[openssl-commits] [openssl] master update

2015-11-21 Thread Dr . Stephen Henson 
The branch master has been updated
   via  043b93d7323a70d4157709fbf4a804d1a0f7c824 (commit)
  from  5c649375dd756dcd0b0c81a14a04cd8e87f198c1 (commit)


- Log -
commit 043b93d7323a70d4157709fbf4a804d1a0f7c824
Author: Dr. Stephen Henson 
Date:   Sat Nov 21 12:44:39 2015 +

add -pthread to debug-steve*

Reviewed-by: Richard Levitte 

---

Summary of changes:
 Configurations/99-personal-steve.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configurations/99-personal-steve.conf 
b/Configurations/99-personal-steve.conf
index 171b1cb..b75e6a3 100644
--- a/Configurations/99-personal-steve.conf
+++ b/Configurations/99-personal-steve.conf
@@ -8,7 +8,7 @@
 "debug-steve64" => {
 inherit_from => [ "x86_64_asm" ],
 cc   => "gcc",
-cflags   => "$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO 
-DCONF_DEBUG -g",
+cflags   => "$gcc_devteam_warn -pthread -m64 -DL_ENDIAN 
-DTERMIO -DCONF_DEBUG -g",
 thread_cflag => "-D_REENTRANT",
 lflags   => "-ldl",
 bn_ops   => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
@@ -22,7 +22,7 @@
 "debug-steve32" => {
 inherit_from => [ "x86_elf_asm" ],
 cc   => "gcc",
-cflags   => "$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG 
-g",
+cflags   => "$gcc_devteam_warn -pthread -m32 -DL_ENDIAN 
-DCONF_DEBUG -g",
 thread_cflag => "-D_REENTRANT",
 lflags   => "-rdynamic -ldl",
 bn_ops   => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
@@ -35,7 +35,7 @@
 "debug-steve-opt" => {
 inherit_from => [ "x86_64_asm" ],
 cc   => "gcc",
-cflags   => "$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO 
-DCONF_DEBUG -g",
+cflags   => "$gcc_devteam_warn -pthread -m64 -O3 -DL_ENDIAN 
-DTERMIO -DCONF_DEBUG -g",
 thread_cflag => "-D_REENTRANT",
 lflags   => "-ldl",
 bn_ops   => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

2015-11-21 Thread Kurt Roeckx 
The branch OpenSSL_1_0_1-stable has been updated
   via  638856f40c67b1fa68d60ab2da3b1d83a5a97bc1 (commit)
  from  a5184a6c89ff954261e73d1e8691ab73b9b4b2d4 (commit)


- Log -
commit 638856f40c67b1fa68d60ab2da3b1d83a5a97bc1
Author: Alessandro Ghedini 
Date:   Wed Oct 28 21:11:37 2015 +0100

Add initial AppVeyor configuration

Original patch by Frank Morgner.

Signed-off-by: Kurt Roeckx 
Reviewed-by: Rich Salz 

GH: #456
(cherry picked from commit 68db80e2d1accdd4c4a6b4763559c6cfe9663820)

---

Summary of changes:
 appveyor.yml | 60 
 1 file changed, 60 insertions(+)
 create mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000..8695359
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,60 @@
+platform:
+- x86
+- x64
+
+environment:
+matrix:
+- VSVER: 9
+- VSVER: 10
+- VSVER: 11
+- VSVER: 12
+- VSVER: 14
+
+configuration:
+- plain
+- shared
+
+matrix:
+allow_failures:
+- platform: x64
+  VSVER: 9
+- platform: x64
+  VSVER: 10
+- platform: x64
+  VSVER: 11
+
+before_build:
+- ps: >-
+If ($env:Platform -Match "x86") {
+$env:VCVARS_PLATFORM="x86"
+$env:TARGET="VC-WIN32"
+$env:DO="do_ms"
+} Else {
+$env:VCVARS_PLATFORM="amd64"
+$env:TARGET="VC-WIN64A"
+$env:DO="do_win64a"
+}
+- ps: >-
+If ($env:Configuration -Like "*shared*") {
+$env:MAK="ntdll.mak"
+} Else {
+$env:MAK="nt.mak"
+}
+- ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + 
"0COMNTOOLS"))
+- call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
+- perl Configure %TARGET% no-asm
+- call ms\%DO%
+
+build_script:
+- nmake /f ms\%MAK%
+
+test_script:
+- nmake /f ms\%MAK% test
+
+notifications:
+- provider: Email
+  to:
+  - openssl-commits@openssl.org
+  on_build_success: false
+  on_build_failure: true
+  on_build_status_changed: true
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

2015-11-21 Thread Kurt Roeckx 
The branch OpenSSL_1_0_2-stable has been updated
   via  6d31885d4ac4965745a6ddff64826ae11d73d58e (commit)
  from  03bf7127808e3a8fba42763458d5da14127e (commit)


- Log -
commit 6d31885d4ac4965745a6ddff64826ae11d73d58e
Author: Alessandro Ghedini 
Date:   Wed Oct 28 21:11:37 2015 +0100

Add initial AppVeyor configuration

Original patch by Frank Morgner.

Signed-off-by: Kurt Roeckx 
Reviewed-by: Rich Salz 

GH: #456
(cherry picked from commit 68db80e2d1accdd4c4a6b4763559c6cfe9663820)

---

Summary of changes:
 appveyor.yml | 60 
 1 file changed, 60 insertions(+)
 create mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000..8695359
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,60 @@
+platform:
+- x86
+- x64
+
+environment:
+matrix:
+- VSVER: 9
+- VSVER: 10
+- VSVER: 11
+- VSVER: 12
+- VSVER: 14
+
+configuration:
+- plain
+- shared
+
+matrix:
+allow_failures:
+- platform: x64
+  VSVER: 9
+- platform: x64
+  VSVER: 10
+- platform: x64
+  VSVER: 11
+
+before_build:
+- ps: >-
+If ($env:Platform -Match "x86") {
+$env:VCVARS_PLATFORM="x86"
+$env:TARGET="VC-WIN32"
+$env:DO="do_ms"
+} Else {
+$env:VCVARS_PLATFORM="amd64"
+$env:TARGET="VC-WIN64A"
+$env:DO="do_win64a"
+}
+- ps: >-
+If ($env:Configuration -Like "*shared*") {
+$env:MAK="ntdll.mak"
+} Else {
+$env:MAK="nt.mak"
+}
+- ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + 
"0COMNTOOLS"))
+- call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
+- perl Configure %TARGET% no-asm
+- call ms\%DO%
+
+build_script:
+- nmake /f ms\%MAK%
+
+test_script:
+- nmake /f ms\%MAK% test
+
+notifications:
+- provider: Email
+  to:
+  - openssl-commits@openssl.org
+  on_build_success: false
+  on_build_failure: true
+  on_build_status_changed: true
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits