--- python2.7-2.7.8.orig/debian/2to3-2.7.1 +++ python2.7-2.7.8/debian/2to3-2.7.1 @@ -0,0 +1,41 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4. +.TH 2TO3-2.7 "1" "January 2012" "2to3-2.7 2.7" "User Commands" +.SH NAME +2to3-2.7 \- Python2 to Python3 converter +.SH SYNOPSIS +.B 2to3 +[\fIoptions\fR] \fIfile|dir \fR... +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +show this help message and exit +.TP +\fB\-d\fR, \fB\-\-doctests_only\fR +Fix up doctests only +.TP +\fB\-f\fR FIX, \fB\-\-fix\fR=\fIFIX\fR +Each FIX specifies a transformation; default: all +.TP +\fB\-j\fR PROCESSES, \fB\-\-processes\fR=\fIPROCESSES\fR +Run 2to3 concurrently +.TP +\fB\-x\fR NOFIX, \fB\-\-nofix\fR=\fINOFIX\fR +Prevent a transformation from being run +.TP +\fB\-l\fR, \fB\-\-list\-fixes\fR +List available transformations +.TP +\fB\-p\fR, \fB\-\-print\-function\fR +Modify the grammar so that print() is a function +.TP +\fB\-v\fR, \fB\-\-verbose\fR +More verbose logging +.TP +\fB\-\-no\-diffs\fR +Don't show diffs of the refactoring +.TP +\fB\-w\fR, \fB\-\-write\fR +Write back modified files +.TP +\fB\-n\fR, \fB\-\-nobackups\fR +Don't write backups for modified files --- python2.7-2.7.8.orig/debian/FAQ.html +++ python2.7-2.7.8/debian/FAQ.html @@ -0,0 +1,8997 @@ + + +The Whole Python FAQ + + + +

The Whole Python FAQ

+Last changed on Wed Feb 12 21:31:08 2003 CET + +

(Entries marked with ** were changed within the last 24 hours; +entries marked with * were changed within the last 7 days.) +

+ +

+


+

1. General information and availability

+ + +

+


+

2. Python in the real world

+ + +

+


+

3. Building Python and Other Known Bugs

+ + +

+


+

4. Programming in Python

+ + +

+


+

5. Extending Python

+ + +

+


+

6. Python's design

+ + +

+


+

7. Using Python on non-UNIX platforms

+ + +

+


+

8. Python on Windows

+ + +
+

1. General information and availability

+ +
+

1.1. What is Python?

+Python is an interpreted, interactive, object-oriented programming +language. It incorporates modules, exceptions, dynamic typing, very +high level dynamic data types, and classes. Python combines +remarkable power with very clear syntax. It has interfaces to many +system calls and libraries, as well as to various window systems, and +is extensible in C or C++. It is also usable as an extension language +for applications that need a programmable interface. Finally, Python +is portable: it runs on many brands of UNIX, on the Mac, and on PCs +under MS-DOS, Windows, Windows NT, and OS/2. +

+To find out more, the best thing to do is to start reading the +tutorial from the documentation set (see a few questions further +down). +

+See also question 1.17 (what is Python good for). +

+ +Edit this entry / +Log info + +/ Last changed on Mon May 26 16:05:18 1997 by +GvR +

+ +


+

1.2. Why is it called Python?

+Apart from being a computer scientist, I'm also a fan of "Monty +Python's Flying Circus" (a BBC comedy series from the seventies, in +the -- unlikely -- case you didn't know). It occurred to me one day +that I needed a name that was short, unique, and slightly mysterious. +And I happened to be reading some scripts from the series at the +time... So then I decided to call my language Python. +

+By now I don't care any more whether you use a Python, some other +snake, a foot or 16-ton weight, or a wood rat as a logo for Python! +

+ +Edit this entry / +Log info + +/ Last changed on Thu Aug 24 00:50:41 2000 by +GvR +

+ +


+

1.3. How do I obtain a copy of the Python source?

+The latest Python source distribution is always available from +python.org, at http://www.python.org/download. The latest development sources can be obtained via anonymous CVS from SourceForge, at http://www.sf.net/projects/python . +

+The source distribution is a gzipped tar file containing the complete C source, LaTeX +documentation, Python library modules, example programs, and several +useful pieces of freely distributable software. This will compile and +run out of the box on most UNIX platforms. (See section 7 for +non-UNIX information.) +

+Older versions of Python are also available from python.org. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Apr 9 17:06:16 2002 by +A.M. Kuchling +

+ +


+

1.4. How do I get documentation on Python?

+All documentation is available on-line, starting at http://www.python.org/doc/. +

+The LaTeX source for the documentation is part of the source +distribution. If you don't have LaTeX, the latest Python +documentation set is available, in various formats like postscript +and html, by anonymous ftp - visit the above URL for links to the +current versions. +

+PostScript for a high-level description of Python is in the file nluug-paper.ps +(a separate file on the ftp site). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jan 21 12:02:55 1998 by +Ken Manheimer +

+ +


+

1.5. Are there other ftp sites that mirror the Python distribution?

+The following anonymous ftp sites keep mirrors of the Python +distribution: +

+USA: +

+

+        ftp://ftp.python.org/pub/python/
+        ftp://gatekeeper.dec.com/pub/plan/python/
+        ftp://ftp.uu.net/languages/python/
+        ftp://ftp.wustl.edu/graphics/graphics/sgi-stuff/python/
+        ftp://ftp.sterling.com/programming/languages/python/
+        ftp://uiarchive.cso.uiuc.edu/pub/lang/python/
+        ftp://ftp.pht.com/mirrors/python/python/
+	ftp://ftp.cdrom.com/pub/python/
+
+Europe: +

+

+        ftp://ftp.cwi.nl/pub/python/
+        ftp://ftp.funet.fi/pub/languages/python/
+        ftp://ftp.sunet.se/pub/lang/python/
+        ftp://unix.hensa.ac.uk/mirrors/uunet/languages/python/
+        ftp://ftp.lip6.fr/pub/python/
+        ftp://sunsite.cnlab-switch.ch/mirror/python/
+        ftp://ftp.informatik.tu-muenchen.de/pub/comp/programming/languages/python/
+
+Australia: +

+

+        ftp://ftp.dstc.edu.au/pub/python/
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Mar 24 09:20:49 1999 by +A.M. Kuchling +

+ +


+

1.6. Is there a newsgroup or mailing list devoted to Python?

+There is a newsgroup, comp.lang.python, +and a mailing list. The newsgroup and mailing list are gatewayed into +each other -- if you can read news it's unnecessary to subscribe to +the mailing list. To subscribe to the mailing list +(python-list@python.org) visit its Mailman webpage at +http://www.python.org/mailman/listinfo/python-list +

+More info about the newsgroup and mailing list, and about other lists, +can be found at +http://www.python.org/psa/MailingLists.html. +

+Archives of the newsgroup are kept by Deja News and accessible +through the "Python newsgroup search" web page, +http://www.python.org/search/search_news.html. +This page also contains pointer to other archival collections. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jun 23 09:29:36 1999 by +GvR +

+ +


+

1.7. Is there a WWW page devoted to Python?

+Yes, http://www.python.org/ is the official Python home page. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 14:42:59 1997 by +Ken Manheimer +

+ +


+

1.8. Is the Python documentation available on the WWW?

+Yes. Python 2.0 documentation is available from +http://www.pythonlabs.com/tech/python2.0/doc/ and from +http://www.python.org/doc/. Note that most documentation +is available for on-line browsing as well as for downloading. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 03:14:08 2001 by +Moshe Zadka +

+ +


+

1.9. Are there any books on Python?

+Yes, many, and more are being published. See +the python.org Wiki at http://www.python.org/cgi-bin/moinmoin/PythonBooks for a list. +

+You can also search online bookstores for "Python" +(and filter out the Monty Python references; or +perhaps search for "Python" and "language"). +

+ +Edit this entry / +Log info + +/ Last changed on Mon Aug 5 19:08:49 2002 by +amk +

+ +


+

1.10. Are there any published articles about Python that I can reference?

+If you can't reference the web site, and you don't want to reference the books +(see previous question), there are several articles on Python that you could +reference. +

+Most publications about Python are collected on the Python web site: +

+

+    http://www.python.org/doc/Publications.html
+
+It is no longer recommended to reference this +very old article by Python's author: +

+

+    Guido van Rossum and Jelke de Boer, "Interactively Testing Remote
+    Servers Using the Python Programming Language", CWI Quarterly, Volume
+    4, Issue 4 (December 1991), Amsterdam, pp 283-303.
+
+

+ +Edit this entry / +Log info + +/ Last changed on Sat Jul 4 20:52:31 1998 by +GvR +

+ +


+

1.11. Are there short introductory papers or talks on Python?

+There are several - you can find links to some of them collected at +http://www.python.org/doc/Hints.html#intros. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 15:04:05 1997 by +Ken Manheimer +

+ +


+

1.12. How does the Python version numbering scheme work?

+Python versions are numbered A.B.C or A.B. A is the major version +number -- it is only incremented for really major changes in the +language. B is the minor version number, incremented for less +earth-shattering changes. C is the micro-level -- it is +incremented for each bugfix release. See PEP 6 for more information +about bugfix releases. +

+Not all releases have bugfix releases. +Note that in the past (ending with 1.5.2), +micro releases have added significant changes; +in fact the changeover from 0.9.9 to 1.0.0 was the first time +that either A or B changed! +

+Alpha, beta and release candidate versions have an additional suffixes. +The suffix for an alpha version is "aN" for some small number N, the +suffix for a beta version is "bN" for some small number N, and the +suffix for a release candidate version is "cN" for some small number N. +

+Note that (for instance) all versions labeled 2.0aN precede the +versions labeled 2.0bN, which precede versions labeled 2.0cN, and +those precede 2.0. +

+As a rule, no changes are made between release candidates and the final +release unless there are show-stopper bugs. +

+You may also find version numbers with a "+" suffix, e.g. "2.2+". +These are unreleased versions, built directly from the CVS trunk. +

+See also the documentation for sys.version, sys.hexversion, and +sys.version_info. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 14 06:34:17 2002 by +GvR +

+ +


+

1.13. How do I get a beta test version of Python?

+All releases, including alphas, betas and release candidates, are announced on +comp.lang.python and comp.lang.python.announce newsgroups, +which are gatewayed into the python-list@python.org and +python-announce@python.org. In addition, all these announcements appear on +the Python home page, at http://www.python.org. +

+You can also access the development version of Python through CVS. See http://sourceforge.net/cvs/?group_id=5470 for details. If you're not familiar with CVS, documents like http://linux.oreillynet.com/pub/a/linux/2002/01/03/cvs_intro.html +provide an introduction. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 00:57:08 2002 by +Neal Norwitz +

+ +


+

1.14. Are there copyright restrictions on the use of Python?

+Hardly. You can do anything you want with the source, as long as +you leave the copyrights in, and display those copyrights in any +documentation about Python that you produce. Also, don't use the +author's institute's name in publicity without prior written +permission, and don't hold them responsible for anything (read the +actual copyright for a precise legal wording). +

+In particular, if you honor the copyright rules, it's OK to use Python +for commercial use, to sell copies of Python in source or binary form, +or to sell products that enhance Python or incorporate Python (or part +of it) in some form. I would still like to know about all commercial +use of Python! +

+ +Edit this entry / +Log info +

+ +


+

1.15. Why was Python created in the first place?

+Here's a very brief summary of what got me started: +

+I had extensive experience with implementing an interpreted language +in the ABC group at CWI, and from working with this group I had +learned a lot about language design. This is the origin of many +Python features, including the use of indentation for statement +grouping and the inclusion of very-high-level data types (although the +details are all different in Python). +

+I had a number of gripes about the ABC language, but also liked many +of its features. It was impossible to extend the ABC language (or its +implementation) to remedy my complaints -- in fact its lack of +extensibility was one of its biggest problems. +I had some experience with using Modula-2+ and talked with the +designers of Modula-3 (and read the M3 report). M3 is the origin of +the syntax and semantics used for exceptions, and some other Python +features. +

+I was working in the Amoeba distributed operating system group at +CWI. We needed a better way to do system administration than by +writing either C programs or Bourne shell scripts, since Amoeba had +its own system call interface which wasn't easily accessible from the +Bourne shell. My experience with error handling in Amoeba made me +acutely aware of the importance of exceptions as a programming +language feature. +

+It occurred to me that a scripting language with a syntax like ABC +but with access to the Amoeba system calls would fill the need. I +realized that it would be foolish to write an Amoeba-specific +language, so I decided that I needed a language that was generally +extensible. +

+During the 1989 Christmas holidays, I had a lot of time on my hand, +so I decided to give it a try. During the next year, while still +mostly working on it in my own time, Python was used in the Amoeba +project with increasing success, and the feedback from colleagues made +me add many early improvements. +

+In February 1991, after just over a year of development, I decided +to post to USENET. The rest is in the Misc/HISTORY file. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 00:06:23 1997 by +GvR +

+ +


+

1.16. Do I have to like "Monty Python's Flying Circus"?

+No, but it helps. Pythonistas like the occasional reference to SPAM, +and of course, nobody expects the Spanish Inquisition +

+The two main reasons to use Python are: +

+

+ - Portable
+ - Easy to learn
+
+The three main reasons to use Python are: +

+

+ - Portable
+ - Easy to learn
+ - Powerful standard library
+
+(And nice red uniforms.) +

+And remember, there is no rule six. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 28 10:39:21 1997 by +GvR +

+ +


+

1.17. What is Python good for?

+Python is used in many situations where a great deal of dynamism, +ease of use, power, and flexibility are required. +

+In the area of basic text +manipulation core Python (without any non-core extensions) is easier +to use and is roughly as fast as just about any language, and this makes Python +good for many system administration type tasks and for CGI programming +and other application areas that manipulate text and strings and such. +

+When augmented with +standard extensions (such as PIL, COM, Numeric, oracledb, kjbuckets, +tkinter, win32api, etc.) +or special purpose extensions (that you write, perhaps using helper tools such +as SWIG, or using object protocols such as ILU/CORBA or COM) Python +becomes a very convenient "glue" or "steering" +language that helps make heterogeneous collections of unrelated +software packages work together. +For example by combining Numeric with oracledb you can help your +SQL database do statistical analysis, or even Fourier transforms. +One of the features that makes Python excel in the "glue language" role +is Python's simple, usable, and powerful C language runtime API. +

+Many developers also use Python extensively as a graphical user +interface development aide. +

+ +Edit this entry / +Log info + +/ Last changed on Sat May 24 10:13:11 1997 by +Aaron Watters +

+ +


+

1.18. Can I use the FAQ Wizard software to maintain my own FAQ?

+Sure. It's in Tools/faqwiz/ of the python source tree. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Mar 29 06:50:32 2002 by +Aahz +

+ +


+

1.19. Which editor has good support for editing Python source code?

+On Unix, the first choice is Emacs/XEmacs. There's an elaborate +mode for editing Python code, which is available from the Python +source distribution (Misc/python-mode.el). It's also bundled +with XEmacs (we're still working on legal details to make it possible +to bundle it with FSF Emacs). And it has its own web page: +

+

+    http://www.python.org/emacs/python-mode/index.html
+
+There are many other choices, for Unix, Windows or Macintosh. +Richard Jones compiled a table from postings on the Python newsgroup: +

+

+    http://www.bofh.asn.au/~richard/editors.html
+
+See also FAQ question 7.10 for some more Mac and Win options. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 15 23:21:04 1998 by +Gvr +

+ +


+

1.20. I've never programmed before. Is there a Python tutorial?

+There are several, and at least one book. +All information for beginning Python programmers is collected here: +

+

+    http://www.python.org/doc/Newbies.html
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Sep 5 05:34:07 2001 by +GvR +

+ +


+

1.21. Where in the world is www.python.org located?

+It's currently in Amsterdam, graciously hosted by XS4ALL: +

+

+    http://www.xs4all.nl
+
+Thanks to Thomas Wouters for setting this up!!!! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 3 21:49:27 2001 by +GvR +

+ +


+

2. Python in the real world

+ +
+

2.1. How many people are using Python?

+Certainly thousands, and quite probably tens of thousands of users. +More are seeing the light each day. The comp.lang.python newsgroup is +very active, but overall there is no accurate estimate of the number of subscribers or Python users. +

+Jacek Artymiak has created a Python Users Counter; you can see the +current count by visiting +http://www.wszechnica.safenet.pl/cgi-bin/checkpythonuserscounter.py +(this will not increment the counter; use the link there if you haven't +added yourself already). Most Python users appear not to have registered themselves. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Feb 21 23:29:18 2002 by +GvR +

+ +


+

2.2. Have any significant projects been done in Python?

+At CWI (the former home of Python), we have written a 20,000 line +authoring environment for transportable hypermedia presentations, a +5,000 line multimedia teleconferencing tool, as well as many many +smaller programs. +

+At CNRI (Python's new home), we have written two large applications: +Grail, a fully featured web browser (see +http://grail.cnri.reston.va.us), +and the Knowbot Operating Environment, +a distributed environment for mobile code. +

+The University of Virginia uses Python to control a virtual reality +engine. See http://alice.cs.cmu.edu. +

+The ILU project at Xerox PARC can generate Python glue for ILU +interfaces. See ftp://ftp.parc.xerox.com/pub/ilu/ilu.html. ILU +is a free CORBA compliant ORB which supplies distributed object +connectivity to a host of platforms using a host of languages. +

+Mark Hammond and Greg Stein and others are interfacing Python to +Microsoft's COM and ActiveX architectures. This means, among other +things, that Python may be used in active server pages or as a COM +controller (for example to automatically extract from or insert information +into Excel or MSAccess or any other COM aware application). +Mark claims Python can even be a ActiveX scripting host (which +means you could embed JScript inside a Python application, if you +had a strange sense of humor). Python/AX/COM is distributed as part +of the PythonWin distribution. +

+The University of California, Irvine uses a student administration +system called TELE-Vision written entirely in Python. Contact: Ray +Price rlprice@uci.edu. +

+The Melbourne Cricket Ground (MCG) in Australia (a 100,000+ person venue) +has it's scoreboard system written largely in Python on MS Windows. +Python expressions are used to create almost every scoring entry that +appears on the board. The move to Python/C++ away from exclusive C++ +has provided a level of functionality that would simply not have been +viable otherwise. +

+See also the next question. +

+Note: this FAQ entry is really old. +See http://www.python.org/psa/Users.html for a more recent list. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 25 13:24:15 2000 by +GvR +

+ +


+

2.3. Are there any commercial projects going on using Python?

+Yes, there's lots of commercial activity using Python. See +http://www.python.org/psa/Users.html for a list. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 14 18:17:33 1998 by +ken +

+ +


+

2.4. How stable is Python?

+Very stable. New, stable releases have been coming out roughly every 3 to 12 months since 1991, and this seems likely to continue. +

+With the introduction of retrospective "bugfix" releases the stability of the language implementations can be, and is being, improved independently of the new features offered by more recent major or minor releases. Bugfix releases, indicated by a third component of the version number, only fix known problems and do not gratuitously introduce new and possibly incompatible features or modified library functionality. +

+Release 2.2 got its first bugfix on April 10, 2002. The new version +number is now 2.2.1. The 2.1 release, at 2.1.3, can probably be +considered the "most stable" platform because it has been bugfixed +twice. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 23 10:20:04 2002 by +Jens Kubieziel +

+ +


+

2.5. What new developments are expected for Python in the future?

+See http://www.python.org/peps/ for the Python Enhancement +Proposals (PEPs). PEPs are design +documents +describing a suggested new feature for Python, providing +a concise technical specification and a rationale. +

+Also, follow the discussions on the python-dev mailing list. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Apr 9 17:09:51 2002 by +A.M. Kuchling +

+ +


+

2.6. Is it reasonable to propose incompatible changes to Python?

+In general, no. There are already millions of lines of Python code +around the world, so any changes in the language that invalidates more +than a very small fraction of existing programs has to be frowned +upon. Even if you can provide a conversion program, there still is +the problem of updating all documentation. Providing a gradual +upgrade path is the only way if a feature has to be changed. +

+See http://www.python.org/peps/pep-0005.html for the proposed +mechanism for creating backwards-incompatibilities. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 1 22:13:47 2002 by +Fred Drake +

+ +


+

2.7. What is the future of Python?

+Please see http://www.python.org/peps/ for proposals of future +activities. One of the PEPs (Python Enhancement Proposals) deals +with the PEP process and PEP format -- see +http://www.python.org/peps/pep-0001.html if you want to +submit a PEP. In http://www.python.org/peps/pep-0042.html there +is a list of wishlists the Python Development team plans to tackle. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 1 22:15:46 2002 by +Fred Drake +

+ +


+

2.8. What was the PSA, anyway?

+The Python Software Activity was +created by a number of Python aficionados who want Python to be more +than the product and responsibility of a single individual. +The PSA was not an independent organization, but lived +under the umbrealla of CNRI. +

+The PSA has been superseded by the Python Software Foundation, +an independent non-profit organization. The PSF's home page +is at http://www.python.org/psf/. +

+Some pages created by the PSA still live at +http://www.python.org/psa/ +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 25 18:19:44 2002 by +GvR +

+ +


+

2.9. Deleted

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:51:30 2001 by +Moshe Zadka +

+ +


+

2.10. Deleted

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:52:19 2001 by +Moshe Zadka +

+ +


+

2.11. Is Python Y2K (Year 2000) Compliant?

+As of January, 2001 no major problems have been reported and Y2K +compliance seems to be a non-issue. +

+Since Python is available free of charge, there are no absolute +guarantees. If there are unforeseen problems, liability is the +user's rather than the developers', and there is nobody you can sue for damages. +

+Python does few +date manipulations, and what it does is all based on the Unix +representation for time (even on non-Unix systems) which uses seconds +since 1970 and won't overflow until 2038. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 8 17:19:32 2001 by +Steve Holden +

+ +


+

2.12. Is Python a good language in a class for beginning programmers?

+Yes. This long answer attempts to address any concerns you might +have with teaching Python as a programmer's first language. +(If you want to discuss Python's use in education, then +you may be interested in joining the edu-sig mailinglist. +See http://www.python.org/sigs/edu-sig/ ) +

+It is still common to start students with a procedural +(subset of a) statically typed language such as Pascal, C, or +a subset of C++ or Java. I think that students may be better +served by learning Python as their first language. Python has +a very simple and consistent syntax and a large standard library. +Most importantly, using Python in a beginning programming course +permits students to concentrate on important programming skills, +such as problem decomposition and data type design. +

+With Python, students can be quickly introduced to basic concepts +such as loops and procedures. They can even probably work with +user-defined objects in their very first course. They could +implement a tree structure as nested Python lists, for example. +They could be introduced to objects in their first course if +desired. For a student who has never programmed before, using +a statically typed language seems unnatural. It presents +additional complexity that the student must master and slows +the pace of the course. The students are trying to learn to +think like a computer, decompose problems, design consistent +interfaces, and encapsulate data. While learning to use a +statically typed language is important, it is not necessarily the +best topic to address in the students' first programming course. +

+Many other aspects of Python make it a good first language. +Python has a large standard library (like Java) so that +students can be assigned programming projects very early in the +course that do something. Assignments aren't restricted to the +standard four-function calculator and check balancing programs. +By using the standard library, students can gain the satisfaction +of working on realistic applications as they learn the fundamentals +of programming. Using the standard library also teaches students +about code reuse. +

+Python's interactive interpreter also enables students to +test language features while they're programming. They can keep +a window with the interpreter running while they enter their +programs' source in another window. If they can't remember the +methods for a list, they can do something like this: +

+

+ >>> L = []
+ >>> dir(L)
+ ['append', 'count', 'extend', 'index', 'insert', 'pop', 'remove',
+ 'reverse', 'sort']
+ >>> print L.append.__doc__
+ L.append(object) -- append object to end
+ >>> L.append(1)
+ >>> L
+ [1]
+
+With the interpreter, documentation is never far from the +student as he's programming. +

+There are also good IDEs for Python. Guido van Rossum's IDLE +is a cross-platform IDE for Python that is written in Python +using Tk. There is also a Windows specific IDE called PythonWin. +Emacs users will be happy to know that there is a very good Python +mode for Emacs. All of these programming environments provide +syntax highlighting, auto-indenting, and access to the interactive +interpreter while coding. For more information about IDEs, see XXX. +

+If your department is currently using Pascal because it was +designed to be a teaching language, then you'll be happy to +know that Guido van Rossum designed Python to be simple to +teach to everyone but powerful enough to implement real world +applications. Python makes a good language for first time +programmers because that was one of Python's design goals. +There are papers at http://www.python.org/doc/essays/ on the Python website +by Python's creator explaining his objectives for the language. +One that may interest you is titled "Computer Programming for Everybody" +http://www.python.org/doc/essays/cp4e.html +

+If you're seriously considering Python as a language for your +school, Guido van Rossum may even be willing to correspond with +you about how the language would fit in your curriculum. +See http://www.python.org/doc/FAQ.html#2.2 for examples of +Python's use in the "real world." +

+While Python, its source code, and its IDEs are freely +available, this consideration should not rule +out other languages. There are other free languages (Java, +free C compilers), and many companies are willing to waive some +or all of their fees for student programming tools if it +guarantees that a whole graduating class will know how to +use their tools. That is, if one of the requirements for +the language that will be taught is that it be freely +available, then Python qualifies, but this requirement +does not preclude other languages. +

+While Python jobs may not be as prevalent as C/C++/Java jobs, +teachers should not worry about teaching students critical job +skills in their first course. The skills that win students a +job are those they learn in their senior classes and internships. +Their first programming courses are there to lay a solid +foundation in programming fundamentals. The primary question +in choosing the language for such a course should be which +language permits the students to learn this material without +hindering or limiting them. +

+Another argument for Python is that there are many tasks for +which something like C++ is overkill. That's where languages +like Python, Perl, Tcl, and Visual Basic thrive. It's critical +for students to know something about these languages. (Every +employer for whom I've worked used at least one such language.) +Of the languages listed above, Python probably makes the best +language in a programming curriculum since its syntax is simple, +consistent, and not unlike other languages (C/C++/Java) that +are probably in the curriculum. By starting students with +Python, a department simultaneously lays the foundations for +other programming courses and introduces students to the type +of language that is often used as a "glue" language. As an +added bonus, Python can be used to interface with Microsoft's +COM components (thanks to Mark Hammond). There is also Jython, +a Java implementation of the Python interpreter, that can be +used to connect Java components. +

+If you currently start students with Pascal or C/C++ or Java, +you may be worried they will have trouble learning a statically +typed language after starting with Python. I think that this +fear most often stems from the fact that the teacher started +with a statically typed language, and we tend to like to teach +others in the same way we were taught. In reality, the +transition from Python to one of these other languages is +quite simple. +

+To motivate a statically typed language such as C++, begin the +course by explaining that unlike Python, their first language, +C++ is compiled to a machine dependent executable. Explain +that the point is to make a very fast executable. To permit +the compiler to make optimizations, programmers must help it +by specifying the "types" of variables. By restricting each +variable to a specific type, the compiler can reduce the +book-keeping it has to do to permit dynamic types. The compiler +also has to resolve references at compile time. Thus, the +language gains speed by sacrificing some of Python's dynamic +features. Then again, the C++ compiler provides type safety +and catches many bugs at compile time instead of run time (a +critical consideration for many commercial applications). C++ +is also designed for very large programs where one may want to +guarantee that others don't touch an object's implementation. +C++ provides very strong language features to separate an object's +implementation from its interface. Explain why this separation +is a good thing. +

+The first day of a C++ course could then be a whirlwind introduction +to what C++ requires and provides. The point here is that after +a semester or two of Python, students are hopefully competent +programmers. They know how to handle loops and write procedures. +They've also worked with objects, thought about the benefits of +consistent interfaces, and used the technique of subclassing to +specialize behavior. Thus, a whirlwind introduction to C++ could +show them how objects and subclassing looks in C++. The +potentially difficult concepts of object-oriented design were +taught without the additional obstacles presented by a language +such as C++ or Java. When learning one of these languages, +the students would already understand the "road map." They +understand objects; they would just be learning how objects +fit in a statically typed languages. Language requirements +and compiler errors that seem unnatural to beginning programmers +make sense in this new context. Many students will find it +helpful to be able to write a fast prototype of their algorithms +in Python. Thus, they can test and debug their ideas before +they attempt to write the code in the new language, saving the +effort of working with C++ types for when they've discovered a +working solution for their assignments. When they get annoyed +with the rigidity of types, they'll be happy to learn about +containers and templates to regain some of the lost flexibility +Python afforded them. Students may also gain an appreciation +for the fact that no language is best for every task. They'll +see that C++ is faster, but they'll know that they can gain +flexibility and development speed with a Python when execution +speed isn't critical. +

+If you have any concerns that weren't addressed here, try +posting to the Python newsgroup. Others there have done some +work with using Python as an instructional tool. Good luck. +We'd love to hear about it if you choose Python for your course. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 2 19:32:35 2002 by +Bill Sconce +

+ +


+

3. Building Python and Other Known Bugs

+ +
+

3.1. Is there a test set?

+Sure. You can run it after building with "make test", or you can +run it manually with this command at the Python prompt: +

+

+ import test.autotest
+
+In Python 1.4 or earlier, use +

+

+ import autotest
+
+The test set doesn't test all features of Python, +but it goes a long way to confirm that Python is actually working. +

+NOTE: if "make test" fails, don't just mail the output to the +newsgroup -- this doesn't give enough information to debug the +problem. Instead, find out which test fails, and run that test +manually from an interactive interpreter. For example, if +"make test" reports that test_spam fails, try this interactively: +

+

+ import test.test_spam
+
+This generally produces more verbose output which can be diagnosed +to debug the problem. If you find a bug in Python or the libraries, or in the tests, please report this in the Python bug tracker at SourceForge: +

+http://sourceforge.net/tracker/?func=add&group_id=5470&atid=105470 +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:29:36 2001 by +Fred Drake +

+ +


+

3.2. When running the test set, I get complaints about floating point operations, but when playing with floating point operations I cannot find anything wrong with them.

+The test set makes occasional unwarranted assumptions about the +semantics of C floating point operations. Until someone donates a +better floating point test set, you will have to comment out the +offending floating point tests and execute similar tests manually. +

+ +Edit this entry / +Log info +

+ +


+

3.3. Link errors after rerunning the configure script.

+It is generally necessary to run "make clean" after a configuration +change. +

+ +Edit this entry / +Log info +

+ +


+

3.4. The python interpreter complains about options passed to a script (after the script name).

+You are probably linking with GNU getopt, e.g. through -liberty. +Don't. The reason for the complaint is that GNU getopt, unlike System +V getopt and other getopt implementations, doesn't consider a +non-option to be the end of the option list. A quick (and compatible) +fix for scripts is to add "--" to the interpreter, like this: +

+

+        #! /usr/local/bin/python --
+
+You can also use this interactively: +

+

+        python -- script.py [options]
+
+Note that a working getopt implementation is provided in the Python +distribution (in Python/getopt.c) but not automatically used. +

+ +Edit this entry / +Log info +

+ +


+

3.5. When building on the SGI, make tries to run python to create glmodule.c, but python hasn't been built or installed yet.

+Comment out the line mentioning glmodule.c in Setup and build a +python without gl first; install it or make sure it is in your $PATH, +then edit the Setup file again to turn on the gl module, and make +again. You don't need to do "make clean"; you do need to run "make +Makefile" in the Modules subdirectory (or just run "make" at the +toplevel). +

+ +Edit this entry / +Log info +

+ +


+

3.6. I use VPATH but some targets are built in the source directory.

+On some systems (e.g. Sun), if the target already exists in the +source directory, it is created there instead of in the build +directory. This is usually because you have previously built without +VPATH. Try running "make clobber" in the source directory. +

+ +Edit this entry / +Log info +

+ +


+

3.7. Trouble building or linking with the GNU readline library.

+You can use the GNU readline library to improve the interactive user +interface: this gives you line editing and command history when +calling python interactively. Its sources are distributed with +Python (at least for 2.0). Uncomment the line +

+#readline readline.c -lreadline -ltermcap +

+in Modules/Setup. The configuration option --with-readline +is no longer supported, at least in Python 2.0. Some hints on +building and using the readline library: +On SGI IRIX 5, you may have to add the following +to rldefs.h: +

+

+        #ifndef sigmask
+        #define sigmask(sig) (1L << ((sig)-1))
+        #endif
+
+On some systems, you will have to add #include "rldefs.h" to the +top of several source files, and if you use the VPATH feature, you +will have to add dependencies of the form foo.o: foo.c to the +Makefile for several values of foo. +The readline library requires use of the termcap library. A +known problem with this is that it contains entry points which +cause conflicts with the STDWIN and SGI GL libraries. The STDWIN +conflict can be solved by adding a line saying '#define werase w_erase' to the +stdwin.h file (in the STDWIN distribution, subdirectory H). The +GL conflict has been solved in the Python configure script by a +hack that forces use of the static version of the termcap library. +Check the newsgroup gnu.bash.bug news:gnu.bash.bug for +specific problems with the readline library (I don't read this group +but I've been told that it is the place for readline bugs). +

+ +Edit this entry / +Log info + +/ Last changed on Sat Dec 2 18:23:48 2000 by +Issac Trotts +

+ +


+

3.8. Trouble with socket I/O on older Linux 1.x versions.

+Once you've built Python, use it to run the regen script in the +Lib/plat-linux2 directory. Apparently the files as distributed don't match the system headers on some Linux versions. +

+Note that this FAQ entry only applies to Linux kernel versions 1.x.y; +these are hardly around any more. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 30 20:05:52 2002 by +Jens Kubieziel +

+ +


+

3.9. Trouble with prototypes on Ultrix.

+Ultrix cc seems broken -- use gcc, or edit config.h to #undef +HAVE_PROTOTYPES. +

+ +Edit this entry / +Log info +

+ +


+

3.10. Other trouble building Python on platform X.

+Please submit the details to the SourceForge bug tracker: +

+

+  http://sourceforge.net/tracker/?group_id=5470&atid=105470
+
+and we'll look +into it. Please provide as many details as possible. In particular, +if you don't tell us what type of computer and what operating system +(and version) you are using it will be difficult for us to figure out +what is the matter. If you have compilation output logs, +please use file uploads -- don't paste everything in the message box. +

+In many cases, we won't have access to the same hardware or operating system version, so please, if you have a SourceForge account, log in before filing your report, or if you don't have an account, include an email address at which we can reach you for further questions. Logging in to SourceForge first will also cause SourceForge to send you updates as we act on your report. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:53:18 2001 by +Fred Drake +

+ +


+

3.11. How to configure dynamic loading on Linux.

+This is now automatic as long as your Linux version uses the ELF +object format (all recent Linuxes do). +

+ +Edit this entry / +Log info +

+ +


+

3.12. I can't get shared modules to work on Linux 2.0 (Slackware96)?

+This is a bug in the Slackware96 release. The fix is simple: Make sure +that there is a link from /lib/libdl.so to /lib/libdl.so.1 so that the +following links are setup: /lib/libdl.so -> /lib/libdl.so.1 +/lib/libdl.so.1 -> /lib/libdl.so.1.7.14 You may have to rerun the +configure script, after rm'ing the config.cache file, before you +attempt to rebuild python after this fix. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 15:45:03 1997 by +GvR +

+ +


+

3.13. Trouble when making modules shared on Linux.

+This happens when you have built Python for static linking and then +enable +
+  *shared*
+
+in the Setup file. Shared library code must be +compiled with "-fpic". If a .o file for the module already exist that +was compiled for static linking, you must remove it or do "make clean" +in the Modules directory. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 13:42:30 1997 by +GvR +

+ +


+

3.14. [deleted]

+[ancient information on threads on linux (when thread support +was not standard) used to be here] +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 2 17:27:13 2002 by +Erno Kuusela +

+ +


+

3.15. Errors when linking with a shared library containing C++ code.

+Link the main Python binary with C++. Change the definition of +LINKCC in Modules/Makefile to be your C++ compiler. You may have to +edit config.c slightly to make it compilable with C++. +

+ +Edit this entry / +Log info +

+ +


+

3.16. Deleted

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 11 16:02:22 2001 by +GvR +

+ +


+

3.17. Deleted.

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 11 15:54:57 2001 by +GvR +

+ +


+

3.18. Compilation or link errors for the _tkinter module

+Most likely, there's a version mismatch between the Tcl/Tk header +files (tcl.h and tk.h) and the Tcl/Tk libraries you are using e.g. +"-ltk8.0" and "-ltcl8.0" arguments for _tkinter in the Setup file). +It is possible to install several versions of the Tcl/Tk libraries, +but there can only be one version of the tcl.h and tk.h header +files. If the library doesn't match the header, you'll get +problems, either when linking the module, or when importing it. +Fortunately, the version number is clearly stated in each file, +so this is easy to find. Reinstalling and using the latest +version usually fixes the problem. +

+(Also note that when compiling unpatched Python 1.5.1 against +Tcl/Tk 7.6/4.2 or older, you get an error on Tcl_Finalize. See +the 1.5.1 patch page at http://www.python.org/1.5/patches-1.5.1/.) +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 11 00:49:14 1998 by +Gvr +

+ +


+

3.19. I configured and built Python for Tcl/Tk but "import Tkinter" fails.

+Most likely, you forgot to enable the line in Setup that says +"TKPATH=:$(DESTLIB)/tkinter". +

+ +Edit this entry / +Log info +

+ +


+

3.20. [deleted]

+[ancient information on a gcc+tkinter bug on alpha was here] +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 16:46:23 2002 by +Erno Kuusela +

+ +


+

3.21. Several common system calls are missing from the posix module.

+Most likely, all test compilations run by the configure script +are failing for some reason or another. Have a look in config.log to +see what could be the reason. A common reason is specifying a +directory to the --with-readline option that doesn't contain the +libreadline.a file. +

+ +Edit this entry / +Log info +

+ +


+

3.22. ImportError: No module named string, on MS Windows.

+Most likely, your PYTHONPATH environment variable should be set to +something like: +

+set PYTHONPATH=c:\python;c:\python\lib;c:\python\scripts +

+(assuming Python was installed in c:\python) +

+ +Edit this entry / +Log info +

+ +


+

3.23. Core dump on SGI when using the gl module.

+There are conflicts between entry points in the termcap and curses +libraries and an entry point in the GL library. There's a hack of a +fix for the termcap library if it's needed for the GNU readline +library, but it doesn't work when you're using curses. Concluding, +you can't build a Python binary containing both the curses and gl +modules. +

+ +Edit this entry / +Log info +

+ +


+

3.24. "Initializer not a constant" while building DLL on MS-Windows

+Static type object initializers in extension modules may cause compiles to +fail with an error message like "initializer not a constant". +Fredrik Lundh <Fredrik.Lundh@image.combitech.se> explains: +

+This shows up when building DLL under MSVC. There's two ways to +address this: either compile the module as C++, or change your code to +something like: +

+

+  statichere PyTypeObject bstreamtype = {
+      PyObject_HEAD_INIT(NULL) /* must be set by init function */
+      0,
+      "bstream",
+      sizeof(bstreamobject),
+
+
+  ...
+
+
+  void
+  initbstream()
+  {
+      /* Patch object type */
+      bstreamtype.ob_type = &PyType_Type;
+      Py_InitModule("bstream", functions);
+      ...
+  }
+
+

+ +Edit this entry / +Log info + +/ Last changed on Sun May 25 14:58:05 1997 by +Aaron Watters +

+ +


+

3.25. Output directed to a pipe or file disappears on Linux.

+Some people have reported that when they run their script +interactively, it runs great, but that when they redirect it +to a pipe or file, no output appears. +

+

+    % python script.py
+    ...some output...
+    % python script.py >file
+    % cat file
+    % # no output
+    % python script.py | cat
+    % # no output
+    %
+
+This was a bug in Linux kernel. It is fixed and should not appear anymore. So most Linux users are not affected by this. +

+If redirection doesn't work on your Linux system, check what shell you are using. Shells like (t)csh doesn't support redirection. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 16 13:38:30 2003 by +Jens Kubieziel +

+ +


+

3.26. [deleted]

+[ancient libc/linux problem was here] +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 16:48:08 2002 by +Erno Kuusela +

+ +


+

3.27. [deleted]

+[ancient linux + threads + tk problem was described here] +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 16:49:08 2002 by +Erno Kuusela +

+ +


+

3.28. How can I test if Tkinter is working?

+Try the following: +

+

+  python
+  >>> import _tkinter
+  >>> import Tkinter
+  >>> Tkinter._test()
+
+This should pop up a window with two buttons, +one "Click me" and one "Quit". +

+If the first statement (import _tkinter) fails, your Python +installation probably has not been configured to support Tcl/Tk. +On Unix, if you have installed Tcl/Tk, you have to rebuild Python +after editing the Modules/Setup file to enable the _tkinter module +and the TKPATH environment variable. +

+It is also possible to get complaints about Tcl/Tk version +number mismatches or missing TCL_LIBRARY or TK_LIBRARY +environment variables. These have to do with Tcl/Tk installation +problems. +

+A common problem is to have installed versions of tcl.h and tk.h +that don't match the installed version of the Tcl/Tk libraries; +this usually results in linker errors or (when using dynamic +loading) complaints about missing symbols during loading +the shared library. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Aug 28 17:01:46 1997 by +Guido van Rossum +

+ +


+

3.29. Is there a way to get the interactive mode of the python interpreter to perform function/variable name completion?

+(From a posting by Guido van Rossum) +

+On Unix, if you have enabled the readline module (i.e. if Emacs-style +command line editing and bash-style history works for you), you can +add this by importing the undocumented standard library module +"rlcompleter". When completing a simple identifier, it +completes keywords, built-ins and globals in __main__; when completing +NAME.NAME..., it evaluates (!) the expression up to the last dot and +completes its attributes. +

+This way, you can do "import string", type "string.", hit the +completion key twice, and see the list of names defined by the +string module. +

+Tip: to use the tab key as the completion key, call +

+

+    readline.parse_and_bind("tab: complete")
+
+You can put this in a ~/.pythonrc file, and set the PYTHONSTARTUP +environment variable to ~/.pythonrc. This will cause the completion to be enabled +whenever you run Python interactively. +

+Notes (see the docstring for rlcompleter.py for more information): +

+* The evaluation of the NAME.NAME... form may cause arbitrary +application defined code to be executed if an object with a +__getattr__ hook is found. Since it is the responsibility of the +application (or the user) to enable this feature, I consider this an +acceptable risk. More complicated expressions (e.g. function calls or +indexing operations) are not evaluated. +

+* GNU readline is also used by the built-in functions input() and +raw_input(), and thus these also benefit/suffer from the complete +features. Clearly an interactive application can benefit by +specifying its own completer function and using raw_input() for all +its input. +

+* When stdin is not a tty device, GNU readline is never +used, and this module (and the readline module) are silently inactive. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 12 09:55:24 1998 by +A.M. Kuchling +

+ +


+

3.30. Why is the Python interpreter not built as a shared library?

+(This is a Unix question; on Mac and Windows, it is a shared +library.) +

+It's just a nightmare to get this to work on all different platforms. +Shared library portability is a pain. And yes, I know about GNU libtool +-- but it requires me to use its conventions for filenames etc, and it +would require a complete and utter rewrite of all the makefile and +config tools I'm currently using. +

+In practice, few applications embed Python -- it's much more common to +have Python extensions, which already are shared libraries. Also, +serious embedders often want total control over which Python version +and configuration they use so they wouldn't want to use a standard +shared library anyway. So while the motivation of saving space +when lots of apps embed Python is nice in theory, I +doubt that it will save much in practice. (Hence the low priority I +give to making a shared library.) +

+For Linux systems, the simplest method of producing libpython1.5.so seems to +be (originally from the Minotaur project web page, +http://www.equi4.com/minotaur/minotaur.html): +

+

+  make distclean 
+  ./configure 
+  make OPT="-fpic -O2" 
+  mkdir .extract 
+  (cd .extract; ar xv ../libpython1.5.a) 
+  gcc -shared -o libpython1.5.so .extract/*.o 
+  rm -rf .extract
+
+In Python 2.3 this will be supported by the standard build routine +(at least on Linux) with --enable-shared. Note however that there +is little advantage, and it slows down Python because of the need +for PIC code and the extra cost at startup time to find the library. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 30 13:36:55 2002 by +GvR +

+ +


+

3.31. Build with GCC on Solaris 2.6 (SunOS 5.6) fails

+If you have upgraded Solaris 2.5 or 2.5.1 to Solaris 2.6, +but you have not upgraded +your GCC installation, the compile may fail, e.g. like this: +

+

+ In file included from /usr/include/sys/stream.h:26,
+                  from /usr/include/netinet/in.h:38,
+                  from /usr/include/netdb.h:96,
+                  from ./socketmodule.c:121:
+ /usr/include/sys/model.h:32: #error "No DATAMODEL_NATIVE specified"
+
+Solution: rebuild GCC for Solaris 2.6. +You might be able to simply re-run fixincludes, but +people have had mixed success with doing that. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 21 11:18:46 1998 by +GvR +

+ +


+

3.32. Running "make clean" seems to leave problematic files that cause subsequent builds to fail.

+Use "make clobber" instead. +

+Use "make clean" to reduce the size of the source/build directory +after you're happy with your build and installation. +If you have already tried to build python and you'd like to start +over, you should use "make clobber". It does a "make clean" and also +removes files such as the partially built Python library from a previous build. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 24 20:39:26 1999 by +TAB +

+ +


+

3.33. Submitting bug reports and patches

+To report a bug or submit a patch, please use the relevant service +from the Python project at SourceForge. +

+Bugs: http://sourceforge.net/tracker/?group_id=5470&atid=105470 +

+Patches: http://sourceforge.net/tracker/?group_id=5470&atid=305470 +

+If you have a SourceForge account, please log in before submitting your bug report; this will make it easier for us to contact you regarding your report in the event we have follow-up questions. It will also enable SourceForge to send you update information as we act on your bug. If you do not have a SourceForge account, please consider leaving your name and email address as part of the report. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:58:26 2001 by +Fred Drake +

+ +


+

3.34. I can't load shared libraries under Python 1.5.2, Solaris 7, and gcc 2.95.2

+When trying to load shared libraries, you may see errors like: +ImportError: ld.so.1: python: fatal: relocation error: file /usr/local/lib/python1.5/site-packages/Perp/util/du_SweepUtilc.so: +
+ symbol PyExc_RuntimeError: referenced symbol not found
+
+

+There is a problem with the configure script for Python 1.5.2 +under Solaris 7 with gcc 2.95 . configure should set the make variable +LINKFORSHARED=-Xlinker -export-dynamic +

+

+in Modules/Makefile, +

+Manually add this line to the Modules/Makefile. +This builds a Python executable that can load shared library extensions (xxx.so) . +

+ +Edit this entry / +Log info + +/ Last changed on Mon Feb 19 10:37:05 2001 by +GvR +

+ +


+

3.35. In the regression test, test___all__ fails for the profile module. What's wrong?

+If you have been using the profile module, and have properly calibrated a copy of the module as described in the documentation for the profiler: +

+http://www.python.org/doc/current/lib/profile-calibration.html +

+then it is possible that the regression test "test___all__" will fail if you run the regression test manually rather than using "make test" in the Python source directory. This will happen if you have set your PYTHONPATH environment variable to include the directory containing your calibrated profile module. You have probably calibrated the profiler using an older version of the profile module which does not define the __all__ value, added to the module as of Python 2.1. +

+The problem can be fixed by removing the old calibrated version of the profile module and using the latest version to do a fresh calibration. In general, you will need to re-calibrate for each version of Python anyway, since the performance characteristics can change in subtle ways that impact profiling. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:44:10 2001 by +Fred Drake +

+ +


+

3.36. relocations remain against allocatable but non-writable sections

+This linker error occurs on Solaris if you attempt to build an extension module which incorporates position-dependent (non-PIC) code. A common source of problems is that a static library (.a file), such as libreadline.a or libcrypto.a is linked with the extension module. The error specifically occurs when using gcc as the compiler, but /usr/ccs/bin/ld as the linker. +

+The following solutions and work-arounds are known: +

+1. Rebuild the libraries (libreadline, libcrypto) with -fPIC (-KPIC if using the system compiler). This is recommended; all object files in a shared library should be position-independent. +

+2. Statically link the extension module and its libraries into the Python interpreter, by editing Modules/Setup. +

+3. Use GNU ld instead of /usr/ccs/bin/ld; GNU ld will accept non-PIC code in shared libraries (and mark the section writable) +

+4. Pass -mimpure-text to GCC when linking the module. This will force gcc to not pass -z text to ld; in turn, ld will make all text sections writable. +

+Options 3 and 4 are not recommended, since the ability to share code across processes is lost. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 29 12:05:11 2002 by +Martin v. Löwis +

+ +


+

4. Programming in Python

+ +
+

4.1. Is there a source code level debugger with breakpoints, step, etc.?

+Yes. +

+Module pdb is a rudimentary but adequate console-mode debugger for Python. It is part of the standard Python library, and is documented in the Library Reference Manual. (You can also write your own debugger by using the code for pdb as an example.) +

+The IDLE interactive development environment, which is part of the standard Python distribution (normally available in Tools/idle), includes a graphical debugger. There is documentation for the IDLE debugger at http://www.python.org/idle/doc/idle2.html#Debugger +

+Pythonwin is a Python IDE that includes a GUI debugger based on bdb. The Pythonwin debugger colors breakpoints and has quite a few cool features (including debugging non-Pythonwin programs). A reference can be found at http://www.python.org/ftp/python/pythonwin/pwindex.html +More recent versions of PythonWin are available as a part of the ActivePython distribution (see http://www.activestate.com/Products/ActivePython/index.html). +

+Pydb is a version of the standard Python debugger pdb, modified for use with DDD (Data Display Debugger), a popular graphical debugger front end. Pydb can be found at http://packages.debian.org/unstable/devel/pydb.html +and DDD can be found at http://www.gnu.org/software/ddd/ +

+There are a number of commmercial Python IDEs that include graphical debuggers. They include: +

+

+ * Wing IDE (http://wingide.com/) 
+ * Komodo IDE (http://www.activestate.com/Products/Komodo/)
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 28 01:43:41 2003 by +Stephen Ferg +

+ +


+

4.2. Can I create an object class with some methods implemented in C and others in Python (e.g. through inheritance)? (Also phrased as: Can I use a built-in type as base class?)

+In Python 2.2, you can inherit from builtin classes such as int, list, dict, etc. +

+In previous versions of Python, you can easily create a Python class which serves as a wrapper around a built-in object, e.g. (for dictionaries): +

+

+        # A user-defined class behaving almost identical
+        # to a built-in dictionary.
+        class UserDict:
+                def __init__(self): self.data = {}
+                def __repr__(self): return repr(self.data)
+                def __cmp__(self, dict):
+                        if type(dict) == type(self.data):
+                                return cmp(self.data, dict)
+                        else:
+                                return cmp(self.data, dict.data)
+                def __len__(self): return len(self.data)
+                def __getitem__(self, key): return self.data[key]
+                def __setitem__(self, key, item): self.data[key] = item
+                def __delitem__(self, key): del self.data[key]
+                def keys(self): return self.data.keys()
+                def items(self): return self.data.items()
+                def values(self): return self.data.values()
+                def has_key(self, key): return self.data.has_key(key)
+
+A2. See Jim Fulton's ExtensionClass for an example of a mechanism +which allows you to have superclasses which you can inherit from in +Python -- that way you can have some methods from a C superclass (call +it a mixin) and some methods from either a Python superclass or your +subclass. ExtensionClass is distributed as a part of Zope (see +http://www.zope.org), but will be phased out with Zope 3, since +Zope 3 uses Python 2.2 or later which supports direct inheritance +from built-in types. Here's a link to the original paper about +ExtensionClass: +http://debian.acm.ndsu.nodak.edu/doc/python-extclass/ExtensionClass.html +

+A3. The Boost Python Library (BPL, http://www.boost.org/libs/python/doc/index.html) +provides a way of doing this from C++ (i.e. you can inherit from an +extension class written in C++ using the BPL). +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 28 21:09:52 2002 by +GvR +

+ +


+

4.3. Is there a curses/termcap package for Python?

+The standard Python source distribution comes with a curses module in +the Modules/ subdirectory, though it's not compiled by default (note +that this is not available in the Windows distribution -- there is +no curses module for Windows). +

+In Python versions before 2.0 the module only supported plain curses; +you couldn't use ncurses features like colors with it (though it would +link with ncurses). +

+In Python 2.0, the curses module has been greatly extended, starting +from Oliver Andrich's enhanced version, to provide many additional +functions from ncurses and SYSV curses, such as colour, alternative +character set support, pads, and mouse support. This means the +module is no longer compatible with operating systems that only +have BSD curses, but there don't seem to be any currently +maintained OSes that fall into this category. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 23 20:24:06 2002 by +Tim Peters +

+ +


+

4.4. Is there an equivalent to C's onexit() in Python?

+For Python 2.0: The new atexit module provides a register function that +is similar to C's onexit. See the Library Reference for details. For +2.0 you should not assign to sys.exitfunc! +

+For Python 1.5.2: You need to import sys and assign a function to +sys.exitfunc, it will be called when your program exits, is +killed by an unhandled exception, or (on UNIX) receives a +SIGHUP or SIGTERM signal. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:14:55 2000 by +Bjorn Pettersen +

+ +


+

4.5. [deleted]

+[python used to lack nested scopes, it was explained here] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:18:22 2002 by +Erno Kuusela +

+ +


+

4.6. How do I iterate over a sequence in reverse order?

+If it is a list, the fastest solution is +

+

+        list.reverse()
+        try:
+                for x in list:
+                        "do something with x"
+        finally:
+                list.reverse()
+
+This has the disadvantage that while you are in the loop, the list +is temporarily reversed. If you don't like this, you can make a copy. +This appears expensive but is actually faster than other solutions: +

+

+        rev = list[:]
+        rev.reverse()
+        for x in rev:
+                <do something with x>
+
+If it's not a list, a more general but slower solution is: +

+

+        for i in range(len(sequence)-1, -1, -1):
+                x = sequence[i]
+                <do something with x>
+
+A more elegant solution, is to define a class which acts as a sequence +and yields the elements in reverse order (solution due to Steve +Majewski): +

+

+        class Rev:
+                def __init__(self, seq):
+                        self.forw = seq
+                def __len__(self):
+                        return len(self.forw)
+                def __getitem__(self, i):
+                        return self.forw[-(i + 1)]
+
+You can now simply write: +

+

+        for x in Rev(list):
+                <do something with x>
+
+Unfortunately, this solution is slowest of all, due to the method +call overhead... +

+ +Edit this entry / +Log info + +/ Last changed on Sun May 25 21:10:50 1997 by +GvR +

+ +


+

4.7. My program is too slow. How do I speed it up?

+That's a tough one, in general. There are many tricks to speed up +Python code; I would consider rewriting parts in C only as a last +resort. One thing to notice is that function and (especially) method +calls are rather expensive; if you have designed a purely OO interface +with lots of tiny functions that don't do much more than get or set an +instance variable or call another method, you may consider using a +more direct way, e.g. directly accessing instance variables. Also see +the standard module "profile" (described in the Library Reference +manual) which makes it possible to find out where +your program is spending most of its time (if you have some patience +-- the profiling itself can slow your program down by an order of +magnitude). +

+Remember that many standard optimization heuristics you +may know from other programming experience may well apply +to Python. For example it may be faster to send output to output +devices using larger writes rather than smaller ones in order to +avoid the overhead of kernel system calls. Thus CGI scripts +that write all output in "one shot" may be notably faster than +those that write lots of small pieces of output. +

+Also, be sure to use "aggregate" operations where appropriate. +For example the "slicing" feature allows programs to chop up +lists and other sequence objects in a single tick of the interpreter +mainloop using highly optimized C implementations. Thus to +get the same effect as +

+

+  L2 = []
+  for i in range[3]:
+       L2.append(L1[i])
+
+it is much shorter and far faster to use +

+

+  L2 = list(L1[:3]) # "list" is redundant if L1 is a list.
+
+Note that the map() function, particularly used with +builtin methods or builtin functions can be a convenient +accelerator. For example to pair the elements of two +lists together: +

+

+  >>> map(None, [1,2,3], [4,5,6])
+  [(1, 4), (2, 5), (3, 6)]
+
+or to compute a number of sines: +

+

+  >>> map( math.sin, (1,2,3,4))
+  [0.841470984808, 0.909297426826, 0.14112000806,   -0.756802495308]
+
+The map operation completes very quickly in such cases. +

+Other examples of aggregate operations include the join and split +methods of string objects. For example if s1..s7 are large (10K+) strings then +"".join([s1,s2,s3,s4,s5,s6,s7]) may be far faster than +the more obvious s1+s2+s3+s4+s5+s6+s7, since the "summation" +will compute many subexpressions, whereas join does all +copying in one pass. For manipulating strings also consider the +regular expression libraries and the "substitution" operations +String % tuple and String % dictionary. Also be sure to use +the list.sort builtin method to do sorting, and see FAQ's 4.51 +and 4.59 for examples of moderately advanced usage -- list.sort beats +other techniques for sorting in all but the most extreme +circumstances. +

+There are many other aggregate operations +available in the standard libraries and in contributed libraries +and extensions. +

+Another common trick is to "push loops into functions or methods." +For example suppose you have a program that runs slowly and you +use the profiler (profile.run) to determine that a Python function ff +is being called lots of times. If you notice that ff +

+

+   def ff(x):
+       ...do something with x computing result...
+       return result
+
+tends to be called in loops like (A) +

+

+   list = map(ff, oldlist)
+
+or (B) +

+

+   for x in sequence:
+       value = ff(x)
+       ...do something with value...
+
+then you can often eliminate function call overhead by rewriting +ff to +

+

+   def ffseq(seq):
+       resultseq = []
+       for x in seq:
+           ...do something with x computing result...
+           resultseq.append(result)
+       return resultseq
+
+and rewrite (A) to +

+

+    list = ffseq(oldlist)
+
+and (B) to +

+

+    for value in ffseq(sequence):
+        ...do something with value...
+
+Other single calls ff(x) translate to ffseq([x])[0] with little +penalty. Of course this technique is not always appropriate +and there are other variants, which you can figure out. +

+You can gain some performance by explicitly storing the results of +a function or method lookup into a local variable. A loop like +

+

+    for key in token:
+        dict[key] = dict.get(key, 0) + 1
+
+resolves dict.get every iteration. If the method isn't going to +change, a faster implementation is +

+

+    dict_get = dict.get  # look up the method once
+    for key in token:
+        dict[key] = dict_get(key, 0) + 1
+
+Default arguments can be used to determine values once, at +compile time instead of at run time. This can only be done for +functions or objects which will not be changed during program +execution, such as replacing +

+

+    def degree_sin(deg):
+        return math.sin(deg * math.pi / 180.0)
+
+with +

+

+    def degree_sin(deg, factor = math.pi/180.0, sin = math.sin):
+        return sin(deg * factor)
+
+Because this trick uses default arguments for terms which should +not be changed, it should only be used when you are not concerned +with presenting a possibly confusing API to your users. +

+

+For an anecdote related to optimization, see +

+

+	http://www.python.org/doc/essays/list2str.html
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:03:54 2002 by +Neal Norwitz +

+ +


+

4.8. When I have imported a module, then edit it, and import it again (into the same Python process), the changes don't seem to take place. What is going on?

+For reasons of efficiency as well as consistency, Python only reads +the module file on the first time a module is imported. (Otherwise a +program consisting of many modules, each of which imports the same +basic module, would read the basic module over and over again.) To +force rereading of a changed module, do this: +

+

+        import modname
+        reload(modname)
+
+Warning: this technique is not 100% fool-proof. In particular, +modules containing statements like +

+

+        from modname import some_objects
+
+will continue to work with the old version of the imported objects. +

+ +Edit this entry / +Log info +

+ +


+

4.9. How do I find the current module name?

+A module can find out its own module name by looking at the +(predefined) global variable __name__. If this has the value +'__main__' you are running as a script. +

+ +Edit this entry / +Log info +

+ +


+

4.10. I have a module in which I want to execute some extra code when it is run as a script. How do I find out whether I am running as a script?

+See the previous question. E.g. if you put the following on the +last line of your module, main() is called only when your module is +running as a script: +

+

+        if __name__ == '__main__': main()
+
+

+ +Edit this entry / +Log info +

+ +


+

4.11. I try to run a program from the Demo directory but it fails with ImportError: No module named ...; what gives?

+This is probably an optional module (written in C!) which hasn't +been configured on your system. This especially happens with modules +like "Tkinter", "stdwin", "gl", "Xt" or "Xm". For Tkinter, STDWIN and +many other modules, see Modules/Setup.in for info on how to add these +modules to your Python, if it is possible at all. Sometimes you will +have to ftp and build another package first (e.g. Tcl and Tk for Tkinter). +Sometimes the module only works on specific platforms (e.g. gl only works +on SGI machines). +

+NOTE: if the complaint is about "Tkinter" (upper case T) and you have +already configured module "tkinter" (lower case t), the solution is +not to rename tkinter to Tkinter or vice versa. There is probably +something wrong with your module search path. Check out the value of +sys.path. +

+For X-related modules (Xt and Xm) you will have to do more work: they +are currently not part of the standard Python distribution. You will +have to ftp the Extensions tar file, i.e. +ftp://ftp.python.org/pub/python/src/X-extension.tar.gz and follow +the instructions there. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Feb 12 21:31:08 2003 by +Jens Kubieziel +

+ +


+

4.12. [deleted]

+[stdwin (long dead windowing library) entry deleted] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 08:30:13 2002 by +Erno Kuusela +

+ +


+

4.13. What GUI toolkits exist for Python?

+Depending on what platform(s) you are aiming at, there are several. +

+Currently supported solutions: +

+Cross-platform: +

+Tk: +

+There's a neat object-oriented interface to the Tcl/Tk widget set, +called Tkinter. It is part of the standard Python distribution and +well-supported -- all you need to do is build and install Tcl/Tk and +enable the _tkinter module and the TKPATH definition in Modules/Setup +when building Python. This is probably the easiest to install and +use, and the most complete widget set. It is also very likely that in +the future the standard Python GUI API will be based on or at least +look very much like the Tkinter interface. For more info about Tk, +including pointers to the source, see the Tcl/Tk home page at +http://www.scriptics.com. Tcl/Tk is now fully +portable to the Mac and Windows platforms (NT and 95 only); you need +Python 1.4beta3 or later and Tk 4.1patch1 or later. +

+wxWindows: +

+There's an interface to wxWindows called wxPython. wxWindows is a +portable GUI class library written in C++. It supports GTK, Motif, +MS-Windows and Mac as targets. Ports to other platforms are being +contemplated or have already had some work done on them. wxWindows +preserves the look and feel of the underlying graphics toolkit, and +there is quite a rich widget set and collection of GDI classes. +See the wxWindows page at http://www.wxwindows.org/ for more details. +wxPython is a python extension module that wraps many of the wxWindows +C++ classes, and is quickly gaining popularity amongst Python +developers. You can get wxPython as part of the source or CVS +distribution of wxWindows, or directly from its home page at +http://alldunn.com/wxPython/. +

+Gtk+: +

+PyGtk bindings for the Gtk+ Toolkit by James Henstridge exist; see ftp://ftp.daa.com.au/pub/james/python/. Note that there are two incompatible bindings. If you are using Gtk+ 1.2.x you should get the 0.6.x PyGtk bindings from +

+

+    ftp://ftp.gtk.org/pub/python/v1.2
+
+If you plan to use Gtk+ 2.0 with Python (highly recommended if you are just starting with Gtk), get the most recent distribution from +

+

+    ftp://ftp.gtk.org/pub/python/v2.0
+
+If you are adventurous, you can also check out the source from the Gnome CVS repository. Set your CVS directory to :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome and check the gnome-python module out from the repository. +

+Other: +

+There are also bindings available for the Qt toolkit (PyQt), and for KDE (PyKDE); see http://www.thekompany.com/projects/pykde/. +

+For OpenGL bindings, see http://starship.python.net/~da/PyOpenGL. +

+Platform specific: +

+The Mac port has a rich and ever-growing set of modules that support +the native Mac toolbox calls. See the documentation that comes with +the Mac port. See ftp://ftp.python.org/pub/python/mac. Support +by Jack Jansen jack@cwi.nl. +

+Pythonwin by Mark Hammond (MHammond@skippinet.com.au) +includes an interface to the Microsoft Foundation +Classes and a Python programming environment using it that's written +mostly in Python. See http://www.python.org/windows/. +

+There's an object-oriented GUI based on the Microsoft Foundation +Classes model called WPY, supported by Jim Ahlstrom jim@interet.com. +Programs written in WPY run unchanged and with native look and feel on +Windows NT/95, Windows 3.1 (using win32s), and on Unix (using Tk). +Source and binaries for Windows and Linux are available in +ftp://ftp.python.org/pub/python/wpy/. +

+Obsolete or minority solutions: +

+There's an interface to X11, including the Athena and Motif widget +sets (and a few individual widgets, like Mosaic's HTML widget and +SGI's GL widget) available from +ftp://ftp.python.org/pub/python/src/X-extension.tar.gz. +Support by Sjoerd Mullender sjoerd@cwi.nl. +

+On top of the X11 interface there's the vpApp +toolkit by Per Spilling, now also maintained by Sjoerd Mullender +sjoerd@cwi.nl. See ftp://ftp.cwi.nl/pub/sjoerd/vpApp.tar.gz. +

+For SGI IRIX only, there are unsupported interfaces to the complete +GL (Graphics Library -- low level but very good 3D capabilities) as +well as to FORMS (a buttons-and-sliders-etc package built on top of GL +by Mark Overmars -- ftp'able from +ftp://ftp.cs.ruu.nl/pub/SGI/FORMS/). This is probably also +becoming obsolete, as OpenGL takes over (see above). +

+There's an interface to STDWIN, a platform-independent low-level +windowing interface for Mac and X11. This is totally unsupported and +rapidly becoming obsolete. The STDWIN sources are at +ftp://ftp.cwi.nl/pub/stdwin/. +

+There is an interface to WAFE, a Tcl interface to the X11 +Motif and Athena widget sets. WAFE is at +http://www.wu-wien.ac.at/wafe/wafe.html. +

+ +Edit this entry / +Log info + +/ Last changed on Mon May 13 21:40:39 2002 by +Skip Montanaro +

+ +


+

4.14. Are there any interfaces to database packages in Python?

+Yes! See the Database Topic Guide at +http://www.python.org/topics/database/ for details. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 4 20:12:19 2000 by +Barney Warplug +

+ +


+

4.15. Is it possible to write obfuscated one-liners in Python?

+Yes. See the following three examples, due to Ulf Bartelt: +

+

+        # Primes < 1000
+        print filter(None,map(lambda y:y*reduce(lambda x,y:x*y!=0,
+        map(lambda x,y=y:y%x,range(2,int(pow(y,0.5)+1))),1),range(2,1000)))
+
+
+        # First 10 Fibonacci numbers
+        print map(lambda x,f=lambda x,f:(x<=1) or (f(x-1,f)+f(x-2,f)): f(x,f),
+        range(10))
+
+
+        # Mandelbrot set
+        print (lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,
+        Iu=Iu,Io=Io,Ru=Ru,Ro=Ro,Sy=Sy,L=lambda yc,Iu=Iu,Io=Io,Ru=Ru,Ro=Ro,i=IM,
+        Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro,
+        i=i,Sx=Sx,F=lambda xc,yc,x,y,k,f=lambda xc,yc,x,y,k,f:(k<=0)or (x*x+y*y
+        >=4.0) or 1+f(xc,yc,x*x-y*y+xc,2.0*x*y+yc,k-1,f):f(xc,yc,x,y,k,f):chr(
+        64+F(Ru+x*(Ro-Ru)/Sx,yc,0,0,i)),range(Sx))):L(Iu+y*(Io-Iu)/Sy),range(Sy
+        ))))(-2.1, 0.7, -1.2, 1.2, 30, 80, 24)
+        #    \___ ___/  \___ ___/  |   |   |__ lines on screen
+        #        V          V      |   |______ columns on screen
+        #        |          |      |__________ maximum of "iterations"
+        #        |          |_________________ range on y axis
+        #        |____________________________ range on x axis
+
+Don't try this at home, kids! +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 15:48:33 1997 by +GvR +

+ +


+

4.16. Is there an equivalent of C's "?:" ternary operator?

+Not directly. In many cases you can mimic a?b:c with "a and b or +c", but there's a flaw: if b is zero (or empty, or None -- anything +that tests false) then c will be selected instead. In many cases you +can prove by looking at the code that this can't happen (e.g. because +b is a constant or has a type that can never be false), but in general +this can be a problem. +

+Tim Peters (who wishes it was Steve Majewski) suggested the following +solution: (a and [b] or [c])[0]. Because [b] is a singleton list it +is never false, so the wrong path is never taken; then applying [0] to +the whole thing gets the b or c that you really wanted. Ugly, but it +gets you there in the rare cases where it is really inconvenient to +rewrite your code using 'if'. +

+As a last resort it is possible to implement the "?:" operator as a function: +

+

+    def q(cond,on_true,on_false):
+        from inspect import isfunction
+
+
+        if cond:
+            if not isfunction(on_true): return on_true
+            else: return apply(on_true)
+        else:
+            if not isfunction(on_false): return on_false 
+            else: return apply(on_false)
+
+In most cases you'll pass b and c directly: q(a,b,c). To avoid evaluating b +or c when they shouldn't be, encapsulate them +within a lambda function, e.g.: q(a,lambda: b, lambda: c). +

+

+

+It has been asked why Python has no if-then-else expression, +since most language have one; it is a frequently requested feature. +

+There are several possible answers: just as many languages do +just fine without one; it can easily lead to less readable code; +no sufficiently "Pythonic" syntax has been discovered; a search +of the standard library found remarkably few places where using an +if-then-else expression would make the code more understandable. +

+Nevertheless, in an effort to decide once and for all whether +an if-then-else expression should be added to the language, +PEP 308 (http://www.python.org/peps/pep-0308.html) has been +put forward, proposing a specific syntax. The community can +now vote on this issue. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 19:41:13 2003 by +David Goodger +

+ +


+

4.17. My class defines __del__ but it is not called when I delete the object.

+There are several possible reasons for this. +

+The del statement does not necessarily call __del__ -- it simply +decrements the object's reference count, and if this reaches zero +__del__ is called. +

+If your data structures contain circular links (e.g. a tree where +each child has a parent pointer and each parent has a list of +children) the reference counts will never go back to zero. You'll +have to define an explicit close() method which removes those +pointers. Please don't ever call __del__ directly -- __del__ should +call close() and close() should make sure that it can be called more +than once for the same object. +

+If the object has ever been a local variable (or argument, which is +really the same thing) to a function that caught an expression in an +except clause, chances are that a reference to the object still exists +in that function's stack frame as contained in the stack trace. +Normally, deleting (better: assigning None to) sys.exc_traceback will +take care of this. If a stack was printed for an unhandled +exception in an interactive interpreter, delete sys.last_traceback +instead. +

+There is code that deletes all objects when the interpreter exits, +but it is not called if your Python has been configured to support +threads (because other threads may still be active). You can define +your own cleanup function using sys.exitfunc (see question 4.4). +

+Finally, if your __del__ method raises an exception, a warning message is printed to sys.stderr. +

+

+Starting with Python 2.0, a garbage collector periodically reclaims the space used by most cycles with no external references. (See the "gc" module documentation for details.) There are, however, pathological cases where it can be expected to fail. Moreover, the garbage collector runs some time after the last reference to your data structure vanishes, so your __del__ method may be called at an inconvenient and random time. This is inconvenient if you're trying to reproduce a problem. Worse, the order in which object's __del__ methods are executed is arbitrary. +

+Another way to avoid cyclical references is to use the "weakref" module, which allows you to point to objects without incrementing their reference count. Tree data structures, for instance, should use weak references for their parent and sibling pointers (if they need them!). +

+Question 6.14 is intended to explain the new garbage collection algorithm. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 10 15:27:28 2002 by +Matthias Urlichs +

+ +


+

4.18. How do I change the shell environment for programs called using os.popen() or os.system()? Changing os.environ doesn't work.

+You must be using either a version of python before 1.4, or on a +(rare) system that doesn't have the putenv() library function. +

+Before Python 1.4, modifying the environment passed to subshells was +left out of the interpreter because there seemed to be no +well-established portable way to do it (in particular, some systems, +have putenv(), others have setenv(), and some have none at all). As +of Python 1.4, almost all Unix systems do have putenv(), and so does +the Win32 API, and thus the os module was modified so that changes to +os.environ are trapped and the corresponding putenv() call is made. +

+ +Edit this entry / +Log info +

+ +


+

4.19. What is a class?

+A class is the particular object type created by executing +a class statement. Class objects are used as templates, to create +instance objects, which embody both the data structure +(attributes) and program routines (methods) specific to a datatype. +

+A class can be based on one or more other classes, called its base +class(es). It then inherits the attributes and methods of its base classes. This allows an object model to be successively refined +by inheritance. +

+The term "classic class" is used to refer to the original +class implementation in Python. One problem with classic +classes is their inability to use the built-in data types +(such as list and dictionary) as base classes. Starting +with Python 2.2 an attempt is in progress to unify user-defined +classes and built-in types. It is now possible to declare classes +that inherit from built-in types. +

+ +Edit this entry / +Log info + +/ Last changed on Mon May 27 01:31:21 2002 by +Steve Holden +

+ +


+

4.20. What is a method?

+A method is a function that you normally call as +x.name(arguments...) for some object x. The term is used for methods +of classes and class instances as well as for methods of built-in +objects. (The latter have a completely different implementation and +only share the way their calls look in Python code.) Methods of +classes (and class instances) are defined as functions inside the +class definition. +

+ +Edit this entry / +Log info +

+ +


+

4.21. What is self?

+Self is merely a conventional name for the first argument of a +method -- i.e. a function defined inside a class definition. A method +defined as meth(self, a, b, c) should be called as x.meth(a, b, c) for +some instance x of the class in which the definition occurs; +the called method will think it is called as meth(x, a, b, c). +

+ +Edit this entry / +Log info +

+ +


+

4.22. What is an unbound method?

+An unbound method is a method defined in a class that is not yet +bound to an instance. You get an unbound method if you ask for a +class attribute that happens to be a function. You get a bound method +if you ask for an instance attribute. A bound method knows which +instance it belongs to and calling it supplies the instance automatically; +an unbound method only knows which class it wants for its first +argument (a derived class is also OK). Calling an unbound method +doesn't "magically" derive the first argument from the context -- you +have to provide it explicitly. +

+Trivia note regarding bound methods: each reference to a bound +method of a particular object creates a bound method object. If you +have two such references (a = inst.meth; b = inst.meth), they will +compare equal (a == b) but are not the same (a is not b). +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 6 18:07:25 1998 by +Clarence Gardner +

+ +


+

4.23. How do I call a method defined in a base class from a derived class that overrides it?

+If your class definition starts with "class Derived(Base): ..." +then you can call method meth defined in Base (or one of Base's base +classes) as Base.meth(self, arguments...). Here, Base.meth is an +unbound method (see previous question). +

+ +Edit this entry / +Log info +

+ +


+

4.24. How do I call a method from a base class without using the name of the base class?

+DON'T DO THIS. REALLY. I MEAN IT. It appears that you could call +self.__class__.__bases__[0].meth(self, arguments...) but this fails when +a doubly-derived method is derived from your class: for its instances, +self.__class__.__bases__[0] is your class, not its base class -- so +(assuming you are doing this from within Derived.meth) you would start +a recursive call. +

+Often when you want to do this you are forgetting that classes +are first class in Python. You can "point to" the class you want +to delegate an operation to either at the instance or at the +subclass level. For example if you want to use a "glorp" +operation of a superclass you can point to the right superclass +to use. +

+

+  class subclass(superclass1, superclass2, superclass3):
+      delegate_glorp = superclass2
+      ...
+      def glorp(self, arg1, arg2):
+            ... subclass specific stuff ...
+            self.delegate_glorp.glorp(self, arg1, arg2)
+       ...
+
+
+  class subsubclass(subclass):
+       delegate_glorp = superclass3
+       ...
+
+Note, however that setting delegate_glorp to subclass in +subsubclass would cause an infinite recursion on subclass.delegate_glorp. Careful! Maybe you are getting too fancy for your own good. Consider simplifying the design (?). +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jul 28 13:58:22 1997 by +aaron watters +

+ +


+

4.25. How can I organize my code to make it easier to change the base class?

+You could define an alias for the base class, assign the real base +class to it before your class definition, and use the alias throughout +your class. Then all you have to change is the value assigned to the +alias. Incidentally, this trick is also handy if you want to decide +dynamically (e.g. depending on availability of resources) which base +class to use. Example: +

+

+        BaseAlias = <real base class>
+        class Derived(BaseAlias):
+                def meth(self):
+                        BaseAlias.meth(self)
+                        ...
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 15:49:57 1997 by +GvR +

+ +


+

4.26. How can I find the methods or attributes of an object?

+This depends on the object type. +

+For an instance x of a user-defined class, instance attributes are +found in the dictionary x.__dict__, and methods and attributes defined +by its class are found in x.__class__.__bases__[i].__dict__ (for i in +range(len(x.__class__.__bases__))). You'll have to walk the tree of +base classes to find all class methods and attributes. +

+Many, but not all built-in types define a list of their method names +in x.__methods__, and if they have data attributes, their names may be +found in x.__members__. However this is only a convention. +

+For more information, read the source of the standard (but +undocumented) module newdir. +

+ +Edit this entry / +Log info +

+ +


+

4.27. I can't seem to use os.read() on a pipe created with os.popen().

+os.read() is a low-level function which takes a file descriptor (a +small integer). os.popen() creates a high-level file object -- the +same type used for sys.std{in,out,err} and returned by the builtin +open() function. Thus, to read n bytes from a pipe p created with +os.popen(), you need to use p.read(n). +

+ +Edit this entry / +Log info +

+ +


+

4.28. How can I create a stand-alone binary from a Python script?

+Even though there are Python compilers being developed, +you probably don't need a real compiler, if all you want +is a stand-alone program. There are three solutions to that. +

+One is to use the freeze tool, which is included in the Python +source tree as Tools/freeze. It converts Python byte +code to C arrays. Using a C compiler, you can embed all +your modules into a new program, which is then linked +with the standard Python modules. +

+It works by scanning your source recursively for import statements +(in both forms) and looking for the modules in the standard Python path +as well as in the source directory (for built-in modules). It then +1 the modules written in Python to C code (array initializers +that can be turned into code objects using the marshal module) and +creates a custom-made config file that only contains those built-in +modules which are actually used in the program. It then compiles the +generated C code and links it with the rest of the Python interpreter +to form a self-contained binary which acts exactly like your script. +

+(Hint: the freeze program only works if your script's filename ends in +".py".) +

+There are several utilities which may be helpful. The first is Gordon McMillan's installer at +

+

+    http://www.mcmillan-inc.com/install1.html
+
+which works on Windows, Linux and at least some forms of Unix. +

+Another is Thomas Heller's py2exe (Windows only) at +

+

+    http://starship.python.net/crew/theller/py2exe/
+
+A third is Christian Tismer's SQFREEZE +(http://starship.python.net/crew/pirx/) which appends the byte code +to a specially-prepared Python interpreter, which +will find the byte code in executable. +

+A fourth is Fredrik Lundh's Squeeze +(http://www.pythonware.com/products/python/squeeze/). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jun 19 14:01:30 2002 by +Gordon McMillan +

+ +


+

4.29. What WWW tools are there for Python?

+See the chapters titled "Internet Protocols and Support" and +"Internet Data Handling" in the Library Reference +Manual. Python is full of good things which will help you build server-side and client-side web systems. +

+A summary of available frameworks is maintained by Paul Boddie at +

+

+    http://thor.prohosting.com/~pboddie/Python/web_modules.html
+
+Cameron Laird maintains a useful set of pages about Python web technologies at +

+

+   http://starbase.neosoft.com/~claird/comp.lang.python/web_python.html/
+
+There was a web browser written in Python, called Grail -- +see http://sourceforge.net/project/grail/. This project has been terminated; http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/grail/grail/README gives more details. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Nov 11 22:48:25 2002 by +GvR +

+ +


+

4.30. How do I run a subprocess with pipes connected to both input and output?

+Use the standard popen2 module. For example: +

+

+	import popen2
+	fromchild, tochild = popen2.popen2("command")
+	tochild.write("input\n")
+	tochild.flush()
+	output = fromchild.readline()
+
+Warning: in general, it is unwise to +do this, because you can easily cause a deadlock where your +process is blocked waiting for output from the child, while the child +is blocked waiting for input from you. This can be caused +because the parent expects the child to output more text than it does, +or it can be caused by data being stuck in stdio buffers due to lack +of flushing. The Python parent can of course explicitly flush the data +it sends to the child before it reads any output, but if the child is +a naive C program it can easily have been written to never explicitly +flush its output, even if it is interactive, since flushing is +normally automatic. +

+Note that a deadlock is also possible if you use popen3 to read +stdout and stderr. If one of the two is too large for the internal +buffer (increasing the buffersize does not help) and you read() +the other one first, there is a deadlock, too. +

+Note on a bug in popen2: unless your program calls wait() +or waitpid(), finished child processes are never removed, +and eventually calls to popen2 will fail because of a limit on +the number of child processes. Calling os.waitpid with the +os.WNOHANG option can prevent this; a good place to insert such +a call would be before calling popen2 again. +

+Another way to produce a deadlock: Call a wait() and there is +still more output from the program than what fits into the +internal buffers. +

+In many cases, all you really need is to run some data through a +command and get the result back. Unless the data is infinite in size, +the easiest (and often the most efficient!) way to do this is to write +it to a temporary file and run the command with that temporary file as +input. The standard module tempfile exports a function mktemp() which +generates unique temporary file names. +

+

+ import tempfile
+ import os
+ class Popen3:
+    """
+    This is a deadlock-save version of popen, that returns
+    an object with errorlevel, out (a string) and err (a string).
+    (capturestderr may not work under windows.)
+    Example: print Popen3('grep spam','\n\nhere spam\n\n').out
+    """
+    def __init__(self,command,input=None,capturestderr=None):
+        outfile=tempfile.mktemp()
+        command="( %s ) > %s" % (command,outfile)
+        if input:
+            infile=tempfile.mktemp()
+            open(infile,"w").write(input)
+            command=command+" <"+infile
+        if capturestderr:
+            errfile=tempfile.mktemp()
+            command=command+" 2>"+errfile
+        self.errorlevel=os.system(command) >> 8
+        self.out=open(outfile,"r").read()
+        os.remove(outfile)
+        if input:
+            os.remove(infile)
+        if capturestderr:
+            self.err=open(errfile,"r").read()
+            os.remove(errfile)
+
+Note that many interactive programs (e.g. vi) don't work well with +pipes substituted for standard input and output. You will have to use +pseudo ttys ("ptys") instead of pipes. There is some undocumented +code to use these in the library module pty.py -- I'm afraid you're on +your own here. +

+A different answer is a Python interface to Don Libes' "expect" +library. A Python extension that interfaces to expect is called "expy" +and available from +http://expectpy.sourceforge.net/. +

+A pure Python solution that works like expect is pexpect of Noah Spurrier. +A beta version is available from +http://pexpect.sourceforge.net/ +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 3 16:31:31 2002 by +Tobias Polzin +

+ +


+

4.31. How do I call a function if I have the arguments in a tuple?

+Use the built-in function apply(). For instance, +

+

+    func(1, 2, 3)
+
+is equivalent to +

+

+    args = (1, 2, 3)
+    apply(func, args)
+
+Note that func(args) is not the same -- it calls func() with exactly +one argument, the tuple args, instead of three arguments, the integers +1, 2 and 3. +

+In Python 2.0, you can also use extended call syntax: +

+f(*args) is equivalent to apply(f, args) +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 03:42:50 2001 by +Moshe Zadka +

+ +


+

4.32. How do I enable font-lock-mode for Python in Emacs?

+If you are using XEmacs 19.14 or later, any XEmacs 20, FSF Emacs 19.34 +or any Emacs 20, font-lock should work automatically for you if you +are using the latest python-mode.el. +

+If you are using an older version of XEmacs or Emacs you will need +to put this in your .emacs file: +

+

+        (defun my-python-mode-hook ()
+          (setq font-lock-keywords python-font-lock-keywords)
+          (font-lock-mode 1))
+        (add-hook 'python-mode-hook 'my-python-mode-hook)
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 6 16:18:46 1998 by +Barry Warsaw +

+ +


+

4.33. Is there a scanf() or sscanf() equivalent?

+Not as such. +

+For simple input parsing, the easiest approach is usually to split +the line into whitespace-delimited words using string.split(), and to +convert decimal strings to numeric values using int(), +long() or float(). (Python's int() is 32-bit and its +long() is arbitrary precision.) string.split supports an optional +"sep" parameter which is useful if the line uses something other +than whitespace as a delimiter. +

+For more complicated input parsing, regular expressions (see module re) +are better suited and more powerful than C's sscanf(). +

+There's a contributed module that emulates sscanf(), by Steve Clift; +see contrib/Misc/sscanfmodule.c of the ftp site: +

+

+    http://www.python.org/ftp/python/contrib-09-Dec-1999/Misc/
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:07:51 2002 by +Neal Norwitz +

+ +


+

4.34. Can I have Tk events handled while waiting for I/O?

+Yes, and you don't even need threads! But you'll have to +restructure your I/O code a bit. Tk has the equivalent of Xt's +XtAddInput() call, which allows you to register a callback function +which will be called from the Tk mainloop when I/O is possible on a +file descriptor. Here's what you need: +

+

+        from Tkinter import tkinter
+        tkinter.createfilehandler(file, mask, callback)
+
+The file may be a Python file or socket object (actually, anything +with a fileno() method), or an integer file descriptor. The mask is +one of the constants tkinter.READABLE or tkinter.WRITABLE. The +callback is called as follows: +

+

+        callback(file, mask)
+
+You must unregister the callback when you're done, using +

+

+        tkinter.deletefilehandler(file)
+
+Note: since you don't know *how many bytes* are available for reading, +you can't use the Python file object's read or readline methods, since +these will insist on reading a predefined number of bytes. For +sockets, the recv() or recvfrom() methods will work fine; for other +files, use os.read(file.fileno(), maxbytecount). +

+ +Edit this entry / +Log info +

+ +


+

4.35. How do I write a function with output parameters (call by reference)?

+[Mark Lutz] The thing to remember is that arguments are passed by +assignment in Python. Since assignment just creates references to +objects, there's no alias between an argument name in the caller and +callee, and so no call-by-reference per se. But you can simulate it +in a number of ways: +

+1) By using global variables; but you probably shouldn't :-) +

+2) By passing a mutable (changeable in-place) object: +

+

+      def func1(a):
+          a[0] = 'new-value'     # 'a' references a mutable list
+          a[1] = a[1] + 1        # changes a shared object
+
+
+      args = ['old-value', 99]
+      func1(args)
+      print args[0], args[1]     # output: new-value 100
+
+3) By returning a tuple, holding the final values of arguments: +

+

+      def func2(a, b):
+          a = 'new-value'        # a and b are local names
+          b = b + 1              # assigned to new objects
+          return a, b            # return new values
+
+
+      x, y = 'old-value', 99
+      x, y = func2(x, y)
+      print x, y                 # output: new-value 100
+
+4) And other ideas that fall-out from Python's object model. For instance, it might be clearer to pass in a mutable dictionary: +

+

+      def func3(args):
+          args['a'] = 'new-value'     # args is a mutable dictionary
+          args['b'] = args['b'] + 1   # change it in-place
+
+
+      args = {'a':' old-value', 'b': 99}
+      func3(args)
+      print args['a'], args['b']
+
+5) Or bundle-up values in a class instance: +

+

+      class callByRef:
+          def __init__(self, **args):
+              for (key, value) in args.items():
+                  setattr(self, key, value)
+
+
+      def func4(args):
+          args.a = 'new-value'        # args is a mutable callByRef
+          args.b = args.b + 1         # change object in-place
+
+
+      args = callByRef(a='old-value', b=99)
+      func4(args)
+      print args.a, args.b
+
+
+   But there's probably no good reason to get this complicated :-).
+
+[Python's author favors solution 3 in most cases.] +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 8 23:49:46 1997 by +David Ascher +

+ +


+

4.36. Please explain the rules for local and global variables in Python.

+[Ken Manheimer] In Python, procedure variables are implicitly +global, unless they are assigned anywhere within the block. +In that case +they are implicitly local, and you need to explicitly declare them as +'global'. +

+Though a bit surprising at first, a moment's consideration explains +this. On one hand, requirement of 'global' for assigned vars provides +a bar against unintended side-effects. On the other hand, if global +were required for all global references, you'd be using global all the +time. Eg, you'd have to declare as global every reference to a +builtin function, or to a component of an imported module. This +clutter would defeat the usefulness of the 'global' declaration for +identifying side-effects. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 28 09:53:27 1998 by +GvR +

+ +


+

4.37. How can I have modules that mutually import each other?

+Suppose you have the following modules: +

+foo.py: +

+

+	from bar import bar_var
+	foo_var=1
+
+bar.py: +

+

+	from foo import foo_var
+	bar_var=2
+
+The problem is that the above is processed by the interpreter thus: +

+

+	main imports foo
+	Empty globals for foo are created
+	foo is compiled and starts executing
+	foo imports bar
+	Empty globals for bar are created
+	bar is compiled and starts executing
+	bar imports foo (which is a no-op since there already is a module named foo)
+	bar.foo_var = foo.foo_var
+	...
+
+The last step fails, because Python isn't done with interpreting foo yet and the global symbol dict for foo is still empty. +

+The same thing happens when you use "import foo", and then try to access "foo.one" in global code. +

+

+There are (at least) three possible workarounds for this problem. +

+Guido van Rossum recommends to avoid all uses of "from <module> import ..." (so everything from an imported module is referenced as <module>.<name>) and to place all code inside functions. Initializations of global variables and class variables should use constants or built-in functions only. +

+

+Jim Roskind suggests the following order in each module: +

+

+ exports (globals, functions, and classes that don't need imported base classes)
+ import statements
+ active code (including globals that are initialized from imported values).
+
+Python's author doesn't like this approach much because the imports +appear in a strange place, but has to admit that it works. +

+

+

+Matthias Urlichs recommends to restructure your code so that the recursive import is not necessary in the first place. +

+

+These solutions are not mutually exclusive. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 06:52:51 2002 by +Matthias Urlichs +

+ +


+

4.38. How do I copy an object in Python?

+Try copy.copy() or copy.deepcopy() for the general case. Not all objects can be copied, but most can. +

+Dictionaries have a copy method. Sequences can be copied by slicing: +

+ new_l = l[:]
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:40:26 2002 by +Erno Kuusela +

+ +


+

4.39. How to implement persistent objects in Python? (Persistent == automatically saved to and restored from disk.)

+The library module "pickle" now solves this in a very general way +(though you still can't store things like open files, sockets or +windows), and the library module "shelve" uses pickle and (g)dbm to +create persistent mappings containing arbitrary Python objects. +For possibly better performance also look for the latest version +of the relatively recent cPickle module. +

+A more awkward way of doing things is to use pickle's little sister, +marshal. The marshal module provides very fast ways to store +noncircular basic Python types to files and strings, and back again. +Although marshal does not do fancy things like store instances or +handle shared references properly, it does run extremely fast. For +example loading a half megabyte of data may take less than a +third of a second (on some machines). This often beats doing +something more complex and general such as using gdbm with +pickle/shelve. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 8 22:59:00 1997 by +David Ascher +

+ +


+

4.40. I try to use __spam and I get an error about _SomeClassName__spam.

+Variables with double leading underscore are "mangled" to provide a +simple but effective way to define class private variables. See the +chapter "New in Release 1.4" in the Python Tutorial. +

+ +Edit this entry / +Log info +

+ +


+

4.41. How do I delete a file? And other file questions.

+Use os.remove(filename) or os.unlink(filename); for documentation, +see the posix section of the library manual. They are the same, +unlink() is simply the Unix name for this function. In earlier +versions of Python, only os.unlink() was available. +

+To remove a directory, use os.rmdir(); use os.mkdir() to create one. +

+To rename a file, use os.rename(). +

+To truncate a file, open it using f = open(filename, "r+"), and use +f.truncate(offset); offset defaults to the current seek position. +(The "r+" mode opens the file for reading and writing.) +There's also os.ftruncate(fd, offset) for files opened with os.open() +-- for advanced Unix hacks only. +

+The shutil module also contains a number of functions to work on files +including copyfile, copytree, and rmtree amongst others. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:30:01 2000 by +Bjorn Pettersen +

+ +


+

4.42. How to modify urllib or httplib to support HTTP/1.1?

+Recent versions of Python (2.0 and onwards) support HTTP/1.1 natively. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:56:56 2001 by +Moshe Zadka +

+ +


+

4.43. Unexplicable syntax errors in compile() or exec.

+When a statement suite (as opposed to an expression) is compiled by +compile(), exec or execfile(), it must end in a newline. In some +cases, when the source ends in an indented block it appears that at +least two newlines are required. +

+ +Edit this entry / +Log info +

+ +


+

4.44. How do I convert a string to a number?

+For integers, use the built-in int() function, e.g. int('144') == 144. Similarly, long() converts from string to long integer, e.g. long('144') == 144L; and float() to floating-point, e.g. float('144') == 144.0. +

+Note that these are restricted to decimal interpretation, so +that int('0144') == 144 and int('0x144') raises ValueError. For Python +2.0 int takes the base to convert from as a second optional argument, so +int('0x144', 16) == 324. +

+For greater flexibility, or before Python 1.5, import the module +string and use the string.atoi() function for integers, +string.atol() for long integers, or string.atof() for +floating-point. E.g., +string.atoi('100', 16) == string.atoi('0x100', 0) == 256. +See the library reference manual section for the string module for +more details. +

+While you could use the built-in function eval() instead of +any of those, this is not recommended, because someone could pass you +a Python expression that might have unwanted side effects (like +reformatting your disk). It also has the effect of interpreting numbers +as Python expressions, so that e.g. eval('09') gives a syntax error +since Python regards numbers starting with '0' as octal (base 8). +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:37:34 2000 by +Bjorn Pettersen +

+ +


+

4.45. How do I convert a number to a string?

+To convert, e.g., the number 144 to the string '144', use the +built-in function repr() or the backquote notation (these are +equivalent). If you want a hexadecimal or octal representation, use +the built-in functions hex() or oct(), respectively. For fancy +formatting, use the % operator on strings, just like C printf formats, +e.g. "%04d" % 144 yields '0144' and "%.3f" % (1/3.0) yields '0.333'. +See the library reference manual for details. +

+ +Edit this entry / +Log info +

+ +


+

4.46. How do I copy a file?

+There's the shutil module which contains a copyfile() +function that implements a copy loop; +it isn't good enough for the Macintosh, though: +it doesn't copy the resource fork and Finder info. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:59:40 2001 by +Moshe Zadka +

+ +


+

4.47. How do I check if an object is an instance of a given class or of a subclass of it?

+If you are developing the classes from scratch it might be better to +program in a more proper object-oriented style -- instead of doing a different +thing based on class membership, why not use a method and define the +method differently in different classes? +

+However, there are some legitimate situations +where you need to test for class membership. +

+In Python 1.5, you can use the built-in function isinstance(obj, cls). +

+The following approaches can be used with earlier Python versions: +

+An unobvious method is to raise the object +as an exception and to try to catch the exception with the class you're +testing for: +

+

+	def is_instance_of(the_instance, the_class):
+	    try:
+		raise the_instance
+	    except the_class:
+		return 1
+	    except:
+		return 0
+
+This technique can be used to distinguish "subclassness" +from a collection of classes as well +

+

+                try:
+                              raise the_instance
+                except Audible:
+                              the_instance.play(largo)
+                except Visual:
+                              the_instance.display(gaudy)
+                except Olfactory:
+                              sniff(the_instance)
+                except:
+                              raise ValueError, "dunno what to do with this!"
+
+This uses the fact that exception catching tests for class or subclass +membership. +

+A different approach is to test for the presence of a class attribute that +is presumably unique for the given class. For instance: +

+

+	class MyClass:
+	    ThisIsMyClass = 1
+	    ...
+
+
+	def is_a_MyClass(the_instance):
+	    return hasattr(the_instance, 'ThisIsMyClass')
+
+This version is easier to inline, and probably faster (inlined it +is definitely faster). The disadvantage is that someone else could cheat: +

+

+	class IntruderClass:
+	    ThisIsMyClass = 1    # Masquerade as MyClass
+	    ...
+
+but this may be seen as a feature (anyway, there are plenty of other ways +to cheat in Python). Another disadvantage is that the class must be +prepared for the membership test. If you do not "control the +source code" for the class it may not be advisable to modify the +class to support testability. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jan 2 15:16:04 1998 by +GvR +

+ +


+

4.48. What is delegation?

+Delegation refers to an object oriented technique Python programmers +may implement with particular ease. Consider the following: +

+

+  from string import upper
+
+
+  class UpperOut:
+        def __init__(self, outfile):
+              self.__outfile = outfile
+        def write(self, str):
+              self.__outfile.write( upper(str) )
+        def __getattr__(self, name):
+              return getattr(self.__outfile, name)
+
+Here the UpperOut class redefines the write method +to convert the argument string to upper case before +calling the underlying self.__outfile.write method, but +all other methods are delegated to the underlying +self.__outfile object. The delegation is accomplished +via the "magic" __getattr__ method. Please see the +language reference for more information on the use +of this method. +

+Note that for more general cases delegation can +get trickier. Particularly when attributes must be set +as well as gotten the class must define a __settattr__ +method too, and it must do so carefully. +

+The basic implementation of __setattr__ is roughly +equivalent to the following: +

+

+   class X:
+        ...
+        def __setattr__(self, name, value):
+             self.__dict__[name] = value
+        ...
+
+Most __setattr__ implementations must modify +self.__dict__ to store local state for self without +causing an infinite recursion. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:11:24 1997 by +aaron watters +

+ +


+

4.49. How do I test a Python program or component.

+We presume for the purposes of this question you are interested +in standalone testing, rather than testing your components inside +a testing framework. The best-known testing framework for Python +is the PyUnit module, maintained at +

+

+    http://pyunit.sourceforge.net/
+
+For standalone testing, it helps to write the program so that +it may be easily tested by using good modular design. +In particular your program +should have almost all functionality encapsulated in either functions +or class methods -- and this sometimes has the surprising and +delightful effect of making the program run faster (because +local variable accesses are faster than global accesses). +Furthermore the program should avoid depending on mutating +global variables, since this makes testing much more difficult to do. +

+The "global main logic" of your program may be as simple +as +

+

+  if __name__=="__main__":
+       main_logic()
+
+at the bottom of the main module of your program. +

+Once your program is organized as a tractable collection +of functions and class behaviours you should write test +functions that exercise the behaviours. A test suite +can be associated with each module which automates +a sequence of tests. This sounds like a lot of work, but +since Python is so terse and flexible it's surprisingly easy. +You can make coding much more pleasant and fun by +writing your test functions in parallel with the "production +code", since this makes it easy to find bugs and even +design flaws earlier. +

+"Support modules" that are not intended to be the main +module of a program may include a "test script interpretation" +which invokes a self test of the module. +

+

+   if __name__ == "__main__":
+      self_test()
+
+Even programs that interact with complex external +interfaces may be tested when the external interfaces are +unavailable by using "fake" interfaces implemented in +Python. For an example of a "fake" interface, the following +class defines (part of) a "fake" file interface: +

+

+ import string
+ testdata = "just a random sequence of characters"
+
+
+ class FakeInputFile:
+   data = testdata
+   position = 0
+   closed = 0
+
+
+   def read(self, n=None):
+       self.testclosed()
+       p = self.position
+       if n is None:
+          result= self.data[p:]
+       else:
+          result= self.data[p: p+n]
+       self.position = p + len(result)
+       return result
+
+
+   def seek(self, n, m=0):
+       self.testclosed()
+       last = len(self.data)
+       p = self.position
+       if m==0: 
+          final=n
+       elif m==1:
+          final=n+p
+       elif m==2:
+          final=len(self.data)+n
+       else:
+          raise ValueError, "bad m"
+       if final<0:
+          raise IOError, "negative seek"
+       self.position = final
+
+
+   def isatty(self):
+       return 0
+
+
+   def tell(self):
+       return self.position
+
+
+   def close(self):
+       self.closed = 1
+
+
+   def testclosed(self):
+       if self.closed:
+          raise IOError, "file closed"
+
+Try f=FakeInputFile() and test out its operations. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:12:10 2002 by +Neal Norwitz +

+ +


+

4.50. My multidimensional list (array) is broken! What gives?

+You probably tried to make a multidimensional array like this. +

+

+   A = [[None] * 2] * 3
+
+This makes a list containing 3 references to the same list of length +two. Changes to one row will show in all rows, which is probably not +what you want. The following works much better: +

+

+   A = [None]*3
+   for i in range(3):
+        A[i] = [None] * 2
+
+This generates a list containing 3 different lists of length two. +

+If you feel weird, you can also do it in the following way: +

+

+   w, h = 2, 3
+   A = map(lambda i,w=w: [None] * w, range(h))
+
+For Python 2.0 the above can be spelled using a list comprehension: +

+

+   w,h = 2,3
+   A = [ [None]*w for i in range(h) ]
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:18:35 2000 by +Bjorn Pettersen +

+ +


+

4.51. I want to do a complicated sort: can you do a Schwartzian Transform in Python?

+Yes, and in Python you only have to write it once: +

+

+ def st(List, Metric):
+     def pairing(element, M = Metric):
+           return (M(element), element)
+     paired = map(pairing, List)
+     paired.sort()
+     return map(stripit, paired)
+
+
+ def stripit(pair):
+     return pair[1]
+
+This technique, attributed to Randal Schwartz, sorts the elements +of a list by a metric which maps each element to its "sort value". +For example, if L is a list of string then +

+

+   import string
+   Usorted = st(L, string.upper)
+
+
+   def intfield(s):
+         return string.atoi( string.strip(s[10:15] ) )
+
+
+   Isorted = st(L, intfield)
+
+Usorted gives the elements of L sorted as if they were upper +case, and Isorted gives the elements of L sorted by the integer +values that appear in the string slices starting at position 10 +and ending at position 15. In Python 2.0 this can be done more +naturally with list comprehensions: +

+

+  tmp1 = [ (x.upper(), x) for x in L ] # Schwartzian transform
+  tmp1.sort()
+  Usorted = [ x[1] for x in tmp1 ]
+
+
+  tmp2 = [ (int(s[10:15]), s) for s in L ] # Schwartzian transform
+  tmp2.sort()
+  Isorted = [ x[1] for x in tmp2 ]
+
+

+Note that Isorted may also be computed by +

+

+   def Icmp(s1, s2):
+         return cmp( intfield(s1), intfield(s2) )
+
+
+   Isorted = L[:]
+   Isorted.sort(Icmp)
+
+but since this method computes intfield many times for each +element of L, it is slower than the Schwartzian Transform. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Jun 1 19:18:46 2002 by +Neal Norwitz +

+ +


+

4.52. How to convert between tuples and lists?

+The function tuple(seq) converts any sequence into a tuple with +the same items in the same order. +For example, tuple([1, 2, 3]) yields (1, 2, 3) and tuple('abc') +yields ('a', 'b', 'c'). If the argument is +a tuple, it does not make a copy but returns the same object, so +it is cheap to call tuple() when you aren't sure that an object +is already a tuple. +

+The function list(seq) converts any sequence into a list with +the same items in the same order. +For example, list((1, 2, 3)) yields [1, 2, 3] and list('abc') +yields ['a', 'b', 'c']. If the argument is a list, +it makes a copy just like seq[:] would. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 14 14:18:53 1998 by +Tim Peters +

+ +


+

4.53. Files retrieved with urllib contain leading garbage that looks like email headers.

+Extremely old versions of Python supplied libraries which +did not support HTTP/1.1; the vanilla httplib in Python 1.4 +only recognized HTTP/1.0. In Python 2.0 full HTTP/1.1 support is included. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 8 17:26:18 2001 by +Steve Holden +

+ +


+

4.54. How do I get a list of all instances of a given class?

+Python does not keep track of all instances of a class (or of a +built-in type). +

+You can program the class's constructor to keep track of all +instances, but unless you're very clever, this has the disadvantage +that the instances never get deleted,because your list of all +instances keeps a reference to them. +

+(The trick is to regularly inspect the reference counts of the +instances you've retained, and if the reference count is below a +certain level, remove it from the list. Determining that level is +tricky -- it's definitely larger than 1.) +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 27 23:52:16 1997 by +GvR +

+ +


+

4.55. A regular expression fails with regex.error: match failure.

+This is usually caused by too much backtracking; the regular +expression engine has a fixed size stack which holds at most 4000 +backtrack points. Every character matched by e.g. ".*" accounts for a +backtrack point, so even a simple search like +

+

+  regex.match('.*x',"x"*5000)
+
+will fail. +

+This is fixed in the re module introduced with +Python 1.5; consult the Library Reference section on re for more information. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 30 12:35:49 1998 by +A.M. Kuchling +

+ +


+

4.56. I can't get signal handlers to work.

+The most common problem is that the signal handler is declared +with the wrong argument list. It is called as +

+

+	handler(signum, frame)
+
+so it should be declared with two arguments: +

+

+	def handler(signum, frame):
+		...
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed May 28 09:29:08 1997 by +GvR +

+ +


+

4.57. I can't use a global variable in a function? Help!

+Did you do something like this? +

+

+   x = 1 # make a global
+
+
+   def f():
+         print x # try to print the global
+         ...
+         for j in range(100):
+              if q>3:
+                 x=4
+
+Any variable assigned in a function is local to that function. +unless it is specifically declared global. Since a value is bound +to x as the last statement of the function body, the compiler +assumes that x is local. Consequently the "print x" +attempts to print an uninitialized local variable and will +trigger a NameError. +

+In such cases the solution is to insert an explicit global +declaration at the start of the function, making it +

+

+

+   def f():
+         global x
+         print x # try to print the global
+         ...
+         for j in range(100):
+              if q>3:
+                 x=4
+
+

+In this case, all references to x are interpreted as references +to the x from the module namespace. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Feb 12 15:52:12 2001 by +Steve Holden +

+ +


+

4.58. What's a negative index? Why doesn't list.insert() use them?

+Python sequences are indexed with positive numbers and +negative numbers. For positive numbers 0 is the first index +1 is the second index and so forth. For negative indices -1 +is the last index and -2 is the pentultimate (next to last) index +and so forth. Think of seq[-n] as the same as seq[len(seq)-n]. +

+Using negative indices can be very convenient. For example +if the string Line ends in a newline then Line[:-1] is all of Line except +the newline. +

+Sadly the list builtin method L.insert does not observe negative +indices. This feature could be considered a mistake but since +existing programs depend on this feature it may stay around +forever. L.insert for negative indices inserts at the start of the +list. To get "proper" negative index behaviour use L[n:n] = [x] +in place of the insert method. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:03:18 1997 by +aaron watters +

+ +


+

4.59. How can I sort one list by values from another list?

+You can sort lists of tuples. +

+

+  >>> list1 = ["what", "I'm", "sorting", "by"]
+  >>> list2 = ["something", "else", "to", "sort"]
+  >>> pairs = map(None, list1, list2)
+  >>> pairs
+  [('what', 'something'), ("I'm", 'else'), ('sorting', 'to'), ('by', 'sort')]
+  >>> pairs.sort()
+  >>> pairs
+  [("I'm", 'else'), ('by', 'sort'), ('sorting', 'to'), ('what', 'something')]
+  >>> result = pairs[:]
+  >>> for i in xrange(len(result)): result[i] = result[i][1]
+  ...
+  >>> result
+  ['else', 'sort', 'to', 'something']
+
+And if you didn't understand the question, please see the +example above ;c). Note that "I'm" sorts before "by" because +uppercase "I" comes before lowercase "b" in the ascii order. +Also see 4.51. +

+In Python 2.0 this can be done like: +

+

+ >>> list1 = ["what", "I'm", "sorting", "by"]
+ >>> list2 = ["something", "else", "to", "sort"]
+ >>> pairs = zip(list1, list2)
+ >>> pairs
+ [('what', 'something'), ("I'm", 'else'), ('sorting', 'to'), ('by', 'sort')]
+ >>> pairs.sort()
+ >>> result = [ x[1] for x in pairs ]
+ >>> result
+ ['else', 'sort', 'to', 'something']
+
+[Followup] +

+Someone asked, why not this for the last steps: +

+

+  result = []
+  for p in pairs: result.append(p[1])
+
+This is much more legible. However, a quick test shows that +it is almost twice as slow for long lists. Why? First of all, +the append() operation has to reallocate memory, and while it +uses some tricks to avoid doing that each time, it still has +to do it occasionally, and apparently that costs quite a bit. +Second, the expression "result.append" requires an extra +attribute lookup. The attribute lookup could be done away +with by rewriting as follows: +

+

+  result = []
+  append = result.append
+  for p in pairs: append(p[1])
+
+which gains back some speed, but is still considerably slower +than the original solution, and hardly less convoluted. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:56:35 2000 by +Bjorn Pettersen +

+ +


+

4.60. Why doesn't dir() work on builtin types like files and lists?

+It does starting with Python 1.5. +

+Using 1.4, you can find out which methods a given object supports +by looking at its __methods__ attribute: +

+

+    >>> List = []
+    >>> List.__methods__
+    ['append', 'count', 'index', 'insert', 'remove', 'reverse', 'sort']
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Sep 16 14:56:42 1999 by +Skip Montanaro +

+ +


+

4.61. How can I mimic CGI form submission (METHOD=POST)?

+I would like to retrieve web pages that are the result of POSTing a +form. Is there existing code that would let me do this easily? +

+Yes. Here's a simple example that uses httplib. +

+

+    #!/usr/local/bin/python
+
+
+    import httplib, sys, time
+
+
+    ### build the query string
+    qs = "First=Josephine&MI=Q&Last=Public"
+
+
+    ### connect and send the server a path
+    httpobj = httplib.HTTP('www.some-server.out-there', 80)
+    httpobj.putrequest('POST', '/cgi-bin/some-cgi-script')
+    ### now generate the rest of the HTTP headers...
+    httpobj.putheader('Accept', '*/*')
+    httpobj.putheader('Connection', 'Keep-Alive')
+    httpobj.putheader('Content-type', 'application/x-www-form-urlencoded')
+    httpobj.putheader('Content-length', '%d' % len(qs))
+    httpobj.endheaders()
+    httpobj.send(qs)
+    ### find out what the server said in response...
+    reply, msg, hdrs = httpobj.getreply()
+    if reply != 200:
+	sys.stdout.write(httpobj.getfile().read())
+
+Note that in general for "url encoded posts" (the default) query strings must be "quoted" to, for example, change equals signs and spaces to an encoded form when they occur in name or value. Use urllib.quote to perform this quoting. For example to send name="Guy Steele, Jr.": +

+

+   >>> from urllib import quote
+   >>> x = quote("Guy Steele, Jr.")
+   >>> x
+   'Guy%20Steele,%20Jr.'
+   >>> query_string = "name="+x
+   >>> query_string
+   'name=Guy%20Steele,%20Jr.'
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 21 03:47:07 1999 by +TAB +

+ +


+

4.62. If my program crashes with a bsddb (or anydbm) database open, it gets corrupted. How come?

+Databases opened for write access with the bsddb module (and often by +the anydbm module, since it will preferentially use bsddb) must +explicitly be closed using the close method of the database. The +underlying libdb package caches database contents which need to be +converted to on-disk form and written, unlike regular open files which +already have the on-disk bits in the kernel's write buffer, where they +can just be dumped by the kernel with the program exits. +

+If you have initialized a new bsddb database but not written anything to +it before the program crashes, you will often wind up with a zero-length +file and encounter an exception the next time the file is opened. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:15:01 2002 by +Neal Norwitz +

+ +


+

4.63. How do I make a Python script executable on Unix?

+You need to do two things: the script file's mode must be executable +(include the 'x' bit), and the first line must begin with #! +followed by the pathname for the Python interpreter. +

+The first is done by executing 'chmod +x scriptfile' or perhaps +'chmod 755 scriptfile'. +

+The second can be done in a number of way. The most straightforward +way is to write +

+

+  #!/usr/local/bin/python
+
+as the very first line of your file - or whatever the pathname is +where the python interpreter is installed on your platform. +

+If you would like the script to be independent of where the python +interpreter lives, you can use the "env" program. On almost all +platforms, the following will work, assuming the python interpreter +is in a directory on the user's $PATH: +

+

+  #! /usr/bin/env python
+
+Note -- *don't* do this for CGI scripts. The $PATH variable for +CGI scripts is often very minimal, so you need to use the actual +absolute pathname of the interpreter. +

+Occasionally, a user's environment is so full that the /usr/bin/env +program fails; or there's no env program at all. +In that case, you can try the following hack (due to Alex Rezinsky): +

+

+  #! /bin/sh
+  """:"
+  exec python $0 ${1+"$@"}
+  """
+
+The disadvantage is that this defines the script's __doc__ string. +However, you can fix that by adding +

+

+  __doc__ = """...Whatever..."""
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 15 09:19:16 2001 by +Neal Norwitz +

+ +


+

4.64. How do you remove duplicates from a list?

+See the Python Cookbook for a long discussion of many cool ways: +

+

+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560
+
+Generally, if you don't mind reordering the List +

+

+   if List:
+      List.sort()
+      last = List[-1]
+      for i in range(len(List)-2, -1, -1):
+          if last==List[i]: del List[i]
+          else: last=List[i]
+
+If all elements of the list may be used as +dictionary keys (ie, they are all hashable) +this is often faster +

+

+   d = {}
+   for x in List: d[x]=x
+   List = d.values()
+
+Also, for extremely large lists you might +consider more optimal alternatives to the first one. +The second one is pretty good whenever it can +be used. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:56:33 2002 by +Tim Peters +

+ +


+

4.65. Are there any known year 2000 problems in Python?

+I am not aware of year 2000 deficiencies in Python 1.5. Python does +very few date calculations and for what it does, it relies on the C +library functions. Python generally represent times either as seconds +since 1970 or as a tuple (year, month, day, ...) where the year is +expressed with four digits, which makes Y2K bugs unlikely. So as long +as your C library is okay, Python should be okay. Of course, I cannot +vouch for your Python code! +

+Given the nature of freely available software, I have to add that this statement is not +legally binding. The Python copyright notice contains the following +disclaimer: +

+

+  STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
+  REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
+  CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+  DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+  PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
+The good news is that if you encounter a problem, you have full +source available to track it down and fix it! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 10 14:59:31 1998 by +GvR +

+ +


+

4.66. I want a version of map that applies a method to a sequence of objects! Help!

+Get fancy! +

+

+  def method_map(objects, method, arguments):
+       """method_map([a,b], "flog", (1,2)) gives [a.flog(1,2), b.flog(1,2)]"""
+       nobjects = len(objects)
+       methods = map(getattr, objects, [method]*nobjects)
+       return map(apply, methods, [arguments]*nobjects)
+
+It's generally a good idea to get to know the mysteries of map and apply +and getattr and the other dynamic features of Python. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 5 14:21:14 1998 by +Aaron Watters +

+ +


+

4.67. How do I generate random numbers in Python?

+The standard library module "random" implements a random number +generator. Usage is simple: +

+

+    import random
+
+
+    random.random()
+
+This returns a random floating point number in the range [0, 1). +

+There are also many other specialized generators in this module, such +as +

+

+    randrange(a, b) chooses an integer in the range [a, b)
+    uniform(a, b) chooses a floating point number in the range [a, b)
+    normalvariate(mean, sdev) sample from normal (Gaussian) distribution
+
+Some higher-level functions operate on sequences directly, such as +

+

+    choice(S) chooses random element from a given sequence
+    shuffle(L) shuffles a list in-place, i.e. permutes it randomly
+
+There's also a class, Random, which you can instantiate +to create independent multiple random number generators. +

+All this is documented in the library reference manual. Note that +the module "whrandom" is obsolete. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:16:51 2002 by +Neal Norwitz +

+ +


+

4.68. How do I access the serial (RS232) port?

+There's a Windows serial communication module (for communication +over RS 232 serial ports) at +

+

+  ftp://ftp.python.org/pub/python/contrib/sio-151.zip
+  http://www.python.org/ftp/python/contrib/sio-151.zip
+
+For DOS, try Hans Nowak's Python-DX, which supports this, at: +

+

+  http://www.cuci.nl/~hnowak/
+
+For Unix, see a usenet post by Mitch Chapman: +

+

+  http://groups.google.com/groups?selm=34A04430.CF9@ohioee.com
+
+For Win32, POSIX(Linux, BSD, *), Jython, Chris': +

+

+  http://pyserial.sourceforge.net
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 2 21:11:07 2002 by +Chris Liechti +

+ +


+

4.69. Images on Tk-Buttons don't work in Py15?

+They do work, but you must keep your own reference to the image +object now. More verbosely, you must make sure that, say, a global +variable or a class attribute refers to the object. +

+Quoting Fredrik Lundh from the mailinglist: +

+

+  Well, the Tk button widget keeps a reference to the internal
+  photoimage object, but Tkinter does not.  So when the last
+  Python reference goes away, Tkinter tells Tk to release the
+  photoimage.  But since the image is in use by a widget, Tk
+  doesn't destroy it.  Not completely.  It just blanks the image,
+  making it completely transparent...
+
+
+  And yes, there was a bug in the keyword argument handling
+  in 1.4 that kept an extra reference around in some cases.  And
+  when Guido fixed that bug in 1.5, he broke quite a few Tkinter
+  programs...
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Feb 3 11:31:03 1998 by +Case Roole +

+ +


+

4.70. Where is the math.py (socket.py, regex.py, etc.) source file?

+If you can't find a source file for a module it may be a builtin +or dynamically loaded module implemented in C, C++ or other +compiled language. In this case you may not have the source +file or it may be something like mathmodule.c, somewhere in +a C source directory (not on the Python Path). +

+Fredrik Lundh (fredrik@pythonware.com) explains (on the python-list): +

+There are (at least) three kinds of modules in Python: +1) modules written in Python (.py); +2) modules written in C and dynamically loaded (.dll, .pyd, .so, .sl, etc); +3) modules written in C and linked with the interpreter; to get a list +of these, type: +

+

+    import sys
+    print sys.builtin_module_names
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Feb 3 13:55:33 1998 by +Aaron Watters +

+ +


+

4.71. How do I send mail from a Python script?

+The standard library module smtplib does this. +Here's a very simple interactive mail +sender that uses it. This method will work on any host that +supports an SMTP listener. +

+

+    import sys, smtplib
+
+
+    fromaddr = raw_input("From: ")
+    toaddrs  = raw_input("To: ").split(',')
+    print "Enter message, end with ^D:"
+    msg = ''
+    while 1:
+        line = sys.stdin.readline()
+        if not line:
+            break
+        msg = msg + line
+
+
+    # The actual mail send
+    server = smtplib.SMTP('localhost')
+    server.sendmail(fromaddr, toaddrs, msg)
+    server.quit()
+
+If the local host doesn't have an SMTP listener, you need to find one. The simple method is to ask the user. Alternately, you can use the DNS system to find the mail gateway(s) responsible for the source address. +

+A Unix-only alternative uses sendmail. The location of the +sendmail program varies between systems; sometimes it is +/usr/lib/sendmail, sometime /usr/sbin/sendmail. The sendmail manual +page will help you out. Here's some sample code: +

+

+  SENDMAIL = "/usr/sbin/sendmail" # sendmail location
+  import os
+  p = os.popen("%s -t -i" % SENDMAIL, "w")
+  p.write("To: cary@ratatosk.org\n")
+  p.write("Subject: test\n")
+  p.write("\n") # blank line separating headers from body
+  p.write("Some text\n")
+  p.write("some more text\n")
+  sts = p.close()
+  if sts != 0:
+      print "Sendmail exit status", sts
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 07:05:12 2002 by +Matthias Urlichs +

+ +


+

4.72. How do I avoid blocking in connect() of a socket?

+The select module is widely known to help with asynchronous +I/O on sockets once they are connected. However, it is less +than common knowledge how to avoid blocking on the initial +connect() call. Jeremy Hylton has the following advice (slightly +edited): +

+To prevent the TCP connect from blocking, you can set the socket to +non-blocking mode. Then when you do the connect(), you will either +connect immediately (unlikely) or get an exception that contains the +errno. errno.EINPROGRESS indicates that the connection is in +progress, but hasn't finished yet. Different OSes will return +different errnos, so you're going to have to check. I can tell you +that different versions of Solaris return different errno values. +

+In Python 1.5 and later, you can use connect_ex() to avoid +creating an exception. It will just return the errno value. +

+To poll, you can call connect_ex() again later -- 0 or errno.EISCONN +indicate that you're connected -- or you can pass this socket to +select (checking to see if it is writeable). +

+ +Edit this entry / +Log info + +/ Last changed on Tue Feb 24 21:30:45 1998 by +GvR +

+ +


+

4.73. How do I specify hexadecimal and octal integers?

+To specify an octal digit, precede the octal value with a zero. For example, +to set the variable "a" to the octal value "10" (8 in decimal), type: +

+

+    >>> a = 010
+
+To verify that this works, you can type "a" and hit enter while in the +interpreter, which will cause Python to spit out the current value of "a" +in decimal: +

+

+    >>> a
+    8
+
+Hexadecimal is just as easy. Simply precede the hexadecimal number with a +zero, and then a lower or uppercase "x". Hexadecimal digits can be specified +in lower or uppercase. For example, in the Python interpreter: +

+

+    >>> a = 0xa5
+    >>> a
+    165
+    >>> b = 0XB2
+    >>> b
+    178
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Mar 3 12:53:16 1998 by +GvR +

+ +


+

4.74. How to get a single keypress at a time?

+For Windows, see question 8.2. Here is an answer for Unix (see also 4.94). +

+There are several solutions; some involve using curses, which is a +pretty big thing to learn. Here's a solution without curses, due +to Andrew Kuchling (adapted from code to do a PGP-style +randomness pool): +

+

+        import termios, sys, os
+        fd = sys.stdin.fileno()
+        old = termios.tcgetattr(fd)
+        new = termios.tcgetattr(fd)
+        new[3] = new[3] & ~termios.ICANON & ~termios.ECHO
+        new[6][termios.VMIN] = 1
+        new[6][termios.VTIME] = 0
+        termios.tcsetattr(fd, termios.TCSANOW, new)
+        s = ''    # We'll save the characters typed and add them to the pool.
+        try:
+            while 1:
+                c = os.read(fd, 1)
+                print "Got character", `c`
+                s = s+c
+        finally:
+            termios.tcsetattr(fd, termios.TCSAFLUSH, old)
+
+You need the termios module for any of this to work, and I've only +tried it on Linux, though it should work elsewhere. It turns off +stdin's echoing and disables canonical mode, and then reads a +character at a time from stdin, noting the time after each keystroke. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Oct 24 00:36:56 2002 by +chris +

+ +


+

4.75. How can I overload constructors (or methods) in Python?

+(This actually applies to all methods, but somehow the question +usually comes up first in the context of constructors.) +

+Where in C++ you'd write +

+

+    class C {
+        C() { cout << "No arguments\n"; }
+        C(int i) { cout << "Argument is " << i << "\n"; }
+    }
+
+in Python you have to write a single constructor that catches all +cases using default arguments. For example: +

+

+    class C:
+        def __init__(self, i=None):
+            if i is None:
+                print "No arguments"
+            else:
+                print "Argument is", i
+
+This is not entirely equivalent, but close enough in practice. +

+You could also try a variable-length argument list, e.g. +

+

+        def __init__(self, *args):
+            ....
+
+The same approach works for all method definitions. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 20 11:55:55 1998 by +GvR +

+ +


+

4.76. How do I pass keyword arguments from one method to another?

+Use apply. For example: +

+

+    class Account:
+        def __init__(self, **kw):
+            self.accountType = kw.get('accountType')
+            self.balance = kw.get('balance')
+
+
+    class CheckingAccount(Account):
+        def __init__(self, **kw):
+            kw['accountType'] = 'checking'
+            apply(Account.__init__, (self,), kw)
+
+
+    myAccount = CheckingAccount(balance=100.00)
+
+In Python 2.0 you can call it directly using the new ** syntax: +

+

+    class CheckingAccount(Account):
+        def __init__(self, **kw):
+            kw['accountType'] = 'checking'
+            Account.__init__(self, **kw)
+
+or more generally: +

+

+ >>> def f(x, *y, **z):
+ ...  print x,y,z
+ ...
+ >>> Y = [1,2,3]
+ >>> Z = {'foo':3,'bar':None}
+ >>> f('hello', *Y, **Z)
+ hello (1, 2, 3) {'foo': 3, 'bar': None}
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 13:04:01 2000 by +Bjorn Pettersen +

+ +


+

4.77. What module should I use to help with generating HTML?

+Check out HTMLgen written by Robin Friedrich. It's a class library +of objects corresponding to all the HTML 3.2 markup tags. It's used +when you are writing in Python and wish to synthesize HTML pages for +generating a web or for CGI forms, etc. +

+It can be found in the FTP contrib area on python.org or on the +Starship. Use the search engines there to locate the latest version. +

+It might also be useful to consider DocumentTemplate, which offers clear +separation between Python code and HTML code. DocumentTemplate is part +of the Bobo objects publishing system (http:/www.digicool.com/releases) +but can be used independantly of course! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 28 09:54:58 1998 by +GvR +

+ +


+

4.78. How do I create documentation from doc strings?

+Use gendoc, by Daniel Larson. See +

+http://starship.python.net/crew/danilo/ +

+It can create HTML from the doc strings in your Python source code. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Oct 7 17:15:51 2002 by +Phil Rittenhouse +

+ +


+

4.79. How do I read (or write) binary data?

+For complex data formats, it's best to use +use the struct module. It's documented in the library reference. +It allows you to take a string read from a file containing binary +data (usually numbers) and convert it to Python objects; and vice +versa. +

+For example, the following code reads two 2-byte integers +and one 4-byte integer in big-endian format from a file: +

+

+  import struct
+
+
+  f = open(filename, "rb")  # Open in binary mode for portability
+  s = f.read(8)
+  x, y, z = struct.unpack(">hhl", s)
+
+The '>' in the format string forces bin-endian data; the letter +'h' reads one "short integer" (2 bytes), and 'l' reads one +"long integer" (4 bytes) from the string. +

+For data that is more regular (e.g. a homogeneous list of ints or +floats), you can also use the array module, also documented +in the library reference. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 7 09:16:45 1998 by +GvR +

+ +


+

4.80. I can't get key bindings to work in Tkinter

+An oft-heard complaint is that event handlers bound to events +with the bind() method don't get handled even when the appropriate +key is pressed. +

+The most common cause is that the widget to which the binding applies +doesn't have "keyboard focus". Check out the Tk documentation +for the focus command. Usually a widget is given the keyboard +focus by clicking in it (but not for labels; see the taketocus +option). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 12 09:37:33 1998 by +GvR +

+ +


+

4.81. "import crypt" fails

+[Unix] +

+Starting with Python 1.5, the crypt module is disabled by default. +In order to enable it, you must go into the Python source tree and +edit the file Modules/Setup to enable it (remove a '#' sign in +front of the line starting with '#crypt'). Then rebuild. +You may also have to add the string '-lcrypt' to that same line. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 5 08:57:09 1998 by +GvR +

+ +


+

4.82. Are there coding standards or a style guide for Python programs?

+Yes, Guido has written the "Python Style Guide". See +http://www.python.org/doc/essays/styleguide.html +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 29 09:50:27 1998 by +Joseph VanAndel +

+ +


+

4.83. How do I freeze Tkinter applications?

+Freeze is a tool to create stand-alone applications (see 4.28). +

+When freezing Tkinter applications, the applications will not be +truly stand-alone, as the application will still need the tcl and +tk libraries. +

+One solution is to ship the application with the tcl and tk libraries, +and point to them at run-time using the TCL_LIBRARY and TK_LIBRARY +environment variables. +

+To get truly stand-alone applications, the Tcl scripts that form +the library have to be integrated into the application as well. One +tool supporting that is SAM (stand-alone modules), which is part +of the Tix distribution (http://tix.mne.com). Build Tix with SAM +enabled, perform the appropriate call to Tclsam_init etc inside +Python's Modules/tkappinit.c, and link with libtclsam +and libtksam (you might include the Tix libraries as well). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jan 20 17:35:01 1999 by +Martin v. Löwis +

+ +


+

4.84. How do I create static class data and static class methods?

+[Tim Peters, tim_one@email.msn.com] +

+Static data (in the sense of C++ or Java) is easy; static methods (again in the sense of C++ or Java) are not supported directly. +

+STATIC DATA +

+For example, +

+

+    class C:
+        count = 0   # number of times C.__init__ called
+
+
+        def __init__(self):
+            C.count = C.count + 1
+
+
+        def getcount(self):
+            return C.count  # or return self.count
+
+c.count also refers to C.count for any c such that isinstance(c, C) holds, unless overridden by c itself or by some class on the base-class search path from c.__class__ back to C. +

+Caution: within a method of C, +

+

+    self.count = 42
+
+creates a new and unrelated instance vrbl named "count" in self's own dict. So rebinding of a class-static data name needs the +

+

+    C.count = 314
+
+form whether inside a method or not. +

+

+STATIC METHODS +

+Static methods (as opposed to static data) are unnatural in Python, because +

+

+    C.getcount
+
+returns an unbound method object, which can't be invoked without supplying an instance of C as the first argument. +

+The intended way to get the effect of a static method is via a module-level function: +

+

+    def getcount():
+        return C.count
+
+If your code is structured so as to define one class (or tightly related class hierarchy) per module, this supplies the desired encapsulation. +

+Several tortured schemes for faking static methods can be found by searching DejaNews. Most people feel such cures are worse than the disease. Perhaps the least obnoxious is due to Pekka Pessi (mailto:ppessi@hut.fi): +

+

+    # helper class to disguise function objects
+    class _static:
+        def __init__(self, f):
+            self.__call__ = f
+
+
+    class C:
+        count = 0
+
+
+        def __init__(self):
+            C.count = C.count + 1
+
+
+        def getcount():
+            return C.count
+        getcount = _static(getcount)
+
+
+        def sum(x, y):
+            return x + y
+        sum = _static(sum)
+
+
+    C(); C()
+    c = C()
+    print C.getcount()  # prints 3
+    print c.getcount()  # prints 3
+    print C.sum(27, 15) # prints 42
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 21 21:35:38 1999 by +Tim Peters +

+ +


+

4.85. __import__('x.y.z') returns <module 'x'>; how do I get z?

+Try +

+

+   __import__('x.y.z').y.z
+
+For more realistic situations, you may have to do something like +

+

+   m = __import__(s)
+   for i in string.split(s, ".")[1:]:
+       m = getattr(m, i)
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 28 11:01:43 1999 by +GvR +

+ +


+

4.86. Basic thread wisdom

+Please note that there is no way to take advantage of +multiprocessor hardware using the Python thread model. The interpreter +uses a global interpreter lock (GIL), +which does not allow multiple threads to be concurrently active. +

+If you write a simple test program like this: +

+

+  import thread
+  def run(name, n):
+      for i in range(n): print name, i
+  for i in range(10):
+      thread.start_new(run, (i, 100))
+
+none of the threads seem to run! The reason is that as soon as +the main thread exits, all threads are killed. +

+A simple fix is to add a sleep to the end of the program, +sufficiently long for all threads to finish: +

+

+  import thread, time
+  def run(name, n):
+      for i in range(n): print name, i
+  for i in range(10):
+      thread.start_new(run, (i, 100))
+  time.sleep(10) # <----------------------------!
+
+But now (on many platforms) the threads don't run in parallel, +but appear to run sequentially, one at a time! The reason is +that the OS thread scheduler doesn't start a new thread until +the previous thread is blocked. +

+A simple fix is to add a tiny sleep to the start of the run +function: +

+

+  import thread, time
+  def run(name, n):
+      time.sleep(0.001) # <---------------------!
+      for i in range(n): print name, i
+  for i in range(10):
+      thread.start_new(run, (i, 100))
+  time.sleep(10)
+
+Some more hints: +

+Instead of using a time.sleep() call at the end, it's +better to use some kind of semaphore mechanism. One idea is to +use a the Queue module to create a queue object, let each thread +append a token to the queue when it finishes, and let the main +thread read as many tokens from the queue as there are threads. +

+Use the threading module instead of the thread module. It's part +of Python since version 1.5.1. It takes care of all these details, +and has many other nice features too! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 16:21:55 2003 by +GvR +

+ +


+

4.87. Why doesn't closing sys.stdout (stdin, stderr) really close it?

+Python file objects are a high-level layer of abstraction on top of C streams, which in turn are a medium-level layer of abstraction on top of (among other things) low-level C file descriptors. +

+For most file objects f you create in Python via the builtin "open" function, f.close() marks the Python file object as being closed from Python's point of view, and also arranges to close the underlying C stream. This happens automatically too, in f's destructor, when f becomes garbage. +

+But stdin, stdout and stderr are treated specially by Python, because of the special status also given to them by C: doing +

+

+    sys.stdout.close() # ditto for stdin and stderr
+
+marks the Python-level file object as being closed, but does not close the associated C stream (provided sys.stdout is still bound to its default value, which is the stream C also calls "stdout"). +

+To close the underlying C stream for one of these three, you should first be sure that's what you really want to do (e.g., you may confuse the heck out of extension modules trying to do I/O). If it is, use os.close: +

+

+    os.close(0)   # close C's stdin stream
+    os.close(1)   # close C's stdout stream
+    os.close(2)   # close C's stderr stream
+
+

+ +Edit this entry / +Log info + +/ Last changed on Sat Apr 17 02:22:35 1999 by +Tim Peters +

+ +


+

4.88. What kinds of global value mutation are thread-safe?

+[adapted from c.l.py responses by Gordon McMillan & GvR] +

+A global interpreter lock (GIL) is used internally to ensure that only one thread runs in the Python VM at a time. In general, Python offers to switch among threads only between bytecode instructions (how frequently it offers to switch can be set via sys.setcheckinterval). Each bytecode instruction-- and all the C implementation code reached from it --is therefore atomic. +

+In theory, this means an exact accounting requires an exact understanding of the PVM bytecode implementation. In practice, it means that operations on shared vrbls of builtin data types (ints, lists, dicts, etc) that "look atomic" really are. +

+For example, these are atomic (L, L1, L2 are lists, D, D1, D2 are dicts, x, y +are objects, i, j are ints): +

+

+    L.append(x)
+    L1.extend(L2)
+    x = L[i]
+    x = L.pop()
+    L1[i:j] = L2
+    L.sort()
+    x = y
+    x.field = y
+    D[x] = y
+    D1.update(D2)
+    D.keys()
+
+These aren't: +

+

+    i = i+1
+    L.append(L[-1])
+    L[i] = L[j]
+    D[x] = D[x] + 1
+
+Note: operations that replace other objects may invoke those other objects' __del__ method when their reference count reaches zero, and that can affect things. This is especially true for the mass updates to dictionaries and lists. When in doubt, use a mutex! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 16:21:03 2003 by +GvR +

+ +


+

4.89. How do I modify a string in place?

+Strings are immutable (see question 6.2) so you cannot modify a string +directly. If you need an object with this ability, try converting the +string to a list or take a look at the array module. +

+

+    >>> s = "Hello, world"
+    >>> a = list(s)
+    >>> print a
+    ['H', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd']
+    >>> a[7:] = list("there!")
+    >>> import string
+    >>> print string.join(a, '')
+    'Hello, there!'
+
+
+    >>> import array
+    >>> a = array.array('c', s)
+    >>> print a
+    array('c', 'Hello, world')
+    >>> a[0] = 'y' ; print a
+    array('c', 'yello world')
+    >>> a.tostring()
+    'yello, world'
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue May 18 01:22:47 1999 by +Andrew Dalke +

+ +


+

4.90. How to pass on keyword/optional parameters/arguments

+Q: How can I pass on optional or keyword parameters from one function to another? +

+

+	def f1(a, *b, **c):
+		...
+
+A: In Python 2.0 and above: +

+

+	def f2(x, *y, **z):
+		...
+		z['width']='14.3c'
+		...
+		f1(x, *y, **z)
+
+
+   Note: y can be any sequence (e.g., list or tuple) and z must be a dict.
+
+

+A: For versions prior to 2.0, use 'apply', like: +

+

+	def f2(x, *y, **z):
+		...
+		z['width']='14.3c'
+		...
+		apply(f1, (x,)+y, z)
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 07:20:56 2002 by +Matthias Urlichs +

+ +


+

4.91. How can I get a dictionary to display its keys in a consistent order?

+In general, dictionaries store their keys in an unpredictable order, +so the display order of a dictionary's elements will be similarly +unpredictable. +(See +Question 6.12 +to understand why this is so.) +

+This can be frustrating if you want to save a printable version to a +file, make some changes and then compare it with some other printed +dictionary. If you have such needs you can subclass UserDict.UserDict +to create a SortedDict class that prints itself in a predictable order. +Here's one simpleminded implementation of such a class: +

+

+  import UserDict, string
+
+
+  class SortedDict(UserDict.UserDict):
+    def __repr__(self):
+      result = []
+      append = result.append
+      keys = self.data.keys()
+      keys.sort()
+      for k in keys:
+        append("%s: %s" % (`k`, `self.data[k]`))
+      return "{%s}" % string.join(result, ", ")
+
+
+    ___str__ = __repr__
+
+

+This will work for many common situations you might encounter, though +it's far from a perfect solution. (It won't have any effect on the +pprint module and does not transparently handle values that are or +contain dictionaries. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Sep 16 17:31:06 1999 by +Skip Montanaro +

+ +


+

4.92. Is there a Python tutorial?

+Yes. See question 1.20 at +http://www.python.org/doc/FAQ.html#1.20 +

+ +Edit this entry / +Log info + +/ Last changed on Sat Dec 4 16:04:00 1999 by +TAB +

+ +


+

4.93. Deleted

+See 4.28 +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 28 20:40:37 2002 by +GvR +

+ +


+

4.94. How do I get a single keypress without blocking?

+There are several solutions; some involve using curses, which is a +pretty big thing to learn. Here's a solution without curses. (see also 4.74, for Windows, see question 8.2) +

+

+  import termios, fcntl, sys, os
+  fd = sys.stdin.fileno()
+
+
+  oldterm = termios.tcgetattr(fd)
+  newattr = termios.tcgetattr(fd)
+  newattr[3] = newattr[3] & ~termios.ICANON & ~termios.ECHO
+  termios.tcsetattr(fd, termios.TCSANOW, newattr)
+
+
+  oldflags = fcntl.fcntl(fd, fcntl.F_GETFL)
+  fcntl.fcntl(fd, fcntl.F_SETFL, oldflags | os.O_NONBLOCK)
+
+
+  try:
+      while 1:
+          try:
+              c = sys.stdin.read(1)
+              print "Got character", `c`
+          except IOError: pass
+  finally:
+      termios.tcsetattr(fd, termios.TCSAFLUSH, oldterm)
+      fcntl.fcntl(fd, fcntl.F_SETFL, oldflags)
+
+

+You need the termios and the fcntl module for any of this to work, +and I've only tried it on Linux, though it should work elsewhere. +

+In this code, characters are read and printed one at a time. +

+termios.tcsetattr() turns off stdin's echoing and disables canonical +mode. fcntl.fnctl() is used to obtain stdin's file descriptor flags +and modify them for non-blocking mode. Since reading stdin when it is +empty results in an IOError, this error is caught and ignored. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Oct 24 00:39:06 2002 by +chris +

+ +


+

4.95. Is there an equivalent to Perl chomp()? (Remove trailing newline from string)

+There are two partial substitutes. If you want to remove all trailing +whitespace, use the method string.rstrip(). Otherwise, if there is only +one line in the string, use string.splitlines()[0]. +

+

+ -----------------------------------------------------------------------
+
+
+ rstrip() is too greedy, it strips all trailing white spaces.
+ splitlines() takes ControlM as line boundary.
+ Consider these strings as input:
+   "python python    \r\n"
+   "python\rpython\r\n"
+   "python python   \r\r\r\n"
+ The results from rstrip()/splitlines() are perhaps not what we want.
+
+
+ It seems re can perform this task.
+
+

+

+ #!/usr/bin/python 
+ # requires python2                                                             
+
+
+ import re, os, StringIO
+
+
+ lines=StringIO.StringIO(
+   "The Python Programming Language\r\n"
+   "The Python Programming Language \r \r \r\r\n"
+   "The\rProgramming\rLanguage\r\n"
+   "The\rProgramming\rLanguage\r\r\r\r\n"
+   "The\r\rProgramming\r\rLanguage\r\r\r\r\n"
+ )
+
+
+ ln=re.compile("(?:[\r]?\n|\r)$") # dos:\r\n, unix:\n, mac:\r, others: unknown
+ # os.linesep does not work if someone ftps(in binary mode) a dos/mac text file
+ # to your unix box
+ #ln=re.compile(os.linesep + "$")
+
+
+ while 1:
+   s=lines.readline()
+   if not s: break
+   print "1.(%s)" % `s.rstrip()`
+   print "2.(%s)" % `ln.sub( "", s, 1)`
+   print "3.(%s)" % `s.splitlines()[0]`
+   print "4.(%s)" % `s.splitlines()`
+   print
+
+
+ lines.close()
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 8 09:51:34 2001 by +Crystal +

+ +


+

4.96. Why is join() a string method when I'm really joining the elements of a (list, tuple, sequence)?

+Strings became much more like other standard types starting in release 1.6, when methods were added which give the same functionality that has always been available using the functions of the string module. These new methods have been widely accepted, but the one which appears to make (some) programmers feel uncomfortable is: +

+

+    ", ".join(['1', '2', '4', '8', '16'])
+
+which gives the result +

+

+    "1, 2, 4, 8, 16"
+
+There are two usual arguments against this usage. +

+The first runs along the lines of: "It looks really ugly using a method of a string literal (string constant)", to which the answer is that it might, but a string literal is just a fixed value. If the methods are to be allowed on names bound to strings there is no logical reason to make them unavailable on literals. Get over it! +

+The second objection is typically cast as: "I am really telling a sequence to join its members together with a string constant". Sadly, you aren't. For some reason there seems to be much less difficulty with having split() as a string method, since in that case it is easy to see that +

+

+    "1, 2, 4, 8, 16".split(", ")
+
+is an instruction to a string literal to return the substrings delimited by the given separator (or, by default, arbitrary runs of white space). In this case a Unicode string returns a list of Unicode strings, an ASCII string returns a list of ASCII strings, and everyone is happy. +

+join() is a string method because in using it you are telling the separator string to iterate over an arbitrary sequence, forming string representations of each of the elements, and inserting itself between the elements' representations. This method can be used with any argument which obeys the rules for sequence objects, inluding any new classes you might define yourself. +

+Because this is a string method it can work for Unicode strings as well as plain ASCII strings. If join() were a method of the sequence types then the sequence types would have to decide which type of string to return depending on the type of the separator. +

+If none of these arguments persuade you, then for the moment you can continue to use the join() function from the string module, which allows you to write +

+

+    string.join(['1', '2', '4', '8', '16'], ", ")
+
+You will just have to try and forget that the string module actually uses the syntax you are compaining about to implement the syntax you prefer! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 2 15:51:58 2002 by +Steve Holden +

+ +


+

4.97. How can my code discover the name of an object?

+Generally speaking, it can't, because objects don't really have names. The assignment statement does not store the assigned value in the name but a reference to it. Essentially, assignment creates a binding of a name to a value. The same is true of def and class statements, but in that case the value is a callable. Consider the following code: +

+

+    class A:
+        pass
+
+
+    B = A
+
+
+    a = B()
+    b = a
+    print b
+    <__main__.A instance at 016D07CC>
+    print a
+    <__main__.A instance at 016D07CC>
+
+

+Arguably the class has a name: even though it is bound to two names and invoked through the name B the created instance is still reported as an instance of class A. However, it is impossible to say whether the instance's name is a or b, since both names are bound to the same value. +

+Generally speaking it should not be necessary for your code to "know the names" of particular values. Unless you are deliberately writing introspective programs, this is usually an indication that a change of approach might be beneficial. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 8 03:53:39 2001 by +Steve Holden +

+ +


+

4.98. Why are floating point calculations so inaccurate?

+The development version of the Python Tutorial now contains an Appendix with more info: +
+    http://www.python.org/doc/current/tut/node14.html
+
+People are often very surprised by results like this: +

+

+ >>> 1.2-1.0
+ 0.199999999999999996
+
+And think it is a bug in Python. It's not. It's a problem caused by +the internal representation of a floating point number. A floating point +number is stored as a fixed number of binary digits. +

+In decimal math, there are many numbers that can't be represented +with a fixed number of decimal digits, i.e. +1/3 = 0.3333333333....... +

+In the binary case, 1/2 = 0.1, 1/4 = 0.01, 1/8 = 0.001, etc. There are +a lot of numbers that can't be represented. The digits are cut off at +some point. +

+Since Python 1.6, a floating point's repr() function prints as many +digits are necessary to make eval(repr(f)) == f true for any float f. +The str() function prints the more sensible number that was probably +intended: +

+

+ >>> 0.2
+ 0.20000000000000001
+ >>> print 0.2
+ 0.2
+
+Again, this has nothing to do with Python, but with the way the +underlying C platform handles floating points, and ultimately with +the inaccuracy you'll always have when writing down numbers of fixed +number of digit strings. +

+One of the consequences of this is that it is dangerous to compare +the result of some computation to a float with == ! +Tiny inaccuracies may mean that == fails. +

+Instead try something like this: +

+

+ epsilon = 0.0000000000001 # Tiny allowed error
+ expected_result = 0.4
+
+
+ if expected_result-epsilon <= computation() <= expected_result+epsilon:
+    ...
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 1 22:18:47 2002 by +Fred Drake +

+ +


+

4.99. I tried to open Berkeley DB file, but bsddb produces bsddb.error: (22, 'Invalid argument'). Help! How can I restore my data?

+Don't panic! Your data are probably intact. The most frequent cause +for the error is that you tried to open an earlier Berkeley DB file +with a later version of the Berkeley DB library. +

+Many Linux systems now have all three versions of Berkeley DB +available. If you are migrating from version 1 to a newer version use +db_dump185 to dump a plain text version of the database. +If you are migrating from version 2 to version 3 use db2_dump to create +a plain text version of the database. In either case, use db_load to +create a new native database for the latest version installed on your +computer. If you have version 3 of Berkeley DB installed, you should +be able to use db2_load to create a native version 2 database. +

+You should probably move away from Berkeley DB version 1 files because +the hash file code contains known bugs that can corrupt your data. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 29 16:04:29 2001 by +Skip Montanaro +

+ +


+

4.100. What are the "best practices" for using import in a module?

+First, the standard modules are great. Use them! The standard Python library is large and varied. Using modules can save you time and effort and will reduce maintainenance cost of your code. (Other programs are dedicated to supporting and fixing bugs in the standard Python modules. Coworkers may also be familiar with themodules that you use, reducing the amount of time it takes them to understand your code.) +

+The rest of this answer is largely a matter of personal preference, but here's what some newsgroup posters said (thanks to all who responded) +

+In general, don't use +

+ from modulename import *
+
+Doing so clutters the importer's namespace. Some avoid this idiom even with the few modules that were designed to be imported in this manner. (Modules designed in this manner include Tkinter, thread, and wxPython.) +

+Import modules at the top of a file, one module per line. Doing so makes it clear what other modules your code requires and avoids questions of whether the module name is in scope. Using one import per line makes it easy to add and delete module imports. +

+Move imports into a local scope (such as at the top of a function definition) if there are a lot of imports, and you're trying to avoid the cost (lots of initialization time) of many imports. This technique is especially helpful if many of the imports are unnecessary depending on how the program executes. You may also want to move imports into a function if the modules are only ever used in that function. Note that loading a module the first time may be expensive (because of the one time initialization of the module) but that loading a module multiple times is virtually free (a couple of dictionary lookups). Even if the module name has gone out of scope, the module is probably available in sys.modules. Thus, there isn't really anything wrong with putting no imports at the module level (if they aren't needed) and putting all of the imports at the function level. +

+It is sometimes necessary to move imports to a function or class to avoid problems with circular imports. Gordon says: +

+ Circular imports are fine where both modules use the "import <module>"
+ form of import. They fail when the 2nd module wants to grab a name
+ out of the first ("from module import name") and the import is at
+ the top level. That's because names in the 1st are not yet available,
+ (the first module is busy importing the 2nd).  
+
+In this case, if the 2nd module is only used in one function, then the import can easily be moved into that function. By the time the import is called, the first module will have finished initializing, and the second module can do its import. +

+It may also be necessary to move imports out of the top level of code +if some of the modules are platform-specific. In that case, it may not even be possible to import all of the modules at the top of the file. In this case, importing the correct modules in the corresponding platform-specific code is a good option. +

+If only instances of a specific class uses a module, then it is reasonable to import the module in the class's __init__ method and then assign the module to an instance variable so that the module is always available (via that instance variable) during the life of the object. Note that to delay an import until the class is instantiated, the import must be inside a method. Putting the import inside the class but outside of any method still causes the import to occur when the module is initialized. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Aug 4 04:44:47 2001 by +TAB +

+ +


+

4.101. Is there a tool to help find bugs or perform static analysis?

+Yes. PyChecker is a static analysis tool for finding bugs +in Python source code as well as warning about code complexity +and style. +

+You can get PyChecker from: http://pychecker.sf.net. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 10 15:42:11 2001 by +Neal +

+ +


+

4.102. UnicodeError: ASCII [decoding,encoding] error: ordinal not in range(128)

+This error indicates that your Python installation can handle +only 7-bit ASCII strings. There are a couple ways to fix or +workaround the problem. +

+If your programs must handle data in arbitary character set encodings, the environment the application runs in will generally identify the encoding of the data it is handing you. You need to convert the input to Unicode data using that encoding. For instance, a program that handles email or web input will typically find character set encoding information in Content-Type headers. This can then be used to properly convert input data to Unicode. Assuming the string referred to by "value" is encoded as UTF-8: +

+

+    value = unicode(value, "utf-8")
+
+will return a Unicode object. If the data is not correctly encoded as UTF-8, the above call will raise a UnicodeError. +

+If you only want strings coverted to Unicode which have non-ASCII data, you can try converting them first assuming an ASCII encoding, and then generate Unicode objects if that fails: +

+

+    try:
+        x = unicode(value, "ascii")
+    except UnicodeError:
+        value = unicode(value, "utf-8")
+    else:
+        # value was valid ASCII data
+        pass
+
+

+If you normally use a character set encoding other than US-ASCII and only need to handle data in that encoding, the simplest way to fix the problem may be simply to set the encoding in sitecustomize.py. The following code is just a modified version of the encoding setup code from site.py with the relevant lines uncommented. +

+

+    # Set the string encoding used by the Unicode implementation.
+    # The default is 'ascii'
+    encoding = "ascii" # <= CHANGE THIS if you wish
+
+
+    # Enable to support locale aware default string encodings.
+    import locale
+    loc = locale.getdefaultlocale()
+    if loc[1]:
+        encoding = loc[1]
+    if encoding != "ascii":
+        import sys
+        sys.setdefaultencoding(encoding)
+
+

+Also note that on Windows, there is an encoding known as "mbcs", which uses an encoding specific to your current locale. In many cases, and particularly when working with COM, this may be an appropriate default encoding to use. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Apr 13 04:45:41 2002 by +Skip Montanaro +

+ +


+

4.103. Using strings to call functions/methods

+There are various techniques: +

+* Use a dictionary pre-loaded with strings and functions. The primary +advantage of this technique is that the strings do not need to match the +names of the functions. This is also the primary technique used to +emulate a case construct: +

+

+    def a():
+        pass
+
+
+    def b():
+        pass
+
+
+    dispatch = {'go': a, 'stop': b}  # Note lack of parens for funcs
+
+
+    dispatch[get_input()]()  # Note trailing parens to call function
+
+* Use the built-in function getattr(): +

+

+    import foo
+    getattr(foo, 'bar')()
+
+Note that getattr() works on any object, including classes, class +instances, modules, and so on. +

+This is used in several places in the standard library, like +this: +

+

+    class Foo:
+        def do_foo(self):
+            ...
+
+
+        def do_bar(self):
+            ...
+
+
+     f = getattr(foo_instance, 'do_' + opname)
+     f()
+
+

+* Use locals() or eval() to resolve the function name: +

+def myFunc(): +

+    print "hello"
+
+fname = "myFunc" +

+f = locals()[fname] +f() +

+f = eval(fname) +f() +

+Note: Using eval() can be dangerous. If you don't have absolute control +over the contents of the string, all sorts of things could happen... +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 08:14:58 2002 by +Erno Kuusela +

+ +


+

4.104. How fast are exceptions?

+A try/except block is extremely efficient. Actually executing an +exception is expensive. In older versions of Python (prior to 2.0), it +was common to code this idiom: +

+

+    try:
+        value = dict[key]
+    except KeyError:
+        dict[key] = getvalue(key)
+        value = dict[key]
+
+This idiom only made sense when you expected the dict to have the key +95% of the time or more; other times, you coded it like this: +

+

+    if dict.has_key(key):
+        value = dict[key]
+    else:
+        dict[key] = getvalue(key)
+        value = dict[key]
+
+In Python 2.0 and higher, of course, you can code this as +

+

+    value = dict.setdefault(key, getvalue(key))
+
+However this evaluates getvalue(key) always, regardless of whether it's needed or not. So if it's slow or has a side effect you should use one of the above variants. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 9 10:12:30 2002 by +Yeti +

+ +


+

4.105. Sharing global variables across modules

+The canonical way to share information across modules within a single +program is to create a special module (often called config or cfg). +Just import the config module in all modules of your application; the +module then becomes available as a global name. Because there is only +one instance of each module, any changes made to the module object get +reflected everywhere. For example: +

+config.py: +

+

+    pass
+
+mod.py: +

+

+    import config
+    config.x = 1
+
+main.py: +

+

+    import config
+    import mod
+    print config.x
+
+Note that using a module is also the basis for implementing the +Singleton design pattern, for the same reason. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Apr 23 23:07:19 2002 by +Aahz +

+ +


+

4.106. Why is cPickle so slow?

+Use the binary option. We'd like to make that the default, but it would +break backward compatibility: +

+

+    largeString = 'z' * (100 * 1024)
+    myPickle = cPickle.dumps(largeString, 1)
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Aug 22 19:54:25 2002 by +Aahz +

+ +


+

4.107. When importing module XXX, why do I get "undefined symbol: PyUnicodeUCS2_..." ?

+You are using a version of Python that uses a 4-byte representation for +Unicode characters, but the extension module you are importing (possibly +indirectly) was compiled using a Python that uses a 2-byte representation +for Unicode characters (the default). +

+If instead the name of the undefined symbol starts with PyUnicodeUCS4_, +the problem is the same by the relationship is reversed: Python was +built using 2-byte Unicode characters, and the extension module was +compiled using a Python with 4-byte Unicode characters. +

+This can easily occur when using pre-built extension packages. RedHat +Linux 7.x, in particular, provides a "python2" binary that is compiled +with 4-byte Unicode. This only causes the link failure if the extension +uses any of the PyUnicode_*() functions. It is also a problem if if an +extension uses any of the Unicode-related format specifiers for +Py_BuildValue (or similar) or parameter-specifications for +PyArg_ParseTuple(). +

+You can check the size of the Unicode character a Python interpreter is +using by checking the value of sys.maxunicode: +

+

+  >>> import sys
+  >>> if sys.maxunicode > 65535:
+  ...     print 'UCS4 build'
+  ... else:
+  ...     print 'UCS2 build'
+
+The only way to solve this problem is to use extension modules compiled +with a Python binary built using the same size for Unicode characters. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Aug 27 15:00:17 2002 by +Fred Drake +

+ +


+

4.108. How do I create a .pyc file?

+QUESTION: +

+I have a module and I wish to generate a .pyc file. +How do I do it? Everything I read says that generation of a .pyc file is +"automatic", but I'm not getting anywhere. +

+

+ANSWER: +

+When a module is imported for the first time (or when the source is more +recent than the current compiled file) a .pyc file containing the compiled code should be created in the +same directory as the .py file. +

+One reason that a .pyc file may not be created is permissions problems with the directory. This can happen, for example, if you develop as one user but run as another, such as if you are testing with a web server. +

+However, in most cases, that's not the problem. +

+Creation of a .pyc file is "automatic" if you are importing a module and Python has the +ability (permissions, free space, etc...) to write the compiled module +back to the directory. But note that running Python on a top level script is not considered an +import and so no .pyc will be created automatically. For example, if you have a top-level module abc.py that imports another module xyz.py, when you run abc, xyz.pyc will be created since xyz is imported, but no abc.pyc file will be created since abc isn't imported. +

+If you need to create abc.pyc -- that is, to create a .pyc file for a +module that is not imported -- you can. (Look up +the py_compile and compileall modules in the Library Reference.) +

+You can manually compile any module using the "py_compile" module. One +way is to use the compile() function in that module interactively: +

+

+    >>> import py_compile
+    >>> py_compile.compile('abc.py')
+
+This will write the .pyc to the same location as abc.py (or you +can override that with the optional parameter cfile). +

+You can also automatically compile all files in a directory or +directories using the "compileall" module, which can also be run +straight from the command line. +

+You can do it from the shell (or DOS) prompt by entering: +

+       python compile.py abc.py
+
+or +
+       python compile.py *
+
+Or you can write a script to do it on a list of filenames that you enter. +

+

+     import sys
+     from py_compile import compile
+
+
+     if len(sys.argv) <= 1:
+        sys.exit(1)
+
+
+     for file in sys.argv[1:]:
+        compile(file)
+
+ACKNOWLEDGMENTS: +

+Steve Holden, David Bolen, Rich Somerfield, Oleg Broytmann, Steve Ferg +

+ +Edit this entry / +Log info + +/ Last changed on Wed Feb 12 15:58:25 2003 by +Stephen Ferg +

+ +


+

5. Extending Python

+ +
+

5.1. Can I create my own functions in C?

+Yes, you can create built-in modules containing functions, +variables, exceptions and even new types in C. This is explained in +the document "Extending and Embedding the Python Interpreter" (http://www.python.org/doc/current/ext/ext.html). Also read the chapter +on dynamic loading. +

+There's more information on this in each of the Python books: +Programming Python, Internet Programming with Python, and Das Python-Buch +(in German). +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 10 05:18:57 2001 by +Fred L. Drake, Jr. +

+ +


+

5.2. Can I create my own functions in C++?

+Yes, using the C-compatibility features found in C++. Basically +you place extern "C" { ... } around the Python include files and put +extern "C" before each function that is going to be called by the +Python interpreter. Global or static C++ objects with constructors +are probably not a good idea. +

+ +Edit this entry / +Log info +

+ +


+

5.3. How can I execute arbitrary Python statements from C?

+The highest-level function to do this is PyRun_SimpleString() which takes +a single string argument which is executed in the context of module +__main__ and returns 0 for success and -1 when an exception occurred +(including SyntaxError). If you want more control, use PyRun_String(); +see the source for PyRun_SimpleString() in Python/pythonrun.c. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 20:08:14 1997 by +Bill Tutt +

+ +


+

5.4. How can I evaluate an arbitrary Python expression from C?

+Call the function PyRun_String() from the previous question with the +start symbol eval_input (Py_eval_input starting with 1.5a1); it +parses an expression, evaluates it and returns its value. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 22:23:18 1997 by +David Ascher +

+ +


+

5.5. How do I extract C values from a Python object?

+That depends on the object's type. If it's a tuple, +PyTupleSize(o) returns its length and PyTuple_GetItem(o, i) +returns its i'th item; similar for lists with PyListSize(o) +and PyList_GetItem(o, i). For strings, PyString_Size(o) returns +its length and PyString_AsString(o) a pointer to its value +(note that Python strings may contain null bytes so strlen() +is not safe). To test which type an object is, first make sure +it isn't NULL, and then use PyString_Check(o), PyTuple_Check(o), +PyList_Check(o), etc. +

+There is also a high-level API to Python objects which is +provided by the so-called 'abstract' interface -- read +Include/abstract.h for further details. It allows for example +interfacing with any kind of Python sequence (e.g. lists and tuples) +using calls like PySequence_Length(), PySequence_GetItem(), etc.) +as well as many other useful protocols. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 22:34:20 1997 by +David Ascher +

+ +


+

5.6. How do I use Py_BuildValue() to create a tuple of arbitrary length?

+You can't. Use t = PyTuple_New(n) instead, and fill it with +objects using PyTuple_SetItem(t, i, o) -- note that this "eats" a +reference count of o. Similar for lists with PyList_New(n) and +PyList_SetItem(l, i, o). Note that you must set all the tuple items to +some value before you pass the tuple to Python code -- +PyTuple_New(n) initializes them to NULL, which isn't a valid Python +value. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 31 18:15:29 1997 by +Guido van Rossum +

+ +


+

5.7. How do I call an object's method from C?

+The PyObject_CallMethod() function can be used to call an arbitrary +method of an object. The parameters are the object, the name of the +method to call, a format string like that used with Py_BuildValue(), and the argument values: +

+

+    PyObject *
+    PyObject_CallMethod(PyObject *object, char *method_name,
+                        char *arg_format, ...);
+
+This works for any object that has methods -- whether built-in or +user-defined. You are responsible for eventually DECREF'ing the +return value. +

+To call, e.g., a file object's "seek" method with arguments 10, 0 +(assuming the file object pointer is "f"): +

+

+        res = PyObject_CallMethod(f, "seek", "(ii)", 10, 0);
+        if (res == NULL) {
+                ... an exception occurred ...
+        }
+        else {
+                Py_DECREF(res);
+        }
+
+Note that since PyObject_CallObject() always wants a tuple for the +argument list, to call a function without arguments, pass "()" for the +format, and to call a function with one argument, surround the argument +in parentheses, e.g. "(i)". +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 6 16:15:46 2002 by +Neal Norwitz +

+ +


+

5.8. How do I catch the output from PyErr_Print() (or anything that prints to stdout/stderr)?

+(Due to Mark Hammond): +

+In Python code, define an object that supports the "write()" method. +Redirect sys.stdout and sys.stderr to this object. +Call print_error, or just allow the standard traceback mechanism to +work. Then, the output will go wherever your write() method sends it. +

+The easiest way to do this is to use the StringIO class in the standard +library. +

+Sample code and use for catching stdout: +

+	>>> class StdoutCatcher:
+	...  def __init__(self):
+	...   self.data = ''
+	...  def write(self, stuff):
+	...   self.data = self.data + stuff
+	...  
+	>>> import sys
+	>>> sys.stdout = StdoutCatcher()
+	>>> print 'foo'
+	>>> print 'hello world!'
+	>>> sys.stderr.write(sys.stdout.data)
+	foo
+	hello world!
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Dec 16 18:34:25 1998 by +Richard Jones +

+ +


+

5.9. How do I access a module written in Python from C?

+You can get a pointer to the module object as follows: +

+

+        module = PyImport_ImportModule("<modulename>");
+
+If the module hasn't been imported yet (i.e. it is not yet present in +sys.modules), this initializes the module; otherwise it simply returns +the value of sys.modules["<modulename>"]. Note that it doesn't enter +the module into any namespace -- it only ensures it has been +initialized and is stored in sys.modules. +

+You can then access the module's attributes (i.e. any name defined in +the module) as follows: +

+

+        attr = PyObject_GetAttrString(module, "<attrname>");
+
+Calling PyObject_SetAttrString(), to assign to variables in the module, also works. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 22:56:40 1997 by +david ascher +

+ +


+

5.10. How do I interface to C++ objects from Python?

+Depending on your requirements, there are many approaches. To do +this manually, begin by reading the "Extending and Embedding" document +(Doc/ext.tex, see also http://www.python.org/doc/). Realize +that for the Python run-time system, there isn't a whole lot of +difference between C and C++ -- so the strategy to build a new Python +type around a C structure (pointer) type will also work for C++ +objects. +

+A useful automated approach (which also works for C) is SWIG: +http://www.swig.org/. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Oct 15 05:14:01 1999 by +Sjoerd Mullender +

+ +


+

5.11. mSQLmodule (or other old module) won't build with Python 1.5 (or later)

+Since python-1.4 "Python.h" will have the file includes needed in an +extension module. +Backward compatibility is dropped after version 1.4 and therefore +mSQLmodule.c will not build as "allobjects.h" cannot be found. +The following change in mSQLmodule.c is harmless when building it with +1.4 and necessary when doing so for later python versions: +

+Remove lines: +

+

+	#include "allobjects.h"
+	#include "modsupport.h"
+
+And insert instead: +

+

+	#include "Python.h"
+
+You may also need to add +

+

+                #include "rename2.h"
+
+if the module uses "old names". +

+This may happen with other ancient python modules as well, +and the same fix applies. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Dec 21 02:03:35 1997 by +GvR +

+ +


+

5.12. I added a module using the Setup file and the make fails! Huh?

+Setup must end in a newline, if there is no newline there it gets +very sad. Aside from this possibility, maybe you have other +non-Python-specific linkage problems. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jun 24 15:54:01 1997 by +aaron watters +

+ +


+

5.13. I want to compile a Python module on my Red Hat Linux system, but some files are missing.

+Red Hat's RPM for Python doesn't include the +/usr/lib/python1.x/config/ directory, which contains various files required +for compiling Python extensions. +Install the python-devel RPM to get the necessary files. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 26 13:44:04 1999 by +A.M. Kuchling +

+ +


+

5.14. What does "SystemError: _PyImport_FixupExtension: module yourmodule not loaded" mean?

+This means that you have created an extension module named "yourmodule", but your module init function does not initialize with that name. +

+Every module init function will have a line similar to: +

+

+  module = Py_InitModule("yourmodule", yourmodule_functions);
+
+If the string passed to this function is not the same name as your extenion module, the SystemError will be raised. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 25 07:16:08 1999 by +Mark Hammond +

+ +


+

5.15. How to tell "incomplete input" from "invalid input"?

+Sometimes you want to emulate the Python interactive interpreter's +behavior, where it gives you a continuation prompt when the input +is incomplete (e.g. you typed the start of an "if" statement +or you didn't close your parentheses or triple string quotes), +but it gives you a syntax error message immediately when the input +is invalid. +

+In Python you can use the codeop module, which approximates the +parser's behavior sufficiently. IDLE uses this, for example. +

+The easiest way to do it in C is to call PyRun_InteractiveLoop() +(in a separate thread maybe) and let the Python interpreter handle +the input for you. You can also set the PyOS_ReadlineFunctionPointer +to point at your custom input function. See Modules/readline.c and +Parser/myreadline.c for more hints. +

+However sometimes you have to run the embedded Python interpreter +in the same thread as your rest application and you can't allow the +PyRun_InteractiveLoop() to stop while waiting for user input. +The one solution then is to call PyParser_ParseString() +and test for e.error equal to E_EOF (then the input is incomplete). +Sample code fragment, untested, inspired by code from Alex Farber: +

+

+  #include <Python.h>
+  #include <node.h>
+  #include <errcode.h>
+  #include <grammar.h>
+  #include <parsetok.h>
+  #include <compile.h>
+
+
+  int testcomplete(char *code)
+    /* code should end in \n */
+    /* return -1 for error, 0 for incomplete, 1 for complete */
+  {
+    node *n;
+    perrdetail e;
+
+
+    n = PyParser_ParseString(code, &_PyParser_Grammar,
+                             Py_file_input, &e);
+    if (n == NULL) {
+      if (e.error == E_EOF) 
+        return 0;
+      return -1;
+    }
+
+
+    PyNode_Free(n);
+    return 1;
+  }
+
+Another solution is trying to compile the received string with +Py_CompileString(). If it compiles fine - try to execute the returned +code object by calling PyEval_EvalCode(). Otherwise save the input for +later. If the compilation fails, find out if it's an error or just +more input is required - by extracting the message string from the +exception tuple and comparing it to the "unexpected EOF while parsing". +Here is a complete example using the GNU readline library (you may +want to ignore SIGINT while calling readline()): +

+

+  #include <stdio.h>
+  #include <readline.h>
+
+
+  #include <Python.h>
+  #include <object.h>
+  #include <compile.h>
+  #include <eval.h>
+
+
+  int main (int argc, char* argv[])
+  {
+    int i, j, done = 0;                          /* lengths of line, code */
+    char ps1[] = ">>> ";
+    char ps2[] = "... ";
+    char *prompt = ps1;
+    char *msg, *line, *code = NULL;
+    PyObject *src, *glb, *loc;
+    PyObject *exc, *val, *trb, *obj, *dum;
+
+
+    Py_Initialize ();
+    loc = PyDict_New ();
+    glb = PyDict_New ();
+    PyDict_SetItemString (glb, "__builtins__", PyEval_GetBuiltins ());
+
+
+    while (!done)
+    {
+      line = readline (prompt);
+
+
+      if (NULL == line)                          /* CTRL-D pressed */
+      {
+        done = 1;
+      }
+      else
+      {
+        i = strlen (line);
+
+
+        if (i > 0)
+          add_history (line);                    /* save non-empty lines */
+
+
+        if (NULL == code)                        /* nothing in code yet */
+          j = 0;
+        else
+          j = strlen (code);
+
+
+        code = realloc (code, i + j + 2);
+        if (NULL == code)                        /* out of memory */
+          exit (1);
+
+
+        if (0 == j)                              /* code was empty, so */
+          code[0] = '\0';                        /* keep strncat happy */
+
+
+        strncat (code, line, i);                 /* append line to code */
+        code[i + j] = '\n';                      /* append '\n' to code */
+        code[i + j + 1] = '\0';
+
+
+        src = Py_CompileString (code, "<stdin>", Py_single_input);       
+
+
+        if (NULL != src)                         /* compiled just fine - */
+        {
+          if (ps1  == prompt ||                  /* ">>> " or */
+              '\n' == code[i + j - 1])           /* "... " and double '\n' */
+          {                                               /* so execute it */
+            dum = PyEval_EvalCode ((PyCodeObject *)src, glb, loc);
+            Py_XDECREF (dum);
+            Py_XDECREF (src);
+            free (code);
+            code = NULL;
+            if (PyErr_Occurred ())
+              PyErr_Print ();
+            prompt = ps1;
+          }
+        }                                        /* syntax error or E_EOF? */
+        else if (PyErr_ExceptionMatches (PyExc_SyntaxError))           
+        {
+          PyErr_Fetch (&exc, &val, &trb);        /* clears exception! */
+
+
+          if (PyArg_ParseTuple (val, "sO", &msg, &obj) &&
+              !strcmp (msg, "unexpected EOF while parsing")) /* E_EOF */
+          {
+            Py_XDECREF (exc);
+            Py_XDECREF (val);
+            Py_XDECREF (trb);
+            prompt = ps2;
+          }
+          else                                   /* some other syntax error */
+          {
+            PyErr_Restore (exc, val, trb);
+            PyErr_Print ();
+            free (code);
+            code = NULL;
+            prompt = ps1;
+          }
+        }
+        else                                     /* some non-syntax error */
+        {
+          PyErr_Print ();
+          free (code);
+          code = NULL;
+          prompt = ps1;
+        }
+
+
+        free (line);
+      }
+    }
+
+
+    Py_XDECREF(glb);
+    Py_XDECREF(loc);
+    Py_Finalize();
+    exit(0);
+  }
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Mar 15 09:47:24 2000 by +Alex Farber +

+ +


+

5.16. How do I debug an extension?

+When using gdb with dynamically loaded extensions, you can't set a +breakpoint in your extension until your extension is loaded. +

+In your .gdbinit file (or interactively), add the command +

+br _PyImport_LoadDynamicModule +

+

+$ gdb /local/bin/python +

+gdb) run myscript.py +

+gdb) continue # repeat until your extension is loaded +

+gdb) finish # so that your extension is loaded +

+gdb) br myfunction.c:50 +

+gdb) continue +

+ +Edit this entry / +Log info + +/ Last changed on Fri Oct 20 11:10:32 2000 by +Joe VanAndel +

+ +


+

5.17. How do I find undefined Linux g++ symbols, __builtin_new or __pure_virtural

+To dynamically load g++ extension modules, you must recompile python, relink python using g++ (change LINKCC in the python Modules Makefile), and link your extension module using g++ (e.g., "g++ -shared -o mymodule.so mymodule.o"). +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jan 14 18:03:51 2001 by +douglas orr +

+ +


+

5.18. How do I define and create objects corresponding to built-in/extension types

+Usually you would like to be able to inherit from a Python type when +you ask this question. The bottom line for Python 2.2 is: types and classes are miscible. You build instances by calling classes, and you can build subclasses to your heart's desire. +

+You need to be careful when instantiating immutable types like integers or strings. See http://www.amk.ca/python/2.2/, section 2, for details. +

+Prior to version 2.2, Python (like Java) insisted that there are first-class and second-class objects (the former are types, the latter classes), and never the twain shall meet. +

+The library has, however, done a good job of providing class wrappers for the more commonly desired objects (see UserDict, UserList and UserString for examples), and more are always welcome if you happen to be in the mood to write code. These wrappers still exist in Python 2.2. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 10 15:14:07 2002 by +Matthias Urlichs +

+ +


+

6. Python's design

+ +
+

6.1. Why isn't there a switch or case statement in Python?

+You can do this easily enough with a sequence of +if... elif... elif... else. There have been some proposals for switch +statement syntax, but there is no consensus (yet) on whether and how +to do range tests. +

+ +Edit this entry / +Log info +

+ +


+

6.2. Why does Python use indentation for grouping of statements?

+Basically I believe that using indentation for grouping is +extremely elegant and contributes a lot to the clarity of the average +Python program. Most people learn to love this feature after a while. +Some arguments for it: +

+Since there are no begin/end brackets there cannot be a disagreement +between grouping perceived by the parser and the human reader. I +remember long ago seeing a C fragment like this: +

+

+        if (x <= y)
+                x++;
+                y--;
+        z++;
+
+and staring a long time at it wondering why y was being decremented +even for x > y... (And I wasn't a C newbie then either.) +

+Since there are no begin/end brackets, Python is much less prone to +coding-style conflicts. In C there are loads of different ways to +place the braces (including the choice whether to place braces around +single statements in certain cases, for consistency). If you're used +to reading (and writing) code that uses one style, you will feel at +least slightly uneasy when reading (or being required to write) +another style. +Many coding styles place begin/end brackets on a line by themself. +This makes programs considerably longer and wastes valuable screen +space, making it harder to get a good overview over a program. +Ideally, a function should fit on one basic tty screen (say, 20 +lines). 20 lines of Python are worth a LOT more than 20 lines of C. +This is not solely due to the lack of begin/end brackets (the lack of +declarations also helps, and the powerful operations of course), but +it certainly helps! +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 16:00:15 1997 by +GvR +

+ +


+

6.3. Why are Python strings immutable?

+There are two advantages. One is performance: knowing that a +string is immutable makes it easy to lay it out at construction time +-- fixed and unchanging storage requirements. (This is also one of +the reasons for the distinction between tuples and lists.) The +other is that strings in Python are considered as "elemental" as +numbers. No amount of activity will change the value 8 to anything +else, and in Python, no amount of activity will change the string +"eight" to anything else. (Adapted from Jim Roskind) +

+ +Edit this entry / +Log info +

+ +


+

6.4. Delete

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 03:05:25 2001 by +Moshe Zadka +

+ +


+

6.5. Why does Python use methods for some functionality (e.g. list.index()) but functions for other (e.g. len(list))?

+The major reason is history. Functions were used for those +operations that were generic for a group of types and which +were intended to work even for objects that didn't have +methods at all (e.g. numbers before type/class unification +began, or tuples). +

+It is also convenient to have a function that can readily be applied +to an amorphous collection of objects when you use the functional features of Python (map(), apply() et al). +

+In fact, implementing len(), max(), min() as a built-in function is +actually less code than implementing them as methods for each type. +One can quibble about individual cases but it's a part of Python, +and it's too late to change such things fundamentally now. The +functions have to remain to avoid massive code breakage. +

+Note that for string operations Python has moved from external functions +(the string module) to methods. However, len() is still a function. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 30 14:08:58 2002 by +Steve Holden +

+ +


+

6.6. Why can't I derive a class from built-in types (e.g. lists or files)?

+As of Python 2.2, you can derive from built-in types. For previous versions, the answer is: +

+This is caused by the relatively late addition of (user-defined) +classes to the language -- the implementation framework doesn't easily +allow it. See the answer to question 4.2 for a work-around. This +may be fixed in the (distant) future. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 23 02:53:22 2002 by +Neal Norwitz +

+ +


+

6.7. Why must 'self' be declared and used explicitly in method definitions and calls?

+So, is your current programming language C++ or Java? :-) +When classes were added to Python, this was (again) the simplest way of +implementing methods without too many changes to the interpreter. The +idea was borrowed from Modula-3. It turns out to be very useful, for +a variety of reasons. +

+First, it makes it more obvious that you are using a method or +instance attribute instead of a local variable. Reading "self.x" or +"self.meth()" makes it absolutely clear that an instance variable or +method is used even if you don't know the class definition by heart. +In C++, you can sort of tell by the lack of a local variable +declaration (assuming globals are rare or easily recognizable) -- but +in Python, there are no local variable declarations, so you'd have to +look up the class definition to be sure. +

+Second, it means that no special syntax is necessary if you want to +explicitly reference or call the method from a particular class. In +C++, if you want to use a method from base class that is overridden in +a derived class, you have to use the :: operator -- in Python you can +write baseclass.methodname(self, <argument list>). This is +particularly useful for __init__() methods, and in general in cases +where a derived class method wants to extend the base class method of +the same name and thus has to call the base class method somehow. +

+Lastly, for instance variables, it solves a syntactic problem with +assignment: since local variables in Python are (by definition!) those +variables to which a value assigned in a function body (and that +aren't explicitly declared global), there has to be some way to tell +the interpreter that an assignment was meant to assign to an instance +variable instead of to a local variable, and it should preferably be +syntactic (for efficiency reasons). C++ does this through +declarations, but Python doesn't have declarations and it would be a +pity having to introduce them just for this purpose. Using the +explicit "self.var" solves this nicely. Similarly, for using instance +variables, having to write "self.var" means that references to +unqualified names inside a method don't have to search the instance's +directories. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jan 12 08:01:50 2001 by +Steve Holden +

+ +


+

6.8. Can't you emulate threads in the interpreter instead of relying on an OS-specific thread implementation?

+Answer 1: Unfortunately, the interpreter pushes at least one C stack +frame for each Python stack frame. Also, extensions can call back into +Python at almost random moments. Therefore a complete threads +implementation requires thread support for C. +

+Answer 2: Fortunately, there is Stackless Python, which has a completely redesigned interpreter loop that avoids the C stack. It's still experimental but looks very promising. Although it is binary compatible with standard Python, it's still unclear whether Stackless will make it into the core -- maybe it's just too revolutionary. Stackless Python currently lives here: http://www.stackless.com. A microthread implementation that uses it can be found here: http://world.std.com/~wware/uthread.html. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Apr 15 08:18:16 2000 by +Just van Rossum +

+ +


+

6.9. Why can't lambda forms contain statements?

+Python lambda forms cannot contain statements because Python's +syntactic framework can't handle statements nested inside expressions. +

+However, in Python, this is not a serious problem. Unlike lambda +forms in other languages, where they add functionality, Python lambdas +are only a shorthand notation if you're too lazy to define a function. +

+Functions are already first class objects in Python, and can be +declared in a local scope. Therefore the only advantage of using a +lambda form instead of a locally-defined function is that you don't need to invent a name for the function -- but that's just a local variable to which the function object (which is exactly the same type of object that a lambda form yields) is assigned! +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 14 14:15:17 1998 by +Tim Peters +

+ +


+

6.10. [deleted]

+[lambda vs non-nested scopes used to be here] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:20:56 2002 by +Erno Kuusela +

+ +


+

6.11. [deleted]

+[recursive functions vs non-nested scopes used to be here] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:22:04 2002 by +Erno Kuusela +

+ +


+

6.12. Why is there no more efficient way of iterating over a dictionary than first constructing the list of keys()?

+As of Python 2.2, you can now iterate over a dictionary directly, +using the new implied dictionary iterator: +

+

+    for k in d: ...
+
+There are also methods returning iterators over the values and items: +

+

+    for k in d.iterkeys(): # same as above
+    for v in d.itervalues(): # iterate over values
+    for k, v in d.iteritems(): # iterate over items
+
+All these require that you do not modify the dictionary during the loop. +

+For previous Python versions, the following defense should do: +

+Have you tried it? I bet it's fast enough for your purposes! In +most cases such a list takes only a few percent of the space occupied +by the dictionary. Apart from the fixed header, +the list needs only 4 bytes (the size of a pointer) per +key. A dictionary uses 12 bytes per key plus between 30 and 70 +percent hash table overhead, plus the space for the keys and values. +By necessity, all keys are distinct objects, and a string object (the most +common key type) costs at least 20 bytes plus the length of the +string. Add to that the values contained in the dictionary, and you +see that 4 bytes more per item really isn't that much more memory... +

+A call to dict.keys() makes one fast scan over the dictionary +(internally, the iteration function does exist) copying the pointers +to the key objects into a pre-allocated list object of the right size. +The iteration time isn't lost (since you'll have to iterate anyway -- +unless in the majority of cases your loop terminates very prematurely +(which I doubt since you're getting the keys in random order). +

+I don't expose the dictionary iteration operation to Python +programmers because the dictionary shouldn't be modified during the +entire iteration -- if it is, there's a small chance that the +dictionary is reorganized because the hash table becomes too full, and +then the iteration may miss some items and see others twice. Exactly +because this only occurs rarely, it would lead to hidden bugs in +programs: it's easy never to have it happen during test runs if you +only insert or delete a few items per iteration -- but your users will +surely hit upon it sooner or later. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:24:08 2002 by +GvR +

+ +


+

6.13. Can Python be compiled to machine code, C or some other language?

+Not easily. Python's high level data types, dynamic typing of +objects and run-time invocation of the interpreter (using eval() or +exec) together mean that a "compiled" Python program would probably +consist mostly of calls into the Python run-time system, even for +seemingly simple operations like "x+1". +

+Several projects described in the Python newsgroup or at past +Python conferences have shown that this approach is feasible, +although the speedups reached so far are only modest (e.g. 2x). +JPython uses the same strategy for compiling to Java bytecode. +(Jim Hugunin has demonstrated that in combination with whole-program +analysis, speedups of 1000x are feasible for small demo programs. +See the website for the 1997 Python conference.) +

+Internally, Python source code is always translated into a "virtual +machine code" or "byte code" representation before it is interpreted +(by the "Python virtual machine" or "bytecode interpreter"). In order +to avoid the overhead of parsing and translating modules that rarely +change over and over again, this byte code is written on a file whose +name ends in ".pyc" whenever a module is parsed (from a file whose +name ends in ".py"). When the corresponding .py file is changed, it +is parsed and translated again and the .pyc file is rewritten. +

+There is no performance difference once the .pyc file has been loaded +(the bytecode read from the .pyc file is exactly the same as the bytecode +created by direct translation). The only difference is that loading +code from a .pyc file is faster than parsing and translating a .py +file, so the presence of precompiled .pyc files will generally improve +start-up time of Python scripts. If desired, the Lib/compileall.py +module/script can be used to force creation of valid .pyc files for a +given set of modules. +

+Note that the main script executed by Python, even if its filename +ends in .py, is not compiled to a .pyc file. It is compiled to +bytecode, but the bytecode is not saved to a file. +

+If you are looking for a way to translate Python programs in order to +distribute them in binary form, without the need to distribute the +interpreter and library as well, have a look at the freeze.py script +in the Tools/freeze directory. This creates a single binary file +incorporating your program, the Python interpreter, and those parts of +the Python library that are needed by your program. Of course, the +resulting binary will only run on the same type of platform as that +used to create it. +

+Newsflash: there are now several programs that do this, to some extent. +Look for Psyco, Pyrex, PyInline, Py2Cmod, and Weave. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:26:19 2002 by +GvR +

+ +


+

6.14. How does Python manage memory?

+The details of Python memory management depend on the implementation. +The standard Python implementation (the C implementation) uses reference +counting and another mechanism to collect reference cycles. +

+Jython relies on the Java runtime; so it uses +the JVM's garbage collector. This difference can cause some subtle +porting problems if your Python code depends on the behavior of +the reference counting implementation. +

+The reference cycle collector was added in CPython 2.0. It +periodically executes a cycle detection algorithm which looks for inaccessible cycles and deletes the objects involved. A new gc module provides functions to perform a garbage collection, obtain debugging statistics, and tuning the collector's parameters. +

+The detection of cycles can be disabled when Python is compiled, if you can't afford even a tiny speed penalty or suspect that the cycle collection is buggy, by specifying the "--without-cycle-gc" switch when running the configure script. +

+Sometimes objects get stuck in "tracebacks" temporarily and hence are not deallocated when you might expect. Clear the tracebacks via +

+

+       import sys
+       sys.exc_traceback = sys.last_traceback = None
+
+Tracebacks are used for reporting errors and implementing debuggers and related things. They contain a portion of the program state extracted during the handling of an exception (usually the most recent exception). +

+In the absence of circularities and modulo tracebacks, Python programs need not explicitly manage memory. +

+Why python doesn't use a more traditional garbage collection +scheme? For one thing, unless this were +added to C as a standard feature, it's a portability pain in the ass. +And yes, I know about the Xerox library. It has bits of assembler +code for most common platforms. Not for all. And although it is +mostly transparent, it isn't completely transparent (when I once +linked Python with it, it dumped core). +

+Traditional GC also becomes a problem when Python gets embedded into +other applications. While in a stand-alone Python it may be fine to +replace the standard malloc() and free() with versions provided by the +GC library, an application embedding Python may want to have its own +substitute for malloc() and free(), and may not want Python's. Right +now, Python works with anything that implements malloc() and free() +properly. +

+In Jython, the following code (which is +fine in C Python) will probably run out of file descriptors long before +it runs out of memory: +

+

+        for file in <very long list of files>:
+                f = open(file)
+                c = f.read(1)
+
+Using the current reference counting and destructor scheme, each new +assignment to f closes the previous file. Using GC, this is not +guaranteed. Sure, you can think of ways to fix this. But it's not +off-the-shelf technology. If you want to write code that will +work with any Python implementation, you should explicitly close +the file; this will work regardless of GC: +

+

+       for file in <very long list of files>:
+                f = open(file)
+                c = f.read(1)
+                f.close()
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:35:38 2002 by +Erno Kuusela +

+ +


+

6.15. Why are there separate tuple and list data types?

+This is done so that tuples can be immutable while lists are mutable. +

+Immutable tuples are useful in situations where you need to pass a few +items to a function and don't want the function to modify the tuple; +for example, +

+

+	point1 = (120, 140)
+	point2 = (200, 300)
+	record(point1, point2)
+	draw(point1, point2)
+
+You don't want to have to think about what would happen if record() +changed the coordinates -- it can't, because the tuples are immutable. +

+On the other hand, when creating large lists dynamically, it is +absolutely crucial that they are mutable -- adding elements to a tuple +one by one requires using the concatenation operator, which makes it +quadratic in time. +

+As a general guideline, use tuples like you would use structs in C or +records in Pascal, use lists like (variable length) arrays. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 15:26:03 1997 by +GvR +

+ +


+

6.16. How are lists implemented?

+Despite what a Lisper might think, Python's lists are really +variable-length arrays. The implementation uses a contiguous +array of references to other objects, and keeps a pointer +to this array (as well as its length) in a list head structure. +

+This makes indexing a list (a[i]) an operation whose cost is +independent of the size of the list or the value of the index. +

+When items are appended or inserted, the array of references is resized. +Some cleverness is applied to improve the performance of appending +items repeatedly; when the array must be grown, some extra space +is allocated so the next few times don't require an actual resize. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 15:32:24 1997 by +GvR +

+ +


+

6.17. How are dictionaries implemented?

+Python's dictionaries are implemented as resizable hash tables. +

+Compared to B-trees, this gives better performance for lookup +(the most common operation by far) under most circumstances, +and the implementation is simpler. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 23:51:14 1997 by +Vladimir Marangozov +

+ +


+

6.18. Why must dictionary keys be immutable?

+The hash table implementation of dictionaries uses a hash value +calculated from the key value to find the key. If the key were +a mutable object, its value could change, and thus its hash could +change. But since whoever changes the key object can't tell that +is incorporated in a dictionary, it can't move the entry around in +the dictionary. Then, when you try to look up the same object +in the dictionary, it won't be found, since its hash value is different; +and if you try to look up the old value, it won't be found either, +since the value of the object found in that hash bin differs. +

+If you think you need to have a dictionary indexed with a list, +try to use a tuple instead. The function tuple(l) creates a tuple +with the same entries as the list l. +

+Some unacceptable solutions that have been proposed: +

+- Hash lists by their address (object ID). This doesn't work because +if you construct a new list with the same value it won't be found; +e.g., +

+

+  d = {[1,2]: '12'}
+  print d[[1,2]]
+
+will raise a KeyError exception because the id of the [1,2] used +in the second line differs from that in the first line. +In other words, dictionary keys should be compared using '==', not using 'is'. +

+- Make a copy when using a list as a key. This doesn't work because +the list (being a mutable object) could contain a reference to itself, +and then the copying code would run into an infinite loop. +

+- Allow lists as keys but tell the user not to modify them. This would +allow a class of hard-to-track bugs in programs that I'd rather not see; +it invalidates an important invariant of dictionaries (every value in +d.keys() is usable as a key of the dictionary). +

+- Mark lists as read-only once they are used as a dictionary key. +The problem is that it's not just the top-level object that could change +its value; you could use a tuple containing a list as a key. Entering +anything as a key into a dictionary would require marking all objects +reachable from there as read-only -- and again, self-referential objects +could cause an infinite loop again (and again and again). +

+There is a trick to get around this if you need to, but +use it at your own risk: You +can wrap a mutable structure inside a class instance which +has both a __cmp__ and a __hash__ method. +

+

+   class listwrapper:
+        def __init__(self, the_list):
+              self.the_list = the_list
+        def __cmp__(self, other):
+              return self.the_list == other.the_list
+        def __hash__(self):
+              l = self.the_list
+              result = 98767 - len(l)*555
+              for i in range(len(l)):
+                   try:
+                        result = result + (hash(l[i]) % 9999999) * 1001 + i
+                   except:
+                        result = (result % 7777777) + i * 333
+              return result
+
+Note that the hash computation is complicated by the +possibility that some members of the list may be unhashable +and also by the possibility of arithmetic overflow. +

+You must make +sure that the hash value for all such wrapper objects that reside in a +dictionary (or other hash based structure), remain fixed while +the object is in the dictionary (or other structure). +

+Furthermore it must always be the case that if +o1 == o2 (ie o1.__cmp__(o2)==0) then hash(o1)==hash(o2) +(ie, o1.__hash__() == o2.__hash__()), regardless of whether +the object is in a dictionary or not. +If you fail to meet these restrictions dictionaries and other +hash based structures may misbehave! +

+In the case of listwrapper above whenever the wrapper +object is in a dictionary the wrapped list must not change +to avoid anomalies. Don't do this unless you are prepared +to think hard about the requirements and the consequences +of not meeting them correctly. You've been warned! +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 10 10:08:40 1997 by +aaron watters +

+ +


+

6.19. How the heck do you make an array in Python?

+["this", 1, "is", "an", "array"] +

+Lists are arrays in the C or Pascal sense of the word (see question +6.16). The array module also provides methods for creating arrays +of fixed types with compact representations (but they are slower to +index than lists). Also note that the Numerics extensions and others +define array-like structures with various characteristics as well. +

+To get Lisp-like lists, emulate cons cells +

+

+    lisp_list = ("like",  ("this",  ("example", None) ) )
+
+using tuples (or lists, if you want mutability). Here the analogue +of lisp car is lisp_list[0] and the analogue of cdr is lisp_list[1]. +Only do this if you're sure you really need to (it's usually a lot +slower than using Python lists). +

+Think of Python lists as mutable heterogeneous arrays of +Python objects (say that 10 times fast :) ). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:08:27 1997 by +aaron watters +

+ +


+

6.20. Why doesn't list.sort() return the sorted list?

+In situations where performance matters, making a copy of the list +just to sort it would be wasteful. Therefore, list.sort() sorts +the list in place. In order to remind you of that fact, it does +not return the sorted list. This way, you won't be fooled into +accidentally overwriting a list when you need a sorted copy but also +need to keep the unsorted version around. +

+As a result, here's the idiom to iterate over the keys of a dictionary +in sorted order: +

+

+	keys = dict.keys()
+	keys.sort()
+	for key in keys:
+		...do whatever with dict[key]...
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 2 17:01:52 1999 by +Fred L. Drake, Jr. +

+ +


+

6.21. How do you specify and enforce an interface spec in Python?

+An interfaces specification for a module as provided +by languages such as C++ and java describes the prototypes +for the methods and functions of the module. Many feel +that compile time enforcement of interface specifications +help aid in the construction of large programs. Python +does not support interface specifications directly, but many +of their advantages can be obtained by an appropriate +test discipline for components, which can often be very +easily accomplished in Python. There is also a tool, PyChecker, +which can be used to find problems due to subclassing. +

+A good test suite for a module can at +once provide a regression test and serve as a module interface +specification (even better since it also gives example usage). Look to +many of the standard libraries which often have a "script +interpretation" which provides a simple "self test." Even +modules which use complex external interfaces can often +be tested in isolation using trivial "stub" emulations of the +external interface. +

+An appropriate testing discipline (if enforced) can help +build large complex applications in Python as well as having interface +specifications would do (or better). Of course Python allows you +to get sloppy and not do it. Also you might want to design +your code with an eye to make it easily tested. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 23 03:05:29 2002 by +Neal Norwitz +

+ +


+

6.22. Why do all classes have the same type? Why do instances all have the same type?

+The Pythonic use of the word "type" is quite different from +common usage in much of the rest of the programming language +world. A "type" in Python is a description for an object's operations +as implemented in C. All classes have the same operations +implemented in C which sometimes "call back" to differing program +fragments implemented in Python, and hence all classes have the +same type. Similarly at the C level all class instances have the +same C implementation, and hence all instances have the same +type. +

+Remember that in Python usage "type" refers to a C implementation +of an object. To distinguish among instances of different classes +use Instance.__class__, and also look to 4.47. Sorry for the +terminological confusion, but at this point in Python's development +nothing can be done! +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 1 12:35:47 1997 by +aaron watters +

+ +


+

6.23. Why isn't all memory freed when Python exits?

+Objects referenced from Python module global name spaces are +not always deallocated when Python exits. +

+This may happen if there are circular references (see question +4.17). There are also certain bits of memory that are allocated +by the C library that are impossible to free (e.g. a tool +like Purify will complain about these). +

+But in general, Python 1.5 and beyond +(in contrast with earlier versions) is quite agressive about +cleaning up memory on exit. +

+If you want to force Python to delete certain things on deallocation +use the sys.exitfunc hook to force those deletions. For example +if you are debugging an extension module using a memory analysis +tool and you wish to make Python deallocate almost everything +you might use an exitfunc like this one: +

+

+  import sys
+
+
+  def my_exitfunc():
+       print "cleaning up"
+       import sys
+       # do order dependant deletions here
+       ...
+       # now delete everything else in arbitrary order
+       for x in sys.modules.values():
+            d = x.__dict__
+            for name in d.keys():
+                 del d[name]
+
+
+  sys.exitfunc = my_exitfunc
+
+Other exitfuncs can be less drastic, of course. +

+(In fact, this one just does what Python now already does itself; +but the example of using sys.exitfunc to force cleanups is still +useful.) +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 29 09:46:26 1998 by +GvR +

+ +


+

6.24. Why no class methods or mutable class variables?

+The notation +

+

+    instance.attribute(arg1, arg2)
+
+usually translates to the equivalent of +

+

+    Class.attribute(instance, arg1, arg2)
+
+where Class is a (super)class of instance. Similarly +

+

+    instance.attribute = value
+
+sets an attribute of an instance (overriding any attribute of a class +that instance inherits). +

+Sometimes programmers want to have +different behaviours -- they want a method which does not bind +to the instance and a class attribute which changes in place. +Python does not preclude these behaviours, but you have to +adopt a convention to implement them. One way to accomplish +this is to use "list wrappers" and global functions. +

+

+   def C_hello():
+         print "hello"
+
+
+   class C:
+        hello = [C_hello]
+        counter = [0]
+
+
+    I = C()
+
+Here I.hello[0]() acts very much like a "class method" and +I.counter[0] = 2 alters C.counter (and doesn't override it). +If you don't understand why you'd ever want to do this, that's +because you are pure of mind, and you probably never will +want to do it! This is dangerous trickery, not recommended +when avoidable. (Inspired by Tim Peter's discussion.) +

+In Python 2.2, you can do this using the new built-in operations +classmethod and staticmethod. +See http://www.python.org/2.2/descrintro.html#staticmethods +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 11 15:59:37 2001 by +GvR +

+ +


+

6.25. Why are default values sometimes shared between objects?

+It is often expected that a function CALL creates new objects for default +values. This is not what happens. Default values are created when the +function is DEFINED, that is, there is only one such object that all +functions refer to. If that object is changed, subsequent calls to the +function will refer to this changed object. By definition, immutable objects +(like numbers, strings, tuples, None) are safe from change. Changes to mutable +objects (like dictionaries, lists, class instances) is what causes the +confusion. +

+Because of this feature it is good programming practice not to use mutable +objects as default values, but to introduce them in the function. +Don't write: +

+

+	def foo(dict={}):  # XXX shared reference to one dict for all calls
+	    ...
+
+but: +
+	def foo(dict=None):
+		if dict is None:
+			dict = {} # create a new dict for local namespace
+
+See page 182 of "Internet Programming with Python" for one discussion +of this feature. Or see the top of page 144 or bottom of page 277 in +"Programming Python" for another discussion. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Aug 16 07:03:35 1997 by +Case Roole +

+ +


+

6.26. Why no goto?

+Actually, you can use exceptions to provide a "structured goto" +that even works across function calls. Many feel that exceptions +can conveniently emulate all reasonable uses of the "go" or "goto" +constructs of C, Fortran, and other languages. For example: +

+

+   class label: pass # declare a label
+   try:
+        ...
+        if (condition): raise label() # goto label
+        ...
+   except label: # where to goto
+        pass
+   ...
+
+This doesn't allow you to jump into the middle of a loop, but +that's usually considered an abuse of goto anyway. Use sparingly. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Sep 10 07:16:44 1997 by +aaron watters +

+ +


+

6.27. How do you make a higher order function in Python?

+You have two choices: you can use default arguments and override +them or you can use "callable objects." For example suppose you +wanted to define linear(a,b) which returns a function f where f(x) +computes the value a*x+b. Using default arguments: +

+

+     def linear(a,b):
+         def result(x, a=a, b=b):
+             return a*x + b
+         return result
+
+Or using callable objects: +

+

+     class linear:
+        def __init__(self, a, b):
+            self.a, self.b = a,b
+        def __call__(self, x):
+            return self.a * x + self.b
+
+In both cases: +

+

+     taxes = linear(0.3,2)
+
+gives a callable object where taxes(10e6) == 0.3 * 10e6 + 2. +

+The defaults strategy has the disadvantage that the default arguments +could be accidentally or maliciously overridden. The callable objects +approach has the disadvantage that it is a bit slower and a bit +longer. Note however that a collection of callables can share +their signature via inheritance. EG +

+

+      class exponential(linear):
+         # __init__ inherited
+         def __call__(self, x):
+             return self.a * (x ** self.b)
+
+On comp.lang.python, zenin@bawdycaste.org points out that +an object can encapsulate state for several methods in order +to emulate the "closure" concept from functional programming +languages, for example: +

+

+    class counter:
+        value = 0
+        def set(self, x): self.value = x
+        def up(self): self.value=self.value+1
+        def down(self): self.value=self.value-1
+
+
+    count = counter()
+    inc, dec, reset = count.up, count.down, count.set
+
+Here inc, dec and reset act like "functions which share the +same closure containing the variable count.value" (if you +like that way of thinking). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Sep 25 08:38:35 1998 by +Aaron Watters +

+ +


+

6.28. Why do I get a SyntaxError for a 'continue' inside a 'try'?

+This is an implementation limitation, +caused by the extremely simple-minded +way Python generates bytecode. The try block pushes something on the +"block stack" which the continue would have to pop off again. The +current code generator doesn't have the data structures around so that +'continue' can generate the right code. +

+Note that JPython doesn't have this restriction! +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 22 15:01:07 1998 by +GvR +

+ +


+

6.29. Why can't raw strings (r-strings) end with a backslash?

+More precisely, they can't end with an odd number of backslashes: +the unpaired backslash at the end escapes the closing quote character, +leaving an unterminated string. +

+Raw strings were designed to ease creating input for processors (chiefly +regular expression engines) that want to do their own backslash escape processing. Such processors consider an unmatched trailing backslash to be an error anyway, so raw strings disallow that. In return, they allow you to pass on the string quote character by escaping it with a backslash. These rules work well when r-strings are used for their intended purpose. +

+If you're trying to build Windows pathnames, note that all Windows system calls accept forward slashes too: +

+

+    f = open("/mydir/file.txt") # works fine!
+
+If you're trying to build a pathname for a DOS command, try e.g. one of +

+

+    dir = r"\this\is\my\dos\dir" "\\"
+    dir = r"\this\is\my\dos\dir\ "[:-1]
+    dir = "\\this\\is\\my\\dos\\dir\\"
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jul 13 20:50:20 1998 by +Tim Peters +

+ +


+

6.30. Why can't I use an assignment in an expression?

+Many people used to C or Perl complain that they want to be able to +use e.g. this C idiom: +

+

+    while (line = readline(f)) {
+        ...do something with line...
+    }
+
+where in Python you're forced to write this: +

+

+    while 1:
+        line = f.readline()
+        if not line:
+            break
+        ...do something with line...
+
+This issue comes up in the Python newsgroup with alarming frequency +-- search Deja News for past messages about assignment expression. +The reason for not allowing assignment in Python expressions +is a common, hard-to-find bug in those other languages, +caused by this construct: +

+

+    if (x = 0) {
+        ...error handling...
+    }
+    else {
+        ...code that only works for nonzero x...
+    }
+
+Many alternatives have been proposed. Most are hacks that save some +typing but use arbitrary or cryptic syntax or keywords, +and fail the simple criterion that I use for language change proposals: +it should intuitively suggest the proper meaning to a human reader +who has not yet been introduced with the construct. +

+The earliest time something can be done about this will be with +Python 2.0 -- if it is decided that it is worth fixing. +An interesting phenomenon is that most experienced Python programmers +recognize the "while 1" idiom and don't seem to be missing the +assignment in expression construct much; it's only the newcomers +who express a strong desire to add this to the language. +

+One fairly elegant solution would be to introduce a new operator +for assignment in expressions spelled ":=" -- this avoids the "=" +instead of "==" problem. It would have the same precedence +as comparison operators but the parser would flag combination with +other comparisons (without disambiguating parentheses) as an error. +

+Finally -- there's an alternative way of spelling this that seems +attractive but is generally less robust than the "while 1" solution: +

+

+    line = f.readline()
+    while line:
+        ...do something with line...
+        line = f.readline()
+
+The problem with this is that if you change your mind about exactly +how you get the next line (e.g. you want to change it into +sys.stdin.readline()) you have to remember to change two places +in your program -- the second one hidden at the bottom of the loop. +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 18 00:57:41 1999 by +Andrew Dalke +

+ +


+

6.31. Why doesn't Python have a "with" statement like some other languages?

+Basically, because such a construct would be terribly ambiguous. Thanks to Carlos Ribeiro for the following remarks: +

+Some languages, such as Object Pascal, Delphi, and C++, use static types. So it is possible to know, in an unambiguous way, what member is being assigned in a "with" clause. This is the main point - the compiler always knows the scope of every variable at compile time. +

+Python uses dynamic types. It is impossible to know in advance which +attribute will be referenced at runtime. Member attributes may be added or removed from objects on the fly. This would make it impossible to know, from a simple reading, what attribute is being referenced - a local one, a global one, or a member attribute. +

+For instance, take the following snippet (it is incomplete btw, just to +give you the idea): +

+

+   def with_is_broken(a):
+      with a:
+         print x
+
+The snippet assumes that "a" must have a member attribute called "x". +However, there is nothing in Python that guarantees that. What should +happen if "a" is, let us say, an integer? And if I have a global variable named "x", will it end up being used inside the with block? As you see, the dynamic nature of Python makes such choices much harder. +

+The primary benefit of "with" and similar language features (reduction of code volume) can, however, easily be achieved in Python by assignment. Instead of: +

+

+    function(args).dict[index][index].a = 21
+    function(args).dict[index][index].b = 42
+    function(args).dict[index][index].c = 63
+
+would become: +

+

+    ref = function(args).dict[index][index]
+    ref.a = 21
+    ref.b = 42
+    ref.c = 63
+
+This also has the happy side-effect of increasing execution speed, since name bindings are resolved at run-time in Python, and the second method only needs to perform the resolution once. If the referenced object does not have a, b and c attributes, of course, the end result is still a run-time exception. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jan 11 14:32:58 2002 by +Steve Holden +

+ +


+

6.32. Why are colons required for if/while/def/class?

+The colon is required primarily to enhance readability (one of the +results of the experimental ABC language). Consider this: +

+

+    if a==b
+        print a
+
+versus +

+

+    if a==b:
+        print a
+
+Notice how the second one is slightly easier to read. Notice further how +a colon sets off the example in the second line of this FAQ answer; it's +a standard usage in English. Finally, the colon makes it easier for +editors with syntax highlighting. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 07:22:57 2002 by +Matthias Urlichs +

+ +


+

6.33. Can't we get rid of the Global Interpreter Lock?

+The Global Interpreter Lock (GIL) is often seen as a hindrance to +Python's deployment on high-end multiprocessor server machines, +because a multi-threaded Python program effectively only uses +one CPU, due to the insistence that (almost) all Python code +can only run while the GIL is held. +

+Back in the days of Python 1.5, Greg Stein actually implemented +a comprehensive patch set ("free threading") +that removed the GIL, replacing it with +fine-grained locking. Unfortunately, even on Windows (where locks +are very efficient) this ran ordinary Python code about twice as +slow as the interpreter using the GIL. On Linux the performance +loss was even worse (pthread locks aren't as efficient). +

+Since then, the idea of getting rid of the GIL has occasionally +come up but nobody has found a way to deal with the expected slowdown; +Greg's free threading patch set has not been kept up-to-date for +later Python versions. +

+This doesn't mean that you can't make good use of Python on +multi-CPU machines! You just have to be creative with dividing +the work up between multiple processes rather than multiple +threads. +

+

+It has been suggested that the GIL should be a per-interpreter-state +lock rather than truly global; interpreters then wouldn't be able +to share objects. Unfortunately, this isn't likely to happen either. +

+It would be a tremendous amount of work, because many object +implementations currently have global state. E.g. small ints and +small strings are cached; these caches would have to be moved to the +interpreter state. Other object types have their own free list; these +free lists would have to be moved to the interpreter state. And so +on. +

+And I doubt that it can even be done in finite time, because the same +problem exists for 3rd party extensions. It is likely that 3rd party +extensions are being written at a faster rate than you can convert +them to store all their global state in the interpreter state. +

+And finally, once you have multiple interpreters not sharing any +state, what have you gained over running each interpreter +in a separate process? +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 16:34:01 2003 by +GvR +

+ +


+

7. Using Python on non-UNIX platforms

+ +
+

7.1. Is there a Mac version of Python?

+Yes, it is maintained by Jack Jansen. See Jack's MacPython Page: +

+

+  http://www.cwi.nl/~jack/macpython.html
+
+

+ +Edit this entry / +Log info + +/ Last changed on Fri May 4 09:33:42 2001 by +GvR +

+ +


+

7.2. Are there DOS and Windows versions of Python?

+Yes. The core windows binaries are available from http://www.python.org/windows/. There is a plethora of Windows extensions available, including a large number of not-always-compatible GUI toolkits. The core binaries include the standard Tkinter GUI extension. +

+Most windows extensions can be found (or referenced) at http://www.python.org/windows/ +

+Windows 3.1/DOS support seems to have dropped off recently. You may need to settle for an old version of Python one these platforms. One such port is WPY +

+WPY: Ports to DOS, Windows 3.1(1), Windows 95, Windows NT and OS/2. +Also contains a GUI package that offers portability between Windows +(not DOS) and Unix, and native look and feel on both. +ftp://ftp.python.org/pub/python/wpy/. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jun 2 20:21:57 1998 by +Mark Hammond +

+ +


+

7.3. Is there an OS/2 version of Python?

+Yes, see http://www.python.org/download/download_os2.html. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 7 11:33:16 1999 by +GvR +

+ +


+

7.4. Is there a VMS version of Python?

+Jean-François Piéronne has ported 2.1.3 to OpenVMS. It can be found at +<http://vmspython.dyndns.org/>. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Sep 19 15:40:38 2002 by +Skip Montanaro +

+ +


+

7.5. What about IBM mainframes, or other non-UNIX platforms?

+I haven't heard about these, except I remember hearing about an +OS/9 port and a port to Vxworks (both operating systems for embedded +systems). If you're interested in any of this, go directly to the +newsgroup and ask there, you may find exactly what you need. For +example, a port to MPE/iX 5.0 on HP3000 computers was just announced, +see http://www.allegro.com/software/. +

+On the IBM mainframe side, for Z/OS there's a port of python 1.4 that goes with their open-unix package, formely OpenEdition MVS, (http://www-1.ibm.com/servers/eserver/zseries/zos/unix/python.html). On a side note, there's also a java vm ported - so, in theory, jython could run too. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Nov 18 03:18:39 2002 by +Bruno Jessen +

+ +


+

7.6. Where are the source or Makefiles for the non-UNIX versions?

+The standard sources can (almost) be used. Additional sources can +be found in the platform-specific subdirectories of the distribution. +

+ +Edit this entry / +Log info +

+ +


+

7.7. What is the status and support for the non-UNIX versions?

+I don't have access to most of these platforms, so in general I am +dependent on material submitted by volunteers. However I strive to +integrate all changes needed to get it to compile on a particular +platform back into the standard sources, so porting of the next +version to the various non-UNIX platforms should be easy. +(Note that Linux is classified as a UNIX platform here. :-) +

+Some specific platforms: +

+Windows: all versions (95, 98, ME, NT, 2000, XP) are supported, +all python.org releases come with a Windows installer. +

+MacOS: Jack Jansen does an admirable job of keeping the Mac version +up to date (both MacOS X and older versions); +see http://www.cwi.nl/~jack/macpython.html +

+For all supported platforms, see http://www.python.org/download/ +(follow the link to "Other platforms" for less common platforms) +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:34:24 2002 by +GvR +

+ +


+

7.8. I have a PC version but it appears to be only a binary. Where's the library?

+If you are running any version of Windows, then you have the wrong distribution. The FAQ lists current Windows versions. Notably, Pythonwin and wpy provide fully functional installations. +

+But if you are sure you have the only distribution with a hope of working on +your system, then... +

+You still need to copy the files from the distribution directory +"python/Lib" to your system. If you don't have the full distribution, +you can get the file lib<version>.tar.gz from most ftp sites carrying +Python; this is a subset of the distribution containing just those +files, e.g. ftp://ftp.python.org/pub/python/src/lib1.4.tar.gz. +

+Once you have installed the library, you need to point sys.path to it. +Assuming the library is in C:\misc\python\lib, the following commands +will point your Python interpreter to it (note the doubled backslashes +-- you can also use single forward slashes instead): +

+

+        >>> import sys
+        >>> sys.path.insert(0, 'C:\\misc\\python\\lib')
+        >>>
+
+For a more permanent effect, set the environment variable PYTHONPATH, +as follows (talking to a DOS prompt): +

+

+        C> SET PYTHONPATH=C:\misc\python\lib
+
+

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 16:28:27 1997 by +Ken Manheimer +

+ +


+

7.9. Where's the documentation for the Mac or PC version?

+The documentation for the Unix version also applies to the Mac and +PC versions. Where applicable, differences are indicated in the text. +

+ +Edit this entry / +Log info +

+ +


+

7.10. How do I create a Python program file on the Mac or PC?

+Use an external editor. On the Mac, BBEdit seems to be a popular +no-frills text editor. I work like this: start the interpreter; edit +a module file using BBedit; import and test it in the interpreter; +edit again in BBedit; then use the built-in function reload() to +re-read the imported module; etc. In the 1.4 distribution +you will find a BBEdit extension that makes life a little easier: +it can tell the interpreter to execute the current window. +See :Mac:Tools:BBPy:README. +

+Regarding the same question for the PC, Kurt Wm. Hemr writes: "While +anyone with a pulse could certainly figure out how to do the same on +MS-Windows, I would recommend the NotGNU Emacs clone for MS-Windows. +Not only can you easily resave and "reload()" from Python after making +changes, but since WinNot auto-copies to the clipboard any text you +select, you can simply select the entire procedure (function) which +you changed in WinNot, switch to QWPython, and shift-ins to reenter +the changed program unit." +

+If you're using Windows95 or Windows NT, you should also know about +PythonWin, which provides a GUI framework, with an mouse-driven +editor, an object browser, and a GUI-based debugger. See +

+       http://www.python.org/ftp/python/pythonwin/
+
+for details. +

+ +Edit this entry / +Log info + +/ Last changed on Sun May 25 10:04:25 1997 by +GvR +

+ +


+

7.11. How can I use Tkinter on Windows 95/NT?

+Starting from Python 1.5, it's very easy -- just download and install +Python and Tcl/Tk and you're in business. See +

+

+  http://www.python.org/download/download_windows.html
+
+One warning: don't attempt to use Tkinter from PythonWin +(Mark Hammond's IDE). Use it from the command line interface +(python.exe) or the windowless interpreter (pythonw.exe). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 12 09:32:48 1998 by +GvR +

+ +


+

7.12. cgi.py (or other CGI programming) doesn't work sometimes on NT or win95!

+Be sure you have the latest python.exe, that you are using +python.exe rather than a GUI version of python and that you +have configured the server to execute +

+

+     "...\python.exe -u ..."
+
+for the cgi execution. The -u (unbuffered) option on NT and +win95 prevents the interpreter from altering newlines in the +standard input and output. Without it post/multipart requests +will seem to have the wrong length and binary (eg, GIF) +responses may get garbled (resulting in, eg, a "broken image"). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jul 30 10:48:02 1997 by +aaron watters +

+ +


+

7.13. Why doesn't os.popen() work in PythonWin on NT?

+The reason that os.popen() doesn't work from within PythonWin is due to a bug in Microsoft's C Runtime Library (CRT). The CRT assumes you have a Win32 console attached to the process. +

+You should use the win32pipe module's popen() instead which doesn't depend on having an attached Win32 console. +

+Example: +

+ import win32pipe
+ f = win32pipe.popen('dir /c c:\\')
+ print f.readlines()
+ f.close()
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 31 15:34:09 1997 by +Bill Tutt +

+ +


+

7.14. How do I use different functionality on different platforms with the same program?

+Remember that Python is extremely dynamic and that you +can use this dynamism to configure a program at run-time to +use available functionality on different platforms. For example +you can test the sys.platform and import different modules based +on its value. +

+

+   import sys
+   if sys.platform == "win32":
+      import win32pipe
+      popen = win32pipe.popen
+   else:
+      import os
+      popen = os.popen
+
+(See FAQ 7.13 for an explanation of why you might want to +do something like this.) Also you can try to import a module +and use a fallback if the import fails: +

+

+    try:
+         import really_fast_implementation
+         choice = really_fast_implementation
+    except ImportError:
+         import slower_implementation
+         choice = slower_implementation
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:39:06 1997 by +aaron watters +

+ +


+

7.15. Is there an Amiga version of Python?

+Yes. See the AmigaPython homepage at http://www.bigfoot.com/~irmen/python.html. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 14 06:53:32 1998 by +Irmen de Jong +

+ +


+

7.16. Why doesn't os.popen()/win32pipe.popen() work on Win9x?

+There is a bug in Win9x that prevents os.popen/win32pipe.popen* from working. The good news is there is a way to work around this problem. +The Microsoft Knowledge Base article that you need to lookup is: Q150956. You will find links to the knowledge base at: +http://www.microsoft.com/kb. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 25 10:45:38 1999 by +Bill Tutt +

+ +


+

8. Python on Windows

+ +
+

8.1. Using Python for CGI on Microsoft Windows

+** Setting up the Microsoft IIS Server/Peer Server +

+On the Microsoft IIS +server or on the Win95 MS Personal Web Server +you set up python in the same way that you +would set up any other scripting engine. +

+Run regedt32 and go to: +

+HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\W3SVC\Parameters\ScriptMap +

+and enter the following line (making any specific changes that your system may need) +

+.py :REG_SZ: c:\<path to python>\python.exe -u %s %s +

+This line will allow you to call your script with a simple reference like: +http://yourserver/scripts/yourscript.py +provided "scripts" is an "executable" directory for your server (which +it usually is by default). +The "-u" flag specifies unbuffered and binary mode for stdin - needed when working with binary data +

+In addition, it is recommended by people who would know that using ".py" may +not be a good idea for the file extensions when used in this context +(you might want to reserve *.py for support modules and use *.cgi or *.cgp +for "main program" scripts). +However, that issue is beyond this Windows FAQ entry. +

+

+** Apache configuration +

+In the Apache configuration file httpd.conf, add the following line at +the end of the file: +

+ScriptInterpreterSource Registry +

+Then, give your Python CGI-scripts the extension .py and put them in the cgi-bin directory. +

+

+** Netscape Servers: +Information on this topic exists at: +http://home.netscape.com/comprod/server_central/support/fasttrack_man/programs.htm#1010870 +

+ +Edit this entry / +Log info + +/ Last changed on Wed Mar 27 12:25:54 2002 by +Gerhard Häring +

+ +


+

8.2. How to check for a keypress without blocking?

+Use the msvcrt module. This is a standard Windows-specific extensions +in Python 1.5 and beyond. It defines a function kbhit() which checks +whether a keyboard hit is present; also getch() which gets one +character without echo. Plus a few other goodies. +

+(Search for "keypress" to find an answer for Unix as well.) +

+ +Edit this entry / +Log info + +/ Last changed on Mon Mar 30 16:21:46 1998 by +GvR +

+ +


+

8.3. $PYTHONPATH

+In MS-DOS derived environments, a unix variable such as $PYTHONPATH is +set as PYTHONPATH, without the dollar sign. PYTHONPATH is useful for +specifying the location of library files. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 11 00:41:26 1998 by +Gvr +

+ +


+

8.4. dedent syntax errors

+The FAQ does not recommend using tabs, and Guido's Python Style Guide recommends 4 spaces for distributed Python code; this is also the Emacs python-mode default; see +

+

+    http://www.python.org/doc/essays/styleguide.html
+
+Under any editor mixing tabs and spaces is a bad idea. MSVC is no different in this respect, and is easily configured to use spaces: Take Tools -> Options -> Tabs, and for file type "Default" set "Tab size" and "Indent size" to 4, and select the "Insert spaces" radio button. +

+If you suspect mixed tabs and spaces are causing problems in leading whitespace, run Python with the -t switch or, run Tools/Scripts/tabnanny.py to check a directory tree in batch mode. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Feb 12 15:04:14 2001 by +Steve Holden +

+ +


+

8.5. How do I emulate os.kill() in Windows?

+Use win32api: +

+

+    def kill(pid):
+        """kill function for Win32"""
+        import win32api
+        handle = win32api.OpenProcess(1, 0, pid)
+        return (0 != win32api.TerminateProcess(handle, 0))
+
+

+ +Edit this entry / +Log info + +/ Last changed on Sat Aug 8 18:55:06 1998 by +Jeff Bauer +

+ +


+

8.6. Why does os.path.isdir() fail on NT shared directories?

+The solution appears to be always append the "\\" on +the end of shared drives. +

+

+  >>> import os
+  >>> os.path.isdir( '\\\\rorschach\\public')
+  0
+  >>> os.path.isdir( '\\\\rorschach\\public\\')
+  1
+
+[Blake Winton responds:] +I've had the same problem doing "Start >> Run" and then a +directory on a shared drive. If I use "\\rorschach\public", +it will fail, but if I use "\\rorschach\public\", it will +work. For that matter, os.stat() does the same thing (well, +it gives an error for "\\\\rorschach\\public", but you get +the idea)... +

+I've got a theory about why this happens, but it's only +a theory. NT knows the difference between shared directories, +and regular directories. "\\rorschach\public" isn't a +directory, it's _really_ an IPC abstraction. This is sort +of lended credence to by the fact that when you're mapping +a network drive, you can't map "\\rorschach\public\utils", +but only "\\rorschach\public". +

+[Clarification by funkster@midwinter.com] +It's not actually a Python +question, as Python is working just fine; it's clearing up something +a bit muddled about Windows networked drives. +

+It helps to think of share points as being like drive letters. +Example: +

+        k: is not a directory
+        k:\ is a directory
+        k:\media is a directory
+        k:\media\ is not a directory
+
+The same rules apply if you substitute "k:" with "\\conky\foo": +
+        \\conky\foo  is not a directory
+        \\conky\foo\ is a directory
+        \\conky\foo\media is a directory
+        \\conky\foo\media\ is not a directory
+
+

+ +Edit this entry / +Log info + +/ Last changed on Sun Jan 31 08:44:48 1999 by +GvR +

+ +


+

8.7. PyRun_SimpleFile() crashes on Windows but not on Unix

+I've seen a number of reports of PyRun_SimpleFile() failing +in a Windows port of an application embedding Python that worked +fine on Unix. PyRun_SimpleString() works fine on both platforms. +

+I think this happens because the application was compiled with a +different set of compiler flags than Python15.DLL. It seems that some +compiler flags affect the standard I/O library in such a way that +using different flags makes calls fail. You need to set it for +the non-debug multi-threaded DLL (/MD on the command line, or can be set via MSVC under Project Settings->C++/Code Generation then the "Use rum-time library" dropdown.) +

+Also note that you can not mix-and-match Debug and Release versions. If you wish to use the Debug Multithreaded DLL, then your module _must_ have an "_d" appended to the base name. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Nov 17 17:37:07 1999 by +Mark Hammond +

+ +


+

8.8. Import of _tkinter fails on Windows 95/98

+Sometimes, the import of _tkinter fails on Windows 95 or 98, +complaining with a message like the following: +

+

+  ImportError: DLL load failed: One of the library files needed
+  to run this application cannot be found.
+
+It could be that you haven't installed Tcl/Tk, but if you did +install Tcl/Tk, and the Wish application works correctly, +the problem may be that its installer didn't +manage to edit the autoexec.bat file correctly. It tries to add a +statement that changes the PATH environment variable to include +the Tcl/Tk 'bin' subdirectory, but sometimes this edit doesn't +quite work. Opening it with notepad usually reveals what the +problem is. +

+(One additional hint, noted by David Szafranski: you can't use +long filenames here; e.g. use C:\PROGRA~1\Tcl\bin instead of +C:\Program Files\Tcl\bin.) +

+ +Edit this entry / +Log info + +/ Last changed on Wed Dec 2 22:32:41 1998 by +GvR +

+ +


+

8.9. Can't extract the downloaded documentation on Windows

+Sometimes, when you download the documentation package to a Windows +machine using a web browser, the file extension of the saved file +ends up being .EXE. This is a mistake; the extension should be .TGZ. +

+Simply rename the downloaded file to have the .TGZ extension, and +WinZip will be able to handle it. (If your copy of WinZip doesn't, +get a newer one from http://www.winzip.com.) +

+ +Edit this entry / +Log info + +/ Last changed on Sat Nov 21 13:41:35 1998 by +GvR +

+ +


+

8.10. Can't get Py_RunSimpleFile() to work.

+This is very sensitive to the compiler vendor, version and (perhaps) +even options. If the FILE* structure in your embedding program isn't +the same as is assumed by the Python interpreter it won't work. +

+The Python 1.5.* DLLs (python15.dll) are all compiled +with MS VC++ 5.0 and with multithreading-DLL options (/MD, I think). +

+If you can't change compilers or flags, try using Py_RunSimpleString(). +A trick to get it to run an arbitrary file is to construct a call to +execfile() with the name of your file as argument. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jan 13 10:58:14 1999 by +GvR +

+ +


+

8.11. Where is Freeze for Windows?

+("Freeze" is a program that allows you to ship a Python program +as a single stand-alone executable file. It is not a compiler, +your programs don't run any faster, but they are more easily +distributable (to platforms with the same OS and CPU). Read the +README file of the freeze program for more disclaimers.) +

+You can use freeze on Windows, but you must download the source +tree (see http://www.python.org/download/download_source.html). +This is recommended for Python 1.5.2 (and betas thereof) only; +older versions don't quite work. +

+You need the Microsoft VC++ 5.0 compiler (maybe it works with +6.0 too). You probably need to build Python -- the project files +are all in the PCbuild directory. +

+The freeze program is in the Tools\freeze subdirectory of the source +tree. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Feb 17 18:47:24 1999 by +GvR +

+ +


+

8.12. Is a *.pyd file the same as a DLL?

+Yes, .pyd files are dll's. But there are a few differences. If you +have a DLL named foo.pyd, then it must have a function initfoo(). You +can then write Python "import foo", and Python will search for foo.pyd +(as well as foo.py, foo.pyc) and if it finds it, will attempt to call +initfoo() to initialize it. You do not link your .exe with foo.lib, +as that would cause Windows to require the DLL to be present. +

+Note that the search path for foo.pyd is PYTHONPATH, not the same as +the path that Windows uses to search for foo.dll. Also, foo.pyd need +not be present to run your program, whereas if you linked your program +with a dll, the dll is required. Of course, foo.pyd is required if +you want to say "import foo". In a dll, linkage is declared in the +source code with __declspec(dllexport). In a .pyd, linkage is defined +in a list of available functions. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Nov 23 02:40:08 1999 by +Jameson Quinn +

+ +


+

8.13. Missing cw3215mt.dll (or missing cw3215.dll)

+Sometimes, when using Tkinter on Windows, you get an error that +cw3215mt.dll or cw3215.dll is missing. +

+Cause: you have an old Tcl/Tk DLL built with cygwin in your path +(probably C:\Windows). You must use the Tcl/Tk DLLs from the +standard Tcl/Tk installation (Python 1.5.2 comes with one). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 11 00:54:13 1999 by +GvR +

+ +


+

8.14. How to make python scripts executable:

+[Blake Coverett] +

+Win2K: +

+The standard installer already associates the .py extension with a file type +(Python.File) and gives that file type an open command that runs the +interpreter (D:\Program Files\Python\python.exe "%1" %*). This is enough to +make scripts executable from the command prompt as 'foo.py'. If you'd +rather be able to execute the script by simple typing 'foo' with no +extension you need to add .py to the PATHEXT environment variable. +

+WinNT: +

+The steps taken by the installed as described above allow you do run a +script with 'foo.py', but a long time bug in the NT command processor +prevents you from redirecting the input or output of any script executed in +this way. This is often important. +

+An appropriate incantation for making a Python script executable under WinNT +is to give the file an extension of .cmd and add the following as the first +line: +

+

+    @setlocal enableextensions & python -x %~f0 %* & goto :EOF
+
+Win9x: +

+[Due to Bruce Eckel] +

+

+  @echo off
+  rem = """
+  rem run python on this bat file. Needs the full path where
+  rem you keep your python files. The -x causes python to skip
+  rem the first line of the file:
+  python -x c:\aaa\Python\\"%0".bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+  goto endofpython
+  rem """
+
+
+  # The python program goes here:
+
+
+  print "hello, Python"
+
+
+  # For the end of the batch file:
+  rem = """
+  :endofpython
+  rem """
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Nov 30 10:25:17 1999 by +GvR +

+ +


+

8.15. Warning about CTL3D32 version from installer

+The Python installer issues a warning like this: +

+

+  This version uses CTL3D32.DLL whitch is not the correct version.
+  This version is used for windows NT applications only.
+
+[Tim Peters] +This is a Microsoft DLL, and a notorious +source of problems. The msg means what it says: you have the wrong version +of this DLL for your operating system. The Python installation did not +cause this -- something else you installed previous to this overwrote the +DLL that came with your OS (probably older shareware of some sort, but +there's no way to tell now). If you search for "CTL3D32" using any search +engine (AltaVista, for example), you'll find hundreds and hundreds of web +pages complaining about the same problem with all sorts of installation +programs. They'll point you to ways to get the correct version reinstalled +on your system (since Python doesn't cause this, we can't fix it). +

+David A Burton has written a little program to fix this. Go to +http://www.burtonsys.com/download.html and click on "ctl3dfix.zip" +

+ +Edit this entry / +Log info + +/ Last changed on Thu Oct 26 15:42:00 2000 by +GvR +

+ +


+

8.16. How can I embed Python into a Windows application?

+Edward K. Ream <edream@tds.net> writes +

+When '##' appears in a file name below, it is an abbreviated version number. For example, for Python 2.1.1, ## will be replaced by 21. +

+Embedding the Python interpreter in a Windows app can be summarized as +follows: +

+1. Do _not_ build Python into your .exe file directly. On Windows, +Python must be a DLL to handle importing modules that are themselves +DLL's. (This is the first key undocumented fact.) Instead, link to +python##.dll; it is typically installed in c:\Windows\System. +

+You can link to Python statically or dynamically. Linking statically +means linking against python##.lib The drawback is that your app won't +run if python##.dll does not exist on your system. +

+General note: python##.lib is the so-called "import lib" corresponding +to python.dll. It merely defines symbols for the linker. +

+Borland note: convert python##.lib to OMF format using Coff2Omf.exe +first. +

+Linking dynamically greatly simplifies link options; everything happens +at run time. Your code must load python##.dll using the Windows +LoadLibraryEx() routine. The code must also use access routines and +data in python##.dll (that is, Python's C API's) using pointers +obtained by the Windows GetProcAddress() routine. Macros can make +using these pointers transparent to any C code that calls routines in +Python's C API. +

+2. If you use SWIG, it is easy to create a Python "extension module" +that will make the app's data and methods available to Python. SWIG +will handle just about all the grungy details for you. The result is C +code that you link _into your .exe file_ (!) You do _not_ have to +create a DLL file, and this also simplifies linking. +

+3. SWIG will create an init function (a C function) whose name depends +on the name of the extension module. For example, if the name of the +module is leo, the init function will be called initleo(). If you use +SWIG shadow classes, as you should, the init function will be called +initleoc(). This initializes a mostly hidden helper class used by the +shadow class. +

+The reason you can link the C code in step 2 into your .exe file is that +calling the initialization function is equivalent to importing the +module into Python! (This is the second key undocumented fact.) +

+4. In short, you can use the following code to initialize the Python +interpreter with your extension module. +

+

+    #include "python.h"
+    ...
+    Py_Initialize();  // Initialize Python.
+    initmyAppc();  // Initialize (import) the helper class. 
+    PyRun_SimpleString("import myApp") ;  // Import the shadow class.
+
+5. There are two problems with Python's C API which will become apparent +if you use a compiler other than MSVC, the compiler used to build +python##.dll. +

+Problem 1: The so-called "Very High Level" functions that take FILE * +arguments will not work in a multi-compiler environment; each compiler's +notion of a struct FILE will be different. From an implementation +standpoint these are very _low_ level functions. +

+Problem 2: SWIG generates the following code when generating wrappers to +void functions: +

+

+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+
+Alas, Py_None is a macro that expands to a reference to a complex data +structure called _Py_NoneStruct inside python##.dll. Again, this code +will fail in a mult-compiler environment. Replace such code by: +

+

+    return Py_BuildValue("");
+
+It may be possible to use SWIG's %typemap command to make the change +automatically, though I have not been able to get this to work (I'm a +complete SWIG newbie). +

+6. Using a Python shell script to put up a Python interpreter window +from inside your Windows app is not a good idea; the resulting window +will be independent of your app's windowing system. Rather, you (or the +wxPythonWindow class) should create a "native" interpreter window. It +is easy to connect that window to the Python interpreter. You can +redirect Python's i/o to _any_ object that supports read and write, so +all you need is a Python object (defined in your extension module) that +contains read() and write() methods. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 31 16:29:34 2002 by +Victor Kryukov +

+ +


+

8.17. Setting up IIS 5 to use Python for CGI

+In order to set up Internet Information Services 5 to use Python for CGI processing, please see the following links: +

+http://www.e-coli.net/pyiis_server.html (for Win2k Server) +http://www.e-coli.net/pyiis.html (for Win2k pro) +

+ +Edit this entry / +Log info + +/ Last changed on Fri Mar 22 22:05:51 2002 by +douglas savitsky +

+ +


+

8.18. How do I run a Python program under Windows?

+This is not necessarily quite the straightforward question it appears +to be. If you are already familiar with running programs from the +Windows command line then everything will seem really easy and +obvious. If your computer experience is limited then you might need a +little more guidance. Also there are differences between Windows 95, +98, NT, ME, 2000 and XP which can add to the confusion. You might +think of this as "why I pay software support charges" if you have a +helpful and friendly administrator to help you set things up without +having to understand all this yourself. If so, then great! Show them +this page and it should be a done deal. +

+Unless you use some sort of integrated development environment (such +as PythonWin or IDLE, to name only two in a growing family) then you +will end up typing Windows commands into what is variously referred +to as a "DOS window" or "Command prompt window". Usually you can +create such a window from your Start menu (under Windows 2000 I use +"Start | Programs | Accessories | Command Prompt"). You should be +able to recognize when you have started such a window because you will +see a Windows "command prompt", which usually looks like this: +

+

+    C:\>
+
+The letter may be different, and there might be other things after it, +so you might just as easily see something like: +

+

+    D:\Steve\Projects\Python>
+
+depending on how your computer has been set up and what else you have +recently done with it. Once you have started such a window, you are +well on the way to running Python programs. +

+You need to realize that your Python scripts have to be processed by +another program, usually called the "Python interpreter". The +interpreter reads your script, "compiles" it into "Python bytecodes" +(which are instructions for an imaginary computer known as the "Python +Virtual Machine") and then executes the bytecodes to run your +program. So, how do you arrange for the interpreter to handle your +Python? +

+First, you need to make sure that your command window recognises the +word "python" as an instruction to start the interpreter. If you have +opened a command window, you should try entering the command: +

+

+    python
+
+and hitting return. If you then see something like: +

+

+    Python 2.2 (#28, Dec 21 2001, 12:21:22) [MSC 32 bit (Intel)] on win32
+    Type "help", "copyright", "credits" or "license" for more information.
+    >>>
+
+then this part of the job has been correctly managed during Python's +installation process, and you have started the interpreter in +"interactive mode". That means you can enter Python statements or +expressions interactively and have them executed or evaluated while +you wait. This is one of Python's strongest features, but it takes a +little getting used to. Check it by entering a few expressions of your +choice and seeing the results... +

+

+    >>> print "Hello"
+    Hello
+    >>> "Hello" * 3
+    HelloHelloHello
+
+When you want to end your interactive Python session, enter a +terminator (hold the Ctrl key down while you enter a Z, then hit the +"Enter" key) to get back to your Windows command prompt. You may also +find that you have a Start-menu entry such as "Start | Programs | +Python 2.2 | Python (command line)" that results in you seeing the +">>>" prompt in a new window. If so, the window will disappear after +you enter the terminator -- Windows runs a single "python" command in +the window, which terminates when you terminate the interpreter. +

+If the "python" command, instead of displaying the interpreter prompt ">>>", gives you a message like +

+

+    'python' is not recognized as an internal or external command,
+    operable program or batch file.
+
+or +

+

+    Bad command or filename
+
+then you need to make sure that your computer knows where to find the +Python interpreter. To do this you will have to modify a setting +called the PATH, which is a just list of directories where Windows +will look for programs. Rather than just enter the right command every +time you create a command window, you should arrange for Python's +installation directory to be added to the PATH of every command window +as it starts. If you installed Python fairly recently then the command +

+

+    dir C:\py*
+
+will probably tell you where it is installed. Alternatively, perhaps +you made a note. Otherwise you will be reduced to a search of your +whole disk ... break out the Windows explorer and use "Tools | Find" +or hit the "Search" button and look for "python.exe". Suppose you +discover that Python is installed in the C:\Python22 directory (the +default at the time of writing) then you should make sure that +entering the command +

+

+    c:\Python22\python
+
+starts up the interpreter as above (and don't forget you'll need a +"CTRL-Z" and an "Enter" to get out of it). Once you have verified the +directory, you need to add it to the start-up routines your computer +goes through. For older versions of Windows the easiest way to do +this is to edit the C:\AUTOEXEC.BAT file. You would want to add a line +like the following to AUTOEXEC.BAT: +

+

+    PATH C:\Python22;%PATH%
+
+For Windows NT, 2000 and (I assume) XP, you will need to add a string +such as +

+

+    ;C:\Python22
+
+to the current setting for the PATH environment variable, which you +will find in the properties window of "My Computer" under the +"Advanced" tab. Note that if you have sufficient privilege you might +get a choice of installing the settings either for the Current User or +for System. The latter is preferred if you want everybody to be able +to run Python on the machine. +

+If you aren't confident doing any of these manipulations yourself, ask +for help! At this stage you may or may not want to reboot your system +to make absolutely sure the new setting has "taken" (don't you love +the way Windows gives you these freqeuent coffee breaks). You probably +won't need to for Windows NT, XP or 2000. You can also avoid it in +earlier versions by editing the file C:\WINDOWS\COMMAND\CMDINIT.BAT +instead of AUTOEXEC.BAT. +

+You should now be able to start a new command window, enter +

+

+    python
+
+at the "C:>" (or whatever) prompt, and see the ">>>" prompt that +indicates the Python interpreter is reading interactive commands. +

+Let's suppose you have a program called "pytest.py" in directory +"C:\Steve\Projects\Python". A session to run that program might look +like this: +

+

+    C:\> cd \Steve\Projects\Python
+    C:\Steve\Projects\Python> python pytest.py
+
+Because you added a file name to the command to start the interpreter, +when it starts up it reads the Python script in the named file, +compiles it, executes it, and terminates (so you see another "C:\>" +prompt). You might also have entered +

+

+    C:\> python \Steve\Projects\Python\pytest.py
+
+if you hadn't wanted to change your current directory. +

+Under NT, 2000 and XP you may well find that the installation process +has also arranged that the command +

+

+    pytest.py
+
+(or, if the file isn't in the current directory) +

+

+    C:\Steve\Projects\Python\pytest.py
+
+will automatically recognize the ".py" extension and run the Python +interpreter on the named file. Using this feature is fine, but some +versions of Windows have bugs which mean that this form isn't exactly +equivalent to using the interpreter explicitly, so be careful. Easier +to remember, for now, that +

+

+    python C:\Steve\Projects\Python\pytest.py
+
+works pretty close to the same, and redirection will work (more) +reliably. +

+The important things to remember are: +

+1. Start Python from the Start Menu, or make sure the PATH is set +correctly so Windows can find the Python interpreter. +

+

+    python
+
+should give you a '>>>" prompt from the Python interpreter. Don't +forget the CTRL-Z and ENTER to terminate the interpreter (and, if you +started the window from the Start Menu, make the window disappear). +

+2. Once this works, you run programs with commands: +

+

+    python {program-file}
+
+3. When you know the commands to use you can build Windows shortcuts +to run the Python interpreter on any of your scripts, naming +particular working directories, and adding them to your menus, but +that's another lessFAQ. Take a look at +

+

+    python --help
+
+if your needs are complex. +

+4. Interactive mode (where you see the ">>>" prompt) is best used +not for running programs, which are better executed as in steps 2 +and 3, but for checking that individual statements and expressions do +what you think they will, and for developing code by experiment. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Aug 20 16:19:53 2002 by +GvR +

+ +


+Python home / +Python FAQ Wizard 1.0.3 / +Feedback to GvR +

Python Powered
+ + --- python2.7-2.7.8.orig/debian/PVER-dbg.README.Debian.in +++ python2.7-2.7.8/debian/PVER-dbg.README.Debian.in @@ -0,0 +1,58 @@ +Contents of the @PVER@-dbg package +------------------------------------- + +For debugging python and extension modules, you may want to add the contents +of /usr/share/doc/@PVER@/gdbinit (found in the @PVER@-dev package) to your +~/.gdbinit file. + +@PVER@-dbg contains two sets of packages: + + - debugging symbols for the standard @PVER@ build. When this package + is installed, gdb will automatically load up the debugging symbols + from it when debugging @PVER@ or one of the included extension + modules. + + - a separate @PVER@-dbg binary, configured --with-pydebug, enabling the + additional debugging code to help debug memory management problems. + +For the latter, all extension modules have to be recompiled to +correctly load with an pydebug enabled build. + + +Debian and Ubuntu specific changes to the debug interpreter +----------------------------------------------------------- +The python2.4 and python2.5 packages in Ubuntu feisty are modified to +first look for extension modules under a different name. + + normal build: foo.so + debug build: foo_d.so foo.so + +This naming schema allows installation of the extension modules into +the same path (The naming is directly taken from the Windows builds +which already uses this naming scheme). + +See https://wiki.ubuntu.com/PyDbgBuilds for more information. + + +Using the python-dbg builds +--------------------------- + + * Call the python-dbg or the pythonX.Y-dbg binaries instead of the + python or pythonX.Y binaries. + + * Debugging a third party extension requires the availabilty of the + extension built for the debug interpreter. For an extension `foo' + make sure that the `python-foo-dbg' package is installed, or else + the interpreter falls back to the extension for the normal build. + The error on fallback is expected. + + * Properties of the debug build are described in + /usr/share/doc/@PVER@/SpecialBuilds.txt.gz. + The debug interpreter is built with Py_DEBUG defined. + + * From SpecialBuilds.txt: This is what is generally meant by "a debug + build" of Python. Py_DEBUG implies LLTRACE, Py_REF_DEBUG, + Py_TRACE_REFS, and PYMALLOC_DEBUG (if WITH_PYMALLOC is enabled). + In addition, C assert()s are enabled (via the C way: by not defining + NDEBUG), and some routines do additional sanity checks inside + "#ifdef Py_DEBUG" blocks. --- python2.7-2.7.8.orig/debian/PVER-dbg.overrides.in +++ python2.7-2.7.8/debian/PVER-dbg.overrides.in @@ -0,0 +1,11 @@ +@PVER@-dbg binary: package-name-doesnt-match-sonames +@PVER@-dbg binary: non-dev-pkg-with-shlib-symlink + +# no, it's not unusual +@PVER@-dbg binary: unusual-interpreter + +# just the gdb debug file +@PVER@-dbg binary: python-script-but-no-python-dep + +# pointless lintian ... +@PVER@-dbg binary: hardening-no-fortify-functions --- python2.7-2.7.8.orig/debian/PVER-dbg.postinst.in +++ python2.7-2.7.8/debian/PVER-dbg.postinst.in @@ -0,0 +1,19 @@ +#! /bin/sh + +set -e + +if [ "$1" = configure ]; then + files=$(dpkg -L lib@PVER@-dbg@HOST_QUAL@ | sed -n '/^\/usr\/lib\/@PVER@\/.*\.py$/p') + if [ -n "$files" ]; then + @PVER@ -E -S /usr/lib/@PVER@/py_compile.py $files + if grep -sq '^byte-compile[^#]*optimize' /etc/python/debian_config; then + @PVER@ -E -S -O /usr/lib/@PVER@/py_compile.py $files + fi + else + echo >&2 "@PVER@-dbg: can't get files for byte-compilation" + fi +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.8.orig/debian/PVER-dbg.prerm.in +++ python2.7-2.7.8/debian/PVER-dbg.prerm.in @@ -0,0 +1,28 @@ +#! /bin/sh + +set -e + +case "$1" in + remove) + rm -f /usr/lib/debug/usr/bin/@PVER@-gdb.py[co] + rm -f /usr/lib/debug/usr/lib/lib@PVER@.so.1.0-gdb.py[co] + dpkg -L lib@PVER@-dbg@HOST_QUAL@ \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 + ;; + upgrade) + dpkg -L lib@PVER@-dbg@HOST_QUAL@ \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.8.orig/debian/PVER-doc.doc-base.PVER-api.in +++ python2.7-2.7.8/debian/PVER-doc.doc-base.PVER-api.in @@ -0,0 +1,13 @@ +Document: @PVER@-api +Title: Python/C API Reference Manual (v@VER@) +Author: Guido van Rossum +Abstract: This manual documents the API used by C (or C++) programmers who + want to write extension modules or embed Python. It is a + companion to *Extending and Embedding the Python Interpreter*, + which describes the general principles of extension writing but + does not document the API functions in detail. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/c-api/index.html +Files: /usr/share/doc/@PVER@/html/c-api/*.html --- python2.7-2.7.8.orig/debian/PVER-doc.doc-base.PVER-dist.in +++ python2.7-2.7.8/debian/PVER-doc.doc-base.PVER-dist.in @@ -0,0 +1,13 @@ +Document: @PVER@-dist +Title: Distributing Python Modules (v@VER@) +Author: Greg Ward +Abstract: This document describes the Python Distribution Utilities + (``Distutils'') from the module developer's point-of-view, describing + how to use the Distutils to make Python modules and extensions easily + available to a wider audience with very little overhead for + build/release/install mechanics. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/distutils/index.html +Files: /usr/share/doc/@PVER@/html/distutils/*.html --- python2.7-2.7.8.orig/debian/PVER-doc.doc-base.PVER-ext.in +++ python2.7-2.7.8/debian/PVER-doc.doc-base.PVER-ext.in @@ -0,0 +1,16 @@ +Document: @PVER@-ext +Title: Extending and Embedding the Python Interpreter (v@VER@) +Author: Guido van Rossum +Abstract: This document describes how to write modules in C or C++ to extend + the Python interpreter with new modules. Those modules can define + new functions but also new object types and their methods. The + document also describes how to embed the Python interpreter in + another application, for use as an extension language. Finally, + it shows how to compile and link extension modules so that they + can be loaded dynamically (at run time) into the interpreter, if + the underlying operating system supports this feature. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/extending/index.html +Files: /usr/share/doc/@PVER@/html/extending/*.html --- python2.7-2.7.8.orig/debian/PVER-doc.doc-base.PVER-inst.in +++ python2.7-2.7.8/debian/PVER-doc.doc-base.PVER-inst.in @@ -0,0 +1,12 @@ +Document: @PVER@-inst +Title: Installing Python Modules (v@VER@) +Author: Greg Ward +Abstract: This document describes the Python Distribution Utilities + (``Distutils'') from the end-user's point-of-view, describing how to + extend the capabilities of a standard Python installation by building + and installing third-party Python modules and extensions. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/install/index.html +Files: /usr/share/doc/@PVER@/html/install/*.html --- python2.7-2.7.8.orig/debian/PVER-doc.doc-base.PVER-lib.in +++ python2.7-2.7.8/debian/PVER-doc.doc-base.PVER-lib.in @@ -0,0 +1,15 @@ +Document: @PVER@-lib +Title: Python Library Reference (v@VER@) +Author: Guido van Rossum +Abstract: This library reference manual documents Python's standard library, + as well as many optional library modules (which may or may not be + available, depending on whether the underlying platform supports + them and on the configuration choices made at compile time). It + also documents the standard types of the language and its built-in + functions and exceptions, many of which are not or incompletely + documented in the Reference Manual. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/library/index.html +Files: /usr/share/doc/@PVER@/html/library/*.html --- python2.7-2.7.8.orig/debian/PVER-doc.doc-base.PVER-new.in +++ python2.7-2.7.8/debian/PVER-doc.doc-base.PVER-new.in @@ -0,0 +1,10 @@ +Document: @PVER@-new +Title: What's new in Python @VER@ +Author: A.M. Kuchling +Abstract: This documents lists new features and changes worth mentioning + in Python @VER@. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/whatsnew/@VER@.html +Files: /usr/share/doc/@PVER@/html/whatsnew/@VER@.html --- python2.7-2.7.8.orig/debian/PVER-doc.doc-base.PVER-ref.in +++ python2.7-2.7.8/debian/PVER-doc.doc-base.PVER-ref.in @@ -0,0 +1,18 @@ +Document: @PVER@-ref +Title: Python Reference Manual (v@VER@) +Author: Guido van Rossum +Abstract: This reference manual describes the syntax and "core semantics" of + the language. It is terse, but attempts to be exact and complete. + The semantics of non-essential built-in object types and of the + built-in functions and modules are described in the *Python + Library Reference*. For an informal introduction to the language, + see the *Python Tutorial*. For C or C++ programmers, two + additional manuals exist: *Extending and Embedding the Python + Interpreter* describes the high-level picture of how to write a + Python extension module, and the *Python/C API Reference Manual* + describes the interfaces available to C/C++ programmers in detail. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/reference/index.html +Files: /usr/share/doc/@PVER@/html/reference/*.html --- python2.7-2.7.8.orig/debian/PVER-doc.doc-base.PVER-tut.in +++ python2.7-2.7.8/debian/PVER-doc.doc-base.PVER-tut.in @@ -0,0 +1,13 @@ +Document: @PVER@-tut +Title: Python Tutorial (v@VER@) +Author: Guido van Rossum, Fred L. Drake, Jr., editor +Abstract: This tutorial introduces the reader informally to the basic + concepts and features of the Python language and system. It helps + to have a Python interpreter handy for hands-on experience, but + all examples are self-contained, so the tutorial can be read + off-line as well. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/tutorial/index.html +Files: /usr/share/doc/@PVER@/html/tutorial/*.html --- python2.7-2.7.8.orig/debian/PVER-doc.overrides.in +++ python2.7-2.7.8/debian/PVER-doc.overrides.in @@ -0,0 +1,2 @@ +# this is referenced by the html docs +@PVER@-doc binary: extra-license-file --- python2.7-2.7.8.orig/debian/PVER-examples.overrides.in +++ python2.7-2.7.8/debian/PVER-examples.overrides.in @@ -0,0 +1,2 @@ +# don't care about permissions of the example files +@PVER@-examples binary: executable-not-elf-or-script --- python2.7-2.7.8.orig/debian/PVER-minimal.README.Debian.in +++ python2.7-2.7.8/debian/PVER-minimal.README.Debian.in @@ -0,0 +1,157 @@ +Contents of the @PVER@-minimal package +----------------------------------------- + +@PVER@-minimal consists of a minimum set of modules which may be needed +for python scripts used during the boot process. If other packages +are needed in these scripts, don't work around the missing module, but +file a bug report against this package. The modules in this package +are: + + __builtin__ builtin + __future__ module + _abcoll module + _bisect extension + _bytesio extension + _codecs builtin + _collections extension + _fileio extension + _functools extension + _hashlib extensionx + _heapq extension + _io extension + _locale extension + _md5 extension + _random extension + _sha extension + _sha256 extension + _sha512 extension + _socket extension + _sre builtin + _ssl extensionx + _struct extension + _symtable builtin + _sysconfigdata module + _types builtin + _warnings builtin + _weakref extension + _weakrefset module + abc module + atexit module + ConfigParser module + StringIO module + UserDict module + cPickle extension + cStringIO extension + array extension + base64 module + binascii extension + bisect module + cmath extension + calendar module + codecs module + collections module + compileall module + contextlib module + copy module + copy_reg module + datetime extension + dis module + encodings package + errno builtin + exceptions builtin + fcntl extension + fnmatch module + functools module + gc builtin + genericpath module + getopt module + glob module + grp extension + hashlib module + heapq module + imp builtin + inspect module + io module + itertools extension + keyword module + linecache module + locale module + logging package + marshal builtin + math extension + md5 module + opcode module + operator extension + optparse module + os module + pickle module + platform module + popen2 module + posix builtin + posixpath module + pkgutil module + pwd builtin + py_compile module + random module + re module + repr module + runpy module + select extension + sha module + shutil module + signal builtin + socket module + spwd extension + sre module + sre_compile module + sre_constants module + sre_parse module + ssl module + stat module + string module + strop extension + struct module + subprocess module + sys builtin + syslog extension + sysconfig module + tempfile module + textwrap module + time extension + token module + thread builtin + token module + tokenize module + traceback module + types module + unicodedata extension + weakref module + warnings module + zipimport extension + zlib extension + +Included are as well the codecs and stringprep modules, and the encodings +modules for all encodings except the multibyte encodings and the bz2 codec. + +The following modules are excluded, their import is guarded from the +importing module: + + Used in Excluded + ------------ ------------------------------------ + os nt ntpath os2 os2emxpath mac macpath + riscos riscospath riscosenviron + optparse gettext + pickle doctest + subprocess threading + +This list was derived by looking at the modules in the perl-base package, +then adding python specific "core modules". + +TODO's +------ + +- time.strptime cannot be used. The required _strptime module is not + included in the -minimal package yet. _strptime, locale, _locale and + calendar have to be added. + +- modules used very often in the testsuite: copy, cPickle, operator. --- python2.7-2.7.8.orig/debian/PVER-minimal.postinst.in +++ python2.7-2.7.8/debian/PVER-minimal.postinst.in @@ -0,0 +1,78 @@ +#! /bin/sh + +set -e + +if [ ! -f /etc/@PVER@/sitecustomize.py ]; then + cat <<-EOF + # Empty sitecustomize.py to avoid a dangling symlink +EOF +fi + +case "$1" in + configure) + # Create empty directories in /usr/local + if [ ! -e /usr/local/lib/@PVER@ ]; then + mkdir -p /usr/local/lib/@PVER@ 2> /dev/null || true + chmod 2775 /usr/local/lib/@PVER@ 2> /dev/null || true + chown root:staff /usr/local/lib/@PVER@ 2> /dev/null || true + fi + localsite=/usr/local/lib/@PVER@/dist-packages + if [ ! -e $localsite ]; then + mkdir -p $localsite 2> /dev/null || true + chmod 2775 $localsite 2> /dev/null || true + chown root:staff $localsite 2> /dev/null || true + fi + + if which update-binfmts >/dev/null; then + update-binfmts --import @PVER@ + fi + + ;; +esac + +if [ "$1" = configure ]; then + if ls -L /usr/lib/@PVER@/sitecustomize.py >/dev/null 2>&1; then + filt='cat' + else + filt='fgrep -v sitecustomize.py' + fi + files=$(dpkg -L lib@PVER@-minimal@HOST_QUAL@ \ + | sed -n '/^\/usr\/lib\/@PVER@\/.*\.py$/p' | $filt) + if [ -n "$files" ]; then + @PVER@ -E -S /usr/lib/@PVER@/py_compile.py $files + if grep -sq '^byte-compile[^#]*optimize' /etc/python/debian_config; then + @PVER@ -E -S -O /usr/lib/@PVER@/py_compile.py $files + fi + else + echo >&2 "@PVER@-minimal: can't get files for byte-compilation" + fi + bc=no + if [ -z "$2" ] || dpkg --compare-versions "$2" lt 2.7-9 \ + || [ -f /var/lib/python/@PVER@_installed ]; then + bc=yes + fi + if grep -sq '^unsupported-versions[^#]*@PVER@' /usr/share/python/debian_defaults + then + # FIXME: byte compile anyway? + bc=no + fi + if [ "$bc" = yes ]; then + # new installation or installation of first version with hook support + if [ "$DEBIAN_FRONTEND" != noninteractive ]; then + echo "Linking and byte-compiling packages for runtime @PVER@..." + fi + version=$(dpkg -s @PVER@-minimal | awk '/^Version:/ {print $2}') + for hook in /usr/share/python/runtime.d/*.rtinstall; do + [ -x $hook ] || continue + $hook rtinstall @PVER@ "$2" "$version" + done + if [ -f /var/lib/python/@PVER@_installed ]; then + rm -f /var/lib/python/@PVER@_installed + rmdir --ignore-fail-on-non-empty /var/lib/python 2>/dev/null + fi + fi +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.8.orig/debian/PVER-minimal.postrm.in +++ python2.7-2.7.8/debian/PVER-minimal.postrm.in @@ -0,0 +1,21 @@ +#! /bin/sh + +set -e + +if [ "$1" = "remove" ]; then + + if [ -f /var/lib/python/@PVER@_installed ]; then + rm -f /var/lib/python/@PVER@_installed + rmdir --ignore-fail-on-non-empty /var/lib/python 2>/dev/null + fi +fi + +if [ "$1" = "purge" ]; then + for d in `find /usr/lib/@PVER@ -depth -type d -empty 2> /dev/null`; do \ + while rmdir $d 2> /dev/null; do d=`dirname $d`; done; \ + done +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.8.orig/debian/PVER-minimal.preinst.in +++ python2.7-2.7.8/debian/PVER-minimal.preinst.in @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +syssite=/usr/lib/@PVER@/site-packages +oldsite=/usr/lib/@PVER@/old-site-packages +localsite=/usr/local/lib/@PVER@/dist-packages +syslink=../../${localsite#/usr/*} + +case "$1" in + install) + if [ -z "$2" ] && [ -d $syssite ] && [ ! -h $syssite ]; then + echo "new installation of @PVER@-minimal; $syssite is a directory" + echo "which is expected a symlink to $localsite." + echo "please find the package shipping files in $syssite and" + echo "file a bug report to ship these in /usr/lib/@PVER@/dist-packages instead" + echo "aborting installation of @PVER@-minimal" + exit 1 + fi + + # remember newly installed runtime + mkdir -p /var/lib/python + touch /var/lib/python/@PVER@_installed + ;; + upgrade) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- python2.7-2.7.8.orig/debian/PVER-minimal.prerm.in +++ python2.7-2.7.8/debian/PVER-minimal.prerm.in @@ -0,0 +1,36 @@ +#! /bin/sh + +set -e + +case "$1" in + remove) + if [ "$DEBIAN_FRONTEND" != noninteractive ]; then + echo "Unlinking and removing bytecode for runtime @PVER@" + fi + for hook in /usr/share/python/runtime.d/*.rtremove; do + [ -x $hook ] || continue + $hook rtremove @PVER@ || continue + done + + if which update-binfmts >/dev/null; then + update-binfmts --package @PVER@ --remove @PVER@ /usr/bin/@PVER@ + fi + + localsite=/usr/local/lib/@PVER@/dist-packages + [ -d $localsite ] && rmdir $localsite 2>/dev/null || true + [ -d $(dirname $localsite) ] \ + && rmdir $(dirname $localsite) 2>/dev/null || true + ;; + upgrade) + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.8.orig/debian/PVER.desktop.in +++ python2.7-2.7.8/debian/PVER.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Python (v@VER@) +Comment=Python Interpreter (v@VER@) +Exec=/usr/bin/@PVER@ +Icon=/usr/share/pixmaps/@PVER@.xpm +Terminal=true +Type=Application +Categories=Development; +StartupNotify=true +NoDisplay=true --- python2.7-2.7.8.orig/debian/PVER.menu.in +++ python2.7-2.7.8/debian/PVER.menu.in @@ -0,0 +1,4 @@ +?package(@PVER@):needs="text" section="Applications/Programming"\ + title="Python (v@VER@)"\ + icon="/usr/share/pixmaps/@PVER@.xpm"\ + command="/usr/bin/python@VER@" --- python2.7-2.7.8.orig/debian/PVER.overrides.in +++ python2.7-2.7.8/debian/PVER.overrides.in @@ -0,0 +1,14 @@ +# idlelib images +@PVER@ binary: image-file-in-usr-lib + +# yes, we have to +@PVER@ binary: depends-on-python-minimal + +@PVER@ binary: desktop-command-not-in-package +@PVER@ binary: menu-command-not-in-package + +# license file referred by the standard library +@PVER@ binary: extra-license-file + +# no, not useless +@PVER@ binary: manpage-has-useless-whatis-entry --- python2.7-2.7.8.orig/debian/PVER.postinst.in +++ python2.7-2.7.8/debian/PVER.postinst.in @@ -0,0 +1,41 @@ +#! /bin/sh + +set -e + +case "$1" in + configure) + files=$(dpkg -L lib@PVER@-stdlib@HOST_QUAL@ | sed -n '/^\/usr\/lib\/@PVER@\/.*\.py$/p') + if [ -n "$files" ]; then + @PVER@ -E -S /usr/lib/@PVER@/py_compile.py $files + if grep -sq '^byte-compile[^#]*optimize' /etc/python/debian_config; then + @PVER@ -E -S -O /usr/lib/@PVER@/py_compile.py $files + fi + else + echo >&2 "@PVER@: can't get files for byte-compilation" + fi + + # Create empty directories in /usr/local + if [ ! -e /usr/local/lib/python@VER@ ]; then + mkdir -p /usr/local/lib/python@VER@ 2> /dev/null || true + chmod 2775 /usr/local/lib/python@VER@ 2> /dev/null || true + chown root:staff /usr/local/lib/python@VER@ 2> /dev/null || true + fi + if [ ! -e /usr/local/lib/python@VER@/site-packages ]; then + mkdir -p /usr/local/lib/python@VER@/site-packages 2> /dev/null || true + chmod 2775 /usr/local/lib/python@VER@/site-packages 2> /dev/null || true + chown root:staff /usr/local/lib/python@VER@/site-packages 2> /dev/null || true + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- python2.7-2.7.8.orig/debian/PVER.prerm.in +++ python2.7-2.7.8/debian/PVER.prerm.in @@ -0,0 +1,22 @@ +#! /bin/sh + +set -e + +case "$1" in + remove|upgrade) + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +rmdir /usr/local/lib/python@VER@/site-packages 2>/dev/null && \ + rmdir /usr/local/lib/python@VER@ 2>/dev/null || \ + true + +#DEBHELPER# --- python2.7-2.7.8.orig/debian/PVER.pycentral.in +++ python2.7-2.7.8/debian/PVER.pycentral.in @@ -0,0 +1,4 @@ +[@PVER@] +runtime: @PVER@ +interpreter: /usr/bin/@PVER@ +prefix: /usr/lib/@PVER@ --- python2.7-2.7.8.orig/debian/README.Debian.in +++ python2.7-2.7.8/debian/README.Debian.in @@ -0,0 +1,8 @@ +The documentation for this package is in /usr/share/doc/@PVER@/. + +A draft of the "Debian Python Policy" can be found in + + /usr/share/doc/python + +Sometime it will be moved to /usr/share/doc/debian-policy in the +debian-policy package. --- python2.7-2.7.8.orig/debian/README.PVER.in +++ python2.7-2.7.8/debian/README.PVER.in @@ -0,0 +1,95 @@ + + Python @VER@ for Debian + --------------------- + +This is Python @VER@ packaged for Debian. + +This document contains information specific to the Debian packages of +Python @VER@. + + + + [TODO: This document is not yet up-to-date with the packages.] + +Currently, it features those two main topics: + + 1. Release notes for the Debian packages: + 2. Notes for developers using the Debian Python packages: + +Release notes and documentation from the upstream package are installed +in /usr/share/doc/@PVER@/. + +There's a mailing list for discussion of issues related to Python on Debian +systems: debian-python@lists.debian.org. The list is not intended for +general Python problems, but as a forum for maintainers of Python-related +packages and interested third parties. + + + +1. Release notes for the Debian packages: + + +Results of the regression test: +------------------------------ + +The package does successfully run the regression tests for all included +modules. Seven packages are skipped since they are platform-dependent and +can't be used with Linux. + + +2. Notes for developers using the Debian python packages: + +See the draft of the Debian Python policy in /usr/share/doc/python. + +distutils can be found in the @PVER@-dev package. Development files +like the python library or Makefiles can be found in the @PVER@-dev +package in /usr/lib/@PVER@/config. Therefore, if you need to install +a pure python extension, you only need @PVER@. On the other hand, to +install a C extension, you need @PVER@-dev. + +a) Locally installed Python add-ons + + /usr/local/lib/@PVER@/site-packages/ + /usr/local/lib/site-python/ (version-independent modules) + +b) Python add-ons packaged for Debian + + /usr/lib/@PVER@/site-packages/ + /usr/lib/site-python/ (version-independent modules) + +Note that no package must install files directly into /usr/lib/@PVER@/ +or /usr/local/lib/@PVER@/. Only the site-packages directory is allowed +for third-party extensions. + +Use of the new `package' scheme is strongly encouraged. The `ni' interface +is obsolete in python 1.5. + +Header files for extensions go into /usr/include/@PVER@/. + + +Installing extensions for local use only: +---------------------------------------- + +Consider using distutils ... + +Most extensions use Python's Makefile.pre.in. Note that Makefile.pre.in +by default will install files into /usr/lib/, not into /usr/local/lib/, +which is not allowed for local extensions. You'll have to change the +Makefile accordingly. Most times, "make prefix=/usr/local install" will +work. + + +Packaging python extensions for Debian: +-------------------------------------- + +Maintainers of Python extension packages should read + + /usr/share/doc/python/python-policy.txt.gz + + + + + 03/09/98 + Gregor Hoffleit + +Last change: 2001-12-14 --- python2.7-2.7.8.orig/debian/README.Tk +++ python2.7-2.7.8/debian/README.Tk @@ -0,0 +1,8 @@ +Tkinter documentation can be found at + + http://www.pythonware.com/library/index.htm + +more specific: + + http://www.pythonware.com/library/tkinter/introduction/index.htm + http://www.pythonware.com/library/tkinter/an-introduction-to-tkinter.pdf --- python2.7-2.7.8.orig/debian/README.dbm +++ python2.7-2.7.8/debian/README.dbm @@ -0,0 +1,72 @@ + + Python and dbm modules on Debian + -------------------------------- + +This file documents the configuration of the dbm modules for Debian. It +gives hints at the preferred use of the dbm modules. + + +The preferred way to access dbm databases in Python is the anydbm module. +dbm databases behave like mappings (dictionaries). + +Since there exist several dbm database formats, we choose the following +layout for Python on Debian: + + * creating a new database with anydbm will create a Berkeley DB 2.X Hash + database file. This is the standard format used by libdb starting + with glibc 2.1. + + * opening an existing database with anydbm will try to guess the format + of the file (using whichdb) and then load it using one of the bsddb, + bsddb1, gdbm or dbm (only if the python-gdbm package is installed) + or dumbdbm modules. + + * The modules use the following database formats: + + - bsddb: Berkeley DB 2.X Hash (as in libc6 >=2.1 or libdb2) + - bsddb1: Berkeley DB 1.85 Hash (as in libc6 >=2.1 or libdb2) + - gdbm: GNU dbm 1.x or ndbm + - dbm: " (nearly the same as the gdbm module for us) + - dumbdbm: a hand-crafted format only used in this module + + That means that all usual formats should be readable with anydbm. + + * If you want to create a database in a format different from DB 2.X, + you can still directly use the specified module. + + * I.e. bsddb is the preferred module, and DB 2.X is the preferred format. + + * Note that the db1hash and bsddb1 modules are Debian specific. anydbm + and whichdb have been modified to support DB 2.X Hash files (see + below for details). + + + +For experts only: +---------------- + +Although bsddb employs the new DB 2.X format and uses the new Sleepycat +DB 2 library as included with glibc >= 2.1, it's still using the old +DB 1.85 API (which is still supported by DB 2). + +A more recent version 1.1 of the BSD DB module (available from +http://starship.skyport.net/robind/python/) directly uses the DB 2.X API. +It has a richer set of features. + + +On a glibc 2.1 system, bsddb is linked with -ldb, bsddb1 is linked with +-ldb1 and gdbm as well as dbm are linked with -lgdbm. + +On a glibc 2.0 system (e.g. potato for m68k or slink), bsddb will be +linked with -ldb2 while bsddb1 will be linked with -ldb (therefore +python-base here depends on libdb2). + + +db1hash and bsddb1 nearly completely identical to dbhash and bsddb. The +only difference is that bsddb is linked with the real DB 2 library, while +bsddb1 is linked with an library which provides compatibility with legacy +DB 1.85 databases. + + + July 16, 1999 + Gregor Hoffleit --- python2.7-2.7.8.orig/debian/README.idle-PVER.in +++ python2.7-2.7.8/debian/README.idle-PVER.in @@ -0,0 +1,14 @@ + + The Python IDLE package for Debian + ---------------------------------- + +This package contains Python @VER@'s Integrated DeveLopment Environment, IDLE. + +IDLE is included in the Python @VER@ upstream distribution (Tools/idle) and +depends on Tkinter (available as @PVER@-tk package). + +I have written a simple man page. + + + 06/16/1999 + Gregor Hoffleit --- python2.7-2.7.8.orig/debian/README.maintainers.in +++ python2.7-2.7.8/debian/README.maintainers.in @@ -0,0 +1,88 @@ + +Hints for maintainers of Debian packages of Python extensions +------------------------------------------------------------- + +Most of the content of this README can be found in the Debian Python policy. +See /usr/share/doc/python/python-policy.txt.gz. + +Documentation Tools +------------------- + +If your package ships documentation produced in the Python +documentation format, you can generate it at build-time by +build-depending on @PVER@-dev, and you will find the +templates, tools and scripts in /usr/lib/@PVER@/doc/tools -- +adjust your build scripts accordingly. + + +Makefile.pre.in issues +---------------------- + +Python comes with a `universal Unix Makefile for Python extensions' in +/usr/lib/@PVER@/config/Makefile.pre.in (with Debian, this is included +in the python-dev package), which is used by most Python extensions. + +In general, packages using the Makefile.pre.in approach can be packaged +simply by running dh_make or by using one of debhelper's rules' templates +(see /usr/doc/debhelper/examples/). Makefile.pre.in works fine with e.g. +"make prefix=debian/tmp/usr install". + +One glitch: You may be running into the problem that Makefile.pre.in +doesn't try to create all the directories when they don't exist. Therefore, +you may have to create them manually before "make install". In most cases, +the following should work: + + ... + dh_installdirs /usr/lib/@PVER@ + $(MAKE) prefix=debian/tmp/usr install + ... + + +Byte-compilation +---------------- + +For speed reasons, Python internally compiles source files into a byte-code. +To speed up subsequent imports, it tries to save the byte-code along with +the source with an extension .pyc (resp. pyo). This will fail if the +libraries are installed in a non-writable directory, which may be the +case for /usr/lib/@PVER@/. + +Not that .pyc and .pyo files should not be relocated, since for debugging +purposes the path of the source for is hard-coded into them. + +To precompile files in batches after installation, Python has a script +compileall.py, which compiles all files in a given directory tree. The +Debian version of compileall has been enhanced to support incremental +compilation and to feature a ddir (destination dir) option. ddir is +used to compile files in debian/usr/lib/python/ when they will be +installed into /usr/lib/python/. + + +Currently, there are two ways to use compileall for Debian packages. The +first has a speed penalty, the second has a space penalty in the package. + +1.) Compiling and removing .pyc files in postinst/prerm: + + Use dh_python(1) from the debhelper packages to add commands to byte- + compile on installation and to remove the byte-compiled files on removal. + Your package has to build-depend on: debhelper (>= 4.1.67), python. + + In /usr/share/doc/@PVER@, you'll find sample.postinst and sample.prerm. + If you set the directory where the .py files are installed, these + scripts will install and remove the .pyc and .pyo files for your + package after unpacking resp. before removing the package. + +2.) Compiling the .pyc files `out of place' during installation: + + As of 1.5.1, compileall.py allows you to specify a faked installation + directory using the "-d destdir" option, so that you can precompile + the files in their temporary directory + (e.g. debian/tmp/usr/lib/python2.1/site-packages/PACKAGE). + + + + 11/02/98 + Gregor Hoffleit + + +Last modified: 2007-10-14 --- python2.7-2.7.8.orig/debian/README.python +++ python2.7-2.7.8/debian/README.python @@ -0,0 +1,153 @@ + + Python 2.x for Debian + --------------------- + +This is Python 2.x packaged for Debian. + +This document contains information specific to the Debian packages of +Python 2.x. + + + + [TODO: This document is not yet up-to-date with the packages.] + + + + + + +Currently, it features those two main topics: + + 1. Release notes for the Debian packages: + 2. Notes for developers using the Debian Python packages: + +Release notes and documentation from the upstream package are installed +in /usr/share/doc/python/. + +Up-to-date information regarding Python on Debian systems is also +available as http://www.debian.org/~flight/python/. + +There's a mailing list for discussion of issues related to Python on Debian +systems: debian-python@lists.debian.org. The list is not intended for +general Python problems, but as a forum for maintainers of Python-related +packages and interested third parties. + + + +1. Release notes for the Debian packages: + + +Results of the regression test: +------------------------------ + +The package does successfully run the regression tests for all included +modules. Seven packages are skipped since they are platform-dependent and +can't be used with Linux. + + +Noteworthy changes since the 1.4 packages: +----------------------------------------- + +- Threading support enabled. +- Tkinter for Tcl/Tk 8.x. +- New package python-zlib. +- The dbmmodule was dropped. Use bsddb instead. gdbmmodule is provided + for compatibility's sake. +- python-elisp adheres to the new emacs add-on policy; it now depends + on emacsen. python-elisp probably won't work correctly with emacs19. + Refer to /usr/doc/python-elisp/ for more information. +- Remember that 1.5 has dropped the `ni' interface in favor of a generic + `packages' concept. +- Python 1.5 regression test as additional package python-regrtest. You + don't need to install this package unless you don't trust the + maintainer ;-). +- once again, modified upstream's compileall.py and py_compile.py. + Now they support compilation of optimized byte-code (.pyo) for use + with "python -O", removal of .pyc and .pyo files where the .py source + files are missing (-d) and finally the fake of a installation directory + when .py files have to be compiled out of place for later installation + in a different directory (-i destdir, used in ./debian/rules). +- The Debian packages for python 1.4 do call + /usr/lib/python1.4/compileall.py in their postrm script. Therefore + I had to provide a link from /usr/lib/python1.5/compileall.py, otherwise + the old packages won't be removed completely. THIS IS A SILLY HACK! + + + +2. Notes for developers using the Debian python packages: + + +Embedding python: +---------------- + +The files for embedding python resp. extending the python interpreter +are included in the python-dev package. With the configuration in the +Debian GNU/Linux packages of python 1.5, you will want to use something +like + + -I/usr/include/python1.5 (e.g. for config.h) + -L/usr/lib/python1.5/config -lpython1.5 (... -lpthread) + (also for Makefile.pre.in, Setup etc.) + +Makefile.pre.in automatically gets that right. Note that unlike 1.4, +python 1.5 has only one library, libpython1.5.a. + +Currently, there's no shared version of libpython. Future version of +the Debian python packages will support this. + + +Python extension packages: +------------------------- + +According to www.python.org/doc/essays/packages.html, extension packages +should only install into /usr/lib/python1.5/site-packages/ (resp. +/usr/lib/site-python/ for packages that are definitely version independent). +No extension package should install files directly into /usr/lib/python1.5/. + +But according to the FSSTND, only Debian packages are allowed to use +/usr/lib/python1.5/. Therefore Debian Python additionally by default +searches a second hierarchy in /usr/local/lib/. These directories take +precedence over their equivalents in /usr/lib/. + +a) Locally installed Python add-ons + + /usr/local/lib/python1.5/site-packages/ + /usr/local/lib/site-python/ (version-independent modules) + +b) Python add-ons packaged for Debian + + /usr/lib/python1.5/site-packages/ + /usr/lib/site-python/ (version-independent modules) + +Note that no package must install files directly into /usr/lib/python1.5/ +or /usr/local/lib/python1.5/. Only the site-packages directory is allowed +for third-party extensions. + +Use of the new `package' scheme is strongly encouraged. The `ni' interface +is obsolete in python 1.5. + +Header files for extensions go into /usr/include/python1.5/. + + +Installing extensions for local use only: +---------------------------------------- + +Most extensions use Python's Makefile.pre.in. Note that Makefile.pre.in +by default will install files into /usr/lib/, not into /usr/local/lib/, +which is not allowed for local extensions. You'll have to change the +Makefile accordingly. Most times, "make prefix=/usr/local install" will +work. + + +Packaging python extensions for Debian: +-------------------------------------- + +Maintainers of Python extension packages should read README.maintainers. + + + + + 03/09/98 + Gregor Hoffleit + +Last change: 07/16/1999 --- python2.7-2.7.8.orig/debian/README.source +++ python2.7-2.7.8/debian/README.source @@ -0,0 +1,7 @@ +The source tarball is lacking the files Lib/profile.py and Lib/pstats.py, +which Debian considers to have a license non-suitable for main (the use +of these modules limited to python). + +The package uses quilt to apply / unapply patches. +See /usr/share/doc/quilt/README.source. The series file is generated +during the build. --- python2.7-2.7.8.orig/debian/_sysconfigdata.py +++ python2.7-2.7.8/debian/_sysconfigdata.py @@ -0,0 +1,6 @@ +import sys + +if hasattr(sys, 'gettotalrefcount'): + from _sysconfigdata_d import * +else: + from _sysconfigdata_nd import * --- python2.7-2.7.8.orig/debian/argparse.egg-info +++ python2.7-2.7.8/debian/argparse.egg-info @@ -0,0 +1,8 @@ +Metadata-Version: 1.0 +Name: argparse +Version: 1.2.1 +Summary: Python command-line parsing library +Author: Steven Bethard +Author-email: steven.bethard@gmail.com +License: Python Software Foundation License +Platform: any --- python2.7-2.7.8.orig/debian/changelog +++ python2.7-2.7.8/debian/changelog @@ -0,0 +1,3649 @@ +python2.7 (2.7.8-12) unstable; urgency=medium + + * Update to 20141118, taken from the 2.7 branch. + - Issue #12728: Different Unicode characters having the same uppercase + but different lowercase are now matched in case-insensitive regular + expressions. + - Issue #22821: Fixed fcntl() with integer argument on 64-bit big-endian + platforms. + - Issues #814253, #9179: Group references and conditional group references + now work in lookbehind assertions in regular expressions. + - Issue #22769: Fixed ttk.Treeview.tag_has() when called without arguments. + - Issue #22787: Allow the keyfile argument of SSLContext.load_cert_chain + to be None. + - Issue #22775: Fixed unpickling of Cookie.SimpleCookie with protocol 2. + - Issue #22776: Brought excluded code into the scope of a try block in + SysLogHandler.emit(). + - Issue #17381: Fixed ranges handling in case-insensitive regular + expressions. + - Issue #19329: Optimized compiling charsets in regular expressions. + - Issue #22410: Module level functions in the re module now cache compiled + locale-dependent regular expressions taking into account the locale. + - Issue #8876: distutils now falls back to copying files when hard linking + doesn't work. This allows use with special filesystems such as + VirtualBox shared folders. + - Issue #22193: Fixed integer overflow error in sys.getsizeof(). + * Backport the ensurepip patch from 3.4. + * Disable ensurepip in Debian, at least for the upcoming release. + * Fix maintainer scripts for byte-code removal. Closes: #769078. + * Allow building and testing without SSLv3 support (Kurt Roeckx). + Closes: #768611. + * Let distutils.sysconfig.get_python_inc() honor the "prefix" argument. + Closes: #769720. + + -- Matthias Klose Tue, 18 Nov 2014 11:37:13 +0100 + +python2.7 (2.7.8-11) unstable; urgency=medium + + * Update to 20141018, taken from the 2.7 branch. + - Issue #9351: Defaults set with set_defaults on an argparse subparser + are no longer ignored when also set on the parent parser. + - Issue #20421: Add a .version() method to SSL sockets exposing the actual + protocol version in use. + - Issue #22435: Fix a file descriptor leak when SocketServer bind fails. + - Issue #13664: GzipFile now supports non-ascii Unicode filenames. + - Issue #13096: Fixed segfault in CTypes POINTER handling of large + values. + - Issue #11694: Raise ConversionError in xdrlib as documented. + - Issue #10712: 2to3 has a new "asserts" fixer that replaces deprecated names + of unittest methods (e.g. failUnlessEqual -> assertEqual). + * Pass -ffat-lto-objects for LTO enabled builds with GCC 4.9. + + -- Matthias Klose Sat, 18 Oct 2014 14:14:19 +0200 + +python2.7 (2.7.8-10) unstable; urgency=medium + + * Update to 20141007, taken from the 2.7 branch. + + -- Matthias Klose Tue, 07 Oct 2014 19:42:51 +0200 + +python2.7 (2.7.8-9) unstable; urgency=medium + + * Fix refcounting error in the fix for issue #22523. Closes: #762010. + + -- Matthias Klose Thu, 02 Oct 2014 13:49:07 +0200 + +python2.7 (2.7.8-8) unstable; urgency=medium + + * Update to 20141002, taken from the 2.7 branch. + * Refresh patches. + * Apply proposed patch for issue #22523. Closes: #762010. + + -- Matthias Klose Thu, 02 Oct 2014 02:13:37 +0200 + +python2.7 (2.7.8-7) unstable; urgency=medium + + * Update to 20140909, taken from the 2.7 branch. + * debian/tests/testsuite{,-dbg}: Several tests fail with configured proxy + and disabled network test resources. Explicitly unset proxy variables. + See issue #22371. + + -- Matthias Klose Tue, 09 Sep 2014 22:02:11 +0200 + +python2.7 (2.7.8-6) unstable; urgency=medium + + * distuils: For extension builds, always pass BASECFLAGS. + + -- Matthias Klose Sat, 23 Aug 2014 22:50:19 +0200 + +python2.7 (2.7.8-5) unstable; urgency=medium + + * Build-depend on dpkg-dev (>= 1.17.11). + + -- Matthias Klose Mon, 18 Aug 2014 09:43:43 +0200 + +python2.7 (2.7.8-4) unstable; urgency=medium + + * distutils: For extension builds pass the CPPFLAGS, CFLAGS, LDFLAGS + used for the python build when these flags cannot be found in the + environment. + * Don't use the system python during the build. + * Build using autotools-dev. Closes: #756772. + * Pass AR and RANLIB for lto enabled builds. + + -- Matthias Klose Sun, 10 Aug 2014 13:45:31 +0200 + +python2.7 (2.7.8-3) unstable; urgency=medium + + * Call dpkg -L in the maintainer scripts with an architecture qualifier + for M-A: same packages. Closes: #736385. + * Apply the plat-linux2_mips patch for mips64 and mips64el. Closes: #755578. + + -- Matthias Klose Sat, 26 Jul 2014 15:32:47 +0200 + +python2.7 (2.7.8-2) unstable; urgency=medium + + * Revert the backport of issue #1856 (avoid daemon thread problems + at shutdown). Issue #21963. Apparently ceph has issues with it. + Closes: #754341. + + -- Matthias Klose Sat, 12 Jul 2014 10:19:55 +0200 + +python2.7 (2.7.8-1) unstable; urgency=medium + + * Python 2.7.8 release. + + -- Matthias Klose Fri, 04 Jul 2014 14:41:31 +0200 + +python2.7 (2.7.7-2) unstable; urgency=medium + + * Re-enable the test_pydoc, test_tools, test_subprocess and test_uuid + autopkg tests. + * In the autopkg tests, make $ADTTMP accessible to the su user. + + -- Matthias Klose Tue, 03 Jun 2014 10:13:57 +0200 + +python2.7 (2.7.7-1) unstable; urgency=medium + + * Python 2.7.7 release. + * Refresh patches. + * In the autopkg tests, set HOME to the temporary home directory after + the su call. + * Expect test failures in the distutils autopkg tests. + * Disable the test_solaris_enable_shared test. + + -- Matthias Klose Mon, 02 Jun 2014 10:53:46 +0200 + +python2.7 (2.7.7~rc1-1) unstable; urgency=medium + + * Python 2.7.7 release candidate 1. + * Run the testsuite in a temporary home directory. + + -- Matthias Klose Wed, 21 May 2014 12:15:26 +0100 + +python2.7 (2.7.6-8) unstable; urgency=medium + + * Set a temporary home directory for the build and the autopkg tests. + + -- Matthias Klose Sat, 22 Mar 2014 14:31:54 +0100 + +python2.7 (2.7.6-8) unstable; urgency=medium + + * Update to 20140322, taken from the 2.7 branch. + * Install updated idle icons. LP: #1295969. + * Update the ssl.match_hostname backport: Change behavior of + ``ssl.match_hostname()`` to follow RFC 6125, for security reasons. + It now doesn't match multiple wildcards nor wildcards inside IDN fragments. + Closes: #740255. + + -- Matthias Klose Sat, 22 Mar 2014 14:31:54 +0100 + +python2.7 (2.7.6-7) unstable; urgency=medium + + * Include test data for test_imghdr test. + + -- Matthias Klose Wed, 26 Feb 2014 01:16:47 +0100 + +python2.7 (2.7.6-6) unstable; urgency=high + + * Update to 20140225, taken from the 2.7 branch. + - CVE-2014-1912. Fix issue 20246, buffer overflow in socket.recvfrom_into. + * Build without ffi on or1k. Closes: #738519. + * Allow loading of extensions in the sqlite module. Closes: #739555. + * Update autopkg tests (Martin Pitt): + - Don't fail if apport is not installed. + - Call su with explicit shell, as nobody has nologin as default shell now. + - Only use $SUDO_USER if that user actually exists in the testbed. + - Drop obsolete chowning of $TMPDIR and $ADTTMP; with current autopkgtest + $TMPDIR has appropriate permissions, and $ADTTMP is not being used. + + -- Matthias Klose Tue, 25 Feb 2014 10:51:27 +0100 + +python2.7 (2.7.6-5) unstable; urgency=medium + + * Update to 20140111, taken from the 2.7 branch. + * Build-depend on net-tools, required for the test_uuid test. + * Build-depend on the default Tcl/Tk. + * Add two new autopkg tests to run the failing tests. + + -- Matthias Klose Sat, 11 Jan 2014 14:52:11 +0100 + +python2.7 (2.7.6-4) unstable; urgency=medium + + * Update to 20131230, taken from the 2.7 branch. + * Disable sphinx refcounting extension, removed in sphinx-1.2. + Closes: #733404. + + -- Matthias Klose Mon, 30 Dec 2013 15:17:09 +0100 + +python2.7 (2.7.6-3) unstable; urgency=low + + * Update to 20131206, taken from the 2.7 branch. + * Disable the test_uuid autopkg test, hanging, missing entropy? + * Drop python dependency in libpython2.7-dbg. + * Revert patch from http://bugs.python.org/issue19352 as it completely breaks + unittest discovery on Debian/Ubuntu. LP: #1255505. + + -- Matthias Klose Fri, 06 Dec 2013 20:35:22 +0100 + +python2.7 (2.7.6-2) unstable; urgency=low + + * Update to 20131121, taken from the 2.7 branch. + * Fix test support when the running kernel doesn't handle port reuse. + * Build-depend on libdb-dev (<< 1:6.0) instead of a specific db version. + + -- Matthias Klose Fri, 22 Nov 2013 13:06:15 +0100 + +python2.7 (2.7.6-1) unstable; urgency=low + + * Python 2.7.6 release. + * Update to 20131119, taken from the 2.7 branch. + * For autopkg tests, only run the separate tests when defined. + * Don't run the curses autopkg test. + * Disable running the testsuite on mipsn32(el) and mips64(el), + requested by YunQiang Su. Closes: #719057. + + -- Matthias Klose Tue, 19 Nov 2013 11:45:31 +0100 + +python2.7 (2.7.5-8) unstable; urgency=medium + + * Update to 20130917, taken from the 2.7 branch. + - Fix SSL module to handle NULL bytes inside subjectAltNames general + names (CVE-2013-4238). Closes: #719566. + * Don't run the curses autopkg test. + * Set Multi-Arch attributes for binary packages. + * Fix multiarch include header for sparc64. Closes: #714802, #715063. + + -- Matthias Klose Tue, 17 Sep 2013 15:47:45 +0200 + +python2.7 (2.7.5-7) unstable; urgency=low + + * Update to 20130803, taken from the 2.7 branch. + * Update package descriptions (Filipus Klutiero). Closes: #715801. + * Fix multiarch include header for sparc64. Closes: #715063. + * Move removal of the sitecustomize.py file into the libpython-minimal + postrm. Closes: #709964. + + -- Matthias Klose Sun, 04 Aug 2013 11:56:52 +0200 + +python2.7 (2.7.5-6) unstable; urgency=low + + * Update to 20130613, taken from the 2.7 branch. + * Refresh patches. + * Don't run consistency check for cross builds. + * Really skip byte compile of non-existing sitecustomize.py. + * Fix the multiarch header file for mips64 (YunQiang Su). Closes: #710374. + + -- Matthias Klose Thu, 13 Jun 2013 13:06:51 +0200 + +python2.7 (2.7.5-5) unstable; urgency=low + + * Update to 20130602, taken from the 2.7 branch. + * Fix possible abuse of ssl.match_hostname() for denial of service + using certificates with many wildcards (CVE-2013-2099). Closes: #709066. + * Don't try to byte-compile sitecustomize.py if the target of the + symlink doesn't exist anymore. Closes: #709157. + * Handle byte compilation in python2.7{-minimal,}, byte removal in + libpython2.7{-minimal,-stdlib}. Closes: #709964. + * Backport patch to fix issue #13146, possible race conditions when writing + .pyc/.pyo files in py_compile.py (Barry Warsaw). LP: #1058884. + * Fix issue #17988, internal error in regular expression engine on 32bit + targets (closes: #710315). + + -- Matthias Klose Sun, 02 Jun 2013 15:11:19 +0200 + +python2.7 (2.7.5-4) unstable; urgency=low + + * Move the libc dependency of -minimal from Depends to Pre-Depends. + Closes: #708831. + * Disable the test_io test on armel, armhf, mips, mipsel. Hangs the + buildds. + + -- Matthias Klose Mon, 20 May 2013 12:21:06 +0200 + +python2.7 (2.7.5-3) unstable; urgency=high + + * Fix the multiarch header file for ppc64. Closes: #708641. + + -- Matthias Klose Sat, 18 May 2013 20:18:38 +0200 + +python2.7 (2.7.5-2) unstable; urgency=low + + * Only run the _multiprocessing build check on linux targets. + + -- Matthias Klose Wed, 15 May 2013 22:09:30 +0200 + +python2.7 (2.7.5-1) unstable; urgency=low + + * Python 2.7.5 release. + * Set the platinclude dir back to the non-multiarch include path, + where the multiarch pyconfig.h compatibility header is found. + * Fix issue #17703: Fix a regression where an illegal use of Py_DECREF() + after interpreter finalization can cause a crash. + * Issue #17754, setting LANG and LC_ALL for the compiler call in ctypes/util. + * Issue #17761, platform._parse_release_file doesn't close the + /etc/lsb-release file, and doesn't know about 'Ubuntu'. + * Fix autopkg tests. + * Re-enable lto and pgo optimized builds, accidentally disabled for the + last upload. + * more autopkg test fixes. + * Link the ctypes extension with the shared libffi library. + * Fix a distutils test with the deb install layout. + * Move lib2to3 library into libpython2.7-stdlib. Closes: #705078. + * Don't set yet any Multi-Arch: attributes in Debian. + + -- Matthias Klose Wed, 15 May 2013 15:02:13 +0200 + +python2.7 (2.7.4-2) experimental; urgency=low + + * Idle updates: + - Issue #17657: Show full Tk version in IDLE's about dialog. + - Issue #17613: Prevent traceback when removing syntax colorizer. + - Issue #1207589: Backwards-compatibility patch for right-click menu. + - Issue #16887: Now accepts Cancel in tabify/untabify dialog box. + - Issue #14254: Now handles readline correctly across shell restarts. + - Issue #17614: No longer raises exception when quickly closing a file. + - Issue #6698: Now opens just an editor window when configured to do so. + - Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer + raises an exception. + - Issue #6649: Fixed missing exit status. + * Build a libpython2.7-testsuite package. LP: #301629. + * Add autopkg tests to run the installed testsuite in normal and debug + mode. + * Re-enable running the tests during the build. + * Add the io and _io modules to libpython2.7-minimal. + * Backport ssl.CertificateError as well. Closes: #626539. LP: #1166344. + * Don't ship an uncompress python man page. Closes: #705079. + + -- Matthias Klose Thu, 11 Apr 2013 00:44:48 +0200 + +python2.7 (2.7.4-1ubuntu4) raring; urgency=low + + * Build a libpython2.7-testsuite package. LP: #301629. + * Add autopkg tests to run the installed testsuite in normal and debug + mode. + * Re-enable running the tests during the build. + * Idle updates: + - Issue #17657: Show full Tk version in IDLE's about dialog. + - Issue #17613: Prevent traceback when removing syntax colorizer. + - Issue #1207589: Backwards-compatibility patch for right-click menu. + - Issue #16887: Now accepts Cancel in tabify/untabify dialog box. + - Issue #14254: Now handles readline correctly across shell restarts. + - Issue #17614: No longer raises exception when quickly closing a file. + - Issue #6698: Now opens just an editor window when configured to do so. + - Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer + raises an exception. + - Issue #6649: Fixed missing exit status. + + -- Matthias Klose Tue, 09 Apr 2013 17:53:02 +0200 + +python2.7 (2.7.4-1ubuntu3) raring; urgency=low + + * Add the io and _io modules to libpython2.7-minimal. LP: #1165172. + * Add missing import for the ssl module. LP: #1166644. + + -- Matthias Klose Tue, 09 Apr 2013 12:11:12 +0200 + +python2.7 (2.7.4-1ubuntu2) raring; urgency=low + + * Backport ssl.CertificateError as well. Closes: #626539. LP: #1166344. + + -- Matthias Klose Mon, 08 Apr 2013 20:59:52 +0200 + +python2.7 (2.7.4-1ubuntu1) raring; urgency=low + + * Merge with Debian; remaining changes: + - Build-depend on python:any instead of python. + + -- Matthias Klose Sat, 06 Apr 2013 17:45:49 +0200 + +python2.7 (2.7.4-1) experimental; urgency=low + + * Python 2.7.4 release. + - Issue #17550: Fix the --enable-profiling configure switch. + - Issue #15801 (again): With string % formatting, relax the type check + for a mapping such that any type with a __getitem__ can be used on the + right hand side. + - Issue #17625: In IDLE, close the replace dialog after it is used. + - Issue #17531: Fix tests that thought group and user ids were always + the int type. Also, always allow -1 as a valid group and user id. + - Issue 17538: Document XML vulnerabilties + * Byte-compile files in libpython2.7-dbg. + * libpython2.7-minimal: Break earlier python2.7-minimal versions. + Closes: #704084. LP: #1157687. + * Call python with -E -S for the byte compilation. + + -- Matthias Klose Sat, 06 Apr 2013 16:38:57 +0200 + +python2.7 (2.7.4~rc1-4) experimental; urgency=low + + * Fix byte-compiliation/-removal for the split-out library packages. + LP: #1160944. + + -- Matthias Klose Sat, 30 Mar 2013 12:51:58 +0100 + +python2.7 (2.7.4~rc1-3) experimental; urgency=low + + * Fix webbrowser update. Closes: #703872. LP: #1159636. + + -- Matthias Klose Mon, 25 Mar 2013 14:33:50 +0100 + +python2.7 (2.7.4~rc1-2) experimental; urgency=low + + * Backport webbrowser updates from 3.3. Closes: #700429. + * Build again using db-5.1 instead of db-5.3. + + -- Matthias Klose Sun, 24 Mar 2013 18:27:57 +0100 + +python2.7 (2.7.4~rc1-1) experimental; urgency=low + + * Python 2.7.4 release candidate 1. + - Issue #10211: Buffer objects expose the new buffer interface internally. + - Issue #10212: cStringIO and struct.unpack support new buffer objects. + - Issue #12098: multiprocessing on Windows now starts child processes + using the same sys.flags as the current process. + - Issue #8862: Fixed curses cleanup when getkey is interrputed by a signal. + - Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or + EAGAIN, retry the select() loop instead of bailing out. + - Issue #1285086: Get rid of the refcounting hack and speed up + urllib.unquote(). + - Issue #17368: Fix an off-by-one error in the Python JSON decoder + that caused a failure while decoding empty object literals when + object_pairs_hook was specified. + - Issue #17477: Update the bsddb module to pybsddb 5.3.0, supporting + db-5.x, and dropping support for db-4.1 and db-4.2. + - Issue #17192: Update the ctypes module's libffi to v3.0.13. This + specifically addresses a stack misalignment issue on x86 and issues on + some more recent platforms. + - Issue #11420: make test suite pass with -B/DONTWRITEBYTECODE set. + - Issue #17299: Add test coverage for cPickle with file objects + and general IO objects. + - Issue #11963: remove human verification from test_parser and + test_subprocess. + - Issue #16004: Add `make touch`. + - Issue #17047: remove doubled words in docs and docstrings + * Rework the sysconfigdata patch into something upstreamable. + + -- Matthias Klose Sun, 24 Mar 2013 01:56:36 +0100 + +python2.7 (2.7.3-16ubuntu2) raring; urgency=low + + * Update to 20130315, taken from the 2.7 branch. + - Issue #1285086: Get rid of the refcounting hack and speed + up urllib.unquote(). + - Issue #17368: Fix an off-by-one error in the Python JSON decoder + that caused a failure while decoding empty object literals when + object_pairs_hook was specified. + - Issue #17299: Add test coverage for cPickle with file objects and general + IO objects. + - Issue #11963: Remove human verification from test_parser and + test_subprocess. + - Issue #16004: Add `make touch`. + - Issue #17412: Update 2.7 Doc/make.bat to also use sphinx-1.0.7. + - Issue #17047: Remove doubled words in docs and docstrings. + * Revert the patch for Issue #1159051, handling corrupted gzip files + with unexpected EOF. LP: #1116079. + + -- Matthias Klose Fri, 15 Mar 2013 12:20:10 -0700 + +python2.7 (2.7.3-16ubuntu1) raring; urgency=low + + * Merge with Debian; remaining changes: + - Build-depend on python:any instead of python. + * Update symbols files. + + -- Matthias Klose Fri, 08 Mar 2013 14:30:55 +0800 + +python2.7 (2.7.3-16) experimental; urgency=low + + * Update to 20130308, taken from the 2.7 branch. + - Issue #10156: In the interpreter's initialization phase, unicode globals + are now initialized dynamically as needed. + - Issue #16975: Fix error handling bug in the escape-decode decoder. + - Issue #9290: In IDLE the sys.std* streams now implement io.TextIOBase + interface and support all mandatory methods and properties. + - Issue #13454: Fix a crash when deleting an iterator created by + itertools.tee() if all other iterators were very advanced before. + - Issue #3754: fix typo in pthread AC_CACHE_VAL. + - Issue #17029: Let h2py search the multiarch system include directory. + - Issue #16445: Fixed potential segmentation fault when deleting an + exception message. + - Issue #17275: Corrected class name in init error messages of the + C version of BufferedWriter and BufferedRandom. + - Issue #7963: Fixed misleading error message that issued when object is + called without arguments. + - Issue #5308: Raise ValueError when marshalling too large object (a + sequence with size >= 2**31), instead of producing illegal marshal data. + - Issue #17043: The unicode-internal decoder no longer read past the end of + input buffer. + - Issue #16979: Fix error handling bugs in the unicode-escape-decode + decoder. + - Issue #17278: Fix a crash in heapq.heappush() and heapq.heappop() when + the list is being resized concurrently. + - Issue #17018: Make Process.join() retry if os.waitpid() fails with EINTR. + - Issue #14720: sqlite3: Convert datetime microseconds correctly. + - Issue #17225: JSON decoder now counts columns in the first line starting + with 1, as in other lines. + - Issue #7842: backported fix for py_compile.compile() syntax error + handling. + - Issue #13153: Tkinter functions now raise TclError instead of ValueError + when a unicode argument contains non-BMP character. + - Issue #9669: Protect re against infinite loops on zero-width matching in + non-greedy repeat. + - Issue #13169: The maximal repetition number in a regular expression + has been increased from 65534 to 2147483647 (on 32-bit platform) or + 4294967294 (on 64-bit). + - Issue #11311: StringIO.readline(0) now returns an empty string + as all other file-like objects. + - Issue #16800: tempfile.gettempdir() no longer left temporary files when + the disk is full. Original patch by Amir Szekely. + - Issue #13555: cPickle now supports files larger than 2 GiB. + - Issue #17052: unittest discovery should use self.testLoader. + - Issue #4591: Uid and gid values larger than 2**31 are supported now. + - Issue #17141: random.vonmisesvariate() no more hangs for large kappas. + - Issue #17149: Fix random.vonmisesvariate to always return results in + the range [0, 2*math.pi]. + - Issue #1470548: XMLGenerator now works with UTF-16 and UTF-32 encodings. + - Issue #6975: os.path.realpath() now correctly resolves multiple nested + symlinks on POSIX platforms. + - Issue #17156: pygettext.py now correctly escapes non-ascii characters. + - Issue #7358: cStringIO.StringIO now supports writing to and reading from + a stream larger than 2 GiB on 64-bit systems. + - IDLE was displaying spurious SystemExit tracebacks when running scripts + that terminated by raising SystemExit (i.e. unittest and turtledemo). + - Issue #10355: In SpooledTemporaryFile class mode and name properties and + xreadlines method now work for unrolled files. encoding and newlines + - Issue #16686: Fixed a lot of bugs in audioop module. + - Issue #17073: Fix some integer overflows in sqlite3 module. + - Issue #6083: Fix multiple segmentation faults occured when + PyArg_ParseTuple parses nested mutating sequence. + - Issue #5289: Fix ctypes.util.find_library on Solaris. + - Issue #17106: Fix a segmentation fault in io.TextIOWrapper when an + underlying stream or a decoder produces data of an unexpected type (i.e. + when io.TextIOWrapper initialized with text stream or use bytes-to-bytes + codec). + - Issue #13994: Add compatibility alias in distutils.ccompiler for + distutils.sysconfig.customize_compiler. + - Issue #15633: httplib.HTTPResponse is now mark closed when the server + sends less than the advertised Content-Length. + - Issue #15881: Fixed atexit hook in multiprocessing. + - Issue #14340: Upgrade the embedded expat library to version 2.1.0. + - Issue #11159: SAX parser now supports unicode file names. + - Issue #6972: The zipfile module no longer overwrites files outside of + its destination path when extracting malicious zip files. + - Issue #17049: Localized calendar methods now return unicode if a locale + includes an encoding and the result string contains month or weekday (was + regression from Python 2.6). + - Issue #4844: ZipFile now raises BadZipfile when opens a ZIP file with an + incomplete "End of Central Directory" record. + - Issue #15505: `unittest.installHandler` no longer assumes SIGINT handler + is set to a callable object. + - Issue #17051: Fix a memory leak in os.path.isdir() on Windows. + - Issue #12268: The io module file object write methods no longer abort + early when a write system calls is interrupted (EINTR). + - Issue #17249: convert a test in test_capi to use unittest and reap + threads. + - We now run both test_email.py and test_email_renamed.py when running the + test_email regression test. test_email_renamed contains some tests that + test_email does not. + - Issue #17041: Fix testing when Python is configured with the + --without-doc-strings option. + - Issue #5033: Fix building of the sqlite3 extension module when the + SQLite library version has "beta" in it. + - Issue #17228: Fix building without pymalloc. + - Issue #17086: Backport the patches from the 3.3 branch to cross-build + the package. + - Issue #16406: combine the pages for uploading and registering to PyPI. + - Issue #16403: Document how distutils uses the maintainer field in + PKG-INFO. + - Issue #16695: Document how glob handles filenames starting with a dot. + - Issue #8890: Stop advertising an insecure practice by replacing uses + of the /tmp directory with better alternatives in the documentation. + - Issue #17203: add long option names to unittest discovery docs. + * python2.7-dbg, libpython2.7-dbg: Drop dependency on python. + * python2.7-dbg: Make gdb (not gdb-minimal) a recommendation. + * python2.7: Replace python2.7-minimal (<< 2.7.3-7). Closes: #702005. + * Build the _md5, _sha1, _sha256 and _sha512 extension modules. + * Fix multiarch include for AArch64. + + -- Matthias Klose Fri, 08 Mar 2013 09:54:59 +0800 + +python2.7 (2.7.3-15) experimental; urgency=low + + * Update to 20130124, taken from the 2.7 branch. + - Issue #14850: Now a charmap decoder treats U+FFFE as "undefined mapping" + in any mapping, not only in a Unicode string. + - Issue #11461: Fix the incremental UTF-16 decoder. + - Issue #1159051: GzipFile now raises EOFError when reading a corrupted + file with truncated header or footer. + - Issue #16992: On Windows in signal.set_wakeup_fd, validate the file + descriptor argument. + - Issue #15861: tkinter now correctly works with lists and tuples + containing strings with whitespaces, backslashes or unbalanced braces. + - Issue #10527: Use poll() instead of select() for multiprocessing pipes. + - Issue #9720: zipfile now writes correct local headers for files larger + than 4 GiB. + - Issue #16829: IDLE printing no longer fails if there are spaces or other + special characters in the file path. + - Issue #13899: \A, \Z, and \B now correctly match the A, Z, and B literals + when used inside character classes (e.g. '[\A]'). + - Issue #16398: Optimize deque.rotate() so that it only moves pointers + and doesn't touch the underlying data with increfs and decrefs. + - Issue #15109: Fix regression in sqlite3's iterdump method where it would + die with an encoding error if the database contained string values + containing non-ASCII. + - Issue #15545: Fix regression in sqlite3's iterdump method where it was + failing if the connection used a row factory (such as sqlite3.Row) that + produced unsortable objects. + - Issue #16953: Fix socket module compilation on platforms with + HAVE_BROKEN_POLL. + - Issue #16836: Enable IPv6 support even if IPv6 is disabled on the + build host. + - Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py. + * Backport cross-build support from python3.3. LP: #873007. + * Add pyconfig.h compatibility headers. Closes: #695667. LP: #1094246. + + -- Matthias Klose Thu, 24 Jan 2013 14:57:08 +0100 + +python2.7 (2.7.3-14) experimental; urgency=low + + * Update to 20130105, taken from the 2.7 branch. + - Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB. + - Issue #15516: Fix a bug in PyString_FromFormat where it failed + to properly ignore errors from a __int__() method. + - Issue #16839: Fix a segfault when calling unicode() on a classic class + early in interpreter initialization. + - Issue #16761: Calling ``int()`` and ``long()`` with *base* argument only + now raises TypeError. + - Issue #16828: Fix error incorrectly raised by bz2.compress(''). + LP: #1090043. + - Issue #16819: IDLE method completion now correctly works for unicode + literals. + - Issue 10527: make multiprocessing use poll() instead of select() + if available. + - Issue #16485: Now file descriptors are closed if file header patching + failed on closing an aifc file. + - Issue #12065: connect_ex() on an SSL socket now returns the original + errno when the socket's timeout expires (it used to return None). + - Issue #16504: IDLE now catches SyntaxErrors raised by tokenizer. + - Issue #16702: test_urllib2_localnet tests now correctly ignores proxies + for localhost tests. + - Issue #16713: Fix the parsing of tel url with params using urlparse + module. + - Issue #16443: Add docstrings to regular expression match objects. + - Issue #8853: Allow port to be of type long for socket.getaddrinfo(). + - Issue #16597: In buffered and text IO, call close() on the underlying + stream if invoking flush() fails. + - Issue #15701: Fix HTTPError info method call to return the headers + information. + - Issue #14958: Change IDLE systax highlighting to recognize all string + and byte literals currently supported in Python 2.7. + - Issue #15324: Fix regrtest parsing of --fromfile and --randomize options. + - Issue #16618: Add more regression tests for glob. + - Issue #13094: add "Why do lambdas defined in a loop with different values + all return the same result?" programming FAQ. + * python-config --help returns with an exit value 0. LP: #1093860. + * Update package description for the -dbg packages. Closes: #696616. + + -- Matthias Klose Sat, 05 Jan 2013 17:22:13 +0100 + +python2.7 (2.7.3-13) experimental; urgency=low + + * Update to 20121220, taken from the 2.7 branch. + - Issue #16646: ftplib.FTP.makeport() might lose socket error details. + - Issue #16298: In HTTPResponse.read(), close the socket when there is no + Content-Length and the incoming stream is finished. + * Filter out -D_FORTIFY_SOURCE for the debug builds. Meaningless. + * Install the _sysconfigdata.py and python-config.sh from both shared + builds, but don't link extensions against the shared python library. + Closes: #695979. + * Fix python2.7-dbg-config symlink. LP: #1091615. + * During purge, check for existance of /etc/python2.7 before trying + to remove it. Closes: #696023. + * python2.7-dev, libpython2.7-dev: Drop the dependency on libssl-dev. + * debian/patches/sys-multiarch.diff: Expose multiarch tuple as + sys._multiarch (Barry Warsaw). Closes: #695958. + Note: Usage of sysconfig.get_config_var('MULTIARCH') is preferred. + + -- Matthias Klose Thu, 20 Dec 2012 16:57:49 +0100 + +python2.7 (2.7.3-12) experimental; urgency=low + + * Fix typo in pkgconfig file. Closes: #695671, LP: #1088988. + + -- Matthias Klose Mon, 10 Dec 2012 19:10:32 +0100 + +python2.7 (2.7.3-11) experimental; urgency=low + + * Update to 20121210, taken from the 2.7 branch. + - Issue #16602: When a weakref's target was part of a long deallocation + chain, the object could remain reachable through its weakref even though + its refcount had dropped to zero. + - Issue #16588: Silence unused-but-set warnings in Python/thread_pthread. + - Issue #16248: Disable code execution from the user's home directory by + tkinter when the -E flag is passed to Python. Patch by Zachary Ware. + - Issue #16628: Fix a memory leak in ctypes.resize(). + - Issue #13614: Fix setup.py register failure with invalid rst in + description. + - Issue #10182: The re module doesn't truncate indices to 32 bits anymore. + - Issue #16573: In 2to3, treat enumerate() like a consuming call, so + superfluous list() calls aren't added to filter(), map(), and zip() + which are directly passed enumerate(). + - Issue #16476: Fix json.tool to avoid including trailing whitespace. + - Issue #16549: Add tests for json.tools. + - Issue #15990: Improve argument/parameter documentation. + * Use _sysconfigdata.py in distutils.sysconfig. + * Fix distutils.sysconfig.get_{config_h,makefile}_filename for multiarch. + * Backport ssl.match_hostname from Python3. Closes: #626539. + + -- Matthias Klose Mon, 10 Dec 2012 16:06:41 +0100 + +python2.7 (2.7.3-10) experimental; urgency=low + + * Update to 20121128, taken from the 2.7 branch. + - Issue #9011: Fix hacky AST code that modified the CST when compiling + a negated numeric literal. + - Issue #16306: Fix multiple error messages when unknown command line + parameters where passed to the interpreter. + - Issue #15379: Fix passing of non-BMP characters as integers for the + charmap decoder (already working as unicode strings). + - Issue #16453: Fix equality testing of dead weakref objects. + - Issue #9535: Fix pending signals that have been received but not yet + handled by Python to not persist after os.fork() in the child process. + - Issue #15001: fix segfault on "del sys.modules['__main__']". + - Issue #5057: the peepholer no longer optimizes subscription on unicode + literals (e.g. u'foo'[0]) in order to produce compatible pyc files + between narrow and wide builds. + - Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) + now raises an error. + - Issue #14700: Fix buggy overflow checks for large width and precision + in string formatting operations. + - Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass + received a nonempty dict from the constructor. + - Issue #6074: Ensure cached bytecode files can always be updated by the + user that created them, even when the source file is read-only. + - Issue #14783: Improve int() and long() docstrings and switch docstrings + for unicode(), slice(), range(), and xrange() to use multi-line + signatures. + - Issue #16030: Fix overflow bug in computing the `repr` of an xrange + object with large start, step or length. + - Issue #16029: Fix overflow bug occurring when pickling xranges with large + start, step or length. + - Issue #16037: Limit httplib's _read_status() function to work around + broken HTTP servers and reduce memory usage (backport of a 3.2 fix). + - Issue #13992: The trashcan mechanism is now thread-safe. This eliminates + sporadic crashes in multi-thread programs when several long deallocator + chains ran concurrently and involved subclasses of built-in container + types. + - Issue #15801: Make sure mappings passed to '%' formatting are actually + subscriptable. + - Issue #15604: Update uses of PyObject_IsTrue() to check for and handle + errors correctly. + - Issue #15897: zipimport.c doesn't check return value of fseek(). + - Issue #16369: Global PyTypeObjects not initialized with PyType_Ready(...). + - Issue #15033: Fix the exit status bug when modules invoked using + -m switch, return the proper failure return value (1). + - Issue #1160: Fix compiling large regular expressions on UCS2 builds. + - Issue #14313: zipfile now raises NotImplementedError when the compression + type is unknown. + - Issue #16408: Fix file descriptors not being closed in error conditions + in the zipfile module. + - Issue #16327: The subprocess module no longer leaks file descriptors + used for stdin/stdout/stderr pipes to the child when fork() fails. + - Issue #14396: Handle the odd rare case of waitpid returning 0 when not + expected in subprocess.Popen.wait(). + - Issue #16411: Fix a bug where zlib.decompressobj().flush() might try + to access previously-freed memory. + - Issue #16350: zlib.decompressobj().decompress() now accumulates data from + successive calls after EOF in unused_data, instead of only saving the + argument to the last call. decompressobj().flush() now correctly sets + unused_data and unconsumed_tail. A bug in the handling of MemoryError + when setting the unconsumed_tail attribute has also been fixed. + - Issue #12759: sre_parse now raises a proper error when the name + of the group is missing. + - Issue #16152: fix tokenize to ignore whitespace at the end of the code + when no newline is found. + - Issue #1207589: Add Cut/Copy/Paste items to IDLE right click + Context Menu. + - Issue #16230: Fix a crash in select.select() when one the lists changes + size while iterated on. + - Issue #16228: Fix a crash in the json module where a list changes size + while it is being encoded. + - Issue #14897: Enhance error messages of struct.pack and struct.pack_into. + - Issue #12890: cgitb no longer prints spurious

tags in text + mode when the logdir option is specified. + - Issue #14398: Fix size truncation and overflow bugs in the bz2 module. + - Issue #5148: Ignore 'U' in mode given to gzip.open() and gzip.GzipFile(). + - Issue #16220: wsgiref now always calls close() on an iterable response. + - Issue #16461: Wave library should be able to deal with 4GB wav files, + and sample rate of 44100 Hz. + - Issue #16176: Properly identify Windows 8 via platform.platform(). + - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to + return a returncode of 0 when the child has already exited or cannot + be waited on. + - Issue #12376: Pass on parameters in TextTestResult.__init__ super call. + - Issue #15222: Insert blank line after each message in mbox mailboxes. + - Issue #16013: Fix CSV Reader parsing issue with ending quote characters. + - Issue #15421: fix an OverflowError in Calendar.itermonthdates() after + datetime.MAXYEAR. + - Issue #15970: xml.etree.ElementTree now serializes correctly the + empty HTML elements 'meta' and 'param'. + - Issue #15676: Now "mmap" check for empty files before doing the + offset check. + - Issue #15340: Fix importing the random module when /dev/urandom cannot + be opened. This was a regression caused by the hash randomization patch. + - Issue #15841: The readable(), writable() and seekable() methods of + io.BytesIO and io.StringIO objects now raise ValueError when the object + has been closed. + - Issue #16112: platform.architecture does not correctly escape argument to + /usr/bin/file. + - Issue #12776,#11839: call argparse type function (specified by + add_argument) only once. Before, the type function was called twice in + the case where the default was specified and the argument was given as + well. This was especially problematic for the FileType type, as a + default file would always be opened, even if a file argument was + specified on the command line. + - Issue #15906: Fix a regression in argparse caused by the preceding change, + when action='append', type='str' and default=[]. + - Issue #13370: Ensure that ctypes works on Mac OS X when Python is + compiled using the clang compiler + - Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs. + - Issue #15199: Fix JavaScript's default MIME type to + application/javascript. + - Issue #15477: In cmath and math modules, add workaround for platforms + whose system-supplied log1p function doesn't respect signs of zeros. + - Issue #15908: Fix misbehaviour of the sha1 module when called on data + larger than 2**32 bytes. + - Issue #15910: Fix misbehaviour of _md5 and sha1 modules when "updating" + on data larger than 2**32 bytes. + - Fix the leak of a dict in the time module when used in an embedded + interpreter that is repeatedly initialized and shutdown and reinitialized. + - Issue #12268: File readline, readlines and read or readall methods + no longer lose data when an underlying read system call is interrupted + within an io module object. IOError is no longer raised due to a read + system call returning EINTR from within these methods. + - Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD() + method doesn't require an argument again. + - Issue #16559: Add more tests for the json module, including some from the + official test suite at json.org. + - Issue #16274: Fix test_asyncore on Solaris. + - Issue #15040: Close files in mailbox tests for PyPy compatibility. + - Issue #15802: Fix test logic in TestMaildir.test_create_tmp. + - Issue #15765: Extend a previous fix to Solaris and OpenBSD for quirky + getcwd() behaviour (issue #9185) to NetBSD as well. + - Issue #15615: Add some tests for the json module's handling of invalid + input data. + - Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError + after 2801bf875a24 (see #15801). + - Issue #11715: Fix multiarch detection without having Debian development + tools (dpkg-dev) installed. + - Issue #15819: Make sure we can build Python out-of-tree from a readonly + source directory. (Somewhat related to Issue #9860.) + - Issue #15822: Ensure 2to3 grammar pickles are properly installed. + - Issue #13301: use ast.literal_eval() instead of eval() + in Tools/i18n/msgfmt.py. + - Issue #16400: Update the description of which versions of a given package + PyPI displays. + - Issue #15677: Document that zlib and gzip accept a compression level + of 0 to mean 'no compression'. + - Issue #8040: added a version switcher to the documentation. + - Issue #16115: Improve subprocess.Popen() documentation around args, + shell, and executable arguments. + - Issue #15979: Improve timeit documentation. + - Issue #16036: Improve documentation of built-in int()'s signature and + arguments. + - Issue #15935: Clarification of argparse docs, re: add_argument() type and + default arguments. + - Issue #13769: Document the effect of ensure_ascii to the return type + of JSON decoding functions. + - Issue #14880: Fix kwargs notation in csv.reader, + .writer & .register_dialect. + - Issue #14674: Add a discussion of the json module's standard compliance. + * Clarify location of the gdbinit file. LP: #975676. + * Fix traceback for missing distutils wininst .exe files. LP: #1081155. + * Backport python3.3 multiarch packaging changes (Riku Voipio), and fix + multiarch issues discovered after the backport. + Closes: #683755. + * Use a shell implementation for the python-config script. + + -- Matthias Klose Thu, 29 Nov 2012 20:18:20 +0100 + +python2.7 (2.7.3-5) unstable; urgency=low + + * Enable verbose build for the sharedmods target. + * Fix issue #15847: allow args to be a tuple in parse_args. Closes: #686583. + * Fix issue #15340: Fix importing the random module when /dev/urandom cannot + be opened. Regression caused by the hash randomization patch. + * Don't use `-n' anymore to start idle in the desktop/menu files, not + needed anymore for multiseat installations. + + -- Matthias Klose Sun, 09 Sep 2012 16:54:26 +0200 + +python2.7 (2.7.3-4) unstable; urgency=low + + * Follwup for issue #9374. Restore the removed attributes in the + urlparse module. + * Update symbols files. + * Disable test_subprocess on the Hurd buildds. + * Call dh_movefiles with --srcdir. Closes: #685543. + + -- Matthias Klose Sun, 26 Aug 2012 12:24:31 +0200 + +python2.7 (2.7.3-3) unstable; urgency=low + + * Update to 20120814, taken from the 2.7 branch. Posix relevant patches: + - Issue #15041: Update "see also" list in tkinter documentation. + - Issue #14579: Fix error handling bug in the utf-16 decoder. + - Issue #15368: An issue that caused bytecode generation to be + non-deterministic when using randomized hashing (-R) has been fixed. + - Issue #15567: Fix NameError when running threading._test + - Issue #15424: Add a __sizeof__ implementation for array objects. + - Issue #13052: Fix IDLE crashing when replace string in Search/Replace + dialog ended with '\'. + - Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo() + emulation code. + - Issue #9803: Don't close IDLE on saving if breakpoint is open. + - Issue #12288: Consider '0' and '0.0' as valid initialvalue + for tkinter SimpleDialog. + - Issue #15489: Add a __sizeof__ implementation for BytesIO objects. + - Issue #15469: Add a __sizeof__ implementation for deque objects. + - Issue #15487: Add a __sizeof__ implementation for buffered I/O objects. + - Issue #15512: Add a __sizeof__ implementation for parser. + - Issue #15402: An issue in the struct module that caused sys.getsizeof to + return incorrect results for struct.Struct instances has been fixed. + - Issue #15232: when mangle_from is True, email.Generator now correctly + mangles lines that start with 'From ' that occur in a MIME preamble + or epilog. + - Issue #13922: argparse no longer incorrectly strips '--'s that appear + after the first one. + - Issue #12353: argparse now correctly handles null argument values. + - Issue #14635: telnetlib will use poll() rather than select() when possible + to avoid failing due to the select() file descriptor limit. + - Issue #6056: Make multiprocessing use setblocking(True) on the + sockets it uses. + - Issue #15630: Add an example for "continue" stmt in the tutorial. + - Issue #15250: Document that filecmp.dircmp compares files shallowly. + * Fortified build. + * Python/import.c: Don't export isdir(). + * Modules/socketmodule.c: Don't export netdb_lock. + * Add breaks for vim-{nox,gtk,gnome,athena}. Closes: #682034. + * Don't ship python2.pc, should be shipped with python-dev instead. + Closes: #684612. + + -- Matthias Klose Tue, 14 Aug 2012 17:55:32 +0200 + +python2.7 (2.7.3-2) unstable; urgency=low + + * Update to 20120713, taken from the 2.7 branch. + - Issue #15033: Fix the exit status bug when modules invoked using -m swith, + return the proper failure return value (1). + - Issue #12268: File readline, readlines and read() methods no longer lose + data when an underlying read system call is interrupted. IOError is no + longer raised due to a read system call returning EINTR from within these + methods. + - Issue #13512: Create ~/.pypirc securely (CVE-2011-4944). + - Issue #7719: Make distutils ignore ``.nfs*`` files instead of choking + later on. + - Issue #10053: Don't close FDs when FileIO.__init__ fails. + - Issue #15247: FileIO now raises an error when given a file descriptor + pointing to a directory. + - Issue #14591: Fix bug in Random.jumpahead that could produce an invalid + Mersenne Twister state on 64-bit machines. + - Issue #5346: Preserve permissions of mbox, MMDF and Babyl mailbox + files on flush(). + - Issue #15219: Fix a reference leak when hashlib.new() is called with + invalid parameters. + - Issue #9559: If messages were only added, a new file is no longer + created and renamed over the old file when flush() is called on an + mbox, MMDF or Babyl mailbox. + - Issue #14653: email.utils.mktime_tz() no longer relies on system + mktime() when timezone offest is supplied. + - Issue #15101: Make pool finalizer avoid joining current thread. + - Issue #15054: A bug in tokenize.tokenize that caused string literals + with 'b' and 'br' prefixes to be incorrectly tokenized has been fixed. + - Issue #15036: Mailbox no longer throws an error if a flush is done + between operations when removing or changing multiple items in mbox, + MMDF, or Babyl mailboxes. + - Issue #15043: test_gdb is now skipped entirely if gdb security settings + block loading of the gdb hooks + - Issue #13557: Clarify effect of giving two different namespaces to exec or + execfile(). + * Don't build the _hashlib and _ssl extensions as a builtin, but as + extensions. Closes: #680930. + * Backport issue #13150: sysconfig no longer parses the Makefile and config.h + files when imported, instead doing it at build time. This makes importing + sysconfig faster and reduces Python startup time by 20%. + * python2.7: Add a break for python-virtualenv (<< 1.7.1.2-2~). + * Don't run the test_gdb test on mips/mipsel, not even in debug mode. + * For lto builds, use -g instead of -g1; filter out lto flags in the + installed Makefile. Closes: #681348. + + -- Matthias Klose Fri, 13 Jul 2012 05:03:43 +0200 + +python2.7 (2.7.3-1) unstable; urgency=low + + * Python 2.7.3 release. + * Update to 20120615, taken from the 2.7 branch. + * The wininst-* files cannot be built within Debian from the included + sources, needing a zlib mingw build, which the zlib maintainer isn't + going to provide. Closes: #639407. + * Let pydoc handle dist-packages the same as site-packages. + Closes: #671021. + * python2.7-doc: Fix underscore.js symlink. Closes: #671795, #676339. + * Do not italicize punctuation in python(1) manual page (Matt Kraai). + Closes: #579269. + * Build _heapq as a builtin (and move it to -minimal). + + -- Matthias Klose Fri, 15 Jun 2012 15:26:21 +0200 + +python2.7 (2.7.3~rc2-2.1) unstable; urgency=low + + * Non-maintainer upload (with maintainer's permission). + * Disable testsuite on GNU/kFreeBSD. (Closes: #669281) + + -- Robert Millan Sun, 22 Apr 2012 22:04:26 +0200 + +python2.7 (2.7.3~rc2-2) unstable; urgency=low + + * Use xdg-open/gvfs-open in Lib/webbrowser.py (Michael Vogt). + LP: #971311. + * Add a paragraph about python-foo-dbg packages to README.debug. + LP: #872050. + * Disable some tests (no feedback from porters): + - test_socket on hurd-i386. + - test_io on amd64. + - test_signal on kfreebsd-*. Closes: #654783. + - test_threading on sparc. + * Tighten build dependency on libexpat-dev. Closes: #665346. + * Build-depend on db-5.1, don't care about testsuite regressions on + some esoteric ports. If packages rely on threaded applications or + transactions, please use the python-bsddb3 package. + Closes: #621374. + * Don't ship the python2 and python2-config symlinks, move these + to the python-minimal and python-dev packages. Closes: #663874. + * Remove PVER-doc.doc-base.PVER-doc.in. Closes: #656763. + * Update symbols files. + * Avoid runtime path for the sqlite extension. + * CVE-2011-4944, distutils creates ~/.pypirc insecurely. Closes: #650555. + * Fix issue #14505, file descriptor leak when deallocating file objects + created with PyFile_FromString(). Closes: #664529. + + -- Matthias Klose Thu, 05 Apr 2012 15:47:03 +0200 + +python2.7 (2.7.3~rc2-1) unstable; urgency=low + + * Python 2.7.3 release candidate 2. + * Build-depend on expat >= 2.1~. + + -- Matthias Klose Wed, 21 Mar 2012 05:21:47 +0100 + +python2.7 (2.7.3~rc1-1) unstable; urgency=low + + * Python 2.7.3 release candidate 1. + * Update to 20120309, taken from the 2.7 branch. + * Fix dangling libpython.a symlink. Closes: #660231. + + -- Matthias Klose Fri, 09 Mar 2012 19:28:43 +0100 + +python2.7 (2.7.2-13) unstable; urgency=low + + * Update to 20120120, taken from the 2.7 branch. + * Remove patch integrated upstream (issue9054.diff). + * Backport Issue #9189 to distutils/sysconfig.py as well. + Closes: #656118. + * Disable test_io on kfreebsd again. Closes: #654783. + * Disable test_bsddb3 tests on kfreebsd again. + + -- Matthias Klose Fri, 20 Jan 2012 16:33:47 +0100 + +python2.7 (2.7.2-12) unstable; urgency=low + + * Run the tests with a script command which doesn't exit immediatly + when stdin is /dev/null (Colin Watson). + + -- Matthias Klose Fri, 13 Jan 2012 11:04:31 +0100 + +python2.7 (2.7.2-11) unstable; urgency=low + + * Don't run the test_site tests when $HOME doesn't exist. + + -- Matthias Klose Wed, 11 Jan 2012 09:19:00 +0100 + +python2.7 (2.7.2-10) unstable; urgency=low + + * Update to 20120110, taken from the 2.7 branch. + * Overwrite some lintian warnings: + - The -dbg interpreters are not unusual. + - The -gdb.py files don't need a python dependency. + - lintian can't handle a whatis entry starting with one word on the line. + * Fix test failures related to distutils debian installation layout. + * Add build-arch/build-indep targets. + * Regenerate Setup and Makefiles after correcting Setup.local. + * profiled-build.diff: Pass PY_CFLAGS instead of CFLAGS for the profiled + build. + * Pass dpkg-buildflags to the build process, and build third party + extensions with these flags. + * Add support to build using -flto (and -g1) on some architectures. + * Disable pgo builds for some architectures (for now, keep just + amd64 armel armhf i386 powerpc ppc64). + * Build-depend on libgdbm-dev to build and run the gdbm tests. + * Build-depend on xvfb to run the tkinter tests. + * python2.7: Provide python2.7-argparse and python-argparse. + * Don't run test_threading on mips/mipsel. + * Run the test_gdb test for the debug build only. + * Add build conflict to python-cxx-dev (pydoc test failures). + * Disable test_ssl certificate check, certificate expired on python.org. + + -- Matthias Klose Tue, 10 Jan 2012 16:44:56 +0100 + +python2.7 (2.7.2-9) unstable; urgency=low + + * Update to 20111217, taken from the 2.7 branch. + + -- Matthias Klose Sat, 17 Dec 2011 17:36:27 +0100 + +python2.7 (2.7.2-8) unstable; urgency=low + + * Update to 20111130, taken from the 2.7 branch. + * New patch, ctypes-arm, allow for ",hard-float" after libc6 in ldconfig -p + output (Loic Minier). LP: #898172. + * debian/rules: Define DPKG_VARS (Alban Browaeys). Closes: #647419). + * Add python-config man page (Johann Felix Soden). Closes: #650181). + + -- Matthias Klose Wed, 30 Nov 2011 19:16:23 +0100 + +python2.7 (2.7.2-7) unstable; urgency=low + + * Adjust patches for removed Lib/plat-linux3. + * Add build conflict to libncurses5-dev, let configure search for + ncurses headers in /usr/include/ncursesw too. + + -- Matthias Klose Wed, 05 Oct 2011 11:30:16 +0200 + +python2.7 (2.7.2-6) unstable; urgency=low + + * Update to 20111004, taken from the 2.7 branch. + * Use the ncursesw include directory when linking with ncursesw. + * Rebuild with libreadline not linked with libncurses*. Closes: #643816. + * Fix typos in the multiprocessing module. Closes: #643856. + + -- Matthias Klose Tue, 04 Oct 2011 16:09:29 +0200 + +python2.7 (2.7.2-5) unstable; urgency=low + + * Update to 20110816, taken from the 2.7 branch. + - Fix issue#12752. LP: #824734. + * Don't run test_threading on the kfreebsd-i386 buildd. + + -- Matthias Klose Tue, 16 Aug 2011 08:33:31 +0200 + +python2.7 (2.7.2-4) unstable; urgency=low + + * Update to 20110803, taken from the 2.7 branch. + * Fix build on s390x. Closes: #636033. + * Use linux-any for some build dependencies. Closes: #634809. + * Revert previous change to treat Linux 3.x as Linux 2. Use the + plat-linux3 directory instead. + + -- Matthias Klose Wed, 03 Aug 2011 12:36:05 +0200 + +python2.7 (2.7.2-3) unstable; urgency=low + + * Update to 20110709, taken from the 2.7 branch. + * Make the conflict against python-profiler a versioned conflict. + * Don't run the bsddb3 tests on kfreebsd-i386. + * Don't add the bsddb multilib path, if already in the standard lib path. + * Treat Linux 3.x as Linux 2. Closes: #633015. + * Assume working semaphores on Linux, don't rely on running kernel + for the check. Closes: #631188. + + -- Matthias Klose Sat, 09 Jul 2011 13:19:47 +0200 + +python2.7 (2.7.2-2) unstable; urgency=low + + * Update to 20110628, taken from the 2.7 branch. + * Add profile/pstats to the python2.7 package, update debian copyright. + * Don't run the bsddb3 tests on kfreebsd-amd64. + * Don't run the benchmark on hurd-i386. + + -- Matthias Klose Tue, 28 Jun 2011 23:05:21 +0200 + +python2.7 (2.7.2-1) unstable; urgency=low + + * Python 2.7.2 release. + + -- Matthias Klose Sun, 12 Jun 2011 21:04:24 +0200 + +python2.7 (2.7.2~rc1-2) unstable; urgency=medium + + * Set pyexpat dummy version string. + + -- Matthias Klose Tue, 31 May 2011 12:05:56 +0200 + +python2.7 (2.7.2~rc1-1) unstable; urgency=low + + * Python 2.7.2 release candidate 1. + * Update libpython symbols file for m68k (Thorsten Glaser). Closes: #627458. + * Apply proposed patch for issue #670664. LP: #357067. + + -- Matthias Klose Mon, 30 May 2011 06:44:23 +0200 + +python2.7 (2.7.1-9) unstable; urgency=low + + * Update to 20110520, taken from the 2.7 branch. + + -- Matthias Klose Fri, 20 May 2011 13:43:12 +0200 + +python2.7 (2.7.1-8) unstable; urgency=low + + * Keep the ssl.PROTOCOL_SSLv2 module constant , just raise an exception + when trying to create a PySSL object. Closes: #623423. + + -- Matthias Klose Wed, 20 Apr 2011 12:31:03 +0200 + +python2.7 (2.7.1-7) unstable; urgency=low + + * Update to 20110419, taken from the 2.7 branch. + * Build without OpenSSL v2 support. Closes: #620581. + * Force linking the curses module against libncursesw. Closes: #622064. + * Link libpython with --whole-archive. Closes: #614711. + * Re-enable running the testsuite during the build. + + -- Matthias Klose Tue, 19 Apr 2011 17:36:56 +0200 + +python2.7 (2.7.1-6) unstable; urgency=low + + * Update to 20110307, taken from the 2.7 branch. + * Disable the profile guided build on ia64, sparc. + + -- Matthias Klose Mon, 07 Mar 2011 02:19:02 +0100 + +python2.7 (2.7.1-5) experimental; urgency=low + + * Update to 20110224, taken from the 2.7 branch. + * Update patches. + * Re-enable profile guided build. + + -- Matthias Klose Thu, 24 Feb 2011 06:01:42 +0100 + +python2.7 (2.7.1-4) experimental; urgency=low + + * Update to 20110119, taken from the 2.7 branch. + + -- Matthias Klose Wed, 19 Jan 2011 04:21:14 +0100 + +python2.7 (2.7.1-3) experimental; urgency=low + + * Do not run test_multiprocessing when running the testsuite. + Fails on armel and powerpc on some buildds. + + -- Matthias Klose Fri, 24 Dec 2010 01:46:55 +0100 + +python2.7 (2.7.1-2) experimental; urgency=low + + * Update to 20101222, taken from the 2.7 branch. + * Re-enable the distutils-sysconfig.diff patch, apparently + lost when updating the patches for 2.7. + * Disable the profiled builds on all architectures. + + -- Matthias Klose Wed, 22 Dec 2010 15:39:48 +0100 + +python2.7 (2.7.1-1) experimental; urgency=low + + * Python 2.7.1 release. + + -- Matthias Klose Sun, 28 Nov 2010 12:05:23 +0100 + +python2.7 (2.7.1~rc1-2) experimental; urgency=low + + * Move the pyconfig.h file into the -min package, required by sysconfig. + Closes: #603237. + + -- Matthias Klose Sun, 14 Nov 2010 09:40:09 +0100 + +python2.7 (2.7.1~rc1-1) experimental; urgency=low + + * Python 2.7.1 release candidate 1. + * Move the Makefile into the -min package, required by sysconfig. + Closes: #603237. + + -- Matthias Klose Sun, 14 Nov 2010 00:33:48 +0100 + +python2.7 (2.7-9) experimental; urgency=low + + * Update to 20101016, taken from the 2.7 branch. + + -- Matthias Klose Sat, 16 Oct 2010 12:46:57 +0200 + +python2.7 (2.7-8) experimental; urgency=low + + * Disabled the profiled build on armel. + + -- Matthias Klose Thu, 23 Sep 2010 15:06:06 +0200 + +python2.7 (2.7-7) experimental; urgency=low + + * Update to 20100922, taken from the 2.7 branch. + * Update GNU/Hurd patches (Pino Toscano). Closes: #597419. + + -- Matthias Klose Wed, 22 Sep 2010 20:35:24 +0200 + +python2.7 (2.7-6) experimental; urgency=low + + * Update to 20100915, taken from the 2.7 branch. + - Fix issue #9729, Unconnected SSLSocket.{send,recv} raises TypeError + (Andrew Bennetts). LP: #637821. + * Add copyright information for expat, libffi and zlib. Addresses: #596276. + * Apply proposed fix for issue 9054, configure --with-system-expat. + * Provide Lib/plat-gnukfreebsd[78] (Jakub Wilk). Addresses: #593818. + + -- Matthias Klose Wed, 15 Sep 2010 17:43:18 +0200 + +python2.7 (2.7-5) experimental; urgency=low + + * Update to 20100829, taken from the 2.7 branch. + * Don't configure --with-system-expat, segfaults the interpreter in the + testsuite. + * Disable more tests on hppa and hurd-i386, which fail on the buildds. + + -- Matthias Klose Sun, 29 Aug 2010 16:22:37 +0200 + +python2.7 (2.7-4) experimental; urgency=low + + * Update to 20100822, taken from the 2.7 branch. + * Fixed in previous 2.7 uploads: Multiple integer overflows in audioop.c + in the audioop module (CVE-2010-1634). + * Fix some lintian warnings. + * Configure --with-system-expat. + + -- Matthias Klose Mon, 23 Aug 2010 13:03:40 +0200 + +python2.7 (2.7-3) experimental; urgency=low + + * Update to 20100807, taken from the 2.7 branch. + * Move '/usr/local/.../dist-packages' before '/usr/lib/.../dist-packages' + in sys.path. Adresses: #588342. + * Fix detection of ffi.h header file. Closes: #591408. + * python2-7-dev: Depend on libssl-dev. LP: #611845. + + -- Matthias Klose Sat, 07 Aug 2010 21:28:04 +0200 + +python2.7 (2.7-2) experimental; urgency=low + + * Complete debug-build.diff, some parts lost in quilt conversion. + * Move the pkgconfig file into the -dev package. + + -- Matthias Klose Tue, 06 Jul 2010 21:07:48 +0200 + +python2.7 (2.7-1) experimental; urgency=low + + * Python 2.7 release. + * Update to 20100706, taken from the trunk. + * Update symbols files. + + -- Matthias Klose Tue, 06 Jul 2010 07:21:23 +0200 + +python2.7 (2.7~rc2-3) experimental; urgency=low + + * Update to 20100703, taken from the trunk. + * Move the _weakrefset module, not extension to -minimal. Closes: #587568. + * Move the sysconfig module to -minimal. Closes: #586113. + * Move the shutil module to python2.6-minimal. Addresses: #587628. + + -- Matthias Klose Sat, 03 Jul 2010 13:27:36 +0200 + +python2.7 (2.7~rc2-2) experimental; urgency=low + + * Fix applying plat-linux2* patches. + * Use the profiled build on armel, sparc and sparc64. + + -- Matthias Klose Tue, 29 Jun 2010 08:04:59 +0200 + +python2.7 (2.7~rc2-1) experimental; urgency=low + + * Python 2.7 release candidate 2. + * Update to 20100628, taken from the trunk. + * Merge packaging changes from python2.6 (2.6.5+20100628-1). + + -- Matthias Klose Tue, 29 Jun 2010 00:57:00 +0200 + +python2.7 (2.7~b1-2) experimental; urgency=low + + * Update to 20100508, taken from the trunk. + + -- Matthias Klose Sat, 08 May 2010 17:34:07 +0200 + +python2.7 (2.7~b1-1) experimental; urgency=low + + * Python 2.7 beta1. + * Update to 20100420, taken from the trunk. + * Update libpython symbols files. + * Apply proposed patch for issue #7332, segfaults in + PyMarshal_ReadLastObjectFromFile in import_submodule. + * Don't build-depend on locales on avr32. Closes: #575144. + + -- Matthias Klose Tue, 20 Apr 2010 23:53:42 +0200 + +python2.7 (2.7~a4-1) experimental; urgency=low + + * Python 2.7 alpha4. + * Update to 20100316, taken from the trunk. + * Point distutils.sysconfig to the system installation. Closes: #573363. + + -- Matthias Klose Tue, 16 Mar 2010 15:45:07 +0100 + +python2.7 (2.7~a3-1) experimental; urgency=low + + * Python 2.7 alpha3. + + -- Matthias Klose Tue, 16 Feb 2010 03:04:01 +0100 + +python2.7 (2.7~a2-1) experimental; urgency=low + + * Python 2.7 alpha2. + + -- Matthias Klose Sat, 16 Jan 2010 14:49:59 +0100 + +python2.6 (2.6.5+20100628-1) unstable; urgency=low + + * Update to 20100614, taken from the 2.6 release branch (r82337). + * Apply plat-linux2- patch for alpha, hppa, mips, mipsel, sparc + and sparc64. + + -- Matthias Klose Mon, 28 Jun 2010 21:26:43 +0200 + +python2.6 (2.6.5+20100626-1) unstable; urgency=low + + * Update to 20100614, taken from the 2.6 release branch (r82245). + * Update libpython symbols files. Closes: #587012. + * Move the logging package and the runpy module to python2.6-minimal. + + -- Matthias Klose Sat, 26 Jun 2010 14:29:41 +0200 + +python2.6 (2.6.5+20100616-1) unstable; urgency=medium + + * Update to 20100614, taken from the 2.6 release branch (r81601). + * Reapply the backport for issue #8233, lost in the conversion to + quilt. + * Disable the profiled build on alpha. + * Make pydoc more robust not to fail on exceptions other than import + exceptions. + * posixmodule: Add flags for statvfs.f_flag to constant list. + + -- Matthias Klose Wed, 16 Jun 2010 07:56:40 +0200 + +python2.6 (2.6.5+20100529-1) unstable; urgency=low + + * Update to 20100529, taken from the 2.6 release branch (r81601). + - Fix issue #5753, CVE-2008-5983 python: untrusted python modules + search path. Closes: #572010. + * Convert internal dpatch system to quilt. + * Build the ossaudio extension on GNU/kFreeBSD. Closes: #574696. + + -- Matthias Klose Sat, 29 May 2010 15:07:51 +0200 + +python2.6 (2.6.5-2) unstable; urgency=low + + * Update libpython symbols files. + * debian/patches/issue8032.dpatch: Update to version from the + trunk. + * Fix issue #8329: Don't return the same lists from select.select + when no fds are changed. + * Fix issue #8310: Allow dis to examine new style classes. + * Fix issues #8279: Fix test_gdb failures. + * Fix issue #8233: When run as a script, py_compile.py optionally + takes a single argument `-`. + * Apply proposed patch for issue #7332, segfaults in + PyMarshal_ReadLastObjectFromFile in import_submodule. + * Don't build-depend on locales on avr32. Closes: #575144. + + -- Matthias Klose Tue, 20 Apr 2010 19:41:36 +0200 + +python2.6 (2.6.5-1ubuntu6) lucid; urgency=low + + * Fix applying patch for issue #8310. + + -- Matthias Klose Fri, 16 Apr 2010 14:20:35 +0200 + +python2.6 (2.6.5-1ubuntu5) lucid; urgency=low + + * Fix issue #8329: Don't return the same lists from select.select + when no fds are changed. + * Fix issue #8310: Allow dis to examine new style classes. + + -- Matthias Klose Thu, 15 Apr 2010 01:21:07 +0200 + +python2.6 (2.6.5-1ubuntu4) lucid; urgency=low + + * debian/patches/issue8032.dpatch: Update to version from the + trunk. Upload for beta2 to avoid apport errors. + - Handle PyFrameObject's: LP: #543624, #548723. + - Detect cycles in object reference graph and add extra + protection: LP: #544823, LP: #552356. + + -- Matthias Klose Thu, 01 Apr 2010 22:53:06 +0200 + +python2.6 (2.6.5-1ubuntu3) lucid; urgency=low + + * debian/patches/issue8140.dpatch: Incomplete patch; regenerate. + * debian/patches/issue8032.dpatch: Update to v4: + - Add support for PySetObject (set/frozenset). + - Add support for PyBaseExceptionObject (BaseException). + - Fix a signed vs unsigned char issue that led to exceptions + in gdb for PyStringObject instances. + - Handle the case of loops in the object reference graph. + - Unit tests for all of the above. + + -- Matthias Klose Wed, 31 Mar 2010 18:52:32 +0200 + +python2.6 (2.6.5-1ubuntu2) lucid; urgency=low + + * Disable profiled build on powerpc. + + -- Matthias Klose Sat, 20 Mar 2010 15:17:18 +0100 + +python2.6 (2.6.5-1ubuntu1) lucid; urgency=low + + * Merge with Debian (2.6.5-1). + + -- Matthias Klose Sat, 20 Mar 2010 03:57:17 +0100 + +python2.6 (2.6.5-1) unstable; urgency=low + + * Python 2.6.5 final release. + * Fix issue #4961: Inconsistent/wrong result of askyesno function in + tkMessageBox with Tcl8.5. LP: #462950. + * Issue #8154, fix segfault with os.execlp('true'). LP: #418848. + * Apply proposed patch for issue #8032, gdb7 hooks for debugging. + + -- Matthias Klose Fri, 19 Mar 2010 00:12:55 +0100 + +python2.6 (2.6.5~rc2-2) unstable; urgency=low + + * Add copyright notices for the readline and _ssl extensions. + Closes: #573866. + * Backport issue #8140: Extend compileall to compile single files. + Add -i option. + * Backport issue #6949, build _bsddb extension with db-4.8.x. + + -- Matthias Klose Tue, 16 Mar 2010 03:02:21 +0100 + +python2.6 (2.6.5~rc2-1) unstable; urgency=low + + * Python 2.6.5 release candidate 2. + - Replace the Monty Python audio test file. Closes: #568674. + * Fix build failure on sparc64. Closes: #570845. + + -- Matthias Klose Thu, 11 Mar 2010 16:50:03 +0100 + +python2.6 (2.6.5~rc2-0ubuntu1) lucid; urgency=low + + * Python 2.6.5 release candidate 2. + + -- Matthias Klose Thu, 11 Mar 2010 13:30:19 +0100 + +python2.6 (2.6.4-6ubuntu1) lucid; urgency=low + + * Merge with Debian (2.6.4-6). + + -- Matthias Klose Tue, 16 Feb 2010 01:08:50 +0100 + +python2.6 (2.6.4-6) unstable; urgency=low + + * Update to 20100215, taken from the 2.6 release branch. + * python2.6-minimal: Skip moving syssite contents to new location, if + /usr/local/lib/python2.6 cannot be written. Closes: #569532. LP: #338227. + * libpython2.6: Fix symlink in /usr/lib/python2.6/config. LP: #521050. + + -- Matthias Klose Mon, 15 Feb 2010 22:12:18 +0100 + +python2.6 (2.6.4-5ubuntu1) lucid; urgency=low + + * Merge with Debian (2.6.4-5). + + -- Matthias Klose Sun, 31 Jan 2010 22:31:41 +0100 + +python2.6 (2.6.4-5) unstable; urgency=low + + * Update to 20100131, taken from the 2.6 release branch. + - Fix typo in os.execvp docstring. Closes: #558764. + * distutils.sysconfig.get_python_lib(): Only return ".../dist-packages" if + prefix is the default prefix and if PYTHONUSERBASE is not set in the + environment and if --user option is not present. LP: #476005. + * distutils install: Don't install into /usr/local/local, if option + --prefix=/usr/local is present, without changing the install prefix. + LP: #510211. + + -- Matthias Klose Sun, 31 Jan 2010 21:16:51 +0100 + +python2.6 (2.6.4-4ubuntu1) lucid; urgency=low + + * Update to 20100122, taken from the 2.6 release branch. + - Fix DoS via XML document with malformed UTF-8 sequences (CVE_2009_3560). + Closes: #566233. + - Fix typo in os.execvp docstring. Closes: #558764. + * python2.6-doc: Fix searching in local documentation. LP: #456025. + * Update locale module from the trunk. LP: #223281. + * Merge with Debian (2.6.4-4). + + -- Matthias Klose Fri, 22 Jan 2010 11:37:29 +0100 + +python2.6 (2.6.4-4) unstable; urgency=low + + * Update to 20100122, taken from the 2.6 release branch. + - Fix DoS via XML document with malformed UTF-8 sequences (CVE_2009_3560). + Closes: #566233. + * Hurd fixes (Pino Toscano). Closes: #565693: + - hurd-broken-poll.dpatch: ported from 2.5. + - hurd-disable-nonworking-constants.dpatch: disable a few constants from + the public API whose C counterparts are not implemented, so using them + either always blocks or always fails (caused issues in the test suite). + - Exclude the profiled build for hurd. + - Disable four blocking tests from the test suite. + + -- Matthias Klose Fri, 22 Jan 2010 11:10:41 +0100 + +python2.6 (2.6.4-3) unstable; urgency=low + + * Disable the profiled build on s390, mips, mipsel. + * Fix symbol files for kfreebsd-amd64 and sparc64. + + -- Matthias Klose Sat, 16 Jan 2010 16:12:17 +0100 + +python2.6 (2.6.4-2) unstable; urgency=low + + * Update to 20100116, taken from the 2.6 release branch. + * Fix bashism in makesetup shell script. Closes: #530170, #530171. + * Fix build issues on avr (Bradley Smith). Closes: #528439. + - Configure --without-ffi. + - Don't run lengthly tests. + * locale.py: Update locale aliases from the 2.7 branch. + + -- Matthias Klose Sat, 16 Jan 2010 11:05:12 +0100 + +python2.6 (2.6.4-1) experimental; urgency=low + + * Python 2.6.4 final release. + - Issue #7120: logging: Removed import of multiprocessing which is causing + crash in GAE. + - Issue #7149: fix exception in urllib when detecting proxy settings + on OSX. + - Issue #7115: Fixed the extension module builds that is failing when + using paths in the extension name instead of dotted names. LP: #449734. + - Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" + environment. + - Issue #7052: Removed nonexisting NullHandler from logging.__all__. + - Issue #7039: Fixed distutils.tests.test_sysconfig when running on + installation with no build. + - Issue #7019: Raise ValueError when unmarshalling bad long data, instead + of producing internally inconsistent Python longs. + * distutils install: Don't install into /usr/local/local, if option + --prefix=/usr/local is present. + + -- Matthias Klose Tue, 27 Oct 2009 01:22:21 +0100 + +python2.6 (2.6.4~rc1-1) experimental; urgency=low + + * Python 2.6.4 release candidate 1. + - Issue #7052: Removed nonexisting NullHandler from logging.__all__. + - Issue #7039: Fixed distutils.tests.test_sysconfig when running on + installation with no build. + - Issue #7019: Raise ValueError when unmarshalling bad long data, instead + of producing internally inconsistent Python longs. + - Issue #7068: Fixed the partial renaming that occured in r72594. + - Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6. + * Remove the conflict with python-setuptools (fixed in issue #7068). + * Build _hashlib as a builtin. + * python2.6-doc: Don't compress the sphinx inventory. + * python2.6-doc: Fix jquery.js symlink. + + -- Matthias Klose Sat, 10 Oct 2009 10:21:02 +0200 + +python2.6 (2.6.3-1) experimental; urgency=low + + * Final Python 2.6.3 release. + - Issue #5329: Fix os.popen* regression from 2.5 with commands as a + sequence running through the shell. + - Issue #6990: Fix threading.local subclasses leaving old state around + after a reference cycle GC which could be recycled by new locals. + - Issue #6790: Make it possible again to pass an `array.array` to + `httplib.HTTPConnection.send`. + - Issue #6922: Fix an infinite loop when trying to decode an invalid + UTF-32 stream with a non-raising error handler like "replace" or + "ignore". + - Issue #1590864: Fix potential deadlock when mixing threads and fork(). + - Issue #6844: Do not emit DeprecationWarnings when accessing a "message" + attribute on exceptions that was set explicitly. + - Issue #6236, #6348: Fix various failures in the `io` module under AIX + and other platforms, when using a non-gcc compiler. Patch by egreen. + - Issue #6851: Fix urllib.urlopen crash on secondairy threads on OSX 10.6 + - Issue #6947: Fix distutils test on windows. Patch by Hirokazu Yamamoto. + - Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...) + does now always result in NULL. + - Issue #5042: ctypes Structure sub-subclass does now initialize + correctly with base class positional arguments. + - Issue #6938: Fix a TypeError in string formatting of a multiprocessing + debug message. + - Issue #6944: Fix a SystemError when socket.getnameinfo() was called + with something other than a tuple as first argument. + - Issue #6980: Fix ctypes build failure on armel-linux-gnueabi with + -mfloat-abi=softfp. + * python2.6-dbg: Don't create debug subdirectory in /usr/local. No + separate debug directory needed anymore. + * Run the benchmark with -C 2 -n 5 -w 4 on all architectures. + * Build-depend on the versioned db4.x-dev to avoid unexpected updates + for anydbm databases. + + -- Matthias Klose Sat, 03 Oct 2009 13:19:56 +0200 + +python2.6 (2.6.2-3) experimental; urgency=low + + * Update to 20090919, taken from the 2.6 release branch. + * Add a conflict to python-setuptools (<< 0.6c9-3), C extension + builds broken. + * Add new symbols for update from the branch. + + -- Matthias Klose Sat, 19 Sep 2009 10:36:34 +0200 + +python2.6 (2.6.2-2) experimental; urgency=low + + * Symbol _Py_force_double@Base is i386 only. Closes: #534208. + + -- Matthias Klose Tue, 23 Jun 2009 06:14:40 +0200 + +python2.6 (2.6.2-1) experimental; urgency=low + + * Final Python 2.6.2 release. + - Update Doc/tools/sphinxext/download.html. Closes: #526797. + * Update to 20090621, taken from the 2.6 release branch. + + * Address issues when working with PYTHONUSERBASE and non standard prefix + (pointed out by Larry Hastings): + - distutils.sysconfig.get_python_lib(): Only return ".../dist-packages" if + prefix is the default prefix and if PYTHONUSERBASE is not set in the + environment. + - site.addusersitepackages(): Add USER_BASE/.../dist-packages to sys.path. + * Always use the `unix_prefix' scheme for setup.py install in a virtualenv + setup. LP: #339904. + * Don't make the setup.py install options --install-layout=deb and --prefix + conflict with each other. + * distutils: Always install into `/usr/local/lib/python2.6/dist-packages' + if an option `--prefix=/usr/local' is present (except for virtualenv + and PYTHONUSERBASE installations). LP: #362570. + * Always use `site-packages' as site directory name in virtualenv. + + * Do not add /usr/lib/pythonXY.zip on sys.path. + * Add symbols files for libpython2.6 and python2.6-dbg, don't include symbols + from builtins, which can either be built as builtins or extensions. + * Keep an empty lib-dynload in python2.6-minimal to avoid a warning on + startup. + * Build a shared library configured --with-pydebug. LP: #322580. + * Fix some lintian warnings. + * Use the information in /etc/lsb-release for platform.dist(). LP: #196526. + * Move the bdist_wininst files into the -dev package (only needed to build + windows installers). + * Document changes to the site directory name in the installation manual. + * Fix issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add + `do { ... } while (0)' to avoid compiler warnings. Closes: #516956. + * debian/pyhtml2devhelp.py: update for python 2.6 (Marc Deslauriers). + * debian/rules: re-enable documentation files for devhelp. LP: #338791. + * python2.6-doc: Depend on libjs-jquery, use jquery.js from this package. + Closes: #523482. + + -- Matthias Klose Sun, 21 Jun 2009 16:12:15 +0200 + +python2.6 (2.6.1-3) experimental; urgency=low + + * Update to 20090318, taken from the 2.6 release branch. + * Use the information in /etc/lsb-release for platform.dist(). + * Update installation schemes: LP: #338395. Closes: #520278. + - When the --prefix option is used for setup.py install, Use the + `unix_prefix' scheme. + - Use the `deb_system' scheme if --install-layout=deb is specified. + - Use the the `unix_local' scheme if neither --install-layout=deb + nor --prefix is specified. + - The options --install-layout=deb and --prefix are exclusive. + * Don't fail installation/removal if directories in /usr/local cannot + be created. LP: #338227. + * Don't try to move away the site-packages directory. There never was a + python2.6 upload using site-packages. Closes: #518780. + * Fix build failure on mips/mipsel. Closes: #519386. + + -- Matthias Klose Wed, 18 Mar 2009 22:17:20 +0100 + +python2.6 (2.6.1-2) experimental; urgency=low + + * Move libpython2.6.a into the python2.6-dev package. + * Move idlelib into the idle-python2.6 package. + + -- Matthias Klose Wed, 25 Feb 2009 18:42:19 +0100 + +python2.6 (2.6.1-1) experimental; urgency=low + + * New upstream version, upload to experimental. + * Update to 20090225, taken from the 2.6 release branch. + * Don't build-depend on locales on armel, hppa, ia64 and mipsel; package is + currently not installable. + + -- Matthias Klose Wed, 25 Feb 2009 18:42:19 +0100 + +python2.6 (2.6.1-0ubuntu9) jaunty; urgency=low + + * Don't build pyexpat, _elementtree and _ctypes as builtin extensions, + third party packages make too many assumptions about these not built + as builtins. + + -- Matthias Klose Tue, 24 Feb 2009 16:34:27 +0100 + +python2.6 (2.6.1-0ubuntu8) jaunty; urgency=low + + * Link the shared libpython with $(MODLIBS). + + -- Matthias Klose Sun, 22 Feb 2009 16:38:49 +0100 + +python2.6 (2.6.1-0ubuntu7) jaunty; urgency=low + + * Update to 20090222, taken from the 2.6 release branch. + + -- Matthias Klose Sun, 22 Feb 2009 10:35:29 +0100 + +python2.6 (2.6.1-0ubuntu6) jaunty; urgency=low + + * Don't build the gdbm extension from the python2.6 source. + * Build the dbm extension using libdb. + * Don't build-depend on locales on sparc (currently not installable), only + needed by the testsuite. + * Update to 20090219, taken from the 2.6 release branch. + + -- Matthias Klose Thu, 19 Feb 2009 12:43:20 +0100 + +python2.6 (2.6.1-0ubuntu5) jaunty; urgency=low + + * Add build dependency on libdb-dev. + + -- Matthias Klose Mon, 16 Feb 2009 13:34:41 +0100 + +python2.6 (2.6.1-0ubuntu4) jaunty; urgency=low + + * Disable the profiled build on all architectures. + + -- Matthias Klose Mon, 16 Feb 2009 11:18:51 +0100 + +python2.6 (2.6.1-0ubuntu3) jaunty; urgency=low + + * Disable the profiled build on armel as well. + + -- Matthias Klose Sun, 15 Feb 2009 10:38:02 +0100 + +python2.6 (2.6.1-0ubuntu2) jaunty; urgency=low + + * Don't use the profiled build on amd64, lpia and sparc (GCC + PR profile/38292). + + -- Matthias Klose Sat, 14 Feb 2009 14:09:34 +0100 + +python2.6 (2.6.1-0ubuntu1) jaunty; urgency=low + + * Update to 20090211, taken from the 2.6 release branch. + + -- Matthias Klose Fri, 13 Feb 2009 12:51:00 +0100 + +python2.6 (2.6.1-0ubuntu1~ppa1) jaunty; urgency=low + + * Python 2.6.1 release. + * Update to 20081206, taken from the 2.6 release branch. + * Ensure that all extensions from the -minimal package are statically + linked into the interpreter. + * Include expat, _elementtree, datetime, bisect, _bytesio, _locale, + _fileio in -minimal to link these extensions statically. + + -- Matthias Klose Fri, 05 Dec 2008 20:43:51 +0100 + +python2.6 (2.6-0ubuntu1~ppa5) intrepid; urgency=low + + * Test build + + -- Matthias Klose Fri, 14 Nov 2008 10:14:38 +0100 + +python2.6 (2.6-0ubuntu1~ppa4) intrepid; urgency=low + + * Do not build the bsddb3 module from this source, but recommend the + python-bsddb3 package (will be a dependency after python-bsddb3 is in + the archive). + * For locally installed packages, create a directory + /usr/local/lib/python2.6/dist-packages. This is the default for + installations done with distutils and setuptools. Third party stuff + packaged within the distribution goes to /usr/lib/python2.6/dist-packages. + There is no /usr/lib/python2.6/site-packages in the file system and + on sys.path. No package within the distribution must not install + anything in this location. + * Place the gdbm extension into the python2.6 package. + * distutils: Add an option --install-layout=deb, which + - installs into $prefix/dist-packages instead of $prefix/site-packages. + - doesn't encode the python version into the egg name. + + -- Matthias Klose Sat, 25 Oct 2008 11:12:24 +0000 + +python2.6 (2.6-0ubuntu1~ppa3) intrepid; urgency=low + + * Build-depend on libdb4.6-dev, instead of libdb-dev (4.7). Test suite + hangs in the bsddb tests. + + -- Matthias Klose Wed, 22 Oct 2008 11:05:13 +0200 + +python2.6 (2.6-0ubuntu1~ppa2) intrepid; urgency=low + + * Update to 20081021, taken from the 2.6 release branch. + * Fix typos and section names in doc-base files. LP: #273344. + * Build a new package libpython2.6. + * For locally installed packages, create a directory + /usr/local/lib/python2.6/system-site-packages, which is symlinked + from /usr/lib/python2.6/site-packages. Third party stuff packaged + within the distribution goes to /usr/lib/python2.6/dist-packages. + + -- Matthias Klose Tue, 21 Oct 2008 18:09:31 +0200 + +python2.6 (2.6-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 release. + * Update to current branch 20081009. + + -- Matthias Klose Thu, 09 Oct 2008 14:28:26 +0200 + +python2.6 (2.6~b3-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 beta3 release. + + -- Matthias Klose Sun, 24 Aug 2008 01:34:54 +0000 + +python2.6 (2.6~b2-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 beta2 release. + + -- Matthias Klose Thu, 07 Aug 2008 16:45:56 +0200 + +python2.6 (2.6~b1-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 beta1 release. + + -- Matthias Klose Tue, 15 Jul 2008 12:57:20 +0000 + +python2.6 (2.6~a3-0ubuntu1~ppa2) hardy; urgency=low + + * Test build + + -- Matthias Klose Thu, 29 May 2008 18:08:48 +0200 + +python2.6 (2.6~a3-0ubuntu1~ppa1) hardy; urgency=low + + * Python 2.6 alpha3 release. + * Update to current trunk 20080523. + + -- Matthias Klose Thu, 22 May 2008 17:37:46 +0200 + +python2.5 (2.5.2-5) unstable; urgency=low + + * Backport new function signal.set_wakeup_fd from the trunk. + Background: http://bugzilla.gnome.org/show_bug.cgi?id=481569 + + -- Matthias Klose Wed, 30 Apr 2008 12:05:10 +0000 + +python2.5 (2.5.2-4) unstable; urgency=low + + * Update to 20080427, taken from the 2.5 release branch. + - Fix issues #2670, #2682. + * Disable running pybench on the hppa buildd (ftbfs). + * Allow setting BASECFLAGS, OPT and EXTRA_LDFLAGS (like, CC, CXX, CPP, + CFLAGS, CPPFLAGS, CCSHARED, LDSHARED) from the environment. + * Support parallel= in DEB_BUILD_OPTIONS (see #209008). + + -- Matthias Klose Sun, 27 Apr 2008 10:40:51 +0200 + +python2.5 (2.5.2-3) unstable; urgency=medium + + * Update to 20080416, taken from the 2.5 release branch. + - Fix CVE-2008-1721, integer signedness error in the zlib extension module. + - Fix urllib2 file descriptor happens byte-at-a-time, reverting + a fix for excessively large memory allocations when calling .read() + on a socket object wrapped with makefile(). + * Disable some regression tests on some architectures: + - arm: test_compiler, test_ctypes. + - armel: test_compiler. + - hppa: test_fork1, test_wait3. + - m68k: test_bsddb3, test_compiler. + * Build-depend on libffi-dev instead of libffi4-dev. + * Fix CVE-2008-1679, integer overflows in the imageop module. + + -- Matthias Klose Wed, 16 Apr 2008 23:37:46 +0200 + +python2.5 (2.5.2-2) unstable; urgency=low + + * Use site.addsitedir() to add directories in /usr/local to sys.path. + Addresses: #469157, #469818. + + -- Matthias Klose Sat, 08 Mar 2008 16:11:23 +0100 + +python2.5 (2.5.2-1) unstable; urgency=low + + * Python 2.5.2 release. + * Merge from Ubuntu: + - Move site customization into sitecustomize.py, don't make site.py + a config file. Addresses: #309719, #413172, #457361. + - Move site.py to python2.4-minimal, remove `addbuilddir' from site.py, + which is unnecessary for installed builds. + - python2.5-dev: Recommend libc-dev instead of suggesting it. LP: #164909. + - Fix issue 961805, Tk Text.edit_modified() fails. LP: #84720. + + -- Matthias Klose Thu, 28 Feb 2008 23:18:52 +0100 + +python2.5 (2.5.1-7) unstable; urgency=low + + * Update to 20080209, taken from the 2.5 release branch. + * Build the _bsddb extension with db-4.5 again; 4.6 is seriously + broken when used with the _bsddb extension. + * Do not run pybench on arm and armel. + * python2.5: Provide python2.5-wsgiref. + * Fix a pseudo RC report with duplicated attributes in the control + file. Closes: #464307. + + -- Matthias Klose Sun, 10 Feb 2008 00:22:57 +0100 + +python2.5 (2.5.1-6) unstable; urgency=low + + * Update to 20080102, taken from the 2.5 release branch. + - Only define _BSD_SOURCE on OpenBSD systems. Closes: #455400. + * Fix handling of packages in linecache.py (Kevin Goodsell). LP: #70902. + * Bump debhelper to v5. + * Register binfmt for .py[co] files. + * Use absolute paths when byte-compiling files. Addresses: #453346. + Closes: #413566, LP: #177722. + * CVE-2007-4965, http://bugs.python.org/issue1179: + Multiple integer overflows in the imageop module in Python 2.5.1 and + earlier allow context-dependent attackers to cause a denial of service + (application crash) and possibly obtain sensitive information (memory + contents) via crafted arguments to (1) the tovideo method, and unspecified + other vectors related to (2) imageop.c, (3) rbgimgmodule.c, and other + files, which trigger heap-based buffer overflows. + Patch prepared by Stephan Herrmann. Closes: #443333, LP: #163845. + * Register info docs when doing source only uploads. LP: #174786. + * Remove deprecated value from categories in desktop file. LP: #172874. + * python2.5-dbg: Don't include the gdbm and _tkinter extensions, now provided + in separate packages. + * Provide a symlink changelog -> NEWS. Closes: #439271. + * Fix build failure on hurd, working around poll() on systems on which it + returns an error on invalid FDs. Closes: #438914. + * Configure --with-system-ffi on all architectures. Closes: #448520. + * Fix version numbers in copyright and README files (Dan O'Huiginn). + Closes: #446682. + * Move some documents from python2.5 to python2.5-dev. + + -- Matthias Klose Wed, 02 Jan 2008 22:22:19 +0100 + +python2.5 (2.5.1-5) unstable; urgency=low + + * Build the _bsddb extension with db-4.6. + + -- Matthias Klose Fri, 17 Aug 2007 00:39:35 +0200 + +python2.5 (2.5.1-4) unstable; urgency=low + + * Update to 20070813, taken from the 2.5 release branch. + * Include plat-mac/plistlib.py (plat-mac is not in sys.path by default. + Closes: #435826. + * Use emacs22 to build the documentation in info format. Closes: #434969. + * Build-depend on db-dev (>= 4.6). Closes: #434965. + + -- Matthias Klose Mon, 13 Aug 2007 22:22:44 +0200 + +python2.5 (2.5.1-3) unstable; urgency=high + + * Support mixed-endian IEEE floating point, as found in the ARM old-ABI + (Aurelien Jarno). Closes: #434905. + + -- Matthias Klose Fri, 27 Jul 2007 20:01:35 +0200 + +python2.5 (2.5.1-2) unstable; urgency=low + + * Update to 20070717, taken from the 2.5 release branch. + * Fix reference count for sys.pydebug variable. Addresses: #431393. + * Build depend on libbluetooth-dev instead of libbluetooth2-dev. + + -- Matthias Klose Tue, 17 Jul 2007 14:09:47 +0200 + +python2.5 (2.5.1-1) unstable; urgency=low + + * Python-2.5.1 release. + * Build-depend on gcc-4.1 (>= 4.1.2-4) on alpha, powerpc, s390, sparc. + * Merge from Ubuntu: + - Add debian/patches/subprocess-eintr-safety.dpatch (LP: #87292): + - Create and use wrappers around read(), write(), and os.waitpid() in the + subprocess module which retry the operation on an EINTR (which happens + if e. g. an alarm was raised while the system call was in progress). + It is incredibly hard and inconvenient to sensibly handle this in + applications, so let's fix this at the right level. + - Patch based on original proposal of Peter <85>strand + in http://python.org/sf/1068268. + - Add two test cases. + - Change the interpreter to build and install python extensions + built with the python-dbg interpreter with a different name into + the same path (by appending `_d' to the extension name). The debug build + of the interpreter tries to first load a foo_d.so or foomodule_d.so + extension, then tries again with the normal name. + - When trying to import the profile and pstats modules, don't + exit, add a hint to the exception pointing to the python-profiler + package, don't exit. + - Keep the module version in the .egg-info name, only remove the + python version. + - python2.5-dbg: Install Misc/SpecialBuilds.txt, document the + debug changes in README.debug. + * Update to 20070425, taken from the 2.5 release branch. + + -- Matthias Klose Wed, 25 Apr 2007 22:12:50 +0200 + +python2.5 (2.5-6) unstable; urgency=medium + + * webbrowser.py: Recognize other browsers: www-browser, x-www-browser, + iceweasel, iceape. + * Move pyconfig.h from the python2.5-dev into the python2.5 package; + required by builds for pure python modules without having python2.5-dev + installed (matching the functionality in python2.4). + * Move the unicodedata module into python2.5-minimal; allows byte compilation + of UTF8 encoded files. + * Do not install anymore outdated debhelper sample scripts. + * Install Misc/SpecialBuilds.txt as python2.5-dbg document. + + -- Matthias Klose Wed, 21 Feb 2007 01:17:12 +0100 + +python2.5 (2.5-5) unstable; urgency=high + + * Do not run the python benchmark on m68k. Timer problems. + Fixes FTBFS on m68k. + * Update to 20061209, taken from the 2.5 release branch. + - Fixes building the library reference in info format. + + -- Matthias Klose Sat, 9 Dec 2006 13:40:48 +0100 + +python2.5 (2.5-4) unstable; urgency=medium + + * Update to 20061203, taken from the 2.5 release branch. + - Fixes build failures on knetfreebsd and the hurd. Closes: #397000. + * Clarify README about distutils. Closes: #396394. + * Move python2.5-config to python2.5-dev. Closes: #401451. + * Cleanup build-conflicts. Addresses: #394512. + + -- Matthias Klose Sun, 3 Dec 2006 18:22:49 +0100 + +python2.5 (2.5-3.1) unstable; urgency=low + + * Non-maintainer upload. + * python2.5-minimal depends on python-minimal (>= 2.4.4-1) because it's the + first version which lists python2.5 as an unsupported runtime (ie a + runtime that is available but for which modules are not auto-compiled). + And being listed there is required for python-central to accept the + installation of python2.5-minimal. Closes: #397006 + + -- Raphael Hertzog Wed, 22 Nov 2006 15:41:06 +0100 + +python2.5 (2.5-3) unstable; urgency=medium + + * Update to 20061029 (2.4.4 was released on 20061019), taken from + the 2.5 release branch. We do not want to have regressions in + 2.5 compared to the 2.4.4 release. + * Don't run pybench on m68k, fails in the calibration loop. Closes: #391030. + * Run the installation/removal hooks. Closes: #383292, #391036. + + -- Matthias Klose Sun, 29 Oct 2006 11:35:19 +0100 + +python2.5 (2.5-2) unstable; urgency=medium + + * Update to 20061003, taken from the 2.5 release branch. + * On arm and m68k, don't run the pybench in debug mode. + * Fix building the source within exec_prefix (Alexander Wirt). + Closes: #385336. + + -- Matthias Klose Tue, 3 Oct 2006 10:08:36 +0200 + +python2.5 (2.5-1) unstable; urgency=low + + * Python 2.5 release. + * Update to 20060926, taken from the 2.5 release branch. + * Run the Python benchmark during the build, compare the results + of the static and shared builds. + * Fix invalid html in python2.5.devhelp.gz. + * Add a python2.5 console entry to the menu (hidden by default). + * python2.5: Suggest python-profiler. + + -- Matthias Klose Tue, 26 Sep 2006 02:36:11 +0200 + +python2.5 (2.5~c1-1) unstable; urgency=low + + * Python 2.5 release candidate 1. + * Update to trunk 20060818. + + -- Matthias Klose Sat, 19 Aug 2006 19:21:05 +0200 + +python2.5 (2.5~b3-1) unstable; urgency=low + + * Build the _ctypes module for m68k-linux. + + -- Matthias Klose Fri, 11 Aug 2006 18:19:19 +0000 + +python2.5 (2.5~b3-0ubuntu1) edgy; urgency=low + + * Python 2.5 beta3 release. + * Update to trunk 20060811. + * Rebuild the documentation. + * Fix value of sys.exec_prefix in the debug build. + * Do not build the library reference in info format; fails to build. + * Link the interpreter against the shared runtime library. With + gcc-4.1 the difference in the pystones benchmark dropped from about + 12% to about 6%. + * Install the statically linked version of the interpreter as + python2.5-static for now. + * Link the shared libpython with -O1. + + -- Matthias Klose Thu, 10 Aug 2006 14:04:48 +0000 + +python2.5 (2.4.3+2.5b2-3) unstable; urgency=low + + * Disable the testsuite on s390; don't care about "minimally configured" + buildd's. + + -- Matthias Klose Sun, 23 Jul 2006 11:45:03 +0200 + +python2.5 (2.4.3+2.5b2-2) unstable; urgency=low + + * Update to trunk 20060722. + * Merge idle-lib from idle-python2.5 into python2.5. + * Merge lib-tk from python-tk into python2.5. + * Tkinter.py: Suggest installation of python-tk package on failed + import of the _tkinter extension. + * Don't run the testsuite for the debug build on alpha. + * Don't run the test_compiler test on m68k. Just takes too long. + * Disable building ctypes on m68k (requires support for closures). + + -- Matthias Klose Sat, 22 Jul 2006 22:26:42 +0200 + +python2.5 (2.4.3+2.5b2-1) unstable; urgency=low + + * Python 2.5 beta2 release. + * Update to trunk 20060716. + * When built on a buildd, do not run the following test which try to + access the network: test_codecmaps_cn, test_codecmaps_hk, test_codecmaps_jp, + test_codecmaps_kr, test_codecmaps_tw, test_normalization. + * When built on a buildd, do not run tests requiring missing write permissions: + test_ossaudiodev. + + -- Matthias Klose Sun, 16 Jul 2006 02:53:50 +0000 + +python2.5 (2.4.3+2.5b2-0ubuntu1) edgy; urgency=low + + * Python 2.5 beta2 release. + + -- Matthias Klose Thu, 13 Jul 2006 17:16:52 +0000 + +python2.5 (2.4.3+2.5b1-1ubuntu2) edgy; urgency=low + + * Fix python-dev dependencies. + * Update to trunk 20060709. + + -- Matthias Klose Sun, 9 Jul 2006 18:50:32 +0200 + +python2.5 (2.4.3+2.5b1-1ubuntu1) edgy; urgency=low + + * Python 2.5 beta1 release. + * Update to trunk 20060623. + * Merge changes from the python2.4 packages. + * python2.5-minimal: Add _struct. + + -- Matthias Klose Fri, 23 Jun 2006 16:04:46 +0200 + +python2.5 (2.4.3+2.5a1-1) experimental; urgency=low + + * Update to trunk 20060409. + * Run testsuite for debug build as well. + * Build-depend on gcc-4.1. + + -- Matthias Klose Sun, 9 Apr 2006 22:27:05 +0200 + +python2.5 (2.4.3+2.5a1-0ubuntu1) dapper; urgency=low + + * Python 2.5 alpha1 release. + * Drop integrated patches. + * Add build dependencies on libsqlite3-dev and libffi4-dev. + * Add (build-)dependency on mime-support, libgpmg1 (test suite). + * Build using the system FFI. + * python2.5 provides python2.5-ctypes and python2.5-pysqlite2, + python2.5-elementtree. + * Move hashlib.py to python-minimal. + * Lib/hotshot/pstats.py: Error out on missing profile/pstats modules. + + -- Matthias Klose Wed, 5 Apr 2006 14:56:15 +0200 + +python2.4 (2.4.3-8ubuntu1) edgy; urgency=low + + * Resynchronize with Debian unstable. Remaining changes: + - Apply langpack-gettext patch. + - diff.gz contains pregenerated html and info docs. + - Build the -doc package from this source. + + -- Matthias Klose Thu, 22 Jun 2006 18:39:57 +0200 + +python2.4 (2.4.3-8) unstable; urgency=low + + * Remove python2.4's dependency on python-central. On installation of + the runtime, call hooks /usr/share/python/runtime.d/*.rtinstall. + On removal, call hooks /usr/share/python/runtime.d/*.rtremove. + Addresses: #372658. + * Call the rtinstall hooks only, if it's a new installation, or the first + installation using the hooks. Adresses: #373677. + + -- Matthias Klose Sun, 18 Jun 2006 00:56:13 +0200 + +python2.4 (2.4.3-7) unstable; urgency=medium + + * Reupload, depend on python-central (>= 0.4.15). + * Add build-conflict on python-xml. + + -- Matthias Klose Wed, 14 Jun 2006 18:56:57 +0200 + +python2.4 (2.4.3-6) medium; urgency=low + + * idle-python2.4: Remove the old postinst and prerm scripts. + * Name the runtime correctly in python2.4-minimal's installation + scripts. + + -- Matthias Klose Mon, 12 Jun 2006 17:39:56 +0000 + +python2.4 (2.4.3-5) unstable; urgency=low + + * python2.4-prerm: Handle the case, when python-central is not installed. + * idle-python2.4: Depend on python-tk instead of python2.4-tk. + + -- Matthias Klose Fri, 9 Jun 2006 05:17:17 +0200 + +python2.4 (2.4.3-4) unstable; urgency=low + + * SVN update up to 2006-06-07 + * Use python-central. + * Don't build the -tk and -gdbm packages from this source; now built + from the python-stdlib-extensions source. + * Remove leftover build dependency on libgmp3-dev. + * Do not build-depend on libbluetooth1-dev and libgpmg1-dev on + hurd-i386, kfreebsd-i386, kfreebsd-amd64. Closes: #365830. + * Do not run the test_tcl test; hangs for unknown reasons on at least + the following buildds: vivaldi(m68k), goedel (alpha), mayer (mipsel). + And no virtual package to file bug reports for the buildds ... + Closes: #364419. + * Move the Makefile from python2.4-dev to python2.4. Closes: #366473. + * Fix typo in pdb(1). Closes: #365772. + * New autoconf likes the mandir in /usr/share instead of /usr; work + with both locations. Closes: #367618. + + -- Matthias Klose Wed, 7 Jun 2006 21:37:20 +0200 + +python2.4 (2.4.3-3) unstable; urgency=low + + * SVN update up to 2006-04-21 + * Update locale aliases from /usr/share/X11/locale/locale.alias. + * Start idle with option -n from the desktop menu, so that the program + can be started in parallel. + * Testsuite related changes only: + - Add build dependencies mime-support, libgpmg1 (needed by test cases). + - Run the testsuite with bsddb, audio and curses resources enabled. + - Re-run the failed tests in verbose mode. + - Run the test suite for the debug build as well. + - Build depend on netbase, needed by test_socketmodule. + - Build depend on libgpmg1, needed by test_curses. + - On the buildds do not run the tests needing the network resource. + * Update python logo. + * Check for the availability of the profile and pstats modules when + importing hotshot.pstats. Closes: #334067. + * Don't build the -doc package from the python2.4 source. + * Set OPT in the installed Makefile to -O2. + + -- Matthias Klose Fri, 21 Apr 2006 19:58:43 +0200 + +python2.4 (2.4.3-2) unstable; urgency=low + + * Add (build-)dependency on mime-support. + + -- Matthias Klose Tue, 4 Apr 2006 22:21:41 +0200 + +python2.4 (2.4.3-1) unstable; urgency=low + + * Python 2.4.3 release. + + -- Matthias Klose Thu, 30 Mar 2006 23:42:37 +0200 + +python2.4 (2.4.3-0ubuntu1) dapper; urgency=low + + * Python 2.4.3 release. + - Fixed a bug that the gb18030 codec raises RuntimeError on encoding + surrogate pair area on UCS4 build. Ubuntu: #29289. + + -- Matthias Klose Thu, 30 Mar 2006 10:57:32 +0200 + +python2.4 (2.4.2+2.4.3c1-0ubuntu1) dapper; urgency=low + + * SVN update up to 2006-03-25 (2.4.3 candidate 1). + - Regenerate the documentation. + + -- Matthias Klose Mon, 27 Mar 2006 12:03:05 +0000 + +python2.4 (2.4.2-1ubuntu3) dapper; urgency=low + + * SVN update up to 2006-03-04 + - Regenerate the documentation. + - map.mmap(-1, size, ...) can return anonymous memory again on Unix. + Ubuntu #26201. + * Build-depend on libncursesw5-dev, ncursesw5 is preferred for linking. + Provides UTF-8 compliant curses bindings. + * Fix difflib where certain patterns of differences were making difflib + touch the recursion limit. + + -- Matthias Klose Sat, 4 Mar 2006 21:38:24 +0000 + +python2.4 (2.4.2-1ubuntu2) dapper; urgency=low + + * SVN update up to 2006-01-17 + - pwd is now a builtin module, remove it from python-minimal. + - Regenerate the documentation. + * python2.4-tk: Suggest tix instead of tix8.1. + * Move config/Makefile from the -dev package into the runtime package + to be able to use the bdist_wininst distutils command. Closes: #348335. + + -- Matthias Klose Tue, 17 Jan 2006 11:02:24 +0000 + +python2.4 (2.4.2-1ubuntu1) dapper; urgency=low + + * Temporarily remove build dependency on lsb-release. + + -- Matthias Klose Sun, 20 Nov 2005 17:40:18 +0100 + +python2.4 (2.4.2-1build1) dapper; urgency=low + + * Rebuild (openssl-0.9.8). + + -- Matthias Klose Sun, 20 Nov 2005 15:27:24 +0000 + +python2.4 (2.4.2-1) unstable; urgency=low + + * Python 2.4.2 release. + + -- Matthias Klose Thu, 29 Sep 2005 01:49:28 +0200 + +python2.4 (2.4.1+2.4.2rc1-1) unstable; urgency=low + + * Python 2.4.2 release candidate 1. + * Fix "Fatal Python error" from cStringIO's writelines. + Patch by Andrew Bennetts. + + -- Matthias Klose Thu, 22 Sep 2005 10:33:22 +0200 + +python2.4 (2.4.1-5) unstable; urgency=low + + * CVS update up to 2005-09-14 + - Regenerate the html and info docs. + * Add some more locale aliases. + * Fix substitution pf python version in README.python2.4-minimal. + Closes: #327487. + * On m68k, build using -O2 (closes: #326903). + * On Debian, don't configure --with-fpectl, which stopped working with + glibc-2.3.5. + + -- Matthias Klose Wed, 14 Sep 2005 17:32:56 +0200 + +python2.4 (2.4.1-4) unstable; urgency=low + + * CVS update up to 2005-09-04 + - teTeX 3.0 related fixes (closes: #322407). + - Regenerate the html and info docs. + * Add entry for IDLE in the Gnome menus. + * Don't build-depend on libbluetooth-dev on the Hurd (closes: #307037). + * Reenable the cthreads patch for the Hurd (closes: #307052). + + -- Matthias Klose Sun, 4 Sep 2005 18:31:42 +0200 + +python2.4 (2.4.1-3) unstable; urgency=low + + * Synchronise with Ubuntu: + - Build a python2.4-minimal package. + + -- Matthias Klose Tue, 12 Jul 2005 00:23:10 +0000 + +python2.4 (2.4.1-2ubuntu3) breezy; urgency=low + + * CVS update up to 2005-07-07 + * Regenerate the documentation. + + -- Matthias Klose Thu, 7 Jul 2005 09:21:28 +0200 + +python2.4 (2.4.1-2ubuntu2) breezy; urgency=low + + * CVS update up to 2005-06-15 + * Regenerate the documentation. + * Synchronize with Debian. Ubuntu 10485. + * idle-python2.4 enhances python2.4. Ubuntu 11562. + * README.Debian: Fix reference to the doc directory (closes: #311677). + + -- Matthias Klose Wed, 15 Jun 2005 08:56:57 +0200 + +python2.4 (2.4.1-2ubuntu1) breezy; urgency=low + + * Update build dependencies: + db4.2-dev -> db4.3-dev, + libreadline4-dev -> libreadline5-dev. + * python2.4-dev: Add missing templates to generate HTML docs. Ubuntu 11531. + + -- Matthias Klose Sun, 29 May 2005 00:01:05 +0200 + +python2.4 (2.4.1-2) unstable; urgency=low + + * Add the debug symbols for the python2.4, python2.4-gdbm + and python2.4-tk packages to the python2.4-dbg package. + * Add gdbinit example to doc directory. + + -- Matthias Klose Thu, 5 May 2005 11:12:32 +0200 + +python2.4 (2.4.1-1ubuntu2) breezy; urgency=low + + * Add the debug symbols for the python2.4, python2.4-minimal, python2.4-gdbm + and python2.4-tk packages to the python2.4-dbg package. Ubuntu 10261, + * Add gdbinit example to doc directory. + * For os.utime, use utimes(2), correctly working with glibc-2.3.5. + Ubuntu 10294. + + -- Matthias Klose Thu, 5 May 2005 09:06:07 +0200 + +python2.4 (2.4.1-1ubuntu1) breezy; urgency=low + + * Reupload as 2.4.1-1ubuntu1. + + -- Matthias Klose Thu, 14 Apr 2005 10:46:32 +0200 + +python2.4 (2.4.1-1) unstable; urgency=low + + * Python 2.4.1 release. + * Fix noise in python-doc installation/removal. + * New Python section for the info docs. + + -- Matthias Klose Wed, 30 Mar 2005 19:42:03 +0200 + +python2.4 (2.4.1-0) hoary; urgency=low + + * Python 2.4.1 release. + * Fix noise in python-doc installation/removal. + * New Python section for the info docs. + + -- Matthias Klose Wed, 30 Mar 2005 16:35:34 +0200 + +python2.4 (2.4+2.4.1rc2-2) unstable; urgency=low + + * Add the valgrind support file to /etc/python2.4 + * Build the -dbg package with -DPy_USING_MEMORY_DEBUGGER. + * Lib/locale.py: + - correctly parse LANGUAGE as a colon separated list of languages. + - prefer LC_ALL, LC_CTYPE and LANG over LANGUAGE to get the correct + encoding. + - Don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding + for glibc. + * Fix two typos in python(1). Addresses: #300124. + + -- Matthias Klose Sat, 19 Mar 2005 21:50:14 +0100 + +python2.4 (2.4+2.4.1rc2-1) unstable; urgency=low + + * Python 2.4.1 release candidate 2. + * Build-depend on libbluetooth1-dev. + + -- Matthias Klose Sat, 19 Mar 2005 00:57:14 +0100 + +python2.4 (2.4dfsg-2) unstable; urgency=low + + * CVS update up to 2005-03-03 + + -- Matthias Klose Thu, 3 Mar 2005 22:22:16 +0100 + +python2.4 (2.4dfsg-1ubuntu4) hoary; urgency=medium + + * Move exception finalisation later in the shutdown process - this + fixes the crash seen in bug #1165761, taken from CVS. + * codecs.StreamReader: Reset codec when seeking. Ubuntu #6972. + * Apply fix for SF1124295, fixing an obscure bit of Zope's security machinery. + * distutils: Don't add standard library dirs to library_dirs + and runtime_library_dirs. On amd64, runtime paths pointing to /usr/lib64 + aren't recognized by dpkg-shlibdeps, and the packages containing these + libraries aren't added to ${shlibs:Depends}. + * Lib/locale.py: + - correctly parse LANGUAGE as a colon separated list of languages. + - prefer LC_ALL, LC_CTYPE and LANG over LANGUAGE to get the correct + encoding. + - Don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding + for glibc. + * os.py: Avoid using items() in environ.update(). Fixes #1124513. + * Python/pythonrun.c: + * Build depend on locales, generate the locales needed for the + testsuite. + * Add build dependency on libbluetooth1-dev, adding some bluetooth + functionality to the socket module. + * Lib/test/test_sundry.py: Don't fail on import of profile & pstats, + which are separated out to the python-profiler package. + * Fix typos in manpage. + + -- Matthias Klose Tue, 29 Mar 2005 13:35:53 +0200 + + +python2.4 (2.4dfsg-1ubuntu3) hoary; urgency=low + + * debian/patches/langpack-gettext.dpatch: + - langpack support for python-gettext added + + -- Michael Vogt Tue, 1 Mar 2005 13:13:36 +0100 + +python2.4 (2.4dfsg-1ubuntu2) hoary; urgency=low + + * Revert 'essential' status on python2.4-minimal. This status on + on python-minimal is sufficient (Ubuntu #6392). + + -- Matthias Klose Wed, 9 Feb 2005 23:09:42 +0100 + +python2.4 (2.4dfsg-1ubuntu1) hoary; urgency=low + + * Resyncronise with Debian. + * Mark the python2.4-minimal package as 'essential'. + + -- Matthias Klose Wed, 9 Feb 2005 13:31:09 +0100 + +python2.4 (2.4dfsg-1) unstable; urgency=medium + + * Add licenses and acknowledgements for incorporated software in the + debian/copyright file (addresses: #293932). + * Replace md5 implementation with one having a DFSG conforming license. + * Remove the profile.py and pstats.py modules from the source package, + not having a DFSG conforming license. The modules can be found in + the python2.x-profile package in the non-free section. + Addresses: #293932. + * Add missing norwegian locales (Tollef Fog Heen). + * CVS updates of the release24-maint branch upto 2005-02-08 (date of + the Python 2.3.5 release). + + -- Matthias Klose Tue, 8 Feb 2005 19:13:10 +0100 + +python2.4 (2.4-7ubuntu1) hoary; urgency=low + + * Fix the name of the python-dbg man page. + * Resyncronise with Debian. + * Move more modules to -minimal (new code in copy.py requires these): + dis, inspect, opcode, token, tokenize. + + -- Matthias Klose Tue, 8 Feb 2005 19:13:10 +0100 + +python2.4 (2.4-7) unstable; urgency=medium + + * Add licenses and acknowledgements for incorporated software in the + debian/copyright file (addresses: #293932). + * Replace md5 implementation with one having a DFSG conforming license. + * Add missing norwegian locales (Tollef Fog Heen). + * CVS updates of the release24-maint branch upto 2005-02-08 (date of + the Python 2.3.5 release). + + -- Matthias Klose Tue, 8 Feb 2005 19:13:10 +0100 + +python2.4 (2.4-6) unstable; urgency=low + + * Build a python2.4-dbg package using --with-pydebug. Add a debug + directory /lib-dynload/debug to sys.path instead of + /lib-dynload und install the extension modules of the + debug build in this directory. + Change the module load path to load extension modules from other + site-packages/debug directories (for further details see the + README in the python2.4-dbg package). Closes: #5415. + * Apply the pydebug-path patch. The package was already built in -5. + + -- Matthias Klose Fri, 4 Feb 2005 22:15:13 +0100 + +python2.4 (2.4-5) unstable; urgency=high + + * Fix a flaw in SimpleXMLRPCServerthat can affect any XML-RPC servers. + This affects any programs have been written that allow remote + untrusted users to do unrestricted traversal and can allow them to + access or change function internals using the im_* and func_* attributes. + References: CAN-2005-0089. + * CVS updates of the release24-maint branch upto 2005-02-04. + + -- Matthias Klose Fri, 4 Feb 2005 08:12:10 +0100 + +python2.4 (2.4-4) unstable; urgency=medium + + * Update debian/copyright to the 2.4 license text (closes: #290898). + * Remove /usr/bin/smtpd.py (closes: #291049). + + -- Matthias Klose Mon, 17 Jan 2005 23:54:37 +0100 + +python2.4 (2.4-3ubuntu6) hoary; urgency=low + + * Use old-style dpatches instead of dpatch-run. + + -- Tollef Fog Heen Mon, 7 Feb 2005 15:58:05 +0100 + +python2.4 (2.4-3ubuntu5) hoary; urgency=low + + * Actually apply the patch as well (add to list of patches in + debian/rules) + + -- Tollef Fog Heen Sun, 6 Feb 2005 15:12:58 +0100 + +python2.4 (2.4-3ubuntu4) hoary; urgency=low + + * Add nb_NO and nn_NO locales to Lib/locale.py + + -- Tollef Fog Heen Sun, 6 Feb 2005 14:33:05 +0100 + +python2.4 (2.4-3ubuntu3) hoary; urgency=low + + * Fix a flaw in SimpleXMLRPCServerthat can affect any XML-RPC servers. + This affects any programs have been written that allow remote + untrusted users to do unrestricted traversal and can allow them to + access or change function internals using the im_* and func_* attributes. + References: CAN-2005-0089. + + -- Matthias Klose Wed, 2 Feb 2005 09:08:20 +0000 + +python2.4 (2.4-3ubuntu2) hoary; urgency=low + + * Build a python2.4-dbg package using --with-pydebug. Add a debug + directory /lib-dynload/debug to sys.path instead of + /lib-dynload und install the extension modules of the + debug build in this directory. + Change the module load path to load extension modules from other + site-packages/debug directories (for further details see the + README in the python2.4-dbg package). Closes: #5415. + * Update debian/copyright to the 2.4 license text (closes: #290898). + * Add operator and copy to the -minimal package. + + -- Matthias Klose Mon, 17 Jan 2005 23:19:47 +0100 + +python2.4 (2.4-3ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + * python2.4: Depend on the very same version of python2.4-minimal. + * Docment, that time.strptime currently cannot be used, if the + python-minimal package is installed without the python package. + + -- Matthias Klose Sun, 9 Jan 2005 19:35:48 +0100 + +python2.4 (2.4-3) unstable; urgency=medium + + * Build the fpectl module. + * Updated to CVS release24-maint 20050107. + + -- Matthias Klose Sat, 8 Jan 2005 19:05:21 +0100 + +python2.4 (2.4-2ubuntu5) hoary; urgency=low + + * Updated to CVS release24-maint 20050102. + * python-minimal: + - os.py: Use dict instead of UserDict, remove UserDict from -minimal. + - add pickle, threading, needed for subprocess module. + - optparse.py: conditionally import gettext, if not available, + define _ as the identity function. Patch taken from the trunk. + Avoids import of _locale, locale, gettext, copy, repr, itertools, + collections, token, tokenize. + - Add a build check to make sure that the minimal module list is + closed under dependency. + * Fix lintian warnings. + + -- Matthias Klose Sun, 2 Jan 2005 22:00:14 +0100 + +python2.4 (2.4-2ubuntu4) hoary; urgency=low + + * Add UserDict.py to the -minimal package, since os.py needs it. + + -- Colin Watson Thu, 30 Dec 2004 20:41:28 +0000 + +python2.4 (2.4-2ubuntu3) hoary; urgency=low + + * Add os.py and traceback.py to the -minimal package, get the list + of modules from the README. + + -- Matthias Klose Mon, 27 Dec 2004 08:20:45 +0100 + +python2.4 (2.4-2ubuntu2) hoary; urgency=low + + * Add compileall.py and py_compile.py to the -minimal package, not + just to the README ... + + -- Matthias Klose Sat, 25 Dec 2004 22:24:56 +0100 + +python2.4 (2.4-2ubuntu1) hoary; urgency=low + + * Separate the interpreter and a minimal subset of modules into + a python2.4-minimal package. See the README.Debian.gz in this + package. + * Move site.py to python2.4-minimal as well. + * Add documentation files for devhelp. + + -- Matthias Klose Sun, 19 Dec 2004 22:47:32 +0100 + +python2.4 (2.4-2) unstable; urgency=medium + + * Updated patch for #283108. Thanks to Jim Meyering. + + -- Matthias Klose Fri, 3 Dec 2004 17:00:16 +0100 + +python2.4 (2.4-1) unstable; urgency=low + + * Final 2.4 release. + * Flush stdout/stderr if closed (SF #1074011). + + -- Matthias Klose Wed, 1 Dec 2004 07:54:34 +0100 + +python2.4 (2.3.97-2) unstable; urgency=low + + * Don't run test_tcl, hanging on the buildds. + + -- Matthias Klose Fri, 19 Nov 2004 23:48:42 +0100 + +python2.4 (2.3.97-1) unstable; urgency=low + + * Python 2.4 Release Candidate 1. + + -- Matthias Klose Fri, 19 Nov 2004 21:27:02 +0100 + +python2.4 (2.3.96-1) experimental; urgency=low + + * Updated to CVS release24-maint 20041113. + * Build the docs in info format again. + + -- Matthias Klose Sat, 13 Nov 2004 21:21:10 +0100 + +python2.4 (2.3.95-2) experimental; urgency=low + + * Move distutils package from the python2.4-dev into the python2.4 + package. + + -- Matthias Klose Thu, 11 Nov 2004 22:56:14 +0100 + +python2.4 (2.3.95-1) experimental; urgency=low + + * Python 2.4 beta2 release. + + -- Matthias Klose Thu, 4 Nov 2004 23:43:47 +0100 + +python2.4 (2.3.94-1) experimental; urgency=low + + * Python 2.4 beta1 release. + + -- Matthias Klose Sat, 16 Oct 2004 08:33:57 +0200 + +python2.4 (2.3.93-1) experimental; urgency=low + + * Python 2.4 alpha3 release. + + -- Matthias Klose Fri, 3 Sep 2004 21:53:47 +0200 + +python2.4 (2.3.92-1) experimental; urgency=low + + * Python 2.4 alpha2 release. + + -- Matthias Klose Thu, 5 Aug 2004 23:53:18 +0200 + +python2.4 (2.3.91-1) experimental; urgency=low + + * Python 2.4 alpha1 release. + Highlights: http://www.python.org/2.4/highlights.html + + -- Matthias Klose Fri, 9 Jul 2004 17:38:54 +0200 + +python2.4 (2.3.90-1) experimental; urgency=low + + * Package HEAD branch (pre alpha ..). + + -- Matthias Klose Mon, 14 Jun 2004 23:19:57 +0200 + +python2.3 (2.3.4-1) unstable; urgency=medium + + * Final Python 2.3.4 Release. + * In the API docs, fix signature of PyModule_AddIntConstant (closes: #250826). + * locale.getdefaultlocale: don't fail with empty environment variables. + Closes: #249816. + * Include distutils/command/wininst.exe in -dev package (closes: #249006). + * Disable cthreads on the Hurd (Michael Banck). Closes: #247211. + * Add a note to pygettext(1), that this program is deprecated in favour + of xgettext, which now includes support for Python as well. + Closes: #246332. + + -- Matthias Klose Fri, 28 May 2004 22:59:42 +0200 + +python2.3 (2.3.3.91-1) unstable; urgency=low + + * Python 2.3.4 Release Candidate 1. + * Do not use the default namespace for attributes. Patch taken from the + 2.3 maintenance branch. + The xmllib module is obsolete. Use xml.sax instead. + * http://python.org/sf/945642 - fix nonblocking i/o with ssl socket. + + -- Matthias Klose Thu, 13 May 2004 21:24:52 +0200 + +python2.3 (2.3.3-7) unstable; urgency=low + + * Add a workaround for GNU libc nl_langinfo()'s returning NULL. + Closes: #239237. + Patch taken from 2.3 maintenance branch. + * threading.py: Remove calls to currentThread() in _Condition methods that + were side-effect. Side-effects were deemed unnecessary and were causing + problems at shutdown time when threads were catching exceptions at start + time and then triggering exceptions trying to call currentThread() after + gc'ed. Masked the initial exception which was deemed bad. + Closes: #195812. + * Properly support normalization of empty unicode strings. Closes: #239986. + Patch taken from 2.3 maintenance branch. + * README.maintainers: Add section where to find the documentation tools. + * Fix crash in pyexpat module (closes: #229281). + * For the Hurd, set the interpreters recursion limit to 930. + * Do not try to byte-compile the test files on installation; this + currently breaks the Hurd install. + + -- Matthias Klose Sat, 1 May 2004 07:50:46 +0200 + +python2.3 (2.3.3-6) unstable; urgency=low + + * Don't build the unversioned python{,-*} packages anymore. Now + built from the python-defaults package. + * Update to the proposed python-policy: byte-compile using -E. + * Remove python-elisp's dependency on emacs20 (closes: #232785). + * Don't build python-elisp from the python2.3 source anymore, + get it from python-mode.sf.net as a separate source package. + * python2.3-dev suggests libc-dev (closes: #231091). + * get LDSHARED and CCSHARED (like, CC, CXX, CPP, CFLAGS) from + the environment + * Set CXX in installed config/Makefile (closes: #230273). + + -- Matthias Klose Tue, 24 Feb 2004 07:07:51 +0100 + +python2.3 (2.3.3-5) unstable; urgency=low + + * Build-depend on libdb4.2-dev, instead of libdb4.1-dev. According + to the docs the file format is compatible. + + -- Matthias Klose Mon, 12 Jan 2004 10:37:45 +0100 + +python2.3 (2.3.3-4) unstable; urgency=low + + * Fix broken _bsddb module. setup.py picked up the wrong library. + + -- Matthias Klose Sun, 4 Jan 2004 11:30:00 +0100 + +python2.3 (2.3.3-3) unstable; urgency=low + + * Fix typo in patch (closes: #224797, #226064). + + -- Matthias Klose Sun, 4 Jan 2004 09:23:21 +0100 + +python2.3 (2.3.3-2) unstable; urgency=medium + + * Lib/email/Charset: use locale unaware function to lower case of locale + name (closes: #224797). + * Update python-mode to version from python-mode.sf.net. Fixes highlighting + problems (closes: #223520). + * Backport from mainline: Add IPV6_ socket options from RFCs 3493 and 3542. + + -- Matthias Klose Fri, 2 Jan 2004 14:03:26 +0100 + +python2.3 (2.3.3-1) unstable; urgency=low + + * New upstream release. + * Copy the templates, tools and scripts from the Doc dir in the source + to /usr/share/lib/python2.3/doc in the python2.3-dev package. Needed + for packages building documentation like python does (closes: #207337). + + -- Matthias Klose Fri, 19 Dec 2003 10:57:39 +0100 + +python2.3 (2.3.2.91-1) unstable; urgency=low + + * New upstream version (2.3.3 release candidate). + * Update python-mode.el (closes: #158811, #159630). + Closing unreproducible report (closes: #159628). + + -- Matthias Klose Sat, 6 Dec 2003 14:41:14 +0100 + +python2.3 (2.3.2-7) unstable; urgency=low + + * Put the conflict in the correct direction. python2.3 (2.3.2-6) doesn't + conflict with python (<= 2.3.2-5) but python (2.3.2-6) conflicts with + python2.3 (<= 2.3.2-5) (thanks to Brian May). Really closes #221791. + + -- Matthias Klose Fri, 21 Nov 2003 00:20:02 +0100 + +python2.3 (2.3.2-6) unstable; urgency=low + + * Add conflicts with older python{,2.3} packages to fix overwrite + errors (closes: #221791). + + -- Matthias Klose Thu, 20 Nov 2003 07:24:36 +0100 + +python2.3 (2.3.2-5) unstable; urgency=low + + * Updated to CVS release23-maint 20031119. + * Re-upgrade the dependency of python2.3 on python (>= 2.3) to + a dependency (closes: #221523). + + -- Matthias Klose Wed, 19 Nov 2003 00:30:27 +0100 + +python2.3 (2.3.2-4) unstable; urgency=low + + * Don't build-depend on latex2html (moved to non-free), but keep + the prebuilt docs in debian/patches (closes: #221347). + * Fix typos in the library reference (closes: #220510, #220954). + * Fix typo in python-elisp's autoloading code (closes: #220308). + * Update proposed python policy: private modules can be installed + into /usr/lib/ (arch dependent) and into /usr/share/ + (arch independent). + + -- Matthias Klose Tue, 18 Nov 2003 00:41:39 +0100 + +python2.3 (2.3.2-3) unstable; urgency=low + + * Downgrade the dependency of python2.3 on python (>= 2.3) to + a recommendation. + * Fix path to interpreter in binfmt file. + * Fix segfault in unicodedata module (closes: #218697). + * Adjust python-elisp autoload code (closes: #219821). + + -- Matthias Klose Sun, 9 Nov 2003 19:43:37 +0100 + +python2.3 (2.3.2-2) unstable; urgency=medium + + * Fix broken doc link (closes: #214217). + * Disable wrongly detected large file support for GNU/Hurd. + * Really fix the FTBFS for the binary-indep target (closes: #214303). + + -- Matthias Klose Mon, 6 Oct 2003 07:54:58 +0200 + +python2.3 (2.3.2-1) unstable; urgency=low + + * New upstream version. + * Fix a FTBFS for the binary-indep target. + + -- Matthias Klose Sat, 4 Oct 2003 10:20:15 +0200 + +python2.3 (2.3.1-3) unstable; urgency=low + + * Fix names of codec packages in recommends. + * On alpha compile using -mieee (see #212912). + + -- Matthias Klose Sun, 28 Sep 2003 10:48:12 +0200 + +python2.3 (2.3.1-2) unstable; urgency=low + + * Update python policy draft (closes: #128911, #163785). + * Re-add os.fsync function (closes: #212672). + * Let python2.3-doc conflict with older python2.3 versions (closes: #211882). + * Add recommends for pythonX.Y-japanese-codecs, pythonX.Y-iconvcodec, + pythonX.Y-cjkcodecs, pythonX.Y-korean-codecs (closes: #207161). + * Generate binfmt file (closes: #208005). + * Add IPPROTO_IPV6 option to the socketmodule (closes: #206569). + * Bugs reported against python2.2 and fixed in python2.3: + - Crashes in idle (closes: #186887, #200084). + + -- Matthias Klose Sat, 27 Sep 2003 11:21:47 +0200 + +python2.3 (2.3.1-1) unstable; urgency=low + + * New upstream version (bug fix release). + + -- Matthias Klose Wed, 24 Sep 2003 11:27:43 +0200 + +python2.3 (2.3-4) unstable; urgency=high + + * Disable check for utimes function, which is broken in glibc-2.3.2. + Packages using distutils had '1970/01/01-01:00:01' timestamps in files. + * Bugs fixed by making python2.3 the default python version: + - Canvas.scan_dragto() takes a 3rd optional parmeter "gain". + Closes: #158168. + - New command line parsing module (closes: #38628). + - compileall.py allows compiling single files (closes: #139971). + * Bugs reported for 2.2 and fixed in 2.3: + - Idle does save files with ASCII characters (closes: #179313). + - imaplib support for prefix-quoted strings (closes: #150485). + - posixpath includes getctime (closes: #173827). + - pydoc has support for keywords (closes: #186775). + * Bugs reported for 2.1 and fixed in 2.3: + - Fix handling of "#anchor" URLs in urlparse (closes: #147844). + - Fix readline if C stdin is not a tty, even if sys.stdin is. + Closes: #131810. + * Updated to CVS release23-maint 20030810 (fixing memory leaks in + array and socket modules). + * pydoc's usage output uses the basename of the script. + * Don't explicitely remove /etc/python2.3 on purge (closes: #202864). + * python conflicts with python-xmlbase (closes: #204773). + * Add dependency python (>= 2.3) to python2.3, so make sure the + unversioned names can be used. + + -- Matthias Klose Sun, 10 Aug 2003 09:27:52 +0200 + +python2.3 (2.3-3) unstable; urgency=medium + + * Fix shlibs file. + + -- Matthias Klose Fri, 8 Aug 2003 08:45:12 +0200 + +python2.3 (2.3-2) unstable; urgency=medium + + * Make python2.3 the default python version. + + -- Matthias Klose Tue, 5 Aug 2003 22:13:22 +0200 + +python2.3 (2.3-1) unstable; urgency=low + + * Python 2.3 final release. + + -- Matthias Klose Wed, 30 Jul 2003 08:12:28 +0200 + +python2.3 (2.2.107-1rc2) unstable; urgency=medium + + * Python 2.3 release candidate 2. + * Don't compress .txt files referenced by the html docs (closes: #200298). + * Include the email/_compat* files (closes: #200349). + + -- Matthias Klose Fri, 25 Jul 2003 07:08:09 +0200 + +python2.3 (2.2.106-2beta2) unstable; urgency=medium + + * Python 2.3 beta2 release, updated to CVS 20030704. + - Fixes AssertionError in httplib (closed: #192452). + - Fixes uncaught division by zero in difflib.py (closed: #199287). + * Detect presence of setgroups(2) at configure time (closes: #199839). + * Use default gcc on arm as well. + + -- Matthias Klose Sat, 5 Jul 2003 10:21:33 +0200 + +python2.3 (2.2.105-1beta2) unstable; urgency=low + + * Python 2.3 beta2 release. + - Includes merged idle fork. + - Fixed socket.setdefaulttimeout(). Closes: #189380. + - socket.ssl works with _socketobj. Closes: #196082. + * Do not link libtix to the _tkinter module. It's loaded via + 'package require tix' at runtime. python2.3-tkinter now + suggests tix8.1 instead. + * On arm, use gcc-3.2 to build. + * Add -fno-strict-aliasing rules to OPT to avoid warnings + "dereferencing type-punned pointer will break strict-aliasing rules", + when building with gcc-3.3. + + -- Matthias Klose Mon, 30 Jun 2003 00:19:32 +0200 + +python2.3 (2.2.104-1beta1.1) unstable; urgency=low + + * Non-maintainer upload with maintainer consent. + * debian/control (Build-Depends): s/libgdbmg1-dev/libgdbm-dev/. + + -- James Troup Wed, 4 Jun 2003 02:24:27 +0100 + +python2.3 (2.2.104-1beta1) unstable; urgency=low + + * Python 2.3 beta1 release, updated to CVS 20030514. + - build the current documentation. + * Reenable Tix support. + + -- Matthias Klose Wed, 14 May 2003 07:38:57 +0200 + +python2.3 (2.2.103-1beta1) unstable; urgency=low + + * Python 2.3 beta1 release, updated to CVS 20030506. + - updated due to build problems on mips/mipsel. + - keep the 2.3b1 documentation (doc build problems with cvs). + + -- Matthias Klose Wed, 7 May 2003 06:26:39 +0200 + +python2.3 (2.2.102-1beta1) unstable; urgency=low + + * Python 2.3 beta1 release. + + -- Matthias Klose Sat, 3 May 2003 22:45:16 +0200 + +python2.3 (2.2.101-1exp1) unstable; urgency=medium + + * Python 2.3 alpha2 release, updated to CVS 20030321. + * Tkinter: Catch exceptions thrown for undefined substitutions in + events (needed for tk 8.4.2). + + -- Matthias Klose Fri, 21 Mar 2003 21:32:14 +0100 + +python2.3 (2.2.100-1exp1) unstable; urgency=low + + * Python 2.3 alpha2 release, updated to CVS 20030221. + + -- Matthias Klose Fri, 21 Feb 2003 19:37:17 +0100 + +python2.3 (2.2.99-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release updated to CVS 20030123. + - should fix the testsuite (and package build) failure on alpha. + * Remove build dependency on libexpat1-dev. Merge the python2.3-xmlbase + package into python2.3 (closes: #177739). + + -- Matthias Klose Thu, 23 Jan 2003 22:48:12 +0100 + +python2.3 (2.2.98-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release updated to CVS 20030117. + * Build using libdb4.1. + + -- Matthias Klose Sat, 18 Jan 2003 00:14:01 +0100 + +python2.3 (2.2.97-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release updated to CVS 20030109. + * Build-Depend on g++ (>= 3:3.2). + * Python package maintainers: please wait uploading python dependent + packages until python2.2 and python2.1 are compiled using gcc-3.2. + + -- Matthias Klose Thu, 9 Jan 2003 23:56:42 +0100 + +python2.3 (2.2.96-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release (not exactly the tarball, but taken from + CVS 20030101). + - Includes support for linking with threaded tk8.4 (closes: #172714). + * Install and register whatsnew document (closes: #173859). + * Properly unregister info documentation. + + -- Matthias Klose Wed, 1 Jan 2003 17:38:54 +0100 + +python2.3 (2.2.95-1exp1) unstable; urgency=low + + * Experimental packages from CVS 021212. + - data in unicodedate module is up to date (closes: #171061). + * Fix idle packaging (closes: #170394). + * Configure using unicode UCS-4 (closes: #171062). + This change breaks compatibility with binary modules, but what do you + expect from experimental packages ... Please recompile dependent packages. + * Don't strip binaries for now. + + -- Matthias Klose Thu, 12 Dec 2002 21:42:27 +0100 + +python2.3 (2.2.94-1exp1) unstable; urgency=low + + * Experimental packages from CVS 021120. + * Remove outdated README.dbm. + * Depend on tk8.4. + * python-elisp: Install emacsen install file with mode 644 (closes: #167718). + + -- Matthias Klose Thu, 21 Nov 2002 01:04:51 +0100 + +python2.3 (2.2.93-1exp1) unstable; urgency=medium + + * Experimental packages from CVS 021015. + * Build a static library libpython2.3-pic.a. + * Enable large file support for the Hurd (closes: #164602). + + -- Matthias Klose Tue, 15 Oct 2002 21:06:27 +0200 + +python2.3 (2.2.92-1exp1) unstable; urgency=low + + * Experimental packages from CVS 020922. + * Fix build error on ia64 (closes: #161234). + * Build depend on gcc-3.2-3.2.1-0pre2 to fix build error on arm. + + -- Matthias Klose Sun, 22 Sep 2002 18:30:28 +0200 + +python2.3 (2.2.91-1exp1) unstable; urgency=low + + * Experimental packages from CVS 020906. + * idle-python2.3: Fix conflict (closes: #159267). + * Fix location of python-mode.el (closes: #159564, #159619). + * Use tix8.1. + * Apply fix for distutils/ccompiler problem (closes: #159288). + + -- Matthias Klose Sat, 7 Sep 2002 09:55:07 +0200 + +python2.3 (2.2.90-1exp1) unstable; urgency=low + + * Experimental packages from CVS 020820. + * Don't build python2.3-elisp, but put the latest version into + python-elisp. + + -- Matthias Klose Thu, 22 Aug 2002 21:52:04 +0200 + +python2.2 (2.2.1-6) unstable; urgency=low + + * CVS updates of the release22-maint branch upto 2002-07-23. + * Enable IPv6 support (closes: #152543). + * Add python2.2-tk suggestion for python2.2 (pydoc -g). + * Fix from SF patch #527518: proxy config with user+pass authentication. + * Point pydoc to the correct location of the docs (closes: #147579). + * Remove '*.py[co]' files, when removing the python package, + not when purging (closes: #147130). + * Update to new py2texi.el version (Milan Zamazal). + + -- Matthias Klose Mon, 29 Jul 2002 23:11:32 +0200 + +python2.2 (2.2.1-5) unstable; urgency=low + + * CVS updates of the release22-maint branch upto 2002-05-03. + * Build the info docs (closes: #145653). + + -- Matthias Klose Fri, 3 May 2002 22:35:46 +0200 + +python2.2 (2.2.1-4) unstable; urgency=high + + * Fix indentation errors introduced in last upload (closes: #143809). + + -- Matthias Klose Sun, 21 Apr 2002 01:00:14 +0200 + +python2.2 (2.2.1-3) unstable; urgency=high + + * Add Build-Conflicts: tcl8.0-dev, tk8.0-dev, tcl8.2-dev, tk8.2-dev. + Closes: #143534 (build a working _tkinter module, on machines, where + 8.0's tk.h gets included). + * CVS updates of the release22-maint branch upto 2002-04-20. + + -- Matthias Klose Sat, 20 Apr 2002 09:22:37 +0200 + +python2.2 (2.2.1-2) unstable; urgency=low + + * Forgot to copy the dlmodule patch from the 2.1.3 package. Really + closes: #141681. + + -- Matthias Klose Sat, 13 Apr 2002 01:28:05 +0200 + +python2.2 (2.2.1-1) unstable; urgency=high + + * Final 2.2.1 release. + * According to report #131813, the python interpreter is much faster on some + architectures, when beeing linked statically with the python library (25%). + Gregor and me tested on i386, m68k and alpha, but we could not reproduce + such a speedup (generally between 5% and 10%). But we are linking the + python executable now statically ... + * Build info docs from the tex source, merge the python-doc-info + package into the python-doc package. + * Always build the dl module. Failure in case of + sizeof(int)!=sizeof(long)!=sizeof(void*) + is delayed until dl.open is called. Closes: #141681. + + -- Matthias Klose Thu, 11 Apr 2002 00:19:19 +0200 + +python2.2 (2.2.0.92-0) unstable; urgency=low + + * Package CVS sources, omit cvs-updates.dpatch (closes: #140977). + + -- Matthias Klose Wed, 3 Apr 2002 08:20:52 +0200 + +python2.2 (2.2-6) unstable; urgency=medium + + * Update to python-2.2.1 release candidate 2 (final release scheduled + for April 10). + * Enable dl module (closes: #138992). + * Build doc files with python binary from package (closes: #139657). + * Build _tkinter module with BLT and Tix support. + * python2.2-elisp: Conflict with python2-elisp (closes: #138970). + * string.split docs updated in python-2.2.1 (closes: #129272). + + -- Matthias Klose Mon, 1 Apr 2002 13:52:36 +0200 + +python2.2 (2.2-5) unstable; urgency=low + + * CVS updates of the release22-maint branch upto 20020310 (aproaching + the first 2.2.1 release candidate). + * Stolen from HEAD: check argument of locale.nl_langinfo (closes: #137371). + + -- Matthias Klose Fri, 15 Mar 2002 01:05:59 +0100 + +python2.2 (2.2-4) unstable; urgency=medium + + * Include test/{__init__.py,README,pystone.py} in package (closes: #129013). + * Fix python-elisp conflict (closes: #129046). + * Don't compress stylesheets (closes: #133179). + * CVS updates of the release22-maint branch upto 20020310. + + -- Matthias Klose Sun, 10 Mar 2002 23:32:28 +0100 + +python2.2 (2.2-3) unstable; urgency=medium + + * Updates from the CVS python22-maint branch up to 20020107. + webbrowser.py: properly escape url's. + * The Hurd does not have large file support: disabled. + + -- Matthias Klose Mon, 7 Jan 2002 21:55:57 +0100 + +python2.2 (2.2-2) unstable; urgency=medium + + * CVS updates of the release22-maint branch upto 20011229. Fixes: + - Include TCP_CORK flag in plat-linux2 headers (fixes: #84340). + - Update CDROM.py module (fixes: #125785). + * Add missing chunk of the GNU/Hurd patch (therefore urgency medium). + * Send anonymous password when using anonftp (closes: #126814). + + -- Matthias Klose Sat, 29 Dec 2001 20:18:26 +0100 + +python2.2 (2.2-1) unstable; urgency=low + + * New upstream version: 2.2. + * Bugs fixed upstream: + - Docs for os.kill reference the signal module for constants. + - Documentation strings in the tutorial end with a period (closes: #94770). + - Tk: grid_location method moved from Grid to Misc (closes: #98338). + - mhlib.SubMessage.getbodytext takes decode parameter (closes: #31876). + - Strings in modules are locale aware (closes: #51444). + - Printable 8-bit characters in strings are correctly printed + (closes: #64354). + - Dictionary can be updated with abstract mapping object (closes: #46566). + * Make site.py a config files. + + -- Matthias Klose Sat, 22 Dec 2001 00:51:46 +0100 + +python2.2 (2.1.99c1-1) unstable; urgency=low + + * New upstream version: 2.2c1 (release candidate). + * Do not provide python2.2-base anymore. + * Install correct README.Debian for python2.2 package. Include hint + where to find Makefile.pre.in. + * Suggest installation of python-ssl. + * Remove idle config files on purge. + * Remove empty /usr/lib/python2.2 directory on purge. + + -- Matthias Klose Sat, 15 Dec 2001 17:56:27 +0100 + +python2.2 (2.1.99beta2-1) unstable; urgency=high + + * debian/rules: Reflect removal of regrtest package (closes: #122278). + Resulted in build failures on all architectures. + * Build -doc package from source. + + -- Matthias Klose Sat, 8 Dec 2001 00:38:41 +0100 + +python2.2 (2.1.99beta2-0.1) unstable; urgency=low + + * Non maintainer upload. + * New upstream version (this is 2.2beta2). + * Do not build the python-regrtest package anymore; keep the test framework + components test/regrtest.py and test/test_support.py in the python + package (closes: #119408). + + -- Gregor Hoffleit Tue, 27 Nov 2001 09:53:26 +0100 + +python2.2 (2.1.99beta1-4) unstable; urgency=low + + * Configure with --with-fpectl (closes: #118125). + * setup.py: Remove broken check for _curses_panel module (#116081). + * idle: Move config-* files to /etc and mark as conffiles (#106390). + * Move idle packages to section `devel'. + + -- Matthias Klose Wed, 31 Oct 2001 10:56:45 +0100 + +python2.2 (2.1.99beta1-3) unstable; urgency=low + + * Fix shlibs file (was still referring to 2.1). Closes: #116810. + * README.Debian: point to draft of python-policy in the python package. + + -- Matthias Klose Wed, 31 Oct 2001 10:56:45 +0100 + +python2.2 (2.1.99beta1-2) unstable; urgency=medium + + * Fix shlibs file (was still referring to 2.1). Closes: #116810. + * Rename package python2.2-base to python2.2. + + -- Matthias Klose Wed, 24 Oct 2001 23:00:50 +0200 + +python2.2 (2.1.99beta1-1) unstable; urgency=low + + * New upstream version (beta). Call the package version 2.1.99beta1-1. + * New maintainer until the final 2.2 release. + * Updated the debian patches. + + -- Matthias Klose Sat, 20 Oct 2001 18:56:26 +0200 + +python2.1 (2.1.1-1.2) unstable; urgency=low + + * Really remove the python alternative. + + -- Matthias Klose Sat, 20 Oct 2001 15:16:56 +0200 + +python2.1 (2.1.1-1.1) unstable; urgency=low + + * README FOR PACKAGE MAINTAINERS: It is planned to remove the python2-XXX + packages from unstable and move on to python2.1. + If you repackage/adapt your modules for python2.1, don't build + python2-XXX and python2.1-XXX packages from the same source package, + so that the python2-XXX package can be removed without influencing the + python2.1-XXX package. + + See the debian-python mailing list at http://lists.debian.org/devel.html + for details and the current discussion and a draft for a debian-python + policy (August to October 2001). + + * Remove alternative for /usr/bin/python. The python-base package now + provides the default python version. + + * Regenerate control file to fix build dependencies (closes: #116190). + * Remove alternative for /usr/bin/{python,pydoc}. + * Provide a libpython2.1.so symlink in /usr/lib/python2.1/config, + so that the shared library is found when -L/usr/lib/python2.1/config + is specified. + * Conflict with old package versions, where /usr/bin/python is a real + program (closes: #115943). + * python2.1-elisp conflicts with python-elisp (closes: #115895). + * We now have 2.1 (closes: #96851, #107849, #110243). + + -- Matthias Klose Fri, 19 Oct 2001 17:34:41 +0200 + +python2.1 (2.1.1-1) unstable; urgency=low + + * Incorporated Matthias' modifications. + + -- Gregor Hoffleit Thu, 11 Oct 2001 00:16:42 +0200 + +python2.1 (2.1.1-0.2) unstable; urgency=low + + * New upstream 2.1.1. + * GPL compatible licence (fixes #84080, #102949, #110643). + * Fixed upstream (closes: #99692, #111340). + * Build in separate build directory. + * Split Debian patches into debian/patches directory. + * Build dependencies: Add libgmp3-dev, libexpat1-dev, tighten + debhelper dependency. + * debian/rules: Updated a "bit". + * python-elisp: Remove custom dependency (closes: #87783), + fix emacs path (closes: #89712), remove emacs19 dependency (#82694). + * Mention distutils in python-dev package description (closes: #108170). + * Update README.Debian (closes: #85430). + * Run versioned python in postinsts (closes: #113349). + * debian/sample.{postinst,prerm}: Change to version independent scripts. + * Use '/usr/bin/env python2.1' as interpreter for all python scripts. + * Add libssl-dev to Build-Conflicts. + * python-elisp: Add support for emacs21 (closes: #98635). + * Do not compress .py files in doc directories. + * Don't link explicitely with libc. + + -- Matthias Klose Wed, 3 Oct 2001 09:53:08 +0200 + +python2.1 (2.1.1-0.1) unstable; urgency=low + + * New upstream version (CVS branch release21-maint, will become 2.1.1): + This CVS branch will be released as 2.1.1 under a GPL compatible + license. + + -- Gregor Hoffleit Wed, 27 Jun 2001 22:47:58 +0200 + +python2 (2.1-0.1) unstable; urgency=low + + * Fixed Makefile.pre.in. + * Fixed the postinst files in order to use 2.1 (instead of 2.0). + * Mention the immanent release of 2.0.1 and 2.1.1, with a GPL + compatible license. + + -- Gregor Hoffleit Sun, 17 Jun 2001 21:05:25 +0200 + +python2 (2.1-0) unstable; urgency=low + + * New upstream version. + * Experimental packages. + + -- Gregor Hoffleit Thu, 10 May 2001 00:20:04 +0200 + +python2 (2.0-7) unstable; urgency=low + + * Rebuilt with recent tcl8.3-dev/tk8.3-dev in order to fix a + dependency problem with python2-tk (closes: #87793, #92962). + * Change postinst to create and update /usr/local/lib/python2.0 and + site-python with permissions and owner as mandated by policy: + 2775 and root:staff (closes: #89047). + * Fix to compileall.py: A superfluous argument made compileall without + options fail (cf. #92990 for python). + * Move the distutils module into python2-dev. It needs Makefile.pre.in + in order to work (closes: #89900). + * Remove build-dependency on libgdbm2-dev (which isn't built anyway). + * Add a build-dependency on libdb2-dev (cf. #90220 for python). + + -- Gregor Hoffleit Sat, 14 Apr 2001 21:07:51 +0200 + +python2 (2.0-6) unstable; urgency=low + + * Remove python-zlib package; merge it into python-base. + * Mark that README.python2 is not yet updated. + + -- Gregor Hoffleit Wed, 21 Feb 2001 12:34:18 +0100 + +python2 (2.0-5) unstable; urgency=low + + * Recompile with tcl/tk8.3 (closes: #82088). + * Modifications to README.why-python2 (closes: #82116). + * Add menu hint to idle2 menu entry. + * idle2 is renamed idle-python2 and now build correctly (closes: #82218). + * Add build-dependency on autoconf (closes: #85339). + * Build bsddbmodule as shared module (Modules/Setup.config.in), + and link libpython2.so with -lm in Makefile (closes: #86027). + * various cleanups in debian/rules, e.g. removing dh_suidregister. + * Make pdb available as /usr/bin/pdb-python2 in python2-dev + (cf. #79870 in python-base). + * Remove libgmp3 from build-dependencies, since we currently can't + build the mpzmodule for Python2 due to license problems. + + -- Gregor Hoffleit Sun, 18 Feb 2001 00:12:17 +0100 + +python2 (2.0-4) unstable; urgency=low + + * control: make python2-elisp conflict with python-elisp (it doesn't + make sense to have both of them installed, does it ?) + * include build-depend on libxmltok1-dev. + * again, build with tcl/tk8.0. + + -- Gregor Hoffleit Wed, 10 Jan 2001 23:37:01 +0100 + +python2 (2.0-3) unstable; urgency=low + + * Modules/Setup.in: Added a missing \ that made _tkinter be built + incorrectly. + * rules: on the fly, change all '#!' python scripts to use python2. + + -- Gregor Hoffleit Wed, 13 Dec 2000 20:07:24 +0100 + +python2 (2.0-2) unstable; urgency=low + + * Aaargh. Remove conflicts/provides/replaces on python-base to make + parallel installation of python-base and python2-base possible. + * Install examples into /usr/share/doc/python2 (not python) and fix + symlink to python2.0 (thanks to Rick Younie for + pointing out this). + * Rename man page to python2.1. + + -- Gregor Hoffleit Wed, 13 Dec 2000 09:31:05 +0100 + +python2 (2.0-1) unstable; urgency=low + + * New upstream version. Initial release for python2. + + -- Gregor Hoffleit Mon, 11 Dec 2000 22:39:46 +0100 --- python2.7-2.7.8.orig/debian/changelog.shared +++ python2.7-2.7.8/debian/changelog.shared @@ -0,0 +1,3 @@ + * Link the interpreter against the shared runtime library. With + gcc-4.1 the difference in the pystones benchmark dropped from about + 12% to about 5%. --- python2.7-2.7.8.orig/debian/compat +++ python2.7-2.7.8/debian/compat @@ -0,0 +1 @@ +5 --- python2.7-2.7.8.orig/debian/control +++ python2.7-2.7.8/debian/control @@ -0,0 +1,217 @@ +Source: python2.7 +Section: python +Priority: optional +Maintainer: Matthias Klose +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.17.11), + gcc (>= 4:4.9.2), + quilt, autoconf, autotools-dev, + lsb-release, sharutils, + libreadline-dev, libtinfo-dev, libncursesw5-dev (>= 5.3), gcc (>= 4:4.9.2-1~), + tk-dev, blt-dev (>= 2.4z), libssl-dev, + zlib1g-dev, libbz2-dev, + libexpat1-dev, + libbluetooth-dev [linux-any], + locales [!armel !avr32 !hppa !ia64 !mipsel], + libsqlite3-dev, libffi-dev (>= 3.0.5) [!or1k !avr32], + libgpm2 [linux-any], + mime-support, netbase, net-tools, bzip2, + libdb-dev (<< 1:6.0), libgdbm-dev, python:any, help2man, + xvfb, xauth +Build-Depends-Indep: python-sphinx +Build-Conflicts: tcl8.4-dev, tk8.4-dev, + python2.7-xml, python-xml, + autoconf2.13, python-cxx-dev, + hardening-wrapper +Standards-Version: 3.9.6 +Vcs-Browser: https://code.launchpad.net/~doko/python/pkg2.7-debian +Vcs-Bzr: http://bazaar.launchpad.net/~doko/python/pkg2.7-debian +XS-Testsuite: autopkgtest + +Package: python2.7 +Architecture: any +Multi-Arch: allowed +Priority: standard +Depends: python2.7-minimal (= ${binary:Version}), libpython2.7-stdlib (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends} +Suggests: python2.7-doc, binutils +Conflicts: python-profiler (<= 2.7.1-2) +Breaks: python-virtualenv (<< 1.7.1.2-2~), vim-nox (<< 2:7.3.547-4), vim-gtk (<< 2:7.3.547-4), vim-gnome (<< 2:7.3.547-4), vim-athena (<< 2:7.3.547-4) +Replaces: python-profiler (<= 2.7.1-2), python2.7-minimal (<< 2.7.3-7~) +Description: Interactive high-level object-oriented language (version 2.7) + Python is a high-level, interactive, object-oriented language. Its 2.7 version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + +Package: libpython2.7-stdlib +Architecture: any +Multi-Arch: same +Priority: standard +Depends: libpython2.7-minimal (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends} +Provides: python2.7-cjkcodecs, python2.7-ctypes, python2.7-elementtree, python2.7-celementtree, python2.7-wsgiref, python2.7-profiler, python2.7-argparse, python-argparse +Replaces: python2.7 (<< 2.7.5-0~) +Description: Interactive high-level object-oriented language (standard library, version 2.7) + Python is a high-level, interactive, object-oriented language. Its 2.7 version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package contains Python 2.7's standard library. It is normally not + used on its own, but as a dependency of python2.7. + +Package: python2.7-minimal +Architecture: any +Multi-Arch: allowed +Priority: standard +Pre-Depends: ${shlibs:Pre-Depends} +Depends: libpython2.7-minimal (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: python2.7 +Suggests: binfmt-support +Replaces: python2.7 (<< 2.7.8-7~) +Conflicts: binfmt-support (<< 1.1.2) +Description: Minimal subset of the Python language (version 2.7) + This package contains the interpreter and some essential modules. It can + be used in the boot process for some basic tasks. + See /usr/share/doc/python2.7-minimal/README.Debian for a list of the modules + contained in this package. + +Package: libpython2.7-minimal +Architecture: any +Multi-Arch: same +Priority: standard +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: libpython2.7-stdlib +Replaces: python2.7 (<< 2.7.4-2), python2.7-minimal (<< 2.7.3-10), libpython2.7-stdlib (<< 2.7.8-7) +Breaks: python2.7-minimal (<< 2.7.4~rc1-1~) +Conflicts: binfmt-support (<< 1.1.2) +Description: Minimal subset of the Python language (version 2.7) + This package contains some essential modules. It is normally not + used on it's own, but as a dependency of python2.7-minimal. + +Package: libpython2.7 +Architecture: any +Multi-Arch: same +Section: libs +Priority: standard +Pre-Depends: multiarch-support +Depends: libpython2.7-stdlib (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: python2.7 (<< 2.6) +Description: Shared Python runtime library (version 2.7) + Python is a high-level, interactive, object-oriented language. Its 2.7 version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package contains the shared runtime library, normally not needed + for programs using the statically linked interpreter. + +Package: python2.7-examples +Architecture: all +Depends: python2.7 (>= ${source:Version}), ${misc:Depends} +Description: Examples for the Python language (v2.7) + Examples, Demos and Tools for Python (v2.7). These are files included in + the upstream Python distribution (v2.7). + +Package: python2.7-dev +Architecture: any +Multi-Arch: allowed +Depends: python2.7 (= ${binary:Version}), libpython2.7-dev (= ${binary:Version}), libpython2.7 (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends} +Recommends: libc6-dev | libc-dev +Replaces: python2.7 (<< 2.7-3) +Description: Header files and a static library for Python (v2.7) + Header files, a static library and development tools for building + Python (v2.7) modules, extending the Python interpreter or embedding + Python (v2.7) in applications. + . + Maintainers of Python packages should read README.maintainers. + +Package: libpython2.7-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Pre-Depends: multiarch-support +Depends: libpython2.7-stdlib (= ${binary:Version}), libpython2.7 (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends} +Replaces: python2.7 (<< 2.7-3), python2.7-dev (<< 2.7.3-10), python2.7-minimal (<< 2.7.3-10) +Recommends: libc6-dev | libc-dev +Description: Header files and a static library for Python (v2.7) + Header files, a static library and development tools for building + Python (v2.7) modules, extending the Python interpreter or embedding + Python (v2.7) in applications. + . + Maintainers of Python packages should read README.maintainers. + . + This package contains development files. It is normally not + used on it's own, but as a dependency of python2.7-dev. + +Package: libpython2.7-testsuite +Section: libdevel +Architecture: all +Depends: libpython2.7-stdlib (>= ${binary:Version}), ${misc:Depends} +Suggests: python-gdbm, python-tk +Description: Testsuite for the Python standard library (v2.7) + The complete testsuite for the Python standard library. Note that + a subset is found in the libpython2.7-stdlib package, which should + be enough for other packages to use (please do not build-depend + on this package, but file a bug report to include additional + testsuite files in the libpython2.7-stdlib package). + +Package: idle-python2.7 +Architecture: all +Depends: python2.7, python-tk (>= 2.6~a3), python2.7-tk, ${misc:Depends} +Enhances: python2.7 +Replaces: python2.7 (<< 2.6.1-2) +Description: IDE for Python (v2.7) using Tkinter + IDLE is an Integrated Development Environment for Python (v2.7). + IDLE is written using Tkinter and therefore quite platform-independent. + +Package: python2.7-doc +Section: doc +Architecture: all +Depends: libjs-jquery, ${misc:Depends} +Suggests: python2.7 +Description: Documentation for the high-level object-oriented language Python (v2.7) + These is the official set of documentation for the interactive high-level + object-oriented language Python (v2.7). All documents are provided + in HTML format. The package consists of ten documents: + . + * What's New in Python2.7 + * Tutorial + * Python Library Reference + * Macintosh Module Reference + * Python Language Reference + * Extending and Embedding Python + * Python/C API Reference + * Installing Python Modules + * Documenting Python + * Distributing Python Modules + +Package: python2.7-dbg +Section: debug +Architecture: any +Multi-Arch: allowed +Priority: extra +Depends: python2.7 (= ${binary:Version}), libpython2.7-dbg (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: python-gdbm-dbg, python-tk-dbg +Description: Debug Build of the Python Interpreter (version 2.7) + The package holds two things: + . + - A Python interpreter configured with --pydebug. Dynamically loaded modules + are searched as _d.so first. Third party extensions need a separate + build to be used by this interpreter. + - Debug information for standard python interpreter and extensions. + . + See the README.debug for more information. + +Package: libpython2.7-dbg +Section: debug +Architecture: any +Multi-Arch: same +Priority: extra +Pre-Depends: multiarch-support +Depends: libpython2.7-stdlib (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: python2.7-gdbm-dbg, python2.7-tk-dbg +Replaces: python2.7-dbg (<< 2.7.3-10) +Description: Debug Build of the Python Interpreter (version 2.7) + The package holds two things: + . + - Extensions for a Python interpreter configured with --pydebug. + - Debug information for standard python extensions. + . + See the README.debug for more information. + --- python2.7-2.7.8.orig/debian/control.in +++ python2.7-2.7.8/debian/control.in @@ -0,0 +1,217 @@ +Source: @PVER@ +Section: python +Priority: optional +Maintainer: Matthias Klose +Build-Depends: debhelper (>= 5), @bd_dpkgdev@ + gcc (>= 4:4.9.2), + quilt, autoconf, autotools-dev, + lsb-release, sharutils, + libreadline-dev, libtinfo-dev, libncursesw5-dev (>= 5.3), @bd_gcc@ + tk-dev, blt-dev (>= 2.4z), libssl-dev, + zlib1g-dev, libbz2-dev, + libexpat1-dev, + libbluetooth-dev [linux-any], + locales [!armel !avr32 !hppa !ia64 !mipsel], + libsqlite3-dev, libffi-dev (>= 3.0.5) [!or1k !avr32], + libgpm2 [linux-any], + mime-support, netbase, net-tools, bzip2, + libdb-dev (<< 1:6.0), libgdbm-dev, python@bd_qual@, help2man, + xvfb, xauth +Build-Depends-Indep: python-sphinx +Build-Conflicts: tcl8.4-dev, tk8.4-dev, + @PVER@-xml, python-xml, + autoconf2.13, python-cxx-dev, + hardening-wrapper +Standards-Version: 3.9.6 +Vcs-Browser: https://code.launchpad.net/~doko/python/pkg@VER@-debian +Vcs-Bzr: http://bazaar.launchpad.net/~doko/python/pkg@VER@-debian +XS-Testsuite: autopkgtest + +Package: @PVER@ +Architecture: any +Multi-Arch: allowed +Priority: @PRIO@ +Depends: @PVER@-minimal (= ${binary:Version}), lib@PVER@-stdlib (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends} +Suggests: @PVER@-doc, binutils +Conflicts: python-profiler (<= 2.7.1-2) +Breaks: python-virtualenv (<< 1.7.1.2-2~), vim-nox (<< 2:7.3.547-4), vim-gtk (<< 2:7.3.547-4), vim-gnome (<< 2:7.3.547-4), vim-athena (<< 2:7.3.547-4) +Replaces: python-profiler (<= 2.7.1-2), @PVER@-minimal (<< 2.7.3-7~) +Description: Interactive high-level object-oriented language (version @VER@) + Python is a high-level, interactive, object-oriented language. Its @VER@ version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + +Package: lib@PVER@-stdlib +Architecture: any +Multi-Arch: same +Priority: @PRIO@ +Depends: lib@PVER@-minimal (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends} +Provides: @PVER@-cjkcodecs, @PVER@-ctypes, @PVER@-elementtree, @PVER@-celementtree, @PVER@-wsgiref, @PVER@-profiler, @PVER@-argparse, python-argparse +Replaces: @PVER@ (<< 2.7.5-0~) +Description: Interactive high-level object-oriented language (standard library, version @VER@) + Python is a high-level, interactive, object-oriented language. Its @VER@ version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package contains Python @VER@'s standard library. It is normally not + used on its own, but as a dependency of python@VER@. + +Package: @PVER@-minimal +Architecture: any +Multi-Arch: allowed +Priority: @MINPRIO@ +Pre-Depends: ${shlibs:Pre-Depends} +Depends: lib@PVER@-minimal (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: @PVER@ +Suggests: binfmt-support +Replaces: @PVER@ (<< 2.7.8-7~) +Conflicts: binfmt-support (<< 1.1.2) +Description: Minimal subset of the Python language (version @VER@) + This package contains the interpreter and some essential modules. It can + be used in the boot process for some basic tasks. + See /usr/share/doc/@PVER@-minimal/README.Debian for a list of the modules + contained in this package. + +Package: lib@PVER@-minimal +Architecture: any +Multi-Arch: same +Priority: @MINPRIO@ +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: lib@PVER@-stdlib +Replaces: @PVER@ (<< 2.7.4-2), @PVER@-minimal (<< 2.7.3-10), lib@PVER@-stdlib (<< 2.7.8-7) +Breaks: @PVER@-minimal (<< 2.7.4~rc1-1~) +Conflicts: binfmt-support (<< 1.1.2) +Description: Minimal subset of the Python language (version @VER@) + This package contains some essential modules. It is normally not + used on it's own, but as a dependency of @PVER@-minimal. + +Package: lib@PVER@ +Architecture: any +Multi-Arch: same +Section: libs +Priority: @PRIO@ +Pre-Depends: multiarch-support +Depends: lib@PVER@-stdlib (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: @PVER@ (<< 2.6) +Description: Shared Python runtime library (version @VER@) + Python is a high-level, interactive, object-oriented language. Its @VER@ version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package contains the shared runtime library, normally not needed + for programs using the statically linked interpreter. + +Package: @PVER@-examples +Architecture: all +Depends: @PVER@ (>= ${source:Version}), ${misc:Depends} +Description: Examples for the Python language (v@VER@) + Examples, Demos and Tools for Python (v@VER@). These are files included in + the upstream Python distribution (v@VER@). + +Package: @PVER@-dev +Architecture: any +Multi-Arch: allowed +Depends: @PVER@ (= ${binary:Version}), lib@PVER@-dev (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends} +Recommends: libc6-dev | libc-dev +Replaces: @PVER@ (<< 2.7-3) +Description: Header files and a static library for Python (v@VER@) + Header files, a static library and development tools for building + Python (v@VER@) modules, extending the Python interpreter or embedding + Python (v@VER@) in applications. + . + Maintainers of Python packages should read README.maintainers. + +Package: lib@PVER@-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Pre-Depends: multiarch-support +Depends: lib@PVER@-stdlib (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends} +Replaces: @PVER@ (<< 2.7-3), @PVER@-dev (<< 2.7.3-10), @PVER@-minimal (<< 2.7.3-10) +Recommends: libc6-dev | libc-dev +Description: Header files and a static library for Python (v@VER@) + Header files, a static library and development tools for building + Python (v@VER@) modules, extending the Python interpreter or embedding + Python (v@VER@) in applications. + . + Maintainers of Python packages should read README.maintainers. + . + This package contains development files. It is normally not + used on it's own, but as a dependency of @PVER@-dev. + +Package: lib@PVER@-testsuite +Section: libdevel +Architecture: all +Depends: lib@PVER@-stdlib (>= ${binary:Version}), ${misc:Depends} +Suggests: python-gdbm, python-tk +Description: Testsuite for the Python standard library (v@VER@) + The complete testsuite for the Python standard library. Note that + a subset is found in the lib@PVER@-stdlib package, which should + be enough for other packages to use (please do not build-depend + on this package, but file a bug report to include additional + testsuite files in the lib@PVER@-stdlib package). + +Package: idle-@PVER@ +Architecture: all +Depends: @PVER@, python-tk (>= 2.6~a3), @PVER@-tk, ${misc:Depends} +Enhances: @PVER@ +Replaces: @PVER@ (<< 2.6.1-2) +Description: IDE for Python (v@VER@) using Tkinter + IDLE is an Integrated Development Environment for Python (v@VER@). + IDLE is written using Tkinter and therefore quite platform-independent. + +Package: @PVER@-doc +Section: doc +Architecture: all +Depends: libjs-jquery, ${misc:Depends} +Suggests: @PVER@ +Description: Documentation for the high-level object-oriented language Python (v@VER@) + These is the official set of documentation for the interactive high-level + object-oriented language Python (v@VER@). All documents are provided + in HTML format. The package consists of ten documents: + . + * What's New in Python@VER@ + * Tutorial + * Python Library Reference + * Macintosh Module Reference + * Python Language Reference + * Extending and Embedding Python + * Python/C API Reference + * Installing Python Modules + * Documenting Python + * Distributing Python Modules + +Package: @PVER@-dbg +Section: debug +Architecture: any +Multi-Arch: allowed +Priority: extra +Depends: @PVER@ (= ${binary:Version}), lib@PVER@-dbg (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: python-gdbm-dbg, python-tk-dbg +Description: Debug Build of the Python Interpreter (version @VER@) + The package holds two things: + . + - A Python interpreter configured with --pydebug. Dynamically loaded modules + are searched as _d.so first. Third party extensions need a separate + build to be used by this interpreter. + - Debug information for standard python interpreter and extensions. + . + See the README.debug for more information. + +Package: lib@PVER@-dbg +Section: debug +Architecture: any +Multi-Arch: same +Priority: extra +Pre-Depends: multiarch-support +Depends: lib@PVER@-stdlib (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: @PVER@-gdbm-dbg, @PVER@-tk-dbg +Replaces: @PVER@-dbg (<< 2.7.3-10) +Description: Debug Build of the Python Interpreter (version @VER@) + The package holds two things: + . + - Extensions for a Python interpreter configured with --pydebug. + - Debug information for standard python extensions. + . + See the README.debug for more information. + --- python2.7-2.7.8.orig/debian/control.stdlib +++ python2.7-2.7.8/debian/control.stdlib @@ -0,0 +1,16 @@ +Package: @PVER@-tk +Architecture: any +Depends: @PVER@ (= ${Source-Version}), ${shlibs:Depends} +Suggests: tix +XB-Python-Version: @VER@ +Description: Tkinter - Writing Tk applications with Python (v@VER@) + A module for writing portable GUI applications with Python (v@VER@) using Tk. + Also known as Tkinter. + +Package: @PVER@-gdbm +Architecture: any +Depends: @PVER@ (= ${Source-Version}), ${shlibs:Depends} +Description: GNU dbm database support for Python (v@VER@) + GNU dbm database module for Python. Install this if you want to + create or read GNU dbm database files with Python. + --- python2.7-2.7.8.orig/debian/copyright +++ python2.7-2.7.8/debian/copyright @@ -0,0 +1,732 @@ +This package was put together by Klee Dienes from +sources from ftp.python.org:/pub/python, based on the Debianization by +the previous maintainers Bernd S. Brentrup and +Bruce Perens. Current maintainer is Matthias Klose . + +It was downloaded from http://python.org/ + +Copyright: + +Upstream Author: Guido van Rossum and others. + +License: + +The following text includes the Python license and licenses and +acknowledgements for incorporated software. The licenses can be read +in the HTML and texinfo versions of the documentation as well, after +installing the pythonx.y-doc package. Licenses for files not licensed +under the Python Licenses are found at the end of this file. + + +Python License +============== + +A. HISTORY OF THE SOFTWARE +========================== + +Python was created in the early 1990s by Guido van Rossum at Stichting +Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands +as a successor of a language called ABC. Guido remains Python's +principal author, although it includes many contributions from others. + +In 1995, Guido continued his work on Python at the Corporation for +National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) +in Reston, Virginia where he released several versions of the +software. + +In May 2000, Guido and the Python core development team moved to +BeOpen.com to form the BeOpen PythonLabs team. In October of the same +year, the PythonLabs team moved to Digital Creations (now Zope +Corporation, see http://www.zope.com). In 2001, the Python Software +Foundation (PSF, see http://www.python.org/psf/) was formed, a +non-profit organization created specifically to own Python-related +Intellectual Property. Zope Corporation is a sponsoring member of +the PSF. + +All Python releases are Open Source (see http://www.opensource.org for +the Open Source Definition). Historically, most, but not all, Python +releases have also been GPL-compatible; the table below summarizes +the various releases. + + Release Derived Year Owner GPL- + from compatible? (1) + + 0.9.0 thru 1.2 1991-1995 CWI yes + 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes + 1.6 1.5.2 2000 CNRI no + 2.0 1.6 2000 BeOpen.com no + 1.6.1 1.6 2001 CNRI yes (2) + 2.1 2.0+1.6.1 2001 PSF no + 2.0.1 2.0+1.6.1 2001 PSF yes + 2.1.1 2.1+2.0.1 2001 PSF yes + 2.2 2.1.1 2001 PSF yes + 2.1.2 2.1.1 2002 PSF yes + 2.1.3 2.1.2 2002 PSF yes + 2.2.1 2.2 2002 PSF yes + 2.2.2 2.2.1 2002 PSF yes + 2.2.3 2.2.2 2003 PSF yes + 2.3 2.2.2 2002-2003 PSF yes + 2.3.1 2.3 2002-2003 PSF yes + 2.3.2 2.3.1 2002-2003 PSF yes + 2.3.3 2.3.2 2002-2003 PSF yes + 2.3.4 2.3.3 2004 PSF yes + 2.3.5 2.3.4 2005 PSF yes + 2.4 2.3 2004 PSF yes + 2.4.1 2.4 2005 PSF yes + 2.4.2 2.4.1 2005 PSF yes + 2.4.3 2.4.2 2006 PSF yes + 2.5 2.4 2006 PSF yes + 2.5.1 2.5 2007 PSF yes + 2.5.2 2.5.1 2008 PSF yes + 2.5.3 2.5.2 2008 PSF yes + 2.6 2.5 2008 PSF yes + 2.6.1 2.6 2008 PSF yes + 2.6.2 2.6.1 2009 PSF yes + 2.6.3 2.6.2 2009 PSF yes + 2.6.4 2.6.3 2009 PSF yes + 2.6.5 2.6.4 2010 PSF yes + 2.7 2.6 2010 PSF yes + +Footnotes: + +(1) GPL-compatible doesn't mean that we're distributing Python under + the GPL. All Python licenses, unlike the GPL, let you distribute + a modified version without making your changes open source. The + GPL-compatible licenses make it possible to combine Python with + other software that is released under the GPL; the others don't. + +(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, + because its license has a choice of law clause. According to + CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 + is "not incompatible" with the GPL. + +Thanks to the many outside volunteers who have worked under Guido's +direction to make these releases possible. + + +B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON +=============================================================== + +PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 +-------------------------------------------- + +1. This LICENSE AGREEMENT is between the Python Software Foundation +("PSF"), and the Individual or Organization ("Licensee") accessing and +otherwise using this software ("Python") in source or binary form and +its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python +alone or in any derivative version, provided, however, that PSF's +License Agreement and PSF's notice of copyright, i.e., "Copyright (c) +2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation; +All Rights Reserved" are retained in Python alone or in any derivative +version prepared by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python. + +4. PSF is making Python available to Licensee on an "AS IS" +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 +------------------------------------------- + +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 + +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an +office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the +Individual or Organization ("Licensee") accessing and otherwise using +this software in source or binary form and its associated +documentation ("the Software"). + +2. Subject to the terms and conditions of this BeOpen Python License +Agreement, BeOpen hereby grants Licensee a non-exclusive, +royalty-free, world-wide license to reproduce, analyze, test, perform +and/or display publicly, prepare derivative works, distribute, and +otherwise use the Software alone or in any derivative version, +provided, however, that the BeOpen Python License is retained in the +Software, alone or in any derivative version prepared by Licensee. + +3. BeOpen is making the Software available to Licensee on an "AS IS" +basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY +DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +5. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +6. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of California, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed to +create any relationship of agency, partnership, or joint venture +between BeOpen and Licensee. This License Agreement does not grant +permission to use BeOpen trademarks or trade names in a trademark +sense to endorse or promote products or services of Licensee, or any +third party. As an exception, the "BeOpen Python" logos available at +http://www.pythonlabs.com/logos.html may be used according to the +permissions granted on that web page. + +7. By copying, installing or otherwise using the software, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 +--------------------------------------- + +1. This LICENSE AGREEMENT is between the Corporation for National +Research Initiatives, having an office at 1895 Preston White Drive, +Reston, VA 20191 ("CNRI"), and the Individual or Organization +("Licensee") accessing and otherwise using Python 1.6.1 software in +source or binary form and its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, CNRI +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 1.6.1 +alone or in any derivative version, provided, however, that CNRI's +License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) +1995-2001 Corporation for National Research Initiatives; All Rights +Reserved" are retained in Python 1.6.1 alone or in any derivative +version prepared by Licensee. Alternately, in lieu of CNRI's License +Agreement, Licensee may substitute the following text (omitting the +quotes): "Python 1.6.1 is made available subject to the terms and +conditions in CNRI's License Agreement. This Agreement together with +Python 1.6.1 may be located on the Internet using the following +unique, persistent identifier (known as a handle): 1895.22/1013. This +Agreement may also be obtained from a proxy server on the Internet +using the following URL: http://hdl.handle.net/1895.22/1013". + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 1.6.1 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python 1.6.1. + +4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" +basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. This License Agreement shall be governed by the federal +intellectual property law of the United States, including without +limitation the federal copyright law, and, to the extent such +U.S. federal law does not apply, by the law of the Commonwealth of +Virginia, excluding Virginia's conflict of law provisions. +Notwithstanding the foregoing, with regard to derivative works based +on Python 1.6.1 that incorporate non-separable material that was +previously distributed under the GNU General Public License (GPL), the +law of the Commonwealth of Virginia shall govern this License +Agreement only as to issues arising under or with respect to +Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this +License Agreement shall be deemed to create any relationship of +agency, partnership, or joint venture between CNRI and Licensee. This +License Agreement does not grant permission to use CNRI trademarks or +trade name in a trademark sense to endorse or promote products or +services of Licensee, or any third party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, +installing or otherwise using Python 1.6.1, Licensee agrees to be +bound by the terms and conditions of this License Agreement. + + ACCEPT + + +CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 +-------------------------------------------------- + +Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, +The Netherlands. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Stichting Mathematisch +Centrum or CWI not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Licenses and Acknowledgements for Incorporated Software +======================================================= + +Mersenne Twister +---------------- + +The `_random' module includes code based on a download from +`http://www.math.keio.ac.jp/~matumoto/MT2002/emt19937ar.html'. The +following are the verbatim comments from the original code: + + A C-program for MT19937, with initialization improved 2002/1/26. + Coded by Takuji Nishimura and Makoto Matsumoto. + + Before using, initialize the state by using init_genrand(seed) + or init_by_array(init_key, key_length). + + Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. The names of its contributors may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Any feedback is very welcome. + http://www.math.keio.ac.jp/matumoto/emt.html + email: matumoto@math.keio.ac.jp + + +Sockets +------- + +The `socket' module uses the functions, `getaddrinfo', and +`getnameinfo', which are coded in separate source files from the WIDE +Project, `http://www.wide.ad.jp/about/index.html'. + + Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the project nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + GAI_ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + FOR GAI_ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON GAI_ANY THEORY OF LIABILITY, WHETHER + IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN GAI_ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. + + +Floating point exception control +-------------------------------- + +The source for the `fpectl' module includes the following notice: + + --------------------------------------------------------------------- + / Copyright (c) 1996. \ + | The Regents of the University of California. | + | All rights reserved. | + | | + | Permission to use, copy, modify, and distribute this software for | + | any purpose without fee is hereby granted, provided that this en- | + | tire notice is included in all copies of any software which is or | + | includes a copy or modification of this software and in all | + | copies of the supporting documentation for such software. | + | | + | This work was produced at the University of California, Lawrence | + | Livermore National Laboratory under contract no. W-7405-ENG-48 | + | between the U.S. Department of Energy and The Regents of the | + | University of California for the operation of UC LLNL. | + | | + | DISCLAIMER | + | | + | This software was prepared as an account of work sponsored by an | + | agency of the United States Government. Neither the United States | + | Government nor the University of California nor any of their em- | + | ployees, makes any warranty, express or implied, or assumes any | + | liability or responsibility for the accuracy, completeness, or | + | usefulness of any information, apparatus, product, or process | + | disclosed, or represents that its use would not infringe | + | privately-owned rights. Reference herein to any specific commer- | + | cial products, process, or service by trade name, trademark, | + | manufacturer, or otherwise, does not necessarily constitute or | + | imply its endorsement, recommendation, or favoring by the United | + | States Government or the University of California. The views and | + | opinions of authors expressed herein do not necessarily state or | + | reflect those of the United States Government or the University | + | of California, and shall not be used for advertising or product | + \ endorsement purposes. / + --------------------------------------------------------------------- + + +Cookie management +----------------- + +The `Cookie' module contains the following notice: + + Copyright 2000 by Timothy O'Malley + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software + and its documentation for any purpose and without fee is hereby + granted, provided that the above copyright notice appear in all + copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name of + Timothy O'Malley not be used in advertising or publicity + pertaining to distribution of the software without specific, written + prior permission. + + Timothy O'Malley DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS, IN NO EVENT SHALL Timothy O'Malley BE LIABLE FOR + ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + + +Execution tracing +----------------- + +The `trace' module contains the following notice: + + portions copyright 2001, Autonomous Zones Industries, Inc., all rights... + err... reserved and offered to the public under the terms of the + Python 2.2 license. + Author: Zooko O'Whielacronx + http://zooko.com/ + mailto:zooko@zooko.com + + Copyright 2000, Mojam Media, Inc., all rights reserved. + Author: Skip Montanaro + + Copyright 1999, Bioreason, Inc., all rights reserved. + Author: Andrew Dalke + + Copyright 1995-1997, Automatrix, Inc., all rights reserved. + Author: Skip Montanaro + + Copyright 1991-1995, Stichting Mathematisch Centrum, all rights reserved. + + Permission to use, copy, modify, and distribute this Python software and + its associated documentation for any purpose without fee is hereby + granted, provided that the above copyright notice appears in all copies, + and that both that copyright notice and this permission notice appear in + supporting documentation, and that the name of neither Automatrix, + Bioreason or Mojam Media be used in advertising or publicity pertaining + to distribution of the software without specific, written prior + permission. + + +UUencode and UUdecode functions +------------------------------- + +The `uu' module contains the following notice: + + Copyright 1994 by Lance Ellinghouse + Cathedral City, California Republic, United States of America. + All Rights Reserved + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Lance Ellinghouse + not be used in advertising or publicity pertaining to distribution + of the software without specific, written prior permission. + LANCE ELLINGHOUSE DISCLAIMS ALL WARRANTIES WITH REGARD TO + THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL LANCE ELLINGHOUSE CENTRUM BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + Modified by Jack Jansen, CWI, July 1995: + - Use binascii module to do the actual line-by-line conversion + between ascii and binary. This results in a 1000-fold speedup. The C + version is still 5 times faster, though. + - Arguments more compliant with python standard + + +XML Remote Procedure Calls +-------------------------- + +The `xmlrpclib' module contains the following notice: + + The XML-RPC client interface is + + Copyright (c) 1999-2002 by Secret Labs AB + Copyright (c) 1999-2002 by Fredrik Lundh + + By obtaining, using, and/or copying this software and/or its + associated documentation, you agree that you have read, understood, + and will comply with the following terms and conditions: + + Permission to use, copy, modify, and distribute this software and + its associated documentation for any purpose and without fee is + hereby granted, provided that the above copyright notice appears in + all copies, and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name of + Secret Labs AB or the author not be used in advertising or publicity + pertaining to distribution of the software without specific, written + prior permission. + + SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD + TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT- + ABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR + BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY + DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + OF THIS SOFTWARE. + +Licenses for Software linked to +=============================== + +Note that the choice of GPL compatibility outlined above doesn't extend +to modules linked to particular libraries, since they change the +effective License of the module binary. + + +GNU Readline +------------ + +The 'readline' module makes use of GNU Readline. + + The GNU Readline Library 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 2, or (at + your option) any later version. + + On Debian systems, you can find the complete statement in + /usr/share/doc/readline-common/copyright'. A copy of the GNU General + Public License is available in /usr/share/common-licenses/GPL-2'. + + +OpenSSL +------- + +The '_ssl' module makes use of OpenSSL. + + The OpenSSL toolkit stays under a dual license, i.e. both the + conditions of the OpenSSL License and the original SSLeay license + apply to the toolkit. Actually both licenses are BSD-style Open + Source licenses. Note that both licenses are incompatible with + the GPL. + + On Debian systems, you can find the complete license text in + /usr/share/doc/openssl/copyright'. + + +Files with other licenses than the Python License +------------------------------------------------- + +Files: Lib/profile.py Lib/pstats.py +Copyright: Disney Enterprises, Inc. All Rights Reserved. +License: # Licensed to PSF under a Contributor Agreement + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific language + overning permissions and limitations under the License. + + On Debian systems, the Apache 2.0 license can be found in + /usr/share/common-licenses/Apache-2.0. + +Files: Modules/zlib/* +Copyright: (C) 1995-2010 Jean-loup Gailly and Mark Adler +License: This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + If you use the zlib library in a product, we would appreciate *not* receiving + lengthy legal documents to sign. The sources are provided for free but without + warranty of any kind. The library has been entirely written by Jean-loup + Gailly and Mark Adler; it does not include third-party code. + +Files: Modules/_ctypes/libffi/* +Copyright: Copyright (C) 1996-2009 Red Hat, Inc and others. +License: Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + ``Software''), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + Documentation: + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. A copy of the license is included in the + section entitled ``GNU General Public License''. + +Files: Modules/expat/* +Copyright: Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper + Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers +License: Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: Misc/python-mode.el +Copyright: Copyright (C) 1992,1993,1994 Tim Peters +License: This software is provided as-is, without express or implied + warranty. Permission to use, copy, modify, distribute or sell this + software, without fee, for any purpose and by any individual or + organization, is hereby granted, provided that the above copyright + notice and this paragraph appear in all copies. + +Files: PC/_subprocess.c +Copyright: Copyright (c) 2004 by Fredrik Lundh + Copyright (c) 2004 by Secret Labs AB, http://www.pythonware.com + Copyright (c) 2004 by Peter Astrand +License: + * Permission to use, copy, modify, and distribute this software and + * its associated documentation for any purpose and without fee is + * hereby granted, provided that the above copyright notice appears in + * all copies, and that both that copyright notice and this permission + * notice appear in supporting documentation, and that the name of the + * authors not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. + * + * THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. + * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Files: PC/winsound.c +Copyright: Copyright (c) 1999 Toby Dickenson +License: * Permission to use this software in any way is granted without + * fee, provided that the copyright notice above appears in all + * copies. This software is provided "as is" without any warranty. + */ + +/* Modified by Guido van Rossum */ +/* Beep added by Mark Hammond */ +/* Win9X Beep and platform identification added by Uncle Timmy */ --- python2.7-2.7.8.orig/debian/depgraph.py +++ python2.7-2.7.8/debian/depgraph.py @@ -0,0 +1,199 @@ +#! /usr/bin/python + +# Copyright 2004 Toby Dickenson +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject +# to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +import sys, getopt, colorsys, imp, md5 + +class pydepgraphdot: + + def main(self,argv): + opts,args = getopt.getopt(argv,'',['mono']) + self.colored = 1 + for o,v in opts: + if o=='--mono': + self.colored = 0 + self.render() + + def fix(self,s): + # Convert a module name to a syntactically correct node name + return s.replace('.','_') + + def render(self): + p,t = self.get_data() + + # normalise our input data + for k,d in p.items(): + for v in d.keys(): + if not p.has_key(v): + p[v] = {} + + f = self.get_output_file() + + f.write('digraph G {\n') + #f.write('concentrate = true;\n') + #f.write('ordering = out;\n') + f.write('ranksep=1.0;\n') + f.write('node [style=filled,fontname=Helvetica,fontsize=10];\n') + allkd = p.items() + allkd.sort() + for k,d in allkd: + tk = t.get(k) + if self.use(k,tk): + allv = d.keys() + allv.sort() + for v in allv: + tv = t.get(v) + if self.use(v,tv) and not self.toocommon(v,tv): + f.write('%s -> %s' % ( self.fix(k),self.fix(v) ) ) + self.write_attributes(f,self.edge_attributes(k,v)) + f.write(';\n') + f.write(self.fix(k)) + self.write_attributes(f,self.node_attributes(k,tk)) + f.write(';\n') + f.write('}\n') + + def write_attributes(self,f,a): + if a: + f.write(' [') + f.write(','.join(a)) + f.write(']') + + def node_attributes(self,k,type): + a = [] + a.append('label="%s"' % self.label(k)) + if self.colored: + a.append('fillcolor="%s"' % self.color(k,type)) + else: + a.append('fillcolor=white') + if self.toocommon(k,type): + a.append('peripheries=2') + return a + + def edge_attributes(self,k,v): + a = [] + weight = self.weight(k,v) + if weight!=1: + a.append('weight=%d' % weight) + length = self.alien(k,v) + if length: + a.append('minlen=%d' % length) + return a + + def get_data(self): + t = eval(sys.stdin.read()) + return t['depgraph'],t['types'] + + def get_output_file(self): + return sys.stdout + + def use(self,s,type): + # Return true if this module is interesting and should be drawn. Return false + # if it should be completely omitted. This is a default policy - please override. + if s=='__main__': + return 0 + #if s in ('os','sys','time','__future__','types','re','string'): + if s in ('sys'): + # nearly all modules use all of these... more or less. They add nothing to + # our diagram. + return 0 + if s.startswith('encodings.'): + return 0 + if self.toocommon(s,type): + # A module where we dont want to draw references _to_. Dot doesnt handle these + # well, so it is probably best to not draw them at all. + return 0 + return 1 + + def toocommon(self,s,type): + # Return true if references to this module are uninteresting. Such references + # do not get drawn. This is a default policy - please override. + # + if s=='__main__': + # references *to* __main__ are never interesting. omitting them means + # that main floats to the top of the page + return 1 + #if type==imp.PKG_DIRECTORY: + # # dont draw references to packages. + # return 1 + return 0 + + def weight(self,a,b): + # Return the weight of the dependency from a to b. Higher weights + # usually have shorter straighter edges. Return 1 if it has normal weight. + # A value of 4 is usually good for ensuring that a related pair of modules + # are drawn next to each other. This is a default policy - please override. + # + if b.split('.')[-1].startswith('_'): + # A module that starts with an underscore. You need a special reason to + # import these (for example random imports _random), so draw them close + # together + return 4 + return 1 + + def alien(self,a,b): + # Return non-zero if references to this module are strange, and should be drawn + # extra-long. the value defines the length, in rank. This is also good for putting some + # vertical space between seperate subsystems. This is a default policy - please override. + # + return 0 + + def label(self,s): + # Convert a module name to a formatted node label. This is a default policy - please override. + # + return '\\.\\n'.join(s.split('.')) + + def color(self,s,type): + # Return the node color for this module name. This is a default policy - please override. + # + # Calculate a color systematically based on the hash of the module name. Modules in the + # same package have the same color. Unpackaged modules are grey + t = self.normalise_module_name_for_hash_coloring(s,type) + return self.color_from_name(t) + + def normalise_module_name_for_hash_coloring(self,s,type): + if type==imp.PKG_DIRECTORY: + return s + else: + i = s.rfind('.') + if i<0: + return '' + else: + return s[:i] + + def color_from_name(self,name): + n = md5.md5(name).digest() + hf = float(ord(n[0])+ord(n[1])*0xff)/0xffff + sf = float(ord(n[2]))/0xff + vf = float(ord(n[3]))/0xff + r,g,b = colorsys.hsv_to_rgb(hf, 0.3+0.6*sf, 0.8+0.2*vf) + return '#%02x%02x%02x' % (r*256,g*256,b*256) + + +def main(): + pydepgraphdot().main(sys.argv[1:]) + +if __name__=='__main__': + main() + + + --- python2.7-2.7.8.orig/debian/dh_doclink +++ python2.7-2.7.8/debian/dh_doclink @@ -0,0 +1,28 @@ +#! /bin/sh + +pkg=`echo $1 | sed 's/^-p//'` +target=$2 + +ln -sf $target debian/$pkg/usr/share/doc/$pkg + +f=debian/$pkg.postinst.debhelper +if [ ! -e $f ] || [ "`grep -c '^# dh_doclink' $f`" -eq 0 ]; then +cat >> $f <> $f < /dev/null`; do \ + while rmdir $$d 2> /dev/null; do d=`dirname $$d`; done; \ +done + +exit 0 --- python2.7-2.7.8.orig/debian/idle-PVER.1.in +++ python2.7-2.7.8/debian/idle-PVER.1.in @@ -0,0 +1,104 @@ +.TH IDLE 1 "21 September 2004" +.SH NAME +\fBIDLE\fP \- An Integrated DeveLopment Environment for Python +.SH SYNTAX +.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] [ \fIfile\fP ...] +.PP +.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] ( \fI-c cmd\fP | \fI-r file\fP ) [ \fIarg\fP ...] +.PP +.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] - [ \fIarg\fP ...] +.SH DESCRIPTION +This manual page documents briefly the +.BR idle +command. +This manual page was written for Debian +because the original program does not have a manual page. +For more information, refer to IDLE's help menu. +.PP +.B IDLE +is an Integrated DeveLopment Environment for Python. IDLE is based on +Tkinter, Python's bindings to the Tk widget set. Features are 100% pure +Python, multi-windows with multiple undo and Python colorizing, a Python +shell window subclass, a debugger. IDLE is cross-platform, i.e. it works +on all platforms where Tk is installed. +.LP +.SH OPTIONS +.TP +.B \-h +.PD +Print this help message and exit. +.TP +.B \-n +.PD +Run IDLE without a subprocess (see Help/IDLE Help for details). +.PP +The following options will override the IDLE 'settings' configuration: +.TP +.B \-e +.PD +Open an edit window. +.TP +.B \-i +.PD +Open a shell window. +.PP +The following options imply -i and will open a shell: +.TP +.B \-c cmd +.PD +Run the command in a shell, or +.TP +.B \-r file +.PD +Run script from file. +.PP +.TP +.B \-d +.PD +Enable the debugger. +.TP +.B \-s +.PD +Run $IDLESTARTUP or $PYTHONSTARTUP before anything else. +.TP +.B \-t title +.PD +Set title of shell window. +.PP +A default edit window will be bypassed when -c, -r, or - are used. +.PP +[arg]* and [file]* are passed to the command (-c) or script (-r) in sys.argv[1:]. +.SH EXAMPLES +.TP +idle +.PD +Open an edit window or shell depending on IDLE's configuration. +.TP +idle foo.py foobar.py +.PD +Edit the files, also open a shell if configured to start with shell. +.TP +idle -est "Baz" foo.py +.PD +Run $IDLESTARTUP or $PYTHONSTARTUP, edit foo.py, and open a shell +window with the title "Baz". +.TP +idle -c "import sys; print sys.argv" "foo" +.PD +Open a shell window and run the command, passing "-c" in sys.argv[0] +and "foo" in sys.argv[1]. +.TP +idle -d -s -r foo.py "Hello World" +.PD +Open a shell window, run a startup script, enable the debugger, and +run foo.py, passing "foo.py" in sys.argv[0] and "Hello World" in +sys.argv[1]. +.TP +echo "import sys; print sys.argv" | idle - "foobar" +.PD +Open a shell window, run the script piped in, passing '' in sys.argv[0] +and "foobar" in sys.argv[1]. +.SH SEE ALSO +python(1). +.SH AUTHORS +Various. --- python2.7-2.7.8.orig/debian/idle-PVER.menu.in +++ python2.7-2.7.8/debian/idle-PVER.menu.in @@ -0,0 +1,5 @@ +?package(idle-@PVER@):needs="X11" section="Applications/Programming"\ + title="IDLE (Python v@VER@)"\ + icon="/usr/share/pixmaps/@PVER@.xpm"\ + command="/usr/bin/idle-@PVER@" \ + hints="Environments" --- python2.7-2.7.8.orig/debian/idle-PVER.overrides.in +++ python2.7-2.7.8/debian/idle-PVER.overrides.in @@ -0,0 +1,3 @@ +# icon in dependent package +idle-@PVER@ binary: menu-icon-missing +idle-@PVER@ binary: image-file-in-usr-lib --- python2.7-2.7.8.orig/debian/idle-PVER.postinst.in +++ python2.7-2.7.8/debian/idle-PVER.postinst.in @@ -0,0 +1,32 @@ +#! /bin/sh +# +# postinst script for the Debian idle-@PVER@ package. +# Written 1998 by Gregor Hoffleit . +# + +set -e + +DIRLIST="/usr/lib/python@VER@/idlelib" + +case "$1" in + configure|abort-upgrade|abort-remove|abort-deconfigure) + + for i in $DIRLIST ; do + @PVER@ /usr/lib/@PVER@/compileall.py -q $i + if grep -sq '^byte-compile[^#]*optimize' /etc/python/debian_config + then + @PVER@ -O /usr/lib/@PVER@/compileall.py -q $i + fi + done + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 --- python2.7-2.7.8.orig/debian/idle-PVER.postrm.in +++ python2.7-2.7.8/debian/idle-PVER.postrm.in @@ -0,0 +1,11 @@ +#! /bin/sh + +set -e + +if [ "$1" = "purge" ]; then + rm -rf /etc/idle-@PVER@ +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.8.orig/debian/idle-PVER.prerm.in +++ python2.7-2.7.8/debian/idle-PVER.prerm.in @@ -0,0 +1,17 @@ +#! /bin/sh +# +# sample prerm script for the Debian idle-@PVER@ package. +# Written 1998 by Gregor Hoffleit . +# + +set -e + +PACKAGE=`basename $0 .prerm` + +dpkg --listfiles $PACKAGE | + awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | + xargs rm -f >&2 + +#DEBHELPER# + +exit 0 --- python2.7-2.7.8.orig/debian/idle.desktop.in +++ python2.7-2.7.8/debian/idle.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=IDLE (using Python-@VER@) +Comment=Integrated Development Environment for Python (using Python-@VER@) +Exec=/usr/bin/idle-@PVER@ +Icon=/usr/share/pixmaps/@PVER@.xpm +Terminal=false +Type=Application +Categories=Application;Development; +StartupNotify=true --- python2.7-2.7.8.orig/debian/libPVER-dbg.overrides.in +++ python2.7-2.7.8/debian/libPVER-dbg.overrides.in @@ -0,0 +1,7 @@ +lib@PVER@-dbg binary: package-name-doesnt-match-sonames +lib@PVER@-dbg binary: non-dev-pkg-with-shlib-symlink + +lib@PVER@-dbg binary: arch-dependent-file-not-in-arch-specific-directory + +# pointless lintian ... +lib@PVER@-dbg binary: hardening-no-fortify-functions --- python2.7-2.7.8.orig/debian/libPVER-dbg.prerm.in +++ python2.7-2.7.8/debian/libPVER-dbg.prerm.in @@ -0,0 +1,23 @@ +#! /bin/sh + +set -e + +case "$1" in + remove) + dpkg -L lib@PVER@-dbg@HOST_QUAL@ \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 + ;; + upgrade) + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.8.orig/debian/libPVER-dbg.symbols.in +++ python2.7-2.7.8/debian/libPVER-dbg.symbols.in @@ -0,0 +1,33 @@ +libpython@VER@_d.so.1.0 libpython@VER@-dbg #MINVER# + Py_InitModule4TraceRefs@Base @VER@ +#include "libpython.symbols" + _PyDict_Dummy@Base @VER@ + _PyMem_DebugFree@Base @VER@ + _PyMem_DebugMalloc@Base @VER@ + _PyMem_DebugRealloc@Base @VER@ + _PyObject_DebugCheckAddress@Base @VER@ + _PyObject_DebugCheckAddressApi@Base @VER@ + _PyObject_DebugDumpAddress@Base @VER@ + _PyObject_DebugFree@Base @VER@ + _PyObject_DebugFreeApi@Base @VER@ + _PyObject_DebugMalloc@Base @VER@ + _PyObject_DebugMallocApi@Base @VER@ + _PyObject_DebugMallocStats@Base @VER@ + _PyObject_DebugRealloc@Base @VER@ + _PyObject_DebugReallocApi@Base @VER@ + _PySet_Dummy@Base @VER@ + _Py_AddToAllObjects@Base @VER@ + _Py_Dealloc@Base @VER@ + _Py_ForgetReference@Base @VER@ + _Py_GetObjects@Base @VER@ + _Py_GetRefTotal@Base @VER@ + _Py_HashSecret_Initialized@Base @VER@ + _Py_NegativeRefcount@Base @VER@ + _Py_NewReference@Base @VER@ + _Py_PrintReferenceAddresses@Base @VER@ + _Py_PrintReferences@Base @VER@ + _Py_RefTotal@Base @VER@ + _Py_dumptree@Base @VER@ + _Py_printtree@Base @VER@ + _Py_showtree@Base @VER@ + _Py_tok_dump@Base @VER@ --- python2.7-2.7.8.orig/debian/libPVER-dev.overrides.in +++ python2.7-2.7.8/debian/libPVER-dev.overrides.in @@ -0,0 +1,3 @@ +lib@PVER@-dev binary: python-script-but-no-python-dep + +lib@PVER@-dev binary: arch-dependent-file-not-in-arch-specific-directory --- python2.7-2.7.8.orig/debian/libPVER-minimal.overrides.in +++ python2.7-2.7.8/debian/libPVER-minimal.overrides.in @@ -0,0 +1 @@ +lib@PVER@-minimal binary: python-script-but-no-python-dep --- python2.7-2.7.8.orig/debian/libPVER-minimal.postinst.in +++ python2.7-2.7.8/debian/libPVER-minimal.postinst.in @@ -0,0 +1,13 @@ +#! /bin/sh + +set -e + +if [ ! -f /etc/@PVER@/sitecustomize.py ]; then + cat <<-EOF + # Empty sitecustomize.py to avoid a dangling symlink +EOF +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.8.orig/debian/libPVER-minimal.postrm.in +++ python2.7-2.7.8/debian/libPVER-minimal.postrm.in @@ -0,0 +1,26 @@ +#! /bin/sh + +set -e + +if [ "$1" = "remove" ]; then + pc=$(dpkg-query -f '${db:Status-Abbrev} ${binary:Package}\n' -W lib@PVER@-minimal \ + | grep -v '^.n' | wc -l) + if [ "$pc" -le 1 ]; then + find /usr/lib/@PVER@ -name '*.py[co]' -print0 | xargs -r0 rm -f + fi +fi + +if [ "$1" = "purge" ]; then + pc=$(dpkg-query -f '${db:Status-Abbrev} ${binary:Package}\n' -W lib@PVER@-minimal \ + | grep -v '^.n' | wc -l) + if [ "$pc" -le 1 ]; then + rm -f /etc/@PVER@/site.py /etc/@PVER@/sitecustomize.py + if [ -d /etc/@PVER@ ]; then + rmdir --ignore-fail-on-non-empty /etc/@PVER@ 2>/dev/null + fi + fi +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.8.orig/debian/libPVER-minimal.prerm.in +++ python2.7-2.7.8/debian/libPVER-minimal.prerm.in @@ -0,0 +1,35 @@ +#! /bin/sh + +set -e + +remove_bytecode() +{ + pkg=$1 + dpkg -L $1 \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 +} + +case "$1" in + remove) + pc=$(dpkg-query -f '${db:Status-Abbrev} ${binary:Package}\n' -W lib@PVER@-minimal \ + | grep -v '^.n' | wc -l) + if [ "$pc" -le 1 ]; then + remove_bytecode lib@PVER@-minimal@HOST_QUAL@ + fi + ;; + upgrade) + remove_bytecode lib@PVER@-minimal@HOST_QUAL@ + # byte compilation in @PVER@-minimal postinst, strict dependency + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.8.orig/debian/libPVER-stdlib.overrides.in +++ python2.7-2.7.8/debian/libPVER-stdlib.overrides.in @@ -0,0 +1,14 @@ +# idlelib images +lib@PVER@-stdlib binary: image-file-in-usr-lib + +# license file referred by the standard library +lib@PVER@-stdlib binary: extra-license-file + +# template files +lib@PVER@-stdlib binary: interpreter-not-absolute usr/lib/python3.3/venv/scripts/posix/pydoc #!__VENV_PYTHON__ +lib@PVER@-stdlib binary: unusual-interpreter usr/lib/python3.3/venv/scripts/posix/pydoc #!__VENV_PYTHON__ + +# the split is the reason for that +lib@PVER@-stdlib binary: python-script-but-no-python-dep + +lib@PVER@-stdlib binary: arch-dependent-file-not-in-arch-specific-directory --- python2.7-2.7.8.orig/debian/libPVER-stdlib.prerm.in +++ python2.7-2.7.8/debian/libPVER-stdlib.prerm.in @@ -0,0 +1,35 @@ +#! /bin/sh + +set -e + +remove_bytecode() +{ + pkg=$1 + dpkg -L $1 \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 +} + +case "$1" in + remove) + pc=$(dpkg-query -f '${db:Status-Abbrev} ${binary:Package}\n' -W lib@PVER@-stdlib \ + | grep -v '^.n' | wc -l) + if [ "$pc" -le 1 ]; then + remove_bytecode lib@PVER@-stdlib@HOST_QUAL@ + fi + ;; + upgrade) + remove_bytecode lib@PVER@-stdlib@HOST_QUAL@ + # byte compilation in @PVER@ postinst, strict dependency + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.8.orig/debian/libPVER-testsuite.overrides.in +++ python2.7-2.7.8/debian/libPVER-testsuite.overrides.in @@ -0,0 +1,2 @@ +lib@PVER@-testsuite binary: python-script-but-no-python-dep +lib@PVER@-testsuite binary: image-file-in-usr-lib --- python2.7-2.7.8.orig/debian/libPVER-testsuite.prerm.in +++ python2.7-2.7.8/debian/libPVER-testsuite.prerm.in @@ -0,0 +1,30 @@ +#! /bin/sh + +set -e + +remove_bytecode() +{ + pkg=$1 + dpkg -L $1 \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 +} + +case "$1" in + remove) + remove_bytecode lib@PVER@-testsuite + ;; + upgrade) + remove_bytecode lib@PVER@-testsuite + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.8.orig/debian/libPVER.overrides.in +++ python2.7-2.7.8/debian/libPVER.overrides.in @@ -0,0 +1 @@ +lib@PVER@ binary: package-name-doesnt-match-sonames --- python2.7-2.7.8.orig/debian/libPVER.symbols.in +++ python2.7-2.7.8/debian/libPVER.symbols.in @@ -0,0 +1,3 @@ +libpython@VER@.so.1.0 libpython@VER@ #MINVER# + Py_InitModule4@Base @VER@ +#include "libpython.symbols" --- python2.7-2.7.8.orig/debian/libpython.symbols.in +++ python2.7-2.7.8/debian/libpython.symbols.in @@ -0,0 +1,1339 @@ + PyAST_Check@Base @VER@ + PyAST_Compile@Base @VER@ + PyAST_FromNode@Base @VER@ + PyAST_mod2obj@Base @VER@ + PyAST_obj2mod@Base @VER@ + PyArena_AddPyObject@Base @VER@ + PyArena_Free@Base @VER@ + PyArena_Malloc@Base @VER@ + PyArena_New@Base @VER@ + PyArg_Parse@Base @VER@ + PyArg_ParseTuple@Base @VER@ + PyArg_ParseTupleAndKeywords@Base @VER@ + PyArg_UnpackTuple@Base @VER@ + PyArg_VaParse@Base @VER@ + PyArg_VaParseTupleAndKeywords@Base @VER@ + PyBaseObject_Type@Base @VER@ + PyBaseString_Type@Base @VER@ + PyBool_FromLong@Base @VER@ + PyBool_Type@Base @VER@ + PyBuffer_FillContiguousStrides@Base @VER@ + PyBuffer_FillInfo@Base @VER@ + PyBuffer_FromContiguous@Base @VER@ + PyBuffer_FromMemory@Base @VER@ + PyBuffer_FromObject@Base @VER@ + PyBuffer_FromReadWriteMemory@Base @VER@ + PyBuffer_FromReadWriteObject@Base @VER@ + PyBuffer_GetPointer@Base @VER@ + PyBuffer_IsContiguous@Base @VER@ + PyBuffer_New@Base @VER@ + PyBuffer_Release@Base @VER@ + PyBuffer_ToContiguous@Base @VER@ + PyBuffer_Type@Base @VER@ + (optional)PyBufferedIOBase_Type@Base @VER@ + (optional)PyBufferedRWPair_Type@Base @VER@ + (optional)PyBufferedRandom_Type@Base @VER@ + (optional)PyBufferedReader_Type@Base @VER@ + (optional)PyBufferedWriter_Type@Base @VER@ + PyByteArrayIter_Type@Base @VER@ + PyByteArray_AsString@Base @VER@ + PyByteArray_Concat@Base @VER@ + PyByteArray_Fini@Base @VER@ + PyByteArray_FromObject@Base @VER@ + PyByteArray_FromStringAndSize@Base @VER@ + PyByteArray_Init@Base @VER@ + PyByteArray_Resize@Base @VER@ + PyByteArray_Size@Base @VER@ + PyByteArray_Type@Base @VER@ + (optional)PyBytesIO_Type@Base @VER@ + PyCFunction_Call@Base @VER@ + PyCFunction_ClearFreeList@Base @VER@ + PyCFunction_Fini@Base @VER@ + PyCFunction_GetFlags@Base @VER@ + PyCFunction_GetFunction@Base @VER@ + PyCFunction_GetSelf@Base @VER@ + PyCFunction_New@Base @VER@ + PyCFunction_NewEx@Base @VER@ + PyCFunction_Type@Base @VER@ + PyCObject_AsVoidPtr@Base @VER@ + PyCObject_FromVoidPtr@Base @VER@ + PyCObject_FromVoidPtrAndDesc@Base @VER@ + PyCObject_GetDesc@Base @VER@ + PyCObject_Import@Base @VER@ + PyCObject_SetVoidPtr@Base @VER@ + PyCObject_Type@Base @VER@ + PyCallIter_New@Base @VER@ + PyCallIter_Type@Base @VER@ + PyCallable_Check@Base @VER@ + PyCapsule_GetContext@Base @VER@ + PyCapsule_GetDestructor@Base @VER@ + PyCapsule_GetName@Base @VER@ + PyCapsule_GetPointer@Base @VER@ + PyCapsule_Import@Base @VER@ + PyCapsule_IsValid@Base @VER@ + PyCapsule_New@Base @VER@ + PyCapsule_SetContext@Base @VER@ + PyCapsule_SetDestructor@Base @VER@ + PyCapsule_SetName@Base @VER@ + PyCapsule_SetPointer@Base @VER@ + PyCapsule_Type@Base @VER@ + PyCell_Get@Base @VER@ + PyCell_New@Base @VER@ + PyCell_Set@Base @VER@ + PyCell_Type@Base @VER@ + PyClassMethod_New@Base @VER@ + PyClassMethod_Type@Base @VER@ + PyClass_IsSubclass@Base @VER@ + PyClass_New@Base @VER@ + PyClass_Type@Base @VER@ + PyCode_Addr2Line@Base @VER@ + PyCode_New@Base @VER@ + PyCode_NewEmpty@Base @VER@ + PyCode_Optimize@Base @VER@ + PyCode_Type@Base @VER@ + PyCodec_BackslashReplaceErrors@Base @VER@ + PyCodec_Decode@Base @VER@ + PyCodec_Decoder@Base @VER@ + PyCodec_Encode@Base @VER@ + PyCodec_Encoder@Base @VER@ + PyCodec_IgnoreErrors@Base @VER@ + PyCodec_IncrementalDecoder@Base @VER@ + PyCodec_IncrementalEncoder@Base @VER@ + PyCodec_LookupError@Base @VER@ + PyCodec_Register@Base @VER@ + PyCodec_RegisterError@Base @VER@ + PyCodec_ReplaceErrors@Base @VER@ + PyCodec_StreamReader@Base @VER@ + PyCodec_StreamWriter@Base @VER@ + PyCodec_StrictErrors@Base @VER@ + PyCodec_XMLCharRefReplaceErrors@Base @VER@ + PyComplex_AsCComplex@Base @VER@ + PyComplex_FromCComplex@Base @VER@ + PyComplex_FromDoubles@Base @VER@ + PyComplex_ImagAsDouble@Base @VER@ + PyComplex_RealAsDouble@Base @VER@ + PyComplex_Type@Base @VER@ + PyDescr_NewClassMethod@Base @VER@ + PyDescr_NewGetSet@Base @VER@ + PyDescr_NewMember@Base @VER@ + PyDescr_NewMethod@Base @VER@ + PyDescr_NewWrapper@Base @VER@ + PyDictItems_Type@Base @VER@ + PyDictIterItem_Type@Base @VER@ + PyDictIterKey_Type@Base @VER@ + PyDictIterValue_Type@Base @VER@ + PyDictKeys_Type@Base @VER@ + PyDictProxy_New@Base @VER@ + PyDictProxy_Type@Base @VER@ + PyDictValues_Type@Base @VER@ + PyDict_Clear@Base @VER@ + PyDict_Contains@Base @VER@ + PyDict_Copy@Base @VER@ + PyDict_DelItem@Base @VER@ + PyDict_DelItemString@Base @VER@ + PyDict_Fini@Base @VER@ + PyDict_GetItem@Base @VER@ + PyDict_GetItemString@Base @VER@ + PyDict_Items@Base @VER@ + PyDict_Keys@Base @VER@ + PyDict_Merge@Base @VER@ + PyDict_MergeFromSeq2@Base @VER@ + PyDict_New@Base @VER@ + PyDict_Next@Base @VER@ + PyDict_SetItem@Base @VER@ + PyDict_SetItemString@Base @VER@ + PyDict_Size@Base @VER@ + PyDict_Type@Base @VER@ + PyDict_Update@Base @VER@ + PyDict_Values@Base @VER@ + PyEllipsis_Type@Base @VER@ + PyEnum_Type@Base @VER@ + PyErr_BadArgument@Base @VER@ + PyErr_BadInternalCall@Base @VER@ + PyErr_CheckSignals@Base @VER@ + PyErr_Clear@Base @VER@ + PyErr_Display@Base @VER@ + PyErr_ExceptionMatches@Base @VER@ + PyErr_Fetch@Base @VER@ + PyErr_Format@Base @VER@ + PyErr_GivenExceptionMatches@Base @VER@ + PyErr_NewException@Base @VER@ + PyErr_NewExceptionWithDoc@Base @VER@ + PyErr_NoMemory@Base @VER@ + PyErr_NormalizeException@Base @VER@ + PyErr_Occurred@Base @VER@ + PyErr_Print@Base @VER@ + PyErr_PrintEx@Base @VER@ + PyErr_ProgramText@Base @VER@ + PyErr_Restore@Base @VER@ + PyErr_SetFromErrno@Base @VER@ + PyErr_SetFromErrnoWithFilename@Base @VER@ + PyErr_SetFromErrnoWithFilenameObject@Base @VER@ + PyErr_SetInterrupt@Base @VER@ + PyErr_SetNone@Base @VER@ + PyErr_SetObject@Base @VER@ + PyErr_SetString@Base @VER@ + PyErr_SyntaxLocation@Base @VER@ + PyErr_Warn@Base @VER@ + PyErr_WarnEx@Base @VER@ + PyErr_WarnExplicit@Base @VER@ + PyErr_WriteUnraisable@Base @VER@ + PyEval_AcquireLock@Base @VER@ + PyEval_AcquireThread@Base @VER@ + PyEval_CallFunction@Base @VER@ + PyEval_CallMethod@Base @VER@ + PyEval_CallObjectWithKeywords@Base @VER@ + PyEval_EvalCode@Base @VER@ + PyEval_EvalCodeEx@Base @VER@ + PyEval_EvalFrame@Base @VER@ + PyEval_EvalFrameEx@Base @VER@ + PyEval_GetBuiltins@Base @VER@ + PyEval_GetCallStats@Base @VER@ + PyEval_GetFrame@Base @VER@ + PyEval_GetFuncDesc@Base @VER@ + PyEval_GetFuncName@Base @VER@ + PyEval_GetGlobals@Base @VER@ + PyEval_GetLocals@Base @VER@ + PyEval_GetRestricted@Base @VER@ + PyEval_InitThreads@Base @VER@ + PyEval_MergeCompilerFlags@Base @VER@ + PyEval_ReInitThreads@Base @VER@ + PyEval_ReleaseLock@Base @VER@ + PyEval_ReleaseThread@Base @VER@ + PyEval_RestoreThread@Base @VER@ + PyEval_SaveThread@Base @VER@ + PyEval_SetProfile@Base @VER@ + PyEval_SetTrace@Base @VER@ + PyEval_ThreadsInitialized@Base @VER@ + PyExc_ArithmeticError@Base @VER@ + PyExc_AssertionError@Base @VER@ + PyExc_AttributeError@Base @VER@ + PyExc_BaseException@Base @VER@ + (optional)PyExc_BlockingIOError@Base @VER@ + PyExc_BufferError@Base @VER@ + PyExc_BytesWarning@Base @VER@ + PyExc_DeprecationWarning@Base @VER@ + PyExc_EOFError@Base @VER@ + PyExc_EnvironmentError@Base @VER@ + PyExc_Exception@Base @VER@ + PyExc_FloatingPointError@Base @VER@ + PyExc_FutureWarning@Base @VER@ + PyExc_GeneratorExit@Base @VER@ + PyExc_IOError@Base @VER@ + PyExc_ImportError@Base @VER@ + PyExc_ImportWarning@Base @VER@ + PyExc_IndentationError@Base @VER@ + PyExc_IndexError@Base @VER@ + PyExc_KeyError@Base @VER@ + PyExc_KeyboardInterrupt@Base @VER@ + PyExc_LookupError@Base @VER@ + PyExc_MemoryError@Base @VER@ + PyExc_MemoryErrorInst@Base @VER@ + PyExc_NameError@Base @VER@ + PyExc_NotImplementedError@Base @VER@ + PyExc_OSError@Base @VER@ + PyExc_OverflowError@Base @VER@ + PyExc_PendingDeprecationWarning@Base @VER@ + PyExc_RecursionErrorInst@Base @VER@ + PyExc_ReferenceError@Base @VER@ + PyExc_RuntimeError@Base @VER@ + PyExc_RuntimeWarning@Base @VER@ + PyExc_StandardError@Base @VER@ + PyExc_StopIteration@Base @VER@ + PyExc_SyntaxError@Base @VER@ + PyExc_SyntaxWarning@Base @VER@ + PyExc_SystemError@Base @VER@ + PyExc_SystemExit@Base @VER@ + PyExc_TabError@Base @VER@ + PyExc_TypeError@Base @VER@ + PyExc_UnboundLocalError@Base @VER@ + PyExc_UnicodeDecodeError@Base @VER@ + PyExc_UnicodeEncodeError@Base @VER@ + PyExc_UnicodeError@Base @VER@ + PyExc_UnicodeTranslateError@Base @VER@ + PyExc_UnicodeWarning@Base @VER@ + PyExc_UserWarning@Base @VER@ + PyExc_ValueError@Base @VER@ + PyExc_Warning@Base @VER@ + PyExc_ZeroDivisionError@Base @VER@ + (optional)PyFileIO_Type@Base @VER@ + PyFile_AsFile@Base @VER@ + PyFile_DecUseCount@Base @VER@ + PyFile_FromFile@Base @VER@ + PyFile_FromString@Base @VER@ + PyFile_GetLine@Base @VER@ + PyFile_IncUseCount@Base @VER@ + PyFile_Name@Base @VER@ + PyFile_SetBufSize@Base @VER@ + PyFile_SetEncoding@Base @VER@ + PyFile_SetEncodingAndErrors@Base @VER@ + PyFile_SoftSpace@Base @VER@ + PyFile_Type@Base @VER@ + PyFile_WriteObject@Base @VER@ + PyFile_WriteString@Base @VER@ + PyFloat_AsDouble@Base @VER@ + PyFloat_AsReprString@Base @VER@ + PyFloat_AsString@Base @VER@ + PyFloat_ClearFreeList@Base @VER@ + PyFloat_Fini@Base @VER@ + PyFloat_FromDouble@Base @VER@ + PyFloat_FromString@Base @VER@ + PyFloat_GetInfo@Base @VER@ + PyFloat_GetMax@Base @VER@ + PyFloat_GetMin@Base @VER@ + PyFloat_Type@Base @VER@ + PyFrame_BlockPop@Base @VER@ + PyFrame_BlockSetup@Base @VER@ + PyFrame_ClearFreeList@Base @VER@ + PyFrame_FastToLocals@Base @VER@ + PyFrame_Fini@Base @VER@ + PyFrame_GetLineNumber@Base @VER@ + PyFrame_LocalsToFast@Base @VER@ + PyFrame_New@Base @VER@ + PyFrame_Type@Base @VER@ + PyFrozenSet_New@Base @VER@ + PyFrozenSet_Type@Base @VER@ + PyFunction_GetClosure@Base @VER@ + PyFunction_GetCode@Base @VER@ + PyFunction_GetDefaults@Base @VER@ + PyFunction_GetGlobals@Base @VER@ + PyFunction_GetModule@Base @VER@ + PyFunction_New@Base @VER@ + PyFunction_SetClosure@Base @VER@ + PyFunction_SetDefaults@Base @VER@ + PyFunction_Type@Base @VER@ + PyFuture_FromAST@Base @VER@ + PyGC_Collect@Base @VER@ + PyGILState_Ensure@Base @VER@ + PyGILState_GetThisThreadState@Base @VER@ + PyGILState_Release@Base @VER@ + PyGen_NeedsFinalizing@Base @VER@ + PyGen_New@Base @VER@ + PyGen_Type@Base @VER@ + PyGetSetDescr_Type@Base @VER@ + PyGrammar_AddAccelerators@Base @VER@ + PyGrammar_FindDFA@Base @VER@ + PyGrammar_LabelRepr@Base @VER@ + PyGrammar_RemoveAccelerators@Base @VER@ + (optional)PyIOBase_Type@Base @VER@ + PyImport_AddModule@Base @VER@ + PyImport_AppendInittab@Base @VER@ + PyImport_Cleanup@Base @VER@ + PyImport_ExecCodeModule@Base @VER@ + PyImport_ExecCodeModuleEx@Base @VER@ + PyImport_ExtendInittab@Base @VER@ + PyImport_FrozenModules@Base @VER@ + PyImport_GetImporter@Base @VER@ + PyImport_GetMagicNumber@Base @VER@ + PyImport_GetModuleDict@Base @VER@ + PyImport_Import@Base @VER@ + PyImport_ImportFrozenModule@Base @VER@ + PyImport_ImportModule@Base @VER@ + PyImport_ImportModuleLevel@Base @VER@ + PyImport_ImportModuleNoBlock@Base @VER@ + PyImport_Inittab@Base @VER@ + PyImport_ReloadModule@Base @VER@ + (optional)PyIncrementalNewlineDecoder_Type@Base @VER@ + PyInstance_New@Base @VER@ + PyInstance_NewRaw@Base @VER@ + PyInstance_Type@Base @VER@ + PyInt_AsLong@Base @VER@ + PyInt_AsSsize_t@Base @VER@ + PyInt_AsUnsignedLongLongMask@Base @VER@ + PyInt_AsUnsignedLongMask@Base @VER@ + PyInt_ClearFreeList@Base @VER@ + PyInt_Fini@Base @VER@ + PyInt_FromLong@Base @VER@ + PyInt_FromSize_t@Base @VER@ + PyInt_FromSsize_t@Base @VER@ + PyInt_FromString@Base @VER@ + PyInt_FromUnicode@Base @VER@ + PyInt_GetMax@Base @VER@ + PyInt_Type@Base @VER@ + PyInterpreterState_Clear@Base @VER@ + PyInterpreterState_Delete@Base @VER@ + PyInterpreterState_Head@Base @VER@ + PyInterpreterState_New@Base @VER@ + PyInterpreterState_Next@Base @VER@ + PyInterpreterState_ThreadHead@Base @VER@ + PyIter_Next@Base @VER@ + PyListIter_Type@Base @VER@ + PyListRevIter_Type@Base @VER@ + PyList_Append@Base @VER@ + PyList_AsTuple@Base @VER@ + PyList_Fini@Base @VER@ + PyList_GetItem@Base @VER@ + PyList_GetSlice@Base @VER@ + PyList_Insert@Base @VER@ + PyList_New@Base @VER@ + PyList_Reverse@Base @VER@ + PyList_SetItem@Base @VER@ + PyList_SetSlice@Base @VER@ + PyList_Size@Base @VER@ + PyList_Sort@Base @VER@ + PyList_Type@Base @VER@ + PyLong_AsDouble@Base @VER@ + PyLong_AsLong@Base @VER@ + PyLong_AsLongAndOverflow@Base @VER@ + PyLong_AsLongLong@Base @VER@ + PyLong_AsLongLongAndOverflow@Base @VER@ + PyLong_AsSsize_t@Base @VER@ + PyLong_AsUnsignedLong@Base @VER@ + PyLong_AsUnsignedLongLong@Base @VER@ + PyLong_AsUnsignedLongLongMask@Base @VER@ + PyLong_AsUnsignedLongMask@Base @VER@ + PyLong_AsVoidPtr@Base @VER@ + PyLong_FromDouble@Base @VER@ + PyLong_FromLong@Base @VER@ + PyLong_FromLongLong@Base @VER@ + PyLong_FromSize_t@Base @VER@ + PyLong_FromSsize_t@Base @VER@ + PyLong_FromString@Base @VER@ + PyLong_FromUnicode@Base @VER@ + PyLong_FromUnsignedLong@Base @VER@ + PyLong_FromUnsignedLongLong@Base @VER@ + PyLong_FromVoidPtr@Base @VER@ + PyLong_GetInfo@Base @VER@ + PyLong_Type@Base @VER@ + PyMapping_Check@Base @VER@ + PyMapping_GetItemString@Base @VER@ + PyMapping_HasKey@Base @VER@ + PyMapping_HasKeyString@Base @VER@ + PyMapping_Length@Base @VER@ + PyMapping_SetItemString@Base @VER@ + PyMapping_Size@Base @VER@ + PyMarshal_Init@Base @VER@ + PyMarshal_ReadLastObjectFromFile@Base @VER@ + PyMarshal_ReadLongFromFile@Base @VER@ + PyMarshal_ReadObjectFromFile@Base @VER@ + PyMarshal_ReadObjectFromString@Base @VER@ + PyMarshal_ReadShortFromFile@Base @VER@ + PyMarshal_WriteLongToFile@Base @VER@ + PyMarshal_WriteObjectToFile@Base @VER@ + PyMarshal_WriteObjectToString@Base @VER@ + PyMem_Free@Base @VER@ + PyMem_Malloc@Base @VER@ + PyMem_Realloc@Base @VER@ + PyMemberDescr_Type@Base @VER@ + PyMember_Get@Base @VER@ + PyMember_GetOne@Base @VER@ + PyMember_Set@Base @VER@ + PyMember_SetOne@Base @VER@ + PyMemoryView_FromBuffer@Base @VER@ + PyMemoryView_FromObject@Base @VER@ + PyMemoryView_GetContiguous@Base @VER@ + PyMemoryView_Type@Base @VER@ + PyMethod_Class@Base @VER@ + PyMethod_ClearFreeList@Base @VER@ + PyMethod_Fini@Base @VER@ + PyMethod_Function@Base @VER@ + PyMethod_New@Base @VER@ + PyMethod_Self@Base @VER@ + PyMethod_Type@Base @VER@ + PyModule_AddIntConstant@Base @VER@ + PyModule_AddObject@Base @VER@ + PyModule_AddStringConstant@Base @VER@ + PyModule_GetDict@Base @VER@ + PyModule_GetFilename@Base @VER@ + PyModule_GetName@Base @VER@ + PyModule_GetWarningsModule@Base @VER@ + PyModule_New@Base @VER@ + PyModule_Type@Base @VER@ + PyNode_AddChild@Base @VER@ + PyNode_Compile@Base @VER@ + PyNode_Free@Base @VER@ + PyNode_ListTree@Base @VER@ + PyNode_New@Base @VER@ + PyNullImporter_Type@Base @VER@ + PyNumber_Absolute@Base @VER@ + PyNumber_Add@Base @VER@ + PyNumber_And@Base @VER@ + (optional)PyNumber_AsOff_t@Base @VER@ + PyNumber_AsSsize_t@Base @VER@ + PyNumber_Check@Base @VER@ + PyNumber_Coerce@Base @VER@ + PyNumber_CoerceEx@Base @VER@ + PyNumber_Divide@Base @VER@ + PyNumber_Divmod@Base @VER@ + PyNumber_Float@Base @VER@ + PyNumber_FloorDivide@Base @VER@ + PyNumber_InPlaceAdd@Base @VER@ + PyNumber_InPlaceAnd@Base @VER@ + PyNumber_InPlaceDivide@Base @VER@ + PyNumber_InPlaceFloorDivide@Base @VER@ + PyNumber_InPlaceLshift@Base @VER@ + PyNumber_InPlaceMultiply@Base @VER@ + PyNumber_InPlaceOr@Base @VER@ + PyNumber_InPlacePower@Base @VER@ + PyNumber_InPlaceRemainder@Base @VER@ + PyNumber_InPlaceRshift@Base @VER@ + PyNumber_InPlaceSubtract@Base @VER@ + PyNumber_InPlaceTrueDivide@Base @VER@ + PyNumber_InPlaceXor@Base @VER@ + PyNumber_Index@Base @VER@ + PyNumber_Int@Base @VER@ + PyNumber_Invert@Base @VER@ + PyNumber_Long@Base @VER@ + PyNumber_Lshift@Base @VER@ + PyNumber_Multiply@Base @VER@ + PyNumber_Negative@Base @VER@ + PyNumber_Or@Base @VER@ + PyNumber_Positive@Base @VER@ + PyNumber_Power@Base @VER@ + PyNumber_Remainder@Base @VER@ + PyNumber_Rshift@Base @VER@ + PyNumber_Subtract@Base @VER@ + PyNumber_ToBase@Base @VER@ + PyNumber_TrueDivide@Base @VER@ + PyNumber_Xor@Base @VER@ + PyOS_AfterFork@Base @VER@ + PyOS_FiniInterrupts@Base @VER@ + PyOS_InitInterrupts@Base @VER@ + PyOS_InputHook@Base @VER@ + PyOS_InterruptOccurred@Base @VER@ + PyOS_Readline@Base @VER@ + PyOS_ReadlineFunctionPointer@Base @VER@ + PyOS_StdioReadline@Base @VER@ + PyOS_ascii_atof@Base @VER@ + PyOS_ascii_formatd@Base @VER@ + PyOS_ascii_strtod@Base @VER@ + PyOS_double_to_string@Base @VER@ + PyOS_getsig@Base @VER@ + PyOS_mystricmp@Base @VER@ + PyOS_mystrnicmp@Base @VER@ + PyOS_setsig@Base @VER@ + PyOS_snprintf@Base @VER@ + PyOS_string_to_double@Base @VER@ + PyOS_strtol@Base @VER@ + PyOS_strtoul@Base @VER@ + PyOS_vsnprintf@Base @VER@ + PyObject_AsCharBuffer@Base @VER@ + PyObject_AsFileDescriptor@Base @VER@ + PyObject_AsReadBuffer@Base @VER@ + PyObject_AsWriteBuffer@Base @VER@ + PyObject_Call@Base @VER@ + PyObject_CallFunction@Base @VER@ + PyObject_CallFunctionObjArgs@Base @VER@ + PyObject_CallMethod@Base @VER@ + PyObject_CallMethodObjArgs@Base @VER@ + PyObject_CallObject@Base @VER@ + PyObject_CheckReadBuffer@Base @VER@ + PyObject_ClearWeakRefs@Base @VER@ + PyObject_Cmp@Base @VER@ + PyObject_Compare@Base @VER@ + PyObject_CopyData@Base @VER@ + PyObject_DelItem@Base @VER@ + PyObject_DelItemString@Base @VER@ + PyObject_Dir@Base @VER@ + PyObject_Format@Base @VER@ + PyObject_Free@Base @VER@ + PyObject_GC_Del@Base @VER@ + PyObject_GC_Track@Base @VER@ + PyObject_GC_UnTrack@Base @VER@ + PyObject_GenericGetAttr@Base @VER@ + PyObject_GenericSetAttr@Base @VER@ + PyObject_GetAttr@Base @VER@ + PyObject_GetAttrString@Base @VER@ + PyObject_GetBuffer@Base @VER@ + PyObject_GetItem@Base @VER@ + PyObject_GetIter@Base @VER@ + PyObject_HasAttr@Base @VER@ + PyObject_HasAttrString@Base @VER@ + PyObject_Hash@Base @VER@ + PyObject_HashNotImplemented@Base @VER@ + PyObject_Init@Base @VER@ + PyObject_InitVar@Base @VER@ + PyObject_IsInstance@Base @VER@ + PyObject_IsSubclass@Base @VER@ + PyObject_IsTrue@Base @VER@ + PyObject_Length@Base @VER@ + PyObject_Malloc@Base @VER@ + PyObject_Not@Base @VER@ + PyObject_Print@Base @VER@ + PyObject_Realloc@Base @VER@ + PyObject_Repr@Base @VER@ + PyObject_RichCompare@Base @VER@ + PyObject_RichCompareBool@Base @VER@ + PyObject_SelfIter@Base @VER@ + PyObject_SetAttr@Base @VER@ + PyObject_SetAttrString@Base @VER@ + PyObject_SetItem@Base @VER@ + PyObject_Size@Base @VER@ + PyObject_Str@Base @VER@ + PyObject_Type@Base @VER@ + PyObject_Unicode@Base @VER@ + PyParser_ASTFromFile@Base @VER@ + PyParser_ASTFromString@Base @VER@ + PyParser_AddToken@Base @VER@ + PyParser_Delete@Base @VER@ + PyParser_New@Base @VER@ + PyParser_ParseFile@Base @VER@ + PyParser_ParseFileFlags@Base @VER@ + PyParser_ParseFileFlagsEx@Base @VER@ + PyParser_ParseString@Base @VER@ + PyParser_ParseStringFlags@Base @VER@ + PyParser_ParseStringFlagsFilename@Base @VER@ + PyParser_ParseStringFlagsFilenameEx@Base @VER@ + PyParser_SetError@Base @VER@ + PyParser_SimpleParseFile@Base @VER@ + PyParser_SimpleParseFileFlags@Base @VER@ + PyParser_SimpleParseString@Base @VER@ + PyParser_SimpleParseStringFilename@Base @VER@ + PyParser_SimpleParseStringFlags@Base @VER@ + PyParser_SimpleParseStringFlagsFilename@Base @VER@ + PyProperty_Type@Base @VER@ + PyRange_Type@Base @VER@ + (optional)PyRawIOBase_Type@Base @VER@ + PyReversed_Type@Base @VER@ + PyRun_AnyFile@Base @VER@ + PyRun_AnyFileEx@Base @VER@ + PyRun_AnyFileExFlags@Base @VER@ + PyRun_AnyFileFlags@Base @VER@ + PyRun_File@Base @VER@ + PyRun_FileEx@Base @VER@ + PyRun_FileExFlags@Base @VER@ + PyRun_FileFlags@Base @VER@ + PyRun_InteractiveLoop@Base @VER@ + PyRun_InteractiveLoopFlags@Base @VER@ + PyRun_InteractiveOne@Base @VER@ + PyRun_InteractiveOneFlags@Base @VER@ + PyRun_SimpleFile@Base @VER@ + PyRun_SimpleFileEx@Base @VER@ + PyRun_SimpleFileExFlags@Base @VER@ + PyRun_SimpleString@Base @VER@ + PyRun_SimpleStringFlags@Base @VER@ + PyRun_String@Base @VER@ + PyRun_StringFlags@Base @VER@ + PySTEntry_Type@Base @VER@ + PyST_GetScope@Base @VER@ + PySeqIter_New@Base @VER@ + PySeqIter_Type@Base @VER@ + PySequence_Check@Base @VER@ + PySequence_Concat@Base @VER@ + PySequence_Contains@Base @VER@ + PySequence_Count@Base @VER@ + PySequence_DelItem@Base @VER@ + PySequence_DelSlice@Base @VER@ + PySequence_Fast@Base @VER@ + PySequence_GetItem@Base @VER@ + PySequence_GetSlice@Base @VER@ + PySequence_In@Base @VER@ + PySequence_InPlaceConcat@Base @VER@ + PySequence_InPlaceRepeat@Base @VER@ + PySequence_Index@Base @VER@ + PySequence_Length@Base @VER@ + PySequence_List@Base @VER@ + PySequence_Repeat@Base @VER@ + PySequence_SetItem@Base @VER@ + PySequence_SetSlice@Base @VER@ + PySequence_Size@Base @VER@ + PySequence_Tuple@Base @VER@ + PySet_Add@Base @VER@ + PySet_Clear@Base @VER@ + PySet_Contains@Base @VER@ + PySet_Discard@Base @VER@ + PySet_Fini@Base @VER@ + PySet_New@Base @VER@ + PySet_Pop@Base @VER@ + PySet_Size@Base @VER@ + PySet_Type@Base @VER@ + PySignal_SetWakeupFd@Base @VER@ + PySlice_GetIndices@Base @VER@ + PySlice_GetIndicesEx@Base @VER@ + PySlice_New@Base @VER@ + PySlice_Type@Base @VER@ + PyStaticMethod_New@Base @VER@ + PyStaticMethod_Type@Base @VER@ + (optional)PyStringIO_Type@Base @VER@ + PyString_AsDecodedObject@Base @VER@ + PyString_AsDecodedString@Base @VER@ + PyString_AsEncodedObject@Base @VER@ + PyString_AsEncodedString@Base @VER@ + PyString_AsString@Base @VER@ + PyString_AsStringAndSize@Base @VER@ + PyString_Concat@Base @VER@ + PyString_ConcatAndDel@Base @VER@ + PyString_Decode@Base @VER@ + PyString_DecodeEscape@Base @VER@ + PyString_Encode@Base @VER@ + PyString_Fini@Base @VER@ + PyString_Format@Base @VER@ + PyString_FromFormat@Base @VER@ + PyString_FromFormatV@Base @VER@ + PyString_FromString@Base @VER@ + PyString_FromStringAndSize@Base @VER@ + PyString_InternFromString@Base @VER@ + PyString_InternImmortal@Base @VER@ + PyString_InternInPlace@Base @VER@ + PyString_Repr@Base @VER@ + PyString_Size@Base @VER@ + PyString_Type@Base @VER@ + PyStructSequence_InitType@Base @VER@ + PyStructSequence_New@Base @VER@ + PyStructSequence_UnnamedField@Base @VER@ + PySuper_Type@Base @VER@ + PySymtable_Build@Base @VER@ + PySymtable_Free@Base @VER@ + PySymtable_Lookup@Base @VER@ + PySys_AddWarnOption@Base @VER@ + PySys_GetFile@Base @VER@ + PySys_GetObject@Base @VER@ + PySys_HasWarnOptions@Base @VER@ + PySys_ResetWarnOptions@Base @VER@ + PySys_SetArgv@Base @VER@ + PySys_SetArgvEx@Base @VER@ + PySys_SetObject@Base @VER@ + PySys_SetPath@Base @VER@ + PySys_WriteStderr@Base @VER@ + PySys_WriteStdout@Base @VER@ + (optional)PyTextIOBase_Type@Base @VER@ + (optional)PyTextIOWrapper_Type@Base @VER@ + PyThreadState_Clear@Base @VER@ + PyThreadState_Delete@Base @VER@ + PyThreadState_DeleteCurrent@Base @VER@ + PyThreadState_Get@Base @VER@ + PyThreadState_GetDict@Base @VER@ + PyThreadState_New@Base @VER@ + PyThreadState_Next@Base @VER@ + PyThreadState_SetAsyncExc@Base @VER@ + PyThreadState_Swap@Base @VER@ + PyThread_ReInitTLS@Base @VER@ + PyThread_acquire_lock@Base @VER@ + PyThread_allocate_lock@Base @VER@ + PyThread_create_key@Base @VER@ + PyThread_delete_key@Base @VER@ + PyThread_delete_key_value@Base @VER@ + PyThread_exit_thread@Base @VER@ + PyThread_free_lock@Base @VER@ + PyThread_get_key_value@Base @VER@ + PyThread_get_stacksize@Base @VER@ + PyThread_get_thread_ident@Base @VER@ + PyThread_init_thread@Base @VER@ + PyThread_release_lock@Base @VER@ + PyThread_set_key_value@Base @VER@ + PyThread_set_stacksize@Base @VER@ + PyThread_start_new_thread@Base @VER@ + PyToken_OneChar@Base @VER@ + PyToken_ThreeChars@Base @VER@ + PyToken_TwoChars@Base @VER@ + PyTokenizer_Free@Base @VER@ + PyTokenizer_FromFile@Base @VER@ + PyTokenizer_FromString@Base @VER@ + PyTokenizer_Get@Base @VER@ + PyTokenizer_RestoreEncoding@Base @VER@ + PyTraceBack_Here@Base @VER@ + PyTraceBack_Print@Base @VER@ + PyTraceBack_Type@Base @VER@ + PyTupleIter_Type@Base @VER@ + PyTuple_ClearFreeList@Base @VER@ + PyTuple_Fini@Base @VER@ + PyTuple_GetItem@Base @VER@ + PyTuple_GetSlice@Base @VER@ + PyTuple_New@Base @VER@ + PyTuple_Pack@Base @VER@ + PyTuple_SetItem@Base @VER@ + PyTuple_Size@Base @VER@ + PyTuple_Type@Base @VER@ + PyType_ClearCache@Base @VER@ + PyType_GenericAlloc@Base @VER@ + PyType_GenericNew@Base @VER@ + PyType_IsSubtype@Base @VER@ + PyType_Modified@Base @VER@ + PyType_Ready@Base @VER@ + PyType_Type@Base @VER@ + PyUnicodeDecodeError_Create@Base @VER@ + PyUnicodeDecodeError_GetEncoding@Base @VER@ + PyUnicodeDecodeError_GetEnd@Base @VER@ + PyUnicodeDecodeError_GetObject@Base @VER@ + PyUnicodeDecodeError_GetReason@Base @VER@ + PyUnicodeDecodeError_GetStart@Base @VER@ + PyUnicodeDecodeError_SetEnd@Base @VER@ + PyUnicodeDecodeError_SetReason@Base @VER@ + PyUnicodeDecodeError_SetStart@Base @VER@ + PyUnicodeEncodeError_Create@Base @VER@ + PyUnicodeEncodeError_GetEncoding@Base @VER@ + PyUnicodeEncodeError_GetEnd@Base @VER@ + PyUnicodeEncodeError_GetObject@Base @VER@ + PyUnicodeEncodeError_GetReason@Base @VER@ + PyUnicodeEncodeError_GetStart@Base @VER@ + PyUnicodeEncodeError_SetEnd@Base @VER@ + PyUnicodeEncodeError_SetReason@Base @VER@ + PyUnicodeEncodeError_SetStart@Base @VER@ + PyUnicodeTranslateError_Create@Base @VER@ + PyUnicodeTranslateError_GetEnd@Base @VER@ + PyUnicodeTranslateError_GetObject@Base @VER@ + PyUnicodeTranslateError_GetReason@Base @VER@ + PyUnicodeTranslateError_GetStart@Base @VER@ + PyUnicodeTranslateError_SetEnd@Base @VER@ + PyUnicodeTranslateError_SetReason@Base @VER@ + PyUnicodeTranslateError_SetStart@Base @VER@ + PyUnicodeUCS4_AsASCIIString@Base @VER@ + PyUnicodeUCS4_AsCharmapString@Base @VER@ + PyUnicodeUCS4_AsEncodedObject@Base @VER@ + PyUnicodeUCS4_AsEncodedString@Base @VER@ + PyUnicodeUCS4_AsLatin1String@Base @VER@ + PyUnicodeUCS4_AsRawUnicodeEscapeString@Base @VER@ + PyUnicodeUCS4_AsUTF16String@Base @VER@ + PyUnicodeUCS4_AsUTF32String@Base @VER@ + PyUnicodeUCS4_AsUTF8String@Base @VER@ + PyUnicodeUCS4_AsUnicode@Base @VER@ + PyUnicodeUCS4_AsUnicodeEscapeString@Base @VER@ + PyUnicodeUCS4_AsWideChar@Base @VER@ + PyUnicodeUCS4_ClearFreelist@Base @VER@ + PyUnicodeUCS4_Compare@Base @VER@ + PyUnicodeUCS4_Concat@Base @VER@ + PyUnicodeUCS4_Contains@Base @VER@ + PyUnicodeUCS4_Count@Base @VER@ + PyUnicodeUCS4_Decode@Base @VER@ + PyUnicodeUCS4_DecodeASCII@Base @VER@ + PyUnicodeUCS4_DecodeCharmap@Base @VER@ + PyUnicodeUCS4_DecodeLatin1@Base @VER@ + PyUnicodeUCS4_DecodeRawUnicodeEscape@Base @VER@ + PyUnicodeUCS4_DecodeUTF16@Base @VER@ + PyUnicodeUCS4_DecodeUTF16Stateful@Base @VER@ + PyUnicodeUCS4_DecodeUTF32@Base @VER@ + PyUnicodeUCS4_DecodeUTF32Stateful@Base @VER@ + PyUnicodeUCS4_DecodeUTF8@Base @VER@ + PyUnicodeUCS4_DecodeUTF8Stateful@Base @VER@ + PyUnicodeUCS4_DecodeUnicodeEscape@Base @VER@ + PyUnicodeUCS4_Encode@Base @VER@ + PyUnicodeUCS4_EncodeASCII@Base @VER@ + PyUnicodeUCS4_EncodeCharmap@Base @VER@ + PyUnicodeUCS4_EncodeDecimal@Base @VER@ + PyUnicodeUCS4_EncodeLatin1@Base @VER@ + PyUnicodeUCS4_EncodeRawUnicodeEscape@Base @VER@ + PyUnicodeUCS4_EncodeUTF16@Base @VER@ + PyUnicodeUCS4_EncodeUTF32@Base @VER@ + PyUnicodeUCS4_EncodeUTF8@Base @VER@ + PyUnicodeUCS4_EncodeUnicodeEscape@Base @VER@ + PyUnicodeUCS4_Find@Base @VER@ + PyUnicodeUCS4_Format@Base @VER@ + PyUnicodeUCS4_FromEncodedObject@Base @VER@ + PyUnicodeUCS4_FromFormat@Base @VER@ + PyUnicodeUCS4_FromFormatV@Base @VER@ + PyUnicodeUCS4_FromObject@Base @VER@ + PyUnicodeUCS4_FromOrdinal@Base @VER@ + PyUnicodeUCS4_FromString@Base @VER@ + PyUnicodeUCS4_FromStringAndSize@Base @VER@ + PyUnicodeUCS4_FromUnicode@Base @VER@ + PyUnicodeUCS4_FromWideChar@Base @VER@ + PyUnicodeUCS4_GetDefaultEncoding@Base @VER@ + PyUnicodeUCS4_GetMax@Base @VER@ + PyUnicodeUCS4_GetSize@Base @VER@ + PyUnicodeUCS4_Join@Base @VER@ + PyUnicodeUCS4_Partition@Base @VER@ + PyUnicodeUCS4_RPartition@Base @VER@ + PyUnicodeUCS4_RSplit@Base @VER@ + PyUnicodeUCS4_Replace@Base @VER@ + PyUnicodeUCS4_Resize@Base @VER@ + PyUnicodeUCS4_RichCompare@Base @VER@ + PyUnicodeUCS4_SetDefaultEncoding@Base @VER@ + PyUnicodeUCS4_Split@Base @VER@ + PyUnicodeUCS4_Splitlines@Base @VER@ + PyUnicodeUCS4_Tailmatch@Base @VER@ + PyUnicodeUCS4_Translate@Base @VER@ + PyUnicodeUCS4_TranslateCharmap@Base @VER@ + PyUnicode_AsDecodedObject@Base @VER@ + PyUnicode_BuildEncodingMap@Base @VER@ + PyUnicode_DecodeUTF7@Base @VER@ + PyUnicode_DecodeUTF7Stateful@Base @VER@ + PyUnicode_EncodeUTF7@Base @VER@ + PyUnicode_Type@Base @VER@ + PyWeakref_GetObject@Base @VER@ + PyWeakref_NewProxy@Base @VER@ + PyWeakref_NewRef@Base @VER@ + PyWrapperDescr_Type@Base @VER@ + PyWrapper_New@Base @VER@ + Py_AddPendingCall@Base @VER@ + Py_AtExit@Base @VER@ + Py_BuildValue@Base @VER@ + Py_BytesWarningFlag@Base @VER@ + Py_CompileString@Base @VER@ + Py_CompileStringFlags@Base @VER@ + Py_DebugFlag@Base @VER@ + Py_DecRef@Base @VER@ + Py_DivisionWarningFlag@Base @VER@ + Py_DontWriteBytecodeFlag@Base @VER@ + Py_EndInterpreter@Base @VER@ + Py_Exit@Base @VER@ + Py_FatalError@Base @VER@ + Py_FdIsInteractive@Base @VER@ + Py_FileSystemDefaultEncoding@Base @VER@ + Py_Finalize@Base @VER@ + Py_FindMethod@Base @VER@ + Py_FindMethodInChain@Base @VER@ + Py_FlushLine@Base @VER@ + Py_FrozenFlag@Base @VER@ + Py_FrozenMain@Base @VER@ + Py_GetArgcArgv@Base @VER@ + Py_GetBuildInfo@Base @VER@ + Py_GetCompiler@Base @VER@ + Py_GetCopyright@Base @VER@ + Py_GetExecPrefix@Base @VER@ + Py_GetPath@Base @VER@ + Py_GetPlatform@Base @VER@ + Py_GetPrefix@Base @VER@ + Py_GetProgramFullPath@Base @VER@ + Py_GetProgramName@Base @VER@ + Py_GetPythonHome@Base @VER@ + Py_GetRecursionLimit@Base @VER@ + Py_GetVersion@Base @VER@ + Py_HashRandomizationFlag@Base @VER@ + Py_IgnoreEnvironmentFlag@Base @VER@ + Py_IncRef@Base @VER@ + Py_Initialize@Base @VER@ + Py_InitializeEx@Base @VER@ + Py_InspectFlag@Base @VER@ + Py_InteractiveFlag@Base @VER@ + Py_IsInitialized@Base @VER@ + Py_Main@Base @VER@ + Py_MakePendingCalls@Base @VER@ + Py_NewInterpreter@Base @VER@ + Py_NoSiteFlag@Base @VER@ + Py_NoUserSiteDirectory@Base @VER@ + Py_OptimizeFlag@Base @VER@ + Py_Py3kWarningFlag@Base @VER@ + Py_ReprEnter@Base @VER@ + Py_ReprLeave@Base @VER@ + Py_SetProgramName@Base @VER@ + Py_SetPythonHome@Base @VER@ + Py_SetRecursionLimit@Base @VER@ + Py_SubversionRevision@Base @VER@ + Py_SubversionShortBranch@Base @VER@ + Py_SymtableString@Base @VER@ + Py_TabcheckFlag@Base @VER@ + Py_UnicodeFlag@Base @VER@ + Py_UniversalNewlineFgets@Base @VER@ + Py_UniversalNewlineFread@Base @VER@ + Py_UseClassExceptionsFlag@Base @VER@ + Py_VaBuildValue@Base @VER@ + Py_VerboseFlag@Base @VER@ + Py_meta_grammar@Base @VER@ + Py_pgen@Base @VER@ + _PyArg_NoKeywords@Base @VER@ + _PyArg_ParseTupleAndKeywords_SizeT@Base @VER@ + _PyArg_ParseTuple_SizeT@Base @VER@ + _PyArg_Parse_SizeT@Base @VER@ + _PyArg_VaParseTupleAndKeywords_SizeT@Base @VER@ + _PyArg_VaParse_SizeT@Base @VER@ + _PyBuiltin_Init@Base @VER@ + _PyByteArray_empty_string@Base @VER@ + _PyBytes_FormatAdvanced@Base @VER@ + _PyCode_CheckLineNumber@Base @VER@ + _PyCodec_Lookup@Base @VER@ + _PyComplex_FormatAdvanced@Base @VER@ + _PyDict_Contains@Base @VER@ + _PyDict_MaybeUntrack@Base @VER@ + _PyDict_NewPresized@Base @VER@ + _PyDict_Next@Base @VER@ + _PyErr_BadInternalCall@Base @VER@ + _PyEval_CallTracing@Base @VER@ + _PyEval_SliceIndex@Base @VER@ + _PyExc_Fini@Base @VER@ + _PyExc_Init@Base @VER@ + (optional)_PyFileIO_closed@Base @VER@ + _PyFile_SanitizeMode@Base @VER@ + _PyFloat_FormatAdvanced@Base @VER@ + _PyFloat_Init@Base @VER@ + _PyFloat_Pack4@Base @VER@ + _PyFloat_Pack8@Base @VER@ + _PyFloat_Unpack4@Base @VER@ + _PyFloat_Unpack8@Base @VER@ + _PyFrame_Init@Base @VER@ + _PyGC_Dump@Base @VER@ + _PyGC_generation0@Base @VER@ + _PyGILState_Fini@Base @VER@ + _PyGILState_Init@Base @VER@ + (optional)_PyIOBase_check_closed@Base @VER@ + (optional)_PyIOBase_check_readable@Base @VER@ + (optional)_PyIOBase_check_seekable@Base @VER@ + (optional)_PyIOBase_check_writable@Base @VER@ + (optional)_PyIOBase_finalize@Base @VER@ + (optional)_PyIO_ConvertSsize_t@Base @VER@ + (optional)_PyIO_empty_bytes@Base @VER@ + (optional)_PyIO_empty_str@Base @VER@ + (optional)_PyIO_find_line_ending@Base @VER@ + (optional)_PyIO_locale_module@Base @VER@ + (optional)_PyIO_os_module@Base @VER@ + (optional)_PyIO_str_close@Base @VER@ + (optional)_PyIO_str_closed@Base @VER@ + (optional)_PyIO_str_decode@Base @VER@ + (optional)_PyIO_str_encode@Base @VER@ + (optional)_PyIO_str_fileno@Base @VER@ + (optional)_PyIO_str_flush@Base @VER@ + (optional)_PyIO_str_getstate@Base @VER@ + (optional)_PyIO_str_isatty@Base @VER@ + (optional)_PyIO_str_newlines@Base @VER@ + (optional)_PyIO_str_nl@Base @VER@ + (optional)_PyIO_str_read1@Base @VER@ + (optional)_PyIO_str_read@Base @VER@ + (optional)_PyIO_str_readable@Base @VER@ + (optional)_PyIO_str_readinto@Base @VER@ + (optional)_PyIO_str_readline@Base @VER@ + (optional)_PyIO_str_reset@Base @VER@ + (optional)_PyIO_str_seek@Base @VER@ + (optional)_PyIO_str_seekable@Base @VER@ + (optional)_PyIO_str_setstate@Base @VER@ + (optional)_PyIO_str_tell@Base @VER@ + (optional)_PyIO_str_truncate@Base @VER@ + (optional)_PyIO_str_writable@Base @VER@ + (optional)_PyIO_str_write@Base @VER@ + (optional)_PyIO_trap_eintr@Base @VER@ + (optional)_PyIO_unsupported_operation@Base @VER@ + (optional)_PyIO_zero@Base @VER@ + _PyImportHooks_Init@Base @VER@ + _PyImport_AcquireLock@Base @VER@ + _PyImport_DynLoadFiletab@Base @VER@ + _PyImport_Filetab@Base @VER@ + _PyImport_FindExtension@Base @VER@ + _PyImport_FindModule@Base @VER@ + _PyImport_Fini@Base @VER@ + _PyImport_FixupExtension@Base @VER@ + _PyImport_GetDynLoadFunc@Base @VER@ + _PyImport_Init@Base @VER@ + _PyImport_Inittab@Base @VER@ + _PyImport_IsScript@Base @VER@ + _PyImport_LoadDynamicModule@Base @VER@ + _PyImport_ReleaseLock@Base @VER@ + _PyImport_ReInitLock@Base @VER@ + (optional)_PyIncrementalNewlineDecoder_decode@Base @VER@ + _PyInstance_Lookup@Base @VER@ + _PyInt_AsInt@Base @VER@ + _PyInt_Format@Base @VER@ + _PyInt_FormatAdvanced@Base @VER@ + _PyInt_FromGid@Base @VER@ + _PyInt_FromUid@Base @VER@ + _PyInt_Init@Base @VER@ + _PyList_Extend@Base @VER@ + _PyLong_AsByteArray@Base @VER@ + _PyLong_AsInt@Base @VER@ + _PyLong_Copy@Base @VER@ + _PyLong_DigitValue@Base @VER@ + _PyLong_Format@Base @VER@ + _PyLong_FormatAdvanced@Base @VER@ + _PyLong_Frexp@Base @VER@ + _PyLong_FromByteArray@Base @VER@ + _PyLong_Init@Base @VER@ + _PyLong_New@Base @VER@ + _PyLong_NumBits@Base @VER@ + _PyLong_Sign@Base @VER@ + _PyModule_Clear@Base @VER@ + _PyNode_SizeOf@Base @VER@ + _PyNumber_ConvertIntegralToInt@Base @VER@ + _PyOS_GetOpt@Base @VER@ + _PyOS_ReadlineTState@Base @VER@ + _PyOS_ResetGetOpt@Base @VER@ + _PyOS_URandom@Base @VER@ + _PyOS_ascii_formatd@Base @VER@ + _PyOS_ascii_strtod@Base @VER@ + _PyOS_mystrnicmp_hack@Base @VER@ + _PyOS_optarg@Base @VER@ + _PyOS_opterr@Base @VER@ + _PyOS_optind@Base @VER@ + _PyObject_CallFunction_SizeT@Base @VER@ + _PyObject_CallMethod_SizeT@Base @VER@ + _PyObject_Del@Base @VER@ + _PyObject_Dump@Base @VER@ + _PyObject_GC_Del@Base @VER@ + _PyObject_GC_Malloc@Base @VER@ + _PyObject_GC_New@Base @VER@ + _PyObject_GC_NewVar@Base @VER@ + _PyObject_GC_Resize@Base @VER@ + _PyObject_GC_Track@Base @VER@ + _PyObject_GC_UnTrack@Base @VER@ + _PyObject_GenericGetAttrWithDict@Base @VER@ + _PyObject_GenericSetAttrWithDict@Base @VER@ + _PyObject_GetDictPtr@Base @VER@ + _PyObject_LengthHint@Base @VER@ + _PyObject_LookupSpecial@Base @VER@ + _PyObject_New@Base @VER@ + _PyObject_NewVar@Base @VER@ + _PyObject_NextNotImplemented@Base @VER@ + _PyObject_RealIsInstance@Base @VER@ + _PyObject_RealIsSubclass@Base @VER@ + _PyObject_SlotCompare@Base @VER@ + _PyObject_Str@Base @VER@ + _PyParser_Grammar@Base @VER@ + _PyParser_TokenNames@Base @VER@ + _PyRandom_Fini@Base @VER@ + _PyRandom_Init@Base @VER@ + _PySequence_IterSearch@Base @VER@ + _PySet_Next@Base @VER@ + _PySet_NextEntry@Base @VER@ + _PySet_Update@Base @VER@ + _PySlice_FromIndices@Base @VER@ + _PyString_Eq@Base @VER@ + _PyString_FormatLong@Base @VER@ + _PyString_InsertThousandsGrouping@Base @VER@ + _PyString_Join@Base @VER@ + _PyString_Resize@Base @VER@ + _PySys_GetSizeOf@Base @VER@ + _PySys_Init@Base @VER@ + _PyThreadState_Current@Base @VER@ + _PyThreadState_GetFrame@Base @VER@ + _PyThreadState_Init@Base @VER@ + _PyThreadState_Prealloc@Base @VER@ + _PyThread_CurrentFrames@Base @VER@ + _PyTime_DoubleToTimet@Base @VER@ + _PyTime_FloatTime@Base @VER@ + _PyTrash_delete_later@Base @VER@ + _PyTrash_delete_nesting@Base @VER@ + _PyTrash_deposit_object@Base @VER@ + _PyTrash_destroy_chain@Base @VER@ + _PyTrash_thread_deposit_object@Base @VER@ + _PyTrash_thread_destroy_chain@Base @VER@ + _PyTuple_MaybeUntrack@Base @VER@ + _PyTuple_Resize@Base @VER@ + _PyType_Lookup@Base @VER@ + _PyUnicodeUCS4_AsDefaultEncodedString@Base @VER@ + _PyUnicodeUCS4_Fini@Base @VER@ + _PyUnicodeUCS4_Init@Base @VER@ + _PyUnicodeUCS4_IsAlpha@Base @VER@ + _PyUnicodeUCS4_IsDecimalDigit@Base @VER@ + _PyUnicodeUCS4_IsDigit@Base @VER@ + _PyUnicodeUCS4_IsLinebreak@Base @VER@ + _PyUnicodeUCS4_IsLowercase@Base @VER@ + _PyUnicodeUCS4_IsNumeric@Base @VER@ + _PyUnicodeUCS4_IsTitlecase@Base @VER@ + _PyUnicodeUCS4_IsUppercase@Base @VER@ + _PyUnicodeUCS4_IsWhitespace@Base @VER@ + _PyUnicodeUCS4_ToDecimalDigit@Base @VER@ + _PyUnicodeUCS4_ToDigit@Base @VER@ + _PyUnicodeUCS4_ToLowercase@Base @VER@ + _PyUnicodeUCS4_ToNumeric@Base @VER@ + _PyUnicodeUCS4_ToTitlecase@Base @VER@ + _PyUnicodeUCS4_ToUppercase@Base @VER@ + _PyUnicode_BidirectionalNames@Base @VER@ + _PyUnicode_CategoryNames@Base @VER@ + _PyUnicode_Database_Records@Base @VER@ + _PyUnicode_DecodeUnicodeInternal@Base @VER@ + _PyUnicode_EastAsianWidthNames@Base @VER@ + _PyUnicode_FormatAdvanced@Base @VER@ + _PyUnicode_TypeRecords@Base @VER@ + _PyUnicode_XStrip@Base @VER@ + _PyWarnings_Init@Base @VER@ + _PyWeakref_CallableProxyType@Base @VER@ + _PyWeakref_ClearRef@Base @VER@ + _PyWeakref_GetWeakrefCount@Base @VER@ + _PyWeakref_ProxyType@Base @VER@ + _PyWeakref_RefType@Base @VER@ + _Py_Assert@Base @VER@ + _Py_Assign@Base @VER@ + _Py_Attribute@Base @VER@ + _Py_AugAssign@Base @VER@ + _Py_BinOp@Base @VER@ + _Py_BoolOp@Base @VER@ + _Py_Break@Base @VER@ + _Py_BuildValue_SizeT@Base @VER@ + _Py_Call@Base @VER@ + _Py_CheckInterval@Base @VER@ + _Py_CheckRecursionLimit@Base @VER@ + _Py_CheckRecursiveCall@Base @VER@ + _Py_ClassDef@Base @VER@ + _Py_Compare@Base @VER@ + _Py_Continue@Base @VER@ + _Py_Delete@Base @VER@ + _Py_Dict@Base @VER@ + _Py_DictComp@Base @VER@ + _Py_DisplaySourceLine@Base @VER@ + _Py_Ellipsis@Base @VER@ + _Py_EllipsisObject@Base @VER@ + _Py_ExceptHandler@Base @VER@ + _Py_Exec@Base @VER@ + _Py_Expr@Base @VER@ + _Py_Expression@Base @VER@ + _Py_ExtSlice@Base @VER@ + _Py_For@Base @VER@ + _Py_FunctionDef@Base @VER@ + _Py_GeneratorExp@Base @VER@ + _Py_Gid_Converter@Base @VER@ + _Py_Global@Base @VER@ + _Py_HashDouble@Base @VER@ + _Py_HashPointer@Base @VER@ + _Py_HashSecret@Base @VER@ + _Py_If@Base @VER@ + _Py_IfExp@Base @VER@ + _Py_Import@Base @VER@ + _Py_ImportFrom@Base @VER@ + _Py_Index@Base @VER@ + _Py_InsertThousandsGroupingLocale@Base @VER@ + _Py_Interactive@Base @VER@ + _Py_Lambda@Base @VER@ + _Py_List@Base @VER@ + _Py_ListComp@Base @VER@ + _Py_Mangle@Base @VER@ + _Py_Module@Base @VER@ + _Py_Name@Base @VER@ + _Py_NoneStruct@Base @VER@ + _Py_NotImplementedStruct@Base @VER@ + _Py_Num@Base @VER@ + _Py_PackageContext@Base @VER@ + _Py_Pass@Base @VER@ + _Py_Print@Base @VER@ + _Py_QnewFlag@Base @VER@ + _Py_Raise@Base @VER@ + _Py_ReadyTypes@Base @VER@ + _Py_ReleaseInternedStrings@Base @VER@ + _Py_Repr@Base @VER@ + _Py_Return@Base @VER@ + _Py_Set@Base @VER@ + _Py_SetComp@Base @VER@ + _Py_Slice@Base @VER@ + _Py_Str@Base @VER@ + _Py_Subscript@Base @VER@ + _Py_Suite@Base @VER@ + _Py_SwappedOp@Base @VER@ + _Py_Ticker@Base @VER@ + _Py_TrueStruct@Base @VER@ + _Py_TryExcept@Base @VER@ + _Py_TryFinally@Base @VER@ + _Py_Tuple@Base @VER@ + _Py_Uid_Converter@Base @VER@ + _Py_UnaryOp@Base @VER@ + _Py_VaBuildValue_SizeT@Base @VER@ + _Py_While@Base @VER@ + _Py_With@Base @VER@ + _Py_Yield@Base @VER@ + _Py_ZeroStruct@Base @VER@ + _Py_abstract_hack@Base @VER@ + _Py_add_one_to_index_C@Base @VER@ + _Py_add_one_to_index_F@Base @VER@ + (optional)_Py_acosh@Base @VER@ + _Py_addarc@Base @VER@ + _Py_addbit@Base @VER@ + _Py_adddfa@Base @VER@ + _Py_addfirstsets@Base @VER@ + _Py_addlabel@Base @VER@ + _Py_addstate@Base @VER@ + _Py_alias@Base @VER@ + _Py_arguments@Base @VER@ + _Py_ascii_whitespace@Base @VER@ + (optional)_Py_asinh@Base @VER@ + (optional)_Py_atanh@Base @VER@ + _Py_bytes_capitalize@Base @VER@ + _Py_bytes_isalnum@Base @VER@ + _Py_bytes_isalpha@Base @VER@ + _Py_bytes_isdigit@Base @VER@ + _Py_bytes_islower@Base @VER@ + _Py_bytes_isspace@Base @VER@ + _Py_bytes_istitle@Base @VER@ + _Py_bytes_isupper@Base @VER@ + _Py_bytes_lower@Base @VER@ + _Py_bytes_swapcase@Base @VER@ + _Py_bytes_title@Base @VER@ + _Py_bytes_upper@Base @VER@ + _Py_c_abs@Base @VER@ + _Py_c_diff@Base @VER@ + _Py_c_neg@Base @VER@ + _Py_c_pow@Base @VER@ + _Py_c_prod@Base @VER@ + _Py_c_quot@Base @VER@ + _Py_c_sum@Base @VER@ + _Py_capitalize__doc__@Base @VER@ + _Py_capsule_hack@Base @VER@ + _Py_cobject_hack@Base @VER@ + _Py_comprehension@Base @VER@ + _Py_ctype_table@Base @VER@ + _Py_ctype_tolower@Base @VER@ + _Py_ctype_toupper@Base @VER@ + _Py_delbitset@Base @VER@ + (arch=!m68k)_Py_dg_dtoa@Base @VER@ + (arch=!m68k)_Py_dg_freedtoa@Base @VER@ + (arch=!m68k)_Py_dg_strtod@Base @VER@ + _Py_double_round@Base @VER@ + (optional)_Py_expm1@Base @VER@ + _Py_findlabel@Base @VER@ + (arch=i386 lpia m68k)_Py_force_double@Base @VER@ + (arch=amd64 i386 lpia)_Py_get_387controlword@Base @VER@ + _Py_hgidentifier@Base 2.7.1 + _Py_hgversion@Base 2.7.1 + _Py_isalnum__doc__@Base @VER@ + _Py_isalpha__doc__@Base @VER@ + _Py_isdigit__doc__@Base @VER@ + _Py_islower__doc__@Base @VER@ + _Py_isspace__doc__@Base @VER@ + _Py_istitle__doc__@Base @VER@ + _Py_isupper__doc__@Base @VER@ + _Py_keyword@Base @VER@ + (optional)_Py_log1p@Base @VER@ + _Py_lower__doc__@Base @VER@ + _Py_mergebitset@Base @VER@ + _Py_meta_grammar@Base @VER@ + _Py_newbitset@Base @VER@ + _Py_newgrammar@Base @VER@ + (optional)_Py_parse_inf_or_nan@Base @VER@ + _Py_pgen@Base @VER@ + _Py_samebitset@Base @VER@ + (arch=amd64 i386 lpia)_Py_set_387controlword@Base @VER@ + _Py_svnversion@Base @VER@ + _Py_swapcase__doc__@Base @VER@ + _Py_title__doc__@Base @VER@ + _Py_translatelabels@Base @VER@ + _Py_upper__doc__@Base @VER@ + + PyFPE_counter@Base @VER@ + PyFPE_dummy@Base @VER@ + PyFPE_jbuf@Base @VER@ + + asdl_int_seq_new@Base @VER@ + asdl_seq_new@Base @VER@ + +# don't check for the following symbols, found in extensions +# which either can be built as builtin or extension. + + (optional)fast_save_leave@Base @VER@ + (optional)partial_reduce@Base @VER@ + (optional)partial_setstate@Base @VER@ + + (optional)md5_append@Base @VER@ + (optional)md5_finish@Base @VER@ + (optional)md5_init@Base @VER@ + +# _check_for_multiple_distdirs@Base @VER@ + (optional)init_ast@Base @VER@ + (optional)init_bisect@Base @VER@ + (optional)init_codecs@Base @VER@ + (optional)init_collections@Base @VER@ + (optional)init_functools@Base @VER@ + (optional)init_hashlib@Base @VER@ + (optional)init_heapq@Base @VER@ + (optional)init_io@Base @VER@ + (optional)init_locale@Base @VER@ + (optional)init_md5@Base @VER@ + (optional)init_random@Base @VER@ + (optional)init_sha@Base @VER@ + (optional)init_sha256@Base @VER@ + (optional)init_sha512@Base @VER@ + (optional)init_socket@Base @VER@ + (optional)init_sockobject@Base @VER@ + (optional)init_sre@Base @VER@ + (optional)init_ssl@Base @VER@ + (optional)init_struct@Base @VER@ + (optional)init_symtable@Base @VER@ + (optional)init_weakref@Base @VER@ + (optional)initarray@Base @VER@ + (optional)initbinascii@Base @VER@ + (optional)initcPickle@Base @VER@ + (optional)initcStringIO@Base @VER@ + (optional)initcmath@Base @VER@ + (optional)initerrno@Base @VER@ + (optional)initfcntl@Base @VER@ + (optional)initgc@Base @VER@ + (optional)initgrp@Base @VER@ + (optional)initimp@Base @VER@ + (optional)inititertools@Base @VER@ + (optional)initmath@Base @VER@ + (optional)initoperator@Base @VER@ + (optional)initposix@Base @VER@ + (optional)initpwd@Base @VER@ + (optional)initselect@Base @VER@ + (optional)initsignal@Base @VER@ + (optional)initspwd@Base @VER@ + (optional)initstrop@Base @VER@ + (optional)initsyslog@Base @VER@ + (optional)initthread@Base @VER@ + (optional)inittime@Base @VER@ + (optional)initunicodedata@Base @VER@ + (optional)initxxsubtype@Base @VER@ + (optional)initzipimport@Base @VER@ + (optional)initzlib@Base @VER@ --- python2.7-2.7.8.orig/debian/locale-gen +++ python2.7-2.7.8/debian/locale-gen @@ -0,0 +1,31 @@ +#!/bin/sh + +LOCPATH=`pwd`/locales +export LOCPATH + +[ -d $LOCPATH ] || mkdir -p $LOCPATH + +umask 022 + +echo "Generating locales..." +while read locale charset; do + case $locale in \#*) continue;; esac + [ -n "$locale" -a -n "$charset" ] || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`" + echo -n ".$charset" + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'` + echo -n '...' + if [ -f $LOCPATH/$locale ]; then + input=$locale + else + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'` + fi + localedef -i $input -c -f $charset $LOCPATH/$locale #-A /etc/locale.alias + echo ' done'; \ +done < +# elif defined(__x86_64__) && defined(__ILP32__) +# include +# elif defined(__i386__) +# include +# elif defined(__aarch64__) && defined(__AARCH64EL__) +# include +# elif defined(__alpha__) +# include +# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP) +# include +# elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP) +# include +# elif defined(__hppa__) +# include +# elif defined(__ia64__) +# include +# elif defined(__m68k__) && !defined(__mcoldfire__) +# include +# elif defined(__mips_hard_float) && defined(_MIPSEL) +# if _MIPS_SIM == _ABIO32 +# include +# elif _MIPS_SIM == _ABIN32 +# include +# elif _MIPS_SIM == _ABI64 +# include +# else +# error unknown multiarch location for @header@ +# endif +# elif defined(__mips_hard_float) +# if _MIPS_SIM == _ABIO32 +# include +# elif _MIPS_SIM == _ABIN32 +# include +# elif _MIPS_SIM == _ABI64 +# include +# else +# error unknown multiarch location for @header@ +# endif +# elif defined(__or1k__) +# include +# elif defined(__powerpc__) && defined(__SPE__) +# include +# elif defined(__powerpc64__) +# if defined(__LITTLE_ENDIAN__) +# include +# else +# include +# endif +# elif defined(__powerpc__) +# include +# elif defined(__s390x__) +# include +# elif defined(__s390__) +# include +# elif defined(__sh__) && defined(__LITTLE_ENDIAN__) +# include +# elif defined(__sparc__) && defined(__arch64__) +# include +# elif defined(__sparc__) +# include +# else +# error unknown multiarch location for @header@ +# endif +#elif defined(__FreeBSD_kernel__) +# if defined(__LP64__) +# include +# elif defined(__i386__) +# include +# else +# error unknown multiarch location for @header@ +# endif +#elif defined(__gnu_hurd__) +# include +#else +# error unknown multiarch location for @header@ +#endif --- python2.7-2.7.8.orig/debian/patches/add-python-config-sh.diff +++ python2.7-2.7.8/debian/patches/add-python-config-sh.diff @@ -0,0 +1,182 @@ +Index: b/Makefile.pre.in +=================================================================== +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1078,6 +1078,8 @@ python-config: $(srcdir)/Misc/python-con + # Substitution happens here, as the completely-expanded BINDIR + # is not available in configure + sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config ++ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} ++ sed -e "s,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g" < Misc/python-config.sh >python-config.sh + + # Install the include files + INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) +@@ -1137,6 +1139,7 @@ libainstall: all python-config + $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh + $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config + rm python-config ++ $(INSTALL_SCRIPT) python-config.sh $(DESTDIR)$(BINDIR)/python-config.sh + @if [ -s Modules/python.exp -a \ + "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ + echo; echo "Installing support files for building shared extension modules on AIX:"; \ +Index: b/Misc/python-config.in +=================================================================== +--- a/Misc/python-config.in ++++ b/Misc/python-config.in +@@ -56,3 +56,11 @@ for opt in opt_flags: + libs.extend(getvar('LINKFORSHARED').split()) + print ' '.join(libs) + ++ elif opt == '--extension-suffix': ++ print sysconfig.get_config_var('SO') ++ ++ elif opt == '--abiflags': ++ print '' ++ ++ elif opt == '--configdir': ++ print sysconfig.get_config_var('LIBPL') +Index: b/Misc/python-config.sh.in +=================================================================== +--- /dev/null ++++ b/Misc/python-config.sh.in +@@ -0,0 +1,103 @@ ++#!/bin/sh ++ ++exit_with_usage () ++{ ++ echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--configdir" ++ exit $1 ++} ++ ++if [ "$1" = "" ] ; then ++ exit_with_usage 1 ++fi ++ ++# Returns the actual prefix where this script was installed to. ++installed_prefix () ++{ ++ local RESULT=$(dirname $(cd $(dirname "$1") && pwd -P)) ++ if [ $(which readlink) ] ; then ++ RESULT=$(readlink -f "$RESULT") ++ fi ++ echo $RESULT ++} ++ ++prefix_build="@prefix@" ++prefix_real=$(installed_prefix "$0") ++ ++# Use sed to fix paths from their built to locations to their installed to locations. ++prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") ++exec_prefix_build="@exec_prefix@" ++exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") ++includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#") ++libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#") ++CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#") ++VERSION="@VERSION@" ++LIBM="@LIBM@" ++LIBC="@LIBC@" ++SYSLIBS="$LIBM $LIBC" ++ABIFLAGS="@DEBUG_EXT@" ++MULTIARCH="@MULTIARCH@" ++LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS" ++BASECFLAGS="@BASECFLAGS@" ++LDLIBRARY="@LDLIBRARY@" ++LINKFORSHARED="@LINKFORSHARED@" ++OPT="@OPT@" ++PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" ++LIBDEST=${prefix}/lib/python${VERSION} ++LIBPL=${LIBDEST}/config-${MULTIARCH}${ABIFLAGS} ++SO="${ABIFLAGS}.so" ++PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" ++INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" ++PLATINCDIR="-I$includedir/$MULTIARCH/python${VERSION}${ABIFLAGS}" ++ ++# Scan for --help or unknown argument. ++for ARG in $* ++do ++ case $ARG in ++ --help) ++ exit_with_usage 0 ++ ;; ++ --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--configdir) ++ ;; ++ *) ++ exit_with_usage 1 ++ ;; ++ esac ++done ++ ++for ARG in $* ++do ++ case $ARG in ++ --prefix) ++ echo "$prefix" ++ ;; ++ --exec-prefix) ++ echo "$exec_prefix" ++ ;; ++ --includes) ++ echo "$INCDIR" "$PLATINCDIR" ++ ;; ++ --cflags) ++ echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT" ++ ;; ++ --libs) ++ echo "$LIBS" ++ ;; ++ --ldflags) ++ LINKFORSHAREDUSED= ++ if [ -z "$PYTHONFRAMEWORK" ] ; then ++ LINKFORSHAREDUSED=$LINKFORSHARED ++ fi ++ LIBPLUSED= ++ if [ "$PY_ENABLE_SHARED" = "0" ] ; then ++ LIBPLUSED="-L$LIBPL" ++ fi ++ echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED" ++ ;; ++ --extension-suffix) ++ echo "$SO" ++ ;; ++ --configdir) ++ echo "$LIBPL" ++ ;; ++esac ++done +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -873,6 +873,7 @@ fi + + # Other platforms follow + if test $enable_shared = "yes"; then ++ PY_ENABLE_SHARED=1 + AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.]) + case $ac_sys_system in + BeOS*) +@@ -933,6 +934,7 @@ if test $enable_shared = "yes"; then + + esac + else # shared is disabled ++ PY_ENABLE_SHARED=0 + case $ac_sys_system in + CYGWIN*) + BLDLIBRARY='$(LIBRARY)' +@@ -940,6 +942,7 @@ else # shared is disabled + ;; + esac + fi ++AC_SUBST(PY_ENABLE_SHARED) + + if test "$cross_compiling" = yes; then + RUNSHARED= +@@ -4571,7 +4574,7 @@ done + AC_MSG_RESULT(done) + + # generate output files +-AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc) ++AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh) + AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) + AC_OUTPUT + --- python2.7-2.7.8.orig/debian/patches/atomic-pyc-rename.diff +++ python2.7-2.7.8/debian/patches/atomic-pyc-rename.diff @@ -0,0 +1,34 @@ +--- a/Lib/py_compile.py ++++ b/Lib/py_compile.py +@@ -120,13 +120,24 @@ + return + if cfile is None: + cfile = file + (__debug__ and 'c' or 'o') +- with open(cfile, 'wb') as fc: +- fc.write('\0\0\0\0') +- wr_long(fc, timestamp) +- marshal.dump(codeobject, fc) +- fc.flush() +- fc.seek(0, 0) +- fc.write(MAGIC) ++ # Atomically write the pyc/pyo file. Issue #13146. ++ # id() is used to generate a pseudo-random filename. ++ path_tmp = '{}.{}'.format(cfile, id(cfile)) ++ try: ++ with open(path_tmp, 'wb') as fc: ++ fc.write('\0\0\0\0') ++ wr_long(fc, timestamp) ++ marshal.dump(codeobject, fc) ++ fc.flush() ++ fc.seek(0, 0) ++ fc.write(MAGIC) ++ os.rename(path_tmp, cfile) ++ except OSError: ++ try: ++ os.unlink(path_tmp) ++ except OSError: ++ pass ++ raise + + def main(args=None): + """Compile several source files. --- python2.7-2.7.8.orig/debian/patches/bdist-wininst-notfound.diff +++ python2.7-2.7.8/debian/patches/bdist-wininst-notfound.diff @@ -0,0 +1,25 @@ +# DP: the wininst-* files cannot be built within Debian, needing a +# DP: zlib mingw build, which the zlib maintainer isn't going to provide. + +--- a/Lib/distutils/command/bdist_wininst.py ++++ b/Lib/distutils/command/bdist_wininst.py +@@ -14,6 +14,7 @@ + from distutils.core import Command + from distutils.dir_util import remove_tree + from distutils.errors import DistutilsOptionError, DistutilsPlatformError ++from distutils.errors import DistutilsFileError + from distutils import log + from distutils.util import get_platform + +@@ -360,7 +361,10 @@ + sfix = '' + + filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix)) +- f = open(filename, "rb") ++ try: ++ f = open(filename, "rb") ++ except IOError, msg: ++ raise DistutilsFileError, str(msg) + ', %s not included in the Debian packages.' % filename + try: + return f.read() + finally: --- python2.7-2.7.8.orig/debian/patches/bsddb-libpath.diff +++ python2.7-2.7.8/debian/patches/bsddb-libpath.diff @@ -0,0 +1,21 @@ +# DP: Don't add the bsddb multilib path, if already in the standard lib path + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -1070,7 +1070,13 @@ class PyBuildExt(build_ext): + if db_setup_debug: + print "bsddb using BerkeleyDB lib:", db_ver, dblib + print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir +- db_incs = [db_incdir] ++ # only add db_incdir/dblib_dir if not in the standard paths ++ if db_incdir in inc_dirs: ++ db_incs = [] ++ else: ++ db_incs = [db_incdir] ++ if dblib_dir[0] in lib_dirs: ++ dblib_dir = [] + dblibs = [dblib] + # We add the runtime_library_dirs argument because the + # BerkeleyDB lib we're linking against often isn't in the --- python2.7-2.7.8.orig/debian/patches/build-hash.diff +++ python2.7-2.7.8/debian/patches/build-hash.diff @@ -0,0 +1,24 @@ +# DP: Always build the _md5, _sha1, _sha256 and _sha512 extension modules. + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -854,7 +854,7 @@ class PyBuildExt(build_ext): + print ("warning: openssl 0x%08x is too old for _hashlib" % + openssl_ver) + missing.append('_hashlib') +- if COMPILED_WITH_PYDEBUG or not have_usable_openssl: ++ if True or COMPILED_WITH_PYDEBUG or not have_usable_openssl: + # The _sha module implements the SHA1 hash algorithm. + exts.append( Extension('_sha', ['shamodule.c']) ) + # The _md5 module implements the RSA Data Security, Inc. MD5 +@@ -865,7 +865,7 @@ class PyBuildExt(build_ext): + depends = ['md5.h']) ) + + min_sha2_openssl_ver = 0x00908000 +- if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver: ++ if True or COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver: + # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash + exts.append( Extension('_sha256', ['sha256module.c']) ) + exts.append( Extension('_sha512', ['sha512module.c']) ) --- python2.7-2.7.8.orig/debian/patches/build-libpython.diff +++ python2.7-2.7.8/debian/patches/build-libpython.diff @@ -0,0 +1,24 @@ +# DP: Don't include object files twice in libpython. + +Index: b/Makefile.pre.in +=================================================================== +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -404,7 +404,7 @@ LIBRARY_OBJS= \ + $(PYTHON_OBJS) \ + $(MODULE_OBJS) \ + $(SIGNAL_OBJS) \ +- $(MODOBJS) ++ $(sort $(MODOBJS)) + + ######################################################################### + # Rules +@@ -488,7 +488,7 @@ $(LIBRARY): $(LIBRARY_OBJS) + $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) + $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) + $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS) +- $(AR) $(ARFLAGS) $@ $(MODOBJS) ++ $(AR) $(ARFLAGS) $@ $(sort $(MODOBJS)) + $(RANLIB) $@ + + libpython$(VERSION).so: $(LIBRARY_OBJS) --- python2.7-2.7.8.orig/debian/patches/cthreads.diff +++ python2.7-2.7.8/debian/patches/cthreads.diff @@ -0,0 +1,39 @@ +# DP: Remove cthreads detection + +--- a/configure.ac ++++ b/configure.ac +@@ -2154,7 +2154,6 @@ + + # Templates for things AC_DEFINEd more than once. + # For a single AC_DEFINE, no template is needed. +-AH_TEMPLATE(C_THREADS,[Define if you have the Mach cthreads package]) + AH_TEMPLATE(_REENTRANT, + [Define to force use of thread-safe errno, h_errno, and other functions]) + AH_TEMPLATE(WITH_THREAD, +@@ -2236,17 +2235,6 @@ + AC_MSG_RESULT($unistd_defines_pthreads) + + AC_DEFINE(_REENTRANT) +- AC_CHECK_HEADER(cthreads.h, [AC_DEFINE(WITH_THREAD) +- AC_DEFINE(C_THREADS) +- AC_DEFINE(HURD_C_THREADS, 1, +- [Define if you are using Mach cthreads directly under /include]) +- LIBS="$LIBS -lthreads" +- THREADOBJ="Python/thread.o"],[ +- AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD) +- AC_DEFINE(C_THREADS) +- AC_DEFINE(MACH_C_THREADS, 1, +- [Define if you are using Mach cthreads under mach /]) +- THREADOBJ="Python/thread.o"],[ + AC_MSG_CHECKING(for --with-pth) + AC_ARG_WITH([pth], + AS_HELP_STRING([--with-pth], [use GNU pth threading libraries]), +@@ -2301,7 +2289,7 @@ + LIBS="$LIBS -lcma" + THREADOBJ="Python/thread.o"],[ + USE_THREAD_MODULE="#"]) +- ])])])])])])])])])]) ++ ])])])])])])])]) + + AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD) + LIBS="$LIBS -lmpc" --- python2.7-2.7.8.orig/debian/patches/ctypes-arm.diff +++ python2.7-2.7.8/debian/patches/ctypes-arm.diff @@ -0,0 +1,32 @@ +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -213,16 +213,27 @@ + + def _findSoname_ldconfig(name): + import struct ++ # XXX this code assumes that we know all unames and that a single ++ # ABI is supported per uname; instead we should find what the ++ # ABI is (e.g. check ABI of current process) or simply ask libc ++ # to load the library for us ++ uname = os.uname()[4] ++ # ARM has a variety of unames, e.g. armv7l ++ if uname.startswith("arm"): ++ uname = "arm" + if struct.calcsize('l') == 4: +- machine = os.uname()[4] + '-32' ++ machine = uname + '-32' + else: +- machine = os.uname()[4] + '-64' ++ machine = uname + '-64' + mach_map = { + 'x86_64-64': 'libc6,x86-64', + 'ppc64-64': 'libc6,64bit', + 'sparc64-64': 'libc6,64bit', + 's390x-64': 'libc6,64bit', + 'ia64-64': 'libc6,IA-64', ++ # this actually breaks on biarch or multiarch as the first ++ # library wins; uname doesn't tell us which ABI we're using ++ 'arm-32': 'libc6(,hard-float)?', + } + abi_type = mach_map.get(machine, 'libc6') + --- python2.7-2.7.8.orig/debian/patches/deb-locations.diff +++ python2.7-2.7.8/debian/patches/deb-locations.diff @@ -0,0 +1,63 @@ +# DP: adjust locations of directories to debian policy + +--- a/Demo/tkinter/guido/ManPage.py ++++ b/Demo/tkinter/guido/ManPage.py +@@ -189,8 +189,9 @@ + def test(): + import os + import sys +- # XXX This directory may be different on your system +- MANDIR = '/usr/local/man/mann' ++ # XXX This directory may be different on your system, ++ # it is here set for Debian GNU/Linux. ++ MANDIR = '/usr/share/man' + DEFAULTPAGE = 'Tcl' + formatted = 0 + if sys.argv[1:] and sys.argv[1] == '-f': +--- a/Demo/tkinter/guido/tkman.py ++++ b/Demo/tkinter/guido/tkman.py +@@ -9,8 +9,8 @@ + from Tkinter import * + from ManPage import ManPage + +-MANNDIRLIST = ['/depot/sundry/man/mann','/usr/local/man/mann'] +-MAN3DIRLIST = ['/depot/sundry/man/man3','/usr/local/man/man3'] ++MANNDIRLIST = ['/depot/sundry/man/mann','/usr/share/man/mann'] ++MAN3DIRLIST = ['/depot/sundry/man/man3','/usr/share/man/man3'] + + foundmanndir = 0 + for dir in MANNDIRLIST: +--- a/Misc/python.man ++++ b/Misc/python.man +@@ -338,7 +338,7 @@ + These are subject to difference depending on local installation + conventions; ${prefix} and ${exec_prefix} are installation-dependent + and should be interpreted as for GNU software; they may be the same. +-The default for both is \fI/usr/local\fP. ++On Debian GNU/{Hurd,Linux} the default for both is \fI/usr\fP. + .IP \fI${exec_prefix}/bin/python\fP + Recommended location of the interpreter. + .PP +--- a/Tools/faqwiz/faqconf.py ++++ b/Tools/faqwiz/faqconf.py +@@ -21,7 +21,7 @@ + OWNEREMAIL = "nobody@anywhere.org" # Email for feedback + HOMEURL = "http://www.python.org" # Related home page + HOMENAME = "Python home" # Name of related home page +-RCSBINDIR = "/usr/local/bin/" # Directory containing RCS commands ++RCSBINDIR = "/usr/bin/" # Directory containing RCS commands + # (must end in a slash) + + # Parameters you can normally leave alone +--- a/Tools/webchecker/webchecker.py ++++ b/Tools/webchecker/webchecker.py +@@ -19,7 +19,8 @@ + a directory listing is returned. Now, you can point webchecker to the + document tree in the local file system of your HTTP daemon, and have + most of it checked. In fact the default works this way if your local +-web tree is located at /usr/local/etc/httpd/htdpcs (the default for ++web tree is located at /var/www, which is the default for Debian ++GNU/Linux. Other systems use /usr/local/etc/httpd/htdocs (the default for + the NCSA HTTP daemon and probably others). + + Report printed: --- python2.7-2.7.8.orig/debian/patches/deb-setup.diff +++ python2.7-2.7.8/debian/patches/deb-setup.diff @@ -0,0 +1,21 @@ +# DP: Don't include /usr/local/include and /usr/local/lib as gcc search paths + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -438,10 +438,10 @@ class PyBuildExt(build_ext): + os.unlink(tmpfile) + + def detect_modules(self): +- # Ensure that /usr/local is always used +- if not cross_compiling: +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ # On Debian /usr/local is always used, so we don't include it twice ++ #if not cross_compiling: ++ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + if cross_compiling: + self.add_gcc_paths() + self.add_multiarch_paths() --- python2.7-2.7.8.orig/debian/patches/debug-build.diff +++ python2.7-2.7.8/debian/patches/debug-build.diff @@ -0,0 +1,248 @@ +# DP: Change the interpreter to build and install python extensions +# DP: built with the python-dbg interpreter with a different name into +# DP: the same path (by appending `_d' to the extension name). + +Index: b/Lib/distutils/command/build.py +=================================================================== +--- a/Lib/distutils/command/build.py ++++ b/Lib/distutils/command/build.py +@@ -91,7 +91,8 @@ class build(Command): + # 'lib.' under the base build directory. We only use one of + # them for a given distribution, though -- + if self.build_purelib is None: +- self.build_purelib = os.path.join(self.build_base, 'lib') ++ self.build_purelib = os.path.join(self.build_base, ++ 'lib' + plat_specifier) + if self.build_platlib is None: + self.build_platlib = os.path.join(self.build_base, + 'lib' + plat_specifier) +Index: b/Lib/distutils/sysconfig.py +=================================================================== +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -90,7 +90,7 @@ def get_python_inc(plat_specific=0, pref + # Include is located in the srcdir + inc_dir = os.path.join(srcdir, "Include") + return inc_dir +- return os.path.join(prefix, "include", "python" + get_python_version()) ++ return os.path.join(prefix, "include", "python" + get_python_version())+(sys.pydebug and "_d" or "") + elif os.name == "nt": + return os.path.join(prefix, "include") + elif os.name == "os2": +@@ -263,7 +263,7 @@ def get_makefile_filename(): + if python_build: + return os.path.join(project_base, "Makefile") + lib_dir = get_python_lib(plat_specific=1, standard_lib=1) +- return os.path.join(lib_dir, "config", "Makefile") ++ return os.path.join(lib_dir, "config"+(sys.pydebug and "_d" or ""), "Makefile") + + + def parse_config_h(fp, g=None): +Index: b/Lib/sysconfig.py +=================================================================== +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -333,7 +333,7 @@ def get_makefile_filename(): + """Return the path of the Makefile.""" + if _PYTHON_BUILD: + return os.path.join(_PROJECT_BASE, "Makefile") +- return os.path.join(get_path('platstdlib').replace("/usr/local","/usr",1), "config", "Makefile") ++ return os.path.join(get_path('platstdlib').replace("/usr/local","/usr",1), "config" + (sys.pydebug and "_d" or ""), "Makefile") + + # Issue #22199: retain undocumented private name for compatibility + _get_makefile_filename = get_makefile_filename +@@ -465,7 +465,7 @@ def get_config_h_filename(): + else: + inc_dir = _PROJECT_BASE + else: +- inc_dir = get_path('platinclude').replace("/usr/local","/usr",1) ++ inc_dir = get_path('platinclude').replace("/usr/local","/usr",1)+(sys.pydebug and "_d" or "") + return os.path.join(inc_dir, 'pyconfig.h') + + def get_scheme_names(): +Index: b/Makefile.pre.in +=================================================================== +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -117,8 +117,8 @@ SCRIPTDIR= $(prefix)/lib + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) + LIBDEST= $(SCRIPTDIR)/python$(VERSION) +-INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) +-CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) ++INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)$(DEBUG_EXT) ++CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)$(DEBUG_EXT) + LIBP= $(LIBDIR)/python$(VERSION) + + # Symbols used for using shared libraries +@@ -132,6 +132,8 @@ DESTSHARED= $(BINLIBDEST)/lib-dynload + EXE= @EXEEXT@ + BUILDEXE= @BUILDEXEEXT@ + ++DEBUG_EXT= @DEBUG_EXT@ ++ + # Short name and location for Mac OS X Python framework + UNIVERSALSDK=@UNIVERSALSDK@ + PYTHONFRAMEWORK= @PYTHONFRAMEWORK@ +@@ -491,7 +493,7 @@ $(LIBRARY): $(LIBRARY_OBJS) + $(AR) $(ARFLAGS) $@ $(sort $(MODOBJS)) + $(RANLIB) $@ + +-libpython$(VERSION).so: $(LIBRARY_OBJS) ++libpython$(VERSION)$(DEBUG_EXT).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ + $(BLDSHARED) $(PY_LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + $(LN) -f $(INSTSONAME) $@; \ +@@ -1089,8 +1091,8 @@ inclinstall: + $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h + + # Install the library and miscellaneous stuff needed for extending/embedding +-# This goes into $(exec_prefix) +-LIBPL= $(LIBP)/config ++# This goes into $(exec_prefix)$(DEBUG_EXT) ++LIBPL= $(LIBP)/config$(DEBUG_EXT) + + # pkgconfig directory + LIBPC= $(LIBDIR)/pkgconfig +Index: b/Misc/python-config.in +=================================================================== +--- a/Misc/python-config.in ++++ b/Misc/python-config.in +@@ -44,7 +44,7 @@ for opt in opt_flags: + print ' '.join(flags) + + elif opt in ('--libs', '--ldflags'): +- libs = ['-lpython' + pyver] ++ libs = ['-lpython' + pyver + (sys.pydebug and "_d" or "")] + libs += getvar('LIBS').split() + libs += getvar('SYSLIBS').split() + # add the prefix/lib/pythonX.Y/config dir, but only if there is no +Index: b/Python/dynload_shlib.c +=================================================================== +--- a/Python/dynload_shlib.c ++++ b/Python/dynload_shlib.c +@@ -46,6 +46,10 @@ const struct filedescr _PyImport_DynLoad + {"module.exe", "rb", C_EXTENSION}, + {"MODULE.EXE", "rb", C_EXTENSION}, + #else ++#ifdef Py_DEBUG ++ {"_d.so", "rb", C_EXTENSION}, ++ {"module_d.so", "rb", C_EXTENSION}, ++#endif + {".so", "rb", C_EXTENSION}, + {"module.so", "rb", C_EXTENSION}, + #endif +Index: b/Python/sysmodule.c +=================================================================== +--- a/Python/sysmodule.c ++++ b/Python/sysmodule.c +@@ -1519,6 +1519,12 @@ _PySys_Init(void) + PyString_FromString("legacy")); + #endif + ++#ifdef Py_DEBUG ++ PyDict_SetItemString(sysdict, "pydebug", Py_True); ++#else ++ PyDict_SetItemString(sysdict, "pydebug", Py_False); ++#endif ++ + #undef SET_SYS_FROM_STRING + if (PyErr_Occurred()) + return NULL; +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -740,7 +740,7 @@ AC_SUBST(LIBRARY) + AC_MSG_CHECKING(LIBRARY) + if test -z "$LIBRARY" + then +- LIBRARY='libpython$(VERSION).a' ++ LIBRARY='libpython$(VERSION)$(DEBUG_EXT).a' + fi + AC_MSG_RESULT($LIBRARY) + +@@ -886,8 +886,8 @@ if test $enable_shared = "yes"; then + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; + Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) +- LDLIBRARY='libpython$(VERSION).so' +- BLDLIBRARY='-L. -lpython$(VERSION)' ++ LDLIBRARY='libpython$(VERSION)$(DEBUG_EXT).so' ++ BLDLIBRARY='-L. -lpython$(VERSION)$(DEBUG_EXT)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + case $ac_sys_system in + FreeBSD*) +@@ -1030,6 +1030,12 @@ else AC_MSG_RESULT(no); Py_DEBUG='false' + fi], + [AC_MSG_RESULT(no)]) + ++if test "$Py_DEBUG" = 'true' ++then ++ DEBUG_EXT=_d ++fi ++AC_SUBST(DEBUG_EXT) ++ + # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be + # merged with this chunk of code? + +@@ -1919,7 +1925,7 @@ then + esac + ;; + CYGWIN*) SO=.dll;; +- *) SO=.so;; ++ *) SO=$DEBUG_EXT.so;; + esac + else + # this might also be a termcap variable, see #610332 +Index: b/Lib/distutils/tests/test_build_ext.py +=================================================================== +--- a/Lib/distutils/tests/test_build_ext.py ++++ b/Lib/distutils/tests/test_build_ext.py +@@ -287,8 +287,8 @@ class BuildExtTestCase(support.TempdirMa + finally: + os.chdir(old_wd) + self.assertTrue(os.path.exists(so_file)) +- self.assertEqual(os.path.splitext(so_file)[-1], +- sysconfig.get_config_var('SO')) ++ so_ext = sysconfig.get_config_var('SO') ++ self.assertEqual(so_file[len(so_file)-len(so_ext):], so_ext) + so_dir = os.path.dirname(so_file) + self.assertEqual(so_dir, other_tmp_dir) + cmd.compiler = None +@@ -296,8 +296,7 @@ class BuildExtTestCase(support.TempdirMa + cmd.run() + so_file = cmd.get_outputs()[0] + self.assertTrue(os.path.exists(so_file)) +- self.assertEqual(os.path.splitext(so_file)[-1], +- sysconfig.get_config_var('SO')) ++ self.assertEqual(so_file[len(so_file)-len(so_ext):], so_ext) + so_dir = os.path.dirname(so_file) + self.assertEqual(so_dir, cmd.build_lib) + +Index: b/Lib/distutils/tests/test_build.py +=================================================================== +--- a/Lib/distutils/tests/test_build.py ++++ b/Lib/distutils/tests/test_build.py +@@ -20,10 +20,6 @@ class BuildTestCase(support.TempdirManag + # if not specified, plat_name gets the current platform + self.assertEqual(cmd.plat_name, get_platform()) + +- # build_purelib is build + lib +- wanted = os.path.join(cmd.build_base, 'lib') +- self.assertEqual(cmd.build_purelib, wanted) +- + # build_platlib is 'build/lib.platform-x.x[-pydebug]' + # examples: + # build/lib.macosx-10.3-i386-2.7 +@@ -34,6 +30,10 @@ class BuildTestCase(support.TempdirManag + wanted = os.path.join(cmd.build_base, 'lib' + plat_spec) + self.assertEqual(cmd.build_platlib, wanted) + ++ # build_purelib is build + lib ++ wanted = os.path.join(cmd.build_base, 'lib' + plat_spec) ++ self.assertEqual(cmd.build_purelib, wanted) ++ + # by default, build_lib = build_purelib + self.assertEqual(cmd.build_lib, cmd.build_purelib) + --- python2.7-2.7.8.orig/debian/patches/disable-sem-check.diff +++ python2.7-2.7.8/debian/patches/disable-sem-check.diff @@ -0,0 +1,30 @@ +# DP: Assume working semaphores on Linux, don't rely on running kernel for the check. + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -3841,6 +3841,11 @@ int main(void) { + [ac_cv_posix_semaphores_enabled=no], + [ac_cv_posix_semaphores_enabled=yes]) + ) ++case $ac_sys_system in ++ Linux*) ++ # assume enabled, see https://launchpad.net/bugs/630511 ++ ac_cv_posix_semaphores_enabled=yes ++esac + AC_MSG_RESULT($ac_cv_posix_semaphores_enabled) + if test $ac_cv_posix_semaphores_enabled = no + then +@@ -3877,6 +3882,11 @@ int main(void){ + [ac_cv_broken_sem_getvalue=yes], + [ac_cv_broken_sem_getvalue=yes]) + ) ++case $ac_sys_system in ++ Linux*) ++ # assume enabled, see https://launchpad.net/bugs/630511 ++ ac_cv_broken_sem_getvalue=no ++esac + AC_MSG_RESULT($ac_cv_broken_sem_getvalue) + if test $ac_cv_broken_sem_getvalue = yes + then --- python2.7-2.7.8.orig/debian/patches/disable-utimes.diff +++ python2.7-2.7.8/debian/patches/disable-utimes.diff @@ -0,0 +1,13 @@ +# DP: disable check for utimes function, which is broken in glibc-2.3.2 + +--- a/configure.ac ++++ b/configure.ac +@@ -2698,7 +2698,7 @@ + setsid setpgid setpgrp setuid setvbuf snprintf \ + sigaction siginterrupt sigrelse strftime \ + sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \ +- truncate uname unsetenv utimes waitpid wait3 wait4 wcscoll _getpty) ++ truncate uname unsetenv waitpid wait3 wait4 wcscoll _getpty) + + # For some functions, having a definition is not sufficient, since + # we want to take their address. --- python2.7-2.7.8.orig/debian/patches/distutils-install-layout.diff +++ python2.7-2.7.8/debian/patches/distutils-install-layout.diff @@ -0,0 +1,406 @@ +# DP: distutils: Add an option --install-layout=deb, which +# DP: - installs into $prefix/dist-packages instead of $prefix/site-packages. +# DP: - doesn't encode the python version into the egg name. + +Index: b/Doc/install/index.rst +=================================================================== +--- a/Doc/install/index.rst ++++ b/Doc/install/index.rst +@@ -250,6 +250,8 @@ is pure Python or contains extensions (" + +-----------------+-----------------------------------------------------+--------------------------------------------------+-------+ + | Platform | Standard installation location | Default value | Notes | + +=================+=====================================================+==================================================+=======+ ++| Debian/Ubuntu | :file:`{prefix}/lib/python{X.Y}/dist-packages` | :file:`/usr/local/lib/python{X.Y}/dist-packages` | \(0) | +++-----------------+-----------------------------------------------------+--------------------------------------------------+-------+ + | Unix (pure) | :file:`{prefix}/lib/python{X.Y}/site-packages` | :file:`/usr/local/lib/python{X.Y}/site-packages` | \(1) | + +-----------------+-----------------------------------------------------+--------------------------------------------------+-------+ + | Unix (non-pure) | :file:`{exec-prefix}/lib/python{X.Y}/site-packages` | :file:`/usr/local/lib/python{X.Y}/site-packages` | \(1) | +@@ -259,6 +261,14 @@ is pure Python or contains extensions (" + + Notes: + ++(0) ++ Starting with Python-2.6 Debian/Ubuntu uses for the Python which comes within ++ the Linux distribution a non-default name for the installation directory. This ++ is to avoid overwriting of the python modules which come with the distribution, ++ which unfortunately is the upstream behaviour of the installation tools. The ++ non-default name in :file:`/usr/local` is used not to overwrite a local python ++ installation (defaulting to :file:`/usr/local`). ++ + (1) + Most Linux distributions include Python as a standard part of the system, so + :file:`{prefix}` and :file:`{exec-prefix}` are usually both :file:`/usr` on +@@ -443,6 +453,15 @@ them to go in :file:`/usr/local/lib/pyth + + /usr/bin/python setup.py install --prefix=/usr/local + ++Starting with Python-2.6 Debian/Ubuntu does use ++:file:`/usr/lib/python{X.Y}/dist-packages` and ++:file:`/usr/local/lib/python{X.Y}/dist-packages` for the installation ++of python modules included in the Linux distribution. To overwrite ++the name of the site directory, explicitely use the :option:`--prefix` ++option, however make sure that the installation path is included in ++``sys.path``. For packaging of python modules for Debian/Ubuntu, use ++the new ``setup.py install`` option :option:`--install-layout=deb`. ++ + Another possibility is a network filesystem where the name used to write to a + remote directory is different from the name used to read it: for example, the + Python interpreter accessed as :file:`/usr/local/bin/python` might search for +@@ -694,6 +713,17 @@ Add-on Python modules might then belong + import them, this directory must be added to ``sys.path``. There are several + different ways to add the directory. + ++On Debian/Ubuntu, starting with Python-2.6 the convention for system ++installed packages is to put then in the ++:file:`/usr/lib/python{X.Y}/dist-packages/` directory, and for locally ++installed packages is to put them in the ++:file:`/usr/lib/python{X.Y}/dist-packages/` directory. To share the ++locally installed packages for the system provided Python with the ++locally installed packages of a local python installation, make ++:file:`/usr/lib/python{X.Y}/dist-packages/` a symbolic link to the ++:file:`{...}/site-packages/` directory of your local python ++installation. ++ + The most convenient way is to add a path configuration file to a directory + that's already on Python's path, usually to the :file:`.../site-packages/` + directory. Path configuration files have an extension of :file:`.pth`, and each +Index: b/Lib/distutils/command/install.py +=================================================================== +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -47,6 +47,20 @@ INSTALL_SCHEMES = { + 'scripts': '$base/bin', + 'data' : '$base', + }, ++ 'unix_local': { ++ 'purelib': '$base/local/lib/python$py_version_short/dist-packages', ++ 'platlib': '$platbase/local/lib/python$py_version_short/dist-packages', ++ 'headers': '$base/local/include/python$py_version_short/$dist_name', ++ 'scripts': '$base/local/bin', ++ 'data' : '$base/local', ++ }, ++ 'deb_system': { ++ 'purelib': '$base/lib/python$py_version_short/dist-packages', ++ 'platlib': '$platbase/lib/python$py_version_short/dist-packages', ++ 'headers': '$base/include/python$py_version_short/$dist_name', ++ 'scripts': '$base/bin', ++ 'data' : '$base', ++ }, + 'unix_home': { + 'purelib': '$base/lib/python', + 'platlib': '$base/lib/python', +@@ -154,6 +168,9 @@ class install (Command): + + ('record=', None, + "filename in which to record list of installed files"), ++ ++ ('install-layout=', None, ++ "installation layout to choose (known values: deb, unix)"), + ] + + boolean_options = ['compile', 'force', 'skip-build', 'user'] +@@ -168,6 +185,7 @@ class install (Command): + self.exec_prefix = None + self.home = None + self.user = 0 ++ self.prefix_option = None + + # These select only the installation base; it's up to the user to + # specify the installation scheme (currently, that means supplying +@@ -189,6 +207,9 @@ class install (Command): + self.install_userbase = USER_BASE + self.install_usersite = USER_SITE + ++ # enable custom installation, known values: deb ++ self.install_layout = None ++ + self.compile = None + self.optimize = None + +@@ -421,6 +442,7 @@ class install (Command): + self.install_base = self.install_platbase = self.home + self.select_scheme("unix_home") + else: ++ self.prefix_option = self.prefix + if self.prefix is None: + if self.exec_prefix is not None: + raise DistutilsOptionError, \ +@@ -435,7 +457,23 @@ class install (Command): + + self.install_base = self.prefix + self.install_platbase = self.exec_prefix +- self.select_scheme("unix_prefix") ++ if self.install_layout: ++ if self.install_layout.lower() in ['deb']: ++ self.select_scheme("deb_system") ++ elif self.install_layout.lower() in ['posix', 'unix']: ++ self.select_scheme("unix_prefix") ++ else: ++ raise DistutilsOptionError( ++ "unknown value for --install-layout") ++ elif (self.prefix_option and os.path.normpath(self.prefix) != '/usr/local') \ ++ or 'PYTHONUSERBASE' in os.environ \ ++ or 'real_prefix' in sys.__dict__: ++ self.select_scheme("unix_prefix") ++ else: ++ if os.path.normpath(self.prefix) == '/usr/local': ++ self.select_scheme("deb_system") ++ else: ++ self.select_scheme("unix_local") + + # finalize_unix () + +Index: b/Lib/distutils/command/install_egg_info.py +=================================================================== +--- a/Lib/distutils/command/install_egg_info.py ++++ b/Lib/distutils/command/install_egg_info.py +@@ -14,18 +14,37 @@ class install_egg_info(Command): + description = "Install package's PKG-INFO metadata as an .egg-info file" + user_options = [ + ('install-dir=', 'd', "directory to install to"), ++ ('install-layout', None, "custom installation layout"), + ] + + def initialize_options(self): + self.install_dir = None ++ self.install_layout = None ++ self.prefix_option = None + + def finalize_options(self): + self.set_undefined_options('install_lib',('install_dir','install_dir')) +- basename = "%s-%s-py%s.egg-info" % ( +- to_filename(safe_name(self.distribution.get_name())), +- to_filename(safe_version(self.distribution.get_version())), +- sys.version[:3] +- ) ++ self.set_undefined_options('install',('install_layout','install_layout')) ++ self.set_undefined_options('install',('prefix_option','prefix_option')) ++ if self.install_layout: ++ basename = "%s-%s.egg-info" % ( ++ to_filename(safe_name(self.distribution.get_name())), ++ to_filename(safe_version(self.distribution.get_version())) ++ ) ++ if not self.install_layout.lower() in ['deb']: ++ raise DistutilsOptionError( ++ "unknown value for --install-layout") ++ elif self.prefix_option or 'real_prefix' in sys.__dict__: ++ basename = "%s-%s-py%s.egg-info" % ( ++ to_filename(safe_name(self.distribution.get_name())), ++ to_filename(safe_version(self.distribution.get_version())), ++ sys.version[:3] ++ ) ++ else: ++ basename = "%s-%s.egg-info" % ( ++ to_filename(safe_name(self.distribution.get_name())), ++ to_filename(safe_version(self.distribution.get_version())) ++ ) + self.target = os.path.join(self.install_dir, basename) + self.outputs = [self.target] + +Index: b/Lib/distutils/sysconfig.py +=================================================================== +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -115,6 +115,7 @@ def get_python_lib(plat_specific=0, stan + If 'prefix' is supplied, use it instead of sys.prefix or + sys.exec_prefix -- i.e., ignore 'plat_specific'. + """ ++ is_default_prefix = not prefix or os.path.normpath(prefix) in ('/usr', '/usr/local') + if prefix is None: + prefix = plat_specific and EXEC_PREFIX or PREFIX + +@@ -123,6 +124,8 @@ def get_python_lib(plat_specific=0, stan + "lib", "python" + get_python_version()) + if standard_lib: + return libpython ++ elif is_default_prefix and 'PYTHONUSERBASE' not in os.environ and 'real_prefix' not in sys.__dict__: ++ return os.path.join(libpython, "dist-packages") + else: + return os.path.join(libpython, "site-packages") + +Index: b/Lib/site.py +=================================================================== +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -273,6 +273,13 @@ def addusersitepackages(known_paths): + + if ENABLE_USER_SITE and os.path.isdir(user_site): + addsitedir(user_site, known_paths) ++ if ENABLE_USER_SITE: ++ for dist_libdir in ("local/lib", "lib"): ++ user_site = os.path.join(USER_BASE, dist_libdir, ++ "python" + sys.version[:3], ++ "dist-packages") ++ if os.path.isdir(user_site): ++ addsitedir(user_site, known_paths) + return known_paths + + def getsitepackages(): +Index: b/Lib/sysconfig.py +=================================================================== +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -16,6 +16,26 @@ _INSTALL_SCHEMES = { + 'scripts': '{base}/bin', + 'data': '{base}', + }, ++ 'posix_local': { ++ 'stdlib': '{base}/lib/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib/python{py_version_short}', ++ 'purelib': '{base}/local/lib/python{py_version_short}/dist-packages', ++ 'platlib': '{platbase}/local/lib/python{py_version_short}/dist-packages', ++ 'include': '{base}/local/include/python{py_version_short}', ++ 'platinclude': '{platbase}/local/include/python{py_version_short}', ++ 'scripts': '{base}/local/bin', ++ 'data': '{base}/local', ++ }, ++ 'deb_system': { ++ 'stdlib': '{base}/lib/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib/python{py_version_short}', ++ 'purelib': '{base}/lib/python{py_version_short}/dist-packages', ++ 'platlib': '{platbase}/lib/python{py_version_short}/dist-packages', ++ 'include': '{base}/include/python{py_version_short}', ++ 'platinclude': '{platbase}/include/python{py_version_short}', ++ 'scripts': '{base}/bin', ++ 'data': '{base}', ++ }, + 'posix_home': { + 'stdlib': '{base}/lib/python', + 'platstdlib': '{base}/lib/python', +@@ -129,7 +149,7 @@ def is_python_build(): + _PYTHON_BUILD = is_python_build() + + if _PYTHON_BUILD: +- for scheme in ('posix_prefix', 'posix_home'): ++ for scheme in ('posix_prefix', 'posix_local', 'deb_system', 'posix_home'): + _INSTALL_SCHEMES[scheme]['include'] = '{projectbase}/Include' + _INSTALL_SCHEMES[scheme]['platinclude'] = '{srcdir}' + +@@ -163,8 +183,11 @@ def _expand_vars(scheme, vars): + + def _get_default_scheme(): + if os.name == 'posix': +- # the default scheme for posix is posix_prefix +- return 'posix_prefix' ++ # the default scheme for posix on Debian/Ubuntu is posix_local ++ # FIXME: return dist-packages/posix_prefix only for ++ # is_default_prefix and 'PYTHONUSERBASE' not in os.environ and 'real_prefix' not in sys.__dict__ ++ # is_default_prefix = not prefix or os.path.normpath(prefix) in ('/usr', '/usr/local') ++ return 'posix_local' + return os.name + + def _getuserbase(): +@@ -310,7 +333,7 @@ def get_makefile_filename(): + """Return the path of the Makefile.""" + if _PYTHON_BUILD: + return os.path.join(_PROJECT_BASE, "Makefile") +- return os.path.join(get_path('platstdlib'), "config", "Makefile") ++ return os.path.join(get_path('platstdlib').replace("/usr/local","/usr",1), "config", "Makefile") + + # Issue #22199: retain undocumented private name for compatibility + _get_makefile_filename = get_makefile_filename +@@ -442,7 +465,7 @@ def get_config_h_filename(): + else: + inc_dir = _PROJECT_BASE + else: +- inc_dir = get_path('platinclude') ++ inc_dir = get_path('platinclude').replace("/usr/local","/usr",1) + return os.path.join(inc_dir, 'pyconfig.h') + + def get_scheme_names(): +Index: b/Lib/test/test_import.py +=================================================================== +--- a/Lib/test/test_import.py ++++ b/Lib/test/test_import.py +@@ -301,7 +301,7 @@ class ImportTests(unittest.TestCase): + with check_warnings(('', ImportWarning)): + # Just a random non-package directory we always expect to be + # somewhere in sys.path... +- self.assertRaises(ImportError, __import__, "site-packages") ++ self.assertRaises(ImportError, __import__, "dist-packages") + + def test_import_by_filename(self): + path = os.path.abspath(TESTFN) +Index: b/Lib/test/test_site.py +=================================================================== +--- a/Lib/test/test_site.py ++++ b/Lib/test/test_site.py +@@ -242,10 +242,13 @@ class HelperFunctionsTests(unittest.Test + elif os.sep == '/': + # OS X non-framwework builds, Linux, FreeBSD, etc + self.assertEqual(len(dirs), 2) +- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], +- 'site-packages') ++ wanted = os.path.join('xoxo', 'local', 'lib', ++ 'python' + sys.version[:3], ++ 'dist-packages') + self.assertEqual(dirs[0], wanted) +- wanted = os.path.join('xoxo', 'lib', 'site-python') ++ wanted = os.path.join('xoxo', 'lib', ++ 'python' + sys.version[:3], ++ 'dist-packages') + self.assertEqual(dirs[1], wanted) + else: + # other platforms +Index: b/Lib/test/test_sysconfig.py +=================================================================== +--- a/Lib/test/test_sysconfig.py ++++ b/Lib/test/test_sysconfig.py +@@ -239,8 +239,8 @@ class TestSysConfig(unittest.TestCase): + self.assertTrue(os.path.isfile(config_h), config_h) + + def test_get_scheme_names(self): +- wanted = ('nt', 'nt_user', 'os2', 'os2_home', 'osx_framework_user', +- 'posix_home', 'posix_prefix', 'posix_user') ++ wanted = ('deb_system', 'nt', 'nt_user', 'os2', 'os2_home', 'osx_framework_user', ++ 'posix_home', 'posix_local', 'posix_prefix', 'posix_user') + self.assertEqual(get_scheme_names(), wanted) + + @unittest.skipIf(sys.platform.startswith('win'), +Index: b/Lib/distutils/tests/test_install.py +=================================================================== +--- a/Lib/distutils/tests/test_install.py ++++ b/Lib/distutils/tests/test_install.py +@@ -193,7 +193,7 @@ class InstallTestCase(support.TempdirMan + + found = [os.path.basename(line) for line in content.splitlines()] + expected = ['hello.py', 'hello.pyc', 'sayhi', +- 'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]] ++ 'UNKNOWN-0.0.0.egg-info'] + self.assertEqual(found, expected) + + def test_record_extensions(self): +@@ -223,7 +223,7 @@ class InstallTestCase(support.TempdirMan + + found = [os.path.basename(line) for line in content.splitlines()] + expected = [_make_ext_name('xx'), +- 'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]] ++ 'UNKNOWN-0.0.0.egg-info'] + self.assertEqual(found, expected) + + def test_debug_mode(self): +Index: b/Lib/distutils/tests/test_bdist_dumb.py +=================================================================== +--- a/Lib/distutils/tests/test_bdist_dumb.py ++++ b/Lib/distutils/tests/test_bdist_dumb.py +@@ -87,7 +87,7 @@ class BuildDumbTestCase(support.TempdirM + fp.close() + + contents = sorted(os.path.basename(fn) for fn in contents) +- wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2], 'foo.py'] ++ wanted = ['foo-0.1.egg-info', 'foo.py'] + if not sys.dont_write_bytecode: + wanted.append('foo.pyc') + self.assertEqual(contents, sorted(wanted)) +Index: b/Lib/pydoc.py +=================================================================== +--- a/Lib/pydoc.py ++++ b/Lib/pydoc.py +@@ -390,6 +390,7 @@ class Doc: + 'marshal', 'posix', 'signal', 'sys', + 'thread', 'zipimport') or + (file.startswith(basedir) and ++ not file.startswith(os.path.join(basedir, 'dist-packages')) and + not file.startswith(os.path.join(basedir, 'site-packages')))) and + object.__name__ not in ('xml.etree', 'test.pydoc_mod')): + if docloc.startswith("http://"): --- python2.7-2.7.8.orig/debian/patches/distutils-link.diff +++ python2.7-2.7.8/debian/patches/distutils-link.diff @@ -0,0 +1,18 @@ +# DP: Don't add standard library dirs to library_dirs and runtime_library_dirs. + +--- a/Lib/distutils/unixccompiler.py ++++ b/Lib/distutils/unixccompiler.py +@@ -155,7 +155,12 @@ + objects, output_dir = self._fix_object_args(objects, output_dir) + libraries, library_dirs, runtime_library_dirs = \ + self._fix_lib_args(libraries, library_dirs, runtime_library_dirs) +- ++ # filter out standard library paths, which are not explicitely needed ++ # for linking ++ library_dirs = [dir for dir in library_dirs ++ if not dir in ('/lib', '/lib64', '/usr/lib', '/usr/lib64')] ++ runtime_library_dirs = [dir for dir in runtime_library_dirs ++ if not dir in ('/lib', '/lib64', '/usr/lib', '/usr/lib64')] + lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs, + libraries) + if type(output_dir) not in (StringType, NoneType): --- python2.7-2.7.8.orig/debian/patches/distutils-sysconfig.diff +++ python2.7-2.7.8/debian/patches/distutils-sysconfig.diff @@ -0,0 +1,53 @@ +# DP: Allow setting BASECFLAGS, OPT and EXTRA_LDFLAGS (like, CC, CXX, CPP, +# DP: CFLAGS, CPPFLAGS, CCSHARED, LDSHARED) from the environment. + +Index: b/Lib/distutils/sysconfig.py +=================================================================== +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -174,10 +174,12 @@ def customize_compiler(compiler): + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' + +- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SO', 'AR', +- 'ARFLAGS') ++ (cc, cxx, opt, cflags, extra_cflags, basecflags, ++ ccshared, ldshared, so_ext, ar, ar_flags, ++ configure_cppflags, configure_cflags, configure_ldflags) = \ ++ get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', 'EXTRA_CFLAGS', 'BASECFLAGS', ++ 'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS', ++ 'CONFIGURE_CPPFLAGS', 'CONFIGURE_CFLAGS', 'CONFIGURE_LDFLAGS') + + if 'CC' in os.environ: + newcc = os.environ['CC'] +@@ -198,13 +200,27 @@ def customize_compiler(compiler): + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ elif configure_ldflags: ++ ldshared = ldshared + ' ' + configure_ldflags ++ if 'BASECFLAGS' in os.environ: ++ basecflags = os.environ['BASECFLAGS'] ++ if 'OPT' in os.environ: ++ opt = os.environ['OPT'] ++ cflags = ' '.join(str(x) for x in (basecflags, opt, extra_cflags) if x) + if 'CFLAGS' in os.environ: +- cflags = opt + ' ' + os.environ['CFLAGS'] ++ cflags = ' '.join(str(x) for x in (opt, basecflags, os.environ['CFLAGS'], extra_cflags) if x) + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ elif configure_cflags: ++ cflags = ' '.join(str(x) for x in (opt, basecflags, configure_cflags, extra_cflags) if x) ++ ldshared = ldshared + ' ' + configure_cflags + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ elif configure_cppflags: ++ cpp = cpp + ' ' + configure_cppflags ++ cflags = cflags + ' ' + configure_cppflags ++ ldshared = ldshared + ' ' + configure_cppflags + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: --- python2.7-2.7.8.orig/debian/patches/do-not-italicize-punctuation.patch +++ python2.7-2.7.8/debian/patches/do-not-italicize-punctuation.patch @@ -0,0 +1,49 @@ +--- a/Misc/python.man ++++ b/Misc/python.man +@@ -290,9 +290,9 @@ + from that file; + when called with + .B \-c +-.I command, ++.IR command , + it executes the Python statement(s) given as +-.I command. ++.IR command . + Here + .I command + may contain multiple statements separated by newlines. +@@ -302,7 +302,7 @@ + .PP + If available, the script name and additional arguments thereafter are + passed to the script in the Python variable +-.I sys.argv , ++.IR sys.argv , + which is a list of strings (you must first + .I import sys + to be able to access it). +@@ -316,14 +316,14 @@ + .I '-c'. + Note that options interpreted by the Python interpreter itself + are not placed in +-.I sys.argv. ++.IR sys.argv . + .PP + In interactive mode, the primary prompt is `>>>'; the second prompt + (which appears when a command is not complete) is `...'. + The prompts can be changed by assignment to + .I sys.ps1 + or +-.I sys.ps2. ++.IR sys.ps2 . + The interpreter quits when it reads an EOF at a prompt. + When an unhandled exception occurs, a stack trace is printed and + control returns to the primary prompt; in non-interactive mode, the +@@ -382,7 +382,7 @@ + inserted in the path in front of $PYTHONPATH. + The search path can be manipulated from within a Python program as the + variable +-.I sys.path . ++.IR sys.path . + .IP PYTHONSTARTUP + If this is the name of a readable file, the Python commands in that + file are executed before the first prompt is displayed in interactive --- python2.7-2.7.8.orig/debian/patches/doc-nodownload.diff +++ python2.7-2.7.8/debian/patches/doc-nodownload.diff @@ -0,0 +1,13 @@ +# DP: Don't try to download documentation tools + +--- a/Doc/Makefile ++++ b/Doc/Makefile +@@ -57,7 +57,7 @@ + + update: clean checkout + +-build: checkout ++build: + mkdir -p build/$(BUILDER) build/doctrees + $(PYTHON) tools/sphinx-build.py $(ALLSPHINXOPTS) + @echo --- python2.7-2.7.8.orig/debian/patches/enable-fpectl.diff +++ python2.7-2.7.8/debian/patches/enable-fpectl.diff @@ -0,0 +1,16 @@ +# DP: Enable the build of the fpectl module. + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -1379,6 +1379,9 @@ class PyBuildExt(build_ext): + else: + missing.append('_curses_panel') + ++ #fpectl fpectlmodule.c ... ++ exts.append( Extension('fpectl', ['fpectlmodule.c']) ) ++ + # Andrew Kuchling's zlib module. Note that some versions of zlib + # 1.1.3 have security problems. See CERT Advisory CA-2002-07: + # http://www.cert.org/advisories/CA-2002-07.html --- python2.7-2.7.8.orig/debian/patches/enable-sqlite-loadext.diff +++ python2.7-2.7.8/debian/patches/enable-sqlite-loadext.diff @@ -0,0 +1,15 @@ +# DP: Allow loading of extensions in the sqlite module + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -1180,7 +1180,7 @@ class PyBuildExt(build_ext): + sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"')) + + # Comment this out if you want the sqlite3 module to be able to load extensions. +- sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1")) ++ # sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1")) + + if host_platform == 'darwin': + # In every directory on the search path search for a dynamic --- python2.7-2.7.8.orig/debian/patches/ensurepip-disabled.diff +++ python2.7-2.7.8/debian/patches/ensurepip-disabled.diff @@ -0,0 +1,42 @@ +# DP: Disable ensurepip in Debian for now. + +--- a/Lib/ensurepip/__init__.py ++++ b/Lib/ensurepip/__init__.py +@@ -12,6 +12,21 @@ + + __all__ = ["version", "bootstrap"] + ++def _ensurepip_is_disabled_in_debian(): ++ if True: ++ print ('''\ ++ensurepip is disabled in Debian/Ubuntu for the system python. ++ ++Python modules For the system python are usually handled by dpkg and apt-get. ++ ++ apt-get install python- ++ ++Install the python-pip package to use pip itself. Using pip together ++with the system python might have unexpected results for any system installed ++module, so use it on your own risk, or make sure to only use it in virtual ++environments. ++''') ++ sys.exit(1) + + # pip currently requires ssl support, so we try to provide a nicer + # error message when that is missing (http://bugs.python.org/issue19744) +@@ -47,6 +62,7 @@ + """ + Returns a string specifying the bundled version of pip. + """ ++ _ensurepip_is_disabled_in_debian() + whl_name = 'pip' + wheel_names = glob.glob('/usr/share/python-wheels/%s-*.whl' % whl_name) + if len(wheel_names) == 1: +@@ -75,6 +91,7 @@ + + Note that calling this function will alter both sys.path and os.environ. + """ ++ _ensurepip_is_disabled_in_debian() + if altinstall and default_pip: + raise ValueError("Cannot use altinstall and default_pip together") + --- python2.7-2.7.8.orig/debian/patches/ensurepip-wheels.diff +++ python2.7-2.7.8/debian/patches/ensurepip-wheels.diff @@ -0,0 +1,148 @@ +# DP: Let ensurepip use the system wheels, not the ones from the python source. + +Index: b/Lib/ensurepip/__init__.py +=================================================================== +--- a/Lib/ensurepip/__init__.py ++++ b/Lib/ensurepip/__init__.py +@@ -1,6 +1,7 @@ + #!/usr/bin/env python2 + from __future__ import print_function + ++import glob + import os + import os.path + import pkgutil +@@ -12,13 +13,9 @@ import tempfile + __all__ = ["version", "bootstrap"] + + +-_SETUPTOOLS_VERSION = "7.0" +- +-_PIP_VERSION = "1.5.6" +- + # pip currently requires ssl support, so we try to provide a nicer + # error message when that is missing (http://bugs.python.org/issue19744) +-_MISSING_SSL_MESSAGE = ("pip {} requires SSL/TLS".format(_PIP_VERSION)) ++_MISSING_SSL_MESSAGE = ("pip requires SSL/TLS") + try: + import ssl + except ImportError: +@@ -31,8 +28,8 @@ else: + pass + + _PROJECTS = [ +- ("setuptools", _SETUPTOOLS_VERSION), +- ("pip", _PIP_VERSION), ++ "setuptools", ++ "pip", + ] + + +@@ -50,7 +47,11 @@ def version(): + """ + Returns a string specifying the bundled version of pip. + """ +- return _PIP_VERSION ++ whl_name = 'pip' ++ wheel_names = glob.glob('/usr/share/python-wheels/%s-*.whl' % whl_name) ++ if len(wheel_names) == 1: ++ return os.path.basename(wheel_names[0]).split('-')[1] ++ raise RuntimeError('missing dependency wheel %s. Installation of the python-%s-whl package is needed to use ensurepip.' % (whl_name, whl_name)) + + + def _disable_pip_configuration_settings(): +@@ -93,21 +94,56 @@ def bootstrap(root=None, upgrade=False, + # omit pip and easy_install + os.environ["ENSUREPIP_OPTIONS"] = "install" + ++ # Debian: The bundled wheels are useless to us because we must use ones ++ # crafted from source code in the archive. As we build the virtual ++ # environment, copy the wheels from the system location into the virtual ++ # environment, and place those wheels on sys.path. ++ def copy_wheels(wheels, destdir, paths): ++ for project in wheels: ++ wheel_names = glob.glob( ++ '/usr/share/python-wheels/{}-*.whl'.format(project)) ++ if len(wheel_names) == 0: ++ raise RuntimeError('missing dependency wheel %s. Installation of the python-%s-whl package is needed to use ensurepip.' % (project, project)) ++ assert len(wheel_names) == 1, wheel_names ++ wheel_name = os.path.basename(wheel_names[0]) ++ path = os.path.join('/usr/share/python-wheels', wheel_name) ++ with open(path, 'rb') as fp: ++ whl = fp.read() ++ dest = os.path.join(destdir, wheel_name) ++ with open(dest, 'wb') as fp: ++ fp.write(whl) ++ paths.append(dest) ++ ++ # check that the python-{pip,setuptools}-whl packages are installed ++ missing = [] ++ for project in reversed(_PROJECTS): ++ wheel_names = glob.glob('/usr/share/python-wheels/%s-*.whl' % project) ++ if len(wheel_names) != 1: ++ missing.append(project) ++ if missing: ++ raise RuntimeError('missing wheel(s) %s. Installation of the %s package(s) is needed to use ensurepip.' \ ++ % (', '.join([missing]), ++ ', '.join(['python-%s-whl' % m for m in missing])) \ ++ ) ++ ++ # FIXME: this shouldn't be created by ensurepip ++ private_wheel_dir = os.path.join(sys.prefix, 'lib', 'python-wheels') ++ if not os.path.exists(private_wheel_dir): ++ os.makedirs(private_wheel_dir) ++ for project in _PROJECTS: ++ try: ++ with open('/usr/share/python-wheels/%s.dependencies' % project) as fp: ++ dependencies = [line[:-1].split()[0] for line in fp.readlines()] ++ except IOError: ++ dependencies = [] ++ copy_wheels(dependencies, private_wheel_dir, sys.path) ++ + tmpdir = tempfile.mkdtemp() + try: + # Put our bundled wheels into a temporary directory and construct the + # additional paths that need added to sys.path + additional_paths = [] +- for project, version in _PROJECTS: +- wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) +- whl = pkgutil.get_data( +- "ensurepip", +- "_bundled/{}".format(wheel_name), +- ) +- with open(os.path.join(tmpdir, wheel_name), "wb") as fp: +- fp.write(whl) +- +- additional_paths.append(os.path.join(tmpdir, wheel_name)) ++ copy_wheels(_PROJECTS, tmpdir, additional_paths) + + # Construct the arguments to be passed to the pip command + args = ["install", "--no-index", "--find-links", tmpdir] +@@ -120,7 +156,7 @@ def bootstrap(root=None, upgrade=False, + if verbosity: + args += ["-" + "v" * verbosity] + +- _run_pip(args + [p[0] for p in _PROJECTS], additional_paths) ++ _run_pip(args + _PROJECTS, additional_paths) + finally: + shutil.rmtree(tmpdir, ignore_errors=True) + +@@ -137,7 +173,8 @@ def _uninstall_helper(verbosity=0): + return + + # If the pip version doesn't match the bundled one, leave it alone +- if pip.__version__ != _PIP_VERSION: ++ # Disabled for Debian, always using the version from the python3-pip package. ++ if False and pip.__version__ != _PIP_VERSION: + msg = ("ensurepip will only uninstall a matching version " + "({!r} installed, {!r} bundled)") + print(msg.format(pip.__version__, _PIP_VERSION), file=sys.stderr) +@@ -151,7 +188,7 @@ def _uninstall_helper(verbosity=0): + if verbosity: + args += ["-" + "v" * verbosity] + +- _run_pip(args + [p[0] for p in reversed(_PROJECTS)]) ++ _run_pip(args + reversed(_PROJECTS)) + + + def _main(argv=None): --- python2.7-2.7.8.orig/debian/patches/ext-no-libpython-link.diff +++ python2.7-2.7.8/debian/patches/ext-no-libpython-link.diff @@ -0,0 +1,24 @@ +# DP: Don't link extensions with the shared libpython library. + +Index: b/Lib/distutils/command/build_ext.py +=================================================================== +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -234,7 +234,7 @@ class build_ext (Command): + # For building extensions with a shared Python library, + # Python's library directory must be appended to library_dirs + # See Issues: #1600860, #4366 +- if (sysconfig.get_config_var('Py_ENABLE_SHARED')): ++ if False and (sysconfig.get_config_var('Py_ENABLE_SHARED')): + if not sysconfig.python_build: + # building third party extensions + self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) +@@ -755,7 +755,7 @@ class build_ext (Command): + return ext.libraries + else: + from distutils import sysconfig +- if sysconfig.get_config_var('Py_ENABLE_SHARED'): ++ if False and sysconfig.get_config_var('Py_ENABLE_SHARED'): + template = "python%d.%d" + pythonlib = (template % + (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff)) --- python2.7-2.7.8.orig/debian/patches/hg-updates.diff +++ python2.7-2.7.8/debian/patches/hg-updates.diff @@ -0,0 +1,119906 @@ +# DP: hg updates of the 2.7 release branch (until 2014-11-18). + +# hg diff -r v2.7.8 | filterdiff --exclude=.*ignore --exclude=.hg* --remove-timestamps + +diff -r ee879c0ffa11 Demo/turtle/demohelp.txt +--- a/Demo/turtle/demohelp.txt ++++ b/Demo/turtle/demohelp.txt +@@ -15,7 +15,7 @@ + (1) How to use the demo viewer. + + Select a demoscript from the example menu. +- The (syntax coloured) source code appears in the left ++ The (syntax colored) source code appears in the left + source code window. IT CANNOT BE EDITED, but ONLY VIEWED! + + - Press START button to start the demo. +@@ -52,6 +52,9 @@ + + + (2) How to add your own demos to the demo repository ++ IMPORTANT! When imported, the demo should not modify the system ++ by calling functions in other modules, such as sys, tkinter, or ++ turtle. Global variables should be initialized in main(). + + - The script name must begin with tdemo_ , + so it must have the form tdemo_.py +diff -r ee879c0ffa11 Demo/turtle/tdemo_chaos.py +--- a/Demo/turtle/tdemo_chaos.py ++++ b/Demo/turtle/tdemo_chaos.py +@@ -29,8 +29,8 @@ + line(-1, 0, N+1, 0) + line(0, -0.1, 0, 1.1) + +-def plot(fun, start, colour): +- pencolor(colour) ++def plot(fun, start, color): ++ pencolor(color) + x = start + jumpto(0, x) + pendown() +diff -r ee879c0ffa11 Demo/turtle/tdemo_clock.py +--- a/Demo/turtle/tdemo_clock.py ++++ b/Demo/turtle/tdemo_clock.py +@@ -11,11 +11,8 @@ + ------------------------------------ + """ + from turtle import * +-from turtle import Terminator # not in __all__ + from datetime import datetime + +-mode("logo") +- + def jump(distanz, winkel=0): + penup() + right(winkel) +@@ -43,7 +40,6 @@ + hand_form = get_poly() + register_shape(name, hand_form) + +- + def clockface(radius): + reset() + pensize(7) +@@ -84,7 +80,6 @@ + writer.pu() + writer.bk(85) + +- + def wochentag(t): + wochentag = ["Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday", "Sunday"] +@@ -131,6 +126,7 @@ + return "EVENTLOOP" + + if __name__ == "__main__": ++ mode("logo") + msg = main() + print msg +- mainloop() ++ mainloop() # keep window open +diff -r ee879c0ffa11 Demo/turtle/tdemo_minimal_hanoi.py +--- a/Demo/turtle/tdemo_minimal_hanoi.py ++++ b/Demo/turtle/tdemo_minimal_hanoi.py +@@ -18,7 +18,6 @@ + --------------------------------------- + """ + from turtle import * +-from turtle import Terminator # not in __all__ + + class Disc(Turtle): + def __init__(self, n): +diff -r ee879c0ffa11 Demo/turtle/tdemo_nim.py +--- a/Demo/turtle/tdemo_nim.py ++++ b/Demo/turtle/tdemo_nim.py +@@ -1,7 +1,7 @@ + """ turtle-example-suite: + + tdemo_nim.py +- ++ + Play nim against the computer. The player + who takes the last stick is the winner. + +@@ -41,7 +41,7 @@ + return move + + def randommove(state): +- m = max(state) ++ m = max(state) + while True: + z = random.randint(0,2) + if state[z] > (m > 1): +@@ -62,7 +62,7 @@ + self.winner = None + self.game.view.setup() + self.game.state = Nim.RUNNING +- ++ + def move(self, row, col): + maxspalte = self.sticks[row] + self.sticks[row] = col +@@ -76,7 +76,7 @@ + row, col = computerzug(self.sticks) + self.move(row, col) + self.player = 0 +- ++ + def game_over(self): + return self.sticks == [0, 0, 0] + +@@ -100,13 +100,13 @@ + self.goto(x,y) + self.color("white") + self.showturtle() +- ++ + def coords(self, row, col): + packet, remainder = divmod(col, 5) + x = (3 + 11 * packet + 2 * remainder) * WUNIT + y = (2 + 3 * row) * HUNIT + return x - SCREENWIDTH // 2 + WUNIT // 2, SCREENHEIGHT // 2 - y - HUNIT // 2 +- ++ + def makemove(self, x, y): + if self.game.state != Nim.RUNNING: + return +@@ -142,7 +142,7 @@ + self.writer.pencolor("black") + self.writer.write(msg1, align="center", font=("Courier",14,"bold")) + self.screen.tracer(True) +- ++ + + def setup(self): + self.screen.tracer(False) +@@ -181,6 +181,7 @@ + if self.game.state == Nim.OVER: + self.screen.clear() + ++ + class NimController(object): + + def __init__(self, game): +@@ -200,28 +201,26 @@ + self.BUSY = True + self.game.model.notify_move(row, col) + self.BUSY = False +- ++ + class Nim(object): + CREATED = 0 + RUNNING = 1 + OVER = 2 + def __init__(self, screen): +- self.state = Nim.CREATED ++ self.state = Nim.CREATED + self.screen = screen + self.model = NimModel(self) + self.view = NimView(self) + self.controller = NimController(self) +- + +-mainscreen = turtle.Screen() +-mainscreen.mode("standard") +-mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) + + def main(): ++ mainscreen = turtle.Screen() ++ mainscreen.mode("standard") ++ mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) + nim = Nim(mainscreen) + return "EVENTLOOP!" + + if __name__ == "__main__": + main() + turtle.mainloop() +- +diff -r ee879c0ffa11 Demo/turtle/tdemo_two_canvases.py +--- /dev/null ++++ b/Demo/turtle/tdemo_two_canvases.py +@@ -0,0 +1,54 @@ ++"""turtledemo.two_canvases ++ ++Use TurtleScreen and RawTurtle to draw on two ++distinct canvases in a separate windows. The ++new window must be separately closed in ++addition to pressing the STOP button. ++""" ++ ++from turtle import TurtleScreen, RawTurtle, TK ++ ++def main(): ++ root = TK.Tk() ++ cv1 = TK.Canvas(root, width=300, height=200, bg="#ddffff") ++ cv2 = TK.Canvas(root, width=300, height=200, bg="#ffeeee") ++ cv1.pack() ++ cv2.pack() ++ ++ s1 = TurtleScreen(cv1) ++ s1.bgcolor(0.85, 0.85, 1) ++ s2 = TurtleScreen(cv2) ++ s2.bgcolor(1, 0.85, 0.85) ++ ++ p = RawTurtle(s1) ++ q = RawTurtle(s2) ++ ++ p.color("red", (1, 0.85, 0.85)) ++ p.width(3) ++ q.color("blue", (0.85, 0.85, 1)) ++ q.width(3) ++ ++ for t in p,q: ++ t.shape("turtle") ++ t.lt(36) ++ ++ q.lt(180) ++ ++ for t in p, q: ++ t.begin_fill() ++ for i in range(5): ++ for t in p, q: ++ t.fd(50) ++ t.lt(72) ++ for t in p,q: ++ t.end_fill() ++ t.lt(54) ++ t.pu() ++ t.bk(50) ++ ++ return "EVENTLOOP" ++ ++ ++if __name__ == '__main__': ++ main() ++ TK.mainloop() # keep window open until user closes it +diff -r ee879c0ffa11 Demo/turtle/turtleDemo.py +--- a/Demo/turtle/turtleDemo.py ++++ b/Demo/turtle/turtleDemo.py +@@ -44,86 +44,54 @@ + entries2.append(subdir+scripts) + return entries2 + +-def showDemoHelp(): +- view_file(demo.root, "Help on turtleDemo", +- os.path.join(demo_dir, "demohelp.txt")) +- +-def showAboutDemo(): +- view_file(demo.root, "About turtleDemo", +- os.path.join(demo_dir, "about_turtledemo.txt")) +- +-def showAboutTurtle(): +- view_file(demo.root, "About the new turtle module.", +- os.path.join(demo_dir, "about_turtle.txt")) ++help_entries = ( # (help_label, help_file) ++ ('Turtledemo help', "demohelp.txt"), ++ ('About turtledemo', "about_turtledemo.txt"), ++ ('About turtle module', "about_turtle.txt"), ++ ) + + class DemoWindow(object): + +- def __init__(self, filename=None): #, root=None): ++ def __init__(self, filename=None): + self.root = root = turtle._root = Tk() ++ root.title('Python turtle-graphics examples') + root.wm_protocol("WM_DELETE_WINDOW", self._destroy) + +- ################# ++ root.grid_rowconfigure(1, weight=1) ++ root.grid_columnconfigure(0, weight=1) ++ root.grid_columnconfigure(1, minsize=90, weight=1) ++ root.grid_columnconfigure(2, minsize=90, weight=1) ++ root.grid_columnconfigure(3, minsize=90, weight=1) ++ + self.mBar = Frame(root, relief=RAISED, borderwidth=2) +- self.mBar.pack(fill=X) +- + self.ExamplesBtn = self.makeLoadDemoMenu() + self.OptionsBtn = self.makeHelpMenu() +- self.mBar.tk_menuBar(self.ExamplesBtn, self.OptionsBtn) #, QuitBtn) ++ self.mBar.grid(row=0, columnspan=4, sticky='news') + +- root.title('Python turtle-graphics examples') +- ################# +- self.left_frame = left_frame = Frame(root) +- self.text_frame = text_frame = Frame(left_frame) +- self.vbar = vbar =Scrollbar(text_frame, name='vbar') +- self.text = text = Text(text_frame, +- name='text', padx=5, wrap='none', +- width=45) +- vbar['command'] = text.yview +- vbar.pack(side=LEFT, fill=Y) +- ##################### +- self.hbar = hbar =Scrollbar(text_frame, name='hbar', orient=HORIZONTAL) +- hbar['command'] = text.xview +- hbar.pack(side=BOTTOM, fill=X) +- ##################### +- text['yscrollcommand'] = vbar.set +- text.config(font=txtfont) +- text.config(xscrollcommand=hbar.set) +- text.pack(side=LEFT, fill=Y, expand=1) +- ##################### +- self.output_lbl = Label(left_frame, height= 1,text=" --- ", bg = "#ddf", +- font = ("Arial", 16, 'normal')) +- self.output_lbl.pack(side=BOTTOM, expand=0, fill=X) +- ##################### +- text_frame.pack(side=LEFT, fill=BOTH, expand=0) +- left_frame.pack(side=LEFT, fill=BOTH, expand=0) +- self.graph_frame = g_frame = Frame(root) ++ pane = PanedWindow(orient=HORIZONTAL, sashwidth=5, ++ sashrelief=SOLID, bg='#ddd') ++ pane.add(self.makeTextFrame(pane)) ++ pane.add(self.makeGraphFrame(pane)) ++ pane.grid(row=1, columnspan=4, sticky='news') + +- turtle._Screen._root = g_frame +- turtle._Screen._canvas = turtle.ScrolledCanvas(g_frame, 800, 600, 1000, 800) +- #xturtle.Screen._canvas.pack(expand=1, fill="both") +- self.screen = _s_ = turtle.Screen() +- turtle.TurtleScreen.__init__(_s_, _s_._canvas) +- self.scanvas = _s_._canvas +- #xturtle.RawTurtle.canvases = [self.scanvas] +- turtle.RawTurtle.screens = [_s_] ++ self.output_lbl = Label(root, height= 1, text=" --- ", bg="#ddf", ++ font=("Arial", 16, 'normal'), borderwidth=2, ++ relief=RIDGE) ++ self.start_btn = Button(root, text=" START ", font=btnfont, ++ fg="white", disabledforeground = "#fed", ++ command=self.startDemo) ++ self.stop_btn = Button(root, text=" STOP ", font=btnfont, ++ fg="white", disabledforeground = "#fed", ++ command=self.stopIt) ++ self.clear_btn = Button(root, text=" CLEAR ", font=btnfont, ++ fg="white", disabledforeground="#fed", ++ command = self.clearCanvas) ++ self.output_lbl.grid(row=2, column=0, sticky='news', padx=(0,5)) ++ self.start_btn.grid(row=2, column=1, sticky='ew') ++ self.stop_btn.grid(row=2, column=2, sticky='ew') ++ self.clear_btn.grid(row=2, column=3, sticky='ew') + +- self.scanvas.pack(side=TOP, fill=BOTH, expand=1) +- +- self.btn_frame = btn_frame = Frame(g_frame, height=100) +- self.start_btn = Button(btn_frame, text=" START ", font=btnfont, fg = "white", +- disabledforeground = "#fed", command=self.startDemo) +- self.start_btn.pack(side=LEFT, fill=X, expand=1) +- self.stop_btn = Button(btn_frame, text=" STOP ", font=btnfont, fg = "white", +- disabledforeground = "#fed", command = self.stopIt) +- self.stop_btn.pack(side=LEFT, fill=X, expand=1) +- self.clear_btn = Button(btn_frame, text=" CLEAR ", font=btnfont, fg = "white", +- disabledforeground = "#fed", command = self.clearCanvas) +- self.clear_btn.pack(side=LEFT, fill=X, expand=1) +- +- self.btn_frame.pack(side=TOP, fill=BOTH, expand=0) +- self.graph_frame.pack(side=TOP, fill=BOTH, expand=1) +- +- Percolator(text).insertfilter(ColorDelegator()) ++ Percolator(self.text).insertfilter(ColorDelegator()) + self.dirty = False + self.exitflag = False + if filename: +@@ -132,37 +100,61 @@ + "Choose example from menu", "black") + self.state = STARTUP + +- def _destroy(self): +- self.root.destroy() +- sys.exit() ++ ++ def onResize(self, event): ++ cwidth = self._canvas.winfo_width() ++ cheight = self._canvas.winfo_height() ++ self._canvas.xview_moveto(0.5*(self.canvwidth-cwidth)/self.canvwidth) ++ self._canvas.yview_moveto(0.5*(self.canvheight-cheight)/self.canvheight) ++ ++ def makeTextFrame(self, root): ++ self.text_frame = text_frame = Frame(root) ++ self.text = text = Text(text_frame, name='text', padx=5, ++ wrap='none', width=45) ++ ++ self.vbar = vbar = Scrollbar(text_frame, name='vbar') ++ vbar['command'] = text.yview ++ vbar.pack(side=LEFT, fill=Y) ++ self.hbar = hbar = Scrollbar(text_frame, name='hbar', orient=HORIZONTAL) ++ hbar['command'] = text.xview ++ hbar.pack(side=BOTTOM, fill=X) ++ ++ text['font'] = txtfont ++ text['yscrollcommand'] = vbar.set ++ text['xscrollcommand'] = hbar.set ++ text.pack(side=LEFT, fill=BOTH, expand=1) ++ return text_frame ++ ++ def makeGraphFrame(self, root): ++ turtle._Screen._root = root ++ self.canvwidth = 1000 ++ self.canvheight = 800 ++ turtle._Screen._canvas = self._canvas = canvas = turtle.ScrolledCanvas( ++ root, 800, 600, self.canvwidth, self.canvheight) ++ canvas.adjustScrolls() ++ canvas._rootwindow.bind('', self.onResize) ++ canvas._canvas['borderwidth'] = 0 ++ ++ self.screen = _s_ = turtle.Screen() ++ turtle.TurtleScreen.__init__(_s_, _s_._canvas) ++ self.scanvas = _s_._canvas ++ turtle.RawTurtle.screens = [_s_] ++ return canvas + + def configGUI(self, menu, start, stop, clear, txt="", color="blue"): + self.ExamplesBtn.config(state=menu) + +- self.start_btn.config(state=start) +- if start==NORMAL: +- self.start_btn.config(bg="#d00") +- else: +- self.start_btn.config(bg="#fca") +- +- self.stop_btn.config(state=stop) +- if stop==NORMAL: +- self.stop_btn.config(bg="#d00") +- else: +- self.stop_btn.config(bg="#fca") +- self.clear_btn.config(state=clear) +- +- self.clear_btn.config(state=clear) +- if clear==NORMAL: +- self.clear_btn.config(bg="#d00") +- else: +- self.clear_btn.config(bg="#fca") +- ++ self.start_btn.config(state=start, ++ bg="#d00" if start == NORMAL else "#fca") ++ self.stop_btn.config(state=stop, ++ bg="#d00" if stop == NORMAL else "#fca") ++ self.clear_btn.config(state=clear, ++ bg="#d00" if clear == NORMAL else"#fca") + self.output_lbl.config(text=txt, fg=color) + +- + def makeLoadDemoMenu(self): +- CmdBtn = Menubutton(self.mBar, text='Examples', underline=0, font=menufont) ++ CmdBtn = Menubutton(self.mBar, text='Examples', ++ underline=0, font=menufont) + CmdBtn.pack(side=LEFT, padx="2m") + CmdBtn.menu = Menu(CmdBtn) + +@@ -172,30 +164,31 @@ + self.loadfile(x) + return emit + if isinstance(entry,str): +- CmdBtn.menu.add_command(label=entry[6:-3], underline=0, font=menufont, ++ CmdBtn.menu.add_command(label=entry[6:-3], underline=0, ++ font=menufont, + command=loadexample(entry)) + else: + _dir, entries = entry[0], entry[1:] + CmdBtn.menu.choices = Menu(CmdBtn.menu) + for e in entries: +- CmdBtn.menu.choices.add_command(label=e[6:-3], underline=0, font=menufont, +- command = loadexample(os.path.join(_dir,e))) +- +- CmdBtn.menu.add_cascade(label=_dir[6:], +- menu = CmdBtn.menu.choices, font=menufont ) ++ CmdBtn.menu.choices.add_command( ++ label=e[6:-3], underline=0, font=menufont, ++ command = loadexample(os.path.join(_dir,e))) ++ CmdBtn.menu.add_cascade( ++ label=_dir[6:], menu = CmdBtn.menu.choices, font=menufont) + + CmdBtn['menu'] = CmdBtn.menu + return CmdBtn + +- + def makeHelpMenu(self): + CmdBtn = Menubutton(self.mBar, text='Help', underline=0, font = menufont) + CmdBtn.pack(side=LEFT, padx='2m') + CmdBtn.menu = Menu(CmdBtn) + +- CmdBtn.menu.add_command(label='About turtle.py', font=menufont, command=showAboutTurtle) +- CmdBtn.menu.add_command(label='turtleDemo - Help', font=menufont, command=showDemoHelp) +- CmdBtn.menu.add_command(label='About turtleDemo', font=menufont, command=showAboutDemo) ++ for help_label, help_file in help_entries: ++ def show(help_label=help_label, help_file=help_file): ++ view_file(self.root, help_label, os.path.join(demo_dir, help_file)) ++ CmdBtn.menu.add_command(label=help_label, font=menufont, command=show) + + CmdBtn['menu'] = CmdBtn.menu + return CmdBtn +@@ -203,7 +196,6 @@ + def refreshCanvas(self): + if not self.dirty: return + self.screen.clear() +- #self.screen.mode("standard") + self.dirty=False + + def loadfile(self,filename): +@@ -218,7 +210,6 @@ + direc, fname = os.path.split(filename) + self.root.title(fname[6:-3]+" - a Python turtle graphics example") + self.module = __import__(fname[:-3]) +- reload(self.module) + self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED, + "Press start button", "red") + self.state = READY +@@ -262,23 +253,16 @@ + self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED, + "STOPPED!", "red") + turtle.TurtleScreen._RUNNING = False +- #print "stopIT: exitflag = True" + else: + turtle.TurtleScreen._RUNNING = False +- #print "stopIt: exitflag = False" ++ ++ def _destroy(self): ++ self.root.destroy() ++ #sys.exit() ++ ++def main(): ++ demo = DemoWindow() ++ demo.root.mainloop() + + if __name__ == '__main__': +- demo = DemoWindow() +- RUN = True +- while RUN: +- try: +- print "ENTERING mainloop" +- demo.root.mainloop() +- except AttributeError: +- print "CRASH!!!- WAIT A MOMENT!" +- time.sleep(0.3) +- print "GOING ON .." +- demo.refreshCanvas() +-## time.sleep(1) +- except: +- RUN = FALSE ++ main() +diff -r ee879c0ffa11 Demo/turtle/turtledemo_two_canvases.py +--- a/Demo/turtle/turtledemo_two_canvases.py ++++ /dev/null +@@ -1,49 +0,0 @@ +-#!/usr/bin/env python +-## DEMONSTRATES USE OF 2 CANVASES, SO CANNOT BE RUN IN DEMOVIEWER! +-"""turtle example: Using TurtleScreen and RawTurtle +-for drawing on two distinct canvases. +-""" +-from turtle import TurtleScreen, RawTurtle, TK +- +-root = TK.Tk() +-cv1 = TK.Canvas(root, width=300, height=200, bg="#ddffff") +-cv2 = TK.Canvas(root, width=300, height=200, bg="#ffeeee") +-cv1.pack() +-cv2.pack() +- +-s1 = TurtleScreen(cv1) +-s1.bgcolor(0.85, 0.85, 1) +-s2 = TurtleScreen(cv2) +-s2.bgcolor(1, 0.85, 0.85) +- +-p = RawTurtle(s1) +-q = RawTurtle(s2) +- +-p.color("red", "white") +-p.width(3) +-q.color("blue", "black") +-q.width(3) +- +-for t in p,q: +- t.shape("turtle") +- t.lt(36) +- +-q.lt(180) +- +-for i in range(5): +- for t in p, q: +- t.fd(50) +- t.lt(72) +-for t in p,q: +- t.lt(54) +- t.pu() +- t.bk(50) +- +-## Want to get some info? +- +-print s1, s2 +-print p, q +-print s1.turtles() +-print s2.turtles() +- +-TK.mainloop() +diff -r ee879c0ffa11 Doc/Makefile +--- a/Doc/Makefile ++++ b/Doc/Makefile +@@ -5,27 +5,27 @@ + + # You can set these variables from the command line. + PYTHON = python +-SVNROOT = http://svn.python.org/projects +-SPHINXOPTS = ++SPHINXBUILD = sphinx-build + PAPER = + SOURCES = +-DISTVERSION = $(shell $(PYTHON) tools/sphinxext/patchlevel.py) ++DISTVERSION = $(shell $(PYTHON) tools/patchlevel.py) + + ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \ + $(SPHINXOPTS) . build/$(BUILDER) $(SOURCES) + +-.PHONY: help checkout update build html htmlhelp latex text changes linkcheck \ ++.PHONY: help build html htmlhelp latex text changes linkcheck \ + suspicious coverage doctest pydoc-topics htmlview clean dist check serve \ + autobuild-dev autobuild-stable + + help: + @echo "Please use \`make ' where is one of" + @echo " clean to remove build files" +- @echo " update to update build tools" + @echo " html to make standalone HTML files" ++ @echo " htmlview to open the index page built by the html target in your browser" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " text to make plain text files" ++ @echo " epub to make EPUB files" + @echo " changes to make an overview over all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + @echo " coverage to check documentation coverage for library and C API" +@@ -36,30 +36,8 @@ + @echo " check to run a check for frequent markup errors" + @echo " serve to serve the documentation on the localhost (8000)" + +-# Note: if you update versions here, do the same in make.bat and README.txt +-checkout: +- @if [ ! -d tools/sphinx ]; then \ +- echo "Checking out Sphinx..."; \ +- svn checkout $(SVNROOT)/external/Sphinx-1.0.7/sphinx tools/sphinx; \ +- fi +- @if [ ! -d tools/docutils ]; then \ +- echo "Checking out Docutils..."; \ +- svn checkout $(SVNROOT)/external/docutils-0.6/docutils tools/docutils; \ +- fi +- @if [ ! -d tools/jinja2 ]; then \ +- echo "Checking out Jinja..."; \ +- svn checkout $(SVNROOT)/external/Jinja-2.3.1/jinja2 tools/jinja2; \ +- fi +- @if [ ! -d tools/pygments ]; then \ +- echo "Checking out Pygments..."; \ +- svn checkout $(SVNROOT)/external/Pygments-1.3.1/pygments tools/pygments; \ +- fi +- +-update: clean checkout +- +-build: checkout +- mkdir -p build/$(BUILDER) build/doctrees +- $(PYTHON) tools/sphinx-build.py $(ALLSPHINXOPTS) ++build: ++ $(SPHINXBUILD) $(ALLSPHINXOPTS) + @echo + + html: BUILDER = html +@@ -81,44 +59,50 @@ + text: build + @echo "Build finished; the text files are in build/text." + ++epub: BUILDER = epub ++epub: build ++ @echo "Build finished; the epub files are in build/epub." ++ + changes: BUILDER = changes + changes: build + @echo "The overview file is in build/changes." + + linkcheck: BUILDER = linkcheck +-linkcheck: build +- @echo "Link check complete; look for any errors in the above output" \ +- "or in build/$(BUILDER)/output.txt" ++linkcheck: ++ @$(MAKE) build BUILDER=$(BUILDER) || { \ ++ echo "Link check complete; look for any errors in the above output" \ ++ "or in build/$(BUILDER)/output.txt"; \ ++ false; } + + suspicious: BUILDER = suspicious +-suspicious: build +- @echo "Suspicious check complete; look for any errors in the above output" \ +- "or in build/$(BUILDER)/suspicious.csv. If all issues are false" \ +- "positives, append that file to tools/sphinxext/susp-ignored.csv." ++suspicious: ++ @$(MAKE) build BUILDER=$(BUILDER) || { \ ++ echo "Suspicious check complete; look for any errors in the above output" \ ++ "or in build/$(BUILDER)/suspicious.csv. If all issues are false" \ ++ "positives, append that file to tools/susp-ignored.csv."; \ ++ false; } + + coverage: BUILDER = coverage + coverage: build + @echo "Coverage finished; see c.txt and python.txt in build/coverage" + + doctest: BUILDER = doctest +-doctest: build +- @echo "Testing of doctests in the sources finished, look at the" \ +- "results in build/doctest/output.txt" ++doctest: ++ @$(MAKE) build BUILDER=$(BUILDER) || { \ ++ echo "Testing of doctests in the sources finished, look at the" \ ++ "results in build/doctest/output.txt"; \ ++ false; } + + pydoc-topics: BUILDER = pydoc-topics + pydoc-topics: build + @echo "Building finished; now copy build/pydoc-topics/topics.py" \ +- "to Lib/pydoc_data/topics.py" ++ "to ../Lib/pydoc_data/topics.py" + + htmlview: html + $(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')" + + clean: + -rm -rf build/* +- -rm -rf tools/sphinx +- -rm -rf tools/pygments +- -rm -rf tools/jinja2 +- -rm -rf tools/docutils + + dist: + rm -rf dist +@@ -158,6 +142,11 @@ + cp build/latex/docs-pdf.zip dist/python-$(DISTVERSION)-docs-pdf-letter.zip + cp build/latex/docs-pdf.tar.bz2 dist/python-$(DISTVERSION)-docs-pdf-letter.tar.bz2 + ++ # copy the epub build ++ rm -rf build/epub ++ make epub ++ cp -pPR build/epub/Python.epub dist/python-$(DISTVERSION)-docs.epub ++ + check: + $(PYTHON) tools/rstlint.py -i tools + +@@ -168,7 +157,6 @@ + + # for development releases: always build + autobuild-dev: +- make update + make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1' + -make suspicious + +diff -r ee879c0ffa11 Doc/README.txt +--- a/Doc/README.txt ++++ b/Doc/README.txt +@@ -3,74 +3,93 @@ + + This directory contains the reStructuredText (reST) sources to the Python + documentation. You don't need to build them yourself, prebuilt versions are +-available at https://docs.python.org/2/download.html ++available at . + +-Documentation on the authoring Python documentation, including information about ++Documentation on authoring Python documentation, including information about + both style and markup, is available in the "Documenting Python" chapter of the +-documentation. ++developers guide . + + + Building the docs + ================= + +-You need to have Python 2 installed; the toolset used to build the +-docs is written in Python. It is called *Sphinx*, it is not included in this +-tree, but maintained separately. Also needed are the docutils, supplying the +-base markup that Sphinx uses, Jinja, a templating engine, and optionally +-Pygments, a code highlighter. ++You need to have Sphinx installed; it is the toolset ++used to build the docs. It is not included in this tree, but maintained ++separately and available from PyPI . + + + Using make + ---------- + +-Luckily, a Makefile has been prepared so that on Unix, provided you have +-installed Python and Subversion, you can just run :: ++A Makefile has been prepared so that on Unix, provided you have installed ++Sphinx, you can just run :: + + make html + +-to check out the necessary toolset in the `tools/` subdirectory and build the +-HTML output files. To view the generated HTML, point your favorite browser at +-the top-level index `build/html/index.html` after running "make". ++to build the HTML output files. + + On Windows, we try to emulate the Makefile as closely as possible with a + ``make.bat`` file. + ++To use a Python interpreter that's not called ``python``, use the standard ++way to set Makefile variables, using e.g. :: ++ ++ make html PYTHON=python3 ++ ++On Windows, set the PYTHON environment variable instead. ++ ++To use a specific sphinx-build (something other than ``sphinx-build``), set ++the SPHINXBUILD variable. ++ + Available make targets are: + +- * "html", which builds standalone HTML files for offline viewing. ++* "clean", which removes all build files. + +- * "htmlhelp", which builds HTML files and a HTML Help project file usable to +- convert them into a single Compiled HTML (.chm) file -- these are popular +- under Microsoft Windows, but very handy on every platform. ++* "html", which builds standalone HTML files for offline viewing. + +- To create the CHM file, you need to run the Microsoft HTML Help Workshop over +- the generated project (.hhp) file. ++* "htmlview", which re-uses the "html" builder, but then opens the main page ++ in your default web browser. + +- * "latex", which builds LaTeX source files as input to "pdflatex" to produce +- PDF documents. ++* "htmlhelp", which builds HTML files and a HTML Help project file usable to ++ convert them into a single Compiled HTML (.chm) file -- these are popular ++ under Microsoft Windows, but very handy on every platform. + +- * "text", which builds a plain text file for each source file. ++ To create the CHM file, you need to run the Microsoft HTML Help Workshop ++ over the generated project (.hhp) file. The make.bat script does this for ++ you on Windows. + +- * "linkcheck", which checks all external references to see whether they are +- broken, redirected or malformed, and outputs this information to stdout as +- well as a plain-text (.txt) file. ++* "latex", which builds LaTeX source files as input to "pdflatex" to produce ++ PDF documents. + +- * "changes", which builds an overview over all versionadded/versionchanged/ +- deprecated items in the current version. This is meant as a help for the +- writer of the "What's New" document. ++* "text", which builds a plain text file for each source file. + +- * "coverage", which builds a coverage overview for standard library modules and +- C API. ++* "epub", which builds an EPUB document, suitable to be viewed on e-book ++ readers. + +- * "pydoc-topics", which builds a Python module containing a dictionary with +- plain text documentation for the labels defined in +- `tools/sphinxext/pyspecific.py` -- pydoc needs these to show topic and +- keyword help. ++* "linkcheck", which checks all external references to see whether they are ++ broken, redirected or malformed, and outputs this information to stdout as ++ well as a plain-text (.txt) file. + +- * "suspicious", which checks the parsed markup for text that looks like +- malformed and thus unconverted reST. ++* "changes", which builds an overview over all versionadded/versionchanged/ ++ deprecated items in the current version. This is meant as a help for the ++ writer of the "What's New" document. + +-A "make update" updates the Subversion checkouts in `tools/`. ++* "coverage", which builds a coverage overview for standard library modules and ++ C API. ++ ++* "pydoc-topics", which builds a Python module containing a dictionary with ++ plain text documentation for the labels defined in ++ `tools/pyspecific.py` -- pydoc needs these to show topic and keyword help. ++ ++* "suspicious", which checks the parsed markup for text that looks like ++ malformed and thus unconverted reST. ++ ++* "check", which checks for frequent markup errors. ++ ++* "serve", which serves the build/html directory on port 8000. ++ ++* "dist", (Unix only) which creates distributable archives of HTML, text, ++ PDF, and EPUB builds. + + + Without make +@@ -78,7 +97,7 @@ + + Install the Sphinx package and its dependencies from PyPI. + +-Then, from the ``Docs`` directory, run :: ++Then, from the ``Doc`` directory, run :: + + sphinx-build -b . build/ + +@@ -90,10 +109,10 @@ + ============ + + Bugs in the content should be reported to the Python bug tracker at +-http://bugs.python.org. ++https://bugs.python.org. + + Bugs in the toolset should be reported in the Sphinx bug tracker at +-http://www.bitbucket.org/birkenfeld/sphinx/issues/. ++https://www.bitbucket.org/birkenfeld/sphinx/issues/. + + You can also send a mail to the Python Documentation Team at docs@python.org, + and we will process your request as soon as possible. +diff -r ee879c0ffa11 Doc/about.rst +--- a/Doc/about.rst ++++ b/Doc/about.rst +@@ -6,7 +6,7 @@ + These documents are generated from `reStructuredText`_ sources by `Sphinx`_, a + document processor specifically written for the Python documentation. + +-.. _reStructuredText: http://docutils.sf.net/rst.html ++.. _reStructuredText: http://docutils.sourceforge.net/rst.html + .. _Sphinx: http://sphinx-doc.org/ + + .. In the online version of these documents, you can submit comments and suggest +@@ -21,7 +21,7 @@ + + * Fred L. Drake, Jr., the creator of the original Python documentation toolset + and writer of much of the content; +-* the `Docutils `_ project for creating ++* the `Docutils `_ project for creating + reStructuredText and the Docutils suite; + * Fredrik Lundh for his `Alternative Python Reference + `_ project from which Sphinx got many good +diff -r ee879c0ffa11 Doc/bugs.rst +--- a/Doc/bugs.rst ++++ b/Doc/bugs.rst +@@ -29,7 +29,7 @@ + ============================== + + Bug reports for Python itself should be submitted via the Python Bug Tracker +-(http://bugs.python.org/). The bug tracker offers a Web form which allows ++(https://bugs.python.org/). The bug tracker offers a Web form which allows + pertinent information to be entered and submitted to the developers. + + The first step in filing a report is to determine whether the problem has +@@ -68,7 +68,7 @@ + Article which goes into some detail about how to create a useful bug report. + This describes what kind of information is useful and why it is useful. + +- `Bug Writing Guidelines `_ ++ `Bug Writing Guidelines `_ + Information about writing a good bug report. Some of this is specific to the + Mozilla project, but describes general good practices. + +@@ -82,6 +82,6 @@ + the `core-mentorship mailing list`_ is a friendly place to get answers to + any and all questions pertaining to the process of fixing issues in Python. + +-.. _Documentation bugs: http://bugs.python.org/issue?@filter=status&@filter=components&components=4&status=1&@columns=id,activity,title,status&@sort=-activity +-.. _Python Developer's Guide: http://docs.python.org/devguide/ ++.. _Documentation bugs: https://bugs.python.org/issue?@filter=status&@filter=components&components=4&status=1&@columns=id,activity,title,status&@sort=-activity ++.. _Python Developer's Guide: https://docs.python.org/devguide/ + .. _core-mentorship mailing list: https://mail.python.org/mailman/listinfo/core-mentorship/ +diff -r ee879c0ffa11 Doc/c-api/long.rst +--- a/Doc/c-api/long.rst ++++ b/Doc/c-api/long.rst +@@ -65,22 +65,6 @@ + .. versionadded:: 2.6 + + +-.. c:function:: PyObject* PyLong_FromSsize_t(Py_ssize_t v) +- +- Return a new :c:type:`PyLongObject` object with a value of *v*, or *NULL* +- on failure. +- +- .. versionadded:: 2.6 +- +- +-.. c:function:: PyObject* PyLong_FromSize_t(size_t v) +- +- Return a new :c:type:`PyLongObject` object with a value of *v*, or *NULL* +- on failure. +- +- .. versionadded:: 2.6 +- +- + .. c:function:: PyObject* PyLong_FromLongLong(PY_LONG_LONG v) + + Return a new :c:type:`PyLongObject` object from a C :c:type:`long long`, or *NULL* +@@ -199,18 +183,6 @@ + raised. + + +-.. c:function:: Py_ssize_t PyLong_AsSsize_t(PyObject *pylong) +- +- .. index:: +- single: PY_SSIZE_T_MAX +- +- Return a :c:type:`Py_ssize_t` representation of the contents of *pylong*. If +- *pylong* is greater than :const:`PY_SSIZE_T_MAX`, an :exc:`OverflowError` is +- raised. +- +- .. versionadded:: 2.6 +- +- + .. c:function:: PY_LONG_LONG PyLong_AsLongLong(PyObject *pylong) + + .. index:: +diff -r ee879c0ffa11 Doc/c-api/type.rst +--- a/Doc/c-api/type.rst ++++ b/Doc/c-api/type.rst +@@ -71,6 +71,11 @@ + + .. versionadded:: 2.2 + ++ This function only checks for actual subtypes, which means that ++ :meth:`~class.__subclasscheck__` is not called on *b*. Call ++ :c:func:`PyObject_IsSubclass` to do the same check that :func:`issubclass` ++ would do. ++ + + .. c:function:: PyObject* PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems) + +diff -r ee879c0ffa11 Doc/c-api/typeobj.rst +--- a/Doc/c-api/typeobj.rst ++++ b/Doc/c-api/typeobj.rst +@@ -770,7 +770,7 @@ + exception may or may not be set. When another error occurs, it must return + *NULL* too. Its presence normally signals that the instances of this type + are iterators (although classic instances always have this function, even if +- they don't define a :meth:`next` method). ++ they don't define a :meth:`~iterator.next` method). + + Iterator types should also define the :c:member:`~PyTypeObject.tp_iter` function, and that + function should return the iterator instance itself (not a new iterator +diff -r ee879c0ffa11 Doc/c-api/unicode.rst +--- a/Doc/c-api/unicode.rst ++++ b/Doc/c-api/unicode.rst +@@ -1035,7 +1035,7 @@ + Unicode string. + + +-.. c:function:: int PyUnicode_Tailmatch(PyObject *str, PyObject *substr, Py_ssize_t start, Py_ssize_t end, int direction) ++.. c:function:: Py_ssize_t PyUnicode_Tailmatch(PyObject *str, PyObject *substr, Py_ssize_t start, Py_ssize_t end, int direction) + + Return 1 if *substr* matches ``str[start:end]`` at the given tail end + (*direction* == -1 means to do a prefix match, *direction* == 1 a suffix match), +@@ -1108,7 +1108,7 @@ + .. c:function:: PyObject* PyUnicode_Format(PyObject *format, PyObject *args) + + Return a new string object from *format* and *args*; this is analogous to +- ``format % args``. The *args* argument must be a tuple. ++ ``format % args``. + + + .. c:function:: int PyUnicode_Contains(PyObject *container, PyObject *element) +diff -r ee879c0ffa11 Doc/conf.py +--- a/Doc/conf.py ++++ b/Doc/conf.py +@@ -8,26 +8,18 @@ + # that aren't pickleable (module imports are okay, they're removed automatically). + + import sys, os, time +-sys.path.append(os.path.abspath('tools/sphinxext')) ++sys.path.append(os.path.abspath('tools/extensions')) + + # General configuration + # --------------------- + +-extensions = ['sphinx.ext.refcounting', 'sphinx.ext.coverage', +- 'sphinx.ext.doctest', 'pyspecific'] +-templates_path = ['tools/sphinxext'] ++extensions = ['sphinx.ext.coverage', 'sphinx.ext.doctest', ++ 'pyspecific', 'c_annotations'] + + # General substitutions. + project = 'Python' + copyright = '1990-%s, Python Software Foundation' % time.strftime('%Y') + +-# The default replacements for |version| and |release|. +-# +-# The short X.Y version. +-# version = '2.6' +-# The full version, including alpha/beta/rc tags. +-# release = '2.6a0' +- + # We look for the Include/patchlevel.h file in the current Python source tree + # and replace the values accordingly. + import patchlevel +@@ -40,24 +32,14 @@ + today_fmt = '%B %d, %Y' + + # List of files that shouldn't be included in the build. +-unused_docs = [ +- 'maclib/scrap', +- 'library/xmllib', +- 'library/xml.etree', ++exclude_patterns = [ ++ 'maclib/scrap.rst', ++ 'library/xmllib.rst', ++ 'library/xml.etree.rst', + ] + +-# Ignore .rst in Sphinx its self. +-exclude_trees = ['tools/sphinx'] +- +-# Relative filename of the reference count data file. +-refcount_file = 'data/refcounts.dat' +- +-# If true, '()' will be appended to :func: etc. cross-reference text. +-add_function_parentheses = True +- +-# If true, the current module name will be prepended to all description +-# unit titles (such as .. function::). +-add_module_names = True ++# Require Sphinx 1.2 for build. ++needs_sphinx = '1.2' + + + # Options for HTML output +@@ -70,9 +52,8 @@ + # using the given strftime format. + html_last_updated_fmt = '%b %d, %Y' + +-# If true, SmartyPants will be used to convert quotes and dashes to +-# typographically correct entities. +-html_use_smartypants = True ++# Path to find HTML templates. ++templates_path = ['tools/templates'] + + # Custom sidebar templates, filenames relative to this file. + html_sidebars = { +@@ -86,10 +67,10 @@ + } + + # Output an OpenSearch description file. +-html_use_opensearch = 'http://docs.python.org/' ++html_use_opensearch = 'https://docs.python.org/' + + # Additional static files. +-html_static_path = ['tools/sphinxext/static'] ++html_static_path = ['tools/static'] + + # Output file base name for HTML help builder. + htmlhelp_basename = 'python' + release.replace('.', '') +@@ -109,7 +90,7 @@ + + # Grouping the document tree into LaTeX files. List of tuples + # (source start file, target name, title, author, document class [howto/manual]). +-_stdauthor = r'Guido van Rossum\\Fred L. Drake, Jr., editor' ++_stdauthor = r'Guido van Rossum\\and the Python development team' + latex_documents = [ + ('c-api/index', 'c-api.tex', + 'The Python/C API', _stdauthor, 'manual'), +@@ -189,3 +170,19 @@ + coverage_ignore_c_items = { + # 'cfunction': [...] + } ++ ++ ++# Options for the link checker ++# ---------------------------- ++ ++# Ignore certain URLs. ++linkcheck_ignore = [r'https://bugs.python.org/(issue)?\d+', ++ # Ignore PEPs for now, they all have permanent redirects. ++ r'http://www.python.org/dev/peps/pep-\d+'] ++ ++ ++# Options for extensions ++# ---------------------- ++ ++# Relative filename of the reference count data file. ++refcount_file = 'data/refcounts.dat' +diff -r ee879c0ffa11 Doc/distutils/apiref.rst +--- a/Doc/distutils/apiref.rst ++++ b/Doc/distutils/apiref.rst +@@ -78,7 +78,7 @@ + | | be built | :class:`distutils.core.Extension` | + +--------------------+--------------------------------+-------------------------------------------------------------+ + | *classifiers* | A list of categories for the | a list of strings; valid classifiers are listed on `PyPI | +- | | package | `_. | ++ | | package | `_. | + +--------------------+--------------------------------+-------------------------------------------------------------+ + | *distclass* | the :class:`Distribution` | a subclass of | + | | class to use | :class:`distutils.core.Distribution` | +diff -r ee879c0ffa11 Doc/distutils/builtdist.rst +--- a/Doc/distutils/builtdist.rst ++++ b/Doc/distutils/builtdist.rst +@@ -186,21 +186,21 @@ + +------------------------------------------+----------------------------------------------+ + | RPM :file:`.spec` file option or section | Distutils setup script option | + +==========================================+==============================================+ +-| Name | :option:`name` | ++| Name | ``name`` | + +------------------------------------------+----------------------------------------------+ +-| Summary (in preamble) | :option:`description` | ++| Summary (in preamble) | ``description`` | + +------------------------------------------+----------------------------------------------+ +-| Version | :option:`version` | ++| Version | ``version`` | + +------------------------------------------+----------------------------------------------+ +-| Vendor | :option:`author` and :option:`author_email`, | +-| | or --- & :option:`maintainer` and | +-| | :option:`maintainer_email` | ++| Vendor | ``author`` and ``author_email``, | ++| | or --- & ``maintainer`` and | ++| | ``maintainer_email`` | + +------------------------------------------+----------------------------------------------+ +-| Copyright | :option:`license` | ++| Copyright | ``license`` | + +------------------------------------------+----------------------------------------------+ +-| Url | :option:`url` | ++| Url | ``url`` | + +------------------------------------------+----------------------------------------------+ +-| %description (section) | :option:`long_description` | ++| %description (section) | ``long_description`` | + +------------------------------------------+----------------------------------------------+ + + Additionally, there are many options in :file:`.spec` files that don't have +@@ -211,27 +211,27 @@ + | RPM :file:`.spec` file option | :command:`bdist_rpm` option | default value | + | or section | | | + +===============================+=============================+=========================+ +-| Release | :option:`release` | "1" | ++| Release | ``release`` | "1" | + +-------------------------------+-----------------------------+-------------------------+ +-| Group | :option:`group` | "Development/Libraries" | ++| Group | ``group`` | "Development/Libraries" | + +-------------------------------+-----------------------------+-------------------------+ +-| Vendor | :option:`vendor` | (see above) | ++| Vendor | ``vendor`` | (see above) | + +-------------------------------+-----------------------------+-------------------------+ +-| Packager | :option:`packager` | (none) | ++| Packager | ``packager`` | (none) | + +-------------------------------+-----------------------------+-------------------------+ +-| Provides | :option:`provides` | (none) | ++| Provides | ``provides`` | (none) | + +-------------------------------+-----------------------------+-------------------------+ +-| Requires | :option:`requires` | (none) | ++| Requires | ``requires`` | (none) | + +-------------------------------+-----------------------------+-------------------------+ +-| Conflicts | :option:`conflicts` | (none) | ++| Conflicts | ``conflicts`` | (none) | + +-------------------------------+-----------------------------+-------------------------+ +-| Obsoletes | :option:`obsoletes` | (none) | ++| Obsoletes | ``obsoletes`` | (none) | + +-------------------------------+-----------------------------+-------------------------+ +-| Distribution | :option:`distribution_name` | (none) | ++| Distribution | ``distribution_name`` | (none) | + +-------------------------------+-----------------------------+-------------------------+ +-| BuildRequires | :option:`build_requires` | (none) | ++| BuildRequires | ``build_requires`` | (none) | + +-------------------------------+-----------------------------+-------------------------+ +-| Icon | :option:`icon` | (none) | ++| Icon | ``icon`` | (none) | + +-------------------------------+-----------------------------+-------------------------+ + + Obviously, supplying even a few of these options on the command-line would be +diff -r ee879c0ffa11 Doc/distutils/configfile.rst +--- a/Doc/distutils/configfile.rst ++++ b/Doc/distutils/configfile.rst +@@ -67,7 +67,7 @@ + [...] + + Note that an option spelled :option:`--foo-bar` on the command-line is spelled +-:option:`foo_bar` in configuration files. ++``foo_bar`` in configuration files. + + .. _distutils-build-ext-inplace: + +@@ -114,7 +114,7 @@ + doc/ + examples/ + +-Note that the :option:`doc_files` option is simply a whitespace-separated string ++Note that the ``doc_files`` option is simply a whitespace-separated string + split across multiple lines for readability. + + +diff -r ee879c0ffa11 Doc/distutils/examples.rst +--- a/Doc/distutils/examples.rst ++++ b/Doc/distutils/examples.rst +@@ -11,7 +11,7 @@ + + .. seealso:: + +- `Distutils Cookbook `_ ++ `Distutils Cookbook `_ + Collection of recipes showing how to achieve more control over distutils. + + +@@ -22,7 +22,7 @@ + + If you're just distributing a couple of modules, especially if they don't live + in a particular package, you can specify them individually using the +-:option:`py_modules` option in the setup script. ++``py_modules`` option in the setup script. + + In the simplest case, you'll have two files to worry about: a setup script and + the single module you're distributing, :file:`foo.py` in this example:: +@@ -41,12 +41,12 @@ + ) + + Note that the name of the distribution is specified independently with the +-:option:`name` option, and there's no rule that says it has to be the same as ++``name`` option, and there's no rule that says it has to be the same as + the name of the sole module in the distribution (although that's probably a good + convention to follow). However, the distribution name is used to generate + filenames, so you should stick to letters, digits, underscores, and hyphens. + +-Since :option:`py_modules` is a list, you can of course specify multiple ++Since ``py_modules`` is a list, you can of course specify multiple + modules, eg. if you're distributing modules :mod:`foo` and :mod:`bar`, your + setup might look like this:: + +@@ -130,7 +130,7 @@ + ) + + If you want to put modules in directories not named for their package, then you +-need to use the :option:`package_dir` option again. For example, if the ++need to use the ``package_dir`` option again. For example, if the + :file:`src` directory holds modules in the :mod:`foobar` package:: + + / +@@ -169,8 +169,8 @@ + + (The empty string also stands for the current directory.) + +-If you have sub-packages, they must be explicitly listed in :option:`packages`, +-but any entries in :option:`package_dir` automatically extend to sub-packages. ++If you have sub-packages, they must be explicitly listed in ``packages``, ++but any entries in ``package_dir`` automatically extend to sub-packages. + (In other words, the Distutils does *not* scan your source tree, trying to + figure out which directories correspond to Python packages by looking for + :file:`__init__.py` files.) Thus, if the default layout grows a sub-package:: +@@ -199,8 +199,8 @@ + Single extension module + ======================= + +-Extension modules are specified using the :option:`ext_modules` option. +-:option:`package_dir` has no effect on where extension source files are found; ++Extension modules are specified using the ``ext_modules`` option. ++``package_dir`` has no effect on where extension source files are found; + it only affects the source for pure Python modules. The simplest case, a + single extension module in a single C source file, is:: + +diff -r ee879c0ffa11 Doc/distutils/extending.rst +--- a/Doc/distutils/extending.rst ++++ b/Doc/distutils/extending.rst +@@ -61,7 +61,7 @@ + requiring modifications to the Python installation. This is expected to allow + third-party extensions to provide support for additional packaging systems, but + the commands can be used for anything distutils commands can be used for. A new +-configuration option, :option:`command_packages` (command-line option ++configuration option, ``command_packages`` (command-line option + :option:`--command-packages`), can be used to specify additional packages to be + searched for modules implementing commands. Like all distutils options, this + can be specified on the command line or in a configuration file. This option +@@ -75,7 +75,7 @@ + packages searched for command implementations; multiple package names should be + separated by commas. When not specified, the search is only performed in the + :mod:`distutils.command` package. When :file:`setup.py` is run with the option +-:option:`--command-packages` :option:`distcmds,buildcmds`, however, the packages ++``--command-packages distcmds,buildcmds``, however, the packages + :mod:`distutils.command`, :mod:`distcmds`, and :mod:`buildcmds` will be searched + in that order. New commands are expected to be implemented in modules of the + same name as the command by classes sharing the same name. Given the example +diff -r ee879c0ffa11 Doc/distutils/packageindex.rst +--- a/Doc/distutils/packageindex.rst ++++ b/Doc/distutils/packageindex.rst +@@ -8,26 +8,57 @@ + The Python Package Index (PyPI) + ******************************* + +-The `Python Package Index (PyPI)`_ holds :ref:`meta-data ` ++The `Python Package Index (PyPI)`_ stores :ref:`meta-data ` + describing distributions packaged with distutils, as well as package data like +-distribution files if the package author wishes. ++distribution files if a package author wishes. ++ ++Distutils provides the :command:`register` and :command:`upload` commands for ++pushing meta-data and distribution files to PyPI, respectively. See ++:ref:`package-commands` for information on these commands. ++ ++ ++PyPI overview ++============= ++ ++PyPI lets you submit any number of versions of your distribution to the index. ++If you alter the meta-data for a particular version, you can submit it again ++and the index will be updated. ++ ++PyPI holds a record for each (name, version) combination submitted. The first ++user to submit information for a given name is designated the Owner of that ++name. Changes can be submitted through the :command:`register` command or ++through the web interface. Owners can designate other users as Owners or ++Maintainers. Maintainers can edit the package information, but not designate ++new Owners or Maintainers. ++ ++By default PyPI displays only the newest version of a given package. The web ++interface lets one change this default behavior and manually select which ++versions to display and hide. ++ ++For each version, PyPI displays a home page. The home page is created from ++the ``long_description`` which can be submitted via the :command:`register` ++command. See :ref:`package-display` for more information. ++ ++ ++.. _package-commands: ++ ++Distutils commands ++================== + + Distutils exposes two commands for submitting package data to PyPI: the + :ref:`register ` command for submitting meta-data to PyPI + and the :ref:`upload ` command for submitting distribution +-files. Both commands read configuration data from a special file called the +-:ref:`.pypirc file `. PyPI :ref:`displays a home page +-` for each package created from the ``long_description`` +-submitted by the :command:`register` command. ++files. Both commands read configuration data from a special file called a ++:ref:`.pypirc file `. + + + .. _package-register: + +-Registering Packages +-==================== ++The ``register`` command ++------------------------ + + The distutils command :command:`register` is used to submit your distribution's +-meta-data to the index. It is invoked as follows:: ++meta-data to an index server. It is invoked as follows:: + + python setup.py register + +@@ -42,7 +73,8 @@ + Your selection [default 1]: + + Note: if your username and password are saved locally, you will not see this +-menu. ++menu. Also, refer to :ref:`pypirc` for how to store your credentials in a ++:file:`.pypirc` file. + + If you have not registered with PyPI, then you will need to do so now. You + should choose option 2, and enter your details as required. Soon after +@@ -53,26 +85,13 @@ + prompted for your PyPI username and password, and :command:`register` will then + submit your meta-data to the index. + +-You may submit any number of versions of your distribution to the index. If you +-alter the meta-data for a particular version, you may submit it again and the +-index will be updated. +- +-PyPI holds a record for each (name, version) combination submitted. The first +-user to submit information for a given name is designated the Owner of that +-name. They may submit changes through the :command:`register` command or through +-the web interface. They may also designate other users as Owners or Maintainers. +-Maintainers may edit the package information, but not designate other Owners or +-Maintainers. +- +-By default PyPI displays only the newest version of a given package. The web +-interface lets one change this default behavior and manually select which +-versions to display and hide. ++See :ref:`package-cmdoptions` for options to the :command:`register` command. + + + .. _package-upload: + +-Uploading Packages +-================== ++The ``upload`` command ++---------------------- + + .. versionadded:: 2.5 + +@@ -88,29 +107,42 @@ + invocation of :file:`setup.py`, but that only distributions named on the command + line for the invocation including the :command:`upload` command are uploaded. + +-The :command:`upload` command uses the username, password, and repository URL +-from the :file:`$HOME/.pypirc` file (see section :ref:`pypirc` for more on this +-file). If a :command:`register` command was previously called in the same command, ++If a :command:`register` command was previously called in the same command, + and if the password was entered in the prompt, :command:`upload` will reuse the +-entered password. This is useful if you do not want to store a clear text +-password in the :file:`$HOME/.pypirc` file. +- +-You can specify another PyPI server with the ``--repository=url`` option:: +- +- python setup.py sdist bdist_wininst upload -r http://example.com/pypi +- +-See section :ref:`pypirc` for more on defining several servers. ++entered password. This is useful if you do not want to store a password in ++clear text in a :file:`.pypirc` file. + + You can use the ``--sign`` option to tell :command:`upload` to sign each + uploaded file using GPG (GNU Privacy Guard). The :program:`gpg` program must + be available for execution on the system :envvar:`PATH`. You can also specify + which key to use for signing using the ``--identity=name`` option. + +-Other :command:`upload` options include ``--repository=url`` or +-``--repository=section`` where *url* is the url of the server and +-*section* the name of the section in :file:`$HOME/.pypirc`, and +-``--show-response`` (which displays the full response text from the PyPI +-server for help in debugging upload problems). ++See :ref:`package-cmdoptions` for additional options to the :command:`upload` ++command. ++ ++ ++.. _package-cmdoptions: ++ ++Additional command options ++-------------------------- ++ ++This section describes options common to both the :command:`register` and ++:command:`upload` commands. ++ ++The ``--repository`` or ``-r`` option lets you specify a PyPI server ++different from the default. For example:: ++ ++ python setup.py sdist bdist_wininst upload -r https://example.com/pypi ++ ++For convenience, a name can be used in place of the URL when the ++:file:`.pypirc` file is configured to do so. For example:: ++ ++ python setup.py register -r other ++ ++See :ref:`pypirc` for more information on defining alternate servers. ++ ++The ``--show-response`` option displays the full response text from the PyPI ++server, which is useful when debugging problems with registering and uploading. + + + .. index:: +@@ -119,10 +151,14 @@ + + .. _pypirc: + +-The .pypirc file +-================ ++The ``.pypirc`` file ++-------------------- + +-The format of the :file:`.pypirc` file is as follows:: ++The :command:`register` and :command:`upload` commands both check for the ++existence of a :file:`.pypirc` file at the location :file:`$HOME/.pypirc`. ++If this file exists, the command uses the username, password, and repository ++URL configured in the file. The format of a :file:`.pypirc` file is as ++follows:: + + [distutils] + index-servers = +@@ -139,7 +175,7 @@ + Each section describing a repository defines three variables: + + - *repository*, that defines the url of the PyPI server. Defaults to +- ``http://www.python.org/pypi``. ++ ``https://www.python.org/pypi``. + - *username*, which is the registered username on the PyPI server. + - *password*, that will be used to authenticate. If omitted the user + will be prompt to type it when needed. +@@ -158,19 +194,17 @@ + password: + + [other] +- repository: http://example.com/pypi ++ repository: https://example.com/pypi + username: + password: + +-:command:`register` can then be called with the -r option to point the +-repository to work with:: ++This allows the :command:`register` and :command:`upload` commands to be ++called with the ``--repository`` option as described in ++:ref:`package-cmdoptions`. + +- python setup.py register -r http://example.com/pypi +- +-For convenience, the name of the section that describes the repository +-may also be used:: +- +- python setup.py register -r other ++Specifically, you might want to add the `PyPI Test Repository ++`_ to your ``.pypirc`` to facilitate ++testing before doing your first upload to ``PyPI`` itself. + + + .. _package-display: +@@ -212,4 +246,4 @@ + successfully. + + +-.. _Python Package Index (PyPI): http://pypi.python.org/ ++.. _Python Package Index (PyPI): https://pypi.python.org/pypi +diff -r ee879c0ffa11 Doc/distutils/setupscript.rst +--- a/Doc/distutils/setupscript.rst ++++ b/Doc/distutils/setupscript.rst +@@ -28,7 +28,7 @@ + description='Python Distribution Utilities', + author='Greg Ward', + author_email='gward@python.net', +- url='http://www.python.org/sigs/distutils-sig/', ++ url='https://www.python.org/sigs/distutils-sig/', + packages=['distutils', 'distutils.command'], + ) + +@@ -62,9 +62,9 @@ + Listing whole packages + ====================== + +-The :option:`packages` option tells the Distutils to process (build, distribute, ++The ``packages`` option tells the Distutils to process (build, distribute, + install, etc.) all pure Python modules found in each package mentioned in the +-:option:`packages` list. In order to do this, of course, there has to be a ++``packages`` list. In order to do this, of course, there has to be a + correspondence between package names and directories in the filesystem. The + default correspondence is the most obvious one, i.e. package :mod:`distutils` is + found in the directory :file:`distutils` relative to the distribution root. +@@ -75,7 +75,7 @@ + Distutils will issue a warning but still process the broken package anyway. + + If you use a different convention to lay out your source directory, that's no +-problem: you just have to supply the :option:`package_dir` option to tell the ++problem: you just have to supply the ``package_dir`` option to tell the + Distutils about your convention. For example, say you keep all Python source + under :file:`lib`, so that modules in the "root package" (i.e., not in any + package at all) are in :file:`lib`, modules in the :mod:`foo` package are in +@@ -94,13 +94,13 @@ + + package_dir = {'foo': 'lib'} + +-A ``package: dir`` entry in the :option:`package_dir` dictionary implicitly ++A ``package: dir`` entry in the ``package_dir`` dictionary implicitly + applies to all packages below *package*, so the :mod:`foo.bar` case is + automatically handled here. In this example, having ``packages = ['foo', + 'foo.bar']`` tells the Distutils to look for :file:`lib/__init__.py` and +-:file:`lib/bar/__init__.py`. (Keep in mind that although :option:`package_dir` ++:file:`lib/bar/__init__.py`. (Keep in mind that although ``package_dir`` + applies recursively, you must explicitly list all packages in +-:option:`packages`: the Distutils will *not* recursively scan your source tree ++``packages``: the Distutils will *not* recursively scan your source tree + looking for any directory with an :file:`__init__.py` file.) + + +@@ -120,7 +120,7 @@ + :mod:`pkg` package. Again, the default package/directory layout implies that + these two modules can be found in :file:`mod1.py` and :file:`pkg/mod2.py`, and + that :file:`pkg/__init__.py` exists as well. And again, you can override the +-package/directory correspondence using the :option:`package_dir` option. ++package/directory correspondence using the ``package_dir`` option. + + + .. _describing-extensions: +@@ -138,7 +138,7 @@ + .. XXX read over this section + + All of this is done through another keyword argument to :func:`setup`, the +-:option:`ext_modules` option. :option:`ext_modules` is just a list of ++``ext_modules`` option. ``ext_modules`` is just a list of + :class:`~distutils.core.Extension` instances, each of which describes a + single extension module. + Suppose your distribution includes a single extension, called :mod:`foo` and +@@ -181,7 +181,7 @@ + resulting extension lives. + + If you have a number of extensions all in the same package (or all under the +-same base package), use the :option:`ext_package` keyword argument to ++same base package), use the ``ext_package`` keyword argument to + :func:`setup`. For example, :: + + setup(..., +@@ -336,20 +336,20 @@ + + There are still some other options which can be used to handle special cases. + +-The :option:`extra_objects` option is a list of object files to be passed to the ++The ``extra_objects`` option is a list of object files to be passed to the + linker. These files must not have extensions, as the default extension for the + compiler is used. + +-:option:`extra_compile_args` and :option:`extra_link_args` can be used to ++``extra_compile_args`` and ``extra_link_args`` can be used to + specify additional command line options for the respective compiler and linker + command lines. + +-:option:`export_symbols` is only useful on Windows. It can contain a list of ++``export_symbols`` is only useful on Windows. It can contain a list of + symbols (functions or variables) to be exported. This option is not needed when + building compiled extensions: Distutils will automatically add ``initmodule`` + to the list of exported symbols. + +-The :option:`depends` option is a list of files that the extension depends on ++The ``depends`` option is a list of files that the extension depends on + (for example header files). The build command will call the compiler on the + sources to rebuild extension if any on this files has been modified since the + previous build. +@@ -445,7 +445,7 @@ + the current interpreter location. The :option:`--executable` (or :option:`-e`) + option will allow the interpreter path to be explicitly overridden. + +-The :option:`scripts` option simply is a list of files to be handled in this ++The ``scripts`` option simply is a list of files to be handled in this + way. From the PyXML setup script:: + + setup(..., +@@ -510,11 +510,11 @@ + Installing Additional Files + =========================== + +-The :option:`data_files` option can be used to specify additional files needed ++The ``data_files`` option can be used to specify additional files needed + by the module distribution: configuration files, message catalogs, data files, + anything which doesn't fit in the previous categories. + +-:option:`data_files` specifies a sequence of (*directory*, *files*) pairs in the ++``data_files`` specifies a sequence of (*directory*, *files*) pairs in the + following way:: + + setup(..., +@@ -535,7 +535,7 @@ + directory information from *files* is used to determine the final location of + the installed file; only the name of the file is used. + +-You can specify the :option:`data_files` options as a simple sequence of files ++You can specify the ``data_files`` options as a simple sequence of files + without specifying a target directory, but this is not recommended, and the + :command:`install` command will print a warning in this case. To install data + files directly in the target directory, an empty string should be given as the +@@ -606,7 +606,7 @@ + (4) + These fields should not be used if your package is to be compatible with Python + versions prior to 2.2.3 or 2.3. The list is available from the `PyPI website +- `_. ++ `_. + + (5) + The ``long_description`` field is used by PyPI when you are +@@ -625,7 +625,7 @@ + + 'long string' + Multiple lines of plain text in reStructuredText format (see +- http://docutils.sf.net/). ++ http://docutils.sourceforge.net/). + + 'list of strings' + See below. +@@ -649,7 +649,7 @@ + 1.0.1a2 + the second alpha release of the first patch version of 1.0 + +-:option:`classifiers` are specified in a Python list:: ++``classifiers`` are specified in a Python list:: + + setup(..., + classifiers=[ +diff -r ee879c0ffa11 Doc/distutils/sourcedist.rst +--- a/Doc/distutils/sourcedist.rst ++++ b/Doc/distutils/sourcedist.rst +@@ -71,16 +71,16 @@ + generate one), the :command:`sdist` command puts a minimal default set into the + source distribution: + +-* all Python source files implied by the :option:`py_modules` and +- :option:`packages` options ++* all Python source files implied by the ``py_modules`` and ++ ``packages`` options + +-* all C source files mentioned in the :option:`ext_modules` or +- :option:`libraries` options ++* all C source files mentioned in the ``ext_modules`` or ++ ``libraries`` options + + .. XXX Getting C library sources is currently broken -- no + :meth:`get_source_files` method in :file:`build_clib.py`! + +-* scripts identified by the :option:`scripts` option ++* scripts identified by the ``scripts`` option + See :ref:`distutils-installing-scripts`. + + * anything that looks like a test script: :file:`test/test\*.py` (currently, the +@@ -215,7 +215,7 @@ + + #. include all Python source files in the :file:`distutils` and + :file:`distutils/command` subdirectories (because packages corresponding to +- those two directories were mentioned in the :option:`packages` option in the ++ those two directories were mentioned in the ``packages`` option in the + setup script---see section :ref:`setup-script`) + + #. include :file:`README.txt`, :file:`setup.py`, and :file:`setup.cfg` (standard +diff -r ee879c0ffa11 Doc/extending/building.rst +--- a/Doc/extending/building.rst ++++ b/Doc/extending/building.rst +@@ -81,7 +81,7 @@ + description = 'This is a demo package', + author = 'Martin v. Loewis', + author_email = 'martin@v.loewis.de', +- url = 'http://docs.python.org/extending/building', ++ url = 'https://docs.python.org/extending/building', + long_description = ''' + This is really just a demo package. + ''', +diff -r ee879c0ffa11 Doc/extending/extending.rst +--- a/Doc/extending/extending.rst ++++ b/Doc/extending/extending.rst +@@ -89,8 +89,9 @@ + function. The C function always has two arguments, conventionally named *self* + and *args*. + +-The *self* argument points to the module object for module-level functions; +-for a method it would point to the object instance. ++For module functions, the *self* argument is *NULL* or a pointer selected while ++initializing the module (see :c:func:`Py_InitModule4`). For a method, it would ++point to the object instance. + + The *args* argument will be a pointer to a Python tuple object containing the + arguments. Each item of the tuple corresponds to an argument in the call's +diff -r ee879c0ffa11 Doc/extending/newtypes.rst +--- a/Doc/extending/newtypes.rst ++++ b/Doc/extending/newtypes.rst +@@ -25,7 +25,7 @@ + Python 2.2. This document documents how to define new types for Python 2.2 and + later. If you need to support older versions of Python, you will need to refer + to `older versions of this documentation +- `_. ++ `_. + + + .. _dnt-basics: +diff -r ee879c0ffa11 Doc/faq/design.rst +--- a/Doc/faq/design.rst ++++ b/Doc/faq/design.rst +@@ -49,7 +49,7 @@ + People are often very surprised by results like this:: + + >>> 1.2 - 1.0 +- 0.199999999999999996 ++ 0.19999999999999996 + + and think it is a bug in Python. It's not. This has nothing to do with Python, + but with how the underlying C platform handles floating point numbers, and +@@ -398,13 +398,13 @@ + ``x+1``. + + Several projects described in the Python newsgroup or at past `Python +-conferences `_ have shown that this ++conferences `_ have shown that this + approach is feasible, although the speedups reached so far are only modest + (e.g. 2x). Jython uses the same strategy for compiling to Java bytecode. (Jim + Hugunin has demonstrated that in combination with whole-program analysis, + speedups of 1000x are feasible for small demo programs. See the proceedings + from the `1997 Python conference +-`_ for more information.) ++`_ for more information.) + + Internally, Python source code is always translated into a bytecode + representation, and this bytecode is then executed by the Python virtual +@@ -429,12 +429,12 @@ + .. XXX check which of these projects are still alive + + There are also several programs which make it easier to intermingle Python and C +-code in various ways to increase performance. See, for example, `Psyco ++code in various ways to increase performance. See, for example, `Cython `_ , `Psyco + `_, `Pyrex + `_, `PyInline + `_, `Py2Cmod +-`_, and `Weave +-`_. ++`_, and ++`Weave `_. + + + How does Python manage memory? +@@ -712,62 +712,6 @@ + sloppy and not write test cases at all. + + +-Why are default values shared between objects? +----------------------------------------------- +- +-This type of bug commonly bites neophyte programmers. Consider this function:: +- +- def foo(mydict={}): # Danger: shared reference to one dict for all calls +- ... compute something ... +- mydict[key] = value +- return mydict +- +-The first time you call this function, ``mydict`` contains a single item. The +-second time, ``mydict`` contains two items because when ``foo()`` begins +-executing, ``mydict`` starts out with an item already in it. +- +-It is often expected that a function call creates new objects for default +-values. This is not what happens. Default values are created exactly once, when +-the function is defined. If that object is changed, like the dictionary in this +-example, subsequent calls to the function will refer to this changed object. +- +-By definition, immutable objects such as numbers, strings, tuples, and ``None``, +-are safe from change. Changes to mutable objects such as dictionaries, lists, +-and class instances can lead to confusion. +- +-Because of this feature, it is good programming practice to not use mutable +-objects as default values. Instead, use ``None`` as the default value and +-inside the function, check if the parameter is ``None`` and create a new +-list/dictionary/whatever if it is. For example, don't write:: +- +- def foo(mydict={}): +- ... +- +-but:: +- +- def foo(mydict=None): +- if mydict is None: +- mydict = {} # create a new dict for local namespace +- +-This feature can be useful. When you have a function that's time-consuming to +-compute, a common technique is to cache the parameters and the resulting value +-of each call to the function, and return the cached value if the same value is +-requested again. This is called "memoizing", and can be implemented like this:: +- +- # Callers will never provide a third parameter for this function. +- def expensive(arg1, arg2, _cache={}): +- if (arg1, arg2) in _cache: +- return _cache[(arg1, arg2)] +- +- # Calculate the value +- result = ... expensive computation ... +- _cache[(arg1, arg2)] = result # Store result in the cache +- return result +- +-You could use a global variable containing a dictionary instead of the default +-value; it's a matter of taste. +- +- + Why is there no goto? + --------------------- + +diff -r ee879c0ffa11 Doc/faq/extending.rst +--- a/Doc/faq/extending.rst ++++ b/Doc/faq/extending.rst +@@ -44,19 +44,20 @@ + very little effort, as long as you're running on a machine with an + x86-compatible processor. + +-`Pyrex `_ is a compiler +-that accepts a slightly modified form of Python and generates the corresponding ++`Cython `_ and its relative `Pyrex ++`_ are compilers ++that accept a slightly modified form of Python and generate the corresponding + C code. Pyrex makes it possible to write an extension without having to learn + Python's C API. + + If you need to interface to some C or C++ library for which no Python extension + currently exists, you can try wrapping the library's data types and functions + with a tool such as `SWIG `_. `SIP +-`__, `CXX ++`__, `CXX + `_ `Boost + `_, or `Weave +-`_ are also alternatives for wrapping +-C++ libraries. ++`_ are also ++alternatives for wrapping C++ libraries. + + + How can I execute arbitrary Python statements from C? +diff -r ee879c0ffa11 Doc/faq/general.rst +--- a/Doc/faq/general.rst ++++ b/Doc/faq/general.rst +@@ -25,7 +25,7 @@ + PCs under MS-DOS, Windows, Windows NT, and OS/2. + + To find out more, start with :ref:`tutorial-index`. The `Beginner's Guide to +-Python `_ links to other ++Python `_ links to other + introductory tutorials and resources for learning Python. + + +@@ -36,11 +36,11 @@ + holds the copyright on Python versions 2.1 and newer. The PSF's mission is to + advance open source technology related to the Python programming language and to + publicize the use of Python. The PSF's home page is at +-http://www.python.org/psf/. ++https://www.python.org/psf/. + + Donations to the PSF are tax-exempt in the US. If you use Python and find it + helpful, please contribute via `the PSF donation page +-`_. ++`_. + + + Are there copyright restrictions on the use of Python? +@@ -53,12 +53,12 @@ + unmodified), or to sell products that incorporate Python in some form. We would + still like to know about all commercial use of Python, of course. + +-See `the PSF license page `_ to find further ++See `the PSF license page `_ to find further + explanations and a link to the full text of the license. + + The Python logo is trademarked, and in certain cases permission is required to + use it. Consult `the Trademark Usage Policy +-`__ for more information. ++`__ for more information. + + + Why was Python created in the first place? +@@ -117,7 +117,7 @@ + Python code), and operating system interfaces (system calls, filesystems, TCP/IP + sockets). Look at the table of contents for :ref:`library-index` to get an idea + of what's available. A wide variety of third-party extensions are also +-available. Consult `the Python Package Index `_ to ++available. Consult `the Python Package Index `_ to + find packages of interest to you. + + +@@ -159,15 +159,16 @@ + -------------------------------------------- + + The latest Python source distribution is always available from python.org, at +-http://www.python.org/download/. The latest development sources can be obtained +-via anonymous Mercurial access at http://hg.python.org/cpython. ++https://www.python.org/download/. The latest development sources can be obtained ++via anonymous Mercurial access at https://hg.python.org/cpython. + + The source distribution is a gzipped tar file containing the complete C source, + Sphinx-formatted documentation, Python library modules, example programs, and + several useful pieces of freely distributable software. The source will compile + and run out of the box on most UNIX platforms. + +-Consult the `Developer FAQ `__ for more ++Consult the `Getting Started section of the Python Developer's Guide ++`__ for more + information on getting the source code and compiling it. + + +@@ -177,8 +178,8 @@ + .. XXX mention py3k + + The standard documentation for the current stable version of Python is available +-at http://docs.python.org/. PDF, plain text, and downloadable HTML versions are +-also available at http://docs.python.org/download.html. ++at https://docs.python.org/3/. PDF, plain text, and downloadable HTML versions are ++also available at https://docs.python.org/3/download.html. + + The documentation is written in reStructuredText and processed by `the Sphinx + documentation tool `__. The reStructuredText source for +@@ -191,7 +192,7 @@ + There are numerous tutorials and books available. The standard documentation + includes :ref:`tutorial-index`. + +-Consult `the Beginner's Guide `_ to ++Consult `the Beginner's Guide `_ to + find information for beginning Python programmers, including lists of tutorials. + + +@@ -199,7 +200,7 @@ + ------------------------------------------------------- + + There is a newsgroup, :newsgroup:`comp.lang.python`, and a mailing list, +-`python-list `_. The ++`python-list `_. The + newsgroup and mailing list are gatewayed into each other -- if you can read news + it's unnecessary to subscribe to the mailing list. + :newsgroup:`comp.lang.python` is high-traffic, receiving hundreds of postings +@@ -208,38 +209,38 @@ + Announcements of new software releases and events can be found in + comp.lang.python.announce, a low-traffic moderated list that receives about five + postings per day. It's available as `the python-announce mailing list +-`_. ++`_. + + More info about other mailing lists and newsgroups +-can be found at http://www.python.org/community/lists/. ++can be found at https://www.python.org/community/lists/. + + + How do I get a beta test version of Python? + ------------------------------------------- + +-Alpha and beta releases are available from http://www.python.org/download/. All ++Alpha and beta releases are available from https://www.python.org/download/. All + releases are announced on the comp.lang.python and comp.lang.python.announce +-newsgroups and on the Python home page at http://www.python.org/; an RSS feed of ++newsgroups and on the Python home page at https://www.python.org/; an RSS feed of + news is available. + +-You can also access the development version of Python through Subversion. See +-http://docs.python.org/devguide/faq for details. ++You can also access the development version of Python through Mercurial. See ++https://docs.python.org/devguide/faq.html for details. + + + How do I submit bug reports and patches for Python? + --------------------------------------------------- + + To report a bug or submit a patch, please use the Roundup installation at +-http://bugs.python.org/. ++https://bugs.python.org/. + + You must have a Roundup account to report bugs; this makes it possible for us to + contact you if we have follow-up questions. It will also enable Roundup to send + you updates as we act on your bug. If you had previously used SourceForge to + report bugs to Python, you can obtain your Roundup password through Roundup's +-`password reset procedure `_. ++`password reset procedure `_. + + For more information on how Python is developed, consult `the Python Developer's +-Guide `_. ++Guide `_. + + + Are there any published articles about Python that I can reference? +@@ -259,7 +260,7 @@ + ------------------------------ + + Yes, there are many, and more are being published. See the python.org wiki at +-http://wiki.python.org/moin/PythonBooks for a list. ++https://wiki.python.org/moin/PythonBooks for a list. + + You can also search online bookstores for "Python" and filter out the Monty + Python references; or perhaps search for "Python" and "language". +@@ -269,11 +270,12 @@ + --------------------------------------------- + + The Python project's infrastructure is located all over the world. +-`www.python.org `_ is currently in Amsterdam, graciously +-hosted by `XS4ALL `_. `Upfront Systems ++`www.python.org `_ is graciously hosted by `Rackspace ++`_, with CDN caching provided by `Fastly ++`_. `Upfront Systems + `_ hosts `bugs.python.org +-`_. Most other Python services like `PyPI +-`_ and hg.python.org are hosted by `Oregon State ++`_. Many other Python services like `the Wiki ++`_ are hosted by `Oregon State + University Open Source Lab `_. + + +@@ -282,7 +284,7 @@ + + When he began implementing Python, Guido van Rossum was also reading the + published scripts from `"Monty Python's Flying Circus" +-`__, a BBC comedy series from the 1970s. Van Rossum ++`__, a BBC comedy series from the 1970s. Van Rossum + thought he needed a name that was short, unique, and slightly mysterious, so he + decided to call the language Python. + +@@ -311,7 +313,7 @@ + releases. + + The latest stable releases can always be found on the `Python download page +-`_. There are two recommended production-ready ++`_. There are two recommended production-ready + versions at this point in time, because at the moment there are two branches of + stable releases: 2.x and 3.x. Python 3.x may be less useful than 2.x, since + currently there is more third party software available for Python 2 than for +@@ -335,9 +337,9 @@ + Have any significant projects been done in Python? + -------------------------------------------------- + +-See http://python.org/about/success for a list of projects that use Python. ++See https://www.python.org/about/success for a list of projects that use Python. + Consulting the proceedings for `past Python conferences +-`_ will reveal contributions from many ++`_ will reveal contributions from many + different companies and organizations. + + High-profile Python projects include `the Mailman mailing list manager +@@ -351,14 +353,14 @@ + What new developments are expected for Python in the future? + ------------------------------------------------------------ + +-See http://www.python.org/dev/peps/ for the Python Enhancement Proposals ++See https://www.python.org/dev/peps/ for the Python Enhancement Proposals + (PEPs). PEPs are design documents describing a suggested new feature for Python, + providing a concise technical specification and a rationale. Look for a PEP + titled "Python X.Y Release Schedule", where X.Y is a version that hasn't been + publicly released yet. + + New development is discussed on `the python-dev mailing list +-`_. ++`_. + + + Is it reasonable to propose incompatible changes to Python? +@@ -376,43 +378,6 @@ + changes while minimizing disruption for users. + + +-Is Python Y2K (Year 2000) Compliant? +------------------------------------- +- +-.. remove this question? +- +-As of August, 2003 no major problems have been reported and Y2K compliance seems +-to be a non-issue. +- +-Python does very few date calculations and for those it does perform relies on +-the C library functions. Python generally represents times either as seconds +-since 1970 or as a ``(year, month, day, ...)`` tuple where the year is expressed +-with four digits, which makes Y2K bugs unlikely. So as long as your C library +-is okay, Python should be okay. Of course, it's possible that a particular +-application written in Python makes assumptions about 2-digit years. +- +-Because Python is available free of charge, there are no absolute guarantees. +-If there *are* unforeseen problems, liability is the user's problem rather than +-the developers', and there is nobody you can sue for damages. The Python +-copyright notice contains the following disclaimer: +- +- 4. PSF is making Python 2.3 available to Licensee on an "AS IS" +- basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY +- WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY +- REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR +- PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT INFRINGE ANY THIRD PARTY +- RIGHTS. +- +- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +- 2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3, +- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. +- +-The good news is that *if* you encounter a problem, you have full source +-available to track it down and fix it. This is one advantage of an open source +-programming environment. +- +- + Is Python a good language for beginning programmers? + ---------------------------------------------------- + +@@ -451,14 +416,22 @@ + remember the methods for a list, they can do something like this:: + + >>> L = [] +- >>> dir(L) +- ['append', 'count', 'extend', 'index', 'insert', 'pop', 'remove', +- 'reverse', 'sort'] ++ >>> dir(L) # doctest: +NORMALIZE_WHITESPACE ++ ['__add__', '__class__', '__contains__', '__delattr__', '__delitem__', ++ '__delslice__', '__doc__', '__eq__', '__format__', '__ge__', ++ '__getattribute__', '__getitem__', '__getslice__', '__gt__', ++ '__hash__', '__iadd__', '__imul__', '__init__', '__iter__', '__le__', ++ '__len__', '__lt__', '__mul__', '__ne__', '__new__', '__reduce__', ++ '__reduce_ex__', '__repr__', '__reversed__', '__rmul__', ++ '__setattr__', '__setitem__', '__setslice__', '__sizeof__', '__str__', ++ '__subclasshook__', 'append', 'count', 'extend', 'index', 'insert', ++ 'pop', 'remove', 'reverse', 'sort'] + >>> help(L.append) + Help on built-in function append: +- ++ + append(...) + L.append(object) -- append object to end ++ + >>> L.append(1) + >>> L + [1] +@@ -476,7 +449,7 @@ + + If you want to discuss Python's use in education, you may be interested in + joining `the edu-sig mailing list +-`_. ++`_. + + + Upgrading Python +diff -r ee879c0ffa11 Doc/faq/gui.rst +--- a/Doc/faq/gui.rst ++++ b/Doc/faq/gui.rst +@@ -48,14 +48,14 @@ + --- + + There are bindings available for the Qt toolkit (using either `PyQt +-`_ or `PySide +-`_) and for KDE (`PyKDE `_). ++`_ or `PySide ++`_) and for KDE (`PyKDE `__). + PyQt is currently more mature than PySide, but you must buy a PyQt license from + `Riverbank Computing `_ + if you want to write proprietary applications. PySide is free for all applications. + + Qt 4.5 upwards is licensed under the LGPL license; also, commercial licenses +-are available from `Nokia `_. ++are available from `The Qt Company `_. + + Gtk+ + ---- +@@ -89,7 +89,7 @@ + ======================================================== + + By installing the `PyObjc Objective-C bridge +-`_, Python programs can use Mac OS X's ++`_, Python programs can use Mac OS X's + Cocoa libraries. + + :ref:`Pythonwin ` by Mark Hammond includes an interface to the +diff -r ee879c0ffa11 Doc/faq/installed.rst +--- a/Doc/faq/installed.rst ++++ b/Doc/faq/installed.rst +@@ -11,7 +11,7 @@ + software developers at places such as Google, NASA, and Lucasfilm Ltd. + + If you wish to learn more about Python, start with the `Beginner's Guide to +-Python `_. ++Python `_. + + + Why is Python installed on my machine? +diff -r ee879c0ffa11 Doc/faq/library.rst +--- a/Doc/faq/library.rst ++++ b/Doc/faq/library.rst +@@ -19,7 +19,7 @@ + library and will be able to skip this step.) + + For third-party packages, search the `Python Package Index +-`_ or try `Google `_ or ++`_ or try `Google `_ or + another Web search engine. Searching for "Python" plus a keyword or two for + your topic of interest will usually find something helpful. + +@@ -181,8 +181,8 @@ + + The :mod:`pydoc` module can create HTML from the doc strings in your Python + source code. An alternative for creating API documentation purely from +-docstrings is `epydoc `_. `Sphinx +-`_ can also include docstring content. ++docstrings is `epydoc `_. `Sphinx ++`_ can also include docstring content. + + + How do I get a single keypress at a time? +@@ -585,7 +585,7 @@ + ("ptys") instead of pipes. Or you can use a Python interface to Don Libes' + "expect" library. A Python extension that interfaces to expect is called "expy" + and available from http://expectpy.sourceforge.net. A pure Python solution that +-works like expect is `pexpect `_. ++works like expect is `pexpect `_. + + + How do I access the serial (RS232) port? +@@ -640,7 +640,7 @@ + .. XXX check if wiki page is still up to date + + A summary of available frameworks is maintained by Paul Boddie at +-http://wiki.python.org/moin/WebProgramming\ . ++https://wiki.python.org/moin/WebProgramming\ . + + Cameron Laird maintains a useful set of pages about Python web technologies at + http://phaseit.net/claird/comp.lang.python/web_python. +@@ -691,7 +691,7 @@ + .. XXX add modern template languages + + You can find a collection of useful links on the `Web Programming wiki page +-`_. ++`_. + + + How do I send mail from a Python script? +@@ -771,7 +771,7 @@ + + Support for most relational databases is available. See the + `DatabaseProgramming wiki page +-`_ for details. ++`_ for details. + + + How do you implement persistent objects in Python? +diff -r ee879c0ffa11 Doc/faq/programming.rst +--- a/Doc/faq/programming.rst ++++ b/Doc/faq/programming.rst +@@ -23,15 +23,14 @@ + + The IDLE interactive development environment, which is part of the standard + Python distribution (normally available as Tools/scripts/idle), includes a +-graphical debugger. There is documentation for the IDLE debugger at +-http://www.python.org/idle/doc/idle2.html#Debugger. ++graphical debugger. + + PythonWin is a Python IDE that includes a GUI debugger based on pdb. The + Pythonwin debugger colors breakpoints and has quite a few cool features such as + debugging non-Pythonwin programs. Pythonwin is available as part of the `Python + for Windows Extensions `__ project and + as a part of the ActivePython distribution (see +-http://www.activestate.com/Products/ActivePython/index.html). ++http://www.activestate.com/activepython\ ). + + `Boa Constructor `_ is an IDE and GUI + builder that uses wxWidgets. It offers visual frame creation and manipulation, +@@ -39,7 +38,7 @@ + hierarchies, doc string generated html documentation, an advanced debugger, + integrated help, and Zope support. + +-`Eric `_ is an IDE built on PyQt ++`Eric `_ is an IDE built on PyQt + and the Scintilla editing component. + + Pydb is a version of the standard Python debugger pdb, modified for use with DDD +@@ -51,7 +50,8 @@ + They include: + + * Wing IDE (http://wingware.com/) +-* Komodo IDE (http://www.activestate.com/Products/Komodo) ++* Komodo IDE (http://komodoide.com/) ++* PyCharm (https://www.jetbrains.com/pycharm/) + + + Is there a tool to help find bugs or perform static analysis? +@@ -61,7 +61,7 @@ + + PyChecker is a static analysis tool that finds bugs in Python source code and + warns about code complexity and style. You can get PyChecker from +-http://pychecker.sf.net. ++http://pychecker.sourceforge.net/. + + `Pylint `_ is another tool that checks + if a module satisfies a coding standard, and also makes it possible to write +@@ -69,8 +69,7 @@ + PyChecker performs, Pylint offers some additional features such as checking line + length, whether variable names are well-formed according to your coding + standard, whether declared interfaces are fully implemented, and more. +-http://www.logilab.org/card/pylint_manual provides a full list of Pylint's +-features. ++http://docs.pylint.org/ provides a full list of Pylint's features. + + + How can I create a stand-alone binary from a Python script? +@@ -101,13 +100,7 @@ + + http://www.py2exe.org/ + +-Another is Christian Tismer's `SQFREEZE `_ +-which appends the byte code to a specially-prepared Python interpreter that can +-find the byte code in the executable. +- +-Other tools include Fredrik Lundh's `Squeeze +-`_ and Anthony Tuininga's +-`cx_Freeze `_. ++Another tool is Anthony Tuininga's `cx_Freeze `_. + + + Are there coding standards or a style guide for Python programs? +@@ -146,10 +139,10 @@ + benefit is worth it. + + There is a page on the wiki devoted to `performance tips +-`_. ++`_. + + Guido van Rossum has written up an anecdote related to optimization at +-http://www.python.org/doc/essays/list2str. ++https://www.python.org/doc/essays/list2str. + + One thing to notice is that function and (especially) method calls are rather + expensive; if you have designed a purely OO interface with lots of tiny +@@ -207,7 +200,7 @@ + operations ` ``string % tuple`` and ``string % dictionary``. + + Be sure to use the :meth:`list.sort` built-in method to do sorting, and see the +-`sorting mini-HOWTO `_ for examples ++`sorting mini-HOWTO `_ for examples + of moderately advanced usage. :meth:`list.sort` beats other techniques for + sorting in all but the most extreme circumstances. + +@@ -438,9 +431,8 @@ + ----------------------------------------------------------- + + In general, don't use ``from modulename import *``. Doing so clutters the +-importer's namespace. Some people avoid this idiom even with the few modules +-that were designed to be imported in this manner. Modules designed in this +-manner include :mod:`Tkinter`, and :mod:`threading`. ++importer's namespace, and makes it much harder for linters to detect undefined ++names. + + Import modules at the top of a file. Doing so makes it clear what other modules + your code requires and avoids questions of whether the module name is in scope. +@@ -454,11 +446,10 @@ + directory) -- e.g. mx.DateTime, ZODB, PIL.Image, etc. + 3. locally-developed modules + +-Never use relative package imports. If you're writing code that's in the +-``package.sub.m1`` module and want to import ``package.sub.m2``, do not just ++Only use explicit relative package imports. If you're writing code that's in ++the ``package.sub.m1`` module and want to import ``package.sub.m2``, do not just + write ``import m2``, even though it's legal. Write ``from package.sub import +-m2`` instead. Relative imports can lead to a module being initialized twice, +-leading to confusing bugs. See :pep:`328` for details. ++m2`` or ``from . import m2`` instead. + + It is sometimes necessary to move imports to a function or class to avoid + problems with circular imports. Gordon McMillan says: +@@ -490,13 +481,61 @@ + couple of dictionary lookups. Even if the module name has gone out of scope, + the module is probably available in :data:`sys.modules`. + +-If only instances of a specific class use a module, then it is reasonable to +-import the module in the class's ``__init__`` method and then assign the module +-to an instance variable so that the module is always available (via that +-instance variable) during the life of the object. Note that to delay an import +-until the class is instantiated, the import must be inside a method. Putting +-the import inside the class but outside of any method still causes the import to +-occur when the module is initialized. ++ ++Why are default values shared between objects? ++---------------------------------------------- ++ ++This type of bug commonly bites neophyte programmers. Consider this function:: ++ ++ def foo(mydict={}): # Danger: shared reference to one dict for all calls ++ ... compute something ... ++ mydict[key] = value ++ return mydict ++ ++The first time you call this function, ``mydict`` contains a single item. The ++second time, ``mydict`` contains two items because when ``foo()`` begins ++executing, ``mydict`` starts out with an item already in it. ++ ++It is often expected that a function call creates new objects for default ++values. This is not what happens. Default values are created exactly once, when ++the function is defined. If that object is changed, like the dictionary in this ++example, subsequent calls to the function will refer to this changed object. ++ ++By definition, immutable objects such as numbers, strings, tuples, and ``None``, ++are safe from change. Changes to mutable objects such as dictionaries, lists, ++and class instances can lead to confusion. ++ ++Because of this feature, it is good programming practice to not use mutable ++objects as default values. Instead, use ``None`` as the default value and ++inside the function, check if the parameter is ``None`` and create a new ++list/dictionary/whatever if it is. For example, don't write:: ++ ++ def foo(mydict={}): ++ ... ++ ++but:: ++ ++ def foo(mydict=None): ++ if mydict is None: ++ mydict = {} # create a new dict for local namespace ++ ++This feature can be useful. When you have a function that's time-consuming to ++compute, a common technique is to cache the parameters and the resulting value ++of each call to the function, and return the cached value if the same value is ++requested again. This is called "memoizing", and can be implemented like this:: ++ ++ # Callers will never provide a third parameter for this function. ++ def expensive(arg1, arg2, _cache={}): ++ if (arg1, arg2) in _cache: ++ return _cache[(arg1, arg2)] ++ ++ # Calculate the value ++ result = ... expensive computation ... ++ _cache[(arg1, arg2)] = result # Store result in the cache ++ return result ++ ++You could use a global variable containing a dictionary instead of the default ++value; it's a matter of taste. + + + How can I pass optional or keyword parameters from one function to another? +@@ -548,6 +587,81 @@ + the values ``42``, ``314``, and ``somevar`` are arguments. + + ++Why did changing list 'y' also change list 'x'? ++------------------------------------------------ ++ ++If you wrote code like:: ++ ++ >>> x = [] ++ >>> y = x ++ >>> y.append(10) ++ >>> y ++ [10] ++ >>> x ++ [10] ++ ++you might be wondering why appending an element to ``y`` changed ``x`` too. ++ ++There are two factors that produce this result: ++ ++1) Variables are simply names that refer to objects. Doing ``y = x`` doesn't ++ create a copy of the list -- it creates a new variable ``y`` that refers to ++ the same object ``x`` refers to. This means that there is only one object ++ (the list), and both ``x`` and ``y`` refer to it. ++2) Lists are :term:`mutable`, which means that you can change their content. ++ ++After the call to :meth:`~list.append`, the content of the mutable object has ++changed from ``[]`` to ``[10]``. Since both the variables refer to the same ++object, using either name accesses the modified value ``[10]``. ++ ++If we instead assign an immutable object to ``x``:: ++ ++ >>> x = 5 # ints are immutable ++ >>> y = x ++ >>> x = x + 1 # 5 can't be mutated, we are creating a new object here ++ >>> x ++ 6 ++ >>> y ++ 5 ++ ++we can see that in this case ``x`` and ``y`` are not equal anymore. This is ++because integers are :term:`immutable`, and when we do ``x = x + 1`` we are not ++mutating the int ``5`` by incrementing its value; instead, we are creating a ++new object (the int ``6``) and assigning it to ``x`` (that is, changing which ++object ``x`` refers to). After this assignment we have two objects (the ints ++``6`` and ``5``) and two variables that refer to them (``x`` now refers to ++``6`` but ``y`` still refers to ``5``). ++ ++Some operations (for example ``y.append(10)`` and ``y.sort()``) mutate the ++object, whereas superficially similar operations (for example ``y = y + [10]`` ++and ``sorted(y)``) create a new object. In general in Python (and in all cases ++in the standard library) a method that mutates an object will return ``None`` ++to help avoid getting the two types of operations confused. So if you ++mistakenly write ``y.sort()`` thinking it will give you a sorted copy of ``y``, ++you'll instead end up with ``None``, which will likely cause your program to ++generate an easily diagnosed error. ++ ++However, there is one class of operations where the same operation sometimes ++has different behaviors with different types: the augmented assignment ++operators. For example, ``+=`` mutates lists but not tuples or ints (``a_list +++= [1, 2, 3]`` is equivalent to ``a_list.extend([1, 2, 3])`` and mutates ++``a_list``, whereas ``some_tuple += (1, 2, 3)`` and ``some_int += 1`` create ++new objects). ++ ++In other words: ++ ++* If we have a mutable object (:class:`list`, :class:`dict`, :class:`set`, ++ etc.), we can use some specific operations to mutate it and all the variables ++ that refer to it will see the change. ++* If we have an immutable object (:class:`str`, :class:`int`, :class:`tuple`, ++ etc.), all the variables that refer to it will always see the same value, ++ but operations that transform that value into a new value always return a new ++ object. ++ ++If you want to know if two variables refer to the same object or not, you can ++use the :keyword:`is` operator, or the built-in function :func:`id`. ++ ++ + How do I write a function with output parameters (call by reference)? + --------------------------------------------------------------------- + +@@ -1113,7 +1227,7 @@ + + See the Python Cookbook for a long discussion of many ways to do this: + +- http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560 ++ http://code.activestate.com/recipes/52560/ + + If you don't mind reordering the list, sort it and then scan from the end of the + list, deleting duplicates as you go:: +@@ -1869,19 +1983,10 @@ + __import__('x.y.z') returns ; how do I get z? + --------------------------------------------------------- + +-Try:: +- +- __import__('x.y.z').y.z +- +-For more realistic situations, you may have to do something like :: +- +- m = __import__(s) +- for i in s.split(".")[1:]: +- m = getattr(m, i) +- +-See :mod:`importlib` for a convenience function called +-:func:`~importlib.import_module`. +- ++Consider using the convenience function :func:`~importlib.import_module` from ++:mod:`importlib` instead:: ++ ++ z = importlib.import_module('x.y.z') + + + When I edit an imported module and reimport it, the changes don't show up. Why does this happen? +diff -r ee879c0ffa11 Doc/faq/windows.rst +--- a/Doc/faq/windows.rst ++++ b/Doc/faq/windows.rst +@@ -27,7 +27,7 @@ + + .. |Python Development on XP| image:: python-video-icon.png + .. _`Python Development on XP`: +- http://www.showmedo.com/videos/series?name=pythonOzsvaldPyNewbieSeries ++ http://showmedo.com/videotutorials/series?name=pythonOzsvaldPyNewbieSeries + + Unless you use some sort of integrated development environment, you will end up + *typing* Windows commands into what is variously referred to as a "DOS window" +@@ -74,7 +74,7 @@ + >>> print "Hello" + Hello + >>> "Hello" * 3 +- HelloHelloHello ++ 'HelloHelloHello' + + Many people use the interactive mode as a convenient yet highly programmable + calculator. When you want to end your interactive Python session, hold the Ctrl +@@ -101,7 +101,7 @@ + + .. |Adding Python to DOS Path| image:: python-video-icon.png + .. _`Adding Python to DOS Path`: +- http://showmedo.com/videos/video?name=960000&fromSeriesID=96 ++ http://showmedo.com/videotutorials/video?name=960000&fromSeriesID=96 + + + or:: +diff -r ee879c0ffa11 Doc/glossary.rst +--- a/Doc/glossary.rst ++++ b/Doc/glossary.rst +@@ -75,7 +75,7 @@ + + BDFL + Benevolent Dictator For Life, a.k.a. `Guido van Rossum +- `_, Python's creator. ++ `_, Python's creator. + + bytes-like object + An object that supports the :ref:`buffer protocol `, +@@ -140,7 +140,7 @@ + + CPython + The canonical implementation of the Python programming language, as +- distributed on `python.org `_. The term "CPython" ++ distributed on `python.org `_. The term "CPython" + is used when necessary to distinguish this implementation from others + such as Jython or IronPython. + +@@ -408,10 +408,10 @@ + + iterator + An object representing a stream of data. Repeated calls to the iterator's +- :meth:`next` method return successive items in the stream. When no more ++ :meth:`~generator.next` method return successive items in the stream. When no more + data are available a :exc:`StopIteration` exception is raised instead. At + this point, the iterator object is exhausted and any further calls to its +- :meth:`next` method just raise :exc:`StopIteration` again. Iterators are ++ :meth:`~generator.next` method just raise :exc:`StopIteration` again. Iterators are + required to have an :meth:`__iter__` method that returns the iterator + object itself so every iterator is also iterable and may be used in most + places where other iterables are accepted. One notable exception is code +@@ -511,7 +511,7 @@ + method resolution order + Method Resolution Order is the order in which base classes are searched + for a member during lookup. See `The Python 2.3 Method Resolution Order +- `_. ++ `_. + + module + An object that serves as an organizational unit of Python code. Modules +diff -r ee879c0ffa11 Doc/howto/argparse.rst +--- a/Doc/howto/argparse.rst ++++ b/Doc/howto/argparse.rst +@@ -8,6 +8,8 @@ + + This tutorial is intended to be a gentle introduction to :mod:`argparse`, the + recommended command-line parsing module in the Python standard library. ++This was written for argparse in Python 3. A few details are different in 2.x, ++especially some exception messages, which were improved in 3.x. + + .. note:: + +diff -r ee879c0ffa11 Doc/howto/cporting.rst +--- a/Doc/howto/cporting.rst ++++ b/Doc/howto/cporting.rst +@@ -43,10 +43,9 @@ + str/unicode Unification + ----------------------- + +- +-Python 3's :func:`str` (``PyString_*`` functions in C) type is equivalent to +-Python 2's :func:`unicode` (``PyUnicode_*``). The old 8-bit string type has +-become :func:`bytes`. Python 2.6 and later provide a compatibility header, ++Python 3's :func:`str` type is equivalent to Python 2's :func:`unicode`; the C ++functions are called ``PyUnicode_*`` for both. The old 8-bit string type has become ++:func:`bytes`, with C functions called ``PyBytes_*``. Python 2.6 and later provide a compatibility header, + :file:`bytesobject.h`, mapping ``PyBytes`` names to ``PyString`` ones. For best + compatibility with Python 3, :c:type:`PyUnicode` should be used for textual data and + :c:type:`PyBytes` for binary data. It's also important to remember that +@@ -253,6 +252,6 @@ + ============= + + If you are writing a new extension module, you might consider `Cython +-`_. It translates a Python-like language to C. The ++`_. It translates a Python-like language to C. The + extension modules it creates are compatible with Python 3 and Python 2. + +diff -r ee879c0ffa11 Doc/howto/descriptor.rst +--- a/Doc/howto/descriptor.rst ++++ b/Doc/howto/descriptor.rst +@@ -96,9 +96,9 @@ + transforms ``b.x`` into ``type(b).__dict__['x'].__get__(b, type(b))``. The + implementation works through a precedence chain that gives data descriptors + priority over instance variables, instance variables priority over non-data +-descriptors, and assigns lowest priority to :meth:`__getattr__` if provided. The +-full C implementation can be found in :c:func:`PyObject_GenericGetAttr()` in +-`Objects/object.c `_\. ++descriptors, and assigns lowest priority to :meth:`__getattr__` if provided. ++The full C implementation can be found in :c:func:`PyObject_GenericGetAttr()` in ++:source:`Objects/object.c`. + + For classes, the machinery is in :meth:`type.__getattribute__` which transforms + ``B.x`` into ``B.__dict__['x'].__get__(None, B)``. In pure Python, it looks +@@ -131,11 +131,9 @@ + Note, in Python 2.2, ``super(B, obj).m()`` would only invoke :meth:`__get__` if + ``m`` was a data descriptor. In Python 2.3, non-data descriptors also get + invoked unless an old-style class is involved. The implementation details are +-in :c:func:`super_getattro()` in +-`Objects/typeobject.c `_ +-and a pure Python equivalent can be found in `Guido's Tutorial`_. ++in :c:func:`super_getattro()` in :source:`Objects/typeobject.c`. + +-.. _`Guido's Tutorial`: http://www.python.org/2.2.3/descrintro.html#cooperation ++.. _`Guido's Tutorial`: https://www.python.org/download/releases/2.2.3/descrintro/#cooperation + + The details above show that the mechanism for descriptors is embedded in the + :meth:`__getattribute__()` methods for :class:`object`, :class:`type`, and +@@ -308,10 +306,9 @@ + + The output suggests that bound and unbound methods are two different types. + While they could have been implemented that way, the actual C implementation of +-:c:type:`PyMethod_Type` in +-`Objects/classobject.c `_ +-is a single object with two different representations depending on whether the +-:attr:`im_self` field is set or is *NULL* (the C equivalent of *None*). ++:c:type:`PyMethod_Type` in :source:`Objects/classobject.c` is a single object ++with two different representations depending on whether the :attr:`im_self` ++field is set or is *NULL* (the C equivalent of *None*). + + Likewise, the effects of calling a method object depend on the :attr:`im_self` + field. If set (meaning bound), the original function (stored in the +diff -r ee879c0ffa11 Doc/howto/functional.rst +--- a/Doc/howto/functional.rst ++++ b/Doc/howto/functional.rst +@@ -741,7 +741,7 @@ + [9878, 9828, 8442, 7953, 6431, 6213, 2207, 769] + + (For a more detailed discussion of sorting, see the Sorting mini-HOWTO in the +-Python wiki at http://wiki.python.org/moin/HowTo/Sorting.) ++Python wiki at https://wiki.python.org/moin/HowTo/Sorting.) + + The ``any(iter)`` and ``all(iter)`` built-ins look at the truth values of an + iterable's contents. :func:`any` returns ``True`` if any element in the iterable is +diff -r ee879c0ffa11 Doc/howto/logging-cookbook.rst +--- a/Doc/howto/logging-cookbook.rst ++++ b/Doc/howto/logging-cookbook.rst +@@ -587,7 +587,7 @@ + not make use of :mod:`multiprocessing` at present, though they may do so in the + future. Note that at present, the :mod:`multiprocessing` module does not provide + working lock functionality on all platforms (see +-http://bugs.python.org/issue3770). ++https://bugs.python.org/issue3770). + + + Using file rotation +@@ -846,15 +846,20 @@ + There are times when you want to customize logging handlers in particular ways, + and if you use :func:`dictConfig` you may be able to do this without + subclassing. As an example, consider that you may want to set the ownership of a +-log file. On POSIX, this is easily done using :func:`shutil.chown`, but the file ++log file. On POSIX, this is easily done using :func:`os.chown`, but the file + handlers in the stdlib don't offer built-in support. You can customize handler + creation using a plain function such as:: + + def owned_file_handler(filename, mode='a', encoding=None, owner=None): + if owner: ++ import os, pwd, grp ++ # convert user and group names to uid and gid ++ uid = pwd.getpwnam(owner[0]).pw_uid ++ gid = grp.getgrnam(owner[1]).gr_gid ++ owner = (uid, gid) + if not os.path.exists(filename): + open(filename, 'a').close() +- shutil.chown(filename, *owner) ++ os.chown(filename, *owner) + return logging.FileHandler(filename, mode, encoding) + + You can then specify, in a logging configuration passed to :func:`dictConfig`, +diff -r ee879c0ffa11 Doc/howto/pyporting.rst +--- a/Doc/howto/pyporting.rst ++++ b/Doc/howto/pyporting.rst +@@ -39,7 +39,9 @@ + + With that done, your options are: + +-* If you are dropping Python 2 support, use 2to3_ to port to Python 3 ++* If you are dropping Python 2 support, use :ref:`2to3 <2to3-reference>` to port ++ to Python 3 ++ + * If you are keeping Python 2 support, then start writing Python 2/3-compatible + code starting **TODAY** + +@@ -84,11 +86,11 @@ + tend to be simpler than the code they are testing so it gives you an idea of how + easy it can be to port code. + +-Drop support for older Python versions if possible. `Python 2.5`_ ++Drop support for older Python versions if possible. Python 2.5 + introduced a lot of useful syntax and libraries which have become idiomatic +-in Python 3. `Python 2.6`_ introduced future statements which makes ++in Python 3. Python 2.6 introduced future statements which makes + compatibility much easier if you are going from Python 2 to 3. +-`Python 2.7`_ continues the trend in the stdlib. Choose the newest version ++Python 2.7 continues the trend in the stdlib. Choose the newest version + of Python which you believe can be your minimum support version + and work from there. + +@@ -142,19 +144,19 @@ + Support Python 2.7 + ////////////////// + +-As a first step, make sure that your project is compatible with `Python 2.7`_. ++As a first step, make sure that your project is compatible with Python 2.7. + This is just good to do as Python 2.7 is the last release of Python 2 and thus + will be used for a rather long time. It also allows for use of the ``-3`` flag + to Python to help discover places in your code where compatibility might be an + issue (the ``-3`` flag is in Python 2.6 but Python 2.7 adds more warnings). + +-Try to Support `Python 2.6`_ and Newer Only +-/////////////////////////////////////////// ++Try to Support Python 2.6 and Newer Only ++//////////////////////////////////////// + +-While not possible for all projects, if you can support `Python 2.6`_ and newer ++While not possible for all projects, if you can support Python 2.6 and newer + **only**, your life will be much easier. Various future statements, stdlib + additions, etc. exist only in Python 2.6 and later which greatly assist in +-supporting Python 3. But if you project must keep support for `Python 2.5`_ then ++supporting Python 3. But if you project must keep support for Python 2.5 then + it is still possible to simultaneously support Python 3. + + Below are the benefits you gain if you only have to support Python 2.6 and +@@ -213,10 +215,10 @@ + prevent yourself from accidentally using implicit relative imports. + + +-Supporting `Python 2.5`_ and Newer Only +-/////////////////////////////////////// ++Supporting Python 2.5 and Newer Only ++//////////////////////////////////// + +-If you are supporting `Python 2.5`_ and newer there are still some features of ++If you are supporting Python 2.5 and newer there are still some features of + Python that you can utilize. + + +@@ -228,11 +230,11 @@ + This future statement moves away from that and allows the use of explicit + relative imports (e.g., ``from . import bacon``). + +-In `Python 2.5`_ you must use ++In Python 2.5 you must use + the __future__ statement to get to use explicit relative imports and prevent +-implicit ones. In `Python 2.6`_ explicit relative imports are available without ++implicit ones. In Python 2.6 explicit relative imports are available without + the statement, but you still want the __future__ statement to prevent implicit +-relative imports. In `Python 2.7`_ the __future__ statement is not needed. In ++relative imports. In Python 2.7 the __future__ statement is not needed. In + other words, unless you are only supporting Python 2.7 or a version earlier + than Python 2.5, use this __future__ statement. + +@@ -259,7 +261,7 @@ + # Current exception is 'exc'. + pass + +-This syntax changed in Python 3 (and backported to `Python 2.6`_ and later) ++This syntax changed in Python 3 (and backported to Python 2.6 and later) + to:: + + try: +@@ -345,7 +347,7 @@ + Subclass ``object`` + ''''''''''''''''''' + +-New-style classes have been around since `Python 2.2`_. You need to make sure ++New-style classes have been around since Python 2.2. You need to make sure + you are subclassing from ``object`` to avoid odd edge cases involving method + resolution order, etc. This continues to be totally valid in Python 3 (although + unneeded as all classes implicitly inherit from ``object``). +@@ -533,7 +535,7 @@ + ''''''''''''''''''''''''''''''''''''''''''''' + + With Python 2, when ``map`` was given more than one input sequence it would pad +-the shorter sequences with `None` values, returning a sequence as long as the ++the shorter sequences with ``None`` values, returning a sequence as long as the + longest input sequence. + + With Python 3, if the input sequences to ``map`` are of unequal length, ``map`` +@@ -588,7 +590,7 @@ + thus helping provide information for this document and its various revisions + over the years): + +-* http://wiki.python.org/moin/PortingPythonToPy3k ++* https://wiki.python.org/moin/PortingPythonToPy3k + * http://python3porting.com/ + * http://docs.pythonsprints.com/python3_porting/py-porting.html + * http://techspot.zzzeek.org/2011/01/24/zzzeek-s-guide-to-python-3-porting/ +@@ -601,25 +603,16 @@ + please email the python-porting_ mailing list. + + +- +-.. _2to3: http://docs.python.org/2/library/2to3.html + .. _3to2: https://pypi.python.org/pypi/3to2 + .. _Cheeseshop: PyPI_ + .. _coverage: https://pypi.python.org/pypi/coverage + .. _future: http://python-future.org/ + .. _modernize: https://github.com/mitsuhiko/python-modernize + .. _Porting to Python 3: http://python3porting.com/ +-.. _PyPI: http://pypi.python.org/ +-.. _Python 2.2: http://www.python.org/2.2.x +-.. _Python 2.5: http://www.python.org/2.5.x +-.. _Python 2.6: http://www.python.org/2.6.x +-.. _Python 2.7: http://www.python.org/2.7.x +-.. _Python 2.5: http://www.python.org/2.5.x +-.. _Python 3.3: http://www.python.org/3.3.x ++.. _PyPI: https://pypi.python.org/pypi + .. _Python 3 Packages: https://pypi.python.org/pypi?:action=browse&c=533&show=all + .. _Python 3 Q & A: http://ncoghlan-devs-python-notes.readthedocs.org/en/latest/python3/questions_and_answers.html +-.. _python-porting: http://mail.python.org/mailman/listinfo/python-porting ++.. _python-porting: https://mail.python.org/mailman/listinfo/python-porting + .. _six: https://pypi.python.org/pypi/six + .. _tox: https://pypi.python.org/pypi/tox + .. _trove classifiers: https://pypi.python.org/pypi?%3Aaction=list_classifiers +- +diff -r ee879c0ffa11 Doc/howto/unicode.rst +--- a/Doc/howto/unicode.rst ++++ b/Doc/howto/unicode.rst +@@ -7,7 +7,7 @@ + This HOWTO discusses Python 2.x's support for Unicode, and explains + various problems that people commonly encounter when trying to work + with Unicode. For the Python 3 version, see +-. ++. + + Introduction to Unicode + ======================= +@@ -435,7 +435,7 @@ + amk:~$ python2.4 p263.py + sys:1: DeprecationWarning: Non-ASCII character '\xe9' + in file p263.py on line 2, but no encoding declared; +- see http://www.python.org/peps/pep-0263.html for details ++ see https://www.python.org/peps/pep-0263.html for details + + Python 2.5 and higher are stricter and will produce a syntax error:: + +@@ -443,7 +443,7 @@ + File "/tmp/p263.py", line 2 + SyntaxError: Non-ASCII character '\xc3' in file /tmp/p263.py + on line 2, but no encoding declared; see +- http://www.python.org/peps/pep-0263.html for details ++ https://www.python.org/peps/pep-0263.html for details + + + Unicode Properties +@@ -500,7 +500,7 @@ + + Marc-André Lemburg gave a presentation at EuroPython 2002 titled "Python and + Unicode". A PDF version of his slides is available at +-, and is an ++, and is an + excellent overview of the design of Python's Unicode features. + + +@@ -687,7 +687,7 @@ + + The PDF slides for Marc-André Lemburg's presentation "Writing Unicode-aware + Applications in Python" are available at +- ++ + and discuss questions of character encodings as well as how to internationalize + and localize an application. + +diff -r ee879c0ffa11 Doc/howto/urllib2.rst +--- a/Doc/howto/urllib2.rst ++++ b/Doc/howto/urllib2.rst +@@ -24,7 +24,7 @@ + + A tutorial on *Basic Authentication*, with examples in Python. + +-**urllib2** is a `Python `_ module for fetching URLs ++**urllib2** is a Python module for fetching URLs + (Uniform Resource Locators). It offers a very simple interface, in the form of + the *urlopen* function. This is capable of fetching URLs using a variety of + different protocols. It also offers a slightly more complex interface for +@@ -560,9 +560,7 @@ + .. [#] For an introduction to the CGI protocol see + `Writing Web Applications in Python `_. + .. [#] Like Google for example. The *proper* way to use google from a program +- is to use `PyGoogle `_ of course. See +- `Voidspace Google `_ +- for some examples of using the Google API. ++ is to use `PyGoogle `_ of course. + .. [#] Browser sniffing is a very bad practise for website design - building + sites using web standards is much more sensible. Unfortunately a lot of + sites still send different versions to different browsers. +@@ -576,5 +574,5 @@ + scripts with a localhost server, I have to prevent urllib2 from using + the proxy. + .. [#] urllib2 opener for SSL proxy (CONNECT method): `ASPN Cookbook Recipe +- `_. ++ `_. + +diff -r ee879c0ffa11 Doc/howto/webservers.rst +--- a/Doc/howto/webservers.rst ++++ b/Doc/howto/webservers.rst +@@ -26,7 +26,7 @@ + While this HOWTO tries to give an overview of Python in the web, it cannot + always be as up to date as desired. Web development in Python is rapidly + moving forward, so the wiki page on `Web Programming +- `_ may be more in sync with ++ `_ may be more in sync with + recent development. + + +@@ -86,7 +86,7 @@ + applications, instead of presenting a "500 Internal Server Error" message + + The Python wiki features a page on `CGI scripts +- `_ with some additional information ++ `_ with some additional information + about CGI in Python. + + +@@ -146,7 +146,7 @@ + tutorial also describes the most common gotchas that might arise. + + * On lighttpd you need to use the `CGI module +- `_\ , which can be configured ++ `_\ , which can be configured + in a straightforward way. It boils down to setting ``cgi.assign`` properly. + + +@@ -210,7 +210,7 @@ + ---------- + + People coming from PHP often find it hard to grasp how to use Python in the web. +-Their first thought is mostly `mod_python `_\ , ++Their first thought is mostly `mod_python `_\ , + because they think that this is the equivalent to ``mod_php``. Actually, there + are many differences. What ``mod_python`` does is embed the interpreter into + the Apache process, thus speeding up requests by not having to start a Python +@@ -260,13 +260,6 @@ + These days, FastCGI is never used directly. Just like ``mod_python``, it is only + used for the deployment of WSGI applications. + +-.. seealso:: +- +- * `FastCGI, SCGI, and Apache: Background and Future +- `_ +- is a discussion on why the concept of FastCGI and SCGI is better than that +- of mod_python. +- + + Setting up FastCGI + ^^^^^^^^^^^^^^^^^^ +@@ -280,8 +273,8 @@ + to be loaded by Apache. + + * lighttpd ships its own `FastCGI module +- `_ as well as an +- `SCGI module `_. ++ `_ as well as an ++ `SCGI module `_. + + * `nginx `_ also supports `FastCGI + `_. +@@ -308,13 +301,13 @@ + WSGIServer(app).run() + + This is a simple WSGI application, but you need to install `flup +-`_ first, as flup handles the low level ++`_ first, as flup handles the low level + FastCGI access. + + .. seealso:: + + There is some documentation on `setting up Django with FastCGI +- `_, most of ++ `_, most of + which can be reused for other WSGI-compliant frameworks and libraries. + Only the ``manage.py`` part has to be changed, the example used here can be + used instead. Django does more or less the exact same thing. +@@ -485,7 +478,7 @@ + + There are far more components than can be presented here. The Python wiki + has a page about these components, called +- `Web Components `_. ++ `Web Components `_. + + + Templates +@@ -526,13 +519,13 @@ + + * `Mako `_ + * `Genshi `_ +- * `Jinja `_ ++ * `Jinja `_ + + .. seealso:: + + There are many template engines competing for attention, because it is + pretty easy to create them in Python. The page `Templating +- `_ in the wiki lists a big, ++ `_ in the wiki lists a big, + ever-growing number of these. The three listed above are considered "second + generation" template engines and are a good place to start. + +@@ -582,11 +575,11 @@ + + .. seealso:: + +- * `Persistence Tools `_ lists ++ * `Persistence Tools `_ lists + possibilities on how to save data in the file system. Some of these + modules are part of the standard library + +- * `Database Programming `_ ++ * `Database Programming `_ + helps with choosing a method for saving data + + * `SQLAlchemy `_, the most powerful OR-Mapper +@@ -648,7 +641,7 @@ + Django + ^^^^^^ + +-`Django `_ is a framework consisting of several ++`Django `_ is a framework consisting of several + tightly coupled elements which were written from scratch and work together very + well. It includes an ORM which is quite powerful while being simple to use, + and has a great online administration interface which makes it possible to edit +@@ -661,7 +654,7 @@ + It has a big, international community, the members of which have created many + web sites. There are also a lot of add-on projects which extend Django's normal + functionality. This is partly due to Django's well written `online +-documentation `_ and the `Django book ++documentation `_ and the `Django book + `_. + + +@@ -669,7 +662,7 @@ + + Although Django is an MVC-style framework, it names the elements + differently, which is described in the `Django FAQ +- `_. ++ `_. + + + TurboGears +@@ -712,7 +705,7 @@ + separate framework based on the Zope components: `Grok + `_. + +-Zope is also the infrastructure used by the `Plone `_ content ++Zope is also the infrastructure used by the `Plone `_ content + management system, one of the most powerful and popular content management + systems available. + +@@ -736,9 +729,9 @@ + .. seealso:: + + The Python wiki contains an extensive list of `web frameworks +- `_. ++ `_. + + Most frameworks also have their own mailing lists and IRC channels, look out + for these on the projects' web sites. There is also a general "Python in the + Web" IRC channel on freenode called `#python.web +- `_. ++ `_. +diff -r ee879c0ffa11 Doc/includes/email-alternative.py +--- a/Doc/includes/email-alternative.py ++++ b/Doc/includes/email-alternative.py +@@ -17,14 +17,14 @@ + msg['To'] = you + + # Create the body of the message (a plain-text and an HTML version). +-text = "Hi!\nHow are you?\nHere is the link you wanted:\nhttp://www.python.org" ++text = "Hi!\nHow are you?\nHere is the link you wanted:\nhttps://www.python.org" + html = """\ + + + +

Hi!
+ How are you?
+- Here is the link you wanted. ++ Here is the link you wanted. +

+ + +diff -r ee879c0ffa11 Doc/install/index.rst +--- a/Doc/install/index.rst ++++ b/Doc/install/index.rst +@@ -1009,7 +1009,7 @@ + + .. seealso:: + +- `C++Builder Compiler `_ ++ `C++Builder Compiler `_ + Information about the free C++ compiler from Borland, including links to the + download pages. + +@@ -1081,7 +1081,7 @@ + + .. seealso:: + +- `Building Python modules on MS Windows platform with MinGW `_ ++ `Building Python modules on MS Windows platform with MinGW `_ + Information about building the required libraries for the MinGW environment. + + +@@ -1090,7 +1090,7 @@ + .. [#] This also means you could replace all existing COFF-libraries with OMF-libraries + of the same name. + +-.. [#] Check http://sources.redhat.com/cygwin/ and http://www.mingw.org/ for more ++.. [#] Check http://www.sourceware.org/cygwin/ and http://www.mingw.org/ for more + information + + .. [#] Then you have no POSIX emulation available, but you also don't need +diff -r ee879c0ffa11 Doc/library/2to3.rst +--- a/Doc/library/2to3.rst ++++ b/Doc/library/2to3.rst +@@ -142,6 +142,39 @@ + Removes usage of :func:`apply`. For example ``apply(function, *args, + **kwargs)`` is converted to ``function(*args, **kwargs)``. + ++.. 2to3fixer:: asserts ++ ++ Replaces deprecated :mod:`unittest` method names with the correct ones. ++ ++ ================================ ========================================== ++ From To ++ ================================ ========================================== ++ ``failUnlessEqual(a, b)`` :meth:`assertEqual(a, b) ++ ` ++ ``assertEquals(a, b)`` :meth:`assertEqual(a, b) ++ ` ++ ``failIfEqual(a, b)`` :meth:`assertNotEqual(a, b) ++ ` ++ ``assertNotEquals(a, b)`` :meth:`assertNotEqual(a, b) ++ ` ++ ``failUnless(a)`` :meth:`assertTrue(a) ++ ` ++ ``assert_(a)`` :meth:`assertTrue(a) ++ ` ++ ``failIf(a)`` :meth:`assertFalse(a) ++ ` ++ ``failUnlessRaises(exc, cal)`` :meth:`assertRaises(exc, cal) ++ ` ++ ``failUnlessAlmostEqual(a, b)`` :meth:`assertAlmostEqual(a, b) ++ ` ++ ``assertAlmostEquals(a, b)`` :meth:`assertAlmostEqual(a, b) ++ ` ++ ``failIfAlmostEqual(a, b)`` :meth:`assertNotAlmostEqual(a, b) ++ ` ++ ``assertNotAlmostEquals(a, b)`` :meth:`assertNotAlmostEqual(a, b) ++ ` ++ ================================ ========================================== ++ + .. 2to3fixer:: basestring + + Converts :class:`basestring` to :class:`str`. +@@ -289,7 +322,7 @@ + .. 2to3fixer:: next + + Converts the use of iterator's :meth:`~iterator.next` methods to the +- :func:`next` function. It also renames :meth:`next` methods to ++ :func:`next` function. It also renames :meth:`~iterator.next` methods to + :meth:`~iterator.__next__`. + + .. 2to3fixer:: nonzero +diff -r ee879c0ffa11 Doc/library/_winreg.rst +--- a/Doc/library/_winreg.rst ++++ b/Doc/library/_winreg.rst +@@ -298,7 +298,7 @@ + +-------+---------------------------------------------+ + | ``2`` | A long integer giving when the key was last | + | | modified (if available) as 100's of | +- | | nanoseconds since Jan 1, 1600. | ++ | | nanoseconds since Jan 1, 1601. | + +-------+---------------------------------------------+ + + +diff -r ee879c0ffa11 Doc/library/argparse.rst +--- a/Doc/library/argparse.rst ++++ b/Doc/library/argparse.rst +@@ -664,7 +664,7 @@ + actions can do just about anything with the command-line arguments associated with + them, though most actions simply add an attribute to the object returned by + :meth:`~ArgumentParser.parse_args`. The ``action`` keyword argument specifies +-how the command-line arguments should be handled. The supported actions are: ++how the command-line arguments should be handled. The supplied actions are: + + * ``'store'`` - This just stores the argument's value. This is the default + action. For example:: +@@ -740,28 +740,18 @@ + >>> parser.parse_args(['--version']) + PROG 2.0 + +-You can also specify an arbitrary action by passing an object that implements +-the Action API. The easiest way to do this is to extend +-:class:`argparse.Action`, supplying an appropriate ``__call__`` method. The +-``__call__`` method should accept four parameters: +- +-* ``parser`` - The ArgumentParser object which contains this action. +- +-* ``namespace`` - The :class:`Namespace` object that will be returned by +- :meth:`~ArgumentParser.parse_args`. Most actions add an attribute to this +- object. +- +-* ``values`` - The associated command-line arguments, with any type conversions +- applied. (Type conversions are specified with the type_ keyword argument to +- :meth:`~ArgumentParser.add_argument`.) +- +-* ``option_string`` - The option string that was used to invoke this action. +- The ``option_string`` argument is optional, and will be absent if the action +- is associated with a positional argument. ++You may also specify an arbitrary action by passing an Action subclass or ++other object that implements the same interface. The recommended way to do ++this is to extend :class:`Action`, overriding the ``__call__`` method ++and optionally the ``__init__`` method. + + An example of a custom action:: + + >>> class FooAction(argparse.Action): ++ ... def __init__(self, option_strings, dest, nargs=None, **kwargs): ++ ... if nargs is not None: ++ ... raise ValueError("nargs not allowed") ++ ... super(FooAction, self).__init__(option_strings, dest, **kwargs) + ... def __call__(self, parser, namespace, values, option_string=None): + ... print '%r %r %r' % (namespace, values, option_string) + ... setattr(namespace, self.dest, values) +@@ -775,6 +765,7 @@ + >>> args + Namespace(bar='1', foo='2') + ++For more details, see :class:`Action`. + + nargs + ^^^^^ +@@ -1218,6 +1209,47 @@ + >>> parser.parse_args('--foo XXX'.split()) + Namespace(bar='XXX') + ++Action classes ++^^^^^^^^^^^^^^ ++ ++Action classes implement the Action API, a callable which returns a callable ++which processes arguments from the command-line. Any object which follows this ++API may be passed as the ``action`` parameter to :meth:`add_argument`. ++ ++.. class:: Action(option_strings, dest, nargs=None, const=None, default=None, ++ type=None, choices=None, required=False, help=None, ++ metavar=None) ++ ++Action objects are used by an ArgumentParser to represent the information needed ++to parse a single argument from one or more strings from the command line. The ++Action class must accept the two positional arguments plus any keyword arguments ++passed to :meth:`ArgumentParser.add_argument` except for the ``action`` itself. ++ ++Instances of Action (or return value of any callable to the ``action`` ++parameter) should have attributes "dest", "option_strings", "default", "type", ++"required", "help", etc. defined. The easiest way to ensure these attributes ++are defined is to call ``Action.__init__``. ++ ++Action instances should be callable, so subclasses must override the ++``__call__`` method, which should accept four parameters: ++ ++* ``parser`` - The ArgumentParser object which contains this action. ++ ++* ``namespace`` - The :class:`Namespace` object that will be returned by ++ :meth:`~ArgumentParser.parse_args`. Most actions add an attribute to this ++ object using :func:`setattr`. ++ ++* ``values`` - The associated command-line arguments, with any type conversions ++ applied. Type conversions are specified with the type_ keyword argument to ++ :meth:`~ArgumentParser.add_argument`. ++ ++* ``option_string`` - The option string that was used to invoke this action. ++ The ``option_string`` argument is optional, and will be absent if the action ++ is associated with a positional argument. ++ ++The ``__call__`` method may perform arbitrary actions, but will typically set ++attributes on the ``namespace`` based on ``dest`` and ``values``. ++ + + The parse_args() method + ----------------------- +@@ -1881,6 +1913,16 @@ + :mod:`optparse` had either been copy-pasted over or monkey-patched, it no + longer seemed practical to try to maintain the backwards compatibility. + ++The :mod:`argparse` module improves on the standard library :mod:`optparse` ++module in a number of ways including: ++ ++* Handling positional arguments. ++* Supporting sub-commands. ++* Allowing alternative option prefixes like ``+`` and ``/``. ++* Handling zero-or-more and one-or-more style arguments. ++* Producing more informative usage messages. ++* Providing a much simpler interface for custom ``type`` and ``action``. ++ + A partial upgrade path from :mod:`optparse` to :mod:`argparse`: + + * Replace all :meth:`optparse.OptionParser.add_option` calls with +diff -r ee879c0ffa11 Doc/library/ast.rst +--- a/Doc/library/ast.rst ++++ b/Doc/library/ast.rst +@@ -132,12 +132,14 @@ + .. function:: literal_eval(node_or_string) + + Safely evaluate an expression node or a Unicode or *Latin-1* encoded string +- containing a Python expression. The string or node provided may only consist +- of the following Python literal structures: strings, numbers, tuples, lists, +- dicts, booleans, and ``None``. ++ containing a Python literal or container display. The string or node ++ provided may only consist of the following Python literal structures: ++ strings, numbers, tuples, lists, dicts, booleans, and ``None``. + +- This can be used for safely evaluating strings containing Python expressions +- from untrusted sources without the need to parse the values oneself. ++ This can be used for safely evaluating strings containing Python values from ++ untrusted sources without the need to parse the values oneself. It is not ++ capable of evaluating arbitrarily complex expressions, for example involving ++ operators or indexing. + + + .. function:: get_docstring(node, clean=True) +diff -r ee879c0ffa11 Doc/library/asyncore.rst +--- a/Doc/library/asyncore.rst ++++ b/Doc/library/asyncore.rst +@@ -193,6 +193,11 @@ + Read at most *buffer_size* bytes from the socket's remote end-point. An + empty string implies that the channel has been closed from the other end. + ++ Note that :meth:`recv` may raise :exc:`socket.error` with ++ :data:`~errno.EAGAIN` or :data:`~errno.EWOULDBLOCK`, even though ++ :func:`select.select` or :func:`select.poll` has reported the socket ++ ready for reading. ++ + + .. method:: listen(backlog) + +diff -r ee879c0ffa11 Doc/library/bz2.rst +--- a/Doc/library/bz2.rst ++++ b/Doc/library/bz2.rst +@@ -74,7 +74,7 @@ + input file, only the first stream will be accessible. If you require + support for multi-stream files, consider using the third-party + :mod:`bz2file` module (available from +- `PyPI `_). This module provides a ++ `PyPI `_). This module provides a + backport of Python 3.3's :class:`BZ2File` class, which does support + multi-stream files. + +diff -r ee879c0ffa11 Doc/library/cmd.rst +--- a/Doc/library/cmd.rst ++++ b/Doc/library/cmd.rst +@@ -151,9 +151,9 @@ + Hook method executed once when :meth:`cmdloop` is about to return. This method + is a stub in :class:`Cmd`; it exists to be overridden by subclasses. + ++ + Instances of :class:`Cmd` subclasses have some public instance variables: + +- + .. attribute:: Cmd.prompt + + The prompt issued to solicit input. +@@ -169,6 +169,13 @@ + The last nonempty command prefix seen. + + ++.. attribute:: Cmd.cmdqueue ++ ++ A list of queued input lines. The cmdqueue list is checked in ++ :meth:`cmdloop` when new input is needed; if it is nonempty, its elements ++ will be processed in order, as if entered at the prompt. ++ ++ + .. attribute:: Cmd.intro + + A string to issue as an intro or banner. May be overridden by giving the +diff -r ee879c0ffa11 Doc/library/collections.rst +--- a/Doc/library/collections.rst ++++ b/Doc/library/collections.rst +@@ -954,8 +954,8 @@ + + .. class:: Iterator + +- ABC for classes that provide the :meth:`__iter__` and :meth:`next` methods. +- See also the definition of :term:`iterator`. ++ ABC for classes that provide the :meth:`~iterator.__iter__` and ++ :meth:`~iterator.next` methods. See also the definition of :term:`iterator`. + + .. class:: Sequence + MutableSequence +@@ -1028,7 +1028,7 @@ + + (2) + To override the comparisons (presumably for speed, as the +- semantics are fixed), redefine :meth:`__le__` and ++ semantics are fixed), redefine :meth:`__le__` and :meth:`__ge__`, + then the other operations will automatically follow suit. + + (3) +diff -r ee879c0ffa11 Doc/library/compileall.rst +--- a/Doc/library/compileall.rst ++++ b/Doc/library/compileall.rst +@@ -4,6 +4,10 @@ + .. module:: compileall + :synopsis: Tools for byte-compiling all Python source files in a directory tree. + ++**Source code:** :source:`Lib/compileall.py` ++ ++-------------- ++ + + This module provides some utility functions to support installing Python + libraries. These functions compile Python source files in a directory tree. +@@ -20,7 +24,8 @@ + + .. program:: compileall + +-.. cmdoption:: [directory|file]... ++.. cmdoption:: directory ... ++ file ... + + Positional arguments are files to compile or directories that contain + source files, traversed recursively. If no argument is given, behave as if +diff -r ee879c0ffa11 Doc/library/cookielib.rst +--- a/Doc/library/cookielib.rst ++++ b/Doc/library/cookielib.rst +@@ -122,7 +122,7 @@ + HTTP cookie classes, principally useful for server-side code. The + :mod:`cookielib` and :mod:`Cookie` modules do not depend on each other. + +- http://wp.netscape.com/newsref/std/cookie_spec.html ++ http://curl.haxx.se/rfc/cookie_spec.html + The specification of the original Netscape cookie protocol. Though this is + still the dominant protocol, the 'Netscape cookie protocol' implemented by all + the major browsers (and :mod:`cookielib`) only bears a passing resemblance to +diff -r ee879c0ffa11 Doc/library/crypto.rst +--- a/Doc/library/crypto.rst ++++ b/Doc/library/crypto.rst +@@ -26,6 +26,5 @@ + Hardcore cypherpunks will probably find the cryptographic modules written by + A.M. Kuchling of further interest; the package contains modules for various + encryption algorithms, most notably AES. These modules are not distributed with +-Python but available separately. See the URL +-http://www.pycrypto.org for more information. +- ++Python but available separately. See the URL http://www.pycrypto.org/ for more ++information. +diff -r ee879c0ffa11 Doc/library/ctypes.rst +--- a/Doc/library/ctypes.rst ++++ b/Doc/library/ctypes.rst +@@ -1090,7 +1090,7 @@ + outside of Python's control (e.g. by the foreign code that calls the + callback), ctypes creates a new dummy Python thread on every invocation. This + behavior is correct for most purposes, but it means that values stored with +- `threading.local` will *not* survive across different callbacks, even when ++ :class:`threading.local` will *not* survive across different callbacks, even when + those calls are made from the same C thread. + + .. _ctypes-accessing-values-exported-from-dlls: +@@ -1443,11 +1443,16 @@ + The default mode which is used to load shared libraries. On OSX 10.3, this is + *RTLD_GLOBAL*, otherwise it is the same as *RTLD_LOCAL*. + +-Instances of these classes have no public methods, however :meth:`__getattr__` +-and :meth:`__getitem__` have special behavior: functions exported by the shared +-library can be accessed as attributes of by index. Please note that both +-:meth:`__getattr__` and :meth:`__getitem__` cache their result, so calling them +-repeatedly returns the same object each time. ++Instances of these classes have no public methods. Functions exported by the ++shared library can be accessed as attributes or by index. Please note that ++accessing the function through an attribute caches the result and therefore ++accessing it repeatedly returns the same object each time. On the other hand, ++accessing it through an index returns a new object each time: ++ ++ >>> libc.time == libc.time ++ True ++ >>> libc['time'] == libc['time'] ++ False + + The following public attributes are available, their name starts with an + underscore to not clash with exported function names: +@@ -1904,7 +1909,7 @@ + .. function:: find_msvcrt() + :module: ctypes.util + +- Windows only: return the filename of the VC runtype library used by Python, ++ Windows only: return the filename of the VC runtime library used by Python, + and by the extension modules. If the name of the library cannot be + determined, ``None`` is returned. + +@@ -2441,11 +2446,6 @@ + and so on). Later assignments to the :attr:`_fields_` class variable will + raise an AttributeError. + +- Structure and union subclass constructors accept both positional and named +- arguments. Positional arguments are used to initialize the fields in the +- same order as they appear in the :attr:`_fields_` definition, named +- arguments are used to initialize the fields with the corresponding name. +- + It is possible to defined sub-subclasses of structure types, they inherit + the fields of the base class plus the :attr:`_fields_` defined in the + sub-subclass, if any. +diff -r ee879c0ffa11 Doc/library/datetime.rst +--- a/Doc/library/datetime.rst ++++ b/Doc/library/datetime.rst +@@ -514,7 +514,7 @@ + Return a 3-tuple, (ISO year, ISO week number, ISO weekday). + + The ISO calendar is a widely used variant of the Gregorian calendar. See +- http://www.phys.uu.nl/~vgent/calendar/isocalendar.htm for a good ++ http://www.staff.science.uu.nl/~gent0113/calendar/isocalendar.htm for a good + explanation. + + The ISO year consists of 52 or 53 full weeks, and where a week starts on a +@@ -1563,7 +1563,7 @@ + + .. seealso:: + +- `pytz `_ ++ `pytz `_ + The standard library has no :class:`tzinfo` instances, but + there exists a third-party library which brings the *IANA timezone + database* (also known as the Olson database) to Python: *pytz*. +diff -r ee879c0ffa11 Doc/library/difflib.rst +--- a/Doc/library/difflib.rst ++++ b/Doc/library/difflib.rst +@@ -331,9 +331,9 @@ + + .. seealso:: + +- `Pattern Matching: The Gestalt Approach `_ ++ `Pattern Matching: The Gestalt Approach `_ + Discussion of a similar algorithm by John W. Ratcliff and D. E. Metzener. This +- was published in `Dr. Dobb's Journal `_ in July, 1988. ++ was published in `Dr. Dobb's Journal `_ in July, 1988. + + + .. _sequence-matcher: +diff -r ee879c0ffa11 Doc/library/dis.rst +--- a/Doc/library/dis.rst ++++ b/Doc/library/dis.rst +@@ -446,7 +446,7 @@ + + Implements the expression statement for the interactive mode. TOS is removed + from the stack and printed. In non-interactive mode, an expression statement is +- terminated with ``POP_STACK``. ++ terminated with :opcode:`POP_TOP`. + + + .. opcode:: PRINT_ITEM () +@@ -481,7 +481,7 @@ + .. opcode:: CONTINUE_LOOP (target) + + Continues a loop due to a :keyword:`continue` statement. *target* is the +- address to jump to (which should be a ``FOR_ITER`` instruction). ++ address to jump to (which should be a :opcode:`FOR_ITER` instruction). + + + .. opcode:: LIST_APPEND (i) +@@ -838,21 +838,21 @@ + + .. opcode:: CALL_FUNCTION_VAR (argc) + +- Calls a function. *argc* is interpreted as in ``CALL_FUNCTION``. The top element ++ Calls a function. *argc* is interpreted as in :opcode:`CALL_FUNCTION`. The top element + on the stack contains the variable argument list, followed by keyword and + positional arguments. + + + .. opcode:: CALL_FUNCTION_KW (argc) + +- Calls a function. *argc* is interpreted as in ``CALL_FUNCTION``. The top element ++ Calls a function. *argc* is interpreted as in :opcode:`CALL_FUNCTION`. The top element + on the stack contains the keyword arguments dictionary, followed by explicit + keyword and positional arguments. + + + .. opcode:: CALL_FUNCTION_VAR_KW (argc) + +- Calls a function. *argc* is interpreted as in ``CALL_FUNCTION``. The top ++ Calls a function. *argc* is interpreted as in :opcode:`CALL_FUNCTION`. The top + element on the stack contains the keyword arguments dictionary, followed by the + variable-arguments tuple, followed by explicit keyword and positional arguments. + +diff -r ee879c0ffa11 Doc/library/distribution.rst +--- /dev/null ++++ b/Doc/library/distribution.rst +@@ -0,0 +1,13 @@ ++*********************************** ++Software Packaging and Distribution ++*********************************** ++ ++These libraries help you with publishing and installing Python software. ++While these modules are designed to work in conjunction with the ++`Python Package Index `__, they can also be used ++with a local index server, or without any index server at all. ++ ++.. toctree:: ++ ++ distutils.rst ++ ensurepip.rst +diff -r ee879c0ffa11 Doc/library/email.rst +--- a/Doc/library/email.rst ++++ b/Doc/library/email.rst +@@ -222,7 +222,7 @@ + ------------------------------- + + The :mod:`email` package was originally prototyped as a separate library called +-`mimelib `_. Changes have been made so that method names ++`mimelib `_. Changes have been made so that method names + are more consistent, and some methods or modules have either been added or + removed. The semantics of some of the methods have also changed. For the most + part, any functionality available in :mod:`mimelib` is still available in the +diff -r ee879c0ffa11 Doc/library/ensurepip.rst +--- /dev/null ++++ b/Doc/library/ensurepip.rst +@@ -0,0 +1,130 @@ ++:mod:`ensurepip` --- Bootstrapping the ``pip`` installer ++======================================================== ++ ++.. module:: ensurepip ++ :synopsis: Bootstrapping the ``pip`` installer into an existing Python ++ installation or virtual environment. ++ ++.. versionadded:: 2.7.9 ++ ++The :mod:`ensurepip` package provides support for bootstrapping the ``pip`` ++installer into an existing Python installation or virtual environment. This ++bootstrapping approach reflects the fact that ``pip`` is an independent ++project with its own release cycle, and the latest available stable version ++is bundled with maintenance and feature releases of the CPython reference ++interpreter. ++ ++In most cases, end users of Python shouldn't need to invoke this module ++directly (as ``pip`` should be bootstrapped by default), but it may be ++needed if installing ``pip`` was skipped when installing Python (or ++when creating a virtual environment) or after explicitly uninstalling ``pip``. ++ ++.. note:: ++ ++ This module *does not* access the internet. All of the components ++ needed to bootstrap ``pip`` are included as internal parts of the ++ package. ++ ++.. seealso:: ++ ++ :ref:`installing-index` ++ The end user guide for installing Python packages ++ ++ :pep:`453`: Explicit bootstrapping of pip in Python installations ++ The original rationale and specification for this module. ++ ++ :pep:`477`: Backport ensurepip (PEP 453) to Python 2.7 ++ The rationale and specification for backporting PEP 453 to Python 2.7. ++ ++ ++Command line interface ++---------------------- ++ ++The command line interface is invoked using the interpreter's ``-m`` switch. ++ ++The simplest possible invocation is:: ++ ++ python -m ensurepip ++ ++This invocation will install ``pip`` if it is not already installed, ++but otherwise does nothing. To ensure the installed version of ``pip`` ++is at least as recent as the one bundled with ``ensurepip``, pass the ++``--upgrade`` option:: ++ ++ python -m ensurepip --upgrade ++ ++By default, ``pip`` is installed into the current virtual environment ++(if one is active) or into the system site packages (if there is no ++active virtual environment). The installation location can be controlled ++through two additional command line options: ++ ++* ``--root ``: Installs ``pip`` relative to the given root directory ++ rather than the root of the currently active virtual environment (if any) ++ or the default root for the current Python installation. ++* ``--user``: Installs ``pip`` into the user site packages directory rather ++ than globally for the current Python installation (this option is not ++ permitted inside an active virtual environment). ++ ++By default, the scripts ``pip``, ``pipX``, and ``pipX.Y`` will be installed ++(where X.Y stands for the version of Python used to invoke ``ensurepip``). The ++scripts installed can be controlled through two additional command line ++options: ++ ++* ``--altinstall``: if an alternate installation is requested, the ``pip`` and ++ ``pipX`` script will *not* be installed. ++ ++* ``--no-default-pip``: if a non-default installation is request, the ``pip`` ++ script will *not* be installed. ++ ++ ++Module API ++---------- ++ ++:mod:`ensurepip` exposes two functions for programmatic use: ++ ++.. function:: version() ++ ++ Returns a string specifying the bundled version of pip that will be ++ installed when bootstrapping an environment. ++ ++.. function:: bootstrap(root=None, upgrade=False, user=False, \ ++ altinstall=False, default_pip=True, \ ++ verbosity=0) ++ ++ Bootstraps ``pip`` into the current or designated environment. ++ ++ *root* specifies an alternative root directory to install relative to. ++ If *root* is None, then installation uses the default install location ++ for the current environment. ++ ++ *upgrade* indicates whether or not to upgrade an existing installation ++ of an earlier version of ``pip`` to the bundled version. ++ ++ *user* indicates whether to use the user scheme rather than installing ++ globally. ++ ++ By default, the scripts ``pip``, ``pipX``, and ``pipX.Y`` will be installed ++ (where X.Y stands for the current version of Python). ++ ++ If *altinstall* is set, then ``pip`` and ``pipX`` will *not* be installed. ++ ++ If *default_pip* is set to ``False``, then ``pip`` will *not* be installed. ++ ++ Setting both *altinstall* and *default_pip* will trigger ++ :exc:`ValueError`. ++ ++ *verbosity* controls the level of output to :data:`sys.stdout` from the ++ bootstrapping operation. ++ ++ .. note:: ++ ++ The bootstrapping process has side effects on both ``sys.path`` and ++ ``os.environ``. Invoking the command line interface in a subprocess ++ instead allows these side effects to be avoided. ++ ++ .. note:: ++ ++ The bootstrapping process may install additional modules required by ++ ``pip``, but other software should not assume those dependencies will ++ always be present by default (as the dependencies may be removed in a ++ future version of ``pip``). +diff -r ee879c0ffa11 Doc/library/functions.rst +--- a/Doc/library/functions.rst ++++ b/Doc/library/functions.rst +@@ -92,13 +92,14 @@ + .. versionadded:: 2.6 + + +-.. function:: bool([x]) ++.. class:: bool([x]) + +- Convert a value to a Boolean, using the standard truth testing procedure. If +- *x* is false or omitted, this returns :const:`False`; otherwise it returns +- :const:`True`. :class:`bool` is also a class, which is a subclass of +- :class:`int`. Class :class:`bool` cannot be subclassed further. Its only +- instances are :const:`False` and :const:`True`. ++ Return a Boolean value, i.e. one of ``True`` or ``False``. *x* is converted ++ using the standard truth testing procedure. If *x* is false or omitted, this ++ returns :const:`False`; otherwise it returns :const:`True`. :class:`bool` is ++ also a class, which is a subclass of :class:`int`. Class :class:`bool` cannot ++ be subclassed further. Its only instances are :const:`False` and ++ :const:`True`. + + .. index:: pair: Boolean; type + +@@ -108,9 +109,9 @@ + If no argument is given, this function returns :const:`False`. + + +-.. function:: bytearray([source[, encoding[, errors]]]) ++.. class:: bytearray([source[, encoding[, errors]]]) + +- Return a new array of bytes. The :class:`bytearray` type is a mutable ++ Return a new array of bytes. The :class:`bytearray` class is a mutable + sequence of integers in the range 0 <= x < 256. It has most of the usual + methods of mutable sequences, described in :ref:`typesseq-mutable`, as well + as most methods that the :class:`str` type has, see :ref:`string-methods`. +@@ -118,9 +119,9 @@ + The optional *source* parameter can be used to initialize the array in a few + different ways: + +- * If it is a *string*, you must also give the *encoding* (and optionally, +- *errors*) parameters; :func:`bytearray` then converts the string to +- bytes using :meth:`str.encode`. ++ * If it is *unicode*, you must also give the *encoding* (and optionally, ++ *errors*) parameters; :func:`bytearray` then converts the unicode to ++ bytes using :meth:`unicode.encode`. + + * If it is an *integer*, the array will have that size and will be + initialized with null bytes. +@@ -217,7 +218,7 @@ + The optional arguments *flags* and *dont_inherit* control which future + statements (see :pep:`236`) affect the compilation of *source*. If neither + is present (or both are zero) the code is compiled with those future +- statements that are in effect in the code that is calling compile. If the ++ statements that are in effect in the code that is calling :func:`compile`. If the + *flags* argument is given and *dont_inherit* is not (or is zero) then the + future statements specified by the *flags* argument are used in addition to + those that would be used anyway. If *dont_inherit* is a non-zero integer then +@@ -232,6 +233,9 @@ + This function raises :exc:`SyntaxError` if the compiled source is invalid, + and :exc:`TypeError` if the source contains null bytes. + ++ If you want to parse Python code into its AST representation, see ++ :func:`ast.parse`. ++ + .. note:: + + When compiling a string with multi-line code in ``'single'`` or +@@ -250,9 +254,9 @@ + does not have to end in a newline anymore. + + +-.. function:: complex([real[, imag]]) ++.. class:: complex([real[, imag]]) + +- Create a complex number with the value *real* + *imag*\*j or convert a string or ++ Return a complex number with the value *real* + *imag*\*j or convert a string or + number to a complex number. If the first parameter is a string, it will be + interpreted as a complex number and the function must be called without a second + parameter. The second parameter can never be a string. Each argument may be any +@@ -279,14 +283,13 @@ + + + .. _func-dict: +-.. function:: dict(**kwarg) +- dict(mapping, **kwarg) +- dict(iterable, **kwarg) ++.. class:: dict(**kwarg) ++ dict(mapping, **kwarg) ++ dict(iterable, **kwarg) + :noindex: + + Create a new dictionary. The :class:`dict` object is the dictionary class. +- See :class:`dict` and :ref:`typesmapping` for documentation about this +- class. ++ See :class:`dict` and :ref:`typesmapping` for documentation about this class. + + For other containers see the built-in :class:`list`, :class:`set`, and + :class:`tuple` classes, as well as the :mod:`collections` module. +@@ -489,9 +492,11 @@ + where the *function* returns false. + + +-.. function:: float([x]) ++.. class:: float([x]) + +- Convert a string or a number to floating point. If the argument is a string, it ++ Return a floating point number constructed from a number or string *x*. ++ ++ If the argument is a string, it + must contain a possibly signed decimal or floating point number, possibly + embedded in whitespace. The argument may also be [+|-]nan or [+|-]inf. + Otherwise, the argument may be a plain or long integer +@@ -534,7 +539,7 @@ + + + .. _func-frozenset: +-.. function:: frozenset([iterable]) ++.. class:: frozenset([iterable]) + :noindex: + + Return a new :class:`frozenset` object, optionally with elements taken from +@@ -645,10 +650,10 @@ + Consider using the :func:`raw_input` function for general input from users. + + +-.. function:: int(x=0) +- int(x, base=10) ++.. class:: int(x=0) ++ int(x, base=10) + +- Convert a number or string *x* to an integer, or return ``0`` if no ++ Return an integer object constructed from a number or string *x*, or return ``0`` if no + arguments are given. If *x* is a number, it can be a plain integer, a long + integer, or a floating point number. If *x* is floating point, the conversion + truncates towards zero. If the argument is outside the integer range, the +@@ -730,7 +735,7 @@ + (such as a dictionary, set, or frozen set). + + +-.. function:: list([iterable]) ++.. class:: list([iterable]) + + Return a list whose items are the same and in the same order as *iterable*'s + items. *iterable* may be either a sequence, a container that supports +@@ -756,10 +761,11 @@ + affect the values of local and free variables used by the interpreter. + + +-.. function:: long(x=0) +- long(x, base=10) ++.. class:: long(x=0) ++ long(x, base=10) + +- Convert a string or number to a long integer. If the argument is a string, it ++ Return a long integer object constructed from a string or number *x*. ++ If the argument is a string, it + must contain a possibly signed number of arbitrary size, possibly embedded in + whitespace. The *base* argument is interpreted in the same way as for + :func:`int`, and may only be given when *x* is a string. Otherwise, the argument +@@ -837,7 +843,7 @@ + .. versionadded:: 2.6 + + +-.. function:: object() ++.. class:: object() + + Return a new featureless object. :class:`object` is a base for all new style + classes. It has the methods that are common to all instances of new style +@@ -987,14 +993,16 @@ + .. versionadded:: 2.6 + + +-.. function:: property([fget[, fset[, fdel[, doc]]]]) ++.. class:: property([fget[, fset[, fdel[, doc]]]]) + + Return a property attribute for :term:`new-style class`\es (classes that + derive from :class:`object`). + +- *fget* is a function for getting an attribute value, likewise *fset* is a +- function for setting, and *fdel* a function for del'ing, an attribute. Typical +- use is to define a managed attribute ``x``:: ++ *fget* is a function for getting an attribute value. *fset* is a function ++ for setting an attribute value. *fdel* is a function for deleting an attribute ++ value. And *doc* creates a docstring for the attribute. ++ ++ A typical use is to define a managed attribute ``x``:: + + class C(object): + def __init__(self): +@@ -1002,13 +1010,16 @@ + + def getx(self): + return self._x ++ + def setx(self, value): + self._x = value ++ + def delx(self): + del self._x ++ + x = property(getx, setx, delx, "I'm the 'x' property.") + +- If then *c* is an instance of *C*, ``c.x`` will invoke the getter, ++ If *c* is an instance of *C*, ``c.x`` will invoke the getter, + ``c.x = value`` will invoke the setter and ``del c.x`` the deleter. + + If given, *doc* will be the docstring of the property attribute. Otherwise, the +@@ -1024,8 +1035,9 @@ + """Get the current voltage.""" + return self._voltage + +- turns the :meth:`voltage` method into a "getter" for a read-only attribute +- with the same name. ++ The ``@property`` decorator turns the :meth:`voltage` method into a "getter" ++ for a read-only attribute with the same name, and it sets the docstring for ++ *voltage* to "Get the current voltage." + + A property object has :attr:`~property.getter`, :attr:`~property.setter`, + and :attr:`~property.deleter` methods usable as decorators that create a +@@ -1053,7 +1065,7 @@ + additional functions the same name as the original property (``x`` in this + case.) + +- The returned property also has the attributes ``fget``, ``fset``, and ++ The returned property object also has the attributes ``fget``, ``fset``, and + ``fdel`` corresponding to the constructor arguments. + + .. versionadded:: 2.2 +@@ -1229,7 +1241,7 @@ + the decimal point. If *ndigits* is omitted, it defaults to zero. The result + is a floating point number. Values are rounded to the closest multiple of + 10 to the power minus *ndigits*; if two multiples are equally close, +- rounding is done away from 0 (so. for example, ``round(0.5)`` is ``1.0`` and ++ rounding is done away from 0 (so, for example, ``round(0.5)`` is ``1.0`` and + ``round(-0.5)`` is ``-1.0``). + + +@@ -1243,7 +1255,7 @@ + + + .. _func-set: +-.. function:: set([iterable]) ++.. class:: set([iterable]) + :noindex: + + Return a new :class:`set` object, optionally with elements taken from +@@ -1266,8 +1278,8 @@ + ``x.foobar = 123``. + + +-.. function:: slice(stop) +- slice(start, stop[, step]) ++.. class:: slice(stop) ++ slice(start, stop[, step]) + + .. index:: single: Numerical Python + +@@ -1309,8 +1321,12 @@ + each element only once. Use :func:`functools.cmp_to_key` to convert an + old-style *cmp* function to a *key* function. + +- For sorting examples and a brief sorting tutorial, see `Sorting HowTo +- `_\. ++ The built-in :func:`sorted` function is guaranteed to be stable. A sort is ++ stable if it guarantees not to change the relative order of elements that ++ compare equal --- this is helpful for sorting in multiple passes (for ++ example, sort by department, then by salary grade). ++ ++ For sorting examples and a brief sorting tutorial, see :ref:`sortinghowto`. + + .. versionadded:: 2.4 + +@@ -1346,7 +1362,7 @@ + Function decorator syntax added. + + +-.. function:: str(object='') ++.. class:: str(object='') + + Return a string containing a nicely printable representation of an object. For + strings, this returns the string itself. The difference with ``repr(object)`` +@@ -1450,8 +1466,8 @@ + :class:`list`, and :class:`set` classes, and the :mod:`collections` module. + + +-.. function:: type(object) +- type(name, bases, dict) ++.. class:: type(object) ++ type(name, bases, dict) + + .. index:: object: type + +diff -r ee879c0ffa11 Doc/library/functools.rst +--- a/Doc/library/functools.rst ++++ b/Doc/library/functools.rst +@@ -22,8 +22,8 @@ + + .. function:: cmp_to_key(func) + +- Transform an old-style comparison function to a key function. Used with +- tools that accept key functions (such as :func:`sorted`, :func:`min`, ++ Transform an old-style comparison function to a :term:`key function`. Used ++ with tools that accept key functions (such as :func:`sorted`, :func:`min`, + :func:`max`, :func:`heapq.nlargest`, :func:`heapq.nsmallest`, + :func:`itertools.groupby`). This function is primarily used as a transition + tool for programs being converted to Python 3 where comparison functions are +@@ -32,13 +32,15 @@ + A comparison function is any callable that accept two arguments, compares them, + and returns a negative number for less-than, zero for equality, or a positive + number for greater-than. A key function is a callable that accepts one +- argument and returns another value that indicates the position in the desired +- collation sequence. ++ argument and returns another value to be used as the sort key. + + Example:: + + sorted(iterable, key=cmp_to_key(locale.strcoll)) # locale-aware sort order + ++ For sorting examples and a brief sorting tutorial, see :ref:`sortinghowto`. ++ ++ + .. versionadded:: 2.7 + + .. function:: total_ordering(cls) +@@ -124,9 +126,10 @@ + + .. function:: wraps(wrapped[, assigned][, updated]) + +- This is a convenience function for invoking ``partial(update_wrapper, +- wrapped=wrapped, assigned=assigned, updated=updated)`` as a function decorator +- when defining a wrapper function. For example: ++ This is a convenience function for invoking :func:`update_wrapper` as a ++ function decorator when defining a wrapper function. It is equivalent to ++ ``partial(update_wrapper, wrapped=wrapped, assigned=assigned, updated=updated)``. ++ For example:: + + >>> from functools import wraps + >>> def my_decorator(f): +diff -r ee879c0ffa11 Doc/library/gettext.rst +--- a/Doc/library/gettext.rst ++++ b/Doc/library/gettext.rst +@@ -756,8 +756,8 @@ + .. [#] See the footnote for :func:`bindtextdomain` above. + + .. [#] François Pinard has written a program called :program:`xpot` which does a +- similar job. It is available as part of his `po-utils package +- `_. ++ similar job. It is available as part of his ++ `po-utils package `__. + + .. [#] :program:`msgfmt.py` is binary compatible with GNU :program:`msgfmt` except that + it provides a simpler, all-Python implementation. With this and +diff -r ee879c0ffa11 Doc/library/hashlib.rst +--- a/Doc/library/hashlib.rst ++++ b/Doc/library/hashlib.rst +@@ -88,6 +88,24 @@ + + .. versionadded:: 2.7 + ++.. data:: algorithms_guaranteed ++ ++ A set containing the names of the hash algorithms guaranteed to be supported ++ by this module on all platforms. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: algorithms_available ++ ++ A set containing the names of the hash algorithms that are available in the ++ running Python interpreter. These names will be recognized when passed to ++ :func:`new`. :attr:`algorithms_guaranteed` will always be a subset. The ++ same algorithm may appear multiple times in this set under different names ++ (thanks to OpenSSL). ++ ++ .. versionadded:: 2.7.9 ++ ++ + The following values are provided as constant attributes of the hash objects + returned by the constructors: + +diff -r ee879c0ffa11 Doc/library/heapq.rst +--- a/Doc/library/heapq.rst ++++ b/Doc/library/heapq.rst +@@ -136,7 +136,6 @@ + time:: + + >>> def heapsort(iterable): +- ... 'Equivalent to sorted(iterable)' + ... h = [] + ... for value in iterable: + ... heappush(h, value) +@@ -145,6 +144,9 @@ + >>> heapsort([1, 3, 5, 7, 9, 2, 4, 6, 8, 0]) + [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + ++This is similar to ``sorted(iterable)``, but unlike :func:`sorted`, this ++implementation is not stable. ++ + Heap elements can be tuples. This is useful for assigning comparison values + (such as task priorities) alongside the main record being tracked:: + +diff -r ee879c0ffa11 Doc/library/index.rst +--- a/Doc/library/index.rst ++++ b/Doc/library/index.rst +@@ -30,7 +30,7 @@ + In addition to the standard library, there is a growing collection of + several thousand components (from individual programs and modules to + packages and entire application development frameworks), available from +-the `Python Package Index `_. ++the `Python Package Index `_. + + + .. toctree:: +@@ -63,6 +63,7 @@ + tk.rst + development.rst + debug.rst ++ distribution.rst + python.rst + custominterp.rst + restricted.rst +diff -r ee879c0ffa11 Doc/library/io.rst +--- a/Doc/library/io.rst ++++ b/Doc/library/io.rst +@@ -287,7 +287,7 @@ + most *limit* bytes will be read. + + The line terminator is always ``b'\n'`` for binary files; for text files, +- the *newlines* argument to :func:`.open` can be used to select the line ++ the *newline* argument to :func:`.open` can be used to select the line + terminator(s) recognized. + + .. method:: readlines(hint=-1) +diff -r ee879c0ffa11 Doc/library/logging.config.rst +--- a/Doc/library/logging.config.rst ++++ b/Doc/library/logging.config.rst +@@ -92,7 +92,7 @@ + + :param disable_existing_loggers: If specified as ``False``, loggers which + exist when this call is made are left +- alone. The default is ``True`` because this ++ enabled. The default is ``True`` because this + enables old behaviour in a backward- + compatible way. This behaviour is to + disable any existing loggers unless they or +diff -r ee879c0ffa11 Doc/library/logging.rst +--- a/Doc/library/logging.rst ++++ b/Doc/library/logging.rst +@@ -130,7 +130,9 @@ + Indicates the effective level for this logger. If a value other than + :const:`NOTSET` has been set using :meth:`setLevel`, it is returned. Otherwise, + the hierarchy is traversed towards the root until a value other than +- :const:`NOTSET` is found, and that value is returned. ++ :const:`NOTSET` is found, and that value is returned. The value returned is ++ an integer, typically one of :const:`logging.DEBUG`, :const:`logging.INFO` ++ etc. + + + .. method:: Logger.getChild(suffix) +@@ -898,6 +900,12 @@ + of the defined levels is passed in, the corresponding string representation is + returned. Otherwise, the string "Level %s" % lvl is returned. + ++ .. note:: Integer levels should be used when e.g. setting levels on instances ++ of :class:`Logger` and handlers. This function is used to convert between ++ an integer level and the level name displayed in the formatted log output ++ by means of the ``%(levelname)s`` format specifier (see ++ :ref:`logrecord-attributes`). ++ + + .. function:: makeLogRecord(attrdict) + +diff -r ee879c0ffa11 Doc/library/mailbox.rst +--- a/Doc/library/mailbox.rst ++++ b/Doc/library/mailbox.rst +@@ -474,7 +474,7 @@ + `Configuring Netscape Mail on Unix: Why The Content-Length Format is Bad `_ + An argument for using the original mbox format rather than a variation. + +- `"mbox" is a family of several mutually incompatible mailbox formats `_ ++ `"mbox" is a family of several mutually incompatible mailbox formats `_ + A history of mbox variations. + + +diff -r ee879c0ffa11 Doc/library/mimetypes.rst +--- a/Doc/library/mimetypes.rst ++++ b/Doc/library/mimetypes.rst +@@ -44,7 +44,7 @@ + + The optional *strict* argument is a flag specifying whether the list of known MIME types + is limited to only the official types `registered with IANA +- `_. ++ `_. + When *strict* is ``True`` (the default), only the IANA types are supported; when + *strict* is ``False``, some additional non-standard but commonly used MIME types + are also recognized. +diff -r ee879c0ffa11 Doc/library/msilib.rst +--- a/Doc/library/msilib.rst ++++ b/Doc/library/msilib.rst +@@ -123,9 +123,9 @@ + + .. seealso:: + +- `FCICreateFile `_ +- `UuidCreate `_ +- `UuidToString `_ ++ `FCICreateFile `_ ++ `UuidCreate `_ ++ `UuidToString `_ + + .. _database-objects: + +@@ -154,9 +154,9 @@ + + .. seealso:: + +- `MSIDatabaseOpenView `_ +- `MSIDatabaseCommit `_ +- `MSIGetSummaryInformation `_ ++ `MSIDatabaseOpenView `_ ++ `MSIDatabaseCommit `_ ++ `MSIGetSummaryInformation `_ + + .. _view-objects: + +@@ -202,11 +202,11 @@ + + .. seealso:: + +- `MsiViewExecute `_ +- `MSIViewGetColumnInfo `_ +- `MsiViewFetch `_ +- `MsiViewModify `_ +- `MsiViewClose `_ ++ `MsiViewExecute `_ ++ `MSIViewGetColumnInfo `_ ++ `MsiViewFetch `_ ++ `MsiViewModify `_ ++ `MsiViewClose `_ + + .. _summary-objects: + +@@ -246,10 +246,10 @@ + + .. seealso:: + +- `MsiSummaryInfoGetProperty `_ +- `MsiSummaryInfoGetPropertyCount `_ +- `MsiSummaryInfoSetProperty `_ +- `MsiSummaryInfoPersist `_ ++ `MsiSummaryInfoGetProperty `_ ++ `MsiSummaryInfoGetPropertyCount `_ ++ `MsiSummaryInfoSetProperty `_ ++ `MsiSummaryInfoPersist `_ + + .. _record-objects: + +@@ -300,11 +300,11 @@ + + .. seealso:: + +- `MsiRecordGetFieldCount `_ +- `MsiRecordSetString `_ +- `MsiRecordSetStream `_ +- `MsiRecordSetInteger `_ +- `MsiRecordClear `_ ++ `MsiRecordGetFieldCount `_ ++ `MsiRecordSetString `_ ++ `MsiRecordSetStream `_ ++ `MsiRecordSetInteger `_ ++ `MsiRecordClear `_ + + .. _msi-errors: + +@@ -396,10 +396,10 @@ + + .. seealso:: + +- `Directory Table `_ +- `File Table `_ +- `Component Table `_ +- `FeatureComponents Table `_ ++ `Directory Table `_ ++ `File Table `_ ++ `Component Table `_ ++ `FeatureComponents Table `_ + + .. _features: + +@@ -424,7 +424,7 @@ + + .. seealso:: + +- `Feature Table `_ ++ `Feature Table `_ + + .. _msi-gui: + +@@ -519,13 +519,13 @@ + + .. seealso:: + +- `Dialog Table `_ +- `Control Table `_ +- `Control Types `_ +- `ControlCondition Table `_ +- `ControlEvent Table `_ +- `EventMapping Table `_ +- `RadioButton Table `_ ++ `Dialog Table `_ ++ `Control Table `_ ++ `Control Types `_ ++ `ControlCondition Table `_ ++ `ControlEvent Table `_ ++ `EventMapping Table `_ ++ `RadioButton Table `_ + + .. _msi-tables: + +diff -r ee879c0ffa11 Doc/library/multiprocessing.rst +--- a/Doc/library/multiprocessing.rst ++++ b/Doc/library/multiprocessing.rst +@@ -694,7 +694,7 @@ + + Return list of all live children of the current process. + +- Calling this has the side affect of "joining" any processes which have ++ Calling this has the side effect of "joining" any processes which have + already finished. + + .. function:: cpu_count() +@@ -2142,7 +2142,7 @@ + items which have been put on the queue will eventually be removed before the + process is joined. Otherwise you cannot be sure that processes which have + put items on the queue will terminate. Remember also that non-daemonic +- processes will be automatically be joined. ++ processes will be joined automatically. + + An example which will deadlock is the following:: + +@@ -2158,7 +2158,7 @@ + p.join() # this deadlocks + obj = queue.get() + +- A fix here would be to swap the last two lines round (or simply remove the ++ A fix here would be to swap the last two lines (or simply remove the + ``p.join()`` line). + + Explicitly pass resources to child processes +diff -r ee879c0ffa11 Doc/library/os.path.rst +--- a/Doc/library/os.path.rst ++++ b/Doc/library/os.path.rst +@@ -197,17 +197,22 @@ + device --- this should detect mount points for all Unix and POSIX variants. + + +-.. function:: join(path1[, path2[, ...]]) ++.. function:: join(path, *paths) + +- Join one or more path components intelligently. If any component is an absolute +- path, all previous components (on Windows, including the previous drive letter, +- if there was one) are thrown away, and joining continues. The return value is +- the concatenation of *path1*, and optionally *path2*, etc., with exactly one +- directory separator (``os.sep``) following each non-empty part except the last. +- (This means that an empty last part will result in a path that ends with a +- separator.) Note that on Windows, since there is a current directory for +- each drive, ``os.path.join("c:", "foo")`` represents a path relative to the +- current directory on drive :file:`C:` (:file:`c:foo`), not :file:`c:\\foo`. ++ Join one or more path components intelligently. The return value is the ++ concatenation of *path* and any members of *\*paths* with exactly one ++ directory separator (``os.sep``) following each non-empty part except the ++ last, meaning that the result will only end in a separator if the last ++ part is empty. If a component is an absolute path, all previous ++ components are thrown away and joining continues from the absolute path ++ component. ++ ++ On Windows, the drive letter is not reset when an absolute path component ++ (e.g., ``r'\foo'``) is encountered. If a component contains a drive ++ letter, all previous components are thrown away and the drive letter is ++ reset. Note that since there is a current directory for each drive, ++ ``os.path.join("c:", "foo")`` represents a path relative to the current ++ directory on drive :file:`C:` (:file:`c:foo`), not :file:`c:\\foo`. + + + .. function:: normcase(path) +diff -r ee879c0ffa11 Doc/library/os.rst +--- a/Doc/library/os.rst ++++ b/Doc/library/os.rst +@@ -188,10 +188,10 @@ + .. function:: getlogin() + + Return the name of the user logged in on the controlling terminal of the +- process. For most purposes, it is more useful to use the environment variable +- :envvar:`LOGNAME` to find out who the user is, or +- ``pwd.getpwuid(os.getuid())[0]`` to get the login name of the currently +- effective user id. ++ process. For most purposes, it is more useful to use the environment ++ variable :envvar:`LOGNAME` to find out who the user is, or ++ ``pwd.getpwuid(os.getuid())[0]`` to get the login name of the process's real ++ user id. + + Availability: Unix. + +diff -r ee879c0ffa11 Doc/library/othergui.rst +--- a/Doc/library/othergui.rst ++++ b/Doc/library/othergui.rst +@@ -16,7 +16,7 @@ + `GNOME `_. An online `tutorial + `_ is available. + +- `PyQt `_ ++ `PyQt `_ + PyQt is a :program:`sip`\ -wrapped binding to the Qt toolkit. Qt is an + extensive C++ GUI application development framework that is + available for Unix, Windows and Mac OS X. :program:`sip` is a tool +@@ -45,7 +45,7 @@ + PyGTK, PyQt, and wxPython, all have a modern look and feel and more + widgets than Tkinter. In addition, there are many other GUI toolkits for + Python, both cross-platform, and platform-specific. See the `GUI Programming +-`_ page in the Python Wiki for a ++`_ page in the Python Wiki for a + much more complete list, and also for links to documents where the + different GUI toolkits are compared. + +diff -r ee879c0ffa11 Doc/library/pdb.rst +--- a/Doc/library/pdb.rst ++++ b/Doc/library/pdb.rst +@@ -6,6 +6,9 @@ + .. module:: pdb + :synopsis: The Python debugger for interactive interpreters. + ++**Source code:** :source:`Lib/pdb.py` ++ ++-------------- + + .. index:: single: debugging + +diff -r ee879c0ffa11 Doc/library/plistlib.rst +--- a/Doc/library/plistlib.rst ++++ b/Doc/library/plistlib.rst +@@ -37,7 +37,7 @@ + + .. seealso:: + +- `PList manual page `_ ++ `PList manual page `_ + Apple's documentation of the file format. + + +diff -r ee879c0ffa11 Doc/library/popen2.rst +--- a/Doc/library/popen2.rst ++++ b/Doc/library/popen2.rst +@@ -153,7 +153,7 @@ + + .. Example explanation and suggested work-arounds substantially stolen + from Martin von Löwis: +- http://mail.python.org/pipermail/python-dev/2000-September/009460.html ++ https://mail.python.org/pipermail/python-dev/2000-September/009460.html + + There are several ways to deal with this situation. + +diff -r ee879c0ffa11 Doc/library/pydoc.rst +--- a/Doc/library/pydoc.rst ++++ b/Doc/library/pydoc.rst +@@ -22,6 +22,13 @@ + modules. The documentation can be presented as pages of text on the console, + served to a Web browser, or saved to HTML files. + ++For modules, classes, functions and methods, the displayed documentation is ++derived from the docstring (i.e. the :attr:`__doc__` attribute) of the object, ++and recursively of its documentable members. If there is no docstring, ++:mod:`pydoc` tries to obtain a description from the block of comment lines just ++above the definition of the class, function or method in the source file, or at ++the top of the module (see :func:`inspect.getcomments`). ++ + The built-in function :func:`help` invokes the online help system in the + interactive interpreter, which uses :mod:`pydoc` to generate its documentation + as text on the console. The same text documentation can also be viewed from +@@ -69,7 +76,7 @@ + Python interpreter and typed ``import spam``. + + Module docs for core modules are assumed to reside in +-http://docs.python.org/library/. This can be overridden by setting the ++https://docs.python.org/library/. This can be overridden by setting the + :envvar:`PYTHONDOCS` environment variable to a different URL or to a local + directory containing the Library Reference Manual pages. + +diff -r ee879c0ffa11 Doc/library/pyexpat.rst +--- a/Doc/library/pyexpat.rst ++++ b/Doc/library/pyexpat.rst +@@ -912,5 +912,5 @@ + .. [#] The encoding string included in XML output should conform to the + appropriate standards. For example, "UTF-8" is valid, but "UTF8" is + not. See http://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EncodingDecl +- and http://www.iana.org/assignments/character-sets\ . ++ and http://www.iana.org/assignments/character-sets/character-sets.xhtml. + +diff -r ee879c0ffa11 Doc/library/python.rst +--- a/Doc/library/python.rst ++++ b/Doc/library/python.rst +@@ -28,4 +28,3 @@ + site.rst + user.rst + fpectl.rst +- distutils.rst +diff -r ee879c0ffa11 Doc/library/re.rst +--- a/Doc/library/re.rst ++++ b/Doc/library/re.rst +@@ -33,13 +33,6 @@ + shortcuts that don't require you to compile a regex object first, but miss some + fine-tuning parameters. + +-.. seealso:: +- +- Mastering Regular Expressions +- Book on regular expressions by Jeffrey Friedl, published by O'Reilly. The +- second edition of the book no longer covers Python at all, but the first +- edition covered writing good regular expression patterns in great detail. +- + + .. _re-syntax: + +@@ -393,7 +386,7 @@ + any non-alphanumeric character; this is equivalent to the set ``[^a-zA-Z0-9_]``. + With :const:`LOCALE`, it will match any character not in the set ``[0-9_]``, and + not defined as alphanumeric for the current locale. If :const:`UNICODE` is set, +- this will match anything other than ``[0-9_]`` plus characters classied as ++ this will match anything other than ``[0-9_]`` plus characters classified as + not alphanumeric in the Unicode character properties database. + + ``\Z`` +@@ -418,6 +411,14 @@ + a group reference. As for string literals, octal escapes are always at most + three digits in length. + ++.. seealso:: ++ ++ Mastering Regular Expressions ++ Book on regular expressions by Jeffrey Friedl, published by O'Reilly. The ++ second edition of the book no longer covers Python at all, but the first ++ edition covered writing good regular expression patterns in great detail. ++ ++ + + .. _contents-of-module-re: + +diff -r ee879c0ffa11 Doc/library/repr.rst +--- a/Doc/library/repr.rst ++++ b/Doc/library/repr.rst +@@ -3,6 +3,7 @@ + + .. module:: repr + :synopsis: Alternate repr() implementation with size limits. ++ :noindex: + .. sectionauthor:: Fred L. Drake, Jr. + + .. note:: +diff -r ee879c0ffa11 Doc/library/socket.rst +--- a/Doc/library/socket.rst ++++ b/Doc/library/socket.rst +@@ -265,7 +265,7 @@ + connection to ``www.python.org`` on port 80 (results may differ on your + system if IPv6 isn't enabled):: + +- >>> socket.getaddrinfo("www.python.org", 80, 0, 0, socket.SOL_TCP) ++ >>> socket.getaddrinfo("www.python.org", 80, 0, 0, socket.IPPROTO_TCP) + [(2, 1, 6, '', ('82.94.164.162', 80)), + (10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))] + +@@ -661,9 +661,11 @@ + .. index:: single: I/O control; buffering + + Return a :dfn:`file object` associated with the socket. (File objects are +- described in :ref:`bltin-file-objects`.) The file object +- references a :c:func:`dup`\ ped version of the socket file descriptor, so the +- file object and socket object may be closed or garbage-collected independently. ++ described in :ref:`bltin-file-objects`.) The file object does not close the ++ socket explicitly when its :meth:`close` method is called, but only removes ++ its reference to the socket object, so that the socket will be closed if it ++ is not referenced from anywhere else. ++ + The socket must be in blocking mode (it can not have a timeout). The optional + *mode* and *bufsize* arguments are interpreted the same way as by the built-in + :func:`file` function. +diff -r ee879c0ffa11 Doc/library/ssl.rst +--- a/Doc/library/ssl.rst ++++ b/Doc/library/ssl.rst +@@ -28,19 +28,14 @@ + + Some behavior may be platform dependent, since calls are made to the + operating system socket APIs. The installed version of OpenSSL may also +- cause variations in behavior. ++ cause variations in behavior. For example, TLSv1.1 and TLSv1.2 come with ++ openssl version 1.0.1. + + .. warning:: +- The ssl module won't validate certificates by default. When used in +- client mode, this means you are vulnerable to man-in-the-middle attacks. ++ Don't use this module without reading the :ref:`ssl-security`. Doing so ++ may lead to a false sense of security, as the default settings of the ++ ssl module are not necessarily appropriate for your application. + +-.. warning:: +- +- OpenSSL's internal random number generator does not properly handle fork. +- Applications must change the PRNG state of the parent process if they use +- any SSL feature with :func:`os.fork`. Any successful call of +- :func:`~ssl.RAND_add`, :func:`~ssl.RAND_bytes` or +- :func:`~ssl.RAND_pseudo_bytes` is sufficient. + + This section documents the objects and functions in the ``ssl`` module; for more + general information about TLS, SSL, and certificates, the reader is referred to +@@ -49,23 +44,101 @@ + This module provides a class, :class:`ssl.SSLSocket`, which is derived from the + :class:`socket.socket` type, and provides a socket-like wrapper that also + encrypts and decrypts the data going over the socket with SSL. It supports +-additional :meth:`read` and :meth:`write` methods, along with a method, +-:meth:`getpeercert`, to retrieve the certificate of the other side of the +-connection, and a method, :meth:`cipher`, to retrieve the cipher being used for +-the secure connection. ++additional methods such as :meth:`getpeercert`, which retrieves the ++certificate of the other side of the connection, and :meth:`cipher`,which ++retrieves the cipher being used for the secure connection. ++ ++For more sophisticated applications, the :class:`ssl.SSLContext` class ++helps manage settings and certificates, which can then be inherited ++by SSL sockets created through the :meth:`SSLContext.wrap_socket` method. ++ + + Functions, Constants, and Exceptions + ------------------------------------ + + .. exception:: SSLError + +- Raised to signal an error from the underlying SSL implementation. This +- signifies some problem in the higher-level encryption and authentication +- layer that's superimposed on the underlying network connection. This error +- is a subtype of :exc:`socket.error`, which in turn is a subtype of +- :exc:`IOError`. ++ Raised to signal an error from the underlying SSL implementation (currently ++ provided by the OpenSSL library). This signifies some problem in the ++ higher-level encryption and authentication layer that's superimposed on the ++ underlying network connection. This error is a subtype of ++ :exc:`socket.error`, which in turn is a subtype of :exc:`IOError`. The ++ error code and message of :exc:`SSLError` instances are provided by the ++ OpenSSL library. + +-.. function:: wrap_socket (sock, keyfile=None, certfile=None, server_side=False, cert_reqs=CERT_NONE, ssl_version={see docs}, ca_certs=None, do_handshake_on_connect=True, suppress_ragged_eofs=True, ciphers=None) ++ .. attribute:: library ++ ++ A string mnemonic designating the OpenSSL submodule in which the error ++ occurred, such as ``SSL``, ``PEM`` or ``X509``. The range of possible ++ values depends on the OpenSSL version. ++ ++ .. versionadded:: 2.7.9 ++ ++ .. attribute:: reason ++ ++ A string mnemonic designating the reason this error occurred, for ++ example ``CERTIFICATE_VERIFY_FAILED``. The range of possible ++ values depends on the OpenSSL version. ++ ++ .. versionadded:: 2.7.9 ++ ++.. exception:: SSLZeroReturnError ++ ++ A subclass of :exc:`SSLError` raised when trying to read or write and ++ the SSL connection has been closed cleanly. Note that this doesn't ++ mean that the underlying transport (read TCP) has been closed. ++ ++ .. versionadded:: 2.7.9 ++ ++.. exception:: SSLWantReadError ++ ++ A subclass of :exc:`SSLError` raised by a :ref:`non-blocking SSL socket ++ ` when trying to read or write data, but more data needs ++ to be received on the underlying TCP transport before the request can be ++ fulfilled. ++ ++ .. versionadded:: 2.7.9 ++ ++.. exception:: SSLWantWriteError ++ ++ A subclass of :exc:`SSLError` raised by a :ref:`non-blocking SSL socket ++ ` when trying to read or write data, but more data needs ++ to be sent on the underlying TCP transport before the request can be ++ fulfilled. ++ ++ .. versionadded:: 2.7.9 ++ ++.. exception:: SSLSyscallError ++ ++ A subclass of :exc:`SSLError` raised when a system error was encountered ++ while trying to fulfill an operation on a SSL socket. Unfortunately, ++ there is no easy way to inspect the original errno number. ++ ++ .. versionadded:: 2.7.9 ++ ++.. exception:: SSLEOFError ++ ++ A subclass of :exc:`SSLError` raised when the SSL connection has been ++ terminated abruptly. Generally, you shouldn't try to reuse the underlying ++ transport when this error is encountered. ++ ++ .. versionadded:: 2.7.9 ++ ++.. exception:: CertificateError ++ ++ Raised to signal an error with a certificate (such as mismatching ++ hostname). Certificate errors detected by OpenSSL, though, raise ++ an :exc:`SSLError`. ++ ++ ++Socket creation ++^^^^^^^^^^^^^^^ ++ ++The following function allows for standalone socket creation. Starting from ++Python 2.7.9, it can be more flexible to use :meth:`SSLContext.wrap_socket` ++instead. ++ ++.. function:: wrap_socket(sock, keyfile=None, certfile=None, server_side=False, cert_reqs=CERT_NONE, ssl_version={see docs}, ca_certs=None, do_handshake_on_connect=True, suppress_ragged_eofs=True, ciphers=None) + + Takes an instance ``sock`` of :class:`socket.socket`, and returns an instance + of :class:`ssl.SSLSocket`, a subtype of :class:`socket.socket`, which wraps +@@ -85,19 +158,6 @@ + connection. See the discussion of :ref:`ssl-certificates` for more + information on how the certificate is stored in the ``certfile``. + +- Often the private key is stored in the same file as the certificate; in this +- case, only the ``certfile`` parameter need be passed. If the private key is +- stored in a separate file, both parameters must be used. If the private key +- is stored in the ``certfile``, it should come before the first certificate in +- the certificate chain:: +- +- -----BEGIN RSA PRIVATE KEY----- +- ... (private key in base64 encoding) ... +- -----END RSA PRIVATE KEY----- +- -----BEGIN CERTIFICATE----- +- ... (certificate in base64 PEM encoding) ... +- -----END CERTIFICATE----- +- + The parameter ``server_side`` is a boolean which identifies whether + server-side or client-side behavior is desired from this socket. + +@@ -127,25 +187,23 @@ + + .. table:: + +- ======================== ========= ========= ========== ========= +- *client* / **server** **SSLv2** **SSLv3** **SSLv23** **TLSv1** +- ------------------------ --------- --------- ---------- --------- +- *SSLv2* yes no yes no +- *SSLv3* no yes yes no +- *SSLv23* yes no yes no +- *TLSv1* no no yes yes +- ======================== ========= ========= ========== ========= ++ ======================== ========= ========= ========== ========= =========== =========== ++ *client* / **server** **SSLv2** **SSLv3** **SSLv23** **TLSv1** **TLSv1.1** **TLSv1.2** ++ ------------------------ --------- --------- ---------- --------- ----------- ----------- ++ *SSLv2* yes no yes no no no ++ *SSLv3* no yes yes no no no ++ *SSLv23* yes no yes no no no ++ *TLSv1* no no yes yes no no ++ *TLSv1.1* no no yes no yes no ++ *TLSv1.2* no no yes no no yes ++ ======================== ========= ========= ========== ========= =========== =========== + + .. note:: + + Which connections succeed will vary depending on the version of +- OpenSSL. For instance, in some older versions of OpenSSL (such +- as 0.9.7l on OS X 10.4), an SSLv2 client could not connect to an +- SSLv23 server. Another example: beginning with OpenSSL 1.0.0, +- an SSLv23 client will not actually attempt SSLv2 connections +- unless you explicitly enable SSLv2 ciphers; for example, you +- might specify ``"ALL"`` or ``"SSLv2"`` as the *ciphers* parameter +- to enable them. ++ OpenSSL. For example, beginning with OpenSSL 1.0.0, an SSLv23 client ++ will not actually attempt SSLv2 connections unless you explicitly ++ enable SSLv2 ciphers (which is not recommended, as SSLv2 is broken). + + The *ciphers* parameter sets the available ciphers for this SSL object. + It should be a string in the `OpenSSL cipher list format +@@ -161,22 +219,79 @@ + The parameter ``suppress_ragged_eofs`` specifies how the + :meth:`SSLSocket.read` method should signal unexpected EOF from the other end + of the connection. If specified as :const:`True` (the default), it returns a +- normal EOF in response to unexpected EOF errors raised from the underlying +- socket; if :const:`False`, it will raise the exceptions back to the caller. ++ normal EOF (an empty bytes object) in response to unexpected EOF errors ++ raised from the underlying socket; if :const:`False`, it will raise the ++ exceptions back to the caller. + + .. versionchanged:: 2.7 + New optional argument *ciphers*. + ++ ++Context creation ++^^^^^^^^^^^^^^^^ ++ ++A convenience function helps create :class:`SSLContext` objects for common ++purposes. ++ ++.. function:: create_default_context(purpose=Purpose.SERVER_AUTH, cafile=None, capath=None, cadata=None) ++ ++ Return a new :class:`SSLContext` object with default settings for ++ the given *purpose*. The settings are chosen by the :mod:`ssl` module, ++ and usually represent a higher security level than when calling the ++ :class:`SSLContext` constructor directly. ++ ++ *cafile*, *capath*, *cadata* represent optional CA certificates to ++ trust for certificate verification, as in ++ :meth:`SSLContext.load_verify_locations`. If all three are ++ :const:`None`, this function can choose to trust the system's default ++ CA certificates instead. ++ ++ The settings in Python 2.7.9 are: :data:`PROTOCOL_SSLv23`, ++ :data:`OP_NO_SSLv2`, and :data:`OP_NO_SSLv3` with high encryption cipher ++ suites without RC4 and without unauthenticated cipher suites. Passing ++ :data:`~Purpose.SERVER_AUTH` as *purpose* sets ++ :data:`~SSLContext.verify_mode` to :data:`CERT_REQUIRED` and either loads CA ++ certificates (when at least one of *cafile*, *capath* or *cadata* is given) ++ or uses :meth:`SSLContext.load_default_certs` to load default CA ++ certificates. ++ ++ .. note:: ++ The protocol, options, cipher and other settings may change to more ++ restrictive values anytime without prior deprecation. The values ++ represent a fair balance between compatibility and security. ++ ++ If your application needs specific settings, you should create a ++ :class:`SSLContext` and apply the settings yourself. ++ ++ .. note:: ++ If you find that when certain older clients or servers attempt to connect ++ with a :class:`SSLContext` created by this function that they get an ++ error stating "Protocol or cipher suite mismatch", it may be that they ++ only support SSL3.0 which this function excludes using the ++ :data:`OP_NO_SSLv3`. SSL3.0 has problematic security due to a number of ++ poor implementations and it's reliance on MD5 within the protocol. If you ++ wish to continue to use this function but still allow SSL 3.0 connections ++ you can re-enable them using:: ++ ++ ctx = ssl.create_default_context(Purpose.CLIENT_AUTH) ++ ctx.options &= ~ssl.OP_NO_SSLv3 ++ ++ .. versionadded:: 2.7.9 ++ ++ ++Random generation ++^^^^^^^^^^^^^^^^^ ++ + .. function:: RAND_status() + + Returns ``True`` if the SSL pseudo-random number generator has been seeded with +- 'enough' randomness, and False otherwise. You can use :func:`ssl.RAND_egd` ++ 'enough' randomness, and ``False`` otherwise. You can use :func:`ssl.RAND_egd` + and :func:`ssl.RAND_add` to increase the randomness of the pseudo-random + number generator. + + .. function:: RAND_egd(path) + +- If you are running an entropy-gathering daemon (EGD) somewhere, and ``path`` ++ If you are running an entropy-gathering daemon (EGD) somewhere, and *path* + is the pathname of a socket connection open to it, this will read 256 bytes + of randomness from the socket, and add it to the SSL pseudo-random number + generator to increase the security of generated secret keys. This is +@@ -187,28 +302,66 @@ + + .. function:: RAND_add(bytes, entropy) + +- Mixes the given ``bytes`` into the SSL pseudo-random number generator. The +- parameter ``entropy`` (a float) is a lower bound on the entropy contained in ++ Mixes the given *bytes* into the SSL pseudo-random number generator. The ++ parameter *entropy* (a float) is a lower bound on the entropy contained in + string (so you can always use :const:`0.0`). See :rfc:`1750` for more + information on sources of entropy. + +-.. function:: cert_time_to_seconds(timestring) ++Certificate handling ++^^^^^^^^^^^^^^^^^^^^ + +- Returns a floating-point value containing a normal seconds-after-the-epoch +- time value, given the time-string representing the "notBefore" or "notAfter" +- date from a certificate. ++.. function:: match_hostname(cert, hostname) + +- Here's an example:: ++ Verify that *cert* (in decoded format as returned by ++ :meth:`SSLSocket.getpeercert`) matches the given *hostname*. The rules ++ applied are those for checking the identity of HTTPS servers as outlined ++ in :rfc:`2818` and :rfc:`6125`, except that IP addresses are not currently ++ supported. In addition to HTTPS, this function should be suitable for ++ checking the identity of servers in various SSL-based protocols such as ++ FTPS, IMAPS, POPS and others. + +- >>> import ssl +- >>> ssl.cert_time_to_seconds("May 9 00:00:00 2007 GMT") +- 1178694000.0 +- >>> import time +- >>> time.ctime(ssl.cert_time_to_seconds("May 9 00:00:00 2007 GMT")) +- 'Wed May 9 00:00:00 2007' +- >>> ++ :exc:`CertificateError` is raised on failure. On success, the function ++ returns nothing:: + +-.. function:: get_server_certificate (addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None) ++ >>> cert = {'subject': ((('commonName', 'example.com'),),)} ++ >>> ssl.match_hostname(cert, "example.com") ++ >>> ssl.match_hostname(cert, "example.org") ++ Traceback (most recent call last): ++ File "", line 1, in ++ File "/home/py3k/Lib/ssl.py", line 130, in match_hostname ++ ssl.CertificateError: hostname 'example.org' doesn't match 'example.com' ++ ++ .. versionadded:: 2.7.9 ++ ++ ++.. function:: cert_time_to_seconds(cert_time) ++ ++ Return the time in seconds since the Epoch, given the ``cert_time`` ++ string representing the "notBefore" or "notAfter" date from a ++ certificate in ``"%b %d %H:%M:%S %Y %Z"`` strptime format (C ++ locale). ++ ++ Here's an example: ++ ++ .. doctest:: newcontext ++ ++ >>> import ssl ++ >>> timestamp = ssl.cert_time_to_seconds("Jan 5 09:34:43 2018 GMT") ++ >>> timestamp ++ 1515144883 ++ >>> from datetime import datetime ++ >>> print(datetime.utcfromtimestamp(timestamp)) ++ 2018-01-05 09:34:43 ++ ++ "notBefore" or "notAfter" dates must use GMT (:rfc:`5280`). ++ ++ .. versionchanged:: 2.7.9 ++ Interpret the input time as a time in UTC as specified by 'GMT' ++ timezone in the input string. Local timezone was used ++ previously. Return an integer (no fractions of a second in the ++ input format) ++ ++.. function:: get_server_certificate(addr, ssl_version=PROTOCOL_SSLv23, ca_certs=None) + + Given the address ``addr`` of an SSL-protected server, as a (*hostname*, + *port-number*) pair, fetches the server's certificate, and returns it as a +@@ -219,36 +372,149 @@ + will attempt to validate the server certificate against that set of root + certificates, and will fail if the validation attempt fails. + +-.. function:: DER_cert_to_PEM_cert (DER_cert_bytes) ++ .. versionchanged:: 2.7.9 ++ ++ This function is now IPv6-compatible, and the default *ssl_version* is ++ changed from :data:`PROTOCOL_SSLv3` to :data:`PROTOCOL_SSLv23` for ++ maximum compatibility with modern servers. ++ ++.. function:: DER_cert_to_PEM_cert(DER_cert_bytes) + + Given a certificate as a DER-encoded blob of bytes, returns a PEM-encoded + string version of the same certificate. + +-.. function:: PEM_cert_to_DER_cert (PEM_cert_string) ++.. function:: PEM_cert_to_DER_cert(PEM_cert_string) + + Given a certificate as an ASCII PEM string, returns a DER-encoded sequence of + bytes for that same certificate. + ++.. function:: get_default_verify_paths() ++ ++ Returns a named tuple with paths to OpenSSL's default cafile and capath. ++ The paths are the same as used by ++ :meth:`SSLContext.set_default_verify_paths`. The return value is a ++ :term:`named tuple` ``DefaultVerifyPaths``: ++ ++ * :attr:`cafile` - resolved path to cafile or None if the file doesn't exist, ++ * :attr:`capath` - resolved path to capath or None if the directory doesn't exist, ++ * :attr:`openssl_cafile_env` - OpenSSL's environment key that points to a cafile, ++ * :attr:`openssl_cafile` - hard coded path to a cafile, ++ * :attr:`openssl_capath_env` - OpenSSL's environment key that points to a capath, ++ * :attr:`openssl_capath` - hard coded path to a capath directory ++ ++ .. versionadded:: 2.7.9 ++ ++.. function:: enum_certificates(store_name) ++ ++ Retrieve certificates from Windows' system cert store. *store_name* may be ++ one of ``CA``, ``ROOT`` or ``MY``. Windows may provide additional cert ++ stores, too. ++ ++ The function returns a list of (cert_bytes, encoding_type, trust) tuples. ++ The encoding_type specifies the encoding of cert_bytes. It is either ++ :const:`x509_asn` for X.509 ASN.1 data or :const:`pkcs_7_asn` for ++ PKCS#7 ASN.1 data. Trust specifies the purpose of the certificate as a set ++ of OIDS or exactly ``True`` if the certificate is trustworthy for all ++ purposes. ++ ++ Example:: ++ ++ >>> ssl.enum_certificates("CA") ++ [(b'data...', 'x509_asn', {'1.3.6.1.5.5.7.3.1', '1.3.6.1.5.5.7.3.2'}), ++ (b'data...', 'x509_asn', True)] ++ ++ Availability: Windows. ++ ++ .. versionadded:: 2.7.9 ++ ++.. function:: enum_crls(store_name) ++ ++ Retrieve CRLs from Windows' system cert store. *store_name* may be ++ one of ``CA``, ``ROOT`` or ``MY``. Windows may provide additional cert ++ stores, too. ++ ++ The function returns a list of (cert_bytes, encoding_type, trust) tuples. ++ The encoding_type specifies the encoding of cert_bytes. It is either ++ :const:`x509_asn` for X.509 ASN.1 data or :const:`pkcs_7_asn` for ++ PKCS#7 ASN.1 data. ++ ++ Availability: Windows. ++ ++ .. versionadded:: 2.7.9 ++ ++ ++Constants ++^^^^^^^^^ ++ + .. data:: CERT_NONE + +- Value to pass to the ``cert_reqs`` parameter to :func:`sslobject` when no +- certificates will be required or validated from the other side of the socket +- connection. ++ Possible value for :attr:`SSLContext.verify_mode`, or the ``cert_reqs`` ++ parameter to :func:`wrap_socket`. In this mode (the default), no ++ certificates will be required from the other side of the socket connection. ++ If a certificate is received from the other end, no attempt to validate it ++ is made. ++ ++ See the discussion of :ref:`ssl-security` below. + + .. data:: CERT_OPTIONAL + +- Value to pass to the ``cert_reqs`` parameter to :func:`sslobject` when no +- certificates will be required from the other side of the socket connection, +- but if they are provided, will be validated. Note that use of this setting +- requires a valid certificate validation file also be passed as a value of the +- ``ca_certs`` parameter. ++ Possible value for :attr:`SSLContext.verify_mode`, or the ``cert_reqs`` ++ parameter to :func:`wrap_socket`. In this mode no certificates will be ++ required from the other side of the socket connection; but if they ++ are provided, validation will be attempted and an :class:`SSLError` ++ will be raised on failure. ++ ++ Use of this setting requires a valid set of CA certificates to ++ be passed, either to :meth:`SSLContext.load_verify_locations` or as a ++ value of the ``ca_certs`` parameter to :func:`wrap_socket`. + + .. data:: CERT_REQUIRED + +- Value to pass to the ``cert_reqs`` parameter to :func:`sslobject` when +- certificates will be required from the other side of the socket connection. +- Note that use of this setting requires a valid certificate validation file +- also be passed as a value of the ``ca_certs`` parameter. ++ Possible value for :attr:`SSLContext.verify_mode`, or the ``cert_reqs`` ++ parameter to :func:`wrap_socket`. In this mode, certificates are ++ required from the other side of the socket connection; an :class:`SSLError` ++ will be raised if no certificate is provided, or if its validation fails. ++ ++ Use of this setting requires a valid set of CA certificates to ++ be passed, either to :meth:`SSLContext.load_verify_locations` or as a ++ value of the ``ca_certs`` parameter to :func:`wrap_socket`. ++ ++.. data:: VERIFY_DEFAULT ++ ++ Possible value for :attr:`SSLContext.verify_flags`. In this mode, ++ certificate revocation lists (CRLs) are not checked. By default OpenSSL ++ does neither require nor verify CRLs. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: VERIFY_CRL_CHECK_LEAF ++ ++ Possible value for :attr:`SSLContext.verify_flags`. In this mode, only the ++ peer cert is check but non of the intermediate CA certificates. The mode ++ requires a valid CRL that is signed by the peer cert's issuer (its direct ++ ancestor CA). If no proper has been loaded ++ :attr:`SSLContext.load_verify_locations`, validation will fail. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: VERIFY_CRL_CHECK_CHAIN ++ ++ Possible value for :attr:`SSLContext.verify_flags`. In this mode, CRLs of ++ all certificates in the peer cert chain are checked. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: VERIFY_X509_STRICT ++ ++ Possible value for :attr:`SSLContext.verify_flags` to disable workarounds ++ for broken X.509 certificates. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: PROTOCOL_SSLv23 ++ ++ Selects the highest protocol version that both the client and server support. ++ Despite the name, this option can select "TLS" protocols as well as "SSL". + + .. data:: PROTOCOL_SSLv2 + +@@ -261,23 +527,145 @@ + + SSL version 2 is insecure. Its use is highly discouraged. + +-.. data:: PROTOCOL_SSLv23 +- +- Selects SSL version 2 or 3 as the channel encryption protocol. This is a +- setting to use with servers for maximum compatibility with the other end of +- an SSL connection, but it may cause the specific ciphers chosen for the +- encryption to be of fairly low quality. +- + .. data:: PROTOCOL_SSLv3 + +- Selects SSL version 3 as the channel encryption protocol. For clients, this +- is the maximally compatible SSL variant. ++ Selects SSL version 3 as the channel encryption protocol. ++ ++ .. warning:: ++ ++ SSL version 3 is insecure. Its use is highly discouraged. + + .. data:: PROTOCOL_TLSv1 + +- Selects TLS version 1 as the channel encryption protocol. This is the most +- modern version, and probably the best choice for maximum protection, if both +- sides can speak it. ++ Selects TLS version 1.0 as the channel encryption protocol. ++ ++.. data:: PROTOCOL_TLSv1_1 ++ ++ Selects TLS version 1.1 as the channel encryption protocol. ++ Available only with openssl version 1.0.1+. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: PROTOCOL_TLSv1_2 ++ ++ Selects TLS version 1.2 as the channel encryption protocol. This is the ++ most modern version, and probably the best choice for maximum protection, ++ if both sides can speak it. Available only with openssl version 1.0.1+. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: OP_ALL ++ ++ Enables workarounds for various bugs present in other SSL implementations. ++ This option is set by default. It does not necessarily set the same ++ flags as OpenSSL's ``SSL_OP_ALL`` constant. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: OP_NO_SSLv2 ++ ++ Prevents an SSLv2 connection. This option is only applicable in ++ conjunction with :const:`PROTOCOL_SSLv23`. It prevents the peers from ++ choosing SSLv2 as the protocol version. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: OP_NO_SSLv3 ++ ++ Prevents an SSLv3 connection. This option is only applicable in ++ conjunction with :const:`PROTOCOL_SSLv23`. It prevents the peers from ++ choosing SSLv3 as the protocol version. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: OP_NO_TLSv1 ++ ++ Prevents a TLSv1 connection. This option is only applicable in ++ conjunction with :const:`PROTOCOL_SSLv23`. It prevents the peers from ++ choosing TLSv1 as the protocol version. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: OP_NO_TLSv1_1 ++ ++ Prevents a TLSv1.1 connection. This option is only applicable in conjunction ++ with :const:`PROTOCOL_SSLv23`. It prevents the peers from choosing TLSv1.1 as ++ the protocol version. Available only with openssl version 1.0.1+. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: OP_NO_TLSv1_2 ++ ++ Prevents a TLSv1.2 connection. This option is only applicable in conjunction ++ with :const:`PROTOCOL_SSLv23`. It prevents the peers from choosing TLSv1.2 as ++ the protocol version. Available only with openssl version 1.0.1+. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: OP_CIPHER_SERVER_PREFERENCE ++ ++ Use the server's cipher ordering preference, rather than the client's. ++ This option has no effect on client sockets and SSLv2 server sockets. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: OP_SINGLE_DH_USE ++ ++ Prevents re-use of the same DH key for distinct SSL sessions. This ++ improves forward secrecy but requires more computational resources. ++ This option only applies to server sockets. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: OP_SINGLE_ECDH_USE ++ ++ Prevents re-use of the same ECDH key for distinct SSL sessions. This ++ improves forward secrecy but requires more computational resources. ++ This option only applies to server sockets. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: OP_NO_COMPRESSION ++ ++ Disable compression on the SSL channel. This is useful if the application ++ protocol supports its own compression scheme. ++ ++ This option is only available with OpenSSL 1.0.0 and later. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: HAS_ECDH ++ ++ Whether the OpenSSL library has built-in support for Elliptic Curve-based ++ Diffie-Hellman key exchange. This should be true unless the feature was ++ explicitly disabled by the distributor. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: HAS_SNI ++ ++ Whether the OpenSSL library has built-in support for the *Server Name ++ Indication* extension (as defined in :rfc:`4366`). When true, you can ++ use the *server_hostname* argument to :meth:`SSLContext.wrap_socket`. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: HAS_NPN ++ ++ Whether the OpenSSL library has built-in support for *Next Protocol ++ Negotiation* as described in the `NPN draft specification ++ `_. When true, ++ you can use the :meth:`SSLContext.set_npn_protocols` method to advertise ++ which protocols you want to support. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: CHANNEL_BINDING_TYPES ++ ++ List of supported TLS channel binding types. Strings in this list ++ can be used as arguments to :meth:`SSLSocket.get_channel_binding`. ++ ++ .. versionadded:: 2.7.9 + + .. data:: OPENSSL_VERSION + +@@ -309,9 +697,40 @@ + + .. versionadded:: 2.7 + ++.. data:: ALERT_DESCRIPTION_HANDSHAKE_FAILURE ++ ALERT_DESCRIPTION_INTERNAL_ERROR ++ ALERT_DESCRIPTION_* + +-SSLSocket Objects +------------------ ++ Alert Descriptions from :rfc:`5246` and others. The `IANA TLS Alert Registry ++ `_ ++ contains this list and references to the RFCs where their meaning is defined. ++ ++ Used as the return value of the callback function in ++ :meth:`SSLContext.set_servername_callback`. ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: Purpose.SERVER_AUTH ++ ++ Option for :func:`create_default_context` and ++ :meth:`SSLContext.load_default_certs`. This value indicates that the ++ context may be used to authenticate Web servers (therefore, it will ++ be used to create client-side sockets). ++ ++ .. versionadded:: 2.7.9 ++ ++.. data:: Purpose.CLIENT_AUTH ++ ++ Option for :func:`create_default_context` and ++ :meth:`SSLContext.load_default_certs`. This value indicates that the ++ context may be used to authenticate Web clients (therefore, it will ++ be used to create server-side sockets). ++ ++ .. versionadded:: 2.7.9 ++ ++ ++SSL Sockets ++----------- + + SSL sockets provide the following methods of :ref:`socket-objects`: + +@@ -334,37 +753,64 @@ + + However, since the SSL (and TLS) protocol has its own framing atop + of TCP, the SSL sockets abstraction can, in certain respects, diverge from +-the specification of normal, OS-level sockets. ++the specification of normal, OS-level sockets. See especially the ++:ref:`notes on non-blocking sockets `. + + SSL sockets also have the following additional methods and attributes: + ++.. method:: SSLSocket.do_handshake() ++ ++ Perform the SSL setup handshake. ++ ++ .. versionchanged:: 2.7.9 ++ ++ The handshake method also performs :func:`match_hostname` when the ++ :attr:`~SSLContext.check_hostname` attribute of the socket's ++ :attr:`~SSLSocket.context` is true. ++ + .. method:: SSLSocket.getpeercert(binary_form=False) + + If there is no certificate for the peer on the other end of the connection, +- returns ``None``. ++ return ``None``. If the SSL handshake hasn't been done yet, raise ++ :exc:`ValueError`. + + If the ``binary_form`` parameter is :const:`False`, and a certificate was + received from the peer, this method returns a :class:`dict` instance. If the + certificate was not validated, the dict is empty. If the certificate was +- validated, it returns a dict with the keys ``subject`` (the principal for +- which the certificate was issued), and ``notAfter`` (the time after which the +- certificate should not be trusted). The certificate was already validated, +- so the ``notBefore`` and ``issuer`` fields are not returned. If a +- certificate contains an instance of the *Subject Alternative Name* extension +- (see :rfc:`3280`), there will also be a ``subjectAltName`` key in the +- dictionary. ++ validated, it returns a dict with several keys, amongst them ``subject`` ++ (the principal for which the certificate was issued) and ``issuer`` ++ (the principal issuing the certificate). If a certificate contains an ++ instance of the *Subject Alternative Name* extension (see :rfc:`3280`), ++ there will also be a ``subjectAltName`` key in the dictionary. + +- The "subject" field is a tuple containing the sequence of relative +- distinguished names (RDNs) given in the certificate's data structure for the +- principal, and each RDN is a sequence of name-value pairs:: ++ The ``subject`` and ``issuer`` fields are tuples containing the sequence ++ of relative distinguished names (RDNs) given in the certificate's data ++ structure for the respective fields, and each RDN is a sequence of ++ name-value pairs. Here is a real-world example:: + +- {'notAfter': 'Feb 16 16:54:50 2013 GMT', +- 'subject': ((('countryName', u'US'),), +- (('stateOrProvinceName', u'Delaware'),), +- (('localityName', u'Wilmington'),), +- (('organizationName', u'Python Software Foundation'),), +- (('organizationalUnitName', u'SSL'),), +- (('commonName', u'somemachine.python.org'),))} ++ {'issuer': ((('countryName', 'IL'),), ++ (('organizationName', 'StartCom Ltd.'),), ++ (('organizationalUnitName', ++ 'Secure Digital Certificate Signing'),), ++ (('commonName', ++ 'StartCom Class 2 Primary Intermediate Server CA'),)), ++ 'notAfter': 'Nov 22 08:15:19 2013 GMT', ++ 'notBefore': 'Nov 21 03:09:52 2011 GMT', ++ 'serialNumber': '95F0', ++ 'subject': ((('description', '571208-SLe257oHY9fVQ07Z'),), ++ (('countryName', 'US'),), ++ (('stateOrProvinceName', 'California'),), ++ (('localityName', 'San Francisco'),), ++ (('organizationName', 'Electronic Frontier Foundation, Inc.'),), ++ (('commonName', '*.eff.org'),), ++ (('emailAddress', 'hostmaster@eff.org'),)), ++ 'subjectAltName': (('DNS', '*.eff.org'), ('DNS', 'eff.org')), ++ 'version': 3} ++ ++ .. note:: ++ ++ To validate a certificate for a particular service, you can use the ++ :func:`match_hostname` function. + + If the ``binary_form`` parameter is :const:`True`, and a certificate was + provided, this method returns the DER-encoded form of the entire certificate +@@ -380,40 +826,398 @@ + :const:`None` if you used :const:`CERT_NONE` (rather than + :const:`CERT_OPTIONAL` or :const:`CERT_REQUIRED`). + ++ .. versionchanged:: 2.7.9 ++ The returned dictionary includes additional items such as ``issuer`` and ++ ``notBefore``. Additionall :exc:`ValueError` is raised when the handshake ++ isn't done. The returned dictionary includes additional X509v3 extension ++ items such as ``crlDistributionPoints``, ``caIssuers`` and ``OCSP`` URIs. ++ + .. method:: SSLSocket.cipher() + + Returns a three-value tuple containing the name of the cipher being used, the + version of the SSL protocol that defines its use, and the number of secret + bits being used. If no connection has been established, returns ``None``. + +-.. method:: SSLSocket.do_handshake() ++.. method:: SSLSocket.compression() + +- Perform a TLS/SSL handshake. If this is used with a non-blocking socket, it +- may raise :exc:`SSLError` with an ``arg[0]`` of :const:`SSL_ERROR_WANT_READ` +- or :const:`SSL_ERROR_WANT_WRITE`, in which case it must be called again until +- it completes successfully. For example, to simulate the behavior of a +- blocking socket, one might write:: ++ Return the compression algorithm being used as a string, or ``None`` ++ if the connection isn't compressed. + +- while True: +- try: +- s.do_handshake() +- break +- except ssl.SSLError as err: +- if err.args[0] == ssl.SSL_ERROR_WANT_READ: +- select.select([s], [], []) +- elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE: +- select.select([], [s], []) +- else: +- raise ++ If the higher-level protocol supports its own compression mechanism, ++ you can use :data:`OP_NO_COMPRESSION` to disable SSL-level compression. ++ ++ .. versionadded:: 2.7.9 ++ ++.. method:: SSLSocket.get_channel_binding(cb_type="tls-unique") ++ ++ Get channel binding data for current connection, as a bytes object. Returns ++ ``None`` if not connected or the handshake has not been completed. ++ ++ The *cb_type* parameter allow selection of the desired channel binding ++ type. Valid channel binding types are listed in the ++ :data:`CHANNEL_BINDING_TYPES` list. Currently only the 'tls-unique' channel ++ binding, defined by :rfc:`5929`, is supported. :exc:`ValueError` will be ++ raised if an unsupported channel binding type is requested. ++ ++ .. versionadded:: 2.7.9 ++ ++.. method:: SSLSocket.selected_npn_protocol() ++ ++ Returns the higher-level protocol that was selected during the TLS/SSL ++ handshake. If :meth:`SSLContext.set_npn_protocols` was not called, or ++ if the other party does not support NPN, or if the handshake has not yet ++ happened, this will return ``None``. ++ ++ .. versionadded:: 2.7.9 + + .. method:: SSLSocket.unwrap() + + Performs the SSL shutdown handshake, which removes the TLS layer from the + underlying socket, and returns the underlying socket object. This can be + used to go from encrypted operation over a connection to unencrypted. The +- socket instance returned should always be used for further communication with +- the other side of the connection, rather than the original socket instance +- (which may not function properly after the unwrap). ++ returned socket should always be used for further communication with the ++ other side of the connection, rather than the original socket. ++ ++.. method:: SSLSocket.version() ++ ++ Return the actual SSL protocol version negotiated by the connection ++ as a string, or ``None`` is no secure connection is established. ++ As of this writing, possible return values include ``"SSLv2"``, ++ ``"SSLv3"``, ``"TLSv1"``, ``"TLSv1.1"`` and ``"TLSv1.2"``. ++ Recent OpenSSL versions may define more return values. ++ ++ .. versionadded:: 2.7.9 ++ ++.. attribute:: SSLSocket.context ++ ++ The :class:`SSLContext` object this SSL socket is tied to. If the SSL ++ socket was created using the top-level :func:`wrap_socket` function ++ (rather than :meth:`SSLContext.wrap_socket`), this is a custom context ++ object created for this SSL socket. ++ ++ .. versionadded:: 2.7.9 ++ ++ ++SSL Contexts ++------------ ++ ++.. versionadded:: 2.7.9 ++ ++An SSL context holds various data longer-lived than single SSL connections, ++such as SSL configuration options, certificate(s) and private key(s). ++It also manages a cache of SSL sessions for server-side sockets, in order ++to speed up repeated connections from the same clients. ++ ++.. class:: SSLContext(protocol) ++ ++ Create a new SSL context. You must pass *protocol* which must be one ++ of the ``PROTOCOL_*`` constants defined in this module. ++ :data:`PROTOCOL_SSLv23` is currently recommended for maximum ++ interoperability. ++ ++ .. seealso:: ++ :func:`create_default_context` lets the :mod:`ssl` module choose ++ security settings for a given purpose. ++ ++ ++:class:`SSLContext` objects have the following methods and attributes: ++ ++.. method:: SSLContext.cert_store_stats() ++ ++ Get statistics about quantities of loaded X.509 certificates, count of ++ X.509 certificates flagged as CA certificates and certificate revocation ++ lists as dictionary. ++ ++ Example for a context with one CA cert and one other cert:: ++ ++ >>> context.cert_store_stats() ++ {'crl': 0, 'x509_ca': 1, 'x509': 2} ++ ++ ++.. method:: SSLContext.load_cert_chain(certfile, keyfile=None, password=None) ++ ++ Load a private key and the corresponding certificate. The *certfile* ++ string must be the path to a single file in PEM format containing the ++ certificate as well as any number of CA certificates needed to establish ++ the certificate's authenticity. The *keyfile* string, if present, must ++ point to a file containing the private key in. Otherwise the private ++ key will be taken from *certfile* as well. See the discussion of ++ :ref:`ssl-certificates` for more information on how the certificate ++ is stored in the *certfile*. ++ ++ The *password* argument may be a function to call to get the password for ++ decrypting the private key. It will only be called if the private key is ++ encrypted and a password is necessary. It will be called with no arguments, ++ and it should return a string, bytes, or bytearray. If the return value is ++ a string it will be encoded as UTF-8 before using it to decrypt the key. ++ Alternatively a string, bytes, or bytearray value may be supplied directly ++ as the *password* argument. It will be ignored if the private key is not ++ encrypted and no password is needed. ++ ++ If the *password* argument is not specified and a password is required, ++ OpenSSL's built-in password prompting mechanism will be used to ++ interactively prompt the user for a password. ++ ++ An :class:`SSLError` is raised if the private key doesn't ++ match with the certificate. ++ ++.. method:: SSLContext.load_default_certs(purpose=Purpose.SERVER_AUTH) ++ ++ Load a set of default "certification authority" (CA) certificates from ++ default locations. On Windows it loads CA certs from the ``CA`` and ++ ``ROOT`` system stores. On other systems it calls ++ :meth:`SSLContext.set_default_verify_paths`. In the future the method may ++ load CA certificates from other locations, too. ++ ++ The *purpose* flag specifies what kind of CA certificates are loaded. The ++ default settings :data:`Purpose.SERVER_AUTH` loads certificates, that are ++ flagged and trusted for TLS web server authentication (client side ++ sockets). :data:`Purpose.CLIENT_AUTH` loads CA certificates for client ++ certificate verification on the server side. ++ ++.. method:: SSLContext.load_verify_locations(cafile=None, capath=None, cadata=None) ++ ++ Load a set of "certification authority" (CA) certificates used to validate ++ other peers' certificates when :data:`verify_mode` is other than ++ :data:`CERT_NONE`. At least one of *cafile* or *capath* must be specified. ++ ++ This method can also load certification revocation lists (CRLs) in PEM or ++ DER format. In order to make use of CRLs, :attr:`SSLContext.verify_flags` ++ must be configured properly. ++ ++ The *cafile* string, if present, is the path to a file of concatenated ++ CA certificates in PEM format. See the discussion of ++ :ref:`ssl-certificates` for more information about how to arrange the ++ certificates in this file. ++ ++ The *capath* string, if present, is ++ the path to a directory containing several CA certificates in PEM format, ++ following an `OpenSSL specific layout ++ `_. ++ ++ The *cadata* object, if present, is either an ASCII string of one or more ++ PEM-encoded certificates or a bytes-like object of DER-encoded ++ certificates. Like with *capath* extra lines around PEM-encoded ++ certificates are ignored but at least one certificate must be present. ++ ++.. method:: SSLContext.get_ca_certs(binary_form=False) ++ ++ Get a list of loaded "certification authority" (CA) certificates. If the ++ ``binary_form`` parameter is :const:`False` each list ++ entry is a dict like the output of :meth:`SSLSocket.getpeercert`. Otherwise ++ the method returns a list of DER-encoded certificates. The returned list ++ does not contain certificates from *capath* unless a certificate was ++ requested and loaded by a SSL connection. ++ ++.. method:: SSLContext.set_default_verify_paths() ++ ++ Load a set of default "certification authority" (CA) certificates from ++ a filesystem path defined when building the OpenSSL library. Unfortunately, ++ there's no easy way to know whether this method succeeds: no error is ++ returned if no certificates are to be found. When the OpenSSL library is ++ provided as part of the operating system, though, it is likely to be ++ configured properly. ++ ++.. method:: SSLContext.set_ciphers(ciphers) ++ ++ Set the available ciphers for sockets created with this context. ++ It should be a string in the `OpenSSL cipher list format ++ `_. ++ If no cipher can be selected (because compile-time options or other ++ configuration forbids use of all the specified ciphers), an ++ :class:`SSLError` will be raised. ++ ++ .. note:: ++ when connected, the :meth:`SSLSocket.cipher` method of SSL sockets will ++ give the currently selected cipher. ++ ++.. method:: SSLContext.set_npn_protocols(protocols) ++ ++ Specify which protocols the socket should advertise during the SSL/TLS ++ handshake. It should be a list of strings, like ``['http/1.1', 'spdy/2']``, ++ ordered by preference. The selection of a protocol will happen during the ++ handshake, and will play out according to the `NPN draft specification ++ `_. After a ++ successful handshake, the :meth:`SSLSocket.selected_npn_protocol` method will ++ return the agreed-upon protocol. ++ ++ This method will raise :exc:`NotImplementedError` if :data:`HAS_NPN` is ++ False. ++ ++.. method:: SSLContext.set_servername_callback(server_name_callback) ++ ++ Register a callback function that will be called after the TLS Client Hello ++ handshake message has been received by the SSL/TLS server when the TLS client ++ specifies a server name indication. The server name indication mechanism ++ is specified in :rfc:`6066` section 3 - Server Name Indication. ++ ++ Only one callback can be set per ``SSLContext``. If *server_name_callback* ++ is ``None`` then the callback is disabled. Calling this function a ++ subsequent time will disable the previously registered callback. ++ ++ The callback function, *server_name_callback*, will be called with three ++ arguments; the first being the :class:`ssl.SSLSocket`, the second is a string ++ that represents the server name that the client is intending to communicate ++ (or :const:`None` if the TLS Client Hello does not contain a server name) ++ and the third argument is the original :class:`SSLContext`. The server name ++ argument is the IDNA decoded server name. ++ ++ A typical use of this callback is to change the :class:`ssl.SSLSocket`'s ++ :attr:`SSLSocket.context` attribute to a new object of type ++ :class:`SSLContext` representing a certificate chain that matches the server ++ name. ++ ++ Due to the early negotiation phase of the TLS connection, only limited ++ methods and attributes are usable like ++ :meth:`SSLSocket.selected_npn_protocol` and :attr:`SSLSocket.context`. ++ :meth:`SSLSocket.getpeercert`, :meth:`SSLSocket.getpeercert`, ++ :meth:`SSLSocket.cipher` and :meth:`SSLSocket.compress` methods require that ++ the TLS connection has progressed beyond the TLS Client Hello and therefore ++ will not contain return meaningful values nor can they be called safely. ++ ++ The *server_name_callback* function must return ``None`` to allow the ++ TLS negotiation to continue. If a TLS failure is required, a constant ++ :const:`ALERT_DESCRIPTION_* ` can be ++ returned. Other return values will result in a TLS fatal error with ++ :const:`ALERT_DESCRIPTION_INTERNAL_ERROR`. ++ ++ If there is an IDNA decoding error on the server name, the TLS connection ++ will terminate with an :const:`ALERT_DESCRIPTION_INTERNAL_ERROR` fatal TLS ++ alert message to the client. ++ ++ If an exception is raised from the *server_name_callback* function the TLS ++ connection will terminate with a fatal TLS alert message ++ :const:`ALERT_DESCRIPTION_HANDSHAKE_FAILURE`. ++ ++ This method will raise :exc:`NotImplementedError` if the OpenSSL library ++ had OPENSSL_NO_TLSEXT defined when it was built. ++ ++.. method:: SSLContext.load_dh_params(dhfile) ++ ++ Load the key generation parameters for Diffie-Helman (DH) key exchange. ++ Using DH key exchange improves forward secrecy at the expense of ++ computational resources (both on the server and on the client). ++ The *dhfile* parameter should be the path to a file containing DH ++ parameters in PEM format. ++ ++ This setting doesn't apply to client sockets. You can also use the ++ :data:`OP_SINGLE_DH_USE` option to further improve security. ++ ++.. method:: SSLContext.set_ecdh_curve(curve_name) ++ ++ Set the curve name for Elliptic Curve-based Diffie-Hellman (ECDH) key ++ exchange. ECDH is significantly faster than regular DH while arguably ++ as secure. The *curve_name* parameter should be a string describing ++ a well-known elliptic curve, for example ``prime256v1`` for a widely ++ supported curve. ++ ++ This setting doesn't apply to client sockets. You can also use the ++ :data:`OP_SINGLE_ECDH_USE` option to further improve security. ++ ++ This method is not available if :data:`HAS_ECDH` is False. ++ ++ .. seealso:: ++ `SSL/TLS & Perfect Forward Secrecy `_ ++ Vincent Bernat. ++ ++.. method:: SSLContext.wrap_socket(sock, server_side=False, \ ++ do_handshake_on_connect=True, suppress_ragged_eofs=True, \ ++ server_hostname=None) ++ ++ Wrap an existing Python socket *sock* and return an :class:`SSLSocket` ++ object. *sock* must be a :data:`~socket.SOCK_STREAM` socket; other socket ++ types are unsupported. ++ ++ The returned SSL socket is tied to the context, its settings and ++ certificates. The parameters *server_side*, *do_handshake_on_connect* ++ and *suppress_ragged_eofs* have the same meaning as in the top-level ++ :func:`wrap_socket` function. ++ ++ On client connections, the optional parameter *server_hostname* specifies ++ the hostname of the service which we are connecting to. This allows a ++ single server to host multiple SSL-based services with distinct certificates, ++ quite similarly to HTTP virtual hosts. Specifying *server_hostname* ++ will raise a :exc:`ValueError` if the OpenSSL library doesn't have support ++ for it (that is, if :data:`HAS_SNI` is :const:`False`). Specifying ++ *server_hostname* will also raise a :exc:`ValueError` if *server_side* ++ is true. ++ ++.. method:: SSLContext.session_stats() ++ ++ Get statistics about the SSL sessions created or managed by this context. ++ A dictionary is returned which maps the names of each `piece of information ++ `_ to their ++ numeric values. For example, here is the total number of hits and misses ++ in the session cache since the context was created:: ++ ++ >>> stats = context.session_stats() ++ >>> stats['hits'], stats['misses'] ++ (0, 0) ++ ++.. method:: SSLContext.get_ca_certs(binary_form=False) ++ ++ Returns a list of dicts with information of loaded CA certs. If the ++ optional argument is true, returns a DER-encoded copy of the CA ++ certificate. ++ ++ .. note:: ++ Certificates in a capath directory aren't loaded unless they have ++ been used at least once. ++ ++.. attribute:: SSLContext.check_hostname ++ ++ Wether to match the peer cert's hostname with :func:`match_hostname` in ++ :meth:`SSLSocket.do_handshake`. The context's ++ :attr:`~SSLContext.verify_mode` must be set to :data:`CERT_OPTIONAL` or ++ :data:`CERT_REQUIRED`, and you must pass *server_hostname* to ++ :meth:`~SSLContext.wrap_socket` in order to match the hostname. ++ ++ Example:: ++ ++ import socket, ssl ++ ++ context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ context.verify_mode = ssl.CERT_REQUIRED ++ context.check_hostname = True ++ context.load_default_certs() ++ ++ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) ++ ssl_sock = context.wrap_socket(s, server_hostname='www.verisign.com') ++ ssl_sock.connect(('www.verisign.com', 443)) ++ ++ .. note:: ++ ++ This features requires OpenSSL 0.9.8f or newer. ++ ++.. attribute:: SSLContext.options ++ ++ An integer representing the set of SSL options enabled on this context. ++ The default value is :data:`OP_ALL`, but you can specify other options ++ such as :data:`OP_NO_SSLv2` by ORing them together. ++ ++ .. note:: ++ With versions of OpenSSL older than 0.9.8m, it is only possible ++ to set options, not to clear them. Attempting to clear an option ++ (by resetting the corresponding bits) will raise a ``ValueError``. ++ ++.. attribute:: SSLContext.protocol ++ ++ The protocol version chosen when constructing the context. This attribute ++ is read-only. ++ ++.. attribute:: SSLContext.verify_flags ++ ++ The flags for certificate verification operations. You can set flags like ++ :data:`VERIFY_CRL_CHECK_LEAF` by ORing them together. By default OpenSSL ++ does neither require nor verify certificate revocation lists (CRLs). ++ Available only with openssl version 0.9.8+. ++ ++.. attribute:: SSLContext.verify_mode ++ ++ Whether to try to verify other peers' certificates and how to behave ++ if verification fails. This attribute must be one of ++ :data:`CERT_NONE`, :data:`CERT_OPTIONAL` or :data:`CERT_REQUIRED`. ++ + + .. index:: single: certificates + +@@ -460,6 +1264,9 @@ + ... (certificate in base64 PEM encoding) ... + -----END CERTIFICATE----- + ++Certificate chains ++^^^^^^^^^^^^^^^^^^ ++ + The Python files which contain certificates can contain a sequence of + certificates, sometimes called a *certificate chain*. This chain should start + with the specific certificate for the principal who "is" the client or server, +@@ -483,24 +1290,35 @@ + ... (the root certificate for the CA's issuer)... + -----END CERTIFICATE----- + ++CA certificates ++^^^^^^^^^^^^^^^ ++ + If you are going to require validation of the other side of the connection's + certificate, you need to provide a "CA certs" file, filled with the certificate + chains for each issuer you are willing to trust. Again, this file just contains + these chains concatenated together. For validation, Python will use the first +-chain it finds in the file which matches. ++chain it finds in the file which matches. The platform's certificates file can ++be used by calling :meth:`SSLContext.load_default_certs`, this is done ++automatically with :func:`.create_default_context`. + +-Some "standard" root certificates are available from various certification +-authorities: `Thawte `_, `Verisign +-`_, `Positive SSL +-`_ +-(used by python.org), `Equifax and GeoTrust +-`_. ++Combined key and certificate ++^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +-In general, if you are using SSL3 or TLS1, you don't need to put the full chain +-in your "CA certs" file; you only need the root certificates, and the remote +-peer is supposed to furnish the other certificates necessary to chain from its +-certificate to a root certificate. See :rfc:`4158` for more discussion of the +-way in which certification chains can be built. ++Often the private key is stored in the same file as the certificate; in this ++case, only the ``certfile`` parameter to :meth:`SSLContext.load_cert_chain` ++and :func:`wrap_socket` needs to be passed. If the private key is stored ++with the certificate, it should come before the first certificate in ++the certificate chain:: ++ ++ -----BEGIN RSA PRIVATE KEY----- ++ ... (private key in base64 encoding) ... ++ -----END RSA PRIVATE KEY----- ++ -----BEGIN CERTIFICATE----- ++ ... (certificate in base64 PEM encoding) ... ++ -----END CERTIFICATE----- ++ ++Self-signed certificates ++^^^^^^^^^^^^^^^^^^^^^^^^ + + If you are going to create a server that provides SSL-encrypted connection + services, you will need to acquire a certificate for that service. There are +@@ -555,87 +1373,138 @@ + Client-side operation + ^^^^^^^^^^^^^^^^^^^^^ + +-This example connects to an SSL server, prints the server's address and +-certificate, sends some bytes, and reads part of the response:: ++This example creates a SSL context with the recommended security settings ++for client sockets, including automatic certificate verification:: + +- import socket, ssl, pprint ++ >>> context = ssl.create_default_context() + +- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) ++If you prefer to tune security settings yourself, you might create ++a context from scratch (but beware that you might not get the settings ++right):: + +- # require a certificate from the server +- ssl_sock = ssl.wrap_socket(s, +- ca_certs="/etc/ca_certs_file", +- cert_reqs=ssl.CERT_REQUIRED) ++ >>> context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ >>> context.verify_mode = ssl.CERT_REQUIRED ++ >>> context.check_hostname = True ++ >>> context.load_verify_locations("/etc/ssl/certs/ca-bundle.crt") + +- ssl_sock.connect(('www.verisign.com', 443)) ++(this snippet assumes your operating system places a bundle of all CA ++certificates in ``/etc/ssl/certs/ca-bundle.crt``; if not, you'll get an ++error and have to adjust the location) + +- print repr(ssl_sock.getpeername()) +- print ssl_sock.cipher() +- print pprint.pformat(ssl_sock.getpeercert()) ++When you use the context to connect to a server, :const:`CERT_REQUIRED` ++validates the server certificate: it ensures that the server certificate ++was signed with one of the CA certificates, and checks the signature for ++correctness:: + +- # Set a simple HTTP request -- use httplib in actual code. +- ssl_sock.write("""GET / HTTP/1.0\r +- Host: www.verisign.com\r\n\r\n""") ++ >>> conn = context.wrap_socket(socket.socket(socket.AF_INET), ++ ... server_hostname="www.python.org") ++ >>> conn.connect(("www.python.org", 443)) + +- # Read a chunk of data. Will not necessarily +- # read all the data returned by the server. +- data = ssl_sock.read() ++You may then fetch the certificate:: + +- # note that closing the SSLSocket will also close the underlying socket +- ssl_sock.close() ++ >>> cert = conn.getpeercert() + +-As of September 6, 2007, the certificate printed by this program looked like +-this:: ++Visual inspection shows that the certificate does identify the desired service ++(that is, the HTTPS host ``www.python.org``):: + +- {'notAfter': 'May 8 23:59:59 2009 GMT', +- 'subject': ((('serialNumber', u'2497886'),), +- (('1.3.6.1.4.1.311.60.2.1.3', u'US'),), +- (('1.3.6.1.4.1.311.60.2.1.2', u'Delaware'),), +- (('countryName', u'US'),), +- (('postalCode', u'94043'),), +- (('stateOrProvinceName', u'California'),), +- (('localityName', u'Mountain View'),), +- (('streetAddress', u'487 East Middlefield Road'),), +- (('organizationName', u'VeriSign, Inc.'),), +- (('organizationalUnitName', +- u'Production Security Services'),), +- (('organizationalUnitName', +- u'Terms of use at www.verisign.com/rpa (c)06'),), +- (('commonName', u'www.verisign.com'),))} ++ >>> pprint.pprint(cert) ++ {'OCSP': ('http://ocsp.digicert.com',), ++ 'caIssuers': ('http://cacerts.digicert.com/DigiCertSHA2ExtendedValidationServerCA.crt',), ++ 'crlDistributionPoints': ('http://crl3.digicert.com/sha2-ev-server-g1.crl', ++ 'http://crl4.digicert.com/sha2-ev-server-g1.crl'), ++ 'issuer': ((('countryName', 'US'),), ++ (('organizationName', 'DigiCert Inc'),), ++ (('organizationalUnitName', 'www.digicert.com'),), ++ (('commonName', 'DigiCert SHA2 Extended Validation Server CA'),)), ++ 'notAfter': 'Sep 9 12:00:00 2016 GMT', ++ 'notBefore': 'Sep 5 00:00:00 2014 GMT', ++ 'serialNumber': '01BB6F00122B177F36CAB49CEA8B6B26', ++ 'subject': ((('businessCategory', 'Private Organization'),), ++ (('1.3.6.1.4.1.311.60.2.1.3', 'US'),), ++ (('1.3.6.1.4.1.311.60.2.1.2', 'Delaware'),), ++ (('serialNumber', '3359300'),), ++ (('streetAddress', '16 Allen Rd'),), ++ (('postalCode', '03894-4801'),), ++ (('countryName', 'US'),), ++ (('stateOrProvinceName', 'NH'),), ++ (('localityName', 'Wolfeboro,'),), ++ (('organizationName', 'Python Software Foundation'),), ++ (('commonName', 'www.python.org'),)), ++ 'subjectAltName': (('DNS', 'www.python.org'), ++ ('DNS', 'python.org'), ++ ('DNS', 'pypi.python.org'), ++ ('DNS', 'docs.python.org'), ++ ('DNS', 'testpypi.python.org'), ++ ('DNS', 'bugs.python.org'), ++ ('DNS', 'wiki.python.org'), ++ ('DNS', 'hg.python.org'), ++ ('DNS', 'mail.python.org'), ++ ('DNS', 'packaging.python.org'), ++ ('DNS', 'pythonhosted.org'), ++ ('DNS', 'www.pythonhosted.org'), ++ ('DNS', 'test.pythonhosted.org'), ++ ('DNS', 'us.pycon.org'), ++ ('DNS', 'id.python.org')), ++ 'version': 3} + +-which is a fairly poorly-formed ``subject`` field. ++Now the SSL channel is established and the certificate verified, you can ++proceed to talk with the server:: ++ ++ >>> conn.sendall(b"HEAD / HTTP/1.0\r\nHost: linuxfr.org\r\n\r\n") ++ >>> pprint.pprint(conn.recv(1024).split(b"\r\n")) ++ [b'HTTP/1.1 200 OK', ++ b'Date: Sat, 18 Oct 2014 18:27:20 GMT', ++ b'Server: nginx', ++ b'Content-Type: text/html; charset=utf-8', ++ b'X-Frame-Options: SAMEORIGIN', ++ b'Content-Length: 45679', ++ b'Accept-Ranges: bytes', ++ b'Via: 1.1 varnish', ++ b'Age: 2188', ++ b'X-Served-By: cache-lcy1134-LCY', ++ b'X-Cache: HIT', ++ b'X-Cache-Hits: 11', ++ b'Vary: Cookie', ++ b'Strict-Transport-Security: max-age=63072000; includeSubDomains', ++ b'Connection: close', ++ b'', ++ b''] ++ ++See the discussion of :ref:`ssl-security` below. ++ + + Server-side operation + ^^^^^^^^^^^^^^^^^^^^^ + +-For server operation, typically you'd need to have a server certificate, and +-private key, each in a file. You'd open a socket, bind it to a port, call +-:meth:`listen` on it, then start waiting for clients to connect:: ++For server operation, typically you'll need to have a server certificate, and ++private key, each in a file. You'll first create a context holding the key ++and the certificate, so that clients can check your authenticity. Then ++you'll open a socket, bind it to a port, call :meth:`listen` on it, and start ++waiting for clients to connect:: + + import socket, ssl + ++ context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) ++ context.load_cert_chain(certfile="mycertfile", keyfile="mykeyfile") ++ + bindsocket = socket.socket() + bindsocket.bind(('myaddr.mydomain.com', 10023)) + bindsocket.listen(5) + +-When one did, you'd call :meth:`accept` on the socket to get the new socket from +-the other end, and use :func:`wrap_socket` to create a server-side SSL context +-for it:: ++When a client connects, you'll call :meth:`accept` on the socket to get the ++new socket from the other end, and use the context's :meth:`SSLContext.wrap_socket` ++method to create a server-side SSL socket for the connection:: + + while True: + newsocket, fromaddr = bindsocket.accept() +- connstream = ssl.wrap_socket(newsocket, +- server_side=True, +- certfile="mycertfile", +- keyfile="mykeyfile", +- ssl_version=ssl.PROTOCOL_TLSv1) ++ connstream = context.wrap_socket(newsocket, server_side=True) + try: + deal_with_client(connstream) + finally: + connstream.shutdown(socket.SHUT_RDWR) + connstream.close() + +-Then you'd read data from the ``connstream`` and do something with it till you ++Then you'll read data from the ``connstream`` and do something with it till you + are finished with the client (or the client is finished with you):: + + def deal_with_client(connstream): +@@ -649,7 +1518,140 @@ + data = connstream.read() + # finished with client + +-And go back to listening for new client connections. ++And go back to listening for new client connections (of course, a real server ++would probably handle each client connection in a separate thread, or put ++the sockets in non-blocking mode and use an event loop). ++ ++ ++.. _ssl-nonblocking: ++ ++Notes on non-blocking sockets ++----------------------------- ++ ++When working with non-blocking sockets, there are several things you need ++to be aware of: ++ ++- Calling :func:`~select.select` tells you that the OS-level socket can be ++ read from (or written to), but it does not imply that there is sufficient ++ data at the upper SSL layer. For example, only part of an SSL frame might ++ have arrived. Therefore, you must be ready to handle :meth:`SSLSocket.recv` ++ and :meth:`SSLSocket.send` failures, and retry after another call to ++ :func:`~select.select`. ++ ++- Conversely, since the SSL layer has its own framing, a SSL socket may ++ still have data available for reading without :func:`~select.select` ++ being aware of it. Therefore, you should first call ++ :meth:`SSLSocket.recv` to drain any potentially available data, and then ++ only block on a :func:`~select.select` call if still necessary. ++ ++ (of course, similar provisions apply when using other primitives such as ++ :func:`~select.poll`, or those in the :mod:`selectors` module) ++ ++- The SSL handshake itself will be non-blocking: the ++ :meth:`SSLSocket.do_handshake` method has to be retried until it returns ++ successfully. Here is a synopsis using :func:`~select.select` to wait for ++ the socket's readiness:: ++ ++ while True: ++ try: ++ sock.do_handshake() ++ break ++ except ssl.SSLWantReadError: ++ select.select([sock], [], []) ++ except ssl.SSLWantWriteError: ++ select.select([], [sock], []) ++ ++ ++.. _ssl-security: ++ ++Security considerations ++----------------------- ++ ++Best defaults ++^^^^^^^^^^^^^ ++ ++For **client use**, if you don't have any special requirements for your ++security policy, it is highly recommended that you use the ++:func:`create_default_context` function to create your SSL context. ++It will load the system's trusted CA certificates, enable certificate ++validation and hostname checking, and try to choose reasonably secure ++protocol and cipher settings. ++ ++If a client certificate is needed for the connection, it can be added with ++:meth:`SSLContext.load_cert_chain`. ++ ++By contrast, if you create the SSL context by calling the :class:`SSLContext` ++constructor yourself, it will not have certificate validation nor hostname ++checking enabled by default. If you do so, please read the paragraphs below ++to achieve a good security level. ++ ++Manual settings ++^^^^^^^^^^^^^^^ ++ ++Verifying certificates ++'''''''''''''''''''''' ++ ++When calling the :class:`SSLContext` constructor directly, ++:const:`CERT_NONE` is the default. Since it does not authenticate the other ++peer, it can be insecure, especially in client mode where most of time you ++would like to ensure the authenticity of the server you're talking to. ++Therefore, when in client mode, it is highly recommended to use ++:const:`CERT_REQUIRED`. However, it is in itself not sufficient; you also ++have to check that the server certificate, which can be obtained by calling ++:meth:`SSLSocket.getpeercert`, matches the desired service. For many ++protocols and applications, the service can be identified by the hostname; ++in this case, the :func:`match_hostname` function can be used. This common ++check is automatically performed when :attr:`SSLContext.check_hostname` is ++enabled. ++ ++In server mode, if you want to authenticate your clients using the SSL layer ++(rather than using a higher-level authentication mechanism), you'll also have ++to specify :const:`CERT_REQUIRED` and similarly check the client certificate. ++ ++ .. note:: ++ ++ In client mode, :const:`CERT_OPTIONAL` and :const:`CERT_REQUIRED` are ++ equivalent unless anonymous ciphers are enabled (they are disabled ++ by default). ++ ++Protocol versions ++''''''''''''''''' ++ ++SSL versions 2 and 3 are considered insecure and are therefore dangerous to ++use. If you want maximum compatibility between clients and servers, it is ++recommended to use :const:`PROTOCOL_SSLv23` as the protocol version and then ++disable SSLv2 and SSLv3 explicitly using the :data:`SSLContext.options` ++attribute:: ++ ++ context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ context.options |= ssl.OP_NO_SSLv2 ++ context.options |= ssl.OP_NO_SSLv3 ++ ++The SSL context created above will only allow TLSv1 and later (if ++supported by your system) connections. ++ ++Cipher selection ++'''''''''''''''' ++ ++If you have advanced security requirements, fine-tuning of the ciphers ++enabled when negotiating a SSL session is possible through the ++:meth:`SSLContext.set_ciphers` method. Starting from Python 2.7.9, the ++ssl module disables certain weak ciphers by default, but you may want ++to further restrict the cipher choice. Be sure to read OpenSSL's documentation ++about the `cipher list format `_. ++If you want to check which ciphers are enabled by a given cipher list, use the ++``openssl ciphers`` command on your system. ++ ++Multi-processing ++^^^^^^^^^^^^^^^^ ++ ++If using this module as part of a multi-processed application (using, ++for example the :mod:`multiprocessing` or :mod:`concurrent.futures` modules), ++be aware that OpenSSL's internal random number generator does not properly ++handle forked processes. Applications must change the PRNG state of the ++parent process if they use any SSL feature with :func:`os.fork`. Any ++successful call of :func:`~ssl.RAND_add`, :func:`~ssl.RAND_bytes` or ++:func:`~ssl.RAND_pseudo_bytes` is sufficient. + + + .. seealso:: +@@ -668,3 +1670,15 @@ + + `RFC 3280: Internet X.509 Public Key Infrastructure Certificate and CRL Profile `_ + Housley et. al. ++ ++ `RFC 4366: Transport Layer Security (TLS) Extensions `_ ++ Blake-Wilson et. al. ++ ++ `RFC 5246: The Transport Layer Security (TLS) Protocol Version 1.2 `_ ++ T. Dierks et. al. ++ ++ `RFC 6066: Transport Layer Security (TLS) Extensions `_ ++ D. Eastlake ++ ++ `IANA TLS: Transport Layer Security (TLS) Parameters `_ ++ IANA +diff -r ee879c0ffa11 Doc/library/stdtypes.rst +--- a/Doc/library/stdtypes.rst ++++ b/Doc/library/stdtypes.rst +@@ -433,8 +433,7 @@ + operations and higher than the comparisons; the unary operation ``~`` has the + same priority as the other unary numeric operations (``+`` and ``-``). + +-This table lists the bitwise operations sorted in ascending priority +-(operations in the same box have the same priority): ++This table lists the bitwise operations sorted in ascending priority: + + +------------+--------------------------------+----------+ + | Operation | Result | Notes | +@@ -652,7 +651,7 @@ + specific types are not important beyond their implementation of the iterator + protocol. + +-The intention of the protocol is that once an iterator's :meth:`next` method ++The intention of the protocol is that once an iterator's :meth:`~iterator.next` method + raises :exc:`StopIteration`, it will continue to do so on subsequent calls. + Implementations that do not obey this property are deemed broken. (This + constraint was added in Python 2.3; in Python 2.2, various iterators are broken +@@ -667,9 +666,9 @@ + Python's :term:`generator`\s provide a convenient way to implement the iterator + protocol. If a container object's :meth:`__iter__` method is implemented as a + generator, it will automatically return an iterator object (technically, a +-generator object) supplying the :meth:`__iter__` and :meth:`next` methods. More +-information about generators can be found in :ref:`the documentation for the +-yield expression `. ++generator object) supplying the :meth:`~iterator.__iter__` and ++:meth:`~iterator.next` methods. More information about generators can be found ++in :ref:`the documentation for the yield expression `. + + + .. _typesseq: +@@ -722,9 +721,8 @@ + ``*`` operations have the same priority as the corresponding numeric operations. + [3]_ Additional methods are provided for :ref:`typesseq-mutable`. + +-This table lists the sequence operations sorted in ascending priority +-(operations in the same box have the same priority). In the table, *s* and *t* +-are sequences of the same type; *n*, *i* and *j* are integers: ++This table lists the sequence operations sorted in ascending priority. ++In the table, *s* and *t* are sequences of the same type; *n*, *i* and *j* are integers: + + +------------------+--------------------------------+----------+ + | Operation | Result | Notes | +diff -r ee879c0ffa11 Doc/library/symtable.rst +--- a/Doc/library/symtable.rst ++++ b/Doc/library/symtable.rst +@@ -4,6 +4,10 @@ + .. module:: symtable + :synopsis: Interface to the compiler's internal symbol tables. + ++**Source code:** :source:`Lib/symtable.py` ++ ++-------------- ++ + .. moduleauthor:: Jeremy Hylton + .. sectionauthor:: Benjamin Peterson + +diff -r ee879c0ffa11 Doc/library/sys.rst +--- a/Doc/library/sys.rst ++++ b/Doc/library/sys.rst +@@ -1014,7 +1014,7 @@ + .. versionadded:: 2.5 + + .. note:: +- Python is now `developed `_ using ++ Python is now `developed `_ using + Mercurial. In recent Python 2.7 bugfix releases, :data:`subversion` + therefore contains placeholder information. It is removed in Python + 3.3. +diff -r ee879c0ffa11 Doc/library/sysconfig.rst +--- a/Doc/library/sysconfig.rst ++++ b/Doc/library/sysconfig.rst +@@ -221,3 +221,7 @@ + .. function:: get_config_h_filename() + + Return the path of :file:`pyconfig.h`. ++ ++.. function:: get_makefile_filename() ++ ++ Return the path of :file:`Makefile`. +diff -r ee879c0ffa11 Doc/library/tarfile.rst +--- a/Doc/library/tarfile.rst ++++ b/Doc/library/tarfile.rst +@@ -21,7 +21,8 @@ + + Some facts and figures: + +-* reads and writes :mod:`gzip` and :mod:`bz2` compressed archives. ++* reads and writes :mod:`gzip` and :mod:`bz2` compressed archives ++ if the respective modules are available. + + * read/write support for the POSIX.1-1988 (ustar) format. + +@@ -179,6 +180,14 @@ + :attr:`TarFile.errorlevel`\ ``== 2``. + + ++The following constants are available at the module level: ++ ++.. data:: ENCODING ++ ++ The default character encoding: ``'utf-8'`` on Windows, the value returned by ++ :func:`sys.getfilesystemencoding` otherwise. ++ ++ + .. exception:: HeaderError + + Is raised by :meth:`TarInfo.frombuf` if the buffer it gets is invalid. +@@ -211,20 +220,15 @@ + The default format for creating archives. This is currently :const:`GNU_FORMAT`. + + +-The following variables are available on module level: +- +- +-.. data:: ENCODING +- +- The default character encoding i.e. the value from either +- :func:`sys.getfilesystemencoding` or :func:`sys.getdefaultencoding`. +- +- + .. seealso:: + + Module :mod:`zipfile` + Documentation of the :mod:`zipfile` standard module. + ++ :ref:`archiving-operations` ++ Documentation of the higher-level archiving facilities provided by the ++ standard :mod:`shutil` module. ++ + `GNU tar manual, Basic Tar Format `_ + Documentation for tar archive files, including GNU tar extensions. + +@@ -247,7 +251,7 @@ + :ref:`tar-examples` section for a use case. + + .. versionadded:: 2.7 +- Added support for the context manager protocol. ++ Added support for the context management protocol. + + .. class:: TarFile(name=None, mode='r', fileobj=None, format=DEFAULT_FORMAT, tarinfo=TarInfo, dereference=False, ignore_zeros=False, encoding=ENCODING, errors=None, pax_headers=None, debug=0, errorlevel=0) + +diff -r ee879c0ffa11 Doc/library/tempfile.rst +--- a/Doc/library/tempfile.rst ++++ b/Doc/library/tempfile.rst +@@ -185,7 +185,7 @@ + >>> os.path.exists(f.name) + False + +-The module uses two global variables that tell it how to construct a ++The module uses a global variable that tell it how to construct a + temporary name. They are initialized at the first call to any of the + functions above. The caller may change them, but this is discouraged; use + the appropriate function arguments, instead. +diff -r ee879c0ffa11 Doc/library/thread.rst +--- a/Doc/library/thread.rst ++++ b/Doc/library/thread.rst +@@ -159,10 +159,6 @@ + * Calling :func:`sys.exit` or raising the :exc:`SystemExit` exception is + equivalent to calling :func:`thread.exit`. + +-* Not all built-in functions that may block waiting for I/O allow other threads +- to run. (The most popular ones (:func:`time.sleep`, :meth:`file.read`, +- :func:`select.select`) work as expected.) +- + * It is not possible to interrupt the :meth:`acquire` method on a lock --- the + :exc:`KeyboardInterrupt` exception will happen after the lock has been acquired. + +diff -r ee879c0ffa11 Doc/library/time.rst +--- a/Doc/library/time.rst ++++ b/Doc/library/time.rst +@@ -248,7 +248,7 @@ + + .. versionchanged:: 2.5 + 0 is now a legal argument for any position in the time tuple; if it is normally +- illegal the value is forced to a correct one.. ++ illegal the value is forced to a correct one. + + The following directives can be embedded in the *format* string. They are shown + without the optional field width and precision specification, and are replaced +diff -r ee879c0ffa11 Doc/library/tkinter.rst +--- a/Doc/library/tkinter.rst ++++ b/Doc/library/tkinter.rst +@@ -26,7 +26,7 @@ + `TKDocs `_ + Extensive tutorial plus friendlier widget pages for some of the widgets. + +- `Tkinter reference: a GUI for Python `_ ++ `Tkinter reference: a GUI for Python `_ + On-line reference material. + + `Tkinter docs from effbot `_ +diff -r ee879c0ffa11 Doc/library/turtle.rst +--- a/Doc/library/turtle.rst ++++ b/Doc/library/turtle.rst +@@ -1859,7 +1859,7 @@ + :param startx: if positive, starting position in pixels from the left + edge of the screen, if negative from the right edge, if None, + center window horizontally +- :param startx: if positive, starting position in pixels from the top ++ :param starty: if positive, starting position in pixels from the top + edge of the screen, if negative from the bottom edge, if None, + center window vertically + +diff -r ee879c0ffa11 Doc/library/unittest.rst +--- a/Doc/library/unittest.rst ++++ b/Doc/library/unittest.rst +@@ -78,7 +78,7 @@ + Module :mod:`doctest` + Another test-support module with a very different flavor. + +- `unittest2: A backport of new unittest features for Python 2.4-2.6 `_ ++ `unittest2: A backport of new unittest features for Python 2.4-2.6 `_ + Many new features were added to unittest in Python 2.7, including test + discovery. unittest2 allows you to use these features with earlier + versions of Python. +@@ -91,7 +91,7 @@ + Third-party unittest frameworks with a lighter-weight syntax for writing + tests. For example, ``assert func(10) == 42``. + +- `The Python Testing Tools Taxonomy `_ ++ `The Python Testing Tools Taxonomy `_ + An extensive list of Python testing tools including functional testing + frameworks and mock object libraries. + +diff -r ee879c0ffa11 Doc/library/urlparse.rst +--- a/Doc/library/urlparse.rst ++++ b/Doc/library/urlparse.rst +@@ -83,8 +83,9 @@ + this argument is the empty string. + + If the *allow_fragments* argument is false, fragment identifiers are not +- allowed, even if the URL's addressing scheme normally does support them. The +- default value for this argument is :const:`True`. ++ recognized and parsed as part of the preceding component, even if the URL's ++ addressing scheme normally does support them. The default value for this ++ argument is :const:`True`. + + The return value is actually an instance of a subclass of :class:`tuple`. This + class has the following additional read-only convenience attributes: +diff -r ee879c0ffa11 Doc/library/xml.dom.minidom.rst +--- a/Doc/library/xml.dom.minidom.rst ++++ b/Doc/library/xml.dom.minidom.rst +@@ -276,4 +276,4 @@ + .. [#] The encoding string included in XML output should conform to the + appropriate standards. For example, "UTF-8" is valid, but "UTF8" is + not. See http://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EncodingDecl +- and http://www.iana.org/assignments/character-sets\ . ++ and http://www.iana.org/assignments/character-sets/character-sets.xhtml. +diff -r ee879c0ffa11 Doc/library/xml.dom.rst +--- a/Doc/library/xml.dom.rst ++++ b/Doc/library/xml.dom.rst +@@ -36,7 +36,7 @@ + .. XXX PyXML is dead... + .. The mapping of the Level 3 specification, currently + only available in draft form, is being developed by the `Python XML Special +- Interest Group `_ as part of the `PyXML ++ Interest Group `_ as part of the `PyXML + package `_. Refer to the documentation bundled + with that package for information on the current state of DOM Level 3 support. + +diff -r ee879c0ffa11 Doc/library/xml.etree.elementtree.rst +--- a/Doc/library/xml.etree.elementtree.rst ++++ b/Doc/library/xml.etree.elementtree.rst +@@ -954,4 +954,4 @@ + .. [#] The encoding string included in XML output should conform to the + appropriate standards. For example, "UTF-8" is valid, but "UTF8" is + not. See http://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EncodingDecl +- and http://www.iana.org/assignments/character-sets. ++ and http://www.iana.org/assignments/character-sets/character-sets.xhtml. +diff -r ee879c0ffa11 Doc/library/xmllib.rst +--- a/Doc/library/xmllib.rst ++++ b/Doc/library/xmllib.rst +@@ -255,11 +255,11 @@ + material on XML, including translations of the specification, are available at + http://www.w3.org/XML/. + +- `Python and XML Processing `_ ++ `Python and XML Processing `_ + The Python XML Topic Guide provides a great deal of information on using XML + from Python and links to other sources of information on XML. + +- `SIG for XML Processing in Python `_ ++ `SIG for XML Processing in Python `_ + The Python XML Special Interest Group is developing substantial support for + processing XML from Python. + +diff -r ee879c0ffa11 Doc/library/xmlrpclib.rst +--- a/Doc/library/xmlrpclib.rst ++++ b/Doc/library/xmlrpclib.rst +@@ -34,6 +34,11 @@ + constructed data. If you need to parse untrusted or unauthenticated data see + :ref:`xml-vulnerabilities`. + ++.. warning:: ++ ++ In the case of https URIs, :mod:`xmlrpclib` does not do any verification of ++ the server's certificate. ++ + + .. class:: ServerProxy(uri[, transport[, encoding[, verbose[, allow_none[, use_datetime]]]]]) + +diff -r ee879c0ffa11 Doc/license.rst +--- a/Doc/license.rst ++++ b/Doc/license.rst +@@ -23,11 +23,11 @@ + form the BeOpen PythonLabs team. In October of the same year, the PythonLabs + team moved to Digital Creations (now Zope Corporation; see + http://www.zope.com/). In 2001, the Python Software Foundation (PSF, see +-http://www.python.org/psf/) was formed, a non-profit organization created ++https://www.python.org/psf/) was formed, a non-profit organization created + specifically to own Python-related Intellectual Property. Zope Corporation is a + sponsoring member of the PSF. + +-All Python releases are Open Source (see http://www.opensource.org/ for the Open ++All Python releases are Open Source (see http://opensource.org/ for the Open + Source Definition). Historically, most, but not all, Python releases have also + been GPL-compatible; the table below summarizes the various releases. + +diff -r ee879c0ffa11 Doc/make.bat +--- a/Doc/make.bat ++++ b/Doc/make.bat +@@ -1,58 +1,124 @@ +-@@echo off ++@echo off + setlocal + +-set SVNROOT=http://svn.python.org/projects +-if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python +-if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe +-if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v ++pushd %~dp0 + ++set this=%~n0 ++ ++if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build ++if "%PYTHON%" EQU "" set PYTHON=py ++ ++if DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles(x86)% ++if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles% ++if "%HTMLHELP%" EQU "" set HTMLHELP=%_PRGMFLS%\HTML Help Workshop\hhc.exe ++ ++if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v ++ ++if "%BUILDDIR%" EQU "" set BUILDDIR=build ++ ++rem Targets that don't require sphinx-build + if "%1" EQU "" goto help +-if "%1" EQU "html" goto build +-if "%1" EQU "htmlhelp" goto build +-if "%1" EQU "latex" goto build +-if "%1" EQU "text" goto build +-if "%1" EQU "suspicious" goto build +-if "%1" EQU "linkcheck" goto build +-if "%1" EQU "changes" goto build +-if "%1" EQU "checkout" goto checkout +-if "%1" EQU "update" goto update ++if "%1" EQU "help" goto help ++if "%1" EQU "check" goto check ++if "%1" EQU "serve" goto serve ++if "%1" == "clean" ( ++ rmdir /q /s %BUILDDIR% ++ goto end ++) ++ ++%SPHINXBUILD% 2> nul ++if errorlevel 9009 ( ++ echo. ++ echo.The 'sphinx-build' command was not found. Make sure you have Sphinx ++ echo.installed, then set the SPHINXBUILD environment variable to point ++ echo.to the full path of the 'sphinx-build' executable. Alternatively you ++ echo.may add the Sphinx directory to PATH. ++ echo. ++ echo.If you don't have Sphinx installed, grab it from ++ echo.http://sphinx-doc.org/ ++ goto end ++) ++ ++rem Targets that do require sphinx-build and have their own label ++if "%1" EQU "htmlview" goto htmlview ++ ++rem Everything else ++goto build + + :help +-set this=%~n0 +-echo HELP ++echo.usage: %this% BUILDER [filename ...] + echo. +-echo %this% checkout +-echo %this% update +-echo %this% html +-echo %this% htmlhelp +-echo %this% latex +-echo %this% text +-echo %this% suspicious +-echo %this% linkcheck +-echo %this% changes ++echo.Call %this% with the desired Sphinx builder as the first argument, e.g. ++echo.``%this% html`` or ``%this% doctest``. Interesting targets that are ++echo.always available include: + echo. +-goto end +- +-:checkout +-svn co %SVNROOT%/external/Sphinx-1.0.7/sphinx tools/sphinx +-svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils +-svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2 +-svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments +-goto end +- +-:update +-svn update tools/sphinx +-svn update tools/docutils +-svn update tools/jinja2 +-svn update tools/pygments ++echo. Provided by Sphinx: ++echo. html, htmlhelp, latex, text ++echo. suspicious, linkcheck, changes, doctest ++echo. Provided by this script: ++echo. clean, check, serve, htmlview ++echo. ++echo.All arguments past the first one are passed through to sphinx-build as ++echo.filenames to build or are ignored. See README.txt in this directory or ++echo.the documentation for your version of Sphinx for more exhaustive lists ++echo.of available targets and descriptions of each. ++echo. ++echo.This script assumes that the SPHINXBUILD environment variable contains ++echo.a legitimate command for calling sphinx-build, or that sphinx-build is ++echo.on your PATH if SPHINXBUILD is not set. Options for sphinx-build can ++echo.be passed by setting the SPHINXOPTS environment variable. + goto end + + :build +-if not exist build mkdir build +-if not exist build\%1 mkdir build\%1 +-if not exist build\doctrees mkdir build\doctrees +-cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%* +-if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp ++if NOT "%PAPER%" == "" ( ++ set SPHINXOPTS=-D latex_paper_size=%PAPER% %SPHINXOPTS% ++) ++cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%* ++ ++if "%1" EQU "htmlhelp" ( ++ if not exist "%HTMLHELP%" ( ++ echo. ++ echo.The HTML Help Workshop was not found. Set the HTMLHELP variable ++ echo.to the path to hhc.exe or download and install it from ++ echo.http://msdn.microsoft.com/en-us/library/ms669985 ++ rem Set errorlevel to 1 and exit ++ cmd /C exit /b 1 ++ goto end ++ ) ++ cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp ++ rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2 ++ if not errorlevel 2 cmd /C exit /b 0 ++) ++ ++echo. ++if errorlevel 1 ( ++ echo.Build failed (exit code %ERRORLEVEL%^), check for error messages ++ echo.above. Any output will be found in %BUILDDIR%\%1 ++) else ( ++ echo.Build succeeded. All output should be in %BUILDDIR%\%1 ++) ++goto end ++ ++:htmlview ++if NOT "%2" EQU "" ( ++ echo.Can't specify filenames to build with htmlview target, ignoring. ++) ++cmd /C %this% html ++ ++if EXIST %BUILDDIR%\html\index.html ( ++ echo.Opening %BUILDDIR%\html\index.html in the default web browser... ++ start %BUILDDIR%\html\index.html ++) ++ ++goto end ++ ++:check ++cmd /C %PYTHON% tools\rstlint.py -i tools ++goto end ++ ++:serve ++cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html + goto end + + :end ++popd +diff -r ee879c0ffa11 Doc/reference/compound_stmts.rst +--- a/Doc/reference/compound_stmts.rst ++++ b/Doc/reference/compound_stmts.rst +@@ -218,7 +218,7 @@ + .. productionlist:: + try_stmt: try1_stmt | try2_stmt + try1_stmt: "try" ":" `suite` +- : ("except" [`expression` [("as" | ",") `target`]] ":" `suite`)+ ++ : ("except" [`expression` [("as" | ",") `identifier`]] ":" `suite`)+ + : ["else" ":" `suite`] + : ["finally" ":" `suite`] + try2_stmt: "try" ":" `suite` +diff -r ee879c0ffa11 Doc/reference/datamodel.rst +--- a/Doc/reference/datamodel.rst ++++ b/Doc/reference/datamodel.rst +@@ -234,7 +234,7 @@ + at the mercy of the underlying machine architecture (and C or Java + implementation) for the accepted range and handling of overflow. Python does not + support single-precision floating point numbers; the savings in processor and +- memory usage that are usually the reason for using these is dwarfed by the ++ memory usage that are usually the reason for using these are dwarfed by the + overhead of using objects in Python, so there is no reason to complicate the + language with two kinds of floating point numbers. + +@@ -783,7 +783,7 @@ + inheritance structures where there are multiple inheritance paths + leading back to a common ancestor. Additional details on the C3 MRO used by + new-style classes can be found in the documentation accompanying the +- 2.3 release at http://www.python.org/download/releases/2.3/mro/. ++ 2.3 release at https://www.python.org/download/releases/2.3/mro/. + + .. XXX: Could we add that MRO doc as an appendix to the language ref? + +@@ -1117,18 +1117,19 @@ + + Classes and instances come in two flavors: old-style (or classic) and new-style. + +-Up to Python 2.1, old-style classes were the only flavour available to the user. +-The concept of (old-style) class is unrelated to the concept of type: if *x* is +-an instance of an old-style class, then ``x.__class__`` designates the class of +-*x*, but ``type(x)`` is always ````. This reflects the fact +-that all old-style instances, independently of their class, are implemented with +-a single built-in type, called ``instance``. +- +-New-style classes were introduced in Python 2.2 to unify classes and types. A +-new-style class is neither more nor less than a user-defined type. If *x* is an +-instance of a new-style class, then ``type(x)`` is typically the same as +-``x.__class__`` (although this is not guaranteed - a new-style class instance is +-permitted to override the value returned for ``x.__class__``). ++Up to Python 2.1 the concept of ``class`` was unrelated to the concept of ++``type``, and old-style classes were the only flavor available. For an ++old-style class, the statement ``x.__class__`` provides the class of *x*, but ++``type(x)`` is always ````. This reflects the fact that all ++old-style instances, independent of their class, are implemented with a single ++built-in type, called ``instance``. ++ ++New-style classes were introduced in Python 2.2 to unify the concepts of ++``class`` and ``type``. A new-style class is simply a user-defined type, ++no more, no less. If *x* is an instance of a new-style class, then ``type(x)`` ++is typically the same as ``x.__class__`` (although this is not guaranteed -- a ++new-style class instance is permitted to override the value returned for ++``x.__class__``). + + The major motivation for introducing new-style classes is to provide a unified + object model with a full meta-model. It also has a number of practical +@@ -1147,7 +1148,7 @@ + + While this manual aims to provide comprehensive coverage of Python's class + mechanics, it may still be lacking in some areas when it comes to its coverage +-of new-style classes. Please see http://www.python.org/doc/newstyle/ for ++of new-style classes. Please see https://www.python.org/doc/newstyle/ for + sources of additional information. + + .. index:: +@@ -1155,8 +1156,7 @@ + single: class; classic + single: class; old-style + +-Old-style classes are removed in Python 3, leaving only the semantics of +-new-style classes. ++Old-style classes are removed in Python 3, leaving only new-style classes. + + + .. _specialnames: +diff -r ee879c0ffa11 Doc/reference/expressions.rst +--- a/Doc/reference/expressions.rst ++++ b/Doc/reference/expressions.rst +@@ -431,22 +431,21 @@ + is already executing raises a :exc:`ValueError` exception. + + .. index:: exception: StopIteration +-.. class:: generator + + + .. method:: generator.next() + + Starts the execution of a generator function or resumes it at the last executed + :keyword:`yield` expression. When a generator function is resumed with a +- :meth:`next` method, the current :keyword:`yield` expression always evaluates to ++ :meth:`~generator.next` method, the current :keyword:`yield` expression ++ always evaluates to + :const:`None`. The execution then continues to the next :keyword:`yield` + expression, where the generator is suspended again, and the value of the +- :token:`expression_list` is returned to :meth:`next`'s caller. If the generator ++ :token:`expression_list` is returned to :meth:`~generator.next`'s caller. ++ If the generator + exits without yielding another value, a :exc:`StopIteration` exception is + raised. + +-.. class:: . +- + .. method:: generator.send(value) + + Resumes the execution and "sends" a value into the generator function. The +@@ -689,7 +688,7 @@ + : ["," "**" `expression`] + : | `keyword_arguments` ["," "*" `expression`] + : ["," "**" `expression`] +- : | "*" `expression` ["," "*" `expression`] ["," "**" `expression`] ++ : | "*" `expression` ["," `keyword_arguments`] ["," "**" `expression`] + : | "**" `expression` + positional_arguments: `expression` ("," `expression`)* + keyword_arguments: `keyword_item` ("," `keyword_item`)* +diff -r ee879c0ffa11 Doc/reference/introduction.rst +--- a/Doc/reference/introduction.rst ++++ b/Doc/reference/introduction.rst +@@ -65,7 +65,7 @@ + An alternate Python for .NET. Unlike Python.NET, this is a complete Python + implementation that generates IL, and compiles Python code directly to .NET + assemblies. It was created by Jim Hugunin, the original creator of Jython. For +- more information, see `the IronPython website `_. ++ more information, see `the IronPython website `_. + + PyPy + An implementation of Python written completely in Python. It supports several +diff -r ee879c0ffa11 Doc/reference/simple_stmts.rst +--- a/Doc/reference/simple_stmts.rst ++++ b/Doc/reference/simple_stmts.rst +@@ -506,16 +506,16 @@ + + When a generator function is called, it returns an iterator known as a generator + iterator, or more commonly, a generator. The body of the generator function is +-executed by calling the generator's :meth:`next` method repeatedly until it +-raises an exception. ++executed by calling the generator's :meth:`~generator.next` method repeatedly ++until it raises an exception. + + When a :keyword:`yield` statement is executed, the state of the generator is +-frozen and the value of :token:`expression_list` is returned to :meth:`next`'s +-caller. By "frozen" we mean that all local state is retained, including the +-current bindings of local variables, the instruction pointer, and the internal +-evaluation stack: enough information is saved so that the next time :meth:`next` +-is invoked, the function can proceed exactly as if the :keyword:`yield` +-statement were just another external call. ++frozen and the value of :token:`expression_list` is returned to ++:meth:`~generator.next`'s caller. By "frozen" we mean that all local state is ++retained, including the current bindings of local variables, the instruction ++pointer, and the internal evaluation stack: enough information is saved so that ++the next time :meth:`~generator.next` is invoked, the function can proceed ++exactly as if the :keyword:`yield` statement were just another external call. + + As of Python version 2.5, the :keyword:`yield` statement is now allowed in the + :keyword:`try` clause of a :keyword:`try` ... :keyword:`finally` construct. If +@@ -695,9 +695,7 @@ + hierarchy in naming, Python has a concept of packages. A package can contain + other packages and modules while modules cannot contain other modules or + packages. From a file system perspective, packages are directories and modules +-are files. The original `specification for packages +-`_ is still available to read, +-although minor details have changed since the writing of that document. ++are files. + + .. index:: + single: sys.modules +diff -r ee879c0ffa11 Doc/tools/dailybuild.py +--- a/Doc/tools/dailybuild.py ++++ /dev/null +@@ -1,135 +0,0 @@ +-#!/usr/bin/env python +-# -*- coding: utf-8 -*- +- +-# Runs the daily build of the Python docs on dinsdale.python.org. +-# +-# Usages: +-# +-# dailybuild.py [-q] +-# +-# without any arguments builds docs for all branches configured in the global +-# BRANCHES value. -q selects "quick build", which means to build only HTML. +-# +-# dailybuild.py [-q] [-d] +-# +-# builds one version, where is an SVN checkout directory of the +-# Python branch to build docs for, and is the directory where the +-# result should be placed. If -d is given, the docs are built even if the +-# branch is in development mode (i.e. version contains a, b or c). +-# +-# This script is not run from the checkout, so if you want to change how the +-# daily build is run, you must replace it on dinsdale. This is necessary, for +-# example, after the release of a new minor version. +-# +-# 03/2010, Georg Brandl +- +-import os +-import sys +-import getopt +- +- +-BUILDROOT = '/home/gbrandl/docbuild' +-SPHINXBUILD = os.path.join(BUILDROOT, 'sphinx-env/bin/sphinx-build') +-WWWROOT = '/data/ftp.python.org/pub/docs.python.org' +- +-BRANCHES = [ +- # checkout, target, isdev +- (BUILDROOT + '/python34', WWWROOT + '/3.4', False), +- (BUILDROOT + '/python35', WWWROOT + '/3.5', True), +- (BUILDROOT + '/python27', WWWROOT + '/2.7', False), +-] +- +- +-def _files_changed(old, new): +- with open(old, 'rb') as fp1, open(new, 'rb') as fp2: +- st1 = os.fstat(fp1.fileno()) +- st2 = os.fstat(fp2.fileno()) +- if st1.st_size != st2.st_size: +- return False +- if st1.st_mtime >= st2.st_mtime: +- return True +- while True: +- one = fp1.read(4096) +- two = fp2.read(4096) +- if one != two: +- return False +- if one == '': +- break +- return True +- +-def build_one(checkout, target, isdev, quick): +- print 'Doc autobuild started in %s' % checkout +- os.chdir(checkout) +- print 'Running hg pull --update' +- os.system('hg pull --update') +- print 'Running make autobuild' +- maketarget = 'autobuild-' + ('html' if quick else +- ('dev' if isdev else 'stable')) +- if os.WEXITSTATUS(os.system('cd Doc; make SPHINXBUILD=%s %s' % (SPHINXBUILD, maketarget))) == 2: +- print '*' * 80 +- return +- print('Computing changed files') +- changed = [] +- for dirpath, dirnames, filenames in os.walk('Doc/build/html/'): +- dir_rel = dirpath[len('Doc/build/html/'):] +- for fn in filenames: +- local_path = os.path.join(dirpath, fn) +- rel_path = os.path.join(dir_rel, fn) +- target_path = os.path.join(target, rel_path) +- if (os.path.exists(target_path) and +- not _files_changed(target_path, local_path)): +- changed.append(rel_path) +- print 'Copying HTML files to %s' % target +- os.system('cp -a Doc/build/html/* %s' % target) +- if not quick: +- print 'Copying dist files' +- os.system('mkdir -p %s/archives' % target) +- os.system('cp -a Doc/dist/* %s/archives' % target) +- changed.append('archives/') +- for fn in os.listdir(os.path.join(target, 'archives')): +- changed.append('archives/' + fn) +- print '%s files changed' % len(changed) +- if changed: +- target_ino = os.stat(target).st_ino +- targets_dir = os.path.dirname(target) +- prefixes = [] +- for fn in os.listdir(targets_dir): +- if os.stat(os.path.join(targets_dir, fn)).st_ino == target_ino: +- prefixes.append(fn) +- to_purge = [] +- for prefix in prefixes: +- to_purge.extend(prefix + "/" + p for p in changed) +- purge_cmd = 'curl -X PURGE "https://docs.python.org/{%s}"' % ','.join(to_purge) +- print("Running CDN purge") +- os.system(purge_cmd) +- print 'Finished' +- print '=' * 80 +- +-def usage(): +- print 'Usage:' +- print ' %s' % sys.argv[0] +- print 'or' +- print ' %s [-d] ' % sys.argv[0] +- sys.exit(1) +- +- +-if __name__ == '__main__': +- try: +- opts, args = getopt.getopt(sys.argv[1:], 'dq') +- except getopt.error: +- usage() +- quick = devel = False +- for opt, _ in opts: +- if opt == '-q': +- quick = True +- if opt == '-d': +- devel = True +- if devel and not args: +- usage() +- if args: +- if len(args) != 2: +- usage() +- build_one(os.path.abspath(args[0]), os.path.abspath(args[1]), devel, quick) +- else: +- for checkout, dest, devel in BRANCHES: +- build_one(checkout, dest, devel, quick) +diff -r ee879c0ffa11 Doc/tools/extensions/c_annotations.py +--- /dev/null ++++ b/Doc/tools/extensions/c_annotations.py +@@ -0,0 +1,121 @@ ++# -*- coding: utf-8 -*- ++""" ++ c_annotations.py ++ ~~~~~~~~~~~~~~~~ ++ ++ Supports annotations for C API elements: ++ ++ * reference count annotations for C API functions. Based on ++ refcount.py and anno-api.py in the old Python documentation tools. ++ ++ * stable API annotations ++ ++ Usage: Set the `refcount_file` config value to the path to the reference ++ count data file. ++ ++ :copyright: Copyright 2007-2014 by Georg Brandl. ++ :license: Python license. ++""" ++ ++from os import path ++from docutils import nodes ++from docutils.parsers.rst import directives ++ ++from sphinx import addnodes ++from sphinx.domains.c import CObject ++ ++ ++class RCEntry: ++ def __init__(self, name): ++ self.name = name ++ self.args = [] ++ self.result_type = '' ++ self.result_refs = None ++ ++ ++class Annotations(dict): ++ @classmethod ++ def fromfile(cls, filename): ++ d = cls() ++ fp = open(filename, 'r') ++ try: ++ for line in fp: ++ line = line.strip() ++ if line[:1] in ("", "#"): ++ # blank lines and comments ++ continue ++ parts = line.split(":", 4) ++ if len(parts) != 5: ++ raise ValueError("Wrong field count in %r" % line) ++ function, type, arg, refcount, comment = parts ++ # Get the entry, creating it if needed: ++ try: ++ entry = d[function] ++ except KeyError: ++ entry = d[function] = RCEntry(function) ++ if not refcount or refcount == "null": ++ refcount = None ++ else: ++ refcount = int(refcount) ++ # Update the entry with the new parameter or the result ++ # information. ++ if arg: ++ entry.args.append((arg, type, refcount)) ++ else: ++ entry.result_type = type ++ entry.result_refs = refcount ++ finally: ++ fp.close() ++ return d ++ ++ def add_annotations(self, app, doctree): ++ for node in doctree.traverse(addnodes.desc_content): ++ par = node.parent ++ if par['domain'] != 'c': ++ continue ++ if par['stableabi']: ++ node.insert(0, nodes.emphasis(' Part of the stable ABI.', ++ ' Part of the stable ABI.', ++ classes=['stableabi'])) ++ if par['objtype'] != 'function': ++ continue ++ if not par[0].has_key('names') or not par[0]['names']: ++ continue ++ name = par[0]['names'][0] ++ if name.startswith("c."): ++ name = name[2:] ++ entry = self.get(name) ++ if not entry: ++ continue ++ elif entry.result_type not in ("PyObject*", "PyVarObject*"): ++ continue ++ if entry.result_refs is None: ++ rc = 'Return value: Always NULL.' ++ elif entry.result_refs: ++ rc = 'Return value: New reference.' ++ else: ++ rc = 'Return value: Borrowed reference.' ++ node.insert(0, nodes.emphasis(rc, rc, classes=['refcount'])) ++ ++ ++def init_annotations(app): ++ refcounts = Annotations.fromfile( ++ path.join(app.srcdir, app.config.refcount_file)) ++ app.connect('doctree-read', refcounts.add_annotations) ++ ++ ++def setup(app): ++ app.add_config_value('refcount_file', '', True) ++ app.connect('builder-inited', init_annotations) ++ ++ # monkey-patch C object... ++ CObject.option_spec = { ++ 'noindex': directives.flag, ++ 'stableabi': directives.flag, ++ } ++ old_handle_signature = CObject.handle_signature ++ def new_handle_signature(self, sig, signode): ++ signode.parent['stableabi'] = 'stableabi' in self.options ++ return old_handle_signature(self, sig, signode) ++ CObject.handle_signature = new_handle_signature ++ return {'version': '1.0', 'parallel_read_safe': True} +diff -r ee879c0ffa11 Doc/tools/extensions/patchlevel.py +--- /dev/null ++++ b/Doc/tools/extensions/patchlevel.py +@@ -0,0 +1,71 @@ ++# -*- coding: utf-8 -*- ++""" ++ patchlevel.py ++ ~~~~~~~~~~~~~ ++ ++ Extract version info from Include/patchlevel.h. ++ Adapted from Doc/tools/getversioninfo. ++ ++ :copyright: 2007-2008 by Georg Brandl. ++ :license: Python license. ++""" ++ ++import os ++import re ++import sys ++ ++def get_header_version_info(srcdir): ++ patchlevel_h = os.path.join(srcdir, '..', 'Include', 'patchlevel.h') ++ ++ # This won't pick out all #defines, but it will pick up the ones we ++ # care about. ++ rx = re.compile(r'\s*#define\s+([a-zA-Z][a-zA-Z_0-9]*)\s+([a-zA-Z_0-9]+)') ++ ++ d = {} ++ f = open(patchlevel_h) ++ try: ++ for line in f: ++ m = rx.match(line) ++ if m is not None: ++ name, value = m.group(1, 2) ++ d[name] = value ++ finally: ++ f.close() ++ ++ release = version = '%s.%s' % (d['PY_MAJOR_VERSION'], d['PY_MINOR_VERSION']) ++ micro = int(d['PY_MICRO_VERSION']) ++ if micro != 0: ++ release += '.' + str(micro) ++ ++ level = d['PY_RELEASE_LEVEL'] ++ suffixes = { ++ 'PY_RELEASE_LEVEL_ALPHA': 'a', ++ 'PY_RELEASE_LEVEL_BETA': 'b', ++ 'PY_RELEASE_LEVEL_GAMMA': 'rc', ++ } ++ if level != 'PY_RELEASE_LEVEL_FINAL': ++ release += suffixes[level] + str(int(d['PY_RELEASE_SERIAL'])) ++ return version, release ++ ++ ++def get_sys_version_info(): ++ major, minor, micro, level, serial = sys.version_info ++ release = version = '%s.%s' % (major, minor) ++ if micro: ++ release += '.%s' % micro ++ if level != 'final': ++ release += '%s%s' % (level[0], serial) ++ return version, release ++ ++ ++def get_version_info(): ++ try: ++ return get_header_version_info('.') ++ except (IOError, OSError): ++ version, release = get_sys_version_info() ++ print >>sys.stderr, 'Can\'t get version info from Include/patchlevel.h, ' \ ++ 'using version of this interpreter (%s).' % release ++ return version, release ++ ++if __name__ == '__main__': ++ print(get_header_version_info('.')[1]) +diff -r ee879c0ffa11 Doc/tools/extensions/pyspecific.py +--- /dev/null ++++ b/Doc/tools/extensions/pyspecific.py +@@ -0,0 +1,258 @@ ++# -*- coding: utf-8 -*- ++""" ++ pyspecific.py ++ ~~~~~~~~~~~~~ ++ ++ Sphinx extension with Python doc-specific markup. ++ ++ :copyright: 2008-2014 by Georg Brandl. ++ :license: Python license. ++""" ++ ++ISSUE_URI = 'https://bugs.python.org/issue%s' ++SOURCE_URI = 'https://hg.python.org/cpython/file/2.7/%s' ++ ++from docutils import nodes, utils ++ ++from sphinx.util.nodes import split_explicit_title ++from sphinx.util.compat import Directive ++from sphinx.writers.html import HTMLTranslator ++from sphinx.writers.latex import LaTeXTranslator ++ ++# monkey-patch reST parser to disable alphabetic and roman enumerated lists ++from docutils.parsers.rst.states import Body ++Body.enum.converters['loweralpha'] = \ ++ Body.enum.converters['upperalpha'] = \ ++ Body.enum.converters['lowerroman'] = \ ++ Body.enum.converters['upperroman'] = lambda x: None ++ ++# monkey-patch HTML and LaTeX translators to keep doctest blocks in the ++# doctest docs themselves ++orig_visit_literal_block = HTMLTranslator.visit_literal_block ++def new_visit_literal_block(self, node): ++ meta = self.builder.env.metadata[self.builder.current_docname] ++ old_trim_doctest_flags = self.highlighter.trim_doctest_flags ++ if 'keepdoctest' in meta: ++ self.highlighter.trim_doctest_flags = False ++ try: ++ orig_visit_literal_block(self, node) ++ finally: ++ self.highlighter.trim_doctest_flags = old_trim_doctest_flags ++ ++HTMLTranslator.visit_literal_block = new_visit_literal_block ++ ++orig_depart_literal_block = LaTeXTranslator.depart_literal_block ++def new_depart_literal_block(self, node): ++ meta = self.builder.env.metadata[self.curfilestack[-1]] ++ old_trim_doctest_flags = self.highlighter.trim_doctest_flags ++ if 'keepdoctest' in meta: ++ self.highlighter.trim_doctest_flags = False ++ try: ++ orig_depart_literal_block(self, node) ++ finally: ++ self.highlighter.trim_doctest_flags = old_trim_doctest_flags ++ ++LaTeXTranslator.depart_literal_block = new_depart_literal_block ++ ++# Support for marking up and linking to bugs.python.org issues ++ ++def issue_role(typ, rawtext, text, lineno, inliner, options={}, content=[]): ++ issue = utils.unescape(text) ++ text = 'issue ' + issue ++ refnode = nodes.reference(text, text, refuri=ISSUE_URI % issue) ++ return [refnode], [] ++ ++ ++# Support for linking to Python source files easily ++ ++def source_role(typ, rawtext, text, lineno, inliner, options={}, content=[]): ++ has_t, title, target = split_explicit_title(text) ++ title = utils.unescape(title) ++ target = utils.unescape(target) ++ refnode = nodes.reference(title, title, refuri=SOURCE_URI % target) ++ return [refnode], [] ++ ++ ++# Support for marking up implementation details ++ ++class ImplementationDetail(Directive): ++ ++ has_content = True ++ required_arguments = 0 ++ optional_arguments = 1 ++ final_argument_whitespace = True ++ ++ def run(self): ++ pnode = nodes.compound(classes=['impl-detail']) ++ content = self.content ++ add_text = nodes.strong('CPython implementation detail:', ++ 'CPython implementation detail:') ++ if self.arguments: ++ n, m = self.state.inline_text(self.arguments[0], self.lineno) ++ pnode.append(nodes.paragraph('', '', *(n + m))) ++ self.state.nested_parse(content, self.content_offset, pnode) ++ if pnode.children and isinstance(pnode[0], nodes.paragraph): ++ pnode[0].insert(0, add_text) ++ pnode[0].insert(1, nodes.Text(' ')) ++ else: ++ pnode.insert(0, nodes.paragraph('', '', add_text)) ++ return [pnode] ++ ++ ++# Support for documenting decorators ++ ++from sphinx import addnodes ++from sphinx.domains.python import PyModulelevel, PyClassmember ++ ++class PyDecoratorMixin(object): ++ def handle_signature(self, sig, signode): ++ ret = super(PyDecoratorMixin, self).handle_signature(sig, signode) ++ signode.insert(0, addnodes.desc_addname('@', '@')) ++ return ret ++ ++ def needs_arglist(self): ++ return False ++ ++class PyDecoratorFunction(PyDecoratorMixin, PyModulelevel): ++ def run(self): ++ # a decorator function is a function after all ++ self.name = 'py:function' ++ return PyModulelevel.run(self) ++ ++class PyDecoratorMethod(PyDecoratorMixin, PyClassmember): ++ def run(self): ++ self.name = 'py:method' ++ return PyClassmember.run(self) ++ ++ ++# Support for building "topic help" for pydoc ++ ++pydoc_topic_labels = [ ++ 'assert', 'assignment', 'atom-identifiers', 'atom-literals', ++ 'attribute-access', 'attribute-references', 'augassign', 'binary', ++ 'bitwise', 'bltin-code-objects', 'bltin-ellipsis-object', ++ 'bltin-null-object', 'bltin-type-objects', 'booleans', ++ 'break', 'callable-types', 'calls', 'class', 'comparisons', 'compound', ++ 'context-managers', 'continue', 'conversions', 'customization', 'debugger', ++ 'del', 'dict', 'dynamic-features', 'else', 'exceptions', 'exec', 'execmodel', ++ 'exprlists', 'floating', 'for', 'formatstrings', 'function', 'global', ++ 'id-classes', 'identifiers', 'if', 'imaginary', 'import', 'in', 'integers', ++ 'lambda', 'lists', 'naming', 'numbers', 'numeric-types', ++ 'objects', 'operator-summary', 'pass', 'power', 'print', 'raise', 'return', ++ 'sequence-types', 'shifting', 'slicings', 'specialattrs', 'specialnames', ++ 'string-methods', 'strings', 'subscriptions', 'truth', 'try', 'types', ++ 'typesfunctions', 'typesmapping', 'typesmethods', 'typesmodules', ++ 'typesseq', 'typesseq-mutable', 'unary', 'while', 'with', 'yield' ++] ++ ++from os import path ++from time import asctime ++from pprint import pformat ++from docutils.io import StringOutput ++from docutils.utils import new_document ++ ++from sphinx.builders import Builder ++from sphinx.writers.text import TextWriter ++ ++ ++class PydocTopicsBuilder(Builder): ++ name = 'pydoc-topics' ++ ++ def init(self): ++ self.topics = {} ++ ++ def get_outdated_docs(self): ++ return 'all pydoc topics' ++ ++ def get_target_uri(self, docname, typ=None): ++ return '' # no URIs ++ ++ def write(self, *ignored): ++ writer = TextWriter(self) ++ for label in self.status_iterator(pydoc_topic_labels, ++ 'building topics... ', ++ length=len(pydoc_topic_labels)): ++ if label not in self.env.domaindata['std']['labels']: ++ self.warn('label %r not in documentation' % label) ++ continue ++ docname, labelid, sectname = self.env.domaindata['std']['labels'][label] ++ doctree = self.env.get_and_resolve_doctree(docname, self) ++ document = new_document('
') ++ document.append(doctree.ids[labelid]) ++ destination = StringOutput(encoding='utf-8') ++ writer.write(document, destination) ++ self.topics[label] = writer.output ++ ++ def finish(self): ++ f = open(path.join(self.outdir, 'topics.py'), 'wb') ++ try: ++ f.write('# -*- coding: utf-8 -*-\n'.encode('utf-8')) ++ f.write(('# Autogenerated by Sphinx on %s\n' % asctime()).encode('utf-8')) ++ f.write(('topics = ' + pformat(self.topics) + '\n').encode('utf-8')) ++ finally: ++ f.close() ++ ++ ++# Support for checking for suspicious markup ++ ++import suspicious ++ ++ ++# Support for documenting Opcodes ++ ++import re ++ ++opcode_sig_re = re.compile(r'(\w+(?:\+\d)?)(?:\s*\((.*)\))?') ++ ++def parse_opcode_signature(env, sig, signode): ++ """Transform an opcode signature into RST nodes.""" ++ m = opcode_sig_re.match(sig) ++ if m is None: ++ raise ValueError ++ opname, arglist = m.groups() ++ signode += addnodes.desc_name(opname, opname) ++ if arglist is not None: ++ paramlist = addnodes.desc_parameterlist() ++ signode += paramlist ++ paramlist += addnodes.desc_parameter(arglist, arglist) ++ return opname.strip() ++ ++ ++# Support for documenting pdb commands ++ ++pdbcmd_sig_re = re.compile(r'([a-z()!]+)\s*(.*)') ++ ++# later... ++#pdbargs_tokens_re = re.compile(r'''[a-zA-Z]+ | # identifiers ++# [.,:]+ | # punctuation ++# [\[\]()] | # parens ++# \s+ # whitespace ++# ''', re.X) ++ ++def parse_pdb_command(env, sig, signode): ++ """Transform a pdb command signature into RST nodes.""" ++ m = pdbcmd_sig_re.match(sig) ++ if m is None: ++ raise ValueError ++ name, args = m.groups() ++ fullname = name.replace('(', '').replace(')', '') ++ signode += addnodes.desc_name(name, name) ++ if args: ++ signode += addnodes.desc_addname(' '+args, ' '+args) ++ return fullname ++ ++ ++def setup(app): ++ app.add_role('issue', issue_role) ++ app.add_role('source', source_role) ++ app.add_directive('impl-detail', ImplementationDetail) ++ app.add_builder(PydocTopicsBuilder) ++ app.add_builder(suspicious.CheckSuspiciousMarkupBuilder) ++ app.add_description_unit('opcode', 'opcode', '%s (opcode)', ++ parse_opcode_signature) ++ app.add_description_unit('pdbcommand', 'pdbcmd', '%s (pdb command)', ++ parse_pdb_command) ++ app.add_description_unit('2to3fixer', '2to3fixer', '%s (2to3 fixer)') ++ app.add_directive_to_domain('py', 'decorator', PyDecoratorFunction) ++ app.add_directive_to_domain('py', 'decoratormethod', PyDecoratorMethod) ++ return {'version': '1.0', 'parallel_read_safe': True} +diff -r ee879c0ffa11 Doc/tools/extensions/suspicious.py +--- /dev/null ++++ b/Doc/tools/extensions/suspicious.py +@@ -0,0 +1,274 @@ ++""" ++Try to detect suspicious constructs, resembling markup ++that has leaked into the final output. ++ ++Suspicious lines are reported in a comma-separated-file, ++``suspicious.csv``, located in the output directory. ++ ++The file is utf-8 encoded, and each line contains four fields: ++ ++ * document name (normalized) ++ * line number in the source document ++ * problematic text ++ * complete line showing the problematic text in context ++ ++It is common to find many false positives. To avoid reporting them ++again and again, they may be added to the ``ignored.csv`` file ++(located in the configuration directory). The file has the same ++format as ``suspicious.csv`` with a few differences: ++ ++ - each line defines a rule; if the rule matches, the issue ++ is ignored. ++ - line number may be empty (that is, nothing between the ++ commas: ",,"). In this case, line numbers are ignored (the ++ rule matches anywhere in the file). ++ - the last field does not have to be a complete line; some ++ surrounding text (never more than a line) is enough for ++ context. ++ ++Rules are processed sequentially. A rule matches when: ++ ++ * document names are the same ++ * problematic texts are the same ++ * line numbers are close to each other (5 lines up or down) ++ * the rule text is completely contained into the source line ++ ++The simplest way to create the ignored.csv file is by copying ++undesired entries from suspicious.csv (possibly trimming the last ++field.) ++ ++Copyright 2009 Gabriel A. Genellina ++ ++""" ++ ++import os ++import re ++import csv ++import sys ++ ++from docutils import nodes ++from sphinx.builders import Builder ++ ++detect_all = re.compile(r''' ++ ::(?=[^=])| # two :: (but NOT ::=) ++ :[a-zA-Z][a-zA-Z0-9]+| # :foo ++ `| # ` (seldom used by itself) ++ (?= (3, 0) ++ ++ ++class Rule: ++ def __init__(self, docname, lineno, issue, line): ++ """A rule for ignoring issues""" ++ self.docname = docname # document to which this rule applies ++ self.lineno = lineno # line number in the original source; ++ # this rule matches only near that. ++ # None -> don't care ++ self.issue = issue # the markup fragment that triggered this rule ++ self.line = line # text of the container element (single line only) ++ self.used = False ++ ++ def __repr__(self): ++ return '{0.docname},,{0.issue},{0.line}'.format(self) ++ ++ ++ ++class dialect(csv.excel): ++ """Our dialect: uses only linefeed as newline.""" ++ lineterminator = '\n' ++ ++ ++class CheckSuspiciousMarkupBuilder(Builder): ++ """ ++ Checks for possibly invalid markup that may leak into the output. ++ """ ++ name = 'suspicious' ++ ++ def init(self): ++ # create output file ++ self.log_file_name = os.path.join(self.outdir, 'suspicious.csv') ++ open(self.log_file_name, 'w').close() ++ # load database of previously ignored issues ++ self.load_rules(os.path.join(os.path.dirname(__file__), '..', ++ 'susp-ignored.csv')) ++ ++ def get_outdated_docs(self): ++ return self.env.found_docs ++ ++ def get_target_uri(self, docname, typ=None): ++ return '' ++ ++ def prepare_writing(self, docnames): ++ pass ++ ++ def write_doc(self, docname, doctree): ++ # set when any issue is encountered in this document ++ self.any_issue = False ++ self.docname = docname ++ visitor = SuspiciousVisitor(doctree, self) ++ doctree.walk(visitor) ++ ++ def finish(self): ++ unused_rules = [rule for rule in self.rules if not rule.used] ++ if unused_rules: ++ self.warn('Found %s/%s unused rules:' % ++ (len(unused_rules), len(self.rules))) ++ for rule in unused_rules: ++ self.info(repr(rule)) ++ return ++ ++ def check_issue(self, line, lineno, issue): ++ if not self.is_ignored(line, lineno, issue): ++ self.report_issue(line, lineno, issue) ++ ++ def is_ignored(self, line, lineno, issue): ++ """Determine whether this issue should be ignored.""" ++ docname = self.docname ++ for rule in self.rules: ++ if rule.docname != docname: continue ++ if rule.issue != issue: continue ++ # Both lines must match *exactly*. This is rather strict, ++ # and probably should be improved. ++ # Doing fuzzy matches with levenshtein distance could work, ++ # but that means bringing other libraries... ++ # Ok, relax that requirement: just check if the rule fragment ++ # is contained in the document line ++ if rule.line not in line: continue ++ # Check both line numbers. If they're "near" ++ # this rule matches. (lineno=None means "don't care") ++ if (rule.lineno is not None) and \ ++ abs(rule.lineno - lineno) > 5: continue ++ # if it came this far, the rule matched ++ rule.used = True ++ return True ++ return False ++ ++ def report_issue(self, text, lineno, issue): ++ if not self.any_issue: self.info() ++ self.any_issue = True ++ self.write_log_entry(lineno, issue, text) ++ if py3: ++ self.warn('[%s:%d] "%s" found in "%-.120s"' % ++ (self.docname, lineno, issue, text)) ++ else: ++ self.warn('[%s:%d] "%s" found in "%-.120s"' % ( ++ self.docname.encode(sys.getdefaultencoding(),'replace'), ++ lineno, ++ issue.encode(sys.getdefaultencoding(),'replace'), ++ text.strip().encode(sys.getdefaultencoding(),'replace'))) ++ self.app.statuscode = 1 ++ ++ def write_log_entry(self, lineno, issue, text): ++ if py3: ++ f = open(self.log_file_name, 'a') ++ writer = csv.writer(f, dialect) ++ writer.writerow([self.docname, lineno, issue, text.strip()]) ++ f.close() ++ else: ++ f = open(self.log_file_name, 'ab') ++ writer = csv.writer(f, dialect) ++ writer.writerow([self.docname.encode('utf-8'), ++ lineno, ++ issue.encode('utf-8'), ++ text.strip().encode('utf-8')]) ++ f.close() ++ ++ def load_rules(self, filename): ++ """Load database of previously ignored issues. ++ ++ A csv file, with exactly the same format as suspicious.csv ++ Fields: document name (normalized), line number, issue, surrounding text ++ """ ++ self.info("loading ignore rules... ", nonl=1) ++ self.rules = rules = [] ++ try: ++ if py3: ++ f = open(filename, 'r') ++ else: ++ f = open(filename, 'rb') ++ except IOError: ++ return ++ for i, row in enumerate(csv.reader(f)): ++ if len(row) != 4: ++ raise ValueError( ++ "wrong format in %s, line %d: %s" % (filename, i+1, row)) ++ docname, lineno, issue, text = row ++ if lineno: ++ lineno = int(lineno) ++ else: ++ lineno = None ++ if not py3: ++ docname = docname.decode('utf-8') ++ issue = issue.decode('utf-8') ++ text = text.decode('utf-8') ++ rule = Rule(docname, lineno, issue, text) ++ rules.append(rule) ++ f.close() ++ self.info('done, %d rules loaded' % len(self.rules)) ++ ++ ++def get_lineno(node): ++ """Obtain line number information for a node.""" ++ lineno = None ++ while lineno is None and node: ++ node = node.parent ++ lineno = node.line ++ return lineno ++ ++ ++def extract_line(text, index): ++ """text may be a multiline string; extract ++ only the line containing the given character index. ++ ++ >>> extract_line("abc\ndefgh\ni", 6) ++ >>> 'defgh' ++ >>> for i in (0, 2, 3, 4, 10): ++ ... print extract_line("abc\ndefgh\ni", i) ++ abc ++ abc ++ abc ++ defgh ++ defgh ++ i ++ """ ++ p = text.rfind('\n', 0, index) + 1 ++ q = text.find('\n', index) ++ if q < 0: ++ q = len(text) ++ return text[p:q] ++ ++ ++class SuspiciousVisitor(nodes.GenericNodeVisitor): ++ ++ lastlineno = 0 ++ ++ def __init__(self, document, builder): ++ nodes.GenericNodeVisitor.__init__(self, document) ++ self.builder = builder ++ ++ def default_visit(self, node): ++ if isinstance(node, (nodes.Text, nodes.image)): # direct text containers ++ text = node.astext() ++ # lineno seems to go backwards sometimes (?) ++ self.lastlineno = lineno = max(get_lineno(node) or 0, self.lastlineno) ++ seen = set() # don't report the same issue more than only once per line ++ for match in detect_all(text): ++ issue = match.group() ++ line = extract_line(text, match.start()) ++ if (issue, line) not in seen: ++ self.builder.check_issue(line, lineno, issue) ++ seen.add((issue, line)) ++ ++ unknown_visit = default_visit ++ ++ def visit_document(self, node): ++ self.lastlineno = 0 ++ ++ def visit_comment(self, node): ++ # ignore comments -- too much false positives. ++ # (although doing this could miss some errors; ++ # there were two sections "commented-out" by mistake ++ # in the Python docs that would not be catched) ++ raise nodes.SkipNode +diff -r ee879c0ffa11 Doc/tools/roman.py +--- a/Doc/tools/roman.py ++++ /dev/null +@@ -1,80 +0,0 @@ +-"""Convert to and from Roman numerals""" +- +-__author__ = "Mark Pilgrim (f8dy@diveintopython.org)" +-__version__ = "1.4" +-__date__ = "8 August 2001" +-__copyright__ = """Copyright (c) 2001 Mark Pilgrim +- +-This program is part of "Dive Into Python", a free Python tutorial for +-experienced programmers. Visit http://diveintopython.org/ for the +-latest version. +- +-This program is free software; you can redistribute it and/or modify +-it under the terms of the Python 2.1.1 license, available at +-http://www.python.org/2.1.1/license.html +-""" +- +-import re +- +-#Define exceptions +-class RomanError(Exception): pass +-class OutOfRangeError(RomanError): pass +-class NotIntegerError(RomanError): pass +-class InvalidRomanNumeralError(RomanError): pass +- +-#Define digit mapping +-romanNumeralMap = (('M', 1000), +- ('CM', 900), +- ('D', 500), +- ('CD', 400), +- ('C', 100), +- ('XC', 90), +- ('L', 50), +- ('XL', 40), +- ('X', 10), +- ('IX', 9), +- ('V', 5), +- ('IV', 4), +- ('I', 1)) +- +-def toRoman(n): +- """convert integer to Roman numeral""" +- if not (0 < n < 5000): +- raise OutOfRangeError("number out of range (must be 1..4999)") +- if int(n) != n: +- raise NotIntegerError("decimals can not be converted") +- +- result = "" +- for numeral, integer in romanNumeralMap: +- while n >= integer: +- result += numeral +- n -= integer +- return result +- +-#Define pattern to detect valid Roman numerals +-romanNumeralPattern = re.compile(""" +- ^ # beginning of string +- M{0,4} # thousands - 0 to 4 M's +- (CM|CD|D?C{0,3}) # hundreds - 900 (CM), 400 (CD), 0-300 (0 to 3 C's), +- # or 500-800 (D, followed by 0 to 3 C's) +- (XC|XL|L?X{0,3}) # tens - 90 (XC), 40 (XL), 0-30 (0 to 3 X's), +- # or 50-80 (L, followed by 0 to 3 X's) +- (IX|IV|V?I{0,3}) # ones - 9 (IX), 4 (IV), 0-3 (0 to 3 I's), +- # or 5-8 (V, followed by 0 to 3 I's) +- $ # end of string +- """ ,re.VERBOSE) +- +-def fromRoman(s): +- """convert Roman numeral to integer""" +- if not s: +- raise InvalidRomanNumeralError('Input can not be blank') +- if not romanNumeralPattern.search(s): +- raise InvalidRomanNumeralError('Invalid Roman numeral: %s' % s) +- +- result = 0 +- index = 0 +- for numeral, integer in romanNumeralMap: +- while s[index:index+len(numeral)] == numeral: +- result += integer +- index += len(numeral) +- return result +diff -r ee879c0ffa11 Doc/tools/rstlint.py +--- a/Doc/tools/rstlint.py ++++ b/Doc/tools/rstlint.py +@@ -15,7 +15,6 @@ + import re + import sys + import getopt +-import subprocess + from os.path import join, splitext, abspath, exists + from collections import defaultdict + +@@ -28,15 +27,16 @@ + 'parsed-literal', 'pull-quote', 'raw', 'replace', + 'restructuredtext-test-directive', 'role', 'rubric', 'sectnum', 'sidebar', + 'table', 'target-notes', 'tip', 'title', 'topic', 'unicode', 'warning', +- # Sphinx custom ones ++ # Sphinx and Python docs custom ones + 'acks', 'attribute', 'autoattribute', 'autoclass', 'autodata', + 'autoexception', 'autofunction', 'automethod', 'automodule', 'centered', + 'cfunction', 'class', 'classmethod', 'cmacro', 'cmdoption', 'cmember', + 'code-block', 'confval', 'cssclass', 'ctype', 'currentmodule', 'cvar', +- 'data', 'deprecated', 'describe', 'directive', 'doctest', 'envvar', 'event', +- 'exception', 'function', 'glossary', 'highlight', 'highlightlang', 'index', +- 'literalinclude', 'method', 'module', 'moduleauthor', 'productionlist', +- 'program', 'role', 'sectionauthor', 'seealso', 'sourcecode', 'staticmethod', ++ 'data', 'decorator', 'decoratormethod', 'deprecated-removed', ++ 'deprecated(?!-removed)', 'describe', 'directive', 'doctest', 'envvar', ++ 'event', 'exception', 'function', 'glossary', 'highlight', 'highlightlang', ++ 'impl-detail', 'index', 'literalinclude', 'method', 'miscnews', 'module', ++ 'moduleauthor', 'opcode', 'pdbcommand', 'productionlist', + 'tabularcolumns', 'testcode', 'testoutput', 'testsetup', 'toctree', 'todo', + 'todolist', 'versionadded', 'versionchanged' + ] +@@ -44,7 +44,7 @@ + all_directives = '(' + '|'.join(directives) + ')' + seems_directive_re = re.compile(r'\.\. %s([^a-z:]|:(?!:))' % all_directives) + default_role_re = re.compile(r'(^| )`\w([^`]*?\w)?`($| )') +-leaked_markup_re = re.compile(r'[a-z]::[^=]|:[a-z]+:|`|\.\.\s*\w+:') ++leaked_markup_re = re.compile(r'[a-z]::\s|`|\.\.\s*\w+:') + + + checkers = {} +diff -r ee879c0ffa11 Doc/tools/sphinx-build.py +--- a/Doc/tools/sphinx-build.py ++++ /dev/null +@@ -1,28 +0,0 @@ +-# -*- coding: utf-8 -*- +-""" +- Sphinx - Python documentation toolchain +- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +- +- :copyright: 2007-2010 by Georg Brandl. +- :license: Python license. +-""" +- +-import sys +-import warnings +- +-# Get rid of UserWarnings reported by pkg_resources. +-warnings.filterwarnings('ignore', category=UserWarning, module='jinja2') +- +-if __name__ == '__main__': +- +- if sys.version_info[:3] < (2, 4, 0) or sys.version_info[:3] > (3, 0, 0): +- sys.stderr.write("""\ +-Error: Sphinx needs to be executed with Python 2.4 or newer (not 3.x though). +-(If you run this from the Makefile, you can set the PYTHON variable +-to the path of an alternative interpreter executable, e.g., +-``make html PYTHON=python2.5``). +-""") +- sys.exit(1) +- +- from sphinx import main +- sys.exit(main(sys.argv)) +diff -r ee879c0ffa11 Doc/tools/sphinxext/download.html +--- a/Doc/tools/sphinxext/download.html ++++ /dev/null +@@ -1,61 +0,0 @@ +-{% extends "layout.html" %} +-{% set title = 'Download' %} +-{% if daily is defined %} +- {% set dlbase = pathto('archives', 1) %} +-{% else %} +- {% set dlbase = 'http://docs.python.org/ftp/python/doc/' + release %} +-{% endif %} +- +-{% block body %} +-

Download Python {{ release }} Documentation

+- +-{% if last_updated %}

Last updated on: {{ last_updated }}.

{% endif %} +- +-

To download an archive containing all the documents for this version of +-Python in one of various formats, follow one of links in this table. The numbers +-in the table are the size of the download files in megabytes.

+- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-
FormatPacked as .zipPacked as .tar.bz2
PDF (US-Letter paper size)Download (ca. 8 MB)Download (ca. 8 MB)
PDF (A4 paper size)Download (ca. 8 MB)Download (ca. 8 MB)
HTMLDownload (ca. 6 MB)Download (ca. 4 MB)
Plain TextDownload (ca. 2 MB)Download (ca. 1.5 MB)
+- +-

These archives contain all the content in the documentation.

+- +-

HTML Help (.chm) files are made available in the "Windows" section +-on the Python +-download page.

+- +- +-

Unpacking

+- +-

Unix users should download the .tar.bz2 archives; these are bzipped tar +-archives and can be handled in the usual way using tar and the bzip2 +-program. The InfoZIP unzip program can be +-used to handle the ZIP archives if desired. The .tar.bz2 archives provide the +-best compression and fastest download times.

+- +-

Windows users can use the ZIP archives since those are customary on that +-platform. These are created on Unix using the InfoZIP zip program.

+- +- +-

Problems

+- +-

If you have comments or suggestions for the Python documentation, please send +-email to docs@python.org.

+-{% endblock %} +diff -r ee879c0ffa11 Doc/tools/sphinxext/indexcontent.html +--- a/Doc/tools/sphinxext/indexcontent.html ++++ /dev/null +@@ -1,59 +0,0 @@ +-{% extends "defindex.html" %} +-{% block tables %} +-

Parts of the documentation:

+- +- +-
+- +- +- +- +- +- +- +- +- +- +- +- +-
+- +-

Indices and tables:

+- +- +-
+- +- +- +- +- +- +-
+- +-

Meta information:

+- +- +-
+- +- +- +- +- +-
+-{% endblock %} +diff -r ee879c0ffa11 Doc/tools/sphinxext/indexsidebar.html +--- a/Doc/tools/sphinxext/indexsidebar.html ++++ /dev/null +@@ -1,17 +0,0 @@ +-

Download

+-

Download these documents

+-

Docs for other versions

+- +- +-

Other resources

+- +diff -r ee879c0ffa11 Doc/tools/sphinxext/layout.html +--- a/Doc/tools/sphinxext/layout.html ++++ /dev/null +@@ -1,51 +0,0 @@ +-{% extends "!layout.html" %} +-{% block rootrellink %} +-
  • +-
  • Python{{ reldelim1 }}
  • +-
  • +- {%- if versionswitcher is defined %} +- {{ release }} +- Documentation{{ reldelim1 }} +- {%- else %} +- {{ shorttitle }}{{ reldelim1 }} +- {%- endif %} +-
  • +-{% endblock %} +-{% block relbar1 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %} +-{% block relbar2 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %} +-{% block extrahead %} +- +- {% if not embedded %}{% endif %} +- {% if versionswitcher is defined and not embedded %}{% endif %} +-{{ super() }} +- {% if builder == 'qthelp' %} +- +- {% endif %} +-{% endblock %} +-{% block footer %} +- +-{% endblock %} +-{% block sidebarsourcelink %} +-{%- if show_source and has_source and sourcename %} +-

    {{ _('This Page') }}

    +- +-{%- endif %} +-{% endblock %} +diff -r ee879c0ffa11 Doc/tools/sphinxext/opensearch.xml +--- a/Doc/tools/sphinxext/opensearch.xml ++++ /dev/null +@@ -1,4 +0,0 @@ +-{% extends "!opensearch.xml" %} +-{% block extra -%} +-http://www.python.org/images/favicon16x16.ico +-{%- endblock %} +diff -r ee879c0ffa11 Doc/tools/sphinxext/patchlevel.py +--- a/Doc/tools/sphinxext/patchlevel.py ++++ /dev/null +@@ -1,71 +0,0 @@ +-# -*- coding: utf-8 -*- +-""" +- patchlevel.py +- ~~~~~~~~~~~~~ +- +- Extract version info from Include/patchlevel.h. +- Adapted from Doc/tools/getversioninfo. +- +- :copyright: 2007-2008 by Georg Brandl. +- :license: Python license. +-""" +- +-import os +-import re +-import sys +- +-def get_header_version_info(srcdir): +- patchlevel_h = os.path.join(srcdir, '..', 'Include', 'patchlevel.h') +- +- # This won't pick out all #defines, but it will pick up the ones we +- # care about. +- rx = re.compile(r'\s*#define\s+([a-zA-Z][a-zA-Z_0-9]*)\s+([a-zA-Z_0-9]+)') +- +- d = {} +- f = open(patchlevel_h) +- try: +- for line in f: +- m = rx.match(line) +- if m is not None: +- name, value = m.group(1, 2) +- d[name] = value +- finally: +- f.close() +- +- release = version = '%s.%s' % (d['PY_MAJOR_VERSION'], d['PY_MINOR_VERSION']) +- micro = int(d['PY_MICRO_VERSION']) +- if micro != 0: +- release += '.' + str(micro) +- +- level = d['PY_RELEASE_LEVEL'] +- suffixes = { +- 'PY_RELEASE_LEVEL_ALPHA': 'a', +- 'PY_RELEASE_LEVEL_BETA': 'b', +- 'PY_RELEASE_LEVEL_GAMMA': 'rc', +- } +- if level != 'PY_RELEASE_LEVEL_FINAL': +- release += suffixes[level] + str(int(d['PY_RELEASE_SERIAL'])) +- return version, release +- +- +-def get_sys_version_info(): +- major, minor, micro, level, serial = sys.version_info +- release = version = '%s.%s' % (major, minor) +- if micro: +- release += '.%s' % micro +- if level != 'final': +- release += '%s%s' % (level[0], serial) +- return version, release +- +- +-def get_version_info(): +- try: +- return get_header_version_info('.') +- except (IOError, OSError): +- version, release = get_sys_version_info() +- print >>sys.stderr, 'Can\'t get version info from Include/patchlevel.h, ' \ +- 'using version of this interpreter (%s).' % release +- return version, release +- +-if __name__ == '__main__': +- print get_header_version_info('.')[1] +diff -r ee879c0ffa11 Doc/tools/sphinxext/pyspecific.py +--- a/Doc/tools/sphinxext/pyspecific.py ++++ /dev/null +@@ -1,307 +0,0 @@ +-# -*- coding: utf-8 -*- +-""" +- pyspecific.py +- ~~~~~~~~~~~~~ +- +- Sphinx extension with Python doc-specific markup. +- +- :copyright: 2008-2013 by Georg Brandl. +- :license: Python license. +-""" +- +-ISSUE_URI = 'http://bugs.python.org/issue%s' +-SOURCE_URI = 'http://hg.python.org/cpython/file/2.7/%s' +- +-from docutils import nodes, utils +- +-import sphinx +-from sphinx.util.nodes import split_explicit_title +-from sphinx.writers.html import HTMLTranslator +-from sphinx.writers.latex import LaTeXTranslator +-from sphinx.locale import versionlabels +- +-# monkey-patch reST parser to disable alphabetic and roman enumerated lists +-from docutils.parsers.rst.states import Body +-Body.enum.converters['loweralpha'] = \ +- Body.enum.converters['upperalpha'] = \ +- Body.enum.converters['lowerroman'] = \ +- Body.enum.converters['upperroman'] = lambda x: None +- +-if sphinx.__version__[:3] < '1.2': +- # monkey-patch HTML translator to give versionmodified paragraphs a class +- def new_visit_versionmodified(self, node): +- self.body.append(self.starttag(node, 'p', CLASS=node['type'])) +- text = versionlabels[node['type']] % node['version'] +- if len(node): +- text += ': ' +- else: +- text += '.' +- self.body.append('%s' % text) +- HTMLTranslator.visit_versionmodified = new_visit_versionmodified +- +-# monkey-patch HTML and LaTeX translators to keep doctest blocks in the +-# doctest docs themselves +-orig_visit_literal_block = HTMLTranslator.visit_literal_block +-def new_visit_literal_block(self, node): +- meta = self.builder.env.metadata[self.builder.current_docname] +- old_trim_doctest_flags = self.highlighter.trim_doctest_flags +- if 'keepdoctest' in meta: +- self.highlighter.trim_doctest_flags = False +- try: +- orig_visit_literal_block(self, node) +- finally: +- self.highlighter.trim_doctest_flags = old_trim_doctest_flags +- +-HTMLTranslator.visit_literal_block = new_visit_literal_block +- +-orig_depart_literal_block = LaTeXTranslator.depart_literal_block +-def new_depart_literal_block(self, node): +- meta = self.builder.env.metadata[self.curfilestack[-1]] +- old_trim_doctest_flags = self.highlighter.trim_doctest_flags +- if 'keepdoctest' in meta: +- self.highlighter.trim_doctest_flags = False +- try: +- orig_depart_literal_block(self, node) +- finally: +- self.highlighter.trim_doctest_flags = old_trim_doctest_flags +- +-LaTeXTranslator.depart_literal_block = new_depart_literal_block +- +-# Support for marking up and linking to bugs.python.org issues +- +-def issue_role(typ, rawtext, text, lineno, inliner, options={}, content=[]): +- issue = utils.unescape(text) +- text = 'issue ' + issue +- refnode = nodes.reference(text, text, refuri=ISSUE_URI % issue) +- return [refnode], [] +- +- +-# Support for linking to Python source files easily +- +-def source_role(typ, rawtext, text, lineno, inliner, options={}, content=[]): +- has_t, title, target = split_explicit_title(text) +- title = utils.unescape(title) +- target = utils.unescape(target) +- refnode = nodes.reference(title, title, refuri=SOURCE_URI % target) +- return [refnode], [] +- +- +-# Support for marking up implementation details +- +-from sphinx.util.compat import Directive +- +-class ImplementationDetail(Directive): +- +- has_content = True +- required_arguments = 0 +- optional_arguments = 1 +- final_argument_whitespace = True +- +- def run(self): +- pnode = nodes.compound(classes=['impl-detail']) +- content = self.content +- add_text = nodes.strong('CPython implementation detail:', +- 'CPython implementation detail:') +- if self.arguments: +- n, m = self.state.inline_text(self.arguments[0], self.lineno) +- pnode.append(nodes.paragraph('', '', *(n + m))) +- self.state.nested_parse(content, self.content_offset, pnode) +- if pnode.children and isinstance(pnode[0], nodes.paragraph): +- pnode[0].insert(0, add_text) +- pnode[0].insert(1, nodes.Text(' ')) +- else: +- pnode.insert(0, nodes.paragraph('', '', add_text)) +- return [pnode] +- +- +-# Support for documenting decorators +- +-from sphinx import addnodes +-from sphinx.domains.python import PyModulelevel, PyClassmember +- +-class PyDecoratorMixin(object): +- def handle_signature(self, sig, signode): +- ret = super(PyDecoratorMixin, self).handle_signature(sig, signode) +- signode.insert(0, addnodes.desc_addname('@', '@')) +- return ret +- +- def needs_arglist(self): +- return False +- +-class PyDecoratorFunction(PyDecoratorMixin, PyModulelevel): +- def run(self): +- # a decorator function is a function after all +- self.name = 'py:function' +- return PyModulelevel.run(self) +- +-class PyDecoratorMethod(PyDecoratorMixin, PyClassmember): +- def run(self): +- self.name = 'py:method' +- return PyClassmember.run(self) +- +- +-# Support for documenting version of removal in deprecations +- +-from sphinx.locale import versionlabels +-from sphinx.util.compat import Directive +- +-versionlabels['deprecated-removed'] = \ +- 'Deprecated since version %s, will be removed in version %s' +- +-class DeprecatedRemoved(Directive): +- has_content = True +- required_arguments = 2 +- optional_arguments = 1 +- final_argument_whitespace = True +- option_spec = {} +- +- def run(self): +- node = addnodes.versionmodified() +- node.document = self.state.document +- node['type'] = 'deprecated-removed' +- version = (self.arguments[0], self.arguments[1]) +- node['version'] = version +- if len(self.arguments) == 3: +- inodes, messages = self.state.inline_text(self.arguments[2], +- self.lineno+1) +- node.extend(inodes) +- if self.content: +- self.state.nested_parse(self.content, self.content_offset, node) +- ret = [node] + messages +- else: +- ret = [node] +- env = self.state.document.settings.env +- env.note_versionchange('deprecated', version[0], node, self.lineno) +- return ret +- +- +-# Support for building "topic help" for pydoc +- +-pydoc_topic_labels = [ +- 'assert', 'assignment', 'atom-identifiers', 'atom-literals', +- 'attribute-access', 'attribute-references', 'augassign', 'binary', +- 'bitwise', 'bltin-code-objects', 'bltin-ellipsis-object', +- 'bltin-null-object', 'bltin-type-objects', 'booleans', +- 'break', 'callable-types', 'calls', 'class', 'comparisons', 'compound', +- 'context-managers', 'continue', 'conversions', 'customization', 'debugger', +- 'del', 'dict', 'dynamic-features', 'else', 'exceptions', 'exec', 'execmodel', +- 'exprlists', 'floating', 'for', 'formatstrings', 'function', 'global', +- 'id-classes', 'identifiers', 'if', 'imaginary', 'import', 'in', 'integers', +- 'lambda', 'lists', 'naming', 'numbers', 'numeric-types', +- 'objects', 'operator-summary', 'pass', 'power', 'print', 'raise', 'return', +- 'sequence-types', 'shifting', 'slicings', 'specialattrs', 'specialnames', +- 'string-methods', 'strings', 'subscriptions', 'truth', 'try', 'types', +- 'typesfunctions', 'typesmapping', 'typesmethods', 'typesmodules', +- 'typesseq', 'typesseq-mutable', 'unary', 'while', 'with', 'yield' +-] +- +-from os import path +-from time import asctime +-from pprint import pformat +-from docutils.io import StringOutput +-from docutils.utils import new_document +- +-from sphinx.builders import Builder +-from sphinx.writers.text import TextWriter +- +- +-class PydocTopicsBuilder(Builder): +- name = 'pydoc-topics' +- +- def init(self): +- self.topics = {} +- +- def get_outdated_docs(self): +- return 'all pydoc topics' +- +- def get_target_uri(self, docname, typ=None): +- return '' # no URIs +- +- def write(self, *ignored): +- writer = TextWriter(self) +- for label in self.status_iterator(pydoc_topic_labels, +- 'building topics... ', +- length=len(pydoc_topic_labels)): +- if label not in self.env.domaindata['std']['labels']: +- self.warn('label %r not in documentation' % label) +- continue +- docname, labelid, sectname = self.env.domaindata['std']['labels'][label] +- doctree = self.env.get_and_resolve_doctree(docname, self) +- document = new_document('
    ') +- document.append(doctree.ids[labelid]) +- destination = StringOutput(encoding='utf-8') +- writer.write(document, destination) +- self.topics[label] = str(writer.output) +- +- def finish(self): +- f = open(path.join(self.outdir, 'topics.py'), 'w') +- try: +- f.write('# Autogenerated by Sphinx on %s\n' % asctime()) +- f.write('topics = ' + pformat(self.topics) + '\n') +- finally: +- f.close() +- +- +-# Support for checking for suspicious markup +- +-import suspicious +- +- +-# Support for documenting Opcodes +- +-import re +- +-opcode_sig_re = re.compile(r'(\w+(?:\+\d)?)(?:\s*\((.*)\))?') +- +-def parse_opcode_signature(env, sig, signode): +- """Transform an opcode signature into RST nodes.""" +- m = opcode_sig_re.match(sig) +- if m is None: +- raise ValueError +- opname, arglist = m.groups() +- signode += addnodes.desc_name(opname, opname) +- if arglist is not None: +- paramlist = addnodes.desc_parameterlist() +- signode += paramlist +- paramlist += addnodes.desc_parameter(arglist, arglist) +- return opname.strip() +- +- +-# Support for documenting pdb commands +- +-pdbcmd_sig_re = re.compile(r'([a-z()!]+)\s*(.*)') +- +-# later... +-#pdbargs_tokens_re = re.compile(r'''[a-zA-Z]+ | # identifiers +-# [.,:]+ | # punctuation +-# [\[\]()] | # parens +-# \s+ # whitespace +-# ''', re.X) +- +-def parse_pdb_command(env, sig, signode): +- """Transform a pdb command signature into RST nodes.""" +- m = pdbcmd_sig_re.match(sig) +- if m is None: +- raise ValueError +- name, args = m.groups() +- fullname = name.replace('(', '').replace(')', '') +- signode += addnodes.desc_name(name, name) +- if args: +- signode += addnodes.desc_addname(' '+args, ' '+args) +- return fullname +- +- +-def setup(app): +- app.add_role('issue', issue_role) +- app.add_role('source', source_role) +- app.add_directive('impl-detail', ImplementationDetail) +- app.add_directive('deprecated-removed', DeprecatedRemoved) +- app.add_builder(PydocTopicsBuilder) +- app.add_builder(suspicious.CheckSuspiciousMarkupBuilder) +- app.add_description_unit('opcode', 'opcode', '%s (opcode)', +- parse_opcode_signature) +- app.add_description_unit('pdbcommand', 'pdbcmd', '%s (pdb command)', +- parse_pdb_command) +- app.add_description_unit('2to3fixer', '2to3fixer', '%s (2to3 fixer)') +- app.add_directive_to_domain('py', 'decorator', PyDecoratorFunction) +- app.add_directive_to_domain('py', 'decoratormethod', PyDecoratorMethod) +diff -r ee879c0ffa11 Doc/tools/sphinxext/static/basic.css +--- a/Doc/tools/sphinxext/static/basic.css ++++ /dev/null +@@ -1,445 +0,0 @@ +-/** +- * Sphinx stylesheet -- basic theme +- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +- */ +- +-/* -- main layout ----------------------------------------------------------- */ +- +-div.clearer { +- clear: both; +-} +- +-/* -- relbar ---------------------------------------------------------------- */ +- +-div.related { +- width: 100%; +- font-size: 90%; +-} +- +-div.related h3 { +- display: none; +-} +- +-div.related ul { +- margin: 0; +- padding: 0 0 0 10px; +- list-style: none; +-} +- +-div.related li { +- display: inline; +-} +- +-div.related li.right { +- float: right; +- margin-right: 5px; +-} +- +-/* -- sidebar --------------------------------------------------------------- */ +- +-div.sphinxsidebarwrapper { +- position: relative; +- top: 0; +- padding: 10px 5px 0 10px; +- word-wrap: break-word; +-} +- +-div.sphinxsidebar { +- float: left; +- width: 230px; +- margin-left: -100%; +- font-size: 90%; +-} +- +-div.sphinxsidebar ul { +- list-style: none; +-} +- +-div.sphinxsidebar ul ul, +-div.sphinxsidebar ul.want-points { +- margin-left: 20px; +- list-style: square; +-} +- +-div.sphinxsidebar ul ul { +- margin-top: 0; +- margin-bottom: 0; +-} +- +-div.sphinxsidebar form { +- margin-top: 10px; +-} +- +-div.sphinxsidebar input { +- border: 1px solid #98dbcc; +- font-family: sans-serif; +- font-size: 1em; +-} +- +-img { +- border: 0; +-} +- +-/* -- search page ----------------------------------------------------------- */ +- +-ul.search { +- margin: 10px 0 0 20px; +- padding: 0; +-} +- +-ul.search li { +- padding: 5px 0 5px 20px; +- background-image: url(file.png); +- background-repeat: no-repeat; +- background-position: 0 7px; +-} +- +-ul.search li a { +- font-weight: bold; +-} +- +-ul.search li div.context { +- color: #888; +- margin: 2px 0 0 30px; +- text-align: left; +-} +- +-ul.keywordmatches li.goodmatch a { +- font-weight: bold; +-} +- +-/* -- index page ------------------------------------------------------------ */ +- +-table.contentstable { +- width: 90%; +-} +- +-table.contentstable p.biglink { +- line-height: 150%; +-} +- +-a.biglink { +- font-size: 1.3em; +-} +- +-span.linkdescr { +- font-style: italic; +- padding-top: 5px; +- font-size: 90%; +-} +- +-/* -- general index --------------------------------------------------------- */ +- +-table.indextable td { +- text-align: left; +- vertical-align: top; +-} +- +-table.indextable dl, table.indextable dd { +- margin-top: 0; +- margin-bottom: 0; +-} +- +-table.indextable tr.pcap { +- height: 10px; +-} +- +-table.indextable tr.cap { +- margin-top: 10px; +- background-color: #f2f2f2; +-} +- +-img.toggler { +- margin-right: 3px; +- margin-top: 3px; +- cursor: pointer; +-} +- +-/* -- general body styles --------------------------------------------------- */ +- +-a.headerlink { +- visibility: hidden; +-} +- +-h1:hover > a.headerlink, +-h2:hover > a.headerlink, +-h3:hover > a.headerlink, +-h4:hover > a.headerlink, +-h5:hover > a.headerlink, +-h6:hover > a.headerlink, +-dt:hover > a.headerlink { +- visibility: visible; +-} +- +-div.body p.caption { +- text-align: inherit; +-} +- +-div.body td { +- text-align: left; +-} +- +-.field-list ul { +- padding-left: 1em; +-} +- +-.first { +- margin-top: 0 !important; +-} +- +-p.rubric { +- margin-top: 30px; +- font-weight: bold; +-} +- +-/* -- sidebars -------------------------------------------------------------- */ +- +-div.sidebar { +- margin: 0 0 0.5em 1em; +- border: 1px solid #ddb; +- padding: 7px 7px 0 7px; +- background-color: #ffe; +- width: 40%; +- float: right; +-} +- +-p.sidebar-title { +- font-weight: bold; +-} +- +-/* -- topics ---------------------------------------------------------------- */ +- +-div.topic { +- border: 1px solid #ccc; +- padding: 7px 7px 0 7px; +- margin: 10px 0 10px 0; +-} +- +-p.topic-title { +- font-size: 1.1em; +- font-weight: bold; +- margin-top: 10px; +-} +- +-/* -- admonitions ----------------------------------------------------------- */ +- +-div.admonition { +- margin-top: 10px; +- margin-bottom: 10px; +- padding: 7px; +-} +- +-div.admonition dt { +- font-weight: bold; +-} +- +-div.admonition dl { +- margin-bottom: 0; +-} +- +-p.admonition-title { +- margin: 0px 10px 5px 0px; +- font-weight: bold; +-} +- +-div.body p.centered { +- text-align: center; +- margin-top: 25px; +-} +- +-/* -- tables ---------------------------------------------------------------- */ +- +-table.docutils { +- border: 0 solid #dce; +- border-collapse: collapse; +-} +- +-table.docutils td, table.docutils th { +- padding: 2px 5px 2px 5px; +- border-left: 0; +- background-color: #eef; +-} +- +-table.docutils td p.last, table.docutils th p.last { +- margin-bottom: 0; +-} +- +-table.field-list td, table.field-list th { +- border: 0 !important; +-} +- +-table.footnote td, table.footnote th { +- border: 0 !important; +-} +- +-table.docutils th { +- border-top: 1px solid #cac; +- background-color: #ede; +-} +- +-th { +- text-align: left; +- padding-right: 5px; +-} +- +-th.head { +- text-align: center; +-} +- +-/* -- other body styles ----------------------------------------------------- */ +- +-dl { +- margin-bottom: 15px; +-} +- +-dd p { +- margin-top: 0px; +-} +- +-dd ul, dd table { +- margin-bottom: 10px; +-} +- +-dd { +- margin-top: 3px; +- margin-bottom: 10px; +- margin-left: 30px; +-} +- +-dt:target, .highlight { +- background-color: #fbe54e; +-} +- +-dl.glossary dt { +- font-weight: bold; +- font-size: 1.1em; +-} +- +-.field-list ul { +- margin: 0; +- padding-left: 1em; +-} +- +-.field-list p { +- margin: 0; +-} +- +-.refcount { +- color: #060; +-} +- +-.optional { +- font-size: 1.3em; +-} +- +-.versionmodified { +- font-style: italic; +-} +- +-.deprecated { +- background-color: #ffe4e4; +- border: 1px solid #f66; +- padding: 7px; +-} +- +-div.deprecated p { +- margin-bottom: 0; +-} +- +-.system-message { +- background-color: #fda; +- padding: 5px; +- border: 3px solid red; +-} +- +-.footnote:target { +- background-color: #ffa; +-} +- +-.impl-detail { +- margin-top: 10px; +- margin-bottom: 10px; +- padding: 7px; +- border: 1px solid #ccc; +-} +- +-.impl-detail .compound-first { +- margin-top: 0; +-} +- +-.impl-detail .compound-last { +- margin-bottom: 0; +-} +- +-/* -- code displays --------------------------------------------------------- */ +- +-pre { +- overflow: auto; +- overflow-y: hidden; +-} +- +-td.linenos pre { +- padding: 5px 0px; +- border: 0; +- background-color: transparent; +- color: #aaa; +-} +- +-table.highlighttable { +- margin-left: 0.5em; +-} +- +-table.highlighttable td { +- padding: 0 0.5em 0 0.5em; +-} +- +-tt.descname { +- background-color: transparent; +- font-weight: bold; +- font-size: 1.2em; +-} +- +-tt.descclassname { +- background-color: transparent; +-} +- +-tt.xref, a tt { +- background-color: transparent; +- font-weight: bold; +-} +- +-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt { +- background-color: transparent; +-} +- +-/* -- math display ---------------------------------------------------------- */ +- +-img.math { +- vertical-align: middle; +-} +- +-div.body div.math p { +- text-align: center; +-} +- +-span.eqno { +- float: right; +-} +- +-/* -- printout stylesheet --------------------------------------------------- */ +- +-@media print { +- div.document, +- div.documentwrapper, +- div.bodywrapper { +- margin: 0 !important; +- width: 100%; +- } +- +- div.sphinxsidebar, +- div.related, +- div.footer, +- #top-link { +- display: none; +- } +-} +diff -r ee879c0ffa11 Doc/tools/sphinxext/static/copybutton.js +--- a/Doc/tools/sphinxext/static/copybutton.js ++++ /dev/null +@@ -1,56 +0,0 @@ +-$(document).ready(function() { +- /* Add a [>>>] button on the top-right corner of code samples to hide +- * the >>> and ... prompts and the output and thus make the code +- * copyable. */ +- var div = $('.highlight-python .highlight,' + +- '.highlight-python3 .highlight') +- var pre = div.find('pre'); +- +- // get the styles from the current theme +- pre.parent().parent().css('position', 'relative'); +- var hide_text = 'Hide the prompts and output'; +- var show_text = 'Show the prompts and output'; +- var border_width = pre.css('border-top-width'); +- var border_style = pre.css('border-top-style'); +- var border_color = pre.css('border-top-color'); +- var button_styles = { +- 'cursor':'pointer', 'position': 'absolute', 'top': '0', 'right': '0', +- 'border-color': border_color, 'border-style': border_style, +- 'border-width': border_width, 'color': border_color, 'text-size': '75%', +- 'font-family': 'monospace', 'padding-left': '0.2em', 'padding-right': '0.2em' +- } +- +- // create and add the button to all the code blocks that contain >>> +- div.each(function(index) { +- var jthis = $(this); +- if (jthis.find('.gp').length > 0) { +- var button = $('>>>'); +- button.css(button_styles) +- button.attr('title', hide_text); +- jthis.prepend(button); +- } +- // tracebacks (.gt) contain bare text elements that need to be +- // wrapped in a span to work with .nextUntil() (see later) +- jthis.find('pre:has(.gt)').contents().filter(function() { +- return ((this.nodeType == 3) && (this.data.trim().length > 0)); +- }).wrap(''); +- }); +- +- // define the behavior of the button when it's clicked +- $('.copybutton').toggle( +- function() { +- var button = $(this); +- button.parent().find('.go, .gp, .gt').hide(); +- button.next('pre').find('.gt').nextUntil('.gp, .go').css('visibility', 'hidden'); +- button.css('text-decoration', 'line-through'); +- button.attr('title', show_text); +- }, +- function() { +- var button = $(this); +- button.parent().find('.go, .gp, .gt').show(); +- button.next('pre').find('.gt').nextUntil('.gp, .go').css('visibility', 'visible'); +- button.css('text-decoration', 'none'); +- button.attr('title', hide_text); +- }); +-}); +- +diff -r ee879c0ffa11 Doc/tools/sphinxext/static/py.png +Binary file Doc/tools/sphinxext/static/py.png has changed +diff -r ee879c0ffa11 Doc/tools/sphinxext/static/sidebar.js +--- a/Doc/tools/sphinxext/static/sidebar.js ++++ /dev/null +@@ -1,186 +0,0 @@ +-/* +- * sidebar.js +- * ~~~~~~~~~~ +- * +- * This script makes the Sphinx sidebar collapsible and implements +- * intelligent scrolling. +- * +- * .sphinxsidebar contains .sphinxsidebarwrapper. This script adds +- * in .sphixsidebar, after .sphinxsidebarwrapper, the #sidebarbutton +- * used to collapse and expand the sidebar. +- * +- * When the sidebar is collapsed the .sphinxsidebarwrapper is hidden +- * and the width of the sidebar and the margin-left of the document +- * are decreased. When the sidebar is expanded the opposite happens. +- * This script saves a per-browser/per-session cookie used to +- * remember the position of the sidebar among the pages. +- * Once the browser is closed the cookie is deleted and the position +- * reset to the default (expanded). +- * +- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. +- * :license: BSD, see LICENSE for details. +- * +- */ +- +-$(function() { +- // global elements used by the functions. +- // the 'sidebarbutton' element is defined as global after its +- // creation, in the add_sidebar_button function +- var jwindow = $(window); +- var jdocument = $(document); +- var bodywrapper = $('.bodywrapper'); +- var sidebar = $('.sphinxsidebar'); +- var sidebarwrapper = $('.sphinxsidebarwrapper'); +- +- // original margin-left of the bodywrapper and width of the sidebar +- // with the sidebar expanded +- var bw_margin_expanded = bodywrapper.css('margin-left'); +- var ssb_width_expanded = sidebar.width(); +- +- // margin-left of the bodywrapper and width of the sidebar +- // with the sidebar collapsed +- var bw_margin_collapsed = '.8em'; +- var ssb_width_collapsed = '.8em'; +- +- // colors used by the current theme +- var dark_color = $('.related').css('background-color'); +- var light_color = $('.document').css('background-color'); +- +- function get_viewport_height() { +- if (window.innerHeight) +- return window.innerHeight; +- else +- return jwindow.height(); +- } +- +- function sidebar_is_collapsed() { +- return sidebarwrapper.is(':not(:visible)'); +- } +- +- function toggle_sidebar() { +- if (sidebar_is_collapsed()) +- expand_sidebar(); +- else +- collapse_sidebar(); +- // adjust the scrolling of the sidebar +- scroll_sidebar(); +- } +- +- function collapse_sidebar() { +- sidebarwrapper.hide(); +- sidebar.css('width', ssb_width_collapsed); +- bodywrapper.css('margin-left', bw_margin_collapsed); +- sidebarbutton.css({ +- 'margin-left': '0', +- 'height': bodywrapper.height() +- }); +- sidebarbutton.find('span').text('»'); +- sidebarbutton.attr('title', _('Expand sidebar')); +- document.cookie = 'sidebar=collapsed'; +- } +- +- function expand_sidebar() { +- bodywrapper.css('margin-left', bw_margin_expanded); +- sidebar.css('width', ssb_width_expanded); +- sidebarwrapper.show(); +- sidebarbutton.css({ +- 'margin-left': ssb_width_expanded-12, +- 'height': bodywrapper.height() +- }); +- sidebarbutton.find('span').text('«'); +- sidebarbutton.attr('title', _('Collapse sidebar')); +- document.cookie = 'sidebar=expanded'; +- } +- +- function add_sidebar_button() { +- sidebarwrapper.css({ +- 'float': 'left', +- 'margin-right': '0', +- 'width': ssb_width_expanded - 28 +- }); +- // create the button +- sidebar.append( +- '
    «
    ' +- ); +- var sidebarbutton = $('#sidebarbutton'); +- light_color = sidebarbutton.css('background-color'); +- // find the height of the viewport to center the '<<' in the page +- var viewport_height = get_viewport_height(); +- sidebarbutton.find('span').css({ +- 'display': 'block', +- 'margin-top': (viewport_height - sidebar.position().top - 20) / 2 +- }); +- +- sidebarbutton.click(toggle_sidebar); +- sidebarbutton.attr('title', _('Collapse sidebar')); +- sidebarbutton.css({ +- 'color': '#FFFFFF', +- 'border-left': '1px solid ' + dark_color, +- 'font-size': '1.2em', +- 'cursor': 'pointer', +- 'height': bodywrapper.height(), +- 'padding-top': '1px', +- 'margin-left': ssb_width_expanded - 12 +- }); +- +- sidebarbutton.hover( +- function () { +- $(this).css('background-color', dark_color); +- }, +- function () { +- $(this).css('background-color', light_color); +- } +- ); +- } +- +- function set_position_from_cookie() { +- if (!document.cookie) +- return; +- var items = document.cookie.split(';'); +- for(var k=0; k wintop && curbot > winbot) { +- sidebarwrapper.css('top', $u.max([wintop - offset - 10, 0])); +- } +- else if (curtop < wintop && curbot < winbot) { +- sidebarwrapper.css('top', $u.min([winbot - sidebar_height - offset - 20, +- jdocument.height() - sidebar_height - 200])); +- } +- } +- } +- jwindow.scroll(scroll_sidebar); +-}); +diff -r ee879c0ffa11 Doc/tools/sphinxext/static/version_switch.js +--- a/Doc/tools/sphinxext/static/version_switch.js ++++ /dev/null +@@ -1,67 +0,0 @@ +-(function() { +- 'use strict'; +- +- var all_versions = { +- '3.5': 'dev (3.5)', +- '3.4': '3.4', +- '3.3': '3.3', +- '3.2': '3.2', +- '2.7': '2.7', +- '2.6': '2.6' +- }; +- +- function build_select(current_version, current_release) { +- var buf = [''); +- return buf.join(''); +- } +- +- function patch_url(url, new_version) { +- var url_re = /\.org\/(\d|py3k|dev|((release\/)?\d\.\d[\w\d\.]*))\//, +- new_url = url.replace(url_re, '.org/' + new_version + '/'); +- +- if (new_url == url && !new_url.match(url_re)) { +- // python 2 url without version? +- new_url = url.replace(/\.org\//, '.org/' + new_version + '/'); +- } +- return new_url; +- } +- +- function on_switch() { +- var selected = $(this).children('option:selected').attr('value'); +- +- var url = window.location.href, +- new_url = patch_url(url, selected); +- +- if (new_url != url) { +- // check beforehand if url exists, else redirect to version's start page +- $.ajax({ +- url: new_url, +- success: function() { +- window.location.href = new_url; +- }, +- error: function() { +- window.location.href = 'http://docs.python.org/' + selected; +- } +- }); +- } +- } +- +- $(document).ready(function() { +- var release = DOCUMENTATION_OPTIONS.VERSION; +- var version = release.substr(0, 3); +- var select = build_select(version, release); +- +- $('.version_switcher_placeholder').html(select); +- $('.version_switcher_placeholder select').bind('change', on_switch); +- }); +-})(); +diff -r ee879c0ffa11 Doc/tools/sphinxext/susp-ignored.csv +--- a/Doc/tools/sphinxext/susp-ignored.csv ++++ /dev/null +@@ -1,186 +0,0 @@ +-c-api/arg,,:ref,"PyArg_ParseTuple(args, ""O|O:ref"", &object, &callback)" +-c-api/list,,:high,list[low:high] +-c-api/sequence,,:i2,o[i1:i2] +-c-api/unicode,,:end,str[start:end] +-distutils/setupscript,,::, +-extending/embedding,,:numargs,"if(!PyArg_ParseTuple(args, "":numargs""))" +-extending/extending,,:set,"if (PyArg_ParseTuple(args, ""O:set_callback"", &temp)) {" +-extending/extending,,:myfunction,"PyArg_ParseTuple(args, ""D:myfunction"", &c);" +-extending/newtypes,,:call,"if (!PyArg_ParseTuple(args, ""sss:call"", &arg1, &arg2, &arg3)) {" +-extending/windows,,:initspam,/export:initspam +-faq/programming,,:reduce,"print (lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y," +-faq/programming,,:reduce,"Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro," +-faq/programming,,:chr,">=4.0) or 1+f(xc,yc,x*x-y*y+xc,2.0*x*y+yc,k-1,f):f(xc,yc,x,y,k,f):chr(" +-faq/programming,,::,for x in sequence[::-1]: +-howto/cporting,,:encode,"if (!PyArg_ParseTuple(args, ""O:encode_object"", &myobj))" +-howto/cporting,,:say,"if (!PyArg_ParseTuple(args, ""U:say_hello"", &name))" +-howto/curses,,:black,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" +-howto/curses,,:blue,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" +-howto/curses,,:cyan,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" +-howto/curses,,:green,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" +-howto/curses,,:magenta,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" +-howto/curses,,:red,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" +-howto/curses,,:white,"7:white." +-howto/curses,,:yellow,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" +-howto/logging,,:root,WARNING:root:Watch out! +-howto/logging,,:Watch,WARNING:root:Watch out! +-howto/logging,,:root,DEBUG:root:This message should go to the log file +-howto/logging,,:root,INFO:root:So should this +-howto/logging,,:So,INFO:root:So should this +-howto/logging,,:root,"WARNING:root:And this, too" +-howto/logging,,:And,"WARNING:root:And this, too" +-howto/logging,,:root,INFO:root:Started +-howto/logging,,:Started,INFO:root:Started +-howto/logging,,:root,INFO:root:Doing something +-howto/logging,,:Doing,INFO:root:Doing something +-howto/logging,,:root,INFO:root:Finished +-howto/logging,,:Finished,INFO:root:Finished +-howto/logging,,:root,WARNING:root:Look before you leap! +-howto/logging,,:Look,WARNING:root:Look before you leap! +-howto/logging,,:This,DEBUG:This message should appear on the console +-howto/logging,,:So,INFO:So should this +-howto/logging,,:And,"WARNING:And this, too" +-howto/logging,,:logger,severity:logger name:message +-howto/logging,,:message,severity:logger name:message +-howto/logging,,:This,DEBUG:root:This message should go to the log file +-howto/pyporting,,::,Programming Language :: Python :: 2 +-howto/pyporting,,::,Programming Language :: Python :: 3 +-howto/regex,,::, +-howto/regex,,:foo,(?:foo) +-howto/urllib2,,:example,"for example ""joe@password:example.com""" +-library/audioop,,:ipos,"# factor = audioop.findfactor(in_test[ipos*2:ipos*2+len(out_test)]," +-library/bisect,,:hi,all(val >= x for val in a[i:hi]) +-library/bisect,,:hi,all(val > x for val in a[i:hi]) +-library/cookie,,`,!#$%&'*+-.^_`|~ +-library/datetime,,:MM, +-library/datetime,,:SS, +-library/decimal,,:optional,"trailneg:optional trailing minus indicator" +-library/difflib,,:ahi,a[alo:ahi] +-library/difflib,,:bhi,b[blo:bhi] +-library/difflib,,:i2, +-library/difflib,,:j2, +-library/difflib,,:i1, +-library/dis,,:TOS, +-library/dis,,`,TOS = `TOS` +-library/doctest,,`,``factorial`` from the ``example`` module: +-library/doctest,,`,The ``example`` module +-library/doctest,,`,Using ``factorial`` +-library/exceptions,,:err,err.object[err.start:err.end] +-library/functions,,:step,a[start:stop:step] +-library/functions,,:stop,"a[start:stop, i]" +-library/functions,,:stop,a[start:stop:step] +-library/hotshot,,:lineno,"ncalls tottime percall cumtime percall filename:lineno(function)" +-library/httplib,,:port,host:port +-library/imaplib,,:MM,"""DD-Mmm-YYYY HH:MM:SS" +-library/imaplib,,:SS,"""DD-Mmm-YYYY HH:MM:SS" +-library/itertools,,:stop,elements from seq[start:stop:step] +-library/itertools,,:step,elements from seq[start:stop:step] +-library/linecache,,:sys,"sys:x:3:3:sys:/dev:/bin/sh" +-library/logging.handlers,,:port,host:port +-library/mmap,,:i2,obj[i1:i2] +-library/multiprocessing,,:queue,">>> QueueManager.register('get_queue', callable=lambda:queue)" +-library/multiprocessing,,`,">>> l._callmethod('__getitem__', (20,)) # equiv to `l[20]`" +-library/multiprocessing,,`,">>> l._callmethod('__getslice__', (2, 7)) # equiv to `l[2:7]`" +-library/multiprocessing,,`,# `BaseManager`. +-library/multiprocessing,,`,# `Pool.imap()` (which will save on the amount of code needed anyway). +-library/multiprocessing,,`,# A test file for the `multiprocessing` package +-library/multiprocessing,,`,# A test of `multiprocessing.Pool` class +-library/multiprocessing,,`,# Add more tasks using `put()` +-library/multiprocessing,,`,# in the original order then consider using `Pool.map()` or +-library/multiprocessing,,`,# Not sure if we should synchronize access to `socket.accept()` method by +-library/multiprocessing,,`,# object. (We import `multiprocessing.reduction` to enable this pickling.) +-library/multiprocessing,,`,# register the Foo class; make `f()` and `g()` accessible via proxy +-library/multiprocessing,,`,# register the Foo class; make `g()` and `_h()` accessible via proxy +-library/multiprocessing,,`,# register the generator function baz; use `GeneratorProxy` to make proxies +-library/optparse,,:len,"del parser.rargs[:len(value)]" +-library/os.path,,:foo,c:foo +-library/pdb,,:lineno,filename:lineno +-library/posix,,`,"CFLAGS=""`getconf LFS_CFLAGS`"" OPT=""-g -O2 $CFLAGS""" +-library/profile,,:lineno,ncalls tottime percall cumtime percall filename:lineno(function) +-library/profile,,:lineno,filename:lineno(function) +-library/pyexpat,,:elem1, +-library/pyexpat,,:py,"xmlns:py = ""http://www.python.org/ns/"">" +-library/smtplib,,:port,method must support that as well as a regular host:port +-library/socket,,::,'5aef:2b::8' +-library/socket,,::,"(10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))]" +-library/sqlite3,,:memory, +-library/sqlite3,,:who,"cur.execute(""select * from people where name_last=:who and age=:age"", {""who"": who, ""age"": age})" +-library/sqlite3,,:age,"cur.execute(""select * from people where name_last=:who and age=:age"", {""who"": who, ""age"": age})" +-library/ssl,,:My,"Organization Name (eg, company) [Internet Widgits Pty Ltd]:My Organization, Inc." +-library/ssl,,:My,"Organizational Unit Name (eg, section) []:My Group" +-library/ssl,,:myserver,"Common Name (eg, YOUR name) []:myserver.mygroup.myorganization.com" +-library/ssl,,:MyState,State or Province Name (full name) [Some-State]:MyState +-library/ssl,,:ops,Email Address []:ops@myserver.mygroup.myorganization.com +-library/ssl,,:Some,"Locality Name (eg, city) []:Some City" +-library/ssl,,:US,Country Name (2 letter code) [AU]:US +-library/stdtypes,,:len,s[len(s):len(s)] +-library/stdtypes,,:end,s[start:end] +-library/string,,:end,s[start:end] +-library/subprocess,,`,"output=`mycmd myarg`" +-library/subprocess,,`,"output=`dmesg | grep hda`" +-library/tarfile,,:compression,filemode[:compression] +-library/tarfile,,:gz, +-library/tarfile,,:bz2, +-library/time,,:mm, +-library/time,,:ss, +-library/turtle,,::,Example:: +-library/urllib,,:port,:port +-library/urllib2,,:password,"""joe:password@python.org""" +-library/urllib2,,:close,Connection:close +-library/uuid,,:uuid,urn:uuid:12345678-1234-5678-1234-567812345678 +-library/xmlrpclib,,:pass,http://user:pass@host:port/path +-library/xmlrpclib,,:pass,user:pass +-library/xmlrpclib,,:port,http://user:pass@host:port/path +-license,,`,THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND +-license,,:zooko,mailto:zooko@zooko.com +-license,,`,THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +-license,,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY +-license,,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND +-license,,`,"``Software''), to deal in the Software without restriction, including" +-license,,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND," +-reference/datamodel,,:step,a[i:j:step] +-reference/datamodel,,:max, +-reference/expressions,,:index,x[index:index] +-reference/expressions,,`,`expressions...` +-reference/expressions,,`,"""`""" +-reference/grammar,,`,'`' testlist1 '`' +-reference/lexical_analysis,,:fileencoding,# vim:fileencoding= +-reference/lexical_analysis,,`,", : . ` = ;" +-tutorial/datastructures,,:value,key:value pairs within the braces adds initial key:value pairs +-tutorial/datastructures,,:value,It is also possible to delete a key:value +-tutorial/stdlib2,,:start,"fields = struct.unpack('>> urlparse.urlparse('http://[1080::8:800:200C:417A]/foo') +-whatsnew/2.7,,::,"ParseResult(scheme='http', netloc='[1080::8:800:200C:417A]'," +diff -r ee879c0ffa11 Doc/tools/sphinxext/suspicious.py +--- a/Doc/tools/sphinxext/suspicious.py ++++ /dev/null +@@ -1,254 +0,0 @@ +-""" +-Try to detect suspicious constructs, resembling markup +-that has leaked into the final output. +- +-Suspicious lines are reported in a comma-separated-file, +-``suspicious.csv``, located in the output directory. +- +-The file is utf-8 encoded, and each line contains four fields: +- +- * document name (normalized) +- * line number in the source document +- * problematic text +- * complete line showing the problematic text in context +- +-It is common to find many false positives. To avoid reporting them +-again and again, they may be added to the ``ignored.csv`` file +-(located in the configuration directory). The file has the same +-format as ``suspicious.csv`` with a few differences: +- +- - each line defines a rule; if the rule matches, the issue +- is ignored. +- - line number may be empty (that is, nothing between the +- commas: ",,"). In this case, line numbers are ignored (the +- rule matches anywhere in the file). +- - the last field does not have to be a complete line; some +- surrounding text (never more than a line) is enough for +- context. +- +-Rules are processed sequentially. A rule matches when: +- +- * document names are the same +- * problematic texts are the same +- * line numbers are close to each other (5 lines up or down) +- * the rule text is completely contained into the source line +- +-The simplest way to create the ignored.csv file is by copying +-undesired entries from suspicious.csv (possibly trimming the last +-field.) +- +-Copyright 2009 Gabriel A. Genellina +- +-""" +- +-import os +-import re +-import csv +-import sys +- +-from docutils import nodes +-from sphinx.builders import Builder +- +-detect_all = re.compile(ur''' +- ::(?=[^=])| # two :: (but NOT ::=) +- :[a-zA-Z][a-zA-Z0-9]+| # :foo +- `| # ` (seldom used by itself) +- (? don't care +- self.issue = issue # the markup fragment that triggered this rule +- self.line = line # text of the container element (single line only) +- self.used = False +- +- def __repr__(self): +- return '{0.docname},,{0.issue},{0.line}'.format(self) +- +- +- +-class dialect(csv.excel): +- """Our dialect: uses only linefeed as newline.""" +- lineterminator = '\n' +- +- +-class CheckSuspiciousMarkupBuilder(Builder): +- """ +- Checks for possibly invalid markup that may leak into the output. +- """ +- name = 'suspicious' +- +- def init(self): +- # create output file +- self.log_file_name = os.path.join(self.outdir, 'suspicious.csv') +- open(self.log_file_name, 'w').close() +- # load database of previously ignored issues +- self.load_rules(os.path.join(os.path.dirname(__file__), +- 'susp-ignored.csv')) +- +- def get_outdated_docs(self): +- return self.env.found_docs +- +- def get_target_uri(self, docname, typ=None): +- return '' +- +- def prepare_writing(self, docnames): +- pass +- +- def write_doc(self, docname, doctree): +- # set when any issue is encountered in this document +- self.any_issue = False +- self.docname = docname +- visitor = SuspiciousVisitor(doctree, self) +- doctree.walk(visitor) +- +- def finish(self): +- unused_rules = [rule for rule in self.rules if not rule.used] +- if unused_rules: +- self.warn('Found %s/%s unused rules:' % +- (len(unused_rules), len(self.rules))) +- for rule in unused_rules: +- self.info(repr(rule)) +- return +- +- def check_issue(self, line, lineno, issue): +- if not self.is_ignored(line, lineno, issue): +- self.report_issue(line, lineno, issue) +- +- def is_ignored(self, line, lineno, issue): +- """Determine whether this issue should be ignored.""" +- docname = self.docname +- for rule in self.rules: +- if rule.docname != docname: continue +- if rule.issue != issue: continue +- # Both lines must match *exactly*. This is rather strict, +- # and probably should be improved. +- # Doing fuzzy matches with levenshtein distance could work, +- # but that means bringing other libraries... +- # Ok, relax that requirement: just check if the rule fragment +- # is contained in the document line +- if rule.line not in line: continue +- # Check both line numbers. If they're "near" +- # this rule matches. (lineno=None means "don't care") +- if (rule.lineno is not None) and \ +- abs(rule.lineno - lineno) > 5: continue +- # if it came this far, the rule matched +- rule.used = True +- return True +- return False +- +- def report_issue(self, text, lineno, issue): +- if not self.any_issue: self.info() +- self.any_issue = True +- self.write_log_entry(lineno, issue, text) +- self.warn('[%s:%d] "%s" found in "%-.120s"' % ( +- self.docname.encode(sys.getdefaultencoding(),'replace'), +- lineno, +- issue.encode(sys.getdefaultencoding(),'replace'), +- text.strip().encode(sys.getdefaultencoding(),'replace'))) +- self.app.statuscode = 1 +- +- def write_log_entry(self, lineno, issue, text): +- f = open(self.log_file_name, 'ab') +- writer = csv.writer(f, dialect) +- writer.writerow([self.docname.encode('utf-8'), +- lineno, +- issue.encode('utf-8'), +- text.strip().encode('utf-8')]) +- f.close() +- +- def load_rules(self, filename): +- """Load database of previously ignored issues. +- +- A csv file, with exactly the same format as suspicious.csv +- Fields: document name (normalized), line number, issue, surrounding text +- """ +- self.info("loading ignore rules... ", nonl=1) +- self.rules = rules = [] +- try: f = open(filename, 'rb') +- except IOError: return +- for i, row in enumerate(csv.reader(f)): +- if len(row) != 4: +- raise ValueError( +- "wrong format in %s, line %d: %s" % (filename, i+1, row)) +- docname, lineno, issue, text = row +- docname = docname.decode('utf-8') +- if lineno: lineno = int(lineno) +- else: lineno = None +- issue = issue.decode('utf-8') +- text = text.decode('utf-8') +- rule = Rule(docname, lineno, issue, text) +- rules.append(rule) +- f.close() +- self.info('done, %d rules loaded' % len(self.rules)) +- +- +-def get_lineno(node): +- """Obtain line number information for a node.""" +- lineno = None +- while lineno is None and node: +- node = node.parent +- lineno = node.line +- return lineno +- +- +-def extract_line(text, index): +- """text may be a multiline string; extract +- only the line containing the given character index. +- +- >>> extract_line("abc\ndefgh\ni", 6) +- >>> 'defgh' +- >>> for i in (0, 2, 3, 4, 10): +- ... print extract_line("abc\ndefgh\ni", i) +- abc +- abc +- abc +- defgh +- defgh +- i +- """ +- p = text.rfind('\n', 0, index) + 1 +- q = text.find('\n', index) +- if q < 0: +- q = len(text) +- return text[p:q] +- +- +-class SuspiciousVisitor(nodes.GenericNodeVisitor): +- +- lastlineno = 0 +- +- def __init__(self, document, builder): +- nodes.GenericNodeVisitor.__init__(self, document) +- self.builder = builder +- +- def default_visit(self, node): +- if isinstance(node, (nodes.Text, nodes.image)): # direct text containers +- text = node.astext() +- # lineno seems to go backwards sometimes (?) +- self.lastlineno = lineno = max(get_lineno(node) or 0, self.lastlineno) +- seen = set() # don't report the same issue more than only once per line +- for match in detect_all(text): +- issue = match.group() +- line = extract_line(text, match.start()) +- if (issue, line) not in seen: +- self.builder.check_issue(line, lineno, issue) +- seen.add((issue, line)) +- +- unknown_visit = default_visit +- +- def visit_document(self, node): +- self.lastlineno = 0 +- +- def visit_comment(self, node): +- # ignore comments -- too much false positives. +- # (although doing this could miss some errors; +- # there were two sections "commented-out" by mistake +- # in the Python docs that would not be catched) +- raise nodes.SkipNode +diff -r ee879c0ffa11 Doc/tools/static/basic.css +--- /dev/null ++++ b/Doc/tools/static/basic.css +@@ -0,0 +1,445 @@ ++/** ++ * Sphinx stylesheet -- basic theme ++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++ */ ++ ++/* -- main layout ----------------------------------------------------------- */ ++ ++div.clearer { ++ clear: both; ++} ++ ++/* -- relbar ---------------------------------------------------------------- */ ++ ++div.related { ++ width: 100%; ++ font-size: 90%; ++} ++ ++div.related h3 { ++ display: none; ++} ++ ++div.related ul { ++ margin: 0; ++ padding: 0 0 0 10px; ++ list-style: none; ++} ++ ++div.related li { ++ display: inline; ++} ++ ++div.related li.right { ++ float: right; ++ margin-right: 5px; ++} ++ ++/* -- sidebar --------------------------------------------------------------- */ ++ ++div.sphinxsidebarwrapper { ++ position: relative; ++ top: 0; ++ padding: 10px 5px 0 10px; ++ word-wrap: break-word; ++} ++ ++div.sphinxsidebar { ++ float: left; ++ width: 230px; ++ margin-left: -100%; ++ font-size: 90%; ++} ++ ++div.sphinxsidebar ul { ++ list-style: none; ++} ++ ++div.sphinxsidebar ul ul, ++div.sphinxsidebar ul.want-points { ++ margin-left: 20px; ++ list-style: square; ++} ++ ++div.sphinxsidebar ul ul { ++ margin-top: 0; ++ margin-bottom: 0; ++} ++ ++div.sphinxsidebar form { ++ margin-top: 10px; ++} ++ ++div.sphinxsidebar input { ++ border: 1px solid #98dbcc; ++ font-family: sans-serif; ++ font-size: 1em; ++} ++ ++img { ++ border: 0; ++} ++ ++/* -- search page ----------------------------------------------------------- */ ++ ++ul.search { ++ margin: 10px 0 0 20px; ++ padding: 0; ++} ++ ++ul.search li { ++ padding: 5px 0 5px 20px; ++ background-image: url(file.png); ++ background-repeat: no-repeat; ++ background-position: 0 7px; ++} ++ ++ul.search li a { ++ font-weight: bold; ++} ++ ++ul.search li div.context { ++ color: #888; ++ margin: 2px 0 0 30px; ++ text-align: left; ++} ++ ++ul.keywordmatches li.goodmatch a { ++ font-weight: bold; ++} ++ ++/* -- index page ------------------------------------------------------------ */ ++ ++table.contentstable { ++ width: 90%; ++} ++ ++table.contentstable p.biglink { ++ line-height: 150%; ++} ++ ++a.biglink { ++ font-size: 1.3em; ++} ++ ++span.linkdescr { ++ font-style: italic; ++ padding-top: 5px; ++ font-size: 90%; ++} ++ ++/* -- general index --------------------------------------------------------- */ ++ ++table.indextable td { ++ text-align: left; ++ vertical-align: top; ++} ++ ++table.indextable dl, table.indextable dd { ++ margin-top: 0; ++ margin-bottom: 0; ++} ++ ++table.indextable tr.pcap { ++ height: 10px; ++} ++ ++table.indextable tr.cap { ++ margin-top: 10px; ++ background-color: #f2f2f2; ++} ++ ++img.toggler { ++ margin-right: 3px; ++ margin-top: 3px; ++ cursor: pointer; ++} ++ ++/* -- general body styles --------------------------------------------------- */ ++ ++a.headerlink { ++ visibility: hidden; ++} ++ ++h1:hover > a.headerlink, ++h2:hover > a.headerlink, ++h3:hover > a.headerlink, ++h4:hover > a.headerlink, ++h5:hover > a.headerlink, ++h6:hover > a.headerlink, ++dt:hover > a.headerlink { ++ visibility: visible; ++} ++ ++div.body p.caption { ++ text-align: inherit; ++} ++ ++div.body td { ++ text-align: left; ++} ++ ++.field-list ul { ++ padding-left: 1em; ++} ++ ++.first { ++ margin-top: 0 !important; ++} ++ ++p.rubric { ++ margin-top: 30px; ++ font-weight: bold; ++} ++ ++/* -- sidebars -------------------------------------------------------------- */ ++ ++div.sidebar { ++ margin: 0 0 0.5em 1em; ++ border: 1px solid #ddb; ++ padding: 7px 7px 0 7px; ++ background-color: #ffe; ++ width: 40%; ++ float: right; ++} ++ ++p.sidebar-title { ++ font-weight: bold; ++} ++ ++/* -- topics ---------------------------------------------------------------- */ ++ ++div.topic { ++ border: 1px solid #ccc; ++ padding: 7px 7px 0 7px; ++ margin: 10px 0 10px 0; ++} ++ ++p.topic-title { ++ font-size: 1.1em; ++ font-weight: bold; ++ margin-top: 10px; ++} ++ ++/* -- admonitions ----------------------------------------------------------- */ ++ ++div.admonition { ++ margin-top: 10px; ++ margin-bottom: 10px; ++ padding: 7px; ++} ++ ++div.admonition dt { ++ font-weight: bold; ++} ++ ++div.admonition dl { ++ margin-bottom: 0; ++} ++ ++p.admonition-title { ++ margin: 0px 10px 5px 0px; ++ font-weight: bold; ++} ++ ++div.body p.centered { ++ text-align: center; ++ margin-top: 25px; ++} ++ ++/* -- tables ---------------------------------------------------------------- */ ++ ++table.docutils { ++ border: 0 solid #dce; ++ border-collapse: collapse; ++} ++ ++table.docutils td, table.docutils th { ++ padding: 2px 5px 2px 5px; ++ border-left: 0; ++ background-color: #eef; ++} ++ ++table.docutils td p.last, table.docutils th p.last { ++ margin-bottom: 0; ++} ++ ++table.field-list td, table.field-list th { ++ border: 0 !important; ++} ++ ++table.footnote td, table.footnote th { ++ border: 0 !important; ++} ++ ++table.docutils th { ++ border-top: 1px solid #cac; ++ background-color: #ede; ++} ++ ++th { ++ text-align: left; ++ padding-right: 5px; ++} ++ ++th.head { ++ text-align: center; ++} ++ ++/* -- other body styles ----------------------------------------------------- */ ++ ++dl { ++ margin-bottom: 15px; ++} ++ ++dd p { ++ margin-top: 0px; ++} ++ ++dd ul, dd table { ++ margin-bottom: 10px; ++} ++ ++dd { ++ margin-top: 3px; ++ margin-bottom: 10px; ++ margin-left: 30px; ++} ++ ++dt:target, .highlight { ++ background-color: #fbe54e; ++} ++ ++dl.glossary dt { ++ font-weight: bold; ++ font-size: 1.1em; ++} ++ ++.field-list ul { ++ margin: 0; ++ padding-left: 1em; ++} ++ ++.field-list p { ++ margin: 0; ++} ++ ++.refcount { ++ color: #060; ++} ++ ++.optional { ++ font-size: 1.3em; ++} ++ ++.versionmodified { ++ font-style: italic; ++} ++ ++.deprecated { ++ background-color: #ffe4e4; ++ border: 1px solid #f66; ++ padding: 7px; ++} ++ ++div.deprecated p { ++ margin-bottom: 0; ++} ++ ++.system-message { ++ background-color: #fda; ++ padding: 5px; ++ border: 3px solid red; ++} ++ ++.footnote:target { ++ background-color: #ffa; ++} ++ ++.impl-detail { ++ margin-top: 10px; ++ margin-bottom: 10px; ++ padding: 7px; ++ border: 1px solid #ccc; ++} ++ ++.impl-detail .compound-first { ++ margin-top: 0; ++} ++ ++.impl-detail .compound-last { ++ margin-bottom: 0; ++} ++ ++/* -- code displays --------------------------------------------------------- */ ++ ++pre { ++ overflow: auto; ++ overflow-y: hidden; ++} ++ ++td.linenos pre { ++ padding: 5px 0px; ++ border: 0; ++ background-color: transparent; ++ color: #aaa; ++} ++ ++table.highlighttable { ++ margin-left: 0.5em; ++} ++ ++table.highlighttable td { ++ padding: 0 0.5em 0 0.5em; ++} ++ ++tt.descname { ++ background-color: transparent; ++ font-weight: bold; ++ font-size: 1.2em; ++} ++ ++tt.descclassname { ++ background-color: transparent; ++} ++ ++tt.xref, a tt { ++ background-color: transparent; ++ font-weight: bold; ++} ++ ++h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt { ++ background-color: transparent; ++} ++ ++/* -- math display ---------------------------------------------------------- */ ++ ++img.math { ++ vertical-align: middle; ++} ++ ++div.body div.math p { ++ text-align: center; ++} ++ ++span.eqno { ++ float: right; ++} ++ ++/* -- printout stylesheet --------------------------------------------------- */ ++ ++@media print { ++ div.document, ++ div.documentwrapper, ++ div.bodywrapper { ++ margin: 0 !important; ++ width: 100%; ++ } ++ ++ div.sphinxsidebar, ++ div.related, ++ div.footer, ++ #top-link { ++ display: none; ++ } ++} +diff -r ee879c0ffa11 Doc/tools/static/copybutton.js +--- /dev/null ++++ b/Doc/tools/static/copybutton.js +@@ -0,0 +1,56 @@ ++$(document).ready(function() { ++ /* Add a [>>>] button on the top-right corner of code samples to hide ++ * the >>> and ... prompts and the output and thus make the code ++ * copyable. */ ++ var div = $('.highlight-python .highlight,' + ++ '.highlight-python3 .highlight') ++ var pre = div.find('pre'); ++ ++ // get the styles from the current theme ++ pre.parent().parent().css('position', 'relative'); ++ var hide_text = 'Hide the prompts and output'; ++ var show_text = 'Show the prompts and output'; ++ var border_width = pre.css('border-top-width'); ++ var border_style = pre.css('border-top-style'); ++ var border_color = pre.css('border-top-color'); ++ var button_styles = { ++ 'cursor':'pointer', 'position': 'absolute', 'top': '0', 'right': '0', ++ 'border-color': border_color, 'border-style': border_style, ++ 'border-width': border_width, 'color': border_color, 'text-size': '75%', ++ 'font-family': 'monospace', 'padding-left': '0.2em', 'padding-right': '0.2em' ++ } ++ ++ // create and add the button to all the code blocks that contain >>> ++ div.each(function(index) { ++ var jthis = $(this); ++ if (jthis.find('.gp').length > 0) { ++ var button = $('>>>'); ++ button.css(button_styles) ++ button.attr('title', hide_text); ++ jthis.prepend(button); ++ } ++ // tracebacks (.gt) contain bare text elements that need to be ++ // wrapped in a span to work with .nextUntil() (see later) ++ jthis.find('pre:has(.gt)').contents().filter(function() { ++ return ((this.nodeType == 3) && (this.data.trim().length > 0)); ++ }).wrap(''); ++ }); ++ ++ // define the behavior of the button when it's clicked ++ $('.copybutton').toggle( ++ function() { ++ var button = $(this); ++ button.parent().find('.go, .gp, .gt').hide(); ++ button.next('pre').find('.gt').nextUntil('.gp, .go').css('visibility', 'hidden'); ++ button.css('text-decoration', 'line-through'); ++ button.attr('title', show_text); ++ }, ++ function() { ++ var button = $(this); ++ button.parent().find('.go, .gp, .gt').show(); ++ button.next('pre').find('.gt').nextUntil('.gp, .go').css('visibility', 'visible'); ++ button.css('text-decoration', 'none'); ++ button.attr('title', hide_text); ++ }); ++}); ++ +diff -r ee879c0ffa11 Doc/tools/static/py.png +Binary file Doc/tools/static/py.png has changed +diff -r ee879c0ffa11 Doc/tools/static/sidebar.js +--- /dev/null ++++ b/Doc/tools/static/sidebar.js +@@ -0,0 +1,186 @@ ++/* ++ * sidebar.js ++ * ~~~~~~~~~~ ++ * ++ * This script makes the Sphinx sidebar collapsible and implements ++ * intelligent scrolling. ++ * ++ * .sphinxsidebar contains .sphinxsidebarwrapper. This script adds ++ * in .sphixsidebar, after .sphinxsidebarwrapper, the #sidebarbutton ++ * used to collapse and expand the sidebar. ++ * ++ * When the sidebar is collapsed the .sphinxsidebarwrapper is hidden ++ * and the width of the sidebar and the margin-left of the document ++ * are decreased. When the sidebar is expanded the opposite happens. ++ * This script saves a per-browser/per-session cookie used to ++ * remember the position of the sidebar among the pages. ++ * Once the browser is closed the cookie is deleted and the position ++ * reset to the default (expanded). ++ * ++ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. ++ * :license: BSD, see LICENSE for details. ++ * ++ */ ++ ++$(function() { ++ // global elements used by the functions. ++ // the 'sidebarbutton' element is defined as global after its ++ // creation, in the add_sidebar_button function ++ var jwindow = $(window); ++ var jdocument = $(document); ++ var bodywrapper = $('.bodywrapper'); ++ var sidebar = $('.sphinxsidebar'); ++ var sidebarwrapper = $('.sphinxsidebarwrapper'); ++ ++ // original margin-left of the bodywrapper and width of the sidebar ++ // with the sidebar expanded ++ var bw_margin_expanded = bodywrapper.css('margin-left'); ++ var ssb_width_expanded = sidebar.width(); ++ ++ // margin-left of the bodywrapper and width of the sidebar ++ // with the sidebar collapsed ++ var bw_margin_collapsed = '.8em'; ++ var ssb_width_collapsed = '.8em'; ++ ++ // colors used by the current theme ++ var dark_color = $('.related').css('background-color'); ++ var light_color = $('.document').css('background-color'); ++ ++ function get_viewport_height() { ++ if (window.innerHeight) ++ return window.innerHeight; ++ else ++ return jwindow.height(); ++ } ++ ++ function sidebar_is_collapsed() { ++ return sidebarwrapper.is(':not(:visible)'); ++ } ++ ++ function toggle_sidebar() { ++ if (sidebar_is_collapsed()) ++ expand_sidebar(); ++ else ++ collapse_sidebar(); ++ // adjust the scrolling of the sidebar ++ scroll_sidebar(); ++ } ++ ++ function collapse_sidebar() { ++ sidebarwrapper.hide(); ++ sidebar.css('width', ssb_width_collapsed); ++ bodywrapper.css('margin-left', bw_margin_collapsed); ++ sidebarbutton.css({ ++ 'margin-left': '0', ++ 'height': bodywrapper.height() ++ }); ++ sidebarbutton.find('span').text('»'); ++ sidebarbutton.attr('title', _('Expand sidebar')); ++ document.cookie = 'sidebar=collapsed'; ++ } ++ ++ function expand_sidebar() { ++ bodywrapper.css('margin-left', bw_margin_expanded); ++ sidebar.css('width', ssb_width_expanded); ++ sidebarwrapper.show(); ++ sidebarbutton.css({ ++ 'margin-left': ssb_width_expanded-12, ++ 'height': bodywrapper.height() ++ }); ++ sidebarbutton.find('span').text('«'); ++ sidebarbutton.attr('title', _('Collapse sidebar')); ++ document.cookie = 'sidebar=expanded'; ++ } ++ ++ function add_sidebar_button() { ++ sidebarwrapper.css({ ++ 'float': 'left', ++ 'margin-right': '0', ++ 'width': ssb_width_expanded - 28 ++ }); ++ // create the button ++ sidebar.append( ++ '
    «
    ' ++ ); ++ var sidebarbutton = $('#sidebarbutton'); ++ light_color = sidebarbutton.css('background-color'); ++ // find the height of the viewport to center the '<<' in the page ++ var viewport_height = get_viewport_height(); ++ sidebarbutton.find('span').css({ ++ 'display': 'block', ++ 'margin-top': (viewport_height - sidebar.position().top - 20) / 2 ++ }); ++ ++ sidebarbutton.click(toggle_sidebar); ++ sidebarbutton.attr('title', _('Collapse sidebar')); ++ sidebarbutton.css({ ++ 'color': '#FFFFFF', ++ 'border-left': '1px solid ' + dark_color, ++ 'font-size': '1.2em', ++ 'cursor': 'pointer', ++ 'height': bodywrapper.height(), ++ 'padding-top': '1px', ++ 'margin-left': ssb_width_expanded - 12 ++ }); ++ ++ sidebarbutton.hover( ++ function () { ++ $(this).css('background-color', dark_color); ++ }, ++ function () { ++ $(this).css('background-color', light_color); ++ } ++ ); ++ } ++ ++ function set_position_from_cookie() { ++ if (!document.cookie) ++ return; ++ var items = document.cookie.split(';'); ++ for(var k=0; k wintop && curbot > winbot) { ++ sidebarwrapper.css('top', $u.max([wintop - offset - 10, 0])); ++ } ++ else if (curtop < wintop && curbot < winbot) { ++ sidebarwrapper.css('top', $u.min([winbot - sidebar_height - offset - 20, ++ jdocument.height() - sidebar_height - 200])); ++ } ++ } ++ } ++ jwindow.scroll(scroll_sidebar); ++}); +diff -r ee879c0ffa11 Doc/tools/static/version_switch.js +--- /dev/null ++++ b/Doc/tools/static/version_switch.js +@@ -0,0 +1,67 @@ ++(function() { ++ 'use strict'; ++ ++ var all_versions = { ++ '3.5': 'dev (3.5)', ++ '3.4': '3.4', ++ '3.3': '3.3', ++ '3.2': '3.2', ++ '2.7': '2.7', ++ '2.6': '2.6' ++ }; ++ ++ function build_select(current_version, current_release) { ++ var buf = [''); ++ return buf.join(''); ++ } ++ ++ function patch_url(url, new_version) { ++ var url_re = /\.org\/(\d|py3k|dev|((release\/)?\d\.\d[\w\d\.]*))\//, ++ new_url = url.replace(url_re, '.org/' + new_version + '/'); ++ ++ if (new_url == url && !new_url.match(url_re)) { ++ // python 2 url without version? ++ new_url = url.replace(/\.org\//, '.org/' + new_version + '/'); ++ } ++ return new_url; ++ } ++ ++ function on_switch() { ++ var selected = $(this).children('option:selected').attr('value'); ++ ++ var url = window.location.href, ++ new_url = patch_url(url, selected); ++ ++ if (new_url != url) { ++ // check beforehand if url exists, else redirect to version's start page ++ $.ajax({ ++ url: new_url, ++ success: function() { ++ window.location.href = new_url; ++ }, ++ error: function() { ++ window.location.href = 'https://docs.python.org/' + selected; ++ } ++ }); ++ } ++ } ++ ++ $(document).ready(function() { ++ var release = DOCUMENTATION_OPTIONS.VERSION; ++ var version = release.substr(0, 3); ++ var select = build_select(version, release); ++ ++ $('.version_switcher_placeholder').html(select); ++ $('.version_switcher_placeholder select').bind('change', on_switch); ++ }); ++})(); +diff -r ee879c0ffa11 Doc/tools/susp-ignored.csv +--- /dev/null ++++ b/Doc/tools/susp-ignored.csv +@@ -0,0 +1,186 @@ ++c-api/arg,,:ref,"PyArg_ParseTuple(args, ""O|O:ref"", &object, &callback)" ++c-api/list,,:high,list[low:high] ++c-api/sequence,,:i2,o[i1:i2] ++c-api/unicode,,:end,str[start:end] ++distutils/setupscript,,::, ++extending/embedding,,:numargs,"if(!PyArg_ParseTuple(args, "":numargs""))" ++extending/extending,,:set,"if (PyArg_ParseTuple(args, ""O:set_callback"", &temp)) {" ++extending/extending,,:myfunction,"PyArg_ParseTuple(args, ""D:myfunction"", &c);" ++extending/newtypes,,:call,"if (!PyArg_ParseTuple(args, ""sss:call"", &arg1, &arg2, &arg3)) {" ++extending/windows,,:initspam,/export:initspam ++faq/programming,,:reduce,"print (lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y," ++faq/programming,,:reduce,"Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro," ++faq/programming,,:chr,">=4.0) or 1+f(xc,yc,x*x-y*y+xc,2.0*x*y+yc,k-1,f):f(xc,yc,x,y,k,f):chr(" ++faq/programming,,::,for x in sequence[::-1]: ++howto/cporting,,:encode,"if (!PyArg_ParseTuple(args, ""O:encode_object"", &myobj))" ++howto/cporting,,:say,"if (!PyArg_ParseTuple(args, ""U:say_hello"", &name))" ++howto/curses,,:black,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" ++howto/curses,,:blue,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" ++howto/curses,,:cyan,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" ++howto/curses,,:green,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" ++howto/curses,,:magenta,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" ++howto/curses,,:red,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" ++howto/curses,,:white,"7:white." ++howto/curses,,:yellow,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and" ++howto/logging,,:root,WARNING:root:Watch out! ++howto/logging,,:Watch,WARNING:root:Watch out! ++howto/logging,,:root,DEBUG:root:This message should go to the log file ++howto/logging,,:root,INFO:root:So should this ++howto/logging,,:So,INFO:root:So should this ++howto/logging,,:root,"WARNING:root:And this, too" ++howto/logging,,:And,"WARNING:root:And this, too" ++howto/logging,,:root,INFO:root:Started ++howto/logging,,:Started,INFO:root:Started ++howto/logging,,:root,INFO:root:Doing something ++howto/logging,,:Doing,INFO:root:Doing something ++howto/logging,,:root,INFO:root:Finished ++howto/logging,,:Finished,INFO:root:Finished ++howto/logging,,:root,WARNING:root:Look before you leap! ++howto/logging,,:Look,WARNING:root:Look before you leap! ++howto/logging,,:This,DEBUG:This message should appear on the console ++howto/logging,,:So,INFO:So should this ++howto/logging,,:And,"WARNING:And this, too" ++howto/logging,,:logger,severity:logger name:message ++howto/logging,,:message,severity:logger name:message ++howto/logging,,:This,DEBUG:root:This message should go to the log file ++howto/pyporting,,::,Programming Language :: Python :: 2 ++howto/pyporting,,::,Programming Language :: Python :: 3 ++howto/regex,,::, ++howto/regex,,:foo,(?:foo) ++howto/urllib2,,:example,"for example ""joe@password:example.com""" ++library/audioop,,:ipos,"# factor = audioop.findfactor(in_test[ipos*2:ipos*2+len(out_test)]," ++library/bisect,,:hi,all(val >= x for val in a[i:hi]) ++library/bisect,,:hi,all(val > x for val in a[i:hi]) ++library/cookie,,`,!#$%&'*+-.^_`|~ ++library/datetime,,:MM, ++library/datetime,,:SS, ++library/decimal,,:optional,"trailneg:optional trailing minus indicator" ++library/difflib,,:ahi,a[alo:ahi] ++library/difflib,,:bhi,b[blo:bhi] ++library/difflib,,:i2, ++library/difflib,,:j2, ++library/difflib,,:i1, ++library/dis,,:TOS, ++library/dis,,`,TOS = `TOS` ++library/doctest,,`,``factorial`` from the ``example`` module: ++library/doctest,,`,The ``example`` module ++library/doctest,,`,Using ``factorial`` ++library/exceptions,,:err,err.object[err.start:err.end] ++library/functions,,:step,a[start:stop:step] ++library/functions,,:stop,"a[start:stop, i]" ++library/functions,,:stop,a[start:stop:step] ++library/hotshot,,:lineno,"ncalls tottime percall cumtime percall filename:lineno(function)" ++library/httplib,,:port,host:port ++library/imaplib,,:MM,"""DD-Mmm-YYYY HH:MM:SS" ++library/imaplib,,:SS,"""DD-Mmm-YYYY HH:MM:SS" ++library/itertools,,:stop,elements from seq[start:stop:step] ++library/itertools,,:step,elements from seq[start:stop:step] ++library/linecache,,:sys,"sys:x:3:3:sys:/dev:/bin/sh" ++library/logging.handlers,,:port,host:port ++library/mmap,,:i2,obj[i1:i2] ++library/multiprocessing,,:queue,">>> QueueManager.register('get_queue', callable=lambda:queue)" ++library/multiprocessing,,`,">>> l._callmethod('__getitem__', (20,)) # equiv to `l[20]`" ++library/multiprocessing,,`,">>> l._callmethod('__getslice__', (2, 7)) # equiv to `l[2:7]`" ++library/multiprocessing,,`,# `BaseManager`. ++library/multiprocessing,,`,# `Pool.imap()` (which will save on the amount of code needed anyway). ++library/multiprocessing,,`,# A test file for the `multiprocessing` package ++library/multiprocessing,,`,# A test of `multiprocessing.Pool` class ++library/multiprocessing,,`,# Add more tasks using `put()` ++library/multiprocessing,,`,# in the original order then consider using `Pool.map()` or ++library/multiprocessing,,`,# Not sure if we should synchronize access to `socket.accept()` method by ++library/multiprocessing,,`,# object. (We import `multiprocessing.reduction` to enable this pickling.) ++library/multiprocessing,,`,# register the Foo class; make `f()` and `g()` accessible via proxy ++library/multiprocessing,,`,# register the Foo class; make `g()` and `_h()` accessible via proxy ++library/multiprocessing,,`,# register the generator function baz; use `GeneratorProxy` to make proxies ++library/optparse,,:len,"del parser.rargs[:len(value)]" ++library/os.path,,:foo,c:foo ++library/pdb,,:lineno,filename:lineno ++library/posix,,`,"CFLAGS=""`getconf LFS_CFLAGS`"" OPT=""-g -O2 $CFLAGS""" ++library/profile,,:lineno,ncalls tottime percall cumtime percall filename:lineno(function) ++library/profile,,:lineno,filename:lineno(function) ++library/pyexpat,,:elem1, ++library/pyexpat,,:py,"xmlns:py = ""http://www.python.org/ns/"">" ++library/smtplib,,:port,method must support that as well as a regular host:port ++library/socket,,::,'5aef:2b::8' ++library/socket,,::,"(10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))]" ++library/sqlite3,,:memory, ++library/sqlite3,,:who,"cur.execute(""select * from people where name_last=:who and age=:age"", {""who"": who, ""age"": age})" ++library/sqlite3,,:age,"cur.execute(""select * from people where name_last=:who and age=:age"", {""who"": who, ""age"": age})" ++library/ssl,,:My,"Organization Name (eg, company) [Internet Widgits Pty Ltd]:My Organization, Inc." ++library/ssl,,:My,"Organizational Unit Name (eg, section) []:My Group" ++library/ssl,,:myserver,"Common Name (eg, YOUR name) []:myserver.mygroup.myorganization.com" ++library/ssl,,:MyState,State or Province Name (full name) [Some-State]:MyState ++library/ssl,,:ops,Email Address []:ops@myserver.mygroup.myorganization.com ++library/ssl,,:Some,"Locality Name (eg, city) []:Some City" ++library/ssl,,:US,Country Name (2 letter code) [AU]:US ++library/stdtypes,,:len,s[len(s):len(s)] ++library/stdtypes,,:end,s[start:end] ++library/string,,:end,s[start:end] ++library/subprocess,,`,"output=`mycmd myarg`" ++library/subprocess,,`,"output=`dmesg | grep hda`" ++library/tarfile,,:compression,filemode[:compression] ++library/tarfile,,:gz, ++library/tarfile,,:bz2, ++library/time,,:mm, ++library/time,,:ss, ++library/turtle,,::,Example:: ++library/urllib,,:port,:port ++library/urllib2,,:password,"""joe:password@python.org""" ++library/urllib2,,:close,Connection:close ++library/uuid,,:uuid,urn:uuid:12345678-1234-5678-1234-567812345678 ++library/xmlrpclib,,:pass,http://user:pass@host:port/path ++library/xmlrpclib,,:pass,user:pass ++library/xmlrpclib,,:port,http://user:pass@host:port/path ++license,,`,THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND ++license,,:zooko,mailto:zooko@zooko.com ++license,,`,THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ++license,,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY ++license,,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND ++license,,`,"``Software''), to deal in the Software without restriction, including" ++license,,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND," ++reference/datamodel,,:step,a[i:j:step] ++reference/datamodel,,:max, ++reference/expressions,,:index,x[index:index] ++reference/expressions,,`,`expressions...` ++reference/expressions,,`,"""`""" ++reference/grammar,,`,'`' testlist1 '`' ++reference/lexical_analysis,,:fileencoding,# vim:fileencoding= ++reference/lexical_analysis,,`,", : . ` = ;" ++tutorial/datastructures,,:value,key:value pairs within the braces adds initial key:value pairs ++tutorial/datastructures,,:value,It is also possible to delete a key:value ++tutorial/stdlib2,,:start,"fields = struct.unpack('>> urlparse.urlparse('http://[1080::8:800:200C:417A]/foo') ++whatsnew/2.7,,::,"ParseResult(scheme='http', netloc='[1080::8:800:200C:417A]'," +diff -r ee879c0ffa11 Doc/tools/templates/download.html +--- /dev/null ++++ b/Doc/tools/templates/download.html +@@ -0,0 +1,61 @@ ++{% extends "layout.html" %} ++{% set title = 'Download' %} ++{% if daily is defined %} ++ {% set dlbase = pathto('archives', 1) %} ++{% else %} ++ {% set dlbase = 'https://docs.python.org/ftp/python/doc/' + release %} ++{% endif %} ++ ++{% block body %} ++

    Download Python {{ release }} Documentation

    ++ ++{% if last_updated %}

    Last updated on: {{ last_updated }}.

    {% endif %} ++ ++

    To download an archive containing all the documents for this version of ++Python in one of various formats, follow one of links in this table. The numbers ++in the table are the size of the download files in megabytes.

    ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
    FormatPacked as .zipPacked as .tar.bz2
    PDF (US-Letter paper size)Download (ca. 8 MB)Download (ca. 8 MB)
    PDF (A4 paper size)Download (ca. 8 MB)Download (ca. 8 MB)
    HTMLDownload (ca. 6 MB)Download (ca. 4 MB)
    Plain TextDownload (ca. 2 MB)Download (ca. 1.5 MB)
    ++ ++

    These archives contain all the content in the documentation.

    ++ ++

    HTML Help (.chm) files are made available in the "Windows" section ++on the Python ++download page.

    ++ ++ ++

    Unpacking

    ++ ++

    Unix users should download the .tar.bz2 archives; these are bzipped tar ++archives and can be handled in the usual way using tar and the bzip2 ++program. The InfoZIP unzip program can be ++used to handle the ZIP archives if desired. The .tar.bz2 archives provide the ++best compression and fastest download times.

    ++ ++

    Windows users can use the ZIP archives since those are customary on that ++platform. These are created on Unix using the InfoZIP zip program.

    ++ ++ ++

    Problems

    ++ ++

    If you have comments or suggestions for the Python documentation, please send ++email to docs@python.org.

    ++{% endblock %} +diff -r ee879c0ffa11 Doc/tools/templates/indexcontent.html +--- /dev/null ++++ b/Doc/tools/templates/indexcontent.html +@@ -0,0 +1,59 @@ ++{% extends "defindex.html" %} ++{% block tables %} ++

    Parts of the documentation:

    ++ ++ ++
    ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
    ++ ++

    Indices and tables:

    ++ ++ ++
    ++ ++ ++ ++ ++ ++ ++
    ++ ++

    Meta information:

    ++ ++ ++
    ++ ++ ++ ++ ++ ++
    ++{% endblock %} +diff -r ee879c0ffa11 Doc/tools/templates/indexsidebar.html +--- /dev/null ++++ b/Doc/tools/templates/indexsidebar.html +@@ -0,0 +1,17 @@ ++

    Download

    ++

    Download these documents

    ++

    Docs for other versions

    ++ ++ ++

    Other resources

    ++ +diff -r ee879c0ffa11 Doc/tools/templates/layout.html +--- /dev/null ++++ b/Doc/tools/templates/layout.html +@@ -0,0 +1,51 @@ ++{% extends "!layout.html" %} ++{% block rootrellink %} ++
  • ++
  • Python{{ reldelim1 }}
  • ++
  • ++ {%- if versionswitcher is defined %} ++ {{ release }} ++ Documentation{{ reldelim1 }} ++ {%- else %} ++ {{ shorttitle }}{{ reldelim1 }} ++ {%- endif %} ++
  • ++{% endblock %} ++{% block relbar1 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %} ++{% block relbar2 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %} ++{% block extrahead %} ++ ++ {% if not embedded %}{% endif %} ++ {% if versionswitcher is defined and not embedded %}{% endif %} ++{{ super() }} ++ {% if builder == 'qthelp' %} ++ ++ {% endif %} ++{% endblock %} ++{% block footer %} ++ ++{% endblock %} ++{% block sidebarsourcelink %} ++{%- if show_source and has_source and sourcename %} ++

    {{ _('This Page') }}

    ++ ++{%- endif %} ++{% endblock %} +diff -r ee879c0ffa11 Doc/tools/templates/opensearch.xml +--- /dev/null ++++ b/Doc/tools/templates/opensearch.xml +@@ -0,0 +1,4 @@ ++{% extends "!opensearch.xml" %} ++{% block extra -%} ++https://www.python.org/images/favicon16x16.ico ++{%- endblock %} +diff -r ee879c0ffa11 Doc/tutorial/appendix.rst +--- /dev/null ++++ b/Doc/tutorial/appendix.rst +@@ -0,0 +1,124 @@ ++.. _tut-appendix: ++ ++******** ++Appendix ++******** ++ ++ ++.. _tut-interac: ++ ++Interactive Mode ++================ ++ ++.. _tut-error: ++ ++Error Handling ++-------------- ++ ++When an error occurs, the interpreter prints an error message and a stack trace. ++In interactive mode, it then returns to the primary prompt; when input came from ++a file, it exits with a nonzero exit status after printing the stack trace. ++(Exceptions handled by an :keyword:`except` clause in a :keyword:`try` statement ++are not errors in this context.) Some errors are unconditionally fatal and ++cause an exit with a nonzero exit; this applies to internal inconsistencies and ++some cases of running out of memory. All error messages are written to the ++standard error stream; normal output from executed commands is written to ++standard output. ++ ++Typing the interrupt character (usually Control-C or DEL) to the primary or ++secondary prompt cancels the input and returns to the primary prompt. [#]_ ++Typing an interrupt while a command is executing raises the ++:exc:`KeyboardInterrupt` exception, which may be handled by a :keyword:`try` ++statement. ++ ++ ++.. _tut-scripts: ++ ++Executable Python Scripts ++------------------------- ++ ++On BSD'ish Unix systems, Python scripts can be made directly executable, like ++shell scripts, by putting the line :: ++ ++ #!/usr/bin/env python ++ ++(assuming that the interpreter is on the user's :envvar:`PATH`) at the beginning ++of the script and giving the file an executable mode. The ``#!`` must be the ++first two characters of the file. On some platforms, this first line must end ++with a Unix-style line ending (``'\n'``), not a Windows (``'\r\n'``) line ++ending. Note that the hash, or pound, character, ``'#'``, is used to start a ++comment in Python. ++ ++The script can be given an executable mode, or permission, using the ++:program:`chmod` command. ++ ++.. code-block:: bash ++ ++ $ chmod +x myscript.py ++ ++On Windows systems, there is no notion of an "executable mode". The Python ++installer automatically associates ``.py`` files with ``python.exe`` so that ++a double-click on a Python file will run it as a script. The extension can ++also be ``.pyw``, in that case, the console window that normally appears is ++suppressed. ++ ++ ++.. _tut-startup: ++ ++The Interactive Startup File ++---------------------------- ++ ++When you use Python interactively, it is frequently handy to have some standard ++commands executed every time the interpreter is started. You can do this by ++setting an environment variable named :envvar:`PYTHONSTARTUP` to the name of a ++file containing your start-up commands. This is similar to the :file:`.profile` ++feature of the Unix shells. ++ ++This file is only read in interactive sessions, not when Python reads commands ++from a script, and not when :file:`/dev/tty` is given as the explicit source of ++commands (which otherwise behaves like an interactive session). It is executed ++in the same namespace where interactive commands are executed, so that objects ++that it defines or imports can be used without qualification in the interactive ++session. You can also change the prompts ``sys.ps1`` and ``sys.ps2`` in this ++file. ++ ++If you want to read an additional start-up file from the current directory, you ++can program this in the global start-up file using code like ``if ++os.path.isfile('.pythonrc.py'): exec(open('.pythonrc.py').read())``. ++If you want to use the startup file in a script, you must do this explicitly ++in the script:: ++ ++ import os ++ filename = os.environ.get('PYTHONSTARTUP') ++ if filename and os.path.isfile(filename): ++ with open(filename) as fobj: ++ startup_file = fobj.read() ++ exec(startup_file) ++ ++ ++.. _tut-customize: ++ ++The Customization Modules ++------------------------- ++ ++Python provides two hooks to let you customize it: :mod:`sitecustomize` and ++:mod:`usercustomize`. To see how it works, you need first to find the location ++of your user site-packages directory. Start Python and run this code:: ++ ++ >>> import site ++ >>> site.getusersitepackages() ++ '/home/user/.local/lib/python2.7/site-packages' ++ ++Now you can create a file named :file:`usercustomize.py` in that directory and ++put anything you want in it. It will affect every invocation of Python, unless ++it is started with the :option:`-s` option to disable the automatic import. ++ ++:mod:`sitecustomize` works in the same way, but is typically created by an ++administrator of the computer in the global site-packages directory, and is ++imported before :mod:`usercustomize`. See the documentation of the :mod:`site` ++module for more details. ++ ++ ++.. rubric:: Footnotes ++ ++.. [#] A problem with the GNU Readline package may prevent this. +diff -r ee879c0ffa11 Doc/tutorial/classes.rst +--- a/Doc/tutorial/classes.rst ++++ b/Doc/tutorial/classes.rst +@@ -600,7 +600,7 @@ + without affecting the precedence order of its parents). Taken together, these + properties make it possible to design reliable and extensible classes with + multiple inheritance. For more detail, see +-http://www.python.org/download/releases/2.3/mro/. ++https://www.python.org/download/releases/2.3/mro/. + + + .. _tut-private: +@@ -788,8 +788,8 @@ + + Having seen the mechanics behind the iterator protocol, it is easy to add + iterator behavior to your classes. Define an :meth:`__iter__` method which +-returns an object with a :meth:`next` method. If the class defines +-:meth:`next`, then :meth:`__iter__` can just return ``self``:: ++returns an object with a :meth:`~iterator.next` method. If the class ++defines :meth:`~iterator.next`, then :meth:`__iter__` can just return ``self``:: + + class Reverse: + """Iterator for looping over a sequence backwards.""" +@@ -825,8 +825,8 @@ + + :term:`Generator`\s are a simple and powerful tool for creating iterators. They + are written like regular functions but use the :keyword:`yield` statement +-whenever they want to return data. Each time :meth:`next` is called, the +-generator resumes where it left-off (it remembers all the data values and which ++whenever they want to return data. Each time :func:`next` is called on it, the ++generator resumes where it left off (it remembers all the data values and which + statement was last executed). An example shows that generators can be trivially + easy to create:: + +@@ -844,10 +844,10 @@ + o + g + +-Anything that can be done with generators can also be done with class based ++Anything that can be done with generators can also be done with class-based + iterators as described in the previous section. What makes generators so +-compact is that the :meth:`__iter__` and :meth:`next` methods are created +-automatically. ++compact is that the :meth:`__iter__` and :meth:`~generator.next` methods ++are created automatically. + + Another key feature is that the local variables and execution state are + automatically saved between calls. This made the function easier to write and +diff -r ee879c0ffa11 Doc/tutorial/datastructures.rst +--- a/Doc/tutorial/datastructures.rst ++++ b/Doc/tutorial/datastructures.rst +@@ -181,12 +181,12 @@ + the sequence for which ``function(item)`` is true. If *sequence* is a + :class:`string` or :class:`tuple`, the result will be of the same type; + otherwise, it is always a :class:`list`. For example, to compute a sequence of +-numbers not divisible by 2 or 3:: ++numbers divisible by 3 or 5:: + +- >>> def f(x): return x % 2 != 0 and x % 3 != 0 ++ >>> def f(x): return x % 3 == 0 or x % 5 == 0 + ... + >>> filter(f, range(2, 25)) +- [5, 7, 11, 13, 17, 19, 23] ++ [3, 5, 6, 9, 10, 12, 15, 18, 20, 21, 24] + + ``map(function, sequence)`` calls ``function(item)`` for each of the sequence's + items and returns a list of the return values. For example, to compute some +diff -r ee879c0ffa11 Doc/tutorial/errors.rst +--- a/Doc/tutorial/errors.rst ++++ b/Doc/tutorial/errors.rst +@@ -184,7 +184,7 @@ + ... except Exception as inst: + ... print type(inst) # the exception instance + ... print inst.args # arguments stored in .args +- ... print inst # __str__ allows args to printed directly ++ ... print inst # __str__ allows args to be printed directly + ... x, y = inst.args + ... print 'x =', x + ... print 'y =', y +diff -r ee879c0ffa11 Doc/tutorial/index.rst +--- a/Doc/tutorial/index.rst ++++ b/Doc/tutorial/index.rst +@@ -12,7 +12,7 @@ + + The Python interpreter and the extensive standard library are freely available + in source or binary form for all major platforms from the Python Web site, +-http://www.python.org/, and may be freely distributed. The same site also ++https://www.python.org/, and may be freely distributed. The same site also + contains distributions of and pointers to many free third party Python modules, + programs and tools, and additional documentation. + +@@ -56,3 +56,4 @@ + whatnow.rst + interactive.rst + floatingpoint.rst ++ appendix.rst +diff -r ee879c0ffa11 Doc/tutorial/interpreter.rst +--- a/Doc/tutorial/interpreter.rst ++++ b/Doc/tutorial/interpreter.rst +@@ -108,63 +108,15 @@ + Be careful not to fall off! + + ++For more on interactive mode, see :ref:`tut-interac`. ++ ++ + .. _tut-interp: + + The Interpreter and Its Environment + =================================== + + +-.. _tut-error: +- +-Error Handling +--------------- +- +-When an error occurs, the interpreter prints an error message and a stack trace. +-In interactive mode, it then returns to the primary prompt; when input came from +-a file, it exits with a nonzero exit status after printing the stack trace. +-(Exceptions handled by an :keyword:`except` clause in a :keyword:`try` statement +-are not errors in this context.) Some errors are unconditionally fatal and +-cause an exit with a nonzero exit; this applies to internal inconsistencies and +-some cases of running out of memory. All error messages are written to the +-standard error stream; normal output from executed commands is written to +-standard output. +- +-Typing the interrupt character (usually Control-C or DEL) to the primary or +-secondary prompt cancels the input and returns to the primary prompt. [#]_ +-Typing an interrupt while a command is executing raises the +-:exc:`KeyboardInterrupt` exception, which may be handled by a :keyword:`try` +-statement. +- +- +-.. _tut-scripts: +- +-Executable Python Scripts +-------------------------- +- +-On BSD'ish Unix systems, Python scripts can be made directly executable, like +-shell scripts, by putting the line :: +- +- #! /usr/bin/env python +- +-(assuming that the interpreter is on the user's :envvar:`PATH`) at the beginning +-of the script and giving the file an executable mode. The ``#!`` must be the +-first two characters of the file. On some platforms, this first line must end +-with a Unix-style line ending (``'\n'``), not a Windows (``'\r\n'``) line +-ending. Note that the hash, or pound, character, ``'#'``, is used to start a +-comment in Python. +- +-The script can be given an executable mode, or permission, using the +-:program:`chmod` command:: +- +- $ chmod +x myscript.py +- +-On Windows systems, there is no notion of an "executable mode". The Python +-installer automatically associates ``.py`` files with ``python.exe`` so that +-a double-click on a Python file will run it as a script. The extension can +-also be ``.pyw``, in that case, the console window that normally appears is +-suppressed. +- +- + .. _tut-source-encoding: + + Source Code Encoding +@@ -207,63 +159,3 @@ + that the file is UTF-8, and it must use a font that supports all the characters + in the file. + +- +-.. _tut-startup: +- +-The Interactive Startup File +----------------------------- +- +-When you use Python interactively, it is frequently handy to have some standard +-commands executed every time the interpreter is started. You can do this by +-setting an environment variable named :envvar:`PYTHONSTARTUP` to the name of a +-file containing your start-up commands. This is similar to the :file:`.profile` +-feature of the Unix shells. +- +-.. XXX This should probably be dumped in an appendix, since most people +- don't use Python interactively in non-trivial ways. +- +-This file is only read in interactive sessions, not when Python reads commands +-from a script, and not when :file:`/dev/tty` is given as the explicit source of +-commands (which otherwise behaves like an interactive session). It is executed +-in the same namespace where interactive commands are executed, so that objects +-that it defines or imports can be used without qualification in the interactive +-session. You can also change the prompts ``sys.ps1`` and ``sys.ps2`` in this +-file. +- +-If you want to read an additional start-up file from the current directory, you +-can program this in the global start-up file using code like ``if +-os.path.isfile('.pythonrc.py'): execfile('.pythonrc.py')``. If you want to use +-the startup file in a script, you must do this explicitly in the script:: +- +- import os +- filename = os.environ.get('PYTHONSTARTUP') +- if filename and os.path.isfile(filename): +- execfile(filename) +- +- +-.. _tut-customize: +- +-The Customization Modules +-------------------------- +- +-Python provides two hooks to let you customize it: :mod:`sitecustomize` and +-:mod:`usercustomize`. To see how it works, you need first to find the location +-of your user site-packages directory. Start Python and run this code: +- +- >>> import site +- >>> site.getusersitepackages() +- '/home/user/.local/lib/python2.7/site-packages' +- +-Now you can create a file named :file:`usercustomize.py` in that directory and +-put anything you want in it. It will affect every invocation of Python, unless +-it is started with the :option:`-s` option to disable the automatic import. +- +-:mod:`sitecustomize` works in the same way, but is typically created by an +-administrator of the computer in the global site-packages directory, and is +-imported before :mod:`usercustomize`. See the documentation of the :mod:`site` +-module for more details. +- +- +-.. rubric:: Footnotes +- +-.. [#] A problem with the GNU Readline package may prevent this. +diff -r ee879c0ffa11 Doc/tutorial/introduction.rst +--- a/Doc/tutorial/introduction.rst ++++ b/Doc/tutorial/introduction.rst +@@ -5,7 +5,7 @@ + ********************************** + + In the following examples, input and output are distinguished by the presence or +-absence of prompts (``>>>`` and ``...``): to repeat the example, you must type ++absence of prompts (:term:`>>>` and :term:`...`): to repeat the example, you must type + everything after the prompt, when the prompt appears; lines that do not begin + with a prompt are output from the interpreter. Note that a secondary prompt on a + line by itself in an example means you must type a blank line; this is used to +@@ -22,9 +22,9 @@ + Some examples:: + + # this is the first comment +- SPAM = 1 # and this is the second comment +- # ... and now a third! +- STRING = "# This is not a comment." ++ spam = 1 # and this is the second comment ++ # ... and now a third! ++ text = "# This is not a comment because it's inside quotes." + + + .. _tut-calculator: +@@ -44,43 +44,57 @@ + The interpreter acts as a simple calculator: you can type an expression at it + and it will write the value. Expression syntax is straightforward: the + operators ``+``, ``-``, ``*`` and ``/`` work just like in most other languages +-(for example, Pascal or C); parentheses can be used for grouping. For example:: ++(for example, Pascal or C); parentheses (``()``) can be used for grouping. ++For example:: + +- >>> 2+2 ++ >>> 2 + 2 + 4 +- >>> # This is a comment +- ... 2+2 +- 4 +- >>> 2+2 # and a comment on the same line as code +- 4 +- >>> (50-5*6)/4 ++ >>> 50 - 5*6 ++ 20 ++ >>> (50 - 5.0*6) / 4 ++ 5.0 ++ >>> 8 / 5.0 ++ 1.6 ++ ++The integer numbers (e.g. ``2``, ``4``, ``20``) have type :class:`int`, ++the ones with a fractional part (e.g. ``5.0``, ``1.6``) have type ++:class:`float`. We will see more about numeric types later in the tutorial. ++ ++The return type of a division (``/``) operation depends on its operands. If ++both operands are of type :class:`int`, :term:`floor division` is performed ++and an :class:`int` is returned. If either operand is a :class:`float`, ++classic division is performed and a :class:`float` is returned. The ``//`` ++operator is also provided for doing floor division no matter what the ++operands are. The remainder can be calculated with the ``%`` operator:: ++ ++ >>> 17 / 3 # int / int -> int + 5 +- >>> # Integer division returns the floor: +- ... 7/3 ++ >>> 17 / 3.0 # int / float -> float ++ 5.666666666666667 ++ >>> 17 // 3.0 # explicit floor division discards the fractional part ++ 5.0 ++ >>> 17 % 3 # the % operator returns the remainder of the division + 2 +- >>> 7/-3 +- -3 ++ >>> 5 * 3 + 2 # result * divisor + remainder ++ 17 + +-The equal sign (``'='``) is used to assign a value to a variable. Afterwards, no ++With Python, it is possible to use the ``**`` operator to calculate powers [#]_:: ++ ++ >>> 5 ** 2 # 5 squared ++ 25 ++ >>> 2 ** 7 # 2 to the power of 7 ++ 128 ++ ++The equal sign (``=``) is used to assign a value to a variable. Afterwards, no + result is displayed before the next interactive prompt:: + + >>> width = 20 +- >>> height = 5*9 ++ >>> height = 5 * 9 + >>> width * height + 900 + +-A value can be assigned to several variables simultaneously:: +- +- >>> x = y = z = 0 # Zero x, y and z +- >>> x +- 0 +- >>> y +- 0 +- >>> z +- 0 +- +-Variables must be "defined" (assigned a value) before they can be used, or an +-error will occur:: ++If a variable is not "defined" (assigned a value), trying to use it will ++give you an error:: + + >>> n # try to access an undefined variable + Traceback (most recent call last): +@@ -95,49 +109,6 @@ + >>> 7.0 / 2 + 3.5 + +-Complex numbers are also supported; imaginary numbers are written with a suffix +-of ``j`` or ``J``. Complex numbers with a nonzero real component are written as +-``(real+imagj)``, or can be created with the ``complex(real, imag)`` function. +-:: +- +- >>> 1j * 1J +- (-1+0j) +- >>> 1j * complex(0,1) +- (-1+0j) +- >>> 3+1j*3 +- (3+3j) +- >>> (3+1j)*3 +- (9+3j) +- >>> (1+2j)/(1+1j) +- (1.5+0.5j) +- +-Complex numbers are always represented as two floating point numbers, the real +-and imaginary part. To extract these parts from a complex number *z*, use +-``z.real`` and ``z.imag``. :: +- +- >>> a=1.5+0.5j +- >>> a.real +- 1.5 +- >>> a.imag +- 0.5 +- +-The conversion functions to floating point and integer (:func:`float`, +-:func:`int` and :func:`long`) don't work for complex numbers --- there is no one +-correct way to convert a complex number to a real number. Use ``abs(z)`` to get +-its magnitude (as a float) or ``z.real`` to get its real part. :: +- +- >>> a=3.0+4.0j +- >>> float(a) +- Traceback (most recent call last): +- File "", line 1, in ? +- TypeError: can't convert complex to float; use abs(z) +- >>> a.real +- 3.0 +- >>> a.imag +- 4.0 +- >>> abs(a) # sqrt(a.real**2 + a.imag**2) +- 5.0 +- + In interactive mode, the last printed expression is assigned to the variable + ``_``. This means that when you are using Python as a desk calculator, it is + somewhat easier to continue calculations, for example:: +@@ -155,20 +126,28 @@ + assign a value to it --- you would create an independent local variable with the + same name masking the built-in variable with its magic behavior. + ++In addition to :class:`int` and :class:`float`, Python supports other types of ++numbers, such as :class:`~decimal.Decimal` and :class:`~fractions.Fraction`. ++Python also has built-in support for :ref:`complex numbers `, ++and uses the ``j`` or ``J`` suffix to indicate the imaginary part ++(e.g. ``3+5j``). ++ + + .. _tut-strings: + + Strings + ------- + +-Besides numbers, Python can also manipulate strings, which can be expressed in +-several ways. They can be enclosed in single quotes or double quotes:: ++Besides numbers, Python can also manipulate strings, which can be expressed ++in several ways. They can be enclosed in single quotes (``'...'``) or ++double quotes (``"..."``) with the same result [#]_. ``\`` can be used ++to escape quotes:: + +- >>> 'spam eggs' ++ >>> 'spam eggs' # single quotes + 'spam eggs' +- >>> 'doesn\'t' ++ >>> 'doesn\'t' # use \' to escape the single quote... + "doesn't" +- >>> "doesn't" ++ >>> "doesn't" # ...or use double quotes instead + "doesn't" + >>> '"Yes," he said.' + '"Yes," he said.' +@@ -177,45 +156,48 @@ + >>> '"Isn\'t," she said.' + '"Isn\'t," she said.' + +-The interpreter prints the result of string operations in the same way as they +-are typed for input: inside quotes, and with quotes and other funny characters +-escaped by backslashes, to show the precise value. The string is enclosed in +-double quotes if the string contains a single quote and no double quotes, else +-it's enclosed in single quotes. The :keyword:`print` statement produces a more +-readable output for such input strings. ++In the interactive interpreter, the output string is enclosed in quotes and ++special characters are escaped with backslashes. While this might sometimes ++look different from the input (the enclosing quotes could change), the two ++strings are equivalent. The string is enclosed in double quotes if ++the string contains a single quote and no double quotes, otherwise it is ++enclosed in single quotes. The :keyword:`print` statement produces a more ++readable output, by omitting the enclosing quotes and by printing escaped ++and special characters:: + +-String literals can span multiple lines in several ways. Continuation lines can +-be used, with a backslash as the last character on the line indicating that the +-next line is a logical continuation of the line:: ++ >>> '"Isn\'t," she said.' ++ '"Isn\'t," she said.' ++ >>> print '"Isn\'t," she said.' ++ "Isn't," she said. ++ >>> s = 'First line.\nSecond line.' # \n means newline ++ >>> s # without print(), \n is included in the output ++ 'First line.\nSecond line.' ++ >>> print s # with print, \n produces a new line ++ First line. ++ Second line. + +- hello = "This is a rather long string containing\n\ +- several lines of text just as you would do in C.\n\ +- Note that whitespace at the beginning of the line is\ +- significant." ++If you don't want characters prefaced by ``\`` to be interpreted as ++special characters, you can use *raw strings* by adding an ``r`` before ++the first quote:: + +- print hello ++ >>> print 'C:\some\name' # here \n means newline! ++ C:\some ++ ame ++ >>> print r'C:\some\name' # note the r before the quote ++ C:\some\name + +-Note that newlines still need to be embedded in the string using ``\n`` -- the +-newline following the trailing backslash is discarded. This example would print +-the following: ++String literals can span multiple lines. One way is using triple-quotes: ++``"""..."""`` or ``'''...'''``. End of lines are automatically ++included in the string, but it's possible to prevent this by adding a ``\`` at ++the end of the line. The following example:: + +-.. code-block:: text +- +- This is a rather long string containing +- several lines of text just as you would do in C. +- Note that whitespace at the beginning of the line is significant. +- +-Or, strings can be surrounded in a pair of matching triple-quotes: ``"""`` or +-``'''``. End of lines do not need to be escaped when using triple-quotes, but +-they will be included in the string. :: +- +- print """ ++ print """\ + Usage: thingy [OPTIONS] + -h Display this usage message + -H hostname Hostname to connect to + """ + +-produces the following output: ++produces the following output (note that the initial newline is not included): + + .. code-block:: text + +@@ -223,142 +205,100 @@ + -h Display this usage message + -H hostname Hostname to connect to + +-If we make the string literal a "raw" string, ``\n`` sequences are not converted +-to newlines, but the backslash at the end of the line, and the newline character +-in the source, are both included in the string as data. Thus, the example:: +- +- hello = r"This is a rather long string containing\n\ +- several lines of text much as you would do in C." +- +- print hello +- +-would print: +- +-.. code-block:: text +- +- This is a rather long string containing\n\ +- several lines of text much as you would do in C. +- + Strings can be concatenated (glued together) with the ``+`` operator, and + repeated with ``*``:: + +- >>> word = 'Help' + 'A' +- >>> word +- 'HelpA' +- >>> '<' + word*5 + '>' +- '' ++ >>> # 3 times 'un', followed by 'ium' ++ >>> 3 * 'un' + 'ium' ++ 'unununium' + +-Two string literals next to each other are automatically concatenated; the first +-line above could also have been written ``word = 'Help' 'A'``; this only works +-with two literals, not with arbitrary string expressions:: ++Two or more *string literals* (i.e. the ones enclosed between quotes) next ++to each other are automatically concatenated. :: + +- >>> 'str' 'ing' # <- This is ok +- 'string' +- >>> 'str'.strip() + 'ing' # <- This is ok +- 'string' +- >>> 'str'.strip() 'ing' # <- This is invalid +- File "", line 1, in ? +- 'str'.strip() 'ing' +- ^ ++ >>> 'Py' 'thon' ++ 'Python' ++ ++This only works with two literals though, not with variables or expressions:: ++ ++ >>> prefix = 'Py' ++ >>> prefix 'thon' # can't concatenate a variable and a string literal ++ ... ++ SyntaxError: invalid syntax ++ >>> ('un' * 3) 'ium' ++ ... + SyntaxError: invalid syntax + +-Strings can be subscripted (indexed); like in C, the first character of a string +-has subscript (index) 0. There is no separate character type; a character is +-simply a string of size one. Like in Icon, substrings can be specified with the +-*slice notation*: two indices separated by a colon. :: ++If you want to concatenate variables or a variable and a literal, use ``+``:: + +- >>> word[4] +- 'A' +- >>> word[0:2] +- 'He' +- >>> word[2:4] +- 'lp' ++ >>> prefix + 'thon' ++ 'Python' ++ ++This feature is particularly useful when you want to break long strings:: ++ ++ >>> text = ('Put several strings within parentheses ' ++ 'to have them joined together.') ++ >>> text ++ 'Put several strings within parentheses to have them joined together.' ++ ++Strings can be *indexed* (subscripted), with the first character having index 0. ++There is no separate character type; a character is simply a string of size ++one:: ++ ++ >>> word = 'Python' ++ >>> word[0] # character in position 0 ++ 'P' ++ >>> word[5] # character in position 5 ++ 'n' ++ ++Indices may also be negative numbers, to start counting from the right:: ++ ++ >>> word[-1] # last character ++ 'n' ++ >>> word[-2] # second-last character ++ 'o' ++ >>> word[-6] ++ 'P' ++ ++Note that since -0 is the same as 0, negative indices start from -1. ++ ++In addition to indexing, *slicing* is also supported. While indexing is used ++to obtain individual characters, *slicing* allows you to obtain a substring:: ++ ++ >>> word[0:2] # characters from position 0 (included) to 2 (excluded) ++ 'Py' ++ >>> word[2:5] # characters from position 2 (included) to 5 (excluded) ++ 'tho' ++ ++Note how the start is always included, and the end always excluded. This ++makes sure that ``s[:i] + s[i:]`` is always equal to ``s``:: ++ ++ >>> word[:2] + word[2:] ++ 'Python' ++ >>> word[:4] + word[4:] ++ 'Python' + + Slice indices have useful defaults; an omitted first index defaults to zero, an + omitted second index defaults to the size of the string being sliced. :: + +- >>> word[:2] # The first two characters +- 'He' +- >>> word[2:] # Everything except the first two characters +- 'lpA' +- +-Unlike a C string, Python strings cannot be changed. Assigning to an indexed +-position in the string results in an error:: +- +- >>> word[0] = 'x' +- Traceback (most recent call last): +- File "", line 1, in ? +- TypeError: object does not support item assignment +- >>> word[:1] = 'Splat' +- Traceback (most recent call last): +- File "", line 1, in ? +- TypeError: object does not support slice assignment +- +-However, creating a new string with the combined content is easy and efficient:: +- +- >>> 'x' + word[1:] +- 'xelpA' +- >>> 'Splat' + word[4] +- 'SplatA' +- +-Here's a useful invariant of slice operations: ``s[:i] + s[i:]`` equals ``s``. +-:: +- +- >>> word[:2] + word[2:] +- 'HelpA' +- >>> word[:3] + word[3:] +- 'HelpA' +- +-Degenerate slice indices are handled gracefully: an index that is too large is +-replaced by the string size, an upper bound smaller than the lower bound returns +-an empty string. :: +- +- >>> word[1:100] +- 'elpA' +- >>> word[10:] +- '' +- >>> word[2:1] +- '' +- +-Indices may be negative numbers, to start counting from the right. For example:: +- +- >>> word[-1] # The last character +- 'A' +- >>> word[-2] # The last-but-one character +- 'p' +- >>> word[-2:] # The last two characters +- 'pA' +- >>> word[:-2] # Everything except the last two characters +- 'Hel' +- +-But note that -0 is really the same as 0, so it does not count from the right! +-:: +- +- >>> word[-0] # (since -0 equals 0) +- 'H' +- +-Out-of-range negative slice indices are truncated, but don't try this for +-single-element (non-slice) indices:: +- +- >>> word[-100:] +- 'HelpA' +- >>> word[-10] # error +- Traceback (most recent call last): +- File "", line 1, in ? +- IndexError: string index out of range ++ >>> word[:2] # character from the beginning to position 2 (excluded) ++ 'Py' ++ >>> word[4:] # characters from position 4 (included) to the end ++ 'on' ++ >>> word[-2:] # characters from the second-last (included) to the end ++ 'on' + + One way to remember how slices work is to think of the indices as pointing + *between* characters, with the left edge of the first character numbered 0. + Then the right edge of the last character of a string of *n* characters has + index *n*, for example:: + +- +---+---+---+---+---+ +- | H | e | l | p | A | +- +---+---+---+---+---+ +- 0 1 2 3 4 5 +- -5 -4 -3 -2 -1 ++ +---+---+---+---+---+---+ ++ | P | y | t | h | o | n | ++ +---+---+---+---+---+---+ ++ 0 1 2 3 4 5 6 ++ -6 -5 -4 -3 -2 -1 + +-The first row of numbers gives the position of the indices 0...5 in the string; ++The first row of numbers gives the position of the indices 0...6 in the string; + the second row gives the corresponding negative indices. The slice from *i* to + *j* consists of all characters between the edges labeled *i* and *j*, + respectively. +@@ -367,6 +307,38 @@ + indices, if both are within bounds. For example, the length of ``word[1:3]`` is + 2. + ++Attempting to use a index that is too large will result in an error:: ++ ++ >>> word[42] # the word only has 7 characters ++ Traceback (most recent call last): ++ File "", line 1, in ++ IndexError: string index out of range ++ ++However, out of range slice indexes are handled gracefully when used for ++slicing:: ++ ++ >>> word[4:42] ++ 'on' ++ >>> word[42:] ++ '' ++ ++Python strings cannot be changed --- they are :term:`immutable`. ++Therefore, assigning to an indexed position in the string results in an error:: ++ ++ >>> word[0] = 'J' ++ ... ++ TypeError: 'str' object does not support item assignment ++ >>> word[2:] = 'py' ++ ... ++ TypeError: 'str' object does not support item assignment ++ ++If you need a different string, you should create a new one:: ++ ++ >>> 'J' + word[1:] ++ 'Jython' ++ >>> word[:2] + 'py' ++ 'Pypy' ++ + The built-in function :func:`len` returns the length of a string:: + + >>> s = 'supercalifragilisticexpialidocious' +@@ -499,94 +471,89 @@ + + Python knows a number of *compound* data types, used to group together other + values. The most versatile is the *list*, which can be written as a list of +-comma-separated values (items) between square brackets. List items need not all +-have the same type. :: ++comma-separated values (items) between square brackets. Lists might contain ++items of different types, but usually the items all have the same type. :: + +- >>> a = ['spam', 'eggs', 100, 1234] +- >>> a +- ['spam', 'eggs', 100, 1234] ++ >>> squares = [1, 4, 9, 16, 25] ++ >>> squares ++ [1, 4, 9, 16, 25] + +-Like string indices, list indices start at 0, and lists can be sliced, +-concatenated and so on:: ++Like strings (and all other built-in :term:`sequence` type), lists can be ++indexed and sliced:: + +- >>> a[0] +- 'spam' +- >>> a[3] +- 1234 +- >>> a[-2] +- 100 +- >>> a[1:-1] +- ['eggs', 100] +- >>> a[:2] + ['bacon', 2*2] +- ['spam', 'eggs', 'bacon', 4] +- >>> 3*a[:3] + ['Boo!'] +- ['spam', 'eggs', 100, 'spam', 'eggs', 100, 'spam', 'eggs', 100, 'Boo!'] ++ >>> squares[0] # indexing returns the item ++ 1 ++ >>> squares[-1] ++ 25 ++ >>> squares[-3:] # slicing returns a new list ++ [9, 16, 25] + + All slice operations return a new list containing the requested elements. This +-means that the following slice returns a shallow copy of the list *a*:: ++means that the following slice returns a new (shallow) copy of the list:: + +- >>> a[:] +- ['spam', 'eggs', 100, 1234] ++ >>> squares[:] ++ [1, 4, 9, 16, 25] + +-Unlike strings, which are *immutable*, it is possible to change individual +-elements of a list:: ++Lists also supports operations like concatenation:: + +- >>> a +- ['spam', 'eggs', 100, 1234] +- >>> a[2] = a[2] + 23 +- >>> a +- ['spam', 'eggs', 123, 1234] ++ >>> squares + [36, 49, 64, 81, 100] ++ [1, 4, 9, 16, 25, 36, 49, 64, 81, 100] ++ ++Unlike strings, which are :term:`immutable`, lists are a :term:`mutable` ++type, i.e. it is possible to change their content:: ++ ++ >>> cubes = [1, 8, 27, 65, 125] # something's wrong here ++ >>> 4 ** 3 # the cube of 4 is 64, not 65! ++ 64 ++ >>> cubes[3] = 64 # replace the wrong value ++ >>> cubes ++ [1, 8, 27, 64, 125] ++ ++You can also add new items at the end of the list, by using ++the :meth:`~list.append` *method* (we will see more about methods later):: ++ ++ >>> cubes.append(216) # add the cube of 6 ++ >>> cubes.append(7 ** 3) # and the cube of 7 ++ >>> cubes ++ [1, 8, 27, 64, 125, 216, 343] + + Assignment to slices is also possible, and this can even change the size of the + list or clear it entirely:: + +- >>> # Replace some items: +- ... a[0:2] = [1, 12] +- >>> a +- [1, 12, 123, 1234] +- >>> # Remove some: +- ... a[0:2] = [] +- >>> a +- [123, 1234] +- >>> # Insert some: +- ... a[1:1] = ['bletch', 'xyzzy'] +- >>> a +- [123, 'bletch', 'xyzzy', 1234] +- >>> # Insert (a copy of) itself at the beginning +- >>> a[:0] = a +- >>> a +- [123, 'bletch', 'xyzzy', 1234, 123, 'bletch', 'xyzzy', 1234] +- >>> # Clear the list: replace all items with an empty list +- >>> a[:] = [] +- >>> a ++ >>> letters = ['a', 'b', 'c', 'd', 'e', 'f', 'g'] ++ >>> letters ++ ['a', 'b', 'c', 'd', 'e', 'f', 'g'] ++ >>> # replace some values ++ >>> letters[2:5] = ['C', 'D', 'E'] ++ >>> letters ++ ['a', 'b', 'C', 'D', 'E', 'f', 'g'] ++ >>> # now remove them ++ >>> letters[2:5] = [] ++ >>> letters ++ ['a', 'b', 'f', 'g'] ++ >>> # clear the list by replacing all the elements with an empty list ++ >>> letters[:] = [] ++ >>> letters + [] + + The built-in function :func:`len` also applies to lists:: + +- >>> a = ['a', 'b', 'c', 'd'] +- >>> len(a) ++ >>> letters = ['a', 'b', 'c', 'd'] ++ >>> len(letters) + 4 + + It is possible to nest lists (create lists containing other lists), for + example:: + +- >>> q = [2, 3] +- >>> p = [1, q, 4] +- >>> len(p) +- 3 +- >>> p[1] +- [2, 3] +- >>> p[1][0] +- 2 +- >>> p[1].append('xtra') # See section 5.1 +- >>> p +- [1, [2, 3, 'xtra'], 4] +- >>> q +- [2, 3, 'xtra'] +- +-Note that in the last example, ``p[1]`` and ``q`` really refer to the same +-object! We'll come back to *object semantics* later. +- ++ >>> a = ['a', 'b', 'c'] ++ >>> n = [1, 2, 3] ++ >>> x = [a, n] ++ >>> x ++ [['a', 'b', 'c'], [1, 2, 3]] ++ >>> x[0] ++ ['a', 'b', 'c'] ++ >>> x[0][1] ++ 'b' + + .. _tut-firststeps: + +@@ -658,3 +625,14 @@ + + Note that the interpreter inserts a newline before it prints the next prompt if + the last line was not completed. ++ ++.. rubric:: Footnotes ++ ++.. [#] Since ``**`` has higher precedence than ``-``, ``-3**2`` will be ++ interpreted as ``-(3**2)`` and thus result in ``-9``. To avoid this ++ and get ``9``, you can use ``(-3)**2``. ++ ++.. [#] Unlike other languages, special characters such as ``\n`` have the ++ same meaning with both single (``'...'``) and double (``"..."``) quotes. ++ The only difference between the two is that within single quotes you don't ++ need to escape ``"`` (but you have to escape ``\'``) and vice versa. +diff -r ee879c0ffa11 Doc/tutorial/whatnow.rst +--- a/Doc/tutorial/whatnow.rst ++++ b/Doc/tutorial/whatnow.rst +@@ -30,20 +30,20 @@ + + More Python resources: + +-* http://www.python.org: The major Python Web site. It contains code, ++* https://www.python.org: The major Python Web site. It contains code, + documentation, and pointers to Python-related pages around the Web. This Web + site is mirrored in various places around the world, such as Europe, Japan, and + Australia; a mirror may be faster than the main site, depending on your + geographical location. + +-* http://docs.python.org: Fast access to Python's documentation. ++* https://docs.python.org: Fast access to Python's documentation. + +-* http://pypi.python.org: The Python Package Index, previously also nicknamed ++* https://pypi.python.org/pypi: The Python Package Index, previously also nicknamed + the Cheese Shop, is an index of user-created Python modules that are available + for download. Once you begin releasing code, you can register it here so that + others can find it. + +-* http://aspn.activestate.com/ASPN/Python/Cookbook/: The Python Cookbook is a ++* http://code.activestate.com/recipes/langs/python/: The Python Cookbook is a + sizable collection of code examples, larger modules, and useful scripts. + Particularly notable contributions are collected in a book also titled Python + Cookbook (O'Reilly & Associates, ISBN 0-596-00797-3.) +@@ -56,7 +56,7 @@ + answering) questions, suggesting new features, and announcing new modules. + Before posting, be sure to check the list of :ref:`Frequently Asked Questions + ` (also called the FAQ). Mailing list +-archives are available at http://mail.python.org/pipermail/. The FAQ answers ++archives are available at https://mail.python.org/pipermail/. The FAQ answers + many of the questions that come up again and again, and may already contain the + solution for your problem. + +diff -r ee879c0ffa11 Doc/using/cmdline.rst +--- a/Doc/using/cmdline.rst ++++ b/Doc/using/cmdline.rst +@@ -410,7 +410,7 @@ + + Reserved for use by Jython_. + +-.. _Jython: http://jython.org ++.. _Jython: http://www.jython.org/ + + .. cmdoption:: -U + +diff -r ee879c0ffa11 Doc/using/mac.rst +--- a/Doc/using/mac.rst ++++ b/Doc/using/mac.rst +@@ -27,7 +27,7 @@ + + Mac OS X 10.8 comes with Python 2.7 pre-installed by Apple. If you wish, you + are invited to install the most recent version of Python from the Python website +-(http://www.python.org). A current "universal binary" build of Python, which ++(https://www.python.org). A current "universal binary" build of Python, which + runs natively on the Mac's new Intel and legacy PPC CPU's, is available there. + + What you get after installing is a number of things: +@@ -71,7 +71,7 @@ + number of standard Unix command line editors, :program:`vim` and + :program:`emacs` among them. If you want a more Mac-like editor, + :program:`BBEdit` or :program:`TextWrangler` from Bare Bones Software (see +-http://www.barebones.com/products/bbedit/index.shtml) are good choices, as is ++http://www.barebones.com/products/bbedit/index.html) are good choices, as is + :program:`TextMate` (see http://macromates.com/). Other editors include + :program:`Gvim` (http://macvim.org) and :program:`Aquamacs` + (http://aquamacs.org/). +@@ -123,7 +123,7 @@ + + MacPython ships with the standard IDLE development environment. A good + introduction to using IDLE can be found at +-http://hkn.eecs.berkeley.edu/~dyoo/python/idle_intro/index.html. ++https://hkn.eecs.berkeley.edu/~dyoo/python/idle_intro/index.html. + + + .. _mac-package-manager: +@@ -137,7 +137,7 @@ + setup.py install``). + + * Many packages can also be installed via the :program:`setuptools` extension +- or :program:`pip` wrapper, see http://www.pip-installer.org/. ++ or :program:`pip` wrapper, see https://pip.pypa.io/. + + + GUI Programming on the Mac +@@ -147,7 +147,7 @@ + + *PyObjC* is a Python binding to Apple's Objective-C/Cocoa framework, which is + the foundation of most modern Mac development. Information on PyObjC is +-available from http://pyobjc.sourceforge.net. ++available from https://pythonhosted.org/pyobjc/. + + The standard Python GUI toolkit is :mod:`Tkinter`, based on the cross-platform + Tk toolkit (http://www.tcl.tk). An Aqua-native version of Tk is bundled with OS +@@ -181,9 +181,9 @@ + The MacPython mailing list is an excellent support resource for Python users and + developers on the Mac: + +-http://www.python.org/community/sigs/current/pythonmac-sig/ ++https://www.python.org/community/sigs/current/pythonmac-sig/ + + Another useful resource is the MacPython wiki: + +-http://wiki.python.org/moin/MacPython ++https://wiki.python.org/moin/MacPython + +diff -r ee879c0ffa11 Doc/using/unix.rst +--- a/Doc/using/unix.rst ++++ b/Doc/using/unix.rst +@@ -55,18 +55,17 @@ + On OpenSolaris + -------------- + +-To install the newest Python versions on OpenSolaris, install `blastwave +-`_ and type ``pkg_get -i python`` at the +-prompt. ++You can get Python from `OpenCSW `_. Various versions ++of Python are available and can be installed with e.g. ``pkgutil -i python27``. + + + Building Python + =============== + + If you want to compile CPython yourself, first thing you should do is get the +-`source `_. You can download either the ++`source `_. You can download either the + latest release's source or just grab a fresh `clone +-`_. (If you want ++`_. (If you want + to contribute patches, you will need a clone.) + + The build process consists in the usual :: +@@ -148,5 +147,4 @@ + information, read: http://www.geany.org/ + + Komodo edit is another extremely good IDE. It also has support for a lot of +-languages. For more information, read: +-http://www.activestate.com/store/productdetail.aspx?prdGuid=20f4ed15-6684-4118-a78b-d37ff4058c5f ++languages. For more information, read http://komodoide.com/. +diff -r ee879c0ffa11 Doc/using/windows.rst +--- a/Doc/using/windows.rst ++++ b/Doc/using/windows.rst +@@ -18,7 +18,7 @@ + Unlike most Unix systems and services, Windows does not require Python natively + and thus does not pre-install a version of Python. However, the CPython team + has compiled Windows installers (MSI packages) with every `release +-`_ for many years. ++`_ for many years. + + With ongoing development of Python, some platforms that used to be supported + earlier are no longer supported (due to the lack of users or developers). +@@ -31,14 +31,13 @@ + following releases), this support was dropped and new releases are just + expected to work on the Windows NT family. + * `Windows CE `_ is still supported. +-* The `Cygwin `_ installer offers to install the `Python +- interpreter `_ as well; it is located under +- "Interpreters." (cf. `Cygwin package source ++* The `Cygwin `_ installer offers to install the Python ++ interpreter as well (cf. `Cygwin package source + `_, `Maintainer releases + `_) + +-See `Python for Windows (and DOS) `_ ++See `Python for Windows (and DOS) `_ + for detailed information about platforms with precompiled installers. + + .. seealso:: +@@ -47,15 +46,15 @@ + "7 Minutes to "Hello World!"" + by Richard Dooling, 2006 + +- `Installing on Windows `_ ++ `Installing on Windows `_ + in "`Dive into Python: Python from novice to pro +- `_" ++ `_" + by Mark Pilgrim, 2004, + ISBN 1-59059-356-1 + +- `For Windows users `_ ++ `For Windows users `_ + in "Installing Python" +- in "`A Byte of Python `_" ++ in "`A Byte of Python `_" + by Swaroop C H, 2003 + + +@@ -69,7 +68,7 @@ + `ActivePython `_ + Installer with multi-platform compatibility, documentation, PyWin32 + +-`Enthought Python Distribution `_ ++`Enthought Python Distribution `_ + Popular modules (such as PyWin32) with their respective documentation, tool + suite for building extensible Python applications + +@@ -255,7 +254,7 @@ + user interfaces + + `PythonWin `_ is a sample MFC application ++https://www.python.org/windows/pythonwin/>`_ is a sample MFC application + shipped with PyWin32. It is an embeddable IDE with a built-in debugger. + + .. seealso:: +@@ -292,9 +291,9 @@ + =========================== + + If you want to compile CPython yourself, first thing you should do is get the +-`source `_. You can download either the ++`source `_. You can download either the + latest release's source or just grab a fresh `checkout +-`_. ++`_. + + For Microsoft Visual C++, which is the compiler with which official Python + releases are built, the source tree contains solutions/project files. View the +@@ -337,7 +336,7 @@ + + .. seealso:: + +- `Python Programming On Win32 `_ ++ `Python Programming On Win32 `_ + "Help for Windows Programmers" + by Mark Hammond and Andy Robinson, O'Reilly Media, 2000, + ISBN 1-56592-621-8 +diff -r ee879c0ffa11 Doc/whatsnew/2.0.rst +--- a/Doc/whatsnew/2.0.rst ++++ b/Doc/whatsnew/2.0.rst +@@ -130,7 +130,7 @@ + Read the rest of PEP 1 for the details of the PEP editorial process, style, and + format. PEPs are kept in the Python CVS tree on SourceForge, though they're not + part of the Python 2.0 distribution, and are also available in HTML form from +-http://www.python.org/peps/. As of September 2000, there are 25 PEPS, ranging ++https://www.python.org/peps/. As of September 2000, there are 25 PEPS, ranging + from PEP 201, "Lockstep Iteration", to PEP 225, "Elementwise/Objectwise + Operators". + +@@ -566,7 +566,7 @@ + simply be silently swallowed. + + .. Starting URL: +-.. http://www.python.org/pipermail/python-dev/2000-April/004834.html ++.. https://www.python.org/pipermail/python-dev/2000-April/004834.html + + Work has been done on porting Python to 64-bit Windows on the Itanium processor, + mostly by Trent Mick of ActiveState. (Confusingly, ``sys.platform`` is still +@@ -1003,7 +1003,7 @@ + + The XML Special Interest Group has been working on XML-related Python code for a + while. Its code distribution, called PyXML, is available from the SIG's Web +-pages at http://www.python.org/sigs/xml-sig/. The PyXML distribution also used ++pages at https://www.python.org/community/sigs/current/xml-sig. The PyXML distribution also used + the package name ``xml``. If you've written programs that used PyXML, you're + probably wondering about its compatibility with the 2.0 :mod:`xml` package. + +diff -r ee879c0ffa11 Doc/whatsnew/2.1.rst +--- a/Doc/whatsnew/2.1.rst ++++ b/Doc/whatsnew/2.1.rst +@@ -555,14 +555,14 @@ + and experiment with them. With the result experience, perhaps it'll be possible + to design a really good catalog and then build support for it into Python 2.2. + For example, the Distutils :command:`sdist` and :command:`bdist_\*` commands +-could support a :option:`upload` option that would automatically upload your ++could support a ``upload`` option that would automatically upload your + package to a catalog server. + + You can start creating packages containing :file:`PKG-INFO` even if you're not + using Python 2.1, since a new release of the Distutils will be made for users of + earlier Python versions. Version 1.0.2 of the Distutils includes the changes + described in PEP 241, as well as various bugfixes and enhancements. It will be +-available from the Distutils SIG at http://www.python.org/sigs/distutils-sig/. ++available from the Distutils SIG at https://www.python.org/sigs/distutils-sig/. + + + .. seealso:: +@@ -731,7 +731,7 @@ + ... + + For a fuller discussion of the line I/O changes, see the python-dev summary for +- January 1-15, 2001 at http://www.python.org/dev/summary/2001-01-1/. ++ January 1-15, 2001 at https://www.python.org/dev/summary/2001-01-1/. + + * A new method, :meth:`popitem`, was added to dictionaries to enable + destructively iterating through the contents of a dictionary; this can be faster +diff -r ee879c0ffa11 Doc/whatsnew/2.2.rst +--- a/Doc/whatsnew/2.2.rst ++++ b/Doc/whatsnew/2.2.rst +@@ -24,8 +24,8 @@ + This article doesn't attempt to provide a complete specification of the new + features, but instead provides a convenient overview. For full details, you + should refer to the documentation for Python 2.2, such as the `Python Library +-Reference `_ and the `Python +-Reference Manual `_. If you want to ++Reference `_ and the `Python ++Reference Manual `_. If you want to + understand the complete implementation and design rationale for a change, refer + to the PEP for a particular new feature. + +@@ -395,7 +395,7 @@ + of an explanation to start you programming, but many details have been + simplified or ignored. Where should you go to get a more complete picture? + +-http://www.python.org/2.2/descrintro.html is a lengthy tutorial introduction to ++https://www.python.org/2.2/descrintro.html is a lengthy tutorial introduction to + the descriptor features, written by Guido van Rossum. If my description has + whetted your appetite, go read this tutorial next, because it goes into much + more detail about the new features while still remaining quite easy to read. +diff -r ee879c0ffa11 Doc/whatsnew/2.3.rst +--- a/Doc/whatsnew/2.3.rst ++++ b/Doc/whatsnew/2.3.rst +@@ -657,7 +657,7 @@ + Running ``python setup.py register`` will collect the metadata describing a + package, such as its name, version, maintainer, description, &c., and send it to + a central catalog server. The resulting catalog is available from +-http://www.python.org/pypi. ++https://pypi.python.org/pypi. + + To make the catalog a bit more useful, a new optional *classifiers* keyword + argument has been added to the Distutils :func:`setup` function. A list of +@@ -1082,9 +1082,9 @@ + C3 algorithm as described in the paper `"A Monotonic Superclass Linearization + for Dylan" `_. To + understand the motivation for this change, read Michele Simionato's article +- `"Python 2.3 Method Resolution Order" `_, or ++ `"Python 2.3 Method Resolution Order" `_, or + read the thread on python-dev starting with the message at +- http://mail.python.org/pipermail/python-dev/2002-October/029035.html. Samuele ++ https://mail.python.org/pipermail/python-dev/2002-October/029035.html. Samuele + Pedroni first pointed out the problem and also implemented the fix by coding the + C3 algorithm. + +@@ -1330,7 +1330,7 @@ + (Contributed by Kevin O'Connor.) + + * The IDLE integrated development environment has been updated using the code +- from the IDLEfork project (http://idlefork.sf.net). The most notable feature is ++ from the IDLEfork project (http://idlefork.sourceforge.net). The most notable feature is + that the code being developed is now executed in a subprocess, meaning that + there's no longer any need for manual ``reload()`` operations. IDLE's core code + has been incorporated into the standard library as the :mod:`idlelib` package. +@@ -1564,7 +1564,7 @@ + to the correct thread, and waiting for the results. Other interfaces can't be + handled automatically but :mod:`Tkinter` will now raise an exception on such an + access so that you can at least find out about the problem. See +- http://mail.python.org/pipermail/python-dev/2002-December/031107.html for a more ++ https://mail.python.org/pipermail/python-dev/2002-December/031107.html for a more + detailed explanation of this change. (Implemented by Martin von Löwis.) + + * Calling Tcl methods through :mod:`_tkinter` no longer returns only strings. +@@ -1858,7 +1858,7 @@ + + .. seealso:: + +- http://svn.python.org/view/python/trunk/Objects/obmalloc.c ++ https://svn.python.org/view/python/trunk/Objects/obmalloc.c + For the full details of the pymalloc implementation, see the comments at + the top of the file :file:`Objects/obmalloc.c` in the Python source code. + The above link points to the file within the python.org SVN browser. +diff -r ee879c0ffa11 Doc/whatsnew/2.4.rst +--- a/Doc/whatsnew/2.4.rst ++++ b/Doc/whatsnew/2.4.rst +@@ -337,7 +337,7 @@ + wrote patches implementing function decorators, but the one that was actually + checked in was patch #979728, written by Mark Russell. + +- http://www.python.org/moin/PythonDecoratorLibrary ++ https://www.python.org/moin/PythonDecoratorLibrary + This Wiki page contains several examples of decorators. + + .. ====================================================================== +diff -r ee879c0ffa11 Doc/whatsnew/2.5.rst +--- a/Doc/whatsnew/2.5.rst ++++ b/Doc/whatsnew/2.5.rst +@@ -39,7 +39,7 @@ + This article doesn't try to be a complete specification of the new features; + instead changes are briefly introduced using helpful examples. For full + details, you should always refer to the documentation for Python 2.5 at +-http://docs.python.org. If you want to understand the complete implementation ++https://docs.python.org. If you want to understand the complete implementation + and design rationale, refer to the PEP for a particular new feature. + + Comments, suggestions, and error reports for this document are welcome; please +@@ -229,7 +229,7 @@ + ) + + Another new enhancement to the Python package index at +-http://cheeseshop.python.org is storing source and binary archives for a ++https://pypi.python.org is storing source and binary archives for a + package. The new :command:`upload` Distutils command will upload a package to + the repository. + +@@ -2130,7 +2130,7 @@ + such as PyCon. + + .. List of names taken from Jeremy's python-dev post at +- .. http://mail.python.org/pipermail/python-dev/2005-October/057500.html ++ .. https://mail.python.org/pipermail/python-dev/2005-October/057500.html + + * Evan Jones's patch to obmalloc, first described in a talk at PyCon DC 2005, + was applied. Python 2.4 allocated small objects in 256K-sized arenas, but never +diff -r ee879c0ffa11 Doc/whatsnew/2.6.rst +--- a/Doc/whatsnew/2.6.rst ++++ b/Doc/whatsnew/2.6.rst +@@ -162,7 +162,7 @@ + to administer it and a server to host it. + + After posting a call for volunteers, a new Roundup installation was +-set up at http://bugs.python.org. One installation of Roundup can ++set up at https://bugs.python.org. One installation of Roundup can + host multiple trackers, and this server now also hosts issue trackers + for Jython and for the Python web site. It will surely find + other uses in the future. Where possible, +@@ -179,7 +179,7 @@ + + .. seealso:: + +- http://bugs.python.org ++ https://bugs.python.org + The Python bug tracker. + + http://bugs.jython.org: +@@ -225,18 +225,18 @@ + + Sphinx is a standalone package that can be used for writing, and + almost two dozen other projects +-(`listed on the Sphinx web site `__) ++(`listed on the Sphinx web site `__) + have adopted Sphinx as their documentation tool. + + .. seealso:: + +- `Documenting Python `__ ++ `Documenting Python `__ + Describes how to write for Python's documentation. + +- `Sphinx `__ ++ `Sphinx `__ + Documentation and code for the Sphinx toolchain. + +- `Docutils `__ ++ `Docutils `__ + The underlying reStructuredText parser and toolset. + + +@@ -2359,7 +2359,7 @@ + negotiation itself. (Patch contributed by Bill Fenner; + :issue:`829951`.) + +-* The :mod:`socket` module now supports TIPC (http://tipc.sf.net), ++* The :mod:`socket` module now supports TIPC (http://tipc.sourceforge.net/), + a high-performance non-IP-based protocol designed for use in clustered + environments. TIPC addresses are 4- or 5-tuples. + (Contributed by Alberto Bertogli; :issue:`1646`.) +diff -r ee879c0ffa11 Doc/whatsnew/2.7.rst +--- a/Doc/whatsnew/2.7.rst ++++ b/Doc/whatsnew/2.7.rst +@@ -68,9 +68,9 @@ + This article doesn't attempt to provide a complete specification of + the new features, but instead provides a convenient overview. For + full details, you should refer to the documentation for Python 2.7 at +-http://docs.python.org. If you want to understand the rationale for ++https://docs.python.org. If you want to understand the rationale for + the design and implementation, refer to the PEP for a particular new +-feature or the issue on http://bugs.python.org in which a change was ++feature or the issue on https://bugs.python.org in which a change was + discussed. Whenever possible, "What's New in Python" links to the + bug/patch item for each change. + +@@ -708,7 +708,7 @@ + The :func:`contextlib.nested` function provides a very similar + function, so it's no longer necessary and has been deprecated. + +- (Proposed in http://codereview.appspot.com/53094; implemented by ++ (Proposed in https://codereview.appspot.com/53094; implemented by + Georg Brandl.) + + * Conversions between floating-point numbers and strings are +@@ -1612,7 +1612,7 @@ + resulting archive. This is more powerful than the existing + *exclude* argument, which has therefore been deprecated. + (Added by Lars Gustäbel; :issue:`6856`.) +- The :class:`~tarfile.TarFile` class also now supports the context manager protocol. ++ The :class:`~tarfile.TarFile` class also now supports the context management protocol. + (Added by Lars Gustäbel; :issue:`7232`.) + + * The :meth:`~threading.Event.wait` method of the :class:`threading.Event` class +@@ -1767,7 +1767,7 @@ + + The Distutils package and :mod:`sysconfig` are now maintained by Tarek + Ziadé, who has also started a Distutils2 package (source repository at +-http://hg.python.org/distutils2/) for developing a next-generation ++https://hg.python.org/distutils2/) for developing a next-generation + version of Distutils. + + +@@ -1804,7 +1804,7 @@ + by Michael Foord, unless otherwise noted. The enhanced version of + the module is downloadable separately for use with Python versions 2.4 to 2.6, + packaged as the :mod:`unittest2` package, from +-http://pypi.python.org/pypi/unittest2. ++https://pypi.python.org/pypi/unittest2. + + When used from the command line, the module can automatically discover + tests. It's not as fancy as `py.test `__ or +@@ -2547,13 +2547,99 @@ + + :pep:`466` related features added in Python 2.7.7: + +-* :func:`hmac.compare_digest` was added to make a timing attack resistant +- comparison operation broadly available to Python 2 applications +- (backported by Alex Gaynor in :issue:`21306`) +- +-* the version of OpenSSL linked with the prebuilt Windows installers +- published on python.org was updated to 1.0.1g (contributed by +- Zachary Ware in :issue:`21462`) ++* :func:`hmac.compare_digest` was backported from Python 3 to make a timing ++ attack resistant comparison operation available to Python 2 applications. ++ (Contributed by Alex Gaynor; :issue:`21306`.) ++ ++* OpenSSL 1.0.1g was upgraded in the official Windows installers published on ++ python.org. (Contributed by Zachary Ware; :issue:`21462`.) ++ ++:pep:`466` related features added in Python 2.7.8: ++ ++* :func:`hashlib.pbkdf2_hmac` was backported from Python 3 to make a hashing ++ algorithm suitable for secure password storage broadly available to Python ++ 2 applications. (Contributed by Alex Gaynor; :issue:`21304`.) ++ ++* OpenSSL 1.0.1h was upgraded for the official Windows installers published on ++ python.org. (contributed by Zachary Ware in :issue:`21671` for CVE-2014-0224) ++ ++:pep:`466` related features added in Python 2.7.9: ++ ++* Most of Python 3.4's :mod:`ssl` module was backported. This means :mod:`ssl` ++ now supports Server Name Indication, TLS1.x settings, access to the platform ++ certificate store, the :class:`~ssl.SSLContext` class, and other ++ features. (Contributed by Alex Gaynor and David Reid; :issue:`21308`.) ++ ++ Refer to the "Version added: 2.7.9" notes in the module documentation for ++ specific details. ++ ++* :func:`os.urandom` was changed to cache a file descriptor to ``/dev/urandom`` ++ instead of reopening ``/dev/urandom`` on every call. (Contributed by Alex ++ Gaynor; :issue:`21305`.) ++ ++* :data:`hashlib.algorithms_guaranteed` and ++ :data:`hashlib.algorithms_available` were backported from Python 3 to make ++ it easier for Python 2 applications to select the strongest available hash ++ algorithm. (Contributed by Alex Gaynor in :issue:`21307`) ++ ++ ++PEP 477: Backport ensurepip (PEP 453) to Python 2.7 ++--------------------------------------------------- ++ ++:pep:`477` approves the inclusion of the :pep:`453` ensurepip module and the ++improved documentation that was enabled by it in the Python 2.7 maintenance ++releases, appearing first in the the Python 2.7.9 release. ++ ++ ++Bootstrapping pip By Default ++~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++ ++The new :mod:`ensurepip` module (defined in :pep:`453`) provides a standard ++cross-platform mechanism to bootstrap the pip installer into Python ++installations. The version of ``pip`` included with Python 2.7.9 is ``pip`` ++1.5.6, and future 2.7.x maintenance releases will update the bundled version to ++the latest version of ``pip`` that is available at the time of creating the ++release candidate. ++ ++By default, the commands ``pip``, ``pipX`` and ``pipX.Y`` will be installed on ++all platforms (where X.Y stands for the version of the Python installation), ++along with the ``pip`` Python package and its dependencies. ++ ++On Windows and Mac OS X, the CPython installers now default to installing ++``pip`` along with CPython itself (users may opt out of installing it ++during the installation process). Window users will need to opt in to the ++automatic ``PATH`` modifications to have ``pip`` available from the command ++line by default, otherwise it can still be accessed through the Python ++launcher for Windows as ``py -m pip``. ++ ++As `discussed in the PEP`__, platform packagers may choose not to install ++these commands by default, as long as, when invoked, they provide clear and ++simple directions on how to install them on that platform (usually using ++the system package manager). ++ ++__ https://www.python.org/dev/peps/pep-0477/#disabling-ensurepip-by-downstream-distributors ++ ++ ++Documentation Changes ++~~~~~~~~~~~~~~~~~~~~~ ++ ++As part of this change, the :ref:`installing-index` and ++:ref:`distributing-index` sections of the documentation have been ++completely redesigned as short getting started and FAQ documents. Most ++packaging documentation has now been moved out to the Python Packaging ++Authority maintained `Python Packaging User Guide ++`__ and the documentation of the individual ++projects. ++ ++However, as this migration is currently still incomplete, the legacy ++versions of those guides remaining available as :ref:`install-index` ++and :ref:`distutils-index`. ++ ++.. seealso:: ++ ++ :pep:`453` -- Explicit bootstrapping of pip in Python installations ++ PEP written by Donald Stufft and Nick Coghlan, implemented by ++ Donald Stufft, Nick Coghlan, Martin von Löwis and Ned Deily. + + + .. ====================================================================== +diff -r ee879c0ffa11 Include/node.h +--- a/Include/node.h ++++ b/Include/node.h +@@ -20,9 +20,7 @@ + PyAPI_FUNC(int) PyNode_AddChild(node *n, int type, + char *str, int lineno, int col_offset); + PyAPI_FUNC(void) PyNode_Free(node *n); +-#ifndef Py_LIMITED_API + Py_ssize_t _PyNode_SizeOf(node *n); +-#endif + + /* Node access functions */ + #define NCH(n) ((n)->n_nchildren) +diff -r ee879c0ffa11 Include/pythonrun.h +--- a/Include/pythonrun.h ++++ b/Include/pythonrun.h +@@ -145,6 +145,7 @@ + PyAPI_FUNC(void) PyFloat_Fini(void); + PyAPI_FUNC(void) PyOS_FiniInterrupts(void); + PyAPI_FUNC(void) PyByteArray_Fini(void); ++PyAPI_FUNC(void) _PyRandom_Fini(void); + + PyAPI_DATA(PyThreadState *) _Py_Finalizing; + +diff -r ee879c0ffa11 Include/sysmodule.h +--- a/Include/sysmodule.h ++++ b/Include/sysmodule.h +@@ -23,6 +23,8 @@ + PyAPI_FUNC(void) PySys_AddWarnOption(char *); + PyAPI_FUNC(int) PySys_HasWarnOptions(void); + ++PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *); ++ + #ifdef __cplusplus + } + #endif +diff -r ee879c0ffa11 Lib/CGIHTTPServer.py +--- a/Lib/CGIHTTPServer.py ++++ b/Lib/CGIHTTPServer.py +@@ -106,16 +106,16 @@ + def run_cgi(self): + """Execute a CGI script.""" + dir, rest = self.cgi_info +- +- i = rest.find('/') ++ path = dir + '/' + rest ++ i = path.find('/', len(dir)+1) + while i >= 0: +- nextdir = rest[:i] +- nextrest = rest[i+1:] ++ nextdir = path[:i] ++ nextrest = path[i+1:] + + scriptdir = self.translate_path(nextdir) + if os.path.isdir(scriptdir): + dir, rest = nextdir, nextrest +- i = rest.find('/') ++ i = path.find('/', len(dir)+1) + else: + break + +diff -r ee879c0ffa11 Lib/Cookie.py +--- a/Lib/Cookie.py ++++ b/Lib/Cookie.py +@@ -56,7 +56,7 @@ + >>> C = Cookie.SmartCookie() + + [Note: Long-time users of Cookie.py will remember using +-Cookie.Cookie() to create an Cookie object. Although deprecated, it ++Cookie.Cookie() to create a Cookie object. Although deprecated, it + is still supported by the code. See the Backward Compatibility notes + for more information.] + +@@ -426,6 +426,8 @@ + "version" : "Version", + } + ++ _flags = {'secure', 'httponly'} ++ + def __init__(self): + # Set defaults + self.key = self.value = self.coded_value = None +@@ -529,9 +531,11 @@ + _LegalCharsPatt = r"[\w\d!#%&'~_`><@,:/\$\*\+\-\.\^\|\)\(\?\}\{\=]" + _CookiePattern = re.compile( + r"(?x)" # This is a Verbose pattern ++ r"\s*" # Optional whitespace at start of cookie + r"(?P" # Start of group 'key' + ""+ _LegalCharsPatt +"+?" # Any word of at least one letter, nongreedy + r")" # End of group 'key' ++ r"(" # Optional group: there may not be a value. + r"\s*=\s*" # Equal Sign + r"(?P" # Start of group 'val' + r'"(?:[^\\"]|\\.)*"' # Any doublequoted string +@@ -540,7 +544,9 @@ + r"|" # or + ""+ _LegalCharsPatt +"*" # Any word or empty string + r")" # End of group 'val' +- r"\s*;?" # Probably ending in a semi-colon ++ r")?" # End of optional value group ++ r"\s*" # Any number of spaces. ++ r"(\s+|;|$)" # Ending either at space, semicolon, or EOS. + ) + + +@@ -585,8 +591,12 @@ + + def __setitem__(self, key, value): + """Dictionary style assignment.""" +- rval, cval = self.value_encode(value) +- self.__set(key, rval, cval) ++ if isinstance(value, Morsel): ++ # allow assignment of constructed Morsels (e.g. for pickling) ++ dict.__setitem__(self, key, value) ++ else: ++ rval, cval = self.value_encode(value) ++ self.__set(key, rval, cval) + # end __setitem__ + + def output(self, attrs=None, header="Set-Cookie:", sep="\015\012"): +@@ -641,7 +651,7 @@ + + while 0 <= i < n: + # Start looking for a cookie +- match = patt.search(str, i) ++ match = patt.match(str, i) + if not match: break # No more cookies + + K,V = match.group("key"), match.group("val") +@@ -656,8 +666,12 @@ + M[ K[1:] ] = V + elif K.lower() in Morsel._reserved: + if M: +- M[ K ] = _unquote(V) +- else: ++ if V is None: ++ if K.lower() in Morsel._flags: ++ M[K] = True ++ else: ++ M[K] = _unquote(V) ++ elif V is not None: + rval, cval = self.value_decode(V) + self.__set(K, rval, cval) + M = self[K] +diff -r ee879c0ffa11 Lib/SocketServer.py +--- a/Lib/SocketServer.py ++++ b/Lib/SocketServer.py +@@ -416,8 +416,12 @@ + self.socket = socket.socket(self.address_family, + self.socket_type) + if bind_and_activate: +- self.server_bind() +- self.server_activate() ++ try: ++ self.server_bind() ++ self.server_activate() ++ except: ++ self.server_close() ++ raise + + def server_bind(self): + """Called by constructor to bind the socket. +diff -r ee879c0ffa11 Lib/_abcoll.py +--- a/Lib/_abcoll.py ++++ b/Lib/_abcoll.py +@@ -143,7 +143,7 @@ + methods except for __contains__, __iter__ and __len__. + + To override the comparisons (presumably for speed, as the +- semantics are fixed), all you have to do is redefine __le__ and ++ semantics are fixed), redefine __le__ and __ge__, + then the other operations will automatically follow suit. + """ + +diff -r ee879c0ffa11 Lib/argparse.py +--- a/Lib/argparse.py ++++ b/Lib/argparse.py +@@ -1089,7 +1089,14 @@ + # parse all the remaining options into the namespace + # store any unrecognized options on the object, so that the top + # level parser can decide what to do with them +- namespace, arg_strings = parser.parse_known_args(arg_strings, namespace) ++ ++ # In case this subparser defines new defaults, we parse them ++ # in a new namespace object and then update the original ++ # namespace for the relevant parts. ++ subnamespace, arg_strings = parser.parse_known_args(arg_strings, None) ++ for key, value in vars(subnamespace).items(): ++ setattr(namespace, key, value) ++ + if arg_strings: + vars(namespace).setdefault(_UNRECOGNIZED_ARGS_ATTR, []) + getattr(namespace, _UNRECOGNIZED_ARGS_ATTR).extend(arg_strings) +diff -r ee879c0ffa11 Lib/asynchat.py +--- a/Lib/asynchat.py ++++ b/Lib/asynchat.py +@@ -46,12 +46,17 @@ + you - by calling your self.found_terminator() method. + """ + ++import asyncore ++import errno + import socket +-import asyncore + from collections import deque + from sys import py3kwarning + from warnings import filterwarnings, catch_warnings + ++_BLOCKING_IO_ERRORS = (errno.EAGAIN, errno.EALREADY, errno.EINPROGRESS, ++ errno.EWOULDBLOCK) ++ ++ + class async_chat (asyncore.dispatcher): + """This is an abstract class. You must derive from this class, and add + the two methods collect_incoming_data() and found_terminator()""" +@@ -109,6 +114,8 @@ + try: + data = self.recv (self.ac_in_buffer_size) + except socket.error, why: ++ if why.args[0] in _BLOCKING_IO_ERRORS: ++ return + self.handle_error() + return + +diff -r ee879c0ffa11 Lib/cookielib.py +--- a/Lib/cookielib.py ++++ b/Lib/cookielib.py +@@ -1719,12 +1719,12 @@ + def __repr__(self): + r = [] + for cookie in self: r.append(repr(cookie)) +- return "<%s[%s]>" % (self.__class__, ", ".join(r)) ++ return "<%s[%s]>" % (self.__class__.__name__, ", ".join(r)) + + def __str__(self): + r = [] + for cookie in self: r.append(str(cookie)) +- return "<%s[%s]>" % (self.__class__, ", ".join(r)) ++ return "<%s[%s]>" % (self.__class__.__name__, ", ".join(r)) + + + # derives from IOError for backwards-compatibility with Python 2.4.0 +diff -r ee879c0ffa11 Lib/ctypes/test/test_pointers.py +--- a/Lib/ctypes/test/test_pointers.py ++++ b/Lib/ctypes/test/test_pointers.py +@@ -7,6 +7,8 @@ + c_long, c_ulong, c_longlong, c_ulonglong, c_double, c_float] + python_types = [int, int, int, int, int, long, + int, long, long, long, float, float] ++LargeNamedType = type('T' * 2 ** 25, (Structure,), {}) ++large_string = 'T' * 2 ** 25 + + class PointersTestCase(unittest.TestCase): + +@@ -188,5 +190,11 @@ + mth = WINFUNCTYPE(None)(42, "name", (), None) + self.assertEqual(bool(mth), True) + ++ def test_pointer_type_name(self): ++ self.assertTrue(POINTER(LargeNamedType)) ++ ++ def test_pointer_type_str_name(self): ++ self.assertTrue(POINTER(large_string)) ++ + if __name__ == '__main__': + unittest.main() +diff -r ee879c0ffa11 Lib/ctypes/test/test_python_api.py +--- a/Lib/ctypes/test/test_python_api.py ++++ b/Lib/ctypes/test/test_python_api.py +@@ -40,8 +40,8 @@ + # This test is unreliable, because it is possible that code in + # unittest changes the refcount of the '42' integer. So, it + # is disabled by default. +- @requires("refcount") + def test_PyInt_Long(self): ++ requires("refcount") + ref42 = grc(42) + pythonapi.PyInt_FromLong.restype = py_object + self.assertEqual(pythonapi.PyInt_FromLong(42), 42) +diff -r ee879c0ffa11 Lib/ctypes/test/test_win32.py +--- a/Lib/ctypes/test/test_win32.py ++++ b/Lib/ctypes/test/test_win32.py +@@ -38,8 +38,11 @@ + + @unittest.skipUnless(sys.platform == "win32", 'Windows-specific test') + class FunctionCallTestCase(unittest.TestCase): +- @requires("SEH") ++ @unittest.skipUnless('MSC' in sys.version, "SEH only supported by MSC") ++ @unittest.skipIf(sys.executable.endswith('_d.exe'), ++ "SEH not enabled in debug builds") + def test_SEH(self): ++ requires("SEH") + # Call functions with invalid arguments, and make sure + # that access violations are trapped and raise an + # exception. +@@ -87,9 +90,29 @@ + + dll = CDLL(_ctypes_test.__file__) + +- pt = POINT(10, 10) +- rect = RECT(0, 0, 20, 20) +- self.assertEqual(1, dll.PointInRect(byref(rect), pt)) ++ pt = POINT(15, 25) ++ left = c_long.in_dll(dll, 'left') ++ top = c_long.in_dll(dll, 'top') ++ right = c_long.in_dll(dll, 'right') ++ bottom = c_long.in_dll(dll, 'bottom') ++ rect = RECT(left, top, right, bottom) ++ PointInRect = dll.PointInRect ++ PointInRect.argtypes = [POINTER(RECT), POINT] ++ self.assertEqual(1, PointInRect(byref(rect), pt)) ++ ++ ReturnRect = dll.ReturnRect ++ ReturnRect.argtypes = [c_int, RECT, POINTER(RECT), POINT, RECT, ++ POINTER(RECT), POINT, RECT] ++ ReturnRect.restype = RECT ++ for i in range(4): ++ ret = ReturnRect(i, rect, pointer(rect), pt, rect, ++ byref(rect), pt, rect) ++ # the c function will check and modify ret if something is ++ # passed in improperly ++ self.assertEqual(ret.left, left.value) ++ self.assertEqual(ret.right, right.value) ++ self.assertEqual(ret.top, top.value) ++ self.assertEqual(ret.bottom, bottom.value) + + if __name__ == '__main__': + unittest.main() +diff -r ee879c0ffa11 Lib/decimal.py +--- a/Lib/decimal.py ++++ b/Lib/decimal.py +@@ -136,7 +136,6 @@ + + __version__ = '1.70' # Highest version of the spec this complies with + +-import copy as _copy + import math as _math + import numbers as _numbers + +@@ -3665,6 +3664,8 @@ + if self._is_special: + sign = _format_sign(self._sign, spec) + body = str(self.copy_abs()) ++ if spec['type'] == '%': ++ body += '%' + return _format_align(sign, body, spec) + + # a type of None defaults to 'g' or 'G', depending on context +@@ -6033,7 +6034,10 @@ + format_dict['decimal_point'] = '.' + + # record whether return type should be str or unicode +- format_dict['unicode'] = isinstance(format_spec, unicode) ++ try: ++ format_dict['unicode'] = isinstance(format_spec, unicode) ++ except NameError: ++ format_dict['unicode'] = False + + return format_dict + +diff -r ee879c0ffa11 Lib/distutils/command/build_ext.py +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -235,7 +235,7 @@ + # Python's library directory must be appended to library_dirs + # See Issues: #1600860, #4366 + if (sysconfig.get_config_var('Py_ENABLE_SHARED')): +- if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): ++ if not sysconfig.python_build: + # building third party extensions + self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) + else: +diff -r ee879c0ffa11 Lib/distutils/command/upload.py +--- a/Lib/distutils/command/upload.py ++++ b/Lib/distutils/command/upload.py +@@ -136,8 +136,8 @@ + + # Build up the MIME payload for the POST data + boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254' +- sep_boundary = '\n--' + boundary +- end_boundary = sep_boundary + '--' ++ sep_boundary = '\r\n--' + boundary ++ end_boundary = sep_boundary + '--\r\n' + body = StringIO.StringIO() + for key, value in data.items(): + # handle multiple entries for the same name +@@ -151,14 +151,13 @@ + fn = "" + + body.write(sep_boundary) +- body.write('\nContent-Disposition: form-data; name="%s"'%key) ++ body.write('\r\nContent-Disposition: form-data; name="%s"' % key) + body.write(fn) +- body.write("\n\n") ++ body.write("\r\n\r\n") + body.write(value) + if value and value[-1] == '\r': + body.write('\n') # write an extra newline (lurve Macs) + body.write(end_boundary) +- body.write("\n") + body = body.getvalue() + + self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO) +diff -r ee879c0ffa11 Lib/distutils/file_util.py +--- a/Lib/distutils/file_util.py ++++ b/Lib/distutils/file_util.py +@@ -85,7 +85,8 @@ + (os.symlink) instead of copying: set it to "hard" or "sym"; if it is + None (the default), files are copied. Don't set 'link' on systems that + don't support it: 'copy_file()' doesn't check if hard or symbolic +- linking is available. ++ linking is available. If hardlink fails, falls back to ++ _copy_file_contents(). + + Under Mac OS, uses the native file copy function in macostools; on + other systems, uses '_copy_file_contents()' to copy file contents. +@@ -137,24 +138,31 @@ + # (Unix only, of course, but that's the caller's responsibility) + if link == 'hard': + if not (os.path.exists(dst) and os.path.samefile(src, dst)): +- os.link(src, dst) ++ try: ++ os.link(src, dst) ++ return (dst, 1) ++ except OSError: ++ # If hard linking fails, fall back on copying file ++ # (some special filesystems don't support hard linking ++ # even under Unix, see issue #8876). ++ pass + elif link == 'sym': + if not (os.path.exists(dst) and os.path.samefile(src, dst)): + os.symlink(src, dst) ++ return (dst, 1) + + # Otherwise (non-Mac, not linking), copy the file contents and + # (optionally) copy the times and mode. +- else: +- _copy_file_contents(src, dst) +- if preserve_mode or preserve_times: +- st = os.stat(src) ++ _copy_file_contents(src, dst) ++ if preserve_mode or preserve_times: ++ st = os.stat(src) + +- # According to David Ascher , utime() should be done +- # before chmod() (at least under NT). +- if preserve_times: +- os.utime(dst, (st[ST_ATIME], st[ST_MTIME])) +- if preserve_mode: +- os.chmod(dst, S_IMODE(st[ST_MODE])) ++ # According to David Ascher , utime() should be done ++ # before chmod() (at least under NT). ++ if preserve_times: ++ os.utime(dst, (st[ST_ATIME], st[ST_MTIME])) ++ if preserve_mode: ++ os.chmod(dst, S_IMODE(st[ST_MODE])) + + return (dst, 1) + +diff -r ee879c0ffa11 Lib/distutils/sysconfig.py +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -165,7 +165,8 @@ + # version and build tools may not support the same set + # of CPU architectures for universal builds. + global _config_vars +- if not _config_vars.get('CUSTOMIZED_OSX_COMPILER', ''): ++ # Use get_config_var() to ensure _config_vars is initialized. ++ if not get_config_var('CUSTOMIZED_OSX_COMPILER'): + import _osx_support + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' +diff -r ee879c0ffa11 Lib/distutils/tests/test_bdist_rpm.py +--- a/Lib/distutils/tests/test_bdist_rpm.py ++++ b/Lib/distutils/tests/test_bdist_rpm.py +@@ -25,6 +25,7 @@ + """ + + class BuildRpmTestCase(support.TempdirManager, ++ support.EnvironGuard, + support.LoggingSilencer, + unittest.TestCase): + +@@ -50,6 +51,7 @@ + def test_quiet(self): + # let's create a package + tmp_dir = self.mkdtemp() ++ os.environ['HOME'] = tmp_dir # to confine dir '.rpmdb' creation + pkg_dir = os.path.join(tmp_dir, 'foo') + os.mkdir(pkg_dir) + self.write_file((pkg_dir, 'setup.py'), SETUP_PY) +@@ -92,6 +94,7 @@ + def test_no_optimize_flag(self): + # let's create a package that brakes bdist_rpm + tmp_dir = self.mkdtemp() ++ os.environ['HOME'] = tmp_dir # to confine dir '.rpmdb' creation + pkg_dir = os.path.join(tmp_dir, 'foo') + os.mkdir(pkg_dir) + self.write_file((pkg_dir, 'setup.py'), SETUP_PY) +diff -r ee879c0ffa11 Lib/distutils/tests/test_dist.py +--- a/Lib/distutils/tests/test_dist.py ++++ b/Lib/distutils/tests/test_dist.py +@@ -11,7 +11,7 @@ + from distutils.dist import Distribution, fix_help_options + from distutils.cmd import Command + import distutils.dist +-from test.test_support import TESTFN, captured_stdout, run_unittest ++from test.test_support import TESTFN, captured_stdout, run_unittest, unlink + from distutils.tests import support + + +@@ -64,6 +64,7 @@ + with open(TESTFN, "w") as f: + f.write("[global]\n") + f.write("command_packages = foo.bar, splat") ++ self.addCleanup(unlink, TESTFN) + + files = [TESTFN] + sys.argv.append("build") +diff -r ee879c0ffa11 Lib/distutils/tests/test_file_util.py +--- a/Lib/distutils/tests/test_file_util.py ++++ b/Lib/distutils/tests/test_file_util.py +@@ -8,6 +8,11 @@ + from distutils.tests import support + from test.test_support import run_unittest + ++ ++requires_os_link = unittest.skipUnless(hasattr(os, "link"), ++ "test requires os.link()") ++ ++ + class FileUtilTestCase(support.TempdirManager, unittest.TestCase): + + def _log(self, msg, *args): +@@ -74,6 +79,44 @@ + copy_file(foo, dst_dir) + self.assertTrue(os.path.exists(os.path.join(dst_dir, 'foo'))) + ++ @requires_os_link ++ def test_copy_file_hard_link(self): ++ with open(self.source, 'w') as f: ++ f.write('some content') ++ st = os.stat(self.source) ++ copy_file(self.source, self.target, link='hard') ++ st2 = os.stat(self.source) ++ st3 = os.stat(self.target) ++ self.assertTrue(os.path.samestat(st, st2), (st, st2)) ++ self.assertTrue(os.path.samestat(st2, st3), (st2, st3)) ++ with open(self.source, 'r') as f: ++ self.assertEqual(f.read(), 'some content') ++ ++ @requires_os_link ++ def test_copy_file_hard_link_failure(self): ++ # If hard linking fails, copy_file() falls back on copying file ++ # (some special filesystems don't support hard linking even under ++ # Unix, see issue #8876). ++ with open(self.source, 'w') as f: ++ f.write('some content') ++ st = os.stat(self.source) ++ def _os_link(*args): ++ raise OSError(0, "linking unsupported") ++ old_link = os.link ++ os.link = _os_link ++ try: ++ copy_file(self.source, self.target, link='hard') ++ finally: ++ os.link = old_link ++ st2 = os.stat(self.source) ++ st3 = os.stat(self.target) ++ self.assertTrue(os.path.samestat(st, st2), (st, st2)) ++ self.assertFalse(os.path.samestat(st2, st3), (st2, st3)) ++ for fn in (self.source, self.target): ++ with open(fn, 'r') as f: ++ self.assertEqual(f.read(), 'some content') ++ ++ + def test_suite(): + return unittest.makeSuite(FileUtilTestCase) + +diff -r ee879c0ffa11 Lib/distutils/tests/test_sysconfig.py +--- a/Lib/distutils/tests/test_sysconfig.py ++++ b/Lib/distutils/tests/test_sysconfig.py +@@ -3,6 +3,9 @@ + import test + import unittest + import shutil ++import subprocess ++import sys ++import textwrap + + from distutils import sysconfig + from distutils.tests import support +@@ -99,6 +102,24 @@ + self.assertEqual(global_sysconfig.get_config_var('LDSHARED'), sysconfig.get_config_var('LDSHARED')) + self.assertEqual(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC')) + ++ def test_customize_compiler_before_get_config_vars(self): ++ # Issue #21923: test that a Distribution compiler ++ # instance can be called without an explicit call to ++ # get_config_vars(). ++ with open(TESTFN, 'w') as f: ++ f.writelines(textwrap.dedent('''\ ++ from distutils.core import Distribution ++ config = Distribution().get_command_obj('config') ++ # try_compile may pass or it may fail if no compiler ++ # is found but it should not raise an exception. ++ rc = config.try_compile('int x;') ++ ''')) ++ p = subprocess.Popen([str(sys.executable), TESTFN], ++ stdout=subprocess.PIPE, ++ stderr=subprocess.STDOUT, ++ universal_newlines=True) ++ outs, errs = p.communicate() ++ self.assertEqual(0, p.returncode, "Subprocess failed: " + outs) + + + def test_suite(): +diff -r ee879c0ffa11 Lib/distutils/tests/test_upload.py +--- a/Lib/distutils/tests/test_upload.py ++++ b/Lib/distutils/tests/test_upload.py +@@ -119,7 +119,7 @@ + # what did we send ? + self.assertIn('dédé', self.last_open.req.data) + headers = dict(self.last_open.req.headers) +- self.assertEqual(headers['Content-length'], '2085') ++ self.assertEqual(headers['Content-length'], '2159') + self.assertTrue(headers['Content-type'].startswith('multipart/form-data')) + self.assertEqual(self.last_open.req.get_method(), 'POST') + self.assertEqual(self.last_open.req.get_full_url(), +diff -r ee879c0ffa11 Lib/doctest.py +--- a/Lib/doctest.py ++++ b/Lib/doctest.py +@@ -216,7 +216,7 @@ + # get_data() opens files as 'rb', so one must do the equivalent + # conversion as universal newlines would do. + return file_contents.replace(os.linesep, '\n'), filename +- with open(filename) as f: ++ with open(filename, 'U') as f: + return f.read(), filename + + # Use sys.stdout encoding for ouput. +diff -r ee879c0ffa11 Lib/email/feedparser.py +--- a/Lib/email/feedparser.py ++++ b/Lib/email/feedparser.py +@@ -49,8 +49,8 @@ + simple abstraction -- it parses until EOF closes the current message. + """ + def __init__(self): +- # The last partial line pushed into this object. +- self._partial = '' ++ # Chunks of the last partial line pushed into this object. ++ self._partial = [] + # The list of full, pushed lines, in reverse order + self._lines = [] + # The stack of false-EOF checking predicates. +@@ -66,8 +66,8 @@ + + def close(self): + # Don't forget any trailing partial line. +- self._lines.append(self._partial) +- self._partial = '' ++ self.pushlines(''.join(self._partial).splitlines(True)) ++ self._partial = [] + self._closed = True + + def readline(self): +@@ -95,8 +95,29 @@ + + def push(self, data): + """Push some new data into this object.""" +- # Handle any previous leftovers +- data, self._partial = self._partial + data, '' ++ # Crack into lines, but preserve the linesep characters on the end of each ++ parts = data.splitlines(True) ++ ++ if not parts or not parts[0].endswith(('\n', '\r')): ++ # No new complete lines, so just accumulate partials ++ self._partial += parts ++ return ++ ++ if self._partial: ++ # If there are previous leftovers, complete them now ++ self._partial.append(parts[0]) ++ parts[0:1] = ''.join(self._partial).splitlines(True) ++ del self._partial[:] ++ ++ # If the last element of the list does not end in a newline, then treat ++ # it as a partial line. We only check for '\n' here because a line ++ # ending with '\r' might be a line that was split in the middle of a ++ # '\r\n' sequence (see bugs 1555570 and 1721862). ++ if not parts[-1].endswith('\n'): ++ self._partial = [parts.pop()] ++ self.pushlines(parts) ++ ++ def pushlines(self, lines): + # Crack into lines, but preserve the newlines on the end of each + parts = NLCRE_crack.split(data) + # The *ahem* interesting behaviour of re.split when supplied grouping +diff -r ee879c0ffa11 Lib/email/mime/nonmultipart.py +--- a/Lib/email/mime/nonmultipart.py ++++ b/Lib/email/mime/nonmultipart.py +@@ -12,7 +12,7 @@ + + + class MIMENonMultipart(MIMEBase): +- """Base class for MIME multipart/* type messages.""" ++ """Base class for MIME non-multipart type messages.""" + + def attach(self, payload): + # The public API prohibits attaching multiple subparts to MIMEBase +diff -r ee879c0ffa11 Lib/email/test/test_email.py +--- a/Lib/email/test/test_email.py ++++ b/Lib/email/test/test_email.py +@@ -11,6 +11,7 @@ + import warnings + import textwrap + from cStringIO import StringIO ++from random import choice + + import email + +@@ -2578,16 +2579,64 @@ + bsf.push(il) + nt += n + n1 = 0 +- while True: +- ol = bsf.readline() +- if ol == NeedMoreData: +- break ++ for ol in iter(bsf.readline, NeedMoreData): + om.append(ol) + n1 += 1 + self.assertEqual(n, n1) + self.assertEqual(len(om), nt) + self.assertEqual(''.join([il for il, n in imt]), ''.join(om)) + ++ def test_push_random(self): ++ from email.feedparser import BufferedSubFile, NeedMoreData ++ ++ n = 10000 ++ chunksize = 5 ++ chars = 'abcd \t\r\n' ++ ++ s = ''.join(choice(chars) for i in range(n)) + '\n' ++ target = s.splitlines(True) ++ ++ bsf = BufferedSubFile() ++ lines = [] ++ for i in range(0, len(s), chunksize): ++ chunk = s[i:i+chunksize] ++ bsf.push(chunk) ++ lines.extend(iter(bsf.readline, NeedMoreData)) ++ self.assertEqual(lines, target) ++ ++ ++class TestFeedParsers(TestEmailBase): ++ ++ def parse(self, chunks): ++ from email.feedparser import FeedParser ++ feedparser = FeedParser() ++ for chunk in chunks: ++ feedparser.feed(chunk) ++ return feedparser.close() ++ ++ def test_newlines(self): ++ m = self.parse(['a:\nb:\rc:\r\nd:\n']) ++ self.assertEqual(m.keys(), ['a', 'b', 'c', 'd']) ++ m = self.parse(['a:\nb:\rc:\r\nd:']) ++ self.assertEqual(m.keys(), ['a', 'b', 'c', 'd']) ++ m = self.parse(['a:\rb', 'c:\n']) ++ self.assertEqual(m.keys(), ['a', 'bc']) ++ m = self.parse(['a:\r', 'b:\n']) ++ self.assertEqual(m.keys(), ['a', 'b']) ++ m = self.parse(['a:\r', '\nb:\n']) ++ self.assertEqual(m.keys(), ['a', 'b']) ++ ++ def test_long_lines(self): ++ # Expected peak memory use on 32-bit platform: 4*N*M bytes. ++ M, N = 1000, 20000 ++ m = self.parse(['a:b\n\n'] + ['x'*M] * N) ++ self.assertEqual(m.items(), [('a', 'b')]) ++ self.assertEqual(m.get_payload(), 'x'*M*N) ++ m = self.parse(['a:b\r\r'] + ['x'*M] * N) ++ self.assertEqual(m.items(), [('a', 'b')]) ++ self.assertEqual(m.get_payload(), 'x'*M*N) ++ m = self.parse(['a:\r', 'b: '] + ['x'*M] * N) ++ self.assertEqual(m.items(), [('a', ''), ('b', 'x'*M*N)]) + + + class TestParsers(TestEmailBase): +@@ -3180,7 +3229,6 @@ + self.assertEqual(res, '=?iso-8859-2?q?abc?=') + self.assertIsInstance(res, str) + +- + # Test RFC 2231 header parameters (en/de)coding + class TestRFC2231(TestEmailBase): + def test_get_param(self): +diff -r ee879c0ffa11 Lib/ensurepip/__init__.py +--- /dev/null ++++ b/Lib/ensurepip/__init__.py +@@ -0,0 +1,227 @@ ++#!/usr/bin/env python2 ++from __future__ import print_function ++ ++import os ++import os.path ++import pkgutil ++import shutil ++import sys ++import tempfile ++ ++ ++__all__ = ["version", "bootstrap"] ++ ++ ++_SETUPTOOLS_VERSION = "7.0" ++ ++_PIP_VERSION = "1.5.6" ++ ++# pip currently requires ssl support, so we try to provide a nicer ++# error message when that is missing (http://bugs.python.org/issue19744) ++_MISSING_SSL_MESSAGE = ("pip {} requires SSL/TLS".format(_PIP_VERSION)) ++try: ++ import ssl ++except ImportError: ++ ssl = None ++ ++ def _require_ssl_for_pip(): ++ raise RuntimeError(_MISSING_SSL_MESSAGE) ++else: ++ def _require_ssl_for_pip(): ++ pass ++ ++_PROJECTS = [ ++ ("setuptools", _SETUPTOOLS_VERSION), ++ ("pip", _PIP_VERSION), ++] ++ ++ ++def _run_pip(args, additional_paths=None): ++ # Add our bundled software to the sys.path so we can import it ++ if additional_paths is not None: ++ sys.path = additional_paths + sys.path ++ ++ # Install the bundled software ++ import pip ++ pip.main(args) ++ ++ ++def version(): ++ """ ++ Returns a string specifying the bundled version of pip. ++ """ ++ return _PIP_VERSION ++ ++ ++def _disable_pip_configuration_settings(): ++ # We deliberately ignore all pip environment variables ++ # when invoking pip ++ # See http://bugs.python.org/issue19734 for details ++ keys_to_remove = [k for k in os.environ if k.startswith("PIP_")] ++ for k in keys_to_remove: ++ del os.environ[k] ++ # We also ignore the settings in the default pip configuration file ++ # See http://bugs.python.org/issue20053 for details ++ os.environ['PIP_CONFIG_FILE'] = os.devnull ++ ++ ++def bootstrap(root=None, upgrade=False, user=False, ++ altinstall=False, default_pip=True, ++ verbosity=0): ++ """ ++ Bootstrap pip into the current Python installation (or the given root ++ directory). ++ ++ Note that calling this function will alter both sys.path and os.environ. ++ """ ++ if altinstall and default_pip: ++ raise ValueError("Cannot use altinstall and default_pip together") ++ ++ _require_ssl_for_pip() ++ _disable_pip_configuration_settings() ++ ++ # By default, installing pip and setuptools installs all of the ++ # following scripts (X.Y == running Python version): ++ # ++ # pip, pipX, pipX.Y, easy_install, easy_install-X.Y ++ # ++ # pip 1.5+ allows ensurepip to request that some of those be left out ++ if altinstall: ++ # omit pip, pipX and easy_install ++ os.environ["ENSUREPIP_OPTIONS"] = "altinstall" ++ elif not default_pip: ++ # omit pip and easy_install ++ os.environ["ENSUREPIP_OPTIONS"] = "install" ++ ++ tmpdir = tempfile.mkdtemp() ++ try: ++ # Put our bundled wheels into a temporary directory and construct the ++ # additional paths that need added to sys.path ++ additional_paths = [] ++ for project, version in _PROJECTS: ++ wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) ++ whl = pkgutil.get_data( ++ "ensurepip", ++ "_bundled/{}".format(wheel_name), ++ ) ++ with open(os.path.join(tmpdir, wheel_name), "wb") as fp: ++ fp.write(whl) ++ ++ additional_paths.append(os.path.join(tmpdir, wheel_name)) ++ ++ # Construct the arguments to be passed to the pip command ++ args = ["install", "--no-index", "--find-links", tmpdir] ++ if root: ++ args += ["--root", root] ++ if upgrade: ++ args += ["--upgrade"] ++ if user: ++ args += ["--user"] ++ if verbosity: ++ args += ["-" + "v" * verbosity] ++ ++ _run_pip(args + [p[0] for p in _PROJECTS], additional_paths) ++ finally: ++ shutil.rmtree(tmpdir, ignore_errors=True) ++ ++ ++def _uninstall_helper(verbosity=0): ++ """Helper to support a clean default uninstall process on Windows ++ ++ Note that calling this function may alter os.environ. ++ """ ++ # Nothing to do if pip was never installed, or has been removed ++ try: ++ import pip ++ except ImportError: ++ return ++ ++ # If the pip version doesn't match the bundled one, leave it alone ++ if pip.__version__ != _PIP_VERSION: ++ msg = ("ensurepip will only uninstall a matching version " ++ "({!r} installed, {!r} bundled)") ++ print(msg.format(pip.__version__, _PIP_VERSION), file=sys.stderr) ++ return ++ ++ _require_ssl_for_pip() ++ _disable_pip_configuration_settings() ++ ++ # Construct the arguments to be passed to the pip command ++ args = ["uninstall", "-y"] ++ if verbosity: ++ args += ["-" + "v" * verbosity] ++ ++ _run_pip(args + [p[0] for p in reversed(_PROJECTS)]) ++ ++ ++def _main(argv=None): ++ if ssl is None: ++ print("Ignoring ensurepip failure: {}".format(_MISSING_SSL_MESSAGE), ++ file=sys.stderr) ++ return ++ ++ import argparse ++ parser = argparse.ArgumentParser(prog="python -m ensurepip") ++ parser.add_argument( ++ "--version", ++ action="version", ++ version="pip {}".format(version()), ++ help="Show the version of pip that is bundled with this Python.", ++ ) ++ parser.add_argument( ++ "-v", "--verbose", ++ action="count", ++ default=0, ++ dest="verbosity", ++ help=("Give more output. Option is additive, and can be used up to 3 " ++ "times."), ++ ) ++ parser.add_argument( ++ "-U", "--upgrade", ++ action="store_true", ++ default=False, ++ help="Upgrade pip and dependencies, even if already installed.", ++ ) ++ parser.add_argument( ++ "--user", ++ action="store_true", ++ default=False, ++ help="Install using the user scheme.", ++ ) ++ parser.add_argument( ++ "--root", ++ default=None, ++ help="Install everything relative to this alternate root directory.", ++ ) ++ parser.add_argument( ++ "--altinstall", ++ action="store_true", ++ default=False, ++ help=("Make an alternate install, installing only the X.Y versioned" ++ "scripts (Default: pipX, pipX.Y, easy_install-X.Y)"), ++ ) ++ parser.add_argument( ++ "--default-pip", ++ action="store_true", ++ default=True, ++ dest="default_pip", ++ help=argparse.SUPPRESS, ++ ) ++ parser.add_argument( ++ "--no-default-pip", ++ action="store_false", ++ dest="default_pip", ++ help=("Make a non default install, installing only the X and X.Y " ++ "versioned scripts."), ++ ) ++ ++ args = parser.parse_args(argv) ++ ++ bootstrap( ++ root=args.root, ++ upgrade=args.upgrade, ++ user=args.user, ++ verbosity=args.verbosity, ++ altinstall=args.altinstall, ++ default_pip=args.default_pip, ++ ) +diff -r ee879c0ffa11 Lib/ensurepip/__main__.py +--- /dev/null ++++ b/Lib/ensurepip/__main__.py +@@ -0,0 +1,4 @@ ++import ensurepip ++ ++if __name__ == "__main__": ++ ensurepip._main() +diff -r ee879c0ffa11 Lib/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl +Binary file Lib/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl has changed +diff -r ee879c0ffa11 Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl +Binary file Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl has changed +diff -r ee879c0ffa11 Lib/ensurepip/_uninstall.py +--- /dev/null ++++ b/Lib/ensurepip/_uninstall.py +@@ -0,0 +1,30 @@ ++"""Basic pip uninstallation support, helper for the Windows uninstaller""" ++ ++import argparse ++import ensurepip ++ ++ ++def _main(argv=None): ++ parser = argparse.ArgumentParser(prog="python -m ensurepip._uninstall") ++ parser.add_argument( ++ "--version", ++ action="version", ++ version="pip {}".format(ensurepip.version()), ++ help="Show the version of pip this will attempt to uninstall.", ++ ) ++ parser.add_argument( ++ "-v", "--verbose", ++ action="count", ++ default=0, ++ dest="verbosity", ++ help=("Give more output. Option is additive, and can be used up to 3 " ++ "times."), ++ ) ++ ++ args = parser.parse_args(argv) ++ ++ ensurepip._uninstall_helper(verbosity=args.verbosity) ++ ++ ++if __name__ == "__main__": ++ _main() +diff -r ee879c0ffa11 Lib/glob.py +--- a/Lib/glob.py ++++ b/Lib/glob.py +@@ -35,11 +35,16 @@ + patterns. + + """ ++ dirname, basename = os.path.split(pathname) + if not has_magic(pathname): +- if os.path.lexists(pathname): +- yield pathname ++ if basename: ++ if os.path.lexists(pathname): ++ yield pathname ++ else: ++ # Patterns ending with a slash should match only directories ++ if os.path.isdir(dirname): ++ yield pathname + return +- dirname, basename = os.path.split(pathname) + if not dirname: + for name in glob1(os.curdir, basename): + yield name +diff -r ee879c0ffa11 Lib/gzip.py +--- a/Lib/gzip.py ++++ b/Lib/gzip.py +@@ -164,9 +164,16 @@ + def _write_gzip_header(self): + self.fileobj.write('\037\213') # magic header + self.fileobj.write('\010') # compression method +- fname = os.path.basename(self.name) +- if fname.endswith(".gz"): +- fname = fname[:-3] ++ try: ++ # RFC 1952 requires the FNAME field to be Latin-1. Do not ++ # include filenames that cannot be represented that way. ++ fname = os.path.basename(self.name) ++ if not isinstance(fname, str): ++ fname = fname.encode('latin-1') ++ if fname.endswith('.gz'): ++ fname = fname[:-3] ++ except UnicodeEncodeError: ++ fname = '' + flags = 0 + if fname: + flags = FNAME +diff -r ee879c0ffa11 Lib/hashlib.py +--- a/Lib/hashlib.py ++++ b/Lib/hashlib.py +@@ -15,8 +15,9 @@ + + md5(), sha1(), sha224(), sha256(), sha384(), and sha512() + +-More algorithms may be available on your platform but the above are +-guaranteed to exist. ++More algorithms may be available on your platform but the above are guaranteed ++to exist. See the algorithms_guaranteed and algorithms_available attributes ++to find out what algorithm names can be passed to new(). + + NOTE: If you want the adler32 or crc32 hash functions they are available in + the zlib module. +@@ -58,9 +59,14 @@ + # always available algorithm is added. + __always_supported = ('md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512') + ++algorithms_guaranteed = set(__always_supported) ++algorithms_available = set(__always_supported) ++ + algorithms = __always_supported + +-__all__ = __always_supported + ('new', 'algorithms', 'pbkdf2_hmac') ++__all__ = __always_supported + ('new', 'algorithms_guaranteed', ++ 'algorithms_available', 'algorithms', ++ 'pbkdf2_hmac') + + + def __get_builtin_constructor(name): +@@ -128,6 +134,8 @@ + import _hashlib + new = __hash_new + __get_hash = __get_openssl_constructor ++ algorithms_available = algorithms_available.union( ++ _hashlib.openssl_md_meth_names) + except ImportError: + new = __py_new + __get_hash = __get_builtin_constructor +diff -r ee879c0ffa11 Lib/httplib.py +--- a/Lib/httplib.py ++++ b/Lib/httplib.py +@@ -215,6 +215,10 @@ + # maximal line length when calling readline(). + _MAXLINE = 65536 + ++# maximum amount of headers accepted ++_MAXHEADERS = 100 ++ ++ + class HTTPMessage(mimetools.Message): + + def addheader(self, key, value): +@@ -271,6 +275,8 @@ + elif self.seekable: + tell = self.fp.tell + while True: ++ if len(hlist) > _MAXHEADERS: ++ raise HTTPException("got more than %d headers" % _MAXHEADERS) + if tell: + try: + startofline = tell() +diff -r ee879c0ffa11 Lib/idlelib/Bindings.py +--- a/Lib/idlelib/Bindings.py ++++ b/Lib/idlelib/Bindings.py +@@ -75,7 +75,8 @@ + ('!_Auto-open Stack Viewer', '<>'), + ]), + ('options', [ +- ('_Configure IDLE...', '<>'), ++ ('Configure _IDLE', '<>'), ++ ('Configure _Extensions', '<>'), + None, + ]), + ('help', [ +diff -r ee879c0ffa11 Lib/idlelib/CallTipWindow.py +--- a/Lib/idlelib/CallTipWindow.py ++++ b/Lib/idlelib/CallTipWindow.py +@@ -2,9 +2,8 @@ + + After ToolTip.py, which uses ideas gleaned from PySol + Used by the CallTips IDLE extension. +- + """ +-from Tkinter import * ++from Tkinter import Toplevel, Label, LEFT, SOLID, TclError + + HIDE_VIRTUAL_EVENT_NAME = "<>" + HIDE_SEQUENCES = ("", "") +@@ -133,35 +132,28 @@ + return bool(self.tipwindow) + + +-def _calltip_window(parent): +- root = Tk() +- root.title("Test calltips") +- width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) +- root.geometry("+%d+%d"%(x, y + 150)) ++def _calltip_window(parent): # htest # ++ from Tkinter import Toplevel, Text, LEFT, BOTH + +- class MyEditWin: # comparenceptually an editor_window +- def __init__(self): +- text = self.text = Text(root) +- text.pack(side=LEFT, fill=BOTH, expand=1) +- text.insert("insert", "string.split") +- root.update() +- self.calltip = CallTip(text) ++ top = Toplevel(parent) ++ top.title("Test calltips") ++ top.geometry("200x100+%d+%d" % (parent.winfo_rootx() + 200, ++ parent.winfo_rooty() + 150)) ++ text = Text(top) ++ text.pack(side=LEFT, fill=BOTH, expand=1) ++ text.insert("insert", "string.split") ++ top.update() ++ calltip = CallTip(text) + +- text.event_add("<>", "(") +- text.event_add("<>", ")") +- text.bind("<>", self.calltip_show) +- text.bind("<>", self.calltip_hide) +- +- text.focus_set() +- root.mainloop() +- +- def calltip_show(self, event): +- self.calltip.showtip("Hello world", "insert", "end") +- +- def calltip_hide(self, event): +- self.calltip.hidetip() +- +- editwin = MyEditWin() ++ def calltip_show(event): ++ calltip.showtip("(s=Hello world)", "insert", "end") ++ def calltip_hide(event): ++ calltip.hidetip() ++ text.event_add("<>", "(") ++ text.event_add("<>", ")") ++ text.bind("<>", calltip_show) ++ text.bind("<>", calltip_hide) ++ text.focus_set() + + if __name__=='__main__': + from idlelib.idle_test.htest import run +diff -r ee879c0ffa11 Lib/idlelib/ClassBrowser.py +--- a/Lib/idlelib/ClassBrowser.py ++++ b/Lib/idlelib/ClassBrowser.py +@@ -19,6 +19,9 @@ + from idlelib.TreeWidget import TreeNode, TreeItem, ScrolledCanvas + from idlelib.configHandler import idleConf + ++file_open = None # Method...Item and Class...Item use this. ++# Normally PyShell.flist.open, but there is no PyShell.flist for htest. ++ + class ClassBrowser: + + def __init__(self, flist, name, path, _htest=False): +@@ -27,6 +30,9 @@ + """ + _htest - bool, change box when location running htest. + """ ++ global file_open ++ if not _htest: ++ file_open = PyShell.flist.open + self.name = name + self.file = os.path.join(path[0], self.name + ".py") + self._htest = _htest +@@ -101,7 +107,7 @@ + return [] + try: + dict = pyclbr.readmodule_ex(name, [dir] + sys.path) +- except ImportError, msg: ++ except ImportError: + return [] + items = [] + self.classes = {} +@@ -170,7 +176,7 @@ + def OnDoubleClick(self): + if not os.path.exists(self.file): + return +- edit = PyShell.flist.open(self.file) ++ edit = file_open(self.file) + if hasattr(self.cl, 'lineno'): + lineno = self.cl.lineno + edit.gotoline(lineno) +@@ -206,7 +212,7 @@ + def OnDoubleClick(self): + if not os.path.exists(self.file): + return +- edit = PyShell.flist.open(self.file) ++ edit = file_open(self.file) + edit.gotoline(self.cl.methods[self.name]) + + def _class_browser(parent): #Wrapper for htest +@@ -221,8 +227,9 @@ + dir, file = os.path.split(file) + name = os.path.splitext(file)[0] + flist = PyShell.PyShellFileList(parent) ++ global file_open ++ file_open = flist.open + ClassBrowser(flist, name, [dir], _htest=True) +- parent.mainloop() + + if __name__ == "__main__": + from idlelib.idle_test.htest import run +diff -r ee879c0ffa11 Lib/idlelib/ColorDelegator.py +--- a/Lib/idlelib/ColorDelegator.py ++++ b/Lib/idlelib/ColorDelegator.py +@@ -2,7 +2,6 @@ + import re + import keyword + import __builtin__ +-from Tkinter import * + from idlelib.Delegator import Delegator + from idlelib.configHandler import idleConf + +@@ -34,7 +33,6 @@ + + prog = re.compile(make_pat(), re.S) + idprog = re.compile(r"\s+(\w+)", re.S) +-asprog = re.compile(r".*?\b(as)\b") + + class ColorDelegator(Delegator): + +@@ -42,7 +40,6 @@ + Delegator.__init__(self) + self.prog = prog + self.idprog = idprog +- self.asprog = asprog + self.LoadTagDefs() + + def setdelegate(self, delegate): +@@ -74,7 +71,6 @@ + "DEFINITION": idleConf.GetHighlight(theme, "definition"), + "SYNC": {'background':None,'foreground':None}, + "TODO": {'background':None,'foreground':None}, +- "BREAK": idleConf.GetHighlight(theme, "break"), + "ERROR": idleConf.GetHighlight(theme, "error"), + # The following is used by ReplaceDialog: + "hit": idleConf.GetHighlight(theme, "hit"), +@@ -216,22 +212,6 @@ + self.tag_add("DEFINITION", + head + "+%dc" % a, + head + "+%dc" % b) +- elif value == "import": +- # color all the "as" words on same line, except +- # if in a comment; cheap approximation to the +- # truth +- if '#' in chars: +- endpos = chars.index('#') +- else: +- endpos = len(chars) +- while True: +- m1 = self.asprog.match(chars, b, endpos) +- if not m1: +- break +- a, b = m1.span(1) +- self.tag_add("KEYWORD", +- head + "+%dc" % a, +- head + "+%dc" % b) + m = self.prog.search(chars, m.end()) + if "SYNC" in self.tag_names(next + "-1c"): + head = next +@@ -255,20 +235,23 @@ + for tag in self.tagdefs.keys(): + self.tag_remove(tag, "1.0", "end") + +-def _color_delegator(parent): ++def _color_delegator(parent): # htest # ++ from Tkinter import Toplevel, Text + from idlelib.Percolator import Percolator +- root = Tk() +- root.title("Test ColorDelegator") +- width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) +- root.geometry("+%d+%d"%(x, y + 150)) +- source = "if somename: x = 'abc' # comment\nprint" +- text = Text(root, background="white") ++ ++ top = Toplevel(parent) ++ top.title("Test ColorDelegator") ++ top.geometry("200x100+%d+%d" % (parent.winfo_rootx() + 200, ++ parent.winfo_rooty() + 150)) ++ source = "if somename: x = 'abc' # comment\nprint\n" ++ text = Text(top, background="white") ++ text.pack(expand=1, fill="both") + text.insert("insert", source) +- text.pack(expand=1, fill="both") ++ text.focus_set() ++ + p = Percolator(text) + d = ColorDelegator() + p.insertfilter(d) +- root.mainloop() + + if __name__ == "__main__": + from idlelib.idle_test.htest import run +diff -r ee879c0ffa11 Lib/idlelib/Debugger.py +--- a/Lib/idlelib/Debugger.py ++++ b/Lib/idlelib/Debugger.py +@@ -1,6 +1,5 @@ + import os + import bdb +-import types + from Tkinter import * + from idlelib.WindowList import ListedToplevel + from idlelib.ScrolledList import ScrolledList +diff -r ee879c0ffa11 Lib/idlelib/EditorWindow.py +--- a/Lib/idlelib/EditorWindow.py ++++ b/Lib/idlelib/EditorWindow.py +@@ -1,6 +1,6 @@ + import sys + import os +-from platform import python_version ++import platform + import re + import imp + from Tkinter import * +@@ -22,6 +22,8 @@ + # The default tab setting for a Text widget, in average-width characters. + TK_TABWIDTH_DEFAULT = 8 + ++_py_version = ' (%s)' % platform.python_version() ++ + def _sphinx_version(): + "Format sys.version_info to produce the Sphinx version string used to install the chm docs" + major, minor, micro, level, serial = sys.version_info +@@ -151,7 +153,7 @@ + # Safari requires real file:-URLs + EditorWindow.help_url = 'file://' + EditorWindow.help_url + else: +- EditorWindow.help_url = "http://docs.python.org/%d.%d" % sys.version_info[:2] ++ EditorWindow.help_url = "https://docs.python.org/%d.%d/" % sys.version_info[:2] + currentTheme=idleConf.CurrentTheme() + self.flist = flist + root = root or flist.root +@@ -214,6 +216,8 @@ + text.bind("<>", self.python_docs) + text.bind("<>", self.about_dialog) + text.bind("<>", self.config_dialog) ++ text.bind("<>", ++ self.config_extensions_dialog) + text.bind("<>", self.open_module) + text.bind("<>", lambda event: "break") + text.bind("<>", self.select_all) +@@ -568,6 +572,8 @@ + + def config_dialog(self, event=None): + configDialog.ConfigDialog(self.top,'Settings') ++ def config_extensions_dialog(self, event=None): ++ configDialog.ConfigExtensionsDialog(self.top) + + def help_dialog(self, event=None): + if self.root: +@@ -691,30 +697,29 @@ + return + # XXX Ought to insert current file's directory in front of path + try: +- (f, file, (suffix, mode, type)) = _find_module(name) ++ (f, file_path, (suffix, mode, mtype)) = _find_module(name) + except (NameError, ImportError) as msg: + tkMessageBox.showerror("Import error", str(msg), parent=self.text) + return +- if type != imp.PY_SOURCE: ++ if mtype != imp.PY_SOURCE: + tkMessageBox.showerror("Unsupported type", + "%s is not a source module" % name, parent=self.text) + return + if f: + f.close() + if self.flist: +- self.flist.open(file) ++ self.flist.open(file_path) + else: +- self.io.loadfile(file) ++ self.io.loadfile(file_path) ++ return file_path + + def open_class_browser(self, event=None): + filename = self.io.filename +- if not filename: +- tkMessageBox.showerror( +- "No filename", +- "This buffer has no associated filename", +- master=self.text) +- self.text.focus_set() +- return None ++ if not (self.__class__.__name__ == 'PyShellEditorWindow' ++ and filename): ++ filename = self.open_module() ++ if filename is None: ++ return + head, tail = os.path.split(filename) + base, ext = os.path.splitext(tail) + from idlelib import ClassBrowser +@@ -779,7 +784,7 @@ + self.color = None + + def ResetColorizer(self): +- "Update the colour theme" ++ "Update the color theme" + # Called from self.filename_change_hook and from configDialog.py + self._rmcolorizer() + self._addcolorizer() +@@ -944,7 +949,7 @@ + short = self.short_title() + long = self.long_title() + if short and long: +- title = short + " - " + long ++ title = short + " - " + long + _py_version + elif short: + title = short + elif long: +@@ -968,14 +973,13 @@ + self.undo.reset_undo() + + def short_title(self): +- pyversion = "Python " + python_version() + ": " + filename = self.io.filename + if filename: + filename = os.path.basename(filename) + else: + filename = "Untitled" + # return unicode string to display non-ASCII chars correctly +- return pyversion + self._filename_to_unicode(filename) ++ return self._filename_to_unicode(filename) + + def long_title(self): + # return unicode string to display non-ASCII chars correctly +@@ -1711,7 +1715,8 @@ + tk.call('set', 'tcl_nonwordchars', '[^a-zA-Z0-9_]') + + +-def _editor_window(parent): ++def _editor_window(parent): # htest # ++ # error if close master window first - timer event, after script + root = parent + fixwordbreaks(root) + if sys.argv[1:]: +@@ -1721,7 +1726,8 @@ + macosxSupport.setupApp(root, None) + edit = EditorWindow(root=root, filename=filename) + edit.text.bind("<>", edit.close_event) +- parent.mainloop() ++ # Does not stop error, neither does following ++ # edit.text.bind("<>", edit.close_event) + + + if __name__ == '__main__': +diff -r ee879c0ffa11 Lib/idlelib/GrepDialog.py +--- a/Lib/idlelib/GrepDialog.py ++++ b/Lib/idlelib/GrepDialog.py +@@ -45,10 +45,10 @@ + + def create_entries(self): + SearchDialogBase.create_entries(self) +- self.globent = self.make_entry("In files:", self.globvar) ++ self.globent = self.make_entry("In files:", self.globvar)[0] + + def create_other_buttons(self): +- f = self.make_frame() ++ f = self.make_frame()[0] + + btn = Checkbutton(f, anchor="w", + variable=self.recvar, +@@ -131,7 +131,7 @@ + self.top.withdraw() + + +-def _grep_dialog(parent): # for htest ++def _grep_dialog(parent): # htest # + from idlelib.PyShell import PyShellFileList + root = Tk() + root.title("Test GrepDialog") +diff -r ee879c0ffa11 Lib/idlelib/IOBinding.py +--- a/Lib/idlelib/IOBinding.py ++++ b/Lib/idlelib/IOBinding.py +@@ -19,11 +19,7 @@ + + from idlelib.configHandler import idleConf + +-try: +- from codecs import BOM_UTF8 +-except ImportError: +- # only available since Python 2.3 +- BOM_UTF8 = '\xef\xbb\xbf' ++from codecs import BOM_UTF8 + + # Try setting the locale, so that we can find out + # what encoding to use +@@ -72,6 +68,7 @@ + encoding = encoding.lower() + + coding_re = re.compile(r'^[ \t\f]*#.*coding[:=][ \t]*([-\w.]+)') ++blank_re = re.compile(r'^[ \t\f]*(?:[#\r\n]|$)') + + class EncodingMessage(SimpleDialog): + "Inform user that an encoding declaration is needed." +@@ -130,6 +127,8 @@ + match = coding_re.match(line) + if match is not None: + break ++ if not blank_re.match(line): ++ return None + else: + return None + name = match.group(1) +@@ -529,6 +528,8 @@ + ("All files", "*"), + ] + ++ defaultextension = '.py' if sys.platform == 'darwin' else '' ++ + def askopenfile(self): + dir, base = self.defaultfilename("open") + if not self.opendialog: +@@ -554,8 +555,10 @@ + def asksavefile(self): + dir, base = self.defaultfilename("save") + if not self.savedialog: +- self.savedialog = tkFileDialog.SaveAs(master=self.text, +- filetypes=self.filetypes) ++ self.savedialog = tkFileDialog.SaveAs( ++ master=self.text, ++ filetypes=self.filetypes, ++ defaultextension=self.defaultextension) + filename = self.savedialog.show(initialdir=dir, initialfile=base) + if isinstance(filename, unicode): + filename = filename.encode(filesystemencoding) +diff -r ee879c0ffa11 Lib/idlelib/NEWS.txt +--- a/Lib/idlelib/NEWS.txt ++++ b/Lib/idlelib/NEWS.txt +@@ -1,6 +1,151 @@ ++What's New in IDLE 2.7.9? ++========================= ++ ++What's New in IDLE 2.7.8? ++========================= ++ ++*Release date: 2014-06-29* ++ ++- Issue #21940: Add unittest for WidgetRedirector. Initial patch by Saimadhav ++ Heblikar. ++ ++- Issue #18592: Add unittest for SearchDialogBase. Patch by Phil Webster. ++ ++- Issue #21694: Add unittest for ParenMatch. Patch by Saimadhav Heblikar. ++ ++- Issue #21686: add unittest for HyperParser. Original patch by Saimadhav ++ Heblikar. ++ ++- Issue #12387: Add missing upper(lower)case versions of default Windows key ++ bindings for Idle so Caps Lock does not disable them. Patch by Roger Serwy. ++ ++- Issue #21695: Closing a Find-in-files output window while the search is ++ still in progress no longer closes Idle. ++ ++- Issue #18910: Add unittest for textView. Patch by Phil Webster. ++ ++- Issue #18292: Add unittest for AutoExpand. Patch by Saihadhav Heblikar. ++ ++- Issue #18409: Add unittest for AutoComplete. Patch by Phil Webster. ++ ++ ++What's New in IDLE 2.7.7? ++========================= ++ ++*Release date: 2014-05-31* ++ ++- Issue #18104: Add idlelib/idle_test/htest.py with a few sample tests to begin ++ consolidating and improving human-validated tests of Idle. Change other files ++ as needed to work with htest. Running the module as __main__ runs all tests. ++ ++- Issue #21139: Change default paragraph width to 72, the PEP 8 recommendation. ++ ++- Issue #21284: Paragraph reformat test passes after user changes reformat width. ++ ++- Issue #20406: Use Python application icons for Idle window title bars. ++ Patch mostly by Serhiy Storchaka. ++ ++- Issue #21029: Occurrences of "print" are now consistently colored as ++ being a keyword (the colorizer doesn't know if print functions are ++ enabled in the source). ++ ++- Issue #17721: Remove non-functional configuration dialog help button until we ++ make it actually gives some help when clicked. Patch by Guilherme Simões. ++ ++- Issue #17390: Add Python version to Idle editor window title bar. ++ Original patches by Edmond Burnett and Kent Johnson. ++ ++- Issue #20058: sys.stdin.readline() in IDLE now always returns only one line. ++ ++- Issue #19481: print() of unicode, str or bytearray subclass instance in IDLE ++ no more hangs. ++ ++- Issue #18270: Prevent possible IDLE AttributeError on OS X when no initial ++ shell window is present. ++ ++- Issue #17654: Ensure IDLE menus are customized properly on OS X for ++ non-framework builds and for all variants of Tk. ++ ++ ++What's New in IDLE 2.7.6? ++========================= ++ ++*Release date: 2013-11-10* ++ ++- Issue #19426: Fixed the opening of Python source file with specified encoding. ++ ++- Issue #18873: IDLE now detects Python source code encoding only in comment ++ lines. ++ ++- Issue #18988: The "Tab" key now works when a word is already autocompleted. ++ ++- Issue #18489: Add tests for SearchEngine. Original patch by Phil Webster. ++ ++- Issue #18429: Format / Format Paragraph, now works when comment blocks ++ are selected. As with text blocks, this works best when the selection ++ only includes complete lines. ++ ++- Issue #18226: Add docstrings and unittests for FormatParagraph.py. ++ Original patches by Todd Rovito and Phil Webster. ++ ++- Issue #18279: Format - Strip trailing whitespace no longer marks a file as ++ changed when it has not been changed. This fix followed the addition of a ++ test file originally written by Phil Webster (the issue's main goal). ++ ++- Issue #18539: Calltips now work for float default arguments. ++ ++- Issue #7136: In the Idle File menu, "New Window" is renamed "New File". ++ Patch by Tal Einat, Roget Serwy, and Todd Rovito. ++ ++- Issue #8515: Set __file__ when run file in IDLE. ++ Initial patch by Bruce Frederiksen. ++ ++- Issue #5492: Avoid traceback when exiting IDLE caused by a race condition. ++ ++- Issue #17511: Keep IDLE find dialog open after clicking "Find Next". ++ Original patch by Sarah K. ++ ++- Issue #15392: Create a unittest framework for IDLE. ++ Preliminary patch by Rajagopalasarma Jayakrishnan ++ See Lib/idlelib/idle_test/README.txt for how to run Idle tests. ++ ++- Issue #14146: Highlight source line while debugging on Windows. ++ ++- Issue #17532: Always include Options menu for IDLE on OS X. ++ Patch by Guilherme Simões. ++ ++ + What's New in IDLE 2.7.5? + ========================= + ++*Release date: 2013-05-12* ++ ++- Issue #17838: Allow sys.stdin to be reassigned. ++ ++- Issue #14735: Update IDLE docs to omit "Control-z on Windows". ++ ++- Issue #17585: Fixed IDLE regression. Now closes when using exit() or quit(). ++ ++- Issue #17657: Show full Tk version in IDLE's about dialog. ++ Patch by Todd Rovito. ++ ++- Issue #17613: Prevent traceback when removing syntax colorizer in IDLE. ++ ++- Issue #1207589: Backwards-compatibility patch for right-click menu in IDLE. ++ ++- Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box. ++ ++- Issue #14254: IDLE now handles readline correctly across shell restarts. ++ ++- Issue #17614: IDLE no longer raises exception when quickly closing a file. ++ ++- Issue #6698: IDLE now opens just an editor window when configured to do so. ++ ++- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer ++ raises an exception. ++ ++- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo. ++ + - Issue #17390: Display Python version on Idle title bar. + Initial patch by Edmond Burnett. + +@@ -8,17 +153,67 @@ + What's New in IDLE 2.7.4? + ========================= + ++*Release date: 2013-04-06* ++ ++- Issue #17625: In IDLE, close the replace dialog after it is used. ++ ++- IDLE was displaying spurious SystemExit tracebacks when running scripts ++ that terminated by raising SystemExit (i.e. unittest and turtledemo). ++ ++- Issue #9290: In IDLE the sys.std* streams now implement io.TextIOBase ++ interface and support all mandatory methods and properties. ++ ++- Issue #16829: IDLE printing no longer fails if there are spaces or other ++ special characters in the file path. ++ ++- Issue #16819: IDLE method completion now correctly works for unicode literals. ++ ++- Issue #16504: IDLE now catches SyntaxErrors raised by tokenizer. Patch by ++ Roger Serwy. ++ ++- Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu ++ Patch by Todd Rovito. ++ ++- Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog ++ ended with '\'. Patch by Roger Serwy. ++ ++- Issue #9803: Don't close IDLE on saving if breakpoint is open. ++ Patch by Roger Serwy. ++ ++- Issue #14958: Change IDLE systax highlighting to recognize all string and byte ++ literals currently supported in Python 2.7. ++ ++- Issue #14962: Update text coloring in IDLE shell window after changing ++ options. Patch by Roger Serwy. ++ ++- Issue #10997: Prevent a duplicate entry in IDLE's "Recent Files" menu. ++ ++- Issue #12510: Attempting to get invalid tooltip no longer closes IDLE. ++ Original patch by Roger Serwy. ++ ++- Issue #10365: File open dialog now works instead of crashing ++ even when parent window is closed. Patch by Roger Serwy. ++ ++- Issue #14876: Use user-selected font for highlight configuration. ++ Patch by Roger Serwy. ++ ++- Issue #14409: IDLE now properly executes commands in the Shell window ++ when it cannot read the normal config files on startup and ++ has to use the built-in default key bindings. ++ There was previously a bug in one of the defaults. ++ ++- Issue #3573: IDLE hangs when passing invalid command line args ++ (directory(ies) instead of file(s)) (Patch by Guilherme Polo) ++ ++- Issue #5219: Prevent event handler cascade in IDLE. ++ + - Issue #15318: Prevent writing to sys.stdin. + + - Issue #13532, #15319: Check that arguments to sys.stdout.write are strings. + +-- Issue # 12510: Attempt to get certain tool tips no longer crashes IDLE. +- +-- Issue10365: File open dialog now works instead of crashing even when ++- Issue #10365: File open dialog now works instead of crashing even when + parent window is closed while dialog is open. + +-- Issue 14876: use user-selected font for highlight configuration. +- + - Issue #14018: Update checks for unstable system Tcl/Tk versions on OS X + to include versions shipped with OS X 10.7 and 10.8 in addition to 10.6. + +@@ -29,6 +224,27 @@ + What's New in IDLE 2.7.3? + ========================= + ++*Release date: 2012-04-09* ++ ++- Issue #964437 Make IDLE help window non-modal. ++ Patch by Guilherme Polo and Roger Serwy. ++ ++- Issue #13933: IDLE auto-complete did not work with some imported ++ module, like hashlib. (Patch by Roger Serwy) ++ ++- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. ++ Original patches by Marco Scataglini and Roger Serwy. ++ ++- Issue #4625: If IDLE cannot write to its recent file or breakpoint ++ files, display a message popup and continue rather than crash. ++ (original patch by Roger Serwy) ++ ++- Issue #8793: Prevent IDLE crash when given strings with invalid hex escape ++ sequences. ++ ++- Issue #13296: Fix IDLE to clear compile __future__ flags on shell restart. ++ (Patch by Roger Serwy) ++ + - Issue #14409: IDLE now properly executes commands in the Shell window + when it cannot read the normal config files on startup and + has to use the built-in default key bindings. +@@ -41,41 +257,85 @@ + What's New in IDLE 2.7.2? + ========================= + +-*Release date: 29-May-2011* ++*Release date: 2011-06-11* ++ ++- Issue #11718: IDLE's open module dialog couldn't find the __init__.py ++ file in a package. ++ ++- Issue #12590: IDLE editor window now always displays the first line ++ when opening a long file. With Tk 8.5, the first line was hidden. ++ ++- Issue #11088: don't crash when using F5 to run a script in IDLE on MacOSX ++ with Tk 8.5. ++ ++- Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the ++ menu accelerators for Open Module, Go to Line, and New Indent Width. ++ The accelerators still work but no longer appear in the menu items. ++ ++- Issue #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather ++ than the currently problematic Apple-supplied one, when running with the ++ 64-/32-bit installer variant. ++ ++- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save ++ commands. ++ ++- Issue #6075: IDLE on Mac OS X now works with both Carbon AquaTk and ++ Cocoa AquaTk. ++ ++- Issue #10404: Use ctl-button-1 on OSX for the context menu in Idle. ++ ++- Issue #10107: Warn about unsaved files in IDLE on OSX. ++ ++- Issue #10406: Enable Rstrip IDLE extension on OSX (just like on other ++ platforms). + + - Issue #6378: Further adjust idle.bat to start associated Python + + - Issue #11896: Save on Close failed despite selecting "Yes" in dialog. + +-- toggle failing on Tk 8.5, causing IDLE exits and strange selection +- behavior. Issue 4676. Improve selection extension behaviour. ++- Issue #4676: toggle failing on Tk 8.5, causing IDLE exits and ++ strange selection behavior. Improve selection extension behaviour. + +-- toggle non-functional when NumLock set on Windows. Issue 3851. ++- Issue #3851 toggle non-functional when NumLock set on Windows. ++ ++ ++What's New in Python 2.7.1? ++=========================== ++ ++*Release date: 2010-11-27* ++ ++- Issue #6378: idle.bat now runs with the appropriate Python version rather than ++ the system default. Patch by Sridhar Ratnakumar. + + + What's New in IDLE 2.7? + ======================= + +-*Release date: 07-03-2010* ++*Release date: 2010-07-03* ++ ++- Issue #5150: IDLE's format menu now has an option to strip trailing ++ whitespace. ++ ++- Issue #5847: Remove -n switch on "Edit with IDLE" menu item. + + - idle.py modified and simplified to better support developing experimental + versions of IDLE which are not installed in the standard location. + +-- OutputWindow/PyShell right click menu "Go to file/line" wasn't working with +- file paths containing spaces. Bug 5559. ++- Issue #5559: OutputWindow/PyShell right click menu "Go to file/line" ++ wasn't working with file paths containing spaces. + +-- Windows: Version string for the .chm help file changed, file not being +- accessed Patch 5783 Guilherme Polo ++- Issue #5783: Windows: Version string for the .chm help file changed, ++ file not being accessed Patch by Guilherme Polo/ + +-- Allow multiple IDLE GUI/subprocess pairs to exist simultaneously. Thanks to +- David Scherer for suggesting the use of an ephemeral port for the GUI. +- Patch 1529142 Weeble. ++- Issue #1529142: Allow multiple IDLE GUI/subprocess pairs to exist ++ simultaneously. Thanks to David Scherer for suggesting the use of an ++ ephemeral port for the GUI. Patch by Weeble. + + - Remove port spec from run.py and fix bug where subprocess fails to + extract port from command line when warnings are present. + +-- Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr to handle +- mixed space/tab properly. Issue 5129, patch by Guilherme Polo. ++- Issue #5129: Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr ++ to handle mixed space/tab properly. Patch by Guilherme Polo. + + - Issue #3549: On MacOS the preferences menu was not present + +diff -r ee879c0ffa11 Lib/idlelib/PyShell.py +--- a/Lib/idlelib/PyShell.py ++++ b/Lib/idlelib/PyShell.py +@@ -1,4 +1,5 @@ + #! /usr/bin/env python ++from __future__ import print_function + + import os + import os.path +@@ -20,8 +21,8 @@ + try: + from Tkinter import * + except ImportError: +- print>>sys.__stderr__, "** IDLE can't import Tkinter. " \ +- "Your Python may not be configured for Tk. **" ++ print("** IDLE can't import Tkinter.\n" ++ "Your Python may not be configured for Tk. **", file=sys.__stderr__) + sys.exit(1) + import tkMessageBox + +@@ -143,6 +144,7 @@ + self.io.set_filename_change_hook(filename_changed_hook) + if self.io.filename: + self.restore_file_breaks() ++ self.color_breakpoint_text() + + rmenu_specs = [ + ("Cut", "<>", "rmenu_check_cut"), +@@ -152,6 +154,18 @@ + ("Clear Breakpoint", "<>", None) + ] + ++ def color_breakpoint_text(self, color=True): ++ "Turn colorizing of breakpoint text on or off" ++ if self.io is None: ++ # possible due to update in restore_file_breaks ++ return ++ if color: ++ theme = idleConf.GetOption('main','Theme','name') ++ cfg = idleConf.GetHighlight(theme, "break") ++ else: ++ cfg = {'foreground': '', 'background': ''} ++ self.text.tag_config('BREAK', cfg) ++ + def set_breakpoint(self, lineno): + text = self.text + filename = self.io.filename +@@ -221,13 +235,8 @@ + # This is necessary to keep the saved breaks synched with the + # saved file. + # +- # Breakpoints are set as tagged ranges in the text. Certain +- # kinds of edits cause these ranges to be deleted: Inserting +- # or deleting a line just before a breakpoint, and certain +- # deletions prior to a breakpoint. These issues need to be +- # investigated and understood. It's not clear if they are +- # Tk issues or IDLE issues, or whether they can actually +- # be fixed. Since a modified file has to be saved before it is ++ # Breakpoints are set as tagged ranges in the text. ++ # Since a modified file has to be saved before it is + # run, and since self.breakpoints (from which the subprocess + # debugger is loaded) is updated during the save, the visible + # breaks stay synched with the subprocess even if one of these +@@ -577,14 +586,14 @@ + console = self.tkconsole.console + if how == "OK": + if what is not None: +- print >>console, repr(what) ++ print(repr(what), file=console) + elif how == "EXCEPTION": + if self.tkconsole.getvar("<>"): + self.remote_stack_viewer() + elif how == "ERROR": + errmsg = "PyShell.ModifiedInterpreter: Subprocess ERROR:\n" +- print >>sys.__stderr__, errmsg, what +- print >>console, errmsg, what ++ print(errmsg, what, file=sys.__stderr__) ++ print(errmsg, what, file=console) + # we received a response to the currently active seq number: + try: + self.tkconsole.endexecuting() +@@ -648,9 +657,9 @@ + code = compile(source, filename, "exec") + except (OverflowError, SyntaxError): + self.tkconsole.resetoutput() +- tkerr = self.tkconsole.stderr +- print>>tkerr, '*** Error in script or command!\n' +- print>>tkerr, 'Traceback (most recent call last):' ++ print('*** Error in script or command!\n' ++ 'Traceback (most recent call last):', ++ file=self.tkconsole.stderr) + InteractiveInterpreter.showsyntaxerror(self, filename) + self.tkconsole.showprompt() + else: +@@ -800,14 +809,14 @@ + raise + except: + if use_subprocess: +- print >>self.tkconsole.stderr, \ +- "IDLE internal error in runcode()" ++ print("IDLE internal error in runcode()", ++ file=self.tkconsole.stderr) + self.showtraceback() + self.tkconsole.endexecuting() + else: + if self.tkconsole.canceled: + self.tkconsole.canceled = False +- print >>self.tkconsole.stderr, "KeyboardInterrupt" ++ print("KeyboardInterrupt", file=self.tkconsole.stderr) + else: + self.showtraceback() + finally: +@@ -1470,8 +1479,7 @@ + try: + opts, args = getopt.getopt(sys.argv[1:], "c:deihnr:st:") + except getopt.error as msg: +- sys.stderr.write("Error: %s\n" % str(msg)) +- sys.stderr.write(usage_msg) ++ print("Error: %s\n%s" % (msg, usage_msg), file=sys.stderr) + sys.exit(2) + for o, a in opts: + if o == '-c': +@@ -1494,7 +1502,7 @@ + if os.path.isfile(script): + pass + else: +- print "No script file: ", script ++ print("No script file: ", script, file=sys.stderr) + sys.exit() + enable_shell = True + if o == '-s': +diff -r ee879c0ffa11 Lib/idlelib/ReplaceDialog.py +--- a/Lib/idlelib/ReplaceDialog.py ++++ b/Lib/idlelib/ReplaceDialog.py +@@ -40,7 +40,7 @@ + + def create_entries(self): + SearchDialogBase.create_entries(self) +- self.replent = self.make_entry("Replace with:", self.replvar) ++ self.replent = self.make_entry("Replace with:", self.replvar)[0] + + def create_command_buttons(self): + SearchDialogBase.create_command_buttons(self) +diff -r ee879c0ffa11 Lib/idlelib/SearchDialogBase.py +--- a/Lib/idlelib/SearchDialogBase.py ++++ b/Lib/idlelib/SearchDialogBase.py +@@ -16,10 +16,12 @@ + (make_button, create_command_buttons). + These are bound to functions that execute the command. + +- Except for command buttons, this base class is not limited to +- items common to all three subclasses. Rather, it is the Find dialog +- minus the "Find Next" command and its execution function. +- The other dialogs override methods to replace and add widgets. ++ Except for command buttons, this base class is not limited to items ++ common to all three subclasses. Rather, it is the Find dialog minus ++ the "Find Next" command, its execution function, and the ++ default_command attribute needed in create_widgets. The other ++ dialogs override attributes and methods, the latter to replace and ++ add widgets. + ''' + + title = "Search Dialog" # replace in subclasses +@@ -30,9 +32,10 @@ + '''Initialize root, engine, and top attributes. + + top (level widget): set in create_widgets() called from open(). +- text (Text being searched): set in open(), only used in subclasses(). ++ text (Text searched): set in open(), only used in subclasses(). + ent (ry): created in make_entry() called from create_entry(). + row (of grid): 0 in create_widgets(), +1 in make_entry/frame(). ++ default_command: set in subclasses, used in create_widgers(). + + title (of dialog): class attribute, override in subclasses. + icon (of dialog): ditto, use unclear if cannot minimize dialog. +@@ -86,79 +89,76 @@ + self.create_other_buttons() # next row, cols 0, 1 + self.create_command_buttons() # col 2, all rows + +- def make_entry(self, label, var): +- "Return gridded labeled Entry." +- l = Label(self.top, text=label) +- l.grid(row=self.row, column=0, sticky="nw") +- e = Entry(self.top, textvariable=var, exportselection=0) +- e.grid(row=self.row, column=1, sticky="nwe") ++ def make_entry(self, label_text, var): ++ '''Return (entry, label), . ++ ++ entry - gridded labeled Entry for text entry. ++ label - Label widget, returned for testing. ++ ''' ++ label = Label(self.top, text=label_text) ++ label.grid(row=self.row, column=0, sticky="nw") ++ entry = Entry(self.top, textvariable=var, exportselection=0) ++ entry.grid(row=self.row, column=1, sticky="nwe") + self.row = self.row + 1 +- return e ++ return entry, label + + def create_entries(self): + "Create one or more entry lines with make_entry." +- self.ent = self.make_entry("Find:", self.engine.patvar) ++ self.ent = self.make_entry("Find:", self.engine.patvar)[0] + + def make_frame(self,labeltext=None): +- "Return gridded labeled Frame for option or other buttons." ++ '''Return (frame, label). ++ ++ frame - gridded labeled Frame for option or other buttons. ++ label - Label widget, returned for testing. ++ ''' + if labeltext: +- l = Label(self.top, text=labeltext) +- l.grid(row=self.row, column=0, sticky="nw") +- f = Frame(self.top) +- f.grid(row=self.row, column=1, columnspan=1, sticky="nwe") ++ label = Label(self.top, text=labeltext) ++ label.grid(row=self.row, column=0, sticky="nw") ++ else: ++ label = '' ++ frame = Frame(self.top) ++ frame.grid(row=self.row, column=1, columnspan=1, sticky="nwe") + self.row = self.row + 1 +- return f ++ return frame, label + + def create_option_buttons(self): +- "Fill frame with Checkbuttons bound to SearchEngine booleanvars." +- f = self.make_frame("Options") ++ '''Return (filled frame, options) for testing. + +- btn = Checkbutton(f, anchor="w", +- variable=self.engine.revar, +- text="Regular expression") +- btn.pack(side="left", fill="both") +- if self.engine.isre(): +- btn.select() +- +- btn = Checkbutton(f, anchor="w", +- variable=self.engine.casevar, +- text="Match case") +- btn.pack(side="left", fill="both") +- if self.engine.iscase(): +- btn.select() +- +- btn = Checkbutton(f, anchor="w", +- variable=self.engine.wordvar, +- text="Whole word") +- btn.pack(side="left", fill="both") +- if self.engine.isword(): +- btn.select() +- ++ Options is a list of SearchEngine booleanvar, label pairs. ++ A gridded frame from make_frame is filled with a Checkbutton ++ for each pair, bound to the var, with the corresponding label. ++ ''' ++ frame = self.make_frame("Options")[0] ++ engine = self.engine ++ options = [(engine.revar, "Regular expression"), ++ (engine.casevar, "Match case"), ++ (engine.wordvar, "Whole word")] + if self.needwrapbutton: +- btn = Checkbutton(f, anchor="w", +- variable=self.engine.wrapvar, +- text="Wrap around") ++ options.append((engine.wrapvar, "Wrap around")) ++ for var, label in options: ++ btn = Checkbutton(frame, anchor="w", variable=var, text=label) + btn.pack(side="left", fill="both") +- if self.engine.iswrap(): ++ if var.get(): + btn.select() ++ return frame, options + + def create_other_buttons(self): +- "Fill frame with buttons tied to other options." +- f = self.make_frame("Direction") ++ '''Return (frame, others) for testing. + +- btn = Radiobutton(f, anchor="w", +- variable=self.engine.backvar, value=1, +- text="Up") +- btn.pack(side="left", fill="both") +- if self.engine.isback(): +- btn.select() +- +- btn = Radiobutton(f, anchor="w", +- variable=self.engine.backvar, value=0, +- text="Down") +- btn.pack(side="left", fill="both") +- if not self.engine.isback(): +- btn.select() ++ Others is a list of value, label pairs. ++ A gridded frame from make_frame is filled with radio buttons. ++ ''' ++ frame = self.make_frame("Direction")[0] ++ var = self.engine.backvar ++ others = [(1, 'Up'), (0, 'Down')] ++ for val, label in others: ++ btn = Radiobutton(frame, anchor="w", ++ variable=var, value=val, text=label) ++ btn.pack(side="left", fill="both") ++ if var.get() == val: ++ btn.select() ++ return frame, others + + def make_button(self, label, command, isdef=0): + "Return command button gridded in command frame." +diff -r ee879c0ffa11 Lib/idlelib/SearchEngine.py +--- a/Lib/idlelib/SearchEngine.py ++++ b/Lib/idlelib/SearchEngine.py +@@ -85,7 +85,7 @@ + except re.error as what: + args = what.args + msg = args[0] +- col = arg[1] if len(args) >= 2 else -1 ++ col = args[1] if len(args) >= 2 else -1 + self.report_error(pat, msg, col) + return None + return prog +diff -r ee879c0ffa11 Lib/idlelib/StackViewer.py +--- a/Lib/idlelib/StackViewer.py ++++ b/Lib/idlelib/StackViewer.py +@@ -131,8 +131,8 @@ + root.geometry("+%d+%d"%(x, y + 150)) + flist = PyShellFileList(root) + try: # to obtain a traceback object +- a +- except: ++ intentional_name_error ++ except NameError: + exc_type, exc_value, exc_tb = sys.exc_info() + + # inject stack trace to sys +diff -r ee879c0ffa11 Lib/idlelib/TreeWidget.py +--- a/Lib/idlelib/TreeWidget.py ++++ b/Lib/idlelib/TreeWidget.py +@@ -174,11 +174,12 @@ + + def draw(self, x, y): + # XXX This hard-codes too many geometry constants! ++ dy = 20 + self.x, self.y = x, y + self.drawicon() + self.drawtext() + if self.state != 'expanded': +- return y+17 ++ return y + dy + # draw children + if not self.children: + sublist = self.item._GetSubList() +@@ -189,7 +190,7 @@ + child = self.__class__(self.canvas, self, item) + self.children.append(child) + cx = x+20 +- cy = y+17 ++ cy = y + dy + cylast = 0 + for child in self.children: + cylast = cy +@@ -228,7 +229,7 @@ + + def drawtext(self): + textx = self.x+20-1 +- texty = self.y-1 ++ texty = self.y-4 + labeltext = self.item.GetLabelText() + if labeltext: + id = self.canvas.create_text(textx, texty, anchor="nw", +diff -r ee879c0ffa11 Lib/idlelib/WidgetRedirector.py +--- a/Lib/idlelib/WidgetRedirector.py ++++ b/Lib/idlelib/WidgetRedirector.py +@@ -1,29 +1,40 @@ +-from Tkinter import * ++from Tkinter import TclError + + class WidgetRedirector: +- + """Support for redirecting arbitrary widget subcommands. + +- Some Tk operations don't normally pass through Tkinter. For example, if a ++ Some Tk operations don't normally pass through tkinter. For example, if a + character is inserted into a Text widget by pressing a key, a default Tk + binding to the widget's 'insert' operation is activated, and the Tk library +- processes the insert without calling back into Tkinter. ++ processes the insert without calling back into tkinter. + +- Although a binding to could be made via Tkinter, what we really want +- to do is to hook the Tk 'insert' operation itself. ++ Although a binding to could be made via tkinter, what we really want ++ to do is to hook the Tk 'insert' operation itself. For one thing, we want ++ a text.insert call in idle code to have the same effect as a key press. + + When a widget is instantiated, a Tcl command is created whose name is the + same as the pathname widget._w. This command is used to invoke the various + widget operations, e.g. insert (for a Text widget). We are going to hook + this command and provide a facility ('register') to intercept the widget +- operation. ++ operation. We will also intercept method calls on the Tkinter class ++ instance that represents the tk widget. + +- In IDLE, the function being registered provides access to the top of a +- Percolator chain. At the bottom of the chain is a call to the original +- Tk widget operation. +- ++ In IDLE, WidgetRedirector is used in Percolator to intercept Text ++ commands. The function being registered provides access to the top ++ of a Percolator chain. At the bottom of the chain is a call to the ++ original Tk widget operation. + """ + def __init__(self, widget): ++ '''Initialize attributes and setup redirection. ++ ++ _operations: dict mapping operation name to new function. ++ widget: the widget whose tcl command is to be intercepted. ++ tk: widget.tk, a convenience attribute, probably not needed. ++ orig: new name of the original tcl command. ++ ++ Since renaming to orig fails with TclError when orig already ++ exists, only one WidgetDirector can exist for a given widget. ++ ''' + self._operations = {} + self.widget = widget # widget instance + self.tk = tk = widget.tk # widget's root +@@ -40,27 +51,45 @@ + self.widget._w) + + def close(self): ++ "Unregister operations and revert redirection created by .__init__." + for operation in list(self._operations): + self.unregister(operation) +- widget = self.widget; del self.widget +- orig = self.orig; del self.orig ++ widget = self.widget + tk = widget.tk + w = widget._w ++ # Restore the original widget Tcl command. + tk.deletecommand(w) +- # restore the original widget Tcl command: +- tk.call("rename", orig, w) ++ tk.call("rename", self.orig, w) ++ del self.widget, self.tk # Should not be needed ++ # if instance is deleted after close, as in Percolator. + + def register(self, operation, function): ++ '''Return OriginalCommand(operation) after registering function. ++ ++ Registration adds an operation: function pair to ._operations. ++ It also adds an widget function attribute that masks the Tkinter ++ class instance method. Method masking operates independently ++ from command dispatch. ++ ++ If a second function is registered for the same operation, the ++ first function is replaced in both places. ++ ''' + self._operations[operation] = function + setattr(self.widget, operation, function) + return OriginalCommand(self, operation) + + def unregister(self, operation): ++ '''Return the function for the operation, or None. ++ ++ Deleting the instance attribute unmasks the class attribute. ++ ''' + if operation in self._operations: + function = self._operations[operation] + del self._operations[operation] +- if hasattr(self.widget, operation): ++ try: + delattr(self.widget, operation) ++ except AttributeError: ++ pass + return function + else: + return None +@@ -88,14 +117,29 @@ + + + class OriginalCommand: ++ '''Callable for original tk command that has been redirected. ++ ++ Returned by .register; can be used in the function registered. ++ redir = WidgetRedirector(text) ++ def my_insert(*args): ++ print("insert", args) ++ original_insert(*args) ++ original_insert = redir.register("insert", my_insert) ++ ''' + + def __init__(self, redir, operation): ++ '''Create .tk_call and .orig_and_operation for .__call__ method. ++ ++ .redir and .operation store the input args for __repr__. ++ .tk and .orig copy attributes of .redir (probably not needed). ++ ''' + self.redir = redir + self.operation = operation +- self.tk = redir.tk +- self.orig = redir.orig +- self.tk_call = self.tk.call +- self.orig_and_operation = (self.orig, self.operation) ++ self.tk = redir.tk # redundant with self.redir ++ self.orig = redir.orig # redundant with self.redir ++ # These two could be deleted after checking recipient code. ++ self.tk_call = redir.tk.call ++ self.orig_and_operation = (redir.orig, operation) + + def __repr__(self): + return "OriginalCommand(%r, %r)" % (self.redir, self.operation) +@@ -104,7 +148,10 @@ + return self.tk_call(self.orig_and_operation + args) + + +-def _widget_redirector(parent): ++def _widget_redirector(parent): # htest # ++ from Tkinter import Tk, Text ++ import re ++ + root = Tk() + root.title("Test WidgetRedirector") + width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) +@@ -113,13 +160,15 @@ + text.pack() + text.focus_set() + redir = WidgetRedirector(text) +- global previous_tcl_fcn + def my_insert(*args): + print "insert", args +- previous_tcl_fcn(*args) +- previous_tcl_fcn = redir.register("insert", my_insert) ++ original_insert(*args) ++ original_insert = redir.register("insert", my_insert) + root.mainloop() + + if __name__ == "__main__": ++ import unittest ++ unittest.main('idlelib.idle_test.test_widgetredir', ++ verbosity=2, exit=False) + from idlelib.idle_test.htest import run + run(_widget_redirector) +diff -r ee879c0ffa11 Lib/idlelib/aboutDialog.py +--- a/Lib/idlelib/aboutDialog.py ++++ b/Lib/idlelib/aboutDialog.py +@@ -62,7 +62,8 @@ + justify=LEFT, fg=self.fg, bg=self.bg) + labelEmail.grid(row=6, column=0, columnspan=2, + sticky=W, padx=10, pady=0) +- labelWWW = Label(frameBg, text='www: http://www.python.org/idle/', ++ labelWWW = Label(frameBg, text='https://docs.python.org/' + ++ sys.version[:3] + '/library/idle.html', + justify=LEFT, fg=self.fg, bg=self.bg) + labelWWW.grid(row=7, column=0, columnspan=2, sticky=W, padx=10, pady=0) + Frame(frameBg, borderwidth=1, relief=SUNKEN, +diff -r ee879c0ffa11 Lib/idlelib/config-extensions.def +--- a/Lib/idlelib/config-extensions.def ++++ b/Lib/idlelib/config-extensions.def +@@ -3,75 +3,37 @@ + # IDLE reads several config files to determine user preferences. This + # file is the default configuration file for IDLE extensions settings. + # +-# Each extension must have at least one section, named after the extension +-# module. This section must contain an 'enable' item (=1 to enable the +-# extension, =0 to disable it), it may contain 'enable_editor' or 'enable_shell' +-# items, to apply it only to editor/shell windows, and may also contain any +-# other general configuration items for the extension. ++# Each extension must have at least one section, named after the ++# extension module. This section must contain an 'enable' item (=True to ++# enable the extension, =False to disable it), it may contain ++# 'enable_editor' or 'enable_shell' items, to apply it only to editor ir ++# shell windows, and may also contain any other general configuration ++# items for the extension. Other True/False values will also be ++# recognized as boolean by the Extension Configuration dialog. + # +-# Each extension must define at least one section named ExtensionName_bindings +-# or ExtensionName_cfgBindings. If present, ExtensionName_bindings defines +-# virtual event bindings for the extension that are not user re-configurable. +-# If present, ExtensionName_cfgBindings defines virtual event bindings for the ++# Each extension must define at least one section named ++# ExtensionName_bindings or ExtensionName_cfgBindings. If present, ++# ExtensionName_bindings defines virtual event bindings for the ++# extension that are not user re-configurable. If present, ++# ExtensionName_cfgBindings defines virtual event bindings for the + # extension that may be sensibly re-configured. + # +-# If there are no keybindings for a menus' virtual events, include lines like +-# <>= (See [CodeContext], below.) ++# If there are no keybindings for a menus' virtual events, include lines ++# like <>= (See [CodeContext], below.) + # +-# Currently it is necessary to manually modify this file to change extension +-# key bindings and default values. To customize, create ++# Currently it is necessary to manually modify this file to change ++# extension key bindings and default values. To customize, create + # ~/.idlerc/config-extensions.cfg and append the appropriate customized + # section(s). Those sections will override the defaults in this file. + # +-# Note: If a keybinding is already in use when the extension is +-# loaded, the extension's virtual event's keybinding will be set to ''. ++# Note: If a keybinding is already in use when the extension is loaded, ++# the extension's virtual event's keybinding will be set to ''. + # + # See config-keys.def for notes on specifying keys and extend.txt for + # information on creating IDLE extensions. + +-[FormatParagraph] +-enable=1 +-[FormatParagraph_cfgBindings] +-format-paragraph= +- +-[AutoExpand] +-enable=1 +-[AutoExpand_cfgBindings] +-expand-word= +- +-[ZoomHeight] +-enable=1 +-[ZoomHeight_cfgBindings] +-zoom-height= +- +-[ScriptBinding] +-enable=1 +-enable_shell=0 +-enable_editor=1 +-[ScriptBinding_cfgBindings] +-run-module= +-check-module= +- +-[CallTips] +-enable=1 +-[CallTips_cfgBindings] +-force-open-calltip= +-[CallTips_bindings] +-try-open-calltip= +-refresh-calltip= +- +-[ParenMatch] +-enable=1 +-style= expression +-flash-delay= 500 +-bell= 1 +-[ParenMatch_cfgBindings] +-flash-paren= +-[ParenMatch_bindings] +-paren-closed= +- + [AutoComplete] +-enable=1 ++enable=True + popupwait=2000 + [AutoComplete_cfgBindings] + force-open-completions= +@@ -79,18 +41,58 @@ + autocomplete= + try-open-completions= + ++[AutoExpand] ++enable=True ++[AutoExpand_cfgBindings] ++expand-word= ++ ++[CallTips] ++enable=True ++[CallTips_cfgBindings] ++force-open-calltip= ++[CallTips_bindings] ++try-open-calltip= ++refresh-calltip= ++ + [CodeContext] +-enable=1 +-enable_shell=0 ++enable=True ++enable_shell=False + numlines=3 +-visible=0 ++visible=False + bgcolor=LightGray + fgcolor=Black + [CodeContext_bindings] + toggle-code-context= + ++[FormatParagraph] ++enable=True ++[FormatParagraph_cfgBindings] ++format-paragraph= ++ ++[ParenMatch] ++enable=True ++style= expression ++flash-delay= 500 ++bell=True ++[ParenMatch_cfgBindings] ++flash-paren= ++[ParenMatch_bindings] ++paren-closed= ++ + [RstripExtension] +-enable=1 +-enable_shell=0 +-enable_editor=1 ++enable=True ++enable_shell=False ++enable_editor=True + ++[ScriptBinding] ++enable=True ++enable_shell=False ++enable_editor=True ++[ScriptBinding_cfgBindings] ++run-module= ++check-module= ++ ++[ZoomHeight] ++enable=True ++[ZoomHeight_cfgBindings] ++zoom-height= +diff -r ee879c0ffa11 Lib/idlelib/configDialog.py +--- a/Lib/idlelib/configDialog.py ++++ b/Lib/idlelib/configDialog.py +@@ -11,7 +11,6 @@ + """ + from Tkinter import * + import tkMessageBox, tkColorChooser, tkFont +-import string + + from idlelib.configHandler import idleConf + from idlelib.dynOptionMenuWidget import DynOptionMenu +@@ -19,544 +18,597 @@ + from idlelib.keybindingDialog import GetKeysDialog + from idlelib.configSectionNameDialog import GetCfgSectionNameDialog + from idlelib.configHelpSourceEdit import GetHelpSourceDialog ++from idlelib.tabbedpages import TabbedPageSet + from idlelib import macosxSupport +- + class ConfigDialog(Toplevel): + +- def __init__(self,parent,title,_htest=False): ++ def __init__(self, parent, title='', _htest=False, _utest=False): + """ + _htest - bool, change box location when running htest ++ _utest - bool, don't wait_window when running unittest + """ + Toplevel.__init__(self, parent) ++ self.parent = parent ++ if _htest: ++ parent.instance_dict = {} + self.wm_withdraw() + + self.configure(borderwidth=5) +- self.title('IDLE Preferences') +- if _htest: +- parent.instance_dict = {} +- self.geometry("+%d+%d" % (parent.winfo_rootx()+20, +- parent.winfo_rooty()+(30 if not _htest else 150))) ++ self.title(title or 'IDLE Preferences') ++ self.geometry( ++ "+%d+%d" % (parent.winfo_rootx() + 20, ++ parent.winfo_rooty() + (30 if not _htest else 150))) + #Theme Elements. Each theme element key is its display name. + #The first value of the tuple is the sample area tag name. + #The second value is the display name list sort index. +- self.themeElements={'Normal Text':('normal','00'), +- 'Python Keywords':('keyword','01'), +- 'Python Definitions':('definition','02'), ++ self.themeElements={ ++ 'Normal Text':('normal', '00'), ++ 'Python Keywords':('keyword', '01'), ++ 'Python Definitions':('definition', '02'), + 'Python Builtins':('builtin', '03'), +- 'Python Comments':('comment','04'), +- 'Python Strings':('string','05'), +- 'Selected Text':('hilite','06'), +- 'Found Text':('hit','07'), +- 'Cursor':('cursor','08'), +- 'Error Text':('error','09'), +- 'Shell Normal Text':('console','10'), +- 'Shell Stdout Text':('stdout','11'), +- 'Shell Stderr Text':('stderr','12'), ++ 'Python Comments':('comment', '04'), ++ 'Python Strings':('string', '05'), ++ 'Selected Text':('hilite', '06'), ++ 'Found Text':('hit', '07'), ++ 'Cursor':('cursor', '08'), ++ 'Error Text':('error', '09'), ++ 'Shell Normal Text':('console', '10'), ++ 'Shell Stdout Text':('stdout', '11'), ++ 'Shell Stderr Text':('stderr', '12'), + } + self.ResetChangedItems() #load initial values in changed items dict + self.CreateWidgets() +- self.resizable(height=FALSE,width=FALSE) ++ self.resizable(height=FALSE, width=FALSE) + self.transient(parent) + self.grab_set() + self.protocol("WM_DELETE_WINDOW", self.Cancel) +- self.parent = parent + self.tabPages.focus_set() + #key bindings for this dialog +- #self.bind('',self.Cancel) #dismiss dialog, no save +- #self.bind('',self.Apply) #apply changes, save +- #self.bind('',self.Help) #context help ++ #self.bind('', self.Cancel) #dismiss dialog, no save ++ #self.bind('', self.Apply) #apply changes, save ++ #self.bind('', self.Help) #context help + self.LoadConfigs() + self.AttachVarCallbacks() #avoid callbacks during LoadConfigs + +- self.wm_deiconify() +- self.wait_window() ++ if not _utest: ++ self.wm_deiconify() ++ self.wait_window() + + def CreateWidgets(self): + self.tabPages = TabbedPageSet(self, +- page_names=['Fonts/Tabs','Highlighting','Keys','General']) +- frameActionButtons = Frame(self,pady=2) +- #action buttons +- if macosxSupport.isAquaTk(): +- # Changing the default padding on OSX results in unreadable +- # text in the buttons +- paddingArgs={} +- else: +- paddingArgs={'padx':6, 'pady':3} +- +-# Comment out button creation and packing until implement self.Help +-## self.buttonHelp = Button(frameActionButtons,text='Help', +-## command=self.Help,takefocus=FALSE, +-## **paddingArgs) +- self.buttonOk = Button(frameActionButtons,text='Ok', +- command=self.Ok,takefocus=FALSE, +- **paddingArgs) +- self.buttonApply = Button(frameActionButtons,text='Apply', +- command=self.Apply,takefocus=FALSE, +- **paddingArgs) +- self.buttonCancel = Button(frameActionButtons,text='Cancel', +- command=self.Cancel,takefocus=FALSE, +- **paddingArgs) ++ page_names=['Fonts/Tabs', 'Highlighting', 'Keys', 'General']) ++ self.tabPages.pack(side=TOP, expand=TRUE, fill=BOTH) + self.CreatePageFontTab() + self.CreatePageHighlight() + self.CreatePageKeys() + self.CreatePageGeneral() +-## self.buttonHelp.pack(side=RIGHT,padx=5) +- self.buttonOk.pack(side=LEFT,padx=5) +- self.buttonApply.pack(side=LEFT,padx=5) +- self.buttonCancel.pack(side=LEFT,padx=5) +- frameActionButtons.pack(side=BOTTOM) +- Frame(self, height=2, borderwidth=0).pack(side=BOTTOM) +- self.tabPages.pack(side=TOP,expand=TRUE,fill=BOTH) ++ self.create_action_buttons().pack(side=BOTTOM) ++ def create_action_buttons(self): ++ if macosxSupport.isAquaTk(): ++ # Changing the default padding on OSX results in unreadable ++ # text in the buttons ++ paddingArgs = {} ++ else: ++ paddingArgs = {'padx':6, 'pady':3} ++ outer = Frame(self, pady=2) ++ buttons = Frame(outer, pady=2) ++ self.buttonOk = Button( ++ buttons, text='Ok', command=self.Ok, ++ takefocus=FALSE, **paddingArgs) ++ self.buttonApply = Button( ++ buttons, text='Apply', command=self.Apply, ++ takefocus=FALSE, **paddingArgs) ++ self.buttonCancel = Button( ++ buttons, text='Cancel', command=self.Cancel, ++ takefocus=FALSE, **paddingArgs) ++ self.buttonOk.pack(side=LEFT, padx=5) ++ self.buttonApply.pack(side=LEFT, padx=5) ++ self.buttonCancel.pack(side=LEFT, padx=5) ++# Comment out Help button creation and packing until implement self.Help ++## self.buttonHelp = Button( ++## buttons, text='Help', command=self.Help, ++## takefocus=FALSE, **paddingArgs) ++## self.buttonHelp.pack(side=RIGHT, padx=5) + ++ # add space above buttons ++ Frame(outer, height=2, borderwidth=0).pack(side=TOP) ++ buttons.pack(side=BOTTOM) ++ return outer + def CreatePageFontTab(self): +- #tkVars +- self.fontSize=StringVar(self) +- self.fontBold=BooleanVar(self) +- self.fontName=StringVar(self) +- self.spaceNum=IntVar(self) +- self.editFont=tkFont.Font(self,('courier',10,'normal')) ++ parent = self.parent ++ self.fontSize = StringVar(parent) ++ self.fontBold = BooleanVar(parent) ++ self.fontName = StringVar(parent) ++ self.spaceNum = IntVar(parent) ++ self.editFont = tkFont.Font(parent, ('courier', 10, 'normal')) ++ + ##widget creation + #body frame +- frame=self.tabPages.pages['Fonts/Tabs'].frame ++ frame = self.tabPages.pages['Fonts/Tabs'].frame + #body section frames +- frameFont=LabelFrame(frame,borderwidth=2,relief=GROOVE, +- text=' Base Editor Font ') +- frameIndent=LabelFrame(frame,borderwidth=2,relief=GROOVE, +- text=' Indentation Width ') ++ frameFont = LabelFrame( ++ frame, borderwidth=2, relief=GROOVE, text=' Base Editor Font ') ++ frameIndent = LabelFrame( ++ frame, borderwidth=2, relief=GROOVE, text=' Indentation Width ') + #frameFont +- frameFontName=Frame(frameFont) +- frameFontParam=Frame(frameFont) +- labelFontNameTitle=Label(frameFontName,justify=LEFT, +- text='Font Face :') +- self.listFontName=Listbox(frameFontName,height=5,takefocus=FALSE, +- exportselection=FALSE) +- self.listFontName.bind('',self.OnListFontButtonRelease) +- scrollFont=Scrollbar(frameFontName) ++ frameFontName = Frame(frameFont) ++ frameFontParam = Frame(frameFont) ++ labelFontNameTitle = Label( ++ frameFontName, justify=LEFT, text='Font Face :') ++ self.listFontName = Listbox( ++ frameFontName, height=5, takefocus=FALSE, exportselection=FALSE) ++ self.listFontName.bind( ++ '', self.OnListFontButtonRelease) ++ scrollFont = Scrollbar(frameFontName) + scrollFont.config(command=self.listFontName.yview) + self.listFontName.config(yscrollcommand=scrollFont.set) +- labelFontSizeTitle=Label(frameFontParam,text='Size :') +- self.optMenuFontSize=DynOptionMenu(frameFontParam,self.fontSize,None, +- command=self.SetFontSample) +- checkFontBold=Checkbutton(frameFontParam,variable=self.fontBold, +- onvalue=1,offvalue=0,text='Bold',command=self.SetFontSample) +- frameFontSample=Frame(frameFont,relief=SOLID,borderwidth=1) +- self.labelFontSample=Label(frameFontSample, +- text='AaBbCcDdEe\nFfGgHhIiJjK\n1234567890\n#:+=(){}[]', +- justify=LEFT,font=self.editFont) ++ labelFontSizeTitle = Label(frameFontParam, text='Size :') ++ self.optMenuFontSize = DynOptionMenu( ++ frameFontParam, self.fontSize, None, command=self.SetFontSample) ++ checkFontBold = Checkbutton( ++ frameFontParam, variable=self.fontBold, onvalue=1, ++ offvalue=0, text='Bold', command=self.SetFontSample) ++ frameFontSample = Frame(frameFont, relief=SOLID, borderwidth=1) ++ self.labelFontSample = Label( ++ frameFontSample, justify=LEFT, font=self.editFont, ++ text='AaBbCcDdEe\nFfGgHhIiJjK\n1234567890\n#:+=(){}[]') + #frameIndent +- frameIndentSize=Frame(frameIndent) +- labelSpaceNumTitle=Label(frameIndentSize, justify=LEFT, +- text='Python Standard: 4 Spaces!') +- self.scaleSpaceNum=Scale(frameIndentSize, variable=self.spaceNum, +- orient='horizontal', +- tickinterval=2, from_=2, to=16) ++ frameIndentSize = Frame(frameIndent) ++ labelSpaceNumTitle = Label( ++ frameIndentSize, justify=LEFT, ++ text='Python Standard: 4 Spaces!') ++ self.scaleSpaceNum = Scale( ++ frameIndentSize, variable=self.spaceNum, ++ orient='horizontal', tickinterval=2, from_=2, to=16) ++ + #widget packing + #body +- frameFont.pack(side=LEFT,padx=5,pady=5,expand=TRUE,fill=BOTH) +- frameIndent.pack(side=LEFT,padx=5,pady=5,fill=Y) ++ frameFont.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH) ++ frameIndent.pack(side=LEFT, padx=5, pady=5, fill=Y) + #frameFont +- frameFontName.pack(side=TOP,padx=5,pady=5,fill=X) +- frameFontParam.pack(side=TOP,padx=5,pady=5,fill=X) +- labelFontNameTitle.pack(side=TOP,anchor=W) +- self.listFontName.pack(side=LEFT,expand=TRUE,fill=X) +- scrollFont.pack(side=LEFT,fill=Y) +- labelFontSizeTitle.pack(side=LEFT,anchor=W) +- self.optMenuFontSize.pack(side=LEFT,anchor=W) +- checkFontBold.pack(side=LEFT,anchor=W,padx=20) +- frameFontSample.pack(side=TOP,padx=5,pady=5,expand=TRUE,fill=BOTH) +- self.labelFontSample.pack(expand=TRUE,fill=BOTH) ++ frameFontName.pack(side=TOP, padx=5, pady=5, fill=X) ++ frameFontParam.pack(side=TOP, padx=5, pady=5, fill=X) ++ labelFontNameTitle.pack(side=TOP, anchor=W) ++ self.listFontName.pack(side=LEFT, expand=TRUE, fill=X) ++ scrollFont.pack(side=LEFT, fill=Y) ++ labelFontSizeTitle.pack(side=LEFT, anchor=W) ++ self.optMenuFontSize.pack(side=LEFT, anchor=W) ++ checkFontBold.pack(side=LEFT, anchor=W, padx=20) ++ frameFontSample.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) ++ self.labelFontSample.pack(expand=TRUE, fill=BOTH) + #frameIndent +- frameIndentSize.pack(side=TOP,fill=X) +- labelSpaceNumTitle.pack(side=TOP,anchor=W,padx=5) +- self.scaleSpaceNum.pack(side=TOP,padx=5,fill=X) ++ frameIndentSize.pack(side=TOP, fill=X) ++ labelSpaceNumTitle.pack(side=TOP, anchor=W, padx=5) ++ self.scaleSpaceNum.pack(side=TOP, padx=5, fill=X) + return frame + + def CreatePageHighlight(self): +- self.builtinTheme=StringVar(self) +- self.customTheme=StringVar(self) +- self.fgHilite=BooleanVar(self) +- self.colour=StringVar(self) +- self.fontName=StringVar(self) +- self.themeIsBuiltin=BooleanVar(self) +- self.highlightTarget=StringVar(self) ++ parent = self.parent ++ self.builtinTheme = StringVar(parent) ++ self.customTheme = StringVar(parent) ++ self.fgHilite = BooleanVar(parent) ++ self.colour = StringVar(parent) ++ self.fontName = StringVar(parent) ++ self.themeIsBuiltin = BooleanVar(parent) ++ self.highlightTarget = StringVar(parent) ++ + ##widget creation + #body frame +- frame=self.tabPages.pages['Highlighting'].frame ++ frame = self.tabPages.pages['Highlighting'].frame + #body section frames +- frameCustom=LabelFrame(frame,borderwidth=2,relief=GROOVE, +- text=' Custom Highlighting ') +- frameTheme=LabelFrame(frame,borderwidth=2,relief=GROOVE, +- text=' Highlighting Theme ') ++ frameCustom = LabelFrame(frame, borderwidth=2, relief=GROOVE, ++ text=' Custom Highlighting ') ++ frameTheme = LabelFrame(frame, borderwidth=2, relief=GROOVE, ++ text=' Highlighting Theme ') + #frameCustom +- self.textHighlightSample=Text(frameCustom,relief=SOLID,borderwidth=1, +- font=('courier',12,''),cursor='hand2',width=21,height=11, +- takefocus=FALSE,highlightthickness=0,wrap=NONE) ++ self.textHighlightSample=Text( ++ frameCustom, relief=SOLID, borderwidth=1, ++ font=('courier', 12, ''), cursor='hand2', width=21, height=11, ++ takefocus=FALSE, highlightthickness=0, wrap=NONE) + text=self.textHighlightSample +- text.bind('',lambda e: 'break') +- text.bind('',lambda e: 'break') +- textAndTags=(('#you can click here','comment'),('\n','normal'), +- ('#to choose items','comment'),('\n','normal'),('def','keyword'), +- (' ','normal'),('func','definition'),('(param):','normal'), +- ('\n ','normal'),('"""string"""','string'),('\n var0 = ','normal'), +- ("'string'",'string'),('\n var1 = ','normal'),("'selected'",'hilite'), +- ('\n var2 = ','normal'),("'found'",'hit'), +- ('\n var3 = ','normal'),('list', 'builtin'), ('(','normal'), +- ('None', 'builtin'),(')\n\n','normal'), +- (' error ','error'),(' ','normal'),('cursor |','cursor'), +- ('\n ','normal'),('shell','console'),(' ','normal'),('stdout','stdout'), +- (' ','normal'),('stderr','stderr'),('\n','normal')) ++ text.bind('', lambda e: 'break') ++ text.bind('', lambda e: 'break') ++ textAndTags=( ++ ('#you can click here', 'comment'), ('\n', 'normal'), ++ ('#to choose items', 'comment'), ('\n', 'normal'), ++ ('def', 'keyword'), (' ', 'normal'), ++ ('func', 'definition'), ('(param):\n ', 'normal'), ++ ('"""string"""', 'string'), ('\n var0 = ', 'normal'), ++ ("'string'", 'string'), ('\n var1 = ', 'normal'), ++ ("'selected'", 'hilite'), ('\n var2 = ', 'normal'), ++ ("'found'", 'hit'), ('\n var3 = ', 'normal'), ++ ('list', 'builtin'), ('(', 'normal'), ++ ('None', 'builtin'), (')\n\n', 'normal'), ++ (' error ', 'error'), (' ', 'normal'), ++ ('cursor |', 'cursor'), ('\n ', 'normal'), ++ ('shell', 'console'), (' ', 'normal'), ++ ('stdout', 'stdout'), (' ', 'normal'), ++ ('stderr', 'stderr'), ('\n', 'normal')) + for txTa in textAndTags: +- text.insert(END,txTa[0],txTa[1]) +- for element in self.themeElements.keys(): +- text.tag_bind(self.themeElements[element][0],'', +- lambda event,elem=element: event.widget.winfo_toplevel() +- .highlightTarget.set(elem)) ++ text.insert(END, txTa[0], txTa[1]) ++ for element in self.themeElements: ++ def tem(event, elem=element): ++ event.widget.winfo_toplevel().highlightTarget.set(elem) ++ text.tag_bind( ++ self.themeElements[element][0], '', tem) + text.config(state=DISABLED) +- self.frameColourSet=Frame(frameCustom,relief=SOLID,borderwidth=1) +- frameFgBg=Frame(frameCustom) +- buttonSetColour=Button(self.frameColourSet,text='Choose Colour for :', +- command=self.GetColour,highlightthickness=0) +- self.optMenuHighlightTarget=DynOptionMenu(self.frameColourSet, +- self.highlightTarget,None,highlightthickness=0)#,command=self.SetHighlightTargetBinding +- self.radioFg=Radiobutton(frameFgBg,variable=self.fgHilite, +- value=1,text='Foreground',command=self.SetColourSampleBinding) +- self.radioBg=Radiobutton(frameFgBg,variable=self.fgHilite, +- value=0,text='Background',command=self.SetColourSampleBinding) ++ self.frameColourSet = Frame(frameCustom, relief=SOLID, borderwidth=1) ++ frameFgBg = Frame(frameCustom) ++ buttonSetColour = Button( ++ self.frameColourSet, text='Choose Colour for :', ++ command=self.GetColour, highlightthickness=0) ++ self.optMenuHighlightTarget = DynOptionMenu( ++ self.frameColourSet, self.highlightTarget, None, ++ highlightthickness=0) #, command=self.SetHighlightTargetBinding ++ self.radioFg = Radiobutton( ++ frameFgBg, variable=self.fgHilite, value=1, ++ text='Foreground', command=self.SetColourSampleBinding) ++ self.radioBg=Radiobutton( ++ frameFgBg, variable=self.fgHilite, value=0, ++ text='Background', command=self.SetColourSampleBinding) + self.fgHilite.set(1) +- buttonSaveCustomTheme=Button(frameCustom, +- text='Save as New Custom Theme',command=self.SaveAsNewTheme) ++ buttonSaveCustomTheme = Button( ++ frameCustom, text='Save as New Custom Theme', ++ command=self.SaveAsNewTheme) + #frameTheme +- labelTypeTitle=Label(frameTheme,text='Select : ') +- self.radioThemeBuiltin=Radiobutton(frameTheme,variable=self.themeIsBuiltin, +- value=1,command=self.SetThemeType,text='a Built-in Theme') +- self.radioThemeCustom=Radiobutton(frameTheme,variable=self.themeIsBuiltin, +- value=0,command=self.SetThemeType,text='a Custom Theme') +- self.optMenuThemeBuiltin=DynOptionMenu(frameTheme, +- self.builtinTheme,None,command=None) +- self.optMenuThemeCustom=DynOptionMenu(frameTheme, +- self.customTheme,None,command=None) +- self.buttonDeleteCustomTheme=Button(frameTheme,text='Delete Custom Theme', ++ labelTypeTitle = Label(frameTheme, text='Select : ') ++ self.radioThemeBuiltin = Radiobutton( ++ frameTheme, variable=self.themeIsBuiltin, value=1, ++ command=self.SetThemeType, text='a Built-in Theme') ++ self.radioThemeCustom = Radiobutton( ++ frameTheme, variable=self.themeIsBuiltin, value=0, ++ command=self.SetThemeType, text='a Custom Theme') ++ self.optMenuThemeBuiltin = DynOptionMenu( ++ frameTheme, self.builtinTheme, None, command=None) ++ self.optMenuThemeCustom=DynOptionMenu( ++ frameTheme, self.customTheme, None, command=None) ++ self.buttonDeleteCustomTheme=Button( ++ frameTheme, text='Delete Custom Theme', + command=self.DeleteCustomTheme) ++ + ##widget packing + #body +- frameCustom.pack(side=LEFT,padx=5,pady=5,expand=TRUE,fill=BOTH) +- frameTheme.pack(side=LEFT,padx=5,pady=5,fill=Y) ++ frameCustom.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH) ++ frameTheme.pack(side=LEFT, padx=5, pady=5, fill=Y) + #frameCustom +- self.frameColourSet.pack(side=TOP,padx=5,pady=5,expand=TRUE,fill=X) +- frameFgBg.pack(side=TOP,padx=5,pady=0) +- self.textHighlightSample.pack(side=TOP,padx=5,pady=5,expand=TRUE, +- fill=BOTH) +- buttonSetColour.pack(side=TOP,expand=TRUE,fill=X,padx=8,pady=4) +- self.optMenuHighlightTarget.pack(side=TOP,expand=TRUE,fill=X,padx=8,pady=3) +- self.radioFg.pack(side=LEFT,anchor=E) +- self.radioBg.pack(side=RIGHT,anchor=W) +- buttonSaveCustomTheme.pack(side=BOTTOM,fill=X,padx=5,pady=5) ++ self.frameColourSet.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=X) ++ frameFgBg.pack(side=TOP, padx=5, pady=0) ++ self.textHighlightSample.pack( ++ side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) ++ buttonSetColour.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4) ++ self.optMenuHighlightTarget.pack( ++ side=TOP, expand=TRUE, fill=X, padx=8, pady=3) ++ self.radioFg.pack(side=LEFT, anchor=E) ++ self.radioBg.pack(side=RIGHT, anchor=W) ++ buttonSaveCustomTheme.pack(side=BOTTOM, fill=X, padx=5, pady=5) + #frameTheme +- labelTypeTitle.pack(side=TOP,anchor=W,padx=5,pady=5) +- self.radioThemeBuiltin.pack(side=TOP,anchor=W,padx=5) +- self.radioThemeCustom.pack(side=TOP,anchor=W,padx=5,pady=2) +- self.optMenuThemeBuiltin.pack(side=TOP,fill=X,padx=5,pady=5) +- self.optMenuThemeCustom.pack(side=TOP,fill=X,anchor=W,padx=5,pady=5) +- self.buttonDeleteCustomTheme.pack(side=TOP,fill=X,padx=5,pady=5) ++ labelTypeTitle.pack(side=TOP, anchor=W, padx=5, pady=5) ++ self.radioThemeBuiltin.pack(side=TOP, anchor=W, padx=5) ++ self.radioThemeCustom.pack(side=TOP, anchor=W, padx=5, pady=2) ++ self.optMenuThemeBuiltin.pack(side=TOP, fill=X, padx=5, pady=5) ++ self.optMenuThemeCustom.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5) ++ self.buttonDeleteCustomTheme.pack(side=TOP, fill=X, padx=5, pady=5) + return frame + + def CreatePageKeys(self): +- #tkVars +- self.bindingTarget=StringVar(self) +- self.builtinKeys=StringVar(self) +- self.customKeys=StringVar(self) +- self.keysAreBuiltin=BooleanVar(self) +- self.keyBinding=StringVar(self) ++ parent = self.parent ++ self.bindingTarget = StringVar(parent) ++ self.builtinKeys = StringVar(parent) ++ self.customKeys = StringVar(parent) ++ self.keysAreBuiltin = BooleanVar(parent) ++ self.keyBinding = StringVar(parent) ++ + ##widget creation + #body frame +- frame=self.tabPages.pages['Keys'].frame ++ frame = self.tabPages.pages['Keys'].frame + #body section frames +- frameCustom=LabelFrame(frame,borderwidth=2,relief=GROOVE, +- text=' Custom Key Bindings ') +- frameKeySets=LabelFrame(frame,borderwidth=2,relief=GROOVE, +- text=' Key Set ') ++ frameCustom = LabelFrame( ++ frame, borderwidth=2, relief=GROOVE, ++ text=' Custom Key Bindings ') ++ frameKeySets = LabelFrame( ++ frame, borderwidth=2, relief=GROOVE, text=' Key Set ') + #frameCustom +- frameTarget=Frame(frameCustom) +- labelTargetTitle=Label(frameTarget,text='Action - Key(s)') +- scrollTargetY=Scrollbar(frameTarget) +- scrollTargetX=Scrollbar(frameTarget,orient=HORIZONTAL) +- self.listBindings=Listbox(frameTarget,takefocus=FALSE, +- exportselection=FALSE) +- self.listBindings.bind('',self.KeyBindingSelected) ++ frameTarget = Frame(frameCustom) ++ labelTargetTitle = Label(frameTarget, text='Action - Key(s)') ++ scrollTargetY = Scrollbar(frameTarget) ++ scrollTargetX = Scrollbar(frameTarget, orient=HORIZONTAL) ++ self.listBindings = Listbox( ++ frameTarget, takefocus=FALSE, exportselection=FALSE) ++ self.listBindings.bind('', self.KeyBindingSelected) + scrollTargetY.config(command=self.listBindings.yview) + scrollTargetX.config(command=self.listBindings.xview) + self.listBindings.config(yscrollcommand=scrollTargetY.set) + self.listBindings.config(xscrollcommand=scrollTargetX.set) +- self.buttonNewKeys=Button(frameCustom,text='Get New Keys for Selection', +- command=self.GetNewKeys,state=DISABLED) ++ self.buttonNewKeys = Button( ++ frameCustom, text='Get New Keys for Selection', ++ command=self.GetNewKeys, state=DISABLED) + #frameKeySets + frames = [Frame(frameKeySets, padx=2, pady=2, borderwidth=0) + for i in range(2)] +- self.radioKeysBuiltin=Radiobutton(frames[0],variable=self.keysAreBuiltin, +- value=1,command=self.SetKeysType,text='Use a Built-in Key Set') +- self.radioKeysCustom=Radiobutton(frames[0],variable=self.keysAreBuiltin, +- value=0,command=self.SetKeysType,text='Use a Custom Key Set') +- self.optMenuKeysBuiltin=DynOptionMenu(frames[0], +- self.builtinKeys,None,command=None) +- self.optMenuKeysCustom=DynOptionMenu(frames[0], +- self.customKeys,None,command=None) +- self.buttonDeleteCustomKeys=Button(frames[1],text='Delete Custom Key Set', ++ self.radioKeysBuiltin = Radiobutton( ++ frames[0], variable=self.keysAreBuiltin, value=1, ++ command=self.SetKeysType, text='Use a Built-in Key Set') ++ self.radioKeysCustom = Radiobutton( ++ frames[0], variable=self.keysAreBuiltin, value=0, ++ command=self.SetKeysType, text='Use a Custom Key Set') ++ self.optMenuKeysBuiltin = DynOptionMenu( ++ frames[0], self.builtinKeys, None, command=None) ++ self.optMenuKeysCustom = DynOptionMenu( ++ frames[0], self.customKeys, None, command=None) ++ self.buttonDeleteCustomKeys = Button( ++ frames[1], text='Delete Custom Key Set', + command=self.DeleteCustomKeys) +- buttonSaveCustomKeys=Button(frames[1], +- text='Save as New Custom Key Set',command=self.SaveAsNewKeySet) ++ buttonSaveCustomKeys = Button( ++ frames[1], text='Save as New Custom Key Set', ++ command=self.SaveAsNewKeySet) ++ + ##widget packing + #body +- frameCustom.pack(side=BOTTOM,padx=5,pady=5,expand=TRUE,fill=BOTH) +- frameKeySets.pack(side=BOTTOM,padx=5,pady=5,fill=BOTH) ++ frameCustom.pack(side=BOTTOM, padx=5, pady=5, expand=TRUE, fill=BOTH) ++ frameKeySets.pack(side=BOTTOM, padx=5, pady=5, fill=BOTH) + #frameCustom +- self.buttonNewKeys.pack(side=BOTTOM,fill=X,padx=5,pady=5) +- frameTarget.pack(side=LEFT,padx=5,pady=5,expand=TRUE,fill=BOTH) ++ self.buttonNewKeys.pack(side=BOTTOM, fill=X, padx=5, pady=5) ++ frameTarget.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH) + #frame target +- frameTarget.columnconfigure(0,weight=1) +- frameTarget.rowconfigure(1,weight=1) +- labelTargetTitle.grid(row=0,column=0,columnspan=2,sticky=W) +- self.listBindings.grid(row=1,column=0,sticky=NSEW) +- scrollTargetY.grid(row=1,column=1,sticky=NS) +- scrollTargetX.grid(row=2,column=0,sticky=EW) ++ frameTarget.columnconfigure(0, weight=1) ++ frameTarget.rowconfigure(1, weight=1) ++ labelTargetTitle.grid(row=0, column=0, columnspan=2, sticky=W) ++ self.listBindings.grid(row=1, column=0, sticky=NSEW) ++ scrollTargetY.grid(row=1, column=1, sticky=NS) ++ scrollTargetX.grid(row=2, column=0, sticky=EW) + #frameKeySets + self.radioKeysBuiltin.grid(row=0, column=0, sticky=W+NS) + self.radioKeysCustom.grid(row=1, column=0, sticky=W+NS) + self.optMenuKeysBuiltin.grid(row=0, column=1, sticky=NSEW) + self.optMenuKeysCustom.grid(row=1, column=1, sticky=NSEW) +- self.buttonDeleteCustomKeys.pack(side=LEFT,fill=X,expand=True,padx=2) +- buttonSaveCustomKeys.pack(side=LEFT,fill=X,expand=True,padx=2) ++ self.buttonDeleteCustomKeys.pack(side=LEFT, fill=X, expand=True, padx=2) ++ buttonSaveCustomKeys.pack(side=LEFT, fill=X, expand=True, padx=2) + frames[0].pack(side=TOP, fill=BOTH, expand=True) + frames[1].pack(side=TOP, fill=X, expand=True, pady=2) + return frame + + def CreatePageGeneral(self): +- #tkVars +- self.winWidth=StringVar(self) +- self.winHeight=StringVar(self) +- self.paraWidth=StringVar(self) +- self.startupEdit=IntVar(self) +- self.autoSave=IntVar(self) +- self.encoding=StringVar(self) +- self.userHelpBrowser=BooleanVar(self) +- self.helpBrowser=StringVar(self) ++ parent = self.parent ++ self.winWidth = StringVar(parent) ++ self.winHeight = StringVar(parent) ++ self.paraWidth = StringVar(parent) ++ self.startupEdit = IntVar(parent) ++ self.autoSave = IntVar(parent) ++ self.encoding = StringVar(parent) ++ self.userHelpBrowser = BooleanVar(parent) ++ self.helpBrowser = StringVar(parent) ++ + #widget creation + #body +- frame=self.tabPages.pages['General'].frame ++ frame = self.tabPages.pages['General'].frame + #body section frames +- frameRun=LabelFrame(frame,borderwidth=2,relief=GROOVE, +- text=' Startup Preferences ') +- frameSave=LabelFrame(frame,borderwidth=2,relief=GROOVE, +- text=' Autosave Preferences ') +- frameWinSize=Frame(frame,borderwidth=2,relief=GROOVE) +- frameParaSize=Frame(frame,borderwidth=2,relief=GROOVE) +- frameEncoding=Frame(frame,borderwidth=2,relief=GROOVE) +- frameHelp=LabelFrame(frame,borderwidth=2,relief=GROOVE, +- text=' Additional Help Sources ') ++ frameRun = LabelFrame(frame, borderwidth=2, relief=GROOVE, ++ text=' Startup Preferences ') ++ frameSave = LabelFrame(frame, borderwidth=2, relief=GROOVE, ++ text=' Autosave Preferences ') ++ frameWinSize = Frame(frame, borderwidth=2, relief=GROOVE) ++ frameParaSize = Frame(frame, borderwidth=2, relief=GROOVE) ++ frameEncoding = Frame(frame, borderwidth=2, relief=GROOVE) ++ frameHelp = LabelFrame(frame, borderwidth=2, relief=GROOVE, ++ text=' Additional Help Sources ') + #frameRun +- labelRunChoiceTitle=Label(frameRun,text='At Startup') +- radioStartupEdit=Radiobutton(frameRun,variable=self.startupEdit, +- value=1,command=self.SetKeysType,text="Open Edit Window") +- radioStartupShell=Radiobutton(frameRun,variable=self.startupEdit, +- value=0,command=self.SetKeysType,text='Open Shell Window') ++ labelRunChoiceTitle = Label(frameRun, text='At Startup') ++ radioStartupEdit = Radiobutton( ++ frameRun, variable=self.startupEdit, value=1, ++ command=self.SetKeysType, text="Open Edit Window") ++ radioStartupShell = Radiobutton( ++ frameRun, variable=self.startupEdit, value=0, ++ command=self.SetKeysType, text='Open Shell Window') + #frameSave +- labelRunSaveTitle=Label(frameSave,text='At Start of Run (F5) ') +- radioSaveAsk=Radiobutton(frameSave,variable=self.autoSave, +- value=0,command=self.SetKeysType,text="Prompt to Save") +- radioSaveAuto=Radiobutton(frameSave,variable=self.autoSave, +- value=1,command=self.SetKeysType,text='No Prompt') ++ labelRunSaveTitle = Label(frameSave, text='At Start of Run (F5) ') ++ radioSaveAsk = Radiobutton( ++ frameSave, variable=self.autoSave, value=0, ++ command=self.SetKeysType, text="Prompt to Save") ++ radioSaveAuto = Radiobutton( ++ frameSave, variable=self.autoSave, value=1, ++ command=self.SetKeysType, text='No Prompt') + #frameWinSize +- labelWinSizeTitle=Label(frameWinSize,text='Initial Window Size'+ +- ' (in characters)') +- labelWinWidthTitle=Label(frameWinSize,text='Width') +- entryWinWidth=Entry(frameWinSize,textvariable=self.winWidth, +- width=3) +- labelWinHeightTitle=Label(frameWinSize,text='Height') +- entryWinHeight=Entry(frameWinSize,textvariable=self.winHeight, +- width=3) ++ labelWinSizeTitle = Label( ++ frameWinSize, text='Initial Window Size (in characters)') ++ labelWinWidthTitle = Label(frameWinSize, text='Width') ++ entryWinWidth = Entry( ++ frameWinSize, textvariable=self.winWidth, width=3) ++ labelWinHeightTitle = Label(frameWinSize, text='Height') ++ entryWinHeight = Entry( ++ frameWinSize, textvariable=self.winHeight, width=3) + #paragraphFormatWidth +- labelParaWidthTitle=Label(frameParaSize,text='Paragraph reformat'+ +- ' width (in characters)') +- entryParaWidth=Entry(frameParaSize,textvariable=self.paraWidth, +- width=3) ++ labelParaWidthTitle = Label( ++ frameParaSize, text='Paragraph reformat width (in characters)') ++ entryParaWidth = Entry( ++ frameParaSize, textvariable=self.paraWidth, width=3) + #frameEncoding +- labelEncodingTitle=Label(frameEncoding,text="Default Source Encoding") +- radioEncLocale=Radiobutton(frameEncoding,variable=self.encoding, +- value="locale",text="Locale-defined") +- radioEncUTF8=Radiobutton(frameEncoding,variable=self.encoding, +- value="utf-8",text="UTF-8") +- radioEncNone=Radiobutton(frameEncoding,variable=self.encoding, +- value="none",text="None") ++ labelEncodingTitle = Label( ++ frameEncoding, text="Default Source Encoding") ++ radioEncLocale = Radiobutton( ++ frameEncoding, variable=self.encoding, ++ value="locale", text="Locale-defined") ++ radioEncUTF8 = Radiobutton( ++ frameEncoding, variable=self.encoding, ++ value="utf-8", text="UTF-8") ++ radioEncNone = Radiobutton( ++ frameEncoding, variable=self.encoding, ++ value="none", text="None") + #frameHelp +- frameHelpList=Frame(frameHelp) +- frameHelpListButtons=Frame(frameHelpList) +- scrollHelpList=Scrollbar(frameHelpList) +- self.listHelp=Listbox(frameHelpList,height=5,takefocus=FALSE, ++ frameHelpList = Frame(frameHelp) ++ frameHelpListButtons = Frame(frameHelpList) ++ scrollHelpList = Scrollbar(frameHelpList) ++ self.listHelp = Listbox( ++ frameHelpList, height=5, takefocus=FALSE, + exportselection=FALSE) + scrollHelpList.config(command=self.listHelp.yview) + self.listHelp.config(yscrollcommand=scrollHelpList.set) +- self.listHelp.bind('',self.HelpSourceSelected) +- self.buttonHelpListEdit=Button(frameHelpListButtons,text='Edit', +- state=DISABLED,width=8,command=self.HelpListItemEdit) +- self.buttonHelpListAdd=Button(frameHelpListButtons,text='Add', +- width=8,command=self.HelpListItemAdd) +- self.buttonHelpListRemove=Button(frameHelpListButtons,text='Remove', +- state=DISABLED,width=8,command=self.HelpListItemRemove) ++ self.listHelp.bind('', self.HelpSourceSelected) ++ self.buttonHelpListEdit = Button( ++ frameHelpListButtons, text='Edit', state=DISABLED, ++ width=8, command=self.HelpListItemEdit) ++ self.buttonHelpListAdd = Button( ++ frameHelpListButtons, text='Add', ++ width=8, command=self.HelpListItemAdd) ++ self.buttonHelpListRemove = Button( ++ frameHelpListButtons, text='Remove', state=DISABLED, ++ width=8, command=self.HelpListItemRemove) ++ + #widget packing + #body +- frameRun.pack(side=TOP,padx=5,pady=5,fill=X) +- frameSave.pack(side=TOP,padx=5,pady=5,fill=X) +- frameWinSize.pack(side=TOP,padx=5,pady=5,fill=X) +- frameParaSize.pack(side=TOP,padx=5,pady=5,fill=X) +- frameEncoding.pack(side=TOP,padx=5,pady=5,fill=X) +- frameHelp.pack(side=TOP,padx=5,pady=5,expand=TRUE,fill=BOTH) ++ frameRun.pack(side=TOP, padx=5, pady=5, fill=X) ++ frameSave.pack(side=TOP, padx=5, pady=5, fill=X) ++ frameWinSize.pack(side=TOP, padx=5, pady=5, fill=X) ++ frameParaSize.pack(side=TOP, padx=5, pady=5, fill=X) ++ frameEncoding.pack(side=TOP, padx=5, pady=5, fill=X) ++ frameHelp.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) + #frameRun +- labelRunChoiceTitle.pack(side=LEFT,anchor=W,padx=5,pady=5) +- radioStartupShell.pack(side=RIGHT,anchor=W,padx=5,pady=5) +- radioStartupEdit.pack(side=RIGHT,anchor=W,padx=5,pady=5) ++ labelRunChoiceTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) ++ radioStartupShell.pack(side=RIGHT, anchor=W, padx=5, pady=5) ++ radioStartupEdit.pack(side=RIGHT, anchor=W, padx=5, pady=5) + #frameSave +- labelRunSaveTitle.pack(side=LEFT,anchor=W,padx=5,pady=5) +- radioSaveAuto.pack(side=RIGHT,anchor=W,padx=5,pady=5) +- radioSaveAsk.pack(side=RIGHT,anchor=W,padx=5,pady=5) ++ labelRunSaveTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) ++ radioSaveAuto.pack(side=RIGHT, anchor=W, padx=5, pady=5) ++ radioSaveAsk.pack(side=RIGHT, anchor=W, padx=5, pady=5) + #frameWinSize +- labelWinSizeTitle.pack(side=LEFT,anchor=W,padx=5,pady=5) +- entryWinHeight.pack(side=RIGHT,anchor=E,padx=10,pady=5) +- labelWinHeightTitle.pack(side=RIGHT,anchor=E,pady=5) +- entryWinWidth.pack(side=RIGHT,anchor=E,padx=10,pady=5) +- labelWinWidthTitle.pack(side=RIGHT,anchor=E,pady=5) ++ labelWinSizeTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) ++ entryWinHeight.pack(side=RIGHT, anchor=E, padx=10, pady=5) ++ labelWinHeightTitle.pack(side=RIGHT, anchor=E, pady=5) ++ entryWinWidth.pack(side=RIGHT, anchor=E, padx=10, pady=5) ++ labelWinWidthTitle.pack(side=RIGHT, anchor=E, pady=5) + #paragraphFormatWidth +- labelParaWidthTitle.pack(side=LEFT,anchor=W,padx=5,pady=5) +- entryParaWidth.pack(side=RIGHT,anchor=E,padx=10,pady=5) ++ labelParaWidthTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) ++ entryParaWidth.pack(side=RIGHT, anchor=E, padx=10, pady=5) + #frameEncoding +- labelEncodingTitle.pack(side=LEFT,anchor=W,padx=5,pady=5) +- radioEncNone.pack(side=RIGHT,anchor=E,pady=5) +- radioEncUTF8.pack(side=RIGHT,anchor=E,pady=5) +- radioEncLocale.pack(side=RIGHT,anchor=E,pady=5) ++ labelEncodingTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) ++ radioEncNone.pack(side=RIGHT, anchor=E, pady=5) ++ radioEncUTF8.pack(side=RIGHT, anchor=E, pady=5) ++ radioEncLocale.pack(side=RIGHT, anchor=E, pady=5) + #frameHelp +- frameHelpListButtons.pack(side=RIGHT,padx=5,pady=5,fill=Y) +- frameHelpList.pack(side=TOP,padx=5,pady=5,expand=TRUE,fill=BOTH) +- scrollHelpList.pack(side=RIGHT,anchor=W,fill=Y) +- self.listHelp.pack(side=LEFT,anchor=E,expand=TRUE,fill=BOTH) +- self.buttonHelpListEdit.pack(side=TOP,anchor=W,pady=5) +- self.buttonHelpListAdd.pack(side=TOP,anchor=W) +- self.buttonHelpListRemove.pack(side=TOP,anchor=W,pady=5) ++ frameHelpListButtons.pack(side=RIGHT, padx=5, pady=5, fill=Y) ++ frameHelpList.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) ++ scrollHelpList.pack(side=RIGHT, anchor=W, fill=Y) ++ self.listHelp.pack(side=LEFT, anchor=E, expand=TRUE, fill=BOTH) ++ self.buttonHelpListEdit.pack(side=TOP, anchor=W, pady=5) ++ self.buttonHelpListAdd.pack(side=TOP, anchor=W) ++ self.buttonHelpListRemove.pack(side=TOP, anchor=W, pady=5) + return frame + + def AttachVarCallbacks(self): +- self.fontSize.trace_variable('w',self.VarChanged_fontSize) +- self.fontName.trace_variable('w',self.VarChanged_fontName) +- self.fontBold.trace_variable('w',self.VarChanged_fontBold) +- self.spaceNum.trace_variable('w',self.VarChanged_spaceNum) +- self.colour.trace_variable('w',self.VarChanged_colour) +- self.builtinTheme.trace_variable('w',self.VarChanged_builtinTheme) +- self.customTheme.trace_variable('w',self.VarChanged_customTheme) +- self.themeIsBuiltin.trace_variable('w',self.VarChanged_themeIsBuiltin) +- self.highlightTarget.trace_variable('w',self.VarChanged_highlightTarget) +- self.keyBinding.trace_variable('w',self.VarChanged_keyBinding) +- self.builtinKeys.trace_variable('w',self.VarChanged_builtinKeys) +- self.customKeys.trace_variable('w',self.VarChanged_customKeys) +- self.keysAreBuiltin.trace_variable('w',self.VarChanged_keysAreBuiltin) +- self.winWidth.trace_variable('w',self.VarChanged_winWidth) +- self.winHeight.trace_variable('w',self.VarChanged_winHeight) +- self.paraWidth.trace_variable('w',self.VarChanged_paraWidth) +- self.startupEdit.trace_variable('w',self.VarChanged_startupEdit) +- self.autoSave.trace_variable('w',self.VarChanged_autoSave) +- self.encoding.trace_variable('w',self.VarChanged_encoding) ++ self.fontSize.trace_variable('w', self.VarChanged_fontSize) ++ self.fontName.trace_variable('w', self.VarChanged_fontName) ++ self.fontBold.trace_variable('w', self.VarChanged_fontBold) ++ self.spaceNum.trace_variable('w', self.VarChanged_spaceNum) ++ self.colour.trace_variable('w', self.VarChanged_colour) ++ self.builtinTheme.trace_variable('w', self.VarChanged_builtinTheme) ++ self.customTheme.trace_variable('w', self.VarChanged_customTheme) ++ self.themeIsBuiltin.trace_variable('w', self.VarChanged_themeIsBuiltin) ++ self.highlightTarget.trace_variable('w', self.VarChanged_highlightTarget) ++ self.keyBinding.trace_variable('w', self.VarChanged_keyBinding) ++ self.builtinKeys.trace_variable('w', self.VarChanged_builtinKeys) ++ self.customKeys.trace_variable('w', self.VarChanged_customKeys) ++ self.keysAreBuiltin.trace_variable('w', self.VarChanged_keysAreBuiltin) ++ self.winWidth.trace_variable('w', self.VarChanged_winWidth) ++ self.winHeight.trace_variable('w', self.VarChanged_winHeight) ++ self.paraWidth.trace_variable('w', self.VarChanged_paraWidth) ++ self.startupEdit.trace_variable('w', self.VarChanged_startupEdit) ++ self.autoSave.trace_variable('w', self.VarChanged_autoSave) ++ self.encoding.trace_variable('w', self.VarChanged_encoding) + +- def VarChanged_fontSize(self,*params): +- value=self.fontSize.get() +- self.AddChangedItem('main','EditorWindow','font-size',value) ++ def VarChanged_fontSize(self, *params): ++ value = self.fontSize.get() ++ self.AddChangedItem('main', 'EditorWindow', 'font-size', value) + +- def VarChanged_fontName(self,*params): +- value=self.fontName.get() +- self.AddChangedItem('main','EditorWindow','font',value) ++ def VarChanged_fontName(self, *params): ++ value = self.fontName.get() ++ self.AddChangedItem('main', 'EditorWindow', 'font', value) + +- def VarChanged_fontBold(self,*params): +- value=self.fontBold.get() +- self.AddChangedItem('main','EditorWindow','font-bold',value) ++ def VarChanged_fontBold(self, *params): ++ value = self.fontBold.get() ++ self.AddChangedItem('main', 'EditorWindow', 'font-bold', value) + +- def VarChanged_spaceNum(self,*params): +- value=self.spaceNum.get() +- self.AddChangedItem('main','Indent','num-spaces',value) ++ def VarChanged_spaceNum(self, *params): ++ value = self.spaceNum.get() ++ self.AddChangedItem('main', 'Indent', 'num-spaces', value) + +- def VarChanged_colour(self,*params): ++ def VarChanged_colour(self, *params): + self.OnNewColourSet() + +- def VarChanged_builtinTheme(self,*params): +- value=self.builtinTheme.get() +- self.AddChangedItem('main','Theme','name',value) ++ def VarChanged_builtinTheme(self, *params): ++ value = self.builtinTheme.get() ++ self.AddChangedItem('main', 'Theme', 'name', value) + self.PaintThemeSample() + +- def VarChanged_customTheme(self,*params): +- value=self.customTheme.get() ++ def VarChanged_customTheme(self, *params): ++ value = self.customTheme.get() + if value != '- no custom themes -': +- self.AddChangedItem('main','Theme','name',value) ++ self.AddChangedItem('main', 'Theme', 'name', value) + self.PaintThemeSample() + +- def VarChanged_themeIsBuiltin(self,*params): +- value=self.themeIsBuiltin.get() +- self.AddChangedItem('main','Theme','default',value) ++ def VarChanged_themeIsBuiltin(self, *params): ++ value = self.themeIsBuiltin.get() ++ self.AddChangedItem('main', 'Theme', 'default', value) + if value: + self.VarChanged_builtinTheme() + else: + self.VarChanged_customTheme() + +- def VarChanged_highlightTarget(self,*params): ++ def VarChanged_highlightTarget(self, *params): + self.SetHighlightTarget() + +- def VarChanged_keyBinding(self,*params): +- value=self.keyBinding.get() +- keySet=self.customKeys.get() +- event=self.listBindings.get(ANCHOR).split()[0] ++ def VarChanged_keyBinding(self, *params): ++ value = self.keyBinding.get() ++ keySet = self.customKeys.get() ++ event = self.listBindings.get(ANCHOR).split()[0] + if idleConf.IsCoreBinding(event): + #this is a core keybinding +- self.AddChangedItem('keys',keySet,event,value) ++ self.AddChangedItem('keys', keySet, event, value) + else: #this is an extension key binding +- extName=idleConf.GetExtnNameForEvent(event) +- extKeybindSection=extName+'_cfgBindings' +- self.AddChangedItem('extensions',extKeybindSection,event,value) ++ extName = idleConf.GetExtnNameForEvent(event) ++ extKeybindSection = extName + '_cfgBindings' ++ self.AddChangedItem('extensions', extKeybindSection, event, value) + +- def VarChanged_builtinKeys(self,*params): +- value=self.builtinKeys.get() +- self.AddChangedItem('main','Keys','name',value) ++ def VarChanged_builtinKeys(self, *params): ++ value = self.builtinKeys.get() ++ self.AddChangedItem('main', 'Keys', 'name', value) + self.LoadKeysList(value) + +- def VarChanged_customKeys(self,*params): +- value=self.customKeys.get() ++ def VarChanged_customKeys(self, *params): ++ value = self.customKeys.get() + if value != '- no custom keys -': +- self.AddChangedItem('main','Keys','name',value) ++ self.AddChangedItem('main', 'Keys', 'name', value) + self.LoadKeysList(value) + +- def VarChanged_keysAreBuiltin(self,*params): +- value=self.keysAreBuiltin.get() +- self.AddChangedItem('main','Keys','default',value) ++ def VarChanged_keysAreBuiltin(self, *params): ++ value = self.keysAreBuiltin.get() ++ self.AddChangedItem('main', 'Keys', 'default', value) + if value: + self.VarChanged_builtinKeys() + else: + self.VarChanged_customKeys() + +- def VarChanged_winWidth(self,*params): +- value=self.winWidth.get() +- self.AddChangedItem('main','EditorWindow','width',value) ++ def VarChanged_winWidth(self, *params): ++ value = self.winWidth.get() ++ self.AddChangedItem('main', 'EditorWindow', 'width', value) + +- def VarChanged_winHeight(self,*params): +- value=self.winHeight.get() +- self.AddChangedItem('main','EditorWindow','height',value) ++ def VarChanged_winHeight(self, *params): ++ value = self.winHeight.get() ++ self.AddChangedItem('main', 'EditorWindow', 'height', value) + +- def VarChanged_paraWidth(self,*params): +- value=self.paraWidth.get() +- self.AddChangedItem('main','FormatParagraph','paragraph',value) ++ def VarChanged_paraWidth(self, *params): ++ value = self.paraWidth.get() ++ self.AddChangedItem('main', 'FormatParagraph', 'paragraph', value) + +- def VarChanged_startupEdit(self,*params): +- value=self.startupEdit.get() +- self.AddChangedItem('main','General','editor-on-startup',value) ++ def VarChanged_startupEdit(self, *params): ++ value = self.startupEdit.get() ++ self.AddChangedItem('main', 'General', 'editor-on-startup', value) + +- def VarChanged_autoSave(self,*params): +- value=self.autoSave.get() +- self.AddChangedItem('main','General','autosave',value) ++ def VarChanged_autoSave(self, *params): ++ value = self.autoSave.get() ++ self.AddChangedItem('main', 'General', 'autosave', value) + +- def VarChanged_encoding(self,*params): +- value=self.encoding.get() +- self.AddChangedItem('main','EditorWindow','encoding',value) ++ def VarChanged_encoding(self, *params): ++ value = self.encoding.get() ++ self.AddChangedItem('main', 'EditorWindow', 'encoding', value) + + def ResetChangedItems(self): + #When any config item is changed in this dialog, an entry +@@ -564,24 +616,25 @@ + #dictionary. The key should be the config file section name and the + #value a dictionary, whose key:value pairs are item=value pairs for + #that config file section. +- self.changedItems={'main':{},'highlight':{},'keys':{},'extensions':{}} ++ self.changedItems = {'main':{}, 'highlight':{}, 'keys':{}, ++ 'extensions':{}} + +- def AddChangedItem(self,type,section,item,value): +- value=str(value) #make sure we use a string +- if section not in self.changedItems[type]: +- self.changedItems[type][section]={} +- self.changedItems[type][section][item]=value ++ def AddChangedItem(self, typ, section, item, value): ++ value = str(value) #make sure we use a string ++ if section not in self.changedItems[typ]: ++ self.changedItems[typ][section] = {} ++ self.changedItems[typ][section][item] = value + + def GetDefaultItems(self): +- dItems={'main':{},'highlight':{},'keys':{},'extensions':{}} +- for configType in dItems.keys(): +- sections=idleConf.GetSectionList('default',configType) ++ dItems={'main':{}, 'highlight':{}, 'keys':{}, 'extensions':{}} ++ for configType in dItems: ++ sections = idleConf.GetSectionList('default', configType) + for section in sections: +- dItems[configType][section]={} +- options=idleConf.defaultCfg[configType].GetOptionList(section) ++ dItems[configType][section] = {} ++ options = idleConf.defaultCfg[configType].GetOptionList(section) + for option in options: +- dItems[configType][section][option]=( +- idleConf.defaultCfg[configType].Get(section,option)) ++ dItems[configType][section][option] = ( ++ idleConf.defaultCfg[configType].Get(section, option)) + return dItems + + def SetThemeType(self): +@@ -607,26 +660,26 @@ + self.buttonDeleteCustomKeys.config(state=NORMAL) + + def GetNewKeys(self): +- listIndex=self.listBindings.index(ANCHOR) +- binding=self.listBindings.get(listIndex) +- bindName=binding.split()[0] #first part, up to first space ++ listIndex = self.listBindings.index(ANCHOR) ++ binding = self.listBindings.get(listIndex) ++ bindName = binding.split()[0] #first part, up to first space + if self.keysAreBuiltin.get(): +- currentKeySetName=self.builtinKeys.get() ++ currentKeySetName = self.builtinKeys.get() + else: +- currentKeySetName=self.customKeys.get() +- currentBindings=idleConf.GetCurrentKeySet() +- if currentKeySetName in self.changedItems['keys'].keys(): #unsaved changes +- keySetChanges=self.changedItems['keys'][currentKeySetName] +- for event in keySetChanges.keys(): +- currentBindings[event]=keySetChanges[event].split() +- currentKeySequences=currentBindings.values() +- newKeys=GetKeysDialog(self,'Get New Keys',bindName, ++ currentKeySetName = self.customKeys.get() ++ currentBindings = idleConf.GetCurrentKeySet() ++ if currentKeySetName in self.changedItems['keys']: #unsaved changes ++ keySetChanges = self.changedItems['keys'][currentKeySetName] ++ for event in keySetChanges: ++ currentBindings[event] = keySetChanges[event].split() ++ currentKeySequences = currentBindings.values() ++ newKeys = GetKeysDialog(self, 'Get New Keys', bindName, + currentKeySequences).result + if newKeys: #new keys were specified + if self.keysAreBuiltin.get(): #current key set is a built-in +- message=('Your changes will be saved as a new Custom Key Set. '+ +- 'Enter a name for your new Custom Key Set below.') +- newKeySet=self.GetNewKeysName(message) ++ message = ('Your changes will be saved as a new Custom Key Set.' ++ ' Enter a name for your new Custom Key Set below.') ++ newKeySet = self.GetNewKeysName(message) + if not newKeySet: #user cancelled custom key set creation + self.listBindings.select_set(listIndex) + self.listBindings.select_anchor(listIndex) +@@ -634,7 +687,7 @@ + else: #create new custom key set based on previously active key set + self.CreateNewKeySet(newKeySet) + self.listBindings.delete(listIndex) +- self.listBindings.insert(listIndex,bindName+' - '+newKeys) ++ self.listBindings.insert(listIndex, bindName+' - '+newKeys) + self.listBindings.select_set(listIndex) + self.listBindings.select_anchor(listIndex) + self.keyBinding.set(newKeys) +@@ -642,65 +695,65 @@ + self.listBindings.select_set(listIndex) + self.listBindings.select_anchor(listIndex) + +- def GetNewKeysName(self,message): +- usedNames=(idleConf.GetSectionList('user','keys')+ +- idleConf.GetSectionList('default','keys')) +- newKeySet=GetCfgSectionNameDialog(self,'New Custom Key Set', +- message,usedNames).result ++ def GetNewKeysName(self, message): ++ usedNames = (idleConf.GetSectionList('user', 'keys') + ++ idleConf.GetSectionList('default', 'keys')) ++ newKeySet = GetCfgSectionNameDialog( ++ self, 'New Custom Key Set', message, usedNames).result + return newKeySet + + def SaveAsNewKeySet(self): +- newKeysName=self.GetNewKeysName('New Key Set Name:') ++ newKeysName = self.GetNewKeysName('New Key Set Name:') + if newKeysName: + self.CreateNewKeySet(newKeysName) + +- def KeyBindingSelected(self,event): ++ def KeyBindingSelected(self, event): + self.buttonNewKeys.config(state=NORMAL) + +- def CreateNewKeySet(self,newKeySetName): ++ def CreateNewKeySet(self, newKeySetName): + #creates new custom key set based on the previously active key set, + #and makes the new key set active + if self.keysAreBuiltin.get(): +- prevKeySetName=self.builtinKeys.get() ++ prevKeySetName = self.builtinKeys.get() + else: +- prevKeySetName=self.customKeys.get() +- prevKeys=idleConf.GetCoreKeys(prevKeySetName) +- newKeys={} +- for event in prevKeys.keys(): #add key set to changed items +- eventName=event[2:-2] #trim off the angle brackets +- binding=string.join(prevKeys[event]) +- newKeys[eventName]=binding ++ prevKeySetName = self.customKeys.get() ++ prevKeys = idleConf.GetCoreKeys(prevKeySetName) ++ newKeys = {} ++ for event in prevKeys: #add key set to changed items ++ eventName = event[2:-2] #trim off the angle brackets ++ binding = ' '.join(prevKeys[event]) ++ newKeys[eventName] = binding + #handle any unsaved changes to prev key set +- if prevKeySetName in self.changedItems['keys'].keys(): +- keySetChanges=self.changedItems['keys'][prevKeySetName] +- for event in keySetChanges.keys(): +- newKeys[event]=keySetChanges[event] ++ if prevKeySetName in self.changedItems['keys']: ++ keySetChanges = self.changedItems['keys'][prevKeySetName] ++ for event in keySetChanges: ++ newKeys[event] = keySetChanges[event] + #save the new theme +- self.SaveNewKeySet(newKeySetName,newKeys) ++ self.SaveNewKeySet(newKeySetName, newKeys) + #change gui over to the new key set +- customKeyList=idleConf.GetSectionList('user','keys') ++ customKeyList = idleConf.GetSectionList('user', 'keys') + customKeyList.sort() +- self.optMenuKeysCustom.SetMenu(customKeyList,newKeySetName) ++ self.optMenuKeysCustom.SetMenu(customKeyList, newKeySetName) + self.keysAreBuiltin.set(0) + self.SetKeysType() + +- def LoadKeysList(self,keySetName): +- reselect=0 +- newKeySet=0 ++ def LoadKeysList(self, keySetName): ++ reselect = 0 ++ newKeySet = 0 + if self.listBindings.curselection(): +- reselect=1 +- listIndex=self.listBindings.index(ANCHOR) +- keySet=idleConf.GetKeySet(keySetName) +- bindNames=keySet.keys() ++ reselect = 1 ++ listIndex = self.listBindings.index(ANCHOR) ++ keySet = idleConf.GetKeySet(keySetName) ++ bindNames = keySet.keys() + bindNames.sort() +- self.listBindings.delete(0,END) ++ self.listBindings.delete(0, END) + for bindName in bindNames: +- key=string.join(keySet[bindName]) #make key(s) into a string +- bindName=bindName[2:-2] #trim off the angle brackets +- if keySetName in self.changedItems['keys'].keys(): ++ key = ' '.join(keySet[bindName]) #make key(s) into a string ++ bindName = bindName[2:-2] #trim off the angle brackets ++ if keySetName in self.changedItems['keys']: + #handle any unsaved changes to this key set +- if bindName in self.changedItems['keys'][keySetName].keys(): +- key=self.changedItems['keys'][keySetName][bindName] ++ if bindName in self.changedItems['keys'][keySetName]: ++ key = self.changedItems['keys'][keySetName][bindName] + self.listBindings.insert(END, bindName+' - '+key) + if reselect: + self.listBindings.see(listIndex) +@@ -709,9 +762,9 @@ + + def DeleteCustomKeys(self): + keySetName=self.customKeys.get() +- if not tkMessageBox.askyesno('Delete Key Set','Are you sure you wish '+ +- 'to delete the key set %r ?' % (keySetName), +- parent=self): ++ delmsg = 'Are you sure you wish to delete the key set %r ?' ++ if not tkMessageBox.askyesno( ++ 'Delete Key Set', delmsg % keySetName, parent=self): + return + #remove key set from config + idleConf.userCfg['keys'].remove_section(keySetName) +@@ -720,25 +773,25 @@ + #write changes + idleConf.userCfg['keys'].Save() + #reload user key set list +- itemList=idleConf.GetSectionList('user','keys') ++ itemList = idleConf.GetSectionList('user', 'keys') + itemList.sort() + if not itemList: + self.radioKeysCustom.config(state=DISABLED) +- self.optMenuKeysCustom.SetMenu(itemList,'- no custom keys -') ++ self.optMenuKeysCustom.SetMenu(itemList, '- no custom keys -') + else: +- self.optMenuKeysCustom.SetMenu(itemList,itemList[0]) ++ self.optMenuKeysCustom.SetMenu(itemList, itemList[0]) + #revert to default key set +- self.keysAreBuiltin.set(idleConf.defaultCfg['main'].Get('Keys','default')) +- self.builtinKeys.set(idleConf.defaultCfg['main'].Get('Keys','name')) ++ self.keysAreBuiltin.set(idleConf.defaultCfg['main'].Get('Keys', 'default')) ++ self.builtinKeys.set(idleConf.defaultCfg['main'].Get('Keys', 'name')) + #user can't back out of these changes, they must be applied now + self.Apply() + self.SetKeysType() + + def DeleteCustomTheme(self): +- themeName=self.customTheme.get() +- if not tkMessageBox.askyesno('Delete Theme','Are you sure you wish '+ +- 'to delete the theme %r ?' % (themeName,), +- parent=self): ++ themeName = self.customTheme.get() ++ delmsg = 'Are you sure you wish to delete the theme %r ?' ++ if not tkMessageBox.askyesno( ++ 'Delete Theme', delmsg % themeName, parent=self): + return + #remove theme from config + idleConf.userCfg['highlight'].remove_section(themeName) +@@ -747,153 +800,149 @@ + #write changes + idleConf.userCfg['highlight'].Save() + #reload user theme list +- itemList=idleConf.GetSectionList('user','highlight') ++ itemList = idleConf.GetSectionList('user', 'highlight') + itemList.sort() + if not itemList: + self.radioThemeCustom.config(state=DISABLED) +- self.optMenuThemeCustom.SetMenu(itemList,'- no custom themes -') ++ self.optMenuThemeCustom.SetMenu(itemList, '- no custom themes -') + else: +- self.optMenuThemeCustom.SetMenu(itemList,itemList[0]) ++ self.optMenuThemeCustom.SetMenu(itemList, itemList[0]) + #revert to default theme +- self.themeIsBuiltin.set(idleConf.defaultCfg['main'].Get('Theme','default')) +- self.builtinTheme.set(idleConf.defaultCfg['main'].Get('Theme','name')) ++ self.themeIsBuiltin.set(idleConf.defaultCfg['main'].Get('Theme', 'default')) ++ self.builtinTheme.set(idleConf.defaultCfg['main'].Get('Theme', 'name')) + #user can't back out of these changes, they must be applied now + self.Apply() + self.SetThemeType() + + def GetColour(self): +- target=self.highlightTarget.get() +- prevColour=self.frameColourSet.cget('bg') +- rgbTuplet, colourString = tkColorChooser.askcolor(parent=self, +- title='Pick new colour for : '+target,initialcolor=prevColour) +- if colourString and (colourString!=prevColour): ++ target = self.highlightTarget.get() ++ prevColour = self.frameColourSet.cget('bg') ++ rgbTuplet, colourString = tkColorChooser.askcolor( ++ parent=self, title='Pick new colour for : '+target, ++ initialcolor=prevColour) ++ if colourString and (colourString != prevColour): + #user didn't cancel, and they chose a new colour +- if self.themeIsBuiltin.get(): #current theme is a built-in +- message=('Your changes will be saved as a new Custom Theme. '+ +- 'Enter a name for your new Custom Theme below.') +- newTheme=self.GetNewThemeName(message) +- if not newTheme: #user cancelled custom theme creation ++ if self.themeIsBuiltin.get(): #current theme is a built-in ++ message = ('Your changes will be saved as a new Custom Theme. ' ++ 'Enter a name for your new Custom Theme below.') ++ newTheme = self.GetNewThemeName(message) ++ if not newTheme: #user cancelled custom theme creation + return +- else: #create new custom theme based on previously active theme ++ else: #create new custom theme based on previously active theme + self.CreateNewTheme(newTheme) + self.colour.set(colourString) +- else: #current theme is user defined ++ else: #current theme is user defined + self.colour.set(colourString) + + def OnNewColourSet(self): + newColour=self.colour.get() +- self.frameColourSet.config(bg=newColour)#set sample +- if self.fgHilite.get(): plane='foreground' +- else: plane='background' +- sampleElement=self.themeElements[self.highlightTarget.get()][0] ++ self.frameColourSet.config(bg=newColour) #set sample ++ plane ='foreground' if self.fgHilite.get() else 'background' ++ sampleElement = self.themeElements[self.highlightTarget.get()][0] + self.textHighlightSample.tag_config(sampleElement, **{plane:newColour}) +- theme=self.customTheme.get() +- themeElement=sampleElement+'-'+plane +- self.AddChangedItem('highlight',theme,themeElement,newColour) ++ theme = self.customTheme.get() ++ themeElement = sampleElement + '-' + plane ++ self.AddChangedItem('highlight', theme, themeElement, newColour) + +- def GetNewThemeName(self,message): +- usedNames=(idleConf.GetSectionList('user','highlight')+ +- idleConf.GetSectionList('default','highlight')) +- newTheme=GetCfgSectionNameDialog(self,'New Custom Theme', +- message,usedNames).result ++ def GetNewThemeName(self, message): ++ usedNames = (idleConf.GetSectionList('user', 'highlight') + ++ idleConf.GetSectionList('default', 'highlight')) ++ newTheme = GetCfgSectionNameDialog( ++ self, 'New Custom Theme', message, usedNames).result + return newTheme + + def SaveAsNewTheme(self): +- newThemeName=self.GetNewThemeName('New Theme Name:') ++ newThemeName = self.GetNewThemeName('New Theme Name:') + if newThemeName: + self.CreateNewTheme(newThemeName) + +- def CreateNewTheme(self,newThemeName): ++ def CreateNewTheme(self, newThemeName): + #creates new custom theme based on the previously active theme, + #and makes the new theme active + if self.themeIsBuiltin.get(): +- themeType='default' +- themeName=self.builtinTheme.get() ++ themeType = 'default' ++ themeName = self.builtinTheme.get() + else: +- themeType='user' +- themeName=self.customTheme.get() +- newTheme=idleConf.GetThemeDict(themeType,themeName) ++ themeType = 'user' ++ themeName = self.customTheme.get() ++ newTheme = idleConf.GetThemeDict(themeType, themeName) + #apply any of the old theme's unsaved changes to the new theme +- if themeName in self.changedItems['highlight'].keys(): +- themeChanges=self.changedItems['highlight'][themeName] +- for element in themeChanges.keys(): +- newTheme[element]=themeChanges[element] ++ if themeName in self.changedItems['highlight']: ++ themeChanges = self.changedItems['highlight'][themeName] ++ for element in themeChanges: ++ newTheme[element] = themeChanges[element] + #save the new theme +- self.SaveNewTheme(newThemeName,newTheme) ++ self.SaveNewTheme(newThemeName, newTheme) + #change gui over to the new theme +- customThemeList=idleConf.GetSectionList('user','highlight') ++ customThemeList = idleConf.GetSectionList('user', 'highlight') + customThemeList.sort() +- self.optMenuThemeCustom.SetMenu(customThemeList,newThemeName) ++ self.optMenuThemeCustom.SetMenu(customThemeList, newThemeName) + self.themeIsBuiltin.set(0) + self.SetThemeType() + +- def OnListFontButtonRelease(self,event): ++ def OnListFontButtonRelease(self, event): + font = self.listFontName.get(ANCHOR) + self.fontName.set(font.lower()) + self.SetFontSample() + +- def SetFontSample(self,event=None): +- fontName=self.fontName.get() +- if self.fontBold.get(): +- fontWeight=tkFont.BOLD +- else: +- fontWeight=tkFont.NORMAL ++ def SetFontSample(self, event=None): ++ fontName = self.fontName.get() ++ fontWeight = tkFont.BOLD if self.fontBold.get() else tkFont.NORMAL + newFont = (fontName, self.fontSize.get(), fontWeight) + self.labelFontSample.config(font=newFont) + self.textHighlightSample.configure(font=newFont) + + def SetHighlightTarget(self): +- if self.highlightTarget.get()=='Cursor': #bg not possible ++ if self.highlightTarget.get() == 'Cursor': #bg not possible + self.radioFg.config(state=DISABLED) + self.radioBg.config(state=DISABLED) + self.fgHilite.set(1) +- else: #both fg and bg can be set ++ else: #both fg and bg can be set + self.radioFg.config(state=NORMAL) + self.radioBg.config(state=NORMAL) + self.fgHilite.set(1) + self.SetColourSample() + +- def SetColourSampleBinding(self,*args): ++ def SetColourSampleBinding(self, *args): + self.SetColourSample() + + def SetColourSample(self): + #set the colour smaple area +- tag=self.themeElements[self.highlightTarget.get()][0] +- if self.fgHilite.get(): plane='foreground' +- else: plane='background' +- colour=self.textHighlightSample.tag_cget(tag,plane) ++ tag = self.themeElements[self.highlightTarget.get()][0] ++ plane = 'foreground' if self.fgHilite.get() else 'background' ++ colour = self.textHighlightSample.tag_cget(tag, plane) + self.frameColourSet.config(bg=colour) + + def PaintThemeSample(self): +- if self.themeIsBuiltin.get(): #a default theme +- theme=self.builtinTheme.get() +- else: #a user theme +- theme=self.customTheme.get() +- for elementTitle in self.themeElements.keys(): +- element=self.themeElements[elementTitle][0] +- colours=idleConf.GetHighlight(theme,element) +- if element=='cursor': #cursor sample needs special painting +- colours['background']=idleConf.GetHighlight(theme, +- 'normal', fgBg='bg') ++ if self.themeIsBuiltin.get(): #a default theme ++ theme = self.builtinTheme.get() ++ else: #a user theme ++ theme = self.customTheme.get() ++ for elementTitle in self.themeElements: ++ element = self.themeElements[elementTitle][0] ++ colours = idleConf.GetHighlight(theme, element) ++ if element == 'cursor': #cursor sample needs special painting ++ colours['background'] = idleConf.GetHighlight( ++ theme, 'normal', fgBg='bg') + #handle any unsaved changes to this theme +- if theme in self.changedItems['highlight'].keys(): +- themeDict=self.changedItems['highlight'][theme] +- if element+'-foreground' in themeDict: +- colours['foreground']=themeDict[element+'-foreground'] +- if element+'-background' in themeDict: +- colours['background']=themeDict[element+'-background'] ++ if theme in self.changedItems['highlight']: ++ themeDict = self.changedItems['highlight'][theme] ++ if element + '-foreground' in themeDict: ++ colours['foreground'] = themeDict[element + '-foreground'] ++ if element + '-background' in themeDict: ++ colours['background'] = themeDict[element + '-background'] + self.textHighlightSample.tag_config(element, **colours) + self.SetColourSample() + +- def HelpSourceSelected(self,event): ++ def HelpSourceSelected(self, event): + self.SetHelpListButtonStates() + + def SetHelpListButtonStates(self): +- if self.listHelp.size()<1: #no entries in list ++ if self.listHelp.size() < 1: #no entries in list + self.buttonHelpListEdit.config(state=DISABLED) + self.buttonHelpListRemove.config(state=DISABLED) + else: #there are some entries +- if self.listHelp.curselection(): #there currently is a selection ++ if self.listHelp.curselection(): #there currently is a selection + self.buttonHelpListEdit.config(state=NORMAL) + self.buttonHelpListRemove.config(state=NORMAL) + else: #there currently is not a selection +@@ -901,28 +950,29 @@ + self.buttonHelpListRemove.config(state=DISABLED) + + def HelpListItemAdd(self): +- helpSource=GetHelpSourceDialog(self,'New Help Source').result ++ helpSource = GetHelpSourceDialog(self, 'New Help Source').result + if helpSource: +- self.userHelpList.append( (helpSource[0],helpSource[1]) ) +- self.listHelp.insert(END,helpSource[0]) ++ self.userHelpList.append((helpSource[0], helpSource[1])) ++ self.listHelp.insert(END, helpSource[0]) + self.UpdateUserHelpChangedItems() + self.SetHelpListButtonStates() + + def HelpListItemEdit(self): +- itemIndex=self.listHelp.index(ANCHOR) +- helpSource=self.userHelpList[itemIndex] +- newHelpSource=GetHelpSourceDialog(self,'Edit Help Source', +- menuItem=helpSource[0],filePath=helpSource[1]).result +- if (not newHelpSource) or (newHelpSource==helpSource): ++ itemIndex = self.listHelp.index(ANCHOR) ++ helpSource = self.userHelpList[itemIndex] ++ newHelpSource = GetHelpSourceDialog( ++ self, 'Edit Help Source', menuItem=helpSource[0], ++ filePath=helpSource[1]).result ++ if (not newHelpSource) or (newHelpSource == helpSource): + return #no changes +- self.userHelpList[itemIndex]=newHelpSource ++ self.userHelpList[itemIndex] = newHelpSource + self.listHelp.delete(itemIndex) +- self.listHelp.insert(itemIndex,newHelpSource[0]) ++ self.listHelp.insert(itemIndex, newHelpSource[0]) + self.UpdateUserHelpChangedItems() + self.SetHelpListButtonStates() + + def HelpListItemRemove(self): +- itemIndex=self.listHelp.index(ANCHOR) ++ itemIndex = self.listHelp.index(ANCHOR) + del(self.userHelpList[itemIndex]) + self.listHelp.delete(itemIndex) + self.UpdateUserHelpChangedItems() +@@ -931,18 +981,19 @@ + def UpdateUserHelpChangedItems(self): + "Clear and rebuild the HelpFiles section in self.changedItems" + self.changedItems['main']['HelpFiles'] = {} +- for num in range(1,len(self.userHelpList)+1): +- self.AddChangedItem('main','HelpFiles',str(num), +- string.join(self.userHelpList[num-1][:2],';')) ++ for num in range(1, len(self.userHelpList) + 1): ++ self.AddChangedItem( ++ 'main', 'HelpFiles', str(num), ++ ';'.join(self.userHelpList[num-1][:2])) + + def LoadFontCfg(self): + ##base editor font selection list +- fonts=list(tkFont.families(self)) ++ fonts = list(tkFont.families(self)) + fonts.sort() + for font in fonts: +- self.listFontName.insert(END,font) +- configuredFont=idleConf.GetOption('main','EditorWindow','font', +- default='courier') ++ self.listFontName.insert(END, font) ++ configuredFont = idleConf.GetOption( ++ 'main', 'EditorWindow', 'font', default='courier') + lc_configuredFont = configuredFont.lower() + self.fontName.set(lc_configuredFont) + lc_fonts = [s.lower() for s in fonts] +@@ -952,107 +1003,107 @@ + self.listFontName.select_set(currentFontIndex) + self.listFontName.select_anchor(currentFontIndex) + ##font size dropdown +- fontSize=idleConf.GetOption('main','EditorWindow','font-size', +- type='int', default='10') +- self.optMenuFontSize.SetMenu(('7','8','9','10','11','12','13','14', +- '16','18','20','22'),fontSize ) ++ fontSize = idleConf.GetOption( ++ 'main', 'EditorWindow', 'font-size', type='int', default='10') ++ self.optMenuFontSize.SetMenu(('7', '8', '9', '10', '11', '12', '13', ++ '14', '16', '18', '20', '22'), fontSize ) + ##fontWeight +- self.fontBold.set(idleConf.GetOption('main','EditorWindow', +- 'font-bold',default=0,type='bool')) ++ self.fontBold.set(idleConf.GetOption( ++ 'main', 'EditorWindow', 'font-bold', default=0, type='bool')) + ##font sample + self.SetFontSample() + + def LoadTabCfg(self): + ##indent sizes +- spaceNum=idleConf.GetOption('main','Indent','num-spaces', +- default=4,type='int') ++ spaceNum = idleConf.GetOption( ++ 'main', 'Indent', 'num-spaces', default=4, type='int') + self.spaceNum.set(spaceNum) + + def LoadThemeCfg(self): + ##current theme type radiobutton +- self.themeIsBuiltin.set(idleConf.GetOption('main','Theme','default', +- type='bool',default=1)) ++ self.themeIsBuiltin.set(idleConf.GetOption( ++ 'main', 'Theme', 'default', type='bool', default=1)) + ##currently set theme +- currentOption=idleConf.CurrentTheme() ++ currentOption = idleConf.CurrentTheme() + ##load available theme option menus + if self.themeIsBuiltin.get(): #default theme selected +- itemList=idleConf.GetSectionList('default','highlight') ++ itemList = idleConf.GetSectionList('default', 'highlight') + itemList.sort() +- self.optMenuThemeBuiltin.SetMenu(itemList,currentOption) +- itemList=idleConf.GetSectionList('user','highlight') ++ self.optMenuThemeBuiltin.SetMenu(itemList, currentOption) ++ itemList = idleConf.GetSectionList('user', 'highlight') + itemList.sort() + if not itemList: + self.radioThemeCustom.config(state=DISABLED) + self.customTheme.set('- no custom themes -') + else: +- self.optMenuThemeCustom.SetMenu(itemList,itemList[0]) ++ self.optMenuThemeCustom.SetMenu(itemList, itemList[0]) + else: #user theme selected +- itemList=idleConf.GetSectionList('user','highlight') ++ itemList = idleConf.GetSectionList('user', 'highlight') + itemList.sort() +- self.optMenuThemeCustom.SetMenu(itemList,currentOption) +- itemList=idleConf.GetSectionList('default','highlight') ++ self.optMenuThemeCustom.SetMenu(itemList, currentOption) ++ itemList = idleConf.GetSectionList('default', 'highlight') + itemList.sort() +- self.optMenuThemeBuiltin.SetMenu(itemList,itemList[0]) ++ self.optMenuThemeBuiltin.SetMenu(itemList, itemList[0]) + self.SetThemeType() + ##load theme element option menu +- themeNames=self.themeElements.keys() ++ themeNames = self.themeElements.keys() + themeNames.sort(key=lambda x: self.themeElements[x][1]) +- self.optMenuHighlightTarget.SetMenu(themeNames,themeNames[0]) ++ self.optMenuHighlightTarget.SetMenu(themeNames, themeNames[0]) + self.PaintThemeSample() + self.SetHighlightTarget() + + def LoadKeyCfg(self): + ##current keys type radiobutton +- self.keysAreBuiltin.set(idleConf.GetOption('main','Keys','default', +- type='bool',default=1)) ++ self.keysAreBuiltin.set(idleConf.GetOption( ++ 'main', 'Keys', 'default', type='bool', default=1)) + ##currently set keys +- currentOption=idleConf.CurrentKeys() ++ currentOption = idleConf.CurrentKeys() + ##load available keyset option menus + if self.keysAreBuiltin.get(): #default theme selected +- itemList=idleConf.GetSectionList('default','keys') ++ itemList = idleConf.GetSectionList('default', 'keys') + itemList.sort() +- self.optMenuKeysBuiltin.SetMenu(itemList,currentOption) +- itemList=idleConf.GetSectionList('user','keys') ++ self.optMenuKeysBuiltin.SetMenu(itemList, currentOption) ++ itemList = idleConf.GetSectionList('user', 'keys') + itemList.sort() + if not itemList: + self.radioKeysCustom.config(state=DISABLED) + self.customKeys.set('- no custom keys -') + else: +- self.optMenuKeysCustom.SetMenu(itemList,itemList[0]) ++ self.optMenuKeysCustom.SetMenu(itemList, itemList[0]) + else: #user key set selected +- itemList=idleConf.GetSectionList('user','keys') ++ itemList = idleConf.GetSectionList('user', 'keys') + itemList.sort() +- self.optMenuKeysCustom.SetMenu(itemList,currentOption) +- itemList=idleConf.GetSectionList('default','keys') ++ self.optMenuKeysCustom.SetMenu(itemList, currentOption) ++ itemList = idleConf.GetSectionList('default', 'keys') + itemList.sort() +- self.optMenuKeysBuiltin.SetMenu(itemList,itemList[0]) ++ self.optMenuKeysBuiltin.SetMenu(itemList, itemList[0]) + self.SetKeysType() + ##load keyset element list +- keySetName=idleConf.CurrentKeys() ++ keySetName = idleConf.CurrentKeys() + self.LoadKeysList(keySetName) + + def LoadGeneralCfg(self): + #startup state +- self.startupEdit.set(idleConf.GetOption('main','General', +- 'editor-on-startup',default=1,type='bool')) ++ self.startupEdit.set(idleConf.GetOption( ++ 'main', 'General', 'editor-on-startup', default=1, type='bool')) + #autosave state +- self.autoSave.set(idleConf.GetOption('main', 'General', 'autosave', +- default=0, type='bool')) ++ self.autoSave.set(idleConf.GetOption( ++ 'main', 'General', 'autosave', default=0, type='bool')) + #initial window size +- self.winWidth.set(idleConf.GetOption('main','EditorWindow','width', +- type='int')) +- self.winHeight.set(idleConf.GetOption('main','EditorWindow','height', +- type='int')) ++ self.winWidth.set(idleConf.GetOption( ++ 'main', 'EditorWindow', 'width', type='int')) ++ self.winHeight.set(idleConf.GetOption( ++ 'main', 'EditorWindow', 'height', type='int')) + #initial paragraph reformat size +- self.paraWidth.set(idleConf.GetOption('main','FormatParagraph','paragraph', +- type='int')) ++ self.paraWidth.set(idleConf.GetOption( ++ 'main', 'FormatParagraph', 'paragraph', type='int')) + # default source encoding +- self.encoding.set(idleConf.GetOption('main', 'EditorWindow', +- 'encoding', default='none')) ++ self.encoding.set(idleConf.GetOption( ++ 'main', 'EditorWindow', 'encoding', default='none')) + # additional help sources + self.userHelpList = idleConf.GetAllExtraHelpSourcesList() + for helpItem in self.userHelpList: +- self.listHelp.insert(END,helpItem[0]) ++ self.listHelp.insert(END, helpItem[0]) + self.SetHelpListButtonStates() + + def LoadConfigs(self): +@@ -1070,7 +1121,7 @@ + ### general page + self.LoadGeneralCfg() + +- def SaveNewKeySet(self,keySetName,keySet): ++ def SaveNewKeySet(self, keySetName, keySet): + """ + save a newly created core key set. + keySetName - string, the name of the new key set +@@ -1078,11 +1129,11 @@ + """ + if not idleConf.userCfg['keys'].has_section(keySetName): + idleConf.userCfg['keys'].add_section(keySetName) +- for event in keySet.keys(): +- value=keySet[event] +- idleConf.userCfg['keys'].SetOption(keySetName,event,value) ++ for event in keySet: ++ value = keySet[event] ++ idleConf.userCfg['keys'].SetOption(keySetName, event, value) + +- def SaveNewTheme(self,themeName,theme): ++ def SaveNewTheme(self, themeName, theme): + """ + save a newly created theme. + themeName - string, the name of the new theme +@@ -1090,31 +1141,31 @@ + """ + if not idleConf.userCfg['highlight'].has_section(themeName): + idleConf.userCfg['highlight'].add_section(themeName) +- for element in theme.keys(): +- value=theme[element] +- idleConf.userCfg['highlight'].SetOption(themeName,element,value) ++ for element in theme: ++ value = theme[element] ++ idleConf.userCfg['highlight'].SetOption(themeName, element, value) + +- def SetUserValue(self,configType,section,item,value): +- if idleConf.defaultCfg[configType].has_option(section,item): +- if idleConf.defaultCfg[configType].Get(section,item)==value: ++ def SetUserValue(self, configType, section, item, value): ++ if idleConf.defaultCfg[configType].has_option(section, item): ++ if idleConf.defaultCfg[configType].Get(section, item) == value: + #the setting equals a default setting, remove it from user cfg +- return idleConf.userCfg[configType].RemoveOption(section,item) ++ return idleConf.userCfg[configType].RemoveOption(section, item) + #if we got here set the option +- return idleConf.userCfg[configType].SetOption(section,item,value) ++ return idleConf.userCfg[configType].SetOption(section, item, value) + + def SaveAllChangedConfigs(self): + "Save configuration changes to the user config file." + idleConf.userCfg['main'].Save() +- for configType in self.changedItems.keys(): ++ for configType in self.changedItems: + cfgTypeHasChanges = False +- for section in self.changedItems[configType].keys(): ++ for section in self.changedItems[configType]: + if section == 'HelpFiles': + #this section gets completely replaced + idleConf.userCfg['main'].remove_section('HelpFiles') + cfgTypeHasChanges = True +- for item in self.changedItems[configType][section].keys(): ++ for item in self.changedItems[configType][section]: + value = self.changedItems[configType][section][item] +- if self.SetUserValue(configType,section,item,value): ++ if self.SetUserValue(configType, section, item, value): + cfgTypeHasChanges = True + if cfgTypeHasChanges: + idleConf.userCfg[configType].Save() +@@ -1126,13 +1177,13 @@ + def DeactivateCurrentConfig(self): + #Before a config is saved, some cleanup of current + #config must be done - remove the previous keybindings +- winInstances=self.parent.instance_dict.keys() ++ winInstances = self.parent.instance_dict + for instance in winInstances: + instance.RemoveKeybindings() + + def ActivateConfigChanges(self): + "Dynamically apply configuration changes" +- winInstances=self.parent.instance_dict.keys() ++ winInstances = self.parent.instance_dict.keys() + for instance in winInstances: + instance.ResetColorizer() + instance.ResetFont() +@@ -1155,6 +1206,252 @@ + def Help(self): + pass + ++class VerticalScrolledFrame(Frame): ++ """A pure Tkinter vertically scrollable frame. ++ ++ * Use the 'interior' attribute to place widgets inside the scrollable frame ++ * Construct and pack/place/grid normally ++ * This frame only allows vertical scrolling ++ """ ++ def __init__(self, parent, *args, **kw): ++ Frame.__init__(self, parent, *args, **kw) ++ ++ # create a canvas object and a vertical scrollbar for scrolling it ++ vscrollbar = Scrollbar(self, orient=VERTICAL) ++ vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE) ++ canvas = Canvas(self, bd=0, highlightthickness=0, ++ yscrollcommand=vscrollbar.set) ++ canvas.pack(side=LEFT, fill=BOTH, expand=TRUE) ++ vscrollbar.config(command=canvas.yview) ++ ++ # reset the view ++ canvas.xview_moveto(0) ++ canvas.yview_moveto(0) ++ ++ # create a frame inside the canvas which will be scrolled with it ++ self.interior = interior = Frame(canvas) ++ interior_id = canvas.create_window(0, 0, window=interior, anchor=NW) ++ ++ # track changes to the canvas and frame width and sync them, ++ # also updating the scrollbar ++ def _configure_interior(event): ++ # update the scrollbars to match the size of the inner frame ++ size = (interior.winfo_reqwidth(), interior.winfo_reqheight()) ++ canvas.config(scrollregion="0 0 %s %s" % size) ++ if interior.winfo_reqwidth() != canvas.winfo_width(): ++ # update the canvas's width to fit the inner frame ++ canvas.config(width=interior.winfo_reqwidth()) ++ interior.bind('', _configure_interior) ++ ++ def _configure_canvas(event): ++ if interior.winfo_reqwidth() != canvas.winfo_width(): ++ # update the inner frame's width to fill the canvas ++ canvas.itemconfigure(interior_id, width=canvas.winfo_width()) ++ canvas.bind('', _configure_canvas) ++ ++ return ++ ++def is_int(s): ++ "Return 's is blank or represents an int'" ++ if not s: ++ return True ++ try: ++ int(s) ++ return True ++ except ValueError: ++ return False ++ ++# TODO: ++# * Revert to default(s)? Per option or per extension? ++# * List options in their original order (possible??) ++class ConfigExtensionsDialog(Toplevel): ++ """A dialog for configuring IDLE extensions. ++ ++ This dialog is generic - it works for any and all IDLE extensions. ++ ++ IDLE extensions save their configuration options using idleConf. ++ ConfigExtensionsDialog reads the current configuration using idleConf, ++ supplies a GUI interface to change the configuration values, and saves the ++ changes using idleConf. ++ ++ Not all changes take effect immediately - some may require restarting IDLE. ++ This depends on each extension's implementation. ++ ++ All values are treated as text, and it is up to the user to supply ++ reasonable values. The only exception to this are the 'enable*' options, ++ which are boolean, and can be toggled with an True/False button. ++ """ ++ def __init__(self, parent, title=None, _htest=False): ++ Toplevel.__init__(self, parent) ++ self.wm_withdraw() ++ ++ self.configure(borderwidth=5) ++ self.geometry( ++ "+%d+%d" % (parent.winfo_rootx() + 20, ++ parent.winfo_rooty() + (30 if not _htest else 150))) ++ self.wm_title(title or 'IDLE Extensions Configuration') ++ ++ self.defaultCfg = idleConf.defaultCfg['extensions'] ++ self.userCfg = idleConf.userCfg['extensions'] ++ self.is_int = self.register(is_int) ++ self.load_extensions() ++ self.create_widgets() ++ ++ self.resizable(height=FALSE, width=FALSE) # don't allow resizing yet ++ self.transient(parent) ++ self.protocol("WM_DELETE_WINDOW", self.Cancel) ++ self.tabbed_page_set.focus_set() ++ # wait for window to be generated ++ self.update() ++ # set current width as the minimum width ++ self.wm_minsize(self.winfo_width(), 1) ++ # now allow resizing ++ self.resizable(height=TRUE, width=TRUE) ++ ++ self.wm_deiconify() ++ if not _htest: ++ self.grab_set() ++ self.wait_window() ++ ++ def load_extensions(self): ++ "Fill self.extensions with data from the default and user configs." ++ self.extensions = {} ++ for ext_name in idleConf.GetExtensions(active_only=False): ++ self.extensions[ext_name] = [] ++ ++ for ext_name in self.extensions: ++ opt_list = sorted(self.defaultCfg.GetOptionList(ext_name)) ++ ++ # bring 'enable' options to the beginning of the list ++ enables = [opt_name for opt_name in opt_list ++ if opt_name.startswith('enable')] ++ for opt_name in enables: ++ opt_list.remove(opt_name) ++ opt_list = enables + opt_list ++ ++ for opt_name in opt_list: ++ def_str = self.defaultCfg.Get( ++ ext_name, opt_name, raw=True) ++ try: ++ def_obj = {'True':True, 'False':False}[def_str] ++ opt_type = 'bool' ++ except KeyError: ++ try: ++ def_obj = int(def_str) ++ opt_type = 'int' ++ except ValueError: ++ def_obj = def_str ++ opt_type = None ++ try: ++ value = self.userCfg.Get( ++ ext_name, opt_name, type=opt_type, raw=True, ++ default=def_obj) ++ except ValueError: # Need this until .Get fixed ++ value = def_obj # bad values overwritten by entry ++ var = StringVar(self) ++ var.set(str(value)) ++ ++ self.extensions[ext_name].append({'name': opt_name, ++ 'type': opt_type, ++ 'default': def_str, ++ 'value': value, ++ 'var': var, ++ }) ++ ++ def create_widgets(self): ++ """Create the dialog's widgets.""" ++ self.rowconfigure(0, weight=1) ++ self.rowconfigure(1, weight=0) ++ self.columnconfigure(0, weight=1) ++ ++ # create the tabbed pages ++ self.tabbed_page_set = TabbedPageSet( ++ self, page_names=self.extensions.keys(), ++ n_rows=None, max_tabs_per_row=5, ++ page_class=TabbedPageSet.PageRemove) ++ self.tabbed_page_set.grid(row=0, column=0, sticky=NSEW) ++ for ext_name in self.extensions: ++ self.create_tab_page(ext_name) ++ ++ self.create_action_buttons().grid(row=1) ++ ++ create_action_buttons = ConfigDialog.create_action_buttons.im_func ++ ++ def create_tab_page(self, ext_name): ++ """Create the page for an extension.""" ++ ++ page = LabelFrame(self.tabbed_page_set.pages[ext_name].frame, ++ border=2, padx=2, relief=GROOVE, ++ text=' %s ' % ext_name) ++ page.pack(fill=BOTH, expand=True, padx=12, pady=2) ++ ++ # create the scrollable frame which will contain the entries ++ scrolled_frame = VerticalScrolledFrame(page, pady=2, height=250) ++ scrolled_frame.pack(side=BOTTOM, fill=BOTH, expand=TRUE) ++ entry_area = scrolled_frame.interior ++ entry_area.columnconfigure(0, weight=0) ++ entry_area.columnconfigure(1, weight=1) ++ ++ # create an entry for each configuration option ++ for row, opt in enumerate(self.extensions[ext_name]): ++ # create a row with a label and entry/checkbutton ++ label = Label(entry_area, text=opt['name']) ++ label.grid(row=row, column=0, sticky=NW) ++ var = opt['var'] ++ if opt['type'] == 'bool': ++ Checkbutton(entry_area, textvariable=var, variable=var, ++ onvalue='True', offvalue='False', ++ indicatoron=FALSE, selectcolor='', width=8 ++ ).grid(row=row, column=1, sticky=W, padx=7) ++ elif opt['type'] == 'int': ++ Entry(entry_area, textvariable=var, validate='key', ++ validatecommand=(self.is_int, '%P') ++ ).grid(row=row, column=1, sticky=NSEW, padx=7) ++ ++ else: ++ Entry(entry_area, textvariable=var ++ ).grid(row=row, column=1, sticky=NSEW, padx=7) ++ return ++ ++ ++ Ok = ConfigDialog.Ok.im_func ++ ++ def Apply(self): ++ self.save_all_changed_configs() ++ pass ++ ++ Cancel = ConfigDialog.Cancel.im_func ++ ++ def Help(self): ++ pass ++ ++ def set_user_value(self, section, opt): ++ name = opt['name'] ++ default = opt['default'] ++ value = opt['var'].get().strip() or default ++ opt['var'].set(value) ++ # if self.defaultCfg.has_section(section): ++ # Currently, always true; if not, indent to return ++ if (value == default): ++ return self.userCfg.RemoveOption(section, name) ++ # set the option ++ return self.userCfg.SetOption(section, name, value) ++ ++ def save_all_changed_configs(self): ++ """Save configuration changes to the user config file.""" ++ has_changes = False ++ for ext_name in self.extensions: ++ options = self.extensions[ext_name] ++ for opt in options: ++ if self.set_user_value(ext_name, opt): ++ has_changes = True ++ if has_changes: ++ self.userCfg.Save() ++ ++ + if __name__ == '__main__': ++ import unittest ++ unittest.main('idlelib.idle_test.test_configdialog', ++ verbosity=2, exit=False) + from idlelib.idle_test.htest import run +- run(ConfigDialog) ++ run(ConfigDialog, ConfigExtensionsDialog) +diff -r ee879c0ffa11 Lib/idlelib/configHandler.py +--- a/Lib/idlelib/configHandler.py ++++ b/Lib/idlelib/configHandler.py +@@ -15,12 +15,14 @@ + the retrieval of config information. When a default is returned instead of + a requested config value, a message is printed to stderr to aid in + configuration problem notification and resolution. ++""" ++# TODOs added Oct 2014, tjr + +-""" ++from __future__ import print_function + import os + import sys +-import string +-from ConfigParser import ConfigParser, NoOptionError, NoSectionError ++ ++from ConfigParser import ConfigParser + + class InvalidConfigType(Exception): pass + class InvalidConfigSet(Exception): pass +@@ -35,36 +37,35 @@ + """ + cfgFile - string, fully specified configuration file name + """ +- self.file=cfgFile +- ConfigParser.__init__(self,defaults=cfgDefaults) ++ self.file = cfgFile ++ ConfigParser.__init__(self, defaults=cfgDefaults) + + def Get(self, section, option, type=None, default=None, raw=False): + """ + Get an option value for given section/option or return default. + If type is specified, return as type. + """ ++ # TODO Use default as fallback, at least if not None ++ # Should also print Warning(file, section, option). ++ # Currently may raise ValueError + if not self.has_option(section, option): + return default +- if type=='bool': ++ if type == 'bool': + return self.getboolean(section, option) +- elif type=='int': ++ elif type == 'int': + return self.getint(section, option) + else: + return self.get(section, option, raw=raw) + +- def GetOptionList(self,section): +- """ +- Get an option list for given section +- """ ++ def GetOptionList(self, section): ++ "Return a list of options for given section, else []." + if self.has_section(section): + return self.options(section) + else: #return a default value + return [] + + def Load(self): +- """ +- Load the configuration file from disk +- """ ++ "Load the configuration file from disk." + self.read(self.file) + + class IdleUserConfParser(IdleConfParser): +@@ -72,61 +73,50 @@ + IdleConfigParser specialised for user configuration handling. + """ + +- def AddSection(self,section): +- """ +- if section doesn't exist, add it +- """ ++ def AddSection(self, section): ++ "If section doesn't exist, add it." + if not self.has_section(section): + self.add_section(section) + + def RemoveEmptySections(self): +- """ +- remove any sections that have no options +- """ ++ "Remove any sections that have no options." + for section in self.sections(): + if not self.GetOptionList(section): + self.remove_section(section) + + def IsEmpty(self): +- """ +- Remove empty sections and then return 1 if parser has no sections +- left, else return 0. +- """ ++ "Return True if no sections after removing empty sections." + self.RemoveEmptySections() +- if self.sections(): +- return 0 +- else: +- return 1 ++ return not self.sections() + +- def RemoveOption(self,section,option): +- """ +- If section/option exists, remove it. +- Returns 1 if option was removed, 0 otherwise. ++ def RemoveOption(self, section, option): ++ """Return True if option is removed from section, else False. ++ ++ False if either section does not exist or did not have option. + """ + if self.has_section(section): +- return self.remove_option(section,option) ++ return self.remove_option(section, option) ++ return False + +- def SetOption(self,section,option,value): ++ def SetOption(self, section, option, value): ++ """Return True if option is added or changed to value, else False. ++ ++ Add section if required. False means option already had value. + """ +- Sets option to value, adding section if required. +- Returns 1 if option was added or changed, otherwise 0. +- """ +- if self.has_option(section,option): +- if self.get(section,option)==value: +- return 0 ++ if self.has_option(section, option): ++ if self.get(section, option) == value: ++ return False + else: +- self.set(section,option,value) +- return 1 ++ self.set(section, option, value) ++ return True + else: + if not self.has_section(section): + self.add_section(section) +- self.set(section,option,value) +- return 1 ++ self.set(section, option, value) ++ return True + + def RemoveFile(self): +- """ +- Removes the user config file from disk if it exists. +- """ ++ "Remove user config file self.file from disk if it exists." + if os.path.exists(self.file): + os.remove(self.file) + +@@ -144,67 +134,65 @@ + except IOError: + os.unlink(fname) + cfgFile = open(fname, 'w') +- self.write(cfgFile) ++ with cfgFile: ++ self.write(cfgFile) + else: + self.RemoveFile() + + class IdleConf: +- """ +- holds config parsers for all idle config files: +- default config files +- (idle install dir)/config-main.def +- (idle install dir)/config-extensions.def +- (idle install dir)/config-highlight.def +- (idle install dir)/config-keys.def +- user config files +- (user home dir)/.idlerc/config-main.cfg +- (user home dir)/.idlerc/config-extensions.cfg +- (user home dir)/.idlerc/config-highlight.cfg +- (user home dir)/.idlerc/config-keys.cfg ++ """Hold config parsers for all idle config files in singleton instance. ++ ++ Default config files, self.defaultCfg -- ++ for config_type in self.config_types: ++ (idle install dir)/config-{config-type}.def ++ ++ User config files, self.userCfg -- ++ for config_type in self.config_types: ++ (user home dir)/.idlerc/config-{config-type}.cfg + """ + def __init__(self): +- self.defaultCfg={} +- self.userCfg={} +- self.cfg={} ++ self.config_types = ('main', 'extensions', 'highlight', 'keys') ++ self.defaultCfg = {} ++ self.userCfg = {} ++ self.cfg = {} # TODO use to select userCfg vs defaultCfg + self.CreateConfigHandlers() + self.LoadCfgFiles() +- #self.LoadCfg() ++ + + def CreateConfigHandlers(self): +- """ +- set up a dictionary of config parsers for default and user +- configurations respectively +- """ ++ "Populate default and user config parser dictionaries." + #build idle install path + if __name__ != '__main__': # we were imported + idleDir=os.path.dirname(__file__) + else: # we were exec'ed (for testing only) + idleDir=os.path.abspath(sys.path[0]) + userDir=self.GetUserCfgDir() +- configTypes=('main','extensions','highlight','keys') +- defCfgFiles={} +- usrCfgFiles={} +- for cfgType in configTypes: #build config file names +- defCfgFiles[cfgType]=os.path.join(idleDir,'config-'+cfgType+'.def') +- usrCfgFiles[cfgType]=os.path.join(userDir,'config-'+cfgType+'.cfg') +- for cfgType in configTypes: #create config parsers +- self.defaultCfg[cfgType]=IdleConfParser(defCfgFiles[cfgType]) +- self.userCfg[cfgType]=IdleUserConfParser(usrCfgFiles[cfgType]) ++ ++ defCfgFiles = {} ++ usrCfgFiles = {} ++ # TODO eliminate these temporaries by combining loops ++ for cfgType in self.config_types: #build config file names ++ defCfgFiles[cfgType] = os.path.join( ++ idleDir, 'config-' + cfgType + '.def') ++ usrCfgFiles[cfgType] = os.path.join( ++ userDir, 'config-' + cfgType + '.cfg') ++ for cfgType in self.config_types: #create config parsers ++ self.defaultCfg[cfgType] = IdleConfParser(defCfgFiles[cfgType]) ++ self.userCfg[cfgType] = IdleUserConfParser(usrCfgFiles[cfgType]) + + def GetUserCfgDir(self): +- """ +- Creates (if required) and returns a filesystem directory for storing +- user config files. ++ """Return a filesystem directory for storing user config files. + ++ Creates it if required. + """ + cfgDir = '.idlerc' + userDir = os.path.expanduser('~') + if userDir != '~': # expanduser() found user home dir + if not os.path.exists(userDir): +- warn = ('\n Warning: os.path.expanduser("~") points to\n '+ +- userDir+',\n but the path does not exist.\n') ++ warn = ('\n Warning: os.path.expanduser("~") points to\n ' + ++ userDir + ',\n but the path does not exist.') + try: +- sys.stderr.write(warn) ++ print(warn, file=sys.stderr) + except IOError: + pass + userDir = '~' +@@ -216,45 +204,44 @@ + try: + os.mkdir(userDir) + except (OSError, IOError): +- warn = ('\n Warning: unable to create user config directory\n'+ +- userDir+'\n Check path and permissions.\n Exiting!\n\n') +- sys.stderr.write(warn) ++ warn = ('\n Warning: unable to create user config directory\n' + ++ userDir + '\n Check path and permissions.\n Exiting!\n') ++ print(warn, file=sys.stderr) + raise SystemExit ++ # TODO continue without userDIr instead of exit + return userDir + + def GetOption(self, configType, section, option, default=None, type=None, + warn_on_default=True, raw=False): +- """ +- Get an option value for given config type and given general +- configuration section/option or return a default. If type is specified, +- return as type. Firstly the user configuration is checked, with a +- fallback to the default configuration, and a final 'catch all' +- fallback to a useable passed-in default if the option isn't present in +- either the user or the default configuration. +- configType must be one of ('main','extensions','highlight','keys') +- If a default is returned, and warn_on_default is True, a warning is +- printed to stderr. ++ """Return a value for configType section option, or default. + ++ If type is not None, return a value of that type. Also pass raw ++ to the config parser. First try to return a valid value ++ (including type) from a user configuration. If that fails, try ++ the default configuration. If that fails, return default, with a ++ default of None. ++ ++ Warn if either user or default configurations have an invalid value. ++ Warn if default is returned and warn_on_default is True. + """ + try: +- if self.userCfg[configType].has_option(section,option): ++ if self.userCfg[configType].has_option(section, option): + return self.userCfg[configType].Get(section, option, + type=type, raw=raw) + except ValueError: + warning = ('\n Warning: configHandler.py - IdleConf.GetOption -\n' + ' invalid %r value for configuration option %r\n' +- ' from section %r: %r\n' % ++ ' from section %r: %r' % + (type, option, section, +- self.userCfg[configType].Get(section, option, +- raw=raw))) ++ self.userCfg[configType].Get(section, option, raw=raw))) + try: +- sys.stderr.write(warning) ++ print(warning, file=sys.stderr) + except IOError: + pass + try: + if self.defaultCfg[configType].has_option(section,option): +- return self.defaultCfg[configType].Get(section, option, +- type=type, raw=raw) ++ return self.defaultCfg[configType].Get( ++ section, option, type=type, raw=raw) + except ValueError: + pass + #returning default, print warning +@@ -262,84 +249,83 @@ + warning = ('\n Warning: configHandler.py - IdleConf.GetOption -\n' + ' problem retrieving configuration option %r\n' + ' from section %r.\n' +- ' returning default value: %r\n' % ++ ' returning default value: %r' % + (option, section, default)) + try: +- sys.stderr.write(warning) ++ print(warning, file=sys.stderr) + except IOError: + pass + return default + + def SetOption(self, configType, section, option, value): +- """In user's config file, set section's option to value. +- +- """ ++ """Set section option to value in user config file.""" + self.userCfg[configType].SetOption(section, option, value) + + def GetSectionList(self, configSet, configType): ++ """Return sections for configSet configType configuration. ++ ++ configSet must be either 'user' or 'default' ++ configType must be in self.config_types. + """ +- Get a list of sections from either the user or default config for +- the given config type. +- configSet must be either 'user' or 'default' +- configType must be one of ('main','extensions','highlight','keys') +- """ +- if not (configType in ('main','extensions','highlight','keys')): +- raise InvalidConfigType, 'Invalid configType specified' ++ if not (configType in self.config_types): ++ raise InvalidConfigType('Invalid configType specified') + if configSet == 'user': +- cfgParser=self.userCfg[configType] ++ cfgParser = self.userCfg[configType] + elif configSet == 'default': + cfgParser=self.defaultCfg[configType] + else: +- raise InvalidConfigSet, 'Invalid configSet specified' ++ raise InvalidConfigSet('Invalid configSet specified') + return cfgParser.sections() + + def GetHighlight(self, theme, element, fgBg=None): +- """ +- return individual highlighting theme elements. +- fgBg - string ('fg'or'bg') or None, if None return a dictionary +- containing fg and bg colours (appropriate for passing to Tkinter in, +- e.g., a tag_config call), otherwise fg or bg colour only as specified. ++ """Return individual theme element highlight color(s). ++ ++ fgBg - string ('fg' or 'bg') or None. ++ If None, return a dictionary containing fg and bg colors with ++ keys 'foreground' and 'background'. Otherwise, only return ++ fg or bg color, as specified. Colors are intended to be ++ appropriate for passing to Tkinter in, e.g., a tag_config call). + """ + if self.defaultCfg['highlight'].has_section(theme): +- themeDict=self.GetThemeDict('default',theme) ++ themeDict = self.GetThemeDict('default', theme) + else: +- themeDict=self.GetThemeDict('user',theme) +- fore=themeDict[element+'-foreground'] +- if element=='cursor': #there is no config value for cursor bg +- back=themeDict['normal-background'] ++ themeDict = self.GetThemeDict('user', theme) ++ fore = themeDict[element + '-foreground'] ++ if element == 'cursor': # There is no config value for cursor bg ++ back = themeDict['normal-background'] + else: +- back=themeDict[element+'-background'] +- highlight={"foreground": fore,"background": back} +- if not fgBg: #return dict of both colours ++ back = themeDict[element + '-background'] ++ highlight = {"foreground": fore, "background": back} ++ if not fgBg: # Return dict of both colors + return highlight +- else: #return specified colour only ++ else: # Return specified color only + if fgBg == 'fg': + return highlight["foreground"] + if fgBg == 'bg': + return highlight["background"] + else: +- raise InvalidFgBg, 'Invalid fgBg specified' ++ raise InvalidFgBg('Invalid fgBg specified') + +- def GetThemeDict(self,type,themeName): +- """ ++ def GetThemeDict(self, type, themeName): ++ """Return {option:value} dict for elements in themeName. ++ + type - string, 'default' or 'user' theme type + themeName - string, theme name +- Returns a dictionary which holds {option:value} for each element +- in the specified theme. Values are loaded over a set of ultimate last +- fallback defaults to guarantee that all theme elements are present in +- a newly created theme. ++ Values are loaded over ultimate fallback defaults to guarantee ++ that all theme elements are present in a newly created theme. + """ + if type == 'user': +- cfgParser=self.userCfg['highlight'] ++ cfgParser = self.userCfg['highlight'] + elif type == 'default': +- cfgParser=self.defaultCfg['highlight'] ++ cfgParser = self.defaultCfg['highlight'] + else: +- raise InvalidTheme, 'Invalid theme type specified' +- #foreground and background values are provded for each theme element +- #(apart from cursor) even though all these values are not yet used +- #by idle, to allow for their use in the future. Default values are +- #generally black and white. +- theme={ 'normal-foreground':'#000000', ++ raise InvalidTheme('Invalid theme type specified') ++ # Provide foreground and background colors for each theme ++ # element (other than cursor) even though some values are not ++ # yet used by idle, to allow for their use in the future. ++ # Default values are generally black and white. ++ # TODO copy theme from a class attribute. ++ theme ={'normal-foreground':'#000000', + 'normal-background':'#ffffff', + 'keyword-foreground':'#000000', + 'keyword-background':'#ffffff', +@@ -368,53 +354,51 @@ + 'stderr-background':'#ffffff', + 'console-foreground':'#000000', + 'console-background':'#ffffff' } +- for element in theme.keys(): +- if not cfgParser.has_option(themeName,element): +- #we are going to return a default, print warning +- warning=('\n Warning: configHandler.py - IdleConf.GetThemeDict' ++ for element in theme: ++ if not cfgParser.has_option(themeName, element): ++ # Print warning that will return a default color ++ warning = ('\n Warning: configHandler.IdleConf.GetThemeDict' + ' -\n problem retrieving theme element %r' + '\n from theme %r.\n' +- ' returning default value: %r\n' % ++ ' returning default color: %r' % + (element, themeName, theme[element])) + try: +- sys.stderr.write(warning) ++ print(warning, file=sys.stderr) + except IOError: + pass +- colour=cfgParser.Get(themeName,element,default=theme[element]) +- theme[element]=colour ++ theme[element] = cfgParser.Get( ++ themeName, element, default=theme[element]) + return theme + + def CurrentTheme(self): +- """ +- Returns the name of the currently active theme +- """ +- return self.GetOption('main','Theme','name',default='') ++ "Return the name of the currently active theme." ++ return self.GetOption('main', 'Theme', 'name', default='') + + def CurrentKeys(self): +- """ +- Returns the name of the currently active key set +- """ +- return self.GetOption('main','Keys','name',default='') ++ "Return the name of the currently active key set." ++ return self.GetOption('main', 'Keys', 'name', default='') + + def GetExtensions(self, active_only=True, editor_only=False, shell_only=False): ++ """Return extensions in default and user config-extensions files. ++ ++ If active_only True, only return active (enabled) extensions ++ and optionally only editor or shell extensions. ++ If active_only False, return all extensions. + """ +- Gets a list of all idle extensions declared in the config files. +- active_only - boolean, if true only return active (enabled) extensions +- """ +- extns=self.RemoveKeyBindNames( +- self.GetSectionList('default','extensions')) +- userExtns=self.RemoveKeyBindNames( +- self.GetSectionList('user','extensions')) ++ extns = self.RemoveKeyBindNames( ++ self.GetSectionList('default', 'extensions')) ++ userExtns = self.RemoveKeyBindNames( ++ self.GetSectionList('user', 'extensions')) + for extn in userExtns: + if extn not in extns: #user has added own extension + extns.append(extn) + if active_only: +- activeExtns=[] ++ activeExtns = [] + for extn in extns: + if self.GetOption('extensions', extn, 'enable', default=True, + type='bool'): + #the extension is enabled +- if editor_only or shell_only: ++ if editor_only or shell_only: # TODO if both, contradictory + if editor_only: + option = "enable_editor" + else: +@@ -429,107 +413,108 @@ + else: + return extns + +- def RemoveKeyBindNames(self,extnNameList): +- #get rid of keybinding section names +- names=extnNameList +- kbNameIndicies=[] ++ def RemoveKeyBindNames(self, extnNameList): ++ "Return extnNameList with keybinding section names removed." ++ # TODO Easier to return filtered copy with list comp ++ names = extnNameList ++ kbNameIndicies = [] + for name in names: + if name.endswith(('_bindings', '_cfgBindings')): + kbNameIndicies.append(names.index(name)) +- kbNameIndicies.sort() +- kbNameIndicies.reverse() ++ kbNameIndicies.sort(reverse=True) + for index in kbNameIndicies: #delete each keybinding section name + del(names[index]) + return names + +- def GetExtnNameForEvent(self,virtualEvent): ++ def GetExtnNameForEvent(self, virtualEvent): ++ """Return the name of the extension binding virtualEvent, or None. ++ ++ virtualEvent - string, name of the virtual event to test for, ++ without the enclosing '<< >>' + """ +- Returns the name of the extension that virtualEvent is bound in, or +- None if not bound in any extension. +- virtualEvent - string, name of the virtual event to test for, without +- the enclosing '<< >>' +- """ +- extName=None +- vEvent='<<'+virtualEvent+'>>' ++ extName = None ++ vEvent = '<<' + virtualEvent + '>>' + for extn in self.GetExtensions(active_only=0): +- for event in self.GetExtensionKeys(extn).keys(): ++ for event in self.GetExtensionKeys(extn): + if event == vEvent: +- extName=extn ++ extName = extn # TODO return here? + return extName + +- def GetExtensionKeys(self,extensionName): ++ def GetExtensionKeys(self, extensionName): ++ """Return dict: {configurable extensionName event : active keybinding}. ++ ++ Events come from default config extension_cfgBindings section. ++ Keybindings come from GetCurrentKeySet() active key dict, ++ where previously used bindings are disabled. + """ +- returns a dictionary of the configurable keybindings for a particular +- extension,as they exist in the dictionary returned by GetCurrentKeySet; +- that is, where previously used bindings are disabled. +- """ +- keysName=extensionName+'_cfgBindings' +- activeKeys=self.GetCurrentKeySet() +- extKeys={} ++ keysName = extensionName + '_cfgBindings' ++ activeKeys = self.GetCurrentKeySet() ++ extKeys = {} + if self.defaultCfg['extensions'].has_section(keysName): +- eventNames=self.defaultCfg['extensions'].GetOptionList(keysName) ++ eventNames = self.defaultCfg['extensions'].GetOptionList(keysName) + for eventName in eventNames: +- event='<<'+eventName+'>>' +- binding=activeKeys[event] +- extKeys[event]=binding ++ event = '<<' + eventName + '>>' ++ binding = activeKeys[event] ++ extKeys[event] = binding + return extKeys + + def __GetRawExtensionKeys(self,extensionName): ++ """Return dict {configurable extensionName event : keybinding list}. ++ ++ Events come from default config extension_cfgBindings section. ++ Keybindings list come from the splitting of GetOption, which ++ tries user config before default config. + """ +- returns a dictionary of the configurable keybindings for a particular +- extension, as defined in the configuration files, or an empty dictionary +- if no bindings are found +- """ +- keysName=extensionName+'_cfgBindings' +- extKeys={} ++ keysName = extensionName+'_cfgBindings' ++ extKeys = {} + if self.defaultCfg['extensions'].has_section(keysName): +- eventNames=self.defaultCfg['extensions'].GetOptionList(keysName) ++ eventNames = self.defaultCfg['extensions'].GetOptionList(keysName) + for eventName in eventNames: +- binding=self.GetOption('extensions',keysName, +- eventName,default='').split() +- event='<<'+eventName+'>>' +- extKeys[event]=binding ++ binding = self.GetOption( ++ 'extensions', keysName, eventName, default='').split() ++ event = '<<' + eventName + '>>' ++ extKeys[event] = binding + return extKeys + +- def GetExtensionBindings(self,extensionName): ++ def GetExtensionBindings(self, extensionName): ++ """Return dict {extensionName event : active or defined keybinding}. ++ ++ Augment self.GetExtensionKeys(extensionName) with mapping of non- ++ configurable events (from default config) to GetOption splits, ++ as in self.__GetRawExtensionKeys. + """ +- Returns a dictionary of all the event bindings for a particular +- extension. The configurable keybindings are returned as they exist in +- the dictionary returned by GetCurrentKeySet; that is, where re-used +- keybindings are disabled. +- """ +- bindsName=extensionName+'_bindings' +- extBinds=self.GetExtensionKeys(extensionName) ++ bindsName = extensionName + '_bindings' ++ extBinds = self.GetExtensionKeys(extensionName) + #add the non-configurable bindings + if self.defaultCfg['extensions'].has_section(bindsName): +- eventNames=self.defaultCfg['extensions'].GetOptionList(bindsName) ++ eventNames = self.defaultCfg['extensions'].GetOptionList(bindsName) + for eventName in eventNames: +- binding=self.GetOption('extensions',bindsName, +- eventName,default='').split() +- event='<<'+eventName+'>>' +- extBinds[event]=binding ++ binding = self.GetOption( ++ 'extensions', bindsName, eventName, default='').split() ++ event = '<<' + eventName + '>>' ++ extBinds[event] = binding + + return extBinds + + def GetKeyBinding(self, keySetName, eventStr): ++ """Return the keybinding list for keySetName eventStr. ++ ++ keySetName - name of key binding set (config-keys section). ++ eventStr - virtual event, including brackets, as in '<>'. + """ +- returns the keybinding for a specific event. +- keySetName - string, name of key binding set +- eventStr - string, the virtual event we want the binding for, +- represented as a string, eg. '<>' +- """ +- eventName=eventStr[2:-2] #trim off the angle brackets +- binding=self.GetOption('keys',keySetName,eventName,default='').split() ++ eventName = eventStr[2:-2] #trim off the angle brackets ++ binding = self.GetOption('keys', keySetName, eventName, default='').split() + return binding + + def GetCurrentKeySet(self): ++ "Return CurrentKeys with 'darwin' modifications." + result = self.GetKeySet(self.CurrentKeys()) + + if sys.platform == "darwin": + # OS X Tk variants do not support the "Alt" keyboard modifier. + # So replace all keybingings that use "Alt" with ones that + # use the "Option" keyboard modifier. +- # TO DO: the "Option" modifier does not work properly for ++ # TODO (Ned?): the "Option" modifier does not work properly for + # Cocoa Tk and XQuartz Tk so we should not use it + # in default OS X KeySets. + for k, v in result.items(): +@@ -539,40 +524,43 @@ + + return result + +- def GetKeySet(self,keySetName): ++ def GetKeySet(self, keySetName): ++ """Return event-key dict for keySetName core plus active extensions. ++ ++ If a binding defined in an extension is already in use, the ++ extension binding is disabled by being set to '' + """ +- Returns a dictionary of: all requested core keybindings, plus the +- keybindings for all currently active extensions. If a binding defined +- in an extension is already in use, that binding is disabled. +- """ +- keySet=self.GetCoreKeys(keySetName) +- activeExtns=self.GetExtensions(active_only=1) ++ keySet = self.GetCoreKeys(keySetName) ++ activeExtns = self.GetExtensions(active_only=1) + for extn in activeExtns: +- extKeys=self.__GetRawExtensionKeys(extn) ++ extKeys = self.__GetRawExtensionKeys(extn) + if extKeys: #the extension defines keybindings +- for event in extKeys.keys(): ++ for event in extKeys: + if extKeys[event] in keySet.values(): + #the binding is already in use +- extKeys[event]='' #disable this binding +- keySet[event]=extKeys[event] #add binding ++ extKeys[event] = '' #disable this binding ++ keySet[event] = extKeys[event] #add binding + return keySet + +- def IsCoreBinding(self,virtualEvent): ++ def IsCoreBinding(self, virtualEvent): ++ """Return True if the virtual event is one of the core idle key events. ++ ++ virtualEvent - string, name of the virtual event to test for, ++ without the enclosing '<< >>' + """ +- returns true if the virtual event is bound in the core idle keybindings. +- virtualEvent - string, name of the virtual event to test for, without +- the enclosing '<< >>' +- """ +- return ('<<'+virtualEvent+'>>') in self.GetCoreKeys().keys() ++ return ('<<'+virtualEvent+'>>') in self.GetCoreKeys() ++ ++# TODO make keyBindins a file or class attribute used for test above ++# and copied in function below + + def GetCoreKeys(self, keySetName=None): +- """ +- returns the requested set of core keybindings, with fallbacks if +- required. +- Keybindings loaded from the config file(s) are loaded _over_ these +- defaults, so if there is a problem getting any core binding there will +- be an 'ultimate last resort fallback' to the CUA-ish bindings +- defined here. ++ """Return dict of core virtual-key keybindings for keySetName. ++ ++ The default keySetName None corresponds to the keyBindings base ++ dict. If keySetName is not None, bindings from the config ++ file(s) are loaded _over_ these defaults, so if there is a ++ problem getting any core binding there will be an 'ultimate last ++ resort fallback' to the CUA-ish bindings defined here. + """ + keyBindings={ + '<>': ['', ''], +@@ -626,24 +614,24 @@ + '<>': [''] + } + if keySetName: +- for event in keyBindings.keys(): +- binding=self.GetKeyBinding(keySetName,event) ++ for event in keyBindings: ++ binding = self.GetKeyBinding(keySetName, event) + if binding: +- keyBindings[event]=binding ++ keyBindings[event] = binding + else: #we are going to return a default, print warning + warning=('\n Warning: configHandler.py - IdleConf.GetCoreKeys' + ' -\n problem retrieving key binding for event %r' + '\n from key set %r.\n' +- ' returning default value: %r\n' % ++ ' returning default value: %r' % + (event, keySetName, keyBindings[event])) + try: +- sys.stderr.write(warning) ++ print(warning, file=sys.stderr) + except IOError: + pass + return keyBindings + +- def GetExtraHelpSourceList(self,configSet): +- """Fetch list of extra help sources from a given configSet. ++ def GetExtraHelpSourceList(self, configSet): ++ """Return list of extra help sources from a given configSet. + + Valid configSets are 'user' or 'default'. Return a list of tuples of + the form (menu_item , path_to_help_file , option), or return the empty +@@ -652,21 +640,21 @@ + therefore the returned list must be sorted by 'option'. + + """ +- helpSources=[] +- if configSet=='user': +- cfgParser=self.userCfg['main'] +- elif configSet=='default': +- cfgParser=self.defaultCfg['main'] ++ helpSources = [] ++ if configSet == 'user': ++ cfgParser = self.userCfg['main'] ++ elif configSet == 'default': ++ cfgParser = self.defaultCfg['main'] + else: +- raise InvalidConfigSet, 'Invalid configSet specified' ++ raise InvalidConfigSet('Invalid configSet specified') + options=cfgParser.GetOptionList('HelpFiles') + for option in options: +- value=cfgParser.Get('HelpFiles',option,default=';') +- if value.find(';')==-1: #malformed config entry with no ';' +- menuItem='' #make these empty +- helpPath='' #so value won't be added to list ++ value=cfgParser.Get('HelpFiles', option, default=';') ++ if value.find(';') == -1: #malformed config entry with no ';' ++ menuItem = '' #make these empty ++ helpPath = '' #so value won't be added to list + else: #config entry contains ';' as expected +- value=string.split(value,';') ++ value=value.split(';') + menuItem=value[0].strip() + helpPath=value[1].strip() + if menuItem and helpPath: #neither are empty strings +@@ -675,47 +663,44 @@ + return helpSources + + def GetAllExtraHelpSourcesList(self): ++ """Return a list of the details of all additional help sources. ++ ++ Tuples in the list are those of GetExtraHelpSourceList. + """ +- Returns a list of tuples containing the details of all additional help +- sources configured, or an empty list if there are none. Tuples are of +- the format returned by GetExtraHelpSourceList. +- """ +- allHelpSources=( self.GetExtraHelpSourceList('default')+ ++ allHelpSources = (self.GetExtraHelpSourceList('default') + + self.GetExtraHelpSourceList('user') ) + return allHelpSources + + def LoadCfgFiles(self): +- """ +- load all configuration files. +- """ +- for key in self.defaultCfg.keys(): ++ "Load all configuration files." ++ for key in self.defaultCfg: + self.defaultCfg[key].Load() + self.userCfg[key].Load() #same keys + + def SaveUserCfgFiles(self): +- """ +- write all loaded user configuration files back to disk +- """ +- for key in self.userCfg.keys(): ++ "Write all loaded user configuration files to disk." ++ for key in self.userCfg: + self.userCfg[key].Save() + +-idleConf=IdleConf() + ++idleConf = IdleConf() ++ ++# TODO Revise test output, write expanded unittest + ### module test + if __name__ == '__main__': + def dumpCfg(cfg): +- print '\n',cfg,'\n' +- for key in cfg.keys(): +- sections=cfg[key].sections() +- print key +- print sections ++ print('\n', cfg, '\n') ++ for key in cfg: ++ sections = cfg[key].sections() ++ print(key) ++ print(sections) + for section in sections: +- options=cfg[key].options(section) +- print section +- print options ++ options = cfg[key].options(section) ++ print(section) ++ print(options) + for option in options: +- print option, '=', cfg[key].Get(section,option) ++ print(option, '=', cfg[key].Get(section, option)) + dumpCfg(idleConf.defaultCfg) + dumpCfg(idleConf.userCfg) +- print idleConf.userCfg['main'].Get('Theme','name') +- #print idleConf.userCfg['highlight'].GetDefHighlight('Foo','normal') ++ print(idleConf.userCfg['main'].Get('Theme', 'name')) ++ #print(idleConf.userCfg['highlight'].GetDefHighlight('Foo','normal')) +diff -r ee879c0ffa11 Lib/idlelib/dynOptionMenuWidget.py +--- a/Lib/idlelib/dynOptionMenuWidget.py ++++ b/Lib/idlelib/dynOptionMenuWidget.py +@@ -2,17 +2,15 @@ + OptionMenu widget modified to allow dynamic menu reconfiguration + and setting of highlightthickness + """ +-from Tkinter import OptionMenu, _setit, Tk, StringVar, Button +- + import copy +-import re ++from Tkinter import OptionMenu, _setit, StringVar, Button + + class DynOptionMenu(OptionMenu): + """ + unlike OptionMenu, our kwargs can include highlightthickness + """ + def __init__(self, master, variable, value, *values, **kwargs): +- #get a copy of kwargs before OptionMenu.__init__ munges them ++ # TODO copy value instead of whole dict + kwargsCopy=copy.copy(kwargs) + if 'highlightthickness' in kwargs.keys(): + del(kwargs['highlightthickness']) +@@ -35,22 +33,24 @@ + if value: + self.variable.set(value) + +-def _dyn_option_menu(parent): +- root = Tk() +- root.title("Tets dynamic option menu") +- var = StringVar(root) +- width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) +- root.geometry("+%d+%d"%(x, y + 150)) ++def _dyn_option_menu(parent): # htest # ++ from Tkinter import Toplevel ++ ++ top = Toplevel() ++ top.title("Tets dynamic option menu") ++ top.geometry("200x100+%d+%d" % (parent.winfo_rootx() + 200, ++ parent.winfo_rooty() + 150)) ++ top.focus_set() ++ ++ var = StringVar(top) + var.set("Old option set") #Set the default value +- dyn = DynOptionMenu(root,var, "old1","old2","old3","old4") ++ dyn = DynOptionMenu(top,var, "old1","old2","old3","old4") + dyn.pack() + + def update(): +- dyn.SetMenu(["new1","new2","new3","new4"],value="new option set") +- +- button = Button(root, text="Change option set", command=update) ++ dyn.SetMenu(["new1","new2","new3","new4"], value="new option set") ++ button = Button(top, text="Change option set", command=update) + button.pack() +- root.mainloop() + + if __name__ == '__main__': + from idlelib.idle_test.htest import run +diff -r ee879c0ffa11 Lib/idlelib/idle_test/htest.py +--- a/Lib/idlelib/idle_test/htest.py ++++ b/Lib/idlelib/idle_test/htest.py +@@ -1,11 +1,24 @@ + '''Run human tests of Idle's window, dialog, and popup widgets. + + run(*tests) +-Run each callable in tests after finding the matching test spec in this file. +-If there are none, run an htest for each spec dict in this file after finding +-the matching callable in the module named in the spec. ++Create a master Tk window. Within that, run each callable in tests ++after finding the matching test spec in this file. If tests is empty, ++run an htest for each spec dict in this file after finding the matching ++callable in the module named in the spec. Close the window to skip or ++end the test. + +-In a tested module, let X be a global name bound to a widget callable. ++In a tested module, let X be a global name bound to a callable (class ++or function) whose .__name__ attrubute is also X (the usual situation). ++The first parameter of X must be 'parent'. When called, the parent ++argument will be the root window. X must create a child Toplevel ++window (or subclass thereof). The Toplevel may be a test widget or ++dialog, in which case the callable is the corresonding class. Or the ++Toplevel may contain the widget to be tested or set up a context in ++which a test widget is invoked. In this latter case, the callable is a ++wrapper function that sets up the Toplevel and other objects. Wrapper ++function names, such as _editor_window', should start with '_'. ++ ++ + End the module with + + if __name__ == '__main__': +@@ -13,13 +26,25 @@ + from idlelib.idle_test.htest import run + run(X) + +-The X object must have a .__name__ attribute and a 'parent' parameter. +-X will often be a widget class, but a callable instance with .__name__ +-or a wrapper function also work. The name of wrapper functions, like +-'_editor_window', should start with '_'. ++To have wrapper functions and test invocation code ignored by coveragepy ++reports, put '# htest #' on the def statement header line. + +-This file must contain a matching instance of the following template, +-with X.__name__ prepended, as in '_editor_window_spec ...'. ++def _wrapper(parent): # htest # ++ ++Also make sure that the 'if __name__' line matches the above. Then have ++make sure that .coveragerc includes the following. ++ ++[report] ++exclude_lines = ++ .*# htest # ++ if __name__ == .__main__.: ++ ++(The "." instead of "'" is intentional and necessary.) ++ ++ ++To run any X, this file must contain a matching instance of the ++following template, with X.__name__ prepended to '_spec'. ++When all tests are run, the prefix is use to get X. + + _spec = { + 'file': '', +@@ -27,18 +52,19 @@ + 'msg': "" + } + +-file (no .py): used in run() to import the file and get X. +-kwds: passed to X (**kwds), after 'parent' is added, to initialize X. +-title: an example; used for some widgets, delete if not. +-msg: displayed in a master window. Hints as to how the user might +- test the widget. Close the window to skip or end the test. ++file (no .py): run() imports file.py. ++kwds: augmented with {'parent':root} and passed to X as **kwds. ++title: an example kwd; some widgets need this, delete if not. ++msg: master window hints about testing the widget. + +-Modules not being tested at the moment: ++ ++Modules and classes not being tested at the moment: + PyShell.PyShellEditorWindow + Debugger.Debugger + AutoCompleteWindow.AutoCompleteWindow + OutputWindow.OutputWindow (indirectly being tested with grep test) + ''' ++ + from importlib import import_module + from idlelib.macosxSupport import _initializeTkVariantTests + import Tkinter as tk +@@ -67,6 +93,15 @@ + "Double clicking on items prints a traceback for an exception " + "that is ignored." + } ++ConfigExtensionsDialog_spec = { ++ 'file': 'configDialog', ++ 'kwds': {'title': 'Test Extension Configuration', ++ '_htest': True,}, ++ 'msg': "IDLE extensions dialog.\n" ++ "\n[Ok] to close the dialog.[Apply] to apply the settings and " ++ "and [Cancel] to revert all changes.\nRe-run the test to ensure " ++ "changes made have persisted." ++ } + + _color_delegator_spec = { + 'file': 'ColorDelegator', +@@ -79,7 +114,7 @@ + + ConfigDialog_spec = { + 'file': 'configDialog', +- 'kwds': {'title': 'Settings', ++ 'kwds': {'title': 'ConfigDialogTest', + '_htest': True,}, + 'msg': "IDLE preferences dialog.\n" + "In the 'Fonts/Tabs' tab, changing font face, should update the " +@@ -92,6 +127,7 @@ + "changes made have persisted." + } + ++# TODO Improve message + _dyn_option_menu_spec = { + 'file': 'dynOptionMenuWidget', + 'kwds': {}, +@@ -100,10 +136,12 @@ + "Select one of the many options in the 'new option set'." + } + ++# TODO edit wrapper + _editor_window_spec = { + 'file': 'EditorWindow', + 'kwds': {}, +- 'msg': "Test editor functions of interest." ++ 'msg': "Test editor functions of interest.\n" ++ "Best to close editor first." + } + + GetCfgSectionNameDialog_spec = { +diff -r ee879c0ffa11 Lib/idlelib/idle_test/mock_idle.py +--- a/Lib/idlelib/idle_test/mock_idle.py ++++ b/Lib/idlelib/idle_test/mock_idle.py +@@ -26,7 +26,10 @@ + self.called = True + self.args = args + self.kwds = kwds +- return self.result ++ if isinstance(self.result, BaseException): ++ raise self.result ++ else: ++ return self.result + + + class Editor(object): +diff -r ee879c0ffa11 Lib/idlelib/idle_test/test_calltips.py +--- a/Lib/idlelib/idle_test/test_calltips.py ++++ b/Lib/idlelib/idle_test/test_calltips.py +@@ -163,7 +163,7 @@ + # In 3.x, get_entity changed from 'instance method' to module function + # since 'self' not used. Use dummy instance until change 2.7 also. + def test_bad_entity(self): +- self.assertIsNone(CTi.get_entity('1/0')) ++ self.assertIsNone(CTi.get_entity('1//0')) + def test_good_entity(self): + self.assertIs(CTi.get_entity('int'), int) + +diff -r ee879c0ffa11 Lib/idlelib/idle_test/test_configdialog.py +--- /dev/null ++++ b/Lib/idlelib/idle_test/test_configdialog.py +@@ -0,0 +1,32 @@ ++'''Unittests for idlelib/configHandler.py ++ ++Coverage: 46% just by creating dialog. The other half is change code. ++ ++''' ++import unittest ++from test.test_support import requires ++from Tkinter import Tk ++from idlelib.configDialog import ConfigDialog ++from idlelib.macosxSupport import _initializeTkVariantTests ++ ++ ++class ConfigDialogTest(unittest.TestCase): ++ ++ @classmethod ++ def setUpClass(cls): ++ requires('gui') ++ cls.root = Tk() ++ _initializeTkVariantTests(cls.root) ++ ++ @classmethod ++ def tearDownClass(cls): ++ cls.root.destroy() ++ del cls.root ++ ++ def test_dialog(self): ++ d=ConfigDialog(self.root, 'Test', _utest=True) ++ d.destroy() ++ ++ ++if __name__ == '__main__': ++ unittest.main(verbosity=2) +diff -r ee879c0ffa11 Lib/idlelib/idle_test/test_searchdialogbase.py +--- /dev/null ++++ b/Lib/idlelib/idle_test/test_searchdialogbase.py +@@ -0,0 +1,165 @@ ++'''Unittests for idlelib/SearchDialogBase.py ++ ++Coverage: 99%. The only thing not covered is inconsequential -- ++testing skipping of suite when self.needwrapbutton is false. ++ ++''' ++import unittest ++from test.test_support import requires ++from Tkinter import Tk, Toplevel, Frame, Label, BooleanVar, StringVar ++from idlelib import SearchEngine as se ++from idlelib import SearchDialogBase as sdb ++from idlelib.idle_test.mock_idle import Func ++from idlelib.idle_test.mock_tk import Var, Mbox ++ ++# The following could help make some tests gui-free. ++# However, they currently make radiobutton tests fail. ++##def setUpModule(): ++## # Replace tk objects used to initialize se.SearchEngine. ++## se.BooleanVar = Var ++## se.StringVar = Var ++## ++##def tearDownModule(): ++## se.BooleanVar = BooleanVar ++## se.StringVar = StringVar ++ ++class SearchDialogBaseTest(unittest.TestCase): ++ ++ @classmethod ++ def setUpClass(cls): ++ requires('gui') ++ cls.root = Tk() ++ ++ @classmethod ++ def tearDownClass(cls): ++ cls.root.destroy() ++ del cls.root ++ ++ def setUp(self): ++ self.engine = se.SearchEngine(self.root) # None also seems to work ++ self.dialog = sdb.SearchDialogBase(root=self.root, engine=self.engine) ++ ++ def tearDown(self): ++ self.dialog.close() ++ ++ def test_open_and_close(self): ++ # open calls create_widgets, which needs default_command ++ self.dialog.default_command = None ++ ++ # Since text parameter of .open is not used in base class, ++ # pass dummy 'text' instead of tk.Text(). ++ self.dialog.open('text') ++ self.assertEqual(self.dialog.top.state(), 'normal') ++ self.dialog.close() ++ self.assertEqual(self.dialog.top.state(), 'withdrawn') ++ ++ self.dialog.open('text', searchphrase="hello") ++ self.assertEqual(self.dialog.ent.get(), 'hello') ++ self.dialog.close() ++ ++ def test_create_widgets(self): ++ self.dialog.create_entries = Func() ++ self.dialog.create_option_buttons = Func() ++ self.dialog.create_other_buttons = Func() ++ self.dialog.create_command_buttons = Func() ++ ++ self.dialog.default_command = None ++ self.dialog.create_widgets() ++ ++ self.assertTrue(self.dialog.create_entries.called) ++ self.assertTrue(self.dialog.create_option_buttons.called) ++ self.assertTrue(self.dialog.create_other_buttons.called) ++ self.assertTrue(self.dialog.create_command_buttons.called) ++ ++ def test_make_entry(self): ++ equal = self.assertEqual ++ self.dialog.row = 0 ++ self.dialog.top = Toplevel(self.root) ++ entry, label = self.dialog.make_entry("Test:", 'hello') ++ equal(label['text'], 'Test:') ++ ++ self.assertIn(entry.get(), 'hello') ++ egi = entry.grid_info() ++ equal(int(egi['row']), 0) ++ equal(int(egi['column']), 1) ++ equal(int(egi['rowspan']), 1) ++ equal(int(egi['columnspan']), 1) ++ equal(self.dialog.row, 1) ++ ++ def test_create_entries(self): ++ self.dialog.row = 0 ++ self.engine.setpat('hello') ++ self.dialog.create_entries() ++ self.assertIn(self.dialog.ent.get(), 'hello') ++ ++ def test_make_frame(self): ++ self.dialog.row = 0 ++ self.dialog.top = Toplevel(self.root) ++ frame, label = self.dialog.make_frame() ++ self.assertEqual(label, '') ++ self.assertIsInstance(frame, Frame) ++ ++ frame, label = self.dialog.make_frame('testlabel') ++ self.assertEqual(label['text'], 'testlabel') ++ self.assertIsInstance(frame, Frame) ++ ++ def btn_test_setup(self, meth): ++ self.dialog.top = Toplevel(self.root) ++ self.dialog.row = 0 ++ return meth() ++ ++ def test_create_option_buttons(self): ++ e = self.engine ++ for state in (0, 1): ++ for var in (e.revar, e.casevar, e.wordvar, e.wrapvar): ++ var.set(state) ++ frame, options = self.btn_test_setup( ++ self.dialog.create_option_buttons) ++ for spec, button in zip (options, frame.pack_slaves()): ++ var, label = spec ++ self.assertEqual(button['text'], label) ++ self.assertEqual(var.get(), state) ++ if state == 1: ++ button.deselect() ++ else: ++ button.select() ++ self.assertEqual(var.get(), 1 - state) ++ ++ def test_create_other_buttons(self): ++ for state in (False, True): ++ var = self.engine.backvar ++ var.set(state) ++ frame, others = self.btn_test_setup( ++ self.dialog.create_other_buttons) ++ buttons = frame.pack_slaves() ++ for spec, button in zip(others, buttons): ++ val, label = spec ++ self.assertEqual(button['text'], label) ++ if val == state: ++ # hit other button, then this one ++ # indexes depend on button order ++ self.assertEqual(var.get(), state) ++ buttons[val].select() ++ self.assertEqual(var.get(), 1 - state) ++ buttons[1-val].select() ++ self.assertEqual(var.get(), state) ++ ++ def test_make_button(self): ++ self.dialog.top = Toplevel(self.root) ++ self.dialog.buttonframe = Frame(self.dialog.top) ++ btn = self.dialog.make_button('Test', self.dialog.close) ++ self.assertEqual(btn['text'], 'Test') ++ ++ def test_create_command_buttons(self): ++ self.dialog.create_command_buttons() ++ # Look for close button command in buttonframe ++ closebuttoncommand = '' ++ for child in self.dialog.buttonframe.winfo_children(): ++ if child['text'] == 'close': ++ closebuttoncommand = child['command'] ++ self.assertIn('close', closebuttoncommand) ++ ++ ++ ++if __name__ == '__main__': ++ unittest.main(verbosity=2, exit=2) +diff -r ee879c0ffa11 Lib/idlelib/idle_test/test_textview.py +--- a/Lib/idlelib/idle_test/test_textview.py ++++ b/Lib/idlelib/idle_test/test_textview.py +@@ -3,7 +3,7 @@ + import unittest + import os + from test.test_support import requires +-from Tkinter import Tk, Text, TclError ++from Tkinter import Tk + from idlelib import textView as tv + from idlelib.idle_test.mock_idle import Func + from idlelib.idle_test.mock_tk import Mbox +@@ -93,6 +93,4 @@ + self.assertIsNone(view) + + if __name__ == '__main__': +- unittest.main(verbosity=2, exit=False) +- from idlelib.idle_test.htest import run +- run(TextViewer) ++ unittest.main(verbosity=2) +diff -r ee879c0ffa11 Lib/idlelib/idle_test/test_widgetredir.py +--- /dev/null ++++ b/Lib/idlelib/idle_test/test_widgetredir.py +@@ -0,0 +1,122 @@ ++"""Unittest for idlelib.WidgetRedirector ++ ++100% coverage ++""" ++from test.test_support import requires ++import unittest ++from idlelib.idle_test.mock_idle import Func ++from Tkinter import Tk, Text, TclError ++from idlelib.WidgetRedirector import WidgetRedirector ++ ++ ++class InitCloseTest(unittest.TestCase): ++ ++ @classmethod ++ def setUpClass(cls): ++ requires('gui') ++ cls.tk = Tk() ++ cls.text = Text(cls.tk) ++ ++ @classmethod ++ def tearDownClass(cls): ++ cls.text.destroy() ++ cls.tk.destroy() ++ del cls.text, cls.tk ++ ++ def test_init(self): ++ redir = WidgetRedirector(self.text) ++ self.assertEqual(redir.widget, self.text) ++ self.assertEqual(redir.tk, self.text.tk) ++ self.assertRaises(TclError, WidgetRedirector, self.text) ++ redir.close() # restore self.tk, self.text ++ ++ def test_close(self): ++ redir = WidgetRedirector(self.text) ++ redir.register('insert', Func) ++ redir.close() ++ self.assertEqual(redir._operations, {}) ++ self.assertFalse(hasattr(self.text, 'widget')) ++ ++ ++class WidgetRedirectorTest(unittest.TestCase): ++ ++ @classmethod ++ def setUpClass(cls): ++ requires('gui') ++ cls.tk = Tk() ++ cls.text = Text(cls.tk) ++ ++ @classmethod ++ def tearDownClass(cls): ++ cls.text.destroy() ++ cls.tk.destroy() ++ del cls.text, cls.tk ++ ++ def setUp(self): ++ self.redir = WidgetRedirector(self.text) ++ self.func = Func() ++ self.orig_insert = self.redir.register('insert', self.func) ++ self.text.insert('insert', 'asdf') # leaves self.text empty ++ ++ def tearDown(self): ++ self.text.delete('1.0', 'end') ++ self.redir.close() ++ ++ def test_repr(self): # partly for 100% coverage ++ self.assertIn('Redirector', repr(self.redir)) ++ self.assertIn('Original', repr(self.orig_insert)) ++ ++ def test_register(self): ++ self.assertEqual(self.text.get('1.0', 'end'), '\n') ++ self.assertEqual(self.func.args, ('insert', 'asdf')) ++ self.assertIn('insert', self.redir._operations) ++ self.assertIn('insert', self.text.__dict__) ++ self.assertEqual(self.text.insert, self.func) ++ ++ def test_original_command(self): ++ self.assertEqual(self.orig_insert.operation, 'insert') ++ self.assertEqual(self.orig_insert.tk_call, self.text.tk.call) ++ self.orig_insert('insert', 'asdf') ++ self.assertEqual(self.text.get('1.0', 'end'), 'asdf\n') ++ ++ def test_unregister(self): ++ self.assertIsNone(self.redir.unregister('invalid operation name')) ++ self.assertEqual(self.redir.unregister('insert'), self.func) ++ self.assertNotIn('insert', self.redir._operations) ++ self.assertNotIn('insert', self.text.__dict__) ++ ++ def test_unregister_no_attribute(self): ++ del self.text.insert ++ self.assertEqual(self.redir.unregister('insert'), self.func) ++ ++ def test_dispatch_intercept(self): ++ self.func.__init__(True) ++ self.assertTrue(self.redir.dispatch('insert', False)) ++ self.assertFalse(self.func.args[0]) ++ ++ def test_dispatch_bypass(self): ++ self.orig_insert('insert', 'asdf') ++ # tk.call returns '' where Python would return None ++ self.assertEqual(self.redir.dispatch('delete', '1.0', 'end'), '') ++ self.assertEqual(self.text.get('1.0', 'end'), '\n') ++ ++ def test_dispatch_error(self): ++ self.func.__init__(TclError()) ++ self.assertEqual(self.redir.dispatch('insert', False), '') ++ self.assertEqual(self.redir.dispatch('invalid'), '') ++ ++ def test_command_dispatch(self): ++ # Test that .__init__ causes redirection of tk calls ++ # through redir.dispatch ++ self.tk.call(self.text._w, 'insert', 'hello') ++ self.assertEqual(self.func.args, ('hello',)) ++ self.assertEqual(self.text.get('1.0', 'end'), '\n') ++ # Ensure that called through redir .dispatch and not through ++ # self.text.insert by having mock raise TclError. ++ self.func.__init__(TclError()) ++ self.assertEqual(self.tk.call(self.text._w, 'insert', 'boo'), '') ++ ++ ++ ++if __name__ == '__main__': ++ unittest.main(verbosity=2) +diff -r ee879c0ffa11 Lib/idlelib/macosxSupport.py +--- a/Lib/idlelib/macosxSupport.py ++++ b/Lib/idlelib/macosxSupport.py +@@ -142,11 +142,9 @@ + # Remove the 'About' entry from the help menu, it is in the application + # menu + del Bindings.menudefs[-1][1][0:2] +- +- # Remove the 'Configure' entry from the options menu, it is in the ++ # Remove the 'Configure Idle' entry from the options menu, it is in the + # application menu as 'Preferences' +- del Bindings.menudefs[-2][1][0:2] +- ++ del Bindings.menudefs[-2][1][0] + menubar = Menu(root) + root.configure(menu=menubar) + menudict = {} +diff -r ee879c0ffa11 Lib/lib-tk/FixTk.py +--- a/Lib/lib-tk/FixTk.py ++++ b/Lib/lib-tk/FixTk.py +@@ -48,8 +48,8 @@ + + prefix = os.path.join(sys.prefix,"tcl") + if not os.path.exists(prefix): +- # devdir/../tcltk/lib +- prefix = os.path.join(sys.prefix, os.path.pardir, "tcltk", "lib") ++ # devdir/externals/tcltk/lib ++ prefix = os.path.join(sys.prefix, "externals", "tcltk", "lib") + prefix = os.path.abspath(prefix) + # if this does not exist, no further search is needed + if os.path.exists(prefix): +diff -r ee879c0ffa11 Lib/lib-tk/Tkinter.py +--- a/Lib/lib-tk/Tkinter.py ++++ b/Lib/lib-tk/Tkinter.py +@@ -123,6 +123,29 @@ + try: _cnfmerge = _tkinter._cnfmerge + except AttributeError: pass + ++def _splitdict(tk, v, cut_minus=True, conv=None): ++ """Return a properly formatted dict built from Tcl list pairs. ++ ++ If cut_minus is True, the supposed '-' prefix will be removed from ++ keys. If conv is specified, it is used to convert values. ++ ++ Tcl list is expected to contain an even number of elements. ++ """ ++ t = tk.splitlist(v) ++ if len(t) % 2: ++ raise RuntimeError('Tcl list representing a dict is expected ' ++ 'to contain an even number of elements') ++ it = iter(t) ++ dict = {} ++ for key, value in zip(it, it): ++ key = str(key) ++ if cut_minus and key[0] == '-': ++ key = key[1:] ++ if conv: ++ value = conv(value) ++ dict[key] = value ++ return dict ++ + class Event: + """Container for the properties of an event. + +@@ -201,6 +224,7 @@ + Subclasses StringVar, IntVar, DoubleVar, BooleanVar are specializations + that constrain the type of the value returned from get().""" + _default = "" ++ _tclCommands = None + def __init__(self, master=None, value=None, name=None): + """Construct a variable + +@@ -214,7 +238,7 @@ + global _varnum + if not master: + master = _default_root +- self._master = master ++ self._root = master._root() + self._tk = master.tk + if name: + self._name = name +@@ -227,9 +251,15 @@ + self.set(self._default) + def __del__(self): + """Unset the variable in Tcl.""" +- if (self._tk is not None and +- self._tk.getboolean(self._tk.call("info", "exists", self._name))): ++ if self._tk is None: ++ return ++ if self._tk.getboolean(self._tk.call("info", "exists", self._name)): + self._tk.globalunsetvar(self._name) ++ if self._tclCommands is not None: ++ for name in self._tclCommands: ++ #print '- Tkinter: deleted command', name ++ self._tk.deletecommand(name) ++ self._tclCommands = None + def __str__(self): + """Return the name of the variable in Tcl.""" + return self._name +@@ -248,7 +278,20 @@ + + Return the name of the callback. + """ +- cbname = self._master._register(callback) ++ f = CallWrapper(callback, None, self._root).__call__ ++ cbname = repr(id(f)) ++ try: ++ callback = callback.im_func ++ except AttributeError: ++ pass ++ try: ++ cbname = cbname + callback.__name__ ++ except AttributeError: ++ pass ++ self._tk.createcommand(cbname, f) ++ if self._tclCommands is None: ++ self._tclCommands = [] ++ self._tclCommands.append(cbname) + self._tk.call("trace", "variable", self._name, mode, cbname) + return cbname + trace = trace_variable +@@ -259,7 +302,11 @@ + CBNAME is the name of the callback returned from trace_variable or trace. + """ + self._tk.call("trace", "vdelete", self._name, mode, cbname) +- self._master.deletecommand(cbname) ++ self._tk.deletecommand(cbname) ++ try: ++ self._tclCommands.remove(cbname) ++ except ValueError: ++ pass + def trace_vinfo(self): + """Return all trace callback information.""" + return map(self._tk.split, self._tk.splitlist( +@@ -425,7 +472,10 @@ + + _flatten(args) + _flatten(kw.items())) + def tk_menuBar(self, *args): + """Do not use. Needed in Tk 3.6 and earlier.""" +- pass # obsolete since Tk 4.0 ++ # obsolete since Tk 4.0 ++ import warnings ++ warnings.warn('tk_menuBar() does nothing and will be removed in 3.6', ++ DeprecationWarning, stacklevel=2) + def wait_variable(self, name='PY_VAR'): + """Wait until the variable is modified. + +@@ -536,6 +586,7 @@ + self.deletecommand(name) + except TclError: + pass ++ callit.__name__ = func.__name__ + name = self._register(callit) + return self.tk.call('after', ms, name) + def after_idle(self, func, *args): +@@ -1362,15 +1413,10 @@ + else: + options = self._options(cnf, kw) + if not options: +- res = self.tk.call('grid', +- command, self._w, index) +- words = self.tk.splitlist(res) +- dict = {} +- for i in range(0, len(words), 2): +- key = words[i][1:] +- value = words[i+1] +- dict[key] = self._gridconvvalue(value) +- return dict ++ return _splitdict( ++ self.tk, ++ self.tk.call('grid', command, self._w, index), ++ conv=self._gridconvvalue) + res = self.tk.call( + ('grid', command, self._w, index) + + options) +@@ -1833,9 +1879,12 @@ + if os.path.isfile(base_py): + execfile(base_py, dir) + def report_callback_exception(self, exc, val, tb): +- """Internal function. It reports exception on sys.stderr.""" ++ """Report callback exception on sys.stderr. ++ ++ Applications may want to override this internal function, and ++ should when sys.stderr is None.""" + import traceback, sys +- sys.stderr.write("Exception in Tkinter callback\n") ++ print >>sys.stderr, "Exception in Tkinter callback" + sys.last_type = exc + sys.last_value = val + sys.last_traceback = tb +@@ -1893,16 +1942,10 @@ + def pack_info(self): + """Return information about the packing options + for this widget.""" +- words = self.tk.splitlist( +- self.tk.call('pack', 'info', self._w)) +- dict = {} +- for i in range(0, len(words), 2): +- key = words[i][1:] +- value = words[i+1] +- if str(value)[:1] == '.': +- value = self._nametowidget(value) +- dict[key] = value +- return dict ++ d = _splitdict(self.tk, self.tk.call('pack', 'info', self._w)) ++ if 'in' in d: ++ d['in'] = self.nametowidget(d['in']) ++ return d + info = pack_info + propagate = pack_propagate = Misc.pack_propagate + slaves = pack_slaves = Misc.pack_slaves +@@ -1944,16 +1987,10 @@ + def place_info(self): + """Return information about the placing options + for this widget.""" +- words = self.tk.splitlist( +- self.tk.call('place', 'info', self._w)) +- dict = {} +- for i in range(0, len(words), 2): +- key = words[i][1:] +- value = words[i+1] +- if str(value)[:1] == '.': +- value = self._nametowidget(value) +- dict[key] = value +- return dict ++ d = _splitdict(self.tk, self.tk.call('place', 'info', self._w)) ++ if 'in' in d: ++ d['in'] = self.nametowidget(d['in']) ++ return d + info = place_info + slaves = place_slaves = Misc.place_slaves + +@@ -1993,16 +2030,10 @@ + def grid_info(self): + """Return information about the options + for positioning this widget in a grid.""" +- words = self.tk.splitlist( +- self.tk.call('grid', 'info', self._w)) +- dict = {} +- for i in range(0, len(words), 2): +- key = words[i][1:] +- value = words[i+1] +- if str(value)[:1] == '.': +- value = self._nametowidget(value) +- dict[key] = value +- return dict ++ d = _splitdict(self.tk, self.tk.call('grid', 'info', self._w)) ++ if 'in' in d: ++ d['in'] = self.nametowidget(d['in']) ++ return d + info = grid_info + location = grid_location = Misc.grid_location + propagate = grid_propagate = Misc.grid_propagate +@@ -2657,7 +2688,11 @@ + selectcolor, takefocus, tearoff, tearoffcommand, title, type.""" + Widget.__init__(self, master, 'menu', cnf, kw) + def tk_bindForTraversal(self): +- pass # obsolete since Tk 4.0 ++ # obsolete since Tk 4.0 ++ import warnings ++ warnings.warn('tk_bindForTraversal() does nothing and ' ++ 'will be removed in 3.6', ++ DeprecationWarning, stacklevel=2) + def tk_mbPost(self): + self.tk.call('tk_mbPost', self._w) + def tk_mbUnpost(self): +@@ -3262,7 +3297,7 @@ + master = _default_root + if not master: + raise RuntimeError, 'Too early to create image' +- self.tk = master.tk ++ self.tk = getattr(master, 'tk', master) + if not name: + Image._last_id += 1 + name = "pyimage%r" % (Image._last_id,) # tk itself would use image +@@ -3275,6 +3310,8 @@ + for k, v in cnf.items(): + if hasattr(v, '__call__'): + v = self._register(v) ++ elif k in ('data', 'maskdata'): ++ v = self.tk._createbytearray(v) + options = options + ('-'+k, v) + self.tk.call(('image', 'create', imgtype, name,) + options) + self.name = name +@@ -3298,6 +3335,8 @@ + if k[-1] == '_': k = k[:-1] + if hasattr(v, '__call__'): + v = self._register(v) ++ elif k in ('data', 'maskdata'): ++ v = self.tk._createbytearray(v) + res = res + ('-'+k, v) + self.tk.call((self.name, 'config') + res) + config = configure +@@ -3333,20 +3372,20 @@ + # XXX copy -from, -to, ...? + def copy(self): + """Return a new PhotoImage with the same image as this widget.""" +- destImage = PhotoImage() ++ destImage = PhotoImage(master=self.tk) + self.tk.call(destImage, 'copy', self.name) + return destImage + def zoom(self,x,y=''): + """Return a new PhotoImage with the same image as this widget + but zoom it with X and Y.""" +- destImage = PhotoImage() ++ destImage = PhotoImage(master=self.tk) + if y=='': y=x + self.tk.call(destImage, 'copy', self.name, '-zoom',x,y) + return destImage + def subsample(self,x,y=''): + """Return a new PhotoImage based on the same image as this widget + but use only every Xth or Yth pixel.""" +- destImage = PhotoImage() ++ destImage = PhotoImage(master=self.tk) + if y=='': y=x + self.tk.call(destImage, 'copy', self.name, '-subsample',x,y) + return destImage +diff -r ee879c0ffa11 Lib/lib-tk/test/test_tkinter/test_font.py +--- /dev/null ++++ b/Lib/lib-tk/test/test_tkinter/test_font.py +@@ -0,0 +1,28 @@ ++import unittest ++import Tkinter as tkinter ++import tkFont as font ++from test.test_support import requires, run_unittest ++from test_ttk.support import AbstractTkTest ++ ++requires('gui') ++ ++class FontTest(AbstractTkTest, unittest.TestCase): ++ ++ def test_font_eq(self): ++ fontname = "TkDefaultFont" ++ try: ++ f = font.Font(root=self.root, name=fontname, exists=True) ++ except tkinter._tkinter.TclError: ++ f = font.Font(root=self.root, name=fontname, exists=False) ++ font1 = font.Font(root=self.root, name=fontname, exists=True) ++ font2 = font.Font(root=self.root, name=fontname, exists=True) ++ self.assertIsNot(font1, font2) ++ self.assertEqual(font1, font2) ++ self.assertNotEqual(font1, font1.copy()) ++ self.assertNotEqual(font1, 0) ++ self.assertNotIn(font1, [0]) ++ ++tests_gui = (FontTest, ) ++ ++if __name__ == "__main__": ++ run_unittest(*tests_gui) +diff -r ee879c0ffa11 Lib/lib-tk/test/test_tkinter/test_geometry_managers.py +--- a/Lib/lib-tk/test/test_tkinter/test_geometry_managers.py ++++ b/Lib/lib-tk/test/test_tkinter/test_geometry_managers.py +@@ -1,6 +1,6 @@ + import unittest + import re +-import Tkinter ++import Tkinter as tkinter + from Tkinter import TclError + from test.test_support import requires, run_unittest + +@@ -13,13 +13,13 @@ + class PackTest(AbstractWidgetTest, unittest.TestCase): + + def create2(self): +- pack = Tkinter.Toplevel(self.root, name='pack') ++ pack = tkinter.Toplevel(self.root, name='pack') + pack.wm_geometry('300x200+0+0') + pack.wm_minsize(1, 1) +- a = Tkinter.Frame(pack, name='a', width=20, height=40, bg='red') +- b = Tkinter.Frame(pack, name='b', width=50, height=30, bg='blue') +- c = Tkinter.Frame(pack, name='c', width=80, height=80, bg='green') +- d = Tkinter.Frame(pack, name='d', width=40, height=30, bg='yellow') ++ a = tkinter.Frame(pack, name='a', width=20, height=40, bg='red') ++ b = tkinter.Frame(pack, name='b', width=50, height=30, bg='blue') ++ c = tkinter.Frame(pack, name='c', width=80, height=80, bg='green') ++ d = tkinter.Frame(pack, name='d', width=40, height=30, bg='yellow') + return pack, a, b, c, d + + def test_pack_configure_after(self): +@@ -277,11 +277,11 @@ + class PlaceTest(AbstractWidgetTest, unittest.TestCase): + + def create2(self): +- t = Tkinter.Toplevel(self.root, width=300, height=200, bd=0) +- t.wm_geometry('+0+0') +- f = Tkinter.Frame(t, width=154, height=84, bd=2, relief='raised') ++ t = tkinter.Toplevel(self.root, width=300, height=200, bd=0) ++ t.wm_geometry('300x200+0+0') ++ f = tkinter.Frame(t, width=154, height=84, bd=2, relief='raised') + f.place_configure(x=48, y=38) +- f2 = Tkinter.Frame(t, width=30, height=60, bd=2, relief='raised') ++ f2 = tkinter.Frame(t, width=30, height=60, bd=2, relief='raised') + self.root.update() + return t, f, f2 + +@@ -369,7 +369,7 @@ + f2.place_configure(in_=f, rely='spam') + + def test_place_configure_anchor(self): +- f = Tkinter.Frame(self.root) ++ f = tkinter.Frame(self.root) + with self.assertRaisesRegexp(TclError, 'bad anchor "j"'): + f.place_configure(anchor='j') + with self.assertRaisesRegexp(TclError, 'ambiguous anchor ""'): +@@ -425,7 +425,7 @@ + f2.place_configure(relheight='abcd') + + def test_place_configure_bordermode(self): +- f = Tkinter.Frame(self.root) ++ f = tkinter.Frame(self.root) + with self.assertRaisesRegexp(TclError, 'bad bordermode "j"'): + f.place_configure(bordermode='j') + with self.assertRaisesRegexp(TclError, 'ambiguous bordermode ""'): +@@ -435,7 +435,7 @@ + self.assertEqual(f.place_info()['bordermode'], value) + + def test_place_forget(self): +- foo = Tkinter.Frame(self.root) ++ foo = tkinter.Frame(self.root) + foo.place_configure(width=50, height=50) + self.root.update() + foo.place_forget() +@@ -467,8 +467,8 @@ + f2.place_info(0) + + def test_place_slaves(self): +- foo = Tkinter.Frame(self.root) +- bar = Tkinter.Frame(self.root) ++ foo = tkinter.Frame(self.root) ++ bar = tkinter.Frame(self.root) + self.assertEqual(foo.place_slaves(), []) + bar.place_configure(in_=foo) + self.assertEqual(foo.place_slaves(), [bar]) +@@ -479,17 +479,16 @@ + class GridTest(AbstractWidgetTest, unittest.TestCase): + + def tearDown(self): +- super(GridTest, self).tearDown() + cols, rows = self.root.grid_size() + for i in range(cols + 1): + self.root.grid_columnconfigure(i, weight=0, minsize=0, pad=0, uniform='') + for i in range(rows + 1): + self.root.grid_rowconfigure(i, weight=0, minsize=0, pad=0, uniform='') + self.root.grid_propagate(1) ++ super(GridTest, self).tearDown() + + def test_grid_configure(self): +- b = Tkinter.Button(self.root) +- self.addCleanup(b.destroy) ++ b = tkinter.Button(self.root) + self.assertEqual(b.grid_info(), {}) + b.grid_configure() + self.assertEqual(b.grid_info()['in'], self.root) +@@ -500,7 +499,7 @@ + self.assertEqual(b.grid_info()['row'], self._str(2)) + + def test_grid_configure_column(self): +- b = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) + with self.assertRaisesRegexp(TclError, 'bad column value "-1": ' + 'must be a non-negative integer'): + b.grid_configure(column=-1) +@@ -508,7 +507,7 @@ + self.assertEqual(b.grid_info()['column'], self._str(2)) + + def test_grid_configure_columnspan(self): +- b = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) + with self.assertRaisesRegexp(TclError, 'bad columnspan value "0": ' + 'must be a positive integer'): + b.grid_configure(columnspan=0) +@@ -516,8 +515,8 @@ + self.assertEqual(b.grid_info()['columnspan'], self._str(2)) + + def test_grid_configure_in(self): +- f = Tkinter.Frame(self.root) +- b = Tkinter.Button(self.root) ++ f = tkinter.Frame(self.root) ++ b = tkinter.Button(self.root) + self.assertEqual(b.grid_info(), {}) + b.grid_configure() + self.assertEqual(b.grid_info()['in'], self.root) +@@ -527,7 +526,7 @@ + self.assertEqual(b.grid_info()['in'], self.root) + + def test_grid_configure_ipadx(self): +- b = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) + with self.assertRaisesRegexp(TclError, 'bad ipadx value "-1": ' + 'must be positive screen distance'): + b.grid_configure(ipadx=-1) +@@ -538,7 +537,7 @@ + self._str(int_round(pixels_conv('.5c') * self.scaling))) + + def test_grid_configure_ipady(self): +- b = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) + with self.assertRaisesRegexp(TclError, 'bad ipady value "-1": ' + 'must be positive screen distance'): + b.grid_configure(ipady=-1) +@@ -549,7 +548,7 @@ + self._str(int_round(pixels_conv('.5c') * self.scaling))) + + def test_grid_configure_padx(self): +- b = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) + with self.assertRaisesRegexp(TclError, 'bad pad value "-1": ' + 'must be positive screen distance'): + b.grid_configure(padx=-1) +@@ -562,7 +561,7 @@ + self._str(int_round(pixels_conv('.5c') * self.scaling))) + + def test_grid_configure_pady(self): +- b = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) + with self.assertRaisesRegexp(TclError, 'bad pad value "-1": ' + 'must be positive screen distance'): + b.grid_configure(pady=-1) +@@ -575,8 +574,7 @@ + self._str(int_round(pixels_conv('.5c') * self.scaling))) + + def test_grid_configure_row(self): +- b = Tkinter.Button(self.root) +- self.addCleanup(b.destroy) ++ b = tkinter.Button(self.root) + with self.assertRaisesRegexp(TclError, 'bad (row|grid) value "-1": ' + 'must be a non-negative integer'): + b.grid_configure(row=-1) +@@ -584,7 +582,7 @@ + self.assertEqual(b.grid_info()['row'], self._str(2)) + + def test_grid_configure_rownspan(self): +- b = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) + with self.assertRaisesRegexp(TclError, 'bad rowspan value "0": ' + 'must be a positive integer'): + b.grid_configure(rowspan=0) +@@ -592,7 +590,7 @@ + self.assertEqual(b.grid_info()['rowspan'], self._str(2)) + + def test_grid_configure_sticky(self): +- f = Tkinter.Frame(self.root, bg='red') ++ f = tkinter.Frame(self.root, bg='red') + with self.assertRaisesRegexp(TclError, 'bad stickyness value "glue"'): + f.grid_configure(sticky='glue') + f.grid_configure(sticky='ne') +@@ -611,7 +609,7 @@ + with self.assertRaisesRegexp(TclError, + 'must specify a single element on retrieval'): + self.root.grid_columnconfigure((0, 3)) +- b = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) + b.grid_configure(column=0, row=0) + if tcl_version >= (8, 5): + self.root.grid_columnconfigure('all', weight=3) +@@ -667,7 +665,7 @@ + with self.assertRaisesRegexp(TclError, + 'must specify a single element on retrieval'): + self.root.grid_rowconfigure((0, 3)) +- b = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) + b.grid_configure(column=0, row=0) + if tcl_version >= (8, 5): + self.root.grid_rowconfigure('all', weight=3) +@@ -713,8 +711,8 @@ + self.assertEqual(self.root.grid_rowconfigure(0)['uniform'], 'foo') + + def test_grid_forget(self): +- b = Tkinter.Button(self.root) +- c = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) ++ c = tkinter.Button(self.root) + b.grid_configure(row=2, column=2, rowspan=2, columnspan=2, + padx=3, pady=4, sticky='ns') + self.assertEqual(self.root.grid_slaves(), [b]) +@@ -733,8 +731,8 @@ + self.assertEqual(info['sticky'], '') + + def test_grid_remove(self): +- b = Tkinter.Button(self.root) +- c = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) ++ c = tkinter.Button(self.root) + b.grid_configure(row=2, column=2, rowspan=2, columnspan=2, + padx=3, pady=4, sticky='ns') + self.assertEqual(self.root.grid_slaves(), [b]) +@@ -753,7 +751,7 @@ + self.assertEqual(info['sticky'], 'ns') + + def test_grid_info(self): +- b = Tkinter.Button(self.root) ++ b = tkinter.Button(self.root) + self.assertEqual(b.grid_info(), {}) + b.grid_configure(row=2, column=2, rowspan=2, columnspan=2, + padx=3, pady=4, sticky='ns') +@@ -782,12 +780,12 @@ + self.root.grid_bbox(0, 0, 0, 'x') + with self.assertRaises(TypeError): + self.root.grid_bbox(0, 0, 0, 0, 0) +- t = Tkinter.Toplevel(self.root) ++ t = self.root + # de-maximize + t.wm_geometry('1x1+0+0') + t.wm_geometry('') +- f1 = Tkinter.Frame(t, width=75, height=75, bg='red') +- f2 = Tkinter.Frame(t, width=90, height=90, bg='blue') ++ f1 = tkinter.Frame(t, width=75, height=75, bg='red') ++ f2 = tkinter.Frame(t, width=90, height=90, bg='blue') + f1.grid_configure(row=0, column=0) + f2.grid_configure(row=1, column=1) + self.root.update() +@@ -810,11 +808,11 @@ + self.root.grid_location('x', 'y') + with self.assertRaisesRegexp(TclError, 'bad screen distance "y"'): + self.root.grid_location('1c', 'y') +- t = Tkinter.Toplevel(self.root) ++ t = self.root + # de-maximize + t.wm_geometry('1x1+0+0') + t.wm_geometry('') +- f = Tkinter.Frame(t, width=200, height=100, ++ f = tkinter.Frame(t, width=200, height=100, + highlightthickness=0, bg='red') + self.assertEqual(f.grid_location(10, 10), (-1, -1)) + f.grid_configure() +@@ -837,13 +835,13 @@ + self.root.grid_propagate(False, False) + self.root.grid_propagate(False) + self.assertFalse(self.root.grid_propagate()) +- f = Tkinter.Frame(self.root, width=100, height=100, bg='red') ++ f = tkinter.Frame(self.root, width=100, height=100, bg='red') + f.grid_configure(row=0, column=0) + self.root.update() + self.assertEqual(f.winfo_width(), 100) + self.assertEqual(f.winfo_height(), 100) + f.grid_propagate(False) +- g = Tkinter.Frame(self.root, width=75, height=85, bg='green') ++ g = tkinter.Frame(self.root, width=75, height=85, bg='green') + g.grid_configure(in_=f, row=0, column=0) + self.root.update() + self.assertEqual(f.winfo_width(), 100) +@@ -857,7 +855,7 @@ + with self.assertRaises(TypeError): + self.root.grid_size(0) + self.assertEqual(self.root.grid_size(), (0, 0)) +- f = Tkinter.Scale(self.root) ++ f = tkinter.Scale(self.root) + f.grid_configure(row=0, column=0) + self.assertEqual(self.root.grid_size(), (1, 1)) + f.grid_configure(row=4, column=5) +@@ -865,13 +863,13 @@ + + def test_grid_slaves(self): + self.assertEqual(self.root.grid_slaves(), []) +- a = Tkinter.Label(self.root) ++ a = tkinter.Label(self.root) + a.grid_configure(row=0, column=1) +- b = Tkinter.Label(self.root) ++ b = tkinter.Label(self.root) + b.grid_configure(row=1, column=0) +- c = Tkinter.Label(self.root) ++ c = tkinter.Label(self.root) + c.grid_configure(row=1, column=1) +- d = Tkinter.Label(self.root) ++ d = tkinter.Label(self.root) + d.grid_configure(row=1, column=1) + self.assertEqual(self.root.grid_slaves(), [d, c, b, a]) + self.assertEqual(self.root.grid_slaves(row=0), [a]) +diff -r ee879c0ffa11 Lib/lib-tk/test/test_tkinter/test_images.py +--- a/Lib/lib-tk/test/test_tkinter/test_images.py ++++ b/Lib/lib-tk/test/test_tkinter/test_images.py +@@ -2,15 +2,12 @@ + import Tkinter as tkinter + import ttk + import test.test_support as support +-from test_ttk.support import requires_tcl ++from test_ttk.support import AbstractTkTest, requires_tcl + + support.requires('gui') + + +-class MiscTest(unittest.TestCase): +- +- def setUp(self): +- self.root = ttk.setup_master() ++class MiscTest(AbstractTkTest, unittest.TestCase): + + def test_image_types(self): + image_types = self.root.image_types() +@@ -23,15 +20,13 @@ + self.assertIsInstance(image_names, tuple) + + +-class BitmapImageTest(unittest.TestCase): ++class BitmapImageTest(AbstractTkTest, unittest.TestCase): + + @classmethod + def setUpClass(cls): ++ AbstractTkTest.setUpClass.__func__(cls) + cls.testfile = support.findfile('python.xbm', subdir='imghdrdata') + +- def setUp(self): +- self.root = ttk.setup_master() +- + def test_create_from_file(self): + image = tkinter.BitmapImage('::img::test', master=self.root, + foreground='yellow', background='blue', +@@ -107,16 +102,13 @@ + '-foreground {} {} #000000 yellow') + + +-class PhotoImageTest(unittest.TestCase): ++class PhotoImageTest(AbstractTkTest, unittest.TestCase): + + @classmethod + def setUpClass(cls): ++ AbstractTkTest.setUpClass.__func__(cls) + cls.testfile = support.findfile('python.gif', subdir='imghdrdata') + +- def setUp(self): +- self.root = ttk.setup_master() +- self.wantobjects = self.root.wantobjects() +- + def create(self): + return tkinter.PhotoImage('::img::test', master=self.root, + file=self.testfile) +@@ -151,7 +143,8 @@ + self.assertEqual(image.type(), 'photo') + self.assertEqual(image.width(), 16) + self.assertEqual(image.height(), 16) +- self.assertEqual(image['data'], data) ++ self.assertEqual(image['data'], data if self.wantobjects ++ else data.decode('latin1')) + self.assertEqual(image['file'], '') + self.assertIn('::img::test', self.root.image_names()) + del image +@@ -160,21 +153,18 @@ + def test_create_from_ppm_file(self): + self.check_create_from_file('ppm') + +- @unittest.skip('issue #21580') + def test_create_from_ppm_data(self): + self.check_create_from_data('ppm') + + def test_create_from_pgm_file(self): + self.check_create_from_file('pgm') + +- @unittest.skip('issue #21580') + def test_create_from_pgm_data(self): + self.check_create_from_data('pgm') + + def test_create_from_gif_file(self): + self.check_create_from_file('gif') + +- @unittest.skip('issue #21580') + def test_create_from_gif_data(self): + self.check_create_from_data('gif') + +@@ -182,19 +172,18 @@ + def test_create_from_png_file(self): + self.check_create_from_file('png') + +- @unittest.skip('issue #21580') + @requires_tcl(8, 6) + def test_create_from_png_data(self): + self.check_create_from_data('png') + +- @unittest.skip('issue #21580') + def test_configure_data(self): + image = tkinter.PhotoImage('::img::test', master=self.root) + self.assertEqual(image['data'], '') + with open(self.testfile, 'rb') as f: + data = f.read() + image.configure(data=data) +- self.assertEqual(image['data'], data) ++ self.assertEqual(image['data'], data if self.wantobjects ++ else data.decode('latin1')) + self.assertEqual(image.width(), 16) + self.assertEqual(image.height(), 16) + +diff -r ee879c0ffa11 Lib/lib-tk/test/test_tkinter/test_text.py +--- a/Lib/lib-tk/test/test_tkinter/test_text.py ++++ b/Lib/lib-tk/test/test_tkinter/test_text.py +@@ -1,18 +1,15 @@ + import unittest +-import Tkinter ++import Tkinter as tkinter + from test.test_support import requires, run_unittest +-from ttk import setup_master ++from test_ttk.support import AbstractTkTest + + requires('gui') + +-class TextTest(unittest.TestCase): ++class TextTest(AbstractTkTest, unittest.TestCase): + + def setUp(self): +- self.root = setup_master() +- self.text = Tkinter.Text(self.root) +- +- def tearDown(self): +- self.text.destroy() ++ super(TextTest, self).setUp() ++ self.text = tkinter.Text(self.root) + + def test_debug(self): + text = self.text +@@ -30,12 +27,12 @@ + text = self.text + + # pattern and index are obligatory arguments. +- self.assertRaises(Tkinter.TclError, text.search, None, '1.0') +- self.assertRaises(Tkinter.TclError, text.search, 'a', None) +- self.assertRaises(Tkinter.TclError, text.search, None, None) ++ self.assertRaises(tkinter.TclError, text.search, None, '1.0') ++ self.assertRaises(tkinter.TclError, text.search, 'a', None) ++ self.assertRaises(tkinter.TclError, text.search, None, None) + + # Invalid text index. +- self.assertRaises(Tkinter.TclError, text.search, '', 0) ++ self.assertRaises(tkinter.TclError, text.search, '', 0) + + # Check if we are getting the indices as strings -- you are likely + # to get Tcl_Obj under Tk 8.5 if Tkinter doesn't convert it. +diff -r ee879c0ffa11 Lib/lib-tk/test/test_tkinter/test_variables.py +--- a/Lib/lib-tk/test/test_tkinter/test_variables.py ++++ b/Lib/lib-tk/test/test_tkinter/test_variables.py +@@ -1,15 +1,15 @@ + import unittest + +-from Tkinter import Variable, StringVar, IntVar, DoubleVar, BooleanVar, Tk, TclError ++from Tkinter import Variable, StringVar, IntVar, DoubleVar, BooleanVar, Tcl, TclError + + + class TestBase(unittest.TestCase): + + def setUp(self): +- self.root = Tk() ++ self.root = Tcl() + + def tearDown(self): +- self.root.destroy() ++ del self.root + + + class TestVariable(TestBase): +diff -r ee879c0ffa11 Lib/lib-tk/test/test_tkinter/test_widgets.py +--- a/Lib/lib-tk/test/test_tkinter/test_widgets.py ++++ b/Lib/lib-tk/test/test_tkinter/test_widgets.py +@@ -1,5 +1,5 @@ + import unittest +-import Tkinter ++import Tkinter as tkinter + from Tkinter import TclError + import os + import sys +@@ -63,12 +63,12 @@ + 'takefocus', 'use', 'visual', 'width', + ) + +- def _create(self, **kwargs): +- return Tkinter.Toplevel(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Toplevel(self.root, **kwargs) + + def test_menu(self): + widget = self.create() +- menu = Tkinter.Menu(self.root) ++ menu = tkinter.Menu(self.root) + self.checkParam(widget, 'menu', menu, eq=widget_eq) + self.checkParam(widget, 'menu', '') + +@@ -102,8 +102,8 @@ + 'relief', 'takefocus', 'visual', 'width', + ) + +- def _create(self, **kwargs): +- return Tkinter.Frame(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Frame(self.root, **kwargs) + + + @add_standard_options(StandardOptionsTests) +@@ -117,8 +117,8 @@ + 'takefocus', 'text', 'visual', 'width', + ) + +- def _create(self, **kwargs): +- return Tkinter.LabelFrame(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.LabelFrame(self.root, **kwargs) + + def test_labelanchor(self): + widget = self.create() +@@ -129,7 +129,7 @@ + + def test_labelwidget(self): + widget = self.create() +- label = Tkinter.Label(self.root, text='Mupp', name='foo') ++ label = tkinter.Label(self.root, text='Mupp', name='foo') + self.checkParam(widget, 'labelwidget', label, expected='.foo') + label.destroy() + +@@ -155,8 +155,8 @@ + 'underline', 'width', 'wraplength', + ) + +- def _create(self, **kwargs): +- return Tkinter.Label(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Label(self.root, **kwargs) + + + @add_standard_options(StandardOptionsTests) +@@ -172,8 +172,8 @@ + 'state', 'takefocus', 'text', 'textvariable', + 'underline', 'width', 'wraplength') + +- def _create(self, **kwargs): +- return Tkinter.Button(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Button(self.root, **kwargs) + + def test_default(self): + widget = self.create() +@@ -196,8 +196,8 @@ + 'underline', 'variable', 'width', 'wraplength', + ) + +- def _create(self, **kwargs): +- return Tkinter.Checkbutton(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Checkbutton(self.root, **kwargs) + + + def test_offvalue(self): +@@ -224,8 +224,8 @@ + 'underline', 'value', 'variable', 'width', 'wraplength', + ) + +- def _create(self, **kwargs): +- return Tkinter.Radiobutton(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Radiobutton(self.root, **kwargs) + + def test_value(self): + widget = self.create() +@@ -247,8 +247,8 @@ + ) + _conv_pixels = staticmethod(pixels_round) + +- def _create(self, **kwargs): +- return Tkinter.Menubutton(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Menubutton(self.root, **kwargs) + + def test_direction(self): + widget = self.create() +@@ -265,21 +265,21 @@ + 'crashes with Cocoa Tk (issue19733)') + def test_image(self): + widget = self.create() +- image = Tkinter.PhotoImage('image1') ++ image = tkinter.PhotoImage(master=self.root, name='image1') + self.checkParam(widget, 'image', image, conv=str) + errmsg = 'image "spam" doesn\'t exist' +- with self.assertRaises(Tkinter.TclError) as cm: ++ with self.assertRaises(tkinter.TclError) as cm: + widget['image'] = 'spam' + if errmsg is not None: + self.assertEqual(str(cm.exception), errmsg) +- with self.assertRaises(Tkinter.TclError) as cm: ++ with self.assertRaises(tkinter.TclError) as cm: + widget.configure({'image': 'spam'}) + if errmsg is not None: + self.assertEqual(str(cm.exception), errmsg) + + def test_menu(self): + widget = self.create() +- menu = Tkinter.Menu(widget, name='menu') ++ menu = tkinter.Menu(widget, name='menu') + self.checkParam(widget, 'menu', menu, eq=widget_eq) + menu.destroy() + +@@ -300,8 +300,8 @@ + + class OptionMenuTest(MenubuttonTest, unittest.TestCase): + +- def _create(self, default='b', values=('a', 'b', 'c'), **kwargs): +- return Tkinter.OptionMenu(self.root, None, default, *values, **kwargs) ++ def create(self, default='b', values=('a', 'b', 'c'), **kwargs): ++ return tkinter.OptionMenu(self.root, None, default, *values, **kwargs) + + + @add_standard_options(IntegerSizeTests, StandardOptionsTests) +@@ -319,8 +319,8 @@ + 'validate', 'validatecommand', 'width', 'xscrollcommand', + ) + +- def _create(self, **kwargs): +- return Tkinter.Entry(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Entry(self.root, **kwargs) + + def test_disabledbackground(self): + widget = self.create() +@@ -393,8 +393,8 @@ + 'width', 'wrap', 'xscrollcommand', + ) + +- def _create(self, **kwargs): +- return Tkinter.Spinbox(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Spinbox(self.root, **kwargs) + + test_show = None + +@@ -465,8 +465,8 @@ + def test_bbox(self): + widget = self.create() + self.assertIsBoundingBox(widget.bbox(0)) +- self.assertRaises(Tkinter.TclError, widget.bbox, 'noindex') +- self.assertRaises(Tkinter.TclError, widget.bbox, None) ++ self.assertRaises(tkinter.TclError, widget.bbox, 'noindex') ++ self.assertRaises(tkinter.TclError, widget.bbox, None) + self.assertRaises(TypeError, widget.bbox) + self.assertRaises(TypeError, widget.bbox, 0, 1) + +@@ -487,10 +487,10 @@ + 'xscrollcommand', 'yscrollcommand', + ) + if tcl_version < (8, 5): +- wantobjects = False ++ _stringify = True + +- def _create(self, **kwargs): +- return Tkinter.Text(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Text(self.root, **kwargs) + + def test_autoseparators(self): + widget = self.create() +@@ -619,10 +619,10 @@ + widget = self.create() + self.assertIsBoundingBox(widget.bbox('1.1')) + self.assertIsNone(widget.bbox('end')) +- self.assertRaises(Tkinter.TclError, widget.bbox, 'noindex') +- self.assertRaises(Tkinter.TclError, widget.bbox, None) +- self.assertRaises(Tkinter.TclError, widget.bbox) +- self.assertRaises(Tkinter.TclError, widget.bbox, '1.1', 'end') ++ self.assertRaises(tkinter.TclError, widget.bbox, 'noindex') ++ self.assertRaises(tkinter.TclError, widget.bbox, None) ++ self.assertRaises(tkinter.TclError, widget.bbox) ++ self.assertRaises(tkinter.TclError, widget.bbox, '1.1', 'end') + + + @add_standard_options(PixelSizeTests, StandardOptionsTests) +@@ -641,10 +641,10 @@ + ) + + _conv_pixels = staticmethod(int_round) +- wantobjects = False ++ _stringify = True + +- def _create(self, **kwargs): +- return Tkinter.Canvas(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Canvas(self.root, **kwargs) + + def test_closeenough(self): + widget = self.create() +@@ -696,8 +696,8 @@ + 'takefocus', 'width', 'xscrollcommand', 'yscrollcommand', + ) + +- def _create(self, **kwargs): +- return Tkinter.Listbox(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Listbox(self.root, **kwargs) + + def test_activestyle(self): + widget = self.create() +@@ -706,7 +706,7 @@ + + def test_listvariable(self): + widget = self.create() +- var = Tkinter.DoubleVar() ++ var = tkinter.DoubleVar(self.root) + self.checkVariableParam(widget, 'listvariable', var) + + def test_selectmode(self): +@@ -789,7 +789,7 @@ + def test_curselection(self): + lb = self.create() + lb.insert(0, *('el%d' % i for i in range(8))) +- lb.selection_clear(0, Tkinter.END) ++ lb.selection_clear(0, tkinter.END) + lb.selection_set(2, 4) + lb.selection_set(6) + self.assertEqual(lb.curselection(), (2, 3, 4, 6)) +@@ -828,8 +828,8 @@ + ) + default_orient = 'vertical' + +- def _create(self, **kwargs): +- return Tkinter.Scale(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Scale(self.root, **kwargs) + + def test_bigincrement(self): + widget = self.create() +@@ -894,11 +894,11 @@ + 'takefocus', 'troughcolor', 'width', + ) + _conv_pixels = staticmethod(int_round) +- wantobjects = False ++ _stringify = True + default_orient = 'vertical' + +- def _create(self, **kwargs): +- return Tkinter.Scrollbar(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Scrollbar(self.root, **kwargs) + + def test_activerelief(self): + widget = self.create() +@@ -913,6 +913,24 @@ + self.checkEnumParam(widget, 'orient', 'vertical', 'horizontal', + errmsg='bad orientation "{}": must be vertical or horizontal') + ++ def test_activate(self): ++ sb = self.create() ++ for e in ('arrow1', 'slider', 'arrow2'): ++ sb.activate(e) ++ sb.activate('') ++ self.assertRaises(TypeError, sb.activate) ++ self.assertRaises(TypeError, sb.activate, 'arrow1', 'arrow2') ++ ++ def test_set(self): ++ sb = self.create() ++ sb.set(0.2, 0.4) ++ self.assertEqual(sb.get(), (0.2, 0.4)) ++ self.assertRaises(TclError, sb.set, 'abc', 'def') ++ self.assertRaises(TclError, sb.set, 0.6, 'def') ++ self.assertRaises(TclError, sb.set, 0.6, None) ++ self.assertRaises(TclError, sb.set, 0.6) ++ self.assertRaises(TclError, sb.set, 0.6, 0.7, 0.8) ++ + + @add_standard_options(StandardOptionsTests) + class PanedWindowTest(AbstractWidgetTest, unittest.TestCase): +@@ -925,8 +943,8 @@ + ) + default_orient = 'horizontal' + +- def _create(self, **kwargs): +- return Tkinter.PanedWindow(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.PanedWindow(self.root, **kwargs) + + def test_handlepad(self): + widget = self.create() +@@ -974,8 +992,8 @@ + + def create2(self): + p = self.create() +- b = Tkinter.Button(p) +- c = Tkinter.Button(p) ++ b = tkinter.Button(p) ++ c = tkinter.Button(p) + p.add(b) + p.add(c) + return p, b, c +@@ -1083,8 +1101,8 @@ + ) + _conv_pixels = noconv_meth + +- def _create(self, **kwargs): +- return Tkinter.Menu(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Menu(self.root, **kwargs) + + def test_postcommand(self): + widget = self.create() +@@ -1132,8 +1150,8 @@ + + def test_entryconfigure_variable(self): + m1 = self.create() +- v1 = Tkinter.BooleanVar(self.root) +- v2 = Tkinter.BooleanVar(self.root) ++ v1 = tkinter.BooleanVar(self.root) ++ v2 = tkinter.BooleanVar(self.root) + m1.add_checkbutton(variable=v1, onvalue=True, offvalue=False, + label='Nonsense') + self.assertEqual(str(m1.entrycget(1, 'variable')), str(v1)) +@@ -1152,8 +1170,8 @@ + ) + _conv_pad_pixels = noconv_meth + +- def _create(self, **kwargs): +- return Tkinter.Message(self.root, **kwargs) ++ def create(self, **kwargs): ++ return tkinter.Message(self.root, **kwargs) + + def test_aspect(self): + widget = self.create() +diff -r ee879c0ffa11 Lib/lib-tk/test/test_ttk/support.py +--- a/Lib/lib-tk/test/test_ttk/support.py ++++ b/Lib/lib-tk/test/test_ttk/support.py +@@ -1,29 +1,44 @@ + import unittest +-import Tkinter ++import Tkinter as tkinter + +-def get_tk_root(): +- try: +- root = Tkinter._default_root +- except AttributeError: +- # it is possible to disable default root in Tkinter, although +- # I haven't seen people doing it (but apparently someone did it +- # here). +- root = None ++class AbstractTkTest: + +- if root is None: +- # create a new master only if there isn't one already +- root = Tkinter.Tk() ++ @classmethod ++ def setUpClass(cls): ++ cls._old_support_default_root = tkinter._support_default_root ++ destroy_default_root() ++ tkinter.NoDefaultRoot() ++ cls.root = tkinter.Tk() ++ cls.wantobjects = cls.root.wantobjects() ++ # De-maximize main window. ++ # Some window managers can maximize new windows. ++ cls.root.wm_state('normal') ++ try: ++ cls.root.wm_attributes('-zoomed', False) ++ except tkinter.TclError: ++ pass + +- return root ++ @classmethod ++ def tearDownClass(cls): ++ cls.root.update_idletasks() ++ cls.root.destroy() ++ cls.root = None ++ tkinter._default_root = None ++ tkinter._support_default_root = cls._old_support_default_root + +-def root_deiconify(): +- root = get_tk_root() +- root.deiconify() ++ def setUp(self): ++ self.root.deiconify() + +-def root_withdraw(): +- root = get_tk_root() +- root.withdraw() ++ def tearDown(self): ++ for w in self.root.winfo_children(): ++ w.destroy() ++ self.root.withdraw() + ++def destroy_default_root(): ++ if getattr(tkinter, '_default_root', None): ++ tkinter._default_root.update_idletasks() ++ tkinter._default_root.destroy() ++ tkinter._default_root = None + + def simulate_mouse_click(widget, x, y): + """Generate proper events to click at the x, y position (tries to act +@@ -45,7 +60,7 @@ + def get_tk_patchlevel(): + global _tk_patchlevel + if _tk_patchlevel is None: +- tcl = Tkinter.Tcl() ++ tcl = tkinter.Tcl() + patchlevel = [] + for x in tcl.call('info', 'patchlevel').split('.'): + try: +@@ -82,7 +97,7 @@ + def widget_eq(actual, expected): + if actual == expected: + return True +- if isinstance(actual, (str, Tkinter.Widget)): +- if isinstance(expected, (str, Tkinter.Widget)): ++ if isinstance(actual, (str, tkinter.Widget)): ++ if isinstance(expected, (str, tkinter.Widget)): + return str(actual) == str(expected) + return False +diff -r ee879c0ffa11 Lib/lib-tk/test/test_ttk/test_extensions.py +--- a/Lib/lib-tk/test/test_ttk/test_extensions.py ++++ b/Lib/lib-tk/test/test_ttk/test_extensions.py +@@ -1,62 +1,68 @@ + import sys + import unittest +-import Tkinter ++import Tkinter as tkinter + import ttk +-from test.test_support import requires, run_unittest +- +-import support ++from test.test_support import requires, run_unittest, swap_attr ++from test_ttk.support import AbstractTkTest, destroy_default_root + + requires('gui') + +-class LabeledScaleTest(unittest.TestCase): +- +- def setUp(self): +- support.root_deiconify() ++class LabeledScaleTest(AbstractTkTest, unittest.TestCase): + + def tearDown(self): +- support.root_withdraw() +- ++ self.root.update_idletasks() ++ super(LabeledScaleTest, self).tearDown() + + def test_widget_destroy(self): + # automatically created variable +- x = ttk.LabeledScale() ++ x = ttk.LabeledScale(self.root) + var = x._variable._name + x.destroy() +- self.assertRaises(Tkinter.TclError, x.tk.globalgetvar, var) ++ self.assertRaises(tkinter.TclError, x.tk.globalgetvar, var) + + # manually created variable +- myvar = Tkinter.DoubleVar() ++ myvar = tkinter.DoubleVar(self.root) + name = myvar._name +- x = ttk.LabeledScale(variable=myvar) ++ x = ttk.LabeledScale(self.root, variable=myvar) + x.destroy() +- if x.tk.wantobjects(): ++ if self.wantobjects: + self.assertEqual(x.tk.globalgetvar(name), myvar.get()) + else: + self.assertEqual(float(x.tk.globalgetvar(name)), myvar.get()) + del myvar +- self.assertRaises(Tkinter.TclError, x.tk.globalgetvar, name) ++ self.assertRaises(tkinter.TclError, x.tk.globalgetvar, name) + + # checking that the tracing callback is properly removed +- myvar = Tkinter.IntVar() ++ myvar = tkinter.IntVar(self.root) + # LabeledScale will start tracing myvar +- x = ttk.LabeledScale(variable=myvar) ++ x = ttk.LabeledScale(self.root, variable=myvar) + x.destroy() + # Unless the tracing callback was removed, creating a new + # LabeledScale with the same var will cause an error now. This + # happens because the variable will be set to (possibly) a new + # value which causes the tracing callback to be called and then + # it tries calling instance attributes not yet defined. +- ttk.LabeledScale(variable=myvar) ++ ttk.LabeledScale(self.root, variable=myvar) + if hasattr(sys, 'last_type'): +- self.assertNotEqual(sys.last_type, Tkinter.TclError) ++ self.assertNotEqual(sys.last_type, tkinter.TclError) + + ++ def test_initialization_no_master(self): ++ # no master passing ++ with swap_attr(tkinter, '_default_root', None), \ ++ swap_attr(tkinter, '_support_default_root', True): ++ try: ++ x = ttk.LabeledScale() ++ self.assertIsNotNone(tkinter._default_root) ++ self.assertEqual(x.master, tkinter._default_root) ++ self.assertEqual(x.tk, tkinter._default_root.tk) ++ x.destroy() ++ finally: ++ destroy_default_root() ++ + def test_initialization(self): + # master passing +- x = ttk.LabeledScale() +- self.assertEqual(x.master, Tkinter._default_root) +- x.destroy() +- master = Tkinter.Frame() ++ master = tkinter.Frame(self.root) + x = ttk.LabeledScale(master) + self.assertEqual(x.master, master) + x.destroy() +@@ -64,25 +70,25 @@ + # variable initialization/passing + passed_expected = (('0', 0), (0, 0), (10, 10), + (-1, -1), (sys.maxint + 1, sys.maxint + 1)) +- if x.tk.wantobjects(): ++ if self.wantobjects: + passed_expected += ((2.5, 2),) + for pair in passed_expected: +- x = ttk.LabeledScale(from_=pair[0]) ++ x = ttk.LabeledScale(self.root, from_=pair[0]) + self.assertEqual(x.value, pair[1]) + x.destroy() +- x = ttk.LabeledScale(from_='2.5') ++ x = ttk.LabeledScale(self.root, from_='2.5') + self.assertRaises(ValueError, x._variable.get) + x.destroy() +- x = ttk.LabeledScale(from_=None) ++ x = ttk.LabeledScale(self.root, from_=None) + self.assertRaises(ValueError, x._variable.get) + x.destroy() + # variable should have its default value set to the from_ value +- myvar = Tkinter.DoubleVar(value=20) +- x = ttk.LabeledScale(variable=myvar) ++ myvar = tkinter.DoubleVar(self.root, value=20) ++ x = ttk.LabeledScale(self.root, variable=myvar) + self.assertEqual(x.value, 0) + x.destroy() + # check that it is really using a DoubleVar +- x = ttk.LabeledScale(variable=myvar, from_=0.5) ++ x = ttk.LabeledScale(self.root, variable=myvar, from_=0.5) + self.assertEqual(x.value, 0.5) + self.assertEqual(x._variable._name, myvar._name) + x.destroy() +@@ -91,25 +97,26 @@ + def check_positions(scale, scale_pos, label, label_pos): + self.assertEqual(scale.pack_info()['side'], scale_pos) + self.assertEqual(label.place_info()['anchor'], label_pos) +- x = ttk.LabeledScale(compound='top') ++ x = ttk.LabeledScale(self.root, compound='top') + check_positions(x.scale, 'bottom', x.label, 'n') + x.destroy() +- x = ttk.LabeledScale(compound='bottom') ++ x = ttk.LabeledScale(self.root, compound='bottom') + check_positions(x.scale, 'top', x.label, 's') + x.destroy() +- x = ttk.LabeledScale(compound='unknown') # invert default positions ++ # invert default positions ++ x = ttk.LabeledScale(self.root, compound='unknown') + check_positions(x.scale, 'top', x.label, 's') + x.destroy() +- x = ttk.LabeledScale() # take default positions ++ x = ttk.LabeledScale(self.root) # take default positions + check_positions(x.scale, 'bottom', x.label, 'n') + x.destroy() + + # extra, and invalid, kwargs +- self.assertRaises(Tkinter.TclError, ttk.LabeledScale, a='b') ++ self.assertRaises(tkinter.TclError, ttk.LabeledScale, master, a='b') + + + def test_horizontal_range(self): +- lscale = ttk.LabeledScale(from_=0, to=10) ++ lscale = ttk.LabeledScale(self.root, from_=0, to=10) + lscale.pack() + lscale.wait_visibility() + lscale.update() +@@ -128,7 +135,7 @@ + self.assertNotEqual(prev_xcoord, curr_xcoord) + # the label widget should have been repositioned too + linfo_2 = lscale.label.place_info() +- self.assertEqual(lscale.label['text'], 0 if lscale.tk.wantobjects() else '0') ++ self.assertEqual(lscale.label['text'], 0 if self.wantobjects else '0') + self.assertEqual(curr_xcoord, int(linfo_2['x'])) + # change the range back + lscale.scale.configure(from_=0, to=10) +@@ -139,7 +146,7 @@ + + + def test_variable_change(self): +- x = ttk.LabeledScale() ++ x = ttk.LabeledScale(self.root) + x.pack() + x.wait_visibility() + x.update() +@@ -151,13 +158,13 @@ + # at the same time this shouldn't affect test outcome + x.update() + self.assertEqual(x.label['text'], +- newval if x.tk.wantobjects() else str(newval)) ++ newval if self.wantobjects else str(newval)) + self.assertGreater(x.scale.coords()[0], curr_xcoord) + self.assertEqual(x.scale.coords()[0], + int(x.label.place_info()['x'])) + + # value outside range +- if x.tk.wantobjects(): ++ if self.wantobjects: + conv = lambda x: x + else: + conv = int +@@ -171,7 +178,7 @@ + + + def test_resize(self): +- x = ttk.LabeledScale() ++ x = ttk.LabeledScale(self.root) + x.pack(expand=True, fill='both') + x.wait_visibility() + x.update() +@@ -190,33 +197,33 @@ + x.destroy() + + +-class OptionMenuTest(unittest.TestCase): ++class OptionMenuTest(AbstractTkTest, unittest.TestCase): + + def setUp(self): +- support.root_deiconify() +- self.textvar = Tkinter.StringVar() ++ super(OptionMenuTest, self).setUp() ++ self.textvar = tkinter.StringVar(self.root) + + def tearDown(self): + del self.textvar +- support.root_withdraw() ++ super(OptionMenuTest, self).tearDown() + + + def test_widget_destroy(self): +- var = Tkinter.StringVar() +- optmenu = ttk.OptionMenu(None, var) ++ var = tkinter.StringVar(self.root) ++ optmenu = ttk.OptionMenu(self.root, var) + name = var._name + optmenu.update_idletasks() + optmenu.destroy() + self.assertEqual(optmenu.tk.globalgetvar(name), var.get()) + del var +- self.assertRaises(Tkinter.TclError, optmenu.tk.globalgetvar, name) ++ self.assertRaises(tkinter.TclError, optmenu.tk.globalgetvar, name) + + + def test_initialization(self): +- self.assertRaises(Tkinter.TclError, +- ttk.OptionMenu, None, self.textvar, invalid='thing') ++ self.assertRaises(tkinter.TclError, ++ ttk.OptionMenu, self.root, self.textvar, invalid='thing') + +- optmenu = ttk.OptionMenu(None, self.textvar, 'b', 'a', 'b') ++ optmenu = ttk.OptionMenu(self.root, self.textvar, 'b', 'a', 'b') + self.assertEqual(optmenu._variable.get(), 'b') + + self.assertTrue(optmenu['menu']) +@@ -228,7 +235,7 @@ + def test_menu(self): + items = ('a', 'b', 'c') + default = 'a' +- optmenu = ttk.OptionMenu(None, self.textvar, default, *items) ++ optmenu = ttk.OptionMenu(self.root, self.textvar, default, *items) + found_default = False + for i in range(len(items)): + value = optmenu['menu'].entrycget(i, 'value') +@@ -240,7 +247,7 @@ + + # default shouldn't be in menu if it is not part of values + default = 'd' +- optmenu = ttk.OptionMenu(None, self.textvar, default, *items) ++ optmenu = ttk.OptionMenu(self.root, self.textvar, default, *items) + curr = None + i = 0 + while True: +@@ -259,7 +266,7 @@ + self.assertEqual(optmenu._variable.get(), items[0]) + + # changing to an invalid index shouldn't change the variable +- self.assertRaises(Tkinter.TclError, optmenu['menu'].invoke, -1) ++ self.assertRaises(tkinter.TclError, optmenu['menu'].invoke, -1) + self.assertEqual(optmenu._variable.get(), items[0]) + + optmenu.destroy() +@@ -269,7 +276,7 @@ + def cb_test(item): + self.assertEqual(item, items[1]) + success.append(True) +- optmenu = ttk.OptionMenu(None, self.textvar, 'a', command=cb_test, ++ optmenu = ttk.OptionMenu(self.root, self.textvar, 'a', command=cb_test, + *items) + optmenu['menu'].invoke(1) + if not success: +diff -r ee879c0ffa11 Lib/lib-tk/test/test_ttk/test_functions.py +--- a/Lib/lib-tk/test/test_ttk/test_functions.py ++++ b/Lib/lib-tk/test/test_ttk/test_functions.py +@@ -324,26 +324,13 @@ + "-opt {3 2m}") + + +- def test_dict_from_tcltuple(self): +- fakettuple = ('-a', '{1 2 3}', '-something', 'foo') +- +- self.assertEqual(ttk._dict_from_tcltuple(fakettuple, False), +- {'-a': '{1 2 3}', '-something': 'foo'}) +- +- self.assertEqual(ttk._dict_from_tcltuple(fakettuple), +- {'a': '{1 2 3}', 'something': 'foo'}) +- +- # passing a tuple with a single item should return an empty dict, +- # since it tries to break the tuple by pairs. +- self.assertFalse(ttk._dict_from_tcltuple(('single', ))) +- +- sspec = MockStateSpec('a', 'b') +- self.assertEqual(ttk._dict_from_tcltuple(('-a', (sspec, 'val'))), +- {'a': [('a', 'b', 'val')]}) +- +- self.assertEqual(ttk._dict_from_tcltuple((MockTclObj('-padding'), +- [MockTclObj('1'), 2, MockTclObj('3m')])), +- {'padding': [1, 2, '3m']}) ++ def test_tclobj_to_py(self): ++ self.assertEqual( ++ ttk._tclobj_to_py((MockStateSpec('a', 'b'), 'val')), ++ [('a', 'b', 'val')]) ++ self.assertEqual( ++ ttk._tclobj_to_py([MockTclObj('1'), 2, MockTclObj('3m')]), ++ [1, 2, '3m']) + + + def test_list_from_statespec(self): +diff -r ee879c0ffa11 Lib/lib-tk/test/test_ttk/test_style.py +--- a/Lib/lib-tk/test/test_ttk/test_style.py ++++ b/Lib/lib-tk/test/test_ttk/test_style.py +@@ -1,16 +1,16 @@ + import unittest +-import Tkinter ++import Tkinter as tkinter + import ttk + from test.test_support import requires, run_unittest +- +-import support ++from test_ttk.support import AbstractTkTest + + requires('gui') + +-class StyleTest(unittest.TestCase): ++class StyleTest(AbstractTkTest, unittest.TestCase): + + def setUp(self): +- self.style = ttk.Style() ++ super(StyleTest, self).setUp() ++ self.style = ttk.Style(self.root) + + + def test_configure(self): +@@ -25,7 +25,7 @@ + style = self.style + style.map('TButton', background=[('active', 'background', 'blue')]) + self.assertEqual(style.map('TButton', 'background'), +- [('active', 'background', 'blue')] if style.tk.wantobjects() else ++ [('active', 'background', 'blue')] if self.wantobjects else + [('active background', 'blue')]) + self.assertIsInstance(style.map('TButton'), dict) + +@@ -44,7 +44,7 @@ + + def test_layout(self): + style = self.style +- self.assertRaises(Tkinter.TclError, style.layout, 'NotALayout') ++ self.assertRaises(tkinter.TclError, style.layout, 'NotALayout') + tv_style = style.layout('Treeview') + + # "erase" Treeview layout +@@ -61,12 +61,12 @@ + self.assertIsInstance(style.layout('TButton'), list) + + # correct layout, but "option" doesn't exist as option +- self.assertRaises(Tkinter.TclError, style.layout, 'Treeview', ++ self.assertRaises(tkinter.TclError, style.layout, 'Treeview', + [('name', {'option': 'inexistent'})]) + + + def test_theme_use(self): +- self.assertRaises(Tkinter.TclError, self.style.theme_use, ++ self.assertRaises(tkinter.TclError, self.style.theme_use, + 'nonexistingname') + + curr_theme = self.style.theme_use() +diff -r ee879c0ffa11 Lib/lib-tk/test/test_ttk/test_widgets.py +--- a/Lib/lib-tk/test/test_ttk/test_widgets.py ++++ b/Lib/lib-tk/test/test_ttk/test_widgets.py +@@ -1,12 +1,13 @@ + import unittest +-import Tkinter ++import Tkinter as tkinter ++from Tkinter import TclError + import ttk + from test.test_support import requires, run_unittest + import sys + +-import support +-from test_functions import MockTclObj, MockStateSpec +-from support import tcl_version, get_tk_patchlevel ++from test_functions import MockTclObj ++from support import (AbstractTkTest, tcl_version, get_tk_patchlevel, ++ simulate_mouse_click) + from widget_tests import (add_standard_options, noconv, noconv_meth, + AbstractWidgetTest, StandardOptionsTests, + IntegerSizeTests, PixelSizeTests, +@@ -54,19 +55,15 @@ + pass + + +-class WidgetTest(unittest.TestCase): ++class WidgetTest(AbstractTkTest, unittest.TestCase): + """Tests methods available in every ttk widget.""" + + def setUp(self): +- support.root_deiconify() +- self.widget = ttk.Button(width=0, text="Text") ++ super(WidgetTest, self).setUp() ++ self.widget = ttk.Button(self.root, width=0, text="Text") + self.widget.pack() + self.widget.wait_visibility() + +- def tearDown(self): +- self.widget.destroy() +- support.root_withdraw() +- + + def test_identify(self): + self.widget.update_idletasks() +@@ -76,9 +73,9 @@ + ), "label") + self.assertEqual(self.widget.identify(-1, -1), "") + +- self.assertRaises(Tkinter.TclError, self.widget.identify, None, 5) +- self.assertRaises(Tkinter.TclError, self.widget.identify, 5, None) +- self.assertRaises(Tkinter.TclError, self.widget.identify, 5, '') ++ self.assertRaises(tkinter.TclError, self.widget.identify, None, 5) ++ self.assertRaises(tkinter.TclError, self.widget.identify, 5, None) ++ self.assertRaises(tkinter.TclError, self.widget.identify, 5, '') + + + def test_widget_state(self): +@@ -105,9 +102,9 @@ + + # attempt to set invalid statespec + currstate = self.widget.state() +- self.assertRaises(Tkinter.TclError, self.widget.instate, ++ self.assertRaises(tkinter.TclError, self.widget.instate, + ['badstate']) +- self.assertRaises(Tkinter.TclError, self.widget.instate, ++ self.assertRaises(tkinter.TclError, self.widget.instate, + ['disabled', 'badstate']) + # verify that widget didn't change its state + self.assertEqual(currstate, self.widget.state()) +@@ -129,7 +126,7 @@ + 'width', + ) + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Frame(self.root, **kwargs) + + +@@ -142,7 +139,7 @@ + 'text', 'underline', 'width', + ) + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.LabelFrame(self.root, **kwargs) + + def test_labelanchor(self): +@@ -162,8 +159,8 @@ + class AbstractLabelTest(AbstractWidgetTest): + + def checkImageParam(self, widget, name): +- image = Tkinter.PhotoImage('image1') +- image2 = Tkinter.PhotoImage('image2') ++ image = tkinter.PhotoImage(master=self.root, name='image1') ++ image2 = tkinter.PhotoImage(master=self.root, name='image2') + self.checkParam(widget, name, image, expected=('image1',)) + self.checkParam(widget, name, 'image1', expected=('image1',)) + self.checkParam(widget, name, (image,), expected=('image1',)) +@@ -200,7 +197,7 @@ + ) + _conv_pixels = noconv_meth + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Label(self.root, **kwargs) + + def test_font(self): +@@ -217,7 +214,7 @@ + 'underline', 'width', + ) + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Button(self.root, **kwargs) + + def test_default(self): +@@ -226,7 +223,7 @@ + + def test_invoke(self): + success = [] +- btn = ttk.Button(command=lambda: success.append(1)) ++ btn = ttk.Button(self.root, command=lambda: success.append(1)) + btn.invoke() + self.assertTrue(success) + +@@ -242,7 +239,7 @@ + 'underline', 'variable', 'width', + ) + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Checkbutton(self.root, **kwargs) + + def test_offvalue(self): +@@ -259,11 +256,11 @@ + success.append(1) + return "cb test called" + +- cbtn = ttk.Checkbutton(command=cb_test) ++ cbtn = ttk.Checkbutton(self.root, command=cb_test) + # the variable automatically created by ttk.Checkbutton is actually + # undefined till we invoke the Checkbutton + self.assertEqual(cbtn.state(), ('alternate', )) +- self.assertRaises(Tkinter.TclError, cbtn.tk.globalgetvar, ++ self.assertRaises(tkinter.TclError, cbtn.tk.globalgetvar, + cbtn['variable']) + + res = cbtn.invoke() +@@ -290,15 +287,9 @@ + + def setUp(self): + super(ComboboxTest, self).setUp() +- support.root_deiconify() + self.combo = self.create() + +- def tearDown(self): +- self.combo.destroy() +- support.root_withdraw() +- super(ComboboxTest, self).tearDown() +- +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Combobox(self.root, **kwargs) + + def test_height(self): +@@ -400,13 +391,13 @@ + r'a\\tb {"a"} \}\ \{') + + # out of range +- self.assertRaises(Tkinter.TclError, self.combo.current, ++ self.assertRaises(tkinter.TclError, self.combo.current, + len(self.combo['values'])) + # it expects an integer (or something that can be converted to int) +- self.assertRaises(Tkinter.TclError, self.combo.current, '') ++ self.assertRaises(tkinter.TclError, self.combo.current, '') + + # testing creating combobox with empty string in values +- combo2 = ttk.Combobox(values=[1, 2, '']) ++ combo2 = ttk.Combobox(self.root, values=[1, 2, '']) + self.assertEqual(combo2['values'], + ('1', '2', '') if self.wantobjects else '1 2 {}') + combo2.destroy() +@@ -424,15 +415,9 @@ + + def setUp(self): + super(EntryTest, self).setUp() +- support.root_deiconify() + self.entry = self.create() + +- def tearDown(self): +- self.entry.destroy() +- support.root_withdraw() +- super(EntryTest, self).tearDown() +- +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Entry(self.root, **kwargs) + + def test_invalidcommand(self): +@@ -462,8 +447,8 @@ + + def test_bbox(self): + self.assertIsBoundingBox(self.entry.bbox(0)) +- self.assertRaises(Tkinter.TclError, self.entry.bbox, 'noindex') +- self.assertRaises(Tkinter.TclError, self.entry.bbox, None) ++ self.assertRaises(tkinter.TclError, self.entry.bbox, 'noindex') ++ self.assertRaises(tkinter.TclError, self.entry.bbox, None) + + + def test_identify(self): +@@ -474,9 +459,9 @@ + self.assertEqual(self.entry.identify(5, 5), "textarea") + self.assertEqual(self.entry.identify(-1, -1), "") + +- self.assertRaises(Tkinter.TclError, self.entry.identify, None, 5) +- self.assertRaises(Tkinter.TclError, self.entry.identify, 5, None) +- self.assertRaises(Tkinter.TclError, self.entry.identify, 5, '') ++ self.assertRaises(tkinter.TclError, self.entry.identify, None, 5) ++ self.assertRaises(tkinter.TclError, self.entry.identify, 5, None) ++ self.assertRaises(tkinter.TclError, self.entry.identify, 5, '') + + + def test_validation_options(self): +@@ -504,7 +489,7 @@ + self.assertEqual(len(success), 1) + + self.entry['validatecommand'] = True +- self.assertRaises(Tkinter.TclError, self.entry.validate) ++ self.assertRaises(tkinter.TclError, self.entry.validate) + + + def test_validation(self): +@@ -559,15 +544,9 @@ + + def setUp(self): + super(PanedWindowTest, self).setUp() +- support.root_deiconify() + self.paned = self.create() + +- def tearDown(self): +- self.paned.destroy() +- support.root_withdraw() +- super(PanedWindowTest, self).tearDown() +- +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.PanedWindow(self.root, **kwargs) + + def test_orient(self): +@@ -585,49 +564,49 @@ + # attempt to add a child that is not a direct child of the paned window + label = ttk.Label(self.paned) + child = ttk.Label(label) +- self.assertRaises(Tkinter.TclError, self.paned.add, child) ++ self.assertRaises(tkinter.TclError, self.paned.add, child) + label.destroy() + child.destroy() + # another attempt +- label = ttk.Label() ++ label = ttk.Label(self.root) + child = ttk.Label(label) +- self.assertRaises(Tkinter.TclError, self.paned.add, child) ++ self.assertRaises(tkinter.TclError, self.paned.add, child) + child.destroy() + label.destroy() + +- good_child = ttk.Label() ++ good_child = ttk.Label(self.root) + self.paned.add(good_child) + # re-adding a child is not accepted +- self.assertRaises(Tkinter.TclError, self.paned.add, good_child) ++ self.assertRaises(tkinter.TclError, self.paned.add, good_child) + + other_child = ttk.Label(self.paned) + self.paned.add(other_child) + self.assertEqual(self.paned.pane(0), self.paned.pane(1)) +- self.assertRaises(Tkinter.TclError, self.paned.pane, 2) ++ self.assertRaises(tkinter.TclError, self.paned.pane, 2) + good_child.destroy() + other_child.destroy() +- self.assertRaises(Tkinter.TclError, self.paned.pane, 0) ++ self.assertRaises(tkinter.TclError, self.paned.pane, 0) + + + def test_forget(self): +- self.assertRaises(Tkinter.TclError, self.paned.forget, None) +- self.assertRaises(Tkinter.TclError, self.paned.forget, 0) ++ self.assertRaises(tkinter.TclError, self.paned.forget, None) ++ self.assertRaises(tkinter.TclError, self.paned.forget, 0) + +- self.paned.add(ttk.Label()) ++ self.paned.add(ttk.Label(self.root)) + self.paned.forget(0) +- self.assertRaises(Tkinter.TclError, self.paned.forget, 0) ++ self.assertRaises(tkinter.TclError, self.paned.forget, 0) + + + def test_insert(self): +- self.assertRaises(Tkinter.TclError, self.paned.insert, None, 0) +- self.assertRaises(Tkinter.TclError, self.paned.insert, 0, None) +- self.assertRaises(Tkinter.TclError, self.paned.insert, 0, 0) ++ self.assertRaises(tkinter.TclError, self.paned.insert, None, 0) ++ self.assertRaises(tkinter.TclError, self.paned.insert, 0, None) ++ self.assertRaises(tkinter.TclError, self.paned.insert, 0, 0) + +- child = ttk.Label() +- child2 = ttk.Label() +- child3 = ttk.Label() ++ child = ttk.Label(self.root) ++ child2 = ttk.Label(self.root) ++ child3 = ttk.Label(self.root) + +- self.assertRaises(Tkinter.TclError, self.paned.insert, 0, child) ++ self.assertRaises(tkinter.TclError, self.paned.insert, 0, child) + + self.paned.insert('end', child2) + self.paned.insert(0, child) +@@ -654,9 +633,9 @@ + + + def test_pane(self): +- self.assertRaises(Tkinter.TclError, self.paned.pane, 0) ++ self.assertRaises(tkinter.TclError, self.paned.pane, 0) + +- child = ttk.Label() ++ child = ttk.Label(self.root) + self.paned.add(child) + self.assertIsInstance(self.paned.pane(0), dict) + self.assertEqual(self.paned.pane(0, weight=None), +@@ -666,21 +645,21 @@ + 0 if self.wantobjects else '0') + self.assertEqual(self.paned.pane(0), self.paned.pane(str(child))) + +- self.assertRaises(Tkinter.TclError, self.paned.pane, 0, ++ self.assertRaises(tkinter.TclError, self.paned.pane, 0, + badoption='somevalue') + + + def test_sashpos(self): +- self.assertRaises(Tkinter.TclError, self.paned.sashpos, None) +- self.assertRaises(Tkinter.TclError, self.paned.sashpos, '') +- self.assertRaises(Tkinter.TclError, self.paned.sashpos, 0) ++ self.assertRaises(tkinter.TclError, self.paned.sashpos, None) ++ self.assertRaises(tkinter.TclError, self.paned.sashpos, '') ++ self.assertRaises(tkinter.TclError, self.paned.sashpos, 0) + + child = ttk.Label(self.paned, text='a') + self.paned.add(child, weight=1) +- self.assertRaises(Tkinter.TclError, self.paned.sashpos, 0) ++ self.assertRaises(tkinter.TclError, self.paned.sashpos, 0) + child2 = ttk.Label(self.paned, text='b') + self.paned.add(child2) +- self.assertRaises(Tkinter.TclError, self.paned.sashpos, 1) ++ self.assertRaises(tkinter.TclError, self.paned.sashpos, 1) + + self.paned.pack(expand=True, fill='both') + self.paned.wait_visibility() +@@ -701,7 +680,7 @@ + 'underline', 'value', 'variable', 'width', + ) + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Radiobutton(self.root, **kwargs) + + def test_value(self): +@@ -714,9 +693,11 @@ + success.append(1) + return "cb test called" + +- myvar = Tkinter.IntVar() +- cbtn = ttk.Radiobutton(command=cb_test, variable=myvar, value=0) +- cbtn2 = ttk.Radiobutton(command=cb_test, variable=myvar, value=1) ++ myvar = tkinter.IntVar(self.root) ++ cbtn = ttk.Radiobutton(self.root, command=cb_test, ++ variable=myvar, value=0) ++ cbtn2 = ttk.Radiobutton(self.root, command=cb_test, ++ variable=myvar, value=1) + + if self.wantobjects: + conv = lambda x: x +@@ -749,7 +730,7 @@ + 'underline', 'width', + ) + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Menubutton(self.root, **kwargs) + + def test_direction(self): +@@ -759,7 +740,7 @@ + + def test_menu(self): + widget = self.create() +- menu = Tkinter.Menu(widget, name='menu') ++ menu = tkinter.Menu(widget, name='menu') + self.checkParam(widget, 'menu', menu, conv=str) + menu.destroy() + +@@ -775,17 +756,11 @@ + + def setUp(self): + super(ScaleTest, self).setUp() +- support.root_deiconify() + self.scale = self.create() + self.scale.pack() + self.scale.update() + +- def tearDown(self): +- self.scale.destroy() +- support.root_withdraw() +- super(ScaleTest, self).tearDown() +- +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Scale(self.root, **kwargs) + + def test_from(self): +@@ -837,8 +812,8 @@ + self.scale['value'] = 30 + self.assertEqual(self.scale.get(), self.scale['value']) + +- self.assertRaises(Tkinter.TclError, self.scale.get, '', 0) +- self.assertRaises(Tkinter.TclError, self.scale.get, 0, '') ++ self.assertRaises(tkinter.TclError, self.scale.get, '', 0) ++ self.assertRaises(tkinter.TclError, self.scale.get, 0, '') + + + def test_set(self): +@@ -857,7 +832,7 @@ + self.assertEqual(conv(self.scale.get()), min) + + # changing directly the variable doesn't impose this limitation tho +- var = Tkinter.DoubleVar() ++ var = tkinter.DoubleVar(self.root) + self.scale['variable'] = var + var.set(max + 5) + self.assertEqual(conv(self.scale.get()), var.get()) +@@ -874,7 +849,7 @@ + self.assertEqual(conv(self.scale.get(0, 0)), min) + self.assertEqual(conv(self.scale.get(self.scale.winfo_width(), 0)), max) + +- self.assertRaises(Tkinter.TclError, self.scale.set, None) ++ self.assertRaises(tkinter.TclError, self.scale.set, None) + + + @add_standard_options(StandardTtkOptionsTests) +@@ -887,7 +862,7 @@ + _conv_pixels = noconv_meth + default_orient = 'horizontal' + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Progressbar(self.root, **kwargs) + + def test_length(self): +@@ -921,7 +896,7 @@ + ) + default_orient = 'vertical' + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Scrollbar(self.root, **kwargs) + + +@@ -933,27 +908,19 @@ + + def setUp(self): + super(NotebookTest, self).setUp() +- support.root_deiconify() + self.nb = self.create(padding=0) +- self.child1 = ttk.Label() +- self.child2 = ttk.Label() ++ self.child1 = ttk.Label(self.root) ++ self.child2 = ttk.Label(self.root) + self.nb.add(self.child1, text='a') + self.nb.add(self.child2, text='b') + +- def tearDown(self): +- self.child1.destroy() +- self.child2.destroy() +- self.nb.destroy() +- support.root_withdraw() +- super(NotebookTest, self).tearDown() +- +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Notebook(self.root, **kwargs) + + def test_tab_identifiers(self): + self.nb.forget(0) + self.nb.hide(self.child2) +- self.assertRaises(Tkinter.TclError, self.nb.tab, self.child1) ++ self.assertRaises(tkinter.TclError, self.nb.tab, self.child1) + self.assertEqual(self.nb.index('end'), 1) + self.nb.add(self.child2) + self.assertEqual(self.nb.index('end'), 1) +@@ -974,7 +941,7 @@ + try: + if self.nb.tab('@%d, 5' % i, text=None) == 'a': + break +- except Tkinter.TclError: ++ except tkinter.TclError: + pass + + else: +@@ -982,11 +949,11 @@ + + + def test_add_and_hidden(self): +- self.assertRaises(Tkinter.TclError, self.nb.hide, -1) +- self.assertRaises(Tkinter.TclError, self.nb.hide, 'hi') +- self.assertRaises(Tkinter.TclError, self.nb.hide, None) +- self.assertRaises(Tkinter.TclError, self.nb.add, None) +- self.assertRaises(Tkinter.TclError, self.nb.add, ttk.Label(), ++ self.assertRaises(tkinter.TclError, self.nb.hide, -1) ++ self.assertRaises(tkinter.TclError, self.nb.hide, 'hi') ++ self.assertRaises(tkinter.TclError, self.nb.hide, None) ++ self.assertRaises(tkinter.TclError, self.nb.add, None) ++ self.assertRaises(tkinter.TclError, self.nb.add, ttk.Label(self.root), + unknown='option') + + tabs = self.nb.tabs() +@@ -994,7 +961,7 @@ + self.nb.add(self.child1) + self.assertEqual(self.nb.tabs(), tabs) + +- child = ttk.Label() ++ child = ttk.Label(self.root) + self.nb.add(child, text='c') + tabs = self.nb.tabs() + +@@ -1011,9 +978,9 @@ + + + def test_forget(self): +- self.assertRaises(Tkinter.TclError, self.nb.forget, -1) +- self.assertRaises(Tkinter.TclError, self.nb.forget, 'hi') +- self.assertRaises(Tkinter.TclError, self.nb.forget, None) ++ self.assertRaises(tkinter.TclError, self.nb.forget, -1) ++ self.assertRaises(tkinter.TclError, self.nb.forget, 'hi') ++ self.assertRaises(tkinter.TclError, self.nb.forget, None) + + tabs = self.nb.tabs() + child1_index = self.nb.index(self.child1) +@@ -1027,8 +994,8 @@ + + + def test_index(self): +- self.assertRaises(Tkinter.TclError, self.nb.index, -1) +- self.assertRaises(Tkinter.TclError, self.nb.index, None) ++ self.assertRaises(tkinter.TclError, self.nb.index, -1) ++ self.assertRaises(tkinter.TclError, self.nb.index, None) + + self.assertIsInstance(self.nb.index('end'), int) + self.assertEqual(self.nb.index(self.child1), 0) +@@ -1048,11 +1015,11 @@ + self.nb.insert('end', 0) + self.assertEqual(self.nb.tabs(), tabs) + # bad moves +- self.assertRaises(Tkinter.TclError, self.nb.insert, 2, tabs[0]) +- self.assertRaises(Tkinter.TclError, self.nb.insert, -1, tabs[0]) ++ self.assertRaises(tkinter.TclError, self.nb.insert, 2, tabs[0]) ++ self.assertRaises(tkinter.TclError, self.nb.insert, -1, tabs[0]) + + # new tab +- child3 = ttk.Label() ++ child3 = ttk.Label(self.root) + self.nb.insert(1, child3) + self.assertEqual(self.nb.tabs(), (tabs[0], str(child3), tabs[1])) + self.nb.forget(child3) +@@ -1060,13 +1027,13 @@ + self.nb.insert(self.child1, child3) + self.assertEqual(self.nb.tabs(), (str(child3), ) + tabs) + self.nb.forget(child3) +- self.assertRaises(Tkinter.TclError, self.nb.insert, 2, child3) +- self.assertRaises(Tkinter.TclError, self.nb.insert, -1, child3) ++ self.assertRaises(tkinter.TclError, self.nb.insert, 2, child3) ++ self.assertRaises(tkinter.TclError, self.nb.insert, -1, child3) + + # bad inserts +- self.assertRaises(Tkinter.TclError, self.nb.insert, 'end', None) +- self.assertRaises(Tkinter.TclError, self.nb.insert, None, 0) +- self.assertRaises(Tkinter.TclError, self.nb.insert, None, None) ++ self.assertRaises(tkinter.TclError, self.nb.insert, 'end', None) ++ self.assertRaises(tkinter.TclError, self.nb.insert, None, 0) ++ self.assertRaises(tkinter.TclError, self.nb.insert, None, None) + + + def test_select(self): +@@ -1090,9 +1057,9 @@ + + + def test_tab(self): +- self.assertRaises(Tkinter.TclError, self.nb.tab, -1) +- self.assertRaises(Tkinter.TclError, self.nb.tab, 'notab') +- self.assertRaises(Tkinter.TclError, self.nb.tab, None) ++ self.assertRaises(tkinter.TclError, self.nb.tab, -1) ++ self.assertRaises(tkinter.TclError, self.nb.tab, 'notab') ++ self.assertRaises(tkinter.TclError, self.nb.tab, None) + + self.assertIsInstance(self.nb.tab(self.child1), dict) + self.assertEqual(self.nb.tab(self.child1, text=None), 'a') +@@ -1118,7 +1085,7 @@ + + self.nb.select(0) + +- support.simulate_mouse_click(self.nb, 5, 5) ++ simulate_mouse_click(self.nb, 5, 5) + self.nb.focus_force() + self.nb.event_generate('') + self.assertEqual(self.nb.select(), str(self.child2)) +@@ -1132,7 +1099,7 @@ + self.nb.tab(self.child1, text='a', underline=0) + self.nb.enable_traversal() + self.nb.focus_force() +- support.simulate_mouse_click(self.nb, 5, 5) ++ simulate_mouse_click(self.nb, 5, 5) + if sys.platform == 'darwin': + self.nb.event_generate('') + else: +@@ -1150,15 +1117,9 @@ + + def setUp(self): + super(TreeviewTest, self).setUp() +- support.root_deiconify() + self.tv = self.create(padding=0) + +- def tearDown(self): +- self.tv.destroy() +- support.root_withdraw() +- super(TreeviewTest, self).tearDown() +- +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Treeview(self.root, **kwargs) + + def test_columns(self): +@@ -1246,7 +1207,7 @@ + + # child3 has child2 as parent, thus trying to set child2 as a children + # of child3 should result in an error +- self.assertRaises(Tkinter.TclError, ++ self.assertRaises(tkinter.TclError, + self.tv.set_children, child3, child2) + + # remove child2 children +@@ -1272,20 +1233,20 @@ + self.assertEqual(self.tv.column('#0', width=None), + 10 if self.wantobjects else '10') + # check read-only option +- self.assertRaises(Tkinter.TclError, self.tv.column, '#0', id='X') ++ self.assertRaises(tkinter.TclError, self.tv.column, '#0', id='X') + +- self.assertRaises(Tkinter.TclError, self.tv.column, 'invalid') ++ self.assertRaises(tkinter.TclError, self.tv.column, 'invalid') + invalid_kws = [ + {'unknown_option': 'some value'}, {'stretch': 'wrong'}, + {'anchor': 'wrong'}, {'width': 'wrong'}, {'minwidth': 'wrong'} + ] + for kw in invalid_kws: +- self.assertRaises(Tkinter.TclError, self.tv.column, '#0', ++ self.assertRaises(tkinter.TclError, self.tv.column, '#0', + **kw) + + + def test_delete(self): +- self.assertRaises(Tkinter.TclError, self.tv.delete, '#0') ++ self.assertRaises(tkinter.TclError, self.tv.delete, '#0') + + item_id = self.tv.insert('', 'end') + item2 = self.tv.insert(item_id, 'end') +@@ -1296,7 +1257,7 @@ + self.assertFalse(self.tv.get_children()) + + # reattach should fail +- self.assertRaises(Tkinter.TclError, ++ self.assertRaises(tkinter.TclError, + self.tv.reattach, item_id, '', 'end') + + # test multiple item delete +@@ -1335,13 +1296,13 @@ + self.assertEqual(self.tv.get_children(item_id), ()) + + # bad values +- self.assertRaises(Tkinter.TclError, ++ self.assertRaises(tkinter.TclError, + self.tv.reattach, 'nonexistent', '', 'end') +- self.assertRaises(Tkinter.TclError, ++ self.assertRaises(tkinter.TclError, + self.tv.detach, 'nonexistent') +- self.assertRaises(Tkinter.TclError, ++ self.assertRaises(tkinter.TclError, + self.tv.reattach, item2, 'otherparent', 'end') +- self.assertRaises(Tkinter.TclError, ++ self.assertRaises(tkinter.TclError, + self.tv.reattach, item2, '', 'invalid') + + # multiple detach +@@ -1358,7 +1319,7 @@ + # the following will make a tk.call equivalent to + # tk.call(treeview, "exists") which should result in an error + # in the tcl interpreter since tk requires an item. +- self.assertRaises(Tkinter.TclError, self.tv.exists, None) ++ self.assertRaises(tkinter.TclError, self.tv.exists, None) + + + def test_focus(self): +@@ -1373,7 +1334,7 @@ + self.assertEqual(self.tv.focus(), '') + + # try focusing inexistent item +- self.assertRaises(Tkinter.TclError, self.tv.focus, 'hi') ++ self.assertRaises(tkinter.TclError, self.tv.focus, 'hi') + + + def test_heading(self): +@@ -1386,15 +1347,15 @@ + self.assertEqual(self.tv.heading('#0', text=None), 'hi') + + # invalid option +- self.assertRaises(Tkinter.TclError, self.tv.heading, '#0', ++ self.assertRaises(tkinter.TclError, self.tv.heading, '#0', + background=None) + # invalid value +- self.assertRaises(Tkinter.TclError, self.tv.heading, '#0', ++ self.assertRaises(tkinter.TclError, self.tv.heading, '#0', + anchor=1) + + def test_heading_callback(self): + def simulate_heading_click(x, y): +- support.simulate_mouse_click(self.tv, x, y) ++ simulate_mouse_click(self.tv, x, y) + self.tv.update() + + success = [] # no success for now +@@ -1428,7 +1389,7 @@ + + def test_index(self): + # item 'what' doesn't exist +- self.assertRaises(Tkinter.TclError, self.tv.index, 'what') ++ self.assertRaises(tkinter.TclError, self.tv.index, 'what') + + self.assertEqual(self.tv.index(''), 0) + +@@ -1454,30 +1415,30 @@ + + # but it fails after item has been deleted + self.tv.delete(item1) +- self.assertRaises(Tkinter.TclError, self.tv.index, c2) ++ self.assertRaises(tkinter.TclError, self.tv.index, c2) + + + def test_insert_item(self): + # parent 'none' doesn't exist +- self.assertRaises(Tkinter.TclError, self.tv.insert, 'none', 'end') ++ self.assertRaises(tkinter.TclError, self.tv.insert, 'none', 'end') + + # open values +- self.assertRaises(Tkinter.TclError, self.tv.insert, '', 'end', ++ self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end', + open='') +- self.assertRaises(Tkinter.TclError, self.tv.insert, '', 'end', ++ self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end', + open='please') + self.assertFalse(self.tv.delete(self.tv.insert('', 'end', open=True))) + self.assertFalse(self.tv.delete(self.tv.insert('', 'end', open=False))) + + # invalid index +- self.assertRaises(Tkinter.TclError, self.tv.insert, '', 'middle') ++ self.assertRaises(tkinter.TclError, self.tv.insert, '', 'middle') + + # trying to duplicate item id is invalid + itemid = self.tv.insert('', 'end', 'first-item') + self.assertEqual(itemid, 'first-item') +- self.assertRaises(Tkinter.TclError, self.tv.insert, '', 'end', ++ self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end', + 'first-item') +- self.assertRaises(Tkinter.TclError, self.tv.insert, '', 'end', ++ self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end', + MockTclObj('first-item')) + + # unicode values +@@ -1551,11 +1512,11 @@ + {'B': 123} if self.wantobjects else {'B': '123'}) + + # inexistent column +- self.assertRaises(Tkinter.TclError, self.tv.set, item, 'A') +- self.assertRaises(Tkinter.TclError, self.tv.set, item, 'A', 'b') ++ self.assertRaises(tkinter.TclError, self.tv.set, item, 'A') ++ self.assertRaises(tkinter.TclError, self.tv.set, item, 'A', 'b') + + # inexistent item +- self.assertRaises(Tkinter.TclError, self.tv.set, 'notme') ++ self.assertRaises(tkinter.TclError, self.tv.set, 'notme') + + + def test_tag_bind(self): +@@ -1583,7 +1544,7 @@ + + self.assertEqual(len(pos_y), 2) # item1 and item2 y pos + for y in pos_y: +- support.simulate_mouse_click(self.tv, 0, y) ++ simulate_mouse_click(self.tv, 0, y) + + # by now there should be 4 things in the events list, since each + # item had a bind for two events that were simulated above +@@ -1595,7 +1556,7 @@ + def test_tag_configure(self): + # Just testing parameter passing for now + self.assertRaises(TypeError, self.tv.tag_configure) +- self.assertRaises(Tkinter.TclError, self.tv.tag_configure, ++ self.assertRaises(tkinter.TclError, self.tv.tag_configure, + 'test', sky='blue') + self.tv.tag_configure('test', foreground='blue') + self.assertEqual(str(self.tv.tag_configure('test', 'foreground')), +@@ -1604,6 +1565,21 @@ + 'blue') + self.assertIsInstance(self.tv.tag_configure('test'), dict) + ++ def test_tag_has(self): ++ item1 = self.tv.insert('', 'end', text='Item 1', tags=['tag1']) ++ item2 = self.tv.insert('', 'end', text='Item 2', tags=['tag2']) ++ self.assertRaises(TypeError, self.tv.tag_has) ++ self.assertRaises(TclError, self.tv.tag_has, 'tag1', 'non-existing') ++ self.assertTrue(self.tv.tag_has('tag1', item1)) ++ self.assertFalse(self.tv.tag_has('tag1', item2)) ++ self.assertFalse(self.tv.tag_has('tag2', item1)) ++ self.assertTrue(self.tv.tag_has('tag2', item2)) ++ self.assertFalse(self.tv.tag_has('tag3', item1)) ++ self.assertFalse(self.tv.tag_has('tag3', item2)) ++ self.assertEqual(self.tv.tag_has('tag1'), (item1,)) ++ self.assertEqual(self.tv.tag_has('tag2'), (item2,)) ++ self.assertEqual(self.tv.tag_has('tag3'), ()) ++ + + @add_standard_options(StandardTtkOptionsTests) + class SeparatorTest(AbstractWidgetTest, unittest.TestCase): +@@ -1613,7 +1589,7 @@ + ) + default_orient = 'horizontal' + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Separator(self.root, **kwargs) + + +@@ -1624,7 +1600,7 @@ + # 'state'? + ) + +- def _create(self, **kwargs): ++ def create(self, **kwargs): + return ttk.Sizegrip(self.root, **kwargs) + + +diff -r ee879c0ffa11 Lib/lib-tk/test/widget_tests.py +--- a/Lib/lib-tk/test/widget_tests.py ++++ b/Lib/lib-tk/test/widget_tests.py +@@ -2,10 +2,10 @@ + + import unittest + import sys +-import Tkinter +-from ttk import setup_master, Scale +-from test_ttk.support import (tcl_version, requires_tcl, get_tk_patchlevel, +- pixels_conv, tcl_obj_eq) ++import Tkinter as tkinter ++from ttk import Scale ++from test_ttk.support import (AbstractTkTest, tcl_version, requires_tcl, ++ get_tk_patchlevel, pixels_conv, tcl_obj_eq) + import test.test_support + + +@@ -26,33 +26,26 @@ + + _sentinel = object() + +-class AbstractWidgetTest(object): ++class AbstractWidgetTest(AbstractTkTest): + _conv_pixels = staticmethod(pixels_round) + _conv_pad_pixels = None +- wantobjects = True ++ _stringify = False + +- def setUp(self): +- self.root = setup_master() +- self.scaling = float(self.root.call('tk', 'scaling')) +- if not self.root.wantobjects(): +- self.wantobjects = False +- +- def tearDown(self): +- for w in self.root.winfo_children(): +- w.destroy() ++ @property ++ def scaling(self): ++ try: ++ return self._scaling ++ except AttributeError: ++ self._scaling = float(self.root.call('tk', 'scaling')) ++ return self._scaling + + def _str(self, value): +- if self.wantobjects and tcl_version >= (8, 6): ++ if not self._stringify and self.wantobjects and tcl_version >= (8, 6): + return value + if isinstance(value, tuple): + return ' '.join(map(self._str, value)) + return str(value) + +- def create(self, **kwargs): +- widget = self._create(**kwargs) +- self.addCleanup(widget.destroy) +- return widget +- + def assertEqual2(self, actual, expected, msg=None, eq=object.__eq__): + if eq(actual, expected): + return +@@ -65,9 +58,9 @@ + expected = value + if conv: + expected = conv(expected) +- if not self.wantobjects: ++ if self._stringify or not self.wantobjects: + if isinstance(expected, tuple): +- expected = Tkinter._join(expected) ++ expected = tkinter._join(expected) + else: + expected = str(expected) + if eq is None: +@@ -85,7 +78,7 @@ + orig = widget[name] + if errmsg is not None: + errmsg = errmsg.format(value) +- with self.assertRaises(Tkinter.TclError) as cm: ++ with self.assertRaises(tkinter.TclError) as cm: + widget[name] = value + if errmsg is not None: + self.assertEqual(str(cm.exception), errmsg) +@@ -93,7 +86,7 @@ + self.assertEqual(widget[name], orig) + else: + widget[name] = orig +- with self.assertRaises(Tkinter.TclError) as cm: ++ with self.assertRaises(tkinter.TclError) as cm: + widget.configure({name: value}) + if errmsg is not None: + self.assertEqual(str(cm.exception), errmsg) +@@ -212,7 +205,7 @@ + errmsg=errmsg) + + def checkImageParam(self, widget, name): +- image = Tkinter.PhotoImage('image1') ++ image = tkinter.PhotoImage(master=self.root, name='image1') + self.checkParam(widget, name, image, conv=str) + self.checkInvalidParam(widget, name, 'spam', + errmsg='image "spam" doesn\'t exist') +@@ -433,7 +426,7 @@ + + def test_textvariable(self): + widget = self.create() +- var = Tkinter.StringVar() ++ var = tkinter.StringVar(self.root) + self.checkVariableParam(widget, 'textvariable', var) + + def test_troughcolor(self): +@@ -494,7 +487,7 @@ + + def test_variable(self): + widget = self.create() +- var = Tkinter.DoubleVar() ++ var = tkinter.DoubleVar(self.root) + self.checkVariableParam(widget, 'variable', var) + + +@@ -543,5 +536,5 @@ + + def setUpModule(): + if test.test_support.verbose: +- tcl = Tkinter.Tcl() ++ tcl = tkinter.Tcl() + print 'patchlevel =', tcl.call('info', 'patchlevel') +diff -r ee879c0ffa11 Lib/lib-tk/tkColorChooser.py +--- a/Lib/lib-tk/tkColorChooser.py ++++ b/Lib/lib-tk/tkColorChooser.py +@@ -1,4 +1,4 @@ +-# tk common colour chooser dialogue ++# tk common color chooser dialogue + # + # this module provides an interface to the native color dialogue + # available in Tk 4.2 and newer. +@@ -11,7 +11,7 @@ + # + # options (all have default values): + # +-# - initialcolor: colour to mark as selected when dialog is displayed ++# - initialcolor: color to mark as selected when dialog is displayed + # (given as an RGB triplet or a Tk color string) + # + # - parent: which window to place the dialog on top of +diff -r ee879c0ffa11 Lib/lib-tk/tkFont.py +--- a/Lib/lib-tk/tkFont.py ++++ b/Lib/lib-tk/tkFont.py +@@ -66,9 +66,10 @@ + def __init__(self, root=None, font=None, name=None, exists=False, **options): + if not root: + root = Tkinter._default_root ++ tk = getattr(root, 'tk', root) + if font: + # get actual settings corresponding to the given font +- font = root.tk.splitlist(root.tk.call("font", "actual", font)) ++ font = tk.splitlist(tk.call("font", "actual", font)) + else: + font = self._set(options) + if not name: +@@ -78,26 +79,24 @@ + if exists: + self.delete_font = False + # confirm font exists +- if self.name not in root.tk.splitlist( +- root.tk.call("font", "names")): ++ if self.name not in tk.splitlist(tk.call("font", "names")): + raise Tkinter._tkinter.TclError, "named font %s does not already exist" % (self.name,) + # if font config info supplied, apply it + if font: +- root.tk.call("font", "configure", self.name, *font) ++ tk.call("font", "configure", self.name, *font) + else: + # create new font (raises TclError if the font exists) +- root.tk.call("font", "create", self.name, *font) ++ tk.call("font", "create", self.name, *font) + self.delete_font = True +- # backlinks! +- self._root = root +- self._split = root.tk.splitlist +- self._call = root.tk.call ++ self._tk = tk ++ self._split = tk.splitlist ++ self._call = tk.call + + def __str__(self): + return self.name + + def __eq__(self, other): +- return self.name == other.name and isinstance(other, Font) ++ return isinstance(other, Font) and self.name == other.name + + def __getitem__(self, key): + return self.cget(key) +@@ -116,7 +115,7 @@ + + def copy(self): + "Return a distinct copy of the current font" +- return Font(self._root, **self.actual()) ++ return Font(self._tk, **self.actual()) + + def actual(self, option=None): + "Return actual font attributes" +diff -r ee879c0ffa11 Lib/lib-tk/ttk.py +--- a/Lib/lib-tk/ttk.py ++++ b/Lib/lib-tk/ttk.py +@@ -26,7 +26,7 @@ + "tclobjs_to_py", "setup_master"] + + import Tkinter +-from Tkinter import _flatten, _join, _stringify ++from Tkinter import _flatten, _join, _stringify, _splitdict + + # Verify if Tk is new enough to not need the Tile package + _REQUIRE_TILE = True if Tkinter.TkVersion < 8.5 else False +@@ -242,21 +242,6 @@ + + return '\n'.join(script) + +-def _dict_from_tcltuple(ttuple, cut_minus=True): +- """Break tuple in pairs, format it properly, then build the return +- dict. If cut_minus is True, the supposed '-' prefixing options will +- be removed. +- +- ttuple is expected to contain an even number of elements.""" +- opt_start = 1 if cut_minus else 0 +- +- retdict = {} +- it = iter(ttuple) +- for opt, val in zip(it, it): +- retdict[str(opt)[opt_start:]] = val +- +- return tclobjs_to_py(retdict) +- + def _list_from_statespec(stuple): + """Construct a list from the given statespec tuple according to the + accepted statespec accepted by _format_mapdict.""" +@@ -316,7 +301,7 @@ + if len(options) % 2: # option specified without a value, return its value + return res + +- return _dict_from_tcltuple(tk.splitlist(res)) ++ return _splitdict(tk, res, conv=_tclobj_to_py) + + def _convert_stringval(value): + """Converts a value to, hopefully, a more appropriate Python object.""" +@@ -336,20 +321,24 @@ + x = int(x) + return x + ++def _tclobj_to_py(val): ++ """Return value converted from Tcl object to Python object.""" ++ if val and hasattr(val, '__len__') and not isinstance(val, basestring): ++ if getattr(val[0], 'typename', None) == 'StateSpec': ++ val = _list_from_statespec(val) ++ else: ++ val = map(_convert_stringval, val) ++ ++ elif hasattr(val, 'typename'): # some other (single) Tcl object ++ val = _convert_stringval(val) ++ ++ return val ++ + def tclobjs_to_py(adict): + """Returns adict with its values converted from Tcl objects to Python + objects.""" +- for opt, val in adict.iteritems(): +- if val and hasattr(val, '__len__') and not isinstance(val, basestring): +- if getattr(val[0], 'typename', None) == 'StateSpec': +- val = _list_from_statespec(val) +- else: +- val = map(_convert_stringval, val) +- +- elif hasattr(val, 'typename'): # some other (single) Tcl object +- val = _convert_stringval(val) +- +- adict[opt] = val ++ for opt, val in adict.items(): ++ adict[opt] = _tclobj_to_py(val) + + return adict + +@@ -409,8 +398,10 @@ + return _list_from_statespec(self.tk.splitlist( + self.tk.call(self._name, "map", style, '-%s' % query_opt))) + +- return _dict_from_tcltuple(self.tk.splitlist( +- self.tk.call(self._name, "map", style, *(_format_mapdict(kw))))) ++ return _splitdict( ++ self.tk, ++ self.tk.call(self._name, "map", style, *_format_mapdict(kw)), ++ conv=_tclobj_to_py) + + + def lookup(self, style, option, state=None, default=None): +@@ -1427,13 +1418,16 @@ + + + def set(self, item, column=None, value=None): +- """With one argument, returns a dictionary of column/value pairs +- for the specified item. With two arguments, returns the current +- value of the specified column. With three arguments, sets the ++ """Query or set the value of given item. ++ ++ With one argument, return a dictionary of column/value pairs ++ for the specified item. With two arguments, return the current ++ value of the specified column. With three arguments, set the + value of given column in given item to the specified value.""" + res = self.tk.call(self._w, "set", item, column, value) + if column is None and value is None: +- return _dict_from_tcltuple(self.tk.splitlist(res), False) ++ return _splitdict(self.tk, res, ++ cut_minus=False, conv=_tclobj_to_py) + else: + return res + +@@ -1464,7 +1458,11 @@ + all items which have the specified tag. + + * Availability: Tk 8.6""" +- return self.tk.getboolean( ++ if item is None: ++ return self.tk.splitlist( ++ self.tk.call(self._w, "tag", "has", tagname)) ++ else: ++ return self.tk.getboolean( + self.tk.call(self._w, "tag", "has", tagname, item)) + + +diff -r ee879c0ffa11 Lib/lib-tk/turtle.py +--- a/Lib/lib-tk/turtle.py ++++ b/Lib/lib-tk/turtle.py +@@ -142,7 +142,7 @@ + 'log10', 'modf', 'pi', 'pow', 'sin', 'sinh', 'sqrt', 'tan', 'tanh'] + + __all__ = (_tg_classes + _tg_screen_functions + _tg_turtle_functions + +- _tg_utilities + _math_functions) ++ _tg_utilities + ['Terminator'] + _math_functions) + + _alias_list = ['addshape', 'backward', 'bk', 'fd', 'ht', 'lt', 'pd', 'pos', + 'pu', 'rt', 'seth', 'setpos', 'setposition', 'st', +@@ -2499,7 +2499,7 @@ + Example (for a Turtle instance named turtle): + >>> turtle.setundobuffer(42) + """ +- if size is None: ++ if size is None or size <= 0: + self.undobuffer = None + else: + self.undobuffer = Tbuffer(size) +diff -r ee879c0ffa11 Lib/lib2to3/fixes/fix_asserts.py +--- /dev/null ++++ b/Lib/lib2to3/fixes/fix_asserts.py +@@ -0,0 +1,34 @@ ++"""Fixer that replaces deprecated unittest method names.""" ++ ++# Author: Ezio Melotti ++ ++from ..fixer_base import BaseFix ++from ..fixer_util import Name ++ ++NAMES = dict( ++ assert_="assertTrue", ++ assertEquals="assertEqual", ++ assertNotEquals="assertNotEqual", ++ assertAlmostEquals="assertAlmostEqual", ++ assertNotAlmostEquals="assertNotAlmostEqual", ++ assertRegexpMatches="assertRegex", ++ assertRaisesRegexp="assertRaisesRegex", ++ failUnlessEqual="assertEqual", ++ failIfEqual="assertNotEqual", ++ failUnlessAlmostEqual="assertAlmostEqual", ++ failIfAlmostEqual="assertNotAlmostEqual", ++ failUnless="assertTrue", ++ failUnlessRaises="assertRaises", ++ failIf="assertFalse", ++) ++ ++ ++class FixAsserts(BaseFix): ++ ++ PATTERN = """ ++ power< any+ trailer< '.' meth=(%s)> any* > ++ """ % '|'.join(map(repr, NAMES)) ++ ++ def transform(self, node, results): ++ name = results["meth"][0] ++ name.replace(Name(NAMES[str(name)], prefix=name.prefix)) +diff -r ee879c0ffa11 Lib/lib2to3/pgen2/tokenize.py +--- a/Lib/lib2to3/pgen2/tokenize.py ++++ b/Lib/lib2to3/pgen2/tokenize.py +@@ -237,6 +237,7 @@ + toks_append(tokval) + + cookie_re = re.compile(r'^[ \t\f]*#.*coding[:=][ \t]*([-\w.]+)') ++blank_re = re.compile(r'^[ \t\f]*(?:[#\r\n]|$)') + + def _get_normal_name(orig_enc): + """Imitates get_normal_name in tokenizer.c.""" +@@ -309,6 +310,8 @@ + encoding = find_cookie(first) + if encoding: + return encoding, [first] ++ if not blank_re.match(first): ++ return default, [first] + + second = read_or_stop() + if not second: +diff -r ee879c0ffa11 Lib/lib2to3/tests/test_fixers.py +--- a/Lib/lib2to3/tests/test_fixers.py ++++ b/Lib/lib2to3/tests/test_fixers.py +@@ -4576,3 +4576,53 @@ + def test_unchanged(self): + s = """f(sys.exitfunc)""" + self.unchanged(s) ++ ++ ++class Test_asserts(FixerTestCase): ++ ++ fixer = "asserts" ++ ++ def test_deprecated_names(self): ++ tests = [ ++ ('self.assert_(True)', 'self.assertTrue(True)'), ++ ('self.assertEquals(2, 2)', 'self.assertEqual(2, 2)'), ++ ('self.assertNotEquals(2, 3)', 'self.assertNotEqual(2, 3)'), ++ ('self.assertAlmostEquals(2, 3)', 'self.assertAlmostEqual(2, 3)'), ++ ('self.assertNotAlmostEquals(2, 8)', 'self.assertNotAlmostEqual(2, 8)'), ++ ('self.failUnlessEqual(2, 2)', 'self.assertEqual(2, 2)'), ++ ('self.failIfEqual(2, 3)', 'self.assertNotEqual(2, 3)'), ++ ('self.failUnlessAlmostEqual(2, 3)', 'self.assertAlmostEqual(2, 3)'), ++ ('self.failIfAlmostEqual(2, 8)', 'self.assertNotAlmostEqual(2, 8)'), ++ ('self.failUnless(True)', 'self.assertTrue(True)'), ++ ('self.failUnlessRaises(foo)', 'self.assertRaises(foo)'), ++ ('self.failIf(False)', 'self.assertFalse(False)'), ++ ] ++ for b, a in tests: ++ self.check(b, a) ++ ++ def test_variants(self): ++ b = 'eq = self.assertEquals' ++ a = 'eq = self.assertEqual' ++ self.check(b, a) ++ b = 'self.assertEquals(2, 3, msg="fail")' ++ a = 'self.assertEqual(2, 3, msg="fail")' ++ self.check(b, a) ++ b = 'self.assertEquals(2, 3, msg="fail") # foo' ++ a = 'self.assertEqual(2, 3, msg="fail") # foo' ++ self.check(b, a) ++ b = 'self.assertEquals (2, 3)' ++ a = 'self.assertEqual (2, 3)' ++ self.check(b, a) ++ b = ' self.assertEquals (2, 3)' ++ a = ' self.assertEqual (2, 3)' ++ self.check(b, a) ++ b = 'with self.failUnlessRaises(Explosion): explode()' ++ a = 'with self.assertRaises(Explosion): explode()' ++ self.check(b, a) ++ b = 'with self.failUnlessRaises(Explosion) as cm: explode()' ++ a = 'with self.assertRaises(Explosion) as cm: explode()' ++ self.check(b, a) ++ ++ def test_unchanged(self): ++ self.unchanged('self.assertEqualsOnSaturday') ++ self.unchanged('self.assertEqualsOnSaturday(3, 5)') +diff -r ee879c0ffa11 Lib/locale.py +--- a/Lib/locale.py ++++ b/Lib/locale.py +@@ -784,12 +784,18 @@ + # updated 'sr_cs' -> 'sr_RS.UTF-8' to 'sr_CS.UTF-8' + # updated 'sr_cs.utf8@latn' -> 'sr_RS.UTF-8@latin' to 'sr_CS.UTF-8@latin' + # updated 'sr_cs@latn' -> 'sr_RS.UTF-8@latin' to 'sr_CS.UTF-8@latin' ++# ++# SS 2014-10-01: ++# Updated alias mapping with glibc 2.19 supported locales. + + locale_alias = { + 'a3': 'az_AZ.KOI8-C', + 'a3_az': 'az_AZ.KOI8-C', + 'a3_az.koi8c': 'az_AZ.KOI8-C', + 'a3_az.koic': 'az_AZ.KOI8-C', ++ 'aa_dj': 'aa_DJ.ISO8859-1', ++ 'aa_er': 'aa_ER.UTF-8', ++ 'aa_et': 'aa_ET.UTF-8', + 'af': 'af_ZA.ISO8859-1', + 'af_za': 'af_ZA.ISO8859-1', + 'af_za.iso88591': 'af_ZA.ISO8859-1', +@@ -797,6 +803,7 @@ + 'am_et': 'am_ET.UTF-8', + 'american': 'en_US.ISO8859-1', + 'american.iso88591': 'en_US.ISO8859-1', ++ 'an_es': 'an_ES.ISO8859-15', + 'ar': 'ar_AA.ISO8859-6', + 'ar_aa': 'ar_AA.ISO8859-6', + 'ar_aa.iso88596': 'ar_AA.ISO8859-6', +@@ -839,23 +846,32 @@ + 'arabic.iso88596': 'ar_AA.ISO8859-6', + 'as': 'as_IN.UTF-8', + 'as_in': 'as_IN.UTF-8', ++ 'ast_es': 'ast_ES.ISO8859-15', ++ 'ayc_pe': 'ayc_PE.UTF-8', + 'az': 'az_AZ.ISO8859-9E', + 'az_az': 'az_AZ.ISO8859-9E', + 'az_az.iso88599e': 'az_AZ.ISO8859-9E', + 'be': 'be_BY.CP1251', + 'be@latin': 'be_BY.UTF-8@latin', ++ 'be_bg.utf8': 'bg_BG.UTF-8', + 'be_by': 'be_BY.CP1251', + 'be_by.cp1251': 'be_BY.CP1251', + 'be_by.microsoftcp1251': 'be_BY.CP1251', + 'be_by.utf8@latin': 'be_BY.UTF-8@latin', + 'be_by@latin': 'be_BY.UTF-8@latin', ++ 'bem_zm': 'bem_ZM.UTF-8', ++ 'ber_dz': 'ber_DZ.UTF-8', ++ 'ber_ma': 'ber_MA.UTF-8', + 'bg': 'bg_BG.CP1251', + 'bg_bg': 'bg_BG.CP1251', + 'bg_bg.cp1251': 'bg_BG.CP1251', + 'bg_bg.iso88595': 'bg_BG.ISO8859-5', + 'bg_bg.koi8r': 'bg_BG.KOI8-R', + 'bg_bg.microsoftcp1251': 'bg_BG.CP1251', ++ 'bho_in': 'bho_IN.UTF-8', ++ 'bn_bd': 'bn_BD.UTF-8', + 'bn_in': 'bn_IN.UTF-8', ++ 'bo_cn': 'bo_CN.UTF-8', + 'bo_in': 'bo_IN.UTF-8', + 'bokmal': 'nb_NO.ISO8859-1', + 'bokm\xe5l': 'nb_NO.ISO8859-1', +@@ -867,16 +883,19 @@ + 'br_fr.iso885915@euro': 'br_FR.ISO8859-15', + 'br_fr.utf8@euro': 'br_FR.UTF-8', + 'br_fr@euro': 'br_FR.ISO8859-15', ++ 'brx_in': 'brx_IN.UTF-8', + 'bs': 'bs_BA.ISO8859-2', + 'bs_ba': 'bs_BA.ISO8859-2', + 'bs_ba.iso88592': 'bs_BA.ISO8859-2', + 'bulgarian': 'bg_BG.CP1251', ++ 'byn_er': 'byn_ER.UTF-8', + 'c': 'C', + 'c-french': 'fr_CA.ISO8859-1', + 'c-french.iso88591': 'fr_CA.ISO8859-1', + 'c.ascii': 'C', + 'c.en': 'C', + 'c.iso88591': 'en_US.ISO8859-1', ++ 'c.utf8': 'en_US.UTF-8', + 'c_c': 'C', + 'c_c.c': 'C', + 'ca': 'ca_ES.ISO8859-1', +@@ -891,6 +910,7 @@ + 'ca_es.iso885915': 'ca_ES.ISO8859-15', + 'ca_es.iso885915@euro': 'ca_ES.ISO8859-15', + 'ca_es.utf8@euro': 'ca_ES.UTF-8', ++ 'ca_es@valencia': 'ca_ES.ISO8859-15@valencia', + 'ca_es@euro': 'ca_ES.ISO8859-15', + 'ca_fr': 'ca_FR.ISO8859-1', + 'ca_fr.iso88591': 'ca_FR.ISO8859-1', +@@ -909,12 +929,15 @@ + 'cextend.en': 'en_US.ISO8859-1', + 'chinese-s': 'zh_CN.eucCN', + 'chinese-t': 'zh_TW.eucTW', ++ 'crh_ua': 'crh_UA.UTF-8', + 'croatian': 'hr_HR.ISO8859-2', + 'cs': 'cs_CZ.ISO8859-2', + 'cs_cs': 'cs_CZ.ISO8859-2', + 'cs_cs.iso88592': 'cs_CZ.ISO8859-2', + 'cs_cz': 'cs_CZ.ISO8859-2', + 'cs_cz.iso88592': 'cs_CZ.ISO8859-2', ++ 'csb_pl': 'csb_PL.UTF-8', ++ 'cv_ru': 'cv_RU.UTF-8', + 'cy': 'cy_GB.ISO8859-1', + 'cy_gb': 'cy_GB.ISO8859-1', + 'cy_gb.iso88591': 'cy_GB.ISO8859-1', +@@ -962,6 +985,7 @@ + 'de_de.iso885915@euro': 'de_DE.ISO8859-15', + 'de_de.utf8@euro': 'de_DE.UTF-8', + 'de_de@euro': 'de_DE.ISO8859-15', ++ 'de_li.utf8': 'de_LI.UTF-8', + 'de_lu': 'de_LU.ISO8859-1', + 'de_lu.iso88591': 'de_LU.ISO8859-1', + 'de_lu.iso885915': 'de_LU.ISO8859-15', +@@ -969,18 +993,23 @@ + 'de_lu.utf8@euro': 'de_LU.UTF-8', + 'de_lu@euro': 'de_LU.ISO8859-15', + 'deutsch': 'de_DE.ISO8859-1', ++ 'doi_in': 'doi_IN.UTF-8', + 'dutch': 'nl_NL.ISO8859-1', + 'dutch.iso88591': 'nl_BE.ISO8859-1', ++ 'dv_mv': 'dv_MV.UTF-8', ++ 'dz_bt': 'dz_BT.UTF-8', + 'ee': 'ee_EE.ISO8859-4', + 'ee_ee': 'ee_EE.ISO8859-4', + 'ee_ee.iso88594': 'ee_EE.ISO8859-4', + 'eesti': 'et_EE.ISO8859-1', + 'el': 'el_GR.ISO8859-7', ++ 'el_cy': 'el_CY.ISO8859-7', + 'el_gr': 'el_GR.ISO8859-7', + 'el_gr.iso88597': 'el_GR.ISO8859-7', + 'el_gr@euro': 'el_GR.ISO8859-15', + 'en': 'en_US.ISO8859-1', + 'en.iso88591': 'en_US.ISO8859-1', ++ 'en_ag': 'en_AG.UTF-8', + 'en_au': 'en_AU.ISO8859-1', + 'en_au.iso88591': 'en_AU.ISO8859-1', + 'en_be': 'en_BE.ISO8859-1', +@@ -989,6 +1018,8 @@ + 'en_bw.iso88591': 'en_BW.ISO8859-1', + 'en_ca': 'en_CA.ISO8859-1', + 'en_ca.iso88591': 'en_CA.ISO8859-1', ++ 'en_dk': 'en_DK.ISO8859-1', ++ 'en_dl.utf8': 'en_DL.UTF-8', + 'en_gb': 'en_GB.ISO8859-1', + 'en_gb.88591': 'en_GB.ISO8859-1', + 'en_gb.iso88591': 'en_GB.ISO8859-1', +@@ -1003,6 +1034,7 @@ + 'en_ie.utf8@euro': 'en_IE.UTF-8', + 'en_ie@euro': 'en_IE.ISO8859-15', + 'en_in': 'en_IN.ISO8859-1', ++ 'en_ng': 'en_NG.UTF-8', + 'en_nz': 'en_NZ.ISO8859-1', + 'en_nz.iso88591': 'en_NZ.ISO8859-1', + 'en_ph': 'en_PH.ISO8859-1', +@@ -1023,8 +1055,10 @@ + 'en_za.iso88591': 'en_ZA.ISO8859-1', + 'en_za.iso885915': 'en_ZA.ISO8859-15', + 'en_za@euro': 'en_ZA.ISO8859-15', ++ 'en_zm': 'en_ZM.UTF-8', + 'en_zw': 'en_ZW.ISO8859-1', + 'en_zw.iso88591': 'en_ZW.ISO8859-1', ++ 'en_zw.utf8': 'en_ZS.UTF-8', + 'eng_gb': 'en_GB.ISO8859-1', + 'eng_gb.8859': 'en_GB.ISO8859-1', + 'english': 'en_EN.ISO8859-1', +@@ -1037,8 +1071,10 @@ + 'english_us.8859': 'en_US.ISO8859-1', + 'english_us.ascii': 'en_US.ISO8859-1', + 'eo': 'eo_XX.ISO8859-3', ++ 'eo.utf8': 'eo.UTF-8', + 'eo_eo': 'eo_EO.ISO8859-3', + 'eo_eo.iso88593': 'eo_EO.ISO8859-3', ++ 'eo_us.utf8': 'eo_US.UTF-8', + 'eo_xx': 'eo_XX.ISO8859-3', + 'eo_xx.iso88593': 'eo_XX.ISO8859-3', + 'es': 'es_ES.ISO8859-1', +@@ -1052,6 +1088,7 @@ + 'es_co.iso88591': 'es_CO.ISO8859-1', + 'es_cr': 'es_CR.ISO8859-1', + 'es_cr.iso88591': 'es_CR.ISO8859-1', ++ 'es_cu': 'es_CU.UTF-8', + 'es_do': 'es_DO.ISO8859-1', + 'es_do.iso88591': 'es_DO.ISO8859-1', + 'es_ec': 'es_EC.ISO8859-1', +@@ -1114,9 +1151,11 @@ + 'eu_es.iso885915@euro': 'eu_ES.ISO8859-15', + 'eu_es.utf8@euro': 'eu_ES.UTF-8', + 'eu_es@euro': 'eu_ES.ISO8859-15', ++ 'eu_fr': 'eu_FR.ISO8859-1', + 'fa': 'fa_IR.UTF-8', + 'fa_ir': 'fa_IR.UTF-8', + 'fa_ir.isiri3342': 'fa_IR.ISIRI-3342', ++ 'ff_sn': 'ff_SN.UTF-8', + 'fi': 'fi_FI.ISO8859-15', + 'fi.iso885915': 'fi_FI.ISO8859-15', + 'fi_fi': 'fi_FI.ISO8859-15', +@@ -1126,6 +1165,7 @@ + 'fi_fi.iso885915@euro': 'fi_FI.ISO8859-15', + 'fi_fi.utf8@euro': 'fi_FI.UTF-8', + 'fi_fi@euro': 'fi_FI.ISO8859-15', ++ 'fil_ph': 'fil_PH.UTF-8', + 'finnish': 'fi_FI.ISO8859-1', + 'finnish.iso88591': 'fi_FI.ISO8859-1', + 'fo': 'fo_FO.ISO8859-1', +@@ -1173,6 +1213,9 @@ + 'french.iso88591': 'fr_CH.ISO8859-1', + 'french_france': 'fr_FR.ISO8859-1', + 'french_france.8859': 'fr_FR.ISO8859-1', ++ 'fur_it': 'fur_IT.UTF-8', ++ 'fy_de': 'fy_DE.UTF-8', ++ 'fy_nl': 'fy_NL.UTF-8', + 'ga': 'ga_IE.ISO8859-1', + 'ga_ie': 'ga_IE.ISO8859-1', + 'ga_ie.iso88591': 'ga_IE.ISO8859-1', +@@ -1195,6 +1238,8 @@ + 'german.iso88591': 'de_CH.ISO8859-1', + 'german_germany': 'de_DE.ISO8859-1', + 'german_germany.8859': 'de_DE.ISO8859-1', ++ 'gez_er': 'gez_ER.UTF-8', ++ 'gez_et': 'gez_ET.UTF-8', + 'gl': 'gl_ES.ISO8859-1', + 'gl_es': 'gl_ES.ISO8859-1', + 'gl_es.iso88591': 'gl_ES.ISO8859-1', +@@ -1211,6 +1256,7 @@ + 'gv_gb.iso885914': 'gv_GB.ISO8859-14', + 'gv_gb.iso885915': 'gv_GB.ISO8859-15', + 'gv_gb@euro': 'gv_GB.ISO8859-15', ++ 'ha_ng': 'ha_NG.UTF-8', + 'he': 'he_IL.ISO8859-8', + 'he_il': 'he_IL.ISO8859-8', + 'he_il.cp1255': 'he_IL.CP1255', +@@ -1227,14 +1273,22 @@ + 'hr_hr': 'hr_HR.ISO8859-2', + 'hr_hr.iso88592': 'hr_HR.ISO8859-2', + 'hrvatski': 'hr_HR.ISO8859-2', ++ 'hsb_de': 'hsb_DE.ISO8859-2', ++ 'ht_ht': 'ht_HT.UTF-8', + 'hu': 'hu_HU.ISO8859-2', + 'hu_hu': 'hu_HU.ISO8859-2', + 'hu_hu.iso88592': 'hu_HU.ISO8859-2', + 'hungarian': 'hu_HU.ISO8859-2', ++ 'hy_am': 'hy_AM.UTF-8', ++ 'hy_am.armscii8': 'hy_AM.ARMSCII_8', ++ 'ia': 'ia.UTF-8', ++ 'ia_fr': 'ia_FR.UTF-8', + 'icelandic': 'is_IS.ISO8859-1', + 'icelandic.iso88591': 'is_IS.ISO8859-1', + 'id': 'id_ID.ISO8859-1', + 'id_id': 'id_ID.ISO8859-1', ++ 'ig_ng': 'ig_NG.UTF-8', ++ 'ik_ca': 'ik_CA.UTF-8', + 'in': 'id_ID.ISO8859-1', + 'in_id': 'id_ID.ISO8859-1', + 'is': 'is_IS.ISO8859-1', +@@ -1269,6 +1323,7 @@ + 'iw': 'he_IL.ISO8859-8', + 'iw_il': 'he_IL.ISO8859-8', + 'iw_il.iso88598': 'he_IL.ISO8859-8', ++ 'iw_il.utf8': 'iw_IL.UTF-8', + 'ja': 'ja_JP.eucJP', + 'ja.jis': 'ja_JP.JIS7', + 'ja.sjis': 'ja_JP.SJIS', +@@ -1295,6 +1350,7 @@ + 'ka_ge.georgianacademy': 'ka_GE.GEORGIAN-ACADEMY', + 'ka_ge.georgianps': 'ka_GE.GEORGIAN-PS', + 'ka_ge.georgianrs': 'ka_GE.GEORGIAN-ACADEMY', ++ 'kk_kz': 'kk_KZ.RK1048', + 'kl': 'kl_GL.ISO8859-1', + 'kl_gl': 'kl_GL.ISO8859-1', + 'kl_gl.iso88591': 'kl_GL.ISO8859-1', +@@ -1307,11 +1363,14 @@ + 'ko_kr': 'ko_KR.eucKR', + 'ko_kr.euc': 'ko_KR.eucKR', + 'ko_kr.euckr': 'ko_KR.eucKR', ++ 'kok_in': 'kok_IN.UTF-8', + 'korean': 'ko_KR.eucKR', + 'korean.euc': 'ko_KR.eucKR', + 'ks': 'ks_IN.UTF-8', + 'ks_in': 'ks_IN.UTF-8', + 'ks_in@devanagari': 'ks_IN.UTF-8@devanagari', ++ 'ks_in@devanagari.utf8': 'ks_IN.UTF-8@devanagari', ++ 'ku_tr': 'ku_TR.ISO8859-9', + 'kw': 'kw_GB.ISO8859-1', + 'kw_gb': 'kw_GB.ISO8859-1', + 'kw_gb.iso88591': 'kw_GB.ISO8859-1', +@@ -1320,6 +1379,11 @@ + 'kw_gb@euro': 'kw_GB.ISO8859-15', + 'ky': 'ky_KG.UTF-8', + 'ky_kg': 'ky_KG.UTF-8', ++ 'lb_lu': 'lb_LU.UTF-8', ++ 'lg_ug': 'lg_UG.ISO8859-10', ++ 'li_be': 'li_BE.UTF-8', ++ 'li_nl': 'li_NL.UTF-8', ++ 'lij_it': 'lij_IT.UTF-8', + 'lithuanian': 'lt_LT.ISO8859-13', + 'lo': 'lo_LA.MULELAO-1', + 'lo_la': 'lo_LA.MULELAO-1', +@@ -1334,8 +1398,11 @@ + 'lv_lv': 'lv_LV.ISO8859-13', + 'lv_lv.iso885913': 'lv_LV.ISO8859-13', + 'lv_lv.iso88594': 'lv_LV.ISO8859-4', ++ 'mag_in': 'mag_IN.UTF-8', + 'mai': 'mai_IN.UTF-8', + 'mai_in': 'mai_IN.UTF-8', ++ 'mg_mg': 'mg_MG.ISO8859-15', ++ 'mhr_ru': 'mhr_RU.UTF-8', + 'mi': 'mi_NZ.ISO8859-1', + 'mi_nz': 'mi_NZ.ISO8859-1', + 'mi_nz.iso88591': 'mi_NZ.ISO8859-1', +@@ -1346,6 +1413,8 @@ + 'mk_mk.microsoftcp1251': 'mk_MK.CP1251', + 'ml': 'ml_IN.UTF-8', + 'ml_in': 'ml_IN.UTF-8', ++ 'mn_mn': 'mn_MN.UTF-8', ++ 'mni_in': 'mni_IN.UTF-8', + 'mr': 'mr_IN.UTF-8', + 'mr_in': 'mr_IN.UTF-8', + 'ms': 'ms_MY.ISO8859-1', +@@ -1354,15 +1423,23 @@ + 'mt': 'mt_MT.ISO8859-3', + 'mt_mt': 'mt_MT.ISO8859-3', + 'mt_mt.iso88593': 'mt_MT.ISO8859-3', ++ 'my_mm': 'my_MM.UTF-8', ++ 'nan_tw@latin': 'nan_TW.UTF-8@latin', + 'nb': 'nb_NO.ISO8859-1', + 'nb_no': 'nb_NO.ISO8859-1', + 'nb_no.88591': 'nb_NO.ISO8859-1', + 'nb_no.iso88591': 'nb_NO.ISO8859-1', + 'nb_no.iso885915': 'nb_NO.ISO8859-15', + 'nb_no@euro': 'nb_NO.ISO8859-15', ++ 'nds_de': 'nds_DE.UTF-8', ++ 'nds_nl': 'nds_NL.UTF-8', + 'ne_np': 'ne_NP.UTF-8', ++ 'nhn_mx': 'nhn_MX.UTF-8', ++ 'niu_nu': 'niu_NU.UTF-8', ++ 'niu_nz': 'niu_NZ.UTF-8', + 'nl': 'nl_NL.ISO8859-1', + 'nl.iso885915': 'nl_NL.ISO8859-15', ++ 'nl_aw': 'nl_AW.UTF-8', + 'nl_be': 'nl_BE.ISO8859-1', + 'nl_be.88591': 'nl_BE.ISO8859-1', + 'nl_be.iso88591': 'nl_BE.ISO8859-1', +@@ -1412,10 +1489,15 @@ + 'oc_fr.iso88591': 'oc_FR.ISO8859-1', + 'oc_fr.iso885915': 'oc_FR.ISO8859-15', + 'oc_fr@euro': 'oc_FR.ISO8859-15', ++ 'om_et': 'om_ET.UTF-8', ++ 'om_ke': 'om_KE.ISO8859-1', + 'or': 'or_IN.UTF-8', + 'or_in': 'or_IN.UTF-8', ++ 'os_ru': 'os_RU.UTF-8', + 'pa': 'pa_IN.UTF-8', + 'pa_in': 'pa_IN.UTF-8', ++ 'pa_pk': 'pa_PK.UTF-8', ++ 'pap_an': 'pap_AN.UTF-8', + 'pd': 'pd_US.ISO8859-1', + 'pd_de': 'pd_DE.ISO8859-1', + 'pd_de.iso88591': 'pd_DE.ISO8859-1', +@@ -1441,6 +1523,7 @@ + 'pp': 'pp_AN.ISO8859-1', + 'pp_an': 'pp_AN.ISO8859-1', + 'pp_an.iso88591': 'pp_AN.ISO8859-1', ++ 'ps_af': 'ps_AF.UTF-8', + 'pt': 'pt_PT.ISO8859-1', + 'pt.iso885915': 'pt_PT.ISO8859-15', + 'pt_br': 'pt_BR.ISO8859-1', +@@ -1475,10 +1558,15 @@ + 'rw': 'rw_RW.ISO8859-1', + 'rw_rw': 'rw_RW.ISO8859-1', + 'rw_rw.iso88591': 'rw_RW.ISO8859-1', ++ 'sa_in': 'sa_IN.UTF-8', ++ 'sat_in': 'sat_IN.UTF-8', ++ 'sc_it': 'sc_IT.UTF-8', + 'sd': 'sd_IN.UTF-8', + 'sd@devanagari': 'sd_IN.UTF-8@devanagari', + 'sd_in': 'sd_IN.UTF-8', + 'sd_in@devanagari': 'sd_IN.UTF-8@devanagari', ++ 'sd_in@devanagari.utf8': 'sd_IN.UTF-8@devanagari', ++ 'sd_pk': 'sd_PK.UTF-8', + 'se_no': 'se_NO.UTF-8', + 'serbocroatian': 'sr_RS.UTF-8@latin', + 'sh': 'sr_RS.UTF-8@latin', +@@ -1487,8 +1575,10 @@ + 'sh_hr.iso88592': 'hr_HR.ISO8859-2', + 'sh_sp': 'sr_CS.ISO8859-2', + 'sh_yu': 'sr_RS.UTF-8@latin', ++ 'shs_ca': 'shs_CA.UTF-8', + 'si': 'si_LK.UTF-8', + 'si_lk': 'si_LK.UTF-8', ++ 'sid_et': 'sid_ET.UTF-8', + 'sinhala': 'si_LK.UTF-8', + 'sk': 'sk_SK.ISO8859-2', + 'sk_sk': 'sk_SK.ISO8859-2', +@@ -1500,6 +1590,10 @@ + 'slovak': 'sk_SK.ISO8859-2', + 'slovene': 'sl_SI.ISO8859-2', + 'slovenian': 'sl_SI.ISO8859-2', ++ 'so_dj': 'so_DJ.ISO8859-1', ++ 'so_et': 'so_ET.UTF-8', ++ 'so_ke': 'so_KE.ISO8859-1', ++ 'so_so': 'so_SO.ISO8859-1', + 'sp': 'sr_CS.ISO8859-5', + 'sp_yu': 'sr_CS.ISO8859-5', + 'spanish': 'es_ES.ISO8859-1', +@@ -1509,6 +1603,7 @@ + 'sq': 'sq_AL.ISO8859-2', + 'sq_al': 'sq_AL.ISO8859-2', + 'sq_al.iso88592': 'sq_AL.ISO8859-2', ++ 'sq_mk': 'sq_MK.UTF-8', + 'sr': 'sr_RS.UTF-8', + 'sr@cyrillic': 'sr_RS.UTF-8', + 'sr@latin': 'sr_RS.UTF-8@latin', +@@ -1521,7 +1616,6 @@ + 'sr_cs@latn': 'sr_CS.UTF-8@latin', + 'sr_me': 'sr_ME.UTF-8', + 'sr_rs': 'sr_RS.UTF-8', +- 'sr_rs.utf8@latn': 'sr_RS.UTF-8@latin', + 'sr_rs@latin': 'sr_RS.UTF-8@latin', + 'sr_rs@latn': 'sr_RS.UTF-8@latin', + 'sr_sp': 'sr_CS.ISO8859-2', +@@ -1531,6 +1625,7 @@ + 'sr_yu.iso88595': 'sr_CS.ISO8859-5', + 'sr_yu.iso88595@cyrillic': 'sr_CS.ISO8859-5', + 'sr_yu.microsoftcp1251@cyrillic': 'sr_CS.CP1251', ++ 'sr_yu.utf8': 'sr_RS.UTF-8', + 'sr_yu.utf8@cyrillic': 'sr_RS.UTF-8', + 'sr_yu@cyrillic': 'sr_RS.UTF-8', + 'ss': 'ss_ZA.ISO8859-1', +@@ -1552,13 +1647,18 @@ + 'sv_se.iso88591': 'sv_SE.ISO8859-1', + 'sv_se.iso885915': 'sv_SE.ISO8859-15', + 'sv_se@euro': 'sv_SE.ISO8859-15', ++ 'sw_ke': 'sw_KE.UTF-8', ++ 'sw_tz': 'sw_TZ.UTF-8', + 'swedish': 'sv_SE.ISO8859-1', + 'swedish.iso88591': 'sv_SE.ISO8859-1', ++ 'szl_pl': 'szl_PL.UTF-8', + 'ta': 'ta_IN.TSCII-0', + 'ta_in': 'ta_IN.TSCII-0', + 'ta_in.tscii': 'ta_IN.TSCII-0', + 'ta_in.tscii0': 'ta_IN.TSCII-0', ++ 'ta_lk': 'ta_LK.UTF-8', + 'te': 'te_IN.UTF-8', ++ 'te_in': 'te_IN.UTF-8', + 'tg': 'tg_TJ.KOI8-C', + 'tg_tj': 'tg_TJ.KOI8-C', + 'tg_tj.koi8c': 'tg_TJ.KOI8-C', +@@ -1568,6 +1668,10 @@ + 'th_th.tactis': 'th_TH.TIS620', + 'th_th.tis620': 'th_TH.TIS620', + 'thai': 'th_TH.ISO8859-11', ++ 'ti_er': 'ti_ER.UTF-8', ++ 'ti_et': 'ti_ET.UTF-8', ++ 'tig_er': 'tig_ER.UTF-8', ++ 'tk_tm': 'tk_TM.UTF-8', + 'tl': 'tl_PH.ISO8859-1', + 'tl_ph': 'tl_PH.ISO8859-1', + 'tl_ph.iso88591': 'tl_PH.ISO8859-1', +@@ -1575,6 +1679,7 @@ + 'tn_za': 'tn_ZA.ISO8859-15', + 'tn_za.iso885915': 'tn_ZA.ISO8859-15', + 'tr': 'tr_TR.ISO8859-9', ++ 'tr_cy': 'tr_CY.ISO8859-9', + 'tr_tr': 'tr_TR.ISO8859-9', + 'tr_tr.iso88599': 'tr_TR.ISO8859-9', + 'ts': 'ts_ZA.ISO8859-1', +@@ -1584,8 +1689,10 @@ + 'tt_ru': 'tt_RU.TATAR-CYR', + 'tt_ru.koi8c': 'tt_RU.KOI8-C', + 'tt_ru.tatarcyr': 'tt_RU.TATAR-CYR', ++ 'tt_ru@iqtelif': 'tt_RU.UTF-8@iqtelif', + 'turkish': 'tr_TR.ISO8859-9', + 'turkish.iso88599': 'tr_TR.ISO8859-9', ++ 'ug_cn': 'ug_CN.UTF-8', + 'uk': 'uk_UA.KOI8-U', + 'uk_ua': 'uk_UA.KOI8-U', + 'uk_ua.cp1251': 'uk_UA.CP1251', +@@ -1595,6 +1702,7 @@ + 'univ': 'en_US.utf', + 'universal': 'en_US.utf', + 'universal.utf8@ucs4': 'en_US.UTF-8', ++ 'unm_us': 'unm_US.UTF-8', + 'ur': 'ur_PK.CP1256', + 'ur_in': 'ur_IN.UTF-8', + 'ur_pk': 'ur_PK.CP1256', +@@ -1619,6 +1727,9 @@ + 'wa_be.iso885915': 'wa_BE.ISO8859-15', + 'wa_be.iso885915@euro': 'wa_BE.ISO8859-15', + 'wa_be@euro': 'wa_BE.ISO8859-15', ++ 'wae_ch': 'wae_CH.UTF-8', ++ 'wal_et': 'wal_ET.UTF-8', ++ 'wo_sn': 'wo_SN.UTF-8', + 'xh': 'xh_ZA.ISO8859-1', + 'xh_za': 'xh_ZA.ISO8859-1', + 'xh_za.iso88591': 'xh_ZA.ISO8859-1', +@@ -1626,6 +1737,8 @@ + 'yi_us': 'yi_US.CP1255', + 'yi_us.cp1255': 'yi_US.CP1255', + 'yi_us.microsoftcp1255': 'yi_US.CP1255', ++ 'yo_ng': 'yo_NG.UTF-8', ++ 'yue_hk': 'yue_HK.UTF-8', + 'zh': 'zh_CN.eucCN', + 'zh_cn': 'zh_CN.gb2312', + 'zh_cn.big5': 'zh_TW.big5', +@@ -1637,6 +1750,8 @@ + 'zh_hk.big5': 'zh_HK.big5', + 'zh_hk.big5hk': 'zh_HK.big5hkscs', + 'zh_hk.big5hkscs': 'zh_HK.big5hkscs', ++ 'zh_sg': 'zh_SG.GB2312', ++ 'zh_sg.gbk': 'zh_SG.GBK', + 'zh_tw': 'zh_TW.big5', + 'zh_tw.big5': 'zh_TW.big5', + 'zh_tw.euc': 'zh_TW.eucTW', +diff -r ee879c0ffa11 Lib/logging/handlers.py +--- a/Lib/logging/handlers.py ++++ b/Lib/logging/handlers.py +@@ -840,18 +840,18 @@ + The record is formatted, and then sent to the syslog server. If + exception information is present, it is NOT sent to the server. + """ +- msg = self.format(record) + '\000' +- """ +- We need to convert record level to lowercase, maybe this will +- change in the future. +- """ +- prio = '<%d>' % self.encodePriority(self.facility, +- self.mapPriority(record.levelname)) +- # Message is a string. Convert to bytes as required by RFC 5424 +- if type(msg) is unicode: +- msg = msg.encode('utf-8') +- msg = prio + msg + try: ++ msg = self.format(record) + '\000' ++ """ ++ We need to convert record level to lowercase, maybe this will ++ change in the future. ++ """ ++ prio = '<%d>' % self.encodePriority(self.facility, ++ self.mapPriority(record.levelname)) ++ # Message is a string. Convert to bytes as required by RFC 5424 ++ if type(msg) is unicode: ++ msg = msg.encode('utf-8') ++ msg = prio + msg + if self.unixsocket: + try: + self.socket.send(msg) +@@ -889,11 +889,11 @@ + certificate file. (This tuple is passed to the `starttls` method). + """ + logging.Handler.__init__(self) +- if isinstance(mailhost, tuple): ++ if isinstance(mailhost, (list, tuple)): + self.mailhost, self.mailport = mailhost + else: + self.mailhost, self.mailport = mailhost, None +- if isinstance(credentials, tuple): ++ if isinstance(credentials, (list, tuple)): + self.username, self.password = credentials + else: + self.username = None +diff -r ee879c0ffa11 Lib/macpath.py +--- a/Lib/macpath.py ++++ b/Lib/macpath.py +@@ -42,7 +42,7 @@ + def join(s, *p): + path = s + for t in p: +- if (not s) or isabs(t): ++ if (not path) or isabs(t): + path = t + continue + if t[:1] == ':': +diff -r ee879c0ffa11 Lib/multiprocessing/dummy/__init__.py +--- a/Lib/multiprocessing/dummy/__init__.py ++++ b/Lib/multiprocessing/dummy/__init__.py +@@ -138,7 +138,7 @@ + self._value = value + value = property(_get, _set) + def __repr__(self): +- return '<%r(%r, %r)>'%(type(self).__name__,self._typecode,self._value) ++ return '<%s(%r, %r)>'%(type(self).__name__,self._typecode,self._value) + + def Manager(): + return sys.modules[__name__] +diff -r ee879c0ffa11 Lib/ntpath.py +--- a/Lib/ntpath.py ++++ b/Lib/ntpath.py +@@ -113,7 +113,7 @@ + """ + if len(p) > 1: + normp = p.replace(altsep, sep) +- if (normp[0:2] == sep*2) and (normp[2] != sep): ++ if (normp[0:2] == sep*2) and (normp[2:3] != sep): + # is a UNC path: + # vvvvvvvvvvvvvvvvvvvv drive letter or UNC path + # \\machine\mountpoint\directory\etc\... +diff -r ee879c0ffa11 Lib/pydoc.py +--- a/Lib/pydoc.py ++++ b/Lib/pydoc.py +@@ -1599,7 +1599,7 @@ + # in pydoc_data/topics.py. + # + # CAUTION: if you change one of these dictionaries, be sure to adapt the +- # list of needed labels in Doc/tools/sphinxext/pyspecific.py and ++ # list of needed labels in Doc/tools/pyspecific.py and + # regenerate the pydoc_data/topics.py file by running + # make pydoc-topics + # in Doc/ and copying the output file into the Lib/ directory. +diff -r ee879c0ffa11 Lib/re.py +--- a/Lib/re.py ++++ b/Lib/re.py +@@ -104,6 +104,10 @@ + import sys + import sre_compile + import sre_parse ++try: ++ import _locale ++except ImportError: ++ _locale = None + + # public symbols + __all__ = [ "match", "search", "sub", "subn", "split", "findall", +@@ -229,9 +233,12 @@ + bypass_cache = flags & DEBUG + if not bypass_cache: + cachekey = (type(key[0]),) + key +- p = _cache.get(cachekey) +- if p is not None: +- return p ++ try: ++ p, loc = _cache[cachekey] ++ if loc is None or loc == _locale.setlocale(_locale.LC_CTYPE): ++ return p ++ except KeyError: ++ pass + if isinstance(pattern, _pattern_type): + if flags: + raise ValueError('Cannot process flags argument with a compiled pattern') +@@ -245,7 +252,13 @@ + if not bypass_cache: + if len(_cache) >= _MAXCACHE: + _cache.clear() +- _cache[cachekey] = p ++ if p.flags & LOCALE: ++ if not _locale: ++ return p ++ loc = _locale.setlocale(_locale.LC_CTYPE) ++ else: ++ loc = None ++ _cache[cachekey] = p, loc + return p + + def _compile_repl(*key): +@@ -299,10 +312,11 @@ + s = sre_parse.Pattern() + s.flags = flags + for phrase, action in lexicon: ++ gid = s.opengroup() + p.append(sre_parse.SubPattern(s, [ +- (SUBPATTERN, (len(p)+1, sre_parse.parse(phrase, flags))), ++ (SUBPATTERN, (gid, sre_parse.parse(phrase, flags))), + ])) +- s.groups = len(p)+1 ++ s.closegroup(gid, p[-1]) + p = sre_parse.SubPattern(s, [(BRANCH, (None, p))]) + self.scanner = sre_compile.compile(p) + def scan(self, string): +diff -r ee879c0ffa11 Lib/smtplib.py +--- a/Lib/smtplib.py ++++ b/Lib/smtplib.py +@@ -754,6 +754,10 @@ + def quit(self): + """Terminate the SMTP session.""" + res = self.docmd("quit") ++ # A new EHLO is required after reconnecting with connect() ++ self.ehlo_resp = self.helo_resp = None ++ self.esmtp_features = {} ++ self.does_esmtp = False + self.close() + return res + +diff -r ee879c0ffa11 Lib/sqlite3/test/dbapi.py +--- a/Lib/sqlite3/test/dbapi.py ++++ b/Lib/sqlite3/test/dbapi.py +@@ -24,6 +24,7 @@ + import unittest + import sys + import sqlite3 as sqlite ++from test import test_support + try: + import threading + except ImportError: +@@ -653,7 +654,8 @@ + ts = sqlite.TimestampFromTicks(42) + + def CheckBinary(self): +- b = sqlite.Binary(chr(0) + "'") ++ with test_support.check_py3k_warnings(): ++ b = sqlite.Binary(chr(0) + "'") + + class ExtensionTests(unittest.TestCase): + def CheckScriptStringSql(self): +diff -r ee879c0ffa11 Lib/sqlite3/test/regression.py +--- a/Lib/sqlite3/test/regression.py ++++ b/Lib/sqlite3/test/regression.py +@@ -319,6 +319,16 @@ + sqlite.connect, ":memory:", isolation_level=123) + + ++ def CheckNullCharacter(self): ++ # Issue #21147 ++ con = sqlite.connect(":memory:") ++ self.assertRaises(ValueError, con, "\0select 1") ++ self.assertRaises(ValueError, con, "select 1\0") ++ cur = con.cursor() ++ self.assertRaises(ValueError, cur.execute, " \0select 2") ++ self.assertRaises(ValueError, cur.execute, "select 2\0") ++ ++ + def suite(): + regression_suite = unittest.makeSuite(RegressionTests, "Check") + return unittest.TestSuite((regression_suite,)) +diff -r ee879c0ffa11 Lib/sqlite3/test/types.py +--- a/Lib/sqlite3/test/types.py ++++ b/Lib/sqlite3/test/types.py +@@ -24,6 +24,7 @@ + import datetime + import unittest + import sqlite3 as sqlite ++from test import test_support + try: + import zlib + except ImportError: +@@ -67,7 +68,8 @@ + self.assertEqual(row[0], val) + + def CheckBlob(self): +- val = buffer("Guglhupf") ++ with test_support.check_py3k_warnings(): ++ val = buffer("Guglhupf") + self.cur.execute("insert into test(b) values (?)", (val,)) + self.cur.execute("select b from test") + row = self.cur.fetchone() +@@ -231,7 +233,8 @@ + + def CheckBlob(self): + # default +- val = buffer("Guglhupf") ++ with test_support.check_py3k_warnings(): ++ val = buffer("Guglhupf") + self.cur.execute("insert into test(bin) values (?)", (val,)) + self.cur.execute("select bin from test") + row = self.cur.fetchone() +@@ -347,7 +350,8 @@ + + def CheckBinaryInputForConverter(self): + testdata = "abcdefg" * 10 +- result = self.con.execute('select ? as "x [bin]"', (buffer(zlib.compress(testdata)),)).fetchone()[0] ++ with test_support.check_py3k_warnings(): ++ result = self.con.execute('select ? as "x [bin]"', (buffer(zlib.compress(testdata)),)).fetchone()[0] + self.assertEqual(testdata, result) + + class DateTimeTests(unittest.TestCase): +diff -r ee879c0ffa11 Lib/sqlite3/test/userfunctions.py +--- a/Lib/sqlite3/test/userfunctions.py ++++ b/Lib/sqlite3/test/userfunctions.py +@@ -24,6 +24,7 @@ + + import unittest + import sqlite3 as sqlite ++from test import test_support + + def func_returntext(): + return "foo" +@@ -36,7 +37,8 @@ + def func_returnnull(): + return None + def func_returnblob(): +- return buffer("blob") ++ with test_support.check_py3k_warnings(): ++ return buffer("blob") + def func_returnlonglong(): + return 1<<31 + def func_raiseexception(): +@@ -202,8 +204,9 @@ + cur = self.con.cursor() + cur.execute("select returnblob()") + val = cur.fetchone()[0] +- self.assertEqual(type(val), buffer) +- self.assertEqual(val, buffer("blob")) ++ with test_support.check_py3k_warnings(): ++ self.assertEqual(type(val), buffer) ++ self.assertEqual(val, buffer("blob")) + + def CheckFuncReturnLongLong(self): + cur = self.con.cursor() +@@ -246,7 +249,8 @@ + + def CheckParamBlob(self): + cur = self.con.cursor() +- cur.execute("select isblob(?)", (buffer("blob"),)) ++ with test_support.check_py3k_warnings(): ++ cur.execute("select isblob(?)", (buffer("blob"),)) + val = cur.fetchone()[0] + self.assertEqual(val, 1) + +@@ -269,8 +273,9 @@ + b blob + ) + """) +- cur.execute("insert into test(t, i, f, n, b) values (?, ?, ?, ?, ?)", +- ("foo", 5, 3.14, None, buffer("blob"),)) ++ with test_support.check_py3k_warnings(): ++ cur.execute("insert into test(t, i, f, n, b) values (?, ?, ?, ?, ?)", ++ ("foo", 5, 3.14, None, buffer("blob"),)) + + self.con.create_aggregate("nostep", 1, AggrNoStep) + self.con.create_aggregate("nofinalize", 1, AggrNoFinalize) +@@ -362,7 +367,8 @@ + + def CheckAggrCheckParamBlob(self): + cur = self.con.cursor() +- cur.execute("select checkType('blob', ?)", (buffer("blob"),)) ++ with test_support.check_py3k_warnings(): ++ cur.execute("select checkType('blob', ?)", (buffer("blob"),)) + val = cur.fetchone()[0] + self.assertEqual(val, 1) + +diff -r ee879c0ffa11 Lib/sre_compile.py +--- a/Lib/sre_compile.py ++++ b/Lib/sre_compile.py +@@ -1,3 +1,4 @@ ++# -*- coding: utf-8 -*- + # + # Secret Labs' Regular Expression Engine + # +@@ -21,14 +22,45 @@ + else: + MAXCODE = 0xFFFFFFFFL + +-def _identityfunction(x): +- return x +- + _LITERAL_CODES = set([LITERAL, NOT_LITERAL]) + _REPEATING_CODES = set([REPEAT, MIN_REPEAT, MAX_REPEAT]) + _SUCCESS_CODES = set([SUCCESS, FAILURE]) + _ASSERT_CODES = set([ASSERT, ASSERT_NOT]) + ++# Sets of lowercase characters which have the same uppercase. ++_equivalences = ( ++ # LATIN SMALL LETTER I, LATIN SMALL LETTER DOTLESS I ++ (0x69, 0x131), # iı ++ # LATIN SMALL LETTER S, LATIN SMALL LETTER LONG S ++ (0x73, 0x17f), # sÅ¿ ++ # MICRO SIGN, GREEK SMALL LETTER MU ++ (0xb5, 0x3bc), # µμ ++ # COMBINING GREEK YPOGEGRAMMENI, GREEK SMALL LETTER IOTA, GREEK PROSGEGRAMMENI ++ (0x345, 0x3b9, 0x1fbe), # \u0345ιι ++ # GREEK SMALL LETTER BETA, GREEK BETA SYMBOL ++ (0x3b2, 0x3d0), # Î²Ï ++ # GREEK SMALL LETTER EPSILON, GREEK LUNATE EPSILON SYMBOL ++ (0x3b5, 0x3f5), # εϵ ++ # GREEK SMALL LETTER THETA, GREEK THETA SYMBOL ++ (0x3b8, 0x3d1), # θϑ ++ # GREEK SMALL LETTER KAPPA, GREEK KAPPA SYMBOL ++ (0x3ba, 0x3f0), # κϰ ++ # GREEK SMALL LETTER PI, GREEK PI SYMBOL ++ (0x3c0, 0x3d6), # πϖ ++ # GREEK SMALL LETTER RHO, GREEK RHO SYMBOL ++ (0x3c1, 0x3f1), # Ïϱ ++ # GREEK SMALL LETTER FINAL SIGMA, GREEK SMALL LETTER SIGMA ++ (0x3c2, 0x3c3), # ςσ ++ # GREEK SMALL LETTER PHI, GREEK PHI SYMBOL ++ (0x3c6, 0x3d5), # φϕ ++ # LATIN SMALL LETTER S WITH DOT ABOVE, LATIN SMALL LETTER LONG S WITH DOT ABOVE ++ (0x1e61, 0x1e9b), # ṡẛ ++) ++ ++# Maps the lowercase code to lowercase codes which have the same uppercase. ++_ignorecase_fixes = {i: tuple(j for j in t if i != j) ++ for t in _equivalences for i in t} ++ + def _compile(code, pattern, flags): + # internal: compile a (sub)pattern + emit = code.append +@@ -37,11 +69,29 @@ + REPEATING_CODES = _REPEATING_CODES + SUCCESS_CODES = _SUCCESS_CODES + ASSERT_CODES = _ASSERT_CODES ++ if (flags & SRE_FLAG_IGNORECASE and ++ not (flags & SRE_FLAG_LOCALE) and ++ flags & SRE_FLAG_UNICODE): ++ fixes = _ignorecase_fixes ++ else: ++ fixes = None + for op, av in pattern: + if op in LITERAL_CODES: + if flags & SRE_FLAG_IGNORECASE: +- emit(OPCODES[OP_IGNORE[op]]) +- emit(_sre.getlower(av, flags)) ++ lo = _sre.getlower(av, flags) ++ if fixes and lo in fixes: ++ emit(OPCODES[IN_IGNORE]) ++ skip = _len(code); emit(0) ++ if op is NOT_LITERAL: ++ emit(OPCODES[NEGATE]) ++ for k in (lo,) + fixes[lo]: ++ emit(OPCODES[LITERAL]) ++ emit(k) ++ emit(OPCODES[FAILURE]) ++ code[skip] = _len(code) - skip ++ else: ++ emit(OPCODES[OP_IGNORE[op]]) ++ emit(lo) + else: + emit(OPCODES[op]) + emit(av) +@@ -52,9 +102,9 @@ + return _sre.getlower(literal, flags) + else: + emit(OPCODES[op]) +- fixup = _identityfunction ++ fixup = None + skip = _len(code); emit(0) +- _compile_charset(av, flags, code, fixup) ++ _compile_charset(av, flags, code, fixup, fixes) + code[skip] = _len(code) - skip + elif op is ANY: + if flags & SRE_FLAG_DOTALL: +@@ -175,20 +225,19 @@ + else: + raise ValueError, ("unsupported operand type", op) + +-def _compile_charset(charset, flags, code, fixup=None): ++def _compile_charset(charset, flags, code, fixup=None, fixes=None): + # compile charset subprogram + emit = code.append +- if fixup is None: +- fixup = _identityfunction +- for op, av in _optimize_charset(charset, fixup): ++ for op, av in _optimize_charset(charset, fixup, fixes, ++ flags & SRE_FLAG_UNICODE): + emit(OPCODES[op]) + if op is NEGATE: + pass + elif op is LITERAL: +- emit(fixup(av)) ++ emit(av) + elif op is RANGE: +- emit(fixup(av[0])) +- emit(fixup(av[1])) ++ emit(av[0]) ++ emit(av[1]) + elif op is CHARSET: + code.extend(av) + elif op is BIGCHARSET: +@@ -204,152 +253,177 @@ + raise error, "internal: unsupported set operator" + emit(OPCODES[FAILURE]) + +-def _optimize_charset(charset, fixup): ++def _optimize_charset(charset, fixup, fixes, isunicode): + # internal: optimize character set + out = [] +- outappend = out.append +- charmap = [0]*256 +- try: +- for op, av in charset: +- if op is NEGATE: +- outappend((op, av)) +- elif op is LITERAL: +- charmap[fixup(av)] = 1 +- elif op is RANGE: +- for i in range(fixup(av[0]), fixup(av[1])+1): +- charmap[i] = 1 +- elif op is CATEGORY: +- # XXX: could append to charmap tail +- return charset # cannot compress +- except IndexError: +- # character set contains unicode characters +- return _optimize_unicode(charset, fixup) ++ tail = [] ++ charmap = bytearray(256) ++ for op, av in charset: ++ while True: ++ try: ++ if op is LITERAL: ++ if fixup: ++ i = fixup(av) ++ charmap[i] = 1 ++ if fixes and i in fixes: ++ for k in fixes[i]: ++ charmap[k] = 1 ++ else: ++ charmap[av] = 1 ++ elif op is RANGE: ++ r = range(av[0], av[1]+1) ++ if fixup: ++ r = map(fixup, r) ++ if fixup and fixes: ++ for i in r: ++ charmap[i] = 1 ++ if i in fixes: ++ for k in fixes[i]: ++ charmap[k] = 1 ++ else: ++ for i in r: ++ charmap[i] = 1 ++ elif op is NEGATE: ++ out.append((op, av)) ++ else: ++ tail.append((op, av)) ++ except IndexError: ++ if len(charmap) == 256: ++ # character set contains non-UCS1 character codes ++ charmap += b'\0' * 0xff00 ++ continue ++ # character set contains non-BMP character codes ++ if fixup and isunicode and op is RANGE: ++ lo, hi = av ++ ranges = [av] ++ # There are only two ranges of cased astral characters: ++ # 10400-1044F (Deseret) and 118A0-118DF (Warang Citi). ++ _fixup_range(max(0x10000, lo), min(0x11fff, hi), ++ ranges, fixup) ++ for lo, hi in ranges: ++ if lo == hi: ++ tail.append((LITERAL, hi)) ++ else: ++ tail.append((RANGE, (lo, hi))) ++ else: ++ tail.append((op, av)) ++ break ++ + # compress character map +- i = p = n = 0 + runs = [] +- runsappend = runs.append +- for c in charmap: +- if c: +- if n == 0: +- p = i +- n = n + 1 +- elif n: +- runsappend((p, n)) +- n = 0 +- i = i + 1 +- if n: +- runsappend((p, n)) +- if len(runs) <= 2: ++ q = 0 ++ while True: ++ p = charmap.find(b'\1', q) ++ if p < 0: ++ break ++ if len(runs) >= 2: ++ runs = None ++ break ++ q = charmap.find(b'\0', p) ++ if q < 0: ++ runs.append((p, len(charmap))) ++ break ++ runs.append((p, q)) ++ if runs is not None: + # use literal/range +- for p, n in runs: +- if n == 1: +- outappend((LITERAL, p)) ++ for p, q in runs: ++ if q - p == 1: ++ out.append((LITERAL, p)) + else: +- outappend((RANGE, (p, p+n-1))) +- if len(out) < len(charset): ++ out.append((RANGE, (p, q - 1))) ++ out += tail ++ # if the case was changed or new representation is more compact ++ if fixup or len(out) < len(charset): + return out +- else: +- # use bitmap ++ # else original character set is good enough ++ return charset ++ ++ # use bitmap ++ if len(charmap) == 256: + data = _mk_bitmap(charmap) +- outappend((CHARSET, data)) ++ out.append((CHARSET, data)) ++ out += tail + return out +- return charset + +-def _mk_bitmap(bits): +- data = [] +- dataappend = data.append +- if _sre.CODESIZE == 2: +- start = (1, 0) +- else: +- start = (1L, 0L) +- m, v = start +- for c in bits: +- if c: +- v = v + m +- m = m + m +- if m > MAXCODE: +- dataappend(v) +- m, v = start +- return data ++ # To represent a big charset, first a bitmap of all characters in the ++ # set is constructed. Then, this bitmap is sliced into chunks of 256 ++ # characters, duplicate chunks are eliminated, and each chunk is ++ # given a number. In the compiled expression, the charset is ++ # represented by a 32-bit word sequence, consisting of one word for ++ # the number of different chunks, a sequence of 256 bytes (64 words) ++ # of chunk numbers indexed by their original chunk position, and a ++ # sequence of 256-bit chunks (8 words each). + +-# To represent a big charset, first a bitmap of all characters in the +-# set is constructed. Then, this bitmap is sliced into chunks of 256 +-# characters, duplicate chunks are eliminated, and each chunk is +-# given a number. In the compiled expression, the charset is +-# represented by a 32-bit word sequence, consisting of one word for +-# the number of different chunks, a sequence of 256 bytes (64 words) +-# of chunk numbers indexed by their original chunk position, and a +-# sequence of 256-bit chunks (8 words each). ++ # Compression is normally good: in a typical charset, large ranges of ++ # Unicode will be either completely excluded (e.g. if only cyrillic ++ # letters are to be matched), or completely included (e.g. if large ++ # subranges of Kanji match). These ranges will be represented by ++ # chunks of all one-bits or all zero-bits. + +-# Compression is normally good: in a typical charset, large ranges of +-# Unicode will be either completely excluded (e.g. if only cyrillic +-# letters are to be matched), or completely included (e.g. if large +-# subranges of Kanji match). These ranges will be represented by +-# chunks of all one-bits or all zero-bits. ++ # Matching can be also done efficiently: the more significant byte of ++ # the Unicode character is an index into the chunk number, and the ++ # less significant byte is a bit index in the chunk (just like the ++ # CHARSET matching). + +-# Matching can be also done efficiently: the more significant byte of +-# the Unicode character is an index into the chunk number, and the +-# less significant byte is a bit index in the chunk (just like the +-# CHARSET matching). ++ # In UCS-4 mode, the BIGCHARSET opcode still supports only subsets ++ # of the basic multilingual plane; an efficient representation ++ # for all of Unicode has not yet been developed. + +-# In UCS-4 mode, the BIGCHARSET opcode still supports only subsets +-# of the basic multilingual plane; an efficient representation +-# for all of Unicode has not yet been developed. This means, +-# in particular, that negated charsets cannot be represented as +-# bigcharsets. ++ charmap = bytes(charmap) # should be hashable ++ comps = {} ++ mapping = bytearray(256) ++ block = 0 ++ data = bytearray() ++ for i in range(0, 65536, 256): ++ chunk = charmap[i: i + 256] ++ if chunk in comps: ++ mapping[i // 256] = comps[chunk] ++ else: ++ mapping[i // 256] = comps[chunk] = block ++ block += 1 ++ data += chunk ++ data = _mk_bitmap(data) ++ data[0:0] = [block] + _bytes_to_codes(mapping) ++ out.append((BIGCHARSET, data)) ++ out += tail ++ return out + +-def _optimize_unicode(charset, fixup): +- try: +- import array +- except ImportError: +- return charset +- charmap = [0]*65536 +- negate = 0 +- try: +- for op, av in charset: +- if op is NEGATE: +- negate = 1 +- elif op is LITERAL: +- charmap[fixup(av)] = 1 +- elif op is RANGE: +- for i in xrange(fixup(av[0]), fixup(av[1])+1): +- charmap[i] = 1 +- elif op is CATEGORY: +- # XXX: could expand category +- return charset # cannot compress +- except IndexError: +- # non-BMP characters +- return charset +- if negate: +- if sys.maxunicode != 65535: +- # XXX: negation does not work with big charsets +- return charset +- for i in xrange(65536): +- charmap[i] = not charmap[i] +- comps = {} +- mapping = [0]*256 +- block = 0 +- data = [] +- for i in xrange(256): +- chunk = tuple(charmap[i*256:(i+1)*256]) +- new = comps.setdefault(chunk, block) +- mapping[i] = new +- if new == block: +- block = block + 1 +- data = data + _mk_bitmap(chunk) +- header = [block] ++def _fixup_range(lo, hi, ranges, fixup): ++ for i in map(fixup, range(lo, hi+1)): ++ for k, (lo, hi) in enumerate(ranges): ++ if i < lo: ++ if l == lo - 1: ++ ranges[k] = (i, hi) ++ else: ++ ranges.insert(k, (i, i)) ++ break ++ elif i > hi: ++ if i == hi + 1: ++ ranges[k] = (lo, i) ++ break ++ else: ++ break ++ else: ++ ranges.append((i, i)) ++ ++_CODEBITS = _sre.CODESIZE * 8 ++_BITS_TRANS = b'0' + b'1' * 255 ++def _mk_bitmap(bits, _CODEBITS=_CODEBITS, _int=int): ++ s = bytes(bits).translate(_BITS_TRANS)[::-1] ++ return [_int(s[i - _CODEBITS: i], 2) ++ for i in range(len(s), 0, -_CODEBITS)] ++ ++def _bytes_to_codes(b): ++ # Convert block indices to word array ++ import array + if _sre.CODESIZE == 2: + code = 'H' + else: + code = 'I' +- # Convert block indices to byte array of 256 bytes +- mapping = array.array('B', mapping).tostring() +- # Convert byte array to word array +- mapping = array.array(code, mapping) +- assert mapping.itemsize == _sre.CODESIZE +- header = header + mapping.tolist() +- data[0:0] = header +- return [(BIGCHARSET, data)] ++ a = array.array(code, bytes(b)) ++ assert a.itemsize == _sre.CODESIZE ++ assert len(a) * a.itemsize == len(b) ++ return a.tolist() + + def _simple(av): + # check if av is a "simple" operator +diff -r ee879c0ffa11 Lib/sre_parse.py +--- a/Lib/sre_parse.py ++++ b/Lib/sre_parse.py +@@ -66,24 +66,25 @@ + # master pattern object. keeps track of global attributes + def __init__(self): + self.flags = 0 +- self.open = [] +- self.groups = 1 + self.groupdict = {} ++ self.subpatterns = [None] # group 0 ++ @property ++ def groups(self): ++ return len(self.subpatterns) + def opengroup(self, name=None): + gid = self.groups +- self.groups = gid + 1 ++ self.subpatterns.append(None) + if name is not None: + ogid = self.groupdict.get(name, None) + if ogid is not None: + raise error, ("redefinition of group name %s as group %d; " + "was group %d" % (repr(name), gid, ogid)) + self.groupdict[name] = gid +- self.open.append(gid) + return gid +- def closegroup(self, gid): +- self.open.remove(gid) ++ def closegroup(self, gid, p): ++ self.subpatterns[gid] = p + def checkgroup(self, gid): +- return gid < self.groups and gid not in self.open ++ return gid < self.groups and self.subpatterns[gid] is not None + + class SubPattern: + # a subpattern, in intermediate form +@@ -94,33 +95,42 @@ + self.data = data + self.width = None + def dump(self, level=0): +- nl = 1 +- seqtypes = type(()), type([]) ++ seqtypes = (tuple, list) + for op, av in self.data: +- print level*" " + op,; nl = 0 +- if op == "in": ++ print level*" " + op, ++ if op == IN: + # member sublanguage +- print; nl = 1 ++ print + for op, a in av: + print (level+1)*" " + op, a +- elif op == "branch": +- print; nl = 1 +- i = 0 +- for a in av[1]: +- if i > 0: ++ elif op == BRANCH: ++ print ++ for i, a in enumerate(av[1]): ++ if i: + print level*" " + "or" +- a.dump(level+1); nl = 1 +- i = i + 1 +- elif type(av) in seqtypes: ++ a.dump(level+1) ++ elif op == GROUPREF_EXISTS: ++ condgroup, item_yes, item_no = av ++ print condgroup ++ item_yes.dump(level+1) ++ if item_no: ++ print level*" " + "else" ++ item_no.dump(level+1) ++ elif isinstance(av, seqtypes): ++ nl = 0 + for a in av: + if isinstance(a, SubPattern): +- if not nl: print +- a.dump(level+1); nl = 1 ++ if not nl: ++ print ++ a.dump(level+1) ++ nl = 1 + else: +- print a, ; nl = 0 ++ print a, ++ nl = 0 ++ if not nl: ++ print + else: +- print av, ; nl = 0 +- if not nl: print ++ print av + def __repr__(self): + return repr(self.data) + def __len__(self): +@@ -169,7 +179,21 @@ + elif op in UNITCODES: + lo = lo + 1 + hi = hi + 1 +- elif op == SUCCESS: ++ elif op is GROUPREF: ++ i, j = self.pattern.subpatterns[av].getwidth() ++ lo = lo + i ++ hi = hi + j ++ elif op is GROUPREF_EXISTS: ++ i, j = av[1].getwidth() ++ if av[2] is not None: ++ l, h = av[2].getwidth() ++ i = min(i, l) ++ j = max(j, h) ++ else: ++ i = 0 ++ lo = lo + i ++ hi = hi + j ++ elif op is SUCCESS: + break + self.width = min(lo, MAXREPEAT - 1), min(hi, MAXREPEAT) + return self.width +@@ -648,7 +672,7 @@ + if not sourcematch(")"): + raise error, "unbalanced parenthesis" + if group is not None: +- state.closegroup(group) ++ state.closegroup(group, p) + subpatternappend((SUBPATTERN, (group, p))) + else: + while 1: +diff -r ee879c0ffa11 Lib/ssl.py +--- a/Lib/ssl.py ++++ b/Lib/ssl.py +@@ -1,8 +1,7 @@ + # Wrapper module for _ssl, providing some additional facilities + # implemented in Python. Written by Bill Janssen. + +-"""\ +-This module provides some more Pythonic support for SSL. ++"""This module provides some more Pythonic support for SSL. + + Object types: + +@@ -53,62 +52,460 @@ + PROTOCOL_SSLv3 + PROTOCOL_SSLv23 + PROTOCOL_TLSv1 ++PROTOCOL_TLSv1_1 ++PROTOCOL_TLSv1_2 ++ ++The following constants identify various SSL alert message descriptions as per ++http://www.iana.org/assignments/tls-parameters/tls-parameters.xml#tls-parameters-6 ++ ++ALERT_DESCRIPTION_CLOSE_NOTIFY ++ALERT_DESCRIPTION_UNEXPECTED_MESSAGE ++ALERT_DESCRIPTION_BAD_RECORD_MAC ++ALERT_DESCRIPTION_RECORD_OVERFLOW ++ALERT_DESCRIPTION_DECOMPRESSION_FAILURE ++ALERT_DESCRIPTION_HANDSHAKE_FAILURE ++ALERT_DESCRIPTION_BAD_CERTIFICATE ++ALERT_DESCRIPTION_UNSUPPORTED_CERTIFICATE ++ALERT_DESCRIPTION_CERTIFICATE_REVOKED ++ALERT_DESCRIPTION_CERTIFICATE_EXPIRED ++ALERT_DESCRIPTION_CERTIFICATE_UNKNOWN ++ALERT_DESCRIPTION_ILLEGAL_PARAMETER ++ALERT_DESCRIPTION_UNKNOWN_CA ++ALERT_DESCRIPTION_ACCESS_DENIED ++ALERT_DESCRIPTION_DECODE_ERROR ++ALERT_DESCRIPTION_DECRYPT_ERROR ++ALERT_DESCRIPTION_PROTOCOL_VERSION ++ALERT_DESCRIPTION_INSUFFICIENT_SECURITY ++ALERT_DESCRIPTION_INTERNAL_ERROR ++ALERT_DESCRIPTION_USER_CANCELLED ++ALERT_DESCRIPTION_NO_RENEGOTIATION ++ALERT_DESCRIPTION_UNSUPPORTED_EXTENSION ++ALERT_DESCRIPTION_CERTIFICATE_UNOBTAINABLE ++ALERT_DESCRIPTION_UNRECOGNIZED_NAME ++ALERT_DESCRIPTION_BAD_CERTIFICATE_STATUS_RESPONSE ++ALERT_DESCRIPTION_BAD_CERTIFICATE_HASH_VALUE ++ALERT_DESCRIPTION_UNKNOWN_PSK_IDENTITY + """ + + import textwrap ++import re ++import sys ++import os ++from collections import namedtuple ++from contextlib import closing + + import _ssl # if we can't import it, let the error propagate + + from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION +-from _ssl import SSLError ++from _ssl import _SSLContext ++from _ssl import ( ++ SSLError, SSLZeroReturnError, SSLWantReadError, SSLWantWriteError, ++ SSLSyscallError, SSLEOFError, ++ ) + from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED ++from _ssl import (VERIFY_DEFAULT, VERIFY_CRL_CHECK_LEAF, VERIFY_CRL_CHECK_CHAIN, ++ VERIFY_X509_STRICT) ++from _ssl import txt2obj as _txt2obj, nid2obj as _nid2obj + from _ssl import RAND_status, RAND_egd, RAND_add +-from _ssl import \ +- SSL_ERROR_ZERO_RETURN, \ +- SSL_ERROR_WANT_READ, \ +- SSL_ERROR_WANT_WRITE, \ +- SSL_ERROR_WANT_X509_LOOKUP, \ +- SSL_ERROR_SYSCALL, \ +- SSL_ERROR_SSL, \ +- SSL_ERROR_WANT_CONNECT, \ +- SSL_ERROR_EOF, \ +- SSL_ERROR_INVALID_ERROR_CODE +-from _ssl import PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1 +-_PROTOCOL_NAMES = { +- PROTOCOL_TLSv1: "TLSv1", +- PROTOCOL_SSLv23: "SSLv23", +- PROTOCOL_SSLv3: "SSLv3", +-} ++ ++def _import_symbols(prefix): ++ for n in dir(_ssl): ++ if n.startswith(prefix): ++ globals()[n] = getattr(_ssl, n) ++ ++_import_symbols('OP_') ++_import_symbols('ALERT_DESCRIPTION_') ++_import_symbols('SSL_ERROR_') ++_import_symbols('PROTOCOL_') ++ ++from _ssl import HAS_SNI, HAS_ECDH, HAS_NPN ++ ++from _ssl import _OPENSSL_API_VERSION ++ ++_PROTOCOL_NAMES = {value: name for name, value in globals().items() if name.startswith('PROTOCOL_')} ++ + try: +- from _ssl import PROTOCOL_SSLv2 + _SSLv2_IF_EXISTS = PROTOCOL_SSLv2 +-except ImportError: ++except NameError: + _SSLv2_IF_EXISTS = None +-else: +- _PROTOCOL_NAMES[PROTOCOL_SSLv2] = "SSLv2" + + from socket import socket, _fileobject, _delegate_methods, error as socket_error +-from socket import getnameinfo as _getnameinfo +-from socket import SOL_SOCKET, SO_TYPE, SOCK_STREAM ++if sys.platform == "win32": ++ from _ssl import enum_certificates, enum_crls ++ ++from socket import socket, AF_INET, SOCK_STREAM, create_connection ++from socket import SOL_SOCKET, SO_TYPE + import base64 # for DER-to-PEM translation + import errno + ++if _ssl.HAS_TLS_UNIQUE: ++ CHANNEL_BINDING_TYPES = ['tls-unique'] ++else: ++ CHANNEL_BINDING_TYPES = [] ++ + # Disable weak or insecure ciphers by default + # (OpenSSL's default setting is 'DEFAULT:!aNULL:!eNULL') +-_DEFAULT_CIPHERS = 'DEFAULT:!aNULL:!eNULL:!LOW:!EXPORT:!SSLv2' ++# Enable a better set of ciphers by default ++# This list has been explicitly chosen to: ++# * Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE) ++# * Prefer ECDHE over DHE for better performance ++# * Prefer any AES-GCM over any AES-CBC for better performance and security ++# * Then Use HIGH cipher suites as a fallback ++# * Then Use 3DES as fallback which is secure but slow ++# * Finally use RC4 as a fallback which is problematic but needed for ++# compatibility some times. ++# * Disable NULL authentication, NULL encryption, and MD5 MACs for security ++# reasons ++_DEFAULT_CIPHERS = ( ++ 'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+HIGH:' ++ 'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:ECDH+RC4:' ++ 'DH+RC4:RSA+RC4:!aNULL:!eNULL:!MD5' ++) + ++# Restricted and more secure ciphers for the server side ++# This list has been explicitly chosen to: ++# * Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE) ++# * Prefer ECDHE over DHE for better performance ++# * Prefer any AES-GCM over any AES-CBC for better performance and security ++# * Then Use HIGH cipher suites as a fallback ++# * Then Use 3DES as fallback which is secure but slow ++# * Disable NULL authentication, NULL encryption, MD5 MACs, DSS, and RC4 for ++# security reasons ++_RESTRICTED_SERVER_CIPHERS = ( ++ 'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+HIGH:' ++ 'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:!aNULL:' ++ '!eNULL:!MD5:!DSS:!RC4' ++) ++ ++ ++class CertificateError(ValueError): ++ pass ++ ++ ++def _dnsname_match(dn, hostname, max_wildcards=1): ++ """Matching according to RFC 6125, section 6.4.3 ++ ++ http://tools.ietf.org/html/rfc6125#section-6.4.3 ++ """ ++ pats = [] ++ if not dn: ++ return False ++ ++ pieces = dn.split(r'.') ++ leftmost = pieces[0] ++ remainder = pieces[1:] ++ ++ wildcards = leftmost.count('*') ++ if wildcards > max_wildcards: ++ # Issue #17980: avoid denials of service by refusing more ++ # than one wildcard per fragment. A survery of established ++ # policy among SSL implementations showed it to be a ++ # reasonable choice. ++ raise CertificateError( ++ "too many wildcards in certificate DNS name: " + repr(dn)) ++ ++ # speed up common case w/o wildcards ++ if not wildcards: ++ return dn.lower() == hostname.lower() ++ ++ # RFC 6125, section 6.4.3, subitem 1. ++ # The client SHOULD NOT attempt to match a presented identifier in which ++ # the wildcard character comprises a label other than the left-most label. ++ if leftmost == '*': ++ # When '*' is a fragment by itself, it matches a non-empty dotless ++ # fragment. ++ pats.append('[^.]+') ++ elif leftmost.startswith('xn--') or hostname.startswith('xn--'): ++ # RFC 6125, section 6.4.3, subitem 3. ++ # The client SHOULD NOT attempt to match a presented identifier ++ # where the wildcard character is embedded within an A-label or ++ # U-label of an internationalized domain name. ++ pats.append(re.escape(leftmost)) ++ else: ++ # Otherwise, '*' matches any dotless string, e.g. www* ++ pats.append(re.escape(leftmost).replace(r'\*', '[^.]*')) ++ ++ # add the remaining fragments, ignore any wildcards ++ for frag in remainder: ++ pats.append(re.escape(frag)) ++ ++ pat = re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE) ++ return pat.match(hostname) ++ ++ ++def match_hostname(cert, hostname): ++ """Verify that *cert* (in decoded format as returned by ++ SSLSocket.getpeercert()) matches the *hostname*. RFC 2818 and RFC 6125 ++ rules are followed, but IP addresses are not accepted for *hostname*. ++ ++ CertificateError is raised on failure. On success, the function ++ returns nothing. ++ """ ++ if not cert: ++ raise ValueError("empty or no certificate, match_hostname needs a " ++ "SSL socket or SSL context with either " ++ "CERT_OPTIONAL or CERT_REQUIRED") ++ dnsnames = [] ++ san = cert.get('subjectAltName', ()) ++ for key, value in san: ++ if key == 'DNS': ++ if _dnsname_match(value, hostname): ++ return ++ dnsnames.append(value) ++ if not dnsnames: ++ # The subject is only checked when there is no dNSName entry ++ # in subjectAltName ++ for sub in cert.get('subject', ()): ++ for key, value in sub: ++ # XXX according to RFC 2818, the most specific Common Name ++ # must be used. ++ if key == 'commonName': ++ if _dnsname_match(value, hostname): ++ return ++ dnsnames.append(value) ++ if len(dnsnames) > 1: ++ raise CertificateError("hostname %r " ++ "doesn't match either of %s" ++ % (hostname, ', '.join(map(repr, dnsnames)))) ++ elif len(dnsnames) == 1: ++ raise CertificateError("hostname %r " ++ "doesn't match %r" ++ % (hostname, dnsnames[0])) ++ else: ++ raise CertificateError("no appropriate commonName or " ++ "subjectAltName fields were found") ++ ++ ++DefaultVerifyPaths = namedtuple("DefaultVerifyPaths", ++ "cafile capath openssl_cafile_env openssl_cafile openssl_capath_env " ++ "openssl_capath") ++ ++def get_default_verify_paths(): ++ """Return paths to default cafile and capath. ++ """ ++ parts = _ssl.get_default_verify_paths() ++ ++ # environment vars shadow paths ++ cafile = os.environ.get(parts[0], parts[1]) ++ capath = os.environ.get(parts[2], parts[3]) ++ ++ return DefaultVerifyPaths(cafile if os.path.isfile(cafile) else None, ++ capath if os.path.isdir(capath) else None, ++ *parts) ++ ++ ++class _ASN1Object(namedtuple("_ASN1Object", "nid shortname longname oid")): ++ """ASN.1 object identifier lookup ++ """ ++ __slots__ = () ++ ++ def __new__(cls, oid): ++ return super(_ASN1Object, cls).__new__(cls, *_txt2obj(oid, name=False)) ++ ++ @classmethod ++ def fromnid(cls, nid): ++ """Create _ASN1Object from OpenSSL numeric ID ++ """ ++ return super(_ASN1Object, cls).__new__(cls, *_nid2obj(nid)) ++ ++ @classmethod ++ def fromname(cls, name): ++ """Create _ASN1Object from short name, long name or OID ++ """ ++ return super(_ASN1Object, cls).__new__(cls, *_txt2obj(name, name=True)) ++ ++ ++class Purpose(_ASN1Object): ++ """SSLContext purpose flags with X509v3 Extended Key Usage objects ++ """ ++ ++Purpose.SERVER_AUTH = Purpose('1.3.6.1.5.5.7.3.1') ++Purpose.CLIENT_AUTH = Purpose('1.3.6.1.5.5.7.3.2') ++ ++ ++class SSLContext(_SSLContext): ++ """An SSLContext holds various SSL-related configuration options and ++ data, such as certificates and possibly a private key.""" ++ ++ __slots__ = ('protocol', '__weakref__') ++ _windows_cert_stores = ("CA", "ROOT") ++ ++ def __new__(cls, protocol, *args, **kwargs): ++ self = _SSLContext.__new__(cls, protocol) ++ if protocol != _SSLv2_IF_EXISTS: ++ self.set_ciphers(_DEFAULT_CIPHERS) ++ return self ++ ++ def __init__(self, protocol): ++ self.protocol = protocol ++ ++ def wrap_socket(self, sock, server_side=False, ++ do_handshake_on_connect=True, ++ suppress_ragged_eofs=True, ++ server_hostname=None): ++ return SSLSocket(sock=sock, server_side=server_side, ++ do_handshake_on_connect=do_handshake_on_connect, ++ suppress_ragged_eofs=suppress_ragged_eofs, ++ server_hostname=server_hostname, ++ _context=self) ++ ++ def set_npn_protocols(self, npn_protocols): ++ protos = bytearray() ++ for protocol in npn_protocols: ++ b = protocol.encode('ascii') ++ if len(b) == 0 or len(b) > 255: ++ raise SSLError('NPN protocols must be 1 to 255 in length') ++ protos.append(len(b)) ++ protos.extend(b) ++ ++ self._set_npn_protocols(protos) ++ ++ def _load_windows_store_certs(self, storename, purpose): ++ certs = bytearray() ++ for cert, encoding, trust in enum_certificates(storename): ++ # CA certs are never PKCS#7 encoded ++ if encoding == "x509_asn": ++ if trust is True or purpose.oid in trust: ++ certs.extend(cert) ++ self.load_verify_locations(cadata=certs) ++ return certs ++ ++ def load_default_certs(self, purpose=Purpose.SERVER_AUTH): ++ if not isinstance(purpose, _ASN1Object): ++ raise TypeError(purpose) ++ if sys.platform == "win32": ++ for storename in self._windows_cert_stores: ++ self._load_windows_store_certs(storename, purpose) ++ self.set_default_verify_paths() ++ ++ ++def create_default_context(purpose=Purpose.SERVER_AUTH, cafile=None, ++ capath=None, cadata=None): ++ """Create a SSLContext object with default settings. ++ ++ NOTE: The protocol and settings may change anytime without prior ++ deprecation. The values represent a fair balance between maximum ++ compatibility and security. ++ """ ++ if not isinstance(purpose, _ASN1Object): ++ raise TypeError(purpose) ++ ++ context = SSLContext(PROTOCOL_SSLv23) ++ ++ # SSLv2 considered harmful. ++ context.options |= OP_NO_SSLv2 ++ ++ # SSLv3 has problematic security and is only required for really old ++ # clients such as IE6 on Windows XP ++ context.options |= OP_NO_SSLv3 ++ ++ # disable compression to prevent CRIME attacks (OpenSSL 1.0+) ++ context.options |= getattr(_ssl, "OP_NO_COMPRESSION", 0) ++ ++ if purpose == Purpose.SERVER_AUTH: ++ # verify certs and host name in client mode ++ context.verify_mode = CERT_REQUIRED ++ context.check_hostname = True ++ elif purpose == Purpose.CLIENT_AUTH: ++ # Prefer the server's ciphers by default so that we get stronger ++ # encryption ++ context.options |= getattr(_ssl, "OP_CIPHER_SERVER_PREFERENCE", 0) ++ ++ # Use single use keys in order to improve forward secrecy ++ context.options |= getattr(_ssl, "OP_SINGLE_DH_USE", 0) ++ context.options |= getattr(_ssl, "OP_SINGLE_ECDH_USE", 0) ++ ++ # disallow ciphers with known vulnerabilities ++ context.set_ciphers(_RESTRICTED_SERVER_CIPHERS) ++ ++ if cafile or capath or cadata: ++ context.load_verify_locations(cafile, capath, cadata) ++ elif context.verify_mode != CERT_NONE: ++ # no explicit cafile, capath or cadata but the verify mode is ++ # CERT_OPTIONAL or CERT_REQUIRED. Let's try to load default system ++ # root CA certificates for the given purpose. This may fail silently. ++ context.load_default_certs(purpose) ++ return context ++ ++ ++def _create_stdlib_context(protocol=PROTOCOL_SSLv23, cert_reqs=None, ++ check_hostname=False, purpose=Purpose.SERVER_AUTH, ++ certfile=None, keyfile=None, ++ cafile=None, capath=None, cadata=None): ++ """Create a SSLContext object for Python stdlib modules ++ ++ All Python stdlib modules shall use this function to create SSLContext ++ objects in order to keep common settings in one place. The configuration ++ is less restrict than create_default_context()'s to increase backward ++ compatibility. ++ """ ++ if not isinstance(purpose, _ASN1Object): ++ raise TypeError(purpose) ++ ++ context = SSLContext(protocol) ++ # SSLv2 considered harmful. ++ context.options |= OP_NO_SSLv2 ++ ++ if cert_reqs is not None: ++ context.verify_mode = cert_reqs ++ context.check_hostname = check_hostname ++ ++ if keyfile and not certfile: ++ raise ValueError("certfile must be specified") ++ if certfile or keyfile: ++ context.load_cert_chain(certfile, keyfile) ++ ++ # load CA root certs ++ if cafile or capath or cadata: ++ context.load_verify_locations(cafile, capath, cadata) ++ elif context.verify_mode != CERT_NONE: ++ # no explicit cafile, capath or cadata but the verify mode is ++ # CERT_OPTIONAL or CERT_REQUIRED. Let's try to load default system ++ # root CA certificates for the given purpose. This may fail silently. ++ context.load_default_certs(purpose) ++ ++ return context + + class SSLSocket(socket): +- + """This class implements a subtype of socket.socket that wraps + the underlying OS socket in an SSL context when necessary, and + provides read and write methods over that channel.""" + +- def __init__(self, sock, keyfile=None, certfile=None, ++ def __init__(self, sock=None, keyfile=None, certfile=None, + server_side=False, cert_reqs=CERT_NONE, + ssl_version=PROTOCOL_SSLv23, ca_certs=None, + do_handshake_on_connect=True, +- suppress_ragged_eofs=True, ciphers=None): ++ family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None, ++ suppress_ragged_eofs=True, npn_protocols=None, ciphers=None, ++ server_hostname=None, ++ _context=None): ++ ++ if _context: ++ self._context = _context ++ else: ++ if server_side and not certfile: ++ raise ValueError("certfile must be specified for server-side " ++ "operations") ++ if keyfile and not certfile: ++ raise ValueError("certfile must be specified") ++ if certfile and not keyfile: ++ keyfile = certfile ++ self._context = SSLContext(ssl_version) ++ self._context.verify_mode = cert_reqs ++ if ca_certs: ++ self._context.load_verify_locations(ca_certs) ++ if certfile: ++ self._context.load_cert_chain(certfile, keyfile) ++ if npn_protocols: ++ self._context.set_npn_protocols(npn_protocols) ++ if ciphers: ++ self._context.set_ciphers(ciphers) ++ self.keyfile = keyfile ++ self.certfile = certfile ++ self.cert_reqs = cert_reqs ++ self.ssl_version = ssl_version ++ self.ca_certs = ca_certs ++ self.ciphers = ciphers + # Can't use sock.type as other flags (such as SOCK_NONBLOCK) get + # mixed in. + if sock.getsockopt(SOL_SOCKET, SO_TYPE) != SOCK_STREAM: +@@ -122,98 +519,161 @@ + delattr(self, attr) + except AttributeError: + pass ++ if server_side and server_hostname: ++ raise ValueError("server_hostname can only be specified " ++ "in client mode") ++ if self._context.check_hostname and not server_hostname: ++ if HAS_SNI: ++ raise ValueError("check_hostname requires server_hostname") ++ else: ++ raise ValueError("check_hostname requires server_hostname, " ++ "but it's not supported by your OpenSSL " ++ "library") ++ self.server_side = server_side ++ self.server_hostname = server_hostname ++ self.do_handshake_on_connect = do_handshake_on_connect ++ self.suppress_ragged_eofs = suppress_ragged_eofs + +- if ciphers is None and ssl_version != _SSLv2_IF_EXISTS: +- ciphers = _DEFAULT_CIPHERS +- +- if certfile and not keyfile: +- keyfile = certfile +- # see if it's connected ++ # See if we are connected + try: +- socket.getpeername(self) +- except socket_error, e: ++ self.getpeername() ++ except socket_error as e: + if e.errno != errno.ENOTCONN: + raise +- # no, no connection yet +- self._connected = False +- self._sslobj = None ++ connected = False + else: +- # yes, create the SSL object +- self._connected = True +- self._sslobj = _ssl.sslwrap(self._sock, server_side, +- keyfile, certfile, +- cert_reqs, ssl_version, ca_certs, +- ciphers) +- if do_handshake_on_connect: +- self.do_handshake() +- self.keyfile = keyfile +- self.certfile = certfile +- self.cert_reqs = cert_reqs +- self.ssl_version = ssl_version +- self.ca_certs = ca_certs +- self.ciphers = ciphers +- self.do_handshake_on_connect = do_handshake_on_connect +- self.suppress_ragged_eofs = suppress_ragged_eofs ++ connected = True ++ ++ self._closed = False ++ self._sslobj = None ++ self._connected = connected ++ if connected: ++ # create the SSL object ++ try: ++ self._sslobj = self._context._wrap_socket(self._sock, server_side, ++ server_hostname, ssl_sock=self) ++ if do_handshake_on_connect: ++ timeout = self.gettimeout() ++ if timeout == 0.0: ++ # non-blocking ++ raise ValueError("do_handshake_on_connect should not be specified for non-blocking sockets") ++ self.do_handshake() ++ ++ except (OSError, ValueError): ++ self.close() ++ raise + self._makefile_refs = 0 + +- def read(self, len=1024): ++ @property ++ def context(self): ++ return self._context + ++ @context.setter ++ def context(self, ctx): ++ self._context = ctx ++ self._sslobj.context = ctx ++ ++ def dup(self): ++ raise NotImplemented("Can't dup() %s instances" % ++ self.__class__.__name__) ++ ++ def _checkClosed(self, msg=None): ++ # raise an exception here if you wish to check for spurious closes ++ pass ++ ++ def _check_connected(self): ++ if not self._connected: ++ # getpeername() will raise ENOTCONN if the socket is really ++ # not connected; note that we can be connected even without ++ # _connected being set, e.g. if connect() first returned ++ # EAGAIN. ++ self.getpeername() ++ ++ def read(self, len=0, buffer=None): + """Read up to LEN bytes and return them. + Return zero-length string on EOF.""" + ++ self._checkClosed() ++ if not self._sslobj: ++ raise ValueError("Read on closed or unwrapped SSL socket.") + try: +- return self._sslobj.read(len) +- except SSLError, x: ++ if buffer is not None: ++ v = self._sslobj.read(len, buffer) ++ else: ++ v = self._sslobj.read(len or 1024) ++ return v ++ except SSLError as x: + if x.args[0] == SSL_ERROR_EOF and self.suppress_ragged_eofs: +- return '' ++ if buffer is not None: ++ return 0 ++ else: ++ return b'' + else: + raise + + def write(self, data): +- + """Write DATA to the underlying SSL channel. Returns + number of bytes of DATA actually transmitted.""" + ++ self._checkClosed() ++ if not self._sslobj: ++ raise ValueError("Write on closed or unwrapped SSL socket.") + return self._sslobj.write(data) + + def getpeercert(self, binary_form=False): +- + """Returns a formatted version of the data in the + certificate provided by the other end of the SSL channel. + Return None if no certificate was provided, {} if a + certificate was provided, but not validated.""" + ++ self._checkClosed() ++ self._check_connected() + return self._sslobj.peer_certificate(binary_form) + ++ def selected_npn_protocol(self): ++ self._checkClosed() ++ if not self._sslobj or not _ssl.HAS_NPN: ++ return None ++ else: ++ return self._sslobj.selected_npn_protocol() ++ + def cipher(self): +- ++ self._checkClosed() + if not self._sslobj: + return None + else: + return self._sslobj.cipher() + ++ def compression(self): ++ self._checkClosed() ++ if not self._sslobj: ++ return None ++ else: ++ return self._sslobj.compression() ++ + def send(self, data, flags=0): ++ self._checkClosed() + if self._sslobj: + if flags != 0: + raise ValueError( + "non-zero flags not allowed in calls to send() on %s" % + self.__class__) +- while True: +- try: +- v = self._sslobj.write(data) +- except SSLError, x: +- if x.args[0] == SSL_ERROR_WANT_READ: +- return 0 +- elif x.args[0] == SSL_ERROR_WANT_WRITE: +- return 0 +- else: +- raise ++ try: ++ v = self._sslobj.write(data) ++ except SSLError as x: ++ if x.args[0] == SSL_ERROR_WANT_READ: ++ return 0 ++ elif x.args[0] == SSL_ERROR_WANT_WRITE: ++ return 0 + else: +- return v ++ raise ++ else: ++ return v + else: + return self._sock.send(data, flags) + + def sendto(self, data, flags_or_addr, addr=None): ++ self._checkClosed() + if self._sslobj: + raise ValueError("sendto not allowed on instances of %s" % + self.__class__) +@@ -222,7 +682,9 @@ + else: + return self._sock.sendto(data, flags_or_addr, addr) + ++ + def sendall(self, data, flags=0): ++ self._checkClosed() + if self._sslobj: + if flags != 0: + raise ValueError( +@@ -238,6 +700,7 @@ + return socket.sendall(self, data, flags) + + def recv(self, buflen=1024, flags=0): ++ self._checkClosed() + if self._sslobj: + if flags != 0: + raise ValueError( +@@ -248,6 +711,7 @@ + return self._sock.recv(buflen, flags) + + def recv_into(self, buffer, nbytes=None, flags=0): ++ self._checkClosed() + if buffer and (nbytes is None): + nbytes = len(buffer) + elif nbytes is None: +@@ -257,14 +721,12 @@ + raise ValueError( + "non-zero flags not allowed in calls to recv_into() on %s" % + self.__class__) +- tmp_buffer = self.read(nbytes) +- v = len(tmp_buffer) +- buffer[:v] = tmp_buffer +- return v ++ return self.read(nbytes, buffer) + else: + return self._sock.recv_into(buffer, nbytes, flags) + + def recvfrom(self, buflen=1024, flags=0): ++ self._checkClosed() + if self._sslobj: + raise ValueError("recvfrom not allowed on instances of %s" % + self.__class__) +@@ -272,27 +734,23 @@ + return self._sock.recvfrom(buflen, flags) + + def recvfrom_into(self, buffer, nbytes=None, flags=0): ++ self._checkClosed() + if self._sslobj: + raise ValueError("recvfrom_into not allowed on instances of %s" % + self.__class__) + else: + return self._sock.recvfrom_into(buffer, nbytes, flags) + ++ + def pending(self): ++ self._checkClosed() + if self._sslobj: + return self._sslobj.pending() + else: + return 0 + +- def unwrap(self): +- if self._sslobj: +- s = self._sslobj.shutdown() +- self._sslobj = None +- return s +- else: +- raise ValueError("No SSL wrapper around " + str(self)) +- + def shutdown(self, how): ++ self._checkClosed() + self._sslobj = None + socket.shutdown(self, how) + +@@ -303,32 +761,55 @@ + else: + self._makefile_refs -= 1 + +- def do_handshake(self): ++ def unwrap(self): ++ if self._sslobj: ++ s = self._sslobj.shutdown() ++ self._sslobj = None ++ return s ++ else: ++ raise ValueError("No SSL wrapper around " + str(self)) + ++ def _real_close(self): ++ self._sslobj = None ++ socket._real_close(self) ++ ++ def do_handshake(self, block=False): + """Perform a TLS/SSL handshake.""" ++ self._check_connected() ++ timeout = self.gettimeout() ++ try: ++ if timeout == 0.0 and block: ++ self.settimeout(None) ++ self._sslobj.do_handshake() ++ finally: ++ self.settimeout(timeout) + +- self._sslobj.do_handshake() ++ if self.context.check_hostname: ++ if not self.server_hostname: ++ raise ValueError("check_hostname needs server_hostname " ++ "argument") ++ match_hostname(self.getpeercert(), self.server_hostname) + +- def _real_connect(self, addr, return_errno): ++ def _real_connect(self, addr, connect_ex): ++ if self.server_side: ++ raise ValueError("can't connect in server-side mode") + # Here we assume that the socket is client-side, and not + # connected at the time of the call. We connect it, then wrap it. + if self._connected: + raise ValueError("attempt to connect already-connected SSLSocket!") +- self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile, +- self.cert_reqs, self.ssl_version, +- self.ca_certs, self.ciphers) ++ self._sslobj = self.context._wrap_socket(self._sock, False, self.server_hostname, ssl_sock=self) + try: +- if return_errno: ++ if connect_ex: + rc = socket.connect_ex(self, addr) + else: + rc = None + socket.connect(self, addr) + if not rc: ++ self._connected = True + if self.do_handshake_on_connect: + self.do_handshake() +- self._connected = True + return rc +- except socket_error: ++ except (OSError, ValueError): + self._sslobj = None + raise + +@@ -343,27 +824,16 @@ + return self._real_connect(addr, True) + + def accept(self): +- + """Accepts a new connection from a remote client, and returns + a tuple containing that new connection wrapped with a server-side + SSL channel, and the address of the remote client.""" + + newsock, addr = socket.accept(self) +- try: +- return (SSLSocket(newsock, +- keyfile=self.keyfile, +- certfile=self.certfile, +- server_side=True, +- cert_reqs=self.cert_reqs, +- ssl_version=self.ssl_version, +- ca_certs=self.ca_certs, +- ciphers=self.ciphers, +- do_handshake_on_connect=self.do_handshake_on_connect, +- suppress_ragged_eofs=self.suppress_ragged_eofs), +- addr) +- except socket_error as e: +- newsock.close() +- raise e ++ newsock = self.context.wrap_socket(newsock, ++ do_handshake_on_connect=self.do_handshake_on_connect, ++ suppress_ragged_eofs=self.suppress_ragged_eofs, ++ server_side=True) ++ return newsock, addr + + def makefile(self, mode='r', bufsize=-1): + +@@ -376,54 +846,90 @@ + # the file-like object. + return _fileobject(self, mode, bufsize, close=True) + ++ def get_channel_binding(self, cb_type="tls-unique"): ++ """Get channel binding data for current connection. Raise ValueError ++ if the requested `cb_type` is not supported. Return bytes of the data ++ or None if the data is not available (e.g. before the handshake). ++ """ ++ if cb_type not in CHANNEL_BINDING_TYPES: ++ raise ValueError("Unsupported channel binding type") ++ if cb_type != "tls-unique": ++ raise NotImplementedError( ++ "{0} channel binding type not implemented" ++ .format(cb_type)) ++ if self._sslobj is None: ++ return None ++ return self._sslobj.tls_unique_cb() ++ ++ def version(self): ++ """ ++ Return a string identifying the protocol version used by the ++ current SSL channel, or None if there is no established channel. ++ """ ++ if self._sslobj is None: ++ return None ++ return self._sslobj.version() + + + def wrap_socket(sock, keyfile=None, certfile=None, + server_side=False, cert_reqs=CERT_NONE, + ssl_version=PROTOCOL_SSLv23, ca_certs=None, + do_handshake_on_connect=True, +- suppress_ragged_eofs=True, ciphers=None): ++ suppress_ragged_eofs=True, ++ ciphers=None): + +- return SSLSocket(sock, keyfile=keyfile, certfile=certfile, ++ return SSLSocket(sock=sock, keyfile=keyfile, certfile=certfile, + server_side=server_side, cert_reqs=cert_reqs, + ssl_version=ssl_version, ca_certs=ca_certs, + do_handshake_on_connect=do_handshake_on_connect, + suppress_ragged_eofs=suppress_ragged_eofs, + ciphers=ciphers) + +- + # some utility functions + + def cert_time_to_seconds(cert_time): ++ """Return the time in seconds since the Epoch, given the timestring ++ representing the "notBefore" or "notAfter" date from a certificate ++ in ``"%b %d %H:%M:%S %Y %Z"`` strptime format (C locale). + +- """Takes a date-time string in standard ASN1_print form +- ("MON DAY 24HOUR:MINUTE:SEC YEAR TIMEZONE") and return +- a Python time value in seconds past the epoch.""" ++ "notBefore" or "notAfter" dates must use UTC (RFC 5280). + +- import time +- return time.mktime(time.strptime(cert_time, "%b %d %H:%M:%S %Y GMT")) ++ Month is one of: Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ++ UTC should be specified as GMT (see ASN1_TIME_print()) ++ """ ++ from time import strptime ++ from calendar import timegm ++ ++ months = ( ++ "Jan","Feb","Mar","Apr","May","Jun", ++ "Jul","Aug","Sep","Oct","Nov","Dec" ++ ) ++ time_format = ' %d %H:%M:%S %Y GMT' # NOTE: no month, fixed GMT ++ try: ++ month_number = months.index(cert_time[:3].title()) + 1 ++ except ValueError: ++ raise ValueError('time data %r does not match ' ++ 'format "%%b%s"' % (cert_time, time_format)) ++ else: ++ # found valid month ++ tt = strptime(cert_time[3:], time_format) ++ # return an integer, the previous mktime()-based implementation ++ # returned a float (fractional seconds are always zero here). ++ return timegm((tt[0], month_number) + tt[2:6]) + + PEM_HEADER = "-----BEGIN CERTIFICATE-----" + PEM_FOOTER = "-----END CERTIFICATE-----" + + def DER_cert_to_PEM_cert(der_cert_bytes): +- + """Takes a certificate in binary DER format and returns the + PEM version of it as a string.""" + +- if hasattr(base64, 'standard_b64encode'): +- # preferred because older API gets line-length wrong +- f = base64.standard_b64encode(der_cert_bytes) +- return (PEM_HEADER + '\n' + +- textwrap.fill(f, 64) + '\n' + +- PEM_FOOTER + '\n') +- else: +- return (PEM_HEADER + '\n' + +- base64.encodestring(der_cert_bytes) + +- PEM_FOOTER + '\n') ++ f = base64.standard_b64encode(der_cert_bytes).decode('ascii') ++ return (PEM_HEADER + '\n' + ++ textwrap.fill(f, 64) + '\n' + ++ PEM_FOOTER + '\n') + + def PEM_cert_to_DER_cert(pem_cert_string): +- + """Takes a certificate in ASCII PEM format and returns the + DER-encoded version of it as a byte sequence""" + +@@ -434,25 +940,25 @@ + raise ValueError("Invalid PEM encoding; must end with %s" + % PEM_FOOTER) + d = pem_cert_string.strip()[len(PEM_HEADER):-len(PEM_FOOTER)] +- return base64.decodestring(d) ++ return base64.decodestring(d.encode('ASCII', 'strict')) + +-def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None): +- ++def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv23, ca_certs=None): + """Retrieve the certificate from the server at the specified address, + and return it as a PEM-encoded string. + If 'ca_certs' is specified, validate the server cert against it. + If 'ssl_version' is specified, use it in the connection attempt.""" + + host, port = addr +- if (ca_certs is not None): ++ if ca_certs is not None: + cert_reqs = CERT_REQUIRED + else: + cert_reqs = CERT_NONE +- s = wrap_socket(socket(), ssl_version=ssl_version, +- cert_reqs=cert_reqs, ca_certs=ca_certs) +- s.connect(addr) +- dercert = s.getpeercert(True) +- s.close() ++ context = _create_stdlib_context(ssl_version, ++ cert_reqs=cert_reqs, ++ cafile=ca_certs) ++ with closing(create_connection(addr)) as sock: ++ with closing(context.wrap_socket(sock)) as sslsock: ++ dercert = sslsock.getpeercert(True) + return DER_cert_to_PEM_cert(dercert) + + def get_protocol_name(protocol_code): +@@ -462,16 +968,16 @@ + # a replacement for the old socket.ssl function + + def sslwrap_simple(sock, keyfile=None, certfile=None): +- + """A replacement for the old socket.ssl function. Designed + for compability with Python 2.5 and earlier. Will disappear in + Python 3.0.""" +- + if hasattr(sock, "_sock"): + sock = sock._sock + +- ssl_sock = _ssl.sslwrap(sock, 0, keyfile, certfile, CERT_NONE, +- PROTOCOL_SSLv23, None) ++ ctx = SSLContext(PROTOCOL_SSLv23) ++ if keyfile or certfile: ++ ctx.load_cert_chain(certfile, keyfile) ++ ssl_sock = ctx._wrap_socket(sock, server_side=False) + try: + sock.getpeername() + except socket_error: +diff -r ee879c0ffa11 Lib/string.py +--- a/Lib/string.py ++++ b/Lib/string.py +@@ -182,24 +182,18 @@ + mapping = args[0] + # Helper function for .sub() + def convert(mo): +- named = mo.group('named') ++ named = mo.group('named') or mo.group('braced') + if named is not None: + try: + # We use this idiom instead of str() because the latter + # will fail if val is a Unicode containing non-ASCII + return '%s' % (mapping[named],) + except KeyError: +- return self.delimiter + named +- braced = mo.group('braced') +- if braced is not None: +- try: +- return '%s' % (mapping[braced],) +- except KeyError: +- return self.delimiter + '{' + braced + '}' ++ return mo.group() + if mo.group('escaped') is not None: + return self.delimiter + if mo.group('invalid') is not None: +- return self.delimiter ++ return mo.group() + raise ValueError('Unrecognized named group in pattern', + self.pattern) + return self.pattern.sub(convert, self.template) +diff -r ee879c0ffa11 Lib/subprocess.py +--- a/Lib/subprocess.py ++++ b/Lib/subprocess.py +@@ -1035,7 +1035,15 @@ + try: + self.stdin.write(input) + except IOError as e: +- if e.errno != errno.EPIPE: ++ if e.errno == errno.EPIPE: ++ # communicate() should ignore broken pipe error ++ pass ++ elif (e.errno == errno.EINVAL ++ and self.poll() is not None): ++ # Issue #19612: stdin.write() fails with EINVAL ++ # if the process already exited before the write ++ pass ++ else: + raise + self.stdin.close() + +diff -r ee879c0ffa11 Lib/sysconfig.py +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -273,17 +273,21 @@ + return vars + + +-def _get_makefile_filename(): ++def get_makefile_filename(): ++ """Return the path of the Makefile.""" + if _PYTHON_BUILD: + return os.path.join(_PROJECT_BASE, "Makefile") + return os.path.join(get_path('platstdlib'), "config", "Makefile") + ++# Issue #22199: retain undocumented private name for compatibility ++_get_makefile_filename = get_makefile_filename ++ + def _generate_posix_vars(): + """Generate the Python module containing build-time variables.""" + import pprint + vars = {} + # load the installed Makefile: +- makefile = _get_makefile_filename() ++ makefile = get_makefile_filename() + try: + _parse_makefile(makefile, vars) + except IOError, e: +diff -r ee879c0ffa11 Lib/tarfile.py +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -417,28 +417,34 @@ + self.pos = 0L + self.closed = False + +- if comptype == "gz": +- try: +- import zlib +- except ImportError: +- raise CompressionError("zlib module is not available") +- self.zlib = zlib +- self.crc = zlib.crc32("") & 0xffffffffL +- if mode == "r": +- self._init_read_gz() +- else: +- self._init_write_gz() ++ try: ++ if comptype == "gz": ++ try: ++ import zlib ++ except ImportError: ++ raise CompressionError("zlib module is not available") ++ self.zlib = zlib ++ self.crc = zlib.crc32("") & 0xffffffffL ++ if mode == "r": ++ self._init_read_gz() ++ else: ++ self._init_write_gz() + +- if comptype == "bz2": +- try: +- import bz2 +- except ImportError: +- raise CompressionError("bz2 module is not available") +- if mode == "r": +- self.dbuf = "" +- self.cmp = bz2.BZ2Decompressor() +- else: +- self.cmp = bz2.BZ2Compressor() ++ elif comptype == "bz2": ++ try: ++ import bz2 ++ except ImportError: ++ raise CompressionError("bz2 module is not available") ++ if mode == "r": ++ self.dbuf = "" ++ self.cmp = bz2.BZ2Decompressor() ++ else: ++ self.cmp = bz2.BZ2Compressor() ++ except: ++ if not self._extfileobj: ++ self.fileobj.close() ++ self.closed = True ++ raise + + def __del__(self): + if hasattr(self, "closed") and not self.closed: +@@ -1685,9 +1691,12 @@ + if filemode not in ("r", "w"): + raise ValueError("mode must be 'r' or 'w'") + +- t = cls(name, filemode, +- _Stream(name, filemode, comptype, fileobj, bufsize), +- **kwargs) ++ stream = _Stream(name, filemode, comptype, fileobj, bufsize) ++ try: ++ t = cls(name, filemode, stream, **kwargs) ++ except: ++ stream.close() ++ raise + t._extfileobj = False + return t + +@@ -1718,17 +1727,23 @@ + except (ImportError, AttributeError): + raise CompressionError("gzip module is not available") + +- if fileobj is None: +- fileobj = bltn_open(name, mode + "b") ++ try: ++ fileobj = gzip.GzipFile(name, mode, compresslevel, fileobj) ++ except OSError: ++ if fileobj is not None and mode == 'r': ++ raise ReadError("not a gzip file") ++ raise + + try: +- t = cls.taropen(name, mode, +- gzip.GzipFile(name, mode, compresslevel, fileobj), +- **kwargs) ++ t = cls.taropen(name, mode, fileobj, **kwargs) + except IOError: ++ fileobj.close() + if mode == 'r': + raise ReadError("not a gzip file") + raise ++ except: ++ fileobj.close() ++ raise + t._extfileobj = False + return t + +@@ -1753,9 +1768,13 @@ + try: + t = cls.taropen(name, mode, fileobj, **kwargs) + except (IOError, EOFError): ++ fileobj.close() + if mode == 'r': + raise ReadError("not a bzip2 file") + raise ++ except: ++ fileobj.close() ++ raise + t._extfileobj = False + return t + +diff -r ee879c0ffa11 Lib/tempfile.py +--- a/Lib/tempfile.py ++++ b/Lib/tempfile.py +@@ -1,10 +1,10 @@ + """Temporary files. + + This module provides generic, low- and high-level interfaces for +-creating temporary files and directories. The interfaces listed +-as "safe" just below can be used without fear of race conditions. +-Those listed as "unsafe" cannot, and are provided for backward +-compatibility only. ++creating temporary files and directories. All of the interfaces ++provided by this module can be used without fear of race conditions ++except for 'mktemp'. 'mktemp' is subject to race conditions and ++should not be used; it is provided for backward compatibility only. + + This module also provides some data items to the user: + +diff -r ee879c0ffa11 Lib/test/_mock_backport.py +--- /dev/null ++++ b/Lib/test/_mock_backport.py +@@ -0,0 +1,2357 @@ ++# mock.py ++# Test tools for mocking and patching. ++# Maintained by Michael Foord ++# Backport for other versions of Python available from ++# http://pypi.python.org/pypi/mock ++ ++__all__ = ( ++ 'Mock', ++ 'MagicMock', ++ 'patch', ++ 'sentinel', ++ 'DEFAULT', ++ 'ANY', ++ 'call', ++ 'create_autospec', ++ 'FILTER_DIR', ++ 'NonCallableMock', ++ 'NonCallableMagicMock', ++ 'mock_open', ++ 'PropertyMock', ++) ++ ++ ++__version__ = '1.0' ++ ++ ++import inspect ++import pprint ++import sys ++ ++from types import ModuleType ++from functools import wraps, partial ++ ++ ++_builtins = {name for name in __builtins__ if not name.startswith('_')} ++ ++BaseExceptions = (BaseException,) ++if 'java' in sys.platform: ++ # jython ++ import java ++ BaseExceptions = (BaseException, java.lang.Throwable) ++ ++ ++FILTER_DIR = True ++ ++# Workaround for issue #12370 ++# Without this, the __class__ properties wouldn't be set correctly ++_safe_super = super ++ ++def _is_instance_mock(obj): ++ # can't use isinstance on Mock objects because they override __class__ ++ # The base class for all mocks is NonCallableMock ++ return issubclass(type(obj), NonCallableMock) ++ ++ ++def _is_exception(obj): ++ return ( ++ isinstance(obj, BaseExceptions) or ++ isinstance(obj, type) and issubclass(obj, BaseExceptions) ++ ) ++ ++ ++class _slotted(object): ++ __slots__ = ['a'] ++ ++ ++DescriptorTypes = ( ++ type(_slotted.a), ++ property, ++) ++ ++ ++def _get_signature_object(func, as_instance, eat_self): ++ """ ++ Given an arbitrary, possibly callable object, try to create a suitable ++ signature object. ++ Return a (reduced func, signature) tuple, or None. ++ """ ++ if isinstance(func, type) and not as_instance: ++ # If it's a type and should be modelled as a type, use __init__. ++ try: ++ func = func.__init__ ++ except AttributeError: ++ return None ++ # Skip the `self` argument in __init__ ++ eat_self = True ++ elif not isinstance(func, FunctionTypes): ++ # If we really want to model an instance of the passed type, ++ # __call__ should be looked up, not __init__. ++ try: ++ func = func.__call__ ++ except AttributeError: ++ return None ++ if eat_self: ++ sig_func = partial(func, None) ++ else: ++ sig_func = func ++ try: ++ return func, inspect.signature(sig_func) ++ except ValueError: ++ # Certain callable types are not supported by inspect.signature() ++ return None ++ ++ ++def _check_signature(func, mock, skipfirst, instance=False): ++ sig = _get_signature_object(func, instance, skipfirst) ++ if sig is None: ++ return ++ func, sig = sig ++ def checksig(_mock_self, *args, **kwargs): ++ sig.bind(*args, **kwargs) ++ _copy_func_details(func, checksig) ++ type(mock)._mock_check_sig = checksig ++ ++ ++def _copy_func_details(func, funcopy): ++ funcopy.__name__ = func.__name__ ++ funcopy.__doc__ = func.__doc__ ++ try: ++ funcopy.__text_signature__ = func.__text_signature__ ++ except AttributeError: ++ pass ++ # we explicitly don't copy func.__dict__ into this copy as it would ++ # expose original attributes that should be mocked ++ try: ++ funcopy.__module__ = func.__module__ ++ except AttributeError: ++ pass ++ try: ++ funcopy.__defaults__ = func.__defaults__ ++ except AttributeError: ++ pass ++ try: ++ funcopy.__kwdefaults__ = func.__kwdefaults__ ++ except AttributeError: ++ pass ++ ++ ++def _callable(obj): ++ if isinstance(obj, type): ++ return True ++ if getattr(obj, '__call__', None) is not None: ++ return True ++ return False ++ ++ ++def _is_list(obj): ++ # checks for list or tuples ++ # XXXX badly named! ++ return type(obj) in (list, tuple) ++ ++ ++def _instance_callable(obj): ++ """Given an object, return True if the object is callable. ++ For classes, return True if instances would be callable.""" ++ if not isinstance(obj, type): ++ # already an instance ++ return getattr(obj, '__call__', None) is not None ++ ++ # *could* be broken by a class overriding __mro__ or __dict__ via ++ # a metaclass ++ for base in (obj,) + obj.__mro__: ++ if base.__dict__.get('__call__') is not None: ++ return True ++ return False ++ ++ ++def _set_signature(mock, original, instance=False): ++ # creates a function with signature (*args, **kwargs) that delegates to a ++ # mock. It still does signature checking by calling a lambda with the same ++ # signature as the original. ++ if not _callable(original): ++ return ++ ++ skipfirst = isinstance(original, type) ++ result = _get_signature_object(original, instance, skipfirst) ++ if result is None: ++ return ++ func, sig = result ++ def checksig(*args, **kwargs): ++ sig.bind(*args, **kwargs) ++ _copy_func_details(func, checksig) ++ ++ name = original.__name__ ++ if not name.isidentifier(): ++ name = 'funcopy' ++ context = {'_checksig_': checksig, 'mock': mock} ++ src = """def %s(*args, **kwargs): ++ _checksig_(*args, **kwargs) ++ return mock(*args, **kwargs)""" % name ++ exec (src, context) ++ funcopy = context[name] ++ _setup_func(funcopy, mock) ++ return funcopy ++ ++ ++def _setup_func(funcopy, mock): ++ funcopy.mock = mock ++ ++ # can't use isinstance with mocks ++ if not _is_instance_mock(mock): ++ return ++ ++ def assert_called_with(*args, **kwargs): ++ return mock.assert_called_with(*args, **kwargs) ++ def assert_called_once_with(*args, **kwargs): ++ return mock.assert_called_once_with(*args, **kwargs) ++ def assert_has_calls(*args, **kwargs): ++ return mock.assert_has_calls(*args, **kwargs) ++ def assert_any_call(*args, **kwargs): ++ return mock.assert_any_call(*args, **kwargs) ++ def reset_mock(): ++ funcopy.method_calls = _CallList() ++ funcopy.mock_calls = _CallList() ++ mock.reset_mock() ++ ret = funcopy.return_value ++ if _is_instance_mock(ret) and not ret is mock: ++ ret.reset_mock() ++ ++ funcopy.called = False ++ funcopy.call_count = 0 ++ funcopy.call_args = None ++ funcopy.call_args_list = _CallList() ++ funcopy.method_calls = _CallList() ++ funcopy.mock_calls = _CallList() ++ ++ funcopy.return_value = mock.return_value ++ funcopy.side_effect = mock.side_effect ++ funcopy._mock_children = mock._mock_children ++ ++ funcopy.assert_called_with = assert_called_with ++ funcopy.assert_called_once_with = assert_called_once_with ++ funcopy.assert_has_calls = assert_has_calls ++ funcopy.assert_any_call = assert_any_call ++ funcopy.reset_mock = reset_mock ++ ++ mock._mock_delegate = funcopy ++ ++ ++def _is_magic(name): ++ return '__%s__' % name[2:-2] == name ++ ++ ++class _SentinelObject(object): ++ "A unique, named, sentinel object." ++ def __init__(self, name): ++ self.name = name ++ ++ def __repr__(self): ++ return 'sentinel.%s' % self.name ++ ++ ++class _Sentinel(object): ++ """Access attributes to return a named object, usable as a sentinel.""" ++ def __init__(self): ++ self._sentinels = {} ++ ++ def __getattr__(self, name): ++ if name == '__bases__': ++ # Without this help(unittest.mock) raises an exception ++ raise AttributeError ++ return self._sentinels.setdefault(name, _SentinelObject(name)) ++ ++ ++sentinel = _Sentinel() ++ ++DEFAULT = sentinel.DEFAULT ++_missing = sentinel.MISSING ++_deleted = sentinel.DELETED ++ ++ ++def _copy(value): ++ if type(value) in (dict, list, tuple, set): ++ return type(value)(value) ++ return value ++ ++ ++_allowed_names = set( ++ [ ++ 'return_value', '_mock_return_value', 'side_effect', ++ '_mock_side_effect', '_mock_parent', '_mock_new_parent', ++ '_mock_name', '_mock_new_name' ++ ] ++) ++ ++ ++def _delegating_property(name): ++ _allowed_names.add(name) ++ _the_name = '_mock_' + name ++ def _get(self, name=name, _the_name=_the_name): ++ sig = self._mock_delegate ++ if sig is None: ++ return getattr(self, _the_name) ++ return getattr(sig, name) ++ def _set(self, value, name=name, _the_name=_the_name): ++ sig = self._mock_delegate ++ if sig is None: ++ self.__dict__[_the_name] = value ++ else: ++ setattr(sig, name, value) ++ ++ return property(_get, _set) ++ ++ ++ ++class _CallList(list): ++ ++ def __contains__(self, value): ++ if not isinstance(value, list): ++ return list.__contains__(self, value) ++ len_value = len(value) ++ len_self = len(self) ++ if len_value > len_self: ++ return False ++ ++ for i in range(0, len_self - len_value + 1): ++ sub_list = self[i:i+len_value] ++ if sub_list == value: ++ return True ++ return False ++ ++ def __repr__(self): ++ return pprint.pformat(list(self)) ++ ++ ++def _check_and_set_parent(parent, value, name, new_name): ++ if not _is_instance_mock(value): ++ return False ++ if ((value._mock_name or value._mock_new_name) or ++ (value._mock_parent is not None) or ++ (value._mock_new_parent is not None)): ++ return False ++ ++ _parent = parent ++ while _parent is not None: ++ # setting a mock (value) as a child or return value of itself ++ # should not modify the mock ++ if _parent is value: ++ return False ++ _parent = _parent._mock_new_parent ++ ++ if new_name: ++ value._mock_new_parent = parent ++ value._mock_new_name = new_name ++ if name: ++ value._mock_parent = parent ++ value._mock_name = name ++ return True ++ ++# Internal class to identify if we wrapped an iterator object or not. ++class _MockIter(object): ++ def __init__(self, obj): ++ self.obj = iter(obj) ++ def __iter__(self): ++ return self ++ def __next__(self): ++ return next(self.obj) ++ ++class Base(object): ++ _mock_return_value = DEFAULT ++ _mock_side_effect = None ++ def __init__(self, *args, **kwargs): ++ pass ++ ++ ++ ++class NonCallableMock(Base): ++ """A non-callable version of `Mock`""" ++ ++ def __new__(cls, *args, **kw): ++ # every instance has its own class ++ # so we can create magic methods on the ++ # class without stomping on other mocks ++ new = type(cls.__name__, (cls,), {'__doc__': cls.__doc__}) ++ instance = object.__new__(new) ++ return instance ++ ++ ++ def __init__( ++ self, spec=None, wraps=None, name=None, spec_set=None, ++ parent=None, _spec_state=None, _new_name='', _new_parent=None, ++ _spec_as_instance=False, _eat_self=None, unsafe=False, **kwargs ++ ): ++ if _new_parent is None: ++ _new_parent = parent ++ ++ __dict__ = self.__dict__ ++ __dict__['_mock_parent'] = parent ++ __dict__['_mock_name'] = name ++ __dict__['_mock_new_name'] = _new_name ++ __dict__['_mock_new_parent'] = _new_parent ++ ++ if spec_set is not None: ++ spec = spec_set ++ spec_set = True ++ if _eat_self is None: ++ _eat_self = parent is not None ++ ++ self._mock_add_spec(spec, spec_set, _spec_as_instance, _eat_self) ++ ++ __dict__['_mock_children'] = {} ++ __dict__['_mock_wraps'] = wraps ++ __dict__['_mock_delegate'] = None ++ ++ __dict__['_mock_called'] = False ++ __dict__['_mock_call_args'] = None ++ __dict__['_mock_call_count'] = 0 ++ __dict__['_mock_call_args_list'] = _CallList() ++ __dict__['_mock_mock_calls'] = _CallList() ++ ++ __dict__['method_calls'] = _CallList() ++ __dict__['_mock_unsafe'] = unsafe ++ ++ if kwargs: ++ self.configure_mock(**kwargs) ++ ++ _safe_super(NonCallableMock, self).__init__( ++ spec, wraps, name, spec_set, parent, ++ _spec_state ++ ) ++ ++ ++ def attach_mock(self, mock, attribute): ++ """ ++ Attach a mock as an attribute of this one, replacing its name and ++ parent. Calls to the attached mock will be recorded in the ++ `method_calls` and `mock_calls` attributes of this one.""" ++ mock._mock_parent = None ++ mock._mock_new_parent = None ++ mock._mock_name = '' ++ mock._mock_new_name = None ++ ++ setattr(self, attribute, mock) ++ ++ ++ def mock_add_spec(self, spec, spec_set=False): ++ """Add a spec to a mock. `spec` can either be an object or a ++ list of strings. Only attributes on the `spec` can be fetched as ++ attributes from the mock. ++ ++ If `spec_set` is True then only attributes on the spec can be set.""" ++ self._mock_add_spec(spec, spec_set) ++ ++ ++ def _mock_add_spec(self, spec, spec_set, _spec_as_instance=False, ++ _eat_self=False): ++ _spec_class = None ++ _spec_signature = None ++ ++ if spec is not None and not _is_list(spec): ++ if isinstance(spec, type): ++ _spec_class = spec ++ else: ++ _spec_class = _get_class(spec) ++ res = _get_signature_object(spec, ++ _spec_as_instance, _eat_self) ++ _spec_signature = res and res[1] ++ ++ spec = dir(spec) ++ ++ __dict__ = self.__dict__ ++ __dict__['_spec_class'] = _spec_class ++ __dict__['_spec_set'] = spec_set ++ __dict__['_spec_signature'] = _spec_signature ++ __dict__['_mock_methods'] = spec ++ ++ ++ def __get_return_value(self): ++ ret = self._mock_return_value ++ if self._mock_delegate is not None: ++ ret = self._mock_delegate.return_value ++ ++ if ret is DEFAULT: ++ ret = self._get_child_mock( ++ _new_parent=self, _new_name='()' ++ ) ++ self.return_value = ret ++ return ret ++ ++ ++ def __set_return_value(self, value): ++ if self._mock_delegate is not None: ++ self._mock_delegate.return_value = value ++ else: ++ self._mock_return_value = value ++ _check_and_set_parent(self, value, None, '()') ++ ++ __return_value_doc = "The value to be returned when the mock is called." ++ return_value = property(__get_return_value, __set_return_value, ++ __return_value_doc) ++ ++ ++ @property ++ def __class__(self): ++ if self._spec_class is None: ++ return type(self) ++ return self._spec_class ++ ++ called = _delegating_property('called') ++ call_count = _delegating_property('call_count') ++ call_args = _delegating_property('call_args') ++ call_args_list = _delegating_property('call_args_list') ++ mock_calls = _delegating_property('mock_calls') ++ ++ ++ def __get_side_effect(self): ++ delegated = self._mock_delegate ++ if delegated is None: ++ return self._mock_side_effect ++ sf = delegated.side_effect ++ if sf is not None and not callable(sf) and not isinstance(sf, _MockIter): ++ sf = _MockIter(sf) ++ delegated.side_effect = sf ++ return sf ++ ++ def __set_side_effect(self, value): ++ value = _try_iter(value) ++ delegated = self._mock_delegate ++ if delegated is None: ++ self._mock_side_effect = value ++ else: ++ delegated.side_effect = value ++ ++ side_effect = property(__get_side_effect, __set_side_effect) ++ ++ ++ def reset_mock(self): ++ "Restore the mock object to its initial state." ++ self.called = False ++ self.call_args = None ++ self.call_count = 0 ++ self.mock_calls = _CallList() ++ self.call_args_list = _CallList() ++ self.method_calls = _CallList() ++ ++ for child in self._mock_children.values(): ++ if isinstance(child, _SpecState): ++ continue ++ child.reset_mock() ++ ++ ret = self._mock_return_value ++ if _is_instance_mock(ret) and ret is not self: ++ ret.reset_mock() ++ ++ ++ def configure_mock(self, **kwargs): ++ """Set attributes on the mock through keyword arguments. ++ ++ Attributes plus return values and side effects can be set on child ++ mocks using standard dot notation and unpacking a dictionary in the ++ method call: ++ ++ >>> attrs = {'method.return_value': 3, 'other.side_effect': KeyError} ++ >>> mock.configure_mock(**attrs)""" ++ for arg, val in sorted(kwargs.items(), ++ # we sort on the number of dots so that ++ # attributes are set before we set attributes on ++ # attributes ++ key=lambda entry: entry[0].count('.')): ++ args = arg.split('.') ++ final = args.pop() ++ obj = self ++ for entry in args: ++ obj = getattr(obj, entry) ++ setattr(obj, final, val) ++ ++ ++ def __getattr__(self, name): ++ if name in {'_mock_methods', '_mock_unsafe'}: ++ raise AttributeError(name) ++ elif self._mock_methods is not None: ++ if name not in self._mock_methods or name in _all_magics: ++ raise AttributeError("Mock object has no attribute %r" % name) ++ elif _is_magic(name): ++ raise AttributeError(name) ++ if not self._mock_unsafe: ++ if name.startswith(('assert', 'assret')): ++ raise AttributeError(name) ++ ++ result = self._mock_children.get(name) ++ if result is _deleted: ++ raise AttributeError(name) ++ elif result is None: ++ wraps = None ++ if self._mock_wraps is not None: ++ # XXXX should we get the attribute without triggering code ++ # execution? ++ wraps = getattr(self._mock_wraps, name) ++ ++ result = self._get_child_mock( ++ parent=self, name=name, wraps=wraps, _new_name=name, ++ _new_parent=self ++ ) ++ self._mock_children[name] = result ++ ++ elif isinstance(result, _SpecState): ++ result = create_autospec( ++ result.spec, result.spec_set, result.instance, ++ result.parent, result.name ++ ) ++ self._mock_children[name] = result ++ ++ return result ++ ++ ++ def __repr__(self): ++ _name_list = [self._mock_new_name] ++ _parent = self._mock_new_parent ++ last = self ++ ++ dot = '.' ++ if _name_list == ['()']: ++ dot = '' ++ seen = set() ++ while _parent is not None: ++ last = _parent ++ ++ _name_list.append(_parent._mock_new_name + dot) ++ dot = '.' ++ if _parent._mock_new_name == '()': ++ dot = '' ++ ++ _parent = _parent._mock_new_parent ++ ++ # use ids here so as not to call __hash__ on the mocks ++ if id(_parent) in seen: ++ break ++ seen.add(id(_parent)) ++ ++ _name_list = list(reversed(_name_list)) ++ _first = last._mock_name or 'mock' ++ if len(_name_list) > 1: ++ if _name_list[1] not in ('()', '().'): ++ _first += '.' ++ _name_list[0] = _first ++ name = ''.join(_name_list) ++ ++ name_string = '' ++ if name not in ('mock', 'mock.'): ++ name_string = ' name=%r' % name ++ ++ spec_string = '' ++ if self._spec_class is not None: ++ spec_string = ' spec=%r' ++ if self._spec_set: ++ spec_string = ' spec_set=%r' ++ spec_string = spec_string % self._spec_class.__name__ ++ return "<%s%s%s id='%s'>" % ( ++ type(self).__name__, ++ name_string, ++ spec_string, ++ id(self) ++ ) ++ ++ ++ def __dir__(self): ++ """Filter the output of `dir(mock)` to only useful members.""" ++ if not FILTER_DIR: ++ return object.__dir__(self) ++ ++ extras = self._mock_methods or [] ++ from_type = dir(type(self)) ++ from_dict = list(self.__dict__) ++ ++ from_type = [e for e in from_type if not e.startswith('_')] ++ from_dict = [e for e in from_dict if not e.startswith('_') or ++ _is_magic(e)] ++ return sorted(set(extras + from_type + from_dict + ++ list(self._mock_children))) ++ ++ ++ def __setattr__(self, name, value): ++ if name in _allowed_names: ++ # property setters go through here ++ return object.__setattr__(self, name, value) ++ elif (self._spec_set and self._mock_methods is not None and ++ name not in self._mock_methods and ++ name not in self.__dict__): ++ raise AttributeError("Mock object has no attribute '%s'" % name) ++ elif name in _unsupported_magics: ++ msg = 'Attempting to set unsupported magic method %r.' % name ++ raise AttributeError(msg) ++ elif name in _all_magics: ++ if self._mock_methods is not None and name not in self._mock_methods: ++ raise AttributeError("Mock object has no attribute '%s'" % name) ++ ++ if not _is_instance_mock(value): ++ setattr(type(self), name, _get_method(name, value)) ++ original = value ++ value = lambda *args, **kw: original(self, *args, **kw) ++ else: ++ # only set _new_name and not name so that mock_calls is tracked ++ # but not method calls ++ _check_and_set_parent(self, value, None, name) ++ setattr(type(self), name, value) ++ self._mock_children[name] = value ++ elif name == '__class__': ++ self._spec_class = value ++ return ++ else: ++ if _check_and_set_parent(self, value, name, name): ++ self._mock_children[name] = value ++ return object.__setattr__(self, name, value) ++ ++ ++ def __delattr__(self, name): ++ if name in _all_magics and name in type(self).__dict__: ++ delattr(type(self), name) ++ if name not in self.__dict__: ++ # for magic methods that are still MagicProxy objects and ++ # not set on the instance itself ++ return ++ ++ if name in self.__dict__: ++ object.__delattr__(self, name) ++ ++ obj = self._mock_children.get(name, _missing) ++ if obj is _deleted: ++ raise AttributeError(name) ++ if obj is not _missing: ++ del self._mock_children[name] ++ self._mock_children[name] = _deleted ++ ++ ++ def _format_mock_call_signature(self, args, kwargs): ++ name = self._mock_name or 'mock' ++ return _format_call_signature(name, args, kwargs) ++ ++ ++ def _format_mock_failure_message(self, args, kwargs): ++ message = 'Expected call: %s\nActual call: %s' ++ expected_string = self._format_mock_call_signature(args, kwargs) ++ call_args = self.call_args ++ if len(call_args) == 3: ++ call_args = call_args[1:] ++ actual_string = self._format_mock_call_signature(*call_args) ++ return message % (expected_string, actual_string) ++ ++ ++ def _call_matcher(self, _call): ++ """ ++ Given a call (or simply a (args, kwargs) tuple), return a ++ comparison key suitable for matching with other calls. ++ This is a best effort method which relies on the spec's signature, ++ if available, or falls back on the arguments themselves. ++ """ ++ sig = self._spec_signature ++ if sig is not None: ++ if len(_call) == 2: ++ name = '' ++ args, kwargs = _call ++ else: ++ name, args, kwargs = _call ++ try: ++ return name, sig.bind(*args, **kwargs) ++ except TypeError as e: ++ return e.with_traceback(None) ++ else: ++ return _call ++ ++ def assert_not_called(_mock_self): ++ """assert that the mock was never called. ++ """ ++ self = _mock_self ++ if self.call_count != 0: ++ msg = ("Expected '%s' to not have been called. Called %s times." % ++ (self._mock_name or 'mock', self.call_count)) ++ raise AssertionError(msg) ++ ++ def assert_called_with(_mock_self, *args, **kwargs): ++ """assert that the mock was called with the specified arguments. ++ ++ Raises an AssertionError if the args and keyword args passed in are ++ different to the last call to the mock.""" ++ self = _mock_self ++ if self.call_args is None: ++ expected = self._format_mock_call_signature(args, kwargs) ++ raise AssertionError('Expected call: %s\nNot called' % (expected,)) ++ ++ def _error_message(): ++ msg = self._format_mock_failure_message(args, kwargs) ++ return msg ++ expected = self._call_matcher((args, kwargs)) ++ actual = self._call_matcher(self.call_args) ++ if expected != actual: ++ raise AssertionError(_error_message()) ++ ++ ++ def assert_called_once_with(_mock_self, *args, **kwargs): ++ """assert that the mock was called exactly once and with the specified ++ arguments.""" ++ self = _mock_self ++ if not self.call_count == 1: ++ msg = ("Expected '%s' to be called once. Called %s times." % ++ (self._mock_name or 'mock', self.call_count)) ++ raise AssertionError(msg) ++ return self.assert_called_with(*args, **kwargs) ++ ++ ++ def assert_has_calls(self, calls, any_order=False): ++ """assert the mock has been called with the specified calls. ++ The `mock_calls` list is checked for the calls. ++ ++ If `any_order` is False (the default) then the calls must be ++ sequential. There can be extra calls before or after the ++ specified calls. ++ ++ If `any_order` is True then the calls can be in any order, but ++ they must all appear in `mock_calls`.""" ++ expected = [self._call_matcher(c) for c in calls] ++ all_calls = _CallList(self._call_matcher(c) for c in self.mock_calls) ++ if not any_order: ++ if expected not in all_calls: ++ raise AssertionError( ++ 'Calls not found.\nExpected: %r\n' ++ 'Actual: %r' % (calls, self.mock_calls) ++ ) ++ return ++ ++ all_calls = list(all_calls) ++ ++ not_found = [] ++ for kall in expected: ++ try: ++ all_calls.remove(kall) ++ except ValueError: ++ not_found.append(kall) ++ if not_found: ++ raise AssertionError( ++ '%r not all found in call list' % (tuple(not_found),) ++ ) ++ ++ ++ def assert_any_call(self, *args, **kwargs): ++ """assert the mock has been called with the specified arguments. ++ ++ The assert passes if the mock has *ever* been called, unlike ++ `assert_called_with` and `assert_called_once_with` that only pass if ++ the call is the most recent one.""" ++ expected = self._call_matcher((args, kwargs)) ++ actual = [self._call_matcher(c) for c in self.call_args_list] ++ if expected not in actual: ++ expected_string = self._format_mock_call_signature(args, kwargs) ++ raise AssertionError( ++ '%s call not found' % expected_string ++ ) ++ ++ ++ def _get_child_mock(self, **kw): ++ """Create the child mocks for attributes and return value. ++ By default child mocks will be the same type as the parent. ++ Subclasses of Mock may want to override this to customize the way ++ child mocks are made. ++ ++ For non-callable mocks the callable variant will be used (rather than ++ any custom subclass).""" ++ _type = type(self) ++ if not issubclass(_type, CallableMixin): ++ if issubclass(_type, NonCallableMagicMock): ++ klass = MagicMock ++ elif issubclass(_type, NonCallableMock) : ++ klass = Mock ++ else: ++ klass = _type.__mro__[1] ++ return klass(**kw) ++ ++ ++ ++def _try_iter(obj): ++ if obj is None: ++ return obj ++ if _is_exception(obj): ++ return obj ++ if _callable(obj): ++ return obj ++ try: ++ return iter(obj) ++ except TypeError: ++ # XXXX backwards compatibility ++ # but this will blow up on first call - so maybe we should fail early? ++ return obj ++ ++ ++ ++class CallableMixin(Base): ++ ++ def __init__(self, spec=None, side_effect=None, return_value=DEFAULT, ++ wraps=None, name=None, spec_set=None, parent=None, ++ _spec_state=None, _new_name='', _new_parent=None, **kwargs): ++ self.__dict__['_mock_return_value'] = return_value ++ ++ _safe_super(CallableMixin, self).__init__( ++ spec, wraps, name, spec_set, parent, ++ _spec_state, _new_name, _new_parent, **kwargs ++ ) ++ ++ self.side_effect = side_effect ++ ++ ++ def _mock_check_sig(self, *args, **kwargs): ++ # stub method that can be replaced with one with a specific signature ++ pass ++ ++ ++ def __call__(_mock_self, *args, **kwargs): ++ # can't use self in-case a function / method we are mocking uses self ++ # in the signature ++ _mock_self._mock_check_sig(*args, **kwargs) ++ return _mock_self._mock_call(*args, **kwargs) ++ ++ ++ def _mock_call(_mock_self, *args, **kwargs): ++ self = _mock_self ++ self.called = True ++ self.call_count += 1 ++ _new_name = self._mock_new_name ++ _new_parent = self._mock_new_parent ++ ++ _call = _Call((args, kwargs), two=True) ++ self.call_args = _call ++ self.call_args_list.append(_call) ++ self.mock_calls.append(_Call(('', args, kwargs))) ++ ++ seen = set() ++ skip_next_dot = _new_name == '()' ++ do_method_calls = self._mock_parent is not None ++ name = self._mock_name ++ while _new_parent is not None: ++ this_mock_call = _Call((_new_name, args, kwargs)) ++ if _new_parent._mock_new_name: ++ dot = '.' ++ if skip_next_dot: ++ dot = '' ++ ++ skip_next_dot = False ++ if _new_parent._mock_new_name == '()': ++ skip_next_dot = True ++ ++ _new_name = _new_parent._mock_new_name + dot + _new_name ++ ++ if do_method_calls: ++ if _new_name == name: ++ this_method_call = this_mock_call ++ else: ++ this_method_call = _Call((name, args, kwargs)) ++ _new_parent.method_calls.append(this_method_call) ++ ++ do_method_calls = _new_parent._mock_parent is not None ++ if do_method_calls: ++ name = _new_parent._mock_name + '.' + name ++ ++ _new_parent.mock_calls.append(this_mock_call) ++ _new_parent = _new_parent._mock_new_parent ++ ++ # use ids here so as not to call __hash__ on the mocks ++ _new_parent_id = id(_new_parent) ++ if _new_parent_id in seen: ++ break ++ seen.add(_new_parent_id) ++ ++ ret_val = DEFAULT ++ effect = self.side_effect ++ if effect is not None: ++ if _is_exception(effect): ++ raise effect ++ ++ if not _callable(effect): ++ result = next(effect) ++ if _is_exception(result): ++ raise result ++ if result is DEFAULT: ++ result = self.return_value ++ return result ++ ++ ret_val = effect(*args, **kwargs) ++ ++ if (self._mock_wraps is not None and ++ self._mock_return_value is DEFAULT): ++ return self._mock_wraps(*args, **kwargs) ++ if ret_val is DEFAULT: ++ ret_val = self.return_value ++ return ret_val ++ ++ ++ ++class Mock(CallableMixin, NonCallableMock): ++ """ ++ Create a new `Mock` object. `Mock` takes several optional arguments ++ that specify the behaviour of the Mock object: ++ ++ * `spec`: This can be either a list of strings or an existing object (a ++ class or instance) that acts as the specification for the mock object. If ++ you pass in an object then a list of strings is formed by calling dir on ++ the object (excluding unsupported magic attributes and methods). Accessing ++ any attribute not in this list will raise an `AttributeError`. ++ ++ If `spec` is an object (rather than a list of strings) then ++ `mock.__class__` returns the class of the spec object. This allows mocks ++ to pass `isinstance` tests. ++ ++ * `spec_set`: A stricter variant of `spec`. If used, attempting to *set* ++ or get an attribute on the mock that isn't on the object passed as ++ `spec_set` will raise an `AttributeError`. ++ ++ * `side_effect`: A function to be called whenever the Mock is called. See ++ the `side_effect` attribute. Useful for raising exceptions or ++ dynamically changing return values. The function is called with the same ++ arguments as the mock, and unless it returns `DEFAULT`, the return ++ value of this function is used as the return value. ++ ++ If `side_effect` is an iterable then each call to the mock will return ++ the next value from the iterable. If any of the members of the iterable ++ are exceptions they will be raised instead of returned. ++ ++ * `return_value`: The value returned when the mock is called. By default ++ this is a new Mock (created on first access). See the ++ `return_value` attribute. ++ ++ * `wraps`: Item for the mock object to wrap. If `wraps` is not None then ++ calling the Mock will pass the call through to the wrapped object ++ (returning the real result). Attribute access on the mock will return a ++ Mock object that wraps the corresponding attribute of the wrapped object ++ (so attempting to access an attribute that doesn't exist will raise an ++ `AttributeError`). ++ ++ If the mock has an explicit `return_value` set then calls are not passed ++ to the wrapped object and the `return_value` is returned instead. ++ ++ * `name`: If the mock has a name then it will be used in the repr of the ++ mock. This can be useful for debugging. The name is propagated to child ++ mocks. ++ ++ Mocks can also be called with arbitrary keyword arguments. These will be ++ used to set attributes on the mock after it is created. ++ """ ++ ++ ++ ++def _dot_lookup(thing, comp, import_path): ++ try: ++ return getattr(thing, comp) ++ except AttributeError: ++ __import__(import_path) ++ return getattr(thing, comp) ++ ++ ++def _importer(target): ++ components = target.split('.') ++ import_path = components.pop(0) ++ thing = __import__(import_path) ++ ++ for comp in components: ++ import_path += ".%s" % comp ++ thing = _dot_lookup(thing, comp, import_path) ++ return thing ++ ++ ++def _is_started(patcher): ++ # XXXX horrible ++ return hasattr(patcher, 'is_local') ++ ++ ++class _patch(object): ++ ++ attribute_name = None ++ _active_patches = [] ++ ++ def __init__( ++ self, getter, attribute, new, spec, create, ++ spec_set, autospec, new_callable, kwargs ++ ): ++ if new_callable is not None: ++ if new is not DEFAULT: ++ raise ValueError( ++ "Cannot use 'new' and 'new_callable' together" ++ ) ++ if autospec is not None: ++ raise ValueError( ++ "Cannot use 'autospec' and 'new_callable' together" ++ ) ++ ++ self.getter = getter ++ self.attribute = attribute ++ self.new = new ++ self.new_callable = new_callable ++ self.spec = spec ++ self.create = create ++ self.has_local = False ++ self.spec_set = spec_set ++ self.autospec = autospec ++ self.kwargs = kwargs ++ self.additional_patchers = [] ++ ++ ++ def copy(self): ++ patcher = _patch( ++ self.getter, self.attribute, self.new, self.spec, ++ self.create, self.spec_set, ++ self.autospec, self.new_callable, self.kwargs ++ ) ++ patcher.attribute_name = self.attribute_name ++ patcher.additional_patchers = [ ++ p.copy() for p in self.additional_patchers ++ ] ++ return patcher ++ ++ ++ def __call__(self, func): ++ if isinstance(func, type): ++ return self.decorate_class(func) ++ return self.decorate_callable(func) ++ ++ ++ def decorate_class(self, klass): ++ for attr in dir(klass): ++ if not attr.startswith(patch.TEST_PREFIX): ++ continue ++ ++ attr_value = getattr(klass, attr) ++ if not hasattr(attr_value, "__call__"): ++ continue ++ ++ patcher = self.copy() ++ setattr(klass, attr, patcher(attr_value)) ++ return klass ++ ++ ++ def decorate_callable(self, func): ++ if hasattr(func, 'patchings'): ++ func.patchings.append(self) ++ return func ++ ++ @wraps(func) ++ def patched(*args, **keywargs): ++ extra_args = [] ++ entered_patchers = [] ++ ++ exc_info = tuple() ++ try: ++ for patching in patched.patchings: ++ arg = patching.__enter__() ++ entered_patchers.append(patching) ++ if patching.attribute_name is not None: ++ keywargs.update(arg) ++ elif patching.new is DEFAULT: ++ extra_args.append(arg) ++ ++ args += tuple(extra_args) ++ return func(*args, **keywargs) ++ except: ++ if (patching not in entered_patchers and ++ _is_started(patching)): ++ # the patcher may have been started, but an exception ++ # raised whilst entering one of its additional_patchers ++ entered_patchers.append(patching) ++ # Pass the exception to __exit__ ++ exc_info = sys.exc_info() ++ # re-raise the exception ++ raise ++ finally: ++ for patching in reversed(entered_patchers): ++ patching.__exit__(*exc_info) ++ ++ patched.patchings = [self] ++ return patched ++ ++ ++ def get_original(self): ++ target = self.getter() ++ name = self.attribute ++ ++ original = DEFAULT ++ local = False ++ ++ try: ++ original = target.__dict__[name] ++ except (AttributeError, KeyError): ++ original = getattr(target, name, DEFAULT) ++ else: ++ local = True ++ ++ if name in _builtins and isinstance(target, ModuleType): ++ self.create = True ++ ++ if not self.create and original is DEFAULT: ++ raise AttributeError( ++ "%s does not have the attribute %r" % (target, name) ++ ) ++ return original, local ++ ++ ++ def __enter__(self): ++ """Perform the patch.""" ++ new, spec, spec_set = self.new, self.spec, self.spec_set ++ autospec, kwargs = self.autospec, self.kwargs ++ new_callable = self.new_callable ++ self.target = self.getter() ++ ++ # normalise False to None ++ if spec is False: ++ spec = None ++ if spec_set is False: ++ spec_set = None ++ if autospec is False: ++ autospec = None ++ ++ if spec is not None and autospec is not None: ++ raise TypeError("Can't specify spec and autospec") ++ if ((spec is not None or autospec is not None) and ++ spec_set not in (True, None)): ++ raise TypeError("Can't provide explicit spec_set *and* spec or autospec") ++ ++ original, local = self.get_original() ++ ++ if new is DEFAULT and autospec is None: ++ inherit = False ++ if spec is True: ++ # set spec to the object we are replacing ++ spec = original ++ if spec_set is True: ++ spec_set = original ++ spec = None ++ elif spec is not None: ++ if spec_set is True: ++ spec_set = spec ++ spec = None ++ elif spec_set is True: ++ spec_set = original ++ ++ if spec is not None or spec_set is not None: ++ if original is DEFAULT: ++ raise TypeError("Can't use 'spec' with create=True") ++ if isinstance(original, type): ++ # If we're patching out a class and there is a spec ++ inherit = True ++ ++ Klass = MagicMock ++ _kwargs = {} ++ if new_callable is not None: ++ Klass = new_callable ++ elif spec is not None or spec_set is not None: ++ this_spec = spec ++ if spec_set is not None: ++ this_spec = spec_set ++ if _is_list(this_spec): ++ not_callable = '__call__' not in this_spec ++ else: ++ not_callable = not callable(this_spec) ++ if not_callable: ++ Klass = NonCallableMagicMock ++ ++ if spec is not None: ++ _kwargs['spec'] = spec ++ if spec_set is not None: ++ _kwargs['spec_set'] = spec_set ++ ++ # add a name to mocks ++ if (isinstance(Klass, type) and ++ issubclass(Klass, NonCallableMock) and self.attribute): ++ _kwargs['name'] = self.attribute ++ ++ _kwargs.update(kwargs) ++ new = Klass(**_kwargs) ++ ++ if inherit and _is_instance_mock(new): ++ # we can only tell if the instance should be callable if the ++ # spec is not a list ++ this_spec = spec ++ if spec_set is not None: ++ this_spec = spec_set ++ if (not _is_list(this_spec) and not ++ _instance_callable(this_spec)): ++ Klass = NonCallableMagicMock ++ ++ _kwargs.pop('name') ++ new.return_value = Klass(_new_parent=new, _new_name='()', ++ **_kwargs) ++ elif autospec is not None: ++ # spec is ignored, new *must* be default, spec_set is treated ++ # as a boolean. Should we check spec is not None and that spec_set ++ # is a bool? ++ if new is not DEFAULT: ++ raise TypeError( ++ "autospec creates the mock for you. Can't specify " ++ "autospec and new." ++ ) ++ if original is DEFAULT: ++ raise TypeError("Can't use 'autospec' with create=True") ++ spec_set = bool(spec_set) ++ if autospec is True: ++ autospec = original ++ ++ new = create_autospec(autospec, spec_set=spec_set, ++ _name=self.attribute, **kwargs) ++ elif kwargs: ++ # can't set keyword args when we aren't creating the mock ++ # XXXX If new is a Mock we could call new.configure_mock(**kwargs) ++ raise TypeError("Can't pass kwargs to a mock we aren't creating") ++ ++ new_attr = new ++ ++ self.temp_original = original ++ self.is_local = local ++ setattr(self.target, self.attribute, new_attr) ++ if self.attribute_name is not None: ++ extra_args = {} ++ if self.new is DEFAULT: ++ extra_args[self.attribute_name] = new ++ for patching in self.additional_patchers: ++ arg = patching.__enter__() ++ if patching.new is DEFAULT: ++ extra_args.update(arg) ++ return extra_args ++ ++ return new ++ ++ ++ def __exit__(self, *exc_info): ++ """Undo the patch.""" ++ if not _is_started(self): ++ raise RuntimeError('stop called on unstarted patcher') ++ ++ if self.is_local and self.temp_original is not DEFAULT: ++ setattr(self.target, self.attribute, self.temp_original) ++ else: ++ delattr(self.target, self.attribute) ++ if not self.create and not hasattr(self.target, self.attribute): ++ # needed for proxy objects like django settings ++ setattr(self.target, self.attribute, self.temp_original) ++ ++ del self.temp_original ++ del self.is_local ++ del self.target ++ for patcher in reversed(self.additional_patchers): ++ if _is_started(patcher): ++ patcher.__exit__(*exc_info) ++ ++ ++ def start(self): ++ """Activate a patch, returning any created mock.""" ++ result = self.__enter__() ++ self._active_patches.append(self) ++ return result ++ ++ ++ def stop(self): ++ """Stop an active patch.""" ++ try: ++ self._active_patches.remove(self) ++ except ValueError: ++ # If the patch hasn't been started this will fail ++ pass ++ ++ return self.__exit__() ++ ++ ++ ++def _get_target(target): ++ try: ++ target, attribute = target.rsplit('.', 1) ++ except (TypeError, ValueError): ++ raise TypeError("Need a valid target to patch. You supplied: %r" % ++ (target,)) ++ getter = lambda: _importer(target) ++ return getter, attribute ++ ++ ++def _patch_object( ++ target, attribute, new=DEFAULT, spec=None, ++ create=False, spec_set=None, autospec=None, ++ new_callable=None, **kwargs ++ ): ++ """ ++ patch the named member (`attribute`) on an object (`target`) with a mock ++ object. ++ ++ `patch.object` can be used as a decorator, class decorator or a context ++ manager. Arguments `new`, `spec`, `create`, `spec_set`, ++ `autospec` and `new_callable` have the same meaning as for `patch`. Like ++ `patch`, `patch.object` takes arbitrary keyword arguments for configuring ++ the mock object it creates. ++ ++ When used as a class decorator `patch.object` honours `patch.TEST_PREFIX` ++ for choosing which methods to wrap. ++ """ ++ getter = lambda: target ++ return _patch( ++ getter, attribute, new, spec, create, ++ spec_set, autospec, new_callable, kwargs ++ ) ++ ++ ++def _patch_multiple(target, spec=None, create=False, spec_set=None, ++ autospec=None, new_callable=None, **kwargs): ++ """Perform multiple patches in a single call. It takes the object to be ++ patched (either as an object or a string to fetch the object by importing) ++ and keyword arguments for the patches:: ++ ++ with patch.multiple(settings, FIRST_PATCH='one', SECOND_PATCH='two'): ++ ... ++ ++ Use `DEFAULT` as the value if you want `patch.multiple` to create ++ mocks for you. In this case the created mocks are passed into a decorated ++ function by keyword, and a dictionary is returned when `patch.multiple` is ++ used as a context manager. ++ ++ `patch.multiple` can be used as a decorator, class decorator or a context ++ manager. The arguments `spec`, `spec_set`, `create`, ++ `autospec` and `new_callable` have the same meaning as for `patch`. These ++ arguments will be applied to *all* patches done by `patch.multiple`. ++ ++ When used as a class decorator `patch.multiple` honours `patch.TEST_PREFIX` ++ for choosing which methods to wrap. ++ """ ++ if type(target) is str: ++ getter = lambda: _importer(target) ++ else: ++ getter = lambda: target ++ ++ if not kwargs: ++ raise ValueError( ++ 'Must supply at least one keyword argument with patch.multiple' ++ ) ++ # need to wrap in a list for python 3, where items is a view ++ items = list(kwargs.items()) ++ attribute, new = items[0] ++ patcher = _patch( ++ getter, attribute, new, spec, create, spec_set, ++ autospec, new_callable, {} ++ ) ++ patcher.attribute_name = attribute ++ for attribute, new in items[1:]: ++ this_patcher = _patch( ++ getter, attribute, new, spec, create, spec_set, ++ autospec, new_callable, {} ++ ) ++ this_patcher.attribute_name = attribute ++ patcher.additional_patchers.append(this_patcher) ++ return patcher ++ ++ ++def patch( ++ target, new=DEFAULT, spec=None, create=False, ++ spec_set=None, autospec=None, new_callable=None, **kwargs ++ ): ++ """ ++ `patch` acts as a function decorator, class decorator or a context ++ manager. Inside the body of the function or with statement, the `target` ++ is patched with a `new` object. When the function/with statement exits ++ the patch is undone. ++ ++ If `new` is omitted, then the target is replaced with a ++ `MagicMock`. If `patch` is used as a decorator and `new` is ++ omitted, the created mock is passed in as an extra argument to the ++ decorated function. If `patch` is used as a context manager the created ++ mock is returned by the context manager. ++ ++ `target` should be a string in the form `'package.module.ClassName'`. The ++ `target` is imported and the specified object replaced with the `new` ++ object, so the `target` must be importable from the environment you are ++ calling `patch` from. The target is imported when the decorated function ++ is executed, not at decoration time. ++ ++ The `spec` and `spec_set` keyword arguments are passed to the `MagicMock` ++ if patch is creating one for you. ++ ++ In addition you can pass `spec=True` or `spec_set=True`, which causes ++ patch to pass in the object being mocked as the spec/spec_set object. ++ ++ `new_callable` allows you to specify a different class, or callable object, ++ that will be called to create the `new` object. By default `MagicMock` is ++ used. ++ ++ A more powerful form of `spec` is `autospec`. If you set `autospec=True` ++ then the mock with be created with a spec from the object being replaced. ++ All attributes of the mock will also have the spec of the corresponding ++ attribute of the object being replaced. Methods and functions being ++ mocked will have their arguments checked and will raise a `TypeError` if ++ they are called with the wrong signature. For mocks replacing a class, ++ their return value (the 'instance') will have the same spec as the class. ++ ++ Instead of `autospec=True` you can pass `autospec=some_object` to use an ++ arbitrary object as the spec instead of the one being replaced. ++ ++ By default `patch` will fail to replace attributes that don't exist. If ++ you pass in `create=True`, and the attribute doesn't exist, patch will ++ create the attribute for you when the patched function is called, and ++ delete it again afterwards. This is useful for writing tests against ++ attributes that your production code creates at runtime. It is off by ++ default because it can be dangerous. With it switched on you can write ++ passing tests against APIs that don't actually exist! ++ ++ Patch can be used as a `TestCase` class decorator. It works by ++ decorating each test method in the class. This reduces the boilerplate ++ code when your test methods share a common patchings set. `patch` finds ++ tests by looking for method names that start with `patch.TEST_PREFIX`. ++ By default this is `test`, which matches the way `unittest` finds tests. ++ You can specify an alternative prefix by setting `patch.TEST_PREFIX`. ++ ++ Patch can be used as a context manager, with the with statement. Here the ++ patching applies to the indented block after the with statement. If you ++ use "as" then the patched object will be bound to the name after the ++ "as"; very useful if `patch` is creating a mock object for you. ++ ++ `patch` takes arbitrary keyword arguments. These will be passed to ++ the `Mock` (or `new_callable`) on construction. ++ ++ `patch.dict(...)`, `patch.multiple(...)` and `patch.object(...)` are ++ available for alternate use-cases. ++ """ ++ getter, attribute = _get_target(target) ++ return _patch( ++ getter, attribute, new, spec, create, ++ spec_set, autospec, new_callable, kwargs ++ ) ++ ++ ++class _patch_dict(object): ++ """ ++ Patch a dictionary, or dictionary like object, and restore the dictionary ++ to its original state after the test. ++ ++ `in_dict` can be a dictionary or a mapping like container. If it is a ++ mapping then it must at least support getting, setting and deleting items ++ plus iterating over keys. ++ ++ `in_dict` can also be a string specifying the name of the dictionary, which ++ will then be fetched by importing it. ++ ++ `values` can be a dictionary of values to set in the dictionary. `values` ++ can also be an iterable of `(key, value)` pairs. ++ ++ If `clear` is True then the dictionary will be cleared before the new ++ values are set. ++ ++ `patch.dict` can also be called with arbitrary keyword arguments to set ++ values in the dictionary:: ++ ++ with patch.dict('sys.modules', mymodule=Mock(), other_module=Mock()): ++ ... ++ ++ `patch.dict` can be used as a context manager, decorator or class ++ decorator. When used as a class decorator `patch.dict` honours ++ `patch.TEST_PREFIX` for choosing which methods to wrap. ++ """ ++ ++ def __init__(self, in_dict, values=(), clear=False, **kwargs): ++ if isinstance(in_dict, str): ++ in_dict = _importer(in_dict) ++ self.in_dict = in_dict ++ # support any argument supported by dict(...) constructor ++ self.values = dict(values) ++ self.values.update(kwargs) ++ self.clear = clear ++ self._original = None ++ ++ ++ def __call__(self, f): ++ if isinstance(f, type): ++ return self.decorate_class(f) ++ @wraps(f) ++ def _inner(*args, **kw): ++ self._patch_dict() ++ try: ++ return f(*args, **kw) ++ finally: ++ self._unpatch_dict() ++ ++ return _inner ++ ++ ++ def decorate_class(self, klass): ++ for attr in dir(klass): ++ attr_value = getattr(klass, attr) ++ if (attr.startswith(patch.TEST_PREFIX) and ++ hasattr(attr_value, "__call__")): ++ decorator = _patch_dict(self.in_dict, self.values, self.clear) ++ decorated = decorator(attr_value) ++ setattr(klass, attr, decorated) ++ return klass ++ ++ ++ def __enter__(self): ++ """Patch the dict.""" ++ self._patch_dict() ++ ++ ++ def _patch_dict(self): ++ values = self.values ++ in_dict = self.in_dict ++ clear = self.clear ++ ++ try: ++ original = in_dict.copy() ++ except AttributeError: ++ # dict like object with no copy method ++ # must support iteration over keys ++ original = {} ++ for key in in_dict: ++ original[key] = in_dict[key] ++ self._original = original ++ ++ if clear: ++ _clear_dict(in_dict) ++ ++ try: ++ in_dict.update(values) ++ except AttributeError: ++ # dict like object with no update method ++ for key in values: ++ in_dict[key] = values[key] ++ ++ ++ def _unpatch_dict(self): ++ in_dict = self.in_dict ++ original = self._original ++ ++ _clear_dict(in_dict) ++ ++ try: ++ in_dict.update(original) ++ except AttributeError: ++ for key in original: ++ in_dict[key] = original[key] ++ ++ ++ def __exit__(self, *args): ++ """Unpatch the dict.""" ++ self._unpatch_dict() ++ return False ++ ++ start = __enter__ ++ stop = __exit__ ++ ++ ++def _clear_dict(in_dict): ++ try: ++ in_dict.clear() ++ except AttributeError: ++ keys = list(in_dict) ++ for key in keys: ++ del in_dict[key] ++ ++ ++def _patch_stopall(): ++ """Stop all active patches. LIFO to unroll nested patches.""" ++ for patch in reversed(_patch._active_patches): ++ patch.stop() ++ ++ ++patch.object = _patch_object ++patch.dict = _patch_dict ++patch.multiple = _patch_multiple ++patch.stopall = _patch_stopall ++patch.TEST_PREFIX = 'test' ++ ++magic_methods = ( ++ "lt le gt ge eq ne " ++ "getitem setitem delitem " ++ "len contains iter " ++ "hash str sizeof " ++ "enter exit " ++ "divmod neg pos abs invert " ++ "complex int float index " ++ "trunc floor ceil " ++ "bool next " ++) ++ ++numerics = ( ++ "add sub mul div floordiv mod lshift rshift and xor or pow truediv" ++) ++inplace = ' '.join('i%s' % n for n in numerics.split()) ++right = ' '.join('r%s' % n for n in numerics.split()) ++ ++# not including __prepare__, __instancecheck__, __subclasscheck__ ++# (as they are metaclass methods) ++# __del__ is not supported at all as it causes problems if it exists ++ ++_non_defaults = set('__%s__' % method for method in [ ++ 'get', 'set', 'delete', 'reversed', 'missing', 'reduce', 'reduce_ex', ++ 'getinitargs', 'getnewargs', 'getstate', 'setstate', 'getformat', ++ 'setformat', 'repr', 'dir', 'subclasses', 'format', ++]) ++ ++ ++def _get_method(name, func): ++ "Turns a callable object (like a mock) into a real function" ++ def method(self, *args, **kw): ++ return func(self, *args, **kw) ++ method.__name__ = name ++ return method ++ ++ ++_magics = set( ++ '__%s__' % method for method in ++ ' '.join([magic_methods, numerics, inplace, right]).split() ++) ++ ++_all_magics = _magics | _non_defaults ++ ++_unsupported_magics = set([ ++ '__getattr__', '__setattr__', ++ '__init__', '__new__', '__prepare__' ++ '__instancecheck__', '__subclasscheck__', ++ '__del__' ++]) ++ ++_calculate_return_value = { ++ '__hash__': lambda self: object.__hash__(self), ++ '__str__': lambda self: object.__str__(self), ++ '__sizeof__': lambda self: object.__sizeof__(self), ++} ++ ++_return_values = { ++ '__lt__': NotImplemented, ++ '__gt__': NotImplemented, ++ '__le__': NotImplemented, ++ '__ge__': NotImplemented, ++ '__int__': 1, ++ '__contains__': False, ++ '__len__': 0, ++ '__exit__': False, ++ '__complex__': 1j, ++ '__float__': 1.0, ++ '__bool__': True, ++ '__index__': 1, ++} ++ ++ ++def _get_eq(self): ++ def __eq__(other): ++ ret_val = self.__eq__._mock_return_value ++ if ret_val is not DEFAULT: ++ return ret_val ++ return self is other ++ return __eq__ ++ ++def _get_ne(self): ++ def __ne__(other): ++ if self.__ne__._mock_return_value is not DEFAULT: ++ return DEFAULT ++ return self is not other ++ return __ne__ ++ ++def _get_iter(self): ++ def __iter__(): ++ ret_val = self.__iter__._mock_return_value ++ if ret_val is DEFAULT: ++ return iter([]) ++ # if ret_val was already an iterator, then calling iter on it should ++ # return the iterator unchanged ++ return iter(ret_val) ++ return __iter__ ++ ++_side_effect_methods = { ++ '__eq__': _get_eq, ++ '__ne__': _get_ne, ++ '__iter__': _get_iter, ++} ++ ++ ++ ++def _set_return_value(mock, method, name): ++ fixed = _return_values.get(name, DEFAULT) ++ if fixed is not DEFAULT: ++ method.return_value = fixed ++ return ++ ++ return_calulator = _calculate_return_value.get(name) ++ if return_calulator is not None: ++ try: ++ return_value = return_calulator(mock) ++ except AttributeError: ++ # XXXX why do we return AttributeError here? ++ # set it as a side_effect instead? ++ return_value = AttributeError(name) ++ method.return_value = return_value ++ return ++ ++ side_effector = _side_effect_methods.get(name) ++ if side_effector is not None: ++ method.side_effect = side_effector(mock) ++ ++ ++ ++class MagicMixin(object): ++ def __init__(self, *args, **kw): ++ _safe_super(MagicMixin, self).__init__(*args, **kw) ++ self._mock_set_magics() ++ ++ ++ def _mock_set_magics(self): ++ these_magics = _magics ++ ++ if self._mock_methods is not None: ++ these_magics = _magics.intersection(self._mock_methods) ++ ++ remove_magics = set() ++ remove_magics = _magics - these_magics ++ ++ for entry in remove_magics: ++ if entry in type(self).__dict__: ++ # remove unneeded magic methods ++ delattr(self, entry) ++ ++ # don't overwrite existing attributes if called a second time ++ these_magics = these_magics - set(type(self).__dict__) ++ ++ _type = type(self) ++ for entry in these_magics: ++ setattr(_type, entry, MagicProxy(entry, self)) ++ ++ ++ ++class NonCallableMagicMock(MagicMixin, NonCallableMock): ++ """A version of `MagicMock` that isn't callable.""" ++ def mock_add_spec(self, spec, spec_set=False): ++ """Add a spec to a mock. `spec` can either be an object or a ++ list of strings. Only attributes on the `spec` can be fetched as ++ attributes from the mock. ++ ++ If `spec_set` is True then only attributes on the spec can be set.""" ++ self._mock_add_spec(spec, spec_set) ++ self._mock_set_magics() ++ ++ ++ ++class MagicMock(MagicMixin, Mock): ++ """ ++ MagicMock is a subclass of Mock with default implementations ++ of most of the magic methods. You can use MagicMock without having to ++ configure the magic methods yourself. ++ ++ If you use the `spec` or `spec_set` arguments then *only* magic ++ methods that exist in the spec will be created. ++ ++ Attributes and the return value of a `MagicMock` will also be `MagicMocks`. ++ """ ++ def mock_add_spec(self, spec, spec_set=False): ++ """Add a spec to a mock. `spec` can either be an object or a ++ list of strings. Only attributes on the `spec` can be fetched as ++ attributes from the mock. ++ ++ If `spec_set` is True then only attributes on the spec can be set.""" ++ self._mock_add_spec(spec, spec_set) ++ self._mock_set_magics() ++ ++ ++ ++class MagicProxy(object): ++ def __init__(self, name, parent): ++ self.name = name ++ self.parent = parent ++ ++ def __call__(self, *args, **kwargs): ++ m = self.create_mock() ++ return m(*args, **kwargs) ++ ++ def create_mock(self): ++ entry = self.name ++ parent = self.parent ++ m = parent._get_child_mock(name=entry, _new_name=entry, ++ _new_parent=parent) ++ setattr(parent, entry, m) ++ _set_return_value(parent, m, entry) ++ return m ++ ++ def __get__(self, obj, _type=None): ++ return self.create_mock() ++ ++ ++ ++class _ANY(object): ++ "A helper object that compares equal to everything." ++ ++ __hash__ = object.__hash__ ++ ++ def __eq__(self, other): ++ return True ++ ++ def __ne__(self, other): ++ return False ++ ++ def __repr__(self): ++ return '' ++ ++ANY = _ANY() ++ ++ ++ ++def _format_call_signature(name, args, kwargs): ++ message = '%s(%%s)' % name ++ formatted_args = '' ++ args_string = ', '.join([repr(arg) for arg in args]) ++ kwargs_string = ', '.join([ ++ '%s=%r' % (key, value) for key, value in sorted(kwargs.items()) ++ ]) ++ if args_string: ++ formatted_args = args_string ++ if kwargs_string: ++ if formatted_args: ++ formatted_args += ', ' ++ formatted_args += kwargs_string ++ ++ return message % formatted_args ++ ++ ++ ++class _Call(tuple): ++ """ ++ A tuple for holding the results of a call to a mock, either in the form ++ `(args, kwargs)` or `(name, args, kwargs)`. ++ ++ If args or kwargs are empty then a call tuple will compare equal to ++ a tuple without those values. This makes comparisons less verbose:: ++ ++ _Call(('name', (), {})) == ('name',) ++ _Call(('name', (1,), {})) == ('name', (1,)) ++ _Call(((), {'a': 'b'})) == ({'a': 'b'},) ++ ++ The `_Call` object provides a useful shortcut for comparing with call:: ++ ++ _Call(((1, 2), {'a': 3})) == call(1, 2, a=3) ++ _Call(('foo', (1, 2), {'a': 3})) == call.foo(1, 2, a=3) ++ ++ If the _Call has no name then it will match any name. ++ """ ++ ++ __hash__ = object.__hash__ ++ ++ def __new__(cls, value=(), name=None, parent=None, two=False, ++ from_kall=True): ++ name = '' ++ args = () ++ kwargs = {} ++ _len = len(value) ++ if _len == 3: ++ name, args, kwargs = value ++ elif _len == 2: ++ first, second = value ++ if isinstance(first, str): ++ name = first ++ if isinstance(second, tuple): ++ args = second ++ else: ++ kwargs = second ++ else: ++ args, kwargs = first, second ++ elif _len == 1: ++ value, = value ++ if isinstance(value, str): ++ name = value ++ elif isinstance(value, tuple): ++ args = value ++ else: ++ kwargs = value ++ ++ if two: ++ return tuple.__new__(cls, (args, kwargs)) ++ ++ return tuple.__new__(cls, (name, args, kwargs)) ++ ++ ++ def __init__(self, value=(), name=None, parent=None, two=False, ++ from_kall=True): ++ self.name = name ++ self.parent = parent ++ self.from_kall = from_kall ++ ++ ++ def __eq__(self, other): ++ if other is ANY: ++ return True ++ try: ++ len_other = len(other) ++ except TypeError: ++ return False ++ ++ self_name = '' ++ if len(self) == 2: ++ self_args, self_kwargs = self ++ else: ++ self_name, self_args, self_kwargs = self ++ ++ other_name = '' ++ if len_other == 0: ++ other_args, other_kwargs = (), {} ++ elif len_other == 3: ++ other_name, other_args, other_kwargs = other ++ elif len_other == 1: ++ value, = other ++ if isinstance(value, tuple): ++ other_args = value ++ other_kwargs = {} ++ elif isinstance(value, str): ++ other_name = value ++ other_args, other_kwargs = (), {} ++ else: ++ other_args = () ++ other_kwargs = value ++ else: ++ # len 2 ++ # could be (name, args) or (name, kwargs) or (args, kwargs) ++ first, second = other ++ if isinstance(first, str): ++ other_name = first ++ if isinstance(second, tuple): ++ other_args, other_kwargs = second, {} ++ else: ++ other_args, other_kwargs = (), second ++ else: ++ other_args, other_kwargs = first, second ++ ++ if self_name and other_name != self_name: ++ return False ++ ++ # this order is important for ANY to work! ++ return (other_args, other_kwargs) == (self_args, self_kwargs) ++ ++ ++ def __ne__(self, other): ++ return not self.__eq__(other) ++ ++ ++ def __call__(self, *args, **kwargs): ++ if self.name is None: ++ return _Call(('', args, kwargs), name='()') ++ ++ name = self.name + '()' ++ return _Call((self.name, args, kwargs), name=name, parent=self) ++ ++ ++ def __getattr__(self, attr): ++ if self.name is None: ++ return _Call(name=attr, from_kall=False) ++ name = '%s.%s' % (self.name, attr) ++ return _Call(name=name, parent=self, from_kall=False) ++ ++ ++ def count(self, *args, **kwargs): ++ return self.__getattr__('count')(*args, **kwargs) ++ ++ def index(self, *args, **kwargs): ++ return self.__getattr__('index')(*args, **kwargs) ++ ++ def __repr__(self): ++ if not self.from_kall: ++ name = self.name or 'call' ++ if name.startswith('()'): ++ name = 'call%s' % name ++ return name ++ ++ if len(self) == 2: ++ name = 'call' ++ args, kwargs = self ++ else: ++ name, args, kwargs = self ++ if not name: ++ name = 'call' ++ elif not name.startswith('()'): ++ name = 'call.%s' % name ++ else: ++ name = 'call%s' % name ++ return _format_call_signature(name, args, kwargs) ++ ++ ++ def call_list(self): ++ """For a call object that represents multiple calls, `call_list` ++ returns a list of all the intermediate calls as well as the ++ final call.""" ++ vals = [] ++ thing = self ++ while thing is not None: ++ if thing.from_kall: ++ vals.append(thing) ++ thing = thing.parent ++ return _CallList(reversed(vals)) ++ ++ ++call = _Call(from_kall=False) ++ ++ ++ ++def create_autospec(spec, spec_set=False, instance=False, _parent=None, ++ _name=None, **kwargs): ++ """Create a mock object using another object as a spec. Attributes on the ++ mock will use the corresponding attribute on the `spec` object as their ++ spec. ++ ++ Functions or methods being mocked will have their arguments checked ++ to check that they are called with the correct signature. ++ ++ If `spec_set` is True then attempting to set attributes that don't exist ++ on the spec object will raise an `AttributeError`. ++ ++ If a class is used as a spec then the return value of the mock (the ++ instance of the class) will have the same spec. You can use a class as the ++ spec for an instance object by passing `instance=True`. The returned mock ++ will only be callable if instances of the mock are callable. ++ ++ `create_autospec` also takes arbitrary keyword arguments that are passed to ++ the constructor of the created mock.""" ++ if _is_list(spec): ++ # can't pass a list instance to the mock constructor as it will be ++ # interpreted as a list of strings ++ spec = type(spec) ++ ++ is_type = isinstance(spec, type) ++ ++ _kwargs = {'spec': spec} ++ if spec_set: ++ _kwargs = {'spec_set': spec} ++ elif spec is None: ++ # None we mock with a normal mock without a spec ++ _kwargs = {} ++ if _kwargs and instance: ++ _kwargs['_spec_as_instance'] = True ++ ++ _kwargs.update(kwargs) ++ ++ Klass = MagicMock ++ if type(spec) in DescriptorTypes: ++ # descriptors don't have a spec ++ # because we don't know what type they return ++ _kwargs = {} ++ elif not _callable(spec): ++ Klass = NonCallableMagicMock ++ elif is_type and instance and not _instance_callable(spec): ++ Klass = NonCallableMagicMock ++ ++ _name = _kwargs.pop('name', _name) ++ ++ _new_name = _name ++ if _parent is None: ++ # for a top level object no _new_name should be set ++ _new_name = '' ++ ++ mock = Klass(parent=_parent, _new_parent=_parent, _new_name=_new_name, ++ name=_name, **_kwargs) ++ ++ if isinstance(spec, FunctionTypes): ++ # should only happen at the top level because we don't ++ # recurse for functions ++ mock = _set_signature(mock, spec) ++ else: ++ _check_signature(spec, mock, is_type, instance) ++ ++ if _parent is not None and not instance: ++ _parent._mock_children[_name] = mock ++ ++ if is_type and not instance and 'return_value' not in kwargs: ++ mock.return_value = create_autospec(spec, spec_set, instance=True, ++ _name='()', _parent=mock) ++ ++ for entry in dir(spec): ++ if _is_magic(entry): ++ # MagicMock already does the useful magic methods for us ++ continue ++ ++ # XXXX do we need a better way of getting attributes without ++ # triggering code execution (?) Probably not - we need the actual ++ # object to mock it so we would rather trigger a property than mock ++ # the property descriptor. Likewise we want to mock out dynamically ++ # provided attributes. ++ # XXXX what about attributes that raise exceptions other than ++ # AttributeError on being fetched? ++ # we could be resilient against it, or catch and propagate the ++ # exception when the attribute is fetched from the mock ++ try: ++ original = getattr(spec, entry) ++ except AttributeError: ++ continue ++ ++ kwargs = {'spec': original} ++ if spec_set: ++ kwargs = {'spec_set': original} ++ ++ if not isinstance(original, FunctionTypes): ++ new = _SpecState(original, spec_set, mock, entry, instance) ++ mock._mock_children[entry] = new ++ else: ++ parent = mock ++ if isinstance(spec, FunctionTypes): ++ parent = mock.mock ++ ++ skipfirst = _must_skip(spec, entry, is_type) ++ kwargs['_eat_self'] = skipfirst ++ new = MagicMock(parent=parent, name=entry, _new_name=entry, ++ _new_parent=parent, ++ **kwargs) ++ mock._mock_children[entry] = new ++ _check_signature(original, new, skipfirst=skipfirst) ++ ++ # so functions created with _set_signature become instance attributes, ++ # *plus* their underlying mock exists in _mock_children of the parent ++ # mock. Adding to _mock_children may be unnecessary where we are also ++ # setting as an instance attribute? ++ if isinstance(new, FunctionTypes): ++ setattr(mock, entry, new) ++ ++ return mock ++ ++ ++def _must_skip(spec, entry, is_type): ++ """ ++ Return whether we should skip the first argument on spec's `entry` ++ attribute. ++ """ ++ if not isinstance(spec, type): ++ if entry in getattr(spec, '__dict__', {}): ++ # instance attribute - shouldn't skip ++ return False ++ spec = spec.__class__ ++ ++ for klass in spec.__mro__: ++ result = klass.__dict__.get(entry, DEFAULT) ++ if result is DEFAULT: ++ continue ++ if isinstance(result, (staticmethod, classmethod)): ++ return False ++ elif isinstance(getattr(result, '__get__', None), MethodWrapperTypes): ++ # Normal method => skip if looked up on type ++ # (if looked up on instance, self is already skipped) ++ return is_type ++ else: ++ return False ++ ++ # shouldn't get here unless function is a dynamically provided attribute ++ # XXXX untested behaviour ++ return is_type ++ ++ ++def _get_class(obj): ++ try: ++ return obj.__class__ ++ except AttributeError: ++ # it is possible for objects to have no __class__ ++ return type(obj) ++ ++ ++class _SpecState(object): ++ ++ def __init__(self, spec, spec_set=False, parent=None, ++ name=None, ids=None, instance=False): ++ self.spec = spec ++ self.ids = ids ++ self.spec_set = spec_set ++ self.parent = parent ++ self.instance = instance ++ self.name = name ++ ++ ++FunctionTypes = ( ++ # python function ++ type(create_autospec), ++ # instance method ++ type(ANY.__eq__), ++) ++ ++MethodWrapperTypes = ( ++ type(ANY.__eq__.__get__), ++) ++ ++ ++file_spec = None ++ ++def _iterate_read_data(read_data): ++ # Helper for mock_open: ++ # Retrieve lines from read_data via a generator so that separate calls to ++ # readline, read, and readlines are properly interleaved ++ data_as_list = ['{}\n'.format(l) for l in read_data.split('\n')] ++ ++ if data_as_list[-1] == '\n': ++ # If the last line ended in a newline, the list comprehension will have an ++ # extra entry that's just a newline. Remove this. ++ data_as_list = data_as_list[:-1] ++ else: ++ # If there wasn't an extra newline by itself, then the file being ++ # emulated doesn't have a newline to end the last line remove the ++ # newline that our naive format() added ++ data_as_list[-1] = data_as_list[-1][:-1] ++ ++ for line in data_as_list: ++ yield line ++ ++def mock_open(mock=None, read_data=''): ++ """ ++ A helper function to create a mock to replace the use of `open`. It works ++ for `open` called directly or used as a context manager. ++ ++ The `mock` argument is the mock object to configure. If `None` (the ++ default) then a `MagicMock` will be created for you, with the API limited ++ to methods or attributes available on standard file handles. ++ ++ `read_data` is a string for the `read` methoddline`, and `readlines` of the ++ file handle to return. This is an empty string by default. ++ """ ++ def _readlines_side_effect(*args, **kwargs): ++ if handle.readlines.return_value is not None: ++ return handle.readlines.return_value ++ return list(_data) ++ ++ def _read_side_effect(*args, **kwargs): ++ if handle.read.return_value is not None: ++ return handle.read.return_value ++ return ''.join(_data) ++ ++ def _readline_side_effect(): ++ if handle.readline.return_value is not None: ++ while True: ++ yield handle.readline.return_value ++ for line in _data: ++ yield line ++ ++ ++ global file_spec ++ if file_spec is None: ++ import _io ++ file_spec = list(set(dir(_io.TextIOWrapper)).union(set(dir(_io.BytesIO)))) ++ ++ if mock is None: ++ mock = MagicMock(name='open', spec=open) ++ ++ handle = MagicMock(spec=file_spec) ++ handle.__enter__.return_value = handle ++ ++ _data = _iterate_read_data(read_data) ++ ++ handle.write.return_value = None ++ handle.read.return_value = None ++ handle.readline.return_value = None ++ handle.readlines.return_value = None ++ ++ handle.read.side_effect = _read_side_effect ++ handle.readline.side_effect = _readline_side_effect() ++ handle.readlines.side_effect = _readlines_side_effect ++ ++ mock.return_value = handle ++ return mock ++ ++ ++class PropertyMock(Mock): ++ """ ++ A mock intended to be used as a property, or other descriptor, on a class. ++ `PropertyMock` provides `__get__` and `__set__` methods so you can specify ++ a return value when it is fetched. ++ ++ Fetching a `PropertyMock` instance from an object calls the mock, with ++ no args. Setting it calls the mock with the value being set. ++ """ ++ def _get_child_mock(self, **kwargs): ++ return MagicMock(**kwargs) ++ ++ def __get__(self, obj, obj_type): ++ return self() ++ def __set__(self, obj, val): ++ self(val) +diff -r ee879c0ffa11 Lib/test/capath/4e1295a3.0 +--- /dev/null ++++ b/Lib/test/capath/4e1295a3.0 +@@ -0,0 +1,14 @@ ++-----BEGIN CERTIFICATE----- ++MIICLDCCAdYCAQAwDQYJKoZIhvcNAQEEBQAwgaAxCzAJBgNVBAYTAlBUMRMwEQYD ++VQQIEwpRdWVlbnNsYW5kMQ8wDQYDVQQHEwZMaXNib2ExFzAVBgNVBAoTDk5ldXJv ++bmlvLCBMZGEuMRgwFgYDVQQLEw9EZXNlbnZvbHZpbWVudG8xGzAZBgNVBAMTEmJy ++dXR1cy5uZXVyb25pby5wdDEbMBkGCSqGSIb3DQEJARYMc2FtcG9AaWtpLmZpMB4X ++DTk2MDkwNTAzNDI0M1oXDTk2MTAwNTAzNDI0M1owgaAxCzAJBgNVBAYTAlBUMRMw ++EQYDVQQIEwpRdWVlbnNsYW5kMQ8wDQYDVQQHEwZMaXNib2ExFzAVBgNVBAoTDk5l ++dXJvbmlvLCBMZGEuMRgwFgYDVQQLEw9EZXNlbnZvbHZpbWVudG8xGzAZBgNVBAMT ++EmJydXR1cy5uZXVyb25pby5wdDEbMBkGCSqGSIb3DQEJARYMc2FtcG9AaWtpLmZp ++MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL7+aty3S1iBA/+yxjxv4q1MUTd1kjNw ++L4lYKbpzzlmC5beaQXeQ2RmGMTXU+mDvuqItjVHOK3DvPK7lTcSGftUCAwEAATAN ++BgkqhkiG9w0BAQQFAANBAFqPEKFjk6T6CKTHvaQeEAsX0/8YHPHqH/9AnhSjrwuX ++9EBc0n6bVGhN7XaXd6sJ7dym9sbsWxb+pJdurnkxjx4= ++-----END CERTIFICATE----- +diff -r ee879c0ffa11 Lib/test/capath/5ed36f99.0 +--- /dev/null ++++ b/Lib/test/capath/5ed36f99.0 +@@ -0,0 +1,41 @@ ++-----BEGIN CERTIFICATE----- ++MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 ++IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB ++IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA ++Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO ++BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi ++MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ ++ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC ++CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ ++8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6 ++zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y ++fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7 ++w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc ++G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k ++epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q ++laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ ++QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU ++fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826 ++YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w ++ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY ++gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe ++MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0 ++IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy ++dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw ++czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0 ++dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl ++aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC ++AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg ++b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB ++ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc ++nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg ++18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c ++gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl ++Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY ++sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T ++SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF ++CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum ++GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk ++zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW ++omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD ++-----END CERTIFICATE----- +diff -r ee879c0ffa11 Lib/test/capath/6e88d7b8.0 +--- /dev/null ++++ b/Lib/test/capath/6e88d7b8.0 +@@ -0,0 +1,14 @@ ++-----BEGIN CERTIFICATE----- ++MIICLDCCAdYCAQAwDQYJKoZIhvcNAQEEBQAwgaAxCzAJBgNVBAYTAlBUMRMwEQYD ++VQQIEwpRdWVlbnNsYW5kMQ8wDQYDVQQHEwZMaXNib2ExFzAVBgNVBAoTDk5ldXJv ++bmlvLCBMZGEuMRgwFgYDVQQLEw9EZXNlbnZvbHZpbWVudG8xGzAZBgNVBAMTEmJy ++dXR1cy5uZXVyb25pby5wdDEbMBkGCSqGSIb3DQEJARYMc2FtcG9AaWtpLmZpMB4X ++DTk2MDkwNTAzNDI0M1oXDTk2MTAwNTAzNDI0M1owgaAxCzAJBgNVBAYTAlBUMRMw ++EQYDVQQIEwpRdWVlbnNsYW5kMQ8wDQYDVQQHEwZMaXNib2ExFzAVBgNVBAoTDk5l ++dXJvbmlvLCBMZGEuMRgwFgYDVQQLEw9EZXNlbnZvbHZpbWVudG8xGzAZBgNVBAMT ++EmJydXR1cy5uZXVyb25pby5wdDEbMBkGCSqGSIb3DQEJARYMc2FtcG9AaWtpLmZp ++MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL7+aty3S1iBA/+yxjxv4q1MUTd1kjNw ++L4lYKbpzzlmC5beaQXeQ2RmGMTXU+mDvuqItjVHOK3DvPK7lTcSGftUCAwEAATAN ++BgkqhkiG9w0BAQQFAANBAFqPEKFjk6T6CKTHvaQeEAsX0/8YHPHqH/9AnhSjrwuX ++9EBc0n6bVGhN7XaXd6sJ7dym9sbsWxb+pJdurnkxjx4= ++-----END CERTIFICATE----- +diff -r ee879c0ffa11 Lib/test/capath/99d0fa06.0 +--- /dev/null ++++ b/Lib/test/capath/99d0fa06.0 +@@ -0,0 +1,41 @@ ++-----BEGIN CERTIFICATE----- ++MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 ++IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB ++IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA ++Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO ++BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi ++MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ ++ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC ++CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ ++8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6 ++zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y ++fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7 ++w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc ++G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k ++epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q ++laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ ++QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU ++fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826 ++YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w ++ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY ++gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe ++MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0 ++IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy ++dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw ++czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0 ++dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl ++aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC ++AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg ++b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB ++ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc ++nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg ++18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c ++gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl ++Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY ++sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T ++SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF ++CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum ++GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk ++zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW ++omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD ++-----END CERTIFICATE----- +diff -r ee879c0ffa11 Lib/test/dh512.pem +--- /dev/null ++++ b/Lib/test/dh512.pem +@@ -0,0 +1,9 @@ ++-----BEGIN DH PARAMETERS----- ++MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak ++XUGfnHy9iUsiGSa6q6Jew1XpKgVfAgEC ++-----END DH PARAMETERS----- ++ ++These are the 512 bit DH parameters from "Assigned Number for SKIP Protocols" ++(http://www.skip-vpn.org/spec/numbers.html). ++See there for how they were generated. ++Note that g is not a generator, but this is not a problem since p is a safe prime. +diff -r ee879c0ffa11 Lib/test/keycert.passwd.pem +--- /dev/null ++++ b/Lib/test/keycert.passwd.pem +@@ -0,0 +1,33 @@ ++-----BEGIN RSA PRIVATE KEY----- ++Proc-Type: 4,ENCRYPTED ++DEK-Info: DES-EDE3-CBC,1A8D9D2A02EC698A ++ ++kJYbfZ8L0sfe9Oty3gw0aloNnY5E8fegRfQLZlNoxTl6jNt0nIwI8kDJ36CZgR9c ++u3FDJm/KqrfUoz8vW+qEnWhSG7QPX2wWGPHd4K94Yz/FgrRzZ0DoK7XxXq9gOtVA ++AVGQhnz32p+6WhfGsCr9ArXEwRZrTk/FvzEPaU5fHcoSkrNVAGX8IpSVkSDwEDQr ++Gv17+cfk99UV1OCza6yKHoFkTtrC+PZU71LomBabivS2Oc4B9hYuSR2hF01wTHP+ ++YlWNagZOOVtNz4oKK9x9eNQpmfQXQvPPTfusexKIbKfZrMvJoxcm1gfcZ0H/wK6P ++6wmXSG35qMOOztCZNtperjs1wzEBXznyK8QmLcAJBjkfarABJX9vBEzZV0OUKhy+ ++noORFwHTllphbmydLhu6ehLUZMHPhzAS5UN7srtpSN81eerDMy0RMUAwA7/PofX1 ++94Me85Q8jP0PC9ETdsJcPqLzAPETEYu0ELewKRcrdyWi+tlLFrpE5KT/s5ecbl9l ++7B61U4Kfd1PIXc/siINhU3A3bYK+845YyUArUOnKf1kEox7p1RpD7yFqVT04lRTo ++cibNKATBusXSuBrp2G6GNuhWEOSafWCKJQAzgCYIp6ZTV2khhMUGppc/2H3CF6cO ++zX0KtlPVZC7hLkB6HT8SxYUwF1zqWY7+/XPPdc37MeEZ87Q3UuZwqORLY+Z0hpgt ++L5JXBCoklZhCAaN2GqwFLXtGiRSRFGY7xXIhbDTlE65Wv1WGGgDLMKGE1gOz3yAo ++2jjG1+yAHJUdE69XTFHSqSkvaloA1W03LdMXZ9VuQJ/ySXCie6ABAQ== ++-----END RSA PRIVATE KEY----- ++-----BEGIN CERTIFICATE----- ++MIICVDCCAb2gAwIBAgIJANfHOBkZr8JOMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV ++BAYTAlhZMRcwFQYDVQQHEw5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9u ++IFNvZnR3YXJlIEZvdW5kYXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEw ++MDgyMzAxNTZaFw0yMDEwMDUyMzAxNTZaMF8xCzAJBgNVBAYTAlhZMRcwFQYDVQQH ++Ew5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9uIFNvZnR3YXJlIEZvdW5k ++YXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw ++gYkCgYEA21vT5isq7F68amYuuNpSFlKDPrMUCa4YWYqZRt2OZ+/3NKaZ2xAiSwr7 ++6MrQF70t5nLbSPpqE5+5VrS58SY+g/sXLiFd6AplH1wJZwh78DofbFYXUggktFMt ++pTyiX8jtP66bkcPkDADA089RI1TQR6Ca+n7HFa7c1fabVV6i3zkCAwEAAaMYMBYw ++FAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBBQUAA4GBAHPctQBEQ4wd ++BJ6+JcpIraopLn8BGhbjNWj40mmRqWB/NAWF6M5ne7KpGAu7tLeG4hb1zLaldK8G ++lxy2GPSRF6LFS48dpEj2HbMv2nvv6xxalDMJ9+DicWgAKTQ6bcX2j3GUkCR0g/T1 ++CRlNBAAlvhKzO7Clpf9l0YKBEfraJByX ++-----END CERTIFICATE----- +diff -r ee879c0ffa11 Lib/test/keycert3.pem +--- /dev/null ++++ b/Lib/test/keycert3.pem +@@ -0,0 +1,73 @@ ++-----BEGIN PRIVATE KEY----- ++MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMLgD0kAKDb5cFyP ++jbwNfR5CtewdXC+kMXAWD8DLxiTTvhMW7qVnlwOm36mZlszHKvsRf05lT4pegiFM ++9z2j1OlaN+ci/X7NU22TNN6crYSiN77FjYJP464j876ndSxyD+rzys386T+1r1aZ ++aggEdkj1TsSsv1zWIYKlPIjlvhuxAgMBAAECgYA0aH+T2Vf3WOPv8KdkcJg6gCRe ++yJKXOWgWRcicx/CUzOEsTxmFIDPLxqAWA3k7v0B+3vjGw5Y9lycV/5XqXNoQI14j ++y09iNsumds13u5AKkGdTJnZhQ7UKdoVHfuP44ZdOv/rJ5/VD6F4zWywpe90pcbK+ ++AWDVtusgGQBSieEl1QJBAOyVrUG5l2yoUBtd2zr/kiGm/DYyXlIthQO/A3/LngDW ++5/ydGxVsT7lAVOgCsoT+0L4efTh90PjzW8LPQrPBWVMCQQDS3h/FtYYd5lfz+FNL ++9CEe1F1w9l8P749uNUD0g317zv1tatIqVCsQWHfVHNdVvfQ+vSFw38OORO00Xqs9 ++1GJrAkBkoXXEkxCZoy4PteheO/8IWWLGGr6L7di6MzFl1lIqwT6D8L9oaV2vynFT ++DnKop0pa09Unhjyw57KMNmSE2SUJAkEArloTEzpgRmCq4IK2/NpCeGdHS5uqRlbh ++1VIa/xGps7EWQl5Mn8swQDel/YP3WGHTjfx7pgSegQfkyaRtGpZ9OQJAa9Vumj8m ++JAAtI0Bnga8hgQx7BhTQY4CadDxyiRGOGYhwUzYVCqkb2sbVRH9HnwUaJT7cWBY3 ++RnJdHOMXWem7/w== ++-----END PRIVATE KEY----- ++Certificate: ++ Data: ++ Version: 1 (0x0) ++ Serial Number: 12723342612721443281 (0xb09264b1f2da21d1) ++ Signature Algorithm: sha1WithRSAEncryption ++ Issuer: C=XY, O=Python Software Foundation CA, CN=our-ca-server ++ Validity ++ Not Before: Jan 4 19:47:07 2013 GMT ++ Not After : Nov 13 19:47:07 2022 GMT ++ Subject: C=XY, L=Castle Anthrax, O=Python Software Foundation, CN=localhost ++ Subject Public Key Info: ++ Public Key Algorithm: rsaEncryption ++ Public-Key: (1024 bit) ++ Modulus: ++ 00:c2:e0:0f:49:00:28:36:f9:70:5c:8f:8d:bc:0d: ++ 7d:1e:42:b5:ec:1d:5c:2f:a4:31:70:16:0f:c0:cb: ++ c6:24:d3:be:13:16:ee:a5:67:97:03:a6:df:a9:99: ++ 96:cc:c7:2a:fb:11:7f:4e:65:4f:8a:5e:82:21:4c: ++ f7:3d:a3:d4:e9:5a:37:e7:22:fd:7e:cd:53:6d:93: ++ 34:de:9c:ad:84:a2:37:be:c5:8d:82:4f:e3:ae:23: ++ f3:be:a7:75:2c:72:0f:ea:f3:ca:cd:fc:e9:3f:b5: ++ af:56:99:6a:08:04:76:48:f5:4e:c4:ac:bf:5c:d6: ++ 21:82:a5:3c:88:e5:be:1b:b1 ++ Exponent: 65537 (0x10001) ++ Signature Algorithm: sha1WithRSAEncryption ++ 2f:42:5f:a3:09:2c:fa:51:88:c7:37:7f:ea:0e:63:f0:a2:9a: ++ e5:5a:e2:c8:20:f0:3f:60:bc:c8:0f:b6:c6:76:ce:db:83:93: ++ f5:a3:33:67:01:8e:04:cd:00:9a:73:fd:f3:35:86:fa:d7:13: ++ e2:46:c6:9d:c0:29:53:d4:a9:90:b8:77:4b:e6:83:76:e4:92: ++ d6:9c:50:cf:43:d0:c6:01:77:61:9a:de:9b:70:f7:72:cd:59: ++ 00:31:69:d9:b4:ca:06:9c:6d:c3:c7:80:8c:68:e6:b5:a2:f8: ++ ef:1d:bb:16:9f:77:77:ef:87:62:22:9b:4d:69:a4:3a:1a:f1: ++ 21:5e:8c:32:ac:92:fd:15:6b:18:c2:7f:15:0d:98:30:ca:75: ++ 8f:1a:71:df:da:1d:b2:ef:9a:e8:2d:2e:02:fd:4a:3c:aa:96: ++ 0b:06:5d:35:b3:3d:24:87:4b:e0:b0:58:60:2f:45:ac:2e:48: ++ 8a:b0:99:10:65:27:ff:cc:b1:d8:fd:bd:26:6b:b9:0c:05:2a: ++ f4:45:63:35:51:07:ed:83:85:fe:6f:69:cb:bb:40:a8:ae:b6: ++ 3b:56:4a:2d:a4:ed:6d:11:2c:4d:ed:17:24:fd:47:bc:d3:41: ++ a2:d3:06:fe:0c:90:d8:d8:94:26:c4:ff:cc:a1:d8:42:77:eb: ++ fc:a9:94:71 ++-----BEGIN CERTIFICATE----- ++MIICpDCCAYwCCQCwkmSx8toh0TANBgkqhkiG9w0BAQUFADBNMQswCQYDVQQGEwJY ++WTEmMCQGA1UECgwdUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRpb24gQ0ExFjAUBgNV ++BAMMDW91ci1jYS1zZXJ2ZXIwHhcNMTMwMTA0MTk0NzA3WhcNMjIxMTEzMTk0NzA3 ++WjBfMQswCQYDVQQGEwJYWTEXMBUGA1UEBxMOQ2FzdGxlIEFudGhyYXgxIzAhBgNV ++BAoTGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRIwEAYDVQQDEwlsb2NhbGhv ++c3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLgD0kAKDb5cFyPjbwNfR5C ++tewdXC+kMXAWD8DLxiTTvhMW7qVnlwOm36mZlszHKvsRf05lT4pegiFM9z2j1Ola ++N+ci/X7NU22TNN6crYSiN77FjYJP464j876ndSxyD+rzys386T+1r1aZaggEdkj1 ++TsSsv1zWIYKlPIjlvhuxAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC9CX6MJLPpR ++iMc3f+oOY/CimuVa4sgg8D9gvMgPtsZ2ztuDk/WjM2cBjgTNAJpz/fM1hvrXE+JG ++xp3AKVPUqZC4d0vmg3bkktacUM9D0MYBd2Ga3ptw93LNWQAxadm0ygacbcPHgIxo ++5rWi+O8duxafd3fvh2Iim01ppDoa8SFejDKskv0VaxjCfxUNmDDKdY8acd/aHbLv ++mugtLgL9SjyqlgsGXTWzPSSHS+CwWGAvRawuSIqwmRBlJ//Msdj9vSZruQwFKvRF ++YzVRB+2Dhf5vacu7QKiutjtWSi2k7W0RLE3tFyT9R7zTQaLTBv4MkNjYlCbE/8yh ++2EJ36/yplHE= ++-----END CERTIFICATE----- +diff -r ee879c0ffa11 Lib/test/keycert4.pem +--- /dev/null ++++ b/Lib/test/keycert4.pem +@@ -0,0 +1,73 @@ ++-----BEGIN PRIVATE KEY----- ++MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAK5UQiMI5VkNs2Qv ++L7gUaiDdFevNUXRjU4DHAe3ZzzYLZNE69h9gO9VCSS16tJ5fT5VEu0EZyGr0e3V2 ++NkX0ZoU0Hc/UaY4qx7LHmn5SYZpIxhJnkf7SyHJK1zUaGlU0/LxYqIuGCtF5dqx1 ++L2OQhEx1GM6RydHdgX69G64LXcY5AgMBAAECgYAhsRMfJkb9ERLMl/oG/5sLQu9L ++pWDKt6+ZwdxzlZbggQ85CMYshjLKIod2DLL/sLf2x1PRXyRG131M1E3k8zkkz6de ++R1uDrIN/x91iuYzfLQZGh8bMY7Yjd2eoroa6R/7DjpElGejLxOAaDWO0ST2IFQy9 ++myTGS2jSM97wcXfsSQJBANP3jelJoS5X6BRjTSneY21wcocxVuQh8pXpErALVNsT ++drrFTeaBuZp7KvbtnIM5g2WRNvaxLZlAY/hXPJvi6ncCQQDSix1cebml6EmPlEZS ++Mm8gwI2F9ufUunwJmBJcz826Do0ZNGByWDAM/JQZH4FX4GfAFNuj8PUb+GQfadkx ++i1DPAkEA0lVsNHojvuDsIo8HGuzarNZQT2beWjJ1jdxh9t7HrTx7LIps6rb/fhOK ++Zs0R6gVAJaEbcWAPZ2tFyECInAdnsQJAUjaeXXjuxFkjOFym5PvqpvhpivEx78Bu ++JPTr3rAKXmfGMxxfuOa0xK1wSyshP6ZR/RBn/+lcXPKubhHQDOegwwJAJF1DBQnN +++/tLmOPULtDwfP4Zixn+/8GmGOahFoRcu6VIGHmRilJTn6MOButw7Glv2YdeC6l/ ++e83Gq6ffLVfKNQ== ++-----END PRIVATE KEY----- ++Certificate: ++ Data: ++ Version: 1 (0x0) ++ Serial Number: 12723342612721443282 (0xb09264b1f2da21d2) ++ Signature Algorithm: sha1WithRSAEncryption ++ Issuer: C=XY, O=Python Software Foundation CA, CN=our-ca-server ++ Validity ++ Not Before: Jan 4 19:47:07 2013 GMT ++ Not After : Nov 13 19:47:07 2022 GMT ++ Subject: C=XY, L=Castle Anthrax, O=Python Software Foundation, CN=fakehostname ++ Subject Public Key Info: ++ Public Key Algorithm: rsaEncryption ++ Public-Key: (1024 bit) ++ Modulus: ++ 00:ae:54:42:23:08:e5:59:0d:b3:64:2f:2f:b8:14: ++ 6a:20:dd:15:eb:cd:51:74:63:53:80:c7:01:ed:d9: ++ cf:36:0b:64:d1:3a:f6:1f:60:3b:d5:42:49:2d:7a: ++ b4:9e:5f:4f:95:44:bb:41:19:c8:6a:f4:7b:75:76: ++ 36:45:f4:66:85:34:1d:cf:d4:69:8e:2a:c7:b2:c7: ++ 9a:7e:52:61:9a:48:c6:12:67:91:fe:d2:c8:72:4a: ++ d7:35:1a:1a:55:34:fc:bc:58:a8:8b:86:0a:d1:79: ++ 76:ac:75:2f:63:90:84:4c:75:18:ce:91:c9:d1:dd: ++ 81:7e:bd:1b:ae:0b:5d:c6:39 ++ Exponent: 65537 (0x10001) ++ Signature Algorithm: sha1WithRSAEncryption ++ ad:45:8a:8e:ef:c6:ef:04:41:5c:2c:4a:84:dc:02:76:0c:d0: ++ 66:0f:f0:16:04:58:4d:fd:68:b7:b8:d3:a8:41:a5:5c:3c:6f: ++ 65:3c:d1:f8:ce:43:35:e7:41:5f:53:3d:c9:2c:c3:7d:fc:56: ++ 4a:fa:47:77:38:9d:bb:97:28:0a:3b:91:19:7f:bc:74:ae:15: ++ 6b:bd:20:36:67:45:a5:1e:79:d7:75:e6:89:5c:6d:54:84:d1: ++ 95:d7:a7:b4:33:3c:af:37:c4:79:8f:5e:75:dc:75:c2:18:fb: ++ 61:6f:2d:dc:38:65:5b:ba:67:28:d0:88:d7:8d:b9:23:5a:8e: ++ e8:c6:bb:db:ce:d5:b8:41:2a:ce:93:08:b6:95:ad:34:20:18: ++ d5:3b:37:52:74:50:0b:07:2c:b0:6d:a4:4c:7b:f4:e0:fd:d1: ++ af:17:aa:20:cd:62:e3:f0:9d:37:69:db:41:bd:d4:1c:fb:53: ++ 20:da:88:9d:76:26:67:ce:01:90:a7:80:1d:a9:5b:39:73:68: ++ 54:0a:d1:2a:03:1b:8f:3c:43:5d:5d:c4:51:f1:a7:e7:11:da: ++ 31:2c:49:06:af:04:f4:b8:3c:99:c4:20:b9:06:36:a2:00:92: ++ 61:1d:0c:6d:24:05:e2:82:e1:47:db:a0:5f:ba:b9:fb:ba:fa: ++ 49:12:1e:ce ++-----BEGIN CERTIFICATE----- ++MIICpzCCAY8CCQCwkmSx8toh0jANBgkqhkiG9w0BAQUFADBNMQswCQYDVQQGEwJY ++WTEmMCQGA1UECgwdUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRpb24gQ0ExFjAUBgNV ++BAMMDW91ci1jYS1zZXJ2ZXIwHhcNMTMwMTA0MTk0NzA3WhcNMjIxMTEzMTk0NzA3 ++WjBiMQswCQYDVQQGEwJYWTEXMBUGA1UEBxMOQ2FzdGxlIEFudGhyYXgxIzAhBgNV ++BAoTGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRUwEwYDVQQDEwxmYWtlaG9z ++dG5hbWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK5UQiMI5VkNs2QvL7gU ++aiDdFevNUXRjU4DHAe3ZzzYLZNE69h9gO9VCSS16tJ5fT5VEu0EZyGr0e3V2NkX0 ++ZoU0Hc/UaY4qx7LHmn5SYZpIxhJnkf7SyHJK1zUaGlU0/LxYqIuGCtF5dqx1L2OQ ++hEx1GM6RydHdgX69G64LXcY5AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAK1Fio7v ++xu8EQVwsSoTcAnYM0GYP8BYEWE39aLe406hBpVw8b2U80fjOQzXnQV9TPcksw338 ++Vkr6R3c4nbuXKAo7kRl/vHSuFWu9IDZnRaUeedd15olcbVSE0ZXXp7QzPK83xHmP ++XnXcdcIY+2FvLdw4ZVu6ZyjQiNeNuSNajujGu9vO1bhBKs6TCLaVrTQgGNU7N1J0 ++UAsHLLBtpEx79OD90a8XqiDNYuPwnTdp20G91Bz7UyDaiJ12JmfOAZCngB2pWzlz ++aFQK0SoDG488Q11dxFHxp+cR2jEsSQavBPS4PJnEILkGNqIAkmEdDG0kBeKC4Ufb ++oF+6ufu6+kkSHs4= ++-----END CERTIFICATE----- +diff -r ee879c0ffa11 Lib/test/make_ssl_certs.py +--- /dev/null ++++ b/Lib/test/make_ssl_certs.py +@@ -0,0 +1,176 @@ ++"""Make the custom certificate and private key files used by test_ssl ++and friends.""" ++ ++import os ++import shutil ++import sys ++import tempfile ++from subprocess import * ++ ++req_template = """ ++ [req] ++ distinguished_name = req_distinguished_name ++ x509_extensions = req_x509_extensions ++ prompt = no ++ ++ [req_distinguished_name] ++ C = XY ++ L = Castle Anthrax ++ O = Python Software Foundation ++ CN = {hostname} ++ ++ [req_x509_extensions] ++ subjectAltName = DNS:{hostname} ++ ++ [ ca ] ++ default_ca = CA_default ++ ++ [ CA_default ] ++ dir = cadir ++ database = $dir/index.txt ++ crlnumber = $dir/crl.txt ++ default_md = sha1 ++ default_days = 3600 ++ default_crl_days = 3600 ++ certificate = pycacert.pem ++ private_key = pycakey.pem ++ serial = $dir/serial ++ RANDFILE = $dir/.rand ++ ++ policy = policy_match ++ ++ [ policy_match ] ++ countryName = match ++ stateOrProvinceName = optional ++ organizationName = match ++ organizationalUnitName = optional ++ commonName = supplied ++ emailAddress = optional ++ ++ [ policy_anything ] ++ countryName = optional ++ stateOrProvinceName = optional ++ localityName = optional ++ organizationName = optional ++ organizationalUnitName = optional ++ commonName = supplied ++ emailAddress = optional ++ ++ ++ [ v3_ca ] ++ ++ subjectKeyIdentifier=hash ++ authorityKeyIdentifier=keyid:always,issuer ++ basicConstraints = CA:true ++ ++ """ ++ ++here = os.path.abspath(os.path.dirname(__file__)) ++ ++def make_cert_key(hostname, sign=False): ++ print("creating cert for " + hostname) ++ tempnames = [] ++ for i in range(3): ++ with tempfile.NamedTemporaryFile(delete=False) as f: ++ tempnames.append(f.name) ++ req_file, cert_file, key_file = tempnames ++ try: ++ with open(req_file, 'w') as f: ++ f.write(req_template.format(hostname=hostname)) ++ args = ['req', '-new', '-days', '3650', '-nodes', ++ '-newkey', 'rsa:1024', '-keyout', key_file, ++ '-config', req_file] ++ if sign: ++ with tempfile.NamedTemporaryFile(delete=False) as f: ++ tempnames.append(f.name) ++ reqfile = f.name ++ args += ['-out', reqfile ] ++ ++ else: ++ args += ['-x509', '-out', cert_file ] ++ check_call(['openssl'] + args) ++ ++ if sign: ++ args = ['ca', '-config', req_file, '-out', cert_file, '-outdir', 'cadir', ++ '-policy', 'policy_anything', '-batch', '-infiles', reqfile ] ++ check_call(['openssl'] + args) ++ ++ ++ with open(cert_file, 'r') as f: ++ cert = f.read() ++ with open(key_file, 'r') as f: ++ key = f.read() ++ return cert, key ++ finally: ++ for name in tempnames: ++ os.remove(name) ++ ++TMP_CADIR = 'cadir' ++ ++def unmake_ca(): ++ shutil.rmtree(TMP_CADIR) ++ ++def make_ca(): ++ os.mkdir(TMP_CADIR) ++ with open(os.path.join('cadir','index.txt'),'a+') as f: ++ pass # empty file ++ with open(os.path.join('cadir','crl.txt'),'a+') as f: ++ f.write("00") ++ with open(os.path.join('cadir','index.txt.attr'),'w+') as f: ++ f.write('unique_subject = no') ++ ++ with tempfile.NamedTemporaryFile("w") as t: ++ t.write(req_template.format(hostname='our-ca-server')) ++ t.flush() ++ with tempfile.NamedTemporaryFile() as f: ++ args = ['req', '-new', '-days', '3650', '-extensions', 'v3_ca', '-nodes', ++ '-newkey', 'rsa:2048', '-keyout', 'pycakey.pem', ++ '-out', f.name, ++ '-subj', '/C=XY/L=Castle Anthrax/O=Python Software Foundation CA/CN=our-ca-server'] ++ check_call(['openssl'] + args) ++ args = ['ca', '-config', t.name, '-create_serial', ++ '-out', 'pycacert.pem', '-batch', '-outdir', TMP_CADIR, ++ '-keyfile', 'pycakey.pem', '-days', '3650', ++ '-selfsign', '-extensions', 'v3_ca', '-infiles', f.name ] ++ check_call(['openssl'] + args) ++ args = ['ca', '-config', t.name, '-gencrl', '-out', 'revocation.crl'] ++ check_call(['openssl'] + args) ++ ++if __name__ == '__main__': ++ os.chdir(here) ++ cert, key = make_cert_key('localhost') ++ with open('ssl_cert.pem', 'w') as f: ++ f.write(cert) ++ with open('ssl_key.pem', 'w') as f: ++ f.write(key) ++ print("password protecting ssl_key.pem in ssl_key.passwd.pem") ++ check_call(['openssl','rsa','-in','ssl_key.pem','-out','ssl_key.passwd.pem','-des3','-passout','pass:somepass']) ++ check_call(['openssl','rsa','-in','ssl_key.pem','-out','keycert.passwd.pem','-des3','-passout','pass:somepass']) ++ ++ with open('keycert.pem', 'w') as f: ++ f.write(key) ++ f.write(cert) ++ ++ with open('keycert.passwd.pem', 'a+') as f: ++ f.write(cert) ++ ++ # For certificate matching tests ++ make_ca() ++ cert, key = make_cert_key('fakehostname') ++ with open('keycert2.pem', 'w') as f: ++ f.write(key) ++ f.write(cert) ++ ++ cert, key = make_cert_key('localhost', True) ++ with open('keycert3.pem', 'w') as f: ++ f.write(key) ++ f.write(cert) ++ ++ cert, key = make_cert_key('fakehostname', True) ++ with open('keycert4.pem', 'w') as f: ++ f.write(key) ++ f.write(cert) ++ ++ unmake_ca() ++ print("\n\nPlease change the values in test_ssl.py, test_parse_cert function related to notAfter,notBefore and serialNumber") ++ check_call(['openssl','x509','-in','keycert.pem','-dates','-serial','-noout']) +diff -r ee879c0ffa11 Lib/test/pycacert.pem +--- /dev/null ++++ b/Lib/test/pycacert.pem +@@ -0,0 +1,78 @@ ++Certificate: ++ Data: ++ Version: 3 (0x2) ++ Serial Number: 12723342612721443280 (0xb09264b1f2da21d0) ++ Signature Algorithm: sha1WithRSAEncryption ++ Issuer: C=XY, O=Python Software Foundation CA, CN=our-ca-server ++ Validity ++ Not Before: Jan 4 19:47:07 2013 GMT ++ Not After : Jan 2 19:47:07 2023 GMT ++ Subject: C=XY, O=Python Software Foundation CA, CN=our-ca-server ++ Subject Public Key Info: ++ Public Key Algorithm: rsaEncryption ++ Public-Key: (2048 bit) ++ Modulus: ++ 00:e7:de:e9:e3:0c:9f:00:b6:a1:fd:2b:5b:96:d2: ++ 6f:cc:e0:be:86:b9:20:5e:ec:03:7a:55:ab:ea:a4: ++ e9:f9:49:85:d2:66:d5:ed:c7:7a:ea:56:8e:2d:8f: ++ e7:42:e2:62:28:a9:9f:d6:1b:8e:eb:b5:b4:9c:9f: ++ 14:ab:df:e6:94:8b:76:1d:3e:6d:24:61:ed:0c:bf: ++ 00:8a:61:0c:df:5c:c8:36:73:16:00:cd:47:ba:6d: ++ a4:a4:74:88:83:23:0a:19:fc:09:a7:3c:4a:4b:d3: ++ e7:1d:2d:e4:ea:4c:54:21:f3:26:db:89:37:18:d4: ++ 02:bb:40:32:5f:a4:ff:2d:1c:f7:d4:bb:ec:8e:cf: ++ 5c:82:ac:e6:7c:08:6c:48:85:61:07:7f:25:e0:5c: ++ e0:bc:34:5f:e0:b9:04:47:75:c8:47:0b:8d:bc:d6: ++ c8:68:5f:33:83:62:d2:20:44:35:b1:ad:81:1a:8a: ++ cd:bc:35:b0:5c:8b:47:d6:18:e9:9c:18:97:cc:01: ++ 3c:29:cc:e8:1e:e4:e4:c1:b8:de:e7:c2:11:18:87: ++ 5a:93:34:d8:a6:25:f7:14:71:eb:e4:21:a2:d2:0f: ++ 2e:2e:d4:62:00:35:d3:d6:ef:5c:60:4b:4c:a9:14: ++ e2:dd:15:58:46:37:33:26:b7:e7:2e:5d:ed:42:e4: ++ c5:4d ++ Exponent: 65537 (0x10001) ++ X509v3 extensions: ++ X509v3 Subject Key Identifier: ++ BC:DD:62:D9:76:DA:1B:D2:54:6B:CF:E0:66:9B:1E:1E:7B:56:0C:0B ++ X509v3 Authority Key Identifier: ++ keyid:BC:DD:62:D9:76:DA:1B:D2:54:6B:CF:E0:66:9B:1E:1E:7B:56:0C:0B ++ ++ X509v3 Basic Constraints: ++ CA:TRUE ++ Signature Algorithm: sha1WithRSAEncryption ++ 7d:0a:f5:cb:8d:d3:5d:bd:99:8e:f8:2b:0f:ba:eb:c2:d9:a6: ++ 27:4f:2e:7b:2f:0e:64:d8:1c:35:50:4e:ee:fc:90:b9:8d:6d: ++ a8:c5:c6:06:b0:af:f3:2d:bf:3b:b8:42:07:dd:18:7d:6d:95: ++ 54:57:85:18:60:47:2f:eb:78:1b:f9:e8:17:fd:5a:0d:87:17: ++ 28:ac:4c:6a:e6:bc:29:f4:f4:55:70:29:42:de:85:ea:ab:6c: ++ 23:06:64:30:75:02:8e:53:bc:5e:01:33:37:cc:1e:cd:b8:a4: ++ fd:ca:e4:5f:65:3b:83:1c:86:f1:55:02:a0:3a:8f:db:91:b7: ++ 40:14:b4:e7:8d:d2:ee:73:ba:e3:e5:34:2d:bc:94:6f:4e:24: ++ 06:f7:5f:8b:0e:a7:8e:6b:de:5e:75:f4:32:9a:50:b1:44:33: ++ 9a:d0:05:e2:78:82:ff:db:da:8a:63:eb:a9:dd:d1:bf:a0:61: ++ ad:e3:9e:8a:24:5d:62:0e:e7:4c:91:7f:ef:df:34:36:3b:2f: ++ 5d:f5:84:b2:2f:c4:6d:93:96:1a:6f:30:28:f1:da:12:9a:64: ++ b4:40:33:1d:bd:de:2b:53:a8:ea:be:d6:bc:4e:96:f5:44:fb: ++ 32:18:ae:d5:1f:f6:69:af:b6:4e:7b:1d:58:ec:3b:a9:53:a3: ++ 5e:58:c8:9e ++-----BEGIN CERTIFICATE----- ++MIIDbTCCAlWgAwIBAgIJALCSZLHy2iHQMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV ++BAYTAlhZMSYwJAYDVQQKDB1QeXRob24gU29mdHdhcmUgRm91bmRhdGlvbiBDQTEW ++MBQGA1UEAwwNb3VyLWNhLXNlcnZlcjAeFw0xMzAxMDQxOTQ3MDdaFw0yMzAxMDIx ++OTQ3MDdaME0xCzAJBgNVBAYTAlhZMSYwJAYDVQQKDB1QeXRob24gU29mdHdhcmUg ++Rm91bmRhdGlvbiBDQTEWMBQGA1UEAwwNb3VyLWNhLXNlcnZlcjCCASIwDQYJKoZI ++hvcNAQEBBQADggEPADCCAQoCggEBAOfe6eMMnwC2of0rW5bSb8zgvoa5IF7sA3pV ++q+qk6flJhdJm1e3HeupWji2P50LiYiipn9Ybjuu1tJyfFKvf5pSLdh0+bSRh7Qy/ ++AIphDN9cyDZzFgDNR7ptpKR0iIMjChn8Cac8SkvT5x0t5OpMVCHzJtuJNxjUArtA ++Ml+k/y0c99S77I7PXIKs5nwIbEiFYQd/JeBc4Lw0X+C5BEd1yEcLjbzWyGhfM4Ni ++0iBENbGtgRqKzbw1sFyLR9YY6ZwYl8wBPCnM6B7k5MG43ufCERiHWpM02KYl9xRx ++6+QhotIPLi7UYgA109bvXGBLTKkU4t0VWEY3Mya35y5d7ULkxU0CAwEAAaNQME4w ++HQYDVR0OBBYEFLzdYtl22hvSVGvP4GabHh57VgwLMB8GA1UdIwQYMBaAFLzdYtl2 ++2hvSVGvP4GabHh57VgwLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB ++AH0K9cuN0129mY74Kw+668LZpidPLnsvDmTYHDVQTu78kLmNbajFxgawr/Mtvzu4 ++QgfdGH1tlVRXhRhgRy/reBv56Bf9Wg2HFyisTGrmvCn09FVwKULeheqrbCMGZDB1 ++Ao5TvF4BMzfMHs24pP3K5F9lO4MchvFVAqA6j9uRt0AUtOeN0u5zuuPlNC28lG9O ++JAb3X4sOp45r3l519DKaULFEM5rQBeJ4gv/b2opj66nd0b+gYa3jnookXWIO50yR ++f+/fNDY7L131hLIvxG2TlhpvMCjx2hKaZLRAMx293itTqOq+1rxOlvVE+zIYrtUf ++9mmvtk57HVjsO6lTo15YyJ4= ++-----END CERTIFICATE----- +diff -r ee879c0ffa11 Lib/test/re_tests.py +--- a/Lib/test/re_tests.py ++++ b/Lib/test/re_tests.py +@@ -663,7 +663,7 @@ + + try: + u = eval("u'\N{LATIN CAPITAL LETTER A WITH DIAERESIS}'") +-except SyntaxError: ++except (SyntaxError, ValueError): + pass + else: + tests.extend([ +diff -r ee879c0ffa11 Lib/test/regrtest.py +--- a/Lib/test/regrtest.py ++++ b/Lib/test/regrtest.py +@@ -475,8 +475,12 @@ + if bad: + return + tests = test_forever() ++ test_count = '' ++ test_count_width = 3 + else: + tests = iter(selected) ++ test_count = '/{}'.format(len(selected)) ++ test_count_width = len(test_count) - 1 + + if use_mp: + try: +@@ -521,8 +525,6 @@ + output.put((None, None, None, None)) + return + result = json.loads(result) +- if not quiet: +- stdout = test+'\n'+stdout + output.put((test, stdout.rstrip(), stderr.rstrip(), result)) + except BaseException: + output.put((None, None, None, None)) +@@ -531,6 +533,7 @@ + for worker in workers: + worker.start() + finished = 0 ++ test_index = 1 + try: + while finished < use_mp: + test, stdout, stderr, result = output.get() +@@ -547,15 +550,23 @@ + assert result[1] == 'KeyboardInterrupt' + raise KeyboardInterrupt # What else? + accumulate_result(test, result) ++ if not quiet: ++ fmt = "[{1:{0}}{2}/{3}] {4}" if bad else "[{1:{0}}{2}] {4}" ++ print(fmt.format( ++ test_count_width, test_index, test_count, ++ len(bad), test)) ++ test_index += 1 + except KeyboardInterrupt: + interrupted = True + pending.close() + for worker in workers: + worker.join() + else: +- for test in tests: ++ for test_index, test in enumerate(tests, 1): + if not quiet: +- print test ++ fmt = "[{1:{0}}{2}/{3}] {4}" if bad else "[{1:{0}}{2}] {4}" ++ print(fmt.format( ++ test_count_width, test_index, test_count, len(bad), test)) + sys.stdout.flush() + if trace: + # If we're tracing code coverage, then we don't exit with status +diff -r ee879c0ffa11 Lib/test/revocation.crl +--- /dev/null ++++ b/Lib/test/revocation.crl +@@ -0,0 +1,11 @@ ++-----BEGIN X509 CRL----- ++MIIBpjCBjwIBATANBgkqhkiG9w0BAQUFADBNMQswCQYDVQQGEwJYWTEmMCQGA1UE ++CgwdUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRpb24gQ0ExFjAUBgNVBAMMDW91ci1j ++YS1zZXJ2ZXIXDTEzMTEyMTE3MDg0N1oXDTIzMDkzMDE3MDg0N1qgDjAMMAoGA1Ud ++FAQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQCNJXC2mVKauEeN3LlQ3ZtM5gkH3ExH +++i4bmJjtJn497WwvvoIeUdrmVXgJQR93RtV37hZwN0SXMLlNmUZPH4rHhihayw4m ++unCzVj/OhCCY7/TPjKuJ1O/0XhaLBpBVjQN7R/1ujoRKbSia/CD3vcn7Fqxzw7LK ++fSRCKRGTj1CZiuxrphtFchwALXSiFDy9mr2ZKhImcyq1PydfgEzU78APpOkMQsIC ++UNJ/cf3c9emzf+dUtcMEcejQ3mynBo4eIGg1EW42bz4q4hSjzQlKcBV0muw5qXhc ++HOxH2iTFhQ7SrvVuK/dM14rYM4B5mSX3nRC1kNmXpS9j3wJDhuwmjHed ++-----END X509 CRL----- +diff -r ee879c0ffa11 Lib/test/sha256.pem +--- a/Lib/test/sha256.pem ++++ b/Lib/test/sha256.pem +@@ -1,128 +1,128 @@ + # Certificate chain for https://sha256.tbs-internet.com +- 0 s:/C=FR/postalCode=14000/ST=Calvados/L=CAEN/street=22 rue de Bretagne/O=TBS INTERNET/OU=0002 440443810/OU=Certificats TBS X509/CN=ecom.tbs-x509.com +- i:/C=FR/ST=Calvados/L=Caen/O=TBS INTERNET/OU=Terms and Conditions: http://www.tbs-internet.com/CA/repository/OU=TBS INTERNET CA/CN=TBS X509 CA business ++ 0 s:/C=FR/postalCode=14000/ST=Calvados/L=CAEN/street=22 rue de Bretagne/O=TBS INTERNET/OU=0002 440443810/OU=sha-256 production/CN=sha256.tbs-internet.com ++ i:/C=FR/ST=Calvados/L=Caen/O=TBS INTERNET/OU=Terms and Conditions: http://www.tbs-internet.com/CA/repository/OU=TBS INTERNET CA/CN=TBS X509 CA SGC + -----BEGIN CERTIFICATE----- +-MIIGTjCCBTagAwIBAgIQOh3d9dNDPq1cSdJmEiMpqDANBgkqhkiG9w0BAQUFADCB +-yTELMAkGA1UEBhMCRlIxETAPBgNVBAgTCENhbHZhZG9zMQ0wCwYDVQQHEwRDYWVu +-MRUwEwYDVQQKEwxUQlMgSU5URVJORVQxSDBGBgNVBAsTP1Rlcm1zIGFuZCBDb25k +-aXRpb25zOiBodHRwOi8vd3d3LnRicy1pbnRlcm5ldC5jb20vQ0EvcmVwb3NpdG9y +-eTEYMBYGA1UECxMPVEJTIElOVEVSTkVUIENBMR0wGwYDVQQDExRUQlMgWDUwOSBD +-QSBidXNpbmVzczAeFw0xMTAxMjUwMDAwMDBaFw0xMzAyMDUyMzU5NTlaMIHHMQsw +-CQYDVQQGEwJGUjEOMAwGA1UEERMFMTQwMDAxETAPBgNVBAgTCENhbHZhZG9zMQ0w +-CwYDVQQHEwRDQUVOMRswGQYDVQQJExIyMiBydWUgZGUgQnJldGFnbmUxFTATBgNV +-BAoTDFRCUyBJTlRFUk5FVDEXMBUGA1UECxMOMDAwMiA0NDA0NDM4MTAxHTAbBgNV +-BAsTFENlcnRpZmljYXRzIFRCUyBYNTA5MRowGAYDVQQDExFlY29tLnRicy14NTA5 +-LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKRrlHUnJ++1lpcg +-jtYco7cdmRe+EEfTmwPfCdfV3G1QfsTSvY6FfMpm/83pqHfT+4ANwr18wD9ZrAEN +-G16mf9VdCGK12+TP7DmqeZyGIqlFFoahQnmb8EarvE43/1UeQ2CV9XmzwZvpqeli +-LfXsFonawrY3H6ZnMwS64St61Z+9gdyuZ/RbsoZBbT5KUjDEG844QRU4OT1IGeEI +-eY5NM5RNIh6ZNhVtqeeCxMS7afONkHQrOco73RdSTRck/Hj96Ofl3MHNHryr+AMK +-DGFk1kLCZGpPdXtkxXvaDeQoiYDlil26CWc+YK6xyDPMdsWvoG14ZLyCpzMXA7/7 +-4YAQRH0CAwEAAaOCAjAwggIsMB8GA1UdIwQYMBaAFBoJBMz5CY+7HqDO1KQUf0vV +-I1jNMB0GA1UdDgQWBBQgOU8HsWzbmD4WZP5Wtdw7jca2WDAOBgNVHQ8BAf8EBAMC +-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw +-TAYDVR0gBEUwQzBBBgsrBgEEAYDlNwIBATAyMDAGCCsGAQUFBwIBFiRodHRwczov +-L3d3dy50YnMtaW50ZXJuZXQuY29tL0NBL0NQUzEwdwYDVR0fBHAwbjA3oDWgM4Yx +-aHR0cDovL2NybC50YnMtaW50ZXJuZXQuY29tL1RCU1g1MDlDQWJ1c2luZXNzLmNy +-bDAzoDGgL4YtaHR0cDovL2NybC50YnMteDUwOS5jb20vVEJTWDUwOUNBYnVzaW5l +-c3MuY3JsMIGwBggrBgEFBQcBAQSBozCBoDA9BggrBgEFBQcwAoYxaHR0cDovL2Ny +-dC50YnMtaW50ZXJuZXQuY29tL1RCU1g1MDlDQWJ1c2luZXNzLmNydDA5BggrBgEF +-BQcwAoYtaHR0cDovL2NydC50YnMteDUwOS5jb20vVEJTWDUwOUNBYnVzaW5lc3Mu +-Y3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC50YnMteDUwOS5jb20wMwYDVR0R +-BCwwKoIRZWNvbS50YnMteDUwOS5jb22CFXd3dy5lY29tLnRicy14NTA5LmNvbTAN +-BgkqhkiG9w0BAQUFAAOCAQEArT4NHfbY87bGAw8lPV4DmHlmuDuVp/y7ltO3Ynse +-3Rz8RxW2AzuO0Oy2F0Cu4yWKtMyEyMXyHqWtae7ElRbdTu5w5GwVBLJHClCzC8S9 +-SpgMMQTx3Rgn8vjkHuU9VZQlulZyiPK7yunjc7c310S9FRZ7XxOwf8Nnx4WnB+No +-WrfApzhhQl31w+RyrNxZe58hCfDDHmevRvwLjQ785ZoQXJDj2j3qAD4aI2yB8lB5 +-oaE1jlCJzC7Kmz/Y9jzfmv/zAs1LQTm9ktevv4BTUFaGjv9jxnQ1xnS862ZiouLW +-zZYIlYPf4F6JjXGiIQgQRglILUfq3ftJd9/ok9W9ZF8h8w== ++MIIGXDCCBUSgAwIBAgIRAKpVmHgg9nfCodAVwcP4siwwDQYJKoZIhvcNAQELBQAw ++gcQxCzAJBgNVBAYTAkZSMREwDwYDVQQIEwhDYWx2YWRvczENMAsGA1UEBxMEQ2Fl ++bjEVMBMGA1UEChMMVEJTIElOVEVSTkVUMUgwRgYDVQQLEz9UZXJtcyBhbmQgQ29u ++ZGl0aW9uczogaHR0cDovL3d3dy50YnMtaW50ZXJuZXQuY29tL0NBL3JlcG9zaXRv ++cnkxGDAWBgNVBAsTD1RCUyBJTlRFUk5FVCBDQTEYMBYGA1UEAxMPVEJTIFg1MDkg ++Q0EgU0dDMB4XDTEyMDEwNDAwMDAwMFoXDTE0MDIxNzIzNTk1OVowgcsxCzAJBgNV ++BAYTAkZSMQ4wDAYDVQQREwUxNDAwMDERMA8GA1UECBMIQ2FsdmFkb3MxDTALBgNV ++BAcTBENBRU4xGzAZBgNVBAkTEjIyIHJ1ZSBkZSBCcmV0YWduZTEVMBMGA1UEChMM ++VEJTIElOVEVSTkVUMRcwFQYDVQQLEw4wMDAyIDQ0MDQ0MzgxMDEbMBkGA1UECxMS ++c2hhLTI1NiBwcm9kdWN0aW9uMSAwHgYDVQQDExdzaGEyNTYudGJzLWludGVybmV0 ++LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQIX/zdJcyxty0m ++PM1XQSoSSifueS3AVcgqMsaIKS/u+rYzsv4hQ/qA6vLn5m5/ewUcZDj7zdi6rBVf ++PaVNXJ6YinLX0tkaW8TEjeVuZG5yksGZlhCt1CJ1Ho9XLiLaP4uJ7MCoNUntpJ+E ++LfrOdgsIj91kPmwjDJeztVcQCvKzhjVJA/KxdInc0JvOATn7rpaSmQI5bvIjufgo ++qVsTPwVFzuUYULXBk7KxRT7MiEqnd5HvviNh0285QC478zl3v0I0Fb5El4yD3p49 ++IthcRnxzMKc0UhU5ogi0SbONyBfm/mzONVfSxpM+MlyvZmJqrbuuLoEDzJD+t8PU ++xSuzgbcCAwEAAaOCAj4wggI6MB8GA1UdIwQYMBaAFAdEdoWTKLx/bXjSCuv6TEvf ++2YIfMB0GA1UdDgQWBBT/qTGYdaj+f61c2IRFL/B1eEsM8DAOBgNVHQ8BAf8EBAMC ++BaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEFBQcDAQYIKwYBBQUHAwIG ++CisGAQQBgjcKAwMGCWCGSAGG+EIEATBLBgNVHSAERDBCMEAGCisGAQQB5TcCBAEw ++MjAwBggrBgEFBQcCARYkaHR0cHM6Ly93d3cudGJzLWludGVybmV0LmNvbS9DQS9D ++UFM0MG0GA1UdHwRmMGQwMqAwoC6GLGh0dHA6Ly9jcmwudGJzLWludGVybmV0LmNv ++bS9UQlNYNTA5Q0FTR0MuY3JsMC6gLKAqhihodHRwOi8vY3JsLnRicy14NTA5LmNv ++bS9UQlNYNTA5Q0FTR0MuY3JsMIGmBggrBgEFBQcBAQSBmTCBljA4BggrBgEFBQcw ++AoYsaHR0cDovL2NydC50YnMtaW50ZXJuZXQuY29tL1RCU1g1MDlDQVNHQy5jcnQw ++NAYIKwYBBQUHMAKGKGh0dHA6Ly9jcnQudGJzLXg1MDkuY29tL1RCU1g1MDlDQVNH ++Qy5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnRicy14NTA5LmNvbTA/BgNV ++HREEODA2ghdzaGEyNTYudGJzLWludGVybmV0LmNvbYIbd3d3LnNoYTI1Ni50YnMt ++aW50ZXJuZXQuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQA0pOuL8QvAa5yksTbGShzX ++ABApagunUGoEydv4YJT1MXy9tTp7DrWaozZSlsqBxrYAXP1d9r2fuKbEniYHxaQ0 ++UYaf1VSIlDo1yuC8wE7wxbHDIpQ/E5KAyxiaJ8obtDhFstWAPAH+UoGXq0kj2teN ++21sFQ5dXgA95nldvVFsFhrRUNB6xXAcaj0VZFhttI0ZfQZmQwEI/P+N9Jr40OGun ++aa+Dn0TMeUH4U20YntfLbu2nDcJcYfyurm+8/0Tr4HznLnedXu9pCPYj0TaddrgT ++XO0oFiyy7qGaY6+qKh71yD64Y3ycCJ/HR9Wm39mjZYc9ezYwT4noP6r7Lk8YO7/q + -----END CERTIFICATE----- +- 1 s:/C=FR/ST=Calvados/L=Caen/O=TBS INTERNET/OU=Terms and Conditions: http://www.tbs-internet.com/CA/repository/OU=TBS INTERNET CA/CN=TBS X509 CA business ++ 1 s:/C=FR/ST=Calvados/L=Caen/O=TBS INTERNET/OU=Terms and Conditions: http://www.tbs-internet.com/CA/repository/OU=TBS INTERNET CA/CN=TBS X509 CA SGC + i:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root + -----BEGIN CERTIFICATE----- +-MIIFPzCCBCegAwIBAgIQDlBz/++iRSmLDeVRHT/hADANBgkqhkiG9w0BAQUFADBv ++MIIFVjCCBD6gAwIBAgIQXpDZ0ETJMV02WTx3GTnhhTANBgkqhkiG9w0BAQUFADBv + MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk + ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF +-eHRlcm5hbCBDQSBSb290MB4XDTA1MTIwMTAwMDAwMFoXDTE5MDcwOTE4MTkyMlow +-gckxCzAJBgNVBAYTAkZSMREwDwYDVQQIEwhDYWx2YWRvczENMAsGA1UEBxMEQ2Fl ++eHRlcm5hbCBDQSBSb290MB4XDTA1MTIwMTAwMDAwMFoXDTE5MDYyNDE5MDYzMFow ++gcQxCzAJBgNVBAYTAkZSMREwDwYDVQQIEwhDYWx2YWRvczENMAsGA1UEBxMEQ2Fl + bjEVMBMGA1UEChMMVEJTIElOVEVSTkVUMUgwRgYDVQQLEz9UZXJtcyBhbmQgQ29u + ZGl0aW9uczogaHR0cDovL3d3dy50YnMtaW50ZXJuZXQuY29tL0NBL3JlcG9zaXRv +-cnkxGDAWBgNVBAsTD1RCUyBJTlRFUk5FVCBDQTEdMBsGA1UEAxMUVEJTIFg1MDkg +-Q0EgYnVzaW5lc3MwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB1PAU +-qudCcz3tmyGcf+u6EkZqonKKHrV4gZYbvVkIRojmmlhfi/jwvpHvo8bqSt/9Rj5S +-jhCDW0pcbI+IPPtD1Jy+CHNSfnMqVDy6CKQ3p5maTzCMG6ZT+XjnvcND5v+FtaiB +-xk1iCX6uvt0jeUtdZvYbyytsSDE6c3Y5//wRxOF8tM1JxibwO3pyER26jbbN2gQz +-m/EkdGjLdJ4svPk23WDAvQ6G0/z2LcAaJB+XLfqRwfQpHQvfKa1uTi8PivC8qtip +-rmNQMMPMjxSK2azX8cKjjTDJiUKaCb4VHlJDWKEsCFRpgJAoAuX8f7Yfs1M4esGo +-sWb3PGspK3O22uIlAgMBAAGjggF6MIIBdjAdBgNVHQ4EFgQUGgkEzPkJj7seoM7U +-pBR/S9UjWM0wDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwGAYD +-VR0gBBEwDzANBgsrBgEEAYDlNwIBATB7BgNVHR8EdDByMDigNqA0hjJodHRwOi8v +-Y3JsLmNvbW9kb2NhLmNvbS9BZGRUcnVzdEV4dGVybmFsQ0FSb290LmNybDA2oDSg +-MoYwaHR0cDovL2NybC5jb21vZG8ubmV0L0FkZFRydXN0RXh0ZXJuYWxDQVJvb3Qu +-Y3JsMIGGBggrBgEFBQcBAQR6MHgwOwYIKwYBBQUHMAKGL2h0dHA6Ly9jcnQuY29t +-b2RvY2EuY29tL0FkZFRydXN0VVROU2VydmVyQ0EuY3J0MDkGCCsGAQUFBzAChi1o +-dHRwOi8vY3J0LmNvbW9kby5uZXQvQWRkVHJ1c3RVVE5TZXJ2ZXJDQS5jcnQwEQYJ +-YIZIAYb4QgEBBAQDAgIEMA0GCSqGSIb3DQEBBQUAA4IBAQA7mqrMgk/MrE6QnbNA +-h4nRCn2ti4bg4w2C3lB6bSvRPnYwuNw9Jb8vuKkNFzRDxNJXqVDZdfFW5CVQJuyd +-nfAx83+wk+spzvFaE1KhFYfN9G9pQfXUfvDRoIcJgPEKUXL1wRiOG+IjU3VVI8pg +-IgqHkr7ylln5i5zCiFAPuIJmYUSFg/gxH5xkCNcjJqqrHrHatJr6Qrrke93joupw +-oU1njfAcZtYp6fbiK6u2b1pJqwkVBE8RsfLnPhRj+SFbpvjv8Od7o/ieJhFIYQNU +-k2jX2u8qZnAiNw93LZW9lpYjtuvMXq8QQppENNja5b53q7UwI+lU7ZGjZ7quuESp +-J6/5 ++cnkxGDAWBgNVBAsTD1RCUyBJTlRFUk5FVCBDQTEYMBYGA1UEAxMPVEJTIFg1MDkg ++Q0EgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsgOkO3f7wzN6 ++rOjg45tR5vjBfzK7qmV9IBxb/QW9EEXxG+E7FNhZqQLtwGBKoSsHTnQqV75wWMk0 ++9tinWvftBkSpj5sTi/8cbzJfUvTSVYh3Qxv6AVVjMMH/ruLjE6y+4PoaPs8WoYAQ ++ts5R4Z1g8c/WnTepLst2x0/Wv7GmuoQi+gXvHU6YrBiu7XkeYhzc95QdviWSJRDk ++owhb5K43qhcvjRmBfO/paGlCliDGZp8mHwrI21mwobWpVjTxZRwYO3bd4+TGcI4G ++Ie5wmHwE8F7SK1tgSqbBacKjDa93j7txKkfz/Yd2n7TGqOXiHPsJpG655vrKtnXk ++9vs1zoDeJQIDAQABo4IBljCCAZIwHQYDVR0OBBYEFAdEdoWTKLx/bXjSCuv6TEvf ++2YIfMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMCAGA1UdJQQZ ++MBcGCisGAQQBgjcKAwMGCWCGSAGG+EIEATAYBgNVHSAEETAPMA0GCysGAQQBgOU3 ++AgQBMHsGA1UdHwR0MHIwOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0Fk ++ZFRydXN0RXh0ZXJuYWxDQVJvb3QuY3JsMDagNKAyhjBodHRwOi8vY3JsLmNvbW9k ++by5uZXQvQWRkVHJ1c3RFeHRlcm5hbENBUm9vdC5jcmwwgYAGCCsGAQUFBwEBBHQw ++cjA4BggrBgEFBQcwAoYsaHR0cDovL2NydC5jb21vZG9jYS5jb20vQWRkVHJ1c3RV ++VE5TR0NDQS5jcnQwNgYIKwYBBQUHMAKGKmh0dHA6Ly9jcnQuY29tb2RvLm5ldC9B ++ZGRUcnVzdFVUTlNHQ0NBLmNydDARBglghkgBhvhCAQEEBAMCAgQwDQYJKoZIhvcN ++AQEFBQADggEBAK2zEzs+jcIrVK9oDkdDZNvhuBYTdCfpxfFs+OAujW0bIfJAy232 ++euVsnJm6u/+OrqKudD2tad2BbejLLXhMZViaCmK7D9nrXHx4te5EP8rL19SUVqLY ++1pTnv5dhNgEgvA7n5lIzDSYs7yRLsr7HJsYPr6SeYSuZizyX1SNz7ooJ32/F3X98 ++RB0Mlc/E0OyOrkQ9/y5IrnpnaSora8CnUrV5XNOg+kyCz9edCyx4D5wXYcwZPVWz ++8aDqquESrezPyjtfi4WRO4s/VD3HLZvOxzMrWAVYCDG9FxaOhF0QGuuG1F7F3GKV ++v6prNyCl016kRl2j1UT+a7gLd8fA25A4C9E= + -----END CERTIFICATE----- + 2 s:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root +- i:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN-USERFirst-Hardware ++ i:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN - DATACorp SGC + -----BEGIN CERTIFICATE----- +-MIIETzCCAzegAwIBAgIQHM5EYpUZep1jUvnyI6m2mDANBgkqhkiG9w0BAQUFADCB +-lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug ++MIIEZjCCA06gAwIBAgIQUSYKkxzif5zDpV954HKugjANBgkqhkiG9w0BAQUFADCB ++kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug + Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt +-SGFyZHdhcmUwHhcNMDUwNjA3MDgwOTEwWhcNMTkwNzA5MTgxOTIyWjBvMQswCQYD +-VQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0 +-IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5h +-bCBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt/caM+by +-AAQtOeBOW+0fvGwPzbX6I7bO3psRM5ekKUx9k5+9SryT7QMa44/P5W1QWtaXKZRa +-gLBJetsulf24yr83OC0ePpFBrXBWx/BPP+gynnTKyJBU6cZfD3idmkA8Dqxhql4U +-j56HoWpQ3NeaTq8Fs6ZxlJxxs1BgCscTnTgHhgKo6ahpJhiQq0ywTyOrOk+E2N/O +-n+Fpb7vXQtdrROTHre5tQV9yWnEIN7N5ZaRZoJQ39wAvDcKSctrQOHLbFKhFxF0q +-fbe01sTurM0TRLfJK91DACX6YblpalgjEbenM49WdVn1zSnXRrcKK2W200JvFbK4 +-e/vv6V1T1TRaJwIDAQABo4G9MIG6MB8GA1UdIwQYMBaAFKFyXyYbKJhDlV0HN9WF +-lp1L0sNFMB0GA1UdDgQWBBStvZh6NLQm9/rEJlTvA73gJMtUGjAOBgNVHQ8BAf8E +-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAQIwRAYDVR0f +-BD0wOzA5oDegNYYzaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmly +-c3QtSGFyZHdhcmUuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQByQhANOs4kClrwF8BW +-onvUOGCSjRK52zYZgDXYNjDtmr5rJ6NyPFDNn+JxkLpjYetIFMTbSRe679Bt8m7a +-gIAoQYFQtxMuyLnJegB2aEbQiIxh/tC21UcFF7ktdnDoTlA6w3pLuvunaI84Of3o +-2YBrhzkTbCfaYk5JRlTpudW9DkUkHBsyx3nknPKnplkIGaK0jgn8E0n+SFabYaHk +-I9LroYT/+JtLefh9lgBdAgVv0UPbzoGfuDsrk/Zh+UrgbLFpHoVnElhzbkh64Z0X +-OGaJunQc68cCZu5HTn/aK7fBGMcVflRCXLVEQpU9PIAdGA8Ynvg684t8GMaKsRl1 +-jIGZ ++dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw ++IFNHQzAeFw0wNTA2MDcwODA5MTBaFw0xOTA2MjQxOTA2MzBaMG8xCzAJBgNVBAYT ++AlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0 ++ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB ++IFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC39xoz5vIABC05 ++4E5b7R+8bA/Ntfojts7emxEzl6QpTH2Tn71KvJPtAxrjj8/lbVBa1pcplFqAsEl6 ++2y6V/bjKvzc4LR4+kUGtcFbH8E8/6DKedMrIkFTpxl8PeJ2aQDwOrGGqXhSPnoeh ++alDc15pOrwWzpnGUnHGzUGAKxxOdOAeGAqjpqGkmGJCrTLBPI6s6T4TY386f4Wlv ++u9dC12tE5Met7m1BX3JacQg3s3llpFmglDf3AC8NwpJy2tA4ctsUqEXEXSp9t7TW ++xO6szRNEt8kr3UMAJfphuWlqWCMRt6czj1Z1WfXNKddGtworZbbTQm8Vsrh7++/p ++XVPVNFonAgMBAAGjgdgwgdUwHwYDVR0jBBgwFoAUUzLRs89/+uDxoF2FTpLSnkUd ++tE8wHQYDVR0OBBYEFK29mHo0tCb3+sQmVO8DveAky1QaMA4GA1UdDwEB/wQEAwIB ++BjAPBgNVHRMBAf8EBTADAQH/MBEGCWCGSAGG+EIBAQQEAwIBAjAgBgNVHSUEGTAX ++BgorBgEEAYI3CgMDBglghkgBhvhCBAEwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDov ++L2NybC51c2VydHJ1c3QuY29tL1VUTi1EQVRBQ29ycFNHQy5jcmwwDQYJKoZIhvcN ++AQEFBQADggEBAMbuUxdoFLJRIh6QWA2U/b3xcOWGLcM2MY9USEbnLQg3vGwKYOEO ++rVE04BKT6b64q7gmtOmWPSiPrmQH/uAB7MXjkesYoPF1ftsK5p+R26+udd8jkWjd ++FwBaS/9kbHDrARrQkNnHptZt9hPk/7XJ0h4qy7ElQyZ42TCbTg0evmnv3+r+LbPM +++bDdtRTKkdSytaX7ARmjR3mfnYyVhzT4HziS2jamEfpr62vp3EV4FTkG101B5CHI ++3C+H0be/SGB1pWLLJN47YaApIKa+xWycxOkKaSLvkTr6Jq/RW0GnOuL4OAdCq8Fb +++M5tug8EPzI0rNwEKNdwMBQmBsTkm5jVz3g= + -----END CERTIFICATE----- +- 3 s:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN-USERFirst-Hardware +- i:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN-USERFirst-Hardware ++ 3 s:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN - DATACorp SGC ++ i:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN - DATACorp SGC + -----BEGIN CERTIFICATE----- +-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB +-lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug ++MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB ++kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug + Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt +-SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG +-A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe +-MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v +-d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh +-cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn +-0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ +-M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a +-MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd +-oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI +-DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy +-oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD +-VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0 +-dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy +-bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF +-BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM +-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli +-CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE +-CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t +-3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS +-KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA== ++dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw ++IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG ++EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD ++VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu ++dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN ++BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6 ++E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ ++D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK ++4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq ++lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW ++bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB ++o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT ++MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js ++LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr ++BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB ++AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft ++Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj ++j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH ++KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv ++2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3 ++mfnGV/TJVTl4uix5yaaIK/QI + -----END CERTIFICATE----- +diff -r ee879c0ffa11 Lib/test/ssl_cert.pem +--- /dev/null ++++ b/Lib/test/ssl_cert.pem +@@ -0,0 +1,15 @@ ++-----BEGIN CERTIFICATE----- ++MIICVDCCAb2gAwIBAgIJANfHOBkZr8JOMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV ++BAYTAlhZMRcwFQYDVQQHEw5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9u ++IFNvZnR3YXJlIEZvdW5kYXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEw ++MDgyMzAxNTZaFw0yMDEwMDUyMzAxNTZaMF8xCzAJBgNVBAYTAlhZMRcwFQYDVQQH ++Ew5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9uIFNvZnR3YXJlIEZvdW5k ++YXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw ++gYkCgYEA21vT5isq7F68amYuuNpSFlKDPrMUCa4YWYqZRt2OZ+/3NKaZ2xAiSwr7 ++6MrQF70t5nLbSPpqE5+5VrS58SY+g/sXLiFd6AplH1wJZwh78DofbFYXUggktFMt ++pTyiX8jtP66bkcPkDADA089RI1TQR6Ca+n7HFa7c1fabVV6i3zkCAwEAAaMYMBYw ++FAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBBQUAA4GBAHPctQBEQ4wd ++BJ6+JcpIraopLn8BGhbjNWj40mmRqWB/NAWF6M5ne7KpGAu7tLeG4hb1zLaldK8G ++lxy2GPSRF6LFS48dpEj2HbMv2nvv6xxalDMJ9+DicWgAKTQ6bcX2j3GUkCR0g/T1 ++CRlNBAAlvhKzO7Clpf9l0YKBEfraJByX ++-----END CERTIFICATE----- +diff -r ee879c0ffa11 Lib/test/ssl_key.passwd.pem +--- /dev/null ++++ b/Lib/test/ssl_key.passwd.pem +@@ -0,0 +1,18 @@ ++-----BEGIN RSA PRIVATE KEY----- ++Proc-Type: 4,ENCRYPTED ++DEK-Info: DES-EDE3-CBC,1A8D9D2A02EC698A ++ ++kJYbfZ8L0sfe9Oty3gw0aloNnY5E8fegRfQLZlNoxTl6jNt0nIwI8kDJ36CZgR9c ++u3FDJm/KqrfUoz8vW+qEnWhSG7QPX2wWGPHd4K94Yz/FgrRzZ0DoK7XxXq9gOtVA ++AVGQhnz32p+6WhfGsCr9ArXEwRZrTk/FvzEPaU5fHcoSkrNVAGX8IpSVkSDwEDQr ++Gv17+cfk99UV1OCza6yKHoFkTtrC+PZU71LomBabivS2Oc4B9hYuSR2hF01wTHP+ ++YlWNagZOOVtNz4oKK9x9eNQpmfQXQvPPTfusexKIbKfZrMvJoxcm1gfcZ0H/wK6P ++6wmXSG35qMOOztCZNtperjs1wzEBXznyK8QmLcAJBjkfarABJX9vBEzZV0OUKhy+ ++noORFwHTllphbmydLhu6ehLUZMHPhzAS5UN7srtpSN81eerDMy0RMUAwA7/PofX1 ++94Me85Q8jP0PC9ETdsJcPqLzAPETEYu0ELewKRcrdyWi+tlLFrpE5KT/s5ecbl9l ++7B61U4Kfd1PIXc/siINhU3A3bYK+845YyUArUOnKf1kEox7p1RpD7yFqVT04lRTo ++cibNKATBusXSuBrp2G6GNuhWEOSafWCKJQAzgCYIp6ZTV2khhMUGppc/2H3CF6cO ++zX0KtlPVZC7hLkB6HT8SxYUwF1zqWY7+/XPPdc37MeEZ87Q3UuZwqORLY+Z0hpgt ++L5JXBCoklZhCAaN2GqwFLXtGiRSRFGY7xXIhbDTlE65Wv1WGGgDLMKGE1gOz3yAo ++2jjG1+yAHJUdE69XTFHSqSkvaloA1W03LdMXZ9VuQJ/ySXCie6ABAQ== ++-----END RSA PRIVATE KEY----- +diff -r ee879c0ffa11 Lib/test/ssl_key.pem +--- /dev/null ++++ b/Lib/test/ssl_key.pem +@@ -0,0 +1,16 @@ ++-----BEGIN PRIVATE KEY----- ++MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANtb0+YrKuxevGpm ++LrjaUhZSgz6zFAmuGFmKmUbdjmfv9zSmmdsQIksK++jK0Be9LeZy20j6ahOfuVa0 ++ufEmPoP7Fy4hXegKZR9cCWcIe/A6H2xWF1IIJLRTLaU8ol/I7T+um5HD5AwAwNPP ++USNU0Eegmvp+xxWu3NX2m1Veot85AgMBAAECgYA3ZdZ673X0oexFlq7AAmrutkHt ++CL7LvwrpOiaBjhyTxTeSNWzvtQBkIU8DOI0bIazA4UreAFffwtvEuPmonDb3F+Iq ++SMAu42XcGyVZEl+gHlTPU9XRX7nTOXVt+MlRRRxL6t9GkGfUAXI3XxJDXW3c0vBK ++UL9xqD8cORXOfE06rQJBAP8mEX1ERkR64Ptsoe4281vjTlNfIbs7NMPkUnrn9N/Y ++BLhjNIfQ3HFZG8BTMLfX7kCS9D593DW5tV4Z9BP/c6cCQQDcFzCcVArNh2JSywOQ ++ZfTfRbJg/Z5Lt9Fkngv1meeGNPgIMLN8Sg679pAOOWmzdMO3V706rNPzSVMME7E5 ++oPIfAkEA8pDddarP5tCvTTgUpmTFbakm0KoTZm2+FzHcnA4jRh+XNTjTOv98Y6Ik ++eO5d1ZnKXseWvkZncQgxfdnMqqpj5wJAcNq/RVne1DbYlwWchT2Si65MYmmJ8t+F ++0mcsULqjOnEMwf5e+ptq5LzwbyrHZYq5FNk7ocufPv/ZQrcSSC+cFwJBAKvOJByS ++x56qyGeZLOQlWS2JS3KJo59XuLFGqcbgN9Om9xFa41Yb4N9NvplFivsvZdw3m1Q/ ++SPIXQuT8RMPDVNQ= ++-----END PRIVATE KEY----- +diff -r ee879c0ffa11 Lib/test/ssl_servers.py +--- /dev/null ++++ b/Lib/test/ssl_servers.py +@@ -0,0 +1,209 @@ ++import os ++import sys ++import ssl ++import pprint ++import urllib ++import urlparse ++# Rename HTTPServer to _HTTPServer so as to avoid confusion with HTTPSServer. ++from BaseHTTPServer import HTTPServer as _HTTPServer, BaseHTTPRequestHandler ++from SimpleHTTPServer import SimpleHTTPRequestHandler ++ ++from test import test_support as support ++threading = support.import_module("threading") ++ ++here = os.path.dirname(__file__) ++ ++HOST = support.HOST ++CERTFILE = os.path.join(here, 'keycert.pem') ++ ++# This one's based on HTTPServer, which is based on SocketServer ++ ++class HTTPSServer(_HTTPServer): ++ ++ def __init__(self, server_address, handler_class, context): ++ _HTTPServer.__init__(self, server_address, handler_class) ++ self.context = context ++ ++ def __str__(self): ++ return ('<%s %s:%s>' % ++ (self.__class__.__name__, ++ self.server_name, ++ self.server_port)) ++ ++ def get_request(self): ++ # override this to wrap socket with SSL ++ try: ++ sock, addr = self.socket.accept() ++ sslconn = self.context.wrap_socket(sock, server_side=True) ++ except OSError as e: ++ # socket errors are silenced by the caller, print them here ++ if support.verbose: ++ sys.stderr.write("Got an error:\n%s\n" % e) ++ raise ++ return sslconn, addr ++ ++class RootedHTTPRequestHandler(SimpleHTTPRequestHandler): ++ # need to override translate_path to get a known root, ++ # instead of using os.curdir, since the test could be ++ # run from anywhere ++ ++ server_version = "TestHTTPS/1.0" ++ root = here ++ # Avoid hanging when a request gets interrupted by the client ++ timeout = 5 ++ ++ def translate_path(self, path): ++ """Translate a /-separated PATH to the local filename syntax. ++ ++ Components that mean special things to the local file system ++ (e.g. drive or directory names) are ignored. (XXX They should ++ probably be diagnosed.) ++ ++ """ ++ # abandon query parameters ++ path = urlparse.urlparse(path)[2] ++ path = os.path.normpath(urllib.unquote(path)) ++ words = path.split('/') ++ words = filter(None, words) ++ path = self.root ++ for word in words: ++ drive, word = os.path.splitdrive(word) ++ head, word = os.path.split(word) ++ path = os.path.join(path, word) ++ return path ++ ++ def log_message(self, format, *args): ++ # we override this to suppress logging unless "verbose" ++ if support.verbose: ++ sys.stdout.write(" server (%s:%d %s):\n [%s] %s\n" % ++ (self.server.server_address, ++ self.server.server_port, ++ self.request.cipher(), ++ self.log_date_time_string(), ++ format%args)) ++ ++ ++class StatsRequestHandler(BaseHTTPRequestHandler): ++ """Example HTTP request handler which returns SSL statistics on GET ++ requests. ++ """ ++ ++ server_version = "StatsHTTPS/1.0" ++ ++ def do_GET(self, send_body=True): ++ """Serve a GET request.""" ++ sock = self.rfile.raw._sock ++ context = sock.context ++ stats = { ++ 'session_cache': context.session_stats(), ++ 'cipher': sock.cipher(), ++ 'compression': sock.compression(), ++ } ++ body = pprint.pformat(stats) ++ body = body.encode('utf-8') ++ self.send_response(200) ++ self.send_header("Content-type", "text/plain; charset=utf-8") ++ self.send_header("Content-Length", str(len(body))) ++ self.end_headers() ++ if send_body: ++ self.wfile.write(body) ++ ++ def do_HEAD(self): ++ """Serve a HEAD request.""" ++ self.do_GET(send_body=False) ++ ++ def log_request(self, format, *args): ++ if support.verbose: ++ BaseHTTPRequestHandler.log_request(self, format, *args) ++ ++ ++class HTTPSServerThread(threading.Thread): ++ ++ def __init__(self, context, host=HOST, handler_class=None): ++ self.flag = None ++ self.server = HTTPSServer((host, 0), ++ handler_class or RootedHTTPRequestHandler, ++ context) ++ self.port = self.server.server_port ++ threading.Thread.__init__(self) ++ self.daemon = True ++ ++ def __str__(self): ++ return "<%s %s>" % (self.__class__.__name__, self.server) ++ ++ def start(self, flag=None): ++ self.flag = flag ++ threading.Thread.start(self) ++ ++ def run(self): ++ if self.flag: ++ self.flag.set() ++ try: ++ self.server.serve_forever(0.05) ++ finally: ++ self.server.server_close() ++ ++ def stop(self): ++ self.server.shutdown() ++ ++ ++def make_https_server(case, context=None, certfile=CERTFILE, ++ host=HOST, handler_class=None): ++ if context is None: ++ context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) ++ # We assume the certfile contains both private key and certificate ++ context.load_cert_chain(certfile) ++ server = HTTPSServerThread(context, host, handler_class) ++ flag = threading.Event() ++ server.start(flag) ++ flag.wait() ++ def cleanup(): ++ if support.verbose: ++ sys.stdout.write('stopping HTTPS server\n') ++ server.stop() ++ if support.verbose: ++ sys.stdout.write('joining HTTPS thread\n') ++ server.join() ++ case.addCleanup(cleanup) ++ return server ++ ++ ++if __name__ == "__main__": ++ import argparse ++ parser = argparse.ArgumentParser( ++ description='Run a test HTTPS server. ' ++ 'By default, the current directory is served.') ++ parser.add_argument('-p', '--port', type=int, default=4433, ++ help='port to listen on (default: %(default)s)') ++ parser.add_argument('-q', '--quiet', dest='verbose', default=True, ++ action='store_false', help='be less verbose') ++ parser.add_argument('-s', '--stats', dest='use_stats_handler', default=False, ++ action='store_true', help='always return stats page') ++ parser.add_argument('--curve-name', dest='curve_name', type=str, ++ action='store', ++ help='curve name for EC-based Diffie-Hellman') ++ parser.add_argument('--ciphers', dest='ciphers', type=str, ++ help='allowed cipher list') ++ parser.add_argument('--dh', dest='dh_file', type=str, action='store', ++ help='PEM file containing DH parameters') ++ args = parser.parse_args() ++ ++ support.verbose = args.verbose ++ if args.use_stats_handler: ++ handler_class = StatsRequestHandler ++ else: ++ handler_class = RootedHTTPRequestHandler ++ handler_class.root = os.getcwd() ++ context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) ++ context.load_cert_chain(CERTFILE) ++ if args.curve_name: ++ context.set_ecdh_curve(args.curve_name) ++ if args.dh_file: ++ context.load_dh_params(args.dh_file) ++ if args.ciphers: ++ context.set_ciphers(args.ciphers) ++ ++ server = HTTPSServer(("", args.port), handler_class, context) ++ if args.verbose: ++ print("Listening on https://localhost:{0.port}".format(args)) ++ server.serve_forever(0.1) +diff -r ee879c0ffa11 Lib/test/string_tests.py +--- a/Lib/test/string_tests.py ++++ b/Lib/test/string_tests.py +@@ -65,14 +65,12 @@ + self.assertTrue(object is not realresult) + + # check that object.method(*args) raises exc +- def checkraises(self, exc, object, methodname, *args): +- object = self.fixtype(object) ++ def checkraises(self, exc, obj, methodname, *args): ++ obj = self.fixtype(obj) + args = self.fixtype(args) +- self.assertRaises( +- exc, +- getattr(object, methodname), +- *args +- ) ++ with self.assertRaises(exc) as cm: ++ getattr(obj, methodname)(*args) ++ self.assertNotEqual(cm.exception.args[0], '') + + # call object.method(*args) without any checks + def checkcall(self, object, methodname, *args): +@@ -1057,6 +1055,7 @@ + self.checkequal('a b c', ' ', 'join', BadSeq2()) + + self.checkraises(TypeError, ' ', 'join') ++ self.checkraises(TypeError, ' ', 'join', None) + self.checkraises(TypeError, ' ', 'join', 7) + self.checkraises(TypeError, ' ', 'join', Sequence([7, 'hello', 123L])) + try: +diff -r ee879c0ffa11 Lib/test/test___all__.py +--- a/Lib/test/test___all__.py ++++ b/Lib/test/test___all__.py +@@ -73,15 +73,16 @@ + # than an AttributeError somewhere deep in CGIHTTPServer. + import _socket + +- # rlcompleter needs special consideration; it import readline which ++ # rlcompleter needs special consideration; it imports readline which + # initializes GNU readline which calls setlocale(LC_CTYPE, "")... :-( ++ import locale ++ locale_tuple = locale.getlocale(locale.LC_CTYPE) + try: + import rlcompleter +- import locale + except ImportError: + pass +- else: +- locale.setlocale(locale.LC_CTYPE, 'C') ++ finally: ++ locale.setlocale(locale.LC_CTYPE, locale_tuple) + + ignored = [] + failed_imports = [] +diff -r ee879c0ffa11 Lib/test/test_argparse.py +--- a/Lib/test/test_argparse.py ++++ b/Lib/test/test_argparse.py +@@ -2726,6 +2726,13 @@ + parser = ErrorRaisingArgumentParser(parents=[parent]) + self.assertEqual(NS(x='foo'), parser.parse_args([])) + ++ def test_set_defaults_on_parent_and_subparser(self): ++ parser = argparse.ArgumentParser() ++ xparser = parser.add_subparsers().add_parser('X') ++ parser.set_defaults(foo=1) ++ xparser.set_defaults(foo=2) ++ self.assertEqual(NS(foo=2), parser.parse_args(['X'])) ++ + def test_set_defaults_same_as_add_argument(self): + parser = ErrorRaisingArgumentParser() + parser.set_defaults(w='W', x='X', y='Y', z='Z') +diff -r ee879c0ffa11 Lib/test/test_asynchat.py +--- a/Lib/test/test_asynchat.py ++++ b/Lib/test/test_asynchat.py +@@ -1,6 +1,10 @@ + # test asynchat + +-import asyncore, asynchat, socket, time ++import errno ++import asyncore ++import asynchat ++import socket ++import time + import unittest + import sys + from test import test_support +@@ -235,6 +239,31 @@ + class TestAsynchat_WithPoll(TestAsynchat): + usepoll = True + ++ ++class TestAsynchatMocked(unittest.TestCase): ++ def test_blockingioerror(self): ++ # Issue #16133: handle_read() must ignore blocking I/O errors like ++ # EAGAIN ++ class fake_socket: ++ def fileno(self): ++ return 0 ++ ++ def recv(self, size): ++ raise socket.error(errno.EAGAIN, "EAGAIN") ++ ++ class MyChat(asynchat.async_chat): ++ def handle_error(self): ++ raise Exception("error") ++ ++ sock = fake_socket() ++ dispatcher = MyChat() ++ dispatcher.set_socket(sock) ++ self.addCleanup(dispatcher.del_channel) ++ ++ # must not call handle_error() ++ dispatcher.handle_read() ++ ++ + class TestHelperFunctions(unittest.TestCase): + def test_find_prefix_at_end(self): + self.assertEqual(asynchat.find_prefix_at_end("qwerty\r", "\r\n"), 1) +@@ -267,6 +296,7 @@ + + def test_main(verbose=None): + test_support.run_unittest(TestAsynchat, TestAsynchat_WithPoll, ++ TestAsynchatMocked, + TestHelperFunctions, TestFifo) + + if __name__ == "__main__": +diff -r ee879c0ffa11 Lib/test/test_codecmaps_cn.py +--- a/Lib/test/test_codecmaps_cn.py ++++ b/Lib/test/test_codecmaps_cn.py +@@ -10,19 +10,17 @@ + class TestGB2312Map(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'gb2312' +- mapfileurl = 'http://people.freebsd.org/~perky/i18n/EUC-CN.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/EUC-CN.TXT' + + class TestGBKMap(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'gbk' +- mapfileurl = 'http://www.unicode.org/Public/MAPPINGS/VENDORS/' \ +- 'MICSFT/WINDOWS/CP936.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/CP936.TXT' + + class TestGB18030Map(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'gb18030' +- mapfileurl = 'http://source.icu-project.org/repos/icu/data/' \ +- 'trunk/charset/data/xml/gb-18030-2000.xml' ++ mapfileurl = 'http://www.pythontest.net/unicode/gb-18030-2000.xml' + + + def test_main(): +diff -r ee879c0ffa11 Lib/test/test_codecmaps_hk.py +--- a/Lib/test/test_codecmaps_hk.py ++++ b/Lib/test/test_codecmaps_hk.py +@@ -10,7 +10,7 @@ + class TestBig5HKSCSMap(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'big5hkscs' +- mapfileurl = 'http://people.freebsd.org/~perky/i18n/BIG5HKSCS-2004.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/BIG5HKSCS-2004.TXT' + + def test_main(): + test_support.run_unittest(__name__) +diff -r ee879c0ffa11 Lib/test/test_codecmaps_jp.py +--- a/Lib/test/test_codecmaps_jp.py ++++ b/Lib/test/test_codecmaps_jp.py +@@ -10,8 +10,7 @@ + class TestCP932Map(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'cp932' +- mapfileurl = 'http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/' \ +- 'WINDOWS/CP932.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/CP932.TXT' + supmaps = [ + ('\x80', u'\u0080'), + ('\xa0', u'\uf8f0'), +@@ -27,15 +26,14 @@ + unittest.TestCase): + encoding = 'euc_jp' + mapfilename = 'EUC-JP.TXT' +- mapfileurl = 'http://people.freebsd.org/~perky/i18n/EUC-JP.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/EUC-JP.TXT' + + + class TestSJISCOMPATMap(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'shift_jis' + mapfilename = 'SHIFTJIS.TXT' +- mapfileurl = 'http://www.unicode.org/Public/MAPPINGS/OBSOLETE' \ +- '/EASTASIA/JIS/SHIFTJIS.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/SHIFTJIS.TXT' + pass_enctest = [ + ('\x81_', u'\\'), + ] +@@ -49,14 +47,14 @@ + unittest.TestCase): + encoding = 'euc_jisx0213' + mapfilename = 'EUC-JISX0213.TXT' +- mapfileurl = 'http://people.freebsd.org/~perky/i18n/EUC-JISX0213.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/EUC-JISX0213.TXT' + + + class TestSJISX0213Map(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'shift_jisx0213' + mapfilename = 'SHIFT_JISX0213.TXT' +- mapfileurl = 'http://people.freebsd.org/~perky/i18n/SHIFT_JISX0213.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/SHIFT_JISX0213.TXT' + + + def test_main(): +diff -r ee879c0ffa11 Lib/test/test_codecmaps_kr.py +--- a/Lib/test/test_codecmaps_kr.py ++++ b/Lib/test/test_codecmaps_kr.py +@@ -10,14 +10,13 @@ + class TestCP949Map(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'cp949' +- mapfileurl = 'http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT' \ +- '/WINDOWS/CP949.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/CP949.TXT' + + + class TestEUCKRMap(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'euc_kr' +- mapfileurl = 'http://people.freebsd.org/~perky/i18n/EUC-KR.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/EUC-KR.TXT' + + # A4D4 HANGUL FILLER indicates the begin of 8-bytes make-up sequence. + pass_enctest = [('\xa4\xd4', u'\u3164')] +@@ -27,8 +26,7 @@ + class TestJOHABMap(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'johab' +- mapfileurl = 'http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/' \ +- 'KSC/JOHAB.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/JOHAB.TXT' + # KS X 1001 standard assigned 0x5c as WON SIGN. + # but, in early 90s that is the only era used johab widely, + # the most softwares implements it as REVERSE SOLIDUS. +diff -r ee879c0ffa11 Lib/test/test_codecmaps_tw.py +--- a/Lib/test/test_codecmaps_tw.py ++++ b/Lib/test/test_codecmaps_tw.py +@@ -10,14 +10,12 @@ + class TestBIG5Map(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'big5' +- mapfileurl = 'http://www.unicode.org/Public/MAPPINGS/OBSOLETE/' \ +- 'EASTASIA/OTHER/BIG5.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/BIG5.TXT' + + class TestCP950Map(test_multibytecodec_support.TestBase_Mapping, + unittest.TestCase): + encoding = 'cp950' +- mapfileurl = 'http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/' \ +- 'WINDOWS/CP950.TXT' ++ mapfileurl = 'http://www.pythontest.net/unicode/CP950.TXT' + pass_enctest = [ + ('\xa2\xcc', u'\u5341'), + ('\xa2\xce', u'\u5345'), +diff -r ee879c0ffa11 Lib/test/test_codecs.py +--- a/Lib/test/test_codecs.py ++++ b/Lib/test/test_codecs.py +@@ -2109,6 +2109,10 @@ + BomTest, + ) + ++ def test_uu_invalid(self): ++ # Missing "begin" line ++ self.assertRaises(ValueError, codecs.decode, "", "uu-codec") ++ + + if __name__ == "__main__": + test_main() +diff -r ee879c0ffa11 Lib/test/test_collections.py +--- a/Lib/test/test_collections.py ++++ b/Lib/test/test_collections.py +@@ -8,13 +8,14 @@ + from random import randrange, shuffle + import keyword + import re +-import sets + import sys + from collections import Hashable, Iterable, Iterator + from collections import Sized, Container, Callable + from collections import Set, MutableSet + from collections import Mapping, MutableMapping + from collections import Sequence, MutableSequence ++# Silence deprecation warning ++sets = test_support.import_module('sets', deprecated=True) + + TestNT = namedtuple('TestNT', 'x y z') # type used for pickle tests + +@@ -713,10 +714,12 @@ + self.assertTrue(r1 < r3) + self.assertFalse(r1 < r1) + self.assertFalse(r1 < r2) +- # python 2 only, cross-type compares will succeed +- f1 < l3 +- f1 < l1 +- f1 < l2 ++ ++ with test_support.check_py3k_warnings(): ++ # python 2 only, cross-type compares will succeed ++ f1 < l3 ++ f1 < l1 ++ f1 < l2 + + # any subset + self.assertTrue(f1 <= f3) +@@ -728,10 +731,12 @@ + self.assertTrue(r1 <= r3) + self.assertTrue(r1 <= r1) + self.assertFalse(r1 <= r2) +- # python 2 only, cross-type compares will succeed +- f1 <= l3 +- f1 <= l1 +- f1 <= l2 ++ ++ with test_support.check_py3k_warnings(): ++ # python 2 only, cross-type compares will succeed ++ f1 <= l3 ++ f1 <= l1 ++ f1 <= l2 + + # proper superset + self.assertTrue(f3 > f1) +@@ -743,10 +748,12 @@ + self.assertTrue(r3 > r1) + self.assertFalse(r1 > r1) + self.assertFalse(r2 > r1) +- # python 2 only, cross-type compares will succeed +- f1 > l3 +- f1 > l1 +- f1 > l2 ++ ++ with test_support.check_py3k_warnings(): ++ # python 2 only, cross-type compares will succeed ++ f1 > l3 ++ f1 > l1 ++ f1 > l2 + + # any superset + self.assertTrue(f3 >= f1) +@@ -758,10 +765,12 @@ + self.assertTrue(r3 >= r1) + self.assertTrue(r1 >= r1) + self.assertFalse(r2 >= r1) +- # python 2 only, cross-type compares will succeed +- f1 >= l3 +- f1 >=l1 +- f1 >= l2 ++ ++ with test_support.check_py3k_warnings(): ++ # python 2 only, cross-type compares will succeed ++ f1 >= l3 ++ f1 >=l1 ++ f1 >= l2 + + # equality + self.assertTrue(f1 == f1) +diff -r ee879c0ffa11 Lib/test/test_compile.py +--- a/Lib/test/test_compile.py ++++ b/Lib/test/test_compile.py +@@ -90,6 +90,27 @@ + with self.assertRaises(TypeError): + exec("a = b + 1", g, l) in g, l + ++ def test_nested_qualified_exec(self): ++ # Can use qualified exec in nested functions. ++ code = [""" ++def g(): ++ def f(): ++ if True: ++ exec "" in {}, {} ++ """, """ ++def g(): ++ def f(): ++ if True: ++ exec("", {}, {}) ++ """, """ ++def g(): ++ def f(): ++ if True: ++ exec("", {}) ++ """] ++ for c in code: ++ compile(c, "", "exec") ++ + def test_exec_with_general_mapping_for_locals(self): + + class M: +@@ -391,9 +412,24 @@ + l = lambda: "foo" + self.assertIsNone(l.__doc__) + +- def test_unicode_encoding(self): ++ @test_support.requires_unicode ++ def test_encoding(self): ++ code = b'# -*- coding: badencoding -*-\npass\n' ++ self.assertRaises(SyntaxError, compile, code, 'tmp', 'exec') + code = u"# -*- coding: utf-8 -*-\npass\n" + self.assertRaises(SyntaxError, compile, code, "tmp", "exec") ++ code = 'u"\xc2\xa4"\n' ++ self.assertEqual(eval(code), u'\xc2\xa4') ++ code = u'u"\xc2\xa4"\n' ++ self.assertEqual(eval(code), u'\xc2\xa4') ++ code = '# -*- coding: latin1 -*-\nu"\xc2\xa4"\n' ++ self.assertEqual(eval(code), u'\xc2\xa4') ++ code = '# -*- coding: utf-8 -*-\nu"\xc2\xa4"\n' ++ self.assertEqual(eval(code), u'\xa4') ++ code = '# -*- coding: iso8859-15 -*-\nu"\xc2\xa4"\n' ++ self.assertEqual(eval(code), test_support.u(r'\xc2\u20ac')) ++ code = 'u"""\\\n# -*- coding: utf-8 -*-\n\xc2\xa4"""\n' ++ self.assertEqual(eval(code), u'# -*- coding: utf-8 -*-\n\xc2\xa4') + + def test_subscripts(self): + # SF bug 1448804 +diff -r ee879c0ffa11 Lib/test/test_complex.py +--- a/Lib/test/test_complex.py ++++ b/Lib/test/test_complex.py +@@ -26,7 +26,7 @@ + unittest.TestCase.assertAlmostEqual(self, a, b) + + def assertCloseAbs(self, x, y, eps=1e-9): +- """Return true iff floats x and y "are close\"""" ++ """Return true iff floats x and y "are close".""" + # put the one with larger magnitude second + if abs(x) > abs(y): + x, y = y, x +@@ -61,7 +61,7 @@ + self.fail(msg.format(x, y)) + + def assertClose(self, x, y, eps=1e-9): +- """Return true iff complexes x and y "are close\"""" ++ """Return true iff complexes x and y "are close".""" + self.assertCloseAbs(x.real, y.real, eps) + self.assertCloseAbs(x.imag, y.imag, eps) + +@@ -108,6 +108,11 @@ + self.assertAlmostEqual(complex.__truediv__(2+0j, 1+1j), 1-1j) + self.assertRaises(ZeroDivisionError, complex.__truediv__, 1+1j, 0+0j) + ++ for denom_real, denom_imag in [(0, NAN), (NAN, 0), (NAN, NAN)]: ++ z = complex(0, 0) / complex(denom_real, denom_imag) ++ self.assertTrue(isnan(z.real)) ++ self.assertTrue(isnan(z.imag)) ++ + def test_floordiv(self): + self.assertAlmostEqual(complex.__floordiv__(3+0j, 1.5+0j), 2) + self.assertRaises(ZeroDivisionError, complex.__floordiv__, 3+0j, 0+0j) +diff -r ee879c0ffa11 Lib/test/test_cookie.py +--- a/Lib/test/test_cookie.py ++++ b/Lib/test/test_cookie.py +@@ -3,6 +3,7 @@ + from test.test_support import run_unittest, run_doctest, check_warnings + import unittest + import Cookie ++import pickle + + + class CookieTests(unittest.TestCase): +@@ -80,6 +81,51 @@ + self.assertEqual(C.output(['val']), + 'Set-Cookie: val="some\\054funky\\073stuff"') + ++ def test_set_secure_httponly_attrs(self): ++ C = Cookie.SimpleCookie('Customer="WILE_E_COYOTE"') ++ C['Customer']['secure'] = True ++ C['Customer']['httponly'] = True ++ self.assertEqual(C.output(), ++ 'Set-Cookie: Customer="WILE_E_COYOTE"; httponly; secure') ++ ++ def test_secure_httponly_false_if_not_present(self): ++ C = Cookie.SimpleCookie() ++ C.load('eggs=scrambled; Path=/bacon') ++ self.assertFalse(C['eggs']['httponly']) ++ self.assertFalse(C['eggs']['secure']) ++ ++ def test_secure_httponly_true_if_present(self): ++ # Issue 16611 ++ C = Cookie.SimpleCookie() ++ C.load('eggs=scrambled; httponly; secure; Path=/bacon') ++ self.assertTrue(C['eggs']['httponly']) ++ self.assertTrue(C['eggs']['secure']) ++ ++ def test_secure_httponly_true_if_have_value(self): ++ # This isn't really valid, but demonstrates what the current code ++ # is expected to do in this case. ++ C = Cookie.SimpleCookie() ++ C.load('eggs=scrambled; httponly=foo; secure=bar; Path=/bacon') ++ self.assertTrue(C['eggs']['httponly']) ++ self.assertTrue(C['eggs']['secure']) ++ # Here is what it actually does; don't depend on this behavior. These ++ # checks are testing backward compatibility for issue 16611. ++ self.assertEqual(C['eggs']['httponly'], 'foo') ++ self.assertEqual(C['eggs']['secure'], 'bar') ++ ++ def test_bad_attrs(self): ++ # Issue 16611: make sure we don't break backward compatibility. ++ C = Cookie.SimpleCookie() ++ C.load('cookie=with; invalid; version; second=cookie;') ++ self.assertEqual(C.output(), ++ 'Set-Cookie: cookie=with\r\nSet-Cookie: second=cookie') ++ ++ def test_extra_spaces(self): ++ C = Cookie.SimpleCookie() ++ C.load('eggs = scrambled ; secure ; path = bar ; foo=foo ') ++ self.assertEqual(C.output(), ++ 'Set-Cookie: eggs=scrambled; Path=bar; secure\r\nSet-Cookie: foo=foo') ++ + def test_quoted_meta(self): + # Try cookie with quoted meta-data + C = Cookie.SimpleCookie() +@@ -88,6 +134,27 @@ + self.assertEqual(C['Customer']['version'], '1') + self.assertEqual(C['Customer']['path'], '/acme') + ++ def test_invalid_cookies(self): ++ # Accepting these could be a security issue ++ C = Cookie.SimpleCookie() ++ for s in (']foo=x', '[foo=x', 'blah]foo=x', 'blah[foo=x'): ++ C.load(s) ++ self.assertEqual(dict(C), {}) ++ self.assertEqual(C.output(), '') ++ ++ def test_pickle(self): ++ rawdata = 'Customer="WILE_E_COYOTE"; Path=/acme; Version=1' ++ expected_output = 'Set-Cookie: %s' % rawdata ++ ++ C = Cookie.SimpleCookie() ++ C.load(rawdata) ++ self.assertEqual(C.output(), expected_output) ++ ++ for proto in range(pickle.HIGHEST_PROTOCOL + 1): ++ C1 = pickle.loads(pickle.dumps(C, protocol=proto)) ++ self.assertEqual(C1.output(), expected_output) ++ ++ + def test_main(): + run_unittest(CookieTests) + if Cookie.__doc__ is not None: +diff -r ee879c0ffa11 Lib/test/test_decimal.py +--- a/Lib/test/test_decimal.py ++++ b/Lib/test/test_decimal.py +@@ -31,7 +31,7 @@ + import unittest + from decimal import * + import numbers +-from test.test_support import (run_unittest, run_doctest, ++from test.test_support import (run_unittest, run_doctest, requires_unicode, u, + is_resource_enabled, check_py3k_warnings) + import random + try: +@@ -595,11 +595,12 @@ + d = nc.create_decimal(prevdec) + self.assertEqual(str(d), '5.00E+8') + ++ @requires_unicode + def test_unicode_digits(self): + test_values = { +- u'\uff11': '1', +- u'\u0660.\u0660\u0663\u0667\u0662e-\u0663' : '0.0000372', +- u'-nan\u0c68\u0c6a\u0c66\u0c66' : '-NaN2400', ++ u(r'\uff11'): '1', ++ u(r'\u0660.\u0660\u0663\u0667\u0662e-\u0663') : '0.0000372', ++ u(r'-nan\u0c68\u0c6a\u0c66\u0c66') : '-NaN2400', + } + for input, expected in test_values.items(): + self.assertEqual(str(Decimal(input)), expected) +@@ -823,6 +824,11 @@ + + # issue 6850 + ('a=-7.0', '0.12345', 'aaaa0.1'), ++ ++ # issue 22090 ++ ('<^+15.20%', 'inf', '<<+Infinity%<<<'), ++ ('\x07>,%', 'sNaN1234567', 'sNaN1234567%'), ++ ('=10.10%', 'NaN123', ' NaN123%'), + ] + for fmt, d, result in test_values: + self.assertEqual(format(Decimal(d), fmt), result) +diff -r ee879c0ffa11 Lib/test/test_doctest.py +--- a/Lib/test/test_doctest.py ++++ b/Lib/test/test_doctest.py +@@ -2569,6 +2569,32 @@ + >>> sys.argv = save_argv + """ + ++def test_lineendings(): r""" ++*nix systems use \n line endings, while Windows systems use \r\n. Python ++handles this using universal newline mode for reading files. Let's make ++sure doctest does so (issue 8473) by creating temporary test files using each ++of the two line disciplines. One of the two will be the "wrong" one for the ++platform the test is run on. ++ ++Windows line endings first: ++ ++ >>> import tempfile, os ++ >>> fn = tempfile.mktemp() ++ >>> open(fn, 'w').write('Test:\r\n\r\n >>> x = 1 + 1\r\n\r\nDone.\r\n') ++ >>> doctest.testfile(fn, False) ++ TestResults(failed=0, attempted=1) ++ >>> os.remove(fn) ++ ++And now *nix line endings: ++ ++ >>> fn = tempfile.mktemp() ++ >>> open(fn, 'w').write('Test:\n\n >>> x = 1 + 1\n\nDone.\n') ++ >>> doctest.testfile(fn, False) ++ TestResults(failed=0, attempted=1) ++ >>> os.remove(fn) ++ ++""" ++ + # old_test1, ... used to live in doctest.py, but cluttered it. Note + # that these use the deprecated doctest.Tester, so should go away (or + # be rewritten) someday. +diff -r ee879c0ffa11 Lib/test/test_ensurepip.py +--- /dev/null ++++ b/Lib/test/test_ensurepip.py +@@ -0,0 +1,352 @@ ++import unittest ++import os ++import os.path ++import contextlib ++import sys ++import test._mock_backport as mock ++import test.test_support ++ ++import ensurepip ++import ensurepip._uninstall ++ ++# pip currently requires ssl support, so we ensure we handle ++# it being missing (http://bugs.python.org/issue19744) ++ensurepip_no_ssl = test.test_support.import_fresh_module("ensurepip", ++ blocked=["ssl"]) ++try: ++ import ssl ++except ImportError: ++ ssl = None ++ ++ def requires_usable_pip(f): ++ deco = unittest.skip(ensurepip._MISSING_SSL_MESSAGE) ++ return deco(f) ++else: ++ def requires_usable_pip(f): ++ return f ++ ++ ++class TestEnsurePipVersion(unittest.TestCase): ++ ++ def test_returns_version(self): ++ self.assertEqual(ensurepip._PIP_VERSION, ensurepip.version()) ++ ++ ++class EnsurepipMixin: ++ ++ def setUp(self): ++ run_pip_patch = mock.patch("ensurepip._run_pip") ++ self.run_pip = run_pip_patch.start() ++ self.addCleanup(run_pip_patch.stop) ++ ++ # Avoid side effects on the actual os module ++ real_devnull = os.devnull ++ os_patch = mock.patch("ensurepip.os") ++ patched_os = os_patch.start() ++ self.addCleanup(os_patch.stop) ++ patched_os.devnull = real_devnull ++ patched_os.path = os.path ++ self.os_environ = patched_os.environ = os.environ.copy() ++ ++ ++class TestBootstrap(EnsurepipMixin, unittest.TestCase): ++ ++ @requires_usable_pip ++ def test_basic_bootstrapping(self): ++ ensurepip.bootstrap() ++ ++ self.run_pip.assert_called_once_with( ++ [ ++ "install", "--no-index", "--find-links", ++ mock.ANY, "setuptools", "pip", ++ ], ++ mock.ANY, ++ ) ++ ++ additional_paths = self.run_pip.call_args[0][1] ++ self.assertEqual(len(additional_paths), 2) ++ ++ @requires_usable_pip ++ def test_bootstrapping_with_root(self): ++ ensurepip.bootstrap(root="/foo/bar/") ++ ++ self.run_pip.assert_called_once_with( ++ [ ++ "install", "--no-index", "--find-links", ++ mock.ANY, "--root", "/foo/bar/", ++ "setuptools", "pip", ++ ], ++ mock.ANY, ++ ) ++ ++ @requires_usable_pip ++ def test_bootstrapping_with_user(self): ++ ensurepip.bootstrap(user=True) ++ ++ self.run_pip.assert_called_once_with( ++ [ ++ "install", "--no-index", "--find-links", ++ mock.ANY, "--user", "setuptools", "pip", ++ ], ++ mock.ANY, ++ ) ++ ++ @requires_usable_pip ++ def test_bootstrapping_with_upgrade(self): ++ ensurepip.bootstrap(upgrade=True) ++ ++ self.run_pip.assert_called_once_with( ++ [ ++ "install", "--no-index", "--find-links", ++ mock.ANY, "--upgrade", "setuptools", "pip", ++ ], ++ mock.ANY, ++ ) ++ ++ @requires_usable_pip ++ def test_bootstrapping_with_verbosity_1(self): ++ ensurepip.bootstrap(verbosity=1) ++ ++ self.run_pip.assert_called_once_with( ++ [ ++ "install", "--no-index", "--find-links", ++ mock.ANY, "-v", "setuptools", "pip", ++ ], ++ mock.ANY, ++ ) ++ ++ @requires_usable_pip ++ def test_bootstrapping_with_verbosity_2(self): ++ ensurepip.bootstrap(verbosity=2) ++ ++ self.run_pip.assert_called_once_with( ++ [ ++ "install", "--no-index", "--find-links", ++ mock.ANY, "-vv", "setuptools", "pip", ++ ], ++ mock.ANY, ++ ) ++ ++ @requires_usable_pip ++ def test_bootstrapping_with_verbosity_3(self): ++ ensurepip.bootstrap(verbosity=3) ++ ++ self.run_pip.assert_called_once_with( ++ [ ++ "install", "--no-index", "--find-links", ++ mock.ANY, "-vvv", "setuptools", "pip", ++ ], ++ mock.ANY, ++ ) ++ ++ @requires_usable_pip ++ def test_bootstrapping_with_regular_install(self): ++ ensurepip.bootstrap() ++ self.assertEqual(self.os_environ["ENSUREPIP_OPTIONS"], "install") ++ ++ @requires_usable_pip ++ def test_bootstrapping_with_alt_install(self): ++ ensurepip.bootstrap(altinstall=True) ++ self.assertEqual(self.os_environ["ENSUREPIP_OPTIONS"], "altinstall") ++ ++ @requires_usable_pip ++ def test_bootstrapping_with_default_pip(self): ++ ensurepip.bootstrap(default_pip=True) ++ self.assertNotIn("ENSUREPIP_OPTIONS", self.os_environ) ++ ++ def test_altinstall_default_pip_conflict(self): ++ with self.assertRaises(ValueError): ++ ensurepip.bootstrap(altinstall=True, default_pip=True) ++ self.assertFalse(self.run_pip.called) ++ ++ @requires_usable_pip ++ def test_pip_environment_variables_removed(self): ++ # ensurepip deliberately ignores all pip environment variables ++ # See http://bugs.python.org/issue19734 for details ++ self.os_environ["PIP_THIS_SHOULD_GO_AWAY"] = "test fodder" ++ ensurepip.bootstrap() ++ self.assertNotIn("PIP_THIS_SHOULD_GO_AWAY", self.os_environ) ++ ++ @requires_usable_pip ++ def test_pip_config_file_disabled(self): ++ # ensurepip deliberately ignores the pip config file ++ # See http://bugs.python.org/issue20053 for details ++ ensurepip.bootstrap() ++ self.assertEqual(self.os_environ["PIP_CONFIG_FILE"], os.devnull) ++ ++ ++@contextlib.contextmanager ++def fake_pip(version=ensurepip._PIP_VERSION): ++ if version is None: ++ pip = None ++ else: ++ class FakePip(): ++ __version__ = version ++ pip = FakePip() ++ sentinel = object() ++ orig_pip = sys.modules.get("pip", sentinel) ++ sys.modules["pip"] = pip ++ try: ++ yield pip ++ finally: ++ if orig_pip is sentinel: ++ del sys.modules["pip"] ++ else: ++ sys.modules["pip"] = orig_pip ++ ++ ++class TestUninstall(EnsurepipMixin, unittest.TestCase): ++ ++ def test_uninstall_skipped_when_not_installed(self): ++ with fake_pip(None): ++ ensurepip._uninstall_helper() ++ self.assertFalse(self.run_pip.called) ++ ++ def test_uninstall_skipped_with_warning_for_wrong_version(self): ++ with fake_pip("not a valid version"): ++ with test.test_support.captured_stderr() as stderr: ++ ensurepip._uninstall_helper() ++ warning = stderr.getvalue().strip() ++ self.assertIn("only uninstall a matching version", warning) ++ self.assertFalse(self.run_pip.called) ++ ++ @requires_usable_pip ++ def test_uninstall(self): ++ with fake_pip(): ++ ensurepip._uninstall_helper() ++ ++ self.run_pip.assert_called_once_with( ++ ["uninstall", "-y", "pip", "setuptools"] ++ ) ++ ++ @requires_usable_pip ++ def test_uninstall_with_verbosity_1(self): ++ with fake_pip(): ++ ensurepip._uninstall_helper(verbosity=1) ++ ++ self.run_pip.assert_called_once_with( ++ ["uninstall", "-y", "-v", "pip", "setuptools"] ++ ) ++ ++ @requires_usable_pip ++ def test_uninstall_with_verbosity_2(self): ++ with fake_pip(): ++ ensurepip._uninstall_helper(verbosity=2) ++ ++ self.run_pip.assert_called_once_with( ++ ["uninstall", "-y", "-vv", "pip", "setuptools"] ++ ) ++ ++ @requires_usable_pip ++ def test_uninstall_with_verbosity_3(self): ++ with fake_pip(): ++ ensurepip._uninstall_helper(verbosity=3) ++ ++ self.run_pip.assert_called_once_with( ++ ["uninstall", "-y", "-vvv", "pip", "setuptools"] ++ ) ++ ++ @requires_usable_pip ++ def test_pip_environment_variables_removed(self): ++ # ensurepip deliberately ignores all pip environment variables ++ # See http://bugs.python.org/issue19734 for details ++ self.os_environ["PIP_THIS_SHOULD_GO_AWAY"] = "test fodder" ++ with fake_pip(): ++ ensurepip._uninstall_helper() ++ self.assertNotIn("PIP_THIS_SHOULD_GO_AWAY", self.os_environ) ++ ++ @requires_usable_pip ++ def test_pip_config_file_disabled(self): ++ # ensurepip deliberately ignores the pip config file ++ # See http://bugs.python.org/issue20053 for details ++ with fake_pip(): ++ ensurepip._uninstall_helper() ++ self.assertEqual(self.os_environ["PIP_CONFIG_FILE"], os.devnull) ++ ++ ++class TestMissingSSL(EnsurepipMixin, unittest.TestCase): ++ ++ def setUp(self): ++ sys.modules["ensurepip"] = ensurepip_no_ssl ++ ++ @self.addCleanup ++ def restore_module(): ++ sys.modules["ensurepip"] = ensurepip ++ super(TestMissingSSL, self).setUp() ++ ++ def test_bootstrap_requires_ssl(self): ++ self.os_environ["PIP_THIS_SHOULD_STAY"] = "test fodder" ++ with self.assertRaisesRegexp(RuntimeError, "requires SSL/TLS"): ++ ensurepip_no_ssl.bootstrap() ++ self.assertFalse(self.run_pip.called) ++ self.assertIn("PIP_THIS_SHOULD_STAY", self.os_environ) ++ ++ def test_uninstall_requires_ssl(self): ++ self.os_environ["PIP_THIS_SHOULD_STAY"] = "test fodder" ++ with self.assertRaisesRegexp(RuntimeError, "requires SSL/TLS"): ++ with fake_pip(): ++ ensurepip_no_ssl._uninstall_helper() ++ self.assertFalse(self.run_pip.called) ++ self.assertIn("PIP_THIS_SHOULD_STAY", self.os_environ) ++ ++ def test_main_exits_early_with_warning(self): ++ with test.test_support.captured_stderr() as stderr: ++ ensurepip_no_ssl._main(["--version"]) ++ warning = stderr.getvalue().strip() ++ self.assertTrue(warning.endswith("requires SSL/TLS"), warning) ++ self.assertFalse(self.run_pip.called) ++ ++# Basic testing of the main functions and their argument parsing ++ ++EXPECTED_VERSION_OUTPUT = "pip " + ensurepip._PIP_VERSION ++ ++ ++class TestBootstrappingMainFunction(EnsurepipMixin, unittest.TestCase): ++ ++ @requires_usable_pip ++ def test_bootstrap_version(self): ++ with test.test_support.captured_stderr() as stderr: ++ with self.assertRaises(SystemExit): ++ ensurepip._main(["--version"]) ++ result = stderr.getvalue().strip() ++ self.assertEqual(result, EXPECTED_VERSION_OUTPUT) ++ self.assertFalse(self.run_pip.called) ++ ++ @requires_usable_pip ++ def test_basic_bootstrapping(self): ++ ensurepip._main([]) ++ ++ self.run_pip.assert_called_once_with( ++ [ ++ "install", "--no-index", "--find-links", ++ mock.ANY, "setuptools", "pip", ++ ], ++ mock.ANY, ++ ) ++ ++ additional_paths = self.run_pip.call_args[0][1] ++ self.assertEqual(len(additional_paths), 2) ++ ++ ++class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase): ++ ++ def test_uninstall_version(self): ++ with test.test_support.captured_stderr() as stderr: ++ with self.assertRaises(SystemExit): ++ ensurepip._uninstall._main(["--version"]) ++ result = stderr.getvalue().strip() ++ self.assertEqual(result, EXPECTED_VERSION_OUTPUT) ++ self.assertFalse(self.run_pip.called) ++ ++ @requires_usable_pip ++ def test_basic_uninstall(self): ++ with fake_pip(): ++ ensurepip._uninstall._main([]) ++ ++ self.run_pip.assert_called_once_with( ++ ["uninstall", "-y", "pip", "setuptools"] ++ ) ++ ++ ++if __name__ == "__main__": ++ test.test_support.run_unittest(__name__) +diff -r ee879c0ffa11 Lib/test/test_file2k.py +--- a/Lib/test/test_file2k.py ++++ b/Lib/test/test_file2k.py +@@ -14,7 +14,7 @@ + threading = None + + from test import test_support +-from test.test_support import TESTFN, run_unittest ++from test.test_support import TESTFN, run_unittest, requires + from UserList import UserList + + class AutoFileTests(unittest.TestCase): +@@ -436,6 +436,21 @@ + finally: + f.close() + ++ @unittest.skipUnless(sys.maxsize > 2**31, "requires 64-bit system") ++ @test_support.precisionbigmemtest(2**31, 2.5, dry_run=False) ++ def test_very_long_line(self, size): ++ # Issue #22526 ++ requires('largefile') ++ with open(TESTFN, "wb") as fp: ++ fp.seek(size - 1) ++ fp.write("\0") ++ with open(TESTFN, "rb") as fp: ++ for l in fp: ++ pass ++ self.assertEqual(len(l), size) ++ self.assertEqual(l.count("\0"), size) ++ l = None ++ + class FileSubclassTests(unittest.TestCase): + + def testExit(self): +diff -r ee879c0ffa11 Lib/test/test_gdb.py +--- a/Lib/test/test_gdb.py ++++ b/Lib/test/test_gdb.py +@@ -13,7 +13,7 @@ + from test.test_support import run_unittest, findfile + + try: +- gdb_version, _ = subprocess.Popen(["gdb", "--version"], ++ gdb_version, _ = subprocess.Popen(["gdb", "-nx", "--version"], + stdout=subprocess.PIPE).communicate() + except OSError: + # This is what "no gdb" looks like. There may, however, be other +@@ -31,7 +31,7 @@ + 'python-gdb.py') + + def run_gdb(*args, **env_vars): +- """Runs gdb in --batch mode with the additional arguments given by *args. ++ """Runs gdb in batch mode with the additional arguments given by *args. + + Returns its (stdout, stderr) + """ +@@ -40,7 +40,9 @@ + env.update(env_vars) + else: + env = None +- base_cmd = ('gdb', '--batch') ++ # -nx: Do not execute commands from any .gdbinit initialization files ++ # (issue #22188) ++ base_cmd = ('gdb', '--batch', '-nx') + if (gdb_major_version, gdb_minor_version) >= (7, 4): + base_cmd += ('-iex', 'add-auto-load-safe-path ' + checkout_hook_path) + out, err = subprocess.Popen(base_cmd + args, +@@ -122,7 +124,7 @@ + # print commands + + # Use "commands" to generate the arguments with which to invoke "gdb": +- args = ["gdb", "--batch"] ++ args = ["gdb", "--batch", "-nx"] + args += ['--eval-command=%s' % cmd for cmd in commands] + args += ["--args", + sys.executable] +@@ -161,6 +163,10 @@ + 'linux-gate.so', + 'Do you need "set solib-search-path" or ' + '"set sysroot"?', ++ 'warning: Source file is more recent than executable.', ++ # Issue #19753: missing symbols on System Z ++ 'Missing separate debuginfo for ', ++ 'Try: zypper install -C ', + ) + for line in errlines: + if not line.startswith(ignore_patterns): +diff -r ee879c0ffa11 Lib/test/test_gzip.py +--- a/Lib/test/test_gzip.py ++++ b/Lib/test/test_gzip.py +@@ -30,6 +30,21 @@ + def tearDown(self): + test_support.unlink(self.filename) + ++ @test_support.requires_unicode ++ def test_unicode_filename(self): ++ unicode_filename = test_support.TESTFN_UNICODE ++ try: ++ unicode_filename.encode(test_support.TESTFN_ENCODING) ++ except (UnicodeError, TypeError): ++ self.skipTest("Requires unicode filenames support") ++ with gzip.GzipFile(unicode_filename, "wb") as f: ++ f.write(data1 * 50) ++ with gzip.GzipFile(unicode_filename, "rb") as f: ++ self.assertEqual(f.read(), data1 * 50) ++ # Sanity check that we are actually operating on the right file. ++ with open(unicode_filename, 'rb') as fobj, \ ++ gzip.GzipFile(fileobj=fobj, mode="rb") as f: ++ self.assertEqual(f.read(), data1 * 50) + + def test_write(self): + with gzip.GzipFile(self.filename, 'wb') as f: +diff -r ee879c0ffa11 Lib/test/test_hash.py +--- a/Lib/test/test_hash.py ++++ b/Lib/test/test_hash.py +@@ -215,7 +215,8 @@ + repr_ = 'buffer("abc")' + + def test_empty_string(self): +- self.assertEqual(hash(buffer("")), 0) ++ with test_support.check_py3k_warnings(): ++ self.assertEqual(hash(buffer("")), 0) + + class DatetimeTests(HashRandomizationTests): + def get_hash_command(self, repr_): +diff -r ee879c0ffa11 Lib/test/test_hashlib.py +--- a/Lib/test/test_hashlib.py ++++ b/Lib/test/test_hashlib.py +@@ -109,6 +109,15 @@ + tuple([_algo for _algo in self.supported_hash_names if + _algo.islower()])) + ++ def test_algorithms_guaranteed(self): ++ self.assertEqual(hashlib.algorithms_guaranteed, ++ set(_algo for _algo in self.supported_hash_names ++ if _algo.islower())) ++ ++ def test_algorithms_available(self): ++ self.assertTrue(set(hashlib.algorithms_guaranteed). ++ issubset(hashlib.algorithms_available)) ++ + def test_unknown_hash(self): + self.assertRaises(ValueError, hashlib.new, 'spam spam spam spam spam') + self.assertRaises(TypeError, hashlib.new, 1) +diff -r ee879c0ffa11 Lib/test/test_hmac.py +--- a/Lib/test/test_hmac.py ++++ b/Lib/test/test_hmac.py +@@ -389,10 +389,11 @@ + a, b = "fooä", "fooä" + self.assertTrue(hmac.compare_digest(a, b)) + +- # subclasses are supported by ignore __eq__ +- class mystr(str): +- def __eq__(self, other): +- return False ++ with test_support.check_py3k_warnings(): ++ # subclasses are supported by ignore __eq__ ++ class mystr(str): ++ def __eq__(self, other): ++ return False + + a, b = mystr("foobar"), mystr("foobar") + self.assertTrue(hmac.compare_digest(a, b)) +@@ -401,9 +402,10 @@ + a, b = mystr("foobar"), mystr("foobaz") + self.assertFalse(hmac.compare_digest(a, b)) + +- class mybytes(bytes): +- def __eq__(self, other): +- return False ++ with test_support.check_py3k_warnings(): ++ class mybytes(bytes): ++ def __eq__(self, other): ++ return False + + a, b = mybytes(b"foobar"), mybytes(b"foobar") + self.assertTrue(hmac.compare_digest(a, b)) +diff -r ee879c0ffa11 Lib/test/test_httplib.py +--- a/Lib/test/test_httplib.py ++++ b/Lib/test/test_httplib.py +@@ -262,6 +262,13 @@ + if resp.read() != "": + self.fail("Did not expect response from HEAD request") + ++ def test_too_many_headers(self): ++ headers = '\r\n'.join('Header%d: foo' % i for i in xrange(200)) + '\r\n' ++ text = ('HTTP/1.1 200 OK\r\n' + headers) ++ s = FakeSocket(text) ++ r = httplib.HTTPResponse(s) ++ self.assertRaises(httplib.HTTPException, r.begin) ++ + def test_send_file(self): + expected = 'GET /foo HTTP/1.1\r\nHost: example.com\r\n' \ + 'Accept-Encoding: identity\r\nContent-Length:' +diff -r ee879c0ffa11 Lib/test/test_httpservers.py +--- a/Lib/test/test_httpservers.py ++++ b/Lib/test/test_httpservers.py +@@ -349,7 +349,7 @@ + response = self.request('/', method='FOO') + self.check_status_and_reason(response, 501) + # requests must be case sensitive,so this should fail too +- response = self.request('/', method='get') ++ response = self.request('/', method='custom') + self.check_status_and_reason(response, 501) + response = self.request('/', method='GETs') + self.check_status_and_reason(response, 501) +@@ -386,7 +386,9 @@ + BaseTestCase.setUp(self) + self.parent_dir = tempfile.mkdtemp() + self.cgi_dir = os.path.join(self.parent_dir, 'cgi-bin') ++ self.cgi_child_dir = os.path.join(self.cgi_dir, 'child-dir') + os.mkdir(self.cgi_dir) ++ os.mkdir(self.cgi_child_dir) + + # The shebang line should be pure ASCII: use symlink if possible. + # See issue #7668. +@@ -411,6 +413,11 @@ + file2.write(cgi_file2 % self.pythonexe) + os.chmod(self.file2_path, 0777) + ++ self.file3_path = os.path.join(self.cgi_child_dir, 'file3.py') ++ with open(self.file3_path, 'w') as file3: ++ file3.write(cgi_file1 % self.pythonexe) ++ os.chmod(self.file3_path, 0777) ++ + self.cwd = os.getcwd() + os.chdir(self.parent_dir) + +@@ -422,6 +429,8 @@ + os.remove(self.nocgi_path) + os.remove(self.file1_path) + os.remove(self.file2_path) ++ os.remove(self.file3_path) ++ os.rmdir(self.cgi_child_dir) + os.rmdir(self.cgi_dir) + os.rmdir(self.parent_dir) + finally: +@@ -516,6 +525,11 @@ + self.assertEqual((b'Hello World\n', 'text/html', 200), + (res.read(), res.getheader('Content-type'), res.status)) + ++ def test_nested_cgi_path_issue21323(self): ++ res = self.request('/cgi-bin/child-dir/file3.py') ++ self.assertEqual((b'Hello World\n', 'text/html', 200), ++ (res.read(), res.getheader('Content-type'), res.status)) ++ + + class SimpleHTTPRequestHandlerTestCase(unittest.TestCase): + """ Test url parsing """ +diff -r ee879c0ffa11 Lib/test/test_io.py +--- a/Lib/test/test_io.py ++++ b/Lib/test/test_io.py +@@ -1474,6 +1474,12 @@ + pair = self.tp(SelectableIsAtty(True), SelectableIsAtty(True)) + self.assertTrue(pair.isatty()) + ++ def test_weakref_clearing(self): ++ brw = self.tp(self.MockRawIO(), self.MockRawIO()) ++ ref = weakref.ref(brw) ++ brw = None ++ ref = None # Shouldn't segfault. ++ + class CBufferedRWPairTest(BufferedRWPairTest): + tp = io.BufferedRWPair + +diff -r ee879c0ffa11 Lib/test/test_itertools.py +--- a/Lib/test/test_itertools.py ++++ b/Lib/test/test_itertools.py +@@ -808,6 +808,7 @@ + it = islice(it, 1) + self.assertIsNotNone(wr()) + list(it) # exhaust the iterator ++ test_support.gc_collect() + self.assertIsNone(wr()) + + def test_takewhile(self): +diff -r ee879c0ffa11 Lib/test/test_kqueue.py +--- a/Lib/test/test_kqueue.py ++++ b/Lib/test/test_kqueue.py +@@ -81,6 +81,31 @@ + self.assertEqual(ev, ev) + self.assertNotEqual(ev, other) + ++ # Issue 11973 ++ bignum = 0xffff ++ ev = select.kevent(0, 1, bignum) ++ self.assertEqual(ev.ident, 0) ++ self.assertEqual(ev.filter, 1) ++ self.assertEqual(ev.flags, bignum) ++ self.assertEqual(ev.fflags, 0) ++ self.assertEqual(ev.data, 0) ++ self.assertEqual(ev.udata, 0) ++ self.assertEqual(ev, ev) ++ self.assertNotEqual(ev, other) ++ ++ # Issue 11973 ++ bignum = 0xffffffff ++ ev = select.kevent(0, 1, 2, bignum) ++ self.assertEqual(ev.ident, 0) ++ self.assertEqual(ev.filter, 1) ++ self.assertEqual(ev.flags, 2) ++ self.assertEqual(ev.fflags, bignum) ++ self.assertEqual(ev.data, 0) ++ self.assertEqual(ev.udata, 0) ++ self.assertEqual(ev, ev) ++ self.assertNotEqual(ev, other) ++ ++ + def test_queue_event(self): + serverSocket = socket.socket() + serverSocket.bind(('127.0.0.1', 0)) +diff -r ee879c0ffa11 Lib/test/test_list.py +--- a/Lib/test/test_list.py ++++ b/Lib/test/test_list.py +@@ -53,7 +53,7 @@ + + def test_overflow(self): + lst = [4, 5, 6, 7] +- n = int((sys.maxint*2+2) // len(lst)) ++ n = int((sys.maxsize*2+2) // len(lst)) + def mul(a, b): return a * b + def imul(a, b): a *= b + self.assertRaises((MemoryError, OverflowError), mul, lst, n) +diff -r ee879c0ffa11 Lib/test/test_locale.py +--- a/Lib/test/test_locale.py ++++ b/Lib/test/test_locale.py +@@ -425,7 +425,7 @@ + + def test_valencia_modifier(self): + self.check('ca_ES.UTF-8@valencia', 'ca_ES.UTF-8@valencia') +- self.check('ca_ES@valencia', 'ca_ES.ISO8859-1@valencia') ++ self.check('ca_ES@valencia', 'ca_ES.ISO8859-15@valencia') + self.check('ca@valencia', 'ca_ES.ISO8859-1@valencia') + + def test_devanagari_modifier(self): +diff -r ee879c0ffa11 Lib/test/test_macpath.py +--- a/Lib/test/test_macpath.py ++++ b/Lib/test/test_macpath.py +@@ -29,6 +29,26 @@ + self.assertEqual(split(":conky:mountpoint:"), + (':conky:mountpoint', '')) + ++ def test_join(self): ++ join = macpath.join ++ self.assertEqual(join('a', 'b'), ':a:b') ++ self.assertEqual(join(':a', 'b'), ':a:b') ++ self.assertEqual(join(':a:', 'b'), ':a:b') ++ self.assertEqual(join(':a::', 'b'), ':a::b') ++ self.assertEqual(join(':a', '::b'), ':a::b') ++ self.assertEqual(join('a', ':'), ':a:') ++ self.assertEqual(join('a:', ':'), 'a:') ++ self.assertEqual(join('a', ''), ':a:') ++ self.assertEqual(join('a:', ''), 'a:') ++ self.assertEqual(join('', ''), '') ++ self.assertEqual(join('', 'a:b'), 'a:b') ++ self.assertEqual(join('', 'a', 'b'), ':a:b') ++ self.assertEqual(join('a:b', 'c'), 'a:b:c') ++ self.assertEqual(join('a:b', ':c'), 'a:b:c') ++ self.assertEqual(join('a', ':b', ':c'), ':a:b:c') ++ self.assertEqual(join('a', 'b:'), 'b:') ++ self.assertEqual(join('a:', 'b:'), 'b:') ++ + def test_splitext(self): + splitext = macpath.splitext + self.assertEqual(splitext(":foo.ext"), (':foo', '.ext')) +diff -r ee879c0ffa11 Lib/test/test_mmap.py +--- a/Lib/test/test_mmap.py ++++ b/Lib/test/test_mmap.py +@@ -1,5 +1,5 @@ + from test.test_support import (TESTFN, run_unittest, import_module, unlink, +- requires, _2G, _4G) ++ requires, _2G, _4G, gc_collect, cpython_only) + import unittest + import os, re, itertools, socket, sys + +@@ -606,6 +606,15 @@ + m2.close() + m1.close() + ++ @cpython_only ++ @unittest.skipUnless(os.name == 'nt', 'requires Windows') ++ def test_sizeof(self): ++ m1 = mmap.mmap(-1, 100) ++ tagname = "foo" ++ m2 = mmap.mmap(-1, 100, tagname=tagname) ++ self.assertEqual(sys.getsizeof(m2), ++ sys.getsizeof(m1) + len(tagname) + 1) ++ + @unittest.skipUnless(os.name == 'nt', 'requires Windows') + def test_crasher_on_windows(self): + # Should not crash (Issue 1733986) +diff -r ee879c0ffa11 Lib/test/test_normalization.py +--- a/Lib/test/test_normalization.py ++++ b/Lib/test/test_normalization.py +@@ -7,7 +7,7 @@ + from unicodedata import normalize, unidata_version + + TESTDATAFILE = "NormalizationTest.txt" +-TESTDATAURL = "http://www.unicode.org/Public/" + unidata_version + "/ucd/" + TESTDATAFILE ++TESTDATAURL = "http://www.pythontest.net/unicode/" + unidata_version + "/" + TESTDATAFILE + + def check_version(testfile): + hdr = testfile.readline() +diff -r ee879c0ffa11 Lib/test/test_ntpath.py +--- a/Lib/test/test_ntpath.py ++++ b/Lib/test/test_ntpath.py +@@ -50,6 +50,7 @@ + # Issue #19911: UNC part containing U+0130 + self.assertEqual(ntpath.splitdrive(u'//conky/MOUNTPOÄ°NT/foo/bar'), + (u'//conky/MOUNTPOÄ°NT', '/foo/bar')) ++ self.assertEqual(ntpath.splitdrive("//"), ("", "//")) + + def test_splitunc(self): + tester('ntpath.splitunc("c:\\foo\\bar")', +diff -r ee879c0ffa11 Lib/test/test_pep292.py +--- a/Lib/test/test_pep292.py ++++ b/Lib/test/test_pep292.py +@@ -125,6 +125,40 @@ + self.assertRaises(ValueError, s.substitute, {}) + self.assertRaises(ValueError, s.safe_substitute, {}) + ++ def test_braced_override(self): ++ class MyTemplate(Template): ++ pattern = r""" ++ \$(?: ++ (?P$) | ++ (?P[_a-z][_a-z0-9]*) | ++ @@(?P[_a-z][_a-z0-9]*)@@ | ++ (?P) | ++ ) ++ """ ++ ++ tmpl = 'PyCon in $@@location@@' ++ t = MyTemplate(tmpl) ++ self.assertRaises(KeyError, t.substitute, {}) ++ val = t.substitute({'location': 'Cleveland'}) ++ self.assertEqual(val, 'PyCon in Cleveland') ++ ++ def test_braced_override_safe(self): ++ class MyTemplate(Template): ++ pattern = r""" ++ \$(?: ++ (?P$) | ++ (?P[_a-z][_a-z0-9]*) | ++ @@(?P[_a-z][_a-z0-9]*)@@ | ++ (?P) | ++ ) ++ """ ++ ++ tmpl = 'PyCon in $@@location@@' ++ t = MyTemplate(tmpl) ++ self.assertEqual(t.safe_substitute(), tmpl) ++ val = t.safe_substitute({'location': 'Cleveland'}) ++ self.assertEqual(val, 'PyCon in Cleveland') ++ + def test_unicode_values(self): + s = Template('$who likes $what') + d = dict(who=u't\xffm', what=u'f\xfe\fed') +diff -r ee879c0ffa11 Lib/test/test_posix.py +--- a/Lib/test/test_posix.py ++++ b/Lib/test/test_posix.py +@@ -194,6 +194,18 @@ + self.fdopen_helper('r') + self.fdopen_helper('r', 100) + ++ @unittest.skipUnless(hasattr(posix, 'fdopen'), ++ 'test needs posix.fdopen()') ++ def test_fdopen_directory(self): ++ try: ++ fd = os.open('.', os.O_RDONLY) ++ except OSError as e: ++ self.assertEqual(e.errno, errno.EACCES) ++ self.skipTest("system cannot open directories") ++ with self.assertRaises(IOError) as cm: ++ os.fdopen(fd, 'r') ++ self.assertEqual(cm.exception.errno, errno.EISDIR) ++ + @unittest.skipUnless(hasattr(posix, 'fdopen') and + not sys.platform.startswith("sunos"), + 'test needs posix.fdopen()') +diff -r ee879c0ffa11 Lib/test/test_pyclbr.py +--- a/Lib/test/test_pyclbr.py ++++ b/Lib/test/test_pyclbr.py +@@ -180,7 +180,7 @@ + cm('pickle') + cm('aifc', ignore=('openfp',)) # set with = in module + cm('Cookie') +- cm('sre_parse', ignore=('dump',)) # from sre_constants import * ++ cm('sre_parse', ignore=('dump', 'groups')) # from sre_constants import *; property + cm('pdb') + cm('pydoc') + +diff -r ee879c0ffa11 Lib/test/test_re.py +--- a/Lib/test/test_re.py ++++ b/Lib/test/test_re.py +@@ -1,6 +1,8 @@ ++# -*- coding: utf-8 -*- + from test.test_support import verbose, run_unittest, import_module + from test.test_support import precisionbigmemtest, _2G, cpython_only +-from test.test_support import captured_stdout ++from test.test_support import captured_stdout, have_unicode, requires_unicode, u ++import locale + import re + from re import Scanner + import sre_constants +@@ -31,12 +33,12 @@ + self.assertEqual(re.search('x*', 'axx').span(), (0, 0)) + self.assertEqual(re.search('x+', 'axx').span(0), (1, 3)) + self.assertEqual(re.search('x+', 'axx').span(), (1, 3)) +- self.assertEqual(re.search('x', 'aaa'), None) ++ self.assertIsNone(re.search('x', 'aaa')) + self.assertEqual(re.match('a*', 'xxx').span(0), (0, 0)) + self.assertEqual(re.match('a*', 'xxx').span(), (0, 0)) + self.assertEqual(re.match('x*', 'xxxa').span(0), (0, 3)) + self.assertEqual(re.match('x*', 'xxxa').span(), (0, 3)) +- self.assertEqual(re.match('a+', 'xxx'), None) ++ self.assertIsNone(re.match('a+', 'xxx')) + + def bump_num(self, matchobj): + int_value = int(matchobj.group(0)) +@@ -86,6 +88,7 @@ + self.assertEqual(re.sub('\r\n', '\n', 'abc\r\ndef\r\n'), + 'abc\ndef\n') + ++ @requires_unicode + def test_bug_1140(self): + # re.sub(x, y, u'') should return u'', not '', and + # re.sub(x, y, '') should return '', not u''. +@@ -284,8 +287,8 @@ + ('(', 'a')) + self.assertEqual(re.match('^(\()?([^()]+)(?(1)\))$', 'a').groups(), + (None, 'a')) +- self.assertEqual(re.match('^(\()?([^()]+)(?(1)\))$', 'a)'), None) +- self.assertEqual(re.match('^(\()?([^()]+)(?(1)\))$', '(a'), None) ++ self.assertIsNone(re.match('^(\()?([^()]+)(?(1)\))$', 'a)')) ++ self.assertIsNone(re.match('^(\()?([^()]+)(?(1)\))$', '(a')) + self.assertEqual(re.match('^(?:(a)|c)((?(1)b|d))$', 'ab').groups(), + ('a', 'b')) + self.assertEqual(re.match('^(?:(a)|c)((?(1)b|d))$', 'cd').groups(), +@@ -301,8 +304,8 @@ + ('a', 'b', 'c')) + self.assertEqual(p.match('ad').groups(), + ('a', None, 'd')) +- self.assertEqual(p.match('abd'), None) +- self.assertEqual(p.match('ac'), None) ++ self.assertIsNone(p.match('abd')) ++ self.assertIsNone(p.match('ac')) + + + def test_re_groupref(self): +@@ -310,8 +313,8 @@ + ('|', 'a')) + self.assertEqual(re.match(r'^(\|)?([^()]+)\1?$', 'a').groups(), + (None, 'a')) +- self.assertEqual(re.match(r'^(\|)?([^()]+)\1$', 'a|'), None) +- self.assertEqual(re.match(r'^(\|)?([^()]+)\1$', '|a'), None) ++ self.assertIsNone(re.match(r'^(\|)?([^()]+)\1$', 'a|')) ++ self.assertIsNone(re.match(r'^(\|)?([^()]+)\1$', '|a')) + self.assertEqual(re.match(r'^(?:(a)|c)(\1)$', 'aa').groups(), + ('a', 'a')) + self.assertEqual(re.match(r'^(?:(a)|c)(\1)?$', 'c').groups(), +@@ -329,10 +332,10 @@ + "second first second first") + + def test_repeat_minmax(self): +- self.assertEqual(re.match("^(\w){1}$", "abc"), None) +- self.assertEqual(re.match("^(\w){1}?$", "abc"), None) +- self.assertEqual(re.match("^(\w){1,2}$", "abc"), None) +- self.assertEqual(re.match("^(\w){1,2}?$", "abc"), None) ++ self.assertIsNone(re.match("^(\w){1}$", "abc")) ++ self.assertIsNone(re.match("^(\w){1}?$", "abc")) ++ self.assertIsNone(re.match("^(\w){1,2}$", "abc")) ++ self.assertIsNone(re.match("^(\w){1,2}?$", "abc")) + + self.assertEqual(re.match("^(\w){3}$", "abc").group(1), "c") + self.assertEqual(re.match("^(\w){1,3}$", "abc").group(1), "c") +@@ -343,29 +346,29 @@ + self.assertEqual(re.match("^(\w){1,4}?$", "abc").group(1), "c") + self.assertEqual(re.match("^(\w){3,4}?$", "abc").group(1), "c") + +- self.assertEqual(re.match("^x{1}$", "xxx"), None) +- self.assertEqual(re.match("^x{1}?$", "xxx"), None) +- self.assertEqual(re.match("^x{1,2}$", "xxx"), None) +- self.assertEqual(re.match("^x{1,2}?$", "xxx"), None) ++ self.assertIsNone(re.match("^x{1}$", "xxx")) ++ self.assertIsNone(re.match("^x{1}?$", "xxx")) ++ self.assertIsNone(re.match("^x{1,2}$", "xxx")) ++ self.assertIsNone(re.match("^x{1,2}?$", "xxx")) + +- self.assertNotEqual(re.match("^x{3}$", "xxx"), None) +- self.assertNotEqual(re.match("^x{1,3}$", "xxx"), None) +- self.assertNotEqual(re.match("^x{1,4}$", "xxx"), None) +- self.assertNotEqual(re.match("^x{3,4}?$", "xxx"), None) +- self.assertNotEqual(re.match("^x{3}?$", "xxx"), None) +- self.assertNotEqual(re.match("^x{1,3}?$", "xxx"), None) +- self.assertNotEqual(re.match("^x{1,4}?$", "xxx"), None) +- self.assertNotEqual(re.match("^x{3,4}?$", "xxx"), None) ++ self.assertTrue(re.match("^x{3}$", "xxx")) ++ self.assertTrue(re.match("^x{1,3}$", "xxx")) ++ self.assertTrue(re.match("^x{1,4}$", "xxx")) ++ self.assertTrue(re.match("^x{3,4}?$", "xxx")) ++ self.assertTrue(re.match("^x{3}?$", "xxx")) ++ self.assertTrue(re.match("^x{1,3}?$", "xxx")) ++ self.assertTrue(re.match("^x{1,4}?$", "xxx")) ++ self.assertTrue(re.match("^x{3,4}?$", "xxx")) + +- self.assertEqual(re.match("^x{}$", "xxx"), None) +- self.assertNotEqual(re.match("^x{}$", "x{}"), None) ++ self.assertIsNone(re.match("^x{}$", "xxx")) ++ self.assertTrue(re.match("^x{}$", "x{}")) + + def test_getattr(self): + self.assertEqual(re.match("(a)", "a").pos, 0) + self.assertEqual(re.match("(a)", "a").endpos, 1) + self.assertEqual(re.match("(a)", "a").string, "a") + self.assertEqual(re.match("(a)", "a").regs, ((0, 1), (0, 1))) +- self.assertNotEqual(re.match("(a)", "a").re, None) ++ self.assertTrue(re.match("(a)", "a").re) + + def test_special_escapes(self): + self.assertEqual(re.search(r"\b(b.)\b", +@@ -376,26 +379,28 @@ + "abcd abc bcd bx", re.LOCALE).group(1), "bx") + self.assertEqual(re.search(r"\B(b.)\B", + "abc bcd bc abxd", re.LOCALE).group(1), "bx") +- self.assertEqual(re.search(r"\b(b.)\b", +- "abcd abc bcd bx", re.UNICODE).group(1), "bx") +- self.assertEqual(re.search(r"\B(b.)\B", +- "abc bcd bc abxd", re.UNICODE).group(1), "bx") ++ if have_unicode: ++ self.assertEqual(re.search(r"\b(b.)\b", ++ "abcd abc bcd bx", re.UNICODE).group(1), "bx") ++ self.assertEqual(re.search(r"\B(b.)\B", ++ "abc bcd bc abxd", re.UNICODE).group(1), "bx") + self.assertEqual(re.search(r"^abc$", "\nabc\n", re.M).group(0), "abc") + self.assertEqual(re.search(r"^\Aabc\Z$", "abc", re.M).group(0), "abc") +- self.assertEqual(re.search(r"^\Aabc\Z$", "\nabc\n", re.M), None) ++ self.assertIsNone(re.search(r"^\Aabc\Z$", "\nabc\n", re.M)) + self.assertEqual(re.search(r"\b(b.)\b", + u"abcd abc bcd bx").group(1), "bx") + self.assertEqual(re.search(r"\B(b.)\B", + u"abc bcd bc abxd").group(1), "bx") + self.assertEqual(re.search(r"^abc$", u"\nabc\n", re.M).group(0), "abc") + self.assertEqual(re.search(r"^\Aabc\Z$", u"abc", re.M).group(0), "abc") +- self.assertEqual(re.search(r"^\Aabc\Z$", u"\nabc\n", re.M), None) ++ self.assertIsNone(re.search(r"^\Aabc\Z$", u"\nabc\n", re.M)) + self.assertEqual(re.search(r"\d\D\w\W\s\S", + "1aa! a").group(0), "1aa! a") + self.assertEqual(re.search(r"\d\D\w\W\s\S", + "1aa! a", re.LOCALE).group(0), "1aa! a") +- self.assertEqual(re.search(r"\d\D\w\W\s\S", +- "1aa! a", re.UNICODE).group(0), "1aa! a") ++ if have_unicode: ++ self.assertEqual(re.search(r"\d\D\w\W\s\S", ++ "1aa! a", re.UNICODE).group(0), "1aa! a") + + def test_string_boundaries(self): + # See http://bugs.python.org/issue10713 +@@ -409,10 +414,10 @@ + self.assertFalse(re.match(r"\B", "abc")) + # However, an empty string contains no word boundaries, and also no + # non-boundaries. +- self.assertEqual(re.search(r"\B", ""), None) ++ self.assertIsNone(re.search(r"\B", "")) + # This one is questionable and different from the perlre behaviour, + # but describes current behavior. +- self.assertEqual(re.search(r"\b", ""), None) ++ self.assertIsNone(re.search(r"\b", "")) + # A single word-character string has two boundaries, but no + # non-boundary gaps. + self.assertEqual(len(re.findall(r"\b", "a")), 2) +@@ -423,19 +428,20 @@ + # Can match around the whitespace. + self.assertEqual(len(re.findall(r"\B", " ")), 2) + ++ @requires_unicode + def test_bigcharset(self): +- self.assertEqual(re.match(u"([\u2222\u2223])", +- u"\u2222").group(1), u"\u2222") +- self.assertEqual(re.match(u"([\u2222\u2223])", +- u"\u2222", re.UNICODE).group(1), u"\u2222") ++ self.assertEqual(re.match(u(r"([\u2222\u2223])"), ++ unichr(0x2222)).group(1), unichr(0x2222)) ++ self.assertEqual(re.match(u(r"([\u2222\u2223])"), ++ unichr(0x2222), re.UNICODE).group(1), unichr(0x2222)) + r = u'[%s]' % u''.join(map(unichr, range(256, 2**16, 255))) +- self.assertEqual(re.match(r, u"\uff01", re.UNICODE).group(), u"\uff01") ++ self.assertEqual(re.match(r, unichr(0xff01), re.UNICODE).group(), unichr(0xff01)) + + def test_big_codesize(self): + # Issue #1160 + r = re.compile('|'.join(('%d'%x for x in range(10000)))) +- self.assertIsNotNone(r.match('1000')) +- self.assertIsNotNone(r.match('9999')) ++ self.assertTrue(r.match('1000')) ++ self.assertTrue(r.match('9999')) + + def test_anyall(self): + self.assertEqual(re.match("a.b", "a\nb", re.DOTALL).group(0), +@@ -443,7 +449,7 @@ + self.assertEqual(re.match("a.*b", "a\n\nb", re.DOTALL).group(0), + "a\n\nb") + +- def test_non_consuming(self): ++ def test_lookahead(self): + self.assertEqual(re.match("(a(?=\s[^a]))", "a b").group(1), "a") + self.assertEqual(re.match("(a(?=\s[^a]*))", "a b").group(1), "a") + self.assertEqual(re.match("(a(?=\s[abc]))", "a b").group(1), "a") +@@ -457,6 +463,42 @@ + self.assertEqual(re.match(r"(a)(?!\s\1)", "a b").group(1), "a") + self.assertEqual(re.match(r"(a)(?!\s(abc|a))", "a b").group(1), "a") + ++ # Group reference. ++ self.assertTrue(re.match(r'(a)b(?=\1)a', 'aba')) ++ self.assertIsNone(re.match(r'(a)b(?=\1)c', 'abac')) ++ # Conditional group reference. ++ self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) ++ self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(2)c|x))c', 'abc')) ++ self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) ++ self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(1)b|x))c', 'abc')) ++ self.assertTrue(re.match('(?:(a)|(x))b(?=(?(1)c|x))c', 'abc')) ++ # Group used before defined. ++ self.assertTrue(re.match('(a)b(?=(?(2)x|c))(c)', 'abc')) ++ self.assertIsNone(re.match('(a)b(?=(?(2)b|x))(c)', 'abc')) ++ self.assertTrue(re.match('(a)b(?=(?(1)c|x))(c)', 'abc')) ++ ++ def test_lookbehind(self): ++ self.assertTrue(re.match('ab(?<=b)c', 'abc')) ++ self.assertIsNone(re.match('ab(?<=c)c', 'abc')) ++ self.assertIsNone(re.match('ab(? 0xffff: ++ self.assertTrue(re.match(u(r'[\U00010428-\U0001044f]'), ++ u(r'\U00010428'), re.U | re.I)) ++ self.assertTrue(re.match(u(r'[\U00010428-\U0001044f]'), ++ u(r'\U00010400'), re.U | re.I)) ++ self.assertTrue(re.match(u(r'[\U00010400-\U00010427]'), ++ u(r'\U00010428'), re.U | re.I)) ++ self.assertTrue(re.match(u(r'[\U00010400-\U00010427]'), ++ u(r'\U00010400'), re.U | re.I)) ++ ++ assert u(r'\u212a').lower() == u'k' # 'K' ++ self.assertTrue(re.match(ur'[J-M]', u(r'\u212a'), re.U | re.I)) ++ self.assertTrue(re.match(ur'[j-m]', u(r'\u212a'), re.U | re.I)) ++ self.assertTrue(re.match(u(r'[\u2129-\u212b]'), u'K', re.U | re.I)) ++ self.assertTrue(re.match(u(r'[\u2129-\u212b]'), u'k', re.U | re.I)) ++ assert u(r'\u017f').upper() == u'S' # 'Å¿' ++ self.assertTrue(re.match(ur'[R-T]', u(r'\u017f'), re.U | re.I)) ++ self.assertTrue(re.match(ur'[r-t]', u(r'\u017f'), re.U | re.I)) ++ self.assertTrue(re.match(u(r'[\u017e-\u0180]'), u'S', re.U | re.I)) ++ self.assertTrue(re.match(u(r'[\u017e-\u0180]'), u's', re.U | re.I)) ++ + def test_category(self): + self.assertEqual(re.match(r"(\s)", " ").group(1), " ") + +@@ -476,7 +599,8 @@ + import _sre + self.assertEqual(_sre.getlower(ord('A'), 0), ord('a')) + self.assertEqual(_sre.getlower(ord('A'), re.LOCALE), ord('a')) +- self.assertEqual(_sre.getlower(ord('A'), re.UNICODE), ord('a')) ++ if have_unicode: ++ self.assertEqual(_sre.getlower(ord('A'), re.UNICODE), ord('a')) + + self.assertEqual(re.match("abc", "ABC", re.I).group(0), "ABC") + self.assertEqual(re.match("abc", u"ABC", re.I).group(0), "ABC") +@@ -503,8 +627,9 @@ + self.assertEqual(m.group(), match) + self.assertEqual(m.span(), span) + ++ @requires_unicode + def test_re_escape(self): +- alnum_chars = string.ascii_letters + string.digits ++ alnum_chars = unicode(string.ascii_letters + string.digits) + p = u''.join(unichr(i) for i in range(256)) + for c in p: + if c in alnum_chars: +@@ -517,7 +642,7 @@ + self.assertMatch(re.escape(p), p) + + def test_re_escape_byte(self): +- alnum_chars = (string.ascii_letters + string.digits).encode('ascii') ++ alnum_chars = string.ascii_letters + string.digits + p = ''.join(chr(i) for i in range(256)) + for b in p: + if b in alnum_chars: +@@ -529,20 +654,21 @@ + self.assertMatch(re.escape(b), b) + self.assertMatch(re.escape(p), p) + ++ @requires_unicode + def test_re_escape_non_ascii(self): +- s = u'xxx\u2620\u2620\u2620xxx' ++ s = u(r'xxx\u2620\u2620\u2620xxx') + s_escaped = re.escape(s) +- self.assertEqual(s_escaped, u'xxx\\\u2620\\\u2620\\\u2620xxx') ++ self.assertEqual(s_escaped, u(r'xxx\\\u2620\\\u2620\\\u2620xxx')) + self.assertMatch(s_escaped, s) +- self.assertMatch(u'.%s+.' % re.escape(u'\u2620'), s, +- u'x\u2620\u2620\u2620x', (2, 7), re.search) ++ self.assertMatch(u'.%s+.' % re.escape(unichr(0x2620)), s, ++ u(r'x\u2620\u2620\u2620x'), (2, 7), re.search) + + def test_re_escape_non_ascii_bytes(self): +- b = u'y\u2620y\u2620y'.encode('utf-8') ++ b = b'y\xe2\x98\xa0y\xe2\x98\xa0y' + b_escaped = re.escape(b) + self.assertEqual(b_escaped, b'y\\\xe2\\\x98\\\xa0y\\\xe2\\\x98\\\xa0y') + self.assertMatch(b_escaped, b) +- res = re.findall(re.escape(u'\u2620'.encode('utf-8')), b) ++ res = re.findall(re.escape(b'\xe2\x98\xa0'), b) + self.assertEqual(len(res), 2) + + def test_pickling(self): +@@ -553,12 +679,15 @@ + # old pickles expect the _compile() reconstructor in sre module + import_module("sre", deprecated=True) + from sre import _compile ++ # current pickle expects the _compile() reconstructor in re module ++ from re import _compile + + def pickle_test(self, pickle): + oldpat = re.compile('a(?:b|(c|e){1,2}?|d)+?(.)') +- s = pickle.dumps(oldpat) +- newpat = pickle.loads(s) +- self.assertEqual(oldpat, newpat) ++ for proto in range(pickle.HIGHEST_PROTOCOL + 1): ++ pickled = pickle.dumps(oldpat, proto) ++ newpat = pickle.loads(pickled) ++ self.assertEqual(newpat, oldpat) + + def test_constants(self): + self.assertEqual(re.I, re.IGNORECASE) +@@ -569,26 +698,26 @@ + + def test_flags(self): + for flag in [re.I, re.M, re.X, re.S, re.L]: +- self.assertNotEqual(re.compile('^pattern$', flag), None) ++ self.assertTrue(re.compile('^pattern$', flag)) + + def test_sre_character_literals(self): + for i in [0, 8, 16, 32, 64, 127, 128, 255]: +- self.assertNotEqual(re.match(r"\%03o" % i, chr(i)), None) +- self.assertNotEqual(re.match(r"\%03o0" % i, chr(i)+"0"), None) +- self.assertNotEqual(re.match(r"\%03o8" % i, chr(i)+"8"), None) +- self.assertNotEqual(re.match(r"\x%02x" % i, chr(i)), None) +- self.assertNotEqual(re.match(r"\x%02x0" % i, chr(i)+"0"), None) +- self.assertNotEqual(re.match(r"\x%02xz" % i, chr(i)+"z"), None) ++ self.assertTrue(re.match(r"\%03o" % i, chr(i))) ++ self.assertTrue(re.match(r"\%03o0" % i, chr(i)+"0")) ++ self.assertTrue(re.match(r"\%03o8" % i, chr(i)+"8")) ++ self.assertTrue(re.match(r"\x%02x" % i, chr(i))) ++ self.assertTrue(re.match(r"\x%02x0" % i, chr(i)+"0")) ++ self.assertTrue(re.match(r"\x%02xz" % i, chr(i)+"z")) + self.assertRaises(re.error, re.match, "\911", "") + + def test_sre_character_class_literals(self): + for i in [0, 8, 16, 32, 64, 127, 128, 255]: +- self.assertNotEqual(re.match(r"[\%03o]" % i, chr(i)), None) +- self.assertNotEqual(re.match(r"[\%03o0]" % i, chr(i)), None) +- self.assertNotEqual(re.match(r"[\%03o8]" % i, chr(i)), None) +- self.assertNotEqual(re.match(r"[\x%02x]" % i, chr(i)), None) +- self.assertNotEqual(re.match(r"[\x%02x0]" % i, chr(i)), None) +- self.assertNotEqual(re.match(r"[\x%02xz]" % i, chr(i)), None) ++ self.assertTrue(re.match(r"[\%03o]" % i, chr(i))) ++ self.assertTrue(re.match(r"[\%03o0]" % i, chr(i))) ++ self.assertTrue(re.match(r"[\%03o8]" % i, chr(i))) ++ self.assertTrue(re.match(r"[\x%02x]" % i, chr(i))) ++ self.assertTrue(re.match(r"[\x%02x0]" % i, chr(i))) ++ self.assertTrue(re.match(r"[\x%02xz]" % i, chr(i))) + self.assertRaises(re.error, re.match, "[\911]", "") + + def test_bug_113254(self): +@@ -598,7 +727,7 @@ + + def test_bug_527371(self): + # bug described in patches 527371/672491 +- self.assertEqual(re.match(r'(a)?a','a').lastindex, None) ++ self.assertIsNone(re.match(r'(a)?a','a').lastindex) + self.assertEqual(re.match(r'(a)(b)?b','ab').lastindex, 1) + self.assertEqual(re.match(r'(?Pa)(?Pb)?b','ab').lastgroup, 'a') + self.assertEqual(re.match("(?Pa(b))", "ab").lastgroup, 'a') +@@ -621,8 +750,9 @@ + # non-recursive scheme was implemented. + self.assertEqual(re.search('(a|b)*?c', 10000*'ab'+'cd').end(0), 20001) + ++ @requires_unicode + def test_bug_612074(self): +- pat=u"["+re.escape(u"\u2039")+u"]" ++ pat=u"["+re.escape(unichr(0x2039))+u"]" + self.assertEqual(re.compile(pat) and 1, 1) + + def test_stack_overflow(self): +@@ -655,7 +785,7 @@ + (r"\s+", None), + ]) + +- self.assertNotEqual(scanner.scanner.scanner("").pattern, None) ++ self.assertTrue(scanner.scanner.scanner("").pattern) + + self.assertEqual(scanner.scan("sum = 3*foo + 312.50 + bar"), + (['sum', 'op=', 3, 'op*', 'foo', 'op+', 312.5, +@@ -696,35 +826,26 @@ + self.assertEqual(re.match('(a)((?!(b)*))*', 'abb').groups(), + ('a', None, None)) + ++ @requires_unicode + def test_bug_764548(self): + # bug 764548, re.compile() barfs on str/unicode subclasses +- try: +- unicode +- except NameError: +- self.skipTest('no problem if we have no unicode') + class my_unicode(unicode): pass + pat = re.compile(my_unicode("abc")) +- self.assertEqual(pat.match("xyz"), None) ++ self.assertIsNone(pat.match("xyz")) + + def test_finditer(self): + iter = re.finditer(r":+", "a:b::c:::d") + self.assertEqual([item.group(0) for item in iter], + [":", "::", ":::"]) + ++ @requires_unicode + def test_bug_926075(self): +- try: +- unicode +- except NameError: +- self.skipTest('no problem if we have no unicode') +- self.assertTrue(re.compile('bug_926075') is not +- re.compile(eval("u'bug_926075'"))) ++ self.assertIsNot(re.compile('bug_926075'), ++ re.compile(u'bug_926075')) + ++ @requires_unicode + def test_bug_931848(self): +- try: +- unicode +- except NameError: +- self.skipTest('no problem if we have no unicode') +- pattern = eval('u"[\u002E\u3002\uFF0E\uFF61]"') ++ pattern = u(r"[\u002E\u3002\uFF0E\uFF61]") + self.assertEqual(re.compile(pattern).split("a.b.c"), + ['a','b','c']) + +@@ -735,7 +856,7 @@ + + scanner = re.compile(r"\s").scanner("a b") + self.assertEqual(scanner.search().span(), (1, 2)) +- self.assertEqual(scanner.search(), None) ++ self.assertIsNone(scanner.search()) + + def test_bug_817234(self): + iter = re.finditer(r".*", "asdf") +@@ -743,23 +864,24 @@ + self.assertEqual(iter.next().span(), (4, 4)) + self.assertRaises(StopIteration, iter.next) + ++ @requires_unicode + def test_bug_6561(self): + # '\d' should match characters in Unicode category 'Nd' + # (Number, Decimal Digit), but not those in 'Nl' (Number, + # Letter) or 'No' (Number, Other). + decimal_digits = [ +- u'\u0037', # '\N{DIGIT SEVEN}', category 'Nd' +- u'\u0e58', # '\N{THAI DIGIT SIX}', category 'Nd' +- u'\uff10', # '\N{FULLWIDTH DIGIT ZERO}', category 'Nd' ++ unichr(0x0037), # '\N{DIGIT SEVEN}', category 'Nd' ++ unichr(0x0e58), # '\N{THAI DIGIT SIX}', category 'Nd' ++ unichr(0xff10), # '\N{FULLWIDTH DIGIT ZERO}', category 'Nd' + ] + for x in decimal_digits: + self.assertEqual(re.match('^\d$', x, re.UNICODE).group(0), x) + + not_decimal_digits = [ +- u'\u2165', # '\N{ROMAN NUMERAL SIX}', category 'Nl' +- u'\u3039', # '\N{HANGZHOU NUMERAL TWENTY}', category 'Nl' +- u'\u2082', # '\N{SUBSCRIPT TWO}', category 'No' +- u'\u32b4', # '\N{CIRCLED NUMBER THIRTY NINE}', category 'No' ++ unichr(0x2165), # '\N{ROMAN NUMERAL SIX}', category 'Nl' ++ unichr(0x3039), # '\N{HANGZHOU NUMERAL TWENTY}', category 'Nl' ++ unichr(0x2082), # '\N{SUBSCRIPT TWO}', category 'No' ++ unichr(0x32b4), # '\N{CIRCLED NUMBER THIRTY NINE}', category 'No' + ] + for x in not_decimal_digits: + self.assertIsNone(re.match('^\d$', x, re.UNICODE)) +@@ -767,11 +889,15 @@ + def test_empty_array(self): + # SF buf 1647541 + import array +- for typecode in 'cbBuhHiIlLfd': ++ typecodes = 'cbBhHiIlLfd' ++ if have_unicode: ++ typecodes += 'u' ++ for typecode in typecodes: + a = array.array(typecode) +- self.assertEqual(re.compile("bla").match(a), None) ++ self.assertIsNone(re.compile("bla").match(a)) + self.assertEqual(re.compile("").match(a).groups(), ()) + ++ @requires_unicode + def test_inline_flags(self): + # Bug #1700 + upper_char = unichr(0x1ea0) # Latin Capital Letter A with Dot Bellow +@@ -779,27 +905,27 @@ + + p = re.compile(upper_char, re.I | re.U) + q = p.match(lower_char) +- self.assertNotEqual(q, None) ++ self.assertTrue(q) + + p = re.compile(lower_char, re.I | re.U) + q = p.match(upper_char) +- self.assertNotEqual(q, None) ++ self.assertTrue(q) + + p = re.compile('(?i)' + upper_char, re.U) + q = p.match(lower_char) +- self.assertNotEqual(q, None) ++ self.assertTrue(q) + + p = re.compile('(?i)' + lower_char, re.U) + q = p.match(upper_char) +- self.assertNotEqual(q, None) ++ self.assertTrue(q) + + p = re.compile('(?iu)' + upper_char) + q = p.match(lower_char) +- self.assertNotEqual(q, None) ++ self.assertTrue(q) + + p = re.compile('(?iu)' + lower_char) + q = p.match(upper_char) +- self.assertNotEqual(q, None) ++ self.assertTrue(q) + + def test_dollar_matches_twice(self): + "$ matches the end of string, and just before the terminating \n" +@@ -906,9 +1032,10 @@ + pattern = '.' + reps + mod + 'yz' + self.assertEqual(re.compile(pattern, re.S).findall('xyz'), + ['xyz'], msg=pattern) +- pattern = pattern.encode() +- self.assertEqual(re.compile(pattern, re.S).findall(b'xyz'), +- [b'xyz'], msg=pattern) ++ if have_unicode: ++ pattern = unicode(pattern) ++ self.assertEqual(re.compile(pattern, re.S).findall(u'xyz'), ++ [u'xyz'], msg=pattern) + + + def test_bug_2537(self): +@@ -922,16 +1049,33 @@ + self.assertEqual(m.group(2), "y") + + def test_debug_flag(self): ++ pat = r'(\.)(?:[ch]|py)(?(1)$|: )' + with captured_stdout() as out: +- re.compile('foo', re.DEBUG) +- self.assertEqual(out.getvalue().splitlines(), +- ['literal 102', 'literal 111', 'literal 111']) ++ re.compile(pat, re.DEBUG) ++ dump = '''\ ++subpattern 1 ++ literal 46 ++subpattern None ++ branch ++ in ++ literal 99 ++ literal 104 ++ or ++ literal 112 ++ literal 121 ++subpattern None ++ groupref_exists 1 ++ at at_end ++ else ++ literal 58 ++ literal 32 ++''' ++ self.assertEqual(out.getvalue(), dump) + # Debug output is output again even a second time (bypassing + # the cache -- issue #20426). + with captured_stdout() as out: +- re.compile('foo', re.DEBUG) +- self.assertEqual(out.getvalue().splitlines(), +- ['literal 102', 'literal 111', 'literal 111']) ++ re.compile(pat, re.DEBUG) ++ self.assertEqual(out.getvalue(), dump) + + def test_keyword_parameters(self): + # Issue #20283: Accepting the string keyword parameter. +@@ -946,6 +1090,46 @@ + pat.split(string='abracadabra', maxsplit=1), + ['', 'ab', 'racadabra']) + ++ def test_match_group_takes_long(self): ++ self.assertEqual(re.match("(foo)", "foo").group(1L), "foo") ++ self.assertRaises(IndexError, re.match("", "").group, sys.maxint + 1) ++ ++ def test_locale_caching(self): ++ # Issue #22410 ++ oldlocale = locale.setlocale(locale.LC_CTYPE) ++ self.addCleanup(locale.setlocale, locale.LC_CTYPE, oldlocale) ++ for loc in 'en_US.iso88591', 'en_US.utf8': ++ try: ++ locale.setlocale(locale.LC_CTYPE, loc) ++ except locale.Error: ++ # Unsupported locale on this system ++ self.skipTest('test needs %s locale' % loc) ++ ++ re.purge() ++ self.check_en_US_iso88591() ++ self.check_en_US_utf8() ++ re.purge() ++ self.check_en_US_utf8() ++ self.check_en_US_iso88591() ++ ++ def check_en_US_iso88591(self): ++ locale.setlocale(locale.LC_CTYPE, 'en_US.iso88591') ++ self.assertTrue(re.match(b'\xc5\xe5', b'\xc5\xe5', re.L|re.I)) ++ self.assertTrue(re.match(b'\xc5', b'\xe5', re.L|re.I)) ++ self.assertTrue(re.match(b'\xe5', b'\xc5', re.L|re.I)) ++ self.assertTrue(re.match(b'(?Li)\xc5\xe5', b'\xc5\xe5')) ++ self.assertTrue(re.match(b'(?Li)\xc5', b'\xe5')) ++ self.assertTrue(re.match(b'(?Li)\xe5', b'\xc5')) ++ ++ def check_en_US_utf8(self): ++ locale.setlocale(locale.LC_CTYPE, 'en_US.utf8') ++ self.assertTrue(re.match(b'\xc5\xe5', b'\xc5\xe5', re.L|re.I)) ++ self.assertIsNone(re.match(b'\xc5', b'\xe5', re.L|re.I)) ++ self.assertIsNone(re.match(b'\xe5', b'\xc5', re.L|re.I)) ++ self.assertTrue(re.match(b'(?Li)\xc5\xe5', b'\xc5\xe5')) ++ self.assertIsNone(re.match(b'(?Li)\xc5', b'\xe5')) ++ self.assertIsNone(re.match(b'(?Li)\xe5', b'\xc5')) ++ + + def run_re_tests(): + from test.re_tests import tests, SUCCEED, FAIL, SYNTAX_ERROR +diff -r ee879c0ffa11 Lib/test/test_readline.py +--- a/Lib/test/test_readline.py ++++ b/Lib/test/test_readline.py +@@ -1,17 +1,19 @@ + """ + Very minimal unittests for parts of the readline module. +- +-These tests were added to check that the libedit emulation on OSX and +-the "real" readline have the same interface for history manipulation. That's +-why the tests cover only a small subset of the interface. + """ ++import os + import unittest + from test.test_support import run_unittest, import_module ++from test.script_helper import assert_python_ok + + # Skip tests if there is no readline module + readline = import_module('readline') + + class TestHistoryManipulation (unittest.TestCase): ++ """These tests were added to check that the libedit emulation on OSX and ++ the "real" readline have the same interface for history manipulation. ++ That's why the tests cover only a small subset of the interface. ++ """ + + @unittest.skipIf(not hasattr(readline, 'clear_history'), + "The history update test cannot be run because the " +@@ -40,8 +42,22 @@ + self.assertEqual(readline.get_current_history_length(), 1) + + ++class TestReadline(unittest.TestCase): ++ ++ @unittest.skipIf(readline._READLINE_VERSION < 0x0600 ++ and "libedit" not in readline.__doc__, ++ "not supported in this library version") ++ def test_init(self): ++ # Issue #19884: Ensure that the ANSI sequence "\033[1034h" is not ++ # written into stdout when the readline module is imported and stdout ++ # is redirected to a pipe. ++ rc, stdout, stderr = assert_python_ok('-c', 'import readline', ++ TERM='xterm-256color') ++ self.assertEqual(stdout, b'') ++ ++ + def test_main(): +- run_unittest(TestHistoryManipulation) ++ run_unittest(TestHistoryManipulation, TestReadline) + + if __name__ == "__main__": + test_main() +diff -r ee879c0ffa11 Lib/test/test_smtplib.py +--- a/Lib/test/test_smtplib.py ++++ b/Lib/test/test_smtplib.py +@@ -507,6 +507,21 @@ + #TODO: add tests for correct AUTH method fallback now that the + #test infrastructure can support it. + ++ def test_quit_resets_greeting(self): ++ smtp = smtplib.SMTP(HOST, self.port, ++ local_hostname='localhost', ++ timeout=15) ++ code, message = smtp.ehlo() ++ self.assertEqual(code, 250) ++ self.assertIn('size', smtp.esmtp_features) ++ smtp.quit() ++ self.assertNotIn('size', smtp.esmtp_features) ++ smtp.connect(HOST, self.port) ++ self.assertNotIn('size', smtp.esmtp_features) ++ smtp.ehlo_or_helo_if_needed() ++ self.assertIn('size', smtp.esmtp_features) ++ smtp.quit() ++ + + def test_main(verbose=None): + test_support.run_unittest(GeneralTests, DebuggingServerTests, +diff -r ee879c0ffa11 Lib/test/test_socket.py +--- a/Lib/test/test_socket.py ++++ b/Lib/test/test_socket.py +@@ -2,6 +2,7 @@ + from test import test_support + + import errno ++import itertools + import socket + import select + import time +@@ -11,9 +12,14 @@ + import os + import array + import contextlib +-from weakref import proxy + import signal + import math ++import weakref ++try: ++ import _socket ++except ImportError: ++ _socket = None ++ + + def try_address(host, port=0, family=socket.AF_INET): + """Try to bind a socket on the given host:port and return True +@@ -243,9 +249,22 @@ + + class GeneralModuleTests(unittest.TestCase): + ++ @unittest.skipUnless(_socket is not None, 'need _socket module') ++ def test_csocket_repr(self): ++ s = _socket.socket(_socket.AF_INET, _socket.SOCK_STREAM) ++ try: ++ expected = ('' ++ % (s.fileno(), s.family, s.type, s.proto)) ++ self.assertEqual(repr(s), expected) ++ finally: ++ s.close() ++ expected = ('' ++ % (s.family, s.type, s.proto)) ++ self.assertEqual(repr(s), expected) ++ + def test_weakref(self): + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +- p = proxy(s) ++ p = weakref.proxy(s) + self.assertEqual(p.fileno(), s.fileno()) + s.close() + s = None +@@ -256,6 +275,14 @@ + else: + self.fail('Socket proxy still exists') + ++ def test_weakref__sock(self): ++ s = socket.socket()._sock ++ w = weakref.ref(s) ++ self.assertIs(w(), s) ++ del s ++ test_support.gc_collect() ++ self.assertIsNone(w()) ++ + def testSocketError(self): + # Testing socket module exceptions + def raise_error(*args, **kwargs): +@@ -600,17 +627,24 @@ + sock.close() + + def test_getsockaddrarg(self): +- host = '0.0.0.0' +- port = self._get_unused_port(bind_address=host) ++ sock = socket.socket() ++ self.addCleanup(sock.close) ++ port = test_support.find_unused_port() + big_port = port + 65536 + neg_port = port - 65536 +- sock = socket.socket() +- try: +- self.assertRaises(OverflowError, sock.bind, (host, big_port)) +- self.assertRaises(OverflowError, sock.bind, (host, neg_port)) +- sock.bind((host, port)) +- finally: +- sock.close() ++ self.assertRaises(OverflowError, sock.bind, (HOST, big_port)) ++ self.assertRaises(OverflowError, sock.bind, (HOST, neg_port)) ++ # Since find_unused_port() is inherently subject to race conditions, we ++ # call it a couple times if necessary. ++ for i in itertools.count(): ++ port = test_support.find_unused_port() ++ try: ++ sock.bind((HOST, port)) ++ except OSError as e: ++ if e.errno != errno.EADDRINUSE or i == 5: ++ raise ++ else: ++ break + + @unittest.skipUnless(os.name == "nt", "Windows specific") + def test_sock_ioctl(self): +diff -r ee879c0ffa11 Lib/test/test_socketserver.py +--- a/Lib/test/test_socketserver.py ++++ b/Lib/test/test_socketserver.py +@@ -314,6 +314,16 @@ + for t, s in threads: + t.join() + ++ def test_tcpserver_bind_leak(self): ++ # Issue #22435: the server socket wouldn't be closed if bind()/listen() ++ # failed. ++ # Create many servers for which bind() will fail, to see if this result ++ # in FD exhaustion. ++ for i in range(1024): ++ with self.assertRaises(OverflowError): ++ SocketServer.TCPServer((HOST, -1), ++ SocketServer.StreamRequestHandler) ++ + + def test_main(): + if imp.lock_held(): +diff -r ee879c0ffa11 Lib/test/test_ssl.py +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -1,35 +1,78 @@ ++# -*- coding: utf-8 -*- + # Test the support for SSL and sockets + + import sys + import unittest +-from test import test_support ++from test import test_support as support + import asyncore + import socket + import select + import time ++import datetime + import gc + import os + import errno + import pprint +-import urllib, urlparse ++import tempfile ++import urllib + import traceback + import weakref ++import platform + import functools +-import platform ++from contextlib import closing + +-from BaseHTTPServer import HTTPServer +-from SimpleHTTPServer import SimpleHTTPRequestHandler ++ssl = support.import_module("ssl") + +-ssl = test_support.import_module("ssl") ++PROTOCOLS = sorted(ssl._PROTOCOL_NAMES) ++HOST = support.HOST + +-HOST = test_support.HOST +-CERTFILE = None +-SVN_PYTHON_ORG_ROOT_CERT = None +-NULLBYTECERT = None ++def data_file(*name): ++ return os.path.join(os.path.dirname(__file__), *name) ++ ++# The custom key and certificate files used in test_ssl are generated ++# using Lib/test/make_ssl_certs.py. ++# Other certificates are simply fetched from the Internet servers they ++# are meant to authenticate. ++ ++CERTFILE = data_file("keycert.pem") ++BYTES_CERTFILE = CERTFILE.encode(sys.getfilesystemencoding()) ++ONLYCERT = data_file("ssl_cert.pem") ++ONLYKEY = data_file("ssl_key.pem") ++BYTES_ONLYCERT = ONLYCERT.encode(sys.getfilesystemencoding()) ++BYTES_ONLYKEY = ONLYKEY.encode(sys.getfilesystemencoding()) ++CERTFILE_PROTECTED = data_file("keycert.passwd.pem") ++ONLYKEY_PROTECTED = data_file("ssl_key.passwd.pem") ++KEY_PASSWORD = "somepass" ++CAPATH = data_file("capath") ++BYTES_CAPATH = CAPATH.encode(sys.getfilesystemencoding()) ++CAFILE_NEURONIO = data_file("capath", "4e1295a3.0") ++CAFILE_CACERT = data_file("capath", "5ed36f99.0") ++ ++ ++# empty CRL ++CRLFILE = data_file("revocation.crl") ++ ++# Two keys and certs signed by the same CA (for SNI tests) ++SIGNED_CERTFILE = data_file("keycert3.pem") ++SIGNED_CERTFILE2 = data_file("keycert4.pem") ++SIGNING_CA = data_file("pycacert.pem") ++ ++SVN_PYTHON_ORG_ROOT_CERT = data_file("https_svn_python_org_root.pem") ++ ++EMPTYCERT = data_file("nullcert.pem") ++BADCERT = data_file("badcert.pem") ++WRONGCERT = data_file("XXXnonexisting.pem") ++BADKEY = data_file("badkey.pem") ++NOKIACERT = data_file("nokia.pem") ++NULLBYTECERT = data_file("nullbytecert.pem") ++ ++DHFILE = data_file("dh512.pem") ++BYTES_DHFILE = DHFILE.encode(sys.getfilesystemencoding()) ++ + + def handle_error(prefix): + exc_format = ' '.join(traceback.format_exception(*sys.exc_info())) +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write(prefix + exc_format) + + +@@ -52,47 +95,77 @@ + else: + raise + ++ ++def can_clear_options(): ++ # 0.9.8m or higher ++ return ssl._OPENSSL_API_VERSION >= (0, 9, 8, 13, 15) ++ ++def no_sslv2_implies_sslv3_hello(): ++ # 0.9.7h or higher ++ return ssl.OPENSSL_VERSION_INFO >= (0, 9, 7, 8, 15) ++ ++def have_verify_flags(): ++ # 0.9.8 or higher ++ return ssl.OPENSSL_VERSION_INFO >= (0, 9, 8, 0, 15) ++ ++def utc_offset(): #NOTE: ignore issues like #1647654 ++ # local time = utc time + utc offset ++ if time.daylight and time.localtime().tm_isdst > 0: ++ return -time.altzone # seconds ++ return -time.timezone ++ ++def asn1time(cert_time): ++ # Some versions of OpenSSL ignore seconds, see #18207 ++ # 0.9.8.i ++ if ssl._OPENSSL_API_VERSION == (0, 9, 8, 9, 15): ++ fmt = "%b %d %H:%M:%S %Y GMT" ++ dt = datetime.datetime.strptime(cert_time, fmt) ++ dt = dt.replace(second=0) ++ cert_time = dt.strftime(fmt) ++ # %d adds leading zero but ASN1_TIME_print() uses leading space ++ if cert_time[4] == "0": ++ cert_time = cert_time[:4] + " " + cert_time[5:] ++ ++ return cert_time ++ + # Issue #9415: Ubuntu hijacks their OpenSSL and forcefully disables SSLv2 + def skip_if_broken_ubuntu_ssl(func): + if hasattr(ssl, 'PROTOCOL_SSLv2'): +- # We need to access the lower-level wrapper in order to create an +- # implicit SSL context without trying to connect or listen. +- try: +- import _ssl +- except ImportError: +- # The returned function won't get executed, just ignore the error +- pass + @functools.wraps(func) + def f(*args, **kwargs): + try: +- s = socket.socket(socket.AF_INET) +- _ssl.sslwrap(s._sock, 0, None, None, +- ssl.CERT_NONE, ssl.PROTOCOL_SSLv2, None, None) +- except ssl.SSLError as e: ++ ssl.SSLContext(ssl.PROTOCOL_SSLv2) ++ except ssl.SSLError: + if (ssl.OPENSSL_VERSION_INFO == (0, 9, 8, 15, 15) and +- platform.linux_distribution() == ('debian', 'squeeze/sid', '') +- and 'Invalid SSL protocol variant specified' in str(e)): ++ platform.linux_distribution() == ('debian', 'squeeze/sid', '')): + raise unittest.SkipTest("Patched Ubuntu OpenSSL breaks behaviour") + return func(*args, **kwargs) + return f + else: + return func + ++needs_sni = unittest.skipUnless(ssl.HAS_SNI, "SNI support needed for this test") ++ + + class BasicSocketTests(unittest.TestCase): + + def test_constants(self): +- #ssl.PROTOCOL_SSLv2 +- ssl.PROTOCOL_SSLv23 +- ssl.PROTOCOL_SSLv3 +- ssl.PROTOCOL_TLSv1 + ssl.CERT_NONE + ssl.CERT_OPTIONAL + ssl.CERT_REQUIRED ++ ssl.OP_CIPHER_SERVER_PREFERENCE ++ ssl.OP_SINGLE_DH_USE ++ if ssl.HAS_ECDH: ++ ssl.OP_SINGLE_ECDH_USE ++ if ssl.OPENSSL_VERSION_INFO >= (1, 0): ++ ssl.OP_NO_COMPRESSION ++ self.assertIn(ssl.HAS_SNI, {True, False}) ++ self.assertIn(ssl.HAS_ECDH, {True, False}) ++ + + def test_random(self): + v = ssl.RAND_status() +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n RAND_status is %d (%s)\n" + % (v, (v and "sufficient randomness") or + "insufficient randomness")) +@@ -104,9 +177,19 @@ + # note that this uses an 'unofficial' function in _ssl.c, + # provided solely for this test, to exercise the certificate + # parsing code +- p = ssl._ssl._test_decode_cert(CERTFILE, False) +- if test_support.verbose: ++ p = ssl._ssl._test_decode_cert(CERTFILE) ++ if support.verbose: + sys.stdout.write("\n" + pprint.pformat(p) + "\n") ++ self.assertEqual(p['issuer'], ++ ((('countryName', 'XY'),), ++ (('localityName', 'Castle Anthrax'),), ++ (('organizationName', 'Python Software Foundation'),), ++ (('commonName', 'localhost'),)) ++ ) ++ # Note the next three asserts will fail if the keys are regenerated ++ self.assertEqual(p['notAfter'], asn1time('Oct 5 23:01:56 2020 GMT')) ++ self.assertEqual(p['notBefore'], asn1time('Oct 8 23:01:56 2010 GMT')) ++ self.assertEqual(p['serialNumber'], 'D7C7381919AFC24E') + self.assertEqual(p['subject'], + ((('countryName', 'XY'),), + (('localityName', 'Castle Anthrax'),), +@@ -117,16 +200,22 @@ + # Issue #13034: the subjectAltName in some certificates + # (notably projects.developer.nokia.com:443) wasn't parsed + p = ssl._ssl._test_decode_cert(NOKIACERT) +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n" + pprint.pformat(p) + "\n") + self.assertEqual(p['subjectAltName'], + (('DNS', 'projects.developer.nokia.com'), + ('DNS', 'projects.forum.nokia.com')) + ) ++ # extra OCSP and AIA fields ++ self.assertEqual(p['OCSP'], ('http://ocsp.verisign.com',)) ++ self.assertEqual(p['caIssuers'], ++ ('http://SVRIntl-G3-aia.verisign.com/SVRIntlG3.cer',)) ++ self.assertEqual(p['crlDistributionPoints'], ++ ('http://SVRIntl-G3-crl.verisign.com/SVRIntlG3.crl',)) + + def test_parse_cert_CVE_2013_4238(self): + p = ssl._ssl._test_decode_cert(NULLBYTECERT) +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n" + pprint.pformat(p) + "\n") + subject = ((('countryName', 'US'),), + (('stateOrProvinceName', 'Oregon'),), +@@ -137,7 +226,7 @@ + (('emailAddress', 'python-dev@python.org'),)) + self.assertEqual(p['subject'], subject) + self.assertEqual(p['issuer'], subject) +- if ssl.OPENSSL_VERSION_INFO >= (0, 9, 8): ++ if ssl._OPENSSL_API_VERSION >= (0, 9, 8): + san = (('DNS', 'altnull.python.org\x00example.com'), + ('email', 'null@python.org\x00user@example.org'), + ('URI', 'http://null.python.org\x00http://example.org'), +@@ -175,11 +264,11 @@ + # Some sanity checks follow + # >= 0.9 + self.assertGreaterEqual(n, 0x900000) +- # < 2.0 +- self.assertLess(n, 0x20000000) ++ # < 3.0 ++ self.assertLess(n, 0x30000000) + major, minor, fix, patch, status = t + self.assertGreaterEqual(major, 0) +- self.assertLess(major, 2) ++ self.assertLess(major, 3) + self.assertGreaterEqual(minor, 0) + self.assertLess(minor, 256) + self.assertGreaterEqual(fix, 0) +@@ -188,28 +277,15 @@ + self.assertLessEqual(patch, 26) + self.assertGreaterEqual(status, 0) + self.assertLessEqual(status, 15) +- # Version string as returned by OpenSSL, the format might change +- self.assertTrue(s.startswith("OpenSSL {:d}.{:d}.{:d}".format(major, minor, fix)), +- (s, t)) ++ # Version string as returned by {Open,Libre}SSL, the format might change ++ if "LibreSSL" in s: ++ self.assertTrue(s.startswith("LibreSSL {:d}.{:d}".format(major, minor)), ++ (s, t)) ++ else: ++ self.assertTrue(s.startswith("OpenSSL {:d}.{:d}.{:d}".format(major, minor, fix)), ++ (s, t)) + +- @test_support.requires_resource('network') +- def test_ciphers(self): +- remote = ("svn.python.org", 443) +- with test_support.transient_internet(remote[0]): +- s = ssl.wrap_socket(socket.socket(socket.AF_INET), +- cert_reqs=ssl.CERT_NONE, ciphers="ALL") +- s.connect(remote) +- s = ssl.wrap_socket(socket.socket(socket.AF_INET), +- cert_reqs=ssl.CERT_NONE, ciphers="DEFAULT") +- s.connect(remote) +- # Error checking occurs when connecting, because the SSL context +- # isn't created before. +- s = ssl.wrap_socket(socket.socket(socket.AF_INET), +- cert_reqs=ssl.CERT_NONE, ciphers="^$:,;?*'dorothyx") +- with self.assertRaisesRegexp(ssl.SSLError, "No cipher can be selected"): +- s.connect(remote) +- +- @test_support.cpython_only ++ @support.cpython_only + def test_refcycle(self): + # Issue #7943: an SSL object doesn't create reference cycles with + # itself. +@@ -220,17 +296,319 @@ + self.assertEqual(wr(), None) + + def test_wrapped_unconnected(self): +- # The _delegate_methods in socket.py are correctly delegated to by an +- # unconnected SSLSocket, so they will raise a socket.error rather than +- # something unexpected like TypeError. ++ # Methods on an unconnected SSLSocket propagate the original ++ # socket.error raise by the underlying socket object. + s = socket.socket(socket.AF_INET) +- ss = ssl.wrap_socket(s) +- self.assertRaises(socket.error, ss.recv, 1) +- self.assertRaises(socket.error, ss.recv_into, bytearray(b'x')) +- self.assertRaises(socket.error, ss.recvfrom, 1) +- self.assertRaises(socket.error, ss.recvfrom_into, bytearray(b'x'), 1) +- self.assertRaises(socket.error, ss.send, b'x') +- self.assertRaises(socket.error, ss.sendto, b'x', ('0.0.0.0', 0)) ++ with closing(ssl.wrap_socket(s)) as ss: ++ self.assertRaises(socket.error, ss.recv, 1) ++ self.assertRaises(socket.error, ss.recv_into, bytearray(b'x')) ++ self.assertRaises(socket.error, ss.recvfrom, 1) ++ self.assertRaises(socket.error, ss.recvfrom_into, bytearray(b'x'), 1) ++ self.assertRaises(socket.error, ss.send, b'x') ++ self.assertRaises(socket.error, ss.sendto, b'x', ('0.0.0.0', 0)) ++ ++ def test_timeout(self): ++ # Issue #8524: when creating an SSL socket, the timeout of the ++ # original socket should be retained. ++ for timeout in (None, 0.0, 5.0): ++ s = socket.socket(socket.AF_INET) ++ s.settimeout(timeout) ++ with closing(ssl.wrap_socket(s)) as ss: ++ self.assertEqual(timeout, ss.gettimeout()) ++ ++ def test_errors(self): ++ sock = socket.socket() ++ self.assertRaisesRegexp(ValueError, ++ "certfile must be specified", ++ ssl.wrap_socket, sock, keyfile=CERTFILE) ++ self.assertRaisesRegexp(ValueError, ++ "certfile must be specified for server-side operations", ++ ssl.wrap_socket, sock, server_side=True) ++ self.assertRaisesRegexp(ValueError, ++ "certfile must be specified for server-side operations", ++ ssl.wrap_socket, sock, server_side=True, certfile="") ++ with closing(ssl.wrap_socket(sock, server_side=True, certfile=CERTFILE)) as s: ++ self.assertRaisesRegexp(ValueError, "can't connect in server-side mode", ++ s.connect, (HOST, 8080)) ++ with self.assertRaises(IOError) as cm: ++ with closing(socket.socket()) as sock: ++ ssl.wrap_socket(sock, certfile=WRONGCERT) ++ self.assertEqual(cm.exception.errno, errno.ENOENT) ++ with self.assertRaises(IOError) as cm: ++ with closing(socket.socket()) as sock: ++ ssl.wrap_socket(sock, certfile=CERTFILE, keyfile=WRONGCERT) ++ self.assertEqual(cm.exception.errno, errno.ENOENT) ++ with self.assertRaises(IOError) as cm: ++ with closing(socket.socket()) as sock: ++ ssl.wrap_socket(sock, certfile=WRONGCERT, keyfile=WRONGCERT) ++ self.assertEqual(cm.exception.errno, errno.ENOENT) ++ ++ def test_match_hostname(self): ++ def ok(cert, hostname): ++ ssl.match_hostname(cert, hostname) ++ def fail(cert, hostname): ++ self.assertRaises(ssl.CertificateError, ++ ssl.match_hostname, cert, hostname) ++ ++ cert = {'subject': ((('commonName', 'example.com'),),)} ++ ok(cert, 'example.com') ++ ok(cert, 'ExAmple.cOm') ++ fail(cert, 'www.example.com') ++ fail(cert, '.example.com') ++ fail(cert, 'example.org') ++ fail(cert, 'exampleXcom') ++ ++ cert = {'subject': ((('commonName', '*.a.com'),),)} ++ ok(cert, 'foo.a.com') ++ fail(cert, 'bar.foo.a.com') ++ fail(cert, 'a.com') ++ fail(cert, 'Xa.com') ++ fail(cert, '.a.com') ++ ++ # only match one left-most wildcard ++ cert = {'subject': ((('commonName', 'f*.com'),),)} ++ ok(cert, 'foo.com') ++ ok(cert, 'f.com') ++ fail(cert, 'bar.com') ++ fail(cert, 'foo.a.com') ++ fail(cert, 'bar.foo.com') ++ ++ # NULL bytes are bad, CVE-2013-4073 ++ cert = {'subject': ((('commonName', ++ 'null.python.org\x00example.org'),),)} ++ ok(cert, 'null.python.org\x00example.org') # or raise an error? ++ fail(cert, 'example.org') ++ fail(cert, 'null.python.org') ++ ++ # error cases with wildcards ++ cert = {'subject': ((('commonName', '*.*.a.com'),),)} ++ fail(cert, 'bar.foo.a.com') ++ fail(cert, 'a.com') ++ fail(cert, 'Xa.com') ++ fail(cert, '.a.com') ++ ++ cert = {'subject': ((('commonName', 'a.*.com'),),)} ++ fail(cert, 'a.foo.com') ++ fail(cert, 'a..com') ++ fail(cert, 'a.com') ++ ++ # wildcard doesn't match IDNA prefix 'xn--' ++ idna = u'püthon.python.org'.encode("idna").decode("ascii") ++ cert = {'subject': ((('commonName', idna),),)} ++ ok(cert, idna) ++ cert = {'subject': ((('commonName', 'x*.python.org'),),)} ++ fail(cert, idna) ++ cert = {'subject': ((('commonName', 'xn--p*.python.org'),),)} ++ fail(cert, idna) ++ ++ # wildcard in first fragment and IDNA A-labels in sequent fragments ++ # are supported. ++ idna = u'www*.pythön.org'.encode("idna").decode("ascii") ++ cert = {'subject': ((('commonName', idna),),)} ++ ok(cert, u'www.pythön.org'.encode("idna").decode("ascii")) ++ ok(cert, u'www1.pythön.org'.encode("idna").decode("ascii")) ++ fail(cert, u'ftp.pythön.org'.encode("idna").decode("ascii")) ++ fail(cert, u'pythön.org'.encode("idna").decode("ascii")) ++ ++ # Slightly fake real-world example ++ cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT', ++ 'subject': ((('commonName', 'linuxfrz.org'),),), ++ 'subjectAltName': (('DNS', 'linuxfr.org'), ++ ('DNS', 'linuxfr.com'), ++ ('othername', ''))} ++ ok(cert, 'linuxfr.org') ++ ok(cert, 'linuxfr.com') ++ # Not a "DNS" entry ++ fail(cert, '') ++ # When there is a subjectAltName, commonName isn't used ++ fail(cert, 'linuxfrz.org') ++ ++ # A pristine real-world example ++ cert = {'notAfter': 'Dec 18 23:59:59 2011 GMT', ++ 'subject': ((('countryName', 'US'),), ++ (('stateOrProvinceName', 'California'),), ++ (('localityName', 'Mountain View'),), ++ (('organizationName', 'Google Inc'),), ++ (('commonName', 'mail.google.com'),))} ++ ok(cert, 'mail.google.com') ++ fail(cert, 'gmail.com') ++ # Only commonName is considered ++ fail(cert, 'California') ++ ++ # Neither commonName nor subjectAltName ++ cert = {'notAfter': 'Dec 18 23:59:59 2011 GMT', ++ 'subject': ((('countryName', 'US'),), ++ (('stateOrProvinceName', 'California'),), ++ (('localityName', 'Mountain View'),), ++ (('organizationName', 'Google Inc'),))} ++ fail(cert, 'mail.google.com') ++ ++ # No DNS entry in subjectAltName but a commonName ++ cert = {'notAfter': 'Dec 18 23:59:59 2099 GMT', ++ 'subject': ((('countryName', 'US'),), ++ (('stateOrProvinceName', 'California'),), ++ (('localityName', 'Mountain View'),), ++ (('commonName', 'mail.google.com'),)), ++ 'subjectAltName': (('othername', 'blabla'), )} ++ ok(cert, 'mail.google.com') ++ ++ # No DNS entry subjectAltName and no commonName ++ cert = {'notAfter': 'Dec 18 23:59:59 2099 GMT', ++ 'subject': ((('countryName', 'US'),), ++ (('stateOrProvinceName', 'California'),), ++ (('localityName', 'Mountain View'),), ++ (('organizationName', 'Google Inc'),)), ++ 'subjectAltName': (('othername', 'blabla'),)} ++ fail(cert, 'google.com') ++ ++ # Empty cert / no cert ++ self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com') ++ self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com') ++ ++ # Issue #17980: avoid denials of service by refusing more than one ++ # wildcard per fragment. ++ cert = {'subject': ((('commonName', 'a*b.com'),),)} ++ ok(cert, 'axxb.com') ++ cert = {'subject': ((('commonName', 'a*b.co*'),),)} ++ fail(cert, 'axxb.com') ++ cert = {'subject': ((('commonName', 'a*b*.com'),),)} ++ with self.assertRaises(ssl.CertificateError) as cm: ++ ssl.match_hostname(cert, 'axxbxxc.com') ++ self.assertIn("too many wildcards", str(cm.exception)) ++ ++ def test_server_side(self): ++ # server_hostname doesn't work for server sockets ++ ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ with closing(socket.socket()) as sock: ++ self.assertRaises(ValueError, ctx.wrap_socket, sock, True, ++ server_hostname="some.hostname") ++ ++ def test_unknown_channel_binding(self): ++ # should raise ValueError for unknown type ++ s = socket.socket(socket.AF_INET) ++ with closing(ssl.wrap_socket(s)) as ss: ++ with self.assertRaises(ValueError): ++ ss.get_channel_binding("unknown-type") ++ ++ @unittest.skipUnless("tls-unique" in ssl.CHANNEL_BINDING_TYPES, ++ "'tls-unique' channel binding not available") ++ def test_tls_unique_channel_binding(self): ++ # unconnected should return None for known type ++ s = socket.socket(socket.AF_INET) ++ with closing(ssl.wrap_socket(s)) as ss: ++ self.assertIsNone(ss.get_channel_binding("tls-unique")) ++ # the same for server-side ++ s = socket.socket(socket.AF_INET) ++ with closing(ssl.wrap_socket(s, server_side=True, certfile=CERTFILE)) as ss: ++ self.assertIsNone(ss.get_channel_binding("tls-unique")) ++ ++ def test_get_default_verify_paths(self): ++ paths = ssl.get_default_verify_paths() ++ self.assertEqual(len(paths), 6) ++ self.assertIsInstance(paths, ssl.DefaultVerifyPaths) ++ ++ with support.EnvironmentVarGuard() as env: ++ env["SSL_CERT_DIR"] = CAPATH ++ env["SSL_CERT_FILE"] = CERTFILE ++ paths = ssl.get_default_verify_paths() ++ self.assertEqual(paths.cafile, CERTFILE) ++ self.assertEqual(paths.capath, CAPATH) ++ ++ @unittest.skipUnless(sys.platform == "win32", "Windows specific") ++ def test_enum_certificates(self): ++ self.assertTrue(ssl.enum_certificates("CA")) ++ self.assertTrue(ssl.enum_certificates("ROOT")) ++ ++ self.assertRaises(TypeError, ssl.enum_certificates) ++ self.assertRaises(WindowsError, ssl.enum_certificates, "") ++ ++ trust_oids = set() ++ for storename in ("CA", "ROOT"): ++ store = ssl.enum_certificates(storename) ++ self.assertIsInstance(store, list) ++ for element in store: ++ self.assertIsInstance(element, tuple) ++ self.assertEqual(len(element), 3) ++ cert, enc, trust = element ++ self.assertIsInstance(cert, bytes) ++ self.assertIn(enc, {"x509_asn", "pkcs_7_asn"}) ++ self.assertIsInstance(trust, (set, bool)) ++ if isinstance(trust, set): ++ trust_oids.update(trust) ++ ++ serverAuth = "1.3.6.1.5.5.7.3.1" ++ self.assertIn(serverAuth, trust_oids) ++ ++ @unittest.skipUnless(sys.platform == "win32", "Windows specific") ++ def test_enum_crls(self): ++ self.assertTrue(ssl.enum_crls("CA")) ++ self.assertRaises(TypeError, ssl.enum_crls) ++ self.assertRaises(WindowsError, ssl.enum_crls, "") ++ ++ crls = ssl.enum_crls("CA") ++ self.assertIsInstance(crls, list) ++ for element in crls: ++ self.assertIsInstance(element, tuple) ++ self.assertEqual(len(element), 2) ++ self.assertIsInstance(element[0], bytes) ++ self.assertIn(element[1], {"x509_asn", "pkcs_7_asn"}) ++ ++ ++ def test_asn1object(self): ++ expected = (129, 'serverAuth', 'TLS Web Server Authentication', ++ '1.3.6.1.5.5.7.3.1') ++ ++ val = ssl._ASN1Object('1.3.6.1.5.5.7.3.1') ++ self.assertEqual(val, expected) ++ self.assertEqual(val.nid, 129) ++ self.assertEqual(val.shortname, 'serverAuth') ++ self.assertEqual(val.longname, 'TLS Web Server Authentication') ++ self.assertEqual(val.oid, '1.3.6.1.5.5.7.3.1') ++ self.assertIsInstance(val, ssl._ASN1Object) ++ self.assertRaises(ValueError, ssl._ASN1Object, 'serverAuth') ++ ++ val = ssl._ASN1Object.fromnid(129) ++ self.assertEqual(val, expected) ++ self.assertIsInstance(val, ssl._ASN1Object) ++ self.assertRaises(ValueError, ssl._ASN1Object.fromnid, -1) ++ with self.assertRaisesRegexp(ValueError, "unknown NID 100000"): ++ ssl._ASN1Object.fromnid(100000) ++ for i in range(1000): ++ try: ++ obj = ssl._ASN1Object.fromnid(i) ++ except ValueError: ++ pass ++ else: ++ self.assertIsInstance(obj.nid, int) ++ self.assertIsInstance(obj.shortname, str) ++ self.assertIsInstance(obj.longname, str) ++ self.assertIsInstance(obj.oid, (str, type(None))) ++ ++ val = ssl._ASN1Object.fromname('TLS Web Server Authentication') ++ self.assertEqual(val, expected) ++ self.assertIsInstance(val, ssl._ASN1Object) ++ self.assertEqual(ssl._ASN1Object.fromname('serverAuth'), expected) ++ self.assertEqual(ssl._ASN1Object.fromname('1.3.6.1.5.5.7.3.1'), ++ expected) ++ with self.assertRaisesRegexp(ValueError, "unknown object 'serverauth'"): ++ ssl._ASN1Object.fromname('serverauth') ++ ++ def test_purpose_enum(self): ++ val = ssl._ASN1Object('1.3.6.1.5.5.7.3.1') ++ self.assertIsInstance(ssl.Purpose.SERVER_AUTH, ssl._ASN1Object) ++ self.assertEqual(ssl.Purpose.SERVER_AUTH, val) ++ self.assertEqual(ssl.Purpose.SERVER_AUTH.nid, 129) ++ self.assertEqual(ssl.Purpose.SERVER_AUTH.shortname, 'serverAuth') ++ self.assertEqual(ssl.Purpose.SERVER_AUTH.oid, ++ '1.3.6.1.5.5.7.3.1') ++ ++ val = ssl._ASN1Object('1.3.6.1.5.5.7.3.2') ++ self.assertIsInstance(ssl.Purpose.CLIENT_AUTH, ssl._ASN1Object) ++ self.assertEqual(ssl.Purpose.CLIENT_AUTH, val) ++ self.assertEqual(ssl.Purpose.CLIENT_AUTH.nid, 130) ++ self.assertEqual(ssl.Purpose.CLIENT_AUTH.shortname, 'clientAuth') ++ self.assertEqual(ssl.Purpose.CLIENT_AUTH.oid, ++ '1.3.6.1.5.5.7.3.2') + + def test_unsupported_dtls(self): + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) +@@ -238,29 +616,618 @@ + with self.assertRaises(NotImplementedError) as cx: + ssl.wrap_socket(s, cert_reqs=ssl.CERT_NONE) + self.assertEqual(str(cx.exception), "only stream sockets are supported") ++ ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ with self.assertRaises(NotImplementedError) as cx: ++ ctx.wrap_socket(s) ++ self.assertEqual(str(cx.exception), "only stream sockets are supported") ++ ++ def cert_time_ok(self, timestring, timestamp): ++ self.assertEqual(ssl.cert_time_to_seconds(timestring), timestamp) ++ ++ def cert_time_fail(self, timestring): ++ with self.assertRaises(ValueError): ++ ssl.cert_time_to_seconds(timestring) ++ ++ @unittest.skipUnless(utc_offset(), ++ 'local time needs to be different from UTC') ++ def test_cert_time_to_seconds_timezone(self): ++ # Issue #19940: ssl.cert_time_to_seconds() returns wrong ++ # results if local timezone is not UTC ++ self.cert_time_ok("May 9 00:00:00 2007 GMT", 1178668800.0) ++ self.cert_time_ok("Jan 5 09:34:43 2018 GMT", 1515144883.0) ++ ++ def test_cert_time_to_seconds(self): ++ timestring = "Jan 5 09:34:43 2018 GMT" ++ ts = 1515144883.0 ++ self.cert_time_ok(timestring, ts) ++ # accept keyword parameter, assert its name ++ self.assertEqual(ssl.cert_time_to_seconds(cert_time=timestring), ts) ++ # accept both %e and %d (space or zero generated by strftime) ++ self.cert_time_ok("Jan 05 09:34:43 2018 GMT", ts) ++ # case-insensitive ++ self.cert_time_ok("JaN 5 09:34:43 2018 GmT", ts) ++ self.cert_time_fail("Jan 5 09:34 2018 GMT") # no seconds ++ self.cert_time_fail("Jan 5 09:34:43 2018") # no GMT ++ self.cert_time_fail("Jan 5 09:34:43 2018 UTC") # not GMT timezone ++ self.cert_time_fail("Jan 35 09:34:43 2018 GMT") # invalid day ++ self.cert_time_fail("Jon 5 09:34:43 2018 GMT") # invalid month ++ self.cert_time_fail("Jan 5 24:00:00 2018 GMT") # invalid hour ++ self.cert_time_fail("Jan 5 09:60:43 2018 GMT") # invalid minute ++ ++ newyear_ts = 1230768000.0 ++ # leap seconds ++ self.cert_time_ok("Dec 31 23:59:60 2008 GMT", newyear_ts) ++ # same timestamp ++ self.cert_time_ok("Jan 1 00:00:00 2009 GMT", newyear_ts) ++ ++ self.cert_time_ok("Jan 5 09:34:59 2018 GMT", 1515144899) ++ # allow 60th second (even if it is not a leap second) ++ self.cert_time_ok("Jan 5 09:34:60 2018 GMT", 1515144900) ++ # allow 2nd leap second for compatibility with time.strptime() ++ self.cert_time_ok("Jan 5 09:34:61 2018 GMT", 1515144901) ++ self.cert_time_fail("Jan 5 09:34:62 2018 GMT") # invalid seconds ++ ++ # no special treatement for the special value: ++ # 99991231235959Z (rfc 5280) ++ self.cert_time_ok("Dec 31 23:59:59 9999 GMT", 253402300799.0) ++ ++ @support.run_with_locale('LC_ALL', '') ++ def test_cert_time_to_seconds_locale(self): ++ # `cert_time_to_seconds()` should be locale independent ++ ++ def local_february_name(): ++ return time.strftime('%b', (1, 2, 3, 4, 5, 6, 0, 0, 0)) ++ ++ if local_february_name().lower() == 'feb': ++ self.skipTest("locale-specific month name needs to be " ++ "different from C locale") ++ ++ # locale-independent ++ self.cert_time_ok("Feb 9 00:00:00 2007 GMT", 1170979200.0) ++ self.cert_time_fail(local_february_name() + " 9 00:00:00 2007 GMT") ++ ++ ++class ContextTests(unittest.TestCase): ++ ++ @skip_if_broken_ubuntu_ssl ++ def test_constructor(self): ++ for protocol in PROTOCOLS: ++ ssl.SSLContext(protocol) ++ self.assertRaises(TypeError, ssl.SSLContext) ++ self.assertRaises(ValueError, ssl.SSLContext, -1) ++ self.assertRaises(ValueError, ssl.SSLContext, 42) ++ ++ @skip_if_broken_ubuntu_ssl ++ def test_protocol(self): ++ for proto in PROTOCOLS: ++ ctx = ssl.SSLContext(proto) ++ self.assertEqual(ctx.protocol, proto) ++ ++ def test_ciphers(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.set_ciphers("ALL") ++ ctx.set_ciphers("DEFAULT") ++ with self.assertRaisesRegexp(ssl.SSLError, "No cipher can be selected"): ++ ctx.set_ciphers("^$:,;?*'dorothyx") ++ ++ @skip_if_broken_ubuntu_ssl ++ def test_options(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ # OP_ALL | OP_NO_SSLv2 is the default value ++ self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2, ++ ctx.options) ++ ctx.options |= ssl.OP_NO_SSLv3 ++ self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3, ++ ctx.options) ++ if can_clear_options(): ++ ctx.options = (ctx.options & ~ssl.OP_NO_SSLv2) | ssl.OP_NO_TLSv1 ++ self.assertEqual(ssl.OP_ALL | ssl.OP_NO_TLSv1 | ssl.OP_NO_SSLv3, ++ ctx.options) ++ ctx.options = 0 ++ self.assertEqual(0, ctx.options) ++ else: ++ with self.assertRaises(ValueError): ++ ctx.options = 0 ++ ++ def test_verify_mode(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ # Default value ++ self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) ++ ctx.verify_mode = ssl.CERT_OPTIONAL ++ self.assertEqual(ctx.verify_mode, ssl.CERT_OPTIONAL) ++ ctx.verify_mode = ssl.CERT_REQUIRED ++ self.assertEqual(ctx.verify_mode, ssl.CERT_REQUIRED) ++ ctx.verify_mode = ssl.CERT_NONE ++ self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) ++ with self.assertRaises(TypeError): ++ ctx.verify_mode = None ++ with self.assertRaises(ValueError): ++ ctx.verify_mode = 42 ++ ++ @unittest.skipUnless(have_verify_flags(), ++ "verify_flags need OpenSSL > 0.9.8") ++ def test_verify_flags(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ # default value by OpenSSL ++ self.assertEqual(ctx.verify_flags, ssl.VERIFY_DEFAULT) ++ ctx.verify_flags = ssl.VERIFY_CRL_CHECK_LEAF ++ self.assertEqual(ctx.verify_flags, ssl.VERIFY_CRL_CHECK_LEAF) ++ ctx.verify_flags = ssl.VERIFY_CRL_CHECK_CHAIN ++ self.assertEqual(ctx.verify_flags, ssl.VERIFY_CRL_CHECK_CHAIN) ++ ctx.verify_flags = ssl.VERIFY_DEFAULT ++ self.assertEqual(ctx.verify_flags, ssl.VERIFY_DEFAULT) ++ # supports any value ++ ctx.verify_flags = ssl.VERIFY_CRL_CHECK_LEAF | ssl.VERIFY_X509_STRICT ++ self.assertEqual(ctx.verify_flags, ++ ssl.VERIFY_CRL_CHECK_LEAF | ssl.VERIFY_X509_STRICT) ++ with self.assertRaises(TypeError): ++ ctx.verify_flags = None ++ ++ def test_load_cert_chain(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ # Combined key and cert in a single file ++ ctx.load_cert_chain(CERTFILE, keyfile=None) ++ ctx.load_cert_chain(CERTFILE, keyfile=CERTFILE) ++ self.assertRaises(TypeError, ctx.load_cert_chain, keyfile=CERTFILE) ++ with self.assertRaises(IOError) as cm: ++ ctx.load_cert_chain(WRONGCERT) ++ self.assertEqual(cm.exception.errno, errno.ENOENT) ++ with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"): ++ ctx.load_cert_chain(BADCERT) ++ with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"): ++ ctx.load_cert_chain(EMPTYCERT) ++ # Separate key and cert ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.load_cert_chain(ONLYCERT, ONLYKEY) ++ ctx.load_cert_chain(certfile=ONLYCERT, keyfile=ONLYKEY) ++ ctx.load_cert_chain(certfile=BYTES_ONLYCERT, keyfile=BYTES_ONLYKEY) ++ with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"): ++ ctx.load_cert_chain(ONLYCERT) ++ with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"): ++ ctx.load_cert_chain(ONLYKEY) ++ with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"): ++ ctx.load_cert_chain(certfile=ONLYKEY, keyfile=ONLYCERT) ++ # Mismatching key and cert ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ with self.assertRaisesRegexp(ssl.SSLError, "key values mismatch"): ++ ctx.load_cert_chain(SVN_PYTHON_ORG_ROOT_CERT, ONLYKEY) ++ # Password protected key and cert ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=KEY_PASSWORD) ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=KEY_PASSWORD.encode()) ++ ctx.load_cert_chain(CERTFILE_PROTECTED, ++ password=bytearray(KEY_PASSWORD.encode())) ++ ctx.load_cert_chain(ONLYCERT, ONLYKEY_PROTECTED, KEY_PASSWORD) ++ ctx.load_cert_chain(ONLYCERT, ONLYKEY_PROTECTED, KEY_PASSWORD.encode()) ++ ctx.load_cert_chain(ONLYCERT, ONLYKEY_PROTECTED, ++ bytearray(KEY_PASSWORD.encode())) ++ with self.assertRaisesRegexp(TypeError, "should be a string"): ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=True) ++ with self.assertRaises(ssl.SSLError): ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password="badpass") ++ with self.assertRaisesRegexp(ValueError, "cannot be longer"): ++ # openssl has a fixed limit on the password buffer. ++ # PEM_BUFSIZE is generally set to 1kb. ++ # Return a string larger than this. ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=b'a' * 102400) ++ # Password callback ++ def getpass_unicode(): ++ return KEY_PASSWORD ++ def getpass_bytes(): ++ return KEY_PASSWORD.encode() ++ def getpass_bytearray(): ++ return bytearray(KEY_PASSWORD.encode()) ++ def getpass_badpass(): ++ return "badpass" ++ def getpass_huge(): ++ return b'a' * (1024 * 1024) ++ def getpass_bad_type(): ++ return 9 ++ def getpass_exception(): ++ raise Exception('getpass error') ++ class GetPassCallable: ++ def __call__(self): ++ return KEY_PASSWORD ++ def getpass(self): ++ return KEY_PASSWORD ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=getpass_unicode) ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=getpass_bytes) ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=getpass_bytearray) ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=GetPassCallable()) ++ ctx.load_cert_chain(CERTFILE_PROTECTED, ++ password=GetPassCallable().getpass) ++ with self.assertRaises(ssl.SSLError): ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=getpass_badpass) ++ with self.assertRaisesRegexp(ValueError, "cannot be longer"): ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=getpass_huge) ++ with self.assertRaisesRegexp(TypeError, "must return a string"): ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=getpass_bad_type) ++ with self.assertRaisesRegexp(Exception, "getpass error"): ++ ctx.load_cert_chain(CERTFILE_PROTECTED, password=getpass_exception) ++ # Make sure the password function isn't called if it isn't needed ++ ctx.load_cert_chain(CERTFILE, password=getpass_exception) ++ ++ def test_load_verify_locations(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.load_verify_locations(CERTFILE) ++ ctx.load_verify_locations(cafile=CERTFILE, capath=None) ++ ctx.load_verify_locations(BYTES_CERTFILE) ++ ctx.load_verify_locations(cafile=BYTES_CERTFILE, capath=None) ++ ctx.load_verify_locations(cafile=BYTES_CERTFILE.decode('utf-8')) ++ self.assertRaises(TypeError, ctx.load_verify_locations) ++ self.assertRaises(TypeError, ctx.load_verify_locations, None, None, None) ++ with self.assertRaises(IOError) as cm: ++ ctx.load_verify_locations(WRONGCERT) ++ self.assertEqual(cm.exception.errno, errno.ENOENT) ++ with self.assertRaises(IOError): ++ ctx.load_verify_locations(u'') ++ with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"): ++ ctx.load_verify_locations(BADCERT) ++ ctx.load_verify_locations(CERTFILE, CAPATH) ++ ctx.load_verify_locations(CERTFILE, capath=BYTES_CAPATH) ++ ++ # Issue #10989: crash if the second argument type is invalid ++ self.assertRaises(TypeError, ctx.load_verify_locations, None, True) ++ ++ def test_load_verify_cadata(self): ++ # test cadata ++ with open(CAFILE_CACERT) as f: ++ cacert_pem = f.read().decode("ascii") ++ cacert_der = ssl.PEM_cert_to_DER_cert(cacert_pem) ++ with open(CAFILE_NEURONIO) as f: ++ neuronio_pem = f.read().decode("ascii") ++ neuronio_der = ssl.PEM_cert_to_DER_cert(neuronio_pem) ++ ++ # test PEM ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ self.assertEqual(ctx.cert_store_stats()["x509_ca"], 0) ++ ctx.load_verify_locations(cadata=cacert_pem) ++ self.assertEqual(ctx.cert_store_stats()["x509_ca"], 1) ++ ctx.load_verify_locations(cadata=neuronio_pem) ++ self.assertEqual(ctx.cert_store_stats()["x509_ca"], 2) ++ # cert already in hash table ++ ctx.load_verify_locations(cadata=neuronio_pem) ++ self.assertEqual(ctx.cert_store_stats()["x509_ca"], 2) ++ ++ # combined ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ combined = "\n".join((cacert_pem, neuronio_pem)) ++ ctx.load_verify_locations(cadata=combined) ++ self.assertEqual(ctx.cert_store_stats()["x509_ca"], 2) ++ ++ # with junk around the certs ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ combined = ["head", cacert_pem, "other", neuronio_pem, "again", ++ neuronio_pem, "tail"] ++ ctx.load_verify_locations(cadata="\n".join(combined)) ++ self.assertEqual(ctx.cert_store_stats()["x509_ca"], 2) ++ ++ # test DER ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.load_verify_locations(cadata=cacert_der) ++ ctx.load_verify_locations(cadata=neuronio_der) ++ self.assertEqual(ctx.cert_store_stats()["x509_ca"], 2) ++ # cert already in hash table ++ ctx.load_verify_locations(cadata=cacert_der) ++ self.assertEqual(ctx.cert_store_stats()["x509_ca"], 2) ++ ++ # combined ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ combined = b"".join((cacert_der, neuronio_der)) ++ ctx.load_verify_locations(cadata=combined) ++ self.assertEqual(ctx.cert_store_stats()["x509_ca"], 2) ++ ++ # error cases ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ self.assertRaises(TypeError, ctx.load_verify_locations, cadata=object) ++ ++ with self.assertRaisesRegexp(ssl.SSLError, "no start line"): ++ ctx.load_verify_locations(cadata=u"broken") ++ with self.assertRaisesRegexp(ssl.SSLError, "not enough data"): ++ ctx.load_verify_locations(cadata=b"broken") ++ ++ ++ def test_load_dh_params(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.load_dh_params(DHFILE) ++ if os.name != 'nt': ++ ctx.load_dh_params(BYTES_DHFILE) ++ self.assertRaises(TypeError, ctx.load_dh_params) ++ self.assertRaises(TypeError, ctx.load_dh_params, None) ++ with self.assertRaises(IOError) as cm: ++ ctx.load_dh_params(WRONGCERT) ++ self.assertEqual(cm.exception.errno, errno.ENOENT) ++ with self.assertRaises(ssl.SSLError) as cm: ++ ctx.load_dh_params(CERTFILE) ++ ++ @skip_if_broken_ubuntu_ssl ++ def test_session_stats(self): ++ for proto in PROTOCOLS: ++ ctx = ssl.SSLContext(proto) ++ self.assertEqual(ctx.session_stats(), { ++ 'number': 0, ++ 'connect': 0, ++ 'connect_good': 0, ++ 'connect_renegotiate': 0, ++ 'accept': 0, ++ 'accept_good': 0, ++ 'accept_renegotiate': 0, ++ 'hits': 0, ++ 'misses': 0, ++ 'timeouts': 0, ++ 'cache_full': 0, ++ }) ++ ++ def test_set_default_verify_paths(self): ++ # There's not much we can do to test that it acts as expected, ++ # so just check it doesn't crash or raise an exception. ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.set_default_verify_paths() ++ ++ @unittest.skipUnless(ssl.HAS_ECDH, "ECDH disabled on this OpenSSL build") ++ def test_set_ecdh_curve(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.set_ecdh_curve("prime256v1") ++ ctx.set_ecdh_curve(b"prime256v1") ++ self.assertRaises(TypeError, ctx.set_ecdh_curve) ++ self.assertRaises(TypeError, ctx.set_ecdh_curve, None) ++ self.assertRaises(ValueError, ctx.set_ecdh_curve, "foo") ++ self.assertRaises(ValueError, ctx.set_ecdh_curve, b"foo") ++ ++ @needs_sni ++ def test_sni_callback(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ++ # set_servername_callback expects a callable, or None ++ self.assertRaises(TypeError, ctx.set_servername_callback) ++ self.assertRaises(TypeError, ctx.set_servername_callback, 4) ++ self.assertRaises(TypeError, ctx.set_servername_callback, "") ++ self.assertRaises(TypeError, ctx.set_servername_callback, ctx) ++ ++ def dummycallback(sock, servername, ctx): ++ pass ++ ctx.set_servername_callback(None) ++ ctx.set_servername_callback(dummycallback) ++ ++ @needs_sni ++ def test_sni_callback_refcycle(self): ++ # Reference cycles through the servername callback are detected ++ # and cleared. ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ def dummycallback(sock, servername, ctx, cycle=ctx): ++ pass ++ ctx.set_servername_callback(dummycallback) ++ wr = weakref.ref(ctx) ++ del ctx, dummycallback ++ gc.collect() ++ self.assertIs(wr(), None) ++ ++ def test_cert_store_stats(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ self.assertEqual(ctx.cert_store_stats(), ++ {'x509_ca': 0, 'crl': 0, 'x509': 0}) ++ ctx.load_cert_chain(CERTFILE) ++ self.assertEqual(ctx.cert_store_stats(), ++ {'x509_ca': 0, 'crl': 0, 'x509': 0}) ++ ctx.load_verify_locations(CERTFILE) ++ self.assertEqual(ctx.cert_store_stats(), ++ {'x509_ca': 0, 'crl': 0, 'x509': 1}) ++ ctx.load_verify_locations(SVN_PYTHON_ORG_ROOT_CERT) ++ self.assertEqual(ctx.cert_store_stats(), ++ {'x509_ca': 1, 'crl': 0, 'x509': 2}) ++ ++ def test_get_ca_certs(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ self.assertEqual(ctx.get_ca_certs(), []) ++ # CERTFILE is not flagged as X509v3 Basic Constraints: CA:TRUE ++ ctx.load_verify_locations(CERTFILE) ++ self.assertEqual(ctx.get_ca_certs(), []) ++ # but SVN_PYTHON_ORG_ROOT_CERT is a CA cert ++ ctx.load_verify_locations(SVN_PYTHON_ORG_ROOT_CERT) ++ self.assertEqual(ctx.get_ca_certs(), ++ [{'issuer': ((('organizationName', 'Root CA'),), ++ (('organizationalUnitName', 'http://www.cacert.org'),), ++ (('commonName', 'CA Cert Signing Authority'),), ++ (('emailAddress', 'support@cacert.org'),)), ++ 'notAfter': asn1time('Mar 29 12:29:49 2033 GMT'), ++ 'notBefore': asn1time('Mar 30 12:29:49 2003 GMT'), ++ 'serialNumber': '00', ++ 'crlDistributionPoints': ('https://www.cacert.org/revoke.crl',), ++ 'subject': ((('organizationName', 'Root CA'),), ++ (('organizationalUnitName', 'http://www.cacert.org'),), ++ (('commonName', 'CA Cert Signing Authority'),), ++ (('emailAddress', 'support@cacert.org'),)), ++ 'version': 3}]) ++ ++ with open(SVN_PYTHON_ORG_ROOT_CERT) as f: ++ pem = f.read() ++ der = ssl.PEM_cert_to_DER_cert(pem) ++ self.assertEqual(ctx.get_ca_certs(True), [der]) ++ ++ def test_load_default_certs(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.load_default_certs() ++ ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.load_default_certs(ssl.Purpose.SERVER_AUTH) ++ ctx.load_default_certs() ++ ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.load_default_certs(ssl.Purpose.CLIENT_AUTH) ++ ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ self.assertRaises(TypeError, ctx.load_default_certs, None) ++ self.assertRaises(TypeError, ctx.load_default_certs, 'SERVER_AUTH') ++ ++ @unittest.skipIf(sys.platform == "win32", "not-Windows specific") ++ def test_load_default_certs_env(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ with support.EnvironmentVarGuard() as env: ++ env["SSL_CERT_DIR"] = CAPATH ++ env["SSL_CERT_FILE"] = CERTFILE ++ ctx.load_default_certs() ++ self.assertEqual(ctx.cert_store_stats(), {"crl": 0, "x509": 1, "x509_ca": 0}) ++ ++ @unittest.skipUnless(sys.platform == "win32", "Windows specific") ++ def test_load_default_certs_env_windows(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.load_default_certs() ++ stats = ctx.cert_store_stats() ++ ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ with support.EnvironmentVarGuard() as env: ++ env["SSL_CERT_DIR"] = CAPATH ++ env["SSL_CERT_FILE"] = CERTFILE ++ ctx.load_default_certs() ++ stats["x509"] += 1 ++ self.assertEqual(ctx.cert_store_stats(), stats) ++ ++ def test_create_default_context(self): ++ ctx = ssl.create_default_context() ++ self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23) ++ self.assertEqual(ctx.verify_mode, ssl.CERT_REQUIRED) ++ self.assertTrue(ctx.check_hostname) ++ self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) ++ self.assertEqual( ++ ctx.options & getattr(ssl, "OP_NO_COMPRESSION", 0), ++ getattr(ssl, "OP_NO_COMPRESSION", 0), ++ ) ++ ++ with open(SIGNING_CA) as f: ++ cadata = f.read().decode("ascii") ++ ctx = ssl.create_default_context(cafile=SIGNING_CA, capath=CAPATH, ++ cadata=cadata) ++ self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23) ++ self.assertEqual(ctx.verify_mode, ssl.CERT_REQUIRED) ++ self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) ++ self.assertEqual( ++ ctx.options & getattr(ssl, "OP_NO_COMPRESSION", 0), ++ getattr(ssl, "OP_NO_COMPRESSION", 0), ++ ) ++ ++ ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) ++ self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23) ++ self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) ++ self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) ++ self.assertEqual( ++ ctx.options & getattr(ssl, "OP_NO_COMPRESSION", 0), ++ getattr(ssl, "OP_NO_COMPRESSION", 0), ++ ) ++ self.assertEqual( ++ ctx.options & getattr(ssl, "OP_SINGLE_DH_USE", 0), ++ getattr(ssl, "OP_SINGLE_DH_USE", 0), ++ ) ++ self.assertEqual( ++ ctx.options & getattr(ssl, "OP_SINGLE_ECDH_USE", 0), ++ getattr(ssl, "OP_SINGLE_ECDH_USE", 0), ++ ) ++ ++ def test__create_stdlib_context(self): ++ ctx = ssl._create_stdlib_context() ++ self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23) ++ self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) ++ self.assertFalse(ctx.check_hostname) ++ self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) ++ ++ ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1) ++ self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1) ++ self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) ++ self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) ++ ++ ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1, ++ cert_reqs=ssl.CERT_REQUIRED, ++ check_hostname=True) ++ self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1) ++ self.assertEqual(ctx.verify_mode, ssl.CERT_REQUIRED) ++ self.assertTrue(ctx.check_hostname) ++ self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) ++ ++ ctx = ssl._create_stdlib_context(purpose=ssl.Purpose.CLIENT_AUTH) ++ self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23) ++ self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) ++ self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) ++ ++ def test_check_hostname(self): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ self.assertFalse(ctx.check_hostname) ++ ++ # Requires CERT_REQUIRED or CERT_OPTIONAL ++ with self.assertRaises(ValueError): ++ ctx.check_hostname = True ++ ctx.verify_mode = ssl.CERT_REQUIRED ++ self.assertFalse(ctx.check_hostname) ++ ctx.check_hostname = True ++ self.assertTrue(ctx.check_hostname) ++ ++ ctx.verify_mode = ssl.CERT_OPTIONAL ++ ctx.check_hostname = True ++ self.assertTrue(ctx.check_hostname) ++ ++ # Cannot set CERT_NONE with check_hostname enabled ++ with self.assertRaises(ValueError): ++ ctx.verify_mode = ssl.CERT_NONE ++ ctx.check_hostname = False ++ self.assertFalse(ctx.check_hostname) ++ ++ ++class SSLErrorTests(unittest.TestCase): ++ ++ def test_str(self): ++ # The str() of a SSLError doesn't include the errno ++ e = ssl.SSLError(1, "foo") ++ self.assertEqual(str(e), "foo") ++ self.assertEqual(e.errno, 1) ++ # Same for a subclass ++ e = ssl.SSLZeroReturnError(1, "foo") ++ self.assertEqual(str(e), "foo") ++ self.assertEqual(e.errno, 1) ++ ++ def test_lib_reason(self): ++ # Test the library and reason attributes ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ with self.assertRaises(ssl.SSLError) as cm: ++ ctx.load_dh_params(CERTFILE) ++ self.assertEqual(cm.exception.library, 'PEM') ++ self.assertEqual(cm.exception.reason, 'NO_START_LINE') ++ s = str(cm.exception) ++ self.assertTrue(s.startswith("[PEM: NO_START_LINE] no start line"), s) ++ ++ def test_subclass(self): ++ # Check that the appropriate SSLError subclass is raised ++ # (this only tests one of them) ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ with closing(socket.socket()) as s: ++ s.bind(("127.0.0.1", 0)) ++ s.listen(5) ++ c = socket.socket() ++ c.connect(s.getsockname()) ++ c.setblocking(False) ++ with closing(ctx.wrap_socket(c, False, do_handshake_on_connect=False)) as c: ++ with self.assertRaises(ssl.SSLWantReadError) as cm: ++ c.do_handshake() ++ s = str(cm.exception) ++ self.assertTrue(s.startswith("The operation did not complete (read)"), s) ++ # For compatibility ++ self.assertEqual(cm.exception.errno, ssl.SSL_ERROR_WANT_READ) + + + class NetworkedTests(unittest.TestCase): + + def test_connect(self): +- with test_support.transient_internet("svn.python.org"): ++ with support.transient_internet("svn.python.org"): + s = ssl.wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_NONE) +- s.connect(("svn.python.org", 443)) +- c = s.getpeercert() +- if c: +- self.fail("Peer cert %s shouldn't be here!") +- s.close() ++ try: ++ s.connect(("svn.python.org", 443)) ++ self.assertEqual({}, s.getpeercert()) ++ finally: ++ s.close() + + # this should fail because we have no verification certs + s = ssl.wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED) +- try: +- s.connect(("svn.python.org", 443)) +- except ssl.SSLError: +- pass +- finally: +- s.close() ++ self.assertRaisesRegexp(ssl.SSLError, "certificate verify failed", ++ s.connect, ("svn.python.org", 443)) ++ s.close() + + # this should succeed because we specify the root cert + s = ssl.wrap_socket(socket.socket(socket.AF_INET), +@@ -268,12 +1235,13 @@ + ca_certs=SVN_PYTHON_ORG_ROOT_CERT) + try: + s.connect(("svn.python.org", 443)) ++ self.assertTrue(s.getpeercert()) + finally: + s.close() + + def test_connect_ex(self): + # Issue #11326: check connect_ex() implementation +- with test_support.transient_internet("svn.python.org"): ++ with support.transient_internet("svn.python.org"): + s = ssl.wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED, + ca_certs=SVN_PYTHON_ORG_ROOT_CERT) +@@ -286,7 +1254,7 @@ + def test_non_blocking_connect_ex(self): + # Issue #11326: non-blocking connect_ex() should allow handshake + # to proceed after the socket gets ready. +- with test_support.transient_internet("svn.python.org"): ++ with support.transient_internet("svn.python.org"): + s = ssl.wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED, + ca_certs=SVN_PYTHON_ORG_ROOT_CERT, +@@ -303,13 +1271,10 @@ + try: + s.do_handshake() + break +- except ssl.SSLError as err: +- if err.args[0] == ssl.SSL_ERROR_WANT_READ: +- select.select([s], [], [], 5.0) +- elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE: +- select.select([], [s], [], 5.0) +- else: +- raise ++ except ssl.SSLWantReadError: ++ select.select([s], [], [], 5.0) ++ except ssl.SSLWantWriteError: ++ select.select([], [s], [], 5.0) + # SSL established + self.assertTrue(s.getpeercert()) + finally: +@@ -318,7 +1283,7 @@ + def test_timeout_connect_ex(self): + # Issue #12065: on a timeout, connect_ex() should return the original + # errno (mimicking the behaviour of non-SSL sockets). +- with test_support.transient_internet("svn.python.org"): ++ with support.transient_internet("svn.python.org"): + s = ssl.wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED, + ca_certs=SVN_PYTHON_ORG_ROOT_CERT, +@@ -333,22 +1298,109 @@ + s.close() + + def test_connect_ex_error(self): +- with test_support.transient_internet("svn.python.org"): ++ with support.transient_internet("svn.python.org"): + s = ssl.wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED, + ca_certs=SVN_PYTHON_ORG_ROOT_CERT) + try: +- self.assertEqual(errno.ECONNREFUSED, +- s.connect_ex(("svn.python.org", 444))) ++ rc = s.connect_ex(("svn.python.org", 444)) ++ # Issue #19919: Windows machines or VMs hosted on Windows ++ # machines sometimes return EWOULDBLOCK. ++ self.assertIn(rc, (errno.ECONNREFUSED, errno.EWOULDBLOCK)) + finally: + s.close() + ++ def test_connect_with_context(self): ++ with support.transient_internet("svn.python.org"): ++ # Same as test_connect, but with a separately created context ++ ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ s = ctx.wrap_socket(socket.socket(socket.AF_INET)) ++ s.connect(("svn.python.org", 443)) ++ try: ++ self.assertEqual({}, s.getpeercert()) ++ finally: ++ s.close() ++ # Same with a server hostname ++ s = ctx.wrap_socket(socket.socket(socket.AF_INET), ++ server_hostname="svn.python.org") ++ if ssl.HAS_SNI: ++ s.connect(("svn.python.org", 443)) ++ s.close() ++ else: ++ self.assertRaises(ValueError, s.connect, ("svn.python.org", 443)) ++ # This should fail because we have no verification certs ++ ctx.verify_mode = ssl.CERT_REQUIRED ++ s = ctx.wrap_socket(socket.socket(socket.AF_INET)) ++ self.assertRaisesRegexp(ssl.SSLError, "certificate verify failed", ++ s.connect, ("svn.python.org", 443)) ++ s.close() ++ # This should succeed because we specify the root cert ++ ctx.load_verify_locations(SVN_PYTHON_ORG_ROOT_CERT) ++ s = ctx.wrap_socket(socket.socket(socket.AF_INET)) ++ s.connect(("svn.python.org", 443)) ++ try: ++ cert = s.getpeercert() ++ self.assertTrue(cert) ++ finally: ++ s.close() ++ ++ def test_connect_capath(self): ++ # Verify server certificates using the `capath` argument ++ # NOTE: the subject hashing algorithm has been changed between ++ # OpenSSL 0.9.8n and 1.0.0, as a result the capath directory must ++ # contain both versions of each certificate (same content, different ++ # filename) for this test to be portable across OpenSSL releases. ++ with support.transient_internet("svn.python.org"): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ ctx.verify_mode = ssl.CERT_REQUIRED ++ ctx.load_verify_locations(capath=CAPATH) ++ s = ctx.wrap_socket(socket.socket(socket.AF_INET)) ++ s.connect(("svn.python.org", 443)) ++ try: ++ cert = s.getpeercert() ++ self.assertTrue(cert) ++ finally: ++ s.close() ++ # Same with a bytes `capath` argument ++ ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ ctx.verify_mode = ssl.CERT_REQUIRED ++ ctx.load_verify_locations(capath=BYTES_CAPATH) ++ s = ctx.wrap_socket(socket.socket(socket.AF_INET)) ++ s.connect(("svn.python.org", 443)) ++ try: ++ cert = s.getpeercert() ++ self.assertTrue(cert) ++ finally: ++ s.close() ++ ++ def test_connect_cadata(self): ++ with open(CAFILE_CACERT) as f: ++ pem = f.read().decode('ascii') ++ der = ssl.PEM_cert_to_DER_cert(pem) ++ with support.transient_internet("svn.python.org"): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ ctx.verify_mode = ssl.CERT_REQUIRED ++ ctx.load_verify_locations(cadata=pem) ++ with closing(ctx.wrap_socket(socket.socket(socket.AF_INET))) as s: ++ s.connect(("svn.python.org", 443)) ++ cert = s.getpeercert() ++ self.assertTrue(cert) ++ ++ # same with DER ++ ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ ctx.verify_mode = ssl.CERT_REQUIRED ++ ctx.load_verify_locations(cadata=der) ++ with closing(ctx.wrap_socket(socket.socket(socket.AF_INET))) as s: ++ s.connect(("svn.python.org", 443)) ++ cert = s.getpeercert() ++ self.assertTrue(cert) ++ + @unittest.skipIf(os.name == "nt", "Can't use a socket as a file under Windows") + def test_makefile_close(self): + # Issue #5238: creating a file-like object with makefile() shouldn't + # delay closing the underlying "real socket" (here tested with its + # file descriptor, hence skipping the test under Windows). +- with test_support.transient_internet("svn.python.org"): ++ with support.transient_internet("svn.python.org"): + ss = ssl.wrap_socket(socket.socket(socket.AF_INET)) + ss.connect(("svn.python.org", 443)) + fd = ss.fileno() +@@ -364,7 +1416,7 @@ + self.assertEqual(e.exception.errno, errno.EBADF) + + def test_non_blocking_handshake(self): +- with test_support.transient_internet("svn.python.org"): ++ with support.transient_internet("svn.python.org"): + s = socket.socket(socket.AF_INET) + s.connect(("svn.python.org", 443)) + s.setblocking(False) +@@ -377,41 +1429,57 @@ + count += 1 + s.do_handshake() + break +- except ssl.SSLError, err: +- if err.args[0] == ssl.SSL_ERROR_WANT_READ: +- select.select([s], [], []) +- elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE: +- select.select([], [s], []) +- else: +- raise ++ except ssl.SSLWantReadError: ++ select.select([s], [], []) ++ except ssl.SSLWantWriteError: ++ select.select([], [s], []) + s.close() +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\nNeeded %d calls to do_handshake() to establish session.\n" % count) + + def test_get_server_certificate(self): +- with test_support.transient_internet("svn.python.org"): +- pem = ssl.get_server_certificate(("svn.python.org", 443), +- ssl.PROTOCOL_SSLv23) +- if not pem: +- self.fail("No server certificate on svn.python.org:443!") ++ def _test_get_server_certificate(host, port, cert=None): ++ with support.transient_internet(host): ++ pem = ssl.get_server_certificate((host, port)) ++ if not pem: ++ self.fail("No server certificate on %s:%s!" % (host, port)) + +- try: +- pem = ssl.get_server_certificate(("svn.python.org", 443), +- ssl.PROTOCOL_SSLv23, +- ca_certs=CERTFILE) +- except ssl.SSLError: +- #should fail +- pass +- else: +- self.fail("Got server certificate %s for svn.python.org!" % pem) ++ try: ++ pem = ssl.get_server_certificate((host, port), ++ ca_certs=CERTFILE) ++ except ssl.SSLError as x: ++ #should fail ++ if support.verbose: ++ sys.stdout.write("%s\n" % x) ++ else: ++ self.fail("Got server certificate %s for %s:%s!" % (pem, host, port)) + +- pem = ssl.get_server_certificate(("svn.python.org", 443), +- ssl.PROTOCOL_SSLv23, +- ca_certs=SVN_PYTHON_ORG_ROOT_CERT) +- if not pem: +- self.fail("No server certificate on svn.python.org:443!") +- if test_support.verbose: +- sys.stdout.write("\nVerified certificate for svn.python.org:443 is\n%s\n" % pem) ++ pem = ssl.get_server_certificate((host, port), ++ ca_certs=cert) ++ if not pem: ++ self.fail("No server certificate on %s:%s!" % (host, port)) ++ if support.verbose: ++ sys.stdout.write("\nVerified certificate for %s:%s is\n%s\n" % (host, port ,pem)) ++ ++ _test_get_server_certificate('svn.python.org', 443, SVN_PYTHON_ORG_ROOT_CERT) ++ if support.IPV6_ENABLED: ++ _test_get_server_certificate('ipv6.google.com', 443) ++ ++ def test_ciphers(self): ++ remote = ("svn.python.org", 443) ++ with support.transient_internet(remote[0]): ++ with closing(ssl.wrap_socket(socket.socket(socket.AF_INET), ++ cert_reqs=ssl.CERT_NONE, ciphers="ALL")) as s: ++ s.connect(remote) ++ with closing(ssl.wrap_socket(socket.socket(socket.AF_INET), ++ cert_reqs=ssl.CERT_NONE, ciphers="DEFAULT")) as s: ++ s.connect(remote) ++ # Error checking can happen at instantiation or when connecting ++ with self.assertRaisesRegexp(ssl.SSLError, "No cipher can be selected"): ++ with closing(socket.socket(socket.AF_INET)) as sock: ++ s = ssl.wrap_socket(sock, ++ cert_reqs=ssl.CERT_NONE, ciphers="^$:,;?*'dorothyx") ++ s.connect(remote) + + def test_algorithms(self): + # Issue #8484: all algorithms should be available when verifying a +@@ -419,17 +1487,21 @@ + # SHA256 was added in OpenSSL 0.9.8 + if ssl.OPENSSL_VERSION_INFO < (0, 9, 8, 0, 15): + self.skipTest("SHA256 not available on %r" % ssl.OPENSSL_VERSION) +- self.skipTest("remote host needs SNI, only available on Python 3.2+") +- # NOTE: https://sha2.hboeck.de is another possible test host ++ # sha256.tbs-internet.com needs SNI to use the correct certificate ++ if not ssl.HAS_SNI: ++ self.skipTest("SNI needed for this test") ++ # https://sha2.hboeck.de/ was used until 2011-01-08 (no route to host) + remote = ("sha256.tbs-internet.com", 443) + sha256_cert = os.path.join(os.path.dirname(__file__), "sha256.pem") +- with test_support.transient_internet("sha256.tbs-internet.com"): +- s = ssl.wrap_socket(socket.socket(socket.AF_INET), +- cert_reqs=ssl.CERT_REQUIRED, +- ca_certs=sha256_cert,) ++ with support.transient_internet("sha256.tbs-internet.com"): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx.verify_mode = ssl.CERT_REQUIRED ++ ctx.load_verify_locations(sha256_cert) ++ s = ctx.wrap_socket(socket.socket(socket.AF_INET), ++ server_hostname="sha256.tbs-internet.com") + try: + s.connect(remote) +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\nCipher with %r is %r\n" % + (remote, s.cipher())) + sys.stdout.write("Certificate is:\n%s\n" % +@@ -437,6 +1509,36 @@ + finally: + s.close() + ++ def test_get_ca_certs_capath(self): ++ # capath certs are loaded on request ++ with support.transient_internet("svn.python.org"): ++ ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ ctx.verify_mode = ssl.CERT_REQUIRED ++ ctx.load_verify_locations(capath=CAPATH) ++ self.assertEqual(ctx.get_ca_certs(), []) ++ s = ctx.wrap_socket(socket.socket(socket.AF_INET)) ++ s.connect(("svn.python.org", 443)) ++ try: ++ cert = s.getpeercert() ++ self.assertTrue(cert) ++ finally: ++ s.close() ++ self.assertEqual(len(ctx.get_ca_certs()), 1) ++ ++ @needs_sni ++ def test_context_setget(self): ++ # Check that the context of a connected socket can be replaced. ++ with support.transient_internet("svn.python.org"): ++ ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ ctx2 = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ s = socket.socket(socket.AF_INET) ++ with closing(ctx1.wrap_socket(s)) as ss: ++ ss.connect(("svn.python.org", 443)) ++ self.assertIs(ss.context, ctx1) ++ self.assertIs(ss._sslobj.context, ctx1) ++ ss.context = ctx2 ++ self.assertIs(ss.context, ctx2) ++ self.assertIs(ss._sslobj.context, ctx2) + + try: + import threading +@@ -445,6 +1547,8 @@ + else: + _have_threads = True + ++ from test.ssl_servers import make_https_server ++ + class ThreadedEchoServer(threading.Thread): + + class ConnectionHandler(threading.Thread): +@@ -453,48 +1557,51 @@ + with and without the SSL wrapper around the socket connection, so + that we can test the STARTTLS functionality.""" + +- def __init__(self, server, connsock): ++ def __init__(self, server, connsock, addr): + self.server = server + self.running = False + self.sock = connsock ++ self.addr = addr + self.sock.setblocking(1) + self.sslconn = None + threading.Thread.__init__(self) + self.daemon = True + +- def show_conn_details(self): +- if self.server.certreqs == ssl.CERT_REQUIRED: +- cert = self.sslconn.getpeercert() +- if test_support.verbose and self.server.chatty: +- sys.stdout.write(" client cert is " + pprint.pformat(cert) + "\n") +- cert_binary = self.sslconn.getpeercert(True) +- if test_support.verbose and self.server.chatty: +- sys.stdout.write(" cert binary is " + str(len(cert_binary)) + " bytes\n") +- cipher = self.sslconn.cipher() +- if test_support.verbose and self.server.chatty: +- sys.stdout.write(" server: connection cipher is now " + str(cipher) + "\n") +- + def wrap_conn(self): + try: +- self.sslconn = ssl.wrap_socket(self.sock, server_side=True, +- certfile=self.server.certificate, +- ssl_version=self.server.protocol, +- ca_certs=self.server.cacerts, +- cert_reqs=self.server.certreqs, +- ciphers=self.server.ciphers) +- except ssl.SSLError as e: ++ self.sslconn = self.server.context.wrap_socket( ++ self.sock, server_side=True) ++ self.server.selected_protocols.append(self.sslconn.selected_npn_protocol()) ++ except socket.error as e: ++ # We treat ConnectionResetError as though it were an ++ # SSLError - OpenSSL on Ubuntu abruptly closes the ++ # connection when asked to use an unsupported protocol. ++ # + # XXX Various errors can have happened here, for example + # a mismatching protocol version, an invalid certificate, + # or a low-level bug. This should be made more discriminating. ++ if not isinstance(e, ssl.SSLError) and e.errno != errno.ECONNRESET: ++ raise + self.server.conn_errors.append(e) + if self.server.chatty: +- handle_error("\n server: bad connection attempt from " + +- str(self.sock.getpeername()) + ":\n") +- self.close() ++ handle_error("\n server: bad connection attempt from " + repr(self.addr) + ":\n") + self.running = False + self.server.stop() ++ self.close() + return False + else: ++ if self.server.context.verify_mode == ssl.CERT_REQUIRED: ++ cert = self.sslconn.getpeercert() ++ if support.verbose and self.server.chatty: ++ sys.stdout.write(" client cert is " + pprint.pformat(cert) + "\n") ++ cert_binary = self.sslconn.getpeercert(True) ++ if support.verbose and self.server.chatty: ++ sys.stdout.write(" cert binary is " + str(len(cert_binary)) + " bytes\n") ++ cipher = self.sslconn.cipher() ++ if support.verbose and self.server.chatty: ++ sys.stdout.write(" server: connection cipher is now " + str(cipher) + "\n") ++ sys.stdout.write(" server: selected protocol is now " ++ + str(self.sslconn.selected_npn_protocol()) + "\n") + return True + + def read(self): +@@ -513,48 +1620,53 @@ + if self.sslconn: + self.sslconn.close() + else: +- self.sock._sock.close() ++ self.sock.close() + + def run(self): + self.running = True + if not self.server.starttls_server: +- if isinstance(self.sock, ssl.SSLSocket): +- self.sslconn = self.sock +- elif not self.wrap_conn(): ++ if not self.wrap_conn(): + return +- self.show_conn_details() + while self.running: + try: + msg = self.read() +- if not msg: ++ stripped = msg.strip() ++ if not stripped: + # eof, so quit this handler + self.running = False + self.close() +- elif msg.strip() == 'over': +- if test_support.verbose and self.server.connectionchatty: ++ elif stripped == b'over': ++ if support.verbose and self.server.connectionchatty: + sys.stdout.write(" server: client closed connection\n") + self.close() + return +- elif self.server.starttls_server and msg.strip() == 'STARTTLS': +- if test_support.verbose and self.server.connectionchatty: ++ elif (self.server.starttls_server and ++ stripped == b'STARTTLS'): ++ if support.verbose and self.server.connectionchatty: + sys.stdout.write(" server: read STARTTLS from client, sending OK...\n") +- self.write("OK\n") ++ self.write(b"OK\n") + if not self.wrap_conn(): + return +- elif self.server.starttls_server and self.sslconn and msg.strip() == 'ENDTLS': +- if test_support.verbose and self.server.connectionchatty: ++ elif (self.server.starttls_server and self.sslconn ++ and stripped == b'ENDTLS'): ++ if support.verbose and self.server.connectionchatty: + sys.stdout.write(" server: read ENDTLS from client, sending OK...\n") +- self.write("OK\n") +- self.sslconn.unwrap() ++ self.write(b"OK\n") ++ self.sock = self.sslconn.unwrap() + self.sslconn = None +- if test_support.verbose and self.server.connectionchatty: ++ if support.verbose and self.server.connectionchatty: + sys.stdout.write(" server: connection is now unencrypted...\n") ++ elif stripped == b'CB tls-unique': ++ if support.verbose and self.server.connectionchatty: ++ sys.stdout.write(" server: read CB tls-unique from client, sending our CB data...\n") ++ data = self.sslconn.get_channel_binding("tls-unique") ++ self.write(repr(data).encode("us-ascii") + b"\n") + else: +- if (test_support.verbose and ++ if (support.verbose and + self.server.connectionchatty): + ctype = (self.sslconn and "encrypted") or "unencrypted" +- sys.stdout.write(" server: read %s (%s), sending back %s (%s)...\n" +- % (repr(msg), ctype, repr(msg.lower()), ctype)) ++ sys.stdout.write(" server: read %r (%s), sending back %r (%s)...\n" ++ % (msg, ctype, msg.lower(), ctype)) + self.write(msg.lower()) + except ssl.SSLError: + if self.server.chatty: +@@ -565,36 +1677,34 @@ + # harness, we want to stop the server + self.server.stop() + +- def __init__(self, certificate, ssl_version=None, ++ def __init__(self, certificate=None, ssl_version=None, + certreqs=None, cacerts=None, + chatty=True, connectionchatty=False, starttls_server=False, +- wrap_accepting_socket=False, ciphers=None): +- +- if ssl_version is None: +- ssl_version = ssl.PROTOCOL_TLSv1 +- if certreqs is None: +- certreqs = ssl.CERT_NONE +- self.certificate = certificate +- self.protocol = ssl_version +- self.certreqs = certreqs +- self.cacerts = cacerts +- self.ciphers = ciphers ++ npn_protocols=None, ciphers=None, context=None): ++ if context: ++ self.context = context ++ else: ++ self.context = ssl.SSLContext(ssl_version ++ if ssl_version is not None ++ else ssl.PROTOCOL_TLSv1) ++ self.context.verify_mode = (certreqs if certreqs is not None ++ else ssl.CERT_NONE) ++ if cacerts: ++ self.context.load_verify_locations(cacerts) ++ if certificate: ++ self.context.load_cert_chain(certificate) ++ if npn_protocols: ++ self.context.set_npn_protocols(npn_protocols) ++ if ciphers: ++ self.context.set_ciphers(ciphers) + self.chatty = chatty + self.connectionchatty = connectionchatty + self.starttls_server = starttls_server + self.sock = socket.socket() ++ self.port = support.bind_port(self.sock) + self.flag = None +- if wrap_accepting_socket: +- self.sock = ssl.wrap_socket(self.sock, server_side=True, +- certfile=self.certificate, +- cert_reqs = self.certreqs, +- ca_certs = self.cacerts, +- ssl_version = self.protocol, +- ciphers = self.ciphers) +- if test_support.verbose and self.chatty: +- sys.stdout.write(' server: wrapped server socket as %s\n' % str(self.sock)) +- self.port = test_support.bind_port(self.sock) + self.active = False ++ self.selected_protocols = [] + self.conn_errors = [] + threading.Thread.__init__(self) + self.daemon = True +@@ -622,10 +1732,10 @@ + while self.active: + try: + newconn, connaddr = self.sock.accept() +- if test_support.verbose and self.chatty: ++ if support.verbose and self.chatty: + sys.stdout.write(' server: new connection from ' +- + str(connaddr) + '\n') +- handler = self.ConnectionHandler(self, newconn) ++ + repr(connaddr) + '\n') ++ handler = self.ConnectionHandler(self, newconn, connaddr) + handler.start() + handler.join() + except socket.timeout: +@@ -644,11 +1754,12 @@ + class ConnectionHandler(asyncore.dispatcher_with_send): + + def __init__(self, conn, certfile): +- asyncore.dispatcher_with_send.__init__(self, conn) + self.socket = ssl.wrap_socket(conn, server_side=True, + certfile=certfile, + do_handshake_on_connect=False) ++ asyncore.dispatcher_with_send.__init__(self, self.socket) + self._ssl_accepting = True ++ self._do_ssl_handshake() + + def readable(self): + if isinstance(self.socket, ssl.SSLSocket): +@@ -659,12 +1770,11 @@ + def _do_ssl_handshake(self): + try: + self.socket.do_handshake() +- except ssl.SSLError, err: +- if err.args[0] in (ssl.SSL_ERROR_WANT_READ, +- ssl.SSL_ERROR_WANT_WRITE): +- return +- elif err.args[0] == ssl.SSL_ERROR_EOF: +- return self.handle_close() ++ except (ssl.SSLWantReadError, ssl.SSLWantWriteError): ++ return ++ except ssl.SSLEOFError: ++ return self.handle_close() ++ except ssl.SSLError: + raise + except socket.error, err: + if err.args[0] == errno.ECONNABORTED: +@@ -677,12 +1787,16 @@ + self._do_ssl_handshake() + else: + data = self.recv(1024) +- if data and data.strip() != 'over': ++ if support.verbose: ++ sys.stdout.write(" server: read %s from client\n" % repr(data)) ++ if not data: ++ self.close() ++ else: + self.send(data.lower()) + + def handle_close(self): + self.close() +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write(" server: closed connection %s\n" % self.socket) + + def handle_error(self): +@@ -690,14 +1804,14 @@ + + def __init__(self, certfile): + self.certfile = certfile +- asyncore.dispatcher.__init__(self) +- self.create_socket(socket.AF_INET, socket.SOCK_STREAM) +- self.port = test_support.bind_port(self.socket) ++ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) ++ self.port = support.bind_port(sock, '') ++ asyncore.dispatcher.__init__(self, sock) + self.listen(5) + + def handle_accept(self): + sock_obj, addr = self.accept() +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write(" server: new connection from %s:%s\n" %addr) + self.ConnectionHandler(sock_obj, self.certfile) + +@@ -721,13 +1835,13 @@ + return self + + def __exit__(self, *args): +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write(" cleanup: stopping server.\n") + self.stop() +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write(" cleanup: joining server thread.\n") + self.join() +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write(" cleanup: successfully joined.\n") + + def start(self, flag=None): +@@ -739,103 +1853,15 @@ + if self.flag: + self.flag.set() + while self.active: +- asyncore.loop(0.05) ++ try: ++ asyncore.loop(1) ++ except: ++ pass + + def stop(self): + self.active = False + self.server.close() + +- class SocketServerHTTPSServer(threading.Thread): +- +- class HTTPSServer(HTTPServer): +- +- def __init__(self, server_address, RequestHandlerClass, certfile): +- HTTPServer.__init__(self, server_address, RequestHandlerClass) +- # we assume the certfile contains both private key and certificate +- self.certfile = certfile +- self.allow_reuse_address = True +- +- def __str__(self): +- return ('<%s %s:%s>' % +- (self.__class__.__name__, +- self.server_name, +- self.server_port)) +- +- def get_request(self): +- # override this to wrap socket with SSL +- sock, addr = self.socket.accept() +- sslconn = ssl.wrap_socket(sock, server_side=True, +- certfile=self.certfile) +- return sslconn, addr +- +- class RootedHTTPRequestHandler(SimpleHTTPRequestHandler): +- # need to override translate_path to get a known root, +- # instead of using os.curdir, since the test could be +- # run from anywhere +- +- server_version = "TestHTTPS/1.0" +- +- root = None +- +- def translate_path(self, path): +- """Translate a /-separated PATH to the local filename syntax. +- +- Components that mean special things to the local file system +- (e.g. drive or directory names) are ignored. (XXX They should +- probably be diagnosed.) +- +- """ +- # abandon query parameters +- path = urlparse.urlparse(path)[2] +- path = os.path.normpath(urllib.unquote(path)) +- words = path.split('/') +- words = filter(None, words) +- path = self.root +- for word in words: +- drive, word = os.path.splitdrive(word) +- head, word = os.path.split(word) +- if word in self.root: continue +- path = os.path.join(path, word) +- return path +- +- def log_message(self, format, *args): +- +- # we override this to suppress logging unless "verbose" +- +- if test_support.verbose: +- sys.stdout.write(" server (%s:%d %s):\n [%s] %s\n" % +- (self.server.server_address, +- self.server.server_port, +- self.request.cipher(), +- self.log_date_time_string(), +- format%args)) +- +- +- def __init__(self, certfile): +- self.flag = None +- self.RootedHTTPRequestHandler.root = os.path.split(CERTFILE)[0] +- self.server = self.HTTPSServer( +- (HOST, 0), self.RootedHTTPRequestHandler, certfile) +- self.port = self.server.server_port +- threading.Thread.__init__(self) +- self.daemon = True +- +- def __str__(self): +- return "<%s %s>" % (self.__class__.__name__, self.server) +- +- def start(self, flag=None): +- self.flag = flag +- threading.Thread.start(self) +- +- def run(self): +- if self.flag: +- self.flag.set() +- self.server.serve_forever(0.05) +- +- def stop(self): +- self.server.shutdown() +- +- + def bad_cert_test(certfile): + """ + Launch a server with CERT_REQUIRED, and check that trying to +@@ -843,74 +1869,82 @@ + """ + server = ThreadedEchoServer(CERTFILE, + certreqs=ssl.CERT_REQUIRED, +- cacerts=CERTFILE, chatty=False) ++ cacerts=CERTFILE, chatty=False, ++ connectionchatty=False) + with server: + try: +- s = ssl.wrap_socket(socket.socket(), +- certfile=certfile, +- ssl_version=ssl.PROTOCOL_TLSv1) +- s.connect((HOST, server.port)) +- except ssl.SSLError, x: +- if test_support.verbose: +- sys.stdout.write("\nSSLError is %s\n" % x[1]) +- except socket.error, x: +- if test_support.verbose: +- sys.stdout.write("\nsocket.error is %s\n" % x[1]) ++ with closing(socket.socket()) as sock: ++ s = ssl.wrap_socket(sock, ++ certfile=certfile, ++ ssl_version=ssl.PROTOCOL_TLSv1) ++ s.connect((HOST, server.port)) ++ except ssl.SSLError as x: ++ if support.verbose: ++ sys.stdout.write("\nSSLError is %s\n" % x.args[1]) ++ except OSError as x: ++ if support.verbose: ++ sys.stdout.write("\nOSError is %s\n" % x.args[1]) ++ except OSError as x: ++ if x.errno != errno.ENOENT: ++ raise ++ if support.verbose: ++ sys.stdout.write("\OSError is %s\n" % str(x)) + else: + raise AssertionError("Use of invalid cert should have failed!") + +- def server_params_test(certfile, protocol, certreqs, cacertsfile, +- client_certfile, client_protocol=None, indata="FOO\n", +- ciphers=None, chatty=True, connectionchatty=False, +- wrap_accepting_socket=False): ++ def server_params_test(client_context, server_context, indata=b"FOO\n", ++ chatty=True, connectionchatty=False, sni_name=None): + """ + Launch a server, connect a client to it and try various reads + and writes. + """ +- server = ThreadedEchoServer(certfile, +- certreqs=certreqs, +- ssl_version=protocol, +- cacerts=cacertsfile, +- ciphers=ciphers, ++ stats = {} ++ server = ThreadedEchoServer(context=server_context, + chatty=chatty, +- connectionchatty=connectionchatty, +- wrap_accepting_socket=wrap_accepting_socket) ++ connectionchatty=False) + with server: +- # try to connect +- if client_protocol is None: +- client_protocol = protocol +- s = ssl.wrap_socket(socket.socket(), +- certfile=client_certfile, +- ca_certs=cacertsfile, +- ciphers=ciphers, +- cert_reqs=certreqs, +- ssl_version=client_protocol) +- s.connect((HOST, server.port)) +- for arg in [indata, bytearray(indata), memoryview(indata)]: ++ with closing(client_context.wrap_socket(socket.socket(), ++ server_hostname=sni_name)) as s: ++ s.connect((HOST, server.port)) ++ for arg in [indata, bytearray(indata), memoryview(indata)]: ++ if connectionchatty: ++ if support.verbose: ++ sys.stdout.write( ++ " client: sending %r...\n" % indata) ++ s.write(arg) ++ outdata = s.read() ++ if connectionchatty: ++ if support.verbose: ++ sys.stdout.write(" client: read %r\n" % outdata) ++ if outdata != indata.lower(): ++ raise AssertionError( ++ "bad data <<%r>> (%d) received; expected <<%r>> (%d)\n" ++ % (outdata[:20], len(outdata), ++ indata[:20].lower(), len(indata))) ++ s.write(b"over\n") + if connectionchatty: +- if test_support.verbose: +- sys.stdout.write( +- " client: sending %s...\n" % (repr(arg))) +- s.write(arg) +- outdata = s.read() +- if connectionchatty: +- if test_support.verbose: +- sys.stdout.write(" client: read %s\n" % repr(outdata)) +- if outdata != indata.lower(): +- raise AssertionError( +- "bad data <<%s>> (%d) received; expected <<%s>> (%d)\n" +- % (outdata[:min(len(outdata),20)], len(outdata), +- indata[:min(len(indata),20)].lower(), len(indata))) +- s.write("over\n") +- if connectionchatty: +- if test_support.verbose: +- sys.stdout.write(" client: closing connection.\n") +- s.close() ++ if support.verbose: ++ sys.stdout.write(" client: closing connection.\n") ++ stats.update({ ++ 'compression': s.compression(), ++ 'cipher': s.cipher(), ++ 'peercert': s.getpeercert(), ++ 'client_npn_protocol': s.selected_npn_protocol(), ++ 'version': s.version(), ++ }) ++ s.close() ++ stats['server_npn_protocols'] = server.selected_protocols ++ return stats + +- def try_protocol_combo(server_protocol, +- client_protocol, +- expect_success, +- certsreqs=None): ++ def try_protocol_combo(server_protocol, client_protocol, expect_success, ++ certsreqs=None, server_options=0, client_options=0): ++ """ ++ Try to SSL-connect using *client_protocol* to *server_protocol*. ++ If *expect_success* is true, assert that the connection succeeds, ++ if it's false, assert that the connection fails. ++ Also, if *expect_success* is a string, assert that it is the protocol ++ version actually used by the connection. ++ """ + if certsreqs is None: + certsreqs = ssl.CERT_NONE + certtype = { +@@ -918,19 +1952,30 @@ + ssl.CERT_OPTIONAL: "CERT_OPTIONAL", + ssl.CERT_REQUIRED: "CERT_REQUIRED", + }[certsreqs] +- if test_support.verbose: ++ if support.verbose: + formatstr = (expect_success and " %s->%s %s\n") or " {%s->%s} %s\n" + sys.stdout.write(formatstr % + (ssl.get_protocol_name(client_protocol), + ssl.get_protocol_name(server_protocol), + certtype)) ++ client_context = ssl.SSLContext(client_protocol) ++ client_context.options |= client_options ++ server_context = ssl.SSLContext(server_protocol) ++ server_context.options |= server_options ++ ++ # NOTE: we must enable "ALL" ciphers on the client, otherwise an ++ # SSLv23 client will send an SSLv3 hello (rather than SSLv2) ++ # starting from OpenSSL 1.0.0 (see issue #8322). ++ if client_context.protocol == ssl.PROTOCOL_SSLv23: ++ client_context.set_ciphers("ALL") ++ ++ for ctx in (client_context, server_context): ++ ctx.verify_mode = certsreqs ++ ctx.load_cert_chain(CERTFILE) ++ ctx.load_verify_locations(CERTFILE) + try: +- # NOTE: we must enable "ALL" ciphers, otherwise an SSLv23 client +- # will send an SSLv3 hello (rather than SSLv2) starting from +- # OpenSSL 1.0.0 (see issue #8322). +- server_params_test(CERTFILE, server_protocol, certsreqs, +- CERTFILE, CERTFILE, client_protocol, +- ciphers="ALL", chatty=False) ++ stats = server_params_test(client_context, server_context, ++ chatty=False, connectionchatty=False) + # Protocol mismatch can result in either an SSLError, or a + # "Connection reset by peer" error. + except ssl.SSLError: +@@ -945,79 +1990,46 @@ + "Client protocol %s succeeded with server protocol %s!" + % (ssl.get_protocol_name(client_protocol), + ssl.get_protocol_name(server_protocol))) ++ elif (expect_success is not True ++ and expect_success != stats['version']): ++ raise AssertionError("version mismatch: expected %r, got %r" ++ % (expect_success, stats['version'])) + + + class ThreadedTests(unittest.TestCase): + +- def test_rude_shutdown(self): +- """A brutal shutdown of an SSL server should raise an IOError +- in the client when attempting handshake. +- """ +- listener_ready = threading.Event() +- listener_gone = threading.Event() +- +- s = socket.socket() +- port = test_support.bind_port(s, HOST) +- +- # `listener` runs in a thread. It sits in an accept() until +- # the main thread connects. Then it rudely closes the socket, +- # and sets Event `listener_gone` to let the main thread know +- # the socket is gone. +- def listener(): +- s.listen(5) +- listener_ready.set() +- s.accept() +- s.close() +- listener_gone.set() +- +- def connector(): +- listener_ready.wait() +- c = socket.socket() +- c.connect((HOST, port)) +- listener_gone.wait() +- try: +- ssl_sock = ssl.wrap_socket(c) +- except IOError: +- pass +- else: +- self.fail('connecting to closed SSL socket should have failed') +- +- t = threading.Thread(target=listener) +- t.start() +- try: +- connector() +- finally: +- t.join() +- + @skip_if_broken_ubuntu_ssl + def test_echo(self): + """Basic test of an SSL client connecting to a server""" +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n") +- server_params_test(CERTFILE, ssl.PROTOCOL_TLSv1, ssl.CERT_NONE, +- CERTFILE, CERTFILE, ssl.PROTOCOL_TLSv1, +- chatty=True, connectionchatty=True) ++ for protocol in PROTOCOLS: ++ context = ssl.SSLContext(protocol) ++ context.load_cert_chain(CERTFILE) ++ server_params_test(context, context, ++ chatty=True, connectionchatty=True) + + def test_getpeercert(self): +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n") +- s2 = socket.socket() +- server = ThreadedEchoServer(CERTFILE, +- certreqs=ssl.CERT_NONE, +- ssl_version=ssl.PROTOCOL_SSLv23, +- cacerts=CERTFILE, +- chatty=False) ++ context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ context.verify_mode = ssl.CERT_REQUIRED ++ context.load_verify_locations(CERTFILE) ++ context.load_cert_chain(CERTFILE) ++ server = ThreadedEchoServer(context=context, chatty=False) + with server: +- s = ssl.wrap_socket(socket.socket(), +- certfile=CERTFILE, +- ca_certs=CERTFILE, +- cert_reqs=ssl.CERT_REQUIRED, +- ssl_version=ssl.PROTOCOL_SSLv23) ++ s = context.wrap_socket(socket.socket(), ++ do_handshake_on_connect=False) + s.connect((HOST, server.port)) ++ # getpeercert() raise ValueError while the handshake isn't ++ # done. ++ with self.assertRaises(ValueError): ++ s.getpeercert() ++ s.do_handshake() + cert = s.getpeercert() + self.assertTrue(cert, "Can't get peer certificate.") + cipher = s.cipher() +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write(pprint.pformat(cert) + '\n') + sys.stdout.write("Connection cipher is " + str(cipher) + '.\n') + if 'subject' not in cert: +@@ -1028,8 +2040,94 @@ + self.fail( + "Missing or invalid 'organizationName' field in certificate subject; " + "should be 'Python Software Foundation'.") ++ self.assertIn('notBefore', cert) ++ self.assertIn('notAfter', cert) ++ before = ssl.cert_time_to_seconds(cert['notBefore']) ++ after = ssl.cert_time_to_seconds(cert['notAfter']) ++ self.assertLess(before, after) + s.close() + ++ @unittest.skipUnless(have_verify_flags(), ++ "verify_flags need OpenSSL > 0.9.8") ++ def test_crl_check(self): ++ if support.verbose: ++ sys.stdout.write("\n") ++ ++ server_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ server_context.load_cert_chain(SIGNED_CERTFILE) ++ ++ context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ context.verify_mode = ssl.CERT_REQUIRED ++ context.load_verify_locations(SIGNING_CA) ++ self.assertEqual(context.verify_flags, ssl.VERIFY_DEFAULT) ++ ++ # VERIFY_DEFAULT should pass ++ server = ThreadedEchoServer(context=server_context, chatty=True) ++ with server: ++ with closing(context.wrap_socket(socket.socket())) as s: ++ s.connect((HOST, server.port)) ++ cert = s.getpeercert() ++ self.assertTrue(cert, "Can't get peer certificate.") ++ ++ # VERIFY_CRL_CHECK_LEAF without a loaded CRL file fails ++ context.verify_flags |= ssl.VERIFY_CRL_CHECK_LEAF ++ ++ server = ThreadedEchoServer(context=server_context, chatty=True) ++ with server: ++ with closing(context.wrap_socket(socket.socket())) as s: ++ with self.assertRaisesRegexp(ssl.SSLError, ++ "certificate verify failed"): ++ s.connect((HOST, server.port)) ++ ++ # now load a CRL file. The CRL file is signed by the CA. ++ context.load_verify_locations(CRLFILE) ++ ++ server = ThreadedEchoServer(context=server_context, chatty=True) ++ with server: ++ with closing(context.wrap_socket(socket.socket())) as s: ++ s.connect((HOST, server.port)) ++ cert = s.getpeercert() ++ self.assertTrue(cert, "Can't get peer certificate.") ++ ++ @needs_sni ++ def test_check_hostname(self): ++ if support.verbose: ++ sys.stdout.write("\n") ++ ++ server_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ server_context.load_cert_chain(SIGNED_CERTFILE) ++ ++ context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ context.verify_mode = ssl.CERT_REQUIRED ++ context.check_hostname = True ++ context.load_verify_locations(SIGNING_CA) ++ ++ # correct hostname should verify ++ server = ThreadedEchoServer(context=server_context, chatty=True) ++ with server: ++ with closing(context.wrap_socket(socket.socket(), ++ server_hostname="localhost")) as s: ++ s.connect((HOST, server.port)) ++ cert = s.getpeercert() ++ self.assertTrue(cert, "Can't get peer certificate.") ++ ++ # incorrect hostname should raise an exception ++ server = ThreadedEchoServer(context=server_context, chatty=True) ++ with server: ++ with closing(context.wrap_socket(socket.socket(), ++ server_hostname="invalid")) as s: ++ with self.assertRaisesRegexp(ssl.CertificateError, ++ "hostname 'invalid' doesn't match u?'localhost'"): ++ s.connect((HOST, server.port)) ++ ++ # missing server_hostname arg should cause an exception, too ++ server = ThreadedEchoServer(context=server_context, chatty=True) ++ with server: ++ with closing(socket.socket()) as s: ++ with self.assertRaisesRegexp(ValueError, ++ "check_hostname requires server_hostname"): ++ context.wrap_socket(s) ++ + def test_empty_cert(self): + """Connecting with an empty cert file""" + bad_cert_test(os.path.join(os.path.dirname(__file__) or os.curdir, +@@ -1047,64 +2145,184 @@ + bad_cert_test(os.path.join(os.path.dirname(__file__) or os.curdir, + "badkey.pem")) + ++ def test_rude_shutdown(self): ++ """A brutal shutdown of an SSL server should raise an OSError ++ in the client when attempting handshake. ++ """ ++ listener_ready = threading.Event() ++ listener_gone = threading.Event() ++ ++ s = socket.socket() ++ port = support.bind_port(s, HOST) ++ ++ # `listener` runs in a thread. It sits in an accept() until ++ # the main thread connects. Then it rudely closes the socket, ++ # and sets Event `listener_gone` to let the main thread know ++ # the socket is gone. ++ def listener(): ++ s.listen(5) ++ listener_ready.set() ++ newsock, addr = s.accept() ++ newsock.close() ++ s.close() ++ listener_gone.set() ++ ++ def connector(): ++ listener_ready.wait() ++ with closing(socket.socket()) as c: ++ c.connect((HOST, port)) ++ listener_gone.wait() ++ try: ++ ssl_sock = ssl.wrap_socket(c) ++ except socket.error: ++ pass ++ else: ++ self.fail('connecting to closed SSL socket should have failed') ++ ++ t = threading.Thread(target=listener) ++ t.start() ++ try: ++ connector() ++ finally: ++ t.join() ++ + @skip_if_broken_ubuntu_ssl ++ @unittest.skipUnless(hasattr(ssl, 'PROTOCOL_SSLv2'), ++ "OpenSSL is compiled without SSLv2 support") + def test_protocol_sslv2(self): + """Connecting to an SSLv2 server with various client options""" +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n") +- if not hasattr(ssl, 'PROTOCOL_SSLv2'): +- self.skipTest("PROTOCOL_SSLv2 needed") + try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True) + try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_OPTIONAL) + try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_REQUIRED) + try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False) + try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv3, False) + try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_TLSv1, False) ++ # SSLv23 client with specific SSL options ++ if no_sslv2_implies_sslv3_hello(): ++ # No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs ++ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False, ++ client_options=ssl.OP_NO_SSLv2) ++ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False, ++ client_options=ssl.OP_NO_SSLv3) ++ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False, ++ client_options=ssl.OP_NO_TLSv1) + + @skip_if_broken_ubuntu_ssl + def test_protocol_sslv23(self): + """Connecting to an SSLv23 server with various client options""" +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n") +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True) ++ if hasattr(ssl, 'PROTOCOL_SSLv2'): ++ try: ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv2, True) ++ except socket.error as x: ++ # this fails on some older versions of OpenSSL (0.9.7l, for instance) ++ if support.verbose: ++ sys.stdout.write( ++ " SSL2 client to SSL23 server test unexpectedly failed:\n %s\n" ++ % str(x)) ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3') + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True) +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True) ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, 'TLSv1') + +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL) ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3', ssl.CERT_OPTIONAL) + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_OPTIONAL) +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_OPTIONAL) ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, 'TLSv1', ssl.CERT_OPTIONAL) + +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED) ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3', ssl.CERT_REQUIRED) + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_REQUIRED) +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED) ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, 'TLSv1', ssl.CERT_REQUIRED) ++ ++ # Server with specific SSL options ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ++ server_options=ssl.OP_NO_SSLv3) ++ # Will choose TLSv1 ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ++ server_options=ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3) ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, False, ++ server_options=ssl.OP_NO_TLSv1) ++ + + @skip_if_broken_ubuntu_ssl + def test_protocol_sslv3(self): + """Connecting to an SSLv3 server with various client options""" +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n") +- try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True) +- try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL) +- try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED) ++ try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, 'SSLv3') ++ try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, 'SSLv3', ssl.CERT_OPTIONAL) ++ try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, 'SSLv3', ssl.CERT_REQUIRED) + if hasattr(ssl, 'PROTOCOL_SSLv2'): + try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv2, False) ++ try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False, ++ client_options=ssl.OP_NO_SSLv3) + try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False) ++ if no_sslv2_implies_sslv3_hello(): ++ # No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs ++ try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, 'SSLv3', ++ client_options=ssl.OP_NO_SSLv2) + + @skip_if_broken_ubuntu_ssl + def test_protocol_tlsv1(self): + """Connecting to a TLSv1 server with various client options""" +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n") +- try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True) +- try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True, ssl.CERT_OPTIONAL) +- try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, 'TLSv1') ++ try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, 'TLSv1', ssl.CERT_OPTIONAL) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, 'TLSv1', ssl.CERT_REQUIRED) + if hasattr(ssl, 'PROTOCOL_SSLv2'): + try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv2, False) + try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv3, False) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False, ++ client_options=ssl.OP_NO_TLSv1) ++ ++ @skip_if_broken_ubuntu_ssl ++ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_1"), ++ "TLS version 1.1 not supported.") ++ def test_protocol_tlsv1_1(self): ++ """Connecting to a TLSv1.1 server with various client options. ++ Testing against older TLS versions.""" ++ if support.verbose: ++ sys.stdout.write("\n") ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1_1, 'TLSv1.1') ++ if hasattr(ssl, 'PROTOCOL_SSLv2'): ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_SSLv2, False) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_SSLv3, False) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_SSLv23, False, ++ client_options=ssl.OP_NO_TLSv1_1) ++ ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1_1, 'TLSv1.1') ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1, False) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1_1, False) ++ ++ ++ @skip_if_broken_ubuntu_ssl ++ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_2"), ++ "TLS version 1.2 not supported.") ++ def test_protocol_tlsv1_2(self): ++ """Connecting to a TLSv1.2 server with various client options. ++ Testing against older TLS versions.""" ++ if support.verbose: ++ sys.stdout.write("\n") ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1_2, 'TLSv1.2', ++ server_options=ssl.OP_NO_SSLv3|ssl.OP_NO_SSLv2, ++ client_options=ssl.OP_NO_SSLv3|ssl.OP_NO_SSLv2,) ++ if hasattr(ssl, 'PROTOCOL_SSLv2'): ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_SSLv2, False) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_SSLv3, False) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_SSLv23, False, ++ client_options=ssl.OP_NO_TLSv1_2) ++ ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1_2, 'TLSv1.2') ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1, False) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1_2, False) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1_1, False) ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1_2, False) + + def test_starttls(self): + """Switching from clear text to encrypted and back again.""" +- msgs = ("msg 1", "MSG 2", "STARTTLS", "MSG 3", "msg 4", "ENDTLS", "msg 5", "msg 6") ++ msgs = (b"msg 1", b"MSG 2", b"STARTTLS", b"MSG 3", b"msg 4", b"ENDTLS", b"msg 5", b"msg 6") + + server = ThreadedEchoServer(CERTFILE, + ssl_version=ssl.PROTOCOL_TLSv1, +@@ -1116,119 +2334,110 @@ + s = socket.socket() + s.setblocking(1) + s.connect((HOST, server.port)) +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n") + for indata in msgs: +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write( +- " client: sending %s...\n" % repr(indata)) ++ " client: sending %r...\n" % indata) + if wrapped: + conn.write(indata) + outdata = conn.read() + else: + s.send(indata) + outdata = s.recv(1024) +- if (indata == "STARTTLS" and +- outdata.strip().lower().startswith("ok")): ++ msg = outdata.strip().lower() ++ if indata == b"STARTTLS" and msg.startswith(b"ok"): + # STARTTLS ok, switch to secure mode +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write( +- " client: read %s from server, starting TLS...\n" +- % repr(outdata)) ++ " client: read %r from server, starting TLS...\n" ++ % msg) + conn = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1) + wrapped = True +- elif (indata == "ENDTLS" and +- outdata.strip().lower().startswith("ok")): ++ elif indata == b"ENDTLS" and msg.startswith(b"ok"): + # ENDTLS ok, switch back to clear text +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write( +- " client: read %s from server, ending TLS...\n" +- % repr(outdata)) ++ " client: read %r from server, ending TLS...\n" ++ % msg) + s = conn.unwrap() + wrapped = False + else: +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write( +- " client: read %s from server\n" % repr(outdata)) +- if test_support.verbose: ++ " client: read %r from server\n" % msg) ++ if support.verbose: + sys.stdout.write(" client: closing connection.\n") + if wrapped: +- conn.write("over\n") ++ conn.write(b"over\n") + else: +- s.send("over\n") +- s.close() ++ s.send(b"over\n") ++ if wrapped: ++ conn.close() ++ else: ++ s.close() + + def test_socketserver(self): + """Using a SocketServer to create and manage SSL connections.""" +- server = SocketServerHTTPSServer(CERTFILE) +- flag = threading.Event() +- server.start(flag) +- # wait for it to start +- flag.wait() ++ server = make_https_server(self, certfile=CERTFILE) + # try to connect ++ if support.verbose: ++ sys.stdout.write('\n') ++ with open(CERTFILE, 'rb') as f: ++ d1 = f.read() ++ d2 = '' ++ # now fetch the same data from the HTTPS server ++ url = 'https://%s:%d/%s' % ( ++ HOST, server.port, os.path.split(CERTFILE)[1]) ++ with support.check_py3k_warnings(): ++ f = urllib.urlopen(url) + try: +- if test_support.verbose: +- sys.stdout.write('\n') +- with open(CERTFILE, 'rb') as f: +- d1 = f.read() +- d2 = '' +- # now fetch the same data from the HTTPS server +- url = 'https://127.0.0.1:%d/%s' % ( +- server.port, os.path.split(CERTFILE)[1]) +- with test_support.check_py3k_warnings(): +- f = urllib.urlopen(url) + dlen = f.info().getheader("content-length") + if dlen and (int(dlen) > 0): + d2 = f.read(int(dlen)) +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write( + " client: read %d bytes from remote server '%s'\n" + % (len(d2), server)) ++ finally: + f.close() +- self.assertEqual(d1, d2) +- finally: +- server.stop() +- server.join() +- +- def test_wrapped_accept(self): +- """Check the accept() method on SSL sockets.""" +- if test_support.verbose: +- sys.stdout.write("\n") +- server_params_test(CERTFILE, ssl.PROTOCOL_SSLv23, ssl.CERT_REQUIRED, +- CERTFILE, CERTFILE, ssl.PROTOCOL_SSLv23, +- chatty=True, connectionchatty=True, +- wrap_accepting_socket=True) ++ self.assertEqual(d1, d2) + + def test_asyncore_server(self): + """Check the example asyncore integration.""" + indata = "TEST MESSAGE of mixed case\n" + +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n") ++ ++ indata = b"FOO\n" + server = AsyncoreEchoServer(CERTFILE) + with server: + s = ssl.wrap_socket(socket.socket()) + s.connect(('127.0.0.1', server.port)) +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write( +- " client: sending %s...\n" % (repr(indata))) ++ " client: sending %r...\n" % indata) + s.write(indata) + outdata = s.read() +- if test_support.verbose: +- sys.stdout.write(" client: read %s\n" % repr(outdata)) ++ if support.verbose: ++ sys.stdout.write(" client: read %r\n" % outdata) + if outdata != indata.lower(): + self.fail( +- "bad data <<%s>> (%d) received; expected <<%s>> (%d)\n" +- % (outdata[:min(len(outdata),20)], len(outdata), +- indata[:min(len(indata),20)].lower(), len(indata))) +- s.write("over\n") +- if test_support.verbose: ++ "bad data <<%r>> (%d) received; expected <<%r>> (%d)\n" ++ % (outdata[:20], len(outdata), ++ indata[:20].lower(), len(indata))) ++ s.write(b"over\n") ++ if support.verbose: + sys.stdout.write(" client: closing connection.\n") + s.close() ++ if support.verbose: ++ sys.stdout.write(" client: connection closed.\n") + + def test_recv_send(self): + """Test recv(), send() and friends.""" +- if test_support.verbose: ++ if support.verbose: + sys.stdout.write("\n") + + server = ThreadedEchoServer(CERTFILE, +@@ -1247,12 +2456,12 @@ + s.connect((HOST, server.port)) + # helper methods for standardising recv* method signatures + def _recv_into(): +- b = bytearray("\0"*100) ++ b = bytearray(b"\0"*100) + count = s.recv_into(b) + return b[:count] + + def _recvfrom_into(): +- b = bytearray("\0"*100) ++ b = bytearray(b"\0"*100) + count, addr = s.recvfrom_into(b) + return b[:count] + +@@ -1271,73 +2480,73 @@ + data_prefix = u"PREFIX_" + + for meth_name, send_meth, expect_success, args in send_methods: +- indata = data_prefix + meth_name ++ indata = (data_prefix + meth_name).encode('ascii') + try: +- send_meth(indata.encode('ASCII', 'strict'), *args) ++ send_meth(indata, *args) + outdata = s.read() +- outdata = outdata.decode('ASCII', 'strict') + if outdata != indata.lower(): + self.fail( +- "While sending with <<%s>> bad data " +- "<<%r>> (%d) received; " +- "expected <<%r>> (%d)\n" % ( +- meth_name, outdata[:20], len(outdata), +- indata[:20], len(indata) ++ "While sending with <<{name:s}>> bad data " ++ "<<{outdata:r}>> ({nout:d}) received; " ++ "expected <<{indata:r}>> ({nin:d})\n".format( ++ name=meth_name, outdata=outdata[:20], ++ nout=len(outdata), ++ indata=indata[:20], nin=len(indata) + ) + ) + except ValueError as e: + if expect_success: + self.fail( +- "Failed to send with method <<%s>>; " +- "expected to succeed.\n" % (meth_name,) ++ "Failed to send with method <<{name:s}>>; " ++ "expected to succeed.\n".format(name=meth_name) + ) + if not str(e).startswith(meth_name): + self.fail( +- "Method <<%s>> failed with unexpected " +- "exception message: %s\n" % ( +- meth_name, e ++ "Method <<{name:s}>> failed with unexpected " ++ "exception message: {exp:s}\n".format( ++ name=meth_name, exp=e + ) + ) + + for meth_name, recv_meth, expect_success, args in recv_methods: +- indata = data_prefix + meth_name ++ indata = (data_prefix + meth_name).encode('ascii') + try: +- s.send(indata.encode('ASCII', 'strict')) ++ s.send(indata) + outdata = recv_meth(*args) +- outdata = outdata.decode('ASCII', 'strict') + if outdata != indata.lower(): + self.fail( +- "While receiving with <<%s>> bad data " +- "<<%r>> (%d) received; " +- "expected <<%r>> (%d)\n" % ( +- meth_name, outdata[:20], len(outdata), +- indata[:20], len(indata) ++ "While receiving with <<{name:s}>> bad data " ++ "<<{outdata:r}>> ({nout:d}) received; " ++ "expected <<{indata:r}>> ({nin:d})\n".format( ++ name=meth_name, outdata=outdata[:20], ++ nout=len(outdata), ++ indata=indata[:20], nin=len(indata) + ) + ) + except ValueError as e: + if expect_success: + self.fail( +- "Failed to receive with method <<%s>>; " +- "expected to succeed.\n" % (meth_name,) ++ "Failed to receive with method <<{name:s}>>; " ++ "expected to succeed.\n".format(name=meth_name) + ) + if not str(e).startswith(meth_name): + self.fail( +- "Method <<%s>> failed with unexpected " +- "exception message: %s\n" % ( +- meth_name, e ++ "Method <<{name:s}>> failed with unexpected " ++ "exception message: {exp:s}\n".format( ++ name=meth_name, exp=e + ) + ) + # consume data + s.read() + +- s.write("over\n".encode("ASCII", "strict")) ++ s.write(b"over\n") + s.close() + + def test_handshake_timeout(self): + # Issue #5103: SSL handshake must respect the socket timeout + server = socket.socket(socket.AF_INET) + host = "127.0.0.1" +- port = test_support.bind_port(server) ++ port = support.bind_port(server) + started = threading.Event() + finish = False + +@@ -1351,6 +2560,8 @@ + # Let the socket hang around rather than having + # it closed by garbage collection. + conns.append(server.accept()[0]) ++ for sock in conns: ++ sock.close() + + t = threading.Thread(target=serve) + t.start() +@@ -1368,8 +2579,8 @@ + c.close() + try: + c = socket.socket(socket.AF_INET) ++ c = ssl.wrap_socket(c) + c.settimeout(0.2) +- c = ssl.wrap_socket(c) + # Will attempt handshake and time out + self.assertRaisesRegexp(ssl.SSLError, "timed out", + c.connect, (host, port)) +@@ -1380,59 +2591,399 @@ + t.join() + server.close() + ++ def test_server_accept(self): ++ # Issue #16357: accept() on a SSLSocket created through ++ # SSLContext.wrap_socket(). ++ context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ context.verify_mode = ssl.CERT_REQUIRED ++ context.load_verify_locations(CERTFILE) ++ context.load_cert_chain(CERTFILE) ++ server = socket.socket(socket.AF_INET) ++ host = "127.0.0.1" ++ port = support.bind_port(server) ++ server = context.wrap_socket(server, server_side=True) ++ ++ evt = threading.Event() ++ remote = [None] ++ peer = [None] ++ def serve(): ++ server.listen(5) ++ # Block on the accept and wait on the connection to close. ++ evt.set() ++ remote[0], peer[0] = server.accept() ++ remote[0].recv(1) ++ ++ t = threading.Thread(target=serve) ++ t.start() ++ # Client wait until server setup and perform a connect. ++ evt.wait() ++ client = context.wrap_socket(socket.socket()) ++ client.connect((host, port)) ++ client_addr = client.getsockname() ++ client.close() ++ t.join() ++ remote[0].close() ++ server.close() ++ # Sanity checks. ++ self.assertIsInstance(remote[0], ssl.SSLSocket) ++ self.assertEqual(peer[0], client_addr) ++ ++ def test_getpeercert_enotconn(self): ++ context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ with closing(context.wrap_socket(socket.socket())) as sock: ++ with self.assertRaises(socket.error) as cm: ++ sock.getpeercert() ++ self.assertEqual(cm.exception.errno, errno.ENOTCONN) ++ ++ def test_do_handshake_enotconn(self): ++ context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ with closing(context.wrap_socket(socket.socket())) as sock: ++ with self.assertRaises(socket.error) as cm: ++ sock.do_handshake() ++ self.assertEqual(cm.exception.errno, errno.ENOTCONN) ++ + def test_default_ciphers(self): ++ context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ try: ++ # Force a set of weak ciphers on our client context ++ context.set_ciphers("DES") ++ except ssl.SSLError: ++ self.skipTest("no DES cipher available") + with ThreadedEchoServer(CERTFILE, + ssl_version=ssl.PROTOCOL_SSLv23, + chatty=False) as server: +- sock = socket.socket() +- try: +- # Force a set of weak ciphers on our client socket +- try: +- s = ssl.wrap_socket(sock, +- ssl_version=ssl.PROTOCOL_SSLv23, +- ciphers="DES") +- except ssl.SSLError: +- self.skipTest("no DES cipher available") +- with self.assertRaises((OSError, ssl.SSLError)): ++ with closing(context.wrap_socket(socket.socket())) as s: ++ with self.assertRaises(ssl.SSLError): + s.connect((HOST, server.port)) +- finally: +- sock.close() + self.assertIn("no shared cipher", str(server.conn_errors[0])) + ++ def test_version_basic(self): ++ """ ++ Basic tests for SSLSocket.version(). ++ More tests are done in the test_protocol_*() methods. ++ """ ++ context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ with ThreadedEchoServer(CERTFILE, ++ ssl_version=ssl.PROTOCOL_TLSv1, ++ chatty=False) as server: ++ with closing(context.wrap_socket(socket.socket())) as s: ++ self.assertIs(s.version(), None) ++ s.connect((HOST, server.port)) ++ self.assertEqual(s.version(), "TLSv1") ++ self.assertIs(s.version(), None) ++ ++ @unittest.skipUnless(ssl.HAS_ECDH, "test requires ECDH-enabled OpenSSL") ++ def test_default_ecdh_curve(self): ++ # Issue #21015: elliptic curve-based Diffie Hellman key exchange ++ # should be enabled by default on SSL contexts. ++ context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ context.load_cert_chain(CERTFILE) ++ # Prior to OpenSSL 1.0.0, ECDH ciphers have to be enabled ++ # explicitly using the 'ECCdraft' cipher alias. Otherwise, ++ # our default cipher list should prefer ECDH-based ciphers ++ # automatically. ++ if ssl.OPENSSL_VERSION_INFO < (1, 0, 0): ++ context.set_ciphers("ECCdraft:ECDH") ++ with ThreadedEchoServer(context=context) as server: ++ with closing(context.wrap_socket(socket.socket())) as s: ++ s.connect((HOST, server.port)) ++ self.assertIn("ECDH", s.cipher()[0]) ++ ++ @unittest.skipUnless("tls-unique" in ssl.CHANNEL_BINDING_TYPES, ++ "'tls-unique' channel binding not available") ++ def test_tls_unique_channel_binding(self): ++ """Test tls-unique channel binding.""" ++ if support.verbose: ++ sys.stdout.write("\n") ++ ++ server = ThreadedEchoServer(CERTFILE, ++ certreqs=ssl.CERT_NONE, ++ ssl_version=ssl.PROTOCOL_TLSv1, ++ cacerts=CERTFILE, ++ chatty=True, ++ connectionchatty=False) ++ with server: ++ s = ssl.wrap_socket(socket.socket(), ++ server_side=False, ++ certfile=CERTFILE, ++ ca_certs=CERTFILE, ++ cert_reqs=ssl.CERT_NONE, ++ ssl_version=ssl.PROTOCOL_TLSv1) ++ s.connect((HOST, server.port)) ++ # get the data ++ cb_data = s.get_channel_binding("tls-unique") ++ if support.verbose: ++ sys.stdout.write(" got channel binding data: {0!r}\n" ++ .format(cb_data)) ++ ++ # check if it is sane ++ self.assertIsNotNone(cb_data) ++ self.assertEqual(len(cb_data), 12) # True for TLSv1 ++ ++ # and compare with the peers version ++ s.write(b"CB tls-unique\n") ++ peer_data_repr = s.read().strip() ++ self.assertEqual(peer_data_repr, ++ repr(cb_data).encode("us-ascii")) ++ s.close() ++ ++ # now, again ++ s = ssl.wrap_socket(socket.socket(), ++ server_side=False, ++ certfile=CERTFILE, ++ ca_certs=CERTFILE, ++ cert_reqs=ssl.CERT_NONE, ++ ssl_version=ssl.PROTOCOL_TLSv1) ++ s.connect((HOST, server.port)) ++ new_cb_data = s.get_channel_binding("tls-unique") ++ if support.verbose: ++ sys.stdout.write(" got another channel binding data: {0!r}\n" ++ .format(new_cb_data)) ++ # is it really unique ++ self.assertNotEqual(cb_data, new_cb_data) ++ self.assertIsNotNone(cb_data) ++ self.assertEqual(len(cb_data), 12) # True for TLSv1 ++ s.write(b"CB tls-unique\n") ++ peer_data_repr = s.read().strip() ++ self.assertEqual(peer_data_repr, ++ repr(new_cb_data).encode("us-ascii")) ++ s.close() ++ ++ def test_compression(self): ++ context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ context.load_cert_chain(CERTFILE) ++ stats = server_params_test(context, context, ++ chatty=True, connectionchatty=True) ++ if support.verbose: ++ sys.stdout.write(" got compression: {!r}\n".format(stats['compression'])) ++ self.assertIn(stats['compression'], { None, 'ZLIB', 'RLE' }) ++ ++ @unittest.skipUnless(hasattr(ssl, 'OP_NO_COMPRESSION'), ++ "ssl.OP_NO_COMPRESSION needed for this test") ++ def test_compression_disabled(self): ++ context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ context.load_cert_chain(CERTFILE) ++ context.options |= ssl.OP_NO_COMPRESSION ++ stats = server_params_test(context, context, ++ chatty=True, connectionchatty=True) ++ self.assertIs(stats['compression'], None) ++ ++ def test_dh_params(self): ++ # Check we can get a connection with ephemeral Diffie-Hellman ++ context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ context.load_cert_chain(CERTFILE) ++ context.load_dh_params(DHFILE) ++ context.set_ciphers("kEDH") ++ stats = server_params_test(context, context, ++ chatty=True, connectionchatty=True) ++ cipher = stats["cipher"][0] ++ parts = cipher.split("-") ++ if "ADH" not in parts and "EDH" not in parts and "DHE" not in parts: ++ self.fail("Non-DH cipher: " + cipher[0]) ++ ++ def test_selected_npn_protocol(self): ++ # selected_npn_protocol() is None unless NPN is used ++ context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ context.load_cert_chain(CERTFILE) ++ stats = server_params_test(context, context, ++ chatty=True, connectionchatty=True) ++ self.assertIs(stats['client_npn_protocol'], None) ++ ++ @unittest.skipUnless(ssl.HAS_NPN, "NPN support needed for this test") ++ def test_npn_protocols(self): ++ server_protocols = ['http/1.1', 'spdy/2'] ++ protocol_tests = [ ++ (['http/1.1', 'spdy/2'], 'http/1.1'), ++ (['spdy/2', 'http/1.1'], 'http/1.1'), ++ (['spdy/2', 'test'], 'spdy/2'), ++ (['abc', 'def'], 'abc') ++ ] ++ for client_protocols, expected in protocol_tests: ++ server_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ server_context.load_cert_chain(CERTFILE) ++ server_context.set_npn_protocols(server_protocols) ++ client_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ client_context.load_cert_chain(CERTFILE) ++ client_context.set_npn_protocols(client_protocols) ++ stats = server_params_test(client_context, server_context, ++ chatty=True, connectionchatty=True) ++ ++ msg = "failed trying %s (s) and %s (c).\n" \ ++ "was expecting %s, but got %%s from the %%s" \ ++ % (str(server_protocols), str(client_protocols), ++ str(expected)) ++ client_result = stats['client_npn_protocol'] ++ self.assertEqual(client_result, expected, msg % (client_result, "client")) ++ server_result = stats['server_npn_protocols'][-1] \ ++ if len(stats['server_npn_protocols']) else 'nothing' ++ self.assertEqual(server_result, expected, msg % (server_result, "server")) ++ ++ def sni_contexts(self): ++ server_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ server_context.load_cert_chain(SIGNED_CERTFILE) ++ other_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ other_context.load_cert_chain(SIGNED_CERTFILE2) ++ client_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ++ client_context.verify_mode = ssl.CERT_REQUIRED ++ client_context.load_verify_locations(SIGNING_CA) ++ return server_context, other_context, client_context ++ ++ def check_common_name(self, stats, name): ++ cert = stats['peercert'] ++ self.assertIn((('commonName', name),), cert['subject']) ++ ++ @needs_sni ++ def test_sni_callback(self): ++ calls = [] ++ server_context, other_context, client_context = self.sni_contexts() ++ ++ def servername_cb(ssl_sock, server_name, initial_context): ++ calls.append((server_name, initial_context)) ++ if server_name is not None: ++ ssl_sock.context = other_context ++ server_context.set_servername_callback(servername_cb) ++ ++ stats = server_params_test(client_context, server_context, ++ chatty=True, ++ sni_name='supermessage') ++ # The hostname was fetched properly, and the certificate was ++ # changed for the connection. ++ self.assertEqual(calls, [("supermessage", server_context)]) ++ # CERTFILE4 was selected ++ self.check_common_name(stats, 'fakehostname') ++ ++ calls = [] ++ # The callback is called with server_name=None ++ stats = server_params_test(client_context, server_context, ++ chatty=True, ++ sni_name=None) ++ self.assertEqual(calls, [(None, server_context)]) ++ self.check_common_name(stats, 'localhost') ++ ++ # Check disabling the callback ++ calls = [] ++ server_context.set_servername_callback(None) ++ ++ stats = server_params_test(client_context, server_context, ++ chatty=True, ++ sni_name='notfunny') ++ # Certificate didn't change ++ self.check_common_name(stats, 'localhost') ++ self.assertEqual(calls, []) ++ ++ @needs_sni ++ def test_sni_callback_alert(self): ++ # Returning a TLS alert is reflected to the connecting client ++ server_context, other_context, client_context = self.sni_contexts() ++ ++ def cb_returning_alert(ssl_sock, server_name, initial_context): ++ return ssl.ALERT_DESCRIPTION_ACCESS_DENIED ++ server_context.set_servername_callback(cb_returning_alert) ++ ++ with self.assertRaises(ssl.SSLError) as cm: ++ stats = server_params_test(client_context, server_context, ++ chatty=False, ++ sni_name='supermessage') ++ self.assertEqual(cm.exception.reason, 'TLSV1_ALERT_ACCESS_DENIED') ++ ++ @needs_sni ++ def test_sni_callback_raising(self): ++ # Raising fails the connection with a TLS handshake failure alert. ++ server_context, other_context, client_context = self.sni_contexts() ++ ++ def cb_raising(ssl_sock, server_name, initial_context): ++ 1/0 ++ server_context.set_servername_callback(cb_raising) ++ ++ with self.assertRaises(ssl.SSLError) as cm, \ ++ support.captured_stderr() as stderr: ++ stats = server_params_test(client_context, server_context, ++ chatty=False, ++ sni_name='supermessage') ++ self.assertEqual(cm.exception.reason, 'SSLV3_ALERT_HANDSHAKE_FAILURE') ++ self.assertIn("ZeroDivisionError", stderr.getvalue()) ++ ++ @needs_sni ++ def test_sni_callback_wrong_return_type(self): ++ # Returning the wrong return type terminates the TLS connection ++ # with an internal error alert. ++ server_context, other_context, client_context = self.sni_contexts() ++ ++ def cb_wrong_return_type(ssl_sock, server_name, initial_context): ++ return "foo" ++ server_context.set_servername_callback(cb_wrong_return_type) ++ ++ with self.assertRaises(ssl.SSLError) as cm, \ ++ support.captured_stderr() as stderr: ++ stats = server_params_test(client_context, server_context, ++ chatty=False, ++ sni_name='supermessage') ++ self.assertEqual(cm.exception.reason, 'TLSV1_ALERT_INTERNAL_ERROR') ++ self.assertIn("TypeError", stderr.getvalue()) ++ ++ def test_read_write_after_close_raises_valuerror(self): ++ context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ++ context.verify_mode = ssl.CERT_REQUIRED ++ context.load_verify_locations(CERTFILE) ++ context.load_cert_chain(CERTFILE) ++ server = ThreadedEchoServer(context=context, chatty=False) ++ ++ with server: ++ s = context.wrap_socket(socket.socket()) ++ s.connect((HOST, server.port)) ++ s.close() ++ ++ self.assertRaises(ValueError, s.read, 1024) ++ self.assertRaises(ValueError, s.write, b'hello') ++ + + def test_main(verbose=False): +- global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT +- CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, +- "keycert.pem") +- SVN_PYTHON_ORG_ROOT_CERT = os.path.join( +- os.path.dirname(__file__) or os.curdir, +- "https_svn_python_org_root.pem") +- NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir, +- "nokia.pem") +- NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir, +- "nullbytecert.pem") ++ if support.verbose: ++ plats = { ++ 'Linux': platform.linux_distribution, ++ 'Mac': platform.mac_ver, ++ 'Windows': platform.win32_ver, ++ } ++ for name, func in plats.items(): ++ plat = func() ++ if plat and plat[0]: ++ plat = '%s %r' % (name, plat) ++ break ++ else: ++ plat = repr(platform.platform()) ++ print("test_ssl: testing with %r %r" % ++ (ssl.OPENSSL_VERSION, ssl.OPENSSL_VERSION_INFO)) ++ print(" under %s" % plat) ++ print(" HAS_SNI = %r" % ssl.HAS_SNI) ++ print(" OP_ALL = 0x%8x" % ssl.OP_ALL) ++ try: ++ print(" OP_NO_TLSv1_1 = 0x%8x" % ssl.OP_NO_TLSv1_1) ++ except AttributeError: ++ pass + +- if (not os.path.exists(CERTFILE) or +- not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or +- not os.path.exists(NOKIACERT) or +- not os.path.exists(NULLBYTECERT)): +- raise test_support.TestFailed("Can't read certificate files!") ++ for filename in [ ++ CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, BYTES_CERTFILE, ++ ONLYCERT, ONLYKEY, BYTES_ONLYCERT, BYTES_ONLYKEY, ++ SIGNED_CERTFILE, SIGNED_CERTFILE2, SIGNING_CA, ++ BADCERT, BADKEY, EMPTYCERT]: ++ if not os.path.exists(filename): ++ raise support.TestFailed("Can't read certificate file %r" % filename) + +- tests = [BasicTests, BasicSocketTests] ++ tests = [ContextTests, BasicTests, BasicSocketTests, SSLErrorTests] + +- if test_support.is_resource_enabled('network'): ++ if support.is_resource_enabled('network'): + tests.append(NetworkedTests) + + if _have_threads: +- thread_info = test_support.threading_setup() +- if thread_info and test_support.is_resource_enabled('network'): ++ thread_info = support.threading_setup() ++ if thread_info: + tests.append(ThreadedTests) + + try: +- test_support.run_unittest(*tests) ++ support.run_unittest(*tests) + finally: + if _have_threads: +- test_support.threading_cleanup(*thread_info) ++ support.threading_cleanup(*thread_info) + + if __name__ == "__main__": + test_main() +diff -r ee879c0ffa11 Lib/test/test_string.py +--- a/Lib/test/test_string.py ++++ b/Lib/test/test_string.py +@@ -16,13 +16,10 @@ + realresult + ) + +- def checkraises(self, exc, object, methodname, *args): +- self.assertRaises( +- exc, +- getattr(string, methodname), +- object, +- *args +- ) ++ def checkraises(self, exc, obj, methodname, *args): ++ with self.assertRaises(exc) as cm: ++ getattr(string, methodname)(obj, *args) ++ self.assertNotEqual(cm.exception.args[0], '') + + def checkcall(self, object, methodname, *args): + getattr(string, methodname)(object, *args) +diff -r ee879c0ffa11 Lib/test/test_support.py +--- a/Lib/test/test_support.py ++++ b/Lib/test/test_support.py +@@ -39,7 +39,7 @@ + "threading_cleanup", "reap_children", "cpython_only", + "check_impl_detail", "get_attribute", "py3k_bytes", + "import_fresh_module", "threading_cleanup", "reap_children", +- "strip_python_stderr"] ++ "strip_python_stderr", "IPV6_ENABLED"] + + class Error(Exception): + """Base class for regression test exceptions.""" +@@ -326,12 +326,11 @@ + reason = "cannot run without OS X gui process" + + # check on every platform whether tkinter can actually do anything +- # but skip the test on OS X because it can cause segfaults in Cocoa Tk +- # when running regrtest with the -j option (multiple threads/subprocesses) +- if (not reason) and (sys.platform != 'darwin'): ++ if not reason: + try: + from Tkinter import Tk + root = Tk() ++ root.update() + root.destroy() + except Exception as e: + err_string = str(e) +@@ -465,6 +464,23 @@ + port = sock.getsockname()[1] + return port + ++def _is_ipv6_enabled(): ++ """Check whether IPv6 is enabled on this host.""" ++ if socket.has_ipv6: ++ sock = None ++ try: ++ sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) ++ sock.bind((HOSTv6, 0)) ++ return True ++ except socket.error: ++ pass ++ finally: ++ if sock: ++ sock.close() ++ return False ++ ++IPV6_ENABLED = _is_ipv6_enabled() ++ + FUZZ = 1e-6 + + def fcmp(x, y): # fuzzy comparison function +@@ -498,13 +514,18 @@ + # for a discussion of this number). + SOCK_MAX_SIZE = 16 * 1024 * 1024 + 1 + ++is_jython = sys.platform.startswith('java') ++ + try: + unicode + have_unicode = True + except NameError: + have_unicode = False + +-is_jython = sys.platform.startswith('java') ++requires_unicode = unittest.skipUnless(have_unicode, 'no unicode support') ++ ++def u(s): ++ return unicode(s, 'unicode-escape') + + # FS_NONASCII: non-ASCII Unicode character encodable by + # sys.getfilesystemencoding(), or None if there is no such character. +diff -r ee879c0ffa11 Lib/test/test_sys.py +--- a/Lib/test/test_sys.py ++++ b/Lib/test/test_sys.py +@@ -494,6 +494,31 @@ + # but lists are + self.assertEqual(sys.getsizeof([]), size('P PP') + gc_header_size) + ++ def test_errors(self): ++ class BadSizeof(object): ++ def __sizeof__(self): ++ raise ValueError ++ self.assertRaises(ValueError, sys.getsizeof, BadSizeof()) ++ ++ class InvalidSizeof(object): ++ def __sizeof__(self): ++ return None ++ self.assertRaises(TypeError, sys.getsizeof, InvalidSizeof()) ++ sentinel = ["sentinel"] ++ self.assertIs(sys.getsizeof(InvalidSizeof(), sentinel), sentinel) ++ ++ class OverflowSizeof(int): ++ def __sizeof__(self): ++ return int(self) ++ self.assertEqual(sys.getsizeof(OverflowSizeof(sys.maxsize)), ++ sys.maxsize + self.gc_headsize) ++ with self.assertRaises(OverflowError): ++ sys.getsizeof(OverflowSizeof(sys.maxsize + 1)) ++ with self.assertRaises(ValueError): ++ sys.getsizeof(OverflowSizeof(-1)) ++ with self.assertRaises((ValueError, OverflowError)): ++ sys.getsizeof(OverflowSizeof(-sys.maxsize - 1)) ++ + def test_default(self): + size = test.test_support.calcobjsize + self.assertEqual(sys.getsizeof(True, -1), size('l')) +diff -r ee879c0ffa11 Lib/test/test_sysconfig.py +--- a/Lib/test/test_sysconfig.py ++++ b/Lib/test/test_sysconfig.py +@@ -243,6 +243,14 @@ + 'posix_home', 'posix_prefix', 'posix_user') + self.assertEqual(get_scheme_names(), wanted) + ++ @unittest.skipIf(sys.platform.startswith('win'), ++ 'Test is not Windows compatible') ++ def test_get_makefile_filename(self): ++ makefile = sysconfig.get_makefile_filename() ++ self.assertTrue(os.path.isfile(makefile), makefile) ++ # Issue 22199 ++ self.assertEqual(sysconfig._get_makefile_filename(), makefile) ++ + def test_symlink(self): + # Issue 7880 + symlink = get_attribute(os, "symlink") +diff -r ee879c0ffa11 Lib/test/test_tcl.py +--- a/Lib/test/test_tcl.py ++++ b/Lib/test/test_tcl.py +@@ -7,6 +7,9 @@ + # Skip this test if the _tkinter module wasn't built. + _tkinter = test_support.import_module('_tkinter') + ++# Make sure tkinter._fix runs to set up the environment ++tkinter = test_support.import_fresh_module('Tkinter') ++ + from Tkinter import Tcl + from _tkinter import TclError + +@@ -420,10 +423,9 @@ + self.assertEqual(passValue(float('inf')), float('inf')) + self.assertEqual(passValue(-float('inf')), -float('inf')) + else: +- f = float(passValue(float('nan'))) +- self.assertNotEqual(f, f) + self.assertEqual(float(passValue(float('inf'))), float('inf')) + self.assertEqual(float(passValue(-float('inf'))), -float('inf')) ++ # XXX NaN representation can be not parsable by float() + self.assertEqual(passValue((1, '2', (3.4,))), + (1, '2', (3.4,)) if self.wantobjects else '1 2 3.4') + +@@ -434,47 +436,45 @@ + return arg + self.interp.createcommand('testfunc', testfunc) + self.addCleanup(self.interp.tk.deletecommand, 'testfunc') +- def check(value, expected, expected2=None, eq=self.assertEqual): +- if expected2 is None: +- expected2 = expected ++ def check(value, expected=None, eq=self.assertEqual): ++ if expected is None: ++ expected = value + del result[:] + r = self.interp.call('testfunc', value) + self.assertEqual(len(result), 1) + self.assertIsInstance(result[0], (str, unicode)) +- eq(result[0], expected2) ++ eq(result[0], expected) + self.assertIsInstance(r, (str, unicode)) +- eq(r, expected2) ++ eq(r, expected) + def float_eq(actual, expected): +- expected = float(expected) + self.assertAlmostEqual(float(actual), expected, + delta=abs(expected) * 1e-10) +- def nan_eq(actual, expected): +- actual = float(actual) +- self.assertNotEqual(actual, actual) + + check(True, '1') + check(False, '0') +- check('string', 'string') +- check('string\xbd', 'string\xbd') +- check('string\xe2\x82\xac', 'string\xe2\x82\xac', u'string\u20ac') +- check(u'string', u'string') +- check(u'string\xbd', 'string\xc2\xbd', u'string\xbd') +- check(u'string\u20ac', 'string\xe2\x82\xac', u'string\u20ac') +- check('str\xc0\x80ing', 'str\xc0\x80ing', u'str\x00ing') +- check('str\xc0\x80ing\xe2\x82\xac', 'str\xc0\x80ing\xe2\x82\xac', u'str\x00ing\u20ac') +- check(u'str\x00ing', 'str\xc0\x80ing', u'str\x00ing') +- check(u'str\x00ing\xbd', 'str\xc0\x80ing\xc2\xbd', u'str\x00ing\xbd') +- check(u'str\x00ing\u20ac', 'str\xc0\x80ing\xe2\x82\xac', u'str\x00ing\u20ac') ++ check('string') ++ check('string\xbd') ++ check('string\xe2\x82\xac', u'string\u20ac') ++ check('') ++ check(u'string') ++ check(u'string\xbd') ++ check(u'string\u20ac') ++ check(u'') ++ check('str\xc0\x80ing', u'str\x00ing') ++ check('str\xc0\x80ing\xe2\x82\xac', u'str\x00ing\u20ac') ++ check(u'str\x00ing') ++ check(u'str\x00ing\xbd') ++ check(u'str\x00ing\u20ac') + for i in (0, 1, -1, 2**31-1, -2**31): + check(i, str(i)) + for f in (0.0, 1.0, -1.0): + check(f, repr(f)) + for f in (1/3.0, sys.float_info.min, sys.float_info.max, + -sys.float_info.min, -sys.float_info.max): +- check(f, f, eq=float_eq) +- check(float('inf'), 'Inf', eq=float_eq) +- check(-float('inf'), '-Inf', eq=float_eq) +- check(float('nan'), 'NaN', eq=nan_eq) ++ check(f, eq=float_eq) ++ check(float('inf'), eq=float_eq) ++ check(-float('inf'), eq=float_eq) ++ # XXX NaN representation can be not parsable by float() + check((), '') + check((1, (2,), (3, 4), '5 6', ()), '1 2 {3 4} {5 6} {}') + +@@ -569,6 +569,42 @@ + for arg, res in testcases: + self.assertEqual(split(arg), res) + ++ def test_splitdict(self): ++ splitdict = tkinter._splitdict ++ tcl = self.interp.tk ++ ++ arg = '-a {1 2 3} -something foo status {}' ++ self.assertEqual(splitdict(tcl, arg, False), ++ {'-a': '1 2 3', '-something': 'foo', 'status': ''}) ++ self.assertEqual(splitdict(tcl, arg), ++ {'a': '1 2 3', 'something': 'foo', 'status': ''}) ++ ++ arg = ('-a', (1, 2, 3), '-something', 'foo', 'status', '{}') ++ self.assertEqual(splitdict(tcl, arg, False), ++ {'-a': (1, 2, 3), '-something': 'foo', 'status': '{}'}) ++ self.assertEqual(splitdict(tcl, arg), ++ {'a': (1, 2, 3), 'something': 'foo', 'status': '{}'}) ++ ++ self.assertRaises(RuntimeError, splitdict, tcl, '-a b -c ') ++ self.assertRaises(RuntimeError, splitdict, tcl, ('-a', 'b', '-c')) ++ ++ arg = tcl.call('list', ++ '-a', (1, 2, 3), '-something', 'foo', 'status', ()) ++ self.assertEqual(splitdict(tcl, arg), ++ {'a': (1, 2, 3) if self.wantobjects else '1 2 3', ++ 'something': 'foo', 'status': ''}) ++ ++ if tcl_version >= (8, 5): ++ arg = tcl.call('dict', 'create', ++ '-a', (1, 2, 3), '-something', 'foo', 'status', ()) ++ if not self.wantobjects or get_tk_patchlevel() < (8, 5, 5): ++ # Before 8.5.5 dicts were converted to lists through string ++ expected = {'a': '1 2 3', 'something': 'foo', 'status': ''} ++ else: ++ expected = {'a': (1, 2, 3), 'something': 'foo', 'status': ''} ++ self.assertEqual(splitdict(tcl, arg), expected) ++ ++ + character_size = 4 if sys.maxunicode > 0xFFFF else 2 + + class BigmemTclTest(unittest.TestCase): +diff -r ee879c0ffa11 Lib/test/test_threading.py +--- a/Lib/test/test_threading.py ++++ b/Lib/test/test_threading.py +@@ -829,6 +829,85 @@ + thread.start() + self.assertRaises(RuntimeError, setattr, thread, "daemon", True) + ++ def test_print_exception(self): ++ script = r"""if 1: ++ import threading ++ import time ++ ++ running = False ++ def run(): ++ global running ++ running = True ++ while running: ++ time.sleep(0.01) ++ 1/0 ++ t = threading.Thread(target=run) ++ t.start() ++ while not running: ++ time.sleep(0.01) ++ running = False ++ t.join() ++ """ ++ rc, out, err = assert_python_ok("-c", script) ++ self.assertEqual(out, '') ++ self.assertIn("Exception in thread", err) ++ self.assertIn("Traceback (most recent call last):", err) ++ self.assertIn("ZeroDivisionError", err) ++ self.assertNotIn("Unhandled exception", err) ++ ++ def test_print_exception_stderr_is_none_1(self): ++ script = r"""if 1: ++ import sys ++ import threading ++ import time ++ ++ running = False ++ def run(): ++ global running ++ running = True ++ while running: ++ time.sleep(0.01) ++ 1/0 ++ t = threading.Thread(target=run) ++ t.start() ++ while not running: ++ time.sleep(0.01) ++ sys.stderr = None ++ running = False ++ t.join() ++ """ ++ rc, out, err = assert_python_ok("-c", script) ++ self.assertEqual(out, '') ++ self.assertIn("Exception in thread", err) ++ self.assertIn("Traceback (most recent call last):", err) ++ self.assertIn("ZeroDivisionError", err) ++ self.assertNotIn("Unhandled exception", err) ++ ++ def test_print_exception_stderr_is_none_2(self): ++ script = r"""if 1: ++ import sys ++ import threading ++ import time ++ ++ running = False ++ def run(): ++ global running ++ running = True ++ while running: ++ time.sleep(0.01) ++ 1/0 ++ sys.stderr = None ++ t = threading.Thread(target=run) ++ t.start() ++ while not running: ++ time.sleep(0.01) ++ running = False ++ t.join() ++ """ ++ rc, out, err = assert_python_ok("-c", script) ++ self.assertEqual(out, '') ++ self.assertNotIn("Unhandled exception", err) ++ + + class LockTests(lock_tests.LockTests): + locktype = staticmethod(threading.Lock) +diff -r ee879c0ffa11 Lib/test/test_ttk_guionly.py +--- a/Lib/test/test_ttk_guionly.py ++++ b/Lib/test/test_ttk_guionly.py +@@ -13,23 +13,28 @@ + with test_support.DirsOnSysPath(lib_tk_test): + import runtktests + ++import Tkinter as tkinter + import ttk + from _tkinter import TclError + ++root = None + try: +- ttk.Button() +-except TclError, msg: ++ root = tkinter.Tk() ++ button = ttk.Button(root) ++ button.destroy() ++ del button ++except TclError as msg: + # assuming ttk is not available + raise unittest.SkipTest("ttk not available: %s" % msg) ++finally: ++ if root is not None: ++ root.destroy() ++ del root + + def test_main(): + with test_support.DirsOnSysPath(lib_tk_test): +- from test_ttk.support import get_tk_root +- try: +- test_support.run_unittest( +- *runtktests.get_tests(text=False, packages=['test_ttk'])) +- finally: +- get_tk_root().destroy() ++ test_support.run_unittest( ++ *runtktests.get_tests(text=False, packages=['test_ttk'])) + + if __name__ == '__main__': + test_main() +diff -r ee879c0ffa11 Lib/test/test_unicode.py +--- a/Lib/test/test_unicode.py ++++ b/Lib/test/test_unicode.py +@@ -1659,6 +1659,118 @@ + self.assertEqual("%s" % u, u'__unicode__ overridden') + self.assertEqual("{}".format(u), '__unicode__ overridden') + ++ # Test PyUnicode_FromFormat() ++ def test_from_format(self): ++ test_support.import_module('ctypes') ++ from ctypes import ( ++ pythonapi, py_object, sizeof, ++ c_int, c_long, c_longlong, c_ssize_t, ++ c_uint, c_ulong, c_ulonglong, c_size_t, c_void_p) ++ if sys.maxunicode == 0xffff: ++ name = "PyUnicodeUCS2_FromFormat" ++ else: ++ name = "PyUnicodeUCS4_FromFormat" ++ _PyUnicode_FromFormat = getattr(pythonapi, name) ++ _PyUnicode_FromFormat.restype = py_object ++ ++ def PyUnicode_FromFormat(format, *args): ++ cargs = tuple( ++ py_object(arg) if isinstance(arg, unicode) else arg ++ for arg in args) ++ return _PyUnicode_FromFormat(format, *cargs) ++ ++ def check_format(expected, format, *args): ++ text = PyUnicode_FromFormat(format, *args) ++ self.assertEqual(expected, text) ++ ++ # ascii format, non-ascii argument ++ check_format(u'ascii\x7f=unicode\xe9', ++ b'ascii\x7f=%U', u'unicode\xe9') ++ ++ # non-ascii format, ascii argument: ensure that PyUnicode_FromFormatV() ++ # raises an error ++ #self.assertRaisesRegex(ValueError, ++ # '^PyUnicode_FromFormatV\(\) expects an ASCII-encoded format ' ++ # 'string, got a non-ASCII byte: 0xe9$', ++ # PyUnicode_FromFormat, b'unicode\xe9=%s', u'ascii') ++ ++ # test "%c" ++ check_format(u'\uabcd', ++ b'%c', c_int(0xabcd)) ++ if sys.maxunicode > 0xffff: ++ check_format(u'\U0010ffff', ++ b'%c', c_int(0x10ffff)) ++ with self.assertRaises(OverflowError): ++ PyUnicode_FromFormat(b'%c', c_int(0x110000)) ++ # Issue #18183 ++ if sys.maxunicode > 0xffff: ++ check_format(u'\U00010000\U00100000', ++ b'%c%c', c_int(0x10000), c_int(0x100000)) ++ ++ # test "%" ++ check_format(u'%', ++ b'%') ++ check_format(u'%', ++ b'%%') ++ check_format(u'%s', ++ b'%%s') ++ check_format(u'[%]', ++ b'[%%]') ++ check_format(u'%abc', ++ b'%%%s', b'abc') ++ ++ # test %S ++ check_format(u"repr=abc", ++ b'repr=%S', u'abc') ++ ++ # test %R ++ check_format(u"repr=u'abc'", ++ b'repr=%R', u'abc') ++ ++ # test integer formats (%i, %d, %u) ++ check_format(u'010', ++ b'%03i', c_int(10)) ++ check_format(u'0010', ++ b'%0.4i', c_int(10)) ++ check_format(u'-123', ++ b'%i', c_int(-123)) ++ ++ check_format(u'-123', ++ b'%d', c_int(-123)) ++ check_format(u'-123', ++ b'%ld', c_long(-123)) ++ check_format(u'-123', ++ b'%zd', c_ssize_t(-123)) ++ ++ check_format(u'123', ++ b'%u', c_uint(123)) ++ check_format(u'123', ++ b'%lu', c_ulong(123)) ++ check_format(u'123', ++ b'%zu', c_size_t(123)) ++ ++ # test long output ++ PyUnicode_FromFormat(b'%p', c_void_p(-1)) ++ ++ # test %V ++ check_format(u'repr=abc', ++ b'repr=%V', u'abc', b'xyz') ++ check_format(u'repr=\xe4\xba\xba\xe6\xb0\x91', ++ b'repr=%V', None, b'\xe4\xba\xba\xe6\xb0\x91') ++ check_format(u'repr=abc\xff', ++ b'repr=%V', None, b'abc\xff') ++ ++ # not supported: copy the raw format string. these tests are just here ++ # to check for crashs and should not be considered as specifications ++ check_format(u'%s', ++ b'%1%s', b'abc') ++ check_format(u'%1abc', ++ b'%1abc') ++ check_format(u'%+i', ++ b'%+i', c_int(10)) ++ check_format(u'%s', ++ b'%.%s', b'abc') ++ + @test_support.cpython_only + def test_encode_decimal(self): + from _testcapi import unicode_encodedecimal +diff -r ee879c0ffa11 Lib/test/test_urllib2_localnet.py +--- a/Lib/test/test_urllib2_localnet.py ++++ b/Lib/test/test_urllib2_localnet.py +@@ -1,3 +1,4 @@ ++import base64 + import urlparse + import urllib2 + import BaseHTTPServer +@@ -66,6 +67,46 @@ + + # Authentication infrastructure + ++ ++class BasicAuthHandler(BaseHTTPServer.BaseHTTPRequestHandler): ++ """Handler for performing Basic Authentication.""" ++ # Server side values ++ USER = "testUser" ++ PASSWD = "testPass" ++ REALM = "Test" ++ USER_PASSWD = "%s:%s" % (USER, PASSWD) ++ ENCODED_AUTH = base64.b64encode(USER_PASSWD) ++ ++ def __init__(self, *args, **kwargs): ++ BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, *args, **kwargs) ++ ++ def log_message(self, format, *args): ++ # Supress the HTTP Console log output ++ pass ++ ++ def do_HEAD(self): ++ self.send_response(200) ++ self.send_header("Content-type", "text/html") ++ self.end_headers() ++ ++ def do_AUTHHEAD(self): ++ self.send_response(401) ++ self.send_header("WWW-Authenticate", "Basic realm=\"%s\"" % self.REALM) ++ self.send_header("Content-type", "text/html") ++ self.end_headers() ++ ++ def do_GET(self): ++ if self.headers.getheader("Authorization") == None: ++ self.do_AUTHHEAD() ++ self.wfile.write("No Auth Header Received") ++ elif self.headers.getheader( ++ "Authorization") == "Basic " + self.ENCODED_AUTH: ++ self.wfile.write("It works!") ++ else: ++ # Unauthorized Request ++ self.do_AUTHHEAD() ++ ++ + class DigestAuthHandler: + """Handler for performing digest authentication.""" + +@@ -228,6 +269,45 @@ + test_support.threading_cleanup(*self._threads) + + ++class BasicAuthTests(BaseTestCase): ++ USER = "testUser" ++ PASSWD = "testPass" ++ INCORRECT_PASSWD = "Incorrect" ++ REALM = "Test" ++ ++ def setUp(self): ++ super(BasicAuthTests, self).setUp() ++ # With Basic Authentication ++ def http_server_with_basic_auth_handler(*args, **kwargs): ++ return BasicAuthHandler(*args, **kwargs) ++ self.server = LoopbackHttpServerThread(http_server_with_basic_auth_handler) ++ self.server_url = 'http://127.0.0.1:%s' % self.server.port ++ self.server.start() ++ self.server.ready.wait() ++ ++ def tearDown(self): ++ self.server.stop() ++ super(BasicAuthTests, self).tearDown() ++ ++ def test_basic_auth_success(self): ++ ah = urllib2.HTTPBasicAuthHandler() ++ ah.add_password(self.REALM, self.server_url, self.USER, self.PASSWD) ++ urllib2.install_opener(urllib2.build_opener(ah)) ++ try: ++ self.assertTrue(urllib2.urlopen(self.server_url)) ++ except urllib2.HTTPError: ++ self.fail("Basic Auth Failed for url: %s" % self.server_url) ++ except Exception as e: ++ raise e ++ ++ def test_basic_auth_httperror(self): ++ ah = urllib2.HTTPBasicAuthHandler() ++ ah.add_password(self.REALM, self.server_url, self.USER, ++ self.INCORRECT_PASSWD) ++ urllib2.install_opener(urllib2.build_opener(ah)) ++ self.assertRaises(urllib2.HTTPError, urllib2.urlopen, self.server_url) ++ ++ + class ProxyAuthTests(BaseTestCase): + URL = "http://localhost" + +@@ -240,6 +320,7 @@ + self.digest_auth_handler = DigestAuthHandler() + self.digest_auth_handler.set_users({self.USER: self.PASSWD}) + self.digest_auth_handler.set_realm(self.REALM) ++ # With Digest Authentication + def create_fake_proxy_handler(*args, **kwargs): + return FakeProxyHandler(self.digest_auth_handler, *args, **kwargs) + +@@ -544,7 +625,7 @@ + # the next line. + #test_support.requires("network") + +- test_support.run_unittest(ProxyAuthTests, TestUrlopen) ++ test_support.run_unittest(BasicAuthTests, ProxyAuthTests, TestUrlopen) + + if __name__ == "__main__": + test_main() +diff -r ee879c0ffa11 Lib/test/test_urllib2net.py +--- a/Lib/test/test_urllib2net.py ++++ b/Lib/test/test_urllib2net.py +@@ -155,12 +155,12 @@ + ## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) + + def test_urlwithfrag(self): +- urlwith_frag = "https://docs.python.org/2/glossary.html#glossary" ++ urlwith_frag = "http://www.pythontest.net/index.html#frag" + with test_support.transient_internet(urlwith_frag): + req = urllib2.Request(urlwith_frag) + res = urllib2.urlopen(req) + self.assertEqual(res.geturl(), +- "https://docs.python.org/2/glossary.html#glossary") ++ "http://www.pythontest.net/index.html#frag") + + def test_fileno(self): + req = urllib2.Request("http://www.example.com") +diff -r ee879c0ffa11 Lib/test/test_userstring.py +--- a/Lib/test/test_userstring.py ++++ b/Lib/test/test_userstring.py +@@ -28,14 +28,12 @@ + realresult + ) + +- def checkraises(self, exc, object, methodname, *args): +- object = self.fixtype(object) ++ def checkraises(self, exc, obj, methodname, *args): ++ obj = self.fixtype(obj) + # we don't fix the arguments, because UserString can't cope with it +- self.assertRaises( +- exc, +- getattr(object, methodname), +- *args +- ) ++ with self.assertRaises(exc) as cm: ++ getattr(obj, methodname)(*args) ++ self.assertNotEqual(cm.exception.args[0], '') + + def checkcall(self, object, methodname, *args): + object = self.fixtype(object) +diff -r ee879c0ffa11 Lib/test/test_uu.py +--- a/Lib/test/test_uu.py ++++ b/Lib/test/test_uu.py +@@ -61,6 +61,26 @@ + except uu.Error, e: + self.assertEqual(str(e), "No valid begin line found in input file") + ++ def test_garbage_padding(self): ++ # Issue #22406 ++ encodedtext = ( ++ "begin 644 file\n" ++ # length 1; bits 001100 111111 111111 111111 ++ "\x21\x2C\x5F\x5F\x5F\n" ++ "\x20\n" ++ "end\n" ++ ) ++ plaintext = "\x33" # 00110011 ++ ++ inp = cStringIO.StringIO(encodedtext) ++ out = cStringIO.StringIO() ++ uu.decode(inp, out, quiet=True) ++ self.assertEqual(out.getvalue(), plaintext) ++ ++ import codecs ++ decoded = codecs.decode(encodedtext, "uu_codec") ++ self.assertEqual(decoded, plaintext) ++ + class UUStdIOTest(unittest.TestCase): + + def setUp(self): +diff -r ee879c0ffa11 Lib/test/test_uuid.py +--- a/Lib/test/test_uuid.py ++++ b/Lib/test/test_uuid.py +@@ -307,6 +307,24 @@ + if node is not None: + self.check_node(node, 'ifconfig') + ++ @unittest.skipUnless(os.name == 'posix', 'requires Posix') ++ def test_arp_getnode(self): ++ node = uuid._arp_getnode() ++ if node is not None: ++ self.check_node(node, 'arp') ++ ++ @unittest.skipUnless(os.name == 'posix', 'requires Posix') ++ def test_lanscan_getnode(self): ++ node = uuid._lanscan_getnode() ++ if node is not None: ++ self.check_node(node, 'lanscan') ++ ++ @unittest.skipUnless(os.name == 'posix', 'requires Posix') ++ def test_netstat_getnode(self): ++ node = uuid._netstat_getnode() ++ if node is not None: ++ self.check_node(node, 'netstat') ++ + @unittest.skipUnless(os.name == 'nt', 'requires Windows') + def test_ipconfig_getnode(self): + node = uuid._ipconfig_getnode() +diff -r ee879c0ffa11 Lib/test/test_warnings.py +--- a/Lib/test/test_warnings.py ++++ b/Lib/test/test_warnings.py +@@ -62,6 +62,25 @@ + sys.modules['warnings'] = original_warnings + super(BaseTest, self).tearDown() + ++class PublicAPITests(BaseTest): ++ ++ """Ensures that the correct values are exposed in the ++ public API. ++ """ ++ ++ def test_module_all_attribute(self): ++ self.assertTrue(hasattr(self.module, '__all__')) ++ target_api = ["warn", "warn_explicit", "showwarning", ++ "formatwarning", "filterwarnings", "simplefilter", ++ "resetwarnings", "catch_warnings"] ++ self.assertSetEqual(set(self.module.__all__), ++ set(target_api)) ++ ++class CPublicAPITests(PublicAPITests, unittest.TestCase): ++ module = c_warnings ++ ++class PyPublicAPITests(PublicAPITests, unittest.TestCase): ++ module = py_warnings + + class FilterTests(object): + +diff -r ee879c0ffa11 Lib/test/test_weakref.py +--- a/Lib/test/test_weakref.py ++++ b/Lib/test/test_weakref.py +@@ -1154,6 +1154,7 @@ + yield Object(v), v + finally: + it = None # should commit all removals ++ gc.collect() + self.check_weak_destroy_and_mutate_while_iterating(dict, testcontext) + + def test_weak_values_destroy_while_iterating(self): +@@ -1175,6 +1176,7 @@ + yield k, Object(k) + finally: + it = None # should commit all removals ++ gc.collect() + self.check_weak_destroy_and_mutate_while_iterating(dict, testcontext) + + def test_make_weak_keyed_dict_from_dict(self): +diff -r ee879c0ffa11 Lib/test/test_winreg.py +--- a/Lib/test/test_winreg.py ++++ b/Lib/test/test_winreg.py +@@ -341,7 +341,7 @@ + def test_queryvalueex_return_value(self): + # Test for Issue #16759, return unsigned int from QueryValueEx. + # Reg2Py, which gets called by QueryValueEx, was returning a value +- # generated by PyLong_FromLong. The implmentation now uses ++ # generated by PyLong_FromLong. The implementation now uses + # PyLong_FromUnsignedLong to match DWORD's size. + try: + with CreateKey(HKEY_CURRENT_USER, test_key_name) as ck: +@@ -354,6 +354,19 @@ + finally: + DeleteKey(HKEY_CURRENT_USER, test_key_name) + ++ def test_setvalueex_crash_with_none_arg(self): ++ # Test for Issue #21151, segfault when None is passed to SetValueEx ++ try: ++ with CreateKey(HKEY_CURRENT_USER, test_key_name) as ck: ++ self.assertNotEqual(ck.handle, 0) ++ test_val = None ++ SetValueEx(ck, "test_name", 0, REG_BINARY, test_val) ++ ret_val, ret_type = QueryValueEx(ck, "test_name") ++ self.assertEqual(ret_type, REG_BINARY) ++ self.assertEqual(ret_val, test_val) ++ finally: ++ DeleteKey(HKEY_CURRENT_USER, test_key_name) ++ + + + @unittest.skipUnless(REMOTE_NAME, "Skipping remote registry tests") +diff -r ee879c0ffa11 Lib/test/test_wsgiref.py +--- a/Lib/test/test_wsgiref.py ++++ b/Lib/test/test_wsgiref.py +@@ -113,6 +113,11 @@ + out, err = run_amock() + self.check_hello(out) + ++ def test_request_length(self): ++ out, err = run_amock(data="GET " + ("x" * 65537) + " HTTP/1.0\n\n") ++ self.assertEqual(out.splitlines()[0], ++ "HTTP/1.0 414 Request-URI Too Long") ++ + def test_validated_hello(self): + out, err = run_amock(validator(hello_app)) + # the middleware doesn't support len(), so content-length isn't there +diff -r ee879c0ffa11 Lib/test/test_xdrlib.py +--- a/Lib/test/test_xdrlib.py ++++ b/Lib/test/test_xdrlib.py +@@ -51,8 +51,32 @@ + up.done() + self.assertRaises(EOFError, up.unpack_uint) + ++class ConversionErrorTest(unittest.TestCase): ++ ++ def setUp(self): ++ self.packer = xdrlib.Packer() ++ ++ def assertRaisesConversion(self, *args): ++ self.assertRaises(xdrlib.ConversionError, *args) ++ ++ def test_pack_int(self): ++ self.assertRaisesConversion(self.packer.pack_int, 'string') ++ ++ def test_pack_uint(self): ++ self.assertRaisesConversion(self.packer.pack_uint, 'string') ++ ++ def test_float(self): ++ self.assertRaisesConversion(self.packer.pack_float, 'string') ++ ++ def test_double(self): ++ self.assertRaisesConversion(self.packer.pack_double, 'string') ++ ++ def test_uhyper(self): ++ self.assertRaisesConversion(self.packer.pack_uhyper, 'string') ++ + def test_main(): + test_support.run_unittest(XDRTest) ++ test_support.run_unittest(ConversionErrorTest) + + if __name__ == "__main__": + test_main() +diff -r ee879c0ffa11 Lib/test/test_zipfile.py +--- a/Lib/test/test_zipfile.py ++++ b/Lib/test/test_zipfile.py +@@ -605,7 +605,9 @@ + + def setUp(self): + self._limit = zipfile.ZIP64_LIMIT +- zipfile.ZIP64_LIMIT = 5 ++ self._filecount_limit = zipfile.ZIP_FILECOUNT_LIMIT ++ zipfile.ZIP64_LIMIT = 1000 ++ zipfile.ZIP_FILECOUNT_LIMIT = 9 + + line_gen = ("Test of zipfile line %d." % i + for i in range(0, FIXEDTEST_SIZE)) +@@ -709,8 +711,63 @@ + with zipfile.ZipFile(TESTFN2, "r", zipfile.ZIP_STORED) as zipfp: + self.assertEqual(zipfp.namelist(), ["absolute"]) + ++ def test_too_many_files(self): ++ # This test checks that more than 64k files can be added to an archive, ++ # and that the resulting archive can be read properly by ZipFile ++ zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=True) ++ zipf.debug = 100 ++ numfiles = 15 ++ for i in range(numfiles): ++ zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57)) ++ self.assertEqual(len(zipf.namelist()), numfiles) ++ zipf.close() ++ ++ zipf2 = zipfile.ZipFile(TESTFN, mode="r") ++ self.assertEqual(len(zipf2.namelist()), numfiles) ++ for i in range(numfiles): ++ content = zipf2.read("foo%08d" % i) ++ self.assertEqual(content, "%d" % (i**3 % 57)) ++ zipf2.close() ++ ++ def test_too_many_files_append(self): ++ zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=False) ++ zipf.debug = 100 ++ numfiles = 9 ++ for i in range(numfiles): ++ zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57)) ++ self.assertEqual(len(zipf.namelist()), numfiles) ++ with self.assertRaises(zipfile.LargeZipFile): ++ zipf.writestr("foo%08d" % numfiles, b'') ++ self.assertEqual(len(zipf.namelist()), numfiles) ++ zipf.close() ++ ++ zipf = zipfile.ZipFile(TESTFN, mode="a", allowZip64=False) ++ zipf.debug = 100 ++ self.assertEqual(len(zipf.namelist()), numfiles) ++ with self.assertRaises(zipfile.LargeZipFile): ++ zipf.writestr("foo%08d" % numfiles, b'') ++ self.assertEqual(len(zipf.namelist()), numfiles) ++ zipf.close() ++ ++ zipf = zipfile.ZipFile(TESTFN, mode="a", allowZip64=True) ++ zipf.debug = 100 ++ self.assertEqual(len(zipf.namelist()), numfiles) ++ numfiles2 = 15 ++ for i in range(numfiles, numfiles2): ++ zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57)) ++ self.assertEqual(len(zipf.namelist()), numfiles2) ++ zipf.close() ++ ++ zipf2 = zipfile.ZipFile(TESTFN, mode="r") ++ self.assertEqual(len(zipf2.namelist()), numfiles2) ++ for i in range(numfiles2): ++ content = zipf2.read("foo%08d" % i) ++ self.assertEqual(content, "%d" % (i**3 % 57)) ++ zipf2.close() ++ + def tearDown(self): + zipfile.ZIP64_LIMIT = self._limit ++ zipfile.ZIP_FILECOUNT_LIMIT = self._filecount_limit + unlink(TESTFN) + unlink(TESTFN2) + +@@ -1415,11 +1472,48 @@ + os.mkdir(os.path.join(TESTFN2, "a")) + self.test_extract_dir() + +- def test_store_dir(self): ++ def test_write_dir(self): ++ dirpath = os.path.join(TESTFN2, "x") ++ os.mkdir(dirpath) ++ mode = os.stat(dirpath).st_mode & 0xFFFF ++ with zipfile.ZipFile(TESTFN, "w") as zipf: ++ zipf.write(dirpath) ++ zinfo = zipf.filelist[0] ++ self.assertTrue(zinfo.filename.endswith("/x/")) ++ self.assertEqual(zinfo.external_attr, (mode << 16) | 0x10) ++ zipf.write(dirpath, "y") ++ zinfo = zipf.filelist[1] ++ self.assertTrue(zinfo.filename, "y/") ++ self.assertEqual(zinfo.external_attr, (mode << 16) | 0x10) ++ with zipfile.ZipFile(TESTFN, "r") as zipf: ++ zinfo = zipf.filelist[0] ++ self.assertTrue(zinfo.filename.endswith("/x/")) ++ self.assertEqual(zinfo.external_attr, (mode << 16) | 0x10) ++ zinfo = zipf.filelist[1] ++ self.assertTrue(zinfo.filename, "y/") ++ self.assertEqual(zinfo.external_attr, (mode << 16) | 0x10) ++ target = os.path.join(TESTFN2, "target") ++ os.mkdir(target) ++ zipf.extractall(target) ++ self.assertTrue(os.path.isdir(os.path.join(target, "y"))) ++ self.assertEqual(len(os.listdir(target)), 2) ++ ++ def test_writestr_dir(self): + os.mkdir(os.path.join(TESTFN2, "x")) + with zipfile.ZipFile(TESTFN, "w") as zipf: +- zipf.write(os.path.join(TESTFN2, "x"), "x") +- self.assertTrue(zipf.filelist[0].filename.endswith("x/")) ++ zipf.writestr("x/", b'') ++ zinfo = zipf.filelist[0] ++ self.assertEqual(zinfo.filename, "x/") ++ self.assertEqual(zinfo.external_attr, (0o40775 << 16) | 0x10) ++ with zipfile.ZipFile(TESTFN, "r") as zipf: ++ zinfo = zipf.filelist[0] ++ self.assertTrue(zinfo.filename.endswith("x/")) ++ self.assertEqual(zinfo.external_attr, (0o40775 << 16) | 0x10) ++ target = os.path.join(TESTFN2, "target") ++ os.mkdir(target) ++ zipf.extractall(target) ++ self.assertTrue(os.path.isdir(os.path.join(target, "x"))) ++ self.assertEqual(os.listdir(target), ["x"]) + + def tearDown(self): + rmtree(TESTFN2) +diff -r ee879c0ffa11 Lib/test/test_zipfile64.py +--- a/Lib/test/test_zipfile64.py ++++ b/Lib/test/test_zipfile64.py +@@ -99,7 +99,7 @@ + def testMoreThan64kFiles(self): + # This test checks that more than 64k files can be added to an archive, + # and that the resulting archive can be read properly by ZipFile +- zipf = zipfile.ZipFile(TESTFN, mode="w") ++ zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=True) + zipf.debug = 100 + numfiles = (1 << 16) * 3/2 + for i in xrange(numfiles): +@@ -111,8 +111,43 @@ + self.assertEqual(len(zipf2.namelist()), numfiles) + for i in xrange(numfiles): + self.assertEqual(zipf2.read("foo%08d" % i), "%d" % (i**3 % 57)) ++ zipf2.close() ++ ++ def testMoreThan64kFilesAppend(self): ++ zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=False) ++ zipf.debug = 100 ++ numfiles = (1 << 16) - 1 ++ for i in range(numfiles): ++ zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57)) ++ self.assertEqual(len(zipf.namelist()), numfiles) ++ with self.assertRaises(zipfile.LargeZipFile): ++ zipf.writestr("foo%08d" % numfiles, b'') ++ self.assertEqual(len(zipf.namelist()), numfiles) + zipf.close() + ++ zipf = zipfile.ZipFile(TESTFN, mode="a", allowZip64=False) ++ zipf.debug = 100 ++ self.assertEqual(len(zipf.namelist()), numfiles) ++ with self.assertRaises(zipfile.LargeZipFile): ++ zipf.writestr("foo%08d" % numfiles, b'') ++ self.assertEqual(len(zipf.namelist()), numfiles) ++ zipf.close() ++ ++ zipf = zipfile.ZipFile(TESTFN, mode="a", allowZip64=True) ++ zipf.debug = 100 ++ self.assertEqual(len(zipf.namelist()), numfiles) ++ numfiles2 = (1 << 16) * 3//2 ++ for i in range(numfiles, numfiles2): ++ zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57)) ++ self.assertEqual(len(zipf.namelist()), numfiles2) ++ zipf.close() ++ ++ zipf2 = zipfile.ZipFile(TESTFN, mode="r") ++ self.assertEqual(len(zipf2.namelist()), numfiles2) ++ for i in range(numfiles2): ++ self.assertEqual(zipf2.read("foo%08d" % i), "%d" % (i**3 % 57)) ++ zipf2.close() ++ + def tearDown(self): + test_support.unlink(TESTFN) + test_support.unlink(TESTFN2) +diff -r ee879c0ffa11 Lib/threading.py +--- a/Lib/threading.py ++++ b/Lib/threading.py +@@ -11,6 +11,7 @@ + import warnings + + from collections import deque as _deque ++from itertools import count as _count + from time import time as _time, sleep as _sleep + from traceback import format_exc as _format_exc + +@@ -623,11 +624,10 @@ + self.__cond.release() + + # Helper to generate new thread names +-_counter = 0 ++_counter = _count().next ++_counter() # Consume 0 so first non-main thread has id 1. + def _newname(template="Thread-%d"): +- global _counter +- _counter = _counter + 1 +- return template % _counter ++ return template % _counter() + + # Active thread administration + _active_limbo_lock = _allocate_lock() +@@ -818,10 +818,10 @@ + # shutdown) use self.__stderr. Otherwise still use sys (as in + # _sys) in case sys.stderr was redefined since the creation of + # self. +- if _sys: +- _sys.stderr.write("Exception in thread %s:\n%s\n" % +- (self.name, _format_exc())) +- else: ++ if _sys and _sys.stderr is not None: ++ print>>_sys.stderr, ("Exception in thread %s:\n%s" % ++ (self.name, _format_exc())) ++ elif self.__stderr is not None: + # Do the best job possible w/o a huge amt. of code to + # approximate a traceback (code ideas from + # Lib/traceback.py) +diff -r ee879c0ffa11 Lib/unittest/test/test_case.py +--- a/Lib/unittest/test/test_case.py ++++ b/Lib/unittest/test/test_case.py +@@ -9,7 +9,7 @@ + + import unittest + +-from .support import ( ++from unittest.test.support import ( + TestEquality, TestHashing, LoggingResult, ResultWithNoStartTestRunStopTestRun + ) + +diff -r ee879c0ffa11 Lib/unittest/test/test_discovery.py +--- a/Lib/unittest/test/test_discovery.py ++++ b/Lib/unittest/test/test_discovery.py +@@ -3,6 +3,7 @@ + import sys + + import unittest ++import unittest.test + + + class TestDiscovery(unittest.TestCase): +diff -r ee879c0ffa11 Lib/unittest/test/test_functiontestcase.py +--- a/Lib/unittest/test/test_functiontestcase.py ++++ b/Lib/unittest/test/test_functiontestcase.py +@@ -1,6 +1,6 @@ + import unittest + +-from .support import LoggingResult ++from unittest.test.support import LoggingResult + + + class Test_FunctionTestCase(unittest.TestCase): +diff -r ee879c0ffa11 Lib/unittest/test/test_program.py +--- a/Lib/unittest/test/test_program.py ++++ b/Lib/unittest/test/test_program.py +@@ -3,6 +3,7 @@ + import os + import sys + import unittest ++import unittest.test + + + class Test_TestProgram(unittest.TestCase): +diff -r ee879c0ffa11 Lib/unittest/test/test_runner.py +--- a/Lib/unittest/test/test_runner.py ++++ b/Lib/unittest/test/test_runner.py +@@ -3,7 +3,8 @@ + from cStringIO import StringIO + import pickle + +-from .support import LoggingResult, ResultWithNoStartTestRunStopTestRun ++from unittest.test.support import (LoggingResult, ++ ResultWithNoStartTestRunStopTestRun) + + + class TestCleanUp(unittest.TestCase): +diff -r ee879c0ffa11 Lib/unittest/test/test_skipping.py +--- a/Lib/unittest/test/test_skipping.py ++++ b/Lib/unittest/test/test_skipping.py +@@ -1,6 +1,6 @@ + import unittest + +-from .support import LoggingResult ++from unittest.test.support import LoggingResult + + + class Test_TestSkipping(unittest.TestCase): +diff -r ee879c0ffa11 Lib/unittest/test/test_suite.py +--- a/Lib/unittest/test/test_suite.py ++++ b/Lib/unittest/test/test_suite.py +@@ -1,7 +1,7 @@ + import unittest + + import sys +-from .support import LoggingResult, TestEquality ++from unittest.test.support import LoggingResult, TestEquality + + + ### Support code for Test_TestSuite +diff -r ee879c0ffa11 Lib/urllib2.py +--- a/Lib/urllib2.py ++++ b/Lib/urllib2.py +@@ -843,10 +843,7 @@ + password_mgr = HTTPPasswordMgr() + self.passwd = password_mgr + self.add_password = self.passwd.add_password +- self.retried = 0 + +- def reset_retry_count(self): +- self.retried = 0 + + def http_error_auth_reqed(self, authreq, host, req, headers): + # host may be an authority (without userinfo) or a URL with an +@@ -854,13 +851,6 @@ + # XXX could be multiple headers + authreq = headers.get(authreq, None) + +- if self.retried > 5: +- # retry sending the username:password 5 times before failing. +- raise HTTPError(req.get_full_url(), 401, "basic auth failed", +- headers, None) +- else: +- self.retried += 1 +- + if authreq: + mo = AbstractBasicAuthHandler.rx.search(authreq) + if mo: +@@ -869,17 +859,14 @@ + warnings.warn("Basic Auth Realm was unquoted", + UserWarning, 2) + if scheme.lower() == 'basic': +- response = self.retry_http_basic_auth(host, req, realm) +- if response and response.code != 401: +- self.retried = 0 +- return response ++ return self.retry_http_basic_auth(host, req, realm) + + def retry_http_basic_auth(self, host, req, realm): + user, pw = self.passwd.find_user_password(realm, host) + if pw is not None: + raw = "%s:%s" % (user, pw) + auth = 'Basic %s' % base64.b64encode(raw).strip() +- if req.headers.get(self.auth_header, None) == auth: ++ if req.get_header(self.auth_header, None) == auth: + return None + req.add_unredirected_header(self.auth_header, auth) + return self.parent.open(req, timeout=req.timeout) +@@ -895,7 +882,6 @@ + url = req.get_full_url() + response = self.http_error_auth_reqed('www-authenticate', + url, req, headers) +- self.reset_retry_count() + return response + + +@@ -911,7 +897,6 @@ + authority = req.get_host() + response = self.http_error_auth_reqed('proxy-authenticate', + authority, req, headers) +- self.reset_retry_count() + return response + + +diff -r ee879c0ffa11 Lib/uuid.py +--- a/Lib/uuid.py ++++ b/Lib/uuid.py +@@ -291,7 +291,7 @@ + + version = property(get_version) + +-def _find_mac(command, args, hw_identifiers, get_index): ++def _popen(command, args): + import os + path = os.environ.get("PATH", os.defpath).split(os.pathsep) + path.extend(('/sbin', '/usr/sbin')) +@@ -303,19 +303,27 @@ + break + else: + return None ++ # LC_ALL to ensure English output, 2>/dev/null to prevent output on ++ # stderr (Note: we don't have an example where the words we search for ++ # are actually localized, but in theory some system could do so.) ++ cmd = 'LC_ALL=C %s %s 2>/dev/null' % (executable, args) ++ return os.popen(cmd) + ++def _find_mac(command, args, hw_identifiers, get_index): + try: +- # LC_ALL to ensure English output, 2>/dev/null to +- # prevent output on stderr +- cmd = 'LC_ALL=C %s %s 2>/dev/null' % (executable, args) +- with os.popen(cmd) as pipe: ++ pipe = _popen(command, args) ++ if not pipe: ++ return ++ with pipe: + for line in pipe: +- words = line.lower().split() ++ words = line.lower().rstrip().split() + for i in range(len(words)): + if words[i] in hw_identifiers: + try: +- return int( +- words[get_index(i)].replace(':', ''), 16) ++ word = words[get_index(i)] ++ mac = int(word.replace(':', ''), 16) ++ if mac: ++ return mac + except (ValueError, IndexError): + # Virtual interfaces, such as those provided by + # VPNs, do not have a colon-delimited MAC address +@@ -328,27 +336,50 @@ + + def _ifconfig_getnode(): + """Get the hardware address on Unix by running ifconfig.""" +- + # This works on Linux ('' or '-a'), Tru64 ('-av'), but not all Unixes. + for args in ('', '-a', '-av'): + mac = _find_mac('ifconfig', args, ['hwaddr', 'ether'], lambda i: i+1) + if mac: + return mac + +- import socket ++def _arp_getnode(): ++ """Get the hardware address on Unix by running arp.""" ++ import os, socket + ip_addr = socket.gethostbyname(socket.gethostname()) + + # Try getting the MAC addr from arp based on our IP address (Solaris). +- mac = _find_mac('arp', '-an', [ip_addr], lambda i: -1) +- if mac: +- return mac ++ return _find_mac('arp', '-an', [ip_addr], lambda i: -1) + ++def _lanscan_getnode(): ++ """Get the hardware address on Unix by running lanscan.""" + # This might work on HP-UX. +- mac = _find_mac('lanscan', '-ai', ['lan0'], lambda i: 0) +- if mac: +- return mac ++ return _find_mac('lanscan', '-ai', ['lan0'], lambda i: 0) + +- return None ++def _netstat_getnode(): ++ """Get the hardware address on Unix by running netstat.""" ++ # This might work on AIX, Tru64 UNIX and presumably on IRIX. ++ try: ++ pipe = _popen('netstat', '-ia') ++ if not pipe: ++ return ++ with pipe: ++ words = pipe.readline().rstrip().split() ++ try: ++ i = words.index('Address') ++ except ValueError: ++ return ++ for line in pipe: ++ try: ++ words = line.rstrip().split() ++ word = words[i] ++ if len(word) == 17 and word.count(':') == 5: ++ mac = int(word.replace(':', ''), 16) ++ if mac: ++ return mac ++ except (ValueError, IndexError): ++ pass ++ except OSError: ++ pass + + def _ipconfig_getnode(): + """Get the hardware address on Windows by running ipconfig.exe.""" +@@ -366,13 +397,11 @@ + pipe = os.popen(os.path.join(dir, 'ipconfig') + ' /all') + except IOError: + continue +- else: ++ with pipe: + for line in pipe: + value = line.split(':')[-1].strip().lower() + if re.match('([0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value): + return int(value.replace('-', ''), 16) +- finally: +- pipe.close() + + def _netbios_getnode(): + """Get the hardware address on Windows using NetBIOS calls. +@@ -490,7 +519,8 @@ + if sys.platform == 'win32': + getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode] + else: +- getters = [_unixdll_getnode, _ifconfig_getnode] ++ getters = [_unixdll_getnode, _ifconfig_getnode, _arp_getnode, ++ _lanscan_getnode, _netstat_getnode] + + for getter in getters + [_random_getnode]: + try: +diff -r ee879c0ffa11 Lib/warnings.py +--- a/Lib/warnings.py ++++ b/Lib/warnings.py +@@ -7,7 +7,8 @@ + import sys + import types + +-__all__ = ["warn", "showwarning", "formatwarning", "filterwarnings", ++__all__ = ["warn", "warn_explicit", "showwarning", ++ "formatwarning", "filterwarnings", "simplefilter", + "resetwarnings", "catch_warnings"] + + +diff -r ee879c0ffa11 Lib/wsgiref/simple_server.py +--- a/Lib/wsgiref/simple_server.py ++++ b/Lib/wsgiref/simple_server.py +@@ -113,7 +113,14 @@ + def handle(self): + """Handle a single HTTP request""" + +- self.raw_requestline = self.rfile.readline() ++ self.raw_requestline = self.rfile.readline(65537) ++ if len(self.raw_requestline) > 65536: ++ self.requestline = '' ++ self.request_version = '' ++ self.command = '' ++ self.send_error(414) ++ return ++ + if not self.parse_request(): # An error code has been sent, just exit + return + +diff -r ee879c0ffa11 Lib/xdrlib.py +--- a/Lib/xdrlib.py ++++ b/Lib/xdrlib.py +@@ -9,6 +9,7 @@ + from cStringIO import StringIO as _StringIO + except ImportError: + from StringIO import StringIO as _StringIO ++from functools import wraps + + __all__ = ["Error", "Packer", "Unpacker", "ConversionError"] + +@@ -34,6 +35,16 @@ + class ConversionError(Error): + pass + ++def raise_conversion_error(function): ++ """ Wrap any raised struct.errors in a ConversionError. """ ++ ++ @wraps(function) ++ def result(self, value): ++ try: ++ return function(self, value) ++ except struct.error as e: ++ raise ConversionError(e.args[0]) ++ return result + + + class Packer: +@@ -50,9 +61,11 @@ + # backwards compatibility + get_buf = get_buffer + ++ @raise_conversion_error + def pack_uint(self, x): + self.__buf.write(struct.pack('>L', x)) + ++ @raise_conversion_error + def pack_int(self, x): + self.__buf.write(struct.pack('>l', x)) + +@@ -63,20 +76,24 @@ + else: self.__buf.write('\0\0\0\0') + + def pack_uhyper(self, x): +- self.pack_uint(x>>32 & 0xffffffffL) +- self.pack_uint(x & 0xffffffffL) ++ try: ++ self.pack_uint(x>>32 & 0xffffffffL) ++ except (TypeError, struct.error) as e: ++ raise ConversionError(e.args[0]) ++ try: ++ self.pack_uint(x & 0xffffffffL) ++ except (TypeError, struct.error) as e: ++ raise ConversionError(e.args[0]) + + pack_hyper = pack_uhyper + ++ @raise_conversion_error + def pack_float(self, x): +- try: self.__buf.write(struct.pack('>f', x)) +- except struct.error, msg: +- raise ConversionError, msg ++ self.__buf.write(struct.pack('>f', x)) + ++ @raise_conversion_error + def pack_double(self, x): +- try: self.__buf.write(struct.pack('>d', x)) +- except struct.error, msg: +- raise ConversionError, msg ++ self.__buf.write(struct.pack('>d', x)) + + def pack_fstring(self, n, s): + if n < 0: +diff -r ee879c0ffa11 Lib/xml/sax/saxutils.py +--- a/Lib/xml/sax/saxutils.py ++++ b/Lib/xml/sax/saxutils.py +@@ -98,14 +98,17 @@ + except AttributeError: + pass + # wrap a binary writer with TextIOWrapper +- class UnbufferedTextIOWrapper(io.TextIOWrapper): +- def write(self, s): +- super(UnbufferedTextIOWrapper, self).write(s) +- self.flush() +- return UnbufferedTextIOWrapper(buffer, encoding=encoding, ++ return _UnbufferedTextIOWrapper(buffer, encoding=encoding, + errors='xmlcharrefreplace', + newline='\n') + ++ ++class _UnbufferedTextIOWrapper(io.TextIOWrapper): ++ def write(self, s): ++ super(_UnbufferedTextIOWrapper, self).write(s) ++ self.flush() ++ ++ + class XMLGenerator(handler.ContentHandler): + + def __init__(self, out=None, encoding="iso-8859-1"): +diff -r ee879c0ffa11 Lib/zipfile.py +--- a/Lib/zipfile.py ++++ b/Lib/zipfile.py +@@ -30,7 +30,7 @@ + error = BadZipfile # The exception raised by this module + + ZIP64_LIMIT = (1 << 31) - 1 +-ZIP_FILECOUNT_LIMIT = 1 << 16 ++ZIP_FILECOUNT_LIMIT = (1 << 16) - 1 + ZIP_MAX_COMMENT = (1 << 16) - 1 + + # constants for Zip file compression methods +@@ -1101,12 +1101,17 @@ + if zinfo.compress_type not in (ZIP_STORED, ZIP_DEFLATED): + raise RuntimeError, \ + "That compression method is not supported" +- if zinfo.file_size > ZIP64_LIMIT: +- if not self._allowZip64: +- raise LargeZipFile("Filesize would require ZIP64 extensions") +- if zinfo.header_offset > ZIP64_LIMIT: +- if not self._allowZip64: +- raise LargeZipFile("Zipfile size would require ZIP64 extensions") ++ if not self._allowZip64: ++ requires_zip64 = None ++ if len(self.filelist) >= ZIP_FILECOUNT_LIMIT: ++ requires_zip64 = "Files count" ++ elif zinfo.file_size > ZIP64_LIMIT: ++ requires_zip64 = "Filesize" ++ elif zinfo.header_offset > ZIP64_LIMIT: ++ requires_zip64 = "Zipfile size" ++ if requires_zip64: ++ raise LargeZipFile(requires_zip64 + ++ " would require ZIP64 extensions") + + def write(self, filename, arcname=None, compress_type=None): + """Put the bytes from filename into the archive under the name +@@ -1145,6 +1150,7 @@ + zinfo.file_size = 0 + zinfo.compress_size = 0 + zinfo.CRC = 0 ++ zinfo.external_attr |= 0x10 # MS-DOS directory flag + self.filelist.append(zinfo) + self.NameToInfo[zinfo.filename] = zinfo + self.fp.write(zinfo.FileHeader(False)) +@@ -1206,7 +1212,11 @@ + date_time=time.localtime(time.time())[:6]) + + zinfo.compress_type = self.compression +- zinfo.external_attr = 0600 << 16 ++ if zinfo.filename[-1] == '/': ++ zinfo.external_attr = 0o40775 << 16 # drwxrwxr-x ++ zinfo.external_attr |= 0x10 # MS-DOS directory flag ++ else: ++ zinfo.external_attr = 0o600 << 16 # ?rw------- + else: + zinfo = zinfo_or_arcname + +@@ -1256,10 +1266,8 @@ + + try: + if self.mode in ("w", "a") and self._didModify: # write ending records +- count = 0 + pos1 = self.fp.tell() + for zinfo in self.filelist: # write central directory +- count = count + 1 + dt = zinfo.date_time + dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2] + dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2) +@@ -1320,13 +1328,21 @@ + + pos2 = self.fp.tell() + # Write end-of-zip-archive record +- centDirCount = count ++ centDirCount = len(self.filelist) + centDirSize = pos2 - pos1 + centDirOffset = pos1 +- if (centDirCount >= ZIP_FILECOUNT_LIMIT or +- centDirOffset > ZIP64_LIMIT or +- centDirSize > ZIP64_LIMIT): ++ requires_zip64 = None ++ if centDirCount > ZIP_FILECOUNT_LIMIT: ++ requires_zip64 = "Files count" ++ elif centDirOffset > ZIP64_LIMIT: ++ requires_zip64 = "Central directory offset" ++ elif centDirSize > ZIP64_LIMIT: ++ requires_zip64 = "Central directory size" ++ if requires_zip64: + # Need to write the ZIP64 end-of-archive records ++ if not self._allowZip64: ++ raise LargeZipFile(requires_zip64 + ++ " would require ZIP64 extensions") + zip64endrec = struct.pack( + structEndArchive64, stringEndArchive64, + 44, 45, 45, 0, 0, centDirCount, centDirCount, +@@ -1492,18 +1508,7 @@ + sys.exit(1) + + with ZipFile(args[1], 'r') as zf: +- out = args[2] +- for path in zf.namelist(): +- if path.startswith('./'): +- tgt = os.path.join(out, path[2:]) +- else: +- tgt = os.path.join(out, path) +- +- tgtdir = os.path.dirname(tgt) +- if not os.path.exists(tgtdir): +- os.makedirs(tgtdir) +- with open(tgt, 'wb') as fp: +- fp.write(zf.read(path)) ++ zf.extractall(args[2]) + + elif args[0] == '-c': + if len(args) < 3: +@@ -1514,14 +1519,21 @@ + if os.path.isfile(path): + zf.write(path, zippath, ZIP_DEFLATED) + elif os.path.isdir(path): ++ if zippath: ++ zf.write(path, zippath) + for nm in os.listdir(path): + addToZip(zf, + os.path.join(path, nm), os.path.join(zippath, nm)) + # else: ignore + + with ZipFile(args[1], 'w', allowZip64=True) as zf: +- for src in args[2:]: +- addToZip(zf, src, os.path.basename(src)) ++ for path in args[2:]: ++ zippath = os.path.basename(path) ++ if not zippath: ++ zippath = os.path.basename(os.path.dirname(path)) ++ if zippath in ('', os.curdir, os.pardir): ++ zippath = '' ++ addToZip(zf, path, zippath) + + if __name__ == "__main__": + main() +diff -r ee879c0ffa11 Mac/BuildScript/README.txt +--- a/Mac/BuildScript/README.txt ++++ b/Mac/BuildScript/README.txt +@@ -11,9 +11,9 @@ + For Python 2.7.x and 3.x, PSF practice is to build two installer variants + for each release. + +-Beginning with Python 2.7.8, we plan to drop binary installer support for ++Beginning with Python 2.7.9, we plan to drop binary installer support for + Mac OS X 10.3.9 and 10.4.x systems. To ease the transition, for Python 2.7.7 +-only there will be three installers provided: ++and 2.7.8 there were three installers provided: + + 1. DEPRECATED - 32-bit-only, i386 and PPC universal, capable on running on all + machines supported by Mac OS X 10.3.9 through (at least) 10.9:: +@@ -41,7 +41,8 @@ + * ``MacOSX10.4u`` SDK (later SDKs do not support PPC G3 processors) + * ``MACOSX_DEPLOYMENT_TARGET=10.3`` + * Apple ``gcc-4.0`` +- * system Python 2.5 for documentation build with Sphinx ++ * bootstrap non-framework Python 2.7 for documentation build with ++ Sphinx (as of 2.7.9) + + - alternate build environments: + +@@ -76,7 +77,8 @@ + * ``MacOSX10.5`` SDK + * ``MACOSX_DEPLOYMENT_TARGET=10.5`` + * Apple ``gcc-4.2`` +- * system Python 2.5+ for documentation build with Sphinx ++ * bootstrap non-framework Python 2.7 for documentation build with ++ Sphinx (as of 2.7.9) + + - alternate build environments: + +@@ -110,7 +112,8 @@ + * ``MacOSX10.6`` SDK + * ``MACOSX_DEPLOYMENT_TARGET=10.6`` + * Apple ``gcc-4.2`` +- * system Python 2.6 for documentation build with Sphinx ++ * bootstrap non-framework Python 2.7 for documentation build with ++ Sphinx (as of 2.7.9) + + - alternate build environments: + +@@ -134,7 +137,13 @@ + interfere with the build. + + * The documentation for the release is built using Sphinx +- because it is included in the installer. ++ because it is included in the installer. For 2.7.x up to and including ++ 2.7.8, the ``Doc/Makefile`` used ``svn`` to download repos of ++ ``Sphinx`` and its dependencies. Beginning with 2.7.9, the ``Doc/Makefile`` ++ assumes there is an externally-provided ``sphinx-build`` and requires at ++ least Python 2.6 to run. Because of this, it is no longer possible to ++ build a 2.7.9 or later installer on OS X 10.5 using the Apple-supplied ++ Python 2.5. + + * It is safest to start each variant build with an empty source directory + populated with a fresh copy of the untarred source. +diff -r ee879c0ffa11 Mac/BuildScript/build-installer.py +--- a/Mac/BuildScript/build-installer.py ++++ b/Mac/BuildScript/build-installer.py +@@ -198,7 +198,7 @@ + LT_10_5 = bool(getDeptargetTuple() < (10, 5)) + + # Disable for now +- if False: # if (getDeptargetTuple() > (10, 5)) and (getVersionTuple() >= (3, 5)): ++ if False: # if getDeptargetTuple() > (10, 5): + result.extend([ + dict( + name="Tcl 8.5.15", +@@ -239,7 +239,7 @@ + ), + ]) + +- if getVersionTuple() >= (3, 3): ++ if PYTHON_3: + result.extend([ + dict( + name="XZ 5.0.5", +@@ -369,8 +369,6 @@ + # Instructions for building packages inside the .mpkg. + def pkg_recipes(): + unselected_for_python3 = ('selected', 'unselected')[PYTHON_3] +- # unselected if 3.0 through 3.3, selected otherwise (2.x or >= 3.4) +- unselected_for_lt_python34 = ('selected', 'unselected')[(3, 0) <= getVersionTuple() < (3, 4)] + result = [ + dict( + name="PythonFramework", +@@ -439,27 +437,23 @@ + topdir="/Library/Frameworks/Python.framework", + source="/empty-dir", + required=False, +- selected=unselected_for_lt_python34, ++ selected='selected', ++ ), ++ dict( ++ name="PythonInstallPip", ++ long_name="Install or upgrade pip", ++ readme="""\ ++ This package installs (or upgrades from an earlier version) ++ pip, a tool for installing and managing Python packages. ++ """, ++ postflight="scripts/postflight.ensurepip", ++ topdir="/Library/Frameworks/Python.framework", ++ source="/empty-dir", ++ required=False, ++ selected='selected', + ), + ] + +- if getVersionTuple() >= (3, 4): +- result.append( +- dict( +- name="PythonInstallPip", +- long_name="Install or upgrade pip", +- readme="""\ +- This package installs (or upgrades from an earlier version) +- pip, a tool for installing and managing Python packages. +- """, +- postflight="scripts/postflight.ensurepip", +- topdir="/Library/Frameworks/Python.framework", +- source="/empty-dir", +- required=False, +- selected='selected', +- ) +- ) +- + if getDeptargetTuple() < (10, 4) and not PYTHON_3: + result.append( + dict( +@@ -615,8 +609,7 @@ + # Ensure ws have access to hg and to sphinx-build. + # You may have to create links in /usr/bin for them. + runCommand('hg --version') +- if getVersionTuple() >= (3, 4): +- runCommand('sphinx-build --version') ++ runCommand('sphinx-build --version') + + def parseOptions(args=None): + """ +@@ -929,15 +922,10 @@ + docdir = os.path.join(rootDir, 'pydocs') + curDir = os.getcwd() + os.chdir(buildDir) +- # The Doc build changed for 3.4 (technically, for 3.4.1) +- if getVersionTuple() < (3, 4): +- # This step does an svn checkout of sphinx and its dependencies +- runCommand('make update') +- runCommand("make html PYTHON='%s'" % os.path.abspath(sys.executable)) +- else: +- runCommand('make clean') +- # Assume sphinx-build is on our PATH, checked in checkEnvironment +- runCommand('make html') ++ # The Doc build changed for 3.4 (technically, for 3.4.1) and for 2.7.9 ++ runCommand('make clean') ++ # Assume sphinx-build is on our PATH, checked in checkEnvironment ++ runCommand('make html') + os.chdir(curDir) + if not os.path.exists(docdir): + os.mkdir(docdir) +@@ -983,7 +971,7 @@ + shellQuote(os.path.join(SRCDIR, 'configure')), shellQuote(SDKPATH), + UNIVERSALARCHS, + (' ', '--with-computed-gotos ')[PYTHON_3], +- (' ', '--without-ensurepip ')[getVersionTuple() >= (3, 4)], ++ (' ', '--without-ensurepip ')[PYTHON_3], + shellQuote(WORKDIR)[1:-1], + shellQuote(WORKDIR)[1:-1])) + +@@ -1165,7 +1153,9 @@ + fp.close() + + def patchScript(inPath, outPath): ++ major, minor = getVersionMajorMinor() + data = fileContents(inPath) ++ data = data.replace('@PYMAJOR@', str(major)) + data = data.replace('@PYVER@', getVersion()) + fp = open(outPath, 'w') + fp.write(data) +diff -r ee879c0ffa11 Mac/BuildScript/resources/ReadMe.txt +--- a/Mac/BuildScript/resources/ReadMe.txt ++++ b/Mac/BuildScript/resources/ReadMe.txt +@@ -1,88 +1,52 @@ +-This package will install Python $FULL_VERSION for Mac OS X +-$MACOSX_DEPLOYMENT_TARGET for the following architecture(s): +-$ARCHITECTURES. ++This package will install Python $FULL_VERSION for Mac OS X $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES. + +- **** IMPORTANT **** ++============================= ++Update your version of Tcl/Tk to use IDLE or other Tk applications ++============================= + ++To use IDLE or other programs that use the Tkinter graphical user interface toolkit, you need to install a newer third-party version of the Tcl/Tk frameworks. Visit https://www.python.org/download/mac/tcltk/ for current information about supported and recommended versions of Tcl/Tk for this version of Python and of Mac OS X. ++ ++============================= + Installing on OS X 10.8 (Mountain Lion) or later systems +-======================================================== ++[CHANGED for Python 2.7.9] ++============================= + +-If you are attempting to install on an OS X 10.8+ system, you may +-see a message that Python can't be installed because it is from an +-unidentified developer. This is because this Python installer +-package is not yet compatible with the Gatekeeper security feature +-introduced in OS X 10.8. To allow Python to be installed, you +-can override the Gatekeeper policy for this install. In the Finder, +-instead of double-clicking, control-click or right click the "Python" +-installer package icon. Then select "Open using ... Installer" from +-the contextual menu that appears. ++As of Python 2.7.9, installer packages from python.org are now compatible with the Gatekeeper security feature introduced in OS X 10.8. Downloaded packages can now be directly installed by double-clicking with the default system security settings. Python.org installer packages for OS X are signed with the Developer ID of the builder, as identified on the download page for this release (https://www.python.org/downloads/). To inspect the digital signature of the package, click on the lock icon in the upper right corner of the Install Python installer window. Refer to Apple’s support pages for more information on Gatekeeper (http://support.apple.com/kb/ht5290). + +- **** IMPORTANT **** ++============================= ++Simplified web-based installs ++[NEW for Python 2.7.9] ++============================= + +-Update your version of Tcl/Tk to use IDLE or other Tk applications +-================================================================== ++With the change to the newer flat format installer package, the download file now has a .pkg extension as it is no longer necessary to embed the installer within a disk image (.dmg) container. If you download the Python installer through a web browser, the OS X installer application may open automatically to allow you to perform the install. If your browser settings do not allow automatic open, double click on the downloaded installer file. + +-To use IDLE or other programs that use the Tkinter graphical user +-interface toolkit, you may need to install a newer third-party version +-of the Tcl/Tk frameworks. Visit http://www.python.org/download/mac/tcltk/ +-for current information about supported and recommended versions of +-Tcl/Tk for this version of Python and of Mac OS X. ++============================= ++New Installation Options and Defaults ++[NEW for Python 2.7.9] ++============================= + +- **** IMPORTANT **** ++The Python installer now includes an option to automatically install or upgrade pip, a tool for installing and managing Python packages. This option is enabled by default and no Internet access is required. If you do not want the installer to do this, select the Customize option at the Installation Type step and uncheck the Install or ugprade pip option. + +-Binary installer support for 10.4 and 10.3.9 to be discontinued +-=============================================================== ++============================= ++Binary installer support for OS X 10.4 and 10.3.9 discontinued ++[CHANGED for Python 2.7.9] ++============================= + +-Python 2.7.7 is the last release for which binary installers will be +-released on python.org that support OS X 10.3.9 (Panther) and 10.4.x +-(Tiger) systems. These systems were last updated by Apple in 2005 +-and 2007. As of 2.7.8, the 32-bit-only installer will support PPC +-and Intel Macs running OS X 10.5 (Leopard) and later. 10.5 was the +-last OS X release for PPC machines (G4 and G5). (The 64-/32-bit +-installer configuration will remain unchanged.) This aligns Python +-2.7.x installer configurations with those currently provided with +-Python 3.x. Some of the reasons for making this change are: +-there were significant additions and compatibility improvements to +-the OS X POSIX system APIs in OS X 10.5 that Python users can now +-take advantage of; it is increasingly difficult to build and test +-on obsolete 10.3 and 10.4 systems and with the 10.3 ABI; and it is +-assumed that most remaining legacy PPC systems have upgraded to 10.5. +-To ease the transition, for Python 2.7.7 only we are providing three +-binary installers: (1) the legacy deprecated 32-bit-only 10.3+ +-PPC/Intel format, (2) the newer 32-bit-only 10.5+ PPC/Intel format, +-and (3) the current 64-bit/32-bit 10.6+ Intel-only format. While +-future releases will not provide the deprecated installer, it will +-still be possible to build Python from source on 10.3.9 and 10.4 +-systems if needed. ++As previously announced, binary installers for Python 2.7.9 from python.org ++no longer support Mac OS X 10.3.9 (Panther) and 10.4.x (Tiger) systems. ++These systems were last updated by Apple in 2005 and 2007. As of 2.7.9, the ++32-bit-only installer supports PPC and Intel Macs running OS X 10.5 (Leopard). ++10.5 was the last OS X release for PPC machines (G4 and G5). The 64-/32-bit ++installer configuration remains unchanged and should normally be used on OS X ++10.6 (Snow Leopard) and later systems. This aligns Python 2.7.x installer ++configurations with those currently provided with Python 3.x. If needed, ++it is still possible to build Python from source for 10.3.9 and 10.4. + +-Using this version of Python on OS X +-==================================== ++============================= ++Python 3 and Python 2 Co-existence ++============================= + +-Python consists of the Python programming language interpreter, plus +-a set of programs to allow easy access to it for Mac users including +-an integrated development environment, IDLE, plus a set of pre-built +-extension modules that open up specific Macintosh technologies to +-Python programs. +- +-The installer puts applications, an "Update Shell Profile" command, +-and a link to the optionally installed Python Documentation into the +-"Python $VERSION" subfolder of the system Applications folder, +-and puts the underlying machinery into the folder +-$PYTHONFRAMEWORKINSTALLDIR. It can +-optionally place links to the command-line tools in /usr/local/bin as +-well. Double-click on the "Update Shell Profile" command to add the +-"bin" directory inside the framework to your shell's search path. +- +-You must install onto your current boot disk, even though the +-installer may not enforce this, otherwise things will not work. +- +-You can verify the integrity of the disk image file containing the +-installer package and this ReadMe file by comparing its md5 checksum +-and size with the values published on the release page linked at +-http://www.python.org/download/ +- +-Installation requires approximately $INSTALL_SIZE MB of disk space, +-ignore the message that it will take zero bytes. +- +-More information on Python in general can be found at +-http://www.python.org. ++Python.org Python 2.7 and 3.x versions can both be installed on your system and ++will not conflict. Python 2 command names contain a 2 or no digit: python2 (or ++python2.7 or python), idle2 (or idle2.7 or idle), pip2 (or pip2.7 or pip), etc. ++Command names for Python 3 contain a 3 in them: python3, idle3, pip3, etc. +diff -r ee879c0ffa11 Mac/BuildScript/resources/Welcome.rtf +--- a/Mac/BuildScript/resources/Welcome.rtf ++++ b/Mac/BuildScript/resources/Welcome.rtf +@@ -1,5 +1,5 @@ +-{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200 +-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} ++{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf140 ++\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;} + {\colortbl;\red255\green255\blue255;} + \paperw11905\paperh16837\margl1440\margr1440\vieww9640\viewh10620\viewkind0 + \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 +@@ -14,9 +14,19 @@ + \b Python for Mac OS X + \b0 consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for Mac OS X users including an integrated development environment + \b IDLE +-\b0 and a set of pre-built extension modules that open up specific Macintosh technologies to Python programs.\ ++\b0 .\ + \ +-See the ReadMe file and the Python documentation for important information, including the dropping of support for OS X 10.3.9 and 10.4 in future Python 2.7.x binary installers.\ ++ ++\b NEW for Python 2.7.9: ++\b0 This package installs a version of ++\f1 pip ++\f0 , the recommended tool for installing and managing Python packages. Type\ ++\ ++ ++\f1 pip2.7 --help ++\f0 \ ++\ ++for an overview. See the ReadMe file and the Python documentation for more information.\ + \ + + \b IMPORTANT: +@@ -26,4 +36,4 @@ + \b tkinter + \b0 graphical user interface toolkit require specific versions of the + \b Tcl/Tk +-\b0 platform independent windowing toolkit. Visit {\field{\*\fldinst{HYPERLINK "http://www.python.org/download/mac/tcltk/"}}{\fldrslt http://www.python.org/download/mac/tcltk/}} for current information on supported and recommended versions of Tcl/Tk for this version of Python and Mac OS X.} +\ No newline at end of file ++\b0 platform independent windowing toolkit. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information on supported and recommended versions of Tcl/Tk for this version of Python and Mac OS X.} +\ No newline at end of file +diff -r ee879c0ffa11 Mac/BuildScript/resources/readme.rtf +--- /dev/null ++++ b/Mac/BuildScript/resources/readme.rtf +@@ -0,0 +1,92 @@ ++{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf140 ++{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;} ++{\colortbl;\red255\green255\blue255;} ++\margl1440\margr1440\vieww15240\viewh15540\viewkind0 ++\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural ++ ++\f0\fs24 \cf0 This package will install Python $FULL_VERSION for Mac OS X $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\ ++\ ++ ++\b \ul Update your version of Tcl/Tk to use IDLE or other Tk applications ++\b0 \ulnone \ ++\ ++To use IDLE or other programs that use the Tkinter graphical user interface toolkit, you need to install a newer third-party version of the ++\i Tcl/Tk ++\i0 frameworks. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information about supported and recommended versions of ++\i Tcl/Tk ++\i0 for this version of Python and of Mac OS X.\ ++ ++\b \ul \ ++Installing on OS X 10.8 (Mountain Lion) or later systems\ ++\ulnone [CHANGED for Python 2.7.9] ++\b0 \ ++\ ++As of Python 2.7.9, installer packages from python.org are now compatible with the Gatekeeper security feature introduced in OS X 10.8. Downloaded packages can now be directly installed by double-clicking with the default system security settings. Python.org installer packages for OS X are signed with the Developer ID of the builder, as identified on the download page for this release ({\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}). To inspect the digital signature of the package, click on the lock icon in the upper right corner of the ++\i Install Python ++\i0 installer window. Refer to Apple\'92s support pages for more information on Gatekeeper ({\field{\*\fldinst{HYPERLINK "http://support.apple.com/kb/ht5290"}}{\fldrslt http://support.apple.com/kb/ht5290}}).\ ++\ ++ ++\b \ul Simplified web-based installs\ ++\ulnone [NEW for Python 2.7.9] ++\b0 \ ++\ ++With the change to the newer flat format installer package, the download file now has a ++\f1 .pkg ++\f0 extension as it is no longer necessary to embed the installer within a disk image ( ++\f1 .dmg ++\f0 ) container. If you download the Python installer through a web browser, the OS X installer application may open automatically to allow you to perform the install. If your browser settings do not allow automatic open, double click on the downloaded installer file.\ ++\ ++\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural ++ ++\b \cf0 \ul \ulc0 New Installation Options and Defaults\ ++\ulnone [NEW for Python 2.7.9] ++\b0 \ ++\ ++The Python installer now includes an option to automatically install or upgrade ++\f1 pip ++\f0 , a tool for installing and managing Python packages. This option is enabled by default and no Internet access is required. If you do not want the installer to do this, select the ++\i Customize ++\i0 option at the ++\i Installation Type ++\i0 step and uncheck the ++\i Install or ugprade pip ++\i0 option.\ ++\ ++ ++\b \ul Binary installer support for OS X 10.4 and 10.3.9 discontinued\ ++\ulnone [CHANGED for Python 2.7.9] ++\b0 \ ++\ ++As previously announced, binary installers for Python 2.7.9 from python.org no longer support Mac OS X 10.3.9 (Panther) and 10.4.x (Tiger) systems. These systems were last updated by Apple in 2005 and 2007. As of 2.7.9, the 32-bit-only installer supports PPC and Intel Macs running OS X 10.5 (Leopard). 10.5 was the last OS X release for PPC machines (G4 and G5). The 64-/32-bit installer configuration remains unchanged and should normally be used on OS X 10.6 (Snow Leopard) and later systems. This aligns Python 2.7.x installer configurations with those currently provided with Python 3.x. If needed, it is still possible to build Python from source for 10.3.9 and 10.4.\ ++\ ++ ++\b \ul Python 3 and Python 2 Co-existence\ ++ ++\b0 \ulnone \ ++Python.org Python 2.7 and 3.x versions can both be installed on your system and will not conflict. Python 2.7 command names contain a 2 or no digit: ++\f1 python2 ++\f0 (or ++\f1 python2.7 ++\f0 or ++\f1 python ++\f0 ), ++\f1 idle2 ++\f0 (or ++\f1 idle2.7 ++\f0 or ++\f1 idle ++\f0 ), ++\f1 pip2 ++\f0 (or ++\f1 pip2.7 ++\f0 or ++\f1 pip ++\f0 ), etc. Command names for Python 3 contain a 3 in them, ++\f1 python3 ++\f0 , ++\f1 idle3 ++\f0 , ++\f1 pip3 ++\f0 , etc.\ ++\ ++} +\ No newline at end of file +diff -r ee879c0ffa11 Mac/BuildScript/scripts/postflight.ensurepip +--- /dev/null ++++ b/Mac/BuildScript/scripts/postflight.ensurepip +@@ -0,0 +1,69 @@ ++#!/bin/sh ++# ++# Install/upgrade pip. ++# ++ ++PYVER="@PYVER@" ++PYMAJOR="@PYMAJOR@" ++FWK="/Library/Frameworks/Python.framework/Versions/${PYVER}" ++RELFWKBIN="../../..${FWK}/bin" ++ ++umask 022 ++ ++"${FWK}/bin/python${PYVER}" -m ensurepip --upgrade ++ ++"${FWK}/bin/python${PYVER}" -Wi \ ++ "${FWK}/lib/python${PYVER}/compileall.py" \ ++ -f -x badsyntax \ ++ "${FWK}/lib/python${PYVER}/site-packages" ++ ++"${FWK}/bin/python${PYVER}" -Wi -O \ ++ "${FWK}/lib/python${PYVER}/compileall.py" \ ++ -f -x badsyntax \ ++ "${FWK}/lib/python${PYVER}/site-packages" ++ ++chgrp -R admin "${FWK}/lib/python${PYVER}/site-packages" "${FWK}/bin" ++chmod -R g+w "${FWK}/lib/python${PYVER}/site-packages" "${FWK}/bin" ++ ++# We do not know if the user selected the Python command-line tools ++# package that installs symlinks to /usr/local/bin. So we assume ++# that the command-line tools package has already completed or was ++# not selected and we will only install /usr/local/bin symlinks for ++# pip et al if there are /usr/local/bin/python* symlinks to our ++# framework bin directory. ++ ++if [ -d /usr/local/bin ] ; then ++ ( ++ install_links_if_our_fw() { ++ if [ "$(readlink -n ./$1)" = "${RELFWKBIN}/$1" ] ; then ++ shift ++ for fn ; ++ do ++ if [ -e "${RELFWKBIN}/${fn}" ] ; then ++ rm -f ./${fn} ++ ln -s "${RELFWKBIN}/${fn}" "./${fn}" ++ chgrp -h admin "./${fn}" ++ chmod -h g+w "./${fn}" ++ fi ++ done ++ fi ++ } ++ ++ cd /usr/local/bin ++ ++ # Create pipx.y and easy_install-x.y links if /usr/local/bin/pythonx.y ++ # is linked to this framework version ++ install_links_if_our_fw "python${PYVER}" \ ++ "pip${PYVER}" "easy_install-${PYVER}" ++ ++ # Create pipx link if /usr/local/bin/pythonx is linked to this version ++ install_links_if_our_fw "python${PYMAJOR}" \ ++ "pip${PYMAJOR}" ++ ++ # Create pip and easy_install link if /usr/local/bin/python ++ # is linked to this version ++ install_links_if_our_fw "python" \ ++ "pip" "easy_install" ++ ) ++fi ++exit 0 +diff -r ee879c0ffa11 Mac/PythonLauncher/Makefile.in +--- a/Mac/PythonLauncher/Makefile.in ++++ b/Mac/PythonLauncher/Makefile.in +@@ -54,8 +54,6 @@ + --resource=$(srcdir)/factorySettings.plist \ + --plist Info.plist \ + build +- find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -r +- + + FileSettings.o: $(srcdir)/FileSettings.m + $(CC) $(CFLAGS) -o $@ -c $(srcdir)/FileSettings.m +diff -r ee879c0ffa11 Makefile.pre.in +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -447,8 +447,18 @@ + # Create build directory and generate the sysconfig build-time data there. + # pybuilddir.txt contains the name of the build dir and is used for + # sys.path fixup -- see Modules/getpath.c. ++# Since this step runs before shared modules are built, try to avoid bootstrap ++# problems by creating a dummy pybuilddir.txt just to allow interpreter ++# initialization to succeed. It will be overwritten by generate-posix-vars ++# or removed in case of failure. + pybuilddir.txt: $(BUILDPYTHON) +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ++ @echo "none" > ./pybuilddir.txt ++ $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\ ++ if test $$? -ne 0 ; then \ ++ echo "generate-posix-vars failed" ; \ ++ rm -f ./pybuilddir.txt ; \ ++ exit 1 ; \ ++ fi + + # Build the shared modules + # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for +@@ -930,13 +940,14 @@ + plat-mac/lib-scriptpackages/Terminal + PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages + LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \ +- lib-tk/test/test_ttk site-packages test test/audiodata test/data \ +- test/cjkencodings test/decimaltestdata test/xmltestdata \ ++ lib-tk/test/test_ttk site-packages test test/audiodata test/capath \ ++ test/data test/cjkencodings test/decimaltestdata test/xmltestdata \ + test/imghdrdata \ + test/subprocessdata \ + test/tracedmodules \ + encodings compiler hotshot \ + email email/mime email/test email/test/data \ ++ ensurepip ensurepip/_bundled \ + json json/tests \ + sqlite3 sqlite3/test \ + logging bsddb bsddb/test csv importlib wsgiref \ +diff -r ee879c0ffa11 Misc/ACKS +--- a/Misc/ACKS ++++ b/Misc/ACKS +@@ -136,6 +136,7 @@ + Pablo Bleyer + Erik van Blokland + Eric Blossom ++Sergey Bobrov + Finn Bock + Paul Boddie + Matthew Boedicker +@@ -198,6 +199,7 @@ + Lee Busby + Katherine Busch + Ralph Butler ++Zach Byrne + Nicolas Cadou + Jp Calderone + Arnaud Calmettes +@@ -216,6 +218,7 @@ + Matej Cepl + Carl Cerecke + Octavian Cerna ++Michael Cetrulo + Dave Chambers + Pascal Chambon + John Chandler +@@ -231,9 +234,11 @@ + Jerry Chen + Michael Chermside + Ingrid Cheung ++Terry Chia + Albert Chin-A-Young + Adal Chiriliuc + Matt Chisholm ++Lita Cho + Anders Chrigström + Tom Christiansen + Renee Chu +@@ -243,6 +248,7 @@ + Craig Citro + Gilles Civario + Chris Clark ++Diana Clarke + Laurie Clark-Michalek + Mike Clarkson + Andrew Clegg +@@ -264,10 +270,12 @@ + Phil Connell + Juan José Conti + Matt Conway ++Devin Cook + David M. Cooke + Jason R. Coombs + Garrett Cooper + Greg Copeland ++Ian Cordasco + Aldo Cortesi + David Costanzo + Scott Cotton +@@ -400,6 +408,7 @@ + John Feuerstein + Carl Feynman + Vincent Fiack ++Anastasia Filatova + Tomer Filiba + Jeffrey Finkelstein + Russell Finn +@@ -475,6 +484,7 @@ + Shelley Gooch + David Goodger + Hans de Graaff ++Tim Graham + Nathaniel Gray + Eddy De Greef + Grant Griffin +@@ -543,6 +553,7 @@ + Magnus L. Hetland + Raymond Hettinger + Kevan Heydon ++Wouter van Heyst + Kelsey Hightower + Jason Hildebrand + Richie Hindle +@@ -574,6 +585,7 @@ + Nadav Horesh + Alon Horev + Jan Hosang ++Jonathan Hosmer + Alan Hourihane + Ken Howard + Brad Howes +@@ -646,6 +658,7 @@ + Irmen de Jong + Lucas de Jonge + Kristján Valur Jónsson ++Robert Jordens + Jens B. Jorgensen + John Jorgensen + Sijin Joseph +@@ -660,6 +673,7 @@ + Tamito Kajiyama + Jan Kaliszewski + Peter van Kampen ++Jan Kanis + Rafe Kaplan + Jacob Kaplan-Moss + Janne Karila +@@ -979,6 +993,7 @@ + Tomas Oppelstrup + Jason Orendorff + Douglas Orr ++William Orr + Michele Orrù + Oleg Oshmyan + Denis S. Otkidach +@@ -994,6 +1009,7 @@ + Todd R. Palmer + Juan David Ibáñez Palomar + Jan Palus ++Yongzhi Pan + Mathias Panzenböck + M. Papillon + Peter Parente +@@ -1045,6 +1061,7 @@ + Jean-François Piéronne + Oleg Plakhotnyuk + Remi Pointel ++Jon Poler + Ariel Poliak + Guilherme Polo + Illia Polosukhin +@@ -1443,6 +1460,7 @@ + Dik Winter + Blake Winton + Jean-Claude Wippler ++Stéphane Wirtel + Lars Wirzenius + John Wiseman + Chris Withers +diff -r ee879c0ffa11 Misc/NEWS +--- a/Misc/NEWS ++++ b/Misc/NEWS +@@ -1,7 +1,344 @@ +-+++++++++++ +++++++++++++ + Python News + +++++++++++ + ++What's New in Python 2.7.9? ++========================== ++ ++*Release date: XXXX-XX-XX* ++ ++Core and Builtins ++----------------- ++ ++- Issue #22604: Fix assertion error in debug mode when dividing a complex ++ number by (nan+0j). ++ ++- Issue #22470: Fixed integer overflow issues in "backslashreplace" and ++ "xmlcharrefreplace" error handlers. ++ ++- Issue #22526: Fix iterating through files with lines longer than 2^31 bytes. ++ ++- Issue #22519: Fix overflow checking in PyString_Repr. ++ ++- Issue #22518: Fix integer overflow issues in latin-1 encoding. ++ ++- Issue #22379: Fix empty exception message in a TypeError raised in ++ ``str.join``. ++ ++- Issue #22221: Now the source encoding declaration on the second line isn't ++ effective if the first line contains anything except a comment. ++ ++- Issue #22023: Fix ``%S``, ``%R`` and ``%V`` formats of ++ :c:func:`PyUnicode_FromFormat`. ++ ++- Issue #21591: Correctly handle qualified exec statements in tuple form by ++ moving compatibility layer from run-time to AST transformation. ++ ++Library ++------- ++ ++- Issue #12728: Different Unicode characters having the same uppercase but ++ different lowercase are now matched in case-insensitive regular expressions. ++ ++- Issue #22821: Fixed fcntl() with integer argument on 64-bit big-endian ++ platforms. ++ ++- Issues #814253, #9179: Group references and conditional group references now ++ work in lookbehind assertions in regular expressions. ++ ++- Issue #17293: uuid.getnode() now determines MAC address on AIX using netstat. ++ Based on patch by Aivars KalvÄns. ++ ++- Issue #22769: Fixed ttk.Treeview.tag_has() when called without arguments. ++ ++- Issue #22787: Allow the keyfile argument of SSLContext.load_cert_chain to be ++ None. ++ ++- Issue #22775: Fixed unpickling of Cookie.SimpleCookie with protocol 2. ++ Patch by Tim Graham. ++ ++- Issue #22776: Brought excluded code into the scope of a try block in ++ SysLogHandler.emit(). ++ ++- Issue #17381: Fixed ranges handling in case-insensitive regular expressions. ++ ++- Issue #19329: Optimized compiling charsets in regular expressions. ++ ++- Issue #22410: Module level functions in the re module now cache compiled ++ locale-dependent regular expressions taking into account the locale. ++ ++- Issue #8876: distutils now falls back to copying files when hard linking ++ doesn't work. This allows use with special filesystems such as VirtualBox ++ shared folders. ++ ++- Issue #9351: Defaults set with set_defaults on an argparse subparser ++ are no longer ignored when also set on the parent parser. ++ ++- Issue #20421: Add a .version() method to SSL sockets exposing the actual ++ protocol version in use. ++ ++- Issue #22435: Fix a file descriptor leak when SocketServer bind fails. ++ ++- Issue #13664: GzipFile now supports non-ascii Unicode filenames. ++ ++- Issue #13096: Fixed segfault in CTypes POINTER handling of large ++ values. ++ ++- Issue #11694: Raise ConversionError in xdrlib as documented. Patch ++ by Filip GruszczyÅ„ski and Claudiu Popa. ++ ++- Issue #1686: Fix string.Template when overriding the pattern attribute. ++ ++- Issue #11866: Eliminated race condition in the computation of names ++ for new threads. ++ ++- Issue #22219: The zipfile module CLI now adds entries for directories ++ (including empty directories) in ZIP file. ++ ++- Issue #22449: In the ssl.SSLContext.load_default_certs, consult the ++ enviromental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows. ++ ++- Issue #8473: doctest.testfile now uses universal newline mode to read ++ the test file. ++ ++- Issue #20076: Added non derived UTF-8 aliases to locale aliases table. ++ ++- Issue #20079: Added locales supported in glibc 2.18 to locale alias table. ++ ++- Issue #22530: Allow the ``group()`` method of regular expression match objects ++ to take a ``long`` as an index. ++ ++- Issue #22517: When a io.BufferedRWPair object is deallocated, clear its ++ weakrefs. ++ ++- Issue #10510: distutils register and upload methods now use HTML standards ++ compliant CRLF line endings. ++ ++- Issue #9850: Fixed macpath.join() for empty first component. Patch by ++ Oleg Oshmyan. ++ ++- Issue #20912: Now directories added to ZIP file have correct Unix and MS-DOS ++ directory attributes. ++ ++- Issue #21866: ZipFile.close() no longer writes ZIP64 central directory ++ records if allowZip64 is false. ++ ++- Issue #22415: Fixed debugging output of the GROUPREF_EXISTS opcode in the re ++ module. ++ ++- Issue #22423: Unhandled exception in thread no longer causes unhandled ++ AttributeError when sys.stderr is None. ++ ++- Issue #22419: Limit the length of incoming HTTP request in wsgiref server to ++ 65536 bytes and send a 414 error code for higher lengths. Patch contributed ++ by Devin Cook. ++ ++- Lax cookie parsing in http.cookies could be a security issue when combined ++ with non-standard cookie handling in some Web browsers. Reported by ++ Sergey Bobrov. ++ ++- Issue #21147: sqlite3 now raises an exception if the request contains a null ++ character instead of truncate it. Based on patch by Victor Stinner. ++ ++- Issue #21951: Fixed a crash in Tkinter on AIX when called Tcl command with ++ empty string or tuple argument. ++ ++- Issue #21951: Tkinter now most likely raises MemoryError instead of crash ++ if the memory allocation fails. ++ ++- Issue #22226: First letter no longer is stripped from the "status" key in ++ the result of Treeview.heading(). ++ ++- Issue #22051: turtledemo no longer reloads examples to re-run them. ++ Initialization of variables and gui setup should be done in main(), ++ which is called each time a demo is run, but not on import. ++ ++- Issue #21597: The separator between the turtledemo text pane and the drawing ++ canvas can now be grabbed and dragged with a mouse. The code text pane can ++ be widened to easily view or copy the full width of the text. The canvas ++ can be widened on small screens. Original patches by Jan Kanis and Lita Cho. ++ ++- Issue #18132: Turtledemo buttons no longer disappear when the window is ++ shrunk. Original patches by Jan Kanis and Lita Cho. ++ ++- Issue #22312: Fix ntpath.splitdrive IndexError. ++ ++- Issue #22216: smtplib now resets its state more completely after a quit. The ++ most obvious consequence of the previous behavior was a STARTTLS failure ++ during a connect/starttls/quit/connect/starttls sequence. ++ ++- Issue #21305: os.urandom now caches a fd to /dev/urandom. This is a PEP 466 ++ backport from Python 3. ++ ++- Issue #21307: As part of PEP 466, backport hashlib.algorithms_guaranteed and ++ hashlib.algorithms_available. ++ ++- Issue #22259: Fix segfault when attempting to fopen a file descriptor ++ corresponding to a directory. ++ ++- Issue #22236: Fixed Tkinter images copying operations in NoDefaultRoot mode. ++ ++- Issue #22191: Fixed warnings.__all__. ++ ++- Issue #21308: Backport numerous features from Python's ssl module. This is ++ part of PEP 466. ++ ++- Issue #15696: Add a __sizeof__ implementation for mmap objects on Windows. ++ ++- Issue #8797: Raise HTTPError on failed Basic Authentication immediately. ++ Initial patch by Sam Bull. ++ ++- Issue #22068: Avoided reference loops with Variables and Fonts in Tkinter. ++ ++- Issue #21448: Changed FeedParser feed() to avoid O(N**2) behavior when ++ parsing long line. Original patch by Raymond Hettinger. ++ ++- Issue #17923: glob() patterns ending with a slash no longer match non-dirs on ++ AIX. Based on patch by Delhallt. ++ ++- Issue #21975: Fixed crash when using uninitialized sqlite3.Row (in particular ++ when unpickling pickled sqlite3.Row). sqlite3.Row is now initialized in the ++ __new__() method. ++ ++- Issue #16037: HTTPMessage.readheaders() raises an HTTPException when more ++ than 100 headers are read. Patch by Jyrki Pulliainen and Daniel Eriksson. ++ ++- Issue #21580: Now Tkinter correctly handles binary "data" and "maskdata" ++ configure options of tkinter.PhotoImage. ++ ++- Issue #19612: subprocess.communicate() now also ignores EINVAL when using at ++ least two pipes. ++ ++- Fix repr(_socket.socket) on Windows 64-bit: don't fail with OverflowError ++ on closed socket. ++ ++- Issue #16133: The asynchat.async_chat.handle_read() method now ignores ++ socket.error() exceptions with blocking I/O errors: EAGAIN, EALREADY, ++ EINPROGRESS, or EWOULDBLOCK. ++ ++- Issue #21990: Clean-up unnecessary and slow inner class definition in ++ saxutils (Contributed by Alex Gaynor). ++ ++- Issue #1730136: Fix the comparison between a tkFont.Font and an object of ++ another kind. ++ ++- Issue #19884: readline: Disable the meta modifier key if stdout is not ++ a terminal to not write the ANSI sequence "\033[1034h" into stdout. This ++ sequence is used on some terminal (ex: TERM=xterm-256color") to enable ++ support of 8 bit characters. ++ ++- Issue #22017: Correct reference counting errror in the initialization of the ++ _warnings module. ++ ++- Issue #21868: Prevent turtle crash when undo buffer set to a value less ++ than one. ++ ++- Issue #21151: Fixed a segfault in the _winreg module when ``None`` is passed ++ as a ``REG_BINARY`` value to SetValueEx. Patch by John Ehresman. ++ ++- Issue #21090: io.FileIO.readall() does not ignore I/O errors anymore. Before, ++ it ignored I/O errors if at least the first C call read() succeed. ++ ++- Issue #19870: BaseCookie now parses 'secure' and 'httponly' flags. ++ Backport of issue #16611. ++ ++- Issue #21923: Prevent AttributeError in distutils.sysconfig.customize_compiler ++ due to possible uninitialized _config_vars. ++ ++- Issue #21323: Fix CGIHTTPServer to again handle scripts in CGI subdirectories, ++ broken by the fix for security issue #19435. Patch by Zach Byrne. ++ ++- Issue #22199: Make get_makefile_filename() available in Lib/sysconfig.py ++ for 2.7 to match other versions of sysconfig. ++ ++IDLE ++---- ++ ++- Issue #22221: IDLE now ignores the source encoding declaration on the second ++ line if the first line contains anything except a comment. ++ ++- Issue #17390: Adjust Editor window title; remove 'Python', ++ move version to end. ++ ++- Issue #14105: Idle debugger breakpoints no longer disappear ++ when inseting or deleting lines. ++ ++Extension Modules ++----------------- ++ ++- Issue #22381: Update zlib to 1.2.8. ++ ++- Issue #22176: Update the ctypes module's libffi to v3.1. This release ++ adds support for the Linux AArch64 and POWERPC ELF ABIv2 little endian ++ architectures. ++ ++Tools/Demos ++----------- ++ ++- Issue #10712: 2to3 has a new "asserts" fixer that replaces deprecated names ++ of unittest methods (e.g. failUnlessEqual -> assertEqual). ++ ++- Issue #22221: 2to3 and the findnocoding.py script now ignore the source ++ encoding declaration on the second line if the first line contains anything ++ except a comment. ++ ++- Issue #22201: Command-line interface of the zipfile module now correctly ++ extracts ZIP files with directory entries. Patch by Ryan Wilson. ++ ++Tests ++----- ++ ++- Issue #22236: Tkinter tests now don't reuse default root window. New root ++ window is created for every test class. ++ ++- Issue #18004: test_overflow in test_list by mistake consumed 40 GiB of memory ++ on 64-bit systems. ++ ++- Issue #21976: Fix test_ssl to accept LibreSSL version strings. Thanks ++ to William Orr. ++ ++- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests. ++ ++Build ++----- ++ ++- Issue #20221: Removed conflicting (or circular) hypot definition when ++ compiled with VS 2010 or above. Initial patch by Tabrez Mohammed. ++ ++- Issue #16537: Check whether self.extensions is empty in setup.py. Patch by ++ Jonathan Hosmer. ++ ++- The documentation Makefile no longer automatically downloads Sphinx. Users are ++ now required to have Sphinx already installed to build the documentation. ++ ++- Issue #21958: Define HAVE_ROUND when building with Visual Studio 2013 and ++ above. Patch by Zachary Turner. ++ ++- Issue #15759: "make suspicious", "make linkcheck" and "make doctest" in Doc/ ++ now display special message when and only when there are failures. ++ ++- Issue #21166: Prevent possible segfaults and other random failures of ++ python --generate-posix-vars in pybuilddir.txt build target. ++ ++- Issue #18096: Fix library order returned by python-config. ++ ++- Issue #17219: Add library build dir for Python extension cross-builds. ++ ++- Issue #22877: PEP 477 - OS X installer now installs pip. ++ ++Windows ++------- ++ ++- Issue #17896: The Windows build scripts now expect external library sources ++ to be in ``PCbuild\..\externals`` rather than ``PCbuild\..\..``. ++ ++- Issue #17717: The Windows build scripts now use a copy of NASM pulled from ++ svn.python.org to build OpenSSL. ++ ++- Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j. ++ ++ ++ + What's New in Python 2.7.8? + =========================== + +@@ -14,7 +351,7 @@ + overwrite the error set in PyObject_GetAttr. + + - Issue #21831: Avoid integer overflow when large sizes and offsets are given to +- the buffer type. ++ the buffer type. CVE-2014-7185. + + - Issue #1856: Avoid crashes and lockups when daemon threads run while the + interpreter is shutting down; instead, these threads are now killed when they +@@ -97,6 +434,13 @@ + IDLE + ---- + ++- Issue #21940: Add unittest for WidgetRedirector. Initial patch by Saimadhav ++ Heblikar. ++ ++- Issue #18592: Add unittest for SearchDialogBase. Patch by Phil Webster. ++ ++- Issue #21694: Add unittest for ParenMatch. Patch by Saimadhav Heblikar. ++ + - Issue #21686: add unittest for HyperParser. Original patch by Saimadhav + Heblikar. + +@@ -140,6 +484,11 @@ + + - Issue #20635: Added tests for Tk geometry managers. + ++Build ++----- ++ ++- Issue #21811: Anticipated fixes to support OS X versions > 10.9. ++ + Windows + ------- + +@@ -1173,6 +1522,9 @@ + + - Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo. + ++- Issue #17390: Display Python version on Idle title bar. ++ Initial patch by Edmond Burnett. ++ + Documentation + ------------- + +@@ -2054,6 +2406,19 @@ + + - Issue #5219: Prevent event handler cascade in IDLE. + ++- Issue #15318: Prevent writing to sys.stdin. ++ ++- Issue #13532, #15319: Check that arguments to sys.stdout.write are strings. ++ ++- Issue #10365: File open dialog now works instead of crashing even when ++ parent window is closed while dialog is open. ++ ++- Issue #14018: Update checks for unstable system Tcl/Tk versions on OS X ++ to include versions shipped with OS X 10.7 and 10.8 in addition to 10.6. ++ ++- Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu ++ with certain versions of Tk 8.5. Initial patch by Kevin Walzer. ++ + Tests + ----- + +@@ -2808,6 +3173,14 @@ + - Issue #13296: Fix IDLE to clear compile __future__ flags on shell restart. + (Patch by Roger Serwy) + ++- Issue #14409: IDLE now properly executes commands in the Shell window ++ when it cannot read the normal config files on startup and ++ has to use the built-in default key bindings. ++ There was previously a bug in one of the defaults. ++ ++- Issue #3573: IDLE hangs when passing invalid command line args ++ (directory(ies) instead of file(s)). ++ + Build + ----- + +@@ -3377,6 +3750,15 @@ + - Issue #10406: Enable Rstrip IDLE extension on OSX (just like on other + platforms). + ++- Issue #6378: Further adjust idle.bat to start associated Python ++ ++- Issue #11896: Save on Close failed despite selecting "Yes" in dialog. ++ ++- Issue #4676: toggle failing on Tk 8.5, causing IDLE exits and ++ strange selection behavior. Improve selection extension behaviour. ++ ++- Issue #3851 toggle non-functional when NumLock set on Windows. ++ + Build + ----- + +@@ -4887,7 +5269,7 @@ + - Issue #7494: Fix a crash in ``_lsprof`` (cProfile) after clearing the profiler, + reset also the pointer to the current pointer context. + +-- Issue #7232: Add support for the context manager protocol to the ++- Issue #7232: Add support for the context management protocol to the + ``tarfile.TarFile`` class. + + - Issue #7250: Fix info leak of os.environ across multi-run uses of +@@ -6637,7 +7019,7 @@ + + - Issue #1696199: Add collections.Counter() for rapid and convenient counting. + +-- Issue #3860: GzipFile and BZ2File now support the context manager protocol. ++- Issue #3860: GzipFile and BZ2File now support the context management protocol. + + - Issue #4272: Add an optional argument to the GzipFile constructor to override + the timestamp in the gzip stream. The default value remains the current time. +@@ -6824,6 +7206,27 @@ + + - Issue #5847: Remove -n switch on "Edit with IDLE" menu item. + ++- idle.py modified and simplified to better support developing experimental ++ versions of IDLE which are not installed in the standard location. ++ ++- Issue #5559: OutputWindow/PyShell right click menu "Go to file/line" ++ wasn't working with file paths containing spaces. ++ ++- Issue #5783: Windows: Version string for the .chm help file changed, ++ file not being accessed Patch by Guilherme Polo/ ++ ++- Issue #1529142: Allow multiple IDLE GUI/subprocess pairs to exist ++ simultaneously. Thanks to David Scherer for suggesting the use of an ++ ephemeral port for the GUI. Patch by Weeble. ++ ++- Remove port spec from run.py and fix bug where subprocess fails to ++ extract port from command line when warnings are present. ++ ++- Issue #5129: Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr ++ to handle mixed space/tab properly. Patch by Guilherme Polo. ++ ++- Issue #3549: On MacOS the preferences menu was not present ++ + Tools/Demos + ----------- + +@@ -9785,7 +10188,7 @@ + parameter. + + - _winreg's HKEY object has gained __enter__ and __exit__ methods to +- support the context manager protocol. The _winreg module also ++ support the context management protocol. The _winreg module also + gained a new function ``ExpandEnvironmentStrings`` to expand + REG_EXPAND_SZ keys. + +diff -r ee879c0ffa11 Misc/python-config.in +--- a/Misc/python-config.in ++++ b/Misc/python-config.in +@@ -44,8 +44,9 @@ + print ' '.join(flags) + + elif opt in ('--libs', '--ldflags'): +- libs = getvar('LIBS').split() + getvar('SYSLIBS').split() +- libs.append('-lpython'+pyver) ++ libs = ['-lpython' + pyver] ++ libs += getvar('LIBS').split() ++ libs += getvar('SYSLIBS').split() + # add the prefix/lib/pythonX.Y/config dir, but only if there is no + # shared library in prefix/lib/. + if opt == '--ldflags': +diff -r ee879c0ffa11 Modules/_ctypes/_ctypes_test.c +--- a/Modules/_ctypes/_ctypes_test.c ++++ b/Modules/_ctypes/_ctypes_test.c +@@ -540,6 +540,49 @@ + return 1; + } + ++EXPORT(long left = 10); ++EXPORT(long top = 20); ++EXPORT(long right = 30); ++EXPORT(long bottom = 40); ++ ++EXPORT(RECT) ReturnRect(int i, RECT ar, RECT* br, POINT cp, RECT dr, ++ RECT *er, POINT fp, RECT gr) ++{ ++ /*Check input */ ++ if (ar.left + br->left + dr.left + er->left + gr.left != left * 5) ++ { ++ ar.left = 100; ++ return ar; ++ } ++ if (ar.right + br->right + dr.right + er->right + gr.right != right * 5) ++ { ++ ar.right = 100; ++ return ar; ++ } ++ if (cp.x != fp.x) ++ { ++ ar.left = -100; ++ } ++ if (cp.y != fp.y) ++ { ++ ar.left = -200; ++ } ++ switch(i) ++ { ++ case 0: ++ return ar; ++ break; ++ case 1: ++ return dr; ++ break; ++ case 2: ++ return gr; ++ break; ++ ++ } ++ return ar; ++} ++ + typedef struct { + short x; + short y; +diff -r ee879c0ffa11 Modules/_ctypes/callproc.c +--- a/Modules/_ctypes/callproc.c ++++ b/Modules/_ctypes/callproc.c +@@ -1170,11 +1170,7 @@ + } + for (i = 0; i < argcount; ++i) { + atypes[i] = args[i].ffi_type; +- if (atypes[i]->type == FFI_TYPE_STRUCT +-#ifdef _WIN64 +- && atypes[i]->size <= sizeof(void *) +-#endif +- ) ++ if (atypes[i]->type == FFI_TYPE_STRUCT) + avalues[i] = (void *)args[i].value.p; + else + avalues[i] = (void *)&args[i].value; +@@ -1807,7 +1803,9 @@ + return result; + } + if (PyString_CheckExact(cls)) { +- buf = alloca(strlen(PyString_AS_STRING(cls)) + 3 + 1); ++ buf = PyMem_Malloc(strlen(PyString_AS_STRING(cls)) + 3 + 1); ++ if (buf == NULL) ++ return PyErr_NoMemory(); + sprintf(buf, "LP_%s", PyString_AS_STRING(cls)); + result = PyObject_CallFunction((PyObject *)Py_TYPE(&PyCPointer_Type), + "s(O){}", +@@ -1818,13 +1816,16 @@ + key = PyLong_FromVoidPtr(result); + } else if (PyType_Check(cls)) { + typ = (PyTypeObject *)cls; +- buf = alloca(strlen(typ->tp_name) + 3 + 1); ++ buf = PyMem_Malloc(strlen(typ->tp_name) + 3 + 1); ++ if (buf == NULL) ++ return PyErr_NoMemory(); + sprintf(buf, "LP_%s", typ->tp_name); + result = PyObject_CallFunction((PyObject *)Py_TYPE(&PyCPointer_Type), + "s(O){sO}", + buf, + &PyCPointer_Type, + "_type_", cls); ++ PyMem_Free(buf); + if (result == NULL) + return result; + Py_INCREF(cls); +diff -r ee879c0ffa11 Modules/_ctypes/libffi.diff +--- a/Modules/_ctypes/libffi.diff ++++ b/Modules/_ctypes/libffi.diff +@@ -1,8 +1,7 @@ +-diff -r -N -u libffi.orig/autom4te.cache/output.0 libffi/autom4te.cache/output.0 +-diff -r -N -u libffi.orig/configure libffi/configure +---- libffi.orig/configure 2013-03-17 15:37:50.000000000 -0700 +-+++ libffi/configure 2013-03-18 15:11:39.611575163 -0700 +-@@ -13368,6 +13368,10 @@ ++diff -urN libffi-3.1/configure libffi/configure ++--- libffi-3.1/configure 2014-05-19 15:44:03.000000000 +0200 +++++ libffi/configure 2014-08-09 21:51:07.877871443 +0200 ++@@ -17236,6 +17236,10 @@ + fi + ;; + +@@ -13,22 +12,22 @@ + x86_64-*-darwin*) + TARGET=X86_DARWIN; TARGETDIR=x86 + ;; +-@@ -13426,12 +13430,12 @@ ++@@ -17298,12 +17302,12 @@ + ;; + + mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*) + - TARGET=MIPS; TARGETDIR=mips + + TARGET=MIPS_IRIX; TARGETDIR=mips + ;; +- mips*-*-linux* | mips*-*-openbsd*) ++ mips*-*linux* | mips*-*-openbsd*) + # Support 128-bit long double for NewABI. + HAVE_LONG_DOUBLE='defined(__mips64)' + - TARGET=MIPS; TARGETDIR=mips +-+ TARGET=MIPS_IRIX; TARGETDIR=mips +++ TARGET=MIPS_LINUX; TARGETDIR=mips + ;; + +- powerpc*-*-linux* | powerpc-*-sysv*) +-@@ -13491,7 +13495,7 @@ ++ nios2*-linux*) ++@@ -17373,7 +17377,7 @@ + as_fn_error $? "\"libffi has not been ported to $host.\"" "$LINENO" 5 + fi + +@@ -37,7 +36,7 @@ + MIPS_TRUE= + MIPS_FALSE='#' + else +-@@ -14862,6 +14866,12 @@ ++@@ -18814,6 +18818,12 @@ + ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc" + + +@@ -50,7 +49,7 @@ + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +-@@ -16047,6 +16057,8 @@ ++@@ -20126,6 +20136,8 @@ + "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; + "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "libffi.pc") CONFIG_FILES="$CONFIG_FILES libffi.pc" ;; +@@ -59,9 +58,9 @@ + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +-diff -r -N -u libffi.orig/configure.ac libffi/configure.ac +---- libffi.orig/configure.ac 2013-03-17 15:37:50.000000000 -0700 +-+++ libffi/configure.ac 2013-03-18 15:11:11.392989136 -0700 ++diff -urN libffi-3.1/configure.ac libffi/configure.ac ++--- libffi-3.1/configure.ac 2014-05-11 15:57:49.000000000 +0200 +++++ libffi/configure.ac 2014-08-09 21:51:07.877871443 +0200 + @@ -1,4 +1,7 @@ + dnl Process this with autoconf to create configure + +# +@@ -70,33 +69,32 @@ + + AC_PREREQ(2.68) + +-@@ -146,6 +149,10 @@ +- fi ++@@ -144,6 +147,9 @@ ++ AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"'; ++ fi + ;; +- + + i*86-*-nto-qnx*) + + TARGET=X86; TARGETDIR=x86 + + ;; +-+ +- x86_64-*-darwin*) ++ i?86-*-darwin*) + TARGET=X86_DARWIN; TARGETDIR=x86 + ;; +-@@ -204,12 +211,12 @@ ++@@ -218,12 +224,12 @@ + ;; + + mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*) + - TARGET=MIPS; TARGETDIR=mips + + TARGET=MIPS_IRIX; TARGETDIR=mips + ;; +- mips*-*-linux* | mips*-*-openbsd*) ++ mips*-*linux* | mips*-*-openbsd*) + # Support 128-bit long double for NewABI. + HAVE_LONG_DOUBLE='defined(__mips64)' + - TARGET=MIPS; TARGETDIR=mips +-+ TARGET=MIPS_IRIX; TARGETDIR=mips +++ TARGET=MIPS_LINUX; TARGETDIR=mips + ;; + +- powerpc*-*-linux* | powerpc-*-sysv*) +-@@ -269,7 +276,7 @@ ++ nios2*-linux*) ++@@ -293,7 +299,7 @@ + AC_MSG_ERROR(["libffi has not been ported to $host."]) + fi + +@@ -105,7 +103,7 @@ + AM_CONDITIONAL(BFIN, test x$TARGET = xBFIN) + AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC) + AM_CONDITIONAL(X86, test x$TARGET = xX86) +-@@ -567,4 +574,8 @@ ++@@ -617,4 +623,8 @@ + + AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc) + +@@ -114,3 +112,98 @@ + +AC_CONFIG_FILES(fficonfig.py) + + + AC_OUTPUT ++diff -urN libffi-3.1/fficonfig.py.in libffi/fficonfig.py.in ++--- libffi-3.1/fficonfig.py.in 1970-01-01 01:00:00.000000000 +0100 +++++ libffi/fficonfig.py.in 2014-08-09 21:43:25.229871827 +0200 ++@@ -0,0 +1,35 @@ +++ffi_sources = """ +++src/prep_cif.c +++src/closures.c +++""".split() +++ +++ffi_platforms = { +++ 'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'], +++ 'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'], +++ 'X86': ['src/x86/ffi.c', 'src/x86/sysv.S', 'src/x86/win32.S'], +++ 'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/freebsd.S'], +++ 'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'], +++ 'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'], +++ 'ALPHA': ['src/alpha/ffi.c', 'src/alpha/osf.S'], +++ 'IA64': ['src/ia64/ffi.c', 'src/ia64/unix.S'], +++ 'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'], +++ 'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'], +++ 'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/ffi_sysv.c', 'src/powerpc/ffi_linux64.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'], +++ 'POWERPC_AIX': ['src/powerpc/ffi_darwin.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'], +++ 'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'], +++ 'AARCH64': ['src/aarch64/sysv.S', 'src/aarch64/ffi.c'], +++ 'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'], +++ 'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'], +++ 'FRV': ['src/frv/eabi.S', 'src/frv/ffi.c'], +++ 'S390': ['src/s390/sysv.S', 'src/s390/ffi.c'], +++ 'X86_64': ['src/x86/ffi64.c', 'src/x86/unix64.S', 'src/x86/ffi.c', 'src/x86/sysv.S'], +++ 'SH': ['src/sh/sysv.S', 'src/sh/ffi.c'], +++ 'SH64': ['src/sh64/sysv.S', 'src/sh64/ffi.c'], +++ 'PA': ['src/pa/linux.S', 'src/pa/ffi.c'], +++ 'PA_LINUX': ['src/pa/linux.S', 'src/pa/ffi.c'], +++ 'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'], +++} +++ +++ffi_sources += ffi_platforms['@TARGET@'] +++ +++ffi_cflags = '@CFLAGS@' ++diff -urN libffi-3.1/src/dlmalloc.c libffi/src/dlmalloc.c ++--- libffi-3.1/src/dlmalloc.c 2014-04-25 19:45:13.000000000 +0200 +++++ libffi/src/dlmalloc.c 2014-08-09 21:51:07.881871443 +0200 ++@@ -457,6 +457,11 @@ ++ #define LACKS_ERRNO_H ++ #define MALLOC_FAILURE_ACTION ++ #define MMAP_CLEARS 0 /* WINCE and some others apparently don't clear */ +++#elif !defined _GNU_SOURCE +++/* mremap() on Linux requires this via sys/mman.h +++ * See roundup issue 10309 +++ */ +++#define _GNU_SOURCE 1 ++ #endif /* WIN32 */ ++ ++ #ifdef __OS2__ ++@@ -4497,7 +4502,7 @@ ++ char* tbase = (char*)(CALL_MMAP(tsize)); ++ if (tbase != CMFAIL) { ++ m = init_user_mstate(tbase, tsize); ++- set_segment_flags(&m->seg, IS_MMAPPED_BIT); +++ (void)set_segment_flags(&m->seg, IS_MMAPPED_BIT); ++ set_lock(m, locked); ++ } ++ } ++@@ -4512,7 +4517,7 @@ ++ if (capacity > msize + TOP_FOOT_SIZE && ++ capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) { ++ m = init_user_mstate((char*)base, capacity); ++- set_segment_flags(&m->seg, EXTERN_BIT); +++ (void)set_segment_flags(&m->seg, EXTERN_BIT); ++ set_lock(m, locked); ++ } ++ return (mspace)m; ++diff -urN libffi-3.1/src/arm/ffi.c libffi/src/arm/ffi.c ++--- libffi-3.1/src/arm/ffi.c Sat Aug 09 23:52:34 2014 +0200 +++++ libffi/src/arm/ffi.c Sat Aug 09 23:58:38 2014 +0200 ++@@ -154,9 +154,6 @@ ++ ++ int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space) ++ { ++- // make sure we are using FFI_VFP ++- FFI_ASSERT(ecif->cif->abi == FFI_VFP); ++- ++ register unsigned int i, vi = 0; ++ register void **p_argv; ++ register char *argp, *regp, *eo_regp; ++@@ -165,6 +162,9 @@ ++ char done_with_regs = 0; ++ char is_vfp_type; ++ +++ // make sure we are using FFI_VFP +++ FFI_ASSERT(ecif->cif->abi == FFI_VFP); +++ ++ /* the first 4 words on the stack are used for values passed in core ++ * registers. */ ++ regp = stack; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/.gitignore +--- a/Modules/_ctypes/libffi/.gitignore ++++ /dev/null +@@ -1,21 +0,0 @@ +-.libs +-.deps +-*.o +-*.lo +-.dirstamp +-*.la +-Makefile +-config.log +-config.status +-*~ +-fficonfig.h +-include/ffi.h +-include/ffitarget.h +-libffi.pc +-libtool +-stamp-h1 +-libffi*gz +-autom4te.cache +-libffi.xcodeproj/xcuserdata +-libffi.xcodeproj/project.xcworkspace +-ios/ +diff -r ee879c0ffa11 Modules/_ctypes/libffi/.travis.yml +--- a/Modules/_ctypes/libffi/.travis.yml ++++ /dev/null +@@ -1,8 +0,0 @@ +-language: c +-compiler: +- - gcc +- - clang +- +-before_script: sudo apt-get install dejagnu +- +-script: ./configure && make && make check +diff -r ee879c0ffa11 Modules/_ctypes/libffi/ChangeLog +--- a/Modules/_ctypes/libffi/ChangeLog ++++ b/Modules/_ctypes/libffi/ChangeLog +@@ -1,5509 +1,5105 @@ +-2013-03-17 Anthony Green +- +- * README: Update for 3.0.13. +- * configure.ac: Ditto. +- * configure: Rebuilt. +- * doc/*: Update version. +- +-2013-03-17 Dave Korn +- +- * src/closures.c (is_emutramp_enabled +- [!FFI_MMAP_EXEC_EMUTRAMP_PAX]): Move default definition outside +- enclosing #if scope. +- +-2013-03-17 Anthony Green +- +- * configure.ac: Only modify toolexecdir in certain cases. +- * configure: Rebuilt. +- +-2013-03-16 Gilles Talis +- +- * src/powerpc/ffi.c (ffi_prep_args_SYSV): Don't use +- fparg_count,etc on __NO_FPRS__ targets. +- +-2013-03-16 Alan Hourihane +- +- * src/m68k/sysv.S (epilogue): Don't use extb instruction on +- m680000 machines. +- +-2013-03-16 Alex Gaynor +- +- * src/x86/ffi.c (ffi_prep_cif_machdep): Always align stack. +- +-2013-03-13 Markos Chandras +- +- * configure.ac: Add support for Imagination Technologies Meta. +- * Makefile.am: Likewise. +- * README: Add Imagination Technologies Meta details. +- * src/metag/ffi.c: New. +- * src/metag/ffitarget.h: Likewise. +- * src/metag/sysv.S: Likewise. +- +-2013-02-24 Andreas Schwab +- +- * doc/libffi.texi (Structures): Fix missing category argument of +- @deftp. +- +-2013-02-11 Anthony Green +- +- * configure.ac: Update release number to 3.0.12. +- * configure: Rebuilt. +- * README: Update release info. +- +-2013-02-10 Anthony Green +- +- * README: Add Moxie. +- * src/moxie/ffi.c: Created. +- * src/moxie/eabi.S: Created. +- * src/moxie/ffitarget.h: Created. +- * Makefile.am (nodist_libffi_la_SOURCES): Add Moxie. +- * Makefile.in: Rebuilt. +- * configure.ac: Add Moxie. +- * configure: Rebuilt. +- * testsuite/libffi.call/huge_struct.c: Disable format string +- warnings for moxie*-*-elf tests. +- +-2013-02-10 Anthony Green +- +- * Makefile.am (LTLDFLAGS): Fix reference. +- * Makefile.in: Rebuilt. +- +-2013-02-10 Anthony Green +- +- * README: Update supported platforms. Update test results link. +- +-2013-02-09 Anthony Green +- +- * testsuite/libffi.call/negint.c: Remove forced -O2. +- * testsuite/libffi.call/many2.c (foo): Remove GCCism. +- * testsuite/libffi.call/ffitest.h: Add default PRIuPTR definition. +- +- * src/sparc/v8.S (ffi_closure_v8): Import ancient ulonglong +- closure return type fix developed by Martin v. Löwis for cpython +- fork. +- +-2013-02-08 Andreas Tobler +- +- * src/powerpc/ffi.c (ffi_prep_cif_machdep): Fix small struct +- support. +- * src/powerpc/sysv.S: Ditto. +- +-2013-02-08 Anthony Green +- +- * testsuite/libffi.call/cls_longdouble.c: Remove xfail for +- arm*-*-*. +- +-2013-02-08 Anthony Green +- +- * src/sparc/ffi.c (ffi_prep_closure_loc): Fix cache flushing for GCC. +- +-2013-02-08 Matthias Klose +- +- * man/ffi_prep_cif.3: Clean up for debian linter. +- +-2013-02-08 Peter Bergner +- +- * src/powerpc/ffi.c (ffi_prep_args_SYSV): Account for FP args pushed +- on the stack. +- +-2013-02-08 Anthony Green +- +- * Makefile.am (EXTRA_DIST): Add missing files. +- * testsuite/Makefile.am (EXTRA_DIST): Ditto. +- * Makefile.in: Rebuilt. +- +-2013-02-08 Anthony Green +- +- * configure.ac: Move sparc asm config checks to within functions +- for compatibility with sun tools. +- * configure: Rebuilt. +- * src/sparc/ffi.c (ffi_prep_closure_loc): Flush cache on v9 +- systems. +- * src/sparc/v8.S (ffi_flush_icache): Implement a sparc v9 cache +- flusher. +- +-2013-02-08 Nathan Rossi +- +- * src/microblaze/ffi.c (ffi_closure_call_SYSV): Fix handling of +- small big-endian structures. +- (ffi_prep_args): Ditto. +- +-2013-02-07 Anthony Green +- +- * src/sparc/v8.S (ffi_call_v8): Fix typo from last patch +- (effectively hiding ffi_call_v8). +- +-2013-02-07 Anthony Green +- +- * configure.ac: Update bug reporting address. +- * configure.in: Rebuild. +- +- * src/sparc/v8.S (ffi_flush_icache): Out-of-line cache flusher for +- Sun compiler. +- * src/sparc/ffi.c (ffi_call): Remove warning. +- Call ffi_flush_icache for non-GCC builds. +- (ffi_prep_closure_loc): Use ffi_flush_icache. +- +- * Makefile.am (EXTRA_DIST): Add libtool-ldflags. +- * Makefile.in: Rebuilt. +- * libtool-ldflags: New file. +- +-2013-02-07 Daniel Schepler +- +- * configure.ac: Correctly identify x32 systems as 64-bit. +- * m4/libtool.m4: Remove libtool expr error. +- * aclocal.m4, configure: Rebuilt. +- +-2013-02-07 Anthony Green +- +- * configure.ac: Fix GCC usage test. +- * configure: Rebuilt. +- * README: Mention LLVM/GCC x86_64 issue. +- * testsuite/Makefile.in: Rebuilt. +- +-2013-02-07 Anthony Green +- +- * testsuite/libffi.call/cls_double_va.c (main): Replace // style +- comments with /* */ for xlc compiler. +- * testsuite/libffi.call/stret_large.c (main): Ditto. +- * testsuite/libffi.call/stret_large2.c (main): Ditto. +- * testsuite/libffi.call/nested_struct1.c (main): Ditto. +- * testsuite/libffi.call/huge_struct.c (main): Ditto. +- * testsuite/libffi.call/float_va.c (main): Ditto. +- * testsuite/libffi.call/cls_struct_va1.c (main): Ditto. +- * testsuite/libffi.call/cls_pointer_stack.c (main): Ditto. +- * testsuite/libffi.call/cls_pointer.c (main): Ditto. +- * testsuite/libffi.call/cls_longdouble_va.c (main): Ditto. +- +-2013-02-06 Anthony Green +- +- * man/ffi_prep_cif.3: Clean up for debian lintian checker. +- +-2013-02-06 Anthony Green +- +- * Makefile.am (pkgconfigdir): Add missing pkgconfig install bits. +- * Makefile.in: Rebuild. +- +-2013-02-02 Mark H Weaver +- +- * src/x86/ffi64.c (ffi_call): Sign-extend integer arguments passed +- via general purpose registers. +- +-2013-01-21 Nathan Rossi +- +- * README: Add MicroBlaze details. +- * Makefile.am: Add MicroBlaze support. +- * configure.ac: Likewise. +- * src/microblaze/ffi.c: New. +- * src/microblaze/ffitarget.h: Likewise. +- * src/microblaze/sysv.S: Likewise. +- +-2013-01-21 Nathan Rossi +- * testsuite/libffi.call/return_uc.c: Fixed issue. +- +-2013-01-21 Chris Zankel +- +- * README: Add Xtensa support. +- * Makefile.am: Likewise. +- * configure.ac: Likewise. +- * Makefile.in Regenerate. +- * configure: Likewise. +- * src/prep_cif.c: Handle Xtensa. +- * src/xtensa: New directory. +- * src/xtensa/ffi.c: New file. +- * src/xtensa/ffitarget.h: Ditto. +- * src/xtensa/sysv.S: Ditto. +- +-2013-01-11 Anthony Green +- +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Replace // style +- comments with /* */ for xlc compiler. +- * src/powerpc/aix.S (ffi_call_AIX): Ditto. +- * testsuite/libffi.call/ffitest.h (allocate_mmap): Delete +- deprecated inline function. +- * testsuite/libffi.special/ffitestcxx.h: Ditto. +- * README: Add update for AIX support. +- +-2013-01-11 Anthony Green +- +- * configure.ac: Robustify pc relative reloc check. +- * m4/ax_cc_maxopt.m4: Don't -malign-double. This is an ABI +- changing option for 32-bit x86. +- * aclocal.m4, configure: Rebuilt. +- * README: Update supported target list. +- +-2013-01-10 Anthony Green +- +- * README (tested): Add Compiler column to table. +- +-2013-01-10 Anthony Green +- +- * src/x86/ffi64.c (struct register_args): Make sse array and array +- of unions for sunpro compiler compatibility. +- +-2013-01-10 Anthony Green +- +- * configure.ac: Test target platform size_t size. Handle both 32 +- and 64-bit builds for x86_64-* and i?86-* targets (allowing for +- CFLAG option to change default settings). +- * configure, aclocal.m4: Rebuilt. +- +-2013-01-10 Anthony Green +- +- * testsuite/libffi.special/special.exp: Only run exception +- handling tests when using GNU compiler. +- +- * m4/ax_compiler_vendor.m4: New file. +- * configure.ac: Test for compiler vendor and don't use +- AX_CFLAGS_WARN_ALL with the sun compiler. +- * aclocal.m4, configure: Rebuilt. +- +-2013-01-10 Anthony Green +- +- * include/ffi_common.h: Don't use GCCisms to define types when +- building with the SUNPRO compiler. +- +-2013-01-10 Anthony Green +- +- * configure.ac: Put local.exp in the right place. +- * configure: Rebuilt. +- +- * src/x86/ffi.c: Update comment about regparm function attributes. +- * src/x86/sysv.S (ffi_closure_SYSV): The SUNPRO compiler requires +- that all function arguments be passed on the stack (no regparm +- support). +- +-2013-01-08 Anthony Green +- +- * configure.ac: Generate local.exp. This sets CC_FOR_TARGET +- when we are using the vendor compiler. +- * testsuite/Makefile.am (EXTRA_DEJAGNU_SITE_CONFIG): Point to +- ../local.exp. +- * configure, testsuite/Makefile.in: Rebuilt. +- +- * testsuite/libffi.call/call.exp: Run tests with different +- options, depending on whether or not we are using gcc or the +- vendor compiler. +- * testsuite/lib/libffi.exp (libffi-init): Set using_gcc based on +- whether or not we are building/testing with gcc. +- +-2013-01-08 Anthony Green +- +- * configure.ac: Switch x86 solaris target to X86 by default. +- * configure: Rebuilt. +- +-2013-01-08 Anthony Green +- +- * configure.ac: Fix test for read-only eh_frame. +- * configure: Rebuilt. +- +-2013-01-08 Anthony Green +- +- * src/x86/sysv.S, src/x86/unix64.S: Only emit DWARF unwind info +- when building with the GNU toolchain. +- * testsuite/libffi.call/ffitest.h (CHECK): Fix for Solaris vendor +- compiler. +- +-2013-01-07 Thorsten Glaser +- +- * testsuite/libffi.call/cls_uchar_va.c, +- testsuite/libffi.call/cls_ushort_va.c, +- testsuite/libffi.call/va_1.c: Testsuite fixes. +- +-2013-01-07 Thorsten Glaser +- +- * src/m68k/ffi.c (CIF_FLAGS_SINT8, CIF_FLAGS_SINT16): Define. +- (ffi_prep_cif_machdep): Fix 8-bit and 16-bit signed calls. +- * src/m68k/sysv.S (ffi_call_SYSV, ffi_closure_SYSV): Ditto. +- +-2013-01-04 Anthony Green +- +- * Makefile.am (AM_CFLAGS): Don't automatically add -fexceptions +- and -Wall. This is set in the configure script after testing for +- GCC. +- * Makefile.in: Rebuilt. +- +-2013-01-02 rofl0r +- +- * src/powerpc/ffi.c (ffi_prep_cif_machdep): Fix build error on ppc +- when long double == double. +- +-2013-01-02 Reini Urban +- +- * Makefile.am (libffi_la_LDFLAGS): Add -no-undefined to LDFLAGS +- (required for shared libs on cygwin/mingw). +- * Makefile.in: Rebuilt. +- +-2012-10-31 Alan Modra +- +- * src/powerpc/linux64_closure.S: Add new ABI support. +- * src/powerpc/linux64.S: Likewise. +- +-2012-10-30 Magnus Granberg +- Pavel Labushev +- +- * configure.ac: New options pax_emutramp +- * configure, fficonfig.h.in: Regenerated +- * src/closures.c: New function emutramp_enabled_check() and +- checks. +- +-2012-10-30 Frederick Cheung +- +- * configure.ac: Enable FFI_MAP_EXEC_WRIT for Darwin 12 (mountain +- lion) and future version. +- * configure: Rebuild. +- +-2012-10-30 James Greenhalgh +- Marcus Shawcroft +- +- * README: Add details of aarch64 port. +- * src/aarch64/ffi.c: New. +- * src/aarch64/ffitarget.h: Likewise. +- * src/aarch64/sysv.S: Likewise. +- * Makefile.am: Support aarch64. +- * configure.ac: Support aarch64. +- * Makefile.in, configure: Rebuilt. +- +-2012-10-30 James Greenhalgh +- Marcus Shawcroft +- +- * testsuite/lib/libffi.exp: Add support for aarch64. +- * testsuite/libffi.call/cls_struct_va1.c: New. +- * testsuite/libffi.call/cls_uchar_va.c: Likewise. +- * testsuite/libffi.call/cls_uint_va.c: Likewise. +- * testsuite/libffi.call/cls_ulong_va.c: Likewise. +- * testsuite/libffi.call/cls_ushort_va.c: Likewise. +- * testsuite/libffi.call/nested_struct11.c: Likewise. +- * testsuite/libffi.call/uninitialized.c: Likewise. +- * testsuite/libffi.call/va_1.c: Likewise. +- * testsuite/libffi.call/va_struct1.c: Likewise. +- * testsuite/libffi.call/va_struct2.c: Likewise. +- * testsuite/libffi.call/va_struct3.c: Likewise. +- +-2012-10-12 Walter Lee +- +- * Makefile.am: Add TILE-Gx/TILEPro support. +- * configure.ac: Likewise. +- * Makefile.in: Regenerate. +- * configure: Likewise. +- * src/prep_cif.c (ffi_prep_cif_core): Handle TILE-Gx/TILEPro. +- * src/tile: New directory. +- * src/tile/ffi.c: New file. +- * src/tile/ffitarget.h: Ditto. +- * src/tile/tile.S: Ditto. +- +-2012-10-12 Matthias Klose +- +- * generate-osx-source-and-headers.py: Normalize whitespace. +- +-2012-09-14 David Edelsohn +- +- * configure: Regenerated. +- +-2012-08-26 Andrew Pinski +- +- PR libffi/53014 +- * src/mips/ffi.c (ffi_prep_closure_loc): Allow n32 with soft-float and n64 with +- soft-float. +- +-2012-08-08 Uros Bizjak +- +- * src/s390/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, +- just return FFI_BAD_ABI when things are wrong. +- +-2012-07-18 H.J. Lu +- +- PR libffi/53982 +- PR libffi/53973 +- * src/x86/ffitarget.h: Check __ILP32__ instead of __LP64__ for x32. +- (FFI_SIZEOF_JAVA_RAW): Defined to 4 for x32. +- +-2012-05-16 H.J. Lu +- +- * configure: Regenerated. +- +-2012-05-05 Nicolas Lelong +- +- * libffi.xcodeproj/project.pbxproj: Fixes. +- * README: Update for iOS builds. +- +-2012-04-23 Alexandre Keunecke I. de Mendonca +- +- * configure.ac: Add Blackfin/sysv support +- * Makefile.am: Add Blackfin/sysv support +- * src/bfin/ffi.c: Add Blackfin/sysv support +- * src/bfin/ffitarget.h: Add Blackfin/sysv support +- +-2012-04-11 Anthony Green +- +- * Makefile.am (EXTRA_DIST): Add new script. +- * Makefile.in: Rebuilt. +- +-2012-04-11 Zachary Waldowski +- +- * generate-ios-source-and-headers.py, +- libffi.xcodeproj/project.pbxproj: Support a Mac static library via +- Xcode. Set iOS compatibility to 4.0. Move iOS trampoline +- generation into an Xcode "run script" phase. Include both as +- Xcode build scripts. Don't always regenerate config files. +- +-2012-04-10 Anthony Green +- +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Add missing semicolon. +- +-2012-04-06 Anthony Green +- +- * Makefile.am (EXTRA_DIST): Add new iOS/xcode files. +- * Makefile.in: Rebuilt. +- +-2012-04-06 Mike Lewis +- +- * generate-ios-source-and-headers.py: New file. +- * libffi.xcodeproj/project.pbxproj: New file. +- * README: Update instructions on building iOS binary. +- * build-ios.sh: Delete. +- +-2012-04-06 Anthony Green +- +- * src/x86/ffi64.c (UINT128): Define differently for Intel and GNU +- compilers, then use it. +- +-2012-04-06 H.J. Lu +- +- * m4/libtool.m4 (_LT_ENABLE_LOCK): Support x32. +- +-2012-04-06 Anthony Green +- +- * testsuite/Makefile.am (EXTRA_DIST): Add missing test cases. +- * testsuite/Makefile.in: Rebuilt. +- +-2012-04-05 Zachary Waldowski +- +- * include/ffi.h.in: Add missing trampoline table fields. +- * src/arm/sysv.S: Fix ENTRY definition, and wrap symbol references +- in CNAME. +- * src/x86/ffi.c: Wrap Windows specific code in ifdefs. +- +-2012-04-02 Peter Bergner +- +- * src/powerpc/ffi.c (ffi_prep_args_SYSV): Declare double_tmp. +- Silence casting pointer to integer of different size warning. +- Delete goto to previously deleted label. +- (ffi_call): Silence possibly undefined warning. +- (ffi_closure_helper_SYSV): Declare variable type. +- +-2012-04-02 Peter Rosin +- +- * src/x86/win32.S (ffi_call_win32): Sign/zero extend the return +- value in the Intel version as is already done for the AT&T version. +- (ffi_closure_SYSV): Likewise. +- (ffi_closure_raw_SYSV): Likewise. +- (ffi_closure_STDCALL): Likewise. +- +-2012-03-29 Peter Rosin +- +- * src/x86/win32.S (ffi_closure_raw_THISCALL): Unify the frame +- generation, fix the ENDP label and remove the surplus third arg +- from the 'lea' insn. +- +-2012-03-29 Peter Rosin +- +- * src/x86/win32.S (ffi_closure_raw_SYSV): Make the 'stubraw' label +- visible outside the PROC, so that ffi_closure_raw_THISCALL can see +- it. Also instruct the assembler to add a frame to the function. +- +-2012-03-23 Peter Rosin +- +- * Makefile.am (AM_CPPFLAGS): Add -DFFI_BUILDING. +- * Makefile.in: Rebuilt. +- * include/ffi.h.in [MSVC]: Add __declspec(dllimport) decorations +- to all data exports, when compiling libffi clients using MSVC. +- +-2012-03-29 Peter Rosin +- +- * src/x86/ffitarget.h (ffi_abi): Add new ABI FFI_MS_CDECL and +- make it the default for MSVC. +- (FFI_TYPE_MS_STRUCT): New structure return convention. +- * src/x86/ffi.c (ffi_prep_cif_machdep): Tweak the structure +- return convention for FFI_MS_CDECL to be FFI_TYPE_MS_STRUCT +- instead of an ordinary FFI_TYPE_STRUCT. +- (ffi_prep_args): Treat FFI_TYPE_MS_STRUCT as FFI_TYPE_STRUCT. +- (ffi_call): Likewise. +- (ffi_prep_incoming_args_SYSV): Likewise. +- (ffi_raw_call): Likewise. +- (ffi_prep_closure_loc): Treat FFI_MS_CDECL as FFI_SYSV. +- * src/x86/win32.S (ffi_closure_SYSV): For FFI_TYPE_MS_STRUCT, +- return a pointer to the result structure in eax and don't pop +- that pointer from the stack, the caller takes care of it. +- (ffi_call_win32): Treat FFI_TYPE_MS_STRUCT as FFI_TYPE_STRUCT. +- (ffi_closure_raw_SYSV): Likewise. +- +-2012-03-22 Peter Rosin +- +- * testsuite/libffi.call/closure_stdcall.c [MSVC]: Add inline +- assembly version with Intel syntax. +- * testsuite/libffi.call/closure_thiscall.c [MSVC]: Likewise. +- +-2012-03-23 Peter Rosin +- +- * testsuite/libffi.call/ffitest.h: Provide abstration of +- __attribute__((fastcall)) in the form of a __FASTCALL__ +- define. Define it to __fastcall for MSVC. +- * testsuite/libffi.call/fastthis1_win32.c: Use the above. +- * testsuite/libffi.call/fastthis2_win32.c: Likewise. +- * testsuite/libffi.call/fastthis3_win32.c: Likewise. +- * testsuite/libffi.call/strlen2_win32.c: Likewise. +- * testsuite/libffi.call/struct1_win32.c: Likewise. +- * testsuite/libffi.call/struct2_win32.c: Likewise. +- +-2012-03-22 Peter Rosin +- +- * src/x86/win32.S [MSVC] (ffi_closure_THISCALL): Remove the manual +- frame on function entry, MASM adds one automatically. +- +-2012-03-22 Peter Rosin +- +- * testsuite/libffi.call/ffitest.h [MSVC]: Add kludge for missing +- bits in the MSVC headers. +- +-2012-03-22 Peter Rosin +- +- * testsuite/libffi.call/cls_12byte.c: Adjust to the C89 style +- with no declarations after statements. +- * testsuite/libffi.call/cls_16byte.c: Likewise. +- * testsuite/libffi.call/cls_18byte.c: Likewise. +- * testsuite/libffi.call/cls_19byte.c: Likewise. +- * testsuite/libffi.call/cls_1_1byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte1.c: Likewise. +- * testsuite/libffi.call/cls_24byte.c: Likewise. +- * testsuite/libffi.call/cls_2byte.c: Likewise. +- * testsuite/libffi.call/cls_3_1byte.c: Likewise. +- * testsuite/libffi.call/cls_3byte1.c: Likewise. +- * testsuite/libffi.call/cls_3byte2.c: Likewise. +- * testsuite/libffi.call/cls_4_1byte.c: Likewise. +- * testsuite/libffi.call/cls_4byte.c: Likewise. +- * testsuite/libffi.call/cls_5_1_byte.c: Likewise. +- * testsuite/libffi.call/cls_5byte.c: Likewise. +- * testsuite/libffi.call/cls_64byte.c: Likewise. +- * testsuite/libffi.call/cls_6_1_byte.c: Likewise. +- * testsuite/libffi.call/cls_6byte.c: Likewise. +- * testsuite/libffi.call/cls_7_1_byte.c: Likewise. +- * testsuite/libffi.call/cls_7byte.c: Likewise. +- * testsuite/libffi.call/cls_8byte.c: Likewise. +- * testsuite/libffi.call/cls_9byte1.c: Likewise. +- * testsuite/libffi.call/cls_9byte2.c: Likewise. +- * testsuite/libffi.call/cls_align_double.c: Likewise. +- * testsuite/libffi.call/cls_align_float.c: Likewise. +- * testsuite/libffi.call/cls_align_longdouble.c: Likewise. +- * testsuite/libffi.call/cls_align_longdouble_split.c: Likewise. +- * testsuite/libffi.call/cls_align_longdouble_split2.c: Likewise. +- * testsuite/libffi.call/cls_align_pointer.c: Likewise. +- * testsuite/libffi.call/cls_align_sint16.c: Likewise. +- * testsuite/libffi.call/cls_align_sint32.c: Likewise. +- * testsuite/libffi.call/cls_align_sint64.c: Likewise. +- * testsuite/libffi.call/cls_align_uint16.c: Likewise. +- * testsuite/libffi.call/cls_align_uint32.c: Likewise. +- * testsuite/libffi.call/cls_align_uint64.c: Likewise. +- * testsuite/libffi.call/cls_dbls_struct.c: Likewise. +- * testsuite/libffi.call/cls_pointer_stack.c: Likewise. +- * testsuite/libffi.call/err_bad_typedef.c: Likewise. +- * testsuite/libffi.call/huge_struct.c: Likewise. +- * testsuite/libffi.call/nested_struct.c: Likewise. +- * testsuite/libffi.call/nested_struct1.c: Likewise. +- * testsuite/libffi.call/nested_struct10.c: Likewise. +- * testsuite/libffi.call/nested_struct2.c: Likewise. +- * testsuite/libffi.call/nested_struct3.c: Likewise. +- * testsuite/libffi.call/nested_struct4.c: Likewise. +- * testsuite/libffi.call/nested_struct5.c: Likewise. +- * testsuite/libffi.call/nested_struct6.c: Likewise. +- * testsuite/libffi.call/nested_struct7.c: Likewise. +- * testsuite/libffi.call/nested_struct8.c: Likewise. +- * testsuite/libffi.call/nested_struct9.c: Likewise. +- * testsuite/libffi.call/stret_large.c: Likewise. +- * testsuite/libffi.call/stret_large2.c: Likewise. +- * testsuite/libffi.call/stret_medium.c: Likewise. +- * testsuite/libffi.call/stret_medium2.c: Likewise. +- * testsuite/libffi.call/struct1.c: Likewise. +- * testsuite/libffi.call/struct1_win32.c: Likewise. +- * testsuite/libffi.call/struct2.c: Likewise. +- * testsuite/libffi.call/struct2_win32.c: Likewise. +- * testsuite/libffi.call/struct3.c: Likewise. +- * testsuite/libffi.call/struct4.c: Likewise. +- * testsuite/libffi.call/struct5.c: Likewise. +- * testsuite/libffi.call/struct6.c: Likewise. +- * testsuite/libffi.call/struct7.c: Likewise. +- * testsuite/libffi.call/struct8.c: Likewise. +- * testsuite/libffi.call/struct9.c: Likewise. +- * testsuite/libffi.call/testclosure.c: Likewise. +- +-2012-03-21 Peter Rosin +- +- * testsuite/libffi.call/float_va.c (float_va_fn): Use %f when +- printing doubles (%lf is for long doubles). +- (main): Likewise. +- +-2012-03-21 Peter Rosin +- +- * testsuite/lib/target-libpath.exp [*-*-cygwin*, *-*-mingw*] +- (set_ld_library_path_env_vars): Add the library search dir to PATH +- (and save PATH for later). +- (restore_ld_library_path_env_vars): Restore PATH. +- +-2012-03-21 Peter Rosin +- +- * testsuite/lib/target-libpath.exp [*-*-cygwin*, *-*-mingw*] +- (set_ld_library_path_env_vars): Add the library search dir to PATH +- (and save PATH for later). +- (restore_ld_library_path_env_vars): Restore PATH. +- +-2012-03-20 Peter Rosin +- +- * testsuite/libffi.call/strlen2_win32.c (main): Remove bug. +- * src/x86/win32.S [MSVC] (ffi_closure_SYSV): Make the 'stub' label +- visible outside the PROC, so that ffi_closure_THISCALL can see it. +- +-2012-03-20 Peter Rosin +- +- * testsuite/libffi.call/strlen2_win32.c (main): Remove bug. +- * src/x86/win32.S [MSVC] (ffi_closure_SYSV): Make the 'stub' label +- visible outside the PROC, so that ffi_closure_THISCALL can see it. +- +-2012-03-19 Alan Hourihane +- +- * src/m68k/ffi.c: Add MINT support. +- * src/m68k/sysv.S: Ditto. +- +-2012-03-06 Chung-Lin Tang +- +- * src/arm/ffi.c (ffi_call): Add __ARM_EABI__ guard around call to +- ffi_call_VFP(). +- (ffi_prep_closure_loc): Add __ARM_EABI__ guard around use of +- ffi_closure_VFP. +- * src/arm/sysv.S: Add __ARM_EABI__ guard around VFP code. +- +-2012-03-19 chennam +- +- * src/powerpc/ffi_darwin.c (ffi_prep_closure_loc): Fix AIX closure +- support. +- +-2012-03-13 Kaz Kojima +- +- * src/sh/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, +- just return FFI_BAD_ABI when things are wrong. +- * src/sh64/ffi.c (ffi_prep_closure_loc): Ditto. +- +-2012-03-09 David Edelsohn +- +- * src/powerpc/aix_closure.S (ffi_closure_ASM): Adjust for Darwin64 +- change to return value of ffi_closure_helper_DARWIN and load type +- from return type. +- +-2012-03-03 H.J. Lu +- +- * src/x86/ffi64.c (ffi_call): Cast the return value to unsigned +- long. +- (ffi_prep_closure_loc): Cast to 64bit address in trampoline. +- (ffi_closure_unix64_inner): Cast return pointer to unsigned long +- first. +- +- * src/x86/ffitarget.h (FFI_SIZEOF_ARG): Defined to 8 for x32. +- (ffi_arg): Set to unsigned long long for x32. +- (ffi_sarg): Set to long long for x32. +- +-2012-03-03 H.J. Lu +- +- * src/prep_cif.c (ffi_prep_cif_core): Properly check bad ABI. +- +-2012-03-03 Andoni Morales Alastruey +- +- * configure.ac: Add -no-undefined for both 32- and 64-bit x86 +- windows-like hosts. +- * configure: Rebuilt. +- +-2012-02-27 Mikael Pettersson +- +- PR libffi/52223 +- * Makefile.am (FLAGS_TO_PASS): Define. +- * Makefile.in: Regenerate. +- +-2012-02-23 Anthony Green +- +- * src/*/ffitarget.h: Ensure that users never include ffitarget.h +- directly. +- +-2012-02-23 Kai Tietz +- +- PR libffi/52221 +- * src/x86/ffi.c (ffi_closure_raw_THISCALL): New +- prototype. +- (ffi_prep_raw_closure_loc): Use ffi_closure_raw_THISCALL for +- thiscall-convention. +- (ffi_raw_call): Use ffi_prep_args_raw. +- * src/x86/win32.S (ffi_closure_raw_THISCALL): Add +- implementation for stub. +- +-2012-02-10 Kai Tietz +- +- * configure.ac (AM_LTLDFLAGS): Add -no-undefine for x64 +- windows target. +- * configure: Regenerated. +- +-2012-02-08 Kai Tietz +- +- * src/prep_cif.c (ffi_prep_cif): Allow for X86_WIN32 +- also FFI_THISCALL. +- * src/x86/ffi.c (ffi_closure_THISCALL): Add prototype. +- (FFI_INIT_TRAMPOLINE_THISCALL): New trampoline code. +- (ffi_prep_closure_loc): Add FFI_THISCALL support. +- * src/x86/ffitarget.h (FFI_TRAMPOLINE_SIZE): Adjust size. +- * src/x86/win32.S (ffi_closure_THISCALL): New closure code +- for thiscall-calling convention. +- * testsuite/libffi.call/closure_thiscall.c: New test. +- +-2012-01-28 Kai Tietz +- +- * src/libffi/src/x86/ffi.c (ffi_call_win32): Add new +- argument to prototype for specify calling-convention. +- (ffi_call): Add support for stdcall/thiscall convention. +- (ffi_prep_args): Likewise. +- (ffi_raw_call): Likewise. +- * src/x86/ffitarget.h (ffi_abi): Add FFI_THISCALL and +- FFI_FASTCALL. +- * src/x86/win32.S (_ffi_call_win32): Add support for +- fastcall/thiscall calling-convention calls. +- * testsuite/libffi.call/fastthis1_win32.c: New test. +- * testsuite/libffi.call/fastthis2_win32.c: New test. +- * testsuite/libffi.call/fastthis3_win32.c: New test. +- * testsuite/libffi.call/strlen2_win32.c: New test. +- * testsuite/libffi.call/many2_win32.c: New test. +- * testsuite/libffi.call/struct1_win32.c: New test. +- * testsuite/libffi.call/struct2_win32.c: New test. +- +-2012-01-23 Uros Bizjak +- +- * src/alpha/ffi.c (ffi_prep_closure_loc): Check for bad ABI. +- +-2012-01-23 Anthony Green +- Chris Young +- +- * configure.ac: Add Amiga support. +- * configure: Rebuilt. +- +-2012-01-23 Dmitry Nadezhin +- +- * include/ffi_common.h (LIKELY, UNLIKELY): Fix definitions. +- +-2012-01-23 Andreas Schwab +- +- * src/m68k/sysv.S (ffi_call_SYSV): Properly test for plain +- mc68000. Test for __HAVE_68881__ in addition to __MC68881__. +- +-2012-01-19 Jakub Jelinek +- +- PR rtl-optimization/48496 +- * src/ia64/ffi.c (ffi_call): Fix up aliasing violations. +- +-2012-01-09 Rainer Orth +- +- * configure.ac (i?86-*-*): Set TARGET to X86_64. +- * configure: Regenerate. +- +-2011-12-07 Andrew Pinski +- +- PR libffi/50051 +- * src/mips/n32.S: Add ".set mips4". +- +-2011-11-21 Andreas Tobler +- +- * configure: Regenerate. +- +-2011-11-12 David Gilbert +- +- * doc/libffi.texi, include/ffi.h.in, include/ffi_common.h, +- man/Makefile.am, man/ffi.3, man/ffi_prep_cif.3, +- man/ffi_prep_cif_var.3, src/arm/ffi.c, src/arm/ffitarget.h, +- src/cris/ffi.c, src/prep_cif.c, +- testsuite/libffi.call/cls_double_va.c, +- testsuite/libffi.call/cls_longdouble_va.c, +- testsuite/libffi.call/float_va.c: Many changes to support variadic +- function calls. +- +-2011-11-12 Kyle Moffett +- +- * src/powerpc/ffi.c, src/powerpc/ffitarget.h, +- src/powerpc/ppc_closure.S, src/powerpc/sysv.S: Many changes for +- softfloat powerpc variants. +- +-2011-11-12 Petr Salinger +- +- * configure.ac (FFI_EXEC_TRAMPOLINE_TABLE): Fix kfreebsd support. +- * configure: Rebuilt. +- +-2011-11-12 Timothy Wall +- +- * src/arm/ffi.c (ffi_prep_args, ffi_prep_incoming_args_SYSV): Max +- alignment of 4 for wince on ARM. +- +-2011-11-12 Kyle Moffett +- Anthony Green +- +- * src/ppc/sysv.S, src/ppc/ffi.c: Remove use of ppc string +- instructions (not available on some cores, like the PPC440). +- +-2011-11-12 Kimura Wataru +- +- * m4/ax_enable_builddir: Change from string comparison to numeric +- comparison for wc output. +- * configure.ac: Enable FFI_MMAP_EXEC_WRIT for darwin11 aka Mac OS +- X 10.7. +- * configure: Rebuilt. +- +-2011-11-12 Anthony Green +- +- * Makefile.am (AM_CCASFLAGS): Add -g option to build assembly +- files with debug info. +- * Makefile.in: Rebuilt. +- +-2011-11-12 Jasper Lievisse Adriaanse +- +- * README: Update list of supported OpenBSD systems. +- +-2011-11-12 Anthony Green +- +- * libtool-version: Update. +- * Makefile.am (nodist_libffi_la_SOURCES): Add src/debug.c if +- FFI_DEBUG. +- (libffi_la_SOURCES): Remove src/debug.c +- (EXTRA_DIST): Add src/debug.c +- * Makefile.in: Rebuilt. +- * README: Update for 3.0.11. +- +-2011-11-10 Richard Henderson +- +- * configure.ac (GCC_AS_CFI_PSEUDO_OP): Use it instead of inline check. +- * configure, aclocal.m4: Rebuild. +- +-2011-09-04 Iain Sandoe +- +- PR libffi/49594 +- * src/powerpc/darwin_closure.S (stubs): Make the stub binding +- helper reference track the architecture pointer size. +- +-2011-08-25 Andrew Haley +- +- * src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Remove hard-coded assembly +- instructions. +- * src/arm/sysv.S (ffi_arm_trampoline): Put them here instead. +- +-2011-07-11 Andrew Haley +- +- * src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Clear icache. +- +-2011-06-29 Rainer Orth +- +- * testsuite/libffi.call/cls_double_va.c: Move PR number to comment. +- * testsuite/libffi.call/cls_longdouble_va.c: Likewise. +- +-2011-06-29 Rainer Orth +- +- PR libffi/46660 +- * testsuite/libffi.call/cls_double_va.c: xfail dg-output on +- mips-sgi-irix6*. +- * testsuite/libffi.call/cls_longdouble_va.c: Likewise. +- +-2011-06-14 Rainer Orth +- +- * testsuite/libffi.call/huge_struct.c (test_large_fn): Use PRIu8, +- PRId8 instead of %hhu, %hhd. +- * testsuite/libffi.call/ffitest.h [__alpha__ && __osf__] (PRId8, +- PRIu8): Define. +- [__sgi__] (PRId8, PRIu8): Define. +- +-2011-04-29 Rainer Orth +- +- * src/alpha/osf.S (UA_SI, FDE_ENCODING, FDE_ENCODE, FDE_ARANGE): +- Define. +- Use them to handle ELF vs. ECOFF differences. +- [__osf__] (_GLOBAL__F_ffi_call_osf): Define. +- +-2011-03-30 Timothy Wall +- +- * src/powerpc/darwin.S: Fix unknown FDE encoding. +- * src/powerpc/darwin_closure.S: ditto. +- +-2011-02-25 Anthony Green +- +- * src/powerpc/ffi.c (ffi_prep_closure_loc): Allow for more +- 32-bit ABIs. +- +-2011-02-15 Anthony Green +- +- * m4/ax_cc_maxopt.m4: Don't -malign-double or use -ffast-math. +- * configure: Rebuilt. +- +-2011-02-13 Ralf Wildenhues +- +- * configure: Regenerate. +- +-2011-02-13 Anthony Green +- +- * include/ffi_common.h (UNLIKELY, LIKELY): Define. +- * src/x86/ffi64.c (UNLIKELY, LIKELY): Remove definition. +- * src/prep_cif.c (UNLIKELY, LIKELY): Remove definition. +- +- * src/prep_cif.c (initialize_aggregate): Convert assertion into +- FFI_BAD_TYPEDEF return. Initialize arg size and alignment to 0. +- +- * src/pa/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, +- just return FFI_BAD_ABI when things are wrong. +- * src/arm/ffi.c (ffi_prep_closure_loc): Ditto. +- * src/powerpc/ffi.c (ffi_prep_closure_loc): Ditto. +- * src/mips/ffi.c (ffi_prep_closure_loc): Ditto. +- * src/ia64/ffi.c (ffi_prep_closure_loc): Ditto. +- * src/avr32/ffi.c (ffi_prep_closure_loc): Ditto. +- +-2011-02-11 Anthony Green +- +- * src/sparc/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, +- just return FFI_BAD_ABI when things are wrong. +- +-2012-02-11 Eric Botcazou +- +- * src/sparc/v9.S (STACKFRAME): Bump to 176. +- +-2011-02-09 Stuart Shelton +- +- http://bugs.gentoo.org/show_bug.cgi?id=286911 +- * src/mips/ffitarget.h: Clean up error messages. +- * src/java_raw_api.c (ffi_java_translate_args): Cast raw arg to +- ffi_raw*. +- * include/ffi.h.in: Add pragma for SGI compiler. +- +-2011-02-09 Anthony Green +- +- * configure.ac: Add powerpc64-*-darwin* support. +- +-2011-02-09 Anthony Green +- +- * README: Mention Interix. +- +-2011-02-09 Jonathan Callen +- +- * configure.ac: Add Interix to win32/cygwin/mingw case. +- * configure: Ditto. +- * src/closures.c: Treat Interix like Cygwin, instead of as a +- generic win32. +- +-2011-02-09 Anthony Green +- +- * testsuite/libffi.call/err_bad_typedef.c: Remove xfail. +- * testsuite/libffi.call/err_bad_abi.c: Remove xfail. +- * src/x86/ffi64.c (UNLIKELY, LIKELY): Define. +- (ffi_prep_closure_loc): Check for bad ABI. +- * src/prep_cif.c (UNLIKELY, LIKELY): Define. +- (initialize_aggregate): Check for bad types. +- +-2011-02-09 Landon Fuller +- +- * Makefile.am (EXTRA_DIST): Add build-ios.sh, src/arm/gentramp.sh, +- src/arm/trampoline.S. +- (nodist_libffi_la_SOURCES): Add src/arc/trampoline.S. +- * configure.ac (FFI_EXEC_TRAMPOLINE_TABLE): Define. +- * src/arm/ffi.c (ffi_trampoline_table) +- (ffi_closure_trampoline_table_page, ffi_trampoline_table_entry) +- (FFI_TRAMPOLINE_CODELOC_CONFIG, FFI_TRAMPOLINE_CONFIG_PAGE_OFFSET) +- (FFI_TRAMPOLINE_COUNT, ffi_trampoline_lock, ffi_trampoline_tables) +- (ffi_trampoline_table_alloc, ffi_closure_alloc, ffi_closure_free): +- Define for FFI_EXEC_TRAMPOLINE_TABLE case (iOS). +- (ffi_prep_closure_loc): Handl FFI_EXEC_TRAMPOLINE_TABLE case +- separately. +- * src/arm/sysv.S: Handle Apple iOS host. +- * src/closures.c: Handle FFI_EXEC_TRAMPOLINE_TABLE case. +- * build-ios.sh: New file. +- * fficonfig.h.in, configure, Makefile.in: Rebuilt. +- * README: Mention ARM iOS. +- +-2011-02-08 Oren Held +- +- * src/dlmalloc.c (_STRUCT_MALLINFO): Define in order to avoid +- redefinition of mallinfo on HP-UX. +- +-2011-02-08 Ginn Chen +- +- * src/sparc/ffi.c (ffi_call): Make compatible with Solaris Studio +- aggregate return ABI. Flush cache. +- (ffi_prep_closure_loc): Flush cache. +- +-2011-02-11 Anthony Green +- +- From Tom Honermann : +- * src/powerpc/aix.S (ffi_call_AIX): Support for xlc toolchain on +- AIX. Declare .ffi_prep_args. Insert nops after branch +- instructions so that the AIX linker can insert TOC reload +- instructions. +- * src/powerpc/aix_closure.S: Declare .ffi_closure_helper_DARWIN. +- +-2011-02-08 Ed +- +- * src/powerpc/asm.h: Fix grammar nit in comment. +- +-2011-02-08 Uli Link +- +- * include/ffi.h.in (FFI_64_BIT_MAX): Define and use. +- +-2011-02-09 Rainer Orth +- +- PR libffi/46661 +- * testsuite/libffi.call/cls_pointer.c (main): Cast void * to +- uintptr_t first. +- * testsuite/libffi.call/cls_pointer_stack.c (main): Likewise. +- +-2011-02-08 Rafael Avila de Espindola +- +- * configure.ac: Fix x86 test for pc related relocs. +- * configure: Rebuilt. +- +-2011-02-07 Joel Sherrill +- +- * libffi/src/m68k/ffi.c: Add RTEMS support for cache flushing. +- Handle case when CPU variant does not have long double support. +- * libffi/src/m68k/sysv.S: Add support for mc68000, Coldfire, +- and cores with soft floating point. +- +-2011-02-07 Joel Sherrill +- +- * configure.ac: Add mips*-*-rtems* support. +- * configure: Regenerate. +- * src/mips/ffitarget.h: Ensure needed constants are available +- for targets which do not have sgidefs.h. +- +-2011-01-26 Dave Korn +- +- PR target/40125 +- * configure.ac (AM_LTLDFLAGS): Add -bindir option for windows DLLs. +- * configure: Regenerate. +- +-2010-12-18 Iain Sandoe +- +- PR libffi/29152 +- PR libffi/42378 +- * src/powerpc/darwin_closure.S: Provide Darwin64 implementation, +- update comments. +- * src/powerpc/ffitarget.h (POWERPC_DARWIN64): New, +- (FFI_TRAMPOLINE_SIZE): Update for Darwin64. +- * src/powerpc/darwin.S: Provide Darwin64 implementation, +- update comments. +- * src/powerpc/ffi_darwin.c: Likewise. +- +-2010-12-06 Rainer Orth +- +- * configure.ac (libffi_cv_as_ascii_pseudo_op): Use double +- backslashes. +- (libffi_cv_as_string_pseudo_op): Likewise. +- * configure: Regenerate. +- +-2010-12-03 Chung-Lin Tang +- +- * src/arm/sysv.S (ffi_closure_SYSV): Add UNWIND to .pad directive. +- (ffi_closure_VFP): Same. +- (ffi_call_VFP): Move down to before ffi_closure_VFP. Add '.fpu vfp' +- directive. +- +-2010-12-01 Rainer Orth +- +- * testsuite/libffi.call/ffitest.h [__sgi] (PRId64, PRIu64): Define. +- (PRIuPTR): Define. +- +-2010-11-29 Richard Henderson +- Rainer Orth +- +- * src/x86/sysv.S (FDE_ENCODING, FDE_ENCODE): Define. +- (.eh_frame): Use FDE_ENCODING. +- (.LASFDE1, .LASFDE2, LASFDE3): Simplify with FDE_ENCODE. +- +-2010-11-22 Jacek Caban +- +- * configure.ac: Check for symbol underscores on mingw-w64. +- * configure: Rebuilt. +- * src/x86/win64.S: Correctly access extern symbols in respect to +- underscores. +- +-2010-11-15 Rainer Orth +- +- * testsuite/lib/libffi-dg.exp: Rename ... +- * testsuite/lib/libffi.exp: ... to this. +- * libffi/testsuite/libffi.call/call.exp: Don't load libffi-dg.exp. +- * libffi/testsuite/libffi.special/special.exp: Likewise. +- +-2010-10-28 Chung-Lin Tang +- +- * src/arm/ffi.c (ffi_prep_args): Add VFP register argument handling +- code, new parameter, and return value. Update comments. +- (ffi_prep_cif_machdep): Add case for VFP struct return values. Add +- call to layout_vfp_args(). +- (ffi_call_SYSV): Update declaration. +- (ffi_call_VFP): New declaration. +- (ffi_call): Add VFP struct return conditions. Call ffi_call_VFP() +- when ABI is FFI_VFP. +- (ffi_closure_VFP): New declaration. +- (ffi_closure_SYSV_inner): Add new vfp_args parameter, update call to +- ffi_prep_incoming_args_SYSV(). +- (ffi_prep_incoming_args_SYSV): Update parameters. Add VFP argument +- case handling. +- (ffi_prep_closure_loc): Pass ffi_closure_VFP to trampoline +- construction under VFP hard-float. +- (rec_vfp_type_p): New function. +- (vfp_type_p): Same. +- (place_vfp_arg): Same. +- (layout_vfp_args): Same. +- * src/arm/ffitarget.h (ffi_abi): Add FFI_VFP. Define FFI_DEFAULT_ABI +- based on __ARM_PCS_VFP. +- (FFI_EXTRA_CIF_FIELDS): Define for adding VFP hard-float specific +- fields. +- (FFI_TYPE_STRUCT_VFP_FLOAT): Define internally used type code. +- (FFI_TYPE_STRUCT_VFP_DOUBLE): Same. +- * src/arm/sysv.S (ffi_call_SYSV): Change call of ffi_prep_args() to +- direct call. Move function pointer load upwards. +- (ffi_call_VFP): New function. +- (ffi_closure_VFP): Same. +- +- * testsuite/lib/libffi-dg.exp (check-flags): New function. +- (dg-skip-if): New function. +- * testsuite/libffi.call/cls_double_va.c: Skip if target is arm*-*-* +- and compiler options include -mfloat-abi=hard. +- * testsuite/libffi.call/cls_longdouble_va.c: Same. +- +-2010-10-01 Jakub Jelinek +- +- PR libffi/45677 +- * src/x86/ffi64.c (ffi_prep_cif_machdep): Ensure cif->bytes is +- a multiple of 8. +- * testsuite/libffi.call/many2.c: New test. +- +-2010-08-20 Mark Wielaard +- +- * src/closures.c (open_temp_exec_file_mnt): Check if getmntent_r +- returns NULL. +- +-2010-08-09 Andreas Tobler +- +- * configure.ac: Add target powerpc64-*-freebsd*. +- * configure: Regenerate. +- * testsuite/libffi.call/cls_align_longdouble_split.c: Pass +- -mlong-double-128 only to linux targets. +- * testsuite/libffi.call/cls_align_longdouble_split2.c: Likewise. +- * testsuite/libffi.call/cls_longdouble.c: Likewise. +- * testsuite/libffi.call/huge_struct.c: Likewise. +- +-2010-08-05 Dan Witte +- +- * Makefile.am: Pass FFI_DEBUG define to msvcc.sh for linking to the +- debug CRT when --enable-debug is given. +- * configure.ac: Define it. +- * msvcc.sh: Translate -g and -DFFI_DEBUG appropriately. +- +-2010-08-04 Dan Witte +- +- * src/x86/ffitarget.h: Add X86_ANY define for all x86/x86_64 +- platforms. +- * src/x86/ffi.c: Remove redundant ifdef checks. +- * src/prep_cif.c: Push stack space computation into src/x86/ffi.c +- for X86_ANY so return value space doesn't get added twice. +- +-2010-08-03 Neil Rashbrooke +- +- * msvcc.sh: Don't pass -safeseh to ml64 because behavior is buggy. +- +-2010-07-22 Dan Witte +- +- * src/*/ffitarget.h: Make FFI_LAST_ABI one past the last valid ABI. +- * src/prep_cif.c: Fix ABI assertion. +- * src/cris/ffi.c: Ditto. +- +-2010-07-10 Evan Phoenix +- +- * src/closures.c (selinux_enabled_check): Fix strncmp usage bug. +- +-2010-07-07 Dan Horák +- +- * include/ffi.h.in: Protect #define with #ifndef. +- * src/powerpc/ffitarget.h: Ditto. +- * src/s390/ffitarget.h: Ditto. +- * src/sparc/ffitarget.h: Ditto. +- +-2010-07-07 Neil Roberts +- +- * src/x86/sysv.S (ffi_call_SYSV): Align the stack pointer to +- 16-bytes. +- +-2010-07-02 Jakub Jelinek +- +- * Makefile.am (AM_MAKEFLAGS): Pass also mandir to submakes. +- * Makefile.in: Regenerated. +- +-2010-05-19 Rainer Orth +- +- * configure.ac (libffi_cv_as_x86_pcrel): Check for illegal in as +- output, too. +- (libffi_cv_as_ascii_pseudo_op): Check for .ascii. +- (libffi_cv_as_string_pseudo_op): Check for .string. +- * configure: Regenerate. +- * fficonfig.h.in: Regenerate. +- * src/x86/sysv.S (.eh_frame): Use .ascii, .string or error. +- +-2010-05-11 Dan Witte +- +- * doc/libffi.tex: Document previous change. +- +-2010-05-11 Makoto Kato +- +- * src/x86/ffi.c (ffi_call): Don't copy structs passed by value. +- +-2010-05-05 Michael Kohler +- +- * src/dlmalloc.c (dlfree): Fix spelling. +- * src/ia64/ffi.c (ffi_prep_cif_machdep): Ditto. +- * configure.ac: Ditto. +- * configure: Rebuilt. +- +-2010-04-13 Dan Witte +- +- * msvcc.sh: Build with -W3 instead of -Wall. +- * src/powerpc/ffi_darwin.c: Remove build warnings. +- * src/x86/ffi.c: Ditto. +- * src/x86/ffitarget.h: Ditto. +- +-2010-04-12 Dan Witte +- Walter Meinl +- +- * configure.ac: Add OS/2 support. +- * configure: Rebuilt. +- * src/closures.c: Ditto. +- * src/dlmalloc.c: Ditto. +- * src/x86/win32.S: Ditto. +- +-2010-04-07 Jakub Jelinek +- +- * testsuite/libffi.call/err_bad_abi.c: Remove unused args variable. +- +-2010-04-02 Ralf Wildenhues +- +- * Makefile.in: Regenerate. +- * aclocal.m4: Regenerate. +- * include/Makefile.in: Regenerate. +- * man/Makefile.in: Regenerate. +- * testsuite/Makefile.in: Regenerate. +- +-2010-03-30 Dan Witte +- +- * msvcc.sh: Disable build warnings. +- * README (tested): Clarify windows build procedure. +- +-2010-03-15 Rainer Orth +- +- * configure.ac (libffi_cv_as_x86_64_unwind_section_type): New test. +- * configure: Regenerate. +- * fficonfig.h.in: Regenerate. +- * libffi/src/x86/unix64.S (.eh_frame) +- [HAVE_AS_X86_64_UNWIND_SECTION_TYPE]: Use @unwind section type. +- +-2010-03-14 Matthias Klose +- +- * src/x86/ffi64.c: Fix typo in comment. +- * src/x86/ffi.c: Use /* ... */ comment style. +- +-2010-02-24 Rainer Orth +- +- * doc/libffi.texi (The Closure API): Fix typo. +- * doc/libffi.info: Remove. +- +-2010-02-15 Matthias Klose +- +- * src/arm/sysv.S (__ARM_ARCH__): Define for processor +- __ARM_ARCH_7EM__. +- +-2010-01-15 Anthony Green +- +- * README: Add notes on building with Microsoft Visual C++. +- +-2010-01-15 Daniel Witte +- +- * msvcc.sh: New file. +- +- * src/x86/win32.S: Port assembly routines to MSVC and #ifdef. +- * src/x86/ffi.c: Tweak function declaration and remove excess +- parens. +- * include/ffi.h.in: Add __declspec(align(8)) to typedef struct +- ffi_closure. +- +- * src/x86/ffi.c: Merge ffi_call_SYSV and ffi_call_STDCALL into new +- function ffi_call_win32 on X86_WIN32. +- * src/x86/win32.S (ffi_call_SYSV): Rename to ffi_call_win32. +- (ffi_call_STDCALL): Remove. +- +- * src/prep_cif.c (ffi_prep_cif): Move stack space allocation code +- to ffi_prep_cif_machdep for x86. +- * src/x86/ffi.c (ffi_prep_cif_machdep): To here. +- +-2010-01-15 Oliver Kiddle +- +- * src/x86/ffitarget.h (ffi_abi): Check for __i386 and __amd64 for +- Sun Studio compiler compatibility. +- +-2010-01-12 Conrad Irwin +- +- * doc/libffi.texi: Add closure example. +- +-2010-01-07 Rainer Orth +- +- PR libffi/40701 +- * testsuite/libffi.call/ffitest.h [__alpha__ && __osf__] (PRIdLL, +- PRIuLL, PRId64, PRIu64, PRIuPTR): Define. +- * testsuite/libffi.call/cls_align_sint64.c: Add -Wno-format on +- alpha*-dec-osf*. +- * testsuite/libffi.call/cls_align_uint64.c: Likewise. +- * testsuite/libffi.call/cls_ulonglong.c: Likewise. +- * testsuite/libffi.call/return_ll1.c: Likewise. +- * testsuite/libffi.call/stret_medium2.c: Likewise. +- * testsuite/libffi.special/ffitestcxx.h (allocate_mmap): Cast +- MAP_FAILED to char *. +- +-2010-01-06 Rainer Orth +- +- * src/mips/n32.S: Use .abicalls and .eh_frame with __GNUC__. +- +-2009-12-31 Anthony Green +- +- * README: Update for libffi 3.0.9. +- +-2009-12-27 Matthias Klose +- +- * configure.ac (HAVE_LONG_DOUBLE): Define for mips when +- appropriate. +- * configure: Rebuilt. +- +-2009-12-26 Anthony Green +- +- * testsuite/libffi.call/cls_longdouble_va.c: Mark as xfail for +- avr32*-*-*. +- * testsuite/libffi.call/cls_double_va.c: Ditto. +- +-2009-12-26 Andreas Tobler +- +- * testsuite/libffi.call/ffitest.h: Conditionally include stdint.h +- and inttypes.h. +- * testsuite/libffi.special/unwindtest.cc: Ditto. +- +-2009-12-26 Andreas Tobler +- +- * configure.ac: Add amd64-*-openbsd*. +- * configure: Rebuilt. +- * testsuite/lib/libffi-dg.exp (libffi_target_compile): Link +- openbsd programs with -lpthread. +- +-2009-12-26 Anthony Green +- +- * testsuite/libffi.call/cls_double_va.c, +- testsuite/libffi.call/cls_longdouble.c, +- testsuite/libffi.call/cls_longdouble_va.c, +- testsuite/libffi.call/cls_pointer.c, +- testsuite/libffi.call/cls_pointer_stack.c: Remove xfail for +- mips*-*-* and arm*-*-*. +- * testsuite/libffi.call/cls_align_longdouble_split.c, +- testsuite/libffi.call/cls_align_longdouble_split2.c, +- testsuite/libffi.call/stret_medium2.c, +- testsuite/libffi.call/stret_medium.c, +- testsuite/libffi.call/stret_large.c, +- testsuite/libffi.call/stret_large2.c: Remove xfail for arm*-*-*. +- +-2009-12-31 Kay Tietz +- +- * testsuite/libffi.call/ffitest.h, +- testsuite/libffi.special/ffitestcxx.h (PRIdLL, PRuLL): Fix +- definitions. +- +-2009-12-31 Carlo Bramini +- +- * configure.ac (AM_LTLDFLAGS): Define for windows hosts. +- * Makefile.am (libffi_la_LDFLAGS): Add AM_LTLDFLAGS. +- * configure: Rebuilt. +- * Makefile.in: Rebuilt. +- +-2009-12-31 Anthony Green +- Blake Chaffin. +- +- * testsuite/libffi.call/huge_struct.c: New test case from Blake +- Chaffin @ Apple. +- +-2009-12-28 David Edelsohn +- +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Copy abi and nargs to +- local variables. +- (aix_adjust_aggregate_sizes): New function. +- (ffi_prep_cif_machdep): Call it. +- +-2009-12-26 Andreas Tobler +- +- * configure.ac: Define FFI_MMAP_EXEC_WRIT for the given targets. +- * configure: Regenerate. +- * fficonfig.h.in: Likewise. +- * src/closures.c: Remove the FFI_MMAP_EXEC_WRIT definition for +- Solaris/x86. +- +-2009-12-26 Andreas Schwab +- +- * src/powerpc/ffi.c (ffi_prep_args_SYSV): Advance intarg_count +- when a float arguments is passed in memory. +- (ffi_closure_helper_SYSV): Mark general registers as used up when +- a 64bit or soft-float long double argument is passed in memory. +- +-2009-12-25 Matthias Klose +- +- * man/ffi_call.3: Fix #include in examples. +- * doc/libffi.texi: Add dircategory. +- +-2009-12-25 Frank Everdij +- +- * include/ffi.h.in: Placed '__GNUC__' ifdef around +- '__attribute__((aligned(8)))' in ffi_closure, fixes compile for +- IRIX MIPSPro c99. +- * include/ffi_common.h: Added '__sgi' define to non +- '__attribute__((__mode__()))' integer typedefs. +- * src/mips/ffi.c (ffi_call, ffi_closure_mips_inner_O32, +- ffi_closure_mips_inner_N32): Added 'defined(_MIPSEB)' to BE check. +- (ffi_closure_mips_inner_O32, ffi_closure_mips_inner_N32): Added +- FFI_LONGDOUBLE support and alignment(N32 only). +- * src/mips/ffitarget.h: Corrected '#include ' for IRIX and +- fixed non '__attribute__((__mode__()))' integer typedefs. +- * src/mips/n32.S: Put '#ifdef linux' around '.abicalls' and '.eh_frame' +- since they are Linux/GNU Assembler specific. +- +-2009-12-25 Bradley Smith +- +- * configure.ac, Makefile.am, src/avr32/ffi.c, +- src/avr32/ffitarget.h, +- src/avr32/sysv.S: Add AVR32 port. +- * configure, Makefile.in: Rebuilt. +- +-2009-12-21 Andreas Tobler +- +- * configure.ac: Make i?86 build on FreeBSD and OpenBSD. +- * configure: Regenerate. +- +-2009-12-15 John David Anglin +- +- * testsuite/libffi.call/ffitest.h: Define PRIuPTR on PA HP-UX. +- +-2009-12-13 John David Anglin +- +- * src/pa/ffi.c (ffi_closure_inner_pa32): Handle FFI_TYPE_LONGDOUBLE +- type on HP-UX. +- +-2012-02-13 Kai Tietz +- +- PR libffi/52221 +- * src/x86/ffi.c (ffi_prep_raw_closure_loc): Add thiscall +- support for X86_WIN32. +- (FFI_INIT_TRAMPOLINE_THISCALL): Fix displacement. +- +-2009-12-11 Eric Botcazou +- +- * src/sparc/ffi.c (ffi_closure_sparc_inner_v9): Properly align 'long +- double' arguments. +- +-2009-12-11 Eric Botcazou +- +- * testsuite/libffi.call/ffitest.h: Define PRIuPTR on Solaris < 10. +- +-2009-12-10 Rainer Orth +- +- PR libffi/40700 +- * src/closures.c [X86_64 && __sun__ && __svr4__] +- (FFI_MMAP_EXEC_WRIT): Define. +- +-2009-12-08 David Daney +- +- * testsuite/libffi.call/stret_medium.c: Remove xfail for mips*-*-* +- * testsuite/libffi.call/cls_align_longdouble_split2.c: Same. +- * testsuite/libffi.call/stret_large.c: Same. +- * testsuite/libffi.call/cls_align_longdouble_split.c: Same. +- * testsuite/libffi.call/stret_large2.c: Same. +- * testsuite/libffi.call/stret_medium2.c: Same. +- +-2009-12-07 David Edelsohn +- +- * src/powerpc/aix_closure.S (libffi_closure_ASM): Fix tablejump +- typo. +- +-2009-12-05 David Edelsohn +- +- * src/powerpc/aix.S: Update AIX32 code to be consistent with AIX64 +- code. +- * src/powerpc/aix_closure.S: Same. +- +-2009-12-05 Ralf Wildenhues +- +- * Makefile.in: Regenerate. +- * configure: Regenerate. +- * include/Makefile.in: Regenerate. +- * man/Makefile.in: Regenerate. +- * testsuite/Makefile.in: Regenerate. +- +-2009-12-04 David Edelsohn +- +- * src/powerpc/aix_closure.S: Reorganize 64-bit code to match +- linux64_closure.S. +- +-2009-12-04 Uros Bizjak +- +- PR libffi/41908 +- * src/x86/ffi64.c (classify_argument): Update from +- gcc/config/i386/i386.c. +- (ffi_closure_unix64_inner): Do not use the address of two consecutive +- SSE registers directly. +- * testsuite/libffi.call/cls_dbls_struct.c (main): Remove xfail +- for x86_64 linux targets. +- +-2009-12-04 David Edelsohn +- +- * src/powerpc/ffi_darwin.c (ffi_closure_helper_DARWIN): Increment +- pfr for long double split between fpr13 and stack. +- +-2009-12-03 David Edelsohn +- +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Increment next_arg and +- fparg_count twice for long double. +- +-2009-12-03 David Edelsohn +- +- PR libffi/42243 +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Remove extra parentheses. +- +-2009-12-03 Uros Bizjak +- +- * testsuite/libffi.call/cls_longdouble_va.c (main): Fix format string. +- Remove xfails for x86 linux targets. +- +-2009-12-02 David Edelsohn +- +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Fix typo in INT64 +- case. +- +-2009-12-01 David Edelsohn +- +- * src/powerpc/aix.S (ffi_call_AIX): Convert to more standard +- register usage. Call ffi_prep_args directly. Add long double +- return value support. +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Double arg increment +- applies to FFI_TYPE_DOUBLE. Correct fpr_base increment typo. +- Separate FFI_TYPE_SINT32 and FFI_TYPE_UINT32 cases. +- (ffi_prep_cif_machdep): Only 16 byte stack alignment in 64 bit +- mode. +- (ffi_closure_helper_DARWIN): Remove nf and ng counters. Move temp +- into case. +- * src/powerpc/aix_closure.S: Maintain 16 byte stack alignment. +- Allocate result area between params and FPRs. +- +-2009-11-30 David Edelsohn +- +- PR target/35484 +- * src/powerpc/ffitarget.h (POWERPC64): Define for PPC64 Linux and +- AIX64. +- * src/powerpc/aix.S: Implement AIX64 version. +- * src/powerpc/aix_closure.S: Implement AIX64 version. +- (ffi_closure_ASM): Use extsb, lha and displament addresses. +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Implement AIX64 +- support. +- (ffi_prep_cif_machdep): Same. +- (ffi_call): Same. +- (ffi_closure_helper_DARWIN): Same. +- +-2009-11-02 Andreas Tobler +- +- PR libffi/41908 +- * testsuite/libffi.call/testclosure.c: New test. +- +-2009-09-28 Kai Tietz +- +- * src/x86/win64.S (_ffi_call_win64 stack): Remove for gnu +- assembly version use of ___chkstk. +- +-2009-09-23 Matthias Klose +- +- PR libffi/40242, PR libffi/41443 +- * src/arm/sysv.S (__ARM_ARCH__): Define for processors +- __ARM_ARCH_6T2__, __ARM_ARCH_6M__, __ARM_ARCH_7__, +- __ARM_ARCH_7A__, __ARM_ARCH_7R__, __ARM_ARCH_7M__. +- Change the conditionals to __SOFTFP__ || __ARM_EABI__ +- for -mfloat-abi=softfp to work. +- +-2009-09-17 Loren J. Rittle +- +- PR testsuite/32843 (strikes again) +- * src/x86/ffi.c (ffi_prep_cif_machdep): Add X86_FREEBSD to +- enable proper extension on char and short. +- +-2009-09-15 David Daney +- +- * src/java_raw_api.c (ffi_java_raw_to_rvalue): Remove special +- handling for FFI_TYPE_POINTER. +- * src/mips/ffitarget.h (FFI_TYPE_STRUCT_D_SOFT, +- FFI_TYPE_STRUCT_F_SOFT, FFI_TYPE_STRUCT_DD_SOFT, +- FFI_TYPE_STRUCT_FF_SOFT, FFI_TYPE_STRUCT_FD_SOFT, +- FFI_TYPE_STRUCT_DF_SOFT, FFI_TYPE_STRUCT_SOFT): New defines. +- (FFI_N32_SOFT_FLOAT, FFI_N64_SOFT_FLOAT): New ffi_abi enumerations. +- (enum ffi_abi): Set FFI_DEFAULT_ABI for soft-float. +- * src/mips/n32.S (ffi_call_N32): Add handling for soft-float +- structure and pointer returns. +- (ffi_closure_N32): Add handling for pointer returns. +- * src/mips/ffi.c (ffi_prep_args, calc_n32_struct_flags, +- calc_n32_return_struct_flags): Handle soft-float. +- (ffi_prep_cif_machdep): Handle soft-float, fix pointer handling. +- (ffi_call_N32): Declare proper argument types. +- (ffi_call, copy_struct_N32, ffi_closure_mips_inner_N32): Handle +- soft-float. +- +-2009-08-24 Ralf Wildenhues +- +- * configure.ac (AC_PREREQ): Bump to 2.64. +- +-2009-08-22 Ralf Wildenhues +- +- * Makefile.am (install-html, install-pdf): Remove. +- * Makefile.in: Regenerate. +- +- * Makefile.in: Regenerate. +- * aclocal.m4: Regenerate. +- * configure: Regenerate. +- * fficonfig.h.in: Regenerate. +- * include/Makefile.in: Regenerate. +- * man/Makefile.in: Regenerate. +- * testsuite/Makefile.in: Regenerate. +- +-2011-08-22 Jasper Lievisse Adriaanse +- +- * configure.ac: Add OpenBSD/hppa and OpenBSD/powerpc support. +- * configure: Rebuilt. +- +-2009-07-30 Ralf Wildenhues +- +- * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. +- +-2009-07-24 Dave Korn +- +- PR libffi/40807 +- * src/x86/ffi.c (ffi_prep_cif_machdep): Also use sign/zero-extending +- return types for X86_WIN32. +- * src/x86/win32.S (_ffi_call_SYSV): Handle omitted return types. +- (_ffi_call_STDCALL, _ffi_closure_SYSV, _ffi_closure_raw_SYSV, +- _ffi_closure_STDCALL): Likewise. +- +- * src/closures.c (is_selinux_enabled): Define to const 0 for Cygwin. +- (dlmmap, dlmunmap): Also use these functions on Cygwin. +- +-2009-07-11 Richard Sandiford +- +- PR testsuite/40699 +- PR testsuite/40707 +- PR testsuite/40709 +- * testsuite/lib/libffi-dg.exp: Revert 2009-07-02, 2009-07-01 and +- 2009-06-30 commits. +- +-2009-07-01 Richard Sandiford +- +- * testsuite/lib/libffi-dg.exp (libffi-init): Set ld_library_path +- to "" before adding paths. (This reinstates an assignment that +- was removed by my 2009-06-30 commit, but changes the initial +- value from "." to "".) +- +-2009-07-01 H.J. Lu +- +- PR testsuite/40601 +- * testsuite/lib/libffi-dg.exp (libffi-init): Properly set +- gccdir. Adjust ld_library_path for gcc only if gccdir isn't +- empty. +- +-2009-06-30 Richard Sandiford +- +- * testsuite/lib/libffi-dg.exp (libffi-init): Don't add "." +- to ld_library_path. Use add_path. Add just find_libgcc_s +- to ld_library_path, not every libgcc multilib directory. +- +-2009-06-16 Wim Lewis +- +- * src/powerpc/ffi.c: Avoid clobbering cr3 and cr4, which are +- supposed to be callee-saved. +- * src/powerpc/sysv.S (small_struct_return_value): Fix overrun of +- return buffer for odd-size structs. +- +-2009-06-16 Andreas Tobler +- +- PR libffi/40444 +- * testsuite/lib/libffi-dg.exp (libffi_target_compile): Add +- allow_stack_execute for Darwin. +- +-2009-06-16 Andrew Haley +- +- * configure.ac (TARGETDIR): Add missing blank lines. +- * configure: Regenerate. +- +-2009-06-16 Andrew Haley +- +- * testsuite/libffi.call/cls_align_sint64.c, +- testsuite/libffi.call/cls_align_uint64.c, +- testsuite/libffi.call/cls_longdouble_va.c, +- testsuite/libffi.call/cls_ulonglong.c, +- testsuite/libffi.call/return_ll1.c, +- testsuite/libffi.call/stret_medium2.c: Fix printf format +- specifiers. +- * testsuite/libffi.call/ffitest.h, +- testsuite/libffi.special/ffitestcxx.h (PRIdLL, PRIuLL): Define. +- +-2009-06-15 Andrew Haley +- +- * testsuite/libffi.call/err_bad_typedef.c: xfail everywhere. +- * testsuite/libffi.call/err_bad_abi.c: Likewise. +- +-2009-06-12 Andrew Haley +- +- * Makefile.am: Remove info_TEXINFOS. +- +-2009-06-12 Andrew Haley +- +- * ChangeLog.libffi: testsuite/libffi.call/cls_align_sint64.c, +- testsuite/libffi.call/cls_align_uint64.c, +- testsuite/libffi.call/cls_ulonglong.c, +- testsuite/libffi.call/return_ll1.c, +- testsuite/libffi.call/stret_medium2.c: Fix printf format +- specifiers. +- testsuite/libffi.special/unwindtest.cc: include stdint.h. +- +-2009-06-11 Timothy Wall +- +- * Makefile.am, +- configure.ac, +- include/ffi.h.in, +- include/ffi_common.h, +- src/closures.c, +- src/dlmalloc.c, +- src/x86/ffi.c, +- src/x86/ffitarget.h, +- src/x86/win64.S (new), +- README: Added win64 support (mingw or MSVC) +- * Makefile.in, +- include/Makefile.in, +- man/Makefile.in, +- testsuite/Makefile.in, +- configure, +- aclocal.m4: Regenerated +- * ltcf-c.sh: properly escape cygwin/w32 path +- * man/ffi_call.3: Clarify size requirements for return value. +- * src/x86/ffi64.c: Fix filename in comment. +- * src/x86/win32.S: Remove unused extern. +- +- * testsuite/libffi.call/closure_fn0.c, +- testsuite/libffi.call/closure_fn1.c, +- testsuite/libffi.call/closure_fn2.c, +- testsuite/libffi.call/closure_fn3.c, +- testsuite/libffi.call/closure_fn4.c, +- testsuite/libffi.call/closure_fn5.c, +- testsuite/libffi.call/closure_fn6.c, +- testsuite/libffi.call/closure_stdcall.c, +- testsuite/libffi.call/cls_12byte.c, +- testsuite/libffi.call/cls_16byte.c, +- testsuite/libffi.call/cls_18byte.c, +- testsuite/libffi.call/cls_19byte.c, +- testsuite/libffi.call/cls_1_1byte.c, +- testsuite/libffi.call/cls_20byte.c, +- testsuite/libffi.call/cls_20byte1.c, +- testsuite/libffi.call/cls_24byte.c, +- testsuite/libffi.call/cls_2byte.c, +- testsuite/libffi.call/cls_3_1byte.c, +- testsuite/libffi.call/cls_3byte1.c, +- testsuite/libffi.call/cls_3byte2.c, +- testsuite/libffi.call/cls_4_1byte.c, +- testsuite/libffi.call/cls_4byte.c, +- testsuite/libffi.call/cls_5_1_byte.c, +- testsuite/libffi.call/cls_5byte.c, +- testsuite/libffi.call/cls_64byte.c, +- testsuite/libffi.call/cls_6_1_byte.c, +- testsuite/libffi.call/cls_6byte.c, +- testsuite/libffi.call/cls_7_1_byte.c, +- testsuite/libffi.call/cls_7byte.c, +- testsuite/libffi.call/cls_8byte.c, +- testsuite/libffi.call/cls_9byte1.c, +- testsuite/libffi.call/cls_9byte2.c, +- testsuite/libffi.call/cls_align_double.c, +- testsuite/libffi.call/cls_align_float.c, +- testsuite/libffi.call/cls_align_longdouble.c, +- testsuite/libffi.call/cls_align_longdouble_split.c, +- testsuite/libffi.call/cls_align_longdouble_split2.c, +- testsuite/libffi.call/cls_align_pointer.c, +- testsuite/libffi.call/cls_align_sint16.c, +- testsuite/libffi.call/cls_align_sint32.c, +- testsuite/libffi.call/cls_align_sint64.c, +- testsuite/libffi.call/cls_align_uint16.c, +- testsuite/libffi.call/cls_align_uint32.c, +- testsuite/libffi.call/cls_align_uint64.c, +- testsuite/libffi.call/cls_dbls_struct.c, +- testsuite/libffi.call/cls_double.c, +- testsuite/libffi.call/cls_double_va.c, +- testsuite/libffi.call/cls_float.c, +- testsuite/libffi.call/cls_longdouble.c, +- testsuite/libffi.call/cls_longdouble_va.c, +- testsuite/libffi.call/cls_multi_schar.c, +- testsuite/libffi.call/cls_multi_sshort.c, +- testsuite/libffi.call/cls_multi_sshortchar.c, +- testsuite/libffi.call/cls_multi_uchar.c, +- testsuite/libffi.call/cls_multi_ushort.c, +- testsuite/libffi.call/cls_multi_ushortchar.c, +- testsuite/libffi.call/cls_pointer.c, +- testsuite/libffi.call/cls_pointer_stack.c, +- testsuite/libffi.call/cls_schar.c, +- testsuite/libffi.call/cls_sint.c, +- testsuite/libffi.call/cls_sshort.c, +- testsuite/libffi.call/cls_uchar.c, +- testsuite/libffi.call/cls_uint.c, +- testsuite/libffi.call/cls_ulonglong.c, +- testsuite/libffi.call/cls_ushort.c, +- testsuite/libffi.call/err_bad_abi.c, +- testsuite/libffi.call/err_bad_typedef.c, +- testsuite/libffi.call/float2.c, +- testsuite/libffi.call/huge_struct.c, +- testsuite/libffi.call/nested_struct.c, +- testsuite/libffi.call/nested_struct1.c, +- testsuite/libffi.call/nested_struct10.c, +- testsuite/libffi.call/nested_struct2.c, +- testsuite/libffi.call/nested_struct3.c, +- testsuite/libffi.call/nested_struct4.c, +- testsuite/libffi.call/nested_struct5.c, +- testsuite/libffi.call/nested_struct6.c, +- testsuite/libffi.call/nested_struct7.c, +- testsuite/libffi.call/nested_struct8.c, +- testsuite/libffi.call/nested_struct9.c, +- testsuite/libffi.call/problem1.c, +- testsuite/libffi.call/return_ldl.c, +- testsuite/libffi.call/return_ll1.c, +- testsuite/libffi.call/stret_large.c, +- testsuite/libffi.call/stret_large2.c, +- testsuite/libffi.call/stret_medium.c, +- testsuite/libffi.call/stret_medium2.c, +- testsuite/libffi.special/unwindtest.cc: use ffi_closure_alloc instead +- of checking for MMAP. Use intptr_t instead of long casts. +- +-2009-06-11 Kaz Kojima +- +- * testsuite/libffi.call/cls_longdouble_va.c: Add xfail sh*-*-linux-*. +- * testsuite/libffi.call/err_bad_abi.c: Add xfail sh*-*-*. +- * testsuite/libffi.call/err_bad_typedef.c: Likewise. +- +-2009-06-09 Andrew Haley +- +- * src/x86/freebsd.S: Add missing file. +- +-2009-06-08 Andrew Haley +- +- Import from libffi 3.0.8: +- +- * doc/libffi.texi: New file. +- * doc/libffi.info: Likewise. +- * doc/stamp-vti: Likewise. +- * man/Makefile.am: New file. +- * man/ffi_call.3: New file. +- +- * Makefile.am (EXTRA_DIST): Add src/x86/darwin64.S, +- src/dlmalloc.c. +- (nodist_libffi_la_SOURCES): Add X86_FREEBSD. +- +- * configure.ac: Bump version to 3.0.8. +- parisc*-*-linux*: Add. +- i386-*-freebsd* | i386-*-openbsd*: Add. +- powerpc-*-beos*: Add. +- AM_CONDITIONAL X86_FREEBSD: Add. +- AC_CONFIG_FILES: Add man/Makefile. +- +- * include/ffi.h.in (FFI_FN): Change void (*)() to void (*)(void). +- +-2009-06-08 Andrew Haley +- +- * README: Import from libffi 3.0.8. +- +-2009-06-08 Andrew Haley +- +- * testsuite/libffi.call/err_bad_abi.c: Add xfails. +- * testsuite/libffi.call/cls_longdouble_va.c: Add xfails. +- * testsuite/libffi.call/cls_dbls_struct.c: Add xfail x86_64-*-linux-*. +- * testsuite/libffi.call/err_bad_typedef.c: Add xfails. +- +- * testsuite/libffi.call/stret_medium2.c: Add __UNUSED__ to args. +- * testsuite/libffi.call/stret_medium.c: Likewise. +- * testsuite/libffi.call/stret_large2.c: Likewise. +- * testsuite/libffi.call/stret_large.c: Likewise. +- +-2008-12-26 Timothy Wall +- +- * testsuite/libffi.call/cls_longdouble.c, +- testsuite/libffi.call/cls_longdouble_va.c, +- testsuite/libffi.call/cls_align_longdouble.c, +- testsuite/libffi.call/cls_align_longdouble_split.c, +- testsuite/libffi.call/cls_align_longdouble_split2.c: mark expected +- failures on x86_64 cygwin/mingw. +- +-2008-12-22 Timothy Wall +- +- * testsuite/libffi.call/closure_fn0.c, +- testsuite/libffi.call/closure_fn1.c, +- testsuite/libffi.call/closure_fn2.c, +- testsuite/libffi.call/closure_fn3.c, +- testsuite/libffi.call/closure_fn4.c, +- testsuite/libffi.call/closure_fn5.c, +- testsuite/libffi.call/closure_fn6.c, +- testsuite/libffi.call/closure_loc_fn0.c, +- testsuite/libffi.call/closure_stdcall.c, +- testsuite/libffi.call/cls_align_pointer.c, +- testsuite/libffi.call/cls_pointer.c, +- testsuite/libffi.call/cls_pointer_stack.c: use portable cast from +- pointer to integer (intptr_t). +- * testsuite/libffi.call/cls_longdouble.c: disable for win64. +- +-2008-07-24 Anthony Green +- +- * testsuite/libffi.call/cls_dbls_struct.c, +- testsuite/libffi.call/cls_double_va.c, +- testsuite/libffi.call/cls_longdouble.c, +- testsuite/libffi.call/cls_longdouble_va.c, +- testsuite/libffi.call/cls_pointer.c, +- testsuite/libffi.call/cls_pointer_stack.c, +- testsuite/libffi.call/err_bad_abi.c: Clean up failures from +- compiler warnings. +- +-2008-03-04 Anthony Green +- Blake Chaffin +- hos@tamanegi.org +- +- * testsuite/libffi.call/cls_align_longdouble_split2.c +- testsuite/libffi.call/cls_align_longdouble_split.c +- testsuite/libffi.call/cls_dbls_struct.c +- testsuite/libffi.call/cls_double_va.c +- testsuite/libffi.call/cls_longdouble.c +- testsuite/libffi.call/cls_longdouble_va.c +- testsuite/libffi.call/cls_pointer.c +- testsuite/libffi.call/cls_pointer_stack.c +- testsuite/libffi.call/err_bad_abi.c +- testsuite/libffi.call/err_bad_typedef.c +- testsuite/libffi.call/stret_large2.c +- testsuite/libffi.call/stret_large.c +- testsuite/libffi.call/stret_medium2.c +- testsuite/libffi.call/stret_medium.c: New tests from Apple. +- +-2009-06-05 Andrew Haley +- +- * src/x86/ffitarget.h, src/x86/ffi.c: Merge stdcall changes from +- libffi. +- +-2009-06-04 Andrew Haley +- +- * src/x86/ffitarget.h, src/x86/win32.S, src/x86/ffi.c: Back out +- stdcall changes. +- +-2008-02-26 Anthony Green +- Thomas Heller +- +- * src/x86/ffi.c (ffi_closure_SYSV_inner): Change C++ comment to C +- comment. +- +-2008-02-03 Timothy Wall +- +- * src/x86/ffi.c (FFI_INIT_TRAMPOLINE_STDCALL): Calculate jump return +- offset based on code pointer, not data pointer. +- +-2008-01-31 Timothy Wall +- +- * testsuite/libffi.call/closure_stdcall.c: Add test for stdcall +- closures. +- * src/x86/ffitarget.h: Increase size of trampoline for stdcall +- closures. +- * src/x86/win32.S: Add assembly for stdcall closure. +- * src/x86/ffi.c: Initialize stdcall closure trampoline. +- +-2009-06-04 Andrew Haley +- +- * include/ffi.h.in: Change void (*)() to void (*)(void). +- * src/x86/ffi.c: Likewise. +- +-2009-06-04 Andrew Haley +- +- * src/powerpc/ppc_closure.S: Insert licence header. +- * src/powerpc/linux64_closure.S: Likewise. +- * src/m68k/sysv.S: Likewise. +- +- * src/sh64/ffi.c: Change void (*)() to void (*)(void). +- * src/powerpc/ffi.c: Likewise. +- * src/powerpc/ffi_darwin.c: Likewise. +- * src/m32r/ffi.c: Likewise. +- * src/sh64/ffi.c: Likewise. +- * src/x86/ffi64.c: Likewise. +- * src/alpha/ffi.c: Likewise. +- * src/alpha/osf.S: Likewise. +- * src/frv/ffi.c: Likewise. +- * src/s390/ffi.c: Likewise. +- * src/pa/ffi.c: Likewise. +- * src/pa/hpux32.S: Likewise. +- * src/ia64/unix.S: Likewise. +- * src/ia64/ffi.c: Likewise. +- * src/sparc/ffi.c: Likewise. +- * src/mips/ffi.c: Likewise. +- * src/sh/ffi.c: Likewise. +- +-2008-02-15 David Daney +- +- * src/mips/ffi.c (USE__BUILTIN___CLEAR_CACHE): +- Define (conditionally), and use it to include cachectl.h. +- (ffi_prep_closure_loc): Fix cache flushing. +- * src/mips/ffitarget.h (_ABIN32, _ABI64, _ABIO32): Define. +- +-2009-06-04 Andrew Haley +- +- include/ffi.h.in, +- src/arm/ffitarget.h, +- src/arm/ffi.c, +- src/arm/sysv.S, +- src/powerpc/ffitarget.h, +- src/closures.c, +- src/sh64/ffitarget.h, +- src/sh64/ffi.c, +- src/sh64/sysv.S, +- src/types.c, +- src/x86/ffi64.c, +- src/x86/ffitarget.h, +- src/x86/win32.S, +- src/x86/darwin.S, +- src/x86/ffi.c, +- src/x86/sysv.S, +- src/x86/unix64.S, +- src/alpha/ffitarget.h, +- src/alpha/ffi.c, +- src/alpha/osf.S, +- src/m68k/ffitarget.h, +- src/frv/ffitarget.h, +- src/frv/ffi.c, +- src/s390/ffitarget.h, +- src/s390/sysv.S, +- src/cris/ffitarget.h, +- src/pa/linux.S, +- src/pa/ffitarget.h, +- src/pa/ffi.c, +- src/raw_api.c, +- src/ia64/ffitarget.h, +- src/ia64/unix.S, +- src/ia64/ffi.c, +- src/ia64/ia64_flags.h, +- src/java_raw_api.c, +- src/debug.c, +- src/sparc/v9.S, +- src/sparc/ffitarget.h, +- src/sparc/ffi.c, +- src/sparc/v8.S, +- src/mips/ffitarget.h, +- src/mips/n32.S, +- src/mips/o32.S, +- src/mips/ffi.c, +- src/prep_cif.c, +- src/sh/ffitarget.h, +- src/sh/ffi.c, +- src/sh/sysv.S: Update license text. +- +-2009-05-22 Dave Korn +- +- * src/x86/win32.S (_ffi_closure_STDCALL): New function. +- (.eh_frame): Add FDE for it. +- +-2009-05-22 Dave Korn +- +- * configure.ac: Also check if assembler supports pc-relative +- relocs on X86_WIN32 targets. +- * configure: Regenerate. +- * src/x86/win32.S (ffi_prep_args): Declare extern, not global. +- (_ffi_call_SYSV): Add missing function type symbol .def and +- add EH markup labels. +- (_ffi_call_STDCALL): Likewise. +- (_ffi_closure_SYSV): Likewise. +- (_ffi_closure_raw_SYSV): Likewise. +- (.eh_frame): Add hand-crafted EH data. +- +-2009-04-09 Jakub Jelinek +- +- * testsuite/lib/libffi-dg.exp: Change copyright header to refer to +- version 3 of the GNU General Public License and to point readers +- at the COPYING3 file and the FSF's license web page. +- * testsuite/libffi.call/call.exp: Likewise. +- * testsuite/libffi.special/special.exp: Likewise. +- +-2009-03-01 Ralf Wildenhues +- +- * configure: Regenerate. +- +-2008-12-18 Rainer Orth +- +- PR libffi/26048 +- * configure.ac (HAVE_AS_X86_PCREL): New test. +- * configure: Regenerate. +- * fficonfig.h.in: Regenerate. +- * src/x86/sysv.S [!FFI_NO_RAW_API]: Precalculate +- RAW_CLOSURE_CIF_OFFSET, RAW_CLOSURE_FUN_OFFSET, +- RAW_CLOSURE_USER_DATA_OFFSET for the Solaris 10/x86 assembler. +- (.eh_frame): Only use SYMBOL-. iff HAVE_AS_X86_PCREL. +- * src/x86/unix64.S (.Lstore_table): Move to .text section. +- (.Lload_table): Likewise. +- (.eh_frame): Only use SYMBOL-. iff HAVE_AS_X86_PCREL. +- +-2008-12-18 Ralf Wildenhues +- +- * configure: Regenerate. +- +-2008-11-21 Eric Botcazou +- +- * src/sparc/ffi.c (ffi_prep_cif_machdep): Add support for +- signed/unsigned int8/16 return values. +- * src/sparc/v8.S (ffi_call_v8): Likewise. +- (ffi_closure_v8): Likewise. +- +-2008-09-26 Peter O'Gorman +- Steve Ellcey +- +- * configure: Regenerate for new libtool. +- * Makefile.in: Ditto. +- * include/Makefile.in: Ditto. +- * aclocal.m4: Ditto. +- +-2008-08-25 Andreas Tobler +- +- * src/powerpc/ffitarget.h (ffi_abi): Add FFI_LINUX and +- FFI_LINUX_SOFT_FLOAT to the POWERPC_FREEBSD enum. +- Add note about flag bits used for FFI_SYSV_TYPE_SMALL_STRUCT. +- Adjust copyright notice. +- * src/powerpc/ffi.c: Add two new flags to indicate if we have one +- register or two register to use for FFI_SYSV structs. +- (ffi_prep_cif_machdep): Pass the right register flag introduced above. +- (ffi_closure_helper_SYSV): Fix the return type for +- FFI_SYSV_TYPE_SMALL_STRUCT. Comment. +- Adjust copyright notice. +- +-2008-07-16 Kaz Kojima +- +- * src/sh/ffi.c (ffi_prep_closure_loc): Turn INSN into an unsigned +- int. +- +-2008-06-17 Ralf Wildenhues +- +- * configure: Regenerate. +- * include/Makefile.in: Regenerate. +- * testsuite/Makefile.in: Regenerate. +- +-2008-06-07 Joseph Myers +- +- * configure.ac (parisc*-*-linux*, powerpc-*-sysv*, +- powerpc-*-beos*): Remove. +- * configure: Regenerate. +- +-2008-05-09 Julian Brown +- +- * Makefile.am (LTLDFLAGS): New. +- (libffi_la_LDFLAGS): Use above. +- * Makefile.in: Regenerate. +- +-2008-04-18 Paolo Bonzini +- +- PR bootstrap/35457 +- * aclocal.m4: Regenerate. +- * configure: Regenerate. +- +-2008-03-26 Kaz Kojima +- +- * src/sh/sysv.S: Add .note.GNU-stack on Linux. +- * src/sh64/sysv.S: Likewise. +- +-2008-03-26 Daniel Jacobowitz +- +- * src/arm/sysv.S: Fix ARM comment marker. +- +-2008-03-26 Jakub Jelinek +- +- * src/alpha/osf.S: Add .note.GNU-stack on Linux. +- * src/s390/sysv.S: Likewise. +- * src/powerpc/ppc_closure.S: Likewise. +- * src/powerpc/sysv.S: Likewise. +- * src/x86/unix64.S: Likewise. +- * src/x86/sysv.S: Likewise. +- * src/sparc/v8.S: Likewise. +- * src/sparc/v9.S: Likewise. +- * src/m68k/sysv.S: Likewise. +- * src/arm/sysv.S: Likewise. +- +-2008-03-16 Ralf Wildenhues +- +- * aclocal.m4: Regenerate. +- * configure: Likewise. +- * Makefile.in: Likewise. +- * include/Makefile.in: Likewise. +- * testsuite/Makefile.in: Likewise. +- +-2008-02-12 Bjoern Koenig +- Andreas Tobler +- +- * configure.ac: Add amd64-*-freebsd* target. +- * configure: Regenerate. +- +-2008-01-30 H.J. Lu +- +- PR libffi/34612 +- * src/x86/sysv.S (ffi_closure_SYSV): Pop 4 byte from stack when +- returning struct. +- +- * testsuite/libffi.call/call.exp: Add "-O2 -fomit-frame-pointer" +- tests. +- +-2008-01-24 David Edelsohn +- +- * configure: Regenerate. +- +-2008-01-06 Andreas Tobler +- +- * src/x86/ffi.c (ffi_prep_cif_machdep): Fix thinko. +- +-2008-01-05 Andreas Tobler +- +- PR testsuite/32843 +- * src/x86/ffi.c (ffi_prep_cif_machdep): Add code for +- signed/unsigned int8/16 for X86_DARWIN. +- Updated copyright info. +- Handle one and two byte structs with special cif->flags. +- * src/x86/ffitarget.h: Add special types for one and two byte structs. +- Updated copyright info. +- * src/x86/darwin.S (ffi_call_SYSV): Rewrite to use a jump table like +- sysv.S +- Remove code to pop args from the stack after call. +- Special-case signed/unsigned for int8/16, one and two byte structs. +- (ffi_closure_raw_SYSV): Handle FFI_TYPE_UINT8, +- FFI_TYPE_SINT8, FFI_TYPE_UINT16, FFI_TYPE_SINT16, FFI_TYPE_UINT32, +- FFI_TYPE_SINT32. +- Updated copyright info. +- +-2007-12-08 David Daney +- +- * src/mips/n32.S (ffi_call_N32): Replace dadd with ADDU, dsub with +- SUBU, add with ADDU and use smaller code sequences. +- +-2007-12-07 David Daney +- +- * src/mips/ffi.c (ffi_prep_cif_machdep): Handle long double return +- type. +- +-2007-12-06 David Daney +- +- * include/ffi.h.in (FFI_SIZEOF_JAVA_RAW): Define if not already +- defined. +- (ffi_java_raw): New typedef. +- (ffi_java_raw_call, ffi_java_ptrarray_to_raw, +- ffi_java_raw_to_ptrarray): Change parameter types from ffi_raw to +- ffi_java_raw. +- (ffi_java_raw_closure) : Same. +- (ffi_prep_java_raw_closure, ffi_prep_java_raw_closure_loc): Change +- parameter types. +- * src/java_raw_api.c (ffi_java_raw_size): Replace FFI_SIZEOF_ARG with +- FFI_SIZEOF_JAVA_RAW. +- (ffi_java_raw_to_ptrarray): Change type of raw to ffi_java_raw. +- Replace FFI_SIZEOF_ARG with FFI_SIZEOF_JAVA_RAW. Use +- sizeof(ffi_java_raw) for alignment calculations. +- (ffi_java_ptrarray_to_raw): Same. +- (ffi_java_rvalue_to_raw): Add special handling for FFI_TYPE_POINTER +- if FFI_SIZEOF_JAVA_RAW == 4. +- (ffi_java_raw_to_rvalue): Same. +- (ffi_java_raw_call): Change type of raw to ffi_java_raw. +- (ffi_java_translate_args): Same. +- (ffi_prep_java_raw_closure_loc, ffi_prep_java_raw_closure): Change +- parameter types. +- * src/mips/ffitarget.h (FFI_SIZEOF_JAVA_RAW): Define for N32 ABI. +- +-2007-12-06 David Daney +- +- * src/mips/n32.S (ffi_closure_N32): Use 64-bit add instruction on +- pointer values. +- +-2007-12-01 Andreas Tobler +- +- PR libffi/31937 +- * src/powerpc/ffitarget.h: Introduce new ABI FFI_LINUX_SOFT_FLOAT. +- Add local FFI_TYPE_UINT128 to handle soft-float long-double-128. +- * src/powerpc/ffi.c: Distinguish between __NO_FPRS__ and not and +- set the NUM_FPR_ARG_REGISTERS according to. +- Add support for potential soft-float support under hard-float +- architecture. +- (ffi_prep_args_SYSV): Set NUM_FPR_ARG_REGISTERS to 0 in case of +- FFI_LINUX_SOFT_FLOAT, handle float, doubles and long-doubles according +- to the FFI_LINUX_SOFT_FLOAT ABI. +- (ffi_prep_cif_machdep): Likewise. +- (ffi_closure_helper_SYSV): Likewise. +- * src/powerpc/ppc_closure.S: Make sure not to store float/double +- on archs where __NO_FPRS__ is true. +- Add FFI_TYPE_UINT128 support. +- * src/powerpc/sysv.S: Add support for soft-float long-double-128. +- Adjust copyright notice. +- +-2007-11-25 Andreas Tobler +- +- * src/closures.c: Move defintion of MAYBE_UNUSED from here to ... +- * include/ffi_common.h: ... here. +- Update copyright. +- +-2007-11-17 Andreas Tobler +- +- * src/powerpc/sysv.S: Load correct cr to compare if we have long double. +- * src/powerpc/linux64.S: Likewise. +- * src/powerpc/ffi.c: Add a comment to show which part goes into cr6. +- * testsuite/libffi.call/return_ldl.c: New test. +- +-2007-09-04 +- +- * src/arm/sysv.S (UNWIND): New. +- (Whole file): Conditionally compile unwinder directives. +- * src/arm/sysv.S: Add unwinder directives. +- +- * src/arm/ffi.c (ffi_prep_args): Align structs by at least 4 bytes. +- Only treat r0 as a struct address if we're actually returning a +- struct by address. +- Only copy the bytes that are actually within a struct. +- (ffi_prep_cif_machdep): A Composite Type not larger than 4 bytes +- is returned in r0, not passed by address. +- (ffi_call): Allocate a word-sized temporary for the case where +- a composite is returned in r0. +- (ffi_prep_incoming_args_SYSV): Align as necessary. +- +-2007-08-05 Steven Newbury +- +- * src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Use __clear_cache instead of +- directly using the sys_cacheflush syscall. +- +-2007-07-27 Andrew Haley +- +- * src/arm/sysv.S (ffi_closure_SYSV): Add soft-float. +- +-2007-09-03 Maciej W. Rozycki +- +- * Makefile.am: Unify MIPS_IRIX and MIPS_LINUX into MIPS. +- * configure.ac: Likewise. +- * Makefile.in: Regenerate. +- * include/Makefile.in: Likewise. +- * testsuite/Makefile.in: Likewise. +- * configure: Likewise. +- +-2007-08-24 David Daney +- +- * testsuite/libffi.call/return_sl.c: New test. +- +-2007-08-10 David Daney +- +- * testsuite/libffi.call/cls_multi_ushort.c, +- testsuite/libffi.call/cls_align_uint16.c, +- testsuite/libffi.call/nested_struct1.c, +- testsuite/libffi.call/nested_struct3.c, +- testsuite/libffi.call/cls_7_1_byte.c, +- testsuite/libffi.call/nested_struct5.c, +- testsuite/libffi.call/cls_double.c, +- testsuite/libffi.call/nested_struct7.c, +- testsuite/libffi.call/cls_sint.c, +- testsuite/libffi.call/nested_struct9.c, +- testsuite/libffi.call/cls_20byte1.c, +- testsuite/libffi.call/cls_multi_sshortchar.c, +- testsuite/libffi.call/cls_align_sint64.c, +- testsuite/libffi.call/cls_3byte2.c, +- testsuite/libffi.call/cls_multi_schar.c, +- testsuite/libffi.call/cls_multi_uchar.c, +- testsuite/libffi.call/cls_19byte.c, +- testsuite/libffi.call/cls_9byte1.c, +- testsuite/libffi.call/cls_align_float.c, +- testsuite/libffi.call/closure_fn1.c, +- testsuite/libffi.call/problem1.c, +- testsuite/libffi.call/closure_fn3.c, +- testsuite/libffi.call/cls_sshort.c, +- testsuite/libffi.call/closure_fn5.c, +- testsuite/libffi.call/cls_align_double.c, +- testsuite/libffi.call/nested_struct.c, +- testsuite/libffi.call/cls_2byte.c, +- testsuite/libffi.call/nested_struct10.c, +- testsuite/libffi.call/cls_4byte.c, +- testsuite/libffi.call/cls_6byte.c, +- testsuite/libffi.call/cls_8byte.c, +- testsuite/libffi.call/cls_multi_sshort.c, +- testsuite/libffi.call/cls_align_sint16.c, +- testsuite/libffi.call/cls_align_uint32.c, +- testsuite/libffi.call/cls_20byte.c, +- testsuite/libffi.call/cls_float.c, +- testsuite/libffi.call/nested_struct2.c, +- testsuite/libffi.call/cls_5_1_byte.c, +- testsuite/libffi.call/nested_struct4.c, +- testsuite/libffi.call/cls_24byte.c, +- testsuite/libffi.call/nested_struct6.c, +- testsuite/libffi.call/cls_64byte.c, +- testsuite/libffi.call/nested_struct8.c, +- testsuite/libffi.call/cls_uint.c, +- testsuite/libffi.call/cls_multi_ushortchar.c, +- testsuite/libffi.call/cls_schar.c, +- testsuite/libffi.call/cls_uchar.c, +- testsuite/libffi.call/cls_align_uint64.c, +- testsuite/libffi.call/cls_ulonglong.c, +- testsuite/libffi.call/cls_align_longdouble.c, +- testsuite/libffi.call/cls_1_1byte.c, +- testsuite/libffi.call/cls_12byte.c, +- testsuite/libffi.call/cls_3_1byte.c, +- testsuite/libffi.call/cls_3byte1.c, +- testsuite/libffi.call/cls_4_1byte.c, +- testsuite/libffi.call/cls_6_1_byte.c, +- testsuite/libffi.call/cls_16byte.c, +- testsuite/libffi.call/cls_18byte.c, +- testsuite/libffi.call/closure_fn0.c, +- testsuite/libffi.call/cls_9byte2.c, +- testsuite/libffi.call/closure_fn2.c, +- testsuite/libffi.call/closure_fn4.c, +- testsuite/libffi.call/cls_ushort.c, +- testsuite/libffi.call/closure_fn6.c, +- testsuite/libffi.call/cls_5byte.c, +- testsuite/libffi.call/cls_align_pointer.c, +- testsuite/libffi.call/cls_7byte.c, +- testsuite/libffi.call/cls_align_sint32.c, +- testsuite/libffi.special/unwindtest_ffi_call.cc, +- testsuite/libffi.special/unwindtest.cc: Remove xfail for mips64*-*-*. +- +-2007-08-10 David Daney +- +- PR libffi/28313 +- * configure.ac: Don't treat mips64 as a special case. +- * Makefile.am (nodist_libffi_la_SOURCES): Add n32.S. +- * configure: Regenerate +- * Makefile.in: Ditto. +- * fficonfig.h.in: Ditto. +- * src/mips/ffitarget.h (REG_L, REG_S, SUBU, ADDU, SRL, LI): Indent. +- (LA, EH_FRAME_ALIGN, FDE_ADDR_BYTES): New preprocessor macros. +- (FFI_DEFAULT_ABI): Set for n64 case. +- (FFI_CLOSURES, FFI_TRAMPOLINE_SIZE): Define for n32 and n64 cases. +- * src/mips/n32.S (ffi_call_N32): Add debug macros and labels for FDE. +- (ffi_closure_N32): New function. +- (.eh_frame): New section +- * src/mips/o32.S: Clean up comments. +- (ffi_closure_O32): Pass ffi_closure parameter in $12. +- * src/mips/ffi.c: Use FFI_MIPS_N32 instead of +- _MIPS_SIM == _ABIN32 throughout. +- (FFI_MIPS_STOP_HERE): New, use in place of +- ffi_stop_here. +- (ffi_prep_args): Use unsigned long to hold pointer values. Rewrite +- to support n32/n64 ABIs. +- (calc_n32_struct_flags): Rewrite. +- (calc_n32_return_struct_flags): Remove unused variable. Reverse +- position of flag bits. +- (ffi_prep_cif_machdep): Rewrite n32 portion. +- (ffi_call): Enable for n64. Add special handling for small structure +- return values. +- (ffi_prep_closure_loc): Add n32 and n64 support. +- (ffi_closure_mips_inner_O32): Add cast to silence warning. +- (copy_struct_N32, ffi_closure_mips_inner_N32): New functions. +- +-2007-08-08 David Daney +- +- * testsuite/libffi.call/ffitest.h (ffi_type_mylong): Remove definition. +- * testsuite/libffi.call/cls_align_uint16.c (main): Use correct type +- specifiers. +- * testsuite/libffi.call/nested_struct1.c (main): Ditto. +- * testsuite/libffi.call/cls_sint.c (main): Ditto. +- * testsuite/libffi.call/nested_struct9.c (main): Ditto. +- * testsuite/libffi.call/cls_20byte1.c (main): Ditto. +- * testsuite/libffi.call/cls_9byte1.c (main): Ditto. +- * testsuite/libffi.call/closure_fn1.c (main): Ditto. +- * testsuite/libffi.call/closure_fn3.c (main): Ditto. +- * testsuite/libffi.call/return_dbl2.c (main): Ditto. +- * testsuite/libffi.call/cls_sshort.c (main): Ditto. +- * testsuite/libffi.call/return_fl3.c (main): Ditto. +- * testsuite/libffi.call/closure_fn5.c (main): Ditto. +- * testsuite/libffi.call/nested_struct.c (main): Ditto. +- * testsuite/libffi.call/nested_struct10.c (main): Ditto. +- * testsuite/libffi.call/return_ll1.c (main): Ditto. +- * testsuite/libffi.call/cls_8byte.c (main): Ditto. +- * testsuite/libffi.call/cls_align_uint32.c (main): Ditto. +- * testsuite/libffi.call/cls_align_sint16.c (main): Ditto. +- * testsuite/libffi.call/cls_20byte.c (main): Ditto. +- * testsuite/libffi.call/nested_struct2.c (main): Ditto. +- * testsuite/libffi.call/cls_24byte.c (main): Ditto. +- * testsuite/libffi.call/nested_struct6.c (main): Ditto. +- * testsuite/libffi.call/cls_uint.c (main): Ditto. +- * testsuite/libffi.call/cls_12byte.c (main): Ditto. +- * testsuite/libffi.call/cls_16byte.c (main): Ditto. +- * testsuite/libffi.call/closure_fn0.c (main): Ditto. +- * testsuite/libffi.call/cls_9byte2.c (main): Ditto. +- * testsuite/libffi.call/closure_fn2.c (main): Ditto. +- * testsuite/libffi.call/return_dbl1.c (main): Ditto. +- * testsuite/libffi.call/closure_fn4.c (main): Ditto. +- * testsuite/libffi.call/closure_fn6.c (main): Ditto. +- * testsuite/libffi.call/cls_align_sint32.c (main): Ditto. +- +-2007-08-07 Andrew Haley +- +- * src/x86/sysv.S (ffi_closure_raw_SYSV): Fix typo in previous +- checkin. +- +-2007-08-06 Andrew Haley +- +- PR testsuite/32843 +- * src/x86/sysv.S (ffi_closure_raw_SYSV): Handle FFI_TYPE_UINT8, +- FFI_TYPE_SINT8, FFI_TYPE_UINT16, FFI_TYPE_SINT16, FFI_TYPE_UINT32, +- FFI_TYPE_SINT32. +- +-2007-08-02 David Daney +- +- * testsuite/libffi.call/return_ul.c (main): Define return type as +- ffi_arg. Use proper printf conversion specifier. +- +-2007-07-30 Andrew Haley +- +- PR testsuite/32843 +- * src/x86/ffi.c (ffi_prep_cif_machdep): in x86 case, add code for +- signed/unsigned int8/16. +- * src/x86/sysv.S (ffi_call_SYSV): Rewrite to: +- Use a jump table. +- Remove code to pop args from the stack after call. +- Special-case signed/unsigned int8/16. +- * testsuite/libffi.call/return_sc.c (main): Revert. +- +-2007-07-26 Richard Guenther +- +- PR testsuite/32843 +- * testsuite/libffi.call/return_sc.c (main): Verify call +- result as signed char, not ffi_arg. +- +-2007-07-16 Rainer Orth +- +- * configure.ac (i?86-*-solaris2.1[0-9]): Set TARGET to X86_64. +- * configure: Regenerate. +- +-2007-07-11 David Daney +- +- * src/mips/ffi.c: Don't include sys/cachectl.h. +- (ffi_prep_closure_loc): Use __builtin___clear_cache() instead of +- cacheflush(). +- +-2007-05-18 Aurelien Jarno +- +- * src/arm/ffi.c (ffi_prep_closure_loc): Renamed and ajusted +- from (ffi_prep_closure): ... this. +- (FFI_INIT_TRAMPOLINE): Adjust. +- +-2005-12-31 Phil Blundell +- +- * src/arm/ffi.c (ffi_prep_incoming_args_SYSV, +- ffi_closure_SYSV_inner, ffi_prep_closure): New, add closure support. +- * src/arm/sysv.S(ffi_closure_SYSV): Likewise. +- * src/arm/ffitarget.h (FFI_TRAMPOLINE_SIZE): Likewise. +- (FFI_CLOSURES): Enable closure support. +- +-2007-07-03 Andrew Haley +- +- * testsuite/libffi.call/cls_multi_ushort.c, +- testsuite/libffi.call/cls_align_uint16.c, +- testsuite/libffi.call/nested_struct1.c, +- testsuite/libffi.call/nested_struct3.c, +- testsuite/libffi.call/cls_7_1_byte.c, +- testsuite/libffi.call/cls_double.c, +- testsuite/libffi.call/nested_struct5.c, +- testsuite/libffi.call/nested_struct7.c, +- testsuite/libffi.call/cls_sint.c, +- testsuite/libffi.call/nested_struct9.c, +- testsuite/libffi.call/cls_20byte1.c, +- testsuite/libffi.call/cls_multi_sshortchar.c, +- testsuite/libffi.call/cls_align_sint64.c, +- testsuite/libffi.call/cls_3byte2.c, +- testsuite/libffi.call/cls_multi_schar.c, +- testsuite/libffi.call/cls_multi_uchar.c, +- testsuite/libffi.call/cls_19byte.c, +- testsuite/libffi.call/cls_9byte1.c, +- testsuite/libffi.call/cls_align_float.c, +- testsuite/libffi.call/closure_fn1.c, +- testsuite/libffi.call/problem1.c, +- testsuite/libffi.call/closure_fn3.c, +- testsuite/libffi.call/cls_sshort.c, +- testsuite/libffi.call/closure_fn5.c, +- testsuite/libffi.call/cls_align_double.c, +- testsuite/libffi.call/cls_2byte.c, +- testsuite/libffi.call/nested_struct.c, +- testsuite/libffi.call/nested_struct10.c, +- testsuite/libffi.call/cls_4byte.c, +- testsuite/libffi.call/cls_6byte.c, +- testsuite/libffi.call/cls_8byte.c, +- testsuite/libffi.call/cls_multi_sshort.c, +- testsuite/libffi.call/cls_align_uint32.c, +- testsuite/libffi.call/cls_align_sint16.c, +- testsuite/libffi.call/cls_float.c, +- testsuite/libffi.call/cls_20byte.c, +- testsuite/libffi.call/cls_5_1_byte.c, +- testsuite/libffi.call/nested_struct2.c, +- testsuite/libffi.call/cls_24byte.c, +- testsuite/libffi.call/nested_struct4.c, +- testsuite/libffi.call/nested_struct6.c, +- testsuite/libffi.call/cls_64byte.c, +- testsuite/libffi.call/nested_struct8.c, +- testsuite/libffi.call/cls_uint.c, +- testsuite/libffi.call/cls_multi_ushortchar.c, +- testsuite/libffi.call/cls_schar.c, +- testsuite/libffi.call/cls_uchar.c, +- testsuite/libffi.call/cls_align_uint64.c, +- testsuite/libffi.call/cls_ulonglong.c, +- testsuite/libffi.call/cls_align_longdouble.c, +- testsuite/libffi.call/cls_1_1byte.c, +- testsuite/libffi.call/cls_12byte.c, +- testsuite/libffi.call/cls_3_1byte.c, +- testsuite/libffi.call/cls_3byte1.c, +- testsuite/libffi.call/cls_4_1byte.c, +- testsuite/libffi.call/cls_6_1_byte.c, +- testsuite/libffi.call/cls_16byte.c, +- testsuite/libffi.call/cls_18byte.c, +- testsuite/libffi.call/closure_fn0.c, +- testsuite/libffi.call/cls_9byte2.c, +- testsuite/libffi.call/closure_fn2.c, +- testsuite/libffi.call/closure_fn4.c, +- testsuite/libffi.call/cls_ushort.c, +- testsuite/libffi.call/closure_fn6.c, +- testsuite/libffi.call/cls_5byte.c, +- testsuite/libffi.call/cls_align_pointer.c, +- testsuite/libffi.call/cls_7byte.c, +- testsuite/libffi.call/cls_align_sint32.c, +- testsuite/libffi.special/unwindtest_ffi_call.cc, +- testsuite/libffi.special/unwindtest.cc: Enable for ARM. +- +-2007-07-05 H.J. Lu +- +- * aclocal.m4: Regenerated. +- +-2007-06-02 Paolo Bonzini +- +- * configure: Regenerate. +- +-2007-05-23 Steve Ellcey +- +- * Makefile.in: Regenerate. +- * configure: Regenerate. +- * aclocal.m4: Regenerate. +- * include/Makefile.in: Regenerate. +- * testsuite/Makefile.in: Regenerate. +- +-2007-05-10 Roman Zippel +- +- * src/m68k/ffi.c (ffi_prep_incoming_args_SYSV, +- ffi_closure_SYSV_inner,ffi_prep_closure): New, add closure support. +- * src/m68k/sysv.S(ffi_closure_SYSV,ffi_closure_struct_SYSV): Likewise. +- * src/m68k/ffitarget.h (FFI_TRAMPOLINE_SIZE): Likewise. +- (FFI_CLOSURES): Enable closure support. +- +-2007-05-10 Roman Zippel +- +- * configure.ac (HAVE_AS_CFI_PSEUDO_OP): New test. +- * configure: Regenerate. +- * fficonfig.h.in: Regenerate. +- * src/m68k/sysv.S (CFI_STARTPROC,CFI_ENDPROC, +- CFI_OFFSET,CFI_DEF_CFA): New macros. +- (ffi_call_SYSV): Add callframe annotation. +- +-2007-05-10 Roman Zippel +- +- * src/m68k/ffi.c (ffi_prep_args,ffi_prep_cif_machdep): Fix +- numerous test suite failures. +- * src/m68k/sysv.S (ffi_call_SYSV): Likewise. +- +-2007-04-11 Paolo Bonzini +- +- * Makefile.am (EXTRA_DIST): Bring up to date. +- * Makefile.in: Regenerate. +- * src/frv/eabi.S: Remove RCS keyword. +- +-2007-04-06 Richard Henderson +- +- * configure.ac: Tidy target case. +- (HAVE_LONG_DOUBLE): Allow the target to override. +- * configure: Regenerate. +- * include/ffi.h.in: Don't define ffi_type_foo if +- LIBFFI_HIDE_BASIC_TYPES is defined. +- (ffi_type_longdouble): If not HAVE_LONG_DOUBLE, define +- to ffi_type_double. +- * types.c (LIBFFI_HIDE_BASIC_TYPES): Define. +- (FFI_TYPEDEF, ffi_type_void): Mark the data const. +- (ffi_type_longdouble): Special case for Alpha. Don't define +- if long double == double. +- +- * src/alpha/ffi.c (FFI_TYPE_LONGDOUBLE): Assert unique value. +- (ffi_prep_cif_machdep): Handle it as the 128-bit type. +- (ffi_call, ffi_closure_osf_inner): Likewise. +- (ffi_closure_osf_inner): Likewise. Mark hidden. +- (ffi_call_osf, ffi_closure_osf): Mark hidden. +- * src/alpha/ffitarget.h (FFI_LAST_ABI): Tidy definition. +- * src/alpha/osf.S (ffi_call_osf, ffi_closure_osf): Mark hidden. +- (load_table): Handle 128-bit long double. +- +- * testsuite/libffi.call/float4.c: Add -mieee for alpha. +- +-2007-04-06 Tom Tromey +- +- PR libffi/31491: +- * README: Fixed bug in example. +- +-2007-04-03 Jakub Jelinek +- +- * src/closures.c: Include sys/statfs.h. +- (_GNU_SOURCE): Define on Linux. +- (FFI_MMAP_EXEC_SELINUX): Define. +- (selinux_enabled): New variable. +- (selinux_enabled_check): New function. +- (is_selinux_enabled): Define. +- (dlmmap): Use it. +- +-2007-03-24 Uros Bizjak +- +- * testsuite/libffi.call/return_fl2.c (return_fl): Mark as static. +- Use 'volatile float sum' to create sum of floats to avoid false +- negative due to excess precision on ix86 targets. +- (main): Ditto. +- +-2007-03-08 Alexandre Oliva +- +- * src/powerpc/ffi.c (flush_icache): Fix left-over from previous +- patch. +- (ffi_prep_closure_loc): Remove unneeded casts. Add needed ones. +- +-2007-03-07 Alexandre Oliva +- +- * include/ffi.h.in (ffi_closure_alloc, ffi_closure_free): New. +- (ffi_prep_closure_loc): New. +- (ffi_prep_raw_closure_loc): New. +- (ffi_prep_java_raw_closure_loc): New. +- * src/closures.c: New file. +- * src/dlmalloc.c [FFI_MMAP_EXEC_WRIT] (struct malloc_segment): +- Replace sflags with exec_offset. +- [FFI_MMAP_EXEC_WRIT] (mmap_exec_offset, add_segment_exec_offset, +- sub_segment_exec_offset): New macros. +- (get_segment_flags, set_segment_flags, check_segment_merge): New +- macros. +- (is_mmapped_segment, is_extern_segment): Use get_segment_flags. +- (add_segment, sys_alloc, create_mspace, create_mspace_with_base, +- destroy_mspace): Use new macros. +- (sys_alloc): Silence warning. +- * Makefile.am (libffi_la_SOURCES): Add src/closures.c. +- * Makefile.in: Rebuilt. +- * src/prep_cif [FFI_CLOSURES] (ffi_prep_closure): Implement in +- terms of ffi_prep_closure_loc. +- * src/raw_api.c (ffi_prep_raw_closure_loc): Renamed and adjusted +- from... +- (ffi_prep_raw_closure): ... this. Re-implement in terms of the +- renamed version. +- * src/java_raw_api (ffi_prep_java_raw_closure_loc): Renamed and +- adjusted from... +- (ffi_prep_java_raw_closure): ... this. Re-implement in terms of +- the renamed version. +- * src/alpha/ffi.c (ffi_prep_closure_loc): Renamed from +- (ffi_prep_closure): ... this. +- * src/pa/ffi.c: Likewise. +- * src/cris/ffi.c: Likewise. Adjust. +- * src/frv/ffi.c: Likewise. +- * src/ia64/ffi.c: Likewise. +- * src/mips/ffi.c: Likewise. +- * src/powerpc/ffi_darwin.c: Likewise. +- * src/s390/ffi.c: Likewise. +- * src/sh/ffi.c: Likewise. +- * src/sh64/ffi.c: Likewise. +- * src/sparc/ffi.c: Likewise. +- * src/x86/ffi64.c: Likewise. +- * src/x86/ffi.c: Likewise. +- (FFI_INIT_TRAMPOLINE): Adjust. +- (ffi_prep_raw_closure_loc): Renamed and adjusted from... +- (ffi_prep_raw_closure): ... this. +- * src/powerpc/ffi.c (ffi_prep_closure_loc): Renamed from +- (ffi_prep_closure): ... this. +- (flush_icache): Adjust. +- +-2007-03-07 Alexandre Oliva +- +- * src/dlmalloc.c: New file, imported version 2.8.3 of Doug +- Lea's malloc. +- +-2007-03-01 Brooks Moses +- +- * Makefile.am: Add dummy install-pdf target. +- * Makefile.in: Regenerate +- +-2007-02-13 Andreas Krebbel +- +- * src/s390/ffi.c (ffi_prep_args, ffi_prep_cif_machdep, +- ffi_closure_helper_SYSV): Add long double handling. +- +-2007-02-02 Jakub Jelinek +- +- * src/powerpc/linux64.S (ffi_call_LINUX64): Move restore of r2 +- immediately after bctrl instruction. +- +-2007-01-18 Alexandre Oliva +- +- * Makefile.am (all-recursive, install-recursive, +- mostlyclean-recursive, clean-recursive, distclean-recursive, +- maintainer-clean-recursive): Add missing targets. +- * Makefile.in: Rebuilt. +- +-2006-12-14 Andreas Tobler +- +- * configure.ac: Add TARGET for x86_64-*-darwin*. +- * Makefile.am (nodist_libffi_la_SOURCES): Add rules for 64-bit sources +- for X86_DARWIN. +- * src/x86/ffitarget.h: Set trampoline size for x86_64-*-darwin*. +- * src/x86/darwin64.S: New file for x86_64-*-darwin* support. +- * configure: Regenerate. +- * Makefile.in: Regenerate. +- * include/Makefile.in: Regenerate. +- * testsuite/Makefile.in: Regenerate. +- * testsuite/libffi.special/unwindtest_ffi_call.cc: New test case for +- ffi_call only. +- +-2006-12-13 Andreas Tobler +- +- * aclocal.m4: Regenerate with aclocal -I .. as written in the +- Makefile.am. +- +-2006-10-31 Geoffrey Keating +- +- * src/powerpc/ffi_darwin.c (darwin_adjust_aggregate_sizes): New. +- (ffi_prep_cif_machdep): Call darwin_adjust_aggregate_sizes for +- Darwin. +- * testsuite/libffi.call/nested_struct4.c: Remove Darwin XFAIL. +- * testsuite/libffi.call/nested_struct6.c: Remove Darwin XFAIL. +- +-2006-10-10 Paolo Bonzini +- Sandro Tolaini +- +- * configure.ac [i*86-*-darwin*]: Set X86_DARWIN symbol and +- conditional. +- * configure: Regenerated. +- * Makefile.am (nodist_libffi_la_SOURCES) [X86_DARWIN]: New case. +- (EXTRA_DIST): Add src/x86/darwin.S. +- * Makefile.in: Regenerated. +- * include/Makefile.in: Regenerated. +- * testsuite/Makefile.in: Regenerated. +- +- * src/x86/ffi.c (ffi_prep_cif_machdep) [X86_DARWIN]: Treat like +- X86_WIN32, and additionally align stack to 16 bytes. +- * src/x86/darwin.S: New, based on sysv.S. +- * src/prep_cif.c (ffi_prep_cif) [X86_DARWIN]: Align > 8-byte structs. +- +-2006-09-12 David Daney +- +- PR libffi/23935 +- * include/Makefile.am: Install both ffi.h and ffitarget.h in +- $(libdir)/gcc/$(target_alias)/$(gcc_version)/include. +- * aclocal.m4: Regenerated for automake 1.9.6. +- * Makefile.in: Regenerated. +- * include/Makefile.in: Regenerated. +- * testsuite/Makefile.in: Regenerated. +- +-2006-08-17 Andreas Tobler +- +- * include/ffi_common.h (struct): Revert accidental commit. +- +-2006-08-15 Andreas Tobler +- +- * include/ffi_common.h: Remove lint directives. +- * include/ffi.h.in: Likewise. +- +-2006-07-25 Torsten Schoenfeld +- +- * include/ffi.h.in (ffi_type_ulong, ffi_type_slong): Define correctly +- for 32-bit architectures. +- * testsuite/libffi.call/return_ul.c: New test case. +- +-2006-07-19 David Daney +- +- * testsuite/libffi.call/closure_fn6.c: Remove xfail for mips, +- xfail remains for mips64. +- +-2006-05-23 Carlos O'Donell +- +- * Makefile.am: Add install-html target. Add install-html to .PHONY +- * Makefile.in: Regenerate. +- * aclocal.m4: Regenerate. +- * include/Makefile.in: Regenerate. +- * testsuite/Makefile.in: Regenerate. +- +-2006-05-18 John David Anglin +- +- * pa/ffi.c (ffi_prep_args_pa32): Load floating point arguments from +- stack slot. +- +-2006-04-22 Andreas Tobler +- +- * README: Remove notice about 'Crazy Comments'. +- * src/debug.c: Remove lint directives. Cleanup white spaces. +- * src/java_raw_api.c: Likewise. +- * src/prep_cif.c: Likewise. +- * src/raw_api.c: Likewise. +- * src/ffitest.c: Delete. No longer needed, all test cases migrated +- to the testsuite. +- * src/arm/ffi.c: Remove lint directives. +- * src/m32r/ffi.c: Likewise. +- * src/pa/ffi.c: Likewise. +- * src/powerpc/ffi.c: Likewise. +- * src/powerpc/ffi_darwin.c: Likewise. +- * src/sh/ffi.c: Likewise. +- * src/sh64/ffi.c: Likewise. +- * src/x86/ffi.c: Likewise. +- * testsuite/libffi.call/float2.c: Likewise. +- * testsuite/libffi.call/promotion.c: Likewise. +- * testsuite/libffi.call/struct1.c: Likewise. +- +-2006-04-13 Andreas Tobler +- +- * src/pa/hpux32.S: Correct unwind offset calculation for +- ffi_closure_pa32. +- * src/pa/linux.S: Likewise. +- +-2006-04-12 James E Wilson +- +- PR libgcj/26483 +- * src/ia64/ffi.c (stf_spill, ldf_fill): Rewrite as macros. +- (hfa_type_load): Call stf_spill. +- (hfa_type_store): Call ldf_fill. +- (ffi_call): Adjust calls to above routines. Add local temps for +- macro result. +- +-2006-04-10 Matthias Klose +- +- * testsuite/lib/libffi-dg.exp (libffi-init): Recognize multilib +- directory names containing underscores. +- +-2006-04-07 James E Wilson +- +- * testsuite/libffi.call/float4.c: New testcase. +- +-2006-04-05 John David Anglin +- Andreas Tobler +- +- * Makefile.am: Add PA_HPUX port. +- * Makefile.in: Regenerate. +- * include/Makefile.in: Likewise. +- * testsuite/Makefile.in: Likewise. +- * configure.ac: Add PA_HPUX rules. +- * configure: Regenerate. +- * src/pa/ffitarget.h: Rename linux target to PA_LINUX. +- Add PA_HPUX and PA64_HPUX. +- Rename FFI_LINUX ABI to FFI_PA32 ABI. +- (FFI_TRAMPOLINE_SIZE): Define for 32-bit HP-UX targets. +- (FFI_TYPE_SMALL_STRUCT2): Define. +- (FFI_TYPE_SMALL_STRUCT4): Likewise. +- (FFI_TYPE_SMALL_STRUCT8): Likewise. +- (FFI_TYPE_SMALL_STRUCT3): Redefine. +- (FFI_TYPE_SMALL_STRUCT5): Likewise. +- (FFI_TYPE_SMALL_STRUCT6): Likewise. +- (FFI_TYPE_SMALL_STRUCT7): Likewise. +- * src/pa/ffi.c (ROUND_DOWN): Delete. +- (fldw, fstw, fldd, fstd): Use '__asm__'. +- (ffi_struct_type): Add support for FFI_TYPE_SMALL_STRUCT2, +- FFI_TYPE_SMALL_STRUCT4 and FFI_TYPE_SMALL_STRUCT8. +- (ffi_prep_args_LINUX): Rename to ffi_prep_args_pa32. Update comment. +- Simplify incrementing of stack slot variable. Change type of local +- 'n' to unsigned int. +- (ffi_size_stack_LINUX): Rename to ffi_size_stack_pa32. Handle long +- double on PA_HPUX. +- (ffi_prep_cif_machdep): Likewise. +- (ffi_call): Likewise. +- (ffi_closure_inner_LINUX): Rename to ffi_closure_inner_pa32. Change +- return type to ffi_status. Simplify incrementing of stack slot +- variable. Only copy floating point argument registers when PA_LINUX +- is true. Reformat debug statement. +- Add support for FFI_TYPE_SMALL_STRUCT2, FFI_TYPE_SMALL_STRUCT4 and +- FFI_TYPE_SMALL_STRUCT8. +- (ffi_closure_LINUX): Rename to ffi_closure_pa32. Add 'extern' to +- declaration. +- (ffi_prep_closure): Make linux trampoline conditional on PA_LINUX. +- Add nops to cache flush. Add trampoline for PA_HPUX. +- * src/pa/hpux32.S: New file. +- * src/pa/linux.S (ffi_call_LINUX): Rename to ffi_call_pa32. Rename +- ffi_prep_args_LINUX to ffi_prep_args_pa32. +- Localize labels. Add support for 2, 4 and 8-byte small structs. Handle +- unaligned destinations in 3, 5, 6 and 7-byte small structs. Order +- argument type checks so that common argument types appear first. +- (ffi_closure_LINUX): Rename to ffi_closure_pa32. Rename +- ffi_closure_inner_LINUX to ffi_closure_inner_pa32. +- +-2006-03-24 Alan Modra +- +- * src/powerpc/ffitarget.h (enum ffi_abi): Add FFI_LINUX. Default +- for 32-bit using IBM extended double format. Fix FFI_LAST_ABI. +- * src/powerpc/ffi.c (ffi_prep_args_SYSV): Handle linux variant of +- FFI_TYPE_LONGDOUBLE. +- (ffi_prep_args64): Assert using IBM extended double. +- (ffi_prep_cif_machdep): Don't munge FFI_TYPE_LONGDOUBLE type. +- Handle FFI_LINUX FFI_TYPE_LONGDOUBLE return and args. +- (ffi_call): Handle FFI_LINUX. +- (ffi_closure_helper_SYSV): Non FFI_LINUX long double return needs +- gpr3 return pointer as for struct return. Handle FFI_LINUX +- FFI_TYPE_LONGDOUBLE return and args. Don't increment "nf" +- unnecessarily. +- * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Load both f1 and f2 +- for FFI_TYPE_LONGDOUBLE. Move epilogue insns into case table. +- Don't use r6 as pointer to results, instead use sp offset. Don't +- make a special call to load lr with case table address, instead +- use offset from previous call. +- * src/powerpc/sysv.S (ffi_call_SYSV): Save long double return. +- * src/powerpc/linux64.S (ffi_call_LINUX64): Simplify long double +- return. +- +-2006-03-15 Kaz Kojima +- +- * src/sh64/ffi.c (ffi_prep_cif_machdep): Handle float arguments +- passed with FP registers correctly. +- (ffi_closure_helper_SYSV): Likewise. +- * src/sh64/sysv.S: Likewise. +- +-2006-03-01 Andreas Tobler +- +- * testsuite/libffi.special/unwindtest.cc (closure_test_fn): Mark cif, +- args and userdata unused. +- (closure_test_fn1): Mark cif and userdata unused. +- (main): Remove unused res. +- +-2006-02-28 Andreas Tobler +- +- * testsuite/libffi.call/call.exp: Adjust FSF address. Add test runs for +- -O2, -O3, -Os and the warning flags -W -Wall. +- * testsuite/libffi.special/special.exp: Likewise. +- * testsuite/libffi.call/ffitest.h: Add an __UNUSED__ macro to mark +- unused parameter unused for gcc or else do nothing. +- * testsuite/libffi.special/ffitestcxx.h: Likewise. +- * testsuite/libffi.call/cls_12byte.c (cls_struct_12byte_gn): Mark cif +- and userdata unused. +- * testsuite/libffi.call/cls_16byte.c (cls_struct_16byte_gn): Likewise. +- * testsuite/libffi.call/cls_18byte.c (cls_struct_18byte_gn): Likewise. +- * testsuite/libffi.call/cls_19byte.c (cls_struct_19byte_gn): Likewise. +- * testsuite/libffi.call/cls_1_1byte.c (cls_struct_1_1byte_gn): Likewise. +- * testsuite/libffi.call/cls_20byte.c (cls_struct_20byte_gn): Likewise. +- * testsuite/libffi.call/cls_20byte1.c (cls_struct_20byte_gn): Likewise. +- * testsuite/libffi.call/cls_24byte.c (cls_struct_24byte_gn): Likewise. +- * testsuite/libffi.call/cls_2byte.c (cls_struct_2byte_gn): Likewise. +- * testsuite/libffi.call/cls_3_1byte.c (cls_struct_3_1byte_gn): Likewise. +- * testsuite/libffi.call/cls_3byte1.c (cls_struct_3byte_gn): Likewise. +- * testsuite/libffi.call/cls_3byte2.c (cls_struct_3byte_gn1): Likewise. +- * testsuite/libffi.call/cls_4_1byte.c (cls_struct_4_1byte_gn): Likewise. +- * testsuite/libffi.call/cls_4byte.c (cls_struct_4byte_gn): Likewise. +- * testsuite/libffi.call/cls_5_1_byte.c (cls_struct_5byte_gn): Likewise. +- * testsuite/libffi.call/cls_5byte.c (cls_struct_5byte_gn): Likewise. +- * testsuite/libffi.call/cls_64byte.c (cls_struct_64byte_gn): Likewise. +- * testsuite/libffi.call/cls_6_1_byte.c (cls_struct_6byte_gn): Likewise. +- * testsuite/libffi.call/cls_6byte.c (cls_struct_6byte_gn): Likewise. +- * testsuite/libffi.call/cls_7_1_byte.c (cls_struct_7byte_gn): Likewise. +- * testsuite/libffi.call/cls_7byte.c (cls_struct_7byte_gn): Likewise. +- * testsuite/libffi.call/cls_8byte.c (cls_struct_8byte_gn): Likewise. +- * testsuite/libffi.call/cls_9byte1.c (cls_struct_9byte_gn): Likewise. +- * testsuite/libffi.call/cls_9byte2.c (cls_struct_9byte_gn): Likewise. +- * testsuite/libffi.call/cls_align_double.c (cls_struct_align_gn): +- Likewise. +- * testsuite/libffi.call/cls_align_float.c (cls_struct_align_gn): +- Likewise. +- * testsuite/libffi.call/cls_align_longdouble.c (cls_struct_align_gn): +- Likewise. +- * testsuite/libffi.call/cls_align_pointer.c (cls_struct_align_fn): Cast +- void* to avoid compiler warning. +- (main): Likewise. +- (cls_struct_align_gn): Mark cif and userdata unused. +- * testsuite/libffi.call/cls_align_sint16.c (cls_struct_align_gn): +- Likewise. +- * testsuite/libffi.call/cls_align_sint32.c (cls_struct_align_gn): +- Likewise. +- * testsuite/libffi.call/cls_align_sint64.c (cls_struct_align_gn): +- Likewise. +- * testsuite/libffi.call/cls_align_uint16.c (cls_struct_align_gn): +- Likewise. +- * testsuite/libffi.call/cls_align_uint32.c (cls_struct_align_gn): +- Likewise. +- * testsuite/libffi.call/cls_double.c (cls_ret_double_fn): Likewise. +- * testsuite/libffi.call/cls_float.c (cls_ret_float_fn): Likewise. +- * testsuite/libffi.call/cls_multi_schar.c (test_func_gn): Mark cif and +- data unused. +- (main): Cast res_call to silence gcc. +- * testsuite/libffi.call/cls_multi_sshort.c (test_func_gn): Mark cif and +- data unused. +- (main): Cast res_call to silence gcc. +- * testsuite/libffi.call/cls_multi_sshortchar.c (test_func_gn): Mark cif +- and data unused. +- (main): Cast res_call to silence gcc. +- * testsuite/libffi.call/cls_multi_uchar.c (test_func_gn): Mark cif and +- data unused. +- (main): Cast res_call to silence gcc. +- * testsuite/libffi.call/cls_multi_ushort.c (test_func_gn): Mark cif and +- data unused. +- (main): Cast res_call to silence gcc. +- * testsuite/libffi.call/cls_multi_ushortchar.c (test_func_gn): Mark cif +- and data unused. +- (main): Cast res_call to silence gcc. +- * testsuite/libffi.call/cls_schar.c (cls_ret_schar_fn): Mark cif and +- userdata unused. +- (cls_ret_schar_fn): Cast printf parameter to silence gcc. +- * testsuite/libffi.call/cls_sint.c (cls_ret_sint_fn): Mark cif and +- userdata unused. +- (cls_ret_sint_fn): Cast printf parameter to silence gcc. +- * testsuite/libffi.call/cls_sshort.c (cls_ret_sshort_fn): Mark cif and +- userdata unused. +- (cls_ret_sshort_fn): Cast printf parameter to silence gcc. +- * testsuite/libffi.call/cls_uchar.c (cls_ret_uchar_fn): Mark cif and +- userdata unused. +- (cls_ret_uchar_fn): Cast printf parameter to silence gcc. +- * testsuite/libffi.call/cls_uint.c (cls_ret_uint_fn): Mark cif and +- userdata unused. +- (cls_ret_uint_fn): Cast printf parameter to silence gcc. +- * testsuite/libffi.call/cls_ulonglong.c (cls_ret_ulonglong_fn): Mark cif +- and userdata unused. +- * testsuite/libffi.call/cls_ushort.c (cls_ret_ushort_fn): Mark cif and +- userdata unused. +- (cls_ret_ushort_fn): Cast printf parameter to silence gcc. +- * testsuite/libffi.call/float.c (floating): Remove unused parameter e. +- * testsuite/libffi.call/float1.c (main): Remove unused variable i. +- Cleanup white spaces. +- * testsuite/libffi.call/negint.c (checking): Remove unused variable i. +- * testsuite/libffi.call/nested_struct.c (cls_struct_combined_gn): Mark +- cif and userdata unused. +- * testsuite/libffi.call/nested_struct1.c (cls_struct_combined_gn): +- Likewise. +- * testsuite/libffi.call/nested_struct10.c (B_gn): Likewise. +- * testsuite/libffi.call/nested_struct2.c (B_fn): Adjust printf +- formatters to silence gcc. +- (B_gn): Mark cif and userdata unused. +- * testsuite/libffi.call/nested_struct3.c (B_gn): Mark cif and userdata +- unused. +- * testsuite/libffi.call/nested_struct4.c: Mention related PR. +- (B_gn): Mark cif and userdata unused. +- * testsuite/libffi.call/nested_struct5.c (B_gn): Mark cif and userdata +- unused. +- * testsuite/libffi.call/nested_struct6.c: Mention related PR. +- (B_gn): Mark cif and userdata unused. +- * testsuite/libffi.call/nested_struct7.c (B_gn): Mark cif and userdata +- unused. +- * testsuite/libffi.call/nested_struct8.c (B_gn): Likewise. +- * testsuite/libffi.call/nested_struct9.c (B_gn): Likewise. +- * testsuite/libffi.call/problem1.c (stub): Likewise. +- * testsuite/libffi.call/pyobjc-tc.c (main): Cast the result to silence +- gcc. +- * testsuite/libffi.call/return_fl2.c (return_fl): Add the note mentioned +- in the last commit for this test case in the test case itself. +- * testsuite/libffi.call/closure_fn0.c (closure_test_fn0): Mark cif as +- unused. +- * testsuite/libffi.call/closure_fn1.c (closure_test_fn1): Likewise. +- * testsuite/libffi.call/closure_fn2.c (closure_test_fn2): Likewise. +- * testsuite/libffi.call/closure_fn3.c (closure_test_fn3): Likewise. +- * testsuite/libffi.call/closure_fn4.c (closure_test_fn0): Likewise. +- * testsuite/libffi.call/closure_fn5.c (closure_test_fn5): Likewise. +- * testsuite/libffi.call/closure_fn6.c (closure_test_fn0): Likewise. +- +-2006-02-22 Kaz Kojima +- +- * src/sh/sysv.S: Fix register numbers in the FDE for +- ffi_closure_SYSV. +- +-2006-02-20 Andreas Tobler +- +- * testsuite/libffi.call/return_fl2.c (return_fl): Remove static +- declaration to avoid a false negative on ix86. See PR323. +- +-2006-02-18 Kaz Kojima +- +- * src/sh/ffi.c (ffi_closure_helper_SYSV): Remove unused variable +- and cast integer to void * if needed. Update the pointer to +- the FP register saved area correctly. +- +-2006-02-17 Andreas Tobler +- +- * testsuite/libffi.call/nested_struct6.c: XFAIL this test until PR25630 +- is fixed. +- * testsuite/libffi.call/nested_struct4.c: Likewise. +- +-2006-02-16 Andreas Tobler +- +- * testsuite/libffi.call/return_dbl.c: New test case. +- * testsuite/libffi.call/return_dbl1.c: Likewise. +- * testsuite/libffi.call/return_dbl2.c: Likewise. +- * testsuite/libffi.call/return_fl.c: Likewise. +- * testsuite/libffi.call/return_fl1.c: Likewise. +- * testsuite/libffi.call/return_fl2.c: Likewise. +- * testsuite/libffi.call/return_fl3.c: Likewise. +- * testsuite/libffi.call/closure_fn6.c: Likewise. +- +- * testsuite/libffi.call/nested_struct2.c: Remove ffi_type_mylong +- definition. +- * testsuite/libffi.call/ffitest.h: Add ffi_type_mylong definition +- here to be used by other test cases too. +- +- * testsuite/libffi.call/nested_struct10.c: New test case. +- * testsuite/libffi.call/nested_struct9.c: Likewise. +- * testsuite/libffi.call/nested_struct8.c: Likewise. +- * testsuite/libffi.call/nested_struct7.c: Likewise. +- * testsuite/libffi.call/nested_struct6.c: Likewise. +- * testsuite/libffi.call/nested_struct5.c: Likewise. +- * testsuite/libffi.call/nested_struct4.c: Likewise. +- +-2006-01-21 Andreas Tobler +- +- * configure.ac: Enable libffi for sparc64-*-freebsd*. +- * configure: Rebuilt. +- +-2006-01-18 Jakub Jelinek +- +- * src/powerpc/sysv.S (smst_two_register): Don't call __ashldi3, +- instead do the shifting inline. +- * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Don't compute %r5 +- shift count unconditionally. Simplify load sequences for 1, 2, 3, 4 +- and 8 byte structs, for the remaining struct sizes don't call +- __lshrdi3, instead do the shifting inline. +- +-2005-12-07 Thiemo Seufer +- +- * src/mips/ffitarget.h: Remove obsolete sgidefs.h include. Add +- missing parentheses. +- * src/mips/o32.S (ffi_call_O32): Code formatting. Define +- and use A3_OFF, FP_OFF, RA_OFF. Micro-optimizations. +- (ffi_closure_O32): Likewise, but with newly defined A3_OFF2, +- A2_OFF2, A1_OFF2, A0_OFF2, RA_OFF2, FP_OFF2, S0_OFF2, GP_OFF2, +- V1_OFF2, V0_OFF2, FA_1_1_OFF2, FA_1_0_OFF2, FA_0_1_OFF2, +- FA_0_0_OFF2. +- * src/mips/ffi.c (ffi_prep_args): Code formatting. Fix +- endianness bugs. +- (ffi_prep_closure): Improve trampoline instruction scheduling. +- (ffi_closure_mips_inner_O32): Fix endianness bugs. +- +-2005-12-03 Alan Modra +- +- * src/powerpc/ffi.c: Formatting. +- (ffi_prep_args_SYSV): Avoid possible aliasing problems by using unions. +- (ffi_prep_args64): Likewise. +- +-2005-09-30 Geoffrey Keating +- +- * testsuite/lib/libffi-dg.exp (libffi_target_compile): For +- darwin, use -shared-libgcc not -lgcc_s, and explain why. +- +-2005-09-26 Tom Tromey +- +- * testsuite/libffi.call/float1.c (value_type): New typedef. +- (CANARY): New define. +- (main): Check for result buffer overflow. +- * src/powerpc/linux64.S: Handle linux64 long double returns. +- * src/powerpc/ffi.c (FLAG_RETURNS_128BITS): New constant. +- (ffi_prep_cif_machdep): Handle linux64 long double returns. +- +-2005-08-25 Alan Modra +- +- PR target/23404 +- * src/powerpc/ffi.c (ffi_prep_args_SYSV): Correct placement of stack +- homed fp args. +- (ffi_status ffi_prep_cif_machdep): Correct stack sizing for same. +- +-2005-08-11 Jakub Jelinek +- +- * configure.ac (HAVE_HIDDEN_VISIBILITY_ATTRIBUTE): New test. +- (AH_BOTTOM): Add FFI_HIDDEN definition. +- * configure: Rebuilt. +- * fficonfig.h.in: Rebuilt. +- * src/powerpc/ffi.c (hidden): Remove. +- (ffi_closure_LINUX64, ffi_prep_args64, ffi_call_LINUX64, +- ffi_closure_helper_LINUX64): Use FFI_HIDDEN instead of hidden. +- * src/powerpc/linux64_closure.S (ffi_closure_LINUX64, +- .ffi_closure_LINUX64): Use FFI_HIDDEN instead of .hidden. +- * src/x86/ffi.c (ffi_closure_SYSV, ffi_closure_raw_SYSV): Remove, +- add FFI_HIDDEN to its prototype. +- (ffi_closure_SYSV_inner): New. +- * src/x86/sysv.S (ffi_closure_SYSV, ffi_closure_raw_SYSV): New. +- * src/x86/win32.S (ffi_closure_SYSV, ffi_closure_raw_SYSV): New. +- +-2005-08-10 Alfred M. Szmidt +- +- PR libffi/21819: +- * configure: Rebuilt. +- * configure.ac: Handle i*86-*-gnu*. +- +-2005-08-09 Jakub Jelinek +- +- * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Use +- DW_CFA_offset_extended_sf rather than +- DW_CFA_GNU_negative_offset_extended. +- * src/powerpc/sysv.S (ffi_call_SYSV): Likewise. +- +-2005-07-22 SUGIOKA Toshinobu +- +- * src/sh/sysv.S (ffi_call_SYSV): Stop argument popping correctly +- on sh3. +- (ffi_closure_SYSV): Change the stack layout for sh3 struct argument. +- * src/sh/ffi.c (ffi_prep_args): Fix sh3 argument copy, when it is +- partially on register. +- (ffi_closure_helper_SYSV): Likewise. +- (ffi_prep_cif_machdep): Don't set too many cif->flags. +- +-2005-07-20 Kaz Kojima +- +- * src/sh/ffi.c (ffi_call): Handle small structures correctly. +- Remove empty line. +- * src/sh64/ffi.c (simple_type): Remove. +- (return_type): Handle small structures correctly. +- (ffi_prep_args): Likewise. +- (ffi_call): Likewise. +- (ffi_closure_helper_SYSV): Likewise. +- * src/sh64/sysv.S (ffi_call_SYSV): Handle 1, 2 and 4-byte return. +- Emit position independent code if PIC and remove wrong datalabel +- prefixes from EH data. +- +-2005-07-19 Andreas Tobler +- +- * Makefile.am (nodist_libffi_la_SOURCES): Add POWERPC_FREEBSD. +- * Makefile.in: Regenerate. +- * include/Makefile.in: Likewise. +- * testsuite/Makefile.in: Likewise. +- * configure.ac: Add POWERPC_FREEBSD rules. +- * configure: Regenerate. +- * src/powerpc/ffitarget.h: Add POWERPC_FREEBSD rules. +- (FFI_SYSV_TYPE_SMALL_STRUCT): Define. +- * src/powerpc/ffi.c: Add flags to handle small structure returns +- in ffi_call_SYSV. +- (ffi_prep_cif_machdep): Handle small structures for SYSV 4 ABI. +- Aka FFI_SYSV. +- (ffi_closure_helper_SYSV): Likewise. +- * src/powerpc/ppc_closure.S: Add return types for small structures. +- * src/powerpc/sysv.S: Add bits to handle small structures for +- final SYSV 4 ABI. +- +-2005-07-10 Andreas Tobler +- +- * testsuite/libffi.call/cls_5_1_byte.c: New test file. +- * testsuite/libffi.call/cls_6_1_byte.c: Likewise. +- * testsuite/libffi.call/cls_7_1_byte.c: Likewise. +- +-2005-07-05 Randolph Chung +- +- * src/pa/ffi.c (ffi_struct_type): Rename FFI_TYPE_SMALL_STRUCT1 +- as FFI_TYPE_SMALL_STRUCT3. Break out handling for 5-7 byte +- structures. Kill compilation warnings. +- (ffi_closure_inner_LINUX): Print return values as hex in debug +- message. Rename FFI_TYPE_SMALL_STRUCT1 as FFI_TYPE_SMALL_STRUCT3. +- Properly handle 5-7 byte structure returns. +- * src/pa/ffitarget.h (FFI_TYPE_SMALL_STRUCT1) +- (FFI_TYPE_SMALL_STRUCT2): Remove. +- (FFI_TYPE_SMALL_STRUCT3, FFI_TYPE_SMALL_STRUCT5) +- (FFI_TYPE_SMALL_STRUCT6, FFI_TYPE_SMALL_STRUCT7): Define. +- * src/pa/linux.S: Mark source file as using PA1.1 assembly. +- (checksmst1, checksmst2): Remove. +- (checksmst3): Optimize handling of 3-byte struct returns. +- (checksmst567): Properly handle 5-7 byte struct returns. +- +-2005-06-15 Rainer Orth +- +- PR libgcj/21943 +- * src/mips/n32.S: Enforce PIC code. +- * src/mips/o32.S: Likewise. +- +-2005-06-15 Rainer Orth +- +- * configure.ac: Treat i*86-*-solaris2.10 and up as X86_64. +- * configure: Regenerate. +- +-2005-06-01 Alan Modra +- +- * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Don't use JUMPTARGET +- to call ffi_closure_helper_SYSV. Append @local instead. +- * src/powerpc/sysv.S (ffi_call_SYSV): Likewise for ffi_prep_args_SYSV. +- +-2005-05-17 Kelley Cook +- +- * configure.ac: Use AC_C_BIGENDIAN instead of AC_C_BIGENDIAN_CROSS. +- Use AC_CHECK_SIZEOF instead of AC_COMPILE_CHECK_SIZEOF. +- * Makefile.am (ACLOCAL_AMFLAGS): Remove -I ../config. +- * aclocal.m4, configure, fficonfig.h.in, Makefile.in, +- include/Makefile.in, testsuite/Makefile.in: Regenerate. +- +-2005-05-09 Mike Stump +- +- * configure: Regenerate. +- +-2005-05-08 Richard Henderson +- +- PR libffi/21285 +- * src/alpha/osf.S: Update unwind into to match code. +- +-2005-05-04 Andreas Degert +- Richard Henderson +- +- * src/x86/ffi64.c (ffi_prep_cif_machdep): Save sse-used flag in +- bit 11 of flags. +- (ffi_call): Mask return type field. Pass ssecount to ffi_call_unix64. +- (ffi_prep_closure): Set carry bit if sse-used flag set. +- * src/x86/unix64.S (ffi_call_unix64): Add ssecount argument. +- Only load sse registers if ssecount non-zero. +- (ffi_closure_unix64): Only save sse registers if carry set on entry. +- +-2005-04-29 Ralf Corsepius +- +- * configure.ac: Add i*86-*-rtems*, sparc*-*-rtems*, +- powerpc-*rtems*, arm*-*-rtems*, sh-*-rtems*. +- * configure: Regenerate. +- +-2005-04-20 Hans-Peter Nilsson +- +- * testsuite/lib/libffi-dg.exp (libffi-dg-test-1): In regsub use, +- have Tcl8.3-compatible intermediate variable. +- +-2005-04-18 Simon Posnjak +- Hans-Peter Nilsson +- +- * Makefile.am: Add CRIS support. +- * configure.ac: Likewise. +- * Makefile.in, configure, testsuite/Makefile.in, +- include/Makefile.in: Regenerate. +- * src/cris: New directory. +- * src/cris/ffi.c, src/cris/sysv.S, src/cris/ffitarget.h: New files. +- * src/prep_cif.c (ffi_prep_cif): Wrap in #ifndef __CRIS__. +- +- * testsuite/lib/libffi-dg.exp (libffi-dg-test-1): Replace \n with +- \r?\n in output tests. +- +-2005-04-12 Mike Stump +- +- * configure: Regenerate. +- +-2005-03-30 Hans Boehm +- +- * src/ia64/ffitarget.h (ffi_arg): Use long long instead of DI. +- +-2005-03-30 Steve Ellcey +- +- * src/ia64/ffitarget.h (ffi_arg) ADD DI attribute. +- (ffi_sarg) Ditto. +- * src/ia64/unix.S (ffi_closure_unix): Extend gp +- to 64 bits in ILP32 mode. +- Load 64 bits even for short data. +- +-2005-03-23 Mike Stump +- +- * src/powerpc/darwin.S: Update for -m64 multilib. +- * src/powerpc/darwin_closure.S: Likewise. +- +-2005-03-21 Zack Weinberg +- +- * configure.ac: Do not invoke TL_AC_GCC_VERSION. +- Do not set tool_include_dir. +- * aclocal.m4, configure, Makefile.in, testsuite/Makefile.in: +- Regenerate. +- * include/Makefile.am: Set gcc_version and toollibffidir. +- * include/Makefile.in: Regenerate. +- +-2005-02-22 Andrew Haley +- +- * src/powerpc/ffi.c (ffi_prep_cif_machdep): Bump alignment to +- odd-numbered register pairs for 64-bit integer types. +- +-2005-02-23 Andreas Tobler +- +- PR libffi/20104 +- * testsuite/libffi.call/return_ll1.c: New test case. +- +-2005-02-11 Janis Johnson +- +- * testsuite/libffi.call/cls_align_longdouble.c: Remove dg-options. +- * testsuite/libffi.call/float.c: Ditto. +- * testsuite/libffi.call/float2.c: Ditto. +- * testsuite/libffi.call/float3.c: Ditto. +- +-2005-02-08 Andreas Tobler +- +- * src/frv/ffitarget.h: Remove PPC stuff which does not belong to frv. +- +-2005-01-12 Eric Botcazou +- +- * testsuite/libffi.special/special.exp (cxx_options): Add +- -shared-libgcc. +- +-2004-12-31 Richard Henderson +- +- * src/types.c (FFI_AGGREGATE_TYPEDEF): Remove. +- (FFI_TYPEDEF): Rename from FFI_INTEGRAL_TYPEDEF. Replace size and +- offset parameters with a type parameter; deduce size and structure +- alignment. Update all users. +- +-2004-12-31 Richard Henderson +- +- * src/types.c (FFI_TYPE_POINTER): Define with sizeof. +- (FFI_TYPE_LONGDOUBLE): Fix for ia64. +- * src/ia64/ffitarget.h (struct ffi_ia64_trampoline_struct): Move +- into ffi_prep_closure. +- * src/ia64/ia64_flags.h, src/ia64/ffi.c, src/ia64/unix.S: Rewrite +- from scratch. +- +-2004-12-27 Richard Henderson +- +- * src/x86/unix64.S: Fix typo in unwind info. +- +-2004-12-25 Richard Henderson +- +- * src/x86/ffi64.c (struct register_args): Rename from stackLayout. +- (enum x86_64_reg_class): Add X86_64_COMPLEX_X87_CLASS. +- (merge_classes): Check for it. +- (SSE_CLASS_P): New. +- (classify_argument): Pass byte_offset by value; perform all updates +- inside struct case. +- (examine_argument): Add classes argument; handle +- X86_64_COMPLEX_X87_CLASS. +- (ffi_prep_args): Merge into ... +- (ffi_call): ... here. Share stack frame with ffi_call_unix64. +- (ffi_prep_cif_machdep): Setup cif->flags for proper structure return. +- (ffi_fill_return_value): Remove. +- (ffi_prep_closure): Remove dead assert. +- (ffi_closure_unix64_inner): Rename from ffi_closure_UNIX64_inner. +- Rewrite to use struct register_args instead of va_list. Create +- flags for handling structure returns. +- * src/x86/unix64.S: Remove dead strings. +- (ffi_call_unix64): Rename from ffi_call_UNIX64. Rewrite to share +- stack frame with ffi_call. Handle structure returns properly. +- (float2sse, floatfloat2sse, double2sse): Remove. +- (sse2float, sse2double, sse2floatfloat): Remove. +- (ffi_closure_unix64): Rename from ffi_closure_UNIX64. Rewrite +- to handle structure returns properly. +- +-2004-12-08 David Edelsohn +- +- * Makefile.am (AM_MAKEFLAGS): Remove duplicate LIBCFLAGS and +- PICFLAG. +- * Makefile.in: Regenerated. +- +-2004-12-02 Richard Sandiford +- +- * configure.ac: Use TL_AC_GCC_VERSION to set gcc_version. +- * configure, aclocal.m4, Makefile.in: Regenerate. +- * include/Makefile.in, testsuite/Makefile.in: Regenerate. +- +-2004-11-29 Kelley Cook +- +- * configure: Regenerate for libtool change. +- +-2004-11-25 Kelley Cook +- +- * configure: Regenerate for libtool reversion. +- +-2004-11-24 Kelley Cook +- +- * configure: Regenerate for libtool change. +- +-2004-11-23 John David Anglin +- +- * testsuite/lib/libffi-dg.exp: Use new procs in target-libpath.exp. +- +-2004-11-23 Richard Sandiford +- +- * src/mips/o32.S (ffi_call_O32, ffi_closure_O32): Use jalr instead +- of jal. Use an absolute encoding for the frame information. +- +-2004-11-23 Kelley Cook +- +- * Makefile.am: Remove no-dependencies. Add ACLOCAL_AMFLAGS. +- * acinclude.m4: Delete logic for sincludes. +- * aclocal.m4, Makefile.in, configure: Regenerate. +- * include/Makefile: Likewise. +- * testsuite/Makefile: Likewise. +- +-2004-11-22 Eric Botcazou +- +- * src/sparc/ffi.c (ffi_prep_closure): Align doubles and 64-bit integers +- on a 8-byte boundary. +- * src/sparc/v8.S (ffi_closure_v8): Reserve frame space for arguments. +- +-2004-10-27 Richard Earnshaw +- +- * src/arm/ffi.c (ffi_prep_cif_machdep): Handle functions that return +- long long values. Round stack allocation to a multiple of 8 bytes +- for ATPCS compatibility. +- * src/arm/sysv.S (ffi_call_SYSV): Rework to avoid use of APCS register +- names. Handle returning long long types. Add Thumb and interworking +- support. Improve soft-float code. +- +-2004-10-27 Richard Earnshaw +- +- * testsuite/lib/libffi-db.exp (load_gcc_lib): New function. +- (libffi_exit): New function. +- (libffi_init): Build the testglue wrapper if needed. +- +-2004-10-25 Eric Botcazou +- +- PR other/18138 +- * testsuite/lib/libffi-dg.exp: Accept more than one multilib libgcc. +- +-2004-10-25 Kazuhiro Inaoka +- +- * src/m32r/libffitarget.h (FFI_CLOSURES): Set to 0. +- +-2004-10-20 Kaz Kojima +- +- * src/sh/sysv.S (ffi_call_SYSV): Don't align for double data. +- * testsuite/libffi.call/float3.c: New test case. +- +-2004-10-18 Kaz Kojima +- +- * src/sh/ffi.c (ffi_prep_closure): Set T bit in trampoline for +- the function returning a structure pointed with R2. +- * src/sh/sysv.S (ffi_closure_SYSV): Use R2 as the pointer to +- the structure return value if T bit set. Emit position +- independent code and EH data if PIC. +- +-2004-10-13 Kazuhiro Inaoka +- +- * Makefile.am: Add m32r support. +- * configure.ac: Likewise. +- * Makefile.in: Regenerate. +- * confiugre: Regenerate. +- * src/types.c: Add m32r port to FFI_INTERNAL_TYPEDEF +- (uint64, sint64, double, longdouble) +- * src/m32r: New directory. +- * src/m32r/ffi.c: New file. +- * src/m32r/sysv.S: Likewise. +- * src/m32r/ffitarget.h: Likewise. +- +-2004-10-02 Kaz Kojima +- +- * testsuite/libffi.call/negint.c: New test case. +- +-2004-09-14 H.J. Lu +- +- PR libgcj/17465 +- * testsuite/lib/libffi-dg.exp: Don't use global ld_library_path. +- Set up LD_LIBRARY_PATH, SHLIB_PATH, LD_LIBRARYN32_PATH, +- LD_LIBRARY64_PATH, LD_LIBRARY_PATH_32, LD_LIBRARY_PATH_64 and +- DYLD_LIBRARY_PATH. +- +-2004-09-05 Andreas Tobler +- +- * testsuite/libffi.call/many_win32.c: Remove whitespaces. +- * testsuite/libffi.call/promotion.c: Likewise. +- * testsuite/libffi.call/return_ll.c: Remove unused var. Cleanup +- whitespaces. +- * testsuite/libffi.call/return_sc.c: Likewise. +- * testsuite/libffi.call/return_uc.c: Likewise. +- +-2004-09-05 Andreas Tobler +- +- * src/powerpc/darwin.S: Fix comments and identation. +- * src/powerpc/darwin_closure.S: Likewise. +- +-2004-09-02 Andreas Tobler +- +- * src/powerpc/ffi_darwin.c: Add flag for longdouble return values. +- (ffi_prep_args): Handle longdouble arguments. +- (ffi_prep_cif_machdep): Set flags for longdouble. Calculate space for +- longdouble. +- (ffi_closure_helper_DARWIN): Add closure handling for longdouble. +- * src/powerpc/darwin.S (_ffi_call_DARWIN): Add handling of longdouble +- values. +- * src/powerpc/darwin_closure.S (_ffi_closure_ASM): Likewise. +- * src/types.c: Defined longdouble size and alignment for darwin. +- +-2004-09-02 Andreas Tobler +- +- * src/powerpc/aix.S: Remove whitespaces. +- * src/powerpc/aix_closure.S: Likewise. +- * src/powerpc/asm.h: Likewise. +- * src/powerpc/ffi.c: Likewise. +- * src/powerpc/ffitarget.h: Likewise. +- * src/powerpc/linux64.S: Likewise. +- * src/powerpc/linux64_closure.S: Likewise. +- * src/powerpc/ppc_closure.S: Likewise. +- * src/powerpc/sysv.S: Likewise. +- +-2004-08-30 Anthony Green +- +- * Makefile.am: Add frv support. +- * Makefile.in, testsuite/Makefile.in: Rebuilt. +- * configure.ac: Read configure.host. +- * configure.in: Read configure.host. +- * configure.host: New file. frv-elf needs libgloss. +- * include/ffi.h.in: Force ffi_closure to have a nice big (8) +- alignment. This is needed to frv and shouldn't harm the others. +- * include/ffi_common.h (ALIGN_DOWN): New macro. +- * src/frv/ffi.c, src/frv/ffitarget.h, src/frv/eabi.S: New files. +- +-2004-08-24 David Daney +- +- * testsuite/libffi.call/closure_fn0.c: Xfail mips64* instead of mips*. +- * testsuite/libffi.call/closure_fn1.c: Likewise. +- * testsuite/libffi.call/closure_fn2.c Likewise. +- * testsuite/libffi.call/closure_fn3.c: Likewise. +- * testsuite/libffi.call/closure_fn4.c: Likewise. +- * testsuite/libffi.call/closure_fn5.c: Likewise. +- * testsuite/libffi.call/cls_18byte.c: Likewise. +- * testsuite/libffi.call/cls_19byte.c: Likewise. +- * testsuite/libffi.call/cls_1_1byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte1.c: Likewise. +- * testsuite/libffi.call/cls_24byte.c: Likewise. +- * testsuite/libffi.call/cls_2byte.c: Likewise. +- * testsuite/libffi.call/cls_3_1byte.c: Likewise. +- * testsuite/libffi.call/cls_3byte1.c: Likewise. +- * testsuite/libffi.call/cls_3byte2.c: Likewise. +- * testsuite/libffi.call/cls_4_1byte.c: Likewise. +- * testsuite/libffi.call/cls_4byte.c: Likewise. +- * testsuite/libffi.call/cls_64byte.c: Likewise. +- * testsuite/libffi.call/cls_6byte.c: Likewise. +- * testsuite/libffi.call/cls_7byte.c: Likewise. +- * testsuite/libffi.call/cls_8byte.c: Likewise. +- * testsuite/libffi.call/cls_9byte1.c: Likewise. +- * testsuite/libffi.call/cls_9byte2.c: Likewise. +- * testsuite/libffi.call/cls_align_double.c: Likewise. +- * testsuite/libffi.call/cls_align_float.c: Likewise. +- * testsuite/libffi.call/cls_align_longdouble.c: Likewise. +- * testsuite/libffi.call/cls_align_pointer.c: Likewise. +- * testsuite/libffi.call/cls_align_sint16.c: Likewise. +- * testsuite/libffi.call/cls_align_sint32.c: Likewise. +- * testsuite/libffi.call/cls_align_sint64.c: Likewise. +- * testsuite/libffi.call/cls_align_uint16.c: Likewise. +- * testsuite/libffi.call/cls_align_uint32.c: Likewise. +- * testsuite/libffi.call/cls_align_uint64.c: Likewise. +- * testsuite/libffi.call/cls_double.c: Likewise. +- * testsuite/libffi.call/cls_float.c: Likewise. +- * testsuite/libffi.call/cls_multi_schar.c: Likewise. +- * testsuite/libffi.call/cls_multi_sshort.c: Likewise. +- * testsuite/libffi.call/cls_multi_sshortchar.c: Likewise. +- * testsuite/libffi.call/cls_multi_uchar.c: Likewise. +- * testsuite/libffi.call/cls_multi_ushort.c: Likewise. +- * testsuite/libffi.call/cls_multi_ushortchar.c: Likewise. +- * testsuite/libffi.call/cls_schar.c: Likewise. +- * testsuite/libffi.call/cls_sint.c: Likewise. +- * testsuite/libffi.call/cls_sshort.c: Likewise. +- * testsuite/libffi.call/cls_uchar.c: Likewise. +- * testsuite/libffi.call/cls_uint.c: Likewise. +- * testsuite/libffi.call/cls_ulonglong.c: Likewise. +- * testsuite/libffi.call/cls_ushort.c: Likewise. +- * testsuite/libffi.call/nested_struct.c: Likewise. +- * testsuite/libffi.call/nested_struct1.c: Likewise. +- * testsuite/libffi.call/nested_struct2.c: Likewise. +- * testsuite/libffi.call/nested_struct3.c: Likewise. +- * testsuite/libffi.call/problem1.c: Likewise. +- * testsuite/libffi.special/unwindtest.cc: Likewise. +- * testsuite/libffi.call/cls_12byte.c: Likewise and set return value +- to zero. +- * testsuite/libffi.call/cls_16byte.c: Likewise. +- * testsuite/libffi.call/cls_5byte.c: Likewise. +- +-2004-08-23 David Daney +- +- PR libgcj/13141 +- * src/mips/ffitarget.h (FFI_O32_SOFT_FLOAT): New ABI. +- * src/mips/ffi.c (ffi_prep_args): Fix alignment calculation. +- (ffi_prep_cif_machdep): Handle FFI_O32_SOFT_FLOAT floating point +- parameters and return types. +- (ffi_call): Handle FFI_O32_SOFT_FLOAT ABI. +- (ffi_prep_closure): Ditto. +- (ffi_closure_mips_inner_O32): Handle FFI_O32_SOFT_FLOAT ABI, fix +- alignment calculations. +- * src/mips/o32.S (ffi_closure_O32): Don't use floating point +- instructions if FFI_O32_SOFT_FLOAT, make stack frame ABI compliant. +- +-2004-08-14 Casey Marshall +- +- * src/mips/ffi.c (ffi_pref_cif_machdep): set `cif->flags' to +- contain `FFI_TYPE_UINT64' as return type for any 64-bit +- integer (O32 ABI only). +- (ffi_prep_closure): new function. +- (ffi_closure_mips_inner_O32): new function. +- * src/mips/ffitarget.h: Define `FFI_CLOSURES' and +- `FFI_TRAMPOLINE_SIZE' appropriately if the ABI is o32. +- * src/mips/o32.S (ffi_call_O32): add labels for .eh_frame. Return +- 64 bit integers correctly. +- (ffi_closure_O32): new function. +- Added DWARF-2 unwind info for both functions. +- +-2004-08-10 Andrew Haley +- +- * src/x86/ffi64.c (ffi_prep_args ): 8-align all stack arguments. +- +-2004-08-01 Robert Millan +- +- * configure.ac: Detect knetbsd-gnu and kfreebsd-gnu. +- * configure: Regenerate. +- +-2004-07-30 Maciej W. Rozycki +- +- * acinclude.m4 (AC_FUNC_MMAP_BLACKLIST): Check for +- and mmap() explicitly instead of relying on preset autoconf cache +- variables. +- * aclocal.m4: Regenerate. +- * configure: Regenerate. +- +-2004-07-11 Ulrich Weigand +- +- * src/s390/ffi.c (ffi_prep_args): Fix C aliasing violation. +- (ffi_check_float_struct): Remove unused prototype. +- +-2004-06-30 Geoffrey Keating +- +- * src/powerpc/ffi_darwin.c (flush_icache): ';' is a comment +- character on Darwin, use '\n\t' instead. +- +-2004-06-26 Matthias Klose +- +- * libtool-version: Fix typo in revision/age. +- +-2004-06-17 Matthias Klose +- +- * libtool-version: New. +- * Makefile.am (libffi_la_LDFLAGS): Use -version-info for soname. +- * Makefile.in: Regenerate. +- +-2004-06-15 Paolo Bonzini +- +- * Makefile.am: Remove useless multilib rules. +- * Makefile.in: Regenerate. +- * aclocal.m4: Regenerate with automake 1.8.5. +- * configure.ac: Remove useless multilib configury. +- * configure: Regenerate. +- +-2004-06-15 Paolo Bonzini +- +- * .cvsignore: New file. +- +-2004-06-10 Jakub Jelinek +- +- * src/ia64/unix.S (ffi_call_unix): Insert group barrier break +- fp_done. +- (ffi_closure_UNIX): Fix f14/f15 adjustment if FLOAT_SZ is ever +- changed from 8. +- +-2004-06-06 Sean McNeil +- +- * configure.ac: Add x86_64-*-freebsd* support. +- * configure: Regenerate. +- +-2004-04-26 Joe Buck +- +- Bug 15093 +- * configure.ac: Test for existence of mmap and sys/mman.h before +- checking blacklist. Fix suggested by Jim Wilson. +- * configure: Regenerate. +- +-2004-04-26 Matt Austern +- +- * src/powerpc/darwin.S: Go through a non-lazy pointer for initial +- FDE location. +- * src/powerpc/darwin_closure.S: Likewise. +- +-2004-04-24 Andreas Tobler +- +- * testsuite/libffi.call/cls_multi_schar.c (main): Fix initialization +- error. Reported by Thomas Heller . +- * testsuite/libffi.call/cls_multi_sshort.c (main): Likewise. +- * testsuite/libffi.call/cls_multi_ushort.c (main): Likewise. +- +-2004-03-20 Matthias Klose +- +- * src/pa/linux.S: Fix typo. +- +-2004-03-19 Matthias Klose +- +- * Makefile.am: Update. +- * Makefile.in: Regenerate. +- * src/pa/ffi.h.in: Remove. +- * src/pa/ffitarget.h: New file. +- +-2004-02-10 Randolph Chung +- +- * Makefile.am: Add PA support. +- * Makefile.in: Regenerate. +- * include/Makefile.in: Regenerate. +- * configure.ac: Add PA target. +- * configure: Regenerate. +- * src/pa/ffi.c: New file. +- * src/pa/ffi.h.in: Add PA support. +- * src/pa/linux.S: New file. +- * prep_cif.c: Add PA support. +- +-2004-03-16 Hosaka Yuji +- +- * src/types.c: Fix alignment size of X86_WIN32 case int64 and +- double. +- * src/x86/ffi.c (ffi_prep_args): Replace ecif->cif->rtype->type +- with ecif->cif->flags. +- (ffi_call, ffi_prep_incoming_args_SYSV): Replace cif->rtype->type +- with cif->flags. +- (ffi_prep_cif_machdep): Add X86_WIN32 struct case. +- (ffi_closure_SYSV): Add 1 or 2-bytes struct case for X86_WIN32. +- * src/x86/win32.S (retstruct1b, retstruct2b, sc_retstruct1b, +- sc_retstruct2b): Add for 1 or 2-bytes struct case. +- +-2004-03-15 Kelley Cook +- +- * configure.in: Rename file to ... +- * configure.ac: ... this. +- * fficonfig.h.in: Regenerate. +- * Makefile.in: Regenerate. +- * include/Makefile.in: Regenerate. +- * testsuite/Makefile.in: Regenerate. +- +-2004-03-12 Matt Austern +- +- * src/powerpc/darwin.S: Fix EH information so it corresponds to +- changes in EH format resulting from addition of linkonce support. +- * src/powerpc/darwin_closure.S: Likewise. +- +-2004-03-11 Andreas Tobler +- Paolo Bonzini +- +- * Makefile.am (AUTOMAKE_OPTIONS): Set them. +- Remove VPATH. Remove rules for object files. Remove multilib support. +- (AM_CCASFLAGS): Add. +- * configure.in (AC_CONFIG_HEADERS): Relace AM_CONFIG_HEADER. +- (AC_PREREQ): Bump version to 2.59. +- (AC_INIT): Fill with version info and bug address. +- (ORIGINAL_LD_FOR_MULTILIBS): Remove. +- (AM_ENABLE_MULTILIB): Use this instead of AC_ARG_ENABLE. +- De-precious CC so that the right flags are passed down to multilibs. +- (AC_MSG_ERROR): Replace obsolete macro AC_ERROR. +- (AC_CONFIG_FILES): Replace obsolete macro AC_LINK_FILES. +- (AC_OUTPUT): Reorganize the output with AC_CONFIG_COMMANDS. +- * configure: Rebuilt. +- * aclocal.m4: Likewise. +- * Makefile.in, include/Makefile.in, testsuite/Makefile.in: Likewise. +- * fficonfig.h.in: Likewise. +- +-2004-03-11 Andreas Schwab +- +- * src/ia64/ffi.c (ffi_prep_incoming_args_UNIX): Get floating point +- arguments from fp registers only for the first 8 parameter slots. +- Don't convert a float parameter when passed in memory. +- +-2004-03-09 Hans-Peter Nilsson +- +- * configure: Regenerate for config/accross.m4 correction. +- +-2004-02-25 Matt Kraai +- +- * src/powerpc/ffi.c (ffi_prep_args_SYSV): Change +- ecif->cif->bytes to bytes. +- (ffi_prep_cif_machdep): Add braces around nested if statement. +- +-2004-02-09 Alan Modra +- +- * src/types.c (pointer): POWERPC64 has 8 byte pointers. +- +- * src/powerpc/ffi.c (ffi_prep_args64): Correct long double handling. +- (ffi_closure_helper_LINUX64): Fix typo. +- * testsuite/libffi.call/cls_align_longdouble.c: Pass -mlong-double-128 +- for powerpc64-*-*. +- * testsuite/libffi.call/float.c: Likewise. +- * testsuite/libffi.call/float2.c: Likewise. +- +-2004-02-08 Alan Modra +- +- * src/powerpc/ffi.c (ffi_prep_cif_machdep ): Correct +- long double function return and long double arg handling. +- (ffi_closure_helper_LINUX64): Formatting. Delete unused "ng" var. +- Use "end_pfr" instead of "nf". Correct long double handling. +- Localise "temp". +- * src/powerpc/linux64.S (ffi_call_LINUX64): Save f2 long double +- return value. +- * src/powerpc/linux64_closure.S (ffi_closure_LINUX64): Allocate +- space for long double return value. Adjust stack frame and offsets. +- Load f2 long double return. +- +-2004-02-07 Alan Modra +- +- * src/types.c: Use 16 byte long double for POWERPC64. +- +-2004-01-25 Eric Botcazou +- +- * src/sparc/ffi.c (ffi_prep_args_v9): Shift the parameter array +- when the structure return address is passed in %o0. +- (ffi_V9_return_struct): Rename into ffi_v9_layout_struct. +- (ffi_v9_layout_struct): Align the field following a nested structure +- on a word boundary. Use memmove instead of memcpy. +- (ffi_call): Update call to ffi_V9_return_struct. +- (ffi_prep_closure): Define 'ctx' only for V8. +- (ffi_closure_sparc_inner): Clone into ffi_closure_sparc_inner_v8 +- and ffi_closure_sparc_inner_v9. +- (ffi_closure_sparc_inner_v8): Return long doubles by reference. +- Always skip the structure return address. For structures and long +- doubles, copy the argument directly. +- (ffi_closure_sparc_inner_v9): Skip the structure return address only +- if required. Shift the maximum floating-point slot accordingly. For +- big structures, copy the argument directly; otherwise, left-justify the +- argument and call ffi_v9_layout_struct to lay out the structure on +- the stack. +- * src/sparc/v8.S: Undef STACKFRAME before defining it. +- (ffi_closure_v8): Pass the structure return address. Update call to +- ffi_closure_sparc_inner_v8. Short-circuit FFI_TYPE_INT handling. +- Skip the 'unimp' insn when returning long doubles and structures. +- * src/sparc/v9.S: Undef STACKFRAME before defining it. +- (ffi_closure_v9): Increase the frame size by 2 words. Short-circuit +- FFI_TYPE_INT handling. Load structures both in integers and +- floating-point registers on return. +- * README: Update status of the SPARC port. +- +-2004-01-24 Andreas Tobler +- +- * testsuite/libffi.call/pyobjc-tc.c (main): Treat result value +- as of type ffi_arg. +- * testsuite/libffi.call/struct3.c (main): Fix CHECK. +- +-2004-01-22 Ulrich Weigand +- +- * testsuite/libffi.call/cls_uint.c (cls_ret_uint_fn): Treat result +- value as of type ffi_arg, not unsigned int. +- +-2004-01-21 Michael Ritzert +- +- * ffi64.c (ffi_prep_args): Cast the RHS of an assignment instead +- of the LHS. +- +-2004-01-12 Andreas Tobler +- +- * testsuite/lib/libffi-dg.exp: Set LD_LIBRARY_PATH_32 for +- Solaris. +- +-2004-01-08 Rainer Orth +- +- * testsuite/libffi.call/ffitest.h (allocate_mmap): Cast MAP_FAILED +- to void *. +- +-2003-12-10 Richard Henderson +- +- * testsuite/libffi.call/cls_align_pointer.c: Cast pointers to +- size_t instead of int. +- +-2003-12-04 Hosaka Yuji +- +- * testsuite/libffi.call/many_win32.c: Include . +- * testsuite/libffi.call/many_win32.c (main): Replace variable +- int i with unsigned long ul. +- +- * testsuite/libffi.call/cls_align_uint64.c: New test case. +- * testsuite/libffi.call/cls_align_sint64.c: Likewise. +- * testsuite/libffi.call/cls_align_uint32.c: Likewise. +- * testsuite/libffi.call/cls_align_sint32.c: Likewise. +- * testsuite/libffi.call/cls_align_uint16.c: Likewise. +- * testsuite/libffi.call/cls_align_sint16.c: Likewise. +- * testsuite/libffi.call/cls_align_float.c: Likewise. +- * testsuite/libffi.call/cls_align_double.c: Likewise. +- * testsuite/libffi.call/cls_align_longdouble.c: Likewise. +- * testsuite/libffi.call/cls_align_pointer.c: Likewise. +- +-2003-12-02 Hosaka Yuji +- +- PR other/13221 +- * src/x86/ffi.c (ffi_prep_args, ffi_prep_incoming_args_SYSV): +- Align arguments to 32 bits. +- +-2003-12-01 Andreas Tobler +- +- PR other/13221 +- * testsuite/libffi.call/cls_multi_sshort.c: New test case. +- * testsuite/libffi.call/cls_multi_sshortchar.c: Likewise. +- * testsuite/libffi.call/cls_multi_uchar.c: Likewise. +- * testsuite/libffi.call/cls_multi_schar.c: Likewise. +- * testsuite/libffi.call/cls_multi_ushortchar.c: Likewise. +- * testsuite/libffi.call/cls_multi_ushort.c: Likewise. +- +- * testsuite/libffi.special/unwindtest.cc: Cosmetics. +- +-2003-11-26 Kaveh R. Ghazi +- +- * testsuite/libffi.call/ffitest.h: Include . +- * testsuite/libffi.special/ffitestcxx.h: Likewise. +- +-2003-11-22 Andreas Tobler +- +- * Makefile.in: Rebuilt. +- * configure: Likewise. +- * testsuite/libffi.special/unwindtest.cc: Convert the mmap to +- the right type. +- +-2003-11-21 Andreas Jaeger +- Andreas Tobler +- +- * acinclude.m4: Add AC_FUNC_MMAP_BLACKLIST. +- * configure.in: Call AC_FUNC_MMAP_BLACKLIST. +- * Makefile.in: Rebuilt. +- * aclocal.m4: Likewise. +- * configure: Likewise. +- * fficonfig.h.in: Likewise. +- * testsuite/lib/libffi-dg.exp: Add include dir. +- * testsuite/libffi.call/ffitest.h: Add MMAP definitions. +- * testsuite/libffi.special/ffitestcxx.h: Likewise. +- * testsuite/libffi.call/closure_fn0.c: Use MMAP functionality +- for ffi_closure if available. +- * testsuite/libffi.call/closure_fn1.c: Likewise. +- * testsuite/libffi.call/closure_fn2.c: Likewise. +- * testsuite/libffi.call/closure_fn3.c: Likewise. +- * testsuite/libffi.call/closure_fn4.c: Likewise. +- * testsuite/libffi.call/closure_fn5.c: Likewise. +- * testsuite/libffi.call/cls_12byte.c: Likewise. +- * testsuite/libffi.call/cls_16byte.c: Likewise. +- * testsuite/libffi.call/cls_18byte.c: Likewise. +- * testsuite/libffi.call/cls_19byte.c: Likewise. +- * testsuite/libffi.call/cls_1_1byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte1.c: Likewise. +- * testsuite/libffi.call/cls_24byte.c: Likewise. +- * testsuite/libffi.call/cls_2byte.c: Likewise. +- * testsuite/libffi.call/cls_3_1byte.c: Likewise. +- * testsuite/libffi.call/cls_3byte1.c: Likewise. +- * testsuite/libffi.call/cls_3byte2.c: Likewise. +- * testsuite/libffi.call/cls_4_1byte.c: Likewise. +- * testsuite/libffi.call/cls_4byte.c: Likewise. +- * testsuite/libffi.call/cls_5byte.c: Likewise. +- * testsuite/libffi.call/cls_64byte.c: Likewise. +- * testsuite/libffi.call/cls_6byte.c: Likewise. +- * testsuite/libffi.call/cls_7byte.c: Likewise. +- * testsuite/libffi.call/cls_8byte.c: Likewise. +- * testsuite/libffi.call/cls_9byte1.c: Likewise. +- * testsuite/libffi.call/cls_9byte2.c: Likewise. +- * testsuite/libffi.call/cls_double.c: Likewise. +- * testsuite/libffi.call/cls_float.c: Likewise. +- * testsuite/libffi.call/cls_schar.c: Likewise. +- * testsuite/libffi.call/cls_sint.c: Likewise. +- * testsuite/libffi.call/cls_sshort.c: Likewise. +- * testsuite/libffi.call/cls_uchar.c: Likewise. +- * testsuite/libffi.call/cls_uint.c: Likewise. +- * testsuite/libffi.call/cls_ulonglong.c: Likewise. +- * testsuite/libffi.call/cls_ushort.c: Likewise. +- * testsuite/libffi.call/nested_struct.c: Likewise. +- * testsuite/libffi.call/nested_struct1.c: Likewise. +- * testsuite/libffi.call/nested_struct2.c: Likewise. +- * testsuite/libffi.call/nested_struct3.c: Likewise. +- * testsuite/libffi.call/problem1.c: Likewise. +- * testsuite/libffi.special/unwindtest.cc: Likewise. +- +-2003-11-20 Andreas Tobler +- +- * testsuite/lib/libffi-dg.exp: Make the -lgcc_s conditional. +- +-2003-11-19 Andreas Tobler +- +- * testsuite/lib/libffi-dg.exp: Add DYLD_LIBRARY_PATH for darwin. +- Add -lgcc_s to additional flags. +- +-2003-11-12 Andreas Tobler +- +- * configure.in, include/Makefile.am: PR libgcj/11147, install +- the ffitarget.h header file in a gcc versioned and target +- dependent place. +- * configure: Regenerated. +- * Makefile.in, include/Makefile.in: Likewise. +- * testsuite/Makefile.in: Likewise. +- +-2003-11-09 Andreas Tobler +- +- * testsuite/libffi.call/closure_fn0.c: Print result and check +- with dg-output to make debugging easier. +- * testsuite/libffi.call/closure_fn1.c: Likewise. +- * testsuite/libffi.call/closure_fn2.c: Likewise. +- * testsuite/libffi.call/closure_fn3.c: Likewise. +- * testsuite/libffi.call/closure_fn4.c: Likewise. +- * testsuite/libffi.call/closure_fn5.c: Likewise. +- * testsuite/libffi.call/cls_12byte.c: Likewise. +- * testsuite/libffi.call/cls_16byte.c: Likewise. +- * testsuite/libffi.call/cls_18byte.c: Likewise. +- * testsuite/libffi.call/cls_19byte.c: Likewise. +- * testsuite/libffi.call/cls_1_1byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte1.c: Likewise. +- * testsuite/libffi.call/cls_24byte.c: Likewise. +- * testsuite/libffi.call/cls_2byte.c: Likewise. +- * testsuite/libffi.call/cls_3_1byte.c: Likewise. +- * testsuite/libffi.call/cls_3byte1.c: Likewise. +- * testsuite/libffi.call/cls_3byte2.c: Likewise. +- * testsuite/libffi.call/cls_4_1byte.c: Likewise. +- * testsuite/libffi.call/cls_4byte.c: Likewise. +- * testsuite/libffi.call/cls_5byte.c: Likewise. +- * testsuite/libffi.call/cls_64byte.c: Likewise. +- * testsuite/libffi.call/cls_6byte.c: Likewise. +- * testsuite/libffi.call/cls_7byte.c: Likewise. +- * testsuite/libffi.call/cls_8byte.c: Likewise. +- * testsuite/libffi.call/cls_9byte1.c: Likewise. +- * testsuite/libffi.call/cls_9byte2.c: Likewise. +- * testsuite/libffi.call/cls_double.c: Likewise. +- * testsuite/libffi.call/cls_float.c: Likewise. +- * testsuite/libffi.call/cls_schar.c: Likewise. +- * testsuite/libffi.call/cls_sint.c: Likewise. +- * testsuite/libffi.call/cls_sshort.c: Likewise. +- * testsuite/libffi.call/cls_uchar.c: Likewise. +- * testsuite/libffi.call/cls_uint.c: Likewise. +- * testsuite/libffi.call/cls_ulonglong.c: Likewise. +- * testsuite/libffi.call/cls_ushort.c: Likewise. +- * testsuite/libffi.call/problem1.c: Likewise. +- +- * testsuite/libffi.special/unwindtest.cc: Make ffi_closure +- static. +- +-2003-11-08 Andreas Tobler +- +- * testsuite/libffi.call/cls_9byte2.c: New test case. +- * testsuite/libffi.call/cls_9byte1.c: Likewise. +- * testsuite/libffi.call/cls_64byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte1.c: Likewise. +- * testsuite/libffi.call/cls_19byte.c: Likewise. +- * testsuite/libffi.call/cls_18byte.c: Likewise. +- * testsuite/libffi.call/closure_fn4.c: Likewise. +- * testsuite/libffi.call/closure_fn5.c: Likewise. +- * testsuite/libffi.call/cls_schar.c: Likewise. +- * testsuite/libffi.call/cls_sint.c: Likewise. +- * testsuite/libffi.call/cls_sshort.c: Likewise. +- * testsuite/libffi.call/nested_struct2.c: Likewise. +- * testsuite/libffi.call/nested_struct3.c: Likewise. +- +-2003-11-08 Andreas Tobler +- +- * testsuite/libffi.call/cls_double.c: Do a check on the result. +- * testsuite/libffi.call/cls_uchar.c: Likewise. +- * testsuite/libffi.call/cls_uint.c: Likewise. +- * testsuite/libffi.call/cls_ulonglong.c: Likewise. +- * testsuite/libffi.call/cls_ushort.c: Likewise. +- * testsuite/libffi.call/return_sc.c: Cleanup whitespaces. +- +-2003-11-06 Andreas Tobler +- +- * src/prep_cif.c (ffi_prep_cif): Move the validity check after +- the initialization. +- +-2003-10-23 Andreas Tobler +- +- * src/java_raw_api.c (ffi_java_ptrarray_to_raw): Replace +- FFI_ASSERT(FALSE) with FFI_ASSERT(0). +- +-2003-10-22 David Daney +- +- * src/mips/ffitarget.h: Replace undefined UINT32 and friends with +- __attribute__((__mode__(__SI__))) and friends. +- +-2003-10-22 Andreas Schwab +- +- * src/ia64/ffi.c: Replace FALSE/TRUE with false/true. +- +-2003-10-21 Andreas Tobler +- +- * configure.in: AC_LINK_FILES(ffitarget.h). +- * configure: Regenerate. +- * Makefile.in: Likewise. +- * include/Makefile.in: Likewise. +- * testsuite/Makefile.in: Likewise. +- * fficonfig.h.in: Likewise. +- +-2003-10-21 Paolo Bonzini +- Richard Henderson +- +- Avoid that ffi.h includes fficonfig.h. +- +- * Makefile.am (EXTRA_DIST): Include ffitarget.h files +- (TARGET_SRC_MIPS_GCC): Renamed to TARGET_SRC_MIPS_IRIX. +- (TARGET_SRC_MIPS_SGI): Removed. +- (MIPS_GCC): Renamed to TARGET_SRC_MIPS_IRIX. +- (MIPS_SGI): Removed. +- (CLEANFILES): Removed. +- (mostlyclean-am, clean-am, mostlyclean-sub, clean-sub): New +- targets. +- * acconfig.h: Removed. +- * configure.in: Compute sizeofs only for double and long double. +- Use them to define and subst HAVE_LONG_DOUBLE. Include comments +- into AC_DEFINE instead of using acconfig.h. Create +- include/ffitarget.h instead of include/fficonfig.h. Rename +- MIPS_GCC to MIPS_IRIX, drop MIPS_SGI since we are in gcc's tree. +- AC_DEFINE EH_FRAME_FLAGS. +- * include/Makefile.am (DISTCLEANFILES): New automake macro. +- (hack_DATA): Add ffitarget.h. +- * include/ffi.h.in: Remove all system specific definitions. +- Declare raw API even if it is not installed, why bother? +- Use limits.h instead of SIZEOF_* to define ffi_type_*. Do +- not define EH_FRAME_FLAGS, it is in fficonfig.h now. Include +- ffitarget.h instead of fficonfig.h. Remove ALIGN macro. +- (UINT_ARG, INT_ARG): Removed, use ffi_arg and ffi_sarg instead. +- * include/ffi_common.h (bool): Do not define. +- (ffi_assert): Accept failed assertion. +- (ffi_type_test): Return void and accept file/line. +- (FFI_ASSERT): Pass stringized failed assertion. +- (FFI_ASSERT_AT): New macro. +- (FFI_ASSERT_VALID_TYPE): New macro. +- (UINT8, SINT8, UINT16, SINT16, UINT32, SINT32, +- UINT64, SINT64): Define here with gcc's __attribute__ macro +- instead of in ffi.h +- (FLOAT32, ALIGN): Define here instead of in ffi.h +- * include/ffi-mips.h: Removed. Its content moved to +- src/mips/ffitarget.h after separating assembly and C sections. +- * src/alpha/ffi.c, src/alpha/ffi.c, src/java_raw_api.c +- src/prep_cif.c, src/raw_api.c, src/ia64/ffi.c, +- src/mips/ffi.c, src/mips/n32.S, src/mips/o32.S, +- src/mips/ffitarget.h, src/sparc/ffi.c, src/x86/ffi64.c: +- SIZEOF_ARG -> FFI_SIZEOF_ARG. +- * src/ia64/ffi.c: Include stdbool.h (provided by GCC 2.95+). +- * src/debug.c (ffi_assert): Accept stringized failed assertion. +- (ffi_type_test): Rewritten. +- * src/prep-cif.c (initialize_aggregate, ffi_prep_cif): Call +- FFI_ASSERT_VALID_TYPE. +- * src/alpha/ffitarget.h, src/arm/ffitarget.h, +- src/ia64/ffitarget.h, src/m68k/ffitarget.h, +- src/mips/ffitarget.h, src/powerpc/ffitarget.h, +- src/s390/ffitarget.h, src/sh/ffitarget.h, +- src/sh64/ffitarget.h, src/sparc/ffitarget.h, +- src/x86/ffitarget.h: New files. +- * src/alpha/osf.S, src/arm/sysv.S, src/ia64/unix.S, +- src/m68k/sysv.S, src/mips/n32.S, src/mips/o32.S, +- src/powerpc/aix.S, src/powerpc/darwin.S, +- src/powerpc/ffi_darwin.c, src/powerpc/linux64.S, +- src/powerpc/linux64_closure.S, src/powerpc/ppc_closure.S, +- src/powerpc/sysv.S, src/s390/sysv.S, src/sh/sysv.S, +- src/sh64/sysv.S, src/sparc/v8.S, src/sparc/v9.S, +- src/x86/sysv.S, src/x86/unix64.S, src/x86/win32.S: +- include fficonfig.h +- +-2003-10-20 Rainer Orth +- +- * src/mips/ffi.c: Use _ABIN32, _ABIO32 instead of external +- _MIPS_SIM_NABI32, _MIPS_SIM_ABI32. +- +-2003-10-19 Andreas Tobler +- +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Declare bytes again. +- Used when FFI_DEBUG = 1. +- +-2003-10-14 Alan Modra +- +- * src/types.c (double, longdouble): Default POWERPC64 to 8 byte size +- and align. +- +-2003-10-06 Rainer Orth +- +- * include/ffi_mips.h: Define FFI_MIPS_N32 for N32/N64 ABIs, +- FFI_MIPS_O32 for O32 ABI. +- +-2003-10-01 Andreas Tobler +- +- * testsuite/lib/libffi-dg.exp: Set LD_LIBRARY_PATH_64 for +- SPARC64. Cleanup whitespaces. +- +-2003-09-19 Andreas Tobler +- +- * testsuite/libffi.call/closure_fn0.c: Xfail mips, arm, +- strongarm, xscale. Cleanup whitespaces. +- * testsuite/libffi.call/closure_fn1.c: Likewise. +- * testsuite/libffi.call/closure_fn2.c: Likewise. +- * testsuite/libffi.call/closure_fn3.c: Likewise. +- * testsuite/libffi.call/cls_12byte.c: Likewise. +- * testsuite/libffi.call/cls_16byte.c: Likewise. +- * testsuite/libffi.call/cls_1_1byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte.c: Likewise. +- * testsuite/libffi.call/cls_24byte.c: Likewise. +- * testsuite/libffi.call/cls_2byte.c: Likewise. +- * testsuite/libffi.call/cls_3_1byte.c: Likewise. +- * testsuite/libffi.call/cls_3byte1.c: Likewise. +- * testsuite/libffi.call/cls_3byte2.c: Likewise. +- * testsuite/libffi.call/cls_4_1byte.c: Likewise. +- * testsuite/libffi.call/cls_4byte.c: Likewise. +- * testsuite/libffi.call/cls_5byte.c: Likewise. +- * testsuite/libffi.call/cls_6byte.c: Likewise. +- * testsuite/libffi.call/cls_7byte.c: Likewise. +- * testsuite/libffi.call/cls_8byte.c: Likewise. +- * testsuite/libffi.call/cls_double.c: Likewise. +- * testsuite/libffi.call/cls_float.c: Likewise. +- * testsuite/libffi.call/cls_uchar.c: Likewise. +- * testsuite/libffi.call/cls_uint.c: Likewise. +- * testsuite/libffi.call/cls_ulonglong.c: Likewise. +- * testsuite/libffi.call/cls_ushort.c: Likewise. +- * testsuite/libffi.call/nested_struct.c: Likewise. +- * testsuite/libffi.call/nested_struct1.c: Likewise. +- * testsuite/libffi.call/problem1.c: Likewise. +- * testsuite/libffi.special/unwindtest.cc: Likewise. +- * testsuite/libffi.call/pyobjc-tc.c: Cleanup whitespaces. +- +-2003-09-18 David Edelsohn +- +- * src/powerpc/aix.S: Cleanup whitespaces. +- * src/powerpc/aix_closure.S: Likewise. +- +-2003-09-18 Andreas Tobler +- +- * src/powerpc/darwin.S: Cleanup whitespaces, comment formatting. +- * src/powerpc/darwin_closure.S: Likewise. +- * src/powerpc/ffi_darwin.c: Likewise. +- +-2003-09-18 Andreas Tobler +- David Edelsohn +- +- * src/types.c (double): Add AIX and Darwin to the right TYPEDEF. +- * src/powerpc/aix_closure.S: Remove the pointer to the outgoing +- parameter stack. +- * src/powerpc/darwin_closure.S: Likewise. +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Handle structures +- according to the Darwin/AIX ABI. +- (ffi_prep_cif_machdep): Likewise. +- (ffi_closure_helper_DARWIN): Likewise. +- Remove the outgoing parameter stack logic. Simplify the evaluation +- of the different CASE types. +- (ffi_prep_clousure): Avoid the casts on lvalues. Change the branch +- statement in the trampoline code. +- +-2003-09-18 Kaz Kojima +- +- * src/sh/ffi.c (ffi_prep_args): Take account into the alignement +- for the register size. +- (ffi_closure_helper_SYSV): Handle the structure return value +- address correctly. +- (ffi_closure_helper_SYSV): Return the appropriate type when +- the registers are used for the structure return value. +- * src/sh/sysv.S (ffi_closure_SYSV): Fix the stack layout for +- the 64-bit return value. Update copyright years. +- +-2003-09-17 Rainer Orth +- +- * testsuite/lib/libffi-dg.exp (libffi_target_compile): Search in +- srcdir for ffi_mips.h. +- +-2003-09-12 Alan Modra +- +- * src/prep_cif.c (initialize_aggregate): Include tail padding in +- structure size. +- * src/powerpc/linux64_closure.S (ffi_closure_LINUX64): Correct +- placement of float result. +- * testsuite/libffi.special/unwindtest.cc (closure_test_fn1): Correct +- cast of "resp" for big-endian 64 bit machines. +- +-2003-09-11 Alan Modra +- +- * src/types.c (double, longdouble): Merge identical SH and ARM +- typedefs, and add POWERPC64. +- * src/powerpc/ffi.c (ffi_prep_args64): Correct next_arg calc for +- struct split over gpr and rest. +- (ffi_prep_cif_machdep): Correct intarg_count for structures. +- * src/powerpc/linux64.S (ffi_call_LINUX64): Fix gpr offsets. +- +-2003-09-09 Andreas Tobler +- +- * src/powerpc/ffi.c (ffi_closure_helper_SYSV) Handle struct +- passing correctly. +- +-2003-09-09 Alan Modra +- +- * configure: Regenerate. +- +-2003-09-04 Andreas Tobler +- +- * Makefile.am: Remove build rules for ffitest. +- * Makefile.in: Rebuilt. +- +-2003-09-04 Andreas Tobler +- +- * src/java_raw_api.c: Include to fix compiler warning +- about implicit declaration of abort(). +- +-2003-09-04 Andreas Tobler +- +- * Makefile.am: Add dejagnu test framework. Fixes PR other/11411. +- * Makefile.in: Rebuilt. +- * configure.in: Add dejagnu test framework. +- * configure: Rebuilt. +- +- * testsuite/Makefile.am: New file. +- * testsuite/Makefile.in: Built +- * testsuite/lib/libffi-dg.exp: New file. +- * testsuite/config/default.exp: Likewise. +- * testsuite/libffi.call/call.exp: Likewise. +- * testsuite/libffi.call/ffitest.h: Likewise. +- * testsuite/libffi.call/closure_fn0.c: Likewise. +- * testsuite/libffi.call/closure_fn1.c: Likewise. +- * testsuite/libffi.call/closure_fn2.c: Likewise. +- * testsuite/libffi.call/closure_fn3.c: Likewise. +- * testsuite/libffi.call/cls_1_1byte.c: Likewise. +- * testsuite/libffi.call/cls_3_1byte.c: Likewise. +- * testsuite/libffi.call/cls_4_1byte.c: Likewise. +- * testsuite/libffi.call/cls_2byte.c: Likewise. +- * testsuite/libffi.call/cls_3byte1.c: Likewise. +- * testsuite/libffi.call/cls_3byte2.c: Likewise. +- * testsuite/libffi.call/cls_4byte.c: Likewise. +- * testsuite/libffi.call/cls_5byte.c: Likewise. +- * testsuite/libffi.call/cls_6byte.c: Likewise. +- * testsuite/libffi.call/cls_7byte.c: Likewise. +- * testsuite/libffi.call/cls_8byte.c: Likewise. +- * testsuite/libffi.call/cls_12byte.c: Likewise. +- * testsuite/libffi.call/cls_16byte.c: Likewise. +- * testsuite/libffi.call/cls_20byte.c: Likewise. +- * testsuite/libffi.call/cls_24byte.c: Likewise. +- * testsuite/libffi.call/cls_double.c: Likewise. +- * testsuite/libffi.call/cls_float.c: Likewise. +- * testsuite/libffi.call/cls_uchar.c: Likewise. +- * testsuite/libffi.call/cls_uint.c: Likewise. +- * testsuite/libffi.call/cls_ulonglong.c: Likewise. +- * testsuite/libffi.call/cls_ushort.c: Likewise. +- * testsuite/libffi.call/float.c: Likewise. +- * testsuite/libffi.call/float1.c: Likewise. +- * testsuite/libffi.call/float2.c: Likewise. +- * testsuite/libffi.call/many.c: Likewise. +- * testsuite/libffi.call/many_win32.c: Likewise. +- * testsuite/libffi.call/nested_struct.c: Likewise. +- * testsuite/libffi.call/nested_struct1.c: Likewise. +- * testsuite/libffi.call/pyobjc-tc.c: Likewise. +- * testsuite/libffi.call/problem1.c: Likewise. +- * testsuite/libffi.call/promotion.c: Likewise. +- * testsuite/libffi.call/return_ll.c: Likewise. +- * testsuite/libffi.call/return_sc.c: Likewise. +- * testsuite/libffi.call/return_uc.c: Likewise. +- * testsuite/libffi.call/strlen.c: Likewise. +- * testsuite/libffi.call/strlen_win32.c: Likewise. +- * testsuite/libffi.call/struct1.c: Likewise. +- * testsuite/libffi.call/struct2.c: Likewise. +- * testsuite/libffi.call/struct3.c: Likewise. +- * testsuite/libffi.call/struct4.c: Likewise. +- * testsuite/libffi.call/struct5.c: Likewise. +- * testsuite/libffi.call/struct6.c: Likewise. +- * testsuite/libffi.call/struct7.c: Likewise. +- * testsuite/libffi.call/struct8.c: Likewise. +- * testsuite/libffi.call/struct9.c: Likewise. +- * testsuite/libffi.special/special.exp: New file. +- * testsuite/libffi.special/ffitestcxx.h: Likewise. +- * testsuite/libffi.special/unwindtest.cc: Likewise. +- +- +-2003-08-13 Kaz Kojima +- +- * src/sh/ffi.c (OFS_INT16): Set 0 for little endian case. Update +- copyright years. +- +-2003-08-02 Alan Modra +- +- * src/powerpc/ffi.c (ffi_prep_args64): Modify for changed gcc +- structure passing. +- (ffi_closure_helper_LINUX64): Likewise. +- * src/powerpc/linux64.S: Remove code writing to parm save area. +- * src/powerpc/linux64_closure.S (ffi_closure_LINUX64): Use return +- address in lr from ffi_closure_helper_LINUX64 call to calculate +- table address. Optimize function tail. +- +-2003-07-28 Andreas Tobler +- +- * src/sparc/ffi.c: Handle all floating point registers. +- * src/sparc/v9.S: Likewise. Fixes second part of PR target/11410. +- +-2003-07-11 Gerald Pfeifer +- +- * README: Note that libffi is not part of GCC. Update the project +- URL and status. +- +-2003-06-19 Franz Sirl +- +- * src/powerpc/ppc_closure.S: Include ffi.h. +- +-2003-06-13 Rainer Orth +- +- * src/x86/sysv.S: Avoid gas-only .uleb128/.sleb128 directives. +- Use C style comments. +- +-2003-06-13 Kaz Kojima +- +- * Makefile.am: Add SHmedia support. Fix a typo of SH support. +- * Makefile.in: Regenerate. +- * configure.in (sh64-*-linux*, sh5*-*-linux*): Add target. +- * configure: Regenerate. +- * include/ffi.h.in: Add SHmedia support. +- * src/sh64/ffi.c: New file. +- * src/sh64/sysv.S: New file. +- +-2003-05-16 Jakub Jelinek +- +- * configure.in (HAVE_RO_EH_FRAME): Check whether .eh_frame section +- should be read-only. +- * configure: Rebuilt. +- * fficonfig.h.in: Rebuilt. +- * include/ffi.h.in (EH_FRAME_FLAGS): Define. +- * src/alpha/osf.S: Use EH_FRAME_FLAGS. +- * src/powerpc/linux64.S: Likewise. +- * src/powerpc/linux64_closure.S: Likewise. Include ffi.h. +- * src/powerpc/sysv.S: Use EH_FRAME_FLAGS. Use pcrel encoding +- if -fpic/-fPIC/-mrelocatable. +- * src/powerpc/powerpc_closure.S: Likewise. +- * src/sparc/v8.S: If HAVE_RO_EH_FRAME is defined, don't include +- #write in .eh_frame flags. +- * src/sparc/v9.S: Likewise. +- * src/x86/unix64.S: Use EH_FRAME_FLAGS. +- * src/x86/sysv.S: Likewise. Use pcrel encoding if -fpic/-fPIC. +- * src/s390/sysv.S: Use EH_FRAME_FLAGS. Include ffi.h. +- +-2003-05-07 Jeff Sturm +- +- Fixes PR bootstrap/10656 +- * configure.in (HAVE_AS_REGISTER_PSEUDO_OP): Test assembler +- support for .register pseudo-op. +- * src/sparc/v8.S: Use it. +- * fficonfig.h.in: Rebuilt. +- * configure: Rebuilt. +- +-2003-04-18 Jakub Jelinek +- +- * include/ffi.h.in (POWERPC64): Define if 64-bit. +- (enum ffi_abi): Add FFI_LINUX64 on POWERPC. +- Make it the default on POWERPC64. +- (FFI_TRAMPOLINE_SIZE): Define to 24 on POWERPC64. +- * configure.in: Change powerpc-*-linux* into powerpc*-*-linux*. +- * configure: Rebuilt. +- * src/powerpc/ffi.c (hidden): Define. +- (ffi_prep_args_SYSV): Renamed from +- ffi_prep_args. Cast pointers to unsigned long to shut up warnings. +- (NUM_GPR_ARG_REGISTERS64, NUM_FPR_ARG_REGISTERS64, +- ASM_NEEDS_REGISTERS64): New. +- (ffi_prep_args64): New function. +- (ffi_prep_cif_machdep): Handle FFI_LINUX64 ABI. +- (ffi_call): Likewise. +- (ffi_prep_closure): Likewise. +- (flush_icache): Surround by #ifndef POWERPC64. +- (ffi_dblfl): New union type. +- (ffi_closure_helper_SYSV): Use it to avoid aliasing problems. +- (ffi_closure_helper_LINUX64): New function. +- * src/powerpc/ppc_closure.S: Surround whole file by #ifndef +- __powerpc64__. +- * src/powerpc/sysv.S: Likewise. +- (ffi_call_SYSV): Rename ffi_prep_args to ffi_prep_args_SYSV. +- * src/powerpc/linux64.S: New file. +- * src/powerpc/linux64_closure.S: New file. +- * Makefile.am (EXTRA_DIST): Add src/powerpc/linux64.S and +- src/powerpc/linux64_closure.S. +- (TARGET_SRC_POWERPC): Likewise. +- +- * src/ffitest.c (closure_test_fn, closure_test_fn1, closure_test_fn2, +- closure_test_fn3): Fix result printing on big-endian 64-bit +- machines. +- (main): Print tst2_arg instead of uninitialized tst2_result. +- +- * src/ffitest.c (main): Hide what closure pointer really points to +- from the compiler. +- +-2003-04-16 Richard Earnshaw +- +- * configure.in (arm-*-netbsdelf*): Add configuration. +- (configure): Regenerated. +- +-2003-04-04 Loren J. Rittle +- +- * include/Makefile.in: Regenerate. +- +-2003-03-21 Zdenek Dvorak +- +- * libffi/include/ffi.h.in: Define X86 instead of X86_64 in 32 +- bit mode. +- * libffi/src/x86/ffi.c (ffi_closure_SYSV, ffi_closure_raw_SYSV): +- Receive closure pointer through parameter, read args using +- __builtin_dwarf_cfa. +- (FFI_INIT_TRAMPOLINE): Send closure reference through eax. +- +-2003-03-12 Andreas Schwab +- +- * configure.in: Avoid trailing /. in toolexeclibdir. +- * configure: Rebuilt. +- +-2003-03-03 Andreas Tobler +- +- * src/powerpc/darwin_closure.S: Recode to fit dynamic libraries. +- +-2003-02-06 Andreas Tobler +- +- * libffi/src/powerpc/darwin_closure.S: +- Fix alignement bug, allocate 8 bytes for the result. +- * libffi/src/powerpc/aix_closure.S: +- Likewise. +- * libffi/src/powerpc/ffi_darwin.c: +- Update stackframe description for aix/darwin_closure.S. +- +-2003-02-06 Jakub Jelinek +- +- * src/s390/ffi.c (ffi_closure_helper_SYSV): Add hidden visibility +- attribute. +- +-2003-01-31 Christian Cornelssen , +- Andreas Schwab +- +- * configure.in: Adjust command to source config-ml.in to account +- for changes to the libffi_basedir definition. +- (libffi_basedir): Remove ${srcdir} from value and include trailing +- slash if nonempty. +- +- * configure: Regenerate. +- +-2003-01-29 Franz Sirl +- +- * src/powerpc/ppc_closure.S: Recode to fit shared libs. +- +-2003-01-28 Andrew Haley +- +- * include/ffi.h.in: Enable FFI_CLOSURES for x86_64. +- * src/x86/ffi64.c (ffi_prep_closure): New. +- (ffi_closure_UNIX64_inner): New. +- * src/x86/unix64.S (ffi_closure_UNIX64): New. +- +-2003-01-27 Alexandre Oliva +- +- * configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST. +- Remove USE_LIBDIR conditional. +- * Makefile.am (toolexecdir, toolexeclibdir): Don't override. +- * Makefile.in, configure: Rebuilt. +- +-2003-01027 David Edelsohn +- +- * Makefile.am (TARGET_SRC_POWERPC_AIX): Fix typo. +- * Makefile.in: Regenerate. +- +-2003-01-22 Andrew Haley +- +- * src/powerpc/darwin.S (_ffi_call_AIX): Add Augmentation size to +- unwind info. +- +-2003-01-21 Andreas Tobler +- +- * src/powerpc/darwin.S: Add unwind info. +- * src/powerpc/darwin_closure.S: Likewise. +- +-2003-01-14 Andrew Haley +- +- * src/x86/ffi64.c (ffi_prep_args): Check for void retval. +- (ffi_prep_cif_machdep): Likewise. +- * src/x86/unix64.S: Add unwind info. +- +-2003-01-14 Andreas Jaeger +- +- * src/ffitest.c (main): Only use ffi_closures if those are +- supported. +- +-2003-01-13 Andreas Tobler +- +- * libffi/src/ffitest.c +- add closure testcases +- +-2003-01-13 Kevin B. Hendricks +- +- * libffi/src/powerpc/ffi.c +- fix alignment bug for float (4 byte aligned iso 8 byte) +- +-2003-01-09 Geoffrey Keating +- +- * src/powerpc/ffi_darwin.c: Remove RCS version string. +- * src/powerpc/darwin.S: Remove RCS version string. +- +-2003-01-03 Jeff Sturm +- +- * include/ffi.h.in: Add closure defines for SPARC, SPARC64. +- * src/ffitest.c (main): Use static storage for closure. +- * src/sparc/ffi.c (ffi_prep_closure, ffi_closure_sparc_inner): New. +- * src/sparc/v8.S (ffi_closure_v8): New. +- * src/sparc/v9.S (ffi_closure_v9): New. +- +-2002-11-10 Ranjit Mathew +- +- * include/ffi.h.in: Added FFI_STDCALL ffi_type +- enumeration for X86_WIN32. +- * src/x86/win32.S: Added ffi_call_STDCALL function +- definition. +- * src/x86/ffi.c (ffi_call/ffi_raw_call): Added +- switch cases for recognising FFI_STDCALL and +- calling ffi_call_STDCALL if target is X86_WIN32. +- * src/ffitest.c (my_stdcall_strlen/stdcall_many): +- stdcall versions of the "my_strlen" and "many" +- test functions (for X86_WIN32). +- Added test cases to test stdcall invocation using +- these functions. +- +-2002-12-02 Kaz Kojima +- +- * src/sh/sysv.S: Add DWARF2 unwind info. +- +-2002-11-27 Ulrich Weigand +- +- * src/s390/sysv.S (.eh_frame section): Make section read-only. +- +-2002-11-26 Jim Wilson +- +- * src/types.c (FFI_TYPE_POINTER): Has size 8 on IA64. +- +-2002-11-23 H.J. Lu +- +- * acinclude.m4: Add dummy AM_PROG_LIBTOOL. +- Include ../config/accross.m4. +- * aclocal.m4; Rebuild. +- * configure: Likewise. +- +-2002-11-15 Ulrich Weigand +- +- * src/s390/sysv.S (.eh_frame section): Adapt to pcrel FDE encoding. +- +-2002-11-11 DJ Delorie +- +- * configure.in: Look for common files in the right place. +- +-2002-10-08 Ulrich Weigand +- +- * src/java_raw_api.c (ffi_java_raw_to_ptrarray): Interpret +- raw data as _Jv_word values, not ffi_raw. +- (ffi_java_ptrarray_to_raw): Likewise. +- (ffi_java_rvalue_to_raw): New function. +- (ffi_java_raw_call): Call it. +- (ffi_java_raw_to_rvalue): New function. +- (ffi_java_translate_args): Call it. +- * src/ffitest.c (closure_test_fn): Interpret return value +- as ffi_arg, not int. +- * src/s390/ffi.c (ffi_prep_cif_machdep): Add missing +- FFI_TYPE_POINTER case. +- (ffi_closure_helper_SYSV): Likewise. Also, assume return +- values extended to word size. +- +-2002-10-02 Andreas Jaeger +- +- * src/x86/ffi64.c (ffi_prep_cif_machdep): Remove debug output. +- +-2002-10-01 Bo Thorsen +- +- * include/ffi.h.in: Fix i386 win32 compilation. +- +-2002-09-30 Ulrich Weigand +- +- * configure.in: Add s390x-*-linux-* target. +- * configure: Regenerate. +- * include/ffi.h.in: Define S390X for s390x targets. +- (FFI_CLOSURES): Define for s390/s390x. +- (FFI_TRAMPOLINE_SIZE): Likewise. +- (FFI_NATIVE_RAW_API): Likewise. +- * src/prep_cif.c (ffi_prep_cif): Do not compute stack space for s390. +- * src/types.c (FFI_TYPE_POINTER): Use 8-byte pointers on s390x. +- * src/s390/ffi.c: Major rework of existing code. Add support for +- s390x targets. Add closure support. +- * src/s390/sysv.S: Likewise. +- +-2002-09-29 Richard Earnshaw +- +- * src/arm/sysv.S: Fix typo. +- +-2002-09-28 Richard Earnshaw +- +- * src/arm/sysv.S: If we don't have machine/asm.h and the pre-processor +- has defined __USER_LABEL_PREFIX__, then use it in CNAME. +- (ffi_call_SYSV): Handle soft-float. +- +-2002-09-27 Bo Thorsen +- +- * include/ffi.h.in: Fix multilib x86-64 support. +- +-2002-09-22 Kaveh R. Ghazi +- +- * Makefile.am (all-multi): Fix multilib parallel build. +- +-2002-07-19 Kaz Kojima +- +- * configure.in (sh[34]*-*-linux*): Add brackets. +- * configure: Regenerate. +- +-2002-07-18 Kaz Kojima +- +- * Makefile.am: Add SH support. +- * Makefile.in: Regenerate. +- * configure.in (sh-*-linux*, sh[34]*-*-linux*): Add target. +- * configure: Regenerate. +- * include/ffi.h.in: Add SH support. +- * src/sh/ffi.c: New file. +- * src/sh/sysv.S: New file. +- * src/types.c: Add SH support. +- +-2002-07-16 Bo Thorsen +- +- * src/x86/ffi64.c: New file that adds x86-64 support. +- * src/x86/unix64.S: New file that handles argument setup for +- x86-64. +- * src/x86/sysv.S: Don't use this on x86-64. +- * src/x86/ffi.c: Don't use this on x86-64. +- Remove unused vars. +- * src/prep_cif.c (ffi_prep_cif): Don't do stack size calculation +- for x86-64. +- * src/ffitest.c (struct6): New test that tests a special case in +- the x86-64 ABI. +- (struct7): Likewise. +- (struct8): Likewise. +- (struct9): Likewise. +- (closure_test_fn): Silence warning about this when it's not used. +- (main): Add the new tests. +- (main): Fix a couple of wrong casts and silence some compiler warnings. +- * include/ffi.h.in: Add x86-64 ABI definition. +- * fficonfig.h.in: Regenerate. +- * Makefile.am: Add x86-64 support. +- * configure.in: Likewise. +- * Makefile.in: Regenerate. +- * configure: Likewise. +- +-2002-06-24 Bo Thorsen +- +- * src/types.c: Merge settings for similar architectures. +- Add x86-64 sizes and alignments. +- +-2002-06-23 Bo Thorsen +- +- * src/arm/ffi.c (ffi_prep_args): Remove unused vars. +- * src/sparc/ffi.c (ffi_prep_args_v8): Likewise. +- * src/mips/ffi.c (ffi_prep_args): Likewise. +- * src/m68k/ffi.c (ffi_prep_args): Likewise. +- +-2002-07-18 H.J. Lu (hjl@gnu.org) +- +- * Makefile.am (TARGET_SRC_MIPS_LINUX): New. +- (libffi_la_SOURCES): Support MIPS_LINUX. +- (libffi_convenience_la_SOURCES): Likewise. +- * Makefile.in: Regenerated. +- +- * configure.in (mips64*-*): Skip. +- (mips*-*-linux*): New. +- * configure: Regenerated. +- +- * src/mips/ffi.c: Include . +- +-2002-06-06 Ulrich Weigand +- +- * src/s390/sysv.S: Save/restore %r6. Add DWARF-2 unwind info. +- +-2002-05-27 Roger Sayle +- +- * src/x86/ffi.c (ffi_prep_args): Remove reference to avn. +- +-2002-05-27 Bo Thorsen +- +- * src/x86/ffi.c (ffi_prep_args): Remove unused variable and +- fix formatting. +- +-2002-05-13 Andreas Tobler +- +- * src/powerpc/ffi_darwin.c (ffi_prep_closure): Declare fd at +- beginning of function (for older apple cc). +- +-2002-05-08 Alexandre Oliva +- +- * configure.in (ORIGINAL_LD_FOR_MULTILIBS): Preserve LD at +- script entry, and set LD to it when configuring multilibs. +- * configure: Rebuilt. +- +-2002-05-05 Jason Thorpe +- +- * configure.in (sparc64-*-netbsd*): Add target. +- (sparc-*-netbsdelf*): Likewise. +- * configure: Regenerate. +- +-2002-04-28 David S. Miller +- +- * configure.in, configure: Fix SPARC test in previous change. +- +-2002-04-29 Gerhard Tonn +- +- * Makefile.am: Add Linux for S/390 support. +- * Makefile.in: Regenerate. +- * configure.in: Add Linux for S/390 support. +- * configure: Regenerate. +- * include/ffi.h.in: Add Linux for S/390 support. +- * src/s390/ffi.c: New file from libffi CVS tree. +- * src/s390/sysv.S: New file from libffi CVS tree. +- +-2002-04-28 Jakub Jelinek +- +- * configure.in (HAVE_AS_SPARC_UA_PCREL): Check for working +- %r_disp32(). +- * src/sparc/v8.S: Use it. +- * src/sparc/v9.S: Likewise. +- * fficonfig.h.in: Rebuilt. +- * configure: Rebuilt. +- +-2002-04-08 Hans Boehm +- +- * src/java_raw_api.c (ffi_java_raw_size): Handle FFI_TYPE_DOUBLE +- correctly. +- * src/ia64/unix.S: Add unwind information. Fix comments. +- Save sp in a way that's compatible with unwind info. +- (ffi_call_unix): Correctly restore sp in all cases. +- * src/ia64/ffi.c: Add, fix comments. +- +-2002-04-08 Jakub Jelinek +- +- * src/sparc/v8.S: Make .eh_frame dependent on target word size. +- +-2002-04-06 Jason Thorpe +- +- * configure.in (alpha*-*-netbsd*): Add target. +- * configure: Regenerate. +- +-2002-04-04 Jeff Sturm +- +- * src/sparc/v8.S: Add unwind info. +- * src/sparc/v9.S: Likewise. +- +-2002-03-30 Krister Walfridsson +- +- * configure.in: Enable i*86-*-netbsdelf*. +- * configure: Rebuilt. +- +-2002-03-29 David Billinghurst +- +- PR other/2620 +- * src/mips/n32.s: Delete +- * src/mips/o32.s: Delete +- +-2002-03-21 Loren J. Rittle +- +- * configure.in: Enable alpha*-*-freebsd*. +- * configure: Rebuilt. +- +-2002-03-17 Bryce McKinlay +- +- * Makefile.am: libfficonvenience -> libffi_convenience. +- * Makefile.in: Rebuilt. +- +- * Makefile.am: Define ffitest_OBJECTS. +- * Makefile.in: Rebuilt. +- +-2002-03-07 Andreas Tobler +- David Edelsohn +- +- * Makefile.am (EXTRA_DIST): Add Darwin and AIX closure files. +- (TARGET_SRC_POWERPC_AIX): Add aix_closure.S. +- (TARGET_SRC_POWERPC_DARWIN): Add darwin_closure.S. +- * Makefile.in: Regenerate. +- * include/ffi.h.in: Add AIX and Darwin closure definitions. +- * src/powerpc/ffi_darwin.c (ffi_prep_closure): New function. +- (flush_icache, flush_range): New functions. +- (ffi_closure_helper_DARWIN): New function. +- * src/powerpc/aix_closure.S: New file. +- * src/powerpc/darwin_closure.S: New file. +- +-2002-02-24 Jeff Sturm +- +- * include/ffi.h.in: Add typedef for ffi_arg. +- * src/ffitest.c (main): Declare rint with ffi_arg. +- +-2002-02-21 Andreas Tobler +- +- * src/powerpc/ffi_darwin.c (ffi_prep_args): Skip appropriate +- number of GPRs for floating-point arguments. +- +-2002-01-31 Anthony Green +- +- * configure: Rebuilt. +- * configure.in: Replace CHECK_SIZEOF and endian tests with +- cross-compiler friendly macros. +- * aclocal.m4 (AC_COMPILE_CHECK_SIZEOF, AC_C_BIGENDIAN_CROSS): New +- macros. +- +-2002-01-18 David Edelsohn +- +- * src/powerpc/darwin.S (_ffi_call_AIX): New. +- * src/powerpc/aix.S (ffi_call_DARWIN): New. +- +-2002-01-17 David Edelsohn +- +- * Makefile.am (EXTRA_DIST): Add Darwin and AIX files. +- (TARGET_SRC_POWERPC_AIX): New. +- (POWERPC_AIX): New stanza. +- * Makefile.in: Regenerate. +- * configure.in: Add AIX case. +- * configure: Regenerate. +- * include/ffi.h.in (ffi_abi): Add FFI_AIX. +- * src/powerpc/ffi_darwin.c (ffi_status): Use "long" to scale frame +- size. Fix "long double" support. +- (ffi_call): Add FFI_AIX case. +- * src/powerpc/aix.S: New. +- +-2001-10-09 John Hornkvist +- +- Implement Darwin PowerPC ABI. +- * configure.in: Handle powerpc-*-darwin*. +- * Makefile.am: Set source files for POWERPC_DARWIN. +- * configure: Rebuilt. +- * Makefile.in: Rebuilt. +- * include/ffi.h.in: Define FFI_DARWIN and FFI_DEFAULT_ABI for +- POWERPC_DARWIN. +- * src/powerpc/darwin.S: New file. +- * src/powerpc/ffi_darwin.c: New file. +- +-2001-10-07 Joseph S. Myers +- +- * src/x86/ffi.c: Fix spelling error of "separate" as "seperate". +- +-2001-07-16 Rainer Orth +- +- * src/x86/sysv.S: Avoid gas-only .balign directive. +- Use C style comments. +- +-2001-07-16 Rainer Orth +- +- * src/alpha/ffi.c (ffi_prep_closure): Avoid gas-only mnemonic. +- Fixes PR bootstrap/3563. +- +-2001-06-26 Rainer Orth +- +- * src/alpha/osf.S (ffi_closure_osf): Use .rdata for ECOFF. +- +-2001-06-25 Rainer Orth +- +- * configure.in: Recognize sparc*-sun-* host. +- * configure: Regenerate. +- +-2001-06-06 Andrew Haley +- +- * src/alpha/osf.S (__FRAME_BEGIN__): Conditionalize for ELF. +- +-2001-06-03 Andrew Haley +- +- * src/alpha/osf.S: Add unwind info. +- * src/powerpc/sysv.S: Add unwind info. +- * src/powerpc/ppc_closure.S: Likewise. +- +-2000-05-31 Jeff Sturm +- +- * configure.in: Fix AC_ARG_ENABLE usage. +- * configure: Rebuilt. +- +-2001-05-06 Bryce McKinlay +- +- * configure.in: Remove warning about beta code. +- * configure: Rebuilt. +- +-2001-04-25 Hans Boehm +- +- * src/ia64/unix.S: Restore stack pointer when returning from +- ffi_closure_UNIX. +- * src/ia64/ffi.c: Fix typo in comment. +- +-2001-04-18 Jim Wilson +- +- * src/ia64/unix.S: Delete unnecessary increment and decrement of loc2 +- to eliminate RAW DV. +- +-2001-04-12 Bryce McKinlay +- +- * Makefile.am: Make a libtool convenience library. +- * Makefile.in: Rebuilt. +- +-2001-03-29 Bryce McKinlay +- +- * configure.in: Use different syntax for subdirectory creation. +- * configure: Rebuilt. +- +-2001-03-27 Jon Beniston +- +- * configure.in: Added X86_WIN32 target (Win32, CygWin, MingW). +- * configure: Rebuilt. +- * Makefile.am: Added X86_WIN32 target support. +- * Makefile.in: Rebuilt. +- +- * include/ffi.h.in: Added X86_WIN32 target support. +- +- * src/ffitest.c: Doesn't run structure tests for X86_WIN32 targets. +- * src/types.c: Added X86_WIN32 target support. +- +- * src/x86/win32.S: New file. Based on sysv.S, but with EH +- stuff removed and made to work with CygWin's gas. +- +-2001-03-26 Bryce McKinlay +- +- * configure.in: Make target subdirectory in build dir. +- * Makefile.am: Override suffix based rules to specify correct output +- subdirectory. +- * Makefile.in: Rebuilt. +- * configure: Rebuilt. +- +-2001-03-23 Kevin B Hendricks +- +- * src/powerpc/ppc_closure.S: New file. +- * src/powerpc/ffi.c (ffi_prep_args): Fixed ABI compatibility bug +- involving long long and register pairs. +- (ffi_prep_closure): New function. +- (flush_icache): Likewise. +- (ffi_closure_helper_SYSV): Likewise. +- * include/ffi.h.in (FFI_CLOSURES): Define on PPC. +- (FFI_TRAMPOLINE_SIZE): Likewise. +- (FFI_NATIVE_RAW_API): Likewise. +- * Makefile.in: Rebuilt. +- * Makefile.am (EXTRA_DIST): Added src/powerpc/ppc_closure.S. +- (TARGET_SRC_POWERPC): Likewise. +- +-2001-03-19 Tom Tromey +- +- * Makefile.in: Rebuilt. +- * Makefile.am (ffitest_LDFLAGS): New macro. +- +-2001-03-02 Nick Clifton +- +- * include/ffi.h.in: Remove RCS ident string. +- * include/ffi_mips.h: Remove RCS ident string. +- * src/debug.c: Remove RCS ident string. +- * src/ffitest.c: Remove RCS ident string. +- * src/prep_cif.c: Remove RCS ident string. +- * src/types.c: Remove RCS ident string. +- * src/alpha/ffi.c: Remove RCS ident string. +- * src/alpha/osf.S: Remove RCS ident string. +- * src/arm/ffi.c: Remove RCS ident string. +- * src/arm/sysv.S: Remove RCS ident string. +- * src/mips/ffi.c: Remove RCS ident string. +- * src/mips/n32.S: Remove RCS ident string. +- * src/mips/o32.S: Remove RCS ident string. +- * src/sparc/ffi.c: Remove RCS ident string. +- * src/sparc/v8.S: Remove RCS ident string. +- * src/sparc/v9.S: Remove RCS ident string. +- * src/x86/ffi.c: Remove RCS ident string. +- * src/x86/sysv.S: Remove RCS ident string. +- +-2001-02-08 Joseph S. Myers +- +- * include/ffi.h.in: Change sourceware.cygnus.com references to +- gcc.gnu.org. +- +-2000-12-09 Richard Henderson +- +- * src/alpha/ffi.c (ffi_call): Simplify struct return test. +- (ffi_closure_osf_inner): Index rather than increment avalue +- and arg_types. Give ffi_closure_osf the raw return value type. +- * src/alpha/osf.S (ffi_closure_osf): Handle return value type +- promotion. +- +-2000-12-07 Richard Henderson +- +- * src/raw_api.c (ffi_translate_args): Fix typo. +- (ffi_prep_closure): Likewise. +- +- * include/ffi.h.in [ALPHA]: Define FFI_CLOSURES and +- FFI_TRAMPOLINE_SIZE. +- * src/alpha/ffi.c (ffi_prep_cif_machdep): Adjust minimal +- cif->bytes for new ffi_call_osf implementation. +- (ffi_prep_args): Absorb into ... +- (ffi_call): ... here. Do all stack allocation here and +- avoid a callback function. +- (ffi_prep_closure, ffi_closure_osf_inner): New. +- * src/alpha/osf.S (ffi_call_osf): Reimplement with no callback. +- (ffi_closure_osf): New. +- +-2000-09-10 Alexandre Oliva +- +- * config.guess, config.sub, install-sh: Removed. +- * ltconfig, ltmain.sh, missing, mkinstalldirs: Likewise. +- * Makefile.in: Rebuilt. +- +- * acinclude.m4: Include libtool macros from the top level. +- * aclocal.m4, configure: Rebuilt. +- +-2000-08-22 Alexandre Oliva +- +- * configure.in [i*86-*-freebsd*] (TARGET, TARGETDIR): Set. +- * configure: Rebuilt. +- +-2000-05-11 Scott Bambrough +- +- * libffi/src/arm/sysv.S (ffi_call_SYSV): Doubles are not saved to +- memory correctly. Use conditional instructions, not branches where +- possible. +- +-2000-05-04 Tom Tromey +- +- * configure: Rebuilt. +- * configure.in: Match `arm*-*-linux-*'. +- From Chris Dornan . +- +-2000-04-28 Jakub Jelinek +- +- * Makefile.am (SUBDIRS): Define. +- (AM_MAKEFLAGS): Likewise. +- (Multilib support.): Add section. +- * Makefile.in: Rebuilt. +- * ltconfig (extra_compiler_flags, extra_compiler_flags_value): +- New variables. Set for gcc using -print-multi-lib. Export them +- to libtool. +- (sparc64-*-linux-gnu*): Use libsuff 64 for search paths. +- * ltmain.sh (B|b|V): Don't throw away gcc's -B, -b and -V options +- for -shared links. +- (extra_compiler_flags_value, extra_compiler_flags): Check these +- for extra compiler options which need to be passed down in +- compiler_flags. +- +-2000-04-16 Anthony Green +- +- * configure: Rebuilt. +- * configure.in: Change i*86-pc-linux* to i*86-*-linux*. +- +-2000-04-14 Jakub Jelinek +- +- * include/ffi.h.in (SPARC64): Define for 64bit SPARC builds. +- Set SPARC FFI_DEFAULT_ABI based on SPARC64 define. +- * src/sparc/ffi.c (ffi_prep_args_v8): Renamed from ffi_prep_args. +- Replace all void * sizeofs with sizeof(int). +- Only compare type with FFI_TYPE_LONGDOUBLE if LONGDOUBLE is +- different than DOUBLE. +- Remove FFI_TYPE_SINT32 and FFI_TYPE_UINT32 cases (handled elsewhere). +- (ffi_prep_args_v9): New function. +- (ffi_prep_cif_machdep): Handle V9 ABI and long long on V8. +- (ffi_V9_return_struct): New function. +- (ffi_call): Handle FFI_V9 ABI from 64bit code and FFI_V8 ABI from +- 32bit code (not yet cross-arch calls). +- * src/sparc/v8.S: Add struct return delay nop. +- Handle long long. +- * src/sparc/v9.S: New file. +- * src/prep_cif.c (ffi_prep_cif): Return structure pointer +- is used on sparc64 only for structures larger than 32 bytes. +- Pass by reference for structures is done for structure arguments +- larger than 16 bytes. +- * src/ffitest.c (main): Use 64bit rint on sparc64. +- Run long long tests on sparc. +- * src/types.c (FFI_TYPE_POINTER): Pointer is 64bit on alpha and +- sparc64. +- (FFI_TYPE_LONGDOUBLE): long double is 128 bit aligned to 128 bits +- on sparc64. +- * configure.in (sparc-*-linux*): New supported target. +- (sparc64-*-linux*): Likewise. +- * configure: Rebuilt. +- * Makefile.am: Add v9.S to SPARC files. +- * Makefile.in: Likewise. +- (LINK): Surround $(CCLD) into double quotes, so that multilib +- compiles work correctly. +- +-2000-04-04 Alexandre Petit-Bianco +- +- * configure: Rebuilt. +- * configure.in: (i*86-*-solaris*): New libffi target. Patch +- proposed by Bryce McKinlay. +- +-2000-03-20 Tom Tromey +- +- * Makefile.in: Hand edit for java_raw_api.lo. +- +-2000-03-08 Bryce McKinlay +- +- * config.guess, config.sub: Update from the gcc tree. +- Fix for PR libgcj/168. +- +-2000-03-03 Tom Tromey +- +- * Makefile.in: Fixed ia64 by hand. +- +- * configure: Rebuilt. +- * configure.in (--enable-multilib): New option. +- (libffi_basedir): New subst. +- (AC_OUTPUT): Added multilib code. +- +-2000-03-02 Tom Tromey +- +- * Makefile.in: Rebuilt. +- * Makefile.am (TARGET_SRC_IA64): Use `ia64', not `alpha', as +- directory name. +- +-2000-02-25 Hans Boehm +- +- * src/ia64/ffi.c, src/ia64/ia64_flags.h, src/ia64/unix.S: New +- files. +- * src/raw_api.c (ffi_translate_args): Fixed typo in argument +- list. +- (ffi_prep_raw_closure): Use ffi_translate_args, not +- ffi_closure_translate. +- * src/java_raw_api.c: New file. +- * src/ffitest.c (closure_test_fn): New function. +- (main): Define `rint' as long long on IA64. Added new test when +- FFI_CLOSURES is defined. +- * include/ffi.h.in (ALIGN): Use size_t, not unsigned. +- (ffi_abi): Recognize IA64. +- (ffi_raw): Added `flt' field. +- Added "Java raw API" code. +- * configure.in: Recognize ia64. +- * Makefile.am (TARGET_SRC_IA64): New macro. +- (libffi_la_common_SOURCES): Added java_raw_api.c. +- (libffi_la_SOURCES): Define in IA64 case. +- +-2000-01-04 Tom Tromey +- +- * Makefile.in: Rebuilt with newer automake. +- +-1999-12-31 Tom Tromey +- +- * Makefile.am (INCLUDES): Added -I$(top_srcdir)/src. +- +-1999-09-01 Tom Tromey +- +- * include/ffi.h.in: Removed PACKAGE and VERSION defines and +- undefs. +- * fficonfig.h.in: Rebuilt. +- * configure: Rebuilt. +- * configure.in: Pass 3rd argument to AM_INIT_AUTOMAKE. +- Use AM_PROG_LIBTOOL (automake 1.4 compatibility). +- * acconfig.h: Don't #undef PACKAGE or VERSION. +- +-1999-08-09 Anthony Green +- +- * include/ffi.h.in: Try to work around messy header problem +- with PACKAGE and VERSION. +- +- * configure: Rebuilt. +- * configure.in: Change version to 2.00-beta. +- +- * fficonfig.h.in: Rebuilt. +- * acconfig.h (FFI_NO_STRUCTS, FFI_NO_RAW_API): Define. +- +- * src/x86/ffi.c (ffi_raw_call): Rename. +- +-1999-08-02 Kresten Krab Thorup +- +- * src/x86/ffi.c (ffi_closure_SYSV): New function. +- (ffi_prep_incoming_args_SYSV): Ditto. +- (ffi_prep_closure): Ditto. +- (ffi_closure_raw_SYSV): Ditto. +- (ffi_prep_raw_closure): More ditto. +- (ffi_call_raw): Final ditto. +- +- * include/ffi.h.in: Add definitions for closure and raw API. +- +- * src/x86/ffi.c (ffi_prep_cif_machdep): Added case for +- FFI_TYPE_UINT64. +- +- * Makefile.am (libffi_la_common_SOURCES): Added raw_api.c +- +- * src/raw_api.c: New file. +- +- * include/ffi.h.in (ffi_raw): New type. +- (UINT_ARG, SINT_ARG): New defines. +- (ffi_closure, ffi_raw_closure): New types. +- (ffi_prep_closure, ffi_prep_raw_closure): New declarations. +- +- * configure.in: Add check for endianness and sizeof void*. +- +- * src/x86/sysv.S (ffi_call_SYSV): Call fixup routine via argument, +- instead of directly. +- +- * configure: Rebuilt. +- +-Thu Jul 8 14:28:42 1999 Anthony Green +- +- * configure.in: Add x86 and powerpc BeOS configurations. +- From Makoto Kato . +- +-1999-05-09 Anthony Green +- +- * configure.in: Add warning about this being beta code. +- Remove src/Makefile.am from the picture. +- * configure: Rebuilt. +- +- * Makefile.am: Move logic from src/Makefile.am. Add changes +- to support libffi as a target library. +- * Makefile.in: Rebuilt. +- +- * aclocal.m4, config.guess, config.sub, ltconfig, ltmain.sh: +- Upgraded to new autoconf, automake, libtool. +- +- * README: Tweaks. +- +- * LICENSE: Update copyright date. +- +- * src/Makefile.am, src/Makefile.in: Removed. +- +-1998-11-29 Anthony Green +- +- * include/ChangeLog: Removed. +- * src/ChangeLog: Removed. +- * src/mips/ChangeLog: Removed. +- * src/sparc/ChangeLog: Remboved. +- * src/x86/ChangeLog: Removed. +- +- * ChangeLog.v1: Created. ++commit 0403f332b1f478696c30d3d8a0e2f6eef24aaf88 ++Author: Anthony Green ++Date: Mon May 19 09:41:32 2014 -0400 ++ ++ Update date. Annoucing 3.1 today. ++ ++commit 94ac0c168ee7b115409121d88b25a4979446c8da ++Author: Anthony Green ++Date: Mon May 19 09:37:21 2014 -0400 ++ ++ Increment libtool library revision number ++ ++commit 57465744b6e1295d7202de5a7734df589518f1c8 ++Author: Anthony Green ++Date: Sun May 11 10:30:22 2014 -0400 ++ ++ Update to version 3.1 ++ ++commit 0c2251a42df5108b6d9ebe5fe1cf83d0bcdf660e ++Author: Anthony Green ++Date: Sun May 11 10:22:30 2014 -0400 ++ ++ Support versions of git older than 1.8.5 ++ ++commit 70c303cb88e23aaee91c87c56b108c50ab4f3c2f ++Author: Anthony Green ++Date: Sun May 11 09:56:40 2014 -0400 ++ ++ Fix testsuite for GCC 4.9.0 ++ ++commit 52b3457093ed19b2a7c5fcf243c4014c90ce6225 ++Author: Magnus Granberg ++Date: Sun May 11 09:55:28 2014 -0400 ++ ++ Check /proc/self/status for PaX status. ++ ++commit 7ba4c5d72aa440a4b21fb57e999e67c5957761da ++Author: Dominik Vogt ++Date: Sun May 11 09:52:47 2014 -0400 ++ ++ Use to get correct dir ++ ++commit 31e0d4ecff6dc2a6c75a066ee099b52a43f6ba27 ++Merge: 1c0e9a7 99909eb ++Author: Anthony Green ++Date: Wed Apr 23 19:24:47 2014 -0400 ++ ++ Merge pull request #119 from joshtriplett/fastcall-fastball ++ ++ src/x86/win32.S: Define ffi_closure_FASTCALL in the MASM section, too ++ ++commit 99909eb6184b62408d88b6b4e7ab38e84e6d0bf3 ++Author: Josh Triplett ++Date: Tue Apr 22 21:17:52 2014 -0700 ++ ++ src/x86/win32.S: Define ffi_closure_FASTCALL in the MASM section, too ++ ++commit 1c0e9a7297ced15413c2d2d5d35f6c650c4b46c9 ++Merge: 93a24f2 d369522 ++Author: Anthony Green ++Date: Mon Apr 21 12:41:56 2014 -0400 ++ ++ Merge pull request #101 from joshtriplett/fastcall-closures ++ ++ Support closures for fastcall ++ ++commit d36952273d4fafbda91ecc205fc0824f7cc65e70 ++Author: Josh Triplett ++Date: Sun Apr 20 12:03:25 2014 -0700 ++ ++ Support fastcall closures ++ ++ libffi on 32-bit x86 now supports closures for all supported ABIs. ++ Thus, rewrite the last remaining duplicated-by-ABI test (closure_stdcall ++ and closure_thiscall) to use the generic ABI_NUM/ABI_ATTR mechanism. ++ ++commit 93a24f216bcdd1018b976d697179c6d49004015a ++Merge: dd11a04 2349fec ++Author: Anthony Green ++Date: Sat Apr 12 19:38:07 2014 -0400 ++ ++ Merge pull request #80 from ueno/devel ++ ++ Fix typo in doc ++ ++commit dd11a04061cb49ce1d702545693c24eb1267d648 ++Merge: 8fa2812 03ca880 ++Author: Anthony Green ++Date: Sat Apr 12 19:37:21 2014 -0400 ++ ++ Merge pull request #86 from joshtriplett/testsuite-CC-CXX ++ ++ testsuite ignores CC parameter supplied to configure or make ++ ++commit 8fa2812355e685a42abf9a62fbc674d616b2edee ++Merge: 8a58e6b 419503f ++Author: Anthony Green ++Date: Sat Apr 12 19:32:08 2014 -0400 ++ ++ Merge pull request #116 from frida/fix/darwin-aarch64-variadic ++ ++ Fix handling of variadic calls on Darwin/AArch64 ++ ++commit 8a58e6b7805b736def197b8baf8e465a2a3f6913 ++Merge: 30b77c5 a539f7f ++Author: Anthony Green ++Date: Sat Apr 12 19:30:18 2014 -0400 ++ ++ Merge pull request #115 from frida/fix/darwin-aarch64-alignment ++ ++ Fix alignment of AArch64 assembler functions ++ ++commit 30b77c56f95c63ecd83399aafdbad7b07330f2fd ++Merge: dc33cb3 3e2b84d ++Author: Anthony Green ++Date: Sat Apr 12 19:29:13 2014 -0400 ++ ++ Merge pull request #117 from frida/fix/windows-regression ++ ++ Fix Windows regression ++ ++commit 3e2b84d295531720917bf46afc532fc6d877e3ec ++Author: Ole André Vadla Ravnås ++Date: Sat Apr 12 01:04:04 2014 +0200 ++ ++ Fix Windows regression ++ ++ Introduced by b5fed601948237037513a9b7f967c8fc6c9ff1f6. ++ ++commit 419503f409c321fe31ff59d963ef34bb913420d0 ++Author: Ole André Vadla Ravnås ++Date: Sun Apr 6 20:54:13 2014 +0200 ++ ++ Fix handling of variadic calls on Darwin/AArch64 ++ ++commit a539f7ffd6783aa11353d13265520e453c565fb4 ++Author: Ole André Vadla Ravnås ++Date: Sun Apr 6 20:53:02 2014 +0200 ++ ++ Fix alignment of AArch64 assembler functions ++ ++commit dc33cb3c998da521a960385c1269c3aef552f69f ++Merge: c860a99 b5fed60 ++Author: Anthony Green ++Date: Sat Apr 5 23:41:22 2014 -0400 ++ ++ Merge pull request #114 from joshtriplett/bounce-on-a-tiny-trampoline ++ ++ Fix ABI on 32-bit non-Windows x86: go back to trampoline size 10 ++ ++commit b5fed601948237037513a9b7f967c8fc6c9ff1f6 ++Author: Josh Triplett ++Date: Sat Apr 5 17:33:42 2014 -0700 ++ ++ Fix ABI on 32-bit non-Windows x86: go back to trampoline size 10 ++ ++ The trampoline size is part of the ABI, so it cannot change. Move the ++ logic from the stdcall and thiscall trampolines to the functions they ++ call, to reduce them both to 10 bytes. ++ ++ This drops the previously added support for raw THISCALL closures on ++ non-Windows. (Non-raw THISCALL closures still work.) ++ ++commit 03ca880081b22efab09ba72268270f83017d3d7b ++Author: Josh Triplett ++Date: Thu Mar 27 08:44:34 2014 -0700 ++ ++ README: Note the testsuite changes to respect $CC and $CXX ++ ++commit d74df8c5d8c6722ecb908da98c86cc8e2c755b84 ++Author: Josh Triplett ++Date: Thu Mar 27 00:44:12 2014 -0700 ++ ++ README: Update Windows example to set both CC and CXX ++ ++commit 7d698125b1f05173f3656a89755a2eb58813b002 ++Author: Josh Triplett ++Date: Wed Mar 26 23:17:56 2014 -0700 ++ ++ Use the proper C++ compiler to run C++ tests ++ ++ Running the C compiler with -shared-libgcc -lstdc++ does not work on ++ non-GCC compilers. ++ ++commit fa5e88f170cb37c7b2b9bb015c8c5b854ffd8a3e ++Author: Josh Triplett ++Date: Wed Mar 26 23:53:57 2014 -0700 ++ ++ .travis.yml: Make the build command more readable by splitting at && ++ ++ "script" can contain multiple commands to run in sequence. ++ ++commit 0c3824702d3d59d37f8c177d646303f546187683 ++Author: Josh Triplett ++Date: Wed Mar 26 14:51:32 2014 -0700 ++ ++ Always set CC_FOR_TARGET for dejagnu, to make the testsuite respect $CC ++ ++ This fixes cross-compilation and compilation with CC="gcc -m32". ++ ++commit 9946a92af31b30cb7760150d1f8ca6c11b01aeea ++Author: Josh Triplett ++Date: Wed Mar 26 20:18:58 2014 -0700 ++ ++ Stop looking for expect and runtest above top_builddir ++ ++ Users wishing to test hand-compiled versions of expect and runtest can ++ easily enough put them in their path or set EXPECT and RUNTEST ++ themselves. ++ ++commit acb202325215058639234efb7af1f04c1c8a1f44 ++Author: Josh Triplett ++Date: Wed Mar 26 20:18:41 2014 -0700 ++ ++ Stop setting an empty AM_RUNTESTFLAGS ++ ++commit c860a992fef5d7cd7bb0975b1632d17a9fafe007 ++Author: Anthony Green ++Date: Tue Mar 25 17:02:51 2014 -0400 ++ ++ Upgrade version to 3.1-rc1 ++ ++commit 9837073e6203048a162a226798c5d252600219ed ++Author: Anthony Green ++Date: Tue Mar 25 16:24:14 2014 -0400 ++ ++ Update copyright date and clean up README notes. ++ ++commit 18d3baa9f597b026675baa1b4e5a5eeef7577a08 ++Merge: afee537 f0c8a31 ++Author: Anthony Green ++Date: Tue Mar 25 16:12:53 2014 -0400 ++ ++ Merge pull request #108 from joshtriplett/freebsd ++ ++ [3.1 blocker] Fix FreeBSD support ++ ++commit afee53738a995e23bd2f89fd0f7b30b380566106 ++Merge: 7d24785 b2d610e ++Author: Anthony Green ++Date: Tue Mar 25 16:12:35 2014 -0400 ++ ++ Merge pull request #106 from joshtriplett/darwin-award ++ ++ [3.1 blocker] Update OS X build system to include win32.S on 32-bit ++ ++commit 7d2478568ed9f03cbf57627f449a2d2cf4d1571c ++Merge: beab5f3 56be47f ++Author: Anthony Green ++Date: Tue Mar 25 16:12:17 2014 -0400 ++ ++ Merge pull request #110 from joshtriplett/w64 ++ ++ Fix 64-bit Windows support ++ ++commit beab5f334d9ec5b8b91d1cc727d1029b40358e7e ++Merge: 28fb197 ef5890e ++Author: Anthony Green ++Date: Tue Mar 25 16:07:47 2014 -0400 ++ ++ Merge pull request #105 from joshtriplett/win32-relocations ++ ++ [3.1 blocker] win32.S needs to handle relocations/GOT ++ ++commit f0c8a31577172104049283f0a80c723084a5bd77 ++Author: Josh Triplett ++Date: Mon Mar 24 22:14:26 2014 -0700 ++ ++ Compile win32.S on FreeBSD ++ ++commit b2d610e028b5ce48d1ad7e5d0debc9c321d891b2 ++Author: Josh Triplett ++Date: Fri Mar 21 11:10:13 2014 -0700 ++ ++ Compile win32.S on 32-bit Darwin as well ++ ++commit be50b87a490e794362cb4a27ada2fbaab202adb8 ++Author: Josh Triplett ++Date: Mon Mar 24 21:44:13 2014 -0700 ++ ++ Always use configure to detect whether global symbols need underscores ++ ++ 64-bit Windows already used this check; make it universal, and use it in ++ place of an ifdef on X86_WIN32, to handle non-Windows platforms that use ++ the underscore, such as Darwin. ++ ++commit 56be47f87629e31afbcb0774aa65735f539ee972 ++Author: Josh Triplett ++Date: Mon Mar 24 21:24:53 2014 -0700 ++ ++ Fix a warning on 64-bit Windows ++ ++ When sizeof(size_t) != sizeof(unsigned), adding a size_t to cif->bytes ++ produces a "possible loss of data" warning. However, the size_t in ++ question refers to the size of a single parameter. Use a cast to avoid ++ the warning. ++ ++commit 48a8eda74aad8a21b6f26df5df08fe64c043d208 ++Author: Josh Triplett ++Date: Mon Mar 24 21:21:12 2014 -0700 ++ ++ Avoid referencing undefined ABIs on 64-bit Windows builds ++ ++ 64-bit Windows does not have FFI_STDCALL, FFI_THISCALL, or FFI_FASTCALL. ++ ++commit f0f4138f90345d7d67dfa6783a7e1c7cc30d3c6f ++Author: Josh Triplett ++Date: Sat Mar 22 10:00:53 2014 -0700 ++ ++ win32.S: Add handling for position-independent code on Darwin ++ ++ Newer versions of Darwin generate the necessary stub functions ++ automatically and just need a call instruction, but accomodating older ++ versions as well requires adding the stub. ++ ++commit ef5890ebafb7cd2fbf9acf161edb55fe1382871c ++Author: Josh Triplett ++Date: Fri Mar 21 11:01:39 2014 -0700 ++ ++ win32.S: Use shifting for multiplication rather than repeated addition ++ ++ The jump table code added a register to itself twice to multiply by 4; ++ shift the register left by 2 instead. ++ ++commit 4fca48901e7e4f53bf490ed22607b2d2d8f4bfcc ++Author: Josh Triplett ++Date: Fri Mar 21 11:00:41 2014 -0700 ++ ++ win32.S: Make the jump tables position-independent ++ ++ Now that non-Windows platforms include win32.S, it needs to support ++ building as position-independent code. This fixes build failures on ++ target platforms that do not allow text relocations. ++ ++commit 2087dcf736274286f76c69d3988fb6d7cc4fd0f5 ++Author: Josh Triplett ++Date: Fri Mar 21 10:57:06 2014 -0700 ++ ++ win32.S: Make calls to ffi_closure_SYSV_inner position-independent ++ ++ Now that non-Windows platforms include win32.S, it needs to support ++ building as position-independent code. This fixes one source of build ++ failures on target platforms that do not allow text relocations. ++ ++commit 28fb197079cf1d11da4eef7c8c243ab05590c528 ++Merge: c697472 c3dd0a1 ++Author: Anthony Green ++Date: Tue Mar 18 12:19:36 2014 -0400 ++ ++ Merge pull request #107 from rvandermeulen/msvcc ++ ++ Various compatibility fixes and improvements to msvcc.sh. ++ ++commit c3dd0a1a0245fc174361a70876e88ae24285f861 ++Author: Ryan VanderMeulen ++Date: Tue Mar 18 12:09:45 2014 -0400 ++ ++ Various compatibility fixes and improvements to msvcc.sh. ++ ++ * Don't try to mix incompatible optimization flags in debug builds. ++ * Workaround ax_cc_maxopt.m4 not supporting MSVC and change -O3 to -O2. ++ * Fix MSVC warning by properly passing linker flags to compiler. ++ * Make msvcc.sh return 1 if invalid command line options are used rather than silently eating them. ++ * Add more comments. ++ ++commit c697472fccfbb5b87b007c053cda9ef014b346b9 ++Merge: 83fd2bc e48918e ++Author: Anthony Green ++Date: Mon Mar 17 00:32:42 2014 -0400 ++ ++ Merge pull request #102 from joshtriplett/test-generic ++ ++ Add ABIs to the test matrix; unify many bits of the testsuite ++ ++commit e48918ecf876bc85d040fc50a232059c566553a8 ++Author: Josh Triplett ++Date: Sun Mar 16 20:29:27 2014 -0700 ++ ++ testsuite: Add ABIs to the test matrix; unify tests across ABIs ++ ++ This eliminates all the *_win32.c tests in favor of the tests they were ++ branched from, and expands test coverage to run many more tests on ++ stdcall, thiscall, and fastcall. ++ ++ This same mechanism also supports testing any other target that has ++ multiple ABIs. ++ ++commit 4d4d368e5a55d9443c4c53b1b70d58ab6d8c941c ++Author: Josh Triplett ++Date: Sun Mar 16 17:02:05 2014 -0700 ++ ++ testsuite: Replace ffitestcxx.h with ffitest.h ++ ++ ffitest.h contains a superset of the functionality of ffitestcxx.h; ++ make the C++ tests include ffitest.h instead, and remove ffitestcxx.h. ++ ++commit 3f97cf3413c46caf2a79f32ac9cda4620972c2d7 ++Author: Josh Triplett ++Date: Sun Mar 16 16:53:42 2014 -0700 ++ ++ testsuite: Unify the C and C++ testsuites ++ ++ These two testsuites differ only in the source file glob and a couple of ++ additional compiler options; unify the remaining bits. ++ ++commit 0d9cce8edb937bbe771a6cdd25f671edf06d2128 ++Author: Josh Triplett ++Date: Sun Mar 16 16:22:58 2014 -0700 ++ ++ testsuite: ffitest.h: Parenthesize the CHECK macro ++ ++commit 5695ec1444c5323e48fe4314f8c8f027625e67df ++Author: Josh Triplett ++Date: Sun Mar 16 16:04:58 2014 -0700 ++ ++ testsuite: Factor out a function to run a matrix of tests ++ ++ This commons up code from libffi.call/call.exp and ++ libffi.special/special.exp, unifies the optimization option matrix ++ between the two, and makes it easier to add more axes to the matrix ++ in the future. ++ ++commit dfdb02cc869855d3b68571e5f7aa77ae8c9d254a ++Author: Josh Triplett ++Date: Sun Mar 16 15:26:26 2014 -0700 ++ ++ testsuite: Introduce a __THISCALL__ compiler-specific macro ++ ++commit 83fd2bce0456224483435d4b764063f4513fd464 ++Merge: 3658a07 06ff924 ++Author: Anthony Green ++Date: Sun Mar 16 22:03:29 2014 -0400 ++ ++ Merge pull request #99 from joshtriplett/gitignore ++ ++ .gitignore: Ignore more generated files ++ ++commit 3658a0700a50d37a2fdba04fd9d79ad2f706d9f5 ++Merge: d948d0a 46c5d3c ++Author: Anthony Green ++Date: Sun Mar 16 21:37:42 2014 -0400 ++ ++ Merge pull request #100 from rvandermeulen/bug-756740 ++ ++ Change double quotes in Makefile.am to single quotes. ++ ++commit 46c5d3c30fdc2b43c076ad955078d7c5f1e75b37 ++Author: Ryan VanderMeulen ++Date: Sun Mar 16 21:16:08 2014 -0400 ++ ++ Change double quotes in Makefile.am to single quotes. ++ ++ This was originally done in PR #84, except the change was made to Makefile.in instead of Makefile.am and was therefore reverted the next time the files were regenerated. ++ ++commit 06ff924215a2f9739efa2c059dc595bc4ec1c851 ++Author: Josh Triplett ++Date: Sun Mar 16 16:19:46 2014 -0700 ++ ++ .gitignore: Ignore more generated files ++ ++ The build process generates doc/libffi.info and fficonfig.h.in, so add ++ them to .gitignore. ++ ++commit bad8948346e9b8813023a0cc78a3b6eb8d9c14c6 ++Author: Josh Triplett ++Date: Sun Mar 16 15:16:18 2014 -0700 ++ ++ testsuite: Introduce a __STDCALL__ compiler-specific macro ++ ++ Several tests want to use stdcall, which differs in syntax by compiler, ++ so introduce a macro for it in ffitest.h. ++ ++commit 98a793fa36a4ab3ba24d059cb80a2891cdb940e1 ++Author: Josh Triplett ++Date: Sun Mar 16 15:20:36 2014 -0700 ++ ++ testsuite: Common up the ifdef blocks for compiler-specific macros ++ ++commit d948d0a729c934b0224749338a3ba0a2c8f51c45 ++Merge: b61b472 a86bd31 ++Author: Anthony Green ++Date: Sun Mar 16 10:53:48 2014 -0400 ++ ++ Merge pull request #98 from joshtriplett/unconfigure.host ++ ++ Merge configure.host into configure.ac ++ ++commit a86bd318e2424d879d784ee7b29d6536d7a17c18 ++Author: Josh Triplett ++Date: Sun Mar 16 06:58:59 2014 -0700 ++ ++ Merge configure.host into configure.ac ++ ++ configure.host only has a single entry, and shows no signs of needing ++ more added. ++ ++commit b61b472bd0647006d6685238721002017f1d119c ++Author: Anthony Green ++Date: Sun Mar 16 09:45:55 2014 -0400 ++ ++ Update version to 3.1-rc0. Clean up README. ++ ++commit 7a64e7dbba54e6e9f69954adfb943be1856ff928 ++Merge: 11a5c5c eef2e02 ++Author: Anthony Green ++Date: Sun Mar 16 09:39:08 2014 -0400 ++ ++ Merge pull request #97 from joshtriplett/remove-more-generated-files ++ ++ Remove more generated files ++ ++commit 11a5c5c39f5861011f6c5ddf795da3a32b5f0082 ++Merge: 9a62a21 1c68c07 ++Author: Anthony Green ++Date: Sun Mar 16 09:38:47 2014 -0400 ++ ++ Merge pull request #96 from joshtriplett/sawing-changelogs ++ ++ Generate ChangeLog from git in make dist; remove it from version control ++ ++commit eef2e02a13d7d1c8145d47a64467f654406a3548 ++Author: Josh Triplett ++Date: Sun Mar 16 06:26:03 2014 -0700 ++ ++ doc: Remove autogenerated info file and stamp ++ ++commit 9fb403d3c5d9643e0f561cab6d4a07b1e54907ff ++Author: Josh Triplett ++Date: Sun Mar 16 06:25:52 2014 -0700 ++ ++ fficonfig.h.in: Remove, configure generates it ++ ++commit 1c68c07217fda78a779778c1480fedef7a58d5b4 ++Author: Josh Triplett ++Date: Sun Mar 16 06:11:58 2014 -0700 ++ ++ Generate ChangeLog from git in make dist ++ ++ Archive the existing ChangeLog to ChangeLog.libffi-3.1 ++ ++commit c65ed55e655711e008282edbdd82ce95d008b4f6 ++Author: Josh Triplett ++Date: Sun Mar 16 05:52:00 2014 -0700 ++ ++ ChangeLog.v1: Fix typo in explanatory header. ++ ++commit 9a62a21f5c3a8e1da463229f3170c8ab3031d920 ++Author: Anthony Green ++Date: Sun Mar 16 09:03:57 2014 -0400 ++ ++ Add missing ChangeLog entry. Clean up some entries. ++ ++commit 9bc704c58cb7a049d867837e3a11e2e31886ec66 ++Merge: 694447a e892e58 ++Author: Anthony Green ++Date: Sun Mar 16 08:41:00 2014 -0400 ++ ++ Merge pull request #95 from joshtriplett/news ++ ++ README: Update news for 3.0.14 ++ ++commit e892e581d1838a06c18c7ecd50ebd79915cff92b ++Author: Josh Triplett ++Date: Sun Mar 16 05:38:24 2014 -0700 ++ ++ README: Update news for 3.0.14 ++ ++commit 694447aa29deadd571efb4e9a26ee3f68ede1493 ++Merge: fdc87f3 45a6c21 ++Author: Anthony Green ++Date: Sun Mar 16 08:32:05 2014 -0400 ++ ++ Merge pull request #93 from joshtriplett/travis-dist ++ ++ Make Travis check "make dist" ++ ++commit 45a6c21efa944b520842e631dc54919b04884744 ++Author: Josh Triplett ++Date: Sun Mar 16 05:29:08 2014 -0700 ++ ++ .travis.yml: Test "make dist" too. ++ ++commit fdc87f3b2ea37b58a4a9ae6c35083f544909fe3c ++Merge: 7412b83 e1911f7 ++Author: Anthony Green ++Date: Sun Mar 16 08:05:51 2014 -0400 ++ ++ Merge pull request #85 from joshtriplett/stdcall ++ ++ stdcall support on Linux ++ ++commit e1911f78df113ca58738b66089a070d4cf747de7 ++Author: Josh Triplett ++Date: Sun Mar 16 03:25:53 2014 -0700 ++ ++ Add support for stdcall, thiscall, and fastcall on non-Windows x86-32 ++ ++ Linux supports the stdcall calling convention, either via functions ++ explicitly declared with the stdcall attribute, or via code compiled ++ with -mrtd which effectively makes stdcall the default. ++ ++ This introduces FFI_STDCALL, FFI_THISCALL, and FFI_FASTCALL on ++ non-Windows x86-32 platforms, as non-default calling conventions. ++ ++commit 7412b838d543aae4fa925862bd5702d3dacbc29a ++Merge: c0cc5fd 9531d05 ++Author: Anthony Green ++Date: Sun Mar 16 07:58:16 2014 -0400 ++ ++ Merge pull request #90 from joshtriplett/win32-unifdef ++ ++ prep_cif.c: Remove unnecessary ifdef for X86_WIN32 ++ ++commit c0cc5fdaa237b67e86f22d2f6e13f3b42d9aae33 ++Merge: 98b5296 b3a5da0 ++Author: Anthony Green ++Date: Sun Mar 16 07:57:59 2014 -0400 ++ ++ Merge pull request #89 from joshtriplett/travis32 ++ ++ .travis.yml: Test on both 32-bit and 64-bit ++ ++commit 9531d05f64c2a674e0197158ffad68d69f177bd0 ++Author: Josh Triplett ++Date: Sun Mar 16 01:50:02 2014 -0700 ++ ++ prep_cif.c: Remove unnecessary ifdef for X86_WIN32 ++ ++ ffi_prep_cif_core had a special case for X86_WIN32, checking for ++ FFI_THISCALL in addition to the FFI_FIRST_ABI-to-FFI_LAST_ABI range ++ before returning FFI_BAD_ABI. However, on X86_WIN32, FFI_THISCALL ++ already falls in that range, making the special case unnecessary. ++ Remove it. ++ ++commit b3a5da068abd2f2983d9e67adbf41b0e0f34e37f ++Author: Josh Triplett ++Date: Sat Mar 15 23:27:56 2014 -0700 ++ ++ .travis.yml: Test on both 32-bit and 64-bit ++ ++commit 98b52960485a261399f081915f36063de3854a5f ++Merge: 134ce4c f6dd184 ++Author: Anthony Green ++Date: Sun Mar 16 07:51:33 2014 -0400 ++ ++ Merge pull request #94 from joshtriplett/esp-extra-stackery-perception ++ ++ ChangeLog: Document testsuite changes to remove fragile stack pointer checks ++ ++commit f6dd1845434dd53e22129becdfa092c082df307c ++Author: Josh Triplett ++Date: Sun Mar 16 04:49:36 2014 -0700 ++ ++ ChangeLog: Document testsuite changes to remove fragile stack pointer checks ++ ++commit 134ce4c0266bf994f07518fc534de53f1d3c8de8 ++Merge: 2680e9e 9c27932 ++Author: Anthony Green ++Date: Sun Mar 16 07:47:17 2014 -0400 ++ ++ Merge pull request #91 from joshtriplett/esp-extra-stackery-perception ++ ++ testsuite: Remove fragile stack pointer checks ++ ++commit 9c279328ee12fc869adff63ca81f1230977bd42b ++Author: Josh Triplett ++Date: Sun Mar 16 02:31:19 2014 -0700 ++ ++ testsuite: Remove fragile stack pointer checks ++ ++ testsuite/libffi.call/closure_stdcall.c and ++ testsuite/libffi.call/closure_thiscall.c include inline assembly to save ++ the stack pointer before and after the call, and compare the values. ++ However, compilers can and do leave the stack in different states for ++ these two pieces of inline assembly, such as by saving a temporary value ++ on the stack across the call; observed with gcc -Os, and verified as ++ spurious through careful inspection of disassembly. ++ ++commit 2680e9ea9b4c87ea8042a61e551bd667493d4bd3 ++Merge: 071eab3 82f8cb2 ++Author: Anthony Green ++Date: Sun Mar 16 07:44:08 2014 -0400 ++ ++ Merge pull request #88 from joshtriplett/such-precision-many-fail-wow ++ ++ testsuite/libffi.call/many.c: Avoid spurious failure due to excess precision ++ ++commit 82f8cb24a1d976db35ae31a4b86cec8926da327d ++Author: Josh Triplett ++Date: Sun Mar 16 04:27:32 2014 -0700 ++ ++ ChangeLog: Document many.c and many_win32.c changes to avoid spurious failures ++ ++commit 88d562a8b5912e99306063fe3bc289bab6ca6ebe ++Author: Josh Triplett ++Date: Sat Mar 15 22:08:19 2014 -0700 ++ ++ testsuite/libffi.call/many_win32.c: Avoid spurious failure due to excess precision ++ ++ The test case testsuite/libffi.call/many_win32.c can spuriously fail due ++ to excess floating-point precision. Instrumenting it with some printf ++ calls shows differences well above FLT_EPSILON. (Note when ++ instrumenting it that multiple computations of the difference, such as ++ one in a print and another in the conditional, may produce different ++ results.) ++ ++ Rather than complicating the test suite with architecture-specific flags ++ to avoid excess precision, just simplify the floating-point computation ++ to avoid a dependency on potential excess precision. ++ ++commit c00a49ecd165b2d06c1c9b249d212dc843fa116f ++Author: Josh Triplett ++Date: Sat Mar 15 22:08:19 2014 -0700 ++ ++ testsuite/libffi.call/many.c: Avoid spurious failure due to excess precision ++ ++ The test case testsuite/libffi.call/many.c can spuriously fail due to ++ excess floating-point precision. Instrumenting it with some printf ++ calls shows differences well above FLT_EPSILON. (Note when ++ instrumenting it that multiple computations of the difference, such as ++ one in a print and another in the conditional, may produce different ++ results.) ++ ++ Rather than complicating the test suite with architecture-specific flags ++ to avoid excess precision, just simplify the floating-point computation ++ to avoid a dependency on potential excess precision. ++ ++commit 071eab32a7f9fbbef46c0d8f37d9985bc9cceb37 ++Merge: 2228c7a 2f44952 ++Author: Anthony Green ++Date: Sun Mar 16 07:36:52 2014 -0400 ++ ++ Merge pull request #92 from joshtriplett/autogen ++ ++ Re-add libtool-ldflags ++ ++commit 2f44952c95765c1486fad66f57235f8d459a9748 ++Author: Josh Triplett ++Date: Sun Mar 16 04:35:12 2014 -0700 ++ ++ Re-add libtool-ldflags ++ ++commit 2228c7ab190f3c529b9018495467b841fa21cba2 ++Merge: 76d19d0 35634db ++Author: Anthony Green ++Date: Sun Mar 16 07:25:18 2014 -0400 ++ ++ Merge pull request #87 from joshtriplett/autogen ++ ++ Remove autogenerated files from the repository ++ ++commit 35634dbceaac0a1544f7385addc01d21ef1ef6a8 ++Author: Josh Triplett ++Date: Sat Mar 15 18:11:16 2014 -0700 ++ ++ Remove autogenerated files from the repository ++ ++ Add an autogen.sh to regenerate them. ++ ++commit 76d19d004e36e99d261ee78261e2f52cea5e4ab1 ++Merge: c86d9b6 a1a6f71 ++Author: Anthony Green ++Date: Fri Mar 14 16:54:31 2014 -0400 ++ ++ Ensure the linker supports @unwind sections in libffi. ++ ++commit c86d9b6cc6e16ee262844a33b40441374400758c ++Merge: 4efb7db f8cdf11 ++Author: Anthony Green ++Date: Fri Mar 14 16:51:20 2014 -0400 ++ ++ Fix merge ++ ++commit 4efb7dbfd9427c478a948cd0d464210123db8de8 ++Merge: 634a475 18eb81d ++Author: Anthony Green ++Date: Fri Mar 14 16:47:57 2014 -0400 ++ ++ Merge pull request #81 from rvandermeulen/bug-756740 ++ ++ Allow building for mipsel with Android NDK r8. ++ ++commit a1a6f71bfe4199293043b2e4cfb4c8d3cb1112f9 ++Author: Ryan VanderMeulen ++Date: Mon Mar 10 15:12:47 2014 -0400 ++ ++ Remove stray hunk that shouldn't have been included in this patch. ++ ++commit f8cdf11467181f2a9a6b7e748167569aa58e3a81 ++Author: Ryan VanderMeulen ++Date: Mon Mar 10 15:04:58 2014 -0400 ++ ++ Replace double quotes with single quotes in Makefile.in to improve compatibility between some versions of MSYS and gmake. From Mozilla bug 943728. ++ https://bugzilla.mozilla.org/show_bug.cgi?id=943728 ++ ++commit dfa3738732e1bc3a7f4130395ae4bab55fcebb99 ++Author: Ryan VanderMeulen ++Date: Mon Mar 10 14:53:48 2014 -0400 ++ ++ Ensure the linker supports @unwind sections in libffi. From Mozilla bug 756740. ++ https://bugzilla.mozilla.org/show_bug.cgi?id=778414 ++ ++ Also tracked as issue #42. ++ https://github.com/atgreen/libffi/issues/42 ++ ++commit 18eb81d032f29d645d0498ba92bddfd651f009ae ++Author: Ryan VanderMeulen ++Date: Mon Mar 10 14:43:37 2014 -0400 ++ ++ Allow building for mipsel with Android NDK r8. From Mozilla bug 756740. ++ https://bugzilla.mozilla.org/show_bug.cgi?id=756740 ++ ++commit 2349fec9a818fb52fd2f294bcbc7b3156cd113de ++Author: Daiki Ueno ++Date: Wed Mar 5 17:53:02 2014 +0900 ++ ++ Fix typo in doc ++ ++commit 634a475eaf1bee31c09f7d519e31c13b64cd24df ++Author: Anthony Green ++Date: Sat Mar 1 18:37:29 2014 -0500 ++ ++ Update Makefile for new darwin scripts ++ ++commit c7b67e874bb89859f9a07d1cf9606052b6c0dcc1 ++Author: Anthony Green ++Date: Sat Mar 1 18:34:18 2014 -0500 ++ ++ Add README note ++ ++commit a04e30ba3dc303133d459c1ac273ceefe4d49b32 ++Author: Anthony Green ++Date: Fri Feb 28 17:20:59 2014 -0500 ++ ++ Add missing -DFFI_DEBUG flag ++ ++commit 934dc1b5c8d6a9e727bedc72342831eb7d62c35f ++Merge: 11d7aa9 67fbef3 ++Author: Anthony Green ++Date: Fri Feb 28 01:10:17 2014 -0500 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++commit 11d7aa9d7a4bbe642944edc0f07cf96db9b270b6 ++Merge: b40aeda 3b44d41 ++Author: Anthony Green ++Date: Fri Feb 28 01:06:48 2014 -0500 ++ ++ Merge pull request #46 from makotokato/android-clang ++ ++ Fix build failure when using clang for Android ++ ++commit 67fbef3b56ff0ef88f9b1a7fe48cb77222fa6cec ++Merge: b40aeda 3b44d41 ++Author: Anthony Green ++Date: Fri Feb 28 01:06:48 2014 -0500 ++ ++ Merge pull request #46 from makotokato/android-clang ++ ++ Fix build failure when using clang for Android ++ ++commit b40aeda31a74d95a37c723b6243aabac466e67c4 ++Merge: 20698ab 53ceaf1 ++Author: Anthony Green ++Date: Fri Feb 28 01:01:29 2014 -0500 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++commit 53ceaf14c5eeb16ba09745f0ca87cca367d41a90 ++Merge: 860fe66 cc9b518 ++Author: Anthony Green ++Date: Fri Feb 28 01:01:02 2014 -0500 ++ ++ Merge pull request #40 from wojdyr/master ++ ++ Correct the -L flag in libffi.pc.in ++ ++commit 20698abc6a00092fd7fd3e434a3a29dc0f048f1e ++Merge: 64bd069 1a0b01e ++Author: Anthony Green ++Date: Fri Feb 28 00:56:27 2014 -0500 ++ ++ Merge pull request #66 from ppizarro/master ++ ++ BlackFin fixes - Fatal error when calling a function defined in a shared library from within the function called by FFI ++ ++commit 860fe6646f5ae603e99a8d1d722ddddba8b75769 ++Merge: 64bd069 1a0b01e ++Author: Anthony Green ++Date: Fri Feb 28 00:56:27 2014 -0500 ++ ++ Merge pull request #66 from ppizarro/master ++ ++ BlackFin fixes - Fatal error when calling a function defined in a shared library from within the function called by FFI ++ ++commit 64bd06990a7accf72271516a2110b86cdccd8df4 ++Author: Anthony Green ++Date: Fri Feb 28 00:52:56 2014 -0500 ++ ++ Add ChangeLog entry for Josh's change ++ ++commit edf29c5169b06fcfc241445e152e325bc3c50e0e ++Merge: 33c9954 3998d26 ++Author: Anthony Green ++Date: Fri Feb 28 00:50:25 2014 -0500 ++ ++ Merge pull request #75 from joshtriplett/longdouble ++ ++ Fix build error on x86 without distinct long double ++ ++commit 33c9954f2eec539011a0f93270aaf013318837ae ++Author: Anthony Green ++Date: Fri Feb 28 00:38:41 2014 -0500 ++ ++ Rebuilt with new libtool ++ ++commit 926b6989fbd08488b9105943293353d45ac527e0 ++Merge: 5a88c85 cc82051 ++Author: Anthony Green ++Date: Fri Feb 28 00:26:57 2014 -0500 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++ Conflicts: ++ ChangeLog ++ ++commit 5a88c85fde304052bed1581ed0b6452ac2c68838 ++Author: Anthony Green ++Date: Fri Feb 28 00:23:04 2014 -0500 ++ ++ Fix spelling errors ++ ++commit cc82051c7e80cea772c4b72da026eb7e68d598fc ++Author: Anthony Green ++Date: Fri Feb 28 00:23:04 2014 -0500 ++ ++ Fix spelling errors ++ ++commit 001aaf4b1b56349596bb6f6b5c1613dcbbd84ea8 ++Author: Anthony Green ++Date: Fri Feb 28 00:20:17 2014 -0500 ++ ++ When no VFP arguments are present the IP register is used ++ uninitialized. Initialize it to the value of FP. ++ ++ This fixes a number of testsuite failures when configured for ++ armv7l-unknown-linux-gnueabihf ++ ++commit 49f7729c3ce697c12408c42ccb29cdf4eb66bb85 ++Author: Anthony Green ++Date: Fri Feb 28 00:17:16 2014 -0500 ++ ++ aarch64 fix ++ ++commit 447483d51c6aa9df7116f346a73fc1cf795f4c2b ++Merge: 51377bd b4df9cf ++Author: Anthony Green ++Date: Thu Feb 27 15:42:41 2014 -0500 ++ ++ Fix ChangeLog merge ++ ++commit 3998d2604b5c0d45a098ff3119a9fd9710ef429d ++Author: Josh Triplett ++Date: Mon Feb 17 11:20:33 2014 -0800 ++ ++ Fix build error on x86 without distinct long double ++ ++ src/x86/ffi64.c: In function 'classify_argument': ++ src/x86/ffi64.c:205:5: error: duplicate case value ++ case FFI_TYPE_LONGDOUBLE: ++ ^ ++ src/x86/ffi64.c:202:5: error: previously used here ++ case FFI_TYPE_DOUBLE: ++ ^ ++ ++commit 51377bda9aed0b2c1309c818460cab9d9ab3d46e ++Merge: f08da54 40927bd ++Author: Anthony Green ++Date: Sat Feb 15 08:06:29 2014 -0500 ++ ++ Merge pull request #72 from heiher/devel ++ ++ MIPS N32: Fix call floating point va function ++ ++commit f08da5465463e60a28f5e921f23ebf2ba984c148 ++Merge: 3dc3f32 fa5f25c ++Author: Anthony Green ++Date: Sat Feb 15 08:06:11 2014 -0500 ++ ++ Merge pull request #68 from zeldin/master ++ ++ Linux/ppc64: Remove assumption on contents of r11 in closure ++ ++commit 40927bd3e1e7c6007025ba10854fd8a0664e47df ++Author: Heiher ++Date: Tue Jan 21 23:18:27 2014 +0800 ++ ++ Fix call floating point va function ++ ++ I'm not sure floating-point arguments in GPR or FPR before calling ++ variable number arguments function. so, load all arguments to GPR and ++ FPR. ++ ++commit b4df9cf9cc4a9a9401a53fd6bea1f3c2c283b97b ++Author: Zachary Waldowski ++Date: Wed Feb 5 14:22:52 2014 -0500 ++ ++ AArch64: Fix void fall-through case when assertions are enabled ++ ++commit f466aad0d91a117e42571d1d6fb434fa0433c930 ++Author: Zachary Waldowski ++Date: Tue Jan 21 16:38:31 2014 -0500 ++ ++ AArch64: Fix missing semicolons when assertions are enabled ++ ++commit 7ea677733bd98917241852b8901a6b7580728895 ++Author: Anthony Green ++Date: Sat Nov 30 20:58:31 2013 -0500 ++ ++ Remove build-ios from Makefile ++ ++ Conflicts: ++ ChangeLog ++ ++commit 6ae046cc59c12b2cd40158d6bcb96f4a59886159 ++Author: Anthony Green ++Date: Sat Nov 30 21:06:51 2013 -0500 ++ ++ Mention Aarch64 on iOS ++ ++commit bfc06b3fdb32abe90ce0749aedfec649df85a7ef ++Author: Zachary Waldowski ++Date: Mon Dec 30 17:36:39 2013 -0500 ++ ++ Update ChangeLog ++ ++commit 0a0f12ce1f7be81006b08a3c81a636926d283a9b ++Author: Zachary Waldowski ++Date: Thu Jan 9 13:50:17 2014 -0500 ++ ++ AArch64: Remove duplicitous element_count call. ++ ++ This inhibits an analyzer warning by Clang. ++ ++commit 4330fdcd92e67c816288d64ab230237065768206 ++Author: Zachary Waldowski ++Date: Thu Jan 9 13:53:30 2014 -0500 ++ ++ Darwin/aarch64: Respect iOS ABI re: stack argument alignment ++ ++commit 0a333d6c3973935d4fe02aae76b10e39d3c88e07 ++Author: Zachary Waldowski ++Date: Thu Jan 9 14:03:29 2014 -0500 ++ ++ Darwin/aarch64: Fix size_t assumptions ++ ++commit 2c18e3c76aad1b426617db05a4384e7c3a920176 ++Author: Zachary Waldowski ++Date: Mon Dec 30 16:14:02 2013 -0500 ++ ++ Darwin/aarch64: Fix "shadows declaration" warnings ++ ++commit 1b8a8e20e344f3c55495ab6eb46bd14e843d4b3e ++Author: Zachary Waldowski ++Date: Thu Jan 9 13:55:21 2014 -0500 ++ ++ Darwin/aarch64: Use Clang cache invalidation builtin ++ ++commit 6030cdcae776f8fb5876a53168f7d1e75d28a242 ++Author: Zachary Waldowski ++Date: Mon Dec 30 15:45:51 2013 -0500 ++ ++ Darwin/aarch64: Account for long double being equal to double ++ ++commit 5658b0892683d2e24e4d5842978c184a7ad33858 ++Author: Zachary Waldowski ++Date: Mon Dec 30 16:33:47 2013 -0500 ++ ++ Darwin/aarch64: Use CNAME, restrict .size like ARM ++ ++commit 07175780802acec5dc49fdedd6d20a62409a6707 ++Author: Zachary Waldowski ++Date: Mon Dec 30 17:48:22 2013 -0500 ++ ++ Darwin/aarch64: Fix invalid reference in assembly ++ ++commit 9da28b44277fea3aeb827c35dd63d609d2524a8b ++Author: Zachary Waldowski ++Date: Mon Dec 30 16:23:21 2013 -0500 ++ ++ Darwin/x86_64: Fix 64-bit type shortening warnings ++ ++commit 821d398f08bd1d540a5b235507812ffeee49b580 ++Author: Zachary Waldowski ++Date: Thu Jan 9 13:15:06 2014 -0500 ++ ++ Darwin: Merge build scripts, redo project, incl. arm64 ++ ++commit 6eff9ff9e72463b9783be2514f944b6f05692054 ++Author: Zachary Waldowski ++Date: Mon Dec 30 17:48:10 2013 -0500 ++ ++ Darwin/iOS: Improve unified syntax use for LLVM ++ ++commit ba0ea99c82aadd5957386a031e3122011bd36d52 ++Author: Zachary Waldowski ++Date: Mon Dec 30 15:27:44 2013 -0500 ++ ++ Fix dlmalloc warnings due to set_segment_flags, sizeof(size_t) ++ ++commit 994be3a5c1d0d17b19103396103e128517fd62f9 ++Author: Zachary Waldowski ++Date: Mon Dec 30 15:27:14 2013 -0500 ++ ++ Darwin/iOS: Fix mis-typing of vfp_reg_free ++ ++commit a8e0a835ab1f62d03ad6391760e3e8b7732d24f8 ++Author: Zachary Waldowski ++Date: Mon Dec 30 15:26:20 2013 -0500 ++ ++ Darwin/ARM: Assert on NULL dereference ++ ++ This inhibits an analyzer warning by Clang on all platforms. ++ ++commit 13675341581c489ed9df8ba390c8e08a732decb2 ++Author: Zachary Waldowski ++Date: Thu Jan 9 13:42:08 2014 -0500 ++ ++ Darwin/i386: Inhibit Clang previous prototype warnings ++ ++commit 66469c381e2e2cc96e7d409266dea0ffe177eeca ++Author: Zachary Waldowski ++Date: Thu Jan 9 13:41:45 2014 -0500 ++ ++ Darwin/ARM: Inhibit Clang previous prototype warnings ++ ++commit 5bfe62a00d2d659eec9f19b39802b6e69844fc27 ++Author: Zachary Waldowski ++Date: Thu Jan 9 13:41:27 2014 -0500 ++ ++ Darwin/AArch64: Inhibit Clang previous prototype warnings ++ ++commit fa5f25c20f76a6ef5e950a7ccbce826672c8a620 ++Author: Marcus Comstedt ++Date: Sat Jan 4 19:00:08 2014 +0100 ++ ++ Linux/ppc64: Remove assumption on contents of r11 in closure ++ ++commit 1a0b01e171e9c750437cef2f18917f5a6e32c498 ++Author: Paulo Pizarro ++Date: Thu Jan 2 16:17:59 2014 -0200 ++ ++ When the function called by the ffi called a function defined in a shared library generate a fatal error ++ The correction was to take into consideration the GOT. ++ ++commit 3dc3f32c35db5ab995a835225f6815369735ceb7 ++Author: Anthony Green ++Date: Thu Dec 5 16:23:25 2013 -0500 ++ ++ Undo iOS ARM64 changes. ++ ++commit 356b2cbc304bfe5bdc28b8d1c68d1ff084e9ec37 ++Merge: 484a758 07345a3 ++Author: Anthony Green ++Date: Sat Nov 30 22:38:13 2013 -0500 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++commit 484a7584260e2fbb399ce90083046834271bf9ff ++Author: Anthony Green ++Date: Sat Nov 30 21:06:51 2013 -0500 ++ ++ Mention Aarch64 on iOS ++ ++commit 07345a30ec0a2fa45a7c363d301f57723690cfa0 ++Author: Anthony Green ++Date: Sat Nov 30 21:06:51 2013 -0500 ++ ++ Mention Aarch64 on iOS ++ ++commit d4b931c1b872378c35f12ddbb9a6d55e7f17c65e ++Author: Anthony Green ++Date: Sat Nov 30 20:58:31 2013 -0500 ++ ++ Remove build-ios from Makefile ++ ++commit dfbf236d70fc1ec68e6ff193584a154353508e2f ++Merge: 852ac3b bb9740e ++Author: Anthony Green ++Date: Sat Nov 30 20:54:54 2013 -0500 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ Add ChangeLog entry. ++ ++commit bb9740e545205f93a525c77aa6d1cbf4ca9371f3 ++Merge: ac75368 4d701e0 ++Author: Anthony Green ++Date: Sat Nov 30 17:54:39 2013 -0800 ++ ++ Merge pull request #60 from zwaldowski/ios-redo ++ ++ Mac/iOS support, including aarch64 port ++ ++commit 4d701e03faa475a5eb3b54b90046114a1e27b813 ++Author: Zachary Waldowski ++Date: Sat Nov 30 13:25:27 2013 -0500 ++ ++ Darwin: Properly export headers from Xcode project ++ ++commit 022f12eb9ad2264e838fa5fb453733f5177888f4 ++Author: Zachary Waldowski ++Date: Sat Nov 30 12:21:38 2013 -0500 ++ ++ Darwin: Freshen gen scripts, remove old build-ios.sh ++ ++commit e820fe2025d7ad3df7584407946dfaad2af69599 ++Author: Zachary Waldowski ++Date: Sat Nov 30 12:03:51 2013 -0500 ++ ++ Darwin/iOS: Include x86_64+aarch64 pieces in library ++ ++commit 0278284e470ec91db7cdc15ac3dcd64683305848 ++Author: Zachary Waldowski ++Date: Sat Nov 30 03:03:37 2013 -0500 ++ ++ Darwin/aarch64: size_t assumptions ++ ++commit 9775446b6441c91cd9059215c106aa3bcf949767 ++Author: Zachary Waldowski ++Date: Sat Nov 30 02:39:34 2013 -0500 ++ ++ Darwin/aarch64: Fix “shadows declaration†warnings ++ ++commit 4260badc37705d3618e774dfe61184ac709881c1 ++Author: Zachary Waldowski ++Date: Sat Nov 30 02:08:14 2013 -0500 ++ ++ Darwin/aarch64: Use Clang cache invalidation builtin ++ ++commit 9fa7998d5f9250908cbf12a671479852ebadf9d1 ++Author: Zachary Waldowski ++Date: Sat Nov 30 02:07:48 2013 -0500 ++ ++ Darwin/aarch64: Inhibit Xcode warning ++ ++commit 0e832048a93830575b0976406444e134e649a4f7 ++Author: Zachary Waldowski ++Date: Sat Nov 30 02:07:34 2013 -0500 ++ ++ Darwin/aarch64: double == long double ++ ++commit 602dc22d76931092610234cf063f9f1b8dbc1a51 ++Author: Zachary Waldowski ++Date: Sat Nov 30 02:06:00 2013 -0500 ++ ++ Darwin/iOS prep script: try and compile for arm64 ++ ++commit b513dfe79de4725e8a717325a9e3b5b9f69f63dc ++Author: Zachary Waldowski ++Date: Sat Nov 30 02:05:22 2013 -0500 ++ ++ Darwin/aarch64: Restrict .size to ELF like arm32. ++ ++commit bc978099bf2812de755c076b67ef9c2547607572 ++Author: Zachary Waldowski ++Date: Sat Nov 30 02:04:57 2013 -0500 ++ ++ Darwin/aarch64: Potentially(?) fix compile error ++ ++commit d6bb9314467c6e0683156559d23ca341c43fa3c8 ++Author: Zachary Waldowski ++Date: Sat Nov 30 02:04:22 2013 -0500 ++ ++ Darwin/aarch64: Use CNAME refs ++ ++commit 33c46ce5680eea28d3437c8771ec1d137e226b45 ++Author: Zachary Waldowski ++Date: Sat Nov 30 04:13:42 2013 -0500 ++ ++ Darwin/Mac: Fix 64/32 shortening warnings ++ ++commit 0612081e6c161d9d820742f995975d35da2adbc2 ++Author: Zachary Waldowski ++Date: Sat Nov 30 03:03:00 2013 -0500 ++ ++ Darwin: Misc size_t warnings ++ ++commit 6a6247d179ec3859311c2d8775841b884f309f66 ++Author: Zachary Waldowski ++Date: Sat Nov 30 02:55:48 2013 -0500 ++ ++ Darwin: Fix dlmalloc warnings due to sizeof(size_t) ++ ++commit 4d60d9e1e32de6166ffd63bbe9ce54cf961c78fc ++Author: Zachary Waldowski ++Date: Sat Nov 30 04:09:30 2013 -0500 ++ ++ Darwin: Rebuild Xcode project ++ ++commit cb719a5c1c2eb391d6a5f5e02484ba4aa990a51b ++Author: Zachary Waldowski ++Date: Sat Nov 30 04:09:18 2013 -0500 ++ ++ Darwin/iOS: Fix LLVM 3.3 warning re: memcpy. ++ ++commit 21bde92c9abb378f9c456a9d95e6f9b99ef8c920 ++Author: Zachary Waldowski ++Date: Sat Nov 30 03:43:42 2013 -0500 ++ ++ Darwin: Clean up, modernize generator scripts ++ ++commit fd54eab74cef7891e4acaaafb71e783142ecb69e ++Author: Zachary Waldowski ++Date: Sat Nov 30 03:38:02 2013 -0500 ++ ++ Darwin/Mac: Also exclude OS X generated source ++ ++commit 953b6f14c655141f9e7d82550a312c3eeb961091 ++Author: Zachary Waldowski ++Date: Tue Apr 24 11:16:20 2012 -0400 ++ ++ Darwin/iOS: More unified syntax support w/ Clang. ++ ++ Signed-off-by: Zachary Waldowski ++ ++commit c713a55379481c339877f2e0003d97cb8d9ed80e ++Author: Zachary Waldowski ++Date: Tue Apr 24 10:25:29 2012 -0400 ++ ++ Darwin/iOS: Simplify RETLDM arguments for LLVM 3.1 ++ ++ Signed-off-by: Zachary Waldowski ++ ++commit 16ba1b80028db5cb71cf86e5f79f5e48317f83c8 ++Author: Zachary Waldowski ++Date: Wed Apr 11 23:26:04 2012 -0400 ++ ++ Darwin: Silence Clang warnings. ++ ++commit 852ac3bd302d6ed97b1ef65f4cbed69c258a48df ++Merge: ab79d6e ac75368 ++Author: Anthony Green ++Date: Thu Nov 21 21:25:44 2013 -0500 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++ Conflicts: ++ ChangeLog ++ ++commit ab79d6e21992dd86139ba07530ff888833b78a04 ++Author: Alan Modra ++Date: Thu Nov 21 06:12:35 2013 -0500 ++ ++ This separates the 32-bit sysv/linux/bsd code from the 64-bit linux ++ code, and makes it possible to link code compiled with different ++ options to those used to compile libffi. For example, a ++ -mlong-double-128 libffi can be used with -mlong-double-64 code. ++ ++ Using the return value area as a place to pass parameters wasn't such ++ a good idea, causing a failure of cls_ulonglong.c. I didn't see this ++ when running the mainline gcc libffi testsuite because that version of ++ the test is inferior to the upstreamm libffi test. ++ ++ Using NUM_FPR_ARG_REGISTERS rather than NUM_FPR_ARG_REGISTERS64 meant ++ that a parameter save area could be allocated before it was strictly ++ necessary. Wrong but harmless. Found when splitting apart ffi.c ++ into 32-bit and 64-bit support. ++ ++commit ac7536889334d4be50709006d7e23536364d7891 ++Author: Alan Modra ++Date: Thu Nov 21 06:12:35 2013 -0500 ++ ++ This separates the 32-bit sysv/linux/bsd code from the 64-bit linux ++ code, and makes it possible to link code compiled with different ++ options to those used to compile libffi. For example, a ++ -mlong-double-128 libffi can be used with -mlong-double-64 code. ++ ++ Using the return value area as a place to pass parameters wasn't such ++ a good idea, causing a failure of cls_ulonglong.c. I didn't see this ++ when running the mainline gcc libffi testsuite because that version of ++ the test is inferior to the upstreamm libffi test. ++ ++ Using NUM_FPR_ARG_REGISTERS rather than NUM_FPR_ARG_REGISTERS64 meant ++ that a parameter save area could be allocated before it was strictly ++ necessary. Wrong but harmless. Found when splitting apart ffi.c ++ into 32-bit and 64-bit support. ++ ++commit 69df91cfb4fa6bcb644350a80bff970f27478a6a ++Merge: 2f45082 aa1f62c ++Author: Anthony Green ++Date: Mon Nov 18 06:34:04 2013 -0800 ++ ++ Merge pull request #59 from iains/powerpc-darwin-unwind-fix ++ ++ Fix PowerPC Darwin FDE encodings to use pcrel correctly. Modernise the picbase labels. ++ ++commit aa1f62c0a093c30325dff1d4d2b6b4b22eb96929 ++Author: Iain Sandoe ++Date: Mon Nov 18 13:11:56 2013 +0000 ++ ++ Fix PowerPC Darwin FDE encodings to use pcrel correctly. Modernise the picbase labels. ++ ++commit 2f450822a8698ba88441c56d152c7dc8924b127f ++Author: Anthony Green ++Date: Mon Nov 18 06:52:29 2013 -0500 ++ ++ Clean up code to appease modern GCC compiler. ++ ++commit 16d56c51aded374730920a4acde76ff3d2860ae1 ++Author: Alan Modra ++Date: Mon Nov 18 06:36:03 2013 -0500 ++ ++ An #endif in the wrong place would cause compile failure on powerpcle. ++ Using bl instead of b doesn't cause runtime failures as you might think, ++ but does mess the processor branch prediction. ++ ++commit 34f878a5ef28663f6b1d7fd26fb099429ea1579e ++Merge: 83f65b6 1fd0457 ++Author: Anthony Green ++Date: Sat Nov 16 06:57:54 2013 -0500 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++ Conflicts: ++ ChangeLog ++ src/powerpc/ffi.c ++ ++commit 83f65b63d9764a9cc7688fc5cda5ee2bd23faf54 ++Author: Alan Modra ++Date: Sat Nov 16 06:53:50 2013 -0500 ++ ++ Finally, this adds _CALL_ELF == 2 support. ELFv1 objects can't be ++ linked with ELFv2 objects, so this is one case where preprocessor ++ tests in ffi.c are fine. Also, there is no need to define a new ++ FFI_ELFv2 or somesuch value in enum ffi_abi. FFI_LINUX64 will happily ++ serve both ABIs. ++ ++commit 1fd045784cac874b5d76b7fa931f67209a8280d3 ++Author: Alan Modra ++Date: Sat Nov 16 06:53:50 2013 -0500 ++ ++ Finally, this adds _CALL_ELF == 2 support. ELFv1 objects can't be ++ linked with ELFv2 objects, so this is one case where preprocessor ++ tests in ffi.c are fine. Also, there is no need to define a new ++ FFI_ELFv2 or somesuch value in enum ffi_abi. FFI_LINUX64 will happily ++ serve both ABIs. ++ ++commit 362851379a49ce07d3e36e82c4e5c7b6cc16a352 ++Author: Alan Modra ++Date: Sat Nov 16 06:52:43 2013 -0500 ++ ++ Andreas' 2013-02-08 change reverted some breakage for struct return ++ values from 2011-11-12, but in so doing reintroduced string ++ instructions to sysv.S that are not supported on all powerpc variants. ++ This patch properly copies the bounce buffer to destination in C code ++ rather than in asm. ++ ++ I have tested this on powerpc64-linux, powerpc-linux and ++ powerpc-freebsd. Well, the last on powerpc-linux by lying to ++ configure with ++ ++ CC="gcc -m32 -msvr4-struct-return -mlong-double-64" \ ++ CXX="g++ -m32 -msvr4-struct-return -mlong-double-64" \ ++ /src/libffi-current/configure --build=powerpc-freebsd ++ ++ and then ++ ++ make && make CC="gcc -m32" CXX="g++ -m32" \ ++ RUNTESTFLAGS=--target_board=unix/-m32/-msvr4-struct-return/-mlong-double-64\ ++ check ++ ++commit 1c06515d927d9de1582438d4eb5953890e79c5c7 ++Author: Alan Modra ++Date: Sat Nov 16 06:41:36 2013 -0500 ++ ++ The powerpc64 ABIs align structs passed by value, a fact ignored by ++ gcc for quite some time. Since gcc now does the correct alignment, ++ libffi needs to follow suit. This ought to be made selectable via ++ a new abi value, and the #ifdefs removed from ffi.c along with many ++ other #ifdefs present there and in assembly. I'll do that with a ++ followup patch sometime. ++ ++ This is a revised version of ++ https://sourceware.org/ml/libffi-discuss/2013/msg00162.html ++ ++commit a97cf1fae575d8bfd5259c5c422025ad43911326 ++Author: Alan Modra ++Date: Sat Nov 16 06:40:13 2013 -0500 ++ ++ This patch prepares for ELFv2, where sizes of these areas change. It ++ also makes some minor changes to improve code efficiency. ++ ++commit 164283f4ac5972ce2ab5e015cc2ab1014c23276c ++Author: Alan Modra ++Date: Sat Nov 16 06:38:55 2013 -0500 ++ ++ The powerpc64 support opted to pass floating point values both in the ++ fpr area and the parameter save area, necessary when the backend ++ doesn't know if a function argument corresponds to the ellipsis ++ arguments of a variadic function. This patch adds powerpc support for ++ variadic functions, and changes the code to only pass fp in the ABI ++ mandated area. ELFv2 needs this change since the parameter save area ++ may not exist there. ++ ++ This also fixes two faulty tests that used a non-variadic function ++ cast to call a variadic function, and spuriously reasoned that this is ++ somehow necessary for static functions.. ++ ++commit 31257b3189f81a199bc2902c22bc5f2d7c54ccde ++Author: Andrew Haley ++Date: Sat Nov 16 06:35:51 2013 -0500 ++ ++ Fix sample closure code ++ ++commit db0ace3a38496af73eae3df02ef353736d16909f ++Author: Andrew Haley ++Date: Sat Nov 16 06:29:25 2013 -0500 ++ ++ Fix broken test cases ++ ++commit de10f5039ed7a53382ddcc95c368d03e535edb98 ++Merge: 58c2577 f3657da ++Author: Anthony Green ++Date: Thu Nov 14 10:56:29 2013 -0500 ++ ++ Merge branch 'master' of https://github.com/bivab/libffi ++ ++ Conflicts: ++ ChangeLog ++ ++commit f3657da278dd63afcdd8762894a9bdaea8ef028a ++Author: David Schneider ++Date: Thu Nov 14 13:02:16 2013 +0100 ++ ++ update Changelog ++ ++commit 58c2577a3ff80e7416ef0434769e2af23365719c ++Author: Alan Modra ++Date: Wed Nov 13 16:55:36 2013 -0500 ++ ++ This enshrines the current testsuite practice of using ffi_arg for ++ returned values. It would be reasonable and logical to use the actual ++ return argument type as passed to ffi_prep_cif, but this would mean ++ changing a large number of tests that use ffi_arg and all backends ++ that write results to an ffi_arg. ++ ++commit 8af42f9944f7ed72c81ae360aac6a84dc11f89dc ++Author: Anthony Green ++Date: Wed Nov 13 16:40:28 2013 -0500 ++ ++ Respect HAVE_ALLOCA_H ++ ++commit cdf405d574f479b782454516366bd4f4b9b3415e ++Author: David Schneider ++Date: Wed Nov 13 15:50:21 2013 +0100 ++ ++ add a testcase for the double/float issue on ARMHF ++ ++commit 77f823e31ffb557a466b24f7fba845fbf7831798 ++Author: David Schneider ++Date: Wed Nov 13 14:26:57 2013 +0100 ++ ++ stop trying to assing vfp regs once we are done with the registers ++ ++commit 37067ec5036f2a6ed7a4799f83f8f53160460344 ++Author: David Schneider ++Date: Tue Nov 12 19:49:01 2013 +0100 ++ ++ mark all vfp registers as used when done. ++ ++ To avoid assigning registers the would fit, once arguments have been on ++ the stack, we mark all registers as used once we do not find a free ++ register for the first time. ++ ++commit 2f5b7ce545473a7f6e41193edc29407cbebe82d5 ++Author: Anthony Green ++Date: Sat Nov 9 06:16:32 2013 -0500 ++ ++ UltraSPARC IIi fix. Update README and build configury. ++ ++commit becd754434173032f426d22ffcbfe24f55b3c137 ++Author: Mark Kettenis ++Date: Wed Nov 6 06:43:49 2013 -0500 ++ ++ Align the stack pointer to 16-bytes. ++ ++commit 05c31093409f7b3e6d795fac21d2c954313d8162 ++Author: Konstantin Belousov ++Date: Wed Nov 6 06:40:58 2013 -0500 ++ ++ Mark executable as not requiring executable stack. ++ ++commit cf6bf9818e8394cfcdb07a40c6a5e2ee6b01d333 ++Author: Anthony Green ++Date: Sat Nov 2 17:23:59 2013 -0400 ++ ++ Fix up docs ++ ++commit 02177176854d16fc0f1a5958aa34da2f306630ee ++Merge: c242217 c265b4c ++Author: Anthony Green ++Date: Sat Nov 2 17:11:22 2013 -0400 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++commit c2422174b3edc0de0b148dfd6b67087bb881c4a6 ++Merge: f4b843f d918d47 ++Author: Anthony Green ++Date: Sat Nov 2 14:08:23 2013 -0700 ++ ++ Merge pull request #45 from foss-for-synopsys-dwc-arc-processors/arc_support ++ ++ arc: Fix build error ++ ++commit c265b4cacb9130f042699a85de9c7242b3f49cc3 ++Merge: f4b843f d918d47 ++Author: Anthony Green ++Date: Sat Nov 2 14:08:23 2013 -0700 ++ ++ Merge pull request #45 from foss-for-synopsys-dwc-arc-processors/arc_support ++ ++ arc: Fix build error ++ ++commit f4b843f83710ac378c48abd87fe66bb519d30d2e ++Author: Anthony Green ++Date: Sat Nov 2 17:01:15 2013 -0400 ++ ++ Don't align stack for win32 ++ ++commit f3cd39345713db8e414cf642b6cb65a4cfe6018c ++Merge: 666f3e7 6aa1590 ++Author: Anthony Green ++Date: Sat Nov 2 13:17:57 2013 -0700 ++ ++ Merge pull request #51 from vbudovski/for_upstream ++ ++ Don't use 16 byte aligned stack for WIN32 ++ ++commit 666f3e71b56d92c49fcd2d7f349b8f8ebca0f8a3 ++Author: Anthony Green ++Date: Sat Oct 26 09:12:42 2013 -0400 ++ ++ Add more credits to README. Tidy up. ++ ++commit 73ada14e756bad97fad0e6915a821a3c7e079f81 ++Author: Anthony Green ++Date: Sat Oct 26 09:09:45 2013 -0400 ++ ++ Update README ++ ++commit d3372c54ce7117e80d389ba875dc5b6b2213c71e ++Author: Mark H Weaver ++Date: Sat Oct 26 08:30:06 2013 -0400 ++ ++ Fix N32 ABI issue for MIPS. ++ ++commit d6716aba8118eb0513885cfe557bedebb7016e8b ++Author: Anthony Green ++Date: Tue Oct 15 15:42:49 2013 -0400 ++ ++ Update travis-ci build dependencies to include texinfo ++ ++commit 16b93a211bcfbe4bd0efdcf94de225a71aa0ee02 ++Author: Sandra Loosemore ++Date: Tue Oct 15 15:33:59 2013 -0400 ++ ++ Add nios2 port. ++ ++commit 2f5626ce02fce8267ab48ceb6d7d0ed7d672a75e ++Author: Sandra Loosemore ++Date: Tue Oct 15 15:32:16 2013 -0400 ++ ++ Fix testsuite bug ++ ++commit f64e4a865557e440774436b4c2b2fd7374290e97 ++Author: Marcus Shawcroft ++Date: Tue Oct 15 15:20:14 2013 -0400 ++ ++ Fix many.c testcase for Aarch64 ++ ++commit 128cd1d2f358f26d9fa75a27cf2b30356f5dd903 ++Author: Anthony Green ++Date: Tue Oct 8 06:45:51 2013 -0400 ++ ++ Fix spelling errors ++ ++commit ff06269d707cafbfef2a88afb07a79c9d1480c5f ++Author: Anthony Green ++Date: Tue Oct 8 06:32:18 2013 -0400 ++ ++ Update README for M88K and VAX ++ ++commit d2fcbcdfbea750d1f6a9f493e2e6c4d5ffa71b34 ++Author: Anthony Green ++Date: Tue Oct 8 06:27:46 2013 -0400 ++ ++ Add m88k and VAX support. Update some configury bits. ++ ++commit 6aa15900accc0a648cdebf11ec11d11697ebfffd ++Author: Vitaly Budovski ++Date: Thu Sep 5 12:05:06 2013 +1000 ++ ++ Don't use 16 byte aligned stack for WIN32 ++ ++ This fixes a crash when accessing __stdcall functions in Python ctypes. ++ ++commit 3b44d41156149af8da2a58825fefdfa23274ae7a ++Author: Makoto Kato ++Date: Wed Jul 10 15:34:53 2013 +0900 ++ ++ Fix build failure when using clang for Android ++ ++ clang for Android generates __gnu_linux__ define, but gcc for Android doesn't. So we should add check it for Android ++ ++commit d918d47809c174d62283306b282749f8db93661f ++Author: Mischa Jonker ++Date: Mon Jul 8 15:51:36 2013 +0200 ++ ++ arc: Fix build error ++ ++ One part of the patch for ARC support was missing in the upstreamed ++ version. ++ ++ Signed-off-by: Mischa Jonker ++ ++commit d3d099b40c122550279789200263346f120f6909 ++Author: Anthony Green ++Date: Tue Jul 2 16:11:38 2013 -0400 ++ ++ little-endian ppc64 support ++ ++commit 0f8690a84c874ec09a090c8c6adfb93c594acac6 ++Author: Anthony Green ++Date: Tue Jul 2 15:54:40 2013 -0400 ++ ++ Rebuild for ARC additions ++ ++commit f88118b345f27c46f5445d6e4832c498ff9a6d85 ++Author: Anthony Green ++Date: Tue Jul 2 15:51:27 2013 -0400 ++ ++ Revert "Merge pull request #36 from abergmeier/emscripten_fix" ++ ++ This reverts commit 6a4d901dde7b3f87984c563505717cde3113d16e, reversing ++ changes made to b50a13b9c07ec09af4b9697e482acdad571e6961. ++ ++commit 6a4d901dde7b3f87984c563505717cde3113d16e ++Merge: b50a13b 587002c ++Author: Anthony Green ++Date: Tue Jul 2 12:12:34 2013 -0700 ++ ++ Merge pull request #36 from abergmeier/emscripten_fix ++ ++ Fixes for building with Emscripten ++ ++commit b50a13b9c07ec09af4b9697e482acdad571e6961 ++Merge: 767f1f9 b082e15 ++Author: Anthony Green ++Date: Tue Jul 2 12:10:26 2013 -0700 ++ ++ Merge pull request #44 from foss-for-synopsys-dwc-arc-processors/arc_support ++ ++ Add ARC support ++ ++commit 767f1f96e5282da44d7340e6815e9820a3f78e39 ++Merge: c3c40e0 b8a91d8 ++Author: Anthony Green ++Date: Tue Jul 2 12:08:04 2013 -0700 ++ ++ Merge pull request #43 from JensTimmerman/__m128 ++ ++ added include for xmmintrin.h ++ ++commit b8a91d81be77d479327fdb6bdd9fdae6d18e6e63 ++Author: Jens Timmerman ++Date: Tue Jul 2 10:57:37 2013 +0200 ++ ++ added include for xmmintrin.h ++ ++commit b082e15091961373c03d10ed0251f619ebb6ed76 ++Author: Mischa Jonker ++Date: Mon Jun 10 16:19:33 2013 +0200 ++ ++ Add ARC support ++ ++ This adds support for the ARC architecture to libffi. DesignWare ARC ++ is a family of processors from Synopsys, Inc. ++ ++ This patch has been tested on a little-endian system and passes ++ the testsuite. ++ ++ Signed-off-by: Mischa Jonker ++ ++commit cc9b518687e46b0d1acafdd4bc3f3b281c25a3d9 ++Author: Marcin Wojdyr ++Date: Tue May 14 15:01:23 2013 +0200 ++ ++ Update libffi.pc.in ++ ++ use -L${toolexeclibdir} instead of -L${libdir} ++ to be consistent with Makefile.am ++ ++commit 587002c092cffe6e7a8d7028f246c241d03b738c ++Author: Andreas Bergmeier ++Date: Fri Apr 19 17:12:24 2013 +0200 ++ ++ Enable disabling of libtool on platforms where it does not work (e.g. LLVM). ++ Build libraries normally then. ++ ++commit c3c40e0290377d7cf948b072eedd8317c4bf215e ++Merge: ede96e4 4750e3c ++Author: Anthony Green ++Date: Sat Mar 30 05:24:14 2013 -0700 ++ ++ Merge pull request #34 from davidsch/armhf ++ ++ Fix ARM hard-float support for large numbers of VFP arguments ++ ++commit 4750e3c662fd9569cb3e2d28f539685fd1ca8caf ++Author: David Schneider ++Date: Thu Mar 28 16:56:36 2013 +0100 ++ ++ update changelog ++ ++commit 9708e7cf09f1bf815f4d6485eb1f180fabb35804 ++Author: David Schneider ++Date: Wed Mar 27 19:31:04 2013 +0100 ++ ++ folow the ARM hard-float ABI in ffi_prep_incoming_args_VFP ++ ++commit b41120981e5e49ca2da10b94b154775f50da5f36 ++Author: David Schneider ++Date: Wed Mar 27 16:38:35 2013 +0100 ++ ++ create separated versions of ffi_prep_incoming_args_* for SYSV and VFP ABIs. ++ ++ The different versions will be called depending on the value of cif->abi ++ ++commit dd26f1f39c54861c5b91931f0f37a72942c2a072 ++Author: David Schneider ++Date: Thu Mar 28 15:39:01 2013 +0100 ++ ++ add a failing test for closures on ARM hardfloat ++ ++commit 3c1608613ab3c2184222b98c5482cddedd6b559b ++Author: David Schneider ++Date: Tue Mar 26 19:24:47 2013 +0100 ++ ++ extend ffi_prepare_args for FFI_VFP (hard-float ABI), fixing an issue with passing VFP arguments in VFP registers and the stack, while at the same time not using all core registers. ++ ++commit 0f2ff2d4c92719be8936179f9ab674f4d1a3fd14 ++Author: David Schneider ++Date: Tue Mar 26 19:22:02 2013 +0100 ++ ++ separate ARM ffi_prepare_args in a version implementing the simple SYSV calling convention and one for the hard-float calling convention ++ ++commit 3a352b8a8252400a83de22c7c424bf1887b4a2ef ++Author: David Schneider ++Date: Tue Mar 26 14:24:04 2013 +0100 ++ ++ move the hardfloat specific argument copying code to the helper function ++ ++commit 5df6b7944a4225b6eb329f3886be64e04e966f29 ++Author: David Schneider ++Date: Tue Mar 26 14:02:21 2013 +0100 ++ ++ extract setting of arguments to be passed to a helper function ++ ++commit 7d1048c471bb4b1f9d67a9e9f8e95f9a1d2e6d45 ++Author: David Schneider ++Date: Tue Mar 26 11:33:33 2013 +0100 ++ ++ extract code to align the argument storage pointer to a helper function ++ ++commit b9f013788f0f384c423ad963475aaacb55598135 ++Author: David Schneider ++Date: Mon Mar 25 13:27:36 2013 +0100 ++ ++ add a testcase, that on ARM hardfloat needs more than the 8 VFP argument registers to pass arguments to a call ++ ++commit 2fbdb0f231cafdb77b025d3cd8afe90cda99b3ba ++Author: David Schneider ++Date: Mon Mar 25 13:26:02 2013 +0100 ++ ++ use the absolute value to check the test result against an epsilon ++ ++commit ede96e4eb660bbf3e0fe048135efa8106f48af5d ++Merge: f22ab3c 9e34992 ++Author: Anthony Green ++Date: Sun Mar 17 18:38:21 2013 -0400 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++commit f22ab3c6877cbdd07f058b68816b0086b1cb0e1e ++Merge: 12b1886 d08124b ++Author: Anthony Green ++Date: Sun Mar 17 18:34:54 2013 -0400 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++commit 9e34992a5ea2fda1dba5875bf96dc91a7230f51f ++Merge: 12b1886 d08124b ++Author: Anthony Green ++Date: Sun Mar 17 18:34:54 2013 -0400 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++commit 12b1886d7b1f8aa264b1d348bfa47a0e14712df4 ++Author: Anthony Green ++Date: Sun Mar 17 18:32:12 2013 -0400 ++ ++ cygwin fix & updates for 3.0.13 ++ ++commit d08124bedf2c6d61874fe215404783aeb9f6f1ac ++Author: Anthony Green ++Date: Sun Mar 17 18:32:12 2013 -0400 ++ ++ cygwin fix & updates for 3.0.13 ++ ++commit cb32c812d04d1dfa72002cc04924e7e4fef89e02 ++Author: Anthony Green ++Date: Sun Mar 17 09:27:55 2013 -0400 ++ ++ Fix lib install dir ++ ++commit efd7866a361a6f636bae8400d26c6811e56ca207 ++Author: Anthony Green ++Date: Sat Mar 16 08:35:57 2013 -0400 ++ ++ 2.0.13rc1 ++ ++commit ff647ad4dff2f07dd153f295a1f70b1d906cd6ca ++Merge: 4acf005 d9dd417 ++Author: Anthony Green ++Date: Sat Mar 16 08:20:40 2013 -0400 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++ Conflicts: ++ ChangeLog ++ ++commit 4acf0056f55c757490dae6c29a65b0321327ea8a ++Author: Anthony Green ++Date: Sat Mar 16 08:18:45 2013 -0400 ++ ++ Build fix for soft-float power targets ++ ++commit 675c9839224e4268187f1ec6f512127f9db555d0 ++Author: Anthony Green ++Date: Sat Mar 16 08:12:38 2013 -0400 ++ ++ Documentation fix ++ ++commit 8a286f570ccd41db81f74ea7f248da62241d898a ++Author: Anthony Green ++Date: Sat Mar 16 08:01:19 2013 -0400 ++ ++ Fix for m68000 systems ++ ++commit d9dd417b09566af55b7b3000bb53ccaf2e1d6c92 ++Author: Anthony Green ++Date: Sat Mar 16 08:01:19 2013 -0400 ++ ++ Fix for m68000 systems ++ ++commit 215763d012a944d95406b394d6013b80d220e870 ++Author: Anthony Green ++Date: Sat Mar 16 07:57:35 2013 -0400 ++ ++ Update configury. ++ ++commit 9180d8f39c9b6afe17b78277c2711a5d9948e824 ++Merge: 2fb527a 7e1b326 ++Author: Anthony Green ++Date: Sat Mar 16 07:46:55 2013 -0400 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++commit 2fb527a017a4943e176a489ff103231b86464b59 ++Author: Anthony Green ++Date: Sat Mar 16 07:46:38 2013 -0400 ++ ++ Add Meta processor support ++ ++commit 211a9ebf4d1a9801e15e103566aed2b8c42790be ++Merge: f308faf ee18766 ++Author: Anthony Green ++Date: Sat Mar 16 04:24:40 2013 -0700 ++ ++ Merge pull request #32 from alex/patch-1 ++ ++ Fix for a crasher due to misaligned stack on x86-32. ++ ++commit 7e1b32649efd24814e86172e196f390566f9e970 ++Merge: f308faf ee18766 ++Author: Anthony Green ++Date: Sat Mar 16 04:24:40 2013 -0700 ++ ++ Merge pull request #32 from alex/patch-1 ++ ++ Fix for a crasher due to misaligned stack on x86-32. ++ ++commit ee18766b169811426c14b011fbb46d81e344f926 ++Author: Alex Gaynor ++Date: Thu Mar 14 15:00:33 2013 -0700 ++ ++ Fix for a crasher due to misaligned stack on x86-32. ++ ++ Full information on reproduction (using Python's ctypes available here: http://bugs.python.org/issue17423) ++ ++commit f308faf1eabaf8dc24966ab17fbf94368f46b9c7 ++Author: Anthony Green ++Date: Mon Feb 11 14:25:13 2013 -0500 ++ ++ Add moxie support. Release 3.0.12. ++ ++commit 4ea22e54e3b143fe05c413f6dddd236af6bcbfb2 ++Author: Anthony Green ++Date: Sun Feb 10 08:48:38 2013 -0500 ++ ++ Update README ++ ++commit 10e77227b6ae85f46f28590bfb09ca3608554358 ++Author: Anthony Green ++Date: Sun Feb 10 08:47:26 2013 -0500 ++ ++ mend ++ ++commit a9521411a53d58f2bf88199242200ceb0d4dae3a ++Author: Anthony Green ++Date: Sat Feb 9 06:54:40 2013 -0500 ++ ++ sparc v8 and testsuite fixes ++ ++commit 70b11b47eea93bf43627588d494d0b3b0d062481 ++Author: Anthony Green ++Date: Fri Feb 8 16:12:19 2013 -0500 ++ ++ Fix small struct passing on ppc ++ ++commit 63ba1fa79f7c4ce42de848debe233aab31aecb51 ++Author: Anthony Green ++Date: Fri Feb 8 15:18:19 2013 -0500 ++ ++ Remove xfail for arm*-*-*. ++ ++commit 24fbca4c1d57d4ea628c0a8ba643684daf54a37e ++Author: Anthony Green ++Date: Fri Feb 8 14:19:56 2013 -0500 ++ ++ Fix typo ++ ++commit b0fa11cb0a94ce6baca058eab9b10e40475e71d6 ++Author: Anthony Green ++Date: Fri Feb 8 14:17:13 2013 -0500 ++ ++ More man page cleanup ++ ++commit 8bd15d139a58a6e46dc90a1cb2d89f59f32f06c7 ++Author: Anthony Green ++Date: Fri Feb 8 13:56:37 2013 -0500 ++ ++ Fix many.c testcase for ppc ++ ++commit 7aab825cf198be85490d3cd80e778d415d85ad9b ++Author: Anthony Green ++Date: Fri Feb 8 13:26:21 2013 -0500 ++ ++ Add missing files to dist ++ ++commit cb03ea8f4eb08024e44abe4392edc77b89fbfbad ++Author: Anthony Green ++Date: Fri Feb 8 12:25:18 2013 -0500 ++ ++ sparc v9 fixes for sun tools ++ ++commit 35ee8d44f31dd3d3b88083c837dc351593e13cc2 ++Author: Anthony Green ++Date: Fri Feb 8 07:12:41 2013 -0500 ++ ++ Fix microblaze big-endian struct issue ++ ++commit 9db7e1a958fc484ba149efe027008b9a170395fb ++Author: Anthony Green ++Date: Thu Feb 7 21:06:08 2013 -0500 ++ ++ Fix botched sparc patch. Update version. ++ ++commit ce0138e61455f268af326e26908b9680ec2c4bea ++Author: Anthony Green ++Date: Thu Feb 7 18:04:01 2013 -0500 ++ ++ Update bug report address. rc2. ++ ++commit fd07c9e40451e0ec1d0475cd54a83d45ccaea2c0 ++Author: Anthony Green ++Date: Thu Feb 7 18:00:36 2013 -0500 ++ ++ Add cache flushing routine for sun compiler on sparc solaris 2.8 ++ ++commit ed6ae9501b2bab45daf93b4935eb0c977635b763 ++Author: Anthony Green ++Date: Thu Feb 7 16:43:36 2013 -0500 ++ ++ Add libtool-ldflags. Define toolexeclibdir for non-GCC builds. ++ ++commit ffef2e046aaec853be356f0b8770a335185ea9cf ++Author: Anthony Green ++Date: Thu Feb 7 15:47:01 2013 -0500 ++ ++ x32 and libtool fixes ++ ++commit 95eecebb2858dc6f1495a61072ff36d0a8127144 ++Author: Anthony Green ++Date: Thu Feb 7 15:32:46 2013 -0500 ++ ++ Remove a.out cruft from dist ++ ++commit 176aa9d2e23d9cd57d6f250692d910b408f9a651 ++Author: Anthony Green ++Date: Thu Feb 7 15:29:22 2013 -0500 ++ ++ Fix GCC usage test and update README ++ ++commit f3a4f3fdde89b04d66983a42a25d09161c5d4d54 ++Author: Anthony Green ++Date: Thu Feb 7 09:57:20 2013 -0500 ++ ++ Fixes for AIX xlc compiler. ++ ++commit 522f8fef49848927482bc63c94afaea5b84e5ec1 ++Author: Anthony Green ++Date: Wed Feb 6 20:31:31 2013 -0500 ++ ++ Fix man page. Clean out junk. ++ ++commit c4dfa259eb4e8e6f4c397868d7fee80aa0bb6a12 ++Author: Anthony Green ++Date: Wed Feb 6 17:43:24 2013 -0500 ++ ++ Bump soversion ++ ++commit f62bd63fe6123cadedb8b2b2c72eb549c40fbce9 ++Author: Anthony Green ++Date: Wed Feb 6 17:38:32 2013 -0500 ++ ++ Release candidate 1 ++ ++commit f7cd61e9e68a4a51147df04d75bfe5b91b9d9286 ++Author: Anthony Green ++Date: Wed Feb 6 17:38:04 2013 -0500 ++ ++ Fix pkgconfig install bits ++ ++commit 6a790129427121f7db2d876e7218a3104e6d2741 ++Author: Anthony Green ++Date: Wed Feb 6 17:37:15 2013 -0500 ++ ++ Work around LLVM ABI problem on x86-64 ++ ++commit 370112938e705128fd5dd4017fc1a1210bd0271a ++Merge: bada2e3 bcc0c28 ++Author: Anthony Green ++Date: Sun Jan 27 05:09:04 2013 -0800 ++ ++ Merge pull request #28 from jralls/master ++ ++ Reorder x86_64 checks ++ ++commit bcc0c28001b6d427d5cd8037d2e3c892babc6b4c ++Author: John Ralls ++Date: Sat Jan 26 15:21:14 2013 -0800 ++ ++ Reorder x86_64 tests ++ ++ So that darwin and cygwin/mingw are tested before the generic check -- ++ which allows them to actually be set. ++ ++commit bada2e326d9a9acf3ae40cfa4f5d7a9ba97b2ea8 ++Author: Anthony Green ++Date: Mon Jan 21 08:02:07 2013 -0500 ++ ++ Update README ++ ++commit 655bb8f3690feba8e840a5f1854b1d78ed08f692 ++Merge: 1035ffb 840f975 ++Author: Anthony Green ++Date: Mon Jan 21 08:01:24 2013 -0500 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++commit 1035ffb2f468e1a1c401d58cff7e7abb69838e68 ++Merge: aeb8719 4086024 ++Author: Anthony Green ++Date: Mon Jan 21 07:55:53 2013 -0500 ++ ++ Update README ++ ++commit 840f975866052fdd91b2c224d56e01ae5900b60d ++Merge: aeb8719 4086024 ++Author: Anthony Green ++Date: Mon Jan 21 07:55:53 2013 -0500 ++ ++ Merge branch 'master' of github.com:/atgreen/libffi ++ ++commit aeb8719a34756969970603fca4568530d56708af ++Author: Anthony Green ++Date: Mon Jan 21 07:37:30 2013 -0500 ++ ++ New microblaze support ++ ++commit 40860245a4fd91a1b88adc9171ec993c549e45d5 ++Author: Anthony Green ++Date: Mon Jan 21 07:37:30 2013 -0500 ++ ++ New microblaze support ++ ++commit 20cae32b152b43679ae65a85db9a1c6bb8a143dd ++Author: Anthony Green ++Date: Mon Jan 21 07:07:38 2013 -0500 ++ ++ Xtensa support ++ ++commit 9742f91782faef4a15941508a22c408fb7d1d227 ++Author: Anthony Green ++Date: Mon Jan 21 07:03:41 2013 -0500 ++ ++ Mention IBM XL compiler support on AIX. ++ ++commit f03eab08248f122ce3b623a18df9e19fae1b6e98 ++Author: Anthony Green ++Date: Fri Jan 11 17:14:11 2013 -0500 ++ ++ Remove obsolete inline test functions ++ ++commit 05fbe1faedc7b2580d5f14010d00e9e3cee73951 ++Author: Anthony Green ++Date: Fri Jan 11 16:54:40 2013 -0500 ++ ++ xlc compiler support ++ ++commit 0b4986a7889ed1864674192228f1162c1b5770a8 ++Author: Anthony Green ++Date: Fri Jan 11 11:19:52 2013 -0500 ++ ++ [travis] install dejagnu with sudo ++ ++commit 3c337eef51ab9a4993fc875bfa26289dd6a08881 ++Author: Anthony Green ++Date: Fri Jan 11 11:18:14 2013 -0500 ++ ++ [travis] install dejagnu ++ ++commit 90720962ce1baf9fc35d1bde1738102bcd5bd5ed ++Author: Anthony Green ++Date: Fri Jan 11 10:57:30 2013 -0500 ++ ++ Add first travis config file ++ ++commit bff052d9cd5be41ba9e47c76114054af487d3c30 ++Author: Anthony Green ++Date: Fri Jan 11 10:24:32 2013 -0500 ++ ++ 32-bit x86 fix and more ++ ++commit cd41aeab6176f839167955c016ecc19f65f75df3 ++Author: Anthony Green ++Date: Thu Jan 10 17:25:45 2013 -0500 ++ ++ Add compiler column to table ++ ++commit 8bf987d4df7c4d21435b9211f6cc86abf5904b42 ++Author: Anthony Green ++Date: Thu Jan 10 17:24:51 2013 -0500 ++ ++ Fix for sunpro compiler on Solaris ++ ++commit 3ee74fd6dc8ccd32b608bbff73526838fc34f70b ++Author: Anthony Green ++Date: Thu Jan 10 17:15:03 2013 -0500 ++ ++ Update documentation version. ++ ++commit 13e2d7b92557a9511a0414df82bf2df3edc55cba ++Author: Anthony Green ++Date: Thu Jan 10 10:52:02 2013 -0500 ++ ++ Handle both 32 and 64-bit x86 builds regardless of target triple ++ ++commit 5141543000fc86a3d49a907a2313713ee79e504d ++Author: Anthony Green ++Date: Thu Jan 10 07:35:53 2013 -0500 ++ ++ Don't run EH tests with non-GNU compiler ++ ++commit 56ba8d86f47937a0afb81a2b9e77c9d235d9db45 ++Author: Anthony Green ++Date: Thu Jan 10 07:25:10 2013 -0500 ++ ++ Don't use warning checking macro with sun compiler ++ ++commit 6a028caec1b2c7904feb4c4f9cb7e1125e1d1b60 ++Author: Anthony Green ++Date: Thu Jan 10 01:19:43 2013 -0500 ++ ++ Don't use GCCisms to define types when ++ + building with the SUNPRO compiler. ++ ++commit 2d9b3939751b3ef9739049509d353ade10b32a8f ++Author: Anthony Green ++Date: Wed Jan 9 21:14:54 2013 -0500 ++ ++ Fix for closures with sunpro compiler ++ ++commit 8308984e479e3274a36e98e8272b5adbb6b774c2 ++Author: Anthony Green ++Date: Tue Jan 8 15:14:21 2013 -0500 ++ ++ Make sure we're running dejagnu tests with the right compiler. ++ ++commit f26c7ca67147450db2fe25ea932944e6cf145d5c ++Author: Anthony Green ++Date: Tue Jan 8 14:47:05 2013 -0500 ++ ++ Make compiler options in dejagnu runs compiler specific ++ ++commit 74c776e21907fc2e59257c021f23077f8b7966cb ++Author: Anthony Green ++Date: Tue Jan 8 12:25:54 2013 -0500 ++ ++ Switch x86 Solaris to X86 from X86_64 ++ ++commit 8962c8c8d06803e310bac0ffc8e84ea15daeff3f ++Author: Anthony Green ++Date: Tue Jan 8 12:22:24 2013 -0500 ++ ++ Fix read-only eh_frame test ++ ++commit 35ddb69c2b49746d940e919ca226ecc1be94f14a ++Author: Anthony Green ++Date: Tue Jan 8 07:53:37 2013 -0500 ++ ++ Only emit DWARF unwind info when building with GCC ++ ++commit f7879bc3f3a8d0bbfcc38771732c160a58ba9cd8 ++Author: Anthony Green ++Date: Tue Jan 8 07:30:28 2013 -0500 ++ ++ Testsuite fix for Solaris vendor compiler ++ ++commit 67cea90fc0897021466fd102671019d30db474cd ++Author: Anthony Green ++Date: Mon Jan 7 06:30:24 2013 -0500 ++ ++ mend ++ ++commit 0de3277b18cf54be3b81d509b9be9b47d9bc1e82 ++Author: Thorsten Glaser ++Date: Mon Dec 3 00:02:31 2012 +0000 ++ ++ Testsuite fixes (was Re: [PATCH] Fix libffi on m68k-linux-gnu, completely) ++ ++ Dixi quod… ++ ++ >although I believe some 3.0.11 checks to be broken: ++ ++ And indeed, with a few minor changes on top of git master, ++ I still get a full run of PASS plus one XPASS on amd64-linux! ++ ++ With the other patches (from this message’s parent) and ++ these applied, I get a full PASS on m68k-linux as well. ++ ++ So, please git am these three diffs ☺ ++ ++ bye, ++ //mirabilos ++ -- ++ FWIW, I'm quite impressed with mksh interactively. I thought it was much ++ *much* more bare bones. But it turns out it beats the living hell out of ++ ksh93 in that respect. I'd even consider it for my daily use if I hadn't ++ wasted half my life on my zsh setup. :-) -- Frank Terbeck in #!/bin/mksh ++ From 5cb15a3bad1f0fb360520dd48bfc938c821cdcca Mon Sep 17 00:00:00 2001 ++ From: Thorsten Glaser ++ Date: Sun, 2 Dec 2012 23:20:56 +0000 ++ Subject: [PATCH 1/2] Fix tests writing to a closure retval via pointer casts ++ ++ As explained in ++ all other tests that do the same cast to an ffi_arg pointer instead. ++ ++ PASS on amd64-linux (Xen domU) and m68k-linux (ARAnyM) ++ ++ Signed-off-by: Thorsten Glaser ++ ++commit 8f4772f383abd71cfa141c8a70ba11c1aa4ebe2c ++Author: Anthony Green ++Date: Mon Jan 7 06:14:53 2013 -0500 ++ ++ m68k fixes for signed 8 and 16-bit calls. ++ ++commit ea7f8440d58afbebb181e295ff564fdf3d6590a0 ++Author: Anthony Green ++Date: Fri Jan 4 09:09:32 2013 -0500 ++ ++ remove gcc-ism ++ ++commit f06c0f10377ac04eeba5e632dbe5c62c629df4e6 ++Author: Anthony Green ++Date: Wed Jan 2 09:39:17 2013 -0500 ++ ++ Add missing ChangeLog entry and generated files. ++ ++commit 1f8675d4c101d19d67ca0a55ff2ba973349558ad ++Merge: 335f419 f6b58d2 ++Author: Anthony Green ++Date: Wed Jan 2 06:34:38 2013 -0800 ++ ++ Merge pull request #26 from rofl0r/master ++ ++ fix build error on ppc when long double == double ++ ++commit 335f419a86090cda9f215d149572f9481c3ad034 ++Merge: 53236d5 6d6f711 ++Author: Anthony Green ++Date: Wed Jan 2 06:30:03 2013 -0800 ++ ++ Merge pull request #23 from rurban/master ++ ++ cygwin/mingw shared libs need libtool LDFLAGS = -no-undefined ++ ++commit 53236d5061034cc0a7f4647fc1bd05ba1aeb3d2a ++Author: Anthony Green ++Date: Wed Jan 2 09:24:55 2013 -0500 ++ ++ Regenerate files ++ ++commit 72222ca3fbe560e13c8dc89ca441b28b7cc74daf ++Author: Anthony Green ++Date: Wed Jan 2 09:06:38 2013 -0500 ++ ++ Update texinfo.tex ++ ++commit 1e326c95431fc9896422fa36659f3e833852579c ++Author: Anthony Green ++Date: Wed Jan 2 09:05:02 2013 -0500 ++ ++ Update config.guess and config.sub ++ ++commit cb6671f5b8a9596ff968c6b6c304f70adf71b368 ++Author: Anthony Green ++Date: Wed Jan 2 08:56:07 2013 -0500 ++ ++ Missing .gitignore changes for xcode support ++ ++commit ebbe77966855395a2a47ed2c09a38f93eb0481cf ++Author: Anthony Green ++Date: Wed Jan 2 08:54:05 2013 -0500 ++ ++ missed x32 libtool patch. ++ ++commit 4394096da0aca0dd422b479a043c18b4f05c5770 ++Author: Anthony Green ++Date: Wed Jan 2 08:51:35 2013 -0500 ++ ++ missed trampoline_table patch. Move to GCC. ++ ++commit ed7a59c3ff7c84bd95c374a5aff21599f705e6dc ++Author: Anthony Green ++Date: Wed Jan 2 08:48:01 2013 -0500 ++ ++ Windows symbol export fix. Move to GCC. ++ ++commit ccee09a4ff843b11c7d8b6819776f57d187305c7 ++Author: Anthony Green ++Date: Wed Jan 2 08:41:55 2013 -0500 ++ ++ +2012-03-21 Peter Rosin ++ + ++ + * testsuite/lib/target-libpath.exp [*-*-cygwin*, *-*-mingw*] ++ + (set_ld_library_path_env_vars): Add the library search dir to PATH ++ + (and save PATH for later). ++ + (restore_ld_library_path_env_vars): Restore PATH. ++ ++commit 089dbce7cc0889eb26444d89ae062c73c69f26f0 ++Author: Anthony Green ++Date: Wed Jan 2 08:37:35 2013 -0500 ++ ++ med ++ ++commit 980a334c42b4b0eff32e55929ec6727d1326b05d ++Author: Anthony Green ++Date: Wed Jan 2 07:36:42 2013 -0500 ++ ++ Test GCC update ++ ++commit 8bad679ade5000e57cdc9cacde22e8b99840930f ++Author: Anthony Green ++Date: Wed Jan 2 08:28:35 2013 -0500 ++ ++ New stand-alone patch ++ ++commit 981c32ee115e9f0d6546a74592875e138222a9d1 ++Author: Anthony Green ++Date: Wed Jan 2 07:34:03 2013 -0500 ++ ++ Merge with GCC. Eliminate quilt bits. ++ ++commit 61a054929517fb80c437ba71c91f3e20cfff581a ++Author: Anthony Green ++Date: Wed Nov 28 06:07:41 2012 -0500 ++ ++ Refresh config.guess and config.sub ++ ++commit f6b58d2bdc0a24ce94dedce59802f091979df265 ++Author: rofl0r ++Date: Thu Nov 22 16:26:21 2012 +0100 ++ ++ fix build on ppc when long double == double ++ ++commit 69da33a0761aeac73f9e9646269da61c906d6020 ++Author: Anthony Green ++Date: Mon Nov 12 15:25:47 2012 -0500 ++ ++ Pull in config.sub for aarch64 support and more ++ ++commit f680b598b7bdde325ac9349e8c35151c228bf2df ++Author: Anthony Green ++Date: Tue Nov 6 16:00:40 2012 -0500 ++ ++ Add missing aarch64 configury bits ++ ++commit dfadfb19853c57c8623c436d0ef2bdafab24b433 ++Author: Anthony Green ++Date: Wed Oct 31 06:46:41 2012 -0400 ++ ++ Rebase for ppc64 fix ++ ++commit e944b8c7eb1e2eeb9c0f3b9742b4d7f476860ce1 ++Author: Anthony Green ++Date: Tue Oct 30 14:06:09 2012 -0400 ++ ++ Add PaX work-around ++ ++commit 9ccd51be1fdeb99f8b4f42f905166c2abbba8ac0 ++Merge: f342996 fa5d747 ++Author: Anthony Green ++Date: Tue Oct 30 13:37:37 2012 -0400 ++ ++ Fix commit conflicts ++ ++commit f342996cb50eb23b868afcff5ac0cdbb6b505d63 ++Author: Anthony Green ++Date: Tue Oct 30 07:42:27 2012 -0400 ++ ++ Darwin12 fix ++ ++commit 58e8b66f70cef2e3c9b0e5a707b45d634cbbf5d9 ++Author: Anthony Green ++Date: Tue Oct 30 07:07:19 2012 -0400 ++ ++ AArch64 port ++ ++commit fa5d747905472571fd472c07d4726017624f66b3 ++Author: Anthony Green ++Date: Tue Oct 30 07:07:19 2012 -0400 ++ ++ AArch64 port ++ ++commit 6993a6686f43f2313b18142c1e96189a27db2aa3 ++Author: Anthony Green ++Date: Tue Oct 30 06:59:32 2012 -0400 ++ ++ Fix autoconf macros ++ ++commit 70084e70ddb13b29dd05c751b1904de206bbe790 ++Author: Anthony Green ++Date: Fri Oct 12 23:55:06 2012 -0400 ++ ++ Update Tile* port info ++ ++commit 9c00a3f6742d61404b31268cc773e7130ff43331 ++Author: Anthony Green ++Date: Fri Oct 12 16:46:06 2012 -0400 ++ ++ TILE-Gx/TILEPro support ++ ++commit 048d2f41c3a6664b4b64bf21e804686662da4160 ++Author: Anthony Green ++Date: Thu Oct 11 10:55:25 2012 -0400 ++ ++ Rebase ++ ++commit 6d6f71108064f5069edd7bf771059d3b82640135 ++Author: Reini Urban ++Date: Sat Jul 7 12:42:00 2012 -0500 ++ ++ cygwin/mingw shared libs need libtool LDFLAGS = -no-undefined ++ ++ otherwise only static libs are created. ++ ++commit d330f19292da8f39a78a9e2b0ba08df8094e3bc5 ++Author: Nicolas Lelong ++Date: Sat May 5 09:37:02 2012 -0400 ++ ++ iOS build fixes. ++ ++commit 09b23cfc1d6d15361eee18818851fd3cacb26559 ++Author: Anthony Green ++Date: Fri Apr 27 08:29:48 2012 -0400 ++ ++ Update README with Blackfin/uClinux support ++ ++commit 213ed15c70e72d666154c08e2b41dae3f61f20d3 ++Author: Anthony Green ++Date: Fri Apr 27 01:34:15 2012 -0400 ++ ++ Add blackfin supprt from Alexandre Keunecke. ++ ++commit ff3d76fd427382ce7d2b2ed54acdd0bce470ca4f ++Author: Anthony Green ++Date: Wed Apr 11 23:16:48 2012 -0400 ++ ++ 3.0.11 ++ ++commit 7e0a412c4fd9cbe77b467a9bf86f56aea62632c3 ++Author: Anthony Green ++Date: Wed Apr 11 22:47:44 2012 -0400 ++ ++ Update files to ship ++ ++commit 39e6a5860416f7bad992149817e1da1ba7c460d4 ++Author: Zachary Waldowski ++Date: Wed Apr 11 22:39:46 2012 -0400 ++ ++ More mac/ios build improvements ++ ++commit 853cc722a16f8d1254573ef3bb73c7b8f3d8a110 ++Author: Anthony Green ++Date: Tue Apr 10 06:33:33 2012 -0400 ++ ++ Fix typo for darwin targets ++ ++commit 3f5023068cda07a3dd6dacbaa875a5b5fc96d4bb ++Author: Anthony Green ++Date: Fri Apr 6 20:34:51 2012 -0400 ++ ++ mend ++ ++commit ebb8e8945681ce0af7a5c47a980287e8ece84b84 ++Author: Mike Lewis ++Date: Fri Apr 6 20:02:08 2012 -0400 ++ ++ Build iOS library with xcode ++ ++commit a098b44f4c592c2192fcdef4fad6108eb3f4301c ++Author: Anthony Green ++Date: Fri Apr 6 17:04:35 2012 -0400 ++ ++ Reapply missing testsuite changes for arm ++ ++commit 10d1e51393f08c14045db85843208f44f9f1e9ba ++Author: Anthony Green ++Date: Fri Apr 6 11:57:14 2012 -0400 ++ ++ Update to rc4. Upgrade autoconf version. ++ ++commit 9bcc884276dc0a807b2605e510b11b1740dd9aa2 ++Author: Anthony Green ++Date: Fri Apr 6 11:53:07 2012 -0400 ++ ++ Fix Linux/x32 reference in README ++ ++commit a044a56b1cd2a0924f5ec0d6b5a5089d14fcd1a1 ++Author: Anthony Green ++Date: Fri Apr 6 10:39:10 2012 -0400 ++ ++ Linux/x32 libtool fix ++ ++commit 59bb61a36661b972e8443531d3b7bc736e131a4b ++Author: Anthony Green ++Date: Fri Apr 6 08:26:14 2012 -0400 ++ ++ Update libtool version, README, tests dists ++ ++commit f2981454cbe25cf9411b710f46c5f5552003a123 ++Author: Anthony Green ++Date: Thu Apr 5 15:45:19 2012 -0400 ++ ++ Revert debug code changes ++ ++commit 39dccddb606f6fdb8dcb177d416e884041da6e30 ++Author: Zachary Waldowski ++Date: Thu Apr 5 12:32:41 2012 -0400 ++ ++ Fix building with Clang for Darwin (OS X 10.6+ and iOS ++ 4.0+) ++ ++commit 3afaa9a34a81a305227ae8cf4f12b9d0484d055e ++Author: Peter Rosin ++Date: Tue Apr 3 07:40:31 2012 -0400 ++ ++ Fix return_uc.c test case on windows. ++ ++commit 65f40c35a2873d8328359ec4512bd0736dbe32c7 ++Author: Anthony Green ++Date: Tue Apr 3 07:35:59 2012 -0400 ++ ++ Repair ppc build regression. ++ ++commit 0a1ab12a8d15caa894116a82249551f23ef65612 ++Author: Peter Rosin ++Date: Fri Mar 30 08:14:08 2012 -0400 ++ ++ Various MSVC-related changes. ++ ++commit e1539266e6c6dde3c99832323586f33f977d1dc0 ++Author: Anthony Green ++Date: Fri Mar 30 00:40:18 2012 -0400 ++ ++ ARM VFP fix for old toolchains ++ ++commit 7c5e60b5f47d725036a72162f136272bc407e3a1 ++Author: Anthony Green ++Date: Thu Mar 29 08:48:22 2012 -0400 ++ ++ Rebase on fixed GCC sources ++ ++commit e72ed5eeaa9cfb0fdc86f6b3422734177b659f96 ++Author: Anthony Green ++Date: Wed Mar 21 09:52:28 2012 -0400 ++ ++ Fix vararg float test ++ ++commit bd78c9c3311244dd5f877c915b0dff91621dd253 ++Author: Anthony Green ++Date: Wed Mar 21 08:09:30 2012 -0400 ++ ++ More cygwin fixes ++ ++commit 84d3253f86dad6b4f261231935675d35fd964b05 ++Author: Anthony Green ++Date: Mon Mar 19 23:07:35 2012 -0400 ++ ++ Rebase post GCC merge ++ ++commit 964c5b93f80dcaacf73056b7d15a4d2b4b7a217c ++Author: Anthony Green ++Date: Sat Mar 3 14:46:20 2012 -0500 ++ ++ abi check fixes and Linux/x32 support ++ ++commit 6c194233a5f6f1d274669afc5924a9e1f69d4876 ++Author: Anthony Green ++Date: Sat Mar 3 14:17:54 2012 -0500 ++ ++ Add -no-undefined for both 32- and 64-bit x86 ++ windows-like hosts. ++ ++commit 8360bf1cd0aba8db5582266da70467de7e89a57a ++Author: Anthony Green ++Date: Thu Feb 23 07:01:13 2012 -0500 ++ ++ Ensure that users don't include ffitarget.h directly ++ ++commit d578b89619cf3d2baff027b203619dc307fc12e3 ++Author: Anthony Green ++Date: Wed Feb 15 00:18:18 2012 -0500 ++ ++ Fix ABI check regression ++ ++commit dee20f8e45c486f5018f31e09bb362992aa498c3 ++Author: Anthony Green ++Date: Fri Feb 10 13:06:46 2012 -0500 ++ ++ Rebased from gcc ++ ++commit 4130e1972d001143e5e9f3c6b65f2a6f9524169e ++Author: Anthony Green ++Date: Fri Feb 3 13:18:27 2012 -0600 ++ ++ Refresh autoconf-archive m4 scripts ++ ++commit 1ff9c604bb214b5a305064af1049577ef783730a ++Author: Anthony Green ++Date: Wed Feb 1 16:34:30 2012 -0600 ++ ++ Rebase from GCC ++ ++commit 211060eb8f714af0e935430efa6bb45e8e3ffc5d ++Author: Anthony Green ++Date: Mon Jan 23 14:24:01 2012 -0500 ++ ++ Alpha fix ++ ++commit 78d9c638ba0de6edfbc603fd65d19c6562663248 ++Author: Anthony Green ++Date: Mon Jan 23 14:17:24 2012 -0500 ++ ++ mend ++ ++commit afaf3381604bd81803d8a5f3bf4d462299f1aac3 ++Author: Anthony Green ++Date: Mon Jan 23 14:17:13 2012 -0500 ++ ++ mend ++ ++commit 9e9c4aeb77de5608d602109f22100c1c0c79faad ++Author: Anthony Green ++Date: Mon Jan 23 14:11:23 2012 -0500 ++ ++ Add Amiga support ++ ++commit 8efc0b1f4027d5a3cbf205e55d422d94e60f3226 ++Author: Anthony Green ++Date: Mon Jan 23 13:47:38 2012 -0500 ++ ++ Unlikely fixes ++ ++commit 1df51398ae183dc208ba4599ee867278b04d13d3 ++Author: Anthony Green ++Date: Mon Jan 23 13:43:59 2012 -0500 ++ ++ mend ++ ++commit cd2277cc796b96b149cd284ae85326529fe7fb9c ++Author: Anthony Green ++Date: Mon Jan 23 13:43:38 2012 -0500 ++ ++ mend ++ ++commit 164e6fe04b189746c8bd5810c6e3e919770bb9d4 ++Author: Anthony Green ++Date: Mon Jan 23 12:41:06 2012 -0500 ++ ++ m68k fixes ++ ++commit c365ee7577bef00cb3c2c0b5224147aea04138d8 ++Author: Anthony Green ++Date: Mon Jan 23 11:13:18 2012 -0500 ++ ++ Refresh ++ ++commit f22c38bbd93bcc0c04bf26c3e414556b3177c385 ++Author: Anthony Green ++Date: Fri Nov 18 15:13:41 2011 -0500 ++ ++ Update variadic patch ++ ++commit 03e9ee321a3c208f88d2432587ce40b2bb2430ba ++Author: Anthony Green ++Date: Fri Nov 18 15:13:00 2011 -0500 ++ ++ Fix cls_double_va.c and update docs ++ ++commit 95f31151ec792809cfb80d385350f9f56d95aa25 ++Author: Anthony Green ++Date: Sat Nov 12 23:46:05 2011 -0500 ++ ++ Rerun automake ++ ++commit 198ed1ef85cf18342627f8d44bc3f12c9975a49d ++Author: Anthony Green ++Date: Sat Nov 12 23:45:20 2011 -0500 ++ ++ Update version number ++ ++commit 4f17e1f142e805b13959ba2594ee735eae439f4e ++Author: Anthony Green ++Date: Sat Nov 12 17:22:24 2011 -0500 ++ ++ Fix last patch ++ ++commit ff9454da44859716a5bd4eaa344499288c79694f ++Author: Anthony Green ++Date: Sat Nov 12 17:18:51 2011 -0500 ++ ++ Add David Gilbert's variadic function call support ++ ++commit ea14ae85e8f54ff046b7fb8a9cfe349475272044 ++Author: Anthony Green ++Date: Sat Nov 12 16:36:59 2011 -0500 ++ ++ clean up ++ ++commit 52891f8a93f9b8de801cca4cf05639422dc9773e ++Author: Anthony Green ++Date: Sat Nov 12 16:35:55 2011 -0500 ++ ++ Add powerpc soft float support ++ ++commit c8f1bde8e2566c5a87474b4d08aa934d6d28ee75 ++Author: Anthony Green ++Date: Sat Nov 12 16:21:02 2011 -0500 ++ ++ Remove junk file ++ ++commit 6a6e7f862f3cc677e19131587caa619e7f9c7ffd ++Author: Anthony Green ++Date: Sat Nov 12 16:20:42 2011 -0500 ++ ++ Fix kfreebsd ++ ++commit d52fbed05ccbdee9ed8b9c911cbb4f85b0ff0f2a ++Author: Anthony Green ++Date: Sat Nov 12 16:13:41 2011 -0500 ++ ++ Add missing ChangeLog entry ++ ++commit 322052ce65c4fdac85bedc24726fd0e0094ba521 ++Author: Anthony Green ++Date: Sat Nov 12 16:11:49 2011 -0500 ++ ++ Fix arm wince alignment issue ++ ++commit af18df2bc2f52df81e7b5c619bd86db8489dc873 ++Author: Anthony Green ++Date: Sat Nov 12 15:52:08 2011 -0500 ++ ++ Remove use of ppc string instructions ++ ++commit 236c9391321f83ad40daf03f40c35c9ebc1da6b3 ++Author: Anthony Green ++Date: Sat Nov 12 07:37:40 2011 -0500 ++ ++ Fix darwin11 build problem ++ ++commit c411f140f305ebb00d33c92b7cb2742bcd241b6a ++Author: Anthony Green ++Date: Sat Nov 12 07:32:36 2011 -0500 ++ ++ Fix ax_enable_builddir macro on BSD systems ++ ++commit 3d56106b07735abef6ae9f032e94f560a0ed2f30 ++Author: Anthony Green ++Date: Sat Nov 12 07:20:24 2011 -0500 ++ ++ Rebase ++ ++commit 8c01954c50bf8ef2e00a3db166060a1b8f83a20d ++Author: Anthony Green ++Date: Tue Sep 6 14:26:32 2011 -0400 ++ ++ Build assembly files with debug info ++ ++commit fed646a2078969f4ce89c29107f1e72e03f4a977 ++Author: Anthony Green ++Date: Tue Sep 6 09:50:20 2011 -0400 ++ ++ Regenerate configury with missing m4 macros ++ ++commit d76441cf71216f8f1e62e7ec852a7f4e21371ec8 ++Author: Anthony Green ++Date: Wed Aug 24 10:14:23 2011 -0400 ++ ++ Update list of supported OpenBSD systems ++ ++commit ee6696fdf4768ba6dd037fb6dd99435afa13816e ++Author: Anthony Green ++Date: Tue Aug 23 12:30:29 2011 -0400 ++ ++ 3.0.11-rc1. soname bump. ++ ++commit c6265c36a91eab8175d0e72db84d8225418f2379 ++Author: Anthony Green ++Date: Tue Aug 23 10:31:33 2011 -0400 ++ ++ Version 3.0.10 ++ ++commit cc5e41bf32d18a14dbdd653d52eacdbdc934c392 ++Author: Anthony Green ++Date: Mon Aug 22 16:34:24 2011 -0400 ++ ++ Fix use of autoconf macros ++ ++commit 049d8386ff52399e69a530b55b9feedc8a2589d2 ++Author: Anthony Green ++Date: Mon Aug 22 14:50:10 2011 -0400 ++ ++ Many new patches ++ ++commit 3b7efa4e74f0dcebf70b447391987aedd3473306 ++Author: Anthony Green ++Date: Mon Aug 15 13:25:13 2011 -0400 ++ ++ Revert remove-debug-code patch temporarily (for ARM Fedora release) ++ ++commit d992ac54a2a9e7e064ffebcb91e05e7cb86185c7 ++Author: Anthony Green ++Date: Fri Jul 29 17:32:53 2011 -0400 ++ ++ Refresh from GCC ++ ++commit 2d3fb36420e09304220ee6c0652bae5eccdb965d ++Author: Anthony Green ++Date: Wed Mar 30 16:54:42 2011 -0400 ++ ++ Fix darwin EH ++ ++commit 30ff28e1d8cd9ed5319f1fbe9c7cccacc8161fb3 ++Author: Anthony Green ++Date: Mon Feb 28 15:36:23 2011 -0500 ++ ++ Fix permissions ++ ++commit 09f8f310f4f53a24289682d3d28f4399d7bafc3b ++Author: Anthony Green ++Date: Mon Feb 28 15:36:07 2011 -0500 ++ ++ More AIX fixes. rc9. ++ ++commit 53d7b165642c220aa5166ba350b490802f359b54 ++Merge: 18dd85d 3000dc2 ++Author: Anthony Green ++Date: Mon Feb 28 15:23:31 2011 -0500 ++ ++ Merge branch 'master' of https://github.com/landonf/libffi-ios ++ ++commit 18dd85d6cb9f3f3eea2a3b70eb4e150045905c55 ++Author: Anthony Green ++Date: Fri Feb 25 16:23:04 2011 -0500 ++ ++ rc8. fix last patch. ++ ++commit 74ee6ea8b42e60d44a3ae8938b1e42a38c1e66b4 ++Author: Anthony Green ++Date: Fri Feb 25 15:52:14 2011 -0500 ++ ++ rc7. More AIX fixes. ++ ++commit 2541679dbd3db0014890f42192dbf8008ab923fa ++Author: Anthony Green ++Date: Fri Feb 25 15:09:13 2011 -0500 ++ ++ Fix ppc32 bug ++ ++commit cbb062cc35c518004f1ab45c847f8ec4f66069ad ++Author: Anthony Green ++Date: Thu Feb 17 20:39:21 2011 -0500 ++ ++ Another non-GCC configury fix ++ ++commit 8cf8878425e9971866fa6b27a3e4914729ad3960 ++Author: Anthony Green ++Date: Tue Feb 15 15:19:49 2011 -0500 ++ ++ Fix ax_cc_maxopt.m4 ++ ++commit 24b72070c0937f9000744c77a636f07e04786b6a ++Author: Anthony Green ++Date: Mon Feb 14 15:30:57 2011 -0500 ++ ++ Fix warning and msvcc patches ++ ++commit d72c49e556a8c516e97f6722d1be2f1209c21207 ++Author: Anthony Green ++Date: Sun Feb 13 11:41:05 2011 -0500 ++ ++ Add missing msvcc.sh ++ ++commit 3000dc237f6017a7445d8404097a4f46b73fdd29 ++Merge: 55e4a5a 1fbf9dc ++Author: Landon Fuller ++Date: Sun Feb 13 08:55:53 2011 -0500 ++ ++ Merge remote branch 'upstream/master' ++ ++commit 1fbf9dc44feea564e84ad7406d17c5d5906ce0e0 ++Author: Anthony Green ++Date: Sun Feb 13 08:06:39 2011 -0500 ++ ++ Fix bad_abi test. rc5. ++ ++commit 90af15ef5c1614b76370c4d13954586fabf9e8e3 ++Author: Anthony Green ++Date: Sat Feb 12 12:29:36 2011 -0500 ++ ++ iOS fixes ++ ++commit 55e4a5aa1568558a04aa40f16fc022e459af53e3 ++Author: Landon Fuller ++Date: Sat Feb 12 12:13:46 2011 -0500 ++ ++ Add support for building a full armv6/armv7/i386 universal iOS library ++ ++commit a0c80f279b8733d001cb5e5c5a3289ecb7a6e56a ++Author: Landon Fuller ++Date: Sat Feb 12 11:43:49 2011 -0500 ++ ++ Update my e-mail address. ++ ++commit 8195e0e11df7a53fa474caa9375f73ca1136ed66 ++Author: Landon Fuller ++Date: Sat Feb 12 11:27:00 2011 -0500 ++ ++ Fix symbol prefixes on Darwin. ++ ++commit 56b3f8cef0f28cefaa0f40fe0cf7c524adef131d ++Author: Landon Fuller ++Date: Sat Feb 12 11:14:54 2011 -0500 ++ ++ Modify the ffi_closure structures to hold table/table entry pointers instead of a code buffer. ++ ++ This re-integrates commit da2773e02ab26cc11a7f. ++ ++commit 28a00f61ff3f64c4eb2269ce2aea3d493274469e ++Author: Landon Fuller ++Date: Sat Feb 12 11:01:48 2011 -0500 ++ ++ Apple assembler support; fixed most gas/ELF-isms. ++ ++commit 7f2ea33a80bfced5e48ed7292f3b8f057d54ff8f ++Author: Landon Fuller ++Date: Sat Feb 12 10:39:18 2011 -0500 ++ ++ Replace RETLDM macro. ++ ++ The macro is incompatible with Apple's assembler; switch to ++ a simple inline version. ++ ++commit 92ff23e77fa586455b427b71f49e1d9502470e6e ++Author: Landon Fuller ++Date: Sat Feb 12 10:24:49 2011 -0500 ++ ++ Switch to the current iOS 4.2 SDK. ++ ++commit 58fb8ca2dfb89ad70284bb9678d3d4dbb658c8a7 ++Merge: cc3fbd9 71c792f ++Author: Landon Fuller ++Date: Sat Feb 12 10:23:19 2011 -0500 ++ ++ Merge remote branch 'upstream/master' ++ ++commit cc3fbd975ce9366d4c40a6ff6c108f664867bd7c ++Merge: e449a43 f6ab3ed ++Author: Landon Fuller ++Date: Sat Feb 12 10:21:02 2011 -0500 ++ ++ Merge branch 'master' of github.com:landonf/libffi-ios ++ ++commit e449a43bbe12f8119399928db1ae26adc71dde14 ++Author: Landon Fuller ++Date: Sat Feb 12 10:20:42 2011 -0500 ++ ++ Allow specification of the minimum supported iOS version. ++ ++commit 71c792f51bcf3e2f334e5ea1fb1a8b667cb3aedb ++Author: Anthony Green ++Date: Sat Feb 12 09:33:11 2011 -0500 ++ ++ rc4 ++ ++commit 7c7c9f327299331022f6000603a35f2310dfe308 ++Author: Anthony Green ++Date: Sat Feb 12 09:29:29 2011 -0500 ++ ++ ungccify parts of the build ++ ++commit ed62e48b95a0fa60b685f647cb73c9e190eec35c ++Author: Anthony Green ++Date: Fri Feb 11 12:23:58 2011 -0500 ++ ++ Fix permissions ++ ++commit 17d9e9e68ddb1b915a0b9751713033861b598575 ++Author: Anthony Green ++Date: Fri Feb 11 12:23:20 2011 -0500 ++ ++ Use newer autotools. Only build debug.c when --enable-debug. ++ ++commit 6972a4ffda75761eaab7dfbe0fb1516b255e8e0c ++Author: Anthony Green ++Date: Fri Feb 11 07:32:51 2011 -0500 ++ ++ Fix xlc build on AIX ++ ++commit 1833aa0fb9831eb0725b63e35886c0f6d35df480 ++Author: Anthony Green ++Date: Fri Feb 11 07:11:04 2011 -0500 ++ ++ sparc ABI test fix. ++ ++commit f1fb139b4e283fffdcf205a903943d5e9d2bb2a2 ++Author: Anthony Green ++Date: Wed Feb 9 18:30:02 2011 -0500 ++ ++ Fix tests ++ ++commit 5cb470331d181c84d5d621e88868327a324a5898 ++Author: Anthony Green ++Date: Wed Feb 9 15:23:06 2011 -0500 ++ ++ Fix permissions ++ ++commit 269deef6dbbb426695919d3398357fada3bb288c ++Author: Anthony Green ++Date: Wed Feb 9 15:22:23 2011 -0500 ++ ++ rc3 ++ ++commit 42695e72504f647444b8e8e9b90bd24f1e3220e1 ++Author: Anthony Green ++Date: Wed Feb 9 15:12:35 2011 -0500 ++ ++ Fix IRIX support ++ ++commit a6e56b97f62a3feeb3301c24a2e4cae55e546021 ++Author: Anthony Green ++Date: Wed Feb 9 15:00:42 2011 -0500 ++ ++ Add powerpc64-*-darwin* support ++ ++commit 747d6c32d4abb07c10c3a1f93579c3929aaa2487 ++Author: Anthony Green ++Date: Wed Feb 9 14:56:23 2011 -0500 ++ ++ Add Interix support ++ ++commit eab6e41cde382aa07de6c011d514a14c0d62eb47 ++Author: Anthony Green ++Date: Wed Feb 9 10:15:02 2011 -0500 ++ ++ Remove README.markdown form libffi-ios ++ ++commit 69dbe845f4ee3e6ce8999f17a1e4f2179ef7da89 ++Author: Anthony Green ++Date: Wed Feb 9 07:38:43 2011 -0500 ++ ++ Fix xfails ++ ++commit f498318c07b95137fe259d86bdbe15347588b84a ++Author: Anthony Green ++Date: Wed Feb 9 06:26:46 2011 -0500 ++ ++ Update README for iOS again ++ ++commit 630b9c0ac43c7edcbfd892e23c09fb26724f4ac0 ++Author: Anthony Green ++Date: Wed Feb 9 06:24:23 2011 -0500 ++ ++ Update to rc2 ++ ++commit 0cad4386fa4c9ea5f8ca88b16247db4e5c8fea90 ++Author: Anthony Green ++Date: Wed Feb 9 06:11:46 2011 -0500 ++ ++ Add ChangeLog entry. Fix copyright headers. ++ ++commit 09cb76f2645bd2c151846e9249d8ea707ba01e8c ++Author: Anthony Green ++Date: Tue Feb 8 20:39:51 2011 -0500 ++ ++ Add missing change ++ ++commit 2e3a48ccdd54340983c46a29a0b41985e3e789ac ++Author: Anthony Green ++Date: Tue Feb 8 20:37:26 2011 -0500 ++ ++ Fix make dist ++ ++commit 5e4814d9928e236a2a4afe84d6e1d4fdaa473206 ++Author: Anthony Green ++Date: Tue Feb 8 19:46:28 2011 -0500 ++ ++ fix permissions ++ ++commit 5c0cc6f1536aa1738795a97303810a823c7fa2cb ++Author: Anthony Green ++Date: Tue Feb 8 19:45:59 2011 -0500 ++ ++ 3.0.10rc1 ++ ++commit 857fe3de46d2286afa2fe772920ecf4aefa1688f ++Author: Anthony Green ++Date: Tue Feb 8 19:39:20 2011 -0500 ++ ++ Clean ups ++ ++commit e2214f8adb5577c247452e2cc9f4cbe304d7ca9f ++Author: Anthony Green ++Date: Tue Feb 8 19:22:56 2011 -0500 ++ ++ Update README ++ ++commit 1106229a5721a659da5c231ec0e8211119615394 ++Merge: bc9d0be f6ab3ed ++Author: Anthony Green ++Date: Tue Feb 8 19:20:09 2011 -0500 ++ ++ Add iOS support ++ ++commit bc9d0be2958ce475757f34dd2c878948aa77a39f ++Author: Anthony Green ++Date: Tue Feb 8 17:04:26 2011 -0500 ++ ++ 3.0.10rc0 changes ++ ++commit 3b836249feae6d08d3e6887486e4b9961ddafa09 ++Author: Anthony Green ++Date: Tue Feb 8 14:28:59 2011 -0500 ++ ++ Rebase from GCC ++ ++commit a26e3940619faeba6de54824c9540c90b1aab513 ++Author: Anthony Green ++Date: Tue Feb 8 13:56:12 2011 -0500 ++ ++ copyright updates patch ++ ++commit b8099539f00e224107594101e9760b6dc081a056 ++Author: Anthony Green ++Date: Tue Feb 8 13:50:43 2011 -0500 ++ ++ Fix msvcc.sh botch ++ ++commit dc411e8f99113a34656bfd2d3ae51259972488cc ++Author: Anthony Green ++Date: Tue Feb 8 10:49:29 2011 -0500 ++ ++ Fix HP-UX build ++ ++commit 404585d1348e30ac58203bbd876d9131e5aed874 ++Author: Anthony Green ++Date: Tue Feb 8 10:44:36 2011 -0500 ++ ++ Fix sparc v8 aggregate type returns for sun's compiler ++ ++commit 19ce713188e193e4522740d24c20170411883d2d ++Author: Anthony Green ++Date: Tue Feb 8 10:34:23 2011 -0500 ++ ++ grammar fix ++ ++commit 89284fe55f1a8ad3bddbea796ee00d0e3ba411ce ++Author: Anthony Green ++Date: Tue Feb 8 10:19:19 2011 -0500 ++ ++ Fix AIX build with IBM XLC ++ ++commit ba022c338af97cb18d9f8ed5a607fd483a61c09c ++Author: Anthony Green ++Date: Tue Feb 8 10:12:48 2011 -0500 ++ ++ fix win64-underscore patch ++ ++commit 097e5f3924ee92a3ba6cd72f787da8a3eb14fea3 ++Author: Anthony Green ++Date: Tue Feb 8 10:11:00 2011 -0500 ++ ++ x86 pcrel test part 2 ++ ++commit ed2c518d960b91d444be74e5a55779a9c4602f3b ++Author: Anthony Green ++Date: Tue Feb 8 10:10:07 2011 -0500 ++ ++ x86 pcrel test ++ ++commit 0e5843995f46900ef212531281e08b224464f413 ++Author: Anthony Green ++Date: Tue Feb 8 07:52:40 2011 -0500 ++ ++ Refresh from GCC ++ ++commit 5b9cd52784339a42e417174a55e310e214d435f9 ++Author: Anthony Green ++Date: Mon Nov 22 15:19:57 2010 -0500 ++ ++ win64-underscore patch ++ ++commit 2db72615b50eb5c0f29725c02c740a2f0d7fc7d9 ++Author: Anthony Green ++Date: Sun Nov 21 10:50:56 2010 -0500 ++ ++ Rebase ++ ++commit f6ab3edc23dc8fc7c47a31c896044150c23f04b5 ++Author: Landon Fuller ++Date: Wed Oct 27 19:34:51 2010 -0400 ++ ++ Include the license header in the generated output. ++ ++commit cef619462887fa0f360e3ee702d1e04f112b5b38 ++Author: Landon Fuller ++Date: Wed Oct 27 13:59:30 2010 -0400 ++ ++ Add missing copyright/license header. ++ ++commit 53f387b203413c9aa6e31f49dbb70d37d816330b ++Author: Landon Fuller ++Date: Sun Sep 19 19:57:17 2010 -0700 ++ ++ Minor README fix. ++ ++commit 4fbcb5b5fbce11f4b168060e00639db33c85b75b ++Author: Landon Fuller ++Date: Sun Sep 19 19:50:37 2010 -0700 ++ ++ Minor README fix. ++ ++commit 8e7652ef6acab5db7a29f786686a54f05cdbdc7d ++Author: Landon Fuller ++Date: Sun Sep 19 19:49:39 2010 -0700 ++ ++ Add a libffi-ios-specific github README. ++ ++commit 83038cf24aa1a92b62b91ffee1dcc25d79243484 ++Author: Landon Fuller ++Date: Sun Sep 19 14:36:45 2010 -0700 ++ ++ Implement FFI_EXEC_TRAMPOLINE_TABLE allocator for iOS/ARM. ++ ++ This provides working closure support on iOS/ARM devices where ++ PROT_WRITE|PROT_EXEC is not permitted. The code passes basic ++ smoke tests, but requires further review. ++ ++commit b00ff3e98fdde622cef617030e14d5356dff988f ++Author: Landon Fuller ++Date: Sun Sep 19 14:22:26 2010 -0700 ++ ++ Rename the generated symbol ++ ++commit da2773e02ab26cc11a7fe87e985599f35cdf0649 ++Author: Landon Fuller ++Date: Sun Sep 19 14:21:37 2010 -0700 ++ ++ Modify the ffi_closure structures to hold table/table entry pointers instead of a code buffer. ++ ++commit 01d71b7bed41844f80cb9feef20dcc5ece5ba2d0 ++Author: Landon Fuller ++Date: Sun Sep 19 14:21:14 2010 -0700 ++ ++ Regenerated the autoconf script ++ ++commit 19afda0069c42e51c81dca7b10a5cf884b4cdce0 ++Author: Landon Fuller ++Date: Sun Sep 19 14:20:52 2010 -0700 ++ ++ Enable AC_SUBST for FFI_EXEC_TRAMPOLINE_TABLE ++ ++commit 9e1196444e78aef20028c18891f44ebe39a815fd ++Author: Landon Fuller ++Date: Sun Sep 19 10:43:06 2010 -0700 ++ ++ Add a hard-coded FFI_EXEC_TRAMPOLINE_TABLE arm implementation. ++ ++ This implements support for re-mapping a shared table of executable ++ trampolines directly in front of a writable configuration page, working ++ around PROT_WRITE restrictions for sandboxed applications on Apple's ++ iOS. ++ ++ This implementation is for testing purposes; a proper allocator is still ++ necessary, and ARM-specific code needs to be moved out of ++ src/closures.c. ++ ++commit f38364b399184e682fc3e785084bd497827bc5af ++Author: Landon Fuller ++Date: Sun Sep 19 10:42:36 2010 -0700 ++ ++ Fix symbol prefix for ffi_closure_SYSV_inner on Darwin. ++ ++commit 36849e7716b77aa25e4175d1f4be1b93dbf47aac ++Author: Landon Fuller ++Date: Sun Sep 19 09:35:04 2010 -0700 ++ ++ Whitespace/comment fixes. ++ ++commit b764162526854686e579a48b6ac5981f4eb886a3 ++Author: Landon Fuller ++Date: Sun Sep 19 09:04:34 2010 -0700 ++ ++ Fix the script name (build-iphone.sh -> build-ios.sh) ++ ++commit a3d9aa85013341451ea97766485b7a11852d32b2 ++Author: Landon Fuller ++Date: Sun Sep 19 09:03:52 2010 -0700 ++ ++ Update the autogenerated autoconf/automake files. ++ ++commit c71480eaf839f26bbdfcd8965f65ac4d8defddc0 ++Author: Landon Fuller ++Date: Sun Sep 19 09:02:05 2010 -0700 ++ ++ Update automake/autoconf to conditionally build src/arm/trampoline.S if FFI_EXEC_TRAMPOLINE_TABLE is enabled. ++ ++commit 9af9291b73bc5e27ecd949bec8157f20426d65b8 ++Author: Landon Fuller ++Date: Sun Sep 19 08:52:33 2010 -0700 ++ ++ Add the trampoline table generated by gentramp.sh ++ ++commit 68ce0c383ece84f69945d1c8c3fed03f7f9cb5d6 ++Author: Landon Fuller ++Date: Sun Sep 19 08:38:19 2010 -0700 ++ ++ Add a shell script that generates the ARM trampoline page. ++ ++ This generates a page of 340 trampolines, aligned within one page. The ++ trampolines use pc-relative addressing to reference config data ++ (context, jump address) from a page placed directly prior to the ++ trampoline page. This can be used on systems -- such as iOS -- that do not ++ support writable, executable memory by remapping the executable page ++ containing the trampolines directly above a newly allocated writable ++ config page. ++ ++commit 75af086be8830a8eafe9b1ebda199d788bcb0c62 ++Author: Landon Fuller ++Date: Sat Sep 18 18:12:19 2010 -0700 ++ ++ Update autoconf files ++ ++commit 1ac92cca9b02ef8d6a769f0de1adccd5c9630355 ++Author: Landon Fuller ++Date: Sat Sep 18 18:08:14 2010 -0700 ++ ++ Add autoconf check for W^X platforms that require a trampoline table. ++ ++ This adds the FFI_EXEC_TRAMPOLINE_TABLE. The flag is enabled for ++ arm-apple-darwin, where PROT_EXEC on writable (or formerly writable) pages is ++ not permitted for sandboxed binaries. ++ ++commit be72fbab29b7190c702d8e1ac3d149855e95879d ++Author: Landon Fuller ++Date: Sat Sep 18 18:02:25 2010 -0700 ++ ++ Use the correct host triple for arm/darwin ++ ++commit 70150bdf4509269965c72f2032bf74f285767afe ++Author: Landon Fuller ++Date: Sat Sep 18 16:38:03 2010 -0700 ++ ++ Add missing UNWIND entry; disables .pad on non-EABI targets. ++ ++commit 6b452bafaec498df975ba8ac4c99de174e5f74f7 ++Author: Landon Fuller ++Date: Sat Sep 18 16:21:32 2010 -0700 ++ ++ Apple assembler support; fixed most gas/ELF-isms. ++ ++commit 8ddac835b6f8b54ede764d0ea977dee4c82e2d67 ++Author: Landon Fuller ++Date: Sat Sep 18 15:38:06 2010 -0700 ++ ++ Fix placement of the __APPLE__ macro. ++ ++commit 69043d02936bb0579ac59b4ee1ed8dec38c38db7 ++Author: Landon Fuller ++Date: Sat Sep 18 15:32:08 2010 -0700 ++ ++ Work-around libffi's FP ABI detection. ++ ++ On iOS, we must use the AAPCS floating point return value calling ++ conventions. libffi's ARM implementation will only use these conventions ++ if __SOFTFP__ is defined, which is not the case when GCC's ++ -mfloat-abi defaults to 'softfp' instead of 'soft'. To work around this ++ we manually define __SOFTFP__ for Apple platforms in the ARM-specific ++ sysv.S. ++ ++ See also: ++ http://developer.apple.com/library/ios/#documentation/Xcode/Conceptual/iPhoneOSABIReference/Introduction/Introduction.html ++ http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/IHI0042D_aapcs.pdf ++ ++commit a82e6c354ea805114642a6e440abd0832cb1d23f ++Author: Landon Fuller ++Date: Sat Sep 18 14:44:24 2010 -0700 ++ ++ Add a stub iOS build script to drive autoconf ++ ++commit 84e8de6e9fc19388f6f1102c013b7d0d52940ecc ++Author: Anthony Green ++Date: Fri Aug 6 01:35:12 2010 -0400 ++ ++ Restore execute permissions ++ ++commit 3aeecc9eb1a6feba6549849cdd335c926415a4fc ++Author: Anthony Green ++Date: Thu Aug 5 15:19:00 2010 -0400 ++ ++ Fix win64-struct-args patch ++ ++commit 00d0b59cd13f89ab8b44bd894eb7f0a131fcb472 ++Author: Anthony Green ++Date: Thu Aug 5 14:56:53 2010 -0400 ++ ++ Fix debug build for windows ++ ++commit bda487e87064f27965155459a62dc52a744778d0 ++Author: Anthony Green ++Date: Thu Aug 5 09:02:41 2010 -0400 ++ ++ Don't use -safeseh with ml64 ++ ++commit c1d28ba8d5029795af313ffeb81c97efc6d4c847 ++Author: Anthony Green ++Date: Thu Aug 5 08:48:16 2010 -0400 ++ ++ stdcall-x86-closure-fix ++ ++commit 5feacad4a56c85b3f23a267a30b2cf424cd59548 ++Author: Anthony Green ++Date: Thu Aug 5 08:30:04 2010 -0400 ++ ++ define generic symbols carefully ++ ++commit 10ea848900bc3018ac213cef52b44cacbe5cbebc ++Author: Anthony Green ++Date: Thu Aug 5 08:24:27 2010 -0400 ++ ++ don't copy win64 struct args ++ ++commit d14178be4c49c3ada44a9fe9efe11d444372ddab ++Author: Anthony Green ++Date: Fri Jul 23 09:14:00 2010 -0400 ++ ++ FFI_LAST_ABI fix ++ ++commit 3f5b1375ab1e2b8e3d593e21b27097a4a50f9b83 ++Author: Anthony Green ++Date: Mon Jul 12 14:39:18 2010 -0400 ++ ++ rebase ++ ++commit eaf444eabc4c78703c0f98ac0197b1619c1b1bef ++Author: Anthony Green ++Date: Sat Jul 10 08:59:09 2010 -0400 ++ ++ Fix selinux test ++ ++commit 630974152247f100ece4d44f10c3721bb4599fbf ++Author: Anthony Green ++Date: Wed May 5 20:14:56 2010 -0400 ++ ++ Micharl Kohler's spelling fixes ++ ++commit 9dc9a293f3d4589fcaf02dd4288c8cebaefa508e ++Author: Anthony Green ++Date: Tue Apr 13 10:33:52 2010 -0400 ++ ++ Rebase to latest GCC sources ++ ++commit f2c2a4fce9b3eca9f39b4f3545118bc256da4a73 ++Author: Anthony Green ++Date: Tue Apr 13 10:19:28 2010 -0400 ++ ++ Remove warnings and add OS/2 support ++ ++commit c0b69e57d529e33d18b658cc5572a21e3663247c ++Author: Anthony Green ++Date: Tue Mar 30 08:30:22 2010 -0400 ++ ++ Dan Witte's windows build fixes. ++ ++commit 59a259f4d348f593b45f452309f4d020a28051c4 ++Author: Anthony Green ++Date: Mon Mar 15 05:57:51 2010 -0400 ++ ++ Remove junk file ++ ++commit 3de1eb36d37a66829e606421939874d0d60d816d ++Author: Anthony Green ++Date: Mon Mar 15 05:57:24 2010 -0400 ++ ++ fix-comments patch ++ ++commit c3813b6d7f8a777700f4c5862190c0db148d4de8 ++Author: Anthony Green ++Date: Tue Jan 26 16:48:56 2010 -0500 ++ ++ Rebuild Makefiles with automake 1.11.1 for CVE-2009-4029. ++ ++commit 8d27f68baa365bf883b6053c5f6bc819646d5434 ++Author: Anthony Green ++Date: Fri Jan 15 11:35:37 2010 -0500 ++ ++ Mention recent changes in README ++ ++commit ff3cd68b8cf2d9a28cad7aa9beff46236eacec8c ++Author: Anthony Green ++Date: Fri Jan 15 11:27:24 2010 -0500 ++ ++ Add msvc.sh wrapper ++ ++commit cadeba6cb53414a1253582f1719c286665de7b6c ++Author: Anthony Green ++Date: Fri Jan 15 10:46:51 2010 -0500 ++ ++ Microsoft Visual C port ++ ++commit 0739e7dc00db766eb64f502ec4137b817638c9a1 ++Author: Anthony Green ++Date: Fri Jan 15 09:48:33 2010 -0500 ++ ++ Add x86 Sun Studio compiler support ++ ++commit edfdfd2e85b8d01d2455934f1d7f4d7eb2f3cf1c ++Author: Anthony Green ++Date: Wed Jan 13 02:56:19 2010 -0500 ++ ++ Add closure example doc ++ ++commit 7b7a42f221cf171e8d09df34cac6dc1fd8458cc3 ++Author: Anthony Green ++Date: Tue Jan 12 09:14:14 2010 -0500 ++ ++ Rebase from GCC ++ ++commit 4b18d1f73dc7733137869e4ab5725cb90c1c8fde ++Author: Anthony Green ++Date: Fri Jan 1 10:24:27 2010 -0500 ++ ++ Add x86-64 MingW to README ++ ++commit c3042afaf3f84abbbe9c91bf9bc9896b0d9eb003 ++Author: Anthony Green ++Date: Fri Jan 1 08:08:02 2010 -0500 ++ ++ Reset quilt patches post 3.0.9 merge with GCC ++ ++commit b0304e9679bdfec6ac45a57b5c96542697249418 ++Author: Anthony Green ++Date: Thu Dec 31 11:32:40 2009 -0500 ++ ++ Update version ++ ++commit 2e7e03d014d9c9bf40e97ce75cba089ad052fa6b ++Author: Anthony Green ++Date: Thu Dec 31 07:43:22 2009 -0500 ++ ++ Final updates before 3.0.9 ++ ++commit aea706c52825c8eee677ffa7fdbdd3aed1725492 ++Author: Anthony Green ++Date: Tue Dec 29 10:09:31 2009 -0500 ++ ++ really 3.0.9rc12 ++ ++commit 0cfe60e9d13f132b88995cfee41f2156344f6fa2 ++Author: Anthony Green ++Date: Tue Dec 29 10:06:04 2009 -0500 ++ ++ 3.0.9rc12 ++ ++commit 14e2e92e8645804b6940b3e96c98e9f7f384a6b2 ++Author: Anthony Green ++Date: Sun Dec 27 21:03:33 2009 -0500 ++ ++ 3.0.9rc11 ++ ++commit 884402787bf8eaf7ec207085037cf8ace2f660ec ++Author: Anthony Green ++Date: Sat Dec 26 12:57:23 2009 -0500 ++ ++ HPUX support and avr32 test fixes. ++ ++commit 01c78756aff22efb1f122f8e93e068d7bf2185c7 ++Author: Anthony Green ++Date: Sat Dec 26 10:05:18 2009 -0500 ++ ++ 3.0.9rc9 ++ ++commit 70868464651320268d79c6894db5a50fdc11032a ++Author: Anthony Green ++Date: Sat Dec 26 09:58:03 2009 -0500 ++ ++ Remove xfails for mips and arm ++ ++commit 838d4ad920ec85cf5ca3b511221d67f6d9a99024 ++Author: Anthony Green ++Date: Sat Dec 26 09:57:27 2009 -0500 ++ ++ Remove a bunch of xfails. ++ ++commit 7e37eaaf772f48906e69618c773b0a36c3927de9 ++Author: Anthony Green ++Date: Sat Dec 26 07:46:50 2009 -0500 ++ ++ Fix huge_struct for solaris ++ ++commit 07cc7a37194bc34064ebed7f2724333a798411c8 ++Author: Anthony Green ++Date: Sat Dec 26 07:23:04 2009 -0500 ++ ++ 3.0.9rc8 ++ ++commit 2b9be16ffabc81326128bc1bbdddff8ddc5d13d3 ++Author: Anthony Green ++Date: Sat Dec 26 07:04:45 2009 -0500 ++ ++ 3.0.9rc8 ++ ++commit 9458d88f676e9a21ab8993a54e16754b11687419 ++Author: Anthony Green ++Date: Sat Dec 26 07:02:27 2009 -0500 ++ ++ Rebase from GCC ++ ++commit 6a3412417593f068a04dc6163f4269cb295ad5ca ++Author: Anthony Green ++Date: Sat Dec 26 06:51:33 2009 -0500 ++ ++ Add Andreas Schwab's powerpc fix ++ ++commit 39c8792ece1043f41f4c395a2ce71f4cf0ff4674 ++Author: Anthony Green ++Date: Fri Dec 25 21:52:28 2009 -0500 ++ ++ 3.0.9rc7 ++ ++commit 1d04af52e3e24db69f742064694c22f8df5cc70e ++Author: Anthony Green ++Date: Fri Dec 25 09:50:36 2009 -0500 ++ ++ Updated some mips XFAILs ++ ++commit 26e9509c9b7929bc4fcf697071699051a652b1fd ++Author: Anthony Green ++Date: Fri Dec 25 02:19:23 2009 -0500 ++ ++ Clean up ChangeLog.libffi for older patches. ++ ++commit 9c157d3215e4393777f83eb6fa801df6528f40d7 ++Author: Anthony Green ++Date: Fri Dec 25 02:15:40 2009 -0500 ++ ++ Clean up undefine_AC_ARG_VAR_PRECIOUS patch. ++ ++commit d22de05b0bfc480766bc1240615ce2830eee71b8 ++Author: Anthony Green ++Date: Fri Dec 25 02:04:23 2009 -0500 ++ ++ Fix patches ++ ++commit 1fe3dc7c20dc4dbd8fed0d19c8618027d44ed971 ++Author: Anthony Green ++Date: Fri Dec 25 01:39:00 2009 -0500 ++ ++ Add windows support patch. ++ ++commit f7c0bc613a88f7dbc2d18b345c10fa438833c170 ++Author: Anthony Green ++Date: Fri Dec 25 01:22:11 2009 -0500 ++ ++ 3.0.9rc6 ++ ++commit c7fa2da8260258c11ab1dc7ac06fb611a2c1b50f ++Author: Anthony Green ++Date: Thu Dec 24 07:22:44 2009 -0500 ++ ++ 3.0.9rc6 ++ ++commit da11bece0fde66fc0268db3a01207dda857e25d2 ++Author: Anthony Green ++Date: Thu Dec 24 05:34:46 2009 -0500 ++ ++ Release 3.0.9rc5 ++ ++commit e3399b11edeab546b066bfc18574f3edb905d0dc ++Author: Anthony Green ++Date: Thu Dec 24 01:09:32 2009 -0500 ++ ++ Update README ++ ++commit 115ab36fceee69740a01ce49bc27e1908cc237b1 ++Author: Anthony Green ++Date: Thu Dec 24 00:22:00 2009 -0500 ++ ++ Update missing changes for 3.0.9r4. ++ ++commit f8c7a245bf5a80bd7e730ec03fcad17c8dcfcb07 ++Author: Anthony Green ++Date: Wed Dec 23 23:46:22 2009 -0500 ++ ++ Switch to quilt. Rebase to latest GCC. ++ ++commit ce806772f02387b9a74f6496a263a368bccd5d59 ++Merge: cd98813 dcc1f6b ++Author: Anthony Green ++Date: Mon Oct 5 00:41:35 2009 -0400 ++ ++ Merge branch 'master' of git@github.com:atgreen/libffi ++ ++commit dcc1f6b4f1ffd2713bf68b791a13f85d455c8b1b ++Author: Anthony Green ++Date: Mon Oct 5 00:29:33 2009 -0400 ++ ++ More clean up. ++ ++commit 2829f5941a223b9d851d8ab6318318e6197d7e01 ++Author: Anthony Green ++Date: Mon Oct 5 00:28:03 2009 -0400 ++ ++ Clean up ++ ++commit cd98813de517ea64041637e3e78d27a001d6d3b4 ++Author: Anthony Green ++Date: Mon Oct 5 00:25:29 2009 -0400 ++ ++ From Jens Rehsack. Fix for 64-bit AIX. ++ ++commit e4a91de766acc47f6c50f13cc11719a65e23ecba ++Author: Anthony Green ++Date: Mon Oct 5 00:16:17 2009 -0400 ++ ++ From Abdulaziz Ghuloum. Adds special case for Snow Leopard. ++ ++commit 3425a763bcdaadb8b430226f427ec833afdcc96a ++Author: Anthony Green ++Date: Sun Oct 4 23:57:29 2009 -0400 ++ ++ Fix detection of free/openbsd. From Alexis Ballier. ++ ++commit 2340e7a777902de61499d47823ad8d5e0eeb6203 ++Author: Anthony Green ++Date: Sun Oct 4 23:53:17 2009 -0400 ++ ++ AVR support ++ ++commit 5cbe2058c128e848446ae79fe15ee54260a90559 ++Author: Anthony Green ++Date: Sun Oct 4 23:53:11 2009 -0400 ++ ++ Initial stand-alone patch. ++ ++commit c6dddbd02bad9654ed58cdb0feb360934d105dec ++Author: Anthony Green ++Date: Sun Oct 4 08:11:33 2009 -0400 ++ ++ Initial commit ++ ++commit 5ffc0c37486fb1538bccc0ca7acc807d4f1af932 ++Author: Anthony Green ++Date: Sun Oct 4 07:58:22 2009 -0400 ++ ++ Update version to 3.0.9rc1. Add more useful things to .gitignore. ++ ++commit bd29f83ee9f6fa6b65adee9d3f57834f364d9887 ++Author: Anthony Green ++Date: Tue Sep 29 12:07:26 2009 -0400 ++ ++ Add .gitignore ++ ++commit 9474f853f83e3f0167c1b306177321bfcc93e56d ++Author: Anthony Green ++Date: Tue Sep 29 11:13:02 2009 -0400 ++ ++ Remove old CVSROOT files. ++ ++commit 0c25275ec24bfe2c2c25a000465f0950ef9dd51b ++Author: twall ++Date: Wed Aug 19 12:57:34 2009 +0000 ++ ++ Apply Dave Korn's cygwin/GCC changes ++ ++commit 39228c27ed3f677a95b46380a8d31602b5777e1a ++Author: aph ++Date: Tue Jun 16 18:00:47 2009 +0000 ++ ++ 2009-06-16 Wim Lewis ++ ++ * src/powerpc/ffi.c: Avoid clobbering cr3 and cr4, which are ++ supposed to be callee-saved. ++ * src/powerpc/sysv.S (small_struct_return_value): Fix overrun of ++ return buffer for odd-size structs. ++ ++commit 5e93cc704d127c2c8ae7f5d2cef621145d43e777 ++Author: aph ++Date: Tue Jun 16 17:41:47 2009 +0000 ++ ++ 2009-06-16 Andreas Tobler ++ ++ PR libffi/40444 ++ * testsuite/lib/libffi-dg.exp (libffi_target_compile): Add ++ allow_stack_execute for Darwin. ++ ++commit b509af8959dc371b92392c623522ea6f4946a71d ++Author: aph ++Date: Tue Jun 16 16:17:52 2009 +0000 ++ ++ 2009-06-16 Andrew Haley ++ ++ * configure.ac (TARGETDIR): Add missing blank lines. ++ * configure: Regenerate. ++ ++commit d57e96dc56ee76fbbb9b59d73aeaa92354db5ecb ++Author: aph ++Date: Tue Jun 16 09:59:02 2009 +0000 ++ ++ 2009-06-16 Andrew Haley ++ ++ * testsuite/libffi.call/cls_align_sint64.c, ++ testsuite/libffi.call/cls_align_uint64.c, ++ testsuite/libffi.call/cls_longdouble_va.c, ++ testsuite/libffi.call/cls_ulonglong.c, ++ testsuite/libffi.call/return_ll1.c, ++ testsuite/libffi.call/stret_medium2.c: Fix printf format ++ specifiers. ++ * testsuite/libffi.call/huge_struct.c: Ad x86 XFAILs. ++ * testsuite/libffi.call/float2.c: Fix dg-excess-errors. ++ * testsuite/libffi.call/ffitest.h, ++ testsuite/libffi.special/ffitestcxx.h (PRIdLL, PRIuLL): Define. ++ ++commit b01d6d1982c9e020507029bfd5a58a8c60d111fa ++Author: aph ++Date: Tue Jun 16 09:44:54 2009 +0000 ++ ++ 2009-06-16 Andrew Haley ++ ++ * testsuite/libffi.call/err_bad_typedef.c: xfail everywhere. ++ * testsuite/libffi.call/err_bad_abi.c: Likewise. ++ ++commit 35b6ded138591900a88055a8a8ac1fadc29a76d6 ++Author: aph ++Date: Fri Jun 12 15:29:20 2009 +0000 ++ ++ 2009-06-11 Kaz Kojima ++ ++ * testsuite/libffi.call/cls_longdouble_va.c: Add xfail sh*-*-linux-*. ++ * testsuite/libffi.call/err_bad_abi.c: Add xfail sh*-*-*. ++ * testsuite/libffi.call/err_bad_typedef.c: Likewise. ++ ++commit acc46605f2d95d67d69398e7644610f10a157ce3 ++Author: aph ++Date: Fri Jun 12 14:21:28 2009 +0000 ++ ++ 2009-06-12 Andrew Haley ++ ++ * ChangeLog.libffi: testsuite/libffi.call/cls_align_sint64.c, ++ testsuite/libffi.call/cls_align_uint64.c, ++ testsuite/libffi.call/cls_ulonglong.c, ++ testsuite/libffi.call/return_ll1.c, ++ testsuite/libffi.call/stret_medium2.c: Fix printf format ++ specifiers. ++ testsuite/libffi.special/unwindtest.cc: include stdint.h. ++ ++commit 16d1996ed0797bd7c11aca2b0fe7e7748751aaf6 ++Author: twall ++Date: Thu Jun 11 14:27:42 2009 +0000 ++ ++ update changelog ++ ++commit 92a515c33efe91be3cb0258f01c63aff208489c7 ++Author: twall ++Date: Thu Jun 11 14:27:28 2009 +0000 ++ ++ use ffi_closure_alloc instead of stack-based closure ++ ++commit e4363160ba9e50167f9ca0a7399d537a1d2cd0ce ++Author: twall ++Date: Thu Jun 11 14:26:23 2009 +0000 ++ ++ remove unused extern ++ ++commit 1dc2781d2ba38f5f000ff70069d617fb21e1d2af ++Author: twall ++Date: Thu Jun 11 11:36:16 2009 +0000 ++ ++ remove not-yet-applied changelog entries ++ ++commit bb27735fe689dac97ec0dc847ed8d3d519620109 ++Author: twall ++Date: Wed Jun 10 10:42:36 2009 +0000 ++ ++ add win64 support ++ ++commit b2a54c100c74854a409820817d54617fdda39eb8 ++Author: aph ++Date: Mon Jun 8 16:50:49 2009 +0000 ++ ++ 2009-06-08 Andrew Haley ++ ++ * testsuite/libffi.call/err_bad_abi.c: Add xfails. ++ * testsuite/libffi.call/cls_longdouble_va.c: Add xfails. ++ * testsuite/libffi.call/cls_dbls_struct.c: Add xfail x86_64-*-linux-*. ++ * testsuite/libffi.call/err_bad_typedef.c: Add xfails. ++ ++ * testsuite/libffi.call/stret_medium2.c: Add __UNUSED__ to args. ++ * testsuite/libffi.call/stret_medium.c: Likewise. ++ * testsuite/libffi.call/stret_large2.c: Likewise. ++ * testsuite/libffi.call/stret_large.c: Likewise. ++ ++commit 25723e7141f73d3736d7244b980c89d97db852b6 ++Author: aph ++Date: Fri Jun 5 13:03:40 2009 +0000 ++ ++ 2009-06-05 Andrew Haley ++ ++ * src/x86/win32.S (_ffi_closure_STDCALL): Import from gcc. ++ ++commit 70758199c7cd41f411987360ccb302b497a56dc9 ++Author: aph ++Date: Thu Jun 4 16:29:58 2009 +0000 ++ ++ 2009-06-04 Andrew Haley ++ ++ * src/powerpc/ffitarget.h: Fix misapplied merge from gcc. ++ ++commit e8bb12563f9aa23ddf36fa6a5b92b16b5c3e1a7f ++Author: aph ++Date: Thu Jun 4 14:59:18 2009 +0000 ++ ++ 2009-06-04 Andrew Haley ++ ++ * src/mips/o32.S, ++ src/mips/n32.S: Fix licence formatting. ++ ++commit d66a8e32c3671479e3ce0f6819673e5932ba6b7f ++Author: aph ++Date: Thu Jun 4 14:43:40 2009 +0000 ++ ++ 2009-06-04 Andrew Haley ++ ++ * src/x86/darwin.S: Fix licence formatting. ++ src/x86/win32.S: Likewise. ++ src/sh64/sysv.S: Likewise. ++ src/sh/sysv.S: Likewise. ++ ++commit 7c3b7fd6b5db746b5b09a718f3044f811372f941 ++Author: aph ++Date: Thu Jun 4 14:39:20 2009 +0000 ++ ++ 2009-06-04 Andrew Haley ++ ++ * src/sh64/ffi.c: Remove lint directives. Was missing from merge ++ of Andreas Tobler's patch from 2006-04-22. ++ ++commit 1a2f93a8b362db13638afd9fcb3f2650180bfa17 ++Author: aph ++Date: Thu Jun 4 10:45:51 2009 +0000 ++ ++ 2009-06-04 Andrew Haley ++ ++ * src/sh/ffi.c: Apply missing hunk from Alexandre Oliva's patch of ++ 2007-03-07. ++ ++commit 944c95cf7aaaaf7c5fa368cda4673dd38f45020e ++Author: aph ++Date: Wed Jun 3 17:42:56 2009 +0000 ++ ++ 2009-05-22 Dave Korn ++ ++ * src/x86/win32.S (_ffi_closure_STDCALL): New function. ++ (.eh_frame): Add FDE for it. ++ ++ 2009-05-22 Dave Korn ++ ++ * configure.ac: Also check if assembler supports pc-relative ++ relocs on X86_WIN32 targets. ++ * configure: Regenerate. ++ * src/x86/win32.S (ffi_prep_args): Declare extern, not global. ++ (_ffi_call_SYSV): Add missing function type symbol .def and ++ add EH markup labels. ++ (_ffi_call_STDCALL): Likewise. ++ (_ffi_closure_SYSV): Likewise. ++ (_ffi_closure_raw_SYSV): Likewise. ++ (.eh_frame): Add hand-crafted EH data. ++ ++ 2008-11-21 Eric Botcazou ++ ++ * src/sparc/ffi.c (ffi_prep_cif_machdep): Add support for ++ signed/unsigned int8/16 return values. ++ * src/sparc/v8.S (ffi_call_v8): Likewise. ++ (ffi_closure_v8): Likewise. ++ ++ 2008-03-26 Kaz Kojima ++ ++ * src/sh/sysv.S: Add .note.GNU-stack on Linux. ++ * src/sh64/sysv.S: Likewise. ++ ++ 2008-03-26 Daniel Jacobowitz ++ ++ * src/arm/sysv.S: Fix ARM comment marker. ++ ++commit 00fa972430bb1535a4b34bf029ebcad500027b0c ++Author: twall ++Date: Sat Dec 27 16:59:05 2008 +0000 ++ ++ properly glob-match ++ ++commit f5179e6794ac35af26fe86e468b8508a7a570c55 ++Author: twall ++Date: Fri Dec 26 19:06:28 2008 +0000 ++ ++ Mark XFAIL on longdouble tests for x86_64/mingw ++ ++commit 80e2b5a749208c8a18f994ec5bee84594d051cc8 ++Author: twall ++Date: Mon Dec 22 15:21:15 2008 +0000 ++ ++ clean up tests for win64 use ++ ++commit 7063d9996f742576095c7b0eb5016c0f9a670aec ++Author: green ++Date: Fri Dec 19 16:13:46 2008 +0000 ++ ++ Version 3.0.8 with x86-solaris support ++ ++commit bdfeb13f0df0a63b19d62597517237b54d92228b ++Author: green ++Date: Fri Dec 19 15:47:44 2008 +0000 ++ ++ Bump to 3.0.7 ++ ++commit 69205de17d6ac4c11d4ba92d6a5b40a0c5f246b2 ++Author: green ++Date: Thu Jul 24 18:03:48 2008 +0000 ++ ++ Many test fixes (failures due to excessive compiler warnings). ++ ++commit 260d513fea00b3613fe957a44a157fe72c4ca29e ++Author: green ++Date: Thu Jul 17 13:13:52 2008 +0000 ++ ++ Version 3.0.6. sh/sh64 fixes. ++ ++commit 3704031875feabb74e3655ed03cff4c2b3c76ac6 ++Author: green ++Date: Thu Apr 3 18:57:57 2008 +0000 ++ ++ Rev 3.0.5. ++ ++commit 8406f5f48f7f58a1c982a93a95d521cf82b3241f ++Author: green ++Date: Thu Apr 3 18:57:34 2008 +0000 ++ ++ 3.0.5 ++ ++commit 23a9e73212b62f9684cedb0ce70e92c59cfdaffa ++Author: green ++Date: Wed Mar 5 00:07:02 2008 +0000 ++ ++ 2008-03-04 Anthony Green ++ Blake Chaffin ++ hos@tamanegi.org ++ ++ * testsuite/libffi.call/cls_align_longdouble_split2.c ++ testsuite/libffi.call/cls_align_longdouble_split.c ++ testsuite/libffi.call/cls_dbls_struct.c ++ testsuite/libffi.call/cls_double_va.c ++ testsuite/libffi.call/cls_longdouble.c ++ testsuite/libffi.call/cls_longdouble_va.c ++ testsuite/libffi.call/cls_pointer.c ++ testsuite/libffi.call/cls_pointer_stack.c ++ testsuite/libffi.call/err_bad_abi.c ++ testsuite/libffi.call/err_bad_typedef.c ++ testsuite/libffi.call/huge_struct.c ++ testsuite/libffi.call/stret_large2.c ++ testsuite/libffi.call/stret_large.c ++ testsuite/libffi.call/stret_medium2.c ++ testsuite/libffi.call/stret_medium.c: New tests from Apple. ++ ++commit 429e37d3ad653e52e75bf725c883ab79e859f89a ++Author: green ++Date: Thu Feb 28 04:50:19 2008 +0000 ++ ++ clicky ++ ++commit 51e79c428348c033314f54bcb30f7e388c59e347 ++Author: green ++Date: Thu Feb 28 04:47:35 2008 +0000 ++ ++ getclicky ++ ++commit affcab04e280efeace45a72c4dc6152c0e4f1b7f ++Author: green ++Date: Tue Feb 26 19:01:53 2008 +0000 ++ ++ 2008-02-26 Jakub Jelinek ++ Anthony Green ++ ++ * src/alpha/osf.S: Add .note.GNU-stack on Linux. ++ * src/s390/sysv.S: Likewise. ++ * src/powerpc/linux64.S: Likewise. ++ * src/powerpc/linux64_closure.S: Likewise. ++ * src/powerpc/ppc_closure.S: Likewise. ++ * src/powerpc/sysv.S: Likewise. ++ * src/x86/unix64.S: Likewise. ++ * src/x86/sysv.S: Likewise. ++ * src/sparc/v8.S: Likewise. ++ * src/sparc/v9.S: Likewise. ++ * src/m68k/sysv.S: Likewise. ++ * src/ia64/unix.S: Likewise. ++ * src/arm/sysv.S: Likewise. ++ ++commit 59689d5522c159a3ac967adb6b891cf5f22c890f ++Author: green ++Date: Tue Feb 26 17:40:51 2008 +0000 ++ ++ 2008-02-26 Anthony Green ++ Thomas Heller ++ ++ * src/x86/ffi.c (ffi_closure_SYSV_inner): Change C++ comment to C ++ comment. ++ ++commit b13c84cf4668828ff8429ba4a2f94cd1eb574ae0 ++Author: green ++Date: Tue Feb 26 17:38:15 2008 +0000 ++ ++ 2008-02-26 Anthony Green ++ Thomas Heller ++ ++ * include/ffi.h.in: Change void (*)() to void (*)(void). ++ ++commit 265289f679ffd24a88ae1aa2cef0e4aa14703cd8 ++Author: green ++Date: Tue Feb 26 17:34:36 2008 +0000 ++ ++ 2008-02-26 Anthony Green ++ ++ * src/alpha/ffi.c: Change void (*)() to void (*)(void). ++ src/alpha/osf.S, src/arm/ffi.c, src/frv/ffi.c, src/ia64/ffi.c, ++ src/ia64/unix.S, src/java_raw_api.c, src/m32r/ffi.c, ++ src/mips/ffi.c, src/pa/ffi.c, src/pa/hpux32.S, src/pa/linux.S, ++ src/powerpc/ffi.c, src/powerpc/ffi_darwin.c, src/raw_api.c, ++ src/s390/ffi.c, src/sh/ffi.c, src/sh64/ffi.c, src/sparc/ffi.c, ++ src/x86/ffi.c, src/x86/unix64.S, src/x86/darwin64.S,> src/x86/ffi64.c: Ditto. ++ ++commit fb5036cd6d0f909918e90f7d2d9fd80d46682d5d ++Author: green ++Date: Sun Feb 24 17:25:25 2008 +0000 ++ ++ fix date ++ ++commit 40bec108e7d0181e6c9928aa7a33187bcc0f3d6f ++Author: green ++Date: Sun Feb 24 17:25:02 2008 +0000 ++ ++ New release ++ ++commit b922048fa82ea109a4af269ee47bbc2a586bbac2 ++Author: green ++Date: Sun Feb 24 17:24:00 2008 +0000 ++ ++ 2008-02-24 Anthony Green ++ ++ * configure.ac: Accept openbsd*, not just openbsd. ++ Bump version to 3.0.4. ++ * configure, doc/stamp-vti, doc/version.texi: Rebuilt. ++ * libtool-version: Increment revision. ++ * README: Update for new release. ++ ++commit affca4b92d06e5554784c7e9b233029ef83f7d8a ++Author: green ++Date: Fri Feb 22 21:53:29 2008 +0000 ++ ++ sync readme with web page. ++ ++commit 3e53d8752ea74859b4c64fbbf935e62a937c4d78 ++Author: green ++Date: Fri Feb 22 21:52:38 2008 +0000 ++ ++ New release ++ ++commit 4d92f6c8e78fe084be65f3e8b58b859901ba796d ++Author: green ++Date: Fri Feb 22 21:49:46 2008 +0000 ++ ++ 2008-02-22 Anthony Green ++ ++ * configure.ac: Bump version to 3.0.3. ++ * configure, doc/stamp-vti, doc/version.texi: Rebuilt. ++ * libtool-version: Increment revision. ++ * README: Update for new release. Clean up test docs. ++ ++commit 0e185fa11a01f816824ba2687ed3715ab6219bef ++Author: green ++Date: Fri Feb 22 21:43:18 2008 +0000 ++ ++ Update configure script. ++ ++commit f73986bd211cfbbaa593d1309504d0dc68626191 ++Author: green ++Date: Fri Feb 22 21:40:53 2008 +0000 ++ ++ 2008-02-22 Bjoern Koenig ++ Andreas Tobler ++ ++ * configure.ac: Add amd64-*-freebsd* target. ++ * configure: Regenerate. ++ ++commit 0208f68fe5de30c33e7f70ebc281635917013f5a ++Author: green ++Date: Fri Feb 22 21:15:44 2008 +0000 ++ ++ 2008-02-22 Thomas Heller ++ ++ * configure.ac: Add x86 OpenBSD support. ++ * configure: Rebuilt. ++ ++commit 01adb0e638a86cf0d5e668ed8e08be9b0cd2505f ++Author: green ++Date: Thu Feb 21 16:17:26 2008 +0000 ++ ++ Fix README. ++ ++commit 1edd4563225981a14f7d4fb9919b1ed88e38082f ++Author: green ++Date: Thu Feb 21 13:39:01 2008 +0000 ++ ++ 3.0.2 ++ ++commit c9b542800864e2204db6e83f3843a17813ba6165 ++Author: green ++Date: Thu Feb 21 13:36:43 2008 +0000 ++ ++ add missing file ++ ++commit d5fa5633d5c8d3c212a2267cfa38fba4091baa2c ++Author: green ++Date: Thu Feb 21 13:36:19 2008 +0000 ++ ++ 2008-02-21 Anthony Green ++ ++ * configure.ac: Bump version to 3.0.2. ++ * configure, doc/stamp-vti, doc/version.texi: Rebuilt. ++ * libtool-version: Increment revision. ++ * README: Update for new release. ++ ++ 2008-02-21 Björn König ++ ++ * src/x86/freebsd.S: New file. ++ * configure.ac: Add x86 FreeBSD support. ++ * Makefile.am: Ditto. ++ ++commit ac35bfc6fcadd8880c1efce36724820f9074b318 ++Author: green ++Date: Sat Feb 16 01:03:56 2008 +0000 ++ ++ Updated ++ ++commit f7942975fee7b0162647dd79e2652615b737e98e ++Author: green ++Date: Sat Feb 16 01:02:00 2008 +0000 ++ ++ 2008-02-15 Anthony Green ++ ++ * configure.ac: Bump version to 3.0.1. ++ * configure, doc/stamp-vti, doc/version.texi: Rebuilt. ++ * libtool-version: Increment revision. ++ * README: Update for new release. ++ ++ 2008-02-15 David Daney ++ ++ * src/mips/ffi.c: Remove extra '>' from include directive. ++ (ffi_prep_closure_loc): Use clear_location instead of tramp. ++ ++commit 59aa6bb1bfc86a610ac1a8b123443efd75854dd1 ++Author: green ++Date: Fri Feb 15 20:52:26 2008 +0000 ++ ++ Add more platforms. ++ ++commit 45a45ab99074448be0ae1a8d2ade50d28b60f8de ++Author: green ++Date: Fri Feb 15 19:16:36 2008 +0000 ++ ++ 3.0 notes ++ ++commit 4db74cbea888c9f1251b85baf00d99b83d3b994d ++Author: green ++Date: Fri Feb 15 19:10:26 2008 +0000 ++ ++ Update ++ ++commit c3e1101ffabf44d8a2ee46e03ba9ab582050a825 ++Author: green ++Date: Fri Feb 15 18:43:40 2008 +0000 ++ ++ 2008-02-15 Anthony Green ++ ++ * configure.ac: Bump version to 3.0.0, ++ * configure, doc/stamp-vti, doc/version.texi: Rebuilt. ++ ++ 2008-02-15 David Daney ++ ++ * src/mips/ffi.c (USE__BUILTIN___CLEAR_CACHE): ++ Define (conditionally), and use it to include cachectl.h. ++ (ffi_prep_closure_loc): Fix cache flushing. ++ * src/mips/ffitarget.h (_ABIN32, _ABI64, _ABIO32): Define. ++ ++commit 7e0cc12e9233ad285db41ce8dbdda61ed2a7fb06 ++Author: green ++Date: Fri Feb 15 15:51:03 2008 +0000 ++ ++ New release ++ ++commit 2d7dc885ec40d53866f29984d595511942c8b686 ++Author: green ++Date: Fri Feb 15 15:30:26 2008 +0000 ++ ++ * man/ffi_call.3, man/ffi_prep_cif.3, man/ffi.3: ++ Update dates and remove all references to ffi_prep_closure. ++ * configure.ac: Bump version to 2.99.9. ++ * configure, doc/stamp-vti, doc/version.texi: Rebuilt. ++ ++commit a0525f03eeaaed33b1eac80e0c016455cee3615d ++Author: green ++Date: Fri Feb 15 15:14:30 2008 +0000 ++ ++ New release. ++ ++commit 2b30dfb3146ee26ad956d00ee05eb835ca1a95b4 ++Author: green ++Date: Fri Feb 15 15:12:43 2008 +0000 ++ ++ * man/ffi_prep_closure.3: Delete. ++ * man/Makefile.am (EXTRA_DIST): Remove ffi_prep_closure.3. ++ (man_MANS): Ditto. ++ * man/Makefile.in: Rebuilt. ++ * configure.ac: Bump version to 2.99.8. ++ * configure, doc/stamp-vti, doc/version.texi: Rebuilt. ++ ++commit bf41e64840ebcb6cc31a6f028253c1fde82705d8 ++Author: green ++Date: Fri Feb 15 01:56:50 2008 +0000 ++ ++ Update. ++ ++commit 4d39ddee677bbb61d621893b91e11eac5e7c4af7 ++Author: green ++Date: Fri Feb 15 01:24:06 2008 +0000 ++ ++ * configure.ac: Bump version to 2.99.7. ++ * configure, doc/stamp-vti, doc/version.texi: Rebuilt. ++ * include/ffi.h.in LICENSE src/debug.c src/closures.c ++ src/ffitest.c src/s390/sysv.S src/s390/ffitarget.h ++ src/types.c src/m68k/ffitarget.h src/raw_api.c src/frv/ffi.c ++ src/frv/ffitarget.h src/sh/ffi.c src/sh/sysv.S ++ src/sh/ffitarget.h src/powerpc/ffitarget.h src/pa/ffi.c ++ src/pa/ffitarget.h src/pa/linux.S src/java_raw_api.c ++ src/cris/ffitarget.h src/x86/ffi.c src/x86/sysv.S ++ src/x86/unix64.S src/x86/win32.S src/x86/ffitarget.h ++ src/x86/ffi64.c src/x86/darwin.S src/ia64/ffi.c ++ src/ia64/ffitarget.h src/ia64/ia64_flags.h src/ia64/unix.S ++ src/sparc/ffi.c src/sparc/v9.S src/sparc/ffitarget.h ++ src/sparc/v8.S src/alpha/ffi.c src/alpha/ffitarget.h ++ src/alpha/osf.S src/sh64/ffi.c src/sh64/sysv.S ++ src/sh64/ffitarget.h src/mips/ffi.c src/mips/ffitarget.h ++ src/mips/n32.S src/mips/o32.S src/arm/ffi.c src/arm/sysv.S ++ src/arm/ffitarget.h src/prep_cif.c: Update license text. ++ ++commit d58b032b41a12bd3d72148da6822ab59dd698ff9 ++Author: green ++Date: Fri Feb 15 00:59:25 2008 +0000 ++ ++ New release ++ ++commit 91e5478df6d5ac63efbb10f025807b4606afab56 ++Author: green ++Date: Fri Feb 15 00:50:30 2008 +0000 ++ ++ Update supported platforms. Bump version. ++ ++commit bd0768f877c8f7fd0d36af2191b203d4d057b1ce ++Author: green ++Date: Fri Feb 15 00:45:33 2008 +0000 ++ ++ * configure.ac: Bump version to 2.99.5. ++ * configure: Rebuilt. ++ * Makefile.am (EXTRA_DIST): Add darwin64.S ++ * Makefile.in: Rebuilt. ++ * testsuite/lib/libffi-dg.exp: Remove libstdc++ bits from GCC tree. ++ * LICENSE: Update WARRANTY. ++ ++commit 49d345f767bd2cfee951bceaab6a1a07986cf293 ++Author: green ++Date: Thu Feb 14 23:43:27 2008 +0000 ++ ++ update license reference ++ ++commit 12ac48fc79b515db7c9accd9fcaa87b0dcefccdb ++Author: green ++Date: Thu Feb 14 23:42:08 2008 +0000 ++ ++ Update WARRANTY ++ ++commit 6b91c41da87e78552f2990dfc504a0a3349f340b ++Author: green ++Date: Thu Feb 14 23:38:27 2008 +0000 ++ ++ fix tarball reference ++ ++commit 2b59579e3533334bee4788e076b4e520c2ab518c ++Author: green ++Date: Thu Feb 14 23:35:58 2008 +0000 ++ ++ First update in 5 years! ++ ++commit 6cbdf3f3a3777a93382a2d508ddef1c353ff0955 ++Author: green ++Date: Thu Feb 14 22:44:06 2008 +0000 ++ ++ Fix .pc file bug and bump version ++ ++commit 1d1dc81104b209df3cfef0840735c59efae2f655 ++Author: green ++Date: Thu Feb 14 22:03:37 2008 +0000 ++ ++ Add man files and info file. Update README. Tag as 2.99.3. ++ ++commit f045a2367f793fa8b01534cf2e25bcc46afc8fa1 ++Author: tromey ++Date: Thu Feb 14 20:46:57 2008 +0000 ++ ++ Move entry from ChangeLog to ChangeLog.libffi ++ ++commit 6257f07d1a9efd27fa83639cfba281f5d3188731 ++Author: tromey ++Date: Thu Feb 14 20:33:17 2008 +0000 ++ ++ * aclocal.m4, Makefile.in, configure, fficonfig.h.in: Rebuilt. ++ * mdate-sh, texinfo.tex: New files. ++ * Makefile.am (info_TEXINFOS): New variable. ++ * doc/libffi.texi: New file. ++ * doc/version.texi: Likewise. ++ ++commit 4232af563c5509c3760a33e3684a2b958be755e1 ++Author: green ++Date: Thu Feb 14 16:19:21 2008 +0000 ++ ++ * Makefile.am (AM_CFLAGS): Don't compile with -D. ++ (lib_LTLIBRARIES): Define. ++ (toolexeclib_LIBRARIES): Undefine. ++ * Makefile.in: Rebuilt. ++ * configure.ac: Reset version to 2.99.1. ++ * configure.in: Rebuilt. ++ ++commit 961543615c31f092b578a4b4cda914db64f9d0fa ++Author: green ++Date: Thu Feb 14 15:57:40 2008 +0000 ++ ++ Fix typo. ++ ++commit aeb0abab87222f637fbf352d4effd3b76b52ed26 ++Author: green ++Date: Thu Feb 14 15:54:27 2008 +0000 ++ ++ * libffi.pc.in: Usse @PACKAGE_NAME@ and @PACKAGE_VERSION@. ++ * configure.ac: Reset version to 2.99.1. ++ * configure.in: Rebuilt. ++ * Makefile.am (EXTRA_DIST): Add ChangeLog.libffi. ++ * Makefile.in: Rebuilt. ++ * LICENSE: Update copyright notice. ++ ++commit 77fe243556433eae119d8bd7469bfccdd5bd8a1a ++Author: green ++Date: Thu Feb 14 15:37:00 2008 +0000 ++ ++ Fix make dist again ++ ++commit d4970cf4529459bf0f0e43c602cac396786c6802 ++Author: green ++Date: Thu Feb 14 15:18:56 2008 +0000 ++ ++ Fix make dist ++ ++commit f0b1462f2d3024922ad71421bd5c4311fcb16da5 ++Author: green ++Date: Thu Feb 14 15:01:41 2008 +0000 ++ ++ Use pkgconfig. Increment libtool CURRENT version. ++ ++commit 27e52f33baa069012a5adb2a3807f9ca1f2165ab ++Author: green ++Date: Sun Feb 3 13:59:48 2008 +0000 ++ ++ Fix header installs when using DESTDIR. ++ ++commit fadab28eb6e33fb6dcdd7b9323e147142216d548 ++Author: twall ++Date: Sun Feb 3 12:32:22 2008 +0000 ++ ++ update changelog ++ ++commit b5e44c8dfa92c87b99762c303cf5574a16db8f27 ++Author: twall ++Date: Sun Feb 3 01:12:32 2008 +0000 ++ ++ offset from code base address, not data base address ++ ++commit f359848d1a995c0e44566d815f218729dc996e22 ++Author: green ++Date: Fri Feb 1 21:29:43 2008 +0000 ++ ++ Fix header installs. ++ ++commit c30df49e157c7bfc8e19e3f8a72b9464fe225e54 ++Author: green ++Date: Fri Feb 1 21:13:55 2008 +0000 ++ ++ Revert my broken changes to twall's patch. ++ ++commit 675561bb9aa0732c76698df10dd3007b5d0ec759 ++Author: green ++Date: Thu Jan 31 13:44:25 2008 +0000 ++ ++ Fix make dist . ++ ++commit abc0bbf3813dc43e23d4c23e6fe794dbf287639b ++Author: green ++Date: Thu Jan 31 11:58:57 2008 +0000 ++ ++ Add Tim Wall's x86 windows patch. ++ ++commit e332366d15a31198735b593ec8f7fc0558d783b8 ++Author: green ++Date: Wed Jan 30 13:21:02 2008 +0000 ++ ++ Add HJ's -fomit-frame-pointer struct return fix ++ ++commit d4204240392af5b7750a08671b08e9c22dff5e93 ++Author: green ++Date: Wed Jan 30 12:42:34 2008 +0000 ++ ++ Clean up for new automake. ++ ++commit f4932dd020df574637c9fb3fc1bb18e5a8f304cc ++Author: green ++Date: Wed Jan 30 12:40:25 2008 +0000 ++ ++ Fixes to run testsuite ++ ++commit 085520ddc8db6a916bfc416b871fcb2d00074d40 ++Author: green ++Date: Tue Jan 29 15:16:43 2008 +0000 ++ ++ New files from gcc tree. ++ ++commit 77175b3f7234e4875a4ef554ed1fe9fdc4133794 ++Author: green ++Date: Tue Jan 29 15:15:20 2008 +0000 ++ ++ Latest gcc svn sources ++ ++commit 2544e45a0b2b634053df02da3a2ed9680eeed2a1 ++Author: green ++Date: Tue Jan 29 14:28:13 2008 +0000 ++ ++ Install ffitarget.h in $prefix/include. ++ ++commit 6002211b1cc4daeb587d054b4f83968bda2c981e ++Author: green ++Date: Tue Jan 29 12:30:10 2008 +0000 ++ ++ Add new files. ++ ++commit ccabd2b16be883cd03e5f0cd88ccfdd6ca39239d ++Author: green ++Date: Tue Jan 29 12:28:15 2008 +0000 ++ ++ Merge from gcc ++ ++commit e680ecfbfca1da8d1823e48bc89b8375e66e128b ++Author: tromey ++Date: Sun Dec 24 23:12:15 2006 +0000 ++ ++ Pulled in libffi from gcc trunk. ++ Fixed build and install for standalone use. ++ ++commit e7ba08965942ce872fdbc69f70f9848cc3d0bad6 ++Author: root ++Date: Sun Jun 4 23:22:24 2006 +0000 ++ ++ sourcware.org ++ ++commit 0cd4aa24e21aaa964dfbdebc25ec5c8188049375 ++Author: root ++Date: Sun May 30 01:51:57 2004 +0000 ++ ++ Add LockDir ++ ++commit 5826120fbd940d26cca76ed2522187505581e1ed ++Author: green ++Date: Tue Nov 4 06:09:08 2003 +0000 ++ ++ Add link to Gianni's web site. ++ ++commit 220aa4b27db42d7ffaac5056000d5179f00d5ea3 ++Author: jsm ++Date: Tue Jan 21 08:07:42 2003 +0000 ++ ++ Newer, better, increased from before! (list of acceptable anon usernames) ++ ++commit 1c3adc892cc1403dc4d3d7003a2385899836612e ++Author: green ++Date: Fri Dec 6 01:28:03 2002 +0000 ++ ++ Fixed Cygnus references. ++ ++commit 4af66bb62fab9a8e318af3bf01e5486596a0c8d4 ++Author: green ++Date: Sun Oct 21 19:18:42 2001 +0000 ++ ++ Testsuite fixes. ++ ++commit 5435965f9015ce40584c98d3816c3d05e7de1d21 ++Author: green ++Date: Mon Apr 23 00:32:03 2001 +0000 ++ ++ * include/ffi_common.h: Delete, after moving contents to... ++ * include/ffi_private.h: Subsume contents of ffi_common.h. ++ * include/Makefile.am (noinst_HEADERS): Remove ffi_common.h. ++ * include/Makefile.in: Rebuilt. ++ * arm/ffi.c, m68k/ffi.c, mips/ffi.c, powerpc/ffi.c, s390/ffi.c, ++ ia64/ffi.c: Include ffi_private.h, not ffi_common.h. ++ * alpha/ffi.c, sparc/ffi.c, x86/ffi.c: Don't include ffi_common.h. ++ * types.c, raw_api.c, java_raw_api.c, prep_cif.c: Don't include ++ ffi_common.h. ++ * debug.c: Include ffi_private.h instead of ffi_common.h. ++ ++ * mips/ffi.c (calc_n32_struct_flags): Make static. ++ (FIX_ARGP): Remove call to debugging routine ffi_stop_here. ++ ++ * mips/n32.S: Include ffi_private.h. ++ * mips/o32.S: Include ffi_private.h. ++ ++commit 6fdb7de0fe3b7385e1fd78812ae69d9b3069d994 ++Author: green ++Date: Sun Apr 22 19:38:34 2001 +0000 ++ ++ * README: Update some comments. ++ ++ * Makefile.am (SUBDIRS): Add include so ffi.h gets installed. ++ * Makefile.in: Rebuilt. ++ ++ * include/ffi.h: Change ALPHA to __alpha__ and SPARC to __sparc__. ++ * types.c: Ditto. ++ * prep_cif.c (ffi_prep_cif): Ditto. ++ ++ * alpha/ffi.c, alpha/osf.S, sparc/ffi.c, sparc/v8.S, sparc/v9.S: ++ Include ffi_private.h. ++ ++ * include/ffi_private.h (FFI_TYPE_LAST): Define. ++ ++commit bc7144b01b9707ef35f1a2e3e6996e005e82953a ++Author: green ++Date: Sun Apr 22 18:28:36 2001 +0000 ++ ++ Moved files from old home ++ ++commit e57279831e20368c1aa1d2b35462b8629be73959 ++Author: green ++Date: Sun Apr 22 18:23:47 2001 +0000 ++ ++ These are dead. ++ ++commit 7247436b5fe71767b29dc02b4da0fe18b08082e6 ++Author: green ++Date: Sun Apr 22 18:22:43 2001 +0000 ++ ++ All these files live somewhere else now. ++ ++commit a8b0d40ff908e275028f676870c31d0d70274a98 ++Author: green ++Date: Sun Apr 22 18:17:14 2001 +0000 ++ ++ Many changes. Not quite there yet. ++ ++commit f893d2273355710a290a26faebf5f12c3a34d0e3 ++Author: green ++Date: Sun Apr 22 18:13:22 2001 +0000 ++ ++ Moved m68k files ++ ++commit 688ddfeced89cbb9d37b53005e1f7f2b9c78a8d7 ++Author: green ++Date: Sun Apr 22 18:12:33 2001 +0000 ++ ++ New, target indepentent, header ++ ++commit f9e40776d488d5ecf43b3ae21444a1a2f6eca528 ++Author: green ++Date: Sun Apr 22 18:11:57 2001 +0000 ++ ++ Many changes. ++ ++commit 8c1d2eb47f6bc314c431b75c85c107e8e43c4a76 ++Author: green ++Date: Sun Apr 22 18:10:47 2001 +0000 ++ ++ Many changes ++ ++commit 1359dfc6582680a158b3caa3efb7a368da4aa12d ++Author: green ++Date: Sun Apr 22 18:10:20 2001 +0000 ++ ++ Moved ia64 files ++ ++commit 6e2de5eee316a4579869aff50c7c5f6f478582d8 ++Author: green ++Date: Sun Apr 22 18:08:11 2001 +0000 ++ ++ Moved arm files ++ ++commit 8807355af34cba8ffe87aee51152dfccec2771fa ++Author: green ++Date: Mon Apr 9 00:58:38 2001 +0000 ++ ++ Many many updates. Merge from gcc and then some. ++ ++commit f7e9f91adec4ff1c2e7a13b3de81d2c5a3f55e7e ++Author: green ++Date: Mon Apr 17 03:32:37 2000 +0000 ++ ++ Mnay fixes. ++ ++commit c4860de618f4956283f5c8230a2544e403dfe390 ++Author: green ++Date: Mon Apr 17 03:18:46 2000 +0000 ++ ++ Merge from libgcj. Merged patches from net. See ChangeLog for details. ++ ++commit c578b58314990c3853429297c38ba14015fec5fa ++Author: jsm ++Date: Sat Oct 9 20:18:16 1999 +0000 ++ ++ 1999-10-09 Jason Molenda (jsm@bugshack.cygnus.com) ++ ++ * CVSROOT/auto_checkout, CVSROOT/commit_prep, CVSROOT/log_accum: ++ Deleted; generic versions now used for all repositories. ++ ++ * CVSROOT/commitinfo, CVSROOT/loginfo: Change pathnames to ++ generic versions. ++ ++ * CVSROOT/checkoutlist: Don't try to check out the removed ++ files any longer. ++ ++commit acdb20051207fed7652dd9f122f65de5458c474c ++Author: jsm ++Date: Sat Oct 9 20:18:15 1999 +0000 ++ ++ 1999-10-09 Jason Molenda (jsm@bugshack.cygnus.com) ++ ++ * CVSROOT/auto_checkout, CVSROOT/commit_prep, CVSROOT/log_accum: ++ Deleted; generic versions now used for all repositories. ++ ++ * CVSROOT/commitinfo, CVSROOT/loginfo: Change pathnames to ++ generic versions. ++ ++ * CVSROOT/checkoutlist: Don't try to check out the removed ++ files any longer. ++ ++commit e75be655ceedf7ab24c4e99d75eec9efeb979bc7 ++Author: green ++Date: Sun Aug 8 13:16:41 1999 +0000 ++ ++ New configury ++ ++commit d6669a0dd5b266005325bbf6d5a8ff34574d809e ++Author: green ++Date: Sun Aug 8 13:05:12 1999 +0000 ++ ++ * include/ffi.h.in: Try to work around messy header problem ++ with PACKAGE and VERSION. ++ ++ * configure: Rebuilt. ++ * configure.in: Change version to 2.00-beta. ++ ++ * fficonfig.h.in: Rebuilt. ++ * acconfig.h (FFI_NO_STRUCTS, FFI_NO_RAW_API): Define. ++ ++ * src/x86/ffi.c (ffi_raw_call): Rename. ++ ++commit 4819d52b007934a40d6d29a75ee30e857c4a93ae ++Author: green ++Date: Wed Aug 4 18:02:34 1999 +0000 ++ ++ New file for Kresten's closure work ++ ++commit 2dbf801eb427cbf5021a9e1e512b5fc523524700 ++Author: green ++Date: Wed Aug 4 18:00:05 1999 +0000 ++ ++ Kresten's closure work. Initial checkin. ++ ++commit d170961701b0f2bf7e824d7caba2ebe10002ed84 ++Author: green ++Date: Thu Jul 8 14:36:52 1999 +0000 ++ ++ * configure.in: Add x86 and powerpc BeOS configurations. ++ From Makoto Kato . ++ ++commit c7747d976924ec6f2229cbcfbbdb98d364e10de9 ++Author: jsm ++Date: Wed May 12 23:32:16 1999 +0000 ++ ++ 1999-05-12 Jason Molenda (jsm@bugshack.cygnus.com) ++ * index.html: Add links to libffi* mail list archives. ++ ++commit dd2aa9a8de22e26df3bbc85d068358641f6202f7 ++Author: green ++Date: Thu May 6 05:34:36 1999 +0000 ++ ++ * configure.in: Add warning about this being beta code. ++ Remove src/Makefile.am from the picture. ++ * configure: Rebuilt. ++ * Makefile.am: Move logic from src/Makefile.am. Add changes ++ to support libffi as a target library. ++ * Makefile.in: Rebuilt. ++ * aclocal.m4, config.guess, config.sub, ltconfig, ltmain.sh: ++ Upgraded to new autoconf, automake, libtool. ++ * README: Tweaks. ++ * LICENSE: Update copyright date. ++ * src/Makefile.am, src/Makefile.in: Removed. ++ ++commit 4e9452abed58a3058ccdb446f96a29d50dda1f34 ++Author: green ++Date: Wed May 5 22:06:13 1999 +0000 ++ ++ Updated to new automake, libtool, autoconf - nothing works :-) ++ ++commit 6d3b2bddaf4967fba8b8656c01bfc77ec0f2800c ++Author: jsm ++Date: Mon Apr 26 15:55:28 1999 +0000 ++ ++ 1999-04-26 Jason Molenda (jsm@bugshack.cygnus.com) ++ * index.html: Missed a reference to libffi-discuss@cygnus.com. Fixed. ++ ++commit ebc6a9c28af831d3d187af8ff17319f0f309bd98 ++Author: jsm ++Date: Mon Apr 26 15:53:29 1999 +0000 ++ ++ 1999-04-26 Jason Molenda (jsm@bugshack.cygnus.com) ++ * index.html: Change links to ftp directory to point to sourceware ++ directory. ++ Change mailing list subscription forms to point to sourceware lists. ++ ++commit 78ffc52a8b257061348c576ccb6fbbf8b48b0fff ++Author: jsm ++Date: Sun Apr 18 01:33:21 1999 +0000 ++ ++ Standard sourceware setup. ++ ++commit b4d77e827d7ebef7e57ebcd71e71c15c62f1e0a8 ++Author: jsm ++Date: Mon Nov 30 11:11:25 1998 +0000 ++ ++ Small typeo. (I wouldn't bother except that it made the sentence hard ++ for me to parse on a casual read.) ++ ++commit bfb73f08fdc987e37070c5fb0b196fbd28872888 ++Author: jsm ++Date: Mon Nov 30 10:44:55 1998 +0000 ++ ++ A few cleanups. Most notably, point to the correct subscribe cgi-bin ++ script. ++ ++commit af8b7f037ccee3b7939ee226a1a2bbc2f057b35c ++Author: green ++Date: Mon Nov 30 06:20:05 1998 +0000 ++ ++ * index.html: Reformatted and updated to reflect hosting on ++ sourceware.cygnus.com (new mailing lists, etc). ++ ++commit 334f0b060942aff8d26badaf7dde7830450dc5da ++Author: green ++Date: Sun Nov 29 16:56:12 1998 +0000 ++ ++ initial snapshot of documentation ++ ++commit 3ab5cb4a1dcc7ecd7e773c97582b0099976c4753 ++Author: green ++Date: Sun Nov 29 16:56:10 1998 +0000 ++ ++ Initial revision ++ ++commit d2a9eb5a8b7cbc8b769809cad59c82b975c178e2 ++Merge: d3782ec bc75c54 ++Author: green ++Date: Sun Nov 29 16:48:16 1998 +0000 ++ ++ This commit was generated by cvs2svn to compensate for changes in r7, which ++ included commits to RCS files with non-trunk default branches. ++ ++commit bc75c54bd311658005b065f1bf201b204c81cbca ++Author: green ++Date: Sun Nov 29 16:48:16 1998 +0000 ++ ++ Import of v1 code. ++ ++commit d3782ec8160c644421dcea17b605fec6e328f14e ++Author: jsm ++Date: Fri Nov 20 20:18:00 1998 +0000 ++ ++ Send commit messages to mailing lists. ++ ++commit 8d8d3843c484c2bb70d8375b2b799f75eb03f709 ++Author: jsm ++Date: Thu Oct 1 22:08:36 1998 +0000 ++ ++ initial checkin ++ ++commit 49634f3bf221cc1939abafc788f7e4e31293fe73 ++Author: jsm ++Date: Thu Oct 1 22:08:35 1998 +0000 ++ ++ Add standard setup. ++ ++commit c64a84c7693f8cd400fb94bba3c9bcfd9ad1fc36 ++Author: jsm ++Date: Thu Oct 1 22:08:34 1998 +0000 ++ ++ Add readers and standard modules file. ++ ++commit 9813273b07fd082da573b3b6bfb8d23809b59eea ++Author: jsm ++Date: Thu Oct 1 22:08:33 1998 +0000 ++ ++ initial checkin +diff -r ee879c0ffa11 Modules/_ctypes/libffi/ChangeLog.libffi-3.1 +--- /dev/null ++++ b/Modules/_ctypes/libffi/ChangeLog.libffi-3.1 +@@ -0,0 +1,6000 @@ ++2014-03-16 Josh Triplett ++ ++ * ChangeLog: Archive to ChangeLog.libffi-3.1 and delete. Future ++ changelogs will come from git, with autogenerated snapshots shipped in ++ distributed tarballs. ++ ++2014-03-16 Josh Triplett ++ ++ Add support for stdcall, thiscall, and fastcall on non-Windows ++ x86-32. ++ ++ Linux supports the stdcall calling convention, either via ++ functions explicitly declared with the stdcall attribute, or via ++ code compiled with -mrtd which effectively makes stdcall the ++ default. ++ ++ This introduces FFI_STDCALL, FFI_THISCALL, and FFI_FASTCALL on ++ non-Windows x86-32 platforms, as non-default calling conventions. ++ ++ * Makefile.am: Compile in src/x86/win32.S on non-Windows x86-32. ++ * src/x86/ffitarget.h: Add FFI_STDCALL, FFI_THISCALL, and ++ FFI_FASTCALL on non-Windows x86-32. Increase trampoline size to ++ accomodate these calling conventions, and unify some ifdeffery. ++ * src/x86/ffi.c: Add support for FFI_STDCALL, FFI_THISCALL, and ++ FFI_FASTCALL on non-Windows x86-32 platforms; update ifdeffery. ++ * src/x86/win32.S: Support compiling on non-Windows x86-32 ++ platforms. On those platforms, avoid redefining the SYSV symbols ++ already provided by src/x86/sysv.S. ++ * testsuite/libffi.call/closure_stdcall.c: Run on non-Windows. ++ #define __stdcall if needed. ++ * testsuite/libffi.call/closure_thiscall.c: Run on non-Windows. ++ #define __fastcall if needed. ++ * testsuite/libffi.call/fastthis1_win32.c: Run on non-Windows. ++ * testsuite/libffi.call/fastthis2_win32.c: Ditto. ++ * testsuite/libffi.call/fastthis3_win32.c: Ditto. ++ * testsuite/libffi.call/many2_win32.c: Ditto. ++ * testsuite/libffi.call/many_win32.c: Ditto. ++ * testsuite/libffi.call/strlen2_win32.c: Ditto. ++ * testsuite/libffi.call/strlen_win32.c: Ditto. ++ * testsuite/libffi.call/struct1_win32.c: Ditto. ++ * testsuite/libffi.call/struct2_win32.c: Ditto. ++ ++2014-03-16 Josh Triplett ++ ++ * prep_cif.c: Remove unnecessary ifdef for X86_WIN32. ++ ffi_prep_cif_core had a special case for X86_WIN32, checking for ++ FFI_THISCALL in addition to the FFI_FIRST_ABI-to-FFI_LAST_ABI ++ range before returning FFI_BAD_ABI. However, on X86_WIN32, ++ FFI_THISCALL already falls in that range, making the special case ++ unnecessary. Remove it. ++ ++2014-03-16 Josh Triplett ++ ++ * testsuite/libffi.call/closure_stdcall.c, ++ testsuite/libffi.call/closure_thiscall.c: Remove fragile stack ++ pointer checks. These files included inline assembly to save the ++ stack pointer before and after the call, and compare the values. ++ However, compilers can and do leave the stack in different states ++ for these two pieces of inline assembly, such as by saving a ++ temporary value on the stack across the call; observed with gcc ++ -Os, and verified as spurious through careful inspection of ++ disassembly. ++ ++2014-03-16 Josh Triplett ++ ++ * testsuite/libffi.call/many.c: Avoid spurious failure due to ++ excess floating-point precision. ++ * testsuite/libffi.call/many_win32.c: Ditto. ++ ++2014-03-16 Josh Triplett ++ ++ * libtool-ldflags: Re-add. ++ ++2014-03-16 Josh Triplett ++ ++ * Makefile.in, aclocal.m4, compile, config.guess, config.sub, ++ configure, depcomp, include/Makefile.in, install-sh, ++ libtool-ldflags, ltmain.sh, m4/libtool.m4, m4/ltoptions.m4, ++ m4/ltsugar.m4, m4/ltversion.m4, m4/lt~obsolete.m4, ++ man/Makefile.in, mdate-sh, missing, testsuite/Makefile.in: Delete ++ autogenerated files from version control. ++ * .gitignore: Add autogenerated files. ++ * autogen.sh: New script to generate the autogenerated files. ++ * README: Document requirement to run autogen.sh when building ++ directly from version control. ++ * .travis.yml: Run autogen.sh ++ ++2014-03-14 Anthony Green ++ ++ * configure, Makefile.in: Rebuilt. ++ ++2014-03-10 Mike Hommey ++ ++ * configure.ac: Allow building for mipsel with Android NDK r8. ++ * Makefile.am (AM_MAKEFLAGS): Replace double quotes with single ++ quotes. ++ ++2014-03-10 Landry Breuil ++ ++ * configure.ac: Ensure the linker supports @unwind sections in libffi. ++ ++2014-03-01 Anthony Green ++ ++ * Makefile.am (EXTRA_DIST): Replace old scripts with ++ generate-darwin-source-and-headers.py. ++ * Makefile.in: Rebuilt. ++ ++2014-02-28 Anthony Green ++ ++ * Makefile.am (AM_CFLAGS): Reintroduce missing -DFFI_DEBUG for ++ --enable-debug builds. ++ * Makefile.in: Rebuilt. ++ ++2014-02-28 Makoto Kato ++ ++ * src/closures.c: Fix build failure when using clang for Android. ++ ++2014-02-28 Marcin Wojdyr ++ ++ * libffi.pc.in (toolexeclibdir): use -L${toolexeclibdir} instead ++ of -L${libdir}. ++ ++2014-02-28 Paulo Pizarro ++ ++ * src/bfin/sysv.S: Calling functions in shared libraries requires ++ considering the GOT. ++ ++2014-02-28 Josh Triplett ++ ++ * src/x86/ffi64.c (classify_argument): Handle case where ++ FFI_TYPE_LONGDOUBLE == FFI_TYPE_DOUBLE. ++ ++2014-02-28 Anthony Green ++ ++ * ltmain.sh: Generate with libtool-2.4.2.418. ++ * m4/libtool.m4, m4/ltoptions.m4, m4/ltversion.m4: Ditto. ++ * configure: Rebuilt. ++ ++2014-02-28 Dominik Vogt ++ ++ * configure.ac (AC_ARG_ENABLE struct): Fix typo in help ++ message. ++ (AC_ARG_ENABLE raw_api): Ditto. ++ * configure, fficonfig.h.in: Rebuilt. ++ ++2014-02-28 Will Newton ++ ++ * src/arm/sysv.S: Initialize IP register with FP. ++ ++2014-02-28 Yufeng Zhang ++ ++ * src/aarch64/sysv.S (ffi_closure_SYSV): Use x29 as the ++ main CFA reg; update cfi_rel_offset. ++ ++2014-02-15 Marcus Comstedt ++ ++ * src/powerpc/ffi_linux64.c, src/powerpc/linux64_closure.S: Remove ++ assumption on contents of r11 in closure. ++ ++2014-02-09 Heiher ++ ++ * src/mips/n32.S: Fix call floating point va function. ++ ++2014-01-21 Zachary Waldowski ++ ++ * src/aarch64/ffi.c: Fix missing semicolons on assertions under ++ debug mode. ++ ++2013-12-30 Zachary Waldowski ++ ++ * .gitignore: Exclude darwin_* generated source and build_* trees. ++ * src/aarch64/ffi.c, src/arm/ffi.c, src/x86/ffi.c: Inhibit Clang ++ previous prototype warnings. ++ * src/arm/ffi.c: Prevent NULL dereference, fix short type warning ++ * src/dlmalloc.c: Fix warnings from set_segment_flags return type, ++ and the native use of size_t for malloc on platforms ++ * src/arm/sysv.S: Use unified syntax. Clang clean-ups for ++ ARM_FUNC_START. ++ * generate-osx-source-and-headers.py: Remove. ++ * build-ios.sh: Remove. ++ * libffi.xcodeproj/project.pbxproj: Rebuild targets. Include ++ x86_64+aarch64 pieces in library. Export headers properly. ++ * src/x86/ffi64.c: More Clang warning clean-ups. ++ * src/closures.c (open_temp_exec_file_dir): Use size_t. ++ * src/prep_cif.c (ffi_prep_cif_core): Cast ALIGN result. ++ * src/aarch64/sysv.S: Use CNAME for global symbols. Only use ++ .size for ELF targets. ++ * src/aarch64/ffi.c: Clean up for double == long double. Clean up ++ from Clang warnings. Use Clang cache invalidation builtin. Use ++ size_t in place of unsigned in many places. Accommodate for ++ differences in Apple AArch64 ABI. ++ ++2013-12-02 Daniel Rodríguez Troitiño ++ ++ * generate-darwin-source-and-headers.py: Clean up, modernize, ++ merged version of previous scripts. ++ ++2013-11-21 Anthony Green ++ ++ * configure, Makefile.in, include/Makefile.in, include/ffi.h.in, ++ man/Makefile.in, testsuite/Makefile.in, fficonfig.h.in: Rebuilt. ++ ++2013-11-21 Alan Modra ++ ++ * Makefile.am (EXTRA_DIST): Add new src/powerpc files. ++ (nodist_libffi_la_SOURCES ): Likewise. ++ * configure.ac (HAVE_LONG_DOUBLE_VARIANT): Define for powerpc. ++ * include/ffi.h.in (ffi_prep_types): Declare. ++ * src/prep_cif.c (ffi_prep_cif_core): Call ffi_prep_types. ++ * src/types.c (FFI_NONCONST_TYPEDEF): Define and use for ++ HAVE_LONG_DOUBLE_VARIANT. ++ * src/powerpc/ffi_powerpc.h: New file. ++ * src/powerpc/ffi.c: Split into.. ++ * src/powerpc/ffi_sysv.c: ..new file, and.. ++ * src/powerpc/ffi_linux64.c: ..new file, rewriting parts. ++ * src/powerpc/ffitarget.h (enum ffi_abi): Rewrite powerpc ABI ++ selection as bits controlling features. ++ * src/powerpc/linux64.S: For consistency, use POWERPC64 rather ++ than __powerpc64__. ++ * src/powerpc/linux64_closure.S: Likewise. ++ * src/powerpc/ppc_closure.S: Likewise. Move .note.FNU-stack ++ inside guard. ++ * src/powerpc/sysv.S: Likewise. ++ * configure: Regenerate. ++ * fficonfig.h.in: Regenerate. ++ * Makefile.in: Regenerate. ++ ++2013-11-20 Alan Modra ++ ++ * src/powerpc/ffi.c (ffi_prep_cif_machdep_core): Use ++ NUM_FPR_ARG_REGISTERS64 and NUM_GPR_ARG_REGISTERS64 not their ++ 32-bit versions for 64-bit code. ++ * src/powerpc/linux64_closure.S: Don't use the return value area ++ as a parameter save area on ELFv2. ++ ++2013-11-18 Iain Sandoe ++ ++ * src/powerpc/darwin.S (EH): Correct use of pcrel FDE encoding. ++ * src/powerpc/darwin_closure.S (EH): Likewise. Modernise picbase ++ labels. ++ ++2013-11-18 Anthony Green ++ ++ * src/arm/ffi.c (ffi_call): Hoist declaration of temp to top of ++ function. ++ * src/arm/ffi.c (ffi_closure_inner): Moderize function declaration ++ to appease compiler. ++ Thanks for Gregory P. Smith . ++ ++2013-11-18 Anthony Green ++ ++ * README (tested): Mention PowerPC ELFv2. ++ ++2013-11-16 Alan Modra ++ ++ * src/powerpc/ppc_closure.S: Move errant #endif to where it belongs. ++ Don't bl .Luint128. ++ ++2013-11-16 Alan Modra ++ ++ * src/powerpc/ffi.c (ffi_prep_cif_machdep_core): Use #if _CALL_ELF ++ test to select parameter save sizing for ELFv2 vs. ELFv1. ++ * src/powerpc/ffitarget.h (FFI_V2_TYPE_FLOAT_HOMOG, ++ FFI_V2_TYPE_DOUBLE_HOMOG, FFI_V2_TYPE_SMALL_STRUCT): Define. ++ (FFI_TRAMPOLINE_SIZE): Define variant for ELFv2. ++ * src/powerpc/ffi.c (FLAG_ARG_NEEDS_PSAVE): Define. ++ (discover_homogeneous_aggregate): New function. ++ (ffi_prep_args64): Adjust start of param save area for ELFv2. ++ Handle homogenous floating point struct parms. ++ (ffi_prep_cif_machdep_core): Adjust space calculation for ELFv2. ++ Handle ELFv2 return values. Set FLAG_ARG_NEEDS_PSAVE. Handle ++ homogenous floating point structs. ++ (ffi_call): Increase size of smst_buffer for ELFv2. Handle ELFv2. ++ (flush_icache): Compile for ELFv2. ++ (ffi_prep_closure_loc): Set up ELFv2 trampoline. ++ (ffi_closure_helper_LINUX64): Don't return all structs directly ++ to caller. Handle homogenous floating point structs. Handle ++ ELFv2 struct return values. ++ * src/powerpc/linux64.S (ffi_call_LINUX64): Set up r2 for ++ ELFv2. Adjust toc save location. Call function pointer using ++ r12. Handle FLAG_RETURNS_SMST. Don't predict branches. ++ * src/powerpc/linux64_closure.S (ffi_closure_LINUX64): Set up r2 ++ for ELFv2. Define ELFv2 versions of STACKFRAME, PARMSAVE, and ++ RETVAL. Handle possibly missing parameter save area. Handle ++ ELFv2 return values. ++ (.note.GNU-stack): Move inside outer #ifdef. ++ ++2013-11-16 Alan Modra ++ ++ * src/powerpc/ffi.c (ffi_prep_cif_machdep): Revert 2013-02-08 ++ change. Do not consume an int arg when returning a small struct ++ for FFI_SYSV ABI. ++ (ffi_call): Only use bounce buffer when FLAG_RETURNS_SMST. ++ Properly copy bounce buffer to destination. ++ * src/powerpc/sysv.S: Revert 2013-02-08 change. ++ * src/powerpc/ppc_closure.S: Remove stray '+'. ++ ++2013-11-16 Alan Modra ++ ++ * src/powerpc/ffi.c (ffi_prep_args64): Align struct parameters ++ according to __STRUCT_PARM_ALIGN__. ++ (ffi_prep_cif_machdep_core): Likewise. ++ (ffi_closure_helper_LINUX64): Likewise. ++ ++2013-11-16 Alan Modra ++ ++ * src/powerpc/linux64.S (ffi_call_LINUX64): Tweak restore of r28. ++ (.note.GNU-stack): Move inside outer #ifdef. ++ * src/powerpc/linux64_closure.S (STACKFRAME, PARMSAVE, ++ RETVAL): Define and use throughout. ++ (ffi_closure_LINUX64): Save fprs before buying stack. ++ (.note.GNU-stack): Move inside outer #ifdef. ++ ++2013-11-16 Alan Modra ++ ++ * src/powerpc/ffitarget.h (FFI_TARGET_SPECIFIC_VARIADIC): Define. ++ (FFI_EXTRA_CIF_FIELDS): Define. ++ * src/powerpc/ffi.c (ffi_prep_args64): Save fprs as per the ++ ABI, not to both fpr and param save area. ++ (ffi_prep_cif_machdep_core): Renamed from ffi_prep_cif_machdep. ++ Keep initial flags. Formatting. Remove dead FFI_LINUX_SOFT_FLOAT ++ code. ++ (ffi_prep_cif_machdep, ffi_prep_cif_machdep_var): New functions. ++ (ffi_closure_helper_LINUX64): Pass floating point as per ABI, ++ not to both fpr and parameter save areas. ++ ++ * libffi/testsuite/libffi.call/cls_double_va.c (main): Correct ++ function cast and don't call ffi_prep_cif. ++ * libffi/testsuite/libffi.call/cls_longdouble_va.c (main): Likewise. ++ ++2013-11-15 Andrew Haley ++ ++ * doc/libffi.texi (Closure Example): Fix the sample code. ++ * doc/libffi.info, doc/stamp-vti, doc/version.texi: Rebuilt. ++ ++2013-11-15 Andrew Haley ++ ++ * testsuite/libffi.call/va_struct1.c (main): Fix broken test. ++ * testsuite/libffi.call/cls_uint_va.c (cls_ret_T_fn): Likewise ++ * testsuite/libffi.call/cls_struct_va1.c (test_fn): Likewise. ++ * testsuite/libffi.call/va_1.c (main): Likewise. ++ ++2013-11-14 David Schneider ++ ++ * src/arm/ffi.c: Fix register allocation for mixed float and ++ doubles. ++ * testsuite/libffi.call/cls_many_mixed_float_double.c: Testcase ++ for many mixed float and double arguments. ++ ++2013-11-13 Alan Modra ++ ++ * doc/libffi.texi (Simple Example): Correct example code. ++ * doc/libffi.info, doc/stamp-vti, doc/version.texi: Rebuilt. ++ ++2013-11-13 Anthony Green ++ ++ * include/ffi_common.h: Respect HAVE_ALLOCA_H for GNU compiler ++ based build. (Thanks to tmr111116 on github) ++ ++2013-11-09 Anthony Green ++ ++ * m4/libtool.m4: Refresh. ++ * configure, Makefile.in: Rebuilt. ++ * README: Add more notes about next release. ++ ++2013-11-09 Shigeharu TAKENO ++ ++ * m4/ax_gcc_archflag.m4 (ax_gcc_arch): Don't recognize ++ UltraSPARC-IIi as ultrasparc3. ++ ++2013-11-06 Mark Kettenis ++ ++ * src/x86/freebsd.S (ffi_call_SYSV): Align the stack pointer to ++ 16-bytes. ++ ++2013-11-06 Konstantin Belousov ++ ++ * src/x86/freebsd.S (ffi_closure_raw_SYSV): Mark the assembler ++ source as not requiring executable stack. ++ ++2013-11-02 Anthony Green ++ ++ * doc/libffi.texi (The Basics): Clarify return value buffer size ++ requirements. Also, NULL result buffer pointers are no longer ++ supported. ++ * doc/libffi.info: Rebuilt. ++ ++2013-11-02 Mischa Jonker ++ ++ * Makefile.am (nodist_libffi_la_SOURCES): Fix build error. ++ * Makefile.in: Rebuilt. ++ ++2013-11-02 David Schneider ++ ++ * src/arm/ffi.c: more robust argument handling for closures on arm hardfloat ++ * testsuite/libffi.call/many_mixed.c: New file. ++ * testsuite/libffi.call/cls_many_mixed_args.c: More tests. ++ ++2013-11-02 Vitaly Budovski ++ ++ * src/x86/ffi.c (ffi_prep_cif_machdep): Don't align stack for win32. ++ ++2013-10-23 Mark H Weaver ++ ++ * src/mips/ffi.c: Fix handling of uint32_t arguments on the ++ MIPS N32 ABI. ++ ++2013-10-13 Sandra Loosemore ++ ++ * README: Add Nios II to table of supported platforms. ++ * Makefile.am (EXTRA_DIST): Add nios2 files. ++ (nodist_libffi_la_SOURCES): Likewise. ++ * Makefile.in: Regenerated. ++ * configure.ac (nios2*-linux*): New host. ++ (NIOS2): Add AM_CONDITIONAL. ++ * configure: Regenerated. ++ * src/nios2/ffi.c: New. ++ * src/nios2/ffitarget.h: New. ++ * src/nios2/sysv.S: New. ++ * src/prep_cif.c (initialize_aggregate): Handle extra structure ++ alignment via FFI_AGGREGATE_ALIGNMENT. ++ (ffi_prep_cif_core): Conditionalize structure return for NIOS2. ++ ++2013-10-10 Sandra Loosemore ++ ++ * testsuite/libffi.call/cls_many_mixed_args.c (cls_ret_double_fn): ++ Fix uninitialized variable. ++ ++2013-10-11 Marcus Shawcroft ++ ++ * testsuite/libffi.call/many.c (many): Replace * with +. ++ ++2013-10-08 Ondřej Bílka ++ ++ * src/aarch64/ffi.c, src/aarch64/sysv.S, src/arm/ffi.c, ++ src/arm/gentramp.sh, src/bfin/sysv.S, src/closures.c, ++ src/dlmalloc.c, src/ia64/ffi.c, src/microblaze/ffi.c, ++ src/microblaze/sysv.S, src/powerpc/darwin_closure.S, ++ src/powerpc/ffi.c, src/powerpc/ffi_darwin.c, src/sh/ffi.c, ++ src/tile/tile.S, testsuite/libffi.call/nested_struct11.c: Fix ++ spelling errors. ++ ++2013-10-08 Anthony Green ++ ++ * aclocal.m4, compile, config.guess, config.sub, depcomp, ++ install-sh, mdate-sh, missing, texinfo.tex: Update from upstream. ++ * configure.ac: Update version to 3.0.14-rc0. ++ * Makefile.in, configure, Makefile.in, include/Makefile.in, ++ man/Makefile.in, testsuite/Makefile.in: Rebuilt. ++ * README: Mention M88K and VAX. ++ ++2013-07-15 Miod Vallat ++ ++ * Makefile.am, ++ configure.ac, ++ src/m88k/ffi.c, ++ src/m88k/ffitarget.h, ++ src/m88k/obsd.S, ++ src/vax/elfbsd.S, ++ src/vax/ffi.c, ++ src/vax/ffitarget.h: Add m88k and vax support. ++ ++2013-06-24 Alan Modra ++ ++ * src/powerpc/ffi.c (ffi_prep_args_SYSV): Move var declaration ++ before statements. ++ (ffi_prep_args64): Support little-endian. ++ (ffi_closure_helper_SYSV, ffi_closure_helper_LINUX64): Likewise. ++ * src/powerpc/linux64_closure.S (ffi_closure_LINUX64): Likewise. ++ * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Likewise. ++ ++2013-06-12 Mischa Jonker ++ ++ * configure.ac: Add support for ARC. ++ * Makefile.am: Likewise. ++ * README: Add ARC details. ++ * src/arc/arcompact.S: New. ++ * src/arc/ffi.c: Likewise. ++ * src/arc/ffitarget.h: Likewise. ++ ++2013-03-28 David Schneider ++ ++ * src/arm/ffi.c: Fix support for ARM hard-float calling convention. ++ * src/arm/sysv.S: call different methods for SYSV and VFP ABIs. ++ * testsuite/libffi.call/cls_many_mixed_args.c: testcase for a closure with ++ mixed arguments, many doubles. ++ * testsuite/libffi.call/many_double.c: testcase for calling a function using ++ more than 8 doubles. ++ * testcase/libffi.call/many.c: use absolute value to check result against an ++ epsilon ++ ++2013-03-17 Anthony Green ++ ++ * README: Update for 3.0.13. ++ * configure.ac: Ditto. ++ * configure: Rebuilt. ++ * doc/*: Update version. ++ ++2013-03-17 Dave Korn ++ ++ * src/closures.c (is_emutramp_enabled ++ [!FFI_MMAP_EXEC_EMUTRAMP_PAX]): Move default definition outside ++ enclosing #if scope. ++ ++2013-03-17 Anthony Green ++ ++ * configure.ac: Only modify toolexecdir in certain cases. ++ * configure: Rebuilt. ++ ++2013-03-16 Gilles Talis ++ ++ * src/powerpc/ffi.c (ffi_prep_args_SYSV): Don't use ++ fparg_count,etc on __NO_FPRS__ targets. ++ ++2013-03-16 Alan Hourihane ++ ++ * src/m68k/sysv.S (epilogue): Don't use extb instruction on ++ m680000 machines. ++ ++2013-03-16 Alex Gaynor ++ ++ * src/x86/ffi.c (ffi_prep_cif_machdep): Always align stack. ++ ++2013-03-13 Markos Chandras ++ ++ * configure.ac: Add support for Imagination Technologies Meta. ++ * Makefile.am: Likewise. ++ * README: Add Imagination Technologies Meta details. ++ * src/metag/ffi.c: New. ++ * src/metag/ffitarget.h: Likewise. ++ * src/metag/sysv.S: Likewise. ++ ++2013-02-24 Andreas Schwab ++ ++ * doc/libffi.texi (Structures): Fix missing category argument of ++ @deftp. ++ ++2013-02-11 Anthony Green ++ ++ * configure.ac: Update release number to 3.0.12. ++ * configure: Rebuilt. ++ * README: Update release info. ++ ++2013-02-10 Anthony Green ++ ++ * README: Add Moxie. ++ * src/moxie/ffi.c: Created. ++ * src/moxie/eabi.S: Created. ++ * src/moxie/ffitarget.h: Created. ++ * Makefile.am (nodist_libffi_la_SOURCES): Add Moxie. ++ * Makefile.in: Rebuilt. ++ * configure.ac: Add Moxie. ++ * configure: Rebuilt. ++ * testsuite/libffi.call/huge_struct.c: Disable format string ++ warnings for moxie*-*-elf tests. ++ ++2013-02-10 Anthony Green ++ ++ * Makefile.am (LTLDFLAGS): Fix reference. ++ * Makefile.in: Rebuilt. ++ ++2013-02-10 Anthony Green ++ ++ * README: Update supported platforms. Update test results link. ++ ++2013-02-09 Anthony Green ++ ++ * testsuite/libffi.call/negint.c: Remove forced -O2. ++ * testsuite/libffi.call/many2.c (foo): Remove GCCism. ++ * testsuite/libffi.call/ffitest.h: Add default PRIuPTR definition. ++ ++ * src/sparc/v8.S (ffi_closure_v8): Import ancient ulonglong ++ closure return type fix developed by Martin v. Löwis for cpython ++ fork. ++ ++2013-02-08 Andreas Tobler ++ ++ * src/powerpc/ffi.c (ffi_prep_cif_machdep): Fix small struct ++ support. ++ * src/powerpc/sysv.S: Ditto. ++ ++2013-02-08 Anthony Green ++ ++ * testsuite/libffi.call/cls_longdouble.c: Remove xfail for ++ arm*-*-*. ++ ++2013-02-08 Anthony Green ++ ++ * src/sparc/ffi.c (ffi_prep_closure_loc): Fix cache flushing for GCC. ++ ++2013-02-08 Matthias Klose ++ ++ * man/ffi_prep_cif.3: Clean up for debian linter. ++ ++2013-02-08 Peter Bergner ++ ++ * src/powerpc/ffi.c (ffi_prep_args_SYSV): Account for FP args pushed ++ on the stack. ++ ++2013-02-08 Anthony Green ++ ++ * Makefile.am (EXTRA_DIST): Add missing files. ++ * testsuite/Makefile.am (EXTRA_DIST): Ditto. ++ * Makefile.in: Rebuilt. ++ ++2013-02-08 Anthony Green ++ ++ * configure.ac: Move sparc asm config checks to within functions ++ for compatibility with sun tools. ++ * configure: Rebuilt. ++ * src/sparc/ffi.c (ffi_prep_closure_loc): Flush cache on v9 ++ systems. ++ * src/sparc/v8.S (ffi_flush_icache): Implement a sparc v9 cache ++ flusher. ++ ++2013-02-08 Nathan Rossi ++ ++ * src/microblaze/ffi.c (ffi_closure_call_SYSV): Fix handling of ++ small big-endian structures. ++ (ffi_prep_args): Ditto. ++ ++2013-02-07 Anthony Green ++ ++ * src/sparc/v8.S (ffi_call_v8): Fix typo from last patch ++ (effectively hiding ffi_call_v8). ++ ++2013-02-07 Anthony Green ++ ++ * configure.ac: Update bug reporting address. ++ * configure.in: Rebuild. ++ ++ * src/sparc/v8.S (ffi_flush_icache): Out-of-line cache flusher for ++ Sun compiler. ++ * src/sparc/ffi.c (ffi_call): Remove warning. ++ Call ffi_flush_icache for non-GCC builds. ++ (ffi_prep_closure_loc): Use ffi_flush_icache. ++ ++ * Makefile.am (EXTRA_DIST): Add libtool-ldflags. ++ * Makefile.in: Rebuilt. ++ * libtool-ldflags: New file. ++ ++2013-02-07 Daniel Schepler ++ ++ * configure.ac: Correctly identify x32 systems as 64-bit. ++ * m4/libtool.m4: Remove libtool expr error. ++ * aclocal.m4, configure: Rebuilt. ++ ++2013-02-07 Anthony Green ++ ++ * configure.ac: Fix GCC usage test. ++ * configure: Rebuilt. ++ * README: Mention LLVM/GCC x86_64 issue. ++ * testsuite/Makefile.in: Rebuilt. ++ ++2013-02-07 Anthony Green ++ ++ * testsuite/libffi.call/cls_double_va.c (main): Replace // style ++ comments with /* */ for xlc compiler. ++ * testsuite/libffi.call/stret_large.c (main): Ditto. ++ * testsuite/libffi.call/stret_large2.c (main): Ditto. ++ * testsuite/libffi.call/nested_struct1.c (main): Ditto. ++ * testsuite/libffi.call/huge_struct.c (main): Ditto. ++ * testsuite/libffi.call/float_va.c (main): Ditto. ++ * testsuite/libffi.call/cls_struct_va1.c (main): Ditto. ++ * testsuite/libffi.call/cls_pointer_stack.c (main): Ditto. ++ * testsuite/libffi.call/cls_pointer.c (main): Ditto. ++ * testsuite/libffi.call/cls_longdouble_va.c (main): Ditto. ++ ++2013-02-06 Anthony Green ++ ++ * man/ffi_prep_cif.3: Clean up for debian lintian checker. ++ ++2013-02-06 Anthony Green ++ ++ * Makefile.am (pkgconfigdir): Add missing pkgconfig install bits. ++ * Makefile.in: Rebuild. ++ ++2013-02-02 Mark H Weaver ++ ++ * src/x86/ffi64.c (ffi_call): Sign-extend integer arguments passed ++ via general purpose registers. ++ ++2013-01-21 Nathan Rossi ++ ++ * README: Add MicroBlaze details. ++ * Makefile.am: Add MicroBlaze support. ++ * configure.ac: Likewise. ++ * src/microblaze/ffi.c: New. ++ * src/microblaze/ffitarget.h: Likewise. ++ * src/microblaze/sysv.S: Likewise. ++ ++2013-01-21 Nathan Rossi ++ * testsuite/libffi.call/return_uc.c: Fixed issue. ++ ++2013-01-21 Chris Zankel ++ ++ * README: Add Xtensa support. ++ * Makefile.am: Likewise. ++ * configure.ac: Likewise. ++ * Makefile.in Regenerate. ++ * configure: Likewise. ++ * src/prep_cif.c: Handle Xtensa. ++ * src/xtensa: New directory. ++ * src/xtensa/ffi.c: New file. ++ * src/xtensa/ffitarget.h: Ditto. ++ * src/xtensa/sysv.S: Ditto. ++ ++2013-01-11 Anthony Green ++ ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Replace // style ++ comments with /* */ for xlc compiler. ++ * src/powerpc/aix.S (ffi_call_AIX): Ditto. ++ * testsuite/libffi.call/ffitest.h (allocate_mmap): Delete ++ deprecated inline function. ++ * testsuite/libffi.special/ffitestcxx.h: Ditto. ++ * README: Add update for AIX support. ++ ++2013-01-11 Anthony Green ++ ++ * configure.ac: Robustify pc relative reloc check. ++ * m4/ax_cc_maxopt.m4: Don't -malign-double. This is an ABI ++ changing option for 32-bit x86. ++ * aclocal.m4, configure: Rebuilt. ++ * README: Update supported target list. ++ ++2013-01-10 Anthony Green ++ ++ * README (tested): Add Compiler column to table. ++ ++2013-01-10 Anthony Green ++ ++ * src/x86/ffi64.c (struct register_args): Make sse array and array ++ of unions for sunpro compiler compatibility. ++ ++2013-01-10 Anthony Green ++ ++ * configure.ac: Test target platform size_t size. Handle both 32 ++ and 64-bit builds for x86_64-* and i?86-* targets (allowing for ++ CFLAG option to change default settings). ++ * configure, aclocal.m4: Rebuilt. ++ ++2013-01-10 Anthony Green ++ ++ * testsuite/libffi.special/special.exp: Only run exception ++ handling tests when using GNU compiler. ++ ++ * m4/ax_compiler_vendor.m4: New file. ++ * configure.ac: Test for compiler vendor and don't use ++ AX_CFLAGS_WARN_ALL with the sun compiler. ++ * aclocal.m4, configure: Rebuilt. ++ ++2013-01-10 Anthony Green ++ ++ * include/ffi_common.h: Don't use GCCisms to define types when ++ building with the SUNPRO compiler. ++ ++2013-01-10 Anthony Green ++ ++ * configure.ac: Put local.exp in the right place. ++ * configure: Rebuilt. ++ ++ * src/x86/ffi.c: Update comment about regparm function attributes. ++ * src/x86/sysv.S (ffi_closure_SYSV): The SUNPRO compiler requires ++ that all function arguments be passed on the stack (no regparm ++ support). ++ ++2013-01-08 Anthony Green ++ ++ * configure.ac: Generate local.exp. This sets CC_FOR_TARGET ++ when we are using the vendor compiler. ++ * testsuite/Makefile.am (EXTRA_DEJAGNU_SITE_CONFIG): Point to ++ ../local.exp. ++ * configure, testsuite/Makefile.in: Rebuilt. ++ ++ * testsuite/libffi.call/call.exp: Run tests with different ++ options, depending on whether or not we are using gcc or the ++ vendor compiler. ++ * testsuite/lib/libffi.exp (libffi-init): Set using_gcc based on ++ whether or not we are building/testing with gcc. ++ ++2013-01-08 Anthony Green ++ ++ * configure.ac: Switch x86 solaris target to X86 by default. ++ * configure: Rebuilt. ++ ++2013-01-08 Anthony Green ++ ++ * configure.ac: Fix test for read-only eh_frame. ++ * configure: Rebuilt. ++ ++2013-01-08 Anthony Green ++ ++ * src/x86/sysv.S, src/x86/unix64.S: Only emit DWARF unwind info ++ when building with the GNU toolchain. ++ * testsuite/libffi.call/ffitest.h (CHECK): Fix for Solaris vendor ++ compiler. ++ ++2013-01-07 Thorsten Glaser ++ ++ * testsuite/libffi.call/cls_uchar_va.c, ++ testsuite/libffi.call/cls_ushort_va.c, ++ testsuite/libffi.call/va_1.c: Testsuite fixes. ++ ++2013-01-07 Thorsten Glaser ++ ++ * src/m68k/ffi.c (CIF_FLAGS_SINT8, CIF_FLAGS_SINT16): Define. ++ (ffi_prep_cif_machdep): Fix 8-bit and 16-bit signed calls. ++ * src/m68k/sysv.S (ffi_call_SYSV, ffi_closure_SYSV): Ditto. ++ ++2013-01-04 Anthony Green ++ ++ * Makefile.am (AM_CFLAGS): Don't automatically add -fexceptions ++ and -Wall. This is set in the configure script after testing for ++ GCC. ++ * Makefile.in: Rebuilt. ++ ++2013-01-02 rofl0r ++ ++ * src/powerpc/ffi.c (ffi_prep_cif_machdep): Fix build error on ppc ++ when long double == double. ++ ++2013-01-02 Reini Urban ++ ++ * Makefile.am (libffi_la_LDFLAGS): Add -no-undefined to LDFLAGS ++ (required for shared libs on cygwin/mingw). ++ * Makefile.in: Rebuilt. ++ ++2012-10-31 Alan Modra ++ ++ * src/powerpc/linux64_closure.S: Add new ABI support. ++ * src/powerpc/linux64.S: Likewise. ++ ++2012-10-30 Magnus Granberg ++ Pavel Labushev ++ ++ * configure.ac: New options pax_emutramp ++ * configure, fficonfig.h.in: Regenerated ++ * src/closures.c: New function emutramp_enabled_check() and ++ checks. ++ ++2012-10-30 Frederick Cheung ++ ++ * configure.ac: Enable FFI_MAP_EXEC_WRIT for Darwin 12 (mountain ++ lion) and future version. ++ * configure: Rebuild. ++ ++2012-10-30 James Greenhalgh ++ Marcus Shawcroft ++ ++ * README: Add details of aarch64 port. ++ * src/aarch64/ffi.c: New. ++ * src/aarch64/ffitarget.h: Likewise. ++ * src/aarch64/sysv.S: Likewise. ++ * Makefile.am: Support aarch64. ++ * configure.ac: Support aarch64. ++ * Makefile.in, configure: Rebuilt. ++ ++2012-10-30 James Greenhalgh ++ Marcus Shawcroft ++ ++ * testsuite/lib/libffi.exp: Add support for aarch64. ++ * testsuite/libffi.call/cls_struct_va1.c: New. ++ * testsuite/libffi.call/cls_uchar_va.c: Likewise. ++ * testsuite/libffi.call/cls_uint_va.c: Likewise. ++ * testsuite/libffi.call/cls_ulong_va.c: Likewise. ++ * testsuite/libffi.call/cls_ushort_va.c: Likewise. ++ * testsuite/libffi.call/nested_struct11.c: Likewise. ++ * testsuite/libffi.call/uninitialized.c: Likewise. ++ * testsuite/libffi.call/va_1.c: Likewise. ++ * testsuite/libffi.call/va_struct1.c: Likewise. ++ * testsuite/libffi.call/va_struct2.c: Likewise. ++ * testsuite/libffi.call/va_struct3.c: Likewise. ++ ++2012-10-12 Walter Lee ++ ++ * Makefile.am: Add TILE-Gx/TILEPro support. ++ * configure.ac: Likewise. ++ * Makefile.in: Regenerate. ++ * configure: Likewise. ++ * src/prep_cif.c (ffi_prep_cif_core): Handle TILE-Gx/TILEPro. ++ * src/tile: New directory. ++ * src/tile/ffi.c: New file. ++ * src/tile/ffitarget.h: Ditto. ++ * src/tile/tile.S: Ditto. ++ ++2012-10-12 Matthias Klose ++ ++ * generate-osx-source-and-headers.py: Normalize whitespace. ++ ++2012-09-14 David Edelsohn ++ ++ * configure: Regenerated. ++ ++2012-08-26 Andrew Pinski ++ ++ PR libffi/53014 ++ * src/mips/ffi.c (ffi_prep_closure_loc): Allow n32 with soft-float and n64 with ++ soft-float. ++ ++2012-08-08 Uros Bizjak ++ ++ * src/s390/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, ++ just return FFI_BAD_ABI when things are wrong. ++ ++2012-07-18 H.J. Lu ++ ++ PR libffi/53982 ++ PR libffi/53973 ++ * src/x86/ffitarget.h: Check __ILP32__ instead of __LP64__ for x32. ++ (FFI_SIZEOF_JAVA_RAW): Defined to 4 for x32. ++ ++2012-05-16 H.J. Lu ++ ++ * configure: Regenerated. ++ ++2012-05-05 Nicolas Lelong ++ ++ * libffi.xcodeproj/project.pbxproj: Fixes. ++ * README: Update for iOS builds. ++ ++2012-04-23 Alexandre Keunecke I. de Mendonca ++ ++ * configure.ac: Add Blackfin/sysv support ++ * Makefile.am: Add Blackfin/sysv support ++ * src/bfin/ffi.c: Add Blackfin/sysv support ++ * src/bfin/ffitarget.h: Add Blackfin/sysv support ++ ++2012-04-11 Anthony Green ++ ++ * Makefile.am (EXTRA_DIST): Add new script. ++ * Makefile.in: Rebuilt. ++ ++2012-04-11 Zachary Waldowski ++ ++ * generate-ios-source-and-headers.py, ++ libffi.xcodeproj/project.pbxproj: Support a Mac static library via ++ Xcode. Set iOS compatibility to 4.0. Move iOS trampoline ++ generation into an Xcode "run script" phase. Include both as ++ Xcode build scripts. Don't always regenerate config files. ++ ++2012-04-10 Anthony Green ++ ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Add missing semicolon. ++ ++2012-04-06 Anthony Green ++ ++ * Makefile.am (EXTRA_DIST): Add new iOS/xcode files. ++ * Makefile.in: Rebuilt. ++ ++2012-04-06 Mike Lewis ++ ++ * generate-ios-source-and-headers.py: New file. ++ * libffi.xcodeproj/project.pbxproj: New file. ++ * README: Update instructions on building iOS binary. ++ * build-ios.sh: Delete. ++ ++2012-04-06 Anthony Green ++ ++ * src/x86/ffi64.c (UINT128): Define differently for Intel and GNU ++ compilers, then use it. ++ ++2012-04-06 H.J. Lu ++ ++ * m4/libtool.m4 (_LT_ENABLE_LOCK): Support x32. ++ ++2012-04-06 Anthony Green ++ ++ * testsuite/Makefile.am (EXTRA_DIST): Add missing test cases. ++ * testsuite/Makefile.in: Rebuilt. ++ ++2012-04-05 Zachary Waldowski ++ ++ * include/ffi.h.in: Add missing trampoline table fields. ++ * src/arm/sysv.S: Fix ENTRY definition, and wrap symbol references ++ in CNAME. ++ * src/x86/ffi.c: Wrap Windows specific code in ifdefs. ++ ++2012-04-02 Peter Bergner ++ ++ * src/powerpc/ffi.c (ffi_prep_args_SYSV): Declare double_tmp. ++ Silence casting pointer to integer of different size warning. ++ Delete goto to previously deleted label. ++ (ffi_call): Silence possibly undefined warning. ++ (ffi_closure_helper_SYSV): Declare variable type. ++ ++2012-04-02 Peter Rosin ++ ++ * src/x86/win32.S (ffi_call_win32): Sign/zero extend the return ++ value in the Intel version as is already done for the AT&T version. ++ (ffi_closure_SYSV): Likewise. ++ (ffi_closure_raw_SYSV): Likewise. ++ (ffi_closure_STDCALL): Likewise. ++ ++2012-03-29 Peter Rosin ++ ++ * src/x86/win32.S (ffi_closure_raw_THISCALL): Unify the frame ++ generation, fix the ENDP label and remove the surplus third arg ++ from the 'lea' insn. ++ ++2012-03-29 Peter Rosin ++ ++ * src/x86/win32.S (ffi_closure_raw_SYSV): Make the 'stubraw' label ++ visible outside the PROC, so that ffi_closure_raw_THISCALL can see ++ it. Also instruct the assembler to add a frame to the function. ++ ++2012-03-23 Peter Rosin ++ ++ * Makefile.am (AM_CPPFLAGS): Add -DFFI_BUILDING. ++ * Makefile.in: Rebuilt. ++ * include/ffi.h.in [MSVC]: Add __declspec(dllimport) decorations ++ to all data exports, when compiling libffi clients using MSVC. ++ ++2012-03-29 Peter Rosin ++ ++ * src/x86/ffitarget.h (ffi_abi): Add new ABI FFI_MS_CDECL and ++ make it the default for MSVC. ++ (FFI_TYPE_MS_STRUCT): New structure return convention. ++ * src/x86/ffi.c (ffi_prep_cif_machdep): Tweak the structure ++ return convention for FFI_MS_CDECL to be FFI_TYPE_MS_STRUCT ++ instead of an ordinary FFI_TYPE_STRUCT. ++ (ffi_prep_args): Treat FFI_TYPE_MS_STRUCT as FFI_TYPE_STRUCT. ++ (ffi_call): Likewise. ++ (ffi_prep_incoming_args_SYSV): Likewise. ++ (ffi_raw_call): Likewise. ++ (ffi_prep_closure_loc): Treat FFI_MS_CDECL as FFI_SYSV. ++ * src/x86/win32.S (ffi_closure_SYSV): For FFI_TYPE_MS_STRUCT, ++ return a pointer to the result structure in eax and don't pop ++ that pointer from the stack, the caller takes care of it. ++ (ffi_call_win32): Treat FFI_TYPE_MS_STRUCT as FFI_TYPE_STRUCT. ++ (ffi_closure_raw_SYSV): Likewise. ++ ++2012-03-22 Peter Rosin ++ ++ * testsuite/libffi.call/closure_stdcall.c [MSVC]: Add inline ++ assembly version with Intel syntax. ++ * testsuite/libffi.call/closure_thiscall.c [MSVC]: Likewise. ++ ++2012-03-23 Peter Rosin ++ ++ * testsuite/libffi.call/ffitest.h: Provide abstration of ++ __attribute__((fastcall)) in the form of a __FASTCALL__ ++ define. Define it to __fastcall for MSVC. ++ * testsuite/libffi.call/fastthis1_win32.c: Use the above. ++ * testsuite/libffi.call/fastthis2_win32.c: Likewise. ++ * testsuite/libffi.call/fastthis3_win32.c: Likewise. ++ * testsuite/libffi.call/strlen2_win32.c: Likewise. ++ * testsuite/libffi.call/struct1_win32.c: Likewise. ++ * testsuite/libffi.call/struct2_win32.c: Likewise. ++ ++2012-03-22 Peter Rosin ++ ++ * src/x86/win32.S [MSVC] (ffi_closure_THISCALL): Remove the manual ++ frame on function entry, MASM adds one automatically. ++ ++2012-03-22 Peter Rosin ++ ++ * testsuite/libffi.call/ffitest.h [MSVC]: Add kludge for missing ++ bits in the MSVC headers. ++ ++2012-03-22 Peter Rosin ++ ++ * testsuite/libffi.call/cls_12byte.c: Adjust to the C89 style ++ with no declarations after statements. ++ * testsuite/libffi.call/cls_16byte.c: Likewise. ++ * testsuite/libffi.call/cls_18byte.c: Likewise. ++ * testsuite/libffi.call/cls_19byte.c: Likewise. ++ * testsuite/libffi.call/cls_1_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte1.c: Likewise. ++ * testsuite/libffi.call/cls_24byte.c: Likewise. ++ * testsuite/libffi.call/cls_2byte.c: Likewise. ++ * testsuite/libffi.call/cls_3_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_3byte1.c: Likewise. ++ * testsuite/libffi.call/cls_3byte2.c: Likewise. ++ * testsuite/libffi.call/cls_4_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_4byte.c: Likewise. ++ * testsuite/libffi.call/cls_5_1_byte.c: Likewise. ++ * testsuite/libffi.call/cls_5byte.c: Likewise. ++ * testsuite/libffi.call/cls_64byte.c: Likewise. ++ * testsuite/libffi.call/cls_6_1_byte.c: Likewise. ++ * testsuite/libffi.call/cls_6byte.c: Likewise. ++ * testsuite/libffi.call/cls_7_1_byte.c: Likewise. ++ * testsuite/libffi.call/cls_7byte.c: Likewise. ++ * testsuite/libffi.call/cls_8byte.c: Likewise. ++ * testsuite/libffi.call/cls_9byte1.c: Likewise. ++ * testsuite/libffi.call/cls_9byte2.c: Likewise. ++ * testsuite/libffi.call/cls_align_double.c: Likewise. ++ * testsuite/libffi.call/cls_align_float.c: Likewise. ++ * testsuite/libffi.call/cls_align_longdouble.c: Likewise. ++ * testsuite/libffi.call/cls_align_longdouble_split.c: Likewise. ++ * testsuite/libffi.call/cls_align_longdouble_split2.c: Likewise. ++ * testsuite/libffi.call/cls_align_pointer.c: Likewise. ++ * testsuite/libffi.call/cls_align_sint16.c: Likewise. ++ * testsuite/libffi.call/cls_align_sint32.c: Likewise. ++ * testsuite/libffi.call/cls_align_sint64.c: Likewise. ++ * testsuite/libffi.call/cls_align_uint16.c: Likewise. ++ * testsuite/libffi.call/cls_align_uint32.c: Likewise. ++ * testsuite/libffi.call/cls_align_uint64.c: Likewise. ++ * testsuite/libffi.call/cls_dbls_struct.c: Likewise. ++ * testsuite/libffi.call/cls_pointer_stack.c: Likewise. ++ * testsuite/libffi.call/err_bad_typedef.c: Likewise. ++ * testsuite/libffi.call/huge_struct.c: Likewise. ++ * testsuite/libffi.call/nested_struct.c: Likewise. ++ * testsuite/libffi.call/nested_struct1.c: Likewise. ++ * testsuite/libffi.call/nested_struct10.c: Likewise. ++ * testsuite/libffi.call/nested_struct2.c: Likewise. ++ * testsuite/libffi.call/nested_struct3.c: Likewise. ++ * testsuite/libffi.call/nested_struct4.c: Likewise. ++ * testsuite/libffi.call/nested_struct5.c: Likewise. ++ * testsuite/libffi.call/nested_struct6.c: Likewise. ++ * testsuite/libffi.call/nested_struct7.c: Likewise. ++ * testsuite/libffi.call/nested_struct8.c: Likewise. ++ * testsuite/libffi.call/nested_struct9.c: Likewise. ++ * testsuite/libffi.call/stret_large.c: Likewise. ++ * testsuite/libffi.call/stret_large2.c: Likewise. ++ * testsuite/libffi.call/stret_medium.c: Likewise. ++ * testsuite/libffi.call/stret_medium2.c: Likewise. ++ * testsuite/libffi.call/struct1.c: Likewise. ++ * testsuite/libffi.call/struct1_win32.c: Likewise. ++ * testsuite/libffi.call/struct2.c: Likewise. ++ * testsuite/libffi.call/struct2_win32.c: Likewise. ++ * testsuite/libffi.call/struct3.c: Likewise. ++ * testsuite/libffi.call/struct4.c: Likewise. ++ * testsuite/libffi.call/struct5.c: Likewise. ++ * testsuite/libffi.call/struct6.c: Likewise. ++ * testsuite/libffi.call/struct7.c: Likewise. ++ * testsuite/libffi.call/struct8.c: Likewise. ++ * testsuite/libffi.call/struct9.c: Likewise. ++ * testsuite/libffi.call/testclosure.c: Likewise. ++ ++2012-03-21 Peter Rosin ++ ++ * testsuite/libffi.call/float_va.c (float_va_fn): Use %f when ++ printing doubles (%lf is for long doubles). ++ (main): Likewise. ++ ++2012-03-21 Peter Rosin ++ ++ * testsuite/lib/target-libpath.exp [*-*-cygwin*, *-*-mingw*] ++ (set_ld_library_path_env_vars): Add the library search dir to PATH ++ (and save PATH for later). ++ (restore_ld_library_path_env_vars): Restore PATH. ++ ++2012-03-21 Peter Rosin ++ ++ * testsuite/lib/target-libpath.exp [*-*-cygwin*, *-*-mingw*] ++ (set_ld_library_path_env_vars): Add the library search dir to PATH ++ (and save PATH for later). ++ (restore_ld_library_path_env_vars): Restore PATH. ++ ++2012-03-20 Peter Rosin ++ ++ * testsuite/libffi.call/strlen2_win32.c (main): Remove bug. ++ * src/x86/win32.S [MSVC] (ffi_closure_SYSV): Make the 'stub' label ++ visible outside the PROC, so that ffi_closure_THISCALL can see it. ++ ++2012-03-20 Peter Rosin ++ ++ * testsuite/libffi.call/strlen2_win32.c (main): Remove bug. ++ * src/x86/win32.S [MSVC] (ffi_closure_SYSV): Make the 'stub' label ++ visible outside the PROC, so that ffi_closure_THISCALL can see it. ++ ++2012-03-19 Alan Hourihane ++ ++ * src/m68k/ffi.c: Add MINT support. ++ * src/m68k/sysv.S: Ditto. ++ ++2012-03-06 Chung-Lin Tang ++ ++ * src/arm/ffi.c (ffi_call): Add __ARM_EABI__ guard around call to ++ ffi_call_VFP(). ++ (ffi_prep_closure_loc): Add __ARM_EABI__ guard around use of ++ ffi_closure_VFP. ++ * src/arm/sysv.S: Add __ARM_EABI__ guard around VFP code. ++ ++2012-03-19 chennam ++ ++ * src/powerpc/ffi_darwin.c (ffi_prep_closure_loc): Fix AIX closure ++ support. ++ ++2012-03-13 Kaz Kojima ++ ++ * src/sh/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, ++ just return FFI_BAD_ABI when things are wrong. ++ * src/sh64/ffi.c (ffi_prep_closure_loc): Ditto. ++ ++2012-03-09 David Edelsohn ++ ++ * src/powerpc/aix_closure.S (ffi_closure_ASM): Adjust for Darwin64 ++ change to return value of ffi_closure_helper_DARWIN and load type ++ from return type. ++ ++2012-03-03 H.J. Lu ++ ++ * src/x86/ffi64.c (ffi_call): Cast the return value to unsigned ++ long. ++ (ffi_prep_closure_loc): Cast to 64bit address in trampoline. ++ (ffi_closure_unix64_inner): Cast return pointer to unsigned long ++ first. ++ ++ * src/x86/ffitarget.h (FFI_SIZEOF_ARG): Defined to 8 for x32. ++ (ffi_arg): Set to unsigned long long for x32. ++ (ffi_sarg): Set to long long for x32. ++ ++2012-03-03 H.J. Lu ++ ++ * src/prep_cif.c (ffi_prep_cif_core): Properly check bad ABI. ++ ++2012-03-03 Andoni Morales Alastruey ++ ++ * configure.ac: Add -no-undefined for both 32- and 64-bit x86 ++ windows-like hosts. ++ * configure: Rebuilt. ++ ++2012-02-27 Mikael Pettersson ++ ++ PR libffi/52223 ++ * Makefile.am (FLAGS_TO_PASS): Define. ++ * Makefile.in: Regenerate. ++ ++2012-02-23 Anthony Green ++ ++ * src/*/ffitarget.h: Ensure that users never include ffitarget.h ++ directly. ++ ++2012-02-23 Kai Tietz ++ ++ PR libffi/52221 ++ * src/x86/ffi.c (ffi_closure_raw_THISCALL): New ++ prototype. ++ (ffi_prep_raw_closure_loc): Use ffi_closure_raw_THISCALL for ++ thiscall-convention. ++ (ffi_raw_call): Use ffi_prep_args_raw. ++ * src/x86/win32.S (ffi_closure_raw_THISCALL): Add ++ implementation for stub. ++ ++2012-02-10 Kai Tietz ++ ++ * configure.ac (AM_LTLDFLAGS): Add -no-undefine for x64 ++ windows target. ++ * configure: Regenerated. ++ ++2012-02-08 Kai Tietz ++ ++ * src/prep_cif.c (ffi_prep_cif): Allow for X86_WIN32 ++ also FFI_THISCALL. ++ * src/x86/ffi.c (ffi_closure_THISCALL): Add prototype. ++ (FFI_INIT_TRAMPOLINE_THISCALL): New trampoline code. ++ (ffi_prep_closure_loc): Add FFI_THISCALL support. ++ * src/x86/ffitarget.h (FFI_TRAMPOLINE_SIZE): Adjust size. ++ * src/x86/win32.S (ffi_closure_THISCALL): New closure code ++ for thiscall-calling convention. ++ * testsuite/libffi.call/closure_thiscall.c: New test. ++ ++2012-01-28 Kai Tietz ++ ++ * src/libffi/src/x86/ffi.c (ffi_call_win32): Add new ++ argument to prototype for specify calling-convention. ++ (ffi_call): Add support for stdcall/thiscall convention. ++ (ffi_prep_args): Likewise. ++ (ffi_raw_call): Likewise. ++ * src/x86/ffitarget.h (ffi_abi): Add FFI_THISCALL and ++ FFI_FASTCALL. ++ * src/x86/win32.S (_ffi_call_win32): Add support for ++ fastcall/thiscall calling-convention calls. ++ * testsuite/libffi.call/fastthis1_win32.c: New test. ++ * testsuite/libffi.call/fastthis2_win32.c: New test. ++ * testsuite/libffi.call/fastthis3_win32.c: New test. ++ * testsuite/libffi.call/strlen2_win32.c: New test. ++ * testsuite/libffi.call/many2_win32.c: New test. ++ * testsuite/libffi.call/struct1_win32.c: New test. ++ * testsuite/libffi.call/struct2_win32.c: New test. ++ ++2012-01-23 Uros Bizjak ++ ++ * src/alpha/ffi.c (ffi_prep_closure_loc): Check for bad ABI. ++ ++2012-01-23 Anthony Green ++ Chris Young ++ ++ * configure.ac: Add Amiga support. ++ * configure: Rebuilt. ++ ++2012-01-23 Dmitry Nadezhin ++ ++ * include/ffi_common.h (LIKELY, UNLIKELY): Fix definitions. ++ ++2012-01-23 Andreas Schwab ++ ++ * src/m68k/sysv.S (ffi_call_SYSV): Properly test for plain ++ mc68000. Test for __HAVE_68881__ in addition to __MC68881__. ++ ++2012-01-19 Jakub Jelinek ++ ++ PR rtl-optimization/48496 ++ * src/ia64/ffi.c (ffi_call): Fix up aliasing violations. ++ ++2012-01-09 Rainer Orth ++ ++ * configure.ac (i?86-*-*): Set TARGET to X86_64. ++ * configure: Regenerate. ++ ++2011-12-07 Andrew Pinski ++ ++ PR libffi/50051 ++ * src/mips/n32.S: Add ".set mips4". ++ ++2011-11-21 Andreas Tobler ++ ++ * configure: Regenerate. ++ ++2011-11-12 David Gilbert ++ ++ * doc/libffi.texi, include/ffi.h.in, include/ffi_common.h, ++ man/Makefile.am, man/ffi.3, man/ffi_prep_cif.3, ++ man/ffi_prep_cif_var.3, src/arm/ffi.c, src/arm/ffitarget.h, ++ src/cris/ffi.c, src/prep_cif.c, ++ testsuite/libffi.call/cls_double_va.c, ++ testsuite/libffi.call/cls_longdouble_va.c, ++ testsuite/libffi.call/float_va.c: Many changes to support variadic ++ function calls. ++ ++2011-11-12 Kyle Moffett ++ ++ * src/powerpc/ffi.c, src/powerpc/ffitarget.h, ++ src/powerpc/ppc_closure.S, src/powerpc/sysv.S: Many changes for ++ softfloat powerpc variants. ++ ++2011-11-12 Petr Salinger ++ ++ * configure.ac (FFI_EXEC_TRAMPOLINE_TABLE): Fix kfreebsd support. ++ * configure: Rebuilt. ++ ++2011-11-12 Timothy Wall ++ ++ * src/arm/ffi.c (ffi_prep_args, ffi_prep_incoming_args_SYSV): Max ++ alignment of 4 for wince on ARM. ++ ++2011-11-12 Kyle Moffett ++ Anthony Green ++ ++ * src/ppc/sysv.S, src/ppc/ffi.c: Remove use of ppc string ++ instructions (not available on some cores, like the PPC440). ++ ++2011-11-12 Kimura Wataru ++ ++ * m4/ax_enable_builddir: Change from string comparison to numeric ++ comparison for wc output. ++ * configure.ac: Enable FFI_MMAP_EXEC_WRIT for darwin11 aka Mac OS ++ X 10.7. ++ * configure: Rebuilt. ++ ++2011-11-12 Anthony Green ++ ++ * Makefile.am (AM_CCASFLAGS): Add -g option to build assembly ++ files with debug info. ++ * Makefile.in: Rebuilt. ++ ++2011-11-12 Jasper Lievisse Adriaanse ++ ++ * README: Update list of supported OpenBSD systems. ++ ++2011-11-12 Anthony Green ++ ++ * libtool-version: Update. ++ * Makefile.am (nodist_libffi_la_SOURCES): Add src/debug.c if ++ FFI_DEBUG. ++ (libffi_la_SOURCES): Remove src/debug.c ++ (EXTRA_DIST): Add src/debug.c ++ * Makefile.in: Rebuilt. ++ * README: Update for 3.0.11. ++ ++2011-11-10 Richard Henderson ++ ++ * configure.ac (GCC_AS_CFI_PSEUDO_OP): Use it instead of inline check. ++ * configure, aclocal.m4: Rebuild. ++ ++2011-09-04 Iain Sandoe ++ ++ PR libffi/49594 ++ * src/powerpc/darwin_closure.S (stubs): Make the stub binding ++ helper reference track the architecture pointer size. ++ ++2011-08-25 Andrew Haley ++ ++ * src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Remove hard-coded assembly ++ instructions. ++ * src/arm/sysv.S (ffi_arm_trampoline): Put them here instead. ++ ++2011-07-11 Andrew Haley ++ ++ * src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Clear icache. ++ ++2011-06-29 Rainer Orth ++ ++ * testsuite/libffi.call/cls_double_va.c: Move PR number to comment. ++ * testsuite/libffi.call/cls_longdouble_va.c: Likewise. ++ ++2011-06-29 Rainer Orth ++ ++ PR libffi/46660 ++ * testsuite/libffi.call/cls_double_va.c: xfail dg-output on ++ mips-sgi-irix6*. ++ * testsuite/libffi.call/cls_longdouble_va.c: Likewise. ++ ++2011-06-14 Rainer Orth ++ ++ * testsuite/libffi.call/huge_struct.c (test_large_fn): Use PRIu8, ++ PRId8 instead of %hhu, %hhd. ++ * testsuite/libffi.call/ffitest.h [__alpha__ && __osf__] (PRId8, ++ PRIu8): Define. ++ [__sgi__] (PRId8, PRIu8): Define. ++ ++2011-04-29 Rainer Orth ++ ++ * src/alpha/osf.S (UA_SI, FDE_ENCODING, FDE_ENCODE, FDE_ARANGE): ++ Define. ++ Use them to handle ELF vs. ECOFF differences. ++ [__osf__] (_GLOBAL__F_ffi_call_osf): Define. ++ ++2011-03-30 Timothy Wall ++ ++ * src/powerpc/darwin.S: Fix unknown FDE encoding. ++ * src/powerpc/darwin_closure.S: ditto. ++ ++2011-02-25 Anthony Green ++ ++ * src/powerpc/ffi.c (ffi_prep_closure_loc): Allow for more ++ 32-bit ABIs. ++ ++2011-02-15 Anthony Green ++ ++ * m4/ax_cc_maxopt.m4: Don't -malign-double or use -ffast-math. ++ * configure: Rebuilt. ++ ++2011-02-13 Ralf Wildenhues ++ ++ * configure: Regenerate. ++ ++2011-02-13 Anthony Green ++ ++ * include/ffi_common.h (UNLIKELY, LIKELY): Define. ++ * src/x86/ffi64.c (UNLIKELY, LIKELY): Remove definition. ++ * src/prep_cif.c (UNLIKELY, LIKELY): Remove definition. ++ ++ * src/prep_cif.c (initialize_aggregate): Convert assertion into ++ FFI_BAD_TYPEDEF return. Initialize arg size and alignment to 0. ++ ++ * src/pa/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, ++ just return FFI_BAD_ABI when things are wrong. ++ * src/arm/ffi.c (ffi_prep_closure_loc): Ditto. ++ * src/powerpc/ffi.c (ffi_prep_closure_loc): Ditto. ++ * src/mips/ffi.c (ffi_prep_closure_loc): Ditto. ++ * src/ia64/ffi.c (ffi_prep_closure_loc): Ditto. ++ * src/avr32/ffi.c (ffi_prep_closure_loc): Ditto. ++ ++2011-02-11 Anthony Green ++ ++ * src/sparc/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, ++ just return FFI_BAD_ABI when things are wrong. ++ ++2012-02-11 Eric Botcazou ++ ++ * src/sparc/v9.S (STACKFRAME): Bump to 176. ++ ++2011-02-09 Stuart Shelton ++ ++ http://bugs.gentoo.org/show_bug.cgi?id=286911 ++ * src/mips/ffitarget.h: Clean up error messages. ++ * src/java_raw_api.c (ffi_java_translate_args): Cast raw arg to ++ ffi_raw*. ++ * include/ffi.h.in: Add pragma for SGI compiler. ++ ++2011-02-09 Anthony Green ++ ++ * configure.ac: Add powerpc64-*-darwin* support. ++ ++2011-02-09 Anthony Green ++ ++ * README: Mention Interix. ++ ++2011-02-09 Jonathan Callen ++ ++ * configure.ac: Add Interix to win32/cygwin/mingw case. ++ * configure: Ditto. ++ * src/closures.c: Treat Interix like Cygwin, instead of as a ++ generic win32. ++ ++2011-02-09 Anthony Green ++ ++ * testsuite/libffi.call/err_bad_typedef.c: Remove xfail. ++ * testsuite/libffi.call/err_bad_abi.c: Remove xfail. ++ * src/x86/ffi64.c (UNLIKELY, LIKELY): Define. ++ (ffi_prep_closure_loc): Check for bad ABI. ++ * src/prep_cif.c (UNLIKELY, LIKELY): Define. ++ (initialize_aggregate): Check for bad types. ++ ++2011-02-09 Landon Fuller ++ ++ * Makefile.am (EXTRA_DIST): Add build-ios.sh, src/arm/gentramp.sh, ++ src/arm/trampoline.S. ++ (nodist_libffi_la_SOURCES): Add src/arc/trampoline.S. ++ * configure.ac (FFI_EXEC_TRAMPOLINE_TABLE): Define. ++ * src/arm/ffi.c (ffi_trampoline_table) ++ (ffi_closure_trampoline_table_page, ffi_trampoline_table_entry) ++ (FFI_TRAMPOLINE_CODELOC_CONFIG, FFI_TRAMPOLINE_CONFIG_PAGE_OFFSET) ++ (FFI_TRAMPOLINE_COUNT, ffi_trampoline_lock, ffi_trampoline_tables) ++ (ffi_trampoline_table_alloc, ffi_closure_alloc, ffi_closure_free): ++ Define for FFI_EXEC_TRAMPOLINE_TABLE case (iOS). ++ (ffi_prep_closure_loc): Handl FFI_EXEC_TRAMPOLINE_TABLE case ++ separately. ++ * src/arm/sysv.S: Handle Apple iOS host. ++ * src/closures.c: Handle FFI_EXEC_TRAMPOLINE_TABLE case. ++ * build-ios.sh: New file. ++ * fficonfig.h.in, configure, Makefile.in: Rebuilt. ++ * README: Mention ARM iOS. ++ ++2011-02-08 Oren Held ++ ++ * src/dlmalloc.c (_STRUCT_MALLINFO): Define in order to avoid ++ redefinition of mallinfo on HP-UX. ++ ++2011-02-08 Ginn Chen ++ ++ * src/sparc/ffi.c (ffi_call): Make compatible with Solaris Studio ++ aggregate return ABI. Flush cache. ++ (ffi_prep_closure_loc): Flush cache. ++ ++2011-02-11 Anthony Green ++ ++ From Tom Honermann : ++ * src/powerpc/aix.S (ffi_call_AIX): Support for xlc toolchain on ++ AIX. Declare .ffi_prep_args. Insert nops after branch ++ instructions so that the AIX linker can insert TOC reload ++ instructions. ++ * src/powerpc/aix_closure.S: Declare .ffi_closure_helper_DARWIN. ++ ++2011-02-08 Ed ++ ++ * src/powerpc/asm.h: Fix grammar nit in comment. ++ ++2011-02-08 Uli Link ++ ++ * include/ffi.h.in (FFI_64_BIT_MAX): Define and use. ++ ++2011-02-09 Rainer Orth ++ ++ PR libffi/46661 ++ * testsuite/libffi.call/cls_pointer.c (main): Cast void * to ++ uintptr_t first. ++ * testsuite/libffi.call/cls_pointer_stack.c (main): Likewise. ++ ++2011-02-08 Rafael Avila de Espindola ++ ++ * configure.ac: Fix x86 test for pc related relocs. ++ * configure: Rebuilt. ++ ++2011-02-07 Joel Sherrill ++ ++ * libffi/src/m68k/ffi.c: Add RTEMS support for cache flushing. ++ Handle case when CPU variant does not have long double support. ++ * libffi/src/m68k/sysv.S: Add support for mc68000, Coldfire, ++ and cores with soft floating point. ++ ++2011-02-07 Joel Sherrill ++ ++ * configure.ac: Add mips*-*-rtems* support. ++ * configure: Regenerate. ++ * src/mips/ffitarget.h: Ensure needed constants are available ++ for targets which do not have sgidefs.h. ++ ++2011-01-26 Dave Korn ++ ++ PR target/40125 ++ * configure.ac (AM_LTLDFLAGS): Add -bindir option for windows DLLs. ++ * configure: Regenerate. ++ ++2010-12-18 Iain Sandoe ++ ++ PR libffi/29152 ++ PR libffi/42378 ++ * src/powerpc/darwin_closure.S: Provide Darwin64 implementation, ++ update comments. ++ * src/powerpc/ffitarget.h (POWERPC_DARWIN64): New, ++ (FFI_TRAMPOLINE_SIZE): Update for Darwin64. ++ * src/powerpc/darwin.S: Provide Darwin64 implementation, ++ update comments. ++ * src/powerpc/ffi_darwin.c: Likewise. ++ ++2010-12-06 Rainer Orth ++ ++ * configure.ac (libffi_cv_as_ascii_pseudo_op): Use double ++ backslashes. ++ (libffi_cv_as_string_pseudo_op): Likewise. ++ * configure: Regenerate. ++ ++2010-12-03 Chung-Lin Tang ++ ++ * src/arm/sysv.S (ffi_closure_SYSV): Add UNWIND to .pad directive. ++ (ffi_closure_VFP): Same. ++ (ffi_call_VFP): Move down to before ffi_closure_VFP. Add '.fpu vfp' ++ directive. ++ ++2010-12-01 Rainer Orth ++ ++ * testsuite/libffi.call/ffitest.h [__sgi] (PRId64, PRIu64): Define. ++ (PRIuPTR): Define. ++ ++2010-11-29 Richard Henderson ++ Rainer Orth ++ ++ * src/x86/sysv.S (FDE_ENCODING, FDE_ENCODE): Define. ++ (.eh_frame): Use FDE_ENCODING. ++ (.LASFDE1, .LASFDE2, LASFDE3): Simplify with FDE_ENCODE. ++ ++2010-11-22 Jacek Caban ++ ++ * configure.ac: Check for symbol underscores on mingw-w64. ++ * configure: Rebuilt. ++ * src/x86/win64.S: Correctly access extern symbols in respect to ++ underscores. ++ ++2010-11-15 Rainer Orth ++ ++ * testsuite/lib/libffi-dg.exp: Rename ... ++ * testsuite/lib/libffi.exp: ... to this. ++ * libffi/testsuite/libffi.call/call.exp: Don't load libffi-dg.exp. ++ * libffi/testsuite/libffi.special/special.exp: Likewise. ++ ++2010-10-28 Chung-Lin Tang ++ ++ * src/arm/ffi.c (ffi_prep_args): Add VFP register argument handling ++ code, new parameter, and return value. Update comments. ++ (ffi_prep_cif_machdep): Add case for VFP struct return values. Add ++ call to layout_vfp_args(). ++ (ffi_call_SYSV): Update declaration. ++ (ffi_call_VFP): New declaration. ++ (ffi_call): Add VFP struct return conditions. Call ffi_call_VFP() ++ when ABI is FFI_VFP. ++ (ffi_closure_VFP): New declaration. ++ (ffi_closure_SYSV_inner): Add new vfp_args parameter, update call to ++ ffi_prep_incoming_args_SYSV(). ++ (ffi_prep_incoming_args_SYSV): Update parameters. Add VFP argument ++ case handling. ++ (ffi_prep_closure_loc): Pass ffi_closure_VFP to trampoline ++ construction under VFP hard-float. ++ (rec_vfp_type_p): New function. ++ (vfp_type_p): Same. ++ (place_vfp_arg): Same. ++ (layout_vfp_args): Same. ++ * src/arm/ffitarget.h (ffi_abi): Add FFI_VFP. Define FFI_DEFAULT_ABI ++ based on __ARM_PCS_VFP. ++ (FFI_EXTRA_CIF_FIELDS): Define for adding VFP hard-float specific ++ fields. ++ (FFI_TYPE_STRUCT_VFP_FLOAT): Define internally used type code. ++ (FFI_TYPE_STRUCT_VFP_DOUBLE): Same. ++ * src/arm/sysv.S (ffi_call_SYSV): Change call of ffi_prep_args() to ++ direct call. Move function pointer load upwards. ++ (ffi_call_VFP): New function. ++ (ffi_closure_VFP): Same. ++ ++ * testsuite/lib/libffi-dg.exp (check-flags): New function. ++ (dg-skip-if): New function. ++ * testsuite/libffi.call/cls_double_va.c: Skip if target is arm*-*-* ++ and compiler options include -mfloat-abi=hard. ++ * testsuite/libffi.call/cls_longdouble_va.c: Same. ++ ++2010-10-01 Jakub Jelinek ++ ++ PR libffi/45677 ++ * src/x86/ffi64.c (ffi_prep_cif_machdep): Ensure cif->bytes is ++ a multiple of 8. ++ * testsuite/libffi.call/many2.c: New test. ++ ++2010-08-20 Mark Wielaard ++ ++ * src/closures.c (open_temp_exec_file_mnt): Check if getmntent_r ++ returns NULL. ++ ++2010-08-09 Andreas Tobler ++ ++ * configure.ac: Add target powerpc64-*-freebsd*. ++ * configure: Regenerate. ++ * testsuite/libffi.call/cls_align_longdouble_split.c: Pass ++ -mlong-double-128 only to linux targets. ++ * testsuite/libffi.call/cls_align_longdouble_split2.c: Likewise. ++ * testsuite/libffi.call/cls_longdouble.c: Likewise. ++ * testsuite/libffi.call/huge_struct.c: Likewise. ++ ++2010-08-05 Dan Witte ++ ++ * Makefile.am: Pass FFI_DEBUG define to msvcc.sh for linking to the ++ debug CRT when --enable-debug is given. ++ * configure.ac: Define it. ++ * msvcc.sh: Translate -g and -DFFI_DEBUG appropriately. ++ ++2010-08-04 Dan Witte ++ ++ * src/x86/ffitarget.h: Add X86_ANY define for all x86/x86_64 ++ platforms. ++ * src/x86/ffi.c: Remove redundant ifdef checks. ++ * src/prep_cif.c: Push stack space computation into src/x86/ffi.c ++ for X86_ANY so return value space doesn't get added twice. ++ ++2010-08-03 Neil Rashbrooke ++ ++ * msvcc.sh: Don't pass -safeseh to ml64 because behavior is buggy. ++ ++2010-07-22 Dan Witte ++ ++ * src/*/ffitarget.h: Make FFI_LAST_ABI one past the last valid ABI. ++ * src/prep_cif.c: Fix ABI assertion. ++ * src/cris/ffi.c: Ditto. ++ ++2010-07-10 Evan Phoenix ++ ++ * src/closures.c (selinux_enabled_check): Fix strncmp usage bug. ++ ++2010-07-07 Dan Horák ++ ++ * include/ffi.h.in: Protect #define with #ifndef. ++ * src/powerpc/ffitarget.h: Ditto. ++ * src/s390/ffitarget.h: Ditto. ++ * src/sparc/ffitarget.h: Ditto. ++ ++2010-07-07 Neil Roberts ++ ++ * src/x86/sysv.S (ffi_call_SYSV): Align the stack pointer to ++ 16-bytes. ++ ++2010-07-02 Jakub Jelinek ++ ++ * Makefile.am (AM_MAKEFLAGS): Pass also mandir to submakes. ++ * Makefile.in: Regenerated. ++ ++2010-05-19 Rainer Orth ++ ++ * configure.ac (libffi_cv_as_x86_pcrel): Check for illegal in as ++ output, too. ++ (libffi_cv_as_ascii_pseudo_op): Check for .ascii. ++ (libffi_cv_as_string_pseudo_op): Check for .string. ++ * configure: Regenerate. ++ * fficonfig.h.in: Regenerate. ++ * src/x86/sysv.S (.eh_frame): Use .ascii, .string or error. ++ ++2010-05-11 Dan Witte ++ ++ * doc/libffi.tex: Document previous change. ++ ++2010-05-11 Makoto Kato ++ ++ * src/x86/ffi.c (ffi_call): Don't copy structs passed by value. ++ ++2010-05-05 Michael Kohler ++ ++ * src/dlmalloc.c (dlfree): Fix spelling. ++ * src/ia64/ffi.c (ffi_prep_cif_machdep): Ditto. ++ * configure.ac: Ditto. ++ * configure: Rebuilt. ++ ++2010-04-13 Dan Witte ++ ++ * msvcc.sh: Build with -W3 instead of -Wall. ++ * src/powerpc/ffi_darwin.c: Remove build warnings. ++ * src/x86/ffi.c: Ditto. ++ * src/x86/ffitarget.h: Ditto. ++ ++2010-04-12 Dan Witte ++ Walter Meinl ++ ++ * configure.ac: Add OS/2 support. ++ * configure: Rebuilt. ++ * src/closures.c: Ditto. ++ * src/dlmalloc.c: Ditto. ++ * src/x86/win32.S: Ditto. ++ ++2010-04-07 Jakub Jelinek ++ ++ * testsuite/libffi.call/err_bad_abi.c: Remove unused args variable. ++ ++2010-04-02 Ralf Wildenhues ++ ++ * Makefile.in: Regenerate. ++ * aclocal.m4: Regenerate. ++ * include/Makefile.in: Regenerate. ++ * man/Makefile.in: Regenerate. ++ * testsuite/Makefile.in: Regenerate. ++ ++2010-03-30 Dan Witte ++ ++ * msvcc.sh: Disable build warnings. ++ * README (tested): Clarify windows build procedure. ++ ++2010-03-15 Rainer Orth ++ ++ * configure.ac (libffi_cv_as_x86_64_unwind_section_type): New test. ++ * configure: Regenerate. ++ * fficonfig.h.in: Regenerate. ++ * libffi/src/x86/unix64.S (.eh_frame) ++ [HAVE_AS_X86_64_UNWIND_SECTION_TYPE]: Use @unwind section type. ++ ++2010-03-14 Matthias Klose ++ ++ * src/x86/ffi64.c: Fix typo in comment. ++ * src/x86/ffi.c: Use /* ... */ comment style. ++ ++2010-02-24 Rainer Orth ++ ++ * doc/libffi.texi (The Closure API): Fix typo. ++ * doc/libffi.info: Remove. ++ ++2010-02-15 Matthias Klose ++ ++ * src/arm/sysv.S (__ARM_ARCH__): Define for processor ++ __ARM_ARCH_7EM__. ++ ++2010-01-15 Anthony Green ++ ++ * README: Add notes on building with Microsoft Visual C++. ++ ++2010-01-15 Daniel Witte ++ ++ * msvcc.sh: New file. ++ ++ * src/x86/win32.S: Port assembly routines to MSVC and #ifdef. ++ * src/x86/ffi.c: Tweak function declaration and remove excess ++ parens. ++ * include/ffi.h.in: Add __declspec(align(8)) to typedef struct ++ ffi_closure. ++ ++ * src/x86/ffi.c: Merge ffi_call_SYSV and ffi_call_STDCALL into new ++ function ffi_call_win32 on X86_WIN32. ++ * src/x86/win32.S (ffi_call_SYSV): Rename to ffi_call_win32. ++ (ffi_call_STDCALL): Remove. ++ ++ * src/prep_cif.c (ffi_prep_cif): Move stack space allocation code ++ to ffi_prep_cif_machdep for x86. ++ * src/x86/ffi.c (ffi_prep_cif_machdep): To here. ++ ++2010-01-15 Oliver Kiddle ++ ++ * src/x86/ffitarget.h (ffi_abi): Check for __i386 and __amd64 for ++ Sun Studio compiler compatibility. ++ ++2010-01-12 Conrad Irwin ++ ++ * doc/libffi.texi: Add closure example. ++ ++2010-01-07 Rainer Orth ++ ++ PR libffi/40701 ++ * testsuite/libffi.call/ffitest.h [__alpha__ && __osf__] (PRIdLL, ++ PRIuLL, PRId64, PRIu64, PRIuPTR): Define. ++ * testsuite/libffi.call/cls_align_sint64.c: Add -Wno-format on ++ alpha*-dec-osf*. ++ * testsuite/libffi.call/cls_align_uint64.c: Likewise. ++ * testsuite/libffi.call/cls_ulonglong.c: Likewise. ++ * testsuite/libffi.call/return_ll1.c: Likewise. ++ * testsuite/libffi.call/stret_medium2.c: Likewise. ++ * testsuite/libffi.special/ffitestcxx.h (allocate_mmap): Cast ++ MAP_FAILED to char *. ++ ++2010-01-06 Rainer Orth ++ ++ * src/mips/n32.S: Use .abicalls and .eh_frame with __GNUC__. ++ ++2009-12-31 Anthony Green ++ ++ * README: Update for libffi 3.0.9. ++ ++2009-12-27 Matthias Klose ++ ++ * configure.ac (HAVE_LONG_DOUBLE): Define for mips when ++ appropriate. ++ * configure: Rebuilt. ++ ++2009-12-26 Anthony Green ++ ++ * testsuite/libffi.call/cls_longdouble_va.c: Mark as xfail for ++ avr32*-*-*. ++ * testsuite/libffi.call/cls_double_va.c: Ditto. ++ ++2009-12-26 Andreas Tobler ++ ++ * testsuite/libffi.call/ffitest.h: Conditionally include stdint.h ++ and inttypes.h. ++ * testsuite/libffi.special/unwindtest.cc: Ditto. ++ ++2009-12-26 Andreas Tobler ++ ++ * configure.ac: Add amd64-*-openbsd*. ++ * configure: Rebuilt. ++ * testsuite/lib/libffi-dg.exp (libffi_target_compile): Link ++ openbsd programs with -lpthread. ++ ++2009-12-26 Anthony Green ++ ++ * testsuite/libffi.call/cls_double_va.c, ++ testsuite/libffi.call/cls_longdouble.c, ++ testsuite/libffi.call/cls_longdouble_va.c, ++ testsuite/libffi.call/cls_pointer.c, ++ testsuite/libffi.call/cls_pointer_stack.c: Remove xfail for ++ mips*-*-* and arm*-*-*. ++ * testsuite/libffi.call/cls_align_longdouble_split.c, ++ testsuite/libffi.call/cls_align_longdouble_split2.c, ++ testsuite/libffi.call/stret_medium2.c, ++ testsuite/libffi.call/stret_medium.c, ++ testsuite/libffi.call/stret_large.c, ++ testsuite/libffi.call/stret_large2.c: Remove xfail for arm*-*-*. ++ ++2009-12-31 Kay Tietz ++ ++ * testsuite/libffi.call/ffitest.h, ++ testsuite/libffi.special/ffitestcxx.h (PRIdLL, PRuLL): Fix ++ definitions. ++ ++2009-12-31 Carlo Bramini ++ ++ * configure.ac (AM_LTLDFLAGS): Define for windows hosts. ++ * Makefile.am (libffi_la_LDFLAGS): Add AM_LTLDFLAGS. ++ * configure: Rebuilt. ++ * Makefile.in: Rebuilt. ++ ++2009-12-31 Anthony Green ++ Blake Chaffin. ++ ++ * testsuite/libffi.call/huge_struct.c: New test case from Blake ++ Chaffin @ Apple. ++ ++2009-12-28 David Edelsohn ++ ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Copy abi and nargs to ++ local variables. ++ (aix_adjust_aggregate_sizes): New function. ++ (ffi_prep_cif_machdep): Call it. ++ ++2009-12-26 Andreas Tobler ++ ++ * configure.ac: Define FFI_MMAP_EXEC_WRIT for the given targets. ++ * configure: Regenerate. ++ * fficonfig.h.in: Likewise. ++ * src/closures.c: Remove the FFI_MMAP_EXEC_WRIT definition for ++ Solaris/x86. ++ ++2009-12-26 Andreas Schwab ++ ++ * src/powerpc/ffi.c (ffi_prep_args_SYSV): Advance intarg_count ++ when a float arguments is passed in memory. ++ (ffi_closure_helper_SYSV): Mark general registers as used up when ++ a 64bit or soft-float long double argument is passed in memory. ++ ++2009-12-25 Matthias Klose ++ ++ * man/ffi_call.3: Fix #include in examples. ++ * doc/libffi.texi: Add dircategory. ++ ++2009-12-25 Frank Everdij ++ ++ * include/ffi.h.in: Placed '__GNUC__' ifdef around ++ '__attribute__((aligned(8)))' in ffi_closure, fixes compile for ++ IRIX MIPSPro c99. ++ * include/ffi_common.h: Added '__sgi' define to non ++ '__attribute__((__mode__()))' integer typedefs. ++ * src/mips/ffi.c (ffi_call, ffi_closure_mips_inner_O32, ++ ffi_closure_mips_inner_N32): Added 'defined(_MIPSEB)' to BE check. ++ (ffi_closure_mips_inner_O32, ffi_closure_mips_inner_N32): Added ++ FFI_LONGDOUBLE support and alignment(N32 only). ++ * src/mips/ffitarget.h: Corrected '#include ' for IRIX and ++ fixed non '__attribute__((__mode__()))' integer typedefs. ++ * src/mips/n32.S: Put '#ifdef linux' around '.abicalls' and '.eh_frame' ++ since they are Linux/GNU Assembler specific. ++ ++2009-12-25 Bradley Smith ++ ++ * configure.ac, Makefile.am, src/avr32/ffi.c, ++ src/avr32/ffitarget.h, ++ src/avr32/sysv.S: Add AVR32 port. ++ * configure, Makefile.in: Rebuilt. ++ ++2009-12-21 Andreas Tobler ++ ++ * configure.ac: Make i?86 build on FreeBSD and OpenBSD. ++ * configure: Regenerate. ++ ++2009-12-15 John David Anglin ++ ++ * testsuite/libffi.call/ffitest.h: Define PRIuPTR on PA HP-UX. ++ ++2009-12-13 John David Anglin ++ ++ * src/pa/ffi.c (ffi_closure_inner_pa32): Handle FFI_TYPE_LONGDOUBLE ++ type on HP-UX. ++ ++2012-02-13 Kai Tietz ++ ++ PR libffi/52221 ++ * src/x86/ffi.c (ffi_prep_raw_closure_loc): Add thiscall ++ support for X86_WIN32. ++ (FFI_INIT_TRAMPOLINE_THISCALL): Fix displacement. ++ ++2009-12-11 Eric Botcazou ++ ++ * src/sparc/ffi.c (ffi_closure_sparc_inner_v9): Properly align 'long ++ double' arguments. ++ ++2009-12-11 Eric Botcazou ++ ++ * testsuite/libffi.call/ffitest.h: Define PRIuPTR on Solaris < 10. ++ ++2009-12-10 Rainer Orth ++ ++ PR libffi/40700 ++ * src/closures.c [X86_64 && __sun__ && __svr4__] ++ (FFI_MMAP_EXEC_WRIT): Define. ++ ++2009-12-08 David Daney ++ ++ * testsuite/libffi.call/stret_medium.c: Remove xfail for mips*-*-* ++ * testsuite/libffi.call/cls_align_longdouble_split2.c: Same. ++ * testsuite/libffi.call/stret_large.c: Same. ++ * testsuite/libffi.call/cls_align_longdouble_split.c: Same. ++ * testsuite/libffi.call/stret_large2.c: Same. ++ * testsuite/libffi.call/stret_medium2.c: Same. ++ ++2009-12-07 David Edelsohn ++ ++ * src/powerpc/aix_closure.S (libffi_closure_ASM): Fix tablejump ++ typo. ++ ++2009-12-05 David Edelsohn ++ ++ * src/powerpc/aix.S: Update AIX32 code to be consistent with AIX64 ++ code. ++ * src/powerpc/aix_closure.S: Same. ++ ++2009-12-05 Ralf Wildenhues ++ ++ * Makefile.in: Regenerate. ++ * configure: Regenerate. ++ * include/Makefile.in: Regenerate. ++ * man/Makefile.in: Regenerate. ++ * testsuite/Makefile.in: Regenerate. ++ ++2009-12-04 David Edelsohn ++ ++ * src/powerpc/aix_closure.S: Reorganize 64-bit code to match ++ linux64_closure.S. ++ ++2009-12-04 Uros Bizjak ++ ++ PR libffi/41908 ++ * src/x86/ffi64.c (classify_argument): Update from ++ gcc/config/i386/i386.c. ++ (ffi_closure_unix64_inner): Do not use the address of two consecutive ++ SSE registers directly. ++ * testsuite/libffi.call/cls_dbls_struct.c (main): Remove xfail ++ for x86_64 linux targets. ++ ++2009-12-04 David Edelsohn ++ ++ * src/powerpc/ffi_darwin.c (ffi_closure_helper_DARWIN): Increment ++ pfr for long double split between fpr13 and stack. ++ ++2009-12-03 David Edelsohn ++ ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Increment next_arg and ++ fparg_count twice for long double. ++ ++2009-12-03 David Edelsohn ++ ++ PR libffi/42243 ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Remove extra parentheses. ++ ++2009-12-03 Uros Bizjak ++ ++ * testsuite/libffi.call/cls_longdouble_va.c (main): Fix format string. ++ Remove xfails for x86 linux targets. ++ ++2009-12-02 David Edelsohn ++ ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Fix typo in INT64 ++ case. ++ ++2009-12-01 David Edelsohn ++ ++ * src/powerpc/aix.S (ffi_call_AIX): Convert to more standard ++ register usage. Call ffi_prep_args directly. Add long double ++ return value support. ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Double arg increment ++ applies to FFI_TYPE_DOUBLE. Correct fpr_base increment typo. ++ Separate FFI_TYPE_SINT32 and FFI_TYPE_UINT32 cases. ++ (ffi_prep_cif_machdep): Only 16 byte stack alignment in 64 bit ++ mode. ++ (ffi_closure_helper_DARWIN): Remove nf and ng counters. Move temp ++ into case. ++ * src/powerpc/aix_closure.S: Maintain 16 byte stack alignment. ++ Allocate result area between params and FPRs. ++ ++2009-11-30 David Edelsohn ++ ++ PR target/35484 ++ * src/powerpc/ffitarget.h (POWERPC64): Define for PPC64 Linux and ++ AIX64. ++ * src/powerpc/aix.S: Implement AIX64 version. ++ * src/powerpc/aix_closure.S: Implement AIX64 version. ++ (ffi_closure_ASM): Use extsb, lha and displament addresses. ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Implement AIX64 ++ support. ++ (ffi_prep_cif_machdep): Same. ++ (ffi_call): Same. ++ (ffi_closure_helper_DARWIN): Same. ++ ++2009-11-02 Andreas Tobler ++ ++ PR libffi/41908 ++ * testsuite/libffi.call/testclosure.c: New test. ++ ++2009-09-28 Kai Tietz ++ ++ * src/x86/win64.S (_ffi_call_win64 stack): Remove for gnu ++ assembly version use of ___chkstk. ++ ++2009-09-23 Matthias Klose ++ ++ PR libffi/40242, PR libffi/41443 ++ * src/arm/sysv.S (__ARM_ARCH__): Define for processors ++ __ARM_ARCH_6T2__, __ARM_ARCH_6M__, __ARM_ARCH_7__, ++ __ARM_ARCH_7A__, __ARM_ARCH_7R__, __ARM_ARCH_7M__. ++ Change the conditionals to __SOFTFP__ || __ARM_EABI__ ++ for -mfloat-abi=softfp to work. ++ ++2009-09-17 Loren J. Rittle ++ ++ PR testsuite/32843 (strikes again) ++ * src/x86/ffi.c (ffi_prep_cif_machdep): Add X86_FREEBSD to ++ enable proper extension on char and short. ++ ++2009-09-15 David Daney ++ ++ * src/java_raw_api.c (ffi_java_raw_to_rvalue): Remove special ++ handling for FFI_TYPE_POINTER. ++ * src/mips/ffitarget.h (FFI_TYPE_STRUCT_D_SOFT, ++ FFI_TYPE_STRUCT_F_SOFT, FFI_TYPE_STRUCT_DD_SOFT, ++ FFI_TYPE_STRUCT_FF_SOFT, FFI_TYPE_STRUCT_FD_SOFT, ++ FFI_TYPE_STRUCT_DF_SOFT, FFI_TYPE_STRUCT_SOFT): New defines. ++ (FFI_N32_SOFT_FLOAT, FFI_N64_SOFT_FLOAT): New ffi_abi enumerations. ++ (enum ffi_abi): Set FFI_DEFAULT_ABI for soft-float. ++ * src/mips/n32.S (ffi_call_N32): Add handling for soft-float ++ structure and pointer returns. ++ (ffi_closure_N32): Add handling for pointer returns. ++ * src/mips/ffi.c (ffi_prep_args, calc_n32_struct_flags, ++ calc_n32_return_struct_flags): Handle soft-float. ++ (ffi_prep_cif_machdep): Handle soft-float, fix pointer handling. ++ (ffi_call_N32): Declare proper argument types. ++ (ffi_call, copy_struct_N32, ffi_closure_mips_inner_N32): Handle ++ soft-float. ++ ++2009-08-24 Ralf Wildenhues ++ ++ * configure.ac (AC_PREREQ): Bump to 2.64. ++ ++2009-08-22 Ralf Wildenhues ++ ++ * Makefile.am (install-html, install-pdf): Remove. ++ * Makefile.in: Regenerate. ++ ++ * Makefile.in: Regenerate. ++ * aclocal.m4: Regenerate. ++ * configure: Regenerate. ++ * fficonfig.h.in: Regenerate. ++ * include/Makefile.in: Regenerate. ++ * man/Makefile.in: Regenerate. ++ * testsuite/Makefile.in: Regenerate. ++ ++2011-08-22 Jasper Lievisse Adriaanse ++ ++ * configure.ac: Add OpenBSD/hppa and OpenBSD/powerpc support. ++ * configure: Rebuilt. ++ ++2009-07-30 Ralf Wildenhues ++ ++ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. ++ ++2009-07-24 Dave Korn ++ ++ PR libffi/40807 ++ * src/x86/ffi.c (ffi_prep_cif_machdep): Also use sign/zero-extending ++ return types for X86_WIN32. ++ * src/x86/win32.S (_ffi_call_SYSV): Handle omitted return types. ++ (_ffi_call_STDCALL, _ffi_closure_SYSV, _ffi_closure_raw_SYSV, ++ _ffi_closure_STDCALL): Likewise. ++ ++ * src/closures.c (is_selinux_enabled): Define to const 0 for Cygwin. ++ (dlmmap, dlmunmap): Also use these functions on Cygwin. ++ ++2009-07-11 Richard Sandiford ++ ++ PR testsuite/40699 ++ PR testsuite/40707 ++ PR testsuite/40709 ++ * testsuite/lib/libffi-dg.exp: Revert 2009-07-02, 2009-07-01 and ++ 2009-06-30 commits. ++ ++2009-07-01 Richard Sandiford ++ ++ * testsuite/lib/libffi-dg.exp (libffi-init): Set ld_library_path ++ to "" before adding paths. (This reinstates an assignment that ++ was removed by my 2009-06-30 commit, but changes the initial ++ value from "." to "".) ++ ++2009-07-01 H.J. Lu ++ ++ PR testsuite/40601 ++ * testsuite/lib/libffi-dg.exp (libffi-init): Properly set ++ gccdir. Adjust ld_library_path for gcc only if gccdir isn't ++ empty. ++ ++2009-06-30 Richard Sandiford ++ ++ * testsuite/lib/libffi-dg.exp (libffi-init): Don't add "." ++ to ld_library_path. Use add_path. Add just find_libgcc_s ++ to ld_library_path, not every libgcc multilib directory. ++ ++2009-06-16 Wim Lewis ++ ++ * src/powerpc/ffi.c: Avoid clobbering cr3 and cr4, which are ++ supposed to be callee-saved. ++ * src/powerpc/sysv.S (small_struct_return_value): Fix overrun of ++ return buffer for odd-size structs. ++ ++2009-06-16 Andreas Tobler ++ ++ PR libffi/40444 ++ * testsuite/lib/libffi-dg.exp (libffi_target_compile): Add ++ allow_stack_execute for Darwin. ++ ++2009-06-16 Andrew Haley ++ ++ * configure.ac (TARGETDIR): Add missing blank lines. ++ * configure: Regenerate. ++ ++2009-06-16 Andrew Haley ++ ++ * testsuite/libffi.call/cls_align_sint64.c, ++ testsuite/libffi.call/cls_align_uint64.c, ++ testsuite/libffi.call/cls_longdouble_va.c, ++ testsuite/libffi.call/cls_ulonglong.c, ++ testsuite/libffi.call/return_ll1.c, ++ testsuite/libffi.call/stret_medium2.c: Fix printf format ++ specifiers. ++ * testsuite/libffi.call/ffitest.h, ++ testsuite/libffi.special/ffitestcxx.h (PRIdLL, PRIuLL): Define. ++ ++2009-06-15 Andrew Haley ++ ++ * testsuite/libffi.call/err_bad_typedef.c: xfail everywhere. ++ * testsuite/libffi.call/err_bad_abi.c: Likewise. ++ ++2009-06-12 Andrew Haley ++ ++ * Makefile.am: Remove info_TEXINFOS. ++ ++2009-06-12 Andrew Haley ++ ++ * ChangeLog.libffi: testsuite/libffi.call/cls_align_sint64.c, ++ testsuite/libffi.call/cls_align_uint64.c, ++ testsuite/libffi.call/cls_ulonglong.c, ++ testsuite/libffi.call/return_ll1.c, ++ testsuite/libffi.call/stret_medium2.c: Fix printf format ++ specifiers. ++ testsuite/libffi.special/unwindtest.cc: include stdint.h. ++ ++2009-06-11 Timothy Wall ++ ++ * Makefile.am, ++ configure.ac, ++ include/ffi.h.in, ++ include/ffi_common.h, ++ src/closures.c, ++ src/dlmalloc.c, ++ src/x86/ffi.c, ++ src/x86/ffitarget.h, ++ src/x86/win64.S (new), ++ README: Added win64 support (mingw or MSVC) ++ * Makefile.in, ++ include/Makefile.in, ++ man/Makefile.in, ++ testsuite/Makefile.in, ++ configure, ++ aclocal.m4: Regenerated ++ * ltcf-c.sh: properly escape cygwin/w32 path ++ * man/ffi_call.3: Clarify size requirements for return value. ++ * src/x86/ffi64.c: Fix filename in comment. ++ * src/x86/win32.S: Remove unused extern. ++ ++ * testsuite/libffi.call/closure_fn0.c, ++ testsuite/libffi.call/closure_fn1.c, ++ testsuite/libffi.call/closure_fn2.c, ++ testsuite/libffi.call/closure_fn3.c, ++ testsuite/libffi.call/closure_fn4.c, ++ testsuite/libffi.call/closure_fn5.c, ++ testsuite/libffi.call/closure_fn6.c, ++ testsuite/libffi.call/closure_stdcall.c, ++ testsuite/libffi.call/cls_12byte.c, ++ testsuite/libffi.call/cls_16byte.c, ++ testsuite/libffi.call/cls_18byte.c, ++ testsuite/libffi.call/cls_19byte.c, ++ testsuite/libffi.call/cls_1_1byte.c, ++ testsuite/libffi.call/cls_20byte.c, ++ testsuite/libffi.call/cls_20byte1.c, ++ testsuite/libffi.call/cls_24byte.c, ++ testsuite/libffi.call/cls_2byte.c, ++ testsuite/libffi.call/cls_3_1byte.c, ++ testsuite/libffi.call/cls_3byte1.c, ++ testsuite/libffi.call/cls_3byte2.c, ++ testsuite/libffi.call/cls_4_1byte.c, ++ testsuite/libffi.call/cls_4byte.c, ++ testsuite/libffi.call/cls_5_1_byte.c, ++ testsuite/libffi.call/cls_5byte.c, ++ testsuite/libffi.call/cls_64byte.c, ++ testsuite/libffi.call/cls_6_1_byte.c, ++ testsuite/libffi.call/cls_6byte.c, ++ testsuite/libffi.call/cls_7_1_byte.c, ++ testsuite/libffi.call/cls_7byte.c, ++ testsuite/libffi.call/cls_8byte.c, ++ testsuite/libffi.call/cls_9byte1.c, ++ testsuite/libffi.call/cls_9byte2.c, ++ testsuite/libffi.call/cls_align_double.c, ++ testsuite/libffi.call/cls_align_float.c, ++ testsuite/libffi.call/cls_align_longdouble.c, ++ testsuite/libffi.call/cls_align_longdouble_split.c, ++ testsuite/libffi.call/cls_align_longdouble_split2.c, ++ testsuite/libffi.call/cls_align_pointer.c, ++ testsuite/libffi.call/cls_align_sint16.c, ++ testsuite/libffi.call/cls_align_sint32.c, ++ testsuite/libffi.call/cls_align_sint64.c, ++ testsuite/libffi.call/cls_align_uint16.c, ++ testsuite/libffi.call/cls_align_uint32.c, ++ testsuite/libffi.call/cls_align_uint64.c, ++ testsuite/libffi.call/cls_dbls_struct.c, ++ testsuite/libffi.call/cls_double.c, ++ testsuite/libffi.call/cls_double_va.c, ++ testsuite/libffi.call/cls_float.c, ++ testsuite/libffi.call/cls_longdouble.c, ++ testsuite/libffi.call/cls_longdouble_va.c, ++ testsuite/libffi.call/cls_multi_schar.c, ++ testsuite/libffi.call/cls_multi_sshort.c, ++ testsuite/libffi.call/cls_multi_sshortchar.c, ++ testsuite/libffi.call/cls_multi_uchar.c, ++ testsuite/libffi.call/cls_multi_ushort.c, ++ testsuite/libffi.call/cls_multi_ushortchar.c, ++ testsuite/libffi.call/cls_pointer.c, ++ testsuite/libffi.call/cls_pointer_stack.c, ++ testsuite/libffi.call/cls_schar.c, ++ testsuite/libffi.call/cls_sint.c, ++ testsuite/libffi.call/cls_sshort.c, ++ testsuite/libffi.call/cls_uchar.c, ++ testsuite/libffi.call/cls_uint.c, ++ testsuite/libffi.call/cls_ulonglong.c, ++ testsuite/libffi.call/cls_ushort.c, ++ testsuite/libffi.call/err_bad_abi.c, ++ testsuite/libffi.call/err_bad_typedef.c, ++ testsuite/libffi.call/float2.c, ++ testsuite/libffi.call/huge_struct.c, ++ testsuite/libffi.call/nested_struct.c, ++ testsuite/libffi.call/nested_struct1.c, ++ testsuite/libffi.call/nested_struct10.c, ++ testsuite/libffi.call/nested_struct2.c, ++ testsuite/libffi.call/nested_struct3.c, ++ testsuite/libffi.call/nested_struct4.c, ++ testsuite/libffi.call/nested_struct5.c, ++ testsuite/libffi.call/nested_struct6.c, ++ testsuite/libffi.call/nested_struct7.c, ++ testsuite/libffi.call/nested_struct8.c, ++ testsuite/libffi.call/nested_struct9.c, ++ testsuite/libffi.call/problem1.c, ++ testsuite/libffi.call/return_ldl.c, ++ testsuite/libffi.call/return_ll1.c, ++ testsuite/libffi.call/stret_large.c, ++ testsuite/libffi.call/stret_large2.c, ++ testsuite/libffi.call/stret_medium.c, ++ testsuite/libffi.call/stret_medium2.c, ++ testsuite/libffi.special/unwindtest.cc: use ffi_closure_alloc instead ++ of checking for MMAP. Use intptr_t instead of long casts. ++ ++2009-06-11 Kaz Kojima ++ ++ * testsuite/libffi.call/cls_longdouble_va.c: Add xfail sh*-*-linux-*. ++ * testsuite/libffi.call/err_bad_abi.c: Add xfail sh*-*-*. ++ * testsuite/libffi.call/err_bad_typedef.c: Likewise. ++ ++2009-06-09 Andrew Haley ++ ++ * src/x86/freebsd.S: Add missing file. ++ ++2009-06-08 Andrew Haley ++ ++ Import from libffi 3.0.8: ++ ++ * doc/libffi.texi: New file. ++ * doc/libffi.info: Likewise. ++ * doc/stamp-vti: Likewise. ++ * man/Makefile.am: New file. ++ * man/ffi_call.3: New file. ++ ++ * Makefile.am (EXTRA_DIST): Add src/x86/darwin64.S, ++ src/dlmalloc.c. ++ (nodist_libffi_la_SOURCES): Add X86_FREEBSD. ++ ++ * configure.ac: Bump version to 3.0.8. ++ parisc*-*-linux*: Add. ++ i386-*-freebsd* | i386-*-openbsd*: Add. ++ powerpc-*-beos*: Add. ++ AM_CONDITIONAL X86_FREEBSD: Add. ++ AC_CONFIG_FILES: Add man/Makefile. ++ ++ * include/ffi.h.in (FFI_FN): Change void (*)() to void (*)(void). ++ ++2009-06-08 Andrew Haley ++ ++ * README: Import from libffi 3.0.8. ++ ++2009-06-08 Andrew Haley ++ ++ * testsuite/libffi.call/err_bad_abi.c: Add xfails. ++ * testsuite/libffi.call/cls_longdouble_va.c: Add xfails. ++ * testsuite/libffi.call/cls_dbls_struct.c: Add xfail x86_64-*-linux-*. ++ * testsuite/libffi.call/err_bad_typedef.c: Add xfails. ++ ++ * testsuite/libffi.call/stret_medium2.c: Add __UNUSED__ to args. ++ * testsuite/libffi.call/stret_medium.c: Likewise. ++ * testsuite/libffi.call/stret_large2.c: Likewise. ++ * testsuite/libffi.call/stret_large.c: Likewise. ++ ++2008-12-26 Timothy Wall ++ ++ * testsuite/libffi.call/cls_longdouble.c, ++ testsuite/libffi.call/cls_longdouble_va.c, ++ testsuite/libffi.call/cls_align_longdouble.c, ++ testsuite/libffi.call/cls_align_longdouble_split.c, ++ testsuite/libffi.call/cls_align_longdouble_split2.c: mark expected ++ failures on x86_64 cygwin/mingw. ++ ++2008-12-22 Timothy Wall ++ ++ * testsuite/libffi.call/closure_fn0.c, ++ testsuite/libffi.call/closure_fn1.c, ++ testsuite/libffi.call/closure_fn2.c, ++ testsuite/libffi.call/closure_fn3.c, ++ testsuite/libffi.call/closure_fn4.c, ++ testsuite/libffi.call/closure_fn5.c, ++ testsuite/libffi.call/closure_fn6.c, ++ testsuite/libffi.call/closure_loc_fn0.c, ++ testsuite/libffi.call/closure_stdcall.c, ++ testsuite/libffi.call/cls_align_pointer.c, ++ testsuite/libffi.call/cls_pointer.c, ++ testsuite/libffi.call/cls_pointer_stack.c: use portable cast from ++ pointer to integer (intptr_t). ++ * testsuite/libffi.call/cls_longdouble.c: disable for win64. ++ ++2008-07-24 Anthony Green ++ ++ * testsuite/libffi.call/cls_dbls_struct.c, ++ testsuite/libffi.call/cls_double_va.c, ++ testsuite/libffi.call/cls_longdouble.c, ++ testsuite/libffi.call/cls_longdouble_va.c, ++ testsuite/libffi.call/cls_pointer.c, ++ testsuite/libffi.call/cls_pointer_stack.c, ++ testsuite/libffi.call/err_bad_abi.c: Clean up failures from ++ compiler warnings. ++ ++2008-03-04 Anthony Green ++ Blake Chaffin ++ hos@tamanegi.org ++ ++ * testsuite/libffi.call/cls_align_longdouble_split2.c ++ testsuite/libffi.call/cls_align_longdouble_split.c ++ testsuite/libffi.call/cls_dbls_struct.c ++ testsuite/libffi.call/cls_double_va.c ++ testsuite/libffi.call/cls_longdouble.c ++ testsuite/libffi.call/cls_longdouble_va.c ++ testsuite/libffi.call/cls_pointer.c ++ testsuite/libffi.call/cls_pointer_stack.c ++ testsuite/libffi.call/err_bad_abi.c ++ testsuite/libffi.call/err_bad_typedef.c ++ testsuite/libffi.call/stret_large2.c ++ testsuite/libffi.call/stret_large.c ++ testsuite/libffi.call/stret_medium2.c ++ testsuite/libffi.call/stret_medium.c: New tests from Apple. ++ ++2009-06-05 Andrew Haley ++ ++ * src/x86/ffitarget.h, src/x86/ffi.c: Merge stdcall changes from ++ libffi. ++ ++2009-06-04 Andrew Haley ++ ++ * src/x86/ffitarget.h, src/x86/win32.S, src/x86/ffi.c: Back out ++ stdcall changes. ++ ++2008-02-26 Anthony Green ++ Thomas Heller ++ ++ * src/x86/ffi.c (ffi_closure_SYSV_inner): Change C++ comment to C ++ comment. ++ ++2008-02-03 Timothy Wall ++ ++ * src/x86/ffi.c (FFI_INIT_TRAMPOLINE_STDCALL): Calculate jump return ++ offset based on code pointer, not data pointer. ++ ++2008-01-31 Timothy Wall ++ ++ * testsuite/libffi.call/closure_stdcall.c: Add test for stdcall ++ closures. ++ * src/x86/ffitarget.h: Increase size of trampoline for stdcall ++ closures. ++ * src/x86/win32.S: Add assembly for stdcall closure. ++ * src/x86/ffi.c: Initialize stdcall closure trampoline. ++ ++2009-06-04 Andrew Haley ++ ++ * include/ffi.h.in: Change void (*)() to void (*)(void). ++ * src/x86/ffi.c: Likewise. ++ ++2009-06-04 Andrew Haley ++ ++ * src/powerpc/ppc_closure.S: Insert licence header. ++ * src/powerpc/linux64_closure.S: Likewise. ++ * src/m68k/sysv.S: Likewise. ++ ++ * src/sh64/ffi.c: Change void (*)() to void (*)(void). ++ * src/powerpc/ffi.c: Likewise. ++ * src/powerpc/ffi_darwin.c: Likewise. ++ * src/m32r/ffi.c: Likewise. ++ * src/sh64/ffi.c: Likewise. ++ * src/x86/ffi64.c: Likewise. ++ * src/alpha/ffi.c: Likewise. ++ * src/alpha/osf.S: Likewise. ++ * src/frv/ffi.c: Likewise. ++ * src/s390/ffi.c: Likewise. ++ * src/pa/ffi.c: Likewise. ++ * src/pa/hpux32.S: Likewise. ++ * src/ia64/unix.S: Likewise. ++ * src/ia64/ffi.c: Likewise. ++ * src/sparc/ffi.c: Likewise. ++ * src/mips/ffi.c: Likewise. ++ * src/sh/ffi.c: Likewise. ++ ++2008-02-15 David Daney ++ ++ * src/mips/ffi.c (USE__BUILTIN___CLEAR_CACHE): ++ Define (conditionally), and use it to include cachectl.h. ++ (ffi_prep_closure_loc): Fix cache flushing. ++ * src/mips/ffitarget.h (_ABIN32, _ABI64, _ABIO32): Define. ++ ++2009-06-04 Andrew Haley ++ ++ include/ffi.h.in, ++ src/arm/ffitarget.h, ++ src/arm/ffi.c, ++ src/arm/sysv.S, ++ src/powerpc/ffitarget.h, ++ src/closures.c, ++ src/sh64/ffitarget.h, ++ src/sh64/ffi.c, ++ src/sh64/sysv.S, ++ src/types.c, ++ src/x86/ffi64.c, ++ src/x86/ffitarget.h, ++ src/x86/win32.S, ++ src/x86/darwin.S, ++ src/x86/ffi.c, ++ src/x86/sysv.S, ++ src/x86/unix64.S, ++ src/alpha/ffitarget.h, ++ src/alpha/ffi.c, ++ src/alpha/osf.S, ++ src/m68k/ffitarget.h, ++ src/frv/ffitarget.h, ++ src/frv/ffi.c, ++ src/s390/ffitarget.h, ++ src/s390/sysv.S, ++ src/cris/ffitarget.h, ++ src/pa/linux.S, ++ src/pa/ffitarget.h, ++ src/pa/ffi.c, ++ src/raw_api.c, ++ src/ia64/ffitarget.h, ++ src/ia64/unix.S, ++ src/ia64/ffi.c, ++ src/ia64/ia64_flags.h, ++ src/java_raw_api.c, ++ src/debug.c, ++ src/sparc/v9.S, ++ src/sparc/ffitarget.h, ++ src/sparc/ffi.c, ++ src/sparc/v8.S, ++ src/mips/ffitarget.h, ++ src/mips/n32.S, ++ src/mips/o32.S, ++ src/mips/ffi.c, ++ src/prep_cif.c, ++ src/sh/ffitarget.h, ++ src/sh/ffi.c, ++ src/sh/sysv.S: Update license text. ++ ++2009-05-22 Dave Korn ++ ++ * src/x86/win32.S (_ffi_closure_STDCALL): New function. ++ (.eh_frame): Add FDE for it. ++ ++2009-05-22 Dave Korn ++ ++ * configure.ac: Also check if assembler supports pc-relative ++ relocs on X86_WIN32 targets. ++ * configure: Regenerate. ++ * src/x86/win32.S (ffi_prep_args): Declare extern, not global. ++ (_ffi_call_SYSV): Add missing function type symbol .def and ++ add EH markup labels. ++ (_ffi_call_STDCALL): Likewise. ++ (_ffi_closure_SYSV): Likewise. ++ (_ffi_closure_raw_SYSV): Likewise. ++ (.eh_frame): Add hand-crafted EH data. ++ ++2009-04-09 Jakub Jelinek ++ ++ * testsuite/lib/libffi-dg.exp: Change copyright header to refer to ++ version 3 of the GNU General Public License and to point readers ++ at the COPYING3 file and the FSF's license web page. ++ * testsuite/libffi.call/call.exp: Likewise. ++ * testsuite/libffi.special/special.exp: Likewise. ++ ++2009-03-01 Ralf Wildenhues ++ ++ * configure: Regenerate. ++ ++2008-12-18 Rainer Orth ++ ++ PR libffi/26048 ++ * configure.ac (HAVE_AS_X86_PCREL): New test. ++ * configure: Regenerate. ++ * fficonfig.h.in: Regenerate. ++ * src/x86/sysv.S [!FFI_NO_RAW_API]: Precalculate ++ RAW_CLOSURE_CIF_OFFSET, RAW_CLOSURE_FUN_OFFSET, ++ RAW_CLOSURE_USER_DATA_OFFSET for the Solaris 10/x86 assembler. ++ (.eh_frame): Only use SYMBOL-. iff HAVE_AS_X86_PCREL. ++ * src/x86/unix64.S (.Lstore_table): Move to .text section. ++ (.Lload_table): Likewise. ++ (.eh_frame): Only use SYMBOL-. iff HAVE_AS_X86_PCREL. ++ ++2008-12-18 Ralf Wildenhues ++ ++ * configure: Regenerate. ++ ++2008-11-21 Eric Botcazou ++ ++ * src/sparc/ffi.c (ffi_prep_cif_machdep): Add support for ++ signed/unsigned int8/16 return values. ++ * src/sparc/v8.S (ffi_call_v8): Likewise. ++ (ffi_closure_v8): Likewise. ++ ++2008-09-26 Peter O'Gorman ++ Steve Ellcey ++ ++ * configure: Regenerate for new libtool. ++ * Makefile.in: Ditto. ++ * include/Makefile.in: Ditto. ++ * aclocal.m4: Ditto. ++ ++2008-08-25 Andreas Tobler ++ ++ * src/powerpc/ffitarget.h (ffi_abi): Add FFI_LINUX and ++ FFI_LINUX_SOFT_FLOAT to the POWERPC_FREEBSD enum. ++ Add note about flag bits used for FFI_SYSV_TYPE_SMALL_STRUCT. ++ Adjust copyright notice. ++ * src/powerpc/ffi.c: Add two new flags to indicate if we have one ++ register or two register to use for FFI_SYSV structs. ++ (ffi_prep_cif_machdep): Pass the right register flag introduced above. ++ (ffi_closure_helper_SYSV): Fix the return type for ++ FFI_SYSV_TYPE_SMALL_STRUCT. Comment. ++ Adjust copyright notice. ++ ++2008-07-16 Kaz Kojima ++ ++ * src/sh/ffi.c (ffi_prep_closure_loc): Turn INSN into an unsigned ++ int. ++ ++2008-06-17 Ralf Wildenhues ++ ++ * configure: Regenerate. ++ * include/Makefile.in: Regenerate. ++ * testsuite/Makefile.in: Regenerate. ++ ++2008-06-07 Joseph Myers ++ ++ * configure.ac (parisc*-*-linux*, powerpc-*-sysv*, ++ powerpc-*-beos*): Remove. ++ * configure: Regenerate. ++ ++2008-05-09 Julian Brown ++ ++ * Makefile.am (LTLDFLAGS): New. ++ (libffi_la_LDFLAGS): Use above. ++ * Makefile.in: Regenerate. ++ ++2008-04-18 Paolo Bonzini ++ ++ PR bootstrap/35457 ++ * aclocal.m4: Regenerate. ++ * configure: Regenerate. ++ ++2008-03-26 Kaz Kojima ++ ++ * src/sh/sysv.S: Add .note.GNU-stack on Linux. ++ * src/sh64/sysv.S: Likewise. ++ ++2008-03-26 Daniel Jacobowitz ++ ++ * src/arm/sysv.S: Fix ARM comment marker. ++ ++2008-03-26 Jakub Jelinek ++ ++ * src/alpha/osf.S: Add .note.GNU-stack on Linux. ++ * src/s390/sysv.S: Likewise. ++ * src/powerpc/ppc_closure.S: Likewise. ++ * src/powerpc/sysv.S: Likewise. ++ * src/x86/unix64.S: Likewise. ++ * src/x86/sysv.S: Likewise. ++ * src/sparc/v8.S: Likewise. ++ * src/sparc/v9.S: Likewise. ++ * src/m68k/sysv.S: Likewise. ++ * src/arm/sysv.S: Likewise. ++ ++2008-03-16 Ralf Wildenhues ++ ++ * aclocal.m4: Regenerate. ++ * configure: Likewise. ++ * Makefile.in: Likewise. ++ * include/Makefile.in: Likewise. ++ * testsuite/Makefile.in: Likewise. ++ ++2008-02-12 Bjoern Koenig ++ Andreas Tobler ++ ++ * configure.ac: Add amd64-*-freebsd* target. ++ * configure: Regenerate. ++ ++2008-01-30 H.J. Lu ++ ++ PR libffi/34612 ++ * src/x86/sysv.S (ffi_closure_SYSV): Pop 4 byte from stack when ++ returning struct. ++ ++ * testsuite/libffi.call/call.exp: Add "-O2 -fomit-frame-pointer" ++ tests. ++ ++2008-01-24 David Edelsohn ++ ++ * configure: Regenerate. ++ ++2008-01-06 Andreas Tobler ++ ++ * src/x86/ffi.c (ffi_prep_cif_machdep): Fix thinko. ++ ++2008-01-05 Andreas Tobler ++ ++ PR testsuite/32843 ++ * src/x86/ffi.c (ffi_prep_cif_machdep): Add code for ++ signed/unsigned int8/16 for X86_DARWIN. ++ Updated copyright info. ++ Handle one and two byte structs with special cif->flags. ++ * src/x86/ffitarget.h: Add special types for one and two byte structs. ++ Updated copyright info. ++ * src/x86/darwin.S (ffi_call_SYSV): Rewrite to use a jump table like ++ sysv.S ++ Remove code to pop args from the stack after call. ++ Special-case signed/unsigned for int8/16, one and two byte structs. ++ (ffi_closure_raw_SYSV): Handle FFI_TYPE_UINT8, ++ FFI_TYPE_SINT8, FFI_TYPE_UINT16, FFI_TYPE_SINT16, FFI_TYPE_UINT32, ++ FFI_TYPE_SINT32. ++ Updated copyright info. ++ ++2007-12-08 David Daney ++ ++ * src/mips/n32.S (ffi_call_N32): Replace dadd with ADDU, dsub with ++ SUBU, add with ADDU and use smaller code sequences. ++ ++2007-12-07 David Daney ++ ++ * src/mips/ffi.c (ffi_prep_cif_machdep): Handle long double return ++ type. ++ ++2007-12-06 David Daney ++ ++ * include/ffi.h.in (FFI_SIZEOF_JAVA_RAW): Define if not already ++ defined. ++ (ffi_java_raw): New typedef. ++ (ffi_java_raw_call, ffi_java_ptrarray_to_raw, ++ ffi_java_raw_to_ptrarray): Change parameter types from ffi_raw to ++ ffi_java_raw. ++ (ffi_java_raw_closure) : Same. ++ (ffi_prep_java_raw_closure, ffi_prep_java_raw_closure_loc): Change ++ parameter types. ++ * src/java_raw_api.c (ffi_java_raw_size): Replace FFI_SIZEOF_ARG with ++ FFI_SIZEOF_JAVA_RAW. ++ (ffi_java_raw_to_ptrarray): Change type of raw to ffi_java_raw. ++ Replace FFI_SIZEOF_ARG with FFI_SIZEOF_JAVA_RAW. Use ++ sizeof(ffi_java_raw) for alignment calculations. ++ (ffi_java_ptrarray_to_raw): Same. ++ (ffi_java_rvalue_to_raw): Add special handling for FFI_TYPE_POINTER ++ if FFI_SIZEOF_JAVA_RAW == 4. ++ (ffi_java_raw_to_rvalue): Same. ++ (ffi_java_raw_call): Change type of raw to ffi_java_raw. ++ (ffi_java_translate_args): Same. ++ (ffi_prep_java_raw_closure_loc, ffi_prep_java_raw_closure): Change ++ parameter types. ++ * src/mips/ffitarget.h (FFI_SIZEOF_JAVA_RAW): Define for N32 ABI. ++ ++2007-12-06 David Daney ++ ++ * src/mips/n32.S (ffi_closure_N32): Use 64-bit add instruction on ++ pointer values. ++ ++2007-12-01 Andreas Tobler ++ ++ PR libffi/31937 ++ * src/powerpc/ffitarget.h: Introduce new ABI FFI_LINUX_SOFT_FLOAT. ++ Add local FFI_TYPE_UINT128 to handle soft-float long-double-128. ++ * src/powerpc/ffi.c: Distinguish between __NO_FPRS__ and not and ++ set the NUM_FPR_ARG_REGISTERS according to. ++ Add support for potential soft-float support under hard-float ++ architecture. ++ (ffi_prep_args_SYSV): Set NUM_FPR_ARG_REGISTERS to 0 in case of ++ FFI_LINUX_SOFT_FLOAT, handle float, doubles and long-doubles according ++ to the FFI_LINUX_SOFT_FLOAT ABI. ++ (ffi_prep_cif_machdep): Likewise. ++ (ffi_closure_helper_SYSV): Likewise. ++ * src/powerpc/ppc_closure.S: Make sure not to store float/double ++ on archs where __NO_FPRS__ is true. ++ Add FFI_TYPE_UINT128 support. ++ * src/powerpc/sysv.S: Add support for soft-float long-double-128. ++ Adjust copyright notice. ++ ++2007-11-25 Andreas Tobler ++ ++ * src/closures.c: Move defintion of MAYBE_UNUSED from here to ... ++ * include/ffi_common.h: ... here. ++ Update copyright. ++ ++2007-11-17 Andreas Tobler ++ ++ * src/powerpc/sysv.S: Load correct cr to compare if we have long double. ++ * src/powerpc/linux64.S: Likewise. ++ * src/powerpc/ffi.c: Add a comment to show which part goes into cr6. ++ * testsuite/libffi.call/return_ldl.c: New test. ++ ++2007-09-04 ++ ++ * src/arm/sysv.S (UNWIND): New. ++ (Whole file): Conditionally compile unwinder directives. ++ * src/arm/sysv.S: Add unwinder directives. ++ ++ * src/arm/ffi.c (ffi_prep_args): Align structs by at least 4 bytes. ++ Only treat r0 as a struct address if we're actually returning a ++ struct by address. ++ Only copy the bytes that are actually within a struct. ++ (ffi_prep_cif_machdep): A Composite Type not larger than 4 bytes ++ is returned in r0, not passed by address. ++ (ffi_call): Allocate a word-sized temporary for the case where ++ a composite is returned in r0. ++ (ffi_prep_incoming_args_SYSV): Align as necessary. ++ ++2007-08-05 Steven Newbury ++ ++ * src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Use __clear_cache instead of ++ directly using the sys_cacheflush syscall. ++ ++2007-07-27 Andrew Haley ++ ++ * src/arm/sysv.S (ffi_closure_SYSV): Add soft-float. ++ ++2007-09-03 Maciej W. Rozycki ++ ++ * Makefile.am: Unify MIPS_IRIX and MIPS_LINUX into MIPS. ++ * configure.ac: Likewise. ++ * Makefile.in: Regenerate. ++ * include/Makefile.in: Likewise. ++ * testsuite/Makefile.in: Likewise. ++ * configure: Likewise. ++ ++2007-08-24 David Daney ++ ++ * testsuite/libffi.call/return_sl.c: New test. ++ ++2007-08-10 David Daney ++ ++ * testsuite/libffi.call/cls_multi_ushort.c, ++ testsuite/libffi.call/cls_align_uint16.c, ++ testsuite/libffi.call/nested_struct1.c, ++ testsuite/libffi.call/nested_struct3.c, ++ testsuite/libffi.call/cls_7_1_byte.c, ++ testsuite/libffi.call/nested_struct5.c, ++ testsuite/libffi.call/cls_double.c, ++ testsuite/libffi.call/nested_struct7.c, ++ testsuite/libffi.call/cls_sint.c, ++ testsuite/libffi.call/nested_struct9.c, ++ testsuite/libffi.call/cls_20byte1.c, ++ testsuite/libffi.call/cls_multi_sshortchar.c, ++ testsuite/libffi.call/cls_align_sint64.c, ++ testsuite/libffi.call/cls_3byte2.c, ++ testsuite/libffi.call/cls_multi_schar.c, ++ testsuite/libffi.call/cls_multi_uchar.c, ++ testsuite/libffi.call/cls_19byte.c, ++ testsuite/libffi.call/cls_9byte1.c, ++ testsuite/libffi.call/cls_align_float.c, ++ testsuite/libffi.call/closure_fn1.c, ++ testsuite/libffi.call/problem1.c, ++ testsuite/libffi.call/closure_fn3.c, ++ testsuite/libffi.call/cls_sshort.c, ++ testsuite/libffi.call/closure_fn5.c, ++ testsuite/libffi.call/cls_align_double.c, ++ testsuite/libffi.call/nested_struct.c, ++ testsuite/libffi.call/cls_2byte.c, ++ testsuite/libffi.call/nested_struct10.c, ++ testsuite/libffi.call/cls_4byte.c, ++ testsuite/libffi.call/cls_6byte.c, ++ testsuite/libffi.call/cls_8byte.c, ++ testsuite/libffi.call/cls_multi_sshort.c, ++ testsuite/libffi.call/cls_align_sint16.c, ++ testsuite/libffi.call/cls_align_uint32.c, ++ testsuite/libffi.call/cls_20byte.c, ++ testsuite/libffi.call/cls_float.c, ++ testsuite/libffi.call/nested_struct2.c, ++ testsuite/libffi.call/cls_5_1_byte.c, ++ testsuite/libffi.call/nested_struct4.c, ++ testsuite/libffi.call/cls_24byte.c, ++ testsuite/libffi.call/nested_struct6.c, ++ testsuite/libffi.call/cls_64byte.c, ++ testsuite/libffi.call/nested_struct8.c, ++ testsuite/libffi.call/cls_uint.c, ++ testsuite/libffi.call/cls_multi_ushortchar.c, ++ testsuite/libffi.call/cls_schar.c, ++ testsuite/libffi.call/cls_uchar.c, ++ testsuite/libffi.call/cls_align_uint64.c, ++ testsuite/libffi.call/cls_ulonglong.c, ++ testsuite/libffi.call/cls_align_longdouble.c, ++ testsuite/libffi.call/cls_1_1byte.c, ++ testsuite/libffi.call/cls_12byte.c, ++ testsuite/libffi.call/cls_3_1byte.c, ++ testsuite/libffi.call/cls_3byte1.c, ++ testsuite/libffi.call/cls_4_1byte.c, ++ testsuite/libffi.call/cls_6_1_byte.c, ++ testsuite/libffi.call/cls_16byte.c, ++ testsuite/libffi.call/cls_18byte.c, ++ testsuite/libffi.call/closure_fn0.c, ++ testsuite/libffi.call/cls_9byte2.c, ++ testsuite/libffi.call/closure_fn2.c, ++ testsuite/libffi.call/closure_fn4.c, ++ testsuite/libffi.call/cls_ushort.c, ++ testsuite/libffi.call/closure_fn6.c, ++ testsuite/libffi.call/cls_5byte.c, ++ testsuite/libffi.call/cls_align_pointer.c, ++ testsuite/libffi.call/cls_7byte.c, ++ testsuite/libffi.call/cls_align_sint32.c, ++ testsuite/libffi.special/unwindtest_ffi_call.cc, ++ testsuite/libffi.special/unwindtest.cc: Remove xfail for mips64*-*-*. ++ ++2007-08-10 David Daney ++ ++ PR libffi/28313 ++ * configure.ac: Don't treat mips64 as a special case. ++ * Makefile.am (nodist_libffi_la_SOURCES): Add n32.S. ++ * configure: Regenerate ++ * Makefile.in: Ditto. ++ * fficonfig.h.in: Ditto. ++ * src/mips/ffitarget.h (REG_L, REG_S, SUBU, ADDU, SRL, LI): Indent. ++ (LA, EH_FRAME_ALIGN, FDE_ADDR_BYTES): New preprocessor macros. ++ (FFI_DEFAULT_ABI): Set for n64 case. ++ (FFI_CLOSURES, FFI_TRAMPOLINE_SIZE): Define for n32 and n64 cases. ++ * src/mips/n32.S (ffi_call_N32): Add debug macros and labels for FDE. ++ (ffi_closure_N32): New function. ++ (.eh_frame): New section ++ * src/mips/o32.S: Clean up comments. ++ (ffi_closure_O32): Pass ffi_closure parameter in $12. ++ * src/mips/ffi.c: Use FFI_MIPS_N32 instead of ++ _MIPS_SIM == _ABIN32 throughout. ++ (FFI_MIPS_STOP_HERE): New, use in place of ++ ffi_stop_here. ++ (ffi_prep_args): Use unsigned long to hold pointer values. Rewrite ++ to support n32/n64 ABIs. ++ (calc_n32_struct_flags): Rewrite. ++ (calc_n32_return_struct_flags): Remove unused variable. Reverse ++ position of flag bits. ++ (ffi_prep_cif_machdep): Rewrite n32 portion. ++ (ffi_call): Enable for n64. Add special handling for small structure ++ return values. ++ (ffi_prep_closure_loc): Add n32 and n64 support. ++ (ffi_closure_mips_inner_O32): Add cast to silence warning. ++ (copy_struct_N32, ffi_closure_mips_inner_N32): New functions. ++ ++2007-08-08 David Daney ++ ++ * testsuite/libffi.call/ffitest.h (ffi_type_mylong): Remove definition. ++ * testsuite/libffi.call/cls_align_uint16.c (main): Use correct type ++ specifiers. ++ * testsuite/libffi.call/nested_struct1.c (main): Ditto. ++ * testsuite/libffi.call/cls_sint.c (main): Ditto. ++ * testsuite/libffi.call/nested_struct9.c (main): Ditto. ++ * testsuite/libffi.call/cls_20byte1.c (main): Ditto. ++ * testsuite/libffi.call/cls_9byte1.c (main): Ditto. ++ * testsuite/libffi.call/closure_fn1.c (main): Ditto. ++ * testsuite/libffi.call/closure_fn3.c (main): Ditto. ++ * testsuite/libffi.call/return_dbl2.c (main): Ditto. ++ * testsuite/libffi.call/cls_sshort.c (main): Ditto. ++ * testsuite/libffi.call/return_fl3.c (main): Ditto. ++ * testsuite/libffi.call/closure_fn5.c (main): Ditto. ++ * testsuite/libffi.call/nested_struct.c (main): Ditto. ++ * testsuite/libffi.call/nested_struct10.c (main): Ditto. ++ * testsuite/libffi.call/return_ll1.c (main): Ditto. ++ * testsuite/libffi.call/cls_8byte.c (main): Ditto. ++ * testsuite/libffi.call/cls_align_uint32.c (main): Ditto. ++ * testsuite/libffi.call/cls_align_sint16.c (main): Ditto. ++ * testsuite/libffi.call/cls_20byte.c (main): Ditto. ++ * testsuite/libffi.call/nested_struct2.c (main): Ditto. ++ * testsuite/libffi.call/cls_24byte.c (main): Ditto. ++ * testsuite/libffi.call/nested_struct6.c (main): Ditto. ++ * testsuite/libffi.call/cls_uint.c (main): Ditto. ++ * testsuite/libffi.call/cls_12byte.c (main): Ditto. ++ * testsuite/libffi.call/cls_16byte.c (main): Ditto. ++ * testsuite/libffi.call/closure_fn0.c (main): Ditto. ++ * testsuite/libffi.call/cls_9byte2.c (main): Ditto. ++ * testsuite/libffi.call/closure_fn2.c (main): Ditto. ++ * testsuite/libffi.call/return_dbl1.c (main): Ditto. ++ * testsuite/libffi.call/closure_fn4.c (main): Ditto. ++ * testsuite/libffi.call/closure_fn6.c (main): Ditto. ++ * testsuite/libffi.call/cls_align_sint32.c (main): Ditto. ++ ++2007-08-07 Andrew Haley ++ ++ * src/x86/sysv.S (ffi_closure_raw_SYSV): Fix typo in previous ++ checkin. ++ ++2007-08-06 Andrew Haley ++ ++ PR testsuite/32843 ++ * src/x86/sysv.S (ffi_closure_raw_SYSV): Handle FFI_TYPE_UINT8, ++ FFI_TYPE_SINT8, FFI_TYPE_UINT16, FFI_TYPE_SINT16, FFI_TYPE_UINT32, ++ FFI_TYPE_SINT32. ++ ++2007-08-02 David Daney ++ ++ * testsuite/libffi.call/return_ul.c (main): Define return type as ++ ffi_arg. Use proper printf conversion specifier. ++ ++2007-07-30 Andrew Haley ++ ++ PR testsuite/32843 ++ * src/x86/ffi.c (ffi_prep_cif_machdep): in x86 case, add code for ++ signed/unsigned int8/16. ++ * src/x86/sysv.S (ffi_call_SYSV): Rewrite to: ++ Use a jump table. ++ Remove code to pop args from the stack after call. ++ Special-case signed/unsigned int8/16. ++ * testsuite/libffi.call/return_sc.c (main): Revert. ++ ++2007-07-26 Richard Guenther ++ ++ PR testsuite/32843 ++ * testsuite/libffi.call/return_sc.c (main): Verify call ++ result as signed char, not ffi_arg. ++ ++2007-07-16 Rainer Orth ++ ++ * configure.ac (i?86-*-solaris2.1[0-9]): Set TARGET to X86_64. ++ * configure: Regenerate. ++ ++2007-07-11 David Daney ++ ++ * src/mips/ffi.c: Don't include sys/cachectl.h. ++ (ffi_prep_closure_loc): Use __builtin___clear_cache() instead of ++ cacheflush(). ++ ++2007-05-18 Aurelien Jarno ++ ++ * src/arm/ffi.c (ffi_prep_closure_loc): Renamed and ajusted ++ from (ffi_prep_closure): ... this. ++ (FFI_INIT_TRAMPOLINE): Adjust. ++ ++2005-12-31 Phil Blundell ++ ++ * src/arm/ffi.c (ffi_prep_incoming_args_SYSV, ++ ffi_closure_SYSV_inner, ffi_prep_closure): New, add closure support. ++ * src/arm/sysv.S(ffi_closure_SYSV): Likewise. ++ * src/arm/ffitarget.h (FFI_TRAMPOLINE_SIZE): Likewise. ++ (FFI_CLOSURES): Enable closure support. ++ ++2007-07-03 Andrew Haley ++ ++ * testsuite/libffi.call/cls_multi_ushort.c, ++ testsuite/libffi.call/cls_align_uint16.c, ++ testsuite/libffi.call/nested_struct1.c, ++ testsuite/libffi.call/nested_struct3.c, ++ testsuite/libffi.call/cls_7_1_byte.c, ++ testsuite/libffi.call/cls_double.c, ++ testsuite/libffi.call/nested_struct5.c, ++ testsuite/libffi.call/nested_struct7.c, ++ testsuite/libffi.call/cls_sint.c, ++ testsuite/libffi.call/nested_struct9.c, ++ testsuite/libffi.call/cls_20byte1.c, ++ testsuite/libffi.call/cls_multi_sshortchar.c, ++ testsuite/libffi.call/cls_align_sint64.c, ++ testsuite/libffi.call/cls_3byte2.c, ++ testsuite/libffi.call/cls_multi_schar.c, ++ testsuite/libffi.call/cls_multi_uchar.c, ++ testsuite/libffi.call/cls_19byte.c, ++ testsuite/libffi.call/cls_9byte1.c, ++ testsuite/libffi.call/cls_align_float.c, ++ testsuite/libffi.call/closure_fn1.c, ++ testsuite/libffi.call/problem1.c, ++ testsuite/libffi.call/closure_fn3.c, ++ testsuite/libffi.call/cls_sshort.c, ++ testsuite/libffi.call/closure_fn5.c, ++ testsuite/libffi.call/cls_align_double.c, ++ testsuite/libffi.call/cls_2byte.c, ++ testsuite/libffi.call/nested_struct.c, ++ testsuite/libffi.call/nested_struct10.c, ++ testsuite/libffi.call/cls_4byte.c, ++ testsuite/libffi.call/cls_6byte.c, ++ testsuite/libffi.call/cls_8byte.c, ++ testsuite/libffi.call/cls_multi_sshort.c, ++ testsuite/libffi.call/cls_align_uint32.c, ++ testsuite/libffi.call/cls_align_sint16.c, ++ testsuite/libffi.call/cls_float.c, ++ testsuite/libffi.call/cls_20byte.c, ++ testsuite/libffi.call/cls_5_1_byte.c, ++ testsuite/libffi.call/nested_struct2.c, ++ testsuite/libffi.call/cls_24byte.c, ++ testsuite/libffi.call/nested_struct4.c, ++ testsuite/libffi.call/nested_struct6.c, ++ testsuite/libffi.call/cls_64byte.c, ++ testsuite/libffi.call/nested_struct8.c, ++ testsuite/libffi.call/cls_uint.c, ++ testsuite/libffi.call/cls_multi_ushortchar.c, ++ testsuite/libffi.call/cls_schar.c, ++ testsuite/libffi.call/cls_uchar.c, ++ testsuite/libffi.call/cls_align_uint64.c, ++ testsuite/libffi.call/cls_ulonglong.c, ++ testsuite/libffi.call/cls_align_longdouble.c, ++ testsuite/libffi.call/cls_1_1byte.c, ++ testsuite/libffi.call/cls_12byte.c, ++ testsuite/libffi.call/cls_3_1byte.c, ++ testsuite/libffi.call/cls_3byte1.c, ++ testsuite/libffi.call/cls_4_1byte.c, ++ testsuite/libffi.call/cls_6_1_byte.c, ++ testsuite/libffi.call/cls_16byte.c, ++ testsuite/libffi.call/cls_18byte.c, ++ testsuite/libffi.call/closure_fn0.c, ++ testsuite/libffi.call/cls_9byte2.c, ++ testsuite/libffi.call/closure_fn2.c, ++ testsuite/libffi.call/closure_fn4.c, ++ testsuite/libffi.call/cls_ushort.c, ++ testsuite/libffi.call/closure_fn6.c, ++ testsuite/libffi.call/cls_5byte.c, ++ testsuite/libffi.call/cls_align_pointer.c, ++ testsuite/libffi.call/cls_7byte.c, ++ testsuite/libffi.call/cls_align_sint32.c, ++ testsuite/libffi.special/unwindtest_ffi_call.cc, ++ testsuite/libffi.special/unwindtest.cc: Enable for ARM. ++ ++2007-07-05 H.J. Lu ++ ++ * aclocal.m4: Regenerated. ++ ++2007-06-02 Paolo Bonzini ++ ++ * configure: Regenerate. ++ ++2007-05-23 Steve Ellcey ++ ++ * Makefile.in: Regenerate. ++ * configure: Regenerate. ++ * aclocal.m4: Regenerate. ++ * include/Makefile.in: Regenerate. ++ * testsuite/Makefile.in: Regenerate. ++ ++2007-05-10 Roman Zippel ++ ++ * src/m68k/ffi.c (ffi_prep_incoming_args_SYSV, ++ ffi_closure_SYSV_inner,ffi_prep_closure): New, add closure support. ++ * src/m68k/sysv.S(ffi_closure_SYSV,ffi_closure_struct_SYSV): Likewise. ++ * src/m68k/ffitarget.h (FFI_TRAMPOLINE_SIZE): Likewise. ++ (FFI_CLOSURES): Enable closure support. ++ ++2007-05-10 Roman Zippel ++ ++ * configure.ac (HAVE_AS_CFI_PSEUDO_OP): New test. ++ * configure: Regenerate. ++ * fficonfig.h.in: Regenerate. ++ * src/m68k/sysv.S (CFI_STARTPROC,CFI_ENDPROC, ++ CFI_OFFSET,CFI_DEF_CFA): New macros. ++ (ffi_call_SYSV): Add callframe annotation. ++ ++2007-05-10 Roman Zippel ++ ++ * src/m68k/ffi.c (ffi_prep_args,ffi_prep_cif_machdep): Fix ++ numerous test suite failures. ++ * src/m68k/sysv.S (ffi_call_SYSV): Likewise. ++ ++2007-04-11 Paolo Bonzini ++ ++ * Makefile.am (EXTRA_DIST): Bring up to date. ++ * Makefile.in: Regenerate. ++ * src/frv/eabi.S: Remove RCS keyword. ++ ++2007-04-06 Richard Henderson ++ ++ * configure.ac: Tidy target case. ++ (HAVE_LONG_DOUBLE): Allow the target to override. ++ * configure: Regenerate. ++ * include/ffi.h.in: Don't define ffi_type_foo if ++ LIBFFI_HIDE_BASIC_TYPES is defined. ++ (ffi_type_longdouble): If not HAVE_LONG_DOUBLE, define ++ to ffi_type_double. ++ * types.c (LIBFFI_HIDE_BASIC_TYPES): Define. ++ (FFI_TYPEDEF, ffi_type_void): Mark the data const. ++ (ffi_type_longdouble): Special case for Alpha. Don't define ++ if long double == double. ++ ++ * src/alpha/ffi.c (FFI_TYPE_LONGDOUBLE): Assert unique value. ++ (ffi_prep_cif_machdep): Handle it as the 128-bit type. ++ (ffi_call, ffi_closure_osf_inner): Likewise. ++ (ffi_closure_osf_inner): Likewise. Mark hidden. ++ (ffi_call_osf, ffi_closure_osf): Mark hidden. ++ * src/alpha/ffitarget.h (FFI_LAST_ABI): Tidy definition. ++ * src/alpha/osf.S (ffi_call_osf, ffi_closure_osf): Mark hidden. ++ (load_table): Handle 128-bit long double. ++ ++ * testsuite/libffi.call/float4.c: Add -mieee for alpha. ++ ++2007-04-06 Tom Tromey ++ ++ PR libffi/31491: ++ * README: Fixed bug in example. ++ ++2007-04-03 Jakub Jelinek ++ ++ * src/closures.c: Include sys/statfs.h. ++ (_GNU_SOURCE): Define on Linux. ++ (FFI_MMAP_EXEC_SELINUX): Define. ++ (selinux_enabled): New variable. ++ (selinux_enabled_check): New function. ++ (is_selinux_enabled): Define. ++ (dlmmap): Use it. ++ ++2007-03-24 Uros Bizjak ++ ++ * testsuite/libffi.call/return_fl2.c (return_fl): Mark as static. ++ Use 'volatile float sum' to create sum of floats to avoid false ++ negative due to excess precision on ix86 targets. ++ (main): Ditto. ++ ++2007-03-08 Alexandre Oliva ++ ++ * src/powerpc/ffi.c (flush_icache): Fix left-over from previous ++ patch. ++ (ffi_prep_closure_loc): Remove unneeded casts. Add needed ones. ++ ++2007-03-07 Alexandre Oliva ++ ++ * include/ffi.h.in (ffi_closure_alloc, ffi_closure_free): New. ++ (ffi_prep_closure_loc): New. ++ (ffi_prep_raw_closure_loc): New. ++ (ffi_prep_java_raw_closure_loc): New. ++ * src/closures.c: New file. ++ * src/dlmalloc.c [FFI_MMAP_EXEC_WRIT] (struct malloc_segment): ++ Replace sflags with exec_offset. ++ [FFI_MMAP_EXEC_WRIT] (mmap_exec_offset, add_segment_exec_offset, ++ sub_segment_exec_offset): New macros. ++ (get_segment_flags, set_segment_flags, check_segment_merge): New ++ macros. ++ (is_mmapped_segment, is_extern_segment): Use get_segment_flags. ++ (add_segment, sys_alloc, create_mspace, create_mspace_with_base, ++ destroy_mspace): Use new macros. ++ (sys_alloc): Silence warning. ++ * Makefile.am (libffi_la_SOURCES): Add src/closures.c. ++ * Makefile.in: Rebuilt. ++ * src/prep_cif [FFI_CLOSURES] (ffi_prep_closure): Implement in ++ terms of ffi_prep_closure_loc. ++ * src/raw_api.c (ffi_prep_raw_closure_loc): Renamed and adjusted ++ from... ++ (ffi_prep_raw_closure): ... this. Re-implement in terms of the ++ renamed version. ++ * src/java_raw_api (ffi_prep_java_raw_closure_loc): Renamed and ++ adjusted from... ++ (ffi_prep_java_raw_closure): ... this. Re-implement in terms of ++ the renamed version. ++ * src/alpha/ffi.c (ffi_prep_closure_loc): Renamed from ++ (ffi_prep_closure): ... this. ++ * src/pa/ffi.c: Likewise. ++ * src/cris/ffi.c: Likewise. Adjust. ++ * src/frv/ffi.c: Likewise. ++ * src/ia64/ffi.c: Likewise. ++ * src/mips/ffi.c: Likewise. ++ * src/powerpc/ffi_darwin.c: Likewise. ++ * src/s390/ffi.c: Likewise. ++ * src/sh/ffi.c: Likewise. ++ * src/sh64/ffi.c: Likewise. ++ * src/sparc/ffi.c: Likewise. ++ * src/x86/ffi64.c: Likewise. ++ * src/x86/ffi.c: Likewise. ++ (FFI_INIT_TRAMPOLINE): Adjust. ++ (ffi_prep_raw_closure_loc): Renamed and adjusted from... ++ (ffi_prep_raw_closure): ... this. ++ * src/powerpc/ffi.c (ffi_prep_closure_loc): Renamed from ++ (ffi_prep_closure): ... this. ++ (flush_icache): Adjust. ++ ++2007-03-07 Alexandre Oliva ++ ++ * src/dlmalloc.c: New file, imported version 2.8.3 of Doug ++ Lea's malloc. ++ ++2007-03-01 Brooks Moses ++ ++ * Makefile.am: Add dummy install-pdf target. ++ * Makefile.in: Regenerate ++ ++2007-02-13 Andreas Krebbel ++ ++ * src/s390/ffi.c (ffi_prep_args, ffi_prep_cif_machdep, ++ ffi_closure_helper_SYSV): Add long double handling. ++ ++2007-02-02 Jakub Jelinek ++ ++ * src/powerpc/linux64.S (ffi_call_LINUX64): Move restore of r2 ++ immediately after bctrl instruction. ++ ++2007-01-18 Alexandre Oliva ++ ++ * Makefile.am (all-recursive, install-recursive, ++ mostlyclean-recursive, clean-recursive, distclean-recursive, ++ maintainer-clean-recursive): Add missing targets. ++ * Makefile.in: Rebuilt. ++ ++2006-12-14 Andreas Tobler ++ ++ * configure.ac: Add TARGET for x86_64-*-darwin*. ++ * Makefile.am (nodist_libffi_la_SOURCES): Add rules for 64-bit sources ++ for X86_DARWIN. ++ * src/x86/ffitarget.h: Set trampoline size for x86_64-*-darwin*. ++ * src/x86/darwin64.S: New file for x86_64-*-darwin* support. ++ * configure: Regenerate. ++ * Makefile.in: Regenerate. ++ * include/Makefile.in: Regenerate. ++ * testsuite/Makefile.in: Regenerate. ++ * testsuite/libffi.special/unwindtest_ffi_call.cc: New test case for ++ ffi_call only. ++ ++2006-12-13 Andreas Tobler ++ ++ * aclocal.m4: Regenerate with aclocal -I .. as written in the ++ Makefile.am. ++ ++2006-10-31 Geoffrey Keating ++ ++ * src/powerpc/ffi_darwin.c (darwin_adjust_aggregate_sizes): New. ++ (ffi_prep_cif_machdep): Call darwin_adjust_aggregate_sizes for ++ Darwin. ++ * testsuite/libffi.call/nested_struct4.c: Remove Darwin XFAIL. ++ * testsuite/libffi.call/nested_struct6.c: Remove Darwin XFAIL. ++ ++2006-10-10 Paolo Bonzini ++ Sandro Tolaini ++ ++ * configure.ac [i*86-*-darwin*]: Set X86_DARWIN symbol and ++ conditional. ++ * configure: Regenerated. ++ * Makefile.am (nodist_libffi_la_SOURCES) [X86_DARWIN]: New case. ++ (EXTRA_DIST): Add src/x86/darwin.S. ++ * Makefile.in: Regenerated. ++ * include/Makefile.in: Regenerated. ++ * testsuite/Makefile.in: Regenerated. ++ ++ * src/x86/ffi.c (ffi_prep_cif_machdep) [X86_DARWIN]: Treat like ++ X86_WIN32, and additionally align stack to 16 bytes. ++ * src/x86/darwin.S: New, based on sysv.S. ++ * src/prep_cif.c (ffi_prep_cif) [X86_DARWIN]: Align > 8-byte structs. ++ ++2006-09-12 David Daney ++ ++ PR libffi/23935 ++ * include/Makefile.am: Install both ffi.h and ffitarget.h in ++ $(libdir)/gcc/$(target_alias)/$(gcc_version)/include. ++ * aclocal.m4: Regenerated for automake 1.9.6. ++ * Makefile.in: Regenerated. ++ * include/Makefile.in: Regenerated. ++ * testsuite/Makefile.in: Regenerated. ++ ++2006-08-17 Andreas Tobler ++ ++ * include/ffi_common.h (struct): Revert accidental commit. ++ ++2006-08-15 Andreas Tobler ++ ++ * include/ffi_common.h: Remove lint directives. ++ * include/ffi.h.in: Likewise. ++ ++2006-07-25 Torsten Schoenfeld ++ ++ * include/ffi.h.in (ffi_type_ulong, ffi_type_slong): Define correctly ++ for 32-bit architectures. ++ * testsuite/libffi.call/return_ul.c: New test case. ++ ++2006-07-19 David Daney ++ ++ * testsuite/libffi.call/closure_fn6.c: Remove xfail for mips, ++ xfail remains for mips64. ++ ++2006-05-23 Carlos O'Donell ++ ++ * Makefile.am: Add install-html target. Add install-html to .PHONY ++ * Makefile.in: Regenerate. ++ * aclocal.m4: Regenerate. ++ * include/Makefile.in: Regenerate. ++ * testsuite/Makefile.in: Regenerate. ++ ++2006-05-18 John David Anglin ++ ++ * pa/ffi.c (ffi_prep_args_pa32): Load floating point arguments from ++ stack slot. ++ ++2006-04-22 Andreas Tobler ++ ++ * README: Remove notice about 'Crazy Comments'. ++ * src/debug.c: Remove lint directives. Cleanup white spaces. ++ * src/java_raw_api.c: Likewise. ++ * src/prep_cif.c: Likewise. ++ * src/raw_api.c: Likewise. ++ * src/ffitest.c: Delete. No longer needed, all test cases migrated ++ to the testsuite. ++ * src/arm/ffi.c: Remove lint directives. ++ * src/m32r/ffi.c: Likewise. ++ * src/pa/ffi.c: Likewise. ++ * src/powerpc/ffi.c: Likewise. ++ * src/powerpc/ffi_darwin.c: Likewise. ++ * src/sh/ffi.c: Likewise. ++ * src/sh64/ffi.c: Likewise. ++ * src/x86/ffi.c: Likewise. ++ * testsuite/libffi.call/float2.c: Likewise. ++ * testsuite/libffi.call/promotion.c: Likewise. ++ * testsuite/libffi.call/struct1.c: Likewise. ++ ++2006-04-13 Andreas Tobler ++ ++ * src/pa/hpux32.S: Correct unwind offset calculation for ++ ffi_closure_pa32. ++ * src/pa/linux.S: Likewise. ++ ++2006-04-12 James E Wilson ++ ++ PR libgcj/26483 ++ * src/ia64/ffi.c (stf_spill, ldf_fill): Rewrite as macros. ++ (hfa_type_load): Call stf_spill. ++ (hfa_type_store): Call ldf_fill. ++ (ffi_call): Adjust calls to above routines. Add local temps for ++ macro result. ++ ++2006-04-10 Matthias Klose ++ ++ * testsuite/lib/libffi-dg.exp (libffi-init): Recognize multilib ++ directory names containing underscores. ++ ++2006-04-07 James E Wilson ++ ++ * testsuite/libffi.call/float4.c: New testcase. ++ ++2006-04-05 John David Anglin ++ Andreas Tobler ++ ++ * Makefile.am: Add PA_HPUX port. ++ * Makefile.in: Regenerate. ++ * include/Makefile.in: Likewise. ++ * testsuite/Makefile.in: Likewise. ++ * configure.ac: Add PA_HPUX rules. ++ * configure: Regenerate. ++ * src/pa/ffitarget.h: Rename linux target to PA_LINUX. ++ Add PA_HPUX and PA64_HPUX. ++ Rename FFI_LINUX ABI to FFI_PA32 ABI. ++ (FFI_TRAMPOLINE_SIZE): Define for 32-bit HP-UX targets. ++ (FFI_TYPE_SMALL_STRUCT2): Define. ++ (FFI_TYPE_SMALL_STRUCT4): Likewise. ++ (FFI_TYPE_SMALL_STRUCT8): Likewise. ++ (FFI_TYPE_SMALL_STRUCT3): Redefine. ++ (FFI_TYPE_SMALL_STRUCT5): Likewise. ++ (FFI_TYPE_SMALL_STRUCT6): Likewise. ++ (FFI_TYPE_SMALL_STRUCT7): Likewise. ++ * src/pa/ffi.c (ROUND_DOWN): Delete. ++ (fldw, fstw, fldd, fstd): Use '__asm__'. ++ (ffi_struct_type): Add support for FFI_TYPE_SMALL_STRUCT2, ++ FFI_TYPE_SMALL_STRUCT4 and FFI_TYPE_SMALL_STRUCT8. ++ (ffi_prep_args_LINUX): Rename to ffi_prep_args_pa32. Update comment. ++ Simplify incrementing of stack slot variable. Change type of local ++ 'n' to unsigned int. ++ (ffi_size_stack_LINUX): Rename to ffi_size_stack_pa32. Handle long ++ double on PA_HPUX. ++ (ffi_prep_cif_machdep): Likewise. ++ (ffi_call): Likewise. ++ (ffi_closure_inner_LINUX): Rename to ffi_closure_inner_pa32. Change ++ return type to ffi_status. Simplify incrementing of stack slot ++ variable. Only copy floating point argument registers when PA_LINUX ++ is true. Reformat debug statement. ++ Add support for FFI_TYPE_SMALL_STRUCT2, FFI_TYPE_SMALL_STRUCT4 and ++ FFI_TYPE_SMALL_STRUCT8. ++ (ffi_closure_LINUX): Rename to ffi_closure_pa32. Add 'extern' to ++ declaration. ++ (ffi_prep_closure): Make linux trampoline conditional on PA_LINUX. ++ Add nops to cache flush. Add trampoline for PA_HPUX. ++ * src/pa/hpux32.S: New file. ++ * src/pa/linux.S (ffi_call_LINUX): Rename to ffi_call_pa32. Rename ++ ffi_prep_args_LINUX to ffi_prep_args_pa32. ++ Localize labels. Add support for 2, 4 and 8-byte small structs. Handle ++ unaligned destinations in 3, 5, 6 and 7-byte small structs. Order ++ argument type checks so that common argument types appear first. ++ (ffi_closure_LINUX): Rename to ffi_closure_pa32. Rename ++ ffi_closure_inner_LINUX to ffi_closure_inner_pa32. ++ ++2006-03-24 Alan Modra ++ ++ * src/powerpc/ffitarget.h (enum ffi_abi): Add FFI_LINUX. Default ++ for 32-bit using IBM extended double format. Fix FFI_LAST_ABI. ++ * src/powerpc/ffi.c (ffi_prep_args_SYSV): Handle linux variant of ++ FFI_TYPE_LONGDOUBLE. ++ (ffi_prep_args64): Assert using IBM extended double. ++ (ffi_prep_cif_machdep): Don't munge FFI_TYPE_LONGDOUBLE type. ++ Handle FFI_LINUX FFI_TYPE_LONGDOUBLE return and args. ++ (ffi_call): Handle FFI_LINUX. ++ (ffi_closure_helper_SYSV): Non FFI_LINUX long double return needs ++ gpr3 return pointer as for struct return. Handle FFI_LINUX ++ FFI_TYPE_LONGDOUBLE return and args. Don't increment "nf" ++ unnecessarily. ++ * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Load both f1 and f2 ++ for FFI_TYPE_LONGDOUBLE. Move epilogue insns into case table. ++ Don't use r6 as pointer to results, instead use sp offset. Don't ++ make a special call to load lr with case table address, instead ++ use offset from previous call. ++ * src/powerpc/sysv.S (ffi_call_SYSV): Save long double return. ++ * src/powerpc/linux64.S (ffi_call_LINUX64): Simplify long double ++ return. ++ ++2006-03-15 Kaz Kojima ++ ++ * src/sh64/ffi.c (ffi_prep_cif_machdep): Handle float arguments ++ passed with FP registers correctly. ++ (ffi_closure_helper_SYSV): Likewise. ++ * src/sh64/sysv.S: Likewise. ++ ++2006-03-01 Andreas Tobler ++ ++ * testsuite/libffi.special/unwindtest.cc (closure_test_fn): Mark cif, ++ args and userdata unused. ++ (closure_test_fn1): Mark cif and userdata unused. ++ (main): Remove unused res. ++ ++2006-02-28 Andreas Tobler ++ ++ * testsuite/libffi.call/call.exp: Adjust FSF address. Add test runs for ++ -O2, -O3, -Os and the warning flags -W -Wall. ++ * testsuite/libffi.special/special.exp: Likewise. ++ * testsuite/libffi.call/ffitest.h: Add an __UNUSED__ macro to mark ++ unused parameter unused for gcc or else do nothing. ++ * testsuite/libffi.special/ffitestcxx.h: Likewise. ++ * testsuite/libffi.call/cls_12byte.c (cls_struct_12byte_gn): Mark cif ++ and userdata unused. ++ * testsuite/libffi.call/cls_16byte.c (cls_struct_16byte_gn): Likewise. ++ * testsuite/libffi.call/cls_18byte.c (cls_struct_18byte_gn): Likewise. ++ * testsuite/libffi.call/cls_19byte.c (cls_struct_19byte_gn): Likewise. ++ * testsuite/libffi.call/cls_1_1byte.c (cls_struct_1_1byte_gn): Likewise. ++ * testsuite/libffi.call/cls_20byte.c (cls_struct_20byte_gn): Likewise. ++ * testsuite/libffi.call/cls_20byte1.c (cls_struct_20byte_gn): Likewise. ++ * testsuite/libffi.call/cls_24byte.c (cls_struct_24byte_gn): Likewise. ++ * testsuite/libffi.call/cls_2byte.c (cls_struct_2byte_gn): Likewise. ++ * testsuite/libffi.call/cls_3_1byte.c (cls_struct_3_1byte_gn): Likewise. ++ * testsuite/libffi.call/cls_3byte1.c (cls_struct_3byte_gn): Likewise. ++ * testsuite/libffi.call/cls_3byte2.c (cls_struct_3byte_gn1): Likewise. ++ * testsuite/libffi.call/cls_4_1byte.c (cls_struct_4_1byte_gn): Likewise. ++ * testsuite/libffi.call/cls_4byte.c (cls_struct_4byte_gn): Likewise. ++ * testsuite/libffi.call/cls_5_1_byte.c (cls_struct_5byte_gn): Likewise. ++ * testsuite/libffi.call/cls_5byte.c (cls_struct_5byte_gn): Likewise. ++ * testsuite/libffi.call/cls_64byte.c (cls_struct_64byte_gn): Likewise. ++ * testsuite/libffi.call/cls_6_1_byte.c (cls_struct_6byte_gn): Likewise. ++ * testsuite/libffi.call/cls_6byte.c (cls_struct_6byte_gn): Likewise. ++ * testsuite/libffi.call/cls_7_1_byte.c (cls_struct_7byte_gn): Likewise. ++ * testsuite/libffi.call/cls_7byte.c (cls_struct_7byte_gn): Likewise. ++ * testsuite/libffi.call/cls_8byte.c (cls_struct_8byte_gn): Likewise. ++ * testsuite/libffi.call/cls_9byte1.c (cls_struct_9byte_gn): Likewise. ++ * testsuite/libffi.call/cls_9byte2.c (cls_struct_9byte_gn): Likewise. ++ * testsuite/libffi.call/cls_align_double.c (cls_struct_align_gn): ++ Likewise. ++ * testsuite/libffi.call/cls_align_float.c (cls_struct_align_gn): ++ Likewise. ++ * testsuite/libffi.call/cls_align_longdouble.c (cls_struct_align_gn): ++ Likewise. ++ * testsuite/libffi.call/cls_align_pointer.c (cls_struct_align_fn): Cast ++ void* to avoid compiler warning. ++ (main): Likewise. ++ (cls_struct_align_gn): Mark cif and userdata unused. ++ * testsuite/libffi.call/cls_align_sint16.c (cls_struct_align_gn): ++ Likewise. ++ * testsuite/libffi.call/cls_align_sint32.c (cls_struct_align_gn): ++ Likewise. ++ * testsuite/libffi.call/cls_align_sint64.c (cls_struct_align_gn): ++ Likewise. ++ * testsuite/libffi.call/cls_align_uint16.c (cls_struct_align_gn): ++ Likewise. ++ * testsuite/libffi.call/cls_align_uint32.c (cls_struct_align_gn): ++ Likewise. ++ * testsuite/libffi.call/cls_double.c (cls_ret_double_fn): Likewise. ++ * testsuite/libffi.call/cls_float.c (cls_ret_float_fn): Likewise. ++ * testsuite/libffi.call/cls_multi_schar.c (test_func_gn): Mark cif and ++ data unused. ++ (main): Cast res_call to silence gcc. ++ * testsuite/libffi.call/cls_multi_sshort.c (test_func_gn): Mark cif and ++ data unused. ++ (main): Cast res_call to silence gcc. ++ * testsuite/libffi.call/cls_multi_sshortchar.c (test_func_gn): Mark cif ++ and data unused. ++ (main): Cast res_call to silence gcc. ++ * testsuite/libffi.call/cls_multi_uchar.c (test_func_gn): Mark cif and ++ data unused. ++ (main): Cast res_call to silence gcc. ++ * testsuite/libffi.call/cls_multi_ushort.c (test_func_gn): Mark cif and ++ data unused. ++ (main): Cast res_call to silence gcc. ++ * testsuite/libffi.call/cls_multi_ushortchar.c (test_func_gn): Mark cif ++ and data unused. ++ (main): Cast res_call to silence gcc. ++ * testsuite/libffi.call/cls_schar.c (cls_ret_schar_fn): Mark cif and ++ userdata unused. ++ (cls_ret_schar_fn): Cast printf parameter to silence gcc. ++ * testsuite/libffi.call/cls_sint.c (cls_ret_sint_fn): Mark cif and ++ userdata unused. ++ (cls_ret_sint_fn): Cast printf parameter to silence gcc. ++ * testsuite/libffi.call/cls_sshort.c (cls_ret_sshort_fn): Mark cif and ++ userdata unused. ++ (cls_ret_sshort_fn): Cast printf parameter to silence gcc. ++ * testsuite/libffi.call/cls_uchar.c (cls_ret_uchar_fn): Mark cif and ++ userdata unused. ++ (cls_ret_uchar_fn): Cast printf parameter to silence gcc. ++ * testsuite/libffi.call/cls_uint.c (cls_ret_uint_fn): Mark cif and ++ userdata unused. ++ (cls_ret_uint_fn): Cast printf parameter to silence gcc. ++ * testsuite/libffi.call/cls_ulonglong.c (cls_ret_ulonglong_fn): Mark cif ++ and userdata unused. ++ * testsuite/libffi.call/cls_ushort.c (cls_ret_ushort_fn): Mark cif and ++ userdata unused. ++ (cls_ret_ushort_fn): Cast printf parameter to silence gcc. ++ * testsuite/libffi.call/float.c (floating): Remove unused parameter e. ++ * testsuite/libffi.call/float1.c (main): Remove unused variable i. ++ Cleanup white spaces. ++ * testsuite/libffi.call/negint.c (checking): Remove unused variable i. ++ * testsuite/libffi.call/nested_struct.c (cls_struct_combined_gn): Mark ++ cif and userdata unused. ++ * testsuite/libffi.call/nested_struct1.c (cls_struct_combined_gn): ++ Likewise. ++ * testsuite/libffi.call/nested_struct10.c (B_gn): Likewise. ++ * testsuite/libffi.call/nested_struct2.c (B_fn): Adjust printf ++ formatters to silence gcc. ++ (B_gn): Mark cif and userdata unused. ++ * testsuite/libffi.call/nested_struct3.c (B_gn): Mark cif and userdata ++ unused. ++ * testsuite/libffi.call/nested_struct4.c: Mention related PR. ++ (B_gn): Mark cif and userdata unused. ++ * testsuite/libffi.call/nested_struct5.c (B_gn): Mark cif and userdata ++ unused. ++ * testsuite/libffi.call/nested_struct6.c: Mention related PR. ++ (B_gn): Mark cif and userdata unused. ++ * testsuite/libffi.call/nested_struct7.c (B_gn): Mark cif and userdata ++ unused. ++ * testsuite/libffi.call/nested_struct8.c (B_gn): Likewise. ++ * testsuite/libffi.call/nested_struct9.c (B_gn): Likewise. ++ * testsuite/libffi.call/problem1.c (stub): Likewise. ++ * testsuite/libffi.call/pyobjc-tc.c (main): Cast the result to silence ++ gcc. ++ * testsuite/libffi.call/return_fl2.c (return_fl): Add the note mentioned ++ in the last commit for this test case in the test case itself. ++ * testsuite/libffi.call/closure_fn0.c (closure_test_fn0): Mark cif as ++ unused. ++ * testsuite/libffi.call/closure_fn1.c (closure_test_fn1): Likewise. ++ * testsuite/libffi.call/closure_fn2.c (closure_test_fn2): Likewise. ++ * testsuite/libffi.call/closure_fn3.c (closure_test_fn3): Likewise. ++ * testsuite/libffi.call/closure_fn4.c (closure_test_fn0): Likewise. ++ * testsuite/libffi.call/closure_fn5.c (closure_test_fn5): Likewise. ++ * testsuite/libffi.call/closure_fn6.c (closure_test_fn0): Likewise. ++ ++2006-02-22 Kaz Kojima ++ ++ * src/sh/sysv.S: Fix register numbers in the FDE for ++ ffi_closure_SYSV. ++ ++2006-02-20 Andreas Tobler ++ ++ * testsuite/libffi.call/return_fl2.c (return_fl): Remove static ++ declaration to avoid a false negative on ix86. See PR323. ++ ++2006-02-18 Kaz Kojima ++ ++ * src/sh/ffi.c (ffi_closure_helper_SYSV): Remove unused variable ++ and cast integer to void * if needed. Update the pointer to ++ the FP register saved area correctly. ++ ++2006-02-17 Andreas Tobler ++ ++ * testsuite/libffi.call/nested_struct6.c: XFAIL this test until PR25630 ++ is fixed. ++ * testsuite/libffi.call/nested_struct4.c: Likewise. ++ ++2006-02-16 Andreas Tobler ++ ++ * testsuite/libffi.call/return_dbl.c: New test case. ++ * testsuite/libffi.call/return_dbl1.c: Likewise. ++ * testsuite/libffi.call/return_dbl2.c: Likewise. ++ * testsuite/libffi.call/return_fl.c: Likewise. ++ * testsuite/libffi.call/return_fl1.c: Likewise. ++ * testsuite/libffi.call/return_fl2.c: Likewise. ++ * testsuite/libffi.call/return_fl3.c: Likewise. ++ * testsuite/libffi.call/closure_fn6.c: Likewise. ++ ++ * testsuite/libffi.call/nested_struct2.c: Remove ffi_type_mylong ++ definition. ++ * testsuite/libffi.call/ffitest.h: Add ffi_type_mylong definition ++ here to be used by other test cases too. ++ ++ * testsuite/libffi.call/nested_struct10.c: New test case. ++ * testsuite/libffi.call/nested_struct9.c: Likewise. ++ * testsuite/libffi.call/nested_struct8.c: Likewise. ++ * testsuite/libffi.call/nested_struct7.c: Likewise. ++ * testsuite/libffi.call/nested_struct6.c: Likewise. ++ * testsuite/libffi.call/nested_struct5.c: Likewise. ++ * testsuite/libffi.call/nested_struct4.c: Likewise. ++ ++2006-01-21 Andreas Tobler ++ ++ * configure.ac: Enable libffi for sparc64-*-freebsd*. ++ * configure: Rebuilt. ++ ++2006-01-18 Jakub Jelinek ++ ++ * src/powerpc/sysv.S (smst_two_register): Don't call __ashldi3, ++ instead do the shifting inline. ++ * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Don't compute %r5 ++ shift count unconditionally. Simplify load sequences for 1, 2, 3, 4 ++ and 8 byte structs, for the remaining struct sizes don't call ++ __lshrdi3, instead do the shifting inline. ++ ++2005-12-07 Thiemo Seufer ++ ++ * src/mips/ffitarget.h: Remove obsolete sgidefs.h include. Add ++ missing parentheses. ++ * src/mips/o32.S (ffi_call_O32): Code formatting. Define ++ and use A3_OFF, FP_OFF, RA_OFF. Micro-optimizations. ++ (ffi_closure_O32): Likewise, but with newly defined A3_OFF2, ++ A2_OFF2, A1_OFF2, A0_OFF2, RA_OFF2, FP_OFF2, S0_OFF2, GP_OFF2, ++ V1_OFF2, V0_OFF2, FA_1_1_OFF2, FA_1_0_OFF2, FA_0_1_OFF2, ++ FA_0_0_OFF2. ++ * src/mips/ffi.c (ffi_prep_args): Code formatting. Fix ++ endianness bugs. ++ (ffi_prep_closure): Improve trampoline instruction scheduling. ++ (ffi_closure_mips_inner_O32): Fix endianness bugs. ++ ++2005-12-03 Alan Modra ++ ++ * src/powerpc/ffi.c: Formatting. ++ (ffi_prep_args_SYSV): Avoid possible aliasing problems by using unions. ++ (ffi_prep_args64): Likewise. ++ ++2005-09-30 Geoffrey Keating ++ ++ * testsuite/lib/libffi-dg.exp (libffi_target_compile): For ++ darwin, use -shared-libgcc not -lgcc_s, and explain why. ++ ++2005-09-26 Tom Tromey ++ ++ * testsuite/libffi.call/float1.c (value_type): New typedef. ++ (CANARY): New define. ++ (main): Check for result buffer overflow. ++ * src/powerpc/linux64.S: Handle linux64 long double returns. ++ * src/powerpc/ffi.c (FLAG_RETURNS_128BITS): New constant. ++ (ffi_prep_cif_machdep): Handle linux64 long double returns. ++ ++2005-08-25 Alan Modra ++ ++ PR target/23404 ++ * src/powerpc/ffi.c (ffi_prep_args_SYSV): Correct placement of stack ++ homed fp args. ++ (ffi_status ffi_prep_cif_machdep): Correct stack sizing for same. ++ ++2005-08-11 Jakub Jelinek ++ ++ * configure.ac (HAVE_HIDDEN_VISIBILITY_ATTRIBUTE): New test. ++ (AH_BOTTOM): Add FFI_HIDDEN definition. ++ * configure: Rebuilt. ++ * fficonfig.h.in: Rebuilt. ++ * src/powerpc/ffi.c (hidden): Remove. ++ (ffi_closure_LINUX64, ffi_prep_args64, ffi_call_LINUX64, ++ ffi_closure_helper_LINUX64): Use FFI_HIDDEN instead of hidden. ++ * src/powerpc/linux64_closure.S (ffi_closure_LINUX64, ++ .ffi_closure_LINUX64): Use FFI_HIDDEN instead of .hidden. ++ * src/x86/ffi.c (ffi_closure_SYSV, ffi_closure_raw_SYSV): Remove, ++ add FFI_HIDDEN to its prototype. ++ (ffi_closure_SYSV_inner): New. ++ * src/x86/sysv.S (ffi_closure_SYSV, ffi_closure_raw_SYSV): New. ++ * src/x86/win32.S (ffi_closure_SYSV, ffi_closure_raw_SYSV): New. ++ ++2005-08-10 Alfred M. Szmidt ++ ++ PR libffi/21819: ++ * configure: Rebuilt. ++ * configure.ac: Handle i*86-*-gnu*. ++ ++2005-08-09 Jakub Jelinek ++ ++ * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Use ++ DW_CFA_offset_extended_sf rather than ++ DW_CFA_GNU_negative_offset_extended. ++ * src/powerpc/sysv.S (ffi_call_SYSV): Likewise. ++ ++2005-07-22 SUGIOKA Toshinobu ++ ++ * src/sh/sysv.S (ffi_call_SYSV): Stop argument popping correctly ++ on sh3. ++ (ffi_closure_SYSV): Change the stack layout for sh3 struct argument. ++ * src/sh/ffi.c (ffi_prep_args): Fix sh3 argument copy, when it is ++ partially on register. ++ (ffi_closure_helper_SYSV): Likewise. ++ (ffi_prep_cif_machdep): Don't set too many cif->flags. ++ ++2005-07-20 Kaz Kojima ++ ++ * src/sh/ffi.c (ffi_call): Handle small structures correctly. ++ Remove empty line. ++ * src/sh64/ffi.c (simple_type): Remove. ++ (return_type): Handle small structures correctly. ++ (ffi_prep_args): Likewise. ++ (ffi_call): Likewise. ++ (ffi_closure_helper_SYSV): Likewise. ++ * src/sh64/sysv.S (ffi_call_SYSV): Handle 1, 2 and 4-byte return. ++ Emit position independent code if PIC and remove wrong datalabel ++ prefixes from EH data. ++ ++2005-07-19 Andreas Tobler ++ ++ * Makefile.am (nodist_libffi_la_SOURCES): Add POWERPC_FREEBSD. ++ * Makefile.in: Regenerate. ++ * include/Makefile.in: Likewise. ++ * testsuite/Makefile.in: Likewise. ++ * configure.ac: Add POWERPC_FREEBSD rules. ++ * configure: Regenerate. ++ * src/powerpc/ffitarget.h: Add POWERPC_FREEBSD rules. ++ (FFI_SYSV_TYPE_SMALL_STRUCT): Define. ++ * src/powerpc/ffi.c: Add flags to handle small structure returns ++ in ffi_call_SYSV. ++ (ffi_prep_cif_machdep): Handle small structures for SYSV 4 ABI. ++ Aka FFI_SYSV. ++ (ffi_closure_helper_SYSV): Likewise. ++ * src/powerpc/ppc_closure.S: Add return types for small structures. ++ * src/powerpc/sysv.S: Add bits to handle small structures for ++ final SYSV 4 ABI. ++ ++2005-07-10 Andreas Tobler ++ ++ * testsuite/libffi.call/cls_5_1_byte.c: New test file. ++ * testsuite/libffi.call/cls_6_1_byte.c: Likewise. ++ * testsuite/libffi.call/cls_7_1_byte.c: Likewise. ++ ++2005-07-05 Randolph Chung ++ ++ * src/pa/ffi.c (ffi_struct_type): Rename FFI_TYPE_SMALL_STRUCT1 ++ as FFI_TYPE_SMALL_STRUCT3. Break out handling for 5-7 byte ++ structures. Kill compilation warnings. ++ (ffi_closure_inner_LINUX): Print return values as hex in debug ++ message. Rename FFI_TYPE_SMALL_STRUCT1 as FFI_TYPE_SMALL_STRUCT3. ++ Properly handle 5-7 byte structure returns. ++ * src/pa/ffitarget.h (FFI_TYPE_SMALL_STRUCT1) ++ (FFI_TYPE_SMALL_STRUCT2): Remove. ++ (FFI_TYPE_SMALL_STRUCT3, FFI_TYPE_SMALL_STRUCT5) ++ (FFI_TYPE_SMALL_STRUCT6, FFI_TYPE_SMALL_STRUCT7): Define. ++ * src/pa/linux.S: Mark source file as using PA1.1 assembly. ++ (checksmst1, checksmst2): Remove. ++ (checksmst3): Optimize handling of 3-byte struct returns. ++ (checksmst567): Properly handle 5-7 byte struct returns. ++ ++2005-06-15 Rainer Orth ++ ++ PR libgcj/21943 ++ * src/mips/n32.S: Enforce PIC code. ++ * src/mips/o32.S: Likewise. ++ ++2005-06-15 Rainer Orth ++ ++ * configure.ac: Treat i*86-*-solaris2.10 and up as X86_64. ++ * configure: Regenerate. ++ ++2005-06-01 Alan Modra ++ ++ * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Don't use JUMPTARGET ++ to call ffi_closure_helper_SYSV. Append @local instead. ++ * src/powerpc/sysv.S (ffi_call_SYSV): Likewise for ffi_prep_args_SYSV. ++ ++2005-05-17 Kelley Cook ++ ++ * configure.ac: Use AC_C_BIGENDIAN instead of AC_C_BIGENDIAN_CROSS. ++ Use AC_CHECK_SIZEOF instead of AC_COMPILE_CHECK_SIZEOF. ++ * Makefile.am (ACLOCAL_AMFLAGS): Remove -I ../config. ++ * aclocal.m4, configure, fficonfig.h.in, Makefile.in, ++ include/Makefile.in, testsuite/Makefile.in: Regenerate. ++ ++2005-05-09 Mike Stump ++ ++ * configure: Regenerate. ++ ++2005-05-08 Richard Henderson ++ ++ PR libffi/21285 ++ * src/alpha/osf.S: Update unwind into to match code. ++ ++2005-05-04 Andreas Degert ++ Richard Henderson ++ ++ * src/x86/ffi64.c (ffi_prep_cif_machdep): Save sse-used flag in ++ bit 11 of flags. ++ (ffi_call): Mask return type field. Pass ssecount to ffi_call_unix64. ++ (ffi_prep_closure): Set carry bit if sse-used flag set. ++ * src/x86/unix64.S (ffi_call_unix64): Add ssecount argument. ++ Only load sse registers if ssecount non-zero. ++ (ffi_closure_unix64): Only save sse registers if carry set on entry. ++ ++2005-04-29 Ralf Corsepius ++ ++ * configure.ac: Add i*86-*-rtems*, sparc*-*-rtems*, ++ powerpc-*rtems*, arm*-*-rtems*, sh-*-rtems*. ++ * configure: Regenerate. ++ ++2005-04-20 Hans-Peter Nilsson ++ ++ * testsuite/lib/libffi-dg.exp (libffi-dg-test-1): In regsub use, ++ have Tcl8.3-compatible intermediate variable. ++ ++2005-04-18 Simon Posnjak ++ Hans-Peter Nilsson ++ ++ * Makefile.am: Add CRIS support. ++ * configure.ac: Likewise. ++ * Makefile.in, configure, testsuite/Makefile.in, ++ include/Makefile.in: Regenerate. ++ * src/cris: New directory. ++ * src/cris/ffi.c, src/cris/sysv.S, src/cris/ffitarget.h: New files. ++ * src/prep_cif.c (ffi_prep_cif): Wrap in #ifndef __CRIS__. ++ ++ * testsuite/lib/libffi-dg.exp (libffi-dg-test-1): Replace \n with ++ \r?\n in output tests. ++ ++2005-04-12 Mike Stump ++ ++ * configure: Regenerate. ++ ++2005-03-30 Hans Boehm ++ ++ * src/ia64/ffitarget.h (ffi_arg): Use long long instead of DI. ++ ++2005-03-30 Steve Ellcey ++ ++ * src/ia64/ffitarget.h (ffi_arg) ADD DI attribute. ++ (ffi_sarg) Ditto. ++ * src/ia64/unix.S (ffi_closure_unix): Extend gp ++ to 64 bits in ILP32 mode. ++ Load 64 bits even for short data. ++ ++2005-03-23 Mike Stump ++ ++ * src/powerpc/darwin.S: Update for -m64 multilib. ++ * src/powerpc/darwin_closure.S: Likewise. ++ ++2005-03-21 Zack Weinberg ++ ++ * configure.ac: Do not invoke TL_AC_GCC_VERSION. ++ Do not set tool_include_dir. ++ * aclocal.m4, configure, Makefile.in, testsuite/Makefile.in: ++ Regenerate. ++ * include/Makefile.am: Set gcc_version and toollibffidir. ++ * include/Makefile.in: Regenerate. ++ ++2005-02-22 Andrew Haley ++ ++ * src/powerpc/ffi.c (ffi_prep_cif_machdep): Bump alignment to ++ odd-numbered register pairs for 64-bit integer types. ++ ++2005-02-23 Andreas Tobler ++ ++ PR libffi/20104 ++ * testsuite/libffi.call/return_ll1.c: New test case. ++ ++2005-02-11 Janis Johnson ++ ++ * testsuite/libffi.call/cls_align_longdouble.c: Remove dg-options. ++ * testsuite/libffi.call/float.c: Ditto. ++ * testsuite/libffi.call/float2.c: Ditto. ++ * testsuite/libffi.call/float3.c: Ditto. ++ ++2005-02-08 Andreas Tobler ++ ++ * src/frv/ffitarget.h: Remove PPC stuff which does not belong to frv. ++ ++2005-01-12 Eric Botcazou ++ ++ * testsuite/libffi.special/special.exp (cxx_options): Add ++ -shared-libgcc. ++ ++2004-12-31 Richard Henderson ++ ++ * src/types.c (FFI_AGGREGATE_TYPEDEF): Remove. ++ (FFI_TYPEDEF): Rename from FFI_INTEGRAL_TYPEDEF. Replace size and ++ offset parameters with a type parameter; deduce size and structure ++ alignment. Update all users. ++ ++2004-12-31 Richard Henderson ++ ++ * src/types.c (FFI_TYPE_POINTER): Define with sizeof. ++ (FFI_TYPE_LONGDOUBLE): Fix for ia64. ++ * src/ia64/ffitarget.h (struct ffi_ia64_trampoline_struct): Move ++ into ffi_prep_closure. ++ * src/ia64/ia64_flags.h, src/ia64/ffi.c, src/ia64/unix.S: Rewrite ++ from scratch. ++ ++2004-12-27 Richard Henderson ++ ++ * src/x86/unix64.S: Fix typo in unwind info. ++ ++2004-12-25 Richard Henderson ++ ++ * src/x86/ffi64.c (struct register_args): Rename from stackLayout. ++ (enum x86_64_reg_class): Add X86_64_COMPLEX_X87_CLASS. ++ (merge_classes): Check for it. ++ (SSE_CLASS_P): New. ++ (classify_argument): Pass byte_offset by value; perform all updates ++ inside struct case. ++ (examine_argument): Add classes argument; handle ++ X86_64_COMPLEX_X87_CLASS. ++ (ffi_prep_args): Merge into ... ++ (ffi_call): ... here. Share stack frame with ffi_call_unix64. ++ (ffi_prep_cif_machdep): Setup cif->flags for proper structure return. ++ (ffi_fill_return_value): Remove. ++ (ffi_prep_closure): Remove dead assert. ++ (ffi_closure_unix64_inner): Rename from ffi_closure_UNIX64_inner. ++ Rewrite to use struct register_args instead of va_list. Create ++ flags for handling structure returns. ++ * src/x86/unix64.S: Remove dead strings. ++ (ffi_call_unix64): Rename from ffi_call_UNIX64. Rewrite to share ++ stack frame with ffi_call. Handle structure returns properly. ++ (float2sse, floatfloat2sse, double2sse): Remove. ++ (sse2float, sse2double, sse2floatfloat): Remove. ++ (ffi_closure_unix64): Rename from ffi_closure_UNIX64. Rewrite ++ to handle structure returns properly. ++ ++2004-12-08 David Edelsohn ++ ++ * Makefile.am (AM_MAKEFLAGS): Remove duplicate LIBCFLAGS and ++ PICFLAG. ++ * Makefile.in: Regenerated. ++ ++2004-12-02 Richard Sandiford ++ ++ * configure.ac: Use TL_AC_GCC_VERSION to set gcc_version. ++ * configure, aclocal.m4, Makefile.in: Regenerate. ++ * include/Makefile.in, testsuite/Makefile.in: Regenerate. ++ ++2004-11-29 Kelley Cook ++ ++ * configure: Regenerate for libtool change. ++ ++2004-11-25 Kelley Cook ++ ++ * configure: Regenerate for libtool reversion. ++ ++2004-11-24 Kelley Cook ++ ++ * configure: Regenerate for libtool change. ++ ++2004-11-23 John David Anglin ++ ++ * testsuite/lib/libffi-dg.exp: Use new procs in target-libpath.exp. ++ ++2004-11-23 Richard Sandiford ++ ++ * src/mips/o32.S (ffi_call_O32, ffi_closure_O32): Use jalr instead ++ of jal. Use an absolute encoding for the frame information. ++ ++2004-11-23 Kelley Cook ++ ++ * Makefile.am: Remove no-dependencies. Add ACLOCAL_AMFLAGS. ++ * acinclude.m4: Delete logic for sincludes. ++ * aclocal.m4, Makefile.in, configure: Regenerate. ++ * include/Makefile: Likewise. ++ * testsuite/Makefile: Likewise. ++ ++2004-11-22 Eric Botcazou ++ ++ * src/sparc/ffi.c (ffi_prep_closure): Align doubles and 64-bit integers ++ on a 8-byte boundary. ++ * src/sparc/v8.S (ffi_closure_v8): Reserve frame space for arguments. ++ ++2004-10-27 Richard Earnshaw ++ ++ * src/arm/ffi.c (ffi_prep_cif_machdep): Handle functions that return ++ long long values. Round stack allocation to a multiple of 8 bytes ++ for ATPCS compatibility. ++ * src/arm/sysv.S (ffi_call_SYSV): Rework to avoid use of APCS register ++ names. Handle returning long long types. Add Thumb and interworking ++ support. Improve soft-float code. ++ ++2004-10-27 Richard Earnshaw ++ ++ * testsuite/lib/libffi-db.exp (load_gcc_lib): New function. ++ (libffi_exit): New function. ++ (libffi_init): Build the testglue wrapper if needed. ++ ++2004-10-25 Eric Botcazou ++ ++ PR other/18138 ++ * testsuite/lib/libffi-dg.exp: Accept more than one multilib libgcc. ++ ++2004-10-25 Kazuhiro Inaoka ++ ++ * src/m32r/libffitarget.h (FFI_CLOSURES): Set to 0. ++ ++2004-10-20 Kaz Kojima ++ ++ * src/sh/sysv.S (ffi_call_SYSV): Don't align for double data. ++ * testsuite/libffi.call/float3.c: New test case. ++ ++2004-10-18 Kaz Kojima ++ ++ * src/sh/ffi.c (ffi_prep_closure): Set T bit in trampoline for ++ the function returning a structure pointed with R2. ++ * src/sh/sysv.S (ffi_closure_SYSV): Use R2 as the pointer to ++ the structure return value if T bit set. Emit position ++ independent code and EH data if PIC. ++ ++2004-10-13 Kazuhiro Inaoka ++ ++ * Makefile.am: Add m32r support. ++ * configure.ac: Likewise. ++ * Makefile.in: Regenerate. ++ * confiugre: Regenerate. ++ * src/types.c: Add m32r port to FFI_INTERNAL_TYPEDEF ++ (uint64, sint64, double, longdouble) ++ * src/m32r: New directory. ++ * src/m32r/ffi.c: New file. ++ * src/m32r/sysv.S: Likewise. ++ * src/m32r/ffitarget.h: Likewise. ++ ++2004-10-02 Kaz Kojima ++ ++ * testsuite/libffi.call/negint.c: New test case. ++ ++2004-09-14 H.J. Lu ++ ++ PR libgcj/17465 ++ * testsuite/lib/libffi-dg.exp: Don't use global ld_library_path. ++ Set up LD_LIBRARY_PATH, SHLIB_PATH, LD_LIBRARYN32_PATH, ++ LD_LIBRARY64_PATH, LD_LIBRARY_PATH_32, LD_LIBRARY_PATH_64 and ++ DYLD_LIBRARY_PATH. ++ ++2004-09-05 Andreas Tobler ++ ++ * testsuite/libffi.call/many_win32.c: Remove whitespaces. ++ * testsuite/libffi.call/promotion.c: Likewise. ++ * testsuite/libffi.call/return_ll.c: Remove unused var. Cleanup ++ whitespaces. ++ * testsuite/libffi.call/return_sc.c: Likewise. ++ * testsuite/libffi.call/return_uc.c: Likewise. ++ ++2004-09-05 Andreas Tobler ++ ++ * src/powerpc/darwin.S: Fix comments and identation. ++ * src/powerpc/darwin_closure.S: Likewise. ++ ++2004-09-02 Andreas Tobler ++ ++ * src/powerpc/ffi_darwin.c: Add flag for longdouble return values. ++ (ffi_prep_args): Handle longdouble arguments. ++ (ffi_prep_cif_machdep): Set flags for longdouble. Calculate space for ++ longdouble. ++ (ffi_closure_helper_DARWIN): Add closure handling for longdouble. ++ * src/powerpc/darwin.S (_ffi_call_DARWIN): Add handling of longdouble ++ values. ++ * src/powerpc/darwin_closure.S (_ffi_closure_ASM): Likewise. ++ * src/types.c: Defined longdouble size and alignment for darwin. ++ ++2004-09-02 Andreas Tobler ++ ++ * src/powerpc/aix.S: Remove whitespaces. ++ * src/powerpc/aix_closure.S: Likewise. ++ * src/powerpc/asm.h: Likewise. ++ * src/powerpc/ffi.c: Likewise. ++ * src/powerpc/ffitarget.h: Likewise. ++ * src/powerpc/linux64.S: Likewise. ++ * src/powerpc/linux64_closure.S: Likewise. ++ * src/powerpc/ppc_closure.S: Likewise. ++ * src/powerpc/sysv.S: Likewise. ++ ++2004-08-30 Anthony Green ++ ++ * Makefile.am: Add frv support. ++ * Makefile.in, testsuite/Makefile.in: Rebuilt. ++ * configure.ac: Read configure.host. ++ * configure.in: Read configure.host. ++ * configure.host: New file. frv-elf needs libgloss. ++ * include/ffi.h.in: Force ffi_closure to have a nice big (8) ++ alignment. This is needed to frv and shouldn't harm the others. ++ * include/ffi_common.h (ALIGN_DOWN): New macro. ++ * src/frv/ffi.c, src/frv/ffitarget.h, src/frv/eabi.S: New files. ++ ++2004-08-24 David Daney ++ ++ * testsuite/libffi.call/closure_fn0.c: Xfail mips64* instead of mips*. ++ * testsuite/libffi.call/closure_fn1.c: Likewise. ++ * testsuite/libffi.call/closure_fn2.c Likewise. ++ * testsuite/libffi.call/closure_fn3.c: Likewise. ++ * testsuite/libffi.call/closure_fn4.c: Likewise. ++ * testsuite/libffi.call/closure_fn5.c: Likewise. ++ * testsuite/libffi.call/cls_18byte.c: Likewise. ++ * testsuite/libffi.call/cls_19byte.c: Likewise. ++ * testsuite/libffi.call/cls_1_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte1.c: Likewise. ++ * testsuite/libffi.call/cls_24byte.c: Likewise. ++ * testsuite/libffi.call/cls_2byte.c: Likewise. ++ * testsuite/libffi.call/cls_3_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_3byte1.c: Likewise. ++ * testsuite/libffi.call/cls_3byte2.c: Likewise. ++ * testsuite/libffi.call/cls_4_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_4byte.c: Likewise. ++ * testsuite/libffi.call/cls_64byte.c: Likewise. ++ * testsuite/libffi.call/cls_6byte.c: Likewise. ++ * testsuite/libffi.call/cls_7byte.c: Likewise. ++ * testsuite/libffi.call/cls_8byte.c: Likewise. ++ * testsuite/libffi.call/cls_9byte1.c: Likewise. ++ * testsuite/libffi.call/cls_9byte2.c: Likewise. ++ * testsuite/libffi.call/cls_align_double.c: Likewise. ++ * testsuite/libffi.call/cls_align_float.c: Likewise. ++ * testsuite/libffi.call/cls_align_longdouble.c: Likewise. ++ * testsuite/libffi.call/cls_align_pointer.c: Likewise. ++ * testsuite/libffi.call/cls_align_sint16.c: Likewise. ++ * testsuite/libffi.call/cls_align_sint32.c: Likewise. ++ * testsuite/libffi.call/cls_align_sint64.c: Likewise. ++ * testsuite/libffi.call/cls_align_uint16.c: Likewise. ++ * testsuite/libffi.call/cls_align_uint32.c: Likewise. ++ * testsuite/libffi.call/cls_align_uint64.c: Likewise. ++ * testsuite/libffi.call/cls_double.c: Likewise. ++ * testsuite/libffi.call/cls_float.c: Likewise. ++ * testsuite/libffi.call/cls_multi_schar.c: Likewise. ++ * testsuite/libffi.call/cls_multi_sshort.c: Likewise. ++ * testsuite/libffi.call/cls_multi_sshortchar.c: Likewise. ++ * testsuite/libffi.call/cls_multi_uchar.c: Likewise. ++ * testsuite/libffi.call/cls_multi_ushort.c: Likewise. ++ * testsuite/libffi.call/cls_multi_ushortchar.c: Likewise. ++ * testsuite/libffi.call/cls_schar.c: Likewise. ++ * testsuite/libffi.call/cls_sint.c: Likewise. ++ * testsuite/libffi.call/cls_sshort.c: Likewise. ++ * testsuite/libffi.call/cls_uchar.c: Likewise. ++ * testsuite/libffi.call/cls_uint.c: Likewise. ++ * testsuite/libffi.call/cls_ulonglong.c: Likewise. ++ * testsuite/libffi.call/cls_ushort.c: Likewise. ++ * testsuite/libffi.call/nested_struct.c: Likewise. ++ * testsuite/libffi.call/nested_struct1.c: Likewise. ++ * testsuite/libffi.call/nested_struct2.c: Likewise. ++ * testsuite/libffi.call/nested_struct3.c: Likewise. ++ * testsuite/libffi.call/problem1.c: Likewise. ++ * testsuite/libffi.special/unwindtest.cc: Likewise. ++ * testsuite/libffi.call/cls_12byte.c: Likewise and set return value ++ to zero. ++ * testsuite/libffi.call/cls_16byte.c: Likewise. ++ * testsuite/libffi.call/cls_5byte.c: Likewise. ++ ++2004-08-23 David Daney ++ ++ PR libgcj/13141 ++ * src/mips/ffitarget.h (FFI_O32_SOFT_FLOAT): New ABI. ++ * src/mips/ffi.c (ffi_prep_args): Fix alignment calculation. ++ (ffi_prep_cif_machdep): Handle FFI_O32_SOFT_FLOAT floating point ++ parameters and return types. ++ (ffi_call): Handle FFI_O32_SOFT_FLOAT ABI. ++ (ffi_prep_closure): Ditto. ++ (ffi_closure_mips_inner_O32): Handle FFI_O32_SOFT_FLOAT ABI, fix ++ alignment calculations. ++ * src/mips/o32.S (ffi_closure_O32): Don't use floating point ++ instructions if FFI_O32_SOFT_FLOAT, make stack frame ABI compliant. ++ ++2004-08-14 Casey Marshall ++ ++ * src/mips/ffi.c (ffi_pref_cif_machdep): set `cif->flags' to ++ contain `FFI_TYPE_UINT64' as return type for any 64-bit ++ integer (O32 ABI only). ++ (ffi_prep_closure): new function. ++ (ffi_closure_mips_inner_O32): new function. ++ * src/mips/ffitarget.h: Define `FFI_CLOSURES' and ++ `FFI_TRAMPOLINE_SIZE' appropriately if the ABI is o32. ++ * src/mips/o32.S (ffi_call_O32): add labels for .eh_frame. Return ++ 64 bit integers correctly. ++ (ffi_closure_O32): new function. ++ Added DWARF-2 unwind info for both functions. ++ ++2004-08-10 Andrew Haley ++ ++ * src/x86/ffi64.c (ffi_prep_args ): 8-align all stack arguments. ++ ++2004-08-01 Robert Millan ++ ++ * configure.ac: Detect knetbsd-gnu and kfreebsd-gnu. ++ * configure: Regenerate. ++ ++2004-07-30 Maciej W. Rozycki ++ ++ * acinclude.m4 (AC_FUNC_MMAP_BLACKLIST): Check for ++ and mmap() explicitly instead of relying on preset autoconf cache ++ variables. ++ * aclocal.m4: Regenerate. ++ * configure: Regenerate. ++ ++2004-07-11 Ulrich Weigand ++ ++ * src/s390/ffi.c (ffi_prep_args): Fix C aliasing violation. ++ (ffi_check_float_struct): Remove unused prototype. ++ ++2004-06-30 Geoffrey Keating ++ ++ * src/powerpc/ffi_darwin.c (flush_icache): ';' is a comment ++ character on Darwin, use '\n\t' instead. ++ ++2004-06-26 Matthias Klose ++ ++ * libtool-version: Fix typo in revision/age. ++ ++2004-06-17 Matthias Klose ++ ++ * libtool-version: New. ++ * Makefile.am (libffi_la_LDFLAGS): Use -version-info for soname. ++ * Makefile.in: Regenerate. ++ ++2004-06-15 Paolo Bonzini ++ ++ * Makefile.am: Remove useless multilib rules. ++ * Makefile.in: Regenerate. ++ * aclocal.m4: Regenerate with automake 1.8.5. ++ * configure.ac: Remove useless multilib configury. ++ * configure: Regenerate. ++ ++2004-06-15 Paolo Bonzini ++ ++ * .cvsignore: New file. ++ ++2004-06-10 Jakub Jelinek ++ ++ * src/ia64/unix.S (ffi_call_unix): Insert group barrier break ++ fp_done. ++ (ffi_closure_UNIX): Fix f14/f15 adjustment if FLOAT_SZ is ever ++ changed from 8. ++ ++2004-06-06 Sean McNeil ++ ++ * configure.ac: Add x86_64-*-freebsd* support. ++ * configure: Regenerate. ++ ++2004-04-26 Joe Buck ++ ++ Bug 15093 ++ * configure.ac: Test for existence of mmap and sys/mman.h before ++ checking blacklist. Fix suggested by Jim Wilson. ++ * configure: Regenerate. ++ ++2004-04-26 Matt Austern ++ ++ * src/powerpc/darwin.S: Go through a non-lazy pointer for initial ++ FDE location. ++ * src/powerpc/darwin_closure.S: Likewise. ++ ++2004-04-24 Andreas Tobler ++ ++ * testsuite/libffi.call/cls_multi_schar.c (main): Fix initialization ++ error. Reported by Thomas Heller . ++ * testsuite/libffi.call/cls_multi_sshort.c (main): Likewise. ++ * testsuite/libffi.call/cls_multi_ushort.c (main): Likewise. ++ ++2004-03-20 Matthias Klose ++ ++ * src/pa/linux.S: Fix typo. ++ ++2004-03-19 Matthias Klose ++ ++ * Makefile.am: Update. ++ * Makefile.in: Regenerate. ++ * src/pa/ffi.h.in: Remove. ++ * src/pa/ffitarget.h: New file. ++ ++2004-02-10 Randolph Chung ++ ++ * Makefile.am: Add PA support. ++ * Makefile.in: Regenerate. ++ * include/Makefile.in: Regenerate. ++ * configure.ac: Add PA target. ++ * configure: Regenerate. ++ * src/pa/ffi.c: New file. ++ * src/pa/ffi.h.in: Add PA support. ++ * src/pa/linux.S: New file. ++ * prep_cif.c: Add PA support. ++ ++2004-03-16 Hosaka Yuji ++ ++ * src/types.c: Fix alignment size of X86_WIN32 case int64 and ++ double. ++ * src/x86/ffi.c (ffi_prep_args): Replace ecif->cif->rtype->type ++ with ecif->cif->flags. ++ (ffi_call, ffi_prep_incoming_args_SYSV): Replace cif->rtype->type ++ with cif->flags. ++ (ffi_prep_cif_machdep): Add X86_WIN32 struct case. ++ (ffi_closure_SYSV): Add 1 or 2-bytes struct case for X86_WIN32. ++ * src/x86/win32.S (retstruct1b, retstruct2b, sc_retstruct1b, ++ sc_retstruct2b): Add for 1 or 2-bytes struct case. ++ ++2004-03-15 Kelley Cook ++ ++ * configure.in: Rename file to ... ++ * configure.ac: ... this. ++ * fficonfig.h.in: Regenerate. ++ * Makefile.in: Regenerate. ++ * include/Makefile.in: Regenerate. ++ * testsuite/Makefile.in: Regenerate. ++ ++2004-03-12 Matt Austern ++ ++ * src/powerpc/darwin.S: Fix EH information so it corresponds to ++ changes in EH format resulting from addition of linkonce support. ++ * src/powerpc/darwin_closure.S: Likewise. ++ ++2004-03-11 Andreas Tobler ++ Paolo Bonzini ++ ++ * Makefile.am (AUTOMAKE_OPTIONS): Set them. ++ Remove VPATH. Remove rules for object files. Remove multilib support. ++ (AM_CCASFLAGS): Add. ++ * configure.in (AC_CONFIG_HEADERS): Relace AM_CONFIG_HEADER. ++ (AC_PREREQ): Bump version to 2.59. ++ (AC_INIT): Fill with version info and bug address. ++ (ORIGINAL_LD_FOR_MULTILIBS): Remove. ++ (AM_ENABLE_MULTILIB): Use this instead of AC_ARG_ENABLE. ++ De-precious CC so that the right flags are passed down to multilibs. ++ (AC_MSG_ERROR): Replace obsolete macro AC_ERROR. ++ (AC_CONFIG_FILES): Replace obsolete macro AC_LINK_FILES. ++ (AC_OUTPUT): Reorganize the output with AC_CONFIG_COMMANDS. ++ * configure: Rebuilt. ++ * aclocal.m4: Likewise. ++ * Makefile.in, include/Makefile.in, testsuite/Makefile.in: Likewise. ++ * fficonfig.h.in: Likewise. ++ ++2004-03-11 Andreas Schwab ++ ++ * src/ia64/ffi.c (ffi_prep_incoming_args_UNIX): Get floating point ++ arguments from fp registers only for the first 8 parameter slots. ++ Don't convert a float parameter when passed in memory. ++ ++2004-03-09 Hans-Peter Nilsson ++ ++ * configure: Regenerate for config/accross.m4 correction. ++ ++2004-02-25 Matt Kraai ++ ++ * src/powerpc/ffi.c (ffi_prep_args_SYSV): Change ++ ecif->cif->bytes to bytes. ++ (ffi_prep_cif_machdep): Add braces around nested if statement. ++ ++2004-02-09 Alan Modra ++ ++ * src/types.c (pointer): POWERPC64 has 8 byte pointers. ++ ++ * src/powerpc/ffi.c (ffi_prep_args64): Correct long double handling. ++ (ffi_closure_helper_LINUX64): Fix typo. ++ * testsuite/libffi.call/cls_align_longdouble.c: Pass -mlong-double-128 ++ for powerpc64-*-*. ++ * testsuite/libffi.call/float.c: Likewise. ++ * testsuite/libffi.call/float2.c: Likewise. ++ ++2004-02-08 Alan Modra ++ ++ * src/powerpc/ffi.c (ffi_prep_cif_machdep ): Correct ++ long double function return and long double arg handling. ++ (ffi_closure_helper_LINUX64): Formatting. Delete unused "ng" var. ++ Use "end_pfr" instead of "nf". Correct long double handling. ++ Localise "temp". ++ * src/powerpc/linux64.S (ffi_call_LINUX64): Save f2 long double ++ return value. ++ * src/powerpc/linux64_closure.S (ffi_closure_LINUX64): Allocate ++ space for long double return value. Adjust stack frame and offsets. ++ Load f2 long double return. ++ ++2004-02-07 Alan Modra ++ ++ * src/types.c: Use 16 byte long double for POWERPC64. ++ ++2004-01-25 Eric Botcazou ++ ++ * src/sparc/ffi.c (ffi_prep_args_v9): Shift the parameter array ++ when the structure return address is passed in %o0. ++ (ffi_V9_return_struct): Rename into ffi_v9_layout_struct. ++ (ffi_v9_layout_struct): Align the field following a nested structure ++ on a word boundary. Use memmove instead of memcpy. ++ (ffi_call): Update call to ffi_V9_return_struct. ++ (ffi_prep_closure): Define 'ctx' only for V8. ++ (ffi_closure_sparc_inner): Clone into ffi_closure_sparc_inner_v8 ++ and ffi_closure_sparc_inner_v9. ++ (ffi_closure_sparc_inner_v8): Return long doubles by reference. ++ Always skip the structure return address. For structures and long ++ doubles, copy the argument directly. ++ (ffi_closure_sparc_inner_v9): Skip the structure return address only ++ if required. Shift the maximum floating-point slot accordingly. For ++ big structures, copy the argument directly; otherwise, left-justify the ++ argument and call ffi_v9_layout_struct to lay out the structure on ++ the stack. ++ * src/sparc/v8.S: Undef STACKFRAME before defining it. ++ (ffi_closure_v8): Pass the structure return address. Update call to ++ ffi_closure_sparc_inner_v8. Short-circuit FFI_TYPE_INT handling. ++ Skip the 'unimp' insn when returning long doubles and structures. ++ * src/sparc/v9.S: Undef STACKFRAME before defining it. ++ (ffi_closure_v9): Increase the frame size by 2 words. Short-circuit ++ FFI_TYPE_INT handling. Load structures both in integers and ++ floating-point registers on return. ++ * README: Update status of the SPARC port. ++ ++2004-01-24 Andreas Tobler ++ ++ * testsuite/libffi.call/pyobjc-tc.c (main): Treat result value ++ as of type ffi_arg. ++ * testsuite/libffi.call/struct3.c (main): Fix CHECK. ++ ++2004-01-22 Ulrich Weigand ++ ++ * testsuite/libffi.call/cls_uint.c (cls_ret_uint_fn): Treat result ++ value as of type ffi_arg, not unsigned int. ++ ++2004-01-21 Michael Ritzert ++ ++ * ffi64.c (ffi_prep_args): Cast the RHS of an assignment instead ++ of the LHS. ++ ++2004-01-12 Andreas Tobler ++ ++ * testsuite/lib/libffi-dg.exp: Set LD_LIBRARY_PATH_32 for ++ Solaris. ++ ++2004-01-08 Rainer Orth ++ ++ * testsuite/libffi.call/ffitest.h (allocate_mmap): Cast MAP_FAILED ++ to void *. ++ ++2003-12-10 Richard Henderson ++ ++ * testsuite/libffi.call/cls_align_pointer.c: Cast pointers to ++ size_t instead of int. ++ ++2003-12-04 Hosaka Yuji ++ ++ * testsuite/libffi.call/many_win32.c: Include . ++ * testsuite/libffi.call/many_win32.c (main): Replace variable ++ int i with unsigned long ul. ++ ++ * testsuite/libffi.call/cls_align_uint64.c: New test case. ++ * testsuite/libffi.call/cls_align_sint64.c: Likewise. ++ * testsuite/libffi.call/cls_align_uint32.c: Likewise. ++ * testsuite/libffi.call/cls_align_sint32.c: Likewise. ++ * testsuite/libffi.call/cls_align_uint16.c: Likewise. ++ * testsuite/libffi.call/cls_align_sint16.c: Likewise. ++ * testsuite/libffi.call/cls_align_float.c: Likewise. ++ * testsuite/libffi.call/cls_align_double.c: Likewise. ++ * testsuite/libffi.call/cls_align_longdouble.c: Likewise. ++ * testsuite/libffi.call/cls_align_pointer.c: Likewise. ++ ++2003-12-02 Hosaka Yuji ++ ++ PR other/13221 ++ * src/x86/ffi.c (ffi_prep_args, ffi_prep_incoming_args_SYSV): ++ Align arguments to 32 bits. ++ ++2003-12-01 Andreas Tobler ++ ++ PR other/13221 ++ * testsuite/libffi.call/cls_multi_sshort.c: New test case. ++ * testsuite/libffi.call/cls_multi_sshortchar.c: Likewise. ++ * testsuite/libffi.call/cls_multi_uchar.c: Likewise. ++ * testsuite/libffi.call/cls_multi_schar.c: Likewise. ++ * testsuite/libffi.call/cls_multi_ushortchar.c: Likewise. ++ * testsuite/libffi.call/cls_multi_ushort.c: Likewise. ++ ++ * testsuite/libffi.special/unwindtest.cc: Cosmetics. ++ ++2003-11-26 Kaveh R. Ghazi ++ ++ * testsuite/libffi.call/ffitest.h: Include . ++ * testsuite/libffi.special/ffitestcxx.h: Likewise. ++ ++2003-11-22 Andreas Tobler ++ ++ * Makefile.in: Rebuilt. ++ * configure: Likewise. ++ * testsuite/libffi.special/unwindtest.cc: Convert the mmap to ++ the right type. ++ ++2003-11-21 Andreas Jaeger ++ Andreas Tobler ++ ++ * acinclude.m4: Add AC_FUNC_MMAP_BLACKLIST. ++ * configure.in: Call AC_FUNC_MMAP_BLACKLIST. ++ * Makefile.in: Rebuilt. ++ * aclocal.m4: Likewise. ++ * configure: Likewise. ++ * fficonfig.h.in: Likewise. ++ * testsuite/lib/libffi-dg.exp: Add include dir. ++ * testsuite/libffi.call/ffitest.h: Add MMAP definitions. ++ * testsuite/libffi.special/ffitestcxx.h: Likewise. ++ * testsuite/libffi.call/closure_fn0.c: Use MMAP functionality ++ for ffi_closure if available. ++ * testsuite/libffi.call/closure_fn1.c: Likewise. ++ * testsuite/libffi.call/closure_fn2.c: Likewise. ++ * testsuite/libffi.call/closure_fn3.c: Likewise. ++ * testsuite/libffi.call/closure_fn4.c: Likewise. ++ * testsuite/libffi.call/closure_fn5.c: Likewise. ++ * testsuite/libffi.call/cls_12byte.c: Likewise. ++ * testsuite/libffi.call/cls_16byte.c: Likewise. ++ * testsuite/libffi.call/cls_18byte.c: Likewise. ++ * testsuite/libffi.call/cls_19byte.c: Likewise. ++ * testsuite/libffi.call/cls_1_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte1.c: Likewise. ++ * testsuite/libffi.call/cls_24byte.c: Likewise. ++ * testsuite/libffi.call/cls_2byte.c: Likewise. ++ * testsuite/libffi.call/cls_3_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_3byte1.c: Likewise. ++ * testsuite/libffi.call/cls_3byte2.c: Likewise. ++ * testsuite/libffi.call/cls_4_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_4byte.c: Likewise. ++ * testsuite/libffi.call/cls_5byte.c: Likewise. ++ * testsuite/libffi.call/cls_64byte.c: Likewise. ++ * testsuite/libffi.call/cls_6byte.c: Likewise. ++ * testsuite/libffi.call/cls_7byte.c: Likewise. ++ * testsuite/libffi.call/cls_8byte.c: Likewise. ++ * testsuite/libffi.call/cls_9byte1.c: Likewise. ++ * testsuite/libffi.call/cls_9byte2.c: Likewise. ++ * testsuite/libffi.call/cls_double.c: Likewise. ++ * testsuite/libffi.call/cls_float.c: Likewise. ++ * testsuite/libffi.call/cls_schar.c: Likewise. ++ * testsuite/libffi.call/cls_sint.c: Likewise. ++ * testsuite/libffi.call/cls_sshort.c: Likewise. ++ * testsuite/libffi.call/cls_uchar.c: Likewise. ++ * testsuite/libffi.call/cls_uint.c: Likewise. ++ * testsuite/libffi.call/cls_ulonglong.c: Likewise. ++ * testsuite/libffi.call/cls_ushort.c: Likewise. ++ * testsuite/libffi.call/nested_struct.c: Likewise. ++ * testsuite/libffi.call/nested_struct1.c: Likewise. ++ * testsuite/libffi.call/nested_struct2.c: Likewise. ++ * testsuite/libffi.call/nested_struct3.c: Likewise. ++ * testsuite/libffi.call/problem1.c: Likewise. ++ * testsuite/libffi.special/unwindtest.cc: Likewise. ++ ++2003-11-20 Andreas Tobler ++ ++ * testsuite/lib/libffi-dg.exp: Make the -lgcc_s conditional. ++ ++2003-11-19 Andreas Tobler ++ ++ * testsuite/lib/libffi-dg.exp: Add DYLD_LIBRARY_PATH for darwin. ++ Add -lgcc_s to additional flags. ++ ++2003-11-12 Andreas Tobler ++ ++ * configure.in, include/Makefile.am: PR libgcj/11147, install ++ the ffitarget.h header file in a gcc versioned and target ++ dependent place. ++ * configure: Regenerated. ++ * Makefile.in, include/Makefile.in: Likewise. ++ * testsuite/Makefile.in: Likewise. ++ ++2003-11-09 Andreas Tobler ++ ++ * testsuite/libffi.call/closure_fn0.c: Print result and check ++ with dg-output to make debugging easier. ++ * testsuite/libffi.call/closure_fn1.c: Likewise. ++ * testsuite/libffi.call/closure_fn2.c: Likewise. ++ * testsuite/libffi.call/closure_fn3.c: Likewise. ++ * testsuite/libffi.call/closure_fn4.c: Likewise. ++ * testsuite/libffi.call/closure_fn5.c: Likewise. ++ * testsuite/libffi.call/cls_12byte.c: Likewise. ++ * testsuite/libffi.call/cls_16byte.c: Likewise. ++ * testsuite/libffi.call/cls_18byte.c: Likewise. ++ * testsuite/libffi.call/cls_19byte.c: Likewise. ++ * testsuite/libffi.call/cls_1_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte1.c: Likewise. ++ * testsuite/libffi.call/cls_24byte.c: Likewise. ++ * testsuite/libffi.call/cls_2byte.c: Likewise. ++ * testsuite/libffi.call/cls_3_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_3byte1.c: Likewise. ++ * testsuite/libffi.call/cls_3byte2.c: Likewise. ++ * testsuite/libffi.call/cls_4_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_4byte.c: Likewise. ++ * testsuite/libffi.call/cls_5byte.c: Likewise. ++ * testsuite/libffi.call/cls_64byte.c: Likewise. ++ * testsuite/libffi.call/cls_6byte.c: Likewise. ++ * testsuite/libffi.call/cls_7byte.c: Likewise. ++ * testsuite/libffi.call/cls_8byte.c: Likewise. ++ * testsuite/libffi.call/cls_9byte1.c: Likewise. ++ * testsuite/libffi.call/cls_9byte2.c: Likewise. ++ * testsuite/libffi.call/cls_double.c: Likewise. ++ * testsuite/libffi.call/cls_float.c: Likewise. ++ * testsuite/libffi.call/cls_schar.c: Likewise. ++ * testsuite/libffi.call/cls_sint.c: Likewise. ++ * testsuite/libffi.call/cls_sshort.c: Likewise. ++ * testsuite/libffi.call/cls_uchar.c: Likewise. ++ * testsuite/libffi.call/cls_uint.c: Likewise. ++ * testsuite/libffi.call/cls_ulonglong.c: Likewise. ++ * testsuite/libffi.call/cls_ushort.c: Likewise. ++ * testsuite/libffi.call/problem1.c: Likewise. ++ ++ * testsuite/libffi.special/unwindtest.cc: Make ffi_closure ++ static. ++ ++2003-11-08 Andreas Tobler ++ ++ * testsuite/libffi.call/cls_9byte2.c: New test case. ++ * testsuite/libffi.call/cls_9byte1.c: Likewise. ++ * testsuite/libffi.call/cls_64byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte1.c: Likewise. ++ * testsuite/libffi.call/cls_19byte.c: Likewise. ++ * testsuite/libffi.call/cls_18byte.c: Likewise. ++ * testsuite/libffi.call/closure_fn4.c: Likewise. ++ * testsuite/libffi.call/closure_fn5.c: Likewise. ++ * testsuite/libffi.call/cls_schar.c: Likewise. ++ * testsuite/libffi.call/cls_sint.c: Likewise. ++ * testsuite/libffi.call/cls_sshort.c: Likewise. ++ * testsuite/libffi.call/nested_struct2.c: Likewise. ++ * testsuite/libffi.call/nested_struct3.c: Likewise. ++ ++2003-11-08 Andreas Tobler ++ ++ * testsuite/libffi.call/cls_double.c: Do a check on the result. ++ * testsuite/libffi.call/cls_uchar.c: Likewise. ++ * testsuite/libffi.call/cls_uint.c: Likewise. ++ * testsuite/libffi.call/cls_ulonglong.c: Likewise. ++ * testsuite/libffi.call/cls_ushort.c: Likewise. ++ * testsuite/libffi.call/return_sc.c: Cleanup whitespaces. ++ ++2003-11-06 Andreas Tobler ++ ++ * src/prep_cif.c (ffi_prep_cif): Move the validity check after ++ the initialization. ++ ++2003-10-23 Andreas Tobler ++ ++ * src/java_raw_api.c (ffi_java_ptrarray_to_raw): Replace ++ FFI_ASSERT(FALSE) with FFI_ASSERT(0). ++ ++2003-10-22 David Daney ++ ++ * src/mips/ffitarget.h: Replace undefined UINT32 and friends with ++ __attribute__((__mode__(__SI__))) and friends. ++ ++2003-10-22 Andreas Schwab ++ ++ * src/ia64/ffi.c: Replace FALSE/TRUE with false/true. ++ ++2003-10-21 Andreas Tobler ++ ++ * configure.in: AC_LINK_FILES(ffitarget.h). ++ * configure: Regenerate. ++ * Makefile.in: Likewise. ++ * include/Makefile.in: Likewise. ++ * testsuite/Makefile.in: Likewise. ++ * fficonfig.h.in: Likewise. ++ ++2003-10-21 Paolo Bonzini ++ Richard Henderson ++ ++ Avoid that ffi.h includes fficonfig.h. ++ ++ * Makefile.am (EXTRA_DIST): Include ffitarget.h files ++ (TARGET_SRC_MIPS_GCC): Renamed to TARGET_SRC_MIPS_IRIX. ++ (TARGET_SRC_MIPS_SGI): Removed. ++ (MIPS_GCC): Renamed to TARGET_SRC_MIPS_IRIX. ++ (MIPS_SGI): Removed. ++ (CLEANFILES): Removed. ++ (mostlyclean-am, clean-am, mostlyclean-sub, clean-sub): New ++ targets. ++ * acconfig.h: Removed. ++ * configure.in: Compute sizeofs only for double and long double. ++ Use them to define and subst HAVE_LONG_DOUBLE. Include comments ++ into AC_DEFINE instead of using acconfig.h. Create ++ include/ffitarget.h instead of include/fficonfig.h. Rename ++ MIPS_GCC to MIPS_IRIX, drop MIPS_SGI since we are in gcc's tree. ++ AC_DEFINE EH_FRAME_FLAGS. ++ * include/Makefile.am (DISTCLEANFILES): New automake macro. ++ (hack_DATA): Add ffitarget.h. ++ * include/ffi.h.in: Remove all system specific definitions. ++ Declare raw API even if it is not installed, why bother? ++ Use limits.h instead of SIZEOF_* to define ffi_type_*. Do ++ not define EH_FRAME_FLAGS, it is in fficonfig.h now. Include ++ ffitarget.h instead of fficonfig.h. Remove ALIGN macro. ++ (UINT_ARG, INT_ARG): Removed, use ffi_arg and ffi_sarg instead. ++ * include/ffi_common.h (bool): Do not define. ++ (ffi_assert): Accept failed assertion. ++ (ffi_type_test): Return void and accept file/line. ++ (FFI_ASSERT): Pass stringized failed assertion. ++ (FFI_ASSERT_AT): New macro. ++ (FFI_ASSERT_VALID_TYPE): New macro. ++ (UINT8, SINT8, UINT16, SINT16, UINT32, SINT32, ++ UINT64, SINT64): Define here with gcc's __attribute__ macro ++ instead of in ffi.h ++ (FLOAT32, ALIGN): Define here instead of in ffi.h ++ * include/ffi-mips.h: Removed. Its content moved to ++ src/mips/ffitarget.h after separating assembly and C sections. ++ * src/alpha/ffi.c, src/alpha/ffi.c, src/java_raw_api.c ++ src/prep_cif.c, src/raw_api.c, src/ia64/ffi.c, ++ src/mips/ffi.c, src/mips/n32.S, src/mips/o32.S, ++ src/mips/ffitarget.h, src/sparc/ffi.c, src/x86/ffi64.c: ++ SIZEOF_ARG -> FFI_SIZEOF_ARG. ++ * src/ia64/ffi.c: Include stdbool.h (provided by GCC 2.95+). ++ * src/debug.c (ffi_assert): Accept stringized failed assertion. ++ (ffi_type_test): Rewritten. ++ * src/prep-cif.c (initialize_aggregate, ffi_prep_cif): Call ++ FFI_ASSERT_VALID_TYPE. ++ * src/alpha/ffitarget.h, src/arm/ffitarget.h, ++ src/ia64/ffitarget.h, src/m68k/ffitarget.h, ++ src/mips/ffitarget.h, src/powerpc/ffitarget.h, ++ src/s390/ffitarget.h, src/sh/ffitarget.h, ++ src/sh64/ffitarget.h, src/sparc/ffitarget.h, ++ src/x86/ffitarget.h: New files. ++ * src/alpha/osf.S, src/arm/sysv.S, src/ia64/unix.S, ++ src/m68k/sysv.S, src/mips/n32.S, src/mips/o32.S, ++ src/powerpc/aix.S, src/powerpc/darwin.S, ++ src/powerpc/ffi_darwin.c, src/powerpc/linux64.S, ++ src/powerpc/linux64_closure.S, src/powerpc/ppc_closure.S, ++ src/powerpc/sysv.S, src/s390/sysv.S, src/sh/sysv.S, ++ src/sh64/sysv.S, src/sparc/v8.S, src/sparc/v9.S, ++ src/x86/sysv.S, src/x86/unix64.S, src/x86/win32.S: ++ include fficonfig.h ++ ++2003-10-20 Rainer Orth ++ ++ * src/mips/ffi.c: Use _ABIN32, _ABIO32 instead of external ++ _MIPS_SIM_NABI32, _MIPS_SIM_ABI32. ++ ++2003-10-19 Andreas Tobler ++ ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Declare bytes again. ++ Used when FFI_DEBUG = 1. ++ ++2003-10-14 Alan Modra ++ ++ * src/types.c (double, longdouble): Default POWERPC64 to 8 byte size ++ and align. ++ ++2003-10-06 Rainer Orth ++ ++ * include/ffi_mips.h: Define FFI_MIPS_N32 for N32/N64 ABIs, ++ FFI_MIPS_O32 for O32 ABI. ++ ++2003-10-01 Andreas Tobler ++ ++ * testsuite/lib/libffi-dg.exp: Set LD_LIBRARY_PATH_64 for ++ SPARC64. Cleanup whitespaces. ++ ++2003-09-19 Andreas Tobler ++ ++ * testsuite/libffi.call/closure_fn0.c: Xfail mips, arm, ++ strongarm, xscale. Cleanup whitespaces. ++ * testsuite/libffi.call/closure_fn1.c: Likewise. ++ * testsuite/libffi.call/closure_fn2.c: Likewise. ++ * testsuite/libffi.call/closure_fn3.c: Likewise. ++ * testsuite/libffi.call/cls_12byte.c: Likewise. ++ * testsuite/libffi.call/cls_16byte.c: Likewise. ++ * testsuite/libffi.call/cls_1_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte.c: Likewise. ++ * testsuite/libffi.call/cls_24byte.c: Likewise. ++ * testsuite/libffi.call/cls_2byte.c: Likewise. ++ * testsuite/libffi.call/cls_3_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_3byte1.c: Likewise. ++ * testsuite/libffi.call/cls_3byte2.c: Likewise. ++ * testsuite/libffi.call/cls_4_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_4byte.c: Likewise. ++ * testsuite/libffi.call/cls_5byte.c: Likewise. ++ * testsuite/libffi.call/cls_6byte.c: Likewise. ++ * testsuite/libffi.call/cls_7byte.c: Likewise. ++ * testsuite/libffi.call/cls_8byte.c: Likewise. ++ * testsuite/libffi.call/cls_double.c: Likewise. ++ * testsuite/libffi.call/cls_float.c: Likewise. ++ * testsuite/libffi.call/cls_uchar.c: Likewise. ++ * testsuite/libffi.call/cls_uint.c: Likewise. ++ * testsuite/libffi.call/cls_ulonglong.c: Likewise. ++ * testsuite/libffi.call/cls_ushort.c: Likewise. ++ * testsuite/libffi.call/nested_struct.c: Likewise. ++ * testsuite/libffi.call/nested_struct1.c: Likewise. ++ * testsuite/libffi.call/problem1.c: Likewise. ++ * testsuite/libffi.special/unwindtest.cc: Likewise. ++ * testsuite/libffi.call/pyobjc-tc.c: Cleanup whitespaces. ++ ++2003-09-18 David Edelsohn ++ ++ * src/powerpc/aix.S: Cleanup whitespaces. ++ * src/powerpc/aix_closure.S: Likewise. ++ ++2003-09-18 Andreas Tobler ++ ++ * src/powerpc/darwin.S: Cleanup whitespaces, comment formatting. ++ * src/powerpc/darwin_closure.S: Likewise. ++ * src/powerpc/ffi_darwin.c: Likewise. ++ ++2003-09-18 Andreas Tobler ++ David Edelsohn ++ ++ * src/types.c (double): Add AIX and Darwin to the right TYPEDEF. ++ * src/powerpc/aix_closure.S: Remove the pointer to the outgoing ++ parameter stack. ++ * src/powerpc/darwin_closure.S: Likewise. ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Handle structures ++ according to the Darwin/AIX ABI. ++ (ffi_prep_cif_machdep): Likewise. ++ (ffi_closure_helper_DARWIN): Likewise. ++ Remove the outgoing parameter stack logic. Simplify the evaluation ++ of the different CASE types. ++ (ffi_prep_clousure): Avoid the casts on lvalues. Change the branch ++ statement in the trampoline code. ++ ++2003-09-18 Kaz Kojima ++ ++ * src/sh/ffi.c (ffi_prep_args): Take account into the alignement ++ for the register size. ++ (ffi_closure_helper_SYSV): Handle the structure return value ++ address correctly. ++ (ffi_closure_helper_SYSV): Return the appropriate type when ++ the registers are used for the structure return value. ++ * src/sh/sysv.S (ffi_closure_SYSV): Fix the stack layout for ++ the 64-bit return value. Update copyright years. ++ ++2003-09-17 Rainer Orth ++ ++ * testsuite/lib/libffi-dg.exp (libffi_target_compile): Search in ++ srcdir for ffi_mips.h. ++ ++2003-09-12 Alan Modra ++ ++ * src/prep_cif.c (initialize_aggregate): Include tail padding in ++ structure size. ++ * src/powerpc/linux64_closure.S (ffi_closure_LINUX64): Correct ++ placement of float result. ++ * testsuite/libffi.special/unwindtest.cc (closure_test_fn1): Correct ++ cast of "resp" for big-endian 64 bit machines. ++ ++2003-09-11 Alan Modra ++ ++ * src/types.c (double, longdouble): Merge identical SH and ARM ++ typedefs, and add POWERPC64. ++ * src/powerpc/ffi.c (ffi_prep_args64): Correct next_arg calc for ++ struct split over gpr and rest. ++ (ffi_prep_cif_machdep): Correct intarg_count for structures. ++ * src/powerpc/linux64.S (ffi_call_LINUX64): Fix gpr offsets. ++ ++2003-09-09 Andreas Tobler ++ ++ * src/powerpc/ffi.c (ffi_closure_helper_SYSV) Handle struct ++ passing correctly. ++ ++2003-09-09 Alan Modra ++ ++ * configure: Regenerate. ++ ++2003-09-04 Andreas Tobler ++ ++ * Makefile.am: Remove build rules for ffitest. ++ * Makefile.in: Rebuilt. ++ ++2003-09-04 Andreas Tobler ++ ++ * src/java_raw_api.c: Include to fix compiler warning ++ about implicit declaration of abort(). ++ ++2003-09-04 Andreas Tobler ++ ++ * Makefile.am: Add dejagnu test framework. Fixes PR other/11411. ++ * Makefile.in: Rebuilt. ++ * configure.in: Add dejagnu test framework. ++ * configure: Rebuilt. ++ ++ * testsuite/Makefile.am: New file. ++ * testsuite/Makefile.in: Built ++ * testsuite/lib/libffi-dg.exp: New file. ++ * testsuite/config/default.exp: Likewise. ++ * testsuite/libffi.call/call.exp: Likewise. ++ * testsuite/libffi.call/ffitest.h: Likewise. ++ * testsuite/libffi.call/closure_fn0.c: Likewise. ++ * testsuite/libffi.call/closure_fn1.c: Likewise. ++ * testsuite/libffi.call/closure_fn2.c: Likewise. ++ * testsuite/libffi.call/closure_fn3.c: Likewise. ++ * testsuite/libffi.call/cls_1_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_3_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_4_1byte.c: Likewise. ++ * testsuite/libffi.call/cls_2byte.c: Likewise. ++ * testsuite/libffi.call/cls_3byte1.c: Likewise. ++ * testsuite/libffi.call/cls_3byte2.c: Likewise. ++ * testsuite/libffi.call/cls_4byte.c: Likewise. ++ * testsuite/libffi.call/cls_5byte.c: Likewise. ++ * testsuite/libffi.call/cls_6byte.c: Likewise. ++ * testsuite/libffi.call/cls_7byte.c: Likewise. ++ * testsuite/libffi.call/cls_8byte.c: Likewise. ++ * testsuite/libffi.call/cls_12byte.c: Likewise. ++ * testsuite/libffi.call/cls_16byte.c: Likewise. ++ * testsuite/libffi.call/cls_20byte.c: Likewise. ++ * testsuite/libffi.call/cls_24byte.c: Likewise. ++ * testsuite/libffi.call/cls_double.c: Likewise. ++ * testsuite/libffi.call/cls_float.c: Likewise. ++ * testsuite/libffi.call/cls_uchar.c: Likewise. ++ * testsuite/libffi.call/cls_uint.c: Likewise. ++ * testsuite/libffi.call/cls_ulonglong.c: Likewise. ++ * testsuite/libffi.call/cls_ushort.c: Likewise. ++ * testsuite/libffi.call/float.c: Likewise. ++ * testsuite/libffi.call/float1.c: Likewise. ++ * testsuite/libffi.call/float2.c: Likewise. ++ * testsuite/libffi.call/many.c: Likewise. ++ * testsuite/libffi.call/many_win32.c: Likewise. ++ * testsuite/libffi.call/nested_struct.c: Likewise. ++ * testsuite/libffi.call/nested_struct1.c: Likewise. ++ * testsuite/libffi.call/pyobjc-tc.c: Likewise. ++ * testsuite/libffi.call/problem1.c: Likewise. ++ * testsuite/libffi.call/promotion.c: Likewise. ++ * testsuite/libffi.call/return_ll.c: Likewise. ++ * testsuite/libffi.call/return_sc.c: Likewise. ++ * testsuite/libffi.call/return_uc.c: Likewise. ++ * testsuite/libffi.call/strlen.c: Likewise. ++ * testsuite/libffi.call/strlen_win32.c: Likewise. ++ * testsuite/libffi.call/struct1.c: Likewise. ++ * testsuite/libffi.call/struct2.c: Likewise. ++ * testsuite/libffi.call/struct3.c: Likewise. ++ * testsuite/libffi.call/struct4.c: Likewise. ++ * testsuite/libffi.call/struct5.c: Likewise. ++ * testsuite/libffi.call/struct6.c: Likewise. ++ * testsuite/libffi.call/struct7.c: Likewise. ++ * testsuite/libffi.call/struct8.c: Likewise. ++ * testsuite/libffi.call/struct9.c: Likewise. ++ * testsuite/libffi.special/special.exp: New file. ++ * testsuite/libffi.special/ffitestcxx.h: Likewise. ++ * testsuite/libffi.special/unwindtest.cc: Likewise. ++ ++ ++2003-08-13 Kaz Kojima ++ ++ * src/sh/ffi.c (OFS_INT16): Set 0 for little endian case. Update ++ copyright years. ++ ++2003-08-02 Alan Modra ++ ++ * src/powerpc/ffi.c (ffi_prep_args64): Modify for changed gcc ++ structure passing. ++ (ffi_closure_helper_LINUX64): Likewise. ++ * src/powerpc/linux64.S: Remove code writing to parm save area. ++ * src/powerpc/linux64_closure.S (ffi_closure_LINUX64): Use return ++ address in lr from ffi_closure_helper_LINUX64 call to calculate ++ table address. Optimize function tail. ++ ++2003-07-28 Andreas Tobler ++ ++ * src/sparc/ffi.c: Handle all floating point registers. ++ * src/sparc/v9.S: Likewise. Fixes second part of PR target/11410. ++ ++2003-07-11 Gerald Pfeifer ++ ++ * README: Note that libffi is not part of GCC. Update the project ++ URL and status. ++ ++2003-06-19 Franz Sirl ++ ++ * src/powerpc/ppc_closure.S: Include ffi.h. ++ ++2003-06-13 Rainer Orth ++ ++ * src/x86/sysv.S: Avoid gas-only .uleb128/.sleb128 directives. ++ Use C style comments. ++ ++2003-06-13 Kaz Kojima ++ ++ * Makefile.am: Add SHmedia support. Fix a typo of SH support. ++ * Makefile.in: Regenerate. ++ * configure.in (sh64-*-linux*, sh5*-*-linux*): Add target. ++ * configure: Regenerate. ++ * include/ffi.h.in: Add SHmedia support. ++ * src/sh64/ffi.c: New file. ++ * src/sh64/sysv.S: New file. ++ ++2003-05-16 Jakub Jelinek ++ ++ * configure.in (HAVE_RO_EH_FRAME): Check whether .eh_frame section ++ should be read-only. ++ * configure: Rebuilt. ++ * fficonfig.h.in: Rebuilt. ++ * include/ffi.h.in (EH_FRAME_FLAGS): Define. ++ * src/alpha/osf.S: Use EH_FRAME_FLAGS. ++ * src/powerpc/linux64.S: Likewise. ++ * src/powerpc/linux64_closure.S: Likewise. Include ffi.h. ++ * src/powerpc/sysv.S: Use EH_FRAME_FLAGS. Use pcrel encoding ++ if -fpic/-fPIC/-mrelocatable. ++ * src/powerpc/powerpc_closure.S: Likewise. ++ * src/sparc/v8.S: If HAVE_RO_EH_FRAME is defined, don't include ++ #write in .eh_frame flags. ++ * src/sparc/v9.S: Likewise. ++ * src/x86/unix64.S: Use EH_FRAME_FLAGS. ++ * src/x86/sysv.S: Likewise. Use pcrel encoding if -fpic/-fPIC. ++ * src/s390/sysv.S: Use EH_FRAME_FLAGS. Include ffi.h. ++ ++2003-05-07 Jeff Sturm ++ ++ Fixes PR bootstrap/10656 ++ * configure.in (HAVE_AS_REGISTER_PSEUDO_OP): Test assembler ++ support for .register pseudo-op. ++ * src/sparc/v8.S: Use it. ++ * fficonfig.h.in: Rebuilt. ++ * configure: Rebuilt. ++ ++2003-04-18 Jakub Jelinek ++ ++ * include/ffi.h.in (POWERPC64): Define if 64-bit. ++ (enum ffi_abi): Add FFI_LINUX64 on POWERPC. ++ Make it the default on POWERPC64. ++ (FFI_TRAMPOLINE_SIZE): Define to 24 on POWERPC64. ++ * configure.in: Change powerpc-*-linux* into powerpc*-*-linux*. ++ * configure: Rebuilt. ++ * src/powerpc/ffi.c (hidden): Define. ++ (ffi_prep_args_SYSV): Renamed from ++ ffi_prep_args. Cast pointers to unsigned long to shut up warnings. ++ (NUM_GPR_ARG_REGISTERS64, NUM_FPR_ARG_REGISTERS64, ++ ASM_NEEDS_REGISTERS64): New. ++ (ffi_prep_args64): New function. ++ (ffi_prep_cif_machdep): Handle FFI_LINUX64 ABI. ++ (ffi_call): Likewise. ++ (ffi_prep_closure): Likewise. ++ (flush_icache): Surround by #ifndef POWERPC64. ++ (ffi_dblfl): New union type. ++ (ffi_closure_helper_SYSV): Use it to avoid aliasing problems. ++ (ffi_closure_helper_LINUX64): New function. ++ * src/powerpc/ppc_closure.S: Surround whole file by #ifndef ++ __powerpc64__. ++ * src/powerpc/sysv.S: Likewise. ++ (ffi_call_SYSV): Rename ffi_prep_args to ffi_prep_args_SYSV. ++ * src/powerpc/linux64.S: New file. ++ * src/powerpc/linux64_closure.S: New file. ++ * Makefile.am (EXTRA_DIST): Add src/powerpc/linux64.S and ++ src/powerpc/linux64_closure.S. ++ (TARGET_SRC_POWERPC): Likewise. ++ ++ * src/ffitest.c (closure_test_fn, closure_test_fn1, closure_test_fn2, ++ closure_test_fn3): Fix result printing on big-endian 64-bit ++ machines. ++ (main): Print tst2_arg instead of uninitialized tst2_result. ++ ++ * src/ffitest.c (main): Hide what closure pointer really points to ++ from the compiler. ++ ++2003-04-16 Richard Earnshaw ++ ++ * configure.in (arm-*-netbsdelf*): Add configuration. ++ (configure): Regenerated. ++ ++2003-04-04 Loren J. Rittle ++ ++ * include/Makefile.in: Regenerate. ++ ++2003-03-21 Zdenek Dvorak ++ ++ * libffi/include/ffi.h.in: Define X86 instead of X86_64 in 32 ++ bit mode. ++ * libffi/src/x86/ffi.c (ffi_closure_SYSV, ffi_closure_raw_SYSV): ++ Receive closure pointer through parameter, read args using ++ __builtin_dwarf_cfa. ++ (FFI_INIT_TRAMPOLINE): Send closure reference through eax. ++ ++2003-03-12 Andreas Schwab ++ ++ * configure.in: Avoid trailing /. in toolexeclibdir. ++ * configure: Rebuilt. ++ ++2003-03-03 Andreas Tobler ++ ++ * src/powerpc/darwin_closure.S: Recode to fit dynamic libraries. ++ ++2003-02-06 Andreas Tobler ++ ++ * libffi/src/powerpc/darwin_closure.S: ++ Fix alignement bug, allocate 8 bytes for the result. ++ * libffi/src/powerpc/aix_closure.S: ++ Likewise. ++ * libffi/src/powerpc/ffi_darwin.c: ++ Update stackframe description for aix/darwin_closure.S. ++ ++2003-02-06 Jakub Jelinek ++ ++ * src/s390/ffi.c (ffi_closure_helper_SYSV): Add hidden visibility ++ attribute. ++ ++2003-01-31 Christian Cornelssen , ++ Andreas Schwab ++ ++ * configure.in: Adjust command to source config-ml.in to account ++ for changes to the libffi_basedir definition. ++ (libffi_basedir): Remove ${srcdir} from value and include trailing ++ slash if nonempty. ++ ++ * configure: Regenerate. ++ ++2003-01-29 Franz Sirl ++ ++ * src/powerpc/ppc_closure.S: Recode to fit shared libs. ++ ++2003-01-28 Andrew Haley ++ ++ * include/ffi.h.in: Enable FFI_CLOSURES for x86_64. ++ * src/x86/ffi64.c (ffi_prep_closure): New. ++ (ffi_closure_UNIX64_inner): New. ++ * src/x86/unix64.S (ffi_closure_UNIX64): New. ++ ++2003-01-27 Alexandre Oliva ++ ++ * configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST. ++ Remove USE_LIBDIR conditional. ++ * Makefile.am (toolexecdir, toolexeclibdir): Don't override. ++ * Makefile.in, configure: Rebuilt. ++ ++2003-01027 David Edelsohn ++ ++ * Makefile.am (TARGET_SRC_POWERPC_AIX): Fix typo. ++ * Makefile.in: Regenerate. ++ ++2003-01-22 Andrew Haley ++ ++ * src/powerpc/darwin.S (_ffi_call_AIX): Add Augmentation size to ++ unwind info. ++ ++2003-01-21 Andreas Tobler ++ ++ * src/powerpc/darwin.S: Add unwind info. ++ * src/powerpc/darwin_closure.S: Likewise. ++ ++2003-01-14 Andrew Haley ++ ++ * src/x86/ffi64.c (ffi_prep_args): Check for void retval. ++ (ffi_prep_cif_machdep): Likewise. ++ * src/x86/unix64.S: Add unwind info. ++ ++2003-01-14 Andreas Jaeger ++ ++ * src/ffitest.c (main): Only use ffi_closures if those are ++ supported. ++ ++2003-01-13 Andreas Tobler ++ ++ * libffi/src/ffitest.c ++ add closure testcases ++ ++2003-01-13 Kevin B. Hendricks ++ ++ * libffi/src/powerpc/ffi.c ++ fix alignment bug for float (4 byte aligned iso 8 byte) ++ ++2003-01-09 Geoffrey Keating ++ ++ * src/powerpc/ffi_darwin.c: Remove RCS version string. ++ * src/powerpc/darwin.S: Remove RCS version string. ++ ++2003-01-03 Jeff Sturm ++ ++ * include/ffi.h.in: Add closure defines for SPARC, SPARC64. ++ * src/ffitest.c (main): Use static storage for closure. ++ * src/sparc/ffi.c (ffi_prep_closure, ffi_closure_sparc_inner): New. ++ * src/sparc/v8.S (ffi_closure_v8): New. ++ * src/sparc/v9.S (ffi_closure_v9): New. ++ ++2002-11-10 Ranjit Mathew ++ ++ * include/ffi.h.in: Added FFI_STDCALL ffi_type ++ enumeration for X86_WIN32. ++ * src/x86/win32.S: Added ffi_call_STDCALL function ++ definition. ++ * src/x86/ffi.c (ffi_call/ffi_raw_call): Added ++ switch cases for recognising FFI_STDCALL and ++ calling ffi_call_STDCALL if target is X86_WIN32. ++ * src/ffitest.c (my_stdcall_strlen/stdcall_many): ++ stdcall versions of the "my_strlen" and "many" ++ test functions (for X86_WIN32). ++ Added test cases to test stdcall invocation using ++ these functions. ++ ++2002-12-02 Kaz Kojima ++ ++ * src/sh/sysv.S: Add DWARF2 unwind info. ++ ++2002-11-27 Ulrich Weigand ++ ++ * src/s390/sysv.S (.eh_frame section): Make section read-only. ++ ++2002-11-26 Jim Wilson ++ ++ * src/types.c (FFI_TYPE_POINTER): Has size 8 on IA64. ++ ++2002-11-23 H.J. Lu ++ ++ * acinclude.m4: Add dummy AM_PROG_LIBTOOL. ++ Include ../config/accross.m4. ++ * aclocal.m4; Rebuild. ++ * configure: Likewise. ++ ++2002-11-15 Ulrich Weigand ++ ++ * src/s390/sysv.S (.eh_frame section): Adapt to pcrel FDE encoding. ++ ++2002-11-11 DJ Delorie ++ ++ * configure.in: Look for common files in the right place. ++ ++2002-10-08 Ulrich Weigand ++ ++ * src/java_raw_api.c (ffi_java_raw_to_ptrarray): Interpret ++ raw data as _Jv_word values, not ffi_raw. ++ (ffi_java_ptrarray_to_raw): Likewise. ++ (ffi_java_rvalue_to_raw): New function. ++ (ffi_java_raw_call): Call it. ++ (ffi_java_raw_to_rvalue): New function. ++ (ffi_java_translate_args): Call it. ++ * src/ffitest.c (closure_test_fn): Interpret return value ++ as ffi_arg, not int. ++ * src/s390/ffi.c (ffi_prep_cif_machdep): Add missing ++ FFI_TYPE_POINTER case. ++ (ffi_closure_helper_SYSV): Likewise. Also, assume return ++ values extended to word size. ++ ++2002-10-02 Andreas Jaeger ++ ++ * src/x86/ffi64.c (ffi_prep_cif_machdep): Remove debug output. ++ ++2002-10-01 Bo Thorsen ++ ++ * include/ffi.h.in: Fix i386 win32 compilation. ++ ++2002-09-30 Ulrich Weigand ++ ++ * configure.in: Add s390x-*-linux-* target. ++ * configure: Regenerate. ++ * include/ffi.h.in: Define S390X for s390x targets. ++ (FFI_CLOSURES): Define for s390/s390x. ++ (FFI_TRAMPOLINE_SIZE): Likewise. ++ (FFI_NATIVE_RAW_API): Likewise. ++ * src/prep_cif.c (ffi_prep_cif): Do not compute stack space for s390. ++ * src/types.c (FFI_TYPE_POINTER): Use 8-byte pointers on s390x. ++ * src/s390/ffi.c: Major rework of existing code. Add support for ++ s390x targets. Add closure support. ++ * src/s390/sysv.S: Likewise. ++ ++2002-09-29 Richard Earnshaw ++ ++ * src/arm/sysv.S: Fix typo. ++ ++2002-09-28 Richard Earnshaw ++ ++ * src/arm/sysv.S: If we don't have machine/asm.h and the pre-processor ++ has defined __USER_LABEL_PREFIX__, then use it in CNAME. ++ (ffi_call_SYSV): Handle soft-float. ++ ++2002-09-27 Bo Thorsen ++ ++ * include/ffi.h.in: Fix multilib x86-64 support. ++ ++2002-09-22 Kaveh R. Ghazi ++ ++ * Makefile.am (all-multi): Fix multilib parallel build. ++ ++2002-07-19 Kaz Kojima ++ ++ * configure.in (sh[34]*-*-linux*): Add brackets. ++ * configure: Regenerate. ++ ++2002-07-18 Kaz Kojima ++ ++ * Makefile.am: Add SH support. ++ * Makefile.in: Regenerate. ++ * configure.in (sh-*-linux*, sh[34]*-*-linux*): Add target. ++ * configure: Regenerate. ++ * include/ffi.h.in: Add SH support. ++ * src/sh/ffi.c: New file. ++ * src/sh/sysv.S: New file. ++ * src/types.c: Add SH support. ++ ++2002-07-16 Bo Thorsen ++ ++ * src/x86/ffi64.c: New file that adds x86-64 support. ++ * src/x86/unix64.S: New file that handles argument setup for ++ x86-64. ++ * src/x86/sysv.S: Don't use this on x86-64. ++ * src/x86/ffi.c: Don't use this on x86-64. ++ Remove unused vars. ++ * src/prep_cif.c (ffi_prep_cif): Don't do stack size calculation ++ for x86-64. ++ * src/ffitest.c (struct6): New test that tests a special case in ++ the x86-64 ABI. ++ (struct7): Likewise. ++ (struct8): Likewise. ++ (struct9): Likewise. ++ (closure_test_fn): Silence warning about this when it's not used. ++ (main): Add the new tests. ++ (main): Fix a couple of wrong casts and silence some compiler warnings. ++ * include/ffi.h.in: Add x86-64 ABI definition. ++ * fficonfig.h.in: Regenerate. ++ * Makefile.am: Add x86-64 support. ++ * configure.in: Likewise. ++ * Makefile.in: Regenerate. ++ * configure: Likewise. ++ ++2002-06-24 Bo Thorsen ++ ++ * src/types.c: Merge settings for similar architectures. ++ Add x86-64 sizes and alignments. ++ ++2002-06-23 Bo Thorsen ++ ++ * src/arm/ffi.c (ffi_prep_args): Remove unused vars. ++ * src/sparc/ffi.c (ffi_prep_args_v8): Likewise. ++ * src/mips/ffi.c (ffi_prep_args): Likewise. ++ * src/m68k/ffi.c (ffi_prep_args): Likewise. ++ ++2002-07-18 H.J. Lu (hjl@gnu.org) ++ ++ * Makefile.am (TARGET_SRC_MIPS_LINUX): New. ++ (libffi_la_SOURCES): Support MIPS_LINUX. ++ (libffi_convenience_la_SOURCES): Likewise. ++ * Makefile.in: Regenerated. ++ ++ * configure.in (mips64*-*): Skip. ++ (mips*-*-linux*): New. ++ * configure: Regenerated. ++ ++ * src/mips/ffi.c: Include . ++ ++2002-06-06 Ulrich Weigand ++ ++ * src/s390/sysv.S: Save/restore %r6. Add DWARF-2 unwind info. ++ ++2002-05-27 Roger Sayle ++ ++ * src/x86/ffi.c (ffi_prep_args): Remove reference to avn. ++ ++2002-05-27 Bo Thorsen ++ ++ * src/x86/ffi.c (ffi_prep_args): Remove unused variable and ++ fix formatting. ++ ++2002-05-13 Andreas Tobler ++ ++ * src/powerpc/ffi_darwin.c (ffi_prep_closure): Declare fd at ++ beginning of function (for older apple cc). ++ ++2002-05-08 Alexandre Oliva ++ ++ * configure.in (ORIGINAL_LD_FOR_MULTILIBS): Preserve LD at ++ script entry, and set LD to it when configuring multilibs. ++ * configure: Rebuilt. ++ ++2002-05-05 Jason Thorpe ++ ++ * configure.in (sparc64-*-netbsd*): Add target. ++ (sparc-*-netbsdelf*): Likewise. ++ * configure: Regenerate. ++ ++2002-04-28 David S. Miller ++ ++ * configure.in, configure: Fix SPARC test in previous change. ++ ++2002-04-29 Gerhard Tonn ++ ++ * Makefile.am: Add Linux for S/390 support. ++ * Makefile.in: Regenerate. ++ * configure.in: Add Linux for S/390 support. ++ * configure: Regenerate. ++ * include/ffi.h.in: Add Linux for S/390 support. ++ * src/s390/ffi.c: New file from libffi CVS tree. ++ * src/s390/sysv.S: New file from libffi CVS tree. ++ ++2002-04-28 Jakub Jelinek ++ ++ * configure.in (HAVE_AS_SPARC_UA_PCREL): Check for working ++ %r_disp32(). ++ * src/sparc/v8.S: Use it. ++ * src/sparc/v9.S: Likewise. ++ * fficonfig.h.in: Rebuilt. ++ * configure: Rebuilt. ++ ++2002-04-08 Hans Boehm ++ ++ * src/java_raw_api.c (ffi_java_raw_size): Handle FFI_TYPE_DOUBLE ++ correctly. ++ * src/ia64/unix.S: Add unwind information. Fix comments. ++ Save sp in a way that's compatible with unwind info. ++ (ffi_call_unix): Correctly restore sp in all cases. ++ * src/ia64/ffi.c: Add, fix comments. ++ ++2002-04-08 Jakub Jelinek ++ ++ * src/sparc/v8.S: Make .eh_frame dependent on target word size. ++ ++2002-04-06 Jason Thorpe ++ ++ * configure.in (alpha*-*-netbsd*): Add target. ++ * configure: Regenerate. ++ ++2002-04-04 Jeff Sturm ++ ++ * src/sparc/v8.S: Add unwind info. ++ * src/sparc/v9.S: Likewise. ++ ++2002-03-30 Krister Walfridsson ++ ++ * configure.in: Enable i*86-*-netbsdelf*. ++ * configure: Rebuilt. ++ ++2002-03-29 David Billinghurst ++ ++ PR other/2620 ++ * src/mips/n32.s: Delete ++ * src/mips/o32.s: Delete ++ ++2002-03-21 Loren J. Rittle ++ ++ * configure.in: Enable alpha*-*-freebsd*. ++ * configure: Rebuilt. ++ ++2002-03-17 Bryce McKinlay ++ ++ * Makefile.am: libfficonvenience -> libffi_convenience. ++ * Makefile.in: Rebuilt. ++ ++ * Makefile.am: Define ffitest_OBJECTS. ++ * Makefile.in: Rebuilt. ++ ++2002-03-07 Andreas Tobler ++ David Edelsohn ++ ++ * Makefile.am (EXTRA_DIST): Add Darwin and AIX closure files. ++ (TARGET_SRC_POWERPC_AIX): Add aix_closure.S. ++ (TARGET_SRC_POWERPC_DARWIN): Add darwin_closure.S. ++ * Makefile.in: Regenerate. ++ * include/ffi.h.in: Add AIX and Darwin closure definitions. ++ * src/powerpc/ffi_darwin.c (ffi_prep_closure): New function. ++ (flush_icache, flush_range): New functions. ++ (ffi_closure_helper_DARWIN): New function. ++ * src/powerpc/aix_closure.S: New file. ++ * src/powerpc/darwin_closure.S: New file. ++ ++2002-02-24 Jeff Sturm ++ ++ * include/ffi.h.in: Add typedef for ffi_arg. ++ * src/ffitest.c (main): Declare rint with ffi_arg. ++ ++2002-02-21 Andreas Tobler ++ ++ * src/powerpc/ffi_darwin.c (ffi_prep_args): Skip appropriate ++ number of GPRs for floating-point arguments. ++ ++2002-01-31 Anthony Green ++ ++ * configure: Rebuilt. ++ * configure.in: Replace CHECK_SIZEOF and endian tests with ++ cross-compiler friendly macros. ++ * aclocal.m4 (AC_COMPILE_CHECK_SIZEOF, AC_C_BIGENDIAN_CROSS): New ++ macros. ++ ++2002-01-18 David Edelsohn ++ ++ * src/powerpc/darwin.S (_ffi_call_AIX): New. ++ * src/powerpc/aix.S (ffi_call_DARWIN): New. ++ ++2002-01-17 David Edelsohn ++ ++ * Makefile.am (EXTRA_DIST): Add Darwin and AIX files. ++ (TARGET_SRC_POWERPC_AIX): New. ++ (POWERPC_AIX): New stanza. ++ * Makefile.in: Regenerate. ++ * configure.in: Add AIX case. ++ * configure: Regenerate. ++ * include/ffi.h.in (ffi_abi): Add FFI_AIX. ++ * src/powerpc/ffi_darwin.c (ffi_status): Use "long" to scale frame ++ size. Fix "long double" support. ++ (ffi_call): Add FFI_AIX case. ++ * src/powerpc/aix.S: New. ++ ++2001-10-09 John Hornkvist ++ ++ Implement Darwin PowerPC ABI. ++ * configure.in: Handle powerpc-*-darwin*. ++ * Makefile.am: Set source files for POWERPC_DARWIN. ++ * configure: Rebuilt. ++ * Makefile.in: Rebuilt. ++ * include/ffi.h.in: Define FFI_DARWIN and FFI_DEFAULT_ABI for ++ POWERPC_DARWIN. ++ * src/powerpc/darwin.S: New file. ++ * src/powerpc/ffi_darwin.c: New file. ++ ++2001-10-07 Joseph S. Myers ++ ++ * src/x86/ffi.c: Fix spelling error of "separate" as "seperate". ++ ++2001-07-16 Rainer Orth ++ ++ * src/x86/sysv.S: Avoid gas-only .balign directive. ++ Use C style comments. ++ ++2001-07-16 Rainer Orth ++ ++ * src/alpha/ffi.c (ffi_prep_closure): Avoid gas-only mnemonic. ++ Fixes PR bootstrap/3563. ++ ++2001-06-26 Rainer Orth ++ ++ * src/alpha/osf.S (ffi_closure_osf): Use .rdata for ECOFF. ++ ++2001-06-25 Rainer Orth ++ ++ * configure.in: Recognize sparc*-sun-* host. ++ * configure: Regenerate. ++ ++2001-06-06 Andrew Haley ++ ++ * src/alpha/osf.S (__FRAME_BEGIN__): Conditionalize for ELF. ++ ++2001-06-03 Andrew Haley ++ ++ * src/alpha/osf.S: Add unwind info. ++ * src/powerpc/sysv.S: Add unwind info. ++ * src/powerpc/ppc_closure.S: Likewise. ++ ++2000-05-31 Jeff Sturm ++ ++ * configure.in: Fix AC_ARG_ENABLE usage. ++ * configure: Rebuilt. ++ ++2001-05-06 Bryce McKinlay ++ ++ * configure.in: Remove warning about beta code. ++ * configure: Rebuilt. ++ ++2001-04-25 Hans Boehm ++ ++ * src/ia64/unix.S: Restore stack pointer when returning from ++ ffi_closure_UNIX. ++ * src/ia64/ffi.c: Fix typo in comment. ++ ++2001-04-18 Jim Wilson ++ ++ * src/ia64/unix.S: Delete unnecessary increment and decrement of loc2 ++ to eliminate RAW DV. ++ ++2001-04-12 Bryce McKinlay ++ ++ * Makefile.am: Make a libtool convenience library. ++ * Makefile.in: Rebuilt. ++ ++2001-03-29 Bryce McKinlay ++ ++ * configure.in: Use different syntax for subdirectory creation. ++ * configure: Rebuilt. ++ ++2001-03-27 Jon Beniston ++ ++ * configure.in: Added X86_WIN32 target (Win32, CygWin, MingW). ++ * configure: Rebuilt. ++ * Makefile.am: Added X86_WIN32 target support. ++ * Makefile.in: Rebuilt. ++ ++ * include/ffi.h.in: Added X86_WIN32 target support. ++ ++ * src/ffitest.c: Doesn't run structure tests for X86_WIN32 targets. ++ * src/types.c: Added X86_WIN32 target support. ++ ++ * src/x86/win32.S: New file. Based on sysv.S, but with EH ++ stuff removed and made to work with CygWin's gas. ++ ++2001-03-26 Bryce McKinlay ++ ++ * configure.in: Make target subdirectory in build dir. ++ * Makefile.am: Override suffix based rules to specify correct output ++ subdirectory. ++ * Makefile.in: Rebuilt. ++ * configure: Rebuilt. ++ ++2001-03-23 Kevin B Hendricks ++ ++ * src/powerpc/ppc_closure.S: New file. ++ * src/powerpc/ffi.c (ffi_prep_args): Fixed ABI compatibility bug ++ involving long long and register pairs. ++ (ffi_prep_closure): New function. ++ (flush_icache): Likewise. ++ (ffi_closure_helper_SYSV): Likewise. ++ * include/ffi.h.in (FFI_CLOSURES): Define on PPC. ++ (FFI_TRAMPOLINE_SIZE): Likewise. ++ (FFI_NATIVE_RAW_API): Likewise. ++ * Makefile.in: Rebuilt. ++ * Makefile.am (EXTRA_DIST): Added src/powerpc/ppc_closure.S. ++ (TARGET_SRC_POWERPC): Likewise. ++ ++2001-03-19 Tom Tromey ++ ++ * Makefile.in: Rebuilt. ++ * Makefile.am (ffitest_LDFLAGS): New macro. ++ ++2001-03-02 Nick Clifton ++ ++ * include/ffi.h.in: Remove RCS ident string. ++ * include/ffi_mips.h: Remove RCS ident string. ++ * src/debug.c: Remove RCS ident string. ++ * src/ffitest.c: Remove RCS ident string. ++ * src/prep_cif.c: Remove RCS ident string. ++ * src/types.c: Remove RCS ident string. ++ * src/alpha/ffi.c: Remove RCS ident string. ++ * src/alpha/osf.S: Remove RCS ident string. ++ * src/arm/ffi.c: Remove RCS ident string. ++ * src/arm/sysv.S: Remove RCS ident string. ++ * src/mips/ffi.c: Remove RCS ident string. ++ * src/mips/n32.S: Remove RCS ident string. ++ * src/mips/o32.S: Remove RCS ident string. ++ * src/sparc/ffi.c: Remove RCS ident string. ++ * src/sparc/v8.S: Remove RCS ident string. ++ * src/sparc/v9.S: Remove RCS ident string. ++ * src/x86/ffi.c: Remove RCS ident string. ++ * src/x86/sysv.S: Remove RCS ident string. ++ ++2001-02-08 Joseph S. Myers ++ ++ * include/ffi.h.in: Change sourceware.cygnus.com references to ++ gcc.gnu.org. ++ ++2000-12-09 Richard Henderson ++ ++ * src/alpha/ffi.c (ffi_call): Simplify struct return test. ++ (ffi_closure_osf_inner): Index rather than increment avalue ++ and arg_types. Give ffi_closure_osf the raw return value type. ++ * src/alpha/osf.S (ffi_closure_osf): Handle return value type ++ promotion. ++ ++2000-12-07 Richard Henderson ++ ++ * src/raw_api.c (ffi_translate_args): Fix typo. ++ (ffi_prep_closure): Likewise. ++ ++ * include/ffi.h.in [ALPHA]: Define FFI_CLOSURES and ++ FFI_TRAMPOLINE_SIZE. ++ * src/alpha/ffi.c (ffi_prep_cif_machdep): Adjust minimal ++ cif->bytes for new ffi_call_osf implementation. ++ (ffi_prep_args): Absorb into ... ++ (ffi_call): ... here. Do all stack allocation here and ++ avoid a callback function. ++ (ffi_prep_closure, ffi_closure_osf_inner): New. ++ * src/alpha/osf.S (ffi_call_osf): Reimplement with no callback. ++ (ffi_closure_osf): New. ++ ++2000-09-10 Alexandre Oliva ++ ++ * config.guess, config.sub, install-sh: Removed. ++ * ltconfig, ltmain.sh, missing, mkinstalldirs: Likewise. ++ * Makefile.in: Rebuilt. ++ ++ * acinclude.m4: Include libtool macros from the top level. ++ * aclocal.m4, configure: Rebuilt. ++ ++2000-08-22 Alexandre Oliva ++ ++ * configure.in [i*86-*-freebsd*] (TARGET, TARGETDIR): Set. ++ * configure: Rebuilt. ++ ++2000-05-11 Scott Bambrough ++ ++ * libffi/src/arm/sysv.S (ffi_call_SYSV): Doubles are not saved to ++ memory correctly. Use conditional instructions, not branches where ++ possible. ++ ++2000-05-04 Tom Tromey ++ ++ * configure: Rebuilt. ++ * configure.in: Match `arm*-*-linux-*'. ++ From Chris Dornan . ++ ++2000-04-28 Jakub Jelinek ++ ++ * Makefile.am (SUBDIRS): Define. ++ (AM_MAKEFLAGS): Likewise. ++ (Multilib support.): Add section. ++ * Makefile.in: Rebuilt. ++ * ltconfig (extra_compiler_flags, extra_compiler_flags_value): ++ New variables. Set for gcc using -print-multi-lib. Export them ++ to libtool. ++ (sparc64-*-linux-gnu*): Use libsuff 64 for search paths. ++ * ltmain.sh (B|b|V): Don't throw away gcc's -B, -b and -V options ++ for -shared links. ++ (extra_compiler_flags_value, extra_compiler_flags): Check these ++ for extra compiler options which need to be passed down in ++ compiler_flags. ++ ++2000-04-16 Anthony Green ++ ++ * configure: Rebuilt. ++ * configure.in: Change i*86-pc-linux* to i*86-*-linux*. ++ ++2000-04-14 Jakub Jelinek ++ ++ * include/ffi.h.in (SPARC64): Define for 64bit SPARC builds. ++ Set SPARC FFI_DEFAULT_ABI based on SPARC64 define. ++ * src/sparc/ffi.c (ffi_prep_args_v8): Renamed from ffi_prep_args. ++ Replace all void * sizeofs with sizeof(int). ++ Only compare type with FFI_TYPE_LONGDOUBLE if LONGDOUBLE is ++ different than DOUBLE. ++ Remove FFI_TYPE_SINT32 and FFI_TYPE_UINT32 cases (handled elsewhere). ++ (ffi_prep_args_v9): New function. ++ (ffi_prep_cif_machdep): Handle V9 ABI and long long on V8. ++ (ffi_V9_return_struct): New function. ++ (ffi_call): Handle FFI_V9 ABI from 64bit code and FFI_V8 ABI from ++ 32bit code (not yet cross-arch calls). ++ * src/sparc/v8.S: Add struct return delay nop. ++ Handle long long. ++ * src/sparc/v9.S: New file. ++ * src/prep_cif.c (ffi_prep_cif): Return structure pointer ++ is used on sparc64 only for structures larger than 32 bytes. ++ Pass by reference for structures is done for structure arguments ++ larger than 16 bytes. ++ * src/ffitest.c (main): Use 64bit rint on sparc64. ++ Run long long tests on sparc. ++ * src/types.c (FFI_TYPE_POINTER): Pointer is 64bit on alpha and ++ sparc64. ++ (FFI_TYPE_LONGDOUBLE): long double is 128 bit aligned to 128 bits ++ on sparc64. ++ * configure.in (sparc-*-linux*): New supported target. ++ (sparc64-*-linux*): Likewise. ++ * configure: Rebuilt. ++ * Makefile.am: Add v9.S to SPARC files. ++ * Makefile.in: Likewise. ++ (LINK): Surround $(CCLD) into double quotes, so that multilib ++ compiles work correctly. ++ ++2000-04-04 Alexandre Petit-Bianco ++ ++ * configure: Rebuilt. ++ * configure.in: (i*86-*-solaris*): New libffi target. Patch ++ proposed by Bryce McKinlay. ++ ++2000-03-20 Tom Tromey ++ ++ * Makefile.in: Hand edit for java_raw_api.lo. ++ ++2000-03-08 Bryce McKinlay ++ ++ * config.guess, config.sub: Update from the gcc tree. ++ Fix for PR libgcj/168. ++ ++2000-03-03 Tom Tromey ++ ++ * Makefile.in: Fixed ia64 by hand. ++ ++ * configure: Rebuilt. ++ * configure.in (--enable-multilib): New option. ++ (libffi_basedir): New subst. ++ (AC_OUTPUT): Added multilib code. ++ ++2000-03-02 Tom Tromey ++ ++ * Makefile.in: Rebuilt. ++ * Makefile.am (TARGET_SRC_IA64): Use `ia64', not `alpha', as ++ directory name. ++ ++2000-02-25 Hans Boehm ++ ++ * src/ia64/ffi.c, src/ia64/ia64_flags.h, src/ia64/unix.S: New ++ files. ++ * src/raw_api.c (ffi_translate_args): Fixed typo in argument ++ list. ++ (ffi_prep_raw_closure): Use ffi_translate_args, not ++ ffi_closure_translate. ++ * src/java_raw_api.c: New file. ++ * src/ffitest.c (closure_test_fn): New function. ++ (main): Define `rint' as long long on IA64. Added new test when ++ FFI_CLOSURES is defined. ++ * include/ffi.h.in (ALIGN): Use size_t, not unsigned. ++ (ffi_abi): Recognize IA64. ++ (ffi_raw): Added `flt' field. ++ Added "Java raw API" code. ++ * configure.in: Recognize ia64. ++ * Makefile.am (TARGET_SRC_IA64): New macro. ++ (libffi_la_common_SOURCES): Added java_raw_api.c. ++ (libffi_la_SOURCES): Define in IA64 case. ++ ++2000-01-04 Tom Tromey ++ ++ * Makefile.in: Rebuilt with newer automake. ++ ++1999-12-31 Tom Tromey ++ ++ * Makefile.am (INCLUDES): Added -I$(top_srcdir)/src. ++ ++1999-09-01 Tom Tromey ++ ++ * include/ffi.h.in: Removed PACKAGE and VERSION defines and ++ undefs. ++ * fficonfig.h.in: Rebuilt. ++ * configure: Rebuilt. ++ * configure.in: Pass 3rd argument to AM_INIT_AUTOMAKE. ++ Use AM_PROG_LIBTOOL (automake 1.4 compatibility). ++ * acconfig.h: Don't #undef PACKAGE or VERSION. ++ ++1999-08-09 Anthony Green ++ ++ * include/ffi.h.in: Try to work around messy header problem ++ with PACKAGE and VERSION. ++ ++ * configure: Rebuilt. ++ * configure.in: Change version to 2.00-beta. ++ ++ * fficonfig.h.in: Rebuilt. ++ * acconfig.h (FFI_NO_STRUCTS, FFI_NO_RAW_API): Define. ++ ++ * src/x86/ffi.c (ffi_raw_call): Rename. ++ ++1999-08-02 Kresten Krab Thorup ++ ++ * src/x86/ffi.c (ffi_closure_SYSV): New function. ++ (ffi_prep_incoming_args_SYSV): Ditto. ++ (ffi_prep_closure): Ditto. ++ (ffi_closure_raw_SYSV): Ditto. ++ (ffi_prep_raw_closure): More ditto. ++ (ffi_call_raw): Final ditto. ++ ++ * include/ffi.h.in: Add definitions for closure and raw API. ++ ++ * src/x86/ffi.c (ffi_prep_cif_machdep): Added case for ++ FFI_TYPE_UINT64. ++ ++ * Makefile.am (libffi_la_common_SOURCES): Added raw_api.c ++ ++ * src/raw_api.c: New file. ++ ++ * include/ffi.h.in (ffi_raw): New type. ++ (UINT_ARG, SINT_ARG): New defines. ++ (ffi_closure, ffi_raw_closure): New types. ++ (ffi_prep_closure, ffi_prep_raw_closure): New declarations. ++ ++ * configure.in: Add check for endianness and sizeof void*. ++ ++ * src/x86/sysv.S (ffi_call_SYSV): Call fixup routine via argument, ++ instead of directly. ++ ++ * configure: Rebuilt. ++ ++Thu Jul 8 14:28:42 1999 Anthony Green ++ ++ * configure.in: Add x86 and powerpc BeOS configurations. ++ From Makoto Kato . ++ ++1999-05-09 Anthony Green ++ ++ * configure.in: Add warning about this being beta code. ++ Remove src/Makefile.am from the picture. ++ * configure: Rebuilt. ++ ++ * Makefile.am: Move logic from src/Makefile.am. Add changes ++ to support libffi as a target library. ++ * Makefile.in: Rebuilt. ++ ++ * aclocal.m4, config.guess, config.sub, ltconfig, ltmain.sh: ++ Upgraded to new autoconf, automake, libtool. ++ ++ * README: Tweaks. ++ ++ * LICENSE: Update copyright date. ++ ++ * src/Makefile.am, src/Makefile.in: Removed. ++ ++1998-11-29 Anthony Green ++ ++ * include/ChangeLog: Removed. ++ * src/ChangeLog: Removed. ++ * src/mips/ChangeLog: Removed. ++ * src/sparc/ChangeLog: Remboved. ++ * src/x86/ChangeLog: Removed. ++ ++ * ChangeLog.v1: Created. +diff -r ee879c0ffa11 Modules/_ctypes/libffi/ChangeLog.v1 +--- a/Modules/_ctypes/libffi/ChangeLog.v1 ++++ b/Modules/_ctypes/libffi/ChangeLog.v1 +@@ -2,7 +2,7 @@ + + Version 1 of libffi had per-directory ChangeLogs. Current and future + versions have a single ChangeLog file in the root directory. The +-version 1 ChangeLogs have all been concatonated into this file for ++version 1 ChangeLogs have all been concatenated into this file for + future reference only. + + --- libffi ---------------------------------------------------------------- +diff -r ee879c0ffa11 Modules/_ctypes/libffi/LICENSE +--- a/Modules/_ctypes/libffi/LICENSE ++++ b/Modules/_ctypes/libffi/LICENSE +@@ -1,4 +1,4 @@ +-libffi - Copyright (c) 1996-2012 Anthony Green, Red Hat, Inc and others. ++libffi - Copyright (c) 1996-2014 Anthony Green, Red Hat, Inc and others. + See source files for details. + + Permission is hereby granted, free of charge, to any person obtaining +diff -r ee879c0ffa11 Modules/_ctypes/libffi/Makefile.am +--- a/Modules/_ctypes/libffi/Makefile.am ++++ b/Modules/_ctypes/libffi/Makefile.am +@@ -6,10 +6,11 @@ + + SUBDIRS = include testsuite man + +-EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ ++EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj \ + src/aarch64/ffi.c src/aarch64/ffitarget.h src/aarch64/sysv.S \ +- build-ios.sh src/alpha/ffi.c src/alpha/osf.S \ +- src/alpha/ffitarget.h src/arm/ffi.c src/arm/sysv.S \ ++ src/alpha/ffi.c src/alpha/osf.S \ ++ src/alpha/ffitarget.h src/arc/ffi.c src/arc/arcompact.S \ ++ src/arc/ffitarget.h src/arm/ffi.c src/arm/sysv.S \ + src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S \ + src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S \ + src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h \ +@@ -19,8 +20,12 @@ + src/moxie/ffitarget.h src/moxie/eabi.S src/mips/ffitarget.h \ + src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h \ + src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \ ++ src/m88k/ffi.c src/m88k/obsd.S src/m88k/ffitarget.h \ + src/microblaze/ffi.c src/microblaze/sysv.S \ +- src/microblaze/ffitarget.h src/powerpc/ffi.c \ ++ src/microblaze/ffitarget.h \ ++ src/nios2/ffi.c src/nios2/ffitarget.h src/nios2/sysv.S \ ++ src/powerpc/ffi.c src/powerpc/ffi_powerpc.h \ ++ src/powerpc/ffi_sysv.c src/powerpc/ffi_linux64.c \ + src/powerpc/sysv.S src/powerpc/linux64.S \ + src/powerpc/linux64_closure.S src/powerpc/ppc_closure.S \ + src/powerpc/asm.h src/powerpc/aix.S src/powerpc/darwin.S \ +@@ -38,14 +43,14 @@ + src/bfin/ffitarget.h src/bfin/sysv.S src/frv/eabi.S \ + src/frv/ffitarget.h src/dlmalloc.c src/tile/ffi.c \ + src/tile/ffitarget.h src/tile/tile.S libtool-version \ ++ src/vax/ffi.c src/vax/ffitarget.h src/vax/elfbsd.S \ + src/xtensa/ffitarget.h src/xtensa/ffi.c src/xtensa/sysv.S \ + ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \ + m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \ + m4/ltversion.m4 src/arm/gentramp.sh src/debug.c msvcc.sh \ +- generate-ios-source-and-headers.py \ +- generate-osx-source-and-headers.py \ ++ generate-darwin-source-and-headers.py \ + libffi.xcodeproj/project.pbxproj src/arm/trampoline.S \ +- libtool-ldflags ++ libtool-ldflags ChangeLog.libffi-3.1 + + info_TEXINFOS = doc/libffi.texi + +@@ -59,39 +64,39 @@ + # values defined in terms of make variables, as is the case for CC and + # friends when we are called from the top level Makefile. + AM_MAKEFLAGS = \ +- "AR_FLAGS=$(AR_FLAGS)" \ +- "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ +- "CFLAGS=$(CFLAGS)" \ +- "CXXFLAGS=$(CXXFLAGS)" \ +- "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ +- "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ +- "INSTALL=$(INSTALL)" \ +- "INSTALL_DATA=$(INSTALL_DATA)" \ +- "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ +- "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ +- "JC1FLAGS=$(JC1FLAGS)" \ +- "LDFLAGS=$(LDFLAGS)" \ +- "LIBCFLAGS=$(LIBCFLAGS)" \ +- "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ +- "MAKE=$(MAKE)" \ +- "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ +- "PICFLAG=$(PICFLAG)" \ +- "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ +- "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ +- "SHELL=$(SHELL)" \ +- "exec_prefix=$(exec_prefix)" \ +- "infodir=$(infodir)" \ +- "libdir=$(libdir)" \ +- "mandir=$(mandir)" \ +- "prefix=$(prefix)" \ +- "AR=$(AR)" \ +- "AS=$(AS)" \ +- "CC=$(CC)" \ +- "CXX=$(CXX)" \ +- "LD=$(LD)" \ +- "NM=$(NM)" \ +- "RANLIB=$(RANLIB)" \ +- "DESTDIR=$(DESTDIR)" ++ 'AR_FLAGS=$(AR_FLAGS)' \ ++ 'CC_FOR_BUILD=$(CC_FOR_BUILD)' \ ++ 'CFLAGS=$(CFLAGS)' \ ++ 'CXXFLAGS=$(CXXFLAGS)' \ ++ 'CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)' \ ++ 'CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)' \ ++ 'INSTALL=$(INSTALL)' \ ++ 'INSTALL_DATA=$(INSTALL_DATA)' \ ++ 'INSTALL_PROGRAM=$(INSTALL_PROGRAM)' \ ++ 'INSTALL_SCRIPT=$(INSTALL_SCRIPT)' \ ++ 'JC1FLAGS=$(JC1FLAGS)' \ ++ 'LDFLAGS=$(LDFLAGS)' \ ++ 'LIBCFLAGS=$(LIBCFLAGS)' \ ++ 'LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)' \ ++ 'MAKE=$(MAKE)' \ ++ 'MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)' \ ++ 'PICFLAG=$(PICFLAG)' \ ++ 'PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)' \ ++ 'RUNTESTFLAGS=$(RUNTESTFLAGS)' \ ++ 'SHELL=$(SHELL)' \ ++ 'exec_prefix=$(exec_prefix)' \ ++ 'infodir=$(infodir)' \ ++ 'libdir=$(libdir)' \ ++ 'mandir=$(mandir)' \ ++ 'prefix=$(prefix)' \ ++ 'AR=$(AR)' \ ++ 'AS=$(AS)' \ ++ 'CC=$(CC)' \ ++ 'CXX=$(CXX)' \ ++ 'LD=$(LD)' \ ++ 'NM=$(NM)' \ ++ 'RANLIB=$(RANLIB)' \ ++ 'DESTDIR=$(DESTDIR)' + + # Subdir rules rely on $(FLAGS_TO_PASS) + FLAGS_TO_PASS = $(AM_MAKEFLAGS) +@@ -120,10 +125,10 @@ + nodist_libffi_la_SOURCES += src/bfin/ffi.c src/bfin/sysv.S + endif + if X86 +-nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S ++nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S src/x86/win32.S + endif + if X86_FREEBSD +-nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/freebsd.S ++nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/freebsd.S src/x86/win32.S + endif + if X86_WIN32 + nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/win32.S +@@ -133,6 +138,9 @@ + endif + if X86_DARWIN + nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S ++if X86_DARWIN32 ++nodist_libffi_la_SOURCES += src/x86/win32.S ++endif + endif + if SPARC + nodist_libffi_la_SOURCES += src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S +@@ -149,14 +157,20 @@ + if M68K + nodist_libffi_la_SOURCES += src/m68k/ffi.c src/m68k/sysv.S + endif ++if M88K ++nodist_libffi_la_SOURCES += src/m88k/ffi.c src/m88k/obsd.S ++endif + if MOXIE + nodist_libffi_la_SOURCES += src/moxie/ffi.c src/moxie/eabi.S + endif + if MICROBLAZE + nodist_libffi_la_SOURCES += src/microblaze/ffi.c src/microblaze/sysv.S + endif ++if NIOS2 ++nodist_libffi_la_SOURCES += src/nios2/sysv.S src/nios2/ffi.c ++endif + if POWERPC +-nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S ++nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/ffi_sysv.c src/powerpc/ffi_linux64.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S + endif + if POWERPC_AIX + nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S +@@ -165,11 +179,14 @@ + nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S + endif + if POWERPC_FREEBSD +-nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S ++nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/ffi_sysv.c src/powerpc/sysv.S src/powerpc/ppc_closure.S + endif + if AARCH64 + nodist_libffi_la_SOURCES += src/aarch64/sysv.S src/aarch64/ffi.c + endif ++if ARC ++nodist_libffi_la_SOURCES += src/arc/arcompact.S src/arc/ffi.c ++endif + if ARM + nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c + if FFI_EXEC_TRAMPOLINE_TABLE +@@ -212,14 +229,26 @@ + if METAG + nodist_libffi_la_SOURCES += src/metag/sysv.S src/metag/ffi.c + endif ++if VAX ++nodist_libffi_la_SOURCES += src/vax/elfbsd.S src/vax/ffi.c ++endif + + libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) + nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) + + LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/libtool-ldflags $(LDFLAGS)) + ++AM_CFLAGS = ++if FFI_DEBUG ++# Build debug. Define FFI_DEBUG on the commandline so that, when building with ++# MSVC, it can link against the debug CRT. ++AM_CFLAGS += -DFFI_DEBUG ++endif ++ + libffi_la_LDFLAGS = -no-undefined -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) + + AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src + AM_CCASFLAGS = $(AM_CPPFLAGS) + ++dist-hook: ++ if [ -d $(top_srcdir)/.git ] ; then (cd $(top_srcdir); git log --no-decorate) ; else echo 'See git log for history.' ; fi > $(distdir)/ChangeLog +diff -r ee879c0ffa11 Modules/_ctypes/libffi/Makefile.in +--- a/Modules/_ctypes/libffi/Makefile.in ++++ b/Modules/_ctypes/libffi/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.12.2 from Makefile.am. ++# Makefile.in generated by automake 1.13.4 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2012 Free Software Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -16,23 +16,51 @@ + + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -55,44 +83,52 @@ + @FFI_DEBUG_TRUE@am__append_1 = src/debug.c + @MIPS_TRUE@am__append_2 = src/mips/ffi.c src/mips/o32.S src/mips/n32.S + @BFIN_TRUE@am__append_3 = src/bfin/ffi.c src/bfin/sysv.S +-@X86_TRUE@am__append_4 = src/x86/ffi.c src/x86/sysv.S +-@X86_FREEBSD_TRUE@am__append_5 = src/x86/ffi.c src/x86/freebsd.S ++@X86_TRUE@am__append_4 = src/x86/ffi.c src/x86/sysv.S src/x86/win32.S ++@X86_FREEBSD_TRUE@am__append_5 = src/x86/ffi.c src/x86/freebsd.S src/x86/win32.S + @X86_WIN32_TRUE@am__append_6 = src/x86/ffi.c src/x86/win32.S + @X86_WIN64_TRUE@am__append_7 = src/x86/ffi.c src/x86/win64.S + @X86_DARWIN_TRUE@am__append_8 = src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S +-@SPARC_TRUE@am__append_9 = src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S +-@ALPHA_TRUE@am__append_10 = src/alpha/ffi.c src/alpha/osf.S +-@IA64_TRUE@am__append_11 = src/ia64/ffi.c src/ia64/unix.S +-@M32R_TRUE@am__append_12 = src/m32r/sysv.S src/m32r/ffi.c +-@M68K_TRUE@am__append_13 = src/m68k/ffi.c src/m68k/sysv.S +-@MOXIE_TRUE@am__append_14 = src/moxie/ffi.c src/moxie/eabi.S +-@MICROBLAZE_TRUE@am__append_15 = src/microblaze/ffi.c src/microblaze/sysv.S +-@POWERPC_TRUE@am__append_16 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S +-@POWERPC_AIX_TRUE@am__append_17 = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S +-@POWERPC_DARWIN_TRUE@am__append_18 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S +-@POWERPC_FREEBSD_TRUE@am__append_19 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S +-@AARCH64_TRUE@am__append_20 = src/aarch64/sysv.S src/aarch64/ffi.c +-@ARM_TRUE@am__append_21 = src/arm/sysv.S src/arm/ffi.c +-@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__append_22 = src/arm/trampoline.S +-@AVR32_TRUE@am__append_23 = src/avr32/sysv.S src/avr32/ffi.c +-@LIBFFI_CRIS_TRUE@am__append_24 = src/cris/sysv.S src/cris/ffi.c +-@FRV_TRUE@am__append_25 = src/frv/eabi.S src/frv/ffi.c +-@S390_TRUE@am__append_26 = src/s390/sysv.S src/s390/ffi.c +-@X86_64_TRUE@am__append_27 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S +-@SH_TRUE@am__append_28 = src/sh/sysv.S src/sh/ffi.c +-@SH64_TRUE@am__append_29 = src/sh64/sysv.S src/sh64/ffi.c +-@PA_LINUX_TRUE@am__append_30 = src/pa/linux.S src/pa/ffi.c +-@PA_HPUX_TRUE@am__append_31 = src/pa/hpux32.S src/pa/ffi.c +-@TILE_TRUE@am__append_32 = src/tile/tile.S src/tile/ffi.c +-@XTENSA_TRUE@am__append_33 = src/xtensa/sysv.S src/xtensa/ffi.c +-@METAG_TRUE@am__append_34 = src/metag/sysv.S src/metag/ffi.c ++@X86_DARWIN32_TRUE@@X86_DARWIN_TRUE@am__append_9 = src/x86/win32.S ++@SPARC_TRUE@am__append_10 = src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S ++@ALPHA_TRUE@am__append_11 = src/alpha/ffi.c src/alpha/osf.S ++@IA64_TRUE@am__append_12 = src/ia64/ffi.c src/ia64/unix.S ++@M32R_TRUE@am__append_13 = src/m32r/sysv.S src/m32r/ffi.c ++@M68K_TRUE@am__append_14 = src/m68k/ffi.c src/m68k/sysv.S ++@M88K_TRUE@am__append_15 = src/m88k/ffi.c src/m88k/obsd.S ++@MOXIE_TRUE@am__append_16 = src/moxie/ffi.c src/moxie/eabi.S ++@MICROBLAZE_TRUE@am__append_17 = src/microblaze/ffi.c src/microblaze/sysv.S ++@NIOS2_TRUE@am__append_18 = src/nios2/sysv.S src/nios2/ffi.c ++@POWERPC_TRUE@am__append_19 = src/powerpc/ffi.c src/powerpc/ffi_sysv.c src/powerpc/ffi_linux64.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S ++@POWERPC_AIX_TRUE@am__append_20 = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S ++@POWERPC_DARWIN_TRUE@am__append_21 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S ++@POWERPC_FREEBSD_TRUE@am__append_22 = src/powerpc/ffi.c src/powerpc/ffi_sysv.c src/powerpc/sysv.S src/powerpc/ppc_closure.S ++@AARCH64_TRUE@am__append_23 = src/aarch64/sysv.S src/aarch64/ffi.c ++@ARC_TRUE@am__append_24 = src/arc/arcompact.S src/arc/ffi.c ++@ARM_TRUE@am__append_25 = src/arm/sysv.S src/arm/ffi.c ++@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__append_26 = src/arm/trampoline.S ++@AVR32_TRUE@am__append_27 = src/avr32/sysv.S src/avr32/ffi.c ++@LIBFFI_CRIS_TRUE@am__append_28 = src/cris/sysv.S src/cris/ffi.c ++@FRV_TRUE@am__append_29 = src/frv/eabi.S src/frv/ffi.c ++@S390_TRUE@am__append_30 = src/s390/sysv.S src/s390/ffi.c ++@X86_64_TRUE@am__append_31 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S ++@SH_TRUE@am__append_32 = src/sh/sysv.S src/sh/ffi.c ++@SH64_TRUE@am__append_33 = src/sh64/sysv.S src/sh64/ffi.c ++@PA_LINUX_TRUE@am__append_34 = src/pa/linux.S src/pa/ffi.c ++@PA_HPUX_TRUE@am__append_35 = src/pa/hpux32.S src/pa/ffi.c ++@TILE_TRUE@am__append_36 = src/tile/tile.S src/tile/ffi.c ++@XTENSA_TRUE@am__append_37 = src/xtensa/sysv.S src/xtensa/ffi.c ++@METAG_TRUE@am__append_38 = src/metag/sysv.S src/metag/ffi.c ++@VAX_TRUE@am__append_39 = src/vax/elfbsd.S src/vax/ffi.c ++# Build debug. Define FFI_DEBUG on the commandline so that, when building with ++# MSVC, it can link against the debug CRT. ++@FFI_DEBUG_TRUE@am__append_40 = -DFFI_DEBUG + subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \ +- $(srcdir)/doc/version.texi $(srcdir)/fficonfig.h.in \ +- $(srcdir)/libffi.pc.in $(top_srcdir)/configure ChangeLog \ +- compile config.guess config.sub depcomp install-sh ltmain.sh \ +- mdate-sh missing texinfo.tex ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/fficonfig.h.in $(srcdir)/libffi.pc.in depcomp \ ++ mdate-sh $(srcdir)/doc/version.texi $(srcdir)/doc/stamp-vti \ ++ texinfo.tex README compile config.guess config.sub install-sh \ ++ missing ltmain.sh + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ +@@ -154,50 +190,60 @@ + @MIPS_TRUE@am__objects_2 = src/mips/ffi.lo src/mips/o32.lo \ + @MIPS_TRUE@ src/mips/n32.lo + @BFIN_TRUE@am__objects_3 = src/bfin/ffi.lo src/bfin/sysv.lo +-@X86_TRUE@am__objects_4 = src/x86/ffi.lo src/x86/sysv.lo +-@X86_FREEBSD_TRUE@am__objects_5 = src/x86/ffi.lo src/x86/freebsd.lo ++@X86_TRUE@am__objects_4 = src/x86/ffi.lo src/x86/sysv.lo \ ++@X86_TRUE@ src/x86/win32.lo ++@X86_FREEBSD_TRUE@am__objects_5 = src/x86/ffi.lo src/x86/freebsd.lo \ ++@X86_FREEBSD_TRUE@ src/x86/win32.lo + @X86_WIN32_TRUE@am__objects_6 = src/x86/ffi.lo src/x86/win32.lo + @X86_WIN64_TRUE@am__objects_7 = src/x86/ffi.lo src/x86/win64.lo + @X86_DARWIN_TRUE@am__objects_8 = src/x86/ffi.lo src/x86/darwin.lo \ + @X86_DARWIN_TRUE@ src/x86/ffi64.lo src/x86/darwin64.lo +-@SPARC_TRUE@am__objects_9 = src/sparc/ffi.lo src/sparc/v8.lo \ ++@X86_DARWIN32_TRUE@@X86_DARWIN_TRUE@am__objects_9 = src/x86/win32.lo ++@SPARC_TRUE@am__objects_10 = src/sparc/ffi.lo src/sparc/v8.lo \ + @SPARC_TRUE@ src/sparc/v9.lo +-@ALPHA_TRUE@am__objects_10 = src/alpha/ffi.lo src/alpha/osf.lo +-@IA64_TRUE@am__objects_11 = src/ia64/ffi.lo src/ia64/unix.lo +-@M32R_TRUE@am__objects_12 = src/m32r/sysv.lo src/m32r/ffi.lo +-@M68K_TRUE@am__objects_13 = src/m68k/ffi.lo src/m68k/sysv.lo +-@MOXIE_TRUE@am__objects_14 = src/moxie/ffi.lo src/moxie/eabi.lo +-@MICROBLAZE_TRUE@am__objects_15 = src/microblaze/ffi.lo \ ++@ALPHA_TRUE@am__objects_11 = src/alpha/ffi.lo src/alpha/osf.lo ++@IA64_TRUE@am__objects_12 = src/ia64/ffi.lo src/ia64/unix.lo ++@M32R_TRUE@am__objects_13 = src/m32r/sysv.lo src/m32r/ffi.lo ++@M68K_TRUE@am__objects_14 = src/m68k/ffi.lo src/m68k/sysv.lo ++@M88K_TRUE@am__objects_15 = src/m88k/ffi.lo src/m88k/obsd.lo ++@MOXIE_TRUE@am__objects_16 = src/moxie/ffi.lo src/moxie/eabi.lo ++@MICROBLAZE_TRUE@am__objects_17 = src/microblaze/ffi.lo \ + @MICROBLAZE_TRUE@ src/microblaze/sysv.lo +-@POWERPC_TRUE@am__objects_16 = src/powerpc/ffi.lo src/powerpc/sysv.lo \ ++@NIOS2_TRUE@am__objects_18 = src/nios2/sysv.lo src/nios2/ffi.lo ++@POWERPC_TRUE@am__objects_19 = src/powerpc/ffi.lo \ ++@POWERPC_TRUE@ src/powerpc/ffi_sysv.lo \ ++@POWERPC_TRUE@ src/powerpc/ffi_linux64.lo src/powerpc/sysv.lo \ + @POWERPC_TRUE@ src/powerpc/ppc_closure.lo \ + @POWERPC_TRUE@ src/powerpc/linux64.lo \ + @POWERPC_TRUE@ src/powerpc/linux64_closure.lo +-@POWERPC_AIX_TRUE@am__objects_17 = src/powerpc/ffi_darwin.lo \ ++@POWERPC_AIX_TRUE@am__objects_20 = src/powerpc/ffi_darwin.lo \ + @POWERPC_AIX_TRUE@ src/powerpc/aix.lo \ + @POWERPC_AIX_TRUE@ src/powerpc/aix_closure.lo +-@POWERPC_DARWIN_TRUE@am__objects_18 = src/powerpc/ffi_darwin.lo \ ++@POWERPC_DARWIN_TRUE@am__objects_21 = src/powerpc/ffi_darwin.lo \ + @POWERPC_DARWIN_TRUE@ src/powerpc/darwin.lo \ + @POWERPC_DARWIN_TRUE@ src/powerpc/darwin_closure.lo +-@POWERPC_FREEBSD_TRUE@am__objects_19 = src/powerpc/ffi.lo \ ++@POWERPC_FREEBSD_TRUE@am__objects_22 = src/powerpc/ffi.lo \ ++@POWERPC_FREEBSD_TRUE@ src/powerpc/ffi_sysv.lo \ + @POWERPC_FREEBSD_TRUE@ src/powerpc/sysv.lo \ + @POWERPC_FREEBSD_TRUE@ src/powerpc/ppc_closure.lo +-@AARCH64_TRUE@am__objects_20 = src/aarch64/sysv.lo src/aarch64/ffi.lo +-@ARM_TRUE@am__objects_21 = src/arm/sysv.lo src/arm/ffi.lo +-@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__objects_22 = src/arm/trampoline.lo +-@AVR32_TRUE@am__objects_23 = src/avr32/sysv.lo src/avr32/ffi.lo +-@LIBFFI_CRIS_TRUE@am__objects_24 = src/cris/sysv.lo src/cris/ffi.lo +-@FRV_TRUE@am__objects_25 = src/frv/eabi.lo src/frv/ffi.lo +-@S390_TRUE@am__objects_26 = src/s390/sysv.lo src/s390/ffi.lo +-@X86_64_TRUE@am__objects_27 = src/x86/ffi64.lo src/x86/unix64.lo \ ++@AARCH64_TRUE@am__objects_23 = src/aarch64/sysv.lo src/aarch64/ffi.lo ++@ARC_TRUE@am__objects_24 = src/arc/arcompact.lo src/arc/ffi.lo ++@ARM_TRUE@am__objects_25 = src/arm/sysv.lo src/arm/ffi.lo ++@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__objects_26 = src/arm/trampoline.lo ++@AVR32_TRUE@am__objects_27 = src/avr32/sysv.lo src/avr32/ffi.lo ++@LIBFFI_CRIS_TRUE@am__objects_28 = src/cris/sysv.lo src/cris/ffi.lo ++@FRV_TRUE@am__objects_29 = src/frv/eabi.lo src/frv/ffi.lo ++@S390_TRUE@am__objects_30 = src/s390/sysv.lo src/s390/ffi.lo ++@X86_64_TRUE@am__objects_31 = src/x86/ffi64.lo src/x86/unix64.lo \ + @X86_64_TRUE@ src/x86/ffi.lo src/x86/sysv.lo +-@SH_TRUE@am__objects_28 = src/sh/sysv.lo src/sh/ffi.lo +-@SH64_TRUE@am__objects_29 = src/sh64/sysv.lo src/sh64/ffi.lo +-@PA_LINUX_TRUE@am__objects_30 = src/pa/linux.lo src/pa/ffi.lo +-@PA_HPUX_TRUE@am__objects_31 = src/pa/hpux32.lo src/pa/ffi.lo +-@TILE_TRUE@am__objects_32 = src/tile/tile.lo src/tile/ffi.lo +-@XTENSA_TRUE@am__objects_33 = src/xtensa/sysv.lo src/xtensa/ffi.lo +-@METAG_TRUE@am__objects_34 = src/metag/sysv.lo src/metag/ffi.lo ++@SH_TRUE@am__objects_32 = src/sh/sysv.lo src/sh/ffi.lo ++@SH64_TRUE@am__objects_33 = src/sh64/sysv.lo src/sh64/ffi.lo ++@PA_LINUX_TRUE@am__objects_34 = src/pa/linux.lo src/pa/ffi.lo ++@PA_HPUX_TRUE@am__objects_35 = src/pa/hpux32.lo src/pa/ffi.lo ++@TILE_TRUE@am__objects_36 = src/tile/tile.lo src/tile/ffi.lo ++@XTENSA_TRUE@am__objects_37 = src/xtensa/sysv.lo src/xtensa/ffi.lo ++@METAG_TRUE@am__objects_38 = src/metag/sysv.lo src/metag/ffi.lo ++@VAX_TRUE@am__objects_39 = src/vax/elfbsd.lo src/vax/ffi.lo + nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ + $(am__objects_3) $(am__objects_4) $(am__objects_5) \ + $(am__objects_6) $(am__objects_7) $(am__objects_8) \ +@@ -209,17 +255,23 @@ + $(am__objects_24) $(am__objects_25) $(am__objects_26) \ + $(am__objects_27) $(am__objects_28) $(am__objects_29) \ + $(am__objects_30) $(am__objects_31) $(am__objects_32) \ +- $(am__objects_33) $(am__objects_34) ++ $(am__objects_33) $(am__objects_34) $(am__objects_35) \ ++ $(am__objects_36) $(am__objects_37) $(am__objects_38) \ ++ $(am__objects_39) + libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \ + $(nodist_libffi_la_OBJECTS) +-libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++AM_V_lt = $(am__v_lt_@AM_V@) ++am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) ++am__v_lt_0 = --silent ++am__v_lt_1 = ++libffi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libffi_la_LDFLAGS) $(LDFLAGS) -o $@ + libffi_convenience_la_LIBADD = +-am__objects_35 = src/prep_cif.lo src/types.lo src/raw_api.lo \ ++am__objects_40 = src/prep_cif.lo src/types.lo src/raw_api.lo \ + src/java_raw_api.lo src/closures.lo +-am_libffi_convenience_la_OBJECTS = $(am__objects_35) +-am__objects_36 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ ++am_libffi_convenience_la_OBJECTS = $(am__objects_40) ++am__objects_41 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ + $(am__objects_4) $(am__objects_5) $(am__objects_6) \ + $(am__objects_7) $(am__objects_8) $(am__objects_9) \ + $(am__objects_10) $(am__objects_11) $(am__objects_12) \ +@@ -230,32 +282,87 @@ + $(am__objects_25) $(am__objects_26) $(am__objects_27) \ + $(am__objects_28) $(am__objects_29) $(am__objects_30) \ + $(am__objects_31) $(am__objects_32) $(am__objects_33) \ +- $(am__objects_34) +-nodist_libffi_convenience_la_OBJECTS = $(am__objects_36) ++ $(am__objects_34) $(am__objects_35) $(am__objects_36) \ ++ $(am__objects_37) $(am__objects_38) $(am__objects_39) ++nodist_libffi_convenience_la_OBJECTS = $(am__objects_41) + libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \ + $(nodist_libffi_convenience_la_OBJECTS) ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) +-LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) ++LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ++ $(AM_CCASFLAGS) $(CCASFLAGS) ++AM_V_CPPAS = $(am__v_CPPAS_@AM_V@) ++am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@) ++am__v_CPPAS_0 = @echo " CPPAS " $@; ++am__v_CPPAS_1 = + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ++ $(AM_CFLAGS) $(CFLAGS) ++AM_V_CC = $(am__v_CC_@AM_V@) ++am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) ++am__v_CC_0 = @echo " CC " $@; ++am__v_CC_1 = + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_CCLD = $(am__v_CCLD_@AM_V@) ++am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) ++am__v_CCLD_0 = @echo " CCLD " $@; ++am__v_CCLD_1 = + SOURCES = $(libffi_la_SOURCES) $(nodist_libffi_la_SOURCES) \ + $(libffi_convenience_la_SOURCES) \ + $(nodist_libffi_convenience_la_SOURCES) + DIST_SOURCES = $(libffi_la_SOURCES) $(libffi_convenience_la_SOURCES) ++AM_V_DVIPS = $(am__v_DVIPS_@AM_V@) ++am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@) ++am__v_DVIPS_0 = @echo " DVIPS " $@; ++am__v_DVIPS_1 = ++AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@) ++am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@) ++am__v_MAKEINFO_0 = @echo " MAKEINFO" $@; ++am__v_MAKEINFO_1 = ++AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@) ++am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@) ++am__v_INFOHTML_0 = @echo " INFOHTML" $@; ++am__v_INFOHTML_1 = ++AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@) ++am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@) ++am__v_TEXI2DVI_0 = @echo " TEXI2DVI" $@; ++am__v_TEXI2DVI_1 = ++AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@) ++am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@) ++am__v_TEXI2PDF_0 = @echo " TEXI2PDF" $@; ++am__v_TEXI2PDF_1 = ++AM_V_texinfo = $(am__v_texinfo_@AM_V@) ++am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@) ++am__v_texinfo_0 = -q ++am__v_texinfo_1 = ++AM_V_texidevnull = $(am__v_texidevnull_@AM_V@) ++am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@) ++am__v_texidevnull_0 = > /dev/null ++am__v_texidevnull_1 = + INFO_DEPS = $(srcdir)/doc/libffi.info + am__TEXINFO_TEX_DIR = $(srcdir) + DVIS = doc/libffi.dvi +@@ -268,13 +375,14 @@ + MAKEINFOHTML = $(MAKEINFO) --html + AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) + DVIPS = dvips +-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +- html-recursive info-recursive install-data-recursive \ +- install-dvi-recursive install-exec-recursive \ +- install-html-recursive install-info-recursive \ +- install-pdf-recursive install-ps-recursive install-recursive \ +- installcheck-recursive installdirs-recursive pdf-recursive \ +- ps-recursive uninstall-recursive ++RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ++ ctags-recursive dvi-recursive html-recursive info-recursive \ ++ install-data-recursive install-dvi-recursive \ ++ install-exec-recursive install-html-recursive \ ++ install-info-recursive install-pdf-recursive \ ++ install-ps-recursive install-recursive installcheck-recursive \ ++ installdirs-recursive pdf-recursive ps-recursive \ ++ tags-recursive uninstall-recursive + am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ +@@ -283,9 +391,30 @@ + DATA = $(pkgconfig_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++am__recursive_targets = \ ++ $(RECURSIVE_TARGETS) \ ++ $(RECURSIVE_CLEAN_TARGETS) \ ++ $(am__extra_recursive_targets) ++AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ ++ $(LISP)fficonfig.h.in ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + CSCOPE = cscope +@@ -335,6 +464,7 @@ + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AM_LTLDFLAGS = @AM_LTLDFLAGS@ + AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ + AR = @AR@ +@@ -350,6 +480,10 @@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +@@ -365,6 +499,7 @@ + FGREP = @FGREP@ + GREP = @GREP@ + HAVE_LONG_DOUBLE = @HAVE_LONG_DOUBLE@ ++HAVE_LONG_DOUBLE_VARIANT = @HAVE_LONG_DOUBLE_VARIANT@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -411,6 +546,7 @@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_AR = @ac_ct_AR@ + ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ +@@ -468,10 +604,11 @@ + AUTOMAKE_OPTIONS = foreign subdir-objects + ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = include testsuite man +-EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ ++EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj \ + src/aarch64/ffi.c src/aarch64/ffitarget.h src/aarch64/sysv.S \ +- build-ios.sh src/alpha/ffi.c src/alpha/osf.S \ +- src/alpha/ffitarget.h src/arm/ffi.c src/arm/sysv.S \ ++ src/alpha/ffi.c src/alpha/osf.S \ ++ src/alpha/ffitarget.h src/arc/ffi.c src/arc/arcompact.S \ ++ src/arc/ffitarget.h src/arm/ffi.c src/arm/sysv.S \ + src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S \ + src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S \ + src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h \ +@@ -481,8 +618,12 @@ + src/moxie/ffitarget.h src/moxie/eabi.S src/mips/ffitarget.h \ + src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h \ + src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \ ++ src/m88k/ffi.c src/m88k/obsd.S src/m88k/ffitarget.h \ + src/microblaze/ffi.c src/microblaze/sysv.S \ +- src/microblaze/ffitarget.h src/powerpc/ffi.c \ ++ src/microblaze/ffitarget.h \ ++ src/nios2/ffi.c src/nios2/ffitarget.h src/nios2/sysv.S \ ++ src/powerpc/ffi.c src/powerpc/ffi_powerpc.h \ ++ src/powerpc/ffi_sysv.c src/powerpc/ffi_linux64.c \ + src/powerpc/sysv.S src/powerpc/linux64.S \ + src/powerpc/linux64_closure.S src/powerpc/ppc_closure.S \ + src/powerpc/asm.h src/powerpc/aix.S src/powerpc/darwin.S \ +@@ -500,14 +641,14 @@ + src/bfin/ffitarget.h src/bfin/sysv.S src/frv/eabi.S \ + src/frv/ffitarget.h src/dlmalloc.c src/tile/ffi.c \ + src/tile/ffitarget.h src/tile/tile.S libtool-version \ ++ src/vax/ffi.c src/vax/ffitarget.h src/vax/elfbsd.S \ + src/xtensa/ffitarget.h src/xtensa/ffi.c src/xtensa/sysv.S \ + ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \ + m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \ + m4/ltversion.m4 src/arm/gentramp.sh src/debug.c msvcc.sh \ +- generate-ios-source-and-headers.py \ +- generate-osx-source-and-headers.py \ ++ generate-darwin-source-and-headers.py \ + libffi.xcodeproj/project.pbxproj src/arm/trampoline.S \ +- libtool-ldflags ++ libtool-ldflags ChangeLog.libffi-3.1 + + info_TEXINFOS = doc/libffi.texi + +@@ -515,39 +656,39 @@ + # values defined in terms of make variables, as is the case for CC and + # friends when we are called from the top level Makefile. + AM_MAKEFLAGS = \ +- "AR_FLAGS=$(AR_FLAGS)" \ +- "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ +- "CFLAGS=$(CFLAGS)" \ +- "CXXFLAGS=$(CXXFLAGS)" \ +- "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ +- "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ +- "INSTALL=$(INSTALL)" \ +- "INSTALL_DATA=$(INSTALL_DATA)" \ +- "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ +- "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ +- "JC1FLAGS=$(JC1FLAGS)" \ +- "LDFLAGS=$(LDFLAGS)" \ +- "LIBCFLAGS=$(LIBCFLAGS)" \ +- "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ +- "MAKE=$(MAKE)" \ +- "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ +- "PICFLAG=$(PICFLAG)" \ +- "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ +- "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ +- "SHELL=$(SHELL)" \ +- "exec_prefix=$(exec_prefix)" \ +- "infodir=$(infodir)" \ +- "libdir=$(libdir)" \ +- "mandir=$(mandir)" \ +- "prefix=$(prefix)" \ +- "AR=$(AR)" \ +- "AS=$(AS)" \ +- "CC=$(CC)" \ +- "CXX=$(CXX)" \ +- "LD=$(LD)" \ +- "NM=$(NM)" \ +- "RANLIB=$(RANLIB)" \ +- "DESTDIR=$(DESTDIR)" ++ 'AR_FLAGS=$(AR_FLAGS)' \ ++ 'CC_FOR_BUILD=$(CC_FOR_BUILD)' \ ++ 'CFLAGS=$(CFLAGS)' \ ++ 'CXXFLAGS=$(CXXFLAGS)' \ ++ 'CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)' \ ++ 'CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)' \ ++ 'INSTALL=$(INSTALL)' \ ++ 'INSTALL_DATA=$(INSTALL_DATA)' \ ++ 'INSTALL_PROGRAM=$(INSTALL_PROGRAM)' \ ++ 'INSTALL_SCRIPT=$(INSTALL_SCRIPT)' \ ++ 'JC1FLAGS=$(JC1FLAGS)' \ ++ 'LDFLAGS=$(LDFLAGS)' \ ++ 'LIBCFLAGS=$(LIBCFLAGS)' \ ++ 'LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)' \ ++ 'MAKE=$(MAKE)' \ ++ 'MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)' \ ++ 'PICFLAG=$(PICFLAG)' \ ++ 'PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)' \ ++ 'RUNTESTFLAGS=$(RUNTESTFLAGS)' \ ++ 'SHELL=$(SHELL)' \ ++ 'exec_prefix=$(exec_prefix)' \ ++ 'infodir=$(infodir)' \ ++ 'libdir=$(libdir)' \ ++ 'mandir=$(mandir)' \ ++ 'prefix=$(prefix)' \ ++ 'AR=$(AR)' \ ++ 'AS=$(AS)' \ ++ 'CC=$(CC)' \ ++ 'CXX=$(CXX)' \ ++ 'LD=$(LD)' \ ++ 'NM=$(NM)' \ ++ 'RANLIB=$(RANLIB)' \ ++ 'DESTDIR=$(DESTDIR)' + + + # Subdir rules rely on $(FLAGS_TO_PASS) +@@ -571,10 +712,13 @@ + $(am__append_24) $(am__append_25) $(am__append_26) \ + $(am__append_27) $(am__append_28) $(am__append_29) \ + $(am__append_30) $(am__append_31) $(am__append_32) \ +- $(am__append_33) $(am__append_34) ++ $(am__append_33) $(am__append_34) $(am__append_35) \ ++ $(am__append_36) $(am__append_37) $(am__append_38) \ ++ $(am__append_39) + libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) + nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) + LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/libtool-ldflags $(LDFLAGS)) ++AM_CFLAGS = $(am__append_40) + libffi_la_LDFLAGS = -no-undefined -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) + AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src + AM_CCASFLAGS = $(AM_CPPFLAGS) +@@ -645,6 +789,7 @@ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } ++ + install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \ +@@ -723,10 +868,10 @@ + src/x86/$(DEPDIR)/$(am__dirstamp) + src/x86/sysv.lo: src/x86/$(am__dirstamp) \ + src/x86/$(DEPDIR)/$(am__dirstamp) ++src/x86/win32.lo: src/x86/$(am__dirstamp) \ ++ src/x86/$(DEPDIR)/$(am__dirstamp) + src/x86/freebsd.lo: src/x86/$(am__dirstamp) \ + src/x86/$(DEPDIR)/$(am__dirstamp) +-src/x86/win32.lo: src/x86/$(am__dirstamp) \ +- src/x86/$(DEPDIR)/$(am__dirstamp) + src/x86/win64.lo: src/x86/$(am__dirstamp) \ + src/x86/$(DEPDIR)/$(am__dirstamp) + src/x86/darwin.lo: src/x86/$(am__dirstamp) \ +@@ -787,6 +932,16 @@ + src/m68k/$(DEPDIR)/$(am__dirstamp) + src/m68k/sysv.lo: src/m68k/$(am__dirstamp) \ + src/m68k/$(DEPDIR)/$(am__dirstamp) ++src/m88k/$(am__dirstamp): ++ @$(MKDIR_P) src/m88k ++ @: > src/m88k/$(am__dirstamp) ++src/m88k/$(DEPDIR)/$(am__dirstamp): ++ @$(MKDIR_P) src/m88k/$(DEPDIR) ++ @: > src/m88k/$(DEPDIR)/$(am__dirstamp) ++src/m88k/ffi.lo: src/m88k/$(am__dirstamp) \ ++ src/m88k/$(DEPDIR)/$(am__dirstamp) ++src/m88k/obsd.lo: src/m88k/$(am__dirstamp) \ ++ src/m88k/$(DEPDIR)/$(am__dirstamp) + src/moxie/$(am__dirstamp): + @$(MKDIR_P) src/moxie + @: > src/moxie/$(am__dirstamp) +@@ -807,6 +962,16 @@ + src/microblaze/$(DEPDIR)/$(am__dirstamp) + src/microblaze/sysv.lo: src/microblaze/$(am__dirstamp) \ + src/microblaze/$(DEPDIR)/$(am__dirstamp) ++src/nios2/$(am__dirstamp): ++ @$(MKDIR_P) src/nios2 ++ @: > src/nios2/$(am__dirstamp) ++src/nios2/$(DEPDIR)/$(am__dirstamp): ++ @$(MKDIR_P) src/nios2/$(DEPDIR) ++ @: > src/nios2/$(DEPDIR)/$(am__dirstamp) ++src/nios2/sysv.lo: src/nios2/$(am__dirstamp) \ ++ src/nios2/$(DEPDIR)/$(am__dirstamp) ++src/nios2/ffi.lo: src/nios2/$(am__dirstamp) \ ++ src/nios2/$(DEPDIR)/$(am__dirstamp) + src/powerpc/$(am__dirstamp): + @$(MKDIR_P) src/powerpc + @: > src/powerpc/$(am__dirstamp) +@@ -815,6 +980,10 @@ + @: > src/powerpc/$(DEPDIR)/$(am__dirstamp) + src/powerpc/ffi.lo: src/powerpc/$(am__dirstamp) \ + src/powerpc/$(DEPDIR)/$(am__dirstamp) ++src/powerpc/ffi_sysv.lo: src/powerpc/$(am__dirstamp) \ ++ src/powerpc/$(DEPDIR)/$(am__dirstamp) ++src/powerpc/ffi_linux64.lo: src/powerpc/$(am__dirstamp) \ ++ src/powerpc/$(DEPDIR)/$(am__dirstamp) + src/powerpc/sysv.lo: src/powerpc/$(am__dirstamp) \ + src/powerpc/$(DEPDIR)/$(am__dirstamp) + src/powerpc/ppc_closure.lo: src/powerpc/$(am__dirstamp) \ +@@ -843,6 +1012,16 @@ + src/aarch64/$(DEPDIR)/$(am__dirstamp) + src/aarch64/ffi.lo: src/aarch64/$(am__dirstamp) \ + src/aarch64/$(DEPDIR)/$(am__dirstamp) ++src/arc/$(am__dirstamp): ++ @$(MKDIR_P) src/arc ++ @: > src/arc/$(am__dirstamp) ++src/arc/$(DEPDIR)/$(am__dirstamp): ++ @$(MKDIR_P) src/arc/$(DEPDIR) ++ @: > src/arc/$(DEPDIR)/$(am__dirstamp) ++src/arc/arcompact.lo: src/arc/$(am__dirstamp) \ ++ src/arc/$(DEPDIR)/$(am__dirstamp) ++src/arc/ffi.lo: src/arc/$(am__dirstamp) \ ++ src/arc/$(DEPDIR)/$(am__dirstamp) + src/arm/$(am__dirstamp): + @$(MKDIR_P) src/arm + @: > src/arm/$(am__dirstamp) +@@ -957,10 +1136,22 @@ + src/metag/$(DEPDIR)/$(am__dirstamp) + src/metag/ffi.lo: src/metag/$(am__dirstamp) \ + src/metag/$(DEPDIR)/$(am__dirstamp) ++src/vax/$(am__dirstamp): ++ @$(MKDIR_P) src/vax ++ @: > src/vax/$(am__dirstamp) ++src/vax/$(DEPDIR)/$(am__dirstamp): ++ @$(MKDIR_P) src/vax/$(DEPDIR) ++ @: > src/vax/$(DEPDIR)/$(am__dirstamp) ++src/vax/elfbsd.lo: src/vax/$(am__dirstamp) \ ++ src/vax/$(DEPDIR)/$(am__dirstamp) ++src/vax/ffi.lo: src/vax/$(am__dirstamp) \ ++ src/vax/$(DEPDIR)/$(am__dirstamp) ++ + libffi.la: $(libffi_la_OBJECTS) $(libffi_la_DEPENDENCIES) $(EXTRA_libffi_la_DEPENDENCIES) +- $(libffi_la_LINK) -rpath $(toolexeclibdir) $(libffi_la_OBJECTS) $(libffi_la_LIBADD) $(LIBS) ++ $(AM_V_CCLD)$(libffi_la_LINK) -rpath $(toolexeclibdir) $(libffi_la_OBJECTS) $(libffi_la_LIBADD) $(LIBS) ++ + libffi_convenience.la: $(libffi_convenience_la_OBJECTS) $(libffi_convenience_la_DEPENDENCIES) $(EXTRA_libffi_convenience_la_DEPENDENCIES) +- $(LINK) $(libffi_convenience_la_OBJECTS) $(libffi_convenience_la_LIBADD) $(LIBS) ++ $(AM_V_CCLD)$(LINK) $(libffi_convenience_la_OBJECTS) $(libffi_convenience_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -970,6 +1161,8 @@ + -rm -f src/aarch64/*.lo + -rm -f src/alpha/*.$(OBJEXT) + -rm -f src/alpha/*.lo ++ -rm -f src/arc/*.$(OBJEXT) ++ -rm -f src/arc/*.lo + -rm -f src/arm/*.$(OBJEXT) + -rm -f src/arm/*.lo + -rm -f src/avr32/*.$(OBJEXT) +@@ -986,6 +1179,8 @@ + -rm -f src/m32r/*.lo + -rm -f src/m68k/*.$(OBJEXT) + -rm -f src/m68k/*.lo ++ -rm -f src/m88k/*.$(OBJEXT) ++ -rm -f src/m88k/*.lo + -rm -f src/metag/*.$(OBJEXT) + -rm -f src/metag/*.lo + -rm -f src/microblaze/*.$(OBJEXT) +@@ -994,6 +1189,8 @@ + -rm -f src/mips/*.lo + -rm -f src/moxie/*.$(OBJEXT) + -rm -f src/moxie/*.lo ++ -rm -f src/nios2/*.$(OBJEXT) ++ -rm -f src/nios2/*.lo + -rm -f src/pa/*.$(OBJEXT) + -rm -f src/pa/*.lo + -rm -f src/powerpc/*.$(OBJEXT) +@@ -1008,6 +1205,8 @@ + -rm -f src/sparc/*.lo + -rm -f src/tile/*.$(OBJEXT) + -rm -f src/tile/*.lo ++ -rm -f src/vax/*.$(OBJEXT) ++ -rm -f src/vax/*.lo + -rm -f src/x86/*.$(OBJEXT) + -rm -f src/x86/*.lo + -rm -f src/xtensa/*.$(OBJEXT) +@@ -1026,6 +1225,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@src/aarch64/$(DEPDIR)/sysv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/alpha/$(DEPDIR)/ffi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/alpha/$(DEPDIR)/osf.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/arc/$(DEPDIR)/arcompact.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/arc/$(DEPDIR)/ffi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/ffi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/sysv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/trampoline.Plo@am__quote@ +@@ -1043,6 +1244,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@src/m32r/$(DEPDIR)/sysv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/m68k/$(DEPDIR)/ffi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/m68k/$(DEPDIR)/sysv.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/m88k/$(DEPDIR)/ffi.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/m88k/$(DEPDIR)/obsd.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/metag/$(DEPDIR)/ffi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/metag/$(DEPDIR)/sysv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/microblaze/$(DEPDIR)/ffi.Plo@am__quote@ +@@ -1052,6 +1255,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@src/mips/$(DEPDIR)/o32.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/moxie/$(DEPDIR)/eabi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/moxie/$(DEPDIR)/ffi.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/nios2/$(DEPDIR)/ffi.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/nios2/$(DEPDIR)/sysv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/ffi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/hpux32.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/linux.Plo@am__quote@ +@@ -1061,6 +1266,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@src/powerpc/$(DEPDIR)/darwin_closure.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/powerpc/$(DEPDIR)/ffi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/powerpc/$(DEPDIR)/ffi_darwin.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/powerpc/$(DEPDIR)/ffi_linux64.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/powerpc/$(DEPDIR)/ffi_sysv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/powerpc/$(DEPDIR)/linux64.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/powerpc/$(DEPDIR)/linux64_closure.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/powerpc/$(DEPDIR)/ppc_closure.Plo@am__quote@ +@@ -1076,6 +1283,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@src/sparc/$(DEPDIR)/v9.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/tile/$(DEPDIR)/ffi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/tile/$(DEPDIR)/tile.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/vax/$(DEPDIR)/elfbsd.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/vax/$(DEPDIR)/ffi.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/darwin.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/darwin64.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/ffi.Plo@am__quote@ +@@ -1089,52 +1298,52 @@ + @AMDEP_TRUE@@am__include@ @am__quote@src/xtensa/$(DEPDIR)/sysv.Plo@am__quote@ + + .S.o: +-@am__fastdepCCAS_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ ++@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ + @am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ + @am__fastdepCCAS_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ $< ++@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $< + + .S.obj: +-@am__fastdepCCAS_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ ++@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ + @am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ + @am__fastdepCCAS_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .S.lo: +-@am__fastdepCCAS_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ ++@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ + @am__fastdepCCAS_TRUE@ $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ + @am__fastdepCCAS_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCCAS_FALSE@ $(LTCPPASCOMPILE) -c -o $@ $< ++@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $< + + .c.o: +-@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ ++@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ + @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + + .c.obj: +-@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ ++@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ + @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ ++@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ + @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -1144,6 +1353,7 @@ + -rm -rf src/.libs src/_libs + -rm -rf src/aarch64/.libs src/aarch64/_libs + -rm -rf src/alpha/.libs src/alpha/_libs ++ -rm -rf src/arc/.libs src/arc/_libs + -rm -rf src/arm/.libs src/arm/_libs + -rm -rf src/avr32/.libs src/avr32/_libs + -rm -rf src/bfin/.libs src/bfin/_libs +@@ -1152,10 +1362,12 @@ + -rm -rf src/ia64/.libs src/ia64/_libs + -rm -rf src/m32r/.libs src/m32r/_libs + -rm -rf src/m68k/.libs src/m68k/_libs ++ -rm -rf src/m88k/.libs src/m88k/_libs + -rm -rf src/metag/.libs src/metag/_libs + -rm -rf src/microblaze/.libs src/microblaze/_libs + -rm -rf src/mips/.libs src/mips/_libs + -rm -rf src/moxie/.libs src/moxie/_libs ++ -rm -rf src/nios2/.libs src/nios2/_libs + -rm -rf src/pa/.libs src/pa/_libs + -rm -rf src/powerpc/.libs src/powerpc/_libs + -rm -rf src/s390/.libs src/s390/_libs +@@ -1163,6 +1375,7 @@ + -rm -rf src/sh64/.libs src/sh64/_libs + -rm -rf src/sparc/.libs src/sparc/_libs + -rm -rf src/tile/.libs src/tile/_libs ++ -rm -rf src/vax/.libs src/vax/_libs + -rm -rf src/x86/.libs src/x86/_libs + -rm -rf src/xtensa/.libs src/xtensa/_libs + +@@ -1173,7 +1386,7 @@ + @: > doc/$(am__dirstamp) + + $(srcdir)/doc/libffi.info: doc/libffi.texi $(srcdir)/doc/version.texi +- restore=: && backupdir="$(am__leading_dot)am$$$$" && \ ++ $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ + am__cwd=`pwd` && $(am__cd) $(srcdir) && \ + rm -rf $$backupdir && mkdir $$backupdir && \ + if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ +@@ -1195,18 +1408,20 @@ + rm -rf $$backupdir; exit $$rc + + doc/libffi.dvi: doc/libffi.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) +- TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ ++ $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \ +- $(TEXI2DVI) --clean -o $@ `test -f 'doc/libffi.texi' || echo '$(srcdir)/'`doc/libffi.texi ++ $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \ ++ `test -f 'doc/libffi.texi' || echo '$(srcdir)/'`doc/libffi.texi + + doc/libffi.pdf: doc/libffi.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) +- TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ ++ $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \ +- $(TEXI2PDF) --clean -o $@ `test -f 'doc/libffi.texi' || echo '$(srcdir)/'`doc/libffi.texi ++ $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \ ++ `test -f 'doc/libffi.texi' || echo '$(srcdir)/'`doc/libffi.texi + + doc/libffi.html: doc/libffi.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) +- rm -rf $(@:.html=.htp) +- if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \ ++ $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp) ++ $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \ + -o $(@:.html=.htp) `test -f 'doc/libffi.texi' || echo '$(srcdir)/'`doc/libffi.texi; \ + then \ + rm -rf $@; \ +@@ -1238,8 +1453,8 @@ + maintainer-clean-vti: + @MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi + .dvi.ps: +- TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ +- $(DVIPS) -o $@ $< ++ $(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ ++ $(DVIPS) $(AM_V_texinfo) -o $@ $< + + uninstall-dvi-am: + @$(NORMAL_UNINSTALL) +@@ -1318,8 +1533,7 @@ + done + + mostlyclean-aminfo: +- -rm -rf libffi.aux libffi.cp libffi.cps libffi.fn libffi.ky libffi.log \ +- libffi.pg libffi.tmp libffi.toc libffi.tp libffi.vr ++ -rm -rf doc/libffi.t2d doc/libffi.t2p + + clean-aminfo: + -test -z "doc/libffi.dvi doc/libffi.pdf doc/libffi.ps doc/libffi.html" \ +@@ -1359,14 +1573,13 @@ + # (1) if the variable is set in 'config.status', edit 'config.status' + # (which will cause the Makefiles to be regenerated when you run 'make'); + # (2) otherwise, pass the desired values on the 'make' command line. +-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++$(am__recursive_targets): ++ @fail=; \ ++ if $(am__make_keepgoing); then \ ++ failcom='fail=yes'; \ ++ else \ ++ failcom='exit 1'; \ ++ fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ +@@ -1387,31 +1600,13 @@ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" +-tags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ +- done +-ctags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ +- done +-cscopelist-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ +- done + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-recursive ++TAGS: tags + +-TAGS: tags-recursive $(HEADERS) $(SOURCES) fficonfig.h.in $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ +@@ -1427,12 +1622,7 @@ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +- list='$(SOURCES) $(HEADERS) fficonfig.h.in $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -1444,15 +1634,11 @@ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) fficonfig.h.in $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) fficonfig.h.in $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-recursive ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -1461,18 +1647,16 @@ + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +- + cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +- + clean-cscope: + -rm -f cscope.files ++cscope.files: clean-cscope cscopelist ++cscopelist: cscopelist-recursive + +-cscope.files: clean-cscope cscopelist-recursive cscopelist +- +-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP)'; \ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ +@@ -1548,7 +1732,7 @@ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-info ++ dist-info dist-hook + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ +@@ -1609,9 +1793,9 @@ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +- chmod -R a-w $(distdir); chmod u+w $(distdir) +- mkdir $(distdir)/_build +- mkdir $(distdir)/_inst ++ chmod -R a-w $(distdir) ++ chmod u+w $(distdir) ++ mkdir $(distdir)/_build $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +@@ -1714,6 +1898,8 @@ + -rm -f src/aarch64/$(am__dirstamp) + -rm -f src/alpha/$(DEPDIR)/$(am__dirstamp) + -rm -f src/alpha/$(am__dirstamp) ++ -rm -f src/arc/$(DEPDIR)/$(am__dirstamp) ++ -rm -f src/arc/$(am__dirstamp) + -rm -f src/arm/$(DEPDIR)/$(am__dirstamp) + -rm -f src/arm/$(am__dirstamp) + -rm -f src/avr32/$(DEPDIR)/$(am__dirstamp) +@@ -1730,6 +1916,8 @@ + -rm -f src/m32r/$(am__dirstamp) + -rm -f src/m68k/$(DEPDIR)/$(am__dirstamp) + -rm -f src/m68k/$(am__dirstamp) ++ -rm -f src/m88k/$(DEPDIR)/$(am__dirstamp) ++ -rm -f src/m88k/$(am__dirstamp) + -rm -f src/metag/$(DEPDIR)/$(am__dirstamp) + -rm -f src/metag/$(am__dirstamp) + -rm -f src/microblaze/$(DEPDIR)/$(am__dirstamp) +@@ -1738,6 +1926,8 @@ + -rm -f src/mips/$(am__dirstamp) + -rm -f src/moxie/$(DEPDIR)/$(am__dirstamp) + -rm -f src/moxie/$(am__dirstamp) ++ -rm -f src/nios2/$(DEPDIR)/$(am__dirstamp) ++ -rm -f src/nios2/$(am__dirstamp) + -rm -f src/pa/$(DEPDIR)/$(am__dirstamp) + -rm -f src/pa/$(am__dirstamp) + -rm -f src/powerpc/$(DEPDIR)/$(am__dirstamp) +@@ -1752,6 +1942,8 @@ + -rm -f src/sparc/$(am__dirstamp) + -rm -f src/tile/$(DEPDIR)/$(am__dirstamp) + -rm -f src/tile/$(am__dirstamp) ++ -rm -f src/vax/$(DEPDIR)/$(am__dirstamp) ++ -rm -f src/vax/$(am__dirstamp) + -rm -f src/x86/$(DEPDIR)/$(am__dirstamp) + -rm -f src/x86/$(am__dirstamp) + -rm -f src/xtensa/$(DEPDIR)/$(am__dirstamp) +@@ -1768,7 +1960,7 @@ + + distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) +- -rm -rf src/$(DEPDIR) src/aarch64/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/metag/$(DEPDIR) src/microblaze/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/tile/$(DEPDIR) src/x86/$(DEPDIR) src/xtensa/$(DEPDIR) ++ -rm -rf src/$(DEPDIR) src/aarch64/$(DEPDIR) src/alpha/$(DEPDIR) src/arc/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/m88k/$(DEPDIR) src/metag/$(DEPDIR) src/microblaze/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/nios2/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/tile/$(DEPDIR) src/vax/$(DEPDIR) src/x86/$(DEPDIR) src/xtensa/$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags +@@ -1907,7 +2099,7 @@ + maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache +- -rm -rf src/$(DEPDIR) src/aarch64/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/metag/$(DEPDIR) src/microblaze/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/tile/$(DEPDIR) src/x86/$(DEPDIR) src/xtensa/$(DEPDIR) ++ -rm -rf src/$(DEPDIR) src/aarch64/$(DEPDIR) src/alpha/$(DEPDIR) src/arc/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/m88k/$(DEPDIR) src/metag/$(DEPDIR) src/microblaze/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/nios2/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/tile/$(DEPDIR) src/vax/$(DEPDIR) src/x86/$(DEPDIR) src/xtensa/$(DEPDIR) + -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-vti +@@ -1929,36 +2121,36 @@ + uninstall-pdf-am uninstall-pkgconfigDATA uninstall-ps-am \ + uninstall-toolexeclibLTLIBRARIES + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ +- cscopelist-recursive ctags-recursive install-am install-strip \ +- tags-recursive ++.MAKE: $(am__recursive_targets) all install-am install-strip + +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am am--refresh check check-am clean clean-aminfo \ +- clean-cscope clean-generic clean-libtool \ +- clean-noinstLTLIBRARIES clean-toolexeclibLTLIBRARIES cscope \ +- cscopelist cscopelist-recursive ctags ctags-recursive dist \ +- dist-all dist-bzip2 dist-gzip dist-info dist-lzip dist-shar \ +- dist-tarZ dist-xz dist-zip distcheck distclean \ +- distclean-compile distclean-generic distclean-hdr \ +- distclean-libtool distclean-tags distcleancheck distdir \ +- distuninstallcheck dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-pkgconfigDATA install-ps \ +- install-ps-am install-strip install-toolexeclibLTLIBRARIES \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-aminfo \ +- maintainer-clean-generic maintainer-clean-vti mostlyclean \ +- mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-vti pdf pdf-am ps ps-am tags \ +- tags-recursive uninstall uninstall-am uninstall-dvi-am \ +- uninstall-html-am uninstall-info-am uninstall-pdf-am \ +- uninstall-pkgconfigDATA uninstall-ps-am \ +- uninstall-toolexeclibLTLIBRARIES ++.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ ++ am--refresh check check-am clean clean-aminfo clean-cscope \ ++ clean-generic clean-libtool clean-noinstLTLIBRARIES \ ++ clean-toolexeclibLTLIBRARIES cscope cscopelist-am ctags \ ++ ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \ ++ dist-info dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ ++ distcheck distclean distclean-compile distclean-generic \ ++ distclean-hdr distclean-libtool distclean-tags distcleancheck \ ++ distdir distuninstallcheck dvi dvi-am html html-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-pkgconfigDATA \ ++ install-ps install-ps-am install-strip \ ++ install-toolexeclibLTLIBRARIES installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-aminfo maintainer-clean-generic \ ++ maintainer-clean-vti mostlyclean mostlyclean-aminfo \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ mostlyclean-vti pdf pdf-am ps ps-am tags tags-am uninstall \ ++ uninstall-am uninstall-dvi-am uninstall-html-am \ ++ uninstall-info-am uninstall-pdf-am uninstall-pkgconfigDATA \ ++ uninstall-ps-am uninstall-toolexeclibLTLIBRARIES + + ++dist-hook: ++ if [ -d $(top_srcdir)/.git ] ; then (cd $(top_srcdir); git log --no-decorate) ; else echo 'See git log for history.' ; fi > $(distdir)/ChangeLog ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r ee879c0ffa11 Modules/_ctypes/libffi/README +--- a/Modules/_ctypes/libffi/README ++++ b/Modules/_ctypes/libffi/README +@@ -1,8 +1,8 @@ + Status + ====== + +-libffi-3.0.13 was released on March 17, 2013. Check the libffi web +-page for updates: . ++libffi-3.1 was released on May 19, 2014. Check the libffi web page ++for updates: . + + + What is libffi? +@@ -43,7 +43,7 @@ + For specific configuration details and testing status, please + refer to the wiki page here: + +- http://www.moxielogic.org/wiki/index.php?title=Libffi_3.0.13 ++ http://www.moxielogic.org/wiki/index.php?title=Libffi_3.1 + + At the time of release, the following basic configurations have been + tested: +@@ -51,9 +51,11 @@ + |-----------------+------------------+-------------------------| + | Architecture | Operating System | Compiler | + |-----------------+------------------+-------------------------| ++| AArch64 (ARM64) | iOS | Clang | + | AArch64 | Linux | GCC | + | Alpha | Linux | GCC | + | Alpha | Tru64 | GCC | ++| ARC | Linux | GCC | + | ARM | Linux | GCC | + | ARM | iOS | GCC | + | AVR32 | Linux | GCC | +@@ -61,15 +63,17 @@ + | HPPA | HPUX | GCC | + | IA-64 | Linux | GCC | + | M68K | FreeMiNT | GCC | +-| M68K | Linux | GCC | ++| M68K | Linux | GCC | + | M68K | RTEMS | GCC | ++| M88K | OpenBSD/mvme88k | GCC | + | Meta | Linux | GCC | + | MicroBlaze | Linux | GCC | + | MIPS | IRIX | GCC | + | MIPS | Linux | GCC | + | MIPS | RTEMS | GCC | + | MIPS64 | Linux | GCC | +-| Moxie | Bare metal | GCC ++| Moxie | Bare metal | GCC | ++| Nios II | Linux | GCC | + | PowerPC 32-bit | AIX | IBM XL C | + | PowerPC 64-bit | AIX | IBM XL C | + | PowerPC | AMIGA | GCC | +@@ -77,7 +81,8 @@ + | PowerPC | Mac OSX | GCC | + | PowerPC | FreeBSD | GCC | + | PowerPC 64-bit | FreeBSD | GCC | +-| PowerPC 64-bit | Linux | GCC | ++| PowerPC 64-bit | Linux ELFv1 | GCC | ++| PowerPC 64-bit | Linux ELFv2 | GCC | + | S390 | Linux | GCC | + | S390X | Linux | GCC | + | SPARC | Linux | GCC | +@@ -87,6 +92,7 @@ + | SPARC64 | FreeBSD | GCC | + | SPARC64 | Solaris | Oracle Solaris Studio C | + | TILE-Gx/TILEPro | Linux | GCC | ++| VAX | OpenBSD/vax | GCC | + | X86 | FreeBSD | GCC | + | X86 | GNU HURD | GCC | + | X86 | Interix | GCC | +@@ -120,6 +126,9 @@ + "configure" program found in the root directory of the libffi source + distribution. + ++If you're building libffi directly from version control, configure won't ++exist yet; run ./autogen.sh first. ++ + You may want to tell configure where to install the libffi library and + header files. To do that, use the --prefix configure switch. Libffi + will install under /usr/local by default. +@@ -137,13 +146,16 @@ + Microsoft's Visual C++ compiler. In this case, use the msvcc.sh + wrapper script during configuration like so: + +-path/to/configure CC=path/to/msvcc.sh LD=link CPP=\"cl -nologo -EP\" ++path/to/configure CC=path/to/msvcc.sh CXX=path/to/msvcc.sh LD=link CPP=\"cl -nologo -EP\" + +-For 64-bit Windows builds, use CC="path/to/msvcc.sh -m64". +-You may also need to specify --build appropriately. When building with MSVC +-under a MingW environment, you may need to remove the line in configure +-that sets 'fix_srcfile_path' to a 'cygpath' command. ('cygpath' is not +-present in MingW, and is not required when using MingW-style paths.) ++For 64-bit Windows builds, use CC="path/to/msvcc.sh -m64" and ++CXX="path/to/msvcc.sh -m64". You may also need to specify --build ++appropriately. ++ ++When building with MSVC under a MingW environment, you may need to ++remove the line in configure that sets 'fix_srcfile_path' to a 'cygpath' ++command. ('cygpath' is not present in MingW, and is not required when ++using MingW-style paths.) + + For iOS builds, the 'libffi.xcodeproj' Xcode project is available. + +@@ -161,7 +173,20 @@ + History + ======= + +-See the ChangeLog files for details. ++See the git log for details at http://github.com/atgreen/libffi. ++ ++3.1 May-19-14 ++ Add AArch64 (ARM64) iOS support. ++ Add Nios II support. ++ Add m88k and DEC VAX support. ++ Add support for stdcall, thiscall, and fastcall on non-Windows ++ 32-bit x86 targets such as Linux. ++ Various Android, MIPS N32, x86, FreeBSD and UltraSPARC IIi ++ fixes. ++ Make the testsuite more robust: eliminate several spurious ++ failures, and respect the $CC and $CXX environment variables. ++ Archive off the manually maintained ChangeLog in favor of git ++ log. + + 3.0.13 Mar-17-13 + Add Meta support. +@@ -187,7 +212,6 @@ + + 3.0.11 Apr-11-12 + Lots of build fixes. +- Add Amiga newer MacOS support. + Add support for variadic functions (ffi_prep_cif_var). + Add Linux/x32 support. + Add thiscall, fastcall and MSVC cdecl support on Windows. +@@ -339,7 +363,7 @@ + Authors & Credits + ================= + +-libffi was originally written by Anthony Green . ++libffi was originally written by Anthony Green . + + The developers of the GNU Compiler Collection project have made + innumerable valuable contributions. See the ChangeLog file for +@@ -363,10 +387,12 @@ + ia64 Hans Boehm + m32r Kazuhiro Inaoka + m68k Andreas Schwab ++m88k Miod Vallat + microblaze Nathan Rossi + mips Anthony Green, Casey Marshall + mips64 David Daney + moxie Anthony Green ++nios ii Sandra Loosemore + pa Randolph Chung, Dave Anglin, Andreas Tobler + powerpc Geoffrey Keating, Andreas Tobler, + David Edelsohn, John Hornkvist +@@ -376,6 +402,7 @@ + sh64 Kaz Kojima + sparc Anthony Green, Gordon Irlam + tile-gx/tilepro Walter Lee ++vax Miod Vallat + x86 Anthony Green, Jon Beniston + x86-64 Bo Thorsen + xtensa Chris Zankel +diff -r ee879c0ffa11 Modules/_ctypes/libffi/aclocal.m4 +--- a/Modules/_ctypes/libffi/aclocal.m4 ++++ b/Modules/_ctypes/libffi/aclocal.m4 +@@ -1,6 +1,6 @@ +-# generated automatically by aclocal 1.12.2 -*- Autoconf -*- ++# generated automatically by aclocal 1.13.4 -*- Autoconf -*- + +-# Copyright (C) 1996-2012 Free Software Foundation, Inc. ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. + + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -11,6 +11,7 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + ++m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +@@ -837,24 +838,22 @@ + dnl aclocal-1.4 backwards compatibility: + dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], []) + +-# Copyright (C) 2002-2012 Free Software Foundation, Inc. ++# Copyright (C) 2002-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 8 +- + # AM_AUTOMAKE_VERSION(VERSION) + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.12' ++[am__api_version='1.13' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.12.2], [], ++m4_if([$1], [1.13.4], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -870,21 +869,19 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.12.2])dnl ++[AM_AUTOMAKE_VERSION([1.13.4])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # Figure out how to run the assembler. -*- Autoconf -*- + +-# Copyright (C) 2001-2012 Free Software Foundation, Inc. ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 +- + # AM_PROG_AS + # ---------- + AC_DEFUN([AM_PROG_AS], +@@ -899,14 +896,12 @@ + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +-# Copyright (C) 2001-2012 Free Software Foundation, Inc. ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 +- + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets + # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to + # '$srcdir', '$srcdir/..', or '$srcdir/../..'. +@@ -954,14 +949,12 @@ + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997-2012 Free Software Foundation, Inc. ++# Copyright (C) 1997-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 10 +- + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- + # Define a conditional. +@@ -987,13 +980,12 @@ + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +-# Copyright (C) 1999-2012 Free Software Foundation, Inc. ++# Copyright (C) 1999-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 17 + + # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -1179,19 +1171,18 @@ + + # Generate code to set up dependency tracking. -*- Autoconf -*- + +-# Copyright (C) 1999-2012 Free Software Foundation, Inc. ++# Copyright (C) 1999-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 6 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], + [{ +- # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in +@@ -1220,7 +1211,7 @@ + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue ++ test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the +@@ -1256,14 +1247,12 @@ + + # Do all the work for Automake. -*- Autoconf -*- + +-# Copyright (C) 1996-2012 Free Software Foundation, Inc. ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 19 +- + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. + +@@ -1279,7 +1268,7 @@ + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.62])dnl ++[AC_PREREQ([2.65])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +@@ -1309,8 +1298,7 @@ + dnl Distinguish between old-style and new-style calls. + m4_ifval([$2], + [AC_DIAGNOSE([obsolete], +-[$0: two- and three-arguments forms are deprecated. For more info, see: +-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) ++ [$0: two- and three-arguments forms are deprecated.]) + m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +@@ -1364,18 +1352,15 @@ + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +-dnl Support for Objective C++ was only introduced in Autoconf 2.65, +-dnl but we still cater to Autoconf 2.62. +-m4_ifdef([AC_PROG_OBJCXX], +-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], ++AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], +- m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl ++ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl + ]) +-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the +-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_REQUIRE([AM_SILENT_RULES])dnl ++dnl The testsuite driver may need to know about EXEEXT, so add the ++dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This ++dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. + AC_CONFIG_COMMANDS_PRE(dnl + [m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +@@ -1409,14 +1394,12 @@ + done + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-# Copyright (C) 2001-2012 Free Software Foundation, Inc. ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 8 +- + # AM_PROG_INSTALL_SH + # ------------------ + # Define $install_sh. +@@ -1432,14 +1415,12 @@ + fi + AC_SUBST([install_sh])]) + +-# Copyright (C) 2003-2012 Free Software Foundation, Inc. ++# Copyright (C) 2003-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 +- + # Check whether the underlying file-system supports filenames + # with a leading dot. For instance MS-DOS doesn't. + AC_DEFUN([AM_SET_LEADING_DOT], +@@ -1456,14 +1437,12 @@ + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + +-# Copyright (C) 1996-2012 Free Software Foundation, Inc. ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 7 +- + # AM_MAINTAINER_MODE([DEFAULT-MODE]) + # ---------------------------------- + # Control maintainer-specific portions of Makefiles. +@@ -1491,18 +1470,14 @@ + ] + ) + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +- + # Check to see how 'make' treats includes. -*- Autoconf -*- + +-# Copyright (C) 2001-2012 Free Software Foundation, Inc. ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 +- + # AM_MAKE_INCLUDE() + # ----------------- + # Check to see how make treats includes. +@@ -1545,14 +1520,12 @@ + rm -f confinc confmf + ]) + +-# Copyright (C) 1999-2012 Free Software Foundation, Inc. ++# Copyright (C) 1999-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 6 +- + # AM_PROG_CC_C_O + # -------------- + # Like AC_PROG_CC_C_O, but changed for automake. +@@ -1581,14 +1554,12 @@ + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997-2012 Free Software Foundation, Inc. ++# Copyright (C) 1997-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 7 +- + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ + AC_DEFUN([AM_MISSING_PROG], +@@ -1596,11 +1567,10 @@ + $1=${$1-"${am_missing_run}$2"} + AC_SUBST($1)]) + +- + # AM_MISSING_HAS_RUN + # ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. ++# Define MISSING if not defined so far and test if it is modern enough. ++# If it is, set am_missing_run to use it, otherwise, to nothing. + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl + AC_REQUIRE_AUX_FILE([missing])dnl +@@ -1613,8 +1583,8 @@ + esac + fi + # Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " ++if eval "$MISSING --is-lightweight"; then ++ am_missing_run="$MISSING " + else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +@@ -1623,14 +1593,12 @@ + + # Helper functions for option handling. -*- Autoconf -*- + +-# Copyright (C) 2001-2012 Free Software Foundation, Inc. ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 6 +- + # _AM_MANGLE_OPTION(NAME) + # ----------------------- + AC_DEFUN([_AM_MANGLE_OPTION], +@@ -1656,14 +1624,12 @@ + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# Copyright (C) 1996-2012 Free Software Foundation, Inc. ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 9 +- + # AM_SANITY_CHECK + # --------------- + AC_DEFUN([AM_SANITY_CHECK], +@@ -1739,13 +1705,71 @@ + rm -f conftest.file + ]) + +-# Copyright (C) 2001-2012 Free Software Foundation, Inc. ++# Copyright (C) 2009-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 ++# AM_SILENT_RULES([DEFAULT]) ++# -------------------------- ++# Enable less verbose build rules; with the default set to DEFAULT ++# ("yes" being less verbose, "no" or empty being verbose). ++AC_DEFUN([AM_SILENT_RULES], ++[AC_ARG_ENABLE([silent-rules], [dnl ++AS_HELP_STRING( ++ [--enable-silent-rules], ++ [less verbose build output (undo: "make V=1")]) ++AS_HELP_STRING( ++ [--disable-silent-rules], ++ [verbose build output (undo: "make V=0")])dnl ++]) ++case $enable_silent_rules in @%:@ ((( ++ yes) AM_DEFAULT_VERBOSITY=0;; ++ no) AM_DEFAULT_VERBOSITY=1;; ++ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; ++esac ++dnl ++dnl A few 'make' implementations (e.g., NonStop OS and NextStep) ++dnl do not support nested variable expansions. ++dnl See automake bug#9928 and bug#10237. ++am_make=${MAKE-make} ++AC_CACHE_CHECK([whether $am_make supports nested variables], ++ [am_cv_make_support_nested_variables], ++ [if AS_ECHO([['TRUE=$(BAR$(V)) ++BAR0=false ++BAR1=true ++V=1 ++am__doit: ++ @$(TRUE) ++.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then ++ am_cv_make_support_nested_variables=yes ++else ++ am_cv_make_support_nested_variables=no ++fi]) ++if test $am_cv_make_support_nested_variables = yes; then ++ dnl Using '$V' instead of '$(V)' breaks IRIX make. ++ AM_V='$(V)' ++ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' ++else ++ AM_V=$AM_DEFAULT_VERBOSITY ++ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY ++fi ++AC_SUBST([AM_V])dnl ++AM_SUBST_NOTMAKE([AM_V])dnl ++AC_SUBST([AM_DEFAULT_V])dnl ++AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl ++AC_SUBST([AM_DEFAULT_VERBOSITY])dnl ++AM_BACKSLASH='\' ++AC_SUBST([AM_BACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++]) ++ ++# Copyright (C) 2001-2013 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + + # AM_PROG_INSTALL_STRIP + # --------------------- +@@ -1769,14 +1793,12 @@ + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Copyright (C) 2006-2012 Free Software Foundation, Inc. ++# Copyright (C) 2006-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 +- + # _AM_SUBST_NOTMAKE(VARIABLE) + # --------------------------- + # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +@@ -1790,14 +1812,12 @@ + + # Check how to create a tarball. -*- Autoconf -*- + +-# Copyright (C) 2004-2012 Free Software Foundation, Inc. ++# Copyright (C) 2004-2013 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 +- + # _AM_PROG_TAR(FORMAT) + # -------------------- + # Check how to create a tarball in format FORMAT. +@@ -1811,76 +1831,114 @@ + # Substitute a variable $(am__untar) that extract such + # a tarball read from stdin. + # $(am__untar) < result.tar ++# + AC_DEFUN([_AM_PROG_TAR], + [# Always define AMTAR for backward compatibility. Yes, it's still used + # in the wild :-( We should find a proper way to deprecate it ... + AC_SUBST([AMTAR], ['$${TAR-tar}']) ++ ++# We'll loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++ + m4_if([$1], [v7], +- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of '-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac ++ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break ++ [m4_case([$1], ++ [ustar], ++ [# The POSIX 1988 'ustar' format is defined with fixed-size fields. ++ # There is notably a 21 bits limit for the UID and the GID. In fact, ++ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 ++ # and bug#13588). ++ am_max_uid=2097151 # 2^21 - 1 ++ am_max_gid=$am_max_uid ++ # The $UID and $GID variables are not portable, so we need to resort ++ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls ++ # below are definitely unexpected, so allow the users to see them ++ # (that is, avoid stderr redirection). ++ am_uid=`id -u || echo unknown` ++ am_gid=`id -g || echo unknown` ++ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) ++ if test $am_uid -le $am_max_uid; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ _am_tools=none ++ fi ++ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) ++ if test $am_gid -le $am_max_gid; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ _am_tools=none ++ fi], + +- # tar/untar a dummy directory, and stop if the command works ++ [pax], ++ [], ++ ++ [m4_fatal([Unknown tar format])]) ++ ++ AC_MSG_CHECKING([how to create a $1 tar archive]) ++ ++ # Go ahead even if we have the value already cached. We do so because we ++ # need to set the values for the 'am__tar' and 'am__untar' variables. ++ _am_tools=${am_cv_prog_tar_$1-$_am_tools} ++ ++ for _am_tool in $_am_tools; do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac ++ ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works. ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++ done + rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir + +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++ AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++ + AC_SUBST([am__tar]) + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR +diff -r ee879c0ffa11 Modules/_ctypes/libffi/build-ios.sh +--- a/Modules/_ctypes/libffi/build-ios.sh ++++ /dev/null +@@ -1,67 +0,0 @@ +-#!/bin/sh +- +-PLATFORM_IOS=/Developer/Platforms/iPhoneOS.platform/ +-PLATFORM_IOS_SIM=/Developer/Platforms/iPhoneSimulator.platform/ +-SDK_IOS_VERSION="4.2" +-MIN_IOS_VERSION="3.0" +-OUTPUT_DIR="universal-ios" +- +-build_target () { +- local platform=$1 +- local sdk=$2 +- local arch=$3 +- local triple=$4 +- local builddir=$5 +- +- mkdir -p "${builddir}" +- pushd "${builddir}" +- export CC="${platform}"/Developer/usr/bin/gcc-4.2 +- export CFLAGS="-arch ${arch} -isysroot ${sdk} -miphoneos-version-min=${MIN_IOS_VERSION}" +- ../configure --host=${triple} && make +- popd +-} +- +-# Build all targets +-build_target "${PLATFORM_IOS}" "${PLATFORM_IOS}/Developer/SDKs/iPhoneOS${SDK_IOS_VERSION}.sdk/" armv6 arm-apple-darwin10 armv6-ios +-build_target "${PLATFORM_IOS}" "${PLATFORM_IOS}/Developer/SDKs/iPhoneOS${SDK_IOS_VERSION}.sdk/" armv7 arm-apple-darwin10 armv7-ios +-build_target "${PLATFORM_IOS_SIM}" "${PLATFORM_IOS_SIM}/Developer/SDKs/iPhoneSimulator${SDK_IOS_VERSION}.sdk/" i386 i386-apple-darwin10 i386-ios-sim +- +-# Create universal output directories +-mkdir -p "${OUTPUT_DIR}" +-mkdir -p "${OUTPUT_DIR}/include" +-mkdir -p "${OUTPUT_DIR}/include/armv6" +-mkdir -p "${OUTPUT_DIR}/include/armv7" +-mkdir -p "${OUTPUT_DIR}/include/i386" +- +-# Create the universal binary +-lipo -create armv6-ios/.libs/libffi.a armv7-ios/.libs/libffi.a i386-ios-sim/.libs/libffi.a -output "${OUTPUT_DIR}/libffi.a" +- +-# Copy in the headers +-copy_headers () { +- local src=$1 +- local dest=$2 +- +- # Fix non-relative header reference +- sed 's//"ffitarget.h"/' < "${src}/include/ffi.h" > "${dest}/ffi.h" +- cp "${src}/include/ffitarget.h" "${dest}" +-} +- +-copy_headers armv6-ios "${OUTPUT_DIR}/include/armv6" +-copy_headers armv7-ios "${OUTPUT_DIR}/include/armv7" +-copy_headers i386-ios-sim "${OUTPUT_DIR}/include/i386" +- +-# Create top-level header +-( +-cat << EOF +-#ifdef __arm__ +- #include +- #ifdef _ARM_ARCH_6 +- #include "include/armv6/ffi.h" +- #elif _ARM_ARCH_7 +- #include "include/armv7/ffi.h" +- #endif +-#elif defined(__i386__) +- #include "include/i386/ffi.h" +-#endif +-EOF +-) > "${OUTPUT_DIR}/ffi.h" +diff -r ee879c0ffa11 Modules/_ctypes/libffi/compile +--- a/Modules/_ctypes/libffi/compile ++++ b/Modules/_ctypes/libffi/compile +@@ -1,10 +1,9 @@ + #! /bin/sh +-# Wrapper for compilers which do not understand `-c -o'. ++# Wrapper for compilers which do not understand '-c -o'. + +-scriptversion=2009-10-06.20; # UTC ++scriptversion=2012-10-14.11; # UTC + +-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software +-# Foundation, Inc. ++# Copyright (C) 1999-2013 Free Software Foundation, Inc. + # Written by Tom Tromey . + # + # This program is free software; you can redistribute it and/or modify +@@ -29,21 +28,224 @@ + # bugs to or send patches to + # . + ++nl=' ++' ++ ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent tools from complaining about whitespace usage. ++IFS=" "" $nl" ++ ++file_conv= ++ ++# func_file_conv build_file lazy ++# Convert a $build file to $host form and store it in $file ++# Currently only supports Windows hosts. If the determined conversion ++# type is listed in (the comma separated) LAZY, no conversion will ++# take place. ++func_file_conv () ++{ ++ file=$1 ++ case $file in ++ / | /[!/]*) # absolute file, and not a UNC file ++ if test -z "$file_conv"; then ++ # lazily determine how to convert abs files ++ case `uname -s` in ++ MINGW*) ++ file_conv=mingw ++ ;; ++ CYGWIN*) ++ file_conv=cygwin ++ ;; ++ *) ++ file_conv=wine ++ ;; ++ esac ++ fi ++ case $file_conv/,$2, in ++ *,$file_conv,*) ++ ;; ++ mingw/*) ++ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ++ ;; ++ cygwin/*) ++ file=`cygpath -m "$file" || echo "$file"` ++ ;; ++ wine/*) ++ file=`winepath -w "$file" || echo "$file"` ++ ;; ++ esac ++ ;; ++ esac ++} ++ ++# func_cl_dashL linkdir ++# Make cl look for libraries in LINKDIR ++func_cl_dashL () ++{ ++ func_file_conv "$1" ++ if test -z "$lib_path"; then ++ lib_path=$file ++ else ++ lib_path="$lib_path;$file" ++ fi ++ linker_opts="$linker_opts -LIBPATH:$file" ++} ++ ++# func_cl_dashl library ++# Do a library search-path lookup for cl ++func_cl_dashl () ++{ ++ lib=$1 ++ found=no ++ save_IFS=$IFS ++ IFS=';' ++ for dir in $lib_path $LIB ++ do ++ IFS=$save_IFS ++ if $shared && test -f "$dir/$lib.dll.lib"; then ++ found=yes ++ lib=$dir/$lib.dll.lib ++ break ++ fi ++ if test -f "$dir/$lib.lib"; then ++ found=yes ++ lib=$dir/$lib.lib ++ break ++ fi ++ if test -f "$dir/lib$lib.a"; then ++ found=yes ++ lib=$dir/lib$lib.a ++ break ++ fi ++ done ++ IFS=$save_IFS ++ ++ if test "$found" != yes; then ++ lib=$lib.lib ++ fi ++} ++ ++# func_cl_wrapper cl arg... ++# Adjust compile command to suit cl ++func_cl_wrapper () ++{ ++ # Assume a capable shell ++ lib_path= ++ shared=: ++ linker_opts= ++ for arg ++ do ++ if test -n "$eat"; then ++ eat= ++ else ++ case $1 in ++ -o) ++ # configure might choose to run compile as 'compile cc -o foo foo.c'. ++ eat=1 ++ case $2 in ++ *.o | *.[oO][bB][jJ]) ++ func_file_conv "$2" ++ set x "$@" -Fo"$file" ++ shift ++ ;; ++ *) ++ func_file_conv "$2" ++ set x "$@" -Fe"$file" ++ shift ++ ;; ++ esac ++ ;; ++ -I) ++ eat=1 ++ func_file_conv "$2" mingw ++ set x "$@" -I"$file" ++ shift ++ ;; ++ -I*) ++ func_file_conv "${1#-I}" mingw ++ set x "$@" -I"$file" ++ shift ++ ;; ++ -l) ++ eat=1 ++ func_cl_dashl "$2" ++ set x "$@" "$lib" ++ shift ++ ;; ++ -l*) ++ func_cl_dashl "${1#-l}" ++ set x "$@" "$lib" ++ shift ++ ;; ++ -L) ++ eat=1 ++ func_cl_dashL "$2" ++ ;; ++ -L*) ++ func_cl_dashL "${1#-L}" ++ ;; ++ -static) ++ shared=false ++ ;; ++ -Wl,*) ++ arg=${1#-Wl,} ++ save_ifs="$IFS"; IFS=',' ++ for flag in $arg; do ++ IFS="$save_ifs" ++ linker_opts="$linker_opts $flag" ++ done ++ IFS="$save_ifs" ++ ;; ++ -Xlinker) ++ eat=1 ++ linker_opts="$linker_opts $2" ++ ;; ++ -*) ++ set x "$@" "$1" ++ shift ++ ;; ++ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) ++ func_file_conv "$1" ++ set x "$@" -Tp"$file" ++ shift ++ ;; ++ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) ++ func_file_conv "$1" mingw ++ set x "$@" "$file" ++ shift ++ ;; ++ *) ++ set x "$@" "$1" ++ shift ++ ;; ++ esac ++ fi ++ shift ++ done ++ if test -n "$linker_opts"; then ++ linker_opts="-link$linker_opts" ++ fi ++ exec "$@" $linker_opts ++ exit 1 ++} ++ ++eat= ++ + case $1 in + '') +- echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ++ echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF + Usage: compile [--help] [--version] PROGRAM [ARGS] + +-Wrapper for compilers which do not understand `-c -o'. +-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining ++Wrapper for compilers which do not understand '-c -o'. ++Remove '-o dest.o' from ARGS, run PROGRAM with the remaining + arguments, and rename the output as expected. + + If you are trying to build a whole package this is not the +-right script to run: please start by reading the file `INSTALL'. ++right script to run: please start by reading the file 'INSTALL'. + + Report bugs to . + EOF +@@ -53,11 +255,13 @@ + echo "compile $scriptversion" + exit $? + ;; ++ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) ++ func_cl_wrapper "$@" # Doesn't return... ++ ;; + esac + + ofile= + cfile= +-eat= + + for arg + do +@@ -66,8 +270,8 @@ + else + case $1 in + -o) +- # configure might choose to run compile as `compile cc -o foo foo.c'. +- # So we strip `-o arg' only if arg is an object. ++ # configure might choose to run compile as 'compile cc -o foo foo.c'. ++ # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) +@@ -94,10 +298,10 @@ + done + + if test -z "$ofile" || test -z "$cfile"; then +- # If no `-o' option was seen then we might have been invoked from a ++ # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no +- # `.c' file was seen then we are probably linking. That is also ++ # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" + fi +@@ -106,7 +310,7 @@ + cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + + # Create the lock directory. +-# Note: use `[/\\:.-]' here to ensure that we don't use the same name ++# Note: use '[/\\:.-]' here to ensure that we don't use the same name + # that we are using for the .o file. Also, base the name on the expected + # object file name, since that is what matters with a parallel build. + lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +diff -r ee879c0ffa11 Modules/_ctypes/libffi/configure +--- a/Modules/_ctypes/libffi/configure ++++ b/Modules/_ctypes/libffi/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for libffi 3.0.13. ++# Generated by GNU Autoconf 2.69 for libffi 3.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ + # Identity of this package. + PACKAGE_NAME='libffi' + PACKAGE_TARNAME='libffi' +-PACKAGE_VERSION='3.0.13' +-PACKAGE_STRING='libffi 3.0.13' ++PACKAGE_VERSION='3.1' ++PACKAGE_STRING='libffi 3.1' + PACKAGE_BUGREPORT='http://github.com/atgreen/libffi/issues' + PACKAGE_URL='' + +@@ -645,10 +645,13 @@ + FFI_EXEC_TRAMPOLINE_TABLE_FALSE + FFI_EXEC_TRAMPOLINE_TABLE_TRUE + sys_symbol_underscore ++HAVE_LONG_DOUBLE_VARIANT + HAVE_LONG_DOUBLE + ALLOCA + XTENSA_FALSE + XTENSA_TRUE ++VAX_FALSE ++VAX_TRUE + TILE_FALSE + TILE_TRUE + PA64_HPUX_FALSE +@@ -673,6 +676,8 @@ + AVR32_TRUE + ARM_FALSE + ARM_TRUE ++ARC_FALSE ++ARC_TRUE + AARCH64_FALSE + AARCH64_TRUE + POWERPC_FREEBSD_FALSE +@@ -683,12 +688,16 @@ + POWERPC_AIX_TRUE + POWERPC_FALSE + POWERPC_TRUE ++NIOS2_FALSE ++NIOS2_TRUE + MOXIE_FALSE + MOXIE_TRUE + METAG_FALSE + METAG_TRUE + MICROBLAZE_FALSE + MICROBLAZE_TRUE ++M88K_FALSE ++M88K_TRUE + M68K_FALSE + M68K_TRUE + M32R_FALSE +@@ -697,6 +706,10 @@ + IA64_TRUE + ALPHA_FALSE + ALPHA_TRUE ++X86_DARWIN64_FALSE ++X86_DARWIN64_TRUE ++X86_DARWIN32_FALSE ++X86_DARWIN32_TRUE + X86_DARWIN_FALSE + X86_DARWIN_TRUE + X86_WIN64_FALSE +@@ -721,6 +734,7 @@ + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE + PRTDIAG ++CXXCPP + CPP + OTOOL64 + OTOOL +@@ -748,6 +762,12 @@ + CCASDEPMODE + CCASFLAGS + CCAS ++am__fastdepCXX_FALSE ++am__fastdepCXX_TRUE ++CXXDEPMODE ++ac_ct_CXX ++CXXFLAGS ++CXX + am__fastdepCC_FALSE + am__fastdepCC_TRUE + CCDEPMODE +@@ -765,6 +785,10 @@ + LDFLAGS + CFLAGS + CC ++AM_BACKSLASH ++AM_DEFAULT_VERBOSITY ++AM_DEFAULT_V ++AM_V + am__untar + am__tar + AMTAR +@@ -843,6 +867,7 @@ + ac_user_opts=' + enable_option_checking + enable_builddir ++enable_silent_rules + enable_dependency_tracking + enable_shared + enable_static +@@ -866,7 +891,8 @@ + CCAS + CCASFLAGS + CPP +-CPPFLAGS' ++CPPFLAGS ++CXXCPP' + + + # Initialize some variables set by options. +@@ -1407,7 +1433,7 @@ + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures libffi 3.0.13 to adapt to many kinds of systems. ++\`configure' configures libffi 3.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1478,7 +1504,7 @@ + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of libffi 3.0.13:";; ++ short | recursive ) echo "Configuration of libffi 3.1:";; + esac + cat <<\_ACEOF + +@@ -1488,6 +1514,8 @@ + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-builddir disable automatic build in subdir of sources + ++ --enable-silent-rules less verbose build output (undo: "make V=1") ++ --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking +@@ -1515,8 +1543,8 @@ + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR +- (or the compiler's sysroot if not specified). ++ --with-sysroot[=DIR] Search for dependent libraries within DIR (or the ++ compiler's sysroot if not specified). + --with-gcc-arch= use architecture for gcc -march/-mtune, + instead of guessing + +@@ -1528,9 +1556,12 @@ + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory ++ CXX C++ compiler command ++ CXXFLAGS C++ compiler flags + CCAS assembler compiler command (defaults to CC) + CCASFLAGS assembler compiler flags (defaults to CFLAGS) + CPP C preprocessor ++ CXXCPP C++ preprocessor + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -1598,7 +1629,7 @@ + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-libffi configure 3.0.13 ++libffi configure 3.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -1650,6 +1681,44 @@ + + } # ac_fn_c_try_compile + ++# ac_fn_cxx_try_compile LINENO ++# ---------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_cxx_try_compile ++ + # ac_fn_c_try_link LINENO + # ----------------------- + # Try to link conftest.$ac_ext, and return whether this succeeded. +@@ -1873,6 +1942,89 @@ + + } # ac_fn_c_check_func + ++# ac_fn_cxx_try_cpp LINENO ++# ------------------------ ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } > conftest.i && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_cxx_try_cpp ++ ++# ac_fn_cxx_try_link LINENO ++# ------------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ test -x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_cxx_try_link ++ + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES + # -------------------------------------------- + # Tries to find the compile-time value of EXPR in a program that includes +@@ -2204,7 +2356,7 @@ + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by libffi $as_me 3.0.13, which was ++It was created by libffi $as_me 3.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2697,7 +2849,11 @@ + + target_alias=${target_alias-$host_alias} + +-. ${srcdir}/configure.host ++case "${host}" in ++ frv*-elf) ++ LDFLAGS=`echo $LDFLAGS | sed "s/\-B^ *libgloss\/frv\///"`\ -B`pwd`/../libgloss/frv/ ++ ;; ++esac + + + # [$]@ is unsable in 2.60+ but earlier autoconf had no ac_configure_args +@@ -2803,7 +2959,7 @@ + ac_config_commands="$ac_config_commands buildir" + + +-am__api_version='1.12' ++am__api_version='1.13' + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -2984,8 +3140,8 @@ + esac + fi + # Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " ++if eval "$MISSING --is-lightweight"; then ++ am_missing_run="$MISSING " + else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +@@ -3225,6 +3381,45 @@ + fi + rmdir .tst 2>/dev/null + ++# Check whether --enable-silent-rules was given. ++if test "${enable_silent_rules+set}" = set; then : ++ enableval=$enable_silent_rules; ++fi ++ ++case $enable_silent_rules in # ((( ++ yes) AM_DEFAULT_VERBOSITY=0;; ++ no) AM_DEFAULT_VERBOSITY=1;; ++ *) AM_DEFAULT_VERBOSITY=1;; ++esac ++am_make=${MAKE-make} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 ++$as_echo_n "checking whether $am_make supports nested variables... " >&6; } ++if ${am_cv_make_support_nested_variables+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if $as_echo 'TRUE=$(BAR$(V)) ++BAR0=false ++BAR1=true ++V=1 ++am__doit: ++ @$(TRUE) ++.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then ++ am_cv_make_support_nested_variables=yes ++else ++ am_cv_make_support_nested_variables=no ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 ++$as_echo "$am_cv_make_support_nested_variables" >&6; } ++if test $am_cv_make_support_nested_variables = yes; then ++ AM_V='$(V)' ++ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' ++else ++ AM_V=$AM_DEFAULT_VERBOSITY ++ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY ++fi ++AM_BACKSLASH='\' ++ + if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." +@@ -3247,7 +3442,7 @@ + + # Define the identity of the package. + PACKAGE='libffi' +- VERSION='3.0.13' ++ VERSION='3.1' + + + cat >>confdefs.h <<_ACEOF +@@ -3287,6 +3482,10 @@ + # in the wild :-( We should find a proper way to deprecate it ... + AMTAR='$${TAR-tar}' + ++ ++# We'll loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar pax cpio none' ++ + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + +@@ -3294,6 +3493,7 @@ + + + ++ + # The same as in boehm-gc and libstdc++. Have to borrow it from there. + # We must force CC to /not/ be precious variables; otherwise + # the wrong, non-multilib-adjusted value will be used in multilibs. +@@ -4284,6 +4484,391 @@ + fi + + ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++if test -z "$CXX"; then ++ if test -n "$CCC"; then ++ CXX=$CCC ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CXX"; then ++ ac_cv_prog_CXX="$CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CXX=$ac_cv_prog_CXX ++if test -n "$CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 ++$as_echo "$CXX" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$CXX" && break ++ done ++fi ++if test -z "$CXX"; then ++ ac_ct_CXX=$CXX ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CXX"; then ++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_ac_ct_CXX="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX ++if test -n "$ac_ct_CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 ++$as_echo "$ac_ct_CXX" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CXX" && break ++done ++ ++ if test "x$ac_ct_CXX" = x; then ++ CXX="g++" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CXX=$ac_ct_CXX ++ fi ++fi ++ ++ fi ++fi ++# Provide some information about the compiler. ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } ++if ${ac_cv_cxx_compiler_gnu+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_compiler_gnu=yes ++else ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 ++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GXX=yes ++else ++ GXX= ++fi ++ac_test_CXXFLAGS=${CXXFLAGS+set} ++ac_save_CXXFLAGS=$CXXFLAGS ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 ++$as_echo_n "checking whether $CXX accepts -g... " >&6; } ++if ${ac_cv_prog_cxx_g+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++ ac_cxx_werror_flag=yes ++ ac_cv_prog_cxx_g=no ++ CXXFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes ++else ++ CXXFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ++else ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++ CXXFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 ++$as_echo "$ac_cv_prog_cxx_g" >&6; } ++if test "$ac_test_CXXFLAGS" = set; then ++ CXXFLAGS=$ac_save_CXXFLAGS ++elif test $ac_cv_prog_cxx_g = yes; then ++ if test "$GXX" = yes; then ++ CXXFLAGS="-g -O2" ++ else ++ CXXFLAGS="-g" ++ fi ++else ++ if test "$GXX" = yes; then ++ CXXFLAGS="-O2" ++ else ++ CXXFLAGS= ++ fi ++fi ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++depcc="$CXX" am_compiler_list= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if ${am_cv_CXX_dependencies_compiler_type+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named 'D' -- because '-MD' means "put the output ++ # in D". ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CXX_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with ++ # Solaris 10 /bin/sh. ++ echo '/* dummy */' > sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ # We check with '-c' and '-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle '-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs. ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # After this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested. ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvc7 | msvc7msys | msvisualcpp | msvcmsys) ++ # This compiler won't grok '-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CXX_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CXX_dependencies_compiler_type=none ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } ++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then ++ am__fastdepCXX_TRUE= ++ am__fastdepCXX_FALSE='#' ++else ++ am__fastdepCXX_TRUE='#' ++ am__fastdepCXX_FALSE= ++fi ++ ++ + CFLAGS=$save_CFLAGS + + +@@ -4557,22 +5142,22 @@ + + + +-macro_version='2.4.2' +-macro_revision='1.3337' +- +- +- +- +- +- +- +- +- +- +- +- +- +-ltmain="$ac_aux_dir/ltmain.sh" ++macro_version='2.4.2.418' ++macro_revision='2.4.2.418' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ltmain=$ac_aux_dir/ltmain.sh + + # Backslashify metacharacters that are still active within + # double-quoted strings. +@@ -4621,7 +5206,7 @@ + $ECHO "" + } + +-case "$ECHO" in ++case $ECHO in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 + $as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +@@ -4944,19 +5529,19 @@ + + # Check whether --with-gnu-ld was given. + if test "${with_gnu_ld+set}" = set; then : +- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes ++ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes + else + with_gnu_ld=no + fi + + ac_prog=ld +-if test "$GCC" = yes; then ++if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 + $as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw ++ # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +@@ -4970,7 +5555,7 @@ + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done +- test -z "$LD" && LD="$ac_prog" ++ test -z "$LD" && LD=$ac_prog + ;; + "") + # If it fails, then pretend we aren't using GCC. +@@ -4981,7 +5566,7 @@ + with_gnu_ld=unknown + ;; + esac +-elif test "$with_gnu_ld" = yes; then ++elif test yes = "$with_gnu_ld"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + $as_echo_n "checking for GNU ld... " >&6; } + else +@@ -4992,32 +5577,32 @@ + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- lt_cv_path_LD="$ac_dir/$ac_prog" ++ lt_cv_path_LD=$ac_dir/$ac_prog + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 + $as_echo "$LD" >&6; } +@@ -5060,33 +5645,33 @@ + else + if test -n "$NM"; then + # Let the user override the test. +- lt_cv_path_NM="$NM" +-else +- lt_nm_to_check="${ac_tool_prefix}nm" ++ lt_cv_path_NM=$NM ++else ++ lt_nm_to_check=${ac_tool_prefix}nm + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/$lt_tmp_nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ tmp_nm=$ac_dir/$lt_tmp_nm ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then + # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # Adding the 'sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" +- break ++ break 2 + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" +- break ++ break 2 + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +@@ -5097,15 +5682,15 @@ + esac + fi + done +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 + $as_echo "$lt_cv_path_NM" >&6; } +-if test "$lt_cv_path_NM" != "no"; then +- NM="$lt_cv_path_NM" ++if test no != "$lt_cv_path_NM"; then ++ NM=$lt_cv_path_NM + else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : +@@ -5211,9 +5796,9 @@ + fi + fi + +- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in ++ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) +- DUMPBIN="$DUMPBIN -symbols" ++ DUMPBIN="$DUMPBIN -symbols -headers" + ;; + *) + DUMPBIN=: +@@ -5221,8 +5806,8 @@ + esac + fi + +- if test "$DUMPBIN" != ":"; then +- NM="$DUMPBIN" ++ if test : != "$DUMPBIN"; then ++ NM=$DUMPBIN + fi + fi + test -z "$NM" && NM=nm +@@ -5273,7 +5858,7 @@ + $as_echo_n "(cached) " >&6 + else + i=0 +- teststring="ABCD" ++ teststring=ABCD + + case $build_os in + msdosdjgpp*) +@@ -5313,7 +5898,7 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +@@ -5364,22 +5949,22 @@ + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ +- test undefined != "$lt_cv_sys_max_cmd_len"; then ++ test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. +- for i in 1 2 3 4 5 6 7 8 ; do ++ for i in 1 2 3 4 5 6 7 8; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. +- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ ++ while { test X`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && +- test $i != 17 # 1/2 MB should be enough ++ test 17 != "$i" # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring +@@ -5397,7 +5982,7 @@ + + fi + +-if test -n $lt_cv_sys_max_cmd_len ; then ++if test -n "$lt_cv_sys_max_cmd_len"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 + $as_echo "$lt_cv_sys_max_cmd_len" >&6; } + else +@@ -5415,30 +6000,6 @@ + : ${MV="mv -f"} + : ${RM="rm -f"} + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +-# Try some XSI features +-xsi_shell=no +-( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,b/c, \ +- && eval 'test $(( 1 + 1 )) -eq 2 \ +- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ +- && xsi_shell=yes +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +-$as_echo "$xsi_shell" >&6; } +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +-lt_shell_append=no +-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ +- >/dev/null 2>&1 \ +- && lt_shell_append=yes +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +-$as_echo "$lt_shell_append" >&6; } +- +- + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset + else +@@ -5561,13 +6122,13 @@ + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) +- if test "$GCC" != yes; then ++ if test yes != "$GCC"; then + reload_cmds=false + fi + ;; + darwin*) +- if test "$GCC" = yes; then +- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ if test yes = "$GCC"; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi +@@ -5695,13 +6256,13 @@ + # Need to set the preceding variable on all platforms that support + # interlibrary dependencies. + # 'none' -- dependencies not supported. +-# `unknown' -- same as none, but documents that we really don't know. ++# 'unknown' -- same as none, but documents that we really don't know. + # 'pass_all' -- all dependencies passed with no checks. + # 'test_compile' -- check by making test program. + # 'file_magic [[regex]]' -- check by looking for files in library path +-# which responds to the $file_magic_cmd with a given extended regex. +-# If you have `file' or equivalent on your system and you're not sure +-# whether `pass_all' will *always* work, you probably want this one. ++# that responds to the $file_magic_cmd with a given extended regex. ++# If you have 'file' or equivalent on your system and you're not sure ++# whether 'pass_all' will *always* work, you probably want this one. + + case $host_os in + aix[4-9]*) +@@ -5728,8 +6289,7 @@ + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. +- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. +- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then ++ if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +@@ -5765,10 +6325,6 @@ + fi + ;; + +-gnu*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- + haiku*) + lt_cv_deplibs_check_method=pass_all + ;; +@@ -5807,7 +6363,7 @@ + ;; + + # This must be glibc/ELF. +-linux* | k*bsd*-gnu | kopensolaris*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -5829,8 +6385,8 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++openbsd* | bitrig*) ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' +@@ -6040,8 +6596,8 @@ + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) +- # two different shell functions defined in ltmain.sh +- # decide which to use based on capabilities of $DLLTOOL ++ # two different shell functions defined in ltmain.sh; ++ # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib +@@ -6053,7 +6609,7 @@ + ;; + *) + # fallback: assume linklib IS sharedlib +- lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; + esac + +@@ -6208,7 +6764,7 @@ + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +- if test "$ac_status" -eq 0; then ++ if test 0 -eq "$ac_status"; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 +@@ -6216,7 +6772,7 @@ + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +- if test "$ac_status" -ne 0; then ++ if test 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ + fi + fi +@@ -6229,7 +6785,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 + $as_echo "$lt_cv_ar_at_file" >&6; } + +-if test "x$lt_cv_ar_at_file" = xno; then ++if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= + else + archiver_list_spec=$lt_cv_ar_at_file +@@ -6446,7 +7002,7 @@ + + if test -n "$RANLIB"; then + case $host_os in +- openbsd*) ++ bitrig* | openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) +@@ -6536,7 +7092,7 @@ + symcode='[ABCDGISTW]' + ;; + hpux*) +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + symcode='[ABCDEGRST]' + fi + ;; +@@ -6569,14 +7125,44 @@ + symcode='[ABCDGIRSTW]' ;; + esac + ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ # Gets list of data symbols to import. ++ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" ++ # Adjust the below global symbol transforms to fixup imported variables. ++ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" ++ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" ++ lt_c_name_lib_hook="\ ++ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ ++ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" ++else ++ # Disable hooks by default. ++ lt_cv_sys_global_symbol_to_import= ++ lt_cdecl_hook= ++ lt_c_name_hook= ++ lt_c_name_lib_hook= ++fi ++ + # Transform an extracted symbol line into a proper C declaration. + # Some systems (esp. on ia64) link data and code symbols differently, + # so use this general approach. +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++lt_cv_sys_global_symbol_to_cdecl="sed -n"\ ++$lt_cdecl_hook\ ++" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ ++" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ ++$lt_c_name_hook\ ++" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ ++" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" ++ ++# Transform an extracted symbol line into symbol name with lib prefix and ++# symbol address. ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ ++$lt_c_name_lib_hook\ ++" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ ++" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ ++" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -6594,21 +7180,24 @@ + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then +- # Fake it for dumpbin and say T for any non-static function +- # and D for any global variable. ++ # Fake it for dumpbin and say T for any non-static function, ++ # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ + " {last_section=section; section=\$ 3};"\ + " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ + " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ ++" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ ++" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ + " \$ 0!~/External *\|/{next};"\ + " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ + " {if(hide[section]) next};"\ +-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +-" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ ++" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ ++" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ ++" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ + " ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" +@@ -6656,11 +7245,11 @@ + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext + /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +-/* DATA imports from DLLs on WIN32 con't be const, because runtime ++#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE ++/* DATA imports from DLLs on WIN32 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ + # define LT_DLSYM_CONST +-#elif defined(__osf__) ++#elif defined __osf__ + /* This system does not cope well with relocations in const data. */ + # define LT_DLSYM_CONST + #else +@@ -6686,7 +7275,7 @@ + { + { "@PROGRAM@", (void *) 0 }, + _LT_EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} + }; +@@ -6706,13 +7295,13 @@ + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS +- LIBS="conftstm.$ac_objext" ++ LIBS=conftstm.$ac_objext + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && test -s conftest${ac_exeext}; then ++ test $ac_status = 0; } && test -s conftest$ac_exeext; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS +@@ -6733,7 +7322,7 @@ + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. +- if test "$pipe_works" = yes; then ++ if test yes = "$pipe_works"; then + break + else + lt_cv_sys_global_symbol_pipe= +@@ -6786,6 +7375,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +@@ -6798,9 +7397,9 @@ + + + lt_sysroot= +-case ${with_sysroot} in #( ++case $with_sysroot in #( + yes) +- if test "$GCC" = yes; then ++ if test yes = "$GCC"; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( +@@ -6810,8 +7409,8 @@ + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 ++$as_echo "$with_sysroot" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +@@ -6828,13 +7427,14 @@ + enableval=$enable_libtool_lock; + fi + +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++test no = "$enable_libtool_lock" || enable_libtool_lock=yes + + # Some flags need to be propagated to the compiler or linker for good + # libtool support. + case $host in + ia64-*-hpux*) +- # Find out which ABI we are using. ++ # Find out what ABI is being produced by ac_compile, and set mode ++ # options accordingly. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 +@@ -6843,24 +7443,25 @@ + test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) +- HPUX_IA64_MODE="32" ++ HPUX_IA64_MODE=32 + ;; + *ELF-64*) +- HPUX_IA64_MODE="64" ++ HPUX_IA64_MODE=64 + ;; + esac + fi + rm -rf conftest* + ;; + *-*-irix6*) +- # Find out which ABI we are using. ++ # Find out what ABI is being produced by ac_compile, and set linker ++ # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- if test "$lt_cv_prog_gnu_ld" = yes; then ++ if test yes = "$lt_cv_prog_gnu_ld"; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" +@@ -6889,9 +7490,50 @@ + rm -rf conftest* + ;; + +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++mips64*-*linux*) ++ # Find out what ABI is being produced by ac_compile, and set linker ++ # options accordingly. ++ echo '#line '$LINENO' "configure"' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ emul=elf ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ emul="${emul}32" ++ ;; ++ *64-bit*) ++ emul="${emul}64" ++ ;; ++ esac ++ case `/usr/bin/file conftest.$ac_objext` in ++ *MSB*) ++ emul="${emul}btsmip" ++ ;; ++ *LSB*) ++ emul="${emul}ltsmip" ++ ;; ++ esac ++ case `/usr/bin/file conftest.$ac_objext` in ++ *N32*) ++ emul="${emul}n32" ++ ;; ++ esac ++ LD="${LD-ld} -m $emul" ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) +- # Find out which ABI we are using. ++ # Find out what ABI is being produced by ac_compile, and set linker ++ # options accordingly. Note that the listed cases only cover the ++ # situations where additional linker options are needed (such as when ++ # doing 32-bit compilation for a host where ld defaults to 64-bit, or ++ # vice versa); the common cases where no linker options are needed do ++ # not appear in the list. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 +@@ -6907,14 +7549,17 @@ + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) +- LD="${LD-ld} -m elf32_x86_64" +- ;; ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; + *) +- LD="${LD-ld} -m elf_i386" +- ;; ++ LD="${LD-ld} -m elf_i386" ++ ;; + esac + ;; +- ppc64-*linux*|powerpc64-*linux*) ++ powerpc64le-*linux*) ++ LD="${LD-ld} -m elf32lppclinux" ++ ;; ++ powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) +@@ -6933,7 +7578,10 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- ppc*-*linux*|powerpc*-*linux*) ++ powerpcle-*linux*) ++ LD="${LD-ld} -m elf64lppc" ++ ;; ++ powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) +@@ -6951,7 +7599,7 @@ + + *-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" ++ SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 + $as_echo_n "checking whether the C compiler needs -belf... " >&6; } +@@ -6991,13 +7639,14 @@ + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 + $as_echo "$lt_cv_cc_needs_belf" >&6; } +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ if test yes != "$lt_cv_cc_needs_belf"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" ++ CFLAGS=$SAVE_CFLAGS + fi + ;; + *-*solaris*) +- # Find out which ABI we are using. ++ # Find out what ABI is being produced by ac_compile, and set linker ++ # options accordingly. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 +@@ -7009,7 +7658,7 @@ + case $lt_cv_prog_gnu_ld in + yes*) + case $host in +- i?86-*-solaris*) ++ i?86-*-solaris*|x86_64-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) +@@ -7018,7 +7667,7 @@ + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then +- LD="${LD-ld}_sol2" ++ LD=${LD-ld}_sol2 + fi + ;; + *) +@@ -7034,7 +7683,7 @@ + ;; + esac + +-need_locks="$enable_libtool_lock" ++need_locks=$enable_libtool_lock + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +@@ -7145,7 +7794,7 @@ + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 + $as_echo "$lt_cv_path_mainfest_tool" >&6; } +-if test "x$lt_cv_path_mainfest_tool" != xyes; then ++if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: + fi + +@@ -7648,7 +8297,7 @@ + $as_echo_n "(cached) " >&6 + else + lt_cv_apple_cc_single_mod=no +- if test -z "${LT_MULTI_MODULE}"; then ++ if test -z "$LT_MULTI_MODULE"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the +@@ -7666,7 +8315,7 @@ + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. +- elif test -f libconftest.dylib && test $_lt_result -eq 0; then ++ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 +@@ -7705,7 +8354,7 @@ + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS=$save_LDFLAGS + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +@@ -7734,7 +8383,7 @@ + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 +- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then ++ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 +@@ -7747,32 +8396,32 @@ + $as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac +- if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi +- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then +- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ if test yes = "$lt_cv_ld_exported_symbols_list"; then ++ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else +- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' ++ fi ++ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= +@@ -8063,6 +8712,17 @@ + + + ++func_stripname_cnf () ++{ ++ case $2 in ++ .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;; ++ *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;; ++ esac ++} # func_stripname_cnf ++ ++ ++ ++ + + # Set options + +@@ -8083,14 +8743,14 @@ + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + ;; + esac + else +@@ -8114,14 +8774,14 @@ + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + ;; + esac + else +@@ -8145,14 +8805,14 @@ + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for lt_pkg in $withval; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + ;; + esac + else +@@ -8160,8 +8820,6 @@ + fi + + +-test -z "$pic_mode" && pic_mode=default +- + + + +@@ -8177,14 +8835,14 @@ + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + ;; + esac + else +@@ -8202,7 +8860,7 @@ + + + # This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ltmain" ++LIBTOOL_DEPS=$ltmain + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -8251,7 +8909,7 @@ + + + +-if test -n "${ZSH_VERSION+set}" ; then ++if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + +@@ -8290,7 +8948,7 @@ + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. +- if test "X${COLLECT_NAMES+set}" != Xset; then ++ if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi +@@ -8301,14 +8959,14 @@ + ofile=libtool + can_build_shared=yes + +-# All known linkers require a `.a' archive for static linking (except MSVC, ++# All known linkers require a '.a' archive for static linking (except MSVC, + # which needs '.lib'). + libext=a + +-with_gnu_ld="$lt_cv_prog_gnu_ld" +- +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" ++with_gnu_ld=$lt_cv_prog_gnu_ld ++ ++old_CC=$CC ++old_CFLAGS=$CFLAGS + + # Set sane defaults for various variables + test -z "$CC" && CC=cc +@@ -8340,22 +8998,22 @@ + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; + *) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ lt_save_MAGIC_CMD=$MAGIC_CMD ++ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/${ac_tool_prefix}file; then +- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" ++ if test -f "$ac_dir/${ac_tool_prefix}file"; then ++ lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : +@@ -8378,13 +9036,13 @@ + break + fi + done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac +-fi +- +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ IFS=$lt_save_ifs ++ MAGIC_CMD=$lt_save_MAGIC_CMD ++ ;; ++esac ++fi ++ ++MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } +@@ -8406,22 +9064,22 @@ + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; + *) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ lt_save_MAGIC_CMD=$MAGIC_CMD ++ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/file; then +- lt_cv_path_MAGIC_CMD="$ac_dir/file" ++ if test -f "$ac_dir/file"; then ++ lt_cv_path_MAGIC_CMD=$ac_dir/"file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : +@@ -8444,13 +9102,13 @@ + break + fi + done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac +-fi +- +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ IFS=$lt_save_ifs ++ MAGIC_CMD=$lt_save_MAGIC_CMD ++ ;; ++esac ++fi ++ ++MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } +@@ -8471,7 +9129,7 @@ + + # Use C for the default configuration in the libtool script + +-lt_save_CC="$CC" ++lt_save_CC=$CC + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -8533,7 +9191,7 @@ + + lt_prog_compiler_no_builtin_flag= + +-if test "$GCC" = yes; then ++if test yes = "$GCC"; then + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; +@@ -8549,7 +9207,7 @@ + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="-fno-rtti -fno-exceptions" ++ lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins +@@ -8579,7 +9237,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 + $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + +-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then ++if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" + else + : +@@ -8597,17 +9255,18 @@ + lt_prog_compiler_static= + + +- if test "$GCC" = yes; then ++ if test yes = "$GCC"; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + + case $host_os in + aix*) + # All AIX code is PIC. +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi ++ lt_prog_compiler_pic='-fPIC' + ;; + + amigaos*) +@@ -8618,8 +9277,8 @@ + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. ++ # adding the '-m68020' flag to GCC prevents building anything better, ++ # like '-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac +@@ -8705,7 +9364,7 @@ + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else +@@ -8713,6 +9372,20 @@ + fi + ;; + ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic='-fno-common' ++ case $cc_basename in ++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ esac ++ ;; ++ + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +@@ -8732,7 +9405,7 @@ + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? +- lt_prog_compiler_static='${wl}-a ${wl}archive' ++ lt_prog_compiler_static='$wl-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) +@@ -8741,9 +9414,9 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in +- # old Intel for x86_64 which still supported -KPIC. ++ # old Intel for x86_64, which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' +@@ -8768,6 +9441,12 @@ + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; ++ tcc*) ++ # Fabrice Bellard et al's Tiny C Compiler ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -8865,7 +9544,7 @@ + ;; + + sysv4*MP*) +- if test -d /usr/nec ;then ++ if test -d /usr/nec; then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi +@@ -8894,7 +9573,7 @@ + fi + + case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: ++ # For platforms that do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; +@@ -8926,7 +9605,7 @@ + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ++ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins +@@ -8956,7 +9635,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 + $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + +-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then ++if test yes = "$lt_cv_prog_compiler_pic_works"; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; +@@ -8988,7 +9667,7 @@ + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works=no +- save_LDFLAGS="$LDFLAGS" ++ save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +@@ -9007,13 +9686,13 @@ + fi + fi + $RM -r conftest* +- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS=$save_LDFLAGS + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 + $as_echo "$lt_cv_prog_compiler_static_works" >&6; } + +-if test x"$lt_cv_prog_compiler_static_works" = xyes; then ++if test yes = "$lt_cv_prog_compiler_static_works"; then + : + else + lt_prog_compiler_static= +@@ -9133,8 +9812,8 @@ + + + +-hard_links="nottested" +-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then ++hard_links=nottested ++if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 + $as_echo_n "checking if we can lock with hard links... " >&6; } +@@ -9146,9 +9825,9 @@ + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 + $as_echo "$hard_links" >&6; } +- if test "$hard_links" = no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ if test no = "$hard_links"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 ++$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + need_locks=warn + fi + else +@@ -9191,9 +9870,9 @@ + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. ++ # it will be wrapped by ' (' and ')$', so one must not match beginning or ++ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', ++ # as well as any symbol that contains 'd'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if +@@ -9208,7 +9887,7 @@ + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +- if test "$GCC" != yes; then ++ if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; +@@ -9216,7 +9895,7 @@ + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; +- openbsd*) ++ openbsd* | bitrig*) + with_gnu_ld=no + ;; + esac +@@ -9226,7 +9905,7 @@ + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no +- if test "$with_gnu_ld" = yes; then ++ if test yes = "$with_gnu_ld"; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility +@@ -9248,24 +9927,24 @@ + esac + fi + +- if test "$lt_use_gnu_ld_interface" = yes; then ++ if test yes = "$lt_use_gnu_ld_interface"; then + # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' ++ wlarc='$wl' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- export_dynamic_flag_spec='${wl}--export-dynamic' ++ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' ++ export_dynamic_flag_spec='$wl--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no +- case `$LD -v 2>&1` in ++ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +@@ -9278,7 +9957,7 @@ + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then ++ if test ia64 != "$host_cpu"; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +@@ -9297,7 +9976,7 @@ + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) +@@ -9313,7 +9992,7 @@ + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi +@@ -9323,7 +10002,7 @@ + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' +- export_dynamic_flag_spec='${wl}--export-all-symbols' ++ export_dynamic_flag_spec='$wl--export-all-symbols' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes +@@ -9331,61 +10010,61 @@ + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file, use it as ++ # is; otherwise, prepend EXPORTS... ++ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + haiku*) +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- export_dynamic_flag_spec='${wl}-E' ++ hardcode_libdir_flag_spec='$wl-rpath,$libdir' ++ export_dynamic_flag_spec='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no +- if test "$host_os" = linux-dietlibc; then ++ if test linux-dietlibc = "$host_os"; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ +- && test "$tmp_diet" = no ++ && test no = "$tmp_diet" + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler +- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers +- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; +@@ -9396,42 +10075,44 @@ + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; ++ nagfor*) # NAGFOR 5.3 ++ tmp_sharedflag='-Wl,-shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 +- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 +- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac +- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- +- if test "x$supports_anon_versioning" = xyes; then ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ ++ if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' +- if test "x$supports_anon_versioning" = xyes; then ++ if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -9445,8 +10126,8 @@ + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -9464,8 +10145,8 @@ + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -9477,7 +10158,7 @@ + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot + *** reliably create shared libraries on SCO systems. Therefore, libtool + *** is disabling shared libraries support. We urge you to upgrade GNU + *** binutils to release 2.16.91.0.3 or newer. Another option is to modify +@@ -9492,9 +10173,9 @@ + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -9511,15 +10192,15 @@ + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + +- if test "$ld_shlibs" = no; then ++ if test no = "$ld_shlibs"; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= +@@ -9535,7 +10216,7 @@ + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes +- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported +@@ -9543,12 +10224,12 @@ + ;; + + aix[4-9]*) +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' +- no_entry_flag="" ++ no_entry_flag= + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm +@@ -9566,7 +10247,7 @@ + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then + aix_use_runtimelinking=yes + break + fi +@@ -9589,13 +10270,13 @@ + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes +- file_list_spec='${wl}-f,' +- +- if test "$GCC" = yes; then ++ file_list_spec='$wl-f,' ++ ++ if test yes = "$GCC"; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` ++ collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then +@@ -9614,35 +10295,35 @@ + ;; + esac + shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' ++ if test yes = "$aix_use_runtimelinking"; then ++ shared_flag="$shared_flag "'$wl-G' + fi + else + # not using gcc +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' ++ if test yes = "$aix_use_runtimelinking"; then ++ shared_flag='$wl-G' + else +- shared_flag='${wl}-bM:SRE' ++ shared_flag='$wl-bM:SRE' + fi + fi + fi + +- export_dynamic_flag_spec='${wl}-bexpall' ++ export_dynamic_flag_spec='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes +- if test "$aix_use_runtimelinking" = yes; then ++ if test yes = "$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- if test "${lt_cv_aix_libpath+set}" = set; then ++ if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else + if ${lt_cv_aix_libpath_+:} false; then : +@@ -9677,7 +10358,7 @@ + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then +- lt_cv_aix_libpath_="/usr/lib:/lib" ++ lt_cv_aix_libpath_=/usr/lib:/lib + fi + + fi +@@ -9685,17 +10366,17 @@ + aix_libpath=$lt_cv_aix_libpath_ + fi + +- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" ++ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' ++ if test ia64 = "$host_cpu"; then ++ hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" +- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. +- if test "${lt_cv_aix_libpath+set}" = set; then ++ if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else + if ${lt_cv_aix_libpath_+:} false; then : +@@ -9730,7 +10411,7 @@ + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then +- lt_cv_aix_libpath_="/usr/lib:/lib" ++ lt_cv_aix_libpath_=/usr/lib:/lib + fi + + fi +@@ -9738,21 +10419,21 @@ + aix_libpath=$lt_cv_aix_libpath_ + fi + +- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" ++ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +- no_undefined_flag=' ${wl}-bernotok' +- allow_undefined_flag=' ${wl}-berok' +- if test "$with_gnu_ld" = yes; then ++ no_undefined_flag=' $wl-bernotok' ++ allow_undefined_flag=' $wl-berok' ++ if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. +- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. +- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; +@@ -9761,7 +10442,7 @@ + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) +@@ -9791,16 +10472,17 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" ++ shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' +- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; +- else +- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; +- fi~ +- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ +- linknames=' ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' ++ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then ++ cp "$export_symbols" "$output_objdir/$soname.def"; ++ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; ++ else ++ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes +@@ -9809,18 +10491,18 @@ + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ +- lt_tool_outputfile="@TOOL_OUTPUT@"~ +- case $lt_outputfile in +- *.exe|*.EXE) ;; +- *) +- lt_outputfile="$lt_outputfile.exe" +- lt_tool_outputfile="$lt_tool_outputfile.exe" +- ;; +- esac~ +- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then +- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; +- $RM "$lt_outputfile.manifest"; +- fi' ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile=$lt_outputfile.exe ++ lt_tool_outputfile=$lt_tool_outputfile.exe ++ ;; ++ esac~ ++ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' + ;; + *) + # Assume MSVC wrapper +@@ -9829,7 +10511,7 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" ++ shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. +@@ -9848,24 +10530,24 @@ + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported +- if test "$lt_cv_ld_force_load" = "yes"; then +- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' ++ if test yes = "$lt_cv_ld_force_load"; then ++ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec='' + fi + link_all_deplibs=yes +- allow_undefined_flag="$_lt_dar_allow_undefined" ++ allow_undefined_flag=$_lt_dar_allow_undefined + case $cc_basename in +- ifort*) _lt_dar_can_shared=yes ;; ++ ifort*|nagfor*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac +- if test "$_lt_dar_can_shared" = "yes"; then ++ if test yes = "$_lt_dar_can_shared"; then + output_verbose_link_cmd=func_echo_all +- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" ++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" ++ archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" ++ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + + else + ld_shlibs=no +@@ -9907,33 +10589,33 @@ + ;; + + hpux9*) +- if test "$GCC" = yes; then +- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ if test yes = "$GCC"; then ++ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else +- archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- fi +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' ++ fi ++ hardcode_libdir_flag_spec='$wl+b $wl$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes +- export_dynamic_flag_spec='${wl}-E' ++ export_dynamic_flag_spec='$wl-E' + ;; + + hpux10*) +- if test "$GCC" = yes && test "$with_gnu_ld" = no; then +- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ if test yes,no = "$GCC,$with_gnu_ld"; then ++ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +- if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ if test no = "$with_gnu_ld"; then ++ hardcode_libdir_flag_spec='$wl+b $wl$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes +- export_dynamic_flag_spec='${wl}-E' ++ export_dynamic_flag_spec='$wl-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes +@@ -9941,25 +10623,25 @@ + ;; + + hpux11*) +- if test "$GCC" = yes && test "$with_gnu_ld" = no; then ++ if test yes,no = "$GCC,$with_gnu_ld"; then + case $host_cpu in + hppa*64*) +- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) +- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + +@@ -9971,7 +10653,7 @@ + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler__b=no +- save_LDFLAGS="$LDFLAGS" ++ save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +@@ -9990,14 +10672,14 @@ + fi + fi + $RM -r conftest* +- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS=$save_LDFLAGS + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 + $as_echo "$lt_cv_prog_compiler__b" >&6; } + +-if test x"$lt_cv_prog_compiler__b" = xyes; then +- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++if test yes = "$lt_cv_prog_compiler__b"; then ++ archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -10005,8 +10687,8 @@ + ;; + esac + fi +- if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ if test no = "$with_gnu_ld"; then ++ hardcode_libdir_flag_spec='$wl+b $wl$libdir' + hardcode_libdir_separator=: + + case $host_cpu in +@@ -10017,7 +10699,7 @@ + *) + hardcode_direct=yes + hardcode_direct_absolute=yes +- export_dynamic_flag_spec='${wl}-E' ++ export_dynamic_flag_spec='$wl-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. +@@ -10028,8 +10710,8 @@ + ;; + + irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ if test yes = "$GCC"; then ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +@@ -10039,8 +10721,8 @@ + if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 + else +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ save_LDFLAGS=$LDFLAGS ++ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + int foo (void) { return 0; } +@@ -10052,19 +10734,19 @@ + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS=$save_LDFLAGS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 + $as_echo "$lt_cv_irix_exported_symbol" >&6; } +- if test "$lt_cv_irix_exported_symbol" = yes; then +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ if test yes = "$lt_cv_irix_exported_symbol"; then ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi + else +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes +@@ -10084,7 +10766,7 @@ + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; +@@ -10092,27 +10774,19 @@ + *nto* | *qnx*) + ;; + +- openbsd*) ++ openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- export_dynamic_flag_spec='${wl}-E' ++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec='$wl-rpath,$libdir' ++ export_dynamic_flag_spec='$wl-E' + else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' +- ;; +- *) +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- ;; +- esac ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='$wl-rpath,$libdir' + fi + else + ld_shlibs=no +@@ -10128,28 +10802,28 @@ + ;; + + osf3*) +- if test "$GCC" = yes; then +- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ if test yes = "$GCC"; then ++ allow_undefined_flag=' $wl-expect_unresolved $wl\*' ++ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + fi + archive_cmds_need_lc='no' +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ if test yes = "$GCC"; then ++ allow_undefined_flag=' $wl-expect_unresolved $wl\*' ++ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ +- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' ++ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' +@@ -10160,24 +10834,24 @@ + + solaris*) + no_undefined_flag=' -z defs' +- if test "$GCC" = yes; then +- wlarc='${wl}' +- archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ if test yes = "$GCC"; then ++ wlarc='$wl' ++ archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' +- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) +- wlarc='${wl}' +- archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ wlarc='$wl' ++ archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi +@@ -10187,11 +10861,11 @@ + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, +- # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but understands '-z linker_flag'. GCC discards it without '$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- if test "$GCC" = yes; then +- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ if test yes = "$GCC"; then ++ whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi +@@ -10201,10 +10875,10 @@ + ;; + + sunos4*) +- if test "x$host_vendor" = xsequent; then ++ if test sequent = "$host_vendor"; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. +- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -10253,43 +10927,43 @@ + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) +- no_undefined_flag='${wl}-z,text' ++ no_undefined_flag='$wl-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + +- if test "$GCC" = yes; then +- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ if test yes = "$GCC"; then ++ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not ++ # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. +- no_undefined_flag='${wl}-z,text' +- allow_undefined_flag='${wl}-z,nodefs' ++ no_undefined_flag='$wl-z,text' ++ allow_undefined_flag='$wl-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no +- hardcode_libdir_flag_spec='${wl}-R,$libdir' ++ hardcode_libdir_flag_spec='$wl-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes +- export_dynamic_flag_spec='${wl}-Bexport' ++ export_dynamic_flag_spec='$wl-Bexport' + runpath_var='LD_RUN_PATH' + +- if test "$GCC" = yes; then +- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ if test yes = "$GCC"; then ++ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + +@@ -10304,10 +10978,10 @@ + ;; + esac + +- if test x$host_vendor = xsni; then ++ if test sni = "$host_vendor"; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- export_dynamic_flag_spec='${wl}-Blargedynsym' ++ export_dynamic_flag_spec='$wl-Blargedynsym' + ;; + esac + fi +@@ -10315,7 +10989,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 + $as_echo "$ld_shlibs" >&6; } +-test "$ld_shlibs" = no && can_build_shared=no ++test no = "$ld_shlibs" && can_build_shared=no + + with_gnu_ld=$with_gnu_ld + +@@ -10341,7 +11015,7 @@ + # Assume -lc should be added + archive_cmds_need_lc=yes + +- if test "$enable_shared" = yes && test "$GCC" = yes; then ++ if test yes,yes = "$GCC,$enable_shared"; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. +@@ -10556,14 +11230,14 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } + +-if test "$GCC" = yes; then ++if test yes = "$GCC"; then + case $host_os in +- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; +- *) lt_awk_arg="/^libraries:/" ;; ++ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; ++ *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in +- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; +- *) lt_sed_strip_eq="s,=/,/,g" ;; ++ mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; ++ *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in +@@ -10579,28 +11253,35 @@ + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it +- # and add multilib dir if necessary. ++ # and add multilib dir if necessary... + lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ # ...but if some path component already ends with the multilib dir we assume ++ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). ++ case "$lt_multi_os_dir; $lt_search_path_spec " in ++ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) ++ lt_multi_os_dir= ++ ;; ++ esac + for lt_sys_path in $lt_search_path_spec; do +- if test -d "$lt_sys_path/$lt_multi_os_dir"; then +- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +- else ++ if test -d "$lt_sys_path$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" ++ elif test -n "$lt_multi_os_dir"; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +-BEGIN {RS=" "; FS="/|\n";} { +- lt_foo=""; +- lt_count=0; ++BEGIN {RS = " "; FS = "/|\n";} { ++ lt_foo = ""; ++ lt_count = 0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { +- lt_foo="/" $lt_i lt_foo; ++ lt_foo = "/" $lt_i lt_foo; + } else { + lt_count--; + } +@@ -10614,7 +11295,7 @@ + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ +- $SED 's,/\([A-Za-z]:\),\1,g'` ;; ++ $SED 's|/\([A-Za-z]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` + else +@@ -10623,7 +11304,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext_cmds=".so" ++shrext_cmds=.so + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -10643,11 +11324,11 @@ + case $host_os in + aix3*) + version_type=linux # correct to gnu/linux during the next big refactor +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' ++ soname_spec='$libname$release$shared_ext$major' + ;; + + aix[4-9]*) +@@ -10655,40 +11336,40 @@ + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in ++ # the line '#! .'. This would cause the generated library to ++ # depend on '.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' +- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then ++ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then ++ if test yes = "$aix_use_runtimelinking"; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release.a $libname.a' ++ soname_spec='$libname$release$shared_ext$major' + fi + shlibpath_var=LIBPATH + fi +@@ -10699,18 +11380,18 @@ + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + + beos*) +- library_names_spec='${libname}${shared_ext}' ++ library_names_spec='$libname$shared_ext' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; +@@ -10718,8 +11399,8 @@ + bsdi[45]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +@@ -10731,7 +11412,7 @@ + + cygwin* | mingw* | pw32* | cegcc*) + version_type=windows +- shrext_cmds=".dll" ++ shrext_cmds=.dll + need_version=no + need_lib_prefix=no + +@@ -10740,8 +11421,8 @@ + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ postinstall_cmds='base_file=`basename \$file`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ +@@ -10757,17 +11438,17 @@ + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' +@@ -10776,8 +11457,8 @@ + *,cl*) + # Native MSVC + libname_spec='$name' +- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- library_names_spec='${libname}.dll.lib' ++ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ++ library_names_spec='$libname.dll.lib' + + case $build_os in + mingw*) +@@ -10804,7 +11485,7 @@ + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) +- sys_lib_search_path_spec="$LIB" ++ sys_lib_search_path_spec=$LIB + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +@@ -10817,8 +11498,8 @@ + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ postinstall_cmds='base_file=`basename \$file`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' +@@ -10831,7 +11512,7 @@ + + *) + # Assume MSVC wrapper +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac +@@ -10844,8 +11525,8 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' ++ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' ++ soname_spec='$libname$release$major$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +@@ -10858,8 +11539,8 @@ + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +@@ -10877,12 +11558,12 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + need_version=yes + ;; + esac +@@ -10907,26 +11588,15 @@ + esac + ;; + +-gnu*) +- version_type=linux # correct to gnu/linux during the next big refactor +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- + haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH +- shlibpath_overrides_runpath=yes ++ shlibpath_overrides_runpath=no + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; +@@ -10944,9 +11614,9 @@ + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ if test 32 = "$HPUX_IA64_MODE"; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +@@ -10959,8 +11629,8 @@ + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +@@ -10969,8 +11639,8 @@ + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... +@@ -10983,8 +11653,8 @@ + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +@@ -10995,7 +11665,7 @@ + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) +- if test "$lt_cv_prog_gnu_ld" = yes; then ++ if test yes = "$lt_cv_prog_gnu_ld"; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix +@@ -11003,8 +11673,8 @@ + esac + need_lib_prefix=no + need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='$libname$release$shared_ext$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= +@@ -11023,8 +11693,8 @@ + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" ++ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + hardcode_into_libs=yes + ;; + +@@ -11033,13 +11703,33 @@ + dynamic_linker=no + ;; + ++linux*android*) ++ version_type=none # Android doesn't support versioned libraries. ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext' ++ soname_spec='$libname$release$shared_ext' ++ finish_cmds= ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ dynamic_linker='Android linker' ++ # Don't embed -rpath directories since the linker doesn't support them. ++ hardcode_libdir_flag_spec='-L$libdir' ++ ;; ++ + # This must be glibc/ELF. +-linux* | k*bsd*-gnu | kopensolaris*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +@@ -11083,14 +11773,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" +- ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -11107,12 +11793,12 @@ + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH +@@ -11122,7 +11808,7 @@ + + newsos6) + version_type=linux # correct to gnu/linux during the next big refactor +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; +@@ -11131,45 +11817,34 @@ + version_type=qnx + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +-openbsd*) ++openbsd* | bitrig*) + version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" ++ sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then ++ need_version=no ++ else ++ need_version=yes ++ fi ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[89] | openbsd2.[89].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi ++ shlibpath_overrides_runpath=yes + ;; + + os2*) + libname_spec='$name' +- shrext_cmds=".dll" ++ shrext_cmds=.dll + need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' ++ library_names_spec='$libname$shared_ext $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; +@@ -11178,11 +11853,11 @@ + version_type=osf + need_lib_prefix=no + need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='$libname$release$shared_ext$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + + rdos*) +@@ -11193,8 +11868,8 @@ + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes +@@ -11204,11 +11879,11 @@ + + sunos4*) + version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then ++ if test yes = "$with_gnu_ld"; then + need_lib_prefix=no + fi + need_version=yes +@@ -11216,8 +11891,8 @@ + + sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) +@@ -11238,10 +11913,10 @@ + ;; + + sysv4*MP*) +- if test -d /usr/nec ;then ++ if test -d /usr/nec; then + version_type=linux # correct to gnu/linux during the next big refactor +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' ++ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' ++ soname_spec='$libname$shared_ext.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; +@@ -11250,12 +11925,12 @@ + version_type=freebsd-elf + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then ++ if test yes = "$with_gnu_ld"; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +@@ -11273,7 +11948,7 @@ + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +@@ -11281,8 +11956,8 @@ + + uts4*) + version_type=linux # correct to gnu/linux during the next big refactor +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +@@ -11292,18 +11967,18 @@ + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 + $as_echo "$dynamic_linker" >&6; } +-test "$dynamic_linker" = no && can_build_shared=no ++test no = "$dynamic_linker" && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then ++if test yes = "$GCC"; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-fi +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then ++ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec ++fi ++if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then ++ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec + fi + + +@@ -11402,15 +12077,15 @@ + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || +- test "X$hardcode_automatic" = "Xyes" ; then ++ test yes = "$hardcode_automatic"; then + + # We can hardcode non-existent directories. +- if test "$hardcode_direct" != no && ++ if test no != "$hardcode_direct" && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && +- test "$hardcode_minus_L" != no; then ++ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && ++ test no != "$hardcode_minus_L"; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else +@@ -11425,12 +12100,12 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 + $as_echo "$hardcode_action" >&6; } + +-if test "$hardcode_action" = relink || +- test "$inherit_rpath" = yes; then ++if test relink = "$hardcode_action" || ++ test yes = "$inherit_rpath"; then + # Fast installation is not supported + enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then ++elif test yes = "$shlibpath_overrides_runpath" || ++ test no = "$enable_shared"; then + # Fast installation is not necessary + enable_fast_install=needless + fi +@@ -11440,7 +12115,7 @@ + + + +- if test "x$enable_dlopen" != xyes; then ++ if test yes != "$enable_dlopen"; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +@@ -11450,23 +12125,23 @@ + + case $host_os in + beos*) +- lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen=load_add_on + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) +- lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; + + cygwin*) +- lt_cv_dlopen="dlopen" ++ lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + ;; + + darwin*) +- # if libdl is installed we need to link against it ++ # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } + if ${ac_cv_lib_dl_dlopen+:} false; then : +@@ -11504,10 +12179,10 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } + if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- +- lt_cv_dlopen="dyld" ++ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl ++else ++ ++ lt_cv_dlopen=dyld + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +@@ -11515,10 +12190,18 @@ + + ;; + ++ tpf*) ++ # Don't try to run any link tests for TPF. We know it's impossible ++ # because TPF is a cross-compiler, and we know how we open DSOs. ++ lt_cv_dlopen=dlopen ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=no ++ ;; ++ + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" + if test "x$ac_cv_func_shl_load" = xyes; then : +- lt_cv_dlopen="shl_load" ++ lt_cv_dlopen=shl_load + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 + $as_echo_n "checking for shl_load in -ldld... " >&6; } +@@ -11557,11 +12240,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 + $as_echo "$ac_cv_lib_dld_shl_load" >&6; } + if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++ lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld + else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" + if test "x$ac_cv_func_dlopen" = xyes; then : +- lt_cv_dlopen="dlopen" ++ lt_cv_dlopen=dlopen + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } +@@ -11600,7 +12283,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } + if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 + $as_echo_n "checking for dlopen in -lsvld... " >&6; } +@@ -11639,7 +12322,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; } + if test "x$ac_cv_lib_svld_dlopen" = xyes; then : +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" ++ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + $as_echo_n "checking for dld_link in -ldld... " >&6; } +@@ -11678,42 +12361,42 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 + $as_echo "$ac_cv_lib_dld_dld_link" >&6; } + if test "x$ac_cv_lib_dld_dld_link" = xyes; then : +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +- ;; +- esac +- +- if test "x$lt_cv_dlopen" != xno; then ++ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ;; ++ esac ++ ++ if test no = "$lt_cv_dlopen"; then ++ enable_dlopen=no ++ else + enable_dlopen=yes +- else +- enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +- +- save_LDFLAGS="$LDFLAGS" ++ save_CPPFLAGS=$CPPFLAGS ++ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS=$LDFLAGS + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + +- save_LIBS="$LIBS" ++ save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +@@ -11721,7 +12404,7 @@ + if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then : ++ if test yes = "$cross_compiling"; then : + lt_cv_dlopen_self=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +@@ -11770,7 +12453,7 @@ + + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) ++#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) + int fnord () __attribute__((visibility("default"))); + #endif + +@@ -11800,7 +12483,7 @@ + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -11820,14 +12503,14 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 + $as_echo "$lt_cv_dlopen_self" >&6; } + +- if test "x$lt_cv_dlopen_self" = xyes; then ++ if test yes = "$lt_cv_dlopen_self"; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 + $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } + if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then : ++ if test yes = "$cross_compiling"; then : + lt_cv_dlopen_self_static=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +@@ -11876,7 +12559,7 @@ + + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) ++#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) + int fnord () __attribute__((visibility("default"))); + #endif + +@@ -11906,7 +12589,7 @@ + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -11927,9 +12610,9 @@ + $as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" ++ CPPFLAGS=$save_CPPFLAGS ++ LDFLAGS=$save_LDFLAGS ++ LIBS=$save_LIBS + ;; + esac + +@@ -11973,7 +12656,7 @@ + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) +- if test -n "$STRIP" ; then ++ if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -12001,7 +12684,7 @@ + + + +- # Report which library types will actually be built ++ # Report what library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 + $as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +@@ -12009,13 +12692,13 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 + $as_echo_n "checking whether to build shared libraries... " >&6; } +- test "$can_build_shared" = "no" && enable_shared=no ++ test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) +- test "$enable_shared" = yes && enable_static=no ++ test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' +@@ -12023,8 +12706,8 @@ + ;; + + aix[4-9]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no ++ if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then ++ test yes = "$enable_shared" && enable_static=no + fi + ;; + esac +@@ -12034,7 +12717,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 + $as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. +- test "$enable_shared" = yes || enable_static=yes ++ test yes = "$enable_shared" || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 + $as_echo "$enable_static" >&6; } + +@@ -12048,7 +12731,3187 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +-CC="$lt_save_CC" ++CC=$lt_save_CC ++ ++ if test -n "$CXX" && ( test no != "$CXX" && ++ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || ++ (test g++ != "$CXX"))); then ++ ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 ++$as_echo_n "checking how to run the C++ preprocessor... " >&6; } ++if test -z "$CXXCPP"; then ++ if ${ac_cv_prog_CXXCPP+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # Double quotes because CXXCPP needs to be expanded ++ for CXXCPP in "$CXX -E" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ break ++fi ++ ++ done ++ ac_cv_prog_CXXCPP=$CXXCPP ++ ++fi ++ CXXCPP=$ac_cv_prog_CXXCPP ++else ++ ac_cv_prog_CXXCPP=$CXXCPP ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 ++$as_echo "$CXXCPP" >&6; } ++ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } ++fi ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++else ++ _lt_caught_CXX_error=yes ++fi ++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++archive_cmds_need_lc_CXX=no ++allow_undefined_flag_CXX= ++always_export_symbols_CXX=no ++archive_expsym_cmds_CXX= ++compiler_needs_object_CXX=no ++export_dynamic_flag_spec_CXX= ++hardcode_direct_CXX=no ++hardcode_direct_absolute_CXX=no ++hardcode_libdir_flag_spec_CXX= ++hardcode_libdir_separator_CXX= ++hardcode_minus_L_CXX=no ++hardcode_shlibpath_var_CXX=unsupported ++hardcode_automatic_CXX=no ++inherit_rpath_CXX=no ++module_cmds_CXX= ++module_expsym_cmds_CXX= ++link_all_deplibs_CXX=unknown ++old_archive_cmds_CXX=$old_archive_cmds ++reload_flag_CXX=$reload_flag ++reload_cmds_CXX=$reload_cmds ++no_undefined_flag_CXX= ++whole_archive_flag_spec_CXX= ++enable_shared_with_static_runtimes_CXX=no ++ ++# Source file extension for C++ test sources. ++ac_ext=cpp ++ ++# Object file extension for compiled C++ test sources. ++objext=o ++objext_CXX=$objext ++ ++# No sense in running all these tests if we already determined that ++# the CXX compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test yes != "$_lt_caught_CXX_error"; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="int some_variable = 0;" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code='int main(int, char *[]) { return(0); }' ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ ++ ++ ++ ++ ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++ # save warnings/boilerplate of simple test code ++ ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$RM conftest* ++ ++ ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$RM -r conftest* ++ ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS ++ lt_save_LD=$LD ++ lt_save_GCC=$GCC ++ GCC=$GXX ++ lt_save_with_gnu_ld=$with_gnu_ld ++ lt_save_path_LD=$lt_cv_path_LD ++ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++ else ++ $as_unset lt_cv_prog_gnu_ld ++ fi ++ if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++ else ++ $as_unset lt_cv_path_LD ++ fi ++ test -z "${LDCXX+set}" || LD=$LDCXX ++ CC=${CXX-"c++"} ++ CFLAGS=$CXXFLAGS ++ compiler=$CC ++ compiler_CXX=$CC ++ for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ++ ++ ++ if test -n "$compiler"; then ++ # We don't want -fno-exception when compiling C++ code, so set the ++ # no_builtin_flag separately ++ if test yes = "$GXX"; then ++ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' ++ else ++ lt_prog_compiler_no_builtin_flag_CXX= ++ fi ++ ++ if test yes = "$GXX"; then ++ # Set up default GNU C++ configuration ++ ++ ++ ++# Check whether --with-gnu-ld was given. ++if test "${with_gnu_ld+set}" = set; then : ++ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes ++else ++ with_gnu_ld=no ++fi ++ ++ac_prog=ld ++if test yes = "$GCC"; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 ++$as_echo_n "checking for ld used by $CC... " >&6; } ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return, which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [\\/]* | ?:[\\/]*) ++ re_direlt='/[^/][^/]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD=$ac_prog ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test yes = "$with_gnu_ld"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 ++$as_echo_n "checking for non-GNU ld... " >&6; } ++fi ++if ${lt_cv_path_LD+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$LD"; then ++ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS=$lt_save_ifs ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD=$ac_dir/$ac_prog ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 &5 ++$as_echo "$LD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 ++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++if ${lt_cv_prog_gnu_ld+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. ++case `$LD -v 2>&1 &5 ++$as_echo "$lt_cv_prog_gnu_ld" >&6; } ++with_gnu_ld=$lt_cv_prog_gnu_ld ++ ++ ++ ++ ++ ++ ++ ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test yes = "$with_gnu_ld"; then ++ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ ++ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' ++ export_dynamic_flag_spec_CXX='$wl--export-dynamic' ++ ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='$wl' ++ ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | ++ $GREP 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' ++ else ++ whole_archive_flag_spec_CXX= ++ fi ++ else ++ with_gnu_ld=no ++ wlarc= ++ ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ fi ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' ++ ++ else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++ fi ++ ++ # PORTME: fill in a description of your system's C++ link characteristics ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++ ld_shlibs_CXX=yes ++ case $host_os in ++ aix3*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aix[4-9]*) ++ if test ia64 = "$host_cpu"; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag= ++ else ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ archive_cmds_CXX='' ++ hardcode_direct_CXX=yes ++ hardcode_direct_absolute_CXX=yes ++ hardcode_libdir_separator_CXX=':' ++ link_all_deplibs_CXX=yes ++ file_list_spec_CXX='$wl-f,' ++ ++ if test yes = "$GXX"; then ++ case $host_os in aix4.[012]|aix4.[012].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`$CC -print-prog-name=collect2` ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ hardcode_direct_CXX=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L_CXX=yes ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ hardcode_libdir_separator_CXX= ++ fi ++ esac ++ shared_flag='-shared' ++ if test yes = "$aix_use_runtimelinking"; then ++ shared_flag=$shared_flag' $wl-G' ++ fi ++ else ++ # not using gcc ++ if test ia64 = "$host_cpu"; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test yes = "$aix_use_runtimelinking"; then ++ shared_flag='$wl-G' ++ else ++ shared_flag='$wl-bM:SRE' ++ fi ++ fi ++ fi ++ ++ export_dynamic_flag_spec_CXX='$wl-bexpall' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to ++ # export. ++ always_export_symbols_CXX=yes ++ if test yes = "$aix_use_runtimelinking"; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ allow_undefined_flag_CXX='-berok' ++ # Determine the default libpath from the value encoded in an empty ++ # executable. ++ if test set = "${lt_cv_aix_libpath+set}"; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if ${lt_cv_aix_libpath__CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX=/usr/lib:/lib ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath__CXX ++fi ++ ++ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" ++ ++ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag ++ else ++ if test ia64 = "$host_cpu"; then ++ hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag_CXX="-z nodefs" ++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ if test set = "${lt_cv_aix_libpath+set}"; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if ${lt_cv_aix_libpath__CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX=/usr/lib:/lib ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath__CXX ++fi ++ ++ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ no_undefined_flag_CXX=' $wl-bernotok' ++ allow_undefined_flag_CXX=' $wl-berok' ++ if test yes = "$with_gnu_ld"; then ++ # We only use this code for GNU lds that support --whole-archive. ++ whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' ++ else ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec_CXX='$convenience' ++ fi ++ archive_cmds_need_lc_CXX=yes ++ # This is similar to how AIX traditionally builds its shared ++ # libraries. ++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag_CXX=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ hardcode_libdir_flag_spec_CXX=' ' ++ allow_undefined_flag_CXX=unsupported ++ always_export_symbols_CXX=yes ++ file_list_spec_CXX='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=.dll ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' ++ archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then ++ cp "$export_symbols" "$output_objdir/$soname.def"; ++ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; ++ else ++ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' ++ enable_shared_with_static_runtimes_CXX=yes ++ # Don't use ranlib ++ old_postinstall_cmds_CXX='chmod 644 $oldlib' ++ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile=$lt_outputfile.exe ++ lt_tool_outputfile=$lt_tool_outputfile.exe ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ export_dynamic_flag_spec_CXX='$wl--export-all-symbols' ++ allow_undefined_flag_CXX=unsupported ++ always_export_symbols_CXX=no ++ enable_shared_with_static_runtimes_CXX=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file, use it as ++ # is; otherwise, prepend EXPORTS... ++ archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ darwin* | rhapsody*) ++ ++ ++ archive_cmds_need_lc_CXX=no ++ hardcode_direct_CXX=no ++ hardcode_automatic_CXX=yes ++ hardcode_shlibpath_var_CXX=unsupported ++ if test yes = "$lt_cv_ld_force_load"; then ++ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' ++ ++ else ++ whole_archive_flag_spec_CXX='' ++ fi ++ link_all_deplibs_CXX=yes ++ allow_undefined_flag_CXX=$_lt_dar_allow_undefined ++ case $cc_basename in ++ ifort*|nagfor*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test yes = "$_lt_dar_can_shared"; then ++ output_verbose_link_cmd=func_echo_all ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" ++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" ++ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" ++ module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" ++ if test yes != "$lt_cv_apple_cc_single_mod"; then ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" ++ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" ++ fi ++ ++ else ++ ld_shlibs_CXX=no ++ fi ++ ++ ;; ++ ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ freebsd2.*) ++ # C++ shared libraries reported to be fairly broken before ++ # switch to ELF ++ ld_shlibs_CXX=no ++ ;; ++ ++ freebsd-elf*) ++ archive_cmds_need_lc_CXX=no ++ ;; ++ ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ ld_shlibs_CXX=yes ++ ;; ++ ++ haiku*) ++ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ link_all_deplibs_CXX=yes ++ ;; ++ ++ hpux9*) ++ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' ++ hardcode_libdir_separator_CXX=: ++ export_dynamic_flag_spec_CXX='$wl-E' ++ hardcode_direct_CXX=yes ++ hardcode_minus_L_CXX=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aCC*) ++ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ++ ;; ++ *) ++ if test yes = "$GXX"; then ++ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ hpux10*|hpux11*) ++ if test no = "$with_gnu_ld"; then ++ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ ;; ++ *) ++ export_dynamic_flag_spec_CXX='$wl-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_direct_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ ;; ++ *) ++ hardcode_direct_CXX=yes ++ hardcode_direct_absolute_CXX=yes ++ hardcode_minus_L_CXX=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ++ ;; ++ *) ++ if test yes = "$GXX"; then ++ if test no = "$with_gnu_ld"; then ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ interix[3-9]*) ++ hardcode_direct_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='$wl-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test yes = "$GXX"; then ++ if test no = "$with_gnu_ld"; then ++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ else ++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' ++ fi ++ fi ++ link_all_deplibs_CXX=yes ++ ;; ++ esac ++ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' ++ hardcode_libdir_separator_CXX=: ++ inherit_rpath_CXX=yes ++ ;; ++ ++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ++ ++ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='$wl--export-dynamic' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc* | ecpc* ) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ archive_cmds_need_lc_CXX=no ++ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='$wl--export-dynamic' ++ whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ case `$CC -V` in ++ *pgCC\ [1-5].* | *pgcpp\ [1-5].*) ++ prelink_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ ++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' ++ old_archive_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ ++ $RANLIB $oldlib' ++ archive_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 6 and above use weak symbols ++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ ++ hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir' ++ export_dynamic_flag_spec_CXX='$wl--export-dynamic' ++ whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' ++ ++ runpath_var=LD_RUN_PATH ++ hardcode_libdir_flag_spec_CXX='-rpath $libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ++ ;; ++ xl* | mpixl* | bgxl*) ++ # IBM XL 8.0 on PPC, with GNU ld ++ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' ++ export_dynamic_flag_spec_CXX='$wl--export-dynamic' ++ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ if test yes = "$supports_anon_versioning"; then ++ archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ no_undefined_flag_CXX=' -zdefs' ++ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ++ compiler_needs_object_CXX=yes ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='func_echo_all' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ lynxos*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ m88k*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++ wlarc= ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ hardcode_direct_CXX=yes ++ hardcode_shlibpath_var_CXX=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ ++ *nto* | *qnx*) ++ ld_shlibs_CXX=yes ++ ;; ++ ++ openbsd* | bitrig*) ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_CXX=yes ++ hardcode_shlibpath_var_CXX=no ++ hardcode_direct_absolute_CXX=yes ++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then ++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' ++ export_dynamic_flag_spec_CXX='$wl-E' ++ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' ++ fi ++ output_verbose_link_cmd=func_echo_all ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ case $host in ++ osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; ++ *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; ++ esac ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ cxx*) ++ case $host in ++ osf3*) ++ allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' ++ archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' ++ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' ++ ;; ++ *) ++ allow_undefined_flag_CXX=' -expect_unresolved \*' ++ archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' ++ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ ++ $RM $lib.exp' ++ hardcode_libdir_flag_spec_CXX='-rpath $libdir' ++ ;; ++ esac ++ ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ++ ;; ++ *) ++ if test yes,no = "$GXX,$with_gnu_ld"; then ++ allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' ++ case $host in ++ osf3*) ++ archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ ;; ++ esac ++ ++ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' ++ ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ psos*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ solaris*) ++ case $cc_basename in ++ CC* | sunCC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ archive_cmds_need_lc_CXX=yes ++ no_undefined_flag_CXX=' -zdefs' ++ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ hardcode_shlibpath_var_CXX=no ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands '-z linker_flag'. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ++ ;; ++ esac ++ link_all_deplibs_CXX=yes ++ ++ output_verbose_link_cmd='func_echo_all' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' ++ ++ # The C++ compiler must be used to create the archive. ++ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test yes,no = "$GXX,$with_gnu_ld"; then ++ no_undefined_flag_CXX=' $wl-z ${wl}defs' ++ if $CC --version | $GREP -v '^2\.7' > /dev/null; then ++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' ++ else ++ # g++ 2.7 appears to require '-G' NOT '-shared' on this ++ # platform. ++ archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' ++ fi ++ ++ hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ ;; ++ ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ++ no_undefined_flag_CXX='$wl-z,text' ++ archive_cmds_need_lc_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We CANNOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ no_undefined_flag_CXX='$wl-z,text' ++ allow_undefined_flag_CXX='$wl-z,nodefs' ++ archive_cmds_need_lc_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ hardcode_libdir_flag_spec_CXX='$wl-R,$libdir' ++ hardcode_libdir_separator_CXX=':' ++ link_all_deplibs_CXX=yes ++ export_dynamic_flag_spec_CXX='$wl-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ ++ '"$old_archive_cmds_CXX" ++ reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ ++ '"$reload_cmds_CXX" ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 ++$as_echo "$ld_shlibs_CXX" >&6; } ++ test no = "$ld_shlibs_CXX" && can_build_shared=no ++ ++ GCC_CXX=$GXX ++ LD_CXX=$LD ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ # Dependencies to place before and after the object being linked: ++predep_objects_CXX= ++postdep_objects_CXX= ++predeps_CXX= ++postdeps_CXX= ++compiler_lib_search_path_CXX= ++ ++cat > conftest.$ac_ext <<_LT_EOF ++class Foo ++{ ++public: ++ Foo (void) { a = 0; } ++private: ++ int a; ++}; ++_LT_EOF ++ ++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; ++esac ++ ++if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ # Parse the compiler output and extract the necessary ++ # objects, libraries and library flags. ++ ++ # Sentinel used to keep track of whether or not we are before ++ # the conftest object file. ++ pre_test_object_deps_done=no ++ ++ for p in `eval "$output_verbose_link_cmd"`; do ++ case $prev$p in ++ ++ -L* | -R* | -l*) ++ # Some compilers place space between "-{L,R}" and the path. ++ # Remove the space. ++ if test x-L = "$p" || ++ test x-R = "$p"; then ++ prev=$p ++ continue ++ fi ++ ++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac ++ if test no = "$pre_test_object_deps_done"; then ++ case $prev in ++ -L | -R) ++ # Internal compiler library paths should come after those ++ # provided the user. The postdeps already come after the ++ # user supplied libs so there is no need to process them. ++ if test -z "$compiler_lib_search_path_CXX"; then ++ compiler_lib_search_path_CXX=$prev$p ++ else ++ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p" ++ fi ++ ;; ++ # The "-l" case would never come before the object being ++ # linked, so don't bother handling this case. ++ esac ++ else ++ if test -z "$postdeps_CXX"; then ++ postdeps_CXX=$prev$p ++ else ++ postdeps_CXX="${postdeps_CXX} $prev$p" ++ fi ++ fi ++ prev= ++ ;; ++ ++ *.lto.$objext) ;; # Ignore GCC LTO objects ++ *.$objext) ++ # This assumes that the test object file only shows up ++ # once in the compiler output. ++ if test "$p" = "conftest.$objext"; then ++ pre_test_object_deps_done=yes ++ continue ++ fi ++ ++ if test no = "$pre_test_object_deps_done"; then ++ if test -z "$predep_objects_CXX"; then ++ predep_objects_CXX=$p ++ else ++ predep_objects_CXX="$predep_objects_CXX $p" ++ fi ++ else ++ if test -z "$postdep_objects_CXX"; then ++ postdep_objects_CXX=$p ++ else ++ postdep_objects_CXX="$postdep_objects_CXX $p" ++ fi ++ fi ++ ;; ++ ++ *) ;; # Ignore the rest. ++ ++ esac ++ done ++ ++ # Clean up. ++ rm -f a.out a.exe ++else ++ echo "libtool.m4: error: problem compiling CXX test program" ++fi ++ ++$RM -f confest.$objext ++CFLAGS=$_lt_libdeps_save_CFLAGS ++ ++# PORTME: override above test on systems where it is broken ++case $host_os in ++interix[3-9]*) ++ # Interix 3.5 installs completely hosed .la files for C++, so rather than ++ # hack all around it, let's just trust "g++" to DTRT. ++ predep_objects_CXX= ++ postdep_objects_CXX= ++ postdeps_CXX= ++ ;; ++ ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ if test yes != "$solaris_use_stlport4"; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++ ++solaris*) ++ case $cc_basename in ++ CC* | sunCC*) ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ # Adding this requires a known-good setup of shared libraries for ++ # Sun compiler versions before 5.6, else PIC objects from an old ++ # archive will be linked into the output, leading to subtle bugs. ++ if test yes != "$solaris_use_stlport4"; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++esac ++ ++ ++case " $postdeps_CXX " in ++*" -lc "*) archive_cmds_need_lc_CXX=no ;; ++esac ++ compiler_lib_search_dirs_CXX= ++if test -n "${compiler_lib_search_path_CXX}"; then ++ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'` ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ lt_prog_compiler_wl_CXX= ++lt_prog_compiler_pic_CXX= ++lt_prog_compiler_static_CXX= ++ ++ ++ # C++ specific cases for pic, static, wl, etc. ++ if test yes = "$GXX"; then ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test ia64 = "$host_cpu"; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_CXX='-Bstatic' ++ fi ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the '-m68020' flag to GCC prevents building anything better, ++ # like '-m68040'. ++ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ++ ;; ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic_CXX='-fno-common' ++ ;; ++ *djgpp*) ++ # DJGPP does not support shared libraries at all ++ lt_prog_compiler_pic_CXX= ++ ;; ++ haiku*) ++ # PIC is the default for Haiku. ++ # The "-static" flag exists, but is broken. ++ lt_prog_compiler_static_CXX= ++ ;; ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic_CXX=-Kconform_pic ++ fi ++ ;; ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ esac ++ ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic_CXX='-fPIC -shared' ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ esac ++ else ++ case $host_os in ++ aix[4-9]*) ++ # All AIX code is PIC. ++ if test ia64 = "$host_cpu"; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_CXX='-Bstatic' ++ else ++ lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ chorus*) ++ case $cc_basename in ++ cxch68*) ++ # Green Hills C++ Compiler ++ # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ ;; ++ esac ++ ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ++ ;; ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ lt_prog_compiler_pic_CXX='-KPIC' ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ freebsd* | dragonfly*) ++ # FreeBSD uses GNU C++ ++ ;; ++ hpux9* | hpux10* | hpux11*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='$wl-a ${wl}archive' ++ if test ia64 != "$host_cpu"; then ++ lt_prog_compiler_pic_CXX='+Z' ++ fi ++ ;; ++ aCC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='$wl-a ${wl}archive' ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='+Z' ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; ++ irix5* | irix6* | nonstopux*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='-non_shared' ++ # CC pic flag -KPIC is the default. ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) ++ case $cc_basename in ++ KCC*) ++ # KAI C++ Compiler ++ lt_prog_compiler_wl_CXX='--backend -Wl,' ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ ecpc* ) ++ # old Intel C++ for x86_64, which still supported -KPIC. ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-static' ++ ;; ++ icpc* ) ++ # Intel C++, used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-fPIC' ++ lt_prog_compiler_static_CXX='-static' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-fpic' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ cxx*) ++ # Compaq C++ ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_static_CXX='-non_shared' ++ ;; ++ xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) ++ # IBM XL 8.0, 9.0 on PPC and BlueGene ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-qpic' ++ lt_prog_compiler_static_CXX='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ lt_prog_compiler_wl_CXX='-Qoption ld ' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ lynxos*) ++ ;; ++ m88k*) ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ lt_prog_compiler_pic_CXX='-W c,exportall' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ netbsd*) ++ ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic_CXX='-fPIC -shared' ++ ;; ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ lt_prog_compiler_wl_CXX='--backend -Wl,' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ cxx*) ++ # Digital/Compaq C++ ++ lt_prog_compiler_wl_CXX='-Wl,' ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_static_CXX='-non_shared' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ psos*) ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC* | sunCC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ lt_prog_compiler_wl_CXX='-Qoption ld ' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ lt_prog_compiler_pic_CXX='-PIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ lt_prog_compiler_pic_CXX='-pic' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ lcc*) ++ # Lucid ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ lt_prog_compiler_pic_CXX='-KPIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ vxworks*) ++ ;; ++ *) ++ lt_prog_compiler_can_build_shared_CXX=no ++ ;; ++ esac ++ fi ++ ++case $host_os in ++ # For platforms that do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic_CXX= ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ++ ;; ++esac ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if ${lt_cv_prog_compiler_pic_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } ++lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$lt_prog_compiler_pic_CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } ++if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic_works_CXX=no ++ ac_outfile=conftest.$ac_objext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works_CXX=yes ++ fi ++ fi ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } ++ ++if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then ++ case $lt_prog_compiler_pic_CXX in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; ++ esac ++else ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_can_build_shared_CXX=no ++fi ++ ++fi ++ ++ ++ ++ ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_static_works_CXX=no ++ save_LDFLAGS=$LDFLAGS ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works_CXX=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works_CXX=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS=$save_LDFLAGS ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } ++ ++if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then ++ : ++else ++ lt_prog_compiler_static_CXX= ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_c_o_CXX=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o_CXX=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_c_o_CXX=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o_CXX=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } ++ ++ ++ ++ ++hard_links=nottested ++if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then ++ # do not overwrite the value of need_locks provided by the user ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 ++$as_echo_n "checking if we can lock with hard links... " >&6; } ++ hard_links=yes ++ $RM conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } ++ if test no = "$hard_links"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 ++$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++ ++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ case $host_os in ++ aix[4-9]*) ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ # Also, AIX nm treats weak defined symbols like other global defined ++ # symbols, whereas GNU nm marks them as "W". ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ else ++ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ fi ++ ;; ++ pw32*) ++ export_symbols_cmds_CXX=$ltdll_cmds ++ ;; ++ cygwin* | mingw* | cegcc*) ++ case $cc_basename in ++ cl*) ++ exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ++ ;; ++ *) ++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ++ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' ++ ;; ++ esac ++ ;; ++ *) ++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ esac ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 ++$as_echo "$ld_shlibs_CXX" >&6; } ++test no = "$ld_shlibs_CXX" && can_build_shared=no ++ ++with_gnu_ld_CXX=$with_gnu_ld ++ ++ ++ ++ ++ ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$archive_cmds_need_lc_CXX" in ++x|xyes) ++ # Assume -lc should be added ++ archive_cmds_need_lc_CXX=yes ++ ++ if test yes,yes = "$GCC,$enable_shared"; then ++ case $archive_cmds_CXX in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 ++$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } ++if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ $RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$lt_prog_compiler_wl_CXX ++ pic_flag=$lt_prog_compiler_pic_CXX ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX ++ allow_undefined_flag_CXX= ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 ++ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ then ++ lt_cv_archive_cmds_need_lc_CXX=no ++ else ++ lt_cv_archive_cmds_need_lc_CXX=yes ++ fi ++ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 ++$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } ++ archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ++ ;; ++ esac ++ fi ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } ++ ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=.so ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ library_names_spec='$libname$release$shared_ext$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='$libname$release$shared_ext$major' ++ ;; ++ ++aix[4-9]*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test ia64 = "$host_cpu"; then ++ # AIX 5 supports IA64 ++ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line '#! .'. This would cause the generated library to ++ # depend on '.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[01] | aix4.[01].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test yes = "$aix_use_runtimelinking"; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='$libname$release.a $libname.a' ++ soname_spec='$libname$release$shared_ext$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac ++ ;; ++ ++beos*) ++ library_names_spec='$libname$shared_ext' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[45]*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32* | cegcc*) ++ version_type=windows ++ shrext_cmds=.dll ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \$file`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ++ ++ ;; ++ mingw* | cegcc*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ++ library_names_spec='$libname.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec=$LIB ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \$file`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' ++ ;; ++ ++ *) ++ # Assume MSVC wrapper ++ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ esac ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' ++ soname_spec='$libname$release$major$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[23].*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2.*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[01]* | freebsdelf3.[01]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ ++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++haiku*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ dynamic_linker="$host_os runtime_loader" ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ if test 32 = "$HPUX_IA64_MODE"; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555, ... ++ postinstall_cmds='chmod 555 $lib' ++ # or fails outright, so override atomically: ++ install_override_mode=555 ++ ;; ++ ++interix[3-9]*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test yes = "$lt_cv_prog_gnu_ld"; then ++ version_type=linux # correct to gnu/linux during the next big refactor ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='$libname$release$shared_ext$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" ++ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++linux*android*) ++ version_type=none # Android doesn't support versioned libraries. ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext' ++ soname_spec='$libname$release$shared_ext' ++ finish_cmds= ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ dynamic_linker='Android linker' ++ # Don't embed -rpath directories since the linker doesn't support them. ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ ;; ++ ++# This must be glibc/ELF. ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ ++ # Some binutils ld are patched to set DT_RUNPATH ++ if ${lt_cv_shlibpath_overrides_runpath+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_shlibpath_overrides_runpath=no ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ ++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : ++ lt_cv_shlibpath_overrides_runpath=yes ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ ++fi ++ ++ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath ++ ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # Append ld.so.conf contents to the search path ++ if test -f /etc/ld.so.conf; then ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ fi ++ ++ # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++*nto* | *qnx*) ++ version_type=qnx ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' ++ ;; ++ ++openbsd* | bitrig*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec=/usr/lib ++ need_lib_prefix=no ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then ++ need_version=no ++ else ++ need_version=yes ++ fi ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=.dll ++ need_lib_prefix=no ++ library_names_spec='$libname$shared_ext $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='$libname$release$shared_ext$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ ++rdos*) ++ dynamic_linker=no ++ ;; ++ ++solaris*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test yes = "$with_gnu_ld"; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec; then ++ version_type=linux # correct to gnu/linux during the next big refactor ++ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' ++ soname_spec='$libname$shared_ext.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ if test yes = "$with_gnu_ld"; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++uts4*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } ++test no = "$dynamic_linker" && can_build_shared=no ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test yes = "$GCC"; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then ++ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec ++fi ++if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then ++ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++hardcode_action_CXX= ++if test -n "$hardcode_libdir_flag_spec_CXX" || ++ test -n "$runpath_var_CXX" || ++ test yes = "$hardcode_automatic_CXX"; then ++ ++ # We can hardcode non-existent directories. ++ if test no != "$hardcode_direct_CXX" && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" && ++ test no != "$hardcode_minus_L_CXX"; then ++ # Linking always hardcodes the temporary library directory. ++ hardcode_action_CXX=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ hardcode_action_CXX=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ hardcode_action_CXX=unsupported ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 ++$as_echo "$hardcode_action_CXX" >&6; } ++ ++if test relink = "$hardcode_action_CXX" || ++ test yes = "$inherit_rpath_CXX"; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test yes = "$shlibpath_overrides_runpath" || ++ test no = "$enable_shared"; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++ ++ ++ ++ ++ ++ ++ ++ fi # test -n "$compiler" ++ ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS ++ LDCXX=$LD ++ LD=$lt_save_LD ++ GCC=$lt_save_GCC ++ with_gnu_ld=$lt_save_with_gnu_ld ++ lt_cv_path_LDCXX=$lt_cv_path_LD ++ lt_cv_path_LD=$lt_save_path_LD ++ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++fi # test yes != "$_lt_caught_CXX_error" ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +@@ -12811,7 +16674,7 @@ + + + cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null` +- cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters` ++ cputype=`echo "$cputype" | tr -d ' -' | sed 's/SPARCIIi/SPARCII/' | tr $as_cr_LETTERS $as_cr_letters` + case $cputype in + *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;; + *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;; +@@ -13082,12 +16945,12 @@ + + if test "x$GCC" = "xyes"; then + CFLAGS="$CFLAGS -fexceptions" +- touch local.exp +-else +- cat > local.exp < local.exp <&5 +@@ -13288,6 +17151,7 @@ + + + TARGETDIR="unknown" ++HAVE_LONG_DOUBLE_VARIANT=0 + case "$host" in + aarch64*-*-*) + TARGET=AARCH64; TARGETDIR=aarch64 +@@ -13299,6 +17163,10 @@ + HAVE_LONG_DOUBLE='defined(__LONG_DOUBLE_128__)' + ;; + ++ arc*-*-*) ++ TARGET=ARC; TARGETDIR=arc ++ ;; ++ + arm*-*-*) + TARGET=ARM; TARGETDIR=arm + ;; +@@ -13417,6 +17285,10 @@ + TARGET=M68K; TARGETDIR=m68k + ;; + ++ m88k-*-*) ++ TARGET=M88K; TARGETDIR=m88k ++ ;; ++ + microblaze*-*-*) + TARGET=MICROBLAZE; TARGETDIR=microblaze + ;; +@@ -13432,14 +17304,19 @@ + mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*) + TARGET=MIPS_IRIX; TARGETDIR=mips + ;; +- mips*-*-linux* | mips*-*-openbsd*) ++ mips*-*linux* | mips*-*-openbsd*) + # Support 128-bit long double for NewABI. + HAVE_LONG_DOUBLE='defined(__mips64)' +- TARGET=MIPS_IRIX; TARGETDIR=mips ++ TARGET=MIPS_LINUX; TARGETDIR=mips ++ ;; ++ ++ nios2*-linux*) ++ TARGET=NIOS2; TARGETDIR=nios2 + ;; + + powerpc*-*-linux* | powerpc-*-sysv*) + TARGET=POWERPC; TARGETDIR=powerpc ++ HAVE_LONG_DOUBLE_VARIANT=1 + ;; + powerpc-*-amigaos*) + TARGET=POWERPC; TARGETDIR=powerpc +@@ -13455,6 +17332,7 @@ + ;; + powerpc-*-freebsd* | powerpc-*-openbsd*) + TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc ++ HAVE_LONG_DOUBLE_VARIANT=1 + ;; + powerpc64-*-freebsd*) + TARGET=POWERPC; TARGETDIR=powerpc +@@ -13482,6 +17360,10 @@ + TARGET=TILE; TARGETDIR=tile + ;; + ++ vax-*-*) ++ TARGET=VAX; TARGETDIR=vax ++ ;; ++ + xtensa*-*) + TARGET=XTENSA; TARGETDIR=xtensa + ;; +@@ -13559,6 +17441,22 @@ + X86_DARWIN_FALSE= + fi + ++ if test x$TARGET = xX86_DARWIN && test $ac_cv_sizeof_size_t = 4; then ++ X86_DARWIN32_TRUE= ++ X86_DARWIN32_FALSE='#' ++else ++ X86_DARWIN32_TRUE='#' ++ X86_DARWIN32_FALSE= ++fi ++ ++ if test x$TARGET = xX86_DARWIN && test $ac_cv_sizeof_size_t = 8; then ++ X86_DARWIN64_TRUE= ++ X86_DARWIN64_FALSE='#' ++else ++ X86_DARWIN64_TRUE='#' ++ X86_DARWIN64_FALSE= ++fi ++ + if test x$TARGET = xALPHA; then + ALPHA_TRUE= + ALPHA_FALSE='#' +@@ -13591,6 +17489,14 @@ + M68K_FALSE= + fi + ++ if test x$TARGET = xM88K; then ++ M88K_TRUE= ++ M88K_FALSE='#' ++else ++ M88K_TRUE='#' ++ M88K_FALSE= ++fi ++ + if test x$TARGET = xMICROBLAZE; then + MICROBLAZE_TRUE= + MICROBLAZE_FALSE='#' +@@ -13615,6 +17521,14 @@ + MOXIE_FALSE= + fi + ++ if test x$TARGET = xNIOS2; then ++ NIOS2_TRUE= ++ NIOS2_FALSE='#' ++else ++ NIOS2_TRUE='#' ++ NIOS2_FALSE= ++fi ++ + if test x$TARGET = xPOWERPC; then + POWERPC_TRUE= + POWERPC_FALSE='#' +@@ -13655,6 +17569,14 @@ + AARCH64_FALSE= + fi + ++ if test x$TARGET = xARC; then ++ ARC_TRUE= ++ ARC_FALSE='#' ++else ++ ARC_TRUE='#' ++ ARC_FALSE= ++fi ++ + if test x$TARGET = xARM; then + ARM_TRUE= + ARM_FALSE='#' +@@ -13751,6 +17673,14 @@ + TILE_FALSE= + fi + ++ if test x$TARGET = xVAX; then ++ VAX_TRUE= ++ VAX_FALSE='#' ++else ++ VAX_TRUE='#' ++ VAX_FALSE= ++fi ++ + if test x$TARGET = xXTENSA; then + XTENSA_TRUE= + XTENSA_FALSE='#' +@@ -14151,15 +18081,23 @@ + # Also AC_SUBST this variable for ffi.h. + if test -z "$HAVE_LONG_DOUBLE"; then + HAVE_LONG_DOUBLE=0 +- if test $ac_cv_sizeof_double != $ac_cv_sizeof_long_double; then +- if test $ac_cv_sizeof_long_double != 0; then ++ if test $ac_cv_sizeof_long_double != 0; then ++ if test $HAVE_LONG_DOUBLE_VARIANT != 0; then ++ ++$as_echo "#define HAVE_LONG_DOUBLE_VARIANT 1" >>confdefs.h ++ + HAVE_LONG_DOUBLE=1 ++ else ++ if test $ac_cv_sizeof_double != $ac_cv_sizeof_long_double; then ++ HAVE_LONG_DOUBLE=1 + + $as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h + +- fi +- fi +-fi ++ fi ++ fi ++ fi ++fi ++ + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +@@ -14602,8 +18540,7 @@ + fi + + +-if test x$TARGET = xX86_WIN64; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ prefix in compiled symbols" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ prefix in compiled symbols" >&5 + $as_echo_n "checking for _ prefix in compiled symbols... " >&6; } + if ${lt_cv_sys_symbol_underscore+:} false; then : + $as_echo_n "(cached) " >&6 +@@ -14650,11 +18587,10 @@ + sys_symbol_underscore=$lt_cv_sys_symbol_underscore + + +- if test "x$sys_symbol_underscore" = xyes; then ++if test "x$sys_symbol_underscore" = xyes; then + + $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h + +- fi + fi + + FFI_EXEC_TRAMPOLINE_TABLE=0 +@@ -14682,16 +18618,32 @@ + + + if test x$TARGET = xX86_64; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler supports unwind section type" >&5 +-$as_echo_n "checking assembler supports unwind section type... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking toolchain supports unwind section type" >&5 ++$as_echo_n "checking toolchain supports unwind section type... " >&6; } + if ${libffi_cv_as_x86_64_unwind_section_type+:} false; then : + $as_echo_n "(cached) " >&6 + else + +- libffi_cv_as_x86_64_unwind_section_type=yes +- echo '.section .eh_frame,"a",@unwind' > conftest.s +- if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then +- libffi_cv_as_x86_64_unwind_section_type=no ++ cat > conftest1.s << EOF ++.text ++.globl foo ++foo: ++jmp bar ++.section .eh_frame,"a",@unwind ++bar: ++EOF ++ ++ cat > conftest2.c << EOF ++extern void foo(); ++int main(){foo();} ++EOF ++ ++ libffi_cv_as_x86_64_unwind_section_type=no ++ # we ensure that we can compile _and_ link an assembly file containing an @unwind section ++ # since the compiler can support it and not the linker (ie old binutils) ++ if $CC -Wa,--fatal-warnings $CFLAGS -c conftest1.s > /dev/null 2>&1 && \ ++ $CC conftest2.c conftest1.o > /dev/null 2>&1 ; then ++ libffi_cv_as_x86_64_unwind_section_type=yes + fi + + fi +@@ -14844,7 +18796,7 @@ + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi +- multi_os_directory=`$CC -print-multi-os-directory` ++ multi_os_directory=`$CC $CFLAGS -print-multi-os-directory` + case $multi_os_directory in + .) ;; # Avoid trailing /. + ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +@@ -15005,6 +18957,10 @@ + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then ++ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -15049,6 +19005,14 @@ + as_fn_error $? "conditional \"X86_DARWIN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${X86_DARWIN32_TRUE}" && test -z "${X86_DARWIN32_FALSE}"; then ++ as_fn_error $? "conditional \"X86_DARWIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${X86_DARWIN64_TRUE}" && test -z "${X86_DARWIN64_FALSE}"; then ++ as_fn_error $? "conditional \"X86_DARWIN64\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${ALPHA_TRUE}" && test -z "${ALPHA_FALSE}"; then + as_fn_error $? "conditional \"ALPHA\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -15065,6 +19029,10 @@ + as_fn_error $? "conditional \"M68K\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${M88K_TRUE}" && test -z "${M88K_FALSE}"; then ++ as_fn_error $? "conditional \"M88K\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${MICROBLAZE_TRUE}" && test -z "${MICROBLAZE_FALSE}"; then + as_fn_error $? "conditional \"MICROBLAZE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -15077,6 +19045,10 @@ + as_fn_error $? "conditional \"MOXIE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${NIOS2_TRUE}" && test -z "${NIOS2_FALSE}"; then ++ as_fn_error $? "conditional \"NIOS2\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${POWERPC_TRUE}" && test -z "${POWERPC_FALSE}"; then + as_fn_error $? "conditional \"POWERPC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -15097,6 +19069,10 @@ + as_fn_error $? "conditional \"AARCH64\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${ARC_TRUE}" && test -z "${ARC_FALSE}"; then ++ as_fn_error $? "conditional \"ARC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${ARM_TRUE}" && test -z "${ARM_FALSE}"; then + as_fn_error $? "conditional \"ARM\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -15145,6 +19121,10 @@ + as_fn_error $? "conditional \"TILE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${VAX_TRUE}" && test -z "${VAX_FALSE}"; then ++ as_fn_error $? "conditional \"VAX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${XTENSA_TRUE}" && test -z "${XTENSA_FALSE}"; then + as_fn_error $? "conditional \"XTENSA\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -15559,7 +19539,7 @@ + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by libffi $as_me 3.0.13, which was ++This file was extended by libffi $as_me 3.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -15629,7 +19609,7 @@ + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-libffi config.status 3.0.13 ++libffi config.status 3.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +@@ -15821,8 +19801,10 @@ + GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' ++lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' + nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' + lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' + objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +@@ -15896,6 +19878,60 @@ + enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' + old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' + striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' ++compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' ++predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' ++postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' ++predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' ++postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' ++compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' ++LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' ++reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' ++reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' ++GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' ++archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' ++export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' ++whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' ++compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' ++old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' ++allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' ++no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' ++hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' ++hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' ++hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' ++hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' ++hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' ++hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' ++inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' ++link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' ++always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' ++export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' ++include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' ++prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' ++hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' ++compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' ++predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' ++postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' ++predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' ++postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' ++compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' + + LTCC='$LTCC' + LTCFLAGS='$LTCFLAGS' +@@ -15940,8 +19976,10 @@ + compiler \ + lt_cv_sys_global_symbol_pipe \ + lt_cv_sys_global_symbol_to_cdecl \ ++lt_cv_sys_global_symbol_to_import \ + lt_cv_sys_global_symbol_to_c_name_address \ + lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ ++lt_cv_nm_interface \ + nm_file_list_spec \ + lt_prog_compiler_no_builtin_flag \ + lt_prog_compiler_pic \ +@@ -15974,10 +20012,41 @@ + install_override_mode \ + finish_eval \ + old_striplib \ +-striplib; do ++striplib \ ++compiler_lib_search_dirs \ ++predep_objects \ ++postdep_objects \ ++predeps \ ++postdeps \ ++compiler_lib_search_path \ ++LD_CXX \ ++reload_flag_CXX \ ++compiler_CXX \ ++lt_prog_compiler_no_builtin_flag_CXX \ ++lt_prog_compiler_pic_CXX \ ++lt_prog_compiler_wl_CXX \ ++lt_prog_compiler_static_CXX \ ++lt_cv_prog_compiler_c_o_CXX \ ++export_dynamic_flag_spec_CXX \ ++whole_archive_flag_spec_CXX \ ++compiler_needs_object_CXX \ ++with_gnu_ld_CXX \ ++allow_undefined_flag_CXX \ ++no_undefined_flag_CXX \ ++hardcode_libdir_flag_spec_CXX \ ++hardcode_libdir_separator_CXX \ ++exclude_expsyms_CXX \ ++include_expsyms_CXX \ ++file_list_spec_CXX \ ++compiler_lib_search_dirs_CXX \ ++predep_objects_CXX \ ++postdep_objects_CXX \ ++predeps_CXX \ ++postdeps_CXX \ ++compiler_lib_search_path_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +@@ -16004,10 +20073,21 @@ + postuninstall_cmds \ + finish_cmds \ + sys_lib_search_path_spec \ +-sys_lib_dlsearch_path_spec; do ++sys_lib_dlsearch_path_spec \ ++reload_cmds_CXX \ ++old_archive_cmds_CXX \ ++old_archive_from_new_cmds_CXX \ ++old_archive_from_expsyms_cmds_CXX \ ++archive_cmds_CXX \ ++archive_expsym_cmds_CXX \ ++module_cmds_CXX \ ++module_expsym_cmds_CXX \ ++export_symbols_cmds_CXX \ ++prelink_cmds_CXX \ ++postlink_cmds_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +@@ -16016,24 +20096,23 @@ + done + + ac_aux_dir='$ac_aux_dir' +-xsi_shell='$xsi_shell' +-lt_shell_append='$lt_shell_append' +- +-# See if we are running on zsh, and set the options which allow our ++ ++# See if we are running on zsh, and set the options that allow our + # commands through without removal of \ escapes INIT. +-if test -n "\${ZSH_VERSION+set}" ; then ++if test -n "\${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + + + PACKAGE='$PACKAGE' + VERSION='$VERSION' +- TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile' + + + ++ ++ + TARGETDIR="$TARGETDIR" + + _ACEOF +@@ -16831,7 +20910,7 @@ + fi + ;; + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { +- # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in +@@ -16882,7 +20961,7 @@ + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue ++ test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the +@@ -16925,13 +21004,13 @@ + ;; + "libtool":C) + +- # See if we are running on zsh, and set the options which allow our ++ # See if we are running on zsh, and set the options that allow our + # commands through without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then ++ if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + +- cfgfile="${ofile}T" ++ cfgfile=${ofile}T + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + +@@ -16939,7 +21018,7 @@ + #! $SHELL + + # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Generated automatically by $as_me ($PACKAGE) $VERSION + # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # +@@ -16973,7 +21052,7 @@ + + + # The names of the tagged configurations supported by this script. +-available_tags="" ++available_tags='CXX ' + + # ### BEGIN LIBTOOL CONFIG + +@@ -17110,16 +21189,22 @@ + # Transform the output of nm in a proper C declaration. + global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + ++# Transform the output of nm into a list of symbols to manually relocate. ++global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import ++ + # Transform the output of nm in a C name address pair. + global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + + # Transform the output of nm in a C name address pair when lib prefix is needed. + global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + ++# The name lister interface. ++nm_interface=$lt_lt_cv_nm_interface ++ + # Specify filename containing input files for \$NM. + nm_file_list_spec=$lt_nm_file_list_spec + +-# The root where to search for dependent libraries,and in which our libraries should be installed. ++# The root where to search for dependent libraries,and where our libraries should be installed. + lt_sysroot=$lt_sysroot + + # The name of the directory that contains temporary libtool files. +@@ -17306,13 +21391,13 @@ + # Whether we need a single "-rpath" flag with a separated argument. + hardcode_libdir_separator=$lt_hardcode_libdir_separator + +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes + # DIR into the resulting binary. + hardcode_direct=$hardcode_direct + +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes + # DIR into the resulting binary and the resulting library dependency is +-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the ++# "absolute",i.e impossible to change by setting \$shlibpath_var if the + # library is relocated. + hardcode_direct_absolute=$hardcode_direct_absolute + +@@ -17360,6 +21445,20 @@ + # How to hardcode a shared library path into an executable. + hardcode_action=$hardcode_action + ++# The directories searched by this compiler when creating a shared library. ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs ++ ++# Dependencies to place before and after the objects being linked to ++# create a shared library. ++predep_objects=$lt_predep_objects ++postdep_objects=$lt_postdep_objects ++predeps=$lt_predeps ++postdeps=$lt_postdeps ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path ++ + # ### END LIBTOOL CONFIG + + _LT_EOF +@@ -17370,7 +21469,7 @@ + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then ++if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi +@@ -17379,7 +21478,7 @@ + esac + + +-ltmain="$ac_aux_dir/ltmain.sh" ++ltmain=$ac_aux_dir/ltmain.sh + + + # We use sed instead of cat because bash on DJGPP gets confused if +@@ -17389,169 +21488,163 @@ + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + +- if test x"$xsi_shell" = xyes; then +- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +-func_dirname ()\ +-{\ +-\ case ${1} in\ +-\ */*) func_dirname_result="${1%/*}${2}" ;;\ +-\ * ) func_dirname_result="${3}" ;;\ +-\ esac\ +-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_basename ()$/,/^} # func_basename /c\ +-func_basename ()\ +-{\ +-\ func_basename_result="${1##*/}"\ +-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +-func_dirname_and_basename ()\ +-{\ +-\ case ${1} in\ +-\ */*) func_dirname_result="${1%/*}${2}" ;;\ +-\ * ) func_dirname_result="${3}" ;;\ +-\ esac\ +-\ func_basename_result="${1##*/}"\ +-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +-func_stripname ()\ +-{\ +-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +-\ # positional parameters, so assign one to ordinary parameter first.\ +-\ func_stripname_result=${3}\ +-\ func_stripname_result=${func_stripname_result#"${1}"}\ +-\ func_stripname_result=${func_stripname_result%"${2}"}\ +-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +-func_split_long_opt ()\ +-{\ +-\ func_split_long_opt_name=${1%%=*}\ +-\ func_split_long_opt_arg=${1#*=}\ +-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +-func_split_short_opt ()\ +-{\ +-\ func_split_short_opt_arg=${1#??}\ +-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +-func_lo2o ()\ +-{\ +-\ case ${1} in\ +-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +-\ *) func_lo2o_result=${1} ;;\ +-\ esac\ +-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_xform ()$/,/^} # func_xform /c\ +-func_xform ()\ +-{\ +- func_xform_result=${1%.*}.lo\ +-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_arith ()$/,/^} # func_arith /c\ +-func_arith ()\ +-{\ +- func_arith_result=$(( $* ))\ +-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_len ()$/,/^} # func_len /c\ +-func_len ()\ +-{\ +- func_len_result=${#1}\ +-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +-fi +- +-if test x"$lt_shell_append" = xyes; then +- sed -e '/^func_append ()$/,/^} # func_append /c\ +-func_append ()\ +-{\ +- eval "${1}+=\\${2}"\ +-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +-func_append_quoted ()\ +-{\ +-\ func_quote_for_eval "${2}"\ +-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- # Save a `func_append' function call where possible by direct use of '+=' +- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +- test 0 -eq $? || _lt_function_replace_fail=: +-else +- # Save a `func_append' function call even when '+=' is not available +- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +- test 0 -eq $? || _lt_function_replace_fail=: +-fi +- +-if test x"$_lt_function_replace_fail" = x":"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +-fi +- +- + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + ++ ++ cat <<_LT_EOF >> "$ofile" ++ ++# ### BEGIN LIBTOOL TAG CONFIG: CXX ++ ++# The linker used to build libraries. ++LD=$lt_LD_CXX ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag_CXX ++reload_cmds=$lt_reload_cmds_CXX ++ ++# Commands used to build an old-style archive. ++old_archive_cmds=$lt_old_archive_cmds_CXX ++ ++# A language specific compiler. ++CC=$lt_compiler_CXX ++ ++# Is the compiler the GNU compiler? ++with_gcc=$GCC_CXX ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic_CXX ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_CXX ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static_CXX ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc_CXX ++ ++# Whether or not to disallow shared libs when runtime libs are static. ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX ++ ++# Whether the compiler copes with passing no objects directly. ++compiler_needs_object=$lt_compiler_needs_object_CXX ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX ++ ++# Commands used to build a shared archive. ++archive_cmds=$lt_archive_cmds_CXX ++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX ++ ++# Commands used to build a loadable module if different from building ++# a shared archive. ++module_cmds=$lt_module_cmds_CXX ++module_expsym_cmds=$lt_module_expsym_cmds_CXX ++ ++# Whether we are building with GNU ld or not. ++with_gnu_ld=$lt_with_gnu_ld_CXX ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag_CXX ++ ++# Flag that enforces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag_CXX ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX ++ ++# Whether we need a single "-rpath" flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX ++ ++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes ++# DIR into the resulting binary. ++hardcode_direct=$hardcode_direct_CXX ++ ++# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes ++# DIR into the resulting binary and the resulting library dependency is ++# "absolute",i.e impossible to change by setting \$shlibpath_var if the ++# library is relocated. ++hardcode_direct_absolute=$hardcode_direct_absolute_CXX ++ ++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++# into the resulting binary. ++hardcode_minus_L=$hardcode_minus_L_CXX ++ ++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++# into the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX ++ ++# Set to "yes" if building a shared library automatically hardcodes DIR ++# into the library and all subsequent libraries and executables linked ++# against it. ++hardcode_automatic=$hardcode_automatic_CXX ++ ++# Set to yes if linker adds runtime paths of dependent libraries ++# to runtime path list. ++inherit_rpath=$inherit_rpath_CXX ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs_CXX ++ ++# Set to "yes" if exported symbols are required. ++always_export_symbols=$always_export_symbols_CXX ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds_CXX ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms_CXX ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms_CXX ++ ++# Commands necessary for linking programs (against libraries) with templates. ++prelink_cmds=$lt_prelink_cmds_CXX ++ ++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds_CXX ++ ++# Specify filename containing input files. ++file_list_spec=$lt_file_list_spec_CXX ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action_CXX ++ ++# The directories searched by this compiler when creating a shared library. ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX ++ ++# Dependencies to place before and after the objects being linked to ++# create a shared library. ++predep_objects=$lt_predep_objects_CXX ++postdep_objects=$lt_postdep_objects_CXX ++predeps=$lt_predeps_CXX ++postdeps=$lt_postdeps_CXX ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX ++ ++# ### END LIBTOOL TAG CONFIG: CXX ++_LT_EOF ++ + ;; + "include":C) test -d include || mkdir include ;; + "src":C) +diff -r ee879c0ffa11 Modules/_ctypes/libffi/configure.ac +--- a/Modules/_ctypes/libffi/configure.ac ++++ b/Modules/_ctypes/libffi/configure.ac +@@ -5,13 +5,17 @@ + + AC_PREREQ(2.68) + +-AC_INIT([libffi], [3.0.13], [http://github.com/atgreen/libffi/issues]) ++AC_INIT([libffi], [3.1], [http://github.com/atgreen/libffi/issues]) + AC_CONFIG_HEADERS([fficonfig.h]) + + AC_CANONICAL_SYSTEM + target_alias=${target_alias-$host_alias} + +-. ${srcdir}/configure.host ++case "${host}" in ++ frv*-elf) ++ LDFLAGS=`echo $LDFLAGS | sed "s/\-B[^ ]*libgloss\/frv\///"`\ -B`pwd`/../libgloss/frv/ ++ ;; ++esac + + AX_ENABLE_BUILDDIR + +@@ -28,6 +32,7 @@ + m4_define([_AC_ARG_VAR_PRECIOUS],[]) + save_CFLAGS=$CFLAGS + AC_PROG_CC ++AC_PROG_CXX + CFLAGS=$save_CFLAGS + m4_undefine([_AC_ARG_VAR_PRECIOUS]) + m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +@@ -52,12 +57,12 @@ + + if test "x$GCC" = "xyes"; then + CFLAGS="$CFLAGS -fexceptions" +- touch local.exp +-else +- cat > local.exp < local.exp < conftest.s +- if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then +- libffi_cv_as_x86_64_unwind_section_type=no ++ cat > conftest1.s << EOF ++.text ++.globl foo ++foo: ++jmp bar ++.section .eh_frame,"a",@unwind ++bar: ++EOF ++ ++ cat > conftest2.c << EOF ++extern void foo(); ++int main(){foo();} ++EOF ++ ++ libffi_cv_as_x86_64_unwind_section_type=no ++ # we ensure that we can compile _and_ link an assembly file containing an @unwind section ++ # since the compiler can support it and not the linker (ie old binutils) ++ if $CC -Wa,--fatal-warnings $CFLAGS -c conftest1.s > /dev/null 2>&1 && \ ++ $CC conftest2.c conftest1.o > /dev/null 2>&1 ; then ++ libffi_cv_as_x86_64_unwind_section_type=yes + fi + ]) + if test "x$libffi_cv_as_x86_64_unwind_section_type" = xyes; then +@@ -526,14 +575,14 @@ + AC_ARG_ENABLE(structs, + [ --disable-structs omit code for struct support], + if test "$enable_structs" = "no"; then +- AC_DEFINE(FFI_NO_STRUCTS, 1, [Define this is you do not want support for aggregate types.]) ++ AC_DEFINE(FFI_NO_STRUCTS, 1, [Define this if you do not want support for aggregate types.]) + fi) + AM_CONDITIONAL(FFI_DEBUG, test "$enable_debug" = "yes") + + AC_ARG_ENABLE(raw-api, + [ --disable-raw-api make the raw api unavailable], + if test "$enable_raw_api" = "no"; then +- AC_DEFINE(FFI_NO_RAW_API, 1, [Define this is you do not want support for the raw API.]) ++ AC_DEFINE(FFI_NO_RAW_API, 1, [Define this if you do not want support for the raw API.]) + fi) + + AC_ARG_ENABLE(purify-safety, +@@ -553,7 +602,7 @@ + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi +- multi_os_directory=`$CC -print-multi-os-directory` ++ multi_os_directory=`$CC $CFLAGS -print-multi-os-directory` + case $multi_os_directory in + .) ;; # Avoid trailing /. + ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/configure.host +--- a/Modules/_ctypes/libffi/configure.host ++++ /dev/null +@@ -1,11 +0,0 @@ +-# configure.host +-# +-# This shell script handles all host based configuration for libffi. +-# +- +-# THIS TABLE IS SORTED. KEEP IT THAT WAY. +-case "${host}" in +- frv*-elf) +- LDFLAGS=`echo $LDFLAGS | sed "s/\-B[^ ]*libgloss\/frv\///"`\ -B`pwd`/../libgloss/frv/ +- ;; +-esac +diff -r ee879c0ffa11 Modules/_ctypes/libffi/depcomp +--- a/Modules/_ctypes/libffi/depcomp ++++ b/Modules/_ctypes/libffi/depcomp +@@ -1,10 +1,9 @@ + #! /bin/sh + # depcomp - compile a program generating dependencies as side-effects + +-scriptversion=2009-04-28.21; # UTC ++scriptversion=2013-05-30.07; # UTC + +-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +-# Software Foundation, Inc. ++# Copyright (C) 1999-2013 Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -28,9 +27,9 @@ + + case $1 in + '') +- echo "$0: No command. Try \`$0 --help' for more information." 1>&2 +- exit 1; +- ;; ++ echo "$0: No command. Try '$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; + -h | --h*) + cat <<\EOF + Usage: depcomp [--help] [--version] PROGRAM [ARGS] +@@ -40,11 +39,11 @@ + + Environment variables: + depmode Dependency tracking mode. +- source Source file read by `PROGRAMS ARGS'. +- object Object file output by `PROGRAMS ARGS'. ++ source Source file read by 'PROGRAMS ARGS'. ++ object Object file output by 'PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. +- tmpdepfile Temporary file to use when outputing dependencies. ++ tmpdepfile Temporary file to use when outputting dependencies. + libtool Whether libtool is used (yes/no). + + Report bugs to . +@@ -57,6 +56,66 @@ + ;; + esac + ++# Get the directory component of the given path, and save it in the ++# global variables '$dir'. Note that this directory component will ++# be either empty or ending with a '/' character. This is deliberate. ++set_dir_from () ++{ ++ case $1 in ++ */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; ++ *) dir=;; ++ esac ++} ++ ++# Get the suffix-stripped basename of the given path, and save it the ++# global variable '$base'. ++set_base_from () ++{ ++ base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` ++} ++ ++# If no dependency file was actually created by the compiler invocation, ++# we still have to create a dummy depfile, to avoid errors with the ++# Makefile "include basename.Plo" scheme. ++make_dummy_depfile () ++{ ++ echo "#dummy" > "$depfile" ++} ++ ++# Factor out some common post-processing of the generated depfile. ++# Requires the auxiliary global variable '$tmpdepfile' to be set. ++aix_post_process_depfile () ++{ ++ # If the compiler actually managed to produce a dependency file, ++ # post-process it. ++ if test -f "$tmpdepfile"; then ++ # Each line is of the form 'foo.o: dependency.h'. ++ # Do two passes, one to just change these to ++ # $object: dependency.h ++ # and one to simply output ++ # dependency.h: ++ # which is needed to avoid the deleted-header problem. ++ { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" ++ sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" ++ } > "$depfile" ++ rm -f "$tmpdepfile" ++ else ++ make_dummy_depfile ++ fi ++} ++ ++# A tabulation character. ++tab=' ' ++# A newline character. ++nl=' ++' ++# Character ranges might be problematic outside the C locale. ++# These definitions help. ++upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ ++lower=abcdefghijklmnopqrstuvwxyz ++digits=0123456789 ++alpha=${upper}${lower} ++ + if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +@@ -69,6 +128,9 @@ + + rm -f "$tmpdepfile" + ++# Avoid interferences from the environment. ++gccflag= dashmflag= ++ + # Some modes work just like other modes, but use different flags. We + # parameterize here, but still list the modes in the big case below, + # to make depend.m4 easier to write. Note that we *cannot* use a case +@@ -80,18 +142,32 @@ + fi + + if test "$depmode" = dashXmstdout; then +- # This is just like dashmstdout with a different argument. +- dashmflag=-xM +- depmode=dashmstdout ++ # This is just like dashmstdout with a different argument. ++ dashmflag=-xM ++ depmode=dashmstdout + fi + + cygpath_u="cygpath -u -f -" + if test "$depmode" = msvcmsys; then +- # This is just like msvisualcpp but w/o cygpath translation. +- # Just convert the backslash-escaped backslashes to single forward +- # slashes to satisfy depend.m4 +- cygpath_u="sed s,\\\\\\\\,/,g" +- depmode=msvisualcpp ++ # This is just like msvisualcpp but w/o cygpath translation. ++ # Just convert the backslash-escaped backslashes to single forward ++ # slashes to satisfy depend.m4 ++ cygpath_u='sed s,\\\\,/,g' ++ depmode=msvisualcpp ++fi ++ ++if test "$depmode" = msvc7msys; then ++ # This is just like msvc7 but w/o cygpath translation. ++ # Just convert the backslash-escaped backslashes to single forward ++ # slashes to satisfy depend.m4 ++ cygpath_u='sed s,\\\\,/,g' ++ depmode=msvc7 ++fi ++ ++if test "$depmode" = xlc; then ++ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. ++ gccflag=-qmakedep=gcc,-MF ++ depmode=gcc + fi + + case "$depmode" in +@@ -114,8 +190,7 @@ + done + "$@" + stat=$? +- if test $stat -eq 0; then : +- else ++ if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi +@@ -123,13 +198,17 @@ + ;; + + gcc) ++## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. ++## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. ++## (see the conditional assignment to $gccflag above). + ## There are various ways to get dependency output from gcc. Here's + ## why we pick this rather obscure method: + ## - Don't want to use -MD because we'd like the dependencies to end + ## up in a subdir. Having to rename by hand is ugly. + ## (We might end up doing this anyway to support other compilers.) + ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +-## -MM, not -M (despite what the docs say). ++## -MM, not -M (despite what the docs say). Also, it might not be ++## supported by the other compilers which use the 'gcc' depmode. + ## - Using -M directly means running the compiler twice (even worse + ## than renaming). + if test -z "$gccflag"; then +@@ -137,31 +216,31 @@ + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? +- if test $stat -eq 0; then : +- else ++ if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" +- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +-## The second -e expression handles DOS-style file names with drive letters. ++ # The second -e expression handles DOS-style file names with drive ++ # letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +-## This next piece of magic avoids the `deleted header file' problem. ++## This next piece of magic avoids the "deleted header file" problem. + ## The problem is that when a header file which appears in a .P file + ## is deleted, the dependency causes make to die (because there is + ## typically no way to rebuild the header). We avoid this by adding + ## dummy dependencies for each header file. Too bad gcc doesn't do + ## this for us directly. +- tr ' ' ' +-' < "$tmpdepfile" | +-## Some versions of gcc put a space before the `:'. On the theory ++## Some versions of gcc put a space before the ':'. On the theory + ## that the space means something, we add a space to the output as +-## well. ++## well. hp depmode also adds that space, but also prefixes the VPATH ++## to the object. Take care to not repeat it in the output. + ## Some versions of the HPUX 10.20 sed can't process this invocation + ## correctly. Breaking it into two sed invocations is a workaround. +- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" ++ tr ' ' "$nl" < "$tmpdepfile" \ ++ | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ ++ | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +@@ -179,8 +258,7 @@ + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? +- if test $stat -eq 0; then : +- else ++ if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi +@@ -188,43 +266,41 @@ + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" +- + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; +- # the IRIX cc adds comments like `#:fec' to the end of the ++ # the IRIX cc adds comments like '#:fec' to the end of the + # dependency line. +- tr ' ' ' +-' < "$tmpdepfile" \ +- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ +- tr ' +-' ' ' >> "$depfile" ++ tr ' ' "$nl" < "$tmpdepfile" \ ++ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ ++ | tr "$nl" ' ' >> "$depfile" + echo >> "$depfile" +- + # The second pass generates a dummy entry for each header file. +- tr ' ' ' +-' < "$tmpdepfile" \ +- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ +- >> "$depfile" ++ tr ' ' "$nl" < "$tmpdepfile" \ ++ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ ++ >> "$depfile" + else +- # The sourcefile does not contain any dependencies, so just +- # store a dummy comment line, to avoid errors with the Makefile +- # "include basename.Plo" scheme. +- echo "#dummy" > "$depfile" ++ make_dummy_depfile + fi + rm -f "$tmpdepfile" + ;; + ++xlc) ++ # This case exists only to let depend.m4 do its work. It works by ++ # looking at the text of this script. This case will never be run, ++ # since it is checked for above. ++ exit 1 ++ ;; ++ + aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. In older versions, this file always lives in the +- # current directory. Also, the AIX compiler puts `$object:' at the ++ # current directory. Also, the AIX compiler puts '$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. +- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` +- test "x$dir" = "x$object" && dir= +- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ set_dir_from "$object" ++ set_base_from "$object" + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u +@@ -237,9 +313,7 @@ + "$@" -M + fi + stat=$? +- +- if test $stat -eq 0; then : +- else ++ if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi +@@ -248,44 +322,100 @@ + do + test -f "$tmpdepfile" && break + done +- if test -f "$tmpdepfile"; then +- # Each line is of the form `foo.o: dependent.h'. +- # Do two passes, one to just change these to +- # `$object: dependent.h' and one to simply `dependent.h:'. +- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" +- # That's a tab and a space in the []. +- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" +- else +- # The sourcefile does not contain any dependencies, so just +- # store a dummy comment line, to avoid errors with the Makefile +- # "include basename.Plo" scheme. +- echo "#dummy" > "$depfile" ++ aix_post_process_depfile ++ ;; ++ ++tcc) ++ # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 ++ # FIXME: That version still under development at the moment of writing. ++ # Make that this statement remains true also for stable, released ++ # versions. ++ # It will wrap lines (doesn't matter whether long or short) with a ++ # trailing '\', as in: ++ # ++ # foo.o : \ ++ # foo.c \ ++ # foo.h \ ++ # ++ # It will put a trailing '\' even on the last line, and will use leading ++ # spaces rather than leading tabs (at least since its commit 0394caf7 ++ # "Emit spaces for -MD"). ++ "$@" -MD -MF "$tmpdepfile" ++ stat=$? ++ if test $stat -ne 0; then ++ rm -f "$tmpdepfile" ++ exit $stat + fi ++ rm -f "$depfile" ++ # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. ++ # We have to change lines of the first kind to '$object: \'. ++ sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" ++ # And for each line of the second kind, we have to emit a 'dep.h:' ++ # dummy dependency, to avoid the deleted-header problem. ++ sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" + rm -f "$tmpdepfile" + ;; + +-icc) +- # Intel's C compiler understands `-MD -MF file'. However on +- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c +- # ICC 7.0 will fill foo.d with something like +- # foo.o: sub/foo.c +- # foo.o: sub/foo.h +- # which is wrong. We want: +- # sub/foo.o: sub/foo.c +- # sub/foo.o: sub/foo.h +- # sub/foo.c: +- # sub/foo.h: +- # ICC 7.1 will output ++## The order of this option in the case statement is important, since the ++## shell code in configure will try each of these formats in the order ++## listed in this file. A plain '-MD' option would be understood by many ++## compilers, so we must ensure this comes after the gcc and icc options. ++pgcc) ++ # Portland's C compiler understands '-MD'. ++ # Will always output deps to 'file.d' where file is the root name of the ++ # source file under compilation, even if file resides in a subdirectory. ++ # The object file name does not affect the name of the '.d' file. ++ # pgcc 10.2 will output + # foo.o: sub/foo.c sub/foo.h +- # and will wrap long lines using \ : ++ # and will wrap long lines using '\' : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... ++ set_dir_from "$object" ++ # Use the source, not the object, to determine the base name, since ++ # that's sadly what pgcc will do too. ++ set_base_from "$source" ++ tmpdepfile=$base.d + +- "$@" -MD -MF "$tmpdepfile" +- stat=$? +- if test $stat -eq 0; then : +- else ++ # For projects that build the same source file twice into different object ++ # files, the pgcc approach of using the *source* file root name can cause ++ # problems in parallel builds. Use a locking strategy to avoid stomping on ++ # the same $tmpdepfile. ++ lockdir=$base.d-lock ++ trap " ++ echo '$0: caught signal, cleaning up...' >&2 ++ rmdir '$lockdir' ++ exit 1 ++ " 1 2 13 15 ++ numtries=100 ++ i=$numtries ++ while test $i -gt 0; do ++ # mkdir is a portable test-and-set. ++ if mkdir "$lockdir" 2>/dev/null; then ++ # This process acquired the lock. ++ "$@" -MD ++ stat=$? ++ # Release the lock. ++ rmdir "$lockdir" ++ break ++ else ++ # If the lock is being held by a different process, wait ++ # until the winning process is done or we timeout. ++ while test -d "$lockdir" && test $i -gt 0; do ++ sleep 1 ++ i=`expr $i - 1` ++ done ++ fi ++ i=`expr $i - 1` ++ done ++ trap - 1 2 13 15 ++ if test $i -le 0; then ++ echo "$0: failed to acquire lock after $numtries attempts" >&2 ++ echo "$0: check lockdir '$lockdir'" >&2 ++ exit 1 ++ fi ++ ++ if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi +@@ -297,8 +427,8 @@ + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. +- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | +- sed -e 's/$/ :/' >> "$depfile" ++ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ ++ | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +@@ -309,9 +439,8 @@ + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. +- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` +- test "x$dir" = "x$object" && dir= +- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ set_dir_from "$object" ++ set_base_from "$object" + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d +@@ -322,8 +451,7 @@ + "$@" +Maked + fi + stat=$? +- if test $stat -eq 0; then : +- else ++ if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi +@@ -333,77 +461,107 @@ + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then +- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" +- # Add `dependent.h:' lines. ++ sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" ++ # Add 'dependent.h:' lines. + sed -ne '2,${ +- s/^ *// +- s/ \\*$// +- s/$/:/ +- p +- }' "$tmpdepfile" >> "$depfile" ++ s/^ *// ++ s/ \\*$// ++ s/$/:/ ++ p ++ }' "$tmpdepfile" >> "$depfile" + else +- echo "#dummy" > "$depfile" ++ make_dummy_depfile + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + + tru64) +- # The Tru64 compiler uses -MD to generate dependencies as a side +- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. +- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put +- # dependencies in `foo.d' instead, so we check for that too. +- # Subdirectories are respected. +- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` +- test "x$dir" = "x$object" && dir= +- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ # The Tru64 compiler uses -MD to generate dependencies as a side ++ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. ++ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put ++ # dependencies in 'foo.d' instead, so we check for that too. ++ # Subdirectories are respected. ++ set_dir_from "$object" ++ set_base_from "$object" + +- if test "$libtool" = yes; then +- # With Tru64 cc, shared objects can also be used to make a +- # static library. This mechanism is used in libtool 1.4 series to +- # handle both shared and static libraries in a single compilation. +- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. +- # +- # With libtool 1.5 this exception was removed, and libtool now +- # generates 2 separate objects for the 2 libraries. These two +- # compilations output dependencies in $dir.libs/$base.o.d and +- # in $dir$base.o.d. We have to check for both files, because +- # one of the two compilations can be disabled. We should prefer +- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is +- # automatically cleaned when .libs/ is deleted, while ignoring +- # the former would cause a distcleancheck panic. +- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 +- tmpdepfile2=$dir$base.o.d # libtool 1.5 +- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 +- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 +- "$@" -Wc,-MD +- else +- tmpdepfile1=$dir$base.o.d +- tmpdepfile2=$dir$base.d +- tmpdepfile3=$dir$base.d +- tmpdepfile4=$dir$base.d +- "$@" -MD +- fi ++ if test "$libtool" = yes; then ++ # Libtool generates 2 separate objects for the 2 libraries. These ++ # two compilations output dependencies in $dir.libs/$base.o.d and ++ # in $dir$base.o.d. We have to check for both files, because ++ # one of the two compilations can be disabled. We should prefer ++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is ++ # automatically cleaned when .libs/ is deleted, while ignoring ++ # the former would cause a distcleancheck panic. ++ tmpdepfile1=$dir$base.o.d # libtool 1.5 ++ tmpdepfile2=$dir.libs/$base.o.d # Likewise. ++ tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 ++ "$@" -Wc,-MD ++ else ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir$base.d ++ tmpdepfile3=$dir$base.d ++ "$@" -MD ++ fi + +- stat=$? +- if test $stat -eq 0; then : +- else +- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" +- exit $stat +- fi ++ stat=$? ++ if test $stat -ne 0; then ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ exit $stat ++ fi + +- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" +- do +- test -f "$tmpdepfile" && break +- done +- if test -f "$tmpdepfile"; then +- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" +- # That's a tab and a space in the []. +- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" +- else +- echo "#dummy" > "$depfile" +- fi +- rm -f "$tmpdepfile" +- ;; ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ do ++ test -f "$tmpdepfile" && break ++ done ++ # Same post-processing that is required for AIX mode. ++ aix_post_process_depfile ++ ;; ++ ++msvc7) ++ if test "$libtool" = yes; then ++ showIncludes=-Wc,-showIncludes ++ else ++ showIncludes=-showIncludes ++ fi ++ "$@" $showIncludes > "$tmpdepfile" ++ stat=$? ++ grep -v '^Note: including file: ' "$tmpdepfile" ++ if test $stat -ne 0; then ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ rm -f "$depfile" ++ echo "$object : \\" > "$depfile" ++ # The first sed program below extracts the file names and escapes ++ # backslashes for cygpath. The second sed program outputs the file ++ # name when reading, but also accumulates all include files in the ++ # hold buffer in order to output them again at the end. This only ++ # works with sed implementations that can handle large buffers. ++ sed < "$tmpdepfile" -n ' ++/^Note: including file: *\(.*\)/ { ++ s//\1/ ++ s/\\/\\\\/g ++ p ++}' | $cygpath_u | sort -u | sed -n ' ++s/ /\\ /g ++s/\(.*\)/'"$tab"'\1 \\/p ++s/.\(.*\) \\/\1:/ ++H ++$ { ++ s/.*/'"$tab"'/ ++ G ++ p ++}' >> "$depfile" ++ echo >> "$depfile" # make sure the fragment doesn't end with a backslash ++ rm -f "$tmpdepfile" ++ ;; ++ ++msvc7msys) ++ # This case exists only to let depend.m4 do its work. It works by ++ # looking at the text of this script. This case will never be run, ++ # since it is checked for above. ++ exit 1 ++ ;; + + #nosideeffect) + # This comment above is used by automake to tell side-effect +@@ -422,7 +580,7 @@ + shift + fi + +- # Remove `-o $object'. ++ # Remove '-o $object'. + IFS=" " + for arg + do +@@ -442,18 +600,18 @@ + done + + test -z "$dashmflag" && dashmflag=-M +- # Require at least two characters before searching for `:' ++ # Require at least two characters before searching for ':' + # in the target name. This is to cope with DOS-style filenames: +- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. ++ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. + "$@" $dashmflag | +- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" ++ sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" +- tr ' ' ' +-' < "$tmpdepfile" | \ +-## Some versions of the HPUX 10.20 sed can't process this invocation +-## correctly. Breaking it into two sed invocations is a workaround. +- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" ++ # Some versions of the HPUX 10.20 sed can't process this sed invocation ++ # correctly. Breaking it into two sed invocations is a workaround. ++ tr ' ' "$nl" < "$tmpdepfile" \ ++ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ ++ | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +@@ -503,12 +661,15 @@ + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" +- cat < "$tmpdepfile" > "$depfile" +- sed '1,2d' "$tmpdepfile" | tr ' ' ' +-' | \ +-## Some versions of the HPUX 10.20 sed can't process this invocation +-## correctly. Breaking it into two sed invocations is a workaround. +- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" ++ # makedepend may prepend the VPATH from the source file name to the object. ++ # No need to regex-escape $object, excess matching of '.' is harmless. ++ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" ++ # Some versions of the HPUX 10.20 sed can't process the last invocation ++ # correctly. Breaking it into two sed invocations is a workaround. ++ sed '1,2d' "$tmpdepfile" \ ++ | tr ' ' "$nl" \ ++ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ ++ | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +@@ -525,7 +686,7 @@ + shift + fi + +- # Remove `-o $object'. ++ # Remove '-o $object'. + IFS=" " + for arg + do +@@ -544,10 +705,10 @@ + esac + done + +- "$@" -E | +- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ +- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | +- sed '$ s: \\$::' > "$tmpdepfile" ++ "$@" -E \ ++ | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ ++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ ++ | sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" +@@ -579,23 +740,23 @@ + shift + ;; + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") +- set fnord "$@" +- shift +- shift +- ;; ++ set fnord "$@" ++ shift ++ shift ++ ;; + *) +- set fnord "$@" "$arg" +- shift +- shift +- ;; ++ set fnord "$@" "$arg" ++ shift ++ shift ++ ;; + esac + done + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" +- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" +- echo " " >> "$depfile" ++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" ++ echo "$tab" >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/doc/libffi.info +Binary file Modules/_ctypes/libffi/doc/libffi.info has changed +diff -r ee879c0ffa11 Modules/_ctypes/libffi/doc/libffi.texi +--- a/Modules/_ctypes/libffi/doc/libffi.texi ++++ b/Modules/_ctypes/libffi/doc/libffi.texi +@@ -184,11 +184,11 @@ + + @var{rvalue} is a pointer to a chunk of memory that will hold the + result of the function call. This must be large enough to hold the +-result and must be suitably aligned; it is the caller's responsibility ++result, no smaller than the system register size (generally 32 or 64 ++bits), and must be suitably aligned; it is the caller's responsibility + to ensure this. If @var{cif} declares that the function returns + @code{void} (using @code{ffi_type_void}), then @var{rvalue} is +-ignored. If @var{rvalue} is @samp{NULL}, then the return value is +-discarded. ++ignored. + + @var{avalues} is a vector of @code{void *} pointers that point to the + memory locations holding the argument values for a call. If @var{cif} +@@ -214,7 +214,7 @@ + ffi_type *args[1]; + void *values[1]; + char *s; +- int rc; ++ ffi_arg rc; + + /* Initialize the argument info vectors */ + args[0] = &ffi_type_pointer; +@@ -222,7 +222,7 @@ + + /* Initialize the cif */ + if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, +- &ffi_type_uint, args) == FFI_OK) ++ &ffi_type_sint, args) == FFI_OK) + @{ + s = "Hello World!"; + ffi_call(&cif, puts, &rc, values); +@@ -414,6 +414,7 @@ + int i; + + tm_type.size = tm_type.alignment = 0; ++ tm_type.type = FFI_TYPE_STRUCT; + tm_type.elements = &tm_type_elements; + + for (i = 0; i < 9; i++) +@@ -533,28 +534,30 @@ + @section Closure Example + + A trivial example that creates a new @code{puts} by binding +-@code{fputs} with @code{stdin}. ++@code{fputs} with @code{stdout}. + + @example + #include + #include + + /* Acts like puts with the file given at time of enclosure. */ +-void puts_binding(ffi_cif *cif, unsigned int *ret, void* args[], +- FILE *stream) ++void puts_binding(ffi_cif *cif, void *ret, void* args[], ++ void *stream) + @{ +- *ret = fputs(*(char **)args[0], stream); ++ *(ffi_arg *)ret = fputs(*(char **)args[0], (FILE *)stream); + @} + ++typedef int (*puts_t)(char *); ++ + int main() + @{ + ffi_cif cif; + ffi_type *args[1]; + ffi_closure *closure; + +- int (*bound_puts)(char *); ++ void *bound_puts; + int rc; +- ++ + /* Allocate closure and bound_puts */ + closure = ffi_closure_alloc(sizeof(ffi_closure), &bound_puts); + +@@ -565,13 +568,13 @@ + + /* Initialize the cif */ + if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, +- &ffi_type_uint, args) == FFI_OK) ++ &ffi_type_sint, args) == FFI_OK) + @{ + /* Initialize the closure, setting stream to stdout */ +- if (ffi_prep_closure_loc(closure, &cif, puts_binding, ++ if (ffi_prep_closure_loc(closure, &cif, puts_binding, + stdout, bound_puts) == FFI_OK) + @{ +- rc = bound_puts("Hello World!"); ++ rc = ((puts_t)bound_puts)("Hello World!"); + /* rc now holds the result of the call to fputs */ + @} + @} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/doc/stamp-vti +--- a/Modules/_ctypes/libffi/doc/stamp-vti ++++ b/Modules/_ctypes/libffi/doc/stamp-vti +@@ -1,4 +1,4 @@ +-@set UPDATED 16 March 2013 +-@set UPDATED-MONTH March 2013 +-@set EDITION 3.0.13 +-@set VERSION 3.0.13 ++@set UPDATED 25 April 2014 ++@set UPDATED-MONTH April 2014 ++@set EDITION 3.1 ++@set VERSION 3.1 +diff -r ee879c0ffa11 Modules/_ctypes/libffi/doc/version.texi +--- a/Modules/_ctypes/libffi/doc/version.texi ++++ b/Modules/_ctypes/libffi/doc/version.texi +@@ -1,4 +1,4 @@ +-@set UPDATED 16 March 2013 +-@set UPDATED-MONTH March 2013 +-@set EDITION 3.0.13 +-@set VERSION 3.0.13 ++@set UPDATED 25 April 2014 ++@set UPDATED-MONTH April 2014 ++@set EDITION 3.1 ++@set VERSION 3.1 +diff -r ee879c0ffa11 Modules/_ctypes/libffi/fficonfig.h.in +--- a/Modules/_ctypes/libffi/fficonfig.h.in ++++ b/Modules/_ctypes/libffi/fficonfig.h.in +@@ -26,10 +26,10 @@ + /* Cannot use malloc on this target, so, we revert to alternative means */ + #undef FFI_MMAP_EXEC_WRIT + +-/* Define this is you do not want support for the raw API. */ ++/* Define this if you do not want support for the raw API. */ + #undef FFI_NO_RAW_API + +-/* Define this is you do not want support for aggregate types. */ ++/* Define this if you do not want support for aggregate types. */ + #undef FFI_NO_STRUCTS + + /* Define to 1 if you have `alloca', as a function or macro. */ +@@ -73,6 +73,9 @@ + /* Define if you have the long double type and it is bigger than a double */ + #undef HAVE_LONG_DOUBLE + ++/* Define if you support more than one size of the long double type */ ++#undef HAVE_LONG_DOUBLE_VARIANT ++ + /* Define to 1 if you have the `memcpy' function. */ + #undef HAVE_MEMCPY + +@@ -118,8 +121,7 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_UNISTD_H + +-/* Define to the sub-directory in which libtool stores uninstalled libraries. +- */ ++/* Define to the sub-directory where libtool stores uninstalled libraries. */ + #undef LT_OBJDIR + + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ +@@ -152,6 +154,9 @@ + /* The size of `long double', as computed by sizeof. */ + #undef SIZEOF_LONG_DOUBLE + ++/* The size of `size_t', as computed by sizeof. */ ++#undef SIZEOF_SIZE_T ++ + /* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. +diff -r ee879c0ffa11 Modules/_ctypes/libffi/fficonfig.py.in +--- a/Modules/_ctypes/libffi/fficonfig.py.in ++++ b/Modules/_ctypes/libffi/fficonfig.py.in +@@ -6,7 +6,7 @@ + ffi_platforms = { + 'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'], + 'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'], +- 'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'], ++ 'X86': ['src/x86/ffi.c', 'src/x86/sysv.S', 'src/x86/win32.S'], + 'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/freebsd.S'], + 'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'], + 'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'], +@@ -14,9 +14,10 @@ + 'IA64': ['src/ia64/ffi.c', 'src/ia64/unix.S'], + 'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'], + 'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'], +- 'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'], +- 'POWERPC_AIX': ['src/powerpc/ffi.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'], ++ 'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/ffi_sysv.c', 'src/powerpc/ffi_linux64.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'], ++ 'POWERPC_AIX': ['src/powerpc/ffi_darwin.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'], + 'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'], ++ 'AARCH64': ['src/aarch64/sysv.S', 'src/aarch64/ffi.c'], + 'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'], + 'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'], + 'FRV': ['src/frv/eabi.S', 'src/frv/ffi.c'], +diff -r ee879c0ffa11 Modules/_ctypes/libffi/generate-darwin-source-and-headers.py +--- /dev/null ++++ b/Modules/_ctypes/libffi/generate-darwin-source-and-headers.py +@@ -0,0 +1,209 @@ ++#!/usr/bin/env python ++import subprocess ++import os ++import errno ++import collections ++import glob ++import argparse ++ ++class Platform(object): ++ pass ++ ++class simulator_platform(Platform): ++ directory = 'darwin_ios' ++ sdk = 'iphonesimulator' ++ arch = 'i386' ++ triple = 'i386-apple-darwin11' ++ version_min = '-miphoneos-version-min=5.1.1' ++ ++ prefix = "#ifdef __i386__\n\n" ++ suffix = "\n\n#endif" ++ src_dir = 'x86' ++ src_files = ['darwin.S', 'win32.S', 'ffi.c'] ++ ++ ++class simulator64_platform(Platform): ++ directory = 'darwin_ios' ++ sdk = 'iphonesimulator' ++ arch = 'x86_64' ++ triple = 'x86_64-apple-darwin13' ++ version_min = '-miphoneos-version-min=7.0' ++ ++ prefix = "#ifdef __x86_64__\n\n" ++ suffix = "\n\n#endif" ++ src_dir = 'x86' ++ src_files = ['darwin64.S', 'ffi64.c'] ++ ++ ++class device_platform(Platform): ++ directory = 'darwin_ios' ++ sdk = 'iphoneos' ++ arch = 'armv7' ++ triple = 'arm-apple-darwin11' ++ version_min = '-miphoneos-version-min=5.1.1' ++ ++ prefix = "#ifdef __arm__\n\n" ++ suffix = "\n\n#endif" ++ src_dir = 'arm' ++ src_files = ['sysv.S', 'trampoline.S', 'ffi.c'] ++ ++ ++class device64_platform(Platform): ++ directory = 'darwin_ios' ++ sdk = 'iphoneos' ++ arch = 'arm64' ++ triple = 'aarch64-apple-darwin13' ++ version_min = '-miphoneos-version-min=7.0' ++ ++ prefix = "#ifdef __arm64__\n\n" ++ suffix = "\n\n#endif" ++ src_dir = 'aarch64' ++ src_files = ['sysv.S', 'ffi.c'] ++ ++ ++class desktop32_platform(Platform): ++ directory = 'darwin_osx' ++ sdk = 'macosx' ++ arch = 'i386' ++ triple = 'i386-apple-darwin10' ++ version_min = '-mmacosx-version-min=10.6' ++ src_dir = 'x86' ++ src_files = ['darwin.S', 'win32.S', 'ffi.c'] ++ ++ prefix = "#ifdef __i386__\n\n" ++ suffix = "\n\n#endif" ++ ++ ++class desktop64_platform(Platform): ++ directory = 'darwin_osx' ++ sdk = 'macosx' ++ arch = 'x86_64' ++ triple = 'x86_64-apple-darwin10' ++ version_min = '-mmacosx-version-min=10.6' ++ ++ prefix = "#ifdef __x86_64__\n\n" ++ suffix = "\n\n#endif" ++ src_dir = 'x86' ++ src_files = ['darwin64.S', 'ffi64.c'] ++ ++ ++def mkdir_p(path): ++ try: ++ os.makedirs(path) ++ except OSError as exc: # Python >2.5 ++ if exc.errno == errno.EEXIST: ++ pass ++ else: ++ raise ++ ++ ++def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''): ++ mkdir_p(dst_dir) ++ out_filename = filename ++ ++ if file_suffix: ++ split_name = os.path.splitext(filename) ++ out_filename = "%s_%s%s" % (split_name[0], file_suffix, split_name[1]) ++ ++ with open(os.path.join(src_dir, filename)) as in_file: ++ with open(os.path.join(dst_dir, out_filename), 'w') as out_file: ++ if prefix: ++ out_file.write(prefix) ++ ++ out_file.write(in_file.read()) ++ ++ if suffix: ++ out_file.write(suffix) ++ ++ ++def list_files(src_dir, pattern=None, filelist=None): ++ if pattern: filelist = glob.iglob(os.path.join(src_dir, pattern)) ++ for file in filelist: ++ yield os.path.basename(file) ++ ++ ++def copy_files(src_dir, dst_dir, pattern=None, filelist=None, file_suffix=None, prefix=None, suffix=None): ++ for filename in list_files(src_dir, pattern=pattern, filelist=filelist): ++ move_file(src_dir, dst_dir, filename, file_suffix=file_suffix, prefix=prefix, suffix=suffix) ++ ++ ++def copy_src_platform_files(platform): ++ src_dir = os.path.join('src', platform.src_dir) ++ dst_dir = os.path.join(platform.directory, 'src', platform.src_dir) ++ copy_files(src_dir, dst_dir, filelist=platform.src_files, file_suffix=platform.arch, prefix=platform.prefix, suffix=platform.suffix) ++ ++ ++def build_target(platform, platform_headers): ++ def xcrun_cmd(cmd): ++ return 'xcrun -sdk %s %s -arch %s' % (platform.sdk, cmd, platform.arch) ++ ++ tag='%s-%s' % (platform.sdk, platform.arch) ++ build_dir = 'build_%s' % tag ++ mkdir_p(build_dir) ++ env = dict(CC=xcrun_cmd('clang'), ++ LD=xcrun_cmd('ld'), ++ CFLAGS='%s' % (platform.version_min)) ++ working_dir = os.getcwd() ++ try: ++ os.chdir(build_dir) ++ subprocess.check_call(['../configure', '-host', platform.triple], env=env) ++ finally: ++ os.chdir(working_dir) ++ ++ for src_dir in [build_dir, os.path.join(build_dir, 'include')]: ++ copy_files(src_dir, ++ os.path.join(platform.directory, 'include'), ++ pattern='*.h', ++ file_suffix=platform.arch, ++ prefix=platform.prefix, ++ suffix=platform.suffix) ++ ++ for filename in list_files(src_dir, pattern='*.h'): ++ platform_headers[filename].add((platform.prefix, platform.arch, platform.suffix)) ++ ++ ++def make_tramp(): ++ with open('src/arm/trampoline.S', 'w') as tramp_out: ++ p = subprocess.Popen(['bash', 'src/arm/gentramp.sh'], stdout=tramp_out) ++ p.wait() ++ ++ ++def generate_source_and_headers(generate_osx=True, generate_ios=True): ++ copy_files('src', 'darwin_common/src', pattern='*.c') ++ copy_files('include', 'darwin_common/include', pattern='*.h') ++ ++ if generate_ios: ++ make_tramp() ++ copy_src_platform_files(simulator_platform) ++ copy_src_platform_files(simulator64_platform) ++ copy_src_platform_files(device_platform) ++ copy_src_platform_files(device64_platform) ++ if generate_osx: ++ copy_src_platform_files(desktop32_platform) ++ copy_src_platform_files(desktop64_platform) ++ ++ platform_headers = collections.defaultdict(set) ++ ++ if generate_ios: ++ build_target(simulator_platform, platform_headers) ++ build_target(simulator64_platform, platform_headers) ++ build_target(device_platform, platform_headers) ++ build_target(device64_platform, platform_headers) ++ if generate_osx: ++ build_target(desktop32_platform, platform_headers) ++ build_target(desktop64_platform, platform_headers) ++ ++ mkdir_p('darwin_common/include') ++ for header_name, tag_tuples in platform_headers.iteritems(): ++ basename, suffix = os.path.splitext(header_name) ++ with open(os.path.join('darwin_common/include', header_name), 'w') as header: ++ for tag_tuple in tag_tuples: ++ header.write('%s#include <%s_%s%s>\n%s\n' % (tag_tuple[0], basename, tag_tuple[1], suffix, tag_tuple[2])) ++ ++if __name__ == '__main__': ++ parser = argparse.ArgumentParser() ++ parser.add_argument('--only-ios', action='store_true', default=False) ++ parser.add_argument('--only-osx', action='store_true', default=False) ++ args = parser.parse_args() ++ ++ generate_source_and_headers(generate_osx=not args.only_ios, generate_ios=not args.only_osx) +diff -r ee879c0ffa11 Modules/_ctypes/libffi/generate-ios-source-and-headers.py +--- a/Modules/_ctypes/libffi/generate-ios-source-and-headers.py ++++ /dev/null +@@ -1,160 +0,0 @@ +-#!/usr/bin/env python +- +-import subprocess +-import re +-import os +-import errno +-import collections +-import sys +- +-class Platform(object): +- pass +- +-sdk_re = re.compile(r'.*-sdk ([a-zA-Z0-9.]*)') +- +-def sdkinfo(sdkname): +- ret = {} +- for line in subprocess.Popen(['xcodebuild', '-sdk', sdkname, '-version'], stdout=subprocess.PIPE).stdout: +- kv = line.strip().split(': ', 1) +- if len(kv) == 2: +- k,v = kv +- ret[k] = v +- return ret +- +-sim_sdk_info = sdkinfo('iphonesimulator') +-device_sdk_info = sdkinfo('iphoneos') +- +-def latest_sdks(): +- latest_sim = None +- latest_device = None +- for line in subprocess.Popen(['xcodebuild', '-showsdks'], stdout=subprocess.PIPE).stdout: +- match = sdk_re.match(line) +- if match: +- if 'Simulator' in line: +- latest_sim = match.group(1) +- elif 'iOS' in line: +- latest_device = match.group(1) +- +- return latest_sim, latest_device +- +-sim_sdk, device_sdk = latest_sdks() +- +-class simulator_platform(Platform): +- sdk='iphonesimulator' +- arch = 'i386' +- name = 'simulator' +- triple = 'i386-apple-darwin10' +- sdkroot = sim_sdk_info['Path'] +- +- prefix = "#if !defined(__arm__) && defined(__i386__)\n\n" +- suffix = "\n\n#endif" +- +-class device_platform(Platform): +- sdk='iphoneos' +- name = 'ios' +- arch = 'armv7' +- triple = 'arm-apple-darwin10' +- sdkroot = device_sdk_info['Path'] +- +- prefix = "#ifdef __arm__\n\n" +- suffix = "\n\n#endif" +- +- +-def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''): +- if not os.path.exists(dst_dir): +- os.makedirs(dst_dir) +- +- out_filename = filename +- +- if file_suffix: +- split_name = os.path.splitext(filename) +- out_filename = "%s_%s%s" % (split_name[0], file_suffix, split_name[1]) +- +- with open(os.path.join(src_dir, filename)) as in_file: +- with open(os.path.join(dst_dir, out_filename), 'w') as out_file: +- if prefix: +- out_file.write(prefix) +- +- out_file.write(in_file.read()) +- +- if suffix: +- out_file.write(suffix) +- +-headers_seen = collections.defaultdict(set) +- +-def move_source_tree(src_dir, dest_dir, dest_include_dir, arch=None, prefix=None, suffix=None): +- for root, dirs, files in os.walk(src_dir, followlinks=True): +- relroot = os.path.relpath(root,src_dir) +- +- def move_dir(arch, prefix='', suffix='', files=[]): +- for file in files: +- file_suffix = None +- if file.endswith('.h'): +- if dest_include_dir: +- file_suffix = arch +- if arch: +- headers_seen[file].add(arch) +- move_file(root, dest_include_dir, file, arch, prefix=prefix, suffix=suffix) +- +- elif dest_dir: +- outroot = os.path.join(dest_dir, relroot) +- move_file(root, outroot, file, prefix=prefix, suffix=suffix) +- +- if relroot == '.': +- move_dir(arch=arch, +- files=files, +- prefix=prefix, +- suffix=suffix) +- elif relroot == 'arm': +- move_dir(arch='arm', +- prefix="#ifdef __arm__\n\n", +- suffix="\n\n#endif", +- files=files) +- elif relroot == 'x86': +- move_dir(arch='i386', +- prefix="#if !defined(__arm__) && defined(__i386__)\n\n", +- suffix="\n\n#endif", +- files=files) +- +-def build_target(platform): +- def xcrun_cmd(cmd): +- return subprocess.check_output(['xcrun', '-sdk', platform.sdkroot, '-find', cmd]).strip() +- +- build_dir = 'build_' + platform.name +- if not os.path.exists(build_dir): +- os.makedirs(build_dir) +- env = dict(CC=xcrun_cmd('clang'), +- LD=xcrun_cmd('ld'), +- CFLAGS='-arch %s -isysroot %s -miphoneos-version-min=4.0' % (platform.arch, platform.sdkroot)) +- working_dir=os.getcwd() +- try: +- os.chdir(build_dir) +- subprocess.check_call(['../configure', '-host', platform.triple], env=env) +- move_source_tree('.', None, '../ios/include', +- arch=platform.arch, +- prefix=platform.prefix, +- suffix=platform.suffix) +- move_source_tree('./include', None, '../ios/include', +- arch=platform.arch, +- prefix=platform.prefix, +- suffix=platform.suffix) +- finally: +- os.chdir(working_dir) +- +- for header_name, archs in headers_seen.iteritems(): +- basename, suffix = os.path.splitext(header_name) +- +-def main(): +- move_source_tree('src', 'ios/src', 'ios/include') +- move_source_tree('include', None, 'ios/include') +- build_target(simulator_platform) +- build_target(device_platform) +- +- for header_name, archs in headers_seen.iteritems(): +- basename, suffix = os.path.splitext(header_name) +- with open(os.path.join('ios/include', header_name), 'w') as header: +- for arch in archs: +- header.write('#include <%s_%s%s>\n' % (basename, arch, suffix)) +- +-if __name__ == '__main__': +- main() +diff -r ee879c0ffa11 Modules/_ctypes/libffi/generate-osx-source-and-headers.py +--- a/Modules/_ctypes/libffi/generate-osx-source-and-headers.py ++++ /dev/null +@@ -1,153 +0,0 @@ +-#!/usr/bin/env python +-import subprocess +-import re +-import os +-import errno +-import collections +-import sys +- +-class Platform(object): +- pass +- +-sdk_re = re.compile(r'.*-sdk ([a-zA-Z0-9.]*)') +- +-def sdkinfo(sdkname): +- ret = {} +- for line in subprocess.Popen(['xcodebuild', '-sdk', sdkname, '-version'], stdout=subprocess.PIPE).stdout: +- kv = line.strip().split(': ', 1) +- if len(kv) == 2: +- k,v = kv +- ret[k] = v +- return ret +- +-desktop_sdk_info = sdkinfo('macosx') +- +-def latest_sdks(): +- latest_desktop = None +- for line in subprocess.Popen(['xcodebuild', '-showsdks'], stdout=subprocess.PIPE).stdout: +- match = sdk_re.match(line) +- if match: +- if 'OS X' in line: +- latest_desktop = match.group(1) +- +- return latest_desktop +- +-desktop_sdk = latest_sdks() +- +-class desktop_platform_32(Platform): +- sdk='macosx' +- arch = 'i386' +- name = 'mac32' +- triple = 'i386-apple-darwin10' +- sdkroot = desktop_sdk_info['Path'] +- +- prefix = "#if defined(__i386__) && !defined(__x86_64__)\n\n" +- suffix = "\n\n#endif" +- +-class desktop_platform_64(Platform): +- sdk='macosx' +- arch = 'x86_64' +- name = 'mac' +- triple = 'x86_64-apple-darwin10' +- sdkroot = desktop_sdk_info['Path'] +- +- prefix = "#if !defined(__i386__) && defined(__x86_64__)\n\n" +- suffix = "\n\n#endif" +- +-def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''): +- if not os.path.exists(dst_dir): +- os.makedirs(dst_dir) +- +- out_filename = filename +- +- if file_suffix: +- split_name = os.path.splitext(filename) +- out_filename = "%s_%s%s" % (split_name[0], file_suffix, split_name[1]) +- +- with open(os.path.join(src_dir, filename)) as in_file: +- with open(os.path.join(dst_dir, out_filename), 'w') as out_file: +- if prefix: +- out_file.write(prefix) +- +- out_file.write(in_file.read()) +- +- if suffix: +- out_file.write(suffix) +- +-headers_seen = collections.defaultdict(set) +- +-def move_source_tree(src_dir, dest_dir, dest_include_dir, arch=None, prefix=None, suffix=None): +- for root, dirs, files in os.walk(src_dir, followlinks=True): +- relroot = os.path.relpath(root,src_dir) +- +- def move_dir(arch, prefix='', suffix='', files=[]): +- for file in files: +- file_suffix = None +- if file.endswith('.h'): +- if dest_include_dir: +- file_suffix = arch +- if arch: +- headers_seen[file].add(arch) +- move_file(root, dest_include_dir, file, arch, prefix=prefix, suffix=suffix) +- +- elif dest_dir: +- outroot = os.path.join(dest_dir, relroot) +- move_file(root, outroot, file, prefix=prefix, suffix=suffix) +- +- if relroot == '.': +- move_dir(arch=arch, +- files=files, +- prefix=prefix, +- suffix=suffix) +- elif relroot == 'x86': +- move_dir(arch='i386', +- prefix="#if defined(__i386__) && !defined(__x86_64__)\n\n", +- suffix="\n\n#endif", +- files=files) +- move_dir(arch='x86_64', +- prefix="#if !defined(__i386__) && defined(__x86_64__)\n\n", +- suffix="\n\n#endif", +- files=files) +- +-def build_target(platform): +- def xcrun_cmd(cmd): +- return subprocess.check_output(['xcrun', '-sdk', platform.sdkroot, '-find', cmd]).strip() +- +- build_dir = 'build_' + platform.name +- if not os.path.exists(build_dir): +- os.makedirs(build_dir) +- env = dict(CC=xcrun_cmd('clang'), +- LD=xcrun_cmd('ld'), +- CFLAGS='-arch %s -isysroot %s -mmacosx-version-min=10.6' % (platform.arch, platform.sdkroot)) +- working_dir=os.getcwd() +- try: +- os.chdir(build_dir) +- subprocess.check_call(['../configure', '-host', platform.triple], env=env) +- move_source_tree('.', None, '../osx/include', +- arch=platform.arch, +- prefix=platform.prefix, +- suffix=platform.suffix) +- move_source_tree('./include', None, '../osx/include', +- arch=platform.arch, +- prefix=platform.prefix, +- suffix=platform.suffix) +- finally: +- os.chdir(working_dir) +- +- for header_name, archs in headers_seen.iteritems(): +- basename, suffix = os.path.splitext(header_name) +- +-def main(): +- move_source_tree('src', 'osx/src', 'osx/include') +- move_source_tree('include', None, 'osx/include') +- build_target(desktop_platform_32) +- build_target(desktop_platform_64) +- +- for header_name, archs in headers_seen.iteritems(): +- basename, suffix = os.path.splitext(header_name) +- with open(os.path.join('osx/include', header_name), 'w') as header: +- for arch in archs: +- header.write('#include <%s_%s%s>\n' % (basename, arch, suffix)) +- +-if __name__ == '__main__': +- main() +diff -r ee879c0ffa11 Modules/_ctypes/libffi/include/Makefile.in +--- a/Modules/_ctypes/libffi/include/Makefile.in ++++ b/Modules/_ctypes/libffi/include/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.12.2 from Makefile.am. ++# Makefile.in generated by automake 1.13.4 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2012 Free Software Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -15,23 +15,51 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -52,7 +80,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = include +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/ffi.h.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \ +@@ -75,6 +103,18 @@ + CONFIG_HEADER = $(top_builddir)/fficonfig.h + CONFIG_CLEAN_FILES = ffi.h ffitarget.h + CONFIG_CLEAN_VPATH_FILES = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + SOURCES = + DIST_SOURCES = + am__can_run_installinfo = \ +@@ -111,12 +151,30 @@ + } + am__installdirs = "$(DESTDIR)$(includesdir)" + HEADERS = $(nodist_includes_HEADERS) ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AM_LTLDFLAGS = @AM_LTLDFLAGS@ + AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ + AR = @AR@ +@@ -132,6 +190,10 @@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +@@ -147,6 +209,7 @@ + FGREP = @FGREP@ + GREP = @GREP@ + HAVE_LONG_DOUBLE = @HAVE_LONG_DOUBLE@ ++HAVE_LONG_DOUBLE_VARIANT = @HAVE_LONG_DOUBLE_VARIANT@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -193,6 +256,7 @@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_AR = @ac_ct_AR@ + ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ +@@ -315,26 +379,15 @@ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir) + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-am ++TAGS: tags + +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +@@ -346,15 +399,11 @@ + $$unique; \ + fi; \ + fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ctags: ctags-am ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique +@@ -363,9 +412,10 @@ + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" ++cscopelist: cscopelist-am + +-cscopelist: $(HEADERS) $(SOURCES) $(LISP) +- list='$(SOURCES) $(HEADERS) $(LISP)'; \ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ +@@ -517,18 +567,19 @@ + + .MAKE: install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool cscopelist ctags distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-nodist_includesHEADERS \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-nodist_includesHEADERS ++.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ ++ clean-libtool cscopelist-am ctags ctags-am distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man \ ++ install-nodist_includesHEADERS install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ ++ uninstall-am uninstall-nodist_includesHEADERS + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -r ee879c0ffa11 Modules/_ctypes/libffi/include/ffi.h.in +--- a/Modules/_ctypes/libffi/include/ffi.h.in ++++ b/Modules/_ctypes/libffi/include/ffi.h.in +@@ -221,6 +221,11 @@ + #endif + } ffi_cif; + ++#if HAVE_LONG_DOUBLE_VARIANT ++/* Used to adjust size/alignment of ffi types. */ ++void ffi_prep_types (ffi_abi abi); ++# endif ++ + /* Used internally, but overridden by some architectures */ + ffi_status ffi_prep_cif_core(ffi_cif *cif, + ffi_abi abi, +diff -r ee879c0ffa11 Modules/_ctypes/libffi/include/ffi_common.h +--- a/Modules/_ctypes/libffi/include/ffi_common.h ++++ b/Modules/_ctypes/libffi/include/ffi_common.h +@@ -1,5 +1,5 @@ + /* ----------------------------------------------------------------------- +- ffi_common.h - Copyright (C) 2011, 2012 Anthony Green ++ ffi_common.h - Copyright (C) 2011, 2012, 2013 Anthony Green + Copyright (C) 2007 Free Software Foundation, Inc + Copyright (c) 1996 Red Hat, Inc. + +@@ -19,10 +19,14 @@ + /* Do not move this. Some versions of AIX are very picky about where + this is positioned. */ + #ifdef __GNUC__ +-/* mingw64 defines this already in malloc.h. */ +-#ifndef alloca +-# define alloca __builtin_alloca +-#endif ++# if HAVE_ALLOCA_H ++# include ++# else ++ /* mingw64 defines this already in malloc.h. */ ++# ifndef alloca ++# define alloca __builtin_alloca ++# endif ++# endif + # define MAYBE_UNUSED __attribute__((__unused__)) + #else + # define MAYBE_UNUSED +@@ -30,17 +34,17 @@ + # include + # else + # ifdef _AIX +- #pragma alloca ++# pragma alloca + # else + # ifndef alloca /* predefined by HP cc +Olibcalls */ + # ifdef _MSC_VER + # define alloca _alloca + # else + char *alloca (); +-# endif + # endif + # endif + # endif ++# endif + #endif + + /* Check for the existence of memcpy. */ +diff -r ee879c0ffa11 Modules/_ctypes/libffi/install-sh +--- a/Modules/_ctypes/libffi/install-sh ++++ b/Modules/_ctypes/libffi/install-sh +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2009-04-28.21; # UTC ++scriptversion=2011-11-20.07; # UTC + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -35,7 +35,7 @@ + # FSF changes to this file are in the public domain. + # + # Calling this script install-sh is preferred over install.sh, to prevent +-# `make' implicit rules from creating a file called install from it ++# 'make' implicit rules from creating a file called install from it + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +@@ -156,6 +156,10 @@ + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 ++ # Protect names problematic for 'test' and other utilities. ++ case $dst_arg in ++ -* | [=\(\)!]) dst_arg=./$dst_arg;; ++ esac + shift;; + + -T) no_target_directory=true;; +@@ -186,6 +190,10 @@ + fi + shift # arg + dst_arg=$arg ++ # Protect names problematic for 'test' and other utilities. ++ case $dst_arg in ++ -* | [=\(\)!]) dst_arg=./$dst_arg;; ++ esac + done + fi + +@@ -194,13 +202,17 @@ + echo "$0: no input file specified." >&2 + exit 1 + fi +- # It's OK to call `install-sh -d' without argument. ++ # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 + fi + + if test -z "$dir_arg"; then +- trap '(exit $?); exit' 1 2 13 15 ++ do_exit='(exit $ret); exit $ret' ++ trap "ret=129; $do_exit" 1 ++ trap "ret=130; $do_exit" 2 ++ trap "ret=141; $do_exit" 13 ++ trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. +@@ -228,9 +240,9 @@ + + for src + do +- # Protect names starting with `-'. ++ # Protect names problematic for 'test' and other utilities. + case $src in +- -*) src=./$src;; ++ -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then +@@ -252,12 +264,7 @@ + echo "$0: no destination specified." >&2 + exit 1 + fi +- + dst=$dst_arg +- # Protect names starting with `-'. +- case $dst in +- -*) dst=./$dst;; +- esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. +@@ -347,7 +354,7 @@ + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or +- # other-writeable bit of parent directory when it shouldn't. ++ # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in +@@ -385,7 +392,7 @@ + + case $dstdir in + /*) prefix='/';; +- -*) prefix='./';; ++ [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + +@@ -403,7 +410,7 @@ + + for d + do +- test -z "$d" && continue ++ test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then +diff -r ee879c0ffa11 Modules/_ctypes/libffi/libffi.pc.in +--- a/Modules/_ctypes/libffi/libffi.pc.in ++++ b/Modules/_ctypes/libffi/libffi.pc.in +@@ -1,10 +1,11 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ ++toolexeclibdir=@toolexeclibdir@ + includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include + + Name: @PACKAGE_NAME@ + Description: Library supporting Foreign Function Interfaces + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lffi ++Libs: -L${toolexeclibdir} -lffi + Cflags: -I${includedir} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/libffi.xcodeproj/project.pbxproj +--- a/Modules/_ctypes/libffi/libffi.xcodeproj/project.pbxproj ++++ b/Modules/_ctypes/libffi/libffi.xcodeproj/project.pbxproj +@@ -7,473 +7,448 @@ + objects = { + + /* Begin PBXBuildFile section */ +- 6C43CBDC1534F76F00162364 /* ffi.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CBBD1534F76F00162364 /* ffi.c */; }; +- 6C43CBDD1534F76F00162364 /* sysv.S in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CBBF1534F76F00162364 /* sysv.S */; }; +- 6C43CBDE1534F76F00162364 /* trampoline.S in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CBC01534F76F00162364 /* trampoline.S */; }; +- 6C43CBE61534F76F00162364 /* darwin.S in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CBC91534F76F00162364 /* darwin.S */; }; +- 6C43CBE81534F76F00162364 /* ffi.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CBCB1534F76F00162364 /* ffi.c */; }; +- 6C43CC1F1534F77800162364 /* darwin.S in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC051534F77800162364 /* darwin.S */; }; +- 6C43CC201534F77800162364 /* darwin64.S in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC061534F77800162364 /* darwin64.S */; }; +- 6C43CC211534F77800162364 /* ffi.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC071534F77800162364 /* ffi.c */; }; +- 6C43CC221534F77800162364 /* ffi64.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC081534F77800162364 /* ffi64.c */; }; +- 6C43CC2F1534F7BE00162364 /* closures.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC281534F7BE00162364 /* closures.c */; }; +- 6C43CC301534F7BE00162364 /* closures.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC281534F7BE00162364 /* closures.c */; }; +- 6C43CC351534F7BE00162364 /* java_raw_api.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC2B1534F7BE00162364 /* java_raw_api.c */; }; +- 6C43CC361534F7BE00162364 /* java_raw_api.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC2B1534F7BE00162364 /* java_raw_api.c */; }; +- 6C43CC371534F7BE00162364 /* prep_cif.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC2C1534F7BE00162364 /* prep_cif.c */; }; +- 6C43CC381534F7BE00162364 /* prep_cif.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC2C1534F7BE00162364 /* prep_cif.c */; }; +- 6C43CC391534F7BE00162364 /* raw_api.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC2D1534F7BE00162364 /* raw_api.c */; }; +- 6C43CC3A1534F7BE00162364 /* raw_api.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC2D1534F7BE00162364 /* raw_api.c */; }; +- 6C43CC3B1534F7BE00162364 /* types.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC2E1534F7BE00162364 /* types.c */; }; +- 6C43CC3C1534F7BE00162364 /* types.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C43CC2E1534F7BE00162364 /* types.c */; }; +- 6C43CC971535032600162364 /* ffi.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CC8D1535032600162364 /* ffi.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CC981535032600162364 /* ffi_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CC8E1535032600162364 /* ffi_common.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CC991535032600162364 /* ffi_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CC8F1535032600162364 /* ffi_i386.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CC9A1535032600162364 /* ffi_x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CC901535032600162364 /* ffi_x86_64.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CC9B1535032600162364 /* fficonfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CC911535032600162364 /* fficonfig.h */; }; +- 6C43CC9C1535032600162364 /* fficonfig_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CC921535032600162364 /* fficonfig_i386.h */; }; +- 6C43CC9D1535032600162364 /* fficonfig_x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CC931535032600162364 /* fficonfig_x86_64.h */; }; +- 6C43CC9E1535032600162364 /* ffitarget.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CC941535032600162364 /* ffitarget.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CC9F1535032600162364 /* ffitarget_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CC951535032600162364 /* ffitarget_i386.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CCA01535032600162364 /* ffitarget_x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CC961535032600162364 /* ffitarget_x86_64.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CCAD1535039600162364 /* ffi.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCA21535039600162364 /* ffi.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CCAE1535039600162364 /* ffi_armv7.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCA31535039600162364 /* ffi_armv7.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CCAF1535039600162364 /* ffi_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCA41535039600162364 /* ffi_common.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CCB01535039600162364 /* ffi_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCA51535039600162364 /* ffi_i386.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CCB11535039600162364 /* fficonfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCA61535039600162364 /* fficonfig.h */; }; +- 6C43CCB21535039600162364 /* fficonfig_armv7.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCA71535039600162364 /* fficonfig_armv7.h */; }; +- 6C43CCB31535039600162364 /* fficonfig_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCA81535039600162364 /* fficonfig_i386.h */; }; +- 6C43CCB41535039600162364 /* ffitarget.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCA91535039600162364 /* ffitarget.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CCB51535039600162364 /* ffitarget_arm.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCAA1535039600162364 /* ffitarget_arm.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CCB61535039600162364 /* ffitarget_armv7.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCAB1535039600162364 /* ffitarget_armv7.h */; settings = {ATTRIBUTES = (Public, ); }; }; +- 6C43CCB71535039600162364 /* ffitarget_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C43CCAC1535039600162364 /* ffitarget_i386.h */; settings = {ATTRIBUTES = (Public, ); }; }; ++ DBFA714A187F1D8600A76262 /* ffi.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA713E187F1D8600A76262 /* ffi.h */; }; ++ DBFA714B187F1D8600A76262 /* ffi_common.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA713F187F1D8600A76262 /* ffi_common.h */; }; ++ DBFA714C187F1D8600A76262 /* fficonfig.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7140187F1D8600A76262 /* fficonfig.h */; }; ++ DBFA714D187F1D8600A76262 /* ffitarget.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7141187F1D8600A76262 /* ffitarget.h */; }; ++ DBFA714E187F1D8600A76262 /* closures.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7143187F1D8600A76262 /* closures.c */; }; ++ DBFA714F187F1D8600A76262 /* closures.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7143187F1D8600A76262 /* closures.c */; }; ++ DBFA7156187F1D8600A76262 /* prep_cif.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7147187F1D8600A76262 /* prep_cif.c */; }; ++ DBFA7157187F1D8600A76262 /* prep_cif.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7147187F1D8600A76262 /* prep_cif.c */; }; ++ DBFA7158187F1D8600A76262 /* raw_api.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7148187F1D8600A76262 /* raw_api.c */; }; ++ DBFA7159187F1D8600A76262 /* raw_api.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7148187F1D8600A76262 /* raw_api.c */; }; ++ DBFA715A187F1D8600A76262 /* types.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7149187F1D8600A76262 /* types.c */; }; ++ DBFA715B187F1D8600A76262 /* types.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7149187F1D8600A76262 /* types.c */; }; ++ DBFA7177187F1D9B00A76262 /* ffi_arm64.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA716C187F1D9B00A76262 /* ffi_arm64.c */; }; ++ DBFA7178187F1D9B00A76262 /* sysv_arm64.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA716D187F1D9B00A76262 /* sysv_arm64.S */; }; ++ DBFA7179187F1D9B00A76262 /* ffi_armv7.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA716F187F1D9B00A76262 /* ffi_armv7.c */; }; ++ DBFA717A187F1D9B00A76262 /* sysv_armv7.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7170187F1D9B00A76262 /* sysv_armv7.S */; }; ++ DBFA717B187F1D9B00A76262 /* trampoline_armv7.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7171187F1D9B00A76262 /* trampoline_armv7.S */; }; ++ DBFA717C187F1D9B00A76262 /* darwin64_x86_64.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7173187F1D9B00A76262 /* darwin64_x86_64.S */; }; ++ DBFA717D187F1D9B00A76262 /* darwin_i386.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7174187F1D9B00A76262 /* darwin_i386.S */; }; ++ DBFA717E187F1D9B00A76262 /* ffi64_x86_64.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7175187F1D9B00A76262 /* ffi64_x86_64.c */; }; ++ DBFA717F187F1D9B00A76262 /* ffi_i386.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7176187F1D9B00A76262 /* ffi_i386.c */; }; ++ DBFA718E187F1DA100A76262 /* ffi_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7182187F1DA100A76262 /* ffi_i386.h */; }; ++ DBFA718F187F1DA100A76262 /* ffi_x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7183187F1DA100A76262 /* ffi_x86_64.h */; }; ++ DBFA7190187F1DA100A76262 /* fficonfig_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7184187F1DA100A76262 /* fficonfig_i386.h */; }; ++ DBFA7191187F1DA100A76262 /* fficonfig_x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7185187F1DA100A76262 /* fficonfig_x86_64.h */; }; ++ DBFA7192187F1DA100A76262 /* ffitarget_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7186187F1DA100A76262 /* ffitarget_i386.h */; }; ++ DBFA7193187F1DA100A76262 /* ffitarget_x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7187187F1DA100A76262 /* ffitarget_x86_64.h */; }; ++ DBFA7194187F1DA100A76262 /* darwin64_x86_64.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA718A187F1DA100A76262 /* darwin64_x86_64.S */; }; ++ DBFA7195187F1DA100A76262 /* darwin_i386.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA718B187F1DA100A76262 /* darwin_i386.S */; }; ++ DBFA7196187F1DA100A76262 /* ffi64_x86_64.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA718C187F1DA100A76262 /* ffi64_x86_64.c */; }; ++ DBFA7197187F1DA100A76262 /* ffi_i386.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA718D187F1DA100A76262 /* ffi_i386.c */; }; + /* End PBXBuildFile section */ + ++/* Begin PBXCopyFilesBuildPhase section */ ++ DB13B1641849DF1E0010F42D /* CopyFiles */ = { ++ isa = PBXCopyFilesBuildPhase; ++ buildActionMask = 8; ++ dstPath = "include/$(PRODUCT_NAME)"; ++ dstSubfolderSpec = 16; ++ files = ( ++ ); ++ runOnlyForDeploymentPostprocessing = 1; ++ }; ++/* End PBXCopyFilesBuildPhase section */ ++ + /* Begin PBXFileReference section */ +- 6C43CB3D1534E9D100162364 /* libffi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libffi.a; sourceTree = BUILT_PRODUCTS_DIR; }; +- 6C43CBBD1534F76F00162364 /* ffi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi.c; sourceTree = ""; }; +- 6C43CBBF1534F76F00162364 /* sysv.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = sysv.S; sourceTree = ""; }; +- 6C43CBC01534F76F00162364 /* trampoline.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = trampoline.S; sourceTree = ""; }; +- 6C43CBC91534F76F00162364 /* darwin.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin.S; sourceTree = ""; }; +- 6C43CBCB1534F76F00162364 /* ffi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi.c; sourceTree = ""; }; +- 6C43CC051534F77800162364 /* darwin.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin.S; sourceTree = ""; }; +- 6C43CC061534F77800162364 /* darwin64.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin64.S; sourceTree = ""; }; +- 6C43CC071534F77800162364 /* ffi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi.c; sourceTree = ""; }; +- 6C43CC081534F77800162364 /* ffi64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi64.c; sourceTree = ""; }; +- 6C43CC281534F7BE00162364 /* closures.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = closures.c; path = src/closures.c; sourceTree = SOURCE_ROOT; }; +- 6C43CC2B1534F7BE00162364 /* java_raw_api.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = java_raw_api.c; path = src/java_raw_api.c; sourceTree = SOURCE_ROOT; }; +- 6C43CC2C1534F7BE00162364 /* prep_cif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = prep_cif.c; path = src/prep_cif.c; sourceTree = SOURCE_ROOT; }; +- 6C43CC2D1534F7BE00162364 /* raw_api.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raw_api.c; path = src/raw_api.c; sourceTree = SOURCE_ROOT; }; +- 6C43CC2E1534F7BE00162364 /* types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = types.c; path = src/types.c; sourceTree = SOURCE_ROOT; }; +- 6C43CC8D1535032600162364 /* ffi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi.h; sourceTree = ""; }; +- 6C43CC8E1535032600162364 /* ffi_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_common.h; sourceTree = ""; }; +- 6C43CC8F1535032600162364 /* ffi_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_i386.h; sourceTree = ""; }; +- 6C43CC901535032600162364 /* ffi_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_x86_64.h; sourceTree = ""; }; +- 6C43CC911535032600162364 /* fficonfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig.h; sourceTree = ""; }; +- 6C43CC921535032600162364 /* fficonfig_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_i386.h; sourceTree = ""; }; +- 6C43CC931535032600162364 /* fficonfig_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_x86_64.h; sourceTree = ""; }; +- 6C43CC941535032600162364 /* ffitarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget.h; sourceTree = ""; }; +- 6C43CC951535032600162364 /* ffitarget_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_i386.h; sourceTree = ""; }; +- 6C43CC961535032600162364 /* ffitarget_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_x86_64.h; sourceTree = ""; }; +- 6C43CCA21535039600162364 /* ffi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi.h; sourceTree = ""; }; +- 6C43CCA31535039600162364 /* ffi_armv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_armv7.h; sourceTree = ""; }; +- 6C43CCA41535039600162364 /* ffi_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_common.h; sourceTree = ""; }; +- 6C43CCA51535039600162364 /* ffi_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_i386.h; sourceTree = ""; }; +- 6C43CCA61535039600162364 /* fficonfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig.h; sourceTree = ""; }; +- 6C43CCA71535039600162364 /* fficonfig_armv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_armv7.h; sourceTree = ""; }; +- 6C43CCA81535039600162364 /* fficonfig_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_i386.h; sourceTree = ""; }; +- 6C43CCA91535039600162364 /* ffitarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget.h; sourceTree = ""; }; +- 6C43CCAA1535039600162364 /* ffitarget_arm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_arm.h; sourceTree = ""; }; +- 6C43CCAB1535039600162364 /* ffitarget_armv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_armv7.h; sourceTree = ""; }; +- 6C43CCAC1535039600162364 /* ffitarget_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_i386.h; sourceTree = ""; }; +- F6F980BA147386130008F121 /* libffi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libffi.a; sourceTree = BUILT_PRODUCTS_DIR; }; ++ DB13B1661849DF1E0010F42D /* libffi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libffi.a; sourceTree = BUILT_PRODUCTS_DIR; }; ++ DB13B1911849DF510010F42D /* ffi.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = ffi.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; ++ DBFA713E187F1D8600A76262 /* ffi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi.h; sourceTree = ""; }; ++ DBFA713F187F1D8600A76262 /* ffi_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_common.h; sourceTree = ""; }; ++ DBFA7140187F1D8600A76262 /* fficonfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig.h; sourceTree = ""; }; ++ DBFA7141187F1D8600A76262 /* ffitarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget.h; sourceTree = ""; }; ++ DBFA7143187F1D8600A76262 /* closures.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = closures.c; sourceTree = ""; }; ++ DBFA7145187F1D8600A76262 /* dlmalloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dlmalloc.c; sourceTree = ""; }; ++ DBFA7147187F1D8600A76262 /* prep_cif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = prep_cif.c; sourceTree = ""; }; ++ DBFA7148187F1D8600A76262 /* raw_api.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = raw_api.c; sourceTree = ""; }; ++ DBFA7149187F1D8600A76262 /* types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = types.c; sourceTree = ""; }; ++ DBFA715E187F1D9B00A76262 /* ffi_arm64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_arm64.h; sourceTree = ""; }; ++ DBFA715F187F1D9B00A76262 /* ffi_armv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_armv7.h; sourceTree = ""; }; ++ DBFA7160187F1D9B00A76262 /* ffi_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_i386.h; sourceTree = ""; }; ++ DBFA7161187F1D9B00A76262 /* ffi_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_x86_64.h; sourceTree = ""; }; ++ DBFA7162187F1D9B00A76262 /* fficonfig_arm64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_arm64.h; sourceTree = ""; }; ++ DBFA7163187F1D9B00A76262 /* fficonfig_armv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_armv7.h; sourceTree = ""; }; ++ DBFA7164187F1D9B00A76262 /* fficonfig_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_i386.h; sourceTree = ""; }; ++ DBFA7165187F1D9B00A76262 /* fficonfig_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_x86_64.h; sourceTree = ""; }; ++ DBFA7166187F1D9B00A76262 /* ffitarget_arm64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_arm64.h; sourceTree = ""; }; ++ DBFA7167187F1D9B00A76262 /* ffitarget_armv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_armv7.h; sourceTree = ""; }; ++ DBFA7168187F1D9B00A76262 /* ffitarget_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_i386.h; sourceTree = ""; }; ++ DBFA7169187F1D9B00A76262 /* ffitarget_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_x86_64.h; sourceTree = ""; }; ++ DBFA716C187F1D9B00A76262 /* ffi_arm64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi_arm64.c; sourceTree = ""; }; ++ DBFA716D187F1D9B00A76262 /* sysv_arm64.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = sysv_arm64.S; sourceTree = ""; }; ++ DBFA716F187F1D9B00A76262 /* ffi_armv7.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi_armv7.c; sourceTree = ""; }; ++ DBFA7170187F1D9B00A76262 /* sysv_armv7.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = sysv_armv7.S; sourceTree = ""; }; ++ DBFA7171187F1D9B00A76262 /* trampoline_armv7.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = trampoline_armv7.S; sourceTree = ""; }; ++ DBFA7173187F1D9B00A76262 /* darwin64_x86_64.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin64_x86_64.S; sourceTree = ""; }; ++ DBFA7174187F1D9B00A76262 /* darwin_i386.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin_i386.S; sourceTree = ""; }; ++ DBFA7175187F1D9B00A76262 /* ffi64_x86_64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi64_x86_64.c; sourceTree = ""; }; ++ DBFA7176187F1D9B00A76262 /* ffi_i386.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi_i386.c; sourceTree = ""; }; ++ DBFA7182187F1DA100A76262 /* ffi_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_i386.h; sourceTree = ""; }; ++ DBFA7183187F1DA100A76262 /* ffi_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_x86_64.h; sourceTree = ""; }; ++ DBFA7184187F1DA100A76262 /* fficonfig_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_i386.h; sourceTree = ""; }; ++ DBFA7185187F1DA100A76262 /* fficonfig_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_x86_64.h; sourceTree = ""; }; ++ DBFA7186187F1DA100A76262 /* ffitarget_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_i386.h; sourceTree = ""; }; ++ DBFA7187187F1DA100A76262 /* ffitarget_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_x86_64.h; sourceTree = ""; }; ++ DBFA718A187F1DA100A76262 /* darwin64_x86_64.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin64_x86_64.S; sourceTree = ""; }; ++ DBFA718B187F1DA100A76262 /* darwin_i386.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin_i386.S; sourceTree = ""; }; ++ DBFA718C187F1DA100A76262 /* ffi64_x86_64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi64_x86_64.c; sourceTree = ""; }; ++ DBFA718D187F1DA100A76262 /* ffi_i386.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi_i386.c; sourceTree = ""; }; + /* End PBXFileReference section */ + +-/* Begin PBXFrameworksBuildPhase section */ +- 6C43CB3A1534E9D100162364 /* Frameworks */ = { +- isa = PBXFrameworksBuildPhase; +- buildActionMask = 2147483647; +- files = ( +- ); +- runOnlyForDeploymentPostprocessing = 0; +- }; +- F6F980B7147386130008F121 /* Frameworks */ = { +- isa = PBXFrameworksBuildPhase; +- buildActionMask = 2147483647; +- files = ( +- ); +- runOnlyForDeploymentPostprocessing = 0; +- }; +-/* End PBXFrameworksBuildPhase section */ +- + /* Begin PBXGroup section */ +- 6C43CBAF1534F76F00162364 /* iOS */ = { ++ DB13B15B1849DEB70010F42D = { + isa = PBXGroup; + children = ( +- 6C43CCA11535039600162364 /* include */, +- 6C43CBBB1534F76F00162364 /* src */, ++ DBFA713C187F1D8600A76262 /* darwin_common */, ++ DBFA715C187F1D9B00A76262 /* darwin_ios */, ++ DBFA7180187F1DA100A76262 /* darwin_osx */, ++ DB13B1671849DF1E0010F42D /* Products */, + ); +- name = iOS; +- path = ios; + sourceTree = ""; + }; +- 6C43CBBB1534F76F00162364 /* src */ = { ++ DB13B1671849DF1E0010F42D /* Products */ = { + isa = PBXGroup; + children = ( +- 6C43CBC81534F76F00162364 /* x86 */, +- 6C43CBBC1534F76F00162364 /* arm */, ++ DB13B1661849DF1E0010F42D /* libffi.a */, ++ DB13B1911849DF510010F42D /* ffi.dylib */, ++ ); ++ name = Products; ++ sourceTree = ""; ++ }; ++ DBFA713C187F1D8600A76262 /* darwin_common */ = { ++ isa = PBXGroup; ++ children = ( ++ DBFA713D187F1D8600A76262 /* include */, ++ DBFA7142187F1D8600A76262 /* src */, ++ ); ++ path = "darwin_common"; ++ sourceTree = ""; ++ }; ++ DBFA713D187F1D8600A76262 /* include */ = { ++ isa = PBXGroup; ++ children = ( ++ DBFA713E187F1D8600A76262 /* ffi.h */, ++ DBFA713F187F1D8600A76262 /* ffi_common.h */, ++ DBFA7140187F1D8600A76262 /* fficonfig.h */, ++ DBFA7141187F1D8600A76262 /* ffitarget.h */, ++ ); ++ path = include; ++ sourceTree = ""; ++ }; ++ DBFA7142187F1D8600A76262 /* src */ = { ++ isa = PBXGroup; ++ children = ( ++ DBFA7143187F1D8600A76262 /* closures.c */, ++ DBFA7145187F1D8600A76262 /* dlmalloc.c */, ++ DBFA7147187F1D8600A76262 /* prep_cif.c */, ++ DBFA7148187F1D8600A76262 /* raw_api.c */, ++ DBFA7149187F1D8600A76262 /* types.c */, + ); + path = src; + sourceTree = ""; + }; +- 6C43CBBC1534F76F00162364 /* arm */ = { ++ DBFA715C187F1D9B00A76262 /* darwin_ios */ = { + isa = PBXGroup; + children = ( +- 6C43CBBD1534F76F00162364 /* ffi.c */, +- 6C43CBBF1534F76F00162364 /* sysv.S */, +- 6C43CBC01534F76F00162364 /* trampoline.S */, ++ DBFA715D187F1D9B00A76262 /* include */, ++ DBFA716A187F1D9B00A76262 /* src */, ++ ); ++ path = "darwin_ios"; ++ sourceTree = ""; ++ }; ++ DBFA715D187F1D9B00A76262 /* include */ = { ++ isa = PBXGroup; ++ children = ( ++ DBFA715E187F1D9B00A76262 /* ffi_arm64.h */, ++ DBFA715F187F1D9B00A76262 /* ffi_armv7.h */, ++ DBFA7160187F1D9B00A76262 /* ffi_i386.h */, ++ DBFA7161187F1D9B00A76262 /* ffi_x86_64.h */, ++ DBFA7162187F1D9B00A76262 /* fficonfig_arm64.h */, ++ DBFA7163187F1D9B00A76262 /* fficonfig_armv7.h */, ++ DBFA7164187F1D9B00A76262 /* fficonfig_i386.h */, ++ DBFA7165187F1D9B00A76262 /* fficonfig_x86_64.h */, ++ DBFA7166187F1D9B00A76262 /* ffitarget_arm64.h */, ++ DBFA7167187F1D9B00A76262 /* ffitarget_armv7.h */, ++ DBFA7168187F1D9B00A76262 /* ffitarget_i386.h */, ++ DBFA7169187F1D9B00A76262 /* ffitarget_x86_64.h */, ++ ); ++ path = include; ++ sourceTree = ""; ++ }; ++ DBFA716A187F1D9B00A76262 /* src */ = { ++ isa = PBXGroup; ++ children = ( ++ DBFA716B187F1D9B00A76262 /* aarch64 */, ++ DBFA716E187F1D9B00A76262 /* arm */, ++ DBFA7172187F1D9B00A76262 /* x86 */, ++ ); ++ path = src; ++ sourceTree = ""; ++ }; ++ DBFA716B187F1D9B00A76262 /* aarch64 */ = { ++ isa = PBXGroup; ++ children = ( ++ DBFA716C187F1D9B00A76262 /* ffi_arm64.c */, ++ DBFA716D187F1D9B00A76262 /* sysv_arm64.S */, ++ ); ++ path = aarch64; ++ sourceTree = ""; ++ }; ++ DBFA716E187F1D9B00A76262 /* arm */ = { ++ isa = PBXGroup; ++ children = ( ++ DBFA716F187F1D9B00A76262 /* ffi_armv7.c */, ++ DBFA7170187F1D9B00A76262 /* sysv_armv7.S */, ++ DBFA7171187F1D9B00A76262 /* trampoline_armv7.S */, + ); + path = arm; + sourceTree = ""; + }; +- 6C43CBC81534F76F00162364 /* x86 */ = { ++ DBFA7172187F1D9B00A76262 /* x86 */ = { + isa = PBXGroup; + children = ( +- 6C43CBC91534F76F00162364 /* darwin.S */, +- 6C43CBCB1534F76F00162364 /* ffi.c */, ++ DBFA7173187F1D9B00A76262 /* darwin64_x86_64.S */, ++ DBFA7174187F1D9B00A76262 /* darwin_i386.S */, ++ DBFA7175187F1D9B00A76262 /* ffi64_x86_64.c */, ++ DBFA7176187F1D9B00A76262 /* ffi_i386.c */, + ); + path = x86; + sourceTree = ""; + }; +- 6C43CBF01534F77800162364 /* OS X */ = { ++ DBFA7180187F1DA100A76262 /* darwin_osx */ = { + isa = PBXGroup; + children = ( +- 6C43CC8C1535032600162364 /* include */, +- 6C43CBFC1534F77800162364 /* src */, ++ DBFA7181187F1DA100A76262 /* include */, ++ DBFA7188187F1DA100A76262 /* src */, + ); +- name = "OS X"; +- path = osx; ++ path = "darwin_osx"; + sourceTree = ""; + }; +- 6C43CBFC1534F77800162364 /* src */ = { ++ DBFA7181187F1DA100A76262 /* include */ = { + isa = PBXGroup; + children = ( +- 6C43CC041534F77800162364 /* x86 */, ++ DBFA7182187F1DA100A76262 /* ffi_i386.h */, ++ DBFA7183187F1DA100A76262 /* ffi_x86_64.h */, ++ DBFA7184187F1DA100A76262 /* fficonfig_i386.h */, ++ DBFA7185187F1DA100A76262 /* fficonfig_x86_64.h */, ++ DBFA7186187F1DA100A76262 /* ffitarget_i386.h */, ++ DBFA7187187F1DA100A76262 /* ffitarget_x86_64.h */, ++ ); ++ path = include; ++ sourceTree = ""; ++ }; ++ DBFA7188187F1DA100A76262 /* src */ = { ++ isa = PBXGroup; ++ children = ( ++ DBFA7189187F1DA100A76262 /* x86 */, + ); + path = src; + sourceTree = ""; + }; +- 6C43CC041534F77800162364 /* x86 */ = { ++ DBFA7189187F1DA100A76262 /* x86 */ = { + isa = PBXGroup; + children = ( +- 6C43CC051534F77800162364 /* darwin.S */, +- 6C43CC061534F77800162364 /* darwin64.S */, +- 6C43CC071534F77800162364 /* ffi.c */, +- 6C43CC081534F77800162364 /* ffi64.c */, ++ DBFA718A187F1DA100A76262 /* darwin64_x86_64.S */, ++ DBFA718B187F1DA100A76262 /* darwin_i386.S */, ++ DBFA718C187F1DA100A76262 /* ffi64_x86_64.c */, ++ DBFA718D187F1DA100A76262 /* ffi_i386.c */, + ); + path = x86; + sourceTree = ""; + }; +- 6C43CC3D1534F7C400162364 /* src */ = { +- isa = PBXGroup; +- children = ( +- 6C43CC281534F7BE00162364 /* closures.c */, +- 6C43CC2B1534F7BE00162364 /* java_raw_api.c */, +- 6C43CC2C1534F7BE00162364 /* prep_cif.c */, +- 6C43CC2D1534F7BE00162364 /* raw_api.c */, +- 6C43CC2E1534F7BE00162364 /* types.c */, +- ); +- name = src; +- path = ios; +- sourceTree = ""; +- }; +- 6C43CC8C1535032600162364 /* include */ = { +- isa = PBXGroup; +- children = ( +- 6C43CC8D1535032600162364 /* ffi.h */, +- 6C43CC8E1535032600162364 /* ffi_common.h */, +- 6C43CC8F1535032600162364 /* ffi_i386.h */, +- 6C43CC901535032600162364 /* ffi_x86_64.h */, +- 6C43CC911535032600162364 /* fficonfig.h */, +- 6C43CC921535032600162364 /* fficonfig_i386.h */, +- 6C43CC931535032600162364 /* fficonfig_x86_64.h */, +- 6C43CC941535032600162364 /* ffitarget.h */, +- 6C43CC951535032600162364 /* ffitarget_i386.h */, +- 6C43CC961535032600162364 /* ffitarget_x86_64.h */, +- ); +- path = include; +- sourceTree = ""; +- }; +- 6C43CCA11535039600162364 /* include */ = { +- isa = PBXGroup; +- children = ( +- 6C43CCA21535039600162364 /* ffi.h */, +- 6C43CCA31535039600162364 /* ffi_armv7.h */, +- 6C43CCA41535039600162364 /* ffi_common.h */, +- 6C43CCA51535039600162364 /* ffi_i386.h */, +- 6C43CCA61535039600162364 /* fficonfig.h */, +- 6C43CCA71535039600162364 /* fficonfig_armv7.h */, +- 6C43CCA81535039600162364 /* fficonfig_i386.h */, +- 6C43CCA91535039600162364 /* ffitarget.h */, +- 6C43CCAA1535039600162364 /* ffitarget_arm.h */, +- 6C43CCAB1535039600162364 /* ffitarget_armv7.h */, +- 6C43CCAC1535039600162364 /* ffitarget_i386.h */, +- ); +- path = include; +- sourceTree = ""; +- }; +- F6B0839514721EE50031D8A1 = { +- isa = PBXGroup; +- children = ( +- 6C43CC3D1534F7C400162364 /* src */, +- 6C43CBAF1534F76F00162364 /* iOS */, +- 6C43CBF01534F77800162364 /* OS X */, +- F6F980C6147386260008F121 /* Products */, +- ); +- sourceTree = ""; +- }; +- F6F980C6147386260008F121 /* Products */ = { +- isa = PBXGroup; +- children = ( +- F6F980BA147386130008F121 /* libffi.a */, +- 6C43CB3D1534E9D100162364 /* libffi.a */, +- ); +- name = Products; +- path = ../..; +- sourceTree = BUILT_PRODUCTS_DIR; +- }; + /* End PBXGroup section */ + + /* Begin PBXHeadersBuildPhase section */ +- 6C43CB3B1534E9D100162364 /* Headers */ = { ++ DB13B18F1849DF510010F42D /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( +- 6C43CC971535032600162364 /* ffi.h in Headers */, +- 6C43CC981535032600162364 /* ffi_common.h in Headers */, +- 6C43CC991535032600162364 /* ffi_i386.h in Headers */, +- 6C43CC9A1535032600162364 /* ffi_x86_64.h in Headers */, +- 6C43CC9E1535032600162364 /* ffitarget.h in Headers */, +- 6C43CC9F1535032600162364 /* ffitarget_i386.h in Headers */, +- 6C43CCA01535032600162364 /* ffitarget_x86_64.h in Headers */, +- 6C43CC9B1535032600162364 /* fficonfig.h in Headers */, +- 6C43CC9C1535032600162364 /* fficonfig_i386.h in Headers */, +- 6C43CC9D1535032600162364 /* fficonfig_x86_64.h in Headers */, +- ); +- runOnlyForDeploymentPostprocessing = 0; +- }; +- F6F980B8147386130008F121 /* Headers */ = { +- isa = PBXHeadersBuildPhase; +- buildActionMask = 2147483647; +- files = ( +- 6C43CCAD1535039600162364 /* ffi.h in Headers */, +- 6C43CCAE1535039600162364 /* ffi_armv7.h in Headers */, +- 6C43CCAF1535039600162364 /* ffi_common.h in Headers */, +- 6C43CCB01535039600162364 /* ffi_i386.h in Headers */, +- 6C43CCB41535039600162364 /* ffitarget.h in Headers */, +- 6C43CCB51535039600162364 /* ffitarget_arm.h in Headers */, +- 6C43CCB61535039600162364 /* ffitarget_armv7.h in Headers */, +- 6C43CCB71535039600162364 /* ffitarget_i386.h in Headers */, +- 6C43CCB11535039600162364 /* fficonfig.h in Headers */, +- 6C43CCB21535039600162364 /* fficonfig_armv7.h in Headers */, +- 6C43CCB31535039600162364 /* fficonfig_i386.h in Headers */, ++ DBFA714C187F1D8600A76262 /* fficonfig.h in Headers */, ++ DBFA714D187F1D8600A76262 /* ffitarget.h in Headers */, ++ DBFA714A187F1D8600A76262 /* ffi.h in Headers */, ++ DBFA718F187F1DA100A76262 /* ffi_x86_64.h in Headers */, ++ DBFA7191187F1DA100A76262 /* fficonfig_x86_64.h in Headers */, ++ DBFA718E187F1DA100A76262 /* ffi_i386.h in Headers */, ++ DBFA7190187F1DA100A76262 /* fficonfig_i386.h in Headers */, ++ DBFA714B187F1D8600A76262 /* ffi_common.h in Headers */, ++ DBFA7193187F1DA100A76262 /* ffitarget_x86_64.h in Headers */, ++ DBFA7192187F1DA100A76262 /* ffitarget_i386.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + /* End PBXHeadersBuildPhase section */ + + /* Begin PBXNativeTarget section */ +- 6C43CB3C1534E9D100162364 /* libffi OS X */ = { ++ DB13B1651849DF1E0010F42D /* libffi-iOS */ = { + isa = PBXNativeTarget; +- buildConfigurationList = 6C43CB4A1534E9D100162364 /* Build configuration list for PBXNativeTarget "libffi OS X" */; ++ buildConfigurationList = DB13B18B1849DF1E0010F42D /* Build configuration list for PBXNativeTarget "libffi-iOS" */; + buildPhases = ( +- 6C43CC401534FF3B00162364 /* Generate Source and Headers */, +- 6C43CB391534E9D100162364 /* Sources */, +- 6C43CB3A1534E9D100162364 /* Frameworks */, +- 6C43CB3B1534E9D100162364 /* Headers */, ++ DB13B3051849E01C0010F42D /* ShellScript */, ++ DB13B1621849DF1E0010F42D /* Sources */, ++ DB13B1641849DF1E0010F42D /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); +- name = "libffi OS X"; +- productName = "ffi OS X"; +- productReference = 6C43CB3D1534E9D100162364 /* libffi.a */; ++ name = "libffi-iOS"; ++ productName = ffi; ++ productReference = DB13B1661849DF1E0010F42D /* libffi.a */; + productType = "com.apple.product-type.library.static"; + }; +- F6F980B9147386130008F121 /* libffi iOS */ = { ++ DB13B1901849DF510010F42D /* libffi-Mac */ = { + isa = PBXNativeTarget; +- buildConfigurationList = F6F980C4147386130008F121 /* Build configuration list for PBXNativeTarget "libffi iOS" */; ++ buildConfigurationList = DB13B1B01849DF520010F42D /* Build configuration list for PBXNativeTarget "libffi-Mac" */; + buildPhases = ( +- 6C43CC3E1534F8E200162364 /* Generate Trampoline */, +- 6C43CC3F1534FF1B00162364 /* Generate Source and Headers */, +- F6F980B6147386130008F121 /* Sources */, +- F6F980B7147386130008F121 /* Frameworks */, +- F6F980B8147386130008F121 /* Headers */, ++ DB13B3061849E0490010F42D /* ShellScript */, ++ DB13B18D1849DF510010F42D /* Sources */, ++ DB13B18F1849DF510010F42D /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); +- name = "libffi iOS"; ++ name = "libffi-Mac"; + productName = ffi; +- productReference = F6F980BA147386130008F121 /* libffi.a */; +- productType = "com.apple.product-type.library.static"; ++ productReference = DB13B1911849DF510010F42D /* ffi.dylib */; ++ productType = "com.apple.product-type.library.dynamic"; + }; + /* End PBXNativeTarget section */ + + /* Begin PBXProject section */ +- F6B0839714721EE50031D8A1 /* Project object */ = { ++ DB13B15C1849DEB70010F42D /* Project object */ = { + isa = PBXProject; + attributes = { +- LastUpgradeCheck = 0430; ++ LastUpgradeCheck = 0510; + }; +- buildConfigurationList = F6B0839A14721EE50031D8A1 /* Build configuration list for PBXProject "libffi" */; ++ buildConfigurationList = DB13B15F1849DEB70010F42D /* Build configuration list for PBXProject "libffi" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); +- mainGroup = F6B0839514721EE50031D8A1; +- productRefGroup = F6B0839514721EE50031D8A1; ++ mainGroup = DB13B15B1849DEB70010F42D; ++ productRefGroup = DB13B1671849DF1E0010F42D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( +- F6F980B9147386130008F121 /* libffi iOS */, +- 6C43CB3C1534E9D100162364 /* libffi OS X */, ++ DB13B1651849DF1E0010F42D /* libffi-iOS */, ++ DB13B1901849DF510010F42D /* libffi-Mac */, + ); + }; + /* End PBXProject section */ + + /* Begin PBXShellScriptBuildPhase section */ +- 6C43CC3E1534F8E200162364 /* Generate Trampoline */ = { ++ DB13B3051849E01C0010F42D /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); +- name = "Generate Trampoline"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; +- shellPath = /usr/bin/python; +- shellScript = "import subprocess\nimport re\nimport os\nimport errno\nimport sys\n\ndef main():\n with open('src/arm/trampoline.S', 'w') as tramp_out:\n p = subprocess.Popen(['bash', 'src/arm/gentramp.sh'], stdout=tramp_out)\n p.wait()\n\nif __name__ == '__main__':\n main()"; ++ shellPath = /bin/sh; ++ shellScript = "/usr/bin/python generate-darwin-source-and-headers.py --only-ios"; + }; +- 6C43CC3F1534FF1B00162364 /* Generate Source and Headers */ = { ++ DB13B3061849E0490010F42D /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); +- name = "Generate Source and Headers"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; +- shellScript = "/usr/bin/python generate-ios-source-and-headers.py"; +- }; +- 6C43CC401534FF3B00162364 /* Generate Source and Headers */ = { +- isa = PBXShellScriptBuildPhase; +- buildActionMask = 2147483647; +- files = ( +- ); +- inputPaths = ( +- ); +- name = "Generate Source and Headers"; +- outputPaths = ( +- ); +- runOnlyForDeploymentPostprocessing = 0; +- shellPath = /bin/sh; +- shellScript = "/usr/bin/python generate-osx-source-and-headers.py"; ++ shellScript = "/usr/bin/python generate-darwin-source-and-headers.py --only-osx"; + }; + /* End PBXShellScriptBuildPhase section */ + + /* Begin PBXSourcesBuildPhase section */ +- 6C43CB391534E9D100162364 /* Sources */ = { ++ DB13B1621849DF1E0010F42D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( +- 6C43CC1F1534F77800162364 /* darwin.S in Sources */, +- 6C43CC201534F77800162364 /* darwin64.S in Sources */, +- 6C43CC211534F77800162364 /* ffi.c in Sources */, +- 6C43CC221534F77800162364 /* ffi64.c in Sources */, +- 6C43CC301534F7BE00162364 /* closures.c in Sources */, +- 6C43CC361534F7BE00162364 /* java_raw_api.c in Sources */, +- 6C43CC381534F7BE00162364 /* prep_cif.c in Sources */, +- 6C43CC3A1534F7BE00162364 /* raw_api.c in Sources */, +- 6C43CC3C1534F7BE00162364 /* types.c in Sources */, ++ DBFA717E187F1D9B00A76262 /* ffi64_x86_64.c in Sources */, ++ DBFA7179187F1D9B00A76262 /* ffi_armv7.c in Sources */, ++ DBFA717B187F1D9B00A76262 /* trampoline_armv7.S in Sources */, ++ DBFA714E187F1D8600A76262 /* closures.c in Sources */, ++ DBFA717A187F1D9B00A76262 /* sysv_armv7.S in Sources */, ++ DBFA717D187F1D9B00A76262 /* darwin_i386.S in Sources */, ++ DBFA7156187F1D8600A76262 /* prep_cif.c in Sources */, ++ DBFA717F187F1D9B00A76262 /* ffi_i386.c in Sources */, ++ DBFA7158187F1D8600A76262 /* raw_api.c in Sources */, ++ DBFA7178187F1D9B00A76262 /* sysv_arm64.S in Sources */, ++ DBFA717C187F1D9B00A76262 /* darwin64_x86_64.S in Sources */, ++ DBFA715A187F1D8600A76262 /* types.c in Sources */, ++ DBFA7177187F1D9B00A76262 /* ffi_arm64.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +- F6F980B6147386130008F121 /* Sources */ = { ++ DB13B18D1849DF510010F42D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( +- 6C43CBDC1534F76F00162364 /* ffi.c in Sources */, +- 6C43CBDD1534F76F00162364 /* sysv.S in Sources */, +- 6C43CBDE1534F76F00162364 /* trampoline.S in Sources */, +- 6C43CBE61534F76F00162364 /* darwin.S in Sources */, +- 6C43CBE81534F76F00162364 /* ffi.c in Sources */, +- 6C43CC2F1534F7BE00162364 /* closures.c in Sources */, +- 6C43CC351534F7BE00162364 /* java_raw_api.c in Sources */, +- 6C43CC371534F7BE00162364 /* prep_cif.c in Sources */, +- 6C43CC391534F7BE00162364 /* raw_api.c in Sources */, +- 6C43CC3B1534F7BE00162364 /* types.c in Sources */, ++ DBFA7196187F1DA100A76262 /* ffi64_x86_64.c in Sources */, ++ DBFA7195187F1DA100A76262 /* darwin_i386.S in Sources */, ++ DBFA7157187F1D8600A76262 /* prep_cif.c in Sources */, ++ DBFA7197187F1DA100A76262 /* ffi_i386.c in Sources */, ++ DBFA715B187F1D8600A76262 /* types.c in Sources */, ++ DBFA7159187F1D8600A76262 /* raw_api.c in Sources */, ++ DBFA714F187F1D8600A76262 /* closures.c in Sources */, ++ DBFA7194187F1DA100A76262 /* darwin64_x86_64.S in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + /* End PBXSourcesBuildPhase section */ + + /* Begin XCBuildConfiguration section */ +- 6C43CB4B1534E9D100162364 /* Debug */ = { ++ DB13B1601849DEB70010F42D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { +- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; +- DSTROOT = /tmp/ffi.dst; +- FRAMEWORK_SEARCH_PATHS = ( ++ HEADER_SEARCH_PATHS = ( + "$(inherited)", +- "\"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks\"", ++ "darwin_common/include", + ); +- GCC_ENABLE_OBJC_EXCEPTIONS = YES; +- GCC_VERSION = com.apple.compilers.llvm.clang.1_0; +- GCC_WARN_64_TO_32_BIT_CONVERSION = YES; +- GCC_WARN_UNINITIALIZED_AUTOS = YES; +- MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; +- PRODUCT_NAME = ffi; +- SDKROOT = macosx; + }; + name = Debug; + }; +- 6C43CB4C1534E9D100162364 /* Release */ = { ++ DB13B1611849DEB70010F42D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { +- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; +- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; +- DSTROOT = /tmp/ffi.dst; +- FRAMEWORK_SEARCH_PATHS = ( ++ HEADER_SEARCH_PATHS = ( + "$(inherited)", +- "\"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks\"", ++ "darwin_common/include", + ); +- GCC_ENABLE_OBJC_EXCEPTIONS = YES; +- GCC_VERSION = com.apple.compilers.llvm.clang.1_0; +- GCC_WARN_64_TO_32_BIT_CONVERSION = YES; +- GCC_WARN_UNINITIALIZED_AUTOS = YES; +- MACOSX_DEPLOYMENT_TARGET = 10.6; +- PRODUCT_NAME = ffi; +- SDKROOT = macosx; + }; + name = Release; + }; +- F6B083AB14721EE50031D8A1 /* Debug */ = { ++ DB13B1871849DF1E0010F42D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; +- ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ++ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; ++ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; ++ CLANG_CXX_LIBRARY = "libc++"; ++ CLANG_ENABLE_MODULES = YES; ++ CLANG_ENABLE_OBJC_ARC = YES; ++ CLANG_WARN_BOOL_CONVERSION = YES; ++ CLANG_WARN_CONSTANT_CONVERSION = YES; ++ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; ++ CLANG_WARN_EMPTY_BODY = YES; ++ CLANG_WARN_ENUM_CONVERSION = YES; ++ CLANG_WARN_INT_CONVERSION = YES; ++ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; ++ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; ++ DSTROOT = /tmp/ffi.dst; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; +@@ -482,98 +457,181 @@ + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; +- GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; +- GCC_WARN_ABOUT_RETURN_TYPE = YES; +- GCC_WARN_UNUSED_VALUE = NO; ++ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; ++ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; ++ GCC_WARN_UNDECLARED_SELECTOR = YES; ++ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; ++ GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; +- HEADER_SEARCH_PATHS = ios/include; ++ HEADER_SEARCH_PATHS = ( ++ "$(inherited)", ++ "darwin_ios/include", ++ ); ++ IPHONEOS_DEPLOYMENT_TARGET = 5.0; ++ "IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0; ++ OTHER_LDFLAGS = "-ObjC"; ++ PRODUCT_NAME = ffi; + SDKROOT = iphoneos; ++ SKIP_INSTALL = YES; + }; + name = Debug; + }; +- F6B083AC14721EE50031D8A1 /* Release */ = { ++ DB13B1881849DF1E0010F42D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; +- ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ++ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; ++ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; ++ CLANG_CXX_LIBRARY = "libc++"; ++ CLANG_ENABLE_MODULES = YES; ++ CLANG_ENABLE_OBJC_ARC = YES; ++ CLANG_WARN_BOOL_CONVERSION = YES; ++ CLANG_WARN_CONSTANT_CONVERSION = YES; ++ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; ++ CLANG_WARN_EMPTY_BODY = YES; ++ CLANG_WARN_ENUM_CONVERSION = YES; ++ CLANG_WARN_INT_CONVERSION = YES; ++ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; ++ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = YES; ++ DSTROOT = /tmp/ffi.dst; ++ ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; +- GCC_PREPROCESSOR_DEFINITIONS = ""; +- GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; +- GCC_WARN_ABOUT_RETURN_TYPE = YES; +- GCC_WARN_UNUSED_VALUE = NO; ++ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; ++ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; ++ GCC_WARN_UNDECLARED_SELECTOR = YES; ++ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; ++ GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; +- HEADER_SEARCH_PATHS = ios/include; ++ HEADER_SEARCH_PATHS = ( ++ "$(inherited)", ++ "darwin_ios/include", ++ ); ++ IPHONEOS_DEPLOYMENT_TARGET = 5.0; ++ "IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0; ++ OTHER_LDFLAGS = "-ObjC"; ++ PRODUCT_NAME = ffi; + SDKROOT = iphoneos; ++ SKIP_INSTALL = YES; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; +- F6F980C2147386130008F121 /* Debug */ = { ++ DB13B1B11849DF520010F42D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { +- ARCHS = ( +- armv6, +- armv7, ++ ALWAYS_SEARCH_USER_PATHS = NO; ++ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; ++ CLANG_CXX_LIBRARY = "libc++"; ++ CLANG_ENABLE_OBJC_ARC = YES; ++ CLANG_WARN_BOOL_CONVERSION = YES; ++ CLANG_WARN_CONSTANT_CONVERSION = YES; ++ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; ++ CLANG_WARN_EMPTY_BODY = YES; ++ CLANG_WARN_ENUM_CONVERSION = YES; ++ CLANG_WARN_INT_CONVERSION = YES; ++ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; ++ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; ++ COPY_PHASE_STRIP = NO; ++ DYLIB_COMPATIBILITY_VERSION = 1; ++ DYLIB_CURRENT_VERSION = 1; ++ GCC_C_LANGUAGE_STANDARD = gnu99; ++ GCC_DYNAMIC_NO_PIC = NO; ++ GCC_ENABLE_OBJC_EXCEPTIONS = YES; ++ GCC_OPTIMIZATION_LEVEL = 0; ++ GCC_PREPROCESSOR_DEFINITIONS = ( ++ "DEBUG=1", ++ "$(inherited)", + ); +- DSTROOT = /tmp/ffi.dst; +- GCC_PRECOMPILE_PREFIX_HEADER = YES; +- GCC_THUMB_SUPPORT = NO; +- IPHONEOS_DEPLOYMENT_TARGET = 4.0; +- OTHER_LDFLAGS = "-ObjC"; ++ GCC_SYMBOLS_PRIVATE_EXTERN = NO; ++ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; ++ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; ++ GCC_WARN_UNDECLARED_SELECTOR = YES; ++ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; ++ GCC_WARN_UNUSED_FUNCTION = YES; ++ GCC_WARN_UNUSED_VARIABLE = YES; ++ HEADER_SEARCH_PATHS = ( ++ "$(inherited)", ++ "darwin_osx/include", ++ ); ++ MACOSX_DEPLOYMENT_TARGET = 10.6; ++ ONLY_ACTIVE_ARCH = YES; ++ OTHER_LDFLAGS = "-Wl,-no_compact_unwind"; + PRODUCT_NAME = ffi; +- SKIP_INSTALL = YES; ++ SDKROOT = macosx; + }; + name = Debug; + }; +- F6F980C3147386130008F121 /* Release */ = { ++ DB13B1B21849DF520010F42D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { +- ARCHS = ( +- armv6, +- armv7, ++ ALWAYS_SEARCH_USER_PATHS = NO; ++ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; ++ CLANG_CXX_LIBRARY = "libc++"; ++ CLANG_ENABLE_OBJC_ARC = YES; ++ CLANG_WARN_BOOL_CONVERSION = YES; ++ CLANG_WARN_CONSTANT_CONVERSION = YES; ++ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; ++ CLANG_WARN_EMPTY_BODY = YES; ++ CLANG_WARN_ENUM_CONVERSION = YES; ++ CLANG_WARN_INT_CONVERSION = YES; ++ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; ++ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; ++ COPY_PHASE_STRIP = YES; ++ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ++ DYLIB_COMPATIBILITY_VERSION = 1; ++ DYLIB_CURRENT_VERSION = 1; ++ ENABLE_NS_ASSERTIONS = NO; ++ GCC_C_LANGUAGE_STANDARD = gnu99; ++ GCC_ENABLE_OBJC_EXCEPTIONS = YES; ++ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; ++ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; ++ GCC_WARN_UNDECLARED_SELECTOR = YES; ++ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; ++ GCC_WARN_UNUSED_FUNCTION = YES; ++ GCC_WARN_UNUSED_VARIABLE = YES; ++ HEADER_SEARCH_PATHS = ( ++ "$(inherited)", ++ "darwin_osx/include", + ); +- DSTROOT = /tmp/ffi.dst; +- GCC_PRECOMPILE_PREFIX_HEADER = YES; +- GCC_THUMB_SUPPORT = NO; +- IPHONEOS_DEPLOYMENT_TARGET = 4.0; +- OTHER_LDFLAGS = "-ObjC"; ++ MACOSX_DEPLOYMENT_TARGET = 10.6; ++ OTHER_LDFLAGS = "-Wl,-no_compact_unwind"; + PRODUCT_NAME = ffi; +- SKIP_INSTALL = YES; ++ SDKROOT = macosx; + }; + name = Release; + }; + /* End XCBuildConfiguration section */ + + /* Begin XCConfigurationList section */ +- 6C43CB4A1534E9D100162364 /* Build configuration list for PBXNativeTarget "libffi OS X" */ = { ++ DB13B15F1849DEB70010F42D /* Build configuration list for PBXProject "libffi" */ = { + isa = XCConfigurationList; + buildConfigurations = ( +- 6C43CB4B1534E9D100162364 /* Debug */, +- 6C43CB4C1534E9D100162364 /* Release */, ++ DB13B1601849DEB70010F42D /* Debug */, ++ DB13B1611849DEB70010F42D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +- F6B0839A14721EE50031D8A1 /* Build configuration list for PBXProject "libffi" */ = { ++ DB13B18B1849DF1E0010F42D /* Build configuration list for PBXNativeTarget "libffi-iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( +- F6B083AB14721EE50031D8A1 /* Debug */, +- F6B083AC14721EE50031D8A1 /* Release */, ++ DB13B1871849DF1E0010F42D /* Debug */, ++ DB13B1881849DF1E0010F42D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +- F6F980C4147386130008F121 /* Build configuration list for PBXNativeTarget "libffi iOS" */ = { ++ DB13B1B01849DF520010F42D /* Build configuration list for PBXNativeTarget "libffi-Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( +- F6F980C2147386130008F121 /* Debug */, +- F6F980C3147386130008F121 /* Release */, ++ DB13B1B11849DF520010F42D /* Debug */, ++ DB13B1B21849DF520010F42D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + /* End XCConfigurationList section */ + }; +- rootObject = F6B0839714721EE50031D8A1 /* Project object */; ++ rootObject = DB13B15C1849DEB70010F42D /* Project object */; + } +diff -r ee879c0ffa11 Modules/_ctypes/libffi/libtool-version +--- a/Modules/_ctypes/libffi/libtool-version ++++ b/Modules/_ctypes/libffi/libtool-version +@@ -26,4 +26,4 @@ + # release, then set age to 0. + # + # CURRENT:REVISION:AGE +-6:1:0 ++6:2:0 +diff -r ee879c0ffa11 Modules/_ctypes/libffi/ltmain.sh +--- a/Modules/_ctypes/libffi/ltmain.sh ++++ b/Modules/_ctypes/libffi/ltmain.sh +@@ -1,9 +1,10 @@ +- +-# libtool (GNU libtool) 2.4.2 ++#! /bin/sh ++ ++# libtool (GNU libtool) 2.4.2.418 ++# Provide generalized library-building support services. + # Written by Gordon Matzigkeit , 1996 + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +@@ -23,166 +24,562 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with GNU Libtool; see the file COPYING. If not, a copy +-# can be downloaded from http://www.gnu.org/licenses/gpl.html, +-# or obtained by writing to the Free Software Foundation, Inc., +-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +- +-# Usage: $progname [OPTION]... [MODE-ARG]... +-# +-# Provide generalized library-building support services. +-# +-# --config show all configuration variables +-# --debug enable verbose shell tracing +-# -n, --dry-run display commands without modifying any files +-# --features display basic configuration information and exit +-# --mode=MODE use operation mode MODE +-# --preserve-dup-deps don't remove duplicate dependency libraries +-# --quiet, --silent don't print informational messages +-# --no-quiet, --no-silent +-# print informational messages (default) +-# --no-warn don't display warning messages +-# --tag=TAG use configuration variables from tag TAG +-# -v, --verbose print more informational messages than default +-# --no-verbose don't print the extra informational messages +-# --version print version information +-# -h, --help, --help-all print short, long, or detailed help message +-# +-# MODE must be one of the following: +-# +-# clean remove files from the build directory +-# compile compile a source file into a libtool object +-# execute automatically set library path, then run a program +-# finish complete the installation of libtool libraries +-# install install libraries or executables +-# link create a library or an executable +-# uninstall remove libraries from an installed directory +-# +-# MODE-ARGS vary depending on the MODE. When passed as first option, +-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. +-# Try `$progname --help --mode=MODE' for a more detailed description of MODE. +-# +-# When reporting a bug, please describe a test case to reproduce it and +-# include the following information: +-# +-# host-triplet: $host +-# shell: $SHELL +-# compiler: $LTCC +-# compiler flags: $LTCFLAGS +-# linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.4.2 +-# automake: $automake_version +-# autoconf: $autoconf_version +-# +-# Report bugs to . +-# GNU libtool home page: . +-# General help using GNU software: . ++# along with this program. If not, see . ++ + + PROGRAM=libtool + PACKAGE=libtool +-VERSION=2.4.2 +-TIMESTAMP="" +-package_revision=1.3337 +- +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++VERSION=2.4.2.418 ++package_revision=2.4.2.418 ++ ++ ++## ------ ## ++## Usage. ## ++## ------ ## ++ ++# Run './libtool --help' for help with using this script from the ++# command line. ++ ++ ++## ------------------------------- ## ++## User overridable command paths. ## ++## ------------------------------- ## ++ ++# After configure completes, it has a better idea of some of the ++# shell tools we need than the defaults used by the functions shared ++# with bootstrap, so set those here where they can still be over- ++# ridden by the user, but otherwise take precedence. ++ ++: ${AUTOCONF="autoconf"} ++: ${AUTOMAKE="automake"} ++ ++ ++## -------------------------- ## ++## Source external libraries. ## ++## -------------------------- ## ++ ++# Much of our low-level functionality needs to be sourced from external ++# libraries, which are installed to $pkgauxdir. ++ ++# Set a version string for this script. ++scriptversion=2013-08-23.20; # UTC ++ ++# General shell script boiler plate, and helper functions. ++# Written by Gary V. Vaughan, 2004 ++ ++# Copyright (C) 2004-2013 Free Software Foundation, Inc. ++# This is free software; see the source for copying conditions. There is NO ++# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++# This program 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 of the License, or ++# (at your option) any later version. ++ ++# As a special exception to the GNU General Public License, if you distribute ++# this file as part of a program or library that is built using GNU Libtool, ++# you may include this file under the same distribution terms that you use ++# for the rest of that program. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNES 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 this program. If not, see . ++ ++# Please report bugs or propose patches to gary@gnu.org. ++ ++ ++## ------ ## ++## Usage. ## ++## ------ ## ++ ++# Evaluate this file near the top of your script to gain access to ++# the functions and variables defined here: ++# ++# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh ++# ++# If you need to override any of the default environment variable ++# settings, do that before evaluating this file. ++ ++ ++## -------------------- ## ++## Shell normalisation. ## ++## -------------------- ## ++ ++# Some shells need a little help to be as Bourne compatible as possible. ++# Before doing anything else, make sure all that help has been provided! ++ ++DUALCASE=1; export DUALCASE # for MKS sh ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh +- +-# A function that is used when there is no print builtin or printf. +-func_fallback_echo () +-{ +- eval 'cat <<_LTECHO_EOF +-$1 +-_LTECHO_EOF' +-} +- +-# NLS nuisances: We save the old values to restore during execute mode. +-lt_user_locale= +-lt_safe_locale= +-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++ ++# NLS nuisances: We save the old values in case they are required later. ++_G_user_locale= ++_G_safe_locale= ++for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do +- eval "if test \"\${$lt_var+set}\" = set; then +- save_$lt_var=\$$lt_var +- $lt_var=C +- export $lt_var +- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" +- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" ++ eval "if test set = \"\${$_G_var+set}\"; then ++ save_$_G_var=\$$_G_var ++ $_G_var=C ++ export $_G_var ++ _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" ++ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" + fi" + done +-LC_ALL=C +-LANGUAGE=C +-export LANGUAGE LC_ALL +- +-$lt_unset CDPATH +- ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++# Make sure IFS has a sensible default ++sp=' ' ++nl=' ++' ++IFS="$sp $nl" ++ ++# There are still modern systems that have problems with 'echo' mis- ++# handling backslashes, among others, so make sure $bs_echo is set to a ++# command that correctly interprets backslashes. ++# (this code from Autoconf 2.68) ++ ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++bs_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++bs_echo=$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo ++bs_echo=$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $bs_echo`" = "X$bs_echo") 2>/dev/null; then ++ bs_echo='print -r --' ++ bs_echo_n='print -rn --' ++elif (test "X`printf %s $bs_echo`" = "X$bs_echo") 2>/dev/null; then ++ bs_echo='printf %s\n' ++ bs_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $bs_echo) 2>/dev/null`" = "X-n $bs_echo"; then ++ bs_echo_body='eval /usr/ucb/echo -n "$1$nl"' ++ bs_echo_n='/usr/ucb/echo -n' ++ else ++ bs_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ bs_echo_n_body='eval ++ arg=$1; ++ case $arg in #( ++ *"$nl"*) ++ expr "X$arg" : "X\\(.*\\)$nl"; ++ arg=`expr "X$arg" : ".*$nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$nl" ++ ' ++ export bs_echo_n_body ++ bs_echo_n='sh -c $bs_echo_n_body bs_echo' ++ fi ++ export bs_echo_body ++ bs_echo='sh -c $bs_echo_body bs_echo' ++fi ++ ++ ++## ------------------------------- ## ++## User overridable command paths. ## ++## ------------------------------- ## ++ ++# All uppercase variable names are used for environment variables. These ++# variables can be overridden by the user before calling a script that ++# uses them if a suitable command of that name is not already available ++# in the command search PATH. ++ ++: ${CP="cp -f"} ++: ${ECHO="$bs_echo"} ++: ${EGREP="grep -E"} ++: ${FGREP="grep -F"} ++: ${GREP="grep"} ++: ${LN_S="ln -s"} ++: ${MAKE="make"} ++: ${MKDIR="mkdir"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++: ${SED="sed"} ++: ${SHELL="${CONFIG_SHELL-/bin/sh}"} ++ ++ ++## -------------------- ## ++## Useful sed snippets. ## ++## -------------------- ## ++ ++sed_dirname='s|/[^/]*$||' ++sed_basename='s|^.*/||' ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++sed_quote_subst='s|\([`"$\\]\)|\\\1|g' ++ ++# Same as above, but do not quote variable references. ++sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' ++ ++# Sed substitution that turns a string into a regex matching for the ++# string literally. ++sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' ++ ++# Sed substitution that converts a w32 file name or path ++# that contains forward slashes, into one that contains ++# (escaped) backslashes. A very naive implementation. ++sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ ++# Re-'\' parameter expansions in output of sed_double_quote_subst that ++# were '\'-ed in input to the same. If an odd number of '\' preceded a ++# '$' in input to sed_double_quote_subst, that '$' was protected from ++# expansion. Since each input '\' is now two '\'s, look for any number ++# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. ++_G_bs='\\' ++_G_bs2='\\\\' ++_G_bs4='\\\\\\\\' ++_G_dollar='\$' ++sed_double_backslash="\ ++ s/$_G_bs4/&\\ ++/g ++ s/^$_G_bs2$_G_dollar/$_G_bs&/ ++ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g ++ s/\n//g" ++ ++ ++## ----------------- ## ++## Global variables. ## ++## ----------------- ## ++ ++# Except for the global variables explicitly listed below, the following ++# functions in the '^func_' namespace, and the '^require_' namespace ++# variables initialised in the 'Resource management' section, sourcing ++# this file will not pollute your global namespace with anything ++# else. There's no portable way to scope variables in Bourne shell ++# though, so actually running these functions will sometimes place ++# results into a variable named after the function, and often use ++# temporary variables in the '^_G_' namespace. If you are careful to ++# avoid using those namespaces casually in your sourcing script, things ++# should continue to work as you expect. And, of course, you can freely ++# overwrite any of the functions or variables defined here before ++# calling anything to customize them. ++ ++EXIT_SUCCESS=0 ++EXIT_FAILURE=1 ++EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. ++EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. ++ ++# Allow overriding, eg assuming that you follow the convention of ++# putting '$debug_cmd' at the start of all your functions, you can get ++# bash to show function call trace with: ++# ++# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name ++debug_cmd=${debug_cmd-":"} ++exit_cmd=: ++ ++# By convention, finish your script with: ++# ++# exit $exit_status ++# ++# so that you can set exit_status to non-zero if you want to indicate ++# something went wrong during execution without actually bailing out at ++# the point of failure. ++exit_status=$EXIT_SUCCESS + + # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh + # is ksh but when the shell is invoked as "sh" and the current value of + # the _XPG environment variable is not equal to 1 (one), the special + # positional parameter $0, within a function call, is the name of the + # function. +-progpath="$0" +- +- +- +-: ${CP="cp -f"} +-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +-: ${MAKE="make"} +-: ${MKDIR="mkdir"} +-: ${MV="mv -f"} +-: ${RM="rm -f"} +-: ${SHELL="${CONFIG_SHELL-/bin/sh}"} +-: ${Xsed="$SED -e 1s/^X//"} +- +-# Global variables: +-EXIT_SUCCESS=0 +-EXIT_FAILURE=1 +-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. +- +-exit_status=$EXIT_SUCCESS +- +-# Make sure IFS has a sensible default +-lt_nl=' +-' +-IFS=" $lt_nl" +- +-dirname="s,/[^/]*$,," +-basename="s,^.*/,," +- +-# func_dirname file append nondir_replacement ++progpath=$0 ++ ++# The name of this program. ++progname=`$bs_echo "$progpath" |$SED "$sed_basename"` ++ ++# Make sure we have an absolute progpath for reexecution: ++case $progpath in ++ [\\/]*|[A-Za-z]:\\*) ;; ++ *[\\/]*) ++ progdir=`$bs_echo "$progpath" |$SED "$sed_dirname"` ++ progdir=`cd "$progdir" && pwd` ++ progpath=$progdir/$progname ++ ;; ++ *) ++ _G_IFS=$IFS ++ IFS=${PATH_SEPARATOR-:} ++ for progdir in $PATH; do ++ IFS=$_G_IFS ++ test -x "$progdir/$progname" && break ++ done ++ IFS=$_G_IFS ++ test -n "$progdir" || progdir=`pwd` ++ progpath=$progdir/$progname ++ ;; ++esac ++ ++ ++## ----------------- ## ++## Standard options. ## ++## ----------------- ## ++ ++# The following options affect the operation of the functions defined ++# below, and should be set appropriately depending on run-time para- ++# meters passed on the command line. ++ ++opt_dry_run=false ++opt_quiet=false ++opt_verbose=false ++ ++# Categories 'all' and 'none' are always available. Append any others ++# you will pass as the first argument to func_warning from your own ++# code. ++warning_categories= ++ ++# By default, display warnings according to 'opt_warning_types'. Set ++# 'warning_func' to ':' to elide all warnings, or func_fatal_error to ++# treat the next displayed warning as a fatal error. ++warning_func=func_warn_and_continue ++ ++# Set to 'all' to display all warnings, 'none' to suppress all ++# warnings, or a space delimited list of some subset of ++# 'warning_categories' to display only the listed warnings. ++opt_warning_types=all ++ ++ ++## -------------------- ## ++## Resource management. ## ++## -------------------- ## ++ ++# This section contains definitions for functions that each ensure a ++# particular resource (a file, or a non-empty configuration variable for ++# example) is available, and if appropriate to extract default values ++# from pertinent package files. Call them using their associated ++# 'require_*' variable to ensure that they are executed, at most, once. ++# ++# It's entirely deliberate that calling these functions can set ++# variables that don't obey the namespace limitations obeyed by the rest ++# of this file, in order that that they be as useful as possible to ++# callers. ++ ++ ++# require_term_colors ++# ------------------- ++# Allow display of bold text on terminals that support it. ++require_term_colors=func_require_term_colors ++func_require_term_colors () ++{ ++ $debug_cmd ++ ++ test -t 1 && { ++ # COLORTERM and USE_ANSI_COLORS environment variables take ++ # precedence, because most terminfo databases neglect to describe ++ # whether color sequences are supported. ++ test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} ++ ++ if test 1 = "$USE_ANSI_COLORS"; then ++ # Standard ANSI escape sequences ++ tc_reset='' ++ tc_bold=''; tc_standout='' ++ tc_red=''; tc_green='' ++ tc_blue=''; tc_cyan='' ++ else ++ # Otherwise trust the terminfo database after all. ++ test -n "`tput sgr0 2>/dev/null`" && { ++ tc_reset=`tput sgr0` ++ test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` ++ tc_standout=$tc_bold ++ test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` ++ test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` ++ test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` ++ test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` ++ test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` ++ } ++ fi ++ } ++ ++ require_term_colors=: ++} ++ ++ ++## ----------------- ## ++## Function library. ## ++## ----------------- ## ++ ++# This section contains a variety of useful functions to call in your ++# scripts. Take note of the portable wrappers for features provided by ++# some modern shells, which will fall back to slower equivalents on ++# less featureful shells. ++ ++ ++# func_append VAR VALUE ++# --------------------- ++# Append VALUE onto the existing contents of VAR. ++ ++ # We should try to minimise forks, especially on Windows where they are ++ # unreasonably slow, so skip the feature probes when bash or zsh are ++ # being used: ++ if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then ++ : ${_G_HAVE_ARITH_OP="yes"} ++ : ${_G_HAVE_XSI_OPS="yes"} ++ # The += operator was introduced in bash 3.1 ++ case $BASH_VERSION in ++ [12].* | 3.0 | 3.0*) ;; ++ *) ++ : ${_G_HAVE_PLUSEQ_OP="yes"} ++ ;; ++ esac ++ fi ++ ++ # _G_HAVE_PLUSEQ_OP ++ # Can be empty, in which case the shell is probed, "yes" if += is ++ # useable or anything else if it does not work. ++ test -z "$_G_HAVE_PLUSEQ_OP" \ ++ && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ ++ && _G_HAVE_PLUSEQ_OP=yes ++ ++if test yes = "$_G_HAVE_PLUSEQ_OP" ++then ++ # This is an XSI compatible shell, allowing a faster implementation... ++ eval 'func_append () ++ { ++ $debug_cmd ++ ++ eval "$1+=\$2" ++ }' ++else ++ # ...otherwise fall back to using expr, which is often a shell builtin. ++ func_append () ++ { ++ $debug_cmd ++ ++ eval "$1=\$$1\$2" ++ } ++fi ++ ++ ++# func_append_quoted VAR VALUE ++# ---------------------------- ++# Quote VALUE and append to the end of shell variable VAR, separated ++# by a space. ++if test yes = "$_G_HAVE_PLUSEQ_OP"; then ++ eval 'func_append_quoted () ++ { ++ $debug_cmd ++ ++ func_quote_for_eval "$2" ++ eval "$1+=\\ \$func_quote_for_eval_result" ++ }' ++else ++ func_append_quoted () ++ { ++ $debug_cmd ++ ++ func_quote_for_eval "$2" ++ eval "$1=\$$1\\ \$func_quote_for_eval_result" ++ } ++fi ++ ++ ++# func_append_uniq VAR VALUE ++# -------------------------- ++# Append unique VALUE onto the existing contents of VAR, assuming ++# entries are delimited by the first character of VALUE. For example: ++# ++# func_append_uniq options " --another-option option-argument" ++# ++# will only append to $options if " --another-option option-argument " ++# is not already present somewhere in $options already (note spaces at ++# each end implied by leading space in second argument). ++func_append_uniq () ++{ ++ $debug_cmd ++ ++ eval _G_current_value='`$bs_echo $'$1'`' ++ _G_delim=`expr "$2" : '\(.\)'` ++ ++ case $_G_delim$_G_current_value$_G_delim in ++ *"$2$_G_delim"*) ;; ++ *) func_append "$@" ;; ++ esac ++} ++ ++ ++# func_arith TERM... ++# ------------------ ++# Set func_arith_result to the result of evaluating TERMs. ++ test -z "$_G_HAVE_ARITH_OP" \ ++ && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ ++ && _G_HAVE_ARITH_OP=yes ++ ++if test yes = "$_G_HAVE_ARITH_OP"; then ++ eval 'func_arith () ++ { ++ $debug_cmd ++ ++ func_arith_result=$(( $* )) ++ }' ++else ++ func_arith () ++ { ++ $debug_cmd ++ ++ func_arith_result=`expr "$@"` ++ } ++fi ++ ++ ++# func_basename FILE ++# ------------------ ++# Set func_basename_result to FILE with everything up to and including ++# the last / stripped. ++if test yes = "$_G_HAVE_XSI_OPS"; then ++ # If this shell supports suffix pattern removal, then use it to avoid ++ # forking. Hide the definitions single quotes in case the shell chokes ++ # on unsupported syntax... ++ _b='func_basename_result=${1##*/}' ++ _d='case $1 in ++ */*) func_dirname_result=${1%/*}$2 ;; ++ * ) func_dirname_result=$3 ;; ++ esac' ++ ++else ++ # ...otherwise fall back to using sed. ++ _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' ++ _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` ++ if test "X$func_dirname_result" = "X$1"; then ++ func_dirname_result=$3 ++ else ++ func_append func_dirname_result "$2" ++ fi' ++fi ++ ++eval 'func_basename () ++{ ++ $debug_cmd ++ ++ '"$_b"' ++}' ++ ++ ++# func_dirname FILE APPEND NONDIR_REPLACEMENT ++# ------------------------------------------- + # Compute the dirname of FILE. If nonempty, add APPEND to the result, + # otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} # func_dirname may be replaced by extended shell implementation +- +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} # func_basename may be replaced by extended shell implementation +- +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function ++eval 'func_dirname () ++{ ++ $debug_cmd ++ ++ '"$_d"' ++}' ++ ++ ++# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT ++# -------------------------------------------------------- ++# Perform func_basename and func_dirname in a single function + # call: + # dirname: Compute the dirname of FILE. If nonempty, + # add APPEND to the result, otherwise set result +@@ -190,263 +587,327 @@ + # value returned in "$func_dirname_result" + # basename: Compute filename of FILE. + # value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" ++# For efficiency, we do not delegate to the functions above but instead ++# duplicate the functionality here. ++eval 'func_dirname_and_basename () ++{ ++ $debug_cmd ++ ++ '"$_b"' ++ '"$_d"' ++}' ++ ++ ++# func_echo ARG... ++# ---------------- ++# Echo program name prefixed message. ++func_echo () ++{ ++ $debug_cmd ++ ++ _G_message=$* ++ ++ func_echo_IFS=$IFS ++ IFS=$nl ++ for _G_line in $_G_message; do ++ IFS=$func_echo_IFS ++ $bs_echo "$progname: $_G_line" ++ done ++ IFS=$func_echo_IFS ++} ++ ++ ++# func_echo_all ARG... ++# -------------------- ++# Invoke $ECHO with all args, space-separated. ++func_echo_all () ++{ ++ $ECHO "$*" ++} ++ ++ ++# func_echo_infix_1 INFIX ARG... ++# ------------------------------ ++# Echo program name, followed by INFIX on the first line, with any ++# additional lines not showing INFIX. ++func_echo_infix_1 () ++{ ++ $debug_cmd ++ ++ $require_term_colors ++ ++ _G_infix=$1; shift ++ _G_indent=$_G_infix ++ _G_prefix="$progname: $_G_infix: " ++ _G_message=$* ++ ++ # Strip color escape sequences before counting printable length ++ for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" ++ do ++ test -n "$_G_tc" && { ++ _G_esc_tc=`$bs_echo "$_G_tc" | sed "$sed_make_literal_regex"` ++ _G_indent=`$bs_echo "$_G_indent" | sed "s|$_G_esc_tc||g"` ++ } ++ done ++ _G_indent="$progname: "`echo "$_G_indent" | sed 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes ++ ++ func_echo_infix_1_IFS=$IFS ++ IFS=$nl ++ for _G_line in $_G_message; do ++ IFS=$func_echo_infix_1_IFS ++ $bs_echo "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 ++ _G_prefix=$_G_indent ++ done ++ IFS=$func_echo_infix_1_IFS ++} ++ ++ ++# func_error ARG... ++# ----------------- ++# Echo program name prefixed message to standard error. ++func_error () ++{ ++ $debug_cmd ++ ++ $require_term_colors ++ ++ func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 ++} ++ ++ ++# func_fatal_error ARG... ++# ----------------------- ++# Echo program name prefixed message to standard error, and exit. ++func_fatal_error () ++{ ++ $debug_cmd ++ ++ func_error "$*" ++ exit $EXIT_FAILURE ++} ++ ++ ++# func_grep EXPRESSION FILENAME ++# ----------------------------- ++# Check whether EXPRESSION matches any line of FILENAME, without output. ++func_grep () ++{ ++ $debug_cmd ++ ++ $GREP "$1" "$2" >/dev/null 2>&1 ++} ++ ++ ++# func_len STRING ++# --------------- ++# Set func_len_result to the length of STRING. STRING may not ++# start with a hyphen. ++ test -z "$_G_HAVE_XSI_OPS" \ ++ && (eval 'x=a/b/c; ++ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ ++ && _G_HAVE_XSI_OPS=yes ++ ++if test yes = "$_G_HAVE_XSI_OPS"; then ++ eval 'func_len () ++ { ++ $debug_cmd ++ ++ func_len_result=${#1} ++ }' ++else ++ func_len () ++ { ++ $debug_cmd ++ ++ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` ++ } ++fi ++ ++ ++# func_mkdir_p DIRECTORY-PATH ++# --------------------------- ++# Make sure the entire path to DIRECTORY-PATH is available. ++func_mkdir_p () ++{ ++ $debug_cmd ++ ++ _G_directory_path=$1 ++ _G_dir_list= ++ ++ if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then ++ ++ # Protect directory names starting with '-' ++ case $_G_directory_path in ++ -*) _G_directory_path=./$_G_directory_path ;; ++ esac ++ ++ # While some portion of DIR does not yet exist... ++ while test ! -d "$_G_directory_path"; do ++ # ...make a list in topmost first order. Use a colon delimited ++ # list incase some portion of path contains whitespace. ++ _G_dir_list=$_G_directory_path:$_G_dir_list ++ ++ # If the last portion added has no slash in it, the list is done ++ case $_G_directory_path in */*) ;; *) break ;; esac ++ ++ # ...otherwise throw away the child directory and loop ++ _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` ++ done ++ _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` ++ ++ func_mkdir_p_IFS=$IFS; IFS=: ++ for _G_dir in $_G_dir_list; do ++ IFS=$func_mkdir_p_IFS ++ # mkdir can fail with a 'File exist' error if two processes ++ # try to create one of the directories concurrently. Don't ++ # stop in that case! ++ $MKDIR "$_G_dir" 2>/dev/null || : ++ done ++ IFS=$func_mkdir_p_IFS ++ ++ # Bail out if we (or some other process) failed to create a directory. ++ test -d "$_G_directory_path" || \ ++ func_fatal_error "Failed to create '$1'" ++ fi ++} ++ ++ ++# func_mktempdir [BASENAME] ++# ------------------------- ++# Make a temporary directory that won't clash with other running ++# libtool processes, and avoids race conditions if possible. If ++# given, BASENAME is the basename for that directory. ++func_mktempdir () ++{ ++ $debug_cmd ++ ++ _G_template=${TMPDIR-/tmp}/${1-$progname} ++ ++ if test : = "$opt_dry_run"; then ++ # Return a directory name, but don't create it in dry-run mode ++ _G_tmpdir=$_G_template-$$ + else +- func_dirname_result="$func_dirname_result${2}" ++ ++ # If mktemp works, use that first and foremost ++ _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` ++ ++ if test ! -d "$_G_tmpdir"; then ++ # Failing that, at least try and use $RANDOM to avoid a race ++ _G_tmpdir=$_G_template-${RANDOM-0}$$ ++ ++ func_mktempdir_umask=`umask` ++ umask 0077 ++ $MKDIR "$_G_tmpdir" ++ umask $func_mktempdir_umask ++ fi ++ ++ # If we're not in dry-run mode, bomb out on failure ++ test -d "$_G_tmpdir" || \ ++ func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi +- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +-} # func_dirname_and_basename may be replaced by extended shell implementation +- +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} # func_stripname may be replaced by extended shell implementation +- +- +-# These SED scripts presuppose an absolute path with a trailing slash. +-pathcar='s,^/\([^/]*\).*$,\1,' +-pathcdr='s,^/[^/]*,,' +-removedotparts=':dotsl +- s@/\./@/@g +- t dotsl +- s,/\.$,/,' +-collapseslashes='s@/\{1,\}@/@g' +-finalslash='s,/*$,/,' ++ ++ $ECHO "$_G_tmpdir" ++} ++ + + # func_normal_abspath PATH ++# ------------------------ + # Remove doubled-up and trailing slashes, "." path components, + # and cancel out any ".." path components in PATH after making + # it an absolute path. +-# value returned in "$func_normal_abspath_result" + func_normal_abspath () + { +- # Start from root dir and reassemble the path. +- func_normal_abspath_result= +- func_normal_abspath_tpath=$1 +- func_normal_abspath_altnamespace= +- case $func_normal_abspath_tpath in +- "") +- # Empty path, that just means $cwd. +- func_stripname '' '/' "`pwd`" +- func_normal_abspath_result=$func_stripname_result +- return +- ;; +- # The next three entries are used to spot a run of precisely +- # two leading slashes without using negated character classes; +- # we take advantage of case's first-match behaviour. +- ///*) +- # Unusual form of absolute path, do nothing. +- ;; +- //*) +- # Not necessarily an ordinary path; POSIX reserves leading '//' +- # and for example Cygwin uses it to access remote file shares +- # over CIFS/SMB, so we conserve a leading double slash if found. +- func_normal_abspath_altnamespace=/ +- ;; +- /*) +- # Absolute path, do nothing. +- ;; +- *) +- # Relative path, prepend $cwd. +- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath +- ;; +- esac +- # Cancel out all the simple stuff to save iterations. We also want +- # the path to end with a slash for ease of parsing, so make sure +- # there is one (and only one) here. +- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ +- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` +- while :; do +- # Processed it all yet? +- if test "$func_normal_abspath_tpath" = / ; then +- # If we ascended to the root using ".." the result may be empty now. +- if test -z "$func_normal_abspath_result" ; then +- func_normal_abspath_result=/ +- fi +- break +- fi +- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ +- -e "$pathcar"` ++ $debug_cmd ++ ++ # These SED scripts presuppose an absolute path with a trailing slash. ++ _G_pathcar='s|^/\([^/]*\).*$|\1|' ++ _G_pathcdr='s|^/[^/]*||' ++ _G_removedotparts=':dotsl ++ s|/\./|/|g ++ t dotsl ++ s|/\.$|/|' ++ _G_collapseslashes='s|/\{1,\}|/|g' ++ _G_finalslash='s|/*$|/|' ++ ++ # Start from root dir and reassemble the path. ++ func_normal_abspath_result= ++ func_normal_abspath_tpath=$1 ++ func_normal_abspath_altnamespace= ++ case $func_normal_abspath_tpath in ++ "") ++ # Empty path, that just means $cwd. ++ func_stripname '' '/' "`pwd`" ++ func_normal_abspath_result=$func_stripname_result ++ return ++ ;; ++ # The next three entries are used to spot a run of precisely ++ # two leading slashes without using negated character classes; ++ # we take advantage of case's first-match behaviour. ++ ///*) ++ # Unusual form of absolute path, do nothing. ++ ;; ++ //*) ++ # Not necessarily an ordinary path; POSIX reserves leading '//' ++ # and for example Cygwin uses it to access remote file shares ++ # over CIFS/SMB, so we conserve a leading double slash if found. ++ func_normal_abspath_altnamespace=/ ++ ;; ++ /*) ++ # Absolute path, do nothing. ++ ;; ++ *) ++ # Relative path, prepend $cwd. ++ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath ++ ;; ++ esac ++ ++ # Cancel out all the simple stuff to save iterations. We also want ++ # the path to end with a slash for ease of parsing, so make sure ++ # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ +- -e "$pathcdr"` +- # Figure out what to do with it +- case $func_normal_abspath_tcomponent in +- "") +- # Trailing empty path component, ignore it. +- ;; +- ..) +- # Parent dir; strip last assembled component from result. +- func_dirname "$func_normal_abspath_result" +- func_normal_abspath_result=$func_dirname_result +- ;; +- *) +- # Actual path component, append it. +- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent +- ;; +- esac +- done +- # Restore leading double-slash if one was found on entry. +- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +-} +- +-# func_relative_path SRCDIR DSTDIR +-# generates a relative path from SRCDIR to DSTDIR, with a trailing +-# slash if non-empty, suitable for immediately appending a filename +-# without needing to append a separator. +-# value returned in "$func_relative_path_result" +-func_relative_path () +-{ +- func_relative_path_result= +- func_normal_abspath "$1" +- func_relative_path_tlibdir=$func_normal_abspath_result +- func_normal_abspath "$2" +- func_relative_path_tbindir=$func_normal_abspath_result +- +- # Ascend the tree starting from libdir +- while :; do +- # check if we have found a prefix of bindir +- case $func_relative_path_tbindir in +- $func_relative_path_tlibdir) +- # found an exact match +- func_relative_path_tcancelled= +- break +- ;; +- $func_relative_path_tlibdir*) +- # found a matching prefix +- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" +- func_relative_path_tcancelled=$func_stripname_result +- if test -z "$func_relative_path_result"; then +- func_relative_path_result=. ++ -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` ++ while :; do ++ # Processed it all yet? ++ if test / = "$func_normal_abspath_tpath"; then ++ # If we ascended to the root using ".." the result may be empty now. ++ if test -z "$func_normal_abspath_result"; then ++ func_normal_abspath_result=/ + fi + break +- ;; +- *) +- func_dirname $func_relative_path_tlibdir +- func_relative_path_tlibdir=${func_dirname_result} +- if test "x$func_relative_path_tlibdir" = x ; then +- # Have to descend all the way to the root! +- func_relative_path_result=../$func_relative_path_result +- func_relative_path_tcancelled=$func_relative_path_tbindir +- break +- fi +- func_relative_path_result=../$func_relative_path_result +- ;; +- esac +- done +- +- # Now calculate path; take care to avoid doubling-up slashes. +- func_stripname '' '/' "$func_relative_path_result" +- func_relative_path_result=$func_stripname_result +- func_stripname '/' '/' "$func_relative_path_tcancelled" +- if test "x$func_stripname_result" != x ; then +- func_relative_path_result=${func_relative_path_result}/${func_stripname_result} +- fi +- +- # Normalisation. If bindir is libdir, return empty string, +- # else relative path ending with a slash; either way, target +- # file name can be directly appended. +- if test ! -z "$func_relative_path_result"; then +- func_stripname './' '' "$func_relative_path_result/" +- func_relative_path_result=$func_stripname_result +- fi +-} +- +-# The name of this program: +-func_dirname_and_basename "$progpath" +-progname=$func_basename_result +- +-# Make sure we have an absolute path for reexecution: +-case $progpath in +- [\\/]*|[A-Za-z]:\\*) ;; +- *[\\/]*) +- progdir=$func_dirname_result +- progdir=`cd "$progdir" && pwd` +- progpath="$progdir/$progname" +- ;; +- *) +- save_IFS="$IFS" +- IFS=${PATH_SEPARATOR-:} +- for progdir in $PATH; do +- IFS="$save_IFS" +- test -x "$progdir/$progname" && break +- done +- IFS="$save_IFS" +- test -n "$progdir" || progdir=`pwd` +- progpath="$progdir/$progname" +- ;; +-esac +- +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed="${SED}"' -e 1s/^X//' +-sed_quote_subst='s/\([`"$\\]\)/\\\1/g' +- +-# Same as above, but do not quote variable references. +-double_quote_subst='s/\(["`\\]\)/\\\1/g' +- +-# Sed substitution that turns a string into a regex matching for the +-# string literally. +-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' +- +-# Sed substitution that converts a w32 file name or path +-# which contains forward slashes, into one that contains +-# (escaped) backslashes. A very naive implementation. +-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- +-# Re-`\' parameter expansions in output of double_quote_subst that were +-# `\'-ed in input to the same. If an odd number of `\' preceded a '$' +-# in input to double_quote_subst, that '$' was protected from expansion. +-# Since each input `\' is now two `\'s, look for any number of runs of +-# four `\'s followed by two `\'s and then a '$'. `\' that '$'. +-bs='\\' +-bs2='\\\\' +-bs4='\\\\\\\\' +-dollar='\$' +-sed_double_backslash="\ +- s/$bs4/&\\ +-/g +- s/^$bs2$dollar/$bs&/ +- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g +- s/\n//g" +- +-# Standard options: +-opt_dry_run=false +-opt_help=false +-opt_quiet=false +-opt_verbose=false +-opt_warning=: +- +-# func_echo arg... +-# Echo program name prefixed message, along with the current mode +-# name if it has been set yet. +-func_echo () +-{ +- $ECHO "$progname: ${opt_mode+$opt_mode: }$*" +-} +- +-# func_verbose arg... +-# Echo program name prefixed message in verbose mode only. +-func_verbose () +-{ +- $opt_verbose && func_echo ${1+"$@"} ++ fi ++ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ ++ -e "$_G_pathcar"` ++ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ ++ -e "$_G_pathcdr"` ++ # Figure out what to do with it ++ case $func_normal_abspath_tcomponent in ++ "") ++ # Trailing empty path component, ignore it. ++ ;; ++ ..) ++ # Parent dir; strip last assembled component from result. ++ func_dirname "$func_normal_abspath_result" ++ func_normal_abspath_result=$func_dirname_result ++ ;; ++ *) ++ # Actual path component, append it. ++ func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" ++ ;; ++ esac ++ done ++ # Restore leading double-slash if one was found on entry. ++ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result ++} ++ ++ ++# func_notquiet ARG... ++# -------------------- ++# Echo program name prefixed message only when not in quiet mode. ++func_notquiet () ++{ ++ $debug_cmd ++ ++ $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to +@@ -454,450 +915,1122 @@ + : + } + +-# func_echo_all arg... +-# Invoke $ECHO with all args, space-separated. +-func_echo_all () +-{ +- $ECHO "$*" +-} +- +-# func_error arg... +-# Echo program name prefixed message to standard error. +-func_error () +-{ +- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 +-} +- +-# func_warning arg... +-# Echo program name prefixed warning message to standard error. +-func_warning () +-{ +- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +- +- # bash bug again: ++ ++# func_relative_path SRCDIR DSTDIR ++# -------------------------------- ++# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. ++func_relative_path () ++{ ++ $debug_cmd ++ ++ func_relative_path_result= ++ func_normal_abspath "$1" ++ func_relative_path_tlibdir=$func_normal_abspath_result ++ func_normal_abspath "$2" ++ func_relative_path_tbindir=$func_normal_abspath_result ++ ++ # Ascend the tree starting from libdir ++ while :; do ++ # check if we have found a prefix of bindir ++ case $func_relative_path_tbindir in ++ $func_relative_path_tlibdir) ++ # found an exact match ++ func_relative_path_tcancelled= ++ break ++ ;; ++ $func_relative_path_tlibdir*) ++ # found a matching prefix ++ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" ++ func_relative_path_tcancelled=$func_stripname_result ++ if test -z "$func_relative_path_result"; then ++ func_relative_path_result=. ++ fi ++ break ++ ;; ++ *) ++ func_dirname $func_relative_path_tlibdir ++ func_relative_path_tlibdir=$func_dirname_result ++ if test -z "$func_relative_path_tlibdir"; then ++ # Have to descend all the way to the root! ++ func_relative_path_result=../$func_relative_path_result ++ func_relative_path_tcancelled=$func_relative_path_tbindir ++ break ++ fi ++ func_relative_path_result=../$func_relative_path_result ++ ;; ++ esac ++ done ++ ++ # Now calculate path; take care to avoid doubling-up slashes. ++ func_stripname '' '/' "$func_relative_path_result" ++ func_relative_path_result=$func_stripname_result ++ func_stripname '/' '/' "$func_relative_path_tcancelled" ++ if test -n "$func_stripname_result"; then ++ func_append func_relative_path_result "/$func_stripname_result" ++ fi ++ ++ # Normalisation. If bindir is libdir, return '.' else relative path. ++ if test -n "$func_relative_path_result"; then ++ func_stripname './' '' "$func_relative_path_result" ++ func_relative_path_result=$func_stripname_result ++ fi ++ ++ test -n "$func_relative_path_result" || func_relative_path_result=. ++ + : + } + +-# func_fatal_error arg... +-# Echo program name prefixed message to standard error, and exit. +-func_fatal_error () +-{ +- func_error ${1+"$@"} +- exit $EXIT_FAILURE +-} +- +-# func_fatal_help arg... +-# Echo program name prefixed message to standard error, followed by +-# a help hint, and exit. +-func_fatal_help () +-{ +- func_error ${1+"$@"} +- func_fatal_error "$help" +-} +-help="Try \`$progname --help' for more information." ## default +- +- +-# func_grep expression filename +-# Check whether EXPRESSION matches any line of FILENAME, without output. +-func_grep () +-{ +- $GREP "$1" "$2" >/dev/null 2>&1 +-} +- +- +-# func_mkdir_p directory-path +-# Make sure the entire path to DIRECTORY-PATH is available. +-func_mkdir_p () +-{ +- my_directory_path="$1" +- my_dir_list= +- +- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then +- +- # Protect directory names starting with `-' +- case $my_directory_path in +- -*) my_directory_path="./$my_directory_path" ;; ++ ++# func_quote_for_eval ARG... ++# -------------------------- ++# Aesthetically quote ARGs to be evaled later. ++# This function returns two values: ++# i) func_quote_for_eval_result ++# double-quoted, suitable for a subsequent eval ++# ii) func_quote_for_eval_unquoted_result ++# has all characters that are still active within double ++# quotes backslashified. ++func_quote_for_eval () ++{ ++ $debug_cmd ++ ++ func_quote_for_eval_unquoted_result= ++ func_quote_for_eval_result= ++ while test 0 -lt $#; do ++ case $1 in ++ *[\\\`\"\$]*) ++ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; ++ *) ++ _G_unquoted_arg=$1 ;; + esac +- +- # While some portion of DIR does not yet exist... +- while test ! -d "$my_directory_path"; do +- # ...make a list in topmost first order. Use a colon delimited +- # list incase some portion of path contains whitespace. +- my_dir_list="$my_directory_path:$my_dir_list" +- +- # If the last portion added has no slash in it, the list is done +- case $my_directory_path in */*) ;; *) break ;; esac +- +- # ...otherwise throw away the child directory and loop +- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` +- done +- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` +- +- save_mkdir_p_IFS="$IFS"; IFS=':' +- for my_dir in $my_dir_list; do +- IFS="$save_mkdir_p_IFS" +- # mkdir can fail with a `File exist' error if two processes +- # try to create one of the directories concurrently. Don't +- # stop in that case! +- $MKDIR "$my_dir" 2>/dev/null || : +- done +- IFS="$save_mkdir_p_IFS" +- +- # Bail out if we (or some other process) failed to create a directory. +- test -d "$my_directory_path" || \ +- func_fatal_error "Failed to create \`$1'" +- fi +-} +- +- +-# func_mktempdir [string] +-# Make a temporary directory that won't clash with other running +-# libtool processes, and avoids race conditions if possible. If +-# given, STRING is the basename for that directory. +-func_mktempdir () +-{ +- my_template="${TMPDIR-/tmp}/${1-$progname}" +- +- if test "$opt_dry_run" = ":"; then +- # Return a directory name, but don't create it in dry-run mode +- my_tmpdir="${my_template}-$$" +- else +- +- # If mktemp works, use that first and foremost +- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` +- +- if test ! -d "$my_tmpdir"; then +- # Failing that, at least try and use $RANDOM to avoid a race +- my_tmpdir="${my_template}-${RANDOM-0}$$" +- +- save_mktempdir_umask=`umask` +- umask 0077 +- $MKDIR "$my_tmpdir" +- umask $save_mktempdir_umask ++ if test -n "$func_quote_for_eval_unquoted_result"; then ++ func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" ++ else ++ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + +- # If we're not in dry-run mode, bomb out on failure +- test -d "$my_tmpdir" || \ +- func_fatal_error "cannot create temporary directory \`$my_tmpdir'" +- fi +- +- $ECHO "$my_tmpdir" +-} +- +- +-# func_quote_for_eval arg +-# Aesthetically quote ARG to be evaled later. +-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT +-# is double-quoted, suitable for a subsequent eval, whereas +-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters +-# which are still active within double quotes backslashified. +-func_quote_for_eval () +-{ +- case $1 in +- *[\\\`\"\$]*) +- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; +- *) +- func_quote_for_eval_unquoted_result="$1" ;; +- esac +- +- case $func_quote_for_eval_unquoted_result in +- # Double-quote args containing shell metacharacters to delay +- # word splitting, command substitution and and variable +- # expansion for a subsequent eval. +- # Many Bourne shells cannot handle close brackets correctly +- # in scan sets, so we specify it separately. +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" +- ;; +- *) +- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" +- esac +-} +- +- +-# func_quote_for_expand arg ++ case $_G_unquoted_arg in ++ # Double-quote args containing shell metacharacters to delay ++ # word splitting, command substitution and variable expansion ++ # for a subsequent eval. ++ # Many Bourne shells cannot handle close brackets correctly ++ # in scan sets, so we specify it separately. ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ _G_quoted_arg=\"$_G_unquoted_arg\" ++ ;; ++ *) ++ _G_quoted_arg=$_G_unquoted_arg ++ ;; ++ esac ++ ++ if test -n "$func_quote_for_eval_result"; then ++ func_append func_quote_for_eval_result " $_G_quoted_arg" ++ else ++ func_append func_quote_for_eval_result "$_G_quoted_arg" ++ fi ++ shift ++ done ++} ++ ++ ++# func_quote_for_expand ARG ++# ------------------------- + # Aesthetically quote ARG to be evaled later; same as above, + # but do not quote variable references. + func_quote_for_expand () + { ++ $debug_cmd ++ + case $1 in + *[\\\`\"]*) +- my_arg=`$ECHO "$1" | $SED \ +- -e "$double_quote_subst" -e "$sed_double_backslash"` ;; ++ _G_arg=`$ECHO "$1" | $SED \ ++ -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) +- my_arg="$1" ;; ++ _G_arg=$1 ;; + esac + +- case $my_arg in ++ case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- my_arg="\"$my_arg\"" ++ _G_arg=\"$_G_arg\" + ;; + esac + +- func_quote_for_expand_result="$my_arg" +-} +- +- +-# func_show_eval cmd [fail_exp] +-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is ++ func_quote_for_expand_result=$_G_arg ++} ++ ++ ++# func_stripname PREFIX SUFFIX NAME ++# --------------------------------- ++# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++if test yes = "$_G_HAVE_XSI_OPS"; then ++ eval 'func_stripname () ++ { ++ $debug_cmd ++ ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary variable first. ++ func_stripname_result=$3 ++ func_stripname_result=${func_stripname_result#"$1"} ++ func_stripname_result=${func_stripname_result%"$2"} ++ }' ++else ++ func_stripname () ++ { ++ $debug_cmd ++ ++ case $2 in ++ .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; ++ *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; ++ esac ++ } ++fi ++ ++ ++# func_show_eval CMD [FAIL_EXP] ++# ----------------------------- ++# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is + # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP + # is given, then evaluate it. + func_show_eval () + { +- my_cmd="$1" +- my_fail_exp="${2-:}" +- +- ${opt_silent-false} || { +- func_quote_for_expand "$my_cmd" +- eval "func_echo $func_quote_for_expand_result" ++ $debug_cmd ++ ++ _G_cmd=$1 ++ _G_fail_exp=${2-':'} ++ ++ func_quote_for_expand "$_G_cmd" ++ eval "func_notquiet $func_quote_for_expand_result" ++ ++ $opt_dry_run || { ++ eval "$_G_cmd" ++ _G_status=$? ++ if test 0 -ne "$_G_status"; then ++ eval "(exit $_G_status); $_G_fail_exp" ++ fi + } +- +- if ${opt_dry_run-false}; then :; else +- eval "$my_cmd" +- my_status=$? +- if test "$my_status" -eq 0; then :; else +- eval "(exit $my_status); $my_fail_exp" +- fi +- fi +-} +- +- +-# func_show_eval_locale cmd [fail_exp] +-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is ++} ++ ++ ++# func_show_eval_locale CMD [FAIL_EXP] ++# ------------------------------------ ++# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is + # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP + # is given, then evaluate it. Use the saved locale for evaluation. + func_show_eval_locale () + { +- my_cmd="$1" +- my_fail_exp="${2-:}" +- +- ${opt_silent-false} || { +- func_quote_for_expand "$my_cmd" ++ $debug_cmd ++ ++ _G_cmd=$1 ++ _G_fail_exp=${2-':'} ++ ++ $opt_quiet || { ++ func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + +- if ${opt_dry_run-false}; then :; else +- eval "$lt_user_locale +- $my_cmd" +- my_status=$? +- eval "$lt_safe_locale" +- if test "$my_status" -eq 0; then :; else +- eval "(exit $my_status); $my_fail_exp" ++ $opt_dry_run || { ++ eval "$_G_user_locale ++ $_G_cmd" ++ _G_status=$? ++ eval "$_G_safe_locale" ++ if test 0 -ne "$_G_status"; then ++ eval "(exit $_G_status); $_G_fail_exp" + fi +- fi +-} ++ } ++} ++ + + # func_tr_sh ++# ---------- + # Turn $1 into a string suitable for a shell variable name. + # Result is stored in $func_tr_sh_result. All characters + # not in the set a-zA-Z0-9_ are replaced with '_'. Further, + # if $1 begins with a digit, a '_' is prepended as well. + func_tr_sh () + { +- case $1 in +- [0-9]* | *[!a-zA-Z0-9_]*) +- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` +- ;; +- * ) +- func_tr_sh_result=$1 +- ;; +- esac +-} +- +- +-# func_version +-# Echo version message to standard output and exit. +-func_version () +-{ +- $opt_debug +- +- $SED -n '/(C)/!b go +- :more +- /\./!{ +- N +- s/\n# / / +- b more +- } +- :go +- /^# '$PROGRAM' (GNU /,/# warranty; / { +- s/^# // +- s/^# *$// +- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ +- p +- }' < "$progpath" +- exit $? +-} +- +-# func_usage +-# Echo short help message to standard output and exit. +-func_usage () +-{ +- $opt_debug +- +- $SED -n '/^# Usage:/,/^# *.*--help/ { +- s/^# // +- s/^# *$// +- s/\$progname/'$progname'/ +- p +- }' < "$progpath" +- echo +- $ECHO "run \`$progname --help | more' for full usage" +- exit $? +-} +- +-# func_help [NOEXIT] +-# Echo long help message to standard output and exit, +-# unless 'noexit' is passed as argument. ++ $debug_cmd ++ ++ case $1 in ++ [0-9]* | *[!a-zA-Z0-9_]*) ++ func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` ++ ;; ++ * ) ++ func_tr_sh_result=$1 ++ ;; ++ esac ++} ++ ++ ++# func_verbose ARG... ++# ------------------- ++# Echo program name prefixed message in verbose mode only. ++func_verbose () ++{ ++ $debug_cmd ++ ++ $opt_verbose && func_echo "$*" ++ ++ : ++} ++ ++ ++# func_warn_and_continue ARG... ++# ----------------------------- ++# Echo program name prefixed warning message to standard error. ++func_warn_and_continue () ++{ ++ $debug_cmd ++ ++ $require_term_colors ++ ++ func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 ++} ++ ++ ++# func_warning CATEGORY ARG... ++# ---------------------------- ++# Echo program name prefixed warning message to standard error. Warning ++# messages can be filtered according to CATEGORY, where this function ++# elides messages where CATEGORY is not listed in the global variable ++# 'opt_warning_types'. ++func_warning () ++{ ++ $debug_cmd ++ ++ # CATEGORY must be in the warning_categories list! ++ case " $warning_categories " in ++ *" $1 "*) ;; ++ *) func_internal_error "invalid warning category '$1'" ;; ++ esac ++ ++ _G_category=$1 ++ shift ++ ++ case " $opt_warning_types " in ++ *" $_G_category "*) $warning_func ${1+"$@"} ;; ++ esac ++} ++ ++ ++# func_sort_ver VER1 VER2 ++# ----------------------- ++# 'sort -V' is not generally available. ++# Note this deviates from the version comparison in automake ++# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a ++# but this should suffice as we won't be specifying old ++# version formats or redundant trailing .0 in bootstrap.conf. ++# If we did want full compatibility then we should probably ++# use m4_version_compare from autoconf. ++func_sort_ver () ++{ ++ $debug_cmd ++ ++ ver1=$1 ++ ver2=$2 ++ ++ # Split on '.' and compare each component. ++ i=1 ++ while :; do ++ p1=`echo "$ver1" |cut -d. -f$i` ++ p2=`echo "$ver2" |cut -d. -f$i` ++ if test ! "$p1"; then ++ echo "$1 $2" ++ break ++ elif test ! "$p2"; then ++ echo "$2 $1" ++ break ++ elif test ! "$p1" = "$p2"; then ++ if test "$p1" -gt "$p2" 2>/dev/null; then # numeric comparison ++ echo "$2 $1" ++ elif test "$p2" -gt "$p1" 2>/dev/null; then # numeric comparison ++ echo "$1 $2" ++ else # numeric, then lexicographic comparison ++ lp=`printf "$p1\n$p2\n" |sort -n |tail -n1` ++ if test "$lp" = "$p2"; then ++ echo "$1 $2" ++ else ++ echo "$2 $1" ++ fi ++ fi ++ break ++ fi ++ i=`expr $i + 1` ++ done ++} ++ ++ ++# Local variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" ++# time-stamp-time-zone: "UTC" ++# End: ++#! /bin/sh ++ ++# Set a version string for this script. ++scriptversion=2012-10-21.11; # UTC ++ ++# A portable, pluggable option parser for Bourne shell. ++# Written by Gary V. Vaughan, 2010 ++ ++# Copyright (C) 2010-2013 Free Software Foundation, Inc. ++# This is free software; see the source for copying conditions. There is NO ++# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++# This program 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 of the License, or ++# (at your option) any later version. ++ ++# This program 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 this program. If not, see . ++ ++# Please report bugs or propose patches to gary@gnu.org. ++ ++ ++## ------ ## ++## Usage. ## ++## ------ ## ++ ++# This file is a library for parsing options in your shell scripts along ++# with assorted other useful supporting features that you can make use ++# of too. ++# ++# For the simplest scripts you might need only: ++# ++# #!/bin/sh ++# . relative/path/to/funclib.sh ++# . relative/path/to/options-parser ++# scriptversion=1.0 ++# func_options ${1+"$@"} ++# eval set dummy "$func_options_result"; shift ++# ...rest of your script... ++# ++# In order for the '--version' option to work, you will need to have a ++# suitably formatted comment like the one at the top of this file ++# starting with '# Written by ' and ending with '# warranty; '. ++# ++# For '-h' and '--help' to work, you will also need a one line ++# description of your script's purpose in a comment directly above the ++# '# Written by ' line, like the one at the top of this file. ++# ++# The default options also support '--debug', which will turn on shell ++# execution tracing (see the comment above debug_cmd below for another ++# use), and '--verbose' and the func_verbose function to allow your script ++# to display verbose messages only when your user has specified ++# '--verbose'. ++# ++# After sourcing this file, you can plug processing for additional ++# options by amending the variables from the 'Configuration' section ++# below, and following the instructions in the 'Option parsing' ++# section further down. ++ ++## -------------- ## ++## Configuration. ## ++## -------------- ## ++ ++# You should override these variables in your script after sourcing this ++# file so that they reflect the customisations you have added to the ++# option parser. ++ ++# The usage line for option parsing errors and the start of '-h' and ++# '--help' output messages. You can embed shell variables for delayed ++# expansion at the time the message is displayed, but you will need to ++# quote other shell meta-characters carefully to prevent them being ++# expanded when the contents are evaled. ++usage='$progpath [OPTION]...' ++ ++# Short help message in response to '-h' and '--help'. Add to this or ++# override it after sourcing this library to reflect the full set of ++# options your script accepts. ++usage_message="\ ++ --debug enable verbose shell tracing ++ -W, --warnings=CATEGORY ++ report the warnings falling in CATEGORY [all] ++ -v, --verbose verbosely report processing ++ --version print version information and exit ++ -h, --help print short or long help message and exit ++" ++ ++# Additional text appended to 'usage_message' in response to '--help'. ++long_help_message=" ++Warning categories include: ++ 'all' show all warnings ++ 'none' turn off all the warnings ++ 'error' warnings are treated as fatal errors" ++ ++# Help message printed before fatal option parsing errors. ++fatal_help="Try '\$progname --help' for more information." ++ ++ ++ ++## ------------------------- ## ++## Hook function management. ## ++## ------------------------- ## ++ ++# This section contains functions for adding, removing, and running hooks ++# to the main code. A hook is just a named list of of function, that can ++# be run in order later on. ++ ++# func_hookable FUNC_NAME ++# ----------------------- ++# Declare that FUNC_NAME will run hooks added with ++# 'func_add_hook FUNC_NAME ...'. ++func_hookable () ++{ ++ $debug_cmd ++ ++ func_append hookable_fns " $1" ++} ++ ++ ++# func_add_hook FUNC_NAME HOOK_FUNC ++# --------------------------------- ++# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must ++# first have been declared "hookable" by a call to 'func_hookable'. ++func_add_hook () ++{ ++ $debug_cmd ++ ++ case " $hookable_fns " in ++ *" $1 "*) ;; ++ *) func_fatal_error "'$1' does not accept hook functions." ;; ++ esac ++ ++ eval func_append ${1}_hooks '" $2"' ++} ++ ++ ++# func_remove_hook FUNC_NAME HOOK_FUNC ++# ------------------------------------ ++# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. ++func_remove_hook () ++{ ++ $debug_cmd ++ ++ eval ${1}_hooks='`$bs_echo "\$'$1'_hooks" |$SED "s| '$2'||"`' ++} ++ ++ ++# func_run_hooks FUNC_NAME [ARG]... ++# --------------------------------- ++# Run all hook functions registered to FUNC_NAME. ++# It is assumed that the list of hook functions contains nothing more ++# than a whitespace-delimited list of legal shell function names, and ++# no effort is wasted trying to catch shell meta-characters or preserve ++# whitespace. ++func_run_hooks () ++{ ++ $debug_cmd ++ ++ case " $hookable_fns " in ++ *" $1 "*) ;; ++ *) func_fatal_error "'$1' does not support hook funcions.n" ;; ++ esac ++ ++ eval _G_hook_fns=\$$1_hooks; shift ++ ++ for _G_hook in $_G_hook_fns; do ++ eval $_G_hook '"$@"' ++ ++ # store returned options list back into positional ++ # parameters for next 'cmd' execution. ++ eval _G_hook_result=\$${_G_hook}_result ++ eval set dummy "$_G_hook_result"; shift ++ done ++ ++ func_quote_for_eval ${1+"$@"} ++ func_run_hooks_result=$func_quote_for_eval_result ++} ++ ++ ++ ++## --------------- ## ++## Option parsing. ## ++## --------------- ## ++ ++# In order to add your own option parsing hooks, you must accept the ++# full positional parameter list in your hook function, remove any ++# options that you action, and then pass back the remaining unprocessed ++# options in '_result', escaped suitably for ++# 'eval'. Like this: ++# ++# my_options_prep () ++# { ++# $debug_cmd ++# ++# # Extend the existing usage message. ++# usage_message=$usage_message' ++# -s, --silent don'\''t print informational messages ++# ' ++# ++# func_quote_for_eval ${1+"$@"} ++# my_options_prep_result=$func_quote_for_eval_result ++# } ++# func_add_hook func_options_prep my_options_prep ++# ++# ++# my_silent_option () ++# { ++# $debug_cmd ++# ++# # Note that for efficiency, we parse as many options as we can ++# # recognise in a loop before passing the remainder back to the ++# # caller on the first unrecognised argument we encounter. ++# while test $# -gt 0; do ++# opt=$1; shift ++# case $opt in ++# --silent|-s) opt_silent=: ;; ++# # Separate non-argument short options: ++# -s*) func_split_short_opt "$_G_opt" ++# set dummy "$func_split_short_opt_name" \ ++# "-$func_split_short_opt_arg" ${1+"$@"} ++# shift ++# ;; ++# *) set dummy "$_G_opt" "$*"; shift; break ;; ++# esac ++# done ++# ++# func_quote_for_eval ${1+"$@"} ++# my_silent_option_result=$func_quote_for_eval_result ++# } ++# func_add_hook func_parse_options my_silent_option ++# ++# ++# my_option_validation () ++# { ++# $debug_cmd ++# ++# $opt_silent && $opt_verbose && func_fatal_help "\ ++# '--silent' and '--verbose' options are mutually exclusive." ++# ++# func_quote_for_eval ${1+"$@"} ++# my_option_validation_result=$func_quote_for_eval_result ++# } ++# func_add_hook func_validate_options my_option_validation ++# ++# You'll alse need to manually amend $usage_message to reflect the extra ++# options you parse. It's preferable to append if you can, so that ++# multiple option parsing hooks can be added safely. ++ ++ ++# func_options [ARG]... ++# --------------------- ++# All the functions called inside func_options are hookable. See the ++# individual implementations for details. ++func_hookable func_options ++func_options () ++{ ++ $debug_cmd ++ ++ func_options_prep ${1+"$@"} ++ eval func_parse_options \ ++ ${func_options_prep_result+"$func_options_prep_result"} ++ eval func_validate_options \ ++ ${func_parse_options_result+"$func_parse_options_result"} ++ ++ eval func_run_hooks func_options \ ++ ${func_validate_options_result+"$func_validate_options_result"} ++ ++ # save modified positional parameters for caller ++ func_options_result=$func_run_hooks_result ++} ++ ++ ++# func_options_prep [ARG]... ++# -------------------------- ++# All initialisations required before starting the option parse loop. ++# Note that when calling hook functions, we pass through the list of ++# positional parameters. If a hook function modifies that list, and ++# needs to propogate that back to rest of this script, then the complete ++# modified list must be put in 'func_run_hooks_result' before ++# returning. ++func_hookable func_options_prep ++func_options_prep () ++{ ++ $debug_cmd ++ ++ # Option defaults: ++ opt_verbose=false ++ opt_warning_types= ++ ++ func_run_hooks func_options_prep ${1+"$@"} ++ ++ # save modified positional parameters for caller ++ func_options_prep_result=$func_run_hooks_result ++} ++ ++ ++# func_parse_options [ARG]... ++# --------------------------- ++# The main option parsing loop. ++func_hookable func_parse_options ++func_parse_options () ++{ ++ $debug_cmd ++ ++ func_parse_options_result= ++ ++ # this just eases exit handling ++ while test $# -gt 0; do ++ # Defer to hook functions for initial option parsing, so they ++ # get priority in the event of reusing an option name. ++ func_run_hooks func_parse_options ${1+"$@"} ++ ++ # Adjust func_parse_options positional parameters to match ++ eval set dummy "$func_run_hooks_result"; shift ++ ++ # Break out of the loop if we already parsed every option. ++ test $# -gt 0 || break ++ ++ _G_opt=$1 ++ shift ++ case $_G_opt in ++ --debug|-x) debug_cmd='set -x' ++ func_echo "enabling shell trace mode" ++ $debug_cmd ++ ;; ++ ++ --no-warnings|--no-warning|--no-warn) ++ set dummy --warnings none ${1+"$@"} ++ shift ++ ;; ++ ++ --warnings|--warning|-W) ++ test $# = 0 && func_missing_arg $_G_opt && break ++ case " $warning_categories $1" in ++ *" $1 "*) ++ # trailing space prevents matching last $1 above ++ func_append_uniq opt_warning_types " $1" ++ ;; ++ *all) ++ opt_warning_types=$warning_categories ++ ;; ++ *none) ++ opt_warning_types=none ++ warning_func=: ++ ;; ++ *error) ++ opt_warning_types=$warning_categories ++ warning_func=func_fatal_error ++ ;; ++ *) ++ func_fatal_error \ ++ "unsupported warning category: '$1'" ++ ;; ++ esac ++ shift ++ ;; ++ ++ --verbose|-v) opt_verbose=: ;; ++ --version) func_version ;; ++ -\?|-h) func_usage ;; ++ --help) func_help ;; ++ ++ # Separate optargs to long options (plugins may need this): ++ --*=*) func_split_equals "$_G_opt" ++ set dummy "$func_split_equals_lhs" \ ++ "$func_split_equals_rhs" ${1+"$@"} ++ shift ++ ;; ++ ++ # Separate optargs to short options: ++ -W*) ++ func_split_short_opt "$_G_opt" ++ set dummy "$func_split_short_opt_name" \ ++ "$func_split_short_opt_arg" ${1+"$@"} ++ shift ++ ;; ++ ++ # Separate non-argument short options: ++ -\?*|-h*|-v*|-x*) ++ func_split_short_opt "$_G_opt" ++ set dummy "$func_split_short_opt_name" \ ++ "-$func_split_short_opt_arg" ${1+"$@"} ++ shift ++ ;; ++ ++ --) break ;; ++ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; ++ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; ++ esac ++ done ++ ++ # save modified positional parameters for caller ++ func_quote_for_eval ${1+"$@"} ++ func_parse_options_result=$func_quote_for_eval_result ++} ++ ++ ++# func_validate_options [ARG]... ++# ------------------------------ ++# Perform any sanity checks on option settings and/or unconsumed ++# arguments. ++func_hookable func_validate_options ++func_validate_options () ++{ ++ $debug_cmd ++ ++ # Display all warnings if -W was not given. ++ test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" ++ ++ func_run_hooks func_validate_options ${1+"$@"} ++ ++ # Bail if the options were screwed! ++ $exit_cmd $EXIT_FAILURE ++ ++ # save modified positional parameters for caller ++ func_validate_options_result=$func_run_hooks_result ++} ++ ++ ++ ++## ------------------## ++## Helper functions. ## ++## ------------------## ++ ++# This section contains the helper functions used by the rest of the ++# hookable option parser framework in ascii-betical order. ++ ++ ++# func_fatal_help ARG... ++# ---------------------- ++# Echo program name prefixed message to standard error, followed by ++# a help hint, and exit. ++func_fatal_help () ++{ ++ $debug_cmd ++ ++ eval \$bs_echo \""Usage: $usage"\" ++ eval \$bs_echo \""$fatal_help"\" ++ func_error ${1+"$@"} ++ exit $EXIT_FAILURE ++} ++ ++ ++# func_help ++# --------- ++# Echo long help message to standard output and exit. + func_help () + { +- $opt_debug +- +- $SED -n '/^# Usage:/,/# Report bugs to/ { +- :print +- s/^# // +- s/^# *$// +- s*\$progname*'$progname'* +- s*\$host*'"$host"'* +- s*\$SHELL*'"$SHELL"'* +- s*\$LTCC*'"$LTCC"'* +- s*\$LTCFLAGS*'"$LTCFLAGS"'* +- s*\$LD*'"$LD"'* +- s/\$with_gnu_ld/'"$with_gnu_ld"'/ +- s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ +- s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ +- p +- d +- } +- /^# .* home page:/b print +- /^# General help using/b print +- ' < "$progpath" +- ret=$? +- if test -z "$1"; then +- exit $ret +- fi +-} +- +-# func_missing_arg argname ++ $debug_cmd ++ ++ func_usage_message ++ $bs_echo "$long_help_message" ++ exit 0 ++} ++ ++ ++# func_missing_arg ARGNAME ++# ------------------------ + # Echo program name prefixed message to standard error and set global + # exit_cmd. + func_missing_arg () + { +- $opt_debug +- +- func_error "missing argument for $1." ++ $debug_cmd ++ ++ func_error "Missing argument for '$1'." + exit_cmd=exit + } + + +-# func_split_short_opt shortopt ++# func_split_equals STRING ++# ------------------------ ++# Set func_split_equals_lhs and func_split_equals_rhs shell variables after ++# splitting STRING at the '=' sign. ++test -z "$_G_HAVE_XSI_OPS" \ ++ && (eval 'x=a/b/c; ++ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ ++ && _G_HAVE_XSI_OPS=yes ++ ++if test yes = "$_G_HAVE_XSI_OPS" ++then ++ # This is an XSI compatible shell, allowing a faster implementation... ++ eval 'func_split_equals () ++ { ++ $debug_cmd ++ ++ func_split_equals_lhs=${1%%=*} ++ func_split_equals_rhs=${1#*=} ++ test "x$func_split_equals_lhs" = "x$1" \ ++ && func_split_equals_rhs= ++ }' ++else ++ # ...otherwise fall back to using expr, which is often a shell builtin. ++ func_split_equals () ++ { ++ $debug_cmd ++ ++ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` ++ func_split_equals_rhs= ++ test "x$func_split_equals_lhs" = "x$1" \ ++ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` ++ } ++fi #func_split_equals ++ ++ ++# func_split_short_opt SHORTOPT ++# ----------------------------- + # Set func_split_short_opt_name and func_split_short_opt_arg shell + # variables after splitting SHORTOPT after the 2nd character. +-func_split_short_opt () +-{ +- my_sed_short_opt='1s/^\(..\).*$/\1/;q' +- my_sed_short_rest='1s/^..\(.*\)$/\1/;q' +- +- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` +- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +-} # func_split_short_opt may be replaced by extended shell implementation +- +- +-# func_split_long_opt longopt +-# Set func_split_long_opt_name and func_split_long_opt_arg shell +-# variables after splitting LONGOPT at the `=' sign. +-func_split_long_opt () +-{ +- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' +- my_sed_long_arg='1s/^--[^=]*=//' +- +- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` +- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +-} # func_split_long_opt may be replaced by extended shell implementation +- +-exit_cmd=: +- +- +- +- +- +-magic="%%%MAGIC variable%%%" +-magic_exe="%%%MAGIC EXE variable%%%" +- +-# Global variables. +-nonopt= +-preserve_args= +-lo2o="s/\\.lo\$/.${objext}/" +-o2lo="s/\\.${objext}\$/.lo/" +-extracted_archives= +-extracted_serial=0 +- +-# If this variable is set in any of the actions, the command in it +-# will be execed at the end. This prevents here-documents from being +-# left over by shells. +-exec_cmd= +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "${1}=\$${1}\${2}" +-} # func_append may be replaced by extended shell implementation +- +-# func_append_quoted var value +-# Quote VALUE and append to the end of shell variable VAR, separated +-# by a space. +-func_append_quoted () +-{ +- func_quote_for_eval "${2}" +- eval "${1}=\$${1}\\ \$func_quote_for_eval_result" +-} # func_append_quoted may be replaced by extended shell implementation +- +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "${@}"` +-} # func_arith may be replaced by extended shell implementation +- +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` +-} # func_len may be replaced by extended shell implementation +- +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} # func_lo2o may be replaced by extended shell implementation +- +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +-} # func_xform may be replaced by extended shell implementation +- +- +-# func_fatal_configuration arg... ++if test yes = "$_G_HAVE_XSI_OPS" ++then ++ # This is an XSI compatible shell, allowing a faster implementation... ++ eval 'func_split_short_opt () ++ { ++ $debug_cmd ++ ++ func_split_short_opt_arg=${1#??} ++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"} ++ }' ++else ++ # ...otherwise fall back to using expr, which is often a shell builtin. ++ func_split_short_opt () ++ { ++ $debug_cmd ++ ++ func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` ++ func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` ++ } ++fi #func_split_short_opt ++ ++ ++# func_usage ++# ---------- ++# Echo short help message to standard output and exit. ++func_usage () ++{ ++ $debug_cmd ++ ++ func_usage_message ++ $bs_echo "Run '$progname --help |${PAGER-more}' for full usage" ++ exit 0 ++} ++ ++ ++# func_usage_message ++# ------------------ ++# Echo short help message to standard output. ++func_usage_message () ++{ ++ $debug_cmd ++ ++ eval \$bs_echo \""Usage: $usage"\" ++ echo ++ $SED -n 's|^# || ++ /^Written by/{ ++ x;p;x ++ } ++ h ++ /^Written by/q' < "$progpath" ++ echo ++ eval \$bs_echo \""$usage_message"\" ++} ++ ++ ++# func_version ++# ------------ ++# Echo version message to standard output and exit. ++func_version () ++{ ++ $debug_cmd ++ ++ printf '%s\n' "$progname $scriptversion" ++ $SED -n '/^##/q ++ /(C)/!b go ++ :more ++ /\./!{ ++ N ++ s|\n# | | ++ b more ++ } ++ :go ++ /^# Written by /,/# warranty; / { ++ s|^# || ++ s|^# *$|| ++ s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| ++ p ++ } ++ /^# Written by / { ++ s|^# || ++ p ++ } ++ /^warranty; /q' < "$progpath" ++ ++ exit $? ++} ++ ++ ++# Local variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" ++# time-stamp-time-zone: "UTC" ++# End: ++ ++# Set a version string. ++scriptversion='(GNU libtool) 2.4.2.418' ++ ++ ++# func_echo ARG... ++# ---------------- ++# Libtool also displays the current mode in messages, so override ++# funclib.sh func_echo with this custom definition. ++func_echo () ++{ ++ $debug_cmd ++ ++ _G_message=$* ++ ++ func_echo_IFS=$IFS ++ IFS=$nl ++ for _G_line in $_G_message; do ++ IFS=$func_echo_IFS ++ $bs_echo "$progname${opt_mode+: $opt_mode}: $_G_line" ++ done ++ IFS=$func_echo_IFS ++} ++ ++ ++# func_warning ARG... ++# ------------------- ++# Libtool warnings are not categorized, so override funclib.sh ++# func_warning with this simpler definition. ++func_warning () ++{ ++ $debug_cmd ++ ++ $warning_func ${1+"$@"} ++} ++ ++ ++## ---------------- ## ++## Options parsing. ## ++## ---------------- ## ++ ++# Hook in the functions to make sure our own options are parsed during ++# the option parsing loop. ++ ++usage='$progpath [OPTION]... [MODE-ARG]...' ++ ++# Short help message in response to '-h'. ++usage_message="Options: ++ --config show all configuration variables ++ --debug enable verbose shell tracing ++ -n, --dry-run display commands without modifying any files ++ --features display basic configuration information and exit ++ --mode=MODE use operation mode MODE ++ --no-warnings equivalent to '-Wnone' ++ --preserve-dup-deps don't remove duplicate dependency libraries ++ --quiet, --silent don't print informational messages ++ --tag=TAG use configuration variables from tag TAG ++ -v, --verbose print more informational messages than default ++ --version print version information ++ -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] ++ -h, --help, --help-all print short, long, or detailed help message ++" ++ ++# Additional text appended to 'usage_message' in response to '--help'. ++long_help_message=$long_help_message" ++ ++MODE must be one of the following: ++ ++ clean remove files from the build directory ++ compile compile a source file into a libtool object ++ execute automatically set library path, then run a program ++ finish complete the installation of libtool libraries ++ install install libraries or executables ++ link create a library or an executable ++ uninstall remove libraries from an installed directory ++ ++MODE-ARGS vary depending on the MODE. When passed as first option, ++'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. ++Try '$progname --help --mode=MODE' for a more detailed description of MODE. ++ ++When reporting a bug, please describe a test case to reproduce it and ++include the following information: ++ ++ host-triplet: $host ++ shell: $SHELL ++ compiler: $LTCC ++ compiler flags: $LTCFLAGS ++ linker: $LD (gnu? $with_gnu_ld) ++ version: $progname (GNU libtool) 2.4.2.418 ++ automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` ++ autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` ++ ++Report bugs to . ++GNU libtool home page: . ++General help using GNU software: ." ++ ++ ++# func_lo2o OBJECT-NAME ++# --------------------- ++# Transform OBJECT-NAME from a '.lo' suffix to the platform specific ++# object suffix. ++ ++lo2o=s/\\.lo\$/.$objext/ ++o2lo=s/\\.$objext\$/.lo/ ++ ++if test yes = "$_G_HAVE_XSI_OPS"; then ++ eval 'func_lo2o () ++ { ++ case $1 in ++ *.lo) func_lo2o_result=${1%.lo}.$objext ;; ++ * ) func_lo2o_result=$1 ;; ++ esac ++ }' ++ ++ # func_xform LIBOBJ-OR-SOURCE ++ # --------------------------- ++ # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) ++ # suffix to a '.lo' libtool-object suffix. ++ eval 'func_xform () ++ { ++ func_xform_result=${1%.*}.lo ++ }' ++else ++ # ...otherwise fall back to using sed. ++ func_lo2o () ++ { ++ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` ++ } ++ ++ func_xform () ++ { ++ func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` ++ } ++fi ++ ++ ++# func_fatal_configuration ARG... ++# ------------------------------- + # Echo program name prefixed message to standard error, followed by + # a configuration failure hint, and exit. + func_fatal_configuration () + { +- func_error ${1+"$@"} +- func_error "See the $PACKAGE documentation for more information." +- func_fatal_error "Fatal configuration error." ++ func__fatal_error ${1+"$@"} \ ++ "See the $PACKAGE documentation for more information." \ ++ "Fatal configuration error." + } + + + # func_config ++# ----------- + # Display the configuration for all the tags in this script. + func_config () + { +@@ -915,17 +2048,19 @@ + exit $? + } + ++ + # func_features ++# ------------- + # Display the features supported by this script. + func_features () + { + echo "host: $host" +- if test "$build_libtool_libs" = yes; then ++ if test yes = "$build_libtool_libs"; then + echo "enable shared libraries" + else + echo "disable shared libraries" + fi +- if test "$build_old_libs" = yes; then ++ if test yes = "$build_old_libs"; then + echo "enable static libraries" + else + echo "disable static libraries" +@@ -934,289 +2069,295 @@ + exit $? + } + +-# func_enable_tag tagname ++ ++# func_enable_tag TAGNAME ++# ----------------------- + # Verify that TAGNAME is valid, and either flag an error and exit, or + # enable the TAGNAME tag. We also add TAGNAME to the global $taglist + # variable here. + func_enable_tag () + { +- # Global variable: +- tagname="$1" +- +- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" +- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" +- sed_extractcf="/$re_begincf/,/$re_endcf/p" +- +- # Validate tagname. +- case $tagname in +- *[!-_A-Za-z0-9,/]*) +- func_fatal_error "invalid tag name: $tagname" +- ;; +- esac +- +- # Don't test for the "default" C tag, as we know it's +- # there but not specially marked. +- case $tagname in +- CC) ;; ++ # Global variable: ++ tagname=$1 ++ ++ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" ++ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" ++ sed_extractcf=/$re_begincf/,/$re_endcf/p ++ ++ # Validate tagname. ++ case $tagname in ++ *[!-_A-Za-z0-9,/]*) ++ func_fatal_error "invalid tag name: $tagname" ++ ;; ++ esac ++ ++ # Don't test for the "default" C tag, as we know it's ++ # there but not specially marked. ++ case $tagname in ++ CC) ;; + *) +- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then +- taglist="$taglist $tagname" +- +- # Evaluate the configuration. Be careful to quote the path +- # and the sed script, to avoid splitting on whitespace, but +- # also don't use non-portable quotes within backquotes within +- # quotes we have to do it in 2 steps: +- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` +- eval "$extractedcf" +- else +- func_error "ignoring unknown tag $tagname" +- fi +- ;; +- esac +-} ++ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then ++ taglist="$taglist $tagname" ++ ++ # Evaluate the configuration. Be careful to quote the path ++ # and the sed script, to avoid splitting on whitespace, but ++ # also don't use non-portable quotes within backquotes within ++ # quotes we have to do it in 2 steps: ++ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` ++ eval "$extractedcf" ++ else ++ func_error "ignoring unknown tag $tagname" ++ fi ++ ;; ++ esac ++} ++ + + # func_check_version_match ++# ------------------------ + # Ensure that we are using m4 macros, and libtool script from the same + # release of libtool. + func_check_version_match () + { +- if test "$package_revision" != "$macro_revision"; then +- if test "$VERSION" != "$macro_version"; then +- if test -z "$macro_version"; then +- cat >&2 <<_LT_EOF ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF + $progname: Version mismatch error. This is $PACKAGE $VERSION, but the + $progname: definition of this LT_INIT comes from an older release. + $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION + $progname: and run autoconf again. + _LT_EOF +- else +- cat >&2 <<_LT_EOF ++ else ++ cat >&2 <<_LT_EOF + $progname: Version mismatch error. This is $PACKAGE $VERSION, but the + $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. + $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION + $progname: and run autoconf again. + _LT_EOF +- fi +- else +- cat >&2 <<_LT_EOF ++ fi ++ else ++ cat >&2 <<_LT_EOF + $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, + $progname: but the definition of this LT_INIT comes from revision $macro_revision. + $progname: You should recreate aclocal.m4 with macros from revision $package_revision + $progname: of $PACKAGE $VERSION and run autoconf again. + _LT_EOF ++ fi ++ ++ exit $EXIT_MISMATCH + fi +- +- exit $EXIT_MISMATCH +- fi +-} +- +- +-# Shorthand for --mode=foo, only valid as the first argument +-case $1 in +-clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +-compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +-execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +-finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +-install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +-link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +-esac +- +- +- +-# Option defaults: +-opt_debug=: +-opt_dry_run=false +-opt_config=false +-opt_preserve_dup_deps=false +-opt_features=false +-opt_finish=false +-opt_help=false +-opt_help_all=false +-opt_silent=: +-opt_warning=: +-opt_verbose=: +-opt_silent=false +-opt_verbose=false +- +- +-# Parse options once, thoroughly. This comes as soon as possible in the +-# script to make things like `--version' happen as quickly as we can. +-{ +- # this just eases exit handling +- while test $# -gt 0; do +- opt="$1" +- shift +- case $opt in +- --debug|-x) opt_debug='set -x' +- func_echo "enabling shell trace mode" +- $opt_debug +- ;; +- --dry-run|--dryrun|-n) +- opt_dry_run=: +- ;; +- --config) +- opt_config=: +-func_config +- ;; +- --dlopen|-dlopen) +- optarg="$1" +- opt_dlopen="${opt_dlopen+$opt_dlopen +-}$optarg" +- shift +- ;; +- --preserve-dup-deps) +- opt_preserve_dup_deps=: +- ;; +- --features) +- opt_features=: +-func_features +- ;; +- --finish) +- opt_finish=: +-set dummy --mode finish ${1+"$@"}; shift +- ;; +- --help) +- opt_help=: +- ;; +- --help-all) +- opt_help_all=: +-opt_help=': help-all' +- ;; +- --mode) +- test $# = 0 && func_missing_arg $opt && break +- optarg="$1" +- opt_mode="$optarg" +-case $optarg in +- # Valid mode arguments: +- clean|compile|execute|finish|install|link|relink|uninstall) ;; +- +- # Catch anything else as an error +- *) func_error "invalid argument for $opt" +- exit_cmd=exit +- break +- ;; +-esac +- shift +- ;; +- --no-silent|--no-quiet) +- opt_silent=false +-func_append preserve_args " $opt" +- ;; +- --no-warning|--no-warn) +- opt_warning=false +-func_append preserve_args " $opt" +- ;; +- --no-verbose) +- opt_verbose=false +-func_append preserve_args " $opt" +- ;; +- --silent|--quiet) +- opt_silent=: +-func_append preserve_args " $opt" +- opt_verbose=false +- ;; +- --verbose|-v) +- opt_verbose=: +-func_append preserve_args " $opt" +-opt_silent=false +- ;; +- --tag) +- test $# = 0 && func_missing_arg $opt && break +- optarg="$1" +- opt_tag="$optarg" +-func_append preserve_args " $opt $optarg" +-func_enable_tag "$optarg" +- shift +- ;; +- +- -\?|-h) func_usage ;; +- --help) func_help ;; +- --version) func_version ;; +- +- # Separate optargs to long options: +- --*=*) +- func_split_long_opt "$opt" +- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} +- shift +- ;; +- +- # Separate non-argument short options: +- -\?*|-h*|-n*|-v*) +- func_split_short_opt "$opt" +- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} +- shift +- ;; +- +- --) break ;; +- -*) func_fatal_help "unrecognized option \`$opt'" ;; +- *) set dummy "$opt" ${1+"$@"}; shift; break ;; ++} ++ ++ ++# libtool_options_prep [ARG]... ++# ----------------------------- ++# Preparation for options parsed by libtool. ++libtool_options_prep () ++{ ++ $debug_mode ++ ++ # Option defaults: ++ opt_config=false ++ opt_dlopen= ++ opt_dry_run=false ++ opt_help=false ++ opt_mode= ++ opt_preserve_dup_deps=false ++ opt_quiet=false ++ ++ nonopt= ++ preserve_args= ++ ++ # Shorthand for --mode=foo, only valid as the first argument ++ case $1 in ++ clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++ compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++ execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++ finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++ link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; + esac +- done +- +- # Validate options: +- +- # save first non-option argument +- if test "$#" -gt 0; then +- nonopt="$opt" +- shift +- fi +- +- # preserve --debug +- test "$opt_debug" = : || func_append preserve_args " --debug" +- +- case $host in +- *cygwin* | *mingw* | *pw32* | *cegcc*) +- # don't eliminate duplications in $postdeps and $predeps +- opt_duplicate_compiler_generated_deps=: +- ;; +- *) +- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps +- ;; +- esac +- +- $opt_help || { +- # Sanity checks first: +- func_check_version_match +- +- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then +- func_fatal_configuration "not configured to build any kind of library" ++ ++ # Pass back the list of options. ++ func_quote_for_eval ${1+"$@"} ++ libtool_options_prep_result=$func_quote_for_eval_result ++} ++func_add_hook func_options_prep libtool_options_prep ++ ++ ++# libtool_parse_options [ARG]... ++# --------------------------------- ++# Provide handling for libtool specific options. ++libtool_parse_options () ++{ ++ $debug_cmd ++ ++ # Perform our own loop to consume as many options as possible in ++ # each iteration. ++ while test $# -gt 0; do ++ _G_opt=$1 ++ shift ++ case $_G_opt in ++ --dry-run|--dryrun|-n) ++ opt_dry_run=: ++ ;; ++ ++ --config) func_config ;; ++ ++ --dlopen|-dlopen) ++ opt_dlopen="${opt_dlopen+$opt_dlopen ++}$1" ++ shift ++ ;; ++ ++ --preserve-dup-deps) ++ opt_preserve_dup_deps=: ;; ++ ++ --features) func_features ;; ++ ++ --finish) set dummy --mode finish ${1+"$@"}; shift ;; ++ ++ --help) opt_help=: ;; ++ ++ --help-all) opt_help=': help-all' ;; ++ ++ --mode) test $# = 0 && func_missing_arg $_G_opt && break ++ opt_mode=$1 ++ case $1 in ++ # Valid mode arguments: ++ clean|compile|execute|finish|install|link|relink|uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $_G_opt" ++ exit_cmd=exit ++ break ++ ;; ++ esac ++ shift ++ ;; ++ ++ --no-silent|--no-quiet) ++ opt_quiet=false ++ func_append preserve_args " $_G_opt" ++ ;; ++ ++ --no-warnings|--no-warning|--no-warn) ++ opt_warning=false ++ func_append preserve_args " $_G_opt" ++ ;; ++ ++ --no-verbose) ++ opt_verbose=false ++ func_append preserve_args " $_G_opt" ++ ;; ++ ++ --silent|--quiet) ++ opt_quiet=: ++ opt_verbose=false ++ func_append preserve_args " $_G_opt" ++ ;; ++ ++ --tag) test $# = 0 && func_missing_arg $_G_opt && break ++ opt_tag=$1 ++ func_append preserve_args " $_G_opt $1" ++ func_enable_tag "$1" ++ shift ++ ;; ++ ++ --verbose|-v) opt_quiet=false ++ opt_verbose=: ++ func_append preserve_args " $_G_opt" ++ ;; ++ ++ # An option not handled by this hook function: ++ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; ++ esac ++ done ++ ++ ++ # save modified positional parameters for caller ++ func_quote_for_eval ${1+"$@"} ++ libtool_parse_options_result=$func_quote_for_eval_result ++} ++func_add_hook func_parse_options libtool_parse_options ++ ++ ++ ++# libtool_validate_options [ARG]... ++# --------------------------------- ++# Perform any sanity checks on option settings and/or unconsumed ++# arguments. ++libtool_validate_options () ++{ ++ # save first non-option argument ++ if test 0 -lt $#; then ++ nonopt=$1 ++ shift + fi + +- # Darwin sucks +- eval std_shrext=\"$shrext_cmds\" +- +- # Only execute mode is allowed to have -dlopen flags. +- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then +- func_error "unrecognized option \`-dlopen'" +- $ECHO "$help" 1>&2 +- exit $EXIT_FAILURE +- fi +- +- # Change the help message to a mode-specific one. +- generic_help="$help" +- help="Try \`$progname --help --mode=$opt_mode' for more information." +- } +- +- +- # Bail if the options were screwed +- $exit_cmd $EXIT_FAILURE +-} +- ++ # preserve --debug ++ test : = "$debug_cmd" || func_append preserve_args " --debug" ++ ++ case $host in ++ *cygwin* | *mingw* | *pw32* | *cegcc*) ++ # don't eliminate duplications in $postdeps and $predeps ++ opt_duplicate_compiler_generated_deps=: ++ ;; ++ *) ++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps ++ ;; ++ esac ++ ++ $opt_help || { ++ # Sanity checks first: ++ func_check_version_match ++ ++ test yes != "$build_libtool_libs" \ ++ && test yes != "$build_old_libs" \ ++ && func_fatal_configuration "not configured to build any kind of library" ++ ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" ++ ++ # Only execute mode is allowed to have -dlopen flags. ++ if test -n "$opt_dlopen" && test execute != "$opt_mode"; then ++ func_error "unrecognized option '-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ ++ # Change the help message to a mode-specific one. ++ generic_help=$help ++ help="Try '$progname --help --mode=$opt_mode' for more information." ++ } ++ ++ # Pass back the unparsed argument list ++ func_quote_for_eval ${1+"$@"} ++ libtool_validate_options_result=$func_quote_for_eval_result ++} ++func_add_hook func_validate_options libtool_validate_options ++ ++ ++# Process options as early as possible so that --help and --version ++# can return quickly. ++func_options ${1+"$@"} ++eval set dummy "$func_options_result"; shift + + + +@@ -1224,8 +2365,29 @@ + ## Main. ## + ## ----------- ## + ++magic='%%%MAGIC variable%%%' ++magic_exe='%%%MAGIC EXE variable%%%' ++ ++# Global variables. ++extracted_archives= ++extracted_serial=0 ++ ++# If this variable is set in any of the actions, the command in it ++# will be execed at the end. This prevents here-documents from being ++# left over by shells. ++exec_cmd= ++ ++ ++# A function that is used when there is no print builtin or printf. ++func_fallback_echo () ++{ ++ eval 'cat <<_LTECHO_EOF ++$1 ++_LTECHO_EOF' ++} ++ + # func_lalib_p file +-# True iff FILE is a libtool `.la' library or `.lo' object file. ++# True iff FILE is a libtool '.la' library or '.lo' object file. + # This function is only a basic sanity check; it will hardly flush out + # determined imposters. + func_lalib_p () +@@ -1236,12 +2398,12 @@ + } + + # func_lalib_unsafe_p file +-# True iff FILE is a libtool `.la' library or `.lo' object file. ++# True iff FILE is a libtool '.la' library or '.lo' object file. + # This function implements the same check as func_lalib_p without + # resorting to external programs. To this end, it redirects stdin and + # closes it afterwards, without saving the original file descriptor. + # As a safety measure, use it only where a negative result would be +-# fatal anyway. Works if `file' does not exist. ++# fatal anyway. Works if 'file' does not exist. + func_lalib_unsafe_p () + { + lalib_p=no +@@ -1249,13 +2411,13 @@ + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line +- case "$lalib_p_line" in ++ case $lalib_p_line in + \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac + done + exec 0<&5 5<&- + fi +- test "$lalib_p" = yes ++ test yes = "$lalib_p" + } + + # func_ltwrapper_script_p file +@@ -1289,7 +2451,7 @@ + { + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" +- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" ++ func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper + } + + # func_ltwrapper_p file +@@ -1308,11 +2470,13 @@ + # FAIL_CMD may read-access the current command in variable CMD! + func_execute_cmds () + { +- $opt_debug ++ $debug_cmd ++ + save_ifs=$IFS; IFS='~' + for cmd in $1; do ++ IFS=$sp$nl ++ eval cmd=\"$cmd\" + IFS=$save_ifs +- eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +@@ -1324,10 +2488,11 @@ + # Note that it is not necessary on cygwin/mingw to append a dot to + # FILE even if both FILE and FILE.exe exist: automatic-append-.exe + # behavior happens only for exec(3), not for open(2)! Also, sourcing +-# `FILE.' does not work on cygwin managed mounts. ++# 'FILE.' does not work on cygwin managed mounts. + func_source () + { +- $opt_debug ++ $debug_cmd ++ + case $1 in + */* | *\\*) . "$1" ;; + *) . "./$1" ;; +@@ -1354,10 +2519,10 @@ + # store the result into func_replace_sysroot_result. + func_replace_sysroot () + { +- case "$lt_sysroot:$1" in ++ case $lt_sysroot:$1 in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" +- func_replace_sysroot_result="=$func_stripname_result" ++ func_replace_sysroot_result='='$func_stripname_result + ;; + *) + # Including no sysroot. +@@ -1374,7 +2539,8 @@ + # arg is usually of the form 'gcc ...' + func_infer_tag () + { +- $opt_debug ++ $debug_cmd ++ + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do +@@ -1393,7 +2559,7 @@ + for z in $available_tags; do + if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. +@@ -1418,7 +2584,7 @@ + # line option must be used. + if test -z "$tagname"; then + func_echo "unable to infer tagged configuration" +- func_fatal_error "specify a tag with \`--tag'" ++ func_fatal_error "specify a tag with '--tag'" + # else + # func_verbose "using $tagname tagged configuration" + fi +@@ -1434,15 +2600,15 @@ + # but don't create it if we're doing a dry run. + func_write_libtool_object () + { +- write_libobj=${1} +- if test "$build_libtool_libs" = yes; then +- write_lobj=\'${2}\' ++ write_libobj=$1 ++ if test yes = "$build_libtool_libs"; then ++ write_lobj=\'$2\' + else + write_lobj=none + fi + +- if test "$build_old_libs" = yes; then +- write_oldobj=\'${3}\' ++ if test yes = "$build_old_libs"; then ++ write_oldobj=\'$3\' + else + write_oldobj=none + fi +@@ -1450,7 +2616,7 @@ + $opt_dry_run || { + cat >${write_libobj}T </dev/null` +- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then ++ if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | +- $SED -e "$lt_sed_naive_backslashify"` ++ $SED -e "$sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi +@@ -1514,18 +2681,19 @@ + # are convertible, then the result may be empty. + func_convert_core_path_wine_to_w32 () + { +- $opt_debug ++ $debug_cmd ++ + # unfortunately, winepath doesn't convert paths, only file names +- func_convert_core_path_wine_to_w32_result="" ++ func_convert_core_path_wine_to_w32_result= + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" +- if test -n "$func_convert_core_file_wine_to_w32_result" ; then ++ if test -n "$func_convert_core_file_wine_to_w32_result"; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then +- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" ++ func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi +@@ -1554,7 +2722,8 @@ + # environment variable; do not put it in $PATH. + func_cygpath () + { +- $opt_debug ++ $debug_cmd ++ + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then +@@ -1563,7 +2732,7 @@ + fi + else + func_cygpath_result= +- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" ++ func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" + fi + } + #end: func_cygpath +@@ -1574,10 +2743,11 @@ + # result in func_convert_core_msys_to_w32_result. + func_convert_core_msys_to_w32 () + { +- $opt_debug ++ $debug_cmd ++ + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ++ $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` + } + #end: func_convert_core_msys_to_w32 + +@@ -1588,13 +2758,14 @@ + # func_to_host_file_result to ARG1). + func_convert_file_check () + { +- $opt_debug +- if test -z "$2" && test -n "$1" ; then ++ $debug_cmd ++ ++ if test -z "$2" && test -n "$1"; then + func_error "Could not determine host file name corresponding to" +- func_error " \`$1'" ++ func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: +- func_to_host_file_result="$1" ++ func_to_host_file_result=$1 + fi + } + # end func_convert_file_check +@@ -1606,10 +2777,11 @@ + # func_to_host_file_result to a simplistic fallback value (see below). + func_convert_path_check () + { +- $opt_debug ++ $debug_cmd ++ + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" +- func_error " \`$3'" ++ func_error " '$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. +@@ -1618,7 +2790,7 @@ + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else +- func_to_host_path_result="$3" ++ func_to_host_path_result=$3 + fi + fi + } +@@ -1630,9 +2802,10 @@ + # and appending REPL if ORIG matches BACKPAT. + func_convert_path_front_back_pathsep () + { +- $opt_debug ++ $debug_cmd ++ + case $4 in +- $1 ) func_to_host_path_result="$3$func_to_host_path_result" ++ $1 ) func_to_host_path_result=$3$func_to_host_path_result + ;; + esac + case $4 in +@@ -1646,7 +2819,7 @@ + ################################################## + # $build to $host FILE NAME CONVERSION FUNCTIONS # + ################################################## +-# invoked via `$to_host_file_cmd ARG' ++# invoked via '$to_host_file_cmd ARG' + # + # In each case, ARG is the path to be converted from $build to $host format. + # Result will be available in $func_to_host_file_result. +@@ -1657,7 +2830,8 @@ + # in func_to_host_file_result. + func_to_host_file () + { +- $opt_debug ++ $debug_cmd ++ + $to_host_file_cmd "$1" + } + # end func_to_host_file +@@ -1669,7 +2843,8 @@ + # in (the comma separated) LAZY, no conversion takes place. + func_to_tool_file () + { +- $opt_debug ++ $debug_cmd ++ + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 +@@ -1687,7 +2862,7 @@ + # Copy ARG to func_to_host_file_result. + func_convert_file_noop () + { +- func_to_host_file_result="$1" ++ func_to_host_file_result=$1 + } + # end func_convert_file_noop + +@@ -1698,11 +2873,12 @@ + # func_to_host_file_result. + func_convert_file_msys_to_w32 () + { +- $opt_debug +- func_to_host_file_result="$1" ++ $debug_cmd ++ ++ func_to_host_file_result=$1 + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" +- func_to_host_file_result="$func_convert_core_msys_to_w32_result" ++ func_to_host_file_result=$func_convert_core_msys_to_w32_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" + } +@@ -1714,8 +2890,9 @@ + # func_to_host_file_result. + func_convert_file_cygwin_to_w32 () + { +- $opt_debug +- func_to_host_file_result="$1" ++ $debug_cmd ++ ++ func_to_host_file_result=$1 + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. +@@ -1731,11 +2908,12 @@ + # and a working winepath. Returns result in func_to_host_file_result. + func_convert_file_nix_to_w32 () + { +- $opt_debug +- func_to_host_file_result="$1" ++ $debug_cmd ++ ++ func_to_host_file_result=$1 + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" +- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" ++ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" + } +@@ -1747,12 +2925,13 @@ + # Returns result in func_to_host_file_result. + func_convert_file_msys_to_cygwin () + { +- $opt_debug +- func_to_host_file_result="$1" ++ $debug_cmd ++ ++ func_to_host_file_result=$1 + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" +- func_to_host_file_result="$func_cygpath_result" ++ func_to_host_file_result=$func_cygpath_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" + } +@@ -1765,13 +2944,14 @@ + # in func_to_host_file_result. + func_convert_file_nix_to_cygwin () + { +- $opt_debug +- func_to_host_file_result="$1" ++ $debug_cmd ++ ++ func_to_host_file_result=$1 + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" +- func_to_host_file_result="$func_cygpath_result" ++ func_to_host_file_result=$func_cygpath_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" + } +@@ -1781,7 +2961,7 @@ + ############################################# + # $build to $host PATH CONVERSION FUNCTIONS # + ############################################# +-# invoked via `$to_host_path_cmd ARG' ++# invoked via '$to_host_path_cmd ARG' + # + # In each case, ARG is the path to be converted from $build to $host format. + # The result will be available in $func_to_host_path_result. +@@ -1805,10 +2985,11 @@ + to_host_path_cmd= + func_init_to_host_path_cmd () + { +- $opt_debug ++ $debug_cmd ++ + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" +- to_host_path_cmd="func_convert_path_${func_stripname_result}" ++ to_host_path_cmd=func_convert_path_$func_stripname_result + fi + } + +@@ -1818,7 +2999,8 @@ + # in func_to_host_path_result. + func_to_host_path () + { +- $opt_debug ++ $debug_cmd ++ + func_init_to_host_path_cmd + $to_host_path_cmd "$1" + } +@@ -1829,7 +3011,7 @@ + # Copy ARG to func_to_host_path_result. + func_convert_path_noop () + { +- func_to_host_path_result="$1" ++ func_to_host_path_result=$1 + } + # end func_convert_path_noop + +@@ -1840,8 +3022,9 @@ + # func_to_host_path_result. + func_convert_path_msys_to_w32 () + { +- $opt_debug +- func_to_host_path_result="$1" ++ $debug_cmd ++ ++ func_to_host_path_result=$1 + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; +@@ -1849,7 +3032,7 @@ + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" +- func_to_host_path_result="$func_convert_core_msys_to_w32_result" ++ func_to_host_path_result=$func_convert_core_msys_to_w32_result + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" +@@ -1863,8 +3046,9 @@ + # func_to_host_file_result. + func_convert_path_cygwin_to_w32 () + { +- $opt_debug +- func_to_host_path_result="$1" ++ $debug_cmd ++ ++ func_to_host_path_result=$1 + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" +@@ -1883,14 +3067,15 @@ + # a working winepath. Returns result in func_to_host_file_result. + func_convert_path_nix_to_w32 () + { +- $opt_debug +- func_to_host_path_result="$1" ++ $debug_cmd ++ ++ func_to_host_path_result=$1 + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" +- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" ++ func_to_host_path_result=$func_convert_core_path_wine_to_w32_result + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" +@@ -1904,15 +3089,16 @@ + # Returns result in func_to_host_file_result. + func_convert_path_msys_to_cygwin () + { +- $opt_debug +- func_to_host_path_result="$1" ++ $debug_cmd ++ ++ func_to_host_path_result=$1 + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" +- func_to_host_path_result="$func_cygpath_result" ++ func_to_host_path_result=$func_cygpath_result + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" +@@ -1927,8 +3113,9 @@ + # func_to_host_file_result. + func_convert_path_nix_to_cygwin () + { +- $opt_debug +- func_to_host_path_result="$1" ++ $debug_cmd ++ ++ func_to_host_path_result=$1 + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them +@@ -1937,7 +3124,7 @@ + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" +- func_to_host_path_result="$func_cygpath_result" ++ func_to_host_path_result=$func_cygpath_result + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" +@@ -1946,13 +3133,31 @@ + # end func_convert_path_nix_to_cygwin + + ++# func_dll_def_p FILE ++# True iff FILE is a Windows DLL '.def' file. ++# Keep in sync with _LT_DLL_DEF_P in libtool.m4 ++func_dll_def_p () ++{ ++ $debug_cmd ++ ++ func_dll_def_p_tmp=`$SED -n \ ++ -e 's/^[ ]*//' \ ++ -e '/^\(;.*\)*$/d' \ ++ -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ ++ -e q \ ++ "$1"` ++ test DEF = "$func_dll_def_p_tmp" ++} ++ ++ + # func_mode_compile arg... + func_mode_compile () + { +- $opt_debug ++ $debug_cmd ++ + # Get the compilation command and the source file. + base_compile= +- srcfile="$nonopt" # always keep a non-empty value in "srcfile" ++ srcfile=$nonopt # always keep a non-empty value in "srcfile" + suppress_opt=yes + suppress_output= + arg_mode=normal +@@ -1965,12 +3170,12 @@ + case $arg_mode in + arg ) + # do not "continue". Instead, add this to base_compile +- lastarg="$arg" ++ lastarg=$arg + arg_mode=normal + ;; + + target ) +- libobj="$arg" ++ libobj=$arg + arg_mode=normal + continue + ;; +@@ -1980,7 +3185,7 @@ + case $arg in + -o) + test -n "$libobj" && \ +- func_fatal_error "you cannot specify \`-o' more than once" ++ func_fatal_error "you cannot specify '-o' more than once" + arg_mode=target + continue + ;; +@@ -2009,12 +3214,12 @@ + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + lastarg= +- save_ifs="$IFS"; IFS=',' ++ save_ifs=$IFS; IFS=, + for arg in $args; do +- IFS="$save_ifs" ++ IFS=$save_ifs + func_append_quoted lastarg "$arg" + done +- IFS="$save_ifs" ++ IFS=$save_ifs + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + +@@ -2027,8 +3232,8 @@ + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # +- lastarg="$srcfile" +- srcfile="$arg" ++ lastarg=$srcfile ++ srcfile=$arg + ;; + esac # case $arg + ;; +@@ -2043,13 +3248,13 @@ + func_fatal_error "you must specify an argument for -Xcompile" + ;; + target) +- func_fatal_error "you must specify a target with \`-o'" ++ func_fatal_error "you must specify a target with '-o'" + ;; + *) + # Get the name of the library object. + test -z "$libobj" && { + func_basename "$srcfile" +- libobj="$func_basename_result" ++ libobj=$func_basename_result + } + ;; + esac +@@ -2069,7 +3274,7 @@ + case $libobj in + *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; + *) +- func_fatal_error "cannot determine name of library object from \`$libobj'" ++ func_fatal_error "cannot determine name of library object from '$libobj'" + ;; + esac + +@@ -2078,8 +3283,8 @@ + for arg in $later; do + case $arg in + -shared) +- test "$build_libtool_libs" != yes && \ +- func_fatal_configuration "can not build a shared library" ++ test yes = "$build_libtool_libs" \ ++ || func_fatal_configuration "cannot build a shared library" + build_old_libs=no + continue + ;; +@@ -2105,17 +3310,17 @@ + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ +- && func_warning "libobj name \`$libobj' may not contain shell special characters." ++ && func_warning "libobj name '$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" +- objname="$func_basename_result" +- xdir="$func_dirname_result" +- lobj=${xdir}$objdir/$objname ++ objname=$func_basename_result ++ xdir=$func_dirname_result ++ lobj=$xdir$objdir/$objname + + test -z "$base_compile" && \ + func_fatal_help "you must specify a compilation command" + + # Delete any leftover library objects. +- if test "$build_old_libs" = yes; then ++ if test yes = "$build_old_libs"; then + removelist="$obj $lobj $libobj ${libobj}T" + else + removelist="$lobj $libobj ${libobj}T" +@@ -2127,16 +3332,16 @@ + pic_mode=default + ;; + esac +- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then ++ if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then + # non-PIC code in shared libraries is not supported + pic_mode=default + fi + + # Calculate the filename of the output object if compiler does + # not support -o with -c +- if test "$compiler_c_o" = no; then +- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} +- lockfile="$output_obj.lock" ++ if test no = "$compiler_c_o"; then ++ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext ++ lockfile=$output_obj.lock + else + output_obj= + need_locks=no +@@ -2145,12 +3350,12 @@ + + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file +- if test "$need_locks" = yes; then ++ if test yes = "$need_locks"; then + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done +- elif test "$need_locks" = warn; then ++ elif test warn = "$need_locks"; then + if test -f "$lockfile"; then + $ECHO "\ + *** ERROR, $lockfile exists and contains: +@@ -2158,7 +3363,7 @@ + + This indicates that another process is trying to use the same + temporary object file, and libtool could not work around it because +-your compiler does not support \`-c' and \`-o' together. If you ++your compiler does not support '-c' and '-o' together. If you + repeat this compilation, it may succeed, by chance, but you had better + avoid parallel builds (make -j) in this platform, or get a better + compiler." +@@ -2180,11 +3385,11 @@ + qsrcfile=$func_quote_for_eval_result + + # Only build a PIC object if we are building libtool libraries. +- if test "$build_libtool_libs" = yes; then ++ if test yes = "$build_libtool_libs"; then + # Without this assignment, base_compile gets emptied. + fbsd_hideous_sh_bug=$base_compile + +- if test "$pic_mode" != no; then ++ if test no != "$pic_mode"; then + command="$base_compile $qsrcfile $pic_flag" + else + # Don't build PIC code +@@ -2201,7 +3406,7 @@ + func_show_eval_locale "$command" \ + 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' + +- if test "$need_locks" = warn && ++ if test warn = "$need_locks" && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ + *** ERROR, $lockfile contains: +@@ -2212,7 +3417,7 @@ + + This indicates that another process is trying to use the same + temporary object file, and libtool could not work around it because +-your compiler does not support \`-c' and \`-o' together. If you ++your compiler does not support '-c' and '-o' together. If you + repeat this compilation, it may succeed, by chance, but you had better + avoid parallel builds (make -j) in this platform, or get a better + compiler." +@@ -2228,20 +3433,20 @@ + fi + + # Allow error messages only from the first compilation. +- if test "$suppress_opt" = yes; then ++ if test yes = "$suppress_opt"; then + suppress_output=' >/dev/null 2>&1' + fi + fi + + # Only build a position-dependent object if we build old libraries. +- if test "$build_old_libs" = yes; then +- if test "$pic_mode" != yes; then ++ if test yes = "$build_old_libs"; then ++ if test yes != "$pic_mode"; then + # Don't build PIC code + command="$base_compile $qsrcfile$pie_flag" + else + command="$base_compile $qsrcfile $pic_flag" + fi +- if test "$compiler_c_o" = yes; then ++ if test yes = "$compiler_c_o"; then + func_append command " -o $obj" + fi + +@@ -2250,7 +3455,7 @@ + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + +- if test "$need_locks" = warn && ++ if test warn = "$need_locks" && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ + *** ERROR, $lockfile contains: +@@ -2261,7 +3466,7 @@ + + This indicates that another process is trying to use the same + temporary object file, and libtool could not work around it because +-your compiler does not support \`-c' and \`-o' together. If you ++your compiler does not support '-c' and '-o' together. If you + repeat this compilation, it may succeed, by chance, but you had better + avoid parallel builds (make -j) in this platform, or get a better + compiler." +@@ -2281,7 +3486,7 @@ + func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" + + # Unlock the critical section if it was locked +- if test "$need_locks" != no; then ++ if test no != "$need_locks"; then + removelist=$lockfile + $RM "$lockfile" + fi +@@ -2291,7 +3496,7 @@ + } + + $opt_help || { +- test "$opt_mode" = compile && func_mode_compile ${1+"$@"} ++ test compile = "$opt_mode" && func_mode_compile ${1+"$@"} + } + + func_mode_help () +@@ -2311,7 +3516,7 @@ + Remove files from the build directory. + + RM is the name of the program to use to delete files associated with each FILE +-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed ++(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed + to RM. + + If FILE is a libtool library, object or program, all the files associated +@@ -2330,16 +3535,16 @@ + -no-suppress do not suppress compiler output for multiple passes + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only +- -shared do not build a \`.o' file suitable for static linking +- -static only build a \`.o' file suitable for static linking ++ -shared do not build a '.o' file suitable for static linking ++ -static only build a '.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler + +-COMPILE-COMMAND is a command to be used in creating a \`standard' object file ++COMPILE-COMMAND is a command to be used in creating a 'standard' object file + from the given SOURCEFILE. + + The output file name is determined by removing the directory component from +-SOURCEFILE, then substituting the C source code suffix \`.c' with the +-library object suffix, \`.lo'." ++SOURCEFILE, then substituting the C source code suffix '.c' with the ++library object suffix, '.lo'." + ;; + + execute) +@@ -2352,7 +3557,7 @@ + + -dlopen FILE add the directory containing FILE to the library path + +-This mode sets the library path environment variable according to \`-dlopen' ++This mode sets the library path environment variable according to '-dlopen' + flags. + + If any of the ARGS are libtool executable wrappers, then they are translated +@@ -2371,7 +3576,7 @@ + Each LIBDIR is a directory that contains libtool libraries. + + The commands that this mode executes may require superuser privileges. Use +-the \`--dry-run' option if you just want to see what would be executed." ++the '--dry-run' option if you just want to see what would be executed." + ;; + + install) +@@ -2381,7 +3586,7 @@ + Install executables or libraries. + + INSTALL-COMMAND is the installation command. The first component should be +-either the \`install' or \`cp' program. ++either the 'install' or 'cp' program. + + The following components of INSTALL-COMMAND are treated specially: + +@@ -2407,7 +3612,7 @@ + -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) +- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime ++ -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE +@@ -2441,20 +3646,20 @@ + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) + +-All other options (arguments beginning with \`-') are ignored. +- +-Every other argument is treated as a filename. Files ending in \`.la' are ++All other options (arguments beginning with '-') are ignored. ++ ++Every other argument is treated as a filename. Files ending in '.la' are + treated as uninstalled libtool libraries, other files are standard or library + object files. + +-If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +-only library objects (\`.lo' files) may be specified, and \`-rpath' is ++If the OUTPUT-FILE ends in '.la', then a libtool library is created, ++only library objects ('.lo' files) may be specified, and '-rpath' is + required, except when creating a convenience library. + +-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +-using \`ar' and \`ranlib', or on Windows using \`lib'. +- +-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file ++If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created ++using 'ar' and 'ranlib', or on Windows using 'lib'. ++ ++If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file + is created, otherwise an executable program is created." + ;; + +@@ -2465,7 +3670,7 @@ + Remove libraries from an installation directory. + + RM is the name of the program to use to delete files associated with each FILE +-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed ++(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed + to RM. + + If FILE is a libtool library, all the files associated with it are deleted. +@@ -2473,17 +3678,17 @@ + ;; + + *) +- func_fatal_help "invalid operation mode \`$opt_mode'" ++ func_fatal_help "invalid operation mode '$opt_mode'" + ;; + esac + + echo +- $ECHO "Try \`$progname --help' for more information about other modes." ++ $ECHO "Try '$progname --help' for more information about other modes." + } + + # Now that we've collected a possible --mode arg, show help if necessary + if $opt_help; then +- if test "$opt_help" = :; then ++ if test : = "$opt_help"; then + func_mode_help + else + { +@@ -2516,16 +3721,17 @@ + # func_mode_execute arg... + func_mode_execute () + { +- $opt_debug ++ $debug_cmd ++ + # The first argument is the command name. +- cmd="$nonopt" ++ cmd=$nonopt + test -z "$cmd" && \ + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. + for file in $opt_dlopen; do + test -f "$file" \ +- || func_fatal_help "\`$file' is not a file" ++ || func_fatal_help "'$file' is not a file" + + dir= + case $file in +@@ -2535,7 +3741,7 @@ + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ +- || func_fatal_help "\`$lib' is not a valid libtool archive" ++ || func_fatal_help "'$lib' is not a valid libtool archive" + + # Read the libtool library. + dlname= +@@ -2546,18 +3752,18 @@ + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && \ +- func_warning "\`$file' was not linked with \`-export-dynamic'" ++ func_warning "'$file' was not linked with '-export-dynamic'" + continue + fi + + func_dirname "$file" "" "." +- dir="$func_dirname_result" ++ dir=$func_dirname_result + + if test -f "$dir/$objdir/$dlname"; then + func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then +- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" ++ func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" + fi + fi + ;; +@@ -2565,18 +3771,18 @@ + *.lo) + # Just add the directory containing the .lo file. + func_dirname "$file" "" "." +- dir="$func_dirname_result" ++ dir=$func_dirname_result + ;; + + *) +- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" ++ func_warning "'-dlopen' is ignored for non-libtool libraries and objects" + continue + ;; + esac + + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` +- test -n "$absdir" && dir="$absdir" ++ test -n "$absdir" && dir=$absdir + + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then +@@ -2588,7 +3794,7 @@ + + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. +- libtool_execute_magic="$magic" ++ libtool_execute_magic=$magic + + # Check if any of the arguments is a wrapper script. + args= +@@ -2601,12 +3807,12 @@ + if func_ltwrapper_script_p "$file"; then + func_source "$file" + # Transform arg to wrapped name. +- file="$progdir/$program" ++ file=$progdir/$program + elif func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. +- file="$progdir/$program" ++ file=$progdir/$program + fi + ;; + esac +@@ -2614,7 +3820,15 @@ + func_append_quoted args "$file" + done + +- if test "X$opt_dry_run" = Xfalse; then ++ if $opt_dry_run; then ++ # Display what would be done. ++ if test -n "$shlibpath_var"; then ++ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" ++ echo "export $shlibpath_var" ++ fi ++ $ECHO "$cmd$args" ++ exit $EXIT_SUCCESS ++ else + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" +@@ -2631,25 +3845,18 @@ + done + + # Now prepare to actually exec the command. +- exec_cmd="\$cmd$args" +- else +- # Display what would be done. +- if test -n "$shlibpath_var"; then +- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" +- echo "export $shlibpath_var" +- fi +- $ECHO "$cmd$args" +- exit $EXIT_SUCCESS ++ exec_cmd=\$cmd$args + fi + } + +-test "$opt_mode" = execute && func_mode_execute ${1+"$@"} ++test execute = "$opt_mode" && func_mode_execute ${1+"$@"} + + + # func_mode_finish arg... + func_mode_finish () + { +- $opt_debug ++ $debug_cmd ++ + libs= + libdirs= + admincmds= +@@ -2663,11 +3870,11 @@ + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else +- func_warning "\`$opt' is not a valid libtool archive" ++ func_warning "'$opt' is not a valid libtool archive" + fi + + else +- func_fatal_error "invalid argument \`$opt'" ++ func_fatal_error "invalid argument '$opt'" + fi + done + +@@ -2682,12 +3889,12 @@ + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do +- echo "removing references to $lt_sysroot and \`=' prefixes from $lib" ++ echo "removing references to $lt_sysroot and '=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do +- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ ++ sed -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done +@@ -2712,7 +3919,7 @@ + fi + + # Exit here if they wanted silent mode. +- $opt_silent && exit $EXIT_SUCCESS ++ $opt_quiet && exit $EXIT_SUCCESS + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" +@@ -2723,27 +3930,27 @@ + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ echo "specify the full pathname of the library, or use the '-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then +- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ echo " - add LIBDIR to the '$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then +- echo " - add LIBDIR to the \`$runpath_var' environment variable" ++ echo " - add LIBDIR to the '$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + +- $ECHO " - use the \`$flag' linker flag" ++ $ECHO " - use the '$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then +- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" + fi + echo + +@@ -2762,18 +3969,20 @@ + exit $EXIT_SUCCESS + } + +-test "$opt_mode" = finish && func_mode_finish ${1+"$@"} ++test finish = "$opt_mode" && func_mode_finish ${1+"$@"} + + + # func_mode_install arg... + func_mode_install () + { +- $opt_debug ++ $debug_cmd ++ + # There may be an optional sh(1) argument at the beginning of + # install_prog (especially on Windows NT). +- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || ++ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || + # Allow the use of GNU shtool's install command. +- case $nonopt in *shtool*) :;; *) false;; esac; then ++ case $nonopt in *shtool*) :;; *) false;; esac ++ then + # Aesthetically quote it. + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " +@@ -2800,7 +4009,7 @@ + opts= + prev= + install_type= +- isdir=no ++ isdir=false + stripme= + no_mode=: + for arg +@@ -2813,7 +4022,7 @@ + fi + + case $arg in +- -d) isdir=yes ;; ++ -d) isdir=: ;; + -f) + if $install_cp; then :; else + prev=$arg +@@ -2831,7 +4040,7 @@ + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then +- if test "x$prev" = x-m && test -n "$install_override_mode"; then ++ if test X-m = "X$prev" && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi +@@ -2856,7 +4065,7 @@ + func_fatal_help "you must specify an install program" + + test -n "$prev" && \ +- func_fatal_help "the \`$prev' option requires an argument" ++ func_fatal_help "the '$prev' option requires an argument" + + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else +@@ -2878,19 +4087,19 @@ + dest=$func_stripname_result + + # Check to see that the destination is a directory. +- test -d "$dest" && isdir=yes +- if test "$isdir" = yes; then +- destdir="$dest" ++ test -d "$dest" && isdir=: ++ if $isdir; then ++ destdir=$dest + destname= + else + func_dirname_and_basename "$dest" "" "." +- destdir="$func_dirname_result" +- destname="$func_basename_result" ++ destdir=$func_dirname_result ++ destname=$func_basename_result + + # Not a directory, so check to see that there is only one file specified. + set dummy $files; shift + test "$#" -gt 1 && \ +- func_fatal_help "\`$dest' is not a directory" ++ func_fatal_help "'$dest' is not a directory" + fi + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; +@@ -2899,7 +4108,7 @@ + case $file in + *.lo) ;; + *) +- func_fatal_help "\`$destdir' must be an absolute directory name" ++ func_fatal_help "'$destdir' must be an absolute directory name" + ;; + esac + done +@@ -2908,7 +4117,7 @@ + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. +- libtool_install_magic="$magic" ++ libtool_install_magic=$magic + + staticlibs= + future_libdirs= +@@ -2928,7 +4137,7 @@ + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ +- || func_fatal_help "\`$file' is not a valid libtool archive" ++ || func_fatal_help "'$file' is not a valid libtool archive" + + library_names= + old_library= +@@ -2950,7 +4159,7 @@ + fi + + func_dirname "$file" "/" "" +- dir="$func_dirname_result" ++ dir=$func_dirname_result + func_append dir "$objdir" + + if test -n "$relink_command"; then +@@ -2964,7 +4173,7 @@ + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. + test "$inst_prefix_dir" = "$destdir" && \ +- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" ++ func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. +@@ -2973,29 +4182,29 @@ + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + fi + +- func_warning "relinking \`$file'" ++ func_warning "relinking '$file'" + func_show_eval "$relink_command" \ +- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' ++ 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' + fi + + # See the names of the shared library. + set dummy $library_names; shift + if test -n "$1"; then +- realname="$1" ++ realname=$1 + shift + +- srcname="$realname" +- test -n "$relink_command" && srcname="$realname"T ++ srcname=$realname ++ test -n "$relink_command" && srcname=${realname}T + + # Install the shared library and build the symlinks. + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ + 'exit $?' +- tstripme="$stripme" ++ tstripme=$stripme + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) +- tstripme="" ++ tstripme= + ;; + esac + ;; +@@ -3006,7 +4215,7 @@ + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. +- # Try `ln -sf' first, because the `ln' binary might depend on ++ # Try 'ln -sf' first, because the 'ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. + for linkname +@@ -3017,14 +4226,14 @@ + fi + + # Do each command in the postinstall commands. +- lib="$destdir/$realname" ++ lib=$destdir/$realname + func_execute_cmds "$postinstall_cmds" 'exit $?' + fi + + # Install the pseudo-library for information purposes. + func_basename "$file" +- name="$func_basename_result" +- instname="$dir/$name"i ++ name=$func_basename_result ++ instname=$dir/${name}i + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. +@@ -3036,11 +4245,11 @@ + + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then +- destfile="$destdir/$destname" ++ destfile=$destdir/$destname + else + func_basename "$file" +- destfile="$func_basename_result" +- destfile="$destdir/$destfile" ++ destfile=$func_basename_result ++ destfile=$destdir/$destfile + fi + + # Deduce the name of the destination old-style object file. +@@ -3050,11 +4259,11 @@ + staticdest=$func_lo2o_result + ;; + *.$objext) +- staticdest="$destfile" ++ staticdest=$destfile + destfile= + ;; + *) +- func_fatal_help "cannot copy a libtool object to \`$destfile'" ++ func_fatal_help "cannot copy a libtool object to '$destfile'" + ;; + esac + +@@ -3063,7 +4272,7 @@ + func_show_eval "$install_prog $file $destfile" 'exit $?' + + # Install the old object if enabled. +- if test "$build_old_libs" = yes; then ++ if test yes = "$build_old_libs"; then + # Deduce the name of the old-style object file. + func_lo2o "$file" + staticobj=$func_lo2o_result +@@ -3075,23 +4284,23 @@ + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then +- destfile="$destdir/$destname" ++ destfile=$destdir/$destname + else + func_basename "$file" +- destfile="$func_basename_result" +- destfile="$destdir/$destfile" ++ destfile=$func_basename_result ++ destfile=$destdir/$destfile + fi + + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install +- stripped_ext="" ++ stripped_ext= + case $file in + *.exe) + if test ! -f "$file"; then + func_stripname '' '.exe' "$file" + file=$func_stripname_result +- stripped_ext=".exe" ++ stripped_ext=.exe + fi + ;; + esac +@@ -3119,19 +4328,19 @@ + + # Check the variables that should have been set. + test -z "$generated_by_libtool_version" && \ +- func_fatal_error "invalid libtool wrapper script \`$wrapper'" +- +- finalize=yes ++ func_fatal_error "invalid libtool wrapper script '$wrapper'" ++ ++ finalize=: + for lib in $notinst_deplibs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + func_source "$lib" + fi +- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test ++ libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` + if test -n "$libdir" && test ! -f "$libfile"; then +- func_warning "\`$lib' has not been installed in \`$libdir'" +- finalize=no ++ func_warning "'$lib' has not been installed in '$libdir'" ++ finalize=false + fi + done + +@@ -3139,29 +4348,29 @@ + func_source "$wrapper" + + outputname= +- if test "$fast_install" = no && test -n "$relink_command"; then ++ if test no = "$fast_install" && test -n "$relink_command"; then + $opt_dry_run || { +- if test "$finalize" = yes; then ++ if $finalize; then + tmpdir=`func_mktempdir` + func_basename "$file$stripped_ext" +- file="$func_basename_result" +- outputname="$tmpdir/$file" ++ file=$func_basename_result ++ outputname=$tmpdir/$file + # Replace the output file specification. + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + +- $opt_silent || { ++ $opt_quiet || { + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" + } + if eval "$relink_command"; then : + else +- func_error "error: relink \`$file' with the above command before installing it" ++ func_error "error: relink '$file' with the above command before installing it" + $opt_dry_run || ${RM}r "$tmpdir" + continue + fi +- file="$outputname" ++ file=$outputname + else +- func_warning "cannot relink \`$file'" ++ func_warning "cannot relink '$file'" + fi + } + else +@@ -3198,10 +4407,10 @@ + + for file in $staticlibs; do + func_basename "$file" +- name="$func_basename_result" ++ name=$func_basename_result + + # Set up the ranlib parameters. +- oldlib="$destdir/$name" ++ oldlib=$destdir/$name + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + +@@ -3216,18 +4425,18 @@ + done + + test -n "$future_libdirs" && \ +- func_warning "remember to run \`$progname --finish$future_libdirs'" ++ func_warning "remember to run '$progname --finish$future_libdirs'" + + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" +- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' ++ exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' + else + exit $EXIT_SUCCESS + fi + } + +-test "$opt_mode" = install && func_mode_install ${1+"$@"} ++test install = "$opt_mode" && func_mode_install ${1+"$@"} + + + # func_generate_dlsyms outputname originator pic_p +@@ -3235,16 +4444,17 @@ + # a dlpreopen symbol table. + func_generate_dlsyms () + { +- $opt_debug +- my_outputname="$1" +- my_originator="$2" +- my_pic_p="${3-no}" ++ $debug_cmd ++ ++ my_outputname=$1 ++ my_originator=$2 ++ my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + my_dlsyms= + +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then +- my_dlsyms="${my_outputname}S.c" ++ my_dlsyms=${my_outputname}S.c + else + func_error "not configured to extract global symbols from dlpreopened files" + fi +@@ -3255,7 +4465,7 @@ + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. +- nlist="$output_objdir/${my_outputname}.nm" ++ nlist=$output_objdir/$my_outputname.nm + + func_show_eval "$RM $nlist ${nlist}S ${nlist}T" + +@@ -3263,34 +4473,36 @@ + func_verbose "creating $output_objdir/$my_dlsyms" + + $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ +-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ +-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ ++/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ ++/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ + + #ifdef __cplusplus + extern \"C\" { + #endif + +-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) ++#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) + #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" + #endif + + /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +-/* DATA imports from DLLs on WIN32 con't be const, because runtime ++#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE ++/* DATA imports from DLLs on WIN32 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ + # define LT_DLSYM_CONST +-#elif defined(__osf__) ++#elif defined __osf__ + /* This system does not cope well with relocations in const data. */ + # define LT_DLSYM_CONST + #else + # define LT_DLSYM_CONST const + #endif + ++#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) ++ + /* External symbol declarations for the compiler. */\ + " + +- if test "$dlself" = yes; then +- func_verbose "generating symbol list for \`$output'" ++ if test yes = "$dlself"; then ++ func_verbose "generating symbol list for '$output'" + + $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" + +@@ -3298,7 +4510,7 @@ + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 +- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" ++ func_verbose "extracting global C symbols from '$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + +@@ -3318,10 +4530,10 @@ + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then +- export_symbols="$output_objdir/$outputname.exp" ++ export_symbols=$output_objdir/$outputname.exp + $opt_dry_run || { + $RM $export_symbols +- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' +@@ -3331,7 +4543,7 @@ + } + else + $opt_dry_run || { +- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in +@@ -3345,22 +4557,22 @@ + fi + + for dlprefile in $dlprefiles; do +- func_verbose "extracting global C symbols from \`$dlprefile'" ++ func_verbose "extracting global C symbols from '$dlprefile'" + func_basename "$dlprefile" +- name="$func_basename_result" ++ name=$func_basename_result + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" +- dlprefile_dlbasename="" ++ dlprefile_dlbasename= + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` +- if test -n "$dlprefile_dlname" ; then ++ if test -n "$dlprefile_dlname"; then + func_basename "$dlprefile_dlname" +- dlprefile_dlbasename="$func_basename_result" ++ dlprefile_dlbasename=$func_basename_result + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" +@@ -3368,7 +4580,7 @@ + fi + fi + $opt_dry_run || { +- if test -n "$dlprefile_dlbasename" ; then ++ if test -n "$dlprefile_dlbasename"; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" +@@ -3424,6 +4636,11 @@ + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + fi + ++ func_show_eval '$RM "${nlist}I"' ++ if test -n "$global_symbol_to_import"; then ++ eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' ++ fi ++ + echo >> "$output_objdir/$my_dlsyms" "\ + + /* The mapping between symbol names and symbols. */ +@@ -3432,11 +4649,30 @@ + void *address; + } lt_dlsymlist; + extern LT_DLSYM_CONST lt_dlsymlist +-lt_${my_prefix}_LTX_preloaded_symbols[]; ++lt_${my_prefix}_LTX_preloaded_symbols[];\ ++" ++ ++ if test -s "$nlist"I; then ++ echo >> "$output_objdir/$my_dlsyms" "\ ++static void lt_syminit(void) ++{ ++ LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; ++ for (; symbol->name; ++symbol) ++ {" ++ $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" ++ echo >> "$output_objdir/$my_dlsyms" "\ ++ } ++}" ++ fi ++ echo >> "$output_objdir/$my_dlsyms" "\ + LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[] = +-{\ +- { \"$my_originator\", (void *) 0 }," ++{ {\"$my_originator\", (void *) 0}," ++ ++ if test -s "$nlist"I; then ++ echo >> "$output_objdir/$my_dlsyms" "\ ++ {\"@INIT@\", (void *) <_syminit}," ++ fi + + case $need_lib_prefix in + no) +@@ -3478,9 +4714,7 @@ + *-*-hpux*) + pic_flag_for_symtable=" $pic_flag" ;; + *) +- if test "X$my_pic_p" != Xno; then +- pic_flag_for_symtable=" $pic_flag" +- fi ++ $my_pic_p && pic_flag_for_symtable=" $pic_flag" + ;; + esac + ;; +@@ -3497,10 +4731,10 @@ + func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' + + # Clean up the generated files. +- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' ++ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' + + # Transform the symbol file into the correct name. +- symfileobj="$output_objdir/${my_outputname}S.$objext" ++ symfileobj=$output_objdir/${my_outputname}S.$objext + case $host in + *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then +@@ -3518,7 +4752,7 @@ + esac + ;; + *) +- func_fatal_error "unknown suffix for \`$my_dlsyms'" ++ func_fatal_error "unknown suffix for '$my_dlsyms'" + ;; + esac + else +@@ -3532,6 +4766,32 @@ + fi + } + ++# func_cygming_gnu_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is a GNU/binutils-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_gnu_implib_p () ++{ ++ $debug_cmd ++ ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` ++ test -n "$func_cygming_gnu_implib_tmp" ++} ++ ++# func_cygming_ms_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is an MS-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_ms_implib_p () ++{ ++ $debug_cmd ++ ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` ++ test -n "$func_cygming_ms_implib_tmp" ++} ++ + # func_win32_libid arg + # return the library type of file 'arg' + # +@@ -3541,8 +4801,9 @@ + # Despite the name, also deal with 64 bit binaries. + func_win32_libid () + { +- $opt_debug +- win32_libid_type="unknown" ++ $debug_cmd ++ ++ win32_libid_type=unknown + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import +@@ -3552,16 +4813,29 @@ + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then +- func_to_tool_file "$1" func_convert_file_msys_to_w32 +- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | +- $SED -n -e ' ++ case $nm_interface in ++ "MS dumpbin") ++ if func_cygming_ms_implib_p "$1" || ++ func_cygming_gnu_implib_p "$1" ++ then ++ win32_nmres=import ++ else ++ win32_nmres= ++ fi ++ ;; ++ *) ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | ++ $SED -n -e ' + 1,100{ + / I /{ +- s,.*,import, ++ s|.*|import| + p + q + } + }'` ++ ;; ++ esac + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; +@@ -3593,7 +4867,8 @@ + # $sharedlib_from_linklib_result + func_cygming_dll_for_implib () + { +- $opt_debug ++ $debug_cmd ++ + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` + } + +@@ -3610,7 +4885,8 @@ + # specified import library. + func_cygming_dll_for_implib_fallback_core () + { +- $opt_debug ++ $debug_cmd ++ + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ +@@ -3646,8 +4922,8 @@ + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the +- # archive which possess that section. Heuristic: eliminate +- # all those which have a first or second character that is ++ # archive that possess that section. Heuristic: eliminate ++ # all those that have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually +@@ -3658,30 +4934,6 @@ + $SED -e '/^\./d;/^.\./d;q' + } + +-# func_cygming_gnu_implib_p ARG +-# This predicate returns with zero status (TRUE) if +-# ARG is a GNU/binutils-style import library. Returns +-# with nonzero status (FALSE) otherwise. +-func_cygming_gnu_implib_p () +-{ +- $opt_debug +- func_to_tool_file "$1" func_convert_file_msys_to_w32 +- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` +- test -n "$func_cygming_gnu_implib_tmp" +-} +- +-# func_cygming_ms_implib_p ARG +-# This predicate returns with zero status (TRUE) if +-# ARG is an MS-style import library. Returns +-# with nonzero status (FALSE) otherwise. +-func_cygming_ms_implib_p () +-{ +- $opt_debug +- func_to_tool_file "$1" func_convert_file_msys_to_w32 +- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` +- test -n "$func_cygming_ms_implib_tmp" +-} +- + # func_cygming_dll_for_implib_fallback ARG + # Platform-specific function to extract the + # name of the DLL associated with the specified +@@ -3695,16 +4947,17 @@ + # $sharedlib_from_linklib_result + func_cygming_dll_for_implib_fallback () + { +- $opt_debug +- if func_cygming_gnu_implib_p "$1" ; then ++ $debug_cmd ++ ++ if func_cygming_gnu_implib_p "$1"; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` +- elif func_cygming_ms_implib_p "$1" ; then ++ elif func_cygming_ms_implib_p "$1"; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown +- sharedlib_from_linklib_result="" ++ sharedlib_from_linklib_result= + fi + } + +@@ -3712,10 +4965,11 @@ + # func_extract_an_archive dir oldlib + func_extract_an_archive () + { +- $opt_debug +- f_ex_an_ar_dir="$1"; shift +- f_ex_an_ar_oldlib="$1" +- if test "$lock_old_archive_extraction" = yes; then ++ $debug_cmd ++ ++ f_ex_an_ar_dir=$1; shift ++ f_ex_an_ar_oldlib=$1 ++ if test yes = "$lock_old_archive_extraction"; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" +@@ -3724,7 +4978,7 @@ + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' +- if test "$lock_old_archive_extraction" = yes; then ++ if test yes = "$lock_old_archive_extraction"; then + $opt_dry_run || rm -f "$lockfile" + fi + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then +@@ -3738,22 +4992,23 @@ + # func_extract_archives gentop oldlib ... + func_extract_archives () + { +- $opt_debug +- my_gentop="$1"; shift ++ $debug_cmd ++ ++ my_gentop=$1; shift + my_oldlibs=${1+"$@"} +- my_oldobjs="" +- my_xlib="" +- my_xabs="" +- my_xdir="" ++ my_oldobjs= ++ my_xlib= ++ my_xabs= ++ my_xdir= + + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in +- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; ++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + func_basename "$my_xlib" +- my_xlib="$func_basename_result" ++ my_xlib=$func_basename_result + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in +@@ -3765,7 +5020,7 @@ + esac + done + extracted_archives="$extracted_archives $my_xlib_u" +- my_xdir="$my_gentop/$my_xlib_u" ++ my_xdir=$my_gentop/$my_xlib_u + + func_mkdir_p "$my_xdir" + +@@ -3778,19 +5033,20 @@ + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` +- darwin_base_archive=`basename "$darwin_archive"` ++ func_basename "$darwin_archive" ++ darwin_base_archive=$func_basename_result + darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` + if test -n "$darwin_arches"; then + darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" +- for darwin_arch in $darwin_arches ; do +- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" +- $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" +- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" +- func_extract_an_archive "`pwd`" "${darwin_base_archive}" ++ for darwin_arch in $darwin_arches; do ++ func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" ++ $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" ++ cd "unfat-$$/$darwin_base_archive-$darwin_arch" ++ func_extract_an_archive "`pwd`" "$darwin_base_archive" + cd "$darwin_curdir" +- $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" ++ $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" + done # $darwin_arches + ## Okay now we've a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` +@@ -3815,7 +5071,7 @@ + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + +- func_extract_archives_result="$my_oldobjs" ++ func_extract_archives_result=$my_oldobjs + } + + +@@ -3830,7 +5086,7 @@ + # + # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR + # variable will take. If 'yes', then the emitted script +-# will assume that the directory in which it is stored is ++# will assume that the directory where it is stored is + # the $objdir directory. This is a cygwin/mingw-specific + # behavior. + func_emit_wrapper () +@@ -3841,7 +5097,7 @@ + #! $SHELL + + # $output - temporary wrapper script for $objdir/$outputname +-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++# Generated by $PROGRAM (GNU $PACKAGE) $VERSION + # + # The $output program cannot be directly executed until all the libtool + # libraries that it depends on are installed. +@@ -3898,9 +5154,9 @@ + + # Very basic option parsing. These options are (a) specific to + # the libtool wrapper, (b) are identical between the wrapper +-# /script/ and the wrapper /executable/ which is used only on ++# /script/ and the wrapper /executable/ that is used only on + # windows platforms, and (c) all begin with the string "--lt-" +-# (application programs are unlikely to have options which match ++# (application programs are unlikely to have options that match + # this pattern). + # + # There are only two supported options: --lt-debug and +@@ -3933,7 +5189,7 @@ + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then +- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 ++ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 + fi + } + +@@ -3944,7 +5200,7 @@ + lt_dump_args_N=1; + for lt_arg + do +- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" ++ \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done + } +@@ -3958,7 +5214,7 @@ + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then +- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 ++ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +@@ -3968,7 +5224,7 @@ + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then +- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 ++ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +@@ -4043,13 +5299,13 @@ + test -n \"\$absdir\" && thisdir=\"\$absdir\" + " + +- if test "$fast_install" = yes; then ++ if test yes = "$fast_install"; then + $ECHO "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" + + if test ! -f \"\$progdir/\$program\" || +- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ ++ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then + + file=\"\$\$-\$program\" +@@ -4101,7 +5357,7 @@ + fi + + # Export our shlibpath_var if we have one. +- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then ++ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" +@@ -4121,7 +5377,7 @@ + fi + else + # The program doesn't exist. +- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 ++ \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 +@@ -4140,7 +5396,7 @@ + cat < + #include + ++#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) ++ + /* declarations of non-ANSI functions */ +-#if defined(__MINGW32__) ++#if defined __MINGW32__ + # ifdef __STRICT_ANSI__ + int _putenv (const char *); + # endif +-#elif defined(__CYGWIN__) ++#elif defined __CYGWIN__ + # ifdef __STRICT_ANSI__ + char *realpath (const char *, char *); + int putenv (char *); + int setenv (const char *, const char *, int); + # endif +-/* #elif defined (other platforms) ... */ ++/* #elif defined other_platform || defined ... */ + #endif + + /* portability defines, excluding path handling macros */ +-#if defined(_MSC_VER) ++#if defined _MSC_VER + # define setmode _setmode + # define stat _stat + # define chmod _chmod + # define getcwd _getcwd + # define putenv _putenv + # define S_IXUSR _S_IEXEC +-# ifndef _INTPTR_T_DEFINED +-# define _INTPTR_T_DEFINED +-# define intptr_t int +-# endif +-#elif defined(__MINGW32__) ++#elif defined __MINGW32__ + # define setmode _setmode + # define stat _stat + # define chmod _chmod + # define getcwd _getcwd + # define putenv _putenv +-#elif defined(__CYGWIN__) ++#elif defined __CYGWIN__ + # define HAVE_SETENV + # define FOPEN_WB "wb" +-/* #elif defined (other platforms) ... */ ++/* #elif defined other platforms ... */ + #endif + +-#if defined(PATH_MAX) ++#if defined PATH_MAX + # define LT_PATHMAX PATH_MAX +-#elif defined(MAXPATHLEN) ++#elif defined MAXPATHLEN + # define LT_PATHMAX MAXPATHLEN + #else + # define LT_PATHMAX 1024 +@@ -4234,8 +5488,8 @@ + # define PATH_SEPARATOR ':' + #endif + +-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ +- defined (__OS2__) ++#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ ++ defined __OS2__ + # define HAVE_DOS_BASED_FILE_SYSTEM + # define FOPEN_WB "wb" + # ifndef DIR_SEPARATOR_2 +@@ -4268,10 +5522,10 @@ + + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) + #define XFREE(stale) do { \ +- if (stale) { free ((void *) stale); stale = 0; } \ ++ if (stale) { free (stale); stale = 0; } \ + } while (0) + +-#if defined(LT_DEBUGWRAPPER) ++#if defined LT_DEBUGWRAPPER + static int lt_debug = 1; + #else + static int lt_debug = 0; +@@ -4304,7 +5558,7 @@ + const char * LIB_PATH_VARNAME = "$shlibpath_var"; + EOF + +- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then ++ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + func_to_host_path "$temp_rpath" + cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) ++ size_t len = strlen (new_value); ++ while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { +- new_value[len-1] = '\0'; ++ new_value[--len] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); +@@ -5082,7 +6336,8 @@ + # True if ARG is an import lib, as indicated by $file_magic_cmd + func_win32_import_lib_p () + { +- $opt_debug ++ $debug_cmd ++ + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; +@@ -5092,17 +6347,18 @@ + # func_mode_link arg... + func_mode_link () + { +- $opt_debug ++ $debug_cmd ++ + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out +- # which system we are compiling for in order to pass an extra ++ # what system we are compiling for in order to pass an extra + # flag for every libtool invocation. + # allow_undefined=no + + # FIXME: Unfortunately, there are problems with the above when trying +- # to make a dll which has undefined symbols, in which case not ++ # to make a dll that has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. +@@ -5149,7 +6405,7 @@ + non_pic_objects= + precious_files_regex= + prefer_static_libs=no +- preload=no ++ preload=false + prev= + prevarg= + release= +@@ -5161,7 +6417,7 @@ + vinfo= + vinfo_number=no + weak_libs= +- single_module="${wl}-single_module" ++ single_module=$wl-single_module + func_infer_tag $base_compile + + # We need to know -static, to get the right output filenames. +@@ -5169,15 +6425,15 @@ + do + case $arg in + -shared) +- test "$build_libtool_libs" != yes && \ +- func_fatal_configuration "can not build a shared library" ++ test yes != "$build_libtool_libs" \ ++ && func_fatal_configuration "cannot build a shared library" + build_old_libs=no + break + ;; + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) +- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then ++ if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then + func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then +@@ -5210,7 +6466,7 @@ + + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do +- arg="$1" ++ arg=$1 + shift + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result +@@ -5227,21 +6483,21 @@ + + case $prev in + bindir) +- bindir="$arg" ++ bindir=$arg + prev= + continue + ;; + dlfiles|dlprefiles) +- if test "$preload" = no; then ++ $preload || { + # Add the symbol object into the linking commands. + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" +- preload=yes +- fi ++ preload=: ++ } + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) +- if test "$dlself" = no; then ++ if test no = "$dlself"; then + dlself=needless + export_dynamic=yes + fi +@@ -5249,9 +6505,9 @@ + continue + ;; + self) +- if test "$prev" = dlprefiles; then ++ if test dlprefiles = "$prev"; then + dlself=yes +- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then ++ elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then + dlself=yes + else + dlself=needless +@@ -5261,7 +6517,7 @@ + continue + ;; + *) +- if test "$prev" = dlfiles; then ++ if test dlfiles = "$prev"; then + func_append dlfiles " $arg" + else + func_append dlprefiles " $arg" +@@ -5272,14 +6528,14 @@ + esac + ;; + expsyms) +- export_symbols="$arg" ++ export_symbols=$arg + test -f "$arg" \ +- || func_fatal_error "symbol file \`$arg' does not exist" ++ || func_fatal_error "symbol file '$arg' does not exist" + prev= + continue + ;; + expsyms_regex) +- export_symbols_regex="$arg" ++ export_symbols_regex=$arg + prev= + continue + ;; +@@ -5297,7 +6553,13 @@ + continue + ;; + inst_prefix) +- inst_prefix_dir="$arg" ++ inst_prefix_dir=$arg ++ prev= ++ continue ++ ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. + prev= + continue + ;; +@@ -5321,21 +6583,21 @@ + + if test -z "$pic_object" || + test -z "$non_pic_object" || +- test "$pic_object" = none && +- test "$non_pic_object" = none; then +- func_fatal_error "cannot find name of object for \`$arg'" ++ test none = "$pic_object" && ++ test none = "$non_pic_object"; then ++ func_fatal_error "cannot find name of object for '$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" +- xdir="$func_dirname_result" +- +- if test "$pic_object" != none; then ++ xdir=$func_dirname_result ++ ++ if test none != "$pic_object"; then + # Prepend the subdirectory the object is found in. +- pic_object="$xdir$pic_object" +- +- if test "$prev" = dlfiles; then +- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then ++ pic_object=$xdir$pic_object ++ ++ if test dlfiles = "$prev"; then ++ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then + func_append dlfiles " $pic_object" + prev= + continue +@@ -5346,7 +6608,7 @@ + fi + + # CHECK ME: I think I busted this. -Ossama +- if test "$prev" = dlprefiles; then ++ if test dlprefiles = "$prev"; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= +@@ -5354,23 +6616,23 @@ + + # A PIC object. + func_append libobjs " $pic_object" +- arg="$pic_object" ++ arg=$pic_object + fi + + # Non-PIC object. +- if test "$non_pic_object" != none; then ++ if test none != "$non_pic_object"; then + # Prepend the subdirectory the object is found in. +- non_pic_object="$xdir$non_pic_object" ++ non_pic_object=$xdir$non_pic_object + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" +- if test -z "$pic_object" || test "$pic_object" = none ; then +- arg="$non_pic_object" ++ if test -z "$pic_object" || test none = "$pic_object"; then ++ arg=$non_pic_object + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. +- non_pic_object="$pic_object" ++ non_pic_object=$pic_object + func_append non_pic_objects " $non_pic_object" + fi + else +@@ -5378,7 +6640,7 @@ + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" +- xdir="$func_dirname_result" ++ xdir=$func_dirname_result + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result +@@ -5386,24 +6648,24 @@ + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else +- func_fatal_error "\`$arg' is not a valid libtool object" ++ func_fatal_error "'$arg' is not a valid libtool object" + fi + fi + done + else +- func_fatal_error "link input file \`$arg' does not exist" ++ func_fatal_error "link input file '$arg' does not exist" + fi + arg=$save_arg + prev= + continue + ;; + precious_regex) +- precious_files_regex="$arg" ++ precious_files_regex=$arg + prev= + continue + ;; + release) +- release="-$arg" ++ release=-$arg + prev= + continue + ;; +@@ -5415,7 +6677,7 @@ + func_fatal_error "only absolute run-paths are allowed" + ;; + esac +- if test "$prev" = rpath; then ++ if test rpath = "$prev"; then + case "$rpath " in + *" $arg "*) ;; + *) func_append rpath " $arg" ;; +@@ -5430,7 +6692,7 @@ + continue + ;; + shrext) +- shrext_cmds="$arg" ++ shrext_cmds=$arg + prev= + continue + ;; +@@ -5470,7 +6732,7 @@ + esac + fi # test -n "$prev" + +- prevarg="$arg" ++ prevarg=$arg + + case $arg in + -all-static) +@@ -5484,7 +6746,7 @@ + + -allow-undefined) + # FIXME: remove this flag sometime in the future. +- func_fatal_error "\`-allow-undefined' must not be used because it is the default" ++ func_fatal_error "'-allow-undefined' must not be used because it is the default" + ;; + + -avoid-version) +@@ -5516,7 +6778,7 @@ + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + func_fatal_error "more than one -exported-symbols argument is not allowed" + fi +- if test "X$arg" = "X-export-symbols"; then ++ if test X-export-symbols = "X$arg"; then + prev=expsyms + else + prev=expsyms_regex +@@ -5550,9 +6812,9 @@ + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then +- func_fatal_error "require no space between \`-L' and \`$1'" ++ func_fatal_error "require no space between '-L' and '$1'" + else +- func_fatal_error "need path for \`-L' option" ++ func_fatal_error "need path for '-L' option" + fi + fi + func_resolve_sysroot "$func_stripname_result" +@@ -5563,8 +6825,8 @@ + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ +- func_fatal_error "cannot determine absolute directory name of \`$dir'" +- dir="$absdir" ++ func_fatal_error "cannot determine absolute directory name of '$dir'" ++ dir=$absdir + ;; + esac + case "$deplibs " in +@@ -5599,7 +6861,7 @@ + ;; + + -l*) +- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then ++ if test X-lc = "X$arg" || test X-lm = "X$arg"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + # These systems don't actually have a C or math library (as such) +@@ -5607,11 +6869,11 @@ + ;; + *-*-os2*) + # These systems don't actually have a C library (as such) +- test "X$arg" = "X-lc" && continue ++ test X-lc = "X$arg" && continue + ;; +- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + # Do not include libc due to us having libc/libc_r. +- test "X$arg" = "X-lc" && continue ++ test X-lc = "X$arg" && continue + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework +@@ -5620,16 +6882,16 @@ + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype +- test "X$arg" = "X-lc" && continue ++ test X-lc = "X$arg" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work +- test "X$arg" = "X-lc" && continue ++ test X-lc = "X$arg" && continue + ;; + esac +- elif test "X$arg" = "X-lc_r"; then ++ elif test X-lc_r = "X$arg"; then + case $host in +- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -5639,6 +6901,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +@@ -5668,7 +6935,7 @@ + ;; + + -multi_module) +- single_module="${wl}-multi_module" ++ single_module=$wl-multi_module + continue + ;; + +@@ -5682,8 +6949,8 @@ + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows + # and Darwin in order for the loader to find any dlls it needs. +- func_warning "\`-no-install' is ignored for $host" +- func_warning "assuming \`-no-fast-install' instead" ++ func_warning "'-no-install' is ignored for $host" ++ func_warning "assuming '-no-fast-install' instead" + fast_install=no + ;; + *) no_install=yes ;; +@@ -5788,14 +7055,14 @@ + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + arg= +- save_ifs="$IFS"; IFS=',' ++ save_ifs=$IFS; IFS=, + for flag in $args; do +- IFS="$save_ifs" ++ IFS=$save_ifs + func_quote_for_eval "$flag" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" + done +- IFS="$save_ifs" ++ IFS=$save_ifs + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; +@@ -5804,15 +7071,15 @@ + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= +- save_ifs="$IFS"; IFS=',' ++ save_ifs=$IFS; IFS=, + for flag in $args; do +- IFS="$save_ifs" ++ IFS=$save_ifs + func_quote_for_eval "$flag" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" + done +- IFS="$save_ifs" ++ IFS=$save_ifs + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; +@@ -5835,7 +7102,7 @@ + # -msg_* for osf cc + -msg_*) + func_quote_for_eval "$arg" +- arg="$func_quote_for_eval_result" ++ arg=$func_quote_for_eval_result + ;; + + # Flags to be passed through unchanged, with rationale: +@@ -5850,12 +7117,13 @@ + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support +- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization ++ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization ++ # -stdlib=* select c++ std lib with clang + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*) + func_quote_for_eval "$arg" +- arg="$func_quote_for_eval_result" ++ arg=$func_quote_for_eval_result + func_append compile_command " $arg" + func_append finalize_command " $arg" + func_append compiler_flags " $arg" +@@ -5865,7 +7133,7 @@ + # Some other compiler flag. + -* | +*) + func_quote_for_eval "$arg" +- arg="$func_quote_for_eval_result" ++ arg=$func_quote_for_eval_result + ;; + + *.$objext) +@@ -5886,21 +7154,21 @@ + + if test -z "$pic_object" || + test -z "$non_pic_object" || +- test "$pic_object" = none && +- test "$non_pic_object" = none; then +- func_fatal_error "cannot find name of object for \`$arg'" ++ test none = "$pic_object" && ++ test none = "$non_pic_object"; then ++ func_fatal_error "cannot find name of object for '$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" +- xdir="$func_dirname_result" +- +- if test "$pic_object" != none; then ++ xdir=$func_dirname_result ++ ++ test none = "$pic_object" || { + # Prepend the subdirectory the object is found in. +- pic_object="$xdir$pic_object" +- +- if test "$prev" = dlfiles; then +- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then ++ pic_object=$xdir$pic_object ++ ++ if test dlfiles = "$prev"; then ++ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then + func_append dlfiles " $pic_object" + prev= + continue +@@ -5911,7 +7179,7 @@ + fi + + # CHECK ME: I think I busted this. -Ossama +- if test "$prev" = dlprefiles; then ++ if test dlprefiles = "$prev"; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= +@@ -5919,23 +7187,23 @@ + + # A PIC object. + func_append libobjs " $pic_object" +- arg="$pic_object" +- fi ++ arg=$pic_object ++ } + + # Non-PIC object. +- if test "$non_pic_object" != none; then ++ if test none != "$non_pic_object"; then + # Prepend the subdirectory the object is found in. +- non_pic_object="$xdir$non_pic_object" ++ non_pic_object=$xdir$non_pic_object + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" +- if test -z "$pic_object" || test "$pic_object" = none ; then +- arg="$non_pic_object" ++ if test -z "$pic_object" || test none = "$pic_object"; then ++ arg=$non_pic_object + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. +- non_pic_object="$pic_object" ++ non_pic_object=$pic_object + func_append non_pic_objects " $non_pic_object" + fi + else +@@ -5943,7 +7211,7 @@ + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" +- xdir="$func_dirname_result" ++ xdir=$func_dirname_result + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result +@@ -5951,7 +7219,7 @@ + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else +- func_fatal_error "\`$arg' is not a valid libtool object" ++ func_fatal_error "'$arg' is not a valid libtool object" + fi + fi + ;; +@@ -5967,11 +7235,11 @@ + # A libtool-controlled library. + + func_resolve_sysroot "$arg" +- if test "$prev" = dlfiles; then ++ if test dlfiles = "$prev"; then + # This library was specified with -dlopen. + func_append dlfiles " $func_resolve_sysroot_result" + prev= +- elif test "$prev" = dlprefiles; then ++ elif test dlprefiles = "$prev"; then + # The library was specified with -dlpreopen. + func_append dlprefiles " $func_resolve_sysroot_result" + prev= +@@ -5986,7 +7254,7 @@ + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + func_quote_for_eval "$arg" +- arg="$func_quote_for_eval_result" ++ arg=$func_quote_for_eval_result + ;; + esac # arg + +@@ -5998,9 +7266,9 @@ + done # argument parsing loop + + test -n "$prev" && \ +- func_fatal_help "the \`$prevarg' option requires an argument" +- +- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then ++ func_fatal_help "the '$prevarg' option requires an argument" ++ ++ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" +@@ -6009,12 +7277,12 @@ + oldlibs= + # calculate the name of the file, without its directory + func_basename "$output" +- outputname="$func_basename_result" +- libobjs_save="$libobjs" ++ outputname=$func_basename_result ++ libobjs_save=$libobjs + + if test -n "$shlibpath_var"; then + # get the directories listed in $shlibpath_var +- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` ++ eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` + else + shlib_search_path= + fi +@@ -6022,7 +7290,7 @@ + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + func_dirname "$output" "/" "" +- output_objdir="$func_dirname_result$objdir" ++ output_objdir=$func_dirname_result$objdir + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result + # Create the object directory. +@@ -6045,7 +7313,7 @@ + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do +- if $opt_preserve_dup_deps ; then ++ if $opt_preserve_dup_deps; then + case "$libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac +@@ -6053,7 +7321,7 @@ + func_append libs " $deplib" + done + +- if test "$linkmode" = lib; then ++ if test lib = "$linkmode"; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps +@@ -6085,7 +7353,7 @@ + case $file in + *.la) ;; + *) +- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" ++ func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" + ;; + esac + done +@@ -6093,7 +7361,7 @@ + prog) + compile_deplibs= + finalize_deplibs= +- alldeplibs=no ++ alldeplibs=false + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" +@@ -6105,29 +7373,29 @@ + for pass in $passes; do + # The preopen pass in lib mode reverses $deplibs; put it back here + # so that -L comes before libs that need it for instance... +- if test "$linkmode,$pass" = "lib,link"; then ++ if test lib,link = "$linkmode,$pass"; then + ## FIXME: Find the place where the list is rebuilt in the wrong + ## order, and fix it there properly + tmp_deplibs= + for deplib in $deplibs; do + tmp_deplibs="$deplib $tmp_deplibs" + done +- deplibs="$tmp_deplibs" ++ deplibs=$tmp_deplibs + fi + +- if test "$linkmode,$pass" = "lib,link" || +- test "$linkmode,$pass" = "prog,scan"; then +- libs="$deplibs" ++ if test lib,link = "$linkmode,$pass" || ++ test prog,scan = "$linkmode,$pass"; then ++ libs=$deplibs + deplibs= + fi +- if test "$linkmode" = prog; then ++ if test prog = "$linkmode"; then + case $pass in +- dlopen) libs="$dlfiles" ;; +- dlpreopen) libs="$dlprefiles" ;; ++ dlopen) libs=$dlfiles ;; ++ dlpreopen) libs=$dlprefiles ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + esac + fi +- if test "$linkmode,$pass" = "lib,dlpreopen"; then ++ if test lib,dlpreopen = "$linkmode,$pass"; then + # Collect and forward deplibs of preopened libtool libs + for lib in $dlprefiles; do + # Ignore non-libtool-libs +@@ -6148,26 +7416,26 @@ + esac + done + done +- libs="$dlprefiles" ++ libs=$dlprefiles + fi +- if test "$pass" = dlopen; then ++ if test dlopen = "$pass"; then + # Collect dlpreopened libraries +- save_deplibs="$deplibs" ++ save_deplibs=$deplibs + deplibs= + fi + + for deplib in $libs; do + lib= +- found=no ++ found=false + case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) +- if test "$linkmode,$pass" = "prog,link"; then ++ if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append compiler_flags " $deplib" +- if test "$linkmode" = lib ; then ++ if test lib = "$linkmode"; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; +@@ -6177,13 +7445,13 @@ + continue + ;; + -l*) +- if test "$linkmode" != lib && test "$linkmode" != prog; then +- func_warning "\`-l' is ignored for archives/objects" ++ if test lib != "$linkmode" && test prog != "$linkmode"; then ++ func_warning "'-l' is ignored for archives/objects" + continue + fi + func_stripname '-l' '' "$deplib" + name=$func_stripname_result +- if test "$linkmode" = lib; then ++ if test lib = "$linkmode"; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" +@@ -6191,31 +7459,22 @@ + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library +- lib="$searchdir/lib${name}${search_ext}" ++ lib=$searchdir/lib$name$search_ext + if test -f "$lib"; then +- if test "$search_ext" = ".la"; then +- found=yes ++ if test .la = "$search_ext"; then ++ found=: + else +- found=no ++ found=false + fi + break 2 + fi + done + done +- if test "$found" != yes; then +- # deplib doesn't seem to be a libtool library +- if test "$linkmode,$pass" = "prog,link"; then +- compile_deplibs="$deplib $compile_deplibs" +- finalize_deplibs="$deplib $finalize_deplibs" +- else +- deplibs="$deplib $deplibs" +- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" +- fi +- continue +- else # deplib is a libtool library ++ if $found; then ++ # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ if test yes = "$allow_libtool_libs_with_static_runtimes"; then + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then +@@ -6223,19 +7482,19 @@ + old_library= + func_source "$lib" + for l in $old_library $library_names; do +- ll="$l" ++ ll=$l + done +- if test "X$ll" = "X$old_library" ; then # only static version available +- found=no ++ if test "X$ll" = "X$old_library"; then # only static version available ++ found=false + func_dirname "$lib" "" "." +- ladir="$func_dirname_result" ++ ladir=$func_dirname_result + lib=$ladir/$old_library +- if test "$linkmode,$pass" = "prog,link"; then ++ if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" +- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" ++ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi +@@ -6244,15 +7503,25 @@ + *) ;; + esac + fi ++ else ++ # deplib doesn't seem to be a libtool library ++ if test prog,link = "$linkmode,$pass"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" ++ fi ++ continue + fi + ;; # -l + *.ltframework) +- if test "$linkmode,$pass" = "prog,link"; then ++ if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" +- if test "$linkmode" = lib ; then ++ if test lib = "$linkmode"; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; +@@ -6265,18 +7534,18 @@ + case $linkmode in + lib) + deplibs="$deplib $deplibs" +- test "$pass" = conv && continue ++ test conv = "$pass" && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) +- if test "$pass" = conv; then ++ if test conv = "$pass"; then + deplibs="$deplib $deplibs" + continue + fi +- if test "$pass" = scan; then ++ if test scan = "$pass"; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" +@@ -6287,13 +7556,13 @@ + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) +- func_warning "\`-L' is ignored for archives/objects" ++ func_warning "'-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) +- if test "$pass" = link; then ++ if test link = "$pass"; then + func_stripname '-R' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result +@@ -6311,7 +7580,7 @@ + lib=$func_resolve_sysroot_result + ;; + *.$libext) +- if test "$pass" = conv; then ++ if test conv = "$pass"; then + deplibs="$deplib $deplibs" + continue + fi +@@ -6322,21 +7591,26 @@ + case " $dlpreconveniencelibs " in + *" $deplib "*) ;; + *) +- valid_a_lib=no ++ valid_a_lib=false + case $deplibs_check_method in + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then +- valid_a_lib=yes ++ valid_a_lib=: + fi + ;; + pass_all) +- valid_a_lib=yes ++ valid_a_lib=: + ;; + esac +- if test "$valid_a_lib" != yes; then ++ if $valid_a_lib; then ++ echo ++ $ECHO "*** Warning: Linking the shared library $output against the" ++ $ECHO "*** static library $deplib is not portable!" ++ deplibs="$deplib $deplibs" ++ else + echo + $ECHO "*** Warning: Trying to link with static lib archive $deplib." + echo "*** I have the capability to make that library automatically link in when" +@@ -6344,18 +7618,13 @@ + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." +- else +- echo +- $ECHO "*** Warning: Linking the shared library $output against the" +- $ECHO "*** static library $deplib is not portable!" +- deplibs="$deplib $deplibs" + fi + ;; + esac + continue + ;; + prog) +- if test "$pass" != link; then ++ if test link != "$pass"; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" +@@ -6366,10 +7635,10 @@ + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) +- if test "$pass" = conv; then ++ if test conv = "$pass"; then + deplibs="$deplib $deplibs" +- elif test "$linkmode" = prog; then +- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then ++ elif test prog = "$linkmode"; then ++ if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + func_append newdlprefiles " $deplib" +@@ -6382,22 +7651,20 @@ + continue + ;; + %DEPLIBS%) +- alldeplibs=yes ++ alldeplibs=: + continue + ;; + esac # case $deplib + +- if test "$found" = yes || test -f "$lib"; then : +- else +- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" +- fi ++ $found || test -f "$lib" \ ++ || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$lib" \ +- || func_fatal_error "\`$lib' is not a valid libtool archive" ++ || func_fatal_error "'$lib' is not a valid libtool archive" + + func_dirname "$lib" "" "." +- ladir="$func_dirname_result" ++ ladir=$func_dirname_result + + dlname= + dlopen= +@@ -6427,30 +7694,30 @@ + done + fi + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` +- if test "$linkmode,$pass" = "lib,link" || +- test "$linkmode,$pass" = "prog,scan" || +- { test "$linkmode" != prog && test "$linkmode" != lib; }; then ++ if test lib,link = "$linkmode,$pass" || ++ test prog,scan = "$linkmode,$pass" || ++ { test prog != "$linkmode" && test lib != "$linkmode"; }; then + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + +- if test "$pass" = conv; then ++ if test conv = "$pass"; then + # Only check for convenience libraries + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then +- func_fatal_error "cannot find name of link library for \`$lib'" ++ func_fatal_error "cannot find name of link library for '$lib'" + fi + # It is a libtool convenience library, so add in its objects. + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" +- elif test "$linkmode" != prog && test "$linkmode" != lib; then +- func_fatal_error "\`$lib' is not a convenience library" ++ elif test prog != "$linkmode" && test lib != "$linkmode"; then ++ func_fatal_error "'$lib' is not a convenience library" + fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" +- if $opt_preserve_dup_deps ; then ++ if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac +@@ -6464,26 +7731,26 @@ + # Get the name of the library we link against. + linklib= + if test -n "$old_library" && +- { test "$prefer_static_libs" = yes || +- test "$prefer_static_libs,$installed" = "built,no"; }; then ++ { test yes = "$prefer_static_libs" || ++ test built,no = "$prefer_static_libs,$installed"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do +- linklib="$l" ++ linklib=$l + done + fi + if test -z "$linklib"; then +- func_fatal_error "cannot find name of link library for \`$lib'" ++ func_fatal_error "cannot find name of link library for '$lib'" + fi + + # This library was specified with -dlopen. +- if test "$pass" = dlopen; then +- if test -z "$libdir"; then +- func_fatal_error "cannot -dlopen a convenience library: \`$lib'" +- fi ++ if test dlopen = "$pass"; then ++ test -z "$libdir" \ ++ && func_fatal_error "cannot -dlopen a convenience library: '$lib'" + if test -z "$dlname" || +- test "$dlopen_support" != yes || +- test "$build_libtool_libs" = no; then ++ test yes != "$dlopen_support" || ++ test no = "$build_libtool_libs" ++ then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't +@@ -6497,40 +7764,40 @@ + + # We need an absolute path. + case $ladir in +- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; ++ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then +- func_warning "cannot determine absolute directory name of \`$ladir'" ++ func_warning "cannot determine absolute directory name of '$ladir'" + func_warning "passing it literally to the linker, although it might fail" +- abs_ladir="$ladir" ++ abs_ladir=$ladir + fi + ;; + esac + func_basename "$lib" +- laname="$func_basename_result" ++ laname=$func_basename_result + + # Find the relevant object directory and library name. +- if test "X$installed" = Xyes; then ++ if test yes = "$installed"; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then +- func_warning "library \`$lib' was moved." +- dir="$ladir" +- absdir="$abs_ladir" +- libdir="$abs_ladir" ++ func_warning "library '$lib' was moved." ++ dir=$ladir ++ absdir=$abs_ladir ++ libdir=$abs_ladir + else +- dir="$lt_sysroot$libdir" +- absdir="$lt_sysroot$libdir" ++ dir=$lt_sysroot$libdir ++ absdir=$lt_sysroot$libdir + fi +- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes ++ test yes = "$hardcode_automatic" && avoidtemprpath=yes + else + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then +- dir="$ladir" +- absdir="$abs_ladir" ++ dir=$ladir ++ absdir=$abs_ladir + # Remove this search path later + func_append notinst_path " $abs_ladir" + else +- dir="$ladir/$objdir" +- absdir="$abs_ladir/$objdir" ++ dir=$ladir/$objdir ++ absdir=$abs_ladir/$objdir + # Remove this search path later + func_append notinst_path " $abs_ladir" + fi +@@ -6539,11 +7806,11 @@ + name=$func_stripname_result + + # This library was specified with -dlpreopen. +- if test "$pass" = dlpreopen; then +- if test -z "$libdir" && test "$linkmode" = prog; then +- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" ++ if test dlpreopen = "$pass"; then ++ if test -z "$libdir" && test prog = "$linkmode"; then ++ func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" + fi +- case "$host" in ++ case $host in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both +@@ -6587,9 +7854,9 @@ + + if test -z "$libdir"; then + # Link the convenience library +- if test "$linkmode" = lib; then ++ if test lib = "$linkmode"; then + deplibs="$dir/$old_library $deplibs" +- elif test "$linkmode,$pass" = "prog,link"; then ++ elif test prog,link = "$linkmode,$pass"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else +@@ -6599,14 +7866,14 @@ + fi + + +- if test "$linkmode" = prog && test "$pass" != link; then ++ if test prog = "$linkmode" && test link != "$pass"; then + func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + +- linkalldeplibs=no +- if test "$link_all_deplibs" != no || test -z "$library_names" || +- test "$build_libtool_libs" = no; then +- linkalldeplibs=yes ++ linkalldeplibs=false ++ if test no != "$link_all_deplibs" || test -z "$library_names" || ++ test no = "$build_libtool_libs"; then ++ linkalldeplibs=: + fi + + tmp_libs= +@@ -6618,14 +7885,14 @@ + ;; + esac + # Need to link against all dependency_libs? +- if test "$linkalldeplibs" = yes; then ++ if $linkalldeplibs; then + deplibs="$deplib $deplibs" + else + # Need to hardcode shared library paths + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi +- if $opt_preserve_dup_deps ; then ++ if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac +@@ -6635,15 +7902,15 @@ + continue + fi # $linkmode = prog... + +- if test "$linkmode,$pass" = "prog,link"; then ++ if test prog,link = "$linkmode,$pass"; then + if test -n "$library_names" && +- { { test "$prefer_static_libs" = no || +- test "$prefer_static_libs,$installed" = "built,yes"; } || ++ { { test no = "$prefer_static_libs" || ++ test built,yes = "$prefer_static_libs,$installed"; } || + test -z "$old_library"; }; then + # We need to hardcode the library path +- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then ++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then + # Make sure the rpath contains only unique directories. +- case "$temp_rpath:" in ++ case $temp_rpath: in + *"$absdir:"*) ;; + *) func_append temp_rpath "$absdir:" ;; + esac +@@ -6672,9 +7939,9 @@ + esac + fi # $linkmode,$pass = prog,link... + +- if test "$alldeplibs" = yes && +- { test "$deplibs_check_method" = pass_all || +- { test "$build_libtool_libs" = yes && ++ if $alldeplibs && ++ { test pass_all = "$deplibs_check_method" || ++ { test yes = "$build_libtool_libs" && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue +@@ -6683,11 +7950,11 @@ + + link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs +- if test "$use_static_libs" = built && test "$installed" = yes; then ++ if test built = "$use_static_libs" && test yes = "$installed"; then + use_static_libs=no + fi + if test -n "$library_names" && +- { test "$use_static_libs" = no || test -z "$old_library"; }; then ++ { test no = "$use_static_libs" || test -z "$old_library"; }; then + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded +@@ -6695,7 +7962,7 @@ + need_relink=no + ;; + *) +- if test "$installed" = no; then ++ if test no = "$installed"; then + func_append notinst_deplibs " $lib" + need_relink=yes + fi +@@ -6705,24 +7972,24 @@ + + # Warn about portability, can't link against -module's on some + # systems (darwin). Don't bleat about dlopened modules though! +- dlopenmodule="" ++ dlopenmodule= + for dlpremoduletest in $dlprefiles; do + if test "X$dlpremoduletest" = "X$lib"; then +- dlopenmodule="$dlpremoduletest" ++ dlopenmodule=$dlpremoduletest + break + fi + done +- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then ++ if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then + echo +- if test "$linkmode" = prog; then ++ if test prog = "$linkmode"; then + $ECHO "*** Warning: Linking the executable $output against the loadable module" + else + $ECHO "*** Warning: Linking the shared library $output against the loadable module" + fi + $ECHO "*** $linklib is not portable!" + fi +- if test "$linkmode" = lib && +- test "$hardcode_into_libs" = yes; then ++ if test lib = "$linkmode" && ++ test yes = "$hardcode_into_libs"; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. +@@ -6750,43 +8017,43 @@ + # figure out the soname + set dummy $library_names + shift +- realname="$1" ++ realname=$1 + shift + libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then +- soname="$dlname" ++ soname=$dlname + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin* | mingw* | *cegcc*) + func_arith $current - $age + major=$func_arith_result +- versuffix="-$major" ++ versuffix=-$major + ;; + esac + eval soname=\"$soname_spec\" + else +- soname="$realname" ++ soname=$realname + fi + + # Make a new name for the extract_expsyms_cmds to use +- soroot="$soname" ++ soroot=$soname + func_basename "$soroot" +- soname="$func_basename_result" ++ soname=$func_basename_result + func_stripname 'lib' '.dll' "$soname" + newlib=libimp-$func_stripname_result.a + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else +- func_verbose "extracting exported symbol list from \`$soname'" ++ func_verbose "extracting exported symbol list from '$soname'" + func_execute_cmds "$extract_expsyms_cmds" 'exit $?' + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else +- func_verbose "generating import library for \`$soname'" ++ func_verbose "generating import library for '$soname'" + func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library +@@ -6794,58 +8061,58 @@ + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + +- if test "$linkmode" = prog || test "$opt_mode" != relink; then ++ if test prog = "$linkmode" || test relink != "$opt_mode"; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) +- if test "$hardcode_direct" = no; then +- add="$dir/$linklib" ++ if test no = "$hardcode_direct"; then ++ add=$dir/$linklib + case $host in +- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; +- *-*-sysv4*uw2*) add_dir="-L$dir" ;; ++ *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; ++ *-*-sysv4*uw2*) add_dir=-L$dir ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ +- *-*-unixware7*) add_dir="-L$dir" ;; ++ *-*-unixware7*) add_dir=-L$dir ;; + *-*-darwin* ) +- # if the lib is a (non-dlopened) module then we can not ++ # if the lib is a (non-dlopened) module then we cannot + # link against it, someone is ignoring the earlier warnings + if /usr/bin/file -L $add 2> /dev/null | +- $GREP ": [^:]* bundle" >/dev/null ; then ++ $GREP ": [^:]* bundle" >/dev/null; then + if test "X$dlopenmodule" != "X$lib"; then + $ECHO "*** Warning: lib $linklib is a module, not a shared library" +- if test -z "$old_library" ; then ++ if test -z "$old_library"; then + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" + else +- add="$dir/$old_library" ++ add=$dir/$old_library + fi + elif test -n "$old_library"; then +- add="$dir/$old_library" ++ add=$dir/$old_library + fi + fi + esac +- elif test "$hardcode_minus_L" = no; then ++ elif test no = "$hardcode_minus_L"; then + case $host in +- *-*-sunos*) add_shlibpath="$dir" ;; ++ *-*-sunos*) add_shlibpath=$dir ;; + esac +- add_dir="-L$dir" +- add="-l$name" +- elif test "$hardcode_shlibpath_var" = no; then +- add_shlibpath="$dir" +- add="-l$name" ++ add_dir=-L$dir ++ add=-l$name ++ elif test no = "$hardcode_shlibpath_var"; then ++ add_shlibpath=$dir ++ add=-l$name + else + lib_linked=no + fi + ;; + relink) +- if test "$hardcode_direct" = yes && +- test "$hardcode_direct_absolute" = no; then +- add="$dir/$linklib" +- elif test "$hardcode_minus_L" = yes; then +- add_dir="-L$absdir" ++ if test yes = "$hardcode_direct" && ++ test no = "$hardcode_direct_absolute"; then ++ add=$dir/$linklib ++ elif test yes = "$hardcode_minus_L"; then ++ add_dir=-L$absdir + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in +@@ -6854,10 +8121,10 @@ + ;; + esac + fi +- add="-l$name" +- elif test "$hardcode_shlibpath_var" = yes; then +- add_shlibpath="$dir" +- add="-l$name" ++ add=-l$name ++ elif test yes = "$hardcode_shlibpath_var"; then ++ add_shlibpath=$dir ++ add=-l$name + else + lib_linked=no + fi +@@ -6865,7 +8132,7 @@ + *) lib_linked=no ;; + esac + +- if test "$lib_linked" != yes; then ++ if test yes != "$lib_linked"; then + func_fatal_configuration "unsupported hardcode properties" + fi + +@@ -6875,15 +8142,15 @@ + *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi +- if test "$linkmode" = prog; then ++ if test prog = "$linkmode"; then + test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" + test -n "$add" && compile_deplibs="$add $compile_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" +- if test "$hardcode_direct" != yes && +- test "$hardcode_minus_L" != yes && +- test "$hardcode_shlibpath_var" = yes; then ++ if test yes != "$hardcode_direct" && ++ test yes != "$hardcode_minus_L" && ++ test yes = "$hardcode_shlibpath_var"; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; +@@ -6892,33 +8159,33 @@ + fi + fi + +- if test "$linkmode" = prog || test "$opt_mode" = relink; then ++ if test prog = "$linkmode" || test relink = "$opt_mode"; then + add_shlibpath= + add_dir= + add= + # Finalize command for both is simple: just hardcode it. +- if test "$hardcode_direct" = yes && +- test "$hardcode_direct_absolute" = no; then +- add="$libdir/$linklib" +- elif test "$hardcode_minus_L" = yes; then +- add_dir="-L$libdir" +- add="-l$name" +- elif test "$hardcode_shlibpath_var" = yes; then ++ if test yes = "$hardcode_direct" && ++ test no = "$hardcode_direct_absolute"; then ++ add=$libdir/$linklib ++ elif test yes = "$hardcode_minus_L"; then ++ add_dir=-L$libdir ++ add=-l$name ++ elif test yes = "$hardcode_shlibpath_var"; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac +- add="-l$name" +- elif test "$hardcode_automatic" = yes; then ++ add=-l$name ++ elif test yes = "$hardcode_automatic"; then + if test -n "$inst_prefix_dir" && +- test -f "$inst_prefix_dir$libdir/$linklib" ; then +- add="$inst_prefix_dir$libdir/$linklib" ++ test -f "$inst_prefix_dir$libdir/$linklib"; then ++ add=$inst_prefix_dir$libdir/$linklib + else +- add="$libdir/$linklib" ++ add=$libdir/$linklib + fi + else + # We cannot seem to hardcode it, guess we'll fake it. +- add_dir="-L$libdir" ++ add_dir=-L$libdir + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in +@@ -6927,10 +8194,10 @@ + ;; + esac + fi +- add="-l$name" ++ add=-l$name + fi + +- if test "$linkmode" = prog; then ++ if test prog = "$linkmode"; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else +@@ -6938,43 +8205,43 @@ + test -n "$add" && deplibs="$add $deplibs" + fi + fi +- elif test "$linkmode" = prog; then ++ elif test prog = "$linkmode"; then + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. +- if test "$hardcode_direct" != unsupported; then +- test -n "$old_library" && linklib="$old_library" ++ if test unsupported != "$hardcode_direct"; then ++ test -n "$old_library" && linklib=$old_library + compile_deplibs="$dir/$linklib $compile_deplibs" + finalize_deplibs="$dir/$linklib $finalize_deplibs" + else + compile_deplibs="-l$name -L$dir $compile_deplibs" + finalize_deplibs="-l$name -L$dir $finalize_deplibs" + fi +- elif test "$build_libtool_libs" = yes; then ++ elif test yes = "$build_libtool_libs"; then + # Not a shared library +- if test "$deplibs_check_method" != pass_all; then ++ if test pass_all != "$deplibs_check_method"; then + # We're trying link a shared library against a static one + # but the system doesn't support it. + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. + echo +- $ECHO "*** Warning: This system can not link to static lib archive $lib." ++ $ECHO "*** Warning: This system cannot link to static lib archive $lib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." +- if test "$module" = yes; then ++ if test yes = "$module"; then + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" +- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" ++ echo "*** lists from a program, using 'nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." +- echo "*** \`nm' from GNU binutils and a full rebuild may help." ++ echo "*** 'nm' from GNU binutils and a full rebuild may help." + fi +- if test "$build_old_libs" = no; then ++ if test no = "$build_old_libs"; then + build_libtool_libs=module + build_old_libs=yes + else +@@ -6987,11 +8254,11 @@ + fi + fi # link shared/static library? + +- if test "$linkmode" = lib; then ++ if test lib = "$linkmode"; then + if test -n "$dependency_libs" && +- { test "$hardcode_into_libs" != yes || +- test "$build_old_libs" = yes || +- test "$link_static" = yes; }; then ++ { test yes != "$hardcode_into_libs" || ++ test yes = "$build_old_libs" || ++ test yes = "$link_static"; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do +@@ -7005,12 +8272,12 @@ + *) func_append temp_deplibs " $libdir";; + esac + done +- dependency_libs="$temp_deplibs" ++ dependency_libs=$temp_deplibs + fi + + func_append newlib_search_path " $absdir" + # Link against this library +- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" ++ test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do +@@ -7020,7 +8287,7 @@ + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac +- if $opt_preserve_dup_deps ; then ++ if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; +@@ -7029,12 +8296,12 @@ + func_append tmp_libs " $func_resolve_sysroot_result" + done + +- if test "$link_all_deplibs" != no; then ++ if test no != "$link_all_deplibs"; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + path= + case $deplib in +- -L*) path="$deplib" ;; ++ -L*) path=$deplib ;; + *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result +@@ -7042,12 +8309,12 @@ + dir=$func_dirname_result + # We need an absolute path. + case $dir in +- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; ++ [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then +- func_warning "cannot determine absolute directory name of \`$dir'" +- absdir="$dir" ++ func_warning "cannot determine absolute directory name of '$dir'" ++ absdir=$dir + fi + ;; + esac +@@ -7055,35 +8322,35 @@ + case $host in + *-*-darwin*) + depdepl= +- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` +- if test -n "$deplibrary_names" ; then +- for tmp in $deplibrary_names ; do ++ eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ if test -n "$deplibrary_names"; then ++ for tmp in $deplibrary_names; do + depdepl=$tmp + done +- if test -f "$absdir/$objdir/$depdepl" ; then +- depdepl="$absdir/$objdir/$depdepl" +- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` ++ if test -f "$absdir/$objdir/$depdepl"; then ++ depdepl=$absdir/$objdir/$depdepl ++ darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -z "$darwin_install_name"; then +- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` ++ darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi +- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" +- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" ++ func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" ++ func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" + path= + fi + fi + ;; + *) +- path="-L$absdir/$objdir" ++ path=-L$absdir/$objdir + ;; + esac + else +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ +- func_fatal_error "\`$deplib' is not a valid libtool archive" ++ func_fatal_error "'$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ +- func_warning "\`$deplib' seems to be moved" +- +- path="-L$absdir" ++ func_warning "'$deplib' seems to be moved" ++ ++ path=-L$absdir + fi + ;; + esac +@@ -7095,23 +8362,23 @@ + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs +- if test "$pass" = link; then +- if test "$linkmode" = "prog"; then ++ if test link = "$pass"; then ++ if test prog = "$linkmode"; then + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" + finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" + else + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + fi + fi +- dependency_libs="$newdependency_libs" +- if test "$pass" = dlpreopen; then ++ dependency_libs=$newdependency_libs ++ if test dlpreopen = "$pass"; then + # Link the dlpreopened libraries before other libraries + for deplib in $save_deplibs; do + deplibs="$deplib $deplibs" + done + fi +- if test "$pass" != dlopen; then +- if test "$pass" != conv; then ++ if test dlopen != "$pass"; then ++ test conv = "$pass" || { + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do +@@ -7121,12 +8388,12 @@ + esac + done + newlib_search_path= +- fi +- +- if test "$linkmode,$pass" != "prog,link"; then +- vars="deplibs" ++ } ++ ++ if test prog,link = "$linkmode,$pass"; then ++ vars="compile_deplibs finalize_deplibs" + else +- vars="compile_deplibs finalize_deplibs" ++ vars=deplibs + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order +@@ -7187,59 +8454,59 @@ + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= +- for i in $dependency_libs ; do ++ for i in $dependency_libs; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) +- i="" ++ i= + ;; + esac +- if test -n "$i" ; then ++ if test -n "$i"; then + func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs + done # for pass +- if test "$linkmode" = prog; then +- dlfiles="$newdlfiles" ++ if test prog = "$linkmode"; then ++ dlfiles=$newdlfiles + fi +- if test "$linkmode" = prog || test "$linkmode" = lib; then +- dlprefiles="$newdlprefiles" ++ if test prog = "$linkmode" || test lib = "$linkmode"; then ++ dlprefiles=$newdlprefiles + fi + + case $linkmode in + oldlib) +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- func_warning "\`-dlopen' is ignored for archives" ++ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then ++ func_warning "'-dlopen' is ignored for archives" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) +- func_warning "\`-l' and \`-L' are ignored for archives" ;; ++ func_warning "'-l' and '-L' are ignored for archives" ;; + esac + + test -n "$rpath" && \ +- func_warning "\`-rpath' is ignored for archives" ++ func_warning "'-rpath' is ignored for archives" + + test -n "$xrpath" && \ +- func_warning "\`-R' is ignored for archives" ++ func_warning "'-R' is ignored for archives" + + test -n "$vinfo" && \ +- func_warning "\`-version-info/-version-number' is ignored for archives" ++ func_warning "'-version-info/-version-number' is ignored for archives" + + test -n "$release" && \ +- func_warning "\`-release' is ignored for archives" ++ func_warning "'-release' is ignored for archives" + + test -n "$export_symbols$export_symbols_regex" && \ +- func_warning "\`-export-symbols' is ignored for archives" ++ func_warning "'-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no +- oldlibs="$output" ++ oldlibs=$output + func_append objs "$old_deplibs" + ;; + + lib) +- # Make sure we only generate libraries of the form `libNAME.la'. ++ # Make sure we only generate libraries of the form 'libNAME.la'. + case $outputname in + lib*) + func_stripname 'lib' '.la' "$outputname" +@@ -7248,10 +8515,10 @@ + eval libname=\"$libname_spec\" + ;; + *) +- test "$module" = no && \ +- func_fatal_help "libtool library \`$output' must begin with \`lib'" +- +- if test "$need_lib_prefix" != no; then ++ test no = "$module" \ ++ && func_fatal_help "libtool library '$output' must begin with 'lib'" ++ ++ if test no != "$need_lib_prefix"; then + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result +@@ -7265,8 +8532,8 @@ + esac + + if test -n "$objs"; then +- if test "$deplibs_check_method" != pass_all; then +- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" ++ if test pass_all != "$deplibs_check_method"; then ++ func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" + else + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" +@@ -7275,21 +8542,21 @@ + fi + fi + +- test "$dlself" != no && \ +- func_warning "\`-dlopen self' is ignored for libtool libraries" ++ test no = "$dlself" \ ++ || func_warning "'-dlopen self' is ignored for libtool libraries" + + set dummy $rpath + shift +- test "$#" -gt 1 && \ +- func_warning "ignoring multiple \`-rpath's for a libtool library" +- +- install_libdir="$1" ++ test 1 -lt "$#" \ ++ && func_warning "ignoring multiple '-rpath's for a libtool library" ++ ++ install_libdir=$1 + + oldlibs= + if test -z "$rpath"; then +- if test "$build_libtool_libs" = yes; then ++ if test yes = "$build_libtool_libs"; then + # Building a libtool convenience library. +- # Some compilers have problems with a `.al' extension so ++ # Some compilers have problems with a '.al' extension so + # convenience libraries should have the same extension an + # archive normally would. + oldlibs="$output_objdir/$libname.$libext $oldlibs" +@@ -7298,20 +8565,20 @@ + fi + + test -n "$vinfo" && \ +- func_warning "\`-version-info/-version-number' is ignored for convenience libraries" ++ func_warning "'-version-info/-version-number' is ignored for convenience libraries" + + test -n "$release" && \ +- func_warning "\`-release' is ignored for convenience libraries" ++ func_warning "'-release' is ignored for convenience libraries" + else + + # Parse the version information argument. +- save_ifs="$IFS"; IFS=':' ++ save_ifs=$IFS; IFS=: + set dummy $vinfo 0 0 0 + shift +- IFS="$save_ifs" ++ IFS=$save_ifs + + test -n "$7" && \ +- func_fatal_help "too many parameters to \`-version-info'" ++ func_fatal_help "too many parameters to '-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts +@@ -7319,42 +8586,42 @@ + + case $vinfo_number in + yes) +- number_major="$1" +- number_minor="$2" +- number_revision="$3" ++ number_major=$1 ++ number_minor=$2 ++ number_revision=$3 + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix +- # which has an extra 1 added just for fun ++ # that has an extra 1 added just for fun + # + case $version_type in + # correct linux to gnu/linux during the next big refactor + darwin|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result +- age="$number_minor" +- revision="$number_revision" ++ age=$number_minor ++ revision=$number_revision + ;; + freebsd-aout|freebsd-elf|qnx|sunos) +- current="$number_major" +- revision="$number_minor" +- age="0" ++ current=$number_major ++ revision=$number_minor ++ age=0 + ;; + irix|nonstopux) + func_arith $number_major + $number_minor + current=$func_arith_result +- age="$number_minor" +- revision="$number_minor" ++ age=$number_minor ++ revision=$number_minor + lt_irix_increment=no + ;; + esac + ;; + no) +- current="$1" +- revision="$2" +- age="$3" ++ current=$1 ++ revision=$2 ++ age=$3 + ;; + esac + +@@ -7362,30 +8629,30 @@ + case $current in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- func_error "CURRENT \`$current' must be a nonnegative integer" +- func_fatal_error "\`$vinfo' is not valid version information" ++ func_error "CURRENT '$current' must be a nonnegative integer" ++ func_fatal_error "'$vinfo' is not valid version information" + ;; + esac + + case $revision in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- func_error "REVISION \`$revision' must be a nonnegative integer" +- func_fatal_error "\`$vinfo' is not valid version information" ++ func_error "REVISION '$revision' must be a nonnegative integer" ++ func_fatal_error "'$vinfo' is not valid version information" + ;; + esac + + case $age in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- func_error "AGE \`$age' must be a nonnegative integer" +- func_fatal_error "\`$vinfo' is not valid version information" ++ func_error "AGE '$age' must be a nonnegative integer" ++ func_fatal_error "'$vinfo' is not valid version information" + ;; + esac + + if test "$age" -gt "$current"; then +- func_error "AGE \`$age' is greater than the current interface number \`$current'" +- func_fatal_error "\`$vinfo' is not valid version information" ++ func_error "AGE '$age' is greater than the current interface number '$current'" ++ func_fatal_error "'$vinfo' is not valid version information" + fi + + # Calculate the version variables. +@@ -7400,26 +8667,35 @@ + # verstring for coding it into the library header + func_arith $current - $age + major=.$func_arith_result +- versuffix="$major.$age.$revision" ++ versuffix=$major.$age.$revision + # Darwin ld doesn't like 0 for these options... + func_arith $current + 1 + minor_current=$func_arith_result +- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" ++ xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ++ # On Darwin other compilers ++ case $CC in ++ nagfor*) ++ verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" ++ ;; ++ *) ++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ++ ;; ++ esac + ;; + + freebsd-aout) +- major=".$current" +- versuffix=".$current.$revision"; ++ major=.$current ++ versuffix=.$current.$revision + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current" ++ major=.$current ++ versuffix=.$current + ;; + + irix | nonstopux) +- if test "X$lt_irix_increment" = "Xno"; then ++ if test no = "$lt_irix_increment"; then + func_arith $current - $age + else + func_arith $current - $age + 1 +@@ -7430,69 +8706,69 @@ + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac +- verstring="$verstring_prefix$major.$revision" ++ verstring=$verstring_prefix$major.$revision + + # Add in all the interfaces that we are compatible with. + loop=$revision +- while test "$loop" -ne 0; do ++ while test 0 -ne "$loop"; do + func_arith $revision - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result +- verstring="$verstring_prefix$major.$iface:$verstring" ++ verstring=$verstring_prefix$major.$iface:$verstring + done + +- # Before this point, $major must not contain `.'. ++ # Before this point, $major must not contain '.'. + major=.$major +- versuffix="$major.$revision" ++ versuffix=$major.$revision + ;; + + linux) # correct to gnu/linux during the next big refactor + func_arith $current - $age + major=.$func_arith_result +- versuffix="$major.$age.$revision" ++ versuffix=$major.$age.$revision + ;; + + osf) + func_arith $current - $age + major=.$func_arith_result +- versuffix=".$current.$age.$revision" +- verstring="$current.$age.$revision" ++ versuffix=.$current.$age.$revision ++ verstring=$current.$age.$revision + + # Add in all the interfaces that we are compatible with. + loop=$age +- while test "$loop" -ne 0; do ++ while test 0 -ne "$loop"; do + func_arith $current - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result +- verstring="$verstring:${iface}.0" ++ verstring=$verstring:$iface.0 + done + + # Make executables depend on our current version. +- func_append verstring ":${current}.0" ++ func_append verstring ":$current.0" + ;; + + qnx) +- major=".$current" +- versuffix=".$current" ++ major=.$current ++ versuffix=.$current + ;; + + sunos) +- major=".$current" +- versuffix=".$current.$revision" ++ major=.$current ++ versuffix=.$current.$revision + ;; + + windows) + # Use '-' rather than '.', since we only want one +- # extension on DOS 8.3 filesystems. ++ # extension on DOS 8.3 file systems. + func_arith $current - $age + major=$func_arith_result +- versuffix="-$major" ++ versuffix=-$major + ;; + + *) +- func_fatal_configuration "unknown library version type \`$version_type'" ++ func_fatal_configuration "unknown library version type '$version_type'" + ;; + esac + +@@ -7506,42 +8782,45 @@ + verstring= + ;; + *) +- verstring="0.0" ++ verstring=0.0 + ;; + esac +- if test "$need_version" = no; then ++ if test no = "$need_version"; then + versuffix= + else +- versuffix=".0.0" ++ versuffix=.0.0 + fi + fi + + # Remove version info from name if versioning should be avoided +- if test "$avoid_version" = yes && test "$need_version" = no; then ++ if test yes,no = "$avoid_version,$need_version"; then + major= + versuffix= +- verstring="" ++ verstring= + fi + + # Check to see if the archive will have undefined symbols. +- if test "$allow_undefined" = yes; then +- if test "$allow_undefined_flag" = unsupported; then +- func_warning "undefined symbols not allowed in $host shared libraries" +- build_libtool_libs=no +- build_old_libs=yes ++ if test yes = "$allow_undefined"; then ++ if test unsupported = "$allow_undefined_flag"; then ++ if test yes = "$build_old_libs"; then ++ func_warning "undefined symbols not allowed in $host shared libraries; building static only" ++ build_libtool_libs=no ++ else ++ func_fatal_error "can't build $host shared library unless -no-undefined is specified" ++ fi + fi + else + # Don't allow undefined symbols. +- allow_undefined_flag="$no_undefined_flag" ++ allow_undefined_flag=$no_undefined_flag + fi + + fi + +- func_generate_dlsyms "$libname" "$libname" "yes" ++ func_generate_dlsyms "$libname" "$libname" : + func_append libobjs " $symfileobj" +- test "X$libobjs" = "X " && libobjs= +- +- if test "$opt_mode" != relink; then ++ test " " = "$libobjs" && libobjs= ++ ++ if test relink != "$opt_mode"; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= +@@ -7550,8 +8829,8 @@ + case $p in + *.$objext | *.gcno) + ;; +- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) +- if test "X$precious_files_regex" != "X"; then ++ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) ++ if test -n "$precious_files_regex"; then + if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue +@@ -7567,11 +8846,11 @@ + fi + + # Now set the variables for building old libraries. +- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then ++ if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then + func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. +- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` ++ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. +@@ -7592,13 +8871,13 @@ + *) func_append finalize_rpath " $libdir" ;; + esac + done +- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then ++ if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened +- old_dlfiles="$dlfiles" ++ old_dlfiles=$dlfiles + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in +@@ -7608,7 +8887,7 @@ + done + + # Make sure dlprefiles contains only unique files +- old_dlprefiles="$dlprefiles" ++ old_dlprefiles=$dlprefiles + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in +@@ -7617,7 +8896,7 @@ + esac + done + +- if test "$build_libtool_libs" = yes; then ++ if test yes = "$build_libtool_libs"; then + if test -n "$rpath"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) +@@ -7641,7 +8920,7 @@ + ;; + *) + # Add libc to deplibs on all other systems if necessary. +- if test "$build_libtool_need_lc" = "yes"; then ++ if test yes = "$build_libtool_need_lc"; then + func_append deplibs " -lc" + fi + ;; +@@ -7657,9 +8936,9 @@ + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? +- release="" +- versuffix="" +- major="" ++ release= ++ versuffix= ++ major= + newdeplibs= + droppeddeps=no + case $deplibs_check_method in +@@ -7688,20 +8967,20 @@ + -l*) + func_stripname -l '' "$i" + name=$func_stripname_result +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ if test yes = "$allow_libtool_libs_with_static_runtimes"; then + case " $predeps $postdeps " in + *" $i "*) + func_append newdeplibs " $i" +- i="" ++ i= + ;; + esac + fi +- if test -n "$i" ; then ++ if test -n "$i"; then + libname=`eval "\\$ECHO \"$libname_spec\""` + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 +- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then ++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then + func_append newdeplibs " $i" + else + droppeddeps=yes +@@ -7731,20 +9010,20 @@ + $opt_dry_run || $RM conftest + if $LTCC $LTCFLAGS -o conftest conftest.c $i; then + ldd_output=`ldd conftest` +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ if test yes = "$allow_libtool_libs_with_static_runtimes"; then + case " $predeps $postdeps " in + *" $i "*) + func_append newdeplibs " $i" +- i="" ++ i= + ;; + esac + fi +- if test -n "$i" ; then ++ if test -n "$i"; then + libname=`eval "\\$ECHO \"$libname_spec\""` + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 +- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then ++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then + func_append newdeplibs " $i" + else + droppeddeps=yes +@@ -7781,24 +9060,24 @@ + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ if test yes = "$allow_libtool_libs_with_static_runtimes"; then + case " $predeps $postdeps " in + *" $a_deplib "*) + func_append newdeplibs " $a_deplib" +- a_deplib="" ++ a_deplib= + ;; + esac + fi +- if test -n "$a_deplib" ; then ++ if test -n "$a_deplib"; then + libname=`eval "\\$ECHO \"$libname_spec\""` + if test -n "$file_magic_glob"; then + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` + else + libnameglob=$libname + fi +- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` ++ test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do +- if test "$want_nocaseglob" = yes; then ++ if test yes = "$want_nocaseglob"; then + shopt -s nocaseglob + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + $nocaseglob +@@ -7816,25 +9095,25 @@ + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? +- potlib="$potent_lib" ++ potlib=$potent_lib + while test -h "$potlib" 2>/dev/null; do +- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` ++ potliblink=`ls -ld $potlib | $SED 's/.* -> //'` + case $potliblink in +- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; +- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; ++ [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; ++ *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; + esac + done + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" +- a_deplib="" ++ a_deplib= + break 2 + fi + done + done + fi +- if test -n "$a_deplib" ; then ++ if test -n "$a_deplib"; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." +@@ -7842,7 +9121,7 @@ + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" +- if test -z "$potlib" ; then ++ if test -z "$potlib"; then + $ECHO "*** with $libname but no candidates were found. (...for file magic test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" +@@ -7865,30 +9144,30 @@ + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ if test yes = "$allow_libtool_libs_with_static_runtimes"; then + case " $predeps $postdeps " in + *" $a_deplib "*) + func_append newdeplibs " $a_deplib" +- a_deplib="" ++ a_deplib= + ;; + esac + fi +- if test -n "$a_deplib" ; then ++ if test -n "$a_deplib"; then + libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do +- potlib="$potent_lib" # see symlink-check above in file_magic test ++ potlib=$potent_lib # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" +- a_deplib="" ++ a_deplib= + break 2 + fi + done + done + fi +- if test -n "$a_deplib" ; then ++ if test -n "$a_deplib"; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." +@@ -7896,7 +9175,7 @@ + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" +- if test -z "$potlib" ; then ++ if test -z "$potlib"; then + $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" +@@ -7912,18 +9191,18 @@ + done # Gone through all deplibs. + ;; + none | unknown | *) +- newdeplibs="" ++ newdeplibs= + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +- for i in $predeps $postdeps ; do ++ if test yes = "$allow_libtool_libs_with_static_runtimes"; then ++ for i in $predeps $postdeps; do + # can't use Xsed below, because $i might contain '/' +- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` ++ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` + done + fi + case $tmp_deplibs in + *[!\ \ ]*) + echo +- if test "X$deplibs_check_method" = "Xnone"; then ++ if test none = "$deplibs_check_method"; then + echo "*** Warning: inter-library dependencies are not supported in this platform." + else + echo "*** Warning: inter-library dependencies are not known to be supported." +@@ -7947,8 +9226,8 @@ + ;; + esac + +- if test "$droppeddeps" = yes; then +- if test "$module" = yes; then ++ if test yes = "$droppeddeps"; then ++ if test yes = "$module"; then + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO "*** dependencies of module $libname. Therefore, libtool will create" +@@ -7957,12 +9236,12 @@ + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" +- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" ++ echo "*** lists from a program, using 'nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." +- echo "*** \`nm' from GNU binutils and a full rebuild may help." ++ echo "*** 'nm' from GNU binutils and a full rebuild may help." + fi +- if test "$build_old_libs" = no; then +- oldlibs="$output_objdir/$libname.$libext" ++ if test no = "$build_old_libs"; then ++ oldlibs=$output_objdir/$libname.$libext + build_libtool_libs=module + build_old_libs=yes + else +@@ -7973,14 +9252,14 @@ + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." + +- if test "$allow_undefined" = no; then ++ if test no = "$allow_undefined"; then + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." +- if test "$build_old_libs" = no; then +- oldlibs="$output_objdir/$libname.$libext" ++ if test no = "$build_old_libs"; then ++ oldlibs=$output_objdir/$libname.$libext + build_libtool_libs=module + build_old_libs=yes + else +@@ -8026,7 +9305,7 @@ + *) func_append new_libs " $deplib" ;; + esac + done +- deplibs="$new_libs" ++ deplibs=$new_libs + + # All the library-specific variables (install_libdir is set above). + library_names= +@@ -8034,25 +9313,25 @@ + dlname= + + # Test again, we may have decided not to build it any more +- if test "$build_libtool_libs" = yes; then +- # Remove ${wl} instances when linking with ld. ++ if test yes = "$build_libtool_libs"; then ++ # Remove $wl instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac +- if test "$hardcode_into_libs" = yes; then ++ if test yes = "$hardcode_into_libs"; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= +- rpath="$finalize_rpath" +- test "$opt_mode" != relink && rpath="$compile_rpath$rpath" ++ rpath=$finalize_rpath ++ test relink = "$opt_mode" || rpath=$compile_rpath$rpath + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then +- hardcode_libdirs="$libdir" ++ hardcode_libdirs=$libdir + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in +@@ -8077,7 +9356,7 @@ + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then +- libdir="$hardcode_libdirs" ++ libdir=$hardcode_libdirs + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then +@@ -8091,8 +9370,8 @@ + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + +- shlibpath="$finalize_shlibpath" +- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ shlibpath=$finalize_shlibpath ++ test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi +@@ -8102,19 +9381,19 @@ + eval library_names=\"$library_names_spec\" + set dummy $library_names + shift +- realname="$1" ++ realname=$1 + shift + + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else +- soname="$realname" ++ soname=$realname + fi + if test -z "$dlname"; then + dlname=$soname + fi + +- lib="$output_objdir/$realname" ++ lib=$output_objdir/$realname + linknames= + for link + do +@@ -8128,7 +9407,7 @@ + delfiles= + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" +- export_symbols="$output_objdir/$libname.uexp" ++ export_symbols=$output_objdir/$libname.uexp + func_append delfiles " $export_symbols" + fi + +@@ -8137,31 +9416,31 @@ + cygwin* | mingw* | cegcc*) + if test -n "$export_symbols" && test -z "$export_symbols_regex"; then + # exporting using user supplied symfile +- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then ++ func_dll_def_p "$export_symbols" || { + # and it's NOT already a .def file. Must figure out + # which of the given symbols are data symbols and tag + # them as such. So, trigger use of export_symbols_cmds. + # export_symbols gets reassigned inside the "prepare + # the list of exported symbols" if statement, so the + # include_expsyms logic still works. +- orig_export_symbols="$export_symbols" ++ orig_export_symbols=$export_symbols + export_symbols= + always_export_symbols=yes +- fi ++ } + fi + ;; + esac + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then +- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then +- func_verbose "generating symbol list for \`$libname.la'" +- export_symbols="$output_objdir/$libname.exp" ++ if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then ++ func_verbose "generating symbol list for '$libname.la'" ++ export_symbols=$output_objdir/$libname.exp + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds +- save_ifs="$IFS"; IFS='~' ++ save_ifs=$IFS; IFS='~' + for cmd1 in $cmds; do +- IFS="$save_ifs" ++ IFS=$save_ifs + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in +@@ -8175,7 +9454,7 @@ + try_normal_branch=no + ;; + esac +- if test "$try_normal_branch" = yes \ ++ if test yes = "$try_normal_branch" \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then +@@ -8186,7 +9465,7 @@ + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output +- output=${output_objdir}/${output_la}.nm ++ output=$output_objdir/$output_la.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" +@@ -8209,8 +9488,8 @@ + break + fi + done +- IFS="$save_ifs" +- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then ++ IFS=$save_ifs ++ if test -n "$export_symbols_regex" && test : != "$skipped_export"; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi +@@ -8218,16 +9497,16 @@ + fi + + if test -n "$export_symbols" && test -n "$include_expsyms"; then +- tmp_export_symbols="$export_symbols" +- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" ++ tmp_export_symbols=$export_symbols ++ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + +- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then ++ if test : != "$skipped_export" && test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. +- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" ++ func_verbose "filter symbol list for '$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of +- # 's' commands which not all seds can handle. GNU sed should be fine ++ # 's' commands, which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. +@@ -8246,11 +9525,11 @@ + ;; + esac + done +- deplibs="$tmp_deplibs" ++ deplibs=$tmp_deplibs + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec" && +- test "$compiler_needs_object" = yes && ++ test yes = "$compiler_needs_object" && + test -z "$libobjs"; then + # extract the archives, so we have objects to list. + # TODO: could optimize this to just extract one archive. +@@ -8261,7 +9540,7 @@ + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else +- gentop="$output_objdir/${outputname}x" ++ gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $convenience +@@ -8270,18 +9549,18 @@ + fi + fi + +- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then ++ if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking +- if test "$opt_mode" = relink; then ++ if test relink = "$opt_mode"; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. +- if test "$module" = yes && test -n "$module_cmds" ; then ++ if test yes = "$module" && test -n "$module_cmds"; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds +@@ -8299,7 +9578,7 @@ + fi + fi + +- if test "X$skipped_export" != "X:" && ++ if test : != "$skipped_export" && + func_len " $test_cmds" && + len=$func_len_result && + test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then +@@ -8332,8 +9611,8 @@ + last_robj= + k=1 + +- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then +- output=${output_objdir}/${output_la}.lnkscript ++ if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then ++ output=$output_objdir/$output_la.lnkscript + func_verbose "creating GNU ld script: $output" + echo 'INPUT (' > $output + for obj in $save_libobjs +@@ -8345,14 +9624,14 @@ + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result +- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then +- output=${output_objdir}/${output_la}.lnk ++ elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then ++ output=$output_objdir/$output_la.lnk + func_verbose "creating linker input file list: $output" + : > $output + set x $save_libobjs + shift + firstobj= +- if test "$compiler_needs_object" = yes; then ++ if test yes = "$compiler_needs_object"; then + firstobj="$1 " + shift + fi +@@ -8367,7 +9646,7 @@ + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." +- output=$output_objdir/$output_la-${k}.$objext ++ output=$output_objdir/$output_la-$k.$objext + eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result +@@ -8379,13 +9658,13 @@ + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result +- if test "X$objlist" = X || ++ if test -z "$objlist" || + test "$len" -lt "$max_cmd_len"; then + func_append objlist " $obj" + else + # The command $test_cmds is almost too long, add a + # command to the queue. +- if test "$k" -eq 1 ; then ++ if test 1 -eq "$k"; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" +@@ -8395,10 +9674,10 @@ + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi +- last_robj=$output_objdir/$output_la-${k}.$objext ++ last_robj=$output_objdir/$output_la-$k.$objext + func_arith $k + 1 + k=$func_arith_result +- output=$output_objdir/$output_la-${k}.$objext ++ output=$output_objdir/$output_la-$k.$objext + objlist=" $obj" + func_len " $last_robj" + func_arith $len0 + $func_len_result +@@ -8410,9 +9689,9 @@ + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" +- eval concat_cmds=\"\${concat_cmds}$reload_cmds\" ++ eval concat_cmds=\"\$concat_cmds$reload_cmds\" + if test -n "$last_robj"; then +- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" ++ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + func_append delfiles " $output" + +@@ -8420,9 +9699,9 @@ + output= + fi + +- if ${skipped_export-false}; then +- func_verbose "generating symbol list for \`$libname.la'" +- export_symbols="$output_objdir/$libname.exp" ++ ${skipped_export-false} && { ++ func_verbose "generating symbol list for '$libname.la'" ++ export_symbols=$output_objdir/$libname.exp + $opt_dry_run || $RM $export_symbols + libobjs=$output + # Append the command to create the export file. +@@ -8431,16 +9710,16 @@ + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi +- fi ++ } + + test -n "$save_libobjs" && + func_verbose "creating a temporary reloadable object file: $output" + + # Loop through the commands generated above and execute them. +- save_ifs="$IFS"; IFS='~' ++ save_ifs=$IFS; IFS='~' + for cmd in $concat_cmds; do +- IFS="$save_ifs" +- $opt_silent || { ++ IFS=$save_ifs ++ $opt_quiet || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } +@@ -8448,7 +9727,7 @@ + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$opt_mode" = relink; then ++ if test relink = "$opt_mode"; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -8457,7 +9736,7 @@ + exit $lt_exit + } + done +- IFS="$save_ifs" ++ IFS=$save_ifs + + if test -n "$export_symbols_regex" && ${skipped_export-false}; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' +@@ -8465,18 +9744,18 @@ + fi + fi + +- if ${skipped_export-false}; then ++ ${skipped_export-false} && { + if test -n "$export_symbols" && test -n "$include_expsyms"; then +- tmp_export_symbols="$export_symbols" +- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" ++ tmp_export_symbols=$export_symbols ++ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. +- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" ++ func_verbose "filter symbol list for '$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of +- # 's' commands which not all seds can handle. GNU sed should be fine ++ # 's' commands, which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. +@@ -8485,7 +9764,7 @@ + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +- fi ++ } + + libobjs=$output + # Restore the value of output. +@@ -8499,7 +9778,7 @@ + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. +- if test "$module" = yes && test -n "$module_cmds" ; then ++ if test yes = "$module" && test -n "$module_cmds"; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds + else +@@ -8521,7 +9800,7 @@ + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then +- gentop="$output_objdir/${outputname}x" ++ gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +@@ -8529,11 +9808,12 @@ + test "X$libobjs" = "X " && libobjs= + fi + +- save_ifs="$IFS"; IFS='~' ++ save_ifs=$IFS; IFS='~' + for cmd in $cmds; do +- IFS="$save_ifs" ++ IFS=$sp$nl + eval cmd=\"$cmd\" +- $opt_silent || { ++ IFS=$save_ifs ++ $opt_quiet || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } +@@ -8541,7 +9821,7 @@ + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$opt_mode" = relink; then ++ if test relink = "$opt_mode"; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -8550,10 +9830,10 @@ + exit $lt_exit + } + done +- IFS="$save_ifs" ++ IFS=$save_ifs + + # Restore the uninstalled library and exit +- if test "$opt_mode" = relink; then ++ if test relink = "$opt_mode"; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then +@@ -8573,39 +9853,39 @@ + done + + # If -module or -export-dynamic was specified, set the dlname. +- if test "$module" = yes || test "$export_dynamic" = yes; then ++ if test yes = "$module" || test yes = "$export_dynamic"; then + # On all known operating systems, these are identical. +- dlname="$soname" ++ dlname=$soname + fi + fi + ;; + + obj) +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- func_warning "\`-dlopen' is ignored for objects" ++ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then ++ func_warning "'-dlopen' is ignored for objects" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) +- func_warning "\`-l' and \`-L' are ignored for objects" ;; ++ func_warning "'-l' and '-L' are ignored for objects" ;; + esac + + test -n "$rpath" && \ +- func_warning "\`-rpath' is ignored for objects" ++ func_warning "'-rpath' is ignored for objects" + + test -n "$xrpath" && \ +- func_warning "\`-R' is ignored for objects" ++ func_warning "'-R' is ignored for objects" + + test -n "$vinfo" && \ +- func_warning "\`-version-info' is ignored for objects" ++ func_warning "'-version-info' is ignored for objects" + + test -n "$release" && \ +- func_warning "\`-release' is ignored for objects" ++ func_warning "'-release' is ignored for objects" + + case $output in + *.lo) + test -n "$objs$old_deplibs" && \ +- func_fatal_error "cannot build library object \`$output' from non-libtool objects" ++ func_fatal_error "cannot build library object '$output' from non-libtool objects" + + libobj=$output + func_lo2o "$libobj" +@@ -8613,7 +9893,7 @@ + ;; + *) + libobj= +- obj="$output" ++ obj=$output + ;; + esac + +@@ -8636,7 +9916,7 @@ + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else +- gentop="$output_objdir/${obj}x" ++ gentop=$output_objdir/${obj}x + func_append generated " $gentop" + + func_extract_archives $gentop $convenience +@@ -8645,12 +9925,12 @@ + fi + + # If we're not building shared, we need to use non_pic_objs +- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" ++ test yes = "$build_libtool_libs" || libobjs=$non_pic_objects + + # Create the old-style object. +- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test +- +- output="$obj" ++ reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs ++ ++ output=$obj + func_execute_cmds "$reload_cmds" 'exit $?' + + # Exit if we aren't doing a library object file. +@@ -8662,7 +9942,7 @@ + exit $EXIT_SUCCESS + fi + +- if test "$build_libtool_libs" != yes; then ++ test yes = "$build_libtool_libs" || { + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi +@@ -8672,12 +9952,12 @@ + # $show "echo timestamp > $libobj" + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS +- fi +- +- if test -n "$pic_flag" || test "$pic_mode" != default; then ++ } ++ ++ if test -n "$pic_flag" || test default != "$pic_mode"; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" +- output="$libobj" ++ output=$libobj + func_execute_cmds "$reload_cmds" 'exit $?' + fi + +@@ -8694,16 +9974,14 @@ + output=$func_stripname_result.exe;; + esac + test -n "$vinfo" && \ +- func_warning "\`-version-info' is ignored for programs" ++ func_warning "'-version-info' is ignored for programs" + + test -n "$release" && \ +- func_warning "\`-release' is ignored for programs" +- +- test "$preload" = yes \ +- && test "$dlopen_support" = unknown \ +- && test "$dlopen_self" = unknown \ +- && test "$dlopen_self_static" = unknown && \ +- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." ++ func_warning "'-release' is ignored for programs" ++ ++ $preload \ ++ && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ ++ && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) +@@ -8717,11 +9995,11 @@ + *-*-darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + # But is supposedly fixed on 10.4 or later (yay!). +- if test "$tagname" = CXX ; then ++ if test CXX = "$tagname"; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) +- func_append compile_command " ${wl}-bind_at_load" +- func_append finalize_command " ${wl}-bind_at_load" ++ func_append compile_command " $wl-bind_at_load" ++ func_append finalize_command " $wl-bind_at_load" + ;; + esac + fi +@@ -8757,7 +10035,7 @@ + *) func_append new_libs " $deplib" ;; + esac + done +- compile_deplibs="$new_libs" ++ compile_deplibs=$new_libs + + + func_append compile_command " $compile_deplibs" +@@ -8781,7 +10059,7 @@ + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then +- hardcode_libdirs="$libdir" ++ hardcode_libdirs=$libdir + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in +@@ -8804,7 +10082,7 @@ + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) +- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` ++ testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; +@@ -8821,10 +10099,10 @@ + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then +- libdir="$hardcode_libdirs" ++ libdir=$hardcode_libdirs + eval rpath=\" $hardcode_libdir_flag_spec\" + fi +- compile_rpath="$rpath" ++ compile_rpath=$rpath + + rpath= + hardcode_libdirs= +@@ -8832,7 +10110,7 @@ + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then +- hardcode_libdirs="$libdir" ++ hardcode_libdirs=$libdir + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in +@@ -8857,45 +10135,43 @@ + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then +- libdir="$hardcode_libdirs" ++ libdir=$hardcode_libdirs + eval rpath=\" $hardcode_libdir_flag_spec\" + fi +- finalize_rpath="$rpath" +- +- if test -n "$libobjs" && test "$build_old_libs" = yes; then ++ finalize_rpath=$rpath ++ ++ if test -n "$libobjs" && test yes = "$build_old_libs"; then + # Transform all the library objects into standard objects. + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + fi + +- func_generate_dlsyms "$outputname" "@PROGRAM@" "no" ++ func_generate_dlsyms "$outputname" "@PROGRAM@" false + + # template prelinking step + if test -n "$prelink_cmds"; then + func_execute_cmds "$prelink_cmds" 'exit $?' + fi + +- wrappers_required=yes ++ wrappers_required=: + case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. +- wrappers_required=no ++ wrappers_required=false + ;; + *cygwin* | *mingw* ) +- if test "$build_libtool_libs" != yes; then +- wrappers_required=no +- fi ++ test yes = "$build_libtool_libs" || wrappers_required=false + ;; + *) +- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then +- wrappers_required=no ++ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then ++ wrappers_required=false + fi + ;; + esac +- if test "$wrappers_required" = no; then ++ $wrappers_required || { + # Replace the output file specification. + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` +- link_command="$compile_command$compile_rpath" ++ link_command=$compile_command$compile_rpath + + # We have no uninstalled library dependencies, so finalize right now. + exit_status=0 +@@ -8908,12 +10184,12 @@ + fi + + # Delete the generated files. +- if test -f "$output_objdir/${outputname}S.${objext}"; then +- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' ++ if test -f "$output_objdir/${outputname}S.$objext"; then ++ func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' + fi + + exit $exit_status +- fi ++ } + + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" +@@ -8943,9 +10219,9 @@ + fi + fi + +- if test "$no_install" = yes; then ++ if test yes = "$no_install"; then + # We don't need to create a wrapper script. +- link_command="$compile_var$compile_command$compile_rpath" ++ link_command=$compile_var$compile_command$compile_rpath + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. +@@ -8962,27 +10238,28 @@ + exit $EXIT_SUCCESS + fi + +- if test "$hardcode_action" = relink; then +- # Fast installation is not supported +- link_command="$compile_var$compile_command$compile_rpath" +- relink_command="$finalize_var$finalize_command$finalize_rpath" +- +- func_warning "this platform does not like uninstalled shared libraries" +- func_warning "\`$output' will be relinked during installation" +- else +- if test "$fast_install" != no; then +- link_command="$finalize_var$compile_command$finalize_rpath" +- if test "$fast_install" = yes; then +- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` +- else +- # fast_install is set to needless +- relink_command= +- fi +- else +- link_command="$compile_var$compile_command$compile_rpath" +- relink_command="$finalize_var$finalize_command$finalize_rpath" +- fi +- fi ++ case $hardcode_action,$fast_install in ++ relink,*) ++ # Fast installation is not supported ++ link_command=$compile_var$compile_command$compile_rpath ++ relink_command=$finalize_var$finalize_command$finalize_rpath ++ ++ func_warning "this platform does not like uninstalled shared libraries" ++ func_warning "'$output' will be relinked during installation" ++ ;; ++ *,yes) ++ link_command=$finalize_var$compile_command$finalize_rpath ++ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` ++ ;; ++ *,no) ++ link_command=$compile_var$compile_command$compile_rpath ++ relink_command=$finalize_var$finalize_command$finalize_rpath ++ ;; ++ *,needless) ++ link_command=$finalize_var$compile_command$finalize_rpath ++ relink_command= ++ ;; ++ esac + + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` +@@ -9039,8 +10316,8 @@ + func_dirname_and_basename "$output" "" "." + output_name=$func_basename_result + output_path=$func_dirname_result +- cwrappersource="$output_path/$objdir/lt-$output_name.c" +- cwrapper="$output_path/$output_name.exe" ++ cwrappersource=$output_path/$objdir/lt-$output_name.c ++ cwrapper=$output_path/$output_name.exe + $RM $cwrappersource $cwrapper + trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + +@@ -9061,7 +10338,7 @@ + trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 + $opt_dry_run || { + # note: this script will not be executed, so do not chmod. +- if test "x$build" = "x$host" ; then ++ if test "x$build" = "x$host"; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result +@@ -9084,25 +10361,27 @@ + # See if we need to build an old-fashioned archive. + for oldlib in $oldlibs; do + +- if test "$build_libtool_libs" = convenience; then +- oldobjs="$libobjs_save $symfileobj" +- addlibs="$convenience" +- build_libtool_libs=no +- else +- if test "$build_libtool_libs" = module; then +- oldobjs="$libobjs_save" ++ case $build_libtool_libs in ++ convenience) ++ oldobjs="$libobjs_save $symfileobj" ++ addlibs=$convenience + build_libtool_libs=no +- else ++ ;; ++ module) ++ oldobjs=$libobjs_save ++ addlibs=$old_convenience ++ build_libtool_libs=no ++ ;; ++ *) + oldobjs="$old_deplibs $non_pic_objects" +- if test "$preload" = yes && test -f "$symfileobj"; then +- func_append oldobjs " $symfileobj" +- fi +- fi +- addlibs="$old_convenience" +- fi ++ $preload && test -f "$symfileobj" \ ++ && func_append oldobjs " $symfileobj" ++ addlibs=$old_convenience ++ ;; ++ esac + + if test -n "$addlibs"; then +- gentop="$output_objdir/${outputname}x" ++ gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $addlibs +@@ -9110,13 +10389,13 @@ + fi + + # Do each command in the archive commands. +- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then ++ if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then + cmds=$old_archive_from_new_cmds + else + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then +- gentop="$output_objdir/${outputname}x" ++ gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +@@ -9137,7 +10416,7 @@ + : + else + echo "copying selected object files to avoid basename conflicts..." +- gentop="$output_objdir/${outputname}x" ++ gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs +@@ -9146,7 +10425,7 @@ + for obj in $save_oldobjs + do + func_basename "$obj" +- objbase="$func_basename_result" ++ objbase=$func_basename_result + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) +@@ -9215,18 +10494,18 @@ + else + # the above command should be used before it gets too long + oldobjs=$objlist +- if test "$obj" = "$last_oldobj" ; then ++ if test "$obj" = "$last_oldobj"; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" ++ eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" + objlist= + len=$len0 + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist +- if test "X$oldobjs" = "X" ; then ++ if test -z "$oldobjs"; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" +@@ -9243,7 +10522,7 @@ + case $output in + *.la) + old_library= +- test "$build_old_libs" = yes && old_library="$libname.$libext" ++ test yes = "$build_old_libs" && old_library=$libname.$libext + func_verbose "creating $output" + + # Preserve any variables that may affect compiler behavior +@@ -9258,31 +10537,31 @@ + fi + done + # Quote the link command for shipping. +- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" ++ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` +- if test "$hardcode_automatic" = yes ; then ++ if test yes = "$hardcode_automatic"; then + relink_command= + fi + + # Only create the output if not a dry run. + $opt_dry_run || { + for installed in no yes; do +- if test "$installed" = yes; then ++ if test yes = "$installed"; then + if test -z "$install_libdir"; then + break + fi +- output="$output_objdir/$outputname"i ++ output=$output_objdir/${outputname}i + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do + case $deplib in + *.la) + func_basename "$deplib" +- name="$func_basename_result" ++ name=$func_basename_result + func_resolve_sysroot "$deplib" +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` ++ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ +- func_fatal_error "\`$deplib' is not a valid libtool archive" ++ func_fatal_error "'$deplib' is not a valid libtool archive" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) +@@ -9298,23 +10577,23 @@ + *) func_append newdependency_libs " $deplib" ;; + esac + done +- dependency_libs="$newdependency_libs" ++ dependency_libs=$newdependency_libs + newdlfiles= + + for lib in $dlfiles; do + case $lib in + *.la) + func_basename "$lib" +- name="$func_basename_result" +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ name=$func_basename_result ++ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ +- func_fatal_error "\`$lib' is not a valid libtool archive" ++ func_fatal_error "'$lib' is not a valid libtool archive" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; + *) func_append newdlfiles " $lib" ;; + esac + done +- dlfiles="$newdlfiles" ++ dlfiles=$newdlfiles + newdlprefiles= + for lib in $dlprefiles; do + case $lib in +@@ -9324,34 +10603,34 @@ + # didn't already link the preopened objects directly into + # the library: + func_basename "$lib" +- name="$func_basename_result" +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ name=$func_basename_result ++ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ +- func_fatal_error "\`$lib' is not a valid libtool archive" ++ func_fatal_error "'$lib' is not a valid libtool archive" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done +- dlprefiles="$newdlprefiles" ++ dlprefiles=$newdlprefiles + else + newdlfiles= + for lib in $dlfiles; do + case $lib in +- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlfiles " $abs" + done +- dlfiles="$newdlfiles" ++ dlfiles=$newdlfiles + newdlprefiles= + for lib in $dlprefiles; do + case $lib in +- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlprefiles " $abs" + done +- dlprefiles="$newdlprefiles" ++ dlprefiles=$newdlprefiles + fi + $RM $output + # place dlname in correct position for cygwin +@@ -9367,10 +10646,9 @@ + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. +- if test "x$bindir" != x ; +- then ++ if test -n "$bindir"; then + func_relative_path "$install_libdir" "$bindir" +- tdlname=$func_relative_path_result$dlname ++ tdlname=$func_relative_path_result/$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname +@@ -9379,7 +10657,7 @@ + esac + $ECHO > $output "\ + # $outputname - a libtool library file +-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++# Generated by $PROGRAM (GNU $PACKAGE) $VERSION + # + # Please DO NOT delete this file! + # It is necessary for linking the library. +@@ -9393,7 +10671,7 @@ + # The name of the static archive. + old_library='$old_library' + +-# Linker flags that can not go in dependency_libs. ++# Linker flags that cannot go in dependency_libs. + inherited_linker_flags='$new_inherited_linker_flags' + + # Libraries that this one depends upon. +@@ -9419,7 +10697,7 @@ + + # Directory that this library needs to be installed in: + libdir='$install_libdir'" +- if test "$installed" = no && test "$need_relink" = yes; then ++ if test no,yes = "$installed,$need_relink"; then + $ECHO >> $output "\ + relink_command=\"$relink_command\"" + fi +@@ -9434,27 +10712,29 @@ + exit $EXIT_SUCCESS + } + +-{ test "$opt_mode" = link || test "$opt_mode" = relink; } && +- func_mode_link ${1+"$@"} ++if test link = "$opt_mode" || test relink = "$opt_mode"; then ++ func_mode_link ${1+"$@"} ++fi + + + # func_mode_uninstall arg... + func_mode_uninstall () + { +- $opt_debug +- RM="$nonopt" ++ $debug_cmd ++ ++ RM=$nonopt + files= +- rmforce= ++ rmforce=false + exit_status=0 + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. +- libtool_install_magic="$magic" ++ libtool_install_magic=$magic + + for arg + do + case $arg in +- -f) func_append RM " $arg"; rmforce=yes ;; ++ -f) func_append RM " $arg"; rmforce=: ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; + esac +@@ -9467,18 +10747,18 @@ + + for file in $files; do + func_dirname "$file" "" "." +- dir="$func_dirname_result" +- if test "X$dir" = X.; then +- odir="$objdir" ++ dir=$func_dirname_result ++ if test . = "$dir"; then ++ odir=$objdir + else +- odir="$dir/$objdir" ++ odir=$dir/$objdir + fi + func_basename "$file" +- name="$func_basename_result" +- test "$opt_mode" = uninstall && odir="$dir" ++ name=$func_basename_result ++ test uninstall = "$opt_mode" && odir=$dir + + # Remember odir for removal later, being careful to avoid duplicates +- if test "$opt_mode" = clean; then ++ if test clean = "$opt_mode"; then + case " $rmdirs " in + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; +@@ -9493,11 +10773,11 @@ + elif test -d "$file"; then + exit_status=1 + continue +- elif test "$rmforce" = yes; then ++ elif $rmforce; then + continue + fi + +- rmfiles="$file" ++ rmfiles=$file + + case $name in + *.la) +@@ -9511,7 +10791,7 @@ + done + test -n "$old_library" && func_append rmfiles " $odir/$old_library" + +- case "$opt_mode" in ++ case $opt_mode in + clean) + case " $library_names " in + *" $dlname "*) ;; +@@ -9522,12 +10802,12 @@ + uninstall) + if test -n "$library_names"; then + # Do each command in the postuninstall commands. +- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' ++ func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' + fi + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. +- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' ++ func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' + fi + # FIXME: should reinstall the best remaining shared library. + ;; +@@ -9543,21 +10823,19 @@ + func_source $dir/$name + + # Add PIC object to the list of files to remove. +- if test -n "$pic_object" && +- test "$pic_object" != none; then ++ if test -n "$pic_object" && test none != "$pic_object"; then + func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. +- if test -n "$non_pic_object" && +- test "$non_pic_object" != none; then ++ if test -n "$non_pic_object" && test none != "$non_pic_object"; then + func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) +- if test "$opt_mode" = clean ; then ++ if test clean = "$opt_mode"; then + noexename=$name + case $file in + *.exe) +@@ -9584,12 +10862,12 @@ + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles +- func_append rmfiles " $odir/$name $odir/${name}S.${objext}" +- if test "$fast_install" = yes && test -n "$relink_command"; then ++ func_append rmfiles " $odir/$name $odir/${name}S.$objext" ++ if test yes = "$fast_install" && test -n "$relink_command"; then + func_append rmfiles " $odir/lt-$name" + fi +- if test "X$noexename" != "X$name" ; then +- func_append rmfiles " $odir/lt-${noexename}.c" ++ if test "X$noexename" != "X$name"; then ++ func_append rmfiles " $odir/lt-$noexename.c" + fi + fi + fi +@@ -9598,7 +10876,7 @@ + func_show_eval "$RM $rmfiles" 'exit_status=1' + done + +- # Try to remove the ${objdir}s in the directories where we deleted files ++ # Try to remove the $objdir's in the directories where we deleted files + for dir in $rmdirs; do + if test -d "$dir"; then + func_show_eval "rmdir $dir >/dev/null 2>&1" +@@ -9608,16 +10886,17 @@ + exit $exit_status + } + +-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && +- func_mode_uninstall ${1+"$@"} ++if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then ++ func_mode_uninstall ${1+"$@"} ++fi + + test -z "$opt_mode" && { +- help="$generic_help" ++ help=$generic_help + func_fatal_help "you must specify a MODE" + } + + test -z "$exec_cmd" && \ +- func_fatal_help "invalid operation mode \`$opt_mode'" ++ func_fatal_help "invalid operation mode '$opt_mode'" + + if test -n "$exec_cmd"; then + eval exec "$exec_cmd" +@@ -9628,7 +10907,7 @@ + + + # The TAGs below are defined such that we never get into a situation +-# in which we disable both kinds of libraries. Given conflicting ++# where we disable both kinds of libraries. Given conflicting + # choices, we go for a static library, that is the most portable, + # since we can't tell whether shared libraries were disabled because + # the user asked for that or because the platform doesn't support +@@ -9651,5 +10930,3 @@ + # mode:shell-script + # sh-indentation:2 + # End: +-# vi:sw=2 +- +diff -r ee879c0ffa11 Modules/_ctypes/libffi/m4/ax_gcc_archflag.m4 +--- a/Modules/_ctypes/libffi/m4/ax_gcc_archflag.m4 ++++ b/Modules/_ctypes/libffi/m4/ax_gcc_archflag.m4 +@@ -155,7 +155,7 @@ + sparc*) + AC_PATH_PROG([PRTDIAG], [prtdiag], [prtdiag], [$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/]) + cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null` +- cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters` ++ cputype=`echo "$cputype" | tr -d ' -' | sed 's/SPARCIIi/SPARCII/' | tr $as_cr_LETTERS $as_cr_letters` + case $cputype in + *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;; + *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/m4/libtool.m4 +--- a/Modules/_ctypes/libffi/m4/libtool.m4 ++++ b/Modules/_ctypes/libffi/m4/libtool.m4 +@@ -1,8 +1,6 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1996-2001, 2003-2013 Free Software Foundation, Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +@@ -39,7 +37,7 @@ + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ]) + +-# serial 57 LT_INIT ++# serial 58 LT_INIT + + + # LT_PREREQ(VERSION) +@@ -91,7 +89,7 @@ + _LT_SET_OPTIONS([$0], [$1]) + + # This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ltmain" ++LIBTOOL_DEPS=$ltmain + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -130,7 +128,7 @@ + # _LT_FILEUTILS_DEFAULTS + # ---------------------- + # It is okay to use these file commands and assume they have been set +-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. ++# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. + m4_defun([_LT_FILEUTILS_DEFAULTS], + [: ${CP="cp -f"} + : ${MV="mv -f"} +@@ -179,13 +177,13 @@ + m4_require([_LT_WITH_SYSROOT])dnl + + _LT_CONFIG_LIBTOOL_INIT([ +-# See if we are running on zsh, and set the options which allow our ++# See if we are running on zsh, and set the options that allow our + # commands through without removal of \ escapes INIT. +-if test -n "\${ZSH_VERSION+set}" ; then ++if test -n "\${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + ]) +-if test -n "${ZSH_VERSION+set}" ; then ++if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + +@@ -198,7 +196,7 @@ + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. +- if test "X${COLLECT_NAMES+set}" != Xset; then ++ if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi +@@ -209,14 +207,14 @@ + ofile=libtool + can_build_shared=yes + +-# All known linkers require a `.a' archive for static linking (except MSVC, ++# All known linkers require a '.a' archive for static linking (except MSVC, + # which needs '.lib'). + libext=a + +-with_gnu_ld="$lt_cv_prog_gnu_ld" +- +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" ++with_gnu_ld=$lt_cv_prog_gnu_ld ++ ++old_CC=$CC ++old_CFLAGS=$CFLAGS + + # Set sane defaults for various variables + test -z "$CC" && CC=cc +@@ -269,14 +267,14 @@ + + # _LT_PROG_LTMAIN + # --------------- +-# Note that this code is called both from `configure', and `config.status' ++# Note that this code is called both from 'configure', and 'config.status' + # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +-# `config.status' has no value for ac_aux_dir unless we are using Automake, ++# 'config.status' has no value for ac_aux_dir unless we are using Automake, + # so we pass a copy along to make sure it has a sensible value anyway. + m4_defun([_LT_PROG_LTMAIN], + [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl + _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +-ltmain="$ac_aux_dir/ltmain.sh" ++ltmain=$ac_aux_dir/ltmain.sh + ])# _LT_PROG_LTMAIN + + +@@ -286,7 +284,7 @@ + + # So that we can recreate a full libtool script including additional + # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +-# in macros and then make a single call at the end using the `libtool' ++# in macros and then make a single call at the end using the 'libtool' + # label. + + +@@ -421,8 +419,8 @@ + + # _LT_CONFIG_STATUS_DECLARE([VARNAME]) + # ------------------------------------ +-# Quote a variable value, and forward it to `config.status' so that its +-# declaration there will have the same value as in `configure'. VARNAME ++# Quote a variable value, and forward it to 'config.status' so that its ++# declaration there will have the same value as in 'configure'. VARNAME + # must have a single quote delimited value for this to work. + m4_define([_LT_CONFIG_STATUS_DECLARE], + [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) +@@ -446,7 +444,7 @@ + # Output comment and list of tags supported by the script + m4_defun([_LT_LIBTOOL_TAGS], + [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +-available_tags="_LT_TAGS"dnl ++available_tags='_LT_TAGS'dnl + ]) + + +@@ -474,7 +472,7 @@ + # _LT_LIBTOOL_CONFIG_VARS + # ----------------------- + # Produce commented declarations of non-tagged libtool config variables +-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' ++# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' + # script. Tagged libtool config variables (even for the LIBTOOL CONFIG + # section) are produced by _LT_LIBTOOL_TAG_VARS. + m4_defun([_LT_LIBTOOL_CONFIG_VARS], +@@ -500,8 +498,8 @@ + # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of + # variables for single and double quote escaping we saved from calls + # to _LT_DECL, we can put quote escaped variables declarations +-# into `config.status', and then the shell code to quote escape them in +-# for loops in `config.status'. Finally, any additional code accumulated ++# into 'config.status', and then the shell code to quote escape them in ++# for loops in 'config.status'. Finally, any additional code accumulated + # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. + m4_defun([_LT_CONFIG_COMMANDS], + [AC_PROVIDE_IFELSE([LT_OUTPUT], +@@ -547,7 +545,7 @@ + ]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +@@ -560,7 +558,7 @@ + ]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +@@ -576,7 +574,7 @@ + # Generate a child script FILE with all initialization necessary to + # reuse the environment learned by the parent script, and make the + # file executable. If COMMENT is supplied, it is inserted after the +-# `#!' sequence but before initialization text begins. After this ++# '#!' sequence but before initialization text begins. After this + # macro, additional text can be appended to FILE to form the body of + # the child script. The macro ends with non-zero status if the + # file could not be fully written (such as if the disk is full). +@@ -598,7 +596,7 @@ + _AS_PREPARE + exec AS_MESSAGE_FD>&1 + _ASEOF +-test $lt_write_fail = 0 && chmod +x $1[]dnl ++test 0 = "$lt_write_fail" && chmod +x $1[]dnl + m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT + + # LT_OUTPUT +@@ -621,7 +619,7 @@ + } >&AS_MESSAGE_LOG_FD + + lt_cl_help="\ +-\`$as_me' creates a local libtool stub from the current configuration, ++'$as_me' creates a local libtool stub from the current configuration, + for use in further configure time tests before the real libtool is + generated. + +@@ -643,7 +641,7 @@ + This config.lt script is free software; the Free Software Foundation + gives unlimited permision to copy, distribute and modify it." + +-while test $[#] != 0 ++while test 0 != $[#] + do + case $[1] in + --version | --v* | -V ) +@@ -656,10 +654,10 @@ + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +-Try \`$[0] --help' for more information.]) ;; ++Try '$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +-Try \`$[0] --help' for more information.]) ;; ++Try '$[0] --help' for more information.]) ;; + esac + shift + done +@@ -685,7 +683,7 @@ + # open by configure. Here we exec the FD to /dev/null, effectively closing + # config.log, so it can be properly (re)opened and appended to by config.lt. + lt_cl_success=: +-test "$silent" = yes && ++test yes = "$silent" && + lt_config_lt_args="$lt_config_lt_args --quiet" + exec AS_MESSAGE_LOG_FD>/dev/null + $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +@@ -705,13 +703,13 @@ + _LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ +- # See if we are running on zsh, and set the options which allow our ++ # See if we are running on zsh, and set the options that allow our + # commands through without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then ++ if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + +- cfgfile="${ofile}T" ++ cfgfile=${ofile}T + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + +@@ -719,7 +717,7 @@ + #! $SHELL + + # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Generated automatically by $as_me ($PACKAGE) $VERSION + # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # +@@ -739,7 +737,7 @@ + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then ++if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi +@@ -756,8 +754,6 @@ + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + +- _LT_PROG_REPLACE_SHELLFNS +- + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +@@ -775,7 +771,6 @@ + [m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' +- TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile'], []) + ])dnl /_LT_CONFIG_SAVE_COMMANDS +@@ -974,7 +969,7 @@ + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no +- if test -z "${LT_MULTI_MODULE}"; then ++ if test -z "$LT_MULTI_MODULE"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the +@@ -992,7 +987,7 @@ + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. +- elif test -f libconftest.dylib && test $_lt_result -eq 0; then ++ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD +@@ -1010,7 +1005,7 @@ + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) +- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS=$save_LDFLAGS + ]) + + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], +@@ -1032,7 +1027,7 @@ + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD +- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then ++ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD +@@ -1042,32 +1037,32 @@ + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac +- if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi +- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then +- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ if test yes = "$lt_cv_ld_exported_symbols_list"; then ++ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else +- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' + fi +- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then ++ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= +@@ -1087,29 +1082,29 @@ + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- if test "$lt_cv_ld_force_load" = "yes"; then +- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' ++ if test yes = "$lt_cv_ld_force_load"; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes +- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined + case $cc_basename in +- ifort*) _lt_dar_can_shared=yes ;; ++ ifort*|nagfor*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac +- if test "$_lt_dar_can_shared" = "yes"; then ++ if test yes = "$_lt_dar_can_shared"; then + output_verbose_link_cmd=func_echo_all +- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" ++ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" ++ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + m4_if([$1], [CXX], +-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then +- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" +- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++[ if test yes != "$lt_cv_apple_cc_single_mod"; then ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + fi + ],[]) + else +@@ -1129,7 +1124,7 @@ + # Allow to override them for all tags through lt_cv_aix_libpath. + m4_defun([_LT_SYS_MODULE_PATH_AIX], + [m4_require([_LT_DECL_SED])dnl +-if test "${lt_cv_aix_libpath+set}" = set; then ++if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], +@@ -1147,7 +1142,7 @@ + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then +- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +@@ -1167,8 +1162,8 @@ + # ----------------------- + # Find how we can fake an echo command that does not interpret backslash. + # In particular, with Autoconf 2.60 or later we add some code to the start +-# of the generated configure script which will find a shell with a builtin +-# printf (which we can use as an echo command). ++# of the generated configure script that will find a shell with a builtin ++# printf (that we can use as an echo command). + m4_defun([_LT_PROG_ECHO_BACKSLASH], + [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -1196,10 +1191,10 @@ + # Invoke $ECHO with all args, space-separated. + func_echo_all () + { +- $ECHO "$*" ++ $ECHO "$*" + } + +-case "$ECHO" in ++case $ECHO in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +@@ -1225,16 +1220,17 @@ + AC_DEFUN([_LT_WITH_SYSROOT], + [AC_MSG_CHECKING([for sysroot]) + AC_ARG_WITH([sysroot], +-[ --with-sysroot[=DIR] Search for dependent libraries within DIR +- (or the compiler's sysroot if not specified).], ++[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], ++ [Search for dependent libraries within DIR (or the compiler's sysroot ++ if not specified).])], + [], [with_sysroot=no]) + + dnl lt_sysroot will always be passed unquoted. We quote it here + dnl in case the user passed a directory name. + lt_sysroot= +-case ${with_sysroot} in #( ++case $with_sysroot in #( + yes) +- if test "$GCC" = yes; then ++ if test yes = "$GCC"; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( +@@ -1244,14 +1240,14 @@ + no|'') + ;; #( + *) +- AC_MSG_RESULT([${with_sysroot}]) ++ AC_MSG_RESULT([$with_sysroot]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; + esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) + _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +-[dependent libraries, and in which our libraries should be installed.])]) ++[dependent libraries, and where our libraries should be installed.])]) + + # _LT_ENABLE_LOCK + # --------------- +@@ -1259,31 +1255,33 @@ + [AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++test no = "$enable_libtool_lock" || enable_libtool_lock=yes + + # Some flags need to be propagated to the compiler or linker for good + # libtool support. + case $host in + ia64-*-hpux*) +- # Find out which ABI we are using. ++ # Find out what ABI is being produced by ac_compile, and set mode ++ # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) +- HPUX_IA64_MODE="32" ++ HPUX_IA64_MODE=32 + ;; + *ELF-64*) +- HPUX_IA64_MODE="64" ++ HPUX_IA64_MODE=64 + ;; + esac + fi + rm -rf conftest* + ;; + *-*-irix6*) +- # Find out which ABI we are using. ++ # Find out what ABI is being produced by ac_compile, and set linker ++ # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then ++ if test yes = "$lt_cv_prog_gnu_ld"; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" +@@ -1312,9 +1310,46 @@ + rm -rf conftest* + ;; + +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++mips64*-*linux*) ++ # Find out what ABI is being produced by ac_compile, and set linker ++ # options accordingly. ++ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ emul=elf ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ emul="${emul}32" ++ ;; ++ *64-bit*) ++ emul="${emul}64" ++ ;; ++ esac ++ case `/usr/bin/file conftest.$ac_objext` in ++ *MSB*) ++ emul="${emul}btsmip" ++ ;; ++ *LSB*) ++ emul="${emul}ltsmip" ++ ;; ++ esac ++ case `/usr/bin/file conftest.$ac_objext` in ++ *N32*) ++ emul="${emul}n32" ++ ;; ++ esac ++ LD="${LD-ld} -m $emul" ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) +- # Find out which ABI we are using. ++ # Find out what ABI is being produced by ac_compile, and set linker ++ # options accordingly. Note that the listed cases only cover the ++ # situations where additional linker options are needed (such as when ++ # doing 32-bit compilation for a host where ld defaults to 64-bit, or ++ # vice versa); the common cases where no linker options are needed do ++ # not appear in the list. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in +@@ -1326,14 +1361,17 @@ + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) +- LD="${LD-ld} -m elf32_x86_64" +- ;; ++ LD="${LD-ld} -m elf32_x86_64" ++ ;; + *) +- LD="${LD-ld} -m elf_i386" +- ;; ++ LD="${LD-ld} -m elf_i386" ++ ;; + esac + ;; +- ppc64-*linux*|powerpc64-*linux*) ++ powerpc64le-*linux*) ++ LD="${LD-ld} -m elf32lppclinux" ++ ;; ++ powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) +@@ -1352,7 +1390,10 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- ppc*-*linux*|powerpc*-*linux*) ++ powerpcle-*linux*) ++ LD="${LD-ld} -m elf64lppc" ++ ;; ++ powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) +@@ -1370,19 +1411,20 @@ + + *-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" ++ SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ if test yes != "$lt_cv_cc_needs_belf"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" ++ CFLAGS=$SAVE_CFLAGS + fi + ;; + *-*solaris*) +- # Find out which ABI we are using. ++ # Find out what ABI is being produced by ac_compile, and set linker ++ # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in +@@ -1390,7 +1432,7 @@ + case $lt_cv_prog_gnu_ld in + yes*) + case $host in +- i?86-*-solaris*) ++ i?86-*-solaris*|x86_64-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) +@@ -1399,7 +1441,7 @@ + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then +- LD="${LD-ld}_sol2" ++ LD=${LD-ld}_sol2 + fi + ;; + *) +@@ -1415,7 +1457,7 @@ + ;; + esac + +-need_locks="$enable_libtool_lock" ++need_locks=$enable_libtool_lock + ])# _LT_ENABLE_LOCK + + +@@ -1434,11 +1476,11 @@ + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) +- if test "$ac_status" -eq 0; then ++ if test 0 -eq "$ac_status"; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) +- if test "$ac_status" -ne 0; then ++ if test 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ + fi + fi +@@ -1446,7 +1488,7 @@ + ]) + ]) + +-if test "x$lt_cv_ar_at_file" = xno; then ++if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= + else + archiver_list_spec=$lt_cv_ar_at_file +@@ -1477,7 +1519,7 @@ + + if test -n "$RANLIB"; then + case $host_os in +- openbsd*) ++ bitrig* | openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) +@@ -1513,7 +1555,7 @@ + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$3" ++ lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins +@@ -1540,7 +1582,7 @@ + $RM conftest* + ]) + +-if test x"[$]$2" = xyes; then ++if test yes = "[$]$2"; then + m4_if([$5], , :, [$5]) + else + m4_if([$6], , :, [$6]) +@@ -1562,7 +1604,7 @@ + m4_require([_LT_DECL_SED])dnl + AC_CACHE_CHECK([$1], [$2], + [$2=no +- save_LDFLAGS="$LDFLAGS" ++ save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +@@ -1581,10 +1623,10 @@ + fi + fi + $RM -r conftest* +- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS=$save_LDFLAGS + ]) + +-if test x"[$]$2" = xyes; then ++if test yes = "[$]$2"; then + m4_if([$4], , :, [$4]) + else + m4_if([$5], , :, [$5]) +@@ -1605,7 +1647,7 @@ + AC_MSG_CHECKING([the maximum length of command line arguments]) + AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 +- teststring="ABCD" ++ teststring=ABCD + + case $build_os in + msdosdjgpp*) +@@ -1645,7 +1687,7 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +@@ -1696,22 +1738,22 @@ + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ +- test undefined != "$lt_cv_sys_max_cmd_len"; then ++ test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. +- for i in 1 2 3 4 5 6 7 8 ; do ++ for i in 1 2 3 4 5 6 7 8; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. +- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ ++ while { test X`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && +- test $i != 17 # 1/2 MB should be enough ++ test 17 != "$i" # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring +@@ -1727,7 +1769,7 @@ + ;; + esac + ]) +-if test -n $lt_cv_sys_max_cmd_len ; then ++if test -n "$lt_cv_sys_max_cmd_len"; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) + else + AC_MSG_RESULT(none) +@@ -1755,7 +1797,7 @@ + # ---------------------------------------------------------------- + m4_defun([_LT_TRY_DLOPEN_SELF], + [m4_require([_LT_HEADER_DLFCN])dnl +-if test "$cross_compiling" = yes; then : ++if test yes = "$cross_compiling"; then : + [$4] + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +@@ -1804,7 +1846,7 @@ + + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) ++#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) + int fnord () __attribute__((visibility("default"))); + #endif + +@@ -1830,7 +1872,7 @@ + return status; + }] + _LT_EOF +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++ if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -1851,7 +1893,7 @@ + # ------------------ + AC_DEFUN([LT_SYS_DLOPEN_SELF], + [m4_require([_LT_HEADER_DLFCN])dnl +-if test "x$enable_dlopen" != xyes; then ++if test yes != "$enable_dlopen"; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +@@ -1861,44 +1903,52 @@ + + case $host_os in + beos*) +- lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen=load_add_on + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) +- lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; + + cygwin*) +- lt_cv_dlopen="dlopen" ++ lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + ;; + + darwin*) +- # if libdl is installed we need to link against it ++ # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ +- lt_cv_dlopen="dyld" ++ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ ++ lt_cv_dlopen=dyld + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + ++ tpf*) ++ # Don't try to run any link tests for TPF. We know it's impossible ++ # because TPF is a cross-compiler, and we know how we open DSOs. ++ lt_cv_dlopen=dlopen ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=no ++ ;; ++ + *) + AC_CHECK_FUNC([shl_load], +- [lt_cv_dlopen="shl_load"], ++ [lt_cv_dlopen=shl_load], + [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], ++ [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], + [AC_CHECK_FUNC([dlopen], +- [lt_cv_dlopen="dlopen"], ++ [lt_cv_dlopen=dlopen], + [AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], + [AC_CHECK_LIB([svld], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], + [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ++ [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) + ]) + ]) + ]) +@@ -1907,21 +1957,21 @@ + ;; + esac + +- if test "x$lt_cv_dlopen" != xno; then ++ if test no = "$lt_cv_dlopen"; then ++ enable_dlopen=no ++ else + enable_dlopen=yes +- else +- enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +- +- save_LDFLAGS="$LDFLAGS" ++ save_CPPFLAGS=$CPPFLAGS ++ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS=$LDFLAGS + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + +- save_LIBS="$LIBS" ++ save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], +@@ -1931,7 +1981,7 @@ + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + +- if test "x$lt_cv_dlopen_self" = xyes; then ++ if test yes = "$lt_cv_dlopen_self"; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl +@@ -1941,9 +1991,9 @@ + ]) + fi + +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" ++ CPPFLAGS=$save_CPPFLAGS ++ LDFLAGS=$save_LDFLAGS ++ LIBS=$save_LIBS + ;; + esac + +@@ -2035,8 +2085,8 @@ + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + _LT_COMPILER_C_O([$1]) + +-hard_links="nottested" +-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++hard_links=nottested ++if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes +@@ -2046,8 +2096,8 @@ + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) +- if test "$hard_links" = no; then +- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++ if test no = "$hard_links"; then ++ AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) + need_locks=warn + fi + else +@@ -2074,8 +2124,8 @@ + _LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl + m4_pattern_allow([LT_OBJDIR])dnl +-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", +- [Define to the sub-directory in which libtool stores uninstalled libraries.]) ++AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", ++ [Define to the sub-directory where libtool stores uninstalled libraries.]) + ])# _LT_CHECK_OBJDIR + + +@@ -2087,15 +2137,15 @@ + _LT_TAGVAR(hardcode_action, $1)= + if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || +- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++ test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then + + # We can hardcode non-existent directories. +- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && ++ if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then ++ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && ++ test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else +@@ -2109,12 +2159,12 @@ + fi + AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || +- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then ++if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || ++ test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then + # Fast installation is not supported + enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then ++elif test yes = "$shlibpath_overrides_runpath" || ++ test no = "$enable_shared"; then + # Fast installation is not necessary + enable_fast_install=needless + fi +@@ -2138,7 +2188,7 @@ + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) +- if test -n "$STRIP" ; then ++ if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) +@@ -2169,14 +2219,14 @@ + AC_MSG_CHECKING([dynamic linker characteristics]) + m4_if([$1], + [], [ +-if test "$GCC" = yes; then ++if test yes = "$GCC"; then + case $host_os in +- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; +- *) lt_awk_arg="/^libraries:/" ;; ++ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; ++ *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in +- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; +- *) lt_sed_strip_eq="s,=/,/,g" ;; ++ mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; ++ *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in +@@ -2192,28 +2242,35 @@ + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it +- # and add multilib dir if necessary. ++ # and add multilib dir if necessary... + lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ # ...but if some path component already ends with the multilib dir we assume ++ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). ++ case "$lt_multi_os_dir; $lt_search_path_spec " in ++ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) ++ lt_multi_os_dir= ++ ;; ++ esac + for lt_sys_path in $lt_search_path_spec; do +- if test -d "$lt_sys_path/$lt_multi_os_dir"; then +- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +- else ++ if test -d "$lt_sys_path$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" ++ elif test -n "$lt_multi_os_dir"; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +-BEGIN {RS=" "; FS="/|\n";} { +- lt_foo=""; +- lt_count=0; ++BEGIN {RS = " "; FS = "/|\n";} { ++ lt_foo = ""; ++ lt_count = 0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { +- lt_foo="/" $lt_i lt_foo; ++ lt_foo = "/" $lt_i lt_foo; + } else { + lt_count--; + } +@@ -2227,7 +2284,7 @@ + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ +- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; ++ $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` + else +@@ -2236,7 +2293,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext_cmds=".so" ++shrext_cmds=.so + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -2256,11 +2313,11 @@ + case $host_os in + aix3*) + version_type=linux # correct to gnu/linux during the next big refactor +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' ++ soname_spec='$libname$release$shared_ext$major' + ;; + + aix[[4-9]]*) +@@ -2268,40 +2325,40 @@ + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in ++ # the line '#! .'. This would cause the generated library to ++ # depend on '.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' +- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then ++ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then ++ if test yes = "$aix_use_runtimelinking"; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release.a $libname.a' ++ soname_spec='$libname$release$shared_ext$major' + fi + shlibpath_var=LIBPATH + fi +@@ -2312,18 +2369,18 @@ + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + + beos*) +- library_names_spec='${libname}${shared_ext}' ++ library_names_spec='$libname$shared_ext' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; +@@ -2331,8 +2388,8 @@ + bsdi[[45]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +@@ -2344,7 +2401,7 @@ + + cygwin* | mingw* | pw32* | cegcc*) + version_type=windows +- shrext_cmds=".dll" ++ shrext_cmds=.dll + need_version=no + need_lib_prefix=no + +@@ -2353,8 +2410,8 @@ + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ postinstall_cmds='base_file=`basename \$file`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ +@@ -2370,17 +2427,17 @@ + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' +@@ -2389,8 +2446,8 @@ + *,cl*) + # Native MSVC + libname_spec='$name' +- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- library_names_spec='${libname}.dll.lib' ++ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ++ library_names_spec='$libname.dll.lib' + + case $build_os in + mingw*) +@@ -2417,7 +2474,7 @@ + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) +- sys_lib_search_path_spec="$LIB" ++ sys_lib_search_path_spec=$LIB + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +@@ -2430,8 +2487,8 @@ + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ postinstall_cmds='base_file=`basename \$file`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' +@@ -2444,7 +2501,7 @@ + + *) + # Assume MSVC wrapper +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac +@@ -2457,8 +2514,8 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' ++ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' ++ soname_spec='$libname$release$major$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +@@ -2471,8 +2528,8 @@ + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +@@ -2490,12 +2547,12 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + need_version=yes + ;; + esac +@@ -2520,26 +2577,15 @@ + esac + ;; + +-gnu*) +- version_type=linux # correct to gnu/linux during the next big refactor +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- + haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH +- shlibpath_overrides_runpath=yes ++ shlibpath_overrides_runpath=no + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; +@@ -2557,9 +2603,9 @@ + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ if test 32 = "$HPUX_IA64_MODE"; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +@@ -2572,8 +2618,8 @@ + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +@@ -2582,8 +2628,8 @@ + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... +@@ -2596,8 +2642,8 @@ + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +@@ -2608,7 +2654,7 @@ + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) +- if test "$lt_cv_prog_gnu_ld" = yes; then ++ if test yes = "$lt_cv_prog_gnu_ld"; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix +@@ -2616,8 +2662,8 @@ + esac + need_lib_prefix=no + need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='$libname$release$shared_ext$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= +@@ -2636,8 +2682,8 @@ + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" ++ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + hardcode_into_libs=yes + ;; + +@@ -2646,13 +2692,33 @@ + dynamic_linker=no + ;; + ++linux*android*) ++ version_type=none # Android doesn't support versioned libraries. ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext' ++ soname_spec='$libname$release$shared_ext' ++ finish_cmds= ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ dynamic_linker='Android linker' ++ # Don't embed -rpath directories since the linker doesn't support them. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ ;; ++ + # This must be glibc/ELF. +-linux* | k*bsd*-gnu | kopensolaris*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +@@ -2677,14 +2743,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" +- ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -2701,12 +2763,12 @@ + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH +@@ -2716,7 +2778,7 @@ + + newsos6) + version_type=linux # correct to gnu/linux during the next big refactor +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; +@@ -2725,45 +2787,34 @@ + version_type=qnx + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +-openbsd*) ++openbsd* | bitrig*) + version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" ++ sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then ++ need_version=no ++ else ++ need_version=yes ++ fi ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[[89]] | openbsd2.[[89]].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi ++ shlibpath_overrides_runpath=yes + ;; + + os2*) + libname_spec='$name' +- shrext_cmds=".dll" ++ shrext_cmds=.dll + need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' ++ library_names_spec='$libname$shared_ext $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; +@@ -2772,11 +2823,11 @@ + version_type=osf + need_lib_prefix=no + need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='$libname$release$shared_ext$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + + rdos*) +@@ -2787,8 +2838,8 @@ + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes +@@ -2798,11 +2849,11 @@ + + sunos4*) + version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then ++ if test yes = "$with_gnu_ld"; then + need_lib_prefix=no + fi + need_version=yes +@@ -2810,8 +2861,8 @@ + + sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) +@@ -2832,10 +2883,10 @@ + ;; + + sysv4*MP*) +- if test -d /usr/nec ;then ++ if test -d /usr/nec; then + version_type=linux # correct to gnu/linux during the next big refactor +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' ++ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' ++ soname_spec='$libname$shared_ext.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; +@@ -2844,12 +2895,12 @@ + version_type=freebsd-elf + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then ++ if test yes = "$with_gnu_ld"; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +@@ -2867,7 +2918,7 @@ + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +@@ -2875,8 +2926,8 @@ + + uts4*) + version_type=linux # correct to gnu/linux during the next big refactor +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +@@ -2885,18 +2936,18 @@ + ;; + esac + AC_MSG_RESULT([$dynamic_linker]) +-test "$dynamic_linker" = no && can_build_shared=no ++test no = "$dynamic_linker" && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then ++if test yes = "$GCC"; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then ++ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec + fi +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then ++ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec + fi + + _LT_DECL([], [variables_saved_for_relink], [1], +@@ -2938,32 +2989,32 @@ + + # _LT_PATH_TOOL_PREFIX(TOOL) + # -------------------------- +-# find a file program which can recognize shared library ++# find a file program that can recognize shared library + AC_DEFUN([_LT_PATH_TOOL_PREFIX], + [m4_require([_LT_DECL_EGREP])dnl + AC_MSG_CHECKING([for $1]) + AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, + [case $MAGIC_CMD in + [[\\/*] | ?:[\\/]*]) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; + *) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ lt_save_MAGIC_CMD=$MAGIC_CMD ++ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + dnl $ac_dummy forces splitting on constant user-supplied paths. + dnl POSIX.2 word splitting is done only on the output of word expansions, + dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$1; then +- lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++ if test -f "$ac_dir/$1"; then ++ lt_cv_path_MAGIC_CMD=$ac_dir/"$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : +@@ -2986,11 +3037,11 @@ + break + fi + done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" ++ IFS=$lt_save_ifs ++ MAGIC_CMD=$lt_save_MAGIC_CMD + ;; + esac]) +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) + else +@@ -3008,7 +3059,7 @@ + + # _LT_PATH_MAGIC + # -------------- +-# find a file program which can recognize a shared library ++# find a file program that can recognize a shared library + m4_defun([_LT_PATH_MAGIC], + [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) + if test -z "$lt_cv_path_MAGIC_CMD"; then +@@ -3035,16 +3086,16 @@ + AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], +- [test "$withval" = no || with_gnu_ld=yes], ++ [test no = "$withval" || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + + ac_prog=ld +-if test "$GCC" = yes; then ++if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw ++ # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +@@ -3058,7 +3109,7 @@ + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done +- test -z "$LD" && LD="$ac_prog" ++ test -z "$LD" && LD=$ac_prog + ;; + "") + # If it fails, then pretend we aren't using GCC. +@@ -3069,37 +3120,37 @@ + with_gnu_ld=unknown + ;; + esac +-elif test "$with_gnu_ld" = yes; then ++elif test yes = "$with_gnu_ld"; then + AC_MSG_CHECKING([for GNU ld]) + else + AC_MSG_CHECKING([for non-GNU ld]) + fi + AC_CACHE_VAL(lt_cv_path_LD, + [if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- lt_cv_path_LD="$ac_dir/$ac_prog" ++ lt_cv_path_LD=$ac_dir/$ac_prog + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 /dev/null 2>&1; then ++ if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +@@ -3255,10 +3305,6 @@ + fi + ;; + +-gnu*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- + haiku*) + lt_cv_deplibs_check_method=pass_all + ;; +@@ -3297,7 +3343,7 @@ + ;; + + # This must be glibc/ELF. +-linux* | k*bsd*-gnu | kopensolaris*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -3319,8 +3365,8 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++openbsd* | bitrig*) ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' +@@ -3413,33 +3459,33 @@ + AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, + [if test -n "$NM"; then + # Let the user override the test. +- lt_cv_path_NM="$NM" ++ lt_cv_path_NM=$NM + else +- lt_nm_to_check="${ac_tool_prefix}nm" ++ lt_nm_to_check=${ac_tool_prefix}nm + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/$lt_tmp_nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ tmp_nm=$ac_dir/$lt_tmp_nm ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then + # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # Adding the 'sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" +- break ++ break 2 + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" +- break ++ break 2 + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +@@ -3450,21 +3496,21 @@ + esac + fi + done +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} + fi]) +-if test "$lt_cv_path_NM" != "no"; then +- NM="$lt_cv_path_NM" ++if test no != "$lt_cv_path_NM"; then ++ NM=$lt_cv_path_NM + else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) +- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in ++ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) +- DUMPBIN="$DUMPBIN -symbols" ++ DUMPBIN="$DUMPBIN -symbols -headers" + ;; + *) + DUMPBIN=: +@@ -3472,8 +3518,8 @@ + esac + fi + AC_SUBST([DUMPBIN]) +- if test "$DUMPBIN" != ":"; then +- NM="$DUMPBIN" ++ if test : != "$DUMPBIN"; then ++ NM=$DUMPBIN + fi + fi + test -z "$NM" && NM=nm +@@ -3519,8 +3565,8 @@ + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) +- # two different shell functions defined in ltmain.sh +- # decide which to use based on capabilities of $DLLTOOL ++ # two different shell functions defined in ltmain.sh; ++ # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib +@@ -3532,7 +3578,7 @@ + ;; + *) + # fallback: assume linklib IS sharedlib +- lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; + esac + ]) +@@ -3559,13 +3605,28 @@ + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +-if test "x$lt_cv_path_mainfest_tool" != xyes; then ++if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: + fi + _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl + ])# _LT_PATH_MANIFEST_TOOL + + ++# _LT_DLL_DEF_P([FILE]) ++# --------------------- ++# True iff FILE is a Windows DLL '.def' file. ++# Keep in sync with func_dll_def_p in the libtool script ++AC_DEFUN([_LT_DLL_DEF_P], ++[dnl ++ test DEF = "`$SED -n dnl ++ -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace ++ -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments ++ -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl ++ -e q dnl Only consider the first "real" line ++ $1`" dnl ++])# _LT_DLL_DEF_P ++ ++ + # LT_LIB_M + # -------- + # check for math library +@@ -3577,11 +3638,11 @@ + # These system don't have libm, or don't need it + ;; + *-ncr-sysv4.3*) +- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; + *) +- AC_CHECK_LIB(m, cos, LIBM="-lm") ++ AC_CHECK_LIB(m, cos, LIBM=-lm) + ;; + esac + AC_SUBST([LIBM]) +@@ -3600,7 +3661,7 @@ + + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +-if test "$GCC" = yes; then ++if test yes = "$GCC"; then + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; +@@ -3652,7 +3713,7 @@ + symcode='[[ABCDGISTW]]' + ;; + hpux*) +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + symcode='[[ABCDEGRST]]' + fi + ;; +@@ -3685,14 +3746,44 @@ + symcode='[[ABCDGIRSTW]]' ;; + esac + ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ # Gets list of data symbols to import. ++ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" ++ # Adjust the below global symbol transforms to fixup imported variables. ++ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" ++ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" ++ lt_c_name_lib_hook="\ ++ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ ++ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" ++else ++ # Disable hooks by default. ++ lt_cv_sys_global_symbol_to_import= ++ lt_cdecl_hook= ++ lt_c_name_hook= ++ lt_c_name_lib_hook= ++fi ++ + # Transform an extracted symbol line into a proper C declaration. + # Some systems (esp. on ia64) link data and code symbols differently, + # so use this general approach. +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++lt_cv_sys_global_symbol_to_cdecl="sed -n"\ ++$lt_cdecl_hook\ ++" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ ++" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ ++$lt_c_name_hook\ ++" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ ++" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" ++ ++# Transform an extracted symbol line into symbol name with lib prefix and ++# symbol address. ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ ++$lt_c_name_lib_hook\ ++" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ ++" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ ++" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -3710,21 +3801,24 @@ + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then +- # Fake it for dumpbin and say T for any non-static function +- # and D for any global variable. ++ # Fake it for dumpbin and say T for any non-static function, ++ # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ + " {last_section=section; section=\$ 3};"\ + " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ + " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ ++" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ ++" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ + " \$ 0!~/External *\|/{next};"\ + " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ + " {if(hide[section]) next};"\ +-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +-" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ ++" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ ++" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ ++" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ + " ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" +@@ -3764,11 +3858,11 @@ + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext + /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +-/* DATA imports from DLLs on WIN32 con't be const, because runtime ++#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE ++/* DATA imports from DLLs on WIN32 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ + # define LT@&t@_DLSYM_CONST +-#elif defined(__osf__) ++#elif defined __osf__ + /* This system does not cope well with relocations in const data. */ + # define LT@&t@_DLSYM_CONST + #else +@@ -3794,7 +3888,7 @@ + { + { "@PROGRAM@", (void *) 0 }, + _LT_EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} + }; +@@ -3814,9 +3908,9 @@ + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS +- LIBS="conftstm.$ac_objext" ++ LIBS=conftstm.$ac_objext + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then ++ if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS +@@ -3837,7 +3931,7 @@ + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. +- if test "$pipe_works" = yes; then ++ if test yes = "$pipe_works"; then + break + else + lt_cv_sys_global_symbol_pipe= +@@ -3864,12 +3958,16 @@ + [Take the output of nm and produce a listing of raw symbols and C names]) + _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) ++_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], ++ [Transform the output of nm into a list of symbols to manually relocate]) + _LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) + _LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) ++_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], ++ [The name lister interface]) + _LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) + ]) # _LT_CMD_GLOBAL_SYMBOLS +@@ -3885,17 +3983,18 @@ + + m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. +- if test "$GXX" = yes; then ++ if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + + amigaos*) +@@ -3906,8 +4005,8 @@ + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. ++ # adding the '-m68020' flag to GCC prevents building anything better, ++ # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac +@@ -3972,7 +4071,7 @@ + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else +@@ -4013,14 +4112,14 @@ + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +- if test "$host_cpu" != ia64; then ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ++ if test ia64 != "$host_cpu"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default +@@ -4049,7 +4148,7 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -4057,7 +4156,7 @@ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) +- # old Intel C++ for x86_64 which still supported -KPIC. ++ # old Intel C++ for x86_64, which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' +@@ -4202,17 +4301,18 @@ + fi + ], + [ +- if test "$GCC" = yes; then ++ if test yes = "$GCC"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + + amigaos*) +@@ -4223,8 +4323,8 @@ + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. ++ # adding the '-m68020' flag to GCC prevents building anything better, ++ # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac +@@ -4311,7 +4411,7 @@ + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else +@@ -4319,6 +4419,20 @@ + fi + ;; + ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ case $cc_basename in ++ nagfor*) ++ # NAG Fortran compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ esac ++ ;; ++ + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +@@ -4339,7 +4453,7 @@ + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? +- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) +@@ -4348,9 +4462,9 @@ + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in +- # old Intel for x86_64 which still supported -KPIC. ++ # old Intel for x86_64, which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +@@ -4375,6 +4489,12 @@ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; ++ tcc*) ++ # Fabrice Bellard et al's Tiny C Compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -4472,7 +4592,7 @@ + ;; + + sysv4*MP*) +- if test -d /usr/nec ;then ++ if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi +@@ -4501,7 +4621,7 @@ + fi + ]) + case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: ++ # For platforms that do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; +@@ -4577,7 +4697,7 @@ + fi + ;; + pw32*) +- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++ _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in +@@ -4623,9 +4743,9 @@ + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. ++ # it will be wrapped by ' (' and ')$', so one must not match beginning or ++ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', ++ # as well as any symbol that contains 'd'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if +@@ -4641,7 +4761,7 @@ + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +- if test "$GCC" != yes; then ++ if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; +@@ -4649,7 +4769,7 @@ + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; +- openbsd*) ++ openbsd* | bitrig*) + with_gnu_ld=no + ;; + esac +@@ -4659,7 +4779,7 @@ + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no +- if test "$with_gnu_ld" = yes; then ++ if test yes = "$with_gnu_ld"; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility +@@ -4681,24 +4801,24 @@ + esac + fi + +- if test "$lt_use_gnu_ld_interface" = yes; then ++ if test yes = "$lt_use_gnu_ld_interface"; then + # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' ++ wlarc='$wl' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then +- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no +- case `$LD -v 2>&1` in ++ case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +@@ -4711,7 +4831,7 @@ + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then ++ if test ia64 != "$host_cpu"; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +@@ -4730,7 +4850,7 @@ + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) +@@ -4746,7 +4866,7 @@ + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4756,7 +4876,7 @@ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +@@ -4764,61 +4884,61 @@ + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file, use it as ++ # is; otherwise, prepend EXPORTS... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + haiku*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no +- if test "$host_os" = linux-dietlibc; then ++ if test linux-dietlibc = "$host_os"; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ +- && test "$tmp_diet" = no ++ && test no = "$tmp_diet" + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; +@@ -4829,42 +4949,44 @@ + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; ++ nagfor*) # NAGFOR 5.3 ++ tmp_sharedflag='-Wl,-shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac +- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- +- if test "x$supports_anon_versioning" = xyes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ ++ if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' +- if test "x$supports_anon_versioning" = xyes; then ++ if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -4878,8 +5000,8 @@ + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -4897,8 +5019,8 @@ + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4910,7 +5032,7 @@ + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot + *** reliably create shared libraries on SCO systems. Therefore, libtool + *** is disabling shared libraries support. We urge you to upgrade GNU + *** binutils to release 2.16.91.0.3 or newer. Another option is to modify +@@ -4925,9 +5047,9 @@ + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4944,15 +5066,15 @@ + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + +- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then ++ if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= +@@ -4968,7 +5090,7 @@ + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes +- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported +@@ -4976,12 +5098,12 @@ + ;; + + aix[[4-9]]*) +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' +- no_entry_flag="" ++ no_entry_flag= + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm +@@ -4999,7 +5121,7 @@ + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then + aix_use_runtimelinking=yes + break + fi +@@ -5022,13 +5144,13 @@ + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes +- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' +- +- if test "$GCC" = yes; then ++ _LT_TAGVAR(file_list_spec, $1)='$wl-f,' ++ ++ if test yes = "$GCC"; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` ++ collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then +@@ -5047,61 +5169,61 @@ + ;; + esac + shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' ++ if test yes = "$aix_use_runtimelinking"; then ++ shared_flag="$shared_flag "'$wl-G' + fi + else + # not using gcc +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' ++ if test yes = "$aix_use_runtimelinking"; then ++ shared_flag='$wl-G' + else +- shared_flag='${wl}-bM:SRE' ++ shared_flag='$wl-bM:SRE' + fi + fi + fi + +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then ++ if test yes = "$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else +- if test "$host_cpu" = ia64; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ if test ia64 = "$host_cpu"; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- if test "$with_gnu_ld" = yes; then ++ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' ++ if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. +- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; +@@ -5110,7 +5232,7 @@ + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) +@@ -5140,16 +5262,17 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" ++ shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; +- else +- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; +- fi~ +- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ +- linknames=' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then ++ cp "$export_symbols" "$output_objdir/$soname.def"; ++ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; ++ else ++ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +@@ -5158,18 +5281,18 @@ + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ +- lt_tool_outputfile="@TOOL_OUTPUT@"~ +- case $lt_outputfile in +- *.exe|*.EXE) ;; +- *) +- lt_outputfile="$lt_outputfile.exe" +- lt_tool_outputfile="$lt_tool_outputfile.exe" +- ;; +- esac~ +- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then +- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; +- $RM "$lt_outputfile.manifest"; +- fi' ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile=$lt_outputfile.exe ++ lt_tool_outputfile=$lt_tool_outputfile.exe ++ ;; ++ esac~ ++ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' + ;; + *) + # Assume MSVC wrapper +@@ -5178,7 +5301,7 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" ++ shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. +@@ -5228,33 +5351,33 @@ + ;; + + hpux9*) +- if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ if test yes = "$GCC"; then ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + fi +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; + + hpux10*) +- if test "$GCC" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ if test yes,no = "$GCC,$with_gnu_ld"; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +- if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ if test no = "$with_gnu_ld"; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes +@@ -5262,25 +5385,25 @@ + ;; + + hpux11*) +- if test "$GCC" = yes && test "$with_gnu_ld" = no; then ++ if test yes,no = "$GCC,$with_gnu_ld"; then + case $host_cpu in + hppa*64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + m4_if($1, [], [ +@@ -5288,14 +5411,14 @@ + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], +- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], ++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], +- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + ;; + esac + fi +- if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ if test no = "$with_gnu_ld"; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in +@@ -5306,7 +5429,7 @@ + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. +@@ -5317,16 +5440,16 @@ + ;; + + irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ if test yes = "$GCC"; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], +- [save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ [save_LDFLAGS=$LDFLAGS ++ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], +@@ -5339,16 +5462,16 @@ + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) +- LDFLAGS="$save_LDFLAGS"]) +- if test "$lt_cv_irix_exported_symbol" = yes; then +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ LDFLAGS=$save_LDFLAGS]) ++ if test yes = "$lt_cv_irix_exported_symbol"; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes +@@ -5368,7 +5491,7 @@ + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; +@@ -5376,27 +5499,19 @@ + *nto* | *qnx*) + ;; + +- openbsd*) ++ openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + else +- case $host_os in +- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) +- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- ;; +- *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- ;; +- esac ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -5412,28 +5527,28 @@ + ;; + + osf3*) +- if test "$GCC" = yes; then +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ if test yes = "$GCC"; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ if test yes = "$GCC"; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ +- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' ++ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +@@ -5444,24 +5559,24 @@ + + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' +- if test "$GCC" = yes; then +- wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ if test yes = "$GCC"; then ++ wlarc='$wl' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' +- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) +- wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ wlarc='$wl' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi +@@ -5471,11 +5586,11 @@ + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, +- # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but understands '-z linker_flag'. GCC discards it without '$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- if test "$GCC" = yes; then +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ if test yes = "$GCC"; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi +@@ -5485,10 +5600,10 @@ + ;; + + sunos4*) +- if test "x$host_vendor" = xsequent; then ++ if test sequent = "$host_vendor"; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. +- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -5537,43 +5652,43 @@ + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) +- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + +- if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ if test yes = "$GCC"; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not ++ # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. +- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' ++ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' + +- if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ if test yes = "$GCC"; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + +@@ -5588,17 +5703,17 @@ + ;; + esac + +- if test x$host_vendor = xsni; then ++ if test sni = "$host_vendor"; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' + ;; + esac + fi + fi + ]) + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no + + _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld + +@@ -5615,7 +5730,7 @@ + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + +- if test "$enable_shared" = yes && test "$GCC" = yes; then ++ if test yes,yes = "$GCC,$enable_shared"; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. +@@ -5695,12 +5810,12 @@ + _LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) + _LT_TAGDECL([], [hardcode_direct], [0], +- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary]) + _LT_TAGDECL([], [hardcode_direct_absolute], [0], +- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary and the resulting library dependency is +- "absolute", i.e impossible to change by setting ${shlibpath_var} if the ++ "absolute", i.e impossible to change by setting $shlibpath_var if the + library is relocated]) + _LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR +@@ -5741,10 +5856,10 @@ + # ------------------------ + # Ensure that the configuration variables for a C compiler are suitably + # defined. These variables are subsequently used by _LT_CONFIG to write +-# the compiler configuration to `libtool'. ++# the compiler configuration to 'libtool'. + m4_defun([_LT_LANG_C_CONFIG], + [m4_require([_LT_DECL_EGREP])dnl +-lt_save_CC="$CC" ++lt_save_CC=$CC + AC_LANG_PUSH(C) + + # Source file extension for C test sources. +@@ -5784,18 +5899,18 @@ + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + +- # Report which library types will actually be built ++ # Report what library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) +- test "$can_build_shared" = "no" && enable_shared=no ++ test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) +- test "$enable_shared" = yes && enable_static=no ++ test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' +@@ -5803,8 +5918,8 @@ + ;; + + aix[[4-9]]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no ++ if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then ++ test yes = "$enable_shared" && enable_static=no + fi + ;; + esac +@@ -5812,13 +5927,13 @@ + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. +- test "$enable_shared" = yes || enable_static=yes ++ test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_CONFIG($1) + fi + AC_LANG_POP +-CC="$lt_save_CC" ++CC=$lt_save_CC + ])# _LT_LANG_C_CONFIG + + +@@ -5826,14 +5941,14 @@ + # -------------------------- + # Ensure that the configuration variables for a C++ compiler are suitably + # defined. These variables are subsequently used by _LT_CONFIG to write +-# the compiler configuration to `libtool'. ++# the compiler configuration to 'libtool'. + m4_defun([_LT_LANG_CXX_CONFIG], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl + m4_require([_LT_PATH_MANIFEST_TOOL])dnl +-if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then ++if test -n "$CXX" && ( test no != "$CXX" && ++ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || ++ (test g++ != "$CXX"))); then + AC_PROG_CXXCPP + else + _lt_caught_CXX_error=yes +@@ -5875,7 +5990,7 @@ + # the CXX compiler isn't working. Some variables (like enable_shared) + # are currently assumed to apply to all compilers on this platform, + # and will be corrupted by setting them based on a non-working compiler. +-if test "$_lt_caught_CXX_error" != yes; then ++if test yes != "$_lt_caught_CXX_error"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + +@@ -5917,35 +6032,35 @@ + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately +- if test "$GXX" = yes; then ++ if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi + +- if test "$GXX" = yes; then ++ if test yes = "$GXX"; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ if test yes = "$with_gnu_ld"; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) +- wlarc='${wl}' ++ wlarc='$wl' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then +- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi +@@ -5981,12 +6096,12 @@ + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' +- no_entry_flag="" ++ no_entry_flag= + else + aix_use_runtimelinking=no + +@@ -6020,13 +6135,13 @@ + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes +- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' +- +- if test "$GXX" = yes; then ++ _LT_TAGVAR(file_list_spec, $1)='$wl-f,' ++ ++ if test yes = "$GXX"; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` ++ collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then +@@ -6044,56 +6159,56 @@ + fi + esac + shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' ++ if test yes = "$aix_use_runtimelinking"; then ++ shared_flag=$shared_flag' $wl-G' + fi + else + # not using gcc +- if test "$host_cpu" = ia64; then ++ if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' ++ if test yes = "$aix_use_runtimelinking"; then ++ shared_flag='$wl-G' + else +- shared_flag='${wl}-bM:SRE' ++ shared_flag='$wl-bM:SRE' + fi + fi + fi + +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then ++ if test yes = "$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX([$1]) +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" ++ ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else +- if test "$host_cpu" = ia64; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ if test ia64 = "$host_cpu"; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- if test "$with_gnu_ld" = yes; then ++ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' ++ if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +@@ -6101,7 +6216,7 @@ + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared + # libraries. +- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; +@@ -6111,7 +6226,7 @@ + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -6139,57 +6254,58 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" ++ shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; +- else +- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; +- fi~ +- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ +- linknames=' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then ++ cp "$export_symbols" "$output_objdir/$soname.def"; ++ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; ++ else ++ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ +- lt_tool_outputfile="@TOOL_OUTPUT@"~ +- case $lt_outputfile in +- *.exe|*.EXE) ;; +- *) +- lt_outputfile="$lt_outputfile.exe" +- lt_tool_outputfile="$lt_tool_outputfile.exe" +- ;; +- esac~ +- func_to_tool_file "$lt_outputfile"~ +- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then +- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; +- $RM "$lt_outputfile.manifest"; +- fi' ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile=$lt_outputfile.exe ++ lt_tool_outputfile=$lt_tool_outputfile.exe ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file, use it as ++ # is; otherwise, prepend EXPORTS... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -6234,18 +6350,15 @@ + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + +- gnu*) +- ;; +- + haiku*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + hpux9*) +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default +@@ -6257,7 +6370,7 @@ + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +@@ -6266,11 +6379,11 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) +- if test "$GXX" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ if test yes = "$GXX"; then ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -6280,15 +6393,15 @@ + ;; + + hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ if test no = "$with_gnu_ld"; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; + esac + fi +@@ -6314,13 +6427,13 @@ + aCC*) + case $host_cpu in + hppa*64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists +@@ -6331,20 +6444,20 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then ++ if test yes = "$GXX"; then ++ if test no = "$with_gnu_ld"; then + case $host_cpu in + hppa*64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -6359,22 +6472,22 @@ + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is +@@ -6383,22 +6496,22 @@ + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ if test yes = "$GXX"; then ++ if test no = "$with_gnu_ld"; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + +- linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -6406,8 +6519,8 @@ + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +@@ -6416,10 +6529,10 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' +- +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. +@@ -6433,59 +6546,59 @@ + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ +- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ ++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ +- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ +- $RANLIB $oldlib' ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ ++ $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + ;; + cxx*) + # Compaq C++ +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +@@ -6499,18 +6612,18 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- if test "x$supports_anon_versioning" = xyes; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + *) +@@ -6518,10 +6631,10 @@ + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on +@@ -6579,22 +6692,17 @@ + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + +- openbsd2*) +- # C++ shared libraries are fairly broken +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- +- openbsd*) ++ openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else +@@ -6610,9 +6718,9 @@ + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using +@@ -6630,17 +6738,17 @@ + cxx*) + case $host in + osf3*) +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ +- $RM $lib.exp' ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ ++ $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac +@@ -6655,21 +6763,21 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ if test yes,no = "$GXX,$with_gnu_ld"; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + case $host in + osf3*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + esac + +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists +@@ -6715,9 +6823,9 @@ + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -6725,7 +6833,7 @@ + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, +- # but understands `-z linker_flag'. ++ # but understands '-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; +@@ -6742,30 +6850,30 @@ + ;; + gcx*) + # Green Hills C++ Compiler +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++ if test yes,no = "$GXX,$with_gnu_ld"; then ++ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # g++ 2.7 appears to require '-G' NOT '-shared' on this + # platform. +- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -6773,11 +6881,11 @@ + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + ;; + esac + fi +@@ -6786,52 +6894,52 @@ + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) +- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not ++ # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. +- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' ++ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ +- '"$_LT_TAGVAR(old_archive_cmds, $1)" ++ '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ +- '"$_LT_TAGVAR(reload_cmds, $1)" ++ '"$_LT_TAGVAR(reload_cmds, $1)" + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; +@@ -6862,10 +6970,10 @@ + esac + + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +- +- _LT_TAGVAR(GCC, $1)="$GXX" +- _LT_TAGVAR(LD, $1)="$LD" ++ test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no ++ ++ _LT_TAGVAR(GCC, $1)=$GXX ++ _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change +@@ -6892,7 +7000,7 @@ + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +-fi # test "$_lt_caught_CXX_error" != yes ++fi # test yes != "$_lt_caught_CXX_error" + + AC_LANG_POP + ])# _LT_LANG_CXX_CONFIG +@@ -6914,9 +7022,9 @@ + AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) + func_stripname_cnf () + { +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ case @S|@2 in ++ .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; ++ *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; + esac + } # func_stripname_cnf + ])# _LT_FUNC_STRIPNAME_CNF +@@ -7004,13 +7112,13 @@ + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do +- case ${prev}${p} in ++ case $prev$p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. +- if test $p = "-L" || +- test $p = "-R"; then ++ if test x-L = "$p" || ++ test x-R = "$p"; then + prev=$p + continue + fi +@@ -7026,16 +7134,16 @@ + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac +- if test "$pre_test_object_deps_done" = no; then +- case ${prev} in ++ if test no = "$pre_test_object_deps_done"; then ++ case $prev in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then +- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" ++ _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p + else +- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" ++ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" + fi + ;; + # The "-l" case would never come before the object being +@@ -7043,9 +7151,9 @@ + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then +- _LT_TAGVAR(postdeps, $1)="${prev}${p}" ++ _LT_TAGVAR(postdeps, $1)=$prev$p + else +- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" ++ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" + fi + fi + prev= +@@ -7060,15 +7168,15 @@ + continue + fi + +- if test "$pre_test_object_deps_done" = no; then ++ if test no = "$pre_test_object_deps_done"; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then +- _LT_TAGVAR(predep_objects, $1)="$p" ++ _LT_TAGVAR(predep_objects, $1)=$p + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then +- _LT_TAGVAR(postdep_objects, $1)="$p" ++ _LT_TAGVAR(postdep_objects, $1)=$p + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi +@@ -7115,7 +7223,7 @@ + ;; + esac + +- if test "$solaris_use_stlport4" != yes; then ++ if test yes != "$solaris_use_stlport4"; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; +@@ -7138,7 +7246,7 @@ + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. +- if test "$solaris_use_stlport4" != yes; then ++ if test yes != "$solaris_use_stlport4"; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; +@@ -7152,7 +7260,7 @@ + esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= + if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then +- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` + fi + _LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +@@ -7172,10 +7280,10 @@ + # -------------------------- + # Ensure that the configuration variables for a Fortran 77 compiler are + # suitably defined. These variables are subsequently used by _LT_CONFIG +-# to write the compiler configuration to `libtool'. ++# to write the compiler configuration to 'libtool'. + m4_defun([_LT_LANG_F77_CONFIG], + [AC_LANG_PUSH(Fortran 77) +-if test -z "$F77" || test "X$F77" = "Xno"; then ++if test -z "$F77" || test no = "$F77"; then + _lt_disable_F77=yes + fi + +@@ -7212,7 +7320,7 @@ + # the F77 compiler isn't working. Some variables (like enable_shared) + # are currently assumed to apply to all compilers on this platform, + # and will be corrupted by setting them based on a non-working compiler. +-if test "$_lt_disable_F77" != yes; then ++if test yes != "$_lt_disable_F77"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t +@@ -7234,7 +7342,7 @@ + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +- lt_save_CC="$CC" ++ lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} +@@ -7248,21 +7356,21 @@ + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) +- test "$can_build_shared" = "no" && enable_shared=no ++ test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) +- test "$enable_shared" = yes && enable_static=no ++ test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no ++ if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then ++ test yes = "$enable_shared" && enable_static=no + fi + ;; + esac +@@ -7270,11 +7378,11 @@ + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. +- test "$enable_shared" = yes || enable_static=yes ++ test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + +- _LT_TAGVAR(GCC, $1)="$G77" +- _LT_TAGVAR(LD, $1)="$LD" ++ _LT_TAGVAR(GCC, $1)=$G77 ++ _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change +@@ -7291,9 +7399,9 @@ + fi # test -n "$compiler" + + GCC=$lt_save_GCC +- CC="$lt_save_CC" +- CFLAGS="$lt_save_CFLAGS" +-fi # test "$_lt_disable_F77" != yes ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS ++fi # test yes != "$_lt_disable_F77" + + AC_LANG_POP + ])# _LT_LANG_F77_CONFIG +@@ -7303,11 +7411,11 @@ + # ------------------------- + # Ensure that the configuration variables for a Fortran compiler are + # suitably defined. These variables are subsequently used by _LT_CONFIG +-# to write the compiler configuration to `libtool'. ++# to write the compiler configuration to 'libtool'. + m4_defun([_LT_LANG_FC_CONFIG], + [AC_LANG_PUSH(Fortran) + +-if test -z "$FC" || test "X$FC" = "Xno"; then ++if test -z "$FC" || test no = "$FC"; then + _lt_disable_FC=yes + fi + +@@ -7344,7 +7452,7 @@ + # the FC compiler isn't working. Some variables (like enable_shared) + # are currently assumed to apply to all compilers on this platform, + # and will be corrupted by setting them based on a non-working compiler. +-if test "$_lt_disable_FC" != yes; then ++if test yes != "$_lt_disable_FC"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t +@@ -7366,7 +7474,7 @@ + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +- lt_save_CC="$CC" ++ lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} +@@ -7382,21 +7490,21 @@ + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) +- test "$can_build_shared" = "no" && enable_shared=no ++ test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) +- test "$enable_shared" = yes && enable_static=no ++ test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no ++ if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then ++ test yes = "$enable_shared" && enable_static=no + fi + ;; + esac +@@ -7404,11 +7512,11 @@ + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. +- test "$enable_shared" = yes || enable_static=yes ++ test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + +- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" +- _LT_TAGVAR(LD, $1)="$LD" ++ _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu ++ _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change +@@ -7428,7 +7536,7 @@ + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +-fi # test "$_lt_disable_FC" != yes ++fi # test yes != "$_lt_disable_FC" + + AC_LANG_POP + ])# _LT_LANG_FC_CONFIG +@@ -7438,7 +7546,7 @@ + # -------------------------- + # Ensure that the configuration variables for the GNU Java Compiler compiler + # are suitably defined. These variables are subsequently used by _LT_CONFIG +-# to write the compiler configuration to `libtool'. ++# to write the compiler configuration to 'libtool'. + m4_defun([_LT_LANG_GCJ_CONFIG], + [AC_REQUIRE([LT_PROG_GCJ])dnl + AC_LANG_SAVE +@@ -7472,7 +7580,7 @@ + CFLAGS=$GCJFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC +-_LT_TAGVAR(LD, $1)="$LD" ++_LT_TAGVAR(LD, $1)=$LD + _LT_CC_BASENAME([$compiler]) + + # GCJ did not exist at the time GCC didn't implicitly link libc in. +@@ -7509,7 +7617,7 @@ + # -------------------------- + # Ensure that the configuration variables for the GNU Go compiler + # are suitably defined. These variables are subsequently used by _LT_CONFIG +-# to write the compiler configuration to `libtool'. ++# to write the compiler configuration to 'libtool'. + m4_defun([_LT_LANG_GO_CONFIG], + [AC_REQUIRE([LT_PROG_GO])dnl + AC_LANG_SAVE +@@ -7543,7 +7651,7 @@ + CFLAGS=$GOFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC +-_LT_TAGVAR(LD, $1)="$LD" ++_LT_TAGVAR(LD, $1)=$LD + _LT_CC_BASENAME([$compiler]) + + # Go did not exist at the time GCC didn't implicitly link libc in. +@@ -7580,7 +7688,7 @@ + # ------------------------- + # Ensure that the configuration variables for the Windows resource compiler + # are suitably defined. These variables are subsequently used by _LT_CONFIG +-# to write the compiler configuration to `libtool'. ++# to write the compiler configuration to 'libtool'. + m4_defun([_LT_LANG_RC_CONFIG], + [AC_REQUIRE([LT_PROG_RC])dnl + AC_LANG_SAVE +@@ -7596,7 +7704,7 @@ + lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + + # Code to be used in simple link tests +-lt_simple_link_test_code="$lt_simple_compile_test_code" ++lt_simple_link_test_code=$lt_simple_compile_test_code + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER +@@ -7606,7 +7714,7 @@ + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +-lt_save_CC="$CC" ++lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC= +@@ -7635,7 +7743,7 @@ + [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl + ]) + +@@ -7746,7 +7854,7 @@ + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && continue ++ test ! -f "$lt_ac_sed" && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in +@@ -7763,9 +7871,9 @@ + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough +- test $lt_ac_count -gt 10 && break ++ test 10 -lt "$lt_ac_count" && break + lt_ac_count=`expr $lt_ac_count + 1` +- if test $lt_ac_count -gt $lt_ac_max; then ++ if test "$lt_ac_count" -gt "$lt_ac_max"; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi +@@ -7789,27 +7897,7 @@ + # Find out whether the shell is Bourne or XSI compatible, + # or has some other useful features. + m4_defun([_LT_CHECK_SHELL_FEATURES], +-[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +-# Try some XSI features +-xsi_shell=no +-( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,b/c, \ +- && eval 'test $(( 1 + 1 )) -eq 2 \ +- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ +- && xsi_shell=yes +-AC_MSG_RESULT([$xsi_shell]) +-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) +- +-AC_MSG_CHECKING([whether the shell understands "+="]) +-lt_shell_append=no +-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ +- >/dev/null 2>&1 \ +- && lt_shell_append=yes +-AC_MSG_RESULT([$lt_shell_append]) +-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) +- +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset + else + lt_unset=false +@@ -7833,102 +7921,9 @@ + ])# _LT_CHECK_SHELL_FEATURES + + +-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +-# ------------------------------------------------------ +-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +-m4_defun([_LT_PROG_FUNCTION_REPLACE], +-[dnl { +-sed -e '/^$1 ()$/,/^} # $1 /c\ +-$1 ()\ +-{\ +-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +-]) +- +- +-# _LT_PROG_REPLACE_SHELLFNS +-# ------------------------- +-# Replace existing portable implementations of several shell functions with +-# equivalent extended shell implementations where those features are available.. +-m4_defun([_LT_PROG_REPLACE_SHELLFNS], +-[if test x"$xsi_shell" = xyes; then +- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac]) +- +- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl +- func_basename_result="${1##*/}"]) +- +- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}"]) +- +- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"}]) +- +- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl +- func_split_long_opt_name=${1%%=*} +- func_split_long_opt_arg=${1#*=}]) +- +- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl +- func_split_short_opt_arg=${1#??} +- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) +- +- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac]) +- +- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) +- +- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) +- +- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +-fi +- +-if test x"$lt_shell_append" = xyes; then +- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) +- +- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl +- func_quote_for_eval "${2}" +-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ +- eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) +- +- # Save a `func_append' function call where possible by direct use of '+=' +- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +- test 0 -eq $? || _lt_function_replace_fail=: +-else +- # Save a `func_append' function call even when '+=' is not available +- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +- test 0 -eq $? || _lt_function_replace_fail=: +-fi +- +-if test x"$_lt_function_replace_fail" = x":"; then +- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +-fi +-]) +- + # _LT_PATH_CONVERSION_FUNCTIONS + # ----------------------------- +-# Determine which file name conversion functions should be used by ++# Determine what file name conversion functions should be used by + # func_to_host_file (and, implicitly, by func_to_host_path). These are needed + # for certain cross-compile configurations and native mingw. + m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +diff -r ee879c0ffa11 Modules/_ctypes/libffi/m4/ltoptions.m4 +--- a/Modules/_ctypes/libffi/m4/ltoptions.m4 ++++ b/Modules/_ctypes/libffi/m4/ltoptions.m4 +@@ -1,14 +1,14 @@ + # Helper functions for option handling. -*- Autoconf -*- + # +-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# Copyright (C) 2004-2005, 2007-2009, 2011-2013 Free Software ++# Foundation, Inc. + # Written by Gary V. Vaughan, 2004 + # + # This file is free software; the Free Software Foundation gives + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 7 ltoptions.m4 ++# serial 8 ltoptions.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +@@ -29,7 +29,7 @@ + [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl + m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), +- [m4_warning([Unknown $1 option `$2'])])[]dnl ++ [m4_warning([Unknown $1 option '$2'])])[]dnl + ]) + + +@@ -75,13 +75,13 @@ + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither +- dnl `shared' nor `disable-shared' was passed, we enable building of shared ++ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], +- [_LT_ENABLE_FAST_INSTALL]) ++ [_LT_ENABLE_FAST_INSTALL]) + ]) + ])# _LT_SET_OPTIONS + +@@ -112,7 +112,7 @@ + [_LT_SET_OPTION([LT_INIT], [dlopen]) + AC_DIAGNOSE([obsolete], + [$0: Remove this warning and the call to _LT_SET_OPTION when you +-put the `dlopen' option into LT_INIT's first parameter.]) ++put the 'dlopen' option into LT_INIT's first parameter.]) + ]) + + dnl aclocal-1.4 backwards compatibility: +@@ -148,7 +148,7 @@ + _LT_SET_OPTION([LT_INIT], [win32-dll]) + AC_DIAGNOSE([obsolete], + [$0: Remove this warning and the call to _LT_SET_OPTION when you +-put the `win32-dll' option into LT_INIT's first parameter.]) ++put the 'win32-dll' option into LT_INIT's first parameter.]) + ]) + + dnl aclocal-1.4 backwards compatibility: +@@ -157,9 +157,9 @@ + + # _LT_ENABLE_SHARED([DEFAULT]) + # ---------------------------- +-# implement the --enable-shared flag, and supports the `shared' and +-# `disable-shared' LT_INIT options. +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++# implement the --enable-shared flag, and supports the 'shared' and ++# 'disable-shared' LT_INIT options. ++# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. + m4_define([_LT_ENABLE_SHARED], + [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl + AC_ARG_ENABLE([shared], +@@ -172,14 +172,14 @@ + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) +@@ -211,9 +211,9 @@ + + # _LT_ENABLE_STATIC([DEFAULT]) + # ---------------------------- +-# implement the --enable-static flag, and support the `static' and +-# `disable-static' LT_INIT options. +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++# implement the --enable-static flag, and support the 'static' and ++# 'disable-static' LT_INIT options. ++# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. + m4_define([_LT_ENABLE_STATIC], + [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl + AC_ARG_ENABLE([static], +@@ -226,14 +226,14 @@ + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) +@@ -265,9 +265,9 @@ + + # _LT_ENABLE_FAST_INSTALL([DEFAULT]) + # ---------------------------------- +-# implement the --enable-fast-install flag, and support the `fast-install' +-# and `disable-fast-install' LT_INIT options. +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++# implement the --enable-fast-install flag, and support the 'fast-install' ++# and 'disable-fast-install' LT_INIT options. ++# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. + m4_define([_LT_ENABLE_FAST_INSTALL], + [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl + AC_ARG_ENABLE([fast-install], +@@ -280,14 +280,14 @@ + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) +@@ -304,14 +304,14 @@ + [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) + AC_DIAGNOSE([obsolete], + [$0: Remove this warning and the call to _LT_SET_OPTION when you put +-the `fast-install' option into LT_INIT's first parameter.]) ++the 'fast-install' option into LT_INIT's first parameter.]) + ]) + + AU_DEFUN([AC_DISABLE_FAST_INSTALL], + [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) + AC_DIAGNOSE([obsolete], + [$0: Remove this warning and the call to _LT_SET_OPTION when you put +-the `disable-fast-install' option into LT_INIT's first parameter.]) ++the 'disable-fast-install' option into LT_INIT's first parameter.]) + ]) + + dnl aclocal-1.4 backwards compatibility: +@@ -321,9 +321,9 @@ + + # _LT_WITH_PIC([MODE]) + # -------------------- +-# implement the --with-pic flag, and support the `pic-only' and `no-pic' ++# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' + # LT_INIT options. +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. + m4_define([_LT_WITH_PIC], + [AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], +@@ -334,19 +334,17 @@ + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for lt_pkg in $withval; do +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done +- IFS="$lt_save_ifs" ++ IFS=$lt_save_ifs + ;; + esac], +- [pic_mode=default]) +- +-test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) ++ [pic_mode=m4_default([$1], [default])]) + + _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl + ])# _LT_WITH_PIC +@@ -359,7 +357,7 @@ + [_LT_SET_OPTION([LT_INIT], [pic-only]) + AC_DIAGNOSE([obsolete], + [$0: Remove this warning and the call to _LT_SET_OPTION when you +-put the `pic-only' option into LT_INIT's first parameter.]) ++put the 'pic-only' option into LT_INIT's first parameter.]) + ]) + + dnl aclocal-1.4 backwards compatibility: +diff -r ee879c0ffa11 Modules/_ctypes/libffi/m4/ltsugar.m4 +--- a/Modules/_ctypes/libffi/m4/ltsugar.m4 ++++ b/Modules/_ctypes/libffi/m4/ltsugar.m4 +@@ -1,6 +1,7 @@ + # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- + # +-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++# Copyright (C) 2004-2005, 2007-2008, 2011-2013 Free Software ++# Foundation, Inc. + # Written by Gary V. Vaughan, 2004 + # + # This file is free software; the Free Software Foundation gives +@@ -33,7 +34,7 @@ + # ------------ + # Manipulate m4 lists. + # These macros are necessary as long as will still need to support +-# Autoconf-2.59 which quotes differently. ++# Autoconf-2.59, which quotes differently. + m4_define([lt_car], [[$1]]) + m4_define([lt_cdr], + [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], +@@ -44,7 +45,7 @@ + + # lt_append(MACRO-NAME, STRING, [SEPARATOR]) + # ------------------------------------------ +-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. ++# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. + # Note that neither SEPARATOR nor STRING are expanded; they are appended + # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). + # No SEPARATOR is output if MACRO-NAME was previously undefined (different +diff -r ee879c0ffa11 Modules/_ctypes/libffi/m4/ltversion.m4 +--- a/Modules/_ctypes/libffi/m4/ltversion.m4 ++++ b/Modules/_ctypes/libffi/m4/ltversion.m4 +@@ -1,6 +1,6 @@ + # ltversion.m4 -- version numbers -*- Autoconf -*- + # +-# Copyright (C) 2004 Free Software Foundation, Inc. ++# Copyright (C) 2004, 2011-2013 Free Software Foundation, Inc. + # Written by Scott James Remnant, 2004 + # + # This file is free software; the Free Software Foundation gives +@@ -9,15 +9,15 @@ + + # @configure_input@ + +-# serial 3337 ltversion.m4 ++# serial 4038 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.4.2]) +-m4_define([LT_PACKAGE_REVISION], [1.3337]) ++m4_define([LT_PACKAGE_VERSION], [2.4.2.418]) ++m4_define([LT_PACKAGE_REVISION], [2.4.2.418]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.4.2' +-macro_revision='1.3337' ++[macro_version='2.4.2.418' ++macro_revision='2.4.2.418' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +diff -r ee879c0ffa11 Modules/_ctypes/libffi/m4/lt~obsolete.m4 +--- a/Modules/_ctypes/libffi/m4/lt~obsolete.m4 ++++ b/Modules/_ctypes/libffi/m4/lt~obsolete.m4 +@@ -1,6 +1,7 @@ + # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- + # +-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. ++# Copyright (C) 2004-2005, 2007, 2009, 2011-2013 Free Software ++# Foundation, Inc. + # Written by Scott James Remnant, 2004. + # + # This file is free software; the Free Software Foundation gives +@@ -11,7 +12,7 @@ + + # These exist entirely to fool aclocal when bootstrapping libtool. + # +-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) ++# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), + # which have later been changed to m4_define as they aren't part of the + # exported API, or moved to Autoconf or Automake where they belong. + # +@@ -25,7 +26,7 @@ + # included after everything else. This provides aclocal with the + # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything + # because those macros already exist, or will be overwritten later. +-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. ++# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. + # + # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. + # Yes, that means every name once taken will need to remain here until +diff -r ee879c0ffa11 Modules/_ctypes/libffi/man/Makefile.in +--- a/Modules/_ctypes/libffi/man/Makefile.in ++++ b/Modules/_ctypes/libffi/man/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.12.2 from Makefile.am. ++# Makefile.in generated by automake 1.13.4 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2012 Free Software Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -14,23 +14,51 @@ + + @SET_MAKE@ + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -51,7 +79,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = man +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ +@@ -73,6 +101,18 @@ + CONFIG_HEADER = $(top_builddir)/fficonfig.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + SOURCES = + DIST_SOURCES = + am__can_run_installinfo = \ +@@ -111,10 +151,12 @@ + am__installdirs = "$(DESTDIR)$(man3dir)" + NROFF = nroff + MANS = $(man_MANS) ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AM_LTLDFLAGS = @AM_LTLDFLAGS@ + AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ + AR = @AR@ +@@ -130,6 +172,10 @@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +@@ -145,6 +191,7 @@ + FGREP = @FGREP@ + GREP = @GREP@ + HAVE_LONG_DOUBLE = @HAVE_LONG_DOUBLE@ ++HAVE_LONG_DOUBLE_VARIANT = @HAVE_LONG_DOUBLE_VARIANT@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -191,6 +238,7 @@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_AR = @ac_ct_AR@ + ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ +@@ -330,29 +378,14 @@ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir) +-tags: TAGS +-TAGS: ++tags TAGS: + +-ctags: CTAGS +-CTAGS: ++ctags CTAGS: + + cscope cscopelist: + + + distdir: $(DISTFILES) +- @list='$(MANS)'; if test -n "$$list"; then \ +- list=`for p in $$list; do \ +- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ +- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ +- if test -n "$$list" && \ +- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ +- echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ +- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ +- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ +- echo " typically 'make maintainer-clean' will remove them" >&2; \ +- exit 1; \ +- else :; fi; \ +- else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -490,16 +523,17 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-man3 \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-man uninstall-man3 ++ cscopelist-am ctags-am distclean distclean-generic \ ++ distclean-libtool distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-man3 install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am tags-am uninstall uninstall-am uninstall-man \ ++ uninstall-man3 + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -r ee879c0ffa11 Modules/_ctypes/libffi/mdate-sh +--- a/Modules/_ctypes/libffi/mdate-sh ++++ b/Modules/_ctypes/libffi/mdate-sh +@@ -1,10 +1,9 @@ + #!/bin/sh + # Get modification time of a file or directory and pretty-print it. + +-scriptversion=2005-06-29.22 ++scriptversion=2010-08-21.06; # UTC + +-# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software +-# Foundation, Inc. ++# Copyright (C) 1995-2013 Free Software Foundation, Inc. + # written by Ulrich Drepper , June 1995 + # + # This program is free software; you can redistribute it and/or modify +@@ -18,8 +17,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software Foundation, +-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++# along with this program. If not, see . + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -30,16 +28,26 @@ + # bugs to or send patches to + # . + ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++fi ++ + case $1 in + '') +- echo "$0: No file. Try \`$0 --help' for more information." 1>&2 ++ echo "$0: No file. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF + Usage: mdate-sh [--help] [--version] FILE + +-Pretty-print the modification time of FILE. ++Pretty-print the modification day of FILE, in the format: ++1 January 1970 + + Report bugs to . + EOF +@@ -51,6 +59,13 @@ + ;; + esac + ++error () ++{ ++ echo "$0: $1" >&2 ++ exit 1 ++} ++ ++ + # Prevent date giving response in another language. + LANG=C + export LANG +@@ -60,7 +75,7 @@ + export LC_TIME + + # GNU ls changes its time format in response to the TIME_STYLE +-# variable. Since we cannot assume `unset' works, revert this ++# variable. Since we cannot assume 'unset' works, revert this + # variable to its documented default. + if test "${TIME_STYLE+set}" = set; then + TIME_STYLE=posix-long-iso +@@ -75,27 +90,32 @@ + else + ls_command='ls -l -d' + fi ++# Avoid user/group names that might have spaces, when possible. ++if ls -n /dev/null 1>/dev/null 2>&1; then ++ ls_command="$ls_command -n" ++fi + +-# A `ls -l' line looks as follows on OS/2. ++# A 'ls -l' line looks as follows on OS/2. + # drwxrwx--- 0 Aug 11 2001 foo + # This differs from Unix, which adds ownership information. + # drwxrwx--- 2 root root 4096 Aug 11 2001 foo + # + # To find the date, we split the line on spaces and iterate on words + # until we find a month. This cannot work with files whose owner is a +-# user named `Jan', or `Feb', etc. However, it's unlikely that `/' ++# user named "Jan", or "Feb", etc. However, it's unlikely that '/' + # will be owned by a user whose name is a month. So we first look at + # the extended ls output of the root directory to decide how many + # words should be skipped to get the date. + + # On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below. +-set x`ls -l -d /` ++set x`$ls_command /` + + # Find which argument is the month. + month= + command= + until test $month + do ++ test $# -gt 0 || error "failed parsing '$ls_command /' output" + shift + # Add another shift to the command. + command="$command shift;" +@@ -115,8 +135,10 @@ + esac + done + ++test -n "$month" || error "failed parsing '$ls_command /' output" ++ + # Get the extended ls output of the file or directory. +-set dummy x`eval "$ls_command \"\$save_arg1\""` ++set dummy x`eval "$ls_command \"\\\$save_arg1\""` + + # Remove all preceding arguments + eval $command +@@ -197,5 +219,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -r ee879c0ffa11 Modules/_ctypes/libffi/missing +--- a/Modules/_ctypes/libffi/missing ++++ b/Modules/_ctypes/libffi/missing +@@ -1,11 +1,10 @@ + #! /bin/sh +-# Common stub for a few missing GNU programs while installing. ++# Common wrapper for a few potentially missing GNU programs. + +-scriptversion=2009-04-28.21; # UTC ++scriptversion=2012-06-26.16; # UTC + +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +-# 2008, 2009 Free Software Foundation, Inc. +-# Originally by Fran,cois Pinard , 1996. ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. ++# Originally written by Fran,cois Pinard , 1996. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -26,69 +25,40 @@ + # the same distribution terms that you use for the rest of that program. + + if test $# -eq 0; then +- echo 1>&2 "Try \`$0 --help' for more information" ++ echo 1>&2 "Try '$0 --help' for more information" + exit 1 + fi + +-run=: +-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +-sed_minuso='s/.* -o \([^ ]*\).*/\1/p' ++case $1 in + +-# In the cases where this matters, `missing' is being run in the +-# srcdir already. +-if test -f configure.ac; then +- configure_ac=configure.ac +-else +- configure_ac=configure.in +-fi ++ --is-lightweight) ++ # Used by our autoconf macros to check whether the available missing ++ # script is modern enough. ++ exit 0 ++ ;; + +-msg="missing on your system" +- +-case $1 in +---run) +- # Try to run requested program, and just exit if it succeeds. +- run= +- shift +- "$@" && exit 0 +- # Exit code 63 means version mismatch. This often happens +- # when the user try to use an ancient version of a tool on +- # a file that requires a minimum version. In this case we +- # we should proceed has if the program had been absent, or +- # if --run hadn't been passed. +- if test $? = 63; then +- run=: +- msg="probably too old" +- fi +- ;; ++ --run) ++ # Back-compat with the calling convention used by older automake. ++ shift ++ ;; + + -h|--h|--he|--hel|--help) + echo "\ + $0 [OPTION]... PROGRAM [ARGUMENT]... + +-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +-error status if there is no known handling for PROGRAM. ++Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due ++to PROGRAM being missing or too old. + + Options: + -h, --help display this help and exit + -v, --version output version information and exit +- --run try to run the given command, and emulate it if it fails + + Supported PROGRAM values: +- aclocal touch file \`aclocal.m4' +- autoconf touch file \`configure' +- autoheader touch file \`config.h.in' +- autom4te touch the output file, or create a stub one +- automake touch all \`Makefile.in' files +- bison create \`y.tab.[ch]', if possible, from existing .[ch] +- flex create \`lex.yy.c', if possible, from existing .c +- help2man touch the output file +- lex create \`lex.yy.c', if possible, from existing .c +- makeinfo touch the output file +- tar try tar, gnutar, gtar, then tar without non-portable flags +- yacc create \`y.tab.[ch]', if possible, from existing .[ch] ++ aclocal autoconf autoheader autom4te automake makeinfo ++ bison yacc flex lex help2man + +-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +-\`g' are ignored when checking the name. ++Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and ++'g' are ignored when checking the name. + + Send bug reports to ." + exit $? +@@ -100,272 +70,141 @@ + ;; + + -*) +- echo 1>&2 "$0: Unknown \`$1' option" +- echo 1>&2 "Try \`$0 --help' for more information" ++ echo 1>&2 "$0: unknown '$1' option" ++ echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + + esac + +-# normalize program name to check for. +-program=`echo "$1" | sed ' +- s/^gnu-//; t +- s/^gnu//; t +- s/^g//; t'` ++# Run the given program, remember its exit status. ++"$@"; st=$? + +-# Now exit if we have it, but it failed. Also exit now if we +-# don't have it and --version was passed (most likely to detect +-# the program). This is about non-GNU programs, so use $1 not +-# $program. +-case $1 in +- lex*|yacc*) +- # Not GNU programs, they don't have --version. ++# If it succeeded, we are done. ++test $st -eq 0 && exit 0 ++ ++# Also exit now if we it failed (or wasn't found), and '--version' was ++# passed; such an option is passed most likely to detect whether the ++# program is present and works. ++case $2 in --version|--help) exit $st;; esac ++ ++# Exit code 63 means version mismatch. This often happens when the user ++# tries to use an ancient version of a tool on a file that requires a ++# minimum version. ++if test $st -eq 63; then ++ msg="probably too old" ++elif test $st -eq 127; then ++ # Program was missing. ++ msg="missing on your system" ++else ++ # Program was found and executed, but failed. Give up. ++ exit $st ++fi ++ ++perl_URL=http://www.perl.org/ ++flex_URL=http://flex.sourceforge.net/ ++gnu_software_URL=http://www.gnu.org/software ++ ++program_details () ++{ ++ case $1 in ++ aclocal|automake) ++ echo "The '$1' program is part of the GNU Automake package:" ++ echo "<$gnu_software_URL/automake>" ++ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" ++ echo "<$gnu_software_URL/autoconf>" ++ echo "<$gnu_software_URL/m4/>" ++ echo "<$perl_URL>" ++ ;; ++ autoconf|autom4te|autoheader) ++ echo "The '$1' program is part of the GNU Autoconf package:" ++ echo "<$gnu_software_URL/autoconf/>" ++ echo "It also requires GNU m4 and Perl in order to run:" ++ echo "<$gnu_software_URL/m4/>" ++ echo "<$perl_URL>" ++ ;; ++ esac ++} ++ ++give_advice () ++{ ++ # Normalize program name to check for. ++ normalized_program=`echo "$1" | sed ' ++ s/^gnu-//; t ++ s/^gnu//; t ++ s/^g//; t'` ++ ++ printf '%s\n' "'$1' is $msg." ++ ++ configure_deps="'configure.ac' or m4 files included by 'configure.ac'" ++ case $normalized_program in ++ autoconf*) ++ echo "You should only need it if you modified 'configure.ac'," ++ echo "or m4 files included by it." ++ program_details 'autoconf' ++ ;; ++ autoheader*) ++ echo "You should only need it if you modified 'acconfig.h' or" ++ echo "$configure_deps." ++ program_details 'autoheader' ++ ;; ++ automake*) ++ echo "You should only need it if you modified 'Makefile.am' or" ++ echo "$configure_deps." ++ program_details 'automake' ++ ;; ++ aclocal*) ++ echo "You should only need it if you modified 'acinclude.m4' or" ++ echo "$configure_deps." ++ program_details 'aclocal' ++ ;; ++ autom4te*) ++ echo "You might have modified some maintainer files that require" ++ echo "the 'automa4te' program to be rebuilt." ++ program_details 'autom4te' ++ ;; ++ bison*|yacc*) ++ echo "You should only need it if you modified a '.y' file." ++ echo "You may want to install the GNU Bison package:" ++ echo "<$gnu_software_URL/bison/>" ++ ;; ++ lex*|flex*) ++ echo "You should only need it if you modified a '.l' file." ++ echo "You may want to install the Fast Lexical Analyzer package:" ++ echo "<$flex_URL>" ++ ;; ++ help2man*) ++ echo "You should only need it if you modified a dependency" \ ++ "of a man page." ++ echo "You may want to install the GNU Help2man package:" ++ echo "<$gnu_software_URL/help2man/>" + ;; ++ makeinfo*) ++ echo "You should only need it if you modified a '.texi' file, or" ++ echo "any other file indirectly affecting the aspect of the manual." ++ echo "You might want to install the Texinfo package:" ++ echo "<$gnu_software_URL/texinfo/>" ++ echo "The spurious makeinfo call might also be the consequence of" ++ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" ++ echo "want to install GNU make:" ++ echo "<$gnu_software_URL/make/>" ++ ;; ++ *) ++ echo "You might have modified some files without having the proper" ++ echo "tools for further handling them. Check the 'README' file, it" ++ echo "often tells you about the needed prerequisites for installing" ++ echo "this package. You may also peek at any GNU archive site, in" ++ echo "case some other package contains this missing '$1' program." ++ ;; ++ esac ++} + +- tar*) +- if test -n "$run"; then +- echo 1>&2 "ERROR: \`tar' requires --run" +- exit 1 +- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then +- exit 1 +- fi +- ;; ++give_advice "$1" | sed -e '1s/^/WARNING: /' \ ++ -e '2,$s/^/ /' >&2 + +- *) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then +- # Could not run --version or --help. This is probably someone +- # running `$TOOL --version' or `$TOOL --help' to check whether +- # $TOOL exists and not knowing $TOOL uses missing. +- exit 1 +- fi +- ;; +-esac +- +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case $program in +- aclocal*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`acinclude.m4' or \`${configure_ac}'. You might want +- to install the \`Automake' and \`Perl' packages. Grab them from +- any GNU archive site." +- touch aclocal.m4 +- ;; +- +- autoconf*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`${configure_ac}'. You might want to install the +- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +- archive site." +- touch configure +- ;; +- +- autoheader*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`acconfig.h' or \`${configure_ac}'. You might want +- to install the \`Autoconf' and \`GNU m4' packages. Grab them +- from any GNU archive site." +- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` +- test -z "$files" && files="config.h" +- touch_files= +- for f in $files; do +- case $f in +- *:*) touch_files="$touch_files "`echo "$f" | +- sed -e 's/^[^:]*://' -e 's/:.*//'`;; +- *) touch_files="$touch_files $f.in";; +- esac +- done +- touch $touch_files +- ;; +- +- automake*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. +- You might want to install the \`Automake' and \`Perl' packages. +- Grab them from any GNU archive site." +- find . -type f -name Makefile.am -print | +- sed 's/\.am$/.in/' | +- while read f; do touch "$f"; done +- ;; +- +- autom4te*) +- echo 1>&2 "\ +-WARNING: \`$1' is needed, but is $msg. +- You might have modified some files without having the +- proper tools for further handling them. +- You can get \`$1' as part of \`Autoconf' from any GNU +- archive site." +- +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -f "$file"; then +- touch $file +- else +- test -z "$file" || exec >$file +- echo "#! /bin/sh" +- echo "# Created by GNU Automake missing as a replacement of" +- echo "# $ $@" +- echo "exit 0" +- chmod +x $file +- exit 1 +- fi +- ;; +- +- bison*|yacc*) +- echo 1>&2 "\ +-WARNING: \`$1' $msg. You should only need it if +- you modified a \`.y' file. You may need the \`Bison' package +- in order for those modifications to take effect. You can get +- \`Bison' from any GNU archive site." +- rm -f y.tab.c y.tab.h +- if test $# -ne 1; then +- eval LASTARG="\${$#}" +- case $LASTARG in +- *.y) +- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" y.tab.c +- fi +- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" y.tab.h +- fi +- ;; +- esac +- fi +- if test ! -f y.tab.h; then +- echo >y.tab.h +- fi +- if test ! -f y.tab.c; then +- echo 'main() { return 0; }' >y.tab.c +- fi +- ;; +- +- lex*|flex*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified a \`.l' file. You may need the \`Flex' package +- in order for those modifications to take effect. You can get +- \`Flex' from any GNU archive site." +- rm -f lex.yy.c +- if test $# -ne 1; then +- eval LASTARG="\${$#}" +- case $LASTARG in +- *.l) +- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" lex.yy.c +- fi +- ;; +- esac +- fi +- if test ! -f lex.yy.c; then +- echo 'main() { return 0; }' >lex.yy.c +- fi +- ;; +- +- help2man*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified a dependency of a manual page. You may need the +- \`Help2man' package in order for those modifications to take +- effect. You can get \`Help2man' from any GNU archive site." +- +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -f "$file"; then +- touch $file +- else +- test -z "$file" || exec >$file +- echo ".ab help2man is required to generate this page" +- exit $? +- fi +- ;; +- +- makeinfo*) +- echo 1>&2 "\ +-WARNING: \`$1' is $msg. You should only need it if +- you modified a \`.texi' or \`.texinfo' file, or any other file +- indirectly affecting the aspect of the manual. The spurious +- call might also be the consequence of using a buggy \`make' (AIX, +- DU, IRIX). You might want to install the \`Texinfo' package or +- the \`GNU make' package. Grab either from any GNU archive site." +- # The file to touch is that specified with -o ... +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -z "$file"; then +- # ... or it is the one specified with @setfilename ... +- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n ' +- /^@setfilename/{ +- s/.* \([^ ]*\) *$/\1/ +- p +- q +- }' $infile` +- # ... or it is derived from the source name (dir/f.texi becomes f.info) +- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info +- fi +- # If the file does not exist, the user really needs makeinfo; +- # let's fail without touching anything. +- test -f $file || exit 1 +- touch $file +- ;; +- +- tar*) +- shift +- +- # We have already tried tar in the generic part. +- # Look for gnutar/gtar before invocation to avoid ugly error +- # messages. +- if (gnutar --version > /dev/null 2>&1); then +- gnutar "$@" && exit 0 +- fi +- if (gtar --version > /dev/null 2>&1); then +- gtar "$@" && exit 0 +- fi +- firstarg="$1" +- if shift; then +- case $firstarg in +- *o*) +- firstarg=`echo "$firstarg" | sed s/o//` +- tar "$firstarg" "$@" && exit 0 +- ;; +- esac +- case $firstarg in +- *h*) +- firstarg=`echo "$firstarg" | sed s/h//` +- tar "$firstarg" "$@" && exit 0 +- ;; +- esac +- fi +- +- echo 1>&2 "\ +-WARNING: I can't seem to be able to run \`tar' with the given arguments. +- You may want to install GNU tar or Free paxutils, or check the +- command line arguments." +- exit 1 +- ;; +- +- *) +- echo 1>&2 "\ +-WARNING: \`$1' is needed, and is $msg. +- You might have modified some files without having the +- proper tools for further handling them. Check the \`README' file, +- it often tells you about the needed prerequisites for installing +- this package. You may also peek at any GNU archive site, in case +- some other package would contain this missing \`$1' program." +- exit 1 +- ;; +-esac +- +-exit 0 ++# Propagate the correct exit status (expected to be 127 for a program ++# not found, 63 for a program that failed due to version mismatch). ++exit $st + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) +diff -r ee879c0ffa11 Modules/_ctypes/libffi/msvcc.sh +--- a/Modules/_ctypes/libffi/msvcc.sh ++++ b/Modules/_ctypes/libffi/msvcc.sh +@@ -42,6 +42,7 @@ + # format and translated into something sensible for cl or ml. + # + ++args_orig=$@ + args="-nologo -W3" + md=-MD + cl="cl" +@@ -72,14 +73,35 @@ + shift 1 + ;; + -O*) +- # If we're optimizing, make sure we explicitly turn on some optimizations +- # that are implicitly disabled by debug symbols (-Zi). +- args="$args $1 -OPT:REF -OPT:ICF -INCREMENTAL:NO" ++ # Runtime error checks (enabled by setting -RTC1 in the -DFFI_DEBUG ++ # case below) are not compatible with optimization flags and will ++ # cause the build to fail. Therefore, drop the optimization flag if ++ # -DFFI_DEBUG is also set. ++ case $args_orig in ++ *-DFFI_DEBUG*) ++ args="$args" ++ ;; ++ *) ++ # The ax_cc_maxopt.m4 macro from the upstream autoconf-archive ++ # project doesn't support MSVC and therefore ends up trying to ++ # use -O3. Use the equivalent "max optimization" flag for MSVC ++ # instead of erroring out. ++ case $1 in ++ -O3) ++ args="$args -O2" ++ ;; ++ *) ++ args="$args $1" ++ ;; ++ esac ++ opt="true" ++ ;; ++ esac + shift 1 + ;; + -g) + # Enable debug symbol generation. +- args="$args -Zi -DEBUG" ++ args="$args -Zi" + shift 1 + ;; + -DFFI_DEBUG) +@@ -126,6 +148,10 @@ + # to do here. + shift 1 + ;; ++ -pedantic) ++ # libffi tests -pedantic with -Wall, so drop it also. ++ shift 1 ++ ;; + -Werror) + args="$args -WX" + shift 1 +@@ -170,6 +196,13 @@ + esac + done + ++# If -Zi is specified, certain optimizations are implicitly disabled ++# by MSVC. Add back those optimizations if this is an optimized build. ++# NOTE: These arguments must come after all others. ++if [ -n "$opt" ]; then ++ args="$args -link -OPT:REF -OPT:ICF -INCREMENTAL:NO" ++fi ++ + if [ -n "$assembly" ]; then + if [ -z "$outdir" ]; then + outdir="." +@@ -189,7 +222,10 @@ + else + args="$md $args" + echo "$cl $args" +- eval "\"$cl\" $args" ++ # Return an error code of 1 if an invalid command line parameter is passed ++ # instead of just ignoring it. ++ eval "(\"$cl\" $args 2>&1 1>&3 | \ ++ awk '{print \$0} /D9002/ {error=1} END{exit error}' >&2) 3>&1" + result=$? + fi + +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/aarch64/ffi.c +--- a/Modules/_ctypes/libffi/src/aarch64/ffi.c ++++ b/Modules/_ctypes/libffi/src/aarch64/ffi.c +@@ -27,7 +27,11 @@ + #include + + /* Stack alignment requirement in bytes */ ++#if defined (__APPLE__) ++#define AARCH64_STACK_ALIGN 1 ++#else + #define AARCH64_STACK_ALIGN 16 ++#endif + + #define N_X_ARG_REG 8 + #define N_V_ARG_REG 8 +@@ -49,6 +53,23 @@ + } v [AARCH64_N_VREG]; + }; + ++#if defined (__clang__) && defined (__APPLE__) ++extern void ++sys_icache_invalidate (void *start, size_t len); ++#endif ++ ++static inline void ++ffi_clear_cache (void *start, void *end) ++{ ++#if defined (__clang__) && defined (__APPLE__) ++ sys_icache_invalidate (start, (char *)end - (char *)start); ++#elif defined (__GNUC__) ++ __builtin___clear_cache (start, end); ++#else ++#error "Missing builtin to flush instruction cache" ++#endif ++} ++ + static void * + get_x_addr (struct call_context *context, unsigned n) + { +@@ -94,8 +115,10 @@ + return get_s_addr (context, n); + case FFI_TYPE_DOUBLE: + return get_d_addr (context, n); ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: + return get_v_addr (context, n); ++#endif + case FFI_TYPE_UINT8: + case FFI_TYPE_SINT8: + case FFI_TYPE_UINT16: +@@ -107,6 +130,8 @@ + case FFI_TYPE_UINT64: + case FFI_TYPE_SINT64: + return get_x_addr (context, n); ++ case FFI_TYPE_VOID: ++ return NULL; + default: + FFI_ASSERT (0); + return NULL; +@@ -123,15 +148,26 @@ + case FFI_TYPE_FLOAT: + case FFI_TYPE_DOUBLE: + return sizeof (UINT64); ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: + return sizeof (long double); ++#endif + case FFI_TYPE_UINT8: + case FFI_TYPE_SINT8: ++#if defined (__APPLE__) ++ return sizeof (UINT8); ++#endif + case FFI_TYPE_UINT16: + case FFI_TYPE_SINT16: ++#if defined (__APPLE__) ++ return sizeof (UINT16); ++#endif + case FFI_TYPE_UINT32: + case FFI_TYPE_INT: + case FFI_TYPE_SINT32: ++#if defined (__APPLE__) ++ return sizeof (UINT32); ++#endif + case FFI_TYPE_POINTER: + case FFI_TYPE_UINT64: + case FFI_TYPE_SINT64: +@@ -154,8 +190,10 @@ + return sizeof (UINT32); + case FFI_TYPE_DOUBLE: + return sizeof (UINT64); ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: + return sizeof (long double); ++#endif + case FFI_TYPE_UINT8: + return sizeof (UINT8); + case FFI_TYPE_SINT8: +@@ -186,7 +224,7 @@ + extended_cif *), + struct call_context *context, + extended_cif *, +- unsigned, ++ size_t, + void (*fn)(void)); + + extern void +@@ -305,7 +343,9 @@ + case FFI_TYPE_VOID: + case FFI_TYPE_FLOAT: + case FFI_TYPE_DOUBLE: ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: ++#endif + case FFI_TYPE_UINT8: + case FFI_TYPE_UINT16: + case FFI_TYPE_UINT32: +@@ -367,16 +407,24 @@ + { + unsigned ngrn; /* Next general-purpose register number. */ + unsigned nsrn; /* Next vector register number. */ +- unsigned nsaa; /* Next stack offset. */ ++ size_t nsaa; /* Next stack offset. */ ++ ++#if defined (__APPLE__) ++ unsigned allocating_variadic; ++#endif + }; + + /* Initialize a procedure call argument marshalling state. */ + static void +-arg_init (struct arg_state *state, unsigned call_frame_size) ++arg_init (struct arg_state *state, size_t call_frame_size) + { + state->ngrn = 0; + state->nsrn = 0; + state->nsaa = 0; ++ ++#if defined (__APPLE__) ++ state->allocating_variadic = 0; ++#endif + } + + /* Return the number of available consecutive core argument +@@ -400,35 +448,35 @@ + static void * + allocate_to_x (struct call_context *context, struct arg_state *state) + { +- FFI_ASSERT (state->ngrn < N_X_ARG_REG) ++ FFI_ASSERT (state->ngrn < N_X_ARG_REG); + return get_x_addr (context, (state->ngrn)++); + } + + static void * + allocate_to_s (struct call_context *context, struct arg_state *state) + { +- FFI_ASSERT (state->nsrn < N_V_ARG_REG) ++ FFI_ASSERT (state->nsrn < N_V_ARG_REG); + return get_s_addr (context, (state->nsrn)++); + } + + static void * + allocate_to_d (struct call_context *context, struct arg_state *state) + { +- FFI_ASSERT (state->nsrn < N_V_ARG_REG) ++ FFI_ASSERT (state->nsrn < N_V_ARG_REG); + return get_d_addr (context, (state->nsrn)++); + } + + static void * + allocate_to_v (struct call_context *context, struct arg_state *state) + { +- FFI_ASSERT (state->nsrn < N_V_ARG_REG) ++ FFI_ASSERT (state->nsrn < N_V_ARG_REG); + return get_v_addr (context, (state->nsrn)++); + } + + /* Allocate an aligned slot on the stack and return a pointer to it. */ + static void * +-allocate_to_stack (struct arg_state *state, void *stack, unsigned alignment, +- unsigned size) ++allocate_to_stack (struct arg_state *state, void *stack, size_t alignment, ++ size_t size) + { + void *allocation; + +@@ -436,7 +484,12 @@ + alignment of the argument's type. */ + state->nsaa = ALIGN (state->nsaa, alignment); + state->nsaa = ALIGN (state->nsaa, alignment); ++#if defined (__APPLE__) ++ if (state->allocating_variadic) ++ state->nsaa = ALIGN (state->nsaa, 8); ++#else + state->nsaa = ALIGN (state->nsaa, 8); ++#endif + + allocation = stack + state->nsaa; + +@@ -447,7 +500,7 @@ + static void + copy_basic_type (void *dest, void *source, unsigned short type) + { +- /* This is neccessary to ensure that basic types are copied ++ /* This is necessary to ensure that basic types are copied + sign extended to 64-bits as libffi expects. */ + switch (type) + { +@@ -457,9 +510,11 @@ + case FFI_TYPE_DOUBLE: + *(double *) dest = *(double *) source; + break; ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: + *(long double *) dest = *(long double *) source; + break; ++#endif + case FFI_TYPE_UINT8: + *(ffi_arg *) dest = *(UINT8 *) source; + break; +@@ -486,6 +541,8 @@ + case FFI_TYPE_SINT64: + *(ffi_sarg *) dest = *(SINT64 *) source; + break; ++ case FFI_TYPE_VOID: ++ break; + + default: + FFI_ASSERT (0); +@@ -514,7 +571,6 @@ + { + int i; + unsigned short type = get_homogeneous_type (ty); +- unsigned elems = element_count (ty); + for (i = 0; i < elems; i++) + { + void *reg = allocate_to_v (context, state); +@@ -548,11 +604,13 @@ + return allocate_to_d (context, state); + state->nsrn = N_V_ARG_REG; + break; ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: + if (state->nsrn < N_V_ARG_REG) + return allocate_to_v (context, state); + state->nsrn = N_V_ARG_REG; + break; ++#endif + case FFI_TYPE_UINT8: + case FFI_TYPE_SINT8: + case FFI_TYPE_UINT16: +@@ -615,7 +673,9 @@ + appropriate register, or if none are available, to the stack. */ + case FFI_TYPE_FLOAT: + case FFI_TYPE_DOUBLE: ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: ++#endif + case FFI_TYPE_UINT8: + case FFI_TYPE_SINT8: + case FFI_TYPE_UINT16: +@@ -676,6 +736,16 @@ + FFI_ASSERT (0); + break; + } ++ ++#if defined (__APPLE__) ++ if (i + 1 == ecif->cif->aarch64_nfixedargs) ++ { ++ state.ngrn = N_X_ARG_REG; ++ state.nsrn = N_V_ARG_REG; ++ ++ state.allocating_variadic = 1; ++ } ++#endif + } + + return ecif->cif->aarch64_flags; +@@ -712,6 +782,20 @@ + return FFI_OK; + } + ++#if defined (__APPLE__) ++ ++/* Perform Apple-specific cif processing for variadic calls */ ++ffi_status ffi_prep_cif_machdep_var(ffi_cif *cif, ++ unsigned int nfixedargs, ++ unsigned int ntotalargs) ++{ ++ cif->aarch64_nfixedargs = nfixedargs; ++ ++ return ffi_prep_cif_machdep(cif); ++} ++ ++#endif ++ + /* Call a function with the provided arguments and capture the return + value. */ + void +@@ -728,7 +812,7 @@ + case FFI_SYSV: + { + struct call_context context; +- unsigned stack_bytes; ++ size_t stack_bytes; + + /* Figure out the total amount of stack space we need, the + above call frame space needs to be 16 bytes aligned to +@@ -745,7 +829,9 @@ + case FFI_TYPE_VOID: + case FFI_TYPE_FLOAT: + case FFI_TYPE_DOUBLE: ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: ++#endif + case FFI_TYPE_UINT8: + case FFI_TYPE_SINT8: + case FFI_TYPE_UINT16: +@@ -778,7 +864,7 @@ + } + else if ((cif->rtype->size + 7) / 8 < N_X_ARG_REG) + { +- unsigned size = ALIGN (cif->rtype->size, sizeof (UINT64)); ++ size_t size = ALIGN (cif->rtype->size, sizeof (UINT64)); + memcpy (rvalue, get_x_addr (&context, 0), size); + } + else +@@ -824,7 +910,7 @@ + memcpy (__tramp + 12, &__fun, sizeof (__fun)); \ + memcpy (__tramp + 20, &__ctx, sizeof (__ctx)); \ + memcpy (__tramp + 28, &__flags, sizeof (__flags)); \ +- __clear_cache(__tramp, __tramp + FFI_TRAMPOLINE_SIZE); \ ++ ffi_clear_cache(__tramp, __tramp + FFI_TRAMPOLINE_SIZE); \ + }) + + ffi_status +@@ -857,13 +943,13 @@ + the stack at the point ffi_closure_SYSV() was invoked. + + On the return path the assembler wrapper will reload call context +- regsiters. ++ registers. + + ffi_closure_SYSV_inner() marshalls the call context into ffi value +- desriptors, invokes the wrapped function, then marshalls the return ++ descriptors, invokes the wrapped function, then marshalls the return + value back into the call context. */ + +-void ++void FFI_HIDDEN + ffi_closure_SYSV_inner (ffi_closure *closure, struct call_context *context, + void *stack) + { +@@ -897,10 +983,12 @@ + case FFI_TYPE_SINT64: + case FFI_TYPE_FLOAT: + case FFI_TYPE_DOUBLE: ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: + avalue[i] = allocate_to_register_or_stack (context, stack, + &state, ty->type); + break; ++#endif + + case FFI_TYPE_STRUCT: + if (is_hfa (ty)) +@@ -924,7 +1012,7 @@ + therefore the structure is not represented as + a contiguous sequence of bytes in our saved + register context. We need to fake up a copy +- of the structure layed out in memory ++ of the structure laid out in memory + correctly. The fake can be tossed once the + closure function has returned hence alloca() + is sufficient. */ +@@ -945,7 +1033,7 @@ + therefore the structure is not represented as + a contiguous sequence of bytes in our saved + register context. We need to fake up a copy +- of the structure layed out in memory ++ of the structure laid out in memory + correctly. The fake can be tossed once the + closure function has returned hence alloca() + is sufficient. */ +@@ -958,11 +1046,13 @@ + break; + } + ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: + memcpy (&avalue[i], + allocate_to_v (context, &state), + sizeof (*avalue)); + break; ++#endif + + default: + FFI_ASSERT (0); +@@ -1033,7 +1123,9 @@ + case FFI_TYPE_SINT64: + case FFI_TYPE_FLOAT: + case FFI_TYPE_DOUBLE: ++#if FFI_TYPE_DOUBLE != FFI_TYPE_LONGDOUBLE + case FFI_TYPE_LONGDOUBLE: ++#endif + { + void *addr = get_basic_type_addr (cif->rtype->type, context, 0); + copy_basic_type (addr, rvalue, cif->rtype->type); +@@ -1042,19 +1134,19 @@ + case FFI_TYPE_STRUCT: + if (is_hfa (cif->rtype)) + { +- int i; ++ int j; + unsigned short type = get_homogeneous_type (cif->rtype); + unsigned elems = element_count (cif->rtype); +- for (i = 0; i < elems; i++) ++ for (j = 0; j < elems; j++) + { +- void *reg = get_basic_type_addr (type, context, i); ++ void *reg = get_basic_type_addr (type, context, j); + copy_basic_type (reg, rvalue, type); + rvalue += get_basic_type_size (type); + } + } + else if ((cif->rtype->size + 7) / 8 < N_X_ARG_REG) + { +- unsigned size = ALIGN (cif->rtype->size, sizeof (UINT64)) ; ++ size_t size = ALIGN (cif->rtype->size, sizeof (UINT64)) ; + memcpy (get_x_addr (context, 0), rvalue, size); + } + else +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/aarch64/ffitarget.h +--- a/Modules/_ctypes/libffi/src/aarch64/ffitarget.h ++++ b/Modules/_ctypes/libffi/src/aarch64/ffitarget.h +@@ -47,8 +47,12 @@ + + /* ---- Internal ---- */ + +- ++#if defined (__APPLE__) ++#define FFI_TARGET_SPECIFIC_VARIADIC ++#define FFI_EXTRA_CIF_FIELDS unsigned aarch64_flags; unsigned aarch64_nfixedargs ++#else + #define FFI_EXTRA_CIF_FIELDS unsigned aarch64_flags ++#endif + + #define AARCH64_FFI_WITH_V_BIT 0 + +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/aarch64/sysv.S +--- a/Modules/_ctypes/libffi/src/aarch64/sysv.S ++++ b/Modules/_ctypes/libffi/src/aarch64/sysv.S +@@ -23,14 +23,33 @@ + #include + #include + ++#ifdef HAVE_MACHINE_ASM_H ++#include ++#else ++#ifdef __USER_LABEL_PREFIX__ ++#define CONCAT1(a, b) CONCAT2(a, b) ++#define CONCAT2(a, b) a ## b ++ ++/* Use the right prefix for global labels. */ ++#define CNAME(x) CONCAT1 (__USER_LABEL_PREFIX__, x) ++#else ++#define CNAME(x) x ++#endif ++#endif ++ + #define cfi_adjust_cfa_offset(off) .cfi_adjust_cfa_offset off + #define cfi_rel_offset(reg, off) .cfi_rel_offset reg, off + #define cfi_restore(reg) .cfi_restore reg + #define cfi_def_cfa_register(reg) .cfi_def_cfa_register reg + + .text +- .globl ffi_call_SYSV +- .type ffi_call_SYSV, #function ++ .globl CNAME(ffi_call_SYSV) ++#ifdef __ELF__ ++ .type CNAME(ffi_call_SYSV), #function ++#endif ++#ifdef __APPLE__ ++ .align 2 ++#endif + + /* ffi_call_SYSV() + +@@ -53,7 +72,7 @@ + extended_cif *), + struct call_context *context, + extended_cif *, +- unsigned required_stack_size, ++ size_t required_stack_size, + void (*fn)(void)); + + Therefore on entry we have: +@@ -82,7 +101,7 @@ + #define ffi_call_SYSV_FS (8 * 4) + + .cfi_startproc +-ffi_call_SYSV: ++CNAME(ffi_call_SYSV): + stp x29, x30, [sp, #-16]! + cfi_adjust_cfa_offset (16) + cfi_rel_offset (x29, 0) +@@ -92,11 +111,11 @@ + cfi_def_cfa_register (x29) + sub sp, sp, #ffi_call_SYSV_FS + +- stp x21, x22, [sp, 0] ++ stp x21, x22, [sp, #0] + cfi_rel_offset (x21, 0 - ffi_call_SYSV_FS) + cfi_rel_offset (x22, 8 - ffi_call_SYSV_FS) + +- stp x23, x24, [sp, 16] ++ stp x23, x24, [sp, #16] + cfi_rel_offset (x23, 16 - ffi_call_SYSV_FS) + cfi_rel_offset (x24, 24 - ffi_call_SYSV_FS) + +@@ -180,7 +199,9 @@ + ret + + .cfi_endproc +- .size ffi_call_SYSV, .-ffi_call_SYSV ++#ifdef __ELF__ ++ .size CNAME(ffi_call_SYSV), .-CNAME(ffi_call_SYSV) ++#endif + + #define ffi_closure_SYSV_FS (8 * 2 + AARCH64_CALL_CONTEXT_SIZE) + +@@ -222,22 +243,25 @@ + Voila! */ + + .text +- .globl ffi_closure_SYSV ++ .globl CNAME(ffi_closure_SYSV) ++#ifdef __APPLE__ ++ .align 2 ++#endif + .cfi_startproc +-ffi_closure_SYSV: ++CNAME(ffi_closure_SYSV): + stp x29, x30, [sp, #-16]! + cfi_adjust_cfa_offset (16) + cfi_rel_offset (x29, 0) + cfi_rel_offset (x30, 8) + + mov x29, sp ++ cfi_def_cfa_register (x29) + + sub sp, sp, #ffi_closure_SYSV_FS +- cfi_adjust_cfa_offset (ffi_closure_SYSV_FS) + + stp x21, x22, [x29, #-16] +- cfi_rel_offset (x21, 0) +- cfi_rel_offset (x22, 8) ++ cfi_rel_offset (x21, -16) ++ cfi_rel_offset (x22, -8) + + /* Load x21 with &call_context. */ + mov x21, sp +@@ -270,7 +294,7 @@ + trampoline was called. */ + add x2, x29, #16 + +- bl ffi_closure_SYSV_inner ++ bl CNAME(ffi_closure_SYSV_inner) + + /* Figure out if we should touch the vector registers. */ + ldr x0, [x22, #8] +@@ -287,7 +311,7 @@ + ldp x2, x3, [x21, #16] + ldp x4, x5, [x21, #32] + ldp x6, x7, [x21, #48] +- /* Note nothing usefull is returned in x8. */ ++ /* Note nothing useful is returned in x8. */ + + /* We are done, unwind our frame. */ + ldp x21, x22, [x29, #-16] +@@ -295,7 +319,7 @@ + cfi_restore (x22) + + mov sp, x29 +- cfi_adjust_cfa_offset (-ffi_closure_SYSV_FS) ++ cfi_def_cfa_register (sp) + + ldp x29, x30, [sp], #16 + cfi_adjust_cfa_offset (-16) +@@ -304,4 +328,6 @@ + + ret + .cfi_endproc +- .size ffi_closure_SYSV, .-ffi_closure_SYSV ++#ifdef __ELF__ ++ .size CNAME(ffi_closure_SYSV), .-CNAME(ffi_closure_SYSV) ++#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/arc/arcompact.S +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/arc/arcompact.S +@@ -0,0 +1,135 @@ ++/* ----------------------------------------------------------------------- ++ arcompact.S - Copyright (c) 2013 Synposys, Inc. (www.synopsys.com) ++ ++ ARCompact Foreign Function Interface ++ ++ Permission is hereby granted, free of charge, to any person obtaining ++ a copy of this software and associated documentation files (the ++ ``Software''), to deal in the Software without restriction, including ++ without limitation the rights to use, copy, modify, merge, publish, ++ distribute, sublicense, and/or sell copies of the Software, and to ++ permit persons to whom the Software is furnished to do so, subject to ++ the following conditions: ++ ++ The above copyright notice and this permission notice shall be included ++ in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ IN NO EVENT SHALL RENESAS TECHNOLOGY BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ OTHER DEALINGS IN THE SOFTWARE. ++ ----------------------------------------------------------------------- */ ++ ++#define LIBFFI_ASM ++#include ++#include ++#ifdef HAVE_MACHINE_ASM_H ++#include ++#else ++#define CNAME(x) x ++#define ENTRY(x) .globl CNAME(x)` .type CNAME(x),%function` CNAME(x): ++#endif ++ ++.text ++ ++ /* R0: ffi_prep_args */ ++ /* R1: &ecif */ ++ /* R2: cif->bytes */ ++ /* R3: fig->flags */ ++ /* R4: ecif.rvalue */ ++ /* R5: fn */ ++ENTRY(ffi_call_ARCompact) ++ /* Save registers. */ ++ st.a fp, [sp, -4] /* fp + 20, fp */ ++ push_s blink /* fp + 16, blink */ ++ st.a r4, [sp, -4] /* fp + 12, ecif.rvalue */ ++ push_s r3 /* fp + 8, fig->flags */ ++ st.a r5, [sp, -4] /* fp + 4, fn */ ++ push_s r2 /* fp + 0, cif->bytes */ ++ mov fp, sp ++ ++ /* Make room for all of the new args. */ ++ sub sp, sp, r2 ++ ++ /* Place all of the ffi_prep_args in position. */ ++ /* ffi_prep_args(char *stack, extended_cif *ecif) */ ++ /* R1 already set. */ ++ ++ /* And call. */ ++ jl_s.d [r0] ++ mov_s r0, sp ++ ++ ld.ab r12, [fp, 4] /* cif->bytes */ ++ ld.ab r11, [fp, 4] /* fn */ ++ ++ /* Move first 8 parameters in registers... */ ++ ld_s r0, [sp] ++ ld_s r1, [sp, 4] ++ ld_s r2, [sp, 8] ++ ld_s r3, [sp, 12] ++ ld r4, [sp, 16] ++ ld r5, [sp, 20] ++ ld r6, [sp, 24] ++ ld r7, [sp, 28] ++ ++ /* ...and adjust the stack. */ ++ min r12, r12, 32 ++ ++ /* Call the function. */ ++ jl.d [r11] ++ add sp, sp, r12 ++ ++ mov sp, fp ++ pop_s r3 /* fig->flags, return type */ ++ pop_s r2 /* ecif.rvalue, pointer for return value */ ++ ++ /* If the return value pointer is NULL, assume no return value. */ ++ breq.d r2, 0, epilogue ++ pop_s blink ++ ++ /* Return INT. */ ++ brne r3, FFI_TYPE_INT, return_double ++ b.d epilogue ++ st_s r0, [r2] ++ ++return_double: ++ brne r3, FFI_TYPE_DOUBLE, epilogue ++ st_s r0, [r2] ++ st_s r1, [r2,4] ++ ++epilogue: ++ j_s.d [blink] ++ ld.ab fp, [sp, 4] ++ ++ENTRY(ffi_closure_ARCompact) ++ st.a r0, [sp, -32] ++ st_s r1, [sp, 4] ++ st_s r2, [sp, 8] ++ st_s r3, [sp, 12] ++ st r4, [sp, 16] ++ st r5, [sp, 20] ++ st r6, [sp, 24] ++ st r7, [sp, 28] ++ ++ /* pointer to arguments */ ++ mov_s r2, sp ++ ++ /* return value goes here */ ++ sub sp, sp, 8 ++ mov_s r1, sp ++ ++ push_s blink ++ ++ bl.d ffi_closure_inner_ARCompact ++ mov_s r0, r8 /* codeloc, set by trampoline */ ++ ++ pop_s blink ++ ++ /* set return value to r1:r0 */ ++ pop_s r0 ++ pop_s r1 ++ j_s.d [blink] ++ add_s sp, sp, 32 +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/arc/ffi.c +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/arc/ffi.c +@@ -0,0 +1,268 @@ ++/* ----------------------------------------------------------------------- ++ ffi.c - Copyright (c) 2013 Synopsys, Inc. (www.synopsys.com) ++ ++ ARC Foreign Function Interface ++ ++ Permission is hereby granted, free of charge, to any person obtaining ++ a copy of this software and associated documentation files (the ++ ``Software''), to deal in the Software without restriction, including ++ without limitation the rights to use, copy, modify, merge, publish, ++ distribute, sublicense, and/or sell copies of the Software, and to ++ permit persons to whom the Software is furnished to do so, subject to ++ the following conditions: ++ ++ The above copyright notice and this permission notice shall be included ++ in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ IN NO EVENT SHALL RENESAS TECHNOLOGY BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ OTHER DEALINGS IN THE SOFTWARE. ++ ----------------------------------------------------------------------- */ ++ ++#include ++#include ++ ++#include ++#include ++ ++#include ++ ++/* for little endian ARC, the code is in fact stored as mixed endian for ++ performance reasons */ ++#if __BIG_ENDIAN__ ++#define CODE_ENDIAN(x) (x) ++#else ++#define CODE_ENDIAN(x) ( (((uint32_t) (x)) << 16) | (((uint32_t) (x)) >> 16)) ++#endif ++ ++/* ffi_prep_args is called by the assembly routine once stack ++ space has been allocated for the function's arguments. */ ++ ++void ++ffi_prep_args (char *stack, extended_cif * ecif) ++{ ++ unsigned int i; ++ int tmp; ++ void **p_argv; ++ char *argp; ++ ffi_type **p_arg; ++ ++ tmp = 0; ++ argp = stack; ++ ++ if (ecif->cif->rtype->type == FFI_TYPE_STRUCT) ++ { ++ *(void **) argp = ecif->rvalue; ++ argp += 4; ++ } ++ ++ p_argv = ecif->avalue; ++ ++ for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; ++ (i != 0); i--, p_arg++) ++ { ++ size_t z; ++ int alignment; ++ ++ /* align alignment to 4 */ ++ alignment = (((*p_arg)->alignment - 1) | 3) + 1; ++ ++ /* Align if necessary. */ ++ if ((alignment - 1) & (unsigned) argp) ++ argp = (char *) ALIGN (argp, alignment); ++ ++ z = (*p_arg)->size; ++ if (z < sizeof (int)) ++ { ++ z = sizeof (int); ++ ++ switch ((*p_arg)->type) ++ { ++ case FFI_TYPE_SINT8: ++ *(signed int *) argp = (signed int) *(SINT8 *) (*p_argv); ++ break; ++ ++ case FFI_TYPE_UINT8: ++ *(unsigned int *) argp = (unsigned int) *(UINT8 *) (*p_argv); ++ break; ++ ++ case FFI_TYPE_SINT16: ++ *(signed int *) argp = (signed int) *(SINT16 *) (*p_argv); ++ break; ++ ++ case FFI_TYPE_UINT16: ++ *(unsigned int *) argp = (unsigned int) *(UINT16 *) (*p_argv); ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ memcpy (argp, *p_argv, (*p_arg)->size); ++ break; ++ ++ default: ++ FFI_ASSERT (0); ++ } ++ } ++ else if (z == sizeof (int)) ++ { ++ *(unsigned int *) argp = (unsigned int) *(UINT32 *) (*p_argv); ++ } ++ else ++ { ++ if ((*p_arg)->type == FFI_TYPE_STRUCT) ++ { ++ memcpy (argp, *p_argv, z); ++ } ++ else ++ { ++ /* Double or long long 64bit. */ ++ memcpy (argp, *p_argv, z); ++ } ++ } ++ p_argv++; ++ argp += z; ++ } ++ ++ return; ++} ++ ++/* Perform machine dependent cif processing. */ ++ffi_status ++ffi_prep_cif_machdep (ffi_cif * cif) ++{ ++ /* Set the return type flag. */ ++ switch (cif->rtype->type) ++ { ++ case FFI_TYPE_VOID: ++ cif->flags = (unsigned) cif->rtype->type; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ cif->flags = (unsigned) cif->rtype->type; ++ break; ++ ++ case FFI_TYPE_SINT64: ++ case FFI_TYPE_UINT64: ++ case FFI_TYPE_DOUBLE: ++ cif->flags = FFI_TYPE_DOUBLE; ++ break; ++ ++ case FFI_TYPE_FLOAT: ++ default: ++ cif->flags = FFI_TYPE_INT; ++ break; ++ } ++ ++ return FFI_OK; ++} ++ ++extern void ffi_call_ARCompact (void (*)(char *, extended_cif *), ++ extended_cif *, unsigned, unsigned, ++ unsigned *, void (*fn) (void)); ++ ++void ++ffi_call (ffi_cif * cif, void (*fn) (void), void *rvalue, void **avalue) ++{ ++ extended_cif ecif; ++ ++ ecif.cif = cif; ++ ecif.avalue = avalue; ++ ++ /* If the return value is a struct and we don't have ++ a return value address then we need to make one. */ ++ if ((rvalue == NULL) && (cif->rtype->type == FFI_TYPE_STRUCT)) ++ { ++ ecif.rvalue = alloca (cif->rtype->size); ++ } ++ else ++ ecif.rvalue = rvalue; ++ ++ switch (cif->abi) ++ { ++ case FFI_ARCOMPACT: ++ ffi_call_ARCompact (ffi_prep_args, &ecif, cif->bytes, ++ cif->flags, ecif.rvalue, fn); ++ break; ++ ++ default: ++ FFI_ASSERT (0); ++ break; ++ } ++} ++ ++int ++ffi_closure_inner_ARCompact (ffi_closure * closure, void *rvalue, ++ ffi_arg * args) ++{ ++ void **arg_area, **p_argv; ++ ffi_cif *cif = closure->cif; ++ char *argp = (char *) args; ++ ffi_type **p_argt; ++ int i; ++ ++ arg_area = (void **) alloca (cif->nargs * sizeof (void *)); ++ ++ /* handle hidden argument */ ++ if (cif->flags == FFI_TYPE_STRUCT) ++ { ++ rvalue = *(void **) argp; ++ argp += 4; ++ } ++ ++ p_argv = arg_area; ++ ++ for (i = 0, p_argt = cif->arg_types; i < cif->nargs; ++ i++, p_argt++, p_argv++) ++ { ++ size_t z; ++ int alignment; ++ ++ /* align alignment to 4 */ ++ alignment = (((*p_argt)->alignment - 1) | 3) + 1; ++ ++ /* Align if necessary. */ ++ if ((alignment - 1) & (unsigned) argp) ++ argp = (char *) ALIGN (argp, alignment); ++ ++ z = (*p_argt)->size; ++ *p_argv = (void *) argp; ++ argp += z; ++ } ++ ++ (closure->fun) (cif, rvalue, arg_area, closure->user_data); ++ ++ return cif->flags; ++} ++ ++extern void ffi_closure_ARCompact (void); ++ ++ffi_status ++ffi_prep_closure_loc (ffi_closure * closure, ffi_cif * cif, ++ void (*fun) (ffi_cif *, void *, void **, void *), ++ void *user_data, void *codeloc) ++{ ++ uint32_t *tramp = (uint32_t *) & (closure->tramp[0]); ++ ++ switch (cif->abi) ++ { ++ case FFI_ARCOMPACT: ++ FFI_ASSERT (tramp == codeloc); ++ tramp[0] = CODE_ENDIAN (0x200a1fc0); /* mov r8, pcl */ ++ tramp[1] = CODE_ENDIAN (0x20200f80); /* j [long imm] */ ++ tramp[2] = CODE_ENDIAN (ffi_closure_ARCompact); ++ break; ++ ++ default: ++ return FFI_BAD_ABI; ++ } ++ ++ closure->cif = cif; ++ closure->fun = fun; ++ closure->user_data = user_data; ++ cacheflush (codeloc, FFI_TRAMPOLINE_SIZE, BCACHE); ++ ++ return FFI_OK; ++} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/arc/ffitarget.h +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/arc/ffitarget.h +@@ -0,0 +1,53 @@ ++/* ----------------------------------------------------------------------- ++ ffitarget.h - Copyright (c) 2012 Anthony Green ++ Copyright (c) 2013 Synopsys, Inc. (www.synopsys.com) ++ Target configuration macros for ARC. ++ ++ Permission is hereby granted, free of charge, to any person obtaining ++ a copy of this software and associated documentation files (the ++ ``Software''), to deal in the Software without restriction, including ++ without limitation the rights to use, copy, modify, merge, publish, ++ distribute, sublicense, and/or sell copies of the Software, and to ++ permit persons to whom the Software is furnished to do so, subject to ++ the following conditions: ++ ++ The above copyright notice and this permission notice shall be included ++ in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ IN NO EVENT SHALL RENESAS TECHNOLOGY BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ OTHER DEALINGS IN THE SOFTWARE. ++ ++ ----------------------------------------------------------------------- */ ++ ++#ifndef LIBFFI_TARGET_H ++#define LIBFFI_TARGET_H ++ ++#ifndef LIBFFI_H ++#error "Please do not include ffitarget.h directly into your source. Use ffi.h instead." ++#endif ++ ++/* ---- Generic type definitions ----------------------------------------- */ ++ ++#ifndef LIBFFI_ASM ++typedef unsigned long ffi_arg; ++typedef signed long ffi_sarg; ++ ++typedef enum ffi_abi ++{ ++ FFI_FIRST_ABI = 0, ++ FFI_ARCOMPACT, ++ FFI_LAST_ABI, ++ FFI_DEFAULT_ABI = FFI_ARCOMPACT ++} ffi_abi; ++#endif ++ ++#define FFI_CLOSURES 1 ++#define FFI_TRAMPOLINE_SIZE 12 ++#define FFI_NATIVE_RAW_API 0 ++ ++#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/arm/ffi.c +--- a/Modules/_ctypes/libffi/src/arm/ffi.c ++++ b/Modules/_ctypes/libffi/src/arm/ffi.c +@@ -4,8 +4,8 @@ + Copyright (c) 2011 Anthony Green + Copyright (c) 2011 Free Software Foundation + Copyright (c) 1998, 2008, 2011 Red Hat, Inc. +- +- ARM Foreign Function Interface ++ ++ ARM Foreign Function Interface + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the +@@ -37,6 +37,87 @@ + static int vfp_type_p (ffi_type *); + static void layout_vfp_args (ffi_cif *); + ++int ffi_prep_args_SYSV(char *stack, extended_cif *ecif, float *vfp_space); ++int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space); ++ ++static char* ffi_align(ffi_type **p_arg, char *argp) ++{ ++ /* Align if necessary */ ++ register size_t alignment = (*p_arg)->alignment; ++ if (alignment < 4) ++ { ++ alignment = 4; ++ } ++#ifdef _WIN32_WCE ++ if (alignment > 4) ++ { ++ alignment = 4; ++ } ++#endif ++ if ((alignment - 1) & (unsigned) argp) ++ { ++ argp = (char *) ALIGN(argp, alignment); ++ } ++ ++ if ((*p_arg)->type == FFI_TYPE_STRUCT) ++ { ++ argp = (char *) ALIGN(argp, 4); ++ } ++ return argp; ++} ++ ++static size_t ffi_put_arg(ffi_type **arg_type, void **arg, char *stack) ++{ ++ register char* argp = stack; ++ register ffi_type **p_arg = arg_type; ++ register void **p_argv = arg; ++ register size_t z = (*p_arg)->size; ++ if (z < sizeof(int)) ++ { ++ z = sizeof(int); ++ switch ((*p_arg)->type) ++ { ++ case FFI_TYPE_SINT8: ++ *(signed int *) argp = (signed int)*(SINT8 *)(* p_argv); ++ break; ++ ++ case FFI_TYPE_UINT8: ++ *(unsigned int *) argp = (unsigned int)*(UINT8 *)(* p_argv); ++ break; ++ ++ case FFI_TYPE_SINT16: ++ *(signed int *) argp = (signed int)*(SINT16 *)(* p_argv); ++ break; ++ ++ case FFI_TYPE_UINT16: ++ *(unsigned int *) argp = (unsigned int)*(UINT16 *)(* p_argv); ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ memcpy(argp, *p_argv, (*p_arg)->size); ++ break; ++ ++ default: ++ FFI_ASSERT(0); ++ } ++ } ++ else if (z == sizeof(int)) ++ { ++ if ((*p_arg)->type == FFI_TYPE_FLOAT) ++ *(float *) argp = *(float *)(* p_argv); ++ else ++ *(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv); ++ } ++ else if (z == sizeof(double) && (*p_arg)->type == FFI_TYPE_DOUBLE) ++ { ++ *(double *) argp = *(double *)(* p_argv); ++ } ++ else ++ { ++ memcpy(argp, *p_argv, z); ++ } ++ return z; ++} + /* ffi_prep_args is called by the assembly routine once stack space + has been allocated for the function's arguments + +@@ -44,14 +125,14 @@ + value is cif->vfp_used (word bitset of VFP regs used for passing + arguments). These are only used for the VFP hard-float ABI. + */ +-int ffi_prep_args(char *stack, extended_cif *ecif, float *vfp_space) ++int ffi_prep_args_SYSV(char *stack, extended_cif *ecif, float *vfp_space) + { +- register unsigned int i, vi = 0; ++ register unsigned int i; + register void **p_argv; + register char *argp; + register ffi_type **p_arg; +- + argp = stack; ++ + + if ( ecif->cif->flags == FFI_TYPE_STRUCT ) { + *(void **) argp = ecif->rvalue; +@@ -62,81 +143,89 @@ + + for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; + (i != 0); +- i--, p_arg++) ++ i--, p_arg++, p_argv++) + { +- size_t z; +- size_t alignment; ++ argp = ffi_align(p_arg, argp); ++ argp += ffi_put_arg(p_arg, p_argv, argp); ++ } ++ ++ return 0; ++} ++ ++int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space) ++{ ++ register unsigned int i, vi = 0; ++ register void **p_argv; ++ register char *argp, *regp, *eo_regp; ++ register ffi_type **p_arg; ++ char stack_used = 0; ++ char done_with_regs = 0; ++ char is_vfp_type; ++ ++ // make sure we are using FFI_VFP ++ FFI_ASSERT(ecif->cif->abi == FFI_VFP); ++ ++ /* the first 4 words on the stack are used for values passed in core ++ * registers. */ ++ regp = stack; ++ eo_regp = argp = regp + 16; ++ ++ ++ /* if the function returns an FFI_TYPE_STRUCT in memory, that address is ++ * passed in r0 to the function */ ++ if ( ecif->cif->flags == FFI_TYPE_STRUCT ) { ++ *(void **) regp = ecif->rvalue; ++ regp += 4; ++ } ++ ++ p_argv = ecif->avalue; ++ ++ for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; ++ (i != 0); ++ i--, p_arg++, p_argv++) ++ { ++ is_vfp_type = vfp_type_p (*p_arg); + + /* Allocated in VFP registers. */ +- if (ecif->cif->abi == FFI_VFP +- && vi < ecif->cif->vfp_nargs && vfp_type_p (*p_arg)) +- { +- float* vfp_slot = vfp_space + ecif->cif->vfp_args[vi++]; +- if ((*p_arg)->type == FFI_TYPE_FLOAT) +- *((float*)vfp_slot) = *((float*)*p_argv); +- else if ((*p_arg)->type == FFI_TYPE_DOUBLE) +- *((double*)vfp_slot) = *((double*)*p_argv); +- else +- memcpy(vfp_slot, *p_argv, (*p_arg)->size); +- p_argv++; +- continue; +- } +- +- /* Align if necessary */ +- alignment = (*p_arg)->alignment; +-#ifdef _WIN32_WCE +- if (alignment > 4) +- alignment = 4; +-#endif +- if ((alignment - 1) & (unsigned) argp) { +- argp = (char *) ALIGN(argp, alignment); +- } +- +- if ((*p_arg)->type == FFI_TYPE_STRUCT) +- argp = (char *) ALIGN(argp, 4); +- +- z = (*p_arg)->size; +- if (z < sizeof(int)) +- { +- z = sizeof(int); +- switch ((*p_arg)->type) +- { +- case FFI_TYPE_SINT8: +- *(signed int *) argp = (signed int)*(SINT8 *)(* p_argv); +- break; +- +- case FFI_TYPE_UINT8: +- *(unsigned int *) argp = (unsigned int)*(UINT8 *)(* p_argv); +- break; +- +- case FFI_TYPE_SINT16: +- *(signed int *) argp = (signed int)*(SINT16 *)(* p_argv); +- break; +- +- case FFI_TYPE_UINT16: +- *(unsigned int *) argp = (unsigned int)*(UINT16 *)(* p_argv); +- break; +- +- case FFI_TYPE_STRUCT: +- memcpy(argp, *p_argv, (*p_arg)->size); +- break; +- +- default: +- FFI_ASSERT(0); +- } +- } +- else if (z == sizeof(int)) +- { +- *(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv); +- } +- else +- { +- memcpy(argp, *p_argv, z); +- } +- p_argv++; +- argp += z; ++ if(vi < ecif->cif->vfp_nargs && is_vfp_type) ++ { ++ char *vfp_slot = (char *)(vfp_space + ecif->cif->vfp_args[vi++]); ++ ffi_put_arg(p_arg, p_argv, vfp_slot); ++ continue; ++ } ++ /* Try allocating in core registers. */ ++ else if (!done_with_regs && !is_vfp_type) ++ { ++ char *tregp = ffi_align(p_arg, regp); ++ size_t size = (*p_arg)->size; ++ size = (size < 4)? 4 : size; // pad ++ /* Check if there is space left in the aligned register area to place ++ * the argument */ ++ if(tregp + size <= eo_regp) ++ { ++ regp = tregp + ffi_put_arg(p_arg, p_argv, tregp); ++ done_with_regs = (regp == argp); ++ // ensure we did not write into the stack area ++ FFI_ASSERT(regp <= argp); ++ continue; ++ } ++ /* In case there are no arguments in the stack area yet, ++ the argument is passed in the remaining core registers and on the ++ stack. */ ++ else if (!stack_used) ++ { ++ stack_used = 1; ++ done_with_regs = 1; ++ argp = tregp + ffi_put_arg(p_arg, p_argv, tregp); ++ FFI_ASSERT(eo_regp < argp); ++ continue; ++ } ++ } ++ /* Base case, arguments are passed on the stack */ ++ stack_used = 1; ++ argp = ffi_align(p_arg, argp); ++ argp += ffi_put_arg(p_arg, p_argv, argp); + } +- + /* Indicate the VFP registers used. */ + return ecif->cif->vfp_used; + } +@@ -221,13 +310,13 @@ + int vfp_struct = (cif->flags == FFI_TYPE_STRUCT_VFP_FLOAT + || cif->flags == FFI_TYPE_STRUCT_VFP_DOUBLE); + ++ unsigned int temp; ++ + ecif.cif = cif; + ecif.avalue = avalue; + +- unsigned int temp; +- + /* If the return value is a struct and we don't have a return */ +- /* value address then we need to make one */ ++ /* value address then we need to make one */ + + if ((rvalue == NULL) && + (cif->flags == FFI_TYPE_STRUCT)) +@@ -261,9 +350,17 @@ + break; + } + if (small_struct) +- memcpy (rvalue, &temp, cif->rtype->size); ++ { ++ FFI_ASSERT(rvalue != NULL); ++ memcpy (rvalue, &temp, cif->rtype->size); ++ } ++ + else if (vfp_struct) +- memcpy (rvalue, ecif.rvalue, cif->rtype->size); ++ { ++ FFI_ASSERT(rvalue != NULL); ++ memcpy (rvalue, ecif.rvalue, cif->rtype->size); ++ } ++ + } + + /** private members **/ +@@ -271,18 +368,18 @@ + static void ffi_prep_incoming_args_SYSV (char *stack, void **ret, + void** args, ffi_cif* cif, float *vfp_stack); + ++static void ffi_prep_incoming_args_VFP (char *stack, void **ret, ++ void** args, ffi_cif* cif, float *vfp_stack); ++ + void ffi_closure_SYSV (ffi_closure *); + + void ffi_closure_VFP (ffi_closure *); + + /* This function is jumped to by the trampoline */ + +-unsigned int +-ffi_closure_SYSV_inner (closure, respp, args, vfp_args) +- ffi_closure *closure; +- void **respp; +- void *args; +- void *vfp_args; ++unsigned int FFI_HIDDEN ++ffi_closure_inner (ffi_closure *closure, ++ void **respp, void *args, void *vfp_args) + { + // our various things... + ffi_cif *cif; +@@ -296,8 +393,10 @@ + * value on the stack; and if the function returns + * a structure, it will re-set RESP to point to the + * structure return address. */ +- +- ffi_prep_incoming_args_SYSV(args, respp, arg_area, cif, vfp_args); ++ if (cif->abi == FFI_VFP) ++ ffi_prep_incoming_args_VFP(args, respp, arg_area, cif, vfp_args); ++ else ++ ffi_prep_incoming_args_SYSV(args, respp, arg_area, cif, vfp_args); + + (closure->fun) (cif, *respp, arg_area, closure->user_data); + +@@ -312,7 +411,7 @@ + float *vfp_stack) + /*@=exportheader@*/ + { +- register unsigned int i, vi = 0; ++ register unsigned int i; + register void **p_argv; + register char *argp; + register ffi_type **p_arg; +@@ -329,27 +428,8 @@ + for (i = cif->nargs, p_arg = cif->arg_types; (i != 0); i--, p_arg++) + { + size_t z; +- size_t alignment; +- +- if (cif->abi == FFI_VFP +- && vi < cif->vfp_nargs && vfp_type_p (*p_arg)) +- { +- *p_argv++ = (void*)(vfp_stack + cif->vfp_args[vi++]); +- continue; +- } + +- alignment = (*p_arg)->alignment; +- if (alignment < 4) +- alignment = 4; +-#ifdef _WIN32_WCE +- else +- if (alignment > 4) +- alignment = 4; +-#endif +- /* Align if necessary */ +- if ((alignment - 1) & (unsigned) argp) { +- argp = (char *) ALIGN(argp, alignment); +- } ++ argp = ffi_align(p_arg, argp); + + z = (*p_arg)->size; + +@@ -364,6 +444,95 @@ + return; + } + ++/*@-exportheader@*/ ++static void ++ffi_prep_incoming_args_VFP(char *stack, void **rvalue, ++ void **avalue, ffi_cif *cif, ++ /* Used only under VFP hard-float ABI. */ ++ float *vfp_stack) ++/*@=exportheader@*/ ++{ ++ register unsigned int i, vi = 0; ++ register void **p_argv; ++ register char *argp, *regp, *eo_regp; ++ register ffi_type **p_arg; ++ char done_with_regs = 0; ++ char stack_used = 0; ++ char is_vfp_type; ++ ++ FFI_ASSERT(cif->abi == FFI_VFP); ++ regp = stack; ++ eo_regp = argp = regp + 16; ++ ++ if ( cif->flags == FFI_TYPE_STRUCT ) { ++ *rvalue = *(void **) regp; ++ regp += 4; ++ } ++ ++ p_argv = avalue; ++ ++ for (i = cif->nargs, p_arg = cif->arg_types; (i != 0); i--, p_arg++) ++ { ++ size_t z; ++ is_vfp_type = vfp_type_p (*p_arg); ++ ++ if(vi < cif->vfp_nargs && is_vfp_type) ++ { ++ *p_argv++ = (void*)(vfp_stack + cif->vfp_args[vi++]); ++ continue; ++ } ++ else if (!done_with_regs && !is_vfp_type) ++ { ++ char* tregp = ffi_align(p_arg, regp); ++ ++ z = (*p_arg)->size; ++ z = (z < 4)? 4 : z; // pad ++ ++ /* if the arguments either fits into the registers or uses registers ++ * and stack, while we haven't read other things from the stack */ ++ if(tregp + z <= eo_regp || !stack_used) ++ { ++ /* because we're little endian, this is what it turns into. */ ++ *p_argv = (void*) tregp; ++ ++ p_argv++; ++ regp = tregp + z; ++ // if we read past the last core register, make sure we have not read ++ // from the stack before and continue reading after regp ++ if(regp > eo_regp) ++ { ++ if(stack_used) ++ { ++ abort(); // we should never read past the end of the register ++ // are if the stack is already in use ++ } ++ argp = regp; ++ } ++ if(regp >= eo_regp) ++ { ++ done_with_regs = 1; ++ stack_used = 1; ++ } ++ continue; ++ } ++ } ++ stack_used = 1; ++ ++ argp = ffi_align(p_arg, argp); ++ ++ z = (*p_arg)->size; ++ ++ /* because we're little endian, this is what it turns into. */ ++ ++ *p_argv = (void*) argp; ++ ++ p_argv++; ++ argp += z; ++ } ++ ++ return; ++} ++ + /* How to make a trampoline. */ + + extern unsigned int ffi_arm_trampoline[3]; +@@ -381,7 +550,7 @@ + typedef struct ffi_trampoline_table_entry ffi_trampoline_table_entry; + + struct ffi_trampoline_table { +- /* contigious writable and executable pages */ ++ /* contiguous writable and executable pages */ + vm_address_t config_page; + vm_address_t trampoline_page; + +@@ -421,7 +590,7 @@ + { + ffi_trampoline_table *table = NULL; + +- /* Loop until we can allocate two contigious pages */ ++ /* Loop until we can allocate two contiguous pages */ + while (table == NULL) { + vm_address_t config_page = 0x0; + kern_return_t kt; +@@ -617,7 +786,7 @@ + #endif + else + return FFI_BAD_ABI; +- ++ + #if FFI_EXEC_TRAMPOLINE_TABLE + void **config = FFI_TRAMPOLINE_CODELOC_CONFIG(codeloc); + config[0] = closure; +@@ -700,9 +869,9 @@ + return 0; + } + +-static void place_vfp_arg (ffi_cif *cif, ffi_type *t) ++static int place_vfp_arg (ffi_cif *cif, ffi_type *t) + { +- int reg = cif->vfp_reg_free; ++ short reg = cif->vfp_reg_free; + int nregs = t->size / sizeof (float); + int align = ((t->type == FFI_TYPE_STRUCT_VFP_FLOAT + || t->type == FFI_TYPE_FLOAT) ? 1 : 2); +@@ -733,9 +902,13 @@ + reg += 1; + cif->vfp_reg_free = reg; + } +- return; ++ return 0; + next_reg: ; + } ++ // done, mark all regs as used ++ cif->vfp_reg_free = 16; ++ cif->vfp_used = 0xFFFF; ++ return 1; + } + + static void layout_vfp_args (ffi_cif *cif) +@@ -750,7 +923,9 @@ + for (i = 0; i < cif->nargs; i++) + { + ffi_type *t = cif->arg_types[i]; +- if (vfp_type_p (t)) +- place_vfp_arg (cif, t); ++ if (vfp_type_p (t) && place_vfp_arg (cif, t) == 1) ++ { ++ break; ++ } + } + } +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/arm/gentramp.sh +--- a/Modules/_ctypes/libffi/src/arm/gentramp.sh ++++ b/Modules/_ctypes/libffi/src/arm/gentramp.sh +@@ -84,7 +84,7 @@ + } + + +-# WARNING - Don't modify the trampoline code size without also updating the relevent libffi code ++# WARNING - Don't modify the trampoline code size without also updating the relevant libffi code + trampoline () { + cat << END + +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/arm/sysv.S +--- a/Modules/_ctypes/libffi/src/arm/sysv.S ++++ b/Modules/_ctypes/libffi/src/arm/sysv.S +@@ -109,42 +109,27 @@ + #define UNWIND @ + #endif + +- ++.syntax unified ++ + #if defined(__thumb__) && !defined(__THUMB_INTERWORK__) +-.macro ARM_FUNC_START name +- .text +- .align 0 +- .thumb +- .thumb_func +-#ifdef __APPLE__ +- ENTRY($0) ++#define ARM_FUNC_START(name) \ ++ .text; \ ++ .align 2; \ ++ .thumb; \ ++ .thumb_func; \ ++ ENTRY(name); \ ++ bx pc; \ ++ nop; \ ++ .arm; \ ++ UNWIND .fnstart; \ ++_L__##name: + #else +- ENTRY(\name) +-#endif +- bx pc +- nop +- .arm ++#define ARM_FUNC_START(name) \ ++ .text; \ ++ .align 2; \ ++ .arm; \ ++ ENTRY(name); \ + UNWIND .fnstart +-/* A hook to tell gdb that we've switched to ARM mode. Also used to call +- directly from other local arm routines. */ +-#ifdef __APPLE__ +-_L__$0: +-#else +-_L__\name: +-#endif +-.endm +-#else +-.macro ARM_FUNC_START name +- .text +- .align 0 +- .arm +-#ifdef __APPLE__ +- ENTRY($0) +-#else +- ENTRY(\name) +-#endif +- UNWIND .fnstart +-.endm + #endif + + .macro RETLDM regs=, cond=, dirn=ia +@@ -171,7 +156,7 @@ + @ sp+0: ecif.rvalue + + @ This assumes we are using gas. +-ARM_FUNC_START ffi_call_SYSV ++ARM_FUNC_START(ffi_call_SYSV) + @ Save registers + stmfd sp!, {r0-r3, fp, lr} + UNWIND .save {r0-r3, fp, lr} +@@ -187,7 +172,7 @@ + @ r1 already set + + @ Call ffi_prep_args(stack, &ecif) +- bl CNAME(ffi_prep_args) ++ bl CNAME(ffi_prep_args_SYSV) + + @ move first 4 parameters in registers + ldmia sp, {r0-r3} +@@ -228,7 +213,7 @@ + #if defined(__SOFTFP__) || defined(__ARM_EABI__) + cmpne r3, #FFI_TYPE_DOUBLE + #endif +- stmeqia r2, {r0, r1} ++ stmiaeq r2, {r0, r1} + + #if !defined(__SOFTFP__) && !defined(__ARM_EABI__) + beq LSYM(Lepilogue) +@@ -260,13 +245,13 @@ + + /* + unsigned int FFI_HIDDEN +- ffi_closure_SYSV_inner (closure, respp, args) ++ ffi_closure_inner (closure, respp, args) + ffi_closure *closure; + void **respp; + void *args; + */ + +-ARM_FUNC_START ffi_closure_SYSV ++ARM_FUNC_START(ffi_closure_SYSV) + UNWIND .pad #16 + add ip, sp, #16 + stmfd sp!, {ip, lr} +@@ -276,7 +261,7 @@ + sub sp, sp, #16 + str sp, [sp, #8] + add r1, sp, #8 +- bl CNAME(ffi_closure_SYSV_inner) ++ bl CNAME(ffi_closure_inner) + cmp r0, #FFI_TYPE_INT + beq .Lretint + +@@ -345,7 +330,7 @@ + @ r3: fig->flags + @ sp+0: ecif.rvalue + +-ARM_FUNC_START ffi_call_VFP ++ARM_FUNC_START(ffi_call_VFP) + @ Save registers + stmfd sp!, {r0-r3, fp, lr} + UNWIND .save {r0-r3, fp, lr} +@@ -364,10 +349,11 @@ + sub r2, fp, #64 @ VFP scratch space + + @ Call ffi_prep_args(stack, &ecif, vfp_space) +- bl CNAME(ffi_prep_args) ++ bl CNAME(ffi_prep_args_VFP) + + @ Load VFP register args if needed + cmp r0, #0 ++ mov ip, fp + beq LSYM(Lbase_args) + + @ Load only d0 if possible +@@ -433,7 +419,7 @@ + .size CNAME(ffi_call_VFP),.ffi_call_VFP_end-CNAME(ffi_call_VFP) + + +-ARM_FUNC_START ffi_closure_VFP ++ARM_FUNC_START(ffi_closure_VFP) + fstmfdd sp!, {d0-d7} + @ r0-r3, then d0-d7 + UNWIND .pad #80 +@@ -446,7 +432,7 @@ + sub sp, sp, #72 + str sp, [sp, #64] + add r1, sp, #64 +- bl CNAME(ffi_closure_SYSV_inner) ++ bl CNAME(ffi_closure_inner) + + cmp r0, #FFI_TYPE_INT + beq .Lretint_vfp +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/bfin/ffi.c +--- a/Modules/_ctypes/libffi/src/bfin/ffi.c ++++ b/Modules/_ctypes/libffi/src/bfin/ffi.c +@@ -1,5 +1,6 @@ + /* ----------------------------------------------------------------------- +- ffi.c - Copyright (c) 2012 Alexandre K. I. de Mendonca ++ ffi.c - Copyright (c) 2012 Alexandre K. I. de Mendonca , ++ Paulo Pizarro + + Blackfin Foreign Function Interface + +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/bfin/sysv.S +--- a/Modules/_ctypes/libffi/src/bfin/sysv.S ++++ b/Modules/_ctypes/libffi/src/bfin/sysv.S +@@ -1,5 +1,6 @@ + /* ----------------------------------------------------------------------- +- sysv.S - Copyright (c) 2012 Alexandre K. I. de Mendonca ++ sysv.S - Copyright (c) 2012 Alexandre K. I. de Mendonca , ++ Paulo Pizarro + + Blackfin Foreign Function Interface + +@@ -32,7 +33,7 @@ + .align 4 + + /* +- There is a "feature" in the bfin toolchain that it puts a _ before funcion names ++ There is a "feature" in the bfin toolchain that it puts a _ before function names + that's why the function here it's called _ffi_call_SYSV and not ffi_call_SYSV + */ + .global _ffi_call_SYSV; +@@ -40,25 +41,26 @@ + .func ffi_call_SYSV + + /* +- cif->bytes = R0 (fp+8) +- &ecif = R1 (fp+12) +- ffi_prep_args = R2 (fp+16) +- ret_type = stack (fp+20) +- ecif.rvalue = stack (fp+24) +- fn = stack (fp+28) +- got (fp+32) +- There is room for improvement here (we can use temporary registers ++ cif->bytes = R0 (fp+8) ++ &ecif = R1 (fp+12) ++ ffi_prep_args = R2 (fp+16) ++ ret_type = stack (fp+20) ++ ecif.rvalue = stack (fp+24) ++ fn = stack (fp+28) ++ got (fp+32) ++ ++ There is room for improvement here (we can use temporary registers + instead of saving the values in the memory) +- REGS: +- P5 => Stack pointer (function arguments) +- R5 => cif->bytes +- R4 => ret->type ++ REGS: ++ P5 => Stack pointer (function arguments) ++ R5 => cif->bytes ++ R4 => ret->type + +- FP-20 = P3 +- FP-16 = SP (parameters area) +- FP-12 = SP (temp) +- FP-08 = function return part 1 [R0] +- FP-04 = function return part 2 [R1] ++ FP-20 = P3 ++ FP-16 = SP (parameters area) ++ FP-12 = SP (temp) ++ FP-08 = function return part 1 [R0] ++ FP-04 = function return part 2 [R1] + */ + + _ffi_call_SYSV: +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/closures.c +--- a/Modules/_ctypes/libffi/src/closures.c ++++ b/Modules/_ctypes/libffi/src/closures.c +@@ -34,7 +34,7 @@ + #include + + #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE +-# if __gnu_linux__ ++# if __gnu_linux__ && !defined(__ANDROID__) + /* This macro indicates it may be forbidden to map anonymous memory + with both write and execute permission. Code compiled when this + option is defined will attempt to map such pages once, but if it +@@ -181,10 +181,26 @@ + static int + emutramp_enabled_check (void) + { +- if (getenv ("FFI_DISABLE_EMUTRAMP") == NULL) +- return 1; +- else ++ char *buf = NULL; ++ size_t len = 0; ++ FILE *f; ++ int ret; ++ f = fopen ("/proc/self/status", "r"); ++ if (f == NULL) + return 0; ++ ret = 0; ++ ++ while (getline (&buf, &len, f) != -1) ++ if (!strncmp (buf, "PaX:", 4)) ++ { ++ char emutramp; ++ if (sscanf (buf, "%*s %*c%c", &emutramp) == 1) ++ ret = (emutramp == 'E'); ++ break; ++ } ++ free (buf); ++ fclose (f); ++ return ret; + } + + #define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \ +@@ -264,7 +280,7 @@ + open_temp_exec_file_dir (const char *dir) + { + static const char suffix[] = "/ffiXXXXXX"; +- int lendir = strlen (dir); ++ size_t lendir = strlen (dir); + char *tempname = __builtin_alloca (lendir + sizeof (suffix)); + + if (!tempname) +@@ -382,7 +398,7 @@ + } + + /* Return a file descriptor of a temporary zero-sized file in a +- writable and exexutable filesystem. */ ++ writable and executable filesystem. */ + static int + open_temp_exec_file (void) + { +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/dlmalloc.c +--- a/Modules/_ctypes/libffi/src/dlmalloc.c ++++ b/Modules/_ctypes/libffi/src/dlmalloc.c +@@ -1260,7 +1260,7 @@ + #define SIZE_T_BITSIZE (sizeof(size_t) << 3) + + /* Some constants coerced to size_t */ +-/* Annoying but necessary to avoid errors on some plaftorms */ ++/* Annoying but necessary to avoid errors on some platforms */ + #define SIZE_T_ZERO ((size_t)0) + #define SIZE_T_ONE ((size_t)1) + #define SIZE_T_TWO ((size_t)2) +@@ -1414,7 +1414,7 @@ + #define CALL_MORECORE(S) MFAIL + #endif /* HAVE_MORECORE */ + +-/* mstate bit set if continguous morecore disabled or failed */ ++/* mstate bit set if contiguous morecore disabled or failed */ + #define USE_NONCONTIGUOUS_BIT (4U) + + /* segment bit set in create_mspace_with_base */ +@@ -1666,7 +1666,7 @@ + typedef struct malloc_chunk mchunk; + typedef struct malloc_chunk* mchunkptr; + typedef struct malloc_chunk* sbinptr; /* The type of bins of chunks */ +-typedef unsigned int bindex_t; /* Described below */ ++typedef size_t bindex_t; /* Described below */ + typedef unsigned int binmap_t; /* Described below */ + typedef unsigned int flag_t; /* The type of various bit flag sets */ + +@@ -3095,8 +3095,8 @@ + and choose its bk node as its replacement. + 2. If x was the last node of its size, but not a leaf node, it must + be replaced with a leaf node (not merely one with an open left or +- right), to make sure that lefts and rights of descendents +- correspond properly to bit masks. We use the rightmost descendent ++ right), to make sure that lefts and rights of descendants ++ correspond properly to bit masks. We use the rightmost descendant + of x. We could use any other leaf, but this is easy to locate and + tends to counteract removal of leftmosts elsewhere, and so keeps + paths shorter than minimally guaranteed. This doesn't loop much +@@ -3393,7 +3393,7 @@ + *ss = m->seg; /* Push current record */ + m->seg.base = tbase; + m->seg.size = tsize; +- set_segment_flags(&m->seg, mmapped); ++ (void)set_segment_flags(&m->seg, mmapped); + m->seg.next = ss; + + /* Insert trailing fenceposts */ +@@ -3553,7 +3553,7 @@ + if (!is_initialized(m)) { /* first-time initialization */ + m->seg.base = m->least_addr = tbase; + m->seg.size = tsize; +- set_segment_flags(&m->seg, mmap_flag); ++ (void)set_segment_flags(&m->seg, mmap_flag); + m->magic = mparams.magic; + init_bins(m); + if (is_global(m)) +@@ -4502,7 +4502,7 @@ + char* tbase = (char*)(CALL_MMAP(tsize)); + if (tbase != CMFAIL) { + m = init_user_mstate(tbase, tsize); +- set_segment_flags(&m->seg, IS_MMAPPED_BIT); ++ (void)set_segment_flags(&m->seg, IS_MMAPPED_BIT); + set_lock(m, locked); + } + } +@@ -4517,7 +4517,7 @@ + if (capacity > msize + TOP_FOOT_SIZE && + capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) { + m = init_user_mstate((char*)base, capacity); +- set_segment_flags(&m->seg, EXTERN_BIT); ++ (void)set_segment_flags(&m->seg, EXTERN_BIT); + set_lock(m, locked); + } + return (mspace)m; +@@ -5096,10 +5096,10 @@ + Wolfram Gloger (Gloger@lrz.uni-muenchen.de). + * Use last_remainder in more cases. + * Pack bins using idea from colin@nyx10.cs.du.edu +- * Use ordered bins instead of best-fit threshhold ++ * Use ordered bins instead of best-fit threshold + * Eliminate block-local decls to simplify tracing and debugging. + * Support another case of realloc via move into top +- * Fix error occuring when initial sbrk_base not word-aligned. ++ * Fix error occurring when initial sbrk_base not word-aligned. + * Rely on page size for units instead of SBRK_UNIT to + avoid surprises about sbrk alignment conventions. + * Add mallinfo, mallopt. Thanks to Raymond Nijssen +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/ia64/ffi.c +--- a/Modules/_ctypes/libffi/src/ia64/ffi.c ++++ b/Modules/_ctypes/libffi/src/ia64/ffi.c +@@ -401,7 +401,7 @@ + the closure (in the "trampoline" area), but we replace the gp + pointer with a pointer to the closure itself. We also add the real + gp pointer to the closure. This allows the function entry code to +- both retrieve the user data, and to restire the correct gp pointer. */ ++ both retrieve the user data, and to restore the correct gp pointer. */ + + extern void ffi_closure_unix (); + +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/m88k/ffi.c +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/m88k/ffi.c +@@ -0,0 +1,400 @@ ++/* ++ * Copyright (c) 2013 Miodrag Vallat. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining ++ * a copy of this software and associated documentation files (the ++ * ``Software''), to deal in the Software without restriction, including ++ * without limitation the rights to use, copy, modify, merge, publish, ++ * distribute, sublicense, and/or sell copies of the Software, and to ++ * permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included ++ * in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/* ++ * m88k Foreign Function Interface ++ * ++ * This file attempts to provide all the FFI entry points which can reliably ++ * be implemented in C. ++ * ++ * Only OpenBSD/m88k is currently supported; other platforms (such as ++ * Motorola's SysV/m88k) could be supported with the following tweaks: ++ * ++ * - non-OpenBSD systems use an `outgoing parameter area' as part of the ++ * 88BCS calling convention, which is not supported under OpenBSD from ++ * release 3.6 onwards. Supporting it should be as easy as taking it ++ * into account when adjusting the stack, in the assembly code. ++ * ++ * - the logic deciding whether a function argument gets passed through ++ * registers, or on the stack, has changed several times in OpenBSD in ++ * edge cases (especially for structs larger than 32 bytes being passed ++ * by value). The code below attemps to match the logic used by the ++ * system compiler of OpenBSD 5.3, i.e. gcc 3.3.6 with many m88k backend ++ * fixes. ++ */ ++ ++#include ++#include ++ ++#include ++#include ++ ++void ffi_call_OBSD (unsigned int, extended_cif *, unsigned int, void *, ++ void (*fn) ()); ++void *ffi_prep_args (void *, extended_cif *); ++void ffi_closure_OBSD (ffi_closure *); ++void ffi_closure_struct_OBSD (ffi_closure *); ++unsigned int ffi_closure_OBSD_inner (ffi_closure *, void *, unsigned int *, ++ char *); ++void ffi_cacheflush_OBSD (unsigned int, unsigned int); ++ ++#define CIF_FLAGS_INT (1 << 0) ++#define CIF_FLAGS_DINT (1 << 1) ++ ++/* ++ * Foreign Function Interface API ++ */ ++ ++/* ffi_prep_args is called by the assembly routine once stack space has ++ been allocated for the function's arguments. */ ++ ++void * ++ffi_prep_args (void *stack, extended_cif *ecif) ++{ ++ unsigned int i; ++ void **p_argv; ++ char *argp, *stackp; ++ unsigned int *regp; ++ unsigned int regused; ++ ffi_type **p_arg; ++ void *struct_value_ptr; ++ ++ regp = (unsigned int *)stack; ++ stackp = (char *)(regp + 8); ++ regused = 0; ++ ++ if (ecif->cif->rtype->type == FFI_TYPE_STRUCT ++ && !ecif->cif->flags) ++ struct_value_ptr = ecif->rvalue; ++ else ++ struct_value_ptr = NULL; ++ ++ p_argv = ecif->avalue; ++ ++ for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; i != 0; i--, p_arg++) ++ { ++ size_t z; ++ unsigned short t, a; ++ ++ z = (*p_arg)->size; ++ t = (*p_arg)->type; ++ a = (*p_arg)->alignment; ++ ++ /* ++ * Figure out whether the argument can be passed through registers ++ * or on the stack. ++ * The rule is that registers can only receive simple types not larger ++ * than 64 bits, or structs the exact size of a register and aligned to ++ * the size of a register. ++ */ ++ if (t == FFI_TYPE_STRUCT) ++ { ++ if (z == sizeof (int) && a == sizeof (int) && regused < 8) ++ argp = (char *)regp; ++ else ++ argp = stackp; ++ } ++ else ++ { ++ if (z > sizeof (int) && regused < 8 - 1) ++ { ++ /* align to an even register pair */ ++ if (regused & 1) ++ { ++ regp++; ++ regused++; ++ } ++ } ++ if (regused < 8) ++ argp = (char *)regp; ++ else ++ argp = stackp; ++ } ++ ++ /* Enforce proper stack alignment of 64-bit types */ ++ if (argp == stackp && a > sizeof (int)) ++ { ++ stackp = (char *) ALIGN(stackp, a); ++ argp = stackp; ++ } ++ ++ switch (t) ++ { ++ case FFI_TYPE_SINT8: ++ *(signed int *) argp = (signed int) *(SINT8 *) *p_argv; ++ break; ++ ++ case FFI_TYPE_UINT8: ++ *(unsigned int *) argp = (unsigned int) *(UINT8 *) *p_argv; ++ break; ++ ++ case FFI_TYPE_SINT16: ++ *(signed int *) argp = (signed int) *(SINT16 *) *p_argv; ++ break; ++ ++ case FFI_TYPE_UINT16: ++ *(unsigned int *) argp = (unsigned int) *(UINT16 *) *p_argv; ++ break; ++ ++ case FFI_TYPE_INT: ++ case FFI_TYPE_FLOAT: ++ case FFI_TYPE_UINT32: ++ case FFI_TYPE_SINT32: ++ case FFI_TYPE_POINTER: ++ *(unsigned int *) argp = *(unsigned int *) *p_argv; ++ break; ++ ++ case FFI_TYPE_DOUBLE: ++ case FFI_TYPE_UINT64: ++ case FFI_TYPE_SINT64: ++ case FFI_TYPE_STRUCT: ++ memcpy (argp, *p_argv, z); ++ break; ++ ++ default: ++ FFI_ASSERT (0); ++ } ++ ++ /* Align if necessary. */ ++ if ((sizeof (int) - 1) & z) ++ z = ALIGN(z, sizeof (int)); ++ ++ p_argv++; ++ ++ /* Be careful, once all registers are filled, and about to continue ++ on stack, regp == stackp. Therefore the check for regused as well. */ ++ if (argp == (char *)regp && regused < 8) ++ { ++ regp += z / sizeof (int); ++ regused += z / sizeof (int); ++ } ++ else ++ stackp += z; ++ } ++ ++ return struct_value_ptr; ++} ++ ++/* Perform machine dependent cif processing */ ++ffi_status ++ffi_prep_cif_machdep (ffi_cif *cif) ++{ ++ /* Set the return type flag */ ++ switch (cif->rtype->type) ++ { ++ case FFI_TYPE_VOID: ++ cif->flags = 0; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ if (cif->rtype->size == sizeof (int) && ++ cif->rtype->alignment == sizeof (int)) ++ cif->flags = CIF_FLAGS_INT; ++ else ++ cif->flags = 0; ++ break; ++ ++ case FFI_TYPE_DOUBLE: ++ case FFI_TYPE_SINT64: ++ case FFI_TYPE_UINT64: ++ cif->flags = CIF_FLAGS_DINT; ++ break; ++ ++ default: ++ cif->flags = CIF_FLAGS_INT; ++ break; ++ } ++ ++ return FFI_OK; ++} ++ ++void ++ffi_call (ffi_cif *cif, void (*fn) (), void *rvalue, void **avalue) ++{ ++ extended_cif ecif; ++ ++ ecif.cif = cif; ++ ecif.avalue = avalue; ++ ++ /* If the return value is a struct and we don't have a return value ++ address then we need to make one. */ ++ ++ if (rvalue == NULL ++ && cif->rtype->type == FFI_TYPE_STRUCT ++ && (cif->rtype->size != sizeof (int) ++ || cif->rtype->alignment != sizeof (int))) ++ ecif.rvalue = alloca (cif->rtype->size); ++ else ++ ecif.rvalue = rvalue; ++ ++ switch (cif->abi) ++ { ++ case FFI_OBSD: ++ ffi_call_OBSD (cif->bytes, &ecif, cif->flags, ecif.rvalue, fn); ++ break; ++ ++ default: ++ FFI_ASSERT (0); ++ break; ++ } ++} ++ ++/* ++ * Closure API ++ */ ++ ++static void ++ffi_prep_closure_args_OBSD (ffi_cif *cif, void **avalue, unsigned int *regp, ++ char *stackp) ++{ ++ unsigned int i; ++ void **p_argv; ++ char *argp; ++ unsigned int regused; ++ ffi_type **p_arg; ++ ++ regused = 0; ++ ++ p_argv = avalue; ++ ++ for (i = cif->nargs, p_arg = cif->arg_types; i != 0; i--, p_arg++) ++ { ++ size_t z; ++ unsigned short t, a; ++ ++ z = (*p_arg)->size; ++ t = (*p_arg)->type; ++ a = (*p_arg)->alignment; ++ ++ /* ++ * Figure out whether the argument has been passed through registers ++ * or on the stack. ++ * The rule is that registers can only receive simple types not larger ++ * than 64 bits, or structs the exact size of a register and aligned to ++ * the size of a register. ++ */ ++ if (t == FFI_TYPE_STRUCT) ++ { ++ if (z == sizeof (int) && a == sizeof (int) && regused < 8) ++ argp = (char *)regp; ++ else ++ argp = stackp; ++ } ++ else ++ { ++ if (z > sizeof (int) && regused < 8 - 1) ++ { ++ /* align to an even register pair */ ++ if (regused & 1) ++ { ++ regp++; ++ regused++; ++ } ++ } ++ if (regused < 8) ++ argp = (char *)regp; ++ else ++ argp = stackp; ++ } ++ ++ /* Enforce proper stack alignment of 64-bit types */ ++ if (argp == stackp && a > sizeof (int)) ++ { ++ stackp = (char *) ALIGN(stackp, a); ++ argp = stackp; ++ } ++ ++ if (z < sizeof (int) && t != FFI_TYPE_STRUCT) ++ *p_argv = (void *) (argp + sizeof (int) - z); ++ else ++ *p_argv = (void *) argp; ++ ++ /* Align if necessary */ ++ if ((sizeof (int) - 1) & z) ++ z = ALIGN(z, sizeof (int)); ++ ++ p_argv++; ++ ++ /* Be careful, once all registers are exhausted, and about to fetch from ++ stack, regp == stackp. Therefore the check for regused as well. */ ++ if (argp == (char *)regp && regused < 8) ++ { ++ regp += z / sizeof (int); ++ regused += z / sizeof (int); ++ } ++ else ++ stackp += z; ++ } ++} ++ ++unsigned int ++ffi_closure_OBSD_inner (ffi_closure *closure, void *resp, unsigned int *regp, ++ char *stackp) ++{ ++ ffi_cif *cif; ++ void **arg_area; ++ ++ cif = closure->cif; ++ arg_area = (void**) alloca (cif->nargs * sizeof (void *)); ++ ++ ffi_prep_closure_args_OBSD(cif, arg_area, regp, stackp); ++ ++ (closure->fun) (cif, resp, arg_area, closure->user_data); ++ ++ return cif->flags; ++} ++ ++ffi_status ++ffi_prep_closure_loc (ffi_closure* closure, ffi_cif* cif, ++ void (*fun)(ffi_cif*,void*,void**,void*), ++ void *user_data, void *codeloc) ++{ ++ unsigned int *tramp = (unsigned int *) codeloc; ++ void *fn; ++ ++ FFI_ASSERT (cif->abi == FFI_OBSD); ++ ++ if (cif->rtype->type == FFI_TYPE_STRUCT && !cif->flags) ++ fn = &ffi_closure_struct_OBSD; ++ else ++ fn = &ffi_closure_OBSD; ++ ++ /* or.u %r10, %r0, %hi16(fn) */ ++ tramp[0] = 0x5d400000 | (((unsigned int)fn) >> 16); ++ /* or.u %r13, %r0, %hi16(closure) */ ++ tramp[1] = 0x5da00000 | ((unsigned int)closure >> 16); ++ /* or %r10, %r10, %lo16(fn) */ ++ tramp[2] = 0x594a0000 | (((unsigned int)fn) & 0xffff); ++ /* jmp.n %r10 */ ++ tramp[3] = 0xf400c40a; ++ /* or %r13, %r13, %lo16(closure) */ ++ tramp[4] = 0x59ad0000 | ((unsigned int)closure & 0xffff); ++ ++ ffi_cacheflush_OBSD((unsigned int)codeloc, FFI_TRAMPOLINE_SIZE); ++ ++ closure->cif = cif; ++ closure->user_data = user_data; ++ closure->fun = fun; ++ ++ return FFI_OK; ++} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/m88k/ffitarget.h +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/m88k/ffitarget.h +@@ -0,0 +1,49 @@ ++/* ++ * Copyright (c) 2013 Miodrag Vallat. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining ++ * a copy of this software and associated documentation files (the ++ * ``Software''), to deal in the Software without restriction, including ++ * without limitation the rights to use, copy, modify, merge, publish, ++ * distribute, sublicense, and/or sell copies of the Software, and to ++ * permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included ++ * in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/* ++ * m88k Foreign Function Interface ++ */ ++ ++#ifndef LIBFFI_TARGET_H ++#define LIBFFI_TARGET_H ++ ++#ifndef LIBFFI_ASM ++typedef unsigned long ffi_arg; ++typedef signed long ffi_sarg; ++ ++typedef enum ffi_abi { ++ FFI_FIRST_ABI = 0, ++ FFI_OBSD, ++ FFI_DEFAULT_ABI = FFI_OBSD, ++ FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 ++} ffi_abi; ++#endif ++ ++/* ---- Definitions for closures ----------------------------------------- */ ++ ++#define FFI_CLOSURES 1 ++#define FFI_TRAMPOLINE_SIZE 0x14 ++#define FFI_NATIVE_RAW_API 0 ++ ++#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/m88k/obsd.S +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/m88k/obsd.S +@@ -0,0 +1,209 @@ ++/* ++ * Copyright (c) 2013 Miodrag Vallat. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining ++ * a copy of this software and associated documentation files (the ++ * ``Software''), to deal in the Software without restriction, including ++ * without limitation the rights to use, copy, modify, merge, publish, ++ * distribute, sublicense, and/or sell copies of the Software, and to ++ * permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included ++ * in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/* ++ * m88k Foreign Function Interface ++ */ ++ ++#define LIBFFI_ASM ++#include ++#include ++ ++ .text ++ ++/* ++ * ffi_cacheflush_OBSD(unsigned int addr, %r2 ++ * unsigned int size); %r3 ++ */ ++ .align 4 ++ .globl ffi_cacheflush_OBSD ++ .type ffi_cacheflush_OBSD,@function ++ffi_cacheflush_OBSD: ++ tb0 0, %r0, 451 ++ or %r0, %r0, %r0 ++ jmp %r1 ++ .size ffi_cacheflush_OBSD, . - ffi_cacheflush_OBSD ++ ++/* ++ * ffi_call_OBSD(unsigned bytes, %r2 ++ * extended_cif *ecif, %r3 ++ * unsigned flags, %r4 ++ * void *rvalue, %r5 ++ * void (*fn)()); %r6 ++ */ ++ .align 4 ++ .globl ffi_call_OBSD ++ .type ffi_call_OBSD,@function ++ffi_call_OBSD: ++ subu %r31, %r31, 32 ++ st %r30, %r31, 4 ++ st %r1, %r31, 0 ++ addu %r30, %r31, 32 ++ ++ | Save the few arguments we'll need after ffi_prep_args() ++ st.d %r4, %r31, 8 ++ st %r6, %r31, 16 ++ ++ | Allocate room for the image of r2-r9, and the stack space for ++ | the args (rounded to a 16-byte boundary) ++ addu %r2, %r2, (8 * 4) + 15 ++ clr %r2, %r2, 4<0> ++ subu %r31, %r31, %r2 ++ ++ | Fill register and stack image ++ or %r2, %r31, %r0 ++#ifdef PIC ++ bsr ffi_prep_args#plt ++#else ++ bsr ffi_prep_args ++#endif ++ ++ | Save pointer to return struct address, if any ++ or %r12, %r2, %r0 ++ ++ | Get function pointer ++ subu %r4, %r30, 32 ++ ld %r1, %r4, 16 ++ ++ | Fetch the register arguments ++ ld.d %r2, %r31, (0 * 4) ++ ld.d %r4, %r31, (2 * 4) ++ ld.d %r6, %r31, (4 * 4) ++ ld.d %r8, %r31, (6 * 4) ++ addu %r31, %r31, (8 * 4) ++ ++ | Invoke the function ++ jsr %r1 ++ ++ | Restore stack now that we don't need the args anymore ++ subu %r31, %r30, 32 ++ ++ | Figure out what to return as the function's return value ++ ld %r5, %r31, 12 | rvalue ++ ld %r4, %r31, 8 | flags ++ ++ bcnd eq0, %r5, 9f ++ ++ bb0 0, %r4, 1f | CIF_FLAGS_INT ++ st %r2, %r5, 0 ++ br 9f ++ ++1: ++ bb0 1, %r4, 1f | CIF_FLAGS_DINT ++ st.d %r2, %r5, 0 ++ br 9f ++ ++1: ++9: ++ ld %r1, %r31, 0 ++ ld %r30, %r31, 4 ++ jmp.n %r1 ++ addu %r31, %r31, 32 ++ .size ffi_call_OBSD, . - ffi_call_OBSD ++ ++/* ++ * ffi_closure_OBSD(ffi_closure *closure); %r13 ++ */ ++ .align 4 ++ .globl ffi_closure_OBSD ++ .type ffi_closure_OBSD, @function ++ffi_closure_OBSD: ++ subu %r31, %r31, 16 ++ st %r30, %r31, 4 ++ st %r1, %r31, 0 ++ addu %r30, %r31, 16 ++ ++ | Make room on the stack for saved register arguments and return ++ | value ++ subu %r31, %r31, (8 * 4) + (2 * 4) ++ st.d %r2, %r31, (0 * 4) ++ st.d %r4, %r31, (2 * 4) ++ st.d %r6, %r31, (4 * 4) ++ st.d %r8, %r31, (6 * 4) ++ ++ | Invoke the closure function ++ or %r5, %r30, 0 | calling stack ++ addu %r4, %r31, 0 | saved registers ++ addu %r3, %r31, (8 * 4) | return value ++ or %r2, %r13, %r0 | closure ++#ifdef PIC ++ bsr ffi_closure_OBSD_inner#plt ++#else ++ bsr ffi_closure_OBSD_inner ++#endif ++ ++ | Figure out what to return as the function's return value ++ bb0 0, %r2, 1f | CIF_FLAGS_INT ++ ld %r2, %r31, (8 * 4) ++ br 9f ++ ++1: ++ bb0 1, %r2, 1f | CIF_FLAGS_DINT ++ ld.d %r2, %r31, (8 * 4) ++ br 9f ++ ++1: ++9: ++ subu %r31, %r30, 16 ++ ld %r1, %r31, 0 ++ ld %r30, %r31, 4 ++ jmp.n %r1 ++ addu %r31, %r31, 16 ++ .size ffi_closure_OBSD,.-ffi_closure_OBSD ++ ++/* ++ * ffi_closure_struct_OBSD(ffi_closure *closure); %r13 ++ */ ++ .align 4 ++ .globl ffi_closure_struct_OBSD ++ .type ffi_closure_struct_OBSD, @function ++ffi_closure_struct_OBSD: ++ subu %r31, %r31, 16 ++ st %r30, %r31, 4 ++ st %r1, %r31, 0 ++ addu %r30, %r31, 16 ++ ++ | Make room on the stack for saved register arguments ++ subu %r31, %r31, (8 * 4) ++ st.d %r2, %r31, (0 * 4) ++ st.d %r4, %r31, (2 * 4) ++ st.d %r6, %r31, (4 * 4) ++ st.d %r8, %r31, (6 * 4) ++ ++ | Invoke the closure function ++ or %r5, %r30, 0 | calling stack ++ addu %r4, %r31, 0 | saved registers ++ or %r3, %r12, 0 | return value ++ or %r2, %r13, %r0 | closure ++#ifdef PIC ++ bsr ffi_closure_OBSD_inner#plt ++#else ++ bsr ffi_closure_OBSD_inner ++#endif ++ ++ subu %r31, %r30, 16 ++ ld %r1, %r31, 0 ++ ld %r30, %r31, 4 ++ jmp.n %r1 ++ addu %r31, %r31, 16 ++ .size ffi_closure_struct_OBSD,.-ffi_closure_struct_OBSD +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/microblaze/ffi.c +--- a/Modules/_ctypes/libffi/src/microblaze/ffi.c ++++ b/Modules/_ctypes/libffi/src/microblaze/ffi.c +@@ -183,7 +183,7 @@ + ffi_type** arg_types = cif->arg_types; + + /* re-allocate data for the args. This needs to be done in order to keep +- * multi-word objects (e.g. structs) in contigious memory. Callers are not ++ * multi-word objects (e.g. structs) in contiguous memory. Callers are not + * required to store the value of args in the lower 6 words in the stack + * (although they are allocated in the stack). + */ +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/microblaze/sysv.S +--- a/Modules/_ctypes/libffi/src/microblaze/sysv.S ++++ b/Modules/_ctypes/libffi/src/microblaze/sysv.S +@@ -134,7 +134,7 @@ + rsubi r11, r23, 8 + beqi r11, ffi_call_SYSV_store64 + +- /* Didnt match anything */ ++ /* Didn't match anything */ + bri ffi_call_SYSV_end + + ffi_call_SYSV_store64: +@@ -210,7 +210,7 @@ + addik r7, r12, 0 /* closure object */ + addik r1, r1, -8 /* allocate return value */ + addik r8, r1, 0 /* void* rvalue */ +- addik r1, r1, -8 /* allocate for reutrn type/size values */ ++ addik r1, r1, -8 /* allocate for return type/size values */ + addik r9, r1, 0 /* void* rtype */ + addik r10, r1, 4 /* void* rsize */ + +@@ -247,7 +247,7 @@ + rsubi r11, r10, 8 + beqi r11, ffi_closure_SYSV_store64 + +- /* Didnt match anything */ ++ /* Didn't match anything */ + bri ffi_closure_SYSV_end + + ffi_closure_SYSV_store64: +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/mips/ffi.c +--- a/Modules/_ctypes/libffi/src/mips/ffi.c ++++ b/Modules/_ctypes/libffi/src/mips/ffi.c +@@ -170,7 +170,14 @@ + break; + + case FFI_TYPE_UINT32: ++#ifdef FFI_MIPS_N32 ++ /* The N32 ABI requires that 32-bit integers ++ be sign-extended to 64-bits, regardless of ++ whether they are signed or unsigned. */ ++ *(ffi_arg *)argp = *(SINT32 *)(* p_argv); ++#else + *(ffi_arg *)argp = *(UINT32 *)(* p_argv); ++#endif + break; + + /* This can only happen with 64bit slots. */ +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/mips/n32.S +--- a/Modules/_ctypes/libffi/src/mips/n32.S ++++ b/Modules/_ctypes/libffi/src/mips/n32.S +@@ -108,10 +108,8 @@ + REG_L t6, 3*FFI_SIZEOF_ARG($fp) # load the flags word into t6. + + and t4, t6, ((1< ++#include ++ ++#include ++ ++/* The Nios II Processor Reference Handbook defines the procedure call ++ ABI as follows. ++ ++ Arguments are passed as if a structure containing the types of ++ the arguments were constructed. The first 16 bytes are passed in r4 ++ through r7, the remainder on the stack. The first 16 bytes of a function ++ taking variable arguments are passed in r4-r7 in the same way. ++ ++ Return values of types up to 8 bytes are returned in r2 and r3. For ++ return values greater than 8 bytes, the caller must allocate memory for ++ the result and pass the address as if it were argument 0. ++ ++ While this isn't specified explicitly in the ABI documentation, GCC ++ promotes integral arguments smaller than int size to 32 bits. ++ ++ Also of note, the ABI specifies that all structure objects are ++ aligned to 32 bits even if all their fields have a smaller natural ++ alignment. See FFI_AGGREGATE_ALIGNMENT. */ ++ ++ ++/* Declare the assembly language hooks. */ ++ ++extern UINT64 ffi_call_sysv (void (*) (char *, extended_cif *), ++ extended_cif *, ++ unsigned, ++ void (*fn) (void)); ++extern void ffi_closure_sysv (void); ++ ++/* Perform machine-dependent cif processing. */ ++ ++ffi_status ffi_prep_cif_machdep (ffi_cif *cif) ++{ ++ /* We always want at least 16 bytes in the parameter block since it ++ simplifies the low-level call function. Also round the parameter ++ block size up to a multiple of 4 bytes to preserve ++ 32-bit alignment of the stack pointer. */ ++ if (cif->bytes < 16) ++ cif->bytes = 16; ++ else ++ cif->bytes = (cif->bytes + 3) & ~3; ++ ++ return FFI_OK; ++} ++ ++ ++/* ffi_prep_args is called by the assembly routine to transfer arguments ++ to the stack using the pointers in the ecif array. ++ Note that the stack buffer is big enough to fit all the arguments, ++ but the first 16 bytes will be copied to registers for the actual ++ call. */ ++ ++void ffi_prep_args (char *stack, extended_cif *ecif) ++{ ++ char *argp = stack; ++ unsigned int i; ++ ++ /* The implicit return value pointer is passed as if it were a hidden ++ first argument. */ ++ if (ecif->cif->rtype->type == FFI_TYPE_STRUCT ++ && ecif->cif->rtype->size > 8) ++ { ++ (*(void **) argp) = ecif->rvalue; ++ argp += 4; ++ } ++ ++ for (i = 0; i < ecif->cif->nargs; i++) ++ { ++ void *avalue = ecif->avalue[i]; ++ ffi_type *atype = ecif->cif->arg_types[i]; ++ size_t size = atype->size; ++ size_t alignment = atype->alignment; ++ ++ /* Align argp as appropriate for the argument type. */ ++ if ((alignment - 1) & (unsigned) argp) ++ argp = (char *) ALIGN (argp, alignment); ++ ++ /* Copy the argument, promoting integral types smaller than a ++ word to word size. */ ++ if (size < sizeof (int)) ++ { ++ size = sizeof (int); ++ switch (atype->type) ++ { ++ case FFI_TYPE_SINT8: ++ *(signed int *) argp = (signed int) *(SINT8 *) avalue; ++ break; ++ ++ case FFI_TYPE_UINT8: ++ *(unsigned int *) argp = (unsigned int) *(UINT8 *) avalue; ++ break; ++ ++ case FFI_TYPE_SINT16: ++ *(signed int *) argp = (signed int) *(SINT16 *) avalue; ++ break; ++ ++ case FFI_TYPE_UINT16: ++ *(unsigned int *) argp = (unsigned int) *(UINT16 *) avalue; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ memcpy (argp, avalue, atype->size); ++ break; ++ ++ default: ++ FFI_ASSERT(0); ++ } ++ } ++ else if (size == sizeof (int)) ++ *(unsigned int *) argp = (unsigned int) *(UINT32 *) avalue; ++ else ++ memcpy (argp, avalue, size); ++ argp += size; ++ } ++} ++ ++ ++/* Call FN using the prepared CIF. RVALUE points to space allocated by ++ the caller for the return value, and AVALUE is an array of argument ++ pointers. */ ++ ++void ffi_call (ffi_cif *cif, void (*fn) (void), void *rvalue, void **avalue) ++{ ++ ++ extended_cif ecif; ++ UINT64 result; ++ ++ /* If bigret is true, this is the case where a return value of larger ++ than 8 bytes is handled by being passed by reference as an implicit ++ argument. */ ++ int bigret = (cif->rtype->type == FFI_TYPE_STRUCT ++ && cif->rtype->size > 8); ++ ++ ecif.cif = cif; ++ ecif.avalue = avalue; ++ ++ /* Allocate space for return value if this is the pass-by-reference case ++ and the caller did not provide a buffer. */ ++ if (rvalue == NULL && bigret) ++ ecif.rvalue = alloca (cif->rtype->size); ++ else ++ ecif.rvalue = rvalue; ++ ++ result = ffi_call_sysv (ffi_prep_args, &ecif, cif->bytes, fn); ++ ++ /* Now result contains the 64 bit contents returned from fn in ++ r2 and r3. Copy the value of the appropriate size to the user-provided ++ rvalue buffer. */ ++ if (rvalue && !bigret) ++ switch (cif->rtype->size) ++ { ++ case 1: ++ *(UINT8 *)rvalue = (UINT8) result; ++ break; ++ case 2: ++ *(UINT16 *)rvalue = (UINT16) result; ++ break; ++ case 4: ++ *(UINT32 *)rvalue = (UINT32) result; ++ break; ++ case 8: ++ *(UINT64 *)rvalue = (UINT64) result; ++ break; ++ default: ++ memcpy (rvalue, (void *)&result, cif->rtype->size); ++ break; ++ } ++} ++ ++/* This function is invoked from the closure trampoline to invoke ++ CLOSURE with argument block ARGS. Parse ARGS according to ++ CLOSURE->cfi and invoke CLOSURE->fun. */ ++ ++static UINT64 ++ffi_closure_helper (unsigned char *args, ++ ffi_closure *closure) ++{ ++ ffi_cif *cif = closure->cif; ++ unsigned char *argp = args; ++ void **parsed_args = alloca (cif->nargs * sizeof (void *)); ++ UINT64 result; ++ void *retptr; ++ unsigned int i; ++ ++ /* First figure out what to do about the return type. If this is the ++ big-structure-return case, the first arg is the hidden return buffer ++ allocated by the caller. */ ++ if (cif->rtype->type == FFI_TYPE_STRUCT ++ && cif->rtype->size > 8) ++ { ++ retptr = *((void **) argp); ++ argp += 4; ++ } ++ else ++ retptr = (void *) &result; ++ ++ /* Fill in the array of argument pointers. */ ++ for (i = 0; i < cif->nargs; i++) ++ { ++ size_t size = cif->arg_types[i]->size; ++ size_t alignment = cif->arg_types[i]->alignment; ++ ++ /* Align argp as appropriate for the argument type. */ ++ if ((alignment - 1) & (unsigned) argp) ++ argp = (char *) ALIGN (argp, alignment); ++ ++ /* Arguments smaller than an int are promoted to int. */ ++ if (size < sizeof (int)) ++ size = sizeof (int); ++ ++ /* Store the pointer. */ ++ parsed_args[i] = argp; ++ argp += size; ++ } ++ ++ /* Call the user-supplied function. */ ++ (closure->fun) (cif, retptr, parsed_args, closure->user_data); ++ return result; ++} ++ ++ ++/* Initialize CLOSURE with a trampoline to call FUN with ++ CIF and USER_DATA. */ ++ffi_status ++ffi_prep_closure_loc (ffi_closure* closure, ++ ffi_cif* cif, ++ void (*fun) (ffi_cif*, void*, void**, void*), ++ void *user_data, ++ void *codeloc) ++{ ++ unsigned int *tramp = (unsigned int *) &closure->tramp[0]; ++ int i; ++ ++ if (cif->abi != FFI_SYSV) ++ return FFI_BAD_ABI; ++ ++ /* The trampoline looks like: ++ movhi r8, %hi(ffi_closure_sysv) ++ ori r8, r8, %lo(ffi_closure_sysv) ++ movhi r9, %hi(ffi_closure_helper) ++ ori r0, r9, %lo(ffi_closure_helper) ++ movhi r10, %hi(closure) ++ ori r10, r10, %lo(closure) ++ jmp r8 ++ and then ffi_closure_sysv retrieves the closure pointer out of r10 ++ in addition to the arguments passed in the normal way for the call, ++ and invokes ffi_closure_helper. We encode the pointer to ++ ffi_closure_helper in the trampoline because making a PIC call ++ to it in ffi_closure_sysv would be messy (it would have to indirect ++ through the GOT). */ ++ ++#define HI(x) ((((unsigned int) (x)) >> 16) & 0xffff) ++#define LO(x) (((unsigned int) (x)) & 0xffff) ++ tramp[0] = (0 << 27) | (8 << 22) | (HI (ffi_closure_sysv) << 6) | 0x34; ++ tramp[1] = (8 << 27) | (8 << 22) | (LO (ffi_closure_sysv) << 6) | 0x14; ++ tramp[2] = (0 << 27) | (9 << 22) | (HI (ffi_closure_helper) << 6) | 0x34; ++ tramp[3] = (9 << 27) | (9 << 22) | (LO (ffi_closure_helper) << 6) | 0x14; ++ tramp[4] = (0 << 27) | (10 << 22) | (HI (closure) << 6) | 0x34; ++ tramp[5] = (10 << 27) | (10 << 22) | (LO (closure) << 6) | 0x14; ++ tramp[6] = (8 << 27) | (0x0d << 11) | 0x3a; ++#undef HI ++#undef LO ++ ++ /* Flush the caches. ++ See Example 9-4 in the Nios II Software Developer's Handbook. */ ++ for (i = 0; i < 7; i++) ++ asm volatile ("flushd 0(%0); flushi %0" :: "r"(tramp + i) : "memory"); ++ asm volatile ("flushp" ::: "memory"); ++ ++ closure->cif = cif; ++ closure->fun = fun; ++ closure->user_data = user_data; ++ ++ return FFI_OK; ++} ++ +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/nios2/ffitarget.h +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/nios2/ffitarget.h +@@ -0,0 +1,52 @@ ++/* libffi target includes for Altera Nios II. ++ ++ Copyright (c) 2013 Mentor Graphics. ++ ++ Permission is hereby granted, free of charge, to any person obtaining ++ a copy of this software and associated documentation files (the ++ ``Software''), to deal in the Software without restriction, including ++ without limitation the rights to use, copy, modify, merge, publish, ++ distribute, sublicense, and/or sell copies of the Software, and to ++ permit persons to whom the Software is furnished to do so, subject to ++ the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++ ++#ifndef LIBFFI_TARGET_H ++#define LIBFFI_TARGET_H ++ ++#ifndef LIBFFI_H ++#error "Please do not include ffitarget.h directly into your source. Use ffi.h instead." ++#endif ++ ++#ifndef LIBFFI_ASM ++typedef unsigned long ffi_arg; ++typedef signed long ffi_sarg; ++ ++typedef enum ffi_abi { ++ FFI_FIRST_ABI = 0, ++ FFI_SYSV, ++ FFI_LAST_ABI, ++ FFI_DEFAULT_ABI = FFI_SYSV ++} ffi_abi; ++#endif ++ ++/* Structures have a 4-byte alignment even if all the fields have lesser ++ alignment requirements. */ ++#define FFI_AGGREGATE_ALIGNMENT 4 ++ ++#define FFI_CLOSURES 1 ++#define FFI_TRAMPOLINE_SIZE 28 /* 7 instructions */ ++#define FFI_NATIVE_RAW_API 0 ++ ++#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/nios2/sysv.S +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/nios2/sysv.S +@@ -0,0 +1,136 @@ ++/* Low-level libffi support for Altera Nios II. ++ ++ Copyright (c) 2013 Mentor Graphics. ++ ++ Permission is hereby granted, free of charge, to any person obtaining ++ a copy of this software and associated documentation files (the ++ ``Software''), to deal in the Software without restriction, including ++ without limitation the rights to use, copy, modify, merge, publish, ++ distribute, sublicense, and/or sell copies of the Software, and to ++ permit persons to whom the Software is furnished to do so, subject to ++ the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++/* This function is declared on the C side as ++ ++ extern UINT64 ffi_call_sysv (void (*arghook) (char *, extended_cif *), ++ extended_cif *ecif, ++ unsigned nbytes, ++ void (*fn) (void)); ++ ++ On input, the arguments appear as ++ r4 = arghook ++ r5 = ecif ++ r6 = nbytes ++ r7 = fn ++*/ ++ ++ .section .text ++ .align 2 ++ .global ffi_call_sysv ++ .type ffi_call_sysv, @function ++ ++ffi_call_sysv: ++ .cfi_startproc ++ ++ /* Create the stack frame, saving r16 so we can use it locally. */ ++ addi sp, sp, -12 ++ .cfi_def_cfa_offset 12 ++ stw ra, 8(sp) ++ stw fp, 4(sp) ++ stw r16, 0(sp) ++ .cfi_offset 31, -4 ++ .cfi_offset 28, -8 ++ .cfi_offset 16, -12 ++ mov fp, sp ++ .cfi_def_cfa_register 28 ++ mov r16, r7 ++ ++ /* Adjust the stack pointer to create the argument buffer ++ nbytes long. */ ++ sub sp, sp, r6 ++ ++ /* Call the arghook function. */ ++ mov r2, r4 /* fn */ ++ mov r4, sp /* argbuffer */ ++ callr r2 /* r5 already contains ecif */ ++ ++ /* Pop off the first 16 bytes of the argument buffer on the stack, ++ transferring the contents to the argument registers. */ ++ ldw r4, 0(sp) ++ ldw r5, 4(sp) ++ ldw r6, 8(sp) ++ ldw r7, 12(sp) ++ addi sp, sp, 16 ++ ++ /* Call the user function, which leaves its result in r2 and r3. */ ++ callr r16 ++ ++ /* Pop off the stack frame. */ ++ mov sp, fp ++ ldw ra, 8(sp) ++ ldw fp, 4(sp) ++ ldw r16, 0(sp) ++ addi sp, sp, 12 ++ ret ++ .cfi_endproc ++ .size ffi_call_sysv, .-ffi_call_sysv ++ ++ ++/* Closure trampolines jump here after putting the C helper address ++ in r9 and the closure pointer in r10. The user-supplied arguments ++ to the closure are in the normal places, in r4-r7 and on the ++ stack. Push the register arguments on the stack too and then call the ++ C helper function to deal with them. */ ++ ++ .section .text ++ .align 2 ++ .global ffi_closure_sysv ++ .type ffi_closure_sysv, @function ++ ++ffi_closure_sysv: ++ .cfi_startproc ++ ++ /* Create the stack frame, pushing the register args on the stack ++ just below the stack args. This is the same trick illustrated ++ in Figure 7-3 in the Nios II Processor Reference Handbook, used ++ for variable arguments and structures passed by value. */ ++ addi sp, sp, -20 ++ .cfi_def_cfa_offset 20 ++ stw ra, 0(sp) ++ .cfi_offset 31, -20 ++ stw r4, 4(sp) ++ .cfi_offset 4, -16 ++ stw r5, 8(sp) ++ .cfi_offset 5, -12 ++ stw r6, 12(sp) ++ .cfi_offset 6, -8 ++ stw r7, 16(sp) ++ .cfi_offset 7, -4 ++ ++ /* Call the helper. ++ r4 = pointer to arguments on stack ++ r5 = closure pointer (loaded in r10 by the trampoline) ++ r9 = address of helper function (loaded by trampoline) */ ++ addi r4, sp, 4 ++ mov r5, r10 ++ callr r9 ++ ++ /* Pop the stack and return. */ ++ ldw ra, 0(sp) ++ addi sp, sp, 20 ++ .cfi_def_cfa_offset -20 ++ ret ++ .cfi_endproc ++ .size ffi_closure_sysv, .-ffi_closure_sysv ++ +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/darwin.S +--- a/Modules/_ctypes/libffi/src/powerpc/darwin.S ++++ b/Modules/_ctypes/libffi/src/powerpc/darwin.S +@@ -318,11 +318,6 @@ + + #define EH_DATA_ALIGN_FACT MODE_CHOICE(0x7c,0x78) + +- .static_data +- .align LOG2_GPR_BYTES +-LLFB0$non_lazy_ptr: +- .g_long Lstartcode +- + .section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support + EH_frame1: + .set L$set$0,LECIE1-LSCIE1 +@@ -335,7 +330,7 @@ + .byte EH_DATA_ALIGN_FACT ; sleb128 -4; CIE Data Alignment Factor + .byte 0x41 ; CIE RA Column + .byte 0x1 ; uleb128 0x1; Augmentation size +- .byte 0x10 ; FDE Encoding (indirect pcrel) ++ .byte 0x10 ; FDE Encoding (pcrel) + .byte 0xc ; DW_CFA_def_cfa + .byte 0x1 ; uleb128 0x1 + .byte 0x0 ; uleb128 0x0 +@@ -349,7 +344,7 @@ + .long L$set$1 ; FDE Length + LASFDE1: + .long LASFDE1-EH_frame1 ; FDE CIE offset +- .g_long LLFB0$non_lazy_ptr-. ; FDE initial location ++ .g_long Lstartcode-. ; FDE initial location + .set L$set$3,LFE1-Lstartcode + .g_long L$set$3 ; FDE address range + .byte 0x0 ; uleb128 0x0; Augmentation size +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/darwin_closure.S +--- a/Modules/_ctypes/libffi/src/powerpc/darwin_closure.S ++++ b/Modules/_ctypes/libffi/src/powerpc/darwin_closure.S +@@ -192,7 +192,7 @@ + lg r0,0(r3) ; size => r0 + lhz r3,FFI_TYPE_TYPE(r3) ; type => r3 + +- /* The helper will have intercepted struture returns and inserted ++ /* The helper will have intercepted structure returns and inserted + the caller`s destination address for structs returned by ref. */ + + /* r3 contains the return type so use it to look up in a table +@@ -467,11 +467,6 @@ + #define EH_FRAME_OFFSETA MODE_CHOICE(176,0x90) + #define EH_FRAME_OFFSETB MODE_CHOICE(1,3) + +- .static_data +- .align LOG2_GPR_BYTES +-LLFB1$non_lazy_ptr: +- .g_long Lstartcode +- + .section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support + EH_frame1: + .set L$set$0,LECIE1-LSCIE1 +@@ -484,7 +479,7 @@ + .byte EH_DATA_ALIGN_FACT ; sleb128 -4; CIE Data Alignment Factor + .byte 0x41 ; CIE RA Column + .byte 0x1 ; uleb128 0x1; Augmentation size +- .byte 0x10 ; FDE Encoding (indirect pcrel) ++ .byte 0x10 ; FDE Encoding (pcrel) + .byte 0xc ; DW_CFA_def_cfa + .byte 0x1 ; uleb128 0x1 + .byte 0x0 ; uleb128 0x0 +@@ -498,7 +493,7 @@ + + LASFDE1: + .long LASFDE1-EH_frame1 ; FDE CIE offset +- .g_long LLFB1$non_lazy_ptr-. ; FDE initial location ++ .g_long Lstartcode-. ; FDE initial location + .set L$set$3,LFE1-Lstartcode + .g_long L$set$3 ; FDE address range + .byte 0x0 ; uleb128 0x0; Augmentation size +@@ -523,12 +518,12 @@ + L_ffi_closure_helper_DARWIN$stub: + .indirect_symbol _ffi_closure_helper_DARWIN + mflr r0 +- bcl 20,31,"L00000000001$spb" +-"L00000000001$spb": ++ bcl 20,31,"L1$spb" ++"L1$spb": + mflr r11 +- addis r11,r11,ha16(L_ffi_closure_helper_DARWIN$lazy_ptr-"L00000000001$spb") ++ addis r11,r11,ha16(L_ffi_closure_helper_DARWIN$lazy_ptr-"L1$spb") + mtlr r0 +- lwzu r12,lo16(L_ffi_closure_helper_DARWIN$lazy_ptr-"L00000000001$spb")(r11) ++ lwzu r12,lo16(L_ffi_closure_helper_DARWIN$lazy_ptr-"L1$spb")(r11) + mtctr r12 + bctr + .lazy_symbol_pointer +@@ -542,12 +537,12 @@ + L_darwin64_struct_ret_by_value_p$stub: + .indirect_symbol _darwin64_struct_ret_by_value_p + mflr r0 +- bcl 20,31,"L00000000002$spb" +-"L00000000002$spb": ++ bcl 20,31,"L2$spb" ++"L2$spb": + mflr r11 +- addis r11,r11,ha16(L_darwin64_struct_ret_by_value_p$lazy_ptr-"L00000000002$spb") ++ addis r11,r11,ha16(L_darwin64_struct_ret_by_value_p$lazy_ptr-"L2$spb") + mtlr r0 +- lwzu r12,lo16(L_darwin64_struct_ret_by_value_p$lazy_ptr-"L00000000002$spb")(r11) ++ lwzu r12,lo16(L_darwin64_struct_ret_by_value_p$lazy_ptr-"L2$spb")(r11) + mtctr r12 + bctr + .lazy_symbol_pointer +@@ -560,12 +555,12 @@ + L_darwin64_pass_struct_floats$stub: + .indirect_symbol _darwin64_pass_struct_floats + mflr r0 +- bcl 20,31,"L00000000003$spb" +-"L00000000003$spb": ++ bcl 20,31,"L3$spb" ++"L3$spb": + mflr r11 +- addis r11,r11,ha16(L_darwin64_pass_struct_floats$lazy_ptr-"L00000000003$spb") ++ addis r11,r11,ha16(L_darwin64_pass_struct_floats$lazy_ptr-"L3$spb") + mtlr r0 +- lwzu r12,lo16(L_darwin64_pass_struct_floats$lazy_ptr-"L00000000003$spb")(r11) ++ lwzu r12,lo16(L_darwin64_pass_struct_floats$lazy_ptr-"L3$spb")(r11) + mtctr r12 + bctr + .lazy_symbol_pointer +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/ffi.c +--- a/Modules/_ctypes/libffi/src/powerpc/ffi.c ++++ b/Modules/_ctypes/libffi/src/powerpc/ffi.c +@@ -1,5 +1,6 @@ + /* ----------------------------------------------------------------------- +- ffi.c - Copyright (C) 2011 Anthony Green ++ ffi.c - Copyright (C) 2013 IBM ++ Copyright (C) 2011 Anthony Green + Copyright (C) 2011 Kyle Moffett + Copyright (C) 2008 Red Hat, Inc + Copyright (C) 2007, 2008 Free Software Foundation, Inc +@@ -27,991 +28,104 @@ + OTHER DEALINGS IN THE SOFTWARE. + ----------------------------------------------------------------------- */ + +-#include +-#include ++#include "ffi.h" ++#include "ffi_common.h" ++#include "ffi_powerpc.h" + +-#include +-#include +- +- +-extern void ffi_closure_SYSV (void); +-extern void FFI_HIDDEN ffi_closure_LINUX64 (void); +- +-enum { +- /* The assembly depends on these exact flags. */ +- FLAG_RETURNS_SMST = 1 << (31-31), /* Used for FFI_SYSV small structs. */ +- FLAG_RETURNS_NOTHING = 1 << (31-30), /* These go in cr7 */ +-#ifndef __NO_FPRS__ +- FLAG_RETURNS_FP = 1 << (31-29), +-#endif +- FLAG_RETURNS_64BITS = 1 << (31-28), +- +- FLAG_RETURNS_128BITS = 1 << (31-27), /* cr6 */ +- +- FLAG_SYSV_SMST_R4 = 1 << (31-26), /* use r4 for FFI_SYSV 8 byte +- structs. */ +- FLAG_SYSV_SMST_R3 = 1 << (31-25), /* use r3 for FFI_SYSV 4 byte +- structs. */ +- +- FLAG_ARG_NEEDS_COPY = 1 << (31- 7), +-#ifndef __NO_FPRS__ +- FLAG_FP_ARGUMENTS = 1 << (31- 6), /* cr1.eq; specified by ABI */ +-#endif +- FLAG_4_GPR_ARGUMENTS = 1 << (31- 5), +- FLAG_RETVAL_REFERENCE = 1 << (31- 4) +-}; +- +-/* About the SYSV ABI. */ +-#define ASM_NEEDS_REGISTERS 4 +-#define NUM_GPR_ARG_REGISTERS 8 +-#ifndef __NO_FPRS__ +-# define NUM_FPR_ARG_REGISTERS 8 ++#if HAVE_LONG_DOUBLE_VARIANT ++/* Adjust ffi_type_longdouble. */ ++void FFI_HIDDEN ++ffi_prep_types (ffi_abi abi) ++{ ++# if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++# ifdef POWERPC64 ++ ffi_prep_types_linux64 (abi); ++# else ++ ffi_prep_types_sysv (abi); ++# endif ++# endif ++} + #endif + +-/* ffi_prep_args_SYSV is called by the assembly routine once stack space +- has been allocated for the function's arguments. +- +- The stack layout we want looks like this: +- +- | Return address from ffi_call_SYSV 4bytes | higher addresses +- |--------------------------------------------| +- | Previous backchain pointer 4 | stack pointer here +- |--------------------------------------------|<+ <<< on entry to +- | Saved r28-r31 4*4 | | ffi_call_SYSV +- |--------------------------------------------| | +- | GPR registers r3-r10 8*4 | | ffi_call_SYSV +- |--------------------------------------------| | +- | FPR registers f1-f8 (optional) 8*8 | | +- |--------------------------------------------| | stack | +- | Space for copied structures | | grows | +- |--------------------------------------------| | down V +- | Parameters that didn't fit in registers | | +- |--------------------------------------------| | lower addresses +- | Space for callee's LR 4 | | +- |--------------------------------------------| | stack pointer here +- | Current backchain pointer 4 |-/ during +- |--------------------------------------------| <<< ffi_call_SYSV +- +-*/ +- +-void +-ffi_prep_args_SYSV (extended_cif *ecif, unsigned *const stack) ++/* Perform machine dependent cif processing */ ++ffi_status FFI_HIDDEN ++ffi_prep_cif_machdep (ffi_cif *cif) + { +- const unsigned bytes = ecif->cif->bytes; +- const unsigned flags = ecif->cif->flags; +- +- typedef union { +- char *c; +- unsigned *u; +- long long *ll; +- float *f; +- double *d; +- } valp; +- +- /* 'stacktop' points at the previous backchain pointer. */ +- valp stacktop; +- +- /* 'gpr_base' points at the space for gpr3, and grows upwards as +- we use GPR registers. */ +- valp gpr_base; +- int intarg_count; +- +-#ifndef __NO_FPRS__ +- /* 'fpr_base' points at the space for fpr1, and grows upwards as +- we use FPR registers. */ +- valp fpr_base; +- int fparg_count; ++#ifdef POWERPC64 ++ return ffi_prep_cif_linux64 (cif); ++#else ++ return ffi_prep_cif_sysv (cif); + #endif +- +- /* 'copy_space' grows down as we put structures in it. It should +- stay 16-byte aligned. */ +- valp copy_space; +- +- /* 'next_arg' grows up as we put parameters in it. */ +- valp next_arg; +- +- int i; +- ffi_type **ptr; +- union { +- void **v; +- char **c; +- signed char **sc; +- unsigned char **uc; +- signed short **ss; +- unsigned short **us; +- unsigned int **ui; +- long long **ll; +- float **f; +- double **d; +- } p_argv; +- size_t struct_copy_size; +- unsigned gprvalue; +- +- stacktop.c = (char *) stack + bytes; +- gpr_base.u = stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS; +- intarg_count = 0; +-#ifndef __NO_FPRS__ +- double double_tmp; +- fpr_base.d = gpr_base.d - NUM_FPR_ARG_REGISTERS; +- fparg_count = 0; +- copy_space.c = ((flags & FLAG_FP_ARGUMENTS) ? fpr_base.c : gpr_base.c); +-#else +- copy_space.c = gpr_base.c; +-#endif +- next_arg.u = stack + 2; +- +- /* Check that everything starts aligned properly. */ +- FFI_ASSERT (((unsigned long) (char *) stack & 0xF) == 0); +- FFI_ASSERT (((unsigned long) copy_space.c & 0xF) == 0); +- FFI_ASSERT (((unsigned long) stacktop.c & 0xF) == 0); +- FFI_ASSERT ((bytes & 0xF) == 0); +- FFI_ASSERT (copy_space.c >= next_arg.c); +- +- /* Deal with return values that are actually pass-by-reference. */ +- if (flags & FLAG_RETVAL_REFERENCE) +- { +- *gpr_base.u++ = (unsigned long) (char *) ecif->rvalue; +- intarg_count++; +- } +- +- /* Now for the arguments. */ +- p_argv.v = ecif->avalue; +- for (ptr = ecif->cif->arg_types, i = ecif->cif->nargs; +- i > 0; +- i--, ptr++, p_argv.v++) +- { +- unsigned short typenum = (*ptr)->type; +- +- /* We may need to handle some values depending on ABI */ +- if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT) { +- if (typenum == FFI_TYPE_FLOAT) +- typenum = FFI_TYPE_UINT32; +- if (typenum == FFI_TYPE_DOUBLE) +- typenum = FFI_TYPE_UINT64; +- if (typenum == FFI_TYPE_LONGDOUBLE) +- typenum = FFI_TYPE_UINT128; +- } else if (ecif->cif->abi != FFI_LINUX) { +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- if (typenum == FFI_TYPE_LONGDOUBLE) +- typenum = FFI_TYPE_STRUCT; +-#endif +- } +- +- /* Now test the translated value */ +- switch (typenum) { +-#ifndef __NO_FPRS__ +- case FFI_TYPE_FLOAT: +- /* With FFI_LINUX_SOFT_FLOAT floats are handled like UINT32. */ +- double_tmp = **p_argv.f; +- if (fparg_count >= NUM_FPR_ARG_REGISTERS) +- { +- *next_arg.f = (float) double_tmp; +- next_arg.u += 1; +- intarg_count++; +- } +- else +- *fpr_base.d++ = double_tmp; +- fparg_count++; +- FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); +- break; +- +- case FFI_TYPE_DOUBLE: +- /* With FFI_LINUX_SOFT_FLOAT doubles are handled like UINT64. */ +- double_tmp = **p_argv.d; +- +- if (fparg_count >= NUM_FPR_ARG_REGISTERS) +- { +- if (intarg_count >= NUM_GPR_ARG_REGISTERS +- && intarg_count % 2 != 0) +- { +- intarg_count++; +- next_arg.u++; +- } +- *next_arg.d = double_tmp; +- next_arg.u += 2; +- } +- else +- *fpr_base.d++ = double_tmp; +- fparg_count++; +- FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); +- break; +- +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- case FFI_TYPE_LONGDOUBLE: +- double_tmp = (*p_argv.d)[0]; +- +- if (fparg_count >= NUM_FPR_ARG_REGISTERS - 1) +- { +- if (intarg_count >= NUM_GPR_ARG_REGISTERS +- && intarg_count % 2 != 0) +- { +- intarg_count++; +- next_arg.u++; +- } +- *next_arg.d = double_tmp; +- next_arg.u += 2; +- double_tmp = (*p_argv.d)[1]; +- *next_arg.d = double_tmp; +- next_arg.u += 2; +- } +- else +- { +- *fpr_base.d++ = double_tmp; +- double_tmp = (*p_argv.d)[1]; +- *fpr_base.d++ = double_tmp; +- } +- +- fparg_count += 2; +- FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); +- break; +-#endif +-#endif /* have FPRs */ +- +- /* +- * The soft float ABI for long doubles works like this, a long double +- * is passed in four consecutive GPRs if available. A maximum of 2 +- * long doubles can be passed in gprs. If we do not have 4 GPRs +- * left, the long double is passed on the stack, 4-byte aligned. +- */ +- case FFI_TYPE_UINT128: { +- unsigned int int_tmp = (*p_argv.ui)[0]; +- unsigned int ii; +- if (intarg_count >= NUM_GPR_ARG_REGISTERS - 3) { +- if (intarg_count < NUM_GPR_ARG_REGISTERS) +- intarg_count += NUM_GPR_ARG_REGISTERS - intarg_count; +- *(next_arg.u++) = int_tmp; +- for (ii = 1; ii < 4; ii++) { +- int_tmp = (*p_argv.ui)[ii]; +- *(next_arg.u++) = int_tmp; +- } +- } else { +- *(gpr_base.u++) = int_tmp; +- for (ii = 1; ii < 4; ii++) { +- int_tmp = (*p_argv.ui)[ii]; +- *(gpr_base.u++) = int_tmp; +- } +- } +- intarg_count += 4; +- break; +- } +- +- case FFI_TYPE_UINT64: +- case FFI_TYPE_SINT64: +- if (intarg_count == NUM_GPR_ARG_REGISTERS-1) +- intarg_count++; +- if (intarg_count >= NUM_GPR_ARG_REGISTERS) +- { +- if (intarg_count % 2 != 0) +- { +- intarg_count++; +- next_arg.u++; +- } +- *next_arg.ll = **p_argv.ll; +- next_arg.u += 2; +- } +- else +- { +- /* whoops: abi states only certain register pairs +- * can be used for passing long long int +- * specifically (r3,r4), (r5,r6), (r7,r8), +- * (r9,r10) and if next arg is long long but +- * not correct starting register of pair then skip +- * until the proper starting register +- */ +- if (intarg_count % 2 != 0) +- { +- intarg_count ++; +- gpr_base.u++; +- } +- *gpr_base.ll++ = **p_argv.ll; +- } +- intarg_count += 2; +- break; +- +- case FFI_TYPE_STRUCT: +- struct_copy_size = ((*ptr)->size + 15) & ~0xF; +- copy_space.c -= struct_copy_size; +- memcpy (copy_space.c, *p_argv.c, (*ptr)->size); +- +- gprvalue = (unsigned long) copy_space.c; +- +- FFI_ASSERT (copy_space.c > next_arg.c); +- FFI_ASSERT (flags & FLAG_ARG_NEEDS_COPY); +- goto putgpr; +- +- case FFI_TYPE_UINT8: +- gprvalue = **p_argv.uc; +- goto putgpr; +- case FFI_TYPE_SINT8: +- gprvalue = **p_argv.sc; +- goto putgpr; +- case FFI_TYPE_UINT16: +- gprvalue = **p_argv.us; +- goto putgpr; +- case FFI_TYPE_SINT16: +- gprvalue = **p_argv.ss; +- goto putgpr; +- +- case FFI_TYPE_INT: +- case FFI_TYPE_UINT32: +- case FFI_TYPE_SINT32: +- case FFI_TYPE_POINTER: +- +- gprvalue = **p_argv.ui; +- +- putgpr: +- if (intarg_count >= NUM_GPR_ARG_REGISTERS) +- *next_arg.u++ = gprvalue; +- else +- *gpr_base.u++ = gprvalue; +- intarg_count++; +- break; +- } +- } +- +- /* Check that we didn't overrun the stack... */ +- FFI_ASSERT (copy_space.c >= next_arg.c); +- FFI_ASSERT (gpr_base.u <= stacktop.u - ASM_NEEDS_REGISTERS); +- /* The assert below is testing that the number of integer arguments agrees +- with the number found in ffi_prep_cif_machdep(). However, intarg_count +- is incremeneted whenever we place an FP arg on the stack, so account for +- that before our assert test. */ +-#ifndef __NO_FPRS__ +- if (fparg_count > NUM_FPR_ARG_REGISTERS) +- intarg_count -= fparg_count - NUM_FPR_ARG_REGISTERS; +- FFI_ASSERT (fpr_base.u +- <= stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS); +-#endif +- FFI_ASSERT (flags & FLAG_4_GPR_ARGUMENTS || intarg_count <= 4); + } + +-/* About the LINUX64 ABI. */ +-enum { +- NUM_GPR_ARG_REGISTERS64 = 8, +- NUM_FPR_ARG_REGISTERS64 = 13 +-}; +-enum { ASM_NEEDS_REGISTERS64 = 4 }; +- +-/* ffi_prep_args64 is called by the assembly routine once stack space +- has been allocated for the function's arguments. +- +- The stack layout we want looks like this: +- +- | Ret addr from ffi_call_LINUX64 8bytes | higher addresses +- |--------------------------------------------| +- | CR save area 8bytes | +- |--------------------------------------------| +- | Previous backchain pointer 8 | stack pointer here +- |--------------------------------------------|<+ <<< on entry to +- | Saved r28-r31 4*8 | | ffi_call_LINUX64 +- |--------------------------------------------| | +- | GPR registers r3-r10 8*8 | | +- |--------------------------------------------| | +- | FPR registers f1-f13 (optional) 13*8 | | +- |--------------------------------------------| | +- | Parameter save area | | +- |--------------------------------------------| | +- | TOC save area 8 | | +- |--------------------------------------------| | stack | +- | Linker doubleword 8 | | grows | +- |--------------------------------------------| | down V +- | Compiler doubleword 8 | | +- |--------------------------------------------| | lower addresses +- | Space for callee's LR 8 | | +- |--------------------------------------------| | +- | CR save area 8 | | +- |--------------------------------------------| | stack pointer here +- | Current backchain pointer 8 |-/ during +- |--------------------------------------------| <<< ffi_call_LINUX64 +- +-*/ +- +-void FFI_HIDDEN +-ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) ++ffi_status FFI_HIDDEN ++ffi_prep_cif_machdep_var (ffi_cif *cif, ++ unsigned int nfixedargs MAYBE_UNUSED, ++ unsigned int ntotalargs MAYBE_UNUSED) + { +- const unsigned long bytes = ecif->cif->bytes; +- const unsigned long flags = ecif->cif->flags; +- +- typedef union { +- char *c; +- unsigned long *ul; +- float *f; +- double *d; +- } valp; +- +- /* 'stacktop' points at the previous backchain pointer. */ +- valp stacktop; +- +- /* 'next_arg' points at the space for gpr3, and grows upwards as +- we use GPR registers, then continues at rest. */ +- valp gpr_base; +- valp gpr_end; +- valp rest; +- valp next_arg; +- +- /* 'fpr_base' points at the space for fpr3, and grows upwards as +- we use FPR registers. */ +- valp fpr_base; +- int fparg_count; +- +- int i, words; +- ffi_type **ptr; +- double double_tmp; +- union { +- void **v; +- char **c; +- signed char **sc; +- unsigned char **uc; +- signed short **ss; +- unsigned short **us; +- signed int **si; +- unsigned int **ui; +- unsigned long **ul; +- float **f; +- double **d; +- } p_argv; +- unsigned long gprvalue; +- +- stacktop.c = (char *) stack + bytes; +- gpr_base.ul = stacktop.ul - ASM_NEEDS_REGISTERS64 - NUM_GPR_ARG_REGISTERS64; +- gpr_end.ul = gpr_base.ul + NUM_GPR_ARG_REGISTERS64; +- rest.ul = stack + 6 + NUM_GPR_ARG_REGISTERS64; +- fpr_base.d = gpr_base.d - NUM_FPR_ARG_REGISTERS64; +- fparg_count = 0; +- next_arg.ul = gpr_base.ul; +- +- /* Check that everything starts aligned properly. */ +- FFI_ASSERT (((unsigned long) (char *) stack & 0xF) == 0); +- FFI_ASSERT (((unsigned long) stacktop.c & 0xF) == 0); +- FFI_ASSERT ((bytes & 0xF) == 0); +- +- /* Deal with return values that are actually pass-by-reference. */ +- if (flags & FLAG_RETVAL_REFERENCE) +- *next_arg.ul++ = (unsigned long) (char *) ecif->rvalue; +- +- /* Now for the arguments. */ +- p_argv.v = ecif->avalue; +- for (ptr = ecif->cif->arg_types, i = ecif->cif->nargs; +- i > 0; +- i--, ptr++, p_argv.v++) +- { +- switch ((*ptr)->type) +- { +- case FFI_TYPE_FLOAT: +- double_tmp = **p_argv.f; +- *next_arg.f = (float) double_tmp; +- if (++next_arg.ul == gpr_end.ul) +- next_arg.ul = rest.ul; +- if (fparg_count < NUM_FPR_ARG_REGISTERS64) +- *fpr_base.d++ = double_tmp; +- fparg_count++; +- FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); +- break; +- +- case FFI_TYPE_DOUBLE: +- double_tmp = **p_argv.d; +- *next_arg.d = double_tmp; +- if (++next_arg.ul == gpr_end.ul) +- next_arg.ul = rest.ul; +- if (fparg_count < NUM_FPR_ARG_REGISTERS64) +- *fpr_base.d++ = double_tmp; +- fparg_count++; +- FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); +- break; +- +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- case FFI_TYPE_LONGDOUBLE: +- double_tmp = (*p_argv.d)[0]; +- *next_arg.d = double_tmp; +- if (++next_arg.ul == gpr_end.ul) +- next_arg.ul = rest.ul; +- if (fparg_count < NUM_FPR_ARG_REGISTERS64) +- *fpr_base.d++ = double_tmp; +- fparg_count++; +- double_tmp = (*p_argv.d)[1]; +- *next_arg.d = double_tmp; +- if (++next_arg.ul == gpr_end.ul) +- next_arg.ul = rest.ul; +- if (fparg_count < NUM_FPR_ARG_REGISTERS64) +- *fpr_base.d++ = double_tmp; +- fparg_count++; +- FFI_ASSERT (__LDBL_MANT_DIG__ == 106); +- FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); +- break; ++#ifdef POWERPC64 ++ return ffi_prep_cif_linux64_var (cif, nfixedargs, ntotalargs); ++#else ++ return ffi_prep_cif_sysv (cif); + #endif +- +- case FFI_TYPE_STRUCT: +- words = ((*ptr)->size + 7) / 8; +- if (next_arg.ul >= gpr_base.ul && next_arg.ul + words > gpr_end.ul) +- { +- size_t first = gpr_end.c - next_arg.c; +- memcpy (next_arg.c, *p_argv.c, first); +- memcpy (rest.c, *p_argv.c + first, (*ptr)->size - first); +- next_arg.c = rest.c + words * 8 - first; +- } +- else +- { +- char *where = next_arg.c; +- +- /* Structures with size less than eight bytes are passed +- left-padded. */ +- if ((*ptr)->size < 8) +- where += 8 - (*ptr)->size; +- +- memcpy (where, *p_argv.c, (*ptr)->size); +- next_arg.ul += words; +- if (next_arg.ul == gpr_end.ul) +- next_arg.ul = rest.ul; +- } +- break; +- +- case FFI_TYPE_UINT8: +- gprvalue = **p_argv.uc; +- goto putgpr; +- case FFI_TYPE_SINT8: +- gprvalue = **p_argv.sc; +- goto putgpr; +- case FFI_TYPE_UINT16: +- gprvalue = **p_argv.us; +- goto putgpr; +- case FFI_TYPE_SINT16: +- gprvalue = **p_argv.ss; +- goto putgpr; +- case FFI_TYPE_UINT32: +- gprvalue = **p_argv.ui; +- goto putgpr; +- case FFI_TYPE_INT: +- case FFI_TYPE_SINT32: +- gprvalue = **p_argv.si; +- goto putgpr; +- +- case FFI_TYPE_UINT64: +- case FFI_TYPE_SINT64: +- case FFI_TYPE_POINTER: +- gprvalue = **p_argv.ul; +- putgpr: +- *next_arg.ul++ = gprvalue; +- if (next_arg.ul == gpr_end.ul) +- next_arg.ul = rest.ul; +- break; +- } +- } +- +- FFI_ASSERT (flags & FLAG_4_GPR_ARGUMENTS +- || (next_arg.ul >= gpr_base.ul +- && next_arg.ul <= gpr_base.ul + 4)); + } + +- +- +-/* Perform machine dependent cif processing */ +-ffi_status +-ffi_prep_cif_machdep (ffi_cif *cif) +-{ +- /* All this is for the SYSV and LINUX64 ABI. */ +- int i; +- ffi_type **ptr; +- unsigned bytes; +- int fparg_count = 0, intarg_count = 0; +- unsigned flags = 0; +- unsigned struct_copy_size = 0; +- unsigned type = cif->rtype->type; +- unsigned size = cif->rtype->size; +- +- if (cif->abi != FFI_LINUX64) +- { +- /* All the machine-independent calculation of cif->bytes will be wrong. +- Redo the calculation for SYSV. */ +- +- /* Space for the frame pointer, callee's LR, and the asm's temp regs. */ +- bytes = (2 + ASM_NEEDS_REGISTERS) * sizeof (int); +- +- /* Space for the GPR registers. */ +- bytes += NUM_GPR_ARG_REGISTERS * sizeof (int); +- } +- else +- { +- /* 64-bit ABI. */ +- +- /* Space for backchain, CR, LR, cc/ld doubleword, TOC and the asm's temp +- regs. */ +- bytes = (6 + ASM_NEEDS_REGISTERS64) * sizeof (long); +- +- /* Space for the mandatory parm save area and general registers. */ +- bytes += 2 * NUM_GPR_ARG_REGISTERS64 * sizeof (long); +- } +- +- /* Return value handling. The rules for SYSV are as follows: +- - 32-bit (or less) integer values are returned in gpr3; +- - Structures of size <= 4 bytes also returned in gpr3; +- - 64-bit integer values and structures between 5 and 8 bytes are returned +- in gpr3 and gpr4; +- - Single/double FP values are returned in fpr1; +- - Larger structures are allocated space and a pointer is passed as +- the first argument. +- - long doubles (if not equivalent to double) are returned in +- fpr1,fpr2 for Linux and as for large structs for SysV. +- For LINUX64: +- - integer values in gpr3; +- - Structures/Unions by reference; +- - Single/double FP values in fpr1, long double in fpr1,fpr2. +- - soft-float float/doubles are treated as UINT32/UINT64 respectivley. +- - soft-float long doubles are returned in gpr3-gpr6. */ +- /* First translate for softfloat/nonlinux */ +- if (cif->abi == FFI_LINUX_SOFT_FLOAT) { +- if (type == FFI_TYPE_FLOAT) +- type = FFI_TYPE_UINT32; +- if (type == FFI_TYPE_DOUBLE) +- type = FFI_TYPE_UINT64; +- if (type == FFI_TYPE_LONGDOUBLE) +- type = FFI_TYPE_UINT128; +- } else if (cif->abi != FFI_LINUX && cif->abi != FFI_LINUX64) { +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- if (type == FFI_TYPE_LONGDOUBLE) +- type = FFI_TYPE_STRUCT; +-#endif +- } +- +- switch (type) +- { +-#ifndef __NO_FPRS__ +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- case FFI_TYPE_LONGDOUBLE: +- flags |= FLAG_RETURNS_128BITS; +- /* Fall through. */ +-#endif +- case FFI_TYPE_DOUBLE: +- flags |= FLAG_RETURNS_64BITS; +- /* Fall through. */ +- case FFI_TYPE_FLOAT: +- flags |= FLAG_RETURNS_FP; +- break; +-#endif +- +- case FFI_TYPE_UINT128: +- flags |= FLAG_RETURNS_128BITS; +- /* Fall through. */ +- case FFI_TYPE_UINT64: +- case FFI_TYPE_SINT64: +- flags |= FLAG_RETURNS_64BITS; +- break; +- +- case FFI_TYPE_STRUCT: +- if (cif->abi == FFI_SYSV) +- { +- /* The final SYSV ABI says that structures smaller or equal 8 bytes +- are returned in r3/r4. The FFI_GCC_SYSV ABI instead returns them +- in memory. */ +- +- /* Treat structs with size <= 8 bytes. */ +- if (size <= 8) +- { +- flags |= FLAG_RETURNS_SMST; +- /* These structs are returned in r3. We pack the type and the +- precalculated shift value (needed in the sysv.S) into flags. +- The same applies for the structs returned in r3/r4. */ +- if (size <= 4) +- { +- flags |= FLAG_SYSV_SMST_R3; +- flags |= 8 * (4 - size) << 8; +- break; +- } +- /* These structs are returned in r3 and r4. See above. */ +- if (size <= 8) +- { +- flags |= FLAG_SYSV_SMST_R3 | FLAG_SYSV_SMST_R4; +- flags |= 8 * (8 - size) << 8; +- break; +- } +- } +- } +- +- intarg_count++; +- flags |= FLAG_RETVAL_REFERENCE; +- /* Fall through. */ +- case FFI_TYPE_VOID: +- flags |= FLAG_RETURNS_NOTHING; +- break; +- +- default: +- /* Returns 32-bit integer, or similar. Nothing to do here. */ +- break; +- } +- +- if (cif->abi != FFI_LINUX64) +- /* The first NUM_GPR_ARG_REGISTERS words of integer arguments, and the +- first NUM_FPR_ARG_REGISTERS fp arguments, go in registers; the rest +- goes on the stack. Structures and long doubles (if not equivalent +- to double) are passed as a pointer to a copy of the structure. +- Stuff on the stack needs to keep proper alignment. */ +- for (ptr = cif->arg_types, i = cif->nargs; i > 0; i--, ptr++) +- { +- unsigned short typenum = (*ptr)->type; +- +- /* We may need to handle some values depending on ABI */ +- if (cif->abi == FFI_LINUX_SOFT_FLOAT) { +- if (typenum == FFI_TYPE_FLOAT) +- typenum = FFI_TYPE_UINT32; +- if (typenum == FFI_TYPE_DOUBLE) +- typenum = FFI_TYPE_UINT64; +- if (typenum == FFI_TYPE_LONGDOUBLE) +- typenum = FFI_TYPE_UINT128; +- } else if (cif->abi != FFI_LINUX && cif->abi != FFI_LINUX64) { +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- if (typenum == FFI_TYPE_LONGDOUBLE) +- typenum = FFI_TYPE_STRUCT; +-#endif +- } +- +- switch (typenum) { +-#ifndef __NO_FPRS__ +- case FFI_TYPE_FLOAT: +- fparg_count++; +- /* floating singles are not 8-aligned on stack */ +- break; +- +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- case FFI_TYPE_LONGDOUBLE: +- fparg_count++; +- /* Fall thru */ +-#endif +- case FFI_TYPE_DOUBLE: +- fparg_count++; +- /* If this FP arg is going on the stack, it must be +- 8-byte-aligned. */ +- if (fparg_count > NUM_FPR_ARG_REGISTERS +- && intarg_count >= NUM_GPR_ARG_REGISTERS +- && intarg_count % 2 != 0) +- intarg_count++; +- break; +-#endif +- case FFI_TYPE_UINT128: +- /* +- * A long double in FFI_LINUX_SOFT_FLOAT can use only a set +- * of four consecutive gprs. If we do not have enough, we +- * have to adjust the intarg_count value. +- */ +- if (intarg_count >= NUM_GPR_ARG_REGISTERS - 3 +- && intarg_count < NUM_GPR_ARG_REGISTERS) +- intarg_count = NUM_GPR_ARG_REGISTERS; +- intarg_count += 4; +- break; +- +- case FFI_TYPE_UINT64: +- case FFI_TYPE_SINT64: +- /* 'long long' arguments are passed as two words, but +- either both words must fit in registers or both go +- on the stack. If they go on the stack, they must +- be 8-byte-aligned. +- +- Also, only certain register pairs can be used for +- passing long long int -- specifically (r3,r4), (r5,r6), +- (r7,r8), (r9,r10). +- */ +- if (intarg_count == NUM_GPR_ARG_REGISTERS-1 +- || intarg_count % 2 != 0) +- intarg_count++; +- intarg_count += 2; +- break; +- +- case FFI_TYPE_STRUCT: +- /* We must allocate space for a copy of these to enforce +- pass-by-value. Pad the space up to a multiple of 16 +- bytes (the maximum alignment required for anything under +- the SYSV ABI). */ +- struct_copy_size += ((*ptr)->size + 15) & ~0xF; +- /* Fall through (allocate space for the pointer). */ +- +- case FFI_TYPE_POINTER: +- case FFI_TYPE_INT: +- case FFI_TYPE_UINT32: +- case FFI_TYPE_SINT32: +- case FFI_TYPE_UINT16: +- case FFI_TYPE_SINT16: +- case FFI_TYPE_UINT8: +- case FFI_TYPE_SINT8: +- /* Everything else is passed as a 4-byte word in a GPR, either +- the object itself or a pointer to it. */ +- intarg_count++; +- break; +- default: +- FFI_ASSERT (0); +- } +- } +- else +- for (ptr = cif->arg_types, i = cif->nargs; i > 0; i--, ptr++) +- { +- switch ((*ptr)->type) +- { +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- case FFI_TYPE_LONGDOUBLE: +- if (cif->abi == FFI_LINUX_SOFT_FLOAT) +- intarg_count += 4; +- else +- { +- fparg_count += 2; +- intarg_count += 2; +- } +- break; +-#endif +- case FFI_TYPE_FLOAT: +- case FFI_TYPE_DOUBLE: +- fparg_count++; +- intarg_count++; +- break; +- +- case FFI_TYPE_STRUCT: +- intarg_count += ((*ptr)->size + 7) / 8; +- break; +- +- case FFI_TYPE_POINTER: +- case FFI_TYPE_UINT64: +- case FFI_TYPE_SINT64: +- case FFI_TYPE_INT: +- case FFI_TYPE_UINT32: +- case FFI_TYPE_SINT32: +- case FFI_TYPE_UINT16: +- case FFI_TYPE_SINT16: +- case FFI_TYPE_UINT8: +- case FFI_TYPE_SINT8: +- /* Everything else is passed as a 8-byte word in a GPR, either +- the object itself or a pointer to it. */ +- intarg_count++; +- break; +- default: +- FFI_ASSERT (0); +- } +- } +- +-#ifndef __NO_FPRS__ +- if (fparg_count != 0) +- flags |= FLAG_FP_ARGUMENTS; +-#endif +- if (intarg_count > 4) +- flags |= FLAG_4_GPR_ARGUMENTS; +- if (struct_copy_size != 0) +- flags |= FLAG_ARG_NEEDS_COPY; +- +- if (cif->abi != FFI_LINUX64) +- { +-#ifndef __NO_FPRS__ +- /* Space for the FPR registers, if needed. */ +- if (fparg_count != 0) +- bytes += NUM_FPR_ARG_REGISTERS * sizeof (double); +-#endif +- +- /* Stack space. */ +- if (intarg_count > NUM_GPR_ARG_REGISTERS) +- bytes += (intarg_count - NUM_GPR_ARG_REGISTERS) * sizeof (int); +-#ifndef __NO_FPRS__ +- if (fparg_count > NUM_FPR_ARG_REGISTERS) +- bytes += (fparg_count - NUM_FPR_ARG_REGISTERS) * sizeof (double); +-#endif +- } +- else +- { +-#ifndef __NO_FPRS__ +- /* Space for the FPR registers, if needed. */ +- if (fparg_count != 0) +- bytes += NUM_FPR_ARG_REGISTERS64 * sizeof (double); +-#endif +- +- /* Stack space. */ +- if (intarg_count > NUM_GPR_ARG_REGISTERS64) +- bytes += (intarg_count - NUM_GPR_ARG_REGISTERS64) * sizeof (long); +- } +- +- /* The stack space allocated needs to be a multiple of 16 bytes. */ +- bytes = (bytes + 15) & ~0xF; +- +- /* Add in the space for the copied structures. */ +- bytes += struct_copy_size; +- +- cif->flags = flags; +- cif->bytes = bytes; +- +- return FFI_OK; +-} +- +-extern void ffi_call_SYSV(extended_cif *, unsigned, unsigned, unsigned *, +- void (*fn)(void)); +-extern void FFI_HIDDEN ffi_call_LINUX64(extended_cif *, unsigned long, +- unsigned long, unsigned long *, +- void (*fn)(void)); +- + void + ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue) + { +- /* +- * The final SYSV ABI says that structures smaller or equal 8 bytes +- * are returned in r3/r4. The FFI_GCC_SYSV ABI instead returns them +- * in memory. +- * +- * Just to keep things simple for the assembly code, we will always +- * bounce-buffer struct return values less than or equal to 8 bytes. +- * This allows the ASM to handle SYSV small structures by directly +- * writing r3 and r4 to memory without worrying about struct size. +- */ +- unsigned int smst_buffer[2]; ++ /* The final SYSV ABI says that structures smaller or equal 8 bytes ++ are returned in r3/r4. A draft ABI used by linux instead returns ++ them in memory. ++ ++ We bounce-buffer SYSV small struct return values so that sysv.S ++ can write r3 and r4 to memory without worrying about struct size. ++ ++ For ELFv2 ABI, use a bounce buffer for homogeneous structs too, ++ for similar reasons. */ ++ unsigned long smst_buffer[8]; + extended_cif ecif; +- unsigned int rsize = 0; + + ecif.cif = cif; + ecif.avalue = avalue; + +- /* Ensure that we have a valid struct return value */ + ecif.rvalue = rvalue; +- if (cif->rtype->type == FFI_TYPE_STRUCT) { +- rsize = cif->rtype->size; +- if (rsize <= 8) +- ecif.rvalue = smst_buffer; +- else if (!rvalue) +- ecif.rvalue = alloca(rsize); +- } ++ if ((cif->flags & FLAG_RETURNS_SMST) != 0) ++ ecif.rvalue = smst_buffer; ++ /* Ensure that we have a valid struct return value. ++ FIXME: Isn't this just papering over a user problem? */ ++ else if (!rvalue && cif->rtype->type == FFI_TYPE_STRUCT) ++ ecif.rvalue = alloca (cif->rtype->size); + +- switch (cif->abi) +- { +-#ifndef POWERPC64 +-# ifndef __NO_FPRS__ +- case FFI_SYSV: +- case FFI_GCC_SYSV: +- case FFI_LINUX: +-# endif +- case FFI_LINUX_SOFT_FLOAT: +- ffi_call_SYSV (&ecif, -cif->bytes, cif->flags, ecif.rvalue, fn); +- break; ++#ifdef POWERPC64 ++ ffi_call_LINUX64 (&ecif, -(long) cif->bytes, cif->flags, ecif.rvalue, fn); + #else +- case FFI_LINUX64: +- ffi_call_LINUX64 (&ecif, -(long) cif->bytes, cif->flags, ecif.rvalue, fn); +- break; ++ ffi_call_SYSV (&ecif, -cif->bytes, cif->flags, ecif.rvalue, fn); + #endif +- default: +- FFI_ASSERT (0); +- break; +- } + + /* Check for a bounce-buffered return value */ + if (rvalue && ecif.rvalue == smst_buffer) +- memcpy(rvalue, smst_buffer, rsize); ++ { ++ unsigned int rsize = cif->rtype->size; ++#ifndef __LITTLE_ENDIAN__ ++ /* The SYSV ABI returns a structure of up to 4 bytes in size ++ left-padded in r3. */ ++# ifndef POWERPC64 ++ if (rsize <= 4) ++ memcpy (rvalue, (char *) smst_buffer + 4 - rsize, rsize); ++ else ++# endif ++ /* The SYSV ABI returns a structure of up to 8 bytes in size ++ left-padded in r3/r4, and the ELFv2 ABI similarly returns a ++ structure of up to 8 bytes in size left-padded in r3. */ ++ if (rsize <= 8) ++ memcpy (rvalue, (char *) smst_buffer + 8 - rsize, rsize); ++ else ++#endif ++ memcpy (rvalue, smst_buffer, rsize); ++ } + } + + +-#ifndef POWERPC64 +-#define MIN_CACHE_LINE_SIZE 8 +- +-static void +-flush_icache (char *wraddr, char *xaddr, int size) +-{ +- int i; +- for (i = 0; i < size; i += MIN_CACHE_LINE_SIZE) +- __asm__ volatile ("icbi 0,%0;" "dcbf 0,%1;" +- : : "r" (xaddr + i), "r" (wraddr + i) : "memory"); +- __asm__ volatile ("icbi 0,%0;" "dcbf 0,%1;" "sync;" "isync;" +- : : "r"(xaddr + size - 1), "r"(wraddr + size - 1) +- : "memory"); +-} +-#endif +- + ffi_status + ffi_prep_closure_loc (ffi_closure *closure, + ffi_cif *cif, +@@ -1020,480 +134,8 @@ + void *codeloc) + { + #ifdef POWERPC64 +- void **tramp = (void **) &closure->tramp[0]; +- +- if (cif->abi != FFI_LINUX64) +- return FFI_BAD_ABI; +- /* Copy function address and TOC from ffi_closure_LINUX64. */ +- memcpy (tramp, (char *) ffi_closure_LINUX64, 16); +- tramp[2] = codeloc; ++ return ffi_prep_closure_loc_linux64 (closure, cif, fun, user_data, codeloc); + #else +- unsigned int *tramp; +- +- if (! (cif->abi == FFI_GCC_SYSV +- || cif->abi == FFI_SYSV +- || cif->abi == FFI_LINUX +- || cif->abi == FFI_LINUX_SOFT_FLOAT)) +- return FFI_BAD_ABI; +- +- tramp = (unsigned int *) &closure->tramp[0]; +- tramp[0] = 0x7c0802a6; /* mflr r0 */ +- tramp[1] = 0x4800000d; /* bl 10 */ +- tramp[4] = 0x7d6802a6; /* mflr r11 */ +- tramp[5] = 0x7c0803a6; /* mtlr r0 */ +- tramp[6] = 0x800b0000; /* lwz r0,0(r11) */ +- tramp[7] = 0x816b0004; /* lwz r11,4(r11) */ +- tramp[8] = 0x7c0903a6; /* mtctr r0 */ +- tramp[9] = 0x4e800420; /* bctr */ +- *(void **) &tramp[2] = (void *) ffi_closure_SYSV; /* function */ +- *(void **) &tramp[3] = codeloc; /* context */ +- +- /* Flush the icache. */ +- flush_icache ((char *)tramp, (char *)codeloc, FFI_TRAMPOLINE_SIZE); ++ return ffi_prep_closure_loc_sysv (closure, cif, fun, user_data, codeloc); + #endif +- +- closure->cif = cif; +- closure->fun = fun; +- closure->user_data = user_data; +- +- return FFI_OK; + } +- +-typedef union +-{ +- float f; +- double d; +-} ffi_dblfl; +- +-int ffi_closure_helper_SYSV (ffi_closure *, void *, unsigned long *, +- ffi_dblfl *, unsigned long *); +- +-/* Basically the trampoline invokes ffi_closure_SYSV, and on +- * entry, r11 holds the address of the closure. +- * After storing the registers that could possibly contain +- * parameters to be passed into the stack frame and setting +- * up space for a return value, ffi_closure_SYSV invokes the +- * following helper function to do most of the work +- */ +- +-int +-ffi_closure_helper_SYSV (ffi_closure *closure, void *rvalue, +- unsigned long *pgr, ffi_dblfl *pfr, +- unsigned long *pst) +-{ +- /* rvalue is the pointer to space for return value in closure assembly */ +- /* pgr is the pointer to where r3-r10 are stored in ffi_closure_SYSV */ +- /* pfr is the pointer to where f1-f8 are stored in ffi_closure_SYSV */ +- /* pst is the pointer to outgoing parameter stack in original caller */ +- +- void ** avalue; +- ffi_type ** arg_types; +- long i, avn; +-#ifndef __NO_FPRS__ +- long nf = 0; /* number of floating registers already used */ +-#endif +- long ng = 0; /* number of general registers already used */ +- +- ffi_cif *cif = closure->cif; +- unsigned size = cif->rtype->size; +- unsigned short rtypenum = cif->rtype->type; +- +- avalue = alloca (cif->nargs * sizeof (void *)); +- +- /* First translate for softfloat/nonlinux */ +- if (cif->abi == FFI_LINUX_SOFT_FLOAT) { +- if (rtypenum == FFI_TYPE_FLOAT) +- rtypenum = FFI_TYPE_UINT32; +- if (rtypenum == FFI_TYPE_DOUBLE) +- rtypenum = FFI_TYPE_UINT64; +- if (rtypenum == FFI_TYPE_LONGDOUBLE) +- rtypenum = FFI_TYPE_UINT128; +- } else if (cif->abi != FFI_LINUX && cif->abi != FFI_LINUX64) { +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- if (rtypenum == FFI_TYPE_LONGDOUBLE) +- rtypenum = FFI_TYPE_STRUCT; +-#endif +- } +- +- +- /* Copy the caller's structure return value address so that the closure +- returns the data directly to the caller. +- For FFI_SYSV the result is passed in r3/r4 if the struct size is less +- or equal 8 bytes. */ +- if (rtypenum == FFI_TYPE_STRUCT && ((cif->abi != FFI_SYSV) || (size > 8))) { +- rvalue = (void *) *pgr; +- ng++; +- pgr++; +- } +- +- i = 0; +- avn = cif->nargs; +- arg_types = cif->arg_types; +- +- /* Grab the addresses of the arguments from the stack frame. */ +- while (i < avn) { +- unsigned short typenum = arg_types[i]->type; +- +- /* We may need to handle some values depending on ABI */ +- if (cif->abi == FFI_LINUX_SOFT_FLOAT) { +- if (typenum == FFI_TYPE_FLOAT) +- typenum = FFI_TYPE_UINT32; +- if (typenum == FFI_TYPE_DOUBLE) +- typenum = FFI_TYPE_UINT64; +- if (typenum == FFI_TYPE_LONGDOUBLE) +- typenum = FFI_TYPE_UINT128; +- } else if (cif->abi != FFI_LINUX && cif->abi != FFI_LINUX64) { +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- if (typenum == FFI_TYPE_LONGDOUBLE) +- typenum = FFI_TYPE_STRUCT; +-#endif +- } +- +- switch (typenum) { +-#ifndef __NO_FPRS__ +- case FFI_TYPE_FLOAT: +- /* unfortunately float values are stored as doubles +- * in the ffi_closure_SYSV code (since we don't check +- * the type in that routine). +- */ +- +- /* there are 8 64bit floating point registers */ +- +- if (nf < 8) +- { +- double temp = pfr->d; +- pfr->f = (float) temp; +- avalue[i] = pfr; +- nf++; +- pfr++; +- } +- else +- { +- /* FIXME? here we are really changing the values +- * stored in the original calling routines outgoing +- * parameter stack. This is probably a really +- * naughty thing to do but... +- */ +- avalue[i] = pst; +- pst += 1; +- } +- break; +- +- case FFI_TYPE_DOUBLE: +- /* On the outgoing stack all values are aligned to 8 */ +- /* there are 8 64bit floating point registers */ +- +- if (nf < 8) +- { +- avalue[i] = pfr; +- nf++; +- pfr++; +- } +- else +- { +- if (((long) pst) & 4) +- pst++; +- avalue[i] = pst; +- pst += 2; +- } +- break; +- +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- case FFI_TYPE_LONGDOUBLE: +- if (nf < 7) +- { +- avalue[i] = pfr; +- pfr += 2; +- nf += 2; +- } +- else +- { +- if (((long) pst) & 4) +- pst++; +- avalue[i] = pst; +- pst += 4; +- nf = 8; +- } +- break; +-#endif +-#endif /* have FPRS */ +- +- case FFI_TYPE_UINT128: +- /* +- * Test if for the whole long double, 4 gprs are available. +- * otherwise the stuff ends up on the stack. +- */ +- if (ng < 5) { +- avalue[i] = pgr; +- pgr += 4; +- ng += 4; +- } else { +- avalue[i] = pst; +- pst += 4; +- ng = 8+4; +- } +- break; +- +- case FFI_TYPE_SINT8: +- case FFI_TYPE_UINT8: +- /* there are 8 gpr registers used to pass values */ +- if (ng < 8) +- { +- avalue[i] = (char *) pgr + 3; +- ng++; +- pgr++; +- } +- else +- { +- avalue[i] = (char *) pst + 3; +- pst++; +- } +- break; +- +- case FFI_TYPE_SINT16: +- case FFI_TYPE_UINT16: +- /* there are 8 gpr registers used to pass values */ +- if (ng < 8) +- { +- avalue[i] = (char *) pgr + 2; +- ng++; +- pgr++; +- } +- else +- { +- avalue[i] = (char *) pst + 2; +- pst++; +- } +- break; +- +- case FFI_TYPE_SINT32: +- case FFI_TYPE_UINT32: +- case FFI_TYPE_POINTER: +- /* there are 8 gpr registers used to pass values */ +- if (ng < 8) +- { +- avalue[i] = pgr; +- ng++; +- pgr++; +- } +- else +- { +- avalue[i] = pst; +- pst++; +- } +- break; +- +- case FFI_TYPE_STRUCT: +- /* Structs are passed by reference. The address will appear in a +- gpr if it is one of the first 8 arguments. */ +- if (ng < 8) +- { +- avalue[i] = (void *) *pgr; +- ng++; +- pgr++; +- } +- else +- { +- avalue[i] = (void *) *pst; +- pst++; +- } +- break; +- +- case FFI_TYPE_SINT64: +- case FFI_TYPE_UINT64: +- /* passing long long ints are complex, they must +- * be passed in suitable register pairs such as +- * (r3,r4) or (r5,r6) or (r6,r7), or (r7,r8) or (r9,r10) +- * and if the entire pair aren't available then the outgoing +- * parameter stack is used for both but an alignment of 8 +- * must will be kept. So we must either look in pgr +- * or pst to find the correct address for this type +- * of parameter. +- */ +- if (ng < 7) +- { +- if (ng & 0x01) +- { +- /* skip r4, r6, r8 as starting points */ +- ng++; +- pgr++; +- } +- avalue[i] = pgr; +- ng += 2; +- pgr += 2; +- } +- else +- { +- if (((long) pst) & 4) +- pst++; +- avalue[i] = pst; +- pst += 2; +- ng = 8; +- } +- break; +- +- default: +- FFI_ASSERT (0); +- } +- +- i++; +- } +- +- +- (closure->fun) (cif, rvalue, avalue, closure->user_data); +- +- /* Tell ffi_closure_SYSV how to perform return type promotions. +- Because the FFI_SYSV ABI returns the structures <= 8 bytes in r3/r4 +- we have to tell ffi_closure_SYSV how to treat them. We combine the base +- type FFI_SYSV_TYPE_SMALL_STRUCT - 1 with the size of the struct. +- So a one byte struct gets the return type 16. Return type 1 to 15 are +- already used and we never have a struct with size zero. That is the reason +- for the subtraction of 1. See the comment in ffitarget.h about ordering. +- */ +- if (cif->abi == FFI_SYSV && rtypenum == FFI_TYPE_STRUCT && size <= 8) +- return (FFI_SYSV_TYPE_SMALL_STRUCT - 1) + size; +- return rtypenum; +-} +- +-int FFI_HIDDEN ffi_closure_helper_LINUX64 (ffi_closure *, void *, +- unsigned long *, ffi_dblfl *); +- +-int FFI_HIDDEN +-ffi_closure_helper_LINUX64 (ffi_closure *closure, void *rvalue, +- unsigned long *pst, ffi_dblfl *pfr) +-{ +- /* rvalue is the pointer to space for return value in closure assembly */ +- /* pst is the pointer to parameter save area +- (r3-r10 are stored into its first 8 slots by ffi_closure_LINUX64) */ +- /* pfr is the pointer to where f1-f13 are stored in ffi_closure_LINUX64 */ +- +- void **avalue; +- ffi_type **arg_types; +- long i, avn; +- ffi_cif *cif; +- ffi_dblfl *end_pfr = pfr + NUM_FPR_ARG_REGISTERS64; +- +- cif = closure->cif; +- avalue = alloca (cif->nargs * sizeof (void *)); +- +- /* Copy the caller's structure return value address so that the closure +- returns the data directly to the caller. */ +- if (cif->rtype->type == FFI_TYPE_STRUCT) +- { +- rvalue = (void *) *pst; +- pst++; +- } +- +- i = 0; +- avn = cif->nargs; +- arg_types = cif->arg_types; +- +- /* Grab the addresses of the arguments from the stack frame. */ +- while (i < avn) +- { +- switch (arg_types[i]->type) +- { +- case FFI_TYPE_SINT8: +- case FFI_TYPE_UINT8: +- avalue[i] = (char *) pst + 7; +- pst++; +- break; +- +- case FFI_TYPE_SINT16: +- case FFI_TYPE_UINT16: +- avalue[i] = (char *) pst + 6; +- pst++; +- break; +- +- case FFI_TYPE_SINT32: +- case FFI_TYPE_UINT32: +- avalue[i] = (char *) pst + 4; +- pst++; +- break; +- +- case FFI_TYPE_SINT64: +- case FFI_TYPE_UINT64: +- case FFI_TYPE_POINTER: +- avalue[i] = pst; +- pst++; +- break; +- +- case FFI_TYPE_STRUCT: +- /* Structures with size less than eight bytes are passed +- left-padded. */ +- if (arg_types[i]->size < 8) +- avalue[i] = (char *) pst + 8 - arg_types[i]->size; +- else +- avalue[i] = pst; +- pst += (arg_types[i]->size + 7) / 8; +- break; +- +- case FFI_TYPE_FLOAT: +- /* unfortunately float values are stored as doubles +- * in the ffi_closure_LINUX64 code (since we don't check +- * the type in that routine). +- */ +- +- /* there are 13 64bit floating point registers */ +- +- if (pfr < end_pfr) +- { +- double temp = pfr->d; +- pfr->f = (float) temp; +- avalue[i] = pfr; +- pfr++; +- } +- else +- avalue[i] = pst; +- pst++; +- break; +- +- case FFI_TYPE_DOUBLE: +- /* On the outgoing stack all values are aligned to 8 */ +- /* there are 13 64bit floating point registers */ +- +- if (pfr < end_pfr) +- { +- avalue[i] = pfr; +- pfr++; +- } +- else +- avalue[i] = pst; +- pst++; +- break; +- +-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE +- case FFI_TYPE_LONGDOUBLE: +- if (pfr + 1 < end_pfr) +- { +- avalue[i] = pfr; +- pfr += 2; +- } +- else +- { +- if (pfr < end_pfr) +- { +- /* Passed partly in f13 and partly on the stack. +- Move it all to the stack. */ +- *pst = *(unsigned long *) pfr; +- pfr++; +- } +- avalue[i] = pst; +- } +- pst += 2; +- break; +-#endif +- +- default: +- FFI_ASSERT (0); +- } +- +- i++; +- } +- +- +- (closure->fun) (cif, rvalue, avalue, closure->user_data); +- +- /* Tell ffi_closure_LINUX64 how to perform return type promotions. */ +- return cif->rtype->type; +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c +--- a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c ++++ b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c +@@ -593,7 +593,7 @@ + /* Natural alignment for all items. */ + align = p->alignment; + #else +- /* Natrual alignment for the first item... */ ++ /* Natural alignment for the first item... */ + if (i == 0) + align = p->alignment; + else if (p->alignment == 16 || p->alignment < 4) +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/ffi_linux64.c +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/powerpc/ffi_linux64.c +@@ -0,0 +1,943 @@ ++/* ----------------------------------------------------------------------- ++ ffi_linux64.c - Copyright (C) 2013 IBM ++ Copyright (C) 2011 Anthony Green ++ Copyright (C) 2011 Kyle Moffett ++ Copyright (C) 2008 Red Hat, Inc ++ Copyright (C) 2007, 2008 Free Software Foundation, Inc ++ Copyright (c) 1998 Geoffrey Keating ++ ++ PowerPC Foreign Function Interface ++ ++ Permission is hereby granted, free of charge, to any person obtaining ++ a copy of this software and associated documentation files (the ++ ``Software''), to deal in the Software without restriction, including ++ without limitation the rights to use, copy, modify, merge, publish, ++ distribute, sublicense, and/or sell copies of the Software, and to ++ permit persons to whom the Software is furnished to do so, subject to ++ the following conditions: ++ ++ The above copyright notice and this permission notice shall be included ++ in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ OTHER DEALINGS IN THE SOFTWARE. ++ ----------------------------------------------------------------------- */ ++ ++#include "ffi.h" ++ ++#ifdef POWERPC64 ++#include "ffi_common.h" ++#include "ffi_powerpc.h" ++ ++ ++/* About the LINUX64 ABI. */ ++enum { ++ NUM_GPR_ARG_REGISTERS64 = 8, ++ NUM_FPR_ARG_REGISTERS64 = 13 ++}; ++enum { ASM_NEEDS_REGISTERS64 = 4 }; ++ ++ ++#if HAVE_LONG_DOUBLE_VARIANT && FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++/* Adjust size of ffi_type_longdouble. */ ++void FFI_HIDDEN ++ffi_prep_types_linux64 (ffi_abi abi) ++{ ++ if ((abi & (FFI_LINUX | FFI_LINUX_LONG_DOUBLE_128)) == FFI_LINUX) ++ { ++ ffi_type_longdouble.size = 8; ++ ffi_type_longdouble.alignment = 8; ++ } ++ else ++ { ++ ffi_type_longdouble.size = 16; ++ ffi_type_longdouble.alignment = 16; ++ } ++} ++#endif ++ ++ ++#if _CALL_ELF == 2 ++static unsigned int ++discover_homogeneous_aggregate (const ffi_type *t, unsigned int *elnum) ++{ ++ switch (t->type) ++ { ++ case FFI_TYPE_FLOAT: ++ case FFI_TYPE_DOUBLE: ++ *elnum = 1; ++ return (int) t->type; ++ ++ case FFI_TYPE_STRUCT:; ++ { ++ unsigned int base_elt = 0, total_elnum = 0; ++ ffi_type **el = t->elements; ++ while (*el) ++ { ++ unsigned int el_elt, el_elnum = 0; ++ el_elt = discover_homogeneous_aggregate (*el, &el_elnum); ++ if (el_elt == 0 ++ || (base_elt && base_elt != el_elt)) ++ return 0; ++ base_elt = el_elt; ++ total_elnum += el_elnum; ++ if (total_elnum > 8) ++ return 0; ++ el++; ++ } ++ *elnum = total_elnum; ++ return base_elt; ++ } ++ ++ default: ++ return 0; ++ } ++} ++#endif ++ ++ ++/* Perform machine dependent cif processing */ ++static ffi_status ++ffi_prep_cif_linux64_core (ffi_cif *cif) ++{ ++ ffi_type **ptr; ++ unsigned bytes; ++ unsigned i, fparg_count = 0, intarg_count = 0; ++ unsigned flags = cif->flags; ++#if _CALL_ELF == 2 ++ unsigned int elt, elnum; ++#endif ++ ++#if FFI_TYPE_LONGDOUBLE == FFI_TYPE_DOUBLE ++ /* If compiled without long double support.. */ ++ if ((cif->abi & FFI_LINUX_LONG_DOUBLE_128) != 0) ++ return FFI_BAD_ABI; ++#endif ++ ++ /* The machine-independent calculation of cif->bytes doesn't work ++ for us. Redo the calculation. */ ++#if _CALL_ELF == 2 ++ /* Space for backchain, CR, LR, TOC and the asm's temp regs. */ ++ bytes = (4 + ASM_NEEDS_REGISTERS64) * sizeof (long); ++ ++ /* Space for the general registers. */ ++ bytes += NUM_GPR_ARG_REGISTERS64 * sizeof (long); ++#else ++ /* Space for backchain, CR, LR, cc/ld doubleword, TOC and the asm's temp ++ regs. */ ++ bytes = (6 + ASM_NEEDS_REGISTERS64) * sizeof (long); ++ ++ /* Space for the mandatory parm save area and general registers. */ ++ bytes += 2 * NUM_GPR_ARG_REGISTERS64 * sizeof (long); ++#endif ++ ++ /* Return value handling. */ ++ switch (cif->rtype->type) ++ { ++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++ case FFI_TYPE_LONGDOUBLE: ++ if ((cif->abi & FFI_LINUX_LONG_DOUBLE_128) != 0) ++ flags |= FLAG_RETURNS_128BITS; ++ /* Fall through. */ ++#endif ++ case FFI_TYPE_DOUBLE: ++ flags |= FLAG_RETURNS_64BITS; ++ /* Fall through. */ ++ case FFI_TYPE_FLOAT: ++ flags |= FLAG_RETURNS_FP; ++ break; ++ ++ case FFI_TYPE_UINT128: ++ flags |= FLAG_RETURNS_128BITS; ++ /* Fall through. */ ++ case FFI_TYPE_UINT64: ++ case FFI_TYPE_SINT64: ++ flags |= FLAG_RETURNS_64BITS; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++#if _CALL_ELF == 2 ++ elt = discover_homogeneous_aggregate (cif->rtype, &elnum); ++ if (elt) ++ { ++ if (elt == FFI_TYPE_DOUBLE) ++ flags |= FLAG_RETURNS_64BITS; ++ flags |= FLAG_RETURNS_FP | FLAG_RETURNS_SMST; ++ break; ++ } ++ if (cif->rtype->size <= 16) ++ { ++ flags |= FLAG_RETURNS_SMST; ++ break; ++ } ++#endif ++ intarg_count++; ++ flags |= FLAG_RETVAL_REFERENCE; ++ /* Fall through. */ ++ case FFI_TYPE_VOID: ++ flags |= FLAG_RETURNS_NOTHING; ++ break; ++ ++ default: ++ /* Returns 32-bit integer, or similar. Nothing to do here. */ ++ break; ++ } ++ ++ for (ptr = cif->arg_types, i = cif->nargs; i > 0; i--, ptr++) ++ { ++ unsigned int align; ++ ++ switch ((*ptr)->type) ++ { ++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++ case FFI_TYPE_LONGDOUBLE: ++ if ((cif->abi & FFI_LINUX_LONG_DOUBLE_128) != 0) ++ { ++ fparg_count++; ++ intarg_count++; ++ } ++ /* Fall through. */ ++#endif ++ case FFI_TYPE_DOUBLE: ++ case FFI_TYPE_FLOAT: ++ fparg_count++; ++ intarg_count++; ++ if (fparg_count > NUM_FPR_ARG_REGISTERS64) ++ flags |= FLAG_ARG_NEEDS_PSAVE; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ if ((cif->abi & FFI_LINUX_STRUCT_ALIGN) != 0) ++ { ++ align = (*ptr)->alignment; ++ if (align > 16) ++ align = 16; ++ align = align / 8; ++ if (align > 1) ++ intarg_count = ALIGN (intarg_count, align); ++ } ++ intarg_count += ((*ptr)->size + 7) / 8; ++#if _CALL_ELF == 2 ++ elt = discover_homogeneous_aggregate (*ptr, &elnum); ++ if (elt) ++ { ++ fparg_count += elnum; ++ if (fparg_count > NUM_FPR_ARG_REGISTERS64) ++ flags |= FLAG_ARG_NEEDS_PSAVE; ++ } ++ else ++#endif ++ { ++ if (intarg_count > NUM_GPR_ARG_REGISTERS64) ++ flags |= FLAG_ARG_NEEDS_PSAVE; ++ } ++ break; ++ ++ case FFI_TYPE_POINTER: ++ case FFI_TYPE_UINT64: ++ case FFI_TYPE_SINT64: ++ case FFI_TYPE_INT: ++ case FFI_TYPE_UINT32: ++ case FFI_TYPE_SINT32: ++ case FFI_TYPE_UINT16: ++ case FFI_TYPE_SINT16: ++ case FFI_TYPE_UINT8: ++ case FFI_TYPE_SINT8: ++ /* Everything else is passed as a 8-byte word in a GPR, either ++ the object itself or a pointer to it. */ ++ intarg_count++; ++ if (intarg_count > NUM_GPR_ARG_REGISTERS64) ++ flags |= FLAG_ARG_NEEDS_PSAVE; ++ break; ++ default: ++ FFI_ASSERT (0); ++ } ++ } ++ ++ if (fparg_count != 0) ++ flags |= FLAG_FP_ARGUMENTS; ++ if (intarg_count > 4) ++ flags |= FLAG_4_GPR_ARGUMENTS; ++ ++ /* Space for the FPR registers, if needed. */ ++ if (fparg_count != 0) ++ bytes += NUM_FPR_ARG_REGISTERS64 * sizeof (double); ++ ++ /* Stack space. */ ++#if _CALL_ELF == 2 ++ if ((flags & FLAG_ARG_NEEDS_PSAVE) != 0) ++ bytes += intarg_count * sizeof (long); ++#else ++ if (intarg_count > NUM_GPR_ARG_REGISTERS64) ++ bytes += (intarg_count - NUM_GPR_ARG_REGISTERS64) * sizeof (long); ++#endif ++ ++ /* The stack space allocated needs to be a multiple of 16 bytes. */ ++ bytes = (bytes + 15) & ~0xF; ++ ++ cif->flags = flags; ++ cif->bytes = bytes; ++ ++ return FFI_OK; ++} ++ ++ffi_status FFI_HIDDEN ++ffi_prep_cif_linux64 (ffi_cif *cif) ++{ ++ if ((cif->abi & FFI_LINUX) != 0) ++ cif->nfixedargs = cif->nargs; ++#if _CALL_ELF != 2 ++ else if (cif->abi == FFI_COMPAT_LINUX64) ++ { ++ /* This call is from old code. Don't touch cif->nfixedargs ++ since old code will be using a smaller cif. */ ++ cif->flags |= FLAG_COMPAT; ++ /* Translate to new abi value. */ ++ cif->abi = FFI_LINUX | FFI_LINUX_LONG_DOUBLE_128; ++ } ++#endif ++ else ++ return FFI_BAD_ABI; ++ return ffi_prep_cif_linux64_core (cif); ++} ++ ++ffi_status FFI_HIDDEN ++ffi_prep_cif_linux64_var (ffi_cif *cif, ++ unsigned int nfixedargs, ++ unsigned int ntotalargs MAYBE_UNUSED) ++{ ++ if ((cif->abi & FFI_LINUX) != 0) ++ cif->nfixedargs = nfixedargs; ++#if _CALL_ELF != 2 ++ else if (cif->abi == FFI_COMPAT_LINUX64) ++ { ++ /* This call is from old code. Don't touch cif->nfixedargs ++ since old code will be using a smaller cif. */ ++ cif->flags |= FLAG_COMPAT; ++ /* Translate to new abi value. */ ++ cif->abi = FFI_LINUX | FFI_LINUX_LONG_DOUBLE_128; ++ } ++#endif ++ else ++ return FFI_BAD_ABI; ++#if _CALL_ELF == 2 ++ cif->flags |= FLAG_ARG_NEEDS_PSAVE; ++#endif ++ return ffi_prep_cif_linux64_core (cif); ++} ++ ++ ++/* ffi_prep_args64 is called by the assembly routine once stack space ++ has been allocated for the function's arguments. ++ ++ The stack layout we want looks like this: ++ ++ | Ret addr from ffi_call_LINUX64 8bytes | higher addresses ++ |--------------------------------------------| ++ | CR save area 8bytes | ++ |--------------------------------------------| ++ | Previous backchain pointer 8 | stack pointer here ++ |--------------------------------------------|<+ <<< on entry to ++ | Saved r28-r31 4*8 | | ffi_call_LINUX64 ++ |--------------------------------------------| | ++ | GPR registers r3-r10 8*8 | | ++ |--------------------------------------------| | ++ | FPR registers f1-f13 (optional) 13*8 | | ++ |--------------------------------------------| | ++ | Parameter save area | | ++ |--------------------------------------------| | ++ | TOC save area 8 | | ++ |--------------------------------------------| | stack | ++ | Linker doubleword 8 | | grows | ++ |--------------------------------------------| | down V ++ | Compiler doubleword 8 | | ++ |--------------------------------------------| | lower addresses ++ | Space for callee's LR 8 | | ++ |--------------------------------------------| | ++ | CR save area 8 | | ++ |--------------------------------------------| | stack pointer here ++ | Current backchain pointer 8 |-/ during ++ |--------------------------------------------| <<< ffi_call_LINUX64 ++ ++*/ ++ ++void FFI_HIDDEN ++ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) ++{ ++ const unsigned long bytes = ecif->cif->bytes; ++ const unsigned long flags = ecif->cif->flags; ++ ++ typedef union ++ { ++ char *c; ++ unsigned long *ul; ++ float *f; ++ double *d; ++ size_t p; ++ } valp; ++ ++ /* 'stacktop' points at the previous backchain pointer. */ ++ valp stacktop; ++ ++ /* 'next_arg' points at the space for gpr3, and grows upwards as ++ we use GPR registers, then continues at rest. */ ++ valp gpr_base; ++ valp gpr_end; ++ valp rest; ++ valp next_arg; ++ ++ /* 'fpr_base' points at the space for fpr3, and grows upwards as ++ we use FPR registers. */ ++ valp fpr_base; ++ unsigned int fparg_count; ++ ++ unsigned int i, words, nargs, nfixedargs; ++ ffi_type **ptr; ++ double double_tmp; ++ union ++ { ++ void **v; ++ char **c; ++ signed char **sc; ++ unsigned char **uc; ++ signed short **ss; ++ unsigned short **us; ++ signed int **si; ++ unsigned int **ui; ++ unsigned long **ul; ++ float **f; ++ double **d; ++ } p_argv; ++ unsigned long gprvalue; ++ unsigned long align; ++ ++ stacktop.c = (char *) stack + bytes; ++ gpr_base.ul = stacktop.ul - ASM_NEEDS_REGISTERS64 - NUM_GPR_ARG_REGISTERS64; ++ gpr_end.ul = gpr_base.ul + NUM_GPR_ARG_REGISTERS64; ++#if _CALL_ELF == 2 ++ rest.ul = stack + 4 + NUM_GPR_ARG_REGISTERS64; ++#else ++ rest.ul = stack + 6 + NUM_GPR_ARG_REGISTERS64; ++#endif ++ fpr_base.d = gpr_base.d - NUM_FPR_ARG_REGISTERS64; ++ fparg_count = 0; ++ next_arg.ul = gpr_base.ul; ++ ++ /* Check that everything starts aligned properly. */ ++ FFI_ASSERT (((unsigned long) (char *) stack & 0xF) == 0); ++ FFI_ASSERT (((unsigned long) stacktop.c & 0xF) == 0); ++ FFI_ASSERT ((bytes & 0xF) == 0); ++ ++ /* Deal with return values that are actually pass-by-reference. */ ++ if (flags & FLAG_RETVAL_REFERENCE) ++ *next_arg.ul++ = (unsigned long) (char *) ecif->rvalue; ++ ++ /* Now for the arguments. */ ++ p_argv.v = ecif->avalue; ++ nargs = ecif->cif->nargs; ++#if _CALL_ELF != 2 ++ nfixedargs = (unsigned) -1; ++ if ((flags & FLAG_COMPAT) == 0) ++#endif ++ nfixedargs = ecif->cif->nfixedargs; ++ for (ptr = ecif->cif->arg_types, i = 0; ++ i < nargs; ++ i++, ptr++, p_argv.v++) ++ { ++#if _CALL_ELF == 2 ++ unsigned int elt, elnum; ++#endif ++ ++ switch ((*ptr)->type) ++ { ++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++ case FFI_TYPE_LONGDOUBLE: ++ if ((ecif->cif->abi & FFI_LINUX_LONG_DOUBLE_128) != 0) ++ { ++ double_tmp = (*p_argv.d)[0]; ++ if (fparg_count < NUM_FPR_ARG_REGISTERS64 && i < nfixedargs) ++ { ++ *fpr_base.d++ = double_tmp; ++# if _CALL_ELF != 2 ++ if ((flags & FLAG_COMPAT) != 0) ++ *next_arg.d = double_tmp; ++# endif ++ } ++ else ++ *next_arg.d = double_tmp; ++ if (++next_arg.ul == gpr_end.ul) ++ next_arg.ul = rest.ul; ++ fparg_count++; ++ double_tmp = (*p_argv.d)[1]; ++ if (fparg_count < NUM_FPR_ARG_REGISTERS64 && i < nfixedargs) ++ { ++ *fpr_base.d++ = double_tmp; ++# if _CALL_ELF != 2 ++ if ((flags & FLAG_COMPAT) != 0) ++ *next_arg.d = double_tmp; ++# endif ++ } ++ else ++ *next_arg.d = double_tmp; ++ if (++next_arg.ul == gpr_end.ul) ++ next_arg.ul = rest.ul; ++ fparg_count++; ++ FFI_ASSERT (__LDBL_MANT_DIG__ == 106); ++ FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); ++ break; ++ } ++ /* Fall through. */ ++#endif ++ case FFI_TYPE_DOUBLE: ++ double_tmp = **p_argv.d; ++ if (fparg_count < NUM_FPR_ARG_REGISTERS64 && i < nfixedargs) ++ { ++ *fpr_base.d++ = double_tmp; ++#if _CALL_ELF != 2 ++ if ((flags & FLAG_COMPAT) != 0) ++ *next_arg.d = double_tmp; ++#endif ++ } ++ else ++ *next_arg.d = double_tmp; ++ if (++next_arg.ul == gpr_end.ul) ++ next_arg.ul = rest.ul; ++ fparg_count++; ++ FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); ++ break; ++ ++ case FFI_TYPE_FLOAT: ++ double_tmp = **p_argv.f; ++ if (fparg_count < NUM_FPR_ARG_REGISTERS64 && i < nfixedargs) ++ { ++ *fpr_base.d++ = double_tmp; ++#if _CALL_ELF != 2 ++ if ((flags & FLAG_COMPAT) != 0) ++ *next_arg.f = (float) double_tmp; ++#endif ++ } ++ else ++ *next_arg.f = (float) double_tmp; ++ if (++next_arg.ul == gpr_end.ul) ++ next_arg.ul = rest.ul; ++ fparg_count++; ++ FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ if ((ecif->cif->abi & FFI_LINUX_STRUCT_ALIGN) != 0) ++ { ++ align = (*ptr)->alignment; ++ if (align > 16) ++ align = 16; ++ if (align > 1) ++ next_arg.p = ALIGN (next_arg.p, align); ++ } ++#if _CALL_ELF == 2 ++ elt = discover_homogeneous_aggregate (*ptr, &elnum); ++ if (elt) ++ { ++ union { ++ void *v; ++ float *f; ++ double *d; ++ } arg; ++ ++ arg.v = *p_argv.v; ++ if (elt == FFI_TYPE_FLOAT) ++ { ++ do ++ { ++ double_tmp = *arg.f++; ++ if (fparg_count < NUM_FPR_ARG_REGISTERS64 ++ && i < nfixedargs) ++ *fpr_base.d++ = double_tmp; ++ else ++ *next_arg.f = (float) double_tmp; ++ if (++next_arg.f == gpr_end.f) ++ next_arg.f = rest.f; ++ fparg_count++; ++ } ++ while (--elnum != 0); ++ if ((next_arg.p & 3) != 0) ++ { ++ if (++next_arg.f == gpr_end.f) ++ next_arg.f = rest.f; ++ } ++ } ++ else ++ do ++ { ++ double_tmp = *arg.d++; ++ if (fparg_count < NUM_FPR_ARG_REGISTERS64 && i < nfixedargs) ++ *fpr_base.d++ = double_tmp; ++ else ++ *next_arg.d = double_tmp; ++ if (++next_arg.d == gpr_end.d) ++ next_arg.d = rest.d; ++ fparg_count++; ++ } ++ while (--elnum != 0); ++ } ++ else ++#endif ++ { ++ words = ((*ptr)->size + 7) / 8; ++ if (next_arg.ul >= gpr_base.ul && next_arg.ul + words > gpr_end.ul) ++ { ++ size_t first = gpr_end.c - next_arg.c; ++ memcpy (next_arg.c, *p_argv.c, first); ++ memcpy (rest.c, *p_argv.c + first, (*ptr)->size - first); ++ next_arg.c = rest.c + words * 8 - first; ++ } ++ else ++ { ++ char *where = next_arg.c; ++ ++#ifndef __LITTLE_ENDIAN__ ++ /* Structures with size less than eight bytes are passed ++ left-padded. */ ++ if ((*ptr)->size < 8) ++ where += 8 - (*ptr)->size; ++#endif ++ memcpy (where, *p_argv.c, (*ptr)->size); ++ next_arg.ul += words; ++ if (next_arg.ul == gpr_end.ul) ++ next_arg.ul = rest.ul; ++ } ++ } ++ break; ++ ++ case FFI_TYPE_UINT8: ++ gprvalue = **p_argv.uc; ++ goto putgpr; ++ case FFI_TYPE_SINT8: ++ gprvalue = **p_argv.sc; ++ goto putgpr; ++ case FFI_TYPE_UINT16: ++ gprvalue = **p_argv.us; ++ goto putgpr; ++ case FFI_TYPE_SINT16: ++ gprvalue = **p_argv.ss; ++ goto putgpr; ++ case FFI_TYPE_UINT32: ++ gprvalue = **p_argv.ui; ++ goto putgpr; ++ case FFI_TYPE_INT: ++ case FFI_TYPE_SINT32: ++ gprvalue = **p_argv.si; ++ goto putgpr; ++ ++ case FFI_TYPE_UINT64: ++ case FFI_TYPE_SINT64: ++ case FFI_TYPE_POINTER: ++ gprvalue = **p_argv.ul; ++ putgpr: ++ *next_arg.ul++ = gprvalue; ++ if (next_arg.ul == gpr_end.ul) ++ next_arg.ul = rest.ul; ++ break; ++ } ++ } ++ ++ FFI_ASSERT (flags & FLAG_4_GPR_ARGUMENTS ++ || (next_arg.ul >= gpr_base.ul ++ && next_arg.ul <= gpr_base.ul + 4)); ++} ++ ++ ++#if _CALL_ELF == 2 ++#define MIN_CACHE_LINE_SIZE 8 ++ ++static void ++flush_icache (char *wraddr, char *xaddr, int size) ++{ ++ int i; ++ for (i = 0; i < size; i += MIN_CACHE_LINE_SIZE) ++ __asm__ volatile ("icbi 0,%0;" "dcbf 0,%1;" ++ : : "r" (xaddr + i), "r" (wraddr + i) : "memory"); ++ __asm__ volatile ("icbi 0,%0;" "dcbf 0,%1;" "sync;" "isync;" ++ : : "r"(xaddr + size - 1), "r"(wraddr + size - 1) ++ : "memory"); ++} ++#endif ++ ++ffi_status ++ffi_prep_closure_loc_linux64 (ffi_closure *closure, ++ ffi_cif *cif, ++ void (*fun) (ffi_cif *, void *, void **, void *), ++ void *user_data, ++ void *codeloc) ++{ ++#if _CALL_ELF == 2 ++ unsigned int *tramp = (unsigned int *) &closure->tramp[0]; ++ ++ if (cif->abi < FFI_LINUX || cif->abi >= FFI_LAST_ABI) ++ return FFI_BAD_ABI; ++ ++ tramp[0] = 0xe96c0018; /* 0: ld 11,2f-0b(12) */ ++ tramp[1] = 0xe98c0010; /* ld 12,1f-0b(12) */ ++ tramp[2] = 0x7d8903a6; /* mtctr 12 */ ++ tramp[3] = 0x4e800420; /* bctr */ ++ /* 1: .quad function_addr */ ++ /* 2: .quad context */ ++ *(void **) &tramp[4] = (void *) ffi_closure_LINUX64; ++ *(void **) &tramp[6] = codeloc; ++ flush_icache ((char *)tramp, (char *)codeloc, FFI_TRAMPOLINE_SIZE); ++#else ++ void **tramp = (void **) &closure->tramp[0]; ++ ++ if (cif->abi < FFI_LINUX || cif->abi >= FFI_LAST_ABI) ++ return FFI_BAD_ABI; ++ ++ /* Copy function address and TOC from ffi_closure_LINUX64. */ ++ memcpy (tramp, (char *) ffi_closure_LINUX64, 16); ++ tramp[2] = tramp[1]; ++ tramp[1] = codeloc; ++#endif ++ ++ closure->cif = cif; ++ closure->fun = fun; ++ closure->user_data = user_data; ++ ++ return FFI_OK; ++} ++ ++ ++int FFI_HIDDEN ++ffi_closure_helper_LINUX64 (ffi_closure *closure, void *rvalue, ++ unsigned long *pst, ffi_dblfl *pfr) ++{ ++ /* rvalue is the pointer to space for return value in closure assembly */ ++ /* pst is the pointer to parameter save area ++ (r3-r10 are stored into its first 8 slots by ffi_closure_LINUX64) */ ++ /* pfr is the pointer to where f1-f13 are stored in ffi_closure_LINUX64 */ ++ ++ void **avalue; ++ ffi_type **arg_types; ++ unsigned long i, avn, nfixedargs; ++ ffi_cif *cif; ++ ffi_dblfl *end_pfr = pfr + NUM_FPR_ARG_REGISTERS64; ++ unsigned long align; ++ ++ cif = closure->cif; ++ avalue = alloca (cif->nargs * sizeof (void *)); ++ ++ /* Copy the caller's structure return value address so that the ++ closure returns the data directly to the caller. */ ++ if (cif->rtype->type == FFI_TYPE_STRUCT ++ && (cif->flags & FLAG_RETURNS_SMST) == 0) ++ { ++ rvalue = (void *) *pst; ++ pst++; ++ } ++ ++ i = 0; ++ avn = cif->nargs; ++#if _CALL_ELF != 2 ++ nfixedargs = (unsigned) -1; ++ if ((cif->flags & FLAG_COMPAT) == 0) ++#endif ++ nfixedargs = cif->nfixedargs; ++ arg_types = cif->arg_types; ++ ++ /* Grab the addresses of the arguments from the stack frame. */ ++ while (i < avn) ++ { ++ unsigned int elt, elnum; ++ ++ switch (arg_types[i]->type) ++ { ++ case FFI_TYPE_SINT8: ++ case FFI_TYPE_UINT8: ++#ifndef __LITTLE_ENDIAN__ ++ avalue[i] = (char *) pst + 7; ++ pst++; ++ break; ++#endif ++ ++ case FFI_TYPE_SINT16: ++ case FFI_TYPE_UINT16: ++#ifndef __LITTLE_ENDIAN__ ++ avalue[i] = (char *) pst + 6; ++ pst++; ++ break; ++#endif ++ ++ case FFI_TYPE_SINT32: ++ case FFI_TYPE_UINT32: ++#ifndef __LITTLE_ENDIAN__ ++ avalue[i] = (char *) pst + 4; ++ pst++; ++ break; ++#endif ++ ++ case FFI_TYPE_SINT64: ++ case FFI_TYPE_UINT64: ++ case FFI_TYPE_POINTER: ++ avalue[i] = pst; ++ pst++; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ if ((cif->abi & FFI_LINUX_STRUCT_ALIGN) != 0) ++ { ++ align = arg_types[i]->alignment; ++ if (align > 16) ++ align = 16; ++ if (align > 1) ++ pst = (unsigned long *) ALIGN ((size_t) pst, align); ++ } ++ elt = 0; ++#if _CALL_ELF == 2 ++ elt = discover_homogeneous_aggregate (arg_types[i], &elnum); ++#endif ++ if (elt) ++ { ++ union { ++ void *v; ++ unsigned long *ul; ++ float *f; ++ double *d; ++ size_t p; ++ } to, from; ++ ++ /* Repackage the aggregate from its parts. The ++ aggregate size is not greater than the space taken by ++ the registers so store back to the register/parameter ++ save arrays. */ ++ if (pfr + elnum <= end_pfr) ++ to.v = pfr; ++ else ++ to.v = pst; ++ ++ avalue[i] = to.v; ++ from.ul = pst; ++ if (elt == FFI_TYPE_FLOAT) ++ { ++ do ++ { ++ if (pfr < end_pfr && i < nfixedargs) ++ { ++ *to.f = (float) pfr->d; ++ pfr++; ++ } ++ else ++ *to.f = *from.f; ++ to.f++; ++ from.f++; ++ } ++ while (--elnum != 0); ++ } ++ else ++ { ++ do ++ { ++ if (pfr < end_pfr && i < nfixedargs) ++ { ++ *to.d = pfr->d; ++ pfr++; ++ } ++ else ++ *to.d = *from.d; ++ to.d++; ++ from.d++; ++ } ++ while (--elnum != 0); ++ } ++ } ++ else ++ { ++#ifndef __LITTLE_ENDIAN__ ++ /* Structures with size less than eight bytes are passed ++ left-padded. */ ++ if (arg_types[i]->size < 8) ++ avalue[i] = (char *) pst + 8 - arg_types[i]->size; ++ else ++#endif ++ avalue[i] = pst; ++ } ++ pst += (arg_types[i]->size + 7) / 8; ++ break; ++ ++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++ case FFI_TYPE_LONGDOUBLE: ++ if ((cif->abi & FFI_LINUX_LONG_DOUBLE_128) != 0) ++ { ++ if (pfr + 1 < end_pfr && i + 1 < nfixedargs) ++ { ++ avalue[i] = pfr; ++ pfr += 2; ++ } ++ else ++ { ++ if (pfr < end_pfr && i < nfixedargs) ++ { ++ /* Passed partly in f13 and partly on the stack. ++ Move it all to the stack. */ ++ *pst = *(unsigned long *) pfr; ++ pfr++; ++ } ++ avalue[i] = pst; ++ } ++ pst += 2; ++ break; ++ } ++ /* Fall through. */ ++#endif ++ case FFI_TYPE_DOUBLE: ++ /* On the outgoing stack all values are aligned to 8 */ ++ /* there are 13 64bit floating point registers */ ++ ++ if (pfr < end_pfr && i < nfixedargs) ++ { ++ avalue[i] = pfr; ++ pfr++; ++ } ++ else ++ avalue[i] = pst; ++ pst++; ++ break; ++ ++ case FFI_TYPE_FLOAT: ++ if (pfr < end_pfr && i < nfixedargs) ++ { ++ /* Float values are stored as doubles in the ++ ffi_closure_LINUX64 code. Fix them here. */ ++ pfr->f = (float) pfr->d; ++ avalue[i] = pfr; ++ pfr++; ++ } ++ else ++ avalue[i] = pst; ++ pst++; ++ break; ++ ++ default: ++ FFI_ASSERT (0); ++ } ++ ++ i++; ++ } ++ ++ ++ (closure->fun) (cif, rvalue, avalue, closure->user_data); ++ ++ /* Tell ffi_closure_LINUX64 how to perform return type promotions. */ ++ if ((cif->flags & FLAG_RETURNS_SMST) != 0) ++ { ++ if ((cif->flags & FLAG_RETURNS_FP) == 0) ++ return FFI_V2_TYPE_SMALL_STRUCT + cif->rtype->size - 1; ++ else if ((cif->flags & FLAG_RETURNS_64BITS) != 0) ++ return FFI_V2_TYPE_DOUBLE_HOMOG; ++ else ++ return FFI_V2_TYPE_FLOAT_HOMOG; ++ } ++ return cif->rtype->type; ++} ++#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/ffi_powerpc.h +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/powerpc/ffi_powerpc.h +@@ -0,0 +1,77 @@ ++/* ----------------------------------------------------------------------- ++ ffi_powerpc.h - Copyright (C) 2013 IBM ++ Copyright (C) 2011 Anthony Green ++ Copyright (C) 2011 Kyle Moffett ++ Copyright (C) 2008 Red Hat, Inc ++ Copyright (C) 2007, 2008 Free Software Foundation, Inc ++ Copyright (c) 1998 Geoffrey Keating ++ ++ PowerPC Foreign Function Interface ++ ++ Permission is hereby granted, free of charge, to any person obtaining ++ a copy of this software and associated documentation files (the ++ ``Software''), to deal in the Software without restriction, including ++ without limitation the rights to use, copy, modify, merge, publish, ++ distribute, sublicense, and/or sell copies of the Software, and to ++ permit persons to whom the Software is furnished to do so, subject to ++ the following conditions: ++ ++ The above copyright notice and this permission notice shall be included ++ in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ OTHER DEALINGS IN THE SOFTWARE. ++ ----------------------------------------------------------------------- */ ++ ++enum { ++ /* The assembly depends on these exact flags. */ ++ /* These go in cr7 */ ++ FLAG_RETURNS_SMST = 1 << (31-31), /* Used for FFI_SYSV small structs. */ ++ FLAG_RETURNS_NOTHING = 1 << (31-30), ++ FLAG_RETURNS_FP = 1 << (31-29), ++ FLAG_RETURNS_64BITS = 1 << (31-28), ++ ++ /* This goes in cr6 */ ++ FLAG_RETURNS_128BITS = 1 << (31-27), ++ ++ FLAG_COMPAT = 1 << (31- 8), /* Not used by assembly */ ++ ++ /* These go in cr1 */ ++ FLAG_ARG_NEEDS_COPY = 1 << (31- 7), /* Used by sysv code */ ++ FLAG_ARG_NEEDS_PSAVE = FLAG_ARG_NEEDS_COPY, /* Used by linux64 code */ ++ FLAG_FP_ARGUMENTS = 1 << (31- 6), /* cr1.eq; specified by ABI */ ++ FLAG_4_GPR_ARGUMENTS = 1 << (31- 5), ++ FLAG_RETVAL_REFERENCE = 1 << (31- 4) ++}; ++ ++typedef union ++{ ++ float f; ++ double d; ++} ffi_dblfl; ++ ++void FFI_HIDDEN ffi_closure_SYSV (void); ++void FFI_HIDDEN ffi_call_SYSV(extended_cif *, unsigned, unsigned, unsigned *, ++ void (*)(void)); ++ ++void FFI_HIDDEN ffi_prep_types_sysv (ffi_abi); ++ffi_status FFI_HIDDEN ffi_prep_cif_sysv (ffi_cif *); ++int FFI_HIDDEN ffi_closure_helper_SYSV (ffi_closure *, void *, unsigned long *, ++ ffi_dblfl *, unsigned long *); ++ ++void FFI_HIDDEN ffi_call_LINUX64(extended_cif *, unsigned long, unsigned long, ++ unsigned long *, void (*)(void)); ++void FFI_HIDDEN ffi_closure_LINUX64 (void); ++ ++void FFI_HIDDEN ffi_prep_types_linux64 (ffi_abi); ++ffi_status FFI_HIDDEN ffi_prep_cif_linux64 (ffi_cif *); ++ffi_status FFI_HIDDEN ffi_prep_cif_linux64_var (ffi_cif *, unsigned int, ++ unsigned int); ++void FFI_HIDDEN ffi_prep_args64 (extended_cif *, unsigned long *const); ++int FFI_HIDDEN ffi_closure_helper_LINUX64 (ffi_closure *, void *, ++ unsigned long *, ffi_dblfl *); +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/ffi_sysv.c +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/powerpc/ffi_sysv.c +@@ -0,0 +1,931 @@ ++/* ----------------------------------------------------------------------- ++ ffi_sysv.c - Copyright (C) 2013 IBM ++ Copyright (C) 2011 Anthony Green ++ Copyright (C) 2011 Kyle Moffett ++ Copyright (C) 2008 Red Hat, Inc ++ Copyright (C) 2007, 2008 Free Software Foundation, Inc ++ Copyright (c) 1998 Geoffrey Keating ++ ++ PowerPC Foreign Function Interface ++ ++ Permission is hereby granted, free of charge, to any person obtaining ++ a copy of this software and associated documentation files (the ++ ``Software''), to deal in the Software without restriction, including ++ without limitation the rights to use, copy, modify, merge, publish, ++ distribute, sublicense, and/or sell copies of the Software, and to ++ permit persons to whom the Software is furnished to do so, subject to ++ the following conditions: ++ ++ The above copyright notice and this permission notice shall be included ++ in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ OTHER DEALINGS IN THE SOFTWARE. ++ ----------------------------------------------------------------------- */ ++ ++#include "ffi.h" ++ ++#ifndef POWERPC64 ++#include "ffi_common.h" ++#include "ffi_powerpc.h" ++ ++ ++/* About the SYSV ABI. */ ++#define ASM_NEEDS_REGISTERS 4 ++#define NUM_GPR_ARG_REGISTERS 8 ++#define NUM_FPR_ARG_REGISTERS 8 ++ ++ ++#if HAVE_LONG_DOUBLE_VARIANT && FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++/* Adjust size of ffi_type_longdouble. */ ++void FFI_HIDDEN ++ffi_prep_types_sysv (ffi_abi abi) ++{ ++ if ((abi & (FFI_SYSV | FFI_SYSV_LONG_DOUBLE_128)) == FFI_SYSV) ++ { ++ ffi_type_longdouble.size = 8; ++ ffi_type_longdouble.alignment = 8; ++ } ++ else ++ { ++ ffi_type_longdouble.size = 16; ++ ffi_type_longdouble.alignment = 16; ++ } ++} ++#endif ++ ++/* Transform long double, double and float to other types as per abi. */ ++static int ++translate_float (int abi, int type) ++{ ++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++ if (type == FFI_TYPE_LONGDOUBLE ++ && (abi & FFI_SYSV_LONG_DOUBLE_128) == 0) ++ type = FFI_TYPE_DOUBLE; ++#endif ++ if ((abi & FFI_SYSV_SOFT_FLOAT) != 0) ++ { ++ if (type == FFI_TYPE_FLOAT) ++ type = FFI_TYPE_UINT32; ++ else if (type == FFI_TYPE_DOUBLE) ++ type = FFI_TYPE_UINT64; ++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++ else if (type == FFI_TYPE_LONGDOUBLE) ++ type = FFI_TYPE_UINT128; ++ } ++ else if ((abi & FFI_SYSV_IBM_LONG_DOUBLE) == 0) ++ { ++ if (type == FFI_TYPE_LONGDOUBLE) ++ type = FFI_TYPE_STRUCT; ++#endif ++ } ++ return type; ++} ++ ++/* Perform machine dependent cif processing */ ++static ffi_status ++ffi_prep_cif_sysv_core (ffi_cif *cif) ++{ ++ ffi_type **ptr; ++ unsigned bytes; ++ unsigned i, fparg_count = 0, intarg_count = 0; ++ unsigned flags = cif->flags; ++ unsigned struct_copy_size = 0; ++ unsigned type = cif->rtype->type; ++ unsigned size = cif->rtype->size; ++ ++ /* The machine-independent calculation of cif->bytes doesn't work ++ for us. Redo the calculation. */ ++ ++ /* Space for the frame pointer, callee's LR, and the asm's temp regs. */ ++ bytes = (2 + ASM_NEEDS_REGISTERS) * sizeof (int); ++ ++ /* Space for the GPR registers. */ ++ bytes += NUM_GPR_ARG_REGISTERS * sizeof (int); ++ ++ /* Return value handling. The rules for SYSV are as follows: ++ - 32-bit (or less) integer values are returned in gpr3; ++ - Structures of size <= 4 bytes also returned in gpr3; ++ - 64-bit integer values and structures between 5 and 8 bytes are returned ++ in gpr3 and gpr4; ++ - Larger structures are allocated space and a pointer is passed as ++ the first argument. ++ - Single/double FP values are returned in fpr1; ++ - long doubles (if not equivalent to double) are returned in ++ fpr1,fpr2 for Linux and as for large structs for SysV. */ ++ ++ type = translate_float (cif->abi, type); ++ ++ switch (type) ++ { ++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++ case FFI_TYPE_LONGDOUBLE: ++ flags |= FLAG_RETURNS_128BITS; ++ /* Fall through. */ ++#endif ++ case FFI_TYPE_DOUBLE: ++ flags |= FLAG_RETURNS_64BITS; ++ /* Fall through. */ ++ case FFI_TYPE_FLOAT: ++ flags |= FLAG_RETURNS_FP; ++#ifdef __NO_FPRS__ ++ return FFI_BAD_ABI; ++#endif ++ break; ++ ++ case FFI_TYPE_UINT128: ++ flags |= FLAG_RETURNS_128BITS; ++ /* Fall through. */ ++ case FFI_TYPE_UINT64: ++ case FFI_TYPE_SINT64: ++ flags |= FLAG_RETURNS_64BITS; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ /* The final SYSV ABI says that structures smaller or equal 8 bytes ++ are returned in r3/r4. A draft ABI used by linux instead ++ returns them in memory. */ ++ if ((cif->abi & FFI_SYSV_STRUCT_RET) != 0 && size <= 8) ++ { ++ flags |= FLAG_RETURNS_SMST; ++ break; ++ } ++ intarg_count++; ++ flags |= FLAG_RETVAL_REFERENCE; ++ /* Fall through. */ ++ case FFI_TYPE_VOID: ++ flags |= FLAG_RETURNS_NOTHING; ++ break; ++ ++ default: ++ /* Returns 32-bit integer, or similar. Nothing to do here. */ ++ break; ++ } ++ ++ /* The first NUM_GPR_ARG_REGISTERS words of integer arguments, and the ++ first NUM_FPR_ARG_REGISTERS fp arguments, go in registers; the rest ++ goes on the stack. Structures and long doubles (if not equivalent ++ to double) are passed as a pointer to a copy of the structure. ++ Stuff on the stack needs to keep proper alignment. */ ++ for (ptr = cif->arg_types, i = cif->nargs; i > 0; i--, ptr++) ++ { ++ unsigned short typenum = (*ptr)->type; ++ ++ typenum = translate_float (cif->abi, typenum); ++ ++ switch (typenum) ++ { ++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++ case FFI_TYPE_LONGDOUBLE: ++ fparg_count++; ++ /* Fall thru */ ++#endif ++ case FFI_TYPE_DOUBLE: ++ fparg_count++; ++ /* If this FP arg is going on the stack, it must be ++ 8-byte-aligned. */ ++ if (fparg_count > NUM_FPR_ARG_REGISTERS ++ && intarg_count >= NUM_GPR_ARG_REGISTERS ++ && intarg_count % 2 != 0) ++ intarg_count++; ++#ifdef __NO_FPRS__ ++ return FFI_BAD_ABI; ++#endif ++ break; ++ ++ case FFI_TYPE_FLOAT: ++ fparg_count++; ++#ifdef __NO_FPRS__ ++ return FFI_BAD_ABI; ++#endif ++ break; ++ ++ case FFI_TYPE_UINT128: ++ /* A long double in FFI_LINUX_SOFT_FLOAT can use only a set ++ of four consecutive gprs. If we do not have enough, we ++ have to adjust the intarg_count value. */ ++ if (intarg_count >= NUM_GPR_ARG_REGISTERS - 3 ++ && intarg_count < NUM_GPR_ARG_REGISTERS) ++ intarg_count = NUM_GPR_ARG_REGISTERS; ++ intarg_count += 4; ++ break; ++ ++ case FFI_TYPE_UINT64: ++ case FFI_TYPE_SINT64: ++ /* 'long long' arguments are passed as two words, but ++ either both words must fit in registers or both go ++ on the stack. If they go on the stack, they must ++ be 8-byte-aligned. ++ ++ Also, only certain register pairs can be used for ++ passing long long int -- specifically (r3,r4), (r5,r6), ++ (r7,r8), (r9,r10). */ ++ if (intarg_count == NUM_GPR_ARG_REGISTERS-1 ++ || intarg_count % 2 != 0) ++ intarg_count++; ++ intarg_count += 2; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ /* We must allocate space for a copy of these to enforce ++ pass-by-value. Pad the space up to a multiple of 16 ++ bytes (the maximum alignment required for anything under ++ the SYSV ABI). */ ++ struct_copy_size += ((*ptr)->size + 15) & ~0xF; ++ /* Fall through (allocate space for the pointer). */ ++ ++ case FFI_TYPE_POINTER: ++ case FFI_TYPE_INT: ++ case FFI_TYPE_UINT32: ++ case FFI_TYPE_SINT32: ++ case FFI_TYPE_UINT16: ++ case FFI_TYPE_SINT16: ++ case FFI_TYPE_UINT8: ++ case FFI_TYPE_SINT8: ++ /* Everything else is passed as a 4-byte word in a GPR, either ++ the object itself or a pointer to it. */ ++ intarg_count++; ++ break; ++ ++ default: ++ FFI_ASSERT (0); ++ } ++ } ++ ++ if (fparg_count != 0) ++ flags |= FLAG_FP_ARGUMENTS; ++ if (intarg_count > 4) ++ flags |= FLAG_4_GPR_ARGUMENTS; ++ if (struct_copy_size != 0) ++ flags |= FLAG_ARG_NEEDS_COPY; ++ ++ /* Space for the FPR registers, if needed. */ ++ if (fparg_count != 0) ++ bytes += NUM_FPR_ARG_REGISTERS * sizeof (double); ++ ++ /* Stack space. */ ++ if (intarg_count > NUM_GPR_ARG_REGISTERS) ++ bytes += (intarg_count - NUM_GPR_ARG_REGISTERS) * sizeof (int); ++ if (fparg_count > NUM_FPR_ARG_REGISTERS) ++ bytes += (fparg_count - NUM_FPR_ARG_REGISTERS) * sizeof (double); ++ ++ /* The stack space allocated needs to be a multiple of 16 bytes. */ ++ bytes = (bytes + 15) & ~0xF; ++ ++ /* Add in the space for the copied structures. */ ++ bytes += struct_copy_size; ++ ++ cif->flags = flags; ++ cif->bytes = bytes; ++ ++ return FFI_OK; ++} ++ ++ffi_status FFI_HIDDEN ++ffi_prep_cif_sysv (ffi_cif *cif) ++{ ++ if ((cif->abi & FFI_SYSV) == 0) ++ { ++ /* This call is from old code. Translate to new ABI values. */ ++ cif->flags |= FLAG_COMPAT; ++ switch (cif->abi) ++ { ++ default: ++ return FFI_BAD_ABI; ++ ++ case FFI_COMPAT_SYSV: ++ cif->abi = FFI_SYSV | FFI_SYSV_STRUCT_RET | FFI_SYSV_LONG_DOUBLE_128; ++ break; ++ ++ case FFI_COMPAT_GCC_SYSV: ++ cif->abi = FFI_SYSV | FFI_SYSV_LONG_DOUBLE_128; ++ break; ++ ++ case FFI_COMPAT_LINUX: ++ cif->abi = (FFI_SYSV | FFI_SYSV_IBM_LONG_DOUBLE ++ | FFI_SYSV_LONG_DOUBLE_128); ++ break; ++ ++ case FFI_COMPAT_LINUX_SOFT_FLOAT: ++ cif->abi = (FFI_SYSV | FFI_SYSV_SOFT_FLOAT | FFI_SYSV_IBM_LONG_DOUBLE ++ | FFI_SYSV_LONG_DOUBLE_128); ++ break; ++ } ++ } ++ return ffi_prep_cif_sysv_core (cif); ++} ++ ++/* ffi_prep_args_SYSV is called by the assembly routine once stack space ++ has been allocated for the function's arguments. ++ ++ The stack layout we want looks like this: ++ ++ | Return address from ffi_call_SYSV 4bytes | higher addresses ++ |--------------------------------------------| ++ | Previous backchain pointer 4 | stack pointer here ++ |--------------------------------------------|<+ <<< on entry to ++ | Saved r28-r31 4*4 | | ffi_call_SYSV ++ |--------------------------------------------| | ++ | GPR registers r3-r10 8*4 | | ffi_call_SYSV ++ |--------------------------------------------| | ++ | FPR registers f1-f8 (optional) 8*8 | | ++ |--------------------------------------------| | stack | ++ | Space for copied structures | | grows | ++ |--------------------------------------------| | down V ++ | Parameters that didn't fit in registers | | ++ |--------------------------------------------| | lower addresses ++ | Space for callee's LR 4 | | ++ |--------------------------------------------| | stack pointer here ++ | Current backchain pointer 4 |-/ during ++ |--------------------------------------------| <<< ffi_call_SYSV ++ ++*/ ++ ++void FFI_HIDDEN ++ffi_prep_args_SYSV (extended_cif *ecif, unsigned *const stack) ++{ ++ const unsigned bytes = ecif->cif->bytes; ++ const unsigned flags = ecif->cif->flags; ++ ++ typedef union ++ { ++ char *c; ++ unsigned *u; ++ long long *ll; ++ float *f; ++ double *d; ++ } valp; ++ ++ /* 'stacktop' points at the previous backchain pointer. */ ++ valp stacktop; ++ ++ /* 'gpr_base' points at the space for gpr3, and grows upwards as ++ we use GPR registers. */ ++ valp gpr_base; ++ int intarg_count; ++ ++#ifndef __NO_FPRS__ ++ /* 'fpr_base' points at the space for fpr1, and grows upwards as ++ we use FPR registers. */ ++ valp fpr_base; ++ int fparg_count; ++#endif ++ ++ /* 'copy_space' grows down as we put structures in it. It should ++ stay 16-byte aligned. */ ++ valp copy_space; ++ ++ /* 'next_arg' grows up as we put parameters in it. */ ++ valp next_arg; ++ ++ int i; ++ ffi_type **ptr; ++#ifndef __NO_FPRS__ ++ double double_tmp; ++#endif ++ union ++ { ++ void **v; ++ char **c; ++ signed char **sc; ++ unsigned char **uc; ++ signed short **ss; ++ unsigned short **us; ++ unsigned int **ui; ++ long long **ll; ++ float **f; ++ double **d; ++ } p_argv; ++ size_t struct_copy_size; ++ unsigned gprvalue; ++ ++ stacktop.c = (char *) stack + bytes; ++ gpr_base.u = stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS; ++ intarg_count = 0; ++#ifndef __NO_FPRS__ ++ fpr_base.d = gpr_base.d - NUM_FPR_ARG_REGISTERS; ++ fparg_count = 0; ++ copy_space.c = ((flags & FLAG_FP_ARGUMENTS) ? fpr_base.c : gpr_base.c); ++#else ++ copy_space.c = gpr_base.c; ++#endif ++ next_arg.u = stack + 2; ++ ++ /* Check that everything starts aligned properly. */ ++ FFI_ASSERT (((unsigned long) (char *) stack & 0xF) == 0); ++ FFI_ASSERT (((unsigned long) copy_space.c & 0xF) == 0); ++ FFI_ASSERT (((unsigned long) stacktop.c & 0xF) == 0); ++ FFI_ASSERT ((bytes & 0xF) == 0); ++ FFI_ASSERT (copy_space.c >= next_arg.c); ++ ++ /* Deal with return values that are actually pass-by-reference. */ ++ if (flags & FLAG_RETVAL_REFERENCE) ++ { ++ *gpr_base.u++ = (unsigned long) (char *) ecif->rvalue; ++ intarg_count++; ++ } ++ ++ /* Now for the arguments. */ ++ p_argv.v = ecif->avalue; ++ for (ptr = ecif->cif->arg_types, i = ecif->cif->nargs; ++ i > 0; ++ i--, ptr++, p_argv.v++) ++ { ++ unsigned int typenum = (*ptr)->type; ++ ++ typenum = translate_float (ecif->cif->abi, typenum); ++ ++ /* Now test the translated value */ ++ switch (typenum) ++ { ++#ifndef __NO_FPRS__ ++# if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++ case FFI_TYPE_LONGDOUBLE: ++ double_tmp = (*p_argv.d)[0]; ++ ++ if (fparg_count >= NUM_FPR_ARG_REGISTERS - 1) ++ { ++ if (intarg_count >= NUM_GPR_ARG_REGISTERS ++ && intarg_count % 2 != 0) ++ { ++ intarg_count++; ++ next_arg.u++; ++ } ++ *next_arg.d = double_tmp; ++ next_arg.u += 2; ++ double_tmp = (*p_argv.d)[1]; ++ *next_arg.d = double_tmp; ++ next_arg.u += 2; ++ } ++ else ++ { ++ *fpr_base.d++ = double_tmp; ++ double_tmp = (*p_argv.d)[1]; ++ *fpr_base.d++ = double_tmp; ++ } ++ ++ fparg_count += 2; ++ FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); ++ break; ++# endif ++ case FFI_TYPE_DOUBLE: ++ double_tmp = **p_argv.d; ++ ++ if (fparg_count >= NUM_FPR_ARG_REGISTERS) ++ { ++ if (intarg_count >= NUM_GPR_ARG_REGISTERS ++ && intarg_count % 2 != 0) ++ { ++ intarg_count++; ++ next_arg.u++; ++ } ++ *next_arg.d = double_tmp; ++ next_arg.u += 2; ++ } ++ else ++ *fpr_base.d++ = double_tmp; ++ fparg_count++; ++ FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); ++ break; ++ ++ case FFI_TYPE_FLOAT: ++ double_tmp = **p_argv.f; ++ if (fparg_count >= NUM_FPR_ARG_REGISTERS) ++ { ++ *next_arg.f = (float) double_tmp; ++ next_arg.u += 1; ++ intarg_count++; ++ } ++ else ++ *fpr_base.d++ = double_tmp; ++ fparg_count++; ++ FFI_ASSERT (flags & FLAG_FP_ARGUMENTS); ++ break; ++#endif /* have FPRs */ ++ ++ case FFI_TYPE_UINT128: ++ /* The soft float ABI for long doubles works like this, a long double ++ is passed in four consecutive GPRs if available. A maximum of 2 ++ long doubles can be passed in gprs. If we do not have 4 GPRs ++ left, the long double is passed on the stack, 4-byte aligned. */ ++ { ++ unsigned int int_tmp; ++ unsigned int ii; ++ if (intarg_count >= NUM_GPR_ARG_REGISTERS - 3) ++ { ++ if (intarg_count < NUM_GPR_ARG_REGISTERS) ++ intarg_count = NUM_GPR_ARG_REGISTERS; ++ for (ii = 0; ii < 4; ii++) ++ { ++ int_tmp = (*p_argv.ui)[ii]; ++ *next_arg.u++ = int_tmp; ++ } ++ } ++ else ++ { ++ for (ii = 0; ii < 4; ii++) ++ { ++ int_tmp = (*p_argv.ui)[ii]; ++ *gpr_base.u++ = int_tmp; ++ } ++ } ++ intarg_count += 4; ++ break; ++ } ++ ++ case FFI_TYPE_UINT64: ++ case FFI_TYPE_SINT64: ++ if (intarg_count == NUM_GPR_ARG_REGISTERS-1) ++ intarg_count++; ++ if (intarg_count >= NUM_GPR_ARG_REGISTERS) ++ { ++ if (intarg_count % 2 != 0) ++ { ++ intarg_count++; ++ next_arg.u++; ++ } ++ *next_arg.ll = **p_argv.ll; ++ next_arg.u += 2; ++ } ++ else ++ { ++ /* The abi states only certain register pairs can be ++ used for passing long long int specifically (r3,r4), ++ (r5,r6), (r7,r8), (r9,r10). If next arg is long long ++ but not correct starting register of pair then skip ++ until the proper starting register. */ ++ if (intarg_count % 2 != 0) ++ { ++ intarg_count ++; ++ gpr_base.u++; ++ } ++ *gpr_base.ll++ = **p_argv.ll; ++ } ++ intarg_count += 2; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ struct_copy_size = ((*ptr)->size + 15) & ~0xF; ++ copy_space.c -= struct_copy_size; ++ memcpy (copy_space.c, *p_argv.c, (*ptr)->size); ++ ++ gprvalue = (unsigned long) copy_space.c; ++ ++ FFI_ASSERT (copy_space.c > next_arg.c); ++ FFI_ASSERT (flags & FLAG_ARG_NEEDS_COPY); ++ goto putgpr; ++ ++ case FFI_TYPE_UINT8: ++ gprvalue = **p_argv.uc; ++ goto putgpr; ++ case FFI_TYPE_SINT8: ++ gprvalue = **p_argv.sc; ++ goto putgpr; ++ case FFI_TYPE_UINT16: ++ gprvalue = **p_argv.us; ++ goto putgpr; ++ case FFI_TYPE_SINT16: ++ gprvalue = **p_argv.ss; ++ goto putgpr; ++ ++ case FFI_TYPE_INT: ++ case FFI_TYPE_UINT32: ++ case FFI_TYPE_SINT32: ++ case FFI_TYPE_POINTER: ++ ++ gprvalue = **p_argv.ui; ++ ++ putgpr: ++ if (intarg_count >= NUM_GPR_ARG_REGISTERS) ++ *next_arg.u++ = gprvalue; ++ else ++ *gpr_base.u++ = gprvalue; ++ intarg_count++; ++ break; ++ } ++ } ++ ++ /* Check that we didn't overrun the stack... */ ++ FFI_ASSERT (copy_space.c >= next_arg.c); ++ FFI_ASSERT (gpr_base.u <= stacktop.u - ASM_NEEDS_REGISTERS); ++ /* The assert below is testing that the number of integer arguments agrees ++ with the number found in ffi_prep_cif_machdep(). However, intarg_count ++ is incremented whenever we place an FP arg on the stack, so account for ++ that before our assert test. */ ++#ifndef __NO_FPRS__ ++ if (fparg_count > NUM_FPR_ARG_REGISTERS) ++ intarg_count -= fparg_count - NUM_FPR_ARG_REGISTERS; ++ FFI_ASSERT (fpr_base.u ++ <= stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS); ++#endif ++ FFI_ASSERT (flags & FLAG_4_GPR_ARGUMENTS || intarg_count <= 4); ++} ++ ++#define MIN_CACHE_LINE_SIZE 8 ++ ++static void ++flush_icache (char *wraddr, char *xaddr, int size) ++{ ++ int i; ++ for (i = 0; i < size; i += MIN_CACHE_LINE_SIZE) ++ __asm__ volatile ("icbi 0,%0;" "dcbf 0,%1;" ++ : : "r" (xaddr + i), "r" (wraddr + i) : "memory"); ++ __asm__ volatile ("icbi 0,%0;" "dcbf 0,%1;" "sync;" "isync;" ++ : : "r"(xaddr + size - 1), "r"(wraddr + size - 1) ++ : "memory"); ++} ++ ++ffi_status FFI_HIDDEN ++ffi_prep_closure_loc_sysv (ffi_closure *closure, ++ ffi_cif *cif, ++ void (*fun) (ffi_cif *, void *, void **, void *), ++ void *user_data, ++ void *codeloc) ++{ ++ unsigned int *tramp; ++ ++ if (cif->abi < FFI_SYSV || cif->abi >= FFI_LAST_ABI) ++ return FFI_BAD_ABI; ++ ++ tramp = (unsigned int *) &closure->tramp[0]; ++ tramp[0] = 0x7c0802a6; /* mflr r0 */ ++ tramp[1] = 0x4800000d; /* bl 10 */ ++ tramp[4] = 0x7d6802a6; /* mflr r11 */ ++ tramp[5] = 0x7c0803a6; /* mtlr r0 */ ++ tramp[6] = 0x800b0000; /* lwz r0,0(r11) */ ++ tramp[7] = 0x816b0004; /* lwz r11,4(r11) */ ++ tramp[8] = 0x7c0903a6; /* mtctr r0 */ ++ tramp[9] = 0x4e800420; /* bctr */ ++ *(void **) &tramp[2] = (void *) ffi_closure_SYSV; /* function */ ++ *(void **) &tramp[3] = codeloc; /* context */ ++ ++ /* Flush the icache. */ ++ flush_icache ((char *)tramp, (char *)codeloc, FFI_TRAMPOLINE_SIZE); ++ ++ closure->cif = cif; ++ closure->fun = fun; ++ closure->user_data = user_data; ++ ++ return FFI_OK; ++} ++ ++/* Basically the trampoline invokes ffi_closure_SYSV, and on ++ entry, r11 holds the address of the closure. ++ After storing the registers that could possibly contain ++ parameters to be passed into the stack frame and setting ++ up space for a return value, ffi_closure_SYSV invokes the ++ following helper function to do most of the work. */ ++ ++int ++ffi_closure_helper_SYSV (ffi_closure *closure, void *rvalue, ++ unsigned long *pgr, ffi_dblfl *pfr, ++ unsigned long *pst) ++{ ++ /* rvalue is the pointer to space for return value in closure assembly */ ++ /* pgr is the pointer to where r3-r10 are stored in ffi_closure_SYSV */ ++ /* pfr is the pointer to where f1-f8 are stored in ffi_closure_SYSV */ ++ /* pst is the pointer to outgoing parameter stack in original caller */ ++ ++ void ** avalue; ++ ffi_type ** arg_types; ++ long i, avn; ++#ifndef __NO_FPRS__ ++ long nf = 0; /* number of floating registers already used */ ++#endif ++ long ng = 0; /* number of general registers already used */ ++ ++ ffi_cif *cif = closure->cif; ++ unsigned size = cif->rtype->size; ++ unsigned short rtypenum = cif->rtype->type; ++ ++ avalue = alloca (cif->nargs * sizeof (void *)); ++ ++ /* First translate for softfloat/nonlinux */ ++ rtypenum = translate_float (cif->abi, rtypenum); ++ ++ /* Copy the caller's structure return value address so that the closure ++ returns the data directly to the caller. ++ For FFI_SYSV the result is passed in r3/r4 if the struct size is less ++ or equal 8 bytes. */ ++ if (rtypenum == FFI_TYPE_STRUCT ++ && !((cif->abi & FFI_SYSV_STRUCT_RET) != 0 && size <= 8)) ++ { ++ rvalue = (void *) *pgr; ++ ng++; ++ pgr++; ++ } ++ ++ i = 0; ++ avn = cif->nargs; ++ arg_types = cif->arg_types; ++ ++ /* Grab the addresses of the arguments from the stack frame. */ ++ while (i < avn) { ++ unsigned short typenum = arg_types[i]->type; ++ ++ /* We may need to handle some values depending on ABI. */ ++ typenum = translate_float (cif->abi, typenum); ++ ++ switch (typenum) ++ { ++#ifndef __NO_FPRS__ ++ case FFI_TYPE_FLOAT: ++ /* Unfortunately float values are stored as doubles ++ in the ffi_closure_SYSV code (since we don't check ++ the type in that routine). */ ++ if (nf < NUM_FPR_ARG_REGISTERS) ++ { ++ /* FIXME? here we are really changing the values ++ stored in the original calling routines outgoing ++ parameter stack. This is probably a really ++ naughty thing to do but... */ ++ double temp = pfr->d; ++ pfr->f = (float) temp; ++ avalue[i] = pfr; ++ nf++; ++ pfr++; ++ } ++ else ++ { ++ avalue[i] = pst; ++ pst += 1; ++ } ++ break; ++ ++ case FFI_TYPE_DOUBLE: ++ if (nf < NUM_FPR_ARG_REGISTERS) ++ { ++ avalue[i] = pfr; ++ nf++; ++ pfr++; ++ } ++ else ++ { ++ if (((long) pst) & 4) ++ pst++; ++ avalue[i] = pst; ++ pst += 2; ++ } ++ break; ++ ++# if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++ case FFI_TYPE_LONGDOUBLE: ++ if (nf < NUM_FPR_ARG_REGISTERS - 1) ++ { ++ avalue[i] = pfr; ++ pfr += 2; ++ nf += 2; ++ } ++ else ++ { ++ if (((long) pst) & 4) ++ pst++; ++ avalue[i] = pst; ++ pst += 4; ++ nf = 8; ++ } ++ break; ++# endif ++#endif ++ ++ case FFI_TYPE_UINT128: ++ /* Test if for the whole long double, 4 gprs are available. ++ otherwise the stuff ends up on the stack. */ ++ if (ng < NUM_GPR_ARG_REGISTERS - 3) ++ { ++ avalue[i] = pgr; ++ pgr += 4; ++ ng += 4; ++ } ++ else ++ { ++ avalue[i] = pst; ++ pst += 4; ++ ng = 8+4; ++ } ++ break; ++ ++ case FFI_TYPE_SINT8: ++ case FFI_TYPE_UINT8: ++#ifndef __LITTLE_ENDIAN__ ++ if (ng < NUM_GPR_ARG_REGISTERS) ++ { ++ avalue[i] = (char *) pgr + 3; ++ ng++; ++ pgr++; ++ } ++ else ++ { ++ avalue[i] = (char *) pst + 3; ++ pst++; ++ } ++ break; ++#endif ++ ++ case FFI_TYPE_SINT16: ++ case FFI_TYPE_UINT16: ++#ifndef __LITTLE_ENDIAN__ ++ if (ng < NUM_GPR_ARG_REGISTERS) ++ { ++ avalue[i] = (char *) pgr + 2; ++ ng++; ++ pgr++; ++ } ++ else ++ { ++ avalue[i] = (char *) pst + 2; ++ pst++; ++ } ++ break; ++#endif ++ ++ case FFI_TYPE_SINT32: ++ case FFI_TYPE_UINT32: ++ case FFI_TYPE_POINTER: ++ if (ng < NUM_GPR_ARG_REGISTERS) ++ { ++ avalue[i] = pgr; ++ ng++; ++ pgr++; ++ } ++ else ++ { ++ avalue[i] = pst; ++ pst++; ++ } ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ /* Structs are passed by reference. The address will appear in a ++ gpr if it is one of the first 8 arguments. */ ++ if (ng < NUM_GPR_ARG_REGISTERS) ++ { ++ avalue[i] = (void *) *pgr; ++ ng++; ++ pgr++; ++ } ++ else ++ { ++ avalue[i] = (void *) *pst; ++ pst++; ++ } ++ break; ++ ++ case FFI_TYPE_SINT64: ++ case FFI_TYPE_UINT64: ++ /* Passing long long ints are complex, they must ++ be passed in suitable register pairs such as ++ (r3,r4) or (r5,r6) or (r6,r7), or (r7,r8) or (r9,r10) ++ and if the entire pair aren't available then the outgoing ++ parameter stack is used for both but an alignment of 8 ++ must will be kept. So we must either look in pgr ++ or pst to find the correct address for this type ++ of parameter. */ ++ if (ng < NUM_GPR_ARG_REGISTERS - 1) ++ { ++ if (ng & 1) ++ { ++ /* skip r4, r6, r8 as starting points */ ++ ng++; ++ pgr++; ++ } ++ avalue[i] = pgr; ++ ng += 2; ++ pgr += 2; ++ } ++ else ++ { ++ if (((long) pst) & 4) ++ pst++; ++ avalue[i] = pst; ++ pst += 2; ++ ng = NUM_GPR_ARG_REGISTERS; ++ } ++ break; ++ ++ default: ++ FFI_ASSERT (0); ++ } ++ ++ i++; ++ } ++ ++ (closure->fun) (cif, rvalue, avalue, closure->user_data); ++ ++ /* Tell ffi_closure_SYSV how to perform return type promotions. ++ Because the FFI_SYSV ABI returns the structures <= 8 bytes in ++ r3/r4 we have to tell ffi_closure_SYSV how to treat them. We ++ combine the base type FFI_SYSV_TYPE_SMALL_STRUCT with the size of ++ the struct less one. We never have a struct with size zero. ++ See the comment in ffitarget.h about ordering. */ ++ if (rtypenum == FFI_TYPE_STRUCT ++ && (cif->abi & FFI_SYSV_STRUCT_RET) != 0 && size <= 8) ++ return FFI_SYSV_TYPE_SMALL_STRUCT - 1 + size; ++ return rtypenum; ++} ++#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/ffitarget.h +--- a/Modules/_ctypes/libffi/src/powerpc/ffitarget.h ++++ b/Modules/_ctypes/libffi/src/powerpc/ffitarget.h +@@ -60,45 +60,76 @@ + typedef enum ffi_abi { + FFI_FIRST_ABI = 0, + +-#ifdef POWERPC +- FFI_SYSV, +- FFI_GCC_SYSV, +- FFI_LINUX64, +- FFI_LINUX, +- FFI_LINUX_SOFT_FLOAT, +-# if defined(POWERPC64) +- FFI_DEFAULT_ABI = FFI_LINUX64, +-# elif defined(__NO_FPRS__) +- FFI_DEFAULT_ABI = FFI_LINUX_SOFT_FLOAT, +-# elif (__LDBL_MANT_DIG__ == 106) +- FFI_DEFAULT_ABI = FFI_LINUX, ++#if defined (POWERPC_AIX) ++ FFI_AIX, ++ FFI_DARWIN, ++ FFI_DEFAULT_ABI = FFI_AIX, ++ FFI_LAST_ABI ++ ++#elif defined (POWERPC_DARWIN) ++ FFI_AIX, ++ FFI_DARWIN, ++ FFI_DEFAULT_ABI = FFI_DARWIN, ++ FFI_LAST_ABI ++ ++#else ++ /* The FFI_COMPAT values are used by old code. Since libffi may be ++ a shared library we have to support old values for backwards ++ compatibility. */ ++ FFI_COMPAT_SYSV, ++ FFI_COMPAT_GCC_SYSV, ++ FFI_COMPAT_LINUX64, ++ FFI_COMPAT_LINUX, ++ FFI_COMPAT_LINUX_SOFT_FLOAT, ++ ++# if defined (POWERPC64) ++ /* This bit, always set in new code, must not be set in any of the ++ old FFI_COMPAT values that might be used for 64-bit linux. We ++ only need worry about FFI_COMPAT_LINUX64, but to be safe avoid ++ all old values. */ ++ FFI_LINUX = 8, ++ /* This and following bits can reuse FFI_COMPAT values. */ ++ FFI_LINUX_STRUCT_ALIGN = 1, ++ FFI_LINUX_LONG_DOUBLE_128 = 2, ++ FFI_DEFAULT_ABI = (FFI_LINUX ++# ifdef __STRUCT_PARM_ALIGN__ ++ | FFI_LINUX_STRUCT_ALIGN ++# endif ++# ifdef __LONG_DOUBLE_128__ ++ | FFI_LINUX_LONG_DOUBLE_128 ++# endif ++ ), ++ FFI_LAST_ABI = 12 ++ + # else +- FFI_DEFAULT_ABI = FFI_GCC_SYSV, ++ /* This bit, always set in new code, must not be set in any of the ++ old FFI_COMPAT values that might be used for 32-bit linux/sysv/bsd. */ ++ FFI_SYSV = 8, ++ /* This and following bits can reuse FFI_COMPAT values. */ ++ FFI_SYSV_SOFT_FLOAT = 1, ++ FFI_SYSV_STRUCT_RET = 2, ++ FFI_SYSV_IBM_LONG_DOUBLE = 4, ++ FFI_SYSV_LONG_DOUBLE_128 = 16, ++ ++ FFI_DEFAULT_ABI = (FFI_SYSV ++# ifdef __NO_FPRS__ ++ | FFI_SYSV_SOFT_FLOAT ++# endif ++# if (defined (__SVR4_STRUCT_RETURN) \ ++ || defined (POWERPC_FREEBSD) && !defined (__AIX_STRUCT_RETURN)) ++ | FFI_SYSV_STRUCT_RET ++# endif ++# if __LDBL_MANT_DIG__ == 106 ++ | FFI_SYSV_IBM_LONG_DOUBLE ++# endif ++# ifdef __LONG_DOUBLE_128__ ++ | FFI_SYSV_LONG_DOUBLE_128 ++# endif ++ ), ++ FFI_LAST_ABI = 32 + # endif + #endif + +-#ifdef POWERPC_AIX +- FFI_AIX, +- FFI_DARWIN, +- FFI_DEFAULT_ABI = FFI_AIX, +-#endif +- +-#ifdef POWERPC_DARWIN +- FFI_AIX, +- FFI_DARWIN, +- FFI_DEFAULT_ABI = FFI_DARWIN, +-#endif +- +-#ifdef POWERPC_FREEBSD +- FFI_SYSV, +- FFI_GCC_SYSV, +- FFI_LINUX64, +- FFI_LINUX, +- FFI_LINUX_SOFT_FLOAT, +- FFI_DEFAULT_ABI = FFI_SYSV, +-#endif +- +- FFI_LAST_ABI + } ffi_abi; + #endif + +@@ -106,6 +137,10 @@ + + #define FFI_CLOSURES 1 + #define FFI_NATIVE_RAW_API 0 ++#if defined (POWERPC) || defined (POWERPC_FREEBSD) ++# define FFI_TARGET_SPECIFIC_VARIADIC 1 ++# define FFI_EXTRA_CIF_FIELDS unsigned nfixedargs ++#endif + + /* For additional types like the below, take care about the order in + ppc_closures.S. They must follow after the FFI_TYPE_LAST. */ +@@ -113,19 +148,26 @@ + /* Needed for soft-float long-double-128 support. */ + #define FFI_TYPE_UINT128 (FFI_TYPE_LAST + 1) + +-/* Needed for FFI_SYSV small structure returns. +- We use two flag bits, (FLAG_SYSV_SMST_R3, FLAG_SYSV_SMST_R4) which are +- defined in ffi.c, to determine the exact return type and its size. */ ++/* Needed for FFI_SYSV small structure returns. */ + #define FFI_SYSV_TYPE_SMALL_STRUCT (FFI_TYPE_LAST + 2) + +-#if defined(POWERPC64) || defined(POWERPC_AIX) ++/* Used by ELFv2 for homogenous structure returns. */ ++#define FFI_V2_TYPE_FLOAT_HOMOG (FFI_TYPE_LAST + 1) ++#define FFI_V2_TYPE_DOUBLE_HOMOG (FFI_TYPE_LAST + 2) ++#define FFI_V2_TYPE_SMALL_STRUCT (FFI_TYPE_LAST + 3) ++ ++#if _CALL_ELF == 2 ++# define FFI_TRAMPOLINE_SIZE 32 ++#else ++# if defined(POWERPC64) || defined(POWERPC_AIX) + # if defined(POWERPC_DARWIN64) + # define FFI_TRAMPOLINE_SIZE 48 + # else + # define FFI_TRAMPOLINE_SIZE 24 + # endif +-#else /* POWERPC || POWERPC_AIX */ ++# else /* POWERPC || POWERPC_AIX */ + # define FFI_TRAMPOLINE_SIZE 40 ++# endif + #endif + + #ifndef LIBFFI_ASM +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/linux64.S +--- a/Modules/_ctypes/libffi/src/powerpc/linux64.S ++++ b/Modules/_ctypes/libffi/src/powerpc/linux64.S +@@ -29,18 +29,25 @@ + #include + #include + +-#ifdef __powerpc64__ ++#ifdef POWERPC64 + .hidden ffi_call_LINUX64 + .globl ffi_call_LINUX64 ++# if _CALL_ELF == 2 ++ .text ++ffi_call_LINUX64: ++ addis %r2, %r12, .TOC.-ffi_call_LINUX64@ha ++ addi %r2, %r2, .TOC.-ffi_call_LINUX64@l ++ .localentry ffi_call_LINUX64, . - ffi_call_LINUX64 ++# else + .section ".opd","aw" + .align 3 + ffi_call_LINUX64: +-#ifdef _CALL_LINUX ++# ifdef _CALL_LINUX + .quad .L.ffi_call_LINUX64,.TOC.@tocbase,0 + .type ffi_call_LINUX64,@function + .text + .L.ffi_call_LINUX64: +-#else ++# else + .hidden .ffi_call_LINUX64 + .globl .ffi_call_LINUX64 + .quad .ffi_call_LINUX64,.TOC.@tocbase,0 +@@ -48,7 +55,8 @@ + .type .ffi_call_LINUX64,@function + .text + .ffi_call_LINUX64: +-#endif ++# endif ++# endif + .LFB1: + mflr %r0 + std %r28, -32(%r1) +@@ -63,26 +71,35 @@ + mr %r31, %r5 /* flags, */ + mr %r30, %r6 /* rvalue, */ + mr %r29, %r7 /* function address. */ ++/* Save toc pointer, not for the ffi_prep_args64 call, but for the later ++ bctrl function call. */ ++# if _CALL_ELF == 2 ++ std %r2, 24(%r1) ++# else + std %r2, 40(%r1) ++# endif + + /* Call ffi_prep_args64. */ + mr %r4, %r1 +-#ifdef _CALL_LINUX ++# if defined _CALL_LINUX || _CALL_ELF == 2 + bl ffi_prep_args64 +-#else ++# else + bl .ffi_prep_args64 +-#endif ++# endif + +- ld %r0, 0(%r29) ++# if _CALL_ELF == 2 ++ mr %r12, %r29 ++# else ++ ld %r12, 0(%r29) + ld %r2, 8(%r29) + ld %r11, 16(%r29) +- ++# endif + /* Now do the call. */ + /* Set up cr1 with bits 4-7 of the flags. */ + mtcrf 0x40, %r31 + + /* Get the address to call into CTR. */ +- mtctr %r0 ++ mtctr %r12 + /* Load all those argument registers. */ + ld %r3, -32-(8*8)(%r28) + ld %r4, -32-(7*8)(%r28) +@@ -117,12 +134,17 @@ + + /* This must follow the call immediately, the unwinder + uses this to find out if r2 has been saved or not. */ ++# if _CALL_ELF == 2 ++ ld %r2, 24(%r1) ++# else + ld %r2, 40(%r1) ++# endif + + /* Now, deal with the return value. */ + mtcrf 0x01, %r31 +- bt- 30, .Ldone_return_value +- bt- 29, .Lfp_return_value ++ bt 31, .Lstruct_return_value ++ bt 30, .Ldone_return_value ++ bt 29, .Lfp_return_value + std %r3, 0(%r30) + /* Fall through... */ + +@@ -130,7 +152,7 @@ + /* Restore the registers we used and return. */ + mr %r1, %r28 + ld %r0, 16(%r28) +- ld %r28, -32(%r1) ++ ld %r28, -32(%r28) + mtlr %r0 + ld %r29, -24(%r1) + ld %r30, -16(%r1) +@@ -147,14 +169,48 @@ + .Lfloat_return_value: + stfs %f1, 0(%r30) + b .Ldone_return_value ++ ++.Lstruct_return_value: ++ bf 29, .Lsmall_struct ++ bf 28, .Lfloat_homog_return_value ++ stfd %f1, 0(%r30) ++ stfd %f2, 8(%r30) ++ stfd %f3, 16(%r30) ++ stfd %f4, 24(%r30) ++ stfd %f5, 32(%r30) ++ stfd %f6, 40(%r30) ++ stfd %f7, 48(%r30) ++ stfd %f8, 56(%r30) ++ b .Ldone_return_value ++ ++.Lfloat_homog_return_value: ++ stfs %f1, 0(%r30) ++ stfs %f2, 4(%r30) ++ stfs %f3, 8(%r30) ++ stfs %f4, 12(%r30) ++ stfs %f5, 16(%r30) ++ stfs %f6, 20(%r30) ++ stfs %f7, 24(%r30) ++ stfs %f8, 28(%r30) ++ b .Ldone_return_value ++ ++.Lsmall_struct: ++ std %r3, 0(%r30) ++ std %r4, 8(%r30) ++ b .Ldone_return_value ++ + .LFE1: + .long 0 + .byte 0,12,0,1,128,4,0,0 +-#ifdef _CALL_LINUX ++# if _CALL_ELF == 2 ++ .size ffi_call_LINUX64,.-ffi_call_LINUX64 ++# else ++# ifdef _CALL_LINUX + .size ffi_call_LINUX64,.-.L.ffi_call_LINUX64 +-#else ++# else + .size .ffi_call_LINUX64,.-.ffi_call_LINUX64 +-#endif ++# endif ++# endif + + .section .eh_frame,EH_FRAME_FLAGS,@progbits + .Lframe1: +@@ -197,8 +253,8 @@ + .uleb128 0x4 + .align 3 + .LEFDE1: ++ ++# if (defined __ELF__ && defined __linux__) || _CALL_ELF == 2 ++ .section .note.GNU-stack,"",@progbits ++# endif + #endif +- +-#if defined __ELF__ && defined __linux__ +- .section .note.GNU-stack,"",@progbits +-#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/linux64_closure.S +--- a/Modules/_ctypes/libffi/src/powerpc/linux64_closure.S ++++ b/Modules/_ctypes/libffi/src/powerpc/linux64_closure.S +@@ -30,18 +30,25 @@ + + .file "linux64_closure.S" + +-#ifdef __powerpc64__ ++#ifdef POWERPC64 + FFI_HIDDEN (ffi_closure_LINUX64) + .globl ffi_closure_LINUX64 ++# if _CALL_ELF == 2 ++ .text ++ffi_closure_LINUX64: ++ addis %r2, %r12, .TOC.-ffi_closure_LINUX64@ha ++ addi %r2, %r2, .TOC.-ffi_closure_LINUX64@l ++ .localentry ffi_closure_LINUX64, . - ffi_closure_LINUX64 ++# else + .section ".opd","aw" + .align 3 + ffi_closure_LINUX64: +-#ifdef _CALL_LINUX ++# ifdef _CALL_LINUX + .quad .L.ffi_closure_LINUX64,.TOC.@tocbase,0 + .type ffi_closure_LINUX64,@function + .text + .L.ffi_closure_LINUX64: +-#else ++# else + FFI_HIDDEN (.ffi_closure_LINUX64) + .globl .ffi_closure_LINUX64 + .quad .ffi_closure_LINUX64,.TOC.@tocbase,0 +@@ -49,61 +56,105 @@ + .type .ffi_closure_LINUX64,@function + .text + .ffi_closure_LINUX64: +-#endif ++# endif ++# endif ++ ++# if _CALL_ELF == 2 ++# 32 byte special reg save area + 64 byte parm save area ++# + 64 byte retval area + 13*8 fpr save area + round to 16 ++# define STACKFRAME 272 ++# define PARMSAVE 32 ++# define RETVAL PARMSAVE+64 ++# else ++# 48 bytes special reg save area + 64 bytes parm save area ++# + 16 bytes retval area + 13*8 bytes fpr save area + round to 16 ++# define STACKFRAME 240 ++# define PARMSAVE 48 ++# define RETVAL PARMSAVE+64 ++# endif ++ + .LFB1: +- # save general regs into parm save area +- std %r3, 48(%r1) +- std %r4, 56(%r1) +- std %r5, 64(%r1) +- std %r6, 72(%r1) ++# if _CALL_ELF == 2 ++ ld %r12, FFI_TRAMPOLINE_SIZE(%r11) # closure->cif + mflr %r0 ++ lwz %r12, 28(%r12) # cif->flags ++ mtcrf 0x40, %r12 ++ addi %r12, %r1, PARMSAVE ++ bt 7, .Lparmsave ++ # Our caller has not allocated a parameter save area. ++ # We need to allocate one here and use it to pass gprs to ++ # ffi_closure_helper_LINUX64. ++ addi %r12, %r1, -STACKFRAME+PARMSAVE ++.Lparmsave: ++ std %r0, 16(%r1) ++ # Save general regs into parm save area ++ std %r3, 0(%r12) ++ std %r4, 8(%r12) ++ std %r5, 16(%r12) ++ std %r6, 24(%r12) ++ std %r7, 32(%r12) ++ std %r8, 40(%r12) ++ std %r9, 48(%r12) ++ std %r10, 56(%r12) + +- std %r7, 80(%r1) +- std %r8, 88(%r1) +- std %r9, 96(%r1) +- std %r10, 104(%r1) ++ # load up the pointer to the parm save area ++ mr %r5, %r12 ++# else ++ # copy r2 to r11 and load TOC into r2 ++ mr %r11, %r2 ++ ld %r2, 16(%r11) ++ ++ mflr %r0 ++ # Save general regs into parm save area ++ # This is the parameter save area set up by our caller. ++ std %r3, PARMSAVE+0(%r1) ++ std %r4, PARMSAVE+8(%r1) ++ std %r5, PARMSAVE+16(%r1) ++ std %r6, PARMSAVE+24(%r1) ++ std %r7, PARMSAVE+32(%r1) ++ std %r8, PARMSAVE+40(%r1) ++ std %r9, PARMSAVE+48(%r1) ++ std %r10, PARMSAVE+56(%r1) ++ + std %r0, 16(%r1) + +- # mandatory 48 bytes special reg save area + 64 bytes parm save area +- # + 16 bytes retval area + 13*8 bytes fpr save area + round to 16 +- stdu %r1, -240(%r1) ++ # load up the pointer to the parm save area ++ addi %r5, %r1, PARMSAVE ++# endif ++ ++ # next save fpr 1 to fpr 13 ++ stfd %f1, -104+(0*8)(%r1) ++ stfd %f2, -104+(1*8)(%r1) ++ stfd %f3, -104+(2*8)(%r1) ++ stfd %f4, -104+(3*8)(%r1) ++ stfd %f5, -104+(4*8)(%r1) ++ stfd %f6, -104+(5*8)(%r1) ++ stfd %f7, -104+(6*8)(%r1) ++ stfd %f8, -104+(7*8)(%r1) ++ stfd %f9, -104+(8*8)(%r1) ++ stfd %f10, -104+(9*8)(%r1) ++ stfd %f11, -104+(10*8)(%r1) ++ stfd %f12, -104+(11*8)(%r1) ++ stfd %f13, -104+(12*8)(%r1) ++ ++ # load up the pointer to the saved fpr registers */ ++ addi %r6, %r1, -104 ++ ++ # load up the pointer to the result storage ++ addi %r4, %r1, -STACKFRAME+RETVAL ++ ++ stdu %r1, -STACKFRAME(%r1) + .LCFI0: + +- # next save fpr 1 to fpr 13 +- stfd %f1, 128+(0*8)(%r1) +- stfd %f2, 128+(1*8)(%r1) +- stfd %f3, 128+(2*8)(%r1) +- stfd %f4, 128+(3*8)(%r1) +- stfd %f5, 128+(4*8)(%r1) +- stfd %f6, 128+(5*8)(%r1) +- stfd %f7, 128+(6*8)(%r1) +- stfd %f8, 128+(7*8)(%r1) +- stfd %f9, 128+(8*8)(%r1) +- stfd %f10, 128+(9*8)(%r1) +- stfd %f11, 128+(10*8)(%r1) +- stfd %f12, 128+(11*8)(%r1) +- stfd %f13, 128+(12*8)(%r1) +- +- # set up registers for the routine that actually does the work + # get the context pointer from the trampoline +- mr %r3, %r11 +- +- # now load up the pointer to the result storage +- addi %r4, %r1, 112 +- +- # now load up the pointer to the parameter save area +- # in the previous frame +- addi %r5, %r1, 240 + 48 +- +- # now load up the pointer to the saved fpr registers */ +- addi %r6, %r1, 128 ++ mr %r3, %r11 + + # make the call +-#ifdef _CALL_LINUX ++# if defined _CALL_LINUX || _CALL_ELF == 2 + bl ffi_closure_helper_LINUX64 +-#else ++# else + bl .ffi_closure_helper_LINUX64 +-#endif ++# endif + .Lret: + + # now r3 contains the return type +@@ -112,10 +163,12 @@ + + # look up the proper starting point in table + # by using return type as offset ++ ld %r0, STACKFRAME+16(%r1) ++ cmpldi %r3, FFI_V2_TYPE_SMALL_STRUCT ++ bge .Lsmall + mflr %r4 # move address of .Lret to r4 + sldi %r3, %r3, 4 # now multiply return type by 16 + addi %r4, %r4, .Lret_type0 - .Lret +- ld %r0, 240+16(%r1) + add %r3, %r3, %r4 # add contents of table to table address + mtctr %r3 + bctr # jump to it +@@ -128,89 +181,175 @@ + .Lret_type0: + # case FFI_TYPE_VOID + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + nop + # case FFI_TYPE_INT +- lwa %r3, 112+4(%r1) ++# ifdef __LITTLE_ENDIAN__ ++ lwa %r3, RETVAL+0(%r1) ++# else ++ lwa %r3, RETVAL+4(%r1) ++# endif + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + # case FFI_TYPE_FLOAT +- lfs %f1, 112+0(%r1) ++ lfs %f1, RETVAL+0(%r1) + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + # case FFI_TYPE_DOUBLE +- lfd %f1, 112+0(%r1) ++ lfd %f1, RETVAL+0(%r1) + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + # case FFI_TYPE_LONGDOUBLE +- lfd %f1, 112+0(%r1) ++ lfd %f1, RETVAL+0(%r1) + mtlr %r0 +- lfd %f2, 112+8(%r1) ++ lfd %f2, RETVAL+8(%r1) + b .Lfinish + # case FFI_TYPE_UINT8 +- lbz %r3, 112+7(%r1) ++# ifdef __LITTLE_ENDIAN__ ++ lbz %r3, RETVAL+0(%r1) ++# else ++ lbz %r3, RETVAL+7(%r1) ++# endif + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + # case FFI_TYPE_SINT8 +- lbz %r3, 112+7(%r1) ++# ifdef __LITTLE_ENDIAN__ ++ lbz %r3, RETVAL+0(%r1) ++# else ++ lbz %r3, RETVAL+7(%r1) ++# endif + extsb %r3,%r3 + mtlr %r0 + b .Lfinish + # case FFI_TYPE_UINT16 +- lhz %r3, 112+6(%r1) ++# ifdef __LITTLE_ENDIAN__ ++ lhz %r3, RETVAL+0(%r1) ++# else ++ lhz %r3, RETVAL+6(%r1) ++# endif + mtlr %r0 + .Lfinish: +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + # case FFI_TYPE_SINT16 +- lha %r3, 112+6(%r1) ++# ifdef __LITTLE_ENDIAN__ ++ lha %r3, RETVAL+0(%r1) ++# else ++ lha %r3, RETVAL+6(%r1) ++# endif + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + # case FFI_TYPE_UINT32 +- lwz %r3, 112+4(%r1) ++# ifdef __LITTLE_ENDIAN__ ++ lwz %r3, RETVAL+0(%r1) ++# else ++ lwz %r3, RETVAL+4(%r1) ++# endif + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + # case FFI_TYPE_SINT32 +- lwa %r3, 112+4(%r1) ++# ifdef __LITTLE_ENDIAN__ ++ lwa %r3, RETVAL+0(%r1) ++# else ++ lwa %r3, RETVAL+4(%r1) ++# endif + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + # case FFI_TYPE_UINT64 +- ld %r3, 112+0(%r1) ++ ld %r3, RETVAL+0(%r1) + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + # case FFI_TYPE_SINT64 +- ld %r3, 112+0(%r1) ++ ld %r3, RETVAL+0(%r1) + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + # case FFI_TYPE_STRUCT + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr + nop + # case FFI_TYPE_POINTER +- ld %r3, 112+0(%r1) ++ ld %r3, RETVAL+0(%r1) + mtlr %r0 +- addi %r1, %r1, 240 ++ addi %r1, %r1, STACKFRAME + blr +-# esac ++# case FFI_V2_TYPE_FLOAT_HOMOG ++ lfs %f1, RETVAL+0(%r1) ++ lfs %f2, RETVAL+4(%r1) ++ lfs %f3, RETVAL+8(%r1) ++ b .Lmorefloat ++# case FFI_V2_TYPE_DOUBLE_HOMOG ++ lfd %f1, RETVAL+0(%r1) ++ lfd %f2, RETVAL+8(%r1) ++ lfd %f3, RETVAL+16(%r1) ++ lfd %f4, RETVAL+24(%r1) ++ mtlr %r0 ++ lfd %f5, RETVAL+32(%r1) ++ lfd %f6, RETVAL+40(%r1) ++ lfd %f7, RETVAL+48(%r1) ++ lfd %f8, RETVAL+56(%r1) ++ addi %r1, %r1, STACKFRAME ++ blr ++.Lmorefloat: ++ lfs %f4, RETVAL+12(%r1) ++ mtlr %r0 ++ lfs %f5, RETVAL+16(%r1) ++ lfs %f6, RETVAL+20(%r1) ++ lfs %f7, RETVAL+24(%r1) ++ lfs %f8, RETVAL+28(%r1) ++ addi %r1, %r1, STACKFRAME ++ blr ++.Lsmall: ++# ifdef __LITTLE_ENDIAN__ ++ ld %r3,RETVAL+0(%r1) ++ mtlr %r0 ++ ld %r4,RETVAL+8(%r1) ++ addi %r1, %r1, STACKFRAME ++ blr ++# else ++ # A struct smaller than a dword is returned in the low bits of r3 ++ # ie. right justified. Larger structs are passed left justified ++ # in r3 and r4. The return value area on the stack will have ++ # the structs as they are usually stored in memory. ++ cmpldi %r3, FFI_V2_TYPE_SMALL_STRUCT + 7 # size 8 bytes? ++ neg %r5, %r3 ++ ld %r3,RETVAL+0(%r1) ++ blt .Lsmalldown ++ mtlr %r0 ++ ld %r4,RETVAL+8(%r1) ++ addi %r1, %r1, STACKFRAME ++ blr ++.Lsmalldown: ++ addi %r5, %r5, FFI_V2_TYPE_SMALL_STRUCT + 7 ++ mtlr %r0 ++ sldi %r5, %r5, 3 ++ addi %r1, %r1, STACKFRAME ++ srd %r3, %r3, %r5 ++ blr ++# endif ++ + .LFE1: + .long 0 + .byte 0,12,0,1,128,0,0,0 +-#ifdef _CALL_LINUX ++# if _CALL_ELF == 2 ++ .size ffi_closure_LINUX64,.-ffi_closure_LINUX64 ++# else ++# ifdef _CALL_LINUX + .size ffi_closure_LINUX64,.-.L.ffi_closure_LINUX64 +-#else ++# else + .size .ffi_closure_LINUX64,.-.ffi_closure_LINUX64 +-#endif ++# endif ++# endif + + .section .eh_frame,EH_FRAME_FLAGS,@progbits + .Lframe1: +@@ -239,14 +378,14 @@ + .byte 0x2 # DW_CFA_advance_loc1 + .byte .LCFI0-.LFB1 + .byte 0xe # DW_CFA_def_cfa_offset +- .uleb128 240 ++ .uleb128 STACKFRAME + .byte 0x11 # DW_CFA_offset_extended_sf + .uleb128 0x41 + .sleb128 -2 + .align 3 + .LEFDE1: ++ ++# if defined __ELF__ && defined __linux__ ++ .section .note.GNU-stack,"",@progbits ++# endif + #endif +- +-#if defined __ELF__ && defined __linux__ +- .section .note.GNU-stack,"",@progbits +-#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/ppc_closure.S +--- a/Modules/_ctypes/libffi/src/powerpc/ppc_closure.S ++++ b/Modules/_ctypes/libffi/src/powerpc/ppc_closure.S +@@ -31,7 +31,7 @@ + + .file "ppc_closure.S" + +-#ifndef __powerpc64__ ++#ifndef POWERPC64 + + ENTRY(ffi_closure_SYSV) + .LFB1: +@@ -159,25 +159,41 @@ + #endif + + # case FFI_TYPE_UINT8 ++#ifdef __LITTLE_ENDIAN__ ++ lbz %r3,112+0(%r1) ++#else + lbz %r3,112+3(%r1) ++#endif + mtlr %r0 + addi %r1,%r1,144 + blr + + # case FFI_TYPE_SINT8 ++#ifdef __LITTLE_ENDIAN__ ++ lbz %r3,112+0(%r1) ++#else + lbz %r3,112+3(%r1) ++#endif + extsb %r3,%r3 + mtlr %r0 + b .Lfinish + + # case FFI_TYPE_UINT16 ++#ifdef __LITTLE_ENDIAN__ ++ lhz %r3,112+0(%r1) ++#else + lhz %r3,112+2(%r1) ++#endif + mtlr %r0 + addi %r1,%r1,144 + blr + + # case FFI_TYPE_SINT16 ++#ifdef __LITTLE_ENDIAN__ ++ lha %r3,112+0(%r1) ++#else + lha %r3,112+2(%r1) ++#endif + mtlr %r0 + addi %r1,%r1,144 + blr +@@ -222,7 +238,7 @@ + lwz %r3,112+0(%r1) + lwz %r4,112+4(%r1) + lwz %r5,112+8(%r1) +- bl .Luint128 ++ b .Luint128 + + # The return types below are only used when the ABI type is FFI_SYSV. + # case FFI_SYSV_TYPE_SMALL_STRUCT + 1. One byte struct. +@@ -239,9 +255,15 @@ + + # case FFI_SYSV_TYPE_SMALL_STRUCT + 3. Three byte struct. + lwz %r3,112+0(%r1) ++#ifdef __LITTLE_ENDIAN__ ++ mtlr %r0 ++ addi %r1,%r1,144 ++ blr ++#else + srwi %r3,%r3,8 + mtlr %r0 + b .Lfinish ++#endif + + # case FFI_SYSV_TYPE_SMALL_STRUCT + 4. Four byte struct. + lwz %r3,112+0(%r1) +@@ -252,20 +274,35 @@ + # case FFI_SYSV_TYPE_SMALL_STRUCT + 5. Five byte struct. + lwz %r3,112+0(%r1) + lwz %r4,112+4(%r1) ++#ifdef __LITTLE_ENDIAN__ ++ mtlr %r0 ++ b .Lfinish ++#else + li %r5,24 + b .Lstruct567 ++#endif + + # case FFI_SYSV_TYPE_SMALL_STRUCT + 6. Six byte struct. + lwz %r3,112+0(%r1) + lwz %r4,112+4(%r1) ++#ifdef __LITTLE_ENDIAN__ ++ mtlr %r0 ++ b .Lfinish ++#else + li %r5,16 + b .Lstruct567 ++#endif + + # case FFI_SYSV_TYPE_SMALL_STRUCT + 7. Seven byte struct. + lwz %r3,112+0(%r1) + lwz %r4,112+4(%r1) ++#ifdef __LITTLE_ENDIAN__ ++ mtlr %r0 ++ b .Lfinish ++#else + li %r5,8 + b .Lstruct567 ++#endif + + # case FFI_SYSV_TYPE_SMALL_STRUCT + 8. Eight byte struct. + lwz %r3,112+0(%r1) +@@ -273,6 +310,7 @@ + mtlr %r0 + b .Lfinish + ++#ifndef __LITTLE_ENDIAN__ + .Lstruct567: + subfic %r6,%r5,32 + srw %r4,%r4,%r5 +@@ -282,13 +320,14 @@ + mtlr %r0 + addi %r1,%r1,144 + blr ++#endif + + .Luint128: + lwz %r6,112+12(%r1) + mtlr %r0 + addi %r1,%r1,144 + blr +- ++ + END(ffi_closure_SYSV) + + .section ".eh_frame",EH_FRAME_FLAGS,@progbits +@@ -339,8 +378,7 @@ + .align 2 + .LEFDE1: + +-#endif +- + #if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits + #endif ++#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/powerpc/sysv.S +--- a/Modules/_ctypes/libffi/src/powerpc/sysv.S ++++ b/Modules/_ctypes/libffi/src/powerpc/sysv.S +@@ -30,7 +30,7 @@ + #include + #include + +-#ifndef __powerpc64__ ++#ifndef POWERPC64 + .globl ffi_prep_args_SYSV + ENTRY(ffi_call_SYSV) + .LFB1: +@@ -142,19 +142,14 @@ + #endif + + L(small_struct_return_value): +- extrwi %r6,%r31,2,19 /* number of bytes padding = shift/8 */ +- mtcrf 0x02,%r31 /* copy flags to cr[24:27] (cr6) */ +- extrwi %r5,%r31,5,19 /* r5 <- number of bits of padding */ +- subfic %r6,%r6,4 /* r6 <- number of useful bytes in r3 */ +- bf- 25,L(done_return_value) /* struct in r3 ? if not, done. */ +-/* smst_one_register: */ +- slw %r3,%r3,%r5 /* Left-justify value in r3 */ +- mtxer %r6 /* move byte count to XER ... */ +- stswx %r3,0,%r30 /* ... and store that many bytes */ +- bf+ 26,L(done_return_value) /* struct in r3:r4 ? */ +- add %r6,%r6,%r30 /* adjust pointer */ +- stswi %r4,%r6,4 /* store last four bytes */ +- b L(done_return_value) ++ /* ++ * The C code always allocates a properly-aligned 8-byte bounce ++ * buffer to make this assembly code very simple. Just write out ++ * r3 and r4 to the buffer to allow the C code to handle the rest. ++ */ ++ stw %r3, 0(%r30) ++ stw %r4, 4(%r30) ++ b L(done_return_value) + + .LFE1: + END(ffi_call_SYSV) +@@ -218,8 +213,8 @@ + .uleb128 0x1c + .align 2 + .LEFDE1: +-#endif + + #if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits + #endif ++#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/prep_cif.c +--- a/Modules/_ctypes/libffi/src/prep_cif.c ++++ b/Modules/_ctypes/libffi/src/prep_cif.c +@@ -76,6 +76,13 @@ + total size of 3*sizeof(long). */ + arg->size = ALIGN (arg->size, arg->alignment); + ++ /* On some targets, the ABI defines that structures have an additional ++ alignment beyond the "natural" one based on their elements. */ ++#ifdef FFI_AGGREGATE_ALIGNMENT ++ if (FFI_AGGREGATE_ALIGNMENT > arg->alignment) ++ arg->alignment = FFI_AGGREGATE_ALIGNMENT; ++#endif ++ + if (arg->size == 0) + return FFI_BAD_TYPEDEF; + else +@@ -111,13 +118,8 @@ + FFI_ASSERT((!isvariadic) || (nfixedargs >= 1)); + FFI_ASSERT(nfixedargs <= ntotalargs); + +-#ifndef X86_WIN32 + if (! (abi > FFI_FIRST_ABI && abi < FFI_LAST_ABI)) + return FFI_BAD_ABI; +-#else +- if (! (abi > FFI_FIRST_ABI && abi < FFI_LAST_ABI || abi == FFI_THISCALL)) +- return FFI_BAD_ABI; +-#endif + + cif->abi = abi; + cif->arg_types = atypes; +@@ -126,6 +128,10 @@ + + cif->flags = 0; + ++#if HAVE_LONG_DOUBLE_VARIANT ++ ffi_prep_types (abi); ++#endif ++ + /* Initialize the return type if necessary */ + if ((cif->rtype->size == 0) && (initialize_aggregate(cif->rtype) != FFI_OK)) + return FFI_BAD_TYPEDEF; +@@ -146,7 +152,9 @@ + #ifdef XTENSA + && (cif->rtype->size > 16) + #endif +- ++#ifdef NIOS2 ++ && (cif->rtype->size > 8) ++#endif + ) + bytes = STACK_ARG_SIZE(sizeof(void*)); + #endif +@@ -174,7 +182,7 @@ + { + /* Add any padding if necessary */ + if (((*ptr)->alignment - 1) & bytes) +- bytes = ALIGN(bytes, (*ptr)->alignment); ++ bytes = (unsigned)ALIGN(bytes, (*ptr)->alignment); + + #ifdef TILE + if (bytes < 10 * FFI_SIZEOF_ARG && +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/sh/ffi.c +--- a/Modules/_ctypes/libffi/src/sh/ffi.c ++++ b/Modules/_ctypes/libffi/src/sh/ffi.c +@@ -41,7 +41,7 @@ + #define STRUCT_VALUE_ADDRESS_WITH_ARG 0 + #endif + +-/* If the structure has essentialy an unique element, return its type. */ ++/* If the structure has essentially an unique element, return its type. */ + static int + simple_type (ffi_type *arg) + { +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/tile/tile.S +--- a/Modules/_ctypes/libffi/src/tile/tile.S ++++ b/Modules/_ctypes/libffi/src/tile/tile.S +@@ -60,7 +60,7 @@ + void (*fnaddr)(void)); + + On entry, REG_ARGS contain the outgoing register values, +- and STACK_ARGS containts STACK_ARG_BYTES of additional values ++ and STACK_ARGS contains STACK_ARG_BYTES of additional values + to be passed on the stack. If STACK_ARG_BYTES is zero, then + STACK_ARGS is ignored. + +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/types.c +--- a/Modules/_ctypes/libffi/src/types.c ++++ b/Modules/_ctypes/libffi/src/types.c +@@ -44,6 +44,17 @@ + id, NULL \ + } + ++#define FFI_NONCONST_TYPEDEF(name, type, id) \ ++struct struct_align_##name { \ ++ char c; \ ++ type x; \ ++}; \ ++ffi_type ffi_type_##name = { \ ++ sizeof(type), \ ++ offsetof(struct struct_align_##name, x), \ ++ id, NULL \ ++} ++ + /* Size and alignment are fake here. They must not be 0. */ + const ffi_type ffi_type_void = { + 1, 1, FFI_TYPE_VOID, NULL +@@ -73,5 +84,9 @@ + # endif + const ffi_type ffi_type_longdouble = { 16, 16, 4, NULL }; + #elif FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE ++# if HAVE_LONG_DOUBLE_VARIANT ++FFI_NONCONST_TYPEDEF(longdouble, long double, FFI_TYPE_LONGDOUBLE); ++# else + FFI_TYPEDEF(longdouble, long double, FFI_TYPE_LONGDOUBLE); ++# endif + #endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/vax/elfbsd.S +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/vax/elfbsd.S +@@ -0,0 +1,195 @@ ++/* ++ * Copyright (c) 2013 Miodrag Vallat. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining ++ * a copy of this software and associated documentation files (the ++ * ``Software''), to deal in the Software without restriction, including ++ * without limitation the rights to use, copy, modify, merge, publish, ++ * distribute, sublicense, and/or sell copies of the Software, and to ++ * permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included ++ * in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/* ++ * vax Foreign Function Interface ++ */ ++ ++#define LIBFFI_ASM ++#include ++#include ++ ++ .text ++ ++/* ++ * void * %r0 ++ * ffi_call_elfbsd(extended_cif *ecif, 4(%ap) ++ * unsigned bytes, 8(%ap) ++ * unsigned flags, 12(%ap) ++ * void *rvalue, 16(%ap) ++ * void (*fn)()); 20(%ap) ++ */ ++ .globl ffi_call_elfbsd ++ .type ffi_call_elfbsd,@function ++ .align 2 ++ffi_call_elfbsd: ++ .word 0x00c # save R2 and R3 ++ ++ # Allocate stack space for the args ++ subl2 8(%ap), %sp ++ ++ # Call ffi_prep_args ++ pushl %sp ++ pushl 4(%ap) ++ calls $2, ffi_prep_args ++ ++ # Get function pointer ++ movl 20(%ap), %r1 ++ ++ # Build a CALLS frame ++ ashl $-2, 8(%ap), %r0 ++ pushl %r0 # argument stack usage ++ movl %sp, %r0 # future %ap ++ # saved registers ++ bbc $11, 0(%r1), 1f ++ pushl %r11 ++1: bbc $10, 0(%r1), 1f ++ pushl %r10 ++1: bbc $9, 0(%r1), 1f ++ pushl %r9 ++1: bbc $8, 0(%r1), 1f ++ pushl %r8 ++1: bbc $7, 0(%r1), 1f ++ pushl %r7 ++1: bbc $6, 0(%r1), 1f ++ pushl %r6 ++1: bbc $5, 0(%r1), 1f ++ pushl %r5 ++1: bbc $4, 0(%r1), 1f ++ pushl %r4 ++1: bbc $3, 0(%r1), 1f ++ pushl %r3 ++1: bbc $2, 0(%r1), 1f ++ pushl %r2 ++1: ++ pushal 9f ++ pushl %fp ++ pushl %ap ++ movl 16(%ap), %r3 # struct return address, if needed ++ movl %r0, %ap ++ movzwl 4(%fp), %r0 # previous PSW, without the saved registers mask ++ bisl2 $0x20000000, %r0 # calls frame ++ movzwl 0(%r1), %r2 ++ bicw2 $0xf003, %r2 # only keep R11-R2 ++ ashl $16, %r2, %r2 ++ bisl2 %r2, %r0 # saved register mask of the called function ++ pushl %r0 ++ pushl $0 ++ movl %sp, %fp ++ ++ # Invoke the function ++ pushal 2(%r1) # skip procedure entry mask ++ movl %r3, %r1 ++ bicpsw $0x000f ++ rsb ++ ++9: ++ # Copy return value if necessary ++ tstl 16(%ap) ++ jeql 9f ++ movl 16(%ap), %r2 ++ ++ bbc $0, 12(%ap), 1f # CIF_FLAGS_CHAR ++ movb %r0, 0(%r2) ++ brb 9f ++1: ++ bbc $1, 12(%ap), 1f # CIF_FLAGS_SHORT ++ movw %r0, 0(%r2) ++ brb 9f ++1: ++ bbc $2, 12(%ap), 1f # CIF_FLAGS_INT ++ movl %r0, 0(%r2) ++ brb 9f ++1: ++ bbc $3, 12(%ap), 1f # CIF_FLAGS_DINT ++ movq %r0, 0(%r2) ++ brb 9f ++1: ++ movl %r1, %r0 # might have been a struct ++ #brb 9f ++ ++9: ++ ret ++ ++/* ++ * ffi_closure_elfbsd(void); ++ * invoked with %r0: ffi_closure *closure ++ */ ++ .globl ffi_closure_elfbsd ++ .type ffi_closure_elfbsd, @function ++ .align 2 ++ffi_closure_elfbsd: ++ .word 0 ++ ++ # Allocate room on stack for return value ++ subl2 $8, %sp ++ ++ # Invoke the closure function ++ pushal 4(%ap) # calling stack ++ pushal 4(%sp) # return value ++ pushl %r0 # closure ++ calls $3, ffi_closure_elfbsd_inner ++ ++ # Copy return value if necessary ++ bitb $1, %r0 # CIF_FLAGS_CHAR ++ beql 1f ++ movb 0(%sp), %r0 ++ brb 9f ++1: ++ bitb $2, %r0 # CIF_FLAGS_SHORT ++ beql 1f ++ movw 0(%sp), %r0 ++ brb 9f ++1: ++ bitb $4, %r0 # CIF_FLAGS_INT ++ beql 1f ++ movl 0(%sp), %r0 ++ brb 9f ++1: ++ bitb $8, %r0 # CIF_FLAGS_DINT ++ beql 1f ++ movq 0(%sp), %r0 ++ #brb 9f ++1: ++ ++9: ++ ret ++ ++/* ++ * ffi_closure_struct_elfbsd(void); ++ * invoked with %r0: ffi_closure *closure ++ * %r1: struct return address ++ */ ++ .globl ffi_closure_struct_elfbsd ++ .type ffi_closure_struct_elfbsd, @function ++ .align 2 ++ffi_closure_struct_elfbsd: ++ .word 0 ++ ++ # Invoke the closure function ++ pushal 4(%ap) # calling stack ++ pushl %r1 # return value ++ pushl %r0 # closure ++ calls $3, ffi_closure_elfbsd_inner ++ ++ ret +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/vax/ffi.c +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/vax/ffi.c +@@ -0,0 +1,276 @@ ++/* ++ * Copyright (c) 2013 Miodrag Vallat. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining ++ * a copy of this software and associated documentation files (the ++ * ``Software''), to deal in the Software without restriction, including ++ * without limitation the rights to use, copy, modify, merge, publish, ++ * distribute, sublicense, and/or sell copies of the Software, and to ++ * permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included ++ * in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/* ++ * vax Foreign Function Interface ++ * ++ * This file attempts to provide all the FFI entry points which can reliably ++ * be implemented in C. ++ */ ++ ++#include ++#include ++ ++#include ++#include ++ ++#define CIF_FLAGS_CHAR 1 /* for struct only */ ++#define CIF_FLAGS_SHORT 2 /* for struct only */ ++#define CIF_FLAGS_INT 4 ++#define CIF_FLAGS_DINT 8 ++ ++/* ++ * Foreign Function Interface API ++ */ ++ ++void ffi_call_elfbsd (extended_cif *, unsigned, unsigned, void *, ++ void (*) ()); ++void *ffi_prep_args (extended_cif *ecif, void *stack); ++ ++void * ++ffi_prep_args (extended_cif *ecif, void *stack) ++{ ++ unsigned int i; ++ void **p_argv; ++ char *argp; ++ ffi_type **p_arg; ++ void *struct_value_ptr; ++ ++ argp = stack; ++ ++ if (ecif->cif->rtype->type == FFI_TYPE_STRUCT ++ && !ecif->cif->flags) ++ struct_value_ptr = ecif->rvalue; ++ else ++ struct_value_ptr = NULL; ++ ++ p_argv = ecif->avalue; ++ ++ for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; ++ i != 0; ++ i--, p_arg++) ++ { ++ size_t z; ++ ++ z = (*p_arg)->size; ++ if (z < sizeof (int)) ++ { ++ switch ((*p_arg)->type) ++ { ++ case FFI_TYPE_SINT8: ++ *(signed int *) argp = (signed int) *(SINT8 *) *p_argv; ++ break; ++ ++ case FFI_TYPE_UINT8: ++ *(unsigned int *) argp = (unsigned int) *(UINT8 *) *p_argv; ++ break; ++ ++ case FFI_TYPE_SINT16: ++ *(signed int *) argp = (signed int) *(SINT16 *) *p_argv; ++ break; ++ ++ case FFI_TYPE_UINT16: ++ *(unsigned int *) argp = (unsigned int) *(UINT16 *) *p_argv; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ memcpy (argp, *p_argv, z); ++ break; ++ ++ default: ++ FFI_ASSERT (0); ++ } ++ z = sizeof (int); ++ } ++ else ++ { ++ memcpy (argp, *p_argv, z); ++ ++ /* Align if necessary. */ ++ if ((sizeof(int) - 1) & z) ++ z = ALIGN(z, sizeof(int)); ++ } ++ ++ p_argv++; ++ argp += z; ++ } ++ ++ return struct_value_ptr; ++} ++ ++ffi_status ++ffi_prep_cif_machdep (ffi_cif *cif) ++{ ++ /* Set the return type flag */ ++ switch (cif->rtype->type) ++ { ++ case FFI_TYPE_VOID: ++ cif->flags = 0; ++ break; ++ ++ case FFI_TYPE_STRUCT: ++ if (cif->rtype->elements[0]->type == FFI_TYPE_STRUCT && ++ cif->rtype->elements[1]) ++ { ++ cif->flags = 0; ++ break; ++ } ++ ++ if (cif->rtype->size == sizeof (char)) ++ cif->flags = CIF_FLAGS_CHAR; ++ else if (cif->rtype->size == sizeof (short)) ++ cif->flags = CIF_FLAGS_SHORT; ++ else if (cif->rtype->size == sizeof (int)) ++ cif->flags = CIF_FLAGS_INT; ++ else if (cif->rtype->size == 2 * sizeof (int)) ++ cif->flags = CIF_FLAGS_DINT; ++ else ++ cif->flags = 0; ++ break; ++ ++ default: ++ if (cif->rtype->size <= sizeof (int)) ++ cif->flags = CIF_FLAGS_INT; ++ else ++ cif->flags = CIF_FLAGS_DINT; ++ break; ++ } ++ ++ return FFI_OK; ++} ++ ++void ++ffi_call (ffi_cif *cif, void (*fn) (), void *rvalue, void **avalue) ++{ ++ extended_cif ecif; ++ ++ ecif.cif = cif; ++ ecif.avalue = avalue; ++ ++ /* If the return value is a struct and we don't have a return value ++ address then we need to make one. */ ++ ++ if (rvalue == NULL ++ && cif->rtype->type == FFI_TYPE_STRUCT ++ && cif->flags == 0) ++ ecif.rvalue = alloca (cif->rtype->size); ++ else ++ ecif.rvalue = rvalue; ++ ++ switch (cif->abi) ++ { ++ case FFI_ELFBSD: ++ ffi_call_elfbsd (&ecif, cif->bytes, cif->flags, ecif.rvalue, fn); ++ break; ++ ++ default: ++ FFI_ASSERT (0); ++ break; ++ } ++} ++ ++/* ++ * Closure API ++ */ ++ ++void ffi_closure_elfbsd (void); ++void ffi_closure_struct_elfbsd (void); ++unsigned int ffi_closure_elfbsd_inner (ffi_closure *, void *, char *); ++ ++static void ++ffi_prep_closure_elfbsd (ffi_cif *cif, void **avalue, char *stackp) ++{ ++ unsigned int i; ++ void **p_argv; ++ ffi_type **p_arg; ++ ++ p_argv = avalue; ++ ++ for (i = cif->nargs, p_arg = cif->arg_types; i != 0; i--, p_arg++) ++ { ++ size_t z; ++ ++ z = (*p_arg)->size; ++ *p_argv = stackp; ++ ++ /* Align if necessary */ ++ if ((sizeof (int) - 1) & z) ++ z = ALIGN(z, sizeof (int)); ++ ++ p_argv++; ++ stackp += z; ++ } ++} ++ ++unsigned int ++ffi_closure_elfbsd_inner (ffi_closure *closure, void *resp, char *stack) ++{ ++ ffi_cif *cif; ++ void **arg_area; ++ ++ cif = closure->cif; ++ arg_area = (void **) alloca (cif->nargs * sizeof (void *)); ++ ++ ffi_prep_closure_elfbsd (cif, arg_area, stack); ++ ++ (closure->fun) (cif, resp, arg_area, closure->user_data); ++ ++ return cif->flags; ++} ++ ++ffi_status ++ffi_prep_closure_loc (ffi_closure *closure, ffi_cif *cif, ++ void (*fun)(ffi_cif *, void *, void **, void *), ++ void *user_data, void *codeloc) ++{ ++ char *tramp = (char *) codeloc; ++ void *fn; ++ ++ FFI_ASSERT (cif->abi == FFI_ELFBSD); ++ ++ /* entry mask */ ++ *(unsigned short *)(tramp + 0) = 0x0000; ++ /* movl #closure, r0 */ ++ tramp[2] = 0xd0; ++ tramp[3] = 0x8f; ++ *(unsigned int *)(tramp + 4) = (unsigned int) closure; ++ tramp[8] = 0x50; ++ ++ if (cif->rtype->type == FFI_TYPE_STRUCT ++ && !cif->flags) ++ fn = &ffi_closure_struct_elfbsd; ++ else ++ fn = &ffi_closure_elfbsd; ++ ++ /* jmpl #fn */ ++ tramp[9] = 0x17; ++ tramp[10] = 0xef; ++ *(unsigned int *)(tramp + 11) = (unsigned int)fn + 2 - ++ (unsigned int)tramp - 9 - 6; ++ ++ closure->cif = cif; ++ closure->user_data = user_data; ++ closure->fun = fun; ++ ++ return FFI_OK; ++} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/vax/ffitarget.h +--- /dev/null ++++ b/Modules/_ctypes/libffi/src/vax/ffitarget.h +@@ -0,0 +1,49 @@ ++/* ++ * Copyright (c) 2013 Miodrag Vallat. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining ++ * a copy of this software and associated documentation files (the ++ * ``Software''), to deal in the Software without restriction, including ++ * without limitation the rights to use, copy, modify, merge, publish, ++ * distribute, sublicense, and/or sell copies of the Software, and to ++ * permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included ++ * in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/* ++ * vax Foreign Function Interface ++ */ ++ ++#ifndef LIBFFI_TARGET_H ++#define LIBFFI_TARGET_H ++ ++#ifndef LIBFFI_ASM ++typedef unsigned long ffi_arg; ++typedef signed long ffi_sarg; ++ ++typedef enum ffi_abi { ++ FFI_FIRST_ABI = 0, ++ FFI_ELFBSD, ++ FFI_DEFAULT_ABI = FFI_ELFBSD, ++ FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 ++} ffi_abi; ++#endif ++ ++/* ---- Definitions for closures ----------------------------------------- */ ++ ++#define FFI_CLOSURES 1 ++#define FFI_TRAMPOLINE_SIZE 15 ++#define FFI_NATIVE_RAW_API 0 ++ ++#endif +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/x86/ffi.c +--- a/Modules/_ctypes/libffi/src/x86/ffi.c ++++ b/Modules/_ctypes/libffi/src/x86/ffi.c +@@ -39,16 +39,18 @@ + + #include + ++ + /* ffi_prep_args is called by the assembly routine once stack space + has been allocated for the function's arguments */ + ++void ffi_prep_args(char *stack, extended_cif *ecif); + void ffi_prep_args(char *stack, extended_cif *ecif) + { + register unsigned int i; + register void **p_argv; + register char *argp; + register ffi_type **p_arg; +-#ifdef X86_WIN32 ++#ifndef X86_WIN64 + size_t p_stack_args[2]; + void *p_stack_data[2]; + char *argp2 = stack; +@@ -67,7 +69,7 @@ + ) + { + *(void **) argp = ecif->rvalue; +-#ifdef X86_WIN32 ++#ifndef X86_WIN64 + /* For fastcall/thiscall this is first register-passed + argument. */ + if (cabi == FFI_THISCALL || cabi == FFI_FASTCALL) +@@ -153,7 +155,7 @@ + memcpy(argp, *p_argv, z); + } + +-#ifdef X86_WIN32 ++#ifndef X86_WIN64 + /* For thiscall/fastcall convention register-passed arguments + are the first two none-floating-point arguments with a size + smaller or equal to sizeof (void*). */ +@@ -178,7 +180,7 @@ + #endif + } + +-#ifdef X86_WIN32 ++#ifndef X86_WIN64 + /* We need to move the register-passed arguments for thiscall/fastcall + on top of stack, so that those can be moved to registers ecx/edx by + call-handler. */ +@@ -307,7 +309,7 @@ + { + if (((*ptr)->alignment - 1) & cif->bytes) + cif->bytes = ALIGN(cif->bytes, (*ptr)->alignment); +- cif->bytes += ALIGN((*ptr)->size, FFI_SIZEOF_ARG); ++ cif->bytes += (unsigned)ALIGN((*ptr)->size, FFI_SIZEOF_ARG); + } + + #ifdef X86_WIN64 +@@ -315,7 +317,12 @@ + cif->bytes += 4 * sizeof(ffi_arg); + #endif + +- cif->bytes = (cif->bytes + 15) & ~0xF; ++#ifndef X86_WIN32 ++#ifndef X86_WIN64 ++ if (cif->abi != FFI_STDCALL && cif->abi != FFI_THISCALL && cif->abi != FFI_FASTCALL) ++#endif ++ cif->bytes = (cif->bytes + 15) & ~0xF; ++#endif + + return FFI_OK; + } +@@ -324,11 +331,10 @@ + extern int + ffi_call_win64(void (*)(char *, extended_cif *), extended_cif *, + unsigned, unsigned, unsigned *, void (*fn)(void)); +-#elif defined(X86_WIN32) ++#else + extern void + ffi_call_win32(void (*)(char *, extended_cif *), extended_cif *, + unsigned, unsigned, unsigned, unsigned *, void (*fn)(void)); +-#else + extern void ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *, + unsigned, unsigned, unsigned *, void (*fn)(void)); + #endif +@@ -370,10 +376,17 @@ + ffi_call_win64(ffi_prep_args, &ecif, cif->bytes, + cif->flags, ecif.rvalue, fn); + break; +-#elif defined(X86_WIN32) ++#else ++#ifndef X86_WIN32 + case FFI_SYSV: ++ ffi_call_SYSV(ffi_prep_args, &ecif, cif->bytes, cif->flags, ecif.rvalue, ++ fn); ++ break; ++#else ++ case FFI_SYSV: ++ case FFI_MS_CDECL: ++#endif + case FFI_STDCALL: +- case FFI_MS_CDECL: + ffi_call_win32(ffi_prep_args, &ecif, cif->abi, cif->bytes, cif->flags, + ecif.rvalue, fn); + break; +@@ -406,11 +419,6 @@ + ecif.rvalue, fn); + } + break; +-#else +- case FFI_SYSV: +- ffi_call_SYSV(ffi_prep_args, &ecif, cif->bytes, cif->flags, ecif.rvalue, +- fn); +- break; + #endif + default: + FFI_ASSERT(0); +@@ -434,12 +442,15 @@ + #ifdef X86_WIN32 + void FFI_HIDDEN ffi_closure_raw_THISCALL (ffi_raw_closure *) + __attribute__ ((regparm(1))); ++#endif ++#ifndef X86_WIN64 + void FFI_HIDDEN ffi_closure_STDCALL (ffi_closure *) + __attribute__ ((regparm(1))); + void FFI_HIDDEN ffi_closure_THISCALL (ffi_closure *) + __attribute__ ((regparm(1))); +-#endif +-#ifdef X86_WIN64 ++void FFI_HIDDEN ffi_closure_FASTCALL (ffi_closure *) ++ __attribute__ ((regparm(1))); ++#else + void FFI_HIDDEN ffi_closure_win64 (ffi_closure *); + #endif + +@@ -598,7 +609,7 @@ + *(unsigned int*) &__tramp[6] = __dis; /* jmp __fun */ \ + } + +-#define FFI_INIT_TRAMPOLINE_THISCALL(TRAMP,FUN,CTX,SIZE) \ ++#define FFI_INIT_TRAMPOLINE_RAW_THISCALL(TRAMP,FUN,CTX,SIZE) \ + { unsigned char *__tramp = (unsigned char*)(TRAMP); \ + unsigned int __fun = (unsigned int)(FUN); \ + unsigned int __ctx = (unsigned int)(CTX); \ +@@ -625,18 +636,15 @@ + *(unsigned short*) &__tramp[50] = (__size + 8); /* ret (__size + 8) */ \ + } + +-#define FFI_INIT_TRAMPOLINE_STDCALL(TRAMP,FUN,CTX,SIZE) \ ++#define FFI_INIT_TRAMPOLINE_STDCALL(TRAMP,FUN,CTX) \ + { unsigned char *__tramp = (unsigned char*)(TRAMP); \ + unsigned int __fun = (unsigned int)(FUN); \ + unsigned int __ctx = (unsigned int)(CTX); \ + unsigned int __dis = __fun - (__ctx + 10); \ +- unsigned short __size = (unsigned short)(SIZE); \ + *(unsigned char*) &__tramp[0] = 0xb8; \ + *(unsigned int*) &__tramp[1] = __ctx; /* movl __ctx, %eax */ \ + *(unsigned char *) &__tramp[5] = 0xe8; \ + *(unsigned int*) &__tramp[6] = __dis; /* call __fun */ \ +- *(unsigned char *) &__tramp[10] = 0xc2; \ +- *(unsigned short*) &__tramp[11] = __size; /* ret __size */ \ + } + + /* the cif must already be prep'ed */ +@@ -666,20 +674,25 @@ + &ffi_closure_SYSV, + (void*)codeloc); + } +-#ifdef X86_WIN32 ++ else if (cif->abi == FFI_FASTCALL) ++ { ++ FFI_INIT_TRAMPOLINE_STDCALL (&closure->tramp[0], ++ &ffi_closure_FASTCALL, ++ (void*)codeloc); ++ } + else if (cif->abi == FFI_THISCALL) + { +- FFI_INIT_TRAMPOLINE_THISCALL (&closure->tramp[0], +- &ffi_closure_THISCALL, +- (void*)codeloc, +- cif->bytes); ++ FFI_INIT_TRAMPOLINE_STDCALL (&closure->tramp[0], ++ &ffi_closure_THISCALL, ++ (void*)codeloc); + } + else if (cif->abi == FFI_STDCALL) + { + FFI_INIT_TRAMPOLINE_STDCALL (&closure->tramp[0], + &ffi_closure_STDCALL, +- (void*)codeloc, cif->bytes); ++ (void*)codeloc); + } ++#ifdef X86_WIN32 + else if (cif->abi == FFI_MS_CDECL) + { + FFI_INIT_TRAMPOLINE (&closure->tramp[0], +@@ -713,12 +726,12 @@ + { + int i; + +- if (cif->abi != FFI_SYSV) { ++ if (cif->abi != FFI_SYSV + #ifdef X86_WIN32 +- if (cif->abi != FFI_THISCALL) ++ && cif->abi != FFI_THISCALL + #endif ++ ) + return FFI_BAD_ABI; +- } + + /* we currently don't support certain kinds of arguments for raw + closures. This should be implemented by a separate assembly +@@ -741,8 +754,7 @@ + } + else if (cif->abi == FFI_THISCALL) + { +- FFI_INIT_TRAMPOLINE_THISCALL (&closure->tramp[0], &ffi_closure_raw_THISCALL, +- codeloc, cif->bytes); ++ FFI_INIT_TRAMPOLINE_RAW_THISCALL (&closure->tramp[0], &ffi_closure_raw_THISCALL, codeloc, cif->bytes); + } + #endif + closure->cif = cif; +@@ -787,10 +799,17 @@ + + switch (cif->abi) + { +-#ifdef X86_WIN32 ++#ifndef X86_WIN32 + case FFI_SYSV: ++ ffi_call_SYSV(ffi_prep_args_raw, &ecif, cif->bytes, cif->flags, ++ ecif.rvalue, fn); ++ break; ++#else ++ case FFI_SYSV: ++ case FFI_MS_CDECL: ++#endif ++#ifndef X86_WIN64 + case FFI_STDCALL: +- case FFI_MS_CDECL: + ffi_call_win32(ffi_prep_args_raw, &ecif, cif->abi, cif->bytes, cif->flags, + ecif.rvalue, fn); + break; +@@ -823,11 +842,6 @@ + ecif.rvalue, fn); + } + break; +-#else +- case FFI_SYSV: +- ffi_call_SYSV(ffi_prep_args_raw, &ecif, cif->bytes, cif->flags, +- ecif.rvalue, fn); +- break; + #endif + default: + FFI_ASSERT(0); +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/x86/ffi64.c +--- a/Modules/_ctypes/libffi/src/x86/ffi64.c ++++ b/Modules/_ctypes/libffi/src/x86/ffi64.c +@@ -3,8 +3,8 @@ + Copyright (c) 2011 Anthony Green + Copyright (c) 2008, 2010 Red Hat, Inc. + Copyright (c) 2002, 2007 Bo Thorsen +- +- x86-64 Foreign Function Interface ++ ++ x86-64 Foreign Function Interface + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the +@@ -39,6 +39,7 @@ + #define MAX_SSE_REGS 8 + + #if defined(__INTEL_COMPILER) ++#include "xmmintrin.h" + #define UINT128 __m128 + #else + #if defined(__SUNPRO_C) +@@ -60,7 +61,7 @@ + { + /* Registers for argument passing. */ + UINT64 gpr[MAX_GPR_REGS]; +- union big_int_union sse[MAX_SSE_REGS]; ++ union big_int_union sse[MAX_SSE_REGS]; + }; + + extern void ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags, +@@ -151,7 +152,7 @@ + + See the x86-64 PS ABI for details. + */ +-static int ++static size_t + classify_argument (ffi_type *type, enum x86_64_reg_class classes[], + size_t byte_offset) + { +@@ -167,7 +168,7 @@ + case FFI_TYPE_SINT64: + case FFI_TYPE_POINTER: + { +- int size = byte_offset + type->size; ++ size_t size = byte_offset + type->size; + + if (size <= 4) + { +@@ -202,15 +203,17 @@ + case FFI_TYPE_DOUBLE: + classes[0] = X86_64_SSEDF_CLASS; + return 1; ++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE + case FFI_TYPE_LONGDOUBLE: + classes[0] = X86_64_X87_CLASS; + classes[1] = X86_64_X87UP_CLASS; + return 2; ++#endif + case FFI_TYPE_STRUCT: + { +- const int UNITS_PER_WORD = 8; +- int words = (type->size + UNITS_PER_WORD - 1) / UNITS_PER_WORD; +- ffi_type **ptr; ++ const size_t UNITS_PER_WORD = 8; ++ size_t words = (type->size + UNITS_PER_WORD - 1) / UNITS_PER_WORD; ++ ffi_type **ptr; + int i; + enum x86_64_reg_class subclasses[MAX_CLASSES]; + +@@ -232,7 +235,7 @@ + /* Merge the fields of structure. */ + for (ptr = type->elements; *ptr != NULL; ptr++) + { +- int num; ++ size_t num; + + byte_offset = ALIGN (byte_offset, (*ptr)->alignment); + +@@ -241,7 +244,7 @@ + return 0; + for (i = 0; i < num; i++) + { +- int pos = byte_offset / 8; ++ size_t pos = byte_offset / 8; + classes[i + pos] = + merge_classes (subclasses[i], classes[i + pos]); + } +@@ -305,11 +308,12 @@ + class. Return zero iff parameter should be passed in memory, otherwise + the number of registers. */ + +-static int ++static size_t + examine_argument (ffi_type *type, enum x86_64_reg_class classes[MAX_CLASSES], + _Bool in_return, int *pngpr, int *pnsse) + { +- int i, n, ngpr, nsse; ++ size_t n; ++ int i, ngpr, nsse; + + n = classify_argument (type, classes, 0); + if (n == 0) +@@ -350,9 +354,9 @@ + ffi_status + ffi_prep_cif_machdep (ffi_cif *cif) + { +- int gprcount, ssecount, i, avn, n, ngpr, nsse, flags; ++ int gprcount, ssecount, i, avn, ngpr, nsse, flags; + enum x86_64_reg_class classes[MAX_CLASSES]; +- size_t bytes; ++ size_t bytes, n; + + gprcount = ssecount = 0; + +@@ -410,7 +414,7 @@ + if (ssecount) + flags |= 1 << 11; + cif->flags = flags; +- cif->bytes = ALIGN (bytes, 8); ++ cif->bytes = (unsigned)ALIGN (bytes, 8); + + return FFI_OK; + } +@@ -453,8 +457,7 @@ + + for (i = 0; i < avn; ++i) + { +- size_t size = arg_types[i]->size; +- int n; ++ size_t n, size = arg_types[i]->size; + + n = examine_argument (arg_types[i], classes, 0, &ngpr, &nsse); + if (n == 0 +@@ -583,7 +586,7 @@ + if (ret != FFI_TYPE_VOID) + { + enum x86_64_reg_class classes[MAX_CLASSES]; +- int n = examine_argument (cif->rtype, classes, 1, &ngpr, &nsse); ++ size_t n = examine_argument (cif->rtype, classes, 1, &ngpr, &nsse); + if (n == 0) + { + /* The return value goes in memory. Arrange for the closure +@@ -606,11 +609,11 @@ + + avn = cif->nargs; + arg_types = cif->arg_types; +- ++ + for (i = 0; i < avn; ++i) + { + enum x86_64_reg_class classes[MAX_CLASSES]; +- int n; ++ size_t n; + + n = examine_argument (arg_types[i], classes, 0, &ngpr, &nsse); + if (n == 0 +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/x86/ffitarget.h +--- a/Modules/_ctypes/libffi/src/x86/ffitarget.h ++++ b/Modules/_ctypes/libffi/src/x86/ffitarget.h +@@ -98,6 +98,9 @@ + /* ---- Intel x86 and AMD x86-64 - */ + FFI_SYSV, + FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */ ++ FFI_THISCALL, ++ FFI_FASTCALL, ++ FFI_STDCALL, + FFI_LAST_ABI, + #if defined(__i386__) || defined(__i386) + FFI_DEFAULT_ABI = FFI_SYSV +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/x86/freebsd.S +--- a/Modules/_ctypes/libffi/src/x86/freebsd.S ++++ b/Modules/_ctypes/libffi/src/x86/freebsd.S +@@ -49,6 +49,9 @@ + movl 16(%ebp),%ecx + subl %ecx,%esp + ++ /* Align the stack pointer to 16-bytes */ ++ andl $0xfffffff0, %esp ++ + movl %esp,%eax + + /* Place all of the ffi_prep_args in position */ +@@ -456,3 +459,5 @@ + #endif + + #endif /* ifndef __x86_64__ */ ++ ++ .section .note.GNU-stack,"",%progbits +diff -r ee879c0ffa11 Modules/_ctypes/libffi/src/x86/win32.S +--- a/Modules/_ctypes/libffi/src/x86/win32.S ++++ b/Modules/_ctypes/libffi/src/x86/win32.S +@@ -33,8 +33,13 @@ + #include + #include + ++#define CIF_ABI_OFFSET 0 ++#define CIF_BYTES_OFFSET 16 ++ + #ifdef _MSC_VER + ++#define CLOSURE_CIF_OFFSET ((FFI_TRAMPOLINE_SIZE + 3) AND NOT 3) ++ + .386 + .MODEL FLAT, C + +@@ -188,14 +193,23 @@ + ret + ffi_call_win32 ENDP + +-ffi_closure_THISCALL PROC NEAR FORCEFRAME +- sub esp, 40 +- lea edx, [ebp -24] +- mov [ebp - 12], edx /* resp */ +- lea edx, [ebp + 12] /* account for stub return address on stack */ +- jmp stub ++ffi_closure_THISCALL PROC NEAR ++ ;; Insert the register argument on the stack as the first argument ++ xchg DWORD PTR [esp+4], ecx ++ xchg DWORD PTR [esp], ecx ++ push ecx ++ jmp ffi_closure_STDCALL + ffi_closure_THISCALL ENDP + ++ffi_closure_FASTCALL PROC NEAR ++ ;; Insert the register argument on the stack as the first argument ++ xchg DWORD PTR [esp+4], edx ++ xchg DWORD PTR [esp], ecx ++ push edx ++ push ecx ++ jmp ffi_closure_STDCALL ++ffi_closure_FASTCALL ENDP ++ + ffi_closure_SYSV PROC NEAR FORCEFRAME + ;; the ffi_closure ctx is passed in eax by the trampoline. + +@@ -464,8 +478,23 @@ + jmp cd_epilogue + + cd_epilogue: +- ;; Epilogue code is autogenerated. +- ret ++ mov esp, ebp ++ pop ebp ++ pop ecx ++ pop edx ++ mov ecx, DWORD PTR [ecx + (CLOSURE_CIF_OFFSET-10)] ++ add esp, DWORD PTR [ecx + CIF_BYTES_OFFSET] ++ mov ecx, DWORD PTR [ecx + CIF_ABI_OFFSET] ++ cmp ecx, 3 ++ je cd_thiscall ++ cmp ecx, 4 ++ jne cd_not_fastcall ++ ++ add esp, 4 ++cd_thiscall: ++ add esp, 4 ++cd_not_fastcall: ++ jmp edx + ffi_closure_STDCALL ENDP + + _TEXT ENDS +@@ -473,15 +502,23 @@ + + #else + ++#define CLOSURE_CIF_OFFSET ((FFI_TRAMPOLINE_SIZE + 3) & ~3) ++ ++#if defined(SYMBOL_UNDERSCORE) ++#define USCORE_SYMBOL(x) _##x ++#else ++#define USCORE_SYMBOL(x) x ++#endif + .text + + # This assumes we are using gas. + .balign 16 +- .globl _ffi_call_win32 +-#ifndef __OS2__ ++FFI_HIDDEN(ffi_call_win32) ++ .globl USCORE_SYMBOL(ffi_call_win32) ++#if defined(X86_WIN32) && !defined(__OS2__) + .def _ffi_call_win32; .scl 2; .type 32; .endef + #endif +-_ffi_call_win32: ++USCORE_SYMBOL(ffi_call_win32): + .LFB1: + pushl %ebp + .LCFI0: +@@ -542,31 +579,32 @@ + call 1f + # Do not insert anything here between the call and the jump table. + .Lstore_table: +- .long .Lnoretval /* FFI_TYPE_VOID */ +- .long .Lretint /* FFI_TYPE_INT */ +- .long .Lretfloat /* FFI_TYPE_FLOAT */ +- .long .Lretdouble /* FFI_TYPE_DOUBLE */ +- .long .Lretlongdouble /* FFI_TYPE_LONGDOUBLE */ +- .long .Lretuint8 /* FFI_TYPE_UINT8 */ +- .long .Lretsint8 /* FFI_TYPE_SINT8 */ +- .long .Lretuint16 /* FFI_TYPE_UINT16 */ +- .long .Lretsint16 /* FFI_TYPE_SINT16 */ +- .long .Lretint /* FFI_TYPE_UINT32 */ +- .long .Lretint /* FFI_TYPE_SINT32 */ +- .long .Lretint64 /* FFI_TYPE_UINT64 */ +- .long .Lretint64 /* FFI_TYPE_SINT64 */ +- .long .Lretstruct /* FFI_TYPE_STRUCT */ +- .long .Lretint /* FFI_TYPE_POINTER */ +- .long .Lretstruct1b /* FFI_TYPE_SMALL_STRUCT_1B */ +- .long .Lretstruct2b /* FFI_TYPE_SMALL_STRUCT_2B */ +- .long .Lretstruct4b /* FFI_TYPE_SMALL_STRUCT_4B */ +- .long .Lretstruct /* FFI_TYPE_MS_STRUCT */ ++ .long .Lnoretval-.Lstore_table /* FFI_TYPE_VOID */ ++ .long .Lretint-.Lstore_table /* FFI_TYPE_INT */ ++ .long .Lretfloat-.Lstore_table /* FFI_TYPE_FLOAT */ ++ .long .Lretdouble-.Lstore_table /* FFI_TYPE_DOUBLE */ ++ .long .Lretlongdouble-.Lstore_table /* FFI_TYPE_LONGDOUBLE */ ++ .long .Lretuint8-.Lstore_table /* FFI_TYPE_UINT8 */ ++ .long .Lretsint8-.Lstore_table /* FFI_TYPE_SINT8 */ ++ .long .Lretuint16-.Lstore_table /* FFI_TYPE_UINT16 */ ++ .long .Lretsint16-.Lstore_table /* FFI_TYPE_SINT16 */ ++ .long .Lretint-.Lstore_table /* FFI_TYPE_UINT32 */ ++ .long .Lretint-.Lstore_table /* FFI_TYPE_SINT32 */ ++ .long .Lretint64-.Lstore_table /* FFI_TYPE_UINT64 */ ++ .long .Lretint64-.Lstore_table /* FFI_TYPE_SINT64 */ ++ .long .Lretstruct-.Lstore_table /* FFI_TYPE_STRUCT */ ++ .long .Lretint-.Lstore_table /* FFI_TYPE_POINTER */ ++ .long .Lretstruct1b-.Lstore_table /* FFI_TYPE_SMALL_STRUCT_1B */ ++ .long .Lretstruct2b-.Lstore_table /* FFI_TYPE_SMALL_STRUCT_2B */ ++ .long .Lretstruct4b-.Lstore_table /* FFI_TYPE_SMALL_STRUCT_4B */ ++ .long .Lretstruct-.Lstore_table /* FFI_TYPE_MS_STRUCT */ + 1: +- add %ecx, %ecx +- add %ecx, %ecx ++ shl $2, %ecx ++ add (%esp),%ecx ++ mov (%ecx),%ecx + add (%esp),%ecx + add $4, %esp +- jmp *(%ecx) ++ jmp *%ecx + + /* Sign/zero extend as appropriate. */ + .Lretsint8: +@@ -644,27 +682,43 @@ + ret + .ffi_call_win32_end: + .balign 16 +- .globl _ffi_closure_THISCALL +-#ifndef __OS2__ ++FFI_HIDDEN(ffi_closure_THISCALL) ++ .globl USCORE_SYMBOL(ffi_closure_THISCALL) ++#if defined(X86_WIN32) && !defined(__OS2__) + .def _ffi_closure_THISCALL; .scl 2; .type 32; .endef + #endif +-_ffi_closure_THISCALL: +- pushl %ebp +- movl %esp, %ebp +- subl $40, %esp +- leal -24(%ebp), %edx +- movl %edx, -12(%ebp) /* resp */ +- leal 12(%ebp), %edx /* account for stub return address on stack */ +- jmp .stub ++USCORE_SYMBOL(ffi_closure_THISCALL): ++ /* Insert the register argument on the stack as the first argument */ ++ xchg %ecx, 4(%esp) ++ xchg %ecx, (%esp) ++ push %ecx ++ jmp .ffi_closure_STDCALL_internal ++ ++ .balign 16 ++FFI_HIDDEN(ffi_closure_FASTCALL) ++ .globl USCORE_SYMBOL(ffi_closure_FASTCALL) ++#if defined(X86_WIN32) && !defined(__OS2__) ++ .def _ffi_closure_FASTCALL; .scl 2; .type 32; .endef ++#endif ++USCORE_SYMBOL(ffi_closure_FASTCALL): ++ /* Insert the register arguments on the stack as the first two arguments */ ++ xchg %edx, 4(%esp) ++ xchg %ecx, (%esp) ++ push %edx ++ push %ecx ++ jmp .ffi_closure_STDCALL_internal + .LFE1: + + # This assumes we are using gas. + .balign 16 +- .globl _ffi_closure_SYSV +-#ifndef __OS2__ ++FFI_HIDDEN(ffi_closure_SYSV) ++#if defined(X86_WIN32) ++ .globl USCORE_SYMBOL(ffi_closure_SYSV) ++#if defined(X86_WIN32) && !defined(__OS2__) + .def _ffi_closure_SYSV; .scl 2; .type 32; .endef + #endif +-_ffi_closure_SYSV: ++USCORE_SYMBOL(ffi_closure_SYSV): ++#endif + .LFB3: + pushl %ebp + .LCFI4: +@@ -674,43 +728,54 @@ + leal -24(%ebp), %edx + movl %edx, -12(%ebp) /* resp */ + leal 8(%ebp), %edx +-.stub: + movl %edx, 4(%esp) /* args = __builtin_dwarf_cfa () */ + leal -12(%ebp), %edx + movl %edx, (%esp) /* &resp */ +- call _ffi_closure_SYSV_inner ++#if defined(HAVE_HIDDEN_VISIBILITY_ATTRIBUTE) || !defined(__PIC__) ++ call USCORE_SYMBOL(ffi_closure_SYSV_inner) ++#elif defined(X86_DARWIN) ++ calll L_ffi_closure_SYSV_inner$stub ++#else ++ movl %ebx, 8(%esp) ++ call 1f ++1: popl %ebx ++ addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx ++ call ffi_closure_SYSV_inner@PLT ++ movl 8(%esp), %ebx ++#endif + movl -12(%ebp), %ecx + + 0: + call 1f + # Do not insert anything here between the call and the jump table. + .Lcls_store_table: +- .long .Lcls_noretval /* FFI_TYPE_VOID */ +- .long .Lcls_retint /* FFI_TYPE_INT */ +- .long .Lcls_retfloat /* FFI_TYPE_FLOAT */ +- .long .Lcls_retdouble /* FFI_TYPE_DOUBLE */ +- .long .Lcls_retldouble /* FFI_TYPE_LONGDOUBLE */ +- .long .Lcls_retuint8 /* FFI_TYPE_UINT8 */ +- .long .Lcls_retsint8 /* FFI_TYPE_SINT8 */ +- .long .Lcls_retuint16 /* FFI_TYPE_UINT16 */ +- .long .Lcls_retsint16 /* FFI_TYPE_SINT16 */ +- .long .Lcls_retint /* FFI_TYPE_UINT32 */ +- .long .Lcls_retint /* FFI_TYPE_SINT32 */ +- .long .Lcls_retllong /* FFI_TYPE_UINT64 */ +- .long .Lcls_retllong /* FFI_TYPE_SINT64 */ +- .long .Lcls_retstruct /* FFI_TYPE_STRUCT */ +- .long .Lcls_retint /* FFI_TYPE_POINTER */ +- .long .Lcls_retstruct1 /* FFI_TYPE_SMALL_STRUCT_1B */ +- .long .Lcls_retstruct2 /* FFI_TYPE_SMALL_STRUCT_2B */ +- .long .Lcls_retstruct4 /* FFI_TYPE_SMALL_STRUCT_4B */ +- .long .Lcls_retmsstruct /* FFI_TYPE_MS_STRUCT */ ++ .long .Lcls_noretval-.Lcls_store_table /* FFI_TYPE_VOID */ ++ .long .Lcls_retint-.Lcls_store_table /* FFI_TYPE_INT */ ++ .long .Lcls_retfloat-.Lcls_store_table /* FFI_TYPE_FLOAT */ ++ .long .Lcls_retdouble-.Lcls_store_table /* FFI_TYPE_DOUBLE */ ++ .long .Lcls_retldouble-.Lcls_store_table /* FFI_TYPE_LONGDOUBLE */ ++ .long .Lcls_retuint8-.Lcls_store_table /* FFI_TYPE_UINT8 */ ++ .long .Lcls_retsint8-.Lcls_store_table /* FFI_TYPE_SINT8 */ ++ .long .Lcls_retuint16-.Lcls_store_table /* FFI_TYPE_UINT16 */ ++ .long .Lcls_retsint16-.Lcls_store_table /* FFI_TYPE_SINT16 */ ++ .long .Lcls_retint-.Lcls_store_table /* FFI_TYPE_UINT32 */ ++ .long .Lcls_retint-.Lcls_store_table /* FFI_TYPE_SINT32 */ ++ .long .Lcls_retllong-.Lcls_store_table /* FFI_TYPE_UINT64 */ ++ .long .Lcls_retllong-.Lcls_store_table /* FFI_TYPE_SINT64 */ ++ .long .Lcls_retstruct-.Lcls_store_table /* FFI_TYPE_STRUCT */ ++ .long .Lcls_retint-.Lcls_store_table /* FFI_TYPE_POINTER */ ++ .long .Lcls_retstruct1-.Lcls_store_table /* FFI_TYPE_SMALL_STRUCT_1B */ ++ .long .Lcls_retstruct2-.Lcls_store_table /* FFI_TYPE_SMALL_STRUCT_2B */ ++ .long .Lcls_retstruct4-.Lcls_store_table /* FFI_TYPE_SMALL_STRUCT_4B */ ++ .long .Lcls_retmsstruct-.Lcls_store_table /* FFI_TYPE_MS_STRUCT */ + + 1: +- add %eax, %eax +- add %eax, %eax ++ shl $2, %eax ++ add (%esp),%eax ++ mov (%eax),%eax + add (%esp),%eax + add $4, %esp +- jmp *(%eax) ++ jmp *%eax + + /* Sign/zero extend as appropriate. */ + .Lcls_retsint8: +@@ -788,12 +853,15 @@ + #define RAW_CLOSURE_FUN_OFFSET (RAW_CLOSURE_CIF_OFFSET + 4) + #define RAW_CLOSURE_USER_DATA_OFFSET (RAW_CLOSURE_FUN_OFFSET + 4) + #define CIF_FLAGS_OFFSET 20 ++ ++#ifdef X86_WIN32 + .balign 16 +- .globl _ffi_closure_raw_THISCALL +-#ifndef __OS2__ ++FFI_HIDDEN(ffi_closure_raw_THISCALL) ++ .globl USCORE_SYMBOL(ffi_closure_raw_THISCALL) ++#if defined(X86_WIN32) && !defined(__OS2__) + .def _ffi_closure_raw_THISCALL; .scl 2; .type 32; .endef + #endif +-_ffi_closure_raw_THISCALL: ++USCORE_SYMBOL(ffi_closure_raw_THISCALL): + pushl %ebp + movl %esp, %ebp + pushl %esi +@@ -803,13 +871,17 @@ + movl %edx, 12(%esp) /* user_data */ + leal 12(%ebp), %edx /* __builtin_dwarf_cfa () */ + jmp .stubraw ++#endif /* X86_WIN32 */ ++ + # This assumes we are using gas. + .balign 16 +- .globl _ffi_closure_raw_SYSV +-#ifndef __OS2__ ++#if defined(X86_WIN32) ++ .globl USCORE_SYMBOL(ffi_closure_raw_SYSV) ++#if defined(X86_WIN32) && !defined(__OS2__) + .def _ffi_closure_raw_SYSV; .scl 2; .type 32; .endef + #endif +-_ffi_closure_raw_SYSV: ++USCORE_SYMBOL(ffi_closure_raw_SYSV): ++#endif /* defined(X86_WIN32) */ + .LFB4: + pushl %ebp + .LCFI6: +@@ -833,31 +905,32 @@ + call 1f + # Do not insert anything here between the call and the jump table. + .Lrcls_store_table: +- .long .Lrcls_noretval /* FFI_TYPE_VOID */ +- .long .Lrcls_retint /* FFI_TYPE_INT */ +- .long .Lrcls_retfloat /* FFI_TYPE_FLOAT */ +- .long .Lrcls_retdouble /* FFI_TYPE_DOUBLE */ +- .long .Lrcls_retldouble /* FFI_TYPE_LONGDOUBLE */ +- .long .Lrcls_retuint8 /* FFI_TYPE_UINT8 */ +- .long .Lrcls_retsint8 /* FFI_TYPE_SINT8 */ +- .long .Lrcls_retuint16 /* FFI_TYPE_UINT16 */ +- .long .Lrcls_retsint16 /* FFI_TYPE_SINT16 */ +- .long .Lrcls_retint /* FFI_TYPE_UINT32 */ +- .long .Lrcls_retint /* FFI_TYPE_SINT32 */ +- .long .Lrcls_retllong /* FFI_TYPE_UINT64 */ +- .long .Lrcls_retllong /* FFI_TYPE_SINT64 */ +- .long .Lrcls_retstruct /* FFI_TYPE_STRUCT */ +- .long .Lrcls_retint /* FFI_TYPE_POINTER */ +- .long .Lrcls_retstruct1 /* FFI_TYPE_SMALL_STRUCT_1B */ +- .long .Lrcls_retstruct2 /* FFI_TYPE_SMALL_STRUCT_2B */ +- .long .Lrcls_retstruct4 /* FFI_TYPE_SMALL_STRUCT_4B */ +- .long .Lrcls_retstruct /* FFI_TYPE_MS_STRUCT */ ++ .long .Lrcls_noretval-.Lrcls_store_table /* FFI_TYPE_VOID */ ++ .long .Lrcls_retint-.Lrcls_store_table /* FFI_TYPE_INT */ ++ .long .Lrcls_retfloat-.Lrcls_store_table /* FFI_TYPE_FLOAT */ ++ .long .Lrcls_retdouble-.Lrcls_store_table /* FFI_TYPE_DOUBLE */ ++ .long .Lrcls_retldouble-.Lrcls_store_table /* FFI_TYPE_LONGDOUBLE */ ++ .long .Lrcls_retuint8-.Lrcls_store_table /* FFI_TYPE_UINT8 */ ++ .long .Lrcls_retsint8-.Lrcls_store_table /* FFI_TYPE_SINT8 */ ++ .long .Lrcls_retuint16-.Lrcls_store_table /* FFI_TYPE_UINT16 */ ++ .long .Lrcls_retsint16-.Lrcls_store_table /* FFI_TYPE_SINT16 */ ++ .long .Lrcls_retint-.Lrcls_store_table /* FFI_TYPE_UINT32 */ ++ .long .Lrcls_retint-.Lrcls_store_table /* FFI_TYPE_SINT32 */ ++ .long .Lrcls_retllong-.Lrcls_store_table /* FFI_TYPE_UINT64 */ ++ .long .Lrcls_retllong-.Lrcls_store_table /* FFI_TYPE_SINT64 */ ++ .long .Lrcls_retstruct-.Lrcls_store_table /* FFI_TYPE_STRUCT */ ++ .long .Lrcls_retint-.Lrcls_store_table /* FFI_TYPE_POINTER */ ++ .long .Lrcls_retstruct1-.Lrcls_store_table /* FFI_TYPE_SMALL_STRUCT_1B */ ++ .long .Lrcls_retstruct2-.Lrcls_store_table /* FFI_TYPE_SMALL_STRUCT_2B */ ++ .long .Lrcls_retstruct4-.Lrcls_store_table /* FFI_TYPE_SMALL_STRUCT_4B */ ++ .long .Lrcls_retstruct-.Lrcls_store_table /* FFI_TYPE_MS_STRUCT */ + 1: +- add %eax, %eax +- add %eax, %eax ++ shl $2, %eax ++ add (%esp),%eax ++ mov (%eax),%eax + add (%esp),%eax + add $4, %esp +- jmp *(%eax) ++ jmp *%eax + + /* Sign/zero extend as appropriate. */ + .Lrcls_retsint8: +@@ -925,11 +998,13 @@ + + # This assumes we are using gas. + .balign 16 +- .globl _ffi_closure_STDCALL +-#ifndef __OS2__ ++FFI_HIDDEN(ffi_closure_STDCALL) ++ .globl USCORE_SYMBOL(ffi_closure_STDCALL) ++#if defined(X86_WIN32) && !defined(__OS2__) + .def _ffi_closure_STDCALL; .scl 2; .type 32; .endef + #endif +-_ffi_closure_STDCALL: ++USCORE_SYMBOL(ffi_closure_STDCALL): ++.ffi_closure_STDCALL_internal: + .LFB5: + pushl %ebp + .LCFI9: +@@ -942,36 +1017,48 @@ + movl %edx, 4(%esp) /* args */ + leal -12(%ebp), %edx + movl %edx, (%esp) /* &resp */ +- call _ffi_closure_SYSV_inner ++#if defined(HAVE_HIDDEN_VISIBILITY_ATTRIBUTE) || !defined(__PIC__) ++ call USCORE_SYMBOL(ffi_closure_SYSV_inner) ++#elif defined(X86_DARWIN) ++ calll L_ffi_closure_SYSV_inner$stub ++#else ++ movl %ebx, 8(%esp) ++ call 1f ++1: popl %ebx ++ addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx ++ call ffi_closure_SYSV_inner@PLT ++ movl 8(%esp), %ebx ++#endif + movl -12(%ebp), %ecx + 0: + call 1f + # Do not insert anything here between the call and the jump table. + .Lscls_store_table: +- .long .Lscls_noretval /* FFI_TYPE_VOID */ +- .long .Lscls_retint /* FFI_TYPE_INT */ +- .long .Lscls_retfloat /* FFI_TYPE_FLOAT */ +- .long .Lscls_retdouble /* FFI_TYPE_DOUBLE */ +- .long .Lscls_retldouble /* FFI_TYPE_LONGDOUBLE */ +- .long .Lscls_retuint8 /* FFI_TYPE_UINT8 */ +- .long .Lscls_retsint8 /* FFI_TYPE_SINT8 */ +- .long .Lscls_retuint16 /* FFI_TYPE_UINT16 */ +- .long .Lscls_retsint16 /* FFI_TYPE_SINT16 */ +- .long .Lscls_retint /* FFI_TYPE_UINT32 */ +- .long .Lscls_retint /* FFI_TYPE_SINT32 */ +- .long .Lscls_retllong /* FFI_TYPE_UINT64 */ +- .long .Lscls_retllong /* FFI_TYPE_SINT64 */ +- .long .Lscls_retstruct /* FFI_TYPE_STRUCT */ +- .long .Lscls_retint /* FFI_TYPE_POINTER */ +- .long .Lscls_retstruct1 /* FFI_TYPE_SMALL_STRUCT_1B */ +- .long .Lscls_retstruct2 /* FFI_TYPE_SMALL_STRUCT_2B */ +- .long .Lscls_retstruct4 /* FFI_TYPE_SMALL_STRUCT_4B */ ++ .long .Lscls_noretval-.Lscls_store_table /* FFI_TYPE_VOID */ ++ .long .Lscls_retint-.Lscls_store_table /* FFI_TYPE_INT */ ++ .long .Lscls_retfloat-.Lscls_store_table /* FFI_TYPE_FLOAT */ ++ .long .Lscls_retdouble-.Lscls_store_table /* FFI_TYPE_DOUBLE */ ++ .long .Lscls_retldouble-.Lscls_store_table /* FFI_TYPE_LONGDOUBLE */ ++ .long .Lscls_retuint8-.Lscls_store_table /* FFI_TYPE_UINT8 */ ++ .long .Lscls_retsint8-.Lscls_store_table /* FFI_TYPE_SINT8 */ ++ .long .Lscls_retuint16-.Lscls_store_table /* FFI_TYPE_UINT16 */ ++ .long .Lscls_retsint16-.Lscls_store_table /* FFI_TYPE_SINT16 */ ++ .long .Lscls_retint-.Lscls_store_table /* FFI_TYPE_UINT32 */ ++ .long .Lscls_retint-.Lscls_store_table /* FFI_TYPE_SINT32 */ ++ .long .Lscls_retllong-.Lscls_store_table /* FFI_TYPE_UINT64 */ ++ .long .Lscls_retllong-.Lscls_store_table /* FFI_TYPE_SINT64 */ ++ .long .Lscls_retstruct-.Lscls_store_table /* FFI_TYPE_STRUCT */ ++ .long .Lscls_retint-.Lscls_store_table /* FFI_TYPE_POINTER */ ++ .long .Lscls_retstruct1-.Lscls_store_table /* FFI_TYPE_SMALL_STRUCT_1B */ ++ .long .Lscls_retstruct2-.Lscls_store_table /* FFI_TYPE_SMALL_STRUCT_2B */ ++ .long .Lscls_retstruct4-.Lscls_store_table /* FFI_TYPE_SMALL_STRUCT_4B */ + 1: +- add %eax, %eax +- add %eax, %eax ++ shl $2, %eax ++ add (%esp),%eax ++ mov (%eax),%eax + add (%esp),%eax + add $4, %esp +- jmp *(%eax) ++ jmp *%eax + + /* Sign/zero extend as appropriate. */ + .Lscls_retsint8: +@@ -1030,11 +1117,30 @@ + .Lscls_epilogue: + movl %ebp, %esp + popl %ebp +- ret ++ popl %ecx ++ popl %edx ++ movl (CLOSURE_CIF_OFFSET-10)(%ecx), %ecx ++ addl CIF_BYTES_OFFSET(%ecx), %esp ++ movl CIF_ABI_OFFSET(%ecx), %ecx ++ cmpl $3, %ecx /* FFI_THISCALL */ ++ je 1f ++ cmpl $4, %ecx /* FFI_FASTCALL */ ++ jne 2f ++ ++ addl $4, %esp ++1: addl $4, %esp ++2: jmp *%edx + .ffi_closure_STDCALL_end: + .LFE5: + +-#ifndef __OS2__ ++#if defined(X86_DARWIN) ++.section __IMPORT,__jump_table,symbol_stubs,self_modifying_code+pure_instructions,5 ++L_ffi_closure_SYSV_inner$stub: ++ .indirect_symbol _ffi_closure_SYSV_inner ++ hlt ; hlt ; hlt ; hlt ; hlt ++#endif ++ ++#if defined(X86_WIN32) && !defined(__OS2__) + .section .eh_frame,"w" + #endif + .Lframe1: +@@ -1094,7 +1200,6 @@ + .align 4 + .LEFDE1: + +- + .LSFDE3: + .long .LEFDE3-.LASFDE3 /* FDE Length */ + .LASFDE3: +diff -r ee879c0ffa11 Modules/_ctypes/libffi/stamp-h.in +--- a/Modules/_ctypes/libffi/stamp-h.in ++++ /dev/null +@@ -1 +0,0 @@ +-timestamp +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/Makefile.am +--- a/Modules/_ctypes/libffi/testsuite/Makefile.am ++++ b/Modules/_ctypes/libffi/testsuite/Makefile.am +@@ -2,17 +2,6 @@ + + AUTOMAKE_OPTIONS = foreign dejagnu + +-# Setup the testing framework, if you have one +-EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \ +- echo $(top_builddir)/../expect/expect ; \ +- else echo expect ; fi` +- +-RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \ +- echo $(top_srcdir)/../dejagnu/runtest ; \ +- else echo runtest; fi` +- +-AM_RUNTESTFLAGS = +- + EXTRA_DEJAGNU_SITE_CONFIG=../local.exp + + CLEANFILES = *.exe core* *.log *.sum +@@ -20,7 +9,7 @@ + EXTRA_DIST = config/default.exp libffi.call/cls_19byte.c \ + libffi.call/cls_align_longdouble_split.c \ + libffi.call/closure_loc_fn0.c libffi.call/cls_schar.c \ +-libffi.call/closure_fn1.c libffi.call/many2_win32.c \ ++libffi.call/closure_fn1.c \ + libffi.call/return_ul.c libffi.call/cls_align_double.c \ + libffi.call/return_fl2.c libffi.call/cls_1_1byte.c \ + libffi.call/cls_64byte.c libffi.call/nested_struct7.c \ +@@ -30,7 +19,7 @@ + libffi.call/cls_3byte1.c libffi.call/cls_16byte.c \ + libffi.call/struct8.c libffi.call/nested_struct8.c \ + libffi.call/cls_multi_sshort.c libffi.call/cls_3byte2.c \ +-libffi.call/fastthis2_win32.c libffi.call/cls_pointer.c \ ++libffi.call/cls_pointer.c \ + libffi.call/err_bad_typedef.c libffi.call/cls_4_1byte.c \ + libffi.call/cls_9byte2.c libffi.call/cls_multi_schar.c \ + libffi.call/stret_medium2.c libffi.call/cls_5_1_byte.c \ +@@ -46,16 +35,16 @@ + libffi.call/return_fl3.c libffi.call/stret_medium.c \ + libffi.call/nested_struct6.c libffi.call/closure_fn3.c \ + libffi.call/float3.c libffi.call/many2.c \ +-libffi.call/closure_stdcall.c libffi.call/cls_align_uint16.c \ ++libffi.call/closure_simple.c libffi.call/cls_align_uint16.c \ + libffi.call/cls_9byte1.c libffi.call/closure_fn6.c \ + libffi.call/cls_double_va.c libffi.call/cls_align_pointer.c \ + libffi.call/cls_align_longdouble.c libffi.call/closure_fn2.c \ +-libffi.call/cls_sshort.c libffi.call/many_win32.c \ ++libffi.call/cls_sshort.c \ + libffi.call/nested_struct.c libffi.call/cls_20byte.c \ + libffi.call/cls_longdouble.c libffi.call/cls_multi_uchar.c \ +-libffi.call/return_uc.c libffi.call/closure_thiscall.c \ ++libffi.call/return_uc.c \ + libffi.call/cls_18byte.c libffi.call/cls_8byte.c \ +-libffi.call/promotion.c libffi.call/struct1_win32.c \ ++libffi.call/promotion.c \ + libffi.call/return_dbl.c libffi.call/cls_24byte.c \ + libffi.call/struct4.c libffi.call/cls_6byte.c \ + libffi.call/cls_align_uint32.c libffi.call/float.c \ +@@ -63,7 +52,7 @@ + libffi.call/return_dbl1.c libffi.call/cls_3_1byte.c \ + libffi.call/cls_align_float.c libffi.call/return_fl1.c \ + libffi.call/nested_struct10.c libffi.call/nested_struct5.c \ +-libffi.call/fastthis1_win32.c libffi.call/cls_align_sint64.c \ ++libffi.call/cls_align_sint64.c \ + libffi.call/stret_large2.c libffi.call/return_sl.c \ + libffi.call/closure_fn0.c libffi.call/cls_5byte.c \ + libffi.call/cls_2byte.c libffi.call/float2.c \ +@@ -75,20 +64,22 @@ + libffi.call/pyobjc-tc.c libffi.call/cls_multi_ushortchar.c \ + libffi.call/struct1.c libffi.call/nested_struct9.c \ + libffi.call/huge_struct.c libffi.call/problem1.c \ +-libffi.call/float4.c libffi.call/fastthis3_win32.c \ +-libffi.call/return_ldl.c libffi.call/strlen2_win32.c \ +-libffi.call/closure_fn5.c libffi.call/struct2_win32.c \ ++libffi.call/float4.c \ ++libffi.call/return_ldl.c \ ++libffi.call/closure_fn5.c \ + libffi.call/struct6.c libffi.call/return_ll.c libffi.call/struct9.c \ + libffi.call/return_sc.c libffi.call/struct7.c \ + libffi.call/cls_align_uint64.c libffi.call/cls_4byte.c \ +-libffi.call/strlen_win32.c libffi.call/cls_6_1_byte.c \ +-libffi.call/cls_7_1_byte.c libffi.special/unwindtest.cc \ +-libffi.special/special.exp libffi.special/unwindtest_ffi_call.cc \ +-libffi.special/ffitestcxx.h lib/wrapper.exp lib/target-libpath.exp \ ++libffi.call/cls_6_1_byte.c \ ++libffi.call/cls_7_1_byte.c libffi.call/unwindtest.cc \ ++libffi.call/unwindtest_ffi_call.cc \ ++lib/wrapper.exp lib/target-libpath.exp \ + lib/libffi.exp libffi.call/cls_struct_va1.c \ + libffi.call/cls_uchar_va.c libffi.call/cls_uint_va.c \ + libffi.call/cls_ulong_va.c libffi.call/cls_ushort_va.c \ + libffi.call/nested_struct11.c libffi.call/uninitialized.c \ + libffi.call/va_1.c libffi.call/va_struct1.c libffi.call/va_struct2.c \ +-libffi.call/va_struct3.c +- ++libffi.call/va_struct3.c \ ++libffi.call/strlen2.c \ ++libffi.call/strlen3.c \ ++libffi.call/strlen4.c +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/Makefile.in +--- a/Modules/_ctypes/libffi/testsuite/Makefile.in ++++ b/Modules/_ctypes/libffi/testsuite/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.12.2 from Makefile.am. ++# Makefile.in generated by automake 1.13.4 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2012 Free Software Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -14,23 +14,51 @@ + + @SET_MAKE@ + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -51,7 +79,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = testsuite +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ +@@ -73,6 +101,18 @@ + CONFIG_HEADER = $(top_builddir)/fficonfig.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + SOURCES = + DIST_SOURCES = + am__can_run_installinfo = \ +@@ -80,14 +120,18 @@ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + DEJATOOL = $(PACKAGE) + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir ++EXPECT = expect ++RUNTEST = runtest + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AM_LTLDFLAGS = @AM_LTLDFLAGS@ +-AM_RUNTESTFLAGS = ++AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -101,6 +145,10 @@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +@@ -116,6 +164,7 @@ + FGREP = @FGREP@ + GREP = @GREP@ + HAVE_LONG_DOUBLE = @HAVE_LONG_DOUBLE@ ++HAVE_LONG_DOUBLE_VARIANT = @HAVE_LONG_DOUBLE_VARIANT@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -162,6 +211,7 @@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_AR = @ac_ct_AR@ + ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ +@@ -217,22 +267,12 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign dejagnu +- +-# Setup the testing framework, if you have one +-EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \ +- echo $(top_builddir)/../expect/expect ; \ +- else echo expect ; fi` +- +-RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \ +- echo $(top_srcdir)/../dejagnu/runtest ; \ +- else echo runtest; fi` +- + EXTRA_DEJAGNU_SITE_CONFIG = ../local.exp + CLEANFILES = *.exe core* *.log *.sum + EXTRA_DIST = config/default.exp libffi.call/cls_19byte.c \ + libffi.call/cls_align_longdouble_split.c \ + libffi.call/closure_loc_fn0.c libffi.call/cls_schar.c \ +-libffi.call/closure_fn1.c libffi.call/many2_win32.c \ ++libffi.call/closure_fn1.c \ + libffi.call/return_ul.c libffi.call/cls_align_double.c \ + libffi.call/return_fl2.c libffi.call/cls_1_1byte.c \ + libffi.call/cls_64byte.c libffi.call/nested_struct7.c \ +@@ -242,7 +282,7 @@ + libffi.call/cls_3byte1.c libffi.call/cls_16byte.c \ + libffi.call/struct8.c libffi.call/nested_struct8.c \ + libffi.call/cls_multi_sshort.c libffi.call/cls_3byte2.c \ +-libffi.call/fastthis2_win32.c libffi.call/cls_pointer.c \ ++libffi.call/cls_pointer.c \ + libffi.call/err_bad_typedef.c libffi.call/cls_4_1byte.c \ + libffi.call/cls_9byte2.c libffi.call/cls_multi_schar.c \ + libffi.call/stret_medium2.c libffi.call/cls_5_1_byte.c \ +@@ -258,16 +298,16 @@ + libffi.call/return_fl3.c libffi.call/stret_medium.c \ + libffi.call/nested_struct6.c libffi.call/closure_fn3.c \ + libffi.call/float3.c libffi.call/many2.c \ +-libffi.call/closure_stdcall.c libffi.call/cls_align_uint16.c \ ++libffi.call/closure_simple.c libffi.call/cls_align_uint16.c \ + libffi.call/cls_9byte1.c libffi.call/closure_fn6.c \ + libffi.call/cls_double_va.c libffi.call/cls_align_pointer.c \ + libffi.call/cls_align_longdouble.c libffi.call/closure_fn2.c \ +-libffi.call/cls_sshort.c libffi.call/many_win32.c \ ++libffi.call/cls_sshort.c \ + libffi.call/nested_struct.c libffi.call/cls_20byte.c \ + libffi.call/cls_longdouble.c libffi.call/cls_multi_uchar.c \ +-libffi.call/return_uc.c libffi.call/closure_thiscall.c \ ++libffi.call/return_uc.c \ + libffi.call/cls_18byte.c libffi.call/cls_8byte.c \ +-libffi.call/promotion.c libffi.call/struct1_win32.c \ ++libffi.call/promotion.c \ + libffi.call/return_dbl.c libffi.call/cls_24byte.c \ + libffi.call/struct4.c libffi.call/cls_6byte.c \ + libffi.call/cls_align_uint32.c libffi.call/float.c \ +@@ -275,7 +315,7 @@ + libffi.call/return_dbl1.c libffi.call/cls_3_1byte.c \ + libffi.call/cls_align_float.c libffi.call/return_fl1.c \ + libffi.call/nested_struct10.c libffi.call/nested_struct5.c \ +-libffi.call/fastthis1_win32.c libffi.call/cls_align_sint64.c \ ++libffi.call/cls_align_sint64.c \ + libffi.call/stret_large2.c libffi.call/return_sl.c \ + libffi.call/closure_fn0.c libffi.call/cls_5byte.c \ + libffi.call/cls_2byte.c libffi.call/float2.c \ +@@ -287,22 +327,25 @@ + libffi.call/pyobjc-tc.c libffi.call/cls_multi_ushortchar.c \ + libffi.call/struct1.c libffi.call/nested_struct9.c \ + libffi.call/huge_struct.c libffi.call/problem1.c \ +-libffi.call/float4.c libffi.call/fastthis3_win32.c \ +-libffi.call/return_ldl.c libffi.call/strlen2_win32.c \ +-libffi.call/closure_fn5.c libffi.call/struct2_win32.c \ ++libffi.call/float4.c \ ++libffi.call/return_ldl.c \ ++libffi.call/closure_fn5.c \ + libffi.call/struct6.c libffi.call/return_ll.c libffi.call/struct9.c \ + libffi.call/return_sc.c libffi.call/struct7.c \ + libffi.call/cls_align_uint64.c libffi.call/cls_4byte.c \ +-libffi.call/strlen_win32.c libffi.call/cls_6_1_byte.c \ +-libffi.call/cls_7_1_byte.c libffi.special/unwindtest.cc \ +-libffi.special/special.exp libffi.special/unwindtest_ffi_call.cc \ +-libffi.special/ffitestcxx.h lib/wrapper.exp lib/target-libpath.exp \ ++libffi.call/cls_6_1_byte.c \ ++libffi.call/cls_7_1_byte.c libffi.call/unwindtest.cc \ ++libffi.call/unwindtest_ffi_call.cc \ ++lib/wrapper.exp lib/target-libpath.exp \ + lib/libffi.exp libffi.call/cls_struct_va1.c \ + libffi.call/cls_uchar_va.c libffi.call/cls_uint_va.c \ + libffi.call/cls_ulong_va.c libffi.call/cls_ushort_va.c \ + libffi.call/nested_struct11.c libffi.call/uninitialized.c \ + libffi.call/va_1.c libffi.call/va_struct1.c libffi.call/va_struct2.c \ +-libffi.call/va_struct3.c ++libffi.call/va_struct3.c \ ++libffi.call/strlen2.c \ ++libffi.call/strlen3.c \ ++libffi.call/strlen4.c + + all: all-am + +@@ -343,11 +386,9 @@ + + clean-libtool: + -rm -rf .libs _libs +-tags: TAGS +-TAGS: ++tags TAGS: + +-ctags: CTAGS +-CTAGS: ++ctags CTAGS: + + cscope cscopelist: + +@@ -355,13 +396,12 @@ + check-DEJAGNU: site.exp + srcdir='$(srcdir)'; export srcdir; \ + EXPECT=$(EXPECT); export EXPECT; \ +- runtest=$(RUNTEST); \ +- if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ ++ if $(SHELL) -c "$(RUNTEST) --version" > /dev/null 2>&1; then \ + exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \ +- if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ ++ if $(RUNTEST) $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ + then :; else exit_status=1; fi; \ + done; \ +- else echo "WARNING: could not find 'runtest'" 1>&2; :;\ ++ else echo "WARNING: could not find '$(RUNTEST)'" 1>&2; :;\ + fi; \ + exit $$exit_status + site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG) +@@ -532,16 +572,17 @@ + .MAKE: check-am install-am install-strip + + .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ +- clean-libtool distclean distclean-DEJAGNU distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am ++ clean-libtool cscopelist-am ctags-am distclean \ ++ distclean-DEJAGNU distclean-generic distclean-libtool distdir \ ++ dvi dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ ++ uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/lib/libffi.exp +--- a/Modules/_ctypes/libffi/testsuite/lib/libffi.exp ++++ b/Modules/_ctypes/libffi/testsuite/lib/libffi.exp +@@ -222,6 +222,10 @@ + lappend options "libs= -lpthread" + } + ++ if { [string match "*.cc" $source] } { ++ lappend options "c++" ++ } ++ + verbose "options: $options" + return [target_compile $source $dest $type $options] + } +@@ -273,6 +277,46 @@ + } + } + ++proc run-many-tests { testcases extra_flags } { ++ global using_gcc ++ if { [string match $using_gcc "yes"] } { ++ set common "-W -Wall" ++ set optimizations { "-O0" "-O2" "-O3" "-Os" "-O2 -fomit-frame-pointer" } ++ } else { ++ # Assume we are using the vendor compiler. ++ set common "" ++ set optimizations { "" } ++ } ++ ++ set targetabis { "" } ++ if [string match $using_gcc "yes"] { ++ if [istarget "i?86-*-*"] { ++ set targetabis { ++ "" ++ "-DABI_NUM=FFI_STDCALL -DABI_ATTR=__STDCALL__" ++ "-DABI_NUM=FFI_THISCALL -DABI_ATTR=__THISCALL__" ++ "-DABI_NUM=FFI_FASTCALL -DABI_ATTR=__FASTCALL__" ++ } ++ } ++ } ++ ++ set common [ concat $common $extra_flags ] ++ foreach test $testcases { ++ set testname [file tail $test] ++ if [search_for $test "ABI_NUM"] { ++ set abis $targetabis ++ } else { ++ set abis { "" } ++ } ++ foreach opt $optimizations { ++ foreach abi $abis { ++ set options [concat $common $opt $abi] ++ verbose "Testing $testname, $options" 1 ++ dg-test $test $options "" ++ } ++ } ++ } ++} + + # Like check_conditional_xfail, but callable from a dg test. + +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/call.exp +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/call.exp ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/call.exp +@@ -19,20 +19,7 @@ + + global srcdir subdir + +-if { [string match $using_gcc "yes"] } { +- +- dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O0 -W -Wall" "" +- dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O2" "" +- dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O3" "" +- dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-Os" "" +- dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O2 -fomit-frame-pointer" "" +- +-} else { +- +- # Assume we are using the vendor compiler. +- dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" "" +- +-} ++run-many-tests [lsort [glob -nocomplain -- $srcdir/$subdir/*.{c,cc}]] "" + + dg-finish + +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/closure_simple.c +--- /dev/null ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_simple.c +@@ -0,0 +1,55 @@ ++/* Area: closure_call ++ Purpose: Check simple closure handling with all ABIs ++ Limitations: none. ++ PR: none. ++ Originator: */ ++ ++/* { dg-do run } */ ++#include "ffitest.h" ++ ++static void ++closure_test(ffi_cif* cif __UNUSED__, void* resp, void** args, void* userdata) ++{ ++ *(ffi_arg*)resp = ++ (int)*(int *)args[0] + (int)(*(int *)args[1]) ++ + (int)(*(int *)args[2]) + (int)(*(int *)args[3]) ++ + (int)(intptr_t)userdata; ++ ++ printf("%d %d %d %d: %d\n", ++ (int)*(int *)args[0], (int)(*(int *)args[1]), ++ (int)(*(int *)args[2]), (int)(*(int *)args[3]), ++ (int)*(ffi_arg *)resp); ++ ++} ++ ++typedef int (ABI_ATTR *closure_test_type0)(int, int, int, int); ++ ++int main (void) ++{ ++ ffi_cif cif; ++ void *code; ++ ffi_closure *pcl = ffi_closure_alloc(sizeof(ffi_closure), &code); ++ ffi_type * cl_arg_types[17]; ++ int res; ++ ++ cl_arg_types[0] = &ffi_type_uint; ++ cl_arg_types[1] = &ffi_type_uint; ++ cl_arg_types[2] = &ffi_type_uint; ++ cl_arg_types[3] = &ffi_type_uint; ++ cl_arg_types[4] = NULL; ++ ++ /* Initialize the cif */ ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 4, ++ &ffi_type_sint, cl_arg_types) == FFI_OK); ++ ++ CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test, ++ (void *) 3 /* userdata */, code) == FFI_OK); ++ ++ res = (*(closure_test_type0)code)(0, 1, 2, 3); ++ /* { dg-output "0 1 2 3: 9" } */ ++ ++ printf("res: %d\n",res); ++ /* { dg-output "\nres: 9" } */ ++ ++ exit(0); ++} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c ++++ /dev/null +@@ -1,72 +0,0 @@ +-/* Area: closure_call (stdcall convention) +- Purpose: Check handling when caller expects stdcall callee +- Limitations: none. +- PR: none. +- Originator: */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +-#include "ffitest.h" +- +-static void +-closure_test_stdcall(ffi_cif* cif __UNUSED__, void* resp, void** args, +- void* userdata) +-{ +- *(ffi_arg*)resp = +- (int)*(int *)args[0] + (int)(*(int *)args[1]) +- + (int)(*(int *)args[2]) + (int)(*(int *)args[3]) +- + (int)(intptr_t)userdata; +- +- printf("%d %d %d %d: %d\n", +- (int)*(int *)args[0], (int)(*(int *)args[1]), +- (int)(*(int *)args[2]), (int)(*(int *)args[3]), +- (int)*(ffi_arg *)resp); +- +-} +- +-typedef int (__stdcall *closure_test_type0)(int, int, int, int); +- +-int main (void) +-{ +- ffi_cif cif; +- void *code; +- ffi_closure *pcl = ffi_closure_alloc(sizeof(ffi_closure), &code); +- ffi_type * cl_arg_types[17]; +- int res; +- void* sp_pre; +- void* sp_post; +- char buf[1024]; +- +- cl_arg_types[0] = &ffi_type_uint; +- cl_arg_types[1] = &ffi_type_uint; +- cl_arg_types[2] = &ffi_type_uint; +- cl_arg_types[3] = &ffi_type_uint; +- cl_arg_types[4] = NULL; +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_STDCALL, 4, +- &ffi_type_sint, cl_arg_types) == FFI_OK); +- +- CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_stdcall, +- (void *) 3 /* userdata */, code) == FFI_OK); +- +-#ifdef _MSC_VER +- __asm { mov sp_pre, esp } +-#else +- asm volatile (" movl %%esp,%0" : "=g" (sp_pre)); +-#endif +- res = (*(closure_test_type0)code)(0, 1, 2, 3); +-#ifdef _MSC_VER +- __asm { mov sp_post, esp } +-#else +- asm volatile (" movl %%esp,%0" : "=g" (sp_post)); +-#endif +- /* { dg-output "0 1 2 3: 9" } */ +- +- printf("res: %d\n",res); +- /* { dg-output "\nres: 9" } */ +- +- sprintf(buf, "mismatch: pre=%p vs post=%p", sp_pre, sp_post); +- printf("stack pointer %s\n", (sp_pre == sp_post ? "match" : buf)); +- /* { dg-output "\nstack pointer match" } */ +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c ++++ /dev/null +@@ -1,72 +0,0 @@ +-/* Area: closure_call (thiscall convention) +- Purpose: Check handling when caller expects thiscall callee +- Limitations: none. +- PR: none. +- Originator: */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +-#include "ffitest.h" +- +-static void +-closure_test_thiscall(ffi_cif* cif __UNUSED__, void* resp, void** args, +- void* userdata) +-{ +- *(ffi_arg*)resp = +- (int)*(int *)args[0] + (int)(*(int *)args[1]) +- + (int)(*(int *)args[2]) + (int)(*(int *)args[3]) +- + (int)(intptr_t)userdata; +- +- printf("%d %d %d %d: %d\n", +- (int)*(int *)args[0], (int)(*(int *)args[1]), +- (int)(*(int *)args[2]), (int)(*(int *)args[3]), +- (int)*(ffi_arg *)resp); +- +-} +- +-typedef int (__thiscall *closure_test_type0)(int, int, int, int); +- +-int main (void) +-{ +- ffi_cif cif; +- void *code; +- ffi_closure *pcl = ffi_closure_alloc(sizeof(ffi_closure), &code); +- ffi_type * cl_arg_types[17]; +- int res; +- void* sp_pre; +- void* sp_post; +- char buf[1024]; +- +- cl_arg_types[0] = &ffi_type_uint; +- cl_arg_types[1] = &ffi_type_uint; +- cl_arg_types[2] = &ffi_type_uint; +- cl_arg_types[3] = &ffi_type_uint; +- cl_arg_types[4] = NULL; +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_THISCALL, 4, +- &ffi_type_sint, cl_arg_types) == FFI_OK); +- +- CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_thiscall, +- (void *) 3 /* userdata */, code) == FFI_OK); +- +-#ifdef _MSC_VER +- __asm { mov sp_pre, esp } +-#else +- asm volatile (" movl %%esp,%0" : "=g" (sp_pre)); +-#endif +- res = (*(closure_test_type0)code)(0, 1, 2, 3); +-#ifdef _MSC_VER +- __asm { mov sp_post, esp } +-#else +- asm volatile (" movl %%esp,%0" : "=g" (sp_post)); +-#endif +- /* { dg-output "0 1 2 3: 9" } */ +- +- printf("res: %d\n",res); +- /* { dg-output "\nres: 9" } */ +- +- sprintf(buf, "mismatch: pre=%p vs post=%p", sp_pre, sp_post); +- printf("stack pointer %s\n", (sp_pre == sp_post ? "match" : buf)); +- /* { dg-output "\nstack pointer match" } */ +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/cls_double_va.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_double_va.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_double_va.c +@@ -38,7 +38,7 @@ + + /* This printf call is variadic */ + CHECK(ffi_prep_cif_var(&cif, FFI_DEFAULT_ABI, 1, 2, &ffi_type_sint, +- arg_types) == FFI_OK); ++ arg_types) == FFI_OK); + + args[0] = &format; + args[1] = &doubleArg; +@@ -49,12 +49,10 @@ + printf("res: %d\n", (int) res); + /* { dg-output "\nres: 4" } */ + +- /* The call to cls_double_va_fn is static, so have to use a normal prep_cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, &ffi_type_sint, arg_types) == FFI_OK); ++ CHECK(ffi_prep_closure_loc(pcl, &cif, cls_double_va_fn, NULL, ++ code) == FFI_OK); + +- CHECK(ffi_prep_closure_loc(pcl, &cif, cls_double_va_fn, NULL, code) == FFI_OK); +- +- res = ((int(*)(char*, double))(code))(format, doubleArg); ++ res = ((int(*)(char*, ...))(code))(format, doubleArg); + /* { dg-output "\n7.0" } */ + printf("res: %d\n", (int) res); + /* { dg-output "\nres: 4" } */ +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble_va.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble_va.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble_va.c +@@ -38,7 +38,7 @@ + + /* This printf call is variadic */ + CHECK(ffi_prep_cif_var(&cif, FFI_DEFAULT_ABI, 1, 2, &ffi_type_sint, +- arg_types) == FFI_OK); ++ arg_types) == FFI_OK); + + args[0] = &format; + args[1] = &ldArg; +@@ -49,13 +49,10 @@ + printf("res: %d\n", (int) res); + /* { dg-output "\nres: 4" } */ + +- /* The call to cls_longdouble_va_fn is static, so have to use a normal prep_cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, &ffi_type_sint, +- arg_types) == FFI_OK); ++ CHECK(ffi_prep_closure_loc(pcl, &cif, cls_longdouble_va_fn, NULL, ++ code) == FFI_OK); + +- CHECK(ffi_prep_closure_loc(pcl, &cif, cls_longdouble_va_fn, NULL, code) == FFI_OK); +- +- res = ((int(*)(char*, long double))(code))(format, ldArg); ++ res = ((int(*)(char*, ...))(code))(format, ldArg); + /* { dg-output "\n7.0" } */ + printf("res: %d\n", (int) res); + /* { dg-output "\nres: 4" } */ +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/cls_struct_va1.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_struct_va1.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_struct_va1.c +@@ -35,7 +35,7 @@ + printf ("%d %d %d %d %d %d %d %d %d %d\n", n, s1.a, s1.b, + l1.a, l1.b, l1.c, l1.d, l1.e, + s2.a, s2.b); +- * (int*) resp = 42; ++ * (ffi_arg*) resp = 42; + } + + int +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/cls_uint_va.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_uint_va.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_uint_va.c +@@ -13,9 +13,9 @@ + static void cls_ret_T_fn(ffi_cif* cif __UNUSED__, void* resp, void** args, + void* userdata __UNUSED__) + { +- *(T *)resp = *(T *)args[0]; ++ *(ffi_arg *)resp = *(T *)args[0]; + +- printf("%d: %d %d\n", *(T *)resp, *(T *)args[0], *(T *)args[1]); ++ printf("%d: %d %d\n", (int)*(ffi_arg *)resp, *(T *)args[0], *(T *)args[1]); + } + + typedef T (*cls_ret_T)(T, ...); +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c ++++ /dev/null +@@ -1,50 +0,0 @@ +-/* Area: ffi_call +- Purpose: Check fastcall fct call on X86_WIN32 systems. +- Limitations: none. +- PR: none. +- Originator: From the original ffitest.c */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +- +-#include "ffitest.h" +- +-static size_t __FASTCALL__ my_fastcall_f(char *s, float a) +-{ +- return (size_t) ((int) strlen(s) + (int) a); +-} +- +-int main (void) +-{ +- ffi_cif cif; +- ffi_type *args[MAX_ARGS]; +- void *values[MAX_ARGS]; +- ffi_arg rint; +- char *s; +- float v2; +- args[0] = &ffi_type_pointer; +- args[1] = &ffi_type_float; +- values[0] = (void*) &s; +- values[1] = (void*) &v2; +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_FASTCALL, 2, +- &ffi_type_sint, args) == FFI_OK); +- +- s = "a"; +- v2 = 0.0; +- ffi_call(&cif, FFI_FN(my_fastcall_f), &rint, values); +- CHECK(rint == 1); +- +- s = "1234567"; +- v2 = -1.0; +- ffi_call(&cif, FFI_FN(my_fastcall_f), &rint, values); +- CHECK(rint == 6); +- +- s = "1234567890123456789012345"; +- v2 = 1.0; +- ffi_call(&cif, FFI_FN(my_fastcall_f), &rint, values); +- CHECK(rint == 26); +- +- printf("fastcall fct1 tests passed\n"); +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c ++++ /dev/null +@@ -1,50 +0,0 @@ +-/* Area: ffi_call +- Purpose: Check fastcall fct call on X86_WIN32 systems. +- Limitations: none. +- PR: none. +- Originator: From the original ffitest.c */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +- +-#include "ffitest.h" +- +-static size_t __FASTCALL__ my_fastcall_f(float a, char *s) +-{ +- return (size_t) ((int) strlen(s) + (int) a); +-} +- +-int main (void) +-{ +- ffi_cif cif; +- ffi_type *args[MAX_ARGS]; +- void *values[MAX_ARGS]; +- ffi_arg rint; +- char *s; +- float v2; +- args[1] = &ffi_type_pointer; +- args[0] = &ffi_type_float; +- values[1] = (void*) &s; +- values[0] = (void*) &v2; +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_FASTCALL, 2, +- &ffi_type_sint, args) == FFI_OK); +- +- s = "a"; +- v2 = 0.0; +- ffi_call(&cif, FFI_FN(my_fastcall_f), &rint, values); +- CHECK(rint == 1); +- +- s = "1234567"; +- v2 = -1.0; +- ffi_call(&cif, FFI_FN(my_fastcall_f), &rint, values); +- CHECK(rint == 6); +- +- s = "1234567890123456789012345"; +- v2 = 1.0; +- ffi_call(&cif, FFI_FN(my_fastcall_f), &rint, values); +- CHECK(rint == 26); +- +- printf("fastcall fct2 tests passed\n"); +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c ++++ /dev/null +@@ -1,56 +0,0 @@ +-/* Area: ffi_call +- Purpose: Check fastcall f call on X86_WIN32 systems. +- Limitations: none. +- PR: none. +- Originator: From the original ffitest.c */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +- +-#include "ffitest.h" +- +-static size_t __FASTCALL__ my_fastcall_f(float a, char *s, int i) +-{ +- return (size_t) ((int) strlen(s) + (int) a + i); +-} +- +-int main (void) +-{ +- ffi_cif cif; +- ffi_type *args[MAX_ARGS]; +- void *values[MAX_ARGS]; +- ffi_arg rint; +- char *s; +- int v1; +- float v2; +- args[2] = &ffi_type_sint; +- args[1] = &ffi_type_pointer; +- args[0] = &ffi_type_float; +- values[2] = (void*) &v1; +- values[1] = (void*) &s; +- values[0] = (void*) &v2; +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_FASTCALL, 3, +- &ffi_type_sint, args) == FFI_OK); +- +- s = "a"; +- v1 = 1; +- v2 = 0.0; +- ffi_call(&cif, FFI_FN(my_fastcall_f), &rint, values); +- CHECK(rint == 2); +- +- s = "1234567"; +- v2 = -1.0; +- v1 = -2; +- ffi_call(&cif, FFI_FN(my_fastcall_f), &rint, values); +- CHECK(rint == 4); +- +- s = "1234567890123456789012345"; +- v2 = 1.0; +- v1 = 2; +- ffi_call(&cif, FFI_FN(my_fastcall_f), &rint, values); +- CHECK(rint == 28); +- +- printf("fastcall fct3 tests passed\n"); +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/ffitest.h +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/ffitest.h ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/ffitest.h +@@ -15,22 +15,25 @@ + + #define MAX_ARGS 256 + +-#define CHECK(x) !(x) ? (abort(), 1) : 0 ++#define CHECK(x) (void)(!(x) ? (abort(), 1) : 0) + +-/* Define __UNUSED__ that also other compilers than gcc can run the tests. */ ++/* Define macros so that compilers other than gcc can run the tests. */ + #undef __UNUSED__ + #if defined(__GNUC__) + #define __UNUSED__ __attribute__((__unused__)) ++#define __STDCALL__ __attribute__((stdcall)) ++#define __THISCALL__ __attribute__((thiscall)) ++#define __FASTCALL__ __attribute__((fastcall)) + #else + #define __UNUSED__ ++#define __STDCALL__ __stdcall ++#define __THISCALL__ __thiscall ++#define __FASTCALL__ __fastcall + #endif + +-/* Define __FASTCALL__ so that other compilers than gcc can run the tests. */ +-#undef __FASTCALL__ +-#if defined _MSC_VER +-#define __FASTCALL__ __fastcall +-#else +-#define __FASTCALL__ __attribute__((fastcall)) ++#ifndef ABI_NUM ++#define ABI_NUM FFI_DEFAULT_ABI ++#define ABI_ATTR + #endif + + /* Prefer MAP_ANON(YMOUS) to /dev/zero, since we don't need to keep a +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/many.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/many.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/many.c +@@ -7,21 +7,11 @@ + /* { dg-do run } */ + #include "ffitest.h" + ++#include + #include ++#include + +-static float many(float f1, +- float f2, +- float f3, +- float f4, +- float f5, +- float f6, +- float f7, +- float f8, +- float f9, +- float f10, +- float f11, +- float f12, +- float f13) ++static float ABI_ATTR many(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13) + { + #if 0 + printf("%f %f %f %f %f %f %f %f %f %f %f %f %f\n", +@@ -30,7 +20,7 @@ + (double) f11, (double) f12, (double) f13); + #endif + +- return ((f1/f2+f3/f4+f5/f6+f7/f8+f9/f10+f11/f12) * f13); ++ return f1+f2+f3+f4+f5+f6+f7+f8+f9+f10+f11+f12+f13; + } + + int main (void) +@@ -50,7 +40,7 @@ + } + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 13, ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 13, + &ffi_type_float, args) == FFI_OK); + + ffi_call(&cif, FFI_FN(many), &f, values); +@@ -62,7 +52,7 @@ + fa[8], fa[9], + fa[10],fa[11],fa[12]); + +- if (f - ff < FLT_EPSILON) ++ if (fabs(f - ff) < FLT_EPSILON) + exit(0); + else + abort(); +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/many2.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/many2.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/many2.c +@@ -22,7 +22,7 @@ + return a + b + c + d + e + f + g; + } + +-uint8_t ++uint8_t ABI_ATTR + bar (uint8_t a, uint8_t b, uint8_t c, uint8_t d, + uint8_t e, uint8_t f, uint8_t g) + { +@@ -42,7 +42,7 @@ + for (i = 0; i < NARGS; ++i) + ffitypes[i] = &ffi_type_uint8; + +- CHECK (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, NARGS, ++ CHECK (ffi_prep_cif (&cif, ABI_NUM, NARGS, + &ffi_type_uint8, ffitypes) == FFI_OK); + + for (i = 0; i < NARGS; ++i) +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/many2_win32.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/many2_win32.c ++++ /dev/null +@@ -1,63 +0,0 @@ +-/* Area: ffi_call +- Purpose: Check stdcall many call on X86_WIN32 systems. +- Limitations: none. +- PR: none. +- Originator: From the original ffitest.c */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +- +-#include "ffitest.h" +-#include +- +-static float __attribute__((fastcall)) fastcall_many(float f1, +- float f2, +- float f3, +- float f4, +- float f5, +- float f6, +- float f7, +- float f8, +- float f9, +- float f10, +- float f11, +- float f12, +- float f13) +-{ +- return ((f1/f2+f3/f4+f5/f6+f7/f8+f9/f10+f11/f12) * f13); +-} +- +-int main (void) +-{ +- ffi_cif cif; +- ffi_type *args[13]; +- void *values[13]; +- float fa[13]; +- float f, ff; +- unsigned long ul; +- +- for (ul = 0; ul < 13; ul++) +- { +- args[ul] = &ffi_type_float; +- values[ul] = &fa[ul]; +- fa[ul] = (float) ul; +- } +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_FASTCALL, 13, +- &ffi_type_float, args) == FFI_OK); +- +- ff = fastcall_many(fa[0], fa[1], +- fa[2], fa[3], +- fa[4], fa[5], +- fa[6], fa[7], +- fa[8], fa[9], +- fa[10], fa[11], fa[12]); +- +- ffi_call(&cif, FFI_FN(fastcall_many), &f, values); +- +- if (f - ff < FLT_EPSILON) +- printf("fastcall many arg tests ok!\n"); +- else +- CHECK(0); +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c ++++ /dev/null +@@ -1,63 +0,0 @@ +-/* Area: ffi_call +- Purpose: Check stdcall many call on X86_WIN32 systems. +- Limitations: none. +- PR: none. +- Originator: From the original ffitest.c */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +- +-#include "ffitest.h" +-#include +- +-static float __attribute__((stdcall)) stdcall_many(float f1, +- float f2, +- float f3, +- float f4, +- float f5, +- float f6, +- float f7, +- float f8, +- float f9, +- float f10, +- float f11, +- float f12, +- float f13) +-{ +- return ((f1/f2+f3/f4+f5/f6+f7/f8+f9/f10+f11/f12) * f13); +-} +- +-int main (void) +-{ +- ffi_cif cif; +- ffi_type *args[13]; +- void *values[13]; +- float fa[13]; +- float f, ff; +- unsigned long ul; +- +- for (ul = 0; ul < 13; ul++) +- { +- args[ul] = &ffi_type_float; +- values[ul] = &fa[ul]; +- fa[ul] = (float) ul; +- } +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_STDCALL, 13, +- &ffi_type_float, args) == FFI_OK); +- +- ff = stdcall_many(fa[0], fa[1], +- fa[2], fa[3], +- fa[4], fa[5], +- fa[6], fa[7], +- fa[8], fa[9], +- fa[10], fa[11], fa[12]); +- +- ffi_call(&cif, FFI_FN(stdcall_many), &f, values); +- +- if (f - ff < FLT_EPSILON) +- printf("stdcall many arg tests ok!\n"); +- else +- CHECK(0); +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct11.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct11.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct11.c +@@ -1,7 +1,7 @@ + /* Area: ffi_call, closure_call + Purpose: Check parameter passing with nested structs + of a single type. This tests the special cases +- for homogenous floating-point aggregates in the ++ for homogeneous floating-point aggregates in the + AArch64 PCS. + Limitations: none. + PR: none. +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/strlen.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen.c +@@ -7,7 +7,7 @@ + /* { dg-do run } */ + #include "ffitest.h" + +-static size_t my_strlen(char *s) ++static size_t ABI_ATTR my_strlen(char *s) + { + return (strlen(s)); + } +@@ -24,7 +24,7 @@ + values[0] = (void*) &s; + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 1, + &ffi_type_sint, args) == FFI_OK); + + s = "a"; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/strlen2.c +--- /dev/null ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2.c +@@ -0,0 +1,49 @@ ++/* Area: ffi_call ++ Purpose: Check strlen function call with additional arguments. ++ Limitations: none. ++ PR: none. ++ Originator: From the original ffitest.c */ ++ ++/* { dg-do run } */ ++ ++#include "ffitest.h" ++ ++static size_t ABI_ATTR my_f(char *s, float a) ++{ ++ return (size_t) ((int) strlen(s) + (int) a); ++} ++ ++int main (void) ++{ ++ ffi_cif cif; ++ ffi_type *args[MAX_ARGS]; ++ void *values[MAX_ARGS]; ++ ffi_arg rint; ++ char *s; ++ float v2; ++ args[0] = &ffi_type_pointer; ++ args[1] = &ffi_type_float; ++ values[0] = (void*) &s; ++ values[1] = (void*) &v2; ++ ++ /* Initialize the cif */ ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 2, ++ &ffi_type_sint, args) == FFI_OK); ++ ++ s = "a"; ++ v2 = 0.0; ++ ffi_call(&cif, FFI_FN(my_f), &rint, values); ++ CHECK(rint == 1); ++ ++ s = "1234567"; ++ v2 = -1.0; ++ ffi_call(&cif, FFI_FN(my_f), &rint, values); ++ CHECK(rint == 6); ++ ++ s = "1234567890123456789012345"; ++ v2 = 1.0; ++ ffi_call(&cif, FFI_FN(my_f), &rint, values); ++ CHECK(rint == 26); ++ ++ exit(0); ++} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c ++++ /dev/null +@@ -1,44 +0,0 @@ +-/* Area: ffi_call +- Purpose: Check fastcall strlen call on X86_WIN32 systems. +- Limitations: none. +- PR: none. +- Originator: From the original ffitest.c */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +- +-#include "ffitest.h" +- +-static size_t __FASTCALL__ my_fastcall_strlen(char *s) +-{ +- return (strlen(s)); +-} +- +-int main (void) +-{ +- ffi_cif cif; +- ffi_type *args[MAX_ARGS]; +- void *values[MAX_ARGS]; +- ffi_arg rint; +- char *s; +- args[0] = &ffi_type_pointer; +- values[0] = (void*) &s; +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_FASTCALL, 1, +- &ffi_type_sint, args) == FFI_OK); +- +- s = "a"; +- ffi_call(&cif, FFI_FN(my_fastcall_strlen), &rint, values); +- CHECK(rint == 1); +- +- s = "1234567"; +- ffi_call(&cif, FFI_FN(my_fastcall_strlen), &rint, values); +- CHECK(rint == 7); +- +- s = "1234567890123456789012345"; +- ffi_call(&cif, FFI_FN(my_fastcall_strlen), &rint, values); +- CHECK(rint == 25); +- +- printf("fastcall strlen tests passed\n"); +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/strlen3.c +--- /dev/null ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen3.c +@@ -0,0 +1,49 @@ ++/* Area: ffi_call ++ Purpose: Check strlen function call with additional arguments. ++ Limitations: none. ++ PR: none. ++ Originator: From the original ffitest.c */ ++ ++/* { dg-do run } */ ++ ++#include "ffitest.h" ++ ++static size_t ABI_ATTR my_f(float a, char *s) ++{ ++ return (size_t) ((int) strlen(s) + (int) a); ++} ++ ++int main (void) ++{ ++ ffi_cif cif; ++ ffi_type *args[MAX_ARGS]; ++ void *values[MAX_ARGS]; ++ ffi_arg rint; ++ char *s; ++ float v2; ++ args[1] = &ffi_type_pointer; ++ args[0] = &ffi_type_float; ++ values[1] = (void*) &s; ++ values[0] = (void*) &v2; ++ ++ /* Initialize the cif */ ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 2, ++ &ffi_type_sint, args) == FFI_OK); ++ ++ s = "a"; ++ v2 = 0.0; ++ ffi_call(&cif, FFI_FN(my_f), &rint, values); ++ CHECK(rint == 1); ++ ++ s = "1234567"; ++ v2 = -1.0; ++ ffi_call(&cif, FFI_FN(my_f), &rint, values); ++ CHECK(rint == 6); ++ ++ s = "1234567890123456789012345"; ++ v2 = 1.0; ++ ffi_call(&cif, FFI_FN(my_f), &rint, values); ++ CHECK(rint == 26); ++ ++ exit(0); ++} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/strlen4.c +--- /dev/null ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen4.c +@@ -0,0 +1,55 @@ ++/* Area: ffi_call ++ Purpose: Check strlen function call with additional arguments. ++ Limitations: none. ++ PR: none. ++ Originator: From the original ffitest.c */ ++ ++/* { dg-do run } */ ++ ++#include "ffitest.h" ++ ++static size_t ABI_ATTR my_f(float a, char *s, int i) ++{ ++ return (size_t) ((int) strlen(s) + (int) a + i); ++} ++ ++int main (void) ++{ ++ ffi_cif cif; ++ ffi_type *args[MAX_ARGS]; ++ void *values[MAX_ARGS]; ++ ffi_arg rint; ++ char *s; ++ int v1; ++ float v2; ++ args[2] = &ffi_type_sint; ++ args[1] = &ffi_type_pointer; ++ args[0] = &ffi_type_float; ++ values[2] = (void*) &v1; ++ values[1] = (void*) &s; ++ values[0] = (void*) &v2; ++ ++ /* Initialize the cif */ ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 3, ++ &ffi_type_sint, args) == FFI_OK); ++ ++ s = "a"; ++ v1 = 1; ++ v2 = 0.0; ++ ffi_call(&cif, FFI_FN(my_f), &rint, values); ++ CHECK(rint == 2); ++ ++ s = "1234567"; ++ v2 = -1.0; ++ v1 = -2; ++ ffi_call(&cif, FFI_FN(my_f), &rint, values); ++ CHECK(rint == 4); ++ ++ s = "1234567890123456789012345"; ++ v2 = 1.0; ++ v1 = 2; ++ ffi_call(&cif, FFI_FN(my_f), &rint, values); ++ CHECK(rint == 28); ++ ++ exit(0); ++} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c ++++ /dev/null +@@ -1,44 +0,0 @@ +-/* Area: ffi_call +- Purpose: Check stdcall strlen call on X86_WIN32 systems. +- Limitations: none. +- PR: none. +- Originator: From the original ffitest.c */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +- +-#include "ffitest.h" +- +-static size_t __attribute__((stdcall)) my_stdcall_strlen(char *s) +-{ +- return (strlen(s)); +-} +- +-int main (void) +-{ +- ffi_cif cif; +- ffi_type *args[MAX_ARGS]; +- void *values[MAX_ARGS]; +- ffi_arg rint; +- char *s; +- args[0] = &ffi_type_pointer; +- values[0] = (void*) &s; +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_STDCALL, 1, +- &ffi_type_sint, args) == FFI_OK); +- +- s = "a"; +- ffi_call(&cif, FFI_FN(my_stdcall_strlen), &rint, values); +- CHECK(rint == 1); +- +- s = "1234567"; +- ffi_call(&cif, FFI_FN(my_stdcall_strlen), &rint, values); +- CHECK(rint == 7); +- +- s = "1234567890123456789012345"; +- ffi_call(&cif, FFI_FN(my_stdcall_strlen), &rint, values); +- CHECK(rint == 25); +- +- printf("stdcall strlen tests passed\n"); +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct1.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct1.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct1.c +@@ -14,7 +14,7 @@ + unsigned int ui; + } test_structure_1; + +-static test_structure_1 struct1(test_structure_1 ts) ++static test_structure_1 ABI_ATTR struct1(test_structure_1 ts) + { + ts.uc++; + ts.d--; +@@ -50,7 +50,7 @@ + values[0] = &ts1_arg; + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 1, + &ts1_type, args) == FFI_OK); + + ts1_arg.uc = '\x01'; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c ++++ /dev/null +@@ -1,67 +0,0 @@ +-/* Area: ffi_call +- Purpose: Check structures with fastcall/thiscall convention. +- Limitations: none. +- PR: none. +- Originator: From the original ffitest.c */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +-#include "ffitest.h" +- +-typedef struct +-{ +- unsigned char uc; +- double d; +- unsigned int ui; +-} test_structure_1; +- +-static test_structure_1 __FASTCALL__ struct1(test_structure_1 ts) +-{ +- ts.uc++; +- ts.d--; +- ts.ui++; +- +- return ts; +-} +- +-int main (void) +-{ +- ffi_cif cif; +- ffi_type *args[MAX_ARGS]; +- void *values[MAX_ARGS]; +- ffi_type ts1_type; +- ffi_type *ts1_type_elements[4]; +- +- test_structure_1 ts1_arg; +- +- /* This is a hack to get a properly aligned result buffer */ +- test_structure_1 *ts1_result = +- (test_structure_1 *) malloc (sizeof(test_structure_1)); +- +- ts1_type.size = 0; +- ts1_type.alignment = 0; +- ts1_type.type = FFI_TYPE_STRUCT; +- ts1_type.elements = ts1_type_elements; +- ts1_type_elements[0] = &ffi_type_uchar; +- ts1_type_elements[1] = &ffi_type_double; +- ts1_type_elements[2] = &ffi_type_uint; +- ts1_type_elements[3] = NULL; +- +- args[0] = &ts1_type; +- values[0] = &ts1_arg; +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_FASTCALL, 1, +- &ts1_type, args) == FFI_OK); +- +- ts1_arg.uc = '\x01'; +- ts1_arg.d = 3.14159; +- ts1_arg.ui = 555; +- +- ffi_call(&cif, FFI_FN(struct1), ts1_result, values); +- +- CHECK(ts1_result->ui == 556); +- CHECK(ts1_result->d == 3.14159 - 1); +- +- free (ts1_result); +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct2.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct2.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct2.c +@@ -13,7 +13,7 @@ + double d2; + } test_structure_2; + +-static test_structure_2 struct2(test_structure_2 ts) ++static test_structure_2 ABI_ATTR struct2(test_structure_2 ts) + { + ts.d1--; + ts.d2--; +@@ -46,7 +46,7 @@ + values[0] = &ts2_arg; + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts2_type, args) == FFI_OK); ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 1, &ts2_type, args) == FFI_OK); + + ts2_arg.d1 = 5.55; + ts2_arg.d2 = 6.66; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c ++++ /dev/null +@@ -1,67 +0,0 @@ +-/* Area: ffi_call +- Purpose: Check structures in fastcall/stdcall function +- Limitations: none. +- PR: none. +- Originator: From the original ffitest.c */ +- +-/* { dg-do run { target i?86-*-cygwin* i?86-*-mingw* } } */ +-#include "ffitest.h" +- +-typedef struct +-{ +- double d1; +- double d2; +-} test_structure_2; +- +-static test_structure_2 __FASTCALL__ struct2(test_structure_2 ts) +-{ +- ts.d1--; +- ts.d2--; +- +- return ts; +-} +- +-int main (void) +-{ +- ffi_cif cif; +- ffi_type *args[MAX_ARGS]; +- void *values[MAX_ARGS]; +- test_structure_2 ts2_arg; +- ffi_type ts2_type; +- ffi_type *ts2_type_elements[3]; +- +- /* This is a hack to get a properly aligned result buffer */ +- test_structure_2 *ts2_result = +- (test_structure_2 *) malloc (sizeof(test_structure_2)); +- +- ts2_type.size = 0; +- ts2_type.alignment = 0; +- ts2_type.type = FFI_TYPE_STRUCT; +- ts2_type.elements = ts2_type_elements; +- ts2_type_elements[0] = &ffi_type_double; +- ts2_type_elements[1] = &ffi_type_double; +- ts2_type_elements[2] = NULL; +- +- args[0] = &ts2_type; +- values[0] = &ts2_arg; +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_FASTCALL, 1, &ts2_type, args) == FFI_OK); +- +- ts2_arg.d1 = 5.55; +- ts2_arg.d2 = 6.66; +- +- printf ("%g\n", ts2_arg.d1); +- printf ("%g\n", ts2_arg.d2); +- +- ffi_call(&cif, FFI_FN(struct2), ts2_result, values); +- +- printf ("%g\n", ts2_result->d1); +- printf ("%g\n", ts2_result->d2); +- +- CHECK(ts2_result->d1 == 5.55 - 1); +- CHECK(ts2_result->d2 == 6.66 - 1); +- +- free (ts2_result); +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct3.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct3.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct3.c +@@ -12,7 +12,7 @@ + int si; + } test_structure_3; + +-static test_structure_3 struct3(test_structure_3 ts) ++static test_structure_3 ABI_ATTR struct3(test_structure_3 ts) + { + ts.si = -(ts.si*2); + +@@ -43,7 +43,7 @@ + values[0] = &ts3_arg; + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 1, + &ts3_type, args) == FFI_OK); + + ts3_arg.si = -123; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct4.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct4.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct4.c +@@ -14,7 +14,7 @@ + unsigned ui3; + } test_structure_4; + +-static test_structure_4 struct4(test_structure_4 ts) ++static test_structure_4 ABI_ATTR struct4(test_structure_4 ts) + { + ts.ui3 = ts.ui1 * ts.ui2 * ts.ui3; + +@@ -48,7 +48,7 @@ + values[0] = &ts4_arg; + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts4_type, args) == FFI_OK); ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 1, &ts4_type, args) == FFI_OK); + + ts4_arg.ui1 = 2; + ts4_arg.ui2 = 3; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct5.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct5.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct5.c +@@ -12,7 +12,7 @@ + char c2; + } test_structure_5; + +-static test_structure_5 struct5(test_structure_5 ts1, test_structure_5 ts2) ++static test_structure_5 ABI_ATTR struct5(test_structure_5 ts1, test_structure_5 ts2) + { + ts1.c1 += ts2.c1; + ts1.c2 -= ts2.c2; +@@ -48,7 +48,7 @@ + values[1] = &ts5_arg2; + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, &ts5_type, args) == FFI_OK); ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 2, &ts5_type, args) == FFI_OK); + + ts5_arg1.c1 = 2; + ts5_arg1.c2 = 6; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct6.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct6.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct6.c +@@ -12,7 +12,7 @@ + double d; + } test_structure_6; + +-static test_structure_6 struct6 (test_structure_6 ts) ++static test_structure_6 ABI_ATTR struct6 (test_structure_6 ts) + { + ts.f += 1; + ts.d += 1; +@@ -46,7 +46,7 @@ + values[0] = &ts6_arg; + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts6_type, args) == FFI_OK); ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 1, &ts6_type, args) == FFI_OK); + + ts6_arg.f = 5.55f; + ts6_arg.d = 6.66; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct7.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct7.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct7.c +@@ -13,7 +13,7 @@ + double d; + } test_structure_7; + +-static test_structure_7 struct7 (test_structure_7 ts) ++static test_structure_7 ABI_ATTR struct7 (test_structure_7 ts) + { + ts.f1 += 1; + ts.f2 += 1; +@@ -49,7 +49,7 @@ + values[0] = &ts7_arg; + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts7_type, args) == FFI_OK); ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 1, &ts7_type, args) == FFI_OK); + + ts7_arg.f1 = 5.55f; + ts7_arg.f2 = 55.5f; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct8.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct8.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct8.c +@@ -14,7 +14,7 @@ + float f4; + } test_structure_8; + +-static test_structure_8 struct8 (test_structure_8 ts) ++static test_structure_8 ABI_ATTR struct8 (test_structure_8 ts) + { + ts.f1 += 1; + ts.f2 += 1; +@@ -52,7 +52,7 @@ + values[0] = &ts8_arg; + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts8_type, args) == FFI_OK); ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 1, &ts8_type, args) == FFI_OK); + + ts8_arg.f1 = 5.55f; + ts8_arg.f2 = 55.5f; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/struct9.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct9.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct9.c +@@ -13,7 +13,7 @@ + int i; + } test_structure_9; + +-static test_structure_9 struct9 (test_structure_9 ts) ++static test_structure_9 ABI_ATTR struct9 (test_structure_9 ts) + { + ts.f += 1; + ts.i += 1; +@@ -47,7 +47,7 @@ + values[0] = &ts9_arg; + + /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts9_type, args) == FFI_OK); ++ CHECK(ffi_prep_cif(&cif, ABI_NUM, 1, &ts9_type, args) == FFI_OK); + + ts9_arg.f = 5.55f; + ts9_arg.i = 5; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/unwindtest.cc +--- /dev/null ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/unwindtest.cc +@@ -0,0 +1,117 @@ ++/* Area: ffi_closure, unwind info ++ Purpose: Check if the unwind information is passed correctly. ++ Limitations: none. ++ PR: none. ++ Originator: Jeff Sturm */ ++ ++/* { dg-do run } */ ++ ++#include "ffitest.h" ++ ++void ABI_ATTR ++closure_test_fn(ffi_cif* cif __UNUSED__, void* resp __UNUSED__, ++ void** args __UNUSED__, void* userdata __UNUSED__) ++{ ++ throw 9; ++} ++ ++typedef void (*closure_test_type)(); ++ ++void closure_test_fn1(ffi_cif* cif __UNUSED__, void* resp, ++ void** args, void* userdata __UNUSED__) ++ { ++ *(ffi_arg*)resp = ++ (int)*(float *)args[0] +(int)(*(float *)args[1]) + ++ (int)(*(float *)args[2]) + (int)*(float *)args[3] + ++ (int)(*(signed short *)args[4]) + (int)(*(float *)args[5]) + ++ (int)*(float *)args[6] + (int)(*(int *)args[7]) + ++ (int)(*(double*)args[8]) + (int)*(int *)args[9] + ++ (int)(*(int *)args[10]) + (int)(*(float *)args[11]) + ++ (int)*(int *)args[12] + (int)(*(int *)args[13]) + ++ (int)(*(int *)args[14]) + *(int *)args[15] + (int)(intptr_t)userdata; ++ ++ printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n", ++ (int)*(float *)args[0], (int)(*(float *)args[1]), ++ (int)(*(float *)args[2]), (int)*(float *)args[3], ++ (int)(*(signed short *)args[4]), (int)(*(float *)args[5]), ++ (int)*(float *)args[6], (int)(*(int *)args[7]), ++ (int)(*(double *)args[8]), (int)*(int *)args[9], ++ (int)(*(int *)args[10]), (int)(*(float *)args[11]), ++ (int)*(int *)args[12], (int)(*(int *)args[13]), ++ (int)(*(int *)args[14]), *(int *)args[15], ++ (int)(intptr_t)userdata, (int)*(ffi_arg*)resp); ++ ++ throw (int)*(ffi_arg*)resp; ++} ++ ++typedef int (*closure_test_type1)(float, float, float, float, signed short, ++ float, float, int, double, int, int, float, ++ int, int, int, int); ++ ++int main (void) ++{ ++ ffi_cif cif; ++ void *code; ++ ffi_closure *pcl = (ffi_closure *)ffi_closure_alloc(sizeof(ffi_closure), &code); ++ ffi_type * cl_arg_types[17]; ++ ++ { ++ cl_arg_types[1] = NULL; ++ ++ CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 0, ++ &ffi_type_void, cl_arg_types) == FFI_OK); ++ CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_fn, NULL, code) == FFI_OK); ++ ++ try ++ { ++ (*((closure_test_type)(code)))(); ++ } catch (int exception_code) ++ { ++ CHECK(exception_code == 9); ++ } ++ ++ printf("part one OK\n"); ++ /* { dg-output "part one OK" } */ ++ } ++ ++ { ++ ++ cl_arg_types[0] = &ffi_type_float; ++ cl_arg_types[1] = &ffi_type_float; ++ cl_arg_types[2] = &ffi_type_float; ++ cl_arg_types[3] = &ffi_type_float; ++ cl_arg_types[4] = &ffi_type_sshort; ++ cl_arg_types[5] = &ffi_type_float; ++ cl_arg_types[6] = &ffi_type_float; ++ cl_arg_types[7] = &ffi_type_uint; ++ cl_arg_types[8] = &ffi_type_double; ++ cl_arg_types[9] = &ffi_type_uint; ++ cl_arg_types[10] = &ffi_type_uint; ++ cl_arg_types[11] = &ffi_type_float; ++ cl_arg_types[12] = &ffi_type_uint; ++ cl_arg_types[13] = &ffi_type_uint; ++ cl_arg_types[14] = &ffi_type_uint; ++ cl_arg_types[15] = &ffi_type_uint; ++ cl_arg_types[16] = NULL; ++ ++ /* Initialize the cif */ ++ CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16, ++ &ffi_type_sint, cl_arg_types) == FFI_OK); ++ ++ CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_fn1, ++ (void *) 3 /* userdata */, code) == FFI_OK); ++ try ++ { ++ (*((closure_test_type1)code)) ++ (1.1, 2.2, 3.3, 4.4, 127, 5.5, 6.6, 8, 9, 10, 11, 12.0, 13, ++ 19, 21, 1); ++ /* { dg-output "\n1 2 3 4 127 5 6 8 9 10 11 12 13 19 21 1 3: 255" } */ ++ } catch (int exception_code) ++ { ++ CHECK(exception_code == 255); ++ } ++ printf("part two OK\n"); ++ /* { dg-output "\npart two OK" } */ ++ } ++ exit(0); ++} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/unwindtest_ffi_call.cc +--- /dev/null ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/unwindtest_ffi_call.cc +@@ -0,0 +1,54 @@ ++/* Area: ffi_call, unwind info ++ Purpose: Check if the unwind information is passed correctly. ++ Limitations: none. ++ PR: none. ++ Originator: Andreas Tobler 20061213 */ ++ ++/* { dg-do run } */ ++ ++#include "ffitest.h" ++ ++static int checking(int a __UNUSED__, short b __UNUSED__, ++ signed char c __UNUSED__) ++{ ++ throw 9; ++} ++ ++int main (void) ++{ ++ ffi_cif cif; ++ ffi_type *args[MAX_ARGS]; ++ void *values[MAX_ARGS]; ++ ffi_arg rint; ++ ++ signed int si; ++ signed short ss; ++ signed char sc; ++ ++ args[0] = &ffi_type_sint; ++ values[0] = &si; ++ args[1] = &ffi_type_sshort; ++ values[1] = &ss; ++ args[2] = &ffi_type_schar; ++ values[2] = ≻ ++ ++ /* Initialize the cif */ ++ CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 3, ++ &ffi_type_sint, args) == FFI_OK); ++ ++ si = -6; ++ ss = -12; ++ sc = -1; ++ { ++ try ++ { ++ ffi_call(&cif, FFI_FN(checking), &rint, values); ++ } catch (int exception_code) ++ { ++ CHECK(exception_code == 9); ++ } ++ printf("part one OK\n"); ++ /* { dg-output "part one OK" } */ ++ } ++ exit(0); ++} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/va_1.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/va_1.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/va_1.c +@@ -94,7 +94,7 @@ + struct large_tag l1; + + int n; +- int res; ++ ffi_arg res; + + unsigned char uc; + signed char sc; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.call/va_struct1.c +--- a/Modules/_ctypes/libffi/testsuite/libffi.call/va_struct1.c ++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/va_struct1.c +@@ -61,7 +61,7 @@ + struct large_tag l1; + + int n; +- int res; ++ ffi_arg res; + + s_type.size = 0; + s_type.alignment = 0; +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.special/ffitestcxx.h +--- a/Modules/_ctypes/libffi/testsuite/libffi.special/ffitestcxx.h ++++ /dev/null +@@ -1,55 +0,0 @@ +-#include +-#include +-#include +-#include +-#include "fficonfig.h" +- +-#define MAX_ARGS 256 +- +- +-/* Define __UNUSED__ that also other compilers than gcc can run the tests. */ +-#undef __UNUSED__ +-#if defined(__GNUC__) +-#define __UNUSED__ __attribute__((__unused__)) +-#else +-#define __UNUSED__ +-#endif +- +-#define CHECK(x) (!(x) ? abort() : (void)0) +- +-/* Prefer MAP_ANON(YMOUS) to /dev/zero, since we don't need to keep a +- file open. */ +-#ifdef HAVE_MMAP_ANON +-# undef HAVE_MMAP_DEV_ZERO +- +-# include +-# ifndef MAP_FAILED +-# define MAP_FAILED -1 +-# endif +-# if !defined (MAP_ANONYMOUS) && defined (MAP_ANON) +-# define MAP_ANONYMOUS MAP_ANON +-# endif +-# define USING_MMAP +- +-#endif +- +-#ifdef HAVE_MMAP_DEV_ZERO +- +-# include +-# ifndef MAP_FAILED +-# define MAP_FAILED -1 +-# endif +-# define USING_MMAP +- +-#endif +- +- +-/* MinGW kludge. */ +-#ifdef _WIN64 +-#define PRIdLL "I64d" +-#define PRIuLL "I64u" +-#else +-#define PRIdLL "lld" +-#define PRIuLL "llu" +-#endif +- +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.special/special.exp +--- a/Modules/_ctypes/libffi/testsuite/libffi.special/special.exp ++++ /dev/null +@@ -1,39 +0,0 @@ +-# Copyright (C) 2003, 2006, 2009, 2010 Free Software Foundation, Inc. +- +-# This program 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 of the License, or +-# (at your option) any later version. +-# +-# This program 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 this program; see the file COPYING3. If not see +-# . +- +-dg-init +-libffi-init +- +-global srcdir subdir +- +-global cxx_options +- +-set cxx_options " -shared-libgcc -lstdc++" +- +-if { [string match $using_gcc "yes"] } { +- +- dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.cc]] $cxx_options "-O0 -W -Wall" +- dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.cc]] $cxx_options "-O2" +- dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.cc]] $cxx_options "-O3" +- dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.cc]] $cxx_options "-Os" +- +-} +- +-dg-finish +- +-# Local Variables: +-# tcl-indent-level:4 +-# End: +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.special/unwindtest.cc +--- a/Modules/_ctypes/libffi/testsuite/libffi.special/unwindtest.cc ++++ /dev/null +@@ -1,125 +0,0 @@ +-/* Area: ffi_closure, unwind info +- Purpose: Check if the unwind information is passed correctly. +- Limitations: none. +- PR: none. +- Originator: Jeff Sturm */ +- +-/* { dg-do run } */ +- +-#include "ffitestcxx.h" +- +-#if defined HAVE_STDINT_H +-#include +-#endif +- +-#if defined HAVE_INTTYPES_H +-#include +-#endif +- +-void +-closure_test_fn(ffi_cif* cif __UNUSED__, void* resp __UNUSED__, +- void** args __UNUSED__, void* userdata __UNUSED__) +-{ +- throw 9; +-} +- +-typedef void (*closure_test_type)(); +- +-void closure_test_fn1(ffi_cif* cif __UNUSED__, void* resp, +- void** args, void* userdata __UNUSED__) +- { +- *(ffi_arg*)resp = +- (int)*(float *)args[0] +(int)(*(float *)args[1]) + +- (int)(*(float *)args[2]) + (int)*(float *)args[3] + +- (int)(*(signed short *)args[4]) + (int)(*(float *)args[5]) + +- (int)*(float *)args[6] + (int)(*(int *)args[7]) + +- (int)(*(double*)args[8]) + (int)*(int *)args[9] + +- (int)(*(int *)args[10]) + (int)(*(float *)args[11]) + +- (int)*(int *)args[12] + (int)(*(int *)args[13]) + +- (int)(*(int *)args[14]) + *(int *)args[15] + (int)(intptr_t)userdata; +- +- printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n", +- (int)*(float *)args[0], (int)(*(float *)args[1]), +- (int)(*(float *)args[2]), (int)*(float *)args[3], +- (int)(*(signed short *)args[4]), (int)(*(float *)args[5]), +- (int)*(float *)args[6], (int)(*(int *)args[7]), +- (int)(*(double *)args[8]), (int)*(int *)args[9], +- (int)(*(int *)args[10]), (int)(*(float *)args[11]), +- (int)*(int *)args[12], (int)(*(int *)args[13]), +- (int)(*(int *)args[14]), *(int *)args[15], +- (int)(intptr_t)userdata, (int)*(ffi_arg*)resp); +- +- throw (int)*(ffi_arg*)resp; +-} +- +-typedef int (*closure_test_type1)(float, float, float, float, signed short, +- float, float, int, double, int, int, float, +- int, int, int, int); +- +-int main (void) +-{ +- ffi_cif cif; +- void *code; +- ffi_closure *pcl = (ffi_closure *)ffi_closure_alloc(sizeof(ffi_closure), &code); +- ffi_type * cl_arg_types[17]; +- +- { +- cl_arg_types[1] = NULL; +- +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 0, +- &ffi_type_void, cl_arg_types) == FFI_OK); +- CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_fn, NULL, code) == FFI_OK); +- +- try +- { +- (*((closure_test_type)(code)))(); +- } catch (int exception_code) +- { +- CHECK(exception_code == 9); +- } +- +- printf("part one OK\n"); +- /* { dg-output "part one OK" } */ +- } +- +- { +- +- cl_arg_types[0] = &ffi_type_float; +- cl_arg_types[1] = &ffi_type_float; +- cl_arg_types[2] = &ffi_type_float; +- cl_arg_types[3] = &ffi_type_float; +- cl_arg_types[4] = &ffi_type_sshort; +- cl_arg_types[5] = &ffi_type_float; +- cl_arg_types[6] = &ffi_type_float; +- cl_arg_types[7] = &ffi_type_uint; +- cl_arg_types[8] = &ffi_type_double; +- cl_arg_types[9] = &ffi_type_uint; +- cl_arg_types[10] = &ffi_type_uint; +- cl_arg_types[11] = &ffi_type_float; +- cl_arg_types[12] = &ffi_type_uint; +- cl_arg_types[13] = &ffi_type_uint; +- cl_arg_types[14] = &ffi_type_uint; +- cl_arg_types[15] = &ffi_type_uint; +- cl_arg_types[16] = NULL; +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16, +- &ffi_type_sint, cl_arg_types) == FFI_OK); +- +- CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_fn1, +- (void *) 3 /* userdata */, code) == FFI_OK); +- try +- { +- (*((closure_test_type1)code)) +- (1.1, 2.2, 3.3, 4.4, 127, 5.5, 6.6, 8, 9, 10, 11, 12.0, 13, +- 19, 21, 1); +- /* { dg-output "\n1 2 3 4 127 5 6 8 9 10 11 12 13 19 21 1 3: 255" } */ +- } catch (int exception_code) +- { +- CHECK(exception_code == 255); +- } +- printf("part two OK\n"); +- /* { dg-output "\npart two OK" } */ +- } +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/testsuite/libffi.special/unwindtest_ffi_call.cc +--- a/Modules/_ctypes/libffi/testsuite/libffi.special/unwindtest_ffi_call.cc ++++ /dev/null +@@ -1,54 +0,0 @@ +-/* Area: ffi_call, unwind info +- Purpose: Check if the unwind information is passed correctly. +- Limitations: none. +- PR: none. +- Originator: Andreas Tobler 20061213 */ +- +-/* { dg-do run } */ +- +-#include "ffitestcxx.h" +- +-static int checking(int a __UNUSED__, short b __UNUSED__, +- signed char c __UNUSED__) +-{ +- throw 9; +-} +- +-int main (void) +-{ +- ffi_cif cif; +- ffi_type *args[MAX_ARGS]; +- void *values[MAX_ARGS]; +- ffi_arg rint; +- +- signed int si; +- signed short ss; +- signed char sc; +- +- args[0] = &ffi_type_sint; +- values[0] = &si; +- args[1] = &ffi_type_sshort; +- values[1] = &ss; +- args[2] = &ffi_type_schar; +- values[2] = ≻ +- +- /* Initialize the cif */ +- CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 3, +- &ffi_type_sint, args) == FFI_OK); +- +- si = -6; +- ss = -12; +- sc = -1; +- { +- try +- { +- ffi_call(&cif, FFI_FN(checking), &rint, values); +- } catch (int exception_code) +- { +- CHECK(exception_code == 9); +- } +- printf("part one OK\n"); +- /* { dg-output "part one OK" } */ +- } +- exit(0); +-} +diff -r ee879c0ffa11 Modules/_ctypes/libffi/texinfo.tex +--- a/Modules/_ctypes/libffi/texinfo.tex ++++ b/Modules/_ctypes/libffi/texinfo.tex +@@ -3,11 +3,11 @@ + % Load plain if necessary, i.e., if running under initex. + \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi + % +-\def\texinfoversion{2012-06-05.14} ++\def\texinfoversion{2013-02-01.11} + % + % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, + % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +-% 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. ++% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. + % + % This texinfo.tex file is free software: you can redistribute it and/or + % modify it under the terms of the GNU General Public License as +@@ -24,7 +24,8 @@ + % + % As a special exception, when this file is read by TeX when processing + % a Texinfo source document, you may use the result without +-% restriction. (This has been our intent since Texinfo was invented.) ++% restriction. This Exception is an additional permission under section 7 ++% of the GNU General Public License, version 3 ("GPLv3"). + % + % Please try the latest version of texinfo.tex before submitting bug + % reports; you can get the latest version from: +@@ -594,7 +595,7 @@ + \def\:{\spacefactor=1000 } + + % @* forces a line break. +-\def\*{\hfil\break\hbox{}\ignorespaces} ++\def\*{\unskip\hfil\break\hbox{}\ignorespaces} + + % @/ allows a line break. + \let\/=\allowbreak +@@ -2272,8 +2273,6 @@ + + \gdef\markupsetcodequoteleft{\let`\codequoteleft} + \gdef\markupsetcodequoteright{\let'\codequoteright} +- +-\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft} + } + + \let\markupsetuplqcode \markupsetcodequoteleft +@@ -2282,6 +2281,9 @@ + \let\markupsetuplqexample \markupsetcodequoteleft + \let\markupsetuprqexample \markupsetcodequoteright + % ++\let\markupsetuplqkbd \markupsetcodequoteleft ++\let\markupsetuprqkbd \markupsetcodequoteright ++% + \let\markupsetuplqsamp \markupsetcodequoteleft + \let\markupsetuprqsamp \markupsetcodequoteright + % +@@ -2291,8 +2293,6 @@ + \let\markupsetuplqverbatim \markupsetcodequoteleft + \let\markupsetuprqverbatim \markupsetcodequoteright + +-\let\markupsetuplqkbd \markupsetnoligaturesquoteleft +- + % Allow an option to not use regular directed right quote/apostrophe + % (char 0x27), but instead the undirected quote from cmtt (char 0x0d). + % The undirected quote is ugly, so don't make it the default, but it +@@ -2382,8 +2382,7 @@ + \aftersmartic + } + +-% like \smartslanted except unconditionally uses \ttsl, and no ic. +-% @var is set to this for defun arguments. ++% Unconditional use \ttsl, and no ic. @var is set to this for defuns. + \def\ttslanted#1{{\ttsl #1}} + + % @cite is like \smartslanted except unconditionally use \sl. We never want +@@ -2448,34 +2447,12 @@ + % @samp. + \def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} + +-% definition of @key that produces a lozenge. Doesn't adjust to text size. +-%\setfont\keyrm\rmshape{8}{1000}{OT1} +-%\font\keysy=cmsy9 +-%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% +-% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% +-% \vbox{\hrule\kern-0.4pt +-% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% +-% \kern-0.4pt\hrule}% +-% \kern-.06em\raise0.4pt\hbox{\angleright}}}} +- +-% definition of @key with no lozenge. If the current font is already +-% monospace, don't change it; that way, we respect @kbdinputstyle. But +-% if it isn't monospace, then use \tt. +-% +-\def\key#1{{\setupmarkupstyle{key}% +- \nohyphenation +- \ifmonospace\else\tt\fi +- #1}\null} +- +-% ctrl is no longer a Texinfo command. +-\def\ctrl #1{{\tt \rawbackslash \hat}#1} +- +-% @file, @option are the same as @samp. +-\let\file=\samp +-\let\option=\samp +- +-% @code is a modification of @t, +-% which makes spaces the same size as normal in the surrounding text. ++% @indicateurl is \samp, that is, with quotes. ++\let\indicateurl=\samp ++ ++% @code (and similar) prints in typewriter, but with spaces the same ++% size as normal in the surrounding text, without hyphenation, etc. ++% This is a subroutine for that. + \def\tclose#1{% + {% + % Change normal interword space to be same as for the current font. +@@ -2500,7 +2477,7 @@ + % We *must* turn on hyphenation at `-' and `_' in @code. + % Otherwise, it is too hard to avoid overfull hboxes + % in the Emacs manual, the Library manual, etc. +- ++% + % Unfortunately, TeX uses one parameter (\hyphenchar) to control + % both hyphenation at - and hyphenation within words. + % We must therefore turn them both off (\tclose does that) +@@ -2519,7 +2496,7 @@ + \let-\codedash + \let_\codeunder + \else +- \let-\realdash ++ \let-\normaldash + \let_\realunder + \fi + \codex +@@ -2528,7 +2505,7 @@ + + \def\codex #1{\tclose{#1}\endgroup} + +-\def\realdash{-} ++\def\normaldash{-} + \def\codedash{-\discretionary{}{}{}} + \def\codeunder{% + % this is all so @math{@code{var_name}+1} can work. In math mode, _ +@@ -2543,9 +2520,9 @@ + } + + % An additional complication: the above will allow breaks after, e.g., +-% each of the four underscores in __typeof__. This is undesirable in +-% some manuals, especially if they don't have long identifiers in +-% general. @allowcodebreaks provides a way to control this. ++% each of the four underscores in __typeof__. This is bad. ++% @allowcodebreaks provides a document-level way to turn breaking at - ++% and _ on and off. + % + \newif\ifallowcodebreaks \allowcodebreakstrue + +@@ -2564,6 +2541,13 @@ + \fi\fi + } + ++% For @command, @env, @file, @option quotes seem unnecessary, ++% so use \code rather than \samp. ++\let\command=\code ++\let\env=\code ++\let\file=\code ++\let\option=\code ++ + % @uref (abbreviation for `urlref') takes an optional (comma-separated) + % second argument specifying the text to display and an optional third + % arg as text to display instead of (rather than in addition to) the url +@@ -2710,10 +2694,6 @@ + \let\email=\uref + \fi + +-% @kbd is like @code, except that if the argument is just one @key command, +-% then @kbd has no effect. +-\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}} +- + % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), + % `example' (@kbd uses ttsl only inside of @example and friends), + % or `code' (@kbd uses normal tty font always). +@@ -2737,16 +2717,36 @@ + % Default is `distinct'. + \kbdinputstyle distinct + ++% @kbd is like @code, except that if the argument is just one @key command, ++% then @kbd has no effect. ++\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}} ++ + \def\xkey{\key} +-\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% +-\ifx\one\xkey\ifx\threex\three \key{#2}% +-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi +-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} +- +-% For @indicateurl, @env, @command quotes seem unnecessary, so use \code. +-\let\indicateurl=\code +-\let\env=\code +-\let\command=\code ++\def\kbdsub#1#2#3\par{% ++ \def\one{#1}\def\three{#3}\def\threex{??}% ++ \ifx\one\xkey\ifx\threex\three \key{#2}% ++ \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi ++ \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi ++} ++ ++% definition of @key that produces a lozenge. Doesn't adjust to text size. ++%\setfont\keyrm\rmshape{8}{1000}{OT1} ++%\font\keysy=cmsy9 ++%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% ++% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% ++% \vbox{\hrule\kern-0.4pt ++% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% ++% \kern-0.4pt\hrule}% ++% \kern-.06em\raise0.4pt\hbox{\angleright}}}} ++ ++% definition of @key with no lozenge. If the current font is already ++% monospace, don't change it; that way, we respect @kbdinputstyle. But ++% if it isn't monospace, then use \tt. ++% ++\def\key#1{{\setupmarkupstyle{key}% ++ \nohyphenation ++ \ifmonospace\else\tt\fi ++ #1}\null} + + % @clicksequence{File @click{} Open ...} + \def\clicksequence#1{\begingroup #1\endgroup} +@@ -2854,6 +2854,9 @@ + } + } + ++% ctrl is no longer a Texinfo command, but leave this definition for fun. ++\def\ctrl #1{{\tt \rawbackslash \hat}#1} ++ + % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. + % Ignore unless FMTNAME == tex; then it is like @iftex and @tex, + % except specified as a normal braced arg, so no newlines to worry about. +@@ -3144,12 +3147,17 @@ + % hopefully nobody will notice/care. + \edef\ecsize{\csname\curfontsize ecsize\endcsname}% + \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% +- \ifx\curfontstyle\bfstylename +- % bold: +- \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize ++ \ifmonospace ++ % typewriter: ++ \font\thisecfont = ectt\ecsize \space at \nominalsize + \else +- % regular: +- \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize ++ \ifx\curfontstyle\bfstylename ++ % bold: ++ \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize ++ \else ++ % regular: ++ \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize ++ \fi + \fi + \thisecfont + } +@@ -3262,6 +3270,20 @@ + \finishedtitlepagetrue + } + ++% Settings used for typesetting titles: no hyphenation, no indentation, ++% don't worry much about spacing, ragged right. This should be used ++% inside a \vbox, and fonts need to be set appropriately first. Because ++% it is always used for titles, nothing else, we call \rmisbold. \par ++% should be specified before the end of the \vbox, since a vbox is a group. ++% ++\def\raggedtitlesettings{% ++ \rmisbold ++ \hyphenpenalty=10000 ++ \parindent=0pt ++ \tolerance=5000 ++ \ptexraggedright ++} ++ + % Macros to be used within @titlepage: + + \let\subtitlerm=\tenrm +@@ -3269,7 +3291,7 @@ + + \parseargdef\title{% + \checkenv\titlepage +- \leftline{\titlefonts\rmisbold #1} ++ \vbox{\titlefonts \raggedtitlesettings #1\par}% + % print a rule at the page bottom also. + \finishedtitlepagefalse + \vskip4pt \hrule height 4pt width \hsize \vskip4pt +@@ -4166,7 +4188,7 @@ + % ..., but we might end up with active ones in the argument if + % we're called from @code, as @code{@value{foo-bar_}}, though. + % So \let them to their normal equivalents. +- \let-\realdash \let_\normalunderscore ++ \let-\normaldash \let_\normalunderscore + } + } + +@@ -4206,7 +4228,7 @@ + } + \def\ifsetfail{\doignore{ifset}} + +-% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been ++% @ifclear VAR ... @end executes the `...' iff VAR has never been + % defined with @set, or has been undefined with @clear. + % + % The `\else' inside the `\doifset' parameter is a trick to reuse the +@@ -4217,6 +4239,35 @@ + \def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}} + \def\ifclearfail{\doignore{ifclear}} + ++% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written ++% without the @) is in fact defined. We can only feasibly check at the ++% TeX level, so something like `mathcode' is going to considered ++% defined even though it is not a Texinfo command. ++% ++\makecond{ifcommanddefined} ++\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} ++% ++\def\doifcmddefined#1#2{{% ++ \makevalueexpandable ++ \let\next=\empty ++ \expandafter\ifx\csname #2\endcsname\relax ++ #1% If not defined, \let\next as above. ++ \fi ++ \expandafter ++ }\next ++} ++\def\ifcmddefinedfail{\doignore{ifcommanddefined}} ++ ++% @ifcommandnotdefined CMD ... handled similar to @ifclear above. ++\makecond{ifcommandnotdefined} ++\def\ifcommandnotdefined{% ++ \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}} ++\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}} ++ ++% Set the `txicommandconditionals' variable, so documents have a way to ++% test if the @ifcommand...defined conditionals are available. ++\set txicommandconditionals ++ + % @dircategory CATEGORY -- specify a category of the dir file + % which this file should belong to. Ignore this in TeX. + \let\dircategory=\comment +@@ -5543,14 +5594,6 @@ + + % Define @majorheading, @heading and @subheading + +-% NOTE on use of \vbox for chapter headings, section headings, and such: +-% 1) We use \vbox rather than the earlier \line to permit +-% overlong headings to fold. +-% 2) \hyphenpenalty is set to 10000 because hyphenation in a +-% heading is obnoxious; this forbids it. +-% 3) Likewise, headings look best if no \parindent is used, and +-% if justification is not attempted. Hence \raggedright. +- + \def\majorheading{% + {\advance\chapheadingskip by 10pt \chapbreak }% + \parsearg\chapheadingzzz +@@ -5558,10 +5601,8 @@ + + \def\chapheading{\chapbreak \parsearg\chapheadingzzz} + \def\chapheadingzzz#1{% +- {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 +- \parindent=0pt\ptexraggedright +- \rmisbold #1\hfill}}% +- \bigskip \par\penalty 200\relax ++ \vbox{\chapfonts \raggedtitlesettings #1\par}% ++ \nobreak\bigskip \nobreak + \suppressfirstparagraphindent + } + +@@ -5720,8 +5761,7 @@ + % + % Typeset the actual heading. + \nobreak % Avoid page breaks at the interline glue. +- \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright +- \hangindent=\wd0 \centerparametersmaybe ++ \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe + \unhbox0 #1\par}% + }% + \nobreak\bigskip % no page break after a chapter title +@@ -5743,18 +5783,18 @@ + \def\setchapterstyle #1 {\csname CHAPF#1\endcsname} + % + \def\unnchfopen #1{% +-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 +- \parindent=0pt\ptexraggedright +- \rmisbold #1\hfill}}\bigskip \par\nobreak ++ \chapoddpage ++ \vbox{\chapfonts \raggedtitlesettings #1\par}% ++ \nobreak\bigskip\nobreak + } + \def\chfopen #1#2{\chapoddpage {\chapfonts + \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% + \par\penalty 5000 % + } + \def\centerchfopen #1{% +-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 +- \parindent=0pt +- \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak ++ \chapoddpage ++ \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}% ++ \nobreak\bigskip \nobreak + } + \def\CHAPFopen{% + \global\let\chapmacro=\chfopen +@@ -6520,16 +6560,9 @@ + \makedispenvdef{quotation}{\quotationstart} + % + \def\quotationstart{% +- {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip +- \parindent=0pt +- % +- % @cartouche defines \nonarrowing to inhibit narrowing at next level down. ++ \indentedblockstart % same as \indentedblock, but increase right margin too. + \ifx\nonarrowing\relax +- \advance\leftskip by \lispnarrowing + \advance\rightskip by \lispnarrowing +- \exdentamount = \lispnarrowing +- \else +- \let\nonarrowing = \relax + \fi + \parsearg\quotationlabel + } +@@ -6555,6 +6588,32 @@ + \fi + } + ++% @indentedblock is like @quotation, but indents only on the left and ++% has no optional argument. ++% ++\makedispenvdef{indentedblock}{\indentedblockstart} ++% ++\def\indentedblockstart{% ++ {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip ++ \parindent=0pt ++ % ++ % @cartouche defines \nonarrowing to inhibit narrowing at next level down. ++ \ifx\nonarrowing\relax ++ \advance\leftskip by \lispnarrowing ++ \exdentamount = \lispnarrowing ++ \else ++ \let\nonarrowing = \relax ++ \fi ++} ++ ++% Keep a nonzero parskip for the environment, since we're doing normal filling. ++% ++\def\Eindentedblock{% ++ \par ++ {\parskip=0pt \afterenvbreak}% ++} ++\def\Esmallindentedblock{\Eindentedblock} ++ + + % LaTeX-like @verbatim...@end verbatim and @verb{...} + % If we want to allow any as delimiter, +@@ -7033,7 +7092,10 @@ + \df \sl \hyphenchar\font=0 + % + % On the other hand, if an argument has two dashes (for instance), we +- % want a way to get ttsl. Let's try @var for that. ++ % want a way to get ttsl. We used to recommend @var for that, so ++ % leave the code in, but it's strange for @var to lead to typewriter. ++ % Nowadays we recommend @code, since the difference between a ttsl hyphen ++ % and a tt hyphen is pretty tiny. @code also disables ?` !`. + \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% + #1% + \sl\hyphenchar\font=45 +@@ -9931,22 +9993,26 @@ + @gdef@otherbackslash{@let\=@realbackslash} + + % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of +-% the literal character `\'. +-% +-@def@normalturnoffactive{% +- @let"=@normaldoublequote +- @let$=@normaldollar %$ font-lock fix +- @let+=@normalplus +- @let<=@normalless +- @let>=@normalgreater +- @let\=@normalbackslash +- @let^=@normalcaret +- @let_=@normalunderscore +- @let|=@normalverticalbar +- @let~=@normaltilde +- @markupsetuplqdefault +- @markupsetuprqdefault +- @unsepspaces ++% the literal character `\'. Also revert - to its normal character, in ++% case the active - from code has slipped in. ++% ++{@catcode`- = @active ++ @gdef@normalturnoffactive{% ++ @let-=@normaldash ++ @let"=@normaldoublequote ++ @let$=@normaldollar %$ font-lock fix ++ @let+=@normalplus ++ @let<=@normalless ++ @let>=@normalgreater ++ @let\=@normalbackslash ++ @let^=@normalcaret ++ @let_=@normalunderscore ++ @let|=@normalverticalbar ++ @let~=@normaltilde ++ @markupsetuplqdefault ++ @markupsetuprqdefault ++ @unsepspaces ++ } + } + + % Make _ and + \other characters, temporarily. +diff -r ee879c0ffa11 Modules/_ctypes/libffi_msvc/ffi.c +--- a/Modules/_ctypes/libffi_msvc/ffi.c ++++ b/Modules/_ctypes/libffi_msvc/ffi.c +@@ -102,6 +102,15 @@ + FFI_ASSERT(0); + } + } ++#ifdef _WIN64 ++ else if (z > 8) ++ { ++ /* On Win64, if a single argument takes more than 8 bytes, ++ then it is always passed by reference. */ ++ *(void **)argp = *p_argv; ++ z = 8; ++ } ++#endif + else + { + memcpy(argp, *p_argv, z); +@@ -124,7 +133,6 @@ + switch (cif->rtype->type) + { + case FFI_TYPE_VOID: +- case FFI_TYPE_STRUCT: + case FFI_TYPE_SINT64: + case FFI_TYPE_FLOAT: + case FFI_TYPE_DOUBLE: +@@ -132,6 +140,18 @@ + cif->flags = (unsigned) cif->rtype->type; + break; + ++ case FFI_TYPE_STRUCT: ++ /* MSVC returns small structures in registers. Put in cif->flags ++ the value FFI_TYPE_STRUCT only if the structure is big enough; ++ otherwise, put the 4- or 8-bytes integer type. */ ++ if (cif->rtype->size <= 4) ++ cif->flags = FFI_TYPE_INT; ++ else if (cif->rtype->size <= 8) ++ cif->flags = FFI_TYPE_SINT64; ++ else ++ cif->flags = FFI_TYPE_STRUCT; ++ break; ++ + case FFI_TYPE_UINT64: + #ifdef _WIN64 + case FFI_TYPE_POINTER: +@@ -201,8 +221,7 @@ + #else + case FFI_SYSV: + /*@-usedef@*/ +- /* Function call needs at least 40 bytes stack size, on win64 AMD64 */ +- return ffi_call_AMD64(ffi_prep_args, &ecif, cif->bytes ? cif->bytes : 40, ++ return ffi_call_AMD64(ffi_prep_args, &ecif, cif->bytes, + cif->flags, ecif.rvalue, fn); + /*@=usedef@*/ + break; +@@ -227,7 +246,7 @@ + #else + static void __fastcall + #endif +-ffi_closure_SYSV (ffi_closure *closure, int *argp) ++ffi_closure_SYSV (ffi_closure *closure, char *argp) + { + // this is our return value storage + long double res; +@@ -237,7 +256,7 @@ + void **arg_area; + unsigned short rtype; + void *resp = (void*)&res; +- void *args = &argp[1]; ++ void *args = argp + sizeof(void*); + + cif = closure->cif; + arg_area = (void**) alloca (cif->nargs * sizeof (void*)); +diff -r ee879c0ffa11 Modules/_ctypes/libffi_msvc/prep_cif.c +--- a/Modules/_ctypes/libffi_msvc/prep_cif.c ++++ b/Modules/_ctypes/libffi_msvc/prep_cif.c +@@ -116,9 +116,9 @@ + #if !defined M68K && !defined __x86_64__ && !defined S390 + /* Make space for the return structure pointer */ + if (cif->rtype->type == FFI_TYPE_STRUCT +- /* MSVC returns small structures in registers. But we have a different +- workaround: pretend int32 or int64 return type, and converting to +- structure afterwards. */ ++#ifdef _WIN32 ++ && (cif->rtype->size > 8) /* MSVC returns small structs in registers */ ++#endif + #ifdef SPARC + && (cif->abi != FFI_V9 || cif->rtype->size > 32) + #endif +@@ -143,7 +143,11 @@ + && ((*ptr)->size > 16 || cif->abi != FFI_V9)) + || ((*ptr)->type == FFI_TYPE_LONGDOUBLE + && cif->abi != FFI_V9)) +- bytes += sizeof(void*); ++ bytes += sizeof(void*); ++ else ++#elif defined (_WIN64) ++ if ((*ptr)->type == FFI_TYPE_STRUCT && ((*ptr)->size > 8)) ++ bytes += sizeof(void*); + else + #endif + { +@@ -168,6 +172,12 @@ + #endif + } + ++#ifdef _WIN64 ++ /* Function call needs at least 40 bytes stack size, on win64 AMD64 */ ++ if (bytes < 40) ++ bytes = 40; ++#endif ++ + cif->bytes = bytes; + + /* Perform machine dependent cif processing */ +diff -r ee879c0ffa11 Modules/_ctypes/libffi_msvc/types.c +--- a/Modules/_ctypes/libffi_msvc/types.c ++++ b/Modules/_ctypes/libffi_msvc/types.c +@@ -43,7 +43,7 @@ + FFI_INTEGRAL_TYPEDEF(float, 4, 4, FFI_TYPE_FLOAT); + + #if defined ALPHA || defined SPARC64 || defined X86_64 || defined S390X \ +- || defined IA64 ++ || defined IA64 || defined _WIN64 + + FFI_INTEGRAL_TYPEDEF(pointer, 8, 8, FFI_TYPE_POINTER); + +diff -r ee879c0ffa11 Modules/_hashopenssl.c +--- a/Modules/_hashopenssl.c ++++ b/Modules/_hashopenssl.c +@@ -712,6 +712,61 @@ + + #endif + ++/* State for our callback function so that it can accumulate a result. */ ++typedef struct _internal_name_mapper_state { ++ PyObject *set; ++ int error; ++} _InternalNameMapperState; ++ ++ ++/* A callback function to pass to OpenSSL's OBJ_NAME_do_all(...) */ ++static void ++_openssl_hash_name_mapper(const OBJ_NAME *openssl_obj_name, void *arg) ++{ ++ _InternalNameMapperState *state = (_InternalNameMapperState *)arg; ++ PyObject *py_name; ++ ++ assert(state != NULL); ++ if (openssl_obj_name == NULL) ++ return; ++ /* Ignore aliased names, they pollute the list and OpenSSL appears to ++ * have a its own definition of alias as the resulting list still ++ * contains duplicate and alternate names for several algorithms. */ ++ if (openssl_obj_name->alias) ++ return; ++ ++ py_name = PyString_FromString(openssl_obj_name->name); ++ if (py_name == NULL) { ++ state->error = 1; ++ } else { ++ if (PySet_Add(state->set, py_name) != 0) { ++ state->error = 1; ++ } ++ Py_DECREF(py_name); ++ } ++} ++ ++ ++/* Ask OpenSSL for a list of supported ciphers, filling in a Python set. */ ++static PyObject* ++generate_hash_name_list(void) ++{ ++ _InternalNameMapperState state; ++ state.set = PyFrozenSet_New(NULL); ++ if (state.set == NULL) ++ return NULL; ++ state.error = 0; ++ ++ OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, &_openssl_hash_name_mapper, &state); ++ ++ if (state.error) { ++ Py_DECREF(state.set); ++ return NULL; ++ } ++ return state.set; ++} ++ ++ + /* + * This macro generates constructor function definitions for specific + * hash algorithms. These constructors are much faster than calling +@@ -792,9 +847,10 @@ + PyMODINIT_FUNC + init_hashlib(void) + { +- PyObject *m; ++ PyObject *m, *openssl_md_meth_names; + + OpenSSL_add_all_digests(); ++ ERR_load_crypto_strings(); + + /* TODO build EVP_functions openssl_* entries dynamically based + * on what hashes are supported rather than listing many +@@ -809,6 +865,14 @@ + if (m == NULL) + return; + ++ openssl_md_meth_names = generate_hash_name_list(); ++ if (openssl_md_meth_names == NULL) { ++ return; ++ } ++ if (PyModule_AddObject(m, "openssl_md_meth_names", openssl_md_meth_names)) { ++ return; ++ } ++ + #if HASH_OBJ_CONSTRUCTOR + Py_INCREF(&EVPtype); + PyModule_AddObject(m, "HASH", (PyObject *)&EVPtype); +diff -r ee879c0ffa11 Modules/_io/_iomodule.c +--- a/Modules/_io/_iomodule.c ++++ b/Modules/_io/_iomodule.c +@@ -526,11 +526,13 @@ + + error: + if (result != NULL) { +- PyObject *exc, *val, *tb; ++ PyObject *exc, *val, *tb, *close_result; + PyErr_Fetch(&exc, &val, &tb); +- if (PyObject_CallMethod(result, "close", NULL) != NULL) ++ close_result = PyObject_CallMethod(result, "close", NULL); ++ if (close_result != NULL) { ++ Py_DECREF(close_result); + PyErr_Restore(exc, val, tb); +- else { ++ } else { + Py_XDECREF(exc); + Py_XDECREF(val); + Py_XDECREF(tb); +diff -r ee879c0ffa11 Modules/_io/bufferedio.c +--- a/Modules/_io/bufferedio.c ++++ b/Modules/_io/bufferedio.c +@@ -2120,6 +2120,8 @@ + bufferedrwpair_dealloc(rwpair *self) + { + _PyObject_GC_UNTRACK(self); ++ if (self->weakreflist != NULL) ++ PyObject_ClearWeakRefs((PyObject *)self); + Py_CLEAR(self->reader); + Py_CLEAR(self->writer); + Py_CLEAR(self->dict); +diff -r ee879c0ffa11 Modules/_io/fileio.c +--- a/Modules/_io/fileio.c ++++ b/Modules/_io/fileio.c +@@ -577,9 +577,9 @@ + } + continue; + } +- if (total > 0) +- break; + if (errno == EAGAIN) { ++ if (total > 0) ++ break; + Py_DECREF(result); + Py_RETURN_NONE; + } +@@ -980,7 +980,8 @@ + "This is needed for lower-level file interfaces, such the fcntl module."); + + PyDoc_STRVAR(seek_doc, +-"seek(offset: int[, whence: int]) -> None. Move to new file position.\n" ++"seek(offset: int[, whence: int]) -> int. Move to new file position\n" ++"and return the file position.\n" + "\n" + "Argument offset is a byte count. Optional argument whence defaults to\n" + "0 (offset from start of file, offset should be >= 0); other values are 1\n" +@@ -992,9 +993,10 @@ + + #ifdef HAVE_FTRUNCATE + PyDoc_STRVAR(truncate_doc, +-"truncate([size: int]) -> None. Truncate the file to at most size bytes.\n" ++"truncate([size: int]) -> int. Truncate the file to at most size bytes and\n" ++"return the truncated size.\n" + "\n" +-"Size defaults to the current file position, as returned by tell()." ++"Size defaults to the current file position, as returned by tell().\n" + "The current file position is changed to the value of size."); + #endif + +diff -r ee879c0ffa11 Modules/_sqlite/connection.c +--- a/Modules/_sqlite/connection.c ++++ b/Modules/_sqlite/connection.c +@@ -1215,7 +1215,8 @@ + if (rc == PYSQLITE_TOO_MUCH_SQL) { + PyErr_SetString(pysqlite_Warning, "You can only execute one statement at a time."); + } else if (rc == PYSQLITE_SQL_WRONG_TYPE) { +- PyErr_SetString(pysqlite_Warning, "SQL is of wrong type. Must be string or unicode."); ++ if (!PyErr_Occurred() || PyErr_ExceptionMatches(PyExc_TypeError)) ++ PyErr_SetString(pysqlite_Warning, "SQL is of wrong type. Must be string or unicode."); + } else { + (void)pysqlite_statement_reset(statement); + _pysqlite_seterror(self->db, NULL); +diff -r ee879c0ffa11 Modules/_sqlite/row.c +--- a/Modules/_sqlite/row.c ++++ b/Modules/_sqlite/row.c +@@ -33,35 +33,41 @@ + Py_TYPE(self)->tp_free((PyObject*)self); + } + +-int pysqlite_row_init(pysqlite_Row* self, PyObject* args, PyObject* kwargs) ++static PyObject * ++pysqlite_row_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) + { ++ pysqlite_Row *self; + PyObject* data; + pysqlite_Cursor* cursor; + +- self->data = 0; +- self->description = 0; ++ assert(type != NULL && type->tp_alloc != NULL); + +- if (!PyArg_ParseTuple(args, "OO", &cursor, &data)) { +- return -1; +- } ++ if (!_PyArg_NoKeywords("Row()", kwargs)) ++ return NULL; ++ if (!PyArg_ParseTuple(args, "OO", &cursor, &data)) ++ return NULL; + + if (!PyObject_IsInstance((PyObject*)cursor, (PyObject*)&pysqlite_CursorType)) { + PyErr_SetString(PyExc_TypeError, "instance of cursor required for first argument"); +- return -1; ++ return NULL; + } + + if (!PyTuple_Check(data)) { + PyErr_SetString(PyExc_TypeError, "tuple required for second argument"); +- return -1; ++ return NULL; + } + ++ self = (pysqlite_Row *) type->tp_alloc(type, 0); ++ if (self == NULL) ++ return NULL; ++ + Py_INCREF(data); + self->data = data; + + Py_INCREF(cursor->description); + self->description = cursor->description; + +- return 0; ++ return (PyObject *) self; + } + + PyObject* pysqlite_row_item(pysqlite_Row* self, Py_ssize_t idx) +@@ -263,7 +269,7 @@ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ +- (initproc)pysqlite_row_init, /* tp_init */ ++ 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ + 0 /* tp_free */ +@@ -271,7 +277,7 @@ + + extern int pysqlite_row_setup_types(void) + { +- pysqlite_RowType.tp_new = PyType_GenericNew; ++ pysqlite_RowType.tp_new = pysqlite_row_new; + pysqlite_RowType.tp_as_mapping = &pysqlite_row_as_mapping; + pysqlite_RowType.tp_as_sequence = &pysqlite_row_as_sequence; + return PyType_Ready(&pysqlite_RowType); +diff -r ee879c0ffa11 Modules/_sqlite/statement.c +--- a/Modules/_sqlite/statement.c ++++ b/Modules/_sqlite/statement.c +@@ -74,12 +74,15 @@ + rc = PYSQLITE_SQL_WRONG_TYPE; + return rc; + } ++ sql_cstr = PyString_AsString(sql_str); ++ if (strlen(sql_cstr) != (size_t)PyString_GET_SIZE(sql_str)) { ++ PyErr_SetString(PyExc_ValueError, "the query contains a null character"); ++ return PYSQLITE_SQL_WRONG_TYPE; ++ } + + self->in_weakreflist = NULL; + self->sql = sql_str; + +- sql_cstr = PyString_AsString(sql_str); +- + Py_BEGIN_ALLOW_THREADS + rc = sqlite3_prepare(connection->db, + sql_cstr, +diff -r ee879c0ffa11 Modules/_sre.c +--- a/Modules/_sre.c ++++ b/Modules/_sre.c +@@ -3301,7 +3301,7 @@ + { + Py_ssize_t i; + +- if (PyInt_Check(index)) ++ if (PyInt_Check(index) || PyLong_Check(index)) + return PyInt_AsSsize_t(index); + + i = -1; +diff -r ee879c0ffa11 Modules/_ssl.c +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -14,22 +14,28 @@ + http://bugs.python.org/issue8108#msg102867 ? + */ + ++#define PY_SSIZE_T_CLEAN + #include "Python.h" + + #ifdef WITH_THREAD + #include "pythread.h" + + ++#define PySSL_BEGIN_ALLOW_THREADS_S(save) \ ++ do { if (_ssl_locks_count>0) { (save) = PyEval_SaveThread(); } } while (0) ++#define PySSL_END_ALLOW_THREADS_S(save) \ ++ do { if (_ssl_locks_count>0) { PyEval_RestoreThread(save); } } while (0) + #define PySSL_BEGIN_ALLOW_THREADS { \ + PyThreadState *_save = NULL; \ +- if (_ssl_locks_count>0) {_save = PyEval_SaveThread();} +-#define PySSL_BLOCK_THREADS if (_ssl_locks_count>0){PyEval_RestoreThread(_save)}; +-#define PySSL_UNBLOCK_THREADS if (_ssl_locks_count>0){_save = PyEval_SaveThread()}; +-#define PySSL_END_ALLOW_THREADS if (_ssl_locks_count>0){PyEval_RestoreThread(_save);} \ +- } ++ PySSL_BEGIN_ALLOW_THREADS_S(_save); ++#define PySSL_BLOCK_THREADS PySSL_END_ALLOW_THREADS_S(_save); ++#define PySSL_UNBLOCK_THREADS PySSL_BEGIN_ALLOW_THREADS_S(_save); ++#define PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS_S(_save); } + + #else /* no WITH_THREAD */ + ++#define PySSL_BEGIN_ALLOW_THREADS_S(save) ++#define PySSL_END_ALLOW_THREADS_S(save) + #define PySSL_BEGIN_ALLOW_THREADS + #define PySSL_BLOCK_THREADS + #define PySSL_UNBLOCK_THREADS +@@ -37,6 +43,68 @@ + + #endif + ++/* Include symbols from _socket module */ ++#include "socketmodule.h" ++ ++#if defined(HAVE_POLL_H) ++#include ++#elif defined(HAVE_SYS_POLL_H) ++#include ++#endif ++ ++/* Include OpenSSL header files */ ++#include "openssl/rsa.h" ++#include "openssl/crypto.h" ++#include "openssl/x509.h" ++#include "openssl/x509v3.h" ++#include "openssl/pem.h" ++#include "openssl/ssl.h" ++#include "openssl/err.h" ++#include "openssl/rand.h" ++ ++/* SSL error object */ ++static PyObject *PySSLErrorObject; ++static PyObject *PySSLZeroReturnErrorObject; ++static PyObject *PySSLWantReadErrorObject; ++static PyObject *PySSLWantWriteErrorObject; ++static PyObject *PySSLSyscallErrorObject; ++static PyObject *PySSLEOFErrorObject; ++ ++/* Error mappings */ ++static PyObject *err_codes_to_names; ++static PyObject *err_names_to_codes; ++static PyObject *lib_codes_to_names; ++ ++struct py_ssl_error_code { ++ const char *mnemonic; ++ int library, reason; ++}; ++struct py_ssl_library_code { ++ const char *library; ++ int code; ++}; ++ ++/* Include generated data (error codes) */ ++#include "_ssl_data.h" ++ ++/* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 ++ http://www.openssl.org/news/changelog.html ++ */ ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++# define HAVE_TLSv1_2 1 ++#else ++# define HAVE_TLSv1_2 0 ++#endif ++ ++/* SNI support (client- and server-side) appeared in OpenSSL 1.0.0 and 0.9.8f ++ * This includes the SSL_set_SSL_CTX() function. ++ */ ++#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME ++# define HAVE_SNI 1 ++#else ++# define HAVE_SNI 0 ++#endif ++ + enum py_ssl_error { + /* these mirror ssl.h */ + PY_SSL_ERROR_NONE, +@@ -49,6 +117,7 @@ + PY_SSL_ERROR_WANT_CONNECT, + /* start of non ssl.h errorcodes */ + PY_SSL_ERROR_EOF, /* special case of SSL_ERROR_SYSCALL */ ++ PY_SSL_ERROR_NO_SOCKET, /* socket has been GC'd */ + PY_SSL_ERROR_INVALID_ERROR_CODE + }; + +@@ -64,36 +133,18 @@ + }; + + enum py_ssl_version { +-#ifndef OPENSSL_NO_SSL2 + PY_SSL_VERSION_SSL2, +-#endif + PY_SSL_VERSION_SSL3=1, + PY_SSL_VERSION_SSL23, ++#if HAVE_TLSv1_2 ++ PY_SSL_VERSION_TLS1, ++ PY_SSL_VERSION_TLS1_1, ++ PY_SSL_VERSION_TLS1_2 ++#else + PY_SSL_VERSION_TLS1 ++#endif + }; + +-/* Include symbols from _socket module */ +-#include "socketmodule.h" +- +-#if defined(HAVE_POLL_H) +-#include +-#elif defined(HAVE_SYS_POLL_H) +-#include +-#endif +- +-/* Include OpenSSL header files */ +-#include "openssl/rsa.h" +-#include "openssl/crypto.h" +-#include "openssl/x509.h" +-#include "openssl/x509v3.h" +-#include "openssl/pem.h" +-#include "openssl/ssl.h" +-#include "openssl/err.h" +-#include "openssl/rand.h" +- +-/* SSL error object */ +-static PyObject *PySSLErrorObject; +- + #ifdef WITH_THREAD + + /* serves as a flag to see whether we've initialized the SSL thread support. */ +@@ -114,27 +165,79 @@ + # undef HAVE_OPENSSL_RAND + #endif + ++/* SSL_CTX_clear_options() and SSL_clear_options() were first added in ++ * OpenSSL 0.9.8m but do not appear in some 0.9.9-dev versions such the ++ * 0.9.9 from "May 2008" that NetBSD 5.0 uses. */ ++#if OPENSSL_VERSION_NUMBER >= 0x009080dfL && OPENSSL_VERSION_NUMBER != 0x00909000L ++# define HAVE_SSL_CTX_CLEAR_OPTIONS ++#else ++# undef HAVE_SSL_CTX_CLEAR_OPTIONS ++#endif ++ ++/* In case of 'tls-unique' it will be 12 bytes for TLS, 36 bytes for ++ * older SSL, but let's be safe */ ++#define PySSL_CB_MAXLEN 128 ++ ++/* SSL_get_finished got added to OpenSSL in 0.9.5 */ ++#if OPENSSL_VERSION_NUMBER >= 0x0090500fL ++# define HAVE_OPENSSL_FINISHED 1 ++#else ++# define HAVE_OPENSSL_FINISHED 0 ++#endif ++ ++/* ECDH support got added to OpenSSL in 0.9.8 */ ++#if OPENSSL_VERSION_NUMBER < 0x0090800fL && !defined(OPENSSL_NO_ECDH) ++# define OPENSSL_NO_ECDH ++#endif ++ ++/* compression support got added to OpenSSL in 0.9.8 */ ++#if OPENSSL_VERSION_NUMBER < 0x0090800fL && !defined(OPENSSL_NO_COMP) ++# define OPENSSL_NO_COMP ++#endif ++ ++/* X509_VERIFY_PARAM got added to OpenSSL in 0.9.8 */ ++#if OPENSSL_VERSION_NUMBER >= 0x0090800fL ++# define HAVE_OPENSSL_VERIFY_PARAM ++#endif ++ ++ + typedef struct { + PyObject_HEAD +- PySocketSockObject *Socket; /* Socket on which we're layered */ +- SSL_CTX* ctx; +- SSL* ssl; +- X509* peer_cert; +- char server[X509_NAME_MAXLEN]; +- char issuer[X509_NAME_MAXLEN]; +- int shutdown_seen_zero; +- +-} PySSLObject; +- +-static PyTypeObject PySSL_Type; +-static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args); +-static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args); ++ SSL_CTX *ctx; ++#ifdef OPENSSL_NPN_NEGOTIATED ++ char *npn_protocols; ++ int npn_protocols_len; ++#endif ++#ifndef OPENSSL_NO_TLSEXT ++ PyObject *set_hostname; ++#endif ++ int check_hostname; ++} PySSLContext; ++ ++typedef struct { ++ PyObject_HEAD ++ PySocketSockObject *Socket; ++ PyObject *ssl_sock; ++ SSL *ssl; ++ PySSLContext *ctx; /* weakref to SSL context */ ++ X509 *peer_cert; ++ char shutdown_seen_zero; ++ char handshake_done; ++ enum py_ssl_server_or_client socket_type; ++} PySSLSocket; ++ ++static PyTypeObject PySSLContext_Type; ++static PyTypeObject PySSLSocket_Type; ++ ++static PyObject *PySSL_SSLwrite(PySSLSocket *self, PyObject *args); ++static PyObject *PySSL_SSLread(PySSLSocket *self, PyObject *args); + static int check_socket_and_wait_for_timeout(PySocketSockObject *s, + int writing); +-static PyObject *PySSL_peercert(PySSLObject *self, PyObject *args); +-static PyObject *PySSL_cipher(PySSLObject *self); +- +-#define PySSLObject_Check(v) (Py_TYPE(v) == &PySSL_Type) ++static PyObject *PySSL_peercert(PySSLSocket *self, PyObject *args); ++static PyObject *PySSL_cipher(PySSLSocket *self); ++ ++#define PySSLContext_Check(v) (Py_TYPE(v) == &PySSLContext_Type) ++#define PySSLSocket_Check(v) (Py_TYPE(v) == &PySSLSocket_Type) + + typedef enum { + SOCKET_IS_NONBLOCKING, +@@ -151,36 +254,140 @@ + #define ERRSTR1(x,y,z) (x ":" y ": " z) + #define ERRSTR(x) ERRSTR1("_ssl.c", STRINGIFY2(__LINE__), x) + +-/* XXX It might be helpful to augment the error message generated +- below with the name of the SSL function that generated the error. +- I expect it's obvious most of the time. +-*/ ++ ++/* ++ * SSL errors. ++ */ ++ ++PyDoc_STRVAR(SSLError_doc, ++"An error occurred in the SSL implementation."); ++ ++PyDoc_STRVAR(SSLZeroReturnError_doc, ++"SSL/TLS session closed cleanly."); ++ ++PyDoc_STRVAR(SSLWantReadError_doc, ++"Non-blocking SSL socket needs to read more data\n" ++"before the requested operation can be completed."); ++ ++PyDoc_STRVAR(SSLWantWriteError_doc, ++"Non-blocking SSL socket needs to write more data\n" ++"before the requested operation can be completed."); ++ ++PyDoc_STRVAR(SSLSyscallError_doc, ++"System error when attempting SSL operation."); ++ ++PyDoc_STRVAR(SSLEOFError_doc, ++"SSL/TLS connection terminated abruptly."); ++ + + static PyObject * +-PySSL_SetError(PySSLObject *obj, int ret, char *filename, int lineno) ++SSLError_str(PyEnvironmentErrorObject *self) + { +- PyObject *v; +- char buf[2048]; +- char *errstr; ++ if (self->strerror != NULL) { ++ Py_INCREF(self->strerror); ++ return self->strerror; ++ } ++ else ++ return PyObject_Str(self->args); ++} ++ ++static void ++fill_and_set_sslerror(PyObject *type, int ssl_errno, const char *errstr, ++ int lineno, unsigned long errcode) ++{ ++ PyObject *err_value = NULL, *reason_obj = NULL, *lib_obj = NULL; ++ PyObject *init_value, *msg, *key; ++ ++ if (errcode != 0) { ++ int lib, reason; ++ ++ lib = ERR_GET_LIB(errcode); ++ reason = ERR_GET_REASON(errcode); ++ key = Py_BuildValue("ii", lib, reason); ++ if (key == NULL) ++ goto fail; ++ reason_obj = PyDict_GetItem(err_codes_to_names, key); ++ Py_DECREF(key); ++ if (reason_obj == NULL) { ++ /* XXX if reason < 100, it might reflect a library number (!!) */ ++ PyErr_Clear(); ++ } ++ key = PyLong_FromLong(lib); ++ if (key == NULL) ++ goto fail; ++ lib_obj = PyDict_GetItem(lib_codes_to_names, key); ++ Py_DECREF(key); ++ if (lib_obj == NULL) { ++ PyErr_Clear(); ++ } ++ if (errstr == NULL) ++ errstr = ERR_reason_error_string(errcode); ++ } ++ if (errstr == NULL) ++ errstr = "unknown error"; ++ ++ if (reason_obj && lib_obj) ++ msg = PyUnicode_FromFormat("[%S: %S] %s (_ssl.c:%d)", ++ lib_obj, reason_obj, errstr, lineno); ++ else if (lib_obj) ++ msg = PyUnicode_FromFormat("[%S] %s (_ssl.c:%d)", ++ lib_obj, errstr, lineno); ++ else ++ msg = PyUnicode_FromFormat("%s (_ssl.c:%d)", errstr, lineno); ++ if (msg == NULL) ++ goto fail; ++ ++ init_value = Py_BuildValue("iN", ssl_errno, msg); ++ if (init_value == NULL) ++ goto fail; ++ ++ err_value = PyObject_CallObject(type, init_value); ++ Py_DECREF(init_value); ++ if (err_value == NULL) ++ goto fail; ++ ++ if (reason_obj == NULL) ++ reason_obj = Py_None; ++ if (PyObject_SetAttrString(err_value, "reason", reason_obj)) ++ goto fail; ++ if (lib_obj == NULL) ++ lib_obj = Py_None; ++ if (PyObject_SetAttrString(err_value, "library", lib_obj)) ++ goto fail; ++ PyErr_SetObject(type, err_value); ++fail: ++ Py_XDECREF(err_value); ++} ++ ++static PyObject * ++PySSL_SetError(PySSLSocket *obj, int ret, char *filename, int lineno) ++{ ++ PyObject *type = PySSLErrorObject; ++ char *errstr = NULL; + int err; + enum py_ssl_error p = PY_SSL_ERROR_NONE; ++ unsigned long e = 0; + + assert(ret <= 0); ++ e = ERR_peek_last_error(); + + if (obj->ssl != NULL) { + err = SSL_get_error(obj->ssl, ret); + + switch (err) { + case SSL_ERROR_ZERO_RETURN: +- errstr = "TLS/SSL connection has been closed"; ++ errstr = "TLS/SSL connection has been closed (EOF)"; ++ type = PySSLZeroReturnErrorObject; + p = PY_SSL_ERROR_ZERO_RETURN; + break; + case SSL_ERROR_WANT_READ: + errstr = "The operation did not complete (read)"; ++ type = PySSLWantReadErrorObject; + p = PY_SSL_ERROR_WANT_READ; + break; + case SSL_ERROR_WANT_WRITE: + p = PY_SSL_ERROR_WANT_WRITE; ++ type = PySSLWantWriteErrorObject; + errstr = "The operation did not complete (write)"; + break; + case SSL_ERROR_WANT_X509_LOOKUP: +@@ -193,213 +400,109 @@ + break; + case SSL_ERROR_SYSCALL: + { +- unsigned long e = ERR_get_error(); + if (e == 0) { +- if (ret == 0 || !obj->Socket) { ++ PySocketSockObject *s = obj->Socket; ++ if (ret == 0) { + p = PY_SSL_ERROR_EOF; ++ type = PySSLEOFErrorObject; + errstr = "EOF occurred in violation of protocol"; + } else if (ret == -1) { + /* underlying BIO reported an I/O error */ ++ Py_INCREF(s); + ERR_clear_error(); +- return obj->Socket->errorhandler(); ++ s->errorhandler(); ++ Py_DECREF(s); ++ return NULL; + } else { /* possible? */ + p = PY_SSL_ERROR_SYSCALL; ++ type = PySSLSyscallErrorObject; + errstr = "Some I/O error occurred"; + } + } else { + p = PY_SSL_ERROR_SYSCALL; +- /* XXX Protected by global interpreter lock */ +- errstr = ERR_error_string(e, NULL); + } + break; + } + case SSL_ERROR_SSL: + { +- unsigned long e = ERR_get_error(); + p = PY_SSL_ERROR_SSL; +- if (e != 0) +- /* XXX Protected by global interpreter lock */ +- errstr = ERR_error_string(e, NULL); +- else { /* possible? */ ++ if (e == 0) ++ /* possible? */ + errstr = "A failure in the SSL library occurred"; +- } + break; + } + default: + p = PY_SSL_ERROR_INVALID_ERROR_CODE; + errstr = "Invalid error code"; + } +- } else { +- errstr = ERR_error_string(ERR_peek_last_error(), NULL); + } +- PyOS_snprintf(buf, sizeof(buf), "_ssl.c:%d: %s", lineno, errstr); ++ fill_and_set_sslerror(type, p, errstr, lineno, e); + ERR_clear_error(); +- v = Py_BuildValue("(is)", p, buf); +- if (v != NULL) { +- PyErr_SetObject(PySSLErrorObject, v); +- Py_DECREF(v); +- } + return NULL; + } + + static PyObject * + _setSSLError (char *errstr, int errcode, char *filename, int lineno) { + +- char buf[2048]; +- PyObject *v; +- +- if (errstr == NULL) { ++ if (errstr == NULL) + errcode = ERR_peek_last_error(); +- errstr = ERR_error_string(errcode, NULL); +- } +- PyOS_snprintf(buf, sizeof(buf), "_ssl.c:%d: %s", lineno, errstr); ++ else ++ errcode = 0; ++ fill_and_set_sslerror(PySSLErrorObject, errcode, errstr, lineno, errcode); + ERR_clear_error(); +- v = Py_BuildValue("(is)", errcode, buf); +- if (v != NULL) { +- PyErr_SetObject(PySSLErrorObject, v); +- Py_DECREF(v); +- } + return NULL; + } + +-static PySSLObject * +-newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file, ++/* ++ * SSL objects ++ */ ++ ++static PySSLSocket * ++newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock, + enum py_ssl_server_or_client socket_type, +- enum py_ssl_cert_requirements certreq, +- enum py_ssl_version proto_version, +- char *cacerts_file, char *ciphers) ++ char *server_hostname, PyObject *ssl_sock) + { +- PySSLObject *self; +- char *errstr = NULL; +- int ret; +- int verification_mode; +- long options; +- +- self = PyObject_New(PySSLObject, &PySSL_Type); /* Create new object */ ++ PySSLSocket *self; ++ SSL_CTX *ctx = sslctx->ctx; ++ long mode; ++ ++ self = PyObject_New(PySSLSocket, &PySSLSocket_Type); + if (self == NULL) + return NULL; +- memset(self->server, '\0', sizeof(char) * X509_NAME_MAXLEN); +- memset(self->issuer, '\0', sizeof(char) * X509_NAME_MAXLEN); ++ + self->peer_cert = NULL; + self->ssl = NULL; +- self->ctx = NULL; + self->Socket = NULL; ++ self->ssl_sock = NULL; ++ self->ctx = sslctx; + self->shutdown_seen_zero = 0; ++ self->handshake_done = 0; ++ Py_INCREF(sslctx); + + /* Make sure the SSL error state is initialized */ + (void) ERR_get_state(); + ERR_clear_error(); + +- if ((key_file && !cert_file) || (!key_file && cert_file)) { +- errstr = ERRSTR("Both the key & certificate files " +- "must be specified"); +- goto fail; +- } +- +- if ((socket_type == PY_SSL_SERVER) && +- ((key_file == NULL) || (cert_file == NULL))) { +- errstr = ERRSTR("Both the key & certificate files " +- "must be specified for server-side operation"); +- goto fail; +- } +- + PySSL_BEGIN_ALLOW_THREADS +- if (proto_version == PY_SSL_VERSION_TLS1) +- self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ +- else if (proto_version == PY_SSL_VERSION_SSL3) +- self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ +-#ifndef OPENSSL_NO_SSL2 +- else if (proto_version == PY_SSL_VERSION_SSL2) +- self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */ ++ self->ssl = SSL_new(ctx); ++ PySSL_END_ALLOW_THREADS ++ SSL_set_app_data(self->ssl,self); ++ SSL_set_fd(self->ssl, Py_SAFE_DOWNCAST(sock->sock_fd, SOCKET_T, int)); ++ mode = SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER; ++#ifdef SSL_MODE_AUTO_RETRY ++ mode |= SSL_MODE_AUTO_RETRY; + #endif +- else if (proto_version == PY_SSL_VERSION_SSL23) +- self->ctx = SSL_CTX_new(SSLv23_method()); /* Set up context */ +- PySSL_END_ALLOW_THREADS +- +- if (self->ctx == NULL) { +- errstr = ERRSTR("Invalid SSL protocol variant specified."); +- goto fail; +- } +- +- if (ciphers != NULL) { +- ret = SSL_CTX_set_cipher_list(self->ctx, ciphers); +- if (ret == 0) { +- errstr = ERRSTR("No cipher can be selected."); +- goto fail; +- } +- } +- +- if (certreq != PY_SSL_CERT_NONE) { +- if (cacerts_file == NULL) { +- errstr = ERRSTR("No root certificates specified for " +- "verification of other-side certificates."); +- goto fail; +- } else { +- PySSL_BEGIN_ALLOW_THREADS +- ret = SSL_CTX_load_verify_locations(self->ctx, +- cacerts_file, +- NULL); +- PySSL_END_ALLOW_THREADS +- if (ret != 1) { +- _setSSLError(NULL, 0, __FILE__, __LINE__); +- goto fail; +- } +- } +- } +- if (key_file) { +- PySSL_BEGIN_ALLOW_THREADS +- ret = SSL_CTX_use_PrivateKey_file(self->ctx, key_file, +- SSL_FILETYPE_PEM); +- PySSL_END_ALLOW_THREADS +- if (ret != 1) { +- _setSSLError(NULL, ret, __FILE__, __LINE__); +- goto fail; +- } +- +- PySSL_BEGIN_ALLOW_THREADS +- ret = SSL_CTX_use_certificate_chain_file(self->ctx, +- cert_file); +- PySSL_END_ALLOW_THREADS +- if (ret != 1) { +- /* +- fprintf(stderr, "ret is %d, errcode is %lu, %lu, with file \"%s\"\n", +- ret, ERR_peek_error(), ERR_peek_last_error(), cert_file); +- */ +- if (ERR_peek_last_error() != 0) { +- _setSSLError(NULL, ret, __FILE__, __LINE__); +- goto fail; +- } +- } +- } +- +- /* ssl compatibility */ +- options = SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; +- if (proto_version != PY_SSL_VERSION_SSL2) +- options |= SSL_OP_NO_SSLv2; +- SSL_CTX_set_options(self->ctx, options); +- +- verification_mode = SSL_VERIFY_NONE; +- if (certreq == PY_SSL_CERT_OPTIONAL) +- verification_mode = SSL_VERIFY_PEER; +- else if (certreq == PY_SSL_CERT_REQUIRED) +- verification_mode = (SSL_VERIFY_PEER | +- SSL_VERIFY_FAIL_IF_NO_PEER_CERT); +- SSL_CTX_set_verify(self->ctx, verification_mode, +- NULL); /* set verify lvl */ +- +- PySSL_BEGIN_ALLOW_THREADS +- self->ssl = SSL_new(self->ctx); /* New ssl struct */ +- PySSL_END_ALLOW_THREADS +- SSL_set_fd(self->ssl, Sock->sock_fd); /* Set the socket for SSL */ +-#ifdef SSL_MODE_AUTO_RETRY +- SSL_set_mode(self->ssl, SSL_MODE_AUTO_RETRY); ++ SSL_set_mode(self->ssl, mode); ++ ++#if HAVE_SNI ++ if (server_hostname != NULL) ++ SSL_set_tlsext_host_name(self->ssl, server_hostname); + #endif + + /* If the socket is in non-blocking mode or timeout mode, set the BIO + * to non-blocking mode (blocking is the default) + */ +- if (Sock->sock_timeout >= 0.0) { +- /* Set both the read and write BIO's to non-blocking mode */ ++ if (sock->sock_timeout >= 0.0) { + BIO_set_nbio(SSL_get_rbio(self->ssl), 1); + BIO_set_nbio(SSL_get_wbio(self->ssl), 1); + } +@@ -411,65 +514,33 @@ + SSL_set_accept_state(self->ssl); + PySSL_END_ALLOW_THREADS + +- self->Socket = Sock; ++ self->socket_type = socket_type; ++ self->Socket = sock; + Py_INCREF(self->Socket); ++ if (ssl_sock != Py_None) { ++ self->ssl_sock = PyWeakref_NewRef(ssl_sock, NULL); ++ if (self->ssl_sock == NULL) { ++ Py_DECREF(self); ++ return NULL; ++ } ++ } + return self; +- fail: +- if (errstr) +- PyErr_SetString(PySSLErrorObject, errstr); +- Py_DECREF(self); +- return NULL; + } + +-static PyObject * +-PySSL_sslwrap(PyObject *self, PyObject *args) +-{ +- PySocketSockObject *Sock; +- int server_side = 0; +- int verification_mode = PY_SSL_CERT_NONE; +- int protocol = PY_SSL_VERSION_SSL23; +- char *key_file = NULL; +- char *cert_file = NULL; +- char *cacerts_file = NULL; +- char *ciphers = NULL; +- +- if (!PyArg_ParseTuple(args, "O!i|zziizz:sslwrap", +- PySocketModule.Sock_Type, +- &Sock, +- &server_side, +- &key_file, &cert_file, +- &verification_mode, &protocol, +- &cacerts_file, &ciphers)) +- return NULL; +- +- /* +- fprintf(stderr, +- "server_side is %d, keyfile %p, certfile %p, verify_mode %d, " +- "protocol %d, certs %p\n", +- server_side, key_file, cert_file, verification_mode, +- protocol, cacerts_file); +- */ +- +- return (PyObject *) newPySSLObject(Sock, key_file, cert_file, +- server_side, verification_mode, +- protocol, cacerts_file, +- ciphers); +-} +- +-PyDoc_STRVAR(ssl_doc, +-"sslwrap(socket, server_side, [keyfile, certfile, certs_mode, protocol,\n" +-" cacertsfile, ciphers]) -> sslobject"); + + /* SSL object methods */ + +-static PyObject *PySSL_SSLdo_handshake(PySSLObject *self) ++static PyObject *PySSL_SSLdo_handshake(PySSLSocket *self) + { + int ret; + int err; + int sockstate, nonblocking; ++ PySocketSockObject *sock = self->Socket; ++ ++ Py_INCREF(sock); + + /* just in case the blocking state of the socket has been changed */ +- nonblocking = (self->Socket->sock_timeout >= 0.0); ++ nonblocking = (sock->sock_timeout >= 0.0); + BIO_set_nbio(SSL_get_rbio(self->ssl), nonblocking); + BIO_set_nbio(SSL_get_wbio(self->ssl), nonblocking); + +@@ -480,60 +551,48 @@ + ret = SSL_do_handshake(self->ssl); + err = SSL_get_error(self->ssl, ret); + PySSL_END_ALLOW_THREADS +- if(PyErr_CheckSignals()) { +- return NULL; +- } ++ if (PyErr_CheckSignals()) ++ goto error; + if (err == SSL_ERROR_WANT_READ) { +- sockstate = check_socket_and_wait_for_timeout(self->Socket, 0); ++ sockstate = check_socket_and_wait_for_timeout(sock, 0); + } else if (err == SSL_ERROR_WANT_WRITE) { +- sockstate = check_socket_and_wait_for_timeout(self->Socket, 1); ++ sockstate = check_socket_and_wait_for_timeout(sock, 1); + } else { + sockstate = SOCKET_OPERATION_OK; + } + if (sockstate == SOCKET_HAS_TIMED_OUT) { + PyErr_SetString(PySSLErrorObject, + ERRSTR("The handshake operation timed out")); +- return NULL; ++ goto error; + } else if (sockstate == SOCKET_HAS_BEEN_CLOSED) { + PyErr_SetString(PySSLErrorObject, + ERRSTR("Underlying socket has been closed.")); +- return NULL; ++ goto error; + } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) { + PyErr_SetString(PySSLErrorObject, + ERRSTR("Underlying socket too large for select().")); +- return NULL; ++ goto error; + } else if (sockstate == SOCKET_IS_NONBLOCKING) { + break; + } + } while (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE); ++ Py_DECREF(sock); + if (ret < 1) + return PySSL_SetError(self, ret, __FILE__, __LINE__); + + if (self->peer_cert) + X509_free (self->peer_cert); + PySSL_BEGIN_ALLOW_THREADS +- if ((self->peer_cert = SSL_get_peer_certificate(self->ssl))) { +- X509_NAME_oneline(X509_get_subject_name(self->peer_cert), +- self->server, X509_NAME_MAXLEN); +- X509_NAME_oneline(X509_get_issuer_name(self->peer_cert), +- self->issuer, X509_NAME_MAXLEN); +- } ++ self->peer_cert = SSL_get_peer_certificate(self->ssl); + PySSL_END_ALLOW_THREADS ++ self->handshake_done = 1; + + Py_INCREF(Py_None); + return Py_None; +-} +- +-static PyObject * +-PySSL_server(PySSLObject *self) +-{ +- return PyString_FromString(self->server); +-} +- +-static PyObject * +-PySSL_issuer(PySSLObject *self) +-{ +- return PyString_FromString(self->issuer); ++ ++error: ++ Py_DECREF(sock); ++ return NULL; + } + + static PyObject * +@@ -639,8 +698,8 @@ + /* + fprintf(stderr, "RDN level %d, attribute %s: %s\n", + entry->set, +- PyString_AS_STRING(PyTuple_GET_ITEM(attr, 0)), +- PyString_AS_STRING(PyTuple_GET_ITEM(attr, 1))); ++ PyBytes_AS_STRING(PyTuple_GET_ITEM(attr, 0)), ++ PyBytes_AS_STRING(PyTuple_GET_ITEM(attr, 1))); + */ + if (attr == NULL) + goto fail1; +@@ -727,21 +786,24 @@ + /* now decode the altName */ + ext = X509_get_ext(certificate, i); + if(!(method = X509V3_EXT_get(ext))) { +- PyErr_SetString(PySSLErrorObject, +- ERRSTR("No method for internalizing subjectAltName!")); ++ PyErr_SetString ++ (PySSLErrorObject, ++ ERRSTR("No method for internalizing subjectAltName!")); + goto fail; + } + + p = ext->value->data; + if (method->it) +- names = (GENERAL_NAMES*) (ASN1_item_d2i(NULL, +- &p, +- ext->value->length, +- ASN1_ITEM_ptr(method->it))); ++ names = (GENERAL_NAMES*) ++ (ASN1_item_d2i(NULL, ++ &p, ++ ext->value->length, ++ ASN1_ITEM_ptr(method->it))); + else +- names = (GENERAL_NAMES*) (method->d2i(NULL, +- &p, +- ext->value->length)); ++ names = (GENERAL_NAMES*) ++ (method->d2i(NULL, ++ &p, ++ ext->value->length)); + + for(j = 0; j < sk_GENERAL_NAME_num(names); j++) { + /* get a rendering of each name in the set of names */ +@@ -888,7 +950,127 @@ + } + + static PyObject * +-_decode_certificate (X509 *certificate, int verbose) { ++_get_aia_uri(X509 *certificate, int nid) { ++ PyObject *lst = NULL, *ostr = NULL; ++ int i, result; ++ AUTHORITY_INFO_ACCESS *info; ++ ++ info = X509_get_ext_d2i(certificate, NID_info_access, NULL, NULL); ++ if ((info == NULL) || (sk_ACCESS_DESCRIPTION_num(info) == 0)) { ++ return Py_None; ++ } ++ ++ if ((lst = PyList_New(0)) == NULL) { ++ goto fail; ++ } ++ ++ for (i = 0; i < sk_ACCESS_DESCRIPTION_num(info); i++) { ++ ACCESS_DESCRIPTION *ad = sk_ACCESS_DESCRIPTION_value(info, i); ++ ASN1_IA5STRING *uri; ++ ++ if ((OBJ_obj2nid(ad->method) != nid) || ++ (ad->location->type != GEN_URI)) { ++ continue; ++ } ++ uri = ad->location->d.uniformResourceIdentifier; ++ ostr = PyUnicode_FromStringAndSize((char *)uri->data, ++ uri->length); ++ if (ostr == NULL) { ++ goto fail; ++ } ++ result = PyList_Append(lst, ostr); ++ Py_DECREF(ostr); ++ if (result < 0) { ++ goto fail; ++ } ++ } ++ AUTHORITY_INFO_ACCESS_free(info); ++ ++ /* convert to tuple or None */ ++ if (PyList_Size(lst) == 0) { ++ Py_DECREF(lst); ++ return Py_None; ++ } else { ++ PyObject *tup; ++ tup = PyList_AsTuple(lst); ++ Py_DECREF(lst); ++ return tup; ++ } ++ ++ fail: ++ AUTHORITY_INFO_ACCESS_free(info); ++ Py_XDECREF(lst); ++ return NULL; ++} ++ ++static PyObject * ++_get_crl_dp(X509 *certificate) { ++ STACK_OF(DIST_POINT) *dps; ++ int i, j, result; ++ PyObject *lst; ++ ++#if OPENSSL_VERSION_NUMBER < 0x10001000L ++ dps = X509_get_ext_d2i(certificate, NID_crl_distribution_points, ++ NULL, NULL); ++#else ++ /* Calls x509v3_cache_extensions and sets up crldp */ ++ X509_check_ca(certificate); ++ dps = certificate->crldp; ++#endif ++ ++ if (dps == NULL) { ++ return Py_None; ++ } ++ ++ if ((lst = PyList_New(0)) == NULL) { ++ return NULL; ++ } ++ ++ for (i=0; i < sk_DIST_POINT_num(dps); i++) { ++ DIST_POINT *dp; ++ STACK_OF(GENERAL_NAME) *gns; ++ ++ dp = sk_DIST_POINT_value(dps, i); ++ gns = dp->distpoint->name.fullname; ++ ++ for (j=0; j < sk_GENERAL_NAME_num(gns); j++) { ++ GENERAL_NAME *gn; ++ ASN1_IA5STRING *uri; ++ PyObject *ouri; ++ ++ gn = sk_GENERAL_NAME_value(gns, j); ++ if (gn->type != GEN_URI) { ++ continue; ++ } ++ uri = gn->d.uniformResourceIdentifier; ++ ouri = PyUnicode_FromStringAndSize((char *)uri->data, ++ uri->length); ++ if (ouri == NULL) { ++ Py_DECREF(lst); ++ return NULL; ++ } ++ result = PyList_Append(lst, ouri); ++ Py_DECREF(ouri); ++ if (result < 0) { ++ Py_DECREF(lst); ++ return NULL; ++ } ++ } ++ } ++ /* convert to tuple or None */ ++ if (PyList_Size(lst) == 0) { ++ Py_DECREF(lst); ++ return Py_None; ++ } else { ++ PyObject *tup; ++ tup = PyList_AsTuple(lst); ++ Py_DECREF(lst); ++ return tup; ++ } ++} ++ ++static PyObject * ++_decode_certificate(X509 *certificate) { + + PyObject *retval = NULL; + BIO *biobuf = NULL; +@@ -897,9 +1079,10 @@ + PyObject *issuer; + PyObject *version; + PyObject *sn_obj; ++ PyObject *obj; + ASN1_INTEGER *serialNumber; + char buf[2048]; +- int len; ++ int len, result; + ASN1_TIME *notBefore, *notAfter; + PyObject *pnotBefore, *pnotAfter; + +@@ -917,65 +1100,62 @@ + } + Py_DECREF(peer); + +- if (verbose) { +- issuer = _create_tuple_for_X509_NAME( +- X509_get_issuer_name(certificate)); +- if (issuer == NULL) +- goto fail0; +- if (PyDict_SetItemString(retval, (const char *)"issuer", issuer) < 0) { +- Py_DECREF(issuer); +- goto fail0; +- } ++ issuer = _create_tuple_for_X509_NAME( ++ X509_get_issuer_name(certificate)); ++ if (issuer == NULL) ++ goto fail0; ++ if (PyDict_SetItemString(retval, (const char *)"issuer", issuer) < 0) { + Py_DECREF(issuer); +- +- version = PyInt_FromLong(X509_get_version(certificate) + 1); +- if (PyDict_SetItemString(retval, "version", version) < 0) { +- Py_DECREF(version); +- goto fail0; +- } ++ goto fail0; ++ } ++ Py_DECREF(issuer); ++ ++ version = PyLong_FromLong(X509_get_version(certificate) + 1); ++ if (version == NULL) ++ goto fail0; ++ if (PyDict_SetItemString(retval, "version", version) < 0) { + Py_DECREF(version); ++ goto fail0; + } ++ Py_DECREF(version); + + /* get a memory buffer */ + biobuf = BIO_new(BIO_s_mem()); + +- if (verbose) { +- +- (void) BIO_reset(biobuf); +- serialNumber = X509_get_serialNumber(certificate); +- /* should not exceed 20 octets, 160 bits, so buf is big enough */ +- i2a_ASN1_INTEGER(biobuf, serialNumber); +- len = BIO_gets(biobuf, buf, sizeof(buf)-1); +- if (len < 0) { +- _setSSLError(NULL, 0, __FILE__, __LINE__); +- goto fail1; +- } +- sn_obj = PyString_FromStringAndSize(buf, len); +- if (sn_obj == NULL) +- goto fail1; +- if (PyDict_SetItemString(retval, "serialNumber", sn_obj) < 0) { +- Py_DECREF(sn_obj); +- goto fail1; +- } ++ (void) BIO_reset(biobuf); ++ serialNumber = X509_get_serialNumber(certificate); ++ /* should not exceed 20 octets, 160 bits, so buf is big enough */ ++ i2a_ASN1_INTEGER(biobuf, serialNumber); ++ len = BIO_gets(biobuf, buf, sizeof(buf)-1); ++ if (len < 0) { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ goto fail1; ++ } ++ sn_obj = PyUnicode_FromStringAndSize(buf, len); ++ if (sn_obj == NULL) ++ goto fail1; ++ if (PyDict_SetItemString(retval, "serialNumber", sn_obj) < 0) { + Py_DECREF(sn_obj); +- +- (void) BIO_reset(biobuf); +- notBefore = X509_get_notBefore(certificate); +- ASN1_TIME_print(biobuf, notBefore); +- len = BIO_gets(biobuf, buf, sizeof(buf)-1); +- if (len < 0) { +- _setSSLError(NULL, 0, __FILE__, __LINE__); +- goto fail1; +- } +- pnotBefore = PyString_FromStringAndSize(buf, len); +- if (pnotBefore == NULL) +- goto fail1; +- if (PyDict_SetItemString(retval, "notBefore", pnotBefore) < 0) { +- Py_DECREF(pnotBefore); +- goto fail1; +- } ++ goto fail1; ++ } ++ Py_DECREF(sn_obj); ++ ++ (void) BIO_reset(biobuf); ++ notBefore = X509_get_notBefore(certificate); ++ ASN1_TIME_print(biobuf, notBefore); ++ len = BIO_gets(biobuf, buf, sizeof(buf)-1); ++ if (len < 0) { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ goto fail1; ++ } ++ pnotBefore = PyUnicode_FromStringAndSize(buf, len); ++ if (pnotBefore == NULL) ++ goto fail1; ++ if (PyDict_SetItemString(retval, "notBefore", pnotBefore) < 0) { + Py_DECREF(pnotBefore); ++ goto fail1; + } ++ Py_DECREF(pnotBefore); + + (void) BIO_reset(biobuf); + notAfter = X509_get_notAfter(certificate); +@@ -1008,6 +1188,41 @@ + Py_DECREF(peer_alt_names); + } + ++ /* Authority Information Access: OCSP URIs */ ++ obj = _get_aia_uri(certificate, NID_ad_OCSP); ++ if (obj == NULL) { ++ goto fail1; ++ } else if (obj != Py_None) { ++ result = PyDict_SetItemString(retval, "OCSP", obj); ++ Py_DECREF(obj); ++ if (result < 0) { ++ goto fail1; ++ } ++ } ++ ++ obj = _get_aia_uri(certificate, NID_ad_ca_issuers); ++ if (obj == NULL) { ++ goto fail1; ++ } else if (obj != Py_None) { ++ result = PyDict_SetItemString(retval, "caIssuers", obj); ++ Py_DECREF(obj); ++ if (result < 0) { ++ goto fail1; ++ } ++ } ++ ++ /* CDP (CRL distribution points) */ ++ obj = _get_crl_dp(certificate); ++ if (obj == NULL) { ++ goto fail1; ++ } else if (obj != Py_None) { ++ result = PyDict_SetItemString(retval, "crlDistributionPoints", obj); ++ Py_DECREF(obj); ++ if (result < 0) { ++ goto fail1; ++ } ++ } ++ + BIO_free(biobuf); + return retval; + +@@ -1019,6 +1234,24 @@ + return NULL; + } + ++static PyObject * ++_certificate_to_der(X509 *certificate) ++{ ++ unsigned char *bytes_buf = NULL; ++ int len; ++ PyObject *retval; ++ ++ bytes_buf = NULL; ++ len = i2d_X509(certificate, &bytes_buf); ++ if (len < 0) { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ return NULL; ++ } ++ /* this is actually an immutable bytes sequence */ ++ retval = PyBytes_FromStringAndSize((const char *) bytes_buf, len); ++ OPENSSL_free(bytes_buf); ++ return retval; ++} + + static PyObject * + PySSL_test_decode_certificate (PyObject *mod, PyObject *args) { +@@ -1027,28 +1260,30 @@ + char *filename = NULL; + X509 *x=NULL; + BIO *cert; +- int verbose = 1; +- +- if (!PyArg_ParseTuple(args, "s|i:test_decode_certificate", &filename, &verbose)) ++ ++ if (!PyArg_ParseTuple(args, "s:test_decode_certificate", &filename)) + return NULL; + + if ((cert=BIO_new(BIO_s_file())) == NULL) { +- PyErr_SetString(PySSLErrorObject, "Can't malloc memory to read file"); ++ PyErr_SetString(PySSLErrorObject, ++ "Can't malloc memory to read file"); + goto fail0; + } + + if (BIO_read_filename(cert,filename) <= 0) { +- PyErr_SetString(PySSLErrorObject, "Can't open file"); ++ PyErr_SetString(PySSLErrorObject, ++ "Can't open file"); + goto fail0; + } + + x = PEM_read_bio_X509_AUX(cert,NULL, NULL, NULL); + if (x == NULL) { +- PyErr_SetString(PySSLErrorObject, "Error decoding PEM-encoded file"); ++ PyErr_SetString(PySSLErrorObject, ++ "Error decoding PEM-encoded file"); + goto fail0; + } + +- retval = _decode_certificate(x, verbose); ++ retval = _decode_certificate(x); + X509_free(x); + + fail0: +@@ -1059,10 +1294,8 @@ + + + static PyObject * +-PySSL_peercert(PySSLObject *self, PyObject *args) ++PySSL_peercert(PySSLSocket *self, PyObject *args) + { +- PyObject *retval = NULL; +- int len; + int verification; + PyObject *binary_mode = Py_None; + int b; +@@ -1070,6 +1303,11 @@ + if (!PyArg_ParseTuple(args, "|O:peer_certificate", &binary_mode)) + return NULL; + ++ if (!self->handshake_done) { ++ PyErr_SetString(PyExc_ValueError, ++ "handshake not done yet"); ++ return NULL; ++ } + if (!self->peer_cert) + Py_RETURN_NONE; + +@@ -1078,26 +1316,13 @@ + return NULL; + if (b) { + /* return cert in DER-encoded format */ +- +- unsigned char *bytes_buf = NULL; +- +- bytes_buf = NULL; +- len = i2d_X509(self->peer_cert, &bytes_buf); +- if (len < 0) { +- PySSL_SetError(self, len, __FILE__, __LINE__); +- return NULL; +- } +- retval = PyString_FromStringAndSize((const char *) bytes_buf, len); +- OPENSSL_free(bytes_buf); +- return retval; +- ++ return _certificate_to_der(self->peer_cert); + } else { +- +- verification = SSL_CTX_get_verify_mode(self->ctx); ++ verification = SSL_CTX_get_verify_mode(SSL_get_SSL_CTX(self->ssl)); + if ((verification & SSL_VERIFY_PEER) == 0) + return PyDict_New(); + else +- return _decode_certificate (self->peer_cert, 0); ++ return _decode_certificate(self->peer_cert); + } + } + +@@ -1113,7 +1338,7 @@ + peer certificate, or None if no certificate was provided. This will\n\ + return the certificate even if it wasn't validated."); + +-static PyObject *PySSL_cipher (PySSLObject *self) { ++static PyObject *PySSL_cipher (PySSLSocket *self) { + + PyObject *retval, *v; + const SSL_CIPHER *current; +@@ -1140,7 +1365,7 @@ + goto fail0; + PyTuple_SET_ITEM(retval, 0, v); + } +- cipher_protocol = SSL_CIPHER_get_version(current); ++ cipher_protocol = (char *) SSL_CIPHER_get_version(current); + if (cipher_protocol == NULL) { + Py_INCREF(Py_None); + PyTuple_SET_ITEM(retval, 1, Py_None); +@@ -1161,15 +1386,97 @@ + return NULL; + } + +-static void PySSL_dealloc(PySSLObject *self) ++static PyObject *PySSL_version(PySSLSocket *self) ++{ ++ const char *version; ++ ++ if (self->ssl == NULL) ++ Py_RETURN_NONE; ++ version = SSL_get_version(self->ssl); ++ if (!strcmp(version, "unknown")) ++ Py_RETURN_NONE; ++ return PyUnicode_FromString(version); ++} ++ ++#ifdef OPENSSL_NPN_NEGOTIATED ++static PyObject *PySSL_selected_npn_protocol(PySSLSocket *self) { ++ const unsigned char *out; ++ unsigned int outlen; ++ ++ SSL_get0_next_proto_negotiated(self->ssl, ++ &out, &outlen); ++ ++ if (out == NULL) ++ Py_RETURN_NONE; ++ return PyUnicode_FromStringAndSize((char *) out, outlen); ++} ++#endif ++ ++static PyObject *PySSL_compression(PySSLSocket *self) { ++#ifdef OPENSSL_NO_COMP ++ Py_RETURN_NONE; ++#else ++ const COMP_METHOD *comp_method; ++ const char *short_name; ++ ++ if (self->ssl == NULL) ++ Py_RETURN_NONE; ++ comp_method = SSL_get_current_compression(self->ssl); ++ if (comp_method == NULL || comp_method->type == NID_undef) ++ Py_RETURN_NONE; ++ short_name = OBJ_nid2sn(comp_method->type); ++ if (short_name == NULL) ++ Py_RETURN_NONE; ++ return PyBytes_FromString(short_name); ++#endif ++} ++ ++static PySSLContext *PySSL_get_context(PySSLSocket *self, void *closure) { ++ Py_INCREF(self->ctx); ++ return self->ctx; ++} ++ ++static int PySSL_set_context(PySSLSocket *self, PyObject *value, ++ void *closure) { ++ ++ if (PyObject_TypeCheck(value, &PySSLContext_Type)) { ++#if !HAVE_SNI ++ PyErr_SetString(PyExc_NotImplementedError, "setting a socket's " ++ "context is not supported by your OpenSSL library"); ++ return -1; ++#else ++ Py_INCREF(value); ++ Py_DECREF(self->ctx); ++ self->ctx = (PySSLContext *) value; ++ SSL_set_SSL_CTX(self->ssl, self->ctx->ctx); ++#endif ++ } else { ++ PyErr_SetString(PyExc_TypeError, "The value must be a SSLContext"); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++PyDoc_STRVAR(PySSL_set_context_doc, ++"_setter_context(ctx)\n\ ++\ ++This changes the context associated with the SSLSocket. This is typically\n\ ++used from within a callback function set by the set_servername_callback\n\ ++on the SSLContext to change the certificate information associated with the\n\ ++SSLSocket before the cryptographic exchange handshake messages\n"); ++ ++ ++ ++static void PySSL_dealloc(PySSLSocket *self) + { + if (self->peer_cert) /* Possible not to have one? */ + X509_free (self->peer_cert); + if (self->ssl) + SSL_free(self->ssl); +- if (self->ctx) +- SSL_CTX_free(self->ctx); + Py_XDECREF(self->Socket); ++ Py_XDECREF(self->ssl_sock); ++ Py_XDECREF(self->ctx); + PyObject_Del(self); + } + +@@ -1241,16 +1548,21 @@ + return rc == 0 ? SOCKET_HAS_TIMED_OUT : SOCKET_OPERATION_OK; + } + +-static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args) ++static PyObject *PySSL_SSLwrite(PySSLSocket *self, PyObject *args) + { + Py_buffer buf; + int len; + int sockstate; + int err; + int nonblocking; +- +- if (!PyArg_ParseTuple(args, "s*:write", &buf)) ++ PySocketSockObject *sock = self->Socket; ++ ++ Py_INCREF(sock); ++ ++ if (!PyArg_ParseTuple(args, "s*:write", &buf)) { ++ Py_DECREF(sock); + return NULL; ++ } + + if (buf.len > INT_MAX) { + PyErr_Format(PyExc_OverflowError, +@@ -1259,11 +1571,11 @@ + } + + /* just in case the blocking state of the socket has been changed */ +- nonblocking = (self->Socket->sock_timeout >= 0.0); ++ nonblocking = (sock->sock_timeout >= 0.0); + BIO_set_nbio(SSL_get_rbio(self->ssl), nonblocking); + BIO_set_nbio(SSL_get_wbio(self->ssl), nonblocking); + +- sockstate = check_socket_and_wait_for_timeout(self->Socket, 1); ++ sockstate = check_socket_and_wait_for_timeout(sock, 1); + if (sockstate == SOCKET_HAS_TIMED_OUT) { + PyErr_SetString(PySSLErrorObject, + "The write operation timed out"); +@@ -1286,9 +1598,9 @@ + goto error; + } + if (err == SSL_ERROR_WANT_READ) { +- sockstate = check_socket_and_wait_for_timeout(self->Socket, 0); ++ sockstate = check_socket_and_wait_for_timeout(sock, 0); + } else if (err == SSL_ERROR_WANT_WRITE) { +- sockstate = check_socket_and_wait_for_timeout(self->Socket, 1); ++ sockstate = check_socket_and_wait_for_timeout(sock, 1); + } else { + sockstate = SOCKET_OPERATION_OK; + } +@@ -1305,6 +1617,7 @@ + } + } while (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE); + ++ Py_DECREF(sock); + PyBuffer_Release(&buf); + if (len > 0) + return PyInt_FromLong(len); +@@ -1312,6 +1625,7 @@ + return PySSL_SetError(self, len, __FILE__, __LINE__); + + error: ++ Py_DECREF(sock); + PyBuffer_Release(&buf); + return NULL; + } +@@ -1322,7 +1636,7 @@ + Writes the string s into the SSL object. Returns the number\n\ + of bytes written."); + +-static PyObject *PySSL_SSLpending(PySSLObject *self) ++static PyObject *PySSL_SSLpending(PySSLSocket *self) + { + int count = 0; + +@@ -1341,23 +1655,46 @@ + Returns the number of already decrypted bytes available for read,\n\ + pending on the connection.\n"); + +-static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args) ++static PyObject *PySSL_SSLread(PySSLSocket *self, PyObject *args) + { +- PyObject *buf; +- int count = 0; +- int len = 1024; ++ PyObject *dest = NULL; ++ Py_buffer buf; ++ char *mem; ++ int len, count; ++ int buf_passed = 0; + int sockstate; + int err; + int nonblocking; +- +- if (!PyArg_ParseTuple(args, "|i:read", &len)) +- return NULL; +- +- if (!(buf = PyString_FromStringAndSize((char *) 0, len))) +- return NULL; ++ PySocketSockObject *sock = self->Socket; ++ ++ Py_INCREF(sock); ++ ++ buf.obj = NULL; ++ buf.buf = NULL; ++ if (!PyArg_ParseTuple(args, "i|w*:read", &len, &buf)) ++ goto error; ++ ++ if ((buf.buf == NULL) && (buf.obj == NULL)) { ++ dest = PyBytes_FromStringAndSize(NULL, len); ++ if (dest == NULL) ++ goto error; ++ mem = PyBytes_AS_STRING(dest); ++ } ++ else { ++ buf_passed = 1; ++ mem = buf.buf; ++ if (len <= 0 || len > buf.len) { ++ len = (int) buf.len; ++ if (buf.len != len) { ++ PyErr_SetString(PyExc_OverflowError, ++ "maximum length can't fit in a C 'int'"); ++ goto error; ++ } ++ } ++ } + + /* just in case the blocking state of the socket has been changed */ +- nonblocking = (self->Socket->sock_timeout >= 0.0); ++ nonblocking = (sock->sock_timeout >= 0.0); + BIO_set_nbio(SSL_get_rbio(self->ssl), nonblocking); + BIO_set_nbio(SSL_get_wbio(self->ssl), nonblocking); + +@@ -1367,70 +1704,71 @@ + PySSL_END_ALLOW_THREADS + + if (!count) { +- sockstate = check_socket_and_wait_for_timeout(self->Socket, 0); ++ sockstate = check_socket_and_wait_for_timeout(sock, 0); + if (sockstate == SOCKET_HAS_TIMED_OUT) { + PyErr_SetString(PySSLErrorObject, + "The read operation timed out"); +- Py_DECREF(buf); +- return NULL; ++ goto error; + } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) { + PyErr_SetString(PySSLErrorObject, + "Underlying socket too large for select()."); +- Py_DECREF(buf); +- return NULL; ++ goto error; + } else if (sockstate == SOCKET_HAS_BEEN_CLOSED) { +- if (SSL_get_shutdown(self->ssl) != +- SSL_RECEIVED_SHUTDOWN) +- { +- Py_DECREF(buf); +- PyErr_SetString(PySSLErrorObject, +- "Socket closed without SSL shutdown handshake"); +- return NULL; +- } else { +- /* should contain a zero-length string */ +- _PyString_Resize(&buf, 0); +- return buf; +- } ++ count = 0; ++ goto done; + } + } + do { + PySSL_BEGIN_ALLOW_THREADS +- count = SSL_read(self->ssl, PyString_AsString(buf), len); ++ count = SSL_read(self->ssl, mem, len); + err = SSL_get_error(self->ssl, count); + PySSL_END_ALLOW_THREADS +- if(PyErr_CheckSignals()) { +- Py_DECREF(buf); +- return NULL; +- } ++ if (PyErr_CheckSignals()) ++ goto error; + if (err == SSL_ERROR_WANT_READ) { +- sockstate = check_socket_and_wait_for_timeout(self->Socket, 0); ++ sockstate = check_socket_and_wait_for_timeout(sock, 0); + } else if (err == SSL_ERROR_WANT_WRITE) { +- sockstate = check_socket_and_wait_for_timeout(self->Socket, 1); ++ sockstate = check_socket_and_wait_for_timeout(sock, 1); + } else if ((err == SSL_ERROR_ZERO_RETURN) && + (SSL_get_shutdown(self->ssl) == + SSL_RECEIVED_SHUTDOWN)) + { +- _PyString_Resize(&buf, 0); +- return buf; ++ count = 0; ++ goto done; + } else { + sockstate = SOCKET_OPERATION_OK; + } + if (sockstate == SOCKET_HAS_TIMED_OUT) { + PyErr_SetString(PySSLErrorObject, + "The read operation timed out"); +- Py_DECREF(buf); +- return NULL; ++ goto error; + } else if (sockstate == SOCKET_IS_NONBLOCKING) { + break; + } + } while (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE); + if (count <= 0) { +- Py_DECREF(buf); +- return PySSL_SetError(self, count, __FILE__, __LINE__); ++ PySSL_SetError(self, count, __FILE__, __LINE__); ++ goto error; + } +- if (count != len) +- _PyString_Resize(&buf, count); +- return buf; ++ ++done: ++ Py_DECREF(sock); ++ if (!buf_passed) { ++ _PyBytes_Resize(&dest, count); ++ return dest; ++ } ++ else { ++ PyBuffer_Release(&buf); ++ return PyLong_FromLong(count); ++ } ++ ++error: ++ Py_DECREF(sock); ++ if (!buf_passed) ++ Py_XDECREF(dest); ++ else ++ PyBuffer_Release(&buf); ++ return NULL; + } + + PyDoc_STRVAR(PySSL_SSLread_doc, +@@ -1438,20 +1776,22 @@ + \n\ + Read up to len bytes from the SSL socket."); + +-static PyObject *PySSL_SSLshutdown(PySSLObject *self) ++static PyObject *PySSL_SSLshutdown(PySSLSocket *self) + { + int err, ssl_err, sockstate, nonblocking; + int zeros = 0; ++ PySocketSockObject *sock = self->Socket; + + /* Guard against closed socket */ +- if (self->Socket->sock_fd < 0) { +- PyErr_SetString(PySSLErrorObject, +- "Underlying socket has been closed."); ++ if (sock->sock_fd < 0) { ++ _setSSLError("Underlying socket connection gone", ++ PY_SSL_ERROR_NO_SOCKET, __FILE__, __LINE__); + return NULL; + } ++ Py_INCREF(sock); + + /* Just in case the blocking state of the socket has been changed */ +- nonblocking = (self->Socket->sock_timeout >= 0.0); ++ nonblocking = (sock->sock_timeout >= 0.0); + BIO_set_nbio(SSL_get_rbio(self->ssl), nonblocking); + BIO_set_nbio(SSL_get_wbio(self->ssl), nonblocking); + +@@ -1486,9 +1826,9 @@ + /* Possibly retry shutdown until timeout or failure */ + ssl_err = SSL_get_error(self->ssl, err); + if (ssl_err == SSL_ERROR_WANT_READ) +- sockstate = check_socket_and_wait_for_timeout(self->Socket, 0); ++ sockstate = check_socket_and_wait_for_timeout(sock, 0); + else if (ssl_err == SSL_ERROR_WANT_WRITE) +- sockstate = check_socket_and_wait_for_timeout(self->Socket, 1); ++ sockstate = check_socket_and_wait_for_timeout(sock, 1); + else + break; + if (sockstate == SOCKET_HAS_TIMED_OUT) { +@@ -1498,24 +1838,29 @@ + else + PyErr_SetString(PySSLErrorObject, + "The write operation timed out"); +- return NULL; ++ goto error; + } + else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) { + PyErr_SetString(PySSLErrorObject, + "Underlying socket too large for select()."); +- return NULL; ++ goto error; + } + else if (sockstate != SOCKET_OPERATION_OK) + /* Retain the SSL error code */ + break; + } + +- if (err < 0) ++ if (err < 0) { ++ Py_DECREF(sock); + return PySSL_SetError(self, err, __FILE__, __LINE__); +- else { +- Py_INCREF(self->Socket); +- return (PyObject *) (self->Socket); + } ++ else ++ /* It's already INCREF'ed */ ++ return (PyObject *) sock; ++ ++error: ++ Py_DECREF(sock); ++ return NULL; + } + + PyDoc_STRVAR(PySSL_SSLshutdown_doc, +@@ -1524,6 +1869,47 @@ + Does the SSL shutdown handshake with the remote end, and returns\n\ + the underlying socket object."); + ++#if HAVE_OPENSSL_FINISHED ++static PyObject * ++PySSL_tls_unique_cb(PySSLSocket *self) ++{ ++ PyObject *retval = NULL; ++ char buf[PySSL_CB_MAXLEN]; ++ size_t len; ++ ++ if (SSL_session_reused(self->ssl) ^ !self->socket_type) { ++ /* if session is resumed XOR we are the client */ ++ len = SSL_get_finished(self->ssl, buf, PySSL_CB_MAXLEN); ++ } ++ else { ++ /* if a new session XOR we are the server */ ++ len = SSL_get_peer_finished(self->ssl, buf, PySSL_CB_MAXLEN); ++ } ++ ++ /* It cannot be negative in current OpenSSL version as of July 2011 */ ++ if (len == 0) ++ Py_RETURN_NONE; ++ ++ retval = PyBytes_FromStringAndSize(buf, len); ++ ++ return retval; ++} ++ ++PyDoc_STRVAR(PySSL_tls_unique_cb_doc, ++"tls_unique_cb() -> bytes\n\ ++\n\ ++Returns the 'tls-unique' channel binding data, as defined by RFC 5929.\n\ ++\n\ ++If the TLS handshake is not yet complete, None is returned"); ++ ++#endif /* HAVE_OPENSSL_FINISHED */ ++ ++static PyGetSetDef ssl_getsetlist[] = { ++ {"context", (getter) PySSL_get_context, ++ (setter) PySSL_set_context, PySSL_set_context_doc}, ++ {NULL}, /* sentinel */ ++}; ++ + static PyMethodDef PySSLMethods[] = { + {"do_handshake", (PyCFunction)PySSL_SSLdo_handshake, METH_NOARGS}, + {"write", (PyCFunction)PySSL_SSLwrite, METH_VARARGS, +@@ -1532,39 +1918,1348 @@ + PySSL_SSLread_doc}, + {"pending", (PyCFunction)PySSL_SSLpending, METH_NOARGS, + PySSL_SSLpending_doc}, +- {"server", (PyCFunction)PySSL_server, METH_NOARGS}, +- {"issuer", (PyCFunction)PySSL_issuer, METH_NOARGS}, + {"peer_certificate", (PyCFunction)PySSL_peercert, METH_VARARGS, + PySSL_peercert_doc}, + {"cipher", (PyCFunction)PySSL_cipher, METH_NOARGS}, ++ {"version", (PyCFunction)PySSL_version, METH_NOARGS}, ++#ifdef OPENSSL_NPN_NEGOTIATED ++ {"selected_npn_protocol", (PyCFunction)PySSL_selected_npn_protocol, METH_NOARGS}, ++#endif ++ {"compression", (PyCFunction)PySSL_compression, METH_NOARGS}, + {"shutdown", (PyCFunction)PySSL_SSLshutdown, METH_NOARGS, + PySSL_SSLshutdown_doc}, ++#if HAVE_OPENSSL_FINISHED ++ {"tls_unique_cb", (PyCFunction)PySSL_tls_unique_cb, METH_NOARGS, ++ PySSL_tls_unique_cb_doc}, ++#endif + {NULL, NULL} + }; + +-static PyObject *PySSL_getattr(PySSLObject *self, char *name) +-{ +- return Py_FindMethod(PySSLMethods, (PyObject *)self, name); +-} +- +-static PyTypeObject PySSL_Type = { ++static PyTypeObject PySSLSocket_Type = { + PyVarObject_HEAD_INIT(NULL, 0) +- "ssl.SSLContext", /*tp_name*/ +- sizeof(PySSLObject), /*tp_basicsize*/ ++ "_ssl._SSLSocket", /*tp_name*/ ++ sizeof(PySSLSocket), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + /* methods */ + (destructor)PySSL_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ +- (getattrfunc)PySSL_getattr, /*tp_getattr*/ ++ 0, /*tp_getattr*/ + 0, /*tp_setattr*/ +- 0, /*tp_compare*/ ++ 0, /*tp_reserved*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash*/ ++ 0, /*tp_call*/ ++ 0, /*tp_str*/ ++ 0, /*tp_getattro*/ ++ 0, /*tp_setattro*/ ++ 0, /*tp_as_buffer*/ ++ Py_TPFLAGS_DEFAULT, /*tp_flags*/ ++ 0, /*tp_doc*/ ++ 0, /*tp_traverse*/ ++ 0, /*tp_clear*/ ++ 0, /*tp_richcompare*/ ++ 0, /*tp_weaklistoffset*/ ++ 0, /*tp_iter*/ ++ 0, /*tp_iternext*/ ++ PySSLMethods, /*tp_methods*/ ++ 0, /*tp_members*/ ++ ssl_getsetlist, /*tp_getset*/ + }; + ++ ++/* ++ * _SSLContext objects ++ */ ++ ++static PyObject * ++context_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ++{ ++ char *kwlist[] = {"protocol", NULL}; ++ PySSLContext *self; ++ int proto_version = PY_SSL_VERSION_SSL23; ++ long options; ++ SSL_CTX *ctx = NULL; ++ ++ if (!PyArg_ParseTupleAndKeywords( ++ args, kwds, "i:_SSLContext", kwlist, ++ &proto_version)) ++ return NULL; ++ ++ PySSL_BEGIN_ALLOW_THREADS ++ if (proto_version == PY_SSL_VERSION_TLS1) ++ ctx = SSL_CTX_new(TLSv1_method()); ++#if HAVE_TLSv1_2 ++ else if (proto_version == PY_SSL_VERSION_TLS1_1) ++ ctx = SSL_CTX_new(TLSv1_1_method()); ++ else if (proto_version == PY_SSL_VERSION_TLS1_2) ++ ctx = SSL_CTX_new(TLSv1_2_method()); ++#endif ++ else if (proto_version == PY_SSL_VERSION_SSL3) ++ ctx = SSL_CTX_new(SSLv3_method()); ++#ifndef OPENSSL_NO_SSL2 ++ else if (proto_version == PY_SSL_VERSION_SSL2) ++ ctx = SSL_CTX_new(SSLv2_method()); ++#endif ++ else if (proto_version == PY_SSL_VERSION_SSL23) ++ ctx = SSL_CTX_new(SSLv23_method()); ++ else ++ proto_version = -1; ++ PySSL_END_ALLOW_THREADS ++ ++ if (proto_version == -1) { ++ PyErr_SetString(PyExc_ValueError, ++ "invalid protocol version"); ++ return NULL; ++ } ++ if (ctx == NULL) { ++ PyErr_SetString(PySSLErrorObject, ++ "failed to allocate SSL context"); ++ return NULL; ++ } ++ ++ assert(type != NULL && type->tp_alloc != NULL); ++ self = (PySSLContext *) type->tp_alloc(type, 0); ++ if (self == NULL) { ++ SSL_CTX_free(ctx); ++ return NULL; ++ } ++ self->ctx = ctx; ++#ifdef OPENSSL_NPN_NEGOTIATED ++ self->npn_protocols = NULL; ++#endif ++#ifndef OPENSSL_NO_TLSEXT ++ self->set_hostname = NULL; ++#endif ++ /* Don't check host name by default */ ++ self->check_hostname = 0; ++ /* Defaults */ ++ SSL_CTX_set_verify(self->ctx, SSL_VERIFY_NONE, NULL); ++ options = SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; ++ if (proto_version != PY_SSL_VERSION_SSL2) ++ options |= SSL_OP_NO_SSLv2; ++ SSL_CTX_set_options(self->ctx, options); ++ ++#ifndef OPENSSL_NO_ECDH ++ /* Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use ++ prime256v1 by default. This is Apache mod_ssl's initialization ++ policy, so we should be safe. */ ++#if defined(SSL_CTX_set_ecdh_auto) ++ SSL_CTX_set_ecdh_auto(self->ctx, 1); ++#else ++ { ++ EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); ++ SSL_CTX_set_tmp_ecdh(self->ctx, key); ++ EC_KEY_free(key); ++ } ++#endif ++#endif ++ ++#define SID_CTX "Python" ++ SSL_CTX_set_session_id_context(self->ctx, (const unsigned char *) SID_CTX, ++ sizeof(SID_CTX)); ++#undef SID_CTX ++ ++ return (PyObject *)self; ++} ++ ++static int ++context_traverse(PySSLContext *self, visitproc visit, void *arg) ++{ ++#ifndef OPENSSL_NO_TLSEXT ++ Py_VISIT(self->set_hostname); ++#endif ++ return 0; ++} ++ ++static int ++context_clear(PySSLContext *self) ++{ ++#ifndef OPENSSL_NO_TLSEXT ++ Py_CLEAR(self->set_hostname); ++#endif ++ return 0; ++} ++ ++static void ++context_dealloc(PySSLContext *self) ++{ ++ context_clear(self); ++ SSL_CTX_free(self->ctx); ++#ifdef OPENSSL_NPN_NEGOTIATED ++ PyMem_Free(self->npn_protocols); ++#endif ++ Py_TYPE(self)->tp_free(self); ++} ++ ++static PyObject * ++set_ciphers(PySSLContext *self, PyObject *args) ++{ ++ int ret; ++ const char *cipherlist; ++ ++ if (!PyArg_ParseTuple(args, "s:set_ciphers", &cipherlist)) ++ return NULL; ++ ret = SSL_CTX_set_cipher_list(self->ctx, cipherlist); ++ if (ret == 0) { ++ /* Clearing the error queue is necessary on some OpenSSL versions, ++ otherwise the error will be reported again when another SSL call ++ is done. */ ++ ERR_clear_error(); ++ PyErr_SetString(PySSLErrorObject, ++ "No cipher can be selected."); ++ return NULL; ++ } ++ Py_RETURN_NONE; ++} ++ ++#ifdef OPENSSL_NPN_NEGOTIATED ++/* this callback gets passed to SSL_CTX_set_next_protos_advertise_cb */ ++static int ++_advertiseNPN_cb(SSL *s, ++ const unsigned char **data, unsigned int *len, ++ void *args) ++{ ++ PySSLContext *ssl_ctx = (PySSLContext *) args; ++ ++ if (ssl_ctx->npn_protocols == NULL) { ++ *data = (unsigned char *) ""; ++ *len = 0; ++ } else { ++ *data = (unsigned char *) ssl_ctx->npn_protocols; ++ *len = ssl_ctx->npn_protocols_len; ++ } ++ ++ return SSL_TLSEXT_ERR_OK; ++} ++/* this callback gets passed to SSL_CTX_set_next_proto_select_cb */ ++static int ++_selectNPN_cb(SSL *s, ++ unsigned char **out, unsigned char *outlen, ++ const unsigned char *server, unsigned int server_len, ++ void *args) ++{ ++ PySSLContext *ssl_ctx = (PySSLContext *) args; ++ ++ unsigned char *client = (unsigned char *) ssl_ctx->npn_protocols; ++ int client_len; ++ ++ if (client == NULL) { ++ client = (unsigned char *) ""; ++ client_len = 0; ++ } else { ++ client_len = ssl_ctx->npn_protocols_len; ++ } ++ ++ SSL_select_next_proto(out, outlen, ++ server, server_len, ++ client, client_len); ++ ++ return SSL_TLSEXT_ERR_OK; ++} ++#endif ++ ++static PyObject * ++_set_npn_protocols(PySSLContext *self, PyObject *args) ++{ ++#ifdef OPENSSL_NPN_NEGOTIATED ++ Py_buffer protos; ++ ++ if (!PyArg_ParseTuple(args, "s*:set_npn_protocols", &protos)) ++ return NULL; ++ ++ if (self->npn_protocols != NULL) { ++ PyMem_Free(self->npn_protocols); ++ } ++ ++ self->npn_protocols = PyMem_Malloc(protos.len); ++ if (self->npn_protocols == NULL) { ++ PyBuffer_Release(&protos); ++ return PyErr_NoMemory(); ++ } ++ memcpy(self->npn_protocols, protos.buf, protos.len); ++ self->npn_protocols_len = (int) protos.len; ++ ++ /* set both server and client callbacks, because the context can ++ * be used to create both types of sockets */ ++ SSL_CTX_set_next_protos_advertised_cb(self->ctx, ++ _advertiseNPN_cb, ++ self); ++ SSL_CTX_set_next_proto_select_cb(self->ctx, ++ _selectNPN_cb, ++ self); ++ ++ PyBuffer_Release(&protos); ++ Py_RETURN_NONE; ++#else ++ PyErr_SetString(PyExc_NotImplementedError, ++ "The NPN extension requires OpenSSL 1.0.1 or later."); ++ return NULL; ++#endif ++} ++ ++static PyObject * ++get_verify_mode(PySSLContext *self, void *c) ++{ ++ switch (SSL_CTX_get_verify_mode(self->ctx)) { ++ case SSL_VERIFY_NONE: ++ return PyLong_FromLong(PY_SSL_CERT_NONE); ++ case SSL_VERIFY_PEER: ++ return PyLong_FromLong(PY_SSL_CERT_OPTIONAL); ++ case SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT: ++ return PyLong_FromLong(PY_SSL_CERT_REQUIRED); ++ } ++ PyErr_SetString(PySSLErrorObject, ++ "invalid return value from SSL_CTX_get_verify_mode"); ++ return NULL; ++} ++ ++static int ++set_verify_mode(PySSLContext *self, PyObject *arg, void *c) ++{ ++ int n, mode; ++ if (!PyArg_Parse(arg, "i", &n)) ++ return -1; ++ if (n == PY_SSL_CERT_NONE) ++ mode = SSL_VERIFY_NONE; ++ else if (n == PY_SSL_CERT_OPTIONAL) ++ mode = SSL_VERIFY_PEER; ++ else if (n == PY_SSL_CERT_REQUIRED) ++ mode = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT; ++ else { ++ PyErr_SetString(PyExc_ValueError, ++ "invalid value for verify_mode"); ++ return -1; ++ } ++ if (mode == SSL_VERIFY_NONE && self->check_hostname) { ++ PyErr_SetString(PyExc_ValueError, ++ "Cannot set verify_mode to CERT_NONE when " ++ "check_hostname is enabled."); ++ return -1; ++ } ++ SSL_CTX_set_verify(self->ctx, mode, NULL); ++ return 0; ++} ++ ++#ifdef HAVE_OPENSSL_VERIFY_PARAM ++static PyObject * ++get_verify_flags(PySSLContext *self, void *c) ++{ ++ X509_STORE *store; ++ unsigned long flags; ++ ++ store = SSL_CTX_get_cert_store(self->ctx); ++ flags = X509_VERIFY_PARAM_get_flags(store->param); ++ return PyLong_FromUnsignedLong(flags); ++} ++ ++static int ++set_verify_flags(PySSLContext *self, PyObject *arg, void *c) ++{ ++ X509_STORE *store; ++ unsigned long new_flags, flags, set, clear; ++ ++ if (!PyArg_Parse(arg, "k", &new_flags)) ++ return -1; ++ store = SSL_CTX_get_cert_store(self->ctx); ++ flags = X509_VERIFY_PARAM_get_flags(store->param); ++ clear = flags & ~new_flags; ++ set = ~flags & new_flags; ++ if (clear) { ++ if (!X509_VERIFY_PARAM_clear_flags(store->param, clear)) { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ return -1; ++ } ++ } ++ if (set) { ++ if (!X509_VERIFY_PARAM_set_flags(store->param, set)) { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ return -1; ++ } ++ } ++ return 0; ++} ++#endif ++ ++static PyObject * ++get_options(PySSLContext *self, void *c) ++{ ++ return PyLong_FromLong(SSL_CTX_get_options(self->ctx)); ++} ++ ++static int ++set_options(PySSLContext *self, PyObject *arg, void *c) ++{ ++ long new_opts, opts, set, clear; ++ if (!PyArg_Parse(arg, "l", &new_opts)) ++ return -1; ++ opts = SSL_CTX_get_options(self->ctx); ++ clear = opts & ~new_opts; ++ set = ~opts & new_opts; ++ if (clear) { ++#ifdef HAVE_SSL_CTX_CLEAR_OPTIONS ++ SSL_CTX_clear_options(self->ctx, clear); ++#else ++ PyErr_SetString(PyExc_ValueError, ++ "can't clear options before OpenSSL 0.9.8m"); ++ return -1; ++#endif ++ } ++ if (set) ++ SSL_CTX_set_options(self->ctx, set); ++ return 0; ++} ++ ++static PyObject * ++get_check_hostname(PySSLContext *self, void *c) ++{ ++ return PyBool_FromLong(self->check_hostname); ++} ++ ++static int ++set_check_hostname(PySSLContext *self, PyObject *arg, void *c) ++{ ++ PyObject *py_check_hostname; ++ int check_hostname; ++ if (!PyArg_Parse(arg, "O", &py_check_hostname)) ++ return -1; ++ ++ check_hostname = PyObject_IsTrue(py_check_hostname); ++ if (check_hostname < 0) ++ return -1; ++ if (check_hostname && ++ SSL_CTX_get_verify_mode(self->ctx) == SSL_VERIFY_NONE) { ++ PyErr_SetString(PyExc_ValueError, ++ "check_hostname needs a SSL context with either " ++ "CERT_OPTIONAL or CERT_REQUIRED"); ++ return -1; ++ } ++ self->check_hostname = check_hostname; ++ return 0; ++} ++ ++ ++typedef struct { ++ PyThreadState *thread_state; ++ PyObject *callable; ++ char *password; ++ int size; ++ int error; ++} _PySSLPasswordInfo; ++ ++static int ++_pwinfo_set(_PySSLPasswordInfo *pw_info, PyObject* password, ++ const char *bad_type_error) ++{ ++ /* Set the password and size fields of a _PySSLPasswordInfo struct ++ from a unicode, bytes, or byte array object. ++ The password field will be dynamically allocated and must be freed ++ by the caller */ ++ PyObject *password_bytes = NULL; ++ const char *data = NULL; ++ Py_ssize_t size; ++ ++ if (PyUnicode_Check(password)) { ++ password_bytes = PyUnicode_AsEncodedString(password, NULL, NULL); ++ if (!password_bytes) { ++ goto error; ++ } ++ data = PyBytes_AS_STRING(password_bytes); ++ size = PyBytes_GET_SIZE(password_bytes); ++ } else if (PyBytes_Check(password)) { ++ data = PyBytes_AS_STRING(password); ++ size = PyBytes_GET_SIZE(password); ++ } else if (PyByteArray_Check(password)) { ++ data = PyByteArray_AS_STRING(password); ++ size = PyByteArray_GET_SIZE(password); ++ } else { ++ PyErr_SetString(PyExc_TypeError, bad_type_error); ++ goto error; ++ } ++ ++ if (size > (Py_ssize_t)INT_MAX) { ++ PyErr_Format(PyExc_ValueError, ++ "password cannot be longer than %d bytes", INT_MAX); ++ goto error; ++ } ++ ++ PyMem_Free(pw_info->password); ++ pw_info->password = PyMem_Malloc(size); ++ if (!pw_info->password) { ++ PyErr_SetString(PyExc_MemoryError, ++ "unable to allocate password buffer"); ++ goto error; ++ } ++ memcpy(pw_info->password, data, size); ++ pw_info->size = (int)size; ++ ++ Py_XDECREF(password_bytes); ++ return 1; ++ ++error: ++ Py_XDECREF(password_bytes); ++ return 0; ++} ++ ++static int ++_password_callback(char *buf, int size, int rwflag, void *userdata) ++{ ++ _PySSLPasswordInfo *pw_info = (_PySSLPasswordInfo*) userdata; ++ PyObject *fn_ret = NULL; ++ ++ PySSL_END_ALLOW_THREADS_S(pw_info->thread_state); ++ ++ if (pw_info->callable) { ++ fn_ret = PyObject_CallFunctionObjArgs(pw_info->callable, NULL); ++ if (!fn_ret) { ++ /* TODO: It would be nice to move _ctypes_add_traceback() into the ++ core python API, so we could use it to add a frame here */ ++ goto error; ++ } ++ ++ if (!_pwinfo_set(pw_info, fn_ret, ++ "password callback must return a string")) { ++ goto error; ++ } ++ Py_CLEAR(fn_ret); ++ } ++ ++ if (pw_info->size > size) { ++ PyErr_Format(PyExc_ValueError, ++ "password cannot be longer than %d bytes", size); ++ goto error; ++ } ++ ++ PySSL_BEGIN_ALLOW_THREADS_S(pw_info->thread_state); ++ memcpy(buf, pw_info->password, pw_info->size); ++ return pw_info->size; ++ ++error: ++ Py_XDECREF(fn_ret); ++ PySSL_BEGIN_ALLOW_THREADS_S(pw_info->thread_state); ++ pw_info->error = 1; ++ return -1; ++} ++ ++static PyObject * ++load_cert_chain(PySSLContext *self, PyObject *args, PyObject *kwds) ++{ ++ char *kwlist[] = {"certfile", "keyfile", "password", NULL}; ++ PyObject *keyfile = NULL, *keyfile_bytes = NULL, *password = NULL; ++ char *certfile_bytes = NULL; ++ pem_password_cb *orig_passwd_cb = self->ctx->default_passwd_callback; ++ void *orig_passwd_userdata = self->ctx->default_passwd_callback_userdata; ++ _PySSLPasswordInfo pw_info = { NULL, NULL, NULL, 0, 0 }; ++ int r; ++ ++ errno = 0; ++ ERR_clear_error(); ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, ++ "et|OO:load_cert_chain", kwlist, ++ Py_FileSystemDefaultEncoding, &certfile_bytes, ++ &keyfile, &password)) ++ return NULL; ++ ++ if (keyfile && keyfile != Py_None) { ++ if (PyString_Check(keyfile)) { ++ Py_INCREF(keyfile); ++ keyfile_bytes = keyfile; ++ } else { ++ PyObject *u = PyUnicode_FromObject(keyfile); ++ if (!u) ++ goto error; ++ keyfile_bytes = PyUnicode_AsEncodedString( ++ u, Py_FileSystemDefaultEncoding, NULL); ++ Py_DECREF(u); ++ if (!keyfile_bytes) ++ goto error; ++ } ++ } ++ ++ if (password && password != Py_None) { ++ if (PyCallable_Check(password)) { ++ pw_info.callable = password; ++ } else if (!_pwinfo_set(&pw_info, password, ++ "password should be a string or callable")) { ++ goto error; ++ } ++ SSL_CTX_set_default_passwd_cb(self->ctx, _password_callback); ++ SSL_CTX_set_default_passwd_cb_userdata(self->ctx, &pw_info); ++ } ++ PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state); ++ r = SSL_CTX_use_certificate_chain_file(self->ctx, certfile_bytes); ++ PySSL_END_ALLOW_THREADS_S(pw_info.thread_state); ++ if (r != 1) { ++ if (pw_info.error) { ++ ERR_clear_error(); ++ /* the password callback has already set the error information */ ++ } ++ else if (errno != 0) { ++ ERR_clear_error(); ++ PyErr_SetFromErrno(PyExc_IOError); ++ } ++ else { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ } ++ goto error; ++ } ++ PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state); ++ r = SSL_CTX_use_PrivateKey_file(self->ctx, ++ keyfile_bytes ? PyBytes_AS_STRING(keyfile_bytes) : certfile_bytes, ++ SSL_FILETYPE_PEM); ++ PySSL_END_ALLOW_THREADS_S(pw_info.thread_state); ++ if (r != 1) { ++ if (pw_info.error) { ++ ERR_clear_error(); ++ /* the password callback has already set the error information */ ++ } ++ else if (errno != 0) { ++ ERR_clear_error(); ++ PyErr_SetFromErrno(PyExc_IOError); ++ } ++ else { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ } ++ goto error; ++ } ++ PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state); ++ r = SSL_CTX_check_private_key(self->ctx); ++ PySSL_END_ALLOW_THREADS_S(pw_info.thread_state); ++ if (r != 1) { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ goto error; ++ } ++ SSL_CTX_set_default_passwd_cb(self->ctx, orig_passwd_cb); ++ SSL_CTX_set_default_passwd_cb_userdata(self->ctx, orig_passwd_userdata); ++ PyMem_Free(pw_info.password); ++ Py_RETURN_NONE; ++ ++error: ++ SSL_CTX_set_default_passwd_cb(self->ctx, orig_passwd_cb); ++ SSL_CTX_set_default_passwd_cb_userdata(self->ctx, orig_passwd_userdata); ++ Py_XDECREF(keyfile_bytes); ++ PyMem_Free(pw_info.password); ++ PyMem_Free(certfile_bytes); ++ return NULL; ++} ++ ++/* internal helper function, returns -1 on error ++ */ ++static int ++_add_ca_certs(PySSLContext *self, void *data, Py_ssize_t len, ++ int filetype) ++{ ++ BIO *biobuf = NULL; ++ X509_STORE *store; ++ int retval = 0, err, loaded = 0; ++ ++ assert(filetype == SSL_FILETYPE_ASN1 || filetype == SSL_FILETYPE_PEM); ++ ++ if (len <= 0) { ++ PyErr_SetString(PyExc_ValueError, ++ "Empty certificate data"); ++ return -1; ++ } else if (len > INT_MAX) { ++ PyErr_SetString(PyExc_OverflowError, ++ "Certificate data is too long."); ++ return -1; ++ } ++ ++ biobuf = BIO_new_mem_buf(data, (int)len); ++ if (biobuf == NULL) { ++ _setSSLError("Can't allocate buffer", 0, __FILE__, __LINE__); ++ return -1; ++ } ++ ++ store = SSL_CTX_get_cert_store(self->ctx); ++ assert(store != NULL); ++ ++ while (1) { ++ X509 *cert = NULL; ++ int r; ++ ++ if (filetype == SSL_FILETYPE_ASN1) { ++ cert = d2i_X509_bio(biobuf, NULL); ++ } else { ++ cert = PEM_read_bio_X509(biobuf, NULL, ++ self->ctx->default_passwd_callback, ++ self->ctx->default_passwd_callback_userdata); ++ } ++ if (cert == NULL) { ++ break; ++ } ++ r = X509_STORE_add_cert(store, cert); ++ X509_free(cert); ++ if (!r) { ++ err = ERR_peek_last_error(); ++ if ((ERR_GET_LIB(err) == ERR_LIB_X509) && ++ (ERR_GET_REASON(err) == X509_R_CERT_ALREADY_IN_HASH_TABLE)) { ++ /* cert already in hash table, not an error */ ++ ERR_clear_error(); ++ } else { ++ break; ++ } ++ } ++ loaded++; ++ } ++ ++ err = ERR_peek_last_error(); ++ if ((filetype == SSL_FILETYPE_ASN1) && ++ (loaded > 0) && ++ (ERR_GET_LIB(err) == ERR_LIB_ASN1) && ++ (ERR_GET_REASON(err) == ASN1_R_HEADER_TOO_LONG)) { ++ /* EOF ASN1 file, not an error */ ++ ERR_clear_error(); ++ retval = 0; ++ } else if ((filetype == SSL_FILETYPE_PEM) && ++ (loaded > 0) && ++ (ERR_GET_LIB(err) == ERR_LIB_PEM) && ++ (ERR_GET_REASON(err) == PEM_R_NO_START_LINE)) { ++ /* EOF PEM file, not an error */ ++ ERR_clear_error(); ++ retval = 0; ++ } else { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ retval = -1; ++ } ++ ++ BIO_free(biobuf); ++ return retval; ++} ++ ++ ++static PyObject * ++load_verify_locations(PySSLContext *self, PyObject *args, PyObject *kwds) ++{ ++ char *kwlist[] = {"cafile", "capath", "cadata", NULL}; ++ PyObject *cadata = NULL, *cafile = NULL, *capath = NULL; ++ PyObject *cafile_bytes = NULL, *capath_bytes = NULL; ++ const char *cafile_buf = NULL, *capath_buf = NULL; ++ int r = 0, ok = 1; ++ ++ errno = 0; ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, ++ "|OOO:load_verify_locations", kwlist, ++ &cafile, &capath, &cadata)) ++ return NULL; ++ ++ if (cafile == Py_None) ++ cafile = NULL; ++ if (capath == Py_None) ++ capath = NULL; ++ if (cadata == Py_None) ++ cadata = NULL; ++ ++ if (cafile == NULL && capath == NULL && cadata == NULL) { ++ PyErr_SetString(PyExc_TypeError, ++ "cafile, capath and cadata cannot be all omitted"); ++ goto error; ++ } ++ ++ if (cafile) { ++ if (PyString_Check(cafile)) { ++ Py_INCREF(cafile); ++ cafile_bytes = cafile; ++ } else { ++ PyObject *u = PyUnicode_FromObject(cafile); ++ if (!u) ++ goto error; ++ cafile_bytes = PyUnicode_AsEncodedString( ++ u, Py_FileSystemDefaultEncoding, NULL); ++ Py_DECREF(u); ++ if (!cafile_bytes) ++ goto error; ++ } ++ } ++ if (capath) { ++ if (PyString_Check(capath)) { ++ Py_INCREF(capath); ++ capath_bytes = capath; ++ } else { ++ PyObject *u = PyUnicode_FromObject(capath); ++ if (!u) ++ goto error; ++ capath_bytes = PyUnicode_AsEncodedString( ++ u, Py_FileSystemDefaultEncoding, NULL); ++ Py_DECREF(u); ++ if (!capath_bytes) ++ goto error; ++ } ++ } ++ ++ /* validata cadata type and load cadata */ ++ if (cadata) { ++ Py_buffer buf; ++ PyObject *cadata_ascii = NULL; ++ ++ if (!PyUnicode_Check(cadata) && PyObject_GetBuffer(cadata, &buf, PyBUF_SIMPLE) == 0) { ++ if (!PyBuffer_IsContiguous(&buf, 'C') || buf.ndim > 1) { ++ PyBuffer_Release(&buf); ++ PyErr_SetString(PyExc_TypeError, ++ "cadata should be a contiguous buffer with " ++ "a single dimension"); ++ goto error; ++ } ++ r = _add_ca_certs(self, buf.buf, buf.len, SSL_FILETYPE_ASN1); ++ PyBuffer_Release(&buf); ++ if (r == -1) { ++ goto error; ++ } ++ } else { ++ PyErr_Clear(); ++ cadata_ascii = PyUnicode_AsASCIIString(cadata); ++ if (cadata_ascii == NULL) { ++ PyErr_SetString(PyExc_TypeError, ++ "cadata should be a ASCII string or a " ++ "bytes-like object"); ++ goto error; ++ } ++ r = _add_ca_certs(self, ++ PyBytes_AS_STRING(cadata_ascii), ++ PyBytes_GET_SIZE(cadata_ascii), ++ SSL_FILETYPE_PEM); ++ Py_DECREF(cadata_ascii); ++ if (r == -1) { ++ goto error; ++ } ++ } ++ } ++ ++ /* load cafile or capath */ ++ if (cafile_bytes || capath_bytes) { ++ if (cafile) ++ cafile_buf = PyBytes_AS_STRING(cafile_bytes); ++ if (capath) ++ capath_buf = PyBytes_AS_STRING(capath_bytes); ++ PySSL_BEGIN_ALLOW_THREADS ++ r = SSL_CTX_load_verify_locations( ++ self->ctx, ++ cafile_buf, ++ capath_buf); ++ PySSL_END_ALLOW_THREADS ++ if (r != 1) { ++ ok = 0; ++ if (errno != 0) { ++ ERR_clear_error(); ++ PyErr_SetFromErrno(PyExc_IOError); ++ } ++ else { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ } ++ goto error; ++ } ++ } ++ goto end; ++ ++ error: ++ ok = 0; ++ end: ++ Py_XDECREF(cafile_bytes); ++ Py_XDECREF(capath_bytes); ++ if (ok) { ++ Py_RETURN_NONE; ++ } else { ++ return NULL; ++ } ++} ++ ++static PyObject * ++load_dh_params(PySSLContext *self, PyObject *filepath) ++{ ++ BIO *bio; ++ DH *dh; ++ char *path = PyBytes_AsString(filepath); ++ if (!path) { ++ return NULL; ++ } ++ ++ bio = BIO_new_file(path, "r"); ++ if (bio == NULL) { ++ ERR_clear_error(); ++ PyErr_SetFromErrnoWithFilenameObject(PyExc_IOError, filepath); ++ return NULL; ++ } ++ errno = 0; ++ PySSL_BEGIN_ALLOW_THREADS ++ dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL); ++ BIO_free(bio); ++ PySSL_END_ALLOW_THREADS ++ if (dh == NULL) { ++ if (errno != 0) { ++ ERR_clear_error(); ++ PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, filepath); ++ } ++ else { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ } ++ return NULL; ++ } ++ if (SSL_CTX_set_tmp_dh(self->ctx, dh) == 0) ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ DH_free(dh); ++ Py_RETURN_NONE; ++} ++ ++static PyObject * ++context_wrap_socket(PySSLContext *self, PyObject *args, PyObject *kwds) ++{ ++ char *kwlist[] = {"sock", "server_side", "server_hostname", "ssl_sock", NULL}; ++ PySocketSockObject *sock; ++ int server_side = 0; ++ char *hostname = NULL; ++ PyObject *hostname_obj, *ssl_sock = Py_None, *res; ++ ++ /* server_hostname is either None (or absent), or to be encoded ++ using the idna encoding. */ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!i|O!O:_wrap_socket", kwlist, ++ PySocketModule.Sock_Type, ++ &sock, &server_side, ++ Py_TYPE(Py_None), &hostname_obj, ++ &ssl_sock)) { ++ PyErr_Clear(); ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!iet|O:_wrap_socket", kwlist, ++ PySocketModule.Sock_Type, ++ &sock, &server_side, ++ "idna", &hostname, &ssl_sock)) ++ return NULL; ++#if !HAVE_SNI ++ PyMem_Free(hostname); ++ PyErr_SetString(PyExc_ValueError, "server_hostname is not supported " ++ "by your OpenSSL library"); ++ return NULL; ++#endif ++ } ++ ++ res = (PyObject *) newPySSLSocket(self, sock, server_side, ++ hostname, ssl_sock); ++ if (hostname != NULL) ++ PyMem_Free(hostname); ++ return res; ++} ++ ++static PyObject * ++session_stats(PySSLContext *self, PyObject *unused) ++{ ++ int r; ++ PyObject *value, *stats = PyDict_New(); ++ if (!stats) ++ return NULL; ++ ++#define ADD_STATS(SSL_NAME, KEY_NAME) \ ++ value = PyLong_FromLong(SSL_CTX_sess_ ## SSL_NAME (self->ctx)); \ ++ if (value == NULL) \ ++ goto error; \ ++ r = PyDict_SetItemString(stats, KEY_NAME, value); \ ++ Py_DECREF(value); \ ++ if (r < 0) \ ++ goto error; ++ ++ ADD_STATS(number, "number"); ++ ADD_STATS(connect, "connect"); ++ ADD_STATS(connect_good, "connect_good"); ++ ADD_STATS(connect_renegotiate, "connect_renegotiate"); ++ ADD_STATS(accept, "accept"); ++ ADD_STATS(accept_good, "accept_good"); ++ ADD_STATS(accept_renegotiate, "accept_renegotiate"); ++ ADD_STATS(accept, "accept"); ++ ADD_STATS(hits, "hits"); ++ ADD_STATS(misses, "misses"); ++ ADD_STATS(timeouts, "timeouts"); ++ ADD_STATS(cache_full, "cache_full"); ++ ++#undef ADD_STATS ++ ++ return stats; ++ ++error: ++ Py_DECREF(stats); ++ return NULL; ++} ++ ++static PyObject * ++set_default_verify_paths(PySSLContext *self, PyObject *unused) ++{ ++ if (!SSL_CTX_set_default_verify_paths(self->ctx)) { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ return NULL; ++ } ++ Py_RETURN_NONE; ++} ++ ++#ifndef OPENSSL_NO_ECDH ++static PyObject * ++set_ecdh_curve(PySSLContext *self, PyObject *name) ++{ ++ char *name_bytes; ++ int nid; ++ EC_KEY *key; ++ ++ name_bytes = PyBytes_AsString(name); ++ if (!name_bytes) { ++ return NULL; ++ } ++ nid = OBJ_sn2nid(name_bytes); ++ if (nid == 0) { ++ PyObject *r = PyObject_Repr(name); ++ if (!r) ++ return NULL; ++ PyErr_Format(PyExc_ValueError, ++ "unknown elliptic curve name %s", PyString_AS_STRING(r)); ++ Py_DECREF(r); ++ return NULL; ++ } ++ key = EC_KEY_new_by_curve_name(nid); ++ if (key == NULL) { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ return NULL; ++ } ++ SSL_CTX_set_tmp_ecdh(self->ctx, key); ++ EC_KEY_free(key); ++ Py_RETURN_NONE; ++} ++#endif ++ ++#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT) ++static int ++_servername_callback(SSL *s, int *al, void *args) ++{ ++ int ret; ++ PySSLContext *ssl_ctx = (PySSLContext *) args; ++ PySSLSocket *ssl; ++ PyObject *servername_o; ++ PyObject *servername_idna; ++ PyObject *result; ++ /* The high-level ssl.SSLSocket object */ ++ PyObject *ssl_socket; ++ const char *servername = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name); ++#ifdef WITH_THREAD ++ PyGILState_STATE gstate = PyGILState_Ensure(); ++#endif ++ ++ if (ssl_ctx->set_hostname == NULL) { ++ /* remove race condition in this the call back while if removing the ++ * callback is in progress */ ++#ifdef WITH_THREAD ++ PyGILState_Release(gstate); ++#endif ++ return SSL_TLSEXT_ERR_OK; ++ } ++ ++ ssl = SSL_get_app_data(s); ++ assert(PySSLSocket_Check(ssl)); ++ if (ssl->ssl_sock == NULL) { ++ ssl_socket = Py_None; ++ } else { ++ ssl_socket = PyWeakref_GetObject(ssl->ssl_sock); ++ Py_INCREF(ssl_socket); ++ } ++ if (ssl_socket == Py_None) { ++ goto error; ++ } ++ ++ if (servername == NULL) { ++ result = PyObject_CallFunctionObjArgs(ssl_ctx->set_hostname, ssl_socket, ++ Py_None, ssl_ctx, NULL); ++ } ++ else { ++ servername_o = PyBytes_FromString(servername); ++ if (servername_o == NULL) { ++ PyErr_WriteUnraisable((PyObject *) ssl_ctx); ++ goto error; ++ } ++ servername_idna = PyUnicode_FromEncodedObject(servername_o, "idna", NULL); ++ if (servername_idna == NULL) { ++ PyErr_WriteUnraisable(servername_o); ++ Py_DECREF(servername_o); ++ goto error; ++ } ++ Py_DECREF(servername_o); ++ result = PyObject_CallFunctionObjArgs(ssl_ctx->set_hostname, ssl_socket, ++ servername_idna, ssl_ctx, NULL); ++ Py_DECREF(servername_idna); ++ } ++ Py_DECREF(ssl_socket); ++ ++ if (result == NULL) { ++ PyErr_WriteUnraisable(ssl_ctx->set_hostname); ++ *al = SSL_AD_HANDSHAKE_FAILURE; ++ ret = SSL_TLSEXT_ERR_ALERT_FATAL; ++ } ++ else { ++ if (result != Py_None) { ++ *al = (int) PyLong_AsLong(result); ++ if (PyErr_Occurred()) { ++ PyErr_WriteUnraisable(result); ++ *al = SSL_AD_INTERNAL_ERROR; ++ } ++ ret = SSL_TLSEXT_ERR_ALERT_FATAL; ++ } ++ else { ++ ret = SSL_TLSEXT_ERR_OK; ++ } ++ Py_DECREF(result); ++ } ++ ++#ifdef WITH_THREAD ++ PyGILState_Release(gstate); ++#endif ++ return ret; ++ ++error: ++ Py_DECREF(ssl_socket); ++ *al = SSL_AD_INTERNAL_ERROR; ++ ret = SSL_TLSEXT_ERR_ALERT_FATAL; ++#ifdef WITH_THREAD ++ PyGILState_Release(gstate); ++#endif ++ return ret; ++} ++#endif ++ ++PyDoc_STRVAR(PySSL_set_servername_callback_doc, ++"set_servername_callback(method)\n\ ++\n\ ++This sets a callback that will be called when a server name is provided by\n\ ++the SSL/TLS client in the SNI extension.\n\ ++\n\ ++If the argument is None then the callback is disabled. The method is called\n\ ++with the SSLSocket, the server name as a string, and the SSLContext object.\n\ ++See RFC 6066 for details of the SNI extension."); ++ ++static PyObject * ++set_servername_callback(PySSLContext *self, PyObject *args) ++{ ++#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT) ++ PyObject *cb; ++ ++ if (!PyArg_ParseTuple(args, "O", &cb)) ++ return NULL; ++ ++ Py_CLEAR(self->set_hostname); ++ if (cb == Py_None) { ++ SSL_CTX_set_tlsext_servername_callback(self->ctx, NULL); ++ } ++ else { ++ if (!PyCallable_Check(cb)) { ++ SSL_CTX_set_tlsext_servername_callback(self->ctx, NULL); ++ PyErr_SetString(PyExc_TypeError, ++ "not a callable object"); ++ return NULL; ++ } ++ Py_INCREF(cb); ++ self->set_hostname = cb; ++ SSL_CTX_set_tlsext_servername_callback(self->ctx, _servername_callback); ++ SSL_CTX_set_tlsext_servername_arg(self->ctx, self); ++ } ++ Py_RETURN_NONE; ++#else ++ PyErr_SetString(PyExc_NotImplementedError, ++ "The TLS extension servername callback, " ++ "SSL_CTX_set_tlsext_servername_callback, " ++ "is not in the current OpenSSL library."); ++ return NULL; ++#endif ++} ++ ++PyDoc_STRVAR(PySSL_get_stats_doc, ++"cert_store_stats() -> {'crl': int, 'x509_ca': int, 'x509': int}\n\ ++\n\ ++Returns quantities of loaded X.509 certificates. X.509 certificates with a\n\ ++CA extension and certificate revocation lists inside the context's cert\n\ ++store.\n\ ++NOTE: Certificates in a capath directory aren't loaded unless they have\n\ ++been used at least once."); ++ ++static PyObject * ++cert_store_stats(PySSLContext *self) ++{ ++ X509_STORE *store; ++ X509_OBJECT *obj; ++ int x509 = 0, crl = 0, pkey = 0, ca = 0, i; ++ ++ store = SSL_CTX_get_cert_store(self->ctx); ++ for (i = 0; i < sk_X509_OBJECT_num(store->objs); i++) { ++ obj = sk_X509_OBJECT_value(store->objs, i); ++ switch (obj->type) { ++ case X509_LU_X509: ++ x509++; ++ if (X509_check_ca(obj->data.x509)) { ++ ca++; ++ } ++ break; ++ case X509_LU_CRL: ++ crl++; ++ break; ++ case X509_LU_PKEY: ++ pkey++; ++ break; ++ default: ++ /* Ignore X509_LU_FAIL, X509_LU_RETRY, X509_LU_PKEY. ++ * As far as I can tell they are internal states and never ++ * stored in a cert store */ ++ break; ++ } ++ } ++ return Py_BuildValue("{sisisi}", "x509", x509, "crl", crl, ++ "x509_ca", ca); ++} ++ ++PyDoc_STRVAR(PySSL_get_ca_certs_doc, ++"get_ca_certs(binary_form=False) -> list of loaded certificate\n\ ++\n\ ++Returns a list of dicts with information of loaded CA certs. If the\n\ ++optional argument is True, returns a DER-encoded copy of the CA certificate.\n\ ++NOTE: Certificates in a capath directory aren't loaded unless they have\n\ ++been used at least once."); ++ ++static PyObject * ++get_ca_certs(PySSLContext *self, PyObject *args, PyObject *kwds) ++{ ++ char *kwlist[] = {"binary_form", NULL}; ++ X509_STORE *store; ++ PyObject *ci = NULL, *rlist = NULL, *py_binary_mode = Py_False; ++ int i; ++ int binary_mode = 0; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:get_ca_certs", ++ kwlist, &py_binary_mode)) { ++ return NULL; ++ } ++ binary_mode = PyObject_IsTrue(py_binary_mode); ++ if (binary_mode < 0) { ++ return NULL; ++ } ++ ++ if ((rlist = PyList_New(0)) == NULL) { ++ return NULL; ++ } ++ ++ store = SSL_CTX_get_cert_store(self->ctx); ++ for (i = 0; i < sk_X509_OBJECT_num(store->objs); i++) { ++ X509_OBJECT *obj; ++ X509 *cert; ++ ++ obj = sk_X509_OBJECT_value(store->objs, i); ++ if (obj->type != X509_LU_X509) { ++ /* not a x509 cert */ ++ continue; ++ } ++ /* CA for any purpose */ ++ cert = obj->data.x509; ++ if (!X509_check_ca(cert)) { ++ continue; ++ } ++ if (binary_mode) { ++ ci = _certificate_to_der(cert); ++ } else { ++ ci = _decode_certificate(cert); ++ } ++ if (ci == NULL) { ++ goto error; ++ } ++ if (PyList_Append(rlist, ci) == -1) { ++ goto error; ++ } ++ Py_CLEAR(ci); ++ } ++ return rlist; ++ ++ error: ++ Py_XDECREF(ci); ++ Py_XDECREF(rlist); ++ return NULL; ++} ++ ++ ++static PyGetSetDef context_getsetlist[] = { ++ {"check_hostname", (getter) get_check_hostname, ++ (setter) set_check_hostname, NULL}, ++ {"options", (getter) get_options, ++ (setter) set_options, NULL}, ++#ifdef HAVE_OPENSSL_VERIFY_PARAM ++ {"verify_flags", (getter) get_verify_flags, ++ (setter) set_verify_flags, NULL}, ++#endif ++ {"verify_mode", (getter) get_verify_mode, ++ (setter) set_verify_mode, NULL}, ++ {NULL}, /* sentinel */ ++}; ++ ++static struct PyMethodDef context_methods[] = { ++ {"_wrap_socket", (PyCFunction) context_wrap_socket, ++ METH_VARARGS | METH_KEYWORDS, NULL}, ++ {"set_ciphers", (PyCFunction) set_ciphers, ++ METH_VARARGS, NULL}, ++ {"_set_npn_protocols", (PyCFunction) _set_npn_protocols, ++ METH_VARARGS, NULL}, ++ {"load_cert_chain", (PyCFunction) load_cert_chain, ++ METH_VARARGS | METH_KEYWORDS, NULL}, ++ {"load_dh_params", (PyCFunction) load_dh_params, ++ METH_O, NULL}, ++ {"load_verify_locations", (PyCFunction) load_verify_locations, ++ METH_VARARGS | METH_KEYWORDS, NULL}, ++ {"session_stats", (PyCFunction) session_stats, ++ METH_NOARGS, NULL}, ++ {"set_default_verify_paths", (PyCFunction) set_default_verify_paths, ++ METH_NOARGS, NULL}, ++#ifndef OPENSSL_NO_ECDH ++ {"set_ecdh_curve", (PyCFunction) set_ecdh_curve, ++ METH_O, NULL}, ++#endif ++ {"set_servername_callback", (PyCFunction) set_servername_callback, ++ METH_VARARGS, PySSL_set_servername_callback_doc}, ++ {"cert_store_stats", (PyCFunction) cert_store_stats, ++ METH_NOARGS, PySSL_get_stats_doc}, ++ {"get_ca_certs", (PyCFunction) get_ca_certs, ++ METH_VARARGS | METH_KEYWORDS, PySSL_get_ca_certs_doc}, ++ {NULL, NULL} /* sentinel */ ++}; ++ ++static PyTypeObject PySSLContext_Type = { ++ PyVarObject_HEAD_INIT(NULL, 0) ++ "_ssl._SSLContext", /*tp_name*/ ++ sizeof(PySSLContext), /*tp_basicsize*/ ++ 0, /*tp_itemsize*/ ++ (destructor)context_dealloc, /*tp_dealloc*/ ++ 0, /*tp_print*/ ++ 0, /*tp_getattr*/ ++ 0, /*tp_setattr*/ ++ 0, /*tp_reserved*/ ++ 0, /*tp_repr*/ ++ 0, /*tp_as_number*/ ++ 0, /*tp_as_sequence*/ ++ 0, /*tp_as_mapping*/ ++ 0, /*tp_hash*/ ++ 0, /*tp_call*/ ++ 0, /*tp_str*/ ++ 0, /*tp_getattro*/ ++ 0, /*tp_setattro*/ ++ 0, /*tp_as_buffer*/ ++ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /*tp_flags*/ ++ 0, /*tp_doc*/ ++ (traverseproc) context_traverse, /*tp_traverse*/ ++ (inquiry) context_clear, /*tp_clear*/ ++ 0, /*tp_richcompare*/ ++ 0, /*tp_weaklistoffset*/ ++ 0, /*tp_iter*/ ++ 0, /*tp_iternext*/ ++ context_methods, /*tp_methods*/ ++ 0, /*tp_members*/ ++ context_getsetlist, /*tp_getset*/ ++ 0, /*tp_base*/ ++ 0, /*tp_dict*/ ++ 0, /*tp_descr_get*/ ++ 0, /*tp_descr_set*/ ++ 0, /*tp_dictoffset*/ ++ 0, /*tp_init*/ ++ 0, /*tp_alloc*/ ++ context_new, /*tp_new*/ ++}; ++ ++ ++ + #ifdef HAVE_OPENSSL_RAND + + /* helper routines for seeding the SSL PRNG */ +@@ -1572,12 +3267,21 @@ + PySSL_RAND_add(PyObject *self, PyObject *args) + { + char *buf; +- int len; ++ Py_ssize_t len, written; + double entropy; + + if (!PyArg_ParseTuple(args, "s#d:RAND_add", &buf, &len, &entropy)) + return NULL; +- RAND_add(buf, len, entropy); ++ do { ++ if (len >= INT_MAX) { ++ written = INT_MAX; ++ } else { ++ written = len; ++ } ++ RAND_add(buf, (int)written, entropy); ++ buf += written; ++ len -= written; ++ } while (len); + Py_INCREF(Py_None); + return Py_None; + } +@@ -1591,7 +3295,7 @@ + static PyObject * + PySSL_RAND_status(PyObject *self) + { +- return PyInt_FromLong(RAND_status()); ++ return PyLong_FromLong(RAND_status()); + } + + PyDoc_STRVAR(PySSL_RAND_status_doc, +@@ -1630,21 +3334,413 @@ + #endif /* HAVE_OPENSSL_RAND */ + + ++PyDoc_STRVAR(PySSL_get_default_verify_paths_doc, ++"get_default_verify_paths() -> tuple\n\ ++\n\ ++Return search paths and environment vars that are used by SSLContext's\n\ ++set_default_verify_paths() to load default CAs. The values are\n\ ++'cert_file_env', 'cert_file', 'cert_dir_env', 'cert_dir'."); ++ ++static PyObject * ++PySSL_get_default_verify_paths(PyObject *self) ++{ ++ PyObject *ofile_env = NULL; ++ PyObject *ofile = NULL; ++ PyObject *odir_env = NULL; ++ PyObject *odir = NULL; ++ ++#define convert(info, target) { \ ++ const char *tmp = (info); \ ++ target = NULL; \ ++ if (!tmp) { Py_INCREF(Py_None); target = Py_None; } \ ++ else { target = PyBytes_FromString(tmp); } \ ++ if (!target) goto error; \ ++ } while(0) ++ ++ convert(X509_get_default_cert_file_env(), ofile_env); ++ convert(X509_get_default_cert_file(), ofile); ++ convert(X509_get_default_cert_dir_env(), odir_env); ++ convert(X509_get_default_cert_dir(), odir); ++#undef convert ++ ++ return Py_BuildValue("NNNN", ofile_env, ofile, odir_env, odir); ++ ++ error: ++ Py_XDECREF(ofile_env); ++ Py_XDECREF(ofile); ++ Py_XDECREF(odir_env); ++ Py_XDECREF(odir); ++ return NULL; ++} ++ ++static PyObject* ++asn1obj2py(ASN1_OBJECT *obj) ++{ ++ int nid; ++ const char *ln, *sn; ++ char buf[100]; ++ Py_ssize_t buflen; ++ ++ nid = OBJ_obj2nid(obj); ++ if (nid == NID_undef) { ++ PyErr_Format(PyExc_ValueError, "Unknown object"); ++ return NULL; ++ } ++ sn = OBJ_nid2sn(nid); ++ ln = OBJ_nid2ln(nid); ++ buflen = OBJ_obj2txt(buf, sizeof(buf), obj, 1); ++ if (buflen < 0) { ++ _setSSLError(NULL, 0, __FILE__, __LINE__); ++ return NULL; ++ } ++ if (buflen) { ++ return Py_BuildValue("isss#", nid, sn, ln, buf, buflen); ++ } else { ++ return Py_BuildValue("issO", nid, sn, ln, Py_None); ++ } ++} ++ ++PyDoc_STRVAR(PySSL_txt2obj_doc, ++"txt2obj(txt, name=False) -> (nid, shortname, longname, oid)\n\ ++\n\ ++Lookup NID, short name, long name and OID of an ASN1_OBJECT. By default\n\ ++objects are looked up by OID. With name=True short and long name are also\n\ ++matched."); ++ ++static PyObject* ++PySSL_txt2obj(PyObject *self, PyObject *args, PyObject *kwds) ++{ ++ char *kwlist[] = {"txt", "name", NULL}; ++ PyObject *result = NULL; ++ char *txt; ++ PyObject *pyname = Py_None; ++ int name = 0; ++ ASN1_OBJECT *obj; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|O:txt2obj", ++ kwlist, &txt, &pyname)) { ++ return NULL; ++ } ++ name = PyObject_IsTrue(pyname); ++ if (name < 0) ++ return NULL; ++ obj = OBJ_txt2obj(txt, name ? 0 : 1); ++ if (obj == NULL) { ++ PyErr_Format(PyExc_ValueError, "unknown object '%.100s'", txt); ++ return NULL; ++ } ++ result = asn1obj2py(obj); ++ ASN1_OBJECT_free(obj); ++ return result; ++} ++ ++PyDoc_STRVAR(PySSL_nid2obj_doc, ++"nid2obj(nid) -> (nid, shortname, longname, oid)\n\ ++\n\ ++Lookup NID, short name, long name and OID of an ASN1_OBJECT by NID."); ++ ++static PyObject* ++PySSL_nid2obj(PyObject *self, PyObject *args) ++{ ++ PyObject *result = NULL; ++ int nid; ++ ASN1_OBJECT *obj; ++ ++ if (!PyArg_ParseTuple(args, "i:nid2obj", &nid)) { ++ return NULL; ++ } ++ if (nid < NID_undef) { ++ PyErr_SetString(PyExc_ValueError, "NID must be positive."); ++ return NULL; ++ } ++ obj = OBJ_nid2obj(nid); ++ if (obj == NULL) { ++ PyErr_Format(PyExc_ValueError, "unknown NID %i", nid); ++ return NULL; ++ } ++ result = asn1obj2py(obj); ++ ASN1_OBJECT_free(obj); ++ return result; ++} ++ ++#ifdef _MSC_VER ++ ++static PyObject* ++certEncodingType(DWORD encodingType) ++{ ++ static PyObject *x509_asn = NULL; ++ static PyObject *pkcs_7_asn = NULL; ++ ++ if (x509_asn == NULL) { ++ x509_asn = PyString_InternFromString("x509_asn"); ++ if (x509_asn == NULL) ++ return NULL; ++ } ++ if (pkcs_7_asn == NULL) { ++ pkcs_7_asn = PyString_InternFromString("pkcs_7_asn"); ++ if (pkcs_7_asn == NULL) ++ return NULL; ++ } ++ switch(encodingType) { ++ case X509_ASN_ENCODING: ++ Py_INCREF(x509_asn); ++ return x509_asn; ++ case PKCS_7_ASN_ENCODING: ++ Py_INCREF(pkcs_7_asn); ++ return pkcs_7_asn; ++ default: ++ return PyInt_FromLong(encodingType); ++ } ++} ++ ++static PyObject* ++parseKeyUsage(PCCERT_CONTEXT pCertCtx, DWORD flags) ++{ ++ CERT_ENHKEY_USAGE *usage; ++ DWORD size, error, i; ++ PyObject *retval; ++ ++ if (!CertGetEnhancedKeyUsage(pCertCtx, flags, NULL, &size)) { ++ error = GetLastError(); ++ if (error == CRYPT_E_NOT_FOUND) { ++ Py_RETURN_TRUE; ++ } ++ return PyErr_SetFromWindowsErr(error); ++ } ++ ++ usage = (CERT_ENHKEY_USAGE*)PyMem_Malloc(size); ++ if (usage == NULL) { ++ return PyErr_NoMemory(); ++ } ++ ++ /* Now get the actual enhanced usage property */ ++ if (!CertGetEnhancedKeyUsage(pCertCtx, flags, usage, &size)) { ++ PyMem_Free(usage); ++ error = GetLastError(); ++ if (error == CRYPT_E_NOT_FOUND) { ++ Py_RETURN_TRUE; ++ } ++ return PyErr_SetFromWindowsErr(error); ++ } ++ retval = PySet_New(NULL); ++ if (retval == NULL) { ++ goto error; ++ } ++ for (i = 0; i < usage->cUsageIdentifier; ++i) { ++ if (usage->rgpszUsageIdentifier[i]) { ++ PyObject *oid; ++ int err; ++ oid = PyString_FromString(usage->rgpszUsageIdentifier[i]); ++ if (oid == NULL) { ++ Py_CLEAR(retval); ++ goto error; ++ } ++ err = PySet_Add(retval, oid); ++ Py_DECREF(oid); ++ if (err == -1) { ++ Py_CLEAR(retval); ++ goto error; ++ } ++ } ++ } ++ error: ++ PyMem_Free(usage); ++ return retval; ++} ++ ++PyDoc_STRVAR(PySSL_enum_certificates_doc, ++"enum_certificates(store_name) -> []\n\ ++\n\ ++Retrieve certificates from Windows' cert store. store_name may be one of\n\ ++'CA', 'ROOT' or 'MY'. The system may provide more cert storages, too.\n\ ++The function returns a list of (bytes, encoding_type, trust) tuples. The\n\ ++encoding_type flag can be interpreted with X509_ASN_ENCODING or\n\ ++PKCS_7_ASN_ENCODING. The trust setting is either a set of OIDs or the\n\ ++boolean True."); ++ ++static PyObject * ++PySSL_enum_certificates(PyObject *self, PyObject *args, PyObject *kwds) ++{ ++ char *kwlist[] = {"store_name", NULL}; ++ char *store_name; ++ HCERTSTORE hStore = NULL; ++ PCCERT_CONTEXT pCertCtx = NULL; ++ PyObject *keyusage = NULL, *cert = NULL, *enc = NULL, *tup = NULL; ++ PyObject *result = NULL; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|s:enum_certificates", ++ kwlist, &store_name)) { ++ return NULL; ++ } ++ result = PyList_New(0); ++ if (result == NULL) { ++ return NULL; ++ } ++ hStore = CertOpenSystemStore((HCRYPTPROV)NULL, store_name); ++ if (hStore == NULL) { ++ Py_DECREF(result); ++ return PyErr_SetFromWindowsErr(GetLastError()); ++ } ++ ++ while (pCertCtx = CertEnumCertificatesInStore(hStore, pCertCtx)) { ++ cert = PyBytes_FromStringAndSize((const char*)pCertCtx->pbCertEncoded, ++ pCertCtx->cbCertEncoded); ++ if (!cert) { ++ Py_CLEAR(result); ++ break; ++ } ++ if ((enc = certEncodingType(pCertCtx->dwCertEncodingType)) == NULL) { ++ Py_CLEAR(result); ++ break; ++ } ++ keyusage = parseKeyUsage(pCertCtx, CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG); ++ if (keyusage == Py_True) { ++ Py_DECREF(keyusage); ++ keyusage = parseKeyUsage(pCertCtx, CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG); ++ } ++ if (keyusage == NULL) { ++ Py_CLEAR(result); ++ break; ++ } ++ if ((tup = PyTuple_New(3)) == NULL) { ++ Py_CLEAR(result); ++ break; ++ } ++ PyTuple_SET_ITEM(tup, 0, cert); ++ cert = NULL; ++ PyTuple_SET_ITEM(tup, 1, enc); ++ enc = NULL; ++ PyTuple_SET_ITEM(tup, 2, keyusage); ++ keyusage = NULL; ++ if (PyList_Append(result, tup) < 0) { ++ Py_CLEAR(result); ++ break; ++ } ++ Py_CLEAR(tup); ++ } ++ if (pCertCtx) { ++ /* loop ended with an error, need to clean up context manually */ ++ CertFreeCertificateContext(pCertCtx); ++ } ++ ++ /* In error cases cert, enc and tup may not be NULL */ ++ Py_XDECREF(cert); ++ Py_XDECREF(enc); ++ Py_XDECREF(keyusage); ++ Py_XDECREF(tup); ++ ++ if (!CertCloseStore(hStore, 0)) { ++ /* This error case might shadow another exception.*/ ++ Py_XDECREF(result); ++ return PyErr_SetFromWindowsErr(GetLastError()); ++ } ++ return result; ++} ++ ++PyDoc_STRVAR(PySSL_enum_crls_doc, ++"enum_crls(store_name) -> []\n\ ++\n\ ++Retrieve CRLs from Windows' cert store. store_name may be one of\n\ ++'CA', 'ROOT' or 'MY'. The system may provide more cert storages, too.\n\ ++The function returns a list of (bytes, encoding_type) tuples. The\n\ ++encoding_type flag can be interpreted with X509_ASN_ENCODING or\n\ ++PKCS_7_ASN_ENCODING."); ++ ++static PyObject * ++PySSL_enum_crls(PyObject *self, PyObject *args, PyObject *kwds) ++{ ++ char *kwlist[] = {"store_name", NULL}; ++ char *store_name; ++ HCERTSTORE hStore = NULL; ++ PCCRL_CONTEXT pCrlCtx = NULL; ++ PyObject *crl = NULL, *enc = NULL, *tup = NULL; ++ PyObject *result = NULL; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|s:enum_crls", ++ kwlist, &store_name)) { ++ return NULL; ++ } ++ result = PyList_New(0); ++ if (result == NULL) { ++ return NULL; ++ } ++ hStore = CertOpenSystemStore((HCRYPTPROV)NULL, store_name); ++ if (hStore == NULL) { ++ Py_DECREF(result); ++ return PyErr_SetFromWindowsErr(GetLastError()); ++ } ++ ++ while (pCrlCtx = CertEnumCRLsInStore(hStore, pCrlCtx)) { ++ crl = PyBytes_FromStringAndSize((const char*)pCrlCtx->pbCrlEncoded, ++ pCrlCtx->cbCrlEncoded); ++ if (!crl) { ++ Py_CLEAR(result); ++ break; ++ } ++ if ((enc = certEncodingType(pCrlCtx->dwCertEncodingType)) == NULL) { ++ Py_CLEAR(result); ++ break; ++ } ++ if ((tup = PyTuple_New(2)) == NULL) { ++ Py_CLEAR(result); ++ break; ++ } ++ PyTuple_SET_ITEM(tup, 0, crl); ++ crl = NULL; ++ PyTuple_SET_ITEM(tup, 1, enc); ++ enc = NULL; ++ ++ if (PyList_Append(result, tup) < 0) { ++ Py_CLEAR(result); ++ break; ++ } ++ Py_CLEAR(tup); ++ } ++ if (pCrlCtx) { ++ /* loop ended with an error, need to clean up context manually */ ++ CertFreeCRLContext(pCrlCtx); ++ } ++ ++ /* In error cases cert, enc and tup may not be NULL */ ++ Py_XDECREF(crl); ++ Py_XDECREF(enc); ++ Py_XDECREF(tup); ++ ++ if (!CertCloseStore(hStore, 0)) { ++ /* This error case might shadow another exception.*/ ++ Py_XDECREF(result); ++ return PyErr_SetFromWindowsErr(GetLastError()); ++ } ++ return result; ++} ++ ++#endif /* _MSC_VER */ ++ + /* List of functions exported by this module. */ + + static PyMethodDef PySSL_methods[] = { +- {"sslwrap", PySSL_sslwrap, +- METH_VARARGS, ssl_doc}, + {"_test_decode_cert", PySSL_test_decode_certificate, + METH_VARARGS}, + #ifdef HAVE_OPENSSL_RAND + {"RAND_add", PySSL_RAND_add, METH_VARARGS, + PySSL_RAND_add_doc}, +- {"RAND_egd", PySSL_RAND_egd, METH_O, ++ {"RAND_egd", PySSL_RAND_egd, METH_VARARGS, + PySSL_RAND_egd_doc}, + {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS, + PySSL_RAND_status_doc}, + #endif ++ {"get_default_verify_paths", (PyCFunction)PySSL_get_default_verify_paths, ++ METH_NOARGS, PySSL_get_default_verify_paths_doc}, ++#ifdef _MSC_VER ++ {"enum_certificates", (PyCFunction)PySSL_enum_certificates, ++ METH_VARARGS | METH_KEYWORDS, PySSL_enum_certificates_doc}, ++ {"enum_crls", (PyCFunction)PySSL_enum_crls, ++ METH_VARARGS | METH_KEYWORDS, PySSL_enum_crls_doc}, ++#endif ++ {"txt2obj", (PyCFunction)PySSL_txt2obj, ++ METH_VARARGS | METH_KEYWORDS, PySSL_txt2obj_doc}, ++ {"nid2obj", (PyCFunction)PySSL_nid2obj, ++ METH_VARARGS, PySSL_nid2obj_doc}, + {NULL, NULL} /* Sentinel */ + }; + +@@ -1672,16 +3768,17 @@ + } + #endif + +-static void _ssl_thread_locking_function (int mode, int n, const char *file, int line) { ++static void _ssl_thread_locking_function ++ (int mode, int n, const char *file, int line) { + /* this function is needed to perform locking on shared data + structures. (Note that OpenSSL uses a number of global data +- structures that will be implicitly shared whenever multiple threads +- use OpenSSL.) Multi-threaded applications will crash at random if +- it is not set. +- +- locking_function() must be able to handle up to CRYPTO_num_locks() +- different mutex locks. It sets the n-th lock if mode & CRYPTO_LOCK, and +- releases it otherwise. ++ structures that will be implicitly shared whenever multiple ++ threads use OpenSSL.) Multi-threaded applications will ++ crash at random if it is not set. ++ ++ locking_function() must be able to handle up to ++ CRYPTO_num_locks() different mutex locks. It sets the n-th ++ lock if mode & CRYPTO_LOCK, and releases it otherwise. + + file and line are the file number of the function setting the + lock. They can be useful for debugging. +@@ -1705,10 +3802,11 @@ + if (_ssl_locks == NULL) { + _ssl_locks_count = CRYPTO_num_locks(); + _ssl_locks = (PyThread_type_lock *) +- malloc(sizeof(PyThread_type_lock) * _ssl_locks_count); ++ PyMem_Malloc(sizeof(PyThread_type_lock) * _ssl_locks_count); + if (_ssl_locks == NULL) + return 0; +- memset(_ssl_locks, 0, sizeof(PyThread_type_lock) * _ssl_locks_count); ++ memset(_ssl_locks, 0, ++ sizeof(PyThread_type_lock) * _ssl_locks_count); + for (i = 0; i < _ssl_locks_count; i++) { + _ssl_locks[i] = PyThread_allocate_lock(); + if (_ssl_locks[i] == NULL) { +@@ -1716,7 +3814,7 @@ + for (j = 0; j < i; j++) { + PyThread_free_lock(_ssl_locks[j]); + } +- free(_ssl_locks); ++ PyMem_Free(_ssl_locks); + return 0; + } + } +@@ -1736,14 +3834,39 @@ + "Implementation module for SSL socket operations. See the socket module\n\ + for documentation."); + ++ ++ ++ ++static void ++parse_openssl_version(unsigned long libver, ++ unsigned int *major, unsigned int *minor, ++ unsigned int *fix, unsigned int *patch, ++ unsigned int *status) ++{ ++ *status = libver & 0xF; ++ libver >>= 4; ++ *patch = libver & 0xFF; ++ libver >>= 8; ++ *fix = libver & 0xFF; ++ libver >>= 8; ++ *minor = libver & 0xFF; ++ libver >>= 8; ++ *major = libver & 0xFF; ++} ++ + PyMODINIT_FUNC + init_ssl(void) + { + PyObject *m, *d, *r; + unsigned long libver; + unsigned int major, minor, fix, patch, status; +- +- Py_TYPE(&PySSL_Type) = &PyType_Type; ++ struct py_ssl_error_code *errcode; ++ struct py_ssl_library_code *libcode; ++ ++ if (PyType_Ready(&PySSLContext_Type) < 0) ++ return; ++ if (PyType_Ready(&PySSLSocket_Type) < 0) ++ return; + + m = Py_InitModule3("_ssl", PySSL_methods, module_doc); + if (m == NULL) +@@ -1766,15 +3889,53 @@ + OpenSSL_add_all_algorithms(); + + /* Add symbols to module dict */ +- PySSLErrorObject = PyErr_NewException("ssl.SSLError", +- PySocketModule.error, +- NULL); ++ PySSLErrorObject = PyErr_NewExceptionWithDoc( ++ "ssl.SSLError", SSLError_doc, ++ PySocketModule.error, NULL); + if (PySSLErrorObject == NULL) + return; +- if (PyDict_SetItemString(d, "SSLError", PySSLErrorObject) != 0) ++ ((PyTypeObject *)PySSLErrorObject)->tp_str = (reprfunc)SSLError_str; ++ ++ PySSLZeroReturnErrorObject = PyErr_NewExceptionWithDoc( ++ "ssl.SSLZeroReturnError", SSLZeroReturnError_doc, ++ PySSLErrorObject, NULL); ++ PySSLWantReadErrorObject = PyErr_NewExceptionWithDoc( ++ "ssl.SSLWantReadError", SSLWantReadError_doc, ++ PySSLErrorObject, NULL); ++ PySSLWantWriteErrorObject = PyErr_NewExceptionWithDoc( ++ "ssl.SSLWantWriteError", SSLWantWriteError_doc, ++ PySSLErrorObject, NULL); ++ PySSLSyscallErrorObject = PyErr_NewExceptionWithDoc( ++ "ssl.SSLSyscallError", SSLSyscallError_doc, ++ PySSLErrorObject, NULL); ++ PySSLEOFErrorObject = PyErr_NewExceptionWithDoc( ++ "ssl.SSLEOFError", SSLEOFError_doc, ++ PySSLErrorObject, NULL); ++ if (PySSLZeroReturnErrorObject == NULL ++ || PySSLWantReadErrorObject == NULL ++ || PySSLWantWriteErrorObject == NULL ++ || PySSLSyscallErrorObject == NULL ++ || PySSLEOFErrorObject == NULL) + return; +- if (PyDict_SetItemString(d, "SSLType", +- (PyObject *)&PySSL_Type) != 0) ++ ++ ((PyTypeObject *)PySSLZeroReturnErrorObject)->tp_str = (reprfunc)SSLError_str; ++ ((PyTypeObject *)PySSLWantReadErrorObject)->tp_str = (reprfunc)SSLError_str; ++ ((PyTypeObject *)PySSLWantWriteErrorObject)->tp_str = (reprfunc)SSLError_str; ++ ((PyTypeObject *)PySSLSyscallErrorObject)->tp_str = (reprfunc)SSLError_str; ++ ((PyTypeObject *)PySSLEOFErrorObject)->tp_str = (reprfunc)SSLError_str; ++ ++ if (PyDict_SetItemString(d, "SSLError", PySSLErrorObject) != 0 ++ || PyDict_SetItemString(d, "SSLZeroReturnError", PySSLZeroReturnErrorObject) != 0 ++ || PyDict_SetItemString(d, "SSLWantReadError", PySSLWantReadErrorObject) != 0 ++ || PyDict_SetItemString(d, "SSLWantWriteError", PySSLWantWriteErrorObject) != 0 ++ || PyDict_SetItemString(d, "SSLSyscallError", PySSLSyscallErrorObject) != 0 ++ || PyDict_SetItemString(d, "SSLEOFError", PySSLEOFErrorObject) != 0) ++ return; ++ if (PyDict_SetItemString(d, "_SSLContext", ++ (PyObject *)&PySSLContext_Type) != 0) ++ return; ++ if (PyDict_SetItemString(d, "_SSLSocket", ++ (PyObject *)&PySSLSocket_Type) != 0) + return; + PyModule_AddIntConstant(m, "SSL_ERROR_ZERO_RETURN", + PY_SSL_ERROR_ZERO_RETURN); +@@ -1802,6 +3963,66 @@ + PY_SSL_CERT_OPTIONAL); + PyModule_AddIntConstant(m, "CERT_REQUIRED", + PY_SSL_CERT_REQUIRED); ++ /* CRL verification for verification_flags */ ++ PyModule_AddIntConstant(m, "VERIFY_DEFAULT", ++ 0); ++ PyModule_AddIntConstant(m, "VERIFY_CRL_CHECK_LEAF", ++ X509_V_FLAG_CRL_CHECK); ++ PyModule_AddIntConstant(m, "VERIFY_CRL_CHECK_CHAIN", ++ X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL); ++ PyModule_AddIntConstant(m, "VERIFY_X509_STRICT", ++ X509_V_FLAG_X509_STRICT); ++ ++ /* Alert Descriptions from ssl.h */ ++ /* note RESERVED constants no longer intended for use have been removed */ ++ /* http://www.iana.org/assignments/tls-parameters/tls-parameters.xml#tls-parameters-6 */ ++ ++#define ADD_AD_CONSTANT(s) \ ++ PyModule_AddIntConstant(m, "ALERT_DESCRIPTION_"#s, \ ++ SSL_AD_##s) ++ ++ ADD_AD_CONSTANT(CLOSE_NOTIFY); ++ ADD_AD_CONSTANT(UNEXPECTED_MESSAGE); ++ ADD_AD_CONSTANT(BAD_RECORD_MAC); ++ ADD_AD_CONSTANT(RECORD_OVERFLOW); ++ ADD_AD_CONSTANT(DECOMPRESSION_FAILURE); ++ ADD_AD_CONSTANT(HANDSHAKE_FAILURE); ++ ADD_AD_CONSTANT(BAD_CERTIFICATE); ++ ADD_AD_CONSTANT(UNSUPPORTED_CERTIFICATE); ++ ADD_AD_CONSTANT(CERTIFICATE_REVOKED); ++ ADD_AD_CONSTANT(CERTIFICATE_EXPIRED); ++ ADD_AD_CONSTANT(CERTIFICATE_UNKNOWN); ++ ADD_AD_CONSTANT(ILLEGAL_PARAMETER); ++ ADD_AD_CONSTANT(UNKNOWN_CA); ++ ADD_AD_CONSTANT(ACCESS_DENIED); ++ ADD_AD_CONSTANT(DECODE_ERROR); ++ ADD_AD_CONSTANT(DECRYPT_ERROR); ++ ADD_AD_CONSTANT(PROTOCOL_VERSION); ++ ADD_AD_CONSTANT(INSUFFICIENT_SECURITY); ++ ADD_AD_CONSTANT(INTERNAL_ERROR); ++ ADD_AD_CONSTANT(USER_CANCELLED); ++ ADD_AD_CONSTANT(NO_RENEGOTIATION); ++ /* Not all constants are in old OpenSSL versions */ ++#ifdef SSL_AD_UNSUPPORTED_EXTENSION ++ ADD_AD_CONSTANT(UNSUPPORTED_EXTENSION); ++#endif ++#ifdef SSL_AD_CERTIFICATE_UNOBTAINABLE ++ ADD_AD_CONSTANT(CERTIFICATE_UNOBTAINABLE); ++#endif ++#ifdef SSL_AD_UNRECOGNIZED_NAME ++ ADD_AD_CONSTANT(UNRECOGNIZED_NAME); ++#endif ++#ifdef SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE ++ ADD_AD_CONSTANT(BAD_CERTIFICATE_STATUS_RESPONSE); ++#endif ++#ifdef SSL_AD_BAD_CERTIFICATE_HASH_VALUE ++ ADD_AD_CONSTANT(BAD_CERTIFICATE_HASH_VALUE); ++#endif ++#ifdef SSL_AD_UNKNOWN_PSK_IDENTITY ++ ADD_AD_CONSTANT(UNKNOWN_PSK_IDENTITY); ++#endif ++ ++#undef ADD_AD_CONSTANT + + /* protocol versions */ + #ifndef OPENSSL_NO_SSL2 +@@ -1814,6 +4035,109 @@ + PY_SSL_VERSION_SSL23); + PyModule_AddIntConstant(m, "PROTOCOL_TLSv1", + PY_SSL_VERSION_TLS1); ++#if HAVE_TLSv1_2 ++ PyModule_AddIntConstant(m, "PROTOCOL_TLSv1_1", ++ PY_SSL_VERSION_TLS1_1); ++ PyModule_AddIntConstant(m, "PROTOCOL_TLSv1_2", ++ PY_SSL_VERSION_TLS1_2); ++#endif ++ ++ /* protocol options */ ++ PyModule_AddIntConstant(m, "OP_ALL", ++ SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); ++ PyModule_AddIntConstant(m, "OP_NO_SSLv2", SSL_OP_NO_SSLv2); ++ PyModule_AddIntConstant(m, "OP_NO_SSLv3", SSL_OP_NO_SSLv3); ++ PyModule_AddIntConstant(m, "OP_NO_TLSv1", SSL_OP_NO_TLSv1); ++#if HAVE_TLSv1_2 ++ PyModule_AddIntConstant(m, "OP_NO_TLSv1_1", SSL_OP_NO_TLSv1_1); ++ PyModule_AddIntConstant(m, "OP_NO_TLSv1_2", SSL_OP_NO_TLSv1_2); ++#endif ++ PyModule_AddIntConstant(m, "OP_CIPHER_SERVER_PREFERENCE", ++ SSL_OP_CIPHER_SERVER_PREFERENCE); ++ PyModule_AddIntConstant(m, "OP_SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE); ++#ifdef SSL_OP_SINGLE_ECDH_USE ++ PyModule_AddIntConstant(m, "OP_SINGLE_ECDH_USE", SSL_OP_SINGLE_ECDH_USE); ++#endif ++#ifdef SSL_OP_NO_COMPRESSION ++ PyModule_AddIntConstant(m, "OP_NO_COMPRESSION", ++ SSL_OP_NO_COMPRESSION); ++#endif ++ ++#if HAVE_SNI ++ r = Py_True; ++#else ++ r = Py_False; ++#endif ++ Py_INCREF(r); ++ PyModule_AddObject(m, "HAS_SNI", r); ++ ++#if HAVE_OPENSSL_FINISHED ++ r = Py_True; ++#else ++ r = Py_False; ++#endif ++ Py_INCREF(r); ++ PyModule_AddObject(m, "HAS_TLS_UNIQUE", r); ++ ++#ifdef OPENSSL_NO_ECDH ++ r = Py_False; ++#else ++ r = Py_True; ++#endif ++ Py_INCREF(r); ++ PyModule_AddObject(m, "HAS_ECDH", r); ++ ++#ifdef OPENSSL_NPN_NEGOTIATED ++ r = Py_True; ++#else ++ r = Py_False; ++#endif ++ Py_INCREF(r); ++ PyModule_AddObject(m, "HAS_NPN", r); ++ ++ /* Mappings for error codes */ ++ err_codes_to_names = PyDict_New(); ++ err_names_to_codes = PyDict_New(); ++ if (err_codes_to_names == NULL || err_names_to_codes == NULL) ++ return; ++ errcode = error_codes; ++ while (errcode->mnemonic != NULL) { ++ PyObject *mnemo, *key; ++ mnemo = PyUnicode_FromString(errcode->mnemonic); ++ key = Py_BuildValue("ii", errcode->library, errcode->reason); ++ if (mnemo == NULL || key == NULL) ++ return; ++ if (PyDict_SetItem(err_codes_to_names, key, mnemo)) ++ return; ++ if (PyDict_SetItem(err_names_to_codes, mnemo, key)) ++ return; ++ Py_DECREF(key); ++ Py_DECREF(mnemo); ++ errcode++; ++ } ++ if (PyModule_AddObject(m, "err_codes_to_names", err_codes_to_names)) ++ return; ++ if (PyModule_AddObject(m, "err_names_to_codes", err_names_to_codes)) ++ return; ++ ++ lib_codes_to_names = PyDict_New(); ++ if (lib_codes_to_names == NULL) ++ return; ++ libcode = library_codes; ++ while (libcode->library != NULL) { ++ PyObject *mnemo, *key; ++ key = PyLong_FromLong(libcode->code); ++ mnemo = PyUnicode_FromString(libcode->library); ++ if (key == NULL || mnemo == NULL) ++ return; ++ if (PyDict_SetItem(lib_codes_to_names, key, mnemo)) ++ return; ++ Py_DECREF(key); ++ Py_DECREF(mnemo); ++ libcode++; ++ } ++ if (PyModule_AddObject(m, "lib_codes_to_names", lib_codes_to_names)) ++ return; + + /* OpenSSL version */ + /* SSLeay() gives us the version of the library linked against, +@@ -1825,15 +4149,7 @@ + return; + if (PyModule_AddObject(m, "OPENSSL_VERSION_NUMBER", r)) + return; +- status = libver & 0xF; +- libver >>= 4; +- patch = libver & 0xFF; +- libver >>= 8; +- fix = libver & 0xFF; +- libver >>= 8; +- minor = libver & 0xFF; +- libver >>= 8; +- major = libver & 0xFF; ++ parse_openssl_version(libver, &major, &minor, &fix, &patch, &status); + r = Py_BuildValue("IIIII", major, minor, fix, patch, status); + if (r == NULL || PyModule_AddObject(m, "OPENSSL_VERSION_INFO", r)) + return; +@@ -1841,4 +4157,9 @@ + if (r == NULL || PyModule_AddObject(m, "OPENSSL_VERSION", r)) + return; + ++ libver = OPENSSL_VERSION_NUMBER; ++ parse_openssl_version(libver, &major, &minor, &fix, &patch, &status); ++ r = Py_BuildValue("IIIII", major, minor, fix, patch, status); ++ if (r == NULL || PyModule_AddObject(m, "_OPENSSL_API_VERSION", r)) ++ return; + } +diff -r ee879c0ffa11 Modules/_ssl_data.h +--- /dev/null ++++ b/Modules/_ssl_data.h +@@ -0,0 +1,1653 @@ ++/* File generated by Tools/ssl/make_ssl_data.py */ ++/* Generated on 2012-05-16T23:56:40.981382 */ ++ ++static struct py_ssl_library_code library_codes[] = { ++ {"PEM", ERR_LIB_PEM}, ++ {"SSL", ERR_LIB_SSL}, ++ {"X509", ERR_LIB_X509}, ++ { NULL } ++}; ++ ++static struct py_ssl_error_code error_codes[] = { ++ #ifdef PEM_R_BAD_BASE64_DECODE ++ {"BAD_BASE64_DECODE", ERR_LIB_PEM, PEM_R_BAD_BASE64_DECODE}, ++ #else ++ {"BAD_BASE64_DECODE", ERR_LIB_PEM, 100}, ++ #endif ++ #ifdef PEM_R_BAD_DECRYPT ++ {"BAD_DECRYPT", ERR_LIB_PEM, PEM_R_BAD_DECRYPT}, ++ #else ++ {"BAD_DECRYPT", ERR_LIB_PEM, 101}, ++ #endif ++ #ifdef PEM_R_BAD_END_LINE ++ {"BAD_END_LINE", ERR_LIB_PEM, PEM_R_BAD_END_LINE}, ++ #else ++ {"BAD_END_LINE", ERR_LIB_PEM, 102}, ++ #endif ++ #ifdef PEM_R_BAD_IV_CHARS ++ {"BAD_IV_CHARS", ERR_LIB_PEM, PEM_R_BAD_IV_CHARS}, ++ #else ++ {"BAD_IV_CHARS", ERR_LIB_PEM, 103}, ++ #endif ++ #ifdef PEM_R_BAD_MAGIC_NUMBER ++ {"BAD_MAGIC_NUMBER", ERR_LIB_PEM, PEM_R_BAD_MAGIC_NUMBER}, ++ #else ++ {"BAD_MAGIC_NUMBER", ERR_LIB_PEM, 116}, ++ #endif ++ #ifdef PEM_R_BAD_PASSWORD_READ ++ {"BAD_PASSWORD_READ", ERR_LIB_PEM, PEM_R_BAD_PASSWORD_READ}, ++ #else ++ {"BAD_PASSWORD_READ", ERR_LIB_PEM, 104}, ++ #endif ++ #ifdef PEM_R_BAD_VERSION_NUMBER ++ {"BAD_VERSION_NUMBER", ERR_LIB_PEM, PEM_R_BAD_VERSION_NUMBER}, ++ #else ++ {"BAD_VERSION_NUMBER", ERR_LIB_PEM, 117}, ++ #endif ++ #ifdef PEM_R_BIO_WRITE_FAILURE ++ {"BIO_WRITE_FAILURE", ERR_LIB_PEM, PEM_R_BIO_WRITE_FAILURE}, ++ #else ++ {"BIO_WRITE_FAILURE", ERR_LIB_PEM, 118}, ++ #endif ++ #ifdef PEM_R_CIPHER_IS_NULL ++ {"CIPHER_IS_NULL", ERR_LIB_PEM, PEM_R_CIPHER_IS_NULL}, ++ #else ++ {"CIPHER_IS_NULL", ERR_LIB_PEM, 127}, ++ #endif ++ #ifdef PEM_R_ERROR_CONVERTING_PRIVATE_KEY ++ {"ERROR_CONVERTING_PRIVATE_KEY", ERR_LIB_PEM, PEM_R_ERROR_CONVERTING_PRIVATE_KEY}, ++ #else ++ {"ERROR_CONVERTING_PRIVATE_KEY", ERR_LIB_PEM, 115}, ++ #endif ++ #ifdef PEM_R_EXPECTING_PRIVATE_KEY_BLOB ++ {"EXPECTING_PRIVATE_KEY_BLOB", ERR_LIB_PEM, PEM_R_EXPECTING_PRIVATE_KEY_BLOB}, ++ #else ++ {"EXPECTING_PRIVATE_KEY_BLOB", ERR_LIB_PEM, 119}, ++ #endif ++ #ifdef PEM_R_EXPECTING_PUBLIC_KEY_BLOB ++ {"EXPECTING_PUBLIC_KEY_BLOB", ERR_LIB_PEM, PEM_R_EXPECTING_PUBLIC_KEY_BLOB}, ++ #else ++ {"EXPECTING_PUBLIC_KEY_BLOB", ERR_LIB_PEM, 120}, ++ #endif ++ #ifdef PEM_R_INCONSISTENT_HEADER ++ {"INCONSISTENT_HEADER", ERR_LIB_PEM, PEM_R_INCONSISTENT_HEADER}, ++ #else ++ {"INCONSISTENT_HEADER", ERR_LIB_PEM, 121}, ++ #endif ++ #ifdef PEM_R_KEYBLOB_HEADER_PARSE_ERROR ++ {"KEYBLOB_HEADER_PARSE_ERROR", ERR_LIB_PEM, PEM_R_KEYBLOB_HEADER_PARSE_ERROR}, ++ #else ++ {"KEYBLOB_HEADER_PARSE_ERROR", ERR_LIB_PEM, 122}, ++ #endif ++ #ifdef PEM_R_KEYBLOB_TOO_SHORT ++ {"KEYBLOB_TOO_SHORT", ERR_LIB_PEM, PEM_R_KEYBLOB_TOO_SHORT}, ++ #else ++ {"KEYBLOB_TOO_SHORT", ERR_LIB_PEM, 123}, ++ #endif ++ #ifdef PEM_R_NOT_DEK_INFO ++ {"NOT_DEK_INFO", ERR_LIB_PEM, PEM_R_NOT_DEK_INFO}, ++ #else ++ {"NOT_DEK_INFO", ERR_LIB_PEM, 105}, ++ #endif ++ #ifdef PEM_R_NOT_ENCRYPTED ++ {"NOT_ENCRYPTED", ERR_LIB_PEM, PEM_R_NOT_ENCRYPTED}, ++ #else ++ {"NOT_ENCRYPTED", ERR_LIB_PEM, 106}, ++ #endif ++ #ifdef PEM_R_NOT_PROC_TYPE ++ {"NOT_PROC_TYPE", ERR_LIB_PEM, PEM_R_NOT_PROC_TYPE}, ++ #else ++ {"NOT_PROC_TYPE", ERR_LIB_PEM, 107}, ++ #endif ++ #ifdef PEM_R_NO_START_LINE ++ {"NO_START_LINE", ERR_LIB_PEM, PEM_R_NO_START_LINE}, ++ #else ++ {"NO_START_LINE", ERR_LIB_PEM, 108}, ++ #endif ++ #ifdef PEM_R_PROBLEMS_GETTING_PASSWORD ++ {"PROBLEMS_GETTING_PASSWORD", ERR_LIB_PEM, PEM_R_PROBLEMS_GETTING_PASSWORD}, ++ #else ++ {"PROBLEMS_GETTING_PASSWORD", ERR_LIB_PEM, 109}, ++ #endif ++ #ifdef PEM_R_PUBLIC_KEY_NO_RSA ++ {"PUBLIC_KEY_NO_RSA", ERR_LIB_PEM, PEM_R_PUBLIC_KEY_NO_RSA}, ++ #else ++ {"PUBLIC_KEY_NO_RSA", ERR_LIB_PEM, 110}, ++ #endif ++ #ifdef PEM_R_PVK_DATA_TOO_SHORT ++ {"PVK_DATA_TOO_SHORT", ERR_LIB_PEM, PEM_R_PVK_DATA_TOO_SHORT}, ++ #else ++ {"PVK_DATA_TOO_SHORT", ERR_LIB_PEM, 124}, ++ #endif ++ #ifdef PEM_R_PVK_TOO_SHORT ++ {"PVK_TOO_SHORT", ERR_LIB_PEM, PEM_R_PVK_TOO_SHORT}, ++ #else ++ {"PVK_TOO_SHORT", ERR_LIB_PEM, 125}, ++ #endif ++ #ifdef PEM_R_READ_KEY ++ {"READ_KEY", ERR_LIB_PEM, PEM_R_READ_KEY}, ++ #else ++ {"READ_KEY", ERR_LIB_PEM, 111}, ++ #endif ++ #ifdef PEM_R_SHORT_HEADER ++ {"SHORT_HEADER", ERR_LIB_PEM, PEM_R_SHORT_HEADER}, ++ #else ++ {"SHORT_HEADER", ERR_LIB_PEM, 112}, ++ #endif ++ #ifdef PEM_R_UNSUPPORTED_CIPHER ++ {"UNSUPPORTED_CIPHER", ERR_LIB_PEM, PEM_R_UNSUPPORTED_CIPHER}, ++ #else ++ {"UNSUPPORTED_CIPHER", ERR_LIB_PEM, 113}, ++ #endif ++ #ifdef PEM_R_UNSUPPORTED_ENCRYPTION ++ {"UNSUPPORTED_ENCRYPTION", ERR_LIB_PEM, PEM_R_UNSUPPORTED_ENCRYPTION}, ++ #else ++ {"UNSUPPORTED_ENCRYPTION", ERR_LIB_PEM, 114}, ++ #endif ++ #ifdef PEM_R_UNSUPPORTED_KEY_COMPONENTS ++ {"UNSUPPORTED_KEY_COMPONENTS", ERR_LIB_PEM, PEM_R_UNSUPPORTED_KEY_COMPONENTS}, ++ #else ++ {"UNSUPPORTED_KEY_COMPONENTS", ERR_LIB_PEM, 126}, ++ #endif ++ #ifdef SSL_R_APP_DATA_IN_HANDSHAKE ++ {"APP_DATA_IN_HANDSHAKE", ERR_LIB_SSL, SSL_R_APP_DATA_IN_HANDSHAKE}, ++ #else ++ {"APP_DATA_IN_HANDSHAKE", ERR_LIB_SSL, 100}, ++ #endif ++ #ifdef SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT ++ {"ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT", ERR_LIB_SSL, SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT}, ++ #else ++ {"ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT", ERR_LIB_SSL, 272}, ++ #endif ++ #ifdef SSL_R_BAD_ALERT_RECORD ++ {"BAD_ALERT_RECORD", ERR_LIB_SSL, SSL_R_BAD_ALERT_RECORD}, ++ #else ++ {"BAD_ALERT_RECORD", ERR_LIB_SSL, 101}, ++ #endif ++ #ifdef SSL_R_BAD_AUTHENTICATION_TYPE ++ {"BAD_AUTHENTICATION_TYPE", ERR_LIB_SSL, SSL_R_BAD_AUTHENTICATION_TYPE}, ++ #else ++ {"BAD_AUTHENTICATION_TYPE", ERR_LIB_SSL, 102}, ++ #endif ++ #ifdef SSL_R_BAD_CHANGE_CIPHER_SPEC ++ {"BAD_CHANGE_CIPHER_SPEC", ERR_LIB_SSL, SSL_R_BAD_CHANGE_CIPHER_SPEC}, ++ #else ++ {"BAD_CHANGE_CIPHER_SPEC", ERR_LIB_SSL, 103}, ++ #endif ++ #ifdef SSL_R_BAD_CHECKSUM ++ {"BAD_CHECKSUM", ERR_LIB_SSL, SSL_R_BAD_CHECKSUM}, ++ #else ++ {"BAD_CHECKSUM", ERR_LIB_SSL, 104}, ++ #endif ++ #ifdef SSL_R_BAD_DATA_RETURNED_BY_CALLBACK ++ {"BAD_DATA_RETURNED_BY_CALLBACK", ERR_LIB_SSL, SSL_R_BAD_DATA_RETURNED_BY_CALLBACK}, ++ #else ++ {"BAD_DATA_RETURNED_BY_CALLBACK", ERR_LIB_SSL, 106}, ++ #endif ++ #ifdef SSL_R_BAD_DECOMPRESSION ++ {"BAD_DECOMPRESSION", ERR_LIB_SSL, SSL_R_BAD_DECOMPRESSION}, ++ #else ++ {"BAD_DECOMPRESSION", ERR_LIB_SSL, 107}, ++ #endif ++ #ifdef SSL_R_BAD_DH_G_LENGTH ++ {"BAD_DH_G_LENGTH", ERR_LIB_SSL, SSL_R_BAD_DH_G_LENGTH}, ++ #else ++ {"BAD_DH_G_LENGTH", ERR_LIB_SSL, 108}, ++ #endif ++ #ifdef SSL_R_BAD_DH_PUB_KEY_LENGTH ++ {"BAD_DH_PUB_KEY_LENGTH", ERR_LIB_SSL, SSL_R_BAD_DH_PUB_KEY_LENGTH}, ++ #else ++ {"BAD_DH_PUB_KEY_LENGTH", ERR_LIB_SSL, 109}, ++ #endif ++ #ifdef SSL_R_BAD_DH_P_LENGTH ++ {"BAD_DH_P_LENGTH", ERR_LIB_SSL, SSL_R_BAD_DH_P_LENGTH}, ++ #else ++ {"BAD_DH_P_LENGTH", ERR_LIB_SSL, 110}, ++ #endif ++ #ifdef SSL_R_BAD_DIGEST_LENGTH ++ {"BAD_DIGEST_LENGTH", ERR_LIB_SSL, SSL_R_BAD_DIGEST_LENGTH}, ++ #else ++ {"BAD_DIGEST_LENGTH", ERR_LIB_SSL, 111}, ++ #endif ++ #ifdef SSL_R_BAD_DSA_SIGNATURE ++ {"BAD_DSA_SIGNATURE", ERR_LIB_SSL, SSL_R_BAD_DSA_SIGNATURE}, ++ #else ++ {"BAD_DSA_SIGNATURE", ERR_LIB_SSL, 112}, ++ #endif ++ #ifdef SSL_R_BAD_ECC_CERT ++ {"BAD_ECC_CERT", ERR_LIB_SSL, SSL_R_BAD_ECC_CERT}, ++ #else ++ {"BAD_ECC_CERT", ERR_LIB_SSL, 304}, ++ #endif ++ #ifdef SSL_R_BAD_ECDSA_SIGNATURE ++ {"BAD_ECDSA_SIGNATURE", ERR_LIB_SSL, SSL_R_BAD_ECDSA_SIGNATURE}, ++ #else ++ {"BAD_ECDSA_SIGNATURE", ERR_LIB_SSL, 305}, ++ #endif ++ #ifdef SSL_R_BAD_ECPOINT ++ {"BAD_ECPOINT", ERR_LIB_SSL, SSL_R_BAD_ECPOINT}, ++ #else ++ {"BAD_ECPOINT", ERR_LIB_SSL, 306}, ++ #endif ++ #ifdef SSL_R_BAD_HANDSHAKE_LENGTH ++ {"BAD_HANDSHAKE_LENGTH", ERR_LIB_SSL, SSL_R_BAD_HANDSHAKE_LENGTH}, ++ #else ++ {"BAD_HANDSHAKE_LENGTH", ERR_LIB_SSL, 332}, ++ #endif ++ #ifdef SSL_R_BAD_HELLO_REQUEST ++ {"BAD_HELLO_REQUEST", ERR_LIB_SSL, SSL_R_BAD_HELLO_REQUEST}, ++ #else ++ {"BAD_HELLO_REQUEST", ERR_LIB_SSL, 105}, ++ #endif ++ #ifdef SSL_R_BAD_LENGTH ++ {"BAD_LENGTH", ERR_LIB_SSL, SSL_R_BAD_LENGTH}, ++ #else ++ {"BAD_LENGTH", ERR_LIB_SSL, 271}, ++ #endif ++ #ifdef SSL_R_BAD_MAC_DECODE ++ {"BAD_MAC_DECODE", ERR_LIB_SSL, SSL_R_BAD_MAC_DECODE}, ++ #else ++ {"BAD_MAC_DECODE", ERR_LIB_SSL, 113}, ++ #endif ++ #ifdef SSL_R_BAD_MAC_LENGTH ++ {"BAD_MAC_LENGTH", ERR_LIB_SSL, SSL_R_BAD_MAC_LENGTH}, ++ #else ++ {"BAD_MAC_LENGTH", ERR_LIB_SSL, 333}, ++ #endif ++ #ifdef SSL_R_BAD_MESSAGE_TYPE ++ {"BAD_MESSAGE_TYPE", ERR_LIB_SSL, SSL_R_BAD_MESSAGE_TYPE}, ++ #else ++ {"BAD_MESSAGE_TYPE", ERR_LIB_SSL, 114}, ++ #endif ++ #ifdef SSL_R_BAD_PACKET_LENGTH ++ {"BAD_PACKET_LENGTH", ERR_LIB_SSL, SSL_R_BAD_PACKET_LENGTH}, ++ #else ++ {"BAD_PACKET_LENGTH", ERR_LIB_SSL, 115}, ++ #endif ++ #ifdef SSL_R_BAD_PROTOCOL_VERSION_NUMBER ++ {"BAD_PROTOCOL_VERSION_NUMBER", ERR_LIB_SSL, SSL_R_BAD_PROTOCOL_VERSION_NUMBER}, ++ #else ++ {"BAD_PROTOCOL_VERSION_NUMBER", ERR_LIB_SSL, 116}, ++ #endif ++ #ifdef SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH ++ {"BAD_PSK_IDENTITY_HINT_LENGTH", ERR_LIB_SSL, SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH}, ++ #else ++ {"BAD_PSK_IDENTITY_HINT_LENGTH", ERR_LIB_SSL, 316}, ++ #endif ++ #ifdef SSL_R_BAD_RESPONSE_ARGUMENT ++ {"BAD_RESPONSE_ARGUMENT", ERR_LIB_SSL, SSL_R_BAD_RESPONSE_ARGUMENT}, ++ #else ++ {"BAD_RESPONSE_ARGUMENT", ERR_LIB_SSL, 117}, ++ #endif ++ #ifdef SSL_R_BAD_RSA_DECRYPT ++ {"BAD_RSA_DECRYPT", ERR_LIB_SSL, SSL_R_BAD_RSA_DECRYPT}, ++ #else ++ {"BAD_RSA_DECRYPT", ERR_LIB_SSL, 118}, ++ #endif ++ #ifdef SSL_R_BAD_RSA_ENCRYPT ++ {"BAD_RSA_ENCRYPT", ERR_LIB_SSL, SSL_R_BAD_RSA_ENCRYPT}, ++ #else ++ {"BAD_RSA_ENCRYPT", ERR_LIB_SSL, 119}, ++ #endif ++ #ifdef SSL_R_BAD_RSA_E_LENGTH ++ {"BAD_RSA_E_LENGTH", ERR_LIB_SSL, SSL_R_BAD_RSA_E_LENGTH}, ++ #else ++ {"BAD_RSA_E_LENGTH", ERR_LIB_SSL, 120}, ++ #endif ++ #ifdef SSL_R_BAD_RSA_MODULUS_LENGTH ++ {"BAD_RSA_MODULUS_LENGTH", ERR_LIB_SSL, SSL_R_BAD_RSA_MODULUS_LENGTH}, ++ #else ++ {"BAD_RSA_MODULUS_LENGTH", ERR_LIB_SSL, 121}, ++ #endif ++ #ifdef SSL_R_BAD_RSA_SIGNATURE ++ {"BAD_RSA_SIGNATURE", ERR_LIB_SSL, SSL_R_BAD_RSA_SIGNATURE}, ++ #else ++ {"BAD_RSA_SIGNATURE", ERR_LIB_SSL, 122}, ++ #endif ++ #ifdef SSL_R_BAD_SIGNATURE ++ {"BAD_SIGNATURE", ERR_LIB_SSL, SSL_R_BAD_SIGNATURE}, ++ #else ++ {"BAD_SIGNATURE", ERR_LIB_SSL, 123}, ++ #endif ++ #ifdef SSL_R_BAD_SSL_FILETYPE ++ {"BAD_SSL_FILETYPE", ERR_LIB_SSL, SSL_R_BAD_SSL_FILETYPE}, ++ #else ++ {"BAD_SSL_FILETYPE", ERR_LIB_SSL, 124}, ++ #endif ++ #ifdef SSL_R_BAD_SSL_SESSION_ID_LENGTH ++ {"BAD_SSL_SESSION_ID_LENGTH", ERR_LIB_SSL, SSL_R_BAD_SSL_SESSION_ID_LENGTH}, ++ #else ++ {"BAD_SSL_SESSION_ID_LENGTH", ERR_LIB_SSL, 125}, ++ #endif ++ #ifdef SSL_R_BAD_STATE ++ {"BAD_STATE", ERR_LIB_SSL, SSL_R_BAD_STATE}, ++ #else ++ {"BAD_STATE", ERR_LIB_SSL, 126}, ++ #endif ++ #ifdef SSL_R_BAD_WRITE_RETRY ++ {"BAD_WRITE_RETRY", ERR_LIB_SSL, SSL_R_BAD_WRITE_RETRY}, ++ #else ++ {"BAD_WRITE_RETRY", ERR_LIB_SSL, 127}, ++ #endif ++ #ifdef SSL_R_BIO_NOT_SET ++ {"BIO_NOT_SET", ERR_LIB_SSL, SSL_R_BIO_NOT_SET}, ++ #else ++ {"BIO_NOT_SET", ERR_LIB_SSL, 128}, ++ #endif ++ #ifdef SSL_R_BLOCK_CIPHER_PAD_IS_WRONG ++ {"BLOCK_CIPHER_PAD_IS_WRONG", ERR_LIB_SSL, SSL_R_BLOCK_CIPHER_PAD_IS_WRONG}, ++ #else ++ {"BLOCK_CIPHER_PAD_IS_WRONG", ERR_LIB_SSL, 129}, ++ #endif ++ #ifdef SSL_R_BN_LIB ++ {"BN_LIB", ERR_LIB_SSL, SSL_R_BN_LIB}, ++ #else ++ {"BN_LIB", ERR_LIB_SSL, 130}, ++ #endif ++ #ifdef SSL_R_CA_DN_LENGTH_MISMATCH ++ {"CA_DN_LENGTH_MISMATCH", ERR_LIB_SSL, SSL_R_CA_DN_LENGTH_MISMATCH}, ++ #else ++ {"CA_DN_LENGTH_MISMATCH", ERR_LIB_SSL, 131}, ++ #endif ++ #ifdef SSL_R_CA_DN_TOO_LONG ++ {"CA_DN_TOO_LONG", ERR_LIB_SSL, SSL_R_CA_DN_TOO_LONG}, ++ #else ++ {"CA_DN_TOO_LONG", ERR_LIB_SSL, 132}, ++ #endif ++ #ifdef SSL_R_CCS_RECEIVED_EARLY ++ {"CCS_RECEIVED_EARLY", ERR_LIB_SSL, SSL_R_CCS_RECEIVED_EARLY}, ++ #else ++ {"CCS_RECEIVED_EARLY", ERR_LIB_SSL, 133}, ++ #endif ++ #ifdef SSL_R_CERTIFICATE_VERIFY_FAILED ++ {"CERTIFICATE_VERIFY_FAILED", ERR_LIB_SSL, SSL_R_CERTIFICATE_VERIFY_FAILED}, ++ #else ++ {"CERTIFICATE_VERIFY_FAILED", ERR_LIB_SSL, 134}, ++ #endif ++ #ifdef SSL_R_CERT_LENGTH_MISMATCH ++ {"CERT_LENGTH_MISMATCH", ERR_LIB_SSL, SSL_R_CERT_LENGTH_MISMATCH}, ++ #else ++ {"CERT_LENGTH_MISMATCH", ERR_LIB_SSL, 135}, ++ #endif ++ #ifdef SSL_R_CHALLENGE_IS_DIFFERENT ++ {"CHALLENGE_IS_DIFFERENT", ERR_LIB_SSL, SSL_R_CHALLENGE_IS_DIFFERENT}, ++ #else ++ {"CHALLENGE_IS_DIFFERENT", ERR_LIB_SSL, 136}, ++ #endif ++ #ifdef SSL_R_CIPHER_CODE_WRONG_LENGTH ++ {"CIPHER_CODE_WRONG_LENGTH", ERR_LIB_SSL, SSL_R_CIPHER_CODE_WRONG_LENGTH}, ++ #else ++ {"CIPHER_CODE_WRONG_LENGTH", ERR_LIB_SSL, 137}, ++ #endif ++ #ifdef SSL_R_CIPHER_OR_HASH_UNAVAILABLE ++ {"CIPHER_OR_HASH_UNAVAILABLE", ERR_LIB_SSL, SSL_R_CIPHER_OR_HASH_UNAVAILABLE}, ++ #else ++ {"CIPHER_OR_HASH_UNAVAILABLE", ERR_LIB_SSL, 138}, ++ #endif ++ #ifdef SSL_R_CIPHER_TABLE_SRC_ERROR ++ {"CIPHER_TABLE_SRC_ERROR", ERR_LIB_SSL, SSL_R_CIPHER_TABLE_SRC_ERROR}, ++ #else ++ {"CIPHER_TABLE_SRC_ERROR", ERR_LIB_SSL, 139}, ++ #endif ++ #ifdef SSL_R_CLIENTHELLO_TLSEXT ++ {"CLIENTHELLO_TLSEXT", ERR_LIB_SSL, SSL_R_CLIENTHELLO_TLSEXT}, ++ #else ++ {"CLIENTHELLO_TLSEXT", ERR_LIB_SSL, 226}, ++ #endif ++ #ifdef SSL_R_COMPRESSED_LENGTH_TOO_LONG ++ {"COMPRESSED_LENGTH_TOO_LONG", ERR_LIB_SSL, SSL_R_COMPRESSED_LENGTH_TOO_LONG}, ++ #else ++ {"COMPRESSED_LENGTH_TOO_LONG", ERR_LIB_SSL, 140}, ++ #endif ++ #ifdef SSL_R_COMPRESSION_DISABLED ++ {"COMPRESSION_DISABLED", ERR_LIB_SSL, SSL_R_COMPRESSION_DISABLED}, ++ #else ++ {"COMPRESSION_DISABLED", ERR_LIB_SSL, 343}, ++ #endif ++ #ifdef SSL_R_COMPRESSION_FAILURE ++ {"COMPRESSION_FAILURE", ERR_LIB_SSL, SSL_R_COMPRESSION_FAILURE}, ++ #else ++ {"COMPRESSION_FAILURE", ERR_LIB_SSL, 141}, ++ #endif ++ #ifdef SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE ++ {"COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE", ERR_LIB_SSL, SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE}, ++ #else ++ {"COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE", ERR_LIB_SSL, 307}, ++ #endif ++ #ifdef SSL_R_COMPRESSION_LIBRARY_ERROR ++ {"COMPRESSION_LIBRARY_ERROR", ERR_LIB_SSL, SSL_R_COMPRESSION_LIBRARY_ERROR}, ++ #else ++ {"COMPRESSION_LIBRARY_ERROR", ERR_LIB_SSL, 142}, ++ #endif ++ #ifdef SSL_R_CONNECTION_ID_IS_DIFFERENT ++ {"CONNECTION_ID_IS_DIFFERENT", ERR_LIB_SSL, SSL_R_CONNECTION_ID_IS_DIFFERENT}, ++ #else ++ {"CONNECTION_ID_IS_DIFFERENT", ERR_LIB_SSL, 143}, ++ #endif ++ #ifdef SSL_R_CONNECTION_TYPE_NOT_SET ++ {"CONNECTION_TYPE_NOT_SET", ERR_LIB_SSL, SSL_R_CONNECTION_TYPE_NOT_SET}, ++ #else ++ {"CONNECTION_TYPE_NOT_SET", ERR_LIB_SSL, 144}, ++ #endif ++ #ifdef SSL_R_COOKIE_MISMATCH ++ {"COOKIE_MISMATCH", ERR_LIB_SSL, SSL_R_COOKIE_MISMATCH}, ++ #else ++ {"COOKIE_MISMATCH", ERR_LIB_SSL, 308}, ++ #endif ++ #ifdef SSL_R_DATA_BETWEEN_CCS_AND_FINISHED ++ {"DATA_BETWEEN_CCS_AND_FINISHED", ERR_LIB_SSL, SSL_R_DATA_BETWEEN_CCS_AND_FINISHED}, ++ #else ++ {"DATA_BETWEEN_CCS_AND_FINISHED", ERR_LIB_SSL, 145}, ++ #endif ++ #ifdef SSL_R_DATA_LENGTH_TOO_LONG ++ {"DATA_LENGTH_TOO_LONG", ERR_LIB_SSL, SSL_R_DATA_LENGTH_TOO_LONG}, ++ #else ++ {"DATA_LENGTH_TOO_LONG", ERR_LIB_SSL, 146}, ++ #endif ++ #ifdef SSL_R_DECRYPTION_FAILED ++ {"DECRYPTION_FAILED", ERR_LIB_SSL, SSL_R_DECRYPTION_FAILED}, ++ #else ++ {"DECRYPTION_FAILED", ERR_LIB_SSL, 147}, ++ #endif ++ #ifdef SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC ++ {"DECRYPTION_FAILED_OR_BAD_RECORD_MAC", ERR_LIB_SSL, SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC}, ++ #else ++ {"DECRYPTION_FAILED_OR_BAD_RECORD_MAC", ERR_LIB_SSL, 281}, ++ #endif ++ #ifdef SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG ++ {"DH_PUBLIC_VALUE_LENGTH_IS_WRONG", ERR_LIB_SSL, SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG}, ++ #else ++ {"DH_PUBLIC_VALUE_LENGTH_IS_WRONG", ERR_LIB_SSL, 148}, ++ #endif ++ #ifdef SSL_R_DIGEST_CHECK_FAILED ++ {"DIGEST_CHECK_FAILED", ERR_LIB_SSL, SSL_R_DIGEST_CHECK_FAILED}, ++ #else ++ {"DIGEST_CHECK_FAILED", ERR_LIB_SSL, 149}, ++ #endif ++ #ifdef SSL_R_DTLS_MESSAGE_TOO_BIG ++ {"DTLS_MESSAGE_TOO_BIG", ERR_LIB_SSL, SSL_R_DTLS_MESSAGE_TOO_BIG}, ++ #else ++ {"DTLS_MESSAGE_TOO_BIG", ERR_LIB_SSL, 334}, ++ #endif ++ #ifdef SSL_R_DUPLICATE_COMPRESSION_ID ++ {"DUPLICATE_COMPRESSION_ID", ERR_LIB_SSL, SSL_R_DUPLICATE_COMPRESSION_ID}, ++ #else ++ {"DUPLICATE_COMPRESSION_ID", ERR_LIB_SSL, 309}, ++ #endif ++ #ifdef SSL_R_ECC_CERT_NOT_FOR_KEY_AGREEMENT ++ {"ECC_CERT_NOT_FOR_KEY_AGREEMENT", ERR_LIB_SSL, SSL_R_ECC_CERT_NOT_FOR_KEY_AGREEMENT}, ++ #else ++ {"ECC_CERT_NOT_FOR_KEY_AGREEMENT", ERR_LIB_SSL, 317}, ++ #endif ++ #ifdef SSL_R_ECC_CERT_NOT_FOR_SIGNING ++ {"ECC_CERT_NOT_FOR_SIGNING", ERR_LIB_SSL, SSL_R_ECC_CERT_NOT_FOR_SIGNING}, ++ #else ++ {"ECC_CERT_NOT_FOR_SIGNING", ERR_LIB_SSL, 318}, ++ #endif ++ #ifdef SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE ++ {"ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE", ERR_LIB_SSL, SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE}, ++ #else ++ {"ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE", ERR_LIB_SSL, 322}, ++ #endif ++ #ifdef SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE ++ {"ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE", ERR_LIB_SSL, SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE}, ++ #else ++ {"ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE", ERR_LIB_SSL, 323}, ++ #endif ++ #ifdef SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER ++ {"ECGROUP_TOO_LARGE_FOR_CIPHER", ERR_LIB_SSL, SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER}, ++ #else ++ {"ECGROUP_TOO_LARGE_FOR_CIPHER", ERR_LIB_SSL, 310}, ++ #endif ++ #ifdef SSL_R_ENCRYPTED_LENGTH_TOO_LONG ++ {"ENCRYPTED_LENGTH_TOO_LONG", ERR_LIB_SSL, SSL_R_ENCRYPTED_LENGTH_TOO_LONG}, ++ #else ++ {"ENCRYPTED_LENGTH_TOO_LONG", ERR_LIB_SSL, 150}, ++ #endif ++ #ifdef SSL_R_ERROR_GENERATING_TMP_RSA_KEY ++ {"ERROR_GENERATING_TMP_RSA_KEY", ERR_LIB_SSL, SSL_R_ERROR_GENERATING_TMP_RSA_KEY}, ++ #else ++ {"ERROR_GENERATING_TMP_RSA_KEY", ERR_LIB_SSL, 282}, ++ #endif ++ #ifdef SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST ++ {"ERROR_IN_RECEIVED_CIPHER_LIST", ERR_LIB_SSL, SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST}, ++ #else ++ {"ERROR_IN_RECEIVED_CIPHER_LIST", ERR_LIB_SSL, 151}, ++ #endif ++ #ifdef SSL_R_EXCESSIVE_MESSAGE_SIZE ++ {"EXCESSIVE_MESSAGE_SIZE", ERR_LIB_SSL, SSL_R_EXCESSIVE_MESSAGE_SIZE}, ++ #else ++ {"EXCESSIVE_MESSAGE_SIZE", ERR_LIB_SSL, 152}, ++ #endif ++ #ifdef SSL_R_EXTRA_DATA_IN_MESSAGE ++ {"EXTRA_DATA_IN_MESSAGE", ERR_LIB_SSL, SSL_R_EXTRA_DATA_IN_MESSAGE}, ++ #else ++ {"EXTRA_DATA_IN_MESSAGE", ERR_LIB_SSL, 153}, ++ #endif ++ #ifdef SSL_R_GOT_A_FIN_BEFORE_A_CCS ++ {"GOT_A_FIN_BEFORE_A_CCS", ERR_LIB_SSL, SSL_R_GOT_A_FIN_BEFORE_A_CCS}, ++ #else ++ {"GOT_A_FIN_BEFORE_A_CCS", ERR_LIB_SSL, 154}, ++ #endif ++ #ifdef SSL_R_HTTPS_PROXY_REQUEST ++ {"HTTPS_PROXY_REQUEST", ERR_LIB_SSL, SSL_R_HTTPS_PROXY_REQUEST}, ++ #else ++ {"HTTPS_PROXY_REQUEST", ERR_LIB_SSL, 155}, ++ #endif ++ #ifdef SSL_R_HTTP_REQUEST ++ {"HTTP_REQUEST", ERR_LIB_SSL, SSL_R_HTTP_REQUEST}, ++ #else ++ {"HTTP_REQUEST", ERR_LIB_SSL, 156}, ++ #endif ++ #ifdef SSL_R_ILLEGAL_PADDING ++ {"ILLEGAL_PADDING", ERR_LIB_SSL, SSL_R_ILLEGAL_PADDING}, ++ #else ++ {"ILLEGAL_PADDING", ERR_LIB_SSL, 283}, ++ #endif ++ #ifdef SSL_R_INCONSISTENT_COMPRESSION ++ {"INCONSISTENT_COMPRESSION", ERR_LIB_SSL, SSL_R_INCONSISTENT_COMPRESSION}, ++ #else ++ {"INCONSISTENT_COMPRESSION", ERR_LIB_SSL, 340}, ++ #endif ++ #ifdef SSL_R_INVALID_CHALLENGE_LENGTH ++ {"INVALID_CHALLENGE_LENGTH", ERR_LIB_SSL, SSL_R_INVALID_CHALLENGE_LENGTH}, ++ #else ++ {"INVALID_CHALLENGE_LENGTH", ERR_LIB_SSL, 158}, ++ #endif ++ #ifdef SSL_R_INVALID_COMMAND ++ {"INVALID_COMMAND", ERR_LIB_SSL, SSL_R_INVALID_COMMAND}, ++ #else ++ {"INVALID_COMMAND", ERR_LIB_SSL, 280}, ++ #endif ++ #ifdef SSL_R_INVALID_COMPRESSION_ALGORITHM ++ {"INVALID_COMPRESSION_ALGORITHM", ERR_LIB_SSL, SSL_R_INVALID_COMPRESSION_ALGORITHM}, ++ #else ++ {"INVALID_COMPRESSION_ALGORITHM", ERR_LIB_SSL, 341}, ++ #endif ++ #ifdef SSL_R_INVALID_PURPOSE ++ {"INVALID_PURPOSE", ERR_LIB_SSL, SSL_R_INVALID_PURPOSE}, ++ #else ++ {"INVALID_PURPOSE", ERR_LIB_SSL, 278}, ++ #endif ++ #ifdef SSL_R_INVALID_STATUS_RESPONSE ++ {"INVALID_STATUS_RESPONSE", ERR_LIB_SSL, SSL_R_INVALID_STATUS_RESPONSE}, ++ #else ++ {"INVALID_STATUS_RESPONSE", ERR_LIB_SSL, 328}, ++ #endif ++ #ifdef SSL_R_INVALID_TICKET_KEYS_LENGTH ++ {"INVALID_TICKET_KEYS_LENGTH", ERR_LIB_SSL, SSL_R_INVALID_TICKET_KEYS_LENGTH}, ++ #else ++ {"INVALID_TICKET_KEYS_LENGTH", ERR_LIB_SSL, 325}, ++ #endif ++ #ifdef SSL_R_INVALID_TRUST ++ {"INVALID_TRUST", ERR_LIB_SSL, SSL_R_INVALID_TRUST}, ++ #else ++ {"INVALID_TRUST", ERR_LIB_SSL, 279}, ++ #endif ++ #ifdef SSL_R_KEY_ARG_TOO_LONG ++ {"KEY_ARG_TOO_LONG", ERR_LIB_SSL, SSL_R_KEY_ARG_TOO_LONG}, ++ #else ++ {"KEY_ARG_TOO_LONG", ERR_LIB_SSL, 284}, ++ #endif ++ #ifdef SSL_R_KRB5 ++ {"KRB5", ERR_LIB_SSL, SSL_R_KRB5}, ++ #else ++ {"KRB5", ERR_LIB_SSL, 285}, ++ #endif ++ #ifdef SSL_R_KRB5_C_CC_PRINC ++ {"KRB5_C_CC_PRINC", ERR_LIB_SSL, SSL_R_KRB5_C_CC_PRINC}, ++ #else ++ {"KRB5_C_CC_PRINC", ERR_LIB_SSL, 286}, ++ #endif ++ #ifdef SSL_R_KRB5_C_GET_CRED ++ {"KRB5_C_GET_CRED", ERR_LIB_SSL, SSL_R_KRB5_C_GET_CRED}, ++ #else ++ {"KRB5_C_GET_CRED", ERR_LIB_SSL, 287}, ++ #endif ++ #ifdef SSL_R_KRB5_C_INIT ++ {"KRB5_C_INIT", ERR_LIB_SSL, SSL_R_KRB5_C_INIT}, ++ #else ++ {"KRB5_C_INIT", ERR_LIB_SSL, 288}, ++ #endif ++ #ifdef SSL_R_KRB5_C_MK_REQ ++ {"KRB5_C_MK_REQ", ERR_LIB_SSL, SSL_R_KRB5_C_MK_REQ}, ++ #else ++ {"KRB5_C_MK_REQ", ERR_LIB_SSL, 289}, ++ #endif ++ #ifdef SSL_R_KRB5_S_BAD_TICKET ++ {"KRB5_S_BAD_TICKET", ERR_LIB_SSL, SSL_R_KRB5_S_BAD_TICKET}, ++ #else ++ {"KRB5_S_BAD_TICKET", ERR_LIB_SSL, 290}, ++ #endif ++ #ifdef SSL_R_KRB5_S_INIT ++ {"KRB5_S_INIT", ERR_LIB_SSL, SSL_R_KRB5_S_INIT}, ++ #else ++ {"KRB5_S_INIT", ERR_LIB_SSL, 291}, ++ #endif ++ #ifdef SSL_R_KRB5_S_RD_REQ ++ {"KRB5_S_RD_REQ", ERR_LIB_SSL, SSL_R_KRB5_S_RD_REQ}, ++ #else ++ {"KRB5_S_RD_REQ", ERR_LIB_SSL, 292}, ++ #endif ++ #ifdef SSL_R_KRB5_S_TKT_EXPIRED ++ {"KRB5_S_TKT_EXPIRED", ERR_LIB_SSL, SSL_R_KRB5_S_TKT_EXPIRED}, ++ #else ++ {"KRB5_S_TKT_EXPIRED", ERR_LIB_SSL, 293}, ++ #endif ++ #ifdef SSL_R_KRB5_S_TKT_NYV ++ {"KRB5_S_TKT_NYV", ERR_LIB_SSL, SSL_R_KRB5_S_TKT_NYV}, ++ #else ++ {"KRB5_S_TKT_NYV", ERR_LIB_SSL, 294}, ++ #endif ++ #ifdef SSL_R_KRB5_S_TKT_SKEW ++ {"KRB5_S_TKT_SKEW", ERR_LIB_SSL, SSL_R_KRB5_S_TKT_SKEW}, ++ #else ++ {"KRB5_S_TKT_SKEW", ERR_LIB_SSL, 295}, ++ #endif ++ #ifdef SSL_R_LENGTH_MISMATCH ++ {"LENGTH_MISMATCH", ERR_LIB_SSL, SSL_R_LENGTH_MISMATCH}, ++ #else ++ {"LENGTH_MISMATCH", ERR_LIB_SSL, 159}, ++ #endif ++ #ifdef SSL_R_LENGTH_TOO_SHORT ++ {"LENGTH_TOO_SHORT", ERR_LIB_SSL, SSL_R_LENGTH_TOO_SHORT}, ++ #else ++ {"LENGTH_TOO_SHORT", ERR_LIB_SSL, 160}, ++ #endif ++ #ifdef SSL_R_LIBRARY_BUG ++ {"LIBRARY_BUG", ERR_LIB_SSL, SSL_R_LIBRARY_BUG}, ++ #else ++ {"LIBRARY_BUG", ERR_LIB_SSL, 274}, ++ #endif ++ #ifdef SSL_R_LIBRARY_HAS_NO_CIPHERS ++ {"LIBRARY_HAS_NO_CIPHERS", ERR_LIB_SSL, SSL_R_LIBRARY_HAS_NO_CIPHERS}, ++ #else ++ {"LIBRARY_HAS_NO_CIPHERS", ERR_LIB_SSL, 161}, ++ #endif ++ #ifdef SSL_R_MESSAGE_TOO_LONG ++ {"MESSAGE_TOO_LONG", ERR_LIB_SSL, SSL_R_MESSAGE_TOO_LONG}, ++ #else ++ {"MESSAGE_TOO_LONG", ERR_LIB_SSL, 296}, ++ #endif ++ #ifdef SSL_R_MISSING_DH_DSA_CERT ++ {"MISSING_DH_DSA_CERT", ERR_LIB_SSL, SSL_R_MISSING_DH_DSA_CERT}, ++ #else ++ {"MISSING_DH_DSA_CERT", ERR_LIB_SSL, 162}, ++ #endif ++ #ifdef SSL_R_MISSING_DH_KEY ++ {"MISSING_DH_KEY", ERR_LIB_SSL, SSL_R_MISSING_DH_KEY}, ++ #else ++ {"MISSING_DH_KEY", ERR_LIB_SSL, 163}, ++ #endif ++ #ifdef SSL_R_MISSING_DH_RSA_CERT ++ {"MISSING_DH_RSA_CERT", ERR_LIB_SSL, SSL_R_MISSING_DH_RSA_CERT}, ++ #else ++ {"MISSING_DH_RSA_CERT", ERR_LIB_SSL, 164}, ++ #endif ++ #ifdef SSL_R_MISSING_DSA_SIGNING_CERT ++ {"MISSING_DSA_SIGNING_CERT", ERR_LIB_SSL, SSL_R_MISSING_DSA_SIGNING_CERT}, ++ #else ++ {"MISSING_DSA_SIGNING_CERT", ERR_LIB_SSL, 165}, ++ #endif ++ #ifdef SSL_R_MISSING_EXPORT_TMP_DH_KEY ++ {"MISSING_EXPORT_TMP_DH_KEY", ERR_LIB_SSL, SSL_R_MISSING_EXPORT_TMP_DH_KEY}, ++ #else ++ {"MISSING_EXPORT_TMP_DH_KEY", ERR_LIB_SSL, 166}, ++ #endif ++ #ifdef SSL_R_MISSING_EXPORT_TMP_RSA_KEY ++ {"MISSING_EXPORT_TMP_RSA_KEY", ERR_LIB_SSL, SSL_R_MISSING_EXPORT_TMP_RSA_KEY}, ++ #else ++ {"MISSING_EXPORT_TMP_RSA_KEY", ERR_LIB_SSL, 167}, ++ #endif ++ #ifdef SSL_R_MISSING_RSA_CERTIFICATE ++ {"MISSING_RSA_CERTIFICATE", ERR_LIB_SSL, SSL_R_MISSING_RSA_CERTIFICATE}, ++ #else ++ {"MISSING_RSA_CERTIFICATE", ERR_LIB_SSL, 168}, ++ #endif ++ #ifdef SSL_R_MISSING_RSA_ENCRYPTING_CERT ++ {"MISSING_RSA_ENCRYPTING_CERT", ERR_LIB_SSL, SSL_R_MISSING_RSA_ENCRYPTING_CERT}, ++ #else ++ {"MISSING_RSA_ENCRYPTING_CERT", ERR_LIB_SSL, 169}, ++ #endif ++ #ifdef SSL_R_MISSING_RSA_SIGNING_CERT ++ {"MISSING_RSA_SIGNING_CERT", ERR_LIB_SSL, SSL_R_MISSING_RSA_SIGNING_CERT}, ++ #else ++ {"MISSING_RSA_SIGNING_CERT", ERR_LIB_SSL, 170}, ++ #endif ++ #ifdef SSL_R_MISSING_TMP_DH_KEY ++ {"MISSING_TMP_DH_KEY", ERR_LIB_SSL, SSL_R_MISSING_TMP_DH_KEY}, ++ #else ++ {"MISSING_TMP_DH_KEY", ERR_LIB_SSL, 171}, ++ #endif ++ #ifdef SSL_R_MISSING_TMP_ECDH_KEY ++ {"MISSING_TMP_ECDH_KEY", ERR_LIB_SSL, SSL_R_MISSING_TMP_ECDH_KEY}, ++ #else ++ {"MISSING_TMP_ECDH_KEY", ERR_LIB_SSL, 311}, ++ #endif ++ #ifdef SSL_R_MISSING_TMP_RSA_KEY ++ {"MISSING_TMP_RSA_KEY", ERR_LIB_SSL, SSL_R_MISSING_TMP_RSA_KEY}, ++ #else ++ {"MISSING_TMP_RSA_KEY", ERR_LIB_SSL, 172}, ++ #endif ++ #ifdef SSL_R_MISSING_TMP_RSA_PKEY ++ {"MISSING_TMP_RSA_PKEY", ERR_LIB_SSL, SSL_R_MISSING_TMP_RSA_PKEY}, ++ #else ++ {"MISSING_TMP_RSA_PKEY", ERR_LIB_SSL, 173}, ++ #endif ++ #ifdef SSL_R_MISSING_VERIFY_MESSAGE ++ {"MISSING_VERIFY_MESSAGE", ERR_LIB_SSL, SSL_R_MISSING_VERIFY_MESSAGE}, ++ #else ++ {"MISSING_VERIFY_MESSAGE", ERR_LIB_SSL, 174}, ++ #endif ++ #ifdef SSL_R_NON_SSLV2_INITIAL_PACKET ++ {"NON_SSLV2_INITIAL_PACKET", ERR_LIB_SSL, SSL_R_NON_SSLV2_INITIAL_PACKET}, ++ #else ++ {"NON_SSLV2_INITIAL_PACKET", ERR_LIB_SSL, 175}, ++ #endif ++ #ifdef SSL_R_NO_CERTIFICATES_RETURNED ++ {"NO_CERTIFICATES_RETURNED", ERR_LIB_SSL, SSL_R_NO_CERTIFICATES_RETURNED}, ++ #else ++ {"NO_CERTIFICATES_RETURNED", ERR_LIB_SSL, 176}, ++ #endif ++ #ifdef SSL_R_NO_CERTIFICATE_ASSIGNED ++ {"NO_CERTIFICATE_ASSIGNED", ERR_LIB_SSL, SSL_R_NO_CERTIFICATE_ASSIGNED}, ++ #else ++ {"NO_CERTIFICATE_ASSIGNED", ERR_LIB_SSL, 177}, ++ #endif ++ #ifdef SSL_R_NO_CERTIFICATE_RETURNED ++ {"NO_CERTIFICATE_RETURNED", ERR_LIB_SSL, SSL_R_NO_CERTIFICATE_RETURNED}, ++ #else ++ {"NO_CERTIFICATE_RETURNED", ERR_LIB_SSL, 178}, ++ #endif ++ #ifdef SSL_R_NO_CERTIFICATE_SET ++ {"NO_CERTIFICATE_SET", ERR_LIB_SSL, SSL_R_NO_CERTIFICATE_SET}, ++ #else ++ {"NO_CERTIFICATE_SET", ERR_LIB_SSL, 179}, ++ #endif ++ #ifdef SSL_R_NO_CERTIFICATE_SPECIFIED ++ {"NO_CERTIFICATE_SPECIFIED", ERR_LIB_SSL, SSL_R_NO_CERTIFICATE_SPECIFIED}, ++ #else ++ {"NO_CERTIFICATE_SPECIFIED", ERR_LIB_SSL, 180}, ++ #endif ++ #ifdef SSL_R_NO_CIPHERS_AVAILABLE ++ {"NO_CIPHERS_AVAILABLE", ERR_LIB_SSL, SSL_R_NO_CIPHERS_AVAILABLE}, ++ #else ++ {"NO_CIPHERS_AVAILABLE", ERR_LIB_SSL, 181}, ++ #endif ++ #ifdef SSL_R_NO_CIPHERS_PASSED ++ {"NO_CIPHERS_PASSED", ERR_LIB_SSL, SSL_R_NO_CIPHERS_PASSED}, ++ #else ++ {"NO_CIPHERS_PASSED", ERR_LIB_SSL, 182}, ++ #endif ++ #ifdef SSL_R_NO_CIPHERS_SPECIFIED ++ {"NO_CIPHERS_SPECIFIED", ERR_LIB_SSL, SSL_R_NO_CIPHERS_SPECIFIED}, ++ #else ++ {"NO_CIPHERS_SPECIFIED", ERR_LIB_SSL, 183}, ++ #endif ++ #ifdef SSL_R_NO_CIPHER_LIST ++ {"NO_CIPHER_LIST", ERR_LIB_SSL, SSL_R_NO_CIPHER_LIST}, ++ #else ++ {"NO_CIPHER_LIST", ERR_LIB_SSL, 184}, ++ #endif ++ #ifdef SSL_R_NO_CIPHER_MATCH ++ {"NO_CIPHER_MATCH", ERR_LIB_SSL, SSL_R_NO_CIPHER_MATCH}, ++ #else ++ {"NO_CIPHER_MATCH", ERR_LIB_SSL, 185}, ++ #endif ++ #ifdef SSL_R_NO_CLIENT_CERT_METHOD ++ {"NO_CLIENT_CERT_METHOD", ERR_LIB_SSL, SSL_R_NO_CLIENT_CERT_METHOD}, ++ #else ++ {"NO_CLIENT_CERT_METHOD", ERR_LIB_SSL, 331}, ++ #endif ++ #ifdef SSL_R_NO_CLIENT_CERT_RECEIVED ++ {"NO_CLIENT_CERT_RECEIVED", ERR_LIB_SSL, SSL_R_NO_CLIENT_CERT_RECEIVED}, ++ #else ++ {"NO_CLIENT_CERT_RECEIVED", ERR_LIB_SSL, 186}, ++ #endif ++ #ifdef SSL_R_NO_COMPRESSION_SPECIFIED ++ {"NO_COMPRESSION_SPECIFIED", ERR_LIB_SSL, SSL_R_NO_COMPRESSION_SPECIFIED}, ++ #else ++ {"NO_COMPRESSION_SPECIFIED", ERR_LIB_SSL, 187}, ++ #endif ++ #ifdef SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER ++ {"NO_GOST_CERTIFICATE_SENT_BY_PEER", ERR_LIB_SSL, SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER}, ++ #else ++ {"NO_GOST_CERTIFICATE_SENT_BY_PEER", ERR_LIB_SSL, 330}, ++ #endif ++ #ifdef SSL_R_NO_METHOD_SPECIFIED ++ {"NO_METHOD_SPECIFIED", ERR_LIB_SSL, SSL_R_NO_METHOD_SPECIFIED}, ++ #else ++ {"NO_METHOD_SPECIFIED", ERR_LIB_SSL, 188}, ++ #endif ++ #ifdef SSL_R_NO_PRIVATEKEY ++ {"NO_PRIVATEKEY", ERR_LIB_SSL, SSL_R_NO_PRIVATEKEY}, ++ #else ++ {"NO_PRIVATEKEY", ERR_LIB_SSL, 189}, ++ #endif ++ #ifdef SSL_R_NO_PRIVATE_KEY_ASSIGNED ++ {"NO_PRIVATE_KEY_ASSIGNED", ERR_LIB_SSL, SSL_R_NO_PRIVATE_KEY_ASSIGNED}, ++ #else ++ {"NO_PRIVATE_KEY_ASSIGNED", ERR_LIB_SSL, 190}, ++ #endif ++ #ifdef SSL_R_NO_PROTOCOLS_AVAILABLE ++ {"NO_PROTOCOLS_AVAILABLE", ERR_LIB_SSL, SSL_R_NO_PROTOCOLS_AVAILABLE}, ++ #else ++ {"NO_PROTOCOLS_AVAILABLE", ERR_LIB_SSL, 191}, ++ #endif ++ #ifdef SSL_R_NO_PUBLICKEY ++ {"NO_PUBLICKEY", ERR_LIB_SSL, SSL_R_NO_PUBLICKEY}, ++ #else ++ {"NO_PUBLICKEY", ERR_LIB_SSL, 192}, ++ #endif ++ #ifdef SSL_R_NO_RENEGOTIATION ++ {"NO_RENEGOTIATION", ERR_LIB_SSL, SSL_R_NO_RENEGOTIATION}, ++ #else ++ {"NO_RENEGOTIATION", ERR_LIB_SSL, 339}, ++ #endif ++ #ifdef SSL_R_NO_REQUIRED_DIGEST ++ {"NO_REQUIRED_DIGEST", ERR_LIB_SSL, SSL_R_NO_REQUIRED_DIGEST}, ++ #else ++ {"NO_REQUIRED_DIGEST", ERR_LIB_SSL, 324}, ++ #endif ++ #ifdef SSL_R_NO_SHARED_CIPHER ++ {"NO_SHARED_CIPHER", ERR_LIB_SSL, SSL_R_NO_SHARED_CIPHER}, ++ #else ++ {"NO_SHARED_CIPHER", ERR_LIB_SSL, 193}, ++ #endif ++ #ifdef SSL_R_NO_VERIFY_CALLBACK ++ {"NO_VERIFY_CALLBACK", ERR_LIB_SSL, SSL_R_NO_VERIFY_CALLBACK}, ++ #else ++ {"NO_VERIFY_CALLBACK", ERR_LIB_SSL, 194}, ++ #endif ++ #ifdef SSL_R_NULL_SSL_CTX ++ {"NULL_SSL_CTX", ERR_LIB_SSL, SSL_R_NULL_SSL_CTX}, ++ #else ++ {"NULL_SSL_CTX", ERR_LIB_SSL, 195}, ++ #endif ++ #ifdef SSL_R_NULL_SSL_METHOD_PASSED ++ {"NULL_SSL_METHOD_PASSED", ERR_LIB_SSL, SSL_R_NULL_SSL_METHOD_PASSED}, ++ #else ++ {"NULL_SSL_METHOD_PASSED", ERR_LIB_SSL, 196}, ++ #endif ++ #ifdef SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED ++ {"OLD_SESSION_CIPHER_NOT_RETURNED", ERR_LIB_SSL, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED}, ++ #else ++ {"OLD_SESSION_CIPHER_NOT_RETURNED", ERR_LIB_SSL, 197}, ++ #endif ++ #ifdef SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED ++ {"OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED", ERR_LIB_SSL, SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED}, ++ #else ++ {"OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED", ERR_LIB_SSL, 344}, ++ #endif ++ #ifdef SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE ++ {"ONLY_TLS_ALLOWED_IN_FIPS_MODE", ERR_LIB_SSL, SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE}, ++ #else ++ {"ONLY_TLS_ALLOWED_IN_FIPS_MODE", ERR_LIB_SSL, 297}, ++ #endif ++ #ifdef SSL_R_OPAQUE_PRF_INPUT_TOO_LONG ++ {"OPAQUE_PRF_INPUT_TOO_LONG", ERR_LIB_SSL, SSL_R_OPAQUE_PRF_INPUT_TOO_LONG}, ++ #else ++ {"OPAQUE_PRF_INPUT_TOO_LONG", ERR_LIB_SSL, 327}, ++ #endif ++ #ifdef SSL_R_PACKET_LENGTH_TOO_LONG ++ {"PACKET_LENGTH_TOO_LONG", ERR_LIB_SSL, SSL_R_PACKET_LENGTH_TOO_LONG}, ++ #else ++ {"PACKET_LENGTH_TOO_LONG", ERR_LIB_SSL, 198}, ++ #endif ++ #ifdef SSL_R_PARSE_TLSEXT ++ {"PARSE_TLSEXT", ERR_LIB_SSL, SSL_R_PARSE_TLSEXT}, ++ #else ++ {"PARSE_TLSEXT", ERR_LIB_SSL, 227}, ++ #endif ++ #ifdef SSL_R_PATH_TOO_LONG ++ {"PATH_TOO_LONG", ERR_LIB_SSL, SSL_R_PATH_TOO_LONG}, ++ #else ++ {"PATH_TOO_LONG", ERR_LIB_SSL, 270}, ++ #endif ++ #ifdef SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE ++ {"PEER_DID_NOT_RETURN_A_CERTIFICATE", ERR_LIB_SSL, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE}, ++ #else ++ {"PEER_DID_NOT_RETURN_A_CERTIFICATE", ERR_LIB_SSL, 199}, ++ #endif ++ #ifdef SSL_R_PEER_ERROR ++ {"PEER_ERROR", ERR_LIB_SSL, SSL_R_PEER_ERROR}, ++ #else ++ {"PEER_ERROR", ERR_LIB_SSL, 200}, ++ #endif ++ #ifdef SSL_R_PEER_ERROR_CERTIFICATE ++ {"PEER_ERROR_CERTIFICATE", ERR_LIB_SSL, SSL_R_PEER_ERROR_CERTIFICATE}, ++ #else ++ {"PEER_ERROR_CERTIFICATE", ERR_LIB_SSL, 201}, ++ #endif ++ #ifdef SSL_R_PEER_ERROR_NO_CERTIFICATE ++ {"PEER_ERROR_NO_CERTIFICATE", ERR_LIB_SSL, SSL_R_PEER_ERROR_NO_CERTIFICATE}, ++ #else ++ {"PEER_ERROR_NO_CERTIFICATE", ERR_LIB_SSL, 202}, ++ #endif ++ #ifdef SSL_R_PEER_ERROR_NO_CIPHER ++ {"PEER_ERROR_NO_CIPHER", ERR_LIB_SSL, SSL_R_PEER_ERROR_NO_CIPHER}, ++ #else ++ {"PEER_ERROR_NO_CIPHER", ERR_LIB_SSL, 203}, ++ #endif ++ #ifdef SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE ++ {"PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE", ERR_LIB_SSL, SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE}, ++ #else ++ {"PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE", ERR_LIB_SSL, 204}, ++ #endif ++ #ifdef SSL_R_PRE_MAC_LENGTH_TOO_LONG ++ {"PRE_MAC_LENGTH_TOO_LONG", ERR_LIB_SSL, SSL_R_PRE_MAC_LENGTH_TOO_LONG}, ++ #else ++ {"PRE_MAC_LENGTH_TOO_LONG", ERR_LIB_SSL, 205}, ++ #endif ++ #ifdef SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS ++ {"PROBLEMS_MAPPING_CIPHER_FUNCTIONS", ERR_LIB_SSL, SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS}, ++ #else ++ {"PROBLEMS_MAPPING_CIPHER_FUNCTIONS", ERR_LIB_SSL, 206}, ++ #endif ++ #ifdef SSL_R_PROTOCOL_IS_SHUTDOWN ++ {"PROTOCOL_IS_SHUTDOWN", ERR_LIB_SSL, SSL_R_PROTOCOL_IS_SHUTDOWN}, ++ #else ++ {"PROTOCOL_IS_SHUTDOWN", ERR_LIB_SSL, 207}, ++ #endif ++ #ifdef SSL_R_PSK_IDENTITY_NOT_FOUND ++ {"PSK_IDENTITY_NOT_FOUND", ERR_LIB_SSL, SSL_R_PSK_IDENTITY_NOT_FOUND}, ++ #else ++ {"PSK_IDENTITY_NOT_FOUND", ERR_LIB_SSL, 223}, ++ #endif ++ #ifdef SSL_R_PSK_NO_CLIENT_CB ++ {"PSK_NO_CLIENT_CB", ERR_LIB_SSL, SSL_R_PSK_NO_CLIENT_CB}, ++ #else ++ {"PSK_NO_CLIENT_CB", ERR_LIB_SSL, 224}, ++ #endif ++ #ifdef SSL_R_PSK_NO_SERVER_CB ++ {"PSK_NO_SERVER_CB", ERR_LIB_SSL, SSL_R_PSK_NO_SERVER_CB}, ++ #else ++ {"PSK_NO_SERVER_CB", ERR_LIB_SSL, 225}, ++ #endif ++ #ifdef SSL_R_PUBLIC_KEY_ENCRYPT_ERROR ++ {"PUBLIC_KEY_ENCRYPT_ERROR", ERR_LIB_SSL, SSL_R_PUBLIC_KEY_ENCRYPT_ERROR}, ++ #else ++ {"PUBLIC_KEY_ENCRYPT_ERROR", ERR_LIB_SSL, 208}, ++ #endif ++ #ifdef SSL_R_PUBLIC_KEY_IS_NOT_RSA ++ {"PUBLIC_KEY_IS_NOT_RSA", ERR_LIB_SSL, SSL_R_PUBLIC_KEY_IS_NOT_RSA}, ++ #else ++ {"PUBLIC_KEY_IS_NOT_RSA", ERR_LIB_SSL, 209}, ++ #endif ++ #ifdef SSL_R_PUBLIC_KEY_NOT_RSA ++ {"PUBLIC_KEY_NOT_RSA", ERR_LIB_SSL, SSL_R_PUBLIC_KEY_NOT_RSA}, ++ #else ++ {"PUBLIC_KEY_NOT_RSA", ERR_LIB_SSL, 210}, ++ #endif ++ #ifdef SSL_R_READ_BIO_NOT_SET ++ {"READ_BIO_NOT_SET", ERR_LIB_SSL, SSL_R_READ_BIO_NOT_SET}, ++ #else ++ {"READ_BIO_NOT_SET", ERR_LIB_SSL, 211}, ++ #endif ++ #ifdef SSL_R_READ_TIMEOUT_EXPIRED ++ {"READ_TIMEOUT_EXPIRED", ERR_LIB_SSL, SSL_R_READ_TIMEOUT_EXPIRED}, ++ #else ++ {"READ_TIMEOUT_EXPIRED", ERR_LIB_SSL, 312}, ++ #endif ++ #ifdef SSL_R_READ_WRONG_PACKET_TYPE ++ {"READ_WRONG_PACKET_TYPE", ERR_LIB_SSL, SSL_R_READ_WRONG_PACKET_TYPE}, ++ #else ++ {"READ_WRONG_PACKET_TYPE", ERR_LIB_SSL, 212}, ++ #endif ++ #ifdef SSL_R_RECORD_LENGTH_MISMATCH ++ {"RECORD_LENGTH_MISMATCH", ERR_LIB_SSL, SSL_R_RECORD_LENGTH_MISMATCH}, ++ #else ++ {"RECORD_LENGTH_MISMATCH", ERR_LIB_SSL, 213}, ++ #endif ++ #ifdef SSL_R_RECORD_TOO_LARGE ++ {"RECORD_TOO_LARGE", ERR_LIB_SSL, SSL_R_RECORD_TOO_LARGE}, ++ #else ++ {"RECORD_TOO_LARGE", ERR_LIB_SSL, 214}, ++ #endif ++ #ifdef SSL_R_RECORD_TOO_SMALL ++ {"RECORD_TOO_SMALL", ERR_LIB_SSL, SSL_R_RECORD_TOO_SMALL}, ++ #else ++ {"RECORD_TOO_SMALL", ERR_LIB_SSL, 298}, ++ #endif ++ #ifdef SSL_R_RENEGOTIATE_EXT_TOO_LONG ++ {"RENEGOTIATE_EXT_TOO_LONG", ERR_LIB_SSL, SSL_R_RENEGOTIATE_EXT_TOO_LONG}, ++ #else ++ {"RENEGOTIATE_EXT_TOO_LONG", ERR_LIB_SSL, 335}, ++ #endif ++ #ifdef SSL_R_RENEGOTIATION_ENCODING_ERR ++ {"RENEGOTIATION_ENCODING_ERR", ERR_LIB_SSL, SSL_R_RENEGOTIATION_ENCODING_ERR}, ++ #else ++ {"RENEGOTIATION_ENCODING_ERR", ERR_LIB_SSL, 336}, ++ #endif ++ #ifdef SSL_R_RENEGOTIATION_MISMATCH ++ {"RENEGOTIATION_MISMATCH", ERR_LIB_SSL, SSL_R_RENEGOTIATION_MISMATCH}, ++ #else ++ {"RENEGOTIATION_MISMATCH", ERR_LIB_SSL, 337}, ++ #endif ++ #ifdef SSL_R_REQUIRED_CIPHER_MISSING ++ {"REQUIRED_CIPHER_MISSING", ERR_LIB_SSL, SSL_R_REQUIRED_CIPHER_MISSING}, ++ #else ++ {"REQUIRED_CIPHER_MISSING", ERR_LIB_SSL, 215}, ++ #endif ++ #ifdef SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING ++ {"REQUIRED_COMPRESSSION_ALGORITHM_MISSING", ERR_LIB_SSL, SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING}, ++ #else ++ {"REQUIRED_COMPRESSSION_ALGORITHM_MISSING", ERR_LIB_SSL, 342}, ++ #endif ++ #ifdef SSL_R_REUSE_CERT_LENGTH_NOT_ZERO ++ {"REUSE_CERT_LENGTH_NOT_ZERO", ERR_LIB_SSL, SSL_R_REUSE_CERT_LENGTH_NOT_ZERO}, ++ #else ++ {"REUSE_CERT_LENGTH_NOT_ZERO", ERR_LIB_SSL, 216}, ++ #endif ++ #ifdef SSL_R_REUSE_CERT_TYPE_NOT_ZERO ++ {"REUSE_CERT_TYPE_NOT_ZERO", ERR_LIB_SSL, SSL_R_REUSE_CERT_TYPE_NOT_ZERO}, ++ #else ++ {"REUSE_CERT_TYPE_NOT_ZERO", ERR_LIB_SSL, 217}, ++ #endif ++ #ifdef SSL_R_REUSE_CIPHER_LIST_NOT_ZERO ++ {"REUSE_CIPHER_LIST_NOT_ZERO", ERR_LIB_SSL, SSL_R_REUSE_CIPHER_LIST_NOT_ZERO}, ++ #else ++ {"REUSE_CIPHER_LIST_NOT_ZERO", ERR_LIB_SSL, 218}, ++ #endif ++ #ifdef SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING ++ {"SCSV_RECEIVED_WHEN_RENEGOTIATING", ERR_LIB_SSL, SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING}, ++ #else ++ {"SCSV_RECEIVED_WHEN_RENEGOTIATING", ERR_LIB_SSL, 345}, ++ #endif ++ #ifdef SSL_R_SERVERHELLO_TLSEXT ++ {"SERVERHELLO_TLSEXT", ERR_LIB_SSL, SSL_R_SERVERHELLO_TLSEXT}, ++ #else ++ {"SERVERHELLO_TLSEXT", ERR_LIB_SSL, 275}, ++ #endif ++ #ifdef SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED ++ {"SESSION_ID_CONTEXT_UNINITIALIZED", ERR_LIB_SSL, SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED}, ++ #else ++ {"SESSION_ID_CONTEXT_UNINITIALIZED", ERR_LIB_SSL, 277}, ++ #endif ++ #ifdef SSL_R_SHORT_READ ++ {"SHORT_READ", ERR_LIB_SSL, SSL_R_SHORT_READ}, ++ #else ++ {"SHORT_READ", ERR_LIB_SSL, 219}, ++ #endif ++ #ifdef SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE ++ {"SIGNATURE_FOR_NON_SIGNING_CERTIFICATE", ERR_LIB_SSL, SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE}, ++ #else ++ {"SIGNATURE_FOR_NON_SIGNING_CERTIFICATE", ERR_LIB_SSL, 220}, ++ #endif ++ #ifdef SSL_R_SSL23_DOING_SESSION_ID_REUSE ++ {"SSL23_DOING_SESSION_ID_REUSE", ERR_LIB_SSL, SSL_R_SSL23_DOING_SESSION_ID_REUSE}, ++ #else ++ {"SSL23_DOING_SESSION_ID_REUSE", ERR_LIB_SSL, 221}, ++ #endif ++ #ifdef SSL_R_SSL2_CONNECTION_ID_TOO_LONG ++ {"SSL2_CONNECTION_ID_TOO_LONG", ERR_LIB_SSL, SSL_R_SSL2_CONNECTION_ID_TOO_LONG}, ++ #else ++ {"SSL2_CONNECTION_ID_TOO_LONG", ERR_LIB_SSL, 299}, ++ #endif ++ #ifdef SSL_R_SSL3_EXT_INVALID_ECPOINTFORMAT ++ {"SSL3_EXT_INVALID_ECPOINTFORMAT", ERR_LIB_SSL, SSL_R_SSL3_EXT_INVALID_ECPOINTFORMAT}, ++ #else ++ {"SSL3_EXT_INVALID_ECPOINTFORMAT", ERR_LIB_SSL, 321}, ++ #endif ++ #ifdef SSL_R_SSL3_EXT_INVALID_SERVERNAME ++ {"SSL3_EXT_INVALID_SERVERNAME", ERR_LIB_SSL, SSL_R_SSL3_EXT_INVALID_SERVERNAME}, ++ #else ++ {"SSL3_EXT_INVALID_SERVERNAME", ERR_LIB_SSL, 319}, ++ #endif ++ #ifdef SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE ++ {"SSL3_EXT_INVALID_SERVERNAME_TYPE", ERR_LIB_SSL, SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE}, ++ #else ++ {"SSL3_EXT_INVALID_SERVERNAME_TYPE", ERR_LIB_SSL, 320}, ++ #endif ++ #ifdef SSL_R_SSL3_SESSION_ID_TOO_LONG ++ {"SSL3_SESSION_ID_TOO_LONG", ERR_LIB_SSL, SSL_R_SSL3_SESSION_ID_TOO_LONG}, ++ #else ++ {"SSL3_SESSION_ID_TOO_LONG", ERR_LIB_SSL, 300}, ++ #endif ++ #ifdef SSL_R_SSL3_SESSION_ID_TOO_SHORT ++ {"SSL3_SESSION_ID_TOO_SHORT", ERR_LIB_SSL, SSL_R_SSL3_SESSION_ID_TOO_SHORT}, ++ #else ++ {"SSL3_SESSION_ID_TOO_SHORT", ERR_LIB_SSL, 222}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_BAD_CERTIFICATE ++ {"SSLV3_ALERT_BAD_CERTIFICATE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_BAD_CERTIFICATE}, ++ #else ++ {"SSLV3_ALERT_BAD_CERTIFICATE", ERR_LIB_SSL, 1042}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_BAD_RECORD_MAC ++ {"SSLV3_ALERT_BAD_RECORD_MAC", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_BAD_RECORD_MAC}, ++ #else ++ {"SSLV3_ALERT_BAD_RECORD_MAC", ERR_LIB_SSL, 1020}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED ++ {"SSLV3_ALERT_CERTIFICATE_EXPIRED", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED}, ++ #else ++ {"SSLV3_ALERT_CERTIFICATE_EXPIRED", ERR_LIB_SSL, 1045}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED ++ {"SSLV3_ALERT_CERTIFICATE_REVOKED", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED}, ++ #else ++ {"SSLV3_ALERT_CERTIFICATE_REVOKED", ERR_LIB_SSL, 1044}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN ++ {"SSLV3_ALERT_CERTIFICATE_UNKNOWN", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN}, ++ #else ++ {"SSLV3_ALERT_CERTIFICATE_UNKNOWN", ERR_LIB_SSL, 1046}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE ++ {"SSLV3_ALERT_DECOMPRESSION_FAILURE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE}, ++ #else ++ {"SSLV3_ALERT_DECOMPRESSION_FAILURE", ERR_LIB_SSL, 1030}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE ++ {"SSLV3_ALERT_HANDSHAKE_FAILURE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE}, ++ #else ++ {"SSLV3_ALERT_HANDSHAKE_FAILURE", ERR_LIB_SSL, 1040}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER ++ {"SSLV3_ALERT_ILLEGAL_PARAMETER", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER}, ++ #else ++ {"SSLV3_ALERT_ILLEGAL_PARAMETER", ERR_LIB_SSL, 1047}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_NO_CERTIFICATE ++ {"SSLV3_ALERT_NO_CERTIFICATE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_NO_CERTIFICATE}, ++ #else ++ {"SSLV3_ALERT_NO_CERTIFICATE", ERR_LIB_SSL, 1041}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE ++ {"SSLV3_ALERT_UNEXPECTED_MESSAGE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE}, ++ #else ++ {"SSLV3_ALERT_UNEXPECTED_MESSAGE", ERR_LIB_SSL, 1010}, ++ #endif ++ #ifdef SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE ++ {"SSLV3_ALERT_UNSUPPORTED_CERTIFICATE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE}, ++ #else ++ {"SSLV3_ALERT_UNSUPPORTED_CERTIFICATE", ERR_LIB_SSL, 1043}, ++ #endif ++ #ifdef SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION ++ {"SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION", ERR_LIB_SSL, SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION}, ++ #else ++ {"SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION", ERR_LIB_SSL, 228}, ++ #endif ++ #ifdef SSL_R_SSL_HANDSHAKE_FAILURE ++ {"SSL_HANDSHAKE_FAILURE", ERR_LIB_SSL, SSL_R_SSL_HANDSHAKE_FAILURE}, ++ #else ++ {"SSL_HANDSHAKE_FAILURE", ERR_LIB_SSL, 229}, ++ #endif ++ #ifdef SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS ++ {"SSL_LIBRARY_HAS_NO_CIPHERS", ERR_LIB_SSL, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS}, ++ #else ++ {"SSL_LIBRARY_HAS_NO_CIPHERS", ERR_LIB_SSL, 230}, ++ #endif ++ #ifdef SSL_R_SSL_SESSION_ID_CALLBACK_FAILED ++ {"SSL_SESSION_ID_CALLBACK_FAILED", ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_CALLBACK_FAILED}, ++ #else ++ {"SSL_SESSION_ID_CALLBACK_FAILED", ERR_LIB_SSL, 301}, ++ #endif ++ #ifdef SSL_R_SSL_SESSION_ID_CONFLICT ++ {"SSL_SESSION_ID_CONFLICT", ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_CONFLICT}, ++ #else ++ {"SSL_SESSION_ID_CONFLICT", ERR_LIB_SSL, 302}, ++ #endif ++ #ifdef SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG ++ {"SSL_SESSION_ID_CONTEXT_TOO_LONG", ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG}, ++ #else ++ {"SSL_SESSION_ID_CONTEXT_TOO_LONG", ERR_LIB_SSL, 273}, ++ #endif ++ #ifdef SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH ++ {"SSL_SESSION_ID_HAS_BAD_LENGTH", ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH}, ++ #else ++ {"SSL_SESSION_ID_HAS_BAD_LENGTH", ERR_LIB_SSL, 303}, ++ #endif ++ #ifdef SSL_R_SSL_SESSION_ID_IS_DIFFERENT ++ {"SSL_SESSION_ID_IS_DIFFERENT", ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_IS_DIFFERENT}, ++ #else ++ {"SSL_SESSION_ID_IS_DIFFERENT", ERR_LIB_SSL, 231}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_ACCESS_DENIED ++ {"TLSV1_ALERT_ACCESS_DENIED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_ACCESS_DENIED}, ++ #else ++ {"TLSV1_ALERT_ACCESS_DENIED", ERR_LIB_SSL, 1049}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_DECODE_ERROR ++ {"TLSV1_ALERT_DECODE_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECODE_ERROR}, ++ #else ++ {"TLSV1_ALERT_DECODE_ERROR", ERR_LIB_SSL, 1050}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_DECRYPTION_FAILED ++ {"TLSV1_ALERT_DECRYPTION_FAILED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED}, ++ #else ++ {"TLSV1_ALERT_DECRYPTION_FAILED", ERR_LIB_SSL, 1021}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_DECRYPT_ERROR ++ {"TLSV1_ALERT_DECRYPT_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPT_ERROR}, ++ #else ++ {"TLSV1_ALERT_DECRYPT_ERROR", ERR_LIB_SSL, 1051}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION ++ {"TLSV1_ALERT_EXPORT_RESTRICTION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION}, ++ #else ++ {"TLSV1_ALERT_EXPORT_RESTRICTION", ERR_LIB_SSL, 1060}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY ++ {"TLSV1_ALERT_INSUFFICIENT_SECURITY", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY}, ++ #else ++ {"TLSV1_ALERT_INSUFFICIENT_SECURITY", ERR_LIB_SSL, 1071}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_INTERNAL_ERROR ++ {"TLSV1_ALERT_INTERNAL_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INTERNAL_ERROR}, ++ #else ++ {"TLSV1_ALERT_INTERNAL_ERROR", ERR_LIB_SSL, 1080}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_NO_RENEGOTIATION ++ {"TLSV1_ALERT_NO_RENEGOTIATION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_NO_RENEGOTIATION}, ++ #else ++ {"TLSV1_ALERT_NO_RENEGOTIATION", ERR_LIB_SSL, 1100}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_PROTOCOL_VERSION ++ {"TLSV1_ALERT_PROTOCOL_VERSION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_PROTOCOL_VERSION}, ++ #else ++ {"TLSV1_ALERT_PROTOCOL_VERSION", ERR_LIB_SSL, 1070}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_RECORD_OVERFLOW ++ {"TLSV1_ALERT_RECORD_OVERFLOW", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW}, ++ #else ++ {"TLSV1_ALERT_RECORD_OVERFLOW", ERR_LIB_SSL, 1022}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_UNKNOWN_CA ++ {"TLSV1_ALERT_UNKNOWN_CA", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_UNKNOWN_CA}, ++ #else ++ {"TLSV1_ALERT_UNKNOWN_CA", ERR_LIB_SSL, 1048}, ++ #endif ++ #ifdef SSL_R_TLSV1_ALERT_USER_CANCELLED ++ {"TLSV1_ALERT_USER_CANCELLED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_USER_CANCELLED}, ++ #else ++ {"TLSV1_ALERT_USER_CANCELLED", ERR_LIB_SSL, 1090}, ++ #endif ++ #ifdef SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE ++ {"TLSV1_BAD_CERTIFICATE_HASH_VALUE", ERR_LIB_SSL, SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE}, ++ #else ++ {"TLSV1_BAD_CERTIFICATE_HASH_VALUE", ERR_LIB_SSL, 1114}, ++ #endif ++ #ifdef SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE ++ {"TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE", ERR_LIB_SSL, SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE}, ++ #else ++ {"TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE", ERR_LIB_SSL, 1113}, ++ #endif ++ #ifdef SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE ++ {"TLSV1_CERTIFICATE_UNOBTAINABLE", ERR_LIB_SSL, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE}, ++ #else ++ {"TLSV1_CERTIFICATE_UNOBTAINABLE", ERR_LIB_SSL, 1111}, ++ #endif ++ #ifdef SSL_R_TLSV1_UNRECOGNIZED_NAME ++ {"TLSV1_UNRECOGNIZED_NAME", ERR_LIB_SSL, SSL_R_TLSV1_UNRECOGNIZED_NAME}, ++ #else ++ {"TLSV1_UNRECOGNIZED_NAME", ERR_LIB_SSL, 1112}, ++ #endif ++ #ifdef SSL_R_TLSV1_UNSUPPORTED_EXTENSION ++ {"TLSV1_UNSUPPORTED_EXTENSION", ERR_LIB_SSL, SSL_R_TLSV1_UNSUPPORTED_EXTENSION}, ++ #else ++ {"TLSV1_UNSUPPORTED_EXTENSION", ERR_LIB_SSL, 1110}, ++ #endif ++ #ifdef SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER ++ {"TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER", ERR_LIB_SSL, SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER}, ++ #else ++ {"TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER", ERR_LIB_SSL, 232}, ++ #endif ++ #ifdef SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST ++ {"TLS_INVALID_ECPOINTFORMAT_LIST", ERR_LIB_SSL, SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST}, ++ #else ++ {"TLS_INVALID_ECPOINTFORMAT_LIST", ERR_LIB_SSL, 157}, ++ #endif ++ #ifdef SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST ++ {"TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST", ERR_LIB_SSL, SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST}, ++ #else ++ {"TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST", ERR_LIB_SSL, 233}, ++ #endif ++ #ifdef SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG ++ {"TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG", ERR_LIB_SSL, SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG}, ++ #else ++ {"TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG", ERR_LIB_SSL, 234}, ++ #endif ++ #ifdef SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER ++ {"TRIED_TO_USE_UNSUPPORTED_CIPHER", ERR_LIB_SSL, SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER}, ++ #else ++ {"TRIED_TO_USE_UNSUPPORTED_CIPHER", ERR_LIB_SSL, 235}, ++ #endif ++ #ifdef SSL_R_UNABLE_TO_DECODE_DH_CERTS ++ {"UNABLE_TO_DECODE_DH_CERTS", ERR_LIB_SSL, SSL_R_UNABLE_TO_DECODE_DH_CERTS}, ++ #else ++ {"UNABLE_TO_DECODE_DH_CERTS", ERR_LIB_SSL, 236}, ++ #endif ++ #ifdef SSL_R_UNABLE_TO_DECODE_ECDH_CERTS ++ {"UNABLE_TO_DECODE_ECDH_CERTS", ERR_LIB_SSL, SSL_R_UNABLE_TO_DECODE_ECDH_CERTS}, ++ #else ++ {"UNABLE_TO_DECODE_ECDH_CERTS", ERR_LIB_SSL, 313}, ++ #endif ++ #ifdef SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY ++ {"UNABLE_TO_EXTRACT_PUBLIC_KEY", ERR_LIB_SSL, SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY}, ++ #else ++ {"UNABLE_TO_EXTRACT_PUBLIC_KEY", ERR_LIB_SSL, 237}, ++ #endif ++ #ifdef SSL_R_UNABLE_TO_FIND_DH_PARAMETERS ++ {"UNABLE_TO_FIND_DH_PARAMETERS", ERR_LIB_SSL, SSL_R_UNABLE_TO_FIND_DH_PARAMETERS}, ++ #else ++ {"UNABLE_TO_FIND_DH_PARAMETERS", ERR_LIB_SSL, 238}, ++ #endif ++ #ifdef SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS ++ {"UNABLE_TO_FIND_ECDH_PARAMETERS", ERR_LIB_SSL, SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS}, ++ #else ++ {"UNABLE_TO_FIND_ECDH_PARAMETERS", ERR_LIB_SSL, 314}, ++ #endif ++ #ifdef SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS ++ {"UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS", ERR_LIB_SSL, SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS}, ++ #else ++ {"UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS", ERR_LIB_SSL, 239}, ++ #endif ++ #ifdef SSL_R_UNABLE_TO_FIND_SSL_METHOD ++ {"UNABLE_TO_FIND_SSL_METHOD", ERR_LIB_SSL, SSL_R_UNABLE_TO_FIND_SSL_METHOD}, ++ #else ++ {"UNABLE_TO_FIND_SSL_METHOD", ERR_LIB_SSL, 240}, ++ #endif ++ #ifdef SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES ++ {"UNABLE_TO_LOAD_SSL2_MD5_ROUTINES", ERR_LIB_SSL, SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES}, ++ #else ++ {"UNABLE_TO_LOAD_SSL2_MD5_ROUTINES", ERR_LIB_SSL, 241}, ++ #endif ++ #ifdef SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES ++ {"UNABLE_TO_LOAD_SSL3_MD5_ROUTINES", ERR_LIB_SSL, SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES}, ++ #else ++ {"UNABLE_TO_LOAD_SSL3_MD5_ROUTINES", ERR_LIB_SSL, 242}, ++ #endif ++ #ifdef SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES ++ {"UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES", ERR_LIB_SSL, SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES}, ++ #else ++ {"UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES", ERR_LIB_SSL, 243}, ++ #endif ++ #ifdef SSL_R_UNEXPECTED_MESSAGE ++ {"UNEXPECTED_MESSAGE", ERR_LIB_SSL, SSL_R_UNEXPECTED_MESSAGE}, ++ #else ++ {"UNEXPECTED_MESSAGE", ERR_LIB_SSL, 244}, ++ #endif ++ #ifdef SSL_R_UNEXPECTED_RECORD ++ {"UNEXPECTED_RECORD", ERR_LIB_SSL, SSL_R_UNEXPECTED_RECORD}, ++ #else ++ {"UNEXPECTED_RECORD", ERR_LIB_SSL, 245}, ++ #endif ++ #ifdef SSL_R_UNINITIALIZED ++ {"UNINITIALIZED", ERR_LIB_SSL, SSL_R_UNINITIALIZED}, ++ #else ++ {"UNINITIALIZED", ERR_LIB_SSL, 276}, ++ #endif ++ #ifdef SSL_R_UNKNOWN_ALERT_TYPE ++ {"UNKNOWN_ALERT_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_ALERT_TYPE}, ++ #else ++ {"UNKNOWN_ALERT_TYPE", ERR_LIB_SSL, 246}, ++ #endif ++ #ifdef SSL_R_UNKNOWN_CERTIFICATE_TYPE ++ {"UNKNOWN_CERTIFICATE_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_CERTIFICATE_TYPE}, ++ #else ++ {"UNKNOWN_CERTIFICATE_TYPE", ERR_LIB_SSL, 247}, ++ #endif ++ #ifdef SSL_R_UNKNOWN_CIPHER_RETURNED ++ {"UNKNOWN_CIPHER_RETURNED", ERR_LIB_SSL, SSL_R_UNKNOWN_CIPHER_RETURNED}, ++ #else ++ {"UNKNOWN_CIPHER_RETURNED", ERR_LIB_SSL, 248}, ++ #endif ++ #ifdef SSL_R_UNKNOWN_CIPHER_TYPE ++ {"UNKNOWN_CIPHER_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_CIPHER_TYPE}, ++ #else ++ {"UNKNOWN_CIPHER_TYPE", ERR_LIB_SSL, 249}, ++ #endif ++ #ifdef SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE ++ {"UNKNOWN_KEY_EXCHANGE_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE}, ++ #else ++ {"UNKNOWN_KEY_EXCHANGE_TYPE", ERR_LIB_SSL, 250}, ++ #endif ++ #ifdef SSL_R_UNKNOWN_PKEY_TYPE ++ {"UNKNOWN_PKEY_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_PKEY_TYPE}, ++ #else ++ {"UNKNOWN_PKEY_TYPE", ERR_LIB_SSL, 251}, ++ #endif ++ #ifdef SSL_R_UNKNOWN_PROTOCOL ++ {"UNKNOWN_PROTOCOL", ERR_LIB_SSL, SSL_R_UNKNOWN_PROTOCOL}, ++ #else ++ {"UNKNOWN_PROTOCOL", ERR_LIB_SSL, 252}, ++ #endif ++ #ifdef SSL_R_UNKNOWN_REMOTE_ERROR_TYPE ++ {"UNKNOWN_REMOTE_ERROR_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_REMOTE_ERROR_TYPE}, ++ #else ++ {"UNKNOWN_REMOTE_ERROR_TYPE", ERR_LIB_SSL, 253}, ++ #endif ++ #ifdef SSL_R_UNKNOWN_SSL_VERSION ++ {"UNKNOWN_SSL_VERSION", ERR_LIB_SSL, SSL_R_UNKNOWN_SSL_VERSION}, ++ #else ++ {"UNKNOWN_SSL_VERSION", ERR_LIB_SSL, 254}, ++ #endif ++ #ifdef SSL_R_UNKNOWN_STATE ++ {"UNKNOWN_STATE", ERR_LIB_SSL, SSL_R_UNKNOWN_STATE}, ++ #else ++ {"UNKNOWN_STATE", ERR_LIB_SSL, 255}, ++ #endif ++ #ifdef SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED ++ {"UNSAFE_LEGACY_RENEGOTIATION_DISABLED", ERR_LIB_SSL, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED}, ++ #else ++ {"UNSAFE_LEGACY_RENEGOTIATION_DISABLED", ERR_LIB_SSL, 338}, ++ #endif ++ #ifdef SSL_R_UNSUPPORTED_CIPHER ++ {"UNSUPPORTED_CIPHER", ERR_LIB_SSL, SSL_R_UNSUPPORTED_CIPHER}, ++ #else ++ {"UNSUPPORTED_CIPHER", ERR_LIB_SSL, 256}, ++ #endif ++ #ifdef SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM ++ {"UNSUPPORTED_COMPRESSION_ALGORITHM", ERR_LIB_SSL, SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM}, ++ #else ++ {"UNSUPPORTED_COMPRESSION_ALGORITHM", ERR_LIB_SSL, 257}, ++ #endif ++ #ifdef SSL_R_UNSUPPORTED_DIGEST_TYPE ++ {"UNSUPPORTED_DIGEST_TYPE", ERR_LIB_SSL, SSL_R_UNSUPPORTED_DIGEST_TYPE}, ++ #else ++ {"UNSUPPORTED_DIGEST_TYPE", ERR_LIB_SSL, 326}, ++ #endif ++ #ifdef SSL_R_UNSUPPORTED_ELLIPTIC_CURVE ++ {"UNSUPPORTED_ELLIPTIC_CURVE", ERR_LIB_SSL, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE}, ++ #else ++ {"UNSUPPORTED_ELLIPTIC_CURVE", ERR_LIB_SSL, 315}, ++ #endif ++ #ifdef SSL_R_UNSUPPORTED_PROTOCOL ++ {"UNSUPPORTED_PROTOCOL", ERR_LIB_SSL, SSL_R_UNSUPPORTED_PROTOCOL}, ++ #else ++ {"UNSUPPORTED_PROTOCOL", ERR_LIB_SSL, 258}, ++ #endif ++ #ifdef SSL_R_UNSUPPORTED_SSL_VERSION ++ {"UNSUPPORTED_SSL_VERSION", ERR_LIB_SSL, SSL_R_UNSUPPORTED_SSL_VERSION}, ++ #else ++ {"UNSUPPORTED_SSL_VERSION", ERR_LIB_SSL, 259}, ++ #endif ++ #ifdef SSL_R_UNSUPPORTED_STATUS_TYPE ++ {"UNSUPPORTED_STATUS_TYPE", ERR_LIB_SSL, SSL_R_UNSUPPORTED_STATUS_TYPE}, ++ #else ++ {"UNSUPPORTED_STATUS_TYPE", ERR_LIB_SSL, 329}, ++ #endif ++ #ifdef SSL_R_WRITE_BIO_NOT_SET ++ {"WRITE_BIO_NOT_SET", ERR_LIB_SSL, SSL_R_WRITE_BIO_NOT_SET}, ++ #else ++ {"WRITE_BIO_NOT_SET", ERR_LIB_SSL, 260}, ++ #endif ++ #ifdef SSL_R_WRONG_CIPHER_RETURNED ++ {"WRONG_CIPHER_RETURNED", ERR_LIB_SSL, SSL_R_WRONG_CIPHER_RETURNED}, ++ #else ++ {"WRONG_CIPHER_RETURNED", ERR_LIB_SSL, 261}, ++ #endif ++ #ifdef SSL_R_WRONG_MESSAGE_TYPE ++ {"WRONG_MESSAGE_TYPE", ERR_LIB_SSL, SSL_R_WRONG_MESSAGE_TYPE}, ++ #else ++ {"WRONG_MESSAGE_TYPE", ERR_LIB_SSL, 262}, ++ #endif ++ #ifdef SSL_R_WRONG_NUMBER_OF_KEY_BITS ++ {"WRONG_NUMBER_OF_KEY_BITS", ERR_LIB_SSL, SSL_R_WRONG_NUMBER_OF_KEY_BITS}, ++ #else ++ {"WRONG_NUMBER_OF_KEY_BITS", ERR_LIB_SSL, 263}, ++ #endif ++ #ifdef SSL_R_WRONG_SIGNATURE_LENGTH ++ {"WRONG_SIGNATURE_LENGTH", ERR_LIB_SSL, SSL_R_WRONG_SIGNATURE_LENGTH}, ++ #else ++ {"WRONG_SIGNATURE_LENGTH", ERR_LIB_SSL, 264}, ++ #endif ++ #ifdef SSL_R_WRONG_SIGNATURE_SIZE ++ {"WRONG_SIGNATURE_SIZE", ERR_LIB_SSL, SSL_R_WRONG_SIGNATURE_SIZE}, ++ #else ++ {"WRONG_SIGNATURE_SIZE", ERR_LIB_SSL, 265}, ++ #endif ++ #ifdef SSL_R_WRONG_SSL_VERSION ++ {"WRONG_SSL_VERSION", ERR_LIB_SSL, SSL_R_WRONG_SSL_VERSION}, ++ #else ++ {"WRONG_SSL_VERSION", ERR_LIB_SSL, 266}, ++ #endif ++ #ifdef SSL_R_WRONG_VERSION_NUMBER ++ {"WRONG_VERSION_NUMBER", ERR_LIB_SSL, SSL_R_WRONG_VERSION_NUMBER}, ++ #else ++ {"WRONG_VERSION_NUMBER", ERR_LIB_SSL, 267}, ++ #endif ++ #ifdef SSL_R_X509_LIB ++ {"X509_LIB", ERR_LIB_SSL, SSL_R_X509_LIB}, ++ #else ++ {"X509_LIB", ERR_LIB_SSL, 268}, ++ #endif ++ #ifdef SSL_R_X509_VERIFICATION_SETUP_PROBLEMS ++ {"X509_VERIFICATION_SETUP_PROBLEMS", ERR_LIB_SSL, SSL_R_X509_VERIFICATION_SETUP_PROBLEMS}, ++ #else ++ {"X509_VERIFICATION_SETUP_PROBLEMS", ERR_LIB_SSL, 269}, ++ #endif ++ #ifdef X509_R_BAD_X509_FILETYPE ++ {"BAD_X509_FILETYPE", ERR_LIB_X509, X509_R_BAD_X509_FILETYPE}, ++ #else ++ {"BAD_X509_FILETYPE", ERR_LIB_X509, 100}, ++ #endif ++ #ifdef X509_R_BASE64_DECODE_ERROR ++ {"BASE64_DECODE_ERROR", ERR_LIB_X509, X509_R_BASE64_DECODE_ERROR}, ++ #else ++ {"BASE64_DECODE_ERROR", ERR_LIB_X509, 118}, ++ #endif ++ #ifdef X509_R_CANT_CHECK_DH_KEY ++ {"CANT_CHECK_DH_KEY", ERR_LIB_X509, X509_R_CANT_CHECK_DH_KEY}, ++ #else ++ {"CANT_CHECK_DH_KEY", ERR_LIB_X509, 114}, ++ #endif ++ #ifdef X509_R_CERT_ALREADY_IN_HASH_TABLE ++ {"CERT_ALREADY_IN_HASH_TABLE", ERR_LIB_X509, X509_R_CERT_ALREADY_IN_HASH_TABLE}, ++ #else ++ {"CERT_ALREADY_IN_HASH_TABLE", ERR_LIB_X509, 101}, ++ #endif ++ #ifdef X509_R_ERR_ASN1_LIB ++ {"ERR_ASN1_LIB", ERR_LIB_X509, X509_R_ERR_ASN1_LIB}, ++ #else ++ {"ERR_ASN1_LIB", ERR_LIB_X509, 102}, ++ #endif ++ #ifdef X509_R_INVALID_DIRECTORY ++ {"INVALID_DIRECTORY", ERR_LIB_X509, X509_R_INVALID_DIRECTORY}, ++ #else ++ {"INVALID_DIRECTORY", ERR_LIB_X509, 113}, ++ #endif ++ #ifdef X509_R_INVALID_FIELD_NAME ++ {"INVALID_FIELD_NAME", ERR_LIB_X509, X509_R_INVALID_FIELD_NAME}, ++ #else ++ {"INVALID_FIELD_NAME", ERR_LIB_X509, 119}, ++ #endif ++ #ifdef X509_R_INVALID_TRUST ++ {"INVALID_TRUST", ERR_LIB_X509, X509_R_INVALID_TRUST}, ++ #else ++ {"INVALID_TRUST", ERR_LIB_X509, 123}, ++ #endif ++ #ifdef X509_R_KEY_TYPE_MISMATCH ++ {"KEY_TYPE_MISMATCH", ERR_LIB_X509, X509_R_KEY_TYPE_MISMATCH}, ++ #else ++ {"KEY_TYPE_MISMATCH", ERR_LIB_X509, 115}, ++ #endif ++ #ifdef X509_R_KEY_VALUES_MISMATCH ++ {"KEY_VALUES_MISMATCH", ERR_LIB_X509, X509_R_KEY_VALUES_MISMATCH}, ++ #else ++ {"KEY_VALUES_MISMATCH", ERR_LIB_X509, 116}, ++ #endif ++ #ifdef X509_R_LOADING_CERT_DIR ++ {"LOADING_CERT_DIR", ERR_LIB_X509, X509_R_LOADING_CERT_DIR}, ++ #else ++ {"LOADING_CERT_DIR", ERR_LIB_X509, 103}, ++ #endif ++ #ifdef X509_R_LOADING_DEFAULTS ++ {"LOADING_DEFAULTS", ERR_LIB_X509, X509_R_LOADING_DEFAULTS}, ++ #else ++ {"LOADING_DEFAULTS", ERR_LIB_X509, 104}, ++ #endif ++ #ifdef X509_R_METHOD_NOT_SUPPORTED ++ {"METHOD_NOT_SUPPORTED", ERR_LIB_X509, X509_R_METHOD_NOT_SUPPORTED}, ++ #else ++ {"METHOD_NOT_SUPPORTED", ERR_LIB_X509, 124}, ++ #endif ++ #ifdef X509_R_NO_CERT_SET_FOR_US_TO_VERIFY ++ {"NO_CERT_SET_FOR_US_TO_VERIFY", ERR_LIB_X509, X509_R_NO_CERT_SET_FOR_US_TO_VERIFY}, ++ #else ++ {"NO_CERT_SET_FOR_US_TO_VERIFY", ERR_LIB_X509, 105}, ++ #endif ++ #ifdef X509_R_PUBLIC_KEY_DECODE_ERROR ++ {"PUBLIC_KEY_DECODE_ERROR", ERR_LIB_X509, X509_R_PUBLIC_KEY_DECODE_ERROR}, ++ #else ++ {"PUBLIC_KEY_DECODE_ERROR", ERR_LIB_X509, 125}, ++ #endif ++ #ifdef X509_R_PUBLIC_KEY_ENCODE_ERROR ++ {"PUBLIC_KEY_ENCODE_ERROR", ERR_LIB_X509, X509_R_PUBLIC_KEY_ENCODE_ERROR}, ++ #else ++ {"PUBLIC_KEY_ENCODE_ERROR", ERR_LIB_X509, 126}, ++ #endif ++ #ifdef X509_R_SHOULD_RETRY ++ {"SHOULD_RETRY", ERR_LIB_X509, X509_R_SHOULD_RETRY}, ++ #else ++ {"SHOULD_RETRY", ERR_LIB_X509, 106}, ++ #endif ++ #ifdef X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN ++ {"UNABLE_TO_FIND_PARAMETERS_IN_CHAIN", ERR_LIB_X509, X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN}, ++ #else ++ {"UNABLE_TO_FIND_PARAMETERS_IN_CHAIN", ERR_LIB_X509, 107}, ++ #endif ++ #ifdef X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY ++ {"UNABLE_TO_GET_CERTS_PUBLIC_KEY", ERR_LIB_X509, X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY}, ++ #else ++ {"UNABLE_TO_GET_CERTS_PUBLIC_KEY", ERR_LIB_X509, 108}, ++ #endif ++ #ifdef X509_R_UNKNOWN_KEY_TYPE ++ {"UNKNOWN_KEY_TYPE", ERR_LIB_X509, X509_R_UNKNOWN_KEY_TYPE}, ++ #else ++ {"UNKNOWN_KEY_TYPE", ERR_LIB_X509, 117}, ++ #endif ++ #ifdef X509_R_UNKNOWN_NID ++ {"UNKNOWN_NID", ERR_LIB_X509, X509_R_UNKNOWN_NID}, ++ #else ++ {"UNKNOWN_NID", ERR_LIB_X509, 109}, ++ #endif ++ #ifdef X509_R_UNKNOWN_PURPOSE_ID ++ {"UNKNOWN_PURPOSE_ID", ERR_LIB_X509, X509_R_UNKNOWN_PURPOSE_ID}, ++ #else ++ {"UNKNOWN_PURPOSE_ID", ERR_LIB_X509, 121}, ++ #endif ++ #ifdef X509_R_UNKNOWN_TRUST_ID ++ {"UNKNOWN_TRUST_ID", ERR_LIB_X509, X509_R_UNKNOWN_TRUST_ID}, ++ #else ++ {"UNKNOWN_TRUST_ID", ERR_LIB_X509, 120}, ++ #endif ++ #ifdef X509_R_UNSUPPORTED_ALGORITHM ++ {"UNSUPPORTED_ALGORITHM", ERR_LIB_X509, X509_R_UNSUPPORTED_ALGORITHM}, ++ #else ++ {"UNSUPPORTED_ALGORITHM", ERR_LIB_X509, 111}, ++ #endif ++ #ifdef X509_R_WRONG_LOOKUP_TYPE ++ {"WRONG_LOOKUP_TYPE", ERR_LIB_X509, X509_R_WRONG_LOOKUP_TYPE}, ++ #else ++ {"WRONG_LOOKUP_TYPE", ERR_LIB_X509, 112}, ++ #endif ++ #ifdef X509_R_WRONG_TYPE ++ {"WRONG_TYPE", ERR_LIB_X509, X509_R_WRONG_TYPE}, ++ #else ++ {"WRONG_TYPE", ERR_LIB_X509, 122}, ++ #endif ++ { NULL } ++}; +diff -r ee879c0ffa11 Modules/_tkinter.c +--- a/Modules/_tkinter.c ++++ b/Modules/_tkinter.c +@@ -408,8 +408,8 @@ + PyErr_SetString(PyExc_OverflowError, "tuple is too long"); + goto finally; + } +- argv = (char **)ckalloc((size_t)argc * sizeof(char *)); +- fv = (int *)ckalloc((size_t)argc * sizeof(int)); ++ argv = (char **)attemptckalloc((size_t)argc * sizeof(char *)); ++ fv = (int *)attemptckalloc((size_t)argc * sizeof(int)); + if (argv == NULL || fv == NULL) { + PyErr_NoMemory(); + goto finally; +@@ -468,8 +468,10 @@ + const char *e = s + size; + PyErr_Clear(); + q = buf = (char *)PyMem_Malloc(size); +- if (buf == NULL) ++ if (buf == NULL) { ++ PyErr_NoMemory(); + return NULL; ++ } + while (s != e) { + if (s + 1 != e && s[0] == '\xc0' && s[1] == '\x80') { + *q++ = '\0'; +@@ -752,7 +754,7 @@ + Tcl_SetVar(v->interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY); + + /* This is used to get the application class for Tk 4.1 and up */ +- argv0 = (char*)ckalloc(strlen(className) + 1); ++ argv0 = (char*)attemptckalloc(strlen(className) + 1); + if (!argv0) { + PyErr_NoMemory(); + Py_DECREF(v); +@@ -786,7 +788,7 @@ + if (use) + len += strlen(use) + sizeof "-use "; + +- args = (char*)ckalloc(len); ++ args = (char*)attemptckalloc(len); + if (!args) { + PyErr_NoMemory(); + Py_DECREF(v); +@@ -1050,11 +1052,13 @@ + Py_ssize_t size, i; + + size = PyTuple_Size(value); ++ if (size == 0) ++ return Tcl_NewListObj(0, NULL); + if (!CHECK_SIZE(size, sizeof(Tcl_Obj *))) { + PyErr_SetString(PyExc_OverflowError, "tuple is too long"); + return NULL; + } +- argv = (Tcl_Obj **) ckalloc(((size_t)size) * sizeof(Tcl_Obj *)); ++ argv = (Tcl_Obj **) attemptckalloc(((size_t)size) * sizeof(Tcl_Obj *)); + if(!argv) + return 0; + for (i = 0; i < size; i++) +@@ -1073,6 +1077,8 @@ + Tcl_UniChar *outbuf = NULL; + Py_ssize_t i; + size_t allocsize; ++ if (size == 0) ++ return Tcl_NewUnicodeObj((const void *)"", 0); + if (!CHECK_SIZE(size, sizeof(Tcl_UniChar))) { + PyErr_SetString(PyExc_OverflowError, "string is too long"); + return NULL; +@@ -1081,7 +1087,7 @@ + return Tcl_NewUnicodeObj(inbuf, size); + allocsize = ((size_t)size) * sizeof(Tcl_UniChar); + if (allocsize >= size) +- outbuf = (Tcl_UniChar*)ckalloc(allocsize); ++ outbuf = (Tcl_UniChar*)attemptckalloc(allocsize); + /* Else overflow occurred, and we take the next exit */ + if (!outbuf) { + PyErr_NoMemory(); +@@ -1270,7 +1276,7 @@ + PyErr_SetString(PyExc_OverflowError, "tuple is too long"); + return NULL; + } +- objv = (Tcl_Obj **)ckalloc(((size_t)objc) * sizeof(Tcl_Obj *)); ++ objv = (Tcl_Obj **)attemptckalloc(((size_t)objc) * sizeof(Tcl_Obj *)); + if (objv == NULL) { + PyErr_NoMemory(); + objc = 0; +@@ -1408,7 +1414,11 @@ + PyObject *exc_type, *exc_value, *exc_tb; + if (!WaitForMainloop(self)) + return NULL; +- ev = (Tkapp_CallEvent*)ckalloc(sizeof(Tkapp_CallEvent)); ++ ev = (Tkapp_CallEvent*)attemptckalloc(sizeof(Tkapp_CallEvent)); ++ if (ev == NULL) { ++ PyErr_NoMemory(); ++ return NULL; ++ } + ev->ev.proc = (Tcl_EventProc*)Tkapp_CallProc; + ev->self = self; + ev->args = args; +@@ -1698,8 +1708,11 @@ + if (!WaitForMainloop(self)) + return NULL; + +- ev = (VarEvent*)ckalloc(sizeof(VarEvent)); +- ++ ev = (VarEvent*)attemptckalloc(sizeof(VarEvent)); ++ if (ev == NULL) { ++ PyErr_NoMemory(); ++ return NULL; ++ } + ev->self = selfptr; + ev->args = args; + ev->flags = flags; +@@ -2310,7 +2323,12 @@ + #ifdef WITH_THREAD + if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) { + Tcl_Condition cond = NULL; +- CommandEvent *ev = (CommandEvent*)ckalloc(sizeof(CommandEvent)); ++ CommandEvent *ev = (CommandEvent*)attemptckalloc(sizeof(CommandEvent)); ++ if (ev == NULL) { ++ PyErr_NoMemory(); ++ PyMem_DEL(data); ++ return NULL; ++ } + ev->ev.proc = (Tcl_EventProc*)Tkapp_CommandProc; + ev->interp = self->interp; + ev->create = 1; +@@ -2357,7 +2375,11 @@ + if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) { + Tcl_Condition cond = NULL; + CommandEvent *ev; +- ev = (CommandEvent*)ckalloc(sizeof(CommandEvent)); ++ ev = (CommandEvent*)attemptckalloc(sizeof(CommandEvent)); ++ if (ev == NULL) { ++ PyErr_NoMemory(); ++ return NULL; ++ } + ev->ev.proc = (Tcl_EventProc*)Tkapp_CommandProc; + ev->interp = self->interp; + ev->create = 0; +@@ -2937,6 +2959,33 @@ + return Py_None; + } + ++/* Convert Python string or any buffer compatible object to Tcl byte-array ++ * object. Use it to pass binary data (e.g. image's data) to Tcl/Tk commands. ++ */ ++static PyObject * ++Tkapp_CreateByteArray(PyObject *self, PyObject *args) ++{ ++ Py_buffer view; ++ Tcl_Obj* obj; ++ PyObject *res = NULL; ++ ++ if (!PyArg_ParseTuple(args, "s*:_createbytearray", &view)) ++ return NULL; ++ ++ if (view.len >= INT_MAX) { ++ PyErr_SetString(PyExc_OverflowError, "string is too long"); ++ return NULL; ++ } ++ obj = Tcl_NewByteArrayObj(view.buf, (int)view.len); ++ if (obj == NULL) { ++ PyBuffer_Release(&view); ++ return Tkinter_Error(self); ++ } ++ res = newPyTclObject(obj); ++ PyBuffer_Release(&view); ++ return res; ++} ++ + + /**** Tkapp Method List ****/ + +@@ -2979,6 +3028,7 @@ + {"quit", Tkapp_Quit, METH_VARARGS}, + {"interpaddr", Tkapp_InterpAddr, METH_VARARGS}, + {"loadtk", Tkapp_TkInit, METH_NOARGS}, ++ {"_createbytearray", Tkapp_CreateByteArray, METH_VARARGS}, + {NULL, NULL} + }; + +diff -r ee879c0ffa11 Modules/fcntlmodule.c +--- a/Modules/fcntlmodule.c ++++ b/Modules/fcntlmodule.c +@@ -34,7 +34,7 @@ + { + int fd; + int code; +- long arg; ++ int arg; + int ret; + char *str; + Py_ssize_t len; +@@ -61,7 +61,7 @@ + PyErr_Clear(); + arg = 0; + if (!PyArg_ParseTuple(args, +- "O&i|l;fcntl requires a file or file descriptor," ++ "O&i|I;fcntl requires a file or file descriptor," + " an integer and optionally a third integer or a string", + conv_descriptor, &fd, &code, &arg)) { + return NULL; +diff -r ee879c0ffa11 Modules/grpmodule.c +--- a/Modules/grpmodule.c ++++ b/Modules/grpmodule.c +@@ -157,11 +157,11 @@ + + static PyMethodDef grp_methods[] = { + {"getgrgid", grp_getgrgid, METH_O, +- "getgrgid(id) -> tuple\n\ ++ "getgrgid(id) -> (gr_name,gr_passwd,gr_gid,gr_mem)\n\ + Return the group database entry for the given numeric group ID. If\n\ + id is not valid, raise KeyError."}, + {"getgrnam", grp_getgrnam, METH_O, +- "getgrnam(name) -> tuple\n\ ++ "getgrnam(name) -> (gr_name,gr_passwd,gr_gid,gr_mem)\n\ + Return the group database entry for the given group name. If\n\ + name is not valid, raise KeyError."}, + {"getgrall", grp_getgrall, METH_NOARGS, +@@ -178,10 +178,10 @@ + Group entries are reported as 4-tuples containing the following fields\n\ + from the group database, in order:\n\ + \n\ +- name - name of the group\n\ +- passwd - group password (encrypted); often empty\n\ +- gid - numeric ID of the group\n\ +- mem - list of members\n\ ++ gr_name - name of the group\n\ ++ gr_passwd - group password (encrypted); often empty\n\ ++ gr_gid - numeric ID of the group\n\ ++ gr_mem - list of members\n\ + \n\ + The gid is an integer, name and password are strings. (Note that most\n\ + users are not explicitly listed as members of the groups they are in\n\ +diff -r ee879c0ffa11 Modules/mmapmodule.c +--- a/Modules/mmapmodule.c ++++ b/Modules/mmapmodule.c +@@ -649,6 +649,19 @@ + } + } + ++#ifdef MS_WINDOWS ++static PyObject * ++mmap__sizeof__method(mmap_object *self, void *unused) ++{ ++ Py_ssize_t res; ++ ++ res = sizeof(mmap_object); ++ if (self->tagname) ++ res += strlen(self->tagname) + 1; ++ return PyLong_FromSsize_t(res); ++} ++#endif ++ + static struct PyMethodDef mmap_object_methods[] = { + {"close", (PyCFunction) mmap_close_method, METH_NOARGS}, + {"find", (PyCFunction) mmap_find_method, METH_VARARGS}, +@@ -664,6 +677,9 @@ + {"tell", (PyCFunction) mmap_tell_method, METH_NOARGS}, + {"write", (PyCFunction) mmap_write_method, METH_VARARGS}, + {"write_byte", (PyCFunction) mmap_write_byte_method, METH_VARARGS}, ++#ifdef MS_WINDOWS ++ {"__sizeof__", (PyCFunction) mmap__sizeof__method, METH_NOARGS}, ++#endif + {NULL, NULL} /* sentinel */ + }; + +diff -r ee879c0ffa11 Modules/posixmodule.c +--- a/Modules/posixmodule.c ++++ b/Modules/posixmodule.c +@@ -6861,7 +6861,7 @@ + if (fstat(fd, &buf) == 0 && S_ISDIR(buf.st_mode)) { + PyMem_FREE(mode); + msg = strerror(EISDIR); +- exc = PyObject_CallFunction(PyExc_IOError, "(isO)", ++ exc = PyObject_CallFunction(PyExc_IOError, "(iss)", + EISDIR, msg, ""); + if (exc) { + PyErr_SetObject(PyExc_IOError, exc); +diff -r ee879c0ffa11 Modules/posixmodule.h +--- a/Modules/posixmodule.h ++++ b/Modules/posixmodule.h +@@ -10,14 +10,12 @@ + #include + #endif + +-#ifndef Py_LIMITED_API + #ifndef MS_WINDOWS + PyAPI_FUNC(PyObject *) _PyInt_FromUid(uid_t); + PyAPI_FUNC(PyObject *) _PyInt_FromGid(gid_t); + PyAPI_FUNC(int) _Py_Uid_Converter(PyObject *, void *); + PyAPI_FUNC(int) _Py_Gid_Converter(PyObject *, void *); + #endif /* MS_WINDOWS */ +-#endif + + #ifdef __cplusplus + } +diff -r ee879c0ffa11 Modules/readline.c +--- a/Modules/readline.c ++++ b/Modules/readline.c +@@ -887,7 +887,7 @@ + #endif + + #ifdef __APPLE__ +- /* the libedit readline emulation resets key bindings etc ++ /* the libedit readline emulation resets key bindings etc + * when calling rl_initialize. So call it upfront + */ + if (using_libedit_emulation) +@@ -932,6 +932,21 @@ + + begidx = PyInt_FromLong(0L); + endidx = PyInt_FromLong(0L); ++ ++#ifndef __APPLE__ ++ if (!isatty(STDOUT_FILENO)) { ++ /* Issue #19884: stdout is no a terminal. Disable meta modifier ++ keys to not write the ANSI sequence "\033[1034h" into stdout. On ++ terminals supporting 8 bit characters like TERM=xterm-256color ++ (which is now the default Fedora since Fedora 18), the meta key is ++ used to enable support of 8 bit characters (ANSI sequence ++ "\033[1034h"). ++ ++ With libedit, this call makes readline() crash. */ ++ rl_variable_bind ("enable-meta-key", "off"); ++ } ++#endif ++ + /* Initialize (allows .inputrc to override) + * + * XXX: A bug in the readline-2.2 library causes a memory leak +@@ -943,7 +958,7 @@ + else + #endif /* __APPLE__ */ + rl_initialize(); +- ++ + RESTORE_LOCALE(saved_locale) + } + +@@ -1169,4 +1184,7 @@ + + PyOS_ReadlineFunctionPointer = call_readline; + setup_readline(); ++ ++ PyModule_AddIntConstant(m, "_READLINE_VERSION", RL_READLINE_VERSION); ++ PyModule_AddIntConstant(m, "_READLINE_RUNTIME_VERSION", rl_readline_version); + } +diff -r ee879c0ffa11 Modules/socketmodule.c +--- a/Modules/socketmodule.c ++++ b/Modules/socketmodule.c +@@ -94,6 +94,10 @@ + #include "structmember.h" + #include "timefuncs.h" + ++#ifndef INVALID_SOCKET /* MS defines this */ ++#define INVALID_SOCKET (-1) ++#endif ++ + #undef MAX + #define MAX(x, y) ((x) < (y) ? (y) : (x)) + +@@ -1705,11 +1709,7 @@ + return NULL; + memset(&addrbuf, 0, addrlen); + +-#ifdef MS_WINDOWS + newfd = INVALID_SOCKET; +-#else +- newfd = -1; +-#endif + + if (!IS_SELECTABLE(s)) + return select_error(); +@@ -1727,11 +1727,7 @@ + } + END_SELECT_LOOP(s) + +-#ifdef MS_WINDOWS + if (newfd == INVALID_SOCKET) +-#else +- if (newfd < 0) +-#endif + return s->errorhandler(); + + /* Create the new object with unspecified family, +@@ -3119,6 +3115,8 @@ + { + if (s->sock_fd != -1) + (void) SOCKETCLOSE(s->sock_fd); ++ if (s->weakreflist != NULL) ++ PyObject_ClearWeakRefs((PyObject *)s); + Py_TYPE(s)->tp_free((PyObject *)s); + } + +@@ -3127,8 +3125,13 @@ + sock_repr(PySocketSockObject *s) + { + char buf[512]; ++ long sock_fd; ++ /* On Windows, this test is needed because SOCKET_T is unsigned */ ++ if (s->sock_fd == INVALID_SOCKET) { ++ sock_fd = -1; ++ } + #if SIZEOF_SOCKET_T > SIZEOF_LONG +- if (s->sock_fd > LONG_MAX) { ++ else if (s->sock_fd > LONG_MAX) { + /* this can occur on Win64, and actually there is a special + ugly printf formatter for decimal pointer length integer + printing, only bother if necessary*/ +@@ -3138,10 +3141,12 @@ + return NULL; + } + #endif ++ else ++ sock_fd = (long)s->sock_fd; + PyOS_snprintf( + buf, sizeof(buf), + "", +- (long)s->sock_fd, s->sock_family, ++ sock_fd, s->sock_family, + s->sock_type, + s->sock_proto); + return PyString_FromString(buf); +@@ -3160,6 +3165,7 @@ + ((PySocketSockObject *)new)->sock_fd = -1; + ((PySocketSockObject *)new)->sock_timeout = -1.0; + ((PySocketSockObject *)new)->errorhandler = &set_error; ++ ((PySocketSockObject *)new)->weakreflist = NULL; + } + return new; + } +@@ -3185,12 +3191,7 @@ + fd = socket(family, type, proto); + Py_END_ALLOW_THREADS + +-#ifdef MS_WINDOWS +- if (fd == INVALID_SOCKET) +-#else +- if (fd < 0) +-#endif +- { ++ if (fd == INVALID_SOCKET) { + set_error(); + return -1; + } +@@ -3228,7 +3229,7 @@ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ +- 0, /* tp_weaklistoffset */ ++ offsetof(PySocketSockObject, weakreflist), /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + sock_methods, /* tp_methods */ +diff -r ee879c0ffa11 Modules/socketmodule.h +--- a/Modules/socketmodule.h ++++ b/Modules/socketmodule.h +@@ -132,6 +132,7 @@ + sets a Python exception */ + double sock_timeout; /* Operation timeout in seconds; + 0.0 means non-blocking */ ++ PyObject *weakreflist; + } PySocketSockObject; + + /* --- C API ----------------------------------------------------*/ +diff -r ee879c0ffa11 Modules/zlib/ChangeLog +--- a/Modules/zlib/ChangeLog ++++ b/Modules/zlib/ChangeLog +@@ -1,6 +1,623 @@ + + ChangeLog file for zlib + ++Changes in 1.2.8 (28 Apr 2013) ++- Update contrib/minizip/iowin32.c for Windows RT [Vollant] ++- Do not force Z_CONST for C++ ++- Clean up contrib/vstudio [Ro§] ++- Correct spelling error in zlib.h ++- Fix mixed line endings in contrib/vstudio ++ ++Changes in 1.2.7.3 (13 Apr 2013) ++- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc ++ ++Changes in 1.2.7.2 (13 Apr 2013) ++- Change check for a four-byte type back to hexadecimal ++- Fix typo in win32/Makefile.msc ++- Add casts in gzwrite.c for pointer differences ++ ++Changes in 1.2.7.1 (24 Mar 2013) ++- Replace use of unsafe string functions with snprintf if available ++- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink] ++- Fix gzgetc undefine when Z_PREFIX set [Turk] ++- Eliminate use of mktemp in Makefile (not always available) ++- Fix bug in 'F' mode for gzopen() ++- Add inflateGetDictionary() function ++- Correct comment in deflate.h ++- Use _snprintf for snprintf in Microsoft C ++- On Darwin, only use /usr/bin/libtool if libtool is not Apple ++- Delete "--version" file if created by "ar --version" [Richard G.] ++- Fix configure check for veracity of compiler error return codes ++- Fix CMake compilation of static lib for MSVC2010 x64 ++- Remove unused variable in infback9.c ++- Fix argument checks in gzlog_compress() and gzlog_write() ++- Clean up the usage of z_const and respect const usage within zlib ++- Clean up examples/gzlog.[ch] comparisons of different types ++- Avoid shift equal to bits in type (caused endless loop) ++- Fix unintialized value bug in gzputc() introduced by const patches ++- Fix memory allocation error in examples/zran.c [Nor] ++- Fix bug where gzopen(), gzclose() would write an empty file ++- Fix bug in gzclose() when gzwrite() runs out of memory ++- Check for input buffer malloc failure in examples/gzappend.c ++- Add note to contrib/blast to use binary mode in stdio ++- Fix comparisons of differently signed integers in contrib/blast ++- Check for invalid code length codes in contrib/puff ++- Fix serious but very rare decompression bug in inftrees.c ++- Update inflateBack() comments, since inflate() can be faster ++- Use underscored I/O function names for WINAPI_FAMILY ++- Add _tr_flush_bits to the external symbols prefixed by --zprefix ++- Add contrib/vstudio/vc10 pre-build step for static only ++- Quote --version-script argument in CMakeLists.txt ++- Don't specify --version-script on Apple platforms in CMakeLists.txt ++- Fix casting error in contrib/testzlib/testzlib.c ++- Fix types in contrib/minizip to match result of get_crc_table() ++- Simplify contrib/vstudio/vc10 with 'd' suffix ++- Add TOP support to win32/Makefile.msc ++- Suport i686 and amd64 assembler builds in CMakeLists.txt ++- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h ++- Add vc11 and vc12 build files to contrib/vstudio ++- Add gzvprintf() as an undocumented function in zlib ++- Fix configure for Sun shell ++- Remove runtime check in configure for four-byte integer type ++- Add casts and consts to ease user conversion to C++ ++- Add man pages for minizip and miniunzip ++- In Makefile uninstall, don't rm if preceding cd fails ++- Do not return Z_BUF_ERROR if deflateParam() has nothing to write ++ ++Changes in 1.2.7 (2 May 2012) ++- Replace use of memmove() with a simple copy for portability ++- Test for existence of strerror ++- Restore gzgetc_ for backward compatibility with 1.2.6 ++- Fix build with non-GNU make on Solaris ++- Require gcc 4.0 or later on Mac OS X to use the hidden attribute ++- Include unistd.h for Watcom C ++- Use __WATCOMC__ instead of __WATCOM__ ++- Do not use the visibility attribute if NO_VIZ defined ++- Improve the detection of no hidden visibility attribute ++- Avoid using __int64 for gcc or solo compilation ++- Cast to char * in gzprintf to avoid warnings [Zinser] ++- Fix make_vms.com for VAX [Zinser] ++- Don't use library or built-in byte swaps ++- Simplify test and use of gcc hidden attribute ++- Fix bug in gzclose_w() when gzwrite() fails to allocate memory ++- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen() ++- Fix bug in test/minigzip.c for configure --solo ++- Fix contrib/vstudio project link errors [Mohanathas] ++- Add ability to choose the builder in make_vms.com [Schweda] ++- Add DESTDIR support to mingw32 win32/Makefile.gcc ++- Fix comments in win32/Makefile.gcc for proper usage ++- Allow overriding the default install locations for cmake ++- Generate and install the pkg-config file with cmake ++- Build both a static and a shared version of zlib with cmake ++- Include version symbols for cmake builds ++- If using cmake with MSVC, add the source directory to the includes ++- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta] ++- Move obsolete emx makefile to old [Truta] ++- Allow the use of -Wundef when compiling or using zlib ++- Avoid the use of the -u option with mktemp ++- Improve inflate() documentation on the use of Z_FINISH ++- Recognize clang as gcc ++- Add gzopen_w() in Windows for wide character path names ++- Rename zconf.h in CMakeLists.txt to move it out of the way ++- Add source directory in CMakeLists.txt for building examples ++- Look in build directory for zlib.pc in CMakeLists.txt ++- Remove gzflags from zlibvc.def in vc9 and vc10 ++- Fix contrib/minizip compilation in the MinGW environment ++- Update ./configure for Solaris, support --64 [Mooney] ++- Remove -R. from Solaris shared build (possible security issue) ++- Avoid race condition for parallel make (-j) running example ++- Fix type mismatch between get_crc_table() and crc_table ++- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler] ++- Fix the path to zlib.map in CMakeLists.txt ++- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe] ++- Add instructions to win32/Makefile.gcc for shared install [Torri] ++ ++Changes in 1.2.6.1 (12 Feb 2012) ++- Avoid the use of the Objective-C reserved name "id" ++- Include io.h in gzguts.h for Microsoft compilers ++- Fix problem with ./configure --prefix and gzgetc macro ++- Include gz_header definition when compiling zlib solo ++- Put gzflags() functionality back in zutil.c ++- Avoid library header include in crc32.c for Z_SOLO ++- Use name in GCC_CLASSIC as C compiler for coverage testing, if set ++- Minor cleanup in contrib/minizip/zip.c [Vollant] ++- Update make_vms.com [Zinser] ++- Remove unnecessary gzgetc_ function ++- Use optimized byte swap operations for Microsoft and GNU [Snyder] ++- Fix minor typo in zlib.h comments [Rzesniowiecki] ++ ++Changes in 1.2.6 (29 Jan 2012) ++- Update the Pascal interface in contrib/pascal ++- Fix function numbers for gzgetc_ in zlibvc.def files ++- Fix configure.ac for contrib/minizip [Schiffer] ++- Fix large-entry detection in minizip on 64-bit systems [Schiffer] ++- Have ./configure use the compiler return code for error indication ++- Fix CMakeLists.txt for cross compilation [McClure] ++- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes] ++- Fix compilation of contrib/minizip on FreeBSD [Marquez] ++- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath] ++- Include io.h for Turbo C / Borland C on all platforms [Truta] ++- Make version explicit in contrib/minizip/configure.ac [Bosmans] ++- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant] ++- Minor cleanup up contrib/minizip/unzip.c [Vollant] ++- Fix bug when compiling minizip with C++ [Vollant] ++- Protect for long name and extra fields in contrib/minizip [Vollant] ++- Avoid some warnings in contrib/minizip [Vollant] ++- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip ++- Add missing libs to minizip linker command ++- Add support for VPATH builds in contrib/minizip ++- Add an --enable-demos option to contrib/minizip/configure ++- Add the generation of configure.log by ./configure ++- Exit when required parameters not provided to win32/Makefile.gcc ++- Have gzputc return the character written instead of the argument ++- Use the -m option on ldconfig for BSD systems [Tobias] ++- Correct in zlib.map when deflateResetKeep was added ++ ++Changes in 1.2.5.3 (15 Jan 2012) ++- Restore gzgetc function for binary compatibility ++- Do not use _lseeki64 under Borland C++ [Truta] ++- Update win32/Makefile.msc to build test/*.c [Truta] ++- Remove old/visualc6 given CMakefile and other alternatives ++- Update AS400 build files and documentation [Monnerat] ++- Update win32/Makefile.gcc to build test/*.c [Truta] ++- Permit stronger flushes after Z_BLOCK flushes ++- Avoid extraneous empty blocks when doing empty flushes ++- Permit Z_NULL arguments to deflatePending ++- Allow deflatePrime() to insert bits in the middle of a stream ++- Remove second empty static block for Z_PARTIAL_FLUSH ++- Write out all of the available bits when using Z_BLOCK ++- Insert the first two strings in the hash table after a flush ++ ++Changes in 1.2.5.2 (17 Dec 2011) ++- fix ld error: unable to find version dependency 'ZLIB_1.2.5' ++- use relative symlinks for shared libs ++- Avoid searching past window for Z_RLE strategy ++- Assure that high-water mark initialization is always applied in deflate ++- Add assertions to fill_window() in deflate.c to match comments ++- Update python link in README ++- Correct spelling error in gzread.c ++- Fix bug in gzgets() for a concatenated empty gzip stream ++- Correct error in comment for gz_make() ++- Change gzread() and related to ignore junk after gzip streams ++- Allow gzread() and related to continue after gzclearerr() ++- Allow gzrewind() and gzseek() after a premature end-of-file ++- Simplify gzseek() now that raw after gzip is ignored ++- Change gzgetc() to a macro for speed (~40% speedup in testing) ++- Fix gzclose() to return the actual error last encountered ++- Always add large file support for windows ++- Include zconf.h for windows large file support ++- Include zconf.h.cmakein for windows large file support ++- Update zconf.h.cmakein on make distclean ++- Merge vestigial vsnprintf determination from zutil.h to gzguts.h ++- Clarify how gzopen() appends in zlib.h comments ++- Correct documentation of gzdirect() since junk at end now ignored ++- Add a transparent write mode to gzopen() when 'T' is in the mode ++- Update python link in zlib man page ++- Get inffixed.h and MAKEFIXED result to match ++- Add a ./config --solo option to make zlib subset with no libary use ++- Add undocumented inflateResetKeep() function for CAB file decoding ++- Add --cover option to ./configure for gcc coverage testing ++- Add #define ZLIB_CONST option to use const in the z_stream interface ++- Add comment to gzdopen() in zlib.h to use dup() when using fileno() ++- Note behavior of uncompress() to provide as much data as it can ++- Add files in contrib/minizip to aid in building libminizip ++- Split off AR options in Makefile.in and configure ++- Change ON macro to Z_ARG to avoid application conflicts ++- Facilitate compilation with Borland C++ for pragmas and vsnprintf ++- Include io.h for Turbo C / Borland C++ ++- Move example.c and minigzip.c to test/ ++- Simplify incomplete code table filling in inflate_table() ++- Remove code from inflate.c and infback.c that is impossible to execute ++- Test the inflate code with full coverage ++- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw) ++- Add deflateResetKeep and fix inflateResetKeep to retain dictionary ++- Fix gzwrite.c to accommodate reduced memory zlib compilation ++- Have inflate() with Z_FINISH avoid the allocation of a window ++- Do not set strm->adler when doing raw inflate ++- Fix gzeof() to behave just like feof() when read is not past end of file ++- Fix bug in gzread.c when end-of-file is reached ++- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF ++- Document gzread() capability to read concurrently written files ++- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo] ++ ++Changes in 1.2.5.1 (10 Sep 2011) ++- Update FAQ entry on shared builds (#13) ++- Avoid symbolic argument to chmod in Makefile.in ++- Fix bug and add consts in contrib/puff [Oberhumer] ++- Update contrib/puff/zeros.raw test file to have all block types ++- Add full coverage test for puff in contrib/puff/Makefile ++- Fix static-only-build install in Makefile.in ++- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno] ++- Add libz.a dependency to shared in Makefile.in for parallel builds ++- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out ++- Replace $(...) with `...` in configure for non-bash sh [Bowler] ++- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen] ++- Add solaris* to Linux* in configure to allow gcc use [Groffen] ++- Add *bsd* to Linux* case in configure [Bar-Lev] ++- Add inffast.obj to dependencies in win32/Makefile.msc ++- Correct spelling error in deflate.h [Kohler] ++- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc ++- Add test to configure for GNU C looking for gcc in output of $cc -v ++- Add zlib.pc generation to win32/Makefile.gcc [Weigelt] ++- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not ++- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense ++- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser) ++- Make stronger test in zconf.h to include unistd.h for LFS ++- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack] ++- Fix zlib.h LFS support when Z_PREFIX used ++- Add updated as400 support (removed from old) [Monnerat] ++- Avoid deflate sensitivity to volatile input data ++- Avoid division in adler32_combine for NO_DIVIDE ++- Clarify the use of Z_FINISH with deflateBound() amount of space ++- Set binary for output file in puff.c ++- Use u4 type for crc_table to avoid conversion warnings ++- Apply casts in zlib.h to avoid conversion warnings ++- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller] ++- Improve inflateSync() documentation to note indeterminancy ++- Add deflatePending() function to return the amount of pending output ++- Correct the spelling of "specification" in FAQ [Randers-Pehrson] ++- Add a check in configure for stdarg.h, use for gzprintf() ++- Check that pointers fit in ints when gzprint() compiled old style ++- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler] ++- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt] ++- Add debug records in assmebler code [Londer] ++- Update RFC references to use http://tools.ietf.org/html/... [Li] ++- Add --archs option, use of libtool to configure for Mac OS X [Borstel] ++ ++Changes in 1.2.5 (19 Apr 2010) ++- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev] ++- Default to libdir as sharedlibdir in configure [Nieder] ++- Update copyright dates on modified source files ++- Update trees.c to be able to generate modified trees.h ++- Exit configure for MinGW, suggesting win32/Makefile.gcc ++- Check for NULL path in gz_open [Homurlu] ++ ++Changes in 1.2.4.5 (18 Apr 2010) ++- Set sharedlibdir in configure [Torok] ++- Set LDFLAGS in Makefile.in [Bar-Lev] ++- Avoid mkdir objs race condition in Makefile.in [Bowler] ++- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays ++- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C ++- Don't use hidden attribute when it is a warning generator (e.g. Solaris) ++ ++Changes in 1.2.4.4 (18 Apr 2010) ++- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok] ++- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty ++- Try to use bash or ksh regardless of functionality of /bin/sh ++- Fix configure incompatibility with NetBSD sh ++- Remove attempt to run under bash or ksh since have better NetBSD fix ++- Fix win32/Makefile.gcc for MinGW [Bar-Lev] ++- Add diagnostic messages when using CROSS_PREFIX in configure ++- Added --sharedlibdir option to configure [Weigelt] ++- Use hidden visibility attribute when available [Frysinger] ++ ++Changes in 1.2.4.3 (10 Apr 2010) ++- Only use CROSS_PREFIX in configure for ar and ranlib if they exist ++- Use CROSS_PREFIX for nm [Bar-Lev] ++- Assume _LARGEFILE64_SOURCE defined is equivalent to true ++- Avoid use of undefined symbols in #if with && and || ++- Make *64 prototypes in gzguts.h consistent with functions ++- Add -shared load option for MinGW in configure [Bowler] ++- Move z_off64_t to public interface, use instead of off64_t ++- Remove ! from shell test in configure (not portable to Solaris) ++- Change +0 macro tests to -0 for possibly increased portability ++ ++Changes in 1.2.4.2 (9 Apr 2010) ++- Add consistent carriage returns to readme.txt's in masmx86 and masmx64 ++- Really provide prototypes for *64 functions when building without LFS ++- Only define unlink() in minigzip.c if unistd.h not included ++- Update README to point to contrib/vstudio project files ++- Move projects/vc6 to old/ and remove projects/ ++- Include stdlib.h in minigzip.c for setmode() definition under WinCE ++- Clean up assembler builds in win32/Makefile.msc [Rowe] ++- Include sys/types.h for Microsoft for off_t definition ++- Fix memory leak on error in gz_open() ++- Symbolize nm as $NM in configure [Weigelt] ++- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt] ++- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined ++- Fix bug in gzeof() to take into account unused input data ++- Avoid initialization of structures with variables in puff.c ++- Updated win32/README-WIN32.txt [Rowe] ++ ++Changes in 1.2.4.1 (28 Mar 2010) ++- Remove the use of [a-z] constructs for sed in configure [gentoo 310225] ++- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech] ++- Restore "for debugging" comment on sprintf() in gzlib.c ++- Remove fdopen for MVS from gzguts.h ++- Put new README-WIN32.txt in win32 [Rowe] ++- Add check for shell to configure and invoke another shell if needed ++- Fix big fat stinking bug in gzseek() on uncompressed files ++- Remove vestigial F_OPEN64 define in zutil.h ++- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE ++- Avoid errors on non-LFS systems when applications define LFS macros ++- Set EXE to ".exe" in configure for MINGW [Kahle] ++- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill] ++- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev] ++- Add DLL install in win32/makefile.gcc [Bar-Lev] ++- Allow Linux* or linux* from uname in configure [Bar-Lev] ++- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev] ++- Add cross-compilation prefixes to configure [Bar-Lev] ++- Match type exactly in gz_load() invocation in gzread.c ++- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func ++- Provide prototypes for *64 functions when building zlib without LFS ++- Don't use -lc when linking shared library on MinGW ++- Remove errno.h check in configure and vestigial errno code in zutil.h ++ ++Changes in 1.2.4 (14 Mar 2010) ++- Fix VER3 extraction in configure for no fourth subversion ++- Update zlib.3, add docs to Makefile.in to make .pdf out of it ++- Add zlib.3.pdf to distribution ++- Don't set error code in gzerror() if passed pointer is NULL ++- Apply destination directory fixes to CMakeLists.txt [Lowman] ++- Move #cmakedefine's to a new zconf.in.cmakein ++- Restore zconf.h for builds that don't use configure or cmake ++- Add distclean to dummy Makefile for convenience ++- Update and improve INDEX, README, and FAQ ++- Update CMakeLists.txt for the return of zconf.h [Lowman] ++- Update contrib/vstudio/vc9 and vc10 [Vollant] ++- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc ++- Apply license and readme changes to contrib/asm686 [Raiter] ++- Check file name lengths and add -c option in minigzip.c [Li] ++- Update contrib/amd64 and contrib/masmx86/ [Vollant] ++- Avoid use of "eof" parameter in trees.c to not shadow library variable ++- Update make_vms.com for removal of zlibdefs.h [Zinser] ++- Update assembler code and vstudio projects in contrib [Vollant] ++- Remove outdated assembler code contrib/masm686 and contrib/asm586 ++- Remove old vc7 and vc8 from contrib/vstudio ++- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe] ++- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open() ++- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant] ++- Remove *64 functions from win32/zlib.def (they're not 64-bit yet) ++- Fix bug in void-returning vsprintf() case in gzwrite.c ++- Fix name change from inflate.h in contrib/inflate86/inffas86.c ++- Check if temporary file exists before removing in make_vms.com [Zinser] ++- Fix make install and uninstall for --static option ++- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta] ++- Update readme.txt in contrib/masmx64 and masmx86 to assemble ++ ++Changes in 1.2.3.9 (21 Feb 2010) ++- Expunge gzio.c ++- Move as400 build information to old ++- Fix updates in contrib/minizip and contrib/vstudio ++- Add const to vsnprintf test in configure to avoid warnings [Weigelt] ++- Delete zconf.h (made by configure) [Weigelt] ++- Change zconf.in.h to zconf.h.in per convention [Weigelt] ++- Check for NULL buf in gzgets() ++- Return empty string for gzgets() with len == 1 (like fgets()) ++- Fix description of gzgets() in zlib.h for end-of-file, NULL return ++- Update minizip to 1.1 [Vollant] ++- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c ++- Note in zlib.h that gzerror() should be used to distinguish from EOF ++- Remove use of snprintf() from gzlib.c ++- Fix bug in gzseek() ++- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant] ++- Fix zconf.h generation in CMakeLists.txt [Lowman] ++- Improve comments in zconf.h where modified by configure ++ ++Changes in 1.2.3.8 (13 Feb 2010) ++- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer] ++- Use z_off64_t in gz_zero() and gz_skip() to match state->skip ++- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t) ++- Revert to Makefile.in from 1.2.3.6 (live with the clutter) ++- Fix missing error return in gzflush(), add zlib.h note ++- Add *64 functions to zlib.map [Levin] ++- Fix signed/unsigned comparison in gz_comp() ++- Use SFLAGS when testing shared linking in configure ++- Add --64 option to ./configure to use -m64 with gcc ++- Fix ./configure --help to correctly name options ++- Have make fail if a test fails [Levin] ++- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson] ++- Remove assembler object files from contrib ++ ++Changes in 1.2.3.7 (24 Jan 2010) ++- Always gzopen() with O_LARGEFILE if available ++- Fix gzdirect() to work immediately after gzopen() or gzdopen() ++- Make gzdirect() more precise when the state changes while reading ++- Improve zlib.h documentation in many places ++- Catch memory allocation failure in gz_open() ++- Complete close operation if seek forward in gzclose_w() fails ++- Return Z_ERRNO from gzclose_r() if close() fails ++- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL ++- Return zero for gzwrite() errors to match zlib.h description ++- Return -1 on gzputs() error to match zlib.h description ++- Add zconf.in.h to allow recovery from configure modification [Weigelt] ++- Fix static library permissions in Makefile.in [Weigelt] ++- Avoid warnings in configure tests that hide functionality [Weigelt] ++- Add *BSD and DragonFly to Linux case in configure [gentoo 123571] ++- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212] ++- Avoid access of uninitialized data for first inflateReset2 call [Gomes] ++- Keep object files in subdirectories to reduce the clutter somewhat ++- Remove default Makefile and zlibdefs.h, add dummy Makefile ++- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_ ++- Remove zlibdefs.h completely -- modify zconf.h instead ++ ++Changes in 1.2.3.6 (17 Jan 2010) ++- Avoid void * arithmetic in gzread.c and gzwrite.c ++- Make compilers happier with const char * for gz_error message ++- Avoid unused parameter warning in inflate.c ++- Avoid signed-unsigned comparison warning in inflate.c ++- Indent #pragma's for traditional C ++- Fix usage of strwinerror() in glib.c, change to gz_strwinerror() ++- Correct email address in configure for system options ++- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser] ++- Update zlib.map [Brown] ++- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok] ++- Apply various fixes to CMakeLists.txt [Lowman] ++- Add checks on len in gzread() and gzwrite() ++- Add error message for no more room for gzungetc() ++- Remove zlib version check in gzwrite() ++- Defer compression of gzprintf() result until need to ++- Use snprintf() in gzdopen() if available ++- Remove USE_MMAP configuration determination (only used by minigzip) ++- Remove examples/pigz.c (available separately) ++- Update examples/gun.c to 1.6 ++ ++Changes in 1.2.3.5 (8 Jan 2010) ++- Add space after #if in zutil.h for some compilers ++- Fix relatively harmless bug in deflate_fast() [Exarevsky] ++- Fix same problem in deflate_slow() ++- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown] ++- Add deflate_rle() for faster Z_RLE strategy run-length encoding ++- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding ++- Change name of "write" variable in inffast.c to avoid library collisions ++- Fix premature EOF from gzread() in gzio.c [Brown] ++- Use zlib header window size if windowBits is 0 in inflateInit2() ++- Remove compressBound() call in deflate.c to avoid linking compress.o ++- Replace use of errno in gz* with functions, support WinCE [Alves] ++- Provide alternative to perror() in minigzip.c for WinCE [Alves] ++- Don't use _vsnprintf on later versions of MSVC [Lowman] ++- Add CMake build script and input file [Lowman] ++- Update contrib/minizip to 1.1 [Svensson, Vollant] ++- Moved nintendods directory from contrib to . ++- Replace gzio.c with a new set of routines with the same functionality ++- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above ++- Update contrib/minizip to 1.1b ++- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h ++ ++Changes in 1.2.3.4 (21 Dec 2009) ++- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility ++- Update comments in configure and Makefile.in for default --shared ++- Fix test -z's in configure [Marquess] ++- Build examplesh and minigzipsh when not testing ++- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h ++- Import LDFLAGS from the environment in configure ++- Fix configure to populate SFLAGS with discovered CFLAGS options ++- Adapt make_vms.com to the new Makefile.in [Zinser] ++- Add zlib2ansi script for C++ compilation [Marquess] ++- Add _FILE_OFFSET_BITS=64 test to make test (when applicable) ++- Add AMD64 assembler code for longest match to contrib [Teterin] ++- Include options from $SFLAGS when doing $LDSHARED ++- Simplify 64-bit file support by introducing z_off64_t type ++- Make shared object files in objs directory to work around old Sun cc ++- Use only three-part version number for Darwin shared compiles ++- Add rc option to ar in Makefile.in for when ./configure not run ++- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4* ++- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile ++- Protect against _FILE_OFFSET_BITS being defined when compiling zlib ++- Rename Makefile.in targets allstatic to static and allshared to shared ++- Fix static and shared Makefile.in targets to be independent ++- Correct error return bug in gz_open() by setting state [Brown] ++- Put spaces before ;;'s in configure for better sh compatibility ++- Add pigz.c (parallel implementation of gzip) to examples/ ++- Correct constant in crc32.c to UL [Leventhal] ++- Reject negative lengths in crc32_combine() ++- Add inflateReset2() function to work like inflateEnd()/inflateInit2() ++- Include sys/types.h for _LARGEFILE64_SOURCE [Brown] ++- Correct typo in doc/algorithm.txt [Janik] ++- Fix bug in adler32_combine() [Zhu] ++- Catch missing-end-of-block-code error in all inflates and in puff ++ Assures that random input to inflate eventually results in an error ++- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/ ++- Update ENOUGH and its usage to reflect discovered bounds ++- Fix gzerror() error report on empty input file [Brown] ++- Add ush casts in trees.c to avoid pedantic runtime errors ++- Fix typo in zlib.h uncompress() description [Reiss] ++- Correct inflate() comments with regard to automatic header detection ++- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays) ++- Put new version of gzlog (2.0) in examples with interruption recovery ++- Add puff compile option to permit invalid distance-too-far streams ++- Add puff TEST command options, ability to read piped input ++- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but ++ _LARGEFILE64_SOURCE not defined ++- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart ++- Fix deflateSetDictionary() to use all 32K for output consistency ++- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h) ++- Clear bytes after deflate lookahead to avoid use of uninitialized data ++- Change a limit in inftrees.c to be more transparent to Coverity Prevent ++- Update win32/zlib.def with exported symbols from zlib.h ++- Correct spelling errors in zlib.h [Willem, Sobrado] ++- Allow Z_BLOCK for deflate() to force a new block ++- Allow negative bits in inflatePrime() to delete existing bit buffer ++- Add Z_TREES flush option to inflate() to return at end of trees ++- Add inflateMark() to return current state information for random access ++- Add Makefile for NintendoDS to contrib [Costa] ++- Add -w in configure compile tests to avoid spurious warnings [Beucler] ++- Fix typos in zlib.h comments for deflateSetDictionary() ++- Fix EOF detection in transparent gzread() [Maier] ++ ++Changes in 1.2.3.3 (2 October 2006) ++- Make --shared the default for configure, add a --static option ++- Add compile option to permit invalid distance-too-far streams ++- Add inflateUndermine() function which is required to enable above ++- Remove use of "this" variable name for C++ compatibility [Marquess] ++- Add testing of shared library in make test, if shared library built ++- Use ftello() and fseeko() if available instead of ftell() and fseek() ++- Provide two versions of all functions that use the z_off_t type for ++ binary compatibility -- a normal version and a 64-bit offset version, ++ per the Large File Support Extension when _LARGEFILE64_SOURCE is ++ defined; use the 64-bit versions by default when _FILE_OFFSET_BITS ++ is defined to be 64 ++- Add a --uname= option to configure to perhaps help with cross-compiling ++ ++Changes in 1.2.3.2 (3 September 2006) ++- Turn off silly Borland warnings [Hay] ++- Use off64_t and define _LARGEFILE64_SOURCE when present ++- Fix missing dependency on inffixed.h in Makefile.in ++- Rig configure --shared to build both shared and static [Teredesai, Truta] ++- Remove zconf.in.h and instead create a new zlibdefs.h file ++- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant] ++- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt] ++ ++Changes in 1.2.3.1 (16 August 2006) ++- Add watcom directory with OpenWatcom make files [Daniel] ++- Remove #undef of FAR in zconf.in.h for MVS [Fedtke] ++- Update make_vms.com [Zinser] ++- Use -fPIC for shared build in configure [Teredesai, Nicholson] ++- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen] ++- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck] ++- Add some FAQ entries about the contrib directory ++- Update the MVS question in the FAQ ++- Avoid extraneous reads after EOF in gzio.c [Brown] ++- Correct spelling of "successfully" in gzio.c [Randers-Pehrson] ++- Add comments to zlib.h about gzerror() usage [Brown] ++- Set extra flags in gzip header in gzopen() like deflate() does ++- Make configure options more compatible with double-dash conventions ++ [Weigelt] ++- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen] ++- Fix uninstall target in Makefile.in [Truta] ++- Add pkgconfig support [Weigelt] ++- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt] ++- Replace set_data_type() with a more accurate detect_data_type() in ++ trees.c, according to the txtvsbin.txt document [Truta] ++- Swap the order of #include and #include "zlib.h" in ++ gzio.c, example.c and minigzip.c [Truta] ++- Shut up annoying VS2005 warnings about standard C deprecation [Rowe, ++ Truta] (where?) ++- Fix target "clean" from win32/Makefile.bor [Truta] ++- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe] ++- Update zlib www home address in win32/DLL_FAQ.txt [Truta] ++- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove] ++- Enable browse info in the "Debug" and "ASM Debug" configurations in ++ the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta] ++- Add pkgconfig support [Weigelt] ++- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h, ++ for use in win32/zlib1.rc [Polushin, Rowe, Truta] ++- Add a document that explains the new text detection scheme to ++ doc/txtvsbin.txt [Truta] ++- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta] ++- Move algorithm.txt into doc/ [Truta] ++- Synchronize FAQ with website ++- Fix compressBound(), was low for some pathological cases [Fearnley] ++- Take into account wrapper variations in deflateBound() ++- Set examples/zpipe.c input and output to binary mode for Windows ++- Update examples/zlib_how.html with new zpipe.c (also web site) ++- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems ++ that gcc became pickier in 4.0) ++- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain ++ un-versioned, the patch adds versioning only for symbols introduced in ++ zlib-1.2.0 or later. It also declares as local those symbols which are ++ not designed to be exported." [Levin] ++- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure ++- Do not initialize global static by default in trees.c, add a response ++ NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess] ++- Don't use strerror() in gzio.c under WinCE [Yakimov] ++- Don't use errno.h in zutil.h under WinCE [Yakimov] ++- Move arguments for AR to its usage to allow replacing ar [Marot] ++- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson] ++- Improve inflateInit() and inflateInit2() documentation ++- Fix structure size comment in inflate.h ++- Change configure help option from --h* to --help [Santos] ++ + Changes in 1.2.3 (18 July 2005) + - Apply security vulnerability fixes to contrib/infback9 as well + - Clean up some text files (carriage returns, trailing space) +@@ -13,7 +630,7 @@ + compile + - Fix some spelling errors in comments [Betts] + - Correct inflateInit2() error return documentation in zlib.h +-- Added zran.c example of compressed data random access to examples ++- Add zran.c example of compressed data random access to examples + directory, shows use of inflatePrime() + - Fix cast for assignments to strm->state in inflate.c and infback.c + - Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer] +diff -r ee879c0ffa11 Modules/zlib/FAQ +--- a/Modules/zlib/FAQ ++++ b/Modules/zlib/FAQ +@@ -3,8 +3,8 @@ + + + If your question is not there, please check the zlib home page +-http://www.zlib.org which may have more recent information. +-The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html ++http://zlib.net/ which may have more recent information. ++The lastest zlib FAQ is at http://zlib.net/zlib_faq.html + + + 1. Is zlib Y2K-compliant? +@@ -13,54 +13,51 @@ + + 2. Where can I get a Windows DLL version? + +- The zlib sources can be compiled without change to produce a DLL. +- See the file win32/DLL_FAQ.txt in the zlib distribution. +- Pointers to the precompiled DLL are found in the zlib web site at +- http://www.zlib.org. ++ The zlib sources can be compiled without change to produce a DLL. See the ++ file win32/DLL_FAQ.txt in the zlib distribution. Pointers to the ++ precompiled DLL are found in the zlib web site at http://zlib.net/ . + + 3. Where can I get a Visual Basic interface to zlib? + + See +- * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm +- * contrib/visual-basic.txt in the zlib distribution ++ * http://marknelson.us/1997/01/01/zlib-engine/ + * win32/DLL_FAQ.txt in the zlib distribution + + 4. compress() returns Z_BUF_ERROR. + +- Make sure that before the call of compress, the length of the compressed +- buffer is equal to the total size of the compressed buffer and not +- zero. For Visual Basic, check that this parameter is passed by reference ++ Make sure that before the call of compress(), the length of the compressed ++ buffer is equal to the available size of the compressed buffer and not ++ zero. For Visual Basic, check that this parameter is passed by reference + ("as any"), not by value ("as long"). + + 5. deflate() or inflate() returns Z_BUF_ERROR. + +- Before making the call, make sure that avail_in and avail_out are not +- zero. When setting the parameter flush equal to Z_FINISH, also make sure +- that avail_out is big enough to allow processing all pending input. +- Note that a Z_BUF_ERROR is not fatal--another call to deflate() or +- inflate() can be made with more input or output space. A Z_BUF_ERROR +- may in fact be unavoidable depending on how the functions are used, since +- it is not possible to tell whether or not there is more output pending +- when strm.avail_out returns with zero. ++ Before making the call, make sure that avail_in and avail_out are not zero. ++ When setting the parameter flush equal to Z_FINISH, also make sure that ++ avail_out is big enough to allow processing all pending input. Note that a ++ Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be ++ made with more input or output space. A Z_BUF_ERROR may in fact be ++ unavoidable depending on how the functions are used, since it is not ++ possible to tell whether or not there is more output pending when ++ strm.avail_out returns with zero. See http://zlib.net/zlib_how.html for a ++ heavily annotated example. + + 6. Where's the zlib documentation (man pages, etc.)? + +- It's in zlib.h for the moment, and Francis S. Lin has converted it to a +- web page zlib.html. Volunteers to transform this to Unix-style man pages, +- please contact us (zlib@gzip.org). Examples of zlib usage are in the files +- example.c and minigzip.c. ++ It's in zlib.h . Examples of zlib usage are in the files test/example.c ++ and test/minigzip.c, with more in examples/ . + + 7. Why don't you use GNU autoconf or libtool or ...? + +- Because we would like to keep zlib as a very small and simple +- package. zlib is rather portable and doesn't need much configuration. ++ Because we would like to keep zlib as a very small and simple package. ++ zlib is rather portable and doesn't need much configuration. + + 8. I found a bug in zlib. + +- Most of the time, such problems are due to an incorrect usage of +- zlib. Please try to reproduce the problem with a small program and send +- the corresponding source to us at zlib@gzip.org . Do not send +- multi-megabyte data files without prior agreement. ++ Most of the time, such problems are due to an incorrect usage of zlib. ++ Please try to reproduce the problem with a small program and send the ++ corresponding source to us at zlib@gzip.org . Do not send multi-megabyte ++ data files without prior agreement. + + 9. Why do I get "undefined reference to gzputc"? + +@@ -82,13 +79,15 @@ + + 12. Can zlib handle .Z files? + +- No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt ++ No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt + the code of uncompress on your own. + + 13. How can I make a Unix shared library? + +- make clean +- ./configure -s ++ By default a shared (and a static) library is built for Unix. So: ++ ++ make distclean ++ ./configure + make + + 14. How do I install a shared zlib library on Unix? +@@ -99,8 +98,10 @@ + + However, many flavors of Unix come with a shared zlib already installed. + Before going to the trouble of compiling a shared version of zlib and +- trying to install it, you may want to check if it's already there! If you +- can #include , it's there. The -lz option will probably link to it. ++ trying to install it, you may want to check if it's already there! If you ++ can #include , it's there. The -lz option will probably link to ++ it. You can check the version at the top of zlib.h or with the ++ ZLIB_VERSION symbol defined in zlib.h . + + 15. I have a question about OttoPDF. + +@@ -109,8 +110,8 @@ + + 16. Can zlib decode Flate data in an Adobe PDF file? + +- Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ . +- To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ . ++ Yes. See http://www.pdflib.com/ . To modify PDF forms, see ++ http://sourceforge.net/projects/acroformtool/ . + + 17. Why am I getting this "register_frame_info not found" error on Solaris? + +@@ -121,67 +122,67 @@ + symbol __register_frame_info: referenced symbol not found + + The symbol __register_frame_info is not part of zlib, it is generated by +- the C compiler (cc or gcc). You must recompile applications using zlib +- which have this problem. This problem is specific to Solaris. See ++ the C compiler (cc or gcc). You must recompile applications using zlib ++ which have this problem. This problem is specific to Solaris. See + http://www.sunfreeware.com for Solaris versions of zlib and applications + using zlib. + + 18. Why does gzip give an error on a file I make with compress/deflate? + + The compress and deflate functions produce data in the zlib format, which +- is different and incompatible with the gzip format. The gz* functions in +- zlib on the other hand use the gzip format. Both the zlib and gzip +- formats use the same compressed data format internally, but have different +- headers and trailers around the compressed data. ++ is different and incompatible with the gzip format. The gz* functions in ++ zlib on the other hand use the gzip format. Both the zlib and gzip formats ++ use the same compressed data format internally, but have different headers ++ and trailers around the compressed data. + + 19. Ok, so why are there two different formats? + +- The gzip format was designed to retain the directory information about +- a single file, such as the name and last modification date. The zlib +- format on the other hand was designed for in-memory and communication +- channel applications, and has a much more compact header and trailer and +- uses a faster integrity check than gzip. ++ The gzip format was designed to retain the directory information about a ++ single file, such as the name and last modification date. The zlib format ++ on the other hand was designed for in-memory and communication channel ++ applications, and has a much more compact header and trailer and uses a ++ faster integrity check than gzip. + + 20. Well that's nice, but how do I make a gzip file in memory? + + You can request that deflate write the gzip format instead of the zlib +- format using deflateInit2(). You can also request that inflate decode +- the gzip format using inflateInit2(). Read zlib.h for more details. ++ format using deflateInit2(). You can also request that inflate decode the ++ gzip format using inflateInit2(). Read zlib.h for more details. + + 21. Is zlib thread-safe? + +- Yes. However any library routines that zlib uses and any application- +- provided memory allocation routines must also be thread-safe. zlib's gz* ++ Yes. However any library routines that zlib uses and any application- ++ provided memory allocation routines must also be thread-safe. zlib's gz* + functions use stdio library routines, and most of zlib's functions use the +- library memory allocation routines by default. zlib's Init functions allow +- for the application to provide custom memory allocation routines. ++ library memory allocation routines by default. zlib's *Init* functions ++ allow for the application to provide custom memory allocation routines. + + Of course, you should only operate on any given zlib or gzip stream from a + single thread at a time. + + 22. Can I use zlib in my commercial application? + +- Yes. Please read the license in zlib.h. ++ Yes. Please read the license in zlib.h. + + 23. Is zlib under the GNU license? + +- No. Please read the license in zlib.h. ++ No. Please read the license in zlib.h. + + 24. The license says that altered source versions must be "plainly marked". So + what exactly do I need to do to meet that requirement? + +- You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In ++ You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In + particular, the final version number needs to be changed to "f", and an +- identification string should be appended to ZLIB_VERSION. Version numbers ++ identification string should be appended to ZLIB_VERSION. Version numbers + x.x.x.f are reserved for modifications to zlib by others than the zlib +- maintainers. For example, if the version of the base zlib you are altering ++ maintainers. For example, if the version of the base zlib you are altering + is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and +- ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also ++ ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also + update the version strings in deflate.c and inftrees.c. + + For altered source distributions, you should also note the origin and + nature of the changes in zlib.h, as well as in ChangeLog and README, along +- with the dates of the alterations. The origin should include at least your ++ with the dates of the alterations. The origin should include at least your + name (or your company's name), and an email address to contact for help or + issues with the library. + +@@ -197,105 +198,112 @@ + + 26. Will zlib work on a 64-bit machine? + +- It should. It has been tested on 64-bit machines, and has no dependence +- on any data types being limited to 32-bits in length. If you have any ++ Yes. It has been tested on 64-bit machines, and has no dependence on any ++ data types being limited to 32-bits in length. If you have any + difficulties, please provide a complete problem report to zlib@gzip.org + + 27. Will zlib decompress data from the PKWare Data Compression Library? + +- No. The PKWare DCL uses a completely different compressed data format +- than does PKZIP and zlib. However, you can look in zlib's contrib/blast ++ No. The PKWare DCL uses a completely different compressed data format than ++ does PKZIP and zlib. However, you can look in zlib's contrib/blast + directory for a possible solution to your problem. + + 28. Can I access data randomly in a compressed stream? + +- No, not without some preparation. If when compressing you periodically +- use Z_FULL_FLUSH, carefully write all the pending data at those points, +- and keep an index of those locations, then you can start decompression +- at those points. You have to be careful to not use Z_FULL_FLUSH too +- often, since it can significantly degrade compression. ++ No, not without some preparation. If when compressing you periodically use ++ Z_FULL_FLUSH, carefully write all the pending data at those points, and ++ keep an index of those locations, then you can start decompression at those ++ points. You have to be careful to not use Z_FULL_FLUSH too often, since it ++ can significantly degrade compression. Alternatively, you can scan a ++ deflate stream once to generate an index, and then use that index for ++ random access. See examples/zran.c . + + 29. Does zlib work on MVS, OS/390, CICS, etc.? + +- We don't know for sure. We have heard occasional reports of success on +- these systems. If you do use it on one of these, please provide us with +- a report, instructions, and patches that we can reference when we get +- these questions. Thanks. ++ It has in the past, but we have not heard of any recent evidence. There ++ were working ports of zlib 1.1.4 to MVS, but those links no longer work. ++ If you know of recent, successful applications of zlib on these operating ++ systems, please let us know. Thanks. + +-30. Is there some simpler, easier to read version of inflate I can look at +- to understand the deflate format? ++30. Is there some simpler, easier to read version of inflate I can look at to ++ understand the deflate format? + +- First off, you should read RFC 1951. Second, yes. Look in zlib's ++ First off, you should read RFC 1951. Second, yes. Look in zlib's + contrib/puff directory. + + 31. Does zlib infringe on any patents? + +- As far as we know, no. In fact, that was originally the whole point behind +- zlib. Look here for some more information: ++ As far as we know, no. In fact, that was originally the whole point behind ++ zlib. Look here for some more information: + + http://www.gzip.org/#faq11 + + 32. Can zlib work with greater than 4 GB of data? + +- Yes. inflate() and deflate() will process any amount of data correctly. ++ Yes. inflate() and deflate() will process any amount of data correctly. + Each call of inflate() or deflate() is limited to input and output chunks + of the maximum value that can be stored in the compiler's "unsigned int" +- type, but there is no limit to the number of chunks. Note however that the +- strm.total_in and strm_total_out counters may be limited to 4 GB. These ++ type, but there is no limit to the number of chunks. Note however that the ++ strm.total_in and strm_total_out counters may be limited to 4 GB. These + counters are provided as a convenience and are not used internally by +- inflate() or deflate(). The application can easily set up its own counters ++ inflate() or deflate(). The application can easily set up its own counters + updated after each call of inflate() or deflate() to count beyond 4 GB. + compress() and uncompress() may be limited to 4 GB, since they operate in a +- single call. gzseek() and gztell() may be limited to 4 GB depending on how +- zlib is compiled. See the zlibCompileFlags() function in zlib.h. ++ single call. gzseek() and gztell() may be limited to 4 GB depending on how ++ zlib is compiled. See the zlibCompileFlags() function in zlib.h. + +- The word "may" appears several times above since there is a 4 GB limit +- only if the compiler's "long" type is 32 bits. If the compiler's "long" +- type is 64 bits, then the limit is 16 exabytes. ++ The word "may" appears several times above since there is a 4 GB limit only ++ if the compiler's "long" type is 32 bits. If the compiler's "long" type is ++ 64 bits, then the limit is 16 exabytes. + + 33. Does zlib have any security vulnerabilities? + +- The only one that we are aware of is potentially in gzprintf(). If zlib +- is compiled to use sprintf() or vsprintf(), then there is no protection +- against a buffer overflow of a 4K string space, other than the caller of +- gzprintf() assuring that the output will not exceed 4K. On the other +- hand, if zlib is compiled to use snprintf() or vsnprintf(), which should +- normally be the case, then there is no vulnerability. The ./configure +- script will display warnings if an insecure variation of sprintf() will +- be used by gzprintf(). Also the zlibCompileFlags() function will return +- information on what variant of sprintf() is used by gzprintf(). ++ The only one that we are aware of is potentially in gzprintf(). If zlib is ++ compiled to use sprintf() or vsprintf(), then there is no protection ++ against a buffer overflow of an 8K string space (or other value as set by ++ gzbuffer()), other than the caller of gzprintf() assuring that the output ++ will not exceed 8K. On the other hand, if zlib is compiled to use ++ snprintf() or vsnprintf(), which should normally be the case, then there is ++ no vulnerability. The ./configure script will display warnings if an ++ insecure variation of sprintf() will be used by gzprintf(). Also the ++ zlibCompileFlags() function will return information on what variant of ++ sprintf() is used by gzprintf(). + + If you don't have snprintf() or vsnprintf() and would like one, you can + find a portable implementation here: + + http://www.ijs.si/software/snprintf/ + +- Note that you should be using the most recent version of zlib. Versions +- 1.1.3 and before were subject to a double-free vulnerability. ++ Note that you should be using the most recent version of zlib. Versions ++ 1.1.3 and before were subject to a double-free vulnerability, and versions ++ 1.2.1 and 1.2.2 were subject to an access exception when decompressing ++ invalid compressed data. + + 34. Is there a Java version of zlib? + + Probably what you want is to use zlib in Java. zlib is already included + as part of the Java SDK in the java.util.zip package. If you really want + a version of zlib written in the Java language, look on the zlib home +- page for links: http://www.zlib.org/ ++ page for links: http://zlib.net/ . + + 35. I get this or that compiler or source-code scanner warning when I crank it + up to maximally-pedantic. Can't you guys write proper code? + + Many years ago, we gave up attempting to avoid warnings on every compiler +- in the universe. It just got to be a waste of time, and some compilers +- were downright silly. So now, we simply make sure that the code always +- works. ++ in the universe. It just got to be a waste of time, and some compilers ++ were downright silly as well as contradicted each other. So now, we simply ++ make sure that the code always works. + + 36. Valgrind (or some similar memory access checker) says that deflate is + performing a conditional jump that depends on an uninitialized value. + Isn't that a bug? + +- No. That is intentional for performance reasons, and the output of +- deflate is not affected. This only started showing up recently since +- zlib 1.2.x uses malloc() by default for allocations, whereas earlier +- versions used calloc(), which zeros out the allocated memory. ++ No. That is intentional for performance reasons, and the output of deflate ++ is not affected. This only started showing up recently since zlib 1.2.x ++ uses malloc() by default for allocations, whereas earlier versions used ++ calloc(), which zeros out the allocated memory. Even though the code was ++ correct, versions 1.2.4 and later was changed to not stimulate these ++ checkers. + + 37. Will zlib read the (insert any ancient or arcane format here) compressed + data format? +@@ -305,20 +313,21 @@ + + 38. How can I encrypt/decrypt zip files with zlib? + +- zlib doesn't support encryption. The original PKZIP encryption is very weak +- and can be broken with freely available programs. To get strong encryption, +- use GnuPG, http://www.gnupg.org/ , which already includes zlib compression. +- For PKZIP compatible "encryption", look at http://www.info-zip.org/ ++ zlib doesn't support encryption. The original PKZIP encryption is very ++ weak and can be broken with freely available programs. To get strong ++ encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib ++ compression. For PKZIP compatible "encryption", look at ++ http://www.info-zip.org/ + + 39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings? + +- "gzip" is the gzip format, and "deflate" is the zlib format. They should +- probably have called the second one "zlib" instead to avoid confusion +- with the raw deflate compressed data format. While the HTTP 1.1 RFC 2616 ++ "gzip" is the gzip format, and "deflate" is the zlib format. They should ++ probably have called the second one "zlib" instead to avoid confusion with ++ the raw deflate compressed data format. While the HTTP 1.1 RFC 2616 + correctly points to the zlib specification in RFC 1950 for the "deflate" + transfer encoding, there have been reports of servers and browsers that + incorrectly produce or expect raw deflate data per the deflate +- specficiation in RFC 1951, most notably Microsoft. So even though the ++ specification in RFC 1951, most notably Microsoft. So even though the + "deflate" transfer encoding using the zlib format would be the more + efficient approach (and in fact exactly what the zlib format was designed + for), using the "gzip" transfer encoding is probably more reliable due to +@@ -328,12 +337,32 @@ + + 40. Does zlib support the new "Deflate64" format introduced by PKWare? + +- No. PKWare has apparently decided to keep that format proprietary, since +- they have not documented it as they have previous compression formats. +- In any case, the compression improvements are so modest compared to other +- more modern approaches, that it's not worth the effort to implement. ++ No. PKWare has apparently decided to keep that format proprietary, since ++ they have not documented it as they have previous compression formats. In ++ any case, the compression improvements are so modest compared to other more ++ modern approaches, that it's not worth the effort to implement. + +-41. Can you please sign these lengthy legal documents and fax them back to us ++41. I'm having a problem with the zip functions in zlib, can you help? ++ ++ There are no zip functions in zlib. You are probably using minizip by ++ Giles Vollant, which is found in the contrib directory of zlib. It is not ++ part of zlib. In fact none of the stuff in contrib is part of zlib. The ++ files in there are not supported by the zlib authors. You need to contact ++ the authors of the respective contribution for help. ++ ++42. The match.asm code in contrib is under the GNU General Public License. ++ Since it's part of zlib, doesn't that mean that all of zlib falls under the ++ GNU GPL? ++ ++ No. The files in contrib are not part of zlib. They were contributed by ++ other authors and are provided as a convenience to the user within the zlib ++ distribution. Each item in contrib has its own license. ++ ++43. Is zlib subject to export controls? What is its ECCN? ++ ++ zlib is not subject to export controls, and so is classified as EAR99. ++ ++44. Can you please sign these lengthy legal documents and fax them back to us + so that we can use your software in our product? + + No. Go away. Shoo. +diff -r ee879c0ffa11 Modules/zlib/INDEX +--- a/Modules/zlib/INDEX ++++ b/Modules/zlib/INDEX +@@ -1,23 +1,37 @@ ++CMakeLists.txt cmake build file + ChangeLog history of changes + FAQ Frequently Asked Questions about zlib + INDEX this file +-Makefile makefile for Unix (generated by configure) +-Makefile.in makefile for Unix (template for configure) ++Makefile dummy Makefile that tells you to ./configure ++Makefile.in template for Unix Makefile + README guess what +-algorithm.txt description of the (de)compression algorithm + configure configure script for Unix +-zconf.in.h template for zconf.h (used by configure) ++make_vms.com makefile for VMS ++test/example.c zlib usages examples for build testing ++test/minigzip.c minimal gzip-like functionality for build testing ++test/infcover.c inf*.c code coverage for build coverage testing ++treebuild.xml XML description of source file dependencies ++zconf.h.cmakein zconf.h template for cmake ++zconf.h.in zconf.h template for configure ++zlib.3 Man page for zlib ++zlib.3.pdf Man page in PDF format ++zlib.map Linux symbol information ++zlib.pc.in Template for pkg-config descriptor ++zlib.pc.cmakein zlib.pc template for cmake ++zlib2ansi perl script to convert source files for C++ compilation + + amiga/ makefiles for Amiga SAS C +-as400/ makefiles for IBM AS/400 ++as400/ makefiles for AS/400 ++doc/ documentation for formats and algorithms + msdos/ makefiles for MSDOS ++nintendods/ makefile for Nintendo DS + old/ makefiles for various architectures and zlib documentation + files that have not yet been updated for zlib 1.2.x +-projects/ projects for various Integrated Development Environments + qnx/ makefiles for QNX ++watcom/ makefiles for OpenWatcom + win32/ makefiles for Windows + +- zlib public header files (must be kept): ++ zlib public header files (required for library use): + zconf.h + zlib.h + +@@ -28,7 +42,11 @@ + crc32.h + deflate.c + deflate.h +-gzio.c ++gzclose.c ++gzguts.h ++gzlib.c ++gzread.c ++gzwrite.c + infback.c + inffast.c + inffast.h +@@ -43,9 +61,8 @@ + zutil.c + zutil.h + +- source files for sample programs: +-example.c +-minigzip.c ++ source files for sample programs ++See examples/README.examples + +- unsupported contribution by third parties ++ unsupported contributions by third parties + See contrib/README.contrib +diff -r ee879c0ffa11 Modules/zlib/Makefile +--- a/Modules/zlib/Makefile ++++ b/Modules/zlib/Makefile +@@ -1,154 +1,5 @@ +-# Makefile for zlib +-# Copyright (C) 1995-2005 Jean-loup Gailly. +-# For conditions of distribution and use, see copyright notice in zlib.h ++all: ++ -@echo "Please use ./configure first. Thank you." + +-# To compile and test, type: +-# ./configure; make test +-# The call of configure is optional if you don't have special requirements +-# If you wish to build zlib as a shared library, use: ./configure -s +- +-# To use the asm code, type: +-# cp contrib/asm?86/match.S ./match.S +-# make LOC=-DASMV OBJA=match.o +- +-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: +-# make install +-# To install in $HOME instead of /usr/local, use: +-# make install prefix=$HOME +- +-CC=cc +- +-CFLAGS=-O +-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 +-#CFLAGS=-g -DDEBUG +-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ +-# -Wstrict-prototypes -Wmissing-prototypes +- +-LDFLAGS=libz.a +-LDSHARED=$(CC) +-CPP=$(CC) -E +- +-LIBS=libz.a +-SHAREDLIB=libz.so +-SHAREDLIBV=libz.so.1.2.3 +-SHAREDLIBM=libz.so.1 +- +-AR=ar rc +-RANLIB=ranlib +-TAR=tar +-SHELL=/bin/sh +-EXE= +- +-prefix = /usr/local +-exec_prefix = ${prefix} +-libdir = ${exec_prefix}/lib +-includedir = ${prefix}/include +-mandir = ${prefix}/share/man +-man3dir = ${mandir}/man3 +- +-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ +- zutil.o inflate.o infback.o inftrees.o inffast.o +- +-OBJA = +-# to use the asm code: make OBJA=match.o +- +-TEST_OBJS = example.o minigzip.o +- +-all: example$(EXE) minigzip$(EXE) +- +-check: test +-test: all +- @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ +- echo hello world | ./minigzip | ./minigzip -d || \ +- echo ' *** minigzip test FAILED ***' ; \ +- if ./example; then \ +- echo ' *** zlib test OK ***'; \ +- else \ +- echo ' *** zlib test FAILED ***'; \ +- fi +- +-libz.a: $(OBJS) $(OBJA) +- $(AR) $@ $(OBJS) $(OBJA) +- -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 +- +-match.o: match.S +- $(CPP) match.S > _match.s +- $(CC) -c _match.s +- mv _match.o match.o +- rm -f _match.s +- +-$(SHAREDLIBV): $(OBJS) +- $(LDSHARED) -o $@ $(OBJS) +- rm -f $(SHAREDLIB) $(SHAREDLIBM) +- ln -s $@ $(SHAREDLIB) +- ln -s $@ $(SHAREDLIBM) +- +-example$(EXE): example.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) +- +-minigzip$(EXE): minigzip.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) +- +-install: $(LIBS) +- -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi +- -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi +- -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi +- -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi +- cp zlib.h zconf.h $(includedir) +- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h +- cp $(LIBS) $(libdir) +- cd $(libdir); chmod 755 $(LIBS) +- -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 +- cd $(libdir); if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIB) $(SHAREDLIBM); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIB); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ +- (ldconfig || true) >/dev/null 2>&1; \ +- fi +- cp zlib.3 $(man3dir) +- chmod 644 $(man3dir)/zlib.3 +-# The ranlib in install is needed on NeXTSTEP which checks file times +-# ldconfig is for Linux +- +-uninstall: +- cd $(includedir); \ +- cd $(libdir); rm -f libz.a; \ +- if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ +- fi +- cd $(man3dir); rm -f zlib.3 +- +-mostlyclean: clean +-clean: +- rm -f *.o *~ example$(EXE) minigzip$(EXE) \ +- libz.* foo.gz so_locations \ +- _match.s maketree contrib/infback9/*.o +- +-maintainer-clean: distclean +-distclean: clean +- cp -p Makefile.in Makefile +- cp -p zconf.in.h zconf.h +- rm -f .DS_Store +- +-tags: +- etags *.[ch] +- +-depend: +- makedepend -- $(CFLAGS) -- *.[ch] +- +-# DO NOT DELETE THIS LINE -- make depend depends on it. +- +-adler32.o: zlib.h zconf.h +-compress.o: zlib.h zconf.h +-crc32.o: crc32.h zlib.h zconf.h +-deflate.o: deflate.h zutil.h zlib.h zconf.h +-example.o: zlib.h zconf.h +-gzio.o: zutil.h zlib.h zconf.h +-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inftrees.o: zutil.h zlib.h zconf.h inftrees.h +-minigzip.o: zlib.h zconf.h +-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h +-uncompr.o: zlib.h zconf.h +-zutil.o: zutil.h zlib.h zconf.h ++distclean: ++ make -f Makefile.in distclean +diff -r ee879c0ffa11 Modules/zlib/Makefile.in +--- a/Modules/zlib/Makefile.in ++++ b/Modules/zlib/Makefile.in +@@ -1,11 +1,11 @@ + # Makefile for zlib +-# Copyright (C) 1995-2005 Jean-loup Gailly. ++# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler + # For conditions of distribution and use, see copyright notice in zlib.h + + # To compile and test, type: + # ./configure; make test +-# The call of configure is optional if you don't have special requirements +-# If you wish to build zlib as a shared library, use: ./configure -s ++# Normally configure builds both a static and a shared library. ++# If you want to build just a static library, use: ./configure --static + + # To use the asm code, type: + # cp contrib/asm?86/match.S ./match.S +@@ -24,17 +24,23 @@ + #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + # -Wstrict-prototypes -Wmissing-prototypes + +-LDFLAGS=libz.a ++SFLAGS=-O ++LDFLAGS= ++TEST_LDFLAGS=-L. libz.a + LDSHARED=$(CC) + CPP=$(CC) -E + +-LIBS=libz.a ++STATICLIB=libz.a + SHAREDLIB=libz.so +-SHAREDLIBV=libz.so.1.2.3 ++SHAREDLIBV=libz.so.1.2.8 + SHAREDLIBM=libz.so.1 ++LIBS=$(STATICLIB) $(SHAREDLIBV) + +-AR=ar rc ++AR=ar ++ARFLAGS=rc + RANLIB=ranlib ++LDCONFIG=ldconfig ++LDSHAREDLIBC=-lc + TAR=tar + SHELL=/bin/sh + EXE= +@@ -42,33 +48,84 @@ + prefix = /usr/local + exec_prefix = ${prefix} + libdir = ${exec_prefix}/lib ++sharedlibdir = ${libdir} + includedir = ${prefix}/include + mandir = ${prefix}/share/man + man3dir = ${mandir}/man3 ++pkgconfigdir = ${libdir}/pkgconfig + +-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ +- zutil.o inflate.o infback.o inftrees.o inffast.o ++OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o ++OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o ++OBJC = $(OBJZ) $(OBJG) + ++PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo ++PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo ++PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG) ++ ++# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo + OBJA = +-# to use the asm code: make OBJA=match.o ++PIC_OBJA = + +-TEST_OBJS = example.o minigzip.o ++OBJS = $(OBJC) $(OBJA) + +-all: example$(EXE) minigzip$(EXE) ++PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA) ++ ++all: static shared ++ ++static: example$(EXE) minigzip$(EXE) ++ ++shared: examplesh$(EXE) minigzipsh$(EXE) ++ ++all64: example64$(EXE) minigzip64$(EXE) + + check: test +-test: all +- @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ +- echo hello world | ./minigzip | ./minigzip -d || \ +- echo ' *** minigzip test FAILED ***' ; \ +- if ./example; then \ ++ ++test: all teststatic testshared ++ ++teststatic: static ++ @TMPST=tmpst_$$; \ ++ if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \ + echo ' *** zlib test OK ***'; \ + else \ +- echo ' *** zlib test FAILED ***'; \ +- fi ++ echo ' *** zlib test FAILED ***'; false; \ ++ fi; \ ++ rm -f $$TMPST + +-libz.a: $(OBJS) $(OBJA) +- $(AR) $@ $(OBJS) $(OBJA) ++testshared: shared ++ @LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ ++ LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \ ++ DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \ ++ SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \ ++ TMPSH=tmpsh_$$; \ ++ if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \ ++ echo ' *** zlib shared test OK ***'; \ ++ else \ ++ echo ' *** zlib shared test FAILED ***'; false; \ ++ fi; \ ++ rm -f $$TMPSH ++ ++test64: all64 ++ @TMP64=tmp64_$$; \ ++ if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \ ++ echo ' *** zlib 64-bit test OK ***'; \ ++ else \ ++ echo ' *** zlib 64-bit test FAILED ***'; false; \ ++ fi; \ ++ rm -f $$TMP64 ++ ++infcover.o: test/infcover.c zlib.h zconf.h ++ $(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c ++ ++infcover: infcover.o libz.a ++ $(CC) $(CFLAGS) -o $@ infcover.o libz.a ++ ++cover: infcover ++ rm -f *.gcda ++ ./infcover ++ gcov inf*.c ++ ++libz.a: $(OBJS) ++ $(AR) $(ARFLAGS) $@ $(OBJS) + -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 + + match.o: match.S +@@ -77,58 +134,130 @@ + mv _match.o match.o + rm -f _match.s + +-$(SHAREDLIBV): $(OBJS) +- $(LDSHARED) -o $@ $(OBJS) ++match.lo: match.S ++ $(CPP) match.S > _match.s ++ $(CC) -c -fPIC _match.s ++ mv _match.o match.lo ++ rm -f _match.s ++ ++example.o: test/example.c zlib.h zconf.h ++ $(CC) $(CFLAGS) -I. -c -o $@ test/example.c ++ ++minigzip.o: test/minigzip.c zlib.h zconf.h ++ $(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c ++ ++example64.o: test/example.c zlib.h zconf.h ++ $(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/example.c ++ ++minigzip64.o: test/minigzip.c zlib.h zconf.h ++ $(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/minigzip.c ++ ++.SUFFIXES: .lo ++ ++.c.lo: ++ -@mkdir objs 2>/dev/null || test -d objs ++ $(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $< ++ -@mv objs/$*.o $@ ++ ++placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a ++ $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) + rm -f $(SHAREDLIB) $(SHAREDLIBM) + ln -s $@ $(SHAREDLIB) + ln -s $@ $(SHAREDLIBM) ++ -@rmdir objs + +-example$(EXE): example.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) ++example$(EXE): example.o $(STATICLIB) ++ $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) + +-minigzip$(EXE): minigzip.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) ++minigzip$(EXE): minigzip.o $(STATICLIB) ++ $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) + +-install: $(LIBS) +- -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi +- -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi +- -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi +- -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi +- cp zlib.h zconf.h $(includedir) +- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h +- cp $(LIBS) $(libdir) +- cd $(libdir); chmod 755 $(LIBS) +- -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 +- cd $(libdir); if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIB) $(SHAREDLIBM); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIB); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ +- (ldconfig || true) >/dev/null 2>&1; \ ++examplesh$(EXE): example.o $(SHAREDLIBV) ++ $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV) ++ ++minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) ++ $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV) ++ ++example64$(EXE): example64.o $(STATICLIB) ++ $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) ++ ++minigzip64$(EXE): minigzip64.o $(STATICLIB) ++ $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) ++ ++install-libs: $(LIBS) ++ -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi ++ -@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi ++ -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi ++ -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi ++ -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi ++ cp $(STATICLIB) $(DESTDIR)$(libdir) ++ chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB) ++ -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1 ++ -@if test -n "$(SHAREDLIBV)"; then \ ++ cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ ++ echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ ++ chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ ++ echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \ ++ rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ ++ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \ ++ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ ++ ($(LDCONFIG) || true) >/dev/null 2>&1; \ + fi +- cp zlib.3 $(man3dir) +- chmod 644 $(man3dir)/zlib.3 ++ cp zlib.3 $(DESTDIR)$(man3dir) ++ chmod 644 $(DESTDIR)$(man3dir)/zlib.3 ++ cp zlib.pc $(DESTDIR)$(pkgconfigdir) ++ chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc + # The ranlib in install is needed on NeXTSTEP which checks file times + # ldconfig is for Linux + ++install: install-libs ++ -@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi ++ cp zlib.h zconf.h $(DESTDIR)$(includedir) ++ chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h ++ + uninstall: +- cd $(includedir); \ +- cd $(libdir); rm -f libz.a; \ +- if test -f $(SHAREDLIBV); then \ ++ cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h ++ cd $(DESTDIR)$(libdir) && rm -f libz.a; \ ++ if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ + rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ + fi +- cd $(man3dir); rm -f zlib.3 ++ cd $(DESTDIR)$(man3dir) && rm -f zlib.3 ++ cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc ++ ++docs: zlib.3.pdf ++ ++zlib.3.pdf: zlib.3 ++ groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf ++ ++zconf.h.cmakein: zconf.h.in ++ -@ TEMPFILE=zconfh_$$; \ ++ echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\ ++ sed -f $$TEMPFILE zconf.h.in > zconf.h.cmakein &&\ ++ touch -r zconf.h.in zconf.h.cmakein &&\ ++ rm $$TEMPFILE ++ ++zconf: zconf.h.in ++ cp -p zconf.h.in zconf.h + + mostlyclean: clean + clean: +- rm -f *.o *~ example$(EXE) minigzip$(EXE) \ ++ rm -f *.o *.lo *~ \ ++ example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \ ++ example64$(EXE) minigzip64$(EXE) \ ++ infcover \ + libz.* foo.gz so_locations \ + _match.s maketree contrib/infback9/*.o ++ rm -rf objs ++ rm -f *.gcda *.gcno *.gcov ++ rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov + + maintainer-clean: distclean +-distclean: clean +- cp -p Makefile.in Makefile +- cp -p zconf.in.h zconf.h +- rm -f .DS_Store ++distclean: clean zconf zconf.h.cmakein docs ++ rm -f Makefile zlib.pc configure.log ++ -@rm -f .DS_Store ++ -@printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile ++ -@printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile ++ -@touch -r Makefile.in Makefile + + tags: + etags *.[ch] +@@ -138,17 +267,22 @@ + + # DO NOT DELETE THIS LINE -- make depend depends on it. + +-adler32.o: zlib.h zconf.h +-compress.o: zlib.h zconf.h +-crc32.o: crc32.h zlib.h zconf.h ++adler32.o zutil.o: zutil.h zlib.h zconf.h ++gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h ++compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h ++crc32.o: zutil.h zlib.h zconf.h crc32.h + deflate.o: deflate.h zutil.h zlib.h zconf.h +-example.o: zlib.h zconf.h +-gzio.o: zutil.h zlib.h zconf.h ++infback.o inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h + inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h + inftrees.o: zutil.h zlib.h zconf.h inftrees.h +-minigzip.o: zlib.h zconf.h + trees.o: deflate.h zutil.h zlib.h zconf.h trees.h +-uncompr.o: zlib.h zconf.h +-zutil.o: zutil.h zlib.h zconf.h ++ ++adler32.lo zutil.lo: zutil.h zlib.h zconf.h ++gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h ++compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h ++crc32.lo: zutil.h zlib.h zconf.h crc32.h ++deflate.lo: deflate.h zutil.h zlib.h zconf.h ++infback.lo inflate.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h ++inffast.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h ++inftrees.lo: zutil.h zlib.h zconf.h inftrees.h ++trees.lo: deflate.h zutil.h zlib.h zconf.h trees.h +diff -r ee879c0ffa11 Modules/zlib/README +--- a/Modules/zlib/README ++++ b/Modules/zlib/README +@@ -1,56 +1,52 @@ + ZLIB DATA COMPRESSION LIBRARY + +-zlib 1.2.3 is a general purpose data compression library. All the code is ++zlib 1.2.8 is a general purpose data compression library. All the code is + thread safe. The data format used by the zlib library is described by RFCs + (Request for Comments) 1950 to 1952 in the files +-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) +-and rfc1952.txt (gzip format). These documents are also available in other +-formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html ++http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and ++rfc1952 (gzip format). + + All functions of the compression library are documented in the file zlib.h +-(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example +-of the library is given in the file example.c which also tests that the library +-is working correctly. Another example is given in the file minigzip.c. The +-compression library itself is composed of all source files except example.c and +-minigzip.c. ++(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example ++of the library is given in the file test/example.c which also tests that ++the library is working correctly. Another example is given in the file ++test/minigzip.c. The compression library itself is composed of all source ++files in the root directory. + + To compile all files and run the test program, follow the instructions given at +-the top of Makefile. In short "make test; make install" should work for most +-machines. For Unix: "./configure; make test; make install". For MSDOS, use one +-of the special makefiles such as Makefile.msc. For VMS, use make_vms.com. ++the top of Makefile.in. In short "./configure; make test", and if that goes ++well, "make install" should work for most flavors of Unix. For Windows, use ++one of the special makefiles in win32/ or contrib/vstudio/ . For VMS, use ++make_vms.com. + + Questions about zlib should be sent to , or to Gilles Vollant +- for the Windows DLL version. The zlib home page is +-http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem, +-please check this site to verify that you have the latest version of zlib; +-otherwise get the latest version and check whether the problem still exists or +-not. ++ for the Windows DLL version. The zlib home page is ++http://zlib.net/ . Before reporting a problem, please check this site to ++verify that you have the latest version of zlib; otherwise get the latest ++version and check whether the problem still exists or not. + +-PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking +-for help. ++PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help. + +-Mark Nelson wrote an article about zlib for the Jan. 1997 +-issue of Dr. Dobb's Journal; a copy of the article is available in +-http://dogma.net/markn/articles/zlibtool/zlibtool.htm ++Mark Nelson wrote an article about zlib for the Jan. 1997 ++issue of Dr. Dobb's Journal; a copy of the article is available at ++http://marknelson.us/1997/01/01/zlib-engine/ . + +-The changes made in version 1.2.3 are documented in the file ChangeLog. ++The changes made in version 1.2.8 are documented in the file ChangeLog. + +-Unsupported third party contributions are provided in directory "contrib". ++Unsupported third party contributions are provided in directory contrib/ . + +-A Java implementation of zlib is available in the Java Development Kit +-http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html +-See the zlib home page http://www.zlib.org for details. ++zlib is available in Java using the java.util.zip package, documented at ++http://java.sun.com/developer/technicalArticles/Programming/compression/ . + +-A Perl interface to zlib written by Paul Marquess is in the +-CPAN (Comprehensive Perl Archive Network) sites +-http://www.cpan.org/modules/by-module/Compress/ ++A Perl interface to zlib written by Paul Marquess is available ++at CPAN (Comprehensive Perl Archive Network) sites, including ++http://search.cpan.org/~pmqs/IO-Compress-Zlib/ . + + A Python interface to zlib written by A.M. Kuchling is + available in Python 1.5 and later versions, see +-http://www.python.org/doc/lib/module-zlib.html ++http://docs.python.org/library/zlib.html . + +-A zlib binding for TCL written by Andreas Kupries is +-availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html ++zlib is built into tcl: http://wiki.tcl.tk/4610 . + + An experimental package to read and write files in .zip format, written on top + of zlib by Gilles Vollant , is available in the +@@ -74,25 +70,21 @@ + - zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with + other compilers. Use "make test" to check your compiler. + +-- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers. ++- gzdopen is not supported on RISCOS or BEOS. + + - For PalmOs, see http://palmzlib.sourceforge.net/ + +-- When building a shared, i.e. dynamic library on Mac OS X, the library must be +- installed before testing (do "make install" before "make test"), since the +- library location is specified in the library. +- + + Acknowledgments: + +- The deflate format used by zlib was defined by Phil Katz. The deflate +- and zlib specifications were written by L. Peter Deutsch. Thanks to all the +- people who reported problems and suggested various improvements in zlib; +- they are too numerous to cite here. ++ The deflate format used by zlib was defined by Phil Katz. The deflate and ++ zlib specifications were written by L. Peter Deutsch. Thanks to all the ++ people who reported problems and suggested various improvements in zlib; they ++ are too numerous to cite here. + + Copyright notice: + +- (C) 1995-2004 Jean-loup Gailly and Mark Adler ++ (C) 1995-2013 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages +@@ -113,13 +105,11 @@ + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + +-If you use the zlib library in a product, we would appreciate *not* +-receiving lengthy legal documents to sign. The sources are provided +-for free but without warranty of any kind. The library has been +-entirely written by Jean-loup Gailly and Mark Adler; it does not +-include third-party code. ++If you use the zlib library in a product, we would appreciate *not* receiving ++lengthy legal documents to sign. The sources are provided for free but without ++warranty of any kind. The library has been entirely written by Jean-loup ++Gailly and Mark Adler; it does not include third-party code. + +-If you redistribute modified sources, we would appreciate that you include +-in the file ChangeLog history information documenting your changes. Please +-read the FAQ for more information on the distribution of modified source +-versions. ++If you redistribute modified sources, we would appreciate that you include in ++the file ChangeLog history information documenting your changes. Please read ++the FAQ for more information on the distribution of modified source versions. +diff -r ee879c0ffa11 Modules/zlib/adler32.c +--- a/Modules/zlib/adler32.c ++++ b/Modules/zlib/adler32.c +@@ -1,14 +1,17 @@ + /* adler32.c -- compute the Adler-32 checksum of a data stream +- * Copyright (C) 1995-2004 Mark Adler ++ * Copyright (C) 1995-2011 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* @(#) $Id$ */ + +-#define ZLIB_INTERNAL +-#include "zlib.h" ++#include "zutil.h" + +-#define BASE 65521UL /* largest prime smaller than 65536 */ ++#define local static ++ ++local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); ++ ++#define BASE 65521 /* largest prime smaller than 65536 */ + #define NMAX 5552 + /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ + +@@ -18,39 +21,44 @@ + #define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); + #define DO16(buf) DO8(buf,0); DO8(buf,8); + +-/* use NO_DIVIDE if your processor does not do division in hardware */ ++/* use NO_DIVIDE if your processor does not do division in hardware -- ++ try it both ways to see which is faster */ + #ifdef NO_DIVIDE ++/* note that this assumes BASE is 65521, where 65536 % 65521 == 15 ++ (thank you to John Reiser for pointing this out) */ ++# define CHOP(a) \ ++ do { \ ++ unsigned long tmp = a >> 16; \ ++ a &= 0xffffUL; \ ++ a += (tmp << 4) - tmp; \ ++ } while (0) ++# define MOD28(a) \ ++ do { \ ++ CHOP(a); \ ++ if (a >= BASE) a -= BASE; \ ++ } while (0) + # define MOD(a) \ + do { \ +- if (a >= (BASE << 16)) a -= (BASE << 16); \ +- if (a >= (BASE << 15)) a -= (BASE << 15); \ +- if (a >= (BASE << 14)) a -= (BASE << 14); \ +- if (a >= (BASE << 13)) a -= (BASE << 13); \ +- if (a >= (BASE << 12)) a -= (BASE << 12); \ +- if (a >= (BASE << 11)) a -= (BASE << 11); \ +- if (a >= (BASE << 10)) a -= (BASE << 10); \ +- if (a >= (BASE << 9)) a -= (BASE << 9); \ +- if (a >= (BASE << 8)) a -= (BASE << 8); \ +- if (a >= (BASE << 7)) a -= (BASE << 7); \ +- if (a >= (BASE << 6)) a -= (BASE << 6); \ +- if (a >= (BASE << 5)) a -= (BASE << 5); \ +- if (a >= (BASE << 4)) a -= (BASE << 4); \ +- if (a >= (BASE << 3)) a -= (BASE << 3); \ +- if (a >= (BASE << 2)) a -= (BASE << 2); \ +- if (a >= (BASE << 1)) a -= (BASE << 1); \ +- if (a >= BASE) a -= BASE; \ ++ CHOP(a); \ ++ MOD28(a); \ + } while (0) +-# define MOD4(a) \ +- do { \ +- if (a >= (BASE << 4)) a -= (BASE << 4); \ +- if (a >= (BASE << 3)) a -= (BASE << 3); \ +- if (a >= (BASE << 2)) a -= (BASE << 2); \ +- if (a >= (BASE << 1)) a -= (BASE << 1); \ ++# define MOD63(a) \ ++ do { /* this assumes a is not negative */ \ ++ z_off64_t tmp = a >> 32; \ ++ a &= 0xffffffffL; \ ++ a += (tmp << 8) - (tmp << 5) + tmp; \ ++ tmp = a >> 16; \ ++ a &= 0xffffL; \ ++ a += (tmp << 4) - tmp; \ ++ tmp = a >> 16; \ ++ a &= 0xffffL; \ ++ a += (tmp << 4) - tmp; \ + if (a >= BASE) a -= BASE; \ + } while (0) + #else + # define MOD(a) a %= BASE +-# define MOD4(a) a %= BASE ++# define MOD28(a) a %= BASE ++# define MOD63(a) a %= BASE + #endif + + /* ========================================================================= */ +@@ -89,7 +97,7 @@ + } + if (adler >= BASE) + adler -= BASE; +- MOD4(sum2); /* only added so many BASE's */ ++ MOD28(sum2); /* only added so many BASE's */ + return adler | (sum2 << 16); + } + +@@ -125,25 +133,47 @@ + } + + /* ========================================================================= */ ++local uLong adler32_combine_(adler1, adler2, len2) ++ uLong adler1; ++ uLong adler2; ++ z_off64_t len2; ++{ ++ unsigned long sum1; ++ unsigned long sum2; ++ unsigned rem; ++ ++ /* for negative len, return invalid adler32 as a clue for debugging */ ++ if (len2 < 0) ++ return 0xffffffffUL; ++ ++ /* the derivation of this formula is left as an exercise for the reader */ ++ MOD63(len2); /* assumes len2 >= 0 */ ++ rem = (unsigned)len2; ++ sum1 = adler1 & 0xffff; ++ sum2 = rem * sum1; ++ MOD(sum2); ++ sum1 += (adler2 & 0xffff) + BASE - 1; ++ sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; ++ if (sum1 >= BASE) sum1 -= BASE; ++ if (sum1 >= BASE) sum1 -= BASE; ++ if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); ++ if (sum2 >= BASE) sum2 -= BASE; ++ return sum1 | (sum2 << 16); ++} ++ ++/* ========================================================================= */ + uLong ZEXPORT adler32_combine(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off_t len2; + { +- unsigned long sum1; +- unsigned long sum2; +- unsigned rem; ++ return adler32_combine_(adler1, adler2, len2); ++} + +- /* the derivation of this formula is left as an exercise for the reader */ +- rem = (unsigned)(len2 % BASE); +- sum1 = adler1 & 0xffff; +- sum2 = rem * sum1; +- MOD(sum2); +- sum1 += (adler2 & 0xffff) + BASE - 1; +- sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; +- if (sum1 > BASE) sum1 -= BASE; +- if (sum1 > BASE) sum1 -= BASE; +- if (sum2 > (BASE << 1)) sum2 -= (BASE << 1); +- if (sum2 > BASE) sum2 -= BASE; +- return sum1 | (sum2 << 16); ++uLong ZEXPORT adler32_combine64(adler1, adler2, len2) ++ uLong adler1; ++ uLong adler2; ++ z_off64_t len2; ++{ ++ return adler32_combine_(adler1, adler2, len2); + } +diff -r ee879c0ffa11 Modules/zlib/algorithm.txt +--- a/Modules/zlib/algorithm.txt ++++ b/Modules/zlib/algorithm.txt +@@ -121,7 +121,7 @@ + kbytes. You can imagine that filling in a 2^15 entry table for a 15-bit code + would take too long if you're only decoding several thousand symbols. At the + other extreme, you could make a new table for every bit in the code. In fact, +-that's essentially a Huffman tree. But then you spend two much time ++that's essentially a Huffman tree. But then you spend too much time + traversing the tree while decoding, even for short symbols. + + So the number of bits for the first lookup table is a trade of the time to +@@ -206,4 +206,4 @@ + pp. 337-343. + + ``DEFLATE Compressed Data Format Specification'' available in +-http://www.ietf.org/rfc/rfc1951.txt ++http://tools.ietf.org/html/rfc1951 +diff -r ee879c0ffa11 Modules/zlib/compress.c +--- a/Modules/zlib/compress.c ++++ b/Modules/zlib/compress.c +@@ -1,5 +1,5 @@ + /* compress.c -- compress a memory buffer +- * Copyright (C) 1995-2003 Jean-loup Gailly. ++ * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -29,7 +29,7 @@ + z_stream stream; + int err; + +- stream.next_in = (Bytef*)source; ++ stream.next_in = (z_const Bytef *)source; + stream.avail_in = (uInt)sourceLen; + #ifdef MAXSEG_64K + /* Check for source > 64K on 16-bit machine: */ +@@ -75,5 +75,6 @@ + uLong ZEXPORT compressBound (sourceLen) + uLong sourceLen; + { +- return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; ++ return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + ++ (sourceLen >> 25) + 13; + } +diff -r ee879c0ffa11 Modules/zlib/configure +--- a/Modules/zlib/configure ++++ b/Modules/zlib/configure +@@ -1,108 +1,239 @@ + #!/bin/sh +-# configure script for zlib. This script is needed only if +-# you wish to build a shared library and your system supports them, +-# of if you need special compiler, flags or install directory. +-# Otherwise, you can just use directly "make test; make install" ++# configure script for zlib. + # +-# To create a shared library, use "configure --shared"; by default a static +-# library is created. If the primitive shared library support provided here +-# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz ++# Normally configure builds both a static and a shared library. ++# If you want to build just a static library, use: ./configure --static + # + # To impose specific compiler or flags or install directory, use for example: + # prefix=$HOME CC=cc CFLAGS="-O4" ./configure + # or for csh/tcsh users: + # (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure) +-# LDSHARED is the command to be used to create a shared library + + # Incorrect settings of CC or CFLAGS may prevent creating a shared library. + # If you have problems, try without defining CC and CFLAGS before reporting + # an error. + +-LIBS=libz.a +-LDFLAGS="-L. ${LIBS}" ++# start off configure.log ++echo -------------------- >> configure.log ++echo $0 $* >> configure.log ++date >> configure.log ++ ++# set command prefix for cross-compilation ++if [ -n "${CHOST}" ]; then ++ uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`" ++ CROSS_PREFIX="${CHOST}-" ++fi ++ ++# destination name for static library ++STATICLIB=libz.a ++ ++# extract zlib version numbers from zlib.h + VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` ++VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h` + VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` + VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` +-AR=${AR-"ar rc"} +-RANLIB=${RANLIB-"ranlib"} ++ ++# establish commands for library building ++if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then ++ AR=${AR-"${CROSS_PREFIX}ar"} ++ test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log ++else ++ AR=${AR-"ar"} ++ test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log ++fi ++ARFLAGS=${ARFLAGS-"rc"} ++if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then ++ RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"} ++ test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log ++else ++ RANLIB=${RANLIB-"ranlib"} ++fi ++if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then ++ NM=${NM-"${CROSS_PREFIX}nm"} ++ test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log ++else ++ NM=${NM-"nm"} ++fi ++ ++# set defaults before processing command line options ++LDCONFIG=${LDCONFIG-"ldconfig"} ++LDSHAREDLIBC="${LDSHAREDLIBC--lc}" ++ARCHS= + prefix=${prefix-/usr/local} + exec_prefix=${exec_prefix-'${prefix}'} + libdir=${libdir-'${exec_prefix}/lib'} ++sharedlibdir=${sharedlibdir-'${libdir}'} + includedir=${includedir-'${prefix}/include'} + mandir=${mandir-'${prefix}/share/man'} + shared_ext='.so' +-shared=0 ++shared=1 ++solo=0 ++cover=0 ++zprefix=0 ++zconst=0 ++build64=0 + gcc=0 + old_cc="$CC" + old_cflags="$CFLAGS" ++OBJC='$(OBJZ) $(OBJG)' ++PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)' + ++# leave this script, optionally in a bad way ++leave() ++{ ++ if test "$*" != "0"; then ++ echo "** $0 aborting." | tee -a configure.log ++ fi ++ rm -f $test.[co] $test $test$shared_ext $test.gcno ./--version ++ echo -------------------- >> configure.log ++ echo >> configure.log ++ echo >> configure.log ++ exit $1 ++} ++ ++# process command line options + while test $# -ge 1 + do + case "$1" in +- -h* | --h*) +- echo 'usage:' +- echo ' configure [--shared] [--prefix=PREFIX] [--exec_prefix=EXPREFIX]' +- echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR]' +- exit 0;; +- -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;; +- -p* | --p*) prefix="$2"; shift; shift;; +- -e* | --e*) exec_prefix="$2"; shift; shift;; +- -l* | --l*) libdir="$2"; shift; shift;; +- -i* | --i*) includedir="$2"; shift; shift;; +- -s* | --s*) shared=1; shift;; +- *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;; ++ -h* | --help) ++ echo 'usage:' | tee -a configure.log ++ echo ' configure [--const] [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]' | tee -a configure.log ++ echo ' [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log ++ echo ' [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log ++ exit 0 ;; ++ -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;; ++ -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;; ++ -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;; ++ --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;; ++ -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;; ++ -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;; ++ -p* | --prefix) prefix="$2"; shift; shift ;; ++ -e* | --eprefix) exec_prefix="$2"; shift; shift ;; ++ -l* | --libdir) libdir="$2"; shift; shift ;; ++ -i* | --includedir) includedir="$2"; shift; shift ;; ++ -s* | --shared | --enable-shared) shared=1; shift ;; ++ -t | --static) shared=0; shift ;; ++ --solo) solo=1; shift ;; ++ --cover) cover=1; shift ;; ++ -z* | --zprefix) zprefix=1; shift ;; ++ -6* | --64) build64=1; shift ;; ++ -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;; ++ --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;; ++ --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;; ++ -c* | --const) zconst=1; shift ;; ++ *) ++ echo "unknown option: $1" | tee -a configure.log ++ echo "$0 --help for help" | tee -a configure.log ++ leave 1;; + esac + done + ++# temporary file name + test=ztest$$ ++ ++# put arguments in log, also put test file in log if used in arguments ++show() ++{ ++ case "$*" in ++ *$test.c*) ++ echo === $test.c === >> configure.log ++ cat $test.c >> configure.log ++ echo === >> configure.log;; ++ esac ++ echo $* >> configure.log ++} ++ ++# check for gcc vs. cc and set compile and link flags based on the system identified by uname + cat > $test.c <&1` in ++ *gcc*) gcc=1 ;; + esac + +-if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then ++show $cc -c $test.c ++if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then ++ echo ... using gcc >> configure.log + CC="$cc" +- SFLAGS=${CFLAGS-"-fPIC -O3"} +- CFLAGS="$cflags" +- case `(uname -s || echo unknown) 2>/dev/null` in +- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; +- CYGWIN* | Cygwin* | cygwin* | OS/2* ) +- EXE='.exe';; ++ CFLAGS="${CFLAGS--O3} ${ARCHS}" ++ SFLAGS="${CFLAGS--O3} -fPIC" ++ LDFLAGS="${LDFLAGS} ${ARCHS}" ++ if test $build64 -eq 1; then ++ CFLAGS="${CFLAGS} -m64" ++ SFLAGS="${SFLAGS} -m64" ++ fi ++ if test "${ZLIBGCCWARN}" = "YES"; then ++ if test "$zconst" -eq 1; then ++ CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -pedantic -DZLIB_CONST" ++ else ++ CFLAGS="${CFLAGS} -Wall -Wextra -pedantic" ++ fi ++ fi ++ if test -z "$uname"; then ++ uname=`(uname -s || echo unknown) 2>/dev/null` ++ fi ++ case "$uname" in ++ Linux* | linux* | GNU | GNU/* | solaris*) ++ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;; ++ *BSD | *bsd* | DragonFly) ++ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ++ LDCONFIG="ldconfig -m" ;; ++ CYGWIN* | Cygwin* | cygwin* | OS/2*) ++ EXE='.exe' ;; ++ MINGW* | mingw*) ++# temporary bypass ++ rm -f $test.[co] $test $test$shared_ext ++ echo "Please use win32/Makefile.gcc instead." | tee -a configure.log ++ leave 1 ++ LDSHARED=${LDSHARED-"$cc -shared"} ++ LDSHAREDLIBC="" ++ EXE='.exe' ;; + QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 + # (alain.bonnefoy@icbt.com) +- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};; ++ LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;; + HP-UX*) + LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} + case `(uname -m || echo unknown) 2>/dev/null` in + ia64) + shared_ext='.so' +- SHAREDLIB='libz.so';; ++ SHAREDLIB='libz.so' ;; + *) + shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; +- Darwin*) shared_ext='.dylib' ++ SHAREDLIB='libz.sl' ;; ++ esac ;; ++ Darwin* | darwin*) ++ shared_ext='.dylib' + SHAREDLIB=libz$shared_ext + SHAREDLIBV=libz.$VER$shared_ext + SHAREDLIBM=libz.$VER1$shared_ext +- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};; +- *) LDSHARED=${LDSHARED-"$cc -shared"};; ++ LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} ++ if libtool -V 2>&1 | grep Apple > /dev/null; then ++ AR="libtool" ++ else ++ AR="/usr/bin/libtool" ++ fi ++ ARFLAGS="-o" ;; ++ *) LDSHARED=${LDSHARED-"$cc -shared"} ;; + esac + else + # find system name and corresponding cc options + CC=${CC-cc} +- case `(uname -sr || echo unknown) 2>/dev/null` in ++ gcc=0 ++ echo ... using $CC >> configure.log ++ if test -z "$uname"; then ++ uname=`(uname -sr || echo unknown) 2>/dev/null` ++ fi ++ case "$uname" in + HP-UX*) SFLAGS=${CFLAGS-"-O +z"} + CFLAGS=${CFLAGS-"-O"} + # LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"} +@@ -110,350 +241,591 @@ + case `(uname -m || echo unknown) 2>/dev/null` in + ia64) + shared_ext='.so' +- SHAREDLIB='libz.so';; ++ SHAREDLIB='libz.so' ;; + *) + shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; ++ SHAREDLIB='libz.sl' ;; ++ esac ;; + IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} + CFLAGS=${CFLAGS-"-ansi -O2"} +- LDSHARED=${LDSHARED-"cc -shared"};; ++ LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;; + OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"} + CFLAGS=${CFLAGS-"-O -std1"} +- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};; ++ LDFLAGS="${LDFLAGS} -Wl,-rpath,." ++ LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;; + OSF1*) SFLAGS=${CFLAGS-"-O -std1"} + CFLAGS=${CFLAGS-"-O -std1"} +- LDSHARED=${LDSHARED-"cc -shared"};; ++ LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;; + QNX*) SFLAGS=${CFLAGS-"-4 -O"} + CFLAGS=${CFLAGS-"-4 -O"} + LDSHARED=${LDSHARED-"cc"} + RANLIB=${RANLIB-"true"} +- AR="cc -A";; ++ AR="cc" ++ ARFLAGS="-A" ;; + SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} + CFLAGS=${CFLAGS-"-O3"} +- LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; +- SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} +- CFLAGS=${CFLAGS-"-fast -xcg89"} +- LDSHARED=${LDSHARED-"cc -G"};; ++ LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;; ++ SunOS\ 5* | solaris*) ++ LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"} ++ SFLAGS=${CFLAGS-"-fast -KPIC"} ++ CFLAGS=${CFLAGS-"-fast"} ++ if test $build64 -eq 1; then ++ # old versions of SunPRO/Workshop/Studio don't support -m64, ++ # but newer ones do. Check for it. ++ flag64=`$CC -flags | egrep -- '^-m64'` ++ if test x"$flag64" != x"" ; then ++ CFLAGS="${CFLAGS} -m64" ++ SFLAGS="${SFLAGS} -m64" ++ else ++ case `(uname -m || echo unknown) 2>/dev/null` in ++ i86*) ++ SFLAGS="$SFLAGS -xarch=amd64" ++ CFLAGS="$CFLAGS -xarch=amd64" ;; ++ *) ++ SFLAGS="$SFLAGS -xarch=v9" ++ CFLAGS="$CFLAGS -xarch=v9" ;; ++ esac ++ fi ++ fi ++ ;; + SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} + CFLAGS=${CFLAGS-"-O2"} +- LDSHARED=${LDSHARED-"ld"};; +- SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"} +- CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"} +- LDSHARED=${LDSHARED-"cc -xarch=v9b"};; ++ LDSHARED=${LDSHARED-"ld"} ;; ++ SunStudio\ 9*) SFLAGS=${CFLAGS-"-fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"} ++ CFLAGS=${CFLAGS-"-fast -xtarget=ultra3 -xarch=v9b"} ++ LDSHARED=${LDSHARED-"cc -xarch=v9b"} ;; + UNIX_System_V\ 4.2.0) + SFLAGS=${CFLAGS-"-KPIC -O"} + CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; ++ LDSHARED=${LDSHARED-"cc -G"} ;; + UNIX_SV\ 4.2MP) + SFLAGS=${CFLAGS-"-Kconform_pic -O"} + CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; ++ LDSHARED=${LDSHARED-"cc -G"} ;; + OpenUNIX\ 5) + SFLAGS=${CFLAGS-"-KPIC -O"} + CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; ++ LDSHARED=${LDSHARED-"cc -G"} ;; + AIX*) # Courtesy of dbakker@arrayasolutions.com + SFLAGS=${CFLAGS-"-O -qmaxmem=8192"} + CFLAGS=${CFLAGS-"-O -qmaxmem=8192"} +- LDSHARED=${LDSHARED-"xlc -G"};; +- # send working options for other systems to support@gzip.org ++ LDSHARED=${LDSHARED-"xlc -G"} ;; ++ # send working options for other systems to zlib@gzip.org + *) SFLAGS=${CFLAGS-"-O"} + CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -shared"};; ++ LDSHARED=${LDSHARED-"cc -shared"} ;; + esac + fi + ++# destination names for shared library if not defined above + SHAREDLIB=${SHAREDLIB-"libz$shared_ext"} + SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"} + SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} + ++echo >> configure.log ++ ++# define functions for testing compiler and library characteristics and logging the results ++ ++cat > $test.c </dev/null; then ++ try() ++ { ++ show $* ++ test "`( $* ) 2>&1 | tee -a configure.log`" = "" ++ } ++ echo - using any output from compiler to indicate an error >> configure.log ++else ++try() ++{ ++ show $* ++ ( $* ) >> configure.log 2>&1 ++ ret=$? ++ if test $ret -ne 0; then ++ echo "(exit code "$ret")" >> configure.log ++ fi ++ return $ret ++} ++fi ++ ++tryboth() ++{ ++ show $* ++ got=`( $* ) 2>&1` ++ ret=$? ++ printf %s "$got" >> configure.log ++ if test $ret -ne 0; then ++ return $ret ++ fi ++ test "$got" = "" ++} ++ ++cat > $test.c << EOF ++int foo() { return 0; } ++EOF ++echo "Checking for obsessive-compulsive compiler options..." >> configure.log ++if try $CC -c $CFLAGS $test.c; then ++ : ++else ++ echo "Compiler error reporting is too harsh for $0 (perhaps remove -Werror)." | tee -a configure.log ++ leave 1 ++fi ++ ++echo >> configure.log ++ ++# see if shared library build supported ++cat > $test.c <&1`" = "" && +- test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then +- CFLAGS="$SFLAGS" +- LIBS="$SHAREDLIBV" +- echo Building shared library $SHAREDLIBV with $CC. ++ if try $CC -w -c $SFLAGS $test.c && ++ try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then ++ echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log + elif test -z "$old_cc" -a -z "$old_cflags"; then +- echo No shared library support. ++ echo No shared library support. | tee -a configure.log + shared=0; + else +- echo 'No shared library support; try without defining CC and CFLAGS' ++ echo 'No shared library support; try without defining CC and CFLAGS' | tee -a configure.log + shared=0; + fi + fi + if test $shared -eq 0; then + LDSHARED="$CC" +- echo Building static library $LIBS version $VER with $CC. ++ ALL="static" ++ TEST="all teststatic" ++ SHAREDLIB="" ++ SHAREDLIBV="" ++ SHAREDLIBM="" ++ echo Building static library $STATICLIB version $VER with $CC. | tee -a configure.log + else +- LDFLAGS="-L. ${SHAREDLIBV}" ++ ALL="static shared" ++ TEST="all teststatic testshared" + fi + ++# check for underscores in external names for use by assembler code ++CPP=${CPP-"$CC -E"} ++case $CFLAGS in ++ *ASMV*) ++ echo >> configure.log ++ show "$NM $test.o | grep _hello" ++ if test "`$NM $test.o | grep _hello | tee -a configure.log`" = ""; then ++ CPP="$CPP -DNO_UNDERLINE" ++ echo Checking for underline in external names... No. | tee -a configure.log ++ else ++ echo Checking for underline in external names... Yes. | tee -a configure.log ++ fi ;; ++esac ++ ++echo >> configure.log ++ ++# check for large file support, and if none, check for fseeko() ++cat > $test.c < ++off64_t dummy = 0; ++EOF ++if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then ++ CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1" ++ SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1" ++ ALL="${ALL} all64" ++ TEST="${TEST} test64" ++ echo "Checking for off64_t... Yes." | tee -a configure.log ++ echo "Checking for fseeko... Yes." | tee -a configure.log ++else ++ echo "Checking for off64_t... No." | tee -a configure.log ++ echo >> configure.log ++ cat > $test.c < ++int main(void) { ++ fseeko(NULL, 0, 0); ++ return 0; ++} ++EOF ++ if try $CC $CFLAGS -o $test $test.c; then ++ echo "Checking for fseeko... Yes." | tee -a configure.log ++ else ++ CFLAGS="${CFLAGS} -DNO_FSEEKO" ++ SFLAGS="${SFLAGS} -DNO_FSEEKO" ++ echo "Checking for fseeko... No." | tee -a configure.log ++ fi ++fi ++ ++echo >> configure.log ++ ++# check for strerror() for use by gz* functions ++cat > $test.c < ++#include ++int main() { return strlen(strerror(errno)); } ++EOF ++if try $CC $CFLAGS -o $test $test.c; then ++ echo "Checking for strerror... Yes." | tee -a configure.log ++else ++ CFLAGS="${CFLAGS} -DNO_STRERROR" ++ SFLAGS="${SFLAGS} -DNO_STRERROR" ++ echo "Checking for strerror... No." | tee -a configure.log ++fi ++ ++# copy clean zconf.h for subsequent edits ++cp -p zconf.h.in zconf.h ++ ++echo >> configure.log ++ ++# check for unistd.h and save result in zconf.h + cat > $test.c < + int main() { return 0; } + EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h +- echo "Checking for unistd.h... Yes." ++if try $CC -c $CFLAGS $test.c; then ++ sed < zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be/ 1\1 was/" > zconf.temp.h ++ mv zconf.temp.h zconf.h ++ echo "Checking for unistd.h... Yes." | tee -a configure.log + else +- cp -p zconf.in.h zconf.h +- echo "Checking for unistd.h... No." ++ echo "Checking for unistd.h... No." | tee -a configure.log + fi + ++echo >> configure.log ++ ++# check for stdarg.h and save result in zconf.h ++cat > $test.c < ++int main() { return 0; } ++EOF ++if try $CC -c $CFLAGS $test.c; then ++ sed < zconf.h "/^#ifdef HAVE_STDARG_H.* may be/s/def HAVE_STDARG_H\(.*\) may be/ 1\1 was/" > zconf.temp.h ++ mv zconf.temp.h zconf.h ++ echo "Checking for stdarg.h... Yes." | tee -a configure.log ++else ++ echo "Checking for stdarg.h... No." | tee -a configure.log ++fi ++ ++# if the z_ prefix was requested, save that in zconf.h ++if test $zprefix -eq 1; then ++ sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" > zconf.temp.h ++ mv zconf.temp.h zconf.h ++ echo >> configure.log ++ echo "Using z_ prefix on all symbols." | tee -a configure.log ++fi ++ ++# if --solo compilation was requested, save that in zconf.h and remove gz stuff from object lists ++if test $solo -eq 1; then ++ sed '/#define ZCONF_H/a\ ++#define Z_SOLO ++ ++' < zconf.h > zconf.temp.h ++ mv zconf.temp.h zconf.h ++OBJC='$(OBJZ)' ++PIC_OBJC='$(PIC_OBJZ)' ++fi ++ ++# if code coverage testing was requested, use older gcc if defined, e.g. "gcc-4.2" on Mac OS X ++if test $cover -eq 1; then ++ CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage" ++ if test -n "$GCC_CLASSIC"; then ++ CC=$GCC_CLASSIC ++ fi ++fi ++ ++echo >> configure.log ++ ++# conduct a series of tests to resolve eight possible cases of using "vs" or "s" printf functions ++# (using stdarg or not), with or without "n" (proving size of buffer), and with or without a ++# return value. The most secure result is vsnprintf() with a return value. snprintf() with a ++# return value is secure as well, but then gzprintf() will be limited to 20 arguments. + cat > $test.c < + #include + #include "zconf.h" +- + int main() + { + #ifndef STDC + choke me + #endif +- + return 0; + } + EOF ++if try $CC -c $CFLAGS $test.c; then ++ echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()." | tee -a configure.log + +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()" +- ++ echo >> configure.log + cat > $test.c < + #include +- +-int mytest(char *fmt, ...) ++int mytest(const char *fmt, ...) + { + char buf[20]; + va_list ap; +- + va_start(ap, fmt); + vsnprintf(buf, sizeof(buf), fmt, ap); + va_end(ap); + return 0; + } ++int main() ++{ ++ return (mytest("Hello%d\n", 1)); ++} ++EOF ++ if try $CC $CFLAGS -o $test $test.c; then ++ echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log + ++ echo >> configure.log ++ cat >$test.c < ++#include ++int mytest(const char *fmt, ...) ++{ ++ int n; ++ char buf[20]; ++ va_list ap; ++ va_start(ap, fmt); ++ n = vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ return n; ++} + int main() + { + return (mytest("Hello%d\n", 1)); + } + EOF + +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for vsnprintf() in stdio.h... Yes." ++ if try $CC -c $CFLAGS $test.c; then ++ echo "Checking for return value of vsnprintf()... Yes." | tee -a configure.log ++ else ++ CFLAGS="$CFLAGS -DHAS_vsnprintf_void" ++ SFLAGS="$SFLAGS -DHAS_vsnprintf_void" ++ echo "Checking for return value of vsnprintf()... No." | tee -a configure.log ++ echo " WARNING: apparently vsnprintf() does not return a value. zlib" | tee -a configure.log ++ echo " can build but will be open to possible string-format security" | tee -a configure.log ++ echo " vulnerabilities." | tee -a configure.log ++ fi ++ else ++ CFLAGS="$CFLAGS -DNO_vsnprintf" ++ SFLAGS="$SFLAGS -DNO_vsnprintf" ++ echo "Checking for vsnprintf() in stdio.h... No." | tee -a configure.log ++ echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" | tee -a configure.log ++ echo " can build but will be open to possible buffer-overflow security" | tee -a configure.log ++ echo " vulnerabilities." | tee -a configure.log + ++ echo >> configure.log + cat >$test.c < + #include +- +-int mytest(char *fmt, ...) ++int mytest(const char *fmt, ...) + { + int n; + char buf[20]; + va_list ap; +- + va_start(ap, fmt); +- n = vsnprintf(buf, sizeof(buf), fmt, ap); ++ n = vsprintf(buf, fmt, ap); + va_end(ap); + return n; + } +- + int main() + { + return (mytest("Hello%d\n", 1)); + } + EOF + +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of vsnprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_vsnprintf_void" +- echo "Checking for return value of vsnprintf()... No." +- echo " WARNING: apparently vsnprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- else +- CFLAGS="$CFLAGS -DNO_vsnprintf" +- echo "Checking for vsnprintf() in stdio.h... No." +- echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" +- echo " can build but will be open to possible buffer-overflow security" +- echo " vulnerabilities." +- +- cat >$test.c < +-#include +- +-int mytest(char *fmt, ...) +-{ +- int n; +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- n = vsprintf(buf, fmt, ap); +- va_end(ap); +- return n; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of vsprintf()... Yes." ++ if try $CC -c $CFLAGS $test.c; then ++ echo "Checking for return value of vsprintf()... Yes." | tee -a configure.log + else + CFLAGS="$CFLAGS -DHAS_vsprintf_void" +- echo "Checking for return value of vsprintf()... No." +- echo " WARNING: apparently vsprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." ++ SFLAGS="$SFLAGS -DHAS_vsprintf_void" ++ echo "Checking for return value of vsprintf()... No." | tee -a configure.log ++ echo " WARNING: apparently vsprintf() does not return a value. zlib" | tee -a configure.log ++ echo " can build but will be open to possible string-format security" | tee -a configure.log ++ echo " vulnerabilities." | tee -a configure.log + fi + fi + else +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()" ++ echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()." | tee -a configure.log + ++ echo >> configure.log + cat >$test.c < +- + int mytest() + { + char buf[20]; +- + snprintf(buf, sizeof(buf), "%s", "foo"); + return 0; + } +- + int main() + { + return (mytest()); + } + EOF + +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for snprintf() in stdio.h... Yes." ++ if try $CC $CFLAGS -o $test $test.c; then ++ echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log + ++ echo >> configure.log + cat >$test.c < +- + int mytest() + { + char buf[20]; +- + return snprintf(buf, sizeof(buf), "%s", "foo"); + } +- + int main() + { + return (mytest()); + } + EOF + +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of snprintf()... Yes." ++ if try $CC -c $CFLAGS $test.c; then ++ echo "Checking for return value of snprintf()... Yes." | tee -a configure.log + else + CFLAGS="$CFLAGS -DHAS_snprintf_void" +- echo "Checking for return value of snprintf()... No." +- echo " WARNING: apparently snprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." ++ SFLAGS="$SFLAGS -DHAS_snprintf_void" ++ echo "Checking for return value of snprintf()... No." | tee -a configure.log ++ echo " WARNING: apparently snprintf() does not return a value. zlib" | tee -a configure.log ++ echo " can build but will be open to possible string-format security" | tee -a configure.log ++ echo " vulnerabilities." | tee -a configure.log + fi + else + CFLAGS="$CFLAGS -DNO_snprintf" +- echo "Checking for snprintf() in stdio.h... No." +- echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" +- echo " can build but will be open to possible buffer-overflow security" +- echo " vulnerabilities." ++ SFLAGS="$SFLAGS -DNO_snprintf" ++ echo "Checking for snprintf() in stdio.h... No." | tee -a configure.log ++ echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" | tee -a configure.log ++ echo " can build but will be open to possible buffer-overflow security" | tee -a configure.log ++ echo " vulnerabilities." | tee -a configure.log + ++ echo >> configure.log + cat >$test.c < +- + int mytest() + { + char buf[20]; +- + return sprintf(buf, "%s", "foo"); + } +- + int main() + { + return (mytest()); + } + EOF + +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of sprintf()... Yes." ++ if try $CC -c $CFLAGS $test.c; then ++ echo "Checking for return value of sprintf()... Yes." | tee -a configure.log + else + CFLAGS="$CFLAGS -DHAS_sprintf_void" +- echo "Checking for return value of sprintf()... No." +- echo " WARNING: apparently sprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." ++ SFLAGS="$SFLAGS -DHAS_sprintf_void" ++ echo "Checking for return value of sprintf()... No." | tee -a configure.log ++ echo " WARNING: apparently sprintf() does not return a value. zlib" | tee -a configure.log ++ echo " can build but will be open to possible string-format security" | tee -a configure.log ++ echo " vulnerabilities." | tee -a configure.log + fi + fi + fi + +-cat >$test.c < +-int main() { return 0; } ++# see if we can hide zlib internal symbols that are linked between separate source files ++if test "$gcc" -eq 1; then ++ echo >> configure.log ++ cat > $test.c <&1`" = ""; then +- echo "Checking for errno.h... Yes." +-else +- echo "Checking for errno.h... No." +- CFLAGS="$CFLAGS -DNO_ERRNO_H" ++ if tryboth $CC -c $CFLAGS $test.c; then ++ CFLAGS="$CFLAGS -DHAVE_HIDDEN" ++ SFLAGS="$SFLAGS -DHAVE_HIDDEN" ++ echo "Checking for attribute(visibility) support... Yes." | tee -a configure.log ++ else ++ echo "Checking for attribute(visibility) support... No." | tee -a configure.log ++ fi + fi + +-cat > $test.c < +-#include +-#include +-caddr_t hello() { +- return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0); +-} +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- CFLAGS="$CFLAGS -DUSE_MMAP" +- echo Checking for mmap support... Yes. +-else +- echo Checking for mmap support... No. +-fi ++# show the results in the log ++echo >> configure.log ++echo ALL = $ALL >> configure.log ++echo AR = $AR >> configure.log ++echo ARFLAGS = $ARFLAGS >> configure.log ++echo CC = $CC >> configure.log ++echo CFLAGS = $CFLAGS >> configure.log ++echo CPP = $CPP >> configure.log ++echo EXE = $EXE >> configure.log ++echo LDCONFIG = $LDCONFIG >> configure.log ++echo LDFLAGS = $LDFLAGS >> configure.log ++echo LDSHARED = $LDSHARED >> configure.log ++echo LDSHAREDLIBC = $LDSHAREDLIBC >> configure.log ++echo OBJC = $OBJC >> configure.log ++echo PIC_OBJC = $PIC_OBJC >> configure.log ++echo RANLIB = $RANLIB >> configure.log ++echo SFLAGS = $SFLAGS >> configure.log ++echo SHAREDLIB = $SHAREDLIB >> configure.log ++echo SHAREDLIBM = $SHAREDLIBM >> configure.log ++echo SHAREDLIBV = $SHAREDLIBV >> configure.log ++echo STATICLIB = $STATICLIB >> configure.log ++echo TEST = $TEST >> configure.log ++echo VER = $VER >> configure.log ++echo Z_U4 = $Z_U4 >> configure.log ++echo exec_prefix = $exec_prefix >> configure.log ++echo includedir = $includedir >> configure.log ++echo libdir = $libdir >> configure.log ++echo mandir = $mandir >> configure.log ++echo prefix = $prefix >> configure.log ++echo sharedlibdir = $sharedlibdir >> configure.log ++echo uname = $uname >> configure.log + +-CPP=${CPP-"$CC -E"} +-case $CFLAGS in +- *ASMV*) +- if test "`nm $test.o | grep _hello`" = ""; then +- CPP="$CPP -DNO_UNDERLINE" +- echo Checking for underline in external names... No. +- else +- echo Checking for underline in external names... Yes. +- fi;; +-esac ++# udpate Makefile with the configure results ++sed < Makefile.in " ++/^CC *=/s#=.*#=$CC# ++/^CFLAGS *=/s#=.*#=$CFLAGS# ++/^SFLAGS *=/s#=.*#=$SFLAGS# ++/^LDFLAGS *=/s#=.*#=$LDFLAGS# ++/^LDSHARED *=/s#=.*#=$LDSHARED# ++/^CPP *=/s#=.*#=$CPP# ++/^STATICLIB *=/s#=.*#=$STATICLIB# ++/^SHAREDLIB *=/s#=.*#=$SHAREDLIB# ++/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# ++/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# ++/^AR *=/s#=.*#=$AR# ++/^ARFLAGS *=/s#=.*#=$ARFLAGS# ++/^RANLIB *=/s#=.*#=$RANLIB# ++/^LDCONFIG *=/s#=.*#=$LDCONFIG# ++/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC# ++/^EXE *=/s#=.*#=$EXE# ++/^prefix *=/s#=.*#=$prefix# ++/^exec_prefix *=/s#=.*#=$exec_prefix# ++/^libdir *=/s#=.*#=$libdir# ++/^sharedlibdir *=/s#=.*#=$sharedlibdir# ++/^includedir *=/s#=.*#=$includedir# ++/^mandir *=/s#=.*#=$mandir# ++/^OBJC *=/s#=.*#= $OBJC# ++/^PIC_OBJC *=/s#=.*#= $PIC_OBJC# ++/^all: */s#:.*#: $ALL# ++/^test: */s#:.*#: $TEST# ++" > Makefile + +-rm -f $test.[co] $test $test$shared_ext +- +-# udpate Makefile +-sed < Makefile.in " ++# create zlib.pc with the configure results ++sed < zlib.pc.in " + /^CC *=/s#=.*#=$CC# + /^CFLAGS *=/s#=.*#=$CFLAGS# + /^CPP *=/s#=.*#=$CPP# + /^LDSHARED *=/s#=.*#=$LDSHARED# +-/^LIBS *=/s#=.*#=$LIBS# ++/^STATICLIB *=/s#=.*#=$STATICLIB# + /^SHAREDLIB *=/s#=.*#=$SHAREDLIB# + /^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# + /^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# + /^AR *=/s#=.*#=$AR# ++/^ARFLAGS *=/s#=.*#=$ARFLAGS# + /^RANLIB *=/s#=.*#=$RANLIB# + /^EXE *=/s#=.*#=$EXE# + /^prefix *=/s#=.*#=$prefix# + /^exec_prefix *=/s#=.*#=$exec_prefix# + /^libdir *=/s#=.*#=$libdir# ++/^sharedlibdir *=/s#=.*#=$sharedlibdir# + /^includedir *=/s#=.*#=$includedir# + /^mandir *=/s#=.*#=$mandir# + /^LDFLAGS *=/s#=.*#=$LDFLAGS# +-" > Makefile ++" | sed -e " ++s/\@VERSION\@/$VER/g; ++" > zlib.pc ++ ++# done ++leave 0 +diff -r ee879c0ffa11 Modules/zlib/crc32.c +--- a/Modules/zlib/crc32.c ++++ b/Modules/zlib/crc32.c +@@ -1,5 +1,5 @@ + /* crc32.c -- compute the CRC-32 of a data stream +- * Copyright (C) 1995-2005 Mark Adler ++ * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Thanks to Rodney Brown for his contribution of faster +@@ -17,6 +17,8 @@ + of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should + first call get_crc_table() to initialize the tables before allowing more than + one thread to use crc32(). ++ ++ DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h. + */ + + #ifdef MAKECRCH +@@ -30,31 +32,11 @@ + + #define local static + +-/* Find a four-byte integer type for crc32_little() and crc32_big(). */ +-#ifndef NOBYFOUR +-# ifdef STDC /* need ANSI C limits.h to determine sizes */ +-# include +-# define BYFOUR +-# if (UINT_MAX == 0xffffffffUL) +- typedef unsigned int u4; +-# else +-# if (ULONG_MAX == 0xffffffffUL) +- typedef unsigned long u4; +-# else +-# if (USHRT_MAX == 0xffffffffUL) +- typedef unsigned short u4; +-# else +-# undef BYFOUR /* can't find a four-byte integer type! */ +-# endif +-# endif +-# endif +-# endif /* STDC */ +-#endif /* !NOBYFOUR */ +- + /* Definitions for doing the crc four data bytes at a time. */ ++#if !defined(NOBYFOUR) && defined(Z_U4) ++# define BYFOUR ++#endif + #ifdef BYFOUR +-# define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \ +- (((w)&0xff00)<<8)+(((w)&0xff)<<24)) + local unsigned long crc32_little OF((unsigned long, + const unsigned char FAR *, unsigned)); + local unsigned long crc32_big OF((unsigned long, +@@ -68,14 +50,16 @@ + local unsigned long gf2_matrix_times OF((unsigned long *mat, + unsigned long vec)); + local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); ++local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2)); ++ + + #ifdef DYNAMIC_CRC_TABLE + + local volatile int crc_table_empty = 1; +-local unsigned long FAR crc_table[TBLS][256]; ++local z_crc_t FAR crc_table[TBLS][256]; + local void make_crc_table OF((void)); + #ifdef MAKECRCH +- local void write_table OF((FILE *, const unsigned long FAR *)); ++ local void write_table OF((FILE *, const z_crc_t FAR *)); + #endif /* MAKECRCH */ + /* + Generate tables for a byte-wise 32-bit CRC calculation on the polynomial: +@@ -105,9 +89,9 @@ + */ + local void make_crc_table() + { +- unsigned long c; ++ z_crc_t c; + int n, k; +- unsigned long poly; /* polynomial exclusive-or pattern */ ++ z_crc_t poly; /* polynomial exclusive-or pattern */ + /* terms of polynomial defining this crc (except x^32): */ + static volatile int first = 1; /* flag to limit concurrent making */ + static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; +@@ -119,13 +103,13 @@ + first = 0; + + /* make exclusive-or pattern from polynomial (0xedb88320UL) */ +- poly = 0UL; +- for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++) +- poly |= 1UL << (31 - p[n]); ++ poly = 0; ++ for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++) ++ poly |= (z_crc_t)1 << (31 - p[n]); + + /* generate a crc for every 8-bit value */ + for (n = 0; n < 256; n++) { +- c = (unsigned long)n; ++ c = (z_crc_t)n; + for (k = 0; k < 8; k++) + c = c & 1 ? poly ^ (c >> 1) : c >> 1; + crc_table[0][n] = c; +@@ -136,11 +120,11 @@ + and then the byte reversal of those as well as the first table */ + for (n = 0; n < 256; n++) { + c = crc_table[0][n]; +- crc_table[4][n] = REV(c); ++ crc_table[4][n] = ZSWAP32(c); + for (k = 1; k < 4; k++) { + c = crc_table[0][c & 0xff] ^ (c >> 8); + crc_table[k][n] = c; +- crc_table[k + 4][n] = REV(c); ++ crc_table[k + 4][n] = ZSWAP32(c); + } + } + #endif /* BYFOUR */ +@@ -162,7 +146,7 @@ + if (out == NULL) return; + fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n"); + fprintf(out, " * Generated automatically by crc32.c\n */\n\n"); +- fprintf(out, "local const unsigned long FAR "); ++ fprintf(out, "local const z_crc_t FAR "); + fprintf(out, "crc_table[TBLS][256] =\n{\n {\n"); + write_table(out, crc_table[0]); + # ifdef BYFOUR +@@ -182,12 +166,13 @@ + #ifdef MAKECRCH + local void write_table(out, table) + FILE *out; +- const unsigned long FAR *table; ++ const z_crc_t FAR *table; + { + int n; + + for (n = 0; n < 256; n++) +- fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", table[n], ++ fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", ++ (unsigned long)(table[n]), + n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", ")); + } + #endif /* MAKECRCH */ +@@ -202,13 +187,13 @@ + /* ========================================================================= + * This function can be used by asm versions of crc32() + */ +-const unsigned long FAR * ZEXPORT get_crc_table() ++const z_crc_t FAR * ZEXPORT get_crc_table() + { + #ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) + make_crc_table(); + #endif /* DYNAMIC_CRC_TABLE */ +- return (const unsigned long FAR *)crc_table; ++ return (const z_crc_t FAR *)crc_table; + } + + /* ========================================================================= */ +@@ -219,7 +204,7 @@ + unsigned long ZEXPORT crc32(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; +- unsigned len; ++ uInt len; + { + if (buf == Z_NULL) return 0UL; + +@@ -230,7 +215,7 @@ + + #ifdef BYFOUR + if (sizeof(void *) == sizeof(ptrdiff_t)) { +- u4 endian; ++ z_crc_t endian; + + endian = 1; + if (*((unsigned char *)(&endian))) +@@ -264,17 +249,17 @@ + const unsigned char FAR *buf; + unsigned len; + { +- register u4 c; +- register const u4 FAR *buf4; ++ register z_crc_t c; ++ register const z_crc_t FAR *buf4; + +- c = (u4)crc; ++ c = (z_crc_t)crc; + c = ~c; + while (len && ((ptrdiff_t)buf & 3)) { + c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); + len--; + } + +- buf4 = (const u4 FAR *)(const void FAR *)buf; ++ buf4 = (const z_crc_t FAR *)(const void FAR *)buf; + while (len >= 32) { + DOLIT32; + len -= 32; +@@ -304,17 +289,17 @@ + const unsigned char FAR *buf; + unsigned len; + { +- register u4 c; +- register const u4 FAR *buf4; ++ register z_crc_t c; ++ register const z_crc_t FAR *buf4; + +- c = REV((u4)crc); ++ c = ZSWAP32((z_crc_t)crc); + c = ~c; + while (len && ((ptrdiff_t)buf & 3)) { + c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); + len--; + } + +- buf4 = (const u4 FAR *)(const void FAR *)buf; ++ buf4 = (const z_crc_t FAR *)(const void FAR *)buf; + buf4--; + while (len >= 32) { + DOBIG32; +@@ -331,7 +316,7 @@ + c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); + } while (--len); + c = ~c; +- return (unsigned long)(REV(c)); ++ return (unsigned long)(ZSWAP32(c)); + } + + #endif /* BYFOUR */ +@@ -367,22 +352,22 @@ + } + + /* ========================================================================= */ +-uLong ZEXPORT crc32_combine(crc1, crc2, len2) ++local uLong crc32_combine_(crc1, crc2, len2) + uLong crc1; + uLong crc2; +- z_off_t len2; ++ z_off64_t len2; + { + int n; + unsigned long row; + unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */ + unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */ + +- /* degenerate case */ +- if (len2 == 0) ++ /* degenerate case (also disallow negative lengths) */ ++ if (len2 <= 0) + return crc1; + + /* put operator for one zero bit in odd */ +- odd[0] = 0xedb88320L; /* CRC-32 polynomial */ ++ odd[0] = 0xedb88320UL; /* CRC-32 polynomial */ + row = 1; + for (n = 1; n < GF2_DIM; n++) { + odd[n] = row; +@@ -421,3 +406,20 @@ + crc1 ^= crc2; + return crc1; + } ++ ++/* ========================================================================= */ ++uLong ZEXPORT crc32_combine(crc1, crc2, len2) ++ uLong crc1; ++ uLong crc2; ++ z_off_t len2; ++{ ++ return crc32_combine_(crc1, crc2, len2); ++} ++ ++uLong ZEXPORT crc32_combine64(crc1, crc2, len2) ++ uLong crc1; ++ uLong crc2; ++ z_off64_t len2; ++{ ++ return crc32_combine_(crc1, crc2, len2); ++} +diff -r ee879c0ffa11 Modules/zlib/crc32.h +--- a/Modules/zlib/crc32.h ++++ b/Modules/zlib/crc32.h +@@ -2,7 +2,7 @@ + * Generated automatically by crc32.c + */ + +-local const unsigned long FAR crc_table[TBLS][256] = ++local const z_crc_t FAR crc_table[TBLS][256] = + { + { + 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, +diff -r ee879c0ffa11 Modules/zlib/deflate.c +--- a/Modules/zlib/deflate.c ++++ b/Modules/zlib/deflate.c +@@ -1,5 +1,5 @@ + /* deflate.c -- compress data using the deflation algorithm +- * Copyright (C) 1995-2005 Jean-loup Gailly. ++ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -37,7 +37,7 @@ + * REFERENCES + * + * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". +- * Available in http://www.ietf.org/rfc/rfc1951.txt ++ * Available in http://tools.ietf.org/html/rfc1951 + * + * A description of the Rabin and Karp algorithm is given in the book + * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. +@@ -52,7 +52,7 @@ + #include "deflate.h" + + const char deflate_copyright[] = +- " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly "; ++ " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler "; + /* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot +@@ -79,19 +79,18 @@ + #ifndef FASTEST + local block_state deflate_slow OF((deflate_state *s, int flush)); + #endif ++local block_state deflate_rle OF((deflate_state *s, int flush)); ++local block_state deflate_huff OF((deflate_state *s, int flush)); + local void lm_init OF((deflate_state *s)); + local void putShortMSB OF((deflate_state *s, uInt b)); + local void flush_pending OF((z_streamp strm)); + local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); +-#ifndef FASTEST + #ifdef ASMV + void match_init OF((void)); /* asm code initialization */ + uInt longest_match OF((deflate_state *s, IPos cur_match)); + #else + local uInt longest_match OF((deflate_state *s, IPos cur_match)); + #endif +-#endif +-local uInt longest_match_fast OF((deflate_state *s, IPos cur_match)); + + #ifdef DEBUG + local void check_match OF((deflate_state *s, IPos start, IPos match, +@@ -110,11 +109,6 @@ + #endif + /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + +-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) +-/* Minimum amount of lookahead, except at the end of the input file. +- * See deflate.c for comments about the MIN_MATCH+1. +- */ +- + /* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to + * exclude worst case performance for pathological files. Better values may be +@@ -161,9 +155,12 @@ + struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ + #endif + ++/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ ++#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0)) ++ + /* =========================================================================== + * Update a hash value with the given input byte +- * IN assertion: all calls to UPDATE_HASH are made with consecutive ++ * IN assertion: all calls to to UPDATE_HASH are made with consecutive + * input characters, so that a running hash key can be computed from the + * previous key instead of complete recalculation each time. + */ +@@ -176,7 +173,7 @@ + * the previous length of the hash chain. + * If this file is compiled with -DFASTEST, the compression level is forced + * to 1, and no hash chains are maintained. +- * IN assertion: all calls to INSERT_STRING are made with consecutive ++ * IN assertion: all calls to to INSERT_STRING are made with consecutive + * input characters and the first MIN_MATCH bytes of str are valid + * (except for the last MIN_MATCH-1 bytes of the input file). + */ +@@ -241,10 +238,19 @@ + + strm->msg = Z_NULL; + if (strm->zalloc == (alloc_func)0) { ++#ifdef Z_SOLO ++ return Z_STREAM_ERROR; ++#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; ++#endif + } +- if (strm->zfree == (free_func)0) strm->zfree = zcfree; ++ if (strm->zfree == (free_func)0) ++#ifdef Z_SOLO ++ return Z_STREAM_ERROR; ++#else ++ strm->zfree = zcfree; ++#endif + + #ifdef FASTEST + if (level != 0) level = 1; +@@ -288,6 +294,8 @@ + s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); + s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); + ++ s->high_water = 0; /* nothing written to s->window yet */ ++ + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + + overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); +@@ -297,7 +305,7 @@ + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { + s->status = FINISH_STATE; +- strm->msg = (char*)ERR_MSG(Z_MEM_ERROR); ++ strm->msg = ERR_MSG(Z_MEM_ERROR); + deflateEnd (strm); + return Z_MEM_ERROR; + } +@@ -318,43 +326,70 @@ + uInt dictLength; + { + deflate_state *s; +- uInt length = dictLength; +- uInt n; +- IPos hash_head = 0; ++ uInt str, n; ++ int wrap; ++ unsigned avail; ++ z_const unsigned char *next; + +- if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL || +- strm->state->wrap == 2 || +- (strm->state->wrap == 1 && strm->state->status != INIT_STATE)) ++ if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL) ++ return Z_STREAM_ERROR; ++ s = strm->state; ++ wrap = s->wrap; ++ if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead) + return Z_STREAM_ERROR; + +- s = strm->state; +- if (s->wrap) ++ /* when using zlib wrappers, compute Adler-32 for provided dictionary */ ++ if (wrap == 1) + strm->adler = adler32(strm->adler, dictionary, dictLength); ++ s->wrap = 0; /* avoid computing Adler-32 in read_buf */ + +- if (length < MIN_MATCH) return Z_OK; +- if (length > MAX_DIST(s)) { +- length = MAX_DIST(s); +- dictionary += dictLength - length; /* use the tail of the dictionary */ ++ /* if dictionary would fill window, just replace the history */ ++ if (dictLength >= s->w_size) { ++ if (wrap == 0) { /* already empty otherwise */ ++ CLEAR_HASH(s); ++ s->strstart = 0; ++ s->block_start = 0L; ++ s->insert = 0; ++ } ++ dictionary += dictLength - s->w_size; /* use the tail */ ++ dictLength = s->w_size; + } +- zmemcpy(s->window, dictionary, length); +- s->strstart = length; +- s->block_start = (long)length; + +- /* Insert all strings in the hash table (except for the last two bytes). +- * s->lookahead stays null, so s->ins_h will be recomputed at the next +- * call of fill_window. +- */ +- s->ins_h = s->window[0]; +- UPDATE_HASH(s, s->ins_h, s->window[1]); +- for (n = 0; n <= length - MIN_MATCH; n++) { +- INSERT_STRING(s, n, hash_head); ++ /* insert dictionary into window and hash */ ++ avail = strm->avail_in; ++ next = strm->next_in; ++ strm->avail_in = dictLength; ++ strm->next_in = (z_const Bytef *)dictionary; ++ fill_window(s); ++ while (s->lookahead >= MIN_MATCH) { ++ str = s->strstart; ++ n = s->lookahead - (MIN_MATCH-1); ++ do { ++ UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); ++#ifndef FASTEST ++ s->prev[str & s->w_mask] = s->head[s->ins_h]; ++#endif ++ s->head[s->ins_h] = (Pos)str; ++ str++; ++ } while (--n); ++ s->strstart = str; ++ s->lookahead = MIN_MATCH-1; ++ fill_window(s); + } +- if (hash_head) hash_head = 0; /* to make compiler happy */ ++ s->strstart += s->lookahead; ++ s->block_start = (long)s->strstart; ++ s->insert = s->lookahead; ++ s->lookahead = 0; ++ s->match_length = s->prev_length = MIN_MATCH-1; ++ s->match_available = 0; ++ strm->next_in = next; ++ strm->avail_in = avail; ++ s->wrap = wrap; + return Z_OK; + } + + /* ========================================================================= */ +-int ZEXPORT deflateReset (strm) ++int ZEXPORT deflateResetKeep (strm) + z_streamp strm; + { + deflate_state *s; +@@ -384,12 +419,23 @@ + s->last_flush = Z_NO_FLUSH; + + _tr_init(s); +- lm_init(s); + + return Z_OK; + } + + /* ========================================================================= */ ++int ZEXPORT deflateReset (strm) ++ z_streamp strm; ++{ ++ int ret; ++ ++ ret = deflateResetKeep(strm); ++ if (ret == Z_OK) ++ lm_init(strm->state); ++ return ret; ++} ++ ++/* ========================================================================= */ + int ZEXPORT deflateSetHeader (strm, head) + z_streamp strm; + gz_headerp head; +@@ -401,14 +447,42 @@ + } + + /* ========================================================================= */ ++int ZEXPORT deflatePending (strm, pending, bits) ++ unsigned *pending; ++ int *bits; ++ z_streamp strm; ++{ ++ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; ++ if (pending != Z_NULL) ++ *pending = strm->state->pending; ++ if (bits != Z_NULL) ++ *bits = strm->state->bi_valid; ++ return Z_OK; ++} ++ ++/* ========================================================================= */ + int ZEXPORT deflatePrime (strm, bits, value) + z_streamp strm; + int bits; + int value; + { ++ deflate_state *s; ++ int put; ++ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; +- strm->state->bi_valid = bits; +- strm->state->bi_buf = (ush)(value & ((1 << bits) - 1)); ++ s = strm->state; ++ if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) ++ return Z_BUF_ERROR; ++ do { ++ put = Buf_size - s->bi_valid; ++ if (put > bits) ++ put = bits; ++ s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid); ++ s->bi_valid += put; ++ _tr_flush_bits(s); ++ value >>= put; ++ bits -= put; ++ } while (bits); + return Z_OK; + } + +@@ -435,9 +509,12 @@ + } + func = configuration_table[s->level].func; + +- if (func != configuration_table[level].func && strm->total_in != 0) { ++ if ((strategy != s->strategy || func != configuration_table[level].func) && ++ strm->total_in != 0) { + /* Flush the last buffer: */ +- err = deflate(strm, Z_PARTIAL_FLUSH); ++ err = deflate(strm, Z_BLOCK); ++ if (err == Z_BUF_ERROR && s->pending == 0) ++ err = Z_OK; + } + if (s->level != level) { + s->level = level; +@@ -481,33 +558,66 @@ + * resulting from using fixed blocks instead of stored blocks, which deflate + * can emit on compressed data for some combinations of the parameters. + * +- * This function could be more sophisticated to provide closer upper bounds +- * for every combination of windowBits and memLevel, as well as wrap. +- * But even the conservative upper bound of about 14% expansion does not +- * seem onerous for output buffer allocation. ++ * This function could be more sophisticated to provide closer upper bounds for ++ * every combination of windowBits and memLevel. But even the conservative ++ * upper bound of about 14% expansion does not seem onerous for output buffer ++ * allocation. + */ + uLong ZEXPORT deflateBound(strm, sourceLen) + z_streamp strm; + uLong sourceLen; + { + deflate_state *s; +- uLong destLen; ++ uLong complen, wraplen; ++ Bytef *str; + +- /* conservative upper bound */ +- destLen = sourceLen + +- ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11; ++ /* conservative upper bound for compressed data */ ++ complen = sourceLen + ++ ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; + +- /* if can't get parameters, return conservative bound */ ++ /* if can't get parameters, return conservative bound plus zlib wrapper */ + if (strm == Z_NULL || strm->state == Z_NULL) +- return destLen; ++ return complen + 6; ++ ++ /* compute wrapper length */ ++ s = strm->state; ++ switch (s->wrap) { ++ case 0: /* raw deflate */ ++ wraplen = 0; ++ break; ++ case 1: /* zlib wrapper */ ++ wraplen = 6 + (s->strstart ? 4 : 0); ++ break; ++ case 2: /* gzip wrapper */ ++ wraplen = 18; ++ if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ ++ if (s->gzhead->extra != Z_NULL) ++ wraplen += 2 + s->gzhead->extra_len; ++ str = s->gzhead->name; ++ if (str != Z_NULL) ++ do { ++ wraplen++; ++ } while (*str++); ++ str = s->gzhead->comment; ++ if (str != Z_NULL) ++ do { ++ wraplen++; ++ } while (*str++); ++ if (s->gzhead->hcrc) ++ wraplen += 2; ++ } ++ break; ++ default: /* for compiler happiness */ ++ wraplen = 6; ++ } + + /* if not default parameters, return conservative bound */ +- s = strm->state; + if (s->w_bits != 15 || s->hash_bits != 8 + 7) +- return destLen; ++ return complen + wraplen; + + /* default settings: return tight bound for that case */ +- return compressBound(sourceLen); ++ return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + ++ (sourceLen >> 25) + 13 - 6 + wraplen; + } + + /* ========================================================================= +@@ -532,19 +642,22 @@ + local void flush_pending(strm) + z_streamp strm; + { +- unsigned len = strm->state->pending; ++ unsigned len; ++ deflate_state *s = strm->state; + ++ _tr_flush_bits(s); ++ len = s->pending; + if (len > strm->avail_out) len = strm->avail_out; + if (len == 0) return; + +- zmemcpy(strm->next_out, strm->state->pending_out, len); ++ zmemcpy(strm->next_out, s->pending_out, len); + strm->next_out += len; +- strm->state->pending_out += len; ++ s->pending_out += len; + strm->total_out += len; + strm->avail_out -= len; +- strm->state->pending -= len; +- if (strm->state->pending == 0) { +- strm->state->pending_out = strm->state->pending_buf; ++ s->pending -= len; ++ if (s->pending == 0) { ++ s->pending_out = s->pending_buf; + } + } + +@@ -557,7 +670,7 @@ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL || +- flush > Z_FINISH || flush < 0) { ++ flush > Z_BLOCK || flush < 0) { + return Z_STREAM_ERROR; + } + s = strm->state; +@@ -581,7 +694,7 @@ + put_byte(s, 31); + put_byte(s, 139); + put_byte(s, 8); +- if (s->gzhead == NULL) { ++ if (s->gzhead == Z_NULL) { + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); +@@ -608,7 +721,7 @@ + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, s->gzhead->os & 0xff); +- if (s->gzhead->extra != NULL) { ++ if (s->gzhead->extra != Z_NULL) { + put_byte(s, s->gzhead->extra_len & 0xff); + put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); + } +@@ -650,7 +763,7 @@ + } + #ifdef GZIP + if (s->status == EXTRA_STATE) { +- if (s->gzhead->extra != NULL) { ++ if (s->gzhead->extra != Z_NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + + while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { +@@ -678,7 +791,7 @@ + s->status = NAME_STATE; + } + if (s->status == NAME_STATE) { +- if (s->gzhead->name != NULL) { ++ if (s->gzhead->name != Z_NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + int val; + +@@ -709,7 +822,7 @@ + s->status = COMMENT_STATE; + } + if (s->status == COMMENT_STATE) { +- if (s->gzhead->comment != NULL) { ++ if (s->gzhead->comment != Z_NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + int val; + +@@ -771,7 +884,7 @@ + * flushes. For repeated and useless calls with Z_FINISH, we keep + * returning Z_STREAM_END instead of Z_BUF_ERROR. + */ +- } else if (strm->avail_in == 0 && flush <= old_flush && ++ } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) && + flush != Z_FINISH) { + ERR_RETURN(strm, Z_BUF_ERROR); + } +@@ -787,7 +900,9 @@ + (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { + block_state bstate; + +- bstate = (*(configuration_table[s->level].func))(s, flush); ++ bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : ++ (s->strategy == Z_RLE ? deflate_rle(s, flush) : ++ (*(configuration_table[s->level].func))(s, flush)); + + if (bstate == finish_started || bstate == finish_done) { + s->status = FINISH_STATE; +@@ -808,13 +923,18 @@ + if (bstate == block_done) { + if (flush == Z_PARTIAL_FLUSH) { + _tr_align(s); +- } else { /* FULL_FLUSH or SYNC_FLUSH */ ++ } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */ + _tr_stored_block(s, (char*)0, 0L, 0); + /* For a full flush, this empty block will be recognized + * as a special marker by inflate_sync(). + */ + if (flush == Z_FULL_FLUSH) { + CLEAR_HASH(s); /* forget history */ ++ if (s->lookahead == 0) { ++ s->strstart = 0; ++ s->block_start = 0L; ++ s->insert = 0; ++ } + } + } + flush_pending(strm); +@@ -909,12 +1029,12 @@ + + ss = source->state; + +- zmemcpy(dest, source, sizeof(z_stream)); ++ zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); + + ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); + if (ds == Z_NULL) return Z_MEM_ERROR; + dest->state = (struct internal_state FAR *) ds; +- zmemcpy(ds, ss, sizeof(deflate_state)); ++ zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state)); + ds->strm = dest; + + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); +@@ -930,8 +1050,8 @@ + } + /* following zmemcpy do not work for 16-bit MSDOS */ + zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte)); +- zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos)); +- zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos)); ++ zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos)); ++ zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos)); + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); +@@ -965,15 +1085,15 @@ + + strm->avail_in -= len; + ++ zmemcpy(buf, strm->next_in, len); + if (strm->state->wrap == 1) { +- strm->adler = adler32(strm->adler, strm->next_in, len); ++ strm->adler = adler32(strm->adler, buf, len); + } + #ifdef GZIP + else if (strm->state->wrap == 2) { +- strm->adler = crc32(strm->adler, strm->next_in, len); ++ strm->adler = crc32(strm->adler, buf, len); + } + #endif +- zmemcpy(buf, strm->next_in, len); + strm->next_in += len; + strm->total_in += len; + +@@ -1000,6 +1120,7 @@ + s->strstart = 0; + s->block_start = 0L; + s->lookahead = 0; ++ s->insert = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + s->ins_h = 0; +@@ -1167,12 +1288,13 @@ + return s->lookahead; + } + #endif /* ASMV */ +-#endif /* FASTEST */ ++ ++#else /* FASTEST */ + + /* --------------------------------------------------------------------------- +- * Optimized version for level == 1 or strategy == Z_RLE only ++ * Optimized version for FASTEST only + */ +-local uInt longest_match_fast(s, cur_match) ++local uInt longest_match(s, cur_match) + deflate_state *s; + IPos cur_match; /* current match */ + { +@@ -1225,6 +1347,8 @@ + return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; + } + ++#endif /* FASTEST */ ++ + #ifdef DEBUG + /* =========================================================================== + * Check that the match at match_start is indeed a match. +@@ -1271,6 +1395,8 @@ + unsigned more; /* Amount of free space at the end of the window. */ + uInt wsize = s->w_size; + ++ Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead"); ++ + do { + more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); + +@@ -1303,7 +1429,6 @@ + later. (Using level 0 permanently is not an optimal usage of + zlib, so we don't care about this pathological case.) + */ +- /* %%% avoid this when Z_RLE */ + n = s->hash_size; + p = &s->head[n]; + do { +@@ -1324,7 +1449,7 @@ + #endif + more += wsize; + } +- if (s->strm->avail_in == 0) return; ++ if (s->strm->avail_in == 0) break; + + /* If there was no sliding: + * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && +@@ -1343,39 +1468,88 @@ + s->lookahead += n; + + /* Initialize the hash value now that we have some input: */ +- if (s->lookahead >= MIN_MATCH) { +- s->ins_h = s->window[s->strstart]; +- UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); ++ if (s->lookahead + s->insert >= MIN_MATCH) { ++ uInt str = s->strstart - s->insert; ++ s->ins_h = s->window[str]; ++ UPDATE_HASH(s, s->ins_h, s->window[str + 1]); + #if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times + #endif ++ while (s->insert) { ++ UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); ++#ifndef FASTEST ++ s->prev[str & s->w_mask] = s->head[s->ins_h]; ++#endif ++ s->head[s->ins_h] = (Pos)str; ++ str++; ++ s->insert--; ++ if (s->lookahead + s->insert < MIN_MATCH) ++ break; ++ } + } + /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, + * but this is not important since only literal bytes will be emitted. + */ + + } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); ++ ++ /* If the WIN_INIT bytes after the end of the current data have never been ++ * written, then zero those bytes in order to avoid memory check reports of ++ * the use of uninitialized (or uninitialised as Julian writes) bytes by ++ * the longest match routines. Update the high water mark for the next ++ * time through here. WIN_INIT is set to MAX_MATCH since the longest match ++ * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. ++ */ ++ if (s->high_water < s->window_size) { ++ ulg curr = s->strstart + (ulg)(s->lookahead); ++ ulg init; ++ ++ if (s->high_water < curr) { ++ /* Previous high water mark below current data -- zero WIN_INIT ++ * bytes or up to end of window, whichever is less. ++ */ ++ init = s->window_size - curr; ++ if (init > WIN_INIT) ++ init = WIN_INIT; ++ zmemzero(s->window + curr, (unsigned)init); ++ s->high_water = curr + init; ++ } ++ else if (s->high_water < (ulg)curr + WIN_INIT) { ++ /* High water mark at or above current data, but below current data ++ * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up ++ * to end of window, whichever is less. ++ */ ++ init = (ulg)curr + WIN_INIT - s->high_water; ++ if (init > s->window_size - s->high_water) ++ init = s->window_size - s->high_water; ++ zmemzero(s->window + s->high_water, (unsigned)init); ++ s->high_water += init; ++ } ++ } ++ ++ Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, ++ "not enough room for search"); + } + + /* =========================================================================== + * Flush the current block, with given end-of-file flag. + * IN assertion: strstart is set to the end of the current match. + */ +-#define FLUSH_BLOCK_ONLY(s, eof) { \ ++#define FLUSH_BLOCK_ONLY(s, last) { \ + _tr_flush_block(s, (s->block_start >= 0L ? \ + (charf *)&s->window[(unsigned)s->block_start] : \ + (charf *)Z_NULL), \ + (ulg)((long)s->strstart - s->block_start), \ +- (eof)); \ ++ (last)); \ + s->block_start = s->strstart; \ + flush_pending(s->strm); \ + Tracev((stderr,"[FLUSH]")); \ + } + + /* Same but force premature exit if necessary. */ +-#define FLUSH_BLOCK(s, eof) { \ +- FLUSH_BLOCK_ONLY(s, eof); \ +- if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \ ++#define FLUSH_BLOCK(s, last) { \ ++ FLUSH_BLOCK_ONLY(s, last); \ ++ if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ + } + + /* =========================================================================== +@@ -1434,8 +1608,14 @@ + FLUSH_BLOCK(s, 0); + } + } +- FLUSH_BLOCK(s, flush == Z_FINISH); +- return flush == Z_FINISH ? finish_done : block_done; ++ s->insert = 0; ++ if (flush == Z_FINISH) { ++ FLUSH_BLOCK(s, 1); ++ return finish_done; ++ } ++ if ((long)s->strstart > s->block_start) ++ FLUSH_BLOCK(s, 0); ++ return block_done; + } + + /* =========================================================================== +@@ -1449,7 +1629,7 @@ + deflate_state *s; + int flush; + { +- IPos hash_head = NIL; /* head of the hash chain */ ++ IPos hash_head; /* head of the hash chain */ + int bflush; /* set if current block must be flushed */ + + for (;;) { +@@ -1469,6 +1649,7 @@ + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ ++ hash_head = NIL; + if (s->lookahead >= MIN_MATCH) { + INSERT_STRING(s, s->strstart, hash_head); + } +@@ -1481,19 +1662,8 @@ + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ +-#ifdef FASTEST +- if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) || +- (s->strategy == Z_RLE && s->strstart - hash_head == 1)) { +- s->match_length = longest_match_fast (s, hash_head); +- } +-#else +- if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) { +- s->match_length = longest_match (s, hash_head); +- } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) { +- s->match_length = longest_match_fast (s, hash_head); +- } +-#endif +- /* longest_match() or longest_match_fast() sets match_start */ ++ s->match_length = longest_match (s, hash_head); ++ /* longest_match() sets match_start */ + } + if (s->match_length >= MIN_MATCH) { + check_match(s, s->strstart, s->match_start, s->match_length); +@@ -1541,8 +1711,14 @@ + } + if (bflush) FLUSH_BLOCK(s, 0); + } +- FLUSH_BLOCK(s, flush == Z_FINISH); +- return flush == Z_FINISH ? finish_done : block_done; ++ s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1; ++ if (flush == Z_FINISH) { ++ FLUSH_BLOCK(s, 1); ++ return finish_done; ++ } ++ if (s->last_lit) ++ FLUSH_BLOCK(s, 0); ++ return block_done; + } + + #ifndef FASTEST +@@ -1555,7 +1731,7 @@ + deflate_state *s; + int flush; + { +- IPos hash_head = NIL; /* head of hash chain */ ++ IPos hash_head; /* head of hash chain */ + int bflush; /* set if current block must be flushed */ + + /* Process the input block. */ +@@ -1576,6 +1752,7 @@ + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ ++ hash_head = NIL; + if (s->lookahead >= MIN_MATCH) { + INSERT_STRING(s, s->strstart, hash_head); + } +@@ -1591,12 +1768,8 @@ + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ +- if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) { +- s->match_length = longest_match (s, hash_head); +- } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) { +- s->match_length = longest_match_fast (s, hash_head); +- } +- /* longest_match() or longest_match_fast() sets match_start */ ++ s->match_length = longest_match (s, hash_head); ++ /* longest_match() sets match_start */ + + if (s->match_length <= 5 && (s->strategy == Z_FILTERED + #if TOO_FAR <= 32767 +@@ -1669,12 +1842,17 @@ + _tr_tally_lit(s, s->window[s->strstart-1], bflush); + s->match_available = 0; + } +- FLUSH_BLOCK(s, flush == Z_FINISH); +- return flush == Z_FINISH ? finish_done : block_done; ++ s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1; ++ if (flush == Z_FINISH) { ++ FLUSH_BLOCK(s, 1); ++ return finish_done; ++ } ++ if (s->last_lit) ++ FLUSH_BLOCK(s, 0); ++ return block_done; + } + #endif /* FASTEST */ + +-#if 0 + /* =========================================================================== + * For Z_RLE, simply look for runs of bytes, generate matches only of distance + * one. Do not maintain a hash table. (It will be regenerated if this run of +@@ -1684,43 +1862,52 @@ + deflate_state *s; + int flush; + { +- int bflush; /* set if current block must be flushed */ +- uInt run; /* length of run */ +- uInt max; /* maximum length of run */ +- uInt prev; /* byte at distance one to match */ +- Bytef *scan; /* scan for end of run */ ++ int bflush; /* set if current block must be flushed */ ++ uInt prev; /* byte at distance one to match */ ++ Bytef *scan, *strend; /* scan goes up to strend for length of run */ + + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes +- * for the longest encodable run. ++ * for the longest run, plus one for the unrolled loop. + */ +- if (s->lookahead < MAX_MATCH) { ++ if (s->lookahead <= MAX_MATCH) { + fill_window(s); +- if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) { ++ if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* See how many times the previous byte repeats */ +- run = 0; +- if (s->strstart > 0) { /* if there is a previous byte, that is */ +- max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH; ++ s->match_length = 0; ++ if (s->lookahead >= MIN_MATCH && s->strstart > 0) { + scan = s->window + s->strstart - 1; +- prev = *scan++; +- do { +- if (*scan++ != prev) +- break; +- } while (++run < max); ++ prev = *scan; ++ if (prev == *++scan && prev == *++scan && prev == *++scan) { ++ strend = s->window + s->strstart + MAX_MATCH; ++ do { ++ } while (prev == *++scan && prev == *++scan && ++ prev == *++scan && prev == *++scan && ++ prev == *++scan && prev == *++scan && ++ prev == *++scan && prev == *++scan && ++ scan < strend); ++ s->match_length = MAX_MATCH - (int)(strend - scan); ++ if (s->match_length > s->lookahead) ++ s->match_length = s->lookahead; ++ } ++ Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan"); + } + + /* Emit match if have run of MIN_MATCH or longer, else emit literal */ +- if (run >= MIN_MATCH) { +- check_match(s, s->strstart, s->strstart - 1, run); +- _tr_tally_dist(s, 1, run - MIN_MATCH, bflush); +- s->lookahead -= run; +- s->strstart += run; ++ if (s->match_length >= MIN_MATCH) { ++ check_match(s, s->strstart, s->strstart - 1, s->match_length); ++ ++ _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush); ++ ++ s->lookahead -= s->match_length; ++ s->strstart += s->match_length; ++ s->match_length = 0; + } else { + /* No match, output a literal byte */ + Tracevv((stderr,"%c", s->window[s->strstart])); +@@ -1730,7 +1917,51 @@ + } + if (bflush) FLUSH_BLOCK(s, 0); + } +- FLUSH_BLOCK(s, flush == Z_FINISH); +- return flush == Z_FINISH ? finish_done : block_done; ++ s->insert = 0; ++ if (flush == Z_FINISH) { ++ FLUSH_BLOCK(s, 1); ++ return finish_done; ++ } ++ if (s->last_lit) ++ FLUSH_BLOCK(s, 0); ++ return block_done; + } +-#endif ++ ++/* =========================================================================== ++ * For Z_HUFFMAN_ONLY, do not look for matches. Do not maintain a hash table. ++ * (It will be regenerated if this run of deflate switches away from Huffman.) ++ */ ++local block_state deflate_huff(s, flush) ++ deflate_state *s; ++ int flush; ++{ ++ int bflush; /* set if current block must be flushed */ ++ ++ for (;;) { ++ /* Make sure that we have a literal to write. */ ++ if (s->lookahead == 0) { ++ fill_window(s); ++ if (s->lookahead == 0) { ++ if (flush == Z_NO_FLUSH) ++ return need_more; ++ break; /* flush the current block */ ++ } ++ } ++ ++ /* Output a literal byte */ ++ s->match_length = 0; ++ Tracevv((stderr,"%c", s->window[s->strstart])); ++ _tr_tally_lit (s, s->window[s->strstart], bflush); ++ s->lookahead--; ++ s->strstart++; ++ if (bflush) FLUSH_BLOCK(s, 0); ++ } ++ s->insert = 0; ++ if (flush == Z_FINISH) { ++ FLUSH_BLOCK(s, 1); ++ return finish_done; ++ } ++ if (s->last_lit) ++ FLUSH_BLOCK(s, 0); ++ return block_done; ++} +diff -r ee879c0ffa11 Modules/zlib/deflate.h +--- a/Modules/zlib/deflate.h ++++ b/Modules/zlib/deflate.h +@@ -1,5 +1,5 @@ + /* deflate.h -- internal compression state +- * Copyright (C) 1995-2004 Jean-loup Gailly ++ * Copyright (C) 1995-2012 Jean-loup Gailly + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -48,6 +48,9 @@ + #define MAX_BITS 15 + /* All codes must not exceed MAX_BITS bits */ + ++#define Buf_size 16 ++/* size of bit buffer in bi_buf */ ++ + #define INIT_STATE 42 + #define EXTRA_STATE 69 + #define NAME_STATE 73 +@@ -101,7 +104,7 @@ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + gz_headerp gzhead; /* gzip header information to write */ + uInt gzindex; /* where in extra, name, or comment */ +- Byte method; /* STORED (for zip only) or DEFLATED */ ++ Byte method; /* can only be DEFLATED */ + int last_flush; /* value of flush param for previous deflate call */ + + /* used by deflate.c: */ +@@ -188,7 +191,7 @@ + int nice_match; /* Stop searching when current match exceeds this */ + + /* used by trees.c: */ +- /* Didn't use ct_data typedef below to supress compiler warning */ ++ /* Didn't use ct_data typedef below to suppress compiler warning */ + struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ + struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ + struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ +@@ -244,7 +247,7 @@ + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ + uInt matches; /* number of string matches in current block */ +- int last_eob_len; /* bit length of EOB code for last block */ ++ uInt insert; /* bytes at end of window left to insert */ + + #ifdef DEBUG + ulg compressed_len; /* total bit length of compressed file mod 2^32 */ +@@ -260,6 +263,13 @@ + * are always zero. + */ + ++ ulg high_water; ++ /* High water mark offset in window for initialized bytes -- bytes above ++ * this are set to zero in order to avoid memory check warnings when ++ * longest match routines access bytes past the input. This is then ++ * updated to the new high water mark. ++ */ ++ + } FAR deflate_state; + + /* Output a byte on the stream. +@@ -278,14 +288,19 @@ + * distances are limited to MAX_DIST instead of WSIZE. + */ + ++#define WIN_INIT MAX_MATCH ++/* Number of bytes after end of data in window to initialize in order to avoid ++ memory checker errors from longest match routines */ ++ + /* in trees.c */ +-void _tr_init OF((deflate_state *s)); +-int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); +-void _tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len, +- int eof)); +-void _tr_align OF((deflate_state *s)); +-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len, +- int eof)); ++void ZLIB_INTERNAL _tr_init OF((deflate_state *s)); ++int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); ++void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf, ++ ulg stored_len, int last)); ++void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s)); ++void ZLIB_INTERNAL _tr_align OF((deflate_state *s)); ++void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, ++ ulg stored_len, int last)); + + #define d_code(dist) \ + ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) +@@ -298,11 +313,11 @@ + /* Inline versions of _tr_tally for speed: */ + + #if defined(GEN_TREES_H) || !defined(STDC) +- extern uch _length_code[]; +- extern uch _dist_code[]; ++ extern uch ZLIB_INTERNAL _length_code[]; ++ extern uch ZLIB_INTERNAL _dist_code[]; + #else +- extern const uch _length_code[]; +- extern const uch _dist_code[]; ++ extern const uch ZLIB_INTERNAL _length_code[]; ++ extern const uch ZLIB_INTERNAL _dist_code[]; + #endif + + # define _tr_tally_lit(s, c, flush) \ +diff -r ee879c0ffa11 Modules/zlib/example.c +--- a/Modules/zlib/example.c ++++ b/Modules/zlib/example.c +@@ -1,12 +1,12 @@ + /* example.c -- usage example of the zlib compression library +- * Copyright (C) 1995-2004 Jean-loup Gailly. ++ * Copyright (C) 1995-2006, 2011 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* @(#) $Id$ */ + ++#include "zlib.h" + #include +-#include "zlib.h" + + #ifdef STDC + # include +@@ -26,7 +26,7 @@ + } \ + } + +-const char hello[] = "hello, hello!"; ++z_const char hello[] = "hello, hello!"; + /* "hello world" would be more standard, but the repeated "hello" + * stresses the compression code better, sorry... + */ +@@ -34,10 +34,6 @@ + const char dictionary[] = "hello"; + uLong dictId; /* Adler32 value of the dictionary */ + +-void test_compress OF((Byte *compr, uLong comprLen, +- Byte *uncompr, uLong uncomprLen)); +-void test_gzio OF((const char *fname, +- Byte *uncompr, uLong uncomprLen)); + void test_deflate OF((Byte *compr, uLong comprLen)); + void test_inflate OF((Byte *compr, uLong comprLen, + Byte *uncompr, uLong uncomprLen)); +@@ -53,6 +49,39 @@ + Byte *uncompr, uLong uncomprLen)); + int main OF((int argc, char *argv[])); + ++ ++#ifdef Z_SOLO ++ ++void *myalloc OF((void *, unsigned, unsigned)); ++void myfree OF((void *, void *)); ++ ++void *myalloc(q, n, m) ++ void *q; ++ unsigned n, m; ++{ ++ q = Z_NULL; ++ return calloc(n, m); ++} ++ ++void myfree(void *q, void *p) ++{ ++ q = Z_NULL; ++ free(p); ++} ++ ++static alloc_func zalloc = myalloc; ++static free_func zfree = myfree; ++ ++#else /* !Z_SOLO */ ++ ++static alloc_func zalloc = (alloc_func)0; ++static free_func zfree = (free_func)0; ++ ++void test_compress OF((Byte *compr, uLong comprLen, ++ Byte *uncompr, uLong uncomprLen)); ++void test_gzio OF((const char *fname, ++ Byte *uncompr, uLong uncomprLen)); ++ + /* =========================================================================== + * Test compress() and uncompress() + */ +@@ -163,6 +192,8 @@ + #endif + } + ++#endif /* Z_SOLO */ ++ + /* =========================================================================== + * Test deflate() with small buffers + */ +@@ -174,14 +205,14 @@ + int err; + uLong len = (uLong)strlen(hello)+1; + +- c_stream.zalloc = (alloc_func)0; +- c_stream.zfree = (free_func)0; ++ c_stream.zalloc = zalloc; ++ c_stream.zfree = zfree; + c_stream.opaque = (voidpf)0; + + err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); + CHECK_ERR(err, "deflateInit"); + +- c_stream.next_in = (Bytef*)hello; ++ c_stream.next_in = (z_const unsigned char *)hello; + c_stream.next_out = compr; + + while (c_stream.total_in != len && c_stream.total_out < comprLen) { +@@ -213,8 +244,8 @@ + + strcpy((char*)uncompr, "garbage"); + +- d_stream.zalloc = (alloc_func)0; +- d_stream.zfree = (free_func)0; ++ d_stream.zalloc = zalloc; ++ d_stream.zfree = zfree; + d_stream.opaque = (voidpf)0; + + d_stream.next_in = compr; +@@ -252,8 +283,8 @@ + z_stream c_stream; /* compression stream */ + int err; + +- c_stream.zalloc = (alloc_func)0; +- c_stream.zfree = (free_func)0; ++ c_stream.zalloc = zalloc; ++ c_stream.zfree = zfree; + c_stream.opaque = (voidpf)0; + + err = deflateInit(&c_stream, Z_BEST_SPEED); +@@ -309,8 +340,8 @@ + + strcpy((char*)uncompr, "garbage"); + +- d_stream.zalloc = (alloc_func)0; +- d_stream.zfree = (free_func)0; ++ d_stream.zalloc = zalloc; ++ d_stream.zfree = zfree; + d_stream.opaque = (voidpf)0; + + d_stream.next_in = compr; +@@ -349,14 +380,14 @@ + int err; + uInt len = (uInt)strlen(hello)+1; + +- c_stream.zalloc = (alloc_func)0; +- c_stream.zfree = (free_func)0; ++ c_stream.zalloc = zalloc; ++ c_stream.zfree = zfree; + c_stream.opaque = (voidpf)0; + + err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); + CHECK_ERR(err, "deflateInit"); + +- c_stream.next_in = (Bytef*)hello; ++ c_stream.next_in = (z_const unsigned char *)hello; + c_stream.next_out = compr; + c_stream.avail_in = 3; + c_stream.avail_out = (uInt)*comprLen; +@@ -388,8 +419,8 @@ + + strcpy((char*)uncompr, "garbage"); + +- d_stream.zalloc = (alloc_func)0; +- d_stream.zfree = (free_func)0; ++ d_stream.zalloc = zalloc; ++ d_stream.zfree = zfree; + d_stream.opaque = (voidpf)0; + + d_stream.next_in = compr; +@@ -430,22 +461,22 @@ + z_stream c_stream; /* compression stream */ + int err; + +- c_stream.zalloc = (alloc_func)0; +- c_stream.zfree = (free_func)0; ++ c_stream.zalloc = zalloc; ++ c_stream.zfree = zfree; + c_stream.opaque = (voidpf)0; + + err = deflateInit(&c_stream, Z_BEST_COMPRESSION); + CHECK_ERR(err, "deflateInit"); + + err = deflateSetDictionary(&c_stream, +- (const Bytef*)dictionary, sizeof(dictionary)); ++ (const Bytef*)dictionary, (int)sizeof(dictionary)); + CHECK_ERR(err, "deflateSetDictionary"); + + dictId = c_stream.adler; + c_stream.next_out = compr; + c_stream.avail_out = (uInt)comprLen; + +- c_stream.next_in = (Bytef*)hello; ++ c_stream.next_in = (z_const unsigned char *)hello; + c_stream.avail_in = (uInt)strlen(hello)+1; + + err = deflate(&c_stream, Z_FINISH); +@@ -469,8 +500,8 @@ + + strcpy((char*)uncompr, "garbage"); + +- d_stream.zalloc = (alloc_func)0; +- d_stream.zfree = (free_func)0; ++ d_stream.zalloc = zalloc; ++ d_stream.zfree = zfree; + d_stream.opaque = (voidpf)0; + + d_stream.next_in = compr; +@@ -491,7 +522,7 @@ + exit(1); + } + err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary, +- sizeof(dictionary)); ++ (int)sizeof(dictionary)); + } + CHECK_ERR(err, "inflate with dict"); + } +@@ -540,10 +571,15 @@ + printf("out of memory\n"); + exit(1); + } ++ ++#ifdef Z_SOLO ++ argc = strlen(argv[0]); ++#else + test_compress(compr, comprLen, uncompr, uncomprLen); + + test_gzio((argc > 1 ? argv[1] : TESTFILE), + uncompr, uncomprLen); ++#endif + + test_deflate(compr, comprLen); + test_inflate(compr, comprLen, uncompr, uncomprLen); +diff -r ee879c0ffa11 Modules/zlib/gzclose.c +--- /dev/null ++++ b/Modules/zlib/gzclose.c +@@ -0,0 +1,25 @@ ++/* gzclose.c -- zlib gzclose() function ++ * Copyright (C) 2004, 2010 Mark Adler ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++#include "gzguts.h" ++ ++/* gzclose() is in a separate file so that it is linked in only if it is used. ++ That way the other gzclose functions can be used instead to avoid linking in ++ unneeded compression or decompression routines. */ ++int ZEXPORT gzclose(file) ++ gzFile file; ++{ ++#ifndef NO_GZCOMPRESS ++ gz_statep state; ++ ++ if (file == NULL) ++ return Z_STREAM_ERROR; ++ state = (gz_statep)file; ++ ++ return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file); ++#else ++ return gzclose_r(file); ++#endif ++} +diff -r ee879c0ffa11 Modules/zlib/gzguts.h +--- /dev/null ++++ b/Modules/zlib/gzguts.h +@@ -0,0 +1,209 @@ ++/* gzguts.h -- zlib internal header definitions for gz* operations ++ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++#ifdef _LARGEFILE64_SOURCE ++# ifndef _LARGEFILE_SOURCE ++# define _LARGEFILE_SOURCE 1 ++# endif ++# ifdef _FILE_OFFSET_BITS ++# undef _FILE_OFFSET_BITS ++# endif ++#endif ++ ++#ifdef HAVE_HIDDEN ++# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) ++#else ++# define ZLIB_INTERNAL ++#endif ++ ++#include ++#include "zlib.h" ++#ifdef STDC ++# include ++# include ++# include ++#endif ++#include ++ ++#ifdef _WIN32 ++# include ++#endif ++ ++#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) ++# include ++#endif ++ ++#ifdef WINAPI_FAMILY ++# define open _open ++# define read _read ++# define write _write ++# define close _close ++#endif ++ ++#ifdef NO_DEFLATE /* for compatibility with old definition */ ++# define NO_GZCOMPRESS ++#endif ++ ++#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) ++# ifndef HAVE_VSNPRINTF ++# define HAVE_VSNPRINTF ++# endif ++#endif ++ ++#if defined(__CYGWIN__) ++# ifndef HAVE_VSNPRINTF ++# define HAVE_VSNPRINTF ++# endif ++#endif ++ ++#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410) ++# ifndef HAVE_VSNPRINTF ++# define HAVE_VSNPRINTF ++# endif ++#endif ++ ++#ifndef HAVE_VSNPRINTF ++# ifdef MSDOS ++/* vsnprintf may exist on some MS-DOS compilers (DJGPP?), ++ but for now we just assume it doesn't. */ ++# define NO_vsnprintf ++# endif ++# ifdef __TURBOC__ ++# define NO_vsnprintf ++# endif ++# ifdef WIN32 ++/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ ++# if !defined(vsnprintf) && !defined(NO_vsnprintf) ++# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 ) ++# define vsnprintf _vsnprintf ++# endif ++# endif ++# endif ++# ifdef __SASC ++# define NO_vsnprintf ++# endif ++# ifdef VMS ++# define NO_vsnprintf ++# endif ++# ifdef __OS400__ ++# define NO_vsnprintf ++# endif ++# ifdef __MVS__ ++# define NO_vsnprintf ++# endif ++#endif ++ ++/* unlike snprintf (which is required in C99, yet still not supported by ++ Microsoft more than a decade later!), _snprintf does not guarantee null ++ termination of the result -- however this is only used in gzlib.c where ++ the result is assured to fit in the space provided */ ++#ifdef _MSC_VER ++# define snprintf _snprintf ++#endif ++ ++#ifndef local ++# define local static ++#endif ++/* compile with -Dlocal if your debugger can't find static symbols */ ++ ++/* gz* functions always use library allocation functions */ ++#ifndef STDC ++ extern voidp malloc OF((uInt size)); ++ extern void free OF((voidpf ptr)); ++#endif ++ ++/* get errno and strerror definition */ ++#if defined UNDER_CE ++# include ++# define zstrerror() gz_strwinerror((DWORD)GetLastError()) ++#else ++# ifndef NO_STRERROR ++# include ++# define zstrerror() strerror(errno) ++# else ++# define zstrerror() "stdio error (consult errno)" ++# endif ++#endif ++ ++/* provide prototypes for these when building zlib without LFS */ ++#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 ++ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); ++ ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); ++ ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); ++ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); ++#endif ++ ++/* default memLevel */ ++#if MAX_MEM_LEVEL >= 8 ++# define DEF_MEM_LEVEL 8 ++#else ++# define DEF_MEM_LEVEL MAX_MEM_LEVEL ++#endif ++ ++/* default i/o buffer size -- double this for output when reading (this and ++ twice this must be able to fit in an unsigned type) */ ++#define GZBUFSIZE 8192 ++ ++/* gzip modes, also provide a little integrity check on the passed structure */ ++#define GZ_NONE 0 ++#define GZ_READ 7247 ++#define GZ_WRITE 31153 ++#define GZ_APPEND 1 /* mode set to GZ_WRITE after the file is opened */ ++ ++/* values for gz_state how */ ++#define LOOK 0 /* look for a gzip header */ ++#define COPY 1 /* copy input directly */ ++#define GZIP 2 /* decompress a gzip stream */ ++ ++/* internal gzip file state data structure */ ++typedef struct { ++ /* exposed contents for gzgetc() macro */ ++ struct gzFile_s x; /* "x" for exposed */ ++ /* x.have: number of bytes available at x.next */ ++ /* x.next: next output data to deliver or write */ ++ /* x.pos: current position in uncompressed data */ ++ /* used for both reading and writing */ ++ int mode; /* see gzip modes above */ ++ int fd; /* file descriptor */ ++ char *path; /* path or fd for error messages */ ++ unsigned size; /* buffer size, zero if not allocated yet */ ++ unsigned want; /* requested buffer size, default is GZBUFSIZE */ ++ unsigned char *in; /* input buffer */ ++ unsigned char *out; /* output buffer (double-sized when reading) */ ++ int direct; /* 0 if processing gzip, 1 if transparent */ ++ /* just for reading */ ++ int how; /* 0: get header, 1: copy, 2: decompress */ ++ z_off64_t start; /* where the gzip data started, for rewinding */ ++ int eof; /* true if end of input file reached */ ++ int past; /* true if read requested past end */ ++ /* just for writing */ ++ int level; /* compression level */ ++ int strategy; /* compression strategy */ ++ /* seek request */ ++ z_off64_t skip; /* amount to skip (already rewound if backwards) */ ++ int seek; /* true if seek request pending */ ++ /* error information */ ++ int err; /* error code */ ++ char *msg; /* error message */ ++ /* zlib inflate or deflate stream */ ++ z_stream strm; /* stream structure in-place (not a pointer) */ ++} gz_state; ++typedef gz_state FAR *gz_statep; ++ ++/* shared functions */ ++void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *)); ++#if defined UNDER_CE ++char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error)); ++#endif ++ ++/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t ++ value -- needed when comparing unsigned to z_off64_t, which is signed ++ (possible z_off64_t types off_t, off64_t, and long are all signed) */ ++#ifdef INT_MAX ++# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX) ++#else ++unsigned ZLIB_INTERNAL gz_intmax OF((void)); ++# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) ++#endif +diff -r ee879c0ffa11 Modules/zlib/gzio.c +--- a/Modules/zlib/gzio.c ++++ /dev/null +@@ -1,1026 +0,0 @@ +-/* gzio.c -- IO on .gz files +- * Copyright (C) 1995-2005 Jean-loup Gailly. +- * For conditions of distribution and use, see copyright notice in zlib.h +- * +- * Compile this file with -DNO_GZCOMPRESS to avoid the compression code. +- */ +- +-/* @(#) $Id$ */ +- +-#include +- +-#include "zutil.h" +- +-#ifdef NO_DEFLATE /* for compatibility with old definition */ +-# define NO_GZCOMPRESS +-#endif +- +-#ifndef NO_DUMMY_DECL +-struct internal_state {int dummy;}; /* for buggy compilers */ +-#endif +- +-#ifndef Z_BUFSIZE +-# ifdef MAXSEG_64K +-# define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */ +-# else +-# define Z_BUFSIZE 16384 +-# endif +-#endif +-#ifndef Z_PRINTF_BUFSIZE +-# define Z_PRINTF_BUFSIZE 4096 +-#endif +- +-#ifdef __MVS__ +-# pragma map (fdopen , "\174\174FDOPEN") +- FILE *fdopen(int, const char *); +-#endif +- +-#ifndef STDC +-extern voidp malloc OF((uInt size)); +-extern void free OF((voidpf ptr)); +-#endif +- +-#define ALLOC(size) malloc(size) +-#define TRYFREE(p) {if (p) free(p);} +- +-static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ +- +-/* gzip flag byte */ +-#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +-#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */ +-#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ +-#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ +-#define COMMENT 0x10 /* bit 4 set: file comment present */ +-#define RESERVED 0xE0 /* bits 5..7: reserved */ +- +-typedef struct gz_stream { +- z_stream stream; +- int z_err; /* error code for last stream operation */ +- int z_eof; /* set if end of input file */ +- FILE *file; /* .gz file */ +- Byte *inbuf; /* input buffer */ +- Byte *outbuf; /* output buffer */ +- uLong crc; /* crc32 of uncompressed data */ +- char *msg; /* error message */ +- char *path; /* path name for debugging only */ +- int transparent; /* 1 if input file is not a .gz file */ +- char mode; /* 'w' or 'r' */ +- z_off_t start; /* start of compressed data in file (header skipped) */ +- z_off_t in; /* bytes into deflate or inflate */ +- z_off_t out; /* bytes out of deflate or inflate */ +- int back; /* one character push-back */ +- int last; /* true if push-back is last character */ +-} gz_stream; +- +- +-local gzFile gz_open OF((const char *path, const char *mode, int fd)); +-local int do_flush OF((gzFile file, int flush)); +-local int get_byte OF((gz_stream *s)); +-local void check_header OF((gz_stream *s)); +-local int destroy OF((gz_stream *s)); +-local void putLong OF((FILE *file, uLong x)); +-local uLong getLong OF((gz_stream *s)); +- +-/* =========================================================================== +- Opens a gzip (.gz) file for reading or writing. The mode parameter +- is as in fopen ("rb" or "wb"). The file is given either by file descriptor +- or path name (if fd == -1). +- gz_open returns NULL if the file could not be opened or if there was +- insufficient memory to allocate the (de)compression state; errno +- can be checked to distinguish the two cases (if errno is zero, the +- zlib error is Z_MEM_ERROR). +-*/ +-local gzFile gz_open (path, mode, fd) +- const char *path; +- const char *mode; +- int fd; +-{ +- int err; +- int level = Z_DEFAULT_COMPRESSION; /* compression level */ +- int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */ +- char *p = (char*)mode; +- gz_stream *s; +- char fmode[80]; /* copy of mode, without the compression level */ +- char *m = fmode; +- +- if (!path || !mode) return Z_NULL; +- +- s = (gz_stream *)ALLOC(sizeof(gz_stream)); +- if (!s) return Z_NULL; +- +- s->stream.zalloc = (alloc_func)0; +- s->stream.zfree = (free_func)0; +- s->stream.opaque = (voidpf)0; +- s->stream.next_in = s->inbuf = Z_NULL; +- s->stream.next_out = s->outbuf = Z_NULL; +- s->stream.avail_in = s->stream.avail_out = 0; +- s->file = NULL; +- s->z_err = Z_OK; +- s->z_eof = 0; +- s->in = 0; +- s->out = 0; +- s->back = EOF; +- s->crc = crc32(0L, Z_NULL, 0); +- s->msg = NULL; +- s->transparent = 0; +- +- s->path = (char*)ALLOC(strlen(path)+1); +- if (s->path == NULL) { +- return destroy(s), (gzFile)Z_NULL; +- } +- strcpy(s->path, path); /* do this early for debugging */ +- +- s->mode = '\0'; +- do { +- if (*p == 'r') s->mode = 'r'; +- if (*p == 'w' || *p == 'a') s->mode = 'w'; +- if (*p >= '0' && *p <= '9') { +- level = *p - '0'; +- } else if (*p == 'f') { +- strategy = Z_FILTERED; +- } else if (*p == 'h') { +- strategy = Z_HUFFMAN_ONLY; +- } else if (*p == 'R') { +- strategy = Z_RLE; +- } else { +- *m++ = *p; /* copy the mode */ +- } +- } while (*p++ && m != fmode + sizeof(fmode)); +- if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL; +- +- if (s->mode == 'w') { +-#ifdef NO_GZCOMPRESS +- err = Z_STREAM_ERROR; +-#else +- err = deflateInit2(&(s->stream), level, +- Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy); +- /* windowBits is passed < 0 to suppress zlib header */ +- +- s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); +-#endif +- if (err != Z_OK || s->outbuf == Z_NULL) { +- return destroy(s), (gzFile)Z_NULL; +- } +- } else { +- s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); +- +- err = inflateInit2(&(s->stream), -MAX_WBITS); +- /* windowBits is passed < 0 to tell that there is no zlib header. +- * Note that in this case inflate *requires* an extra "dummy" byte +- * after the compressed stream in order to complete decompression and +- * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are +- * present after the compressed stream. +- */ +- if (err != Z_OK || s->inbuf == Z_NULL) { +- return destroy(s), (gzFile)Z_NULL; +- } +- } +- s->stream.avail_out = Z_BUFSIZE; +- +- errno = 0; +- s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode); +- +- if (s->file == NULL) { +- return destroy(s), (gzFile)Z_NULL; +- } +- if (s->mode == 'w') { +- /* Write a very simple .gz header: +- */ +- fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], +- Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE); +- s->start = 10L; +- /* We use 10L instead of ftell(s->file) to because ftell causes an +- * fflush on some systems. This version of the library doesn't use +- * start anyway in write mode, so this initialization is not +- * necessary. +- */ +- } else { +- check_header(s); /* skip the .gz header */ +- s->start = ftell(s->file) - s->stream.avail_in; +- } +- +- return (gzFile)s; +-} +- +-/* =========================================================================== +- Opens a gzip (.gz) file for reading or writing. +-*/ +-gzFile ZEXPORT gzopen (path, mode) +- const char *path; +- const char *mode; +-{ +- return gz_open (path, mode, -1); +-} +- +-/* =========================================================================== +- Associate a gzFile with the file descriptor fd. fd is not dup'ed here +- to mimic the behavio(u)r of fdopen. +-*/ +-gzFile ZEXPORT gzdopen (fd, mode) +- int fd; +- const char *mode; +-{ +- char name[46]; /* allow for up to 128-bit integers */ +- +- if (fd < 0) return (gzFile)Z_NULL; +- sprintf(name, "", fd); /* for debugging */ +- +- return gz_open (name, mode, fd); +-} +- +-/* =========================================================================== +- * Update the compression level and strategy +- */ +-int ZEXPORT gzsetparams (file, level, strategy) +- gzFile file; +- int level; +- int strategy; +-{ +- gz_stream *s = (gz_stream*)file; +- +- if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; +- +- /* Make room to allow flushing */ +- if (s->stream.avail_out == 0) { +- +- s->stream.next_out = s->outbuf; +- if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { +- s->z_err = Z_ERRNO; +- } +- s->stream.avail_out = Z_BUFSIZE; +- } +- +- return deflateParams (&(s->stream), level, strategy); +-} +- +-/* =========================================================================== +- Read a byte from a gz_stream; update next_in and avail_in. Return EOF +- for end of file. +- IN assertion: the stream s has been sucessfully opened for reading. +-*/ +-local int get_byte(s) +- gz_stream *s; +-{ +- if (s->z_eof) return EOF; +- if (s->stream.avail_in == 0) { +- errno = 0; +- s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file); +- if (s->stream.avail_in == 0) { +- s->z_eof = 1; +- if (ferror(s->file)) s->z_err = Z_ERRNO; +- return EOF; +- } +- s->stream.next_in = s->inbuf; +- } +- s->stream.avail_in--; +- return *(s->stream.next_in)++; +-} +- +-/* =========================================================================== +- Check the gzip header of a gz_stream opened for reading. Set the stream +- mode to transparent if the gzip magic header is not present; set s->err +- to Z_DATA_ERROR if the magic header is present but the rest of the header +- is incorrect. +- IN assertion: the stream s has already been created sucessfully; +- s->stream.avail_in is zero for the first time, but may be non-zero +- for concatenated .gz files. +-*/ +-local void check_header(s) +- gz_stream *s; +-{ +- int method; /* method byte */ +- int flags; /* flags byte */ +- uInt len; +- int c; +- +- /* Assure two bytes in the buffer so we can peek ahead -- handle case +- where first byte of header is at the end of the buffer after the last +- gzip segment */ +- len = s->stream.avail_in; +- if (len < 2) { +- if (len) s->inbuf[0] = s->stream.next_in[0]; +- errno = 0; +- len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file); +- if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO; +- s->stream.avail_in += len; +- s->stream.next_in = s->inbuf; +- if (s->stream.avail_in < 2) { +- s->transparent = s->stream.avail_in; +- return; +- } +- } +- +- /* Peek ahead to check the gzip magic header */ +- if (s->stream.next_in[0] != gz_magic[0] || +- s->stream.next_in[1] != gz_magic[1]) { +- s->transparent = 1; +- return; +- } +- s->stream.avail_in -= 2; +- s->stream.next_in += 2; +- +- /* Check the rest of the gzip header */ +- method = get_byte(s); +- flags = get_byte(s); +- if (method != Z_DEFLATED || (flags & RESERVED) != 0) { +- s->z_err = Z_DATA_ERROR; +- return; +- } +- +- /* Discard time, xflags and OS code: */ +- for (len = 0; len < 6; len++) (void)get_byte(s); +- +- if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */ +- len = (uInt)get_byte(s); +- len += ((uInt)get_byte(s))<<8; +- /* len is garbage if EOF but the loop below will quit anyway */ +- while (len-- != 0 && get_byte(s) != EOF) ; +- } +- if ((flags & ORIG_NAME) != 0) { /* skip the original file name */ +- while ((c = get_byte(s)) != 0 && c != EOF) ; +- } +- if ((flags & COMMENT) != 0) { /* skip the .gz file comment */ +- while ((c = get_byte(s)) != 0 && c != EOF) ; +- } +- if ((flags & HEAD_CRC) != 0) { /* skip the header crc */ +- for (len = 0; len < 2; len++) (void)get_byte(s); +- } +- s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK; +-} +- +- /* =========================================================================== +- * Cleanup then free the given gz_stream. Return a zlib error code. +- Try freeing in the reverse order of allocations. +- */ +-local int destroy (s) +- gz_stream *s; +-{ +- int err = Z_OK; +- +- if (!s) return Z_STREAM_ERROR; +- +- TRYFREE(s->msg); +- +- if (s->stream.state != NULL) { +- if (s->mode == 'w') { +-#ifdef NO_GZCOMPRESS +- err = Z_STREAM_ERROR; +-#else +- err = deflateEnd(&(s->stream)); +-#endif +- } else if (s->mode == 'r') { +- err = inflateEnd(&(s->stream)); +- } +- } +- if (s->file != NULL && fclose(s->file)) { +-#ifdef ESPIPE +- if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */ +-#endif +- err = Z_ERRNO; +- } +- if (s->z_err < 0) err = s->z_err; +- +- TRYFREE(s->inbuf); +- TRYFREE(s->outbuf); +- TRYFREE(s->path); +- TRYFREE(s); +- return err; +-} +- +-/* =========================================================================== +- Reads the given number of uncompressed bytes from the compressed file. +- gzread returns the number of bytes actually read (0 for end of file). +-*/ +-int ZEXPORT gzread (file, buf, len) +- gzFile file; +- voidp buf; +- unsigned len; +-{ +- gz_stream *s = (gz_stream*)file; +- Bytef *start = (Bytef*)buf; /* starting point for crc computation */ +- Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */ +- +- if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR; +- +- if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1; +- if (s->z_err == Z_STREAM_END) return 0; /* EOF */ +- +- next_out = (Byte*)buf; +- s->stream.next_out = (Bytef*)buf; +- s->stream.avail_out = len; +- +- if (s->stream.avail_out && s->back != EOF) { +- *next_out++ = s->back; +- s->stream.next_out++; +- s->stream.avail_out--; +- s->back = EOF; +- s->out++; +- start++; +- if (s->last) { +- s->z_err = Z_STREAM_END; +- return 1; +- } +- } +- +- while (s->stream.avail_out != 0) { +- +- if (s->transparent) { +- /* Copy first the lookahead bytes: */ +- uInt n = s->stream.avail_in; +- if (n > s->stream.avail_out) n = s->stream.avail_out; +- if (n > 0) { +- zmemcpy(s->stream.next_out, s->stream.next_in, n); +- next_out += n; +- s->stream.next_out = next_out; +- s->stream.next_in += n; +- s->stream.avail_out -= n; +- s->stream.avail_in -= n; +- } +- if (s->stream.avail_out > 0) { +- s->stream.avail_out -= +- (uInt)fread(next_out, 1, s->stream.avail_out, s->file); +- } +- len -= s->stream.avail_out; +- s->in += len; +- s->out += len; +- if (len == 0) s->z_eof = 1; +- return (int)len; +- } +- if (s->stream.avail_in == 0 && !s->z_eof) { +- +- errno = 0; +- s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file); +- if (s->stream.avail_in == 0) { +- s->z_eof = 1; +- if (ferror(s->file)) { +- s->z_err = Z_ERRNO; +- break; +- } +- } +- s->stream.next_in = s->inbuf; +- } +- s->in += s->stream.avail_in; +- s->out += s->stream.avail_out; +- s->z_err = inflate(&(s->stream), Z_NO_FLUSH); +- s->in -= s->stream.avail_in; +- s->out -= s->stream.avail_out; +- +- if (s->z_err == Z_STREAM_END) { +- /* Check CRC and original size */ +- s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); +- start = s->stream.next_out; +- +- if (getLong(s) != s->crc) { +- s->z_err = Z_DATA_ERROR; +- } else { +- (void)getLong(s); +- /* The uncompressed length returned by above getlong() may be +- * different from s->out in case of concatenated .gz files. +- * Check for such files: +- */ +- check_header(s); +- if (s->z_err == Z_OK) { +- inflateReset(&(s->stream)); +- s->crc = crc32(0L, Z_NULL, 0); +- } +- } +- } +- if (s->z_err != Z_OK || s->z_eof) break; +- } +- s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); +- +- if (len == s->stream.avail_out && +- (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO)) +- return -1; +- return (int)(len - s->stream.avail_out); +-} +- +- +-/* =========================================================================== +- Reads one byte from the compressed file. gzgetc returns this byte +- or -1 in case of end of file or error. +-*/ +-int ZEXPORT gzgetc(file) +- gzFile file; +-{ +- unsigned char c; +- +- return gzread(file, &c, 1) == 1 ? c : -1; +-} +- +- +-/* =========================================================================== +- Push one byte back onto the stream. +-*/ +-int ZEXPORT gzungetc(c, file) +- int c; +- gzFile file; +-{ +- gz_stream *s = (gz_stream*)file; +- +- if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF; +- s->back = c; +- s->out--; +- s->last = (s->z_err == Z_STREAM_END); +- if (s->last) s->z_err = Z_OK; +- s->z_eof = 0; +- return c; +-} +- +- +-/* =========================================================================== +- Reads bytes from the compressed file until len-1 characters are +- read, or a newline character is read and transferred to buf, or an +- end-of-file condition is encountered. The string is then terminated +- with a null character. +- gzgets returns buf, or Z_NULL in case of error. +- +- The current implementation is not optimized at all. +-*/ +-char * ZEXPORT gzgets(file, buf, len) +- gzFile file; +- char *buf; +- int len; +-{ +- char *b = buf; +- if (buf == Z_NULL || len <= 0) return Z_NULL; +- +- while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ; +- *buf = '\0'; +- return b == buf && len > 0 ? Z_NULL : b; +-} +- +- +-#ifndef NO_GZCOMPRESS +-/* =========================================================================== +- Writes the given number of uncompressed bytes into the compressed file. +- gzwrite returns the number of bytes actually written (0 in case of error). +-*/ +-int ZEXPORT gzwrite (file, buf, len) +- gzFile file; +- voidpc buf; +- unsigned len; +-{ +- gz_stream *s = (gz_stream*)file; +- +- if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; +- +- s->stream.next_in = (Bytef*)buf; +- s->stream.avail_in = len; +- +- while (s->stream.avail_in != 0) { +- +- if (s->stream.avail_out == 0) { +- +- s->stream.next_out = s->outbuf; +- if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { +- s->z_err = Z_ERRNO; +- break; +- } +- s->stream.avail_out = Z_BUFSIZE; +- } +- s->in += s->stream.avail_in; +- s->out += s->stream.avail_out; +- s->z_err = deflate(&(s->stream), Z_NO_FLUSH); +- s->in -= s->stream.avail_in; +- s->out -= s->stream.avail_out; +- if (s->z_err != Z_OK) break; +- } +- s->crc = crc32(s->crc, (const Bytef *)buf, len); +- +- return (int)(len - s->stream.avail_in); +-} +- +- +-/* =========================================================================== +- Converts, formats, and writes the args to the compressed file under +- control of the format string, as in fprintf. gzprintf returns the number of +- uncompressed bytes actually written (0 in case of error). +-*/ +-#ifdef STDC +-#include +- +-int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) +-{ +- char buf[Z_PRINTF_BUFSIZE]; +- va_list va; +- int len; +- +- buf[sizeof(buf) - 1] = 0; +- va_start(va, format); +-#ifdef NO_vsnprintf +-# ifdef HAS_vsprintf_void +- (void)vsprintf(buf, format, va); +- va_end(va); +- for (len = 0; len < sizeof(buf); len++) +- if (buf[len] == 0) break; +-# else +- len = vsprintf(buf, format, va); +- va_end(va); +-# endif +-#else +-# ifdef HAS_vsnprintf_void +- (void)vsnprintf(buf, sizeof(buf), format, va); +- va_end(va); +- len = strlen(buf); +-# else +- len = vsnprintf(buf, sizeof(buf), format, va); +- va_end(va); +-# endif +-#endif +- if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0) +- return 0; +- return gzwrite(file, buf, (unsigned)len); +-} +-#else /* not ANSI C */ +- +-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, +- a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) +- gzFile file; +- const char *format; +- int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, +- a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; +-{ +- char buf[Z_PRINTF_BUFSIZE]; +- int len; +- +- buf[sizeof(buf) - 1] = 0; +-#ifdef NO_snprintf +-# ifdef HAS_sprintf_void +- sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, +- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); +- for (len = 0; len < sizeof(buf); len++) +- if (buf[len] == 0) break; +-# else +- len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, +- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); +-# endif +-#else +-# ifdef HAS_snprintf_void +- snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, +- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); +- len = strlen(buf); +-# else +- len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, +- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); +-# endif +-#endif +- if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0) +- return 0; +- return gzwrite(file, buf, len); +-} +-#endif +- +-/* =========================================================================== +- Writes c, converted to an unsigned char, into the compressed file. +- gzputc returns the value that was written, or -1 in case of error. +-*/ +-int ZEXPORT gzputc(file, c) +- gzFile file; +- int c; +-{ +- unsigned char cc = (unsigned char) c; /* required for big endian systems */ +- +- return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; +-} +- +- +-/* =========================================================================== +- Writes the given null-terminated string to the compressed file, excluding +- the terminating null character. +- gzputs returns the number of characters written, or -1 in case of error. +-*/ +-int ZEXPORT gzputs(file, s) +- gzFile file; +- const char *s; +-{ +- return gzwrite(file, (char*)s, (unsigned)strlen(s)); +-} +- +- +-/* =========================================================================== +- Flushes all pending output into the compressed file. The parameter +- flush is as in the deflate() function. +-*/ +-local int do_flush (file, flush) +- gzFile file; +- int flush; +-{ +- uInt len; +- int done = 0; +- gz_stream *s = (gz_stream*)file; +- +- if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; +- +- s->stream.avail_in = 0; /* should be zero already anyway */ +- +- for (;;) { +- len = Z_BUFSIZE - s->stream.avail_out; +- +- if (len != 0) { +- if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) { +- s->z_err = Z_ERRNO; +- return Z_ERRNO; +- } +- s->stream.next_out = s->outbuf; +- s->stream.avail_out = Z_BUFSIZE; +- } +- if (done) break; +- s->out += s->stream.avail_out; +- s->z_err = deflate(&(s->stream), flush); +- s->out -= s->stream.avail_out; +- +- /* Ignore the second of two consecutive flushes: */ +- if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK; +- +- /* deflate has finished flushing only when it hasn't used up +- * all the available space in the output buffer: +- */ +- done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END); +- +- if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break; +- } +- return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; +-} +- +-int ZEXPORT gzflush (file, flush) +- gzFile file; +- int flush; +-{ +- gz_stream *s = (gz_stream*)file; +- int err = do_flush (file, flush); +- +- if (err) return err; +- fflush(s->file); +- return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; +-} +-#endif /* NO_GZCOMPRESS */ +- +-/* =========================================================================== +- Sets the starting position for the next gzread or gzwrite on the given +- compressed file. The offset represents a number of bytes in the +- gzseek returns the resulting offset location as measured in bytes from +- the beginning of the uncompressed stream, or -1 in case of error. +- SEEK_END is not implemented, returns error. +- In this version of the library, gzseek can be extremely slow. +-*/ +-z_off_t ZEXPORT gzseek (file, offset, whence) +- gzFile file; +- z_off_t offset; +- int whence; +-{ +- gz_stream *s = (gz_stream*)file; +- +- if (s == NULL || whence == SEEK_END || +- s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) { +- return -1L; +- } +- +- if (s->mode == 'w') { +-#ifdef NO_GZCOMPRESS +- return -1L; +-#else +- if (whence == SEEK_SET) { +- offset -= s->in; +- } +- if (offset < 0) return -1L; +- +- /* At this point, offset is the number of zero bytes to write. */ +- if (s->inbuf == Z_NULL) { +- s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */ +- if (s->inbuf == Z_NULL) return -1L; +- zmemzero(s->inbuf, Z_BUFSIZE); +- } +- while (offset > 0) { +- uInt size = Z_BUFSIZE; +- if (offset < Z_BUFSIZE) size = (uInt)offset; +- +- size = gzwrite(file, s->inbuf, size); +- if (size == 0) return -1L; +- +- offset -= size; +- } +- return s->in; +-#endif +- } +- /* Rest of function is for reading only */ +- +- /* compute absolute position */ +- if (whence == SEEK_CUR) { +- offset += s->out; +- } +- if (offset < 0) return -1L; +- +- if (s->transparent) { +- /* map to fseek */ +- s->back = EOF; +- s->stream.avail_in = 0; +- s->stream.next_in = s->inbuf; +- if (fseek(s->file, offset, SEEK_SET) < 0) return -1L; +- +- s->in = s->out = offset; +- return offset; +- } +- +- /* For a negative seek, rewind and use positive seek */ +- if (offset >= s->out) { +- offset -= s->out; +- } else if (gzrewind(file) < 0) { +- return -1L; +- } +- /* offset is now the number of bytes to skip. */ +- +- if (offset != 0 && s->outbuf == Z_NULL) { +- s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); +- if (s->outbuf == Z_NULL) return -1L; +- } +- if (offset && s->back != EOF) { +- s->back = EOF; +- s->out++; +- offset--; +- if (s->last) s->z_err = Z_STREAM_END; +- } +- while (offset > 0) { +- int size = Z_BUFSIZE; +- if (offset < Z_BUFSIZE) size = (int)offset; +- +- size = gzread(file, s->outbuf, (uInt)size); +- if (size <= 0) return -1L; +- offset -= size; +- } +- return s->out; +-} +- +-/* =========================================================================== +- Rewinds input file. +-*/ +-int ZEXPORT gzrewind (file) +- gzFile file; +-{ +- gz_stream *s = (gz_stream*)file; +- +- if (s == NULL || s->mode != 'r') return -1; +- +- s->z_err = Z_OK; +- s->z_eof = 0; +- s->back = EOF; +- s->stream.avail_in = 0; +- s->stream.next_in = s->inbuf; +- s->crc = crc32(0L, Z_NULL, 0); +- if (!s->transparent) (void)inflateReset(&s->stream); +- s->in = 0; +- s->out = 0; +- return fseek(s->file, s->start, SEEK_SET); +-} +- +-/* =========================================================================== +- Returns the starting position for the next gzread or gzwrite on the +- given compressed file. This position represents a number of bytes in the +- uncompressed data stream. +-*/ +-z_off_t ZEXPORT gztell (file) +- gzFile file; +-{ +- return gzseek(file, 0L, SEEK_CUR); +-} +- +-/* =========================================================================== +- Returns 1 when EOF has previously been detected reading the given +- input stream, otherwise zero. +-*/ +-int ZEXPORT gzeof (file) +- gzFile file; +-{ +- gz_stream *s = (gz_stream*)file; +- +- /* With concatenated compressed files that can have embedded +- * crc trailers, z_eof is no longer the only/best indicator of EOF +- * on a gz_stream. Handle end-of-stream error explicitly here. +- */ +- if (s == NULL || s->mode != 'r') return 0; +- if (s->z_eof) return 1; +- return s->z_err == Z_STREAM_END; +-} +- +-/* =========================================================================== +- Returns 1 if reading and doing so transparently, otherwise zero. +-*/ +-int ZEXPORT gzdirect (file) +- gzFile file; +-{ +- gz_stream *s = (gz_stream*)file; +- +- if (s == NULL || s->mode != 'r') return 0; +- return s->transparent; +-} +- +-/* =========================================================================== +- Outputs a long in LSB order to the given file +-*/ +-local void putLong (file, x) +- FILE *file; +- uLong x; +-{ +- int n; +- for (n = 0; n < 4; n++) { +- fputc((int)(x & 0xff), file); +- x >>= 8; +- } +-} +- +-/* =========================================================================== +- Reads a long in LSB order from the given gz_stream. Sets z_err in case +- of error. +-*/ +-local uLong getLong (s) +- gz_stream *s; +-{ +- uLong x = (uLong)get_byte(s); +- int c; +- +- x += ((uLong)get_byte(s))<<8; +- x += ((uLong)get_byte(s))<<16; +- c = get_byte(s); +- if (c == EOF) s->z_err = Z_DATA_ERROR; +- x += ((uLong)c)<<24; +- return x; +-} +- +-/* =========================================================================== +- Flushes all pending output if necessary, closes the compressed file +- and deallocates all the (de)compression state. +-*/ +-int ZEXPORT gzclose (file) +- gzFile file; +-{ +- gz_stream *s = (gz_stream*)file; +- +- if (s == NULL) return Z_STREAM_ERROR; +- +- if (s->mode == 'w') { +-#ifdef NO_GZCOMPRESS +- return Z_STREAM_ERROR; +-#else +- if (do_flush (file, Z_FINISH) != Z_OK) +- return destroy((gz_stream*)file); +- +- putLong (s->file, s->crc); +- putLong (s->file, (uLong)(s->in & 0xffffffff)); +-#endif +- } +- return destroy((gz_stream*)file); +-} +- +-#ifdef STDC +-# define zstrerror(errnum) strerror(errnum) +-#else +-# define zstrerror(errnum) "" +-#endif +- +-/* =========================================================================== +- Returns the error message for the last error which occurred on the +- given compressed file. errnum is set to zlib error number. If an +- error occurred in the file system and not in the compression library, +- errnum is set to Z_ERRNO and the application may consult errno +- to get the exact error code. +-*/ +-const char * ZEXPORT gzerror (file, errnum) +- gzFile file; +- int *errnum; +-{ +- char *m; +- gz_stream *s = (gz_stream*)file; +- +- if (s == NULL) { +- *errnum = Z_STREAM_ERROR; +- return (const char*)ERR_MSG(Z_STREAM_ERROR); +- } +- *errnum = s->z_err; +- if (*errnum == Z_OK) return (const char*)""; +- +- m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg); +- +- if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err); +- +- TRYFREE(s->msg); +- s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3); +- if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR); +- strcpy(s->msg, s->path); +- strcat(s->msg, ": "); +- strcat(s->msg, m); +- return (const char*)s->msg; +-} +- +-/* =========================================================================== +- Clear the error and end-of-file flags, and do the same for the real file. +-*/ +-void ZEXPORT gzclearerr (file) +- gzFile file; +-{ +- gz_stream *s = (gz_stream*)file; +- +- if (s == NULL) return; +- if (s->z_err != Z_STREAM_END) s->z_err = Z_OK; +- s->z_eof = 0; +- clearerr(s->file); +-} +diff -r ee879c0ffa11 Modules/zlib/gzlib.c +--- /dev/null ++++ b/Modules/zlib/gzlib.c +@@ -0,0 +1,634 @@ ++/* gzlib.c -- zlib functions common to reading and writing gzip files ++ * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++#include "gzguts.h" ++ ++#if defined(_WIN32) && !defined(__BORLANDC__) ++# define LSEEK _lseeki64 ++#else ++#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 ++# define LSEEK lseek64 ++#else ++# define LSEEK lseek ++#endif ++#endif ++ ++/* Local functions */ ++local void gz_reset OF((gz_statep)); ++local gzFile gz_open OF((const void *, int, const char *)); ++ ++#if defined UNDER_CE ++ ++/* Map the Windows error number in ERROR to a locale-dependent error message ++ string and return a pointer to it. Typically, the values for ERROR come ++ from GetLastError. ++ ++ The string pointed to shall not be modified by the application, but may be ++ overwritten by a subsequent call to gz_strwinerror ++ ++ The gz_strwinerror function does not change the current setting of ++ GetLastError. */ ++char ZLIB_INTERNAL *gz_strwinerror (error) ++ DWORD error; ++{ ++ static char buf[1024]; ++ ++ wchar_t *msgbuf; ++ DWORD lasterr = GetLastError(); ++ DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM ++ | FORMAT_MESSAGE_ALLOCATE_BUFFER, ++ NULL, ++ error, ++ 0, /* Default language */ ++ (LPVOID)&msgbuf, ++ 0, ++ NULL); ++ if (chars != 0) { ++ /* If there is an \r\n appended, zap it. */ ++ if (chars >= 2 ++ && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') { ++ chars -= 2; ++ msgbuf[chars] = 0; ++ } ++ ++ if (chars > sizeof (buf) - 1) { ++ chars = sizeof (buf) - 1; ++ msgbuf[chars] = 0; ++ } ++ ++ wcstombs(buf, msgbuf, chars + 1); ++ LocalFree(msgbuf); ++ } ++ else { ++ sprintf(buf, "unknown win32 error (%ld)", error); ++ } ++ ++ SetLastError(lasterr); ++ return buf; ++} ++ ++#endif /* UNDER_CE */ ++ ++/* Reset gzip file state */ ++local void gz_reset(state) ++ gz_statep state; ++{ ++ state->x.have = 0; /* no output data available */ ++ if (state->mode == GZ_READ) { /* for reading ... */ ++ state->eof = 0; /* not at end of file */ ++ state->past = 0; /* have not read past end yet */ ++ state->how = LOOK; /* look for gzip header */ ++ } ++ state->seek = 0; /* no seek request pending */ ++ gz_error(state, Z_OK, NULL); /* clear error */ ++ state->x.pos = 0; /* no uncompressed data yet */ ++ state->strm.avail_in = 0; /* no input data yet */ ++} ++ ++/* Open a gzip file either by name or file descriptor. */ ++local gzFile gz_open(path, fd, mode) ++ const void *path; ++ int fd; ++ const char *mode; ++{ ++ gz_statep state; ++ size_t len; ++ int oflag; ++#ifdef O_CLOEXEC ++ int cloexec = 0; ++#endif ++#ifdef O_EXCL ++ int exclusive = 0; ++#endif ++ ++ /* check input */ ++ if (path == NULL) ++ return NULL; ++ ++ /* allocate gzFile structure to return */ ++ state = (gz_statep)malloc(sizeof(gz_state)); ++ if (state == NULL) ++ return NULL; ++ state->size = 0; /* no buffers allocated yet */ ++ state->want = GZBUFSIZE; /* requested buffer size */ ++ state->msg = NULL; /* no error message yet */ ++ ++ /* interpret mode */ ++ state->mode = GZ_NONE; ++ state->level = Z_DEFAULT_COMPRESSION; ++ state->strategy = Z_DEFAULT_STRATEGY; ++ state->direct = 0; ++ while (*mode) { ++ if (*mode >= '0' && *mode <= '9') ++ state->level = *mode - '0'; ++ else ++ switch (*mode) { ++ case 'r': ++ state->mode = GZ_READ; ++ break; ++#ifndef NO_GZCOMPRESS ++ case 'w': ++ state->mode = GZ_WRITE; ++ break; ++ case 'a': ++ state->mode = GZ_APPEND; ++ break; ++#endif ++ case '+': /* can't read and write at the same time */ ++ free(state); ++ return NULL; ++ case 'b': /* ignore -- will request binary anyway */ ++ break; ++#ifdef O_CLOEXEC ++ case 'e': ++ cloexec = 1; ++ break; ++#endif ++#ifdef O_EXCL ++ case 'x': ++ exclusive = 1; ++ break; ++#endif ++ case 'f': ++ state->strategy = Z_FILTERED; ++ break; ++ case 'h': ++ state->strategy = Z_HUFFMAN_ONLY; ++ break; ++ case 'R': ++ state->strategy = Z_RLE; ++ break; ++ case 'F': ++ state->strategy = Z_FIXED; ++ break; ++ case 'T': ++ state->direct = 1; ++ break; ++ default: /* could consider as an error, but just ignore */ ++ ; ++ } ++ mode++; ++ } ++ ++ /* must provide an "r", "w", or "a" */ ++ if (state->mode == GZ_NONE) { ++ free(state); ++ return NULL; ++ } ++ ++ /* can't force transparent read */ ++ if (state->mode == GZ_READ) { ++ if (state->direct) { ++ free(state); ++ return NULL; ++ } ++ state->direct = 1; /* for empty file */ ++ } ++ ++ /* save the path name for error messages */ ++#ifdef _WIN32 ++ if (fd == -2) { ++ len = wcstombs(NULL, path, 0); ++ if (len == (size_t)-1) ++ len = 0; ++ } ++ else ++#endif ++ len = strlen((const char *)path); ++ state->path = (char *)malloc(len + 1); ++ if (state->path == NULL) { ++ free(state); ++ return NULL; ++ } ++#ifdef _WIN32 ++ if (fd == -2) ++ if (len) ++ wcstombs(state->path, path, len + 1); ++ else ++ *(state->path) = 0; ++ else ++#endif ++#if !defined(NO_snprintf) && !defined(NO_vsnprintf) ++ snprintf(state->path, len + 1, "%s", (const char *)path); ++#else ++ strcpy(state->path, path); ++#endif ++ ++ /* compute the flags for open() */ ++ oflag = ++#ifdef O_LARGEFILE ++ O_LARGEFILE | ++#endif ++#ifdef O_BINARY ++ O_BINARY | ++#endif ++#ifdef O_CLOEXEC ++ (cloexec ? O_CLOEXEC : 0) | ++#endif ++ (state->mode == GZ_READ ? ++ O_RDONLY : ++ (O_WRONLY | O_CREAT | ++#ifdef O_EXCL ++ (exclusive ? O_EXCL : 0) | ++#endif ++ (state->mode == GZ_WRITE ? ++ O_TRUNC : ++ O_APPEND))); ++ ++ /* open the file with the appropriate flags (or just use fd) */ ++ state->fd = fd > -1 ? fd : ( ++#ifdef _WIN32 ++ fd == -2 ? _wopen(path, oflag, 0666) : ++#endif ++ open((const char *)path, oflag, 0666)); ++ if (state->fd == -1) { ++ free(state->path); ++ free(state); ++ return NULL; ++ } ++ if (state->mode == GZ_APPEND) ++ state->mode = GZ_WRITE; /* simplify later checks */ ++ ++ /* save the current position for rewinding (only if reading) */ ++ if (state->mode == GZ_READ) { ++ state->start = LSEEK(state->fd, 0, SEEK_CUR); ++ if (state->start == -1) state->start = 0; ++ } ++ ++ /* initialize stream */ ++ gz_reset(state); ++ ++ /* return stream */ ++ return (gzFile)state; ++} ++ ++/* -- see zlib.h -- */ ++gzFile ZEXPORT gzopen(path, mode) ++ const char *path; ++ const char *mode; ++{ ++ return gz_open(path, -1, mode); ++} ++ ++/* -- see zlib.h -- */ ++gzFile ZEXPORT gzopen64(path, mode) ++ const char *path; ++ const char *mode; ++{ ++ return gz_open(path, -1, mode); ++} ++ ++/* -- see zlib.h -- */ ++gzFile ZEXPORT gzdopen(fd, mode) ++ int fd; ++ const char *mode; ++{ ++ char *path; /* identifier for error messages */ ++ gzFile gz; ++ ++ if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL) ++ return NULL; ++#if !defined(NO_snprintf) && !defined(NO_vsnprintf) ++ snprintf(path, 7 + 3 * sizeof(int), "", fd); /* for debugging */ ++#else ++ sprintf(path, "", fd); /* for debugging */ ++#endif ++ gz = gz_open(path, fd, mode); ++ free(path); ++ return gz; ++} ++ ++/* -- see zlib.h -- */ ++#ifdef _WIN32 ++gzFile ZEXPORT gzopen_w(path, mode) ++ const wchar_t *path; ++ const char *mode; ++{ ++ return gz_open(path, -2, mode); ++} ++#endif ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzbuffer(file, size) ++ gzFile file; ++ unsigned size; ++{ ++ gz_statep state; ++ ++ /* get internal structure and check integrity */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ if (state->mode != GZ_READ && state->mode != GZ_WRITE) ++ return -1; ++ ++ /* make sure we haven't already allocated memory */ ++ if (state->size != 0) ++ return -1; ++ ++ /* check and set requested size */ ++ if (size < 2) ++ size = 2; /* need two bytes to check magic header */ ++ state->want = size; ++ return 0; ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzrewind(file) ++ gzFile file; ++{ ++ gz_statep state; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ ++ /* check that we're reading and that there's no error */ ++ if (state->mode != GZ_READ || ++ (state->err != Z_OK && state->err != Z_BUF_ERROR)) ++ return -1; ++ ++ /* back up and start over */ ++ if (LSEEK(state->fd, state->start, SEEK_SET) == -1) ++ return -1; ++ gz_reset(state); ++ return 0; ++} ++ ++/* -- see zlib.h -- */ ++z_off64_t ZEXPORT gzseek64(file, offset, whence) ++ gzFile file; ++ z_off64_t offset; ++ int whence; ++{ ++ unsigned n; ++ z_off64_t ret; ++ gz_statep state; ++ ++ /* get internal structure and check integrity */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ if (state->mode != GZ_READ && state->mode != GZ_WRITE) ++ return -1; ++ ++ /* check that there's no error */ ++ if (state->err != Z_OK && state->err != Z_BUF_ERROR) ++ return -1; ++ ++ /* can only seek from start or relative to current position */ ++ if (whence != SEEK_SET && whence != SEEK_CUR) ++ return -1; ++ ++ /* normalize offset to a SEEK_CUR specification */ ++ if (whence == SEEK_SET) ++ offset -= state->x.pos; ++ else if (state->seek) ++ offset += state->skip; ++ state->seek = 0; ++ ++ /* if within raw area while reading, just go there */ ++ if (state->mode == GZ_READ && state->how == COPY && ++ state->x.pos + offset >= 0) { ++ ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR); ++ if (ret == -1) ++ return -1; ++ state->x.have = 0; ++ state->eof = 0; ++ state->past = 0; ++ state->seek = 0; ++ gz_error(state, Z_OK, NULL); ++ state->strm.avail_in = 0; ++ state->x.pos += offset; ++ return state->x.pos; ++ } ++ ++ /* calculate skip amount, rewinding if needed for back seek when reading */ ++ if (offset < 0) { ++ if (state->mode != GZ_READ) /* writing -- can't go backwards */ ++ return -1; ++ offset += state->x.pos; ++ if (offset < 0) /* before start of file! */ ++ return -1; ++ if (gzrewind(file) == -1) /* rewind, then skip to offset */ ++ return -1; ++ } ++ ++ /* if reading, skip what's in output buffer (one less gzgetc() check) */ ++ if (state->mode == GZ_READ) { ++ n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ? ++ (unsigned)offset : state->x.have; ++ state->x.have -= n; ++ state->x.next += n; ++ state->x.pos += n; ++ offset -= n; ++ } ++ ++ /* request skip (if not zero) */ ++ if (offset) { ++ state->seek = 1; ++ state->skip = offset; ++ } ++ return state->x.pos + offset; ++} ++ ++/* -- see zlib.h -- */ ++z_off_t ZEXPORT gzseek(file, offset, whence) ++ gzFile file; ++ z_off_t offset; ++ int whence; ++{ ++ z_off64_t ret; ++ ++ ret = gzseek64(file, (z_off64_t)offset, whence); ++ return ret == (z_off_t)ret ? (z_off_t)ret : -1; ++} ++ ++/* -- see zlib.h -- */ ++z_off64_t ZEXPORT gztell64(file) ++ gzFile file; ++{ ++ gz_statep state; ++ ++ /* get internal structure and check integrity */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ if (state->mode != GZ_READ && state->mode != GZ_WRITE) ++ return -1; ++ ++ /* return position */ ++ return state->x.pos + (state->seek ? state->skip : 0); ++} ++ ++/* -- see zlib.h -- */ ++z_off_t ZEXPORT gztell(file) ++ gzFile file; ++{ ++ z_off64_t ret; ++ ++ ret = gztell64(file); ++ return ret == (z_off_t)ret ? (z_off_t)ret : -1; ++} ++ ++/* -- see zlib.h -- */ ++z_off64_t ZEXPORT gzoffset64(file) ++ gzFile file; ++{ ++ z_off64_t offset; ++ gz_statep state; ++ ++ /* get internal structure and check integrity */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ if (state->mode != GZ_READ && state->mode != GZ_WRITE) ++ return -1; ++ ++ /* compute and return effective offset in file */ ++ offset = LSEEK(state->fd, 0, SEEK_CUR); ++ if (offset == -1) ++ return -1; ++ if (state->mode == GZ_READ) /* reading */ ++ offset -= state->strm.avail_in; /* don't count buffered input */ ++ return offset; ++} ++ ++/* -- see zlib.h -- */ ++z_off_t ZEXPORT gzoffset(file) ++ gzFile file; ++{ ++ z_off64_t ret; ++ ++ ret = gzoffset64(file); ++ return ret == (z_off_t)ret ? (z_off_t)ret : -1; ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzeof(file) ++ gzFile file; ++{ ++ gz_statep state; ++ ++ /* get internal structure and check integrity */ ++ if (file == NULL) ++ return 0; ++ state = (gz_statep)file; ++ if (state->mode != GZ_READ && state->mode != GZ_WRITE) ++ return 0; ++ ++ /* return end-of-file state */ ++ return state->mode == GZ_READ ? state->past : 0; ++} ++ ++/* -- see zlib.h -- */ ++const char * ZEXPORT gzerror(file, errnum) ++ gzFile file; ++ int *errnum; ++{ ++ gz_statep state; ++ ++ /* get internal structure and check integrity */ ++ if (file == NULL) ++ return NULL; ++ state = (gz_statep)file; ++ if (state->mode != GZ_READ && state->mode != GZ_WRITE) ++ return NULL; ++ ++ /* return error information */ ++ if (errnum != NULL) ++ *errnum = state->err; ++ return state->err == Z_MEM_ERROR ? "out of memory" : ++ (state->msg == NULL ? "" : state->msg); ++} ++ ++/* -- see zlib.h -- */ ++void ZEXPORT gzclearerr(file) ++ gzFile file; ++{ ++ gz_statep state; ++ ++ /* get internal structure and check integrity */ ++ if (file == NULL) ++ return; ++ state = (gz_statep)file; ++ if (state->mode != GZ_READ && state->mode != GZ_WRITE) ++ return; ++ ++ /* clear error and end-of-file */ ++ if (state->mode == GZ_READ) { ++ state->eof = 0; ++ state->past = 0; ++ } ++ gz_error(state, Z_OK, NULL); ++} ++ ++/* Create an error message in allocated memory and set state->err and ++ state->msg accordingly. Free any previous error message already there. Do ++ not try to free or allocate space if the error is Z_MEM_ERROR (out of ++ memory). Simply save the error message as a static string. If there is an ++ allocation failure constructing the error message, then convert the error to ++ out of memory. */ ++void ZLIB_INTERNAL gz_error(state, err, msg) ++ gz_statep state; ++ int err; ++ const char *msg; ++{ ++ /* free previously allocated message and clear */ ++ if (state->msg != NULL) { ++ if (state->err != Z_MEM_ERROR) ++ free(state->msg); ++ state->msg = NULL; ++ } ++ ++ /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */ ++ if (err != Z_OK && err != Z_BUF_ERROR) ++ state->x.have = 0; ++ ++ /* set error code, and if no message, then done */ ++ state->err = err; ++ if (msg == NULL) ++ return; ++ ++ /* for an out of memory error, return literal string when requested */ ++ if (err == Z_MEM_ERROR) ++ return; ++ ++ /* construct error message with path */ ++ if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) == ++ NULL) { ++ state->err = Z_MEM_ERROR; ++ return; ++ } ++#if !defined(NO_snprintf) && !defined(NO_vsnprintf) ++ snprintf(state->msg, strlen(state->path) + strlen(msg) + 3, ++ "%s%s%s", state->path, ": ", msg); ++#else ++ strcpy(state->msg, state->path); ++ strcat(state->msg, ": "); ++ strcat(state->msg, msg); ++#endif ++ return; ++} ++ ++#ifndef INT_MAX ++/* portably return maximum value for an int (when limits.h presumed not ++ available) -- we need to do this to cover cases where 2's complement not ++ used, since C standard permits 1's complement and sign-bit representations, ++ otherwise we could just use ((unsigned)-1) >> 1 */ ++unsigned ZLIB_INTERNAL gz_intmax() ++{ ++ unsigned p, q; ++ ++ p = 1; ++ do { ++ q = p; ++ p <<= 1; ++ p++; ++ } while (p > q); ++ return q >> 1; ++} ++#endif +diff -r ee879c0ffa11 Modules/zlib/gzread.c +--- /dev/null ++++ b/Modules/zlib/gzread.c +@@ -0,0 +1,594 @@ ++/* gzread.c -- zlib functions for reading gzip files ++ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++#include "gzguts.h" ++ ++/* Local functions */ ++local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); ++local int gz_avail OF((gz_statep)); ++local int gz_look OF((gz_statep)); ++local int gz_decomp OF((gz_statep)); ++local int gz_fetch OF((gz_statep)); ++local int gz_skip OF((gz_statep, z_off64_t)); ++ ++/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from ++ state->fd, and update state->eof, state->err, and state->msg as appropriate. ++ This function needs to loop on read(), since read() is not guaranteed to ++ read the number of bytes requested, depending on the type of descriptor. */ ++local int gz_load(state, buf, len, have) ++ gz_statep state; ++ unsigned char *buf; ++ unsigned len; ++ unsigned *have; ++{ ++ int ret; ++ ++ *have = 0; ++ do { ++ ret = read(state->fd, buf + *have, len - *have); ++ if (ret <= 0) ++ break; ++ *have += ret; ++ } while (*have < len); ++ if (ret < 0) { ++ gz_error(state, Z_ERRNO, zstrerror()); ++ return -1; ++ } ++ if (ret == 0) ++ state->eof = 1; ++ return 0; ++} ++ ++/* Load up input buffer and set eof flag if last data loaded -- return -1 on ++ error, 0 otherwise. Note that the eof flag is set when the end of the input ++ file is reached, even though there may be unused data in the buffer. Once ++ that data has been used, no more attempts will be made to read the file. ++ If strm->avail_in != 0, then the current data is moved to the beginning of ++ the input buffer, and then the remainder of the buffer is loaded with the ++ available data from the input file. */ ++local int gz_avail(state) ++ gz_statep state; ++{ ++ unsigned got; ++ z_streamp strm = &(state->strm); ++ ++ if (state->err != Z_OK && state->err != Z_BUF_ERROR) ++ return -1; ++ if (state->eof == 0) { ++ if (strm->avail_in) { /* copy what's there to the start */ ++ unsigned char *p = state->in; ++ unsigned const char *q = strm->next_in; ++ unsigned n = strm->avail_in; ++ do { ++ *p++ = *q++; ++ } while (--n); ++ } ++ if (gz_load(state, state->in + strm->avail_in, ++ state->size - strm->avail_in, &got) == -1) ++ return -1; ++ strm->avail_in += got; ++ strm->next_in = state->in; ++ } ++ return 0; ++} ++ ++/* Look for gzip header, set up for inflate or copy. state->x.have must be 0. ++ If this is the first time in, allocate required memory. state->how will be ++ left unchanged if there is no more input data available, will be set to COPY ++ if there is no gzip header and direct copying will be performed, or it will ++ be set to GZIP for decompression. If direct copying, then leftover input ++ data from the input buffer will be copied to the output buffer. In that ++ case, all further file reads will be directly to either the output buffer or ++ a user buffer. If decompressing, the inflate state will be initialized. ++ gz_look() will return 0 on success or -1 on failure. */ ++local int gz_look(state) ++ gz_statep state; ++{ ++ z_streamp strm = &(state->strm); ++ ++ /* allocate read buffers and inflate memory */ ++ if (state->size == 0) { ++ /* allocate buffers */ ++ state->in = (unsigned char *)malloc(state->want); ++ state->out = (unsigned char *)malloc(state->want << 1); ++ if (state->in == NULL || state->out == NULL) { ++ if (state->out != NULL) ++ free(state->out); ++ if (state->in != NULL) ++ free(state->in); ++ gz_error(state, Z_MEM_ERROR, "out of memory"); ++ return -1; ++ } ++ state->size = state->want; ++ ++ /* allocate inflate memory */ ++ state->strm.zalloc = Z_NULL; ++ state->strm.zfree = Z_NULL; ++ state->strm.opaque = Z_NULL; ++ state->strm.avail_in = 0; ++ state->strm.next_in = Z_NULL; ++ if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) { /* gunzip */ ++ free(state->out); ++ free(state->in); ++ state->size = 0; ++ gz_error(state, Z_MEM_ERROR, "out of memory"); ++ return -1; ++ } ++ } ++ ++ /* get at least the magic bytes in the input buffer */ ++ if (strm->avail_in < 2) { ++ if (gz_avail(state) == -1) ++ return -1; ++ if (strm->avail_in == 0) ++ return 0; ++ } ++ ++ /* look for gzip magic bytes -- if there, do gzip decoding (note: there is ++ a logical dilemma here when considering the case of a partially written ++ gzip file, to wit, if a single 31 byte is written, then we cannot tell ++ whether this is a single-byte file, or just a partially written gzip ++ file -- for here we assume that if a gzip file is being written, then ++ the header will be written in a single operation, so that reading a ++ single byte is sufficient indication that it is not a gzip file) */ ++ if (strm->avail_in > 1 && ++ strm->next_in[0] == 31 && strm->next_in[1] == 139) { ++ inflateReset(strm); ++ state->how = GZIP; ++ state->direct = 0; ++ return 0; ++ } ++ ++ /* no gzip header -- if we were decoding gzip before, then this is trailing ++ garbage. Ignore the trailing garbage and finish. */ ++ if (state->direct == 0) { ++ strm->avail_in = 0; ++ state->eof = 1; ++ state->x.have = 0; ++ return 0; ++ } ++ ++ /* doing raw i/o, copy any leftover input to output -- this assumes that ++ the output buffer is larger than the input buffer, which also assures ++ space for gzungetc() */ ++ state->x.next = state->out; ++ if (strm->avail_in) { ++ memcpy(state->x.next, strm->next_in, strm->avail_in); ++ state->x.have = strm->avail_in; ++ strm->avail_in = 0; ++ } ++ state->how = COPY; ++ state->direct = 1; ++ return 0; ++} ++ ++/* Decompress from input to the provided next_out and avail_out in the state. ++ On return, state->x.have and state->x.next point to the just decompressed ++ data. If the gzip stream completes, state->how is reset to LOOK to look for ++ the next gzip stream or raw data, once state->x.have is depleted. Returns 0 ++ on success, -1 on failure. */ ++local int gz_decomp(state) ++ gz_statep state; ++{ ++ int ret = Z_OK; ++ unsigned had; ++ z_streamp strm = &(state->strm); ++ ++ /* fill output buffer up to end of deflate stream */ ++ had = strm->avail_out; ++ do { ++ /* get more input for inflate() */ ++ if (strm->avail_in == 0 && gz_avail(state) == -1) ++ return -1; ++ if (strm->avail_in == 0) { ++ gz_error(state, Z_BUF_ERROR, "unexpected end of file"); ++ break; ++ } ++ ++ /* decompress and handle errors */ ++ ret = inflate(strm, Z_NO_FLUSH); ++ if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) { ++ gz_error(state, Z_STREAM_ERROR, ++ "internal error: inflate stream corrupt"); ++ return -1; ++ } ++ if (ret == Z_MEM_ERROR) { ++ gz_error(state, Z_MEM_ERROR, "out of memory"); ++ return -1; ++ } ++ if (ret == Z_DATA_ERROR) { /* deflate stream invalid */ ++ gz_error(state, Z_DATA_ERROR, ++ strm->msg == NULL ? "compressed data error" : strm->msg); ++ return -1; ++ } ++ } while (strm->avail_out && ret != Z_STREAM_END); ++ ++ /* update available output */ ++ state->x.have = had - strm->avail_out; ++ state->x.next = strm->next_out - state->x.have; ++ ++ /* if the gzip stream completed successfully, look for another */ ++ if (ret == Z_STREAM_END) ++ state->how = LOOK; ++ ++ /* good decompression */ ++ return 0; ++} ++ ++/* Fetch data and put it in the output buffer. Assumes state->x.have is 0. ++ Data is either copied from the input file or decompressed from the input ++ file depending on state->how. If state->how is LOOK, then a gzip header is ++ looked for to determine whether to copy or decompress. Returns -1 on error, ++ otherwise 0. gz_fetch() will leave state->how as COPY or GZIP unless the ++ end of the input file has been reached and all data has been processed. */ ++local int gz_fetch(state) ++ gz_statep state; ++{ ++ z_streamp strm = &(state->strm); ++ ++ do { ++ switch(state->how) { ++ case LOOK: /* -> LOOK, COPY (only if never GZIP), or GZIP */ ++ if (gz_look(state) == -1) ++ return -1; ++ if (state->how == LOOK) ++ return 0; ++ break; ++ case COPY: /* -> COPY */ ++ if (gz_load(state, state->out, state->size << 1, &(state->x.have)) ++ == -1) ++ return -1; ++ state->x.next = state->out; ++ return 0; ++ case GZIP: /* -> GZIP or LOOK (if end of gzip stream) */ ++ strm->avail_out = state->size << 1; ++ strm->next_out = state->out; ++ if (gz_decomp(state) == -1) ++ return -1; ++ } ++ } while (state->x.have == 0 && (!state->eof || strm->avail_in)); ++ return 0; ++} ++ ++/* Skip len uncompressed bytes of output. Return -1 on error, 0 on success. */ ++local int gz_skip(state, len) ++ gz_statep state; ++ z_off64_t len; ++{ ++ unsigned n; ++ ++ /* skip over len bytes or reach end-of-file, whichever comes first */ ++ while (len) ++ /* skip over whatever is in output buffer */ ++ if (state->x.have) { ++ n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ? ++ (unsigned)len : state->x.have; ++ state->x.have -= n; ++ state->x.next += n; ++ state->x.pos += n; ++ len -= n; ++ } ++ ++ /* output buffer empty -- return if we're at the end of the input */ ++ else if (state->eof && state->strm.avail_in == 0) ++ break; ++ ++ /* need more data to skip -- load up output buffer */ ++ else { ++ /* get more output, looking for header if required */ ++ if (gz_fetch(state) == -1) ++ return -1; ++ } ++ return 0; ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzread(file, buf, len) ++ gzFile file; ++ voidp buf; ++ unsigned len; ++{ ++ unsigned got, n; ++ gz_statep state; ++ z_streamp strm; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ strm = &(state->strm); ++ ++ /* check that we're reading and that there's no (serious) error */ ++ if (state->mode != GZ_READ || ++ (state->err != Z_OK && state->err != Z_BUF_ERROR)) ++ return -1; ++ ++ /* since an int is returned, make sure len fits in one, otherwise return ++ with an error (this avoids the flaw in the interface) */ ++ if ((int)len < 0) { ++ gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); ++ return -1; ++ } ++ ++ /* if len is zero, avoid unnecessary operations */ ++ if (len == 0) ++ return 0; ++ ++ /* process a skip request */ ++ if (state->seek) { ++ state->seek = 0; ++ if (gz_skip(state, state->skip) == -1) ++ return -1; ++ } ++ ++ /* get len bytes to buf, or less than len if at the end */ ++ got = 0; ++ do { ++ /* first just try copying data from the output buffer */ ++ if (state->x.have) { ++ n = state->x.have > len ? len : state->x.have; ++ memcpy(buf, state->x.next, n); ++ state->x.next += n; ++ state->x.have -= n; ++ } ++ ++ /* output buffer empty -- return if we're at the end of the input */ ++ else if (state->eof && strm->avail_in == 0) { ++ state->past = 1; /* tried to read past end */ ++ break; ++ } ++ ++ /* need output data -- for small len or new stream load up our output ++ buffer */ ++ else if (state->how == LOOK || len < (state->size << 1)) { ++ /* get more output, looking for header if required */ ++ if (gz_fetch(state) == -1) ++ return -1; ++ continue; /* no progress yet -- go back to copy above */ ++ /* the copy above assures that we will leave with space in the ++ output buffer, allowing at least one gzungetc() to succeed */ ++ } ++ ++ /* large len -- read directly into user buffer */ ++ else if (state->how == COPY) { /* read directly */ ++ if (gz_load(state, (unsigned char *)buf, len, &n) == -1) ++ return -1; ++ } ++ ++ /* large len -- decompress directly into user buffer */ ++ else { /* state->how == GZIP */ ++ strm->avail_out = len; ++ strm->next_out = (unsigned char *)buf; ++ if (gz_decomp(state) == -1) ++ return -1; ++ n = state->x.have; ++ state->x.have = 0; ++ } ++ ++ /* update progress */ ++ len -= n; ++ buf = (char *)buf + n; ++ got += n; ++ state->x.pos += n; ++ } while (len); ++ ++ /* return number of bytes read into user buffer (will fit in int) */ ++ return (int)got; ++} ++ ++/* -- see zlib.h -- */ ++#ifdef Z_PREFIX_SET ++# undef z_gzgetc ++#else ++# undef gzgetc ++#endif ++int ZEXPORT gzgetc(file) ++ gzFile file; ++{ ++ int ret; ++ unsigned char buf[1]; ++ gz_statep state; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ ++ /* check that we're reading and that there's no (serious) error */ ++ if (state->mode != GZ_READ || ++ (state->err != Z_OK && state->err != Z_BUF_ERROR)) ++ return -1; ++ ++ /* try output buffer (no need to check for skip request) */ ++ if (state->x.have) { ++ state->x.have--; ++ state->x.pos++; ++ return *(state->x.next)++; ++ } ++ ++ /* nothing there -- try gzread() */ ++ ret = gzread(file, buf, 1); ++ return ret < 1 ? -1 : buf[0]; ++} ++ ++int ZEXPORT gzgetc_(file) ++gzFile file; ++{ ++ return gzgetc(file); ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzungetc(c, file) ++ int c; ++ gzFile file; ++{ ++ gz_statep state; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ ++ /* check that we're reading and that there's no (serious) error */ ++ if (state->mode != GZ_READ || ++ (state->err != Z_OK && state->err != Z_BUF_ERROR)) ++ return -1; ++ ++ /* process a skip request */ ++ if (state->seek) { ++ state->seek = 0; ++ if (gz_skip(state, state->skip) == -1) ++ return -1; ++ } ++ ++ /* can't push EOF */ ++ if (c < 0) ++ return -1; ++ ++ /* if output buffer empty, put byte at end (allows more pushing) */ ++ if (state->x.have == 0) { ++ state->x.have = 1; ++ state->x.next = state->out + (state->size << 1) - 1; ++ state->x.next[0] = c; ++ state->x.pos--; ++ state->past = 0; ++ return c; ++ } ++ ++ /* if no room, give up (must have already done a gzungetc()) */ ++ if (state->x.have == (state->size << 1)) { ++ gz_error(state, Z_DATA_ERROR, "out of room to push characters"); ++ return -1; ++ } ++ ++ /* slide output data if needed and insert byte before existing data */ ++ if (state->x.next == state->out) { ++ unsigned char *src = state->out + state->x.have; ++ unsigned char *dest = state->out + (state->size << 1); ++ while (src > state->out) ++ *--dest = *--src; ++ state->x.next = dest; ++ } ++ state->x.have++; ++ state->x.next--; ++ state->x.next[0] = c; ++ state->x.pos--; ++ state->past = 0; ++ return c; ++} ++ ++/* -- see zlib.h -- */ ++char * ZEXPORT gzgets(file, buf, len) ++ gzFile file; ++ char *buf; ++ int len; ++{ ++ unsigned left, n; ++ char *str; ++ unsigned char *eol; ++ gz_statep state; ++ ++ /* check parameters and get internal structure */ ++ if (file == NULL || buf == NULL || len < 1) ++ return NULL; ++ state = (gz_statep)file; ++ ++ /* check that we're reading and that there's no (serious) error */ ++ if (state->mode != GZ_READ || ++ (state->err != Z_OK && state->err != Z_BUF_ERROR)) ++ return NULL; ++ ++ /* process a skip request */ ++ if (state->seek) { ++ state->seek = 0; ++ if (gz_skip(state, state->skip) == -1) ++ return NULL; ++ } ++ ++ /* copy output bytes up to new line or len - 1, whichever comes first -- ++ append a terminating zero to the string (we don't check for a zero in ++ the contents, let the user worry about that) */ ++ str = buf; ++ left = (unsigned)len - 1; ++ if (left) do { ++ /* assure that something is in the output buffer */ ++ if (state->x.have == 0 && gz_fetch(state) == -1) ++ return NULL; /* error */ ++ if (state->x.have == 0) { /* end of file */ ++ state->past = 1; /* read past end */ ++ break; /* return what we have */ ++ } ++ ++ /* look for end-of-line in current output buffer */ ++ n = state->x.have > left ? left : state->x.have; ++ eol = (unsigned char *)memchr(state->x.next, '\n', n); ++ if (eol != NULL) ++ n = (unsigned)(eol - state->x.next) + 1; ++ ++ /* copy through end-of-line, or remainder if not found */ ++ memcpy(buf, state->x.next, n); ++ state->x.have -= n; ++ state->x.next += n; ++ state->x.pos += n; ++ left -= n; ++ buf += n; ++ } while (left && eol == NULL); ++ ++ /* return terminated string, or if nothing, end of file */ ++ if (buf == str) ++ return NULL; ++ buf[0] = 0; ++ return str; ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzdirect(file) ++ gzFile file; ++{ ++ gz_statep state; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return 0; ++ state = (gz_statep)file; ++ ++ /* if the state is not known, but we can find out, then do so (this is ++ mainly for right after a gzopen() or gzdopen()) */ ++ if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0) ++ (void)gz_look(state); ++ ++ /* return 1 if transparent, 0 if processing a gzip stream */ ++ return state->direct; ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzclose_r(file) ++ gzFile file; ++{ ++ int ret, err; ++ gz_statep state; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return Z_STREAM_ERROR; ++ state = (gz_statep)file; ++ ++ /* check that we're reading */ ++ if (state->mode != GZ_READ) ++ return Z_STREAM_ERROR; ++ ++ /* free memory and close file */ ++ if (state->size) { ++ inflateEnd(&(state->strm)); ++ free(state->out); ++ free(state->in); ++ } ++ err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK; ++ gz_error(state, Z_OK, NULL); ++ free(state->path); ++ ret = close(state->fd); ++ free(state); ++ return ret ? Z_ERRNO : err; ++} +diff -r ee879c0ffa11 Modules/zlib/gzwrite.c +--- /dev/null ++++ b/Modules/zlib/gzwrite.c +@@ -0,0 +1,577 @@ ++/* gzwrite.c -- zlib functions for writing gzip files ++ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++#include "gzguts.h" ++ ++/* Local functions */ ++local int gz_init OF((gz_statep)); ++local int gz_comp OF((gz_statep, int)); ++local int gz_zero OF((gz_statep, z_off64_t)); ++ ++/* Initialize state for writing a gzip file. Mark initialization by setting ++ state->size to non-zero. Return -1 on failure or 0 on success. */ ++local int gz_init(state) ++ gz_statep state; ++{ ++ int ret; ++ z_streamp strm = &(state->strm); ++ ++ /* allocate input buffer */ ++ state->in = (unsigned char *)malloc(state->want); ++ if (state->in == NULL) { ++ gz_error(state, Z_MEM_ERROR, "out of memory"); ++ return -1; ++ } ++ ++ /* only need output buffer and deflate state if compressing */ ++ if (!state->direct) { ++ /* allocate output buffer */ ++ state->out = (unsigned char *)malloc(state->want); ++ if (state->out == NULL) { ++ free(state->in); ++ gz_error(state, Z_MEM_ERROR, "out of memory"); ++ return -1; ++ } ++ ++ /* allocate deflate memory, set up for gzip compression */ ++ strm->zalloc = Z_NULL; ++ strm->zfree = Z_NULL; ++ strm->opaque = Z_NULL; ++ ret = deflateInit2(strm, state->level, Z_DEFLATED, ++ MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy); ++ if (ret != Z_OK) { ++ free(state->out); ++ free(state->in); ++ gz_error(state, Z_MEM_ERROR, "out of memory"); ++ return -1; ++ } ++ } ++ ++ /* mark state as initialized */ ++ state->size = state->want; ++ ++ /* initialize write buffer if compressing */ ++ if (!state->direct) { ++ strm->avail_out = state->size; ++ strm->next_out = state->out; ++ state->x.next = strm->next_out; ++ } ++ return 0; ++} ++ ++/* Compress whatever is at avail_in and next_in and write to the output file. ++ Return -1 if there is an error writing to the output file, otherwise 0. ++ flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH, ++ then the deflate() state is reset to start a new gzip stream. If gz->direct ++ is true, then simply write to the output file without compressing, and ++ ignore flush. */ ++local int gz_comp(state, flush) ++ gz_statep state; ++ int flush; ++{ ++ int ret, got; ++ unsigned have; ++ z_streamp strm = &(state->strm); ++ ++ /* allocate memory if this is the first time through */ ++ if (state->size == 0 && gz_init(state) == -1) ++ return -1; ++ ++ /* write directly if requested */ ++ if (state->direct) { ++ got = write(state->fd, strm->next_in, strm->avail_in); ++ if (got < 0 || (unsigned)got != strm->avail_in) { ++ gz_error(state, Z_ERRNO, zstrerror()); ++ return -1; ++ } ++ strm->avail_in = 0; ++ return 0; ++ } ++ ++ /* run deflate() on provided input until it produces no more output */ ++ ret = Z_OK; ++ do { ++ /* write out current buffer contents if full, or if flushing, but if ++ doing Z_FINISH then don't write until we get to Z_STREAM_END */ ++ if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && ++ (flush != Z_FINISH || ret == Z_STREAM_END))) { ++ have = (unsigned)(strm->next_out - state->x.next); ++ if (have && ((got = write(state->fd, state->x.next, have)) < 0 || ++ (unsigned)got != have)) { ++ gz_error(state, Z_ERRNO, zstrerror()); ++ return -1; ++ } ++ if (strm->avail_out == 0) { ++ strm->avail_out = state->size; ++ strm->next_out = state->out; ++ } ++ state->x.next = strm->next_out; ++ } ++ ++ /* compress */ ++ have = strm->avail_out; ++ ret = deflate(strm, flush); ++ if (ret == Z_STREAM_ERROR) { ++ gz_error(state, Z_STREAM_ERROR, ++ "internal error: deflate stream corrupt"); ++ return -1; ++ } ++ have -= strm->avail_out; ++ } while (have); ++ ++ /* if that completed a deflate stream, allow another to start */ ++ if (flush == Z_FINISH) ++ deflateReset(strm); ++ ++ /* all done, no errors */ ++ return 0; ++} ++ ++/* Compress len zeros to output. Return -1 on error, 0 on success. */ ++local int gz_zero(state, len) ++ gz_statep state; ++ z_off64_t len; ++{ ++ int first; ++ unsigned n; ++ z_streamp strm = &(state->strm); ++ ++ /* consume whatever's left in the input buffer */ ++ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) ++ return -1; ++ ++ /* compress len zeros (len guaranteed > 0) */ ++ first = 1; ++ while (len) { ++ n = GT_OFF(state->size) || (z_off64_t)state->size > len ? ++ (unsigned)len : state->size; ++ if (first) { ++ memset(state->in, 0, n); ++ first = 0; ++ } ++ strm->avail_in = n; ++ strm->next_in = state->in; ++ state->x.pos += n; ++ if (gz_comp(state, Z_NO_FLUSH) == -1) ++ return -1; ++ len -= n; ++ } ++ return 0; ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzwrite(file, buf, len) ++ gzFile file; ++ voidpc buf; ++ unsigned len; ++{ ++ unsigned put = len; ++ gz_statep state; ++ z_streamp strm; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return 0; ++ state = (gz_statep)file; ++ strm = &(state->strm); ++ ++ /* check that we're writing and that there's no error */ ++ if (state->mode != GZ_WRITE || state->err != Z_OK) ++ return 0; ++ ++ /* since an int is returned, make sure len fits in one, otherwise return ++ with an error (this avoids the flaw in the interface) */ ++ if ((int)len < 0) { ++ gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); ++ return 0; ++ } ++ ++ /* if len is zero, avoid unnecessary operations */ ++ if (len == 0) ++ return 0; ++ ++ /* allocate memory if this is the first time through */ ++ if (state->size == 0 && gz_init(state) == -1) ++ return 0; ++ ++ /* check for seek request */ ++ if (state->seek) { ++ state->seek = 0; ++ if (gz_zero(state, state->skip) == -1) ++ return 0; ++ } ++ ++ /* for small len, copy to input buffer, otherwise compress directly */ ++ if (len < state->size) { ++ /* copy to input buffer, compress when full */ ++ do { ++ unsigned have, copy; ++ ++ if (strm->avail_in == 0) ++ strm->next_in = state->in; ++ have = (unsigned)((strm->next_in + strm->avail_in) - state->in); ++ copy = state->size - have; ++ if (copy > len) ++ copy = len; ++ memcpy(state->in + have, buf, copy); ++ strm->avail_in += copy; ++ state->x.pos += copy; ++ buf = (const char *)buf + copy; ++ len -= copy; ++ if (len && gz_comp(state, Z_NO_FLUSH) == -1) ++ return 0; ++ } while (len); ++ } ++ else { ++ /* consume whatever's left in the input buffer */ ++ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) ++ return 0; ++ ++ /* directly compress user buffer to file */ ++ strm->avail_in = len; ++ strm->next_in = (z_const Bytef *)buf; ++ state->x.pos += len; ++ if (gz_comp(state, Z_NO_FLUSH) == -1) ++ return 0; ++ } ++ ++ /* input was all buffered or compressed (put will fit in int) */ ++ return (int)put; ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzputc(file, c) ++ gzFile file; ++ int c; ++{ ++ unsigned have; ++ unsigned char buf[1]; ++ gz_statep state; ++ z_streamp strm; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ strm = &(state->strm); ++ ++ /* check that we're writing and that there's no error */ ++ if (state->mode != GZ_WRITE || state->err != Z_OK) ++ return -1; ++ ++ /* check for seek request */ ++ if (state->seek) { ++ state->seek = 0; ++ if (gz_zero(state, state->skip) == -1) ++ return -1; ++ } ++ ++ /* try writing to input buffer for speed (state->size == 0 if buffer not ++ initialized) */ ++ if (state->size) { ++ if (strm->avail_in == 0) ++ strm->next_in = state->in; ++ have = (unsigned)((strm->next_in + strm->avail_in) - state->in); ++ if (have < state->size) { ++ state->in[have] = c; ++ strm->avail_in++; ++ state->x.pos++; ++ return c & 0xff; ++ } ++ } ++ ++ /* no room in buffer or not initialized, use gz_write() */ ++ buf[0] = c; ++ if (gzwrite(file, buf, 1) != 1) ++ return -1; ++ return c & 0xff; ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzputs(file, str) ++ gzFile file; ++ const char *str; ++{ ++ int ret; ++ unsigned len; ++ ++ /* write string */ ++ len = (unsigned)strlen(str); ++ ret = gzwrite(file, str, len); ++ return ret == 0 && len != 0 ? -1 : ret; ++} ++ ++#if defined(STDC) || defined(Z_HAVE_STDARG_H) ++#include ++ ++/* -- see zlib.h -- */ ++int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) ++{ ++ int size, len; ++ gz_statep state; ++ z_streamp strm; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ strm = &(state->strm); ++ ++ /* check that we're writing and that there's no error */ ++ if (state->mode != GZ_WRITE || state->err != Z_OK) ++ return 0; ++ ++ /* make sure we have some buffer space */ ++ if (state->size == 0 && gz_init(state) == -1) ++ return 0; ++ ++ /* check for seek request */ ++ if (state->seek) { ++ state->seek = 0; ++ if (gz_zero(state, state->skip) == -1) ++ return 0; ++ } ++ ++ /* consume whatever's left in the input buffer */ ++ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) ++ return 0; ++ ++ /* do the printf() into the input buffer, put length in len */ ++ size = (int)(state->size); ++ state->in[size - 1] = 0; ++#ifdef NO_vsnprintf ++# ifdef HAS_vsprintf_void ++ (void)vsprintf((char *)(state->in), format, va); ++ for (len = 0; len < size; len++) ++ if (state->in[len] == 0) break; ++# else ++ len = vsprintf((char *)(state->in), format, va); ++# endif ++#else ++# ifdef HAS_vsnprintf_void ++ (void)vsnprintf((char *)(state->in), size, format, va); ++ len = strlen((char *)(state->in)); ++# else ++ len = vsnprintf((char *)(state->in), size, format, va); ++# endif ++#endif ++ ++ /* check that printf() results fit in buffer */ ++ if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) ++ return 0; ++ ++ /* update buffer and position, defer compression until needed */ ++ strm->avail_in = (unsigned)len; ++ strm->next_in = state->in; ++ state->x.pos += len; ++ return len; ++} ++ ++int ZEXPORTVA gzprintf(gzFile file, const char *format, ...) ++{ ++ va_list va; ++ int ret; ++ ++ va_start(va, format); ++ ret = gzvprintf(file, format, va); ++ va_end(va); ++ return ret; ++} ++ ++#else /* !STDC && !Z_HAVE_STDARG_H */ ++ ++/* -- see zlib.h -- */ ++int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, ++ a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) ++ gzFile file; ++ const char *format; ++ int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, ++ a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; ++{ ++ int size, len; ++ gz_statep state; ++ z_streamp strm; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ strm = &(state->strm); ++ ++ /* check that can really pass pointer in ints */ ++ if (sizeof(int) != sizeof(void *)) ++ return 0; ++ ++ /* check that we're writing and that there's no error */ ++ if (state->mode != GZ_WRITE || state->err != Z_OK) ++ return 0; ++ ++ /* make sure we have some buffer space */ ++ if (state->size == 0 && gz_init(state) == -1) ++ return 0; ++ ++ /* check for seek request */ ++ if (state->seek) { ++ state->seek = 0; ++ if (gz_zero(state, state->skip) == -1) ++ return 0; ++ } ++ ++ /* consume whatever's left in the input buffer */ ++ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) ++ return 0; ++ ++ /* do the printf() into the input buffer, put length in len */ ++ size = (int)(state->size); ++ state->in[size - 1] = 0; ++#ifdef NO_snprintf ++# ifdef HAS_sprintf_void ++ sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8, ++ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); ++ for (len = 0; len < size; len++) ++ if (state->in[len] == 0) break; ++# else ++ len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8, ++ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); ++# endif ++#else ++# ifdef HAS_snprintf_void ++ snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8, ++ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); ++ len = strlen((char *)(state->in)); ++# else ++ len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, ++ a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, ++ a19, a20); ++# endif ++#endif ++ ++ /* check that printf() results fit in buffer */ ++ if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) ++ return 0; ++ ++ /* update buffer and position, defer compression until needed */ ++ strm->avail_in = (unsigned)len; ++ strm->next_in = state->in; ++ state->x.pos += len; ++ return len; ++} ++ ++#endif ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzflush(file, flush) ++ gzFile file; ++ int flush; ++{ ++ gz_statep state; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return -1; ++ state = (gz_statep)file; ++ ++ /* check that we're writing and that there's no error */ ++ if (state->mode != GZ_WRITE || state->err != Z_OK) ++ return Z_STREAM_ERROR; ++ ++ /* check flush parameter */ ++ if (flush < 0 || flush > Z_FINISH) ++ return Z_STREAM_ERROR; ++ ++ /* check for seek request */ ++ if (state->seek) { ++ state->seek = 0; ++ if (gz_zero(state, state->skip) == -1) ++ return -1; ++ } ++ ++ /* compress remaining data with requested flush */ ++ gz_comp(state, flush); ++ return state->err; ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzsetparams(file, level, strategy) ++ gzFile file; ++ int level; ++ int strategy; ++{ ++ gz_statep state; ++ z_streamp strm; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return Z_STREAM_ERROR; ++ state = (gz_statep)file; ++ strm = &(state->strm); ++ ++ /* check that we're writing and that there's no error */ ++ if (state->mode != GZ_WRITE || state->err != Z_OK) ++ return Z_STREAM_ERROR; ++ ++ /* if no change is requested, then do nothing */ ++ if (level == state->level && strategy == state->strategy) ++ return Z_OK; ++ ++ /* check for seek request */ ++ if (state->seek) { ++ state->seek = 0; ++ if (gz_zero(state, state->skip) == -1) ++ return -1; ++ } ++ ++ /* change compression parameters for subsequent input */ ++ if (state->size) { ++ /* flush previous input with previous parameters before changing */ ++ if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1) ++ return state->err; ++ deflateParams(strm, level, strategy); ++ } ++ state->level = level; ++ state->strategy = strategy; ++ return Z_OK; ++} ++ ++/* -- see zlib.h -- */ ++int ZEXPORT gzclose_w(file) ++ gzFile file; ++{ ++ int ret = Z_OK; ++ gz_statep state; ++ ++ /* get internal structure */ ++ if (file == NULL) ++ return Z_STREAM_ERROR; ++ state = (gz_statep)file; ++ ++ /* check that we're writing */ ++ if (state->mode != GZ_WRITE) ++ return Z_STREAM_ERROR; ++ ++ /* check for seek request */ ++ if (state->seek) { ++ state->seek = 0; ++ if (gz_zero(state, state->skip) == -1) ++ ret = state->err; ++ } ++ ++ /* flush, free memory, and close file */ ++ if (gz_comp(state, Z_FINISH) == -1) ++ ret = state->err; ++ if (state->size) { ++ if (!state->direct) { ++ (void)deflateEnd(&(state->strm)); ++ free(state->out); ++ } ++ free(state->in); ++ } ++ gz_error(state, Z_OK, NULL); ++ free(state->path); ++ if (close(state->fd) == -1) ++ ret = Z_ERRNO; ++ free(state); ++ return ret; ++} +diff -r ee879c0ffa11 Modules/zlib/infback.c +--- a/Modules/zlib/infback.c ++++ b/Modules/zlib/infback.c +@@ -1,5 +1,5 @@ + /* infback.c -- inflate using a call-back interface +- * Copyright (C) 1995-2005 Mark Adler ++ * Copyright (C) 1995-2011 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -42,10 +42,19 @@ + return Z_STREAM_ERROR; + strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { ++#ifdef Z_SOLO ++ return Z_STREAM_ERROR; ++#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; ++#endif + } +- if (strm->zfree == (free_func)0) strm->zfree = zcfree; ++ if (strm->zfree == (free_func)0) ++#ifdef Z_SOLO ++ return Z_STREAM_ERROR; ++#else ++ strm->zfree = zcfree; ++#endif + state = (struct inflate_state FAR *)ZALLOC(strm, 1, + sizeof(struct inflate_state)); + if (state == Z_NULL) return Z_MEM_ERROR; +@@ -55,7 +64,7 @@ + state->wbits = windowBits; + state->wsize = 1U << windowBits; + state->window = window; +- state->write = 0; ++ state->wnext = 0; + state->whave = 0; + return Z_OK; + } +@@ -246,14 +255,14 @@ + void FAR *out_desc; + { + struct inflate_state FAR *state; +- unsigned char FAR *next; /* next input */ ++ z_const unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have, left; /* available input and output */ + unsigned long hold; /* bit buffer */ + unsigned bits; /* bits in bit buffer */ + unsigned copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ +- code this; /* current decoding table entry */ ++ code here; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ +@@ -389,19 +398,18 @@ + state->have = 0; + while (state->have < state->nlen + state->ndist) { + for (;;) { +- this = state->lencode[BITS(state->lenbits)]; +- if ((unsigned)(this.bits) <= bits) break; ++ here = state->lencode[BITS(state->lenbits)]; ++ if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } +- if (this.val < 16) { +- NEEDBITS(this.bits); +- DROPBITS(this.bits); +- state->lens[state->have++] = this.val; ++ if (here.val < 16) { ++ DROPBITS(here.bits); ++ state->lens[state->have++] = here.val; + } + else { +- if (this.val == 16) { +- NEEDBITS(this.bits + 2); +- DROPBITS(this.bits); ++ if (here.val == 16) { ++ NEEDBITS(here.bits + 2); ++ DROPBITS(here.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; +@@ -411,16 +419,16 @@ + copy = 3 + BITS(2); + DROPBITS(2); + } +- else if (this.val == 17) { +- NEEDBITS(this.bits + 3); +- DROPBITS(this.bits); ++ else if (here.val == 17) { ++ NEEDBITS(here.bits + 3); ++ DROPBITS(here.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { +- NEEDBITS(this.bits + 7); +- DROPBITS(this.bits); ++ NEEDBITS(here.bits + 7); ++ DROPBITS(here.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); +@@ -438,7 +446,16 @@ + /* handle error breaks in while */ + if (state->mode == BAD) break; + +- /* build code tables */ ++ /* check for end-of-block code (better have one) */ ++ if (state->lens[256] == 0) { ++ strm->msg = (char *)"invalid code -- missing end-of-block"; ++ state->mode = BAD; ++ break; ++ } ++ ++ /* build code tables -- note: do not change the lenbits or distbits ++ values here (9 and 6) without reading the comments in inftrees.h ++ concerning the ENOUGH constants, which depend on those values */ + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 9; +@@ -474,28 +491,28 @@ + + /* get a literal, length, or end-of-block code */ + for (;;) { +- this = state->lencode[BITS(state->lenbits)]; +- if ((unsigned)(this.bits) <= bits) break; ++ here = state->lencode[BITS(state->lenbits)]; ++ if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } +- if (this.op && (this.op & 0xf0) == 0) { +- last = this; ++ if (here.op && (here.op & 0xf0) == 0) { ++ last = here; + for (;;) { +- this = state->lencode[last.val + ++ here = state->lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; +- if ((unsigned)(last.bits + this.bits) <= bits) break; ++ if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } +- DROPBITS(this.bits); +- state->length = (unsigned)this.val; ++ DROPBITS(here.bits); ++ state->length = (unsigned)here.val; + + /* process literal */ +- if (this.op == 0) { +- Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? ++ if (here.op == 0) { ++ Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + "inflate: literal '%c'\n" : +- "inflate: literal 0x%02x\n", this.val)); ++ "inflate: literal 0x%02x\n", here.val)); + ROOM(); + *put++ = (unsigned char)(state->length); + left--; +@@ -504,21 +521,21 @@ + } + + /* process end of block */ +- if (this.op & 32) { ++ if (here.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + + /* invalid code */ +- if (this.op & 64) { ++ if (here.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + + /* length code -- get extra bits, if any */ +- state->extra = (unsigned)(this.op) & 15; ++ state->extra = (unsigned)(here.op) & 15; + if (state->extra != 0) { + NEEDBITS(state->extra); + state->length += BITS(state->extra); +@@ -528,30 +545,30 @@ + + /* get distance code */ + for (;;) { +- this = state->distcode[BITS(state->distbits)]; +- if ((unsigned)(this.bits) <= bits) break; ++ here = state->distcode[BITS(state->distbits)]; ++ if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } +- if ((this.op & 0xf0) == 0) { +- last = this; ++ if ((here.op & 0xf0) == 0) { ++ last = here; + for (;;) { +- this = state->distcode[last.val + ++ here = state->distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; +- if ((unsigned)(last.bits + this.bits) <= bits) break; ++ if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } +- DROPBITS(this.bits); +- if (this.op & 64) { ++ DROPBITS(here.bits); ++ if (here.op & 64) { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } +- state->offset = (unsigned)this.val; ++ state->offset = (unsigned)here.val; + + /* get distance extra bits, if any */ +- state->extra = (unsigned)(this.op) & 15; ++ state->extra = (unsigned)(here.op) & 15; + if (state->extra != 0) { + NEEDBITS(state->extra); + state->offset += BITS(state->extra); +diff -r ee879c0ffa11 Modules/zlib/inffast.c +--- a/Modules/zlib/inffast.c ++++ b/Modules/zlib/inffast.c +@@ -1,5 +1,5 @@ + /* inffast.c -- fast decoding +- * Copyright (C) 1995-2004 Mark Adler ++ * Copyright (C) 1995-2008, 2010, 2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -64,13 +64,13 @@ + requires strm->avail_out >= 258 for each loop to avoid checking for + output space. + */ +-void inflate_fast(strm, start) ++void ZLIB_INTERNAL inflate_fast(strm, start) + z_streamp strm; + unsigned start; /* inflate()'s starting value for strm->avail_out */ + { + struct inflate_state FAR *state; +- unsigned char FAR *in; /* local strm->next_in */ +- unsigned char FAR *last; /* while in < last, enough input available */ ++ z_const unsigned char FAR *in; /* local strm->next_in */ ++ z_const unsigned char FAR *last; /* have enough input while in < last */ + unsigned char FAR *out; /* local strm->next_out */ + unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ + unsigned char FAR *end; /* while out < end, enough space available */ +@@ -79,7 +79,7 @@ + #endif + unsigned wsize; /* window size or zero if not using window */ + unsigned whave; /* valid bytes in the window */ +- unsigned write; /* window write index */ ++ unsigned wnext; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ + unsigned long hold; /* local strm->hold */ + unsigned bits; /* local strm->bits */ +@@ -87,7 +87,7 @@ + code const FAR *dcode; /* local strm->distcode */ + unsigned lmask; /* mask for first level of length codes */ + unsigned dmask; /* mask for first level of distance codes */ +- code this; /* retrieved table entry */ ++ code here; /* retrieved table entry */ + unsigned op; /* code bits, operation, extra bits, or */ + /* window position, window bytes to copy */ + unsigned len; /* match length, unused bytes */ +@@ -106,7 +106,7 @@ + #endif + wsize = state->wsize; + whave = state->whave; +- write = state->write; ++ wnext = state->wnext; + window = state->window; + hold = state->hold; + bits = state->bits; +@@ -124,20 +124,20 @@ + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } +- this = lcode[hold & lmask]; ++ here = lcode[hold & lmask]; + dolen: +- op = (unsigned)(this.bits); ++ op = (unsigned)(here.bits); + hold >>= op; + bits -= op; +- op = (unsigned)(this.op); ++ op = (unsigned)(here.op); + if (op == 0) { /* literal */ +- Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? ++ Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + "inflate: literal '%c'\n" : +- "inflate: literal 0x%02x\n", this.val)); +- PUP(out) = (unsigned char)(this.val); ++ "inflate: literal 0x%02x\n", here.val)); ++ PUP(out) = (unsigned char)(here.val); + } + else if (op & 16) { /* length base */ +- len = (unsigned)(this.val); ++ len = (unsigned)(here.val); + op &= 15; /* number of extra bits */ + if (op) { + if (bits < op) { +@@ -155,14 +155,14 @@ + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } +- this = dcode[hold & dmask]; ++ here = dcode[hold & dmask]; + dodist: +- op = (unsigned)(this.bits); ++ op = (unsigned)(here.bits); + hold >>= op; + bits -= op; +- op = (unsigned)(this.op); ++ op = (unsigned)(here.op); + if (op & 16) { /* distance base */ +- dist = (unsigned)(this.val); ++ dist = (unsigned)(here.val); + op &= 15; /* number of extra bits */ + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; +@@ -187,12 +187,34 @@ + if (dist > op) { /* see if copy from window */ + op = dist - op; /* distance back in window */ + if (op > whave) { +- strm->msg = (char *)"invalid distance too far back"; +- state->mode = BAD; +- break; ++ if (state->sane) { ++ strm->msg = ++ (char *)"invalid distance too far back"; ++ state->mode = BAD; ++ break; ++ } ++#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR ++ if (len <= op - whave) { ++ do { ++ PUP(out) = 0; ++ } while (--len); ++ continue; ++ } ++ len -= op - whave; ++ do { ++ PUP(out) = 0; ++ } while (--op > whave); ++ if (op == 0) { ++ from = out - dist; ++ do { ++ PUP(out) = PUP(from); ++ } while (--len); ++ continue; ++ } ++#endif + } + from = window - OFF; +- if (write == 0) { /* very common case */ ++ if (wnext == 0) { /* very common case */ + from += wsize - op; + if (op < len) { /* some from window */ + len -= op; +@@ -202,17 +224,17 @@ + from = out - dist; /* rest from output */ + } + } +- else if (write < op) { /* wrap around window */ +- from += wsize + write - op; +- op -= write; ++ else if (wnext < op) { /* wrap around window */ ++ from += wsize + wnext - op; ++ op -= wnext; + if (op < len) { /* some from end of window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = window - OFF; +- if (write < len) { /* some from start of window */ +- op = write; ++ if (wnext < len) { /* some from start of window */ ++ op = wnext; + len -= op; + do { + PUP(out) = PUP(from); +@@ -222,7 +244,7 @@ + } + } + else { /* contiguous in window */ +- from += write - op; ++ from += wnext - op; + if (op < len) { /* some from window */ + len -= op; + do { +@@ -259,7 +281,7 @@ + } + } + else if ((op & 64) == 0) { /* 2nd level distance code */ +- this = dcode[this.val + (hold & ((1U << op) - 1))]; ++ here = dcode[here.val + (hold & ((1U << op) - 1))]; + goto dodist; + } + else { +@@ -269,7 +291,7 @@ + } + } + else if ((op & 64) == 0) { /* 2nd level length code */ +- this = lcode[this.val + (hold & ((1U << op) - 1))]; ++ here = lcode[here.val + (hold & ((1U << op) - 1))]; + goto dolen; + } + else if (op & 32) { /* end-of-block */ +@@ -305,7 +327,7 @@ + inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): + - Using bit fields for code structure + - Different op definition to avoid & for extra bits (do & for table bits) +- - Three separate decoding do-loops for direct, window, and write == 0 ++ - Three separate decoding do-loops for direct, window, and wnext == 0 + - Special case for distance > 1 copies to do overlapped load and store copy + - Explicit branch predictions (based on measured branch probabilities) + - Deferring match copy and interspersed it with decoding subsequent codes +diff -r ee879c0ffa11 Modules/zlib/inffast.h +--- a/Modules/zlib/inffast.h ++++ b/Modules/zlib/inffast.h +@@ -1,5 +1,5 @@ + /* inffast.h -- header to use inffast.c +- * Copyright (C) 1995-2003 Mark Adler ++ * Copyright (C) 1995-2003, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -8,4 +8,4 @@ + subject to change. Applications should only use zlib.h. + */ + +-void inflate_fast OF((z_streamp strm, unsigned start)); ++void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); +diff -r ee879c0ffa11 Modules/zlib/inffixed.h +--- a/Modules/zlib/inffixed.h ++++ b/Modules/zlib/inffixed.h +@@ -2,9 +2,9 @@ + * Generated automatically by makefixed(). + */ + +- /* WARNING: this file should *not* be used by applications. It +- is part of the implementation of the compression library and +- is subject to change. Applications should only use zlib.h. ++ /* WARNING: this file should *not* be used by applications. ++ It is part of the implementation of this library and is ++ subject to change. Applications should only use zlib.h. + */ + + static const code lenfix[512] = { +diff -r ee879c0ffa11 Modules/zlib/inflate.c +--- a/Modules/zlib/inflate.c ++++ b/Modules/zlib/inflate.c +@@ -1,5 +1,5 @@ + /* inflate.c -- zlib decompression +- * Copyright (C) 1995-2005 Mark Adler ++ * Copyright (C) 1995-2012 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -45,7 +45,7 @@ + * - Rearrange window copies in inflate_fast() for speed and simplification + * - Unroll last copy for window match in inflate_fast() + * - Use local copies of window variables in inflate_fast() for speed +- * - Pull out common write == 0 case for speed in inflate_fast() ++ * - Pull out common wnext == 0 case for speed in inflate_fast() + * - Make op and len in inflate_fast() unsigned for consistency + * - Add FAR to lcode and dcode declarations in inflate_fast() + * - Simplified bad distance check in inflate_fast() +@@ -93,13 +93,39 @@ + + /* function prototypes */ + local void fixedtables OF((struct inflate_state FAR *state)); +-local int updatewindow OF((z_streamp strm, unsigned out)); ++local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, ++ unsigned copy)); + #ifdef BUILDFIXED + void makefixed OF((void)); + #endif +-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf, ++local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf, + unsigned len)); + ++int ZEXPORT inflateResetKeep(strm) ++z_streamp strm; ++{ ++ struct inflate_state FAR *state; ++ ++ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; ++ state = (struct inflate_state FAR *)strm->state; ++ strm->total_in = strm->total_out = state->total = 0; ++ strm->msg = Z_NULL; ++ if (state->wrap) /* to support ill-conceived Java test suite */ ++ strm->adler = state->wrap & 1; ++ state->mode = HEAD; ++ state->last = 0; ++ state->havedict = 0; ++ state->dmax = 32768U; ++ state->head = Z_NULL; ++ state->hold = 0; ++ state->bits = 0; ++ state->lencode = state->distcode = state->next = state->codes; ++ state->sane = 1; ++ state->back = -1; ++ Tracev((stderr, "inflate: reset\n")); ++ return Z_OK; ++} ++ + int ZEXPORT inflateReset(strm) + z_streamp strm; + { +@@ -107,22 +133,98 @@ + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; +- strm->total_in = strm->total_out = state->total = 0; +- strm->msg = Z_NULL; +- strm->adler = 1; /* to support ill-conceived Java test suite */ +- state->mode = HEAD; +- state->last = 0; +- state->havedict = 0; +- state->dmax = 32768U; +- state->head = Z_NULL; + state->wsize = 0; + state->whave = 0; +- state->write = 0; +- state->hold = 0; +- state->bits = 0; +- state->lencode = state->distcode = state->next = state->codes; +- Tracev((stderr, "inflate: reset\n")); +- return Z_OK; ++ state->wnext = 0; ++ return inflateResetKeep(strm); ++} ++ ++int ZEXPORT inflateReset2(strm, windowBits) ++z_streamp strm; ++int windowBits; ++{ ++ int wrap; ++ struct inflate_state FAR *state; ++ ++ /* get the state */ ++ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; ++ state = (struct inflate_state FAR *)strm->state; ++ ++ /* extract wrap request from windowBits parameter */ ++ if (windowBits < 0) { ++ wrap = 0; ++ windowBits = -windowBits; ++ } ++ else { ++ wrap = (windowBits >> 4) + 1; ++#ifdef GUNZIP ++ if (windowBits < 48) ++ windowBits &= 15; ++#endif ++ } ++ ++ /* set number of window bits, free window if different */ ++ if (windowBits && (windowBits < 8 || windowBits > 15)) ++ return Z_STREAM_ERROR; ++ if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) { ++ ZFREE(strm, state->window); ++ state->window = Z_NULL; ++ } ++ ++ /* update state and reset the rest of it */ ++ state->wrap = wrap; ++ state->wbits = (unsigned)windowBits; ++ return inflateReset(strm); ++} ++ ++int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) ++z_streamp strm; ++int windowBits; ++const char *version; ++int stream_size; ++{ ++ int ret; ++ struct inflate_state FAR *state; ++ ++ if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || ++ stream_size != (int)(sizeof(z_stream))) ++ return Z_VERSION_ERROR; ++ if (strm == Z_NULL) return Z_STREAM_ERROR; ++ strm->msg = Z_NULL; /* in case we return an error */ ++ if (strm->zalloc == (alloc_func)0) { ++#ifdef Z_SOLO ++ return Z_STREAM_ERROR; ++#else ++ strm->zalloc = zcalloc; ++ strm->opaque = (voidpf)0; ++#endif ++ } ++ if (strm->zfree == (free_func)0) ++#ifdef Z_SOLO ++ return Z_STREAM_ERROR; ++#else ++ strm->zfree = zcfree; ++#endif ++ state = (struct inflate_state FAR *) ++ ZALLOC(strm, 1, sizeof(struct inflate_state)); ++ if (state == Z_NULL) return Z_MEM_ERROR; ++ Tracev((stderr, "inflate: allocated\n")); ++ strm->state = (struct internal_state FAR *)state; ++ state->window = Z_NULL; ++ ret = inflateReset2(strm, windowBits); ++ if (ret != Z_OK) { ++ ZFREE(strm, state); ++ strm->state = Z_NULL; ++ } ++ return ret; ++} ++ ++int ZEXPORT inflateInit_(strm, version, stream_size) ++z_streamp strm; ++const char *version; ++int stream_size; ++{ ++ return inflateInit2_(strm, DEF_WBITS, version, stream_size); + } + + int ZEXPORT inflatePrime(strm, bits, value) +@@ -134,6 +236,11 @@ + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; ++ if (bits < 0) { ++ state->hold = 0; ++ state->bits = 0; ++ return Z_OK; ++ } + if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; + value &= (1L << bits) - 1; + state->hold += value << state->bits; +@@ -141,57 +248,6 @@ + return Z_OK; + } + +-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) +-z_streamp strm; +-int windowBits; +-const char *version; +-int stream_size; +-{ +- struct inflate_state FAR *state; +- +- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || +- stream_size != (int)(sizeof(z_stream))) +- return Z_VERSION_ERROR; +- if (strm == Z_NULL) return Z_STREAM_ERROR; +- strm->msg = Z_NULL; /* in case we return an error */ +- if (strm->zalloc == (alloc_func)0) { +- strm->zalloc = zcalloc; +- strm->opaque = (voidpf)0; +- } +- if (strm->zfree == (free_func)0) strm->zfree = zcfree; +- state = (struct inflate_state FAR *) +- ZALLOC(strm, 1, sizeof(struct inflate_state)); +- if (state == Z_NULL) return Z_MEM_ERROR; +- Tracev((stderr, "inflate: allocated\n")); +- strm->state = (struct internal_state FAR *)state; +- if (windowBits < 0) { +- state->wrap = 0; +- windowBits = -windowBits; +- } +- else { +- state->wrap = (windowBits >> 4) + 1; +-#ifdef GUNZIP +- if (windowBits < 48) windowBits &= 15; +-#endif +- } +- if (windowBits < 8 || windowBits > 15) { +- ZFREE(strm, state); +- strm->state = Z_NULL; +- return Z_STREAM_ERROR; +- } +- state->wbits = (unsigned)windowBits; +- state->window = Z_NULL; +- return inflateReset(strm); +-} +- +-int ZEXPORT inflateInit_(strm, version, stream_size) +-z_streamp strm; +-const char *version; +-int stream_size; +-{ +- return inflateInit2_(strm, DEF_WBITS, version, stream_size); +-} +- + /* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. +@@ -286,8 +342,8 @@ + low = 0; + for (;;) { + if ((low % 7) == 0) printf("\n "); +- printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits, +- state.lencode[low].val); ++ printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op, ++ state.lencode[low].bits, state.lencode[low].val); + if (++low == size) break; + putchar(','); + } +@@ -320,12 +376,13 @@ + output will fall in the output data, making match copies simpler and faster. + The advantage may be dependent on the size of the processor's data caches. + */ +-local int updatewindow(strm, out) ++local int updatewindow(strm, end, copy) + z_streamp strm; +-unsigned out; ++const Bytef *end; ++unsigned copy; + { + struct inflate_state FAR *state; +- unsigned copy, dist; ++ unsigned dist; + + state = (struct inflate_state FAR *)strm->state; + +@@ -340,30 +397,29 @@ + /* if window not in use yet, initialize */ + if (state->wsize == 0) { + state->wsize = 1U << state->wbits; +- state->write = 0; ++ state->wnext = 0; + state->whave = 0; + } + + /* copy state->wsize or less output bytes into the circular window */ +- copy = out - strm->avail_out; + if (copy >= state->wsize) { +- zmemcpy(state->window, strm->next_out - state->wsize, state->wsize); +- state->write = 0; ++ zmemcpy(state->window, end - state->wsize, state->wsize); ++ state->wnext = 0; + state->whave = state->wsize; + } + else { +- dist = state->wsize - state->write; ++ dist = state->wsize - state->wnext; + if (dist > copy) dist = copy; +- zmemcpy(state->window + state->write, strm->next_out - copy, dist); ++ zmemcpy(state->window + state->wnext, end - copy, dist); + copy -= dist; + if (copy) { +- zmemcpy(state->window, strm->next_out - copy, copy); +- state->write = copy; ++ zmemcpy(state->window, end - copy, copy); ++ state->wnext = copy; + state->whave = state->wsize; + } + else { +- state->write += dist; +- if (state->write == state->wsize) state->write = 0; ++ state->wnext += dist; ++ if (state->wnext == state->wsize) state->wnext = 0; + if (state->whave < state->wsize) state->whave += dist; + } + } +@@ -464,11 +520,6 @@ + bits -= bits & 7; \ + } while (0) + +-/* Reverse the bytes in a 32-bit value */ +-#define REVERSE(q) \ +- ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ +- (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) +- + /* + inflate() uses a state machine to process as much input data and generate as + much output data as possible before returning. The state machine is +@@ -556,7 +607,7 @@ + int flush; + { + struct inflate_state FAR *state; +- unsigned char FAR *next; /* next input */ ++ z_const unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have, left; /* available input and output */ + unsigned long hold; /* bit buffer */ +@@ -564,7 +615,7 @@ + unsigned in, out; /* save starting available input and output */ + unsigned copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ +- code this; /* current decoding table entry */ ++ code here; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ +@@ -619,7 +670,9 @@ + } + DROPBITS(4); + len = BITS(4) + 8; +- if (len > state->wbits) { ++ if (state->wbits == 0) ++ state->wbits = len; ++ else if (len > state->wbits) { + strm->msg = (char *)"invalid window size"; + state->mode = BAD; + break; +@@ -760,7 +813,7 @@ + #endif + case DICTID: + NEEDBITS(32); +- strm->adler = state->check = REVERSE(hold); ++ strm->adler = state->check = ZSWAP32(hold); + INITBITS(); + state->mode = DICT; + case DICT: +@@ -771,7 +824,7 @@ + strm->adler = state->check = adler32(0L, Z_NULL, 0); + state->mode = TYPE; + case TYPE: +- if (flush == Z_BLOCK) goto inf_leave; ++ if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave; + case TYPEDO: + if (state->last) { + BYTEBITS(); +@@ -791,7 +844,11 @@ + fixedtables(state); + Tracev((stderr, "inflate: fixed codes block%s\n", + state->last ? " (last)" : "")); +- state->mode = LEN; /* decode codes */ ++ state->mode = LEN_; /* decode codes */ ++ if (flush == Z_TREES) { ++ DROPBITS(2); ++ goto inf_leave; ++ } + break; + case 2: /* dynamic block */ + Tracev((stderr, "inflate: dynamic codes block%s\n", +@@ -816,6 +873,9 @@ + Tracev((stderr, "inflate: stored length %u\n", + state->length)); + INITBITS(); ++ state->mode = COPY_; ++ if (flush == Z_TREES) goto inf_leave; ++ case COPY_: + state->mode = COPY; + case COPY: + copy = state->length; +@@ -861,7 +921,7 @@ + while (state->have < 19) + state->lens[order[state->have++]] = 0; + state->next = state->codes; +- state->lencode = (code const FAR *)(state->next); ++ state->lencode = (const code FAR *)(state->next); + state->lenbits = 7; + ret = inflate_table(CODES, state->lens, 19, &(state->next), + &(state->lenbits), state->work); +@@ -876,19 +936,18 @@ + case CODELENS: + while (state->have < state->nlen + state->ndist) { + for (;;) { +- this = state->lencode[BITS(state->lenbits)]; +- if ((unsigned)(this.bits) <= bits) break; ++ here = state->lencode[BITS(state->lenbits)]; ++ if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } +- if (this.val < 16) { +- NEEDBITS(this.bits); +- DROPBITS(this.bits); +- state->lens[state->have++] = this.val; ++ if (here.val < 16) { ++ DROPBITS(here.bits); ++ state->lens[state->have++] = here.val; + } + else { +- if (this.val == 16) { +- NEEDBITS(this.bits + 2); +- DROPBITS(this.bits); ++ if (here.val == 16) { ++ NEEDBITS(here.bits + 2); ++ DROPBITS(here.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; +@@ -898,16 +957,16 @@ + copy = 3 + BITS(2); + DROPBITS(2); + } +- else if (this.val == 17) { +- NEEDBITS(this.bits + 3); +- DROPBITS(this.bits); ++ else if (here.val == 17) { ++ NEEDBITS(here.bits + 3); ++ DROPBITS(here.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { +- NEEDBITS(this.bits + 7); +- DROPBITS(this.bits); ++ NEEDBITS(here.bits + 7); ++ DROPBITS(here.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); +@@ -925,9 +984,18 @@ + /* handle error breaks in while */ + if (state->mode == BAD) break; + +- /* build code tables */ ++ /* check for end-of-block code (better have one) */ ++ if (state->lens[256] == 0) { ++ strm->msg = (char *)"invalid code -- missing end-of-block"; ++ state->mode = BAD; ++ break; ++ } ++ ++ /* build code tables -- note: do not change the lenbits or distbits ++ values here (9 and 6) without reading the comments in inftrees.h ++ concerning the ENOUGH constants, which depend on those values */ + state->next = state->codes; +- state->lencode = (code const FAR *)(state->next); ++ state->lencode = (const code FAR *)(state->next); + state->lenbits = 9; + ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), + &(state->lenbits), state->work); +@@ -936,7 +1004,7 @@ + state->mode = BAD; + break; + } +- state->distcode = (code const FAR *)(state->next); ++ state->distcode = (const code FAR *)(state->next); + state->distbits = 6; + ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, + &(state->next), &(state->distbits), state->work); +@@ -946,88 +1014,102 @@ + break; + } + Tracev((stderr, "inflate: codes ok\n")); ++ state->mode = LEN_; ++ if (flush == Z_TREES) goto inf_leave; ++ case LEN_: + state->mode = LEN; + case LEN: + if (have >= 6 && left >= 258) { + RESTORE(); + inflate_fast(strm, out); + LOAD(); ++ if (state->mode == TYPE) ++ state->back = -1; + break; + } ++ state->back = 0; + for (;;) { +- this = state->lencode[BITS(state->lenbits)]; +- if ((unsigned)(this.bits) <= bits) break; ++ here = state->lencode[BITS(state->lenbits)]; ++ if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } +- if (this.op && (this.op & 0xf0) == 0) { +- last = this; ++ if (here.op && (here.op & 0xf0) == 0) { ++ last = here; + for (;;) { +- this = state->lencode[last.val + ++ here = state->lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; +- if ((unsigned)(last.bits + this.bits) <= bits) break; ++ if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); ++ state->back += last.bits; + } +- DROPBITS(this.bits); +- state->length = (unsigned)this.val; +- if ((int)(this.op) == 0) { +- Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? ++ DROPBITS(here.bits); ++ state->back += here.bits; ++ state->length = (unsigned)here.val; ++ if ((int)(here.op) == 0) { ++ Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + "inflate: literal '%c'\n" : +- "inflate: literal 0x%02x\n", this.val)); ++ "inflate: literal 0x%02x\n", here.val)); + state->mode = LIT; + break; + } +- if (this.op & 32) { ++ if (here.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); ++ state->back = -1; + state->mode = TYPE; + break; + } +- if (this.op & 64) { ++ if (here.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } +- state->extra = (unsigned)(this.op) & 15; ++ state->extra = (unsigned)(here.op) & 15; + state->mode = LENEXT; + case LENEXT: + if (state->extra) { + NEEDBITS(state->extra); + state->length += BITS(state->extra); + DROPBITS(state->extra); ++ state->back += state->extra; + } + Tracevv((stderr, "inflate: length %u\n", state->length)); ++ state->was = state->length; + state->mode = DIST; + case DIST: + for (;;) { +- this = state->distcode[BITS(state->distbits)]; +- if ((unsigned)(this.bits) <= bits) break; ++ here = state->distcode[BITS(state->distbits)]; ++ if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } +- if ((this.op & 0xf0) == 0) { +- last = this; ++ if ((here.op & 0xf0) == 0) { ++ last = here; + for (;;) { +- this = state->distcode[last.val + ++ here = state->distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; +- if ((unsigned)(last.bits + this.bits) <= bits) break; ++ if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); ++ state->back += last.bits; + } +- DROPBITS(this.bits); +- if (this.op & 64) { ++ DROPBITS(here.bits); ++ state->back += here.bits; ++ if (here.op & 64) { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } +- state->offset = (unsigned)this.val; +- state->extra = (unsigned)(this.op) & 15; ++ state->offset = (unsigned)here.val; ++ state->extra = (unsigned)(here.op) & 15; + state->mode = DISTEXT; + case DISTEXT: + if (state->extra) { + NEEDBITS(state->extra); + state->offset += BITS(state->extra); + DROPBITS(state->extra); ++ state->back += state->extra; + } + #ifdef INFLATE_STRICT + if (state->offset > state->dmax) { +@@ -1036,11 +1118,6 @@ + break; + } + #endif +- if (state->offset > state->whave + out - left) { +- strm->msg = (char *)"invalid distance too far back"; +- state->mode = BAD; +- break; +- } + Tracevv((stderr, "inflate: distance %u\n", state->offset)); + state->mode = MATCH; + case MATCH: +@@ -1048,12 +1125,32 @@ + copy = out - left; + if (state->offset > copy) { /* copy from window */ + copy = state->offset - copy; +- if (copy > state->write) { +- copy -= state->write; ++ if (copy > state->whave) { ++ if (state->sane) { ++ strm->msg = (char *)"invalid distance too far back"; ++ state->mode = BAD; ++ break; ++ } ++#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR ++ Trace((stderr, "inflate.c too far\n")); ++ copy -= state->whave; ++ if (copy > state->length) copy = state->length; ++ if (copy > left) copy = left; ++ left -= copy; ++ state->length -= copy; ++ do { ++ *put++ = 0; ++ } while (--copy); ++ if (state->length == 0) state->mode = LEN; ++ break; ++#endif ++ } ++ if (copy > state->wnext) { ++ copy -= state->wnext; + from = state->window + (state->wsize - copy); + } + else +- from = state->window + (state->write - copy); ++ from = state->window + (state->wnext - copy); + if (copy > state->length) copy = state->length; + } + else { /* copy from output */ +@@ -1088,7 +1185,7 @@ + #ifdef GUNZIP + state->flags ? hold : + #endif +- REVERSE(hold)) != state->check) { ++ ZSWAP32(hold)) != state->check) { + strm->msg = (char *)"incorrect data check"; + state->mode = BAD; + break; +@@ -1132,8 +1229,9 @@ + */ + inf_leave: + RESTORE(); +- if (state->wsize || (state->mode < CHECK && out != strm->avail_out)) +- if (updatewindow(strm, out)) { ++ if (state->wsize || (out != strm->avail_out && state->mode < BAD && ++ (state->mode < CHECK || flush != Z_FINISH))) ++ if (updatewindow(strm, strm->next_out, out - strm->avail_out)) { + state->mode = MEM; + return Z_MEM_ERROR; + } +@@ -1146,7 +1244,8 @@ + strm->adler = state->check = + UPDATE(state->check, strm->next_out - out, out); + strm->data_type = state->bits + (state->last ? 64 : 0) + +- (state->mode == TYPE ? 128 : 0); ++ (state->mode == TYPE ? 128 : 0) + ++ (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); + if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) + ret = Z_BUF_ERROR; + return ret; +@@ -1166,13 +1265,37 @@ + return Z_OK; + } + ++int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength) ++z_streamp strm; ++Bytef *dictionary; ++uInt *dictLength; ++{ ++ struct inflate_state FAR *state; ++ ++ /* check state */ ++ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; ++ state = (struct inflate_state FAR *)strm->state; ++ ++ /* copy dictionary */ ++ if (state->whave && dictionary != Z_NULL) { ++ zmemcpy(dictionary, state->window + state->wnext, ++ state->whave - state->wnext); ++ zmemcpy(dictionary + state->whave - state->wnext, ++ state->window, state->wnext); ++ } ++ if (dictLength != Z_NULL) ++ *dictLength = state->whave; ++ return Z_OK; ++} ++ + int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) + z_streamp strm; + const Bytef *dictionary; + uInt dictLength; + { + struct inflate_state FAR *state; +- unsigned long id; ++ unsigned long dictid; ++ int ret; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; +@@ -1180,29 +1303,21 @@ + if (state->wrap != 0 && state->mode != DICT) + return Z_STREAM_ERROR; + +- /* check for correct dictionary id */ ++ /* check for correct dictionary identifier */ + if (state->mode == DICT) { +- id = adler32(0L, Z_NULL, 0); +- id = adler32(id, dictionary, dictLength); +- if (id != state->check) ++ dictid = adler32(0L, Z_NULL, 0); ++ dictid = adler32(dictid, dictionary, dictLength); ++ if (dictid != state->check) + return Z_DATA_ERROR; + } + +- /* copy dictionary to window */ +- if (updatewindow(strm, strm->avail_out)) { ++ /* copy dictionary to window using updatewindow(), which will amend the ++ existing dictionary if appropriate */ ++ ret = updatewindow(strm, dictionary + dictLength, dictLength); ++ if (ret) { + state->mode = MEM; + return Z_MEM_ERROR; + } +- if (dictLength > state->wsize) { +- zmemcpy(state->window, dictionary + dictLength - state->wsize, +- state->wsize); +- state->whave = state->wsize; +- } +- else { +- zmemcpy(state->window + state->wsize - dictLength, dictionary, +- dictLength); +- state->whave = dictLength; +- } + state->havedict = 1; + Tracev((stderr, "inflate: dictionary set\n")); + return Z_OK; +@@ -1238,7 +1353,7 @@ + */ + local unsigned syncsearch(have, buf, len) + unsigned FAR *have; +-unsigned char FAR *buf; ++const unsigned char FAR *buf; + unsigned len; + { + unsigned got; +@@ -1350,8 +1465,8 @@ + } + + /* copy state */ +- zmemcpy(dest, source, sizeof(z_stream)); +- zmemcpy(copy, state, sizeof(struct inflate_state)); ++ zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); ++ zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state)); + if (state->lencode >= state->codes && + state->lencode <= state->codes + ENOUGH - 1) { + copy->lencode = copy->codes + (state->lencode - state->codes); +@@ -1366,3 +1481,32 @@ + dest->state = (struct internal_state FAR *)copy; + return Z_OK; + } ++ ++int ZEXPORT inflateUndermine(strm, subvert) ++z_streamp strm; ++int subvert; ++{ ++ struct inflate_state FAR *state; ++ ++ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; ++ state = (struct inflate_state FAR *)strm->state; ++ state->sane = !subvert; ++#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR ++ return Z_OK; ++#else ++ state->sane = 1; ++ return Z_DATA_ERROR; ++#endif ++} ++ ++long ZEXPORT inflateMark(strm) ++z_streamp strm; ++{ ++ struct inflate_state FAR *state; ++ ++ if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; ++ state = (struct inflate_state FAR *)strm->state; ++ return ((long)(state->back) << 16) + ++ (state->mode == COPY ? state->length : ++ (state->mode == MATCH ? state->was - state->length : 0)); ++} +diff -r ee879c0ffa11 Modules/zlib/inflate.h +--- a/Modules/zlib/inflate.h ++++ b/Modules/zlib/inflate.h +@@ -1,5 +1,5 @@ + /* inflate.h -- internal inflate state definition +- * Copyright (C) 1995-2004 Mark Adler ++ * Copyright (C) 1995-2009 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -32,11 +32,13 @@ + TYPE, /* i: waiting for type bits, including last-flag bit */ + TYPEDO, /* i: same, but skip check to exit inflate on new block */ + STORED, /* i: waiting for stored size (length and complement) */ ++ COPY_, /* i/o: same as COPY below, but only first time in */ + COPY, /* i/o: waiting for input or output to copy stored block */ + TABLE, /* i: waiting for dynamic block table lengths */ + LENLENS, /* i: waiting for code length code lengths */ + CODELENS, /* i: waiting for length/lit and distance code lengths */ +- LEN, /* i: waiting for length/lit code */ ++ LEN_, /* i: same as LEN below, but only first time in */ ++ LEN, /* i: waiting for length/lit/eob code */ + LENEXT, /* i: waiting for length extra bits */ + DIST, /* i: waiting for distance code */ + DISTEXT, /* i: waiting for distance extra bits */ +@@ -53,19 +55,21 @@ + /* + State transitions between above modes - + +- (most modes can go to the BAD or MEM mode -- not shown for clarity) ++ (most modes can go to BAD or MEM on error -- not shown for clarity) + + Process header: +- HEAD -> (gzip) or (zlib) +- (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME +- NAME -> COMMENT -> HCRC -> TYPE ++ HEAD -> (gzip) or (zlib) or (raw) ++ (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT -> ++ HCRC -> TYPE + (zlib) -> DICTID or TYPE + DICTID -> DICT -> TYPE ++ (raw) -> TYPEDO + Read deflate blocks: +- TYPE -> STORED or TABLE or LEN or CHECK +- STORED -> COPY -> TYPE +- TABLE -> LENLENS -> CODELENS -> LEN +- Read deflate codes: ++ TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK ++ STORED -> COPY_ -> COPY -> TYPE ++ TABLE -> LENLENS -> CODELENS -> LEN_ ++ LEN_ -> LEN ++ Read deflate codes in fixed or dynamic block: + LEN -> LENEXT or LIT or TYPE + LENEXT -> DIST -> DISTEXT -> MATCH -> LEN + LIT -> LEN +@@ -73,7 +77,7 @@ + CHECK -> LENGTH -> DONE + */ + +-/* state maintained between inflate() calls. Approximately 7K bytes. */ ++/* state maintained between inflate() calls. Approximately 10K bytes. */ + struct inflate_state { + inflate_mode mode; /* current inflate mode */ + int last; /* true if processing last block */ +@@ -88,7 +92,7 @@ + unsigned wbits; /* log base 2 of requested window size */ + unsigned wsize; /* window size or zero if not using window */ + unsigned whave; /* valid bytes in the window */ +- unsigned write; /* window write index */ ++ unsigned wnext; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if needed */ + /* bit accumulator */ + unsigned long hold; /* input bit accumulator */ +@@ -112,4 +116,7 @@ + unsigned short lens[320]; /* temporary storage for code lengths */ + unsigned short work[288]; /* work area for code table building */ + code codes[ENOUGH]; /* space for code tables */ ++ int sane; /* if false, allow invalid distance too far */ ++ int back; /* bits back of last unprocessed length/lit */ ++ unsigned was; /* initial length of match */ + }; +diff -r ee879c0ffa11 Modules/zlib/inftrees.c +--- a/Modules/zlib/inftrees.c ++++ b/Modules/zlib/inftrees.c +@@ -1,5 +1,5 @@ + /* inftrees.c -- generate Huffman trees for efficient decoding +- * Copyright (C) 1995-2005 Mark Adler ++ * Copyright (C) 1995-2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -9,7 +9,7 @@ + #define MAXBITS 15 + + const char inflate_copyright[] = +- " inflate 1.2.3 Copyright 1995-2005 Mark Adler "; ++ " inflate 1.2.8 Copyright 1995-2013 Mark Adler "; + /* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot +@@ -29,7 +29,7 @@ + table index bits. It will differ if the request is greater than the + longest code or if it is less than the shortest code. + */ +-int inflate_table(type, lens, codes, table, bits, work) ++int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work) + codetype type; + unsigned short FAR *lens; + unsigned codes; +@@ -50,7 +50,7 @@ + unsigned fill; /* index for replicating entries */ + unsigned low; /* low bits for current root entry */ + unsigned mask; /* mask for low root bits */ +- code this; /* table entry for duplication */ ++ code here; /* table entry for duplication */ + code FAR *next; /* next available space in table */ + const unsigned short FAR *base; /* base value table to use */ + const unsigned short FAR *extra; /* extra bits table to use */ +@@ -62,7 +62,7 @@ + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; + static const unsigned short lext[31] = { /* Length codes 257..285 extra */ + 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, +- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196}; ++ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78}; + static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, +@@ -115,15 +115,15 @@ + if (count[max] != 0) break; + if (root > max) root = max; + if (max == 0) { /* no symbols to code at all */ +- this.op = (unsigned char)64; /* invalid code marker */ +- this.bits = (unsigned char)1; +- this.val = (unsigned short)0; +- *(*table)++ = this; /* make a table to force an error */ +- *(*table)++ = this; ++ here.op = (unsigned char)64; /* invalid code marker */ ++ here.bits = (unsigned char)1; ++ here.val = (unsigned short)0; ++ *(*table)++ = here; /* make a table to force an error */ ++ *(*table)++ = here; + *bits = 1; + return 0; /* no symbols, but wait for decoding to report error */ + } +- for (min = 1; min <= MAXBITS; min++) ++ for (min = 1; min < max; min++) + if (count[min] != 0) break; + if (root < min) root = min; + +@@ -166,11 +166,10 @@ + entered in the tables. + + used keeps track of how many table entries have been allocated from the +- provided *table space. It is checked when a LENS table is being made +- against the space in *table, ENOUGH, minus the maximum space needed by +- the worst case distance code, MAXD. This should never happen, but the +- sufficiency of ENOUGH has not been proven exhaustively, hence the check. +- This assumes that when type == LENS, bits == 9. ++ provided *table space. It is checked for LENS and DIST tables against ++ the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in ++ the initial root table size constants. See the comments in inftrees.h ++ for more information. + + sym increments through all symbols, and the loop terminates when + all codes of length max, i.e. all codes, have been processed. This +@@ -209,24 +208,25 @@ + mask = used - 1; /* mask for comparing low */ + + /* check available table space */ +- if (type == LENS && used >= ENOUGH - MAXD) ++ if ((type == LENS && used > ENOUGH_LENS) || ++ (type == DISTS && used > ENOUGH_DISTS)) + return 1; + + /* process all codes and make table entries */ + for (;;) { + /* create table entry */ +- this.bits = (unsigned char)(len - drop); ++ here.bits = (unsigned char)(len - drop); + if ((int)(work[sym]) < end) { +- this.op = (unsigned char)0; +- this.val = work[sym]; ++ here.op = (unsigned char)0; ++ here.val = work[sym]; + } + else if ((int)(work[sym]) > end) { +- this.op = (unsigned char)(extra[work[sym]]); +- this.val = base[work[sym]]; ++ here.op = (unsigned char)(extra[work[sym]]); ++ here.val = base[work[sym]]; + } + else { +- this.op = (unsigned char)(32 + 64); /* end of block */ +- this.val = 0; ++ here.op = (unsigned char)(32 + 64); /* end of block */ ++ here.val = 0; + } + + /* replicate for those indices with low len bits equal to huff */ +@@ -235,7 +235,7 @@ + min = fill; /* save offset to next table */ + do { + fill -= incr; +- next[(huff >> drop) + fill] = this; ++ next[(huff >> drop) + fill] = here; + } while (fill != 0); + + /* backwards increment the len-bit code huff */ +@@ -277,7 +277,8 @@ + + /* check for enough space */ + used += 1U << curr; +- if (type == LENS && used >= ENOUGH - MAXD) ++ if ((type == LENS && used > ENOUGH_LENS) || ++ (type == DISTS && used > ENOUGH_DISTS)) + return 1; + + /* point entry in root table to sub-table */ +@@ -288,38 +289,14 @@ + } + } + +- /* +- Fill in rest of table for incomplete codes. This loop is similar to the +- loop above in incrementing huff for table indices. It is assumed that +- len is equal to curr + drop, so there is no loop needed to increment +- through high index bits. When the current sub-table is filled, the loop +- drops back to the root table to fill in any remaining entries there. +- */ +- this.op = (unsigned char)64; /* invalid code marker */ +- this.bits = (unsigned char)(len - drop); +- this.val = (unsigned short)0; +- while (huff != 0) { +- /* when done with sub-table, drop back to root table */ +- if (drop != 0 && (huff & mask) != low) { +- drop = 0; +- len = root; +- next = *table; +- this.bits = (unsigned char)len; +- } +- +- /* put invalid code marker in table */ +- next[huff >> drop] = this; +- +- /* backwards increment the len-bit code huff */ +- incr = 1U << (len - 1); +- while (huff & incr) +- incr >>= 1; +- if (incr != 0) { +- huff &= incr - 1; +- huff += incr; +- } +- else +- huff = 0; ++ /* fill in remaining table entry if code is incomplete (guaranteed to have ++ at most one remaining entry, since if the code is incomplete, the ++ maximum code length that was allowed to get this far is one bit) */ ++ if (huff != 0) { ++ here.op = (unsigned char)64; /* invalid code marker */ ++ here.bits = (unsigned char)(len - drop); ++ here.val = (unsigned short)0; ++ next[huff] = here; + } + + /* set return parameters */ +diff -r ee879c0ffa11 Modules/zlib/inftrees.h +--- a/Modules/zlib/inftrees.h ++++ b/Modules/zlib/inftrees.h +@@ -1,5 +1,5 @@ + /* inftrees.h -- header to use inftrees.c +- * Copyright (C) 1995-2005 Mark Adler ++ * Copyright (C) 1995-2005, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -35,21 +35,28 @@ + 01000000 - invalid code + */ + +-/* Maximum size of dynamic tree. The maximum found in a long but non- +- exhaustive search was 1444 code structures (852 for length/literals +- and 592 for distances, the latter actually the result of an +- exhaustive search). The true maximum is not known, but the value +- below is more than safe. */ +-#define ENOUGH 2048 +-#define MAXD 592 ++/* Maximum size of the dynamic table. The maximum number of code structures is ++ 1444, which is the sum of 852 for literal/length codes and 592 for distance ++ codes. These values were found by exhaustive searches using the program ++ examples/enough.c found in the zlib distribtution. The arguments to that ++ program are the number of symbols, the initial root table size, and the ++ maximum bit length of a code. "enough 286 9 15" for literal/length codes ++ returns returns 852, and "enough 30 6 15" for distance codes returns 592. ++ The initial root table size (9 or 6) is found in the fifth argument of the ++ inflate_table() calls in inflate.c and infback.c. If the root table size is ++ changed, then these maximum sizes would be need to be recalculated and ++ updated. */ ++#define ENOUGH_LENS 852 ++#define ENOUGH_DISTS 592 ++#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS) + +-/* Type of code to build for inftable() */ ++/* Type of code to build for inflate_table() */ + typedef enum { + CODES, + LENS, + DISTS + } codetype; + +-extern int inflate_table OF((codetype type, unsigned short FAR *lens, ++int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens, + unsigned codes, code FAR * FAR *table, + unsigned FAR *bits, unsigned short FAR *work)); +diff -r ee879c0ffa11 Modules/zlib/make_vms.com +--- a/Modules/zlib/make_vms.com ++++ b/Modules/zlib/make_vms.com +@@ -1,46 +1,95 @@ + $! make libz under VMS written by + $! Martin P.J. Zinser +-$! ++$! ++$! In case of problems with the install you might contact me at ++$! zinser@zinser.no-ip.info(preferred) or ++$! martin.zinser@eurexchange.com (work) ++$! ++$! Make procedure history for Zlib ++$! ++$!------------------------------------------------------------------------------ ++$! Version history ++$! 0.01 20060120 First version to receive a number ++$! 0.02 20061008 Adapt to new Makefile.in ++$! 0.03 20091224 Add support for large file check ++$! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite ++$! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in ++$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new exmples ++$! subdir path, update module search in makefile.in ++$! 0.07 20120115 Triggered by work done by Alexey Chupahin completly redesigned ++$! shared image creation ++$! 0.08 20120219 Make it work on VAX again, pre-load missing symbols to shared ++$! image ++$! 0.09 20120305 SMS. P1 sets builder ("MMK", "MMS", " " (built-in)). ++$! "" -> automatic, preference: MMK, MMS, built-in. + $! + $ on error then goto err_exit + $! +-$! +-$! Just some general constants... +-$! + $ true = 1 + $ false = 0 + $ tmpnam = "temp_" + f$getjpi("","pid") +-$ SAY = "WRITE SYS$OUTPUT" ++$ tt = tmpnam + ".txt" ++$ tc = tmpnam + ".c" ++$ th = tmpnam + ".h" ++$ define/nolog tconfig 'th' ++$ its_decc = false ++$ its_vaxc = false ++$ its_gnuc = false ++$ s_case = False + $! + $! Setup variables holding "config" information + $! +-$ Make = "" ++$ Make = "''p1'" + $ name = "Zlib" + $ version = "?.?.?" + $ v_string = "ZLIB_VERSION" + $ v_file = "zlib.h" +-$ ccopt = "" +-$ lopts = "" ++$ ccopt = "/include = []" ++$ lopts = "" ++$ dnsrl = "" ++$ aconf_in_file = "zconf.h.in#zconf.h_in#zconf_h.in" ++$ conf_check_string = "" + $ linkonly = false + $ optfile = name + ".opt" +-$ its_decc = false +-$ its_vaxc = false +-$ its_gnuc = false +-$ axp = f$getsyi("HW_MODEL").ge.1024 +-$ s_case = false ++$ mapfile = name + ".map" ++$ libdefs = "" ++$ vax = f$getsyi("HW_MODEL").lt.1024 ++$ axp = f$getsyi("HW_MODEL").ge.1024 .and. f$getsyi("HW_MODEL").lt.4096 ++$ ia64 = f$getsyi("HW_MODEL").ge.4096 ++$! ++$! 2012-03-05 SMS. ++$! Why is this needed? And if it is needed, why not simply ".not. vax"? ++$! ++$!!! if axp .or. ia64 then set proc/parse=extended ++$! ++$ whoami = f$parse(f$environment("Procedure"),,,,"NO_CONCEAL") ++$ mydef = F$parse(whoami,,,"DEVICE") ++$ mydir = f$parse(whoami,,,"DIRECTORY") - "][" ++$ myproc = f$parse(whoami,,,"Name") + f$parse(whoami,,,"type") ++$! + $! Check for MMK/MMS + $! +-$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS" +-$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK" +-$! ++$ if (Make .eqs. "") ++$ then ++$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS" ++$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK" ++$ else ++$ Make = f$edit( Make, "trim") ++$ endif + $! + $ gosub find_version + $! ++$ open/write topt tmp.opt ++$ open/write optf 'optfile' ++$! + $ gosub check_opts + $! + $! Look for the compiler used + $! + $ gosub check_compiler ++$ close topt ++$ close optf ++$! + $ if its_decc + $ then + $ ccopt = "/prefix=all" + ccopt +@@ -54,18 +103,79 @@ + $ define sys decc$library_include: + $ endif + $ endif ++$! ++$! 2012-03-05 SMS. ++$! Why /NAMES = AS_IS? Why not simply ".not. vax"? And why not on VAX? ++$! ++$ if axp .or. ia64 ++$ then ++$ ccopt = ccopt + "/name=as_is/opt=(inline=speed)" ++$ s_case = true ++$ endif + $ endif + $ if its_vaxc .or. its_gnuc + $ then + $ if f$trnlnm("SYS").eqs."" then define sys sys$library: + $ endif + $! ++$! Build a fake configure input header ++$! ++$ open/write conf_hin config.hin ++$ write conf_hin "#undef _LARGEFILE64_SOURCE" ++$ close conf_hin ++$! ++$! ++$ i = 0 ++$FIND_ACONF: ++$ fname = f$element(i,"#",aconf_in_file) ++$ if fname .eqs. "#" then goto AMISS_ERR ++$ if f$search(fname) .eqs. "" ++$ then ++$ i = i + 1 ++$ goto find_aconf ++$ endif ++$ open/read/err=aconf_err aconf_in 'fname' ++$ open/write aconf zconf.h ++$ACONF_LOOP: ++$ read/end_of_file=aconf_exit aconf_in line ++$ work = f$edit(line, "compress,trim") ++$ if f$extract(0,6,work) .nes. "#undef" ++$ then ++$ if f$extract(0,12,work) .nes. "#cmakedefine" ++$ then ++$ write aconf line ++$ endif ++$ else ++$ cdef = f$element(1," ",work) ++$ gosub check_config ++$ endif ++$ goto aconf_loop ++$ACONF_EXIT: ++$ write aconf "" ++$ write aconf "/* VMS specifics added by make_vms.com: */" ++$ write aconf "#define VMS 1" ++$ write aconf "#include " ++$ write aconf "#include " ++$ write aconf "#ifdef _LARGEFILE" ++$ write aconf "# define off64_t __off64_t" ++$ write aconf "# define fopen64 fopen" ++$ write aconf "# define fseeko64 fseeko" ++$ write aconf "# define lseek64 lseek" ++$ write aconf "# define ftello64 ftell" ++$ write aconf "#endif" ++$ write aconf "#if !defined( __VAX) && (__CRTL_VER >= 70312000)" ++$ write aconf "# define HAVE_VSNPRINTF" ++$ write aconf "#endif" ++$ close aconf_in ++$ close aconf ++$ if f$search("''th'") .nes. "" then delete 'th';* + $! Build the thing plain or with mms + $! + $ write sys$output "Compiling Zlib sources ..." + $ if make.eqs."" +-$ then +-$ dele example.obj;*,minigzip.obj;* ++$ then ++$ if (f$search( "example.obj;*") .nes. "") then delete example.obj;* ++$ if (f$search( "minigzip.obj;*") .nes. "") then delete minigzip.obj;* + $ CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" - + adler32.c zlib.h zconf.h + $ CALL MAKE compress.OBJ "CC ''CCOPT' compress" - +@@ -74,8 +184,14 @@ + crc32.c zlib.h zconf.h + $ CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" - + deflate.c deflate.h zutil.h zlib.h zconf.h +-$ CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" - +- gzio.c zutil.h zlib.h zconf.h ++$ CALL MAKE gzclose.OBJ "CC ''CCOPT' gzclose" - ++ gzclose.c zutil.h zlib.h zconf.h ++$ CALL MAKE gzlib.OBJ "CC ''CCOPT' gzlib" - ++ gzlib.c zutil.h zlib.h zconf.h ++$ CALL MAKE gzread.OBJ "CC ''CCOPT' gzread" - ++ gzread.c zutil.h zlib.h zconf.h ++$ CALL MAKE gzwrite.OBJ "CC ''CCOPT' gzwrite" - ++ gzwrite.c zutil.h zlib.h zconf.h + $ CALL MAKE infback.OBJ "CC ''CCOPT' infback" - + infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h + $ CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" - +@@ -93,46 +209,47 @@ + $ write sys$output "Building Zlib ..." + $ CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ + $ write sys$output "Building example..." +-$ CALL MAKE example.OBJ "CC ''CCOPT' example" - +- example.c zlib.h zconf.h ++$ CALL MAKE example.OBJ "CC ''CCOPT' [.test]example" - ++ [.test]example.c zlib.h zconf.h + $ call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb +-$ if f$search("x11vms:xvmsutils.olb") .nes. "" +-$ then +-$ write sys$output "Building minigzip..." +-$ CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" - +- minigzip.c zlib.h zconf.h +-$ call make minigzip.exe - +- "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" - +- minigzip.obj libz.olb +-$ endif +-$ else ++$ write sys$output "Building minigzip..." ++$ CALL MAKE minigzip.OBJ "CC ''CCOPT' [.test]minigzip" - ++ [.test]minigzip.c zlib.h zconf.h ++$ call make minigzip.exe - ++ "LINK minigzip,libz.olb/lib" - ++ minigzip.obj libz.olb ++$ else + $ gosub crea_mms +-$ SAY "Make ''name' ''version' with ''Make' " ++$ write sys$output "Make ''name' ''version' with ''Make' " + $ 'make' +-$ endif ++$ endif + $! +-$! Alpha gets a shareable image ++$! Create shareable image + $! +-$ If axp +-$ Then +-$ gosub crea_olist +-$ write sys$output "Creating libzshr.exe" +-$ call anal_obj_axp modules.opt _link.opt +-$ if s_case +-$ then +-$ open/append optf modules.opt +-$ write optf "case_sensitive=YES" +-$ close optf +-$ endif +-$ LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,_link.opt/opt +-$ endif ++$ gosub crea_olist ++$ write sys$output "Creating libzshr.exe" ++$ call map_2_shopt 'mapfile' 'optfile' ++$ LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,'optfile'/opt + $ write sys$output "Zlib build completed" ++$ delete/nolog tmp.opt;* + $ exit ++$AMISS_ERR: ++$ write sys$output "No source for config.hin found." ++$ write sys$output "Tried any of ''aconf_in_file'" ++$ goto err_exit + $CC_ERR: + $ write sys$output "C compiler required to build ''name'" + $ goto err_exit + $ERR_EXIT: + $ set message/facil/ident/sever/text ++$ close/nolog optf ++$ close/nolog topt ++$ close/nolog aconf_in ++$ close/nolog aconf ++$ close/nolog out ++$ close/nolog min ++$ close/nolog mod ++$ close/nolog h_in + $ write sys$output "Exiting..." + $ exit 2 + $! +@@ -180,61 +297,72 @@ + $! + $! Check command line options and set symbols accordingly + $! ++$!------------------------------------------------------------------------------ ++$! Version history ++$! 0.01 20041206 First version to receive a number ++$! 0.02 20060126 Add new "HELP" target + $ CHECK_OPTS: + $ i = 1 + $ OPT_LOOP: + $ if i .lt. 9 + $ then + $ cparm = f$edit(p'i',"upcase") +-$ if cparm .eqs. "DEBUG" ++$! ++$! Check if parameter actually contains something ++$! ++$ if f$edit(cparm,"trim") .nes. "" + $ then +-$ ccopt = ccopt + "/noopt/deb" +-$ lopts = lopts + "/deb" +-$ endif +-$ if f$locate("CCOPT=",cparm) .lt. f$length(cparm) +-$ then +-$ start = f$locate("=",cparm) + 1 +-$ len = f$length(cparm) - start +-$ ccopt = ccopt + f$extract(start,len,cparm) +-$ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) - +- then s_case = true +-$ endif +-$ if cparm .eqs. "LINK" then linkonly = true +-$ if f$locate("LOPTS=",cparm) .lt. f$length(cparm) +-$ then +-$ start = f$locate("=",cparm) + 1 +-$ len = f$length(cparm) - start +-$ lopts = lopts + f$extract(start,len,cparm) +-$ endif +-$ if f$locate("CC=",cparm) .lt. f$length(cparm) +-$ then +-$ start = f$locate("=",cparm) + 1 +-$ len = f$length(cparm) - start +-$ cc_com = f$extract(start,len,cparm) +- if (cc_com .nes. "DECC") .and. - +- (cc_com .nes. "VAXC") .and. - +- (cc_com .nes. "GNUC") ++$ if cparm .eqs. "DEBUG" + $ then +-$ write sys$output "Unsupported compiler choice ''cc_com' ignored" +-$ write sys$output "Use DECC, VAXC, or GNUC instead" +-$ else +-$ if cc_com .eqs. "DECC" then its_decc = true +-$ if cc_com .eqs. "VAXC" then its_vaxc = true +-$ if cc_com .eqs. "GNUC" then its_gnuc = true ++$ ccopt = ccopt + "/noopt/deb" ++$ lopts = lopts + "/deb" + $ endif +-$ endif +-$ if f$locate("MAKE=",cparm) .lt. f$length(cparm) +-$ then +-$ start = f$locate("=",cparm) + 1 +-$ len = f$length(cparm) - start +-$ mmks = f$extract(start,len,cparm) +-$ if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS") ++$ if f$locate("CCOPT=",cparm) .lt. f$length(cparm) + $ then +-$ make = mmks +-$ else +-$ write sys$output "Unsupported make choice ''mmks' ignored" +-$ write sys$output "Use MMK or MMS instead" ++$ start = f$locate("=",cparm) + 1 ++$ len = f$length(cparm) - start ++$ ccopt = ccopt + f$extract(start,len,cparm) ++$ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) - ++ then s_case = true + $ endif ++$ if cparm .eqs. "LINK" then linkonly = true ++$ if f$locate("LOPTS=",cparm) .lt. f$length(cparm) ++$ then ++$ start = f$locate("=",cparm) + 1 ++$ len = f$length(cparm) - start ++$ lopts = lopts + f$extract(start,len,cparm) ++$ endif ++$ if f$locate("CC=",cparm) .lt. f$length(cparm) ++$ then ++$ start = f$locate("=",cparm) + 1 ++$ len = f$length(cparm) - start ++$ cc_com = f$extract(start,len,cparm) ++ if (cc_com .nes. "DECC") .and. - ++ (cc_com .nes. "VAXC") .and. - ++ (cc_com .nes. "GNUC") ++$ then ++$ write sys$output "Unsupported compiler choice ''cc_com' ignored" ++$ write sys$output "Use DECC, VAXC, or GNUC instead" ++$ else ++$ if cc_com .eqs. "DECC" then its_decc = true ++$ if cc_com .eqs. "VAXC" then its_vaxc = true ++$ if cc_com .eqs. "GNUC" then its_gnuc = true ++$ endif ++$ endif ++$ if f$locate("MAKE=",cparm) .lt. f$length(cparm) ++$ then ++$ start = f$locate("=",cparm) + 1 ++$ len = f$length(cparm) - start ++$ mmks = f$extract(start,len,cparm) ++$ if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS") ++$ then ++$ make = mmks ++$ else ++$ write sys$output "Unsupported make choice ''mmks' ignored" ++$ write sys$output "Use MMK or MMS instead" ++$ endif ++$ endif ++$ if cparm .eqs. "HELP" then gosub bhelp + $ endif + $ i = i + 1 + $ goto opt_loop +@@ -244,6 +372,11 @@ + $! + $! Look for the compiler used + $! ++$! Version history ++$! 0.01 20040223 First version to receive a number ++$! 0.02 20040229 Save/set value of decc$no_rooted_search_lists ++$! 0.03 20060202 Extend handling of GNU C ++$! 0.04 20090402 Compaq -> hp + $CHECK_COMPILER: + $ if (.not. (its_decc .or. its_vaxc .or. its_gnuc)) + $ then +@@ -257,9 +390,26 @@ + $ if (.not. (its_decc .or. its_vaxc .or. its_gnuc)) + $ then goto CC_ERR + $ else +-$ if its_decc then write sys$output "CC compiler check ... Compaq C" +-$ if its_vaxc then write sys$output "CC compiler check ... VAX C" +-$ if its_gnuc then write sys$output "CC compiler check ... GNU C" ++$ if its_decc ++$ then ++$ write sys$output "CC compiler check ... hp C" ++$ if f$trnlnm("decc$no_rooted_search_lists") .nes. "" ++$ then ++$ dnrsl = f$trnlnm("decc$no_rooted_search_lists") ++$ endif ++$ define/nolog decc$no_rooted_search_lists 1 ++$ else ++$ if its_vaxc then write sys$output "CC compiler check ... VAX C" ++$ if its_gnuc ++$ then ++$ write sys$output "CC compiler check ... GNU C" ++$ if f$trnlnm(topt) then write topt "gnu_cc:[000000]gcclib.olb/lib" ++$ if f$trnlnm(optf) then write optf "gnu_cc:[000000]gcclib.olb/lib" ++$ cc = "gcc" ++$ endif ++$ if f$trnlnm(topt) then write topt "sys$share:vaxcrtl.exe/share" ++$ if f$trnlnm(optf) then write optf "sys$share:vaxcrtl.exe/share" ++$ endif + $ endif + $ return + $!------------------------------------------------------------------------------ +@@ -274,19 +424,19 @@ + $ deck + # descrip.mms: MMS description file for building zlib on VMS + # written by Martin P.J. Zinser +-# ++# + +-OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj, infback.obj\ ++OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzlib.obj\ ++ gzread.obj, gzwrite.obj, uncompr.obj, infback.obj\ + deflate.obj, trees.obj, zutil.obj, inflate.obj, \ + inftrees.obj, inffast.obj + + $ eod + $ write out "CFLAGS=", ccopt + $ write out "LOPTS=", lopts ++$ write out "all : example.exe minigzip.exe libz.olb" + $ copy sys$input: out + $ deck +- +-all : example.exe minigzip.exe libz.olb + @ write sys$output " Example applications available" + + libz.olb : libz.olb($(OBJS)) +@@ -296,7 +446,7 @@ + link $(LOPTS) example,libz.olb/lib + + minigzip.exe : minigzip.obj libz.olb +- link $(LOPTS) minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib ++ link $(LOPTS) minigzip,libz.olb/lib + + clean : + delete *.obj;*,libz.olb;*,*.opt;*,*.exe;* +@@ -307,12 +457,15 @@ + compress.obj : compress.c zlib.h zconf.h + crc32.obj : crc32.c zutil.h zlib.h zconf.h + deflate.obj : deflate.c deflate.h zutil.h zlib.h zconf.h +-example.obj : example.c zlib.h zconf.h +-gzio.obj : gzio.c zutil.h zlib.h zconf.h ++example.obj : [.test]example.c zlib.h zconf.h ++gzclose.obj : gzclose.c zutil.h zlib.h zconf.h ++gzlib.obj : gzlib.c zutil.h zlib.h zconf.h ++gzread.obj : gzread.c zutil.h zlib.h zconf.h ++gzwrite.obj : gzwrite.c zutil.h zlib.h zconf.h + inffast.obj : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h + inflate.obj : inflate.c zutil.h zlib.h zconf.h + inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h +-minigzip.obj : minigzip.c zlib.h zconf.h ++minigzip.obj : [.test]minigzip.c zlib.h zconf.h + trees.obj : trees.c deflate.h zutil.h zlib.h zconf.h + uncompr.obj : uncompr.c zlib.h zconf.h + zutil.obj : zutil.c zutil.h zlib.h zconf.h +@@ -328,13 +481,18 @@ + $CREA_OLIST: + $ open/read min makefile.in + $ open/write mod modules.opt +-$ src_check = "OBJS =" ++$ src_check_list = "OBJZ =#OBJG =" + $MRLOOP: + $ read/end=mrdone min rec +-$ if (f$extract(0,6,rec) .nes. src_check) then goto mrloop ++$ i = 0 ++$SRC_CHECK_LOOP: ++$ src_check = f$element(i, "#", src_check_list) ++$ i = i+1 ++$ if src_check .eqs. "#" then goto mrloop ++$ if (f$extract(0,6,rec) .nes. src_check) then goto src_check_loop + $ rec = rec - src_check + $ gosub extra_filnam +-$ if (f$element(1,"\",rec) .eqs. "\") then goto mrdone ++$ if (f$element(1,"\",rec) .eqs. "\") then goto mrloop + $MRSLOOP: + $ read/end=mrdone min rec + $ gosub extra_filnam +@@ -382,80 +540,328 @@ + $ return + $!------------------------------------------------------------------------------ + $! +-$! Analyze Object files for OpenVMS AXP to extract Procedure and Data +-$! information to build a symbol vector for a shareable image +-$! All the "brains" of this logic was suggested by Hartmut Becker +-$! (Hartmut.Becker@compaq.com). All the bugs were introduced by me +-$! (zinser@decus.de), so if you do have problem reports please do not +-$! bother Hartmut/HP, but get in touch with me ++$CHECK_CONFIG: + $! +-$ ANAL_OBJ_AXP: Subroutine +-$ V = 'F$Verify(0) ++$ in_ldef = f$locate(cdef,libdefs) ++$ if (in_ldef .lt. f$length(libdefs)) ++$ then ++$ write aconf "#define ''cdef' 1" ++$ libdefs = f$extract(0,in_ldef,libdefs) + - ++ f$extract(in_ldef + f$length(cdef) + 1, - ++ f$length(libdefs) - in_ldef - f$length(cdef) - 1, - ++ libdefs) ++$ else ++$ if (f$type('cdef') .eqs. "INTEGER") ++$ then ++$ write aconf "#define ''cdef' ", 'cdef' ++$ else ++$ if (f$type('cdef') .eqs. "STRING") ++$ then ++$ write aconf "#define ''cdef' ", """", '''cdef'', """" ++$ else ++$ gosub check_cc_def ++$ endif ++$ endif ++$ endif ++$ return ++$!------------------------------------------------------------------------------ ++$! ++$! Check if this is a define relating to the properties of the C/C++ ++$! compiler ++$! ++$ CHECK_CC_DEF: ++$ if (cdef .eqs. "_LARGEFILE64_SOURCE") ++$ then ++$ copy sys$input: 'tc' ++$ deck ++#include "tconfig" ++#define _LARGEFILE ++#include ++ ++int main(){ ++FILE *fp; ++ fp = fopen("temp.txt","r"); ++ fseeko(fp,1,SEEK_SET); ++ fclose(fp); ++} ++ ++$ eod ++$ test_inv = false ++$ comm_h = false ++$ gosub cc_prop_check ++$ return ++$ endif ++$ write aconf "/* ", line, " */" ++$ return ++$!------------------------------------------------------------------------------ ++$! ++$! Check for properties of C/C++ compiler ++$! ++$! Version history ++$! 0.01 20031020 First version to receive a number ++$! 0.02 20031022 Added logic for defines with value ++$! 0.03 20040309 Make sure local config file gets not deleted ++$! 0.04 20041230 Also write include for configure run ++$! 0.05 20050103 Add processing of "comment defines" ++$CC_PROP_CHECK: ++$ cc_prop = true ++$ is_need = false ++$ is_need = (f$extract(0,4,cdef) .eqs. "NEED") .or. (test_inv .eq. true) ++$ if f$search(th) .eqs. "" then create 'th' ++$ set message/nofac/noident/nosever/notext ++$ on error then continue ++$ cc 'tmpnam' ++$ if .not. ($status) then cc_prop = false ++$ on error then continue ++$! The headers might lie about the capabilities of the RTL ++$ link 'tmpnam',tmp.opt/opt ++$ if .not. ($status) then cc_prop = false ++$ set message/fac/ident/sever/text ++$ on error then goto err_exit ++$ delete/nolog 'tmpnam'.*;*/exclude='th' ++$ if (cc_prop .and. .not. is_need) .or. - ++ (.not. cc_prop .and. is_need) ++$ then ++$ write sys$output "Checking for ''cdef'... yes" ++$ if f$type('cdef_val'_yes) .nes. "" ++$ then ++$ if f$type('cdef_val'_yes) .eqs. "INTEGER" - ++ then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_yes) ++$ if f$type('cdef_val'_yes) .eqs. "STRING" - ++ then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_yes) ++$ else ++$ call write_config f$fao("#define !AS 1",cdef) ++$ endif ++$ if (cdef .eqs. "HAVE_FSEEKO") .or. (cdef .eqs. "_LARGE_FILES") .or. - ++ (cdef .eqs. "_LARGEFILE64_SOURCE") then - ++ call write_config f$string("#define _LARGEFILE 1") ++$ else ++$ write sys$output "Checking for ''cdef'... no" ++$ if (comm_h) ++$ then ++ call write_config f$fao("/* !AS */",line) ++$ else ++$ if f$type('cdef_val'_no) .nes. "" ++$ then ++$ if f$type('cdef_val'_no) .eqs. "INTEGER" - ++ then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_no) ++$ if f$type('cdef_val'_no) .eqs. "STRING" - ++ then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_no) ++$ else ++$ call write_config f$fao("#undef !AS",cdef) ++$ endif ++$ endif ++$ endif ++$ return ++$!------------------------------------------------------------------------------ ++$! ++$! Check for properties of C/C++ compiler with multiple result values ++$! ++$! Version history ++$! 0.01 20040127 First version ++$! 0.02 20050103 Reconcile changes from cc_prop up to version 0.05 ++$CC_MPROP_CHECK: ++$ cc_prop = true ++$ i = 1 ++$ idel = 1 ++$ MT_LOOP: ++$ if f$type(result_'i') .eqs. "STRING" ++$ then ++$ set message/nofac/noident/nosever/notext ++$ on error then continue ++$ cc 'tmpnam'_'i' ++$ if .not. ($status) then cc_prop = false ++$ on error then continue ++$! The headers might lie about the capabilities of the RTL ++$ link 'tmpnam'_'i',tmp.opt/opt ++$ if .not. ($status) then cc_prop = false ++$ set message/fac/ident/sever/text ++$ on error then goto err_exit ++$ delete/nolog 'tmpnam'_'i'.*;* ++$ if (cc_prop) ++$ then ++$ write sys$output "Checking for ''cdef'... ", mdef_'i' ++$ if f$type(mdef_'i') .eqs. "INTEGER" - ++ then call write_config f$fao("#define !AS !UL",cdef,mdef_'i') ++$ if f$type('cdef_val'_yes) .eqs. "STRING" - ++ then call write_config f$fao("#define !AS !AS",cdef,mdef_'i') ++$ goto msym_clean ++$ else ++$ i = i + 1 ++$ goto mt_loop ++$ endif ++$ endif ++$ write sys$output "Checking for ''cdef'... no" ++$ call write_config f$fao("#undef !AS",cdef) ++$ MSYM_CLEAN: ++$ if (idel .le. msym_max) ++$ then ++$ delete/sym mdef_'idel' ++$ idel = idel + 1 ++$ goto msym_clean ++$ endif ++$ return ++$!------------------------------------------------------------------------------ ++$! ++$! Write configuration to both permanent and temporary config file ++$! ++$! Version history ++$! 0.01 20031029 First version to receive a number ++$! ++$WRITE_CONFIG: SUBROUTINE ++$ write aconf 'p1' ++$ open/append confh 'th' ++$ write confh 'p1' ++$ close confh ++$ENDSUBROUTINE ++$!------------------------------------------------------------------------------ ++$! ++$! Analyze the project map file and create the symbol vector for a shareable ++$! image from it ++$! ++$! Version history ++$! 0.01 20120128 First version ++$! 0.02 20120226 Add pre-load logic ++$! ++$ MAP_2_SHOPT: Subroutine ++$! + $ SAY := "WRITE_ SYS$OUTPUT" +-$ ++$! + $ IF F$SEARCH("''P1'") .EQS. "" + $ THEN +-$ SAY "ANAL_OBJ_AXP-E-NOSUCHFILE: Error, inputfile ''p1' not available" +-$ goto exit_aa ++$ SAY "MAP_2_SHOPT-E-NOSUCHFILE: Error, inputfile ''p1' not available" ++$ goto exit_m2s + $ ENDIF + $ IF "''P2'" .EQS. "" + $ THEN +-$ SAY "ANAL_OBJ_AXP: Error, no output file provided" +-$ goto exit_aa ++$ SAY "MAP_2_SHOPT: Error, no output file provided" ++$ goto exit_m2s + $ ENDIF +-$ +-$ open/read in 'p1 +-$ create a.tmp +-$ open/append atmp a.tmp +-$ loop: +-$ read/end=end_loop in line +-$ f= f$search(line) +-$ if f .eqs. "" ++$! ++$ module1 = "deflate#deflateEnd#deflateInit_#deflateParams#deflateSetDictionary" ++$ module2 = "gzclose#gzerror#gzgetc#gzgets#gzopen#gzprintf#gzputc#gzputs#gzread" ++$ module3 = "gzseek#gztell#inflate#inflateEnd#inflateInit_#inflateSetDictionary" ++$ module4 = "inflateSync#uncompress#zlibVersion#compress" ++$ open/read map 'p1 ++$ if axp .or. ia64 + $ then +-$ write sys$output "ANAL_OBJ_AXP-w-nosuchfile, ''line'" +-$ goto loop ++$ open/write aopt a.opt ++$ open/write bopt b.opt ++$ write aopt " CASE_SENSITIVE=YES" ++$ write bopt "SYMBOL_VECTOR= (-" ++$ mod_sym_num = 1 ++$ MOD_SYM_LOOP: ++$ if f$type(module'mod_sym_num') .nes. "" ++$ then ++$ mod_in = 0 ++$ MOD_SYM_IN: ++$ shared_proc = f$element(mod_in, "#", module'mod_sym_num') ++$ if shared_proc .nes. "#" ++$ then ++$ write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",- ++ f$edit(shared_proc,"upcase"),shared_proc) ++$ write bopt f$fao("!AS=PROCEDURE,-",shared_proc) ++$ mod_in = mod_in + 1 ++$ goto mod_sym_in ++$ endif ++$ mod_sym_num = mod_sym_num + 1 ++$ goto mod_sym_loop ++$ endif ++$MAP_LOOP: ++$ read/end=map_end map line ++$ if (f$locate("{",line).lt. f$length(line)) .or. - ++ (f$locate("global:", line) .lt. f$length(line)) ++$ then ++$ proc = true ++$ goto map_loop ++$ endif ++$ if f$locate("}",line).lt. f$length(line) then proc = false ++$ if f$locate("local:", line) .lt. f$length(line) then proc = false ++$ if proc ++$ then ++$ shared_proc = f$edit(line,"collapse") ++$ chop_semi = f$locate(";", shared_proc) ++$ if chop_semi .lt. f$length(shared_proc) then - ++ shared_proc = f$extract(0, chop_semi, shared_proc) ++$ write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",- ++ f$edit(shared_proc,"upcase"),shared_proc) ++$ write bopt f$fao("!AS=PROCEDURE,-",shared_proc) ++$ endif ++$ goto map_loop ++$MAP_END: ++$ close/nolog aopt ++$ close/nolog bopt ++$ open/append libopt 'p2' ++$ open/read aopt a.opt ++$ open/read bopt b.opt ++$ALOOP: ++$ read/end=aloop_end aopt line ++$ write libopt line ++$ goto aloop ++$ALOOP_END: ++$ close/nolog aopt ++$ sv = "" ++$BLOOP: ++$ read/end=bloop_end bopt svn ++$ if (svn.nes."") ++$ then ++$ if (sv.nes."") then write libopt sv ++$ sv = svn ++$ endif ++$ goto bloop ++$BLOOP_END: ++$ write libopt f$extract(0,f$length(sv)-2,sv), "-" ++$ write libopt ")" ++$ close/nolog bopt ++$ delete/nolog/noconf a.opt;*,b.opt;* ++$ else ++$ if vax ++$ then ++$ open/append libopt 'p2' ++$ mod_sym_num = 1 ++$ VMOD_SYM_LOOP: ++$ if f$type(module'mod_sym_num') .nes. "" ++$ then ++$ mod_in = 0 ++$ VMOD_SYM_IN: ++$ shared_proc = f$element(mod_in, "#", module'mod_sym_num') ++$ if shared_proc .nes. "#" ++$ then ++$ write libopt f$fao("UNIVERSAL=!AS",- ++ f$edit(shared_proc,"upcase")) ++$ mod_in = mod_in + 1 ++$ goto vmod_sym_in ++$ endif ++$ mod_sym_num = mod_sym_num + 1 ++$ goto vmod_sym_loop ++$ endif ++$VMAP_LOOP: ++$ read/end=vmap_end map line ++$ if (f$locate("{",line).lt. f$length(line)) .or. - ++ (f$locate("global:", line) .lt. f$length(line)) ++$ then ++$ proc = true ++$ goto vmap_loop ++$ endif ++$ if f$locate("}",line).lt. f$length(line) then proc = false ++$ if f$locate("local:", line) .lt. f$length(line) then proc = false ++$ if proc ++$ then ++$ shared_proc = f$edit(line,"collapse") ++$ chop_semi = f$locate(";", shared_proc) ++$ if chop_semi .lt. f$length(shared_proc) then - ++ shared_proc = f$extract(0, chop_semi, shared_proc) ++$ write libopt f$fao("UNIVERSAL=!AS",- ++ f$edit(shared_proc,"upcase")) ++$ endif ++$ goto vmap_loop ++$VMAP_END: ++$ else ++$ write sys$output "Unknown Architecture (Not VAX, AXP, or IA64)" ++$ write sys$output "No options file created" ++$ endif + $ endif +-$ define/user sys$output nl: +-$ define/user sys$error nl: +-$ anal/obj/gsd 'f /out=x.tmp +-$ open/read xtmp x.tmp +-$ XLOOP: +-$ read/end=end_xloop xtmp xline +-$ xline = f$edit(xline,"compress") +-$ write atmp xline +-$ goto xloop +-$ END_XLOOP: +-$ close xtmp +-$ goto loop +-$ end_loop: +-$ close in +-$ close atmp +-$ if f$search("a.tmp") .eqs. "" - +- then $ exit +-$ ! all global definitions +-$ search a.tmp "symbol:","EGSY$V_DEF 1","EGSY$V_NORM 1"/out=b.tmp +-$ ! all procedures +-$ search b.tmp "EGSY$V_NORM 1"/wind=(0,1) /out=c.tmp +-$ search c.tmp "symbol:"/out=d.tmp +-$ define/user sys$output nl: +-$ edito/edt/command=sys$input d.tmp +-sub/symbol: "/symbol_vector=(/whole +-sub/"/=PROCEDURE)/whole +-exit +-$ ! all data +-$ search b.tmp "EGSY$V_DEF 1"/wind=(0,1) /out=e.tmp +-$ search e.tmp "symbol:"/out=f.tmp +-$ define/user sys$output nl: +-$ edito/edt/command=sys$input f.tmp +-sub/symbol: "/symbol_vector=(/whole +-sub/"/=DATA)/whole +-exit +-$ sort/nodupl d.tmp,f.tmp 'p2' +-$ delete a.tmp;*,b.tmp;*,c.tmp;*,d.tmp;*,e.tmp;*,f.tmp;* +-$ if f$search("x.tmp") .nes. "" - +- then $ delete x.tmp;* +-$! +-$ EXIT_AA: +-$ if V then set verify ++$ EXIT_M2S: ++$ close/nolog map ++$ close/nolog libopt + $ endsubroutine +-$!------------------------------------------------------------------------------ +diff -r ee879c0ffa11 Modules/zlib/minigzip.c +--- a/Modules/zlib/minigzip.c ++++ b/Modules/zlib/minigzip.c +@@ -1,5 +1,5 @@ + /* minigzip.c -- simulate gzip using the zlib compression library +- * Copyright (C) 1995-2005 Jean-loup Gailly. ++ * Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -15,8 +15,8 @@ + + /* @(#) $Id$ */ + ++#include "zlib.h" + #include +-#include "zlib.h" + + #ifdef STDC + # include +@@ -32,11 +32,18 @@ + #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__) + # include + # include ++# ifdef UNDER_CE ++# include ++# endif + # define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY) + #else + # define SET_BINARY_MODE(file) + #endif + ++#ifdef _MSC_VER ++# define snprintf _snprintf ++#endif ++ + #ifdef VMS + # define unlink delete + # define GZ_SUFFIX "-gz" +@@ -50,9 +57,75 @@ + # include /* for fileno */ + #endif + ++#if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE) + #ifndef WIN32 /* unlink already in stdio.h for WIN32 */ + extern int unlink OF((const char *)); + #endif ++#endif ++ ++#if defined(UNDER_CE) ++# include ++# define perror(s) pwinerror(s) ++ ++/* Map the Windows error number in ERROR to a locale-dependent error ++ message string and return a pointer to it. Typically, the values ++ for ERROR come from GetLastError. ++ ++ The string pointed to shall not be modified by the application, ++ but may be overwritten by a subsequent call to strwinerror ++ ++ The strwinerror function does not change the current setting ++ of GetLastError. */ ++ ++static char *strwinerror (error) ++ DWORD error; ++{ ++ static char buf[1024]; ++ ++ wchar_t *msgbuf; ++ DWORD lasterr = GetLastError(); ++ DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM ++ | FORMAT_MESSAGE_ALLOCATE_BUFFER, ++ NULL, ++ error, ++ 0, /* Default language */ ++ (LPVOID)&msgbuf, ++ 0, ++ NULL); ++ if (chars != 0) { ++ /* If there is an \r\n appended, zap it. */ ++ if (chars >= 2 ++ && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') { ++ chars -= 2; ++ msgbuf[chars] = 0; ++ } ++ ++ if (chars > sizeof (buf) - 1) { ++ chars = sizeof (buf) - 1; ++ msgbuf[chars] = 0; ++ } ++ ++ wcstombs(buf, msgbuf, chars + 1); ++ LocalFree(msgbuf); ++ } ++ else { ++ sprintf(buf, "unknown win32 error (%ld)", error); ++ } ++ ++ SetLastError(lasterr); ++ return buf; ++} ++ ++static void pwinerror (s) ++ const char *s; ++{ ++ if (s && *s) ++ fprintf(stderr, "%s: %s\n", s, strwinerror(GetLastError ())); ++ else ++ fprintf(stderr, "%s\n", strwinerror(GetLastError ())); ++} ++ ++#endif /* UNDER_CE */ + + #ifndef GZ_SUFFIX + # define GZ_SUFFIX ".gz" +@@ -69,6 +142,197 @@ + # define local + #endif + ++#ifdef Z_SOLO ++/* for Z_SOLO, create simplified gz* functions using deflate and inflate */ ++ ++#if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE) ++# include /* for unlink() */ ++#endif ++ ++void *myalloc OF((void *, unsigned, unsigned)); ++void myfree OF((void *, void *)); ++ ++void *myalloc(q, n, m) ++ void *q; ++ unsigned n, m; ++{ ++ q = Z_NULL; ++ return calloc(n, m); ++} ++ ++void myfree(q, p) ++ void *q, *p; ++{ ++ q = Z_NULL; ++ free(p); ++} ++ ++typedef struct gzFile_s { ++ FILE *file; ++ int write; ++ int err; ++ char *msg; ++ z_stream strm; ++} *gzFile; ++ ++gzFile gzopen OF((const char *, const char *)); ++gzFile gzdopen OF((int, const char *)); ++gzFile gz_open OF((const char *, int, const char *)); ++ ++gzFile gzopen(path, mode) ++const char *path; ++const char *mode; ++{ ++ return gz_open(path, -1, mode); ++} ++ ++gzFile gzdopen(fd, mode) ++int fd; ++const char *mode; ++{ ++ return gz_open(NULL, fd, mode); ++} ++ ++gzFile gz_open(path, fd, mode) ++ const char *path; ++ int fd; ++ const char *mode; ++{ ++ gzFile gz; ++ int ret; ++ ++ gz = malloc(sizeof(struct gzFile_s)); ++ if (gz == NULL) ++ return NULL; ++ gz->write = strchr(mode, 'w') != NULL; ++ gz->strm.zalloc = myalloc; ++ gz->strm.zfree = myfree; ++ gz->strm.opaque = Z_NULL; ++ if (gz->write) ++ ret = deflateInit2(&(gz->strm), -1, 8, 15 + 16, 8, 0); ++ else { ++ gz->strm.next_in = 0; ++ gz->strm.avail_in = Z_NULL; ++ ret = inflateInit2(&(gz->strm), 15 + 16); ++ } ++ if (ret != Z_OK) { ++ free(gz); ++ return NULL; ++ } ++ gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") : ++ fopen(path, gz->write ? "wb" : "rb"); ++ if (gz->file == NULL) { ++ gz->write ? deflateEnd(&(gz->strm)) : inflateEnd(&(gz->strm)); ++ free(gz); ++ return NULL; ++ } ++ gz->err = 0; ++ gz->msg = ""; ++ return gz; ++} ++ ++int gzwrite OF((gzFile, const void *, unsigned)); ++ ++int gzwrite(gz, buf, len) ++ gzFile gz; ++ const void *buf; ++ unsigned len; ++{ ++ z_stream *strm; ++ unsigned char out[BUFLEN]; ++ ++ if (gz == NULL || !gz->write) ++ return 0; ++ strm = &(gz->strm); ++ strm->next_in = (void *)buf; ++ strm->avail_in = len; ++ do { ++ strm->next_out = out; ++ strm->avail_out = BUFLEN; ++ (void)deflate(strm, Z_NO_FLUSH); ++ fwrite(out, 1, BUFLEN - strm->avail_out, gz->file); ++ } while (strm->avail_out == 0); ++ return len; ++} ++ ++int gzread OF((gzFile, void *, unsigned)); ++ ++int gzread(gz, buf, len) ++ gzFile gz; ++ void *buf; ++ unsigned len; ++{ ++ int ret; ++ unsigned got; ++ unsigned char in[1]; ++ z_stream *strm; ++ ++ if (gz == NULL || gz->write) ++ return 0; ++ if (gz->err) ++ return 0; ++ strm = &(gz->strm); ++ strm->next_out = (void *)buf; ++ strm->avail_out = len; ++ do { ++ got = fread(in, 1, 1, gz->file); ++ if (got == 0) ++ break; ++ strm->next_in = in; ++ strm->avail_in = 1; ++ ret = inflate(strm, Z_NO_FLUSH); ++ if (ret == Z_DATA_ERROR) { ++ gz->err = Z_DATA_ERROR; ++ gz->msg = strm->msg; ++ return 0; ++ } ++ if (ret == Z_STREAM_END) ++ inflateReset(strm); ++ } while (strm->avail_out); ++ return len - strm->avail_out; ++} ++ ++int gzclose OF((gzFile)); ++ ++int gzclose(gz) ++ gzFile gz; ++{ ++ z_stream *strm; ++ unsigned char out[BUFLEN]; ++ ++ if (gz == NULL) ++ return Z_STREAM_ERROR; ++ strm = &(gz->strm); ++ if (gz->write) { ++ strm->next_in = Z_NULL; ++ strm->avail_in = 0; ++ do { ++ strm->next_out = out; ++ strm->avail_out = BUFLEN; ++ (void)deflate(strm, Z_FINISH); ++ fwrite(out, 1, BUFLEN - strm->avail_out, gz->file); ++ } while (strm->avail_out == 0); ++ deflateEnd(strm); ++ } ++ else ++ inflateEnd(strm); ++ fclose(gz->file); ++ free(gz); ++ return Z_OK; ++} ++ ++const char *gzerror OF((gzFile, int *)); ++ ++const char *gzerror(gz, err) ++ gzFile gz; ++ int *err; ++{ ++ *err = gz->err; ++ return gz->msg; ++} ++ ++#endif ++ + char *prog; + + void error OF((const char *msg)); +@@ -198,8 +462,17 @@ + FILE *in; + gzFile out; + ++ if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) { ++ fprintf(stderr, "%s: filename too long\n", prog); ++ exit(1); ++ } ++ ++#if !defined(NO_snprintf) && !defined(NO_vsnprintf) ++ snprintf(outfile, sizeof(outfile), "%s%s", file, GZ_SUFFIX); ++#else + strcpy(outfile, file); + strcat(outfile, GZ_SUFFIX); ++#endif + + in = fopen(file, "rb"); + if (in == NULL) { +@@ -227,9 +500,18 @@ + char *infile, *outfile; + FILE *out; + gzFile in; +- uInt len = (uInt)strlen(file); ++ size_t len = strlen(file); + ++ if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) { ++ fprintf(stderr, "%s: filename too long\n", prog); ++ exit(1); ++ } ++ ++#if !defined(NO_snprintf) && !defined(NO_vsnprintf) ++ snprintf(buf, sizeof(buf), "%s", file); ++#else + strcpy(buf, file); ++#endif + + if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) { + infile = file; +@@ -238,7 +520,11 @@ + } else { + outfile = file; + infile = buf; ++#if !defined(NO_snprintf) && !defined(NO_vsnprintf) ++ snprintf(buf + len, sizeof(buf) - len, "%s", GZ_SUFFIX); ++#else + strcat(infile, GZ_SUFFIX); ++#endif + } + in = gzopen(infile, "rb"); + if (in == NULL) { +@@ -258,7 +544,8 @@ + + + /* =========================================================================== +- * Usage: minigzip [-d] [-f] [-h] [-r] [-1 to -9] [files...] ++ * Usage: minigzip [-c] [-d] [-f] [-h] [-r] [-1 to -9] [files...] ++ * -c : write to standard output + * -d : decompress + * -f : compress with Z_FILTERED + * -h : compress with Z_HUFFMAN_ONLY +@@ -270,17 +557,34 @@ + int argc; + char *argv[]; + { ++ int copyout = 0; + int uncompr = 0; + gzFile file; +- char outmode[20]; ++ char *bname, outmode[20]; + ++#if !defined(NO_snprintf) && !defined(NO_vsnprintf) ++ snprintf(outmode, sizeof(outmode), "%s", "wb6 "); ++#else + strcpy(outmode, "wb6 "); ++#endif + + prog = argv[0]; ++ bname = strrchr(argv[0], '/'); ++ if (bname) ++ bname++; ++ else ++ bname = argv[0]; + argc--, argv++; + ++ if (!strcmp(bname, "gunzip")) ++ uncompr = 1; ++ else if (!strcmp(bname, "zcat")) ++ copyout = uncompr = 1; ++ + while (argc > 0) { +- if (strcmp(*argv, "-d") == 0) ++ if (strcmp(*argv, "-c") == 0) ++ copyout = 1; ++ else if (strcmp(*argv, "-d") == 0) + uncompr = 1; + else if (strcmp(*argv, "-f") == 0) + outmode[3] = 'f'; +@@ -310,11 +614,36 @@ + gz_compress(stdin, file); + } + } else { ++ if (copyout) { ++ SET_BINARY_MODE(stdout); ++ } + do { + if (uncompr) { +- file_uncompress(*argv); ++ if (copyout) { ++ file = gzopen(*argv, "rb"); ++ if (file == NULL) ++ fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv); ++ else ++ gz_uncompress(file, stdout); ++ } else { ++ file_uncompress(*argv); ++ } + } else { +- file_compress(*argv, outmode); ++ if (copyout) { ++ FILE * in = fopen(*argv, "rb"); ++ ++ if (in == NULL) { ++ perror(*argv); ++ } else { ++ file = gzdopen(fileno(stdout), outmode); ++ if (file == NULL) error("can't gzdopen stdout"); ++ ++ gz_compress(in, file); ++ } ++ ++ } else { ++ file_compress(*argv, outmode); ++ } + } + } while (argv++, --argc); + } +diff -r ee879c0ffa11 Modules/zlib/trees.c +--- a/Modules/zlib/trees.c ++++ b/Modules/zlib/trees.c +@@ -1,5 +1,6 @@ + /* trees.c -- output deflated data using Huffman coding +- * Copyright (C) 1995-2005 Jean-loup Gailly ++ * Copyright (C) 1995-2012 Jean-loup Gailly ++ * detect_data_type() function provided freely by Cosmin Truta, 2006 + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -73,11 +74,6 @@ + * probability, to avoid transmitting the lengths for unused bit length codes. + */ + +-#define Buf_size (8 * 2*sizeof(char)) +-/* Number of bits used within bi_buf. (bi_buf might be implemented on +- * more than 16 bits on some systems.) +- */ +- + /* =========================================================================== + * Local data. These are initialized only once. + */ +@@ -150,9 +146,9 @@ + local int build_bl_tree OF((deflate_state *s)); + local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, + int blcodes)); +-local void compress_block OF((deflate_state *s, ct_data *ltree, +- ct_data *dtree)); +-local void set_data_type OF((deflate_state *s)); ++local void compress_block OF((deflate_state *s, const ct_data *ltree, ++ const ct_data *dtree)); ++local int detect_data_type OF((deflate_state *s)); + local unsigned bi_reverse OF((unsigned value, int length)); + local void bi_windup OF((deflate_state *s)); + local void bi_flush OF((deflate_state *s)); +@@ -203,12 +199,12 @@ + * unused bits in value. + */ + if (s->bi_valid > (int)Buf_size - length) { +- s->bi_buf |= (value << s->bi_valid); ++ s->bi_buf |= (ush)value << s->bi_valid; + put_short(s, s->bi_buf); + s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); + s->bi_valid += length - Buf_size; + } else { +- s->bi_buf |= value << s->bi_valid; ++ s->bi_buf |= (ush)value << s->bi_valid; + s->bi_valid += length; + } + } +@@ -218,12 +214,12 @@ + { int len = length;\ + if (s->bi_valid > (int)Buf_size - len) {\ + int val = value;\ +- s->bi_buf |= (val << s->bi_valid);\ ++ s->bi_buf |= (ush)val << s->bi_valid;\ + put_short(s, s->bi_buf);\ + s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ + s->bi_valid += len - Buf_size;\ + } else {\ +- s->bi_buf |= (value) << s->bi_valid;\ ++ s->bi_buf |= (ush)(value) << s->bi_valid;\ + s->bi_valid += len;\ + }\ + } +@@ -250,11 +246,13 @@ + if (static_init_done) return; + + /* For some embedded targets, global variables are not initialized: */ ++#ifdef NO_INIT_GLOBAL_POINTERS + static_l_desc.static_tree = static_ltree; + static_l_desc.extra_bits = extra_lbits; + static_d_desc.static_tree = static_dtree; + static_d_desc.extra_bits = extra_dbits; + static_bl_desc.extra_bits = extra_blbits; ++#endif + + /* Initialize the mapping length (0..255) -> length code (0..28) */ + length = 0; +@@ -348,13 +346,14 @@ + static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5)); + } + +- fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n"); ++ fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n"); + for (i = 0; i < DIST_CODE_LEN; i++) { + fprintf(header, "%2u%s", _dist_code[i], + SEPARATOR(i, DIST_CODE_LEN-1, 20)); + } + +- fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); ++ fprintf(header, ++ "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); + for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) { + fprintf(header, "%2u%s", _length_code[i], + SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20)); +@@ -379,7 +378,7 @@ + /* =========================================================================== + * Initialize the tree data structures for a new zlib stream. + */ +-void _tr_init(s) ++void ZLIB_INTERNAL _tr_init(s) + deflate_state *s; + { + tr_static_init(); +@@ -395,7 +394,6 @@ + + s->bi_buf = 0; + s->bi_valid = 0; +- s->last_eob_len = 8; /* enough lookahead for inflate */ + #ifdef DEBUG + s->compressed_len = 0L; + s->bits_sent = 0L; +@@ -864,13 +862,13 @@ + /* =========================================================================== + * Send a stored block + */ +-void _tr_stored_block(s, buf, stored_len, eof) ++void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last) + deflate_state *s; + charf *buf; /* input block */ + ulg stored_len; /* length of input block */ +- int eof; /* true if this is the last block for a file */ ++ int last; /* one if this is the last block for a file */ + { +- send_bits(s, (STORED_BLOCK<<1)+eof, 3); /* send block type */ ++ send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */ + #ifdef DEBUG + s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; + s->compressed_len += (stored_len + 4) << 3; +@@ -879,17 +877,19 @@ + } + + /* =========================================================================== ++ * Flush the bits in the bit buffer to pending output (leaves at most 7 bits) ++ */ ++void ZLIB_INTERNAL _tr_flush_bits(s) ++ deflate_state *s; ++{ ++ bi_flush(s); ++} ++ ++/* =========================================================================== + * Send one empty static block to give enough lookahead for inflate. + * This takes 10 bits, of which 7 may remain in the bit buffer. +- * The current inflate code requires 9 bits of lookahead. If the +- * last two codes for the previous block (real code plus EOB) were coded +- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode +- * the last real code. In this case we send two empty static blocks instead +- * of one. (There are no problems if the previous block is stored or fixed.) +- * To simplify the code, we assume the worst case of last real code encoded +- * on one bit only. + */ +-void _tr_align(s) ++void ZLIB_INTERNAL _tr_align(s) + deflate_state *s; + { + send_bits(s, STATIC_TREES<<1, 3); +@@ -898,31 +898,17 @@ + s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ + #endif + bi_flush(s); +- /* Of the 10 bits for the empty block, we have already sent +- * (10 - bi_valid) bits. The lookahead for the last real code (before +- * the EOB of the previous block) was thus at least one plus the length +- * of the EOB plus what we have just sent of the empty static block. +- */ +- if (1 + s->last_eob_len + 10 - s->bi_valid < 9) { +- send_bits(s, STATIC_TREES<<1, 3); +- send_code(s, END_BLOCK, static_ltree); +-#ifdef DEBUG +- s->compressed_len += 10L; +-#endif +- bi_flush(s); +- } +- s->last_eob_len = 7; + } + + /* =========================================================================== + * Determine the best encoding for the current block: dynamic trees, static + * trees or store, and output the encoded block to the zip file. + */ +-void _tr_flush_block(s, buf, stored_len, eof) ++void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) + deflate_state *s; + charf *buf; /* input block, or NULL if too old */ + ulg stored_len; /* length of input block */ +- int eof; /* true if this is the last block for a file */ ++ int last; /* one if this is the last block for a file */ + { + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ + int max_blindex = 0; /* index of last bit length code of non zero freq */ +@@ -931,8 +917,8 @@ + if (s->level > 0) { + + /* Check if the file is binary or text */ +- if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN) +- set_data_type(s); ++ if (s->strm->data_type == Z_UNKNOWN) ++ s->strm->data_type = detect_data_type(s); + + /* Construct the literal and distance trees */ + build_tree(s, (tree_desc *)(&(s->l_desc))); +@@ -978,23 +964,25 @@ + * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to + * transform a block into a stored block. + */ +- _tr_stored_block(s, buf, stored_len, eof); ++ _tr_stored_block(s, buf, stored_len, last); + + #ifdef FORCE_STATIC + } else if (static_lenb >= 0) { /* force static trees */ + #else + } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { + #endif +- send_bits(s, (STATIC_TREES<<1)+eof, 3); +- compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); ++ send_bits(s, (STATIC_TREES<<1)+last, 3); ++ compress_block(s, (const ct_data *)static_ltree, ++ (const ct_data *)static_dtree); + #ifdef DEBUG + s->compressed_len += 3 + s->static_len; + #endif + } else { +- send_bits(s, (DYN_TREES<<1)+eof, 3); ++ send_bits(s, (DYN_TREES<<1)+last, 3); + send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, + max_blindex+1); +- compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree); ++ compress_block(s, (const ct_data *)s->dyn_ltree, ++ (const ct_data *)s->dyn_dtree); + #ifdef DEBUG + s->compressed_len += 3 + s->opt_len; + #endif +@@ -1005,21 +993,21 @@ + */ + init_block(s); + +- if (eof) { ++ if (last) { + bi_windup(s); + #ifdef DEBUG + s->compressed_len += 7; /* align on byte boundary */ + #endif + } + Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3, +- s->compressed_len-7*eof)); ++ s->compressed_len-7*last)); + } + + /* =========================================================================== + * Save the match info and tally the frequency counts. Return true if + * the current block must be flushed. + */ +-int _tr_tally (s, dist, lc) ++int ZLIB_INTERNAL _tr_tally (s, dist, lc) + deflate_state *s; + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ +@@ -1071,8 +1059,8 @@ + */ + local void compress_block(s, ltree, dtree) + deflate_state *s; +- ct_data *ltree; /* literal tree */ +- ct_data *dtree; /* distance tree */ ++ const ct_data *ltree; /* literal tree */ ++ const ct_data *dtree; /* distance tree */ + { + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ +@@ -1114,28 +1102,48 @@ + } while (lx < s->last_lit); + + send_code(s, END_BLOCK, ltree); +- s->last_eob_len = ltree[END_BLOCK].Len; + } + + /* =========================================================================== +- * Set the data type to BINARY or TEXT, using a crude approximation: +- * set it to Z_TEXT if all symbols are either printable characters (33 to 255) +- * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise. ++ * Check if the data type is TEXT or BINARY, using the following algorithm: ++ * - TEXT if the two conditions below are satisfied: ++ * a) There are no non-portable control characters belonging to the ++ * "black list" (0..6, 14..25, 28..31). ++ * b) There is at least one printable character belonging to the ++ * "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). ++ * - BINARY otherwise. ++ * - The following partially-portable control characters form a ++ * "gray list" that is ignored in this detection algorithm: ++ * (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}). + * IN assertion: the fields Freq of dyn_ltree are set. + */ +-local void set_data_type(s) ++local int detect_data_type(s) + deflate_state *s; + { ++ /* black_mask is the bit mask of black-listed bytes ++ * set bits 0..6, 14..25, and 28..31 ++ * 0xf3ffc07f = binary 11110011111111111100000001111111 ++ */ ++ unsigned long black_mask = 0xf3ffc07fUL; + int n; + +- for (n = 0; n < 9; n++) ++ /* Check for non-textual ("black-listed") bytes. */ ++ for (n = 0; n <= 31; n++, black_mask >>= 1) ++ if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0)) ++ return Z_BINARY; ++ ++ /* Check for textual ("white-listed") bytes. */ ++ if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0 ++ || s->dyn_ltree[13].Freq != 0) ++ return Z_TEXT; ++ for (n = 32; n < LITERALS; n++) + if (s->dyn_ltree[n].Freq != 0) +- break; +- if (n == 9) +- for (n = 14; n < 32; n++) +- if (s->dyn_ltree[n].Freq != 0) +- break; +- s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY; ++ return Z_TEXT; ++ ++ /* There are no "black-listed" or "white-listed" bytes: ++ * this stream either is empty or has tolerated ("gray-listed") bytes only. ++ */ ++ return Z_BINARY; + } + + /* =========================================================================== +@@ -1201,7 +1209,6 @@ + int header; /* true if block header must be written */ + { + bi_windup(s); /* align on byte boundary */ +- s->last_eob_len = 8; /* enough lookahead for inflate */ + + if (header) { + put_short(s, (ush)len); +diff -r ee879c0ffa11 Modules/zlib/trees.h +--- a/Modules/zlib/trees.h ++++ b/Modules/zlib/trees.h +@@ -70,7 +70,7 @@ + {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} + }; + +-const uch _dist_code[DIST_CODE_LEN] = { ++const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = { + 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, + 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, +@@ -99,7 +99,7 @@ + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 + }; + +-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= { ++const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, + 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, + 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, +diff -r ee879c0ffa11 Modules/zlib/uncompr.c +--- a/Modules/zlib/uncompr.c ++++ b/Modules/zlib/uncompr.c +@@ -1,5 +1,5 @@ + /* uncompr.c -- decompress a memory buffer +- * Copyright (C) 1995-2003 Jean-loup Gailly. ++ * Copyright (C) 1995-2003, 2010 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -16,8 +16,6 @@ + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer. +- This function can be used to decompress a whole file at once if the +- input file is mmap'ed. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output +@@ -32,7 +30,7 @@ + z_stream stream; + int err; + +- stream.next_in = (Bytef*)source; ++ stream.next_in = (z_const Bytef *)source; + stream.avail_in = (uInt)sourceLen; + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; +diff -r ee879c0ffa11 Modules/zlib/zconf.h +--- a/Modules/zlib/zconf.h ++++ b/Modules/zlib/zconf.h +@@ -1,5 +1,5 @@ + /* zconf.h -- configuration of the zlib compression library +- * Copyright (C) 1995-2005 Jean-loup Gailly. ++ * Copyright (C) 1995-2013 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -11,52 +11,145 @@ + /* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. ++ * Even better than compiling with -DZ_PREFIX would be to use configure to set ++ * this permanently in zconf.h using "./configure --zprefix". + */ +-#ifdef Z_PREFIX ++#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ ++# define Z_PREFIX_SET ++ ++/* all linked symbols */ ++# define _dist_code z__dist_code ++# define _length_code z__length_code ++# define _tr_align z__tr_align ++# define _tr_flush_bits z__tr_flush_bits ++# define _tr_flush_block z__tr_flush_block ++# define _tr_init z__tr_init ++# define _tr_stored_block z__tr_stored_block ++# define _tr_tally z__tr_tally ++# define adler32 z_adler32 ++# define adler32_combine z_adler32_combine ++# define adler32_combine64 z_adler32_combine64 ++# ifndef Z_SOLO ++# define compress z_compress ++# define compress2 z_compress2 ++# define compressBound z_compressBound ++# endif ++# define crc32 z_crc32 ++# define crc32_combine z_crc32_combine ++# define crc32_combine64 z_crc32_combine64 ++# define deflate z_deflate ++# define deflateBound z_deflateBound ++# define deflateCopy z_deflateCopy ++# define deflateEnd z_deflateEnd ++# define deflateInit2_ z_deflateInit2_ + # define deflateInit_ z_deflateInit_ +-# define deflate z_deflate +-# define deflateEnd z_deflateEnd ++# define deflateParams z_deflateParams ++# define deflatePending z_deflatePending ++# define deflatePrime z_deflatePrime ++# define deflateReset z_deflateReset ++# define deflateResetKeep z_deflateResetKeep ++# define deflateSetDictionary z_deflateSetDictionary ++# define deflateSetHeader z_deflateSetHeader ++# define deflateTune z_deflateTune ++# define deflate_copyright z_deflate_copyright ++# define get_crc_table z_get_crc_table ++# ifndef Z_SOLO ++# define gz_error z_gz_error ++# define gz_intmax z_gz_intmax ++# define gz_strwinerror z_gz_strwinerror ++# define gzbuffer z_gzbuffer ++# define gzclearerr z_gzclearerr ++# define gzclose z_gzclose ++# define gzclose_r z_gzclose_r ++# define gzclose_w z_gzclose_w ++# define gzdirect z_gzdirect ++# define gzdopen z_gzdopen ++# define gzeof z_gzeof ++# define gzerror z_gzerror ++# define gzflush z_gzflush ++# define gzgetc z_gzgetc ++# define gzgetc_ z_gzgetc_ ++# define gzgets z_gzgets ++# define gzoffset z_gzoffset ++# define gzoffset64 z_gzoffset64 ++# define gzopen z_gzopen ++# define gzopen64 z_gzopen64 ++# ifdef _WIN32 ++# define gzopen_w z_gzopen_w ++# endif ++# define gzprintf z_gzprintf ++# define gzvprintf z_gzvprintf ++# define gzputc z_gzputc ++# define gzputs z_gzputs ++# define gzread z_gzread ++# define gzrewind z_gzrewind ++# define gzseek z_gzseek ++# define gzseek64 z_gzseek64 ++# define gzsetparams z_gzsetparams ++# define gztell z_gztell ++# define gztell64 z_gztell64 ++# define gzungetc z_gzungetc ++# define gzwrite z_gzwrite ++# endif ++# define inflate z_inflate ++# define inflateBack z_inflateBack ++# define inflateBackEnd z_inflateBackEnd ++# define inflateBackInit_ z_inflateBackInit_ ++# define inflateCopy z_inflateCopy ++# define inflateEnd z_inflateEnd ++# define inflateGetHeader z_inflateGetHeader ++# define inflateInit2_ z_inflateInit2_ + # define inflateInit_ z_inflateInit_ +-# define inflate z_inflate +-# define inflateEnd z_inflateEnd +-# define deflateInit2_ z_deflateInit2_ +-# define deflateSetDictionary z_deflateSetDictionary +-# define deflateCopy z_deflateCopy +-# define deflateReset z_deflateReset +-# define deflateParams z_deflateParams +-# define deflateBound z_deflateBound +-# define deflatePrime z_deflatePrime +-# define inflateInit2_ z_inflateInit2_ ++# define inflateMark z_inflateMark ++# define inflatePrime z_inflatePrime ++# define inflateReset z_inflateReset ++# define inflateReset2 z_inflateReset2 + # define inflateSetDictionary z_inflateSetDictionary ++# define inflateGetDictionary z_inflateGetDictionary + # define inflateSync z_inflateSync + # define inflateSyncPoint z_inflateSyncPoint +-# define inflateCopy z_inflateCopy +-# define inflateReset z_inflateReset +-# define inflateBack z_inflateBack +-# define inflateBackEnd z_inflateBackEnd +-# define compress z_compress +-# define compress2 z_compress2 +-# define compressBound z_compressBound +-# define uncompress z_uncompress +-# define adler32 z_adler32 +-# define crc32 z_crc32 +-# define get_crc_table z_get_crc_table ++# define inflateUndermine z_inflateUndermine ++# define inflateResetKeep z_inflateResetKeep ++# define inflate_copyright z_inflate_copyright ++# define inflate_fast z_inflate_fast ++# define inflate_table z_inflate_table ++# ifndef Z_SOLO ++# define uncompress z_uncompress ++# endif + # define zError z_zError ++# ifndef Z_SOLO ++# define zcalloc z_zcalloc ++# define zcfree z_zcfree ++# endif ++# define zlibCompileFlags z_zlibCompileFlags ++# define zlibVersion z_zlibVersion + ++/* all zlib typedefs in zlib.h and zconf.h */ ++# define Byte z_Byte ++# define Bytef z_Bytef + # define alloc_func z_alloc_func ++# define charf z_charf + # define free_func z_free_func ++# ifndef Z_SOLO ++# define gzFile z_gzFile ++# endif ++# define gz_header z_gz_header ++# define gz_headerp z_gz_headerp + # define in_func z_in_func ++# define intf z_intf + # define out_func z_out_func +-# define Byte z_Byte + # define uInt z_uInt ++# define uIntf z_uIntf + # define uLong z_uLong +-# define Bytef z_Bytef +-# define charf z_charf +-# define intf z_intf +-# define uIntf z_uIntf + # define uLongf z_uLongf ++# define voidp z_voidp ++# define voidpc z_voidpc + # define voidpf z_voidpf +-# define voidp z_voidp ++ ++/* all zlib structs in zlib.h and zconf.h */ ++# define gz_header_s z_gz_header_s ++# define internal_state z_internal_state ++ + #endif + + #if defined(__MSDOS__) && !defined(MSDOS) +@@ -125,6 +218,12 @@ + # endif + #endif + ++#if defined(ZLIB_CONST) && !defined(z_const) ++# define z_const const ++#else ++# define z_const ++#endif ++ + /* Some Mac compilers merge all .h files incorrectly: */ + #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) + # define NO_DUMMY_DECL +@@ -171,6 +270,14 @@ + # endif + #endif + ++#ifndef Z_ARG /* function prototypes for stdarg */ ++# if defined(STDC) || defined(Z_HAVE_STDARG_H) ++# define Z_ARG(args) args ++# else ++# define Z_ARG(args) () ++# endif ++#endif ++ + /* The following definitions for FAR are needed only for MSDOS mixed + * model programming (small or medium model with some far allocations). + * This was tested only with MSC; for other MSDOS compilers you may have +@@ -284,49 +391,121 @@ + typedef Byte *voidp; + #endif + +-#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ +-# include /* for off_t */ +-# include /* for SEEK_* and off_t */ +-# ifdef VMS +-# include /* for off_t */ ++#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) ++# include ++# if (UINT_MAX == 0xffffffffUL) ++# define Z_U4 unsigned ++# elif (ULONG_MAX == 0xffffffffUL) ++# define Z_U4 unsigned long ++# elif (USHRT_MAX == 0xffffffffUL) ++# define Z_U4 unsigned short + # endif +-# define z_off_t off_t + #endif +-#ifndef SEEK_SET ++ ++#ifdef Z_U4 ++ typedef Z_U4 z_crc_t; ++#else ++ typedef unsigned long z_crc_t; ++#endif ++ ++#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ ++# define Z_HAVE_UNISTD_H ++#endif ++ ++#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ ++# define Z_HAVE_STDARG_H ++#endif ++ ++#ifdef STDC ++# ifndef Z_SOLO ++# include /* for off_t */ ++# endif ++#endif ++ ++#if defined(STDC) || defined(Z_HAVE_STDARG_H) ++# ifndef Z_SOLO ++# include /* for va_list */ ++# endif ++#endif ++ ++#ifdef _WIN32 ++# ifndef Z_SOLO ++# include /* for wchar_t */ ++# endif ++#endif ++ ++/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and ++ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even ++ * though the former does not conform to the LFS document), but considering ++ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as ++ * equivalently requesting no 64-bit operations ++ */ ++#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 ++# undef _LARGEFILE64_SOURCE ++#endif ++ ++#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) ++# define Z_HAVE_UNISTD_H ++#endif ++#ifndef Z_SOLO ++# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) ++# include /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ ++# ifdef VMS ++# include /* for off_t */ ++# endif ++# ifndef z_off_t ++# define z_off_t off_t ++# endif ++# endif ++#endif ++ ++#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0 ++# define Z_LFS64 ++#endif ++ ++#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64) ++# define Z_LARGE64 ++#endif ++ ++#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64) ++# define Z_WANT64 ++#endif ++ ++#if !defined(SEEK_SET) && !defined(Z_SOLO) + # define SEEK_SET 0 /* Seek from beginning of file. */ + # define SEEK_CUR 1 /* Seek from current position. */ + # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ + #endif ++ + #ifndef z_off_t + # define z_off_t long + #endif + +-#if defined(__OS400__) +-# define NO_vsnprintf +-#endif +- +-#if defined(__MVS__) +-# define NO_vsnprintf +-# ifdef FAR +-# undef FAR ++#if !defined(_WIN32) && defined(Z_LARGE64) ++# define z_off64_t off64_t ++#else ++# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) ++# define z_off64_t __int64 ++# else ++# define z_off64_t z_off_t + # endif + #endif + + /* MVS linker does not support external names larger than 8 bytes */ + #if defined(__MVS__) +-# pragma map(deflateInit_,"DEIN") +-# pragma map(deflateInit2_,"DEIN2") +-# pragma map(deflateEnd,"DEEND") +-# pragma map(deflateBound,"DEBND") +-# pragma map(inflateInit_,"ININ") +-# pragma map(inflateInit2_,"ININ2") +-# pragma map(inflateEnd,"INEND") +-# pragma map(inflateSync,"INSY") +-# pragma map(inflateSetDictionary,"INSEDI") +-# pragma map(compressBound,"CMBND") +-# pragma map(inflate_table,"INTABL") +-# pragma map(inflate_fast,"INFA") +-# pragma map(inflate_copyright,"INCOPY") ++ #pragma map(deflateInit_,"DEIN") ++ #pragma map(deflateInit2_,"DEIN2") ++ #pragma map(deflateEnd,"DEEND") ++ #pragma map(deflateBound,"DEBND") ++ #pragma map(inflateInit_,"ININ") ++ #pragma map(inflateInit2_,"ININ2") ++ #pragma map(inflateEnd,"INEND") ++ #pragma map(inflateSync,"INSY") ++ #pragma map(inflateSetDictionary,"INSEDI") ++ #pragma map(compressBound,"CMBND") ++ #pragma map(inflate_table,"INTABL") ++ #pragma map(inflate_fast,"INFA") ++ #pragma map(inflate_copyright,"INCOPY") + #endif + + #endif /* ZCONF_H */ +diff -r ee879c0ffa11 Modules/zlib/zconf.h.cmakein +--- /dev/null ++++ b/Modules/zlib/zconf.h.cmakein +@@ -0,0 +1,513 @@ ++/* zconf.h -- configuration of the zlib compression library ++ * Copyright (C) 1995-2013 Jean-loup Gailly. ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++/* @(#) $Id$ */ ++ ++#ifndef ZCONF_H ++#define ZCONF_H ++#cmakedefine Z_PREFIX ++#cmakedefine Z_HAVE_UNISTD_H ++ ++/* ++ * If you *really* need a unique prefix for all types and library functions, ++ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. ++ * Even better than compiling with -DZ_PREFIX would be to use configure to set ++ * this permanently in zconf.h using "./configure --zprefix". ++ */ ++#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ ++# define Z_PREFIX_SET ++ ++/* all linked symbols */ ++# define _dist_code z__dist_code ++# define _length_code z__length_code ++# define _tr_align z__tr_align ++# define _tr_flush_bits z__tr_flush_bits ++# define _tr_flush_block z__tr_flush_block ++# define _tr_init z__tr_init ++# define _tr_stored_block z__tr_stored_block ++# define _tr_tally z__tr_tally ++# define adler32 z_adler32 ++# define adler32_combine z_adler32_combine ++# define adler32_combine64 z_adler32_combine64 ++# ifndef Z_SOLO ++# define compress z_compress ++# define compress2 z_compress2 ++# define compressBound z_compressBound ++# endif ++# define crc32 z_crc32 ++# define crc32_combine z_crc32_combine ++# define crc32_combine64 z_crc32_combine64 ++# define deflate z_deflate ++# define deflateBound z_deflateBound ++# define deflateCopy z_deflateCopy ++# define deflateEnd z_deflateEnd ++# define deflateInit2_ z_deflateInit2_ ++# define deflateInit_ z_deflateInit_ ++# define deflateParams z_deflateParams ++# define deflatePending z_deflatePending ++# define deflatePrime z_deflatePrime ++# define deflateReset z_deflateReset ++# define deflateResetKeep z_deflateResetKeep ++# define deflateSetDictionary z_deflateSetDictionary ++# define deflateSetHeader z_deflateSetHeader ++# define deflateTune z_deflateTune ++# define deflate_copyright z_deflate_copyright ++# define get_crc_table z_get_crc_table ++# ifndef Z_SOLO ++# define gz_error z_gz_error ++# define gz_intmax z_gz_intmax ++# define gz_strwinerror z_gz_strwinerror ++# define gzbuffer z_gzbuffer ++# define gzclearerr z_gzclearerr ++# define gzclose z_gzclose ++# define gzclose_r z_gzclose_r ++# define gzclose_w z_gzclose_w ++# define gzdirect z_gzdirect ++# define gzdopen z_gzdopen ++# define gzeof z_gzeof ++# define gzerror z_gzerror ++# define gzflush z_gzflush ++# define gzgetc z_gzgetc ++# define gzgetc_ z_gzgetc_ ++# define gzgets z_gzgets ++# define gzoffset z_gzoffset ++# define gzoffset64 z_gzoffset64 ++# define gzopen z_gzopen ++# define gzopen64 z_gzopen64 ++# ifdef _WIN32 ++# define gzopen_w z_gzopen_w ++# endif ++# define gzprintf z_gzprintf ++# define gzvprintf z_gzvprintf ++# define gzputc z_gzputc ++# define gzputs z_gzputs ++# define gzread z_gzread ++# define gzrewind z_gzrewind ++# define gzseek z_gzseek ++# define gzseek64 z_gzseek64 ++# define gzsetparams z_gzsetparams ++# define gztell z_gztell ++# define gztell64 z_gztell64 ++# define gzungetc z_gzungetc ++# define gzwrite z_gzwrite ++# endif ++# define inflate z_inflate ++# define inflateBack z_inflateBack ++# define inflateBackEnd z_inflateBackEnd ++# define inflateBackInit_ z_inflateBackInit_ ++# define inflateCopy z_inflateCopy ++# define inflateEnd z_inflateEnd ++# define inflateGetHeader z_inflateGetHeader ++# define inflateInit2_ z_inflateInit2_ ++# define inflateInit_ z_inflateInit_ ++# define inflateMark z_inflateMark ++# define inflatePrime z_inflatePrime ++# define inflateReset z_inflateReset ++# define inflateReset2 z_inflateReset2 ++# define inflateSetDictionary z_inflateSetDictionary ++# define inflateGetDictionary z_inflateGetDictionary ++# define inflateSync z_inflateSync ++# define inflateSyncPoint z_inflateSyncPoint ++# define inflateUndermine z_inflateUndermine ++# define inflateResetKeep z_inflateResetKeep ++# define inflate_copyright z_inflate_copyright ++# define inflate_fast z_inflate_fast ++# define inflate_table z_inflate_table ++# ifndef Z_SOLO ++# define uncompress z_uncompress ++# endif ++# define zError z_zError ++# ifndef Z_SOLO ++# define zcalloc z_zcalloc ++# define zcfree z_zcfree ++# endif ++# define zlibCompileFlags z_zlibCompileFlags ++# define zlibVersion z_zlibVersion ++ ++/* all zlib typedefs in zlib.h and zconf.h */ ++# define Byte z_Byte ++# define Bytef z_Bytef ++# define alloc_func z_alloc_func ++# define charf z_charf ++# define free_func z_free_func ++# ifndef Z_SOLO ++# define gzFile z_gzFile ++# endif ++# define gz_header z_gz_header ++# define gz_headerp z_gz_headerp ++# define in_func z_in_func ++# define intf z_intf ++# define out_func z_out_func ++# define uInt z_uInt ++# define uIntf z_uIntf ++# define uLong z_uLong ++# define uLongf z_uLongf ++# define voidp z_voidp ++# define voidpc z_voidpc ++# define voidpf z_voidpf ++ ++/* all zlib structs in zlib.h and zconf.h */ ++# define gz_header_s z_gz_header_s ++# define internal_state z_internal_state ++ ++#endif ++ ++#if defined(__MSDOS__) && !defined(MSDOS) ++# define MSDOS ++#endif ++#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) ++# define OS2 ++#endif ++#if defined(_WINDOWS) && !defined(WINDOWS) ++# define WINDOWS ++#endif ++#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) ++# ifndef WIN32 ++# define WIN32 ++# endif ++#endif ++#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) ++# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) ++# ifndef SYS16BIT ++# define SYS16BIT ++# endif ++# endif ++#endif ++ ++/* ++ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more ++ * than 64k bytes at a time (needed on systems with 16-bit int). ++ */ ++#ifdef SYS16BIT ++# define MAXSEG_64K ++#endif ++#ifdef MSDOS ++# define UNALIGNED_OK ++#endif ++ ++#ifdef __STDC_VERSION__ ++# ifndef STDC ++# define STDC ++# endif ++# if __STDC_VERSION__ >= 199901L ++# ifndef STDC99 ++# define STDC99 ++# endif ++# endif ++#endif ++#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) ++# define STDC ++#endif ++#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) ++# define STDC ++#endif ++#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) ++# define STDC ++#endif ++#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) ++# define STDC ++#endif ++ ++#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ ++# define STDC ++#endif ++ ++#ifndef STDC ++# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ ++# define const /* note: need a more gentle solution here */ ++# endif ++#endif ++ ++#if defined(ZLIB_CONST) && !defined(z_const) ++# define z_const const ++#else ++# define z_const ++#endif ++ ++/* Some Mac compilers merge all .h files incorrectly: */ ++#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) ++# define NO_DUMMY_DECL ++#endif ++ ++/* Maximum value for memLevel in deflateInit2 */ ++#ifndef MAX_MEM_LEVEL ++# ifdef MAXSEG_64K ++# define MAX_MEM_LEVEL 8 ++# else ++# define MAX_MEM_LEVEL 9 ++# endif ++#endif ++ ++/* Maximum value for windowBits in deflateInit2 and inflateInit2. ++ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files ++ * created by gzip. (Files created by minigzip can still be extracted by ++ * gzip.) ++ */ ++#ifndef MAX_WBITS ++# define MAX_WBITS 15 /* 32K LZ77 window */ ++#endif ++ ++/* The memory requirements for deflate are (in bytes): ++ (1 << (windowBits+2)) + (1 << (memLevel+9)) ++ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) ++ plus a few kilobytes for small objects. For example, if you want to reduce ++ the default memory requirements from 256K to 128K, compile with ++ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" ++ Of course this will generally degrade compression (there's no free lunch). ++ ++ The memory requirements for inflate are (in bytes) 1 << windowBits ++ that is, 32K for windowBits=15 (default value) plus a few kilobytes ++ for small objects. ++*/ ++ ++ /* Type declarations */ ++ ++#ifndef OF /* function prototypes */ ++# ifdef STDC ++# define OF(args) args ++# else ++# define OF(args) () ++# endif ++#endif ++ ++#ifndef Z_ARG /* function prototypes for stdarg */ ++# if defined(STDC) || defined(Z_HAVE_STDARG_H) ++# define Z_ARG(args) args ++# else ++# define Z_ARG(args) () ++# endif ++#endif ++ ++/* The following definitions for FAR are needed only for MSDOS mixed ++ * model programming (small or medium model with some far allocations). ++ * This was tested only with MSC; for other MSDOS compilers you may have ++ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, ++ * just define FAR to be empty. ++ */ ++#ifdef SYS16BIT ++# if defined(M_I86SM) || defined(M_I86MM) ++ /* MSC small or medium model */ ++# define SMALL_MEDIUM ++# ifdef _MSC_VER ++# define FAR _far ++# else ++# define FAR far ++# endif ++# endif ++# if (defined(__SMALL__) || defined(__MEDIUM__)) ++ /* Turbo C small or medium model */ ++# define SMALL_MEDIUM ++# ifdef __BORLANDC__ ++# define FAR _far ++# else ++# define FAR far ++# endif ++# endif ++#endif ++ ++#if defined(WINDOWS) || defined(WIN32) ++ /* If building or using zlib as a DLL, define ZLIB_DLL. ++ * This is not mandatory, but it offers a little performance increase. ++ */ ++# ifdef ZLIB_DLL ++# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) ++# ifdef ZLIB_INTERNAL ++# define ZEXTERN extern __declspec(dllexport) ++# else ++# define ZEXTERN extern __declspec(dllimport) ++# endif ++# endif ++# endif /* ZLIB_DLL */ ++ /* If building or using zlib with the WINAPI/WINAPIV calling convention, ++ * define ZLIB_WINAPI. ++ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. ++ */ ++# ifdef ZLIB_WINAPI ++# ifdef FAR ++# undef FAR ++# endif ++# include ++ /* No need for _export, use ZLIB.DEF instead. */ ++ /* For complete Windows compatibility, use WINAPI, not __stdcall. */ ++# define ZEXPORT WINAPI ++# ifdef WIN32 ++# define ZEXPORTVA WINAPIV ++# else ++# define ZEXPORTVA FAR CDECL ++# endif ++# endif ++#endif ++ ++#if defined (__BEOS__) ++# ifdef ZLIB_DLL ++# ifdef ZLIB_INTERNAL ++# define ZEXPORT __declspec(dllexport) ++# define ZEXPORTVA __declspec(dllexport) ++# else ++# define ZEXPORT __declspec(dllimport) ++# define ZEXPORTVA __declspec(dllimport) ++# endif ++# endif ++#endif ++ ++#ifndef ZEXTERN ++# define ZEXTERN extern ++#endif ++#ifndef ZEXPORT ++# define ZEXPORT ++#endif ++#ifndef ZEXPORTVA ++# define ZEXPORTVA ++#endif ++ ++#ifndef FAR ++# define FAR ++#endif ++ ++#if !defined(__MACTYPES__) ++typedef unsigned char Byte; /* 8 bits */ ++#endif ++typedef unsigned int uInt; /* 16 bits or more */ ++typedef unsigned long uLong; /* 32 bits or more */ ++ ++#ifdef SMALL_MEDIUM ++ /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ ++# define Bytef Byte FAR ++#else ++ typedef Byte FAR Bytef; ++#endif ++typedef char FAR charf; ++typedef int FAR intf; ++typedef uInt FAR uIntf; ++typedef uLong FAR uLongf; ++ ++#ifdef STDC ++ typedef void const *voidpc; ++ typedef void FAR *voidpf; ++ typedef void *voidp; ++#else ++ typedef Byte const *voidpc; ++ typedef Byte FAR *voidpf; ++ typedef Byte *voidp; ++#endif ++ ++#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) ++# include ++# if (UINT_MAX == 0xffffffffUL) ++# define Z_U4 unsigned ++# elif (ULONG_MAX == 0xffffffffUL) ++# define Z_U4 unsigned long ++# elif (USHRT_MAX == 0xffffffffUL) ++# define Z_U4 unsigned short ++# endif ++#endif ++ ++#ifdef Z_U4 ++ typedef Z_U4 z_crc_t; ++#else ++ typedef unsigned long z_crc_t; ++#endif ++ ++#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ ++# define Z_HAVE_UNISTD_H ++#endif ++ ++#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ ++# define Z_HAVE_STDARG_H ++#endif ++ ++#ifdef STDC ++# ifndef Z_SOLO ++# include /* for off_t */ ++# endif ++#endif ++ ++#if defined(STDC) || defined(Z_HAVE_STDARG_H) ++# ifndef Z_SOLO ++# include /* for va_list */ ++# endif ++#endif ++ ++#ifdef _WIN32 ++# ifndef Z_SOLO ++# include /* for wchar_t */ ++# endif ++#endif ++ ++/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and ++ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even ++ * though the former does not conform to the LFS document), but considering ++ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as ++ * equivalently requesting no 64-bit operations ++ */ ++#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 ++# undef _LARGEFILE64_SOURCE ++#endif ++ ++#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) ++# define Z_HAVE_UNISTD_H ++#endif ++#ifndef Z_SOLO ++# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) ++# include /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ ++# ifdef VMS ++# include /* for off_t */ ++# endif ++# ifndef z_off_t ++# define z_off_t off_t ++# endif ++# endif ++#endif ++ ++#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0 ++# define Z_LFS64 ++#endif ++ ++#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64) ++# define Z_LARGE64 ++#endif ++ ++#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64) ++# define Z_WANT64 ++#endif ++ ++#if !defined(SEEK_SET) && !defined(Z_SOLO) ++# define SEEK_SET 0 /* Seek from beginning of file. */ ++# define SEEK_CUR 1 /* Seek from current position. */ ++# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ ++#endif ++ ++#ifndef z_off_t ++# define z_off_t long ++#endif ++ ++#if !defined(_WIN32) && defined(Z_LARGE64) ++# define z_off64_t off64_t ++#else ++# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) ++# define z_off64_t __int64 ++# else ++# define z_off64_t z_off_t ++# endif ++#endif ++ ++/* MVS linker does not support external names larger than 8 bytes */ ++#if defined(__MVS__) ++ #pragma map(deflateInit_,"DEIN") ++ #pragma map(deflateInit2_,"DEIN2") ++ #pragma map(deflateEnd,"DEEND") ++ #pragma map(deflateBound,"DEBND") ++ #pragma map(inflateInit_,"ININ") ++ #pragma map(inflateInit2_,"ININ2") ++ #pragma map(inflateEnd,"INEND") ++ #pragma map(inflateSync,"INSY") ++ #pragma map(inflateSetDictionary,"INSEDI") ++ #pragma map(compressBound,"CMBND") ++ #pragma map(inflate_table,"INTABL") ++ #pragma map(inflate_fast,"INFA") ++ #pragma map(inflate_copyright,"INCOPY") ++#endif ++ ++#endif /* ZCONF_H */ +diff -r ee879c0ffa11 Modules/zlib/zconf.h.in +--- /dev/null ++++ b/Modules/zlib/zconf.h.in +@@ -0,0 +1,511 @@ ++/* zconf.h -- configuration of the zlib compression library ++ * Copyright (C) 1995-2013 Jean-loup Gailly. ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++/* @(#) $Id$ */ ++ ++#ifndef ZCONF_H ++#define ZCONF_H ++ ++/* ++ * If you *really* need a unique prefix for all types and library functions, ++ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. ++ * Even better than compiling with -DZ_PREFIX would be to use configure to set ++ * this permanently in zconf.h using "./configure --zprefix". ++ */ ++#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ ++# define Z_PREFIX_SET ++ ++/* all linked symbols */ ++# define _dist_code z__dist_code ++# define _length_code z__length_code ++# define _tr_align z__tr_align ++# define _tr_flush_bits z__tr_flush_bits ++# define _tr_flush_block z__tr_flush_block ++# define _tr_init z__tr_init ++# define _tr_stored_block z__tr_stored_block ++# define _tr_tally z__tr_tally ++# define adler32 z_adler32 ++# define adler32_combine z_adler32_combine ++# define adler32_combine64 z_adler32_combine64 ++# ifndef Z_SOLO ++# define compress z_compress ++# define compress2 z_compress2 ++# define compressBound z_compressBound ++# endif ++# define crc32 z_crc32 ++# define crc32_combine z_crc32_combine ++# define crc32_combine64 z_crc32_combine64 ++# define deflate z_deflate ++# define deflateBound z_deflateBound ++# define deflateCopy z_deflateCopy ++# define deflateEnd z_deflateEnd ++# define deflateInit2_ z_deflateInit2_ ++# define deflateInit_ z_deflateInit_ ++# define deflateParams z_deflateParams ++# define deflatePending z_deflatePending ++# define deflatePrime z_deflatePrime ++# define deflateReset z_deflateReset ++# define deflateResetKeep z_deflateResetKeep ++# define deflateSetDictionary z_deflateSetDictionary ++# define deflateSetHeader z_deflateSetHeader ++# define deflateTune z_deflateTune ++# define deflate_copyright z_deflate_copyright ++# define get_crc_table z_get_crc_table ++# ifndef Z_SOLO ++# define gz_error z_gz_error ++# define gz_intmax z_gz_intmax ++# define gz_strwinerror z_gz_strwinerror ++# define gzbuffer z_gzbuffer ++# define gzclearerr z_gzclearerr ++# define gzclose z_gzclose ++# define gzclose_r z_gzclose_r ++# define gzclose_w z_gzclose_w ++# define gzdirect z_gzdirect ++# define gzdopen z_gzdopen ++# define gzeof z_gzeof ++# define gzerror z_gzerror ++# define gzflush z_gzflush ++# define gzgetc z_gzgetc ++# define gzgetc_ z_gzgetc_ ++# define gzgets z_gzgets ++# define gzoffset z_gzoffset ++# define gzoffset64 z_gzoffset64 ++# define gzopen z_gzopen ++# define gzopen64 z_gzopen64 ++# ifdef _WIN32 ++# define gzopen_w z_gzopen_w ++# endif ++# define gzprintf z_gzprintf ++# define gzvprintf z_gzvprintf ++# define gzputc z_gzputc ++# define gzputs z_gzputs ++# define gzread z_gzread ++# define gzrewind z_gzrewind ++# define gzseek z_gzseek ++# define gzseek64 z_gzseek64 ++# define gzsetparams z_gzsetparams ++# define gztell z_gztell ++# define gztell64 z_gztell64 ++# define gzungetc z_gzungetc ++# define gzwrite z_gzwrite ++# endif ++# define inflate z_inflate ++# define inflateBack z_inflateBack ++# define inflateBackEnd z_inflateBackEnd ++# define inflateBackInit_ z_inflateBackInit_ ++# define inflateCopy z_inflateCopy ++# define inflateEnd z_inflateEnd ++# define inflateGetHeader z_inflateGetHeader ++# define inflateInit2_ z_inflateInit2_ ++# define inflateInit_ z_inflateInit_ ++# define inflateMark z_inflateMark ++# define inflatePrime z_inflatePrime ++# define inflateReset z_inflateReset ++# define inflateReset2 z_inflateReset2 ++# define inflateSetDictionary z_inflateSetDictionary ++# define inflateGetDictionary z_inflateGetDictionary ++# define inflateSync z_inflateSync ++# define inflateSyncPoint z_inflateSyncPoint ++# define inflateUndermine z_inflateUndermine ++# define inflateResetKeep z_inflateResetKeep ++# define inflate_copyright z_inflate_copyright ++# define inflate_fast z_inflate_fast ++# define inflate_table z_inflate_table ++# ifndef Z_SOLO ++# define uncompress z_uncompress ++# endif ++# define zError z_zError ++# ifndef Z_SOLO ++# define zcalloc z_zcalloc ++# define zcfree z_zcfree ++# endif ++# define zlibCompileFlags z_zlibCompileFlags ++# define zlibVersion z_zlibVersion ++ ++/* all zlib typedefs in zlib.h and zconf.h */ ++# define Byte z_Byte ++# define Bytef z_Bytef ++# define alloc_func z_alloc_func ++# define charf z_charf ++# define free_func z_free_func ++# ifndef Z_SOLO ++# define gzFile z_gzFile ++# endif ++# define gz_header z_gz_header ++# define gz_headerp z_gz_headerp ++# define in_func z_in_func ++# define intf z_intf ++# define out_func z_out_func ++# define uInt z_uInt ++# define uIntf z_uIntf ++# define uLong z_uLong ++# define uLongf z_uLongf ++# define voidp z_voidp ++# define voidpc z_voidpc ++# define voidpf z_voidpf ++ ++/* all zlib structs in zlib.h and zconf.h */ ++# define gz_header_s z_gz_header_s ++# define internal_state z_internal_state ++ ++#endif ++ ++#if defined(__MSDOS__) && !defined(MSDOS) ++# define MSDOS ++#endif ++#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) ++# define OS2 ++#endif ++#if defined(_WINDOWS) && !defined(WINDOWS) ++# define WINDOWS ++#endif ++#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) ++# ifndef WIN32 ++# define WIN32 ++# endif ++#endif ++#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) ++# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) ++# ifndef SYS16BIT ++# define SYS16BIT ++# endif ++# endif ++#endif ++ ++/* ++ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more ++ * than 64k bytes at a time (needed on systems with 16-bit int). ++ */ ++#ifdef SYS16BIT ++# define MAXSEG_64K ++#endif ++#ifdef MSDOS ++# define UNALIGNED_OK ++#endif ++ ++#ifdef __STDC_VERSION__ ++# ifndef STDC ++# define STDC ++# endif ++# if __STDC_VERSION__ >= 199901L ++# ifndef STDC99 ++# define STDC99 ++# endif ++# endif ++#endif ++#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) ++# define STDC ++#endif ++#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) ++# define STDC ++#endif ++#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) ++# define STDC ++#endif ++#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) ++# define STDC ++#endif ++ ++#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ ++# define STDC ++#endif ++ ++#ifndef STDC ++# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ ++# define const /* note: need a more gentle solution here */ ++# endif ++#endif ++ ++#if defined(ZLIB_CONST) && !defined(z_const) ++# define z_const const ++#else ++# define z_const ++#endif ++ ++/* Some Mac compilers merge all .h files incorrectly: */ ++#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) ++# define NO_DUMMY_DECL ++#endif ++ ++/* Maximum value for memLevel in deflateInit2 */ ++#ifndef MAX_MEM_LEVEL ++# ifdef MAXSEG_64K ++# define MAX_MEM_LEVEL 8 ++# else ++# define MAX_MEM_LEVEL 9 ++# endif ++#endif ++ ++/* Maximum value for windowBits in deflateInit2 and inflateInit2. ++ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files ++ * created by gzip. (Files created by minigzip can still be extracted by ++ * gzip.) ++ */ ++#ifndef MAX_WBITS ++# define MAX_WBITS 15 /* 32K LZ77 window */ ++#endif ++ ++/* The memory requirements for deflate are (in bytes): ++ (1 << (windowBits+2)) + (1 << (memLevel+9)) ++ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) ++ plus a few kilobytes for small objects. For example, if you want to reduce ++ the default memory requirements from 256K to 128K, compile with ++ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" ++ Of course this will generally degrade compression (there's no free lunch). ++ ++ The memory requirements for inflate are (in bytes) 1 << windowBits ++ that is, 32K for windowBits=15 (default value) plus a few kilobytes ++ for small objects. ++*/ ++ ++ /* Type declarations */ ++ ++#ifndef OF /* function prototypes */ ++# ifdef STDC ++# define OF(args) args ++# else ++# define OF(args) () ++# endif ++#endif ++ ++#ifndef Z_ARG /* function prototypes for stdarg */ ++# if defined(STDC) || defined(Z_HAVE_STDARG_H) ++# define Z_ARG(args) args ++# else ++# define Z_ARG(args) () ++# endif ++#endif ++ ++/* The following definitions for FAR are needed only for MSDOS mixed ++ * model programming (small or medium model with some far allocations). ++ * This was tested only with MSC; for other MSDOS compilers you may have ++ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, ++ * just define FAR to be empty. ++ */ ++#ifdef SYS16BIT ++# if defined(M_I86SM) || defined(M_I86MM) ++ /* MSC small or medium model */ ++# define SMALL_MEDIUM ++# ifdef _MSC_VER ++# define FAR _far ++# else ++# define FAR far ++# endif ++# endif ++# if (defined(__SMALL__) || defined(__MEDIUM__)) ++ /* Turbo C small or medium model */ ++# define SMALL_MEDIUM ++# ifdef __BORLANDC__ ++# define FAR _far ++# else ++# define FAR far ++# endif ++# endif ++#endif ++ ++#if defined(WINDOWS) || defined(WIN32) ++ /* If building or using zlib as a DLL, define ZLIB_DLL. ++ * This is not mandatory, but it offers a little performance increase. ++ */ ++# ifdef ZLIB_DLL ++# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) ++# ifdef ZLIB_INTERNAL ++# define ZEXTERN extern __declspec(dllexport) ++# else ++# define ZEXTERN extern __declspec(dllimport) ++# endif ++# endif ++# endif /* ZLIB_DLL */ ++ /* If building or using zlib with the WINAPI/WINAPIV calling convention, ++ * define ZLIB_WINAPI. ++ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. ++ */ ++# ifdef ZLIB_WINAPI ++# ifdef FAR ++# undef FAR ++# endif ++# include ++ /* No need for _export, use ZLIB.DEF instead. */ ++ /* For complete Windows compatibility, use WINAPI, not __stdcall. */ ++# define ZEXPORT WINAPI ++# ifdef WIN32 ++# define ZEXPORTVA WINAPIV ++# else ++# define ZEXPORTVA FAR CDECL ++# endif ++# endif ++#endif ++ ++#if defined (__BEOS__) ++# ifdef ZLIB_DLL ++# ifdef ZLIB_INTERNAL ++# define ZEXPORT __declspec(dllexport) ++# define ZEXPORTVA __declspec(dllexport) ++# else ++# define ZEXPORT __declspec(dllimport) ++# define ZEXPORTVA __declspec(dllimport) ++# endif ++# endif ++#endif ++ ++#ifndef ZEXTERN ++# define ZEXTERN extern ++#endif ++#ifndef ZEXPORT ++# define ZEXPORT ++#endif ++#ifndef ZEXPORTVA ++# define ZEXPORTVA ++#endif ++ ++#ifndef FAR ++# define FAR ++#endif ++ ++#if !defined(__MACTYPES__) ++typedef unsigned char Byte; /* 8 bits */ ++#endif ++typedef unsigned int uInt; /* 16 bits or more */ ++typedef unsigned long uLong; /* 32 bits or more */ ++ ++#ifdef SMALL_MEDIUM ++ /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ ++# define Bytef Byte FAR ++#else ++ typedef Byte FAR Bytef; ++#endif ++typedef char FAR charf; ++typedef int FAR intf; ++typedef uInt FAR uIntf; ++typedef uLong FAR uLongf; ++ ++#ifdef STDC ++ typedef void const *voidpc; ++ typedef void FAR *voidpf; ++ typedef void *voidp; ++#else ++ typedef Byte const *voidpc; ++ typedef Byte FAR *voidpf; ++ typedef Byte *voidp; ++#endif ++ ++#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) ++# include ++# if (UINT_MAX == 0xffffffffUL) ++# define Z_U4 unsigned ++# elif (ULONG_MAX == 0xffffffffUL) ++# define Z_U4 unsigned long ++# elif (USHRT_MAX == 0xffffffffUL) ++# define Z_U4 unsigned short ++# endif ++#endif ++ ++#ifdef Z_U4 ++ typedef Z_U4 z_crc_t; ++#else ++ typedef unsigned long z_crc_t; ++#endif ++ ++#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ ++# define Z_HAVE_UNISTD_H ++#endif ++ ++#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ ++# define Z_HAVE_STDARG_H ++#endif ++ ++#ifdef STDC ++# ifndef Z_SOLO ++# include /* for off_t */ ++# endif ++#endif ++ ++#if defined(STDC) || defined(Z_HAVE_STDARG_H) ++# ifndef Z_SOLO ++# include /* for va_list */ ++# endif ++#endif ++ ++#ifdef _WIN32 ++# ifndef Z_SOLO ++# include /* for wchar_t */ ++# endif ++#endif ++ ++/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and ++ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even ++ * though the former does not conform to the LFS document), but considering ++ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as ++ * equivalently requesting no 64-bit operations ++ */ ++#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 ++# undef _LARGEFILE64_SOURCE ++#endif ++ ++#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) ++# define Z_HAVE_UNISTD_H ++#endif ++#ifndef Z_SOLO ++# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) ++# include /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ ++# ifdef VMS ++# include /* for off_t */ ++# endif ++# ifndef z_off_t ++# define z_off_t off_t ++# endif ++# endif ++#endif ++ ++#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0 ++# define Z_LFS64 ++#endif ++ ++#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64) ++# define Z_LARGE64 ++#endif ++ ++#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64) ++# define Z_WANT64 ++#endif ++ ++#if !defined(SEEK_SET) && !defined(Z_SOLO) ++# define SEEK_SET 0 /* Seek from beginning of file. */ ++# define SEEK_CUR 1 /* Seek from current position. */ ++# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ ++#endif ++ ++#ifndef z_off_t ++# define z_off_t long ++#endif ++ ++#if !defined(_WIN32) && defined(Z_LARGE64) ++# define z_off64_t off64_t ++#else ++# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) ++# define z_off64_t __int64 ++# else ++# define z_off64_t z_off_t ++# endif ++#endif ++ ++/* MVS linker does not support external names larger than 8 bytes */ ++#if defined(__MVS__) ++ #pragma map(deflateInit_,"DEIN") ++ #pragma map(deflateInit2_,"DEIN2") ++ #pragma map(deflateEnd,"DEEND") ++ #pragma map(deflateBound,"DEBND") ++ #pragma map(inflateInit_,"ININ") ++ #pragma map(inflateInit2_,"ININ2") ++ #pragma map(inflateEnd,"INEND") ++ #pragma map(inflateSync,"INSY") ++ #pragma map(inflateSetDictionary,"INSEDI") ++ #pragma map(compressBound,"CMBND") ++ #pragma map(inflate_table,"INTABL") ++ #pragma map(inflate_fast,"INFA") ++ #pragma map(inflate_copyright,"INCOPY") ++#endif ++ ++#endif /* ZCONF_H */ +diff -r ee879c0ffa11 Modules/zlib/zconf.in.h +--- a/Modules/zlib/zconf.in.h ++++ /dev/null +@@ -1,332 +0,0 @@ +-/* zconf.h -- configuration of the zlib compression library +- * Copyright (C) 1995-2005 Jean-loup Gailly. +- * For conditions of distribution and use, see copyright notice in zlib.h +- */ +- +-/* @(#) $Id$ */ +- +-#ifndef ZCONF_H +-#define ZCONF_H +- +-/* +- * If you *really* need a unique prefix for all types and library functions, +- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. +- */ +-#ifdef Z_PREFIX +-# define deflateInit_ z_deflateInit_ +-# define deflate z_deflate +-# define deflateEnd z_deflateEnd +-# define inflateInit_ z_inflateInit_ +-# define inflate z_inflate +-# define inflateEnd z_inflateEnd +-# define deflateInit2_ z_deflateInit2_ +-# define deflateSetDictionary z_deflateSetDictionary +-# define deflateCopy z_deflateCopy +-# define deflateReset z_deflateReset +-# define deflateParams z_deflateParams +-# define deflateBound z_deflateBound +-# define deflatePrime z_deflatePrime +-# define inflateInit2_ z_inflateInit2_ +-# define inflateSetDictionary z_inflateSetDictionary +-# define inflateSync z_inflateSync +-# define inflateSyncPoint z_inflateSyncPoint +-# define inflateCopy z_inflateCopy +-# define inflateReset z_inflateReset +-# define inflateBack z_inflateBack +-# define inflateBackEnd z_inflateBackEnd +-# define compress z_compress +-# define compress2 z_compress2 +-# define compressBound z_compressBound +-# define uncompress z_uncompress +-# define adler32 z_adler32 +-# define crc32 z_crc32 +-# define get_crc_table z_get_crc_table +-# define zError z_zError +- +-# define alloc_func z_alloc_func +-# define free_func z_free_func +-# define in_func z_in_func +-# define out_func z_out_func +-# define Byte z_Byte +-# define uInt z_uInt +-# define uLong z_uLong +-# define Bytef z_Bytef +-# define charf z_charf +-# define intf z_intf +-# define uIntf z_uIntf +-# define uLongf z_uLongf +-# define voidpf z_voidpf +-# define voidp z_voidp +-#endif +- +-#if defined(__MSDOS__) && !defined(MSDOS) +-# define MSDOS +-#endif +-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) +-# define OS2 +-#endif +-#if defined(_WINDOWS) && !defined(WINDOWS) +-# define WINDOWS +-#endif +-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +-# ifndef WIN32 +-# define WIN32 +-# endif +-#endif +-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) +-# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) +-# ifndef SYS16BIT +-# define SYS16BIT +-# endif +-# endif +-#endif +- +-/* +- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more +- * than 64k bytes at a time (needed on systems with 16-bit int). +- */ +-#ifdef SYS16BIT +-# define MAXSEG_64K +-#endif +-#ifdef MSDOS +-# define UNALIGNED_OK +-#endif +- +-#ifdef __STDC_VERSION__ +-# ifndef STDC +-# define STDC +-# endif +-# if __STDC_VERSION__ >= 199901L +-# ifndef STDC99 +-# define STDC99 +-# endif +-# endif +-#endif +-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) +-# define STDC +-#endif +-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) +-# define STDC +-#endif +-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) +-# define STDC +-#endif +-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) +-# define STDC +-#endif +- +-#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ +-# define STDC +-#endif +- +-#ifndef STDC +-# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ +-# define const /* note: need a more gentle solution here */ +-# endif +-#endif +- +-/* Some Mac compilers merge all .h files incorrectly: */ +-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +-# define NO_DUMMY_DECL +-#endif +- +-/* Maximum value for memLevel in deflateInit2 */ +-#ifndef MAX_MEM_LEVEL +-# ifdef MAXSEG_64K +-# define MAX_MEM_LEVEL 8 +-# else +-# define MAX_MEM_LEVEL 9 +-# endif +-#endif +- +-/* Maximum value for windowBits in deflateInit2 and inflateInit2. +- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files +- * created by gzip. (Files created by minigzip can still be extracted by +- * gzip.) +- */ +-#ifndef MAX_WBITS +-# define MAX_WBITS 15 /* 32K LZ77 window */ +-#endif +- +-/* The memory requirements for deflate are (in bytes): +- (1 << (windowBits+2)) + (1 << (memLevel+9)) +- that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) +- plus a few kilobytes for small objects. For example, if you want to reduce +- the default memory requirements from 256K to 128K, compile with +- make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" +- Of course this will generally degrade compression (there's no free lunch). +- +- The memory requirements for inflate are (in bytes) 1 << windowBits +- that is, 32K for windowBits=15 (default value) plus a few kilobytes +- for small objects. +-*/ +- +- /* Type declarations */ +- +-#ifndef OF /* function prototypes */ +-# ifdef STDC +-# define OF(args) args +-# else +-# define OF(args) () +-# endif +-#endif +- +-/* The following definitions for FAR are needed only for MSDOS mixed +- * model programming (small or medium model with some far allocations). +- * This was tested only with MSC; for other MSDOS compilers you may have +- * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, +- * just define FAR to be empty. +- */ +-#ifdef SYS16BIT +-# if defined(M_I86SM) || defined(M_I86MM) +- /* MSC small or medium model */ +-# define SMALL_MEDIUM +-# ifdef _MSC_VER +-# define FAR _far +-# else +-# define FAR far +-# endif +-# endif +-# if (defined(__SMALL__) || defined(__MEDIUM__)) +- /* Turbo C small or medium model */ +-# define SMALL_MEDIUM +-# ifdef __BORLANDC__ +-# define FAR _far +-# else +-# define FAR far +-# endif +-# endif +-#endif +- +-#if defined(WINDOWS) || defined(WIN32) +- /* If building or using zlib as a DLL, define ZLIB_DLL. +- * This is not mandatory, but it offers a little performance increase. +- */ +-# ifdef ZLIB_DLL +-# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) +-# ifdef ZLIB_INTERNAL +-# define ZEXTERN extern __declspec(dllexport) +-# else +-# define ZEXTERN extern __declspec(dllimport) +-# endif +-# endif +-# endif /* ZLIB_DLL */ +- /* If building or using zlib with the WINAPI/WINAPIV calling convention, +- * define ZLIB_WINAPI. +- * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. +- */ +-# ifdef ZLIB_WINAPI +-# ifdef FAR +-# undef FAR +-# endif +-# include +- /* No need for _export, use ZLIB.DEF instead. */ +- /* For complete Windows compatibility, use WINAPI, not __stdcall. */ +-# define ZEXPORT WINAPI +-# ifdef WIN32 +-# define ZEXPORTVA WINAPIV +-# else +-# define ZEXPORTVA FAR CDECL +-# endif +-# endif +-#endif +- +-#if defined (__BEOS__) +-# ifdef ZLIB_DLL +-# ifdef ZLIB_INTERNAL +-# define ZEXPORT __declspec(dllexport) +-# define ZEXPORTVA __declspec(dllexport) +-# else +-# define ZEXPORT __declspec(dllimport) +-# define ZEXPORTVA __declspec(dllimport) +-# endif +-# endif +-#endif +- +-#ifndef ZEXTERN +-# define ZEXTERN extern +-#endif +-#ifndef ZEXPORT +-# define ZEXPORT +-#endif +-#ifndef ZEXPORTVA +-# define ZEXPORTVA +-#endif +- +-#ifndef FAR +-# define FAR +-#endif +- +-#if !defined(__MACTYPES__) +-typedef unsigned char Byte; /* 8 bits */ +-#endif +-typedef unsigned int uInt; /* 16 bits or more */ +-typedef unsigned long uLong; /* 32 bits or more */ +- +-#ifdef SMALL_MEDIUM +- /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ +-# define Bytef Byte FAR +-#else +- typedef Byte FAR Bytef; +-#endif +-typedef char FAR charf; +-typedef int FAR intf; +-typedef uInt FAR uIntf; +-typedef uLong FAR uLongf; +- +-#ifdef STDC +- typedef void const *voidpc; +- typedef void FAR *voidpf; +- typedef void *voidp; +-#else +- typedef Byte const *voidpc; +- typedef Byte FAR *voidpf; +- typedef Byte *voidp; +-#endif +- +-#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ +-# include /* for off_t */ +-# include /* for SEEK_* and off_t */ +-# ifdef VMS +-# include /* for off_t */ +-# endif +-# define z_off_t off_t +-#endif +-#ifndef SEEK_SET +-# define SEEK_SET 0 /* Seek from beginning of file. */ +-# define SEEK_CUR 1 /* Seek from current position. */ +-# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ +-#endif +-#ifndef z_off_t +-# define z_off_t long +-#endif +- +-#if defined(__OS400__) +-# define NO_vsnprintf +-#endif +- +-#if defined(__MVS__) +-# define NO_vsnprintf +-# ifdef FAR +-# undef FAR +-# endif +-#endif +- +-/* MVS linker does not support external names larger than 8 bytes */ +-#if defined(__MVS__) +-# pragma map(deflateInit_,"DEIN") +-# pragma map(deflateInit2_,"DEIN2") +-# pragma map(deflateEnd,"DEEND") +-# pragma map(deflateBound,"DEBND") +-# pragma map(inflateInit_,"ININ") +-# pragma map(inflateInit2_,"ININ2") +-# pragma map(inflateEnd,"INEND") +-# pragma map(inflateSync,"INSY") +-# pragma map(inflateSetDictionary,"INSEDI") +-# pragma map(compressBound,"CMBND") +-# pragma map(inflate_table,"INTABL") +-# pragma map(inflate_fast,"INFA") +-# pragma map(inflate_copyright,"INCOPY") +-#endif +- +-#endif /* ZCONF_H */ +diff -r ee879c0ffa11 Modules/zlib/zlib.3 +--- a/Modules/zlib/zlib.3 ++++ b/Modules/zlib/zlib.3 +@@ -1,4 +1,4 @@ +-.TH ZLIB 3 "18 July 2005" ++.TH ZLIB 3 "28 Apr 2013" + .SH NAME + zlib \- compression/decompression library + .SH SYNOPSIS +@@ -9,15 +9,15 @@ + The + .I zlib + library is a general purpose data compression library. +-The code is thread safe. ++The code is thread safe, assuming that the standard library functions ++used are thread safe, such as memory allocation routines. + It provides in-memory compression and decompression functions, + including integrity checks of the uncompressed data. + This version of the library supports only one compression method (deflation) +-but other algorithms will be added later +-and will have the same stream interface. ++but other algorithms may be added later ++with the same stream interface. + .LP + Compression can be done in a single step if the buffers are large enough +-(for example if an input file is mmap'ed), + or can be done by repeated calls of the compression function. + In the latter case, + the application must provide more input and/or consume the output +@@ -30,26 +30,27 @@ + .LP + The library does not install any signal handler. + The decoder checks the consistency of the compressed data, +-so the library should never crash even in case of corrupted input. ++so the library should never crash even in the case of corrupted input. + .LP + All functions of the compression library are documented in the file + .IR zlib.h . + The distribution source includes examples of use of the library + in the files +-.I example.c ++.I test/example.c + and +-.IR minigzip.c . ++.IR test/minigzip.c, ++as well as other examples in the ++.IR examples/ ++directory. + .LP + Changes to this version are documented in the file + .I ChangeLog +-that accompanies the source, +-and are concerned primarily with bug fixes and portability enhancements. ++that accompanies the source. + .LP +-A Java implementation of + .I zlib +-is available in the Java Development Kit 1.1: ++is available in Java using the java.util.zip package: + .IP +-http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html ++http://java.sun.com/developer/technicalArticles/Programming/compression/ + .LP + A Perl interface to + .IR zlib , +@@ -57,23 +58,20 @@ + is available at CPAN (Comprehensive Perl Archive Network) sites, + including: + .IP +-http://www.cpan.org/modules/by-module/Compress/ ++http://search.cpan.org/~pmqs/IO-Compress-Zlib/ + .LP + A Python interface to + .IR zlib , + written by A.M. Kuchling (amk@magnet.com), + is available in Python 1.5 and later versions: + .IP +-http://www.python.org/doc/lib/module-zlib.html ++http://docs.python.org/library/zlib.html + .LP +-A + .I zlib +-binding for +-.IR tcl (1), +-written by Andreas Kupries (a.kupries@westend.com), +-is availlable at: ++is built into ++.IR tcl: + .IP +-http://www.westend.com/~kupries/doc/trf/man/man.html ++http://wiki.tcl.tk/4610 + .LP + An experimental package to read and write files in .zip format, + written on top of +@@ -81,40 +79,34 @@ + by Gilles Vollant (info@winimage.com), + is available at: + .IP +-http://www.winimage.com/zLibDll/unzip.html ++http://www.winimage.com/zLibDll/minizip.html + and also in the + .I contrib/minizip + directory of the main + .I zlib +-web site. ++source distribution. + .SH "SEE ALSO" + The + .I zlib +-web site can be found at either of these locations: ++web site can be found at: + .IP +-http://www.zlib.org +-.br +-http://www.gzip.org/zlib/ ++http://zlib.net/ + .LP + The data format used by the zlib library is described by RFC + (Request for Comments) 1950 to 1952 in the files: + .IP +-http://www.ietf.org/rfc/rfc1950.txt (concerning zlib format) ++http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format) + .br +-http://www.ietf.org/rfc/rfc1951.txt (concerning deflate format) ++http://tools.ietf.org/html/rfc1951 (for the deflate compressed data format) + .br +-http://www.ietf.org/rfc/rfc1952.txt (concerning gzip format) ++http://tools.ietf.org/html/rfc1952 (for the gzip header and trailer format) + .LP +-These documents are also available in other formats from: +-.IP +-ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html +-.LP +-Mark Nelson (markn@ieee.org) wrote an article about ++Mark Nelson wrote an article about + .I zlib + for the Jan. 1997 issue of Dr. Dobb's Journal; + a copy of the article is available at: + .IP +-http://dogma.net/markn/articles/zlibtool/zlibtool.htm ++http://marknelson.us/1997/01/01/zlib-engine/ + .SH "REPORTING PROBLEMS" + Before reporting a problem, + please check the +@@ -127,14 +119,14 @@ + .I zlib + FAQ at: + .IP +-http://www.gzip.org/zlib/zlib_faq.html ++http://zlib.net/zlib_faq.html + .LP + before asking for help. + Send questions and/or comments to zlib@gzip.org, + or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). + .SH AUTHORS +-Version 1.2.3 +-Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org) ++Version 1.2.8 ++Copyright (C) 1995-2013 Jean-loup Gailly (jloup@gzip.org) + and Mark Adler (madler@alumni.caltech.edu). + .LP + This software is provided "as-is," +diff -r ee879c0ffa11 Modules/zlib/zlib.h +--- a/Modules/zlib/zlib.h ++++ b/Modules/zlib/zlib.h +@@ -1,7 +1,7 @@ + /* zlib.h -- interface of the 'zlib' general purpose compression library +- version 1.2.3, July 18th, 2005 ++ version 1.2.8, April 28th, 2013 + +- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler ++ Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages +@@ -24,8 +24,8 @@ + + + The data format used by the zlib library is described by RFCs (Request for +- Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt +- (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). ++ Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 ++ (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format). + */ + + #ifndef ZLIB_H +@@ -37,41 +37,44 @@ + extern "C" { + #endif + +-#define ZLIB_VERSION "1.2.3" +-#define ZLIB_VERNUM 0x1230 ++#define ZLIB_VERSION "1.2.8" ++#define ZLIB_VERNUM 0x1280 ++#define ZLIB_VER_MAJOR 1 ++#define ZLIB_VER_MINOR 2 ++#define ZLIB_VER_REVISION 8 ++#define ZLIB_VER_SUBREVISION 0 + + /* +- The 'zlib' compression library provides in-memory compression and +- decompression functions, including integrity checks of the uncompressed +- data. This version of the library supports only one compression method +- (deflation) but other algorithms will be added later and will have the same +- stream interface. ++ The 'zlib' compression library provides in-memory compression and ++ decompression functions, including integrity checks of the uncompressed data. ++ This version of the library supports only one compression method (deflation) ++ but other algorithms will be added later and will have the same stream ++ interface. + +- Compression can be done in a single step if the buffers are large +- enough (for example if an input file is mmap'ed), or can be done by +- repeated calls of the compression function. In the latter case, the +- application must provide more input and/or consume the output ++ Compression can be done in a single step if the buffers are large enough, ++ or can be done by repeated calls of the compression function. In the latter ++ case, the application must provide more input and/or consume the output + (providing more output space) before each call. + +- The compressed data format used by default by the in-memory functions is ++ The compressed data format used by default by the in-memory functions is + the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped + around a deflate stream, which is itself documented in RFC 1951. + +- The library also supports reading and writing files in gzip (.gz) format ++ The library also supports reading and writing files in gzip (.gz) format + with an interface similar to that of stdio using the functions that start + with "gz". The gzip format is different from the zlib format. gzip is a + gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. + +- This library can optionally read and write gzip streams in memory as well. ++ This library can optionally read and write gzip streams in memory as well. + +- The zlib format was designed to be compact and fast for use in memory ++ The zlib format was designed to be compact and fast for use in memory + and on communications channels. The gzip format was designed for single- + file compression on file systems, has a larger header than zlib to maintain + directory information, and uses a different, slower check method than zlib. + +- The library does not install any signal handler. The decoder checks +- the consistency of the compressed data, so the library should never +- crash even in case of corrupted input. ++ The library does not install any signal handler. The decoder checks ++ the consistency of the compressed data, so the library should never crash ++ even in case of corrupted input. + */ + + typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); +@@ -80,15 +83,15 @@ + struct internal_state; + + typedef struct z_stream_s { +- Bytef *next_in; /* next input byte */ ++ z_const Bytef *next_in; /* next input byte */ + uInt avail_in; /* number of bytes available at next_in */ +- uLong total_in; /* total nb of input bytes read so far */ ++ uLong total_in; /* total number of input bytes read so far */ + + Bytef *next_out; /* next output byte should be put there */ + uInt avail_out; /* remaining free space at next_out */ +- uLong total_out; /* total nb of bytes output so far */ ++ uLong total_out; /* total number of bytes output so far */ + +- char *msg; /* last error message, NULL if no error */ ++ z_const char *msg; /* last error message, NULL if no error */ + struct internal_state FAR *state; /* not visible by applications */ + + alloc_func zalloc; /* used to allocate the internal state */ +@@ -126,45 +129,45 @@ + typedef gz_header FAR *gz_headerp; + + /* +- The application must update next_in and avail_in when avail_in has +- dropped to zero. It must update next_out and avail_out when avail_out +- has dropped to zero. The application must initialize zalloc, zfree and +- opaque before calling the init function. All other fields are set by the +- compression library and must not be updated by the application. ++ The application must update next_in and avail_in when avail_in has dropped ++ to zero. It must update next_out and avail_out when avail_out has dropped ++ to zero. The application must initialize zalloc, zfree and opaque before ++ calling the init function. All other fields are set by the compression ++ library and must not be updated by the application. + +- The opaque value provided by the application will be passed as the first +- parameter for calls of zalloc and zfree. This can be useful for custom +- memory management. The compression library attaches no meaning to the ++ The opaque value provided by the application will be passed as the first ++ parameter for calls of zalloc and zfree. This can be useful for custom ++ memory management. The compression library attaches no meaning to the + opaque value. + +- zalloc must return Z_NULL if there is not enough memory for the object. ++ zalloc must return Z_NULL if there is not enough memory for the object. + If zlib is used in a multi-threaded application, zalloc and zfree must be + thread safe. + +- On 16-bit systems, the functions zalloc and zfree must be able to allocate +- exactly 65536 bytes, but will not be required to allocate more than this +- if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, +- pointers returned by zalloc for objects of exactly 65536 bytes *must* +- have their offset normalized to zero. The default allocation function +- provided by this library ensures this (see zutil.c). To reduce memory +- requirements and avoid any allocation of 64K objects, at the expense of +- compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). ++ On 16-bit systems, the functions zalloc and zfree must be able to allocate ++ exactly 65536 bytes, but will not be required to allocate more than this if ++ the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers ++ returned by zalloc for objects of exactly 65536 bytes *must* have their ++ offset normalized to zero. The default allocation function provided by this ++ library ensures this (see zutil.c). To reduce memory requirements and avoid ++ any allocation of 64K objects, at the expense of compression ratio, compile ++ the library with -DMAX_WBITS=14 (see zconf.h). + +- The fields total_in and total_out can be used for statistics or +- progress reports. After compression, total_in holds the total size of +- the uncompressed data and may be saved for use in the decompressor +- (particularly if the decompressor wants to decompress everything in +- a single step). ++ The fields total_in and total_out can be used for statistics or progress ++ reports. After compression, total_in holds the total size of the ++ uncompressed data and may be saved for use in the decompressor (particularly ++ if the decompressor wants to decompress everything in a single step). + */ + + /* constants */ + + #define Z_NO_FLUSH 0 +-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */ ++#define Z_PARTIAL_FLUSH 1 + #define Z_SYNC_FLUSH 2 + #define Z_FULL_FLUSH 3 + #define Z_FINISH 4 + #define Z_BLOCK 5 ++#define Z_TREES 6 + /* Allowed flush values; see deflate() and inflate() below for details */ + + #define Z_OK 0 +@@ -176,8 +179,8 @@ + #define Z_MEM_ERROR (-4) + #define Z_BUF_ERROR (-5) + #define Z_VERSION_ERROR (-6) +-/* Return codes for the compression/decompression functions. Negative +- * values are errors, positive values are used for special but normal events. ++/* Return codes for the compression/decompression functions. Negative values ++ * are errors, positive values are used for special but normal events. + */ + + #define Z_NO_COMPRESSION 0 +@@ -207,119 +210,141 @@ + #define zlib_version zlibVersion() + /* for compatibility with versions < 1.0.2 */ + ++ + /* basic functions */ + + ZEXTERN const char * ZEXPORT zlibVersion OF((void)); + /* The application can compare zlibVersion and ZLIB_VERSION for consistency. +- If the first character differs, the library code actually used is +- not compatible with the zlib.h header file used by the application. +- This check is automatically made by deflateInit and inflateInit. ++ If the first character differs, the library code actually used is not ++ compatible with the zlib.h header file used by the application. This check ++ is automatically made by deflateInit and inflateInit. + */ + + /* + ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); + +- Initializes the internal stream state for compression. The fields +- zalloc, zfree and opaque must be initialized before by the caller. +- If zalloc and zfree are set to Z_NULL, deflateInit updates them to +- use default allocation functions. ++ Initializes the internal stream state for compression. The fields ++ zalloc, zfree and opaque must be initialized before by the caller. If ++ zalloc and zfree are set to Z_NULL, deflateInit updates them to use default ++ allocation functions. + + The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: +- 1 gives best speed, 9 gives best compression, 0 gives no compression at +- all (the input data is simply copied a block at a time). +- Z_DEFAULT_COMPRESSION requests a default compromise between speed and +- compression (currently equivalent to level 6). ++ 1 gives best speed, 9 gives best compression, 0 gives no compression at all ++ (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION ++ requests a default compromise between speed and compression (currently ++ equivalent to level 6). + +- deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not +- enough memory, Z_STREAM_ERROR if level is not a valid compression level, ++ deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough ++ memory, Z_STREAM_ERROR if level is not a valid compression level, or + Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible +- with the version assumed by the caller (ZLIB_VERSION). +- msg is set to null if there is no error message. deflateInit does not +- perform any compression: this will be done by deflate(). ++ with the version assumed by the caller (ZLIB_VERSION). msg is set to null ++ if there is no error message. deflateInit does not perform any compression: ++ this will be done by deflate(). + */ + + + ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); + /* + deflate compresses as much data as possible, and stops when the input +- buffer becomes empty or the output buffer becomes full. It may introduce some +- output latency (reading input without producing any output) except when ++ buffer becomes empty or the output buffer becomes full. It may introduce ++ some output latency (reading input without producing any output) except when + forced to flush. + +- The detailed semantics are as follows. deflate performs one or both of the ++ The detailed semantics are as follows. deflate performs one or both of the + following actions: + + - Compress more input starting at next_in and update next_in and avail_in +- accordingly. If not all input can be processed (because there is not ++ accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in and avail_in are updated and + processing will resume at this point for the next call of deflate(). + + - Provide more output starting at next_out and update next_out and avail_out +- accordingly. This action is forced if the parameter flush is non zero. ++ accordingly. This action is forced if the parameter flush is non zero. + Forcing flush frequently degrades the compression ratio, so this parameter +- should be set only when necessary (in interactive applications). +- Some output may be provided even if flush is not set. ++ should be set only when necessary (in interactive applications). Some ++ output may be provided even if flush is not set. + +- Before the call of deflate(), the application should ensure that at least +- one of the actions is possible, by providing more input and/or consuming +- more output, and updating avail_in or avail_out accordingly; avail_out +- should never be zero before the call. The application can consume the +- compressed output when it wants, for example when the output buffer is full +- (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK +- and with zero avail_out, it must be called again after making room in the +- output buffer because there might be more output pending. ++ Before the call of deflate(), the application should ensure that at least ++ one of the actions is possible, by providing more input and/or consuming more ++ output, and updating avail_in or avail_out accordingly; avail_out should ++ never be zero before the call. The application can consume the compressed ++ output when it wants, for example when the output buffer is full (avail_out ++ == 0), or after each call of deflate(). If deflate returns Z_OK and with ++ zero avail_out, it must be called again after making room in the output ++ buffer because there might be more output pending. + + Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to +- decide how much data to accumualte before producing output, in order to ++ decide how much data to accumulate before producing output, in order to + maximize compression. + + If the parameter flush is set to Z_SYNC_FLUSH, all pending output is + flushed to the output buffer and the output is aligned on a byte boundary, so +- that the decompressor can get all input data available so far. (In particular +- avail_in is zero after the call if enough output space has been provided +- before the call.) Flushing may degrade compression for some compression +- algorithms and so it should be used only when necessary. ++ that the decompressor can get all input data available so far. (In ++ particular avail_in is zero after the call if enough output space has been ++ provided before the call.) Flushing may degrade compression for some ++ compression algorithms and so it should be used only when necessary. This ++ completes the current deflate block and follows it with an empty stored block ++ that is three bits plus filler bits to the next byte, followed by four bytes ++ (00 00 ff ff). ++ ++ If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the ++ output buffer, but the output is not aligned to a byte boundary. All of the ++ input data so far will be available to the decompressor, as for Z_SYNC_FLUSH. ++ This completes the current deflate block and follows it with an empty fixed ++ codes block that is 10 bits long. This assures that enough bytes are output ++ in order for the decompressor to finish the block before the empty fixed code ++ block. ++ ++ If flush is set to Z_BLOCK, a deflate block is completed and emitted, as ++ for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to ++ seven bits of the current block are held to be written as the next byte after ++ the next deflate block is completed. In this case, the decompressor may not ++ be provided enough bits at this point in order to complete decompression of ++ the data provided so far to the compressor. It may need to wait for the next ++ block to be emitted. This is for advanced applications that need to control ++ the emission of deflate blocks. + + If flush is set to Z_FULL_FLUSH, all output is flushed as with + Z_SYNC_FLUSH, and the compression state is reset so that decompression can + restart from this point if previous compressed data has been damaged or if +- random access is desired. Using Z_FULL_FLUSH too often can seriously degrade ++ random access is desired. Using Z_FULL_FLUSH too often can seriously degrade + compression. + + If deflate returns with avail_out == 0, this function must be called again + with the same value of the flush parameter and more output space (updated + avail_out), until the flush is complete (deflate returns with non-zero +- avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that ++ avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that + avail_out is greater than six to avoid repeated flush markers due to + avail_out == 0 on return. + + If the parameter flush is set to Z_FINISH, pending input is processed, +- pending output is flushed and deflate returns with Z_STREAM_END if there +- was enough output space; if deflate returns with Z_OK, this function must be ++ pending output is flushed and deflate returns with Z_STREAM_END if there was ++ enough output space; if deflate returns with Z_OK, this function must be + called again with Z_FINISH and more output space (updated avail_out) but no +- more input data, until it returns with Z_STREAM_END or an error. After +- deflate has returned Z_STREAM_END, the only possible operations on the +- stream are deflateReset or deflateEnd. ++ more input data, until it returns with Z_STREAM_END or an error. After ++ deflate has returned Z_STREAM_END, the only possible operations on the stream ++ are deflateReset or deflateEnd. + + Z_FINISH can be used immediately after deflateInit if all the compression +- is to be done in a single step. In this case, avail_out must be at least +- the value returned by deflateBound (see below). If deflate does not return +- Z_STREAM_END, then it must be called again as described above. ++ is to be done in a single step. In this case, avail_out must be at least the ++ value returned by deflateBound (see below). Then deflate is guaranteed to ++ return Z_STREAM_END. If not enough output space is provided, deflate will ++ not return Z_STREAM_END, and it must be called again as described above. + + deflate() sets strm->adler to the adler32 checksum of all input read + so far (that is, total_in bytes). + + deflate() may update strm->data_type if it can make a good guess about +- the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered +- binary. This field is only for information purposes and does not affect +- the compression algorithm in any manner. ++ the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered ++ binary. This field is only for information purposes and does not affect the ++ compression algorithm in any manner. + + deflate() returns Z_OK if some progress has been made (more input + processed or more output produced), Z_STREAM_END if all input has been + consumed and all output has been produced (only when flush is set to + Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example +- if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible +- (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not ++ if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible ++ (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not + fatal, and deflate() can be called again with more input and more output + space to continue compressing. + */ +@@ -328,13 +353,13 @@ + ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); + /* + All dynamically allocated data structures for this stream are freed. +- This function discards any unprocessed input and does not flush any +- pending output. ++ This function discards any unprocessed input and does not flush any pending ++ output. + + deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the + stream state was inconsistent, Z_DATA_ERROR if the stream was freed +- prematurely (some input or output was discarded). In the error case, +- msg may be set but then points to a static string (which must not be ++ prematurely (some input or output was discarded). In the error case, msg ++ may be set but then points to a static string (which must not be + deallocated). + */ + +@@ -342,10 +367,10 @@ + /* + ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); + +- Initializes the internal stream state for decompression. The fields ++ Initializes the internal stream state for decompression. The fields + next_in, avail_in, zalloc, zfree and opaque must be initialized before by +- the caller. If next_in is not Z_NULL and avail_in is large enough (the exact +- value depends on the compression method), inflateInit determines the ++ the caller. If next_in is not Z_NULL and avail_in is large enough (the ++ exact value depends on the compression method), inflateInit determines the + compression method from the zlib header and allocates all data structures + accordingly; otherwise the allocation will be deferred to the first call of + inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to +@@ -353,95 +378,116 @@ + + inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the +- version assumed by the caller. msg is set to null if there is no error +- message. inflateInit does not perform any decompression apart from reading +- the zlib header if present: this will be done by inflate(). (So next_in and +- avail_in may be modified, but next_out and avail_out are unchanged.) ++ version assumed by the caller, or Z_STREAM_ERROR if the parameters are ++ invalid, such as a null pointer to the structure. msg is set to null if ++ there is no error message. inflateInit does not perform any decompression ++ apart from possibly reading the zlib header if present: actual decompression ++ will be done by inflate(). (So next_in and avail_in may be modified, but ++ next_out and avail_out are unused and unchanged.) The current implementation ++ of inflateInit() does not process any header information -- that is deferred ++ until inflate() is called. + */ + + + ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); + /* + inflate decompresses as much data as possible, and stops when the input +- buffer becomes empty or the output buffer becomes full. It may introduce ++ buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when + forced to flush. + +- The detailed semantics are as follows. inflate performs one or both of the ++ The detailed semantics are as follows. inflate performs one or both of the + following actions: + + - Decompress more input starting at next_in and update next_in and avail_in +- accordingly. If not all input can be processed (because there is not +- enough room in the output buffer), next_in is updated and processing +- will resume at this point for the next call of inflate(). ++ accordingly. If not all input can be processed (because there is not ++ enough room in the output buffer), next_in is updated and processing will ++ resume at this point for the next call of inflate(). + + - Provide more output starting at next_out and update next_out and avail_out +- accordingly. inflate() provides as much output as possible, until there +- is no more input data or no more space in the output buffer (see below +- about the flush parameter). ++ accordingly. inflate() provides as much output as possible, until there is ++ no more input data or no more space in the output buffer (see below about ++ the flush parameter). + +- Before the call of inflate(), the application should ensure that at least +- one of the actions is possible, by providing more input and/or consuming +- more output, and updating the next_* and avail_* values accordingly. +- The application can consume the uncompressed output when it wants, for +- example when the output buffer is full (avail_out == 0), or after each +- call of inflate(). If inflate returns Z_OK and with zero avail_out, it +- must be called again after making room in the output buffer because there +- might be more output pending. ++ Before the call of inflate(), the application should ensure that at least ++ one of the actions is possible, by providing more input and/or consuming more ++ output, and updating the next_* and avail_* values accordingly. The ++ application can consume the uncompressed output when it wants, for example ++ when the output buffer is full (avail_out == 0), or after each call of ++ inflate(). If inflate returns Z_OK and with zero avail_out, it must be ++ called again after making room in the output buffer because there might be ++ more output pending. + +- The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, +- Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much +- output as possible to the output buffer. Z_BLOCK requests that inflate() stop +- if and when it gets to the next deflate block boundary. When decoding the +- zlib or gzip format, this will cause inflate() to return immediately after +- the header and before the first block. When doing a raw inflate, inflate() +- will go ahead and process the first block, and will return when it gets to +- the end of that block, or when it runs out of data. ++ The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH, ++ Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much ++ output as possible to the output buffer. Z_BLOCK requests that inflate() ++ stop if and when it gets to the next deflate block boundary. When decoding ++ the zlib or gzip format, this will cause inflate() to return immediately ++ after the header and before the first block. When doing a raw inflate, ++ inflate() will go ahead and process the first block, and will return when it ++ gets to the end of that block, or when it runs out of data. + + The Z_BLOCK option assists in appending to or combining deflate streams. + Also to assist in this, on return inflate() will set strm->data_type to the +- number of unused bits in the last byte taken from strm->next_in, plus 64 +- if inflate() is currently decoding the last block in the deflate stream, +- plus 128 if inflate() returned immediately after decoding an end-of-block +- code or decoding the complete header up to just before the first byte of the +- deflate stream. The end-of-block will not be indicated until all of the +- uncompressed data from that block has been written to strm->next_out. The +- number of unused bits may in general be greater than seven, except when +- bit 7 of data_type is set, in which case the number of unused bits will be +- less than eight. ++ number of unused bits in the last byte taken from strm->next_in, plus 64 if ++ inflate() is currently decoding the last block in the deflate stream, plus ++ 128 if inflate() returned immediately after decoding an end-of-block code or ++ decoding the complete header up to just before the first byte of the deflate ++ stream. The end-of-block will not be indicated until all of the uncompressed ++ data from that block has been written to strm->next_out. The number of ++ unused bits may in general be greater than seven, except when bit 7 of ++ data_type is set, in which case the number of unused bits will be less than ++ eight. data_type is set as noted here every time inflate() returns for all ++ flush options, and so can be used to determine the amount of currently ++ consumed input in bits. ++ ++ The Z_TREES option behaves as Z_BLOCK does, but it also returns when the ++ end of each deflate block header is reached, before any actual data in that ++ block is decoded. This allows the caller to determine the length of the ++ deflate block header for later use in random access within a deflate block. ++ 256 is added to the value of strm->data_type when inflate() returns ++ immediately after reaching the end of the deflate block header. + + inflate() should normally be called until it returns Z_STREAM_END or an +- error. However if all decompression is to be performed in a single step +- (a single call of inflate), the parameter flush should be set to +- Z_FINISH. In this case all pending input is processed and all pending +- output is flushed; avail_out must be large enough to hold all the +- uncompressed data. (The size of the uncompressed data may have been saved +- by the compressor for this purpose.) The next operation on this stream must +- be inflateEnd to deallocate the decompression state. The use of Z_FINISH +- is never required, but can be used to inform inflate that a faster approach +- may be used for the single inflate() call. ++ error. However if all decompression is to be performed in a single step (a ++ single call of inflate), the parameter flush should be set to Z_FINISH. In ++ this case all pending input is processed and all pending output is flushed; ++ avail_out must be large enough to hold all of the uncompressed data for the ++ operation to complete. (The size of the uncompressed data may have been ++ saved by the compressor for this purpose.) The use of Z_FINISH is not ++ required to perform an inflation in one step. However it may be used to ++ inform inflate that a faster approach can be used for the single inflate() ++ call. Z_FINISH also informs inflate to not maintain a sliding window if the ++ stream completes, which reduces inflate's memory footprint. If the stream ++ does not complete, either because not all of the stream is provided or not ++ enough output space is provided, then a sliding window will be allocated and ++ inflate() can be called again to continue the operation as if Z_NO_FLUSH had ++ been used. + + In this implementation, inflate() always flushes as much output as + possible to the output buffer, and always uses the faster approach on the +- first call. So the only effect of the flush parameter in this implementation +- is on the return value of inflate(), as noted below, or when it returns early +- because Z_BLOCK is used. ++ first call. So the effects of the flush parameter in this implementation are ++ on the return value of inflate() as noted below, when inflate() returns early ++ when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of ++ memory for a sliding window when Z_FINISH is used. + + If a preset dictionary is needed after this call (see inflateSetDictionary +- below), inflate sets strm->adler to the adler32 checksum of the dictionary ++ below), inflate sets strm->adler to the Adler-32 checksum of the dictionary + chosen by the compressor and returns Z_NEED_DICT; otherwise it sets +- strm->adler to the adler32 checksum of all output produced so far (that is, ++ strm->adler to the Adler-32 checksum of all output produced so far (that is, + total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described +- below. At the end of the stream, inflate() checks that its computed adler32 ++ below. At the end of the stream, inflate() checks that its computed adler32 + checksum is equal to that saved by the compressor and returns Z_STREAM_END + only if the checksum is correct. + +- inflate() will decompress and check either zlib-wrapped or gzip-wrapped +- deflate data. The header type is detected automatically. Any information +- contained in the gzip header is not retained, so applications that need that +- information should instead use raw inflate, see inflateInit2() below, or +- inflateBack() and perform their own processing of the gzip header and +- trailer. ++ inflate() can decompress and check either zlib-wrapped or gzip-wrapped ++ deflate data. The header type is detected automatically, if requested when ++ initializing with inflateInit2(). Any information contained in the gzip ++ header is not retained, so applications that need that information should ++ instead use raw inflate, see inflateInit2() below, or inflateBack() and ++ perform their own processing of the gzip header and trailer. When processing ++ gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output ++ producted so far. The CRC-32 is checked against the gzip trailer. + + inflate() returns Z_OK if some progress has been made (more input processed + or more output produced), Z_STREAM_END if the end of the compressed data has +@@ -449,27 +495,28 @@ + preset dictionary is needed at this point, Z_DATA_ERROR if the input data was + corrupted (input stream not conforming to the zlib format or incorrect check + value), Z_STREAM_ERROR if the stream structure was inconsistent (for example +- if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory, ++ next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory, + Z_BUF_ERROR if no progress is possible or if there was not enough room in the +- output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and ++ output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and + inflate() can be called again with more input and more output space to +- continue decompressing. If Z_DATA_ERROR is returned, the application may then +- call inflateSync() to look for a good compression block if a partial recovery +- of the data is desired. ++ continue decompressing. If Z_DATA_ERROR is returned, the application may ++ then call inflateSync() to look for a good compression block if a partial ++ recovery of the data is desired. + */ + + + ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); + /* + All dynamically allocated data structures for this stream are freed. +- This function discards any unprocessed input and does not flush any +- pending output. ++ This function discards any unprocessed input and does not flush any pending ++ output. + + inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state +- was inconsistent. In the error case, msg may be set but then points to a ++ was inconsistent. In the error case, msg may be set but then points to a + static string (which must not be deallocated). + */ + ++ + /* Advanced functions */ + + /* +@@ -484,55 +531,57 @@ + int memLevel, + int strategy)); + +- This is another version of deflateInit with more compression options. The +- fields next_in, zalloc, zfree and opaque must be initialized before by +- the caller. ++ This is another version of deflateInit with more compression options. The ++ fields next_in, zalloc, zfree and opaque must be initialized before by the ++ caller. + +- The method parameter is the compression method. It must be Z_DEFLATED in ++ The method parameter is the compression method. It must be Z_DEFLATED in + this version of the library. + + The windowBits parameter is the base two logarithm of the window size +- (the size of the history buffer). It should be in the range 8..15 for this +- version of the library. Larger values of this parameter result in better +- compression at the expense of memory usage. The default value is 15 if ++ (the size of the history buffer). It should be in the range 8..15 for this ++ version of the library. Larger values of this parameter result in better ++ compression at the expense of memory usage. The default value is 15 if + deflateInit is used instead. + +- windowBits can also be -8..-15 for raw deflate. In this case, -windowBits +- determines the window size. deflate() will then generate raw deflate data ++ windowBits can also be -8..-15 for raw deflate. In this case, -windowBits ++ determines the window size. deflate() will then generate raw deflate data + with no zlib header or trailer, and will not compute an adler32 check value. + +- windowBits can also be greater than 15 for optional gzip encoding. Add ++ windowBits can also be greater than 15 for optional gzip encoding. Add + 16 to windowBits to write a simple gzip header and trailer around the +- compressed data instead of a zlib wrapper. The gzip header will have no +- file name, no extra data, no comment, no modification time (set to zero), +- no header crc, and the operating system will be set to 255 (unknown). If a ++ compressed data instead of a zlib wrapper. The gzip header will have no ++ file name, no extra data, no comment, no modification time (set to zero), no ++ header crc, and the operating system will be set to 255 (unknown). If a + gzip stream is being written, strm->adler is a crc32 instead of an adler32. + + The memLevel parameter specifies how much memory should be allocated +- for the internal compression state. memLevel=1 uses minimum memory but +- is slow and reduces compression ratio; memLevel=9 uses maximum memory +- for optimal speed. The default value is 8. See zconf.h for total memory +- usage as a function of windowBits and memLevel. ++ for the internal compression state. memLevel=1 uses minimum memory but is ++ slow and reduces compression ratio; memLevel=9 uses maximum memory for ++ optimal speed. The default value is 8. See zconf.h for total memory usage ++ as a function of windowBits and memLevel. + +- The strategy parameter is used to tune the compression algorithm. Use the ++ The strategy parameter is used to tune the compression algorithm. Use the + value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a + filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no + string match), or Z_RLE to limit match distances to one (run-length +- encoding). Filtered data consists mostly of small values with a somewhat +- random distribution. In this case, the compression algorithm is tuned to +- compress them better. The effect of Z_FILTERED is to force more Huffman ++ encoding). Filtered data consists mostly of small values with a somewhat ++ random distribution. In this case, the compression algorithm is tuned to ++ compress them better. The effect of Z_FILTERED is to force more Huffman + coding and less string matching; it is somewhat intermediate between +- Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as +- Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy +- parameter only affects the compression ratio but not the correctness of the +- compressed output even if it is not set appropriately. Z_FIXED prevents the +- use of dynamic Huffman codes, allowing for a simpler decoder for special +- applications. ++ Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as ++ fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The ++ strategy parameter only affects the compression ratio but not the ++ correctness of the compressed output even if it is not set appropriately. ++ Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler ++ decoder for special applications. + +- deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough +- memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid +- method). msg is set to null if there is no error message. deflateInit2 does +- not perform any compression: this will be done by deflate(). ++ deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough ++ memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid ++ method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is ++ incompatible with the version assumed by the caller (ZLIB_VERSION). msg is ++ set to null if there is no error message. deflateInit2 does not perform any ++ compression: this will be done by deflate(). + */ + + ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, +@@ -540,38 +589,43 @@ + uInt dictLength)); + /* + Initializes the compression dictionary from the given byte sequence +- without producing any compressed output. This function must be called +- immediately after deflateInit, deflateInit2 or deflateReset, before any +- call of deflate. The compressor and decompressor must use exactly the same +- dictionary (see inflateSetDictionary). ++ without producing any compressed output. When using the zlib format, this ++ function must be called immediately after deflateInit, deflateInit2 or ++ deflateReset, and before any call of deflate. When doing raw deflate, this ++ function must be called either before any call of deflate, or immediately ++ after the completion of a deflate block, i.e. after all input has been ++ consumed and all output has been delivered when using any of the flush ++ options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH. The ++ compressor and decompressor must use exactly the same dictionary (see ++ inflateSetDictionary). + + The dictionary should consist of strings (byte sequences) that are likely + to be encountered later in the data to be compressed, with the most commonly +- used strings preferably put towards the end of the dictionary. Using a ++ used strings preferably put towards the end of the dictionary. Using a + dictionary is most useful when the data to be compressed is short and can be + predicted with good accuracy; the data can then be compressed better than + with the default empty dictionary. + + Depending on the size of the compression data structures selected by + deflateInit or deflateInit2, a part of the dictionary may in effect be +- discarded, for example if the dictionary is larger than the window size in +- deflate or deflate2. Thus the strings most likely to be useful should be +- put at the end of the dictionary, not at the front. In addition, the +- current implementation of deflate will use at most the window size minus +- 262 bytes of the provided dictionary. ++ discarded, for example if the dictionary is larger than the window size ++ provided in deflateInit or deflateInit2. Thus the strings most likely to be ++ useful should be put at the end of the dictionary, not at the front. In ++ addition, the current implementation of deflate will use at most the window ++ size minus 262 bytes of the provided dictionary. + + Upon return of this function, strm->adler is set to the adler32 value + of the dictionary; the decompressor may later use this value to determine +- which dictionary has been used by the compressor. (The adler32 value ++ which dictionary has been used by the compressor. (The adler32 value + applies to the whole dictionary even if only a subset of the dictionary is + actually used by the compressor.) If a raw deflate was requested, then the + adler32 value is not computed and strm->adler is not set. + + deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a +- parameter is invalid (such as NULL dictionary) or the stream state is ++ parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is + inconsistent (for example if deflate has already been called for this stream +- or if the compression method is bsort). deflateSetDictionary does not +- perform any compression: this will be done by deflate(). ++ or if not at a block boundary for raw deflate). deflateSetDictionary does ++ not perform any compression: this will be done by deflate(). + */ + + ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, +@@ -581,26 +635,26 @@ + + This function can be useful when several compression strategies will be + tried, for example when there are several ways of pre-processing the input +- data with a filter. The streams that will be discarded should then be freed ++ data with a filter. The streams that will be discarded should then be freed + by calling deflateEnd. Note that deflateCopy duplicates the internal +- compression state which can be quite large, so this strategy is slow and +- can consume lots of memory. ++ compression state which can be quite large, so this strategy is slow and can ++ consume lots of memory. + + deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent +- (such as zalloc being NULL). msg is left unchanged in both source and ++ (such as zalloc being Z_NULL). msg is left unchanged in both source and + destination. + */ + + ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); + /* + This function is equivalent to deflateEnd followed by deflateInit, +- but does not free and reallocate all the internal compression state. +- The stream will keep the same compression level and any other attributes +- that may have been set by deflateInit2. ++ but does not free and reallocate all the internal compression state. The ++ stream will keep the same compression level and any other attributes that ++ may have been set by deflateInit2. + +- deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source +- stream state was inconsistent (such as zalloc or state being NULL). ++ deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source ++ stream state was inconsistent (such as zalloc or state being Z_NULL). + */ + + ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, +@@ -610,18 +664,18 @@ + Dynamically update the compression level and compression strategy. The + interpretation of level and strategy is as in deflateInit2. This can be + used to switch between compression and straight copy of the input data, or +- to switch to a different kind of input data requiring a different +- strategy. If the compression level is changed, the input available so far +- is compressed with the old level (and may be flushed); the new level will +- take effect only at the next call of deflate(). ++ to switch to a different kind of input data requiring a different strategy. ++ If the compression level is changed, the input available so far is ++ compressed with the old level (and may be flushed); the new level will take ++ effect only at the next call of deflate(). + + Before the call of deflateParams, the stream state must be set as for +- a call of deflate(), since the currently available input may have to +- be compressed and flushed. In particular, strm->avail_out must be non-zero. ++ a call of deflate(), since the currently available input may have to be ++ compressed and flushed. In particular, strm->avail_out must be non-zero. + + deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source +- stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR +- if strm->avail_out was zero. ++ stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if ++ strm->avail_out was zero. + */ + + ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, +@@ -645,31 +699,53 @@ + uLong sourceLen)); + /* + deflateBound() returns an upper bound on the compressed size after +- deflation of sourceLen bytes. It must be called after deflateInit() +- or deflateInit2(). This would be used to allocate an output buffer +- for deflation in a single pass, and so would be called before deflate(). ++ deflation of sourceLen bytes. It must be called after deflateInit() or ++ deflateInit2(), and after deflateSetHeader(), if used. This would be used ++ to allocate an output buffer for deflation in a single pass, and so would be ++ called before deflate(). If that first deflate() call is provided the ++ sourceLen input bytes, an output buffer allocated to the size returned by ++ deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed ++ to return Z_STREAM_END. Note that it is possible for the compressed size to ++ be larger than the value returned by deflateBound() if flush options other ++ than Z_FINISH or Z_NO_FLUSH are used. + */ + ++ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm, ++ unsigned *pending, ++ int *bits)); ++/* ++ deflatePending() returns the number of bytes and bits of output that have ++ been generated, but not yet provided in the available output. The bytes not ++ provided would be due to the available output space having being consumed. ++ The number of bits of output not provided are between 0 and 7, where they ++ await more bits to join them in order to fill out a full byte. If pending ++ or bits are Z_NULL, then those values are not set. ++ ++ deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source ++ stream state was inconsistent. ++ */ ++ + ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, + int bits, + int value)); + /* + deflatePrime() inserts bits in the deflate output stream. The intent +- is that this function is used to start off the deflate output with the +- bits leftover from a previous deflate stream when appending to it. As such, +- this function can only be used for raw deflate, and must be used before the +- first deflate() call after a deflateInit2() or deflateReset(). bits must be +- less than or equal to 16, and that many of the least significant bits of +- value will be inserted in the output. ++ is that this function is used to start off the deflate output with the bits ++ leftover from a previous deflate stream when appending to it. As such, this ++ function can only be used for raw deflate, and must be used before the first ++ deflate() call after a deflateInit2() or deflateReset(). bits must be less ++ than or equal to 16, and that many of the least significant bits of value ++ will be inserted in the output. + +- deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source +- stream state was inconsistent. ++ deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough ++ room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the ++ source stream state was inconsistent. + */ + + ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, + gz_headerp head)); + /* +- deflateSetHeader() provides gzip header information for when a gzip ++ deflateSetHeader() provides gzip header information for when a gzip + stream is requested by deflateInit2(). deflateSetHeader() may be called + after deflateInit2() or deflateReset() and before the first call of + deflate(). The text, time, os, extra field, name, and comment information +@@ -682,11 +758,11 @@ + 1.3.x) do not support header crc's, and will report that it is a "multi-part + gzip file" and give up. + +- If deflateSetHeader is not used, the default gzip header has text false, ++ If deflateSetHeader is not used, the default gzip header has text false, + the time set to zero, and os set to 255, with no extra, name, or comment + fields. The gzip header is returned to the default state by deflateReset(). + +- deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source ++ deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ + +@@ -694,43 +770,50 @@ + ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, + int windowBits)); + +- This is another version of inflateInit with an extra parameter. The ++ This is another version of inflateInit with an extra parameter. The + fields next_in, avail_in, zalloc, zfree and opaque must be initialized + before by the caller. + + The windowBits parameter is the base two logarithm of the maximum window + size (the size of the history buffer). It should be in the range 8..15 for +- this version of the library. The default value is 15 if inflateInit is used +- instead. windowBits must be greater than or equal to the windowBits value ++ this version of the library. The default value is 15 if inflateInit is used ++ instead. windowBits must be greater than or equal to the windowBits value + provided to deflateInit2() while compressing, or it must be equal to 15 if +- deflateInit2() was not used. If a compressed stream with a larger window ++ deflateInit2() was not used. If a compressed stream with a larger window + size is given as input, inflate() will return with the error code + Z_DATA_ERROR instead of trying to allocate a larger window. + +- windowBits can also be -8..-15 for raw inflate. In this case, -windowBits +- determines the window size. inflate() will then process raw deflate data, ++ windowBits can also be zero to request that inflate use the window size in ++ the zlib header of the compressed stream. ++ ++ windowBits can also be -8..-15 for raw inflate. In this case, -windowBits ++ determines the window size. inflate() will then process raw deflate data, + not looking for a zlib or gzip header, not generating a check value, and not +- looking for any check values for comparison at the end of the stream. This ++ looking for any check values for comparison at the end of the stream. This + is for use with other formats that use the deflate compressed data format +- such as zip. Those formats provide their own check values. If a custom ++ such as zip. Those formats provide their own check values. If a custom + format is developed using the raw deflate format for compressed data, it is + recommended that a check value such as an adler32 or a crc32 be applied to + the uncompressed data as is done in the zlib, gzip, and zip formats. For +- most applications, the zlib format should be used as is. Note that comments ++ most applications, the zlib format should be used as is. Note that comments + above on the use in deflateInit2() applies to the magnitude of windowBits. + +- windowBits can also be greater than 15 for optional gzip decoding. Add ++ windowBits can also be greater than 15 for optional gzip decoding. Add + 32 to windowBits to enable zlib and gzip decoding with automatic header + detection, or add 16 to decode only the gzip format (the zlib format will +- return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is +- a crc32 instead of an adler32. ++ return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a ++ crc32 instead of an adler32. + + inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough +- memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg +- is set to null if there is no error message. inflateInit2 does not perform +- any decompression apart from reading the zlib header if present: this will +- be done by inflate(). (So next_in and avail_in may be modified, but next_out +- and avail_out are unchanged.) ++ memory, Z_VERSION_ERROR if the zlib library version is incompatible with the ++ version assumed by the caller, or Z_STREAM_ERROR if the parameters are ++ invalid, such as a null pointer to the structure. msg is set to null if ++ there is no error message. inflateInit2 does not perform any decompression ++ apart from possibly reading the zlib header if present: actual decompression ++ will be done by inflate(). (So next_in and avail_in may be modified, but ++ next_out and avail_out are unused and unchanged.) The current implementation ++ of inflateInit2() does not process any header information -- that is ++ deferred until inflate() is called. + */ + + ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, +@@ -738,36 +821,56 @@ + uInt dictLength)); + /* + Initializes the decompression dictionary from the given uncompressed byte +- sequence. This function must be called immediately after a call of inflate, +- if that call returned Z_NEED_DICT. The dictionary chosen by the compressor ++ sequence. This function must be called immediately after a call of inflate, ++ if that call returned Z_NEED_DICT. The dictionary chosen by the compressor + can be determined from the adler32 value returned by that call of inflate. + The compressor and decompressor must use exactly the same dictionary (see +- deflateSetDictionary). For raw inflate, this function can be called +- immediately after inflateInit2() or inflateReset() and before any call of +- inflate() to set the dictionary. The application must insure that the +- dictionary that was used for compression is provided. ++ deflateSetDictionary). For raw inflate, this function can be called at any ++ time to set the dictionary. If the provided dictionary is smaller than the ++ window and there is already data in the window, then the provided dictionary ++ will amend what's there. The application must insure that the dictionary ++ that was used for compression is provided. + + inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a +- parameter is invalid (such as NULL dictionary) or the stream state is ++ parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is + inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the +- expected one (incorrect adler32 value). inflateSetDictionary does not ++ expected one (incorrect adler32 value). inflateSetDictionary does not + perform any decompression: this will be done by subsequent calls of + inflate(). + */ + ++ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm, ++ Bytef *dictionary, ++ uInt *dictLength)); ++/* ++ Returns the sliding dictionary being maintained by inflate. dictLength is ++ set to the number of bytes in the dictionary, and that many bytes are copied ++ to dictionary. dictionary must have enough space, where 32768 bytes is ++ always enough. If inflateGetDictionary() is called with dictionary equal to ++ Z_NULL, then only the dictionary length is returned, and nothing is copied. ++ Similary, if dictLength is Z_NULL, then it is not set. ++ ++ inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the ++ stream state is inconsistent. ++*/ ++ + ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); + /* +- Skips invalid compressed data until a full flush point (see above the +- description of deflate with Z_FULL_FLUSH) can be found, or until all +- available input is skipped. No output is provided. ++ Skips invalid compressed data until a possible full flush point (see above ++ for the description of deflate with Z_FULL_FLUSH) can be found, or until all ++ available input is skipped. No output is provided. + +- inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR +- if no more input was provided, Z_DATA_ERROR if no flush point has been found, +- or Z_STREAM_ERROR if the stream structure was inconsistent. In the success +- case, the application may save the current value of total_in which +- indicates where valid compressed data was found. In the error case, the +- application may repeatedly call inflateSync, providing more input each time, +- until success or end of the input data. ++ inflateSync searches for a 00 00 FF FF pattern in the compressed data. ++ All full flush points have this pattern, but not all occurrences of this ++ pattern are full flush points. ++ ++ inflateSync returns Z_OK if a possible full flush point has been found, ++ Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point ++ has been found, or Z_STREAM_ERROR if the stream structure was inconsistent. ++ In the success case, the application may save the current current value of ++ total_in which indicates where valid compressed data was found. In the ++ error case, the application may repeatedly call inflateSync, providing more ++ input each time, until success or end of the input data. + */ + + ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, +@@ -782,18 +885,30 @@ + + inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent +- (such as zalloc being NULL). msg is left unchanged in both source and ++ (such as zalloc being Z_NULL). msg is left unchanged in both source and + destination. + */ + + ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); + /* + This function is equivalent to inflateEnd followed by inflateInit, +- but does not free and reallocate all the internal decompression state. +- The stream will keep attributes that may have been set by inflateInit2. ++ but does not free and reallocate all the internal decompression state. The ++ stream will keep attributes that may have been set by inflateInit2. + +- inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source +- stream state was inconsistent (such as zalloc or state being NULL). ++ inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source ++ stream state was inconsistent (such as zalloc or state being Z_NULL). ++*/ ++ ++ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, ++ int windowBits)); ++/* ++ This function is the same as inflateReset, but it also permits changing ++ the wrap and window size requests. The windowBits parameter is interpreted ++ the same as it is for inflateInit2. ++ ++ inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source ++ stream state was inconsistent (such as zalloc or state being Z_NULL), or if ++ the windowBits parameter is invalid. + */ + + ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, +@@ -801,54 +916,87 @@ + int value)); + /* + This function inserts bits in the inflate input stream. The intent is +- that this function is used to start inflating at a bit position in the +- middle of a byte. The provided bits will be used before any bytes are used +- from next_in. This function should only be used with raw inflate, and +- should be used before the first inflate() call after inflateInit2() or +- inflateReset(). bits must be less than or equal to 16, and that many of the +- least significant bits of value will be inserted in the input. ++ that this function is used to start inflating at a bit position in the ++ middle of a byte. The provided bits will be used before any bytes are used ++ from next_in. This function should only be used with raw inflate, and ++ should be used before the first inflate() call after inflateInit2() or ++ inflateReset(). bits must be less than or equal to 16, and that many of the ++ least significant bits of value will be inserted in the input. + +- inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source ++ If bits is negative, then the input stream bit buffer is emptied. Then ++ inflatePrime() can be called again to put bits in the buffer. This is used ++ to clear out bits leftover after feeding inflate a block description prior ++ to feeding inflate codes. ++ ++ inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ + ++ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); ++/* ++ This function returns two values, one in the lower 16 bits of the return ++ value, and the other in the remaining upper bits, obtained by shifting the ++ return value down 16 bits. If the upper value is -1 and the lower value is ++ zero, then inflate() is currently decoding information outside of a block. ++ If the upper value is -1 and the lower value is non-zero, then inflate is in ++ the middle of a stored block, with the lower value equaling the number of ++ bytes from the input remaining to copy. If the upper value is not -1, then ++ it is the number of bits back from the current bit position in the input of ++ the code (literal or length/distance pair) currently being processed. In ++ that case the lower value is the number of bytes already emitted for that ++ code. ++ ++ A code is being processed if inflate is waiting for more input to complete ++ decoding of the code, or if it has completed decoding but is waiting for ++ more output space to write the literal or match data. ++ ++ inflateMark() is used to mark locations in the input data for random ++ access, which may be at bit positions, and to note those cases where the ++ output of a code may span boundaries of random access blocks. The current ++ location in the input stream can be determined from avail_in and data_type ++ as noted in the description for the Z_BLOCK flush parameter for inflate. ++ ++ inflateMark returns the value noted above or -1 << 16 if the provided ++ source stream state was inconsistent. ++*/ ++ + ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, + gz_headerp head)); + /* +- inflateGetHeader() requests that gzip header information be stored in the ++ inflateGetHeader() requests that gzip header information be stored in the + provided gz_header structure. inflateGetHeader() may be called after + inflateInit2() or inflateReset(), and before the first call of inflate(). + As inflate() processes the gzip stream, head->done is zero until the header + is completed, at which time head->done is set to one. If a zlib stream is + being decoded, then head->done is set to -1 to indicate that there will be +- no gzip header information forthcoming. Note that Z_BLOCK can be used to +- force inflate() to return immediately after header processing is complete +- and before any actual data is decompressed. ++ no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be ++ used to force inflate() to return immediately after header processing is ++ complete and before any actual data is decompressed. + +- The text, time, xflags, and os fields are filled in with the gzip header ++ The text, time, xflags, and os fields are filled in with the gzip header + contents. hcrc is set to true if there is a header CRC. (The header CRC +- was valid if done is set to one.) If extra is not Z_NULL, then extra_max ++ was valid if done is set to one.) If extra is not Z_NULL, then extra_max + contains the maximum number of bytes to write to extra. Once done is true, + extra_len contains the actual extra field length, and extra contains the + extra field, or that field truncated if extra_max is less than extra_len. + If name is not Z_NULL, then up to name_max characters are written there, + terminated with a zero unless the length is greater than name_max. If + comment is not Z_NULL, then up to comm_max characters are written there, +- terminated with a zero unless the length is greater than comm_max. When +- any of extra, name, or comment are not Z_NULL and the respective field is +- not present in the header, then that field is set to Z_NULL to signal its ++ terminated with a zero unless the length is greater than comm_max. When any ++ of extra, name, or comment are not Z_NULL and the respective field is not ++ present in the header, then that field is set to Z_NULL to signal its + absence. This allows the use of deflateSetHeader() with the returned + structure to duplicate the header. However if those fields are set to + allocated memory, then the application will need to save those pointers + elsewhere so that they can be eventually freed. + +- If inflateGetHeader is not used, then the header information is simply ++ If inflateGetHeader is not used, then the header information is simply + discarded. The header is always checked for validity, including the header + CRC if present. inflateReset() will reset the process to discard the header + information. The application would need to call inflateGetHeader() again to + retrieve the header from the next gzip stream. + +- inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source ++ inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ + +@@ -869,12 +1017,13 @@ + See inflateBack() for the usage of these routines. + + inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of +- the paramaters are invalid, Z_MEM_ERROR if the internal state could not +- be allocated, or Z_VERSION_ERROR if the version of the library does not +- match the version of the header file. ++ the parameters are invalid, Z_MEM_ERROR if the internal state could not be ++ allocated, or Z_VERSION_ERROR if the version of the library does not match ++ the version of the header file. + */ + +-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); ++typedef unsigned (*in_func) OF((void FAR *, ++ z_const unsigned char FAR * FAR *)); + typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); + + ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, +@@ -882,24 +1031,25 @@ + out_func out, void FAR *out_desc)); + /* + inflateBack() does a raw inflate with a single call using a call-back +- interface for input and output. This is more efficient than inflate() for +- file i/o applications in that it avoids copying between the output and the +- sliding window by simply making the window itself the output buffer. This +- function trusts the application to not change the output buffer passed by +- the output function, at least until inflateBack() returns. ++ interface for input and output. This is potentially more efficient than ++ inflate() for file i/o applications, in that it avoids copying between the ++ output and the sliding window by simply making the window itself the output ++ buffer. inflate() can be faster on modern CPUs when used with large ++ buffers. inflateBack() trusts the application to not change the output ++ buffer passed by the output function, at least until inflateBack() returns. + + inflateBackInit() must be called first to allocate the internal state + and to initialize the state with the user-provided window buffer. + inflateBack() may then be used multiple times to inflate a complete, raw +- deflate stream with each call. inflateBackEnd() is then called to free +- the allocated state. ++ deflate stream with each call. inflateBackEnd() is then called to free the ++ allocated state. + + A raw deflate stream is one with no zlib or gzip header or trailer. + This routine would normally be used in a utility that reads zip or gzip + files and writes out uncompressed files. The utility would decode the +- header and process the trailer on its own, hence this routine expects +- only the raw deflate stream to decompress. This is different from the +- normal behavior of inflate(), which expects either a zlib or gzip header and ++ header and process the trailer on its own, hence this routine expects only ++ the raw deflate stream to decompress. This is different from the normal ++ behavior of inflate(), which expects either a zlib or gzip header and + trailer around the deflate stream. + + inflateBack() uses two subroutines supplied by the caller that are then +@@ -925,7 +1075,7 @@ + calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called + immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in + must also be initialized, and then if strm->avail_in is not zero, input will +- initially be taken from strm->next_in[0 .. strm->avail_in - 1]. ++ initially be taken from strm->next_in[0 .. strm->avail_in - 1]. + + The in_desc and out_desc parameters of inflateBack() is passed as the + first parameter of in() and out() respectively when they are called. These +@@ -935,15 +1085,15 @@ + On return, inflateBack() will set strm->next_in and strm->avail_in to + pass back any unused input that was provided by the last in() call. The + return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR +- if in() or out() returned an error, Z_DATA_ERROR if there was a format +- error in the deflate stream (in which case strm->msg is set to indicate the +- nature of the error), or Z_STREAM_ERROR if the stream was not properly +- initialized. In the case of Z_BUF_ERROR, an input or output error can be +- distinguished using strm->next_in which will be Z_NULL only if in() returned +- an error. If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to +- out() returning non-zero. (in() will always be called before out(), so +- strm->next_in is assured to be defined if out() returns non-zero.) Note +- that inflateBack() cannot return Z_OK. ++ if in() or out() returned an error, Z_DATA_ERROR if there was a format error ++ in the deflate stream (in which case strm->msg is set to indicate the nature ++ of the error), or Z_STREAM_ERROR if the stream was not properly initialized. ++ In the case of Z_BUF_ERROR, an input or output error can be distinguished ++ using strm->next_in which will be Z_NULL only if in() returned an error. If ++ strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning ++ non-zero. (in() will always be called before out(), so strm->next_in is ++ assured to be defined if out() returns non-zero.) Note that inflateBack() ++ cannot return Z_OK. + */ + + ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); +@@ -995,27 +1145,27 @@ + 27-31: 0 (reserved) + */ + ++#ifndef Z_SOLO + + /* utility functions */ + + /* +- The following utility functions are implemented on top of the +- basic stream-oriented functions. To simplify the interface, some +- default options are assumed (compression level and memory usage, +- standard memory allocation functions). The source code of these +- utility functions can easily be modified if you need special options. ++ The following utility functions are implemented on top of the basic ++ stream-oriented functions. To simplify the interface, some default options ++ are assumed (compression level and memory usage, standard memory allocation ++ functions). The source code of these utility functions can be modified if ++ you need special options. + */ + + ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); + /* + Compresses the source buffer into the destination buffer. sourceLen is +- the byte length of the source buffer. Upon entry, destLen is the total +- size of the destination buffer, which must be at least the value returned +- by compressBound(sourceLen). Upon exit, destLen is the actual size of the ++ the byte length of the source buffer. Upon entry, destLen is the total size ++ of the destination buffer, which must be at least the value returned by ++ compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. +- This function can be used to compress a whole file at once if the +- input file is mmap'ed. ++ + compress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer. +@@ -1025,11 +1175,11 @@ + const Bytef *source, uLong sourceLen, + int level)); + /* +- Compresses the source buffer into the destination buffer. The level ++ Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte +- length of the source buffer. Upon entry, destLen is the total size of the ++ length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least the value returned by +- compressBound(sourceLen). Upon exit, destLen is the actual size of the ++ compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough +@@ -1040,159 +1190,255 @@ + ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); + /* + compressBound() returns an upper bound on the compressed size after +- compress() or compress2() on sourceLen bytes. It would be used before +- a compress() or compress2() call to allocate the destination buffer. ++ compress() or compress2() on sourceLen bytes. It would be used before a ++ compress() or compress2() call to allocate the destination buffer. + */ + + ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); + /* + Decompresses the source buffer into the destination buffer. sourceLen is +- the byte length of the source buffer. Upon entry, destLen is the total +- size of the destination buffer, which must be large enough to hold the +- entire uncompressed data. (The size of the uncompressed data must have +- been saved previously by the compressor and transmitted to the decompressor +- by some mechanism outside the scope of this compression library.) +- Upon exit, destLen is the actual size of the compressed buffer. +- This function can be used to decompress a whole file at once if the +- input file is mmap'ed. ++ the byte length of the source buffer. Upon entry, destLen is the total size ++ of the destination buffer, which must be large enough to hold the entire ++ uncompressed data. (The size of the uncompressed data must have been saved ++ previously by the compressor and transmitted to the decompressor by some ++ mechanism outside the scope of this compression library.) Upon exit, destLen ++ is the actual size of the uncompressed buffer. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output +- buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. ++ buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. In ++ the case where there is not enough room, uncompress() will fill the output ++ buffer with the uncompressed data up to that point. + */ + ++ /* gzip file access functions */ + +-typedef voidp gzFile; ++/* ++ This library supports reading and writing files in gzip (.gz) format with ++ an interface similar to that of stdio, using the functions that start with ++ "gz". The gzip format is different from the zlib format. gzip is a gzip ++ wrapper, documented in RFC 1952, wrapped around a deflate stream. ++*/ + +-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); ++typedef struct gzFile_s *gzFile; /* semi-opaque gzip file descriptor */ ++ + /* +- Opens a gzip (.gz) file for reading or writing. The mode parameter +- is as in fopen ("rb" or "wb") but can also include a compression level +- ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for +- Huffman only compression as in "wb1h", or 'R' for run-length encoding +- as in "wb1R". (See the description of deflateInit2 for more information +- about the strategy parameter.) ++ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); ++ ++ Opens a gzip (.gz) file for reading or writing. The mode parameter is as ++ in fopen ("rb" or "wb") but can also include a compression level ("wb9") or ++ a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only ++ compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F' ++ for fixed code compression as in "wb9F". (See the description of ++ deflateInit2 for more information about the strategy parameter.) 'T' will ++ request transparent writing or appending with no compression and not using ++ the gzip format. ++ ++ "a" can be used instead of "w" to request that the gzip stream that will ++ be written be appended to the file. "+" will result in an error, since ++ reading and writing to the same gzip file is not supported. The addition of ++ "x" when writing will create the file exclusively, which fails if the file ++ already exists. On systems that support it, the addition of "e" when ++ reading or writing will set the flag to close the file on an execve() call. ++ ++ These functions, as well as gzip, will read and decode a sequence of gzip ++ streams in a file. The append function of gzopen() can be used to create ++ such a file. (Also see gzflush() for another way to do this.) When ++ appending, gzopen does not test whether the file begins with a gzip stream, ++ nor does it look for the end of the gzip streams to begin appending. gzopen ++ will simply append a gzip stream to the existing file. + + gzopen can be used to read a file which is not in gzip format; in this +- case gzread will directly read from the file without decompression. ++ case gzread will directly read from the file without decompression. When ++ reading, this will be detected automatically by looking for the magic two- ++ byte gzip header. + +- gzopen returns NULL if the file could not be opened or if there was +- insufficient memory to allocate the (de)compression state; errno +- can be checked to distinguish the two cases (if errno is zero, the +- zlib error is Z_MEM_ERROR). */ ++ gzopen returns NULL if the file could not be opened, if there was ++ insufficient memory to allocate the gzFile state, or if an invalid mode was ++ specified (an 'r', 'w', or 'a' was not provided, or '+' was provided). ++ errno can be checked to determine if the reason gzopen failed was that the ++ file could not be opened. ++*/ + +-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); ++ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); + /* +- gzdopen() associates a gzFile with the file descriptor fd. File +- descriptors are obtained from calls like open, dup, creat, pipe or +- fileno (in the file has been previously opened with fopen). +- The mode parameter is as in gzopen. +- The next call of gzclose on the returned gzFile will also close the +- file descriptor fd, just like fclose(fdopen(fd), mode) closes the file +- descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode). +- gzdopen returns NULL if there was insufficient memory to allocate +- the (de)compression state. ++ gzdopen associates a gzFile with the file descriptor fd. File descriptors ++ are obtained from calls like open, dup, creat, pipe or fileno (if the file ++ has been previously opened with fopen). The mode parameter is as in gzopen. ++ ++ The next call of gzclose on the returned gzFile will also close the file ++ descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor ++ fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd, ++ mode);. The duplicated descriptor should be saved to avoid a leak, since ++ gzdopen does not close fd if it fails. If you are using fileno() to get the ++ file descriptor from a FILE *, then you will have to use dup() to avoid ++ double-close()ing the file descriptor. Both gzclose() and fclose() will ++ close the associated file descriptor, so they need to have different file ++ descriptors. ++ ++ gzdopen returns NULL if there was insufficient memory to allocate the ++ gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not ++ provided, or '+' was provided), or if fd is -1. The file descriptor is not ++ used until the next gz* read, write, seek, or close operation, so gzdopen ++ will not detect if fd is invalid (unless fd is -1). ++*/ ++ ++ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); ++/* ++ Set the internal buffer size used by this library's functions. The ++ default buffer size is 8192 bytes. This function must be called after ++ gzopen() or gzdopen(), and before any other calls that read or write the ++ file. The buffer memory allocation is always deferred to the first read or ++ write. Two buffers are allocated, either both of the specified size when ++ writing, or one of the specified size and the other twice that size when ++ reading. A larger buffer size of, for example, 64K or 128K bytes will ++ noticeably increase the speed of decompression (reading). ++ ++ The new buffer size also affects the maximum length for gzprintf(). ++ ++ gzbuffer() returns 0 on success, or -1 on failure, such as being called ++ too late. + */ + + ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); + /* +- Dynamically update the compression level or strategy. See the description ++ Dynamically update the compression level or strategy. See the description + of deflateInit2 for the meaning of these parameters. ++ + gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not + opened for writing. + */ + +-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); ++ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); + /* +- Reads the given number of uncompressed bytes from the compressed file. +- If the input file was not in gzip format, gzread copies the given number +- of bytes into the buffer. +- gzread returns the number of uncompressed bytes actually read (0 for +- end of file, -1 for error). */ ++ Reads the given number of uncompressed bytes from the compressed file. If ++ the input file is not in gzip format, gzread copies the given number of ++ bytes into the buffer directly from the file. + +-ZEXTERN int ZEXPORT gzwrite OF((gzFile file, +- voidpc buf, unsigned len)); ++ After reaching the end of a gzip stream in the input, gzread will continue ++ to read, looking for another gzip stream. Any number of gzip streams may be ++ concatenated in the input file, and will all be decompressed by gzread(). ++ If something other than a gzip stream is encountered after a gzip stream, ++ that remaining trailing garbage is ignored (and no error is returned). ++ ++ gzread can be used to read a gzip file that is being concurrently written. ++ Upon reaching the end of the input, gzread will return with the available ++ data. If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then ++ gzclearerr can be used to clear the end of file indicator in order to permit ++ gzread to be tried again. Z_OK indicates that a gzip stream was completed ++ on the last gzread. Z_BUF_ERROR indicates that the input file ended in the ++ middle of a gzip stream. Note that gzread does not return -1 in the event ++ of an incomplete gzip stream. This error is deferred until gzclose(), which ++ will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip ++ stream. Alternatively, gzerror can be used before gzclose to detect this ++ case. ++ ++ gzread returns the number of uncompressed bytes actually read, less than ++ len for end of file, or -1 for error. ++*/ ++ ++ZEXTERN int ZEXPORT gzwrite OF((gzFile file, ++ voidpc buf, unsigned len)); + /* + Writes the given number of uncompressed bytes into the compressed file. +- gzwrite returns the number of uncompressed bytes actually written +- (0 in case of error). ++ gzwrite returns the number of uncompressed bytes written or 0 in case of ++ error. + */ + +-ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); ++ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...)); + /* +- Converts, formats, and writes the args to the compressed file under +- control of the format string, as in fprintf. gzprintf returns the number of +- uncompressed bytes actually written (0 in case of error). The number of +- uncompressed bytes written is limited to 4095. The caller should assure that +- this limit is not exceeded. If it is exceeded, then gzprintf() will return +- return an error (0) with nothing written. In this case, there may also be a +- buffer overflow with unpredictable consequences, which is possible only if +- zlib was compiled with the insecure functions sprintf() or vsprintf() +- because the secure snprintf() or vsnprintf() functions were not available. ++ Converts, formats, and writes the arguments to the compressed file under ++ control of the format string, as in fprintf. gzprintf returns the number of ++ uncompressed bytes actually written, or 0 in case of error. The number of ++ uncompressed bytes written is limited to 8191, or one less than the buffer ++ size given to gzbuffer(). The caller should assure that this limit is not ++ exceeded. If it is exceeded, then gzprintf() will return an error (0) with ++ nothing written. In this case, there may also be a buffer overflow with ++ unpredictable consequences, which is possible only if zlib was compiled with ++ the insecure functions sprintf() or vsprintf() because the secure snprintf() ++ or vsnprintf() functions were not available. This can be determined using ++ zlibCompileFlags(). + */ + + ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); + /* +- Writes the given null-terminated string to the compressed file, excluding ++ Writes the given null-terminated string to the compressed file, excluding + the terminating null character. +- gzputs returns the number of characters written, or -1 in case of error. ++ ++ gzputs returns the number of characters written, or -1 in case of error. + */ + + ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); + /* +- Reads bytes from the compressed file until len-1 characters are read, or +- a newline character is read and transferred to buf, or an end-of-file +- condition is encountered. The string is then terminated with a null +- character. +- gzgets returns buf, or Z_NULL in case of error. ++ Reads bytes from the compressed file until len-1 characters are read, or a ++ newline character is read and transferred to buf, or an end-of-file ++ condition is encountered. If any characters are read or if len == 1, the ++ string is terminated with a null character. If no characters are read due ++ to an end-of-file or len < 1, then the buffer is left untouched. ++ ++ gzgets returns buf which is a null-terminated string, or it returns NULL ++ for end-of-file or in case of error. If there was an error, the contents at ++ buf are indeterminate. + */ + +-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); ++ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); + /* +- Writes c, converted to an unsigned char, into the compressed file. +- gzputc returns the value that was written, or -1 in case of error. ++ Writes c, converted to an unsigned char, into the compressed file. gzputc ++ returns the value that was written, or -1 in case of error. + */ + +-ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); ++ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); + /* +- Reads one byte from the compressed file. gzgetc returns this byte +- or -1 in case of end of file or error. ++ Reads one byte from the compressed file. gzgetc returns this byte or -1 ++ in case of end of file or error. This is implemented as a macro for speed. ++ As such, it does not do all of the checking the other functions do. I.e. ++ it does not check to see if file is NULL, nor whether the structure file ++ points to has been clobbered or not. + */ + +-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); ++ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); + /* +- Push one character back onto the stream to be read again later. +- Only one character of push-back is allowed. gzungetc() returns the +- character pushed, or -1 on failure. gzungetc() will fail if a +- character has been pushed but not read yet, or if c is -1. The pushed +- character will be discarded if the stream is repositioned with gzseek() +- or gzrewind(). ++ Push one character back onto the stream to be read as the first character ++ on the next read. At least one character of push-back is allowed. ++ gzungetc() returns the character pushed, or -1 on failure. gzungetc() will ++ fail if c is -1, and may fail if a character has been pushed but not read ++ yet. If gzungetc is used immediately after gzopen or gzdopen, at least the ++ output buffer size of pushed characters is allowed. (See gzbuffer above.) ++ The pushed character will be discarded if the stream is repositioned with ++ gzseek() or gzrewind(). + */ + +-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); ++ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); + /* +- Flushes all pending output into the compressed file. The parameter +- flush is as in the deflate() function. The return value is the zlib +- error number (see function gzerror below). gzflush returns Z_OK if +- the flush parameter is Z_FINISH and all output could be flushed. +- gzflush should be called only when strictly necessary because it can +- degrade compression. ++ Flushes all pending output into the compressed file. The parameter flush ++ is as in the deflate() function. The return value is the zlib error number ++ (see function gzerror below). gzflush is only permitted when writing. ++ ++ If the flush parameter is Z_FINISH, the remaining data is written and the ++ gzip stream is completed in the output. If gzwrite() is called again, a new ++ gzip stream will be started in the output. gzread() is able to read such ++ concatented gzip streams. ++ ++ gzflush should be called only when strictly necessary because it will ++ degrade compression if called too often. + */ + +-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, +- z_off_t offset, int whence)); + /* +- Sets the starting position for the next gzread or gzwrite on the +- given compressed file. The offset represents a number of bytes in the +- uncompressed data stream. The whence parameter is defined as in lseek(2); ++ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, ++ z_off_t offset, int whence)); ++ ++ Sets the starting position for the next gzread or gzwrite on the given ++ compressed file. The offset represents a number of bytes in the ++ uncompressed data stream. The whence parameter is defined as in lseek(2); + the value SEEK_END is not supported. ++ + If the file is opened for reading, this function is emulated but can be +- extremely slow. If the file is opened for writing, only forward seeks are ++ extremely slow. If the file is opened for writing, only forward seeks are + supported; gzseek then compresses a sequence of zeroes up to the new + starting position. + +- gzseek returns the resulting offset location as measured in bytes from ++ gzseek returns the resulting offset location as measured in bytes from + the beginning of the uncompressed stream, or -1 in case of error, in + particular if the file is opened for writing and the new starting position + would be before the current position. +@@ -1202,68 +1448,134 @@ + /* + Rewinds the given file. This function is supported only for reading. + +- gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) ++ gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) + */ + ++/* + ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); ++ ++ Returns the starting position for the next gzread or gzwrite on the given ++ compressed file. This position represents a number of bytes in the ++ uncompressed data stream, and is zero when starting, even if appending or ++ reading a gzip stream from the middle of a file using gzdopen(). ++ ++ gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) ++*/ ++ + /* +- Returns the starting position for the next gzread or gzwrite on the +- given compressed file. This position represents a number of bytes in the +- uncompressed data stream. ++ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file)); + +- gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) ++ Returns the current offset in the file being read or written. This offset ++ includes the count of bytes that precede the gzip stream, for example when ++ appending or when using gzdopen() for reading. When reading, the offset ++ does not include as yet unused buffered input. This information can be used ++ for a progress indicator. On error, gzoffset() returns -1. + */ + + ZEXTERN int ZEXPORT gzeof OF((gzFile file)); + /* +- Returns 1 when EOF has previously been detected reading the given +- input stream, otherwise zero. ++ Returns true (1) if the end-of-file indicator has been set while reading, ++ false (0) otherwise. Note that the end-of-file indicator is set only if the ++ read tried to go past the end of the input, but came up short. Therefore, ++ just like feof(), gzeof() may return false even if there is no more data to ++ read, in the event that the last read request was for the exact number of ++ bytes remaining in the input file. This will happen if the input file size ++ is an exact multiple of the buffer size. ++ ++ If gzeof() returns true, then the read functions will return no more data, ++ unless the end-of-file indicator is reset by gzclearerr() and the input file ++ has grown since the previous end of file was detected. + */ + + ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); + /* +- Returns 1 if file is being read directly without decompression, otherwise +- zero. ++ Returns true (1) if file is being copied directly while reading, or false ++ (0) if file is a gzip stream being decompressed. ++ ++ If the input file is empty, gzdirect() will return true, since the input ++ does not contain a gzip stream. ++ ++ If gzdirect() is used immediately after gzopen() or gzdopen() it will ++ cause buffers to be allocated to allow reading the file to determine if it ++ is a gzip file. Therefore if gzbuffer() is used, it should be called before ++ gzdirect(). ++ ++ When writing, gzdirect() returns true (1) if transparent writing was ++ requested ("wT" for the gzopen() mode), or false (0) otherwise. (Note: ++ gzdirect() is not needed when writing. Transparent writing must be ++ explicitly requested, so the application already knows the answer. When ++ linking statically, using gzdirect() will include all of the zlib code for ++ gzip file reading and decompression, which may not be desired.) + */ + + ZEXTERN int ZEXPORT gzclose OF((gzFile file)); + /* +- Flushes all pending output if necessary, closes the compressed file +- and deallocates all the (de)compression state. The return value is the zlib +- error number (see function gzerror below). ++ Flushes all pending output if necessary, closes the compressed file and ++ deallocates the (de)compression state. Note that once file is closed, you ++ cannot call gzerror with file, since its structures have been deallocated. ++ gzclose must not be called more than once on the same file, just as free ++ must not be called more than once on the same allocation. ++ ++ gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a ++ file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the ++ last read ended in the middle of a gzip stream, or Z_OK on success. ++*/ ++ ++ZEXTERN int ZEXPORT gzclose_r OF((gzFile file)); ++ZEXTERN int ZEXPORT gzclose_w OF((gzFile file)); ++/* ++ Same as gzclose(), but gzclose_r() is only for use when reading, and ++ gzclose_w() is only for use when writing or appending. The advantage to ++ using these instead of gzclose() is that they avoid linking in zlib ++ compression or decompression code that is not used when only reading or only ++ writing respectively. If gzclose() is used, then both compression and ++ decompression code will be included the application when linking to a static ++ zlib library. + */ + + ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); + /* +- Returns the error message for the last error which occurred on the +- given compressed file. errnum is set to zlib error number. If an +- error occurred in the file system and not in the compression library, +- errnum is set to Z_ERRNO and the application may consult errno +- to get the exact error code. ++ Returns the error message for the last error which occurred on the given ++ compressed file. errnum is set to zlib error number. If an error occurred ++ in the file system and not in the compression library, errnum is set to ++ Z_ERRNO and the application may consult errno to get the exact error code. ++ ++ The application must not modify the returned string. Future calls to ++ this function may invalidate the previously returned string. If file is ++ closed, then the string previously returned by gzerror will no longer be ++ available. ++ ++ gzerror() should be used to distinguish errors from end-of-file for those ++ functions above that do not distinguish those cases in their return values. + */ + + ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); + /* +- Clears the error and end-of-file flags for file. This is analogous to the +- clearerr() function in stdio. This is useful for continuing to read a gzip ++ Clears the error and end-of-file flags for file. This is analogous to the ++ clearerr() function in stdio. This is useful for continuing to read a gzip + file that is being written concurrently. + */ + ++#endif /* !Z_SOLO */ ++ + /* checksum functions */ + + /* + These functions are not related to compression but are exported +- anyway because they might be useful in applications using the +- compression library. ++ anyway because they might be useful in applications using the compression ++ library. + */ + + ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); + /* + Update a running Adler-32 checksum with the bytes buf[0..len-1] and +- return the updated checksum. If buf is NULL, this function returns +- the required initial value for the checksum. +- An Adler-32 checksum is almost as reliable as a CRC32 but can be computed +- much faster. Usage example: ++ return the updated checksum. If buf is Z_NULL, this function returns the ++ required initial value for the checksum. ++ ++ An Adler-32 checksum is almost as reliable as a CRC32 but can be computed ++ much faster. ++ ++ Usage example: + + uLong adler = adler32(0L, Z_NULL, 0); + +@@ -1273,21 +1585,25 @@ + if (adler != original_adler) error(); + */ + ++/* + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, + z_off_t len2)); +-/* ++ + Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 + and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for + each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of +- seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. ++ seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. Note ++ that the z_off_t type (like off_t) is a signed integer. If len2 is ++ negative, the result has no meaning or utility. + */ + + ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); + /* + Update a running CRC-32 with the bytes buf[0..len-1] and return the +- updated CRC-32. If buf is NULL, this function returns the required initial +- value for the for the crc. Pre- and post-conditioning (one's complement) is ++ updated CRC-32. If buf is Z_NULL, this function returns the required ++ initial value for the crc. Pre- and post-conditioning (one's complement) is + performed within this function so it shouldn't be done by the application. ++ + Usage example: + + uLong crc = crc32(0L, Z_NULL, 0); +@@ -1298,9 +1614,9 @@ + if (crc != original_crc) error(); + */ + ++/* + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); + +-/* + Combine two CRC-32 check values into one. For two sequences of bytes, + seq1 and seq2 with lengths len1 and len2, CRC-32 check values were + calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 +@@ -1329,26 +1645,121 @@ + const char *version, + int stream_size)); + #define deflateInit(strm, level) \ +- deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream)) ++ deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) + #define inflateInit(strm) \ +- inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream)) ++ inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) + #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ +- (strategy), ZLIB_VERSION, sizeof(z_stream)) ++ (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) + #define inflateInit2(strm, windowBits) \ +- inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) ++ inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ ++ (int)sizeof(z_stream)) + #define inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ +- ZLIB_VERSION, sizeof(z_stream)) ++ ZLIB_VERSION, (int)sizeof(z_stream)) + ++#ifndef Z_SOLO + +-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) +- struct internal_state {int dummy;}; /* hack for buggy compilers */ ++/* gzgetc() macro and its supporting function and exposed data structure. Note ++ * that the real internal state is much larger than the exposed structure. ++ * This abbreviated structure exposes just enough for the gzgetc() macro. The ++ * user should not mess with these exposed elements, since their names or ++ * behavior could change in the future, perhaps even capriciously. They can ++ * only be used by the gzgetc() macro. You have been warned. ++ */ ++struct gzFile_s { ++ unsigned have; ++ unsigned char *next; ++ z_off64_t pos; ++}; ++ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ ++#ifdef Z_PREFIX_SET ++# undef z_gzgetc ++# define z_gzgetc(g) \ ++ ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) ++#else ++# define gzgetc(g) \ ++ ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) + #endif + ++/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or ++ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if ++ * both are true, the application gets the *64 functions, and the regular ++ * functions are changed to 64 bits) -- in case these are set on systems ++ * without large file support, _LFS64_LARGEFILE must also be true ++ */ ++#ifdef Z_LARGE64 ++ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); ++ ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); ++ ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); ++ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); ++ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t)); ++ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t)); ++#endif ++ ++#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64) ++# ifdef Z_PREFIX_SET ++# define z_gzopen z_gzopen64 ++# define z_gzseek z_gzseek64 ++# define z_gztell z_gztell64 ++# define z_gzoffset z_gzoffset64 ++# define z_adler32_combine z_adler32_combine64 ++# define z_crc32_combine z_crc32_combine64 ++# else ++# define gzopen gzopen64 ++# define gzseek gzseek64 ++# define gztell gztell64 ++# define gzoffset gzoffset64 ++# define adler32_combine adler32_combine64 ++# define crc32_combine crc32_combine64 ++# endif ++# ifndef Z_LARGE64 ++ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); ++ ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); ++ ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); ++ ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); ++ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); ++ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); ++# endif ++#else ++ ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); ++ ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); ++ ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); ++ ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); ++ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); ++ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); ++#endif ++ ++#else /* Z_SOLO */ ++ ++ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); ++ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); ++ ++#endif /* !Z_SOLO */ ++ ++/* hack for buggy compilers */ ++#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) ++ struct internal_state {int dummy;}; ++#endif ++ ++/* undocumented functions */ + ZEXTERN const char * ZEXPORT zError OF((int)); +-ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); +-ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); ++ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); ++ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void)); ++ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); ++ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); ++ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); ++#if defined(_WIN32) && !defined(Z_SOLO) ++ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, ++ const char *mode)); ++#endif ++#if defined(STDC) || defined(Z_HAVE_STDARG_H) ++# ifndef Z_SOLO ++ZEXTERN int ZEXPORTVA gzvprintf Z_ARG((gzFile file, ++ const char *format, ++ va_list va)); ++# endif ++#endif + + #ifdef __cplusplus + } +diff -r ee879c0ffa11 Modules/zlib/zlib.map +--- /dev/null ++++ b/Modules/zlib/zlib.map +@@ -0,0 +1,83 @@ ++ZLIB_1.2.0 { ++ global: ++ compressBound; ++ deflateBound; ++ inflateBack; ++ inflateBackEnd; ++ inflateBackInit_; ++ inflateCopy; ++ local: ++ deflate_copyright; ++ inflate_copyright; ++ inflate_fast; ++ inflate_table; ++ zcalloc; ++ zcfree; ++ z_errmsg; ++ gz_error; ++ gz_intmax; ++ _*; ++}; ++ ++ZLIB_1.2.0.2 { ++ gzclearerr; ++ gzungetc; ++ zlibCompileFlags; ++} ZLIB_1.2.0; ++ ++ZLIB_1.2.0.8 { ++ deflatePrime; ++} ZLIB_1.2.0.2; ++ ++ZLIB_1.2.2 { ++ adler32_combine; ++ crc32_combine; ++ deflateSetHeader; ++ inflateGetHeader; ++} ZLIB_1.2.0.8; ++ ++ZLIB_1.2.2.3 { ++ deflateTune; ++ gzdirect; ++} ZLIB_1.2.2; ++ ++ZLIB_1.2.2.4 { ++ inflatePrime; ++} ZLIB_1.2.2.3; ++ ++ZLIB_1.2.3.3 { ++ adler32_combine64; ++ crc32_combine64; ++ gzopen64; ++ gzseek64; ++ gztell64; ++ inflateUndermine; ++} ZLIB_1.2.2.4; ++ ++ZLIB_1.2.3.4 { ++ inflateReset2; ++ inflateMark; ++} ZLIB_1.2.3.3; ++ ++ZLIB_1.2.3.5 { ++ gzbuffer; ++ gzoffset; ++ gzoffset64; ++ gzclose_r; ++ gzclose_w; ++} ZLIB_1.2.3.4; ++ ++ZLIB_1.2.5.1 { ++ deflatePending; ++} ZLIB_1.2.3.5; ++ ++ZLIB_1.2.5.2 { ++ deflateResetKeep; ++ gzgetc_; ++ inflateResetKeep; ++} ZLIB_1.2.5.1; ++ ++ZLIB_1.2.7.1 { ++ inflateGetDictionary; ++ gzvprintf; ++} ZLIB_1.2.5.2; +diff -r ee879c0ffa11 Modules/zlib/zlib.pc.in +--- /dev/null ++++ b/Modules/zlib/zlib.pc.in +@@ -0,0 +1,13 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++sharedlibdir=@sharedlibdir@ ++includedir=@includedir@ ++ ++Name: zlib ++Description: zlib compression library ++Version: @VERSION@ ++ ++Requires: ++Libs: -L${libdir} -L${sharedlibdir} -lz ++Cflags: -I${includedir} +diff -r ee879c0ffa11 Modules/zlib/zutil.c +--- a/Modules/zlib/zutil.c ++++ b/Modules/zlib/zutil.c +@@ -1,17 +1,20 @@ + /* zutil.c -- target dependent utility functions for the compression library +- * Copyright (C) 1995-2005 Jean-loup Gailly. ++ * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + + /* @(#) $Id$ */ + + #include "zutil.h" ++#ifndef Z_SOLO ++# include "gzguts.h" ++#endif + + #ifndef NO_DUMMY_DECL + struct internal_state {int dummy;}; /* for buggy compilers */ + #endif + +-const char * const z_errmsg[10] = { ++z_const char * const z_errmsg[10] = { + "need dictionary", /* Z_NEED_DICT 2 */ + "stream end", /* Z_STREAM_END 1 */ + "", /* Z_OK 0 */ +@@ -34,25 +37,25 @@ + uLong flags; + + flags = 0; +- switch (sizeof(uInt)) { ++ switch ((int)(sizeof(uInt))) { + case 2: break; + case 4: flags += 1; break; + case 8: flags += 2; break; + default: flags += 3; + } +- switch (sizeof(uLong)) { ++ switch ((int)(sizeof(uLong))) { + case 2: break; + case 4: flags += 1 << 2; break; + case 8: flags += 2 << 2; break; + default: flags += 3 << 2; + } +- switch (sizeof(voidpf)) { ++ switch ((int)(sizeof(voidpf))) { + case 2: break; + case 4: flags += 1 << 4; break; + case 8: flags += 2 << 4; break; + default: flags += 3 << 4; + } +- switch (sizeof(z_off_t)) { ++ switch ((int)(sizeof(z_off_t))) { + case 2: break; + case 4: flags += 1 << 6; break; + case 8: flags += 2 << 6; break; +@@ -85,27 +88,27 @@ + #ifdef FASTEST + flags += 1L << 21; + #endif +-#ifdef STDC ++#if defined(STDC) || defined(Z_HAVE_STDARG_H) + # ifdef NO_vsnprintf +- flags += 1L << 25; ++ flags += 1L << 25; + # ifdef HAS_vsprintf_void +- flags += 1L << 26; ++ flags += 1L << 26; + # endif + # else + # ifdef HAS_vsnprintf_void +- flags += 1L << 26; ++ flags += 1L << 26; + # endif + # endif + #else +- flags += 1L << 24; ++ flags += 1L << 24; + # ifdef NO_snprintf +- flags += 1L << 25; ++ flags += 1L << 25; + # ifdef HAS_sprintf_void +- flags += 1L << 26; ++ flags += 1L << 26; + # endif + # else + # ifdef HAS_snprintf_void +- flags += 1L << 26; ++ flags += 1L << 26; + # endif + # endif + #endif +@@ -117,9 +120,9 @@ + # ifndef verbose + # define verbose 0 + # endif +-int z_verbose = verbose; ++int ZLIB_INTERNAL z_verbose = verbose; + +-void z_error (m) ++void ZLIB_INTERNAL z_error (m) + char *m; + { + fprintf(stderr, "%s\n", m); +@@ -146,7 +149,7 @@ + + #ifndef HAVE_MEMCPY + +-void zmemcpy(dest, source, len) ++void ZLIB_INTERNAL zmemcpy(dest, source, len) + Bytef* dest; + const Bytef* source; + uInt len; +@@ -157,7 +160,7 @@ + } while (--len != 0); + } + +-int zmemcmp(s1, s2, len) ++int ZLIB_INTERNAL zmemcmp(s1, s2, len) + const Bytef* s1; + const Bytef* s2; + uInt len; +@@ -170,7 +173,7 @@ + return 0; + } + +-void zmemzero(dest, len) ++void ZLIB_INTERNAL zmemzero(dest, len) + Bytef* dest; + uInt len; + { +@@ -181,6 +184,7 @@ + } + #endif + ++#ifndef Z_SOLO + + #ifdef SYS16BIT + +@@ -213,7 +217,7 @@ + * a protected system like OS/2. Use Microsoft C instead. + */ + +-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) ++voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) + { + voidpf buf = opaque; /* just to make some compilers happy */ + ulg bsize = (ulg)items*size; +@@ -237,7 +241,7 @@ + return buf; + } + +-void zcfree (voidpf opaque, voidpf ptr) ++void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) + { + int n; + if (*(ush*)&ptr != 0) { /* object < 64K */ +@@ -272,13 +276,13 @@ + # define _hfree hfree + #endif + +-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) ++voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) + { + if (opaque) opaque = 0; /* to make compiler happy */ + return _halloc((long)items, size); + } + +-void zcfree (voidpf opaque, voidpf ptr) ++void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) + { + if (opaque) opaque = 0; /* to make compiler happy */ + _hfree(ptr); +@@ -297,7 +301,7 @@ + extern void free OF((voidpf ptr)); + #endif + +-voidpf zcalloc (opaque, items, size) ++voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) + voidpf opaque; + unsigned items; + unsigned size; +@@ -307,7 +311,7 @@ + (voidpf)calloc(items, size); + } + +-void zcfree (opaque, ptr) ++void ZLIB_INTERNAL zcfree (opaque, ptr) + voidpf opaque; + voidpf ptr; + { +@@ -316,3 +320,5 @@ + } + + #endif /* MY_ZCALLOC */ ++ ++#endif /* !Z_SOLO */ +diff -r ee879c0ffa11 Modules/zlib/zutil.h +--- a/Modules/zlib/zutil.h ++++ b/Modules/zlib/zutil.h +@@ -1,5 +1,5 @@ + /* zutil.h -- internal interface and configuration of the compression library +- * Copyright (C) 1995-2005 Jean-loup Gailly. ++ * Copyright (C) 1995-2013 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +@@ -13,30 +13,24 @@ + #ifndef ZUTIL_H + #define ZUTIL_H + +-#define ZLIB_INTERNAL ++#ifdef HAVE_HIDDEN ++# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) ++#else ++# define ZLIB_INTERNAL ++#endif ++ + #include "zlib.h" + +-#ifdef STDC +-# ifndef _WIN32_WCE ++#if defined(STDC) && !defined(Z_SOLO) ++# if !(defined(_WIN32_WCE) && defined(_MSC_VER)) + # include + # endif + # include + # include + #endif +-#ifdef NO_ERRNO_H +-# ifdef _WIN32_WCE +- /* The Microsoft C Run-Time Library for Windows CE doesn't have +- * errno. We define it as a global variable to simplify porting. +- * Its value is always 0 and should not be used. We rename it to +- * avoid conflict with other libraries that use the same workaround. +- */ +-# define errno z_errno +-# endif +- extern int errno; +-#else +-# ifndef _WIN32_WCE +-# include +-# endif ++ ++#ifdef Z_SOLO ++ typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */ + #endif + + #ifndef local +@@ -50,13 +44,13 @@ + typedef ush FAR ushf; + typedef unsigned long ulg; + +-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ ++extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ + /* (size given to avoid silly warnings with Visual C++) */ + + #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] + + #define ERR_RETURN(strm,err) \ +- return (strm->msg = (char*)ERR_MSG(err), (err)) ++ return (strm->msg = ERR_MSG(err), (err)) + /* To be used only when the state is known to be valid */ + + /* common constants */ +@@ -88,16 +82,18 @@ + + #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) + # define OS_CODE 0x00 +-# if defined(__TURBOC__) || defined(__BORLANDC__) +-# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) +- /* Allow compilation with ANSI keywords only enabled */ +- void _Cdecl farfree( void *block ); +- void *_Cdecl farmalloc( unsigned long nbytes ); +-# else +-# include ++# ifndef Z_SOLO ++# if defined(__TURBOC__) || defined(__BORLANDC__) ++# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) ++ /* Allow compilation with ANSI keywords only enabled */ ++ void _Cdecl farfree( void *block ); ++ void *_Cdecl farmalloc( unsigned long nbytes ); ++# else ++# include ++# endif ++# else /* MSC or DJGPP */ ++# include + # endif +-# else /* MSC or DJGPP */ +-# include + # endif + #endif + +@@ -117,18 +113,20 @@ + + #ifdef OS2 + # define OS_CODE 0x06 +-# ifdef M_I86 +- #include ++# if defined(M_I86) && !defined(Z_SOLO) ++# include + # endif + #endif + + #if defined(MACOS) || defined(TARGET_OS_MAC) + # define OS_CODE 0x07 +-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os +-# include /* for fdopen */ +-# else +-# ifndef fdopen +-# define fdopen(fd,mode) NULL /* No fdopen() */ ++# ifndef Z_SOLO ++# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os ++# include /* for fdopen */ ++# else ++# ifndef fdopen ++# define fdopen(fd,mode) NULL /* No fdopen() */ ++# endif + # endif + # endif + #endif +@@ -151,7 +149,7 @@ + # define fdopen(fd,mode) NULL /* No fdopen() */ + #endif + +-#if (defined(_MSC_VER) && (_MSC_VER > 600)) ++#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX + # if defined(_WIN32_WCE) + # define fdopen(fd,mode) NULL /* No fdopen() */ + # ifndef _PTRDIFF_T_DEFINED +@@ -163,6 +161,19 @@ + # endif + #endif + ++#if defined(__BORLANDC__) && !defined(MSDOS) ++ #pragma warn -8004 ++ #pragma warn -8008 ++ #pragma warn -8066 ++#endif ++ ++/* provide prototypes for these when building zlib without LFS */ ++#if !defined(_WIN32) && \ ++ (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) ++ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); ++ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); ++#endif ++ + /* common defaults */ + + #ifndef OS_CODE +@@ -175,40 +186,7 @@ + + /* functions */ + +-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) +-# ifndef HAVE_VSNPRINTF +-# define HAVE_VSNPRINTF +-# endif +-#endif +-#if defined(__CYGWIN__) +-# ifndef HAVE_VSNPRINTF +-# define HAVE_VSNPRINTF +-# endif +-#endif +-#ifndef HAVE_VSNPRINTF +-# ifdef MSDOS +- /* vsnprintf may exist on some MS-DOS compilers (DJGPP?), +- but for now we just assume it doesn't. */ +-# define NO_vsnprintf +-# endif +-# ifdef __TURBOC__ +-# define NO_vsnprintf +-# endif +-# ifdef WIN32 +- /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ +-# if !defined(vsnprintf) && !defined(NO_vsnprintf) +-# define vsnprintf _vsnprintf +-# endif +-# endif +-# ifdef __SASC +-# define NO_vsnprintf +-# endif +-#endif +-#ifdef VMS +-# define NO_vsnprintf +-#endif +- +-#if defined(pyr) ++#if defined(pyr) || defined(Z_SOLO) + # define NO_MEMCPY + #endif + #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) +@@ -232,16 +210,16 @@ + # define zmemzero(dest, len) memset(dest, 0, len) + # endif + #else +- extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); +- extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); +- extern void zmemzero OF((Bytef* dest, uInt len)); ++ void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); ++ int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); ++ void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len)); + #endif + + /* Diagnostic functions */ + #ifdef DEBUG + # include +- extern int z_verbose; +- extern void z_error OF((char *m)); ++ extern int ZLIB_INTERNAL z_verbose; ++ extern void ZLIB_INTERNAL z_error OF((char *m)); + # define Assert(cond,msg) {if(!(cond)) z_error(msg);} + # define Trace(x) {if (z_verbose>=0) fprintf x ;} + # define Tracev(x) {if (z_verbose>0) fprintf x ;} +@@ -257,13 +235,19 @@ + # define Tracecv(c,x) + #endif + +- +-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); +-void zcfree OF((voidpf opaque, voidpf ptr)); ++#ifndef Z_SOLO ++ voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items, ++ unsigned size)); ++ void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr)); ++#endif + + #define ZALLOC(strm, items, size) \ + (*((strm)->zalloc))((strm)->opaque, (items), (size)) + #define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) + #define TRY_FREE(s, p) {if (p) ZFREE(s, p);} + ++/* Reverse the bytes in a 32-bit value */ ++#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ ++ (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) ++ + #endif /* ZUTIL_H */ +diff -r ee879c0ffa11 Objects/classobject.c +--- a/Objects/classobject.c ++++ b/Objects/classobject.c +@@ -4,7 +4,7 @@ + #include "Python.h" + #include "structmember.h" + +-/* Free list for method objects to safe malloc/free overhead ++/* Free list for method objects to save malloc/free overhead + * The im_self element is used to chain the elements. + */ + static PyMethodObject *free_list; +diff -r ee879c0ffa11 Objects/complexobject.c +--- a/Objects/complexobject.c ++++ b/Objects/complexobject.c +@@ -96,7 +96,7 @@ + const double abs_breal = b.real < 0 ? -b.real : b.real; + const double abs_bimag = b.imag < 0 ? -b.imag : b.imag; + +- if (abs_breal >= abs_bimag) { ++ if (abs_breal >= abs_bimag) { + /* divide tops and bottom by b.real */ + if (abs_breal == 0.0) { + errno = EDOM; +@@ -109,7 +109,7 @@ + r.imag = (a.imag - a.real * ratio) / denom; + } + } +- else { ++ else if (abs_bimag >= abs_breal) { + /* divide tops and bottom by b.imag */ + const double ratio = b.real / b.imag; + const double denom = b.real * ratio + b.imag; +@@ -117,6 +117,10 @@ + r.real = (a.real * ratio + a.imag) / denom; + r.imag = (a.imag * ratio - a.real) / denom; + } ++ else { ++ /* At least one of b.real or b.imag is a NaN */ ++ r.real = r.imag = Py_NAN; ++ } + return r; + } + +diff -r ee879c0ffa11 Objects/fileobject.c +--- a/Objects/fileobject.c ++++ b/Objects/fileobject.c +@@ -2236,7 +2236,7 @@ + (unless at EOF) and no more than bufsize. Returns negative value on + error, will set MemoryError if bufsize bytes cannot be allocated. */ + static int +-readahead(PyFileObject *f, int bufsize) ++readahead(PyFileObject *f, Py_ssize_t bufsize) + { + Py_ssize_t chunksize; + +@@ -2274,7 +2274,7 @@ + logarithmic buffer growth to about 50 even when reading a 1gb line. */ + + static PyStringObject * +-readahead_get_line_skip(PyFileObject *f, int skip, int bufsize) ++readahead_get_line_skip(PyFileObject *f, Py_ssize_t skip, Py_ssize_t bufsize) + { + PyStringObject* s; + char *bufptr; +@@ -2294,10 +2294,10 @@ + bufptr++; /* Count the '\n' */ + len = bufptr - f->f_bufptr; + s = (PyStringObject *) +- PyString_FromStringAndSize(NULL, skip+len); ++ PyString_FromStringAndSize(NULL, skip + len); + if (s == NULL) + return NULL; +- memcpy(PyString_AS_STRING(s)+skip, f->f_bufptr, len); ++ memcpy(PyString_AS_STRING(s) + skip, f->f_bufptr, len); + f->f_bufptr = bufptr; + if (bufptr == f->f_bufend) + drop_readahead(f); +@@ -2305,14 +2305,13 @@ + bufptr = f->f_bufptr; + buf = f->f_buf; + f->f_buf = NULL; /* Force new readahead buffer */ +- assert(skip+len < INT_MAX); +- s = readahead_get_line_skip( +- f, (int)(skip+len), bufsize + (bufsize>>2) ); ++ assert(len <= PY_SSIZE_T_MAX - skip); ++ s = readahead_get_line_skip(f, skip + len, bufsize + (bufsize>>2)); + if (s == NULL) { + PyMem_Free(buf); + return NULL; + } +- memcpy(PyString_AS_STRING(s)+skip, bufptr, len); ++ memcpy(PyString_AS_STRING(s) + skip, bufptr, len); + PyMem_Free(buf); + } + return s; +diff -r ee879c0ffa11 Objects/stringobject.c +--- a/Objects/stringobject.c ++++ b/Objects/stringobject.c +@@ -926,13 +926,14 @@ + PyString_Repr(PyObject *obj, int smartquotes) + { + register PyStringObject* op = (PyStringObject*) obj; +- size_t newsize = 2 + 4 * Py_SIZE(op); ++ size_t newsize; + PyObject *v; +- if (newsize > PY_SSIZE_T_MAX || newsize / 4 != Py_SIZE(op)) { ++ if (Py_SIZE(op) > (PY_SSIZE_T_MAX - 2)/4) { + PyErr_SetString(PyExc_OverflowError, + "string is too large to make repr"); + return NULL; + } ++ newsize = 2 + 4*Py_SIZE(op); + v = PyString_FromStringAndSize((char *)NULL, newsize); + if (v == NULL) { + return NULL; +@@ -1594,7 +1595,7 @@ + Py_ssize_t i; + PyObject *seq, *item; + +- seq = PySequence_Fast(orig, ""); ++ seq = PySequence_Fast(orig, "can only join an iterable"); + if (seq == NULL) { + return NULL; + } +diff -r ee879c0ffa11 Objects/typeobject.c +--- a/Objects/typeobject.c ++++ b/Objects/typeobject.c +@@ -5993,9 +5993,9 @@ + BINSLOT("__truediv__", nb_true_divide, slot_nb_true_divide, "/"), + RBINSLOT("__rtruediv__", nb_true_divide, slot_nb_true_divide, "/"), + IBSLOT("__ifloordiv__", nb_inplace_floor_divide, +- slot_nb_inplace_floor_divide, wrap_binaryfunc, "//"), ++ slot_nb_inplace_floor_divide, wrap_binaryfunc, "//="), + IBSLOT("__itruediv__", nb_inplace_true_divide, +- slot_nb_inplace_true_divide, wrap_binaryfunc, "/"), ++ slot_nb_inplace_true_divide, wrap_binaryfunc, "/="), + NBSLOT("__index__", nb_index, slot_nb_index, wrap_unaryfunc, + "x[y:z] <==> x[y.__index__():z.__index__()]"), + MPSLOT("__len__", mp_length, slot_mp_length, wrap_lenfunc, +diff -r ee879c0ffa11 Objects/unicodeobject.c +--- a/Objects/unicodeobject.c ++++ b/Objects/unicodeobject.c +@@ -690,7 +690,12 @@ + *fmt = '\0'; + } + +-#define appendstring(string) {for (copy = string;*copy;) *s++ = *copy++;} ++#define appendstring(string) \ ++ do { \ ++ for (copy = string;*copy; copy++) { \ ++ *s++ = (unsigned char)*copy; \ ++ } \ ++ } while (0) + + PyObject * + PyUnicode_FromFormatV(const char *format, va_list vargs) +@@ -845,7 +850,7 @@ + str = PyObject_Str(obj); + if (!str) + goto fail; +- n += PyUnicode_GET_SIZE(str); ++ n += PyString_GET_SIZE(str); + /* Remember the str and switch to the next slot */ + *callresult++ = str; + break; +@@ -1006,15 +1011,10 @@ + case 'S': + case 'R': + { +- Py_UNICODE *ucopy; +- Py_ssize_t usize; +- Py_ssize_t upos; ++ const char *str = PyString_AS_STRING(*callresult); + /* unused, since we already have the result */ + (void) va_arg(vargs, PyObject *); +- ucopy = PyUnicode_AS_UNICODE(*callresult); +- usize = PyUnicode_GET_SIZE(*callresult); +- for (upos = 0; upos forget it */ + Py_DECREF(*callresult); + /* switch to next unicode()/repr() result */ +@@ -1510,9 +1510,15 @@ + when there are no errors in the rest of the string) */ + repptr = PyUnicode_AS_UNICODE(repunicode); + repsize = PyUnicode_GET_SIZE(repunicode); +- requiredsize = *outpos + repsize + insize-newpos; ++ requiredsize = *outpos; ++ if (requiredsize > PY_SSIZE_T_MAX - repsize) ++ goto overflow; ++ requiredsize += repsize; ++ if (requiredsize > PY_SSIZE_T_MAX - (insize - newpos)) ++ goto overflow; ++ requiredsize += insize - newpos; + if (requiredsize > outsize) { +- if (requiredsize<2*outsize) ++ if (outsize <= PY_SSIZE_T_MAX/2 && requiredsize < 2*outsize) + requiredsize = 2*outsize; + if (_PyUnicode_Resize(output, requiredsize) < 0) + goto onError; +@@ -1529,6 +1535,11 @@ + onError: + Py_XDECREF(restuple); + return res; ++ ++ overflow: ++ PyErr_SetString(PyExc_OverflowError, ++ "decoded result is too long for a Python string"); ++ goto onError; + } + + /* --- UTF-7 Codec -------------------------------------------------------- */ +@@ -3646,7 +3657,7 @@ + const Py_UNICODE *collstart = p; + const Py_UNICODE *collend = p; + /* find all unecodable characters */ +- while ((collend < endp) && ((*collend)>=limit)) ++ while ((collend < endp) && ((*collend) >= limit)) + ++collend; + /* cache callback name lookup (if not done yet, i.e. it's the first error) */ + if (known_errorHandler==-1) { +@@ -3666,34 +3677,41 @@ + raise_encode_exception(&exc, encoding, startp, size, collstart-startp, collend-startp, reason); + goto onError; + case 2: /* replace */ +- while (collstart++ PY_SSIZE_T_MAX - incr) ++ goto overflow; ++ requiredsize += incr; + } +- requiredsize = respos+repsize+(endp-collend); ++ if (requiredsize > PY_SSIZE_T_MAX - (endp - collend)) ++ goto overflow; ++ requiredsize += endp - collend; + if (requiredsize > ressize) { +- if (requiredsize<2*ressize) ++ if (ressize <= PY_SSIZE_T_MAX/2 && requiredsize < 2*ressize) + requiredsize = 2*ressize; + if (_PyString_Resize(&res, requiredsize)) + goto onError; +@@ -3716,11 +3734,16 @@ + /* need more space? (at least enough for what we have+the + replacement+the rest of the string, so we won't have to + check space for encodable characters) */ +- respos = str-PyString_AS_STRING(res); ++ respos = str - PyString_AS_STRING(res); + repsize = PyUnicode_GET_SIZE(repunicode); +- requiredsize = respos+repsize+(endp-collend); ++ if (respos > PY_SSIZE_T_MAX - repsize) ++ goto overflow; ++ requiredsize = respos + repsize; ++ if (requiredsize > PY_SSIZE_T_MAX - (endp - collend)) ++ goto overflow; ++ requiredsize += endp - collend; + if (requiredsize > ressize) { +- if (requiredsize<2*ressize) ++ if (ressize <= PY_SSIZE_T_MAX/2 && requiredsize < 2*ressize) + requiredsize = 2*ressize; + if (_PyString_Resize(&res, requiredsize)) { + Py_DECREF(repunicode); +@@ -3731,7 +3754,7 @@ + } + /* check if there is anything unencodable in the replacement + and copy it to the output */ +- for (uni2 = PyUnicode_AS_UNICODE(repunicode);repsize-->0; ++uni2, ++str) { ++ for (uni2 = PyUnicode_AS_UNICODE(repunicode); repsize-->0; ++uni2, ++str) { + c = *uni2; + if (c >= limit) { + raise_encode_exception(&exc, encoding, startp, size, +@@ -3747,14 +3770,18 @@ + } + } + /* Resize if we allocated to much */ +- respos = str-PyString_AS_STRING(res); +- if (respos + + ++ RelativePath="..\..\Modules\zlib\gzclose.c"> ++ ++ ++ ++ ++ ++ + + +diff -r ee879c0ffa11 PC/VS8.0/pythoncore.vcproj +--- a/PC/VS8.0/pythoncore.vcproj ++++ b/PC/VS8.0/pythoncore.vcproj +@@ -1218,7 +1218,19 @@ + > + + ++ ++ ++ ++ ++ ++ + + ob_type->tp_as_buffer; +diff -r ee879c0ffa11 PC/pyconfig.h +--- a/PC/pyconfig.h ++++ b/PC/pyconfig.h +@@ -217,7 +217,11 @@ + #define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X)) + #define Py_IS_FINITE(X) _finite(X) + #define copysign _copysign ++ ++/* VS 2010 and above already defines hypot as _hypot */ ++#if _MSC_VER < 1600 + #define hypot _hypot ++#endif + + #endif /* _MSC_VER */ + +@@ -435,6 +439,11 @@ + /* Define to 1 if you have the `copysign' function. */ + #define HAVE_COPYSIGN 1 + ++/* Define to 1 if you have the `round' function. */ ++#if _MSC_VER >= 1800 ++#define HAVE_ROUND 1 ++#endif ++ + /* Define to 1 if you have the `isinf' macro. */ + #define HAVE_DECL_ISINF 1 + +diff -r ee879c0ffa11 PCbuild/_ssl.vcproj +--- a/PCbuild/_ssl.vcproj ++++ b/PCbuild/_ssl.vcproj +@@ -57,7 +57,7 @@ + /> + + + + + + + + + + + + + + + + + + + + + + ++ ++ ++ ++ ++ ++ + + + + +- +\ No newline at end of file ++ +diff -r ee879c0ffa11 PCbuild/readme.txt +--- a/PCbuild/readme.txt ++++ b/PCbuild/readme.txt +@@ -112,9 +112,9 @@ + Wraps the Tk windowing system. Unlike _bsddb and _sqlite3, there's no + corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's + within our pcbuild.sln, which means this module expects to find a +- pre-built Tcl/Tk in either ..\..\tcltk for 32-bit or ..\..\tcltk64 for +- 64-bit (relative to this directory). See below for instructions to build +- Tcl/Tk. ++ pre-built Tcl/Tk in either ..\externals\tcltk for 32-bit or ++ ..\externals\tcltk64 for 64-bit (relative to this directory). See below ++ for instructions to build Tcl/Tk. + bz2 + Python wrapper for the libbz2 compression library. Homepage + http://sources.redhat.com/bzip2/ +@@ -132,7 +132,7 @@ + + Get the source code through + +- svn export http://svn.python.org/projects/external/openssl-1.0.1h ++ svn export http://svn.python.org/projects/external/openssl-1.0.1j + + ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for + obtaining external sources then you don't need to manually get the source +@@ -144,7 +144,9 @@ + + You must install the NASM assembler from + http://nasm.sf.net +- for x86 builds. Put nasm.exe anywhere in your PATH. ++ for x86 builds. Put nasm.exe anywhere in your PATH. If you use the ++ Tools\buildbot\external(-amd64).bat method for getting sources, it also ++ downloads a version of NASM, which the ssl build script will add to PATH. + + You can also install ActivePerl from + http://www.activestate.com/activeperl/ +@@ -184,8 +186,8 @@ + + This extracts all the external subprojects from http://svn.python.org/external + via Subversion (so you'll need an svn.exe on your PATH) and places them in +-..\.. (relative to this directory). The external(-amd64).bat scripts will +-also build a debug build of Tcl/Tk; there aren't any equivalent batch files ++..\externals (relative to this directory). The external(-amd64).bat scripts ++will also build a debug build of Tcl/Tk; there aren't any equivalent batch files + for building release versions of Tcl/Tk lying around in the Tools\buildbot + directory. If you need to build a release version of Tcl/Tk it isn't hard + though, take a look at the relevant external(-amd64).bat file and find the +@@ -206,36 +208,6 @@ + _bsddb.vcproj and sqlite3.vcproj files, which will remove the need for + Tcl/Tk to be built separately via a batch file. + +-XXX trent.nelson 02-Apr-08: +- Having the external subprojects in ..\.. relative to this directory is a +- bit of a nuisance when you're working on py3k and trunk in parallel and +- your directory layout mimics that of Python's subversion layout, e.g.: +- +- C:\..\svn.python.org\projects\python\trunk +- C:\..\svn.python.org\projects\python\branches\py3k +- C:\..\svn.python.org\projects\python\branches\release25-maint +- +- I'd like to change things so that external subprojects are fetched from +- ..\external instead of ..\.., then provide some helper scripts or batch +- files that would set up a new ..\external directory with svn checkouts of +- the relevant branches in http://svn.python.org/projects/external/, or +- alternatively, use junctions to link ..\external with a pre-existing +- externals directory being used by another branch. i.e. if I'm usually +- working on trunk (and have previously created trunk\external via the +- provided batch file), and want to do some work on py3k, I'd set up a +- junction as follows (using the directory structure above as an example): +- +- C:\..\python\trunk\external <- already exists and has built versions +- of the external subprojects +- +- C:\..\python\branches\py3k>linkd.exe external ..\..\trunk\external +- Link created at: external +- +- Only a slight tweak would be needed to the buildbots such that bots +- building trunk and py3k could make use of the same facility. (2.5.x +- builds need to be kept separate as they're using Visual Studio 7.1.) +-/XXX trent.nelson 02-Apr-08 +- + Building for Itanium + -------------------- + +diff -r ee879c0ffa11 PCbuild/rt.bat +--- a/PCbuild/rt.bat ++++ b/PCbuild/rt.bat +@@ -38,7 +38,7 @@ + if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts + if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts + +-PATH %PATH%;%~dp0..\..\%tcltk%\bin ++PATH %PATH%;%~dp0..\externals\%tcltk%\bin + set exe=%prefix%\python%suffix% + set cmd=%exe% %dashO% -Wd -3 -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 + if defined qmode goto Qmode +diff -r ee879c0ffa11 Parser/tokenizer.c +--- a/Parser/tokenizer.c ++++ b/Parser/tokenizer.c +@@ -259,11 +259,25 @@ + char * cs; + int r = 1; + +- if (tok->cont_line) ++ if (tok->cont_line) { + /* It's a continuation line, so it can't be a coding spec. */ ++ tok->read_coding_spec = 1; + return 1; ++ } + cs = get_coding_spec(line, size); +- if (cs != NULL) { ++ if (!cs) { ++ Py_ssize_t i; ++ for (i = 0; i < size; i++) { ++ if (line[i] == '#' || line[i] == '\n' || line[i] == '\r') ++ break; ++ if (line[i] != ' ' && line[i] != '\t' && line[i] != '\014') { ++ /* Stop checking coding spec after a line containing ++ * anything except a comment. */ ++ tok->read_coding_spec = 1; ++ break; ++ } ++ } ++ } else { + tok->read_coding_spec = 1; + if (tok->encoding == NULL) { + assert(tok->decoding_state == 1); /* raw */ +@@ -688,7 +702,7 @@ + if (newl[0]) { + if (!check_coding_spec(str, newl[0] - str, tok, buf_setreadl)) + return error_ret(tok); +- if (tok->enc == NULL && newl[1]) { ++ if (tok->enc == NULL && !tok->read_coding_spec && newl[1]) { + if (!check_coding_spec(newl[0]+1, newl[1] - newl[0], + tok, buf_setreadl)) + return error_ret(tok); +diff -r ee879c0ffa11 Python/_warnings.c +--- a/Python/_warnings.c ++++ b/Python/_warnings.c +@@ -905,6 +905,7 @@ + _default_action = PyString_FromString("default"); + if (_default_action == NULL) + return; ++ Py_INCREF(_default_action); + if (PyModule_AddObject(m, "default_action", _default_action) < 0) + return; + } +diff -r ee879c0ffa11 Python/ast.c +--- a/Python/ast.c ++++ b/Python/ast.c +@@ -2679,6 +2679,18 @@ + expr1 = ast_for_expr(c, CHILD(n, 1)); + if (!expr1) + return NULL; ++ ++ if (expr1->kind == Tuple_kind && n_children < 4 && ++ (asdl_seq_LEN(expr1->v.Tuple.elts) == 2 || ++ asdl_seq_LEN(expr1->v.Tuple.elts) == 3)) { ++ /* Backwards compatibility: passing exec args as a tuple */ ++ globals = asdl_seq_GET(expr1->v.Tuple.elts, 1); ++ if (asdl_seq_LEN(expr1->v.Tuple.elts) == 3) { ++ locals = asdl_seq_GET(expr1->v.Tuple.elts, 2); ++ } ++ expr1 = asdl_seq_GET(expr1->v.Tuple.elts, 0); ++ } ++ + if (n_children >= 4) { + globals = ast_for_expr(c, CHILD(n, 3)); + if (!globals) +diff -r ee879c0ffa11 Python/codecs.c +--- a/Python/codecs.c ++++ b/Python/codecs.c +@@ -558,7 +558,7 @@ + Py_UNICODE *startp; + Py_UNICODE *e; + Py_UNICODE *outp; +- int ressize; ++ Py_ssize_t ressize; + if (PyUnicodeEncodeError_GetStart(exc, &start)) + return NULL; + if (PyUnicodeEncodeError_GetEnd(exc, &end)) +@@ -566,6 +566,13 @@ + if (!(object = PyUnicodeEncodeError_GetObject(exc))) + return NULL; + startp = PyUnicode_AS_UNICODE(object); ++ if (end - start > PY_SSIZE_T_MAX / (2+7+1)) { ++ end = start + PY_SSIZE_T_MAX / (2+7+1); ++#ifndef Py_UNICODE_WIDE ++ if (0xD800 <= startp[end - 1] && startp[end - 1] <= 0xDBFF) ++ end--; ++#endif ++ } + e = startp + end; + for (p = startp+start, ressize = 0; p < e;) { + Py_UCS4 ch = *p++; +@@ -675,13 +682,15 @@ + Py_UNICODE *p; + Py_UNICODE *startp; + Py_UNICODE *outp; +- int ressize; ++ Py_ssize_t ressize; + if (PyUnicodeEncodeError_GetStart(exc, &start)) + return NULL; + if (PyUnicodeEncodeError_GetEnd(exc, &end)) + return NULL; + if (!(object = PyUnicodeEncodeError_GetObject(exc))) + return NULL; ++ if (end - start > PY_SSIZE_T_MAX / (1+1+8)) ++ end = start + PY_SSIZE_T_MAX / (1+1+8); + startp = PyUnicode_AS_UNICODE(object); + for (p = startp+start, ressize = 0; p < startp+end; ++p) { + #ifdef Py_UNICODE_WIDE +@@ -696,8 +705,10 @@ + ressize += 1+1+2; + } + res = PyUnicode_FromUnicode(NULL, ressize); +- if (res==NULL) ++ if (res == NULL) { ++ Py_DECREF(object); + return NULL; ++ } + for (p = startp+start, outp = PyUnicode_AS_UNICODE(res); + p < startp+end; ++p) { + Py_UNICODE c = *p; +diff -r ee879c0ffa11 Python/pythonrun.c +--- a/Python/pythonrun.c ++++ b/Python/pythonrun.c +@@ -536,6 +536,7 @@ + PyInt_Fini(); + PyFloat_Fini(); + PyDict_Fini(); ++ _PyRandom_Fini(); + + #ifdef Py_USING_UNICODE + /* Cleanup Unicode implementation */ +diff -r ee879c0ffa11 Python/random.c +--- a/Python/random.c ++++ b/Python/random.c +@@ -118,10 +118,16 @@ + + #if !defined(MS_WINDOWS) && !defined(__VMS) + ++static struct { ++ int fd; ++ dev_t st_dev; ++ ino_t st_ino; ++} urandom_cache = { -1 }; ++ + /* Read size bytes from /dev/urandom into buffer. + Call Py_FatalError() on error. */ + static void +-dev_urandom_noraise(char *buffer, Py_ssize_t size) ++dev_urandom_noraise(unsigned char *buffer, Py_ssize_t size) + { + int fd; + Py_ssize_t n; +@@ -156,22 +162,56 @@ + { + int fd; + Py_ssize_t n; ++ struct stat st; + + if (size <= 0) + return 0; + +- Py_BEGIN_ALLOW_THREADS +- fd = open("/dev/urandom", O_RDONLY); +- Py_END_ALLOW_THREADS +- if (fd < 0) +- { +- if (errno == ENOENT || errno == ENXIO || +- errno == ENODEV || errno == EACCES) +- PyErr_SetString(PyExc_NotImplementedError, +- "/dev/urandom (or equivalent) not found"); +- else +- PyErr_SetFromErrno(PyExc_OSError); +- return -1; ++ if (urandom_cache.fd >= 0) { ++ /* Does the fd point to the same thing as before? (issue #21207) */ ++ if (fstat(urandom_cache.fd, &st) ++ || st.st_dev != urandom_cache.st_dev ++ || st.st_ino != urandom_cache.st_ino) { ++ /* Something changed: forget the cached fd (but don't close it, ++ since it probably points to something important for some ++ third-party code). */ ++ urandom_cache.fd = -1; ++ } ++ } ++ if (urandom_cache.fd >= 0) ++ fd = urandom_cache.fd; ++ else { ++ Py_BEGIN_ALLOW_THREADS ++ fd = open("/dev/urandom", O_RDONLY); ++ Py_END_ALLOW_THREADS ++ if (fd < 0) ++ { ++ if (errno == ENOENT || errno == ENXIO || ++ errno == ENODEV || errno == EACCES) ++ PyErr_SetString(PyExc_NotImplementedError, ++ "/dev/urandom (or equivalent) not found"); ++ else ++ PyErr_SetFromErrno(PyExc_OSError); ++ return -1; ++ } ++ if (urandom_cache.fd >= 0) { ++ /* urandom_fd was initialized by another thread while we were ++ not holding the GIL, keep it. */ ++ close(fd); ++ fd = urandom_cache.fd; ++ } ++ else { ++ if (fstat(fd, &st)) { ++ PyErr_SetFromErrno(PyExc_OSError); ++ close(fd); ++ return -1; ++ } ++ else { ++ urandom_cache.fd = fd; ++ urandom_cache.st_dev = st.st_dev; ++ urandom_cache.st_ino = st.st_ino; ++ } ++ } + } + + Py_BEGIN_ALLOW_THREADS +@@ -195,12 +235,21 @@ + PyErr_Format(PyExc_RuntimeError, + "Failed to read %zi bytes from /dev/urandom", + size); +- close(fd); + return -1; + } +- close(fd); + return 0; + } ++ ++static void ++dev_urandom_close(void) ++{ ++ if (urandom_cache.fd >= 0) { ++ close(urandom_cache.fd); ++ urandom_cache.fd = -1; ++ } ++} ++ ++ + #endif /* !defined(MS_WINDOWS) && !defined(__VMS) */ + + /* Fill buffer with pseudo-random bytes generated by a linear congruent +@@ -305,8 +354,21 @@ + # ifdef __VMS + vms_urandom((unsigned char *)secret, secret_size, 0); + # else +- dev_urandom_noraise((char*)secret, secret_size); ++ dev_urandom_noraise((unsigned char*)secret, secret_size); + # endif + #endif + } + } ++ ++void ++_PyRandom_Fini(void) ++{ ++#ifdef MS_WINDOWS ++ if (hCryptProv) { ++ CryptReleaseContext(hCryptProv, 0); ++ hCryptProv = 0; ++ } ++#else ++ dev_urandom_close(); ++#endif ++} +diff -r ee879c0ffa11 Python/symtable.c +--- a/Python/symtable.c ++++ b/Python/symtable.c +@@ -504,7 +504,7 @@ + case OPT_BARE_EXEC: + PyOS_snprintf(buf, sizeof(buf), + "unqualified exec is not allowed in function " +- "'%.100s' it %s", ++ "'%.100s' because it %s", + PyString_AS_STRING(ste->ste_name), trailer); + break; + default: +diff -r ee879c0ffa11 Python/sysmodule.c +--- a/Python/sysmodule.c ++++ b/Python/sysmodule.c +@@ -684,32 +684,20 @@ + } + #endif /* USE_MALLOPT */ + +-static PyObject * +-sys_getsizeof(PyObject *self, PyObject *args, PyObject *kwds) ++size_t ++_PySys_GetSizeOf(PyObject *o) + { ++ static PyObject *str__sizeof__ = NULL; + PyObject *res = NULL; +- static PyObject *str__sizeof__ = NULL, *gc_head_size = NULL; +- static char *kwlist[] = {"object", "default", 0}; +- PyObject *o, *dflt = NULL; +- +- if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:getsizeof", +- kwlist, &o, &dflt)) +- return NULL; +- +- /* Initialize static variable for GC head size */ +- if (gc_head_size == NULL) { +- gc_head_size = PyInt_FromSsize_t(sizeof(PyGC_Head)); +- if (gc_head_size == NULL) +- return NULL; +- } ++ Py_ssize_t size; + + /* Make sure the type is initialized. float gets initialized late */ + if (PyType_Ready(Py_TYPE(o)) < 0) +- return NULL; ++ return (size_t)-1; + + /* Instance of old-style class */ + if (PyInstance_Check(o)) +- res = PyInt_FromSsize_t(PyInstance_Type.tp_basicsize); ++ size = PyInstance_Type.tp_basicsize; + /* all other objects */ + else { + PyObject *method = _PyObject_LookupSpecial(o, "__sizeof__", +@@ -724,26 +712,52 @@ + res = PyObject_CallFunctionObjArgs(method, NULL); + Py_DECREF(method); + } ++ ++ if (res == NULL) ++ return (size_t)-1; ++ ++ size = (size_t)PyInt_AsSsize_t(res); ++ Py_DECREF(res); ++ if (size == -1 && PyErr_Occurred()) ++ return (size_t)-1; + } + +- /* Has a default value been given? */ +- if ((res == NULL) && (dflt != NULL) && +- PyErr_ExceptionMatches(PyExc_TypeError)) +- { +- PyErr_Clear(); +- Py_INCREF(dflt); +- return dflt; ++ if (size < 0) { ++ PyErr_SetString(PyExc_ValueError, "__sizeof__() should return >= 0"); ++ return (size_t)-1; + } +- else if (res == NULL) +- return res; + + /* add gc_head size */ +- if (PyObject_IS_GC(o)) { +- PyObject *tmp = res; +- res = PyNumber_Add(tmp, gc_head_size); +- Py_DECREF(tmp); ++ if (PyObject_IS_GC(o)) ++ return ((size_t)size) + sizeof(PyGC_Head); ++ return (size_t)size; ++} ++ ++static PyObject * ++sys_getsizeof(PyObject *self, PyObject *args, PyObject *kwds) ++{ ++ static char *kwlist[] = {"object", "default", 0}; ++ size_t size; ++ PyObject *o, *dflt = NULL; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:getsizeof", ++ kwlist, &o, &dflt)) ++ return NULL; ++ ++ size = _PySys_GetSizeOf(o); ++ ++ if (size == (size_t)-1 && PyErr_Occurred()) { ++ /* Has a default value been given */ ++ if (dflt != NULL && PyErr_ExceptionMatches(PyExc_TypeError)) { ++ PyErr_Clear(); ++ Py_INCREF(dflt); ++ return dflt; ++ } ++ else ++ return NULL; + } +- return res; ++ ++ return PyInt_FromSize_t(size); + } + + PyDoc_STRVAR(getsizeof_doc, +diff -r ee879c0ffa11 Tools/buildbot/external-amd64.bat +--- a/Tools/buildbot/external-amd64.bat ++++ b/Tools/buildbot/external-amd64.bat +@@ -6,23 +6,23 @@ + + if not exist tcltk64\bin\tcl85g.dll ( + cd tcl-8.5.15.0\win +- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all +- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install ++ nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all ++ nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install + cd ..\.. + ) + + if not exist tcltk64\bin\tk85g.dll ( + cd tk-8.5.15.0\win +- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 clean +- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 all +- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 install ++ nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 clean ++ nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 all ++ nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 install + cd ..\.. + ) + + if not exist tcltk64\lib\tix8.4.3\tix84g.dll ( + cd tix-8.4.3.5\win +- nmake -f python.mak DEBUG=1 MACHINE=AMD64 COMPILERFLAGS=-DWINVER=0x0500 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 clean +- nmake -f python.mak DEBUG=1 MACHINE=AMD64 COMPILERFLAGS=-DWINVER=0x0500 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 all +- nmake -f python.mak DEBUG=1 MACHINE=AMD64 COMPILERFLAGS=-DWINVER=0x0500 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 install ++ nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 clean ++ nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 all ++ nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 install + cd ..\.. +-) +\ No newline at end of file ++) +diff -r ee879c0ffa11 Tools/buildbot/external-common.bat +--- a/Tools/buildbot/external-common.bat ++++ b/Tools/buildbot/external-common.bat +@@ -1,7 +1,8 @@ + @rem Common file shared between external.bat and external-amd64.bat. Responsible for +-@rem fetching external components into the root\.. buildbot directories. ++@rem fetching external components into the root\externals directory. + +-cd .. ++if not exist externals mkdir externals ++cd externals + @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment + @rem the following, check it in, then check it out, comment it out, then check it back in. + @rem if exist bzip2-1.0.6 rd /s/q bzip2-1.0.6 +@@ -23,6 +24,8 @@ + @rem if exist openssl-0.9.8y rd /s/q openssl-0.9.8y + @rem if exist openssl-1.0.1g rd /s/q openssl-1.0.1g + @rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h ++@rem if exist openssl-1.0.1i rd /s/q openssl-1.0.1i ++@rem if exist openssl-1.0.1j rd /s/q openssl-1.0.1j + @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21 + + @rem bzip +@@ -35,9 +38,13 @@ + if exist db-4.4.20 rd /s/q db-4.4.20 + if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0 + ++@rem NASM, for OpenSSL build ++@rem if exist nasm-2.11.06 rd /s/q nasm-2.11.06 ++if not exist nasm-2.11.06 svn export http://svn.python.org/projects/external/nasm-2.11.06 ++ + @rem OpenSSL +-if exist openssl-1.0.1g rd /s/q openssl-1.0.1g +-if not exist openssl-1.0.1h svn export http://svn.python.org/projects/external/openssl-1.0.1h ++if exist openssl-1.0.1i rd /s/q openssl-1.0.1i ++if not exist openssl-1.0.1j svn export http://svn.python.org/projects/external/openssl-1.0.1j + + @rem tcl/tk + if not exist tcl-8.5.15.0 ( +diff -r ee879c0ffa11 Tools/buildbot/external.bat +--- a/Tools/buildbot/external.bat ++++ b/Tools/buildbot/external.bat +@@ -7,23 +7,23 @@ + if not exist tcltk\bin\tcl85g.dll ( + @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install + cd tcl-8.5.15.0\win +- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all ++ nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk clean all + nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install + cd ..\.. + ) + + if not exist tcltk\bin\tk85g.dll ( + cd tk-8.5.15.0\win +- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 clean +- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 all +- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 install ++ nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 clean ++ nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 all ++ nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 install + cd ..\.. + ) + + if not exist tcltk\lib\tix8.4.3\tix84g.dll ( + cd tix-8.4.3.5\win +- nmake -f python.mak DEBUG=1 MACHINE=IX86 COMPILERFLAGS=-DWINVER=0x0500 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk clean +- nmake -f python.mak DEBUG=1 MACHINE=IX86 COMPILERFLAGS=-DWINVER=0x0500 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk all +- nmake -f python.mak DEBUG=1 MACHINE=IX86 COMPILERFLAGS=-DWINVER=0x0500 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk install ++ nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk clean ++ nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk all ++ nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk install + cd ..\.. + ) +diff -r ee879c0ffa11 Tools/msi/msi.py +--- a/Tools/msi/msi.py ++++ b/Tools/msi/msi.py +@@ -13,7 +13,7 @@ + # 0 for official python.org releases + # 1 for intermediate releases by anybody, with + # a new product code for every package. +-snapshot = 1 ++snapshot = int(os.environ.get("SNAPSHOT", "1")) + # 1 means that file extension is px, not py, + # and binaries start with x + testpackage = 0 +@@ -22,15 +22,15 @@ + # Text to be displayed as the version in dialogs etc. + # goes into file name and ProductCode. Defaults to + # current_version.day for Snapshot, current_version otherwise +-full_current_version = None ++full_current_version = os.environ.get("CURRENT_VERSION") + # Is Tcl available at all? + have_tcl = True + # path to PCbuild directory +-PCBUILD="PCbuild" ++PCBUILD=os.environ.get("PCBUILD", "PCbuild") + # msvcrt version + MSVCR = "90" + # Name of certificate in default store to sign MSI with +-certname = None ++certname = os.environ.get("CERTNAME", None) + # Make a zip file containing the PDB files for this build? + pdbzip = True + +@@ -410,6 +410,8 @@ + + compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py3_" "[TARGETDIR]Lib"' + lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"' ++ updatepipargs = r'-m ensurepip -U --default-pip' ++ removepipargs = r'-B -m ensurepip._uninstall' + # See "CustomAction Table" + add_data(db, "CustomAction", [ + # msidbCustomActionTypeFirstSequence + msidbCustomActionTypeTextData + msidbCustomActionTypeProperty +@@ -421,9 +423,13 @@ + ("SetDLLDirToSystem32", 307, "DLLDIR", SystemFolderName), + # msidbCustomActionTypeExe + msidbCustomActionTypeSourceFile + # See "Custom Action Type 18" +- ("CompilePyc", 18, "python.exe", compileargs), +- ("CompilePyo", 18, "python.exe", "-O "+compileargs), +- ("CompileGrammar", 18, "python.exe", lib2to3args), ++ # msidbCustomActionTypeInScript (1024); run during actual installation ++ # msidbCustomActionTypeNoImpersonate (2048); run action in system account, not user account ++ ("CompilePyc", 18+1024+2048, "python.exe", compileargs), ++ ("CompilePyo", 18+1024+2048, "python.exe", "-O "+compileargs), ++ ("CompileGrammar", 18+1024+2048, "python.exe", lib2to3args), ++ ("UpdatePip", 18+1024+2048, "python.exe", updatepipargs), ++ ("RemovePip", 18+1024+2048, "python.exe", removepipargs), + ]) + + # UI Sequences, see "InstallUISequence Table", "Using a Sequence Table" +@@ -447,7 +453,7 @@ + + # Prepend TARGETDIR to the system path, and remove it on uninstall. + add_data(db, "Environment", +- [("PathAddition", "=-*Path", "[TARGETDIR];[~]", "REGISTRY.path")]) ++ [("PathAddition", "=-*Path", "[TARGETDIR];[TARGETDIR]Scripts;[~]", "REGISTRY.path")]) + + # Execute Sequences + add_data(db, "InstallExecuteSequence", +@@ -455,16 +461,19 @@ + ("SetDLLDirToSystem32", 'DLLDIR="" and ' + sys32cond, 751), + ("SetDLLDirToTarget", 'DLLDIR="" and not ' + sys32cond, 752), + ("UpdateEditIDLE", None, 1050), +- ("CompilePyc", "COMPILEALL", 6800), +- ("CompilePyo", "COMPILEALL", 6801), +- ("CompileGrammar", "COMPILEALL", 6802), ++ # run command if install state of pip changes to INSTALLSTATE_LOCAL ++ # run after InstallFiles ++ ("UpdatePip", "&pip_feature=3", 4001), ++ # remove pip when state changes to INSTALLSTATE_ABSENT ++ # run before RemoveFiles ++ ("RemovePip", "&pip_feature=2", 3499), ++ ("CompilePyc", "COMPILEALL", 4002), ++ ("CompilePyo", "COMPILEALL", 4003), ++ ("CompileGrammar", "COMPILEALL", 4004), + ]) + add_data(db, "AdminExecuteSequence", + [("InitialTargetDir", 'TARGETDIR=""', 750), + ("SetDLLDirToTarget", 'DLLDIR=""', 751), +- ("CompilePyc", "COMPILEALL", 6800), +- ("CompilePyo", "COMPILEALL", 6801), +- ("CompileGrammar", "COMPILEALL", 6802), + ]) + + ##################################################################### +@@ -830,7 +839,8 @@ + # (i.e. additional Python libraries) need to follow the parent feature. + # Features that have no advertisement trigger (e.g. the test suite) + # must not support advertisement +- global default_feature, tcltk, htmlfiles, tools, testsuite, ext_feature, private_crt, prepend_path ++ global default_feature, tcltk, htmlfiles, tools, testsuite ++ global ext_feature, private_crt, prepend_path, pip_feature + default_feature = Feature(db, "DefaultFeature", "Python", + "Python Interpreter and Libraries", + 1, directory = "TARGETDIR") +@@ -852,8 +862,12 @@ + tools = Feature(db, "Tools", "Utility Scripts", + "Python utility scripts (Tools/", 9, + parent = default_feature, attributes=2) ++ pip_feature = Feature(db, "pip_feature", "pip", ++ "Install or upgrade pip, a tool for installing and managing " ++ "Python packages.", 11, ++ parent = default_feature, attributes=2|8) + testsuite = Feature(db, "Testsuite", "Test suite", +- "Python test suite (Lib/test/)", 11, ++ "Python test suite (Lib/test/)", 13, + parent = default_feature, attributes=2|8) + # prepend_path is an additional feature which is to be off by default. + # Since the default level for the above features is 1, this needs to be +@@ -861,7 +875,7 @@ + prepend_path = Feature(db, "PrependPath", "Add python.exe to Path", + "Prepend [TARGETDIR] to the system Path variable. " + "This allows you to type 'python' into a command " +- "prompt without needing the full path.", 13, ++ "prompt without needing the full path.", 15, + parent = default_feature, attributes=2|8, + level=2) + +@@ -894,8 +908,8 @@ + for name, pat, file in (("bzip2","bzip2-*", "LICENSE"), + ("Berkeley DB", "db-*", "LICENSE"), + ("openssl", "openssl-*", "LICENSE"), +- ("Tcl", "tcl8*", "license.terms"), +- ("Tk", "tk8*", "license.terms"), ++ ("Tcl", "tcl-8*", "license.terms"), ++ ("Tk", "tk-8*", "license.terms"), + ("Tix", "tix-*", "license.terms")): + out.write("\nThis copy of Python includes a copy of %s, which is licensed under the following terms:\n\n" % name) + dirs = glob.glob(srcdir+"/../"+pat) +@@ -946,7 +960,7 @@ + if not snapshot: + # For releases, the Python DLL has the same version as the + # installer package. +- assert pyversion.split(".")[:3] == current_version.split(".") ++ assert pyversion.split(".")[:3] == current_version.split("."), "%s != %s" % (pyversion, current_version) + dlldir.add_file("%s/python%s%s.dll" % (PCBUILD, major, minor), + version=pyversion, + language=installer.FileVersion(pydllsrc, 1)) +@@ -1188,6 +1202,8 @@ + "Documentation"), + ("REGISTRY.path", msilib.gen_uuid(), "TARGETDIR", registry_component, None, + None), ++ ("REGISTRY.ensurepip", msilib.gen_uuid(), "TARGETDIR", registry_component, "EnsurePipRun", ++ None), + ("REGISTRY.def", msilib.gen_uuid(), "TARGETDIR", registry_component, + None, None)] + tcldata) + # See "FeatureComponents Table". +@@ -1205,6 +1221,7 @@ + [(default_feature.id, "REGISTRY"), + (htmlfiles.id, "REGISTRY.doc"), + (prepend_path.id, "REGISTRY.path"), ++ (pip_feature.id, "REGISTRY.ensurepip"), + (ext_feature.id, "REGISTRY.def")] + + tcldata + ) +@@ -1287,7 +1304,9 @@ + "", r"[TARGETDIR]Python.exe", "REGISTRY.def"), + ("DisplayIcon", -1, + r"Software\Microsoft\Windows\CurrentVersion\Uninstall\%s" % product_code, +- "DisplayIcon", "[TARGETDIR]python.exe", "REGISTRY") ++ "DisplayIcon", "[TARGETDIR]python.exe", "REGISTRY"), ++ # Fake registry entry to allow installer to track whether ensurepip has been run ++ ("EnsurePipRun", -1, prefix+r"\EnsurePipRun", "", "#1", "REGISTRY.ensurepip"), + ]) + # Shortcuts, see "Shortcut Table" + add_data(db, "Directory", +diff -r ee879c0ffa11 Tools/msi/msilib.py +--- a/Tools/msi/msilib.py ++++ b/Tools/msi/msilib.py +@@ -484,12 +484,7 @@ + + def make_short(self, file): + file = re.sub(r'[\?|><:/*"+,;=\[\]]', '_', file) # restrictions on short names +- parts = file.split(".") +- if len(parts)>1: +- suffix = parts[-1].upper() +- else: +- suffix = None +- prefix = parts[0].upper() ++ prefix, _, suffix = file.upper().rpartition(".") + if len(prefix) <= 8 and (not suffix or len(suffix)<=3): + if suffix: + file = prefix+"."+suffix +diff -r ee879c0ffa11 Tools/msi/uuids.py +--- a/Tools/msi/uuids.py ++++ b/Tools/msi/uuids.py +@@ -65,4 +65,5 @@ + '2.7.6150':'{C3CC4DF5-39A5-4027-B136-2B3E1F5AB6E2}', # 2.7.6 + '2.7.7121':'{5E0D187D-238B-4e96-9C75-C4CF141F5385}', # 2.7.7rc1 + '2.7.7150':'{049CA433-77A0-4e48-AC76-180A282C4E10}', # 2.7.7 ++ '2.7.8150':'{61121B12-88BD-4261-A6EE-AB32610A56DD}', # 2.7.8 + } +diff -r ee879c0ffa11 Tools/scripts/checkpip.py +--- /dev/null ++++ b/Tools/scripts/checkpip.py +@@ -0,0 +1,31 @@ ++#!/usr/bin/env python2 ++""" ++Checks that the version of the projects bundled in ensurepip are the latest ++versions available. ++""" ++import ensurepip ++import json ++import urllib2 ++import sys ++ ++ ++def main(): ++ outofdate = False ++ ++ for project, version in ensurepip._PROJECTS: ++ data = json.loads(urllib2.urlopen( ++ "https://pypi.python.org/pypi/{}/json".format(project), ++ ).read().decode("utf8")) ++ upstream_version = data["info"]["version"] ++ ++ if version != upstream_version: ++ outofdate = True ++ print("The latest version of {} on PyPI is {}, but ensurepip " ++ "has {}".format(project, upstream_version, version)) ++ ++ if outofdate: ++ sys.exit(1) ++ ++ ++if __name__ == "__main__": ++ main() +diff -r ee879c0ffa11 Tools/scripts/findnocoding.py +--- a/Tools/scripts/findnocoding.py ++++ b/Tools/scripts/findnocoding.py +@@ -33,6 +33,7 @@ + + + decl_re = re.compile(r'^[ \t\f]*#.*coding[:=][ \t]*([-\w.]+)') ++blank_re = re.compile(r'^[ \t\f]*(?:[#\r\n]|$)') + + def get_declaration(line): + match = decl_re.match(line) +@@ -57,7 +58,8 @@ + line1 = infile.readline() + line2 = infile.readline() + +- if get_declaration(line1) or get_declaration(line2): ++ if (get_declaration(line1) or ++ blank_re.match(line1) and get_declaration(line2)): + # the file does have an encoding declaration, so trust it + infile.close() + return False +diff -r ee879c0ffa11 Tools/scripts/patchcheck.py +--- a/Tools/scripts/patchcheck.py ++++ b/Tools/scripts/patchcheck.py +@@ -157,7 +157,8 @@ + file_paths = changed_files() + python_files = [fn for fn in file_paths if fn.endswith('.py')] + c_files = [fn for fn in file_paths if fn.endswith(('.c', '.h'))] +- doc_files = [fn for fn in file_paths if fn.startswith('Doc')] ++ doc_files = [fn for fn in file_paths if fn.startswith('Doc') and ++ fn.endswith(('.rst', '.inc'))] + misc_files = {os.path.join('Misc', 'ACKS'), os.path.join('Misc', 'NEWS')}\ + & set(file_paths) + # PEP 8 whitespace rules enforcement. +diff -r ee879c0ffa11 Tools/ssl/make_ssl_data.py +--- /dev/null ++++ b/Tools/ssl/make_ssl_data.py +@@ -0,0 +1,68 @@ ++#! /usr/bin/env python3 ++ ++""" ++This script should be called *manually* when we want to upgrade SSLError ++`library` and `reason` mnemnonics to a more recent OpenSSL version. ++ ++It takes two arguments: ++- the path to the OpenSSL include files' directory ++ (e.g. openssl-1.0.1-beta3/include/openssl/) ++- the path to the C file to be generated ++ (probably Modules/_ssl_data.h) ++""" ++ ++import datetime ++import os ++import re ++import sys ++ ++ ++def parse_error_codes(h_file, prefix): ++ pat = re.compile(r"#define\W+(%s([\w]+))\W+(\d+)\b" % re.escape(prefix)) ++ codes = [] ++ with open(h_file, "r", encoding="latin1") as f: ++ for line in f: ++ match = pat.search(line) ++ if match: ++ code, name, num = match.groups() ++ num = int(num) ++ codes.append((code, name, num)) ++ return codes ++ ++if __name__ == "__main__": ++ openssl_inc = sys.argv[1] ++ outfile = sys.argv[2] ++ use_stdout = outfile == '-' ++ f = sys.stdout if use_stdout else open(outfile, "w") ++ error_libraries = ( ++ # (library code, mnemonic, error prefix, header file) ++ ('ERR_LIB_PEM', 'PEM', 'PEM_R_', 'pem.h'), ++ ('ERR_LIB_SSL', 'SSL', 'SSL_R_', 'ssl.h'), ++ ('ERR_LIB_X509', 'X509', 'X509_R_', 'x509.h'), ++ ) ++ def w(l): ++ f.write(l + "\n") ++ w("/* File generated by Tools/ssl/make_ssl_data.py */") ++ w("/* Generated on %s */" % datetime.datetime.now().isoformat()) ++ w("") ++ ++ w("static struct py_ssl_library_code library_codes[] = {") ++ for libcode, mnemo, _, _ in error_libraries: ++ w(' {"%s", %s},' % (mnemo, libcode)) ++ w(' { NULL }') ++ w('};') ++ w("") ++ ++ w("static struct py_ssl_error_code error_codes[] = {") ++ for libcode, _, prefix, h_file in error_libraries: ++ codes = parse_error_codes(os.path.join(openssl_inc, h_file), prefix) ++ for code, name, num in sorted(codes): ++ w(' #ifdef %s' % (code)) ++ w(' {"%s", %s, %s},' % (name, libcode, code)) ++ w(' #else') ++ w(' {"%s", %s, %d},' % (name, libcode, num)) ++ w(' #endif') ++ w(' { NULL }') ++ w('};') ++ if not use_stdout: ++ f.close() +diff -r ee879c0ffa11 Tools/ssl/test_multiple_versions.py +--- /dev/null ++++ b/Tools/ssl/test_multiple_versions.py +@@ -0,0 +1,241 @@ ++#./python ++"""Run Python tests with multiple installations of OpenSSL ++ ++The script ++ ++ (1) downloads OpenSSL tar bundle ++ (2) extracts it to ../openssl/src/openssl-VERSION/ ++ (3) compiles OpenSSL ++ (4) installs OpenSSL into ../openssl/VERSION/ ++ (5) forces a recompilation of Python modules using the ++ header and library files from ../openssl/VERSION/ ++ (6) runs Python's test suite ++ ++The script must be run with Python's build directory as current working ++directory: ++ ++ ./python Tools/ssl/test_multiple_versions.py ++ ++The script uses LD_RUN_PATH, LD_LIBRARY_PATH, CPPFLAGS and LDFLAGS to bend ++search paths for header files and shared libraries. It's known to work on ++Linux with GCC 4.x. ++ ++(c) 2013 Christian Heimes ++""" ++import logging ++import os ++import tarfile ++import shutil ++import subprocess ++import sys ++from urllib import urlopen ++ ++log = logging.getLogger("multissl") ++ ++OPENSSL_VERSIONS = [ ++ "0.9.7m", "0.9.8i", "0.9.8l", "0.9.8m", "0.9.8y", "1.0.0k", "1.0.1e" ++] ++FULL_TESTS = [ ++ "test_asyncio", "test_ftplib", "test_hashlib", "test_httplib", ++ "test_imaplib", "test_nntplib", "test_poplib", "test_smtplib", ++ "test_smtpnet", "test_urllib2_localnet", "test_venv" ++] ++MINIMAL_TESTS = ["test_ssl", "test_hashlib"] ++CADEFAULT = True ++HERE = os.path.abspath(os.getcwd()) ++DEST_DIR = os.path.abspath(os.path.join(HERE, os.pardir, "openssl")) ++ ++ ++class BuildSSL(object): ++ url_template = "https://www.openssl.org/source/openssl-{}.tar.gz" ++ ++ module_files = ["Modules/_ssl.c", ++ "Modules/socketmodule.c", ++ "Modules/_hashopenssl.c"] ++ ++ def __init__(self, version, openssl_compile_args=(), destdir=DEST_DIR): ++ self._check_python_builddir() ++ self.version = version ++ self.openssl_compile_args = openssl_compile_args ++ # installation directory ++ self.install_dir = os.path.join(destdir, version) ++ # source file ++ self.src_file = os.path.join(destdir, "src", ++ "openssl-{}.tar.gz".format(version)) ++ # build directory (removed after install) ++ self.build_dir = os.path.join(destdir, "src", ++ "openssl-{}".format(version)) ++ ++ @property ++ def openssl_cli(self): ++ """openssl CLI binary""" ++ return os.path.join(self.install_dir, "bin", "openssl") ++ ++ @property ++ def openssl_version(self): ++ """output of 'bin/openssl version'""" ++ env = os.environ.copy() ++ env["LD_LIBRARY_PATH"] = self.lib_dir ++ cmd = [self.openssl_cli, "version"] ++ return self._subprocess_output(cmd, env=env) ++ ++ @property ++ def pyssl_version(self): ++ """Value of ssl.OPENSSL_VERSION""" ++ env = os.environ.copy() ++ env["LD_LIBRARY_PATH"] = self.lib_dir ++ cmd = ["./python", "-c", "import ssl; print(ssl.OPENSSL_VERSION)"] ++ return self._subprocess_output(cmd, env=env) ++ ++ @property ++ def include_dir(self): ++ return os.path.join(self.install_dir, "include") ++ ++ @property ++ def lib_dir(self): ++ return os.path.join(self.install_dir, "lib") ++ ++ @property ++ def has_openssl(self): ++ return os.path.isfile(self.openssl_cli) ++ ++ @property ++ def has_src(self): ++ return os.path.isfile(self.src_file) ++ ++ def _subprocess_call(self, cmd, stdout=subprocess.DEVNULL, env=None, ++ **kwargs): ++ log.debug("Call '{}'".format(" ".join(cmd))) ++ return subprocess.check_call(cmd, stdout=stdout, env=env, **kwargs) ++ ++ def _subprocess_output(self, cmd, env=None, **kwargs): ++ log.debug("Call '{}'".format(" ".join(cmd))) ++ out = subprocess.check_output(cmd, env=env) ++ return out.strip().decode("utf-8") ++ ++ def _check_python_builddir(self): ++ if not os.path.isfile("python") or not os.path.isfile("setup.py"): ++ raise ValueError("Script must be run in Python build directory") ++ ++ def _download_openssl(self): ++ """Download OpenSSL source dist""" ++ src_dir = os.path.dirname(self.src_file) ++ if not os.path.isdir(src_dir): ++ os.makedirs(src_dir) ++ url = self.url_template.format(self.version) ++ log.info("Downloading OpenSSL from {}".format(url)) ++ req = urlopen(url, cadefault=CADEFAULT) ++ # KISS, read all, write all ++ data = req.read() ++ log.info("Storing {}".format(self.src_file)) ++ with open(self.src_file, "wb") as f: ++ f.write(data) ++ ++ def _unpack_openssl(self): ++ """Unpack tar.gz bundle""" ++ # cleanup ++ if os.path.isdir(self.build_dir): ++ shutil.rmtree(self.build_dir) ++ os.makedirs(self.build_dir) ++ ++ tf = tarfile.open(self.src_file) ++ base = "openssl-{}/".format(self.version) ++ # force extraction into build dir ++ members = tf.getmembers() ++ for member in members: ++ if not member.name.startswith(base): ++ raise ValueError(member.name) ++ member.name = member.name[len(base):] ++ log.info("Unpacking files to {}".format(self.build_dir)) ++ tf.extractall(self.build_dir, members) ++ ++ def _build_openssl(self): ++ """Now build openssl""" ++ log.info("Running build in {}".format(self.install_dir)) ++ cwd = self.build_dir ++ cmd = ["./config", "shared", "--prefix={}".format(self.install_dir)] ++ cmd.extend(self.openssl_compile_args) ++ self._subprocess_call(cmd, cwd=cwd) ++ self._subprocess_call(["make"], cwd=cwd) ++ ++ def _install_openssl(self, remove=True): ++ self._subprocess_call(["make", "install"], cwd=self.build_dir) ++ if remove: ++ shutil.rmtree(self.build_dir) ++ ++ def install_openssl(self): ++ if not self.has_openssl: ++ if not self.has_src: ++ self._download_openssl() ++ else: ++ log.debug("Already has src {}".format(self.src_file)) ++ self._unpack_openssl() ++ self._build_openssl() ++ self._install_openssl() ++ else: ++ log.info("Already has installation {}".format(self.install_dir)) ++ # validate installation ++ version = self.openssl_version ++ if self.version not in version: ++ raise ValueError(version) ++ ++ def touch_pymods(self): ++ # force a rebuild of all modules that use OpenSSL APIs ++ for fname in self.module_files: ++ os.utime(fname) ++ ++ def recompile_pymods(self): ++ log.info("Using OpenSSL build from {}".format(self.build_dir)) ++ # overwrite header and library search paths ++ env = os.environ.copy() ++ env["CPPFLAGS"] = "-I{}".format(self.include_dir) ++ env["LDFLAGS"] = "-L{}".format(self.lib_dir) ++ # set rpath ++ env["LD_RUN_PATH"] = self.lib_dir ++ ++ log.info("Rebuilding Python modules") ++ self.touch_pymods() ++ cmd = ["./python", "setup.py", "build"] ++ self._subprocess_call(cmd, env=env) ++ ++ def check_pyssl(self): ++ version = self.pyssl_version ++ if self.version not in version: ++ raise ValueError(version) ++ ++ def run_pytests(self, *args): ++ cmd = ["./python", "-m", "test"] ++ cmd.extend(args) ++ self._subprocess_call(cmd, stdout=None) ++ ++ def run_python_tests(self, *args): ++ self.recompile_pymods() ++ self.check_pyssl() ++ self.run_pytests(*args) ++ ++ ++def main(*args): ++ builders = [] ++ for version in OPENSSL_VERSIONS: ++ if version in ("0.9.8i", "0.9.8l"): ++ openssl_compile_args = ("no-asm",) ++ else: ++ openssl_compile_args = () ++ builder = BuildSSL(version, openssl_compile_args) ++ builder.install_openssl() ++ builders.append(builder) ++ ++ for builder in builders: ++ builder.run_python_tests(*args) ++ # final touch ++ builder.touch_pymods() ++ ++ ++if __name__ == "__main__": ++ logging.basicConfig(level=logging.INFO, ++ format="*** %(levelname)s %(message)s") ++ args = sys.argv[1:] ++ if not args: ++ args = ["-unetwork", "-v"] ++ args.extend(FULL_TESTS) ++ main(*args) +diff -r ee879c0ffa11 configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,9 @@ + AC_SUBST(build) + AC_SUBST(host) + ++# pybuilddir.txt will be created by --generate-posix-vars in the Makefile ++rm -f pybuilddir.txt ++ + if test "$cross_compiling" = yes; then + AC_MSG_CHECKING([for python interpreter for cross build]) + if test -z "$PYTHON_FOR_BUILD"; then +diff -r ee879c0ffa11 setup.py +--- a/setup.py ++++ b/setup.py +@@ -250,7 +250,9 @@ + + build_ext.build_extensions(self) + +- longest = max([len(e.name) for e in self.extensions]) ++ longest = 0 ++ if self.extensions: ++ longest = max([len(e.name) for e in self.extensions]) + if self.failed: + longest = max(longest, max([len(name) for name in self.failed])) + --- python2.7-2.7.8.orig/debian/patches/hotshot-import.diff +++ python2.7-2.7.8/debian/patches/hotshot-import.diff @@ -0,0 +1,17 @@ +# DP: hotshot: Check for the availability of the profile and pstats modules. + +--- a/Lib/hotshot/stats.py ++++ b/Lib/hotshot/stats.py +@@ -1,7 +1,10 @@ + """Statistics analyzer for HotShot.""" + +-import profile +-import pstats ++try: ++ import profile ++ import pstats ++except ImportError, e: ++ raise ImportError, str(e) + '; please install the python-profiler package' + + import hotshot.log + --- python2.7-2.7.8.orig/debian/patches/hurd-disable-nonworking-constants.diff +++ python2.7-2.7.8/debian/patches/hurd-disable-nonworking-constants.diff @@ -0,0 +1,38 @@ +# DP: Comment out constant exposed on the API which are not implemented on +# DP: GNU/Hurd. They would not work at runtime anyway. + +Index: b/Modules/posixmodule.c +=================================================================== +--- a/Modules/posixmodule.c ++++ b/Modules/posixmodule.c +@@ -9248,12 +9248,14 @@ all_ins(PyObject *d) + #ifdef O_LARGEFILE + if (ins(d, "O_LARGEFILE", (long)O_LARGEFILE)) return -1; + #endif ++#ifndef __GNU__ + #ifdef O_SHLOCK + if (ins(d, "O_SHLOCK", (long)O_SHLOCK)) return -1; + #endif + #ifdef O_EXLOCK + if (ins(d, "O_EXLOCK", (long)O_EXLOCK)) return -1; + #endif ++#endif + + /* MS Windows */ + #ifdef O_NOINHERIT +Index: b/Modules/socketmodule.c +=================================================================== +--- a/Modules/socketmodule.c ++++ b/Modules/socketmodule.c +@@ -4903,9 +4903,11 @@ init_socket(void) + #ifdef SO_OOBINLINE + PyModule_AddIntConstant(m, "SO_OOBINLINE", SO_OOBINLINE); + #endif ++#ifndef __GNU__ + #ifdef SO_REUSEPORT + PyModule_AddIntConstant(m, "SO_REUSEPORT", SO_REUSEPORT); + #endif ++#endif + #ifdef SO_SNDBUF + PyModule_AddIntConstant(m, "SO_SNDBUF", SO_SNDBUF); + #endif --- python2.7-2.7.8.orig/debian/patches/installed-testsuite.diff +++ python2.7-2.7.8/debian/patches/installed-testsuite.diff @@ -0,0 +1,37 @@ +# DP: Changes needed to run the installed testsuite. +# DP: Also removed: +# DP: - ctypes/test/test_macholib.py +# DP: - distutils/tests/test_bdist_wininst.py + +Index: b/Lib/distutils/tests/test_build_ext.py +=================================================================== +--- a/Lib/distutils/tests/test_build_ext.py ++++ b/Lib/distutils/tests/test_build_ext.py +@@ -83,27 +83,6 @@ class BuildExtTestCase(support.TempdirMa + self.assertIsInstance(xx.Null(), xx.Null) + self.assertIsInstance(xx.Str(), xx.Str) + +- def test_solaris_enable_shared(self): +- dist = Distribution({'name': 'xx'}) +- cmd = build_ext(dist) +- old = sys.platform +- +- sys.platform = 'sunos' # fooling finalize_options +- from distutils.sysconfig import _config_vars +- old_var = _config_vars.get('Py_ENABLE_SHARED') +- _config_vars['Py_ENABLE_SHARED'] = 1 +- try: +- cmd.ensure_finalized() +- finally: +- sys.platform = old +- if old_var is None: +- del _config_vars['Py_ENABLE_SHARED'] +- else: +- _config_vars['Py_ENABLE_SHARED'] = old_var +- +- # make sure we get some library dirs under solaris +- self.assertGreater(len(cmd.library_dirs), 0) +- + @unittest.skipIf(sys.version < '2.6', + 'site.USER_SITE was introduced in 2.6') + def test_user_site(self): --- python2.7-2.7.8.orig/debian/patches/issue21963.diff +++ python2.7-2.7.8/debian/patches/issue21963.diff @@ -0,0 +1,152 @@ +Index: b/Include/pythonrun.h +=================================================================== +--- a/Include/pythonrun.h ++++ b/Include/pythonrun.h +@@ -147,8 +147,6 @@ PyAPI_FUNC(void) PyOS_FiniInterrupts(voi + PyAPI_FUNC(void) PyByteArray_Fini(void); + PyAPI_FUNC(void) _PyRandom_Fini(void); + +-PyAPI_DATA(PyThreadState *) _Py_Finalizing; +- + /* Stuff with no proper home (yet) */ + PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *); + PyAPI_DATA(int) (*PyOS_InputHook)(void); +Index: b/Lib/test/test_threading.py +=================================================================== +--- a/Lib/test/test_threading.py ++++ b/Lib/test/test_threading.py +@@ -700,49 +700,6 @@ class ThreadJoinOnShutdown(BaseTestCase) + output = "end of worker thread\nend of main thread\n" + self.assertScriptHasOutput(script, output) + +- @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") +- def test_6_daemon_threads(self): +- # Check that a daemon thread cannot crash the interpreter on shutdown +- # by manipulating internal structures that are being disposed of in +- # the main thread. +- script = """if True: +- import os +- import random +- import sys +- import time +- import threading +- +- thread_has_run = set() +- +- def random_io(): +- '''Loop for a while sleeping random tiny amounts and doing some I/O.''' +- while True: +- in_f = open(os.__file__, 'rb') +- stuff = in_f.read(200) +- null_f = open(os.devnull, 'wb') +- null_f.write(stuff) +- time.sleep(random.random() / 1995) +- null_f.close() +- in_f.close() +- thread_has_run.add(threading.current_thread()) +- +- def main(): +- count = 0 +- for _ in range(40): +- new_thread = threading.Thread(target=random_io) +- new_thread.daemon = True +- new_thread.start() +- count += 1 +- while len(thread_has_run) < count: +- time.sleep(0.001) +- # Trigger process shutdown +- sys.exit(0) +- +- main() +- """ +- rc, out, err = assert_python_ok('-c', script) +- self.assertFalse(err) +- + @unittest.skipUnless(hasattr(os, 'fork'), "needs os.fork()") + @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") + def test_reinit_tls_after_fork(self): +Index: b/Python/ceval.c +=================================================================== +--- a/Python/ceval.c ++++ b/Python/ceval.c +@@ -355,12 +355,6 @@ PyEval_RestoreThread(PyThreadState *tsta + if (interpreter_lock) { + int err = errno; + PyThread_acquire_lock(interpreter_lock, 1); +- /* _Py_Finalizing is protected by the GIL */ +- if (_Py_Finalizing && tstate != _Py_Finalizing) { +- PyThread_release_lock(interpreter_lock); +- PyThread_exit_thread(); +- assert(0); /* unreachable */ +- } + errno = err; + } + #endif +@@ -1025,12 +1019,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int + + PyThread_acquire_lock(interpreter_lock, 1); + +- /* Check if we should make a quick exit. */ +- if (_Py_Finalizing && _Py_Finalizing != tstate) { +- PyThread_release_lock(interpreter_lock); +- PyThread_exit_thread(); +- } +- + if (PyThreadState_Swap(tstate) != NULL) + Py_FatalError("ceval: orphan tstate"); + +Index: b/Python/pythonrun.c +=================================================================== +--- a/Python/pythonrun.c ++++ b/Python/pythonrun.c +@@ -91,8 +91,6 @@ int _Py_QnewFlag = 0; + int Py_NoUserSiteDirectory = 0; /* for -s and site.py */ + int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */ + +-PyThreadState *_Py_Finalizing = NULL; +- + + /* Hack to force loading of object files */ + int (*_PyOS_mystrnicmp_hack)(const char *, const char *, Py_ssize_t) = \ +@@ -165,7 +163,6 @@ Py_InitializeEx(int install_sigs) + if (initialized) + return; + initialized = 1; +- _Py_Finalizing = NULL; + + if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0') + Py_DebugFlag = add_flag(Py_DebugFlag, p); +@@ -425,16 +422,12 @@ Py_Finalize(void) + * the threads created via Threading. + */ + call_sys_exitfunc(); ++ initialized = 0; + + /* Get current thread state and interpreter pointer */ + tstate = PyThreadState_GET(); + interp = tstate->interp; + +- /* Remaining threads (e.g. daemon threads) will automatically exit +- after taking the GIL (in PyEval_RestoreThread()). */ +- _Py_Finalizing = tstate; +- initialized = 0; +- + /* Disable signal handling */ + PyOS_FiniInterrupts(); + +Index: b/Python/thread_pthread.h +=================================================================== +--- a/Python/thread_pthread.h ++++ b/Python/thread_pthread.h +@@ -242,9 +242,9 @@ void + PyThread_exit_thread(void) + { + dprintf(("PyThread_exit_thread called\n")); +- if (!initialized) ++ if (!initialized) { + exit(0); +- pthread_exit(0); ++ } + } + + #ifdef USE_SEMAPHORES --- python2.7-2.7.8.orig/debian/patches/issue670664.diff +++ python2.7-2.7.8/debian/patches/issue670664.diff @@ -0,0 +1,54 @@ +# DP: Proposed patch for issue #670664. + +--- a/Lib/HTMLParser.py ++++ b/Lib/HTMLParser.py +@@ -96,6 +96,7 @@ + self.rawdata = '' + self.lasttag = '???' + self.interesting = interesting_normal ++ self.cdata_tag = None + markupbase.ParserBase.reset(self) + + def feed(self, data): +@@ -120,11 +121,13 @@ + """Return full source of start tag: '<...>'.""" + return self.__starttag_text + +- def set_cdata_mode(self): ++ def set_cdata_mode(self, tag): + self.interesting = interesting_cdata ++ self.cdata_tag = tag.lower() + + def clear_cdata_mode(self): + self.interesting = interesting_normal ++ self.cdata_tag = None + + # Internal -- handle data as far as reasonable. May leave state + # and data to be processed by a subsequent call. If 'end' is +@@ -270,7 +273,7 @@ + else: + self.handle_starttag(tag, attrs) + if tag in self.CDATA_CONTENT_ELEMENTS: +- self.set_cdata_mode() ++ self.set_cdata_mode(tag) + return endpos + + # Internal -- check to see if we have a complete starttag; return end +@@ -314,10 +317,16 @@ + j = match.end() + match = endtagfind.match(rawdata, i) # + if not match: ++ if self.cdata_tag is not None: return j + self.error("bad end tag: %r" % (rawdata[i:j],)) +- tag = match.group(1) ++ tag = match.group(1).strip() ++ ++ if self.cdata_tag is not None: ++ if tag.lower() != self.cdata_tag: return j ++ + self.handle_endtag(tag.lower()) + self.clear_cdata_mode() ++ + return j + + # Overridable -- finish processing of start+end tag: --- python2.7-2.7.8.orig/debian/patches/issue9012a.diff +++ python2.7-2.7.8/debian/patches/issue9012a.diff @@ -0,0 +1,13 @@ +# DP: Link _math.o only once to the static library. + +--- a/Modules/Setup.dist ++++ b/Modules/Setup.dist +@@ -169,7 +169,7 @@ + # Modules that should always be present (non UNIX dependent): + + #array arraymodule.c # array objects +-#cmath cmathmodule.c _math.c # -lm # complex math library functions ++#cmath cmathmodule.c # -lm # complex math library functions + #math mathmodule.c _math.c # -lm # math library functions, e.g. sin() + #_struct _struct.c # binary structure packing/unpacking + #time timemodule.c # -lm # time operations and variables --- python2.7-2.7.8.orig/debian/patches/issue9189.diff +++ python2.7-2.7.8/debian/patches/issue9189.diff @@ -0,0 +1,342 @@ +Index: b/Lib/sysconfig.py +=================================================================== +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -231,11 +231,19 @@ def _parse_makefile(filename, vars=None) + done[n] = v + + # do variable interpolation here +- while notdone: +- for name in notdone.keys(): ++ variables = list(notdone.keys()) ++ ++ # Variables with a 'PY_' prefix in the makefile. These need to ++ # be made available without that prefix through sysconfig. ++ # Special care is needed to ensure that variable expansion works, even ++ # if the expansion uses the name without a prefix. ++ renamed_variables = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS') ++ ++ while len(variables) > 0: ++ for name in tuple(variables): + value = notdone[name] + m = _findvar1_rx.search(value) or _findvar2_rx.search(value) +- if m: ++ if m is not None: + n = m.group(1) + found = True + if n in done: +@@ -246,23 +254,48 @@ def _parse_makefile(filename, vars=None) + elif n in os.environ: + # do it like make: fall back to environment + item = os.environ[n] ++ ++ elif n in renamed_variables: ++ if name.startswith('PY_') and name[3:] in renamed_variables: ++ item = "" ++ ++ elif 'PY_' + n in notdone: ++ found = False ++ ++ else: ++ item = str(done['PY_' + n]) ++ + else: + done[n] = item = "" ++ + if found: + after = value[m.end():] + value = value[:m.start()] + item + after + if "$" in after: + notdone[name] = value + else: +- try: value = int(value) ++ try: ++ value = int(value) + except ValueError: + done[name] = value.strip() + else: + done[name] = value +- del notdone[name] ++ variables.remove(name) ++ ++ if name.startswith('PY_') \ ++ and name[3:] in renamed_variables: ++ ++ name = name[3:] ++ if name not in done: ++ done[name] = value ++ ++ + else: +- # bogus variable reference; just drop it since we can't deal +- del notdone[name] ++ # bogus variable reference (e.g. "prefix=$/opt/python"); ++ # just drop it since we can't deal ++ done[name] = value ++ variables.remove(name) ++ + # strip spurious spaces + for k, v in done.items(): + if isinstance(v, str): +Index: b/Makefile.pre.in +=================================================================== +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -68,12 +68,18 @@ MAKESETUP= $(srcdir)/Modules/makese + # Compiler options + OPT= @OPT@ + BASECFLAGS= @BASECFLAGS@ +-CFLAGS= $(BASECFLAGS) @CFLAGS@ $(OPT) $(EXTRA_CFLAGS) ++CONFIGURE_CFLAGS= @CFLAGS@ ++CONFIGURE_CPPFLAGS= @CPPFLAGS@ ++CONFIGURE_LDFLAGS= @LDFLAGS@ ++# Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the ++# command line to append to these values without stomping the pre-set ++# values. ++PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) + # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to + # be able to build extension modules using the directories specified in the + # environment variables +-CPPFLAGS= -I. -IInclude -I$(srcdir)/Include @CPPFLAGS@ +-LDFLAGS= @LDFLAGS@ ++PY_CPPFLAGS= -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) ++PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) + LDLAST= @LDLAST@ + SGI_ABI= @SGI_ABI@ + CCSHARED= @CCSHARED@ +@@ -82,7 +88,7 @@ ARFLAGS= @ARFLAGS@ + # Extra C flags added for building the interpreter object files. + CFLAGSFORSHARED=@CFLAGSFORSHARED@ + # C flags used for building the interpreter object files +-PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE ++PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE + + + # Machine-dependent subdirectories +@@ -437,7 +443,7 @@ coverage: + + # Build the interpreter + $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) +- $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ ++ $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ \ + Modules/python.o \ + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + +@@ -469,7 +475,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx + *\ -s*|s*) quiet="-q";; \ + *) quiet="";; \ + esac; \ +- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(PY_LDFLAGS)' OPT='$(OPT)' \ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build + +@@ -487,18 +493,18 @@ $(LIBRARY): $(LIBRARY_OBJS) + + libpython$(VERSION).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ +- $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ ++ $(BLDSHARED) $(PY_LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + $(LN) -f $(INSTSONAME) $@; \ + else \ +- $(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ ++ $(BLDSHARED) $(PY_LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + fi + + libpython$(VERSION).dylib: $(LIBRARY_OBJS) +- $(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ ++ $(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + + + libpython$(VERSION).sl: $(LIBRARY_OBJS) +- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST) ++ $(LDSHARED) $(PY_LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST) + + # Copy up the gdb python hooks into a position where they can be automatically + # loaded by gdb during Lib/test/test_gdb.py +@@ -537,7 +543,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION + # for a shared core library; otherwise, this rule is a noop. + $(DLLLIBRARY) libpython$(VERSION).dll.a: $(LIBRARY_OBJS) + if test -n "$(DLLLIBRARY)"; then \ +- $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \ ++ $(LDSHARED) $(PY_LDFLAGS) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \ + $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \ + else true; \ + fi +@@ -581,7 +587,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \ + $(SIGNAL_OBJS) \ + $(MODOBJS) \ + $(srcdir)/Modules/getbuildinfo.c +- $(CC) -c $(PY_CFLAGS) \ ++ $(CC) -c $(PY_CORE_CFLAGS) \ + -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" \ + -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \ + -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \ +@@ -589,7 +595,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \ + -o $@ $(srcdir)/Modules/getbuildinfo.c + + Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile +- $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ ++ $(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ + -DPREFIX='"$(prefix)"' \ + -DEXEC_PREFIX='"$(exec_prefix)"' \ + -DVERSION='"$(VERSION)"' \ +@@ -597,7 +603,7 @@ Modules/getpath.o: $(srcdir)/Modules/get + -o $@ $(srcdir)/Modules/getpath.c + + Modules/python.o: $(srcdir)/Modules/python.c +- $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c ++ $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Modules/python.c + + Modules/posixmodule.o: $(srcdir)/Modules/posixmodule.c $(srcdir)/Modules/posixmodule.h + +@@ -614,7 +620,7 @@ $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INP + touch $(GRAMMAR_C) + + $(PGEN): $(PGENOBJS) +- $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) ++ $(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) + + Parser/grammar.o: $(srcdir)/Parser/grammar.c \ + $(srcdir)/Include/token.h \ +@@ -636,10 +642,10 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) + Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) + + Python/getplatform.o: $(srcdir)/Python/getplatform.c +- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c ++ $(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c + + Python/importdl.o: $(srcdir)/Python/importdl.c +- $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c ++ $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c + + Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \ + $(srcdir)/Objects/unicodetype_db.h +@@ -1244,7 +1250,7 @@ config.status: $(srcdir)/configure + + # Some make's put the object file in the current directory + .c.o: +- $(CC) -c $(PY_CFLAGS) -o $@ $< ++ $(CC) -c $(PY_CORE_CFLAGS) -o $@ $< + + # Run reindent on the library + reindent: +Index: b/Modules/makesetup +=================================================================== +--- a/Modules/makesetup ++++ b/Modules/makesetup +@@ -219,7 +219,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | + case $doconfig in + no) cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; + *) +- cc="$cc \$(PY_CFLAGS)";; ++ cc="$cc \$(PY_CORE_CFLAGS)";; + esac + rule="$obj: $src; $cc $cpps -c $src -o $obj" + echo "$rule" >>$rulesf +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -610,14 +610,13 @@ if test "$MACHDEP" = "irix6" && test "$C + fi + fi + +-# If the user set CFLAGS, use this instead of the automatically +-# determined setting +-preset_cflags="$CFLAGS" +-AC_PROG_CC +-if test ! -z "$preset_cflags" +-then +- CFLAGS=$preset_cflags ++# Don't let AC_PROG_CC set the default CFLAGS. It normally sets -g -O2 ++# when the compiler supports them, but we don't always want -O2, and ++# we set -g later. ++if test -z "$CFLAGS"; then ++ CFLAGS= + fi ++AC_PROG_CC + + AC_SUBST(CXX) + AC_SUBST(MAINCC) +Index: b/Lib/distutils/sysconfig.py +=================================================================== +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -320,11 +320,19 @@ def parse_makefile(fn, g=None): + done[n] = v + + # do variable interpolation here +- while notdone: +- for name in notdone.keys(): ++ variables = list(notdone.keys()) ++ ++ # Variables with a 'PY_' prefix in the makefile. These need to ++ # be made available without that prefix through sysconfig. ++ # Special care is needed to ensure that variable expansion works, even ++ # if the expansion uses the name without a prefix. ++ renamed_variables = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS') ++ ++ while len(variables) > 0: ++ for name in tuple(variables): + value = notdone[name] + m = _findvar1_rx.search(value) or _findvar2_rx.search(value) +- if m: ++ if m is not None: + n = m.group(1) + found = True + if n in done: +@@ -335,25 +343,47 @@ def parse_makefile(fn, g=None): + elif n in os.environ: + # do it like make: fall back to environment + item = os.environ[n] ++ ++ elif n in renamed_variables: ++ if name.startswith('PY_') and name[3:] in renamed_variables: ++ item = "" ++ ++ elif 'PY_' + n in notdone: ++ found = False ++ ++ else: ++ item = str(done['PY_' + n]) ++ + else: + done[n] = item = "" ++ + if found: + after = value[m.end():] + value = value[:m.start()] + item + after + if "$" in after: + notdone[name] = value + else: +- try: value = int(value) ++ try: ++ value = int(value) + except ValueError: + done[name] = value.strip() + else: + done[name] = value +- del notdone[name] +- else: +- # bogus variable reference; just drop it since we can't deal +- del notdone[name] ++ variables.remove(name) ++ ++ if name.startswith('PY_') \ ++ and name[3:] in renamed_variables: + +- fp.close() ++ name = name[3:] ++ if name not in done: ++ done[name] = value ++ ++ ++ else: ++ # bogus variable reference (e.g. "prefix=$/opt/python"); ++ # just drop it since we can't deal ++ done[name] = value ++ variables.remove(name) + + # strip spurious spaces + for k, v in done.items(): --- python2.7-2.7.8.orig/debian/patches/langpack-gettext.diff +++ python2.7-2.7.8/debian/patches/langpack-gettext.diff @@ -0,0 +1,34 @@ +# DP: Description: support alternative gettext tree in +# DP: /usr/share/locale-langpack; if a file is present in both trees, +# DP: prefer the newer one +# DP: Upstream status: Ubuntu-Specific + +--- a/Lib/gettext.py ++++ b/Lib/gettext.py +@@ -446,11 +446,26 @@ + if lang == 'C': + break + mofile = os.path.join(localedir, lang, 'LC_MESSAGES', '%s.mo' % domain) ++ mofile_lp = os.path.join("/usr/share/locale-langpack", lang, ++ 'LC_MESSAGES', '%s.mo' % domain) ++ ++ # first look into the standard locale dir, then into the ++ # langpack locale dir ++ ++ # standard mo file + if os.path.exists(mofile): + if all: + result.append(mofile) + else: + return mofile ++ ++ # langpack mofile -> use it ++ if os.path.exists(mofile_lp): ++ if all: ++ result.append(mofile_lp) ++ else: ++ return mofile_lp ++ + return result + + --- python2.7-2.7.8.orig/debian/patches/lib2to3-no-pickled-grammar.diff +++ python2.7-2.7.8/debian/patches/lib2to3-no-pickled-grammar.diff @@ -0,0 +1,14 @@ +--- a/Lib/lib2to3/pgen2/driver.py ++++ b/Lib/lib2to3/pgen2/driver.py +@@ -119,7 +119,10 @@ + if force or not _newer(gp, gt): + logger.info("Generating grammar tables from %s", gt) + g = pgen.generate_grammar(gt) +- if save: ++ # the pickle files mismatch, when built on different architectures. ++ # don't save these for now. An alternative solution might be to ++ # include the multiarch triplet into the file name ++ if False: + logger.info("Writing grammar tables to %s", gp) + try: + g.dump(gp) --- python2.7-2.7.8.orig/debian/patches/libffi-shared.diff +++ python2.7-2.7.8/debian/patches/libffi-shared.diff @@ -0,0 +1,13 @@ +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -2131,7 +2131,7 @@ class PyBuildExt(build_ext): + break + ffi_lib = None + if ffi_inc is not None: +- for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'): ++ for lib_name in ('ffi', 'ffi_convenience', 'ffi_pic', 'ffi'): + if (self.compiler.find_library_file(lib_dirs, lib_name)): + ffi_lib = lib_name + break --- python2.7-2.7.8.orig/debian/patches/libre.diff +++ python2.7-2.7.8/debian/patches/libre.diff @@ -0,0 +1,9 @@ +--- Doc/lib/libre.tex~ 2003-07-25 09:29:22.000000000 +0200 ++++ Doc/lib/libre.tex 2003-07-25 09:30:58.000000000 +0200 +@@ -919,5 +919,5 @@ + Starting with Python 2.3, simple uses of the \regexp{*?} pattern are + special-cased to avoid recursion. Thus, the above regular expression + can avoid recursion by being recast as +-\regexp{Begin [a-zA-Z0-9_ ]*?end}. As a further benefit, such regular ++`Begin [a-zA-Z0-9_ ]*?end'. As a further benefit, such regular + expressions will run faster than their recursive equivalents. --- python2.7-2.7.8.orig/debian/patches/link-opt.diff +++ python2.7-2.7.8/debian/patches/link-opt.diff @@ -0,0 +1,26 @@ +# DP: Call the linker with -O1 -Bsymbolic-functions + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -2033,8 +2033,8 @@ then + fi + ;; + Linux*|GNU*|QNX*) +- LDSHARED='$(CC) -shared' +- LDCXXSHARED='$(CXX) -shared';; ++ LDSHARED='$(CC) -shared -Wl,-O1 -Wl,-Bsymbolic-functions' ++ LDCXXSHARED='$(CXX) -shared -Wl,-O1 -Wl,-Bsymbolic-functions';; + BSD/OS*/4*) + LDSHARED="gcc -shared" + LDCXXSHARED="g++ -shared";; +@@ -2136,7 +2136,7 @@ then + LINKFORSHARED="-Wl,-E -Wl,+s";; + # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; + BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; +- Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; ++ Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions";; + # -u libsys_s pulls in all symbols in libsys + Darwin/*) + # -u _PyMac_Error is needed to pull in the mac toolbox glue, --- python2.7-2.7.8.orig/debian/patches/link-system-expat.diff +++ python2.7-2.7.8/debian/patches/link-system-expat.diff @@ -0,0 +1,22 @@ +# DP: Link with the system expat + +--- a/Modules/Setup.dist ++++ b/Modules/Setup.dist +@@ -181,7 +181,7 @@ + #itertools itertoolsmodule.c # Functions creating iterators for efficient looping + #strop stropmodule.c # String manipulations + #_functools _functoolsmodule.c # Tools for working with functions and callable objects +-#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator ++#_elementtree -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator + #_pickle _pickle.c # pickle accelerator + #datetime datetimemodule.c # date/time type + #_bisect _bisectmodule.c # Bisection algorithms +@@ -475,7 +475,7 @@ + # + # More information on Expat can be found at www.libexpat.org. + # +-#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI ++#pyexpat pyexpat.c -lexpat + + + # Hye-Shik Chang's CJKCodecs --- python2.7-2.7.8.orig/debian/patches/link-whole-archive.diff +++ python2.7-2.7.8/debian/patches/link-whole-archive.diff @@ -0,0 +1,13 @@ +# DP: Link libpython with --whole-archive. + +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -447,7 +447,7 @@ + $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) + $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ \ + Modules/python.o \ +- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ++ -Wl,--whole-archive $(BLDLIBRARY) -Wl,--no-whole-archive $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + + platform: $(BUILDPYTHON) pybuilddir.txt + $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform --- python2.7-2.7.8.orig/debian/patches/locale-module.diff +++ python2.7-2.7.8/debian/patches/locale-module.diff @@ -0,0 +1,19 @@ +# DP: * Lib/locale.py: +# DP: - Don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding +# DP: for glibc. + +Index: b/Lib/locale.py +=================================================================== +--- a/Lib/locale.py ++++ b/Lib/locale.py +@@ -1690,8 +1690,8 @@ locale_alias = { + 'uk_ua.iso88595': 'uk_UA.ISO8859-5', + 'uk_ua.koi8u': 'uk_UA.KOI8-U', + 'uk_ua.microsoftcp1251': 'uk_UA.CP1251', +- 'univ': 'en_US.utf', +- 'universal': 'en_US.utf', ++ 'univ': 'en_US.UTF-8', ++ 'universal': 'en_US.UTF-8', + 'universal.utf8@ucs4': 'en_US.UTF-8', + 'unm_us': 'unm_US.UTF-8', + 'ur': 'ur_PK.CP1256', --- python2.7-2.7.8.orig/debian/patches/lto-link-flags.diff +++ python2.7-2.7.8/debian/patches/lto-link-flags.diff @@ -0,0 +1,22 @@ +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -123,8 +123,8 @@ + + # Symbols used for using shared libraries + SO= @SO@ +-LDSHARED= @LDSHARED@ $(LDFLAGS) +-BLDSHARED= @BLDSHARED@ $(LDFLAGS) ++LDSHARED= @LDSHARED@ $(PY_LDFLAGS) ++BLDSHARED= @BLDSHARED@ $(PY_LDFLAGS) $(PY_CFLAGS) + LDCXXSHARED= @LDCXXSHARED@ + DESTSHARED= $(BINLIBDEST)/lib-dynload + +@@ -445,7 +445,7 @@ + + # Build the interpreter + $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) +- $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ \ ++ $(LINKCC) $(PY_LDFLAGS) $(PY_CFLAGS) $(LINKFORSHARED) -o $@ \ + Modules/python.o \ + -Wl,--whole-archive $(BLDLIBRARY) -Wl,--no-whole-archive $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + --- python2.7-2.7.8.orig/debian/patches/makesetup-bashism.diff +++ python2.7-2.7.8/debian/patches/makesetup-bashism.diff @@ -0,0 +1,13 @@ +# DP: Fix bashism in makesetup shell script + +--- a/Modules/makesetup ++++ b/Modules/makesetup +@@ -281,7 +281,7 @@ + -) ;; + *) sedf="@sed.in.$$" + trap 'rm -f $sedf' 0 1 2 3 +- echo "1i\\" >$sedf ++ printf "1i\\" >$sedf + str="# Generated automatically from $makepre by makesetup." + echo "$str" >>$sedf + echo "s%_MODOBJS_%$OBJS%" >>$sedf --- python2.7-2.7.8.orig/debian/patches/multiarch.diff +++ python2.7-2.7.8/debian/patches/multiarch.diff @@ -0,0 +1,180 @@ +Index: b/Lib/sysconfig.py +=================================================================== +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -333,7 +333,7 @@ def get_makefile_filename(): + """Return the path of the Makefile.""" + if _PYTHON_BUILD: + return os.path.join(_PROJECT_BASE, "Makefile") +- return os.path.join(get_path('platstdlib').replace("/usr/local","/usr",1), "config" + (sys.pydebug and "_d" or ""), "Makefile") ++ return os.path.join(get_config_var('LIBPL'), "Makefile") + + # Issue #22199: retain undocumented private name for compatibility + _get_makefile_filename = get_makefile_filename +@@ -532,6 +532,12 @@ def get_config_vars(*args): + # the init-function. + _CONFIG_VARS['userbase'] = _getuserbase() + ++ multiarch = get_config_var('MULTIARCH') ++ if multiarch: ++ _CONFIG_VARS['multiarchsubdir'] = '/' + multiarch ++ else: ++ _CONFIG_VARS['multiarchsubdir'] = '' ++ + if 'srcdir' not in _CONFIG_VARS: + _CONFIG_VARS['srcdir'] = _PROJECT_BASE + +Index: b/Makefile.pre.in +=================================================================== +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -97,6 +97,9 @@ MACHDEP= @MACHDEP@ + # Multiarch directory (may be empty) + MULTIARCH= @MULTIARCH@ + ++# Multiarch directory (may be empty) ++MULTIARCH= @MULTIARCH@ ++ + # Install prefix for architecture-independent files + prefix= @prefix@ + +@@ -568,6 +571,10 @@ Makefile Modules/config.c: Makefile.pre + @mv config.c Modules + @echo "The Makefile was updated, you may need to re-run make." + ++Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile ++ $(CC) -c $(PY_CORE_CFLAGS) \ ++ $(if $(MULTIARCH),-DMULTIARCH='"$(MULTIARCH)"') \ ++ -o $@ $(srcdir)/Python/dynload_shlib.c + + Modules/Setup: $(srcdir)/Modules/Setup.dist + @if test -f Modules/Setup; then \ +@@ -932,7 +939,7 @@ maninstall: altmaninstall + (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python2.1 python.1) + + # Install the library +-PLATDIR= plat-$(MACHDEP) ++PLATDIR= plat-$(MULTIARCH) + EXTRAPLATDIR= @EXTRAPLATDIR@ + EXTRAMACHDEPPATH=@EXTRAMACHDEPPATH@ + MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR) +@@ -1093,10 +1100,10 @@ inclinstall: + + # Install the library and miscellaneous stuff needed for extending/embedding + # This goes into $(exec_prefix)$(DEBUG_EXT) +-LIBPL= $(LIBP)/config$(DEBUG_EXT) ++LIBPL= $(LIBP)/config-$(MULTIARCH)$(DEBUG_EXT) + + # pkgconfig directory +-LIBPC= $(LIBDIR)/pkgconfig ++LIBPC= $(LIBDIR)/$(MULTIARCH)/pkgconfig + + libainstall: all python-config + @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \ +@@ -1372,6 +1379,11 @@ patchcheck: + + Python/thread.o: @THREADHEADERS@ + ++Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile ++ $(CC) -c $(PY_CORE_CFLAGS) \ ++ -DMULTIARCH='"$(MULTIARCH)"' \ ++ -o $@ $(srcdir)/Python/sysmodule.c ++ + # Declare targets that aren't real files + .PHONY: all build_all sharedmods oldsharedmods test quicktest memtest + .PHONY: install altinstall oldsharedinstall bininstall altbininstall +Index: b/Modules/Setup.dist +=================================================================== +--- a/Modules/Setup.dist ++++ b/Modules/Setup.dist +@@ -91,7 +91,7 @@ SITEPATH= + TESTPATH= + + # Path components for machine- or system-dependent modules and shared libraries +-MACHDEPPATH=:plat-$(MACHDEP) ++MACHDEPPATH=:plat-$(MULTIARCH) + EXTRAMACHDEPPATH= + + # Path component for the Tkinter-related modules +Index: b/Python/dynload_shlib.c +=================================================================== +--- a/Python/dynload_shlib.c ++++ b/Python/dynload_shlib.c +@@ -49,6 +49,12 @@ const struct filedescr _PyImport_DynLoad + #ifdef Py_DEBUG + {"_d.so", "rb", C_EXTENSION}, + {"module_d.so", "rb", C_EXTENSION}, ++# ifdef MULTIARCH ++ {"." MULTIARCH "_d.so", "rb", C_EXTENSION}, ++# endif ++#endif ++#ifdef MULTIARCH ++ {"." MULTIARCH ".so", "rb", C_EXTENSION}, + #endif + {".so", "rb", C_EXTENSION}, + {"module.so", "rb", C_EXTENSION}, +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -675,6 +675,9 @@ fi + MULTIARCH=$($CC --print-multiarch 2>/dev/null) + AC_SUBST(MULTIARCH) + ++MULTIARCH=$($CC --print-multiarch 2>/dev/null) ++AC_SUBST(MULTIARCH) ++ + + # checks for UNIX variants that set C preprocessor variables + AC_USE_SYSTEM_EXTENSIONS +Index: b/Lib/distutils/sysconfig.py +=================================================================== +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -74,8 +74,6 @@ def get_python_inc(plat_specific=0, pref + If 'prefix' is supplied, use it instead of sys.prefix or + sys.exec_prefix -- i.e., ignore 'plat_specific'. + """ +- if prefix is None: +- prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": + if python_build: +@@ -90,7 +88,14 @@ def get_python_inc(plat_specific=0, pref + # Include is located in the srcdir + inc_dir = os.path.join(srcdir, "Include") + return inc_dir +- return os.path.join(prefix, "include", "python" + get_python_version())+(sys.pydebug and "_d" or "") ++ else: ++ if not (prefix is None): ++ return os.path.join(prefix, "include", ++ "python" + get_python_version())+(sys.pydebug and "_d" or "") ++ if plat_specific: ++ return get_config_var('CONFINCLUDEPY') ++ else: ++ return get_config_var('INCLUDEPY') + elif os.name == "nt": + return os.path.join(prefix, "include") + elif os.name == "os2": +@@ -263,7 +268,7 @@ def get_makefile_filename(): + if python_build: + return os.path.join(project_base, "Makefile") + lib_dir = get_python_lib(plat_specific=1, standard_lib=1) +- return os.path.join(lib_dir, "config"+(sys.pydebug and "_d" or ""), "Makefile") ++ return os.path.join(get_config_var('LIBPL'), "Makefile") + + + def parse_config_h(fp, g=None): +Index: b/Python/sysmodule.c +=================================================================== +--- a/Python/sysmodule.c ++++ b/Python/sysmodule.c +@@ -1453,6 +1453,8 @@ _PySys_Init(void) + PyFloat_GetInfo()); + SET_SYS_FROM_STRING("long_info", + PyLong_GetInfo()); ++ SET_SYS_FROM_STRING("_multiarch", ++ PyString_FromString(MULTIARCH)); + #ifdef Py_USING_UNICODE + SET_SYS_FROM_STRING("maxunicode", + PyInt_FromLong(PyUnicode_GetMax())); --- python2.7-2.7.8.orig/debian/patches/no-large-file-support.diff +++ python2.7-2.7.8/debian/patches/no-large-file-support.diff @@ -0,0 +1,14 @@ +# DP: disable large file support for GNU/Hurd + +--- a/configure.ac ++++ b/configure.ac +@@ -1434,6 +1434,9 @@ + use_lfs=no + fi + ++# Don't use largefile support anyway. ++use_lfs=no ++ + if test "$use_lfs" = "yes"; then + # Two defines needed to enable largefile support on various platforms + # These may affect some typedefs --- python2.7-2.7.8.orig/debian/patches/no-ssl3.diff +++ python2.7-2.7.8/debian/patches/no-ssl3.diff @@ -0,0 +1,159 @@ +# DP: Allow building and testing without SSLv3 support + +Index: b/Doc/library/ssl.rst +=================================================================== +--- a/Doc/library/ssl.rst ++++ b/Doc/library/ssl.rst +@@ -192,7 +192,7 @@ instead. + ------------------------ --------- --------- ---------- --------- ----------- ----------- + *SSLv2* yes no yes no no no + *SSLv3* no yes yes no no no +- *SSLv23* yes no yes no no no ++ *SSLv23* yes yes yes yes yes yes + *TLSv1* no no yes yes no no + *TLSv1.1* no no yes no yes no + *TLSv1.2* no no yes no no yes +@@ -516,6 +516,10 @@ Constants + Selects the highest protocol version that both the client and server support. + Despite the name, this option can select "TLS" protocols as well as "SSL". + ++ You should always use this for both client and server. ++ ++ You can alter the behaviour of it with settings like OP_NO_TLSv1_2. ++ + .. data:: PROTOCOL_SSLv2 + + Selects SSL version 2 as the channel encryption protocol. +@@ -531,6 +535,9 @@ Constants + + Selects SSL version 3 as the channel encryption protocol. + ++ This protocol is not available if OpenSSL is compiled with OPENSSL_NO_SSL3 ++ flag. ++ + .. warning:: + + SSL version 3 is insecure. Its use is highly discouraged. +@@ -548,9 +555,8 @@ Constants + + .. data:: PROTOCOL_TLSv1_2 + +- Selects TLS version 1.2 as the channel encryption protocol. This is the +- most modern version, and probably the best choice for maximum protection, +- if both sides can speak it. Available only with openssl version 1.0.1+. ++ Selects TLS version 1.2 as the channel encryption protocol. ++ Available only with openssl version 1.0.1+. + + .. versionadded:: 2.7.9 + +Index: b/Lib/test/test_ftplib.py +=================================================================== +--- a/Lib/test/test_ftplib.py ++++ b/Lib/test/test_ftplib.py +@@ -693,7 +693,7 @@ class TestTLS_FTPClass(TestCase): + + def test_auth_ssl(self): + try: +- self.client.ssl_version = ssl.PROTOCOL_SSLv3 ++ self.client.ssl_version = ssl.PROTOCOL_SSLv23 + self.client.auth() + self.assertRaises(ValueError, self.client.auth) + finally: +Index: b/Lib/test/test_ssl.py +=================================================================== +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -2223,20 +2223,24 @@ else: + sys.stdout.write( + " SSL2 client to SSL23 server test unexpectedly failed:\n %s\n" + % str(x)) +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3') ++ if hasattr(ssl, 'PROTOCOL_SSLv3'): ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3') + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True) + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, 'TLSv1') + +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3', ssl.CERT_OPTIONAL) ++ if hasattr(ssl, 'PROTOCOL_SSLv3'): ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3', ssl.CERT_OPTIONAL) + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_OPTIONAL) + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, 'TLSv1', ssl.CERT_OPTIONAL) + +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3', ssl.CERT_REQUIRED) ++ if hasattr(ssl, 'PROTOCOL_SSLv3'): ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, 'SSLv3', ssl.CERT_REQUIRED) + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_REQUIRED) + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, 'TLSv1', ssl.CERT_REQUIRED) + + # Server with specific SSL options +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ++ if hasattr(ssl, 'PROTOCOL_SSLv3'): ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, + server_options=ssl.OP_NO_SSLv3) + # Will choose TLSv1 + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, +@@ -2246,6 +2250,8 @@ else: + + + @skip_if_broken_ubuntu_ssl ++ @unittest.skipUnless(hasattr(ssl, 'PROTOCOL_SSLv3'), ++ "OpenSSL is compiled without SSLv3 support") + def test_protocol_sslv3(self): + """Connecting to an SSLv3 server with various client options""" + if support.verbose: +@@ -2273,7 +2279,8 @@ else: + try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, 'TLSv1', ssl.CERT_REQUIRED) + if hasattr(ssl, 'PROTOCOL_SSLv2'): + try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv2, False) +- try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv3, False) ++ if hasattr(ssl, 'PROTOCOL_SSLv3'): ++ try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv3, False) + try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False, + client_options=ssl.OP_NO_TLSv1) + +@@ -2288,7 +2295,8 @@ else: + try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1_1, 'TLSv1.1') + if hasattr(ssl, 'PROTOCOL_SSLv2'): + try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_SSLv2, False) +- try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_SSLv3, False) ++ if hasattr(ssl, 'PROTOCOL_SSLv3'): ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_SSLv3, False) + try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_SSLv23, False, + client_options=ssl.OP_NO_TLSv1_1) + +@@ -2310,7 +2318,8 @@ else: + client_options=ssl.OP_NO_SSLv3|ssl.OP_NO_SSLv2,) + if hasattr(ssl, 'PROTOCOL_SSLv2'): + try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_SSLv2, False) +- try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_SSLv3, False) ++ if hasattr(ssl, 'PROTOCOL_SSLv3'): ++ try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_SSLv3, False) + try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_SSLv23, False, + client_options=ssl.OP_NO_TLSv1_2) + +Index: b/Modules/_ssl.c +=================================================================== +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -1997,8 +1997,10 @@ context_new(PyTypeObject *type, PyObject + else if (proto_version == PY_SSL_VERSION_TLS1_2) + ctx = SSL_CTX_new(TLSv1_2_method()); + #endif ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + ctx = SSL_CTX_new(SSLv3_method()); ++#endif + #ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + ctx = SSL_CTX_new(SSLv2_method()); +@@ -4029,8 +4031,10 @@ init_ssl(void) + PyModule_AddIntConstant(m, "PROTOCOL_SSLv2", + PY_SSL_VERSION_SSL2); + #endif ++#ifndef OPENSSL_NO_SSL3 + PyModule_AddIntConstant(m, "PROTOCOL_SSLv3", + PY_SSL_VERSION_SSL3); ++#endif + PyModule_AddIntConstant(m, "PROTOCOL_SSLv23", + PY_SSL_VERSION_SSL23); + PyModule_AddIntConstant(m, "PROTOCOL_TLSv1", --- python2.7-2.7.8.orig/debian/patches/no-zip-on-sys.path.diff +++ python2.7-2.7.8/debian/patches/no-zip-on-sys.path.diff @@ -0,0 +1,52 @@ +# DP: Do not add /usr/lib/pythonXY.zip on sys.path. + +--- a/Modules/getpath.c ++++ b/Modules/getpath.c +@@ -395,7 +395,9 @@ + char *path = getenv("PATH"); + char *prog = Py_GetProgramName(); + char argv0_path[MAXPATHLEN+1]; ++#ifdef WITH_ZIP_PATH + char zip_path[MAXPATHLEN+1]; ++#endif + int pfound, efound; /* 1 if found; -1 if found build directory */ + char *buf; + size_t bufsz; +@@ -535,6 +537,7 @@ + else + reduce(prefix); + ++#ifdef WITH_ZIP_PATH + strncpy(zip_path, prefix, MAXPATHLEN); + zip_path[MAXPATHLEN] = '\0'; + if (pfound > 0) { /* Use the reduced prefix returned by Py_GetPrefix() */ +@@ -547,6 +550,7 @@ + bufsz = strlen(zip_path); /* Replace "00" with version */ + zip_path[bufsz - 6] = VERSION[0]; + zip_path[bufsz - 5] = VERSION[2]; ++#endif + + if (!(efound = search_for_exec_prefix(argv0_path, home))) { + if (!Py_FrozenFlag) +@@ -586,7 +590,9 @@ + defpath = delim + 1; + } + ++#ifdef WITH_ZIP_PATH + bufsz += strlen(zip_path) + 1; ++#endif + bufsz += strlen(exec_prefix) + 1; + + /* This is the only malloc call in this file */ +@@ -607,9 +613,11 @@ + else + buf[0] = '\0'; + ++#ifdef WITH_ZIP_PATH + /* Next is the default zip path */ + strcat(buf, zip_path); + strcat(buf, delimiter); ++#endif + + /* Next goes merge of compile-time $PYTHONPATH with + * dynamically located prefix. --- python2.7-2.7.8.orig/debian/patches/plat-gnukfreebsd.diff +++ python2.7-2.7.8/debian/patches/plat-gnukfreebsd.diff @@ -0,0 +1,2478 @@ +--- /dev/null ++++ b/Lib/plat-gnukfreebsd7/IN.py +@@ -0,0 +1,809 @@ ++# Generated by h2py from /usr/include/netinet/in.h ++_NETINET_IN_H = 1 ++ ++# Included from features.h ++_FEATURES_H = 1 ++__USE_ANSI = 1 ++__FAVOR_BSD = 1 ++_ISOC99_SOURCE = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 200809L ++_XOPEN_SOURCE = 700 ++_XOPEN_SOURCE_EXTENDED = 1 ++_LARGEFILE64_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++_ATFILE_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++__USE_ISOC99 = 1 ++__USE_ISOC95 = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 2 ++_POSIX_C_SOURCE = 199506L ++_POSIX_C_SOURCE = 200112L ++_POSIX_C_SOURCE = 200809L ++__USE_POSIX_IMPLICITLY = 1 ++__USE_POSIX = 1 ++__USE_POSIX2 = 1 ++__USE_POSIX199309 = 1 ++__USE_POSIX199506 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN2K8 = 1 ++_ATFILE_SOURCE = 1 ++__USE_XOPEN = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_UNIX98 = 1 ++_LARGEFILE_SOURCE = 1 ++__USE_XOPEN2K8 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_FILE_OFFSET64 = 1 ++__USE_MISC = 1 ++__USE_BSD = 1 ++__USE_SVID = 1 ++__USE_ATFILE = 1 ++__USE_GNU = 1 ++__USE_REENTRANT = 1 ++__USE_FORTIFY_LEVEL = 2 ++__USE_FORTIFY_LEVEL = 1 ++__USE_FORTIFY_LEVEL = 0 ++ ++# Included from bits/predefs.h ++__STDC_IEC_559__ = 1 ++__STDC_IEC_559_COMPLEX__ = 1 ++__STDC_ISO_10646__ = 200009L ++__GNU_LIBRARY__ = 6 ++__GLIBC__ = 2 ++__GLIBC_MINOR__ = 11 ++__GLIBC_HAVE_LONG_LONG = 1 ++ ++# Included from sys/cdefs.h ++_SYS_CDEFS_H = 1 ++def __NTH(fct): return fct ++ ++def __NTH(fct): return fct ++ ++def __P(args): return args ++ ++def __PMT(args): return args ++ ++def __STRING(x): return #x ++ ++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) ++ ++def __bos0(ptr): return __builtin_object_size (ptr, 0) ++ ++def __warnattr(msg): return __attribute__((__warning__ (msg))) ++ ++__flexarr = [] ++__flexarr = [0] ++__flexarr = [] ++__flexarr = [1] ++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname) ++ ++def __attribute__(xyz): return ++ ++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x))) ++ ++def __attribute_format_arg__(x): return ++ ++ ++# Included from bits/wordsize.h ++__WORDSIZE = 32 ++__LDBL_COMPAT = 1 ++def __LDBL_REDIR_DECL(name): return \ ++ ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_EXTERN_INLINES = 1 ++__USE_EXTERN_INLINES_IN_LIBC = 1 ++ ++# Included from gnu/stubs.h ++ ++# Included from stdint.h ++_STDINT_H = 1 ++ ++# Included from bits/wchar.h ++_BITS_WCHAR_H = 1 ++__WCHAR_MAX = (2147483647) ++__WCHAR_MIN = (-__WCHAR_MAX - 1) ++def __INT64_C(c): return c ## L ++ ++def __UINT64_C(c): return c ## UL ++ ++def __INT64_C(c): return c ## LL ++ ++def __UINT64_C(c): return c ## ULL ++ ++INT8_MIN = (-128) ++INT16_MIN = (-32767-1) ++INT32_MIN = (-2147483647-1) ++INT64_MIN = (-__INT64_C(9223372036854775807)-1) ++INT8_MAX = (127) ++INT16_MAX = (32767) ++INT32_MAX = (2147483647) ++INT64_MAX = (__INT64_C(9223372036854775807)) ++UINT8_MAX = (255) ++UINT16_MAX = (65535) ++UINT64_MAX = (__UINT64_C(18446744073709551615)) ++INT_LEAST8_MIN = (-128) ++INT_LEAST16_MIN = (-32767-1) ++INT_LEAST32_MIN = (-2147483647-1) ++INT_LEAST64_MIN = (-__INT64_C(9223372036854775807)-1) ++INT_LEAST8_MAX = (127) ++INT_LEAST16_MAX = (32767) ++INT_LEAST32_MAX = (2147483647) ++INT_LEAST64_MAX = (__INT64_C(9223372036854775807)) ++UINT_LEAST8_MAX = (255) ++UINT_LEAST16_MAX = (65535) ++UINT_LEAST64_MAX = (__UINT64_C(18446744073709551615)) ++INT_FAST8_MIN = (-128) ++INT_FAST16_MIN = (-9223372036854775807L-1) ++INT_FAST32_MIN = (-9223372036854775807L-1) ++INT_FAST16_MIN = (-2147483647-1) ++INT_FAST32_MIN = (-2147483647-1) ++INT_FAST64_MIN = (-__INT64_C(9223372036854775807)-1) ++INT_FAST8_MAX = (127) ++INT_FAST16_MAX = (9223372036854775807L) ++INT_FAST32_MAX = (9223372036854775807L) ++INT_FAST16_MAX = (2147483647) ++INT_FAST32_MAX = (2147483647) ++INT_FAST64_MAX = (__INT64_C(9223372036854775807)) ++UINT_FAST8_MAX = (255) ++UINT_FAST64_MAX = (__UINT64_C(18446744073709551615)) ++INTPTR_MIN = (-9223372036854775807L-1) ++INTPTR_MAX = (9223372036854775807L) ++INTPTR_MIN = (-2147483647-1) ++INTPTR_MAX = (2147483647) ++INTMAX_MIN = (-__INT64_C(9223372036854775807)-1) ++INTMAX_MAX = (__INT64_C(9223372036854775807)) ++UINTMAX_MAX = (__UINT64_C(18446744073709551615)) ++PTRDIFF_MIN = (-9223372036854775807L-1) ++PTRDIFF_MAX = (9223372036854775807L) ++PTRDIFF_MIN = (-2147483647-1) ++PTRDIFF_MAX = (2147483647) ++SIG_ATOMIC_MIN = (-2147483647-1) ++SIG_ATOMIC_MAX = (2147483647) ++WCHAR_MIN = __WCHAR_MIN ++WCHAR_MAX = __WCHAR_MAX ++def INT8_C(c): return c ++ ++def INT16_C(c): return c ++ ++def INT32_C(c): return c ++ ++def INT64_C(c): return c ## L ++ ++def INT64_C(c): return c ## LL ++ ++def UINT8_C(c): return c ++ ++def UINT16_C(c): return c ++ ++def UINT32_C(c): return c ## U ++ ++def UINT64_C(c): return c ## UL ++ ++def UINT64_C(c): return c ## ULL ++ ++def INTMAX_C(c): return c ## L ++ ++def UINTMAX_C(c): return c ## UL ++ ++def INTMAX_C(c): return c ## LL ++ ++def UINTMAX_C(c): return c ## ULL ++ ++ ++# Included from sys/socket.h ++_SYS_SOCKET_H = 1 ++ ++# Included from sys/uio.h ++_SYS_UIO_H = 1 ++from TYPES import * ++ ++# Included from bits/uio.h ++_BITS_UIO_H = 1 ++from TYPES import * ++UIO_MAXIOV = 1024 ++ ++# Included from bits/sigset.h ++_SIGSET_H_types = 1 ++_SIGSET_H_fns = 1 ++def __sigword(sig): return (((sig) - 1) >> 5) ++ ++def __sigemptyset(set): return \ ++ ++def __sigfillset(set): return \ ++ ++def __sigisemptyset(set): return \ ++ ++ ++# Included from bits/socket.h ++__BITS_SOCKET_H = 1 ++ ++# Included from limits.h ++_LIBC_LIMITS_H_ = 1 ++MB_LEN_MAX = 16 ++_LIMITS_H = 1 ++CHAR_BIT = 8 ++SCHAR_MIN = (-128) ++SCHAR_MAX = 127 ++UCHAR_MAX = 255 ++CHAR_MIN = 0 ++CHAR_MAX = UCHAR_MAX ++CHAR_MIN = SCHAR_MIN ++CHAR_MAX = SCHAR_MAX ++SHRT_MIN = (-32768) ++SHRT_MAX = 32767 ++USHRT_MAX = 65535 ++INT_MAX = 2147483647 ++LONG_MAX = 9223372036854775807L ++LONG_MAX = 2147483647L ++LONG_MIN = (-LONG_MAX - 1L) ++ ++# Included from bits/posix1_lim.h ++_BITS_POSIX1_LIM_H = 1 ++_POSIX_AIO_LISTIO_MAX = 2 ++_POSIX_AIO_MAX = 1 ++_POSIX_ARG_MAX = 4096 ++_POSIX_CHILD_MAX = 25 ++_POSIX_CHILD_MAX = 6 ++_POSIX_DELAYTIMER_MAX = 32 ++_POSIX_HOST_NAME_MAX = 255 ++_POSIX_LINK_MAX = 8 ++_POSIX_LOGIN_NAME_MAX = 9 ++_POSIX_MAX_CANON = 255 ++_POSIX_MAX_INPUT = 255 ++_POSIX_MQ_OPEN_MAX = 8 ++_POSIX_MQ_PRIO_MAX = 32 ++_POSIX_NAME_MAX = 14 ++_POSIX_NGROUPS_MAX = 8 ++_POSIX_NGROUPS_MAX = 0 ++_POSIX_OPEN_MAX = 20 ++_POSIX_OPEN_MAX = 16 ++_POSIX_FD_SETSIZE = _POSIX_OPEN_MAX ++_POSIX_PATH_MAX = 256 ++_POSIX_PIPE_BUF = 512 ++_POSIX_RE_DUP_MAX = 255 ++_POSIX_RTSIG_MAX = 8 ++_POSIX_SEM_NSEMS_MAX = 256 ++_POSIX_SEM_VALUE_MAX = 32767 ++_POSIX_SIGQUEUE_MAX = 32 ++_POSIX_SSIZE_MAX = 32767 ++_POSIX_STREAM_MAX = 8 ++_POSIX_SYMLINK_MAX = 255 ++_POSIX_SYMLOOP_MAX = 8 ++_POSIX_TIMER_MAX = 32 ++_POSIX_TTY_NAME_MAX = 9 ++_POSIX_TZNAME_MAX = 6 ++_POSIX_QLIMIT = 1 ++_POSIX_HIWAT = _POSIX_PIPE_BUF ++_POSIX_UIO_MAXIOV = 16 ++_POSIX_CLOCKRES_MIN = 20000000 ++ ++# Included from bits/local_lim.h ++ ++# Included from sys/syslimits.h ++ARG_MAX = 262144 ++CHILD_MAX = 40 ++LINK_MAX = 32767 ++MAX_CANON = 255 ++MAX_INPUT = 255 ++NAME_MAX = 255 ++NGROUPS_MAX = 1023 ++OPEN_MAX = 64 ++PATH_MAX = 1024 ++PIPE_BUF = 512 ++IOV_MAX = 1024 ++_POSIX_THREAD_KEYS_MAX = 128 ++PTHREAD_KEYS_MAX = 1024 ++_POSIX_THREAD_DESTRUCTOR_ITERATIONS = 4 ++PTHREAD_DESTRUCTOR_ITERATIONS = _POSIX_THREAD_DESTRUCTOR_ITERATIONS ++_POSIX_THREAD_THREADS_MAX = 64 ++PTHREAD_THREADS_MAX = 1024 ++AIO_PRIO_DELTA_MAX = 20 ++PTHREAD_STACK_MIN = 16384 ++TIMER_MAX = 256 ++DELAYTIMER_MAX = 2147483647 ++SSIZE_MAX = LONG_MAX ++NGROUPS_MAX = 8 ++ ++# Included from bits/posix2_lim.h ++_BITS_POSIX2_LIM_H = 1 ++_POSIX2_BC_BASE_MAX = 99 ++_POSIX2_BC_DIM_MAX = 2048 ++_POSIX2_BC_SCALE_MAX = 99 ++_POSIX2_BC_STRING_MAX = 1000 ++_POSIX2_COLL_WEIGHTS_MAX = 2 ++_POSIX2_EXPR_NEST_MAX = 32 ++_POSIX2_LINE_MAX = 2048 ++_POSIX2_RE_DUP_MAX = 255 ++_POSIX2_CHARCLASS_NAME_MAX = 14 ++BC_BASE_MAX = _POSIX2_BC_BASE_MAX ++BC_DIM_MAX = _POSIX2_BC_DIM_MAX ++BC_SCALE_MAX = _POSIX2_BC_SCALE_MAX ++BC_STRING_MAX = _POSIX2_BC_STRING_MAX ++COLL_WEIGHTS_MAX = 255 ++EXPR_NEST_MAX = _POSIX2_EXPR_NEST_MAX ++LINE_MAX = _POSIX2_LINE_MAX ++CHARCLASS_NAME_MAX = 2048 ++RE_DUP_MAX = (0x7fff) ++ ++# Included from bits/xopen_lim.h ++_XOPEN_LIM_H = 1 ++ ++# Included from bits/stdio_lim.h ++L_tmpnam = 20 ++TMP_MAX = 238328 ++FILENAME_MAX = 1024 ++L_ctermid = 9 ++L_cuserid = 9 ++FOPEN_MAX = 64 ++IOV_MAX = 1024 ++_XOPEN_IOV_MAX = _POSIX_UIO_MAXIOV ++NL_ARGMAX = _POSIX_ARG_MAX ++NL_LANGMAX = _POSIX2_LINE_MAX ++NL_MSGMAX = INT_MAX ++NL_NMAX = INT_MAX ++NL_SETMAX = INT_MAX ++NL_TEXTMAX = INT_MAX ++NZERO = 20 ++WORD_BIT = 16 ++WORD_BIT = 32 ++WORD_BIT = 64 ++WORD_BIT = 16 ++WORD_BIT = 32 ++WORD_BIT = 64 ++WORD_BIT = 32 ++LONG_BIT = 32 ++LONG_BIT = 64 ++LONG_BIT = 32 ++LONG_BIT = 64 ++LONG_BIT = 64 ++LONG_BIT = 32 ++ ++# Included from bits/types.h ++_BITS_TYPES_H = 1 ++__S32_TYPE = int ++__SWORD_TYPE = int ++__SLONG32_TYPE = int ++ ++# Included from bits/typesizes.h ++_BITS_TYPESIZES_H = 1 ++__PID_T_TYPE = __S32_TYPE ++__CLOCK_T_TYPE = __S32_TYPE ++__SWBLK_T_TYPE = __S32_TYPE ++__CLOCKID_T_TYPE = __S32_TYPE ++__TIMER_T_TYPE = __S32_TYPE ++__SSIZE_T_TYPE = __SWORD_TYPE ++__FD_SETSIZE = 1024 ++PF_UNSPEC = 0 ++PF_LOCAL = 1 ++PF_UNIX = PF_LOCAL ++PF_FILE = PF_LOCAL ++PF_INET = 2 ++PF_IMPLINK = 3 ++PF_PUP = 4 ++PF_CHAOS = 5 ++PF_NS = 6 ++PF_ISO = 7 ++PF_OSI = PF_ISO ++PF_ECMA = 8 ++PF_DATAKIT = 9 ++PF_CCITT = 10 ++PF_SNA = 11 ++PF_DECnet = 12 ++PF_DLI = 13 ++PF_LAT = 14 ++PF_HYLINK = 15 ++PF_APPLETALK = 16 ++PF_ROUTE = 17 ++PF_LINK = 18 ++PF_XTP = 19 ++PF_COIP = 20 ++PF_CNT = 21 ++PF_RTIP = 22 ++PF_IPX = 23 ++PF_SIP = 24 ++PF_PIP = 25 ++PF_ISDN = 26 ++PF_KEY = 27 ++PF_INET6 = 28 ++PF_NATM = 29 ++PF_ATM = 30 ++PF_HDRCMPLT = 31 ++PF_NETGRAPH = 32 ++PF_MAX = 33 ++AF_UNSPEC = PF_UNSPEC ++AF_LOCAL = PF_LOCAL ++AF_UNIX = PF_UNIX ++AF_FILE = PF_FILE ++AF_INET = PF_INET ++AF_IMPLINK = PF_IMPLINK ++AF_PUP = PF_PUP ++AF_CHAOS = PF_CHAOS ++AF_NS = PF_NS ++AF_ISO = PF_ISO ++AF_OSI = PF_OSI ++AF_ECMA = PF_ECMA ++AF_DATAKIT = PF_DATAKIT ++AF_CCITT = PF_CCITT ++AF_SNA = PF_SNA ++AF_DECnet = PF_DECnet ++AF_DLI = PF_DLI ++AF_LAT = PF_LAT ++AF_HYLINK = PF_HYLINK ++AF_APPLETALK = PF_APPLETALK ++AF_ROUTE = PF_ROUTE ++AF_LINK = PF_LINK ++pseudo_AF_XTP = PF_XTP ++AF_COIP = PF_COIP ++AF_CNT = PF_CNT ++pseudo_AF_RTIP = PF_RTIP ++AF_IPX = PF_IPX ++AF_SIP = PF_SIP ++pseudo_AF_PIP = PF_PIP ++AF_ISDN = PF_ISDN ++AF_E164 = AF_ISDN ++pseudo_AF_KEY = PF_KEY ++AF_INET6 = PF_INET6 ++AF_NATM = PF_NATM ++AF_ATM = PF_ATM ++pseudo_AF_HDRCMPLT = PF_HDRCMPLT ++AF_NETGRAPH = PF_NETGRAPH ++AF_MAX = PF_MAX ++SOMAXCONN = 128 ++ ++# Included from bits/sockaddr.h ++_BITS_SOCKADDR_H = 1 ++def __SOCKADDR_COMMON(sa_prefix): return \ ++ ++_HAVE_SA_LEN = 1 ++_SS_SIZE = 128 ++def CMSG_FIRSTHDR(mhdr): return \ ++ ++CMGROUP_MAX = 16 ++SOL_SOCKET = 0xffff ++LOCAL_PEERCRED = 0x001 ++LOCAL_CREDS = 0x002 ++LOCAL_CONNWAIT = 0x004 ++ ++# Included from bits/socket2.h ++def IN_CLASSA(a): return ((((in_addr_t)(a)) & (-2147483648)) == 0) ++ ++IN_CLASSA_NET = (-16777216) ++IN_CLASSA_NSHIFT = 24 ++IN_CLASSA_HOST = ((-1) & ~IN_CLASSA_NET) ++IN_CLASSA_MAX = 128 ++def IN_CLASSB(a): return ((((in_addr_t)(a)) & (-1073741824)) == (-2147483648)) ++ ++IN_CLASSB_NET = (-65536) ++IN_CLASSB_NSHIFT = 16 ++IN_CLASSB_HOST = ((-1) & ~IN_CLASSB_NET) ++IN_CLASSB_MAX = 65536 ++def IN_CLASSC(a): return ((((in_addr_t)(a)) & (-536870912)) == (-1073741824)) ++ ++IN_CLASSC_NET = (-256) ++IN_CLASSC_NSHIFT = 8 ++IN_CLASSC_HOST = ((-1) & ~IN_CLASSC_NET) ++def IN_CLASSD(a): return ((((in_addr_t)(a)) & (-268435456)) == (-536870912)) ++ ++def IN_MULTICAST(a): return IN_CLASSD(a) ++ ++def IN_EXPERIMENTAL(a): return ((((in_addr_t)(a)) & (-536870912)) == (-536870912)) ++ ++def IN_BADCLASS(a): return ((((in_addr_t)(a)) & (-268435456)) == (-268435456)) ++ ++IN_LOOPBACKNET = 127 ++INET_ADDRSTRLEN = 16 ++INET6_ADDRSTRLEN = 46 ++ ++# Included from bits/in.h ++IMPLINK_IP = 155 ++IMPLINK_LOWEXPER = 156 ++IMPLINK_HIGHEXPER = 158 ++IPPROTO_DIVERT = 258 ++SOL_IP = 0 ++IP_OPTIONS = 1 ++IP_HDRINCL = 2 ++IP_TOS = 3 ++IP_TTL = 4 ++IP_RECVOPTS = 5 ++IP_RECVRETOPTS = 6 ++IP_RECVDSTADDR = 7 ++IP_SENDSRCADDR = IP_RECVDSTADDR ++IP_RETOPTS = 8 ++IP_MULTICAST_IF = 9 ++IP_MULTICAST_TTL = 10 ++IP_MULTICAST_LOOP = 11 ++IP_ADD_MEMBERSHIP = 12 ++IP_DROP_MEMBERSHIP = 13 ++IP_MULTICAST_VIF = 14 ++IP_RSVP_ON = 15 ++IP_RSVP_OFF = 16 ++IP_RSVP_VIF_ON = 17 ++IP_RSVP_VIF_OFF = 18 ++IP_PORTRANGE = 19 ++IP_RECVIF = 20 ++IP_IPSEC_POLICY = 21 ++IP_FAITH = 22 ++IP_ONESBCAST = 23 ++IP_NONLOCALOK = 24 ++IP_FW_TABLE_ADD = 40 ++IP_FW_TABLE_DEL = 41 ++IP_FW_TABLE_FLUSH = 42 ++IP_FW_TABLE_GETSIZE = 43 ++IP_FW_TABLE_LIST = 44 ++IP_FW_ADD = 50 ++IP_FW_DEL = 51 ++IP_FW_FLUSH = 52 ++IP_FW_ZERO = 53 ++IP_FW_GET = 54 ++IP_FW_RESETLOG = 55 ++IP_FW_NAT_CFG = 56 ++IP_FW_NAT_DEL = 57 ++IP_FW_NAT_GET_CONFIG = 58 ++IP_FW_NAT_GET_LOG = 59 ++IP_DUMMYNET_CONFIGURE = 60 ++IP_DUMMYNET_DEL = 61 ++IP_DUMMYNET_FLUSH = 62 ++IP_DUMMYNET_GET = 64 ++IP_RECVTTL = 65 ++IP_MINTTL = 66 ++IP_DONTFRAG = 67 ++IP_ADD_SOURCE_MEMBERSHIP = 70 ++IP_DROP_SOURCE_MEMBERSHIP = 71 ++IP_BLOCK_SOURCE = 72 ++IP_UNBLOCK_SOURCE = 73 ++IP_MSFILTER = 74 ++MCAST_JOIN_GROUP = 80 ++MCAST_LEAVE_GROUP = 81 ++MCAST_JOIN_SOURCE_GROUP = 82 ++MCAST_LEAVE_SOURCE_GROUP = 83 ++MCAST_BLOCK_SOURCE = 84 ++MCAST_UNBLOCK_SOURCE = 85 ++IP_DEFAULT_MULTICAST_TTL = 1 ++IP_DEFAULT_MULTICAST_LOOP = 1 ++IP_MIN_MEMBERSHIPS = 31 ++IP_MAX_MEMBERSHIPS = 4095 ++IP_MAX_SOURCE_FILTER = 1024 ++MCAST_UNDEFINED = 0 ++MCAST_INCLUDE = 1 ++MCAST_EXCLUDE = 2 ++IP_PORTRANGE_DEFAULT = 0 ++IP_PORTRANGE_HIGH = 1 ++IP_PORTRANGE_LOW = 2 ++IPCTL_FORWARDING = 1 ++IPCTL_SENDREDIRECTS = 2 ++IPCTL_DEFTTL = 3 ++IPCTL_DEFMTU = 4 ++IPCTL_RTEXPIRE = 5 ++IPCTL_RTMINEXPIRE = 6 ++IPCTL_RTMAXCACHE = 7 ++IPCTL_SOURCEROUTE = 8 ++IPCTL_DIRECTEDBROADCAST = 9 ++IPCTL_INTRQMAXLEN = 10 ++IPCTL_INTRQDROPS = 11 ++IPCTL_STATS = 12 ++IPCTL_ACCEPTSOURCEROUTE = 13 ++IPCTL_FASTFORWARDING = 14 ++IPCTL_KEEPFAITH = 15 ++IPCTL_GIF_TTL = 16 ++IPCTL_MAXID = 17 ++IPV6_SOCKOPT_RESERVED1 = 3 ++IPV6_UNICAST_HOPS = 4 ++IPV6_MULTICAST_IF = 9 ++IPV6_MULTICAST_HOPS = 10 ++IPV6_MULTICAST_LOOP = 11 ++IPV6_JOIN_GROUP = 12 ++IPV6_LEAVE_GROUP = 13 ++IPV6_PORTRANGE = 14 ++ICMP6_FILTER = 18 ++IPV6_CHECKSUM = 26 ++IPV6_V6ONLY = 27 ++IPV6_IPSEC_POLICY = 28 ++IPV6_FAITH = 29 ++IPV6_FW_ADD = 30 ++IPV6_FW_DEL = 31 ++IPV6_FW_FLUSH = 32 ++IPV6_FW_ZERO = 33 ++IPV6_FW_GET = 34 ++IPV6_RTHDRDSTOPTS = 35 ++IPV6_RECVPKTINFO = 36 ++IPV6_RECVHOPLIMIT = 37 ++IPV6_RECVRTHDR = 38 ++IPV6_RECVHOPOPTS = 39 ++IPV6_RECVDSTOPTS = 40 ++IPV6_USE_MIN_MTU = 42 ++IPV6_RECVPATHMTU = 43 ++IPV6_PATHMTU = 44 ++IPV6_PKTINFO = 46 ++IPV6_HOPLIMIT = 47 ++IPV6_NEXTHOP = 48 ++IPV6_HOPOPTS = 49 ++IPV6_DSTOPTS = 50 ++IPV6_RTHDR = 51 ++IPV6_RECVTCLASS = 57 ++IPV6_AUTOFLOWLABEL = 59 ++IPV6_TCLASS = 61 ++IPV6_DONTFRAG = 62 ++IPV6_PREFER_TEMPADDR = 63 ++IPV6_ADD_MEMBERSHIP = IPV6_JOIN_GROUP ++IPV6_DROP_MEMBERSHIP = IPV6_LEAVE_GROUP ++IPV6_RXHOPOPTS = IPV6_HOPOPTS ++IPV6_RXDSTOPTS = IPV6_DSTOPTS ++SOL_IPV6 = 41 ++SOL_ICMPV6 = 58 ++IPV6_DEFAULT_MULTICAST_HOPS = 1 ++IPV6_DEFAULT_MULTICAST_LOOP = 1 ++IPV6_PORTRANGE_DEFAULT = 0 ++IPV6_PORTRANGE_HIGH = 1 ++IPV6_PORTRANGE_LOW = 2 ++IPV6_RTHDR_LOOSE = 0 ++IPV6_RTHDR_STRICT = 1 ++IPV6_RTHDR_TYPE_0 = 0 ++IPV6CTL_FORWARDING = 1 ++IPV6CTL_SENDREDIRECTS = 2 ++IPV6CTL_DEFHLIM = 3 ++IPV6CTL_FORWSRCRT = 5 ++IPV6CTL_STATS = 6 ++IPV6CTL_MRTSTATS = 7 ++IPV6CTL_MRTPROTO = 8 ++IPV6CTL_MAXFRAGPACKETS = 9 ++IPV6CTL_SOURCECHECK = 10 ++IPV6CTL_SOURCECHECK_LOGINT = 11 ++IPV6CTL_ACCEPT_RTADV = 12 ++IPV6CTL_KEEPFAITH = 13 ++IPV6CTL_LOG_INTERVAL = 14 ++IPV6CTL_HDRNESTLIMIT = 15 ++IPV6CTL_DAD_COUNT = 16 ++IPV6CTL_AUTO_FLOWLABEL = 17 ++IPV6CTL_DEFMCASTHLIM = 18 ++IPV6CTL_GIF_HLIM = 19 ++IPV6CTL_KAME_VERSION = 20 ++IPV6CTL_USE_DEPRECATED = 21 ++IPV6CTL_RR_PRUNE = 22 ++IPV6CTL_V6ONLY = 24 ++IPV6CTL_RTEXPIRE = 25 ++IPV6CTL_RTMINEXPIRE = 26 ++IPV6CTL_RTMAXCACHE = 27 ++IPV6CTL_USETEMPADDR = 32 ++IPV6CTL_TEMPPLTIME = 33 ++IPV6CTL_TEMPVLTIME = 34 ++IPV6CTL_AUTO_LINKLOCAL = 35 ++IPV6CTL_RIP6STATS = 36 ++IPV6CTL_PREFER_TEMPADDR = 37 ++IPV6CTL_ADDRCTLPOLICY = 38 ++IPV6CTL_USE_DEFAULTZONE = 39 ++IPV6CTL_MAXFRAGS = 41 ++IPV6CTL_MCAST_PMTU = 44 ++IPV6CTL_STEALTH = 45 ++ICMPV6CTL_ND6_ONLINKNSRFC4861 = 47 ++IPV6CTL_MAXID = 48 ++ ++# Included from endian.h ++_ENDIAN_H = 1 ++__LITTLE_ENDIAN = 1234 ++__BIG_ENDIAN = 4321 ++__PDP_ENDIAN = 3412 ++ ++# Included from bits/endian.h ++__BYTE_ORDER = __LITTLE_ENDIAN ++__FLOAT_WORD_ORDER = __BYTE_ORDER ++LITTLE_ENDIAN = __LITTLE_ENDIAN ++BIG_ENDIAN = __BIG_ENDIAN ++PDP_ENDIAN = __PDP_ENDIAN ++BYTE_ORDER = __BYTE_ORDER ++ ++# Included from bits/byteswap.h ++_BITS_BYTESWAP_H = 1 ++def __bswap_constant_16(x): return \ ++ ++def __bswap_16(x): return \ ++ ++def __bswap_16(x): return \ ++ ++def __bswap_constant_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_constant_64(x): return \ ++ ++def __bswap_64(x): return \ ++ ++def htobe16(x): return __bswap_16 (x) ++ ++def htole16(x): return (x) ++ ++def be16toh(x): return __bswap_16 (x) ++ ++def le16toh(x): return (x) ++ ++def htobe32(x): return __bswap_32 (x) ++ ++def htole32(x): return (x) ++ ++def be32toh(x): return __bswap_32 (x) ++ ++def le32toh(x): return (x) ++ ++def htobe64(x): return __bswap_64 (x) ++ ++def htole64(x): return (x) ++ ++def be64toh(x): return __bswap_64 (x) ++ ++def le64toh(x): return (x) ++ ++def htobe16(x): return (x) ++ ++def htole16(x): return __bswap_16 (x) ++ ++def be16toh(x): return (x) ++ ++def le16toh(x): return __bswap_16 (x) ++ ++def htobe32(x): return (x) ++ ++def htole32(x): return __bswap_32 (x) ++ ++def be32toh(x): return (x) ++ ++def le32toh(x): return __bswap_32 (x) ++ ++def htobe64(x): return (x) ++ ++def htole64(x): return __bswap_64 (x) ++ ++def be64toh(x): return (x) ++ ++def le64toh(x): return __bswap_64 (x) ++ ++def ntohl(x): return (x) ++ ++def ntohs(x): return (x) ++ ++def htonl(x): return (x) ++ ++def htons(x): return (x) ++ ++def ntohl(x): return __bswap_32 (x) ++ ++def ntohs(x): return __bswap_16 (x) ++ ++def htonl(x): return __bswap_32 (x) ++ ++def htons(x): return __bswap_16 (x) ++ ++def IN6_IS_ADDR_UNSPECIFIED(a): return \ ++ ++def IN6_IS_ADDR_LOOPBACK(a): return \ ++ ++def IN6_IS_ADDR_LINKLOCAL(a): return \ ++ ++def IN6_IS_ADDR_SITELOCAL(a): return \ ++ ++def IN6_IS_ADDR_V4MAPPED(a): return \ ++ ++def IN6_IS_ADDR_V4COMPAT(a): return \ ++ ++def IN6_IS_ADDR_MC_NODELOCAL(a): return \ ++ ++def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ ++ ++def IN6_IS_ADDR_MC_SITELOCAL(a): return \ ++ ++def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ ++ ++def IN6_IS_ADDR_MC_GLOBAL(a): return \ ++ +--- /dev/null ++++ b/Lib/plat-gnukfreebsd7/TYPES.py +@@ -0,0 +1,303 @@ ++# Generated by h2py from /usr/include/sys/types.h ++_SYS_TYPES_H = 1 ++ ++# Included from features.h ++_FEATURES_H = 1 ++__USE_ANSI = 1 ++__FAVOR_BSD = 1 ++_ISOC99_SOURCE = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 200809L ++_XOPEN_SOURCE = 700 ++_XOPEN_SOURCE_EXTENDED = 1 ++_LARGEFILE64_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++_ATFILE_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++__USE_ISOC99 = 1 ++__USE_ISOC95 = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 2 ++_POSIX_C_SOURCE = 199506L ++_POSIX_C_SOURCE = 200112L ++_POSIX_C_SOURCE = 200809L ++__USE_POSIX_IMPLICITLY = 1 ++__USE_POSIX = 1 ++__USE_POSIX2 = 1 ++__USE_POSIX199309 = 1 ++__USE_POSIX199506 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN2K8 = 1 ++_ATFILE_SOURCE = 1 ++__USE_XOPEN = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_UNIX98 = 1 ++_LARGEFILE_SOURCE = 1 ++__USE_XOPEN2K8 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_FILE_OFFSET64 = 1 ++__USE_MISC = 1 ++__USE_BSD = 1 ++__USE_SVID = 1 ++__USE_ATFILE = 1 ++__USE_GNU = 1 ++__USE_REENTRANT = 1 ++__USE_FORTIFY_LEVEL = 2 ++__USE_FORTIFY_LEVEL = 1 ++__USE_FORTIFY_LEVEL = 0 ++ ++# Included from bits/predefs.h ++__STDC_IEC_559__ = 1 ++__STDC_IEC_559_COMPLEX__ = 1 ++__STDC_ISO_10646__ = 200009L ++__GNU_LIBRARY__ = 6 ++__GLIBC__ = 2 ++__GLIBC_MINOR__ = 11 ++__GLIBC_HAVE_LONG_LONG = 1 ++ ++# Included from sys/cdefs.h ++_SYS_CDEFS_H = 1 ++def __NTH(fct): return fct ++ ++def __NTH(fct): return fct ++ ++def __P(args): return args ++ ++def __PMT(args): return args ++ ++def __STRING(x): return #x ++ ++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) ++ ++def __bos0(ptr): return __builtin_object_size (ptr, 0) ++ ++def __warnattr(msg): return __attribute__((__warning__ (msg))) ++ ++__flexarr = [] ++__flexarr = [0] ++__flexarr = [] ++__flexarr = [1] ++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname) ++ ++def __attribute__(xyz): return ++ ++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x))) ++ ++def __attribute_format_arg__(x): return ++ ++ ++# Included from bits/wordsize.h ++__WORDSIZE = 32 ++__LDBL_COMPAT = 1 ++def __LDBL_REDIR_DECL(name): return \ ++ ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_EXTERN_INLINES = 1 ++__USE_EXTERN_INLINES_IN_LIBC = 1 ++ ++# Included from gnu/stubs.h ++ ++# Included from bits/types.h ++_BITS_TYPES_H = 1 ++__S32_TYPE = int ++__SWORD_TYPE = int ++__SLONG32_TYPE = int ++ ++# Included from bits/typesizes.h ++_BITS_TYPESIZES_H = 1 ++__PID_T_TYPE = __S32_TYPE ++__CLOCK_T_TYPE = __S32_TYPE ++__SWBLK_T_TYPE = __S32_TYPE ++__CLOCKID_T_TYPE = __S32_TYPE ++__TIMER_T_TYPE = __S32_TYPE ++__SSIZE_T_TYPE = __SWORD_TYPE ++__FD_SETSIZE = 1024 ++ ++# Included from time.h ++_TIME_H = 1 ++ ++# Included from bits/time.h ++_BITS_TIME_H = 1 ++CLOCKS_PER_SEC = 1000000l ++CLK_TCK = 128 ++CLOCK_REALTIME = 0 ++CLOCK_PROCESS_CPUTIME_ID = 2 ++CLOCK_THREAD_CPUTIME_ID = 3 ++CLOCK_MONOTONIC = 4 ++CLOCK_VIRTUAL = 1 ++CLOCK_PROF = 2 ++CLOCK_UPTIME = 5 ++CLOCK_UPTIME_PRECISE = 7 ++CLOCK_UPTIME_FAST = 8 ++CLOCK_REALTIME_PRECISE = 9 ++CLOCK_REALTIME_FAST = 10 ++CLOCK_MONOTONIC_PRECISE = 11 ++CLOCK_MONOTONIC_FAST = 12 ++CLOCK_SECOND = 13 ++TIMER_RELTIME = 0 ++TIMER_ABSTIME = 1 ++_STRUCT_TIMEVAL = 1 ++CLK_TCK = CLOCKS_PER_SEC ++__clock_t_defined = 1 ++__time_t_defined = 1 ++__clockid_t_defined = 1 ++__timer_t_defined = 1 ++__timespec_defined = 1 ++ ++# Included from xlocale.h ++_XLOCALE_H = 1 ++def __isleap(year): return \ ++ ++__BIT_TYPES_DEFINED__ = 1 ++ ++# Included from endian.h ++_ENDIAN_H = 1 ++__LITTLE_ENDIAN = 1234 ++__BIG_ENDIAN = 4321 ++__PDP_ENDIAN = 3412 ++ ++# Included from bits/endian.h ++__BYTE_ORDER = __LITTLE_ENDIAN ++__FLOAT_WORD_ORDER = __BYTE_ORDER ++LITTLE_ENDIAN = __LITTLE_ENDIAN ++BIG_ENDIAN = __BIG_ENDIAN ++PDP_ENDIAN = __PDP_ENDIAN ++BYTE_ORDER = __BYTE_ORDER ++ ++# Included from bits/byteswap.h ++_BITS_BYTESWAP_H = 1 ++def __bswap_constant_16(x): return \ ++ ++def __bswap_16(x): return \ ++ ++def __bswap_16(x): return \ ++ ++def __bswap_constant_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_constant_64(x): return \ ++ ++def __bswap_64(x): return \ ++ ++def htobe16(x): return __bswap_16 (x) ++ ++def htole16(x): return (x) ++ ++def be16toh(x): return __bswap_16 (x) ++ ++def le16toh(x): return (x) ++ ++def htobe32(x): return __bswap_32 (x) ++ ++def htole32(x): return (x) ++ ++def be32toh(x): return __bswap_32 (x) ++ ++def le32toh(x): return (x) ++ ++def htobe64(x): return __bswap_64 (x) ++ ++def htole64(x): return (x) ++ ++def be64toh(x): return __bswap_64 (x) ++ ++def le64toh(x): return (x) ++ ++def htobe16(x): return (x) ++ ++def htole16(x): return __bswap_16 (x) ++ ++def be16toh(x): return (x) ++ ++def le16toh(x): return __bswap_16 (x) ++ ++def htobe32(x): return (x) ++ ++def htole32(x): return __bswap_32 (x) ++ ++def be32toh(x): return (x) ++ ++def le32toh(x): return __bswap_32 (x) ++ ++def htobe64(x): return (x) ++ ++def htole64(x): return __bswap_64 (x) ++ ++def be64toh(x): return (x) ++ ++def le64toh(x): return __bswap_64 (x) ++ ++ ++# Included from sys/select.h ++_SYS_SELECT_H = 1 ++ ++# Included from bits/select.h ++def __FD_ZERO(fdsp): return \ ++ ++def __FD_ZERO(set): return \ ++ ++ ++# Included from bits/sigset.h ++_SIGSET_H_types = 1 ++_SIGSET_H_fns = 1 ++def __sigword(sig): return (((sig) - 1) >> 5) ++ ++def __sigemptyset(set): return \ ++ ++def __sigfillset(set): return \ ++ ++def __sigisemptyset(set): return \ ++ ++def __FDELT(d): return ((d) / __NFDBITS) ++ ++FD_SETSIZE = __FD_SETSIZE ++def FD_ZERO(fdsetp): return __FD_ZERO (fdsetp) ++ ++ ++# Included from sys/sysmacros.h ++_SYS_SYSMACROS_H = 1 ++def minor(dev): return ((int)((dev) & (-65281))) ++ ++def gnu_dev_major(dev): return major (dev) ++ ++def gnu_dev_minor(dev): return minor (dev) ++ ++ ++# Included from bits/pthreadtypes.h ++_BITS_PTHREADTYPES_H = 1 ++ ++# Included from bits/sched.h ++SCHED_OTHER = 2 ++SCHED_FIFO = 1 ++SCHED_RR = 3 ++CSIGNAL = 0x000000ff ++CLONE_VM = 0x00000100 ++CLONE_FS = 0x00000200 ++CLONE_FILES = 0x00000400 ++CLONE_SIGHAND = 0x00000800 ++CLONE_PTRACE = 0x00002000 ++CLONE_VFORK = 0x00004000 ++CLONE_SYSVSEM = 0x00040000 ++__defined_schedparam = 1 ++__CPU_SETSIZE = 128 ++def __CPUELT(cpu): return ((cpu) / __NCPUBITS) ++ ++def __CPU_ALLOC_SIZE(count): return \ ++ ++def __CPU_ALLOC(count): return __sched_cpualloc (count) ++ ++def __CPU_FREE(cpuset): return __sched_cpufree (cpuset) ++ +--- /dev/null ++++ b/Lib/plat-gnukfreebsd7/DLFCN.py +@@ -0,0 +1,118 @@ ++# Generated by h2py from /usr/include/dlfcn.h ++_DLFCN_H = 1 ++ ++# Included from features.h ++_FEATURES_H = 1 ++__USE_ANSI = 1 ++__FAVOR_BSD = 1 ++_ISOC99_SOURCE = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 200809L ++_XOPEN_SOURCE = 700 ++_XOPEN_SOURCE_EXTENDED = 1 ++_LARGEFILE64_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++_ATFILE_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++__USE_ISOC99 = 1 ++__USE_ISOC95 = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 2 ++_POSIX_C_SOURCE = 199506L ++_POSIX_C_SOURCE = 200112L ++_POSIX_C_SOURCE = 200809L ++__USE_POSIX_IMPLICITLY = 1 ++__USE_POSIX = 1 ++__USE_POSIX2 = 1 ++__USE_POSIX199309 = 1 ++__USE_POSIX199506 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN2K8 = 1 ++_ATFILE_SOURCE = 1 ++__USE_XOPEN = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_UNIX98 = 1 ++_LARGEFILE_SOURCE = 1 ++__USE_XOPEN2K8 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_FILE_OFFSET64 = 1 ++__USE_MISC = 1 ++__USE_BSD = 1 ++__USE_SVID = 1 ++__USE_ATFILE = 1 ++__USE_GNU = 1 ++__USE_REENTRANT = 1 ++__USE_FORTIFY_LEVEL = 2 ++__USE_FORTIFY_LEVEL = 1 ++__USE_FORTIFY_LEVEL = 0 ++ ++# Included from bits/predefs.h ++__STDC_IEC_559__ = 1 ++__STDC_IEC_559_COMPLEX__ = 1 ++__STDC_ISO_10646__ = 200009L ++__GNU_LIBRARY__ = 6 ++__GLIBC__ = 2 ++__GLIBC_MINOR__ = 11 ++__GLIBC_HAVE_LONG_LONG = 1 ++ ++# Included from sys/cdefs.h ++_SYS_CDEFS_H = 1 ++def __NTH(fct): return fct ++ ++def __NTH(fct): return fct ++ ++def __P(args): return args ++ ++def __PMT(args): return args ++ ++def __STRING(x): return #x ++ ++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) ++ ++def __bos0(ptr): return __builtin_object_size (ptr, 0) ++ ++def __warnattr(msg): return __attribute__((__warning__ (msg))) ++ ++__flexarr = [] ++__flexarr = [0] ++__flexarr = [] ++__flexarr = [1] ++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname) ++ ++def __attribute__(xyz): return ++ ++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x))) ++ ++def __attribute_format_arg__(x): return ++ ++ ++# Included from bits/wordsize.h ++__WORDSIZE = 32 ++__LDBL_COMPAT = 1 ++def __LDBL_REDIR_DECL(name): return \ ++ ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_EXTERN_INLINES = 1 ++__USE_EXTERN_INLINES_IN_LIBC = 1 ++ ++# Included from gnu/stubs.h ++ ++# Included from bits/dlfcn.h ++RTLD_LAZY = 0x00001 ++RTLD_NOW = 0x00002 ++RTLD_BINDING_MASK = 0x3 ++RTLD_NOLOAD = 0x00004 ++RTLD_DEEPBIND = 0x00008 ++RTLD_GLOBAL = 0x00100 ++RTLD_LOCAL = 0 ++RTLD_NODELETE = 0x01000 ++LM_ID_BASE = 0 ++LM_ID_NEWLM = -1 +--- /dev/null ++++ b/Lib/plat-gnukfreebsd8/IN.py +@@ -0,0 +1,809 @@ ++# Generated by h2py from /usr/include/netinet/in.h ++_NETINET_IN_H = 1 ++ ++# Included from features.h ++_FEATURES_H = 1 ++__USE_ANSI = 1 ++__FAVOR_BSD = 1 ++_ISOC99_SOURCE = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 200809L ++_XOPEN_SOURCE = 700 ++_XOPEN_SOURCE_EXTENDED = 1 ++_LARGEFILE64_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++_ATFILE_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++__USE_ISOC99 = 1 ++__USE_ISOC95 = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 2 ++_POSIX_C_SOURCE = 199506L ++_POSIX_C_SOURCE = 200112L ++_POSIX_C_SOURCE = 200809L ++__USE_POSIX_IMPLICITLY = 1 ++__USE_POSIX = 1 ++__USE_POSIX2 = 1 ++__USE_POSIX199309 = 1 ++__USE_POSIX199506 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN2K8 = 1 ++_ATFILE_SOURCE = 1 ++__USE_XOPEN = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_UNIX98 = 1 ++_LARGEFILE_SOURCE = 1 ++__USE_XOPEN2K8 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_FILE_OFFSET64 = 1 ++__USE_MISC = 1 ++__USE_BSD = 1 ++__USE_SVID = 1 ++__USE_ATFILE = 1 ++__USE_GNU = 1 ++__USE_REENTRANT = 1 ++__USE_FORTIFY_LEVEL = 2 ++__USE_FORTIFY_LEVEL = 1 ++__USE_FORTIFY_LEVEL = 0 ++ ++# Included from bits/predefs.h ++__STDC_IEC_559__ = 1 ++__STDC_IEC_559_COMPLEX__ = 1 ++__STDC_ISO_10646__ = 200009L ++__GNU_LIBRARY__ = 6 ++__GLIBC__ = 2 ++__GLIBC_MINOR__ = 11 ++__GLIBC_HAVE_LONG_LONG = 1 ++ ++# Included from sys/cdefs.h ++_SYS_CDEFS_H = 1 ++def __NTH(fct): return fct ++ ++def __NTH(fct): return fct ++ ++def __P(args): return args ++ ++def __PMT(args): return args ++ ++def __STRING(x): return #x ++ ++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) ++ ++def __bos0(ptr): return __builtin_object_size (ptr, 0) ++ ++def __warnattr(msg): return __attribute__((__warning__ (msg))) ++ ++__flexarr = [] ++__flexarr = [0] ++__flexarr = [] ++__flexarr = [1] ++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname) ++ ++def __attribute__(xyz): return ++ ++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x))) ++ ++def __attribute_format_arg__(x): return ++ ++ ++# Included from bits/wordsize.h ++__WORDSIZE = 32 ++__LDBL_COMPAT = 1 ++def __LDBL_REDIR_DECL(name): return \ ++ ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_EXTERN_INLINES = 1 ++__USE_EXTERN_INLINES_IN_LIBC = 1 ++ ++# Included from gnu/stubs.h ++ ++# Included from stdint.h ++_STDINT_H = 1 ++ ++# Included from bits/wchar.h ++_BITS_WCHAR_H = 1 ++__WCHAR_MAX = (2147483647) ++__WCHAR_MIN = (-__WCHAR_MAX - 1) ++def __INT64_C(c): return c ## L ++ ++def __UINT64_C(c): return c ## UL ++ ++def __INT64_C(c): return c ## LL ++ ++def __UINT64_C(c): return c ## ULL ++ ++INT8_MIN = (-128) ++INT16_MIN = (-32767-1) ++INT32_MIN = (-2147483647-1) ++INT64_MIN = (-__INT64_C(9223372036854775807)-1) ++INT8_MAX = (127) ++INT16_MAX = (32767) ++INT32_MAX = (2147483647) ++INT64_MAX = (__INT64_C(9223372036854775807)) ++UINT8_MAX = (255) ++UINT16_MAX = (65535) ++UINT64_MAX = (__UINT64_C(18446744073709551615)) ++INT_LEAST8_MIN = (-128) ++INT_LEAST16_MIN = (-32767-1) ++INT_LEAST32_MIN = (-2147483647-1) ++INT_LEAST64_MIN = (-__INT64_C(9223372036854775807)-1) ++INT_LEAST8_MAX = (127) ++INT_LEAST16_MAX = (32767) ++INT_LEAST32_MAX = (2147483647) ++INT_LEAST64_MAX = (__INT64_C(9223372036854775807)) ++UINT_LEAST8_MAX = (255) ++UINT_LEAST16_MAX = (65535) ++UINT_LEAST64_MAX = (__UINT64_C(18446744073709551615)) ++INT_FAST8_MIN = (-128) ++INT_FAST16_MIN = (-9223372036854775807L-1) ++INT_FAST32_MIN = (-9223372036854775807L-1) ++INT_FAST16_MIN = (-2147483647-1) ++INT_FAST32_MIN = (-2147483647-1) ++INT_FAST64_MIN = (-__INT64_C(9223372036854775807)-1) ++INT_FAST8_MAX = (127) ++INT_FAST16_MAX = (9223372036854775807L) ++INT_FAST32_MAX = (9223372036854775807L) ++INT_FAST16_MAX = (2147483647) ++INT_FAST32_MAX = (2147483647) ++INT_FAST64_MAX = (__INT64_C(9223372036854775807)) ++UINT_FAST8_MAX = (255) ++UINT_FAST64_MAX = (__UINT64_C(18446744073709551615)) ++INTPTR_MIN = (-9223372036854775807L-1) ++INTPTR_MAX = (9223372036854775807L) ++INTPTR_MIN = (-2147483647-1) ++INTPTR_MAX = (2147483647) ++INTMAX_MIN = (-__INT64_C(9223372036854775807)-1) ++INTMAX_MAX = (__INT64_C(9223372036854775807)) ++UINTMAX_MAX = (__UINT64_C(18446744073709551615)) ++PTRDIFF_MIN = (-9223372036854775807L-1) ++PTRDIFF_MAX = (9223372036854775807L) ++PTRDIFF_MIN = (-2147483647-1) ++PTRDIFF_MAX = (2147483647) ++SIG_ATOMIC_MIN = (-2147483647-1) ++SIG_ATOMIC_MAX = (2147483647) ++WCHAR_MIN = __WCHAR_MIN ++WCHAR_MAX = __WCHAR_MAX ++def INT8_C(c): return c ++ ++def INT16_C(c): return c ++ ++def INT32_C(c): return c ++ ++def INT64_C(c): return c ## L ++ ++def INT64_C(c): return c ## LL ++ ++def UINT8_C(c): return c ++ ++def UINT16_C(c): return c ++ ++def UINT32_C(c): return c ## U ++ ++def UINT64_C(c): return c ## UL ++ ++def UINT64_C(c): return c ## ULL ++ ++def INTMAX_C(c): return c ## L ++ ++def UINTMAX_C(c): return c ## UL ++ ++def INTMAX_C(c): return c ## LL ++ ++def UINTMAX_C(c): return c ## ULL ++ ++ ++# Included from sys/socket.h ++_SYS_SOCKET_H = 1 ++ ++# Included from sys/uio.h ++_SYS_UIO_H = 1 ++from TYPES import * ++ ++# Included from bits/uio.h ++_BITS_UIO_H = 1 ++from TYPES import * ++UIO_MAXIOV = 1024 ++ ++# Included from bits/sigset.h ++_SIGSET_H_types = 1 ++_SIGSET_H_fns = 1 ++def __sigword(sig): return (((sig) - 1) >> 5) ++ ++def __sigemptyset(set): return \ ++ ++def __sigfillset(set): return \ ++ ++def __sigisemptyset(set): return \ ++ ++ ++# Included from bits/socket.h ++__BITS_SOCKET_H = 1 ++ ++# Included from limits.h ++_LIBC_LIMITS_H_ = 1 ++MB_LEN_MAX = 16 ++_LIMITS_H = 1 ++CHAR_BIT = 8 ++SCHAR_MIN = (-128) ++SCHAR_MAX = 127 ++UCHAR_MAX = 255 ++CHAR_MIN = 0 ++CHAR_MAX = UCHAR_MAX ++CHAR_MIN = SCHAR_MIN ++CHAR_MAX = SCHAR_MAX ++SHRT_MIN = (-32768) ++SHRT_MAX = 32767 ++USHRT_MAX = 65535 ++INT_MAX = 2147483647 ++LONG_MAX = 9223372036854775807L ++LONG_MAX = 2147483647L ++LONG_MIN = (-LONG_MAX - 1L) ++ ++# Included from bits/posix1_lim.h ++_BITS_POSIX1_LIM_H = 1 ++_POSIX_AIO_LISTIO_MAX = 2 ++_POSIX_AIO_MAX = 1 ++_POSIX_ARG_MAX = 4096 ++_POSIX_CHILD_MAX = 25 ++_POSIX_CHILD_MAX = 6 ++_POSIX_DELAYTIMER_MAX = 32 ++_POSIX_HOST_NAME_MAX = 255 ++_POSIX_LINK_MAX = 8 ++_POSIX_LOGIN_NAME_MAX = 9 ++_POSIX_MAX_CANON = 255 ++_POSIX_MAX_INPUT = 255 ++_POSIX_MQ_OPEN_MAX = 8 ++_POSIX_MQ_PRIO_MAX = 32 ++_POSIX_NAME_MAX = 14 ++_POSIX_NGROUPS_MAX = 8 ++_POSIX_NGROUPS_MAX = 0 ++_POSIX_OPEN_MAX = 20 ++_POSIX_OPEN_MAX = 16 ++_POSIX_FD_SETSIZE = _POSIX_OPEN_MAX ++_POSIX_PATH_MAX = 256 ++_POSIX_PIPE_BUF = 512 ++_POSIX_RE_DUP_MAX = 255 ++_POSIX_RTSIG_MAX = 8 ++_POSIX_SEM_NSEMS_MAX = 256 ++_POSIX_SEM_VALUE_MAX = 32767 ++_POSIX_SIGQUEUE_MAX = 32 ++_POSIX_SSIZE_MAX = 32767 ++_POSIX_STREAM_MAX = 8 ++_POSIX_SYMLINK_MAX = 255 ++_POSIX_SYMLOOP_MAX = 8 ++_POSIX_TIMER_MAX = 32 ++_POSIX_TTY_NAME_MAX = 9 ++_POSIX_TZNAME_MAX = 6 ++_POSIX_QLIMIT = 1 ++_POSIX_HIWAT = _POSIX_PIPE_BUF ++_POSIX_UIO_MAXIOV = 16 ++_POSIX_CLOCKRES_MIN = 20000000 ++ ++# Included from bits/local_lim.h ++ ++# Included from sys/syslimits.h ++ARG_MAX = 262144 ++CHILD_MAX = 40 ++LINK_MAX = 32767 ++MAX_CANON = 255 ++MAX_INPUT = 255 ++NAME_MAX = 255 ++NGROUPS_MAX = 1023 ++OPEN_MAX = 64 ++PATH_MAX = 1024 ++PIPE_BUF = 512 ++IOV_MAX = 1024 ++_POSIX_THREAD_KEYS_MAX = 128 ++PTHREAD_KEYS_MAX = 1024 ++_POSIX_THREAD_DESTRUCTOR_ITERATIONS = 4 ++PTHREAD_DESTRUCTOR_ITERATIONS = _POSIX_THREAD_DESTRUCTOR_ITERATIONS ++_POSIX_THREAD_THREADS_MAX = 64 ++PTHREAD_THREADS_MAX = 1024 ++AIO_PRIO_DELTA_MAX = 20 ++PTHREAD_STACK_MIN = 16384 ++TIMER_MAX = 256 ++DELAYTIMER_MAX = 2147483647 ++SSIZE_MAX = LONG_MAX ++NGROUPS_MAX = 8 ++ ++# Included from bits/posix2_lim.h ++_BITS_POSIX2_LIM_H = 1 ++_POSIX2_BC_BASE_MAX = 99 ++_POSIX2_BC_DIM_MAX = 2048 ++_POSIX2_BC_SCALE_MAX = 99 ++_POSIX2_BC_STRING_MAX = 1000 ++_POSIX2_COLL_WEIGHTS_MAX = 2 ++_POSIX2_EXPR_NEST_MAX = 32 ++_POSIX2_LINE_MAX = 2048 ++_POSIX2_RE_DUP_MAX = 255 ++_POSIX2_CHARCLASS_NAME_MAX = 14 ++BC_BASE_MAX = _POSIX2_BC_BASE_MAX ++BC_DIM_MAX = _POSIX2_BC_DIM_MAX ++BC_SCALE_MAX = _POSIX2_BC_SCALE_MAX ++BC_STRING_MAX = _POSIX2_BC_STRING_MAX ++COLL_WEIGHTS_MAX = 255 ++EXPR_NEST_MAX = _POSIX2_EXPR_NEST_MAX ++LINE_MAX = _POSIX2_LINE_MAX ++CHARCLASS_NAME_MAX = 2048 ++RE_DUP_MAX = (0x7fff) ++ ++# Included from bits/xopen_lim.h ++_XOPEN_LIM_H = 1 ++ ++# Included from bits/stdio_lim.h ++L_tmpnam = 20 ++TMP_MAX = 238328 ++FILENAME_MAX = 1024 ++L_ctermid = 9 ++L_cuserid = 9 ++FOPEN_MAX = 64 ++IOV_MAX = 1024 ++_XOPEN_IOV_MAX = _POSIX_UIO_MAXIOV ++NL_ARGMAX = _POSIX_ARG_MAX ++NL_LANGMAX = _POSIX2_LINE_MAX ++NL_MSGMAX = INT_MAX ++NL_NMAX = INT_MAX ++NL_SETMAX = INT_MAX ++NL_TEXTMAX = INT_MAX ++NZERO = 20 ++WORD_BIT = 16 ++WORD_BIT = 32 ++WORD_BIT = 64 ++WORD_BIT = 16 ++WORD_BIT = 32 ++WORD_BIT = 64 ++WORD_BIT = 32 ++LONG_BIT = 32 ++LONG_BIT = 64 ++LONG_BIT = 32 ++LONG_BIT = 64 ++LONG_BIT = 64 ++LONG_BIT = 32 ++ ++# Included from bits/types.h ++_BITS_TYPES_H = 1 ++__S32_TYPE = int ++__SWORD_TYPE = int ++__SLONG32_TYPE = int ++ ++# Included from bits/typesizes.h ++_BITS_TYPESIZES_H = 1 ++__PID_T_TYPE = __S32_TYPE ++__CLOCK_T_TYPE = __S32_TYPE ++__SWBLK_T_TYPE = __S32_TYPE ++__CLOCKID_T_TYPE = __S32_TYPE ++__TIMER_T_TYPE = __S32_TYPE ++__SSIZE_T_TYPE = __SWORD_TYPE ++__FD_SETSIZE = 1024 ++PF_UNSPEC = 0 ++PF_LOCAL = 1 ++PF_UNIX = PF_LOCAL ++PF_FILE = PF_LOCAL ++PF_INET = 2 ++PF_IMPLINK = 3 ++PF_PUP = 4 ++PF_CHAOS = 5 ++PF_NS = 6 ++PF_ISO = 7 ++PF_OSI = PF_ISO ++PF_ECMA = 8 ++PF_DATAKIT = 9 ++PF_CCITT = 10 ++PF_SNA = 11 ++PF_DECnet = 12 ++PF_DLI = 13 ++PF_LAT = 14 ++PF_HYLINK = 15 ++PF_APPLETALK = 16 ++PF_ROUTE = 17 ++PF_LINK = 18 ++PF_XTP = 19 ++PF_COIP = 20 ++PF_CNT = 21 ++PF_RTIP = 22 ++PF_IPX = 23 ++PF_SIP = 24 ++PF_PIP = 25 ++PF_ISDN = 26 ++PF_KEY = 27 ++PF_INET6 = 28 ++PF_NATM = 29 ++PF_ATM = 30 ++PF_HDRCMPLT = 31 ++PF_NETGRAPH = 32 ++PF_MAX = 33 ++AF_UNSPEC = PF_UNSPEC ++AF_LOCAL = PF_LOCAL ++AF_UNIX = PF_UNIX ++AF_FILE = PF_FILE ++AF_INET = PF_INET ++AF_IMPLINK = PF_IMPLINK ++AF_PUP = PF_PUP ++AF_CHAOS = PF_CHAOS ++AF_NS = PF_NS ++AF_ISO = PF_ISO ++AF_OSI = PF_OSI ++AF_ECMA = PF_ECMA ++AF_DATAKIT = PF_DATAKIT ++AF_CCITT = PF_CCITT ++AF_SNA = PF_SNA ++AF_DECnet = PF_DECnet ++AF_DLI = PF_DLI ++AF_LAT = PF_LAT ++AF_HYLINK = PF_HYLINK ++AF_APPLETALK = PF_APPLETALK ++AF_ROUTE = PF_ROUTE ++AF_LINK = PF_LINK ++pseudo_AF_XTP = PF_XTP ++AF_COIP = PF_COIP ++AF_CNT = PF_CNT ++pseudo_AF_RTIP = PF_RTIP ++AF_IPX = PF_IPX ++AF_SIP = PF_SIP ++pseudo_AF_PIP = PF_PIP ++AF_ISDN = PF_ISDN ++AF_E164 = AF_ISDN ++pseudo_AF_KEY = PF_KEY ++AF_INET6 = PF_INET6 ++AF_NATM = PF_NATM ++AF_ATM = PF_ATM ++pseudo_AF_HDRCMPLT = PF_HDRCMPLT ++AF_NETGRAPH = PF_NETGRAPH ++AF_MAX = PF_MAX ++SOMAXCONN = 128 ++ ++# Included from bits/sockaddr.h ++_BITS_SOCKADDR_H = 1 ++def __SOCKADDR_COMMON(sa_prefix): return \ ++ ++_HAVE_SA_LEN = 1 ++_SS_SIZE = 128 ++def CMSG_FIRSTHDR(mhdr): return \ ++ ++CMGROUP_MAX = 16 ++SOL_SOCKET = 0xffff ++LOCAL_PEERCRED = 0x001 ++LOCAL_CREDS = 0x002 ++LOCAL_CONNWAIT = 0x004 ++ ++# Included from bits/socket2.h ++def IN_CLASSA(a): return ((((in_addr_t)(a)) & (-2147483648)) == 0) ++ ++IN_CLASSA_NET = (-16777216) ++IN_CLASSA_NSHIFT = 24 ++IN_CLASSA_HOST = ((-1) & ~IN_CLASSA_NET) ++IN_CLASSA_MAX = 128 ++def IN_CLASSB(a): return ((((in_addr_t)(a)) & (-1073741824)) == (-2147483648)) ++ ++IN_CLASSB_NET = (-65536) ++IN_CLASSB_NSHIFT = 16 ++IN_CLASSB_HOST = ((-1) & ~IN_CLASSB_NET) ++IN_CLASSB_MAX = 65536 ++def IN_CLASSC(a): return ((((in_addr_t)(a)) & (-536870912)) == (-1073741824)) ++ ++IN_CLASSC_NET = (-256) ++IN_CLASSC_NSHIFT = 8 ++IN_CLASSC_HOST = ((-1) & ~IN_CLASSC_NET) ++def IN_CLASSD(a): return ((((in_addr_t)(a)) & (-268435456)) == (-536870912)) ++ ++def IN_MULTICAST(a): return IN_CLASSD(a) ++ ++def IN_EXPERIMENTAL(a): return ((((in_addr_t)(a)) & (-536870912)) == (-536870912)) ++ ++def IN_BADCLASS(a): return ((((in_addr_t)(a)) & (-268435456)) == (-268435456)) ++ ++IN_LOOPBACKNET = 127 ++INET_ADDRSTRLEN = 16 ++INET6_ADDRSTRLEN = 46 ++ ++# Included from bits/in.h ++IMPLINK_IP = 155 ++IMPLINK_LOWEXPER = 156 ++IMPLINK_HIGHEXPER = 158 ++IPPROTO_DIVERT = 258 ++SOL_IP = 0 ++IP_OPTIONS = 1 ++IP_HDRINCL = 2 ++IP_TOS = 3 ++IP_TTL = 4 ++IP_RECVOPTS = 5 ++IP_RECVRETOPTS = 6 ++IP_RECVDSTADDR = 7 ++IP_SENDSRCADDR = IP_RECVDSTADDR ++IP_RETOPTS = 8 ++IP_MULTICAST_IF = 9 ++IP_MULTICAST_TTL = 10 ++IP_MULTICAST_LOOP = 11 ++IP_ADD_MEMBERSHIP = 12 ++IP_DROP_MEMBERSHIP = 13 ++IP_MULTICAST_VIF = 14 ++IP_RSVP_ON = 15 ++IP_RSVP_OFF = 16 ++IP_RSVP_VIF_ON = 17 ++IP_RSVP_VIF_OFF = 18 ++IP_PORTRANGE = 19 ++IP_RECVIF = 20 ++IP_IPSEC_POLICY = 21 ++IP_FAITH = 22 ++IP_ONESBCAST = 23 ++IP_NONLOCALOK = 24 ++IP_FW_TABLE_ADD = 40 ++IP_FW_TABLE_DEL = 41 ++IP_FW_TABLE_FLUSH = 42 ++IP_FW_TABLE_GETSIZE = 43 ++IP_FW_TABLE_LIST = 44 ++IP_FW_ADD = 50 ++IP_FW_DEL = 51 ++IP_FW_FLUSH = 52 ++IP_FW_ZERO = 53 ++IP_FW_GET = 54 ++IP_FW_RESETLOG = 55 ++IP_FW_NAT_CFG = 56 ++IP_FW_NAT_DEL = 57 ++IP_FW_NAT_GET_CONFIG = 58 ++IP_FW_NAT_GET_LOG = 59 ++IP_DUMMYNET_CONFIGURE = 60 ++IP_DUMMYNET_DEL = 61 ++IP_DUMMYNET_FLUSH = 62 ++IP_DUMMYNET_GET = 64 ++IP_RECVTTL = 65 ++IP_MINTTL = 66 ++IP_DONTFRAG = 67 ++IP_ADD_SOURCE_MEMBERSHIP = 70 ++IP_DROP_SOURCE_MEMBERSHIP = 71 ++IP_BLOCK_SOURCE = 72 ++IP_UNBLOCK_SOURCE = 73 ++IP_MSFILTER = 74 ++MCAST_JOIN_GROUP = 80 ++MCAST_LEAVE_GROUP = 81 ++MCAST_JOIN_SOURCE_GROUP = 82 ++MCAST_LEAVE_SOURCE_GROUP = 83 ++MCAST_BLOCK_SOURCE = 84 ++MCAST_UNBLOCK_SOURCE = 85 ++IP_DEFAULT_MULTICAST_TTL = 1 ++IP_DEFAULT_MULTICAST_LOOP = 1 ++IP_MIN_MEMBERSHIPS = 31 ++IP_MAX_MEMBERSHIPS = 4095 ++IP_MAX_SOURCE_FILTER = 1024 ++MCAST_UNDEFINED = 0 ++MCAST_INCLUDE = 1 ++MCAST_EXCLUDE = 2 ++IP_PORTRANGE_DEFAULT = 0 ++IP_PORTRANGE_HIGH = 1 ++IP_PORTRANGE_LOW = 2 ++IPCTL_FORWARDING = 1 ++IPCTL_SENDREDIRECTS = 2 ++IPCTL_DEFTTL = 3 ++IPCTL_DEFMTU = 4 ++IPCTL_RTEXPIRE = 5 ++IPCTL_RTMINEXPIRE = 6 ++IPCTL_RTMAXCACHE = 7 ++IPCTL_SOURCEROUTE = 8 ++IPCTL_DIRECTEDBROADCAST = 9 ++IPCTL_INTRQMAXLEN = 10 ++IPCTL_INTRQDROPS = 11 ++IPCTL_STATS = 12 ++IPCTL_ACCEPTSOURCEROUTE = 13 ++IPCTL_FASTFORWARDING = 14 ++IPCTL_KEEPFAITH = 15 ++IPCTL_GIF_TTL = 16 ++IPCTL_MAXID = 17 ++IPV6_SOCKOPT_RESERVED1 = 3 ++IPV6_UNICAST_HOPS = 4 ++IPV6_MULTICAST_IF = 9 ++IPV6_MULTICAST_HOPS = 10 ++IPV6_MULTICAST_LOOP = 11 ++IPV6_JOIN_GROUP = 12 ++IPV6_LEAVE_GROUP = 13 ++IPV6_PORTRANGE = 14 ++ICMP6_FILTER = 18 ++IPV6_CHECKSUM = 26 ++IPV6_V6ONLY = 27 ++IPV6_IPSEC_POLICY = 28 ++IPV6_FAITH = 29 ++IPV6_FW_ADD = 30 ++IPV6_FW_DEL = 31 ++IPV6_FW_FLUSH = 32 ++IPV6_FW_ZERO = 33 ++IPV6_FW_GET = 34 ++IPV6_RTHDRDSTOPTS = 35 ++IPV6_RECVPKTINFO = 36 ++IPV6_RECVHOPLIMIT = 37 ++IPV6_RECVRTHDR = 38 ++IPV6_RECVHOPOPTS = 39 ++IPV6_RECVDSTOPTS = 40 ++IPV6_USE_MIN_MTU = 42 ++IPV6_RECVPATHMTU = 43 ++IPV6_PATHMTU = 44 ++IPV6_PKTINFO = 46 ++IPV6_HOPLIMIT = 47 ++IPV6_NEXTHOP = 48 ++IPV6_HOPOPTS = 49 ++IPV6_DSTOPTS = 50 ++IPV6_RTHDR = 51 ++IPV6_RECVTCLASS = 57 ++IPV6_AUTOFLOWLABEL = 59 ++IPV6_TCLASS = 61 ++IPV6_DONTFRAG = 62 ++IPV6_PREFER_TEMPADDR = 63 ++IPV6_ADD_MEMBERSHIP = IPV6_JOIN_GROUP ++IPV6_DROP_MEMBERSHIP = IPV6_LEAVE_GROUP ++IPV6_RXHOPOPTS = IPV6_HOPOPTS ++IPV6_RXDSTOPTS = IPV6_DSTOPTS ++SOL_IPV6 = 41 ++SOL_ICMPV6 = 58 ++IPV6_DEFAULT_MULTICAST_HOPS = 1 ++IPV6_DEFAULT_MULTICAST_LOOP = 1 ++IPV6_PORTRANGE_DEFAULT = 0 ++IPV6_PORTRANGE_HIGH = 1 ++IPV6_PORTRANGE_LOW = 2 ++IPV6_RTHDR_LOOSE = 0 ++IPV6_RTHDR_STRICT = 1 ++IPV6_RTHDR_TYPE_0 = 0 ++IPV6CTL_FORWARDING = 1 ++IPV6CTL_SENDREDIRECTS = 2 ++IPV6CTL_DEFHLIM = 3 ++IPV6CTL_FORWSRCRT = 5 ++IPV6CTL_STATS = 6 ++IPV6CTL_MRTSTATS = 7 ++IPV6CTL_MRTPROTO = 8 ++IPV6CTL_MAXFRAGPACKETS = 9 ++IPV6CTL_SOURCECHECK = 10 ++IPV6CTL_SOURCECHECK_LOGINT = 11 ++IPV6CTL_ACCEPT_RTADV = 12 ++IPV6CTL_KEEPFAITH = 13 ++IPV6CTL_LOG_INTERVAL = 14 ++IPV6CTL_HDRNESTLIMIT = 15 ++IPV6CTL_DAD_COUNT = 16 ++IPV6CTL_AUTO_FLOWLABEL = 17 ++IPV6CTL_DEFMCASTHLIM = 18 ++IPV6CTL_GIF_HLIM = 19 ++IPV6CTL_KAME_VERSION = 20 ++IPV6CTL_USE_DEPRECATED = 21 ++IPV6CTL_RR_PRUNE = 22 ++IPV6CTL_V6ONLY = 24 ++IPV6CTL_RTEXPIRE = 25 ++IPV6CTL_RTMINEXPIRE = 26 ++IPV6CTL_RTMAXCACHE = 27 ++IPV6CTL_USETEMPADDR = 32 ++IPV6CTL_TEMPPLTIME = 33 ++IPV6CTL_TEMPVLTIME = 34 ++IPV6CTL_AUTO_LINKLOCAL = 35 ++IPV6CTL_RIP6STATS = 36 ++IPV6CTL_PREFER_TEMPADDR = 37 ++IPV6CTL_ADDRCTLPOLICY = 38 ++IPV6CTL_USE_DEFAULTZONE = 39 ++IPV6CTL_MAXFRAGS = 41 ++IPV6CTL_MCAST_PMTU = 44 ++IPV6CTL_STEALTH = 45 ++ICMPV6CTL_ND6_ONLINKNSRFC4861 = 47 ++IPV6CTL_MAXID = 48 ++ ++# Included from endian.h ++_ENDIAN_H = 1 ++__LITTLE_ENDIAN = 1234 ++__BIG_ENDIAN = 4321 ++__PDP_ENDIAN = 3412 ++ ++# Included from bits/endian.h ++__BYTE_ORDER = __LITTLE_ENDIAN ++__FLOAT_WORD_ORDER = __BYTE_ORDER ++LITTLE_ENDIAN = __LITTLE_ENDIAN ++BIG_ENDIAN = __BIG_ENDIAN ++PDP_ENDIAN = __PDP_ENDIAN ++BYTE_ORDER = __BYTE_ORDER ++ ++# Included from bits/byteswap.h ++_BITS_BYTESWAP_H = 1 ++def __bswap_constant_16(x): return \ ++ ++def __bswap_16(x): return \ ++ ++def __bswap_16(x): return \ ++ ++def __bswap_constant_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_constant_64(x): return \ ++ ++def __bswap_64(x): return \ ++ ++def htobe16(x): return __bswap_16 (x) ++ ++def htole16(x): return (x) ++ ++def be16toh(x): return __bswap_16 (x) ++ ++def le16toh(x): return (x) ++ ++def htobe32(x): return __bswap_32 (x) ++ ++def htole32(x): return (x) ++ ++def be32toh(x): return __bswap_32 (x) ++ ++def le32toh(x): return (x) ++ ++def htobe64(x): return __bswap_64 (x) ++ ++def htole64(x): return (x) ++ ++def be64toh(x): return __bswap_64 (x) ++ ++def le64toh(x): return (x) ++ ++def htobe16(x): return (x) ++ ++def htole16(x): return __bswap_16 (x) ++ ++def be16toh(x): return (x) ++ ++def le16toh(x): return __bswap_16 (x) ++ ++def htobe32(x): return (x) ++ ++def htole32(x): return __bswap_32 (x) ++ ++def be32toh(x): return (x) ++ ++def le32toh(x): return __bswap_32 (x) ++ ++def htobe64(x): return (x) ++ ++def htole64(x): return __bswap_64 (x) ++ ++def be64toh(x): return (x) ++ ++def le64toh(x): return __bswap_64 (x) ++ ++def ntohl(x): return (x) ++ ++def ntohs(x): return (x) ++ ++def htonl(x): return (x) ++ ++def htons(x): return (x) ++ ++def ntohl(x): return __bswap_32 (x) ++ ++def ntohs(x): return __bswap_16 (x) ++ ++def htonl(x): return __bswap_32 (x) ++ ++def htons(x): return __bswap_16 (x) ++ ++def IN6_IS_ADDR_UNSPECIFIED(a): return \ ++ ++def IN6_IS_ADDR_LOOPBACK(a): return \ ++ ++def IN6_IS_ADDR_LINKLOCAL(a): return \ ++ ++def IN6_IS_ADDR_SITELOCAL(a): return \ ++ ++def IN6_IS_ADDR_V4MAPPED(a): return \ ++ ++def IN6_IS_ADDR_V4COMPAT(a): return \ ++ ++def IN6_IS_ADDR_MC_NODELOCAL(a): return \ ++ ++def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ ++ ++def IN6_IS_ADDR_MC_SITELOCAL(a): return \ ++ ++def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ ++ ++def IN6_IS_ADDR_MC_GLOBAL(a): return \ ++ +--- /dev/null ++++ b/Lib/plat-gnukfreebsd8/TYPES.py +@@ -0,0 +1,303 @@ ++# Generated by h2py from /usr/include/sys/types.h ++_SYS_TYPES_H = 1 ++ ++# Included from features.h ++_FEATURES_H = 1 ++__USE_ANSI = 1 ++__FAVOR_BSD = 1 ++_ISOC99_SOURCE = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 200809L ++_XOPEN_SOURCE = 700 ++_XOPEN_SOURCE_EXTENDED = 1 ++_LARGEFILE64_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++_ATFILE_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++__USE_ISOC99 = 1 ++__USE_ISOC95 = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 2 ++_POSIX_C_SOURCE = 199506L ++_POSIX_C_SOURCE = 200112L ++_POSIX_C_SOURCE = 200809L ++__USE_POSIX_IMPLICITLY = 1 ++__USE_POSIX = 1 ++__USE_POSIX2 = 1 ++__USE_POSIX199309 = 1 ++__USE_POSIX199506 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN2K8 = 1 ++_ATFILE_SOURCE = 1 ++__USE_XOPEN = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_UNIX98 = 1 ++_LARGEFILE_SOURCE = 1 ++__USE_XOPEN2K8 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_FILE_OFFSET64 = 1 ++__USE_MISC = 1 ++__USE_BSD = 1 ++__USE_SVID = 1 ++__USE_ATFILE = 1 ++__USE_GNU = 1 ++__USE_REENTRANT = 1 ++__USE_FORTIFY_LEVEL = 2 ++__USE_FORTIFY_LEVEL = 1 ++__USE_FORTIFY_LEVEL = 0 ++ ++# Included from bits/predefs.h ++__STDC_IEC_559__ = 1 ++__STDC_IEC_559_COMPLEX__ = 1 ++__STDC_ISO_10646__ = 200009L ++__GNU_LIBRARY__ = 6 ++__GLIBC__ = 2 ++__GLIBC_MINOR__ = 11 ++__GLIBC_HAVE_LONG_LONG = 1 ++ ++# Included from sys/cdefs.h ++_SYS_CDEFS_H = 1 ++def __NTH(fct): return fct ++ ++def __NTH(fct): return fct ++ ++def __P(args): return args ++ ++def __PMT(args): return args ++ ++def __STRING(x): return #x ++ ++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) ++ ++def __bos0(ptr): return __builtin_object_size (ptr, 0) ++ ++def __warnattr(msg): return __attribute__((__warning__ (msg))) ++ ++__flexarr = [] ++__flexarr = [0] ++__flexarr = [] ++__flexarr = [1] ++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname) ++ ++def __attribute__(xyz): return ++ ++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x))) ++ ++def __attribute_format_arg__(x): return ++ ++ ++# Included from bits/wordsize.h ++__WORDSIZE = 32 ++__LDBL_COMPAT = 1 ++def __LDBL_REDIR_DECL(name): return \ ++ ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_EXTERN_INLINES = 1 ++__USE_EXTERN_INLINES_IN_LIBC = 1 ++ ++# Included from gnu/stubs.h ++ ++# Included from bits/types.h ++_BITS_TYPES_H = 1 ++__S32_TYPE = int ++__SWORD_TYPE = int ++__SLONG32_TYPE = int ++ ++# Included from bits/typesizes.h ++_BITS_TYPESIZES_H = 1 ++__PID_T_TYPE = __S32_TYPE ++__CLOCK_T_TYPE = __S32_TYPE ++__SWBLK_T_TYPE = __S32_TYPE ++__CLOCKID_T_TYPE = __S32_TYPE ++__TIMER_T_TYPE = __S32_TYPE ++__SSIZE_T_TYPE = __SWORD_TYPE ++__FD_SETSIZE = 1024 ++ ++# Included from time.h ++_TIME_H = 1 ++ ++# Included from bits/time.h ++_BITS_TIME_H = 1 ++CLOCKS_PER_SEC = 1000000l ++CLK_TCK = 128 ++CLOCK_REALTIME = 0 ++CLOCK_PROCESS_CPUTIME_ID = 2 ++CLOCK_THREAD_CPUTIME_ID = 3 ++CLOCK_MONOTONIC = 4 ++CLOCK_VIRTUAL = 1 ++CLOCK_PROF = 2 ++CLOCK_UPTIME = 5 ++CLOCK_UPTIME_PRECISE = 7 ++CLOCK_UPTIME_FAST = 8 ++CLOCK_REALTIME_PRECISE = 9 ++CLOCK_REALTIME_FAST = 10 ++CLOCK_MONOTONIC_PRECISE = 11 ++CLOCK_MONOTONIC_FAST = 12 ++CLOCK_SECOND = 13 ++TIMER_RELTIME = 0 ++TIMER_ABSTIME = 1 ++_STRUCT_TIMEVAL = 1 ++CLK_TCK = CLOCKS_PER_SEC ++__clock_t_defined = 1 ++__time_t_defined = 1 ++__clockid_t_defined = 1 ++__timer_t_defined = 1 ++__timespec_defined = 1 ++ ++# Included from xlocale.h ++_XLOCALE_H = 1 ++def __isleap(year): return \ ++ ++__BIT_TYPES_DEFINED__ = 1 ++ ++# Included from endian.h ++_ENDIAN_H = 1 ++__LITTLE_ENDIAN = 1234 ++__BIG_ENDIAN = 4321 ++__PDP_ENDIAN = 3412 ++ ++# Included from bits/endian.h ++__BYTE_ORDER = __LITTLE_ENDIAN ++__FLOAT_WORD_ORDER = __BYTE_ORDER ++LITTLE_ENDIAN = __LITTLE_ENDIAN ++BIG_ENDIAN = __BIG_ENDIAN ++PDP_ENDIAN = __PDP_ENDIAN ++BYTE_ORDER = __BYTE_ORDER ++ ++# Included from bits/byteswap.h ++_BITS_BYTESWAP_H = 1 ++def __bswap_constant_16(x): return \ ++ ++def __bswap_16(x): return \ ++ ++def __bswap_16(x): return \ ++ ++def __bswap_constant_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_32(x): return \ ++ ++def __bswap_constant_64(x): return \ ++ ++def __bswap_64(x): return \ ++ ++def htobe16(x): return __bswap_16 (x) ++ ++def htole16(x): return (x) ++ ++def be16toh(x): return __bswap_16 (x) ++ ++def le16toh(x): return (x) ++ ++def htobe32(x): return __bswap_32 (x) ++ ++def htole32(x): return (x) ++ ++def be32toh(x): return __bswap_32 (x) ++ ++def le32toh(x): return (x) ++ ++def htobe64(x): return __bswap_64 (x) ++ ++def htole64(x): return (x) ++ ++def be64toh(x): return __bswap_64 (x) ++ ++def le64toh(x): return (x) ++ ++def htobe16(x): return (x) ++ ++def htole16(x): return __bswap_16 (x) ++ ++def be16toh(x): return (x) ++ ++def le16toh(x): return __bswap_16 (x) ++ ++def htobe32(x): return (x) ++ ++def htole32(x): return __bswap_32 (x) ++ ++def be32toh(x): return (x) ++ ++def le32toh(x): return __bswap_32 (x) ++ ++def htobe64(x): return (x) ++ ++def htole64(x): return __bswap_64 (x) ++ ++def be64toh(x): return (x) ++ ++def le64toh(x): return __bswap_64 (x) ++ ++ ++# Included from sys/select.h ++_SYS_SELECT_H = 1 ++ ++# Included from bits/select.h ++def __FD_ZERO(fdsp): return \ ++ ++def __FD_ZERO(set): return \ ++ ++ ++# Included from bits/sigset.h ++_SIGSET_H_types = 1 ++_SIGSET_H_fns = 1 ++def __sigword(sig): return (((sig) - 1) >> 5) ++ ++def __sigemptyset(set): return \ ++ ++def __sigfillset(set): return \ ++ ++def __sigisemptyset(set): return \ ++ ++def __FDELT(d): return ((d) / __NFDBITS) ++ ++FD_SETSIZE = __FD_SETSIZE ++def FD_ZERO(fdsetp): return __FD_ZERO (fdsetp) ++ ++ ++# Included from sys/sysmacros.h ++_SYS_SYSMACROS_H = 1 ++def minor(dev): return ((int)((dev) & (-65281))) ++ ++def gnu_dev_major(dev): return major (dev) ++ ++def gnu_dev_minor(dev): return minor (dev) ++ ++ ++# Included from bits/pthreadtypes.h ++_BITS_PTHREADTYPES_H = 1 ++ ++# Included from bits/sched.h ++SCHED_OTHER = 2 ++SCHED_FIFO = 1 ++SCHED_RR = 3 ++CSIGNAL = 0x000000ff ++CLONE_VM = 0x00000100 ++CLONE_FS = 0x00000200 ++CLONE_FILES = 0x00000400 ++CLONE_SIGHAND = 0x00000800 ++CLONE_PTRACE = 0x00002000 ++CLONE_VFORK = 0x00004000 ++CLONE_SYSVSEM = 0x00040000 ++__defined_schedparam = 1 ++__CPU_SETSIZE = 128 ++def __CPUELT(cpu): return ((cpu) / __NCPUBITS) ++ ++def __CPU_ALLOC_SIZE(count): return \ ++ ++def __CPU_ALLOC(count): return __sched_cpualloc (count) ++ ++def __CPU_FREE(cpuset): return __sched_cpufree (cpuset) ++ +--- /dev/null ++++ b/Lib/plat-gnukfreebsd8/DLFCN.py +@@ -0,0 +1,118 @@ ++# Generated by h2py from /usr/include/dlfcn.h ++_DLFCN_H = 1 ++ ++# Included from features.h ++_FEATURES_H = 1 ++__USE_ANSI = 1 ++__FAVOR_BSD = 1 ++_ISOC99_SOURCE = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 200809L ++_XOPEN_SOURCE = 700 ++_XOPEN_SOURCE_EXTENDED = 1 ++_LARGEFILE64_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++_ATFILE_SOURCE = 1 ++_BSD_SOURCE = 1 ++_SVID_SOURCE = 1 ++__USE_ISOC99 = 1 ++__USE_ISOC95 = 1 ++_POSIX_SOURCE = 1 ++_POSIX_C_SOURCE = 2 ++_POSIX_C_SOURCE = 199506L ++_POSIX_C_SOURCE = 200112L ++_POSIX_C_SOURCE = 200809L ++__USE_POSIX_IMPLICITLY = 1 ++__USE_POSIX = 1 ++__USE_POSIX2 = 1 ++__USE_POSIX199309 = 1 ++__USE_POSIX199506 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN2K8 = 1 ++_ATFILE_SOURCE = 1 ++__USE_XOPEN = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_UNIX98 = 1 ++_LARGEFILE_SOURCE = 1 ++__USE_XOPEN2K8 = 1 ++__USE_XOPEN2K = 1 ++__USE_ISOC99 = 1 ++__USE_XOPEN_EXTENDED = 1 ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_FILE_OFFSET64 = 1 ++__USE_MISC = 1 ++__USE_BSD = 1 ++__USE_SVID = 1 ++__USE_ATFILE = 1 ++__USE_GNU = 1 ++__USE_REENTRANT = 1 ++__USE_FORTIFY_LEVEL = 2 ++__USE_FORTIFY_LEVEL = 1 ++__USE_FORTIFY_LEVEL = 0 ++ ++# Included from bits/predefs.h ++__STDC_IEC_559__ = 1 ++__STDC_IEC_559_COMPLEX__ = 1 ++__STDC_ISO_10646__ = 200009L ++__GNU_LIBRARY__ = 6 ++__GLIBC__ = 2 ++__GLIBC_MINOR__ = 11 ++__GLIBC_HAVE_LONG_LONG = 1 ++ ++# Included from sys/cdefs.h ++_SYS_CDEFS_H = 1 ++def __NTH(fct): return fct ++ ++def __NTH(fct): return fct ++ ++def __P(args): return args ++ ++def __PMT(args): return args ++ ++def __STRING(x): return #x ++ ++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) ++ ++def __bos0(ptr): return __builtin_object_size (ptr, 0) ++ ++def __warnattr(msg): return __attribute__((__warning__ (msg))) ++ ++__flexarr = [] ++__flexarr = [0] ++__flexarr = [] ++__flexarr = [1] ++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname) ++ ++def __attribute__(xyz): return ++ ++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x))) ++ ++def __attribute_format_arg__(x): return ++ ++ ++# Included from bits/wordsize.h ++__WORDSIZE = 32 ++__LDBL_COMPAT = 1 ++def __LDBL_REDIR_DECL(name): return \ ++ ++__USE_LARGEFILE = 1 ++__USE_LARGEFILE64 = 1 ++__USE_EXTERN_INLINES = 1 ++__USE_EXTERN_INLINES_IN_LIBC = 1 ++ ++# Included from gnu/stubs.h ++ ++# Included from bits/dlfcn.h ++RTLD_LAZY = 0x00001 ++RTLD_NOW = 0x00002 ++RTLD_BINDING_MASK = 0x3 ++RTLD_NOLOAD = 0x00004 ++RTLD_DEEPBIND = 0x00008 ++RTLD_GLOBAL = 0x00100 ++RTLD_LOCAL = 0 ++RTLD_NODELETE = 0x01000 ++LM_ID_BASE = 0 ++LM_ID_NEWLM = -1 --- python2.7-2.7.8.orig/debian/patches/plat-linux2_alpha.diff +++ python2.7-2.7.8/debian/patches/plat-linux2_alpha.diff @@ -0,0 +1,73 @@ +Index: Lib/plat-linux2/IN.py +=================================================================== +--- ./Lib/plat-linux2/IN.py (Revision 77754) ++++ ./Lib/plat-linux2/IN.py (Arbeitskopie) +@@ -436,43 +436,43 @@ + # Included from asm/socket.h + + # Included from asm/sockios.h +-FIOSETOWN = 0x8901 +-SIOCSPGRP = 0x8902 +-FIOGETOWN = 0x8903 +-SIOCGPGRP = 0x8904 +-SIOCATMARK = 0x8905 ++FIOSETOWN = 0x8004667c ++SIOCSPGRP = 0x80047308 ++FIOGETOWN = 0x4004667b ++SIOCGPGRP = 0x40047309 ++SIOCATMARK = 0x40047307 + SIOCGSTAMP = 0x8906 +-SOL_SOCKET = 1 +-SO_DEBUG = 1 +-SO_REUSEADDR = 2 +-SO_TYPE = 3 +-SO_ERROR = 4 +-SO_DONTROUTE = 5 +-SO_BROADCAST = 6 +-SO_SNDBUF = 7 +-SO_RCVBUF = 8 +-SO_KEEPALIVE = 9 +-SO_OOBINLINE = 10 ++SOL_SOCKET = 0xffff ++SO_DEBUG = 0x0001 ++SO_REUSEADDR = 0x0004 ++SO_TYPE = 0x1008 ++SO_ERROR = 0x1007 ++SO_DONTROUTE = 0x0010 ++SO_BROADCAST = 0x0020 ++SO_SNDBUF = 0x1001 ++SO_RCVBUF = 0x1002 ++SO_KEEPALIVE = 0x0008 ++SO_OOBINLINE = 0x0100 + SO_NO_CHECK = 11 + SO_PRIORITY = 12 +-SO_LINGER = 13 ++SO_LINGER = 0x0080 + SO_BSDCOMPAT = 14 + SO_PASSCRED = 16 + SO_PEERCRED = 17 +-SO_RCVLOWAT = 18 +-SO_SNDLOWAT = 19 +-SO_RCVTIMEO = 20 +-SO_SNDTIMEO = 21 +-SO_SECURITY_AUTHENTICATION = 22 +-SO_SECURITY_ENCRYPTION_TRANSPORT = 23 +-SO_SECURITY_ENCRYPTION_NETWORK = 24 ++SO_RCVLOWAT = 0x1010 ++SO_SNDLOWAT = 0x1011 ++SO_RCVTIMEO = 0x1012 ++SO_SNDTIMEO = 0x1013 ++SO_SECURITY_AUTHENTICATION = 19 ++SO_SECURITY_ENCRYPTION_TRANSPORT = 20 ++SO_SECURITY_ENCRYPTION_NETWORK = 21 + SO_BINDTODEVICE = 25 + SO_ATTACH_FILTER = 26 + SO_DETACH_FILTER = 27 + SO_PEERNAME = 28 + SO_TIMESTAMP = 29 + SCM_TIMESTAMP = SO_TIMESTAMP +-SO_ACCEPTCONN = 30 ++SO_ACCEPTCONN = 0x1014 + SOCK_STREAM = 1 + SOCK_DGRAM = 2 + SOCK_RAW = 3 --- python2.7-2.7.8.orig/debian/patches/plat-linux2_hppa.diff +++ python2.7-2.7.8/debian/patches/plat-linux2_hppa.diff @@ -0,0 +1,72 @@ +Index: Lib/plat-linux2/IN.py +=================================================================== +--- ./Lib/plat-linux2/IN.py (Revision 77754) ++++ ./Lib/plat-linux2/IN.py (Arbeitskopie) +@@ -442,37 +442,37 @@ + SIOCGPGRP = 0x8904 + SIOCATMARK = 0x8905 + SIOCGSTAMP = 0x8906 +-SOL_SOCKET = 1 +-SO_DEBUG = 1 +-SO_REUSEADDR = 2 +-SO_TYPE = 3 +-SO_ERROR = 4 +-SO_DONTROUTE = 5 +-SO_BROADCAST = 6 +-SO_SNDBUF = 7 +-SO_RCVBUF = 8 +-SO_KEEPALIVE = 9 +-SO_OOBINLINE = 10 +-SO_NO_CHECK = 11 +-SO_PRIORITY = 12 +-SO_LINGER = 13 +-SO_BSDCOMPAT = 14 +-SO_PASSCRED = 16 +-SO_PEERCRED = 17 +-SO_RCVLOWAT = 18 +-SO_SNDLOWAT = 19 +-SO_RCVTIMEO = 20 +-SO_SNDTIMEO = 21 +-SO_SECURITY_AUTHENTICATION = 22 +-SO_SECURITY_ENCRYPTION_TRANSPORT = 23 +-SO_SECURITY_ENCRYPTION_NETWORK = 24 +-SO_BINDTODEVICE = 25 +-SO_ATTACH_FILTER = 26 +-SO_DETACH_FILTER = 27 +-SO_PEERNAME = 28 +-SO_TIMESTAMP = 29 ++SOL_SOCKET = 0xffff ++SO_DEBUG = 0x0001 ++SO_REUSEADDR = 0x0004 ++SO_TYPE = 0x1008 ++SO_ERROR = 0x1007 ++SO_DONTROUTE = 0x0010 ++SO_BROADCAST = 0x0020 ++SO_SNDBUF = 0x1001 ++SO_RCVBUF = 0x1002 ++SO_KEEPALIVE = 0x0008 ++SO_OOBINLINE = 0x0100 ++SO_NO_CHECK = 0x400b ++SO_PRIORITY = 0x400c ++SO_LINGER = 0x0080 ++SO_BSDCOMPAT = 0x400e ++SO_PASSCRED = 0x4010 ++SO_PEERCRED = 0x4011 ++SO_RCVLOWAT = 0x1004 ++SO_SNDLOWAT = 0x1003 ++SO_RCVTIMEO = 0x1006 ++SO_SNDTIMEO = 0x1005 ++SO_SECURITY_AUTHENTICATION = 0x4016 ++SO_SECURITY_ENCRYPTION_TRANSPORT = 0x4017 ++SO_SECURITY_ENCRYPTION_NETWORK = 0x4018 ++SO_BINDTODEVICE = 0x4019 ++SO_ATTACH_FILTER = 0x401a ++SO_DETACH_FILTER = 0x401b ++SO_PEERNAME = 0x2000 ++SO_TIMESTAMP = 0x4012 + SCM_TIMESTAMP = SO_TIMESTAMP +-SO_ACCEPTCONN = 30 ++SO_ACCEPTCONN = 0x401c + SOCK_STREAM = 1 + SOCK_DGRAM = 2 + SOCK_RAW = 3 --- python2.7-2.7.8.orig/debian/patches/plat-linux2_mips.diff +++ python2.7-2.7.8/debian/patches/plat-linux2_mips.diff @@ -0,0 +1,88 @@ +Index: Lib/plat-linux2/DLFCN.py +=================================================================== +--- ./Lib/plat-linux2/DLFCN.py (Revision 77754) ++++ ./Lib/plat-linux2/DLFCN.py (Arbeitskopie) +@@ -77,7 +77,7 @@ + RTLD_LAZY = 0x00001 + RTLD_NOW = 0x00002 + RTLD_BINDING_MASK = 0x3 +-RTLD_NOLOAD = 0x00004 +-RTLD_GLOBAL = 0x00100 ++RTLD_NOLOAD = 0x00008 ++RTLD_GLOBAL = 0x00004 + RTLD_LOCAL = 0 + RTLD_NODELETE = 0x01000 +Index: Lib/plat-linux2/IN.py +=================================================================== +--- ./Lib/plat-linux2/IN.py (Revision 77754) ++++ ./Lib/plat-linux2/IN.py (Arbeitskopie) +@@ -436,33 +436,33 @@ + # Included from asm/socket.h + + # Included from asm/sockios.h +-FIOSETOWN = 0x8901 +-SIOCSPGRP = 0x8902 +-FIOGETOWN = 0x8903 +-SIOCGPGRP = 0x8904 +-SIOCATMARK = 0x8905 ++FIOSETOWN = 0x8004667c ++SIOCSPGRP = 0x80047308 ++FIOGETOWN = 0x4004667b ++SIOCGPGRP = 0x40047309 ++SIOCATMARK = 0x40047307 + SIOCGSTAMP = 0x8906 +-SOL_SOCKET = 1 +-SO_DEBUG = 1 +-SO_REUSEADDR = 2 +-SO_TYPE = 3 +-SO_ERROR = 4 +-SO_DONTROUTE = 5 +-SO_BROADCAST = 6 +-SO_SNDBUF = 7 +-SO_RCVBUF = 8 +-SO_KEEPALIVE = 9 +-SO_OOBINLINE = 10 ++SOL_SOCKET = 0xffff ++SO_DEBUG = 0x0001 ++SO_REUSEADDR = 0x0004 ++SO_TYPE = 0x1008 ++SO_ERROR = 0x1007 ++SO_DONTROUTE = 0x0010 ++SO_BROADCAST = 0x0020 ++SO_SNDBUF = 0x1001 ++SO_RCVBUF = 0x1002 ++SO_KEEPALIVE = 0x0008 ++SO_OOBINLINE = 0x0100 + SO_NO_CHECK = 11 + SO_PRIORITY = 12 +-SO_LINGER = 13 ++SO_LINGER = 0x0080 + SO_BSDCOMPAT = 14 +-SO_PASSCRED = 16 +-SO_PEERCRED = 17 +-SO_RCVLOWAT = 18 +-SO_SNDLOWAT = 19 +-SO_RCVTIMEO = 20 +-SO_SNDTIMEO = 21 ++SO_PASSCRED = 17 ++SO_PEERCRED = 18 ++SO_RCVLOWAT = 0x1004 ++SO_SNDLOWAT = 0x1003 ++SO_RCVTIMEO = 0x1006 ++SO_SNDTIMEO = 0x1005 + SO_SECURITY_AUTHENTICATION = 22 + SO_SECURITY_ENCRYPTION_TRANSPORT = 23 + SO_SECURITY_ENCRYPTION_NETWORK = 24 +@@ -472,9 +472,9 @@ + SO_PEERNAME = 28 + SO_TIMESTAMP = 29 + SCM_TIMESTAMP = SO_TIMESTAMP +-SO_ACCEPTCONN = 30 +-SOCK_STREAM = 1 +-SOCK_DGRAM = 2 ++SO_ACCEPTCONN = 0x1009 ++SOCK_STREAM = 2 ++SOCK_DGRAM = 1 + SOCK_RAW = 3 + SOCK_RDM = 4 + SOCK_SEQPACKET = 5 --- python2.7-2.7.8.orig/debian/patches/plat-linux2_sparc.diff +++ python2.7-2.7.8/debian/patches/plat-linux2_sparc.diff @@ -0,0 +1,72 @@ +Index: Lib/plat-linux2/IN.py +=================================================================== +--- ./Lib/plat-linux2/IN.py (Revision 77754) ++++ ./Lib/plat-linux2/IN.py (Arbeitskopie) +@@ -442,37 +442,37 @@ + SIOCGPGRP = 0x8904 + SIOCATMARK = 0x8905 + SIOCGSTAMP = 0x8906 +-SOL_SOCKET = 1 +-SO_DEBUG = 1 +-SO_REUSEADDR = 2 +-SO_TYPE = 3 +-SO_ERROR = 4 +-SO_DONTROUTE = 5 +-SO_BROADCAST = 6 +-SO_SNDBUF = 7 +-SO_RCVBUF = 8 +-SO_KEEPALIVE = 9 +-SO_OOBINLINE = 10 +-SO_NO_CHECK = 11 +-SO_PRIORITY = 12 +-SO_LINGER = 13 +-SO_BSDCOMPAT = 14 +-SO_PASSCRED = 16 +-SO_PEERCRED = 17 +-SO_RCVLOWAT = 18 +-SO_SNDLOWAT = 19 +-SO_RCVTIMEO = 20 +-SO_SNDTIMEO = 21 +-SO_SECURITY_AUTHENTICATION = 22 +-SO_SECURITY_ENCRYPTION_TRANSPORT = 23 +-SO_SECURITY_ENCRYPTION_NETWORK = 24 +-SO_BINDTODEVICE = 25 +-SO_ATTACH_FILTER = 26 +-SO_DETACH_FILTER = 27 +-SO_PEERNAME = 28 +-SO_TIMESTAMP = 29 ++SOL_SOCKET = 0xffff ++SO_DEBUG = 0x0001 ++SO_REUSEADDR = 0x0004 ++SO_TYPE = 0x1008 ++SO_ERROR = 0x1007 ++SO_DONTROUTE = 0x0010 ++SO_BROADCAST = 0x0020 ++SO_SNDBUF = 0x1001 ++SO_RCVBUF = 0x1002 ++SO_KEEPALIVE = 0x0008 ++SO_OOBINLINE = 0x0100 ++SO_NO_CHECK = 0x000b ++SO_PRIORITY = 0x000c ++SO_LINGER = 0x0080 ++SO_BSDCOMPAT = 0x0400 ++SO_PASSCRED = 0x0002 ++SO_PEERCRED = 0x0040 ++SO_RCVLOWAT = 0x0800 ++SO_SNDLOWAT = 0x1000 ++SO_RCVTIMEO = 0x2000 ++SO_SNDTIMEO = 0x4000 ++SO_SECURITY_AUTHENTICATION = 0x5001 ++SO_SECURITY_ENCRYPTION_TRANSPORT = 0x5002 ++SO_SECURITY_ENCRYPTION_NETWORK = 0x5004 ++SO_BINDTODEVICE = 0x000d ++SO_ATTACH_FILTER = 0x001a ++SO_DETACH_FILTER = 0x001b ++SO_PEERNAME = 0x001c ++SO_TIMESTAMP = 0x001d + SCM_TIMESTAMP = SO_TIMESTAMP +-SO_ACCEPTCONN = 30 ++SO_ACCEPTCONN = 0x8000 + SOCK_STREAM = 1 + SOCK_DGRAM = 2 + SOCK_RAW = 3 --- python2.7-2.7.8.orig/debian/patches/platform-lsbrelease.diff +++ python2.7-2.7.8/debian/patches/platform-lsbrelease.diff @@ -0,0 +1,50 @@ +# DP: Use /etc/lsb-release to identify the platform. + +--- a/Lib/platform.py ++++ b/Lib/platform.py +@@ -259,7 +259,7 @@ + _supported_dists = ( + 'SuSE', 'debian', 'fedora', 'redhat', 'centos', + 'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo', +- 'UnitedLinux', 'turbolinux') ++ 'UnitedLinux', 'turbolinux', 'Ubuntu') + + def _parse_release_file(firstline): + +@@ -288,6 +288,10 @@ + id = l[1] + return '', version, id + ++_distributor_id_file_re = re.compile("(?:DISTRIB_ID\s*=)\s*(.*)", re.I) ++_release_file_re = re.compile("(?:DISTRIB_RELEASE\s*=)\s*(.*)", re.I) ++_codename_file_re = re.compile("(?:DISTRIB_CODENAME\s*=)\s*(.*)", re.I) ++ + def linux_distribution(distname='', version='', id='', + + supported_dists=_supported_dists, +@@ -312,6 +316,25 @@ + args given as parameters. + + """ ++ # check for the LSB /etc/lsb-release file first, needed so ++ # that the distribution doesn't get identified as Debian. ++ try: ++ with open("/etc/lsb-release", "rU") as etclsbrel: ++ for line in etclsbrel: ++ m = _distributor_id_file_re.search(line) ++ if m: ++ _u_distname = m.group(1).strip() ++ m = _release_file_re.search(line) ++ if m: ++ _u_version = m.group(1).strip() ++ m = _codename_file_re.search(line) ++ if m: ++ _u_id = m.group(1).strip() ++ if _u_distname and _u_version: ++ return (_u_distname, _u_version, _u_id) ++ except (EnvironmentError, UnboundLocalError): ++ pass ++ + try: + etc = os.listdir('/etc') + except os.error: --- python2.7-2.7.8.orig/debian/patches/profiled-build.diff +++ python2.7-2.7.8/debian/patches/profiled-build.diff @@ -0,0 +1,28 @@ +# DP: Fix profiled build; don't use Python/thread.gc*, gcc complains + +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -428,19 +428,19 @@ + $(MAKE) build_all_use_profile + + build_all_generate_profile: +- $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov" ++ $(MAKE) all PY_CFLAGS="$(PY_CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov" + + run_profile_task: + : # FIXME: can't run for a cross build +- ./$(BUILDPYTHON) $(PROFILE_TASK) ++ -./$(BUILDPYTHON) $(PROFILE_TASK) + + build_all_use_profile: +- $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use" ++ $(MAKE) all PY_CFLAGS="$(PY_CFLAGS) -fprofile-use -fprofile-correction" + + coverage: + @echo "Building with support for coverage checking:" + $(MAKE) clean +- $(MAKE) all CFLAGS="$(CFLAGS) -O0 -pg -fprofile-arcs -ftest-coverage" LIBS="$(LIBS) -lgcov" ++ $(MAKE) all PY_CFLAGS="$(PY_CFLAGS) -O0 -pg -fprofile-arcs -ftest-coverage" LIBS="$(LIBS) -lgcov" + + + # Build the interpreter --- python2.7-2.7.8.orig/debian/patches/revert-unittest-loader-symlinks19352.diff +++ python2.7-2.7.8/debian/patches/revert-unittest-loader-symlinks19352.diff @@ -0,0 +1,68 @@ +Description: DP: Revert patch from http://bugs.python.org/issue19352 as it completely breaks unittest discovery on Debian/Ubuntu +Bug-Ubuntu: https://launchpad.net/bugs/1255505 + +Index: b/Lib/unittest/loader.py +=================================================================== +--- a/Lib/unittest/loader.py ++++ b/Lib/unittest/loader.py +@@ -256,8 +256,8 @@ class TestLoader(object): + yield _make_failed_import_test(name, self.suiteClass) + else: + mod_file = os.path.abspath(getattr(module, '__file__', full_path)) +- realpath = os.path.splitext(os.path.realpath(mod_file))[0] +- fullpath_noext = os.path.splitext(os.path.realpath(full_path))[0] ++ realpath = os.path.splitext(mod_file)[0] ++ fullpath_noext = os.path.splitext(full_path)[0] + if realpath.lower() != fullpath_noext.lower(): + module_dir = os.path.dirname(realpath) + mod_name = os.path.splitext(os.path.basename(full_path))[0] +Index: b/Lib/unittest/test/test_discovery.py +=================================================================== +--- a/Lib/unittest/test/test_discovery.py ++++ b/Lib/unittest/test/test_discovery.py +@@ -315,7 +315,7 @@ class TestDiscovery(unittest.TestCase): + self.assertTrue(program.failfast) + self.assertTrue(program.catchbreak) + +- def setup_module_clash(self): ++ def test_detect_module_clash(self): + class Module(object): + __file__ = 'bar/foo.py' + sys.modules['foo'] = Module +@@ -342,10 +342,7 @@ class TestDiscovery(unittest.TestCase): + os.listdir = listdir + os.path.isfile = isfile + os.path.isdir = isdir +- return full_path + +- def test_detect_module_clash(self): +- full_path = self.setup_module_clash() + loader = unittest.TestLoader() + + mod_dir = os.path.abspath('bar') +@@ -358,25 +355,6 @@ class TestDiscovery(unittest.TestCase): + ) + self.assertEqual(sys.path[0], full_path) + +- def test_module_symlink_ok(self): +- full_path = self.setup_module_clash() +- +- original_realpath = os.path.realpath +- +- mod_dir = os.path.abspath('bar') +- expected_dir = os.path.abspath('foo') +- +- def cleanup(): +- os.path.realpath = original_realpath +- self.addCleanup(cleanup) +- +- def realpath(path): +- if path == os.path.join(mod_dir, 'foo.py'): +- return os.path.join(expected_dir, 'foo.py') +- return path +- os.path.realpath = realpath +- loader = unittest.TestLoader() +- loader.discover(start_dir='foo', pattern='foo.py') + + def test_discovery_from_dotted_path(self): + loader = unittest.TestLoader() --- python2.7-2.7.8.orig/debian/patches/series.in +++ python2.7-2.7.8/debian/patches/series.in @@ -0,0 +1,68 @@ +hg-updates.diff +issue9189.diff +build-libpython.diff +deb-setup.diff +deb-locations.diff +site-locations.diff +distutils-install-layout.diff +locale-module.diff +distutils-link.diff +distutils-sysconfig.diff +test-sundry.diff +tkinter-import.diff +link-opt.diff +debug-build.diff +hotshot-import.diff +profiled-build.diff +no-zip-on-sys.path.diff +platform-lsbrelease.diff +bdist-wininst-notfound.diff +setup-modules-ssl.diff +makesetup-bashism.diff +hurd-disable-nonworking-constants.diff +#ifdef WITH_FPECTL +enable-fpectl.diff +#endif +statvfs-f_flag-constants.diff +#if defined (arch_alpha) +plat-linux2_alpha.diff +#elif defined (arch_hppa) +plat-linux2_hppa.diff +#elif defined (arch_mips) || defined(arch_mipsel) || defined (arch_mips64) || defined(arch_mips64el) +plat-linux2_mips.diff +#elif defined (arch_sparc) || defined (arch_sparc64) +plat-linux2_sparc.diff +#endif +#if defined (BROKEN_UTIMES) +disable-utimes.diff +#endif +#if defined (Ubuntu) +langpack-gettext.diff +#endif +#if defined (arch_os_hurd) +no-large-file-support.diff +cthreads.diff +#endif +issue9012a.diff +link-system-expat.diff +plat-gnukfreebsd.diff +link-whole-archive.diff +bsddb-libpath.diff +disable-sem-check.diff +ctypes-arm.diff +lto-link-flags.diff +do-not-italicize-punctuation.patch +multiarch.diff +lib2to3-no-pickled-grammar.diff +add-python-config-sh.diff +ext-no-libpython-link.diff +build-hash.diff +libffi-shared.diff +atomic-pyc-rename.diff +revert-unittest-loader-symlinks19352.diff +enable-sqlite-loadext.diff +installed-testsuite.diff +issue21963.diff +ensurepip-wheels.diff +ensurepip-disabled.diff +no-ssl3.diff --- python2.7-2.7.8.orig/debian/patches/setup-modules-ssl.diff +++ python2.7-2.7.8/debian/patches/setup-modules-ssl.diff @@ -0,0 +1,24 @@ +# DP: Modules/Setup.dist: patch to build _hashlib and _ssl extensions statically + +--- a/Modules/Setup.dist ++++ b/Modules/Setup.dist +@@ -215,10 +215,7 @@ + + # Socket module helper for SSL support; you must comment out the other + # socket line above, and possibly edit the SSL variable: +-#SSL=/usr/local/ssl +-#_ssl _ssl.c \ +-# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +-# -L$(SSL)/lib -lssl -lcrypto ++#_ssl _ssl.c -lssl -lcrypto + + # The crypt module is now disabled by default because it breaks builds + # on many systems (where -lcrypt is needed), e.g. Linux (I believe). +@@ -261,6 +258,7 @@ + #_sha256 sha256module.c + #_sha512 sha512module.c + ++#_hashlib _hashopenssl.c -lssl -lcrypto + + # SGI IRIX specific modules -- off by default. + --- python2.7-2.7.8.orig/debian/patches/site-locations.diff +++ python2.7-2.7.8/debian/patches/site-locations.diff @@ -0,0 +1,32 @@ +# DP: Set site-packages/dist-packages + +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -19,6 +19,12 @@ + resulting directories, if they exist, are appended to sys.path, and + also inspected for path configuration files. + ++For Debian and derivatives, this sys.path is augmented with directories ++for packages distributed within the distribution. Local addons go ++into /usr/local/lib/python/dist-packages, Debian addons ++install into /usr/{lib,share}/python/dist-packages. ++/usr/lib/python/site-packages is not used. ++ + A path configuration file is a file whose name has the form + .pth; its contents are additional directories (one per line) + to be added to sys.path. Non-existing directories (or +@@ -288,10 +294,12 @@ + if sys.platform in ('os2emx', 'riscos'): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) + elif os.sep == '/': ++ sitepackages.append(os.path.join(prefix, "local/lib", ++ "python" + sys.version[:3], ++ "dist-packages")) + sitepackages.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], +- "site-packages")) +- sitepackages.append(os.path.join(prefix, "lib", "site-python")) ++ "dist-packages")) + else: + sitepackages.append(prefix) + sitepackages.append(os.path.join(prefix, "lib", "site-packages")) --- python2.7-2.7.8.orig/debian/patches/sphinx-no-refcounting.diff +++ python2.7-2.7.8/debian/patches/sphinx-no-refcounting.diff @@ -0,0 +1,15 @@ +# DP: Use the included sphinx refcounting extension. + +Index: b/Doc/conf.py +=================================================================== +--- a/Doc/conf.py ++++ b/Doc/conf.py +@@ -13,7 +13,7 @@ + # General configuration + # --------------------- + +-extensions = ['sphinx.ext.refcounting', 'sphinx.ext.coverage', ++extensions = ['sphinx.ext.coverage', + 'sphinx.ext.doctest', 'pyspecific'] + templates_path = ['tools/sphinxext'] + --- python2.7-2.7.8.orig/debian/patches/statvfs-f_flag-constants.diff +++ python2.7-2.7.8/debian/patches/statvfs-f_flag-constants.diff @@ -0,0 +1,59 @@ +From 21fda4c78000d78cb1824fdf0373031d07f5325a Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 6 Jan 2010 15:22:38 -0500 +Subject: [PATCH] Add flags for statvfs.f_flag to constant list. + +You really need these to figure out what statvfs is trying to say to +you, so add them here. +--- + Modules/posixmodule.c | 37 +++++++++++++++++++++++++++++++++++++ + 1 files changed, 37 insertions(+), 0 deletions(-) + +Index: b/Modules/posixmodule.c +=================================================================== +--- a/Modules/posixmodule.c ++++ b/Modules/posixmodule.c +@@ -9356,6 +9356,43 @@ all_ins(PyObject *d) + if (ins(d, "EX_NOTFOUND", (long)EX_NOTFOUND)) return -1; + #endif /* EX_NOTFOUND */ + ++ /* These came from statvfs.h */ ++#ifdef ST_RDONLY ++ if (ins(d, "ST_RDONLY", (long)ST_RDONLY)) return -1; ++#endif /* ST_RDONLY */ ++#ifdef ST_NOSUID ++ if (ins(d, "ST_NOSUID", (long)ST_NOSUID)) return -1; ++#endif /* ST_NOSUID */ ++ ++ /* GNU extensions */ ++#ifdef ST_NODEV ++ if (ins(d, "ST_NODEV", (long)ST_NODEV)) return -1; ++#endif /* ST_NODEV */ ++#ifdef ST_NOEXEC ++ if (ins(d, "ST_NOEXEC", (long)ST_NOEXEC)) return -1; ++#endif /* ST_NOEXEC */ ++#ifdef ST_SYNCHRONOUS ++ if (ins(d, "ST_SYNCHRONOUS", (long)ST_SYNCHRONOUS)) return -1; ++#endif /* ST_SYNCHRONOUS */ ++#ifdef ST_MANDLOCK ++ if (ins(d, "ST_MANDLOCK", (long)ST_MANDLOCK)) return -1; ++#endif /* ST_MANDLOCK */ ++#ifdef ST_WRITE ++ if (ins(d, "ST_WRITE", (long)ST_WRITE)) return -1; ++#endif /* ST_WRITE */ ++#ifdef ST_APPEND ++ if (ins(d, "ST_APPEND", (long)ST_APPEND)) return -1; ++#endif /* ST_APPEND */ ++#ifdef ST_NOATIME ++ if (ins(d, "ST_NOATIME", (long)ST_NOATIME)) return -1; ++#endif /* ST_NOATIME */ ++#ifdef ST_NODIRATIME ++ if (ins(d, "ST_NODIRATIME", (long)ST_NODIRATIME)) return -1; ++#endif /* ST_NODIRATIME */ ++#ifdef ST_RELATIME ++ if (ins(d, "ST_RELATIME", (long)ST_RELATIME)) return -1; ++#endif /* ST_RELATIME */ ++ + #ifdef HAVE_SPAWNV + #if defined(PYOS_OS2) && defined(PYCC_GCC) + if (ins(d, "P_WAIT", (long)P_WAIT)) return -1; --- python2.7-2.7.8.orig/debian/patches/sys-multiarch.diff +++ python2.7-2.7.8/debian/patches/sys-multiarch.diff @@ -0,0 +1,25 @@ +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1357,6 +1357,11 @@ + + Python/thread.o: @THREADHEADERS@ + ++Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile ++ $(CC) -c $(PY_CORE_CFLAGS) \ ++ -DMULTIARCH='"$(MULTIARCH)"' \ ++ -o $@ $(srcdir)/Python/sysmodule.c ++ + # Declare targets that aren't real files + .PHONY: all build_all sharedmods oldsharedmods test quicktest memtest + .PHONY: install altinstall oldsharedinstall bininstall altbininstall +--- a/Python/sysmodule.c ++++ b/Python/sysmodule.c +@@ -1435,6 +1435,8 @@ + PyFloat_GetInfo()); + SET_SYS_FROM_STRING("long_info", + PyLong_GetInfo()); ++ SET_SYS_FROM_STRING("_multiarch", ++ PyString_FromString(MULTIARCH)); + #ifdef Py_USING_UNICODE + SET_SYS_FROM_STRING("maxunicode", + PyInt_FromLong(PyUnicode_GetMax())); --- python2.7-2.7.8.orig/debian/patches/test-sundry.diff +++ python2.7-2.7.8/debian/patches/test-sundry.diff @@ -0,0 +1,19 @@ +# DP: test_sundry: Don't fail on import of the profile and pstats module + +Index: b/Lib/test/test_sundry.py +=================================================================== +--- a/Lib/test/test_sundry.py ++++ b/Lib/test/test_sundry.py +@@ -60,7 +60,11 @@ class TestUntestedModules(unittest.TestC + import os2emxpath + import pdb + import posixfile +- import pstats ++ try: ++ import pstats # separated out into the python-profiler package ++ except ImportError: ++ if test_support.verbose: ++ print "skipping profile and pstats" + import py_compile + import rexec + import sched --- python2.7-2.7.8.orig/debian/patches/tkinter-import.diff +++ python2.7-2.7.8/debian/patches/tkinter-import.diff @@ -0,0 +1,16 @@ +# DP: suggest installation of python-tk package on failing _tkinter import + +--- a/Lib/lib-tk/Tkinter.py ++++ b/Lib/lib-tk/Tkinter.py +@@ -36,7 +36,10 @@ + if sys.platform == "win32": + # Attempt to configure Tcl/Tk without requiring PATH + import FixTk +-import _tkinter # If this fails your Python may not be configured for Tk ++try: ++ import _tkinter ++except ImportError, msg: ++ raise ImportError, str(msg) + ', please install the python-tk package' + tkinter = _tkinter # b/w compat for export + TclError = _tkinter.TclError + from types import * --- python2.7-2.7.8.orig/debian/pdb.1.in +++ python2.7-2.7.8/debian/pdb.1.in @@ -0,0 +1,16 @@ +.TH PDB@VER@ 1 +.SH NAME +pdb@VER@ \- the Python debugger +.SH SYNOPSIS +.PP +.B pdb@VER@ +.I script [...] +.SH DESCRIPTION +.PP +See /usr/lib/python@VER@/pdb.doc for more information on the use +of pdb. When the debugger is started, help is available via the +help command. +.SH SEE ALSO +python@VER@(1). Chapter 9 of the Python Library Reference +(The Python Debugger). Available in the python@VER@-doc package at +/usr/share/doc/python@VER@/html/lib/module-pdb.html. --- python2.7-2.7.8.orig/debian/pydoc.1.in +++ python2.7-2.7.8/debian/pydoc.1.in @@ -0,0 +1,53 @@ +.TH PYDOC@VER@ 1 +.SH NAME +pydoc@VER@ \- the Python documentation tool +.SH SYNOPSIS +.PP +.B pydoc@VER@ +.I name +.PP +.B pydoc@VER@ -k +.I keyword +.PP +.B pydoc@VER@ -p +.I port +.PP +.B pydoc@VER@ -g +.PP +.B pydoc@VER@ -w +.I module [...] +.SH DESCRIPTION +.PP +.B pydoc@VER@ +.I name +Show text documentation on something. +.I name +may be the name of a +Python keyword, topic, function, module, or package, or a dotted +reference to a class or function within a module or module in a +package. If +.I name +contains a '/', it is used as the path to a +Python source file to document. If name is 'keywords', 'topics', +or 'modules', a listing of these things is displayed. +.PP +.B pydoc@VER@ -k +.I keyword +Search for a keyword in the synopsis lines of all available modules. +.PP +.B pydoc@VER@ -p +.I port +Start an HTTP server on the given port on the local machine. +.PP +.B pydoc@VER@ -g +Pop up a graphical interface for finding and serving documentation. +.PP +.B pydoc@VER@ -w +.I name [...] +Write out the HTML documentation for a module to a file in the current +directory. If +.I name +contains a '/', it is treated as a filename; if +it names a directory, documentation is written for all the contents. +.SH AUTHOR +Moshe Zadka, based on "pydoc --help" --- python2.7-2.7.8.orig/debian/pygettext.1 +++ python2.7-2.7.8/debian/pygettext.1 @@ -0,0 +1,108 @@ +.TH PYGETTEXT 1 "" "pygettext 1.4" +.SH NAME +pygettext \- Python equivalent of xgettext(1) +.SH SYNOPSIS +.B pygettext +[\fIOPTIONS\fR] \fIINPUTFILE \fR... +.SH DESCRIPTION +pygettext is deprecated. The current version of xgettext supports +many languages, including Python. + +pygettext uses Python's standard tokenize module to scan Python +source code, generating .pot files identical to what GNU xgettext generates +for C and C++ code. From there, the standard GNU tools can be used. +.PP +pygettext searches only for _() by default, even though GNU xgettext +recognizes the following keywords: gettext, dgettext, dcgettext, +and gettext_noop. See the \fB\-k\fR/\fB\--keyword\fR flag below for how to +augment this. +.PP +.SH OPTIONS +.TP +\fB\-a\fR, \fB\-\-extract\-all\fR +Extract all strings. +.TP +\fB\-d\fR, \fB\-\-default\-domain\fR=\fINAME\fR +Rename the default output file from messages.pot to name.pot. +.TP +\fB\-E\fR, \fB\-\-escape\fR +Replace non-ASCII characters with octal escape sequences. +.TP +\fB\-D\fR, \fB\-\-docstrings\fR +Extract module, class, method, and function docstrings. +These do not need to be wrapped in _() markers, and in fact cannot +be for Python to consider them docstrings. (See also the \fB\-X\fR option). +.TP +\fB\-h\fR, \fB\-\-help\fR +Print this help message and exit. +.TP +\fB\-k\fR, \fB\-\-keyword\fR=\fIWORD\fR +Keywords to look for in addition to the default set, which are: _ +.IP +You can have multiple \fB\-k\fR flags on the command line. +.TP +\fB\-K\fR, \fB\-\-no\-default\-keywords\fR +Disable the default set of keywords (see above). +Any keywords explicitly added with the \fB\-k\fR/\fB\--keyword\fR option +are still recognized. +.TP +\fB\-\-no\-location\fR +Do not write filename/lineno location comments. +.TP +\fB\-n\fR, \fB\-\-add\-location\fR +Write filename/lineno location comments indicating where each +extracted string is found in the source. These lines appear before +each msgid. The style of comments is controlled by the +\fB\-S\fR/\fB\--style\fR option. This is the default. +.TP +\fB\-o\fR, \fB\-\-output\fR=\fIFILENAME\fR +Rename the default output file from messages.pot to FILENAME. +If FILENAME is `-' then the output is sent to standard out. +.TP +\fB\-p\fR, \fB\-\-output\-dir\fR=\fIDIR\fR +Output files will be placed in directory DIR. +.TP +\fB\-S\fR, \fB\-\-style\fR=\fISTYLENAME\fR +Specify which style to use for location comments. +Two styles are supported: +.RS +.IP \(bu 4 +Solaris # File: filename, line: line-number +.IP \(bu 4 +GNU #: filename:line +.RE +.IP +The style name is case insensitive. +GNU style is the default. +.TP +\fB\-v\fR, \fB\-\-verbose\fR +Print the names of the files being processed. +.TP +\fB\-V\fR, \fB\-\-version\fR +Print the version of pygettext and exit. +.TP +\fB\-w\fR, \fB\-\-width\fR=\fICOLUMNS\fR +Set width of output to columns. +.TP +\fB\-x\fR, \fB\-\-exclude\-file\fR=\fIFILENAME\fR +Specify a file that contains a list of strings that are not be +extracted from the input files. Each string to be excluded must +appear on a line by itself in the file. +.TP +\fB\-X\fR, \fB\-\-no\-docstrings\fR=\fIFILENAME\fR +Specify a file that contains a list of files (one per line) that +should not have their docstrings extracted. This is only useful in +conjunction with the \fB\-D\fR option above. +.PP +If `INPUTFILE' is -, standard input is read. +.SH BUGS +pygettext attempts to be option and feature compatible with GNU xgettext +where ever possible. However some options are still missing or are not fully +implemented. Also, xgettext's use of command line switches with option +arguments is broken, and in these cases, pygettext just defines additional +switches. +.SH AUTHOR +pygettext is written by Barry Warsaw . +.PP +Joonas Paalasmaa put this manual page together +based on "pygettext --help". --- python2.7-2.7.8.orig/debian/pyhtml2devhelp.py +++ python2.7-2.7.8/debian/pyhtml2devhelp.py @@ -0,0 +1,222 @@ +#! /usr/bin/python + +import formatter, htmllib +import os, sys, re + +class PyHTMLParser(htmllib.HTMLParser): + pages_to_include = set(('whatsnew/index.html', 'tutorial/index.html', 'using/index.html', + 'reference/index.html', 'library/index.html', 'howto/index.html', + 'extending/index.html', 'c-api/index.html', 'install/index.html', + 'distutils/index.html')) + + def __init__(self, formatter, basedir, fn, indent, parents=set()): + htmllib.HTMLParser.__init__(self, formatter) + self.basedir = basedir + self.dir, self.fn = os.path.split(fn) + self.data = '' + self.parents = parents + self.link = {} + self.indent = indent + self.last_indent = indent - 1 + self.sub_indent = 0 + self.sub_count = 0 + self.next_link = False + + def process_link(self): + new_href = os.path.join(self.dir, self.link['href']) + text = self.link['text'] + indent = self.indent + self.sub_indent + if self.last_indent == indent: + print '%s' % (' ' * self.last_indent) + self.sub_count -= 1 + print '%s' % (' ' * indent, new_href, text) + self.sub_count += 1 + self.last_indent = self.indent + self.sub_indent + + def start_li(self, attrs): + self.sub_indent += 1 + self.next_link = True + + def end_li(self): + indent = self.indent + self.sub_indent + if self.sub_count > 0: + print '%s' % (' ' * self.last_indent) + self.sub_count -= 1 + self.last_indent -= 1 + self.sub_indent -= 1 + + def start_a(self, attrs): + self.link = {} + for attr in attrs: + self.link[attr[0]] = attr[1] + self.data = '' + + def end_a(self): + process = False + text = self.data.replace('\t', '').replace('\n', ' ').replace('&', '&').replace('<', '<').replace('>', '>') + self.link['text'] = text + # handle a tag without href attribute + try: + href = self.link['href'] + except KeyError: + return + + abs_href = os.path.join(self.basedir, href) + if abs_href in self.parents: + return + if href.startswith('..') or href.startswith('http:') \ + or href.startswith('mailto:') or href.startswith('news:'): + return + if href in ('', 'about.html', 'modindex.html', 'genindex.html', 'glossary.html', + 'search.html', 'contents.html', 'download.html', 'bugs.html', + 'license.html', 'copyright.html'): + return + + if self.link.has_key('class'): + if self.link['class'] in ('biglink'): + process = True + if self.link['class'] in ('reference external'): + if self.next_link: + process = True + next_link = False + + if process == True: + self.process_link() + if href in self.pages_to_include: + self.parse_file(os.path.join(self.dir, href)) + + def finish(self): + if self.sub_count > 0: + print '%s' % (' ' * self.last_indent) + + def handle_data(self, data): + self.data += data + + def parse_file(self, href): + # TODO basedir bestimmen + parent = os.path.join(self.basedir, self.fn) + self.parents.add(parent) + parser = PyHTMLParser(formatter.NullFormatter(), + self.basedir, href, self.indent + 1, + self.parents) + text = file(self.basedir + '/' + href).read() + parser.feed(text) + parser.finish() + parser.close() + if parent in self.parents: + self.parents.remove(parent) + +class PyIdxHTMLParser(htmllib.HTMLParser): + def __init__(self, formatter, basedir, fn, indent): + htmllib.HTMLParser.__init__(self, formatter) + self.basedir = basedir + self.dir, self.fn = os.path.split(fn) + self.data = '' + self.link = {} + self.indent = indent + self.active = False + self.indented = False + self.nolink = False + self.header = '' + self.last_letter = 'Z' + self.last_text = '' + + def process_link(self): + new_href = os.path.join(self.dir, self.link['href']) + text = self.link['text'] + if not self.active: + return + if text.startswith('['): + return + if self.link.get('rel', None) in ('prev', 'parent', 'next', 'contents', 'index'): + return + if self.indented: + text = self.last_text + ' ' + text + else: + # Save it in case we need it again + self.last_text = re.sub(' \([\w\-\.\s]+\)', '', text) + indent = self.indent + print '%s' % (' ' * indent, new_href, text) + + def start_dl(self, attrs): + if self.last_text: + # Looks like we found the second part to a command + self.indented = True + + def end_dl(self): + self.indented = False + + def start_dt(self, attrs): + self.data = '' + self.nolink = True + + def end_dt(self): + if not self.active: + return + if self.nolink == True: + # Looks like we found the first part to a command + self.last_text = re.sub(' \([\w\-\.\s]+\)', '', self.data) + self.nolink = False + + def start_h2(self, attrs): + for k, v in attrs: + if k == 'id': + self.header = v + if v == '_': + self.active = True + + def start_td(self, attrs): + self.indented = False + self.last_text = '' + + def start_table(self, attrs): + pass + + def end_table(self): + if self.header == self.last_letter: + self.active = False + + def start_a(self, attrs): + self.nolink = False + self.link = {} + for attr in attrs: + self.link[attr[0]] = attr[1] + self.data = '' + + def end_a(self): + text = self.data.replace('\t', '').replace('\n', ' ').replace('&', '&').replace('<', '<').replace('>', '>') + self.link['text'] = text + # handle a tag without href attribute + try: + href = self.link['href'] + except KeyError: + return + self.process_link() + + def handle_data(self, data): + self.data += data + +def main(): + base = sys.argv[1] + fn = sys.argv[2] + version = sys.argv[3] + + parser = PyHTMLParser(formatter.NullFormatter(), base, fn, indent=0) + print '' + print '' % (version, version) + print '' + parser.parse_file(fn) + print '' + + print '' + + fn = 'genindex-all.html' + parser = PyIdxHTMLParser(formatter.NullFormatter(), base, fn, indent=1) + text = file(base + '/' + fn).read() + parser.feed(text) + parser.close() + + print '' + print '' + +main() --- python2.7-2.7.8.orig/debian/pylogo.xpm +++ python2.7-2.7.8/debian/pylogo.xpm @@ -0,0 +1,351 @@ +/* XPM */ +static char * pylogo_xpm[] = { +"32 32 316 2", +" c None", +". c #8DB0CE", +"+ c #6396BF", +"@ c #4985B7", +"# c #4181B5", +"$ c #417EB2", +"% c #417EB1", +"& c #4D83B0", +"* c #6290B6", +"= c #94B2CA", +"- c #70A1C8", +"; c #3D83BC", +"> c #3881BD", +", c #387DB6", +"' c #387CB5", +") c #387BB3", +"! c #3779B0", +"~ c #3778AE", +"{ c #3776AB", +"] c #3776AA", +"^ c #3775A9", +"/ c #4A7FAC", +"( c #709FC5", +"_ c #3A83BE", +": c #5795C7", +"< c #94B9DB", +"[ c #73A4CE", +"} c #3D80B7", +"| c #387CB4", +"1 c #377AB2", +"2 c #377AB0", +"3 c #3777AC", +"4 c #3774A7", +"5 c #3773A5", +"6 c #3C73A5", +"7 c #4586BB", +"8 c #4489C1", +"9 c #A7C7E1", +"0 c #F7F9FD", +"a c #E1E9F1", +"b c #4C89BC", +"c c #3779AF", +"d c #3778AD", +"e c #3873A5", +"f c #4B7CA4", +"g c #3982BE", +"h c #4389C1", +"i c #A6C6E1", +"j c #F6F9FC", +"k c #D6E4F0", +"l c #4A88BB", +"m c #3773A6", +"n c #366F9F", +"o c #366E9D", +"p c #376E9C", +"q c #4A8BC0", +"r c #79A7CD", +"s c #548EBD", +"t c #387AB0", +"u c #3773A4", +"v c #366D9C", +"w c #387FBA", +"x c #387DB7", +"y c #387BB4", +"z c #3775A8", +"A c #366FA0", +"B c #4981AF", +"C c #427BAA", +"D c #3772A4", +"E c #376B97", +"F c #77A3C8", +"G c #4586BC", +"H c #3882BE", +"I c #3B76A7", +"J c #3B76A6", +"K c #366E9E", +"L c #376B98", +"M c #376B96", +"N c #5681A3", +"O c #F5EEB8", +"P c #FFED60", +"Q c #FFE85B", +"R c #FFE659", +"S c #FDE55F", +"T c #5592C4", +"U c #3A83BF", +"V c #3882BD", +"W c #387FB9", +"X c #3779AE", +"Y c #366F9E", +"Z c #366C98", +"` c #376A94", +" . c #5D85A7", +".. c #F5EDB7", +"+. c #FFEA5D", +"@. c #FFE75A", +"#. c #FFE354", +"$. c #FDDD56", +"%. c #669DC8", +"&. c #3885C3", +"*. c #3884C2", +"=. c #387EB8", +"-. c #387CB6", +";. c #377AB1", +">. c #3772A3", +",. c #366D9B", +"'. c #F5EBB5", +"). c #FFE557", +"!. c #FFE455", +"~. c #FFDF50", +"{. c #FFDB4C", +"]. c #FAD862", +"^. c #8EB4D2", +"/. c #3C86C1", +"(. c #3883C0", +"_. c #3882BF", +":. c #3881BC", +"<. c #3880BB", +"[. c #3775AA", +"}. c #F5EAB3", +"|. c #FFE051", +"1. c #FFDE4F", +"2. c #FFDA4A", +"3. c #FED446", +"4. c #F5DF9D", +"5. c #77A5CA", +"6. c #3885C2", +"7. c #387BB2", +"8. c #6B8EA8", +"9. c #F8E7A1", +"0. c #FFE153", +"a. c #FFDD4E", +"b. c #FFDB4B", +"c. c #FFD746", +"d. c #FFD645", +"e. c #FFD342", +"f. c #F6DB8D", +"g. c #508DBE", +"h. c #3771A3", +"i. c #376A95", +"j. c #3D6F97", +"k. c #C3CBC2", +"l. c #FBD964", +"m. c #FFDC4D", +"n. c #FFD544", +"o. c #FFD040", +"p. c #F9CF58", +"q. c #3F83BB", +"r. c #376B95", +"s. c #3A6C95", +"t. c #4E7BA0", +"u. c #91AABC", +"v. c #F6E4A3", +"w. c #FFDA4B", +"x. c #FFD646", +"y. c #FFD443", +"z. c #FFD241", +"A. c #FFCE3D", +"B. c #FFCC3B", +"C. c #FCC83E", +"D. c #3880BC", +"E. c #3C79AC", +"F. c #5F8DB4", +"G. c #7AA0C0", +"H. c #82A6C3", +"I. c #82A3BF", +"J. c #82A2BE", +"K. c #82A1BB", +"L. c #82A1B9", +"M. c #8BA4B5", +"N. c #C1C5AE", +"O. c #F2E19F", +"P. c #FDD74C", +"Q. c #FFD94A", +"R. c #FFD343", +"S. c #FFCE3E", +"T. c #FFCB39", +"U. c #FFC937", +"V. c #FEC636", +"W. c #3D79AB", +"X. c #9DB6C6", +"Y. c #D0CFA2", +"Z. c #EFE598", +"`. c #F8EE9B", +" + c #F8EB97", +".+ c #F8E996", +"++ c #F8E894", +"@+ c #FAE489", +"#+ c #FCDB64", +"$+ c #FFDA4D", +"%+ c #FFCF3E", +"&+ c #FFCB3A", +"*+ c #FFC734", +"=+ c #FFC532", +"-+ c #3F82B7", +";+ c #387EB9", +">+ c #9EB9D0", +",+ c #F2E287", +"'+ c #FDEB69", +")+ c #FEEC60", +"!+ c #FFEB5E", +"~+ c #FFE254", +"{+ c #FFE152", +"]+ c #FFD747", +"^+ c #FFC633", +"/+ c #FCC235", +"(+ c #578FBE", +"_+ c #6996BC", +":+ c #DED9A8", +"<+ c #FEEC62", +"[+ c #FFE658", +"}+ c #FFDF51", +"|+ c #FFDE50", +"1+ c #FFD03F", +"2+ c #FFCD3C", +"3+ c #FFC431", +"4+ c #FFBF2C", +"5+ c #FAC244", +"6+ c #85AACA", +"7+ c #A1BBD2", +"8+ c #F7E47C", +"9+ c #FFE456", +"0+ c #FFC735", +"a+ c #FFBC29", +"b+ c #F7D280", +"c+ c #9DBAD2", +"d+ c #3B7CB2", +"e+ c #ABC2D6", +"f+ c #FDEB7B", +"g+ c #FFC12E", +"h+ c #FDBD30", +"i+ c #F4DEA8", +"j+ c #5F91BA", +"k+ c #ABC1D4", +"l+ c #FDEE7E", +"m+ c #FFE253", +"n+ c #FFCC3C", +"o+ c #FFBA27", +"p+ c #FAC75B", +"q+ c #4A82B0", +"r+ c #3877AB", +"s+ c #3774A6", +"t+ c #AAC0D4", +"u+ c #FDEE7D", +"v+ c #FFEC5F", +"w+ c #FFE255", +"x+ c #FFD848", +"y+ c #FFD444", +"z+ c #FFCF3F", +"A+ c #FFBC2A", +"B+ c #FFBB28", +"C+ c #FDBA32", +"D+ c #447AA8", +"E+ c #4379A7", +"F+ c #FFE95C", +"G+ c #FFE558", +"H+ c #FFE355", +"I+ c #FED84B", +"J+ c #FCD149", +"K+ c #FBCE47", +"L+ c #FBCD46", +"M+ c #FBC840", +"N+ c #FBC63E", +"O+ c #FBC037", +"P+ c #FAC448", +"Q+ c #FDD44C", +"R+ c #FCD14E", +"S+ c #FFC836", +"T+ c #FFC22F", +"U+ c #FFC02D", +"V+ c #FFE052", +"W+ c #FFC636", +"X+ c #FFCF5C", +"Y+ c #FFD573", +"Z+ c #FFC33E", +"`+ c #FEBD2D", +" @ c #FFDB4D", +".@ c #FFD949", +"+@ c #FFD545", +"@@ c #FFD140", +"#@ c #FFCB48", +"$@ c #FFF7E4", +"%@ c #FFFCF6", +"&@ c #FFE09D", +"*@ c #FFBA2E", +"=@ c #FDBE2F", +"-@ c #FFD748", +";@ c #FFCA38", +">@ c #FFC844", +",@ c #FFF2D7", +"'@ c #FFF9EC", +")@ c #FFDB94", +"!@ c #FFB92D", +"~@ c #FAC54D", +"{@ c #FDD54E", +"]@ c #FFBD2D", +"^@ c #FFC858", +"/@ c #FFD174", +"(@ c #FFBF3E", +"_@ c #FCBD3C", +":@ c #FAD66A", +"<@ c #FECD3F", +"[@ c #FFC330", +"}@ c #FFBD2A", +"|@ c #FFB724", +"1@ c #FFB521", +"2@ c #FFB526", +"3@ c #FBC457", +"4@ c #F7E09E", +"5@ c #F8D781", +"6@ c #FAC349", +"7@ c #FCC134", +"8@ c #FEBE2C", +"9@ c #FBBE3F", +"0@ c #F7CF79", +"a@ c #F5D795", +" . + @ # $ % % & * = ", +" - ; > > , ' ) ! ~ { ] ^ / ", +" ( _ : < [ } | 1 2 ~ 3 4 5 5 6 ", +" 7 8 9 0 a b 2 c d 3 { 5 5 5 e f ", +" g h i j k l c ~ { { m 5 5 n o p ", +" > > q r s t c c d 4 5 u n v v v ", +" w x ' y 2 c d d z 5 u A v v v v ", +" B C 5 D v v v v E ", +" F G H H H x ' ) c c c d I J 5 K v v L M N O P Q R S ", +" T U H V V W ' ) c c X ~ 5 5 5 Y v v Z ` ` ...+.@.#.#.$. ", +" %.&.*.> w W =.-.;.c 3 { ^ 5 5 >.o v ,.E ` ` .'.).!.#.~.{.]. ", +"^./.(._.:.<., ' ) ;.X d [.5 5 >.K v ,.E ` ` ` .}.#.|.1.{.2.3.4.", +"5.6.(.H H x ' 7.c c 3 3 4 5 D K v v ,.` ` ` ` 8.9.0.a.b.c.d.e.f.", +"g._.> <.w ' ' | 2 3 { z 5 5 h.v v v i.` ` ` j.k.l.m.{.d.n.e.o.p.", +"q.> > :.-.' 1 c c c ] 5 5 >.v v ,.r.` ` s.t.u.v.{.w.x.y.z.A.B.C.", +"D.D.w -.' 1 c c c E.F.G.H.I.J.J.K.L.L.L.M.N.O.P.Q.c.R.S.B.T.U.V.", +"D.D.=.' ' 1 c c W.X.Y.Z.`.`.`.`.`. +.+++@+#+$+Q.d.R.%+B.&+*+=+=+", +"-+;+-.' ;.2 c c >+,+'+)+P P P !+Q R ~+{+1.{.]+d.y.%+B.&+^+=+=+/+", +"(+' ' ;.c X X _+:+<+P P P P !+R [+~+}+|+{.]+n.R.1+2+&+^+=+3+4+5+", +"6+' ) ! ~ { { 7+8+P P P P !+R 9+#.{+{.w.]+y.z.S.&+0+=+=+3+4+a+b+", +"c+d+7.! d 3 z e+f+P P P !+R 9+#.{+m.{.]+y.1+B.&+0+=+=+g+4+a+h+i+", +" j+c d 3 { 4 k+l+P P !+@.9+m+1.m.{.]+y.1+n+B.*+=+=+g+a+a+o+p+ ", +" q+r+{ s+m t+u+v+@.R w+{+}+{.x+d.y+z+n+B.0+=+=+g+A+a+B+C+ ", +" * D+E+E+ +.F+G+H+}+}+{.I+J+K+L+M+M+M+M+N+O+O+O+O+P+ ", +" ).).#.{+a.{.x+Q+R+ ", +" #.m+1.a.{.x+y.o.2+B.S+=+=+T+U+O+ ", +" 0.V+{.{.x+n.o.2+B.B.W+X+Y+Z+a+`+ ", +" @{..@+@n.@@B.B.S+^+#@$@%@&@*@=@ ", +" ].-@x.y.o.%+;@S+=+=+>@,@'@)@!@~@ ", +" {@z.z+2+U.=+=+=+T+]@^@/@(@_@ ", +" :@<@U.=+=+[@4+}@|@1@2@3@ ", +" 4@5@6@7@8@a+a+9@0@a@ "}; --- python2.7-2.7.8.orig/debian/pymindeps.py +++ python2.7-2.7.8/debian/pymindeps.py @@ -0,0 +1,174 @@ +#! /usr/bin/python + +# Matthias Klose +# Modified to only exclude module imports from a given module. + +# Copyright 2004 Toby Dickenson +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject +# to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import os, sys, pprint +import modulefinder +import imp + +class mymf(modulefinder.ModuleFinder): + def __init__(self,*args,**kwargs): + self._depgraph = {} + self._types = {} + self._last_caller = None + modulefinder.ModuleFinder.__init__(self, *args, **kwargs) + + def import_hook(self, name, caller=None, fromlist=None, level=-1): + old_last_caller = self._last_caller + try: + self._last_caller = caller + return modulefinder.ModuleFinder.import_hook(self, name, caller, + fromlist, level) + finally: + self._last_caller = old_last_caller + + def import_module(self, partnam, fqname, parent): + m = modulefinder.ModuleFinder.import_module(self, + partnam, fqname, parent) + if m is not None and self._last_caller: + caller = self._last_caller.__name__ + if '.' in caller: + caller = caller[:caller.index('.')] + callee = m.__name__ + if '.' in callee: + callee = callee[:callee.index('.')] + #print "XXX last_caller", caller, "MOD", callee + #self._depgraph.setdefault(self._last_caller.__name__,{})[r.__name__] = 1 + #if caller in ('pdb', 'doctest') or callee in ('pdb', 'doctest'): + # print caller, "-->", callee + if caller != callee: + self._depgraph.setdefault(caller,{})[callee] = 1 + return m + + def find_module(self, name, path, parent=None): + if parent is not None: + # assert path is not None + fullname = parent.__name__+'.'+name + elif name == "__init__": + fullname = os.path.basename(path[0]) + else: + fullname = name + if self._last_caller: + caller = self._last_caller.__name__ + if fullname in excluded_imports.get(caller, []): + #self.msgout(3, "find_module -> Excluded", fullname) + raise ImportError, name + + if fullname in self.excludes: + #self.msgout(3, "find_module -> Excluded", fullname) + raise ImportError, name + + if path is None: + if name in sys.builtin_module_names: + return (None, None, ("", "", imp.C_BUILTIN)) + + path = self.path + return imp.find_module(name, path) + + def load_module(self, fqname, fp, pathname, file_info): + suffix, mode, type = file_info + m = modulefinder.ModuleFinder.load_module(self, fqname, + fp, pathname, file_info) + if m is not None: + self._types[m.__name__] = type + return m + + def load_package(self, fqname, pathname): + m = modulefinder.ModuleFinder.load_package(self, fqname,pathname) + if m is not None: + self._types[m.__name__] = imp.PKG_DIRECTORY + return m + +def reduce_depgraph(dg): + pass + +# guarded imports, which don't need to be included in python-minimal +excluded_imports = { + 'collections': set(('doctest', 'dummy_thread', 'cPickle')), + 'copy': set(('reprlib',)), + 'difflib': set(('doctest',)), + 'hashlib': set(('logging',)), + 'hashlib': set(('_hashlib', '_md5', '_sha', '_sha256','_sha512',)), + 'heapq': set(('doctest',)), + 'inspect': set(('compiler',)), + 'os': set(('nt', 'ntpath', 'os2', 'os2emxpath', 'mac', 'macpath', + 'riscos', 'riscospath', 'riscosenviron')), + 'optparse': set(('gettext',)), + 'pickle': set(('doctest',)), + 'platform': set(('plistlib', 'tempfile')), + #'socket': set(('_ssl', 'ssl')), + 'tempfile': set(('dummy_thread',)), + 'subprocess': set(('threading',)), + 'shutil': set(('distutils', 'tarfile', 'zipfile')), + 'sysconfig': set(('pprint', '_osx_support')), + } + +def main(argv): + # Parse command line + import getopt + try: + opts, args = getopt.getopt(sys.argv[1:], "dmp:qx:") + except getopt.error as msg: + print(msg) + return + + # Process options + debug = 1 + domods = 0 + addpath = [] + exclude = [] + for o, a in opts: + if o == '-d': + debug = debug + 1 + if o == '-m': + domods = 1 + if o == '-p': + addpath = addpath + a.split(os.pathsep) + if o == '-q': + debug = 0 + if o == '-x': + exclude.append(a) + + path = sys.path[:] + path = addpath + path + + if debug > 1: + print("version:", sys.version) + print("path:") + for item in path: + print(" ", repr(item)) + + #exclude = ['__builtin__', 'sys', 'os'] + exclude = [] + mf = mymf(path, debug, exclude) + for arg in args: + mf.run_script(arg) + + depgraph = reduce_depgraph(mf._depgraph) + + pprint.pprint({'depgraph':mf._depgraph, 'types':mf._types}) + +if __name__=='__main__': + main(sys.argv[1:]) --- python2.7-2.7.8.orig/debian/python-config.1 +++ python2.7-2.7.8/debian/python-config.1 @@ -0,0 +1,102 @@ +.TH PYTHON\-CONFIG 1 "November 27, 2011" +.SH NAME +python\-config \- output build options for python C/C++ extensions or embedding +.SH SYNOPSIS +.BI "python\-config" +[ +.BI "\-\-prefix" +] +[ +.BI "\-\-exec\-prefix" +] +[ +.BI "\-\-includes" +] +[ +.BI "\-\-libs" +] +[ +.BI "\-\-cflags" +] +[ +.BI "\-\-ldflags" +] +[ +.BI "\-\-extension\-suffix" +] +[ +.BI "\-\-configdir" +] +[ +.BI "\-\-help" +] +.SH DESCRIPTION +.B python\-config +helps compiling and linking programs, which embed the Python interpreter, or +extension modules that can be loaded dynamically (at run time) into +the interpreter. +.SH OPTIONS +.TP +.BI "\-\-cflags" +print the C compiler flags. +.TP +.BI "\-\-ldflags" +print the flags that should be passed to the linker. +.TP +.BI "\-\-includes" +similar to \fI\-\-cflags\fP but only with \-I options (path to python header files). +.TP +.BI "\-\-libs" +similar to \fI\-\-ldflags\fP but only with \-l options (used libraries). +.TP +.BI "\-\-prefix" +prints the prefix (base directory) under which python can be found. +.TP +.BI "\-\-exec\-prefix" +print the prefix used for executable program directories (such as bin, sbin, etc). +.TP +.BI "\-\-extension\-suffix" +print suffix used for extension modules (including the _d modified for debug builds). +.TP +.BI "\-\-configdir" +prints the path to the configuration directory under which the Makefile, etc. can be found). +.TP +.BI "\-\-help" +print the usage message. +.PP + +.SH EXAMPLES +To build the singe\-file c program \fIprog\fP against the python library, use +.PP +.RS +gcc $(python\-config \-\-cflags \-\-ldflags) progr.cpp \-o progr.cpp +.RE +.PP +The same in a makefile: +.PP +.RS +CFLAGS+=$(shell python\-config \-\-cflags) +.RE +.RS +LDFLAGS+=$(shell python\-config \-\-ldflags) +.RE +.RS +all: progr +.RE + +To build a dynamically loadable python module, use +.PP +.RS +gcc $(python\-config \-\-cflags \-\-ldflags) \-shared \-fPIC progr.cpp \-o progr.so +.RE + +.SH "SEE ALSO" +python (1) +.br +http://docs.python.org/extending/extending.html +.br +/usr/share/doc/python/faq/extending.html + +.SH AUTHORS +This manual page was written by Johann Felix Soden +for the Debian project (and may be used by others). --- python2.7-2.7.8.orig/debian/rules +++ python2.7-2.7.8/debian/rules @@ -0,0 +1,1401 @@ +#!/usr/bin/make -f + +unexport LANG LC_ALL LC_CTYPE LC_COLLATE LC_TIME LC_NUMERIC LC_MESSAGES +unexport CFLAGS CXXFLAGS CPPFLAGS LDFLAGS + +export SHELL = /bin/bash + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1))) + +DPKG_VARS := $(shell dpkg-architecture) +DEB_BUILD_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_ARCH) +DEB_BUILD_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH) +DEB_HOST_ARCH_BITS ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_BITS) +DEB_HOST_ARCH_ENDIAN ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_ENDIAN) +DEB_HOST_ARCH_OS ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH) + +changelog_values := $(shell dpkg-parsechangelog \ + | awk '/^(Version|Source):/ {print $$2}') +PKGSOURCE := $(word 1, $(changelog_values)) +PKGVERSION := $(word 2, $(changelog_values)) + +on_buildd := $(shell [ -f /CurrentlyBuilding -o "$$LOGNAME" = buildd -o "$$USER" = buildd ] && echo yes) + +ifneq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) + WITHOUT_CHECK := yes +endif +WITHOUT_BENCH := +ifneq (,$(findstring nobench, $(DEB_BUILD_OPTIONS))) + WITHOUT_BENCH := yes +endif +ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386)) + WITHOUT_BENCH := disabled on $(DEB_HOST_ARCH) +endif +ifeq ($(on_buildd),yes) + ifneq (,$(findstring $(DEB_HOST_ARCH), hppa mips mipsel mipsn32 mipsn32el mips64 mips64el s390)) + WITHOUT_CHECK := yes + endif +endif +ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386 kfreebsd-amd64 kfreebsd-i386)) + WITHOUT_CHECK := yes +endif +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + WITHOUT_BENCH := yes + WITHOUT_CHECK := yes +endif + +COMMA = , +ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) +endif + +distribution := $(shell lsb_release -is) +distrelease := $(shell lsb_release -cs) + +VER=2.7 +NVER=2.8 +PVER=python2.7 +PRIORITY=$(shell echo $(VER) | tr -d '.')0 + +PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog) + +# default versions are built from the python-defaults source package +# keep the definition to adjust package priorities. +DEFAULT_VERSION = yes +STATIC_PYTHON=yes + +MIN_MODS := $(shell awk '/^ / && $$2 == "module" { print $$1 }' \ + debian/PVER-minimal.README.Debian.in) +MIN_EXTS := $(shell awk '/^ / && $$2 ~ /^extension/ { print $$1 }' \ + debian/PVER-minimal.README.Debian.in) +MIN_BUILTINS := $(shell awk '/^ / && $$2 == "builtin" { print $$1 }' \ + debian/PVER-minimal.README.Debian.in) +MIN_PACKAGES := $(shell awk '/^ / && $$2 == "package" { print $$1 }' \ + debian/PVER-minimal.README.Debian.in) +MIN_ENCODINGS := $(foreach i, \ + $(filter-out \ + big5% bz2% cp932.py cp949.py cp950.py euc_% \ + gb% iso2022% johab.py shift_jis% , \ + $(shell cd Lib/encodings && echo *.py)), \ + encodings/$(i)) \ + codecs.py stringprep.py + +with_tk := no +with_gdbm := no +with_interp := static +#with_interp := shared + +PY_INTERPRETER = /usr/bin/python$(VER) + +ifeq ($(DEFAULT_VERSION),yes) + PY_PRIO = standard + #PYSTDDEP = , python (>= $(VER)) + PY_MINPRIO = $(PY_PRIO) +else + PY_PRIO = optional + PY_MINPRIO = $(PY_PRIO) +endif +with_fpectl = yes + +ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric)) + bd_qual = :any +endif +ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric)) + ma_filter = cat +else + ma_filter = grep -v '^Multi-Arch:' +endif +ifneq (,$(filter $(distrelease),sid experimental)) + bd_gcc = gcc (>= 4:4.9.2-1~), +endif +ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric precise quantal raring saucy trusty)) + bd_dpkgdev = dpkg-dev (>= 1.17.11), +endif + +CC = $(DEB_HOST_GNU_TYPE)-gcc +CXX=$(DEB_HOST_GNU_TYPE)-g++ + +AR=$(DEB_HOST_GNU_TYPE)-ar +RANLIB=$(DEB_HOST_GNU_TYPE)-ranlib + +DPKG_CFLAGS := $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS) +DPKG_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) +OPT_CFLAGS := $(filter-out -O%,$(DPKG_CFLAGS)) # default is -O3 +DEBUG_CFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(patsubst -O%,-O0,$(DPKG_CFLAGS))) + +# on alpha, use -O2 only, use -mieee +ifeq ($(DEB_HOST_ARCH),alpha) + OPT_CFLAGS += -mieee + DEBUG_CFLAGS += -mieee + EXTRA_OPT_FLAGS += -O2 +endif +# issues with ia64 and m68k with -O3 +ifeq ($(DEB_HOST_ARCH),m68k) + EXTRA_OPT_FLAGS += -O2 +endif + +ifeq ($(DEB_HOST_ARCH_OS),linux) + ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386 powerpc ppc64)) + with_pgo := yes + endif +endif +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + with_pgo := +endif +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + with_pgo := +endif + +ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386)) + with_lto := yes +endif + +ifneq (,$(findstring noopt, $(DEB_BUILD_OPTIONS))) + OPT_CFLAGS := $(filter-out -O%, $(OPT_CFLAGS)) + EXTRA_OPT_CFLAGS = -O0 + with_pgo = + with_lto = +endif + +ifeq ($(with_lto),yes) + LTO_CFLAGS = -g -flto -fuse-linker-plugin + with_fat_lto := $(shell dpkg --compare-versions $$($(CC) --version \ + | sed -n '/^$(CC)/s/.* //p') ge 4.9 && echo yes) + ifeq ($(with_fat_lto),yes) + LTO_CFLAGS += -ffat-lto-objects + endif + EXTRA_OPT_CFLAGS += $(LTO_CFLAGS) + AR=$(DEB_HOST_GNU_TYPE)-gcc-ar + RANLIB=$(DEB_HOST_GNU_TYPE)-gcc-ranlib +endif + +make_build_target = $(if $(with_pgo),profile-opt) + +buildd_static := $(CURDIR)/build-static +buildd_shared := $(CURDIR)/build-shared +buildd_debug := $(CURDIR)/build-debug +buildd_shdebug := $(CURDIR)/build-shdebug + +d := debian/tmp +scriptdir = usr/share/lib/python$(VER) +scriptdir = usr/share/python$(VER) +scriptdir = usr/lib/python$(VER) + +# package names and directories +p_base := $(PVER) +p_min := $(PVER)-minimal +p_lib := lib$(PVER) +p_tk := $(PVER)-tk +p_gdbm := $(PVER)-gdbm +p_dev := $(PVER)-dev +p_exam := $(PVER)-examples +p_idle := idle-$(PVER) +p_doc := $(PVER)-doc +p_dbg := $(PVER)-dbg + +p_lbase := lib$(PVER)-stdlib +p_lmin := lib$(PVER)-minimal +p_ldev := lib$(PVER)-dev +p_ldbg := lib$(PVER)-dbg +p_ltst := lib$(PVER)-testsuite + +d_base := debian/$(p_base) +d_min := debian/$(p_min) +d_lib := debian/$(p_lib) +d_tk := debian/$(p_tk) +d_gdbm := debian/$(p_gdbm) +d_dev := debian/$(p_dev) +d_exam := debian/$(p_exam) +d_idle := debian/$(p_idle) +d_doc := debian/$(p_doc) +d_dbg := debian/$(p_dbg) + +d_lbase := debian/$(p_lbase) +d_lmin := debian/$(p_lmin) +d_ldev := debian/$(p_ldev) +d_ldbg := debian/$(p_ldbg) +d_ltst := debian/$(p_ltst) + +build-arch: stamps/stamp-build +build-indep: stamps/stamp-build-doc +build: build-arch +stamps/stamp-build: stamps/stamp-build-static stamps/stamp-mincheck \ + stamps/stamp-build-shared stamps/stamp-build-debug \ + stamps/stamp-build-shared-debug \ + stamps/stamp-check stamps/stamp-pystone stamps/stamp-pybench + touch $@ + +PROFILE_EXCLUDES = test_compiler test_distutils test_platform test_subprocess \ + test_multiprocessing test_cprofile \ + test_thread test_threaded_import test_threadedtempfile \ + test_socketserver \ + test_threading test_threading_local test_threadsignals \ + test_dbm_dumb test_dbm_ndbm test_pydoc test_sundry test_gdb \ + +ifneq (,$(filter $(DEB_HOST_ARCH), arm armel)) + PROFILE_EXCLUDES += test_float +endif +ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386)) + PROFILE_EXCLUDES += test_io +endif +PROFILE_EXCLUDES += test_zipfile +PROFILE_EXCLUDES += test_xmlrpc +PROFILE_EXCLUDES += test_bsddb3 + +PROFILE_TASK = ../Lib/test/regrtest.py \ + -x $(sort $(TEST_EXCLUDES) $(PROFILE_EXCLUDES)) + +stamps/stamp-build-static: stamps/stamp-configure-static + dh_testdir + $(MAKE) $(NJOBS) -C $(buildd_static) \ + EXTRA_CFLAGS="$(EXTRA_OPT_CFLAGS)" \ + PROFILE_TASK='$(PROFILE_TASK)' $(make_build_target) + + : # check that things are correctly built +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + ifneq (,$(filter $(DEB_HOST_ARCH_OS), linux)) + cd $(buildd_static) && ./python -c 'from _multiprocessing import SemLock' + endif +endif + + touch stamps/stamp-build-static + +stamps/stamp-build-shared: stamps/stamp-configure-shared + dh_testdir + $(MAKE) $(NJOBS) -C $(buildd_shared) \ + EXTRA_CFLAGS="$(EXTRA_OPT_CFLAGS)" +# : # build the shared library +# $(MAKE) $(NJOBS) -C $(buildd_shared) \ +# libpython$(VER).so + : # build a static library with PIC objects + $(MAKE) $(NJOBS) -C $(buildd_shared) \ + EXTRA_CFLAGS="$(EXTRA_OPT_CFLAGS)" \ + LIBRARY=libpython$(VER)-pic.a libpython$(VER)-pic.a + touch stamps/stamp-build-shared + +stamps/stamp-build-debug: stamps/stamp-configure-debug + dh_testdir + $(MAKE) $(NJOBS) -C $(buildd_debug) \ + EXTRA_CFLAGS="$(DEBUG_CFLAGS)" + touch stamps/stamp-build-debug + +stamps/stamp-build-shared-debug: stamps/stamp-configure-shared-debug + dh_testdir + : # build the shared debug library + $(MAKE) $(NJOBS) -C $(buildd_shdebug) \ + EXTRA_CFLAGS="$(DEBUG_CFLAGS)" + touch stamps/stamp-build-shared-debug + +common_configure_args = \ + --prefix=/usr \ + --enable-ipv6 \ + --enable-unicode=ucs4 \ + --with-dbmliborder=bdb:gdbm \ + --with-system-expat + +ifneq (,$(filter $(DEB_HOST_ARCH), avr32 or1k)) + common_configure_args += --without-ffi +else + common_configure_args += --with-system-ffi +endif + +ifeq ($(with_fpectl),yes) + common_configure_args += \ + --with-fpectl +endif + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + common_configure_args += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) + config_site = ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=yes + ifeq (,$(filter $(DEB_HOST_ARCH),arm m68k)) + ifeq ($(DEB_HOST_ARCH_ENDIAN),little) + config_site += ac_cv_little_endian_double=yes + else + config_site += ac_cv_big_endian_double=yes + endif + endif +endif + +stamps/stamp-configure-shared: stamps/stamp-patch + rm -rf $(buildd_shared) + mkdir -p $(buildd_shared) + cd $(buildd_shared) && \ + CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" \ + CFLAGS="$(OPT_CFLAGS)" LDFLAGS="$(DPKG_LDFLAGS)" \ + $(config_site) \ + ../configure \ + --enable-shared \ + $(common_configure_args) + + $(call __post_configure,$(buildd_shared)) + + touch stamps/stamp-configure-shared + +stamps/stamp-configure-static: stamps/stamp-patch + rm -rf $(buildd_static) + mkdir -p $(buildd_static) + cd $(buildd_static) && \ + CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" \ + CFLAGS="$(OPT_CFLAGS)" LDFLAGS="$(DPKG_LDFLAGS)" \ + $(config_site) \ + ../configure \ + $(common_configure_args) + + $(call __post_configure,$(buildd_static)) + + touch stamps/stamp-configure-static + +stamps/stamp-configure-debug: stamps/stamp-patch + rm -rf $(buildd_debug) + mkdir -p $(buildd_debug) + cd $(buildd_debug) && \ + CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" \ + CFLAGS="$(DEBUG_CFLAGS)" LDFLAGS="$(DPKG_LDFLAGS)" \ + $(config_site) \ + ../configure \ + $(common_configure_args) \ + --with-pydebug + + $(call __post_configure,$(buildd_debug)) + + touch stamps/stamp-configure-debug + +stamps/stamp-configure-shared-debug: stamps/stamp-patch + rm -rf $(buildd_shdebug) + mkdir -p $(buildd_shdebug) + cd $(buildd_shdebug) && \ + CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" \ + CFLAGS="$(DEBUG_CFLAGS)" LDFLAGS="$(DPKG_LDFLAGS)" \ + $(config_site) \ + ../configure \ + $(common_configure_args) \ + --enable-shared \ + --with-pydebug + + $(call __post_configure,$(buildd_shdebug)) + + touch stamps/stamp-configure-shared-debug + +define __post_configure + egrep \ + "^#($$(awk -v ORS='|' '$$2 ~ /^extension$$/ {print $$1}' debian/PVER-minimal.README.Debian.in)XX)" \ + Modules/Setup.dist \ + | sed -e 's/^#//' -e 's/-Wl,-Bdynamic//;s/-Wl,-Bstatic//' \ + >> $(1)/Modules/Setup.local + + : # unconditionally run makesetup + cd $(1) && \ + ../Modules/makesetup -c ../Modules/config.c.in -s Modules \ + Modules/Setup.config Modules/Setup.local Modules/Setup + mv $(1)/config.c $(1)/Modules/ + + : # and fix the timestamps + $(MAKE) -C $(1) Makefile Modules/config.c + + : # apply workaround for missing os.fsync + sed 's/HAVE_SYNC/HAVE_FSYNC/g' $(1)/pyconfig.h \ + > $(1)/pyconfig.h.new + touch -r $(1)/pyconfig.h $(1)/pyconfig.h.new + mv -f $(1)/pyconfig.h.new $(1)/pyconfig.h +endef + +stamps/stamp-mincheck: stamps/stamp-build-static debian/PVER-minimal.README.Debian.in +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + for m in $(MIN_MODS) $(MIN_PACKAGES) $(MIN_EXTS) $(MIN_BUILTINS); do \ + echo "import $$m"; \ + done > $(buildd_static)/minmods.py + cd $(buildd_static) && ./python ../debian/pymindeps.py minmods.py \ + > $(buildd_static)/mindeps.txt + if [ -x /usr/bin/dot ]; then \ + cd $(buildd_static); \ + ./python ../debian/depgraph.py < mindeps.txt > mindeps.dot; \ + dot -Tpng -o $(buildd_static)/mindeps.png \ + $(buildd_static)/mindeps.dot; \ + else true; fi + cd $(buildd_static) && ./python ../debian/mincheck.py \ + minmods.py mindeps.txt +endif + touch stamps/stamp-mincheck + +TEST_RESOURCES = all +ifeq ($(on_buildd),yes) + TEST_RESOURCES := $(TEST_RESOURCES),-network,-urlfetch,-bsddb +endif +TESTOPTS = -w -l -u$(TEST_RESOURCES) +TEST_EXCLUDES = +ifeq ($(on_buildd),yes) + TEST_EXCLUDES += test_codecmaps_cn test_codecmaps_hk \ + test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw \ + test_normalization test_ossaudiodev + ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel powerpc kfreebsd-i386 sparc)) + TEST_EXCLUDES += test_threading + endif + ifeq (,$(wildcard $(HOME))) + TEST_EXCLUDES += test_site + endif +endif +ifeq (,$(wildcard /dev/dsp)) + TEST_EXCLUDES += test_linuxaudiodev test_ossaudiodev +endif +ifneq (,$(filter $(DEB_HOST_ARCH), armel hppa powerpc)) + TEST_EXCLUDES += test_multiprocessing +endif +ifneq (,$(filter $(DEB_HOST_ARCH), hppa)) + TEST_EXCLUDES += test_fork1 test_socketserver test_threading test_wait3 test_wait4 test_gdb +endif +ifneq (,$(filter $(DEB_HOST_ARCH), arm avr32)) + TEST_EXCLUDES += test_ctypes +endif +TEST_EXCLUDES += test_bsddb3 +TEST_EXCLUDES += test_ensurepip +ifneq (,$(filter $(DEB_HOST_ARCH), arm armel avr32 m68k)) + ifeq ($(on_buildd),yes) + TEST_EXCLUDES += test_compiler + endif +endif +TEST_EXCLUDES += test_gdb +# fails on some buildds +ifneq (,$(filter $(DEB_HOST_ARCH), amd64 armel armhf mips mipsel)) + TEST_EXCLUDES += test_io +endif +ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386)) + TEST_EXCLUDES += test_io test_signal +endif +ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386)) + TEST_EXCLUDES += test_io test_random test_signal test_socket test_socketserver test_ssl \ + test_threading test_subprocess +endif +ifneq (,$(filter $(DEB_HOST_ARCH), ia64)) + TEST_EXCLUDES += test_threading test_subprocess +endif +ifneq (,$(TEST_EXCLUDES)) + TESTOPTS += -x $(sort $(TEST_EXCLUDES)) + ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel)) + TESTOPTS_DEBUG := $(TESTOPTS) + else + TESTOPTS_DEBUG := $(filter-out test_gdb,$(TESTOPTS)) + endif +endif + +ifneq (,$(wildcard /usr/bin/localedef)) + SET_LOCPATH = LOCPATH=$(CURDIR)/locales +endif + +stamps/stamp-check: +ifeq ($(WITHOUT_CHECK),yes) + echo "check run disabled for this build" > $(buildd_static)/test_results +else + : # build locales needed by the testsuite + rm -rf locales + mkdir locales + if which localedef >/dev/null 2>&1; then \ + sh debian/locale-gen; \ + fi + + @echo ========== test environment ============ + @env + @echo ======================================== + ifeq (,$(findstring $(DEB_HOST_ARCH), alpha)) + ( \ + echo '#! /bin/sh'; \ + echo 'set -x'; \ + echo 'export TERM=$${TERM:-dumb}'; \ + echo '$(buildd_static)/python $(CURDIR)/debian/script.py test_results '\''make test TESTOPTS="$(TESTOPTS_DEBUG)"'\'; \ + echo 'echo DONE'; \ + ) > $(buildd_debug)/run_tests + chmod 755 $(buildd_debug)/run_tests + @echo "BEGIN test debug" + -tmphome=$$(mktemp -d); export HOME=$$tmphome; \ + cd $(buildd_debug) && time xvfb-run -a -e xvfb-run.log ./run_tests; \ + rm -rf $$tmphome + @echo "END test debug" + endif + + ( \ + echo '#! /bin/sh'; \ + echo 'set -x'; \ + echo 'export TERM=$${TERM:-dumb}'; \ + echo 'export $(SET_LOCPATH)'; \ + echo '$(buildd_static)/python $(CURDIR)/debian/script.py test_results '\''make test EXTRA_CFLAGS="$(EXTRA_OPT_CFLAGS)" TESTOPTS="$(TESTOPTS)"'\'; \ + echo 'echo DONE'; \ + ) > $(buildd_static)/run_tests + chmod 755 $(buildd_static)/run_tests + @echo "BEGIN test static" + -tmphome=$$(mktemp -d); export HOME=$$tmphome; \ + cd $(buildd_static) && time xvfb-run -a -e xvfb-run.log ./run_tests; \ + rm -rf $$tmphome + @echo "END test static" + + ( \ + echo '#! /bin/sh'; \ + echo 'set -x'; \ + echo 'export TERM=$${TERM:-dumb}'; \ + echo 'export $(SET_LOCPATH)'; \ + echo '$(buildd_static)/python $(CURDIR)/debian/script.py test_results '\''make test EXTRA_CFLAGS="$(EXTRA_OPT_CFLAGS)" TESTOPTS="$(TESTOPTS)"'\'; \ + echo 'echo DONE'; \ + ) > $(buildd_shared)/run_tests + chmod 755 $(buildd_shared)/run_tests + @echo "BEGIN test shared" + -tmphome=$$(mktemp -d); export HOME=$$tmphome; \ + cd $(buildd_shared) && time xvfb-run -a -e xvfb-run.log ./run_tests; \ + rm -rf $$tmphome + @echo "END test shared" +endif + cp -p $(buildd_static)/test_results debian/ + touch stamps/stamp-check + +stamps/stamp-pystone: +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + @echo "BEGIN pystone static" + cd $(buildd_static) && ./python ../Lib/test/pystone.py + cd $(buildd_static) && ./python ../Lib/test/pystone.py + @echo "END pystone static" + @echo "BEGIN pystone shared" + cd $(buildd_shared) \ + && LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. ./python ../Lib/test/pystone.py + cd $(buildd_shared) \ + && LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. ./python ../Lib/test/pystone.py + @echo "END pystone shared" + @echo "BEGIN pystone debug" + cd $(buildd_debug) && ./python ../Lib/test/pystone.py + cd $(buildd_debug) && ./python ../Lib/test/pystone.py + @echo "END pystone debug" +endif + touch stamps/stamp-pystone + +#ifeq (,$(filter $(DEB_HOST_ARCH), arm armel avr32 hppa mips mipsel m68k)) + pybench_options = -C 2 -n 5 -w 4 +#endif + +stamps/stamp-pybench: +ifeq ($(WITHOUT_BENCH),yes) + echo "pybench run disabled for this build" > $(buildd_static)/pybench.log +else + @echo "BEGIN pybench static" + cd $(buildd_static) \ + && time ./python ../Tools/pybench/pybench.py -f run1.pybench $(pybench_options) + cd $(buildd_static) \ + && ./python ../Tools/pybench/pybench.py -f run2.pybench -c run1.pybench $(pybench_options) + @echo "END pybench static" + @echo "BEGIN pybench shared" + cd $(buildd_shared) \ + && LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. \ + ./python ../Tools/pybench/pybench.py -f run1.pybench $(pybench_options) + cd $(buildd_shared) \ + && LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. \ + ./python ../Tools/pybench/pybench.py -f run2.pybench -c run1.pybench $(pybench_options) + @echo "END pybench shared" + @echo "BEGIN shared/static comparision" + $(buildd_static)/python Tools/pybench/pybench.py \ + -s $(buildd_static)/run2.pybench -c $(buildd_shared)/run2.pybench \ + | tee $(buildd_static)/pybench.log + @echo "END shared/static comparision" +endif + touch stamps/stamp-pybench + +minimal-test: + rm -rf mintest + mkdir -p mintest/lib mintest/dynlib mintest/testlib mintest/all-lib + cp -p $(buildd_static)/python mintest/ + cp -p $(foreach i,$(MIN_MODS),Lib/$(i).py) \ + mintest/lib/ + cp -a $(foreach i,$(MIN_PACKAGES),Lib/$(i)) \ + mintest/lib/ + cp -p $(wildcard $(foreach i,$(MIN_EXTS),$(buildd_static)/build/lib*/$(i).*.so)) \ + mintest/dynlib/ + cp -p Lib/unittest.py mintest/lib/ + cp -pr Lib/test mintest/lib/ + cp -pr Lib mintest/all-lib + cp -p $(buildd_static)/build/lib*/*.so mintest/all-lib/ + ( \ + echo "import sys"; \ + echo "sys.path = ["; \ + echo " '$(CURDIR)/mintest/lib',"; \ + echo " '$(CURDIR)/mintest/dynlib',"; \ + echo "]"; \ + cat Lib/test/regrtest.py; \ + ) > mintest/lib/test/mintest.py + cd mintest && ./python -E -S lib/test/mintest.py \ + -x test_codecencodings_cn test_codecencodings_hk \ + test_codecencodings_jp test_codecencodings_kr \ + test_codecencodings_tw test_codecs test_multibytecodec \ + +stamps/stamp-doc-html: + dh_testdir + $(MAKE) -C Doc html + touch stamps/stamp-doc-html + +build-doc: stamps/stamp-patch stamps/stamp-build-doc +stamps/stamp-build-doc: stamps/stamp-doc-html + touch stamps/stamp-build-doc + +control-file: + sed -e "s/@PVER@/$(PVER)/g" \ + -e "s/@VER@/$(VER)/g" \ + -e "s/@PYSTDDEP@/$(PYSTDDEP)/g" \ + -e "s/@PRIO@/$(PY_PRIO)/g" \ + -e "s/@MINPRIO@/$(PY_MINPRIO)/g" \ + -e "s/@bd_qual@/$(bd_qual)/g" \ + -e "s/@bd_gcc@/$(bd_gcc)/g" \ + -e "s/@bd_dpkgdev@/$(bd_dpkgdev)/g" \ + debian/control.in \ + | $(ma_filter) \ + > debian/control.tmp +ifeq ($(distribution),Ubuntu) + ifneq (,$(findstring ubuntu, $(PKGVERSION))) + m='Ubuntu Core Developers '; \ + sed -i "/^Maintainer:/s/\(.*\)/Maintainer: $$m\nXSBC-Original-\1/" \ + debian/control.tmp + endif +endif + [ -e debian/control ] \ + && cmp -s debian/control debian/control.tmp \ + && rm -f debian/control.tmp && exit 0; \ + mv debian/control.tmp debian/control + + + +clean: control-file + dh_testdir + dh_testroot + $(MAKE) -f debian/rules unpatch + rm -rf stamps .pc + rm -f debian/test_results + + $(MAKE) -C Doc clean + sed 's/^@/#/' Makefile.pre.in | $(MAKE) -f - srcdir=. distclean + rm -rf Lib/test/db_home + rm -rf $(buildd_static) $(buildd_shared) $(buildd_debug) $(buildd_shdebug) + find -name '*.py[co]' | xargs -r rm -f + rm -f Lib/lib2to3/*.pickle + rm -rf Lib/plat-$(DEB_HOST_MULTIARCH) + rm -rf locales + rm -rf $(d)-dbg $(d)-shdbg + + for f in debian/*.in; do \ + f2=`echo $$f | sed "s,PVER,$(PVER),g;s/@VER@/$(VER)/g;s,\.in$$,,"`; \ + if [ $$f2 != debian/control ] && [ $$f2 != debian/source.lintian-overrides ]; then \ + rm -f $$f2; \ + fi; \ + done + dh_autotools-dev_restoreconfig + dh_clean + +stamps/stamp-control: + : # We have to prepare the various control files + + for f in debian/*.in; do \ + f2=`echo $$f | sed "s,PVER,$(PVER),g;s/@VER@/$(VER)/g;s,\.in$$,,"`; \ + if [ $$f2 != debian/control ]; then \ + sed -e "s/@PVER@/$(PVER)/g;s/@VER@/$(VER)/g" \ + -e "s/@PRIORITY@/$(PRIORITY)/g" \ + -e "s,@SCRIPTDIR@,/$(scriptdir),g" \ + -e "s,@INFO@,$(info_docs),g" \ + -e "s,@HOST_QUAL@,:$(DEB_HOST_ARCH),g" \ + <$$f >$$f2; \ + fi; \ + done +ifeq ($(DEB_HOST_ARCH_BITS),64) + sed -i 's/\(Py_InitModule4[^@]*\)@/\1_64@/' \ + debian/lib$(PVER).symbols debian/lib$(PVER)-dbg.symbols +endif + +2to3-man: + help2man --no-info --version-string=$(VER) --no-discard-stderr \ + --name 'Python2 to Python3 converter' \ + 2to3-$(VER) > debian/2to3-$(VER).1 + +install: build-arch stamps/stamp-install +stamps/stamp-install: stamps/stamp-build control-file stamps/stamp-control + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + : # make install into tmp and subsequently move the files into + : # their packages' directories. + install -d $(d)/usr +ifeq ($(with_interp),static) + $(MAKE) -C $(buildd_static) install prefix=$(CURDIR)/$(d)/usr +else + $(MAKE) -C $(buildd_shared) install prefix=$(CURDIR)/$(d)/usr +endif + mkdir -p $(d)/usr/include/$(DEB_HOST_MULTIARCH)/$(PVER) + mv $(d)/usr/include/$(PVER)/pyconfig.h \ + $(d)/usr/include/$(DEB_HOST_MULTIARCH)/$(PVER)/. + mv $(d)/usr/bin/python-config.sh $(d)/usr/bin/python$(VER)-config + sed -i 's/-O3/-O2/g;s/$(LTO_CFLAGS)//g;s/-fprofile-use *-fprofile-correction//g' \ + $(d)/usr/bin/python$(VER)-config + + : # fiddle around with the platform directory + mkdir -p $(d)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/ + set -x; echo XXXXXX; \ + for i in Lib/plat-linux2/*; do \ + n=$$(basename $$i); \ + if [ ! -f $(d)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/$$n ]; then \ + cp -p $$i $(d)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/; \ + fi; \ + done + rm -f $(d)/$(scriptdir)/lib-dynload/*.py + cp -p $(buildd_shared)/$(shell cat $(buildd_shared)/pybuilddir.txt)/_sysconfigdata.py \ + $(d)/$(scriptdir)/. + mv $(d)/$(scriptdir)/_sysconfigdata.py \ + $(d)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/_sysconfigdata_nd.py + sed -i 's/ -O3 / -O2 /g;s/$(LTO_CFLAGS)//g;s/-fprofile-use *-fprofile-correction//g' \ + $(d)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/_sysconfigdata_nd.py + cp -p debian/_sysconfigdata.py $(d)/$(scriptdir) + + -find $(d)/usr/lib/python$(VER) -name '*_failed*.so' + find $(d)/usr/lib/python$(VER) -name '*_failed*.so' | xargs -r rm -f + + test -f $(d)/usr/lib/python$(VER)/lib-dynload/_bsddb.so + + for i in $(d)/$(scriptdir)/lib-dynload/*.so; do \ + b=$$(basename $$i .so); \ + d=$${b}.$(DEB_HOST_MULTIARCH).so; \ + mv $$i $(d)/$(scriptdir)/lib-dynload/$$d; \ + done + + mv $(d)/usr/lib/libpython*.a $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/ + + mv $(d)/usr/lib/python$(VER)/site-packages \ + $(d)/usr/lib/python$(VER)/dist-packages + + : # remove files, which are not packaged + rm -f $(d)/usr/bin/smtpd.py + rm -rf $(d)/usr/lib/python$(VER)/ctypes/macholib + rm -f $(d)/$(scriptdir)/plat-*/regen + rm -f $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python.pc + rm -f $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python2.pc + rm -f $(d)/usr/bin/python2{,-config} + rm -f $(d)/usr/share/man/man1/python.1 + rm -f $(d)/usr/share/man/man1/python2{,-config}.1 + rm -f $(d)/$(scriptdir)/lib2to3/*.pickle + + if [ -d $(d)/$(scriptdir)/ensurepip/_bundled ]; then \ + echo "ensurepip/_bundled must not be included in the source package"; \ + exit 1; \ + fi + + : # cannot build it, zlib maintainer won't provide a mingw build + find $(d) -name 'wininst*.exe' | xargs -r rm -f + + : # fix some file permissions + chmod a-x $(d)/$(scriptdir)/{fractions,lib-tk/Tix}.py + + : # move manpages to new names + if [ -d $(d)/usr/man/man1 ]; then \ + mkdir -p $(d)/usr/share/man; \ + mv $(d)/usr/man/man1/* $(d)/usr/share/man/man1/; \ + rm -rf $(d)/usr/man/; \ + fi + cp -p debian/pydoc.1 $(d)/usr/share/man/man1/pydoc$(VER).1 + + : # Symlinks to /usr/bin for some tools + ln -sf ../lib/python$(VER)/pdb.py $(d)/usr/bin/pdb$(VER) + cp -p debian/pdb.1 $(d)/usr/share/man/man1/pdb$(VER).1 + + : # versioned install only + rm -f $(d)/usr/bin/python-config + + mv $(d)/usr/bin/2to3 $(d)/usr/bin/2to3-$(VER) + cp debian/2to3-$(VER).1 $(d)/usr/share/man/man1/2to3-$(VER).1 + +# : # remove the bsddb stuff +# rm -rf $(d)/$(scriptdir)/bsddb +# rm -f $(d)/$(scriptdir)/lib-dynload/_bsddb.so + + : # Remove version information from the egg-info file + mv $(d)/$(scriptdir)/lib-dynload/Python-$(VER)*.egg-info \ + $(d)/$(scriptdir)/lib-dynload/Python-$(VER).egg-info + + dh_installdirs -p$(p_lib) \ + usr/lib/$(DEB_HOST_MULTIARCH) \ + $(scriptdir)/config-$(DEB_HOST_MULTIARCH) \ + usr/share/doc + : # install the shared library + cp -p $(buildd_shared)/libpython$(VER).so.1.0 \ + $(d_lib)/usr/lib/$(DEB_HOST_MULTIARCH)/ + dh_link -p$(p_lib) \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).so.1.0 \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).so.1 \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).so.1 \ + /$(scriptdir)/config-$(DEB_HOST_MULTIARCH)/libpython$(VER).so + + ln -sf $(p_base) $(d_lib)/usr/share/doc/$(p_lib) + + ln -sf libpython$(VER).so.1 $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).so + +ifeq ($(with_interp),shared) + : # install the statically linked runtime + install -m755 $(buildd_static)/python $(d)/usr/bin/python$(VER)-static +endif + + mv $(d)/usr/bin/pydoc $(d)/usr/bin/pydoc$(VER) + cp -p Tools/i18n/pygettext.py $(d)/usr/bin/pygettext$(VER) + cp -p debian/pygettext.1 $(d)/usr/share/man/man1/pygettext$(VER).1 + + : # install the Makefile of the shared python build + sed -e '/^OPT/s,-O3,-O2,' \ + -e 's/$(LTO_CFLAGS)//g' \ + -e 's,^RUNSHARED *=.*,RUNSHARED=,' \ + -e '/BLDLIBRARY/s/-L\. //' \ + build-shared/Makefile > $(d)/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)/Makefile + + : # Move the binary and the minimal libraries into $(p_lmin). + dh_installdirs -p$(p_lmin) \ + etc/$(PVER) \ + usr/bin \ + usr/include/$(PVER) \ + usr/share/man/man1 \ + $(scriptdir)/lib-dynload + DH_COMPAT=2 dh_movefiles -p$(p_lmin) --sourcedir=$(d) \ + $(foreach i,$(MIN_MODS),$(scriptdir)/$(i).py) \ + $(foreach i,$(MIN_PACKAGES),$(scriptdir)/$(i)) \ + $(foreach i,$(MIN_ENCODINGS),$(scriptdir)/$(i)) \ + /$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/_sysconfigdata_nd.py \ + $(scriptdir)/site.py \ + $(shell cd $(d); for i in $(MIN_EXTS); do \ + test -e $(scriptdir)/lib-dynload/$$i.so \ + && echo $(scriptdir)/lib-dynload/$$i.so; \ + done; true) + + : # Move the binary and the minimal libraries into $(p_min). + dh_installdirs -p$(p_min) \ + usr/bin \ + usr/share/man/man1 + DH_COMPAT=2 dh_movefiles -p$(p_min) --sourcedir=$(d) \ + usr/bin/python$(VER) \ + usr/share/man/man1/python$(VER).1 + + : # Install sitecustomize.py. + cp -p debian/sitecustomize.py $(d_lmin)/etc/$(PVER)/ + dh_link -p$(p_lmin) /etc/$(PVER)/sitecustomize.py \ + /$(scriptdir)/sitecustomize.py + + : # Move the static library and the header files into $(p_ldev). +# mv $(d)/usr/share/include/python$(VER)/* $(d)/usr/include/python$(VER)/. +# rm -rf $(d)/usr/share/include + + cp $(d)/usr/bin/python$(VER)-config $(d)/usr/bin/$(DEB_HOST_MULTIARCH)-python$(VER)-config + dh_installdirs -p$(p_ldev) \ + usr/bin \ + $(scriptdir) \ + usr/include \ + usr/share/man/man1 + + DH_COMPAT=2 dh_movefiles -p$(p_ldev) --sourcedir=$(d) \ + usr/bin/$(DEB_HOST_MULTIARCH)-python$(VER)-config \ + usr/lib/python$(VER)/config-$(DEB_HOST_MULTIARCH) \ + usr/include \ + usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).{a,so} \ + usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER)*.pc + + sed 's/@subdir@/$(PVER)/;s/@header@/pyconfig.h/' \ + debian/multiarch.h.in > $(d_ldev)/usr/include/$(PVER)/pyconfig.h + + cp -p debian/python-config.1 \ + $(d_ldev)/usr/share/man/man1/$(DEB_HOST_MULTIARCH)-python$(VER)-config.1 + +ifneq ($(DEB_HOST_MULTIARCH),$(DEB_HOST_GNU_TYPE)) + ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config \ + $(d_ldev)/usr/bin/$(DEB_HOST_GNU_TYPE)-$(PVER)-config + ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config.1.gz \ + $(d_ldev)/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-$(PVER)-config.1.gz +endif + + sed -i '/^Cflags:/s,$$, -I$${includedir}/$(DEB_HOST_MULTIARCH)/python$(VER),' \ + $(d_ldev)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER).pc + + dh_link -p$(p_ldev) \ + /usr/lib/$(PVER)/config-$(DEB_HOST_MULTIARCH)/libpython$(VER).a \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).a + + cp -p $(buildd_shared)/libpython$(VER)-pic.a \ + $(d_ldev)/usr/lib/python$(VER)/config-$(DEB_HOST_MULTIARCH)/ + + : # Move the static library and the header files into $(p_dev). + dh_installdirs -p$(p_dev) \ + usr/share/doc/python$(VER)/$(DEB_HOST_MULTIARCH) \ + usr/share/man/man1 \ + $(scriptdir) \ + $(scriptdir)/doc/html + + cp -p Misc/HISTORY Misc/README.valgrind Misc/gdbinit \ + debian/README.maintainers \ + $(d_dev)/usr/share/doc/python$(VER)/ + cp -p debian/test_results $(buildd_static)/pybench.log \ + $(d_dev)/usr/share/doc/python$(VER)/$(DEB_HOST_MULTIARCH)/ + + DH_COMPAT=2 dh_movefiles -p$(p_dev) --sourcedir=$(d) \ + usr/bin/python$(VER)-config \ + usr/lib/python$(VER)/distutils/command/wininst-*.exe + + ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config $(d_dev)/usr/bin/$(PVER)-config + ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config.1.gz $(d_dev)/usr/share/man/man1/$(PVER)-config.1.gz + +ifeq ($(with_tk),yes) + : # Move the Tkinter files into $(p_tk). + dh_installdirs -p$(p_tk) \ + $(scriptdir) \ + usr/lib/python$(VER)/lib-dynload + DH_COMPAT=2 dh_movefiles -p$(p_tk) --sourcedir=$(d) \ + usr/lib/python$(VER)/lib-dynload/_tkinter.so +endif + +ifeq ($(with_gdbm),yes) + : # gdbm and dbm modules into $(p_gdbm). + dh_installdirs -p$(p_gdbm) \ + usr/lib/python$(VER)/lib-dynload + DH_COMPAT=2 dh_movefiles -p$(p_gdbm) --sourcedir=$(d) \ + usr/lib/python$(VER)/lib-dynload/gdbm.so +endif + + : # The test framework into $(p_lbase) + DH_COMPAT=2 dh_movefiles -p$(p_lbase) --sourcedir=$(d) \ + $(scriptdir)/test/{regrtest.py,test_support.py,__init__.py,pystone.py} + + : # The complete testsuite into $(p_lbase) + DH_COMPAT=2 dh_movefiles -p$(p_ltst) --sourcedir=$(d) \ + $(scriptdir)/test \ + $(scriptdir)/ctypes/test \ + $(scriptdir)/bsddb/test \ + $(scriptdir)/email/test \ + $(scriptdir)/json/tests \ + $(scriptdir)/sqlite3/test \ + $(scriptdir)/distutils/tests \ + $(scriptdir)/lib2to3/tests \ + $(scriptdir)/unittest/test \ + $(scriptdir)/lib-tk/test + + : # test_ctypes fails with test_macholib.py installed + rm -f $(d_ltst)/$(scriptdir)/ctypes/test/test_macholib.py + : # test_bdist_wininst fails, '*.exe' files are not installed + rm -f $(d_ltst)/$(scriptdir)/distutils/tests/test_bdist_wininst.py + + : # IDLE + mv $(d)/usr/bin/idle $(d)/usr/bin/idle-python$(VER) + rm -f $(d)/usr/lib/python$(VER)/idlelib/idle.bat + dh_installdirs -p$(p_idle) \ + usr/bin \ + usr/share/man/man1 + DH_COMPAT=2 dh_movefiles -p$(p_idle) --sourcedir=$(d) \ + usr/lib/python$(VER)/idlelib \ + usr/bin/idle-python$(VER) + cp -p debian/idle-$(PVER).1 $(d_idle)/usr/share/man/man1/ + + : # Move the demos and tools into $(p_exam)'s doc directory + dh_installdirs -p$(p_exam) \ + usr/share/doc/python$(VER)/examples + + cp -rp Demo Tools $(d_exam)/usr/share/doc/python$(VER)/examples/ + rm -rf $(d_exam)/usr/share/doc/python$(VER)/examples/Demo/sgi + : # IDLE is in its own package: + rm -rf $(d_exam)/usr/share/doc/python$(VER)/examples/Tools/idle + : # XXX: We don't need rgb.txt, we'll use our own: + rm -rf $(d_exam)/usr/share/doc/python$(VER)/examples/Tools/pynche/X + + : # XXX: Some files in upstream Demo and Tools have strange + : # exec permissions, make lintian glad: + -chmod 644 $(d_tk)/$(scriptdir)/lib-tk/Tix.py + -chmod 644 $(d)/$(scriptdir)/runpy.py + + cd $(d_exam)/usr/share/doc/python$(VER)/examples && chmod 644 \ + Demo/{classes/*.py*,comparisons/patterns} \ + Demo/{rpc/test,threads/*.py*,md5test/*} \ + Demo/pdist/{client.py,cmdfw.py,cmptree.py,cvslib.py,cvslock.py,FSProxy.py,mac.py,rcsclient.py,rcslib.py,security.py,server.py,sumtree.py} \ + Demo/scripts/{morse.py,newslist.doc} \ + Demo/sockets/{broadcast.py,ftp.py,mcast.py,radio.py} \ + Demo/tix/{bitmaps/{tix.gif,*x[pb]m*},samples/*.py} \ + Demo/tkinter/guido/{AttrDialog.py,hanoi.py,hello.py,imagedraw.py,imageview.py,listtree.py,ManPage.py,ShellWindow.py,wish.py} \ + Tools/scripts/pydocgui.pyw \ + Tools/scripts/mailerdaemon.py + + : # Replace all '#!' calls to python with $(PY_INTERPRETER) + : # and make them executable + for i in `find debian -mindepth 3 -type f ! -name '*.dpatch'`; do \ + sed '1s,#!.*python[^ ]*\(.*\),#! $(PY_INTERPRETER)\1,' \ + $$i > $$i.temp; \ + if cmp --quiet $$i $$i.temp; then \ + rm -f $$i.temp; \ + else \ + mv -f $$i.temp $$i; \ + chmod 755 $$i; \ + echo "fixed interpreter: $$i"; \ + fi; \ + done + + : # Move the docs into $(p_base)'s /usr/share/doc/$(PVER) directory, + : # all other packages only have a copyright file. + dh_installdocs -p$(p_base) \ + README Misc/NEWS Misc/ACKS + ln -sf NEWS.gz $(d_base)/usr/share/doc/$(p_base)/changelog.gz + dh_installdocs --all -N$(p_base) -N$(p_dev) -N$(p_dbg) -N$(p_lib) debian/README.Debian + + : # IDLE has its own changelogs, docs... + dh_installchangelogs -p$(p_idle) Lib/idlelib/ChangeLog + dh_installdocs -p$(p_idle) Lib/idlelib/{NEWS,README,TODO,extend}.txt + + mkdir -p $(d_idle)/usr/share/applications + cp -p debian/idle.desktop \ + $(d_idle)/usr/share/applications/idle-$(PVER).desktop + + : # those packages have own README.Debian's + install -m 644 -p debian/README.$(p_base) \ + $(d_base)/usr/share/doc/$(PVER)/README.Debian + install -m 644 -p debian/README.$(p_idle) \ + $(d_idle)/usr/share/doc/$(p_idle)/README.Debian +ifeq ($(with_tk),yes) + cp -p debian/README.Tk $(d_tk)/usr/share/doc/$(p_tk)/ +endif + + : # library files into $(p_lbase) + dh_installdirs -p$(p_lbase) \ + usr/lib + dh_movefiles -p$(p_lbase) \ + usr/lib/python$(VER) + + : # The rest goes into $(p_base) + mkdir -p $(d)/usr/lib/python$(VER)/dist-packages + (cd $(d) && tar cf - .) | (cd $(d_base) && tar xpf -) + sh debian/dh_rmemptydirs -p$(p_base) + rm -f $(d_base)/usr/bin/python + + : # install egg-info for arparse + install -m 644 debian/argparse.egg-info $(d_lbase)/$(scriptdir)/ + + : # Install menu icon + dh_installdirs -p$(p_base) usr/share/pixmaps + cp -p debian/pylogo.xpm $(d_base)/usr/share/pixmaps/$(PVER).xpm + + : # generate binfmt file + mkdir -p $(d_min)/usr/share/binfmts +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + $(buildd_static)/python debian/mkbinfmt.py $(PVER) \ + > $(d_min)/usr/share/binfmts/$(PVER) +else + $(PVER) debian/mkbinfmt.py $(PVER) > $(d_min)/usr/share/binfmts/$(PVER) +endif + + : # desktop entry + mkdir -p $(d_base)/usr/share/applications + cp -p debian/$(PVER).desktop \ + $(d_base)/usr/share/applications/$(PVER).desktop + + : # remove some things + -find debian -name .cvsignore | xargs rm -f + -find debian -name '*.py[co]' | xargs rm -f + + : # remove empty directories, when all components are in place + -find debian ! -name lib-dynload -type d -empty -delete + + : # install debug package + rm -rf $(d)-dbg $(d)-shdbg + : # need some files from the shared build + $(MAKE) -C $(buildd_shdebug) install DESTDIR=$(CURDIR)/$(d)-shdbg + $(MAKE) -C $(buildd_debug) install DESTDIR=$(CURDIR)/$(d)-dbg + mv $(d)-dbg/usr/lib/libpython*.a $(d)-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/ + mv $(d)-shdbg/$(scriptdir)/_sysconfigdata.py \ + $(d)-shdbg/$(scriptdir)/_sysconfigdata_d.py + + for i in $(d)-dbg/$(scriptdir)/lib-dynload/*_d.so; do \ + b=$$(basename $$i _d.so); \ + d=$${b}.$(DEB_HOST_MULTIARCH)_d.so; \ + mv $$i $(d)-dbg/$(scriptdir)/lib-dynload/$$d; \ + done + for i in $(d)-shdbg/$(scriptdir)/lib-dynload/*_d.so; do \ + b=$$(basename $$i _d.so); \ + d=$${b}.$(DEB_HOST_MULTIARCH)_d.so; \ + mv $$i $(d)-shdbg/$(scriptdir)/lib-dynload/$$d; \ + done + + dh_installdirs -p$(p_ldbg) \ + usr/bin \ + usr/share/man/man1 \ + $(scriptdir)/lib-dynload \ + $(scriptdir)/plat-$(DEB_HOST_MULTIARCH) \ + usr/include/$(PVER)_d \ + usr/include/$(DEB_HOST_MULTIARCH)/$(PVER)_d \ + usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \ + + cp -p $(d)-shdbg/$(scriptdir)/lib-dynload/*.so \ + $(d_ldbg)/$(scriptdir)/lib-dynload/ + cp -p $(buildd_shdebug)/libpython$(VER)_d.so.1.0 \ + $(d_ldbg)/usr/lib/$(DEB_HOST_MULTIARCH)/ + dh_link -p$(p_ldbg) \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)_d.so.1.0 \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)_d.so.1 \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)_d.so.1 \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)_d.so + sed -e '/^Libs:/s,-lpython$(VER),-lpython$(VER)_d,' \ + -e '/^Cflags:/s,python$(VER),python$(VER)_d,' \ + -e '/^Cflags:/s,$$, -I$${includedir}/$(DEB_HOST_MULTIARCH)/python$(VER)_d,' \ + $(d)-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER).pc \ + > $(d_ldbg)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER)-dbg.pc + + : # in $(p_ldbg), prefix python-config with triplets + cp $(d)-shdbg/usr/bin/python-config.sh \ + $(d_ldbg)/usr/bin/$(DEB_HOST_MULTIARCH)-$(PVER)-dbg-config + ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config.1.gz \ + $(d_ldbg)/usr/share/man/man1/$(DEB_HOST_MULTIARCH)-$(PVER)-dbg-config.1.gz +ifneq ($(DEB_HOST_MULTIARCH),$(DEB_HOST_GNU_TYPE)) + ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-dbg-config \ + $(d_ldbg)/usr/bin/$(DEB_HOST_GNU_TYPE)-$(PVER)-dbg-config + ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config.1.gz \ + $(d_ldbg)/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-$(PVER)-dbg-config.1.gz +endif + + dh_installdirs -p$(p_dbg) \ + usr/bin \ + $(scriptdir)/lib-dynload \ + usr/share/man/man1 \ + usr/share/doc/$(p_base) + + cp -p Misc/SpecialBuilds.txt $(d_dbg)/usr/share/doc/$(p_base)/ + cp -p debian/$(PVER)-dbg.README.Debian \ + $(d_dbg)/usr/share/doc/$(p_base)/README.debug + cp -p $(buildd_debug)/python $(d_dbg)/usr/bin/$(PVER)-dbg + cp -p $(d)-shdbg/usr/bin/python-config.sh \ + $(d_dbg)/usr/bin/$(PVER)-dbg-config +# cp -p $(buildd_debug)/build/lib*/*_d.so \ + $(d_dbg)/$(scriptdir)/lib-dynload/ + cp -p $(d)-shdbg/$(scriptdir)/_sysconfigdata_d.py \ + $(d_ldbg)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/ +ifneq ($(with_gdbm),yes) + rm -f $(d_ldbg)/$(scriptdir)/lib-dynload/gdbm.$(DEB_HOST_MULTIARCH)_d.so + rm -f $(d_dbg)/usr/lib/debug/$(scriptdir)/lib-dynload/gdbm.$(DEB_HOST_MULTIARCH).so +endif +ifneq ($(with_tk),yes) + rm -f $(d_ldbg)/$(scriptdir)/lib-dynload/_tkinter.$(DEB_HOST_MULTIARCH)_d.so + rm -f $(d_dbg)/usr/lib/debug/$(scriptdir)/lib-dynload/_tkinter.$(DEB_HOST_MULTIARCH).so +endif +# rm -f $(d_dbg)/$(scriptdir)/lib-dynload/_bsddb_d.so + + cp -a $(d)-dbg/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)_d \ + $(d_ldbg)/$(scriptdir)/ + ln -sf ../../$(DEB_HOST_MULTIARCH)/libpython$(VER)_d.so \ + $(d_ldbg)/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)_d/libpython$(VER)_d.so + ln -sf libpython$(VER)_d.so \ + $(d_ldbg)/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)_d/libpython$(VER).so + ln -sf libpython$(VER)_d.a \ + $(d_ldbg)/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)_d/libpython$(VER).a + + for i in $(d_ldev)/usr/include/$(PVER)/*; do \ + i=$$(basename $$i); \ + case $$i in pyconfig.h) continue; esac; \ + ln -sf ../$(PVER)/$$i $(d_ldbg)/usr/include/$(PVER)_d/$$i; \ + done + cp -p $(buildd_debug)/pyconfig.h $(d_ldbg)/usr/include/$(DEB_HOST_MULTIARCH)/$(PVER)_d/ + sed 's/@subdir@/$(PVER)_d/;s/@header@/pyconfig.h/' \ + debian/multiarch.h.in > $(d_ldbg)/usr/include/$(PVER)_d/pyconfig.h + ln -sf $(PVER).1.gz $(d_dbg)/usr/share/man/man1/$(PVER)-dbg.1.gz + ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-dbg-config \ + $(d_dbg)/usr/bin/$(PVER)-dbg-config + ln -sf $(PVER)-config.1.gz $(d_dbg)/usr/share/man/man1/$(PVER)-dbg-config.1.gz + + for i in debian/*.overrides; do \ + b=$$(basename $$i .overrides); \ + install -D -m 644 $$i debian/$$b/usr/share/lintian/overrides/$$b; \ + done + + touch stamps/stamp-install + +# Build architecture-independent files here. +binary-indep: build-indep install stamps/stamp-control + dh_testdir -i + dh_testroot -i + + : # $(p_doc) package + dh_installdirs -p$(p_doc) \ + usr/share/doc/$(p_base) \ + usr/share/doc/$(p_doc) + dh_installdocs -p$(p_doc) + cp -a Doc/build/html $(d_doc)/usr/share/doc/$(p_base)/ + rm -f $(d_doc)/usr/share/doc/$(p_base)/html/_static/jquery.js + rm -f $(d_doc)/usr/share/doc/$(p_base)/html/_static/underscore.js + dh_link -p$(p_doc) \ + /usr/share/doc/$(p_base)/html \ + /usr/share/doc/$(p_doc)/html \ + /usr/share/javascript/jquery/jquery.js \ + /usr/share/doc/$(p_base)/html/_static/jquery.js \ + /usr/share/javascript/underscore/underscore.js \ + /usr/share/doc/$(p_base)/html/_static/underscore.js + + : # devhelp docs + $(buildd_static)/python debian/pyhtml2devhelp.py \ + $(d_doc)/usr/share/doc/$(p_base)/html index.html $(VER) \ + > $(d_doc)/usr/share/doc/$(p_base)/html/$(PVER).devhelp + gzip -9v $(d_doc)/usr/share/doc/$(p_base)/html/$(PVER).devhelp + dh_link -p$(p_doc) \ + /usr/share/doc/$(p_base)/html /usr/share/devhelp/books/$(PVER) + + for i in $(p_ltst); do \ + rm -rf debian/$$i/usr/share/doc/$$i; \ + ln -s $(p_lbase) debian/$$i/usr/share/doc/$$i; \ + done + + dh_installdebconf -i $(dh_args) + dh_installexamples -i $(dh_args) + dh_installmenu -i $(dh_args) + -dh_icons -i $(dh_args) || dh_iconcache -i $(dh_args) + dh_installchangelogs -i $(dh_args) + dh_link -i $(dh_args) + dh_compress -i $(dh_args) -X.py -X.cls -X.css -X.txt -X.json -X.js -Xobjects.inv -Xgdbinit + dh_fixperms -i $(dh_args) + + : # make python scripts starting with '#!' executable + for i in `find debian -mindepth 3 -type f ! -name '*.dpatch' ! -perm 755`; do \ + if head -1 $$i | grep -q '^#!'; then \ + chmod 755 $$i; \ + echo "make executable: $$i"; \ + fi; \ + done + -find $(d_doc) -name '*.txt' -perm 755 -exec chmod 644 {} \; + + dh_installdeb -i $(dh_args) + dh_gencontrol -i $(dh_args) + dh_md5sums -i $(dh_args) + dh_builddeb -i $(dh_args) + +# Build architecture-dependent files here. +binary-arch: build-arch install + dh_testdir -a + dh_testroot -a +# dh_installdebconf -a + dh_installexamples -a + dh_installmenu -a + -dh_icons -a || dh_iconcache -a +# dh_installmime -a + dh_installchangelogs -a + for i in $(p_dev) $(p_dbg); do \ + rm -rf debian/$$i/usr/share/doc/$$i; \ + ln -s $(p_base) debian/$$i/usr/share/doc/$$i; \ + done + for i in $(p_lbase); do \ + rm -rf debian/$$i/usr/share/doc/$$i; \ + ln -s $(p_lmin) debian/$$i/usr/share/doc/$$i; \ + done + for i in $(p_ldev) $(p_ldbg) $(p_lib); do \ + rm -rf debian/$$i/usr/share/doc/$$i; \ + ln -s $(p_lbase) debian/$$i/usr/share/doc/$$i; \ + done + -find debian ! -perm -200 -print -exec chmod +w {} \; +ifneq ($(with_tk),yes) + rm -f $(d_lbase)/$(scriptdir)/lib-dynload/_tkinter.$(DEB_HOST_MULTIARCH).so +endif +ifneq ($(with_gdbm),yes) + rm -f $(d_lbase)/$(scriptdir)/lib-dynload/gdbm.$(DEB_HOST_MULTIARCH).so +endif + dh_strip -a -N$(p_dbg) -Xdebug -Xdbg --dbg-package=$(p_dbg) + cp Tools/gdb/libpython.py $(d_dbg)/usr/lib/debug/usr/bin/$(PVER)-gdb.py + ln -sf $(PVER)-gdb.py $(d_dbg)/usr/lib/debug/usr/bin/$(PVER)-dbg-gdb.py + ln -sf ../bin/$(PVER)-gdb.py \ + $(d_dbg)/usr/lib/debug/usr/lib/lib$(PVER).so.1.0-gdb.py + ln -sf ../bin/$(PVER)-gdb.py \ + $(d_dbg)/usr/lib/lib$(PVER)_d.so.1.0-gdb.py + dh_link -a + dh_compress -a -X.py + dh_fixperms -a + + : # make python scripts starting with '#!' executable + for i in `find debian -mindepth 3 -type f ! -name '*.dpatch' ! -perm 755`; do \ + if head -1 $$i | grep -q '^#!'; then \ + chmod 755 $$i; \ + echo "make executable: $$i"; \ + fi; \ + done + + dh_makeshlibs -p$(p_lib) -V '$(p_lib)' + dh_makeshlibs -p$(p_ldbg) -V '$(p_ldbg)' +# don't include the following symbols, found in extensions +# which either can be built as builtin or extension. + sed -ri '/^ (_check_|asdl_|fast_save_|init)/d' \ + $(d_lib)/DEBIAN/symbols $(d_ldbg)/DEBIAN/symbols + dh_shlibdeps -a + dep=`sed -n '/^shlibs:Depends/s/.*\(libc6[^,]*\).*/\1/p' $(d_min).substvars`; \ + echo "shlibs:Pre-Depends=$$dep" >> $(d_min).substvars + sed -i '/^shlibs:Depends/s/libc6[^,]*[, ]*//' $(d_min).substvars + dh_installdeb -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +# rules to patch the unpacked files in the source directory +# --------------------------------------------------------------------------- +# various rules to unpack addons and (un)apply patches. +# - patch / apply-patches +# - unpatch / reverse-patches + +patchdir = debian/patches + +glibc_version := $(shell dpkg -s locales | awk '/^Version:/ {print $$2}') +broken_utimes := $(shell dpkg --compare-versions $(glibc_version) lt 2.3.5 && echo yes || echo no) + +$(patchdir)/series: $(patchdir)/series.in + cpp -E \ + -D$(distribution) \ + $(if $(filter $(broken_utimes),yes),-DBROKEN_UTIMES) \ + $(if $(filter $(with_fpectl),yes),-DWITH_FPECTL) \ + -Darch_os_$(DEB_HOST_ARCH_OS) -Darch_$(DEB_HOST_ARCH) \ + -o - $(patchdir)/series.in \ + | egrep -v '^(#.*|$$)' > $(patchdir)/series + +patch: stamps/stamp-patch +stamps/stamp-patch: $(patchdir)/series + dh_testdir + uname -a + @echo USER=$$USER, LOGNAME=$$LOGNAME + QUILT_PATCHES=$(patchdir) quilt push -a || test $$? = 2 + rm -rf autom4te.cache configure + autoconf + mkdir -p stamps + echo ""; echo "Patches applied in this version:" > stamps/pxx + for i in $$(cat $(patchdir)/series); do \ + echo ""; echo "$$i:"; \ + sed -n 's/^# *DP: */ /p' $(patchdir)/$$i; \ + done >> stamps/pxx + mv stamps/pxx $@ + + dh_autotools-dev_updateconfig + + : # don't build pgen for cross builds, adjust timestamps + touch Parser/acceler.c Parser/grammar1.c Parser/listnode.c \ + Parser/node.c Parser/parser.c Parser/parsetok.c Parser/bitset.c \ + Parser/metagrammar.c Parser/firstsets.c Parser/grammar.c \ + Parser/pgen.c + touch Objects/obmalloc.c Python/mysnprintf.c Python/pyctype.c \ + Parser/tokenizer_pgen.c Parser/printgrammar.c Parser/pgenmain.c + @sleep 0.1 + touch Grammar/Grammar + @sleep 0.1 + touch Include/graminit.h + @sleep 0.1 + touch Python/graminit.c + ln -sf site-packages Lib/dist-packages + +reverse-patches: unpatch +unpatch: + QUILT_PATCHES=$(patchdir) quilt pop -a -R || test $$? = 2 + rm -f stamps/stamp-patch $(patchdir)/series + rm -rf configure autom4te.cache + rm -f Lib/dist-packages + +update-patches: $(patchdir)/series + export QUILT_PATCHES=$(patchdir); \ + export QUILT_REFRESH_ARGS="--no-timestamps --no-index -pab"; \ + export QUILT_DIFF_ARGS="--no-timestamps --no-index -pab"; \ + while quilt push; do quilt refresh; done + +binary: binary-indep binary-arch + +.PHONY: control-file configure build clean binary-indep binary-arch binary install + +# Local Variables: +# mode: makefile +# end: --- python2.7-2.7.8.orig/debian/script.py +++ python2.7-2.7.8/debian/script.py @@ -0,0 +1,61 @@ +#! /usr/bin/python + +# Copyright (C) 2012 Colin Watson . +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject +# to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +"""Trivial script(1) workalike, but without reading from standard input.""" + +import os +import pty +import select +import sys + +filename = sys.argv[1] +command = sys.argv[2] + +pid, master = pty.fork() +if pid == 0: # child + os.execlp("sh", "sh", "-c", command) + +# parent +with open(filename, "w") as logfile: + try: + while True: + rfds, _, _ = select.select([master], [], []) + if master in rfds: + data = os.read(master, 65536) + os.write(1, data) + logfile.write(data) + logfile.flush() + except (IOError, OSError): + pass + +pid, status = os.wait() +returncode = 0 +if os.WIFSIGNALED(status): + returncode = -os.WTERMSIG(status) +elif os.WIFEXITED(status): + returncode = os.WEXITSTATUS(status) +else: + # Should never happen + raise RuntimeError("Unknown child exit status!") +os.close(master) +sys.exit(returncode) --- python2.7-2.7.8.orig/debian/sitecustomize.py.in +++ python2.7-2.7.8/debian/sitecustomize.py.in @@ -0,0 +1,7 @@ +# install the apport exception handler if available +try: + import apport_python_hook +except ImportError: + pass +else: + apport_python_hook.install() --- python2.7-2.7.8.orig/debian/source.lintian-overrides +++ python2.7-2.7.8/debian/source.lintian-overrides @@ -0,0 +1,11 @@ +# this is conditional in the rules file +python2.7 source: debhelper-script-needs-versioned-build-depends dh_icons (>= 5.0.51~) + +# generated during the build +python2.7 source: quilt-build-dep-but-no-series-file + +# doesn't support any newer versions +python2.7 source: build-depends-on-versioned-berkeley-db + +# using the system libffi +python2.7 source: outdated-autotools-helper-file --- python2.7-2.7.8.orig/debian/source.lintian-overrides.in +++ python2.7-2.7.8/debian/source.lintian-overrides.in @@ -0,0 +1,11 @@ +# this is conditional in the rules file +@PVER@ source: debhelper-script-needs-versioned-build-depends dh_icons (>= 5.0.51~) + +# generated during the build +@PVER@ source: quilt-build-dep-but-no-series-file + +# doesn't support any newer versions +@PVER@ source: build-depends-on-versioned-berkeley-db + +# using the system libffi +@PVER@ source: outdated-autotools-helper-file --- python2.7-2.7.8.orig/debian/source/format +++ python2.7-2.7.8/debian/source/format @@ -0,0 +1 @@ +1.0 --- python2.7-2.7.8.orig/debian/tests/control +++ python2.7-2.7.8/debian/tests/control @@ -0,0 +1,19 @@ +Tests: testsuite +Depends: build-essential, python2.7-dev, libpython2.7-testsuite, python-gdbm +# test_zipfile wants to write +Restrictions: needs-root + +Tests: testsuite-dbg +Depends: build-essential, python2.7-dev, python2.7-dbg, libpython2.7-testsuite, python-gdbm-dbg +# test_zipfile wants to write +Restrictions: needs-root + +Tests: failing-tests +Depends: build-essential, python2.7-dev, libpython2.7-testsuite, python-gdbm +# test_zipfile wants to write +Restrictions: needs-root allow-stderr + +Tests: failing-tests-dbg +Depends: build-essential, python2.7-dev, python2.7-dbg, libpython2.7-testsuite, python-gdbm-dbg +# test_zipfile wants to write +Restrictions: needs-root allow-stderr --- python2.7-2.7.8.orig/debian/tests/failing-tests +++ python2.7-2.7.8/debian/tests/failing-tests @@ -0,0 +1,110 @@ +#!/bin/sh + +set -e + +if [ "$(whoami)" = root ]; then + if [ -n "$SUDO_USER" ] && getent passwd "$SUDO_USER" > /dev/null; then + su_user="$SUDO_USER" + else + su_user=nobody + fi + + if [ -e /etc/default/apport ]; then + # stop apport + stop apport 2>/dev/null || true + sed -i '/^enabled=/s/=.*/=0/' /etc/default/apport 2>/dev/null + + if status apport | grep -q start; then + echo >&2 "apport is running. needs to be disabled before running the tests" + exit 1 + fi + fi +fi + +tmphome=$ADTTMP/home +mkdir -p $tmphome +if [ -n "$su_user" ]; then + chmod go+rx $ADTTMP + chown $su_user:nogroup $tmphome +fi +ls -la $ADTTMP + +# no root access needed after this point + +debian_dir=$(dirname $(dirname $0)) + +export LOCPATH=$(pwd)/locales +sh $debian_dir/locale-gen + +export LANG=C + +arch=$(dpkg --print-architecture) + +TESTPYTHON="python2.7 -E -Wd -3 -tt /usr/lib/python2.7/test/regrtest.py" +TESTOPTS="-w -uall,-network,-urlfetch,-gui,-xpickle" +TESTEXCLUSIONS= + +# test_curses: error: copywin() returned ERR +TESTEXCLUSIONS="$TESTEXCLUSIONS test_curses" + +# test_distutils: failing tests test_parse_makefile_base, test_parse_makefile_literal_dollar +TESTEXCLUSIONS="$TESTEXCLUSIONS test_distutils" + +# test_gdb: not run for the optimized build +TESTEXCLUSIONS="$TESTEXCLUSIONS test_gdb" + +# test_zipfile: Issue 17753, requires write access to test and email.test +TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile" + +if [ "$su_user" = nobody ]; then + log=/dev/null +else + log=testsuite.log +fi + +# run some tests separately in it's own run. These succeed locally, +# but fail on the test setup. +SEPARATE_TESTS= +case "$arch" in + amd64) + ;; + i386) + SEPARATE_TESTS="$SEPARATE_TESTS test_io" + ;; +esac + +script=$debian_dir/script.py + +echo "Running the failing tests with the standard interpreter:" +progressions= +for tst in $TESTEXCLUSIONS; do + if [ -f "$script" ]; then + cmd="HOME=$tmphome python2.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $tst\"" + else + cmd="HOME=$tmphome $TESTPYTHON $TESTOPTS $tst" + fi + + echo "Running $tst ..." + if [ "$(whoami)" = root ]; then + echo "su -s /bin/sh -c $cmd $su_user" + if su -s /bin/sh -c "$cmd" $su_user; then + progressions="$progressions $tst" + else + : + fi + else + echo "$cmd" + if eval $cmd; then + progressions="$progressions $tst" + else + : + fi + fi +done + +if [ -n "$progressions" ]; then + echo "Tests run: $TESTEXCLUSIONS" + echo "Progressions:$progressions" +fi + +exit 0 --- python2.7-2.7.8.orig/debian/tests/failing-tests-dbg +++ python2.7-2.7.8/debian/tests/failing-tests-dbg @@ -0,0 +1,100 @@ +#!/bin/sh + +set -e + +if [ "$(whoami)" = root ]; then + if [ -n "$SUDO_USER" ] && getent passwd "$SUDO_USER" > /dev/null; then + su_user="$SUDO_USER" + else + su_user=nobody + fi + + if [ -e /etc/default/apport ]; then + # stop apport + stop apport 2>/dev/null || true + sed -i '/^enabled=/s/=.*/=0/' /etc/default/apport 2>/dev/null + + if status apport | grep -q start; then + echo >&2 "apport is running. needs to be disabled before running the tests" + exit 1 + fi + fi +fi + +tmphome=$ADTTMP/home +mkdir -p $tmphome +if [ -n "$su_user" ]; then + chmod go+rx $ADTTMP + chown $su_user:nogroup $tmphome +fi +ls -la $ADTTMP + +# no root access needed after this point + +debian_dir=$(dirname $(dirname $0)) + +export LOCPATH=$(pwd)/locales +sh $debian_dir/locale-gen + +export LANG=C + +tmphome=$ADTTMP/home +mkdir -p $tmphome +if [ -n "$su_user" ]; then + chown $su_user $tmphome +fi + +TESTPYTHON="python2.7-dbg -E -Wd -3 -tt /usr/lib/python2.7/test/regrtest.py" +TESTOPTS="-w -uall,-network,-urlfetch,-gui,-xpickle" +TESTEXCLUSIONS= + +# test_curses: error: copywin() returned ERR +TESTEXCLUSIONS="$TESTEXCLUSIONS test_curses" + +# test_distutils: failing tests test_parse_makefile_base, test_parse_makefile_literal_dollar +TESTEXCLUSIONS="$TESTEXCLUSIONS test_distutils" + +# test_zipfile: Issue 17753, requires write access to test and email.test +TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile" + +if [ "$su_user" = nobody ]; then + log=/dev/null +else + log=testsuite-dbg.log +fi + +script=$debian_dir/script.py + +echo "Running the failing tests with the standard interpreter:" +progressions= +for tst in $TESTEXCLUSIONS; do + if [ -f "$script" ]; then + cmd="HOME=$tmphome python2.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $tst\"" + else + cmd="HOME=$tmphome $TESTPYTHON $TESTOPTS $tst" + fi + + echo "Running $tst ..." + if [ "$(whoami)" = root ]; then + echo "su -s /bin/sh -c $cmd $su_user" + if su -s /bin/sh -c "$cmd" $su_user; then + progressions="$progressions $tst" + else + : + fi + else + echo "$cmd" + if eval $cmd; then + progressions="$progressions $tst" + else + : + fi + fi +done + +if [ -n "$progressions" ]; then + echo "Tests run: $TESTEXCLUSIONS" + echo "Progressions:$progressions" +fi + +exit 0 --- python2.7-2.7.8.orig/debian/tests/testsuite +++ python2.7-2.7.8/debian/tests/testsuite @@ -0,0 +1,107 @@ +#!/bin/sh + +set -e + +if [ "$(whoami)" = root ]; then + if [ -n "$SUDO_USER" ] && getent passwd "$SUDO_USER" > /dev/null; then + su_user="$SUDO_USER" + else + su_user=nobody + fi + + if [ -e /etc/default/apport ]; then + # stop apport + stop apport 2>/dev/null || true + sed -i '/^enabled=/s/=.*/=0/' /etc/default/apport 2>/dev/null + + if status apport | grep -q start; then + echo >&2 "apport is running. needs to be disabled before running the tests" + exit 1 + fi + fi +fi + +tmphome=$ADTTMP/home +mkdir -p $tmphome +if [ -n "$su_user" ]; then + chmod go+rx $ADTTMP + chown $su_user:nogroup $tmphome +fi +ls -la $ADTTMP + +# no root access needed after this point + +debian_dir=$(dirname $(dirname $0)) + +export LOCPATH=$(pwd)/locales +sh $debian_dir/locale-gen + +export LANG=C + +arch=$(dpkg --print-architecture) + +TESTPYTHON="python2.7 -E -Wd -3 -tt /usr/lib/python2.7/test/regrtest.py" +TESTOPTS="-w -uall,-network,-urlfetch,-gui,-xpickle" +TESTEXCLUSIONS="-x" + +# test_curses: error: copywin() returned ERR +TESTEXCLUSIONS="$TESTEXCLUSIONS test_curses" + +# test_distutils: failing tests test_parse_makefile_base, test_parse_makefile_literal_dollar +TESTEXCLUSIONS="$TESTEXCLUSIONS test_distutils" + +# test_ensurepip: module disabled in Debian +TESTEXCLUSIONS="$TESTEXCLUSIONS test_ensurepip" + +# test_gdb: not run for the optimized build +TESTEXCLUSIONS="$TESTEXCLUSIONS test_gdb" + +# test_zipfile: Issue 17753, requires write access to test and email.test +TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile" + +if [ "$su_user" = nobody ]; then + log=/dev/null +else + log=testsuite.log +fi + +# run some tests separately in it's own run. These succeed locally, +# but fail on the test setup. +SEPARATE_TESTS= +case "$arch" in + amd64) + ;; + i386) + SEPARATE_TESTS="$SEPARATE_TESTS test_io" + ;; +esac + +# several tests fail with configured proxy; we don't need internet access, so +# unset proxy variables +EXTRAENV="env -u https_proxy -u http_proxy -u no_proxy HOME=$tmphome" + +script=$debian_dir/script.py +if [ -f "$script" ]; then + cmd1="$EXTRAENV python2.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $TESTEXCLUSIONS $SEPARATE_TESTS\"" + cmd2="$EXTRAENV python2.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $SEPARATE_TESTS\"" +else + cmd1="$EXTRAENV $TESTPYTHON $TESTOPTS $TESTEXCLUSIONS $SEPARATE_TESTS" + cmd2="$EXTRAENV $TESTPYTHON $TESTOPTS $SEPARATE_TESTS" +fi + +echo "Running the python testsuite with the standard interpreter:" +if [ "$(whoami)" = root ]; then + echo "su -s /bin/sh -c $cmd1 $su_user" + su -s /bin/sh -c "$cmd1" $su_user + if [ -n "$SEPARATE_TESTS" ]; then + echo "su -s /bin/sh -c $cmd2 $su_user" + su -s /bin/sh -c "$cmd2" $su_user + fi +else + echo "$cmd1" + eval $cmd1 + if [ -n "$SEPARATE_TESTS" ]; then + echo "$cmd2" + eval $cmd2 + fi +fi --- python2.7-2.7.8.orig/debian/tests/testsuite-dbg +++ python2.7-2.7.8/debian/tests/testsuite-dbg @@ -0,0 +1,80 @@ +#!/bin/sh + +set -e + +if [ "$(whoami)" = root ]; then + if [ -n "$SUDO_USER" ] && getent passwd "$SUDO_USER" > /dev/null; then + su_user="$SUDO_USER" + else + su_user=nobody + fi + + if [ -e /etc/default/apport ]; then + # stop apport + stop apport 2>/dev/null || true + sed -i '/^enabled=/s/=.*/=0/' /etc/default/apport 2>/dev/null + + if status apport | grep -q start; then + echo >&2 "apport is running. needs to be disabled before running the tests" + exit 1 + fi + fi +fi + +tmphome=$ADTTMP/home +mkdir -p $tmphome +if [ -n "$su_user" ]; then + chmod go+rx $ADTTMP + chown $su_user:nogroup $tmphome +fi +ls -la $ADTTMP + +# no root access needed after this point + +debian_dir=$(dirname $(dirname $0)) + +export LOCPATH=$(pwd)/locales +sh $debian_dir/locale-gen + +export LANG=C + +TESTPYTHON="python2.7-dbg -E -Wd -3 -tt /usr/lib/python2.7/test/regrtest.py" +TESTOPTS="-w -uall,-network,-urlfetch,-gui,-xpickle" +TESTEXCLUSIONS="-x" + +# test_curses: error: copywin() returned ERR +TESTEXCLUSIONS="$TESTEXCLUSIONS test_curses" + +# test_distutils: failing tests test_parse_makefile_base, test_parse_makefile_literal_dollar +TESTEXCLUSIONS="$TESTEXCLUSIONS test_distutils" + +# test_ensurepip: module disabled in Debian +TESTEXCLUSIONS="$TESTEXCLUSIONS test_ensurepip" + +# test_zipfile: Issue 17753, requires write access to test and email.test +TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile" + +if [ "$su_user" = nobody ]; then + log=/dev/null +else + log=testsuite-dbg.log +fi + +# several tests fail with configured proxy; we don't need internet access, so +# unset proxy variables +EXTRAENV="env -u https_proxy -u http_proxy -u no_proxy HOME=$tmphome" + +script=$debian_dir/script.py +if [ -f "$script" ]; then + cmd="$EXTRAENV python2.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $TESTEXCLUSIONS\"" +else + cmd="$EXTRAENV $TESTPYTHON $TESTOPTS $TESTEXCLUSIONS" +fi +echo "Running the python testsuite with the debug enabled interpreter:" +if [ "$(whoami)" = root ]; then + echo "su -s /bin/sh -c $cmd $su_user" + su -s /bin/sh -c "$cmd" $su_user +else + echo "$cmd" + eval $cmd +fi --- python2.7-2.7.8.orig/debian/watch +++ python2.7-2.7.8/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=dversionmangle=s/.*\+//,uversionmangle=s/([abcr]+[1-9])$/~$1/ \ + http://www.python.org/ftp/python/2\.7(\.\d)?/Python-(2\.7[.\dabcr]*)\.tgz