Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
3407dfba
Commit
3407dfba
authored
May 18, 2012
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade OpenSSL to 1.0.0j
parent
0d635aef
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
8 deletions
+9
-8
Misc/NEWS
Misc/NEWS
+2
-0
PC/VC6/readme.txt
PC/VC6/readme.txt
+2
-3
PC/VS8.0/pyproject.vsprops
PC/VS8.0/pyproject.vsprops
+1
-1
PCbuild/pyproject.vsprops
PCbuild/pyproject.vsprops
+1
-1
PCbuild/readme.txt
PCbuild/readme.txt
+1
-1
Tools/buildbot/external-common.bat
Tools/buildbot/external-common.bat
+2
-2
No files found.
Misc/NEWS
View file @
3407dfba
...
...
@@ -235,6 +235,8 @@ Tests
Build
-----
- The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6.
- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban.
- Issue #14437: Fix building the _io module under Cygwin.
...
...
PC/VC6/readme.txt
View file @
3407dfba
...
...
@@ -153,10 +153,9 @@ _ssl
Unpack into the "dist" directory, retaining the folder name from
the archive - for example, the latest stable OpenSSL will install as
dist/openssl-1.0.0
a
dist/openssl-1.0.0
j
You can (theoretically) use any version of OpenSSL you like - the
build process will automatically select the latest version.
You need to use version 1.0.0j of OpenSSL.
You can install the NASM assembler from
http://www.nasm.us/
...
...
PC/VS8.0/pyproject.vsprops
View file @
3407dfba
...
...
@@ -58,7 +58,7 @@
/>
<UserMacro
Name=
"opensslDir"
Value=
"$(externalsDir)\openssl-1.0.0
a
"
Value=
"$(externalsDir)\openssl-1.0.0
j
"
/>
<UserMacro
Name=
"tcltkDir"
...
...
PCbuild/pyproject.vsprops
View file @
3407dfba
...
...
@@ -58,7 +58,7 @@
/>
<UserMacro
Name=
"opensslDir"
Value=
"$(externalsDir)\openssl-1.0.0
a
"
Value=
"$(externalsDir)\openssl-1.0.0
j
"
/>
<UserMacro
Name=
"tcltkDir"
...
...
PCbuild/readme.txt
View file @
3407dfba
...
...
@@ -139,7 +139,7 @@ _ssl
Get the source code through
svn export http://svn.python.org/projects/external/openssl-1.0.0
a
svn export http://svn.python.org/projects/external/openssl-1.0.0
j
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
obtaining external sources then you don't need to manually get the source
...
...
Tools/buildbot/external-common.bat
View file @
3407dfba
...
...
@@ -14,7 +14,7 @@ cd ..
@rem
if
exist
tk8
.4.16
rd
/s/q
tk8
.4.16
@rem
if
exist
tk
-
8
.4.18.1
rd
/s/q
tk
-
8
.4.18.1
@rem
if
exist
db
-
4
.4.20
rd
/s/q
db
-
4
.4.20
@rem
if
exist
openssl
-
1
.0.0
a
rd
/s/q
openssl
-
1
.0.0a
@rem
if
exist
openssl
-
1
.0.0
j
rd
/s/q
openssl
-
1
.0.0j
@rem
if
exist
sqlite
-
3
.7.4
rd
/s/q
sqlite
-
3
.7.4
@rem
bzip
...
...
@@ -24,7 +24,7 @@ if not exist bzip2-1.0.6 (
)
@rem
OpenSSL
if
not
exist
openssl
-
1
.0.0
a
svn
export
http
://svn.python.org/projects/external/openssl
-
1
.0.0a
if
not
exist
openssl
-
1
.0.0
j
svn
export
http
://svn.python.org/projects/external/openssl
-
1
.0.0j
@rem
tcl
/tk
if
not
exist
tcl
-
8
.5.9.0
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment