v1.0.1

2025-11-09 03:53:48 -05:00 · 2016-09-09 05:26:30 +00:00
549 changed files with 2044 additions and 8649 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +0,0 @@
-.git/
-.python-version
-.vscode/
-.idea/
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,21 +0,0 @@
-Too many issues will kill our team's development velocity, drastically.
-Make sure you have checked all steps below.
-
-### Prerequisite
-* [ ] Make sure your problem is not listed in [the common build problems](https://github.com/pyenv/pyenv/wiki/Common-build-problems).
-* [ ] Make sure no duplicated issue has already been reported in [the pyenv issues](https://github.com/pyenv/pyenv/issues). You should look for closed issues, too.
-* [ ] Make sure you are not asking us to help solving your specific issue.
-  * GitHub issues is opened mainly for development purposes. If you want to ask someone to help solving your problem, go to some community site like [Gitter](https://gitter.im/yyuu/pyenv), [StackOverflow](https://stackoverflow.com/questions/tagged/pyenv), etc.
-* [ ] Make sure your problem is not derived from packaging (e.g. [Homebrew](https://brew.sh)).
-  * Please refer to the package documentation for the installation issues, etc.
-* [ ] Make sure your problem is not derived from plugins.
-  * This repository is maintaining `pyenv` and the default `python-build` plugin only. Please refrain from reporting issues of other plugins here.
-
-### Description
- [ ] Platform information (e.g. Ubuntu Linux 16.04):
- [ ] OS architecture (e.g. amd64):
- [ ] pyenv version:
- [ ] Python version:
- [ ] C Compiler information (e.g. gcc 7.3): 
- [ ] Please attach verbose build log as gist
-  * You can turn on verbose debug logging using by setting `PYENV_DEBUG=1`, e.g. `env PYENV_DEBUG=1 pyenv install -v 3.6.4`
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,16 +0,0 @@
-Make sure you have checked all steps below.
-
-### Prerequisite
-* [ ] Please consider implementing the feature as a hook script or plugin as a first step.
-  * pyenv has some powerful support for plugins and hook scripts. Please refer to [Authoring plugins](https://github.com/pyenv/pyenv/wiki/Authoring-plugins) for details and try to implement it as a plugin if possible.
-* [ ] Please consider contributing the patch upstream to [rbenv](https://github.com/rbenv/rbenv), since we have borrowed most of the code from that project.
-  * We occasionally import the changes from rbenv. In general, you can expect changes made in rbenv will be imported to pyenv too, eventually.
-  * Generally speaking, we prefer not to make changes in the core in order to keep compatibility with rbenv.
-* [ ] My PR addresses the following pyenv issue (if any)
-  - Closes https://github.com/pyenv/pyenv/issues/XXXX
-
-### Description
- [ ] Here are some details about my PR
-
-### Tests
- [ ] My PR adds the following unit tests (if any)
--- a/.github/no-response.yml
+++ b/.github/no-response.yml
@@ -1,13 +0,0 @@
-# Configuration for probot-no-response - https://github.com/probot/no-response
-
-# Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 30
-# Label requiring a response
-responseRequiredLabel: need-feedback
-# Comment to post when closing an Issue for lack of response. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed because there has been no response
-  to our request for more information from the original author. With only the
-  information that is currently in the issue, we don't have enough information
-  to take action. Please reach out if you have or find the answers we need so
-  that we can investigate further.
--- a/.github/workflows/ubuntu_tests.yml
+++ b/.github/workflows/ubuntu_tests.yml
@@ -1,42 +0,0 @@
-name: ubuntu_tests
-on: [pull_request, push]
-jobs:
-  ubuntu_tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - 2.7.18
-          - 3.5.10
-          - 3.6.13
-          - 3.7.10
-          - 3.8.10
-          - 3.9.5
-    runs-on: Ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      # Normally, we would use the superbly maintained...
-      # - uses: actions/setup-python@v2
-      #   with:
-      #    python-version: ${{ matrix.python-version }}
-      # ... but in the repo, we want to test pyenv builds on Ubuntu
-      - run: |
-          sudo apt-get install -y build-essential libssl-dev zlib1g-dev libbz2-dev \
-              libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
-              xz-utils tk-dev libffi-dev liblzma-dev python-openssl git
-      # https://github.com/pyenv/pyenv#installation
-      - run: pwd
-      - env:
-          PYENV_ROOT: /home/runner/work/pyenv/pyenv
-        run: |
-          echo $PYENV_ROOT
-          echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
-          bin/pyenv install ${{ matrix.python-version }}
-          bin/pyenv global ${{ matrix.python-version }}
-          bin/pyenv rehash
-      - run: python --version
-      - run: python -m pip --version
-      - shell: python  # Prove that actual Python == expected Python
-        env:
-          EXPECTED_PYTHON: ${{ matrix.python-version }}
-        run: import os, sys ; assert sys.version.startswith(os.getenv("EXPECTED_PYTHON"))
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@
 /src/Makefile
 /src/*.o
 /bats/
-/default-packages
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,83 +1,7 @@
-# Two types of tests:
-#
-# 1. shell tests run using bats
-# 2. build tests also run using bats
-#
-# Shell tests are run unconditionally on Linux (see jobs.include).
-#
-# Build tests can be skipped by starting the commit message with
-# '[skip build]'.
-#
-# Build tests are run on platforms generated from all combinations
-# of keys below.
+sudo: false
+install: git clone --depth 1 https://github.com/sstephenson/bats.git
+script: make test
 language: c
-
-os:
- linux
- osx
-
-dist:
- focal
-
-# https://docs.travis-ci.com/user/reference/osx/#macos-version
-osx_image:
- xcode9.4.1  # macOS 10.13.6
- xcode10.3   # macOS 10.14.4
- xcode11.6   # macOS 10.15.7
- xcode12.2   # macOS 10.15.7
-
 env:
- PYTHON_BUILD_VERSION=3.9.1
- PYTHON_BUILD_VERSION=3.7.5
-
-before_install:
- date +%Y-%m-%dT%H:%M:%S
-
-install: git clone --depth 1 --branch v1.2.0 https://github.com/bats-core/bats-core.git bats
-
-# Default for auto-generated jobs.
-script: make test-build
-
-jobs:
-  include:
-  # Shell-based tests should execute every time.
-  - stage: test shell
-    script: make test
-    env: PYENV_NATIVE_EXT=1
-    after_script: []
-    os: linux
-  - stage: test shell
-    script: make test
-    env: PYENV_NATIVE_EXT=
-    after_script: []
-    os: linux
-
-  exclude:
-  # For each osx_image but one there should be an entry in the exclude
-  # list, to prevent duplicate Linux builds.
-  - os: linux
-    osx_image: xcode9.4
-  - os: linux
-    osx_image: xcode10
-
-  allow_failures:
-  - env: PYTHON_BUILD_VERSION=3.9.1
-
-stages:
- test shell
- name: test
-  if: NOT (commit_message =~ /^\[skip build\]/)
-
-# Default 
-
-notifications:
-  email:
-    on_success: never
-
-deploy:
-  provider: releases
-  api_key:
-    secure: FLWevL09KYp7V1SjJUNEdWzuomuocXwNvPr1DSAFH7mmrjKTtjzwrjINAthSqzjlDrs5B//P47l1VLyHp5byEzy673W+bOmEg8swmqc7E9FrHLRyEByd/yca3DzkZgXEXgGdY/cl7tHhM4V2fYKEgAIWbFV+takmTFMK4WkEtNg=
-  on:
-    repo: pyenv/pyenv
-    tags: true
+  - PYENV_NATIVE_EXT=
+  - PYENV_NATIVE_EXT=1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,409 +1,5 @@
 ## Version History

-## Release 2.0.3
-
-* Remove PATH warning (#2001)
-* Add Python 3.6.14, 3.7.11, 3.8.11, and 3.9.6 (#1996)
-* Miniforge minor update to 4.10.1-5 (#1992)
-* Suggest that fish users init in interactive mode (#1991)
-
-## Release 2.0.2
-
-* Miniforge minor update to 4.10.1-5 (#1992)
-* Suggest that fish users init in interactive mode (#1991)
-* Add 3.10.0b3 (#1988)
-* Revert "Drop inferring version to install from `pyenv local`" (#1984)
-* Use system Python3 for tests (#1979)
-* Check for shims in path with pure Bash (#1978)
-* Update setup instructions for debian, ubuntu etc. (#1977)
-
-## Release 2.0.1
-
-* Drop inferring version to install from `pyenv local` (#1907)
-* Create mambaforge-4.10.1-4 (#1971)
-* Add 3.10.0b2 recipe (#1966)
-* Fix .bashrc `echo` install syntax error (#1965)
-* Add explicit Zsh instructions for MacOS (#1964)
-* Install pip with pyston (#1955)
-* Mention log file if an error happened before building, too (#1537)
-* Add pypy3.7-7.3.5 (#1950)
-
-## Release 2.0.0
-
-* Support for CPython 3.9.5 has been added.
-* Support for CPython 3.8.10 has been added.
-* Support for CPython 3.10.0b1 has been added.
-* Support for GraalPython 21.1.0 has been added.
-* Support for  Anaconda 2021.05 has been added.
-* Support for   Miniforge3 4.10.1-1 has been added.
-* CPython 3.10-dev target branch renamed.
-* CPython 3.10-dev and 3.11-dev updated.
-* Bump OpenSSL to 1.1.1x for all Pythons that support MacOS 11
-* Update generated configuration files before run ./configure
-* Full shell configuration instructions placed into `pyenv init`
-* Prevent build from installing MacOS apps globally
-* ldflags_dirs is not needed for Python and causes failures
-* Report cache filename at download
-* Add micropython 1.15
-* Correct URLs for Stackless builds and add Stackless 2.7.16
-
-## Breaking changes
-* Split startup logic into PATH and everything else (https://github.com/pyenv/pyenv/issues/1649#issuecomment-694388530)
-
-## 1.2.27
-
-* Add GraalPython 21.1.0 (#1882)
-* Add CPython 3.10.0a7 (#1880)
-* Docs(README): fix info about version-file separator (#1874)
-* List versions starting with a dot (#1350)
-* Feat: support (skip) commented lines in version-file (#1866)
-* pypy3.7-7.3.4 (#1873)
-* Create miniforge3-4.10 (#1868)
-* Add CPython 3.9.4 (#1865)
-
-## 1.2.26
-
-* Add CPython 3.9.4 (#1865)
-
-## 1.2.25
-
-* bpo-43631: update to openssl 1.1.1k (#1861)
-* Add CPython 3.9.3 and 3.8.9 (#1859)
-* Add micropython 1.14 (#1858)
-* Shell detect improvements (#1835)
-* Test(init): remove misleading detect from parent shell case arg (#1856)
-* Add GraalPython 21.0.0 (#1855)
-
-## 1.2.24
-
-* GitHub Actions: Add $PYENV_ROOT/shims to $PATH (#1838)
-* Add Python 3.10.0a6 (#1839)
-* Remove the "Using script's directory as PYENV_DIR if shim is invoked with a script argument" feature (#1814)
-* Update GET_PIP_URL (#1844)
-* GitHub Action to build Python versions on Ubuntu (#1794)
-* Make work in nounset (-u) mode (#1786)
-* Update miniforge3-4.9.2 (#1834)
-* Added aarch64 for Linux in anaconda_architecture() (#1833)
-* Hook script to add latest suffix for install command (#1831)
-* Fix error link (#1832)
-* Clarify proxy variable names in readme (#1830)
-* Travis CI: Add Xcode 12 on macOS 10.15.5 (#1708)
-* Added --nosystem argument (#1829)
-* Add CPython 3.8.8 (#1825)
-* Add CPython 3.9.2 (#1826)
-* Add manpage (#1790)
-
-## 1.2.23
-
-+ python-build: Add CPython v3.7.10 (#1818)
-+ python-build: Add CPython v3.6.13 (#1817)
-* python-build: Add PyPy 3.7-c-jit-latest (#1812)
-* python-build: Add PyPy 3.7 (#1718, #1726, #1780)
-* python-build: Add miniconda3 4.9.2 (#1763)
-* python-build: Add miniconda3 4.8.3 (#1763)
-* python-build: Add miniconda3 4.8.2 (#1763)
-* python-build: Add Miniforge3-4.9.2 (#1782)
-* python-build: Fix download links for some PyPy and Stackless versions (#1692)
-* python-build: Add PYENV_DEBUG option (#1806)
-* python-build: Fix get-pip which dropped support for legacy Python (#1793)
-* pyenv-help: Fix `sed: RE error: illegal byte sequence` (#1714)
-* pyenv-versions: Fix not printing asterisk for current version in Bash 3 (#1815)
-* pyenv-prefix: "system" python - support cases where python3 is in PATH but not python (#1655)
-* pyenv-which: Added fallback to system executable (#1797)
-* pyenv-rehash: Use associative arrays for better performance on bash >= 4 (#1749)
-* pyenv-rehash: Try to sleep in 0.1 sec steps when acquiring lock (#1798)
-* pyenv: Use a better PS4 as recommended by Bash Hackers Wiki (#1810)
-
-## 1.2.22
-
-+ python-build: Add LDFLAGS for zlib on macOS >= 1100 (#1711)
-+ python-build: Add the CPython 3.9.1 (#1752)
-+ python-build: Change order of LDFLAGS paths (#1754)
-+ python-build: Docker config for testing python-build (#1548)
-+ python-build: Put prerequisite for installation before install (#1750)
-+ python-build: Add GraalPython 20.3 (#1736)
-+ python-build: Add CPython 3.8.7
-+ python-build: Added anaconda3-2020.11 (#1774)
-+ python-build: Added arm64 architecture support in python-build for macOS  (#1775)
-
-## 1.2.21
-
-* python-build: Add CPython 3.9.0 (#1706)
-* python-build: Add CPython 3.8.6 (#1698)
-* python-build: Add CPython 3.7.9 (#1680)
-* python-build: Add CPython 3.6.12 (#1680)
-* python-build: Add CPython 3.5.10 (#1690)
-* python-build: Add Jython 2.7.2 (#1672)
-* python-build: Add Graalpython 20.1.0 (#1594)
-* python-build: Add Graalpython 20.2.0 (#1594)
-* python-build: Add Anaconda3-2020.07 (#1684)
-* python-build: Add micropython-1.13 (#1704)
-* python-build: Fix PyPy download links (#1682)
-* python-build: Support for `PYTHON_BUILD_MIRROR_URL` when checksums do not exist (#1673)
-* pyenv: Search for plugins in `PYENV_DIR` and `PYENV_ROOT` (#1697)
-* pyenv-help: Fix 'sed: RE error: illegal byte sequence' (#1670)
-
-## 1.2.20
-
-* python-build: Add CPython 3.8.5 (#1667)
-* python-build: Add CPython 3.8.4 (#1658)
-* python-build: Add CPython 3.7.8
-* python-build: Add CPython 3.6.11
-* pyenv-install: Make grep detection more robust (#1663)
-* python-build: Fix has_tar_xz_support function on FreeBSD. (#1652)
-
-## 1.2.19
-
-* python-build: Add CPython 3.8.3 (#1612)
-* python-build: Add CPython 2.7.18 (#1593)
-* python-build: Add CPython 3.10-dev (#1619)
-* python-build: Add anaconda3-2020.02 (#1584)
-* python-build: Add stackless 3.7.5 (#1589)
-
-## 1.2.18
-
-* python-build: Update download URLs for old OpenSSL releases (#1578)
-* python-build: Prevent `brew: command not found` messages that are not errors (#1544)
-
-## 1.2.17
-
-* python-build: Add CPython 3.8.2
-* python-build: Add CPython 3.7.7 (#1553)
-* python-build: Add Miniconda versions newer than 4.3.30 (#1361)
-* python-build: Add Micropython 1.12 (#1542)
-* python-build: Add Add CPython 3.9.0a4
-* pyenv: Fix sed illegal byte sequence error (#1521)
-
-## 1.2.16
-
-* python-build: Add CPython 3.8.1 (#1497)
-* python-build: Add CPython 3.7.6 (#1498)
-* python-build: Add CPython 3.6.10 (#1499)
-* python-build: Add CPython 3.5.9 (#1448)
-* python-build: Add PyPy 7.3.0 (1502)
-
-## 1.2.15
-
-* python-build: Add CPython 3.7.5 (#1423)
-* python-build: Add CPython 2.7.17 (#1433)
-* python-build: Add CPython 3.5.8 (#1441)
-* python-build: Add PyPy 7.2.0 (#1418)
-* python-build: Add anaconda3-2019.10 (#1427)
-* pyenv-help: Show text for all pyenv commands in pyenv-help (#1421)
-
-## 1.2.14
-
-* python-build: Add CPython 3.8.0 (#1416)
-* python-build: Add Anaconda-2019.07 (#1382)
-* python-build: Add Micropython 1.11 (#1395)
-* python-build: Fix compatibility issues with Homebrew installed Tcl/Tk (#1397)
-* pyenv-exec: Do not use `exec -a`, do not mangle PATH for system Python (#1169)
-
-## 1.2.13
-
-* python-build: Add CPython 3.7.4
-* python-build: Add CPython 3.6.9
-
-## 1.2.12
-
-* python-build: Find zlib from Xcode or brew on Mojave (#1353)
-* python-build: Add PyPy 7.1.1 (#1335)
-* python-build: Add CPython 3.8.0b1
-
-## 1.2.11
-
-* python-build: Fix `posix_close` name collision in 2.4 builds (#1321)
-* python-build: Add CPython 3.4.10 (#1322)
-* python-build: Add Anaconda 2019.03
-* python-build: Allow overriding the preference of OpenSSL version per definition basis (#1302, #1325, #1326)
-* python-build: Imported changes from rbenv/ruby-build 20190401 (#1327)
-* python-build: Use GNU Readline 8.0 on macOS if brew's package isn't available (#1329)
-
-## 1.2.10
-
-* python-build: Force y, Y, yes or YES to confirm installation (#1217)
-* python-build: Add PyPy 7.0.0, 7.1.0
-* python-build: Add CPython 2.7.16, 3.5.7 and 3.7.3
-* python-build: Install `python-gdb.py` (#1190, #1289)
-* python-build: Add micropython 1.10
-* python-build: Prefer Homebrew's OpenSSL 1.1 over 1.0 (#839, #1302)
-
-## 1.2.9
-
-* python-build: Add CPython 3.7.2 and CPython 3.6.8 (#1256)
-* python-build: Add anaconda[23]-5.3.1 (#1246)
-* python-build: Add Anaconda 2018.12 (#1259)
-* python-build: Fix ironpython-dev git repo url (#1260)
-* python-build: Add `OPENSSL_NO_SSL3` patch for CPython 3.3.7 (#1263)
-
-## 1.2.8
-
-* python-build: Add CPython 3.7.1
-* python-build: Add CPython 3.6.7
-* python-build: Add anaconda[23]-5.3.0 (#1220)
-
-## 1.2.7
-
-* python-build: Add CPython 3.5.6 (#1199)
-* python-build: Add CPython 3.4.9
-
-## 1.2.6
-
-* python-build: Added CPython 3.6.6 (#1178)
-* python-build: Check wget version iff wget is going to be used (#1180)
-
-## 1.2.5
-
-* python-build: Add CPython 3.7.0 (#1177)
-* python-build: Add micropython 1.9.4 (#1160)
-* python-build: Add anaconda[23]-5.2.0 (#1165)
-* pyenv: Fix `seq(1)` is not available on OpenBSD (#1166)
-
-## 1.2.4
-
-* python-build: Add CPython 2.7.15
-* python-build: Add PyPy 6.0.0
-* python-build: Allow overriding HTTP client type based on environment variable `PYTHON_BUILD_HTTP_CLIENT` (#1126)
-* python-build: Use version-specific `get-pip.py` when installing 2.6 and 3.2 (#1131)
-* pyenv: Merge rbenv master (#1151)
-* pyenv: Make `pyenv-rehash` safer for multiple processes (#1092)
-
-## 1.2.3
-
-* python-build: Add CPython 3.6.5
-* python-build: Set openssl PKG_CONFIG_PATH for python 3.7 (#1117)
-* python-build: Add ActivePython versions 2.7.14, 3.5.4, 3.6.0 (#1113)
-* python-build: Unset `PIP_VERSION` before invoking `get-pip.py` as a workaround for `invalid truth value` error (#1124)
-
-## 1.2.2
-
-* python-build: Add PyPy3 5.10.1 (#1084)
-* python-build: Add CPython 3.5.5 (#1090)
-* python-build: Add Anaconda[23]-5.1.0 (#1100)
-* python-build: Fix checksum issue for CPython 3.4.8 (#1094)
-* python-build: Prevent Anaconda from installing a `clear` shim (#1084)
-## 1.2.1
-
-* python-build: Add CPython 3.6.4
-* python-build: Add PyPy[23] 5.10
-
-## 1.2.0
-
-* python-build: Import changes from ruby-build v20171031 (#1026)
-* python-build: Ignore LibreSSL bundled with macOS 10.13 (#1025)
-* python-build: Skip passing `--enable-unicode` to CPython 3.3+ (#912)
-* python-build: Add CPython 3.3.7 (#1053)
-* python-build: Add micropython 1.9.3
-* python-build: Add PyPy 5.9.0
-* python-build: Add Miniconda[23] 4.3.14, 4.3.21, 4.3.27, 4.3.30
-* python-build: Add Anaconda[23] 5.0.1
-* python-build: Update Anaconda[23] 5.0.0 to 5.0.0.1 bugfix release
-
-## v1.1.5
-
-* python-build: Add CPython 3.6.3
-* python-build: Add CPython 3.7.0a1
-* python-build: Add Anaconda[23] 5.0.0
-
-## v1.1.4
-
-* pyenv: Workaround for scripts in `$PATH` which needs to be source'd (#100, #688, #953)
-* python-build: Add support for PyPy3 executables like `libpypy3-c.so` (#955, #956)
-* python-build: Add CPython 2.7.14, 3.4.7, 3.5.4 (#965, #971, #980)
-* python-build: Add Jython 2.7.1 (#973)
-
-## v1.1.3
-
-* python-build: Add CPython 3.6.2 (#951)
-
-## v1.1.2
-
-* pyenv: Fix incorrect `pyenv --version` output in v1.1.1 (#947)
-
-## v1.1.1
-
-* python-build: Update links to Portable Pypy 5.8-1 bugfix release, affects pypy2.7-5.8.0 and pypy3.5-5.8.0 definitions (#939)
-
-## v1.1.0
-
-* python-build: Add PyPy 5.7.1 (#888)
-* pyenv: Merge rbenv master (#927)
-* python-build: Add PyPy 5.8.0 (#932)
-* python-build: Anaconda[23] 4.4.0
-* python-build: Add micropython-dev
-
-## 1.0.10
-
-* python-build: Add Anaconda2/Anaconda3 4.3.1 (#876)
-* python-build: Make miniconda-latest point to miniconda2-latest (#881)
-* python-build: Fix typo in MacOS packages for anaconda2-4.3.0/4.2.0 (#880)
-
-## 1.0.9
-
-* pyenv: Migrate project site from https://github.com/yyuu/pyenv to https://github.com/pyenv/pyenv
-* python-build: Add PyPy2 5.7.0 (#872, #868)
-* python-build: Add PyPy3 5.7.0-beta (#871, #869)
-* python-build: Add CPython 3.6.1 (#873)
-* python-build: Add Pyston 0.6.1 (#859)
-* python-build: Change default mirror site URL from https://yyuu.github.io/pythons to https://pyenv.github.io/pythons
-* python-build: Upgrade OpenSSL from 1.0.2g to 1.0.2k (#850)
-
-## 1.0.8
-
-* pyenv: Fix fish subcommand completion (#831)
-* python-build: Add Anaconda2/Anaconda3 4.3.0  (#824)
-* python-build: Use CPython on GitHub as the source repository of CPython development versions (#836, #837)
-* python-build: Fix checksum verification issue on the platform where OpenSSL isn't available (#840)
-
-## 1.0.7
-
-* python-build: Add CPython 3.5.3 (#811)
-* python-build: Add CPython 3.4.6 (#812)
-* python-build: Fix tar.gz checksum of CPython 3.6.0 (#793)
-* python-build: Jython installer workaround (#800)
-* python-build: Disable optimization (`-O0`) when `--debug` was specified (#808)
-
-## 1.0.6
-
-* python-build: Add CPython 3.6.0 (#787)
-
-## 1.0.5
-
-* python-build: Add CPython 2.7.13 (#782)
-* python-build: Add CPython 3.6.0rc2 (#781)
-* python-build: Add Anaconda 4.2.0 (#774)
-* python-build: Add Anaconda3 4.2.0 (#765)
-* python-build: Add IronPython 2.7.7 (#755)
-
-## 1.0.4
-
-* python-build: Add PyPy 5.6.0 (#751)
-* python-build: Add PyPy3 3.5 nightlies (`pypy3.5-c-jit-latest` #737)
-* python-build: Add Stackless 2.7.12 (#753)
-* python-build: Add Stackless 2.7.11
-* python-build: Add Stackless 2.7.10
-* python-build: Add Pyston 0.6.0
-* python-build: Add CPython 3.6.0b4 (#762)
-
-## 1.0.3
-
-* python-build: Add CPython 3.6.0b3 (#731, #744)
-* python-build: Add PyPy3.3 5.5-alpha (#734, #736)
-* python-build: Stop specifying `--enable-unicode=ucs4` on OS X (#257, #726)
-* python-build: Fix 3.6-dev and add 3.7-dev (#729, #730)
-* python-build: Add a patch for https://bugs.python.org/issue26664 (#725)
-* python-build: Add Pyston 0.5.1 (#718)
-* python-build: Add Stackless 3.4.2 (#720)
-* python-build: Add IronPython 2.7.6.3 (#716)
-* python-build: Add Stackless 2.7.9 (#714)
-
-## 1.0.2
-
-* python-build: Add CPython 3.6.0b1 (#699)
-* python-build: Add anaconda[23] 4.1.1 (#701, #702)
-* python-build: Add miniconda[23] 4.1.11 (#703, #704, #706)
-* python-build: Remove `bin.orig` if exists to fix an issue with `--enable-framework` (#687, #700)
-
 ## 1.0.1

 * python-build: Add CPython 3.6.0a4 (#673)
@@ -485,12 +81,12 @@

 * pyenv: Merge recent changes from rbenv as of 2015-12-14 (#504)
 * python-build: Add a `OPENSSL_NO_SSL3` patch for CPython 2.6, 2.7, 3.0, 3.1, 3.2 and 3.3 series (#507, #511)
-* python-build: Stopped using mirror at pyenv.github.io for CPython since http://www.python.org is on fast.ly
+* python-build: Stopped using mirror at yyuu.github.io for CPython since http://www.python.org is on fast.ly

 ### 20151210

 * pyenv: Add a default hook for Anaconda to look for original `$PATH` (#491)
-* pyenv: Skip virtualenv aliases on `pyenv versions --skip-aliases` (pyenv/pyenv-virtualenv#126)
+* pyenv: Skip virtualenv aliases on `pyenv versions --skip-aliases` (yyuu/pyenv-virtualenv#126)
 * python-build: Add CPython 2.7.11, 3.5.1 (#494, #498)
 * python-build: Update OpenSSL to 1.0.1q (#496)
 * python-build: Adding SSL patch to build 2.7.3 on Debian (#495)
@@ -507,7 +103,7 @@
 ### 20151105

 * python-build: Add anaconda2-2.4.0 and anacondaa3-2.4.0
-* python-build: Add Portable PyPy 4.0 (#472)
+* python-biuld: Add Portable PyPy 4.0 (#472)

 ### 20151103

@@ -520,7 +116,7 @@
 * pyenv: Different behaviour when invoking .py script through symlink (#379, #404)
 * pyenv: Enabled Gitter on the project (#436, #444)
 * python-build: Add Jython 2.7.1b1
-* python-build: Install OpenSSL on OS X if no proper version is available (#429)
+* python-build: Install OpenSSL on OS X if no proper versionn is available (#429)

 ### 20150913

@@ -597,12 +193,12 @@
 #### 20150124

 * python-build: Import recent changes from ruby-build v20150112
-* python-build: Prevent adding `/Library/Python/X.X/site-packages` to `sys.path` when `--enable-framework` is enabled on OS X. Thanks @s1341 (#292)
+* python-build: Prevent adding `/Library/Python/X.X/site-packages` to `sys.path` whtn `--enable-framework` is enabled on OS X. Thanks @s1341 (#292)
 * python-build: Add new IronPython release; 2.7.5

 #### 20141211

-* pyenv: Add built-in `pip-rehash` feature. You don't need to install [pyenv-pip-rehash](https://github.com/pyenv/pyenv-pip-rehash) anymore.
+* pyenv: Add bulit-in `pip-rehash` feature. You don't need to install [pyenv-pip-rehash](https://github.com/yyuu/pyenv-pip-rehash) anymore.
 * python-build: Add new CPython release; 2.7.9 (#284)
 * python-build: Add new PyPy releases; pypy3-2.4.0, pypy3-2.4.0-src (#277)
 * python-build: Add build definitions of PyPy nightly build
@@ -712,9 +308,9 @@
 * python-build: Fix build of Tkinter with Tcl/Tk 8.6 (#131)
 * python-build: Fix build problem with Readline 6.3 (#126, #131, #149, #152)
 * python-build: Do not exit with errors even if some of modules are absent (#131)
-* python-build: MacOSX was misspelled as MaxOSX in `anaconda_architecture` (#136)
+* python-build: MacOSX was mispelled as MaxOSX in `anaconda_architecture` (#136)
 * python-build: Use default `cc` as the C Compiler to build CPython (#148, #150)
-* python-build: Display value from `pypy_architecture` and `anaconda_architecture` on errors (pyenv/pyenv-virtualenv#18)
+* python-build: Display value from `pypy_architecture` and `anaconda_architecture` on errors (yyuu/pyenv-virtualenv#18)
 * python-build: Remove old development version; 2.6-dev
 * python-build: Update default setuptools version (3.3 -> 3.4.1)

@@ -768,7 +364,7 @@
 * python-build: Activate friendly CPython during build if the one is not activated (8fa6b4a1847851919ad7857c6c42ed809a4d277b)
 * python-build: Fix broken install.sh
 * python-build: Import recent changes from ruby-build v20131225.1
-* version-ext-compat: Removed from default plugin. Please use [pyenv-version-ext](https://github.com/pyenv/pyenv-version-ext) instead.
+* version-ext-compat: Removed from default plugin. Please use [pyenv-version-ext](https://github.com/yyuu/pyenv-version-ext) instead.

 #### 0.4.0-20131217

--- a/COMMANDS.md
+++ b/COMMANDS.md
@@ -1,7 +1,7 @@
 # Command Reference

 Like `git`, the `pyenv` command delegates to subcommands based on its
-first argument.
+first argument. 

 The most common subcommands are:

@@ -185,7 +185,7 @@ or, if you prefer 3.3.3 over 2.7.6,

 ## `pyenv install`

-Install a Python version (using [`python-build`](https://github.com/pyenv/pyenv/tree/master/plugins/python-build)).
+Install a Python version (using `python-build`).

    Usage: pyenv install [-f] [-kvp] <version>
           pyenv install [-f] [-kvp] <definition-file>
@@ -203,18 +203,6 @@ Install a Python version (using [`python-build`](https://github.com/pyenv/pyenv/
      -p/--patch       Apply a patch from stdin before building
      -g/--debug       Build a debug version

-To list the all available versions of Python, including Anaconda, Jython, pypy, and stackless, use:
-
-    $ pyenv install --list
-
-Then install the desired versions:
-
-    $ pyenv install 2.7.6
-    $ pyenv install 2.6.8
-    $ pyenv versions
-      system
-      2.6.8
-    * 2.7.6 (set by /home/yyuu/.pyenv/version)

 ## `pyenv uninstall`

@@ -267,8 +255,6 @@ you run the given command.
    $ pyenv which python3.3
    /home/yyuu/.pyenv/versions/3.3.3/bin/python3.3

-Use --nosystem argument in case when you don't need to search command in the 
-system environment.

 ## `pyenv whence`

@@ -278,3 +264,24 @@ Lists all Python versions with the given command installed.
    2.6.8
    2.7.6
    3.3.3
+
+
+## `pyenv install`
+
+Part of [Python-build](https://github.com/yyuu/pyenv/tree/master/plugins/python-build), this installs versions of python
+
+    $ pyenv install 2.7.6
+    $ pyenv install 2.6.8
+    $ pyenv versions
+      system
+      2.6.8
+    * 2.7.6 (set by /home/yyuu/.pyenv/version)
+
+
+## `pyenv install --list`
+
+List available remote versions of Python, including Anaconda, Jython, pypy, and stackless
+
+    $ pyenv install --list
+
+
--- a/CONDUCT.md
+++ b/CONDUCT.md
@@ -67,9 +67,9 @@ members of the project's leadership.

 ## Project Maintainers

-* Yamashita, Yuu <<peek824545201@gmail.com>>
-* Daniel Hahler <<git@thequod.de>>
-* Josh Friend <<josh@fueledbycaffeine.com>>
+* Sam Stephenson <<sstephenson@gmail.com>>
+* Mislav Marohnić <<mislav.marohnic@gmail.com>>
+* Erik Michaels-Ober <<sferik@gmail.com>>

 ## Attribution

--- a/35
+++ b/35
@@ -1,35 +0,0 @@
-FROM ubuntu:18.04
-
-LABEL maintainer="Chris L. Barnes <chrislloydbarnes@gmail.com>"
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update -y \
-    && apt-get install -y \
-        make \
-        build-essential \
-        libssl-dev \
-        zlib1g-dev \
-        libbz2-dev \
-        libreadline-dev \
-        libsqlite3-dev \
-        wget \
-        curl \
-        llvm \
-        libncurses5-dev \
-        libncursesw5-dev \
-        xz-utils \
-        tk-dev \
-        libffi-dev \
-        liblzma-dev \
-        python-openssl \
-        git \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV PYENV_ROOT "/pyenv"
-ENV PATH "$PYENV_ROOT/bin:$PATH"
-
-COPY . /pyenv
-
-RUN eval "$(pyenv init -)"
-
--- a/17
+++ b/17
@@ -1,4 +1,4 @@
-.PHONY: test test-build
+.PHONY: test

 # Do not pass in user flags to build tests.
 unexport PYTHON_CFLAGS
@@ -8,18 +8,5 @@ test: bats
 	PATH="./bats/bin:$$PATH" test/run
 	cd plugins/python-build && $(PWD)/bats/bin/bats $${CI:+--tap} test

-PYTHON_BUILD_ROOT := $(CURDIR)/plugins/python-build
-PYTHON_BUILD_OPTS ?= --verbose
-PYTHON_BUILD_VERSION ?= 3.8-dev
-PYTHON_BUILD_TEST_PREFIX ?= $(PYTHON_BUILD_ROOT)/test/build/tmp/dist
-
-test-build:
-	$(RM) -r $(PYTHON_BUILD_TEST_PREFIX)
-	$(PYTHON_BUILD_ROOT)/bin/python-build $(PYTHON_BUILD_OPTS) $(PYTHON_BUILD_VERSION) $(PYTHON_BUILD_TEST_PREFIX)
-	[ -e $(PYTHON_BUILD_TEST_PREFIX)/bin/python ]
-	$(PYTHON_BUILD_TEST_PREFIX)/bin/python -V
-	[ -e $(PYTHON_BUILD_TEST_PREFIX)/bin/pip ]
-	$(PYTHON_BUILD_TEST_PREFIX)/bin/pip -V
-
 bats:
-	git clone --depth 1 --branch v1.2.0 https://github.com/bats-core/bats-core.git bats
+	git clone https://github.com/sstephenson/bats.git
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 [![Join the chat at https://gitter.im/yyuu/pyenv](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/yyuu/pyenv?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-[![Build Status](https://travis-ci.org/pyenv/pyenv.svg?branch=master)](https://travis-ci.org/pyenv/pyenv)
+[![Build Status](https://travis-ci.org/yyuu/pyenv.svg?branch=master)](https://travis-ci.org/yyuu/pyenv)

 pyenv lets you easily switch between multiple versions of Python. It's
 simple, unobtrusive, and follows the UNIX tradition of single-purpose
@@ -11,7 +11,7 @@ tools that do one thing well.
 This project was forked from [rbenv](https://github.com/rbenv/rbenv) and
 [ruby-build](https://github.com/rbenv/ruby-build), and modified for Python.

-![Terminal output example](/terminal_output.png)
+<img src="https://i.gyazo.com/699a58927b77e46e71cd674c7fc7a78d.png" width="735" height="490" />


 ### pyenv _does..._
@@ -31,7 +31,7 @@ This project was forked from [rbenv](https://github.com/rbenv/rbenv) and
 * **Need to be loaded into your shell.** Instead, pyenv's shim
    approach works by adding a directory to your `$PATH`.
 * **Manage virtualenv.** Of course, you can create [virtualenv](https://pypi.python.org/pypi/virtualenv)
-    yourself, or [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv)
+    yourself, or [pyenv-virtualenv](https://github.com/yyuu/pyenv-virtualenv)
    to automate the process.


@@ -48,7 +48,7 @@ This project was forked from [rbenv](https://github.com/rbenv/rbenv) and
 * **[Installation](#installation)**
  * [Basic GitHub Checkout](#basic-github-checkout)
    * [Upgrading](#upgrading)
-    * [Homebrew on macOS](#homebrew-on-macos)
+    * [Homebrew on Mac OS X](#homebrew-on-mac-os-x)
    * [Advanced Configuration](#advanced-configuration)
    * [Uninstalling Python Versions](#uninstalling-python-versions)
 * **[Command Reference](#command-reference)**
@@ -87,7 +87,7 @@ then `/bin`.
 pyenv works by inserting a directory of _shims_ at the front of your
 `PATH`:

-    $(pyenv root)/shims:/usr/local/bin:/usr/bin:/bin
+    ~/.pyenv/shims:/usr/local/bin:/usr/bin:/bin

 Through a process called _rehashing_, pyenv maintains shims in that
 directory to match every Python command across every installed version
@@ -108,19 +108,19 @@ When you execute a shim, pyenv determines which Python version to use by
 reading it from the following sources, in this order:

 1. The `PYENV_VERSION` environment variable (if specified). You can use
-   the [`pyenv shell`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-shell) command to set this environment
+   the [`pyenv shell`](https://github.com/yyuu/pyenv/blob/master/COMMANDS.md#pyenv-shell) command to set this environment
   variable in your current shell session.

 2. The application-specific `.python-version` file in the current
   directory (if present). You can modify the current directory's
-   `.python-version` file with the [`pyenv local`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-local)
+   `.python-version` file with the [`pyenv local`](https://github.com/yyuu/pyenv/blob/master/COMMANDS.md#pyenv-local)
   command.

 3. The first `.python-version` file found (if any) by searching each parent
   directory, until reaching the root of your filesystem.

-4. The global `$(pyenv root)/version` file. You can modify this file using
-   the [`pyenv global`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-global) command. If the global version
+4. The global `~/.pyenv/version` file. You can modify this file using
+   the [`pyenv global`](https://github.com/yyuu/pyenv/blob/master/COMMANDS.md#pyenv-global) command. If the global version
   file is not present, pyenv assumes you want to use the "system"
   Python. (In other words, whatever version would run if pyenv weren't in your
   `PATH`.)
@@ -133,10 +133,8 @@ in this example), but also have Python 3.3.6, 3.2, and 2.5 available on your
 `PATH`, one would first `pyenv install` the missing versions, then set `pyenv
 global system 3.3.6 3.2 2.5`. At this point, one should be able to find the full
 executable path to each of these using `pyenv which`, e.g. `pyenv which python2.5`
-(should display `$(pyenv root)/versions/2.5/bin/python2.5`), or `pyenv which
-python3.4` (should display path to system Python3). You can also specify multiple
-versions in a `.python-version` file, separated by newlines.
-Lines starting with a `#` are ignored.
+(should display `$PYENV_ROOT/versions/2.5/bin/python2.5`), or `pyenv which
+python3.4` (should display path to system Python3).

 ### Locating the Python Installation

@@ -145,22 +143,16 @@ specified, it passes the command along to the corresponding Python
 installation.

 Each Python version is installed into its own directory under
-`$(pyenv root)/versions`.
+`~/.pyenv/versions`.

 For example, you might have these versions installed:

-* `$(pyenv root)/versions/2.7.8/`
-* `$(pyenv root)/versions/3.4.2/`
-* `$(pyenv root)/versions/pypy-2.4.0/`
+* `~/.pyenv/versions/2.7.8/`
+* `~/.pyenv/versions/3.4.2/`
+* `~/.pyenv/versions/pypy-2.4.0/`

-As far as Pyenv is concerned, version names are simply directories under
-`$(pyenv root)/versions`.
-
-### Managing Virtual Environments
-
-There is a pyenv plugin named [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv) which comes with various features to help pyenv users to manage virtual environments created by virtualenv or Anaconda.
-Because the `activate` script of those virtual environments are relying on mutating `$PATH` variable of user's interactive shell, it will intercept pyenv's shim style command execution hooks.
-We'd recommend to install pyenv-virtualenv as well if you have some plan to play with those virtual environments.
+As far as pyenv is concerned, version names are simply the directories in
+`~/.pyenv/versions`.


 ----
@@ -168,254 +160,130 @@ We'd recommend to install pyenv-virtualenv as well if you have some plan to play

 ## Installation

-### Prerequisites:
+If you're on Mac OS X, consider [installing with Homebrew](#homebrew-on-mac-os-x).

-For pyenv to install python correctly you should [**install the Python build dependencies**](https://github.com/pyenv/pyenv/wiki#suggested-build-environment).
-
-### Homebrew on macOS
-
-   1. Consider installing with [Homebrew](https://brew.sh):
-      ```sh
-      brew update
-      brew install pyenv
-      ```
-   2. Then follow the rest of the post-installation steps under [Basic GitHub Checkout](https://github.com/pyenv/pyenv#basic-github-checkout), starting with #2 ("Configure your shell's environment for Pyenv").
-
-If you're on Windows, consider using @kirankotari's [`pyenv-win`](https://github.com/pyenv-win/pyenv-win) fork. (Pyenv does not work in Windows outside the Windows Subsystem for Linux.)

 ### The automatic installer

-Visit our other project:
-https://github.com/pyenv/pyenv-installer
+Visit my other project:
+https://github.com/yyuu/pyenv-installer


 ### Basic GitHub Checkout

-This will get you going with the latest version of Pyenv and make it
+This will get you going with the latest version of pyenv and make it
 easy to fork and contribute any changes back upstream.

-1. **Check out Pyenv where you want it installed.**
-   A good place to choose is `$HOME/.pyenv` (but you can install it somewhere else):
+1. **Check out pyenv where you want it installed.**
+   A good place to choose is `$HOME/.pyenv` (but you can install it somewhere else).

-        git clone https://github.com/pyenv/pyenv.git ~/.pyenv
+        $ git clone https://github.com/yyuu/pyenv.git ~/.pyenv

-   Optionally, try to compile a dynamic Bash extension to speed up Pyenv. Don't
-   worry if it fails; Pyenv will still work normally:

-        cd ~/.pyenv && src/configure && make -C src
+2. **Define environment variable `PYENV_ROOT`** to point to the path where
+   pyenv repo is cloned and add `$PYENV_ROOT/bin` to your `$PATH` for access
+   to the `pyenv` command-line utility.

-2. **Configure your shell's environment for Pyenv**
+        $ echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile
+        $ echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bash_profile

-   **Note:** The below instructions for specific shells are designed for common shell setups.  
-   If you have an uncommon setup and they don't work for you,
-   use the guidance text and the [Advanced Configuration](#advanced-configuration)
-   section below to figure out what you need to do in your specific case.
-   
-   1. **Adjust the session-wide environment for your account.** Define
-   the `PYENV_ROOT` environment variable to point to the path where
-   you cloned the Pyenv repo, add the `pyenv` command-line utility to your `PATH`,
-   run the output of `pyenv init --path` to enable shims.
-   
-      These commands need to be added into your shell startup files in such a way
-      that _they are executed only once per session, by its login shell._
-      This typically means they need to be added into a per-user shell-specific
-      `~/.*profile` file, _and_ into `~/.profile`, too, so that they are also
-      run by GUI managers (which typically act as a `sh` login shell).
+    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
+    **Ubuntu note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.

-      **MacOS note:** If you installed Pyenv with Homebrew, you don't need
-      to add the `PYENV_ROOT=` and `PATH=` lines.
-      You also don't need to add commands into `~/.profile` if your shell doesn't use it.
-   
-      - For **Bash**:
+3. **Add `pyenv init` to your shell** to enable shims and autocompletion.
+   Please make sure `eval "$(pyenv init -)"` is placed toward the end of the shell
+   configuration file since it manipulates `PATH` during the initialization.

-         ~~~ bash
-         echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.profile
-         echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.profile
-         echo 'eval "$(pyenv init --path)"' >> ~/.profile
-         ~~~
+        $ echo 'eval "$(pyenv init -)"' >> ~/.bash_profile

-         - **If your `~/.profile` sources `~/.bashrc` (Debian, Ubuntu, Mint):**
+    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
+    **Ubuntu note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.
+    
+    **General warning**: There are some systems where the `BASH_ENV` variable is configured
+    to point to `.bashrc`. On such systems you should almost certainly put the abovementioned line
+    `eval "$(pyenv init -)` into `.bash_profile`, and **not** into `.bashrc`. Otherwise you
+    may observe strange behaviour, such as `pyenv` getting into an infinite loop.
+    See [#264](https://github.com/yyuu/pyenv/issues/264) for details.

-            Put these lines into `~/.profile` _before_ the part that sources `~/.bashrc`:
-            ~~~bash
-            export PYENV_ROOT="$HOME/.pyenv"
-            export PATH="$PYENV_ROOT/bin:$PATH"
-            ~~~
-            
-            And put this line at the _bottom_ of `~/.profile`:
-            ~~~bash
-            eval "$(pyenv init --path)"
-            ~~~
+4. **Restart your shell so the path changes take effect.**
+   You can now begin using pyenv.

-            <!--This is an alternative option and needn't be replicated to `pyenv init`-->
-            Alternatively, for an automated installation, you can run the following:
-            ~~~ bash
-            echo -e 'if shopt -q login_shell; then' \
-                  '\n  export PYENV_ROOT="$HOME/.pyenv"' \
-                  '\n  export PATH="$PYENV_ROOT/bin:$PATH"' \
-                  '\n eval "$(pyenv init --path)"' \
-                  '\nfi' >> ~/.bashrc
-            echo -e 'if [ -z "$BASH_VERSION" ]; then'\
-                  '\n  export PYENV_ROOT="$HOME/.pyenv"'\
-                  '\n  export PATH="$PYENV_ROOT/bin:$PATH"'\
-                  '\n  eval "$(pyenv init --path)"'\
-                  '\nfi' >>~/.profile
-            ~~~
+        $ exec $SHELL

-         **Note:** If you have `~/.bash_profile`, make sure that it too executes the above-added commands,
-         e.g. by copying them there or by `source`'ing `~/.profile`.
-
-      - For **Zsh**:
-
-         - **MacOS, if Pyenv is installed with Homebrew:**
-
-            ~~~ zsh
-            echo 'eval "$(pyenv init --path)"' >> ~/.zprofile
-            ~~~
-         
-         - **MacOS, if Pyenv is installed with a Git checkout:**
-         
-            ~~~ zsh
-            echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.zprofile
-            echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.zprofile
-            echo 'eval "$(pyenv init --path)"' >> ~/.zprofile
-            ~~~
-
-         - **Other OSes:**
-         
-           Same as for Bash above, but add the commands into both `~/.profile`
-           and `~/.zprofile`.
-        
-      - For **Fish shell**:
-
-        Execute this interactively:
-        ~~~ fish
-        set -Ux PYENV_ROOT $HOME/.pyenv
-        set -U fish_user_paths $PYENV_ROOT/bin $fish_user_paths
-        ~~~
-
-        And add this to `~/.config/fish/config.fish`:
-        ~~~ fish
-        status is-interactive; and pyenv init --path | source
-        ~~~
-
-        If Fish is not your login shell, also follow the Bash/Zsh instructions to add to `~/.profile`.
-
-      **Proxy note**: If you use a proxy, export `http_proxy` and `https_proxy`, too.
-
-   2. **Add `pyenv` into your shell** by running the output of `pyenv init -`
-     to enable autocompletion and all subcommands.
-   
-      This command needs to run at startup of any interactive shell instance.
-      In an interactive login shell, it needs to run _after_ the commands
-      from the previous step.
-
-      - For **bash**:
-        ~~~ bash
-        echo 'eval "$(pyenv init -)"' >> ~/.bashrc
-        ~~~
-        
-        - **If your `/etc/profile` sources `~/.bashrc` (SUSE):**
-        
-          ~~~bash
-          echo 'if command -v pyenv >/dev/null; then eval "$(pyenv init -)"; fi' >> ~/.bashrc 
-          ~~~
-
-      - For **Zsh**:
-        ~~~ zsh
-        echo 'eval "$(pyenv init -)"' >> ~/.zshrc
-        ~~~
-
-      - For **Fish shell**:
-        Add this to `~/.config/fish/config.fish`:
-        ~~~ fish
-        pyenv init - | source
-        ~~~
-
-      **General warning**: There are some systems where the `BASH_ENV` variable is configured
-      to point to `.bashrc`. On such systems you should almost certainly put the above-mentioned line
-      `eval "$(pyenv init -)"` into `.bash_profile`, and **not** into `.bashrc`. Otherwise you
-      may observe strange behaviour, such as `pyenv` getting into an infinite loop.
-      See [#264](https://github.com/pyenv/pyenv/issues/264) for details.
-
-4. **Restart your login session for the changes to take effect.**
-   E.g. if you're in a GUI session, you need to fully log out and log back in.
-   
-   In MacOS, restarting terminal windows is enough (because MacOS runs shells
-   in them as login shells by default).
-
-5. [**Install Python build dependencies**](https://github.com/pyenv/pyenv/wiki#suggested-build-environment) before attempting to install a new Python version.
-
-6. **Install Python versions into `$(pyenv root)/versions`.**
+5. **Install Python versions into `$PYENV_ROOT/versions`.**
   For example, to download and install Python 2.7.8, run:
-    ```sh
-    pyenv install 2.7.8
-    ```
-   **NOTE:** If you need to pass a `configure` option to a build, please use the
+
+        $ pyenv install 2.7.8
+
+   **NOTE:** If you need to pass configure option to build, please use
   ```CONFIGURE_OPTS``` environment variable.
+   
+   **NOTE:** If you want to use proxy to download, please use `http_proxy` and `https_proxy`
+   environment variable.

-   **NOTE:** If you want to use proxy to download, please set the `http_proxy` and `https_proxy`
-   environment variables.
-
-   **NOTE:** If you are having trouble installing a Python version,
+   **NOTE:** If you are having trouble installing a python version,
   please visit the wiki page about
-   [Common Build Problems](https://github.com/pyenv/pyenv/wiki/Common-build-problems).
+   [Common Build Problems](https://github.com/yyuu/pyenv/wiki/Common-build-problems)


 #### Upgrading

-If you've installed Pyenv using Homebrew, upgrade using:
-```sh
-brew upgrade pyenv
-```
-
-If you've installed Pyenv using the instructions above, you can
-upgrade your installation at any time using Git.
+If you've installed pyenv using the instructions above, you can
+upgrade your installation at any time using git.

 To upgrade to the latest development version of pyenv, use `git pull`:

-```sh
-cd $(pyenv root)
-git pull
-```
+    $ cd ~/.pyenv
+    $ git pull

-To upgrade to a specific release of Pyenv, check out the corresponding tag:
+To upgrade to a specific release of pyenv, check out the corresponding tag:

-```sh
-cd $(pyenv root)
-git fetch
-git tag
-git checkout v0.1.0
-```
+    $ cd ~/.pyenv
+    $ git fetch
+    $ git tag
+    v0.1.0
+    $ git checkout v0.1.0

 ### Uninstalling pyenv

 The simplicity of pyenv makes it easy to temporarily disable it, or
 uninstall from the system.

-1. To **disable** Pyenv managing your Python versions, simply remove the
-  `pyenv init` invocations from your shell startup configuration. This will
-  remove Pyenv shims directory from `PATH`, and future invocations like
-  `python` will execute the system Python version, as it was before Pyenv.
+1. To **disable** pyenv managing your Python versions, simply remove the
+  `pyenv init` line from your shell startup configuration. This will
+  remove pyenv shims directory from PATH, and future invocations like
+  `python` will execute the system Python version, as before pyenv.

-   `pyenv` will still be accessible on the command line, but your Python
-   apps won't be affected by version switching.
+  `pyenv` will still be accessible on the command line, but your Python
+  apps won't be affected by version switching.

-2. To completely **uninstall** Pyenv, remove _all_ configuration lines for it
-   from your shell startup configuration, and then remove
+2. To completely **uninstall** pyenv, perform step (1) and then remove
   its root directory. This will **delete all Python versions** that were
-   installed under `` $(pyenv root)/versions/ `` directory:
-   
-   ```sh
-   rm -rf $(pyenv root)
-   ```
+   installed under `` `pyenv root`/versions/ `` directory:

-   If you've installed Pyenv using a package manager, as a final step,
-   perform the Pyenv package removal. For instance, for Homebrew:
+        rm -rf `pyenv root`

-   ```
-   brew uninstall pyenv
-   ```
+   If you've installed pyenv using a package manager, as a final step
+   perform the pyenv package removal. For instance, for Homebrew:
+
+        brew uninstall pyenv
+
+## Command Reference
+
+### Homebrew on Mac OS X
+
+You can also install pyenv using the [Homebrew](http://brew.sh)
+package manager for Mac OS X.
+
+    $ brew update
+    $ brew install pyenv
+
+
+To upgrade pyenv in the future, use `upgrade` instead of `install`.
+
+After installation, you'll need to add `eval "$(pyenv init -)"` to your profile (as stated in the caveats displayed by Homebrew — to display them again, use `brew info pyenv`). You only need to add that to your profile once.
+
+Then follow the rest of the post-installation steps under "Basic GitHub Checkout" above, starting with #4 ("restart your shell so the path changes take effect").

 ### Advanced Configuration

@@ -423,19 +291,16 @@ Skip this section unless you must know what every line in your shell
 profile is doing.

 `pyenv init` is the only command that crosses the line of loading
-extra commands into your shell. Coming from RVM, some of you might be
-opposed to this idea. Here's what `pyenv init` actually does.
-Step 1 is done by `eval "$(pyenv init --path)"`, the others are done by
-`eval "$(pyenv init -)"`.
-
+extra commands into your shell. Coming from rvm, some of you might be
+opposed to this idea. Here's what `pyenv init` actually does:

 1. **Sets up your shims path.** This is the only requirement for pyenv to
   function properly. You can do this by hand by prepending
-   `$(pyenv root)/shims` to your `$PATH`.
+   `~/.pyenv/shims` to your `$PATH`.

 2. **Installs autocompletion.** This is entirely optional but pretty
-   useful. Sourcing `$(pyenv root)/completions/pyenv.bash` will set that
-   up. There is also a `$(pyenv root)/completions/pyenv.zsh` for Zsh
+   useful. Sourcing `~/.pyenv/completions/pyenv.bash` will set that
+   up. There is also a `~/.pyenv/completions/pyenv.zsh` for Zsh
   users.

 3. **Rehashes shims.** From time to time you'll need to rebuild your
@@ -449,19 +314,13 @@ Step 1 is done by `eval "$(pyenv init --path)"`, the others are done by
   for some reason you need `pyenv` to be a real script rather than a
   shell function, you can safely skip it.

-To see exactly what happens under the hood for yourself, run `pyenv init -`
-or `pyenv init --path`.
+To see exactly what happens under the hood for yourself, run `pyenv init -`.

-If you don't want to use `pyenv init` and shims, you can still benefit
-from pyenv's ability to install Python versions for you. Just run
-`pyenv install` and you will find versions installed in
-`$(pyenv root)/versions`, which you can manually execute or symlink
-as required.

 ### Uninstalling Python Versions

 As time goes on, you will accumulate Python versions in your
-`$(pyenv root)/versions` directory.
+`~/.pyenv/versions` directory.

 To remove old Python versions, `pyenv uninstall` command to automate
 the removal process.
@@ -487,37 +346,26 @@ You can affect how pyenv operates with the following settings:

 name | default | description
 -----|---------|------------
-`PYENV_VERSION` | | Specifies the Python version to be used.<br>Also see [`pyenv shell`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-shell)
+`PYENV_VERSION` | | Specifies the Python version to be used.<br>Also see [`pyenv shell`](#pyenv-shell)
 `PYENV_ROOT` | `~/.pyenv` | Defines the directory under which Python versions and shims reside.<br>Also see `pyenv root`
 `PYENV_DEBUG` | | Outputs debug information.<br>Also as: `pyenv --debug <subcommand>`
 `PYENV_HOOK_PATH` | [_see wiki_][hooks] | Colon-separated list of paths searched for pyenv hooks.
 `PYENV_DIR` | `$PWD` | Directory to start searching for `.python-version` files.
-`PYTHON_BUILD_ARIA2_OPTS` | | Used to pass additional parameters to [`aria2`](https://aria2.github.io/).<br>If the `aria2c` binary is available on PATH, pyenv uses `aria2c` instead of `curl` or `wget` to download the Python Source code. If you have an unstable internet connection, you can use this variable to instruct `aria2` to accelerate the download.<br>In most cases, you will only need to use `-x 10 -k 1M` as value to `PYTHON_BUILD_ARIA2_OPTS` environment variable
-
-

 ## Development

 The pyenv source code is [hosted on
-GitHub](https://github.com/pyenv/pyenv).  It's clean, modular,
+GitHub](https://github.com/yyuu/pyenv).  It's clean, modular,
 and easy to understand, even if you're not a shell hacker.

-Tests are executed using [Bats](https://github.com/bats-core/bats-core):
+Tests are executed using [Bats](https://github.com/sstephenson/bats):

-    bats test
-    bats/test/<file>.bats
+    $ bats test
+    $ bats/test/<file>.bats

 Please feel free to submit pull requests and file bugs on the [issue
-tracker](https://github.com/pyenv/pyenv/issues).
+tracker](https://github.com/yyuu/pyenv/issues).


-  [pyenv-virtualenv]: https://github.com/pyenv/pyenv-virtualenv#readme
-  [hooks]: https://github.com/pyenv/pyenv/wiki/Authoring-plugins#pyenv-hooks
-
-### Version History
-
-See [CHANGELOG.md](CHANGELOG.md).
-
-### License
-
-[The MIT License](LICENSE)
+  [pyenv-virtualenv]: https://github.com/yyuu/pyenv-virtualenv#readme
+  [hooks]: https://github.com/yyuu/pyenv/wiki/Authoring-plugins#pyenv-hooks
--- a/completions/pyenv.fish
+++ b/completions/pyenv.fish
@@ -18,6 +18,5 @@ end

 complete -f -c pyenv -n '__fish_pyenv_needs_command' -a '(pyenv commands)'
 for cmd in (pyenv commands)
-  complete -f -c pyenv -n "__fish_pyenv_using_command $cmd" -a \
-    "(pyenv completions (commandline -opc)[2..-1])"
+  complete -f -c pyenv -n "__fish_pyenv_using_command $cmd" -a "(pyenv completions $cmd)"
 end
--- a/libexec/pyenv
+++ b/libexec/pyenv
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -e
+unset CDPATH

 if [ "$1" = "--debug" ]; then
  export PYENV_DEBUG=1
@@ -7,8 +8,7 @@ if [ "$1" = "--debug" ]; then
 fi

 if [ -n "$PYENV_DEBUG" ]; then
-  # https://wiki-dev.bash-hackers.org/scripting/debuggingtips#making_xtrace_more_useful
-  export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
+  export PS4='+ [${BASH_SOURCE##*/}:${LINENO}] '
  set -x
 fi

@@ -22,14 +22,13 @@ abort() {

 if enable -f "${BASH_SOURCE%/*}"/../libexec/pyenv-realpath.dylib realpath 2>/dev/null; then
  abs_dirname() {
-    local path
-    path="$(realpath "$1")"
+    local path="$(realpath "$1")"
    echo "${path%/*}"
  }
 else
  [ -z "$PYENV_NATIVE_EXT" ] || abort "failed to load \`realpath' builtin"

-  READLINK=$(type -P greadlink readlink | head -1)
+  READLINK=$(type -p greadlink readlink | head -1)
  [ -n "$READLINK" ] || abort "cannot find readlink - are you missing GNU coreutils?"

  resolve_link() {
@@ -37,21 +36,17 @@ else
  }

  abs_dirname() {
+    local cwd="$PWD"
    local path="$1"

-    # Use a subshell to avoid changing the current path
-    (
    while [ -n "$path" ]; do
-      cd_path="${path%/*}"
-      if [[ "$cd_path" != "$path" ]]; then
-        cd "$cd_path"
-      fi
-      name="${path##*/}"
+      cd "${path%/*}"
+      local name="${path##*/}"
      path="$(resolve_link "$name" || true)"
    done

-    echo "$PWD"
-    )
+    pwd
+    cd "$cwd"
  }
 fi

@@ -62,25 +57,33 @@ else
 fi
 export PYENV_ROOT

+# Transfer PYENV_FILE_ARG (from shims) into PYENV_DIR.
+if [ -z "${PYENV_DIR}" ]; then
+  if [ -n "${PYENV_FILE_ARG}" ]; then
+    if [ -L "${PYENV_FILE_ARG}" ]; then
+      PYENV_DIR="$(abs_dirname "${PYENV_FILE_ARG}")"
+    else
+      PYENV_DIR="${PYENV_FILE_ARG%/*}"
+    fi
+    export PYENV_DIR
+    unset PYENV_FILE_ARG
+  fi
+fi
+
 if [ -z "${PYENV_DIR}" ]; then
  PYENV_DIR="$PWD"
+else
+  cd "$PYENV_DIR" 2>/dev/null || abort "cannot change working directory to \`$PYENV_DIR'"
+  PYENV_DIR="$PWD"
+  cd "$OLDPWD"
 fi
-
-if [ ! -d "$PYENV_DIR" ] || [ ! -e "$PYENV_DIR" ]; then
-  abort "cannot change working directory to \`$PYENV_DIR'"
-fi
-
-PYENV_DIR=$(cd "$PYENV_DIR" && echo "$PWD")
 export PYENV_DIR


 shopt -s nullglob

 bin_path="$(abs_dirname "$0")"
-for plugin_bin in "${bin_path%/*}"/plugins/*/bin; do
-  PATH="${plugin_bin}:${PATH}"
-done
-for plugin_bin in "${PYENV_ROOT}"/plugins/*/bin; do
+for plugin_bin in "${PYENV_ROOT}/plugins/"*/bin; do
  PATH="${plugin_bin}:${PATH}"
 done
 export PATH="${bin_path}:${PATH}"
@@ -115,13 +118,7 @@ case "$command" in
  ;;
 * )
  command_path="$(command -v "pyenv-$command" || true)"
-  if [ -z "$command_path" ]; then
-    if [ "$command" == "shell" ]; then
-      abort "shell integration not enabled. Run \`pyenv init' for instructions."
-    else
-      abort "no such command \`$command'"
-    fi
-  fi
+  [ -n "$command_path" ] || abort "no such command \`$command'"

  shift 1
  if [ "$1" = --help ]; then
--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-version="2.0.3"
+version="1.0.1"
 git_revision=""

 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
--- a/libexec/pyenv-commands
+++ b/libexec/pyenv-commands
@@ -28,15 +28,15 @@ shopt -s nullglob
    for command in "${path}/pyenv-"*; do
      command="${command##*pyenv-}"
      if [ -n "$sh" ]; then
-        if [ "${command:0:3}" = "sh-" ]; then
-          echo "${command##sh-}"
+        if [ ${command:0:3} = "sh-" ]; then
+          echo ${command##sh-}
        fi
      elif [ -n "$nosh" ]; then
-        if [ "${command:0:3}" != "sh-" ]; then
-          echo "${command##sh-}"
+        if [ ${command:0:3} != "sh-" ]; then
+          echo ${command##sh-}
        fi
      else
-        echo "${command##sh-}"
+        echo ${command##sh-}
      fi
    done
  done
--- a/libexec/pyenv-exec
+++ b/libexec/pyenv-exec
@@ -41,8 +41,7 @@ for script in "${scripts[@]}"; do
 done

 shift 1
-if [ "${PYENV_BIN_PATH#${PYENV_ROOT}}" != "${PYENV_BIN_PATH}" ]; then
-  # Only add to $PATH for non-system version.
-  export PATH="${PYENV_BIN_PATH}:${PATH}"
-fi
-exec "$PYENV_COMMAND_PATH" "$@"
+# CPython's `sys.executable` requires the `PYENV_BIN_PATH` to be at the top of the `PATH`.
+# https://github.com/yyuu/pyenv/issues/98
+export PATH="${PYENV_BIN_PATH}:${PATH}"
+exec -a "$PYENV_COMMAND" "$PYENV_COMMAND_PATH" "$@"
--- a/libexec/pyenv-global
+++ b/libexec/pyenv-global
@@ -1,24 +1,16 @@
 #!/usr/bin/env bash
 #
-# Summary: Set or show the global Python version(s)
+# Summary: Set or show the global Python version
 #
-# Usage: pyenv global <version> <version2> <..>
+# Usage: pyenv global <version>
 #
-# Sets the global Python version(s). You can override the global version at
+# Sets the global Python version. You can override the global version at
 # any time by setting a directory-specific version with `pyenv local'
 # or by setting the `PYENV_VERSION' environment variable.
 #
-# <version> can be specified multiple times and should be a version
-# tag known to pyenv.  The special version string `system' will use
-# your default system Python.  Run `pyenv versions' for a list of
-# available Python versions.
-#
-# Example: To enable the python2.7 and python3.7 shims to find their
-#          respective executables you could set both versions with:
-#
-# 'pyenv global 3.7.0 2.7.15'
-#
-
+# <version> should be a string matching a Python version known to pyenv.
+# The special version string `system' will use your default system Python.
+# Run `pyenv versions' for a list of available Python versions.

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
--- a/libexec/pyenv-help
+++ b/libexec/pyenv-help
@@ -27,8 +27,6 @@ command_path() {
 }

 extract_initial_comment_block() {
-  LC_ALL= \
-  LC_CTYPE=C \
  sed -ne "
    /^#/ !{
      q
@@ -44,8 +42,7 @@ extract_initial_comment_block() {
 }

 collect_documentation() {
-  # shellcheck disable=SC2016
-  $(type -P gawk awk | head -1) '
+  $(type -p gawk awk | head -1) '
    /^Summary:/ {
      summary = substr($0, 10)
      next
@@ -89,8 +86,7 @@ collect_documentation() {
 }

 documentation_for() {
-  local filename
-  filename="$(command_path "$1")"
+  local filename="$(command_path "$1")"
  if [ -n "$filename" ]; then
    extract_initial_comment_block < "$filename" | collect_documentation
  fi
@@ -118,7 +114,7 @@ print_help() {
  eval "$(documentation_for "$command")"
  [ -n "$help" ] || help="$summary"

-  if [ -n "$usage" ] || [ -n "$summary" ]; then
+  if [ -n "$usage" -o -n "$summary" ]; then
    if [ -n "$usage" ]; then
      echo "$usage"
    else
@@ -153,10 +149,10 @@ if [ -z "$1" ] || [ "$1" == "pyenv" ]; then
  [ -z "$usage" ] || exit
  echo
  echo "Some useful pyenv commands are:"
-  print_summaries $(exec pyenv-commands | sort -u)
+  print_summaries commands local global shell install uninstall rehash version versions which whence
  echo
  echo "See \`pyenv help <command>' for information on a specific command."
-  echo "For full documentation, see: https://github.com/pyenv/pyenv#readme"
+  echo "For full documentation, see: https://github.com/yyuu/pyenv#readme"
 else
  command="$1"
  if [ -n "$(command_path "$command")" ]; then
--- a/libexec/pyenv-hooks
+++ b/libexec/pyenv-hooks
@@ -26,7 +26,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; th
    echo "pyenv: failed to load \`realpath' builtin" >&2
    exit 1
  fi
-READLINK=$(type -P greadlink readlink | head -1)
+READLINK=$(type -p greadlink readlink | head -1)
 if [ -z "$READLINK" ]; then
  echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
  exit 1
@@ -37,10 +37,10 @@ resolve_link() {
 }

 realpath() {
+  local cwd="$PWD"
  local path="$1"
  local name
-  # Use a subshell to avoid changing the current path
-  (
+
  while [ -n "$path" ]; do
    name="${path##*/}"
    [ "$name" = "$path" ] || cd "${path%/*}"
@@ -48,7 +48,7 @@ realpath() {
  done

  echo "${PWD}/$name"
-  )
+  cd "$cwd"
 }
 fi

--- a/libexec/pyenv-init
+++ b/libexec/pyenv-init
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Summary: Configure the shell environment for pyenv
-# Usage: eval "$(pyenv init [-|--path] [--no-rehash] [<shell>])"
+# Usage: eval "$(pyenv init - [--no-rehash] [<shell>])"

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -8,7 +8,6 @@ set -e
 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
  echo -
-  echo --path
  echo --no-rehash
  echo bash
  echo fish
@@ -17,20 +16,15 @@ if [ "$1" = "--complete" ]; then
  exit
 fi

-mode="help"
+print=""
 no_rehash=""
 for args in "$@"
 do
  if [ "$args" = "-" ]; then
-    mode="print"
+    print=1
    shift
  fi

-  if [ "$args" = "--path" ]; then
-    mode="path"
-    shift
-  fi
-  
  if [ "$args" = "--no-rehash" ]; then
    no_rehash=1
    shift
@@ -44,209 +38,120 @@ if [ -z "$shell" ]; then
  shell="${shell##-}"
  shell="${shell:-$SHELL}"
  shell="${shell##*/}"
-  shell="${shell%%-*}"
 fi

 root="${0%/*}/.."

-function main() {
-  case "$mode" in
-  "help")
-    help_
-    exit 1
-    ;;
-  "path")
-    print_path
-    exit 0
-    ;;
-  "print")
-    init_dirs
-    print_env
-    print_completion
-    print_shell_function
-    exit 0
-    ;;
-  esac
-  # should never get here
-  exit 2
-}
-
-function help_() {
+if [ -z "$print" ]; then
  case "$shell" in
  bash )
-    profile='~/.bash_profile'
-    rc='~/.bashrc'
+    if [ -f "${HOME}/.bashrc" ] && [ ! -f "${HOME}/.bash_profile" ]; then
+      profile='~/.bashrc'
+    else
+      profile='~/.bash_profile'
+    fi
    ;;
  zsh )
-    profile='~/.zprofile'
-    rc='~/.zshrc'
+    profile='~/.zshrc'
    ;;
  ksh )
    profile='~/.profile'
-    rc='~/.profile'
+    ;;
+  fish )
+    profile='~/.config/fish/config.fish'
    ;;
  * )
-    profile='your shell'\''s login startup file'
-    rc='your shell'\''s interactive startup file'
+    profile='your profile'
    ;;
  esac

-  {
+  { echo "# Load pyenv automatically by appending"
+    echo "# the following to ${profile}:"
    echo
-    echo '# (The below instructions are intended for common'
-    echo '# shell setups. See the README for more guidance'
-    echo '# if they don'\''t apply and/or don'\''t work for you.)'
-    echo 
    case "$shell" in
    fish )
-      echo "# Add pyenv executable to PATH by running"
-      echo "# the following interactively:"
-      echo
-      echo 'set -Ux PYENV_ROOT $HOME/.pyenv'
-      echo 'set -U fish_user_paths $PYENV_ROOT/bin $fish_user_paths'
-      echo
-      echo "# Load pyenv automatically by appending"
-      echo "# the following to ~/.config/fish/config.fish:"
-      echo
-      echo 'status is-interactive; and pyenv init --path | source'
-      echo 'pyenv init - | source'
-      echo
-      echo "# If fish is not your login shell,"
-      echo "# add the following to ~/.profile:"
-      echo
-      echo 'export PYENV_ROOT="$HOME/.pyenv"'
-      echo 'export PATH="$PYENV_ROOT/bin:$PATH"'
-      echo 'eval "$(pyenv init --path)"'
-      echo
+      echo 'status --is-interactive; and source (pyenv init -|psub)'
      ;;
    * )
-      echo '# Add pyenv executable to PATH and'
-      echo '# enable shims by adding the following'
-      case "$shell" in
-      bash|ksh )
-        echo '# to ~/.profile:'
-        ;;
-      * )
-        echo '# to ~/.profile and '"${profile}"':'
-        ;;
-      esac
-      echo
-      echo 'export PYENV_ROOT="$HOME/.pyenv"'
-      echo 'export PATH="$PYENV_ROOT/bin:$PATH"'
-      echo 'eval "$(pyenv init --path)"'
-      echo
-      if [[ $shell == "bash" ]]; then
-        echo '# If your ~/.profile sources '"${rc}"','
-        echo '# the lines need to be inserted before the part'
-        echo '# that does that. See the README for another option.'
-        echo
-        echo '# If you have '"${profile}"', make sure that it'
-        echo '# also executes the above lines -- e.g. by'
-        echo '# copying them there or by sourcing ~/.profile'
-        echo
-      fi
-      echo "# Load pyenv into the shell by adding"
-      echo "# the following to ${rc}:"
-      echo
      echo 'eval "$(pyenv init -)"'
-      echo
-      echo '# Make sure to restart your entire logon session'
-      echo '# for changes to profile files to take effect.'
-      echo
      ;;
    esac
+    echo
  } >&2
-}

-function init_dirs() {
-  mkdir -p "${PYENV_ROOT}/"{shims,versions}
-}
+  exit 1
+fi

-function print_path() {
-  # Need to use the login shell rather than the current one
+mkdir -p "${PYENV_ROOT}/"{shims,versions}
+
+case "$shell" in
+fish )
+  echo "setenv PATH '${PYENV_ROOT}/shims' \$PATH"
+  echo "setenv PYENV_SHELL $shell"
+;;
+* )
+  echo 'export PATH="'${PYENV_ROOT}'/shims:${PATH}"'
+  echo "export PYENV_SHELL=$shell"
+;;
+esac
+
+completion="${root}/completions/pyenv.${shell}"
+if [ -r "$completion" ]; then
  case "$shell" in
-    fish )
-      echo "set -gx PATH '${PYENV_ROOT}/shims' \$PATH"
-      ;;
-    * )
-      echo 'export PATH="'${PYENV_ROOT}'/shims:${PATH}"'
-      ;;
+  fish ) echo ". '$completion'" ;;
+  *    ) echo "source '$completion'" ;;
  esac
-}
+fi

-function print_env() {
-  case "$shell" in
-  fish )
-    echo "set -gx PYENV_SHELL $shell"
-    ;;
-  * )
-    echo "export PYENV_SHELL=$shell"
-    ;;
-  esac
-}
+if [ -z "$no_rehash" ]; then
+  echo 'command pyenv rehash 2>/dev/null'
+fi

-function print_completion() {
-  completion="${root}/completions/pyenv.${shell}"
-  if [ -r "$completion" ]; then
-    echo "source '$completion'"
-  fi
-
-  if [ -z "$no_rehash" ]; then
-    echo 'command pyenv rehash 2>/dev/null'
-  fi
-}
-
-function print_shell_function() {
-  commands=(`pyenv-commands --sh`)
-  case "$shell" in
-  fish )
-    cat <<EOS
+commands=(`pyenv-commands --sh`)
+case "$shell" in
+fish )
+  cat <<EOS
 function pyenv
  set command \$argv[1]
  set -e argv[1]

  switch "\$command"
  case ${commands[*]}
-    source (pyenv "sh-\$command" \$argv|psub)
+    . (pyenv "sh-\$command" \$argv|psub)
  case '*'
    command pyenv "\$command" \$argv
  end
 end
 EOS
-    ;;
-  ksh )
-    cat <<EOS
+  ;;
+ksh )
+  cat <<EOS
 function pyenv {
  typeset command
 EOS
-    ;;
-  * )
-    cat <<EOS
+  ;;
+* )
+  cat <<EOS
 pyenv() {
  local command
 EOS
-    ;;
-  esac
+  ;;
+esac

-  if [ "$shell" != "fish" ]; then
-    IFS="|"
-    cat <<EOS
-  command="\${1:-}"
+if [ "$shell" != "fish" ]; then
+IFS="|"
+cat <<EOS
+  command="\$1"
  if [ "\$#" -gt 0 ]; then
    shift
  fi

  case "\$command" in
  ${commands[*]})
-    eval "\$(pyenv "sh-\$command" "\$@")"
-    ;;
+    eval "\$(pyenv "sh-\$command" "\$@")";;
  *)
-    command pyenv "\$command" "\$@"
-    ;;
+    command pyenv "\$command" "\$@";;
  esac
 }
 EOS
-  fi
-}
-
-main
+fi
--- a/libexec/pyenv-local
+++ b/libexec/pyenv-local
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 #
-# Summary: Set or show the local application-specific Python version(s)
+# Summary: Set or show the local application-specific Python version
 #
-# Usage: pyenv local <version> <version2> <..>
+# Usage: pyenv local <version>
 #        pyenv local --unset
 #
-# Sets the local application-specific Python version(s) by writing the
+# Sets the local application-specific Python version by writing the
 # version name to a file named `.python-version'.
 #
 # When you run a Python command, pyenv will look for a `.python-version'
@@ -15,16 +15,9 @@
 # `PYENV_VERSION' environment variable takes precedence over local
 # and global versions.
 #
-# <version> can be specified multiple times and should be a version
-# tag known to pyenv.  The special version string `system' will use
-# your default system Python.  Run `pyenv versions' for a list of
-# available Python versions.
-#
-# Example: To enable the python2.7 and python3.7 shims to find their
-#          respective executables you could set both versions with:
-#
-# 'pyenv local 3.7.0 2.7.15'
-
+# <version> should be a string matching a Python version known to pyenv.
+# The special version string `system' will use your default system Python.
+# Run `pyenv versions' for a list of available Python versions.

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
--- a/libexec/pyenv-prefix
+++ b/libexec/pyenv-prefix
@@ -30,9 +30,7 @@ OLDIFS="$IFS"
 { IFS=:
  for version in ${PYENV_VERSION}; do
    if [ "$version" = "system" ]; then
-      if PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python 2>/dev/null)" || \
-          PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python3 2>/dev/null)" || \
-          PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python2 2>/dev/null)"; then
+      if PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python 2>/dev/null)"; then
        PYENV_PREFIX_PATH="${PYTHON_PATH%/bin/*}"
        PYENV_PREFIX_PATH="${PYENV_PREFIX_PATH:-/}"
      else
--- a/libexec/pyenv-rehash
+++ b/libexec/pyenv-rehash
@@ -10,52 +10,30 @@ PROTOTYPE_SHIM_PATH="${SHIM_PATH}/.pyenv-shim"
 # Create the shims directory if it doesn't already exist.
 mkdir -p "$SHIM_PATH"

-acquire_lock() {
-  # Ensure only one instance of pyenv-rehash is running at a time by
-  # setting the shell's `noclobber` option and attempting to write to
-  # the prototype shim file. If the file already exists, print a warning
-  # to stderr and exit with a non-zero status.
-  local ret
-  set -o noclobber
-  echo > "$PROTOTYPE_SHIM_PATH" 2>| /dev/null || ret=1
-  set +o noclobber
-  [ -z "${ret}" ]
-}
+# Ensure only one instance of pyenv-rehash is running at a time by
+# setting the shell's `noclobber` option and attempting to write to
+# the prototype shim file. If the file already exists, print a warning
+# to stderr and exit with a non-zero status.
+set -o noclobber
+{ echo > "$PROTOTYPE_SHIM_PATH"
+} 2>/dev/null ||
+{ if [ -w "$SHIM_PATH" ]; then
+    echo "pyenv: cannot rehash: $PROTOTYPE_SHIM_PATH exists"
+  else
+    echo "pyenv: cannot rehash: $SHIM_PATH isn't writable"
+  fi
+  exit 1
+} >&2
+set +o noclobber

 # If we were able to obtain a lock, register a trap to clean up the
 # prototype shim when the process exits.
-trap release_lock EXIT
+trap remove_prototype_shim EXIT

 remove_prototype_shim() {
  rm -f "$PROTOTYPE_SHIM_PATH"
 }

-release_lock() {
-  remove_prototype_shim
-}
-
-if [ ! -w "$SHIM_PATH" ]; then
-  echo "pyenv: cannot rehash: $SHIM_PATH isn't writable"
-  exit 1
-fi
-
-unset acquired
-start=$SECONDS
-while (( SECONDS <= start + ${PYENV_REHASH_TIMEOUT:-60} )); do
-  if acquire_lock 2>/dev/null; then
-    acquired=1
-    break
-  else
-    # POSIX sleep(1) doesn't provide subsecond precision, but many others do
-    sleep 0.1 2>/dev/null || sleep 1
-  fi
-done
-
-if [ -z "${acquired}" ]; then
-  echo "pyenv: cannot rehash: $PROTOTYPE_SHIM_PATH exists"
-  exit 1
-fi
-
 # The prototype shim file is a script that re-execs itself, passing
 # its filename and any arguments to `pyenv exec`. This file is
 # hard-linked for every executable and then removed. The linking
@@ -68,6 +46,19 @@ set -e
 [ -n "\$PYENV_DEBUG" ] && set -x

 program="\${0##*/}"
+if [[ "\$program" = "python"* ]]; then
+  for arg; do
+    case "\$arg" in
+    -c* | -- ) break ;;
+    */* )
+      if [ -f "\$arg" ]; then
+        export PYENV_FILE_ARG="\$arg"
+        break
+      fi
+      ;;
+    esac
+  done
+fi

 export PYENV_ROOT="$PYENV_ROOT"
 exec "$(command -v pyenv)" exec "\$program" "\$@"
@@ -92,7 +83,7 @@ remove_outdated_shims() {
 list_executable_names() {
  local version file
  pyenv-versions --bare --skip-aliases | \
-  while read -r version; do
+  while read version; do
    for file in "${PYENV_ROOT}/versions/${version}/bin/"*; do
      echo "${file##*/}"
    done
@@ -110,62 +101,34 @@ make_shims() {
  done
 }

-if ((${BASH_VERSINFO[0]} > 3)); then
+registered_shims=" "

-  declare -A registered_shims
+# Registers the name of a shim to be generated.
+register_shim() {
+  registered_shims="${registered_shims}${1} "
+}

-  # Registers the name of a shim to be generated.
-  register_shim() {
-    registered_shims["$1"]=1
-  }
+# Install all the shims registered via `make_shims` or `register_shim` directly.
+install_registered_shims() {
+  local shim file
+  for shim in $registered_shims; do
+    file="${SHIM_PATH}/${shim}"
+    [ -e "$file" ] || cp "$PROTOTYPE_SHIM_PATH" "$file"
+  done
+}

-  # Install all shims registered via `make_shims` or `register_shim` directly.
-  install_registered_shims() {
-    local shim file
-    for shim in "${!registered_shims[@]}"; do
-      file="${SHIM_PATH}/${shim}"
-      [ -e "$file" ] || cp "$PROTOTYPE_SHIM_PATH" "$file"
-    done
-  }
-
-  # Once the registered shims have been installed, we make a second pass
-  # over the contents of the shims directory. Any file that is present
-  # in the directory but has not been registered as a shim should be
-  # removed.
-  remove_stale_shims() {
-    local shim
-    for shim in "$SHIM_PATH"/*; do
-      if [[ ! ${registered_shims["${shim##*/}"]} ]]; then
-        rm -f "$shim"
-      fi
-    done
-  }
-
-else # Same for bash < 4.
-
-    registered_shims=" "
-
-    register_shim() {
-      registered_shims="${registered_shims}${1} "
-    }
-
-    install_registered_shims() {
-      local shim file
-      for shim in $registered_shims; do
-        file="${SHIM_PATH}/${shim}"
-        [ -e "$file" ] || cp "$PROTOTYPE_SHIM_PATH" "$file"
-      done
-    }
-
-    remove_stale_shims() {
-      local shim
-      for shim in "$SHIM_PATH"/*; do
-        if [[ "$registered_shims" != *" ${shim##*/} "* ]]; then
-          rm -f "$shim"
-        fi
-      done
-    }
-fi
+# Once the registered shims have been installed, we make a second pass
+# over the contents of the shims directory. Any file that is present
+# in the directory but has not been registered as a shim should be
+# removed.
+remove_stale_shims() {
+  local shim
+  for shim in "$SHIM_PATH"/*; do
+    if [[ "$registered_shims" != *" ${shim##*/} "* ]]; then
+      rm -f "$shim"
+    fi
+  done
+}

 shopt -s nullglob

@@ -173,7 +136,6 @@ shopt -s nullglob
 # executables.
 create_prototype_shim
 remove_outdated_shims
-# shellcheck disable=SC2046
 make_shims $(list_executable_names | sort -u)


--- a/libexec/pyenv-root
+++ b/libexec/pyenv-root
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 # Summary: Display the root directory where versions and shims are kept
-echo "$PYENV_ROOT"
+echo $PYENV_ROOT
--- a/libexec/pyenv-sh-shell
+++ b/libexec/pyenv-sh-shell
@@ -2,8 +2,7 @@
 #
 # Summary: Set or show the shell-specific Python version
 #
-# Usage: pyenv shell <version>...
-#        pyenv shell -
+# Usage: pyenv shell <version>
 #        pyenv shell --unset
 #
 # Sets a shell-specific Python version by setting the `PYENV_VERSION'
@@ -13,11 +12,6 @@
 # <version> should be a string matching a Python version known to pyenv.
 # The special version string `system' will use your default system Python.
 # Run `pyenv versions' for a list of available Python versions.
-#
-# When `-` is passed instead of the version string, the previously set
-# version will be restored. With `--unset`, the `PYENV_VERSION`
-# environment variable gets unset, restoring the environment to the
-# state before the first `pyenv shell` call.

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -37,7 +31,7 @@ if [ -z "$versions" ]; then
    echo "pyenv: no shell-specific version configured" >&2
    exit 1
  else
-    echo 'echo "$PYENV_VERSION"'
+    echo "echo \"\$PYENV_VERSION\""
    exit
  fi
 fi
@@ -45,76 +39,28 @@ fi
 if [ "$versions" = "--unset" ]; then
  case "$shell" in
  fish )
-    echo 'set -gu PYENV_VERSION_OLD "$PYENV_VERSION"'
    echo "set -e PYENV_VERSION"
    ;;
  * )
-    echo 'PYENV_VERSION_OLD="${PYENV_VERSION-}"'
    echo "unset PYENV_VERSION"
    ;;
  esac
  exit
 fi

-if [ "$versions" = "-" ]; then
-  case "$shell" in
-  fish )
-    cat <<EOS
-if set -q PYENV_VERSION_OLD
-  if [ -n "\$PYENV_VERSION_OLD" ]
-    set PYENV_VERSION_OLD_ "\$PYENV_VERSION"
-    set -gx PYENV_VERSION "\$PYENV_VERSION_OLD"
-    set -gu PYENV_VERSION_OLD "\$PYENV_VERSION_OLD_"
-    set -e PYENV_VERSION_OLD_
-  else
-    set -gu PYENV_VERSION_OLD "\$PYENV_VERSION"
-    set -e PYENV_VERSION
-  end
-else
-  echo "pyenv: PYENV_VERSION_OLD is not set" >&2
-  false
-end
-EOS
-    ;;
-  * )
-    cat <<EOS
-if [ -n "\${PYENV_VERSION_OLD+x}" ]; then
-  if [ -n "\$PYENV_VERSION_OLD" ]; then
-    PYENV_VERSION_OLD_="\$PYENV_VERSION"
-    export PYENV_VERSION="\$PYENV_VERSION_OLD"
-    PYENV_VERSION_OLD="\$PYENV_VERSION_OLD_"
-    unset PYENV_VERSION_OLD_
-  else
-    PYENV_VERSION_OLD="\$PYENV_VERSION"
-    unset PYENV_VERSION
-  fi
-else
-  echo "pyenv: PYENV_VERSION_OLD is not set" >&2
-  false
-fi
-EOS
-    ;;
-  esac
-  exit
-fi
-
 # Make sure the specified version is installed.
 if pyenv-prefix "${versions[@]}" >/dev/null; then
  OLDIFS="$IFS"
  IFS=: version="${versions[*]}"
  IFS="$OLDIFS"
-  if [ "$version" != "$PYENV_VERSION" ]; then
-    case "$shell" in
-    fish )
-      echo 'set -gu PYENV_VERSION_OLD "$PYENV_VERSION"'
-      echo "set -gx PYENV_VERSION \"$version\""
-      ;;
-    * )
-      echo 'PYENV_VERSION_OLD="${PYENV_VERSION-}"'
-      echo "export PYENV_VERSION=\"${version}\""
-      ;;
-    esac
-  fi
+  case "$shell" in
+  fish )
+    echo "setenv PYENV_VERSION \"${version}\""
+    ;;
+  * )
+    echo "export PYENV_VERSION=\"${version}\""
+    ;;
+  esac
 else
  echo "false"
  exit 1
--- a/libexec/pyenv-version
+++ b/libexec/pyenv-version
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-# Summary: Show the current Python version(s) and its origin
+# Summary: Show the current Python version and its origin
 #
-# Shows the currently selected Python version(s) and how it was
+# Shows the currently selected Python version and how it was
 # selected. To obtain only the version string, use `pyenv
 # version-name'.

--- a/libexec/pyenv-version-file
+++ b/libexec/pyenv-version-file
@@ -9,7 +9,7 @@ target_dir="$1"
 find_local_version_file() {
  local root="$1"
  while ! [[ "$root" =~ ^//[^/]*$ ]]; do
-    if [ -f "${root}/.python-version" ]; then
+    if [ -e "${root}/.python-version" ]; then
      echo "${root}/.python-version"
      return 0
    fi
--- a/libexec/pyenv-version-file-read
+++ b/libexec/pyenv-version-file-read
@@ -9,7 +9,7 @@ if [ -e "$VERSION_FILE" ]; then
  # Read the first non-whitespace word from the specified version file.
  # Be careful not to load it whole in case there's something crazy in it.
  IFS="${IFS}"$'\r'
-  words=($(cut -b 1-1024 "$VERSION_FILE" | sed -n 's/^[[:space:]]*\([^[:space:]#][^[:space:]]*\).*/\1/p'))
+  words=($(cut -b 1-1024 "$VERSION_FILE" | sed 's/^\s*\(\S\+\).*/\1/'))
  versions=("${words[@]}")

  if [ -n "$versions" ]; then
--- a/libexec/pyenv-versions
+++ b/libexec/pyenv-versions
@@ -33,7 +33,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; th
    exit 1
  fi

-  READLINK=$(type -P greadlink readlink | head -1)
+  READLINK=$(type -p greadlink readlink | head -1)
  if [ -z "$READLINK" ]; then
    echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
    exit 1
@@ -44,11 +44,10 @@ if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; th
  }

  realpath() {
+    local cwd="$PWD"
    local path="$1"
    local name

-    # Use a subshell to avoid changing the current path
-    (
    while [ -n "$path" ]; do
      name="${path##*/}"
      [ "$name" = "$path" ] || cd "${path%/*}"
@@ -56,7 +55,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; th
    done

    echo "${PWD}/$name"
-    )
+    cd "$cwd"
  }
 fi

@@ -64,27 +63,16 @@ if [ -d "$versions_dir" ]; then
  versions_dir="$(realpath "$versions_dir")"
 fi

-if ((${BASH_VERSINFO[0]} > 3)); then
-  declare -A current_versions
-else
-  current_versions=()
-fi
 if [ -n "$bare" ]; then
  hit_prefix=""
  miss_prefix=""
+  current_versions=()
  include_system=""
 else
  hit_prefix="* "
  miss_prefix="  "
  OLDIFS="$IFS"
-  IFS=:
-  if ((${BASH_VERSINFO[0]} > 3)); then
-    for i in $(pyenv-version-name || true); do
-      current_versions["$i"]="1"
-    done
-  else
-    current_versions=($(pyenv-version-name || true))
-  fi
+  IFS=: current_versions=($(pyenv-version-name || true))
  IFS="$OLDIFS"
  include_system="1"
 fi
@@ -104,9 +92,7 @@ exists() {
 }

 print_version() {
-  if [[ ${BASH_VERSINFO[0]} -ge 4 && ${current_versions["$1"]} ]]; then
-    echo "${hit_prefix}$1 (set by $(pyenv-version-origin))"
-  elif (( ${BASH_VERSINFO[0]} <= 3 )) && exists "$1" "${current_versions[@]}"; then
+  if exists "$1" "${current_versions[@]}"; then
    echo "${hit_prefix}$1 (set by $(pyenv-version-origin))"
  else
    echo "${miss_prefix}$1"
@@ -115,14 +101,11 @@ print_version() {
 }

 # Include "system" in the non-bare output, if it exists
-if [ -n "$include_system" ] && \
-    (PYENV_VERSION=system pyenv-which python >/dev/null 2>&1 || \
-     PYENV_VERSION=system pyenv-which python3 >/dev/null 2>&1 || \
-     PYENV_VERSION=system pyenv-which python2 >/dev/null 2>&1) ; then
+if [ -n "$include_system" ] && PYENV_VERSION=system pyenv-which python >/dev/null 2>&1; then
  print_version system
 fi

-shopt -s dotglob nullglob
+shopt -s nullglob
 for path in "$versions_dir"/*; do
  if [ -d "$path" ]; then
    if [ -n "$skip_aliases" ] && [ -L "$path" ]; then
@@ -139,7 +122,7 @@ for path in "$versions_dir"/*; do
    done
  fi
 done
-shopt -u dotglob nullglob
+shopt -u nullglob

 if [ "$num_versions" -eq 0 ] && [ -n "$include_system" ]; then
  echo "Warning: no Python detected on the system" >&2
--- a/libexec/pyenv-whence
+++ b/libexec/pyenv-whence
@@ -20,7 +20,7 @@ fi

 whence() {
  local command="$1"
-  pyenv-versions --bare | while read -r version; do
+  pyenv-versions --bare | while read version; do
    path="$(pyenv-prefix "$version")/bin/${command}"
    if [ -x "$path" ]; then
      [ "$print_paths" ] && echo "$path" || echo "$version"
--- a/libexec/pyenv-which
+++ b/libexec/pyenv-which
@@ -2,13 +2,10 @@
 #
 # Summary: Display the full path to an executable
 #
-# Usage: pyenv which <command> [--nosystem]
+# Usage: pyenv which <command>
 #
 # Displays the full path to the executable that pyenv will invoke when
 # you run the given command.
-# Use --nosystem argument in case when you don't need to search command in the 
-# system environment.
-#

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -18,16 +15,10 @@ if [ "$1" = "--complete" ]; then
  exec pyenv-shims --short
 fi

-if [ "$2" = "--nosystem" ]; then
-  system=""
-else
-  system="system"
-fi
-
 remove_from_path() {
  local path_to_remove="$1"
  local path_before
-  local result=":${PATH//\~/$HOME}:"
+  local result=":$PATH:"
  while [ "$path_before" != "$result" ]; do
    path_before="$result"
    result="${result//:$path_to_remove:/:}"
@@ -47,7 +38,7 @@ OLDIFS="$IFS"
 IFS=: versions=(${PYENV_VERSION:-$(pyenv-version-name)})
 IFS="$OLDIFS"

-for version in "${versions[@]}" "$system"; do
+for version in "${versions[@]}"; do
  if [ "$version" = "system" ]; then
    PATH="$(remove_from_path "${PYENV_ROOT}/shims")"
    PYENV_COMMAND_PATH="$(command -v "$PYENV_COMMAND" || true)"
@@ -91,8 +82,6 @@ else
      echo "The \`$1' command exists in these Python versions:"
      echo "$versions" | sed 's/^/  /g'
      echo
-      echo "Note: See 'pyenv help global' for tips on allowing both"
-      echo "      python2 and python3 to be found."
    } >&2
  fi

--- a/plugins/python-build/README.md
+++ b/plugins/python-build/README.md
@@ -1,22 +1,22 @@
 # python-build

-python-build is a [pyenv](https://github.com/pyenv/pyenv) plugin that
+python-build is a [pyenv](https://github.com/yyuu/pyenv) plugin that
 provides a `pyenv install` command to compile and install different versions
 of Python on UNIX-like systems.

 You can also use python-build without pyenv in environments where you need
 precise control over Python version installation.

-See the [list of releases](https://github.com/pyenv/pyenv/releases)
+See the [list of releases](https://github.com/yyuu/pyenv/releases)
 for changes in each version.


 ## Installation

-### Installing as a pyenv plugin (recommended)
+### Installing as an pyenv plugin (recommended)

-Since python-build is bundled with pyenv by
-default, you do not need to do anything.
+You need nothing to do since python-build is bundled with pyenv by
+default.

 ### Installing as a standalone program (advanced)

@@ -24,7 +24,7 @@ Installing python-build as a standalone program will give you access to the
 `python-build` command for precise control over Python version installation. If you
 have pyenv installed, you will also be able to use the `pyenv install` command.

-    git clone git://github.com/pyenv/pyenv.git
+    git clone git://github.com/yyuu/pyenv.git
    cd pyenv/plugins/python-build
    ./install.sh

@@ -55,7 +55,7 @@ Or, if you would like to install the latest development release:
 ## Usage

 Before you begin, you should ensure that your build environment has the proper
-system dependencies for compiling the wanted Python Version (see our [recommendations](https://github.com/pyenv/pyenv/wiki#suggested-build-environment)).
+system dependencies for compiling the wanted Python Version (see our [recommendations](https://github.com/yyuu/pyenv/wiki#suggested-build-environment)).

 ### Using `pyenv install` with pyenv

@@ -93,10 +93,10 @@ Both `pyenv install` and `python-build` accept a path to a custom definition fil
 in place of a version name. Custom definitions let you develop and install
 versions of Python that are not yet supported by python-build.

-See the [python-build built-in definitions](https://github.com/pyenv/pyenv/tree/master/plugins/python-build/share/python-build) as a starting point for
+See the [python-build built-in definitions](https://github.com/yyuu/pyenv/tree/master/plugins/python-build/share/python-build) as a starting point for
 custom definition files.

-[definitions]: https://github.com/pyenv/pyenv/tree/master/plugins/python-build/share/python-build
+[definitions]: https://github.com/yyuu/pyenv/tree/master/plugins/python-build/share/python-build

 ### Special environment variables

@@ -109,8 +109,6 @@ You can set certain environment variables to control the build process.
  downloaded package files.
 * `PYTHON_BUILD_MIRROR_URL` overrides the default mirror URL root to one of your
  choosing.
-* `PYTHON_BUILD_MIRROR_URL_SKIP_CHECKSUM`, if set, does not append the SHA2
-  checksum of the file to the mirror URL.
 * `PYTHON_BUILD_SKIP_MIRROR`, if set, forces python-build to download packages from
  their original source URLs instead of using a mirror.
 * `PYTHON_BUILD_ROOT` overrides the default location from where build definitions
@@ -126,7 +124,7 @@ You can set certain environment variables to control the build process.
 * `MAKE_OPTS` (or `MAKEOPTS`) lets you pass additional options to `make`.
 * `MAKE_INSTALL_OPTS` lets you pass additional options to `make install`.
 * `PYTHON_CONFIGURE_OPTS` and `PYTHON_MAKE_OPTS` and `PYTHON_MAKE_INSTALL_OPTS` allow
-  you to specify configure and make options for building CPython. These variables
+  you to specify configure and make options for buildling CPython. These variables
  will be passed to Python only, not any dependent packages (e.g. libyaml).

 ### Applying patches to Python before compiling
@@ -154,13 +152,13 @@ $ cat fix1.patch fix2.patch | pyenv install --patch 2.7.10
 You can build CPython with `--enable-shared` to install a version with
 shared object.

-If `--enable-shared` was found in `PYTHON_CONFIGURE_OPTS` or `CONFIGURE_OPTS`,
+If `--enabled-shared` was found in `PYTHON_CONFIGURE_OPTS` or `CONFIGURE_OPTS`,
 `python-build` will automatically set `RPATH` to the pyenv's prefix directory.
 This means you don't have to set `LD_LIBRARY_PATH` or `DYLD_LIBRARY_PATH` for
 the version(s) installed with `--enable-shared`.

 ```sh
-$ env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 2.7.9
+$ env PYTHON_CONFIGURE_OPTS="--enable-shared` pyenv install 2.7.9
 ```

 ### Checksum verification
@@ -177,17 +175,13 @@ definition. (All bundled definitions include checksums.)
 python-build will first attempt to download package files from a mirror hosted on
 GitHub Pages. If a package is not available on the mirror, if the mirror
 is down, or if the download is corrupt, python-build will fall back to the
-official URL specified in the definition file.
+official URL specified in the defintion file.

 You can point python-build to another mirror by specifying the
 `PYTHON_BUILD_MIRROR_URL` environment variable--useful if you'd like to run your
 own local mirror, for example. Package mirror URLs are constructed by joining
 this variable with the SHA2 checksum of the package file.

-If the mirror being used does not have the same checksum (*e.g.* with a
-pull-through cache like Artifactory), you can set the
-`PYTHON_BUILD_MIRROR_URL_SKIP_CHECKSUM` environment variable.
-
 If you don't have an SHA2 program installed, python-build will skip the download
 mirror and use official URLs instead. You can force python-build to bypass the
 mirror by setting the `PYTHON_BUILD_SKIP_MIRROR` environment variable.
@@ -219,58 +213,10 @@ variable when using `--keep` with `python-build`.

 ## Getting Help

-Please see the [pyenv wiki](https://github.com/pyenv/pyenv/wiki) for solutions to common problems.
+Please see the [pyenv wiki](https://github.com/yyuu/pyenv/wiki) for solutions to common problems.

-[wiki]: https://github.com/pyenv/pyenv/wiki
+[wiki]: https://github.com/yyuu/pyenv/wiki

 If you can't find an answer on the wiki, open an issue on the [issue
-tracker](https://github.com/pyenv/pyenv/issues). Be sure to include
+tracker](https://github.com/yyuu/pyenv/issues). Be sure to include
 the full build log for build failures.
-
-## Contributing
-
-### Testing new python versions
-
-If you are contributing a new python version for python-build, 
-you can test the build in a [docker](https://www.docker.com/) container based on Ubuntu 18.04.
-
-With docker installed:
-
-```sh
-docker build -t my_container .
-docker run my_container pyenv install <my_version>
-```
-
-To enter a shell which will allow you to build and then test a python version,
-replace the second line with
-
-```sh
-docker run -it my_container
-```
-
-The container will need to be rebuilt whenever you change the repo,
-but after the first build, this will be very fast, 
-as the layer including the build dependencies will be cached.
-
-Changes made inside the container will not be persisted.
-
-To test *all* new versions since a particular revision (e.g. `master`), `cd` to the root of your `pyenv` repo, and run this script:
-
-```sh
-set -e
-set -x
-
-docker build -t pyenv-test-container .
-
-git diff --name-only master \
-  | grep '^plugins/python-build/share/python-build/' \
-  | awk -F '/' '{print $NF}' \
-  | xargs -I _ docker run pyenv-test-container pyenv install _
-```
-
- Build the docker image with the **t**ag pyenv-test-container
- Look for the names files changed since revision `master`
- Filter out any which don't live where python-build keeps its build scripts
- Look only at the file name (i.e. the python version name)
- Run a new docker container for each, building that version
-
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -22,7 +22,7 @@
 #
 # For detailed information on installing Python versions with
 # python-build, including a list of environment variables for adjusting
-# compilation, see: https://github.com/pyenv/pyenv#readme
+# compilation, see: https://github.com/yyuu/pyenv#readme
 #
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -59,7 +59,7 @@ usage() {

 definitions() {
  local query="$1"
-  python-build --definitions | $(type -P ggrep grep | head -1) -F "$query" || true
+  python-build --definitions | $(type -p ggrep grep | head -1) -F "$query" || true
 }

 indent() {
@@ -160,7 +160,7 @@ if [ -d "${PREFIX}/bin" ]; then
    read -p "continue with installation? (y/N) "

    case "$REPLY" in
-    y | Y | yes | YES ) ;;
+    y* | Y* ) ;;
    * ) exit 1 ;;
    esac
  elif [ -n "$SKIP_EXISTING" ]; then
@@ -191,7 +191,7 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
    # unsatisfied local .python-version file can cause the installer to
    # fail.)
    for version_info in "${VERSION_NAME%-dev}" "${VERSION_NAME%.*}" "${VERSION_NAME%%.*}"; do
-      # Anaconda's `curl` doesn't work on platform where `/etc/pki/tls/certs/ca-bundle.crt` isn't available (e.g. Debian)
+      # Anaconda's `curl` doesn't work on platfrom where `/etc/pki/tls/certs/ca-bundle.crt` isn't available (e.g. Debian)
      for version in $(pyenv-whence "python${version_info}" 2>/dev/null || true); do
        if [[ "${version}" != "anaconda"* ]] && [[ "${version}" != "miniconda"* ]]; then
          PYENV_BOOTSTRAP_VERSION="${version}"
@@ -200,7 +200,7 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
      done
    done
    ;;
-  "pypy"*"-dev" | "pypy"*"-src" )
+  "pypy-dev" | "pypy-"*"-src" | "pypy3-"*"-src" )
    # PyPy/PyPy3 requires existing Python 2.7 to build
    if [ -n "${PYENV_RPYTHON_VERSION}" ]; then
      PYENV_BOOTSTRAP_VERSION="${PYENV_RPYTHON_VERSION}"
@@ -213,12 +213,10 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
      done
    fi
    if [ -n "$PYENV_BOOTSTRAP_VERSION" ]; then
-      for dep in curses genc pycparser; do
-        if ! PYENV_VERSION="$PYENV_BOOTSTRAP_VERSION" pyenv-exec python -c "import ${dep}" 1>/dev/null 2>&1; then
-          echo "pyenv-install: $VERSION_NAME: PyPy requires \`${dep}' in $PYENV_BOOTSTRAP_VERSION to build from source." >&2
-          exit 1
-        fi
-      done
+      if ! PYENV_VERSION="$PYENV_BOOTSTRAP_VERSION" pyenv-exec python -c 'import curses' 1>/dev/null 2>&1; then
+        echo "pyenv-install: $VERSION_NAME: PyPy requires \`curses' in $PYENV_BOOTSTRAP_VERSION to build from source." >&2
+        exit 1
+      fi
    else
      echo "pyenv-install: $VERSION_NAME: PyPy requires Python 2.7 to build from source." >&2
      exit 1
--- a/plugins/python-build/bin/pyenv-uninstall
+++ b/plugins/python-build/bin/pyenv-uninstall
@@ -69,9 +69,9 @@ if [ -z "$FORCE" ]; then
    exit 1
  fi

-  read -p "pyenv: remove $PREFIX? [y|N]"
+  read -p "pyenv: remove $PREFIX? "
  case "$REPLY" in
-  y | Y | yes | YES ) ;;
+  y* | Y* ) ;;
  * ) exit 1 ;;
  esac
 fi
@@ -81,7 +81,6 @@ for hook in "${before_hooks[@]}"; do eval "$hook"; done
 if [ -d "$PREFIX" ]; then
  rm -rf "$PREFIX"
  pyenv-rehash
-  echo "pyenv: $VERSION_NAME uninstalled"
 fi

 for hook in "${after_hooks[@]}"; do eval "$hook"; done
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
--- a/plugins/python-build/scripts/README.md
+++ b/plugins/python-build/scripts/README.md
@@ -1,22 +0,0 @@
-# Scripts for updating python-build
-
-Install dependencies with `pip install -r requirements.txt`.
-
-## add_miniconda.py
-
-```_add_miniconda
-usage: add_miniconda.py [-h] [-d] [-v]
-
-Script to add non-"latest" miniconda releases. Written for python 3.7. Checks
-the miniconda download archives for new versions, then writes a build script
-for any which do not exist locally, saving it to plugins/python-
-build/share/python-build. Ignores releases below 4.3.30. Also ignores sub-
-patch releases if that major.minor.patch already exists, but otherwise, takes
-the latest sub-patch release for given OS/arch. Assumes all miniconda3
-releases < 4.7 default to python 3.6, and anything else 3.7.
-
-optional arguments:
-  -h, --help     show this help message and exit
-  -d, --dry-run  Do not write scripts, just report them to stdout
-  -v, --verbose  Increase verbosity of logging
-```
--- a/plugins/python-build/scripts/add_miniconda.py
+++ b/plugins/python-build/scripts/add_miniconda.py
@@ -1,294 +0,0 @@
-#!/usr/bin/env python3
-"""Script to add non-"latest" miniconda releases.
-Written for python 3.7.
-
-Checks the miniconda download archives for new versions,
-then writes a build script for any which do not exist locally,
-saving it to plugins/python-build/share/python-build.
-
-Ignores releases below 4.3.30.
-Also ignores sub-patch releases if that major.minor.patch already exists,
-but otherwise, takes the latest sub-patch release for given OS/arch.
-Assumes all miniconda3 releases < 4.7 default to python 3.6, and anything else 3.7.
-"""
-import textwrap
-from argparse import ArgumentParser
-from collections import defaultdict
-from enum import Enum
-from functools import total_ordering
-from pathlib import Path
-from typing import NamedTuple, List, Optional, DefaultDict, Dict
-import logging
-
-import requests_html
-
-logger = logging.getLogger(__name__)
-
-CONDA_REPO = "https://repo.anaconda.com"
-MINICONDA_REPO = CONDA_REPO + "/miniconda"
-# ANACONDA_REPO = CONDA_REPO + "/archive"
-
-install_script_fmt = """
-case "$(anaconda_architecture 2>/dev/null || true)" in
-{install_lines}
-* )
-  {{ echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  }} >&2
-  exit 1
-  ;;
-esac
-""".lstrip()
-
-install_line_fmt = """
-"{os}-{arch}" )
-  install_script "Miniconda{suffix}-{version_str}-{os}-{arch}" "{repo}/Miniconda{suffix}-{version_str}-{os}-{arch}.sh#{md5}" "miniconda" verify_{py_version}
-  ;;
-""".strip()
-
-here = Path(__file__).resolve()
-out_dir: Path = here.parent.parent / "share" / "python-build"
-
-
-class StrEnum(str, Enum):
-    """Enum subclass whose members are also instances of str
-    and directly comparable to strings. str type is forced at declaration.
-
-    Adapted from https://github.com/kissgyorgy/enum34-custom/blob/dbc89596761c970398701d26c6a5bbcfcf70f548/enum_custom.py#L100
-    (MIT license)
-    """
-
-    def __new__(cls, *args):
-        for arg in args:
-            if not isinstance(arg, str):
-                raise TypeError("Not text %s:" % arg)
-
-        return super(StrEnum, cls).__new__(cls, *args)
-
-    def __str__(self):
-        return str(self.value)
-
-
-class SupportedOS(StrEnum):
-    LINUX = "Linux"
-    MACOSX = "MacOSX"
-
-
-class SupportedArch(StrEnum):
-    PPC64LE = "ppc64le"
-    X86_64 = "x86_64"
-    X86 = "x86"
-
-
-class Suffix(StrEnum):
-    TWO = "2"
-    THREE = "3"
-
-
-class PyVersion(StrEnum):
-    PY27 = "py27"
-    PY36 = "py36"
-    PY37 = "py37"
-    PY38 = "py38"
-    PY39 = "py39"
-
-    def version(self):
-        first, *others = self.value[2:]
-        return f"{first}.{''.join(others)}"
-
-    def version_info(self):
-        return tuple(int(n) for n in self.version().split("."))
-
-
-@total_ordering
-class VersionStr(str):
-    def info(self):
-        return tuple(int(n) for n in self.split("."))
-
-    def __eq__(self, other):
-        return str(self) == str(other)
-
-    def __lt__(self, other):
-        if isinstance(other, VersionStr):
-            return self.info() < other.info()
-        raise ValueError("VersionStr can only be compared to other VersionStr")
-
-    @classmethod
-    def from_info(cls, version_info):
-        return VersionStr(".".join(str(n) for n in version_info))
-
-    def __hash__(self):
-        return hash(str(self))
-
-
-class MinicondaVersion(NamedTuple):
-    suffix: Suffix
-    version_str: VersionStr
-
-    @classmethod
-    def from_str(cls, s):
-        miniconda_n, ver = s.split("-")
-        return MinicondaVersion(Suffix(miniconda_n[-1]), VersionStr(ver))
-
-    def to_filename(self):
-        return f"miniconda{self.suffix}-{self.version_str}"
-
-    def default_py_version(self):
-        if self.suffix == Suffix.TWO:
-            return PyVersion.PY27
-        elif self.version_str.info() < (4, 7):
-            # https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-python.html
-            return PyVersion.PY36
-        else:
-            return PyVersion.PY37
-
-    def with_version_triple(self):
-        return MinicondaVersion(
-            self.suffix, VersionStr.from_info(self.version_str.info()[:3])
-        )
-
-
-class MinicondaSpec(NamedTuple):
-    version: MinicondaVersion
-    os: SupportedOS
-    arch: SupportedArch
-    md5: str
-    py_version: Optional[PyVersion] = None
-
-    @classmethod
-    def from_filestem(cls, stem, md5, py_version=None):
-        miniconda_n, ver, os, arch = stem.split("-")
-        spec = MinicondaSpec(
-            MinicondaVersion(Suffix(miniconda_n[-1]), VersionStr(ver)),
-            SupportedOS(os),
-            SupportedArch(arch),
-            md5,
-        )
-        if py_version is None:
-            spec = spec.with_py_version(spec.version.default_py_version())
-        return spec
-
-    def to_install_lines(self):
-        return install_line_fmt.format(
-            repo=MINICONDA_REPO,
-            suffix=self.version.suffix,
-            version_str=self.version.version_str,
-            os=self.os,
-            arch=self.arch,
-            md5=self.md5,
-            py_version=self.py_version,
-        )
-
-    def with_py_version(self, py_version: PyVersion):
-        return MinicondaSpec(*self[:-1], py_version=py_version)
-
-    def with_version_triple(self):
-        version, *others = self
-        return MinicondaSpec(version.with_version_triple(), *others)
-
-
-def make_script(specs: List[MinicondaSpec]):
-    install_lines = [s.to_install_lines() for s in specs]
-    return install_script_fmt.format(install_lines="\n".join(install_lines))
-
-
-def get_existing_minicondas():
-    logger.info("Getting known miniconda versions")
-    for p in out_dir.iterdir():
-        name = p.name
-        if not p.is_file() or not name.startswith("miniconda"):
-            continue
-        try:
-            v = MinicondaVersion.from_str(name)
-            if v.version_str != "latest":
-                logger.debug("Found existing miniconda version %s", v)
-                yield v
-        except ValueError:
-            pass
-
-
-def get_available_minicondas():
-    logger.info("Fetching remote miniconda versions")
-    session = requests_html.HTMLSession()
-    response = session.get(MINICONDA_REPO)
-    page: requests_html.HTML = response.html
-    table = page.find("table", first=True)
-    rows = table.find("tr")[1:]
-    for row in rows:
-        f, size, date, md5 = row.find("td")
-        fname = f.text
-        md5 = md5.text
-
-        if not fname.endswith(".sh"):
-            continue
-        stem = fname[:-3]
-
-        try:
-            s = MinicondaSpec.from_filestem(stem, md5)
-            if s.version.version_str != "latest":
-                logger.debug("Found remote miniconda version %s", s)
-                yield s
-        except ValueError:
-            pass
-
-
-def key_fn(spec: MinicondaSpec):
-    return (
-        spec.version.version_str.info(),
-        spec.version.suffix.value,
-        spec.os.value,
-        spec.arch.value,
-    )
-
-
-if __name__ == "__main__":
-    parser = ArgumentParser(description=__doc__)
-    parser.add_argument(
-        "-d", "--dry-run", action="store_true",
-        help="Do not write scripts, just report them to stdout",
-    )
-    parser.add_argument(
-        "-v", "--verbose", action="count",
-        help="Increase verbosity of logging",
-    )
-    parsed = parser.parse_args()
-
-    log_level = {
-        0: logging.WARNING,
-        1: logging.INFO,
-        2: logging.DEBUG,
-    }.get(parsed.verbose, logging.DEBUG)
-    logging.basicConfig(level=log_level)
-    if parsed.verbose < 3:
-        logging.getLogger("requests").setLevel(logging.WARNING)
-
-    existing_versions = set(get_existing_minicondas())
-    available_specs = set(get_available_minicondas())
-
-    # version triple to triple-ified spec to raw spec
-    to_add: DefaultDict[
-        MinicondaVersion, Dict[MinicondaSpec, MinicondaSpec]
-    ] = defaultdict(dict)
-
-    logger.info("Checking for new versions")
-    for s in sorted(available_specs, key=key_fn):
-        key = s.version.with_version_triple()
-        if key in existing_versions or key.version_str.info() <= (4, 3, 30):
-            logger.debug("Ignoring version %s (too old or already exists)", s)
-            continue
-
-        to_add[key][s.with_version_triple()] = s
-
-    logger.info("Writing %s scripts", len(to_add))
-    for ver, d in to_add.items():
-        specs = list(d.values())
-        fpath = out_dir / ver.to_filename()
-        script_str = make_script(specs)
-        logger.debug("Writing script for %s", ver)
-        if parsed.dry_run:
-            print(f"Would write spec to {fpath}:\n" + textwrap.indent(script_str, "  "))
-        else:
-            with open(fpath, "w") as f:
-                f.write(script_str)
--- a/plugins/python-build/scripts/requirements.txt
+++ b/plugins/python-build/scripts/requirements.txt
@@ -1 +0,0 @@
-requests-html
--- a/plugins/python-build/share/python-build/2.1.3
+++ b/plugins/python-build/share/python-build/2.1.3
@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "https://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" mac_readline --if has_broken_mac_readline
-install_package "Python-2.1.3" "https://www.python.org/ftp/python/2.1.3/Python-2.1.3.tgz#1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9" standard verify_py21
+install_package "readline-6.2" "https://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" standard --if has_broken_mac_readline
+install_package "Python-2.1.3" "https://www.python.org/ftp/python/2.1.3/Python-2.1.3.tgz#1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9" ldflags_dirs standard verify_py21
 #install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 #install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
--- a/plugins/python-build/share/python-build/2.2.3
+++ b/plugins/python-build/share/python-build/2.2.3
@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "https://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" mac_readline --if has_broken_mac_readline
-install_package "Python-2.2.3" "https://www.python.org/ftp/python/2.2.3/Python-2.2.3.tgz#a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188" standard verify_py22
+install_package "readline-6.2" "https://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" standard --if has_broken_mac_readline
+install_package "Python-2.2.3" "https://www.python.org/ftp/python/2.2.3/Python-2.2.3.tgz#a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188" ldflags_dirs standard verify_py22
 #install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 #install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
--- a/plugins/python-build/share/python-build/2.3.7
+++ b/plugins/python-build/share/python-build/2.3.7
@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "https://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" mac_readline --if has_broken_mac_readline
-install_package "Python-2.3.7" "https://www.python.org/ftp/python/2.3.7/Python-2.3.7.tgz#969a9891dce9f50b13e54f9890acaf2be66715a5895bf9b11111f320c205b90e" standard verify_py23
+install_package "readline-6.2" "https://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" standard --if has_broken_mac_readline
+install_package "Python-2.3.7" "https://www.python.org/ftp/python/2.3.7/Python-2.3.7.tgz#969a9891dce9f50b13e54f9890acaf2be66715a5895bf9b11111f320c205b90e" ldflags_dirs standard verify_py23
 #install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 #install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
--- a/plugins/python-build/share/python-build/2.4.0
+++ b/plugins/python-build/share/python-build/2.4.0
@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.4" "https://www.python.org/ftp/python/2.4/Python-2.4.tgz#ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9" standard verify_py24
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4" "https://www.python.org/ftp/python/2.4/Python-2.4.tgz#ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
--- a/plugins/python-build/share/python-build/2.4.1
+++ b/plugins/python-build/share/python-build/2.4.1
@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.4.1" "https://www.python.org/ftp/python/2.4.1/Python-2.4.1.tgz#f449c3b167389324c525ad99d02376c518ac11e163dbbbc13bc88a5c7101fd00" standard verify_py24
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.1" "https://www.python.org/ftp/python/2.4.1/Python-2.4.1.tgz#f449c3b167389324c525ad99d02376c518ac11e163dbbbc13bc88a5c7101fd00" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
--- a/plugins/python-build/share/python-build/2.4.2
+++ b/plugins/python-build/share/python-build/2.4.2
@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.4.2" "https://www.python.org/ftp/python/2.4.2/Python-2.4.2.tgz#2653e1846e87fd9b3ee287fefc965c80c54646548b4913a22265b0dd54493adf" standard verify_py24
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.2" "https://www.python.org/ftp/python/2.4.2/Python-2.4.2.tgz#2653e1846e87fd9b3ee287fefc965c80c54646548b4913a22265b0dd54493adf" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
--- a/plugins/python-build/share/python-build/2.4.3
+++ b/plugins/python-build/share/python-build/2.4.3
@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.4.3" "https://www.python.org/ftp/python/2.4.3/Python-2.4.3.tgz#985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5" standard verify_py24
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.3" "https://www.python.org/ftp/python/2.4.3/Python-2.4.3.tgz#985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
--- a/plugins/python-build/share/python-build/2.4.4
+++ b/plugins/python-build/share/python-build/2.4.4
@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.4.4" "https://www.python.org/ftp/python/2.4.4/Python-2.4.4.tgz#92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e" standard verify_py24
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.4" "https://www.python.org/ftp/python/2.4.4/Python-2.4.4.tgz#92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
--- a/plugins/python-build/share/python-build/2.4.5
+++ b/plugins/python-build/share/python-build/2.4.5
@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.4.5" "https://www.python.org/ftp/python/2.4.5/Python-2.4.5.tgz#6ae6f67a388a7f70ed3a20eebab5aae995ee433089d1f1724095c62f4b7389a1" standard verify_py24
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.5" "https://www.python.org/ftp/python/2.4.5/Python-2.4.5.tgz#6ae6f67a388a7f70ed3a20eebab5aae995ee433089d1f1724095c62f4b7389a1" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
--- a/plugins/python-build/share/python-build/2.4.6
+++ b/plugins/python-build/share/python-build/2.4.6
@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.4.6" "https://www.python.org/ftp/python/2.4.6/Python-2.4.6.tgz#b03f269e826927f05c966cf4f4414f3c93ee2314960859e7f8375e24e82f8b02" standard verify_py24
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.6" "https://www.python.org/ftp/python/2.4.6/Python-2.4.6.tgz#b03f269e826927f05c966cf4f4414f3c93ee2314960859e7f8375e24e82f8b02" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
--- a/plugins/python-build/share/python-build/2.5.0
+++ b/plugins/python-build/share/python-build/2.5.0
@@ -1,5 +1,5 @@
 #require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.5" "https://www.python.org/ftp/python/2.5/Python-2.5.tgz#d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2" standard verify_py25
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5" "https://www.python.org/ftp/python/2.5/Python-2.5.tgz#d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" python
--- a/plugins/python-build/share/python-build/2.5.1
+++ b/plugins/python-build/share/python-build/2.5.1
@@ -1,5 +1,5 @@
 #require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.5.1" "https://www.python.org/ftp/python/2.5.1/Python-2.5.1.tgz#1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8" standard verify_py25
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.1" "https://www.python.org/ftp/python/2.5.1/Python-2.5.1.tgz#1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" python
--- a/plugins/python-build/share/python-build/2.5.2
+++ b/plugins/python-build/share/python-build/2.5.2
@@ -1,5 +1,5 @@
 #require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.5.2" "https://www.python.org/ftp/python/2.5.2/Python-2.5.2.tgz#834afe8a88adaf623b05ac5dd6700dd5bb5d0d5553fc74ad529359a3496e4ae3" standard verify_py25
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.2" "https://www.python.org/ftp/python/2.5.2/Python-2.5.2.tgz#834afe8a88adaf623b05ac5dd6700dd5bb5d0d5553fc74ad529359a3496e4ae3" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" python
--- a/plugins/python-build/share/python-build/2.5.3
+++ b/plugins/python-build/share/python-build/2.5.3
@@ -1,5 +1,5 @@
 #require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.5.3" "https://www.python.org/ftp/python/2.5.3/Python-2.5.3.tgz#c3fee607d20a77dfb72ea2e627eb4d95d25c735603435abde62c57015a0445bd" standard verify_py25
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.3" "https://www.python.org/ftp/python/2.5.3/Python-2.5.3.tgz#c3fee607d20a77dfb72ea2e627eb4d95d25c735603435abde62c57015a0445bd" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" python
--- a/plugins/python-build/share/python-build/2.5.4
+++ b/plugins/python-build/share/python-build/2.5.4
@@ -1,5 +1,5 @@
 #require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.5.4" "https://www.python.org/ftp/python/2.5.4/Python-2.5.4.tgz#3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6" standard verify_py25
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.4" "https://www.python.org/ftp/python/2.5.4/Python-2.5.4.tgz#3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" python
--- a/plugins/python-build/share/python-build/2.5.5
+++ b/plugins/python-build/share/python-build/2.5.5
@@ -1,5 +1,5 @@
 #require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.5.5" "https://www.python.org/ftp/python/2.5.5/Python-2.5.5.tgz#03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392" standard verify_py25
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.5" "https://www.python.org/ftp/python/2.5.5/Python-2.5.5.tgz#03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" python
--- a/plugins/python-build/share/python-build/2.5.6
+++ b/plugins/python-build/share/python-build/2.5.6
@@ -1,5 +1,5 @@
 #require_gcc
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.5.6" "https://www.python.org/ftp/python/2.5.6/Python-2.5.6.tgz#c2e4377597241b1065677d23327c04d0f41945d370c61a491cc88be367234c5d" standard verify_py25
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.6" "https://www.python.org/ftp/python/2.5.6/Python-2.5.6.tgz#c2e4377597241b1065677d23327c04d0f41945d370c61a491cc88be367234c5d" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" python
--- a/plugins/python-build/share/python-build/2.6.6
+++ b/plugins/python-build/share/python-build/2.6.6
@@ -1,4 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.6.6" "https://www.python.org/ftp/python/2.6.6/Python-2.6.6.tgz#372f66db46d773214e4619df1794a26449158f626138d4d2141a64c2f017fae1" standard verify_py26 ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.6.6" "https://www.python.org/ftp/python/2.6.6/Python-2.6.6.tgz#372f66db46d773214e4619df1794a26449158f626138d4d2141a64c2f017fae1" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.6.7
+++ b/plugins/python-build/share/python-build/2.6.7
@@ -1,4 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.6.7" "https://www.python.org/ftp/python/2.6.7/Python-2.6.7.tgz#a8093eace4cfd3e06b05f0deb5d765e3c6cec65908048640a8cadd7a948b3826" standard verify_py26 ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.6.7" "https://www.python.org/ftp/python/2.6.7/Python-2.6.7.tgz#a8093eace4cfd3e06b05f0deb5d765e3c6cec65908048640a8cadd7a948b3826" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.6.8
+++ b/plugins/python-build/share/python-build/2.6.8
@@ -1,4 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.6.8" "https://www.python.org/ftp/python/2.6.8/Python-2.6.8.tgz#5bf02a75ffa2fcaa5a3cabb8201998519b045541975622316888ea468d9512f7" standard verify_py26 ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.6.8" "https://www.python.org/ftp/python/2.6.8/Python-2.6.8.tgz#5bf02a75ffa2fcaa5a3cabb8201998519b045541975622316888ea468d9512f7" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.6.9
+++ b/plugins/python-build/share/python-build/2.6.9
@@ -1,4 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.6.9" "https://www.python.org/ftp/python/2.6.9/Python-2.6.9.tgz#7277b1285d8a82f374ef6ebaac85b003266f7939b3f2a24a3af52f9523ac94db" standard verify_py26 ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.6.9" "https://www.python.org/ftp/python/2.6.9/Python-2.6.9.tgz#7277b1285d8a82f374ef6ebaac85b003266f7939b3f2a24a3af52f9523ac94db" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.7
+++ b/plugins/python-build/share/python-build/2.7
@@ -0,0 +1,4 @@
+#require_gcc
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7" "https://www.python.org/ftp/python/2.7/Python-2.7.tgz#5670dd6c0c93b0b529781d070852f7b51ce6855615b16afcd318341af2910fb5" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7-dev
+++ b/plugins/python-build/share/python-build/2.7-dev
@@ -1,5 +1,4 @@
 #require_gcc
-prefer_openssl11
-install_package "openssl-1.1.0j" "https://www.openssl.org/source/old/1.1.0/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_git "Python-2.7-dev" "https://github.com/python/cpython" "2.7" standard verify_py27 copy_python_gdb ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_hg "Python-2.7-dev" "https://hg.python.org/cpython" "2.7" standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.0
+++ b/plugins/python-build/share/python-build/2.7.0
@@ -1,4 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.7" "https://www.python.org/ftp/python/2.7/Python-2.7.tgz#5670dd6c0c93b0b529781d070852f7b51ce6855615b16afcd318341af2910fb5" standard verify_py27 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/2.7.1
+++ b/plugins/python-build/share/python-build/2.7.1
@@ -1,4 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.7.1" "https://www.python.org/ftp/python/2.7.1/Python-2.7.1.tgz#ca13e7b1860821494f70de017202283ad73b1fb7bd88586401c54ef958226ec8" standard verify_py27 copy_python_gdb ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.1" "https://www.python.org/ftp/python/2.7.1/Python-2.7.1.tgz#ca13e7b1860821494f70de017202283ad73b1fb7bd88586401c54ef958226ec8" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.10
+++ b/plugins/python-build/share/python-build/2.7.10
@@ -1,8 +1,8 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 if has_tar_xz_support; then
-  install_package "Python-2.7.10" "https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz#1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.10" "https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz#1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0" ldflags_dirs standard verify_py27 ensurepip
 else
-  install_package "Python-2.7.10" "https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz#eda8ce6eec03e74991abb5384170e7c65fcd7522e409b8e83d7e6372add0f12a" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.10" "https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz#eda8ce6eec03e74991abb5384170e7c65fcd7522e409b8e83d7e6372add0f12a" ldflags_dirs standard verify_py27 ensurepip
 fi
--- a/plugins/python-build/share/python-build/2.7.11
+++ b/plugins/python-build/share/python-build/2.7.11
@@ -1,8 +1,8 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 if has_tar_xz_support; then
-  install_package "Python-2.7.11" "https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz#962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.11" "https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz#962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46" ldflags_dirs standard verify_py27 ensurepip
 else
-  install_package "Python-2.7.11" "https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tgz#82929b96fd6afc8da838b149107078c02fa1744b7e60999a8babbc0d3fa86fc6" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.11" "https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tgz#82929b96fd6afc8da838b149107078c02fa1744b7e60999a8babbc0d3fa86fc6" ldflags_dirs standard verify_py27 ensurepip
 fi
--- a/plugins/python-build/share/python-build/2.7.12
+++ b/plugins/python-build/share/python-build/2.7.12
@@ -1,8 +1,8 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 if has_tar_xz_support; then
-  install_package "Python-2.7.12" "https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tar.xz#d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.12" "https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tar.xz#d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978" ldflags_dirs standard verify_py27 ensurepip
 else
-  install_package "Python-2.7.12" "https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tgz#3cb522d17463dfa69a155ab18cffa399b358c966c0363d6c8b5b3bf1384da4b6" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.12" "https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tgz#3cb522d17463dfa69a155ab18cffa399b358c966c0363d6c8b5b3bf1384da4b6" ldflags_dirs standard verify_py27 ensurepip
 fi
--- a/plugins/python-build/share/python-build/2.7.13
+++ b/plugins/python-build/share/python-build/2.7.13
@@ -1,8 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.13" "https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz#35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731" standard verify_py27 copy_python_gdb ensurepip
-else
-  install_package "Python-2.7.13" "https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz#a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1" standard verify_py27 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.14
+++ b/plugins/python-build/share/python-build/2.7.14
@@ -1,9 +0,0 @@
-#require_gcc
-prefer_openssl11
-install_package "openssl-1.1.0j" "https://www.openssl.org/source/old/1.1.0/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.14" "https://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz#71ffb26e09e78650e424929b2b457b9c912ac216576e6bd9e7d204ed03296a66" standard verify_py27 copy_python_gdb ensurepip
-else
-  install_package "Python-2.7.14" "https://www.python.org/ftp/python/2.7.14/Python-2.7.14.tgz#304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8" standard verify_py27 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.15
+++ b/plugins/python-build/share/python-build/2.7.15
@@ -1,9 +0,0 @@
-#require_gcc
-prefer_openssl11
-install_package "openssl-1.1.0j" "https://www.openssl.org/source/old/1.1.0/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.15" "https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz#22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574" standard verify_py27 copy_python_gdb ensurepip
-else
-  install_package "Python-2.7.15" "https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tgz#18617d1f15a380a919d517630a9cd85ce17ea602f9bbdc58ddc672df4b0239db" standard verify_py27 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.16
+++ b/plugins/python-build/share/python-build/2.7.16
@@ -1,8 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2q" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2q.tar.gz#5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.16" "https://www.python.org/ftp/python/2.7.16/Python-2.7.16.tar.xz#f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7" standard verify_py27 copy_python_gdb ensurepip
-else
-  install_package "Python-2.7.16" "https://www.python.org/ftp/python/2.7.16/Python-2.7.16.tgz#01da813a3600876f03f46db11cc5c408175e99f03af2ba942ef324389a83bad5" standard verify_py27 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.17
+++ b/plugins/python-build/share/python-build/2.7.17
@@ -1,8 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2q" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2q.tar.gz#5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.17" "https://www.python.org/ftp/python/2.7.17/Python-2.7.17.tar.xz#4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41" standard verify_py27 copy_python_gdb ensurepip
-else
-  install_package "Python-2.7.17" "https://www.python.org/ftp/python/2.7.17/Python-2.7.17.tgz#f22059d09cdf9625e0a7284d24a13062044f5bf59d93a7f3382190dfa94cecde" standard verify_py27 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.18
+++ b/plugins/python-build/share/python-build/2.7.18
@@ -1,8 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2q" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2q.tar.gz#5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.18" "https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz#b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43" standard verify_py27 copy_python_gdb ensurepip
-else
-  install_package "Python-2.7.18" "https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tgz#da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814" standard verify_py27 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.2
+++ b/plugins/python-build/share/python-build/2.7.2
@@ -1,4 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.7.2" "https://www.python.org/ftp/python/2.7.2/Python-2.7.2.tgz#1d54b7096c17902c3f40ffce7e5b84e0072d0144024184fff184a84d563abbb3" standard verify_py27 copy_python_gdb ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.2" "https://www.python.org/ftp/python/2.7.2/Python-2.7.2.tgz#1d54b7096c17902c3f40ffce7e5b84e0072d0144024184fff184a84d563abbb3" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.3
+++ b/plugins/python-build/share/python-build/2.7.3
@@ -1,4 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.7.3" "https://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz#d4c20f2b5faf95999fd5fecb3f7d32071b0820516224a6d2b72932ab47a1cb8e" standard verify_py27 copy_python_gdb ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.3" "https://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz#d4c20f2b5faf95999fd5fecb3f7d32071b0820516224a6d2b72932ab47a1cb8e" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.4
+++ b/plugins/python-build/share/python-build/2.7.4
@@ -1,4 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.7.4" "https://www.python.org/ftp/python/2.7.4/Python-2.7.4.tgz#98c5eb9c8e65effcc0122112ba17a0bce880aa23ecb560af56b55eb55632b81a" standard verify_py27 copy_python_gdb ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.4" "https://www.python.org/ftp/python/2.7.4/Python-2.7.4.tgz#98c5eb9c8e65effcc0122112ba17a0bce880aa23ecb560af56b55eb55632b81a" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.5
+++ b/plugins/python-build/share/python-build/2.7.5
@@ -1,4 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.7.5" "https://www.python.org/ftp/python/2.7.5/Python-2.7.5.tgz#8e1b5fa87b91835afb376a9c0d319d41feca07ffebc0288d97ab08d64f48afbf" standard verify_py27 copy_python_gdb ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.5" "https://www.python.org/ftp/python/2.7.5/Python-2.7.5.tgz#8e1b5fa87b91835afb376a9c0d319d41feca07ffebc0288d97ab08d64f48afbf" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.6
+++ b/plugins/python-build/share/python-build/2.7.6
@@ -1,4 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-2.7.6" "https://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz#99c6860b70977befa1590029fae092ddb18db1d69ae67e8b9385b66ed104ba58" standard verify_py27 copy_python_gdb ensurepip
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.6" "https://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz#99c6860b70977befa1590029fae092ddb18db1d69ae67e8b9385b66ed104ba58" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.7
+++ b/plugins/python-build/share/python-build/2.7.7
@@ -1,8 +1,8 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 if has_tar_xz_support; then
-  install_package "Python-2.7.7" "https://www.python.org/ftp/python/2.7.7/Python-2.7.7.tar.xz#2983e3cd089b30c50e2b2234f07c2ac4fb8a5df230ab8f2e1133a1d8b208da78" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.7" "https://www.python.org/ftp/python/2.7.7/Python-2.7.7.tar.xz#2983e3cd089b30c50e2b2234f07c2ac4fb8a5df230ab8f2e1133a1d8b208da78" ldflags_dirs standard verify_py27 ensurepip
 else
-  install_package "Python-2.7.7" "https://www.python.org/ftp/python/2.7.7/Python-2.7.7.tgz#7f49c0a6705ad89d925181e27d0aaa025ee4731ce0de64776c722216c3e66c42" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.7" "https://www.python.org/ftp/python/2.7.7/Python-2.7.7.tgz#7f49c0a6705ad89d925181e27d0aaa025ee4731ce0de64776c722216c3e66c42" ldflags_dirs standard verify_py27 ensurepip
 fi
--- a/plugins/python-build/share/python-build/2.7.8
+++ b/plugins/python-build/share/python-build/2.7.8
@@ -1,8 +1,8 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 if has_tar_xz_support; then
-  install_package "Python-2.7.8" "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tar.xz#edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.8" "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tar.xz#edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a" ldflags_dirs standard verify_py27 ensurepip
 else
-  install_package "Python-2.7.8" "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz#74d70b914da4487aa1d97222b29e9554d042f825f26cb2b93abd20fdda56b557" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.8" "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz#74d70b914da4487aa1d97222b29e9554d042f825f26cb2b93abd20fdda56b557" ldflags_dirs standard verify_py27 ensurepip
 fi
--- a/plugins/python-build/share/python-build/2.7.9
+++ b/plugins/python-build/share/python-build/2.7.9
@@ -1,8 +1,8 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 if has_tar_xz_support; then
-  install_package "Python-2.7.9" "https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tar.xz#90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.9" "https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tar.xz#90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" ldflags_dirs standard verify_py27 ensurepip
 else
-  install_package "Python-2.7.9" "https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz#c8bba33e66ac3201dabdc556f0ea7cfe6ac11946ec32d357c4c6f9b018c12c5b" standard verify_py27 copy_python_gdb ensurepip
+  install_package "Python-2.7.9" "https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz#c8bba33e66ac3201dabdc556f0ea7cfe6ac11946ec32d357c4c6f9b018c12c5b" ldflags_dirs standard verify_py27 ensurepip
 fi
--- a/plugins/python-build/share/python-build/3.0.1
+++ b/plugins/python-build/share/python-build/3.0.1
@@ -1,9 +1,9 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.0.1" "https://www.python.org/ftp/python/3.0.1/Python-3.0.1.tgz#7d5f2feae9035f1d3d9e6bb7f092dbf374d6bb4b25abd0d2d11f13bba1cb04de" standard verify_py30
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.0.1" "https://www.python.org/ftp/python/3.0.1/Python-3.0.1.tgz#7d5f2feae9035f1d3d9e6bb7f092dbf374d6bb4b25abd0d2d11f13bba1cb04de" ldflags_dirs standard verify_py30
 if [[ "Darwin" == "$(uname -s)" ]]; then
-  # https://github.com/pyenv/pyenv/issues/456
+  # https://github.com/yyuu/pyenv/issues/456
  { echo
    colorize 1 "WARNING"
    echo ": pyenv cannot install setuptools-1.4.2 to CPython 3.0.1 on OS X."
--- a/plugins/python-build/share/python-build/3.1.0
+++ b/plugins/python-build/share/python-build/3.1.0
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.1" "https://www.python.org/ftp/python/3.1/Python-3.1.tgz#99a034cf574ea3c26412b0a0728126d7fd6ea9593d099d807a25d216ed031e6a" standard verify_py31
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1" "https://www.python.org/ftp/python/3.1/Python-3.1.tgz#99a034cf574ea3c26412b0a0728126d7fd6ea9593d099d807a25d216ed031e6a" ldflags_dirs standard verify_py31
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.1.1
+++ b/plugins/python-build/share/python-build/3.1.1
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.1.1" "https://www.python.org/ftp/python/3.1.1/Python-3.1.1.tgz#5d85d7bff11c4db44920af99f64f4227c816f897f6bfa9dd8a2611165ca5f0a1" standard verify_py31
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1.1" "https://www.python.org/ftp/python/3.1.1/Python-3.1.1.tgz#5d85d7bff11c4db44920af99f64f4227c816f897f6bfa9dd8a2611165ca5f0a1" ldflags_dirs standard verify_py31
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.1.2
+++ b/plugins/python-build/share/python-build/3.1.2
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.1.2" "https://www.python.org/ftp/python/3.1.2/Python-3.1.2.tgz#dffbc0561a161a4a576c6059e6990a9859a0be16ba9b5736eabe4abbb2700d1c" standard verify_py31
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1.2" "https://www.python.org/ftp/python/3.1.2/Python-3.1.2.tgz#dffbc0561a161a4a576c6059e6990a9859a0be16ba9b5736eabe4abbb2700d1c" ldflags_dirs standard verify_py31
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.1.3
+++ b/plugins/python-build/share/python-build/3.1.3
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.1.3" "https://www.python.org/ftp/python/3.1.3/Python-3.1.3.tgz#6311823aeda8be6a7a2b67caaeff48abce6626c9940ba7ed81f9c978666a36bd" standard verify_py31
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1.3" "https://www.python.org/ftp/python/3.1.3/Python-3.1.3.tgz#6311823aeda8be6a7a2b67caaeff48abce6626c9940ba7ed81f9c978666a36bd" ldflags_dirs standard verify_py31
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.1.4
+++ b/plugins/python-build/share/python-build/3.1.4
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.1.4" "https://www.python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fadc05ea6d05360cff189944a85ecd2180bbc308784d168b350450e70bbdd846" standard verify_py31
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1.4" "https://www.python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fadc05ea6d05360cff189944a85ecd2180bbc308784d168b350450e70bbdd846" ldflags_dirs standard verify_py31
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.1.5
+++ b/plugins/python-build/share/python-build/3.1.5
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.1.5" "https://www.python.org/ftp/python/3.1.5/Python-3.1.5.tgz#d12dae6d06f52ef6bf1271db4d5b4d14b5dd39813e324314e72b648ef1bc0103" standard verify_py31
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1.5" "https://www.python.org/ftp/python/3.1.5/Python-3.1.5.tgz#d12dae6d06f52ef6bf1271db4d5b4d14b5dd39813e324314e72b648ef1bc0103" ldflags_dirs standard verify_py31
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.10-dev
+++ b/plugins/python-build/share/python-build/3.10-dev
@@ -1,6 +0,0 @@
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_git "Python-3.10-dev" "https://github.com/python/cpython" 3.10 standard verify_py310 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/3.10.0b3
+++ b/plugins/python-build/share/python-build/3.10.0b3
@@ -1,10 +0,0 @@
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-    install_package "Python-3.10.0b3" "https://www.python.org/ftp/python/3.10.0/Python-3.10.0b3.tar.xz#2267aed4d01015176bcfe645ac6ca36e05f0c30a76f1f9973863692f6e25cc15" standard verify_py310 copy_python_gdb ensurepip
-else
-    install_package "Python-3.10.0b3" "https://www.python.org/ftp/python/3.10.0/Python-3.10.0b3.tgz#880f407e619aa92c831900a98c0793889c4b40008a0b5623fd829ef76c8d96be" standard verify_py310 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.11-dev
+++ b/plugins/python-build/share/python-build/3.11-dev
@@ -1,6 +0,0 @@
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_git "Python-3.11-dev" "https://github.com/python/cpython" main standard verify_py311 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/3.2.0
+++ b/plugins/python-build/share/python-build/3.2.0
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.2" "https://www.python.org/ftp/python/3.2/Python-3.2.tgz#27b35bfcbbf01de9564c0265d72b58ba3ff3d56df0615765372f2aa09dc20da9" standard verify_py32
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2" "https://www.python.org/ftp/python/3.2/Python-3.2.tgz#27b35bfcbbf01de9564c0265d72b58ba3ff3d56df0615765372f2aa09dc20da9" ldflags_dirs standard verify_py32
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
--- a/plugins/python-build/share/python-build/3.2-dev
+++ b/plugins/python-build/share/python-build/3.2-dev
@@ -0,0 +1,6 @@
+#require_gcc
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_hg "Python-3.2-dev" "https://hg.python.org/cpython" "3.2" standard verify_py32
+install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
+install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
--- a/plugins/python-build/share/python-build/3.2.1
+++ b/plugins/python-build/share/python-build/3.2.1
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.2.1" "https://www.python.org/ftp/python/3.2.1/Python-3.2.1.tgz#7cff29d984696d9fe8c7bea54da5b9ad36acef33ff5cf0d3e37e4d12fb21c572" standard verify_py32
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.1" "https://www.python.org/ftp/python/3.2.1/Python-3.2.1.tgz#7cff29d984696d9fe8c7bea54da5b9ad36acef33ff5cf0d3e37e4d12fb21c572" ldflags_dirs standard verify_py32
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
--- a/plugins/python-build/share/python-build/3.2.2
+++ b/plugins/python-build/share/python-build/3.2.2
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.2.2" "https://www.python.org/ftp/python/3.2.2/Python-3.2.2.tgz#acc6a13cb4fed0b7e86716324a8437e326645b8076177eede5a0cad99ec0313c" standard verify_py32
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.2" "https://www.python.org/ftp/python/3.2.2/Python-3.2.2.tgz#acc6a13cb4fed0b7e86716324a8437e326645b8076177eede5a0cad99ec0313c" ldflags_dirs standard verify_py32
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
--- a/plugins/python-build/share/python-build/3.2.3
+++ b/plugins/python-build/share/python-build/3.2.3
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.2.3" "https://www.python.org/ftp/python/3.2.3/Python-3.2.3.tgz#74c33e165edef7532cef95fd9a325a06878b5bfc8a5d038161573f283eaf9809" standard verify_py32
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.3" "https://www.python.org/ftp/python/3.2.3/Python-3.2.3.tgz#74c33e165edef7532cef95fd9a325a06878b5bfc8a5d038161573f283eaf9809" ldflags_dirs standard verify_py32
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
--- a/plugins/python-build/share/python-build/3.2.4
+++ b/plugins/python-build/share/python-build/3.2.4
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.2.4" "https://www.python.org/ftp/python/3.2.4/Python-3.2.4.tgz#71c3139908ccc1c544ba1e331a3c22b3f1c09f562438a054fd6f4e2628de8b9a" standard verify_py32
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.4" "https://www.python.org/ftp/python/3.2.4/Python-3.2.4.tgz#71c3139908ccc1c544ba1e331a3c22b3f1c09f562438a054fd6f4e2628de8b9a" ldflags_dirs standard verify_py32
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
--- a/plugins/python-build/share/python-build/3.2.5
+++ b/plugins/python-build/share/python-build/3.2.5
@@ -1,6 +1,6 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-install_package "Python-3.2.5" "https://www.python.org/ftp/python/3.2.5/Python-3.2.5.tgz#5eae0ab92a0bb9e3a1bf9c7cd046bc3de58996b049bd894d095978b6b085099f" standard verify_py32
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.5" "https://www.python.org/ftp/python/3.2.5/Python-3.2.5.tgz#5eae0ab92a0bb9e3a1bf9c7cd046bc3de58996b049bd894d095978b6b085099f" ldflags_dirs standard verify_py32
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
--- a/plugins/python-build/share/python-build/3.2.6
+++ b/plugins/python-build/share/python-build/3.2.6
@@ -1,10 +1,10 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 if has_tar_xz_support; then
-  install_package "Python-3.2.6" "https://www.python.org/ftp/python/3.2.6/Python-3.2.6.tar.xz#1d12b501819fd26afafbf8459be1aa279b56f032b4c15412de0a713ce0de7bdc" standard verify_py32
+  install_package "Python-3.2.6" "https://www.python.org/ftp/python/3.2.6/Python-3.2.6.tar.xz#1d12b501819fd26afafbf8459be1aa279b56f032b4c15412de0a713ce0de7bdc" ldflags_dirs standard verify_py32
 else
-  install_package "Python-3.2.6" "https://www.python.org/ftp/python/3.2.6/Python-3.2.6.tgz#fc1e41296e29d476f696303acae293ae7a2310f0f9d0d637905e722a3f16163e" standard verify_py32
+  install_package "Python-3.2.6" "https://www.python.org/ftp/python/3.2.6/Python-3.2.6.tgz#fc1e41296e29d476f696303acae293ae7a2310f0f9d0d637905e722a3f16163e" ldflags_dirs standard verify_py32
 fi
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
--- a/Show More
+++ b/Show More