SF.net SVN: gar:[26303] csw/mgar/pkg/openssl1/branches/lts102

[janholzh at users.sourceforge.net]

Revision: 26303
          http://sourceforge.net/p/gar/code/26303
Author:   janholzh
Date:     2017-12-08 08:52:10 +0000 (Fri, 08 Dec 2017)
Log Message:
-----------
openssl1/branches/lts102: update to 1.0.2n

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/branches/lts102/Makefile
    csw/mgar/pkg/openssl1/branches/lts102/checksums
    csw/mgar/pkg/openssl1/branches/lts102/files/029-fork_safe.patch

Removed Paths:
-------------
    csw/mgar/pkg/openssl1/branches/lts102/files/0018-PRE-29_Patch_do_to_code_change.patch

Modified: csw/mgar/pkg/openssl1/branches/lts102/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/Makefile	2017-11-30 09:49:24 UTC (rev 26302)
+++ csw/mgar/pkg/openssl1/branches/lts102/Makefile	2017-12-08 08:52:10 UTC (rev 26303)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = openssl
-VERSION = 1.0.2m
+VERSION = 1.0.2n
 GARTYPE = v2
 # Since version 1.0.0, soname is fixed and does not follow the minor releases
 SONAME=1.0.0
@@ -166,7 +166,6 @@
 
 
 # Patches taken form oracle
-PATCHFILES += 0018-PRE-29_Patch_do_to_code_change.patch
 PATCHFILES += 029-fork_safe.patch
 PATCHFILES += 032-aes_cbc_len_check.patch
 PATCHFILES += 036-evp_leak.patch

Modified: csw/mgar/pkg/openssl1/branches/lts102/checksums
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/checksums	2017-11-30 09:49:24 UTC (rev 26302)
+++ csw/mgar/pkg/openssl1/branches/lts102/checksums	2017-12-08 08:52:10 UTC (rev 26303)
@@ -1 +1 @@
-10e9e37f492094b9ef296f68f24a7666  openssl-1.0.2m.tar.gz
+13bdc1b1d1ff39b6fd42a255e74676a4  openssl-1.0.2n.tar.gz

Deleted: csw/mgar/pkg/openssl1/branches/lts102/files/0018-PRE-29_Patch_do_to_code_change.patch
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/files/0018-PRE-29_Patch_do_to_code_change.patch	2017-11-30 09:49:24 UTC (rev 26302)
+++ csw/mgar/pkg/openssl1/branches/lts102/files/0018-PRE-29_Patch_do_to_code_change.patch	2017-12-08 08:52:10 UTC (rev 26303)
@@ -1,26 +0,0 @@
-From 6945a594cda4f1198f3ceee20d344e6728f925ce Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at opencsw.org>
-Date: Fri, 3 Nov 2017 10:05:18 +0100
-Subject: [PATCH] PRE-29_Patch_do_to_code_change
-
----
- crypto/cryptlib.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
-index 5fab45b..9de694f 100644
---- a/crypto/cryptlib.c
-+++ b/crypto/cryptlib.c
-@@ -478,9 +478,6 @@ int CRYPTO_THREADID_set_callback(void (*func) (CRYPTO_THREADID *))
-     if (threadid_callback)
-         return 0;
-     threadid_callback = func;
--#ifdef OPENSSL_FIPS
--    FIPS_crypto_threadid_set_callback(func);
--#endif
-     return 1;
- }
- 
--- 
-2.4.0
-

Modified: csw/mgar/pkg/openssl1/branches/lts102/files/029-fork_safe.patch
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/files/029-fork_safe.patch	2017-11-30 09:49:24 UTC (rev 26302)
+++ csw/mgar/pkg/openssl1/branches/lts102/files/029-fork_safe.patch	2017-12-08 08:52:10 UTC (rev 26303)
@@ -188,7 +188,7 @@
  void CRYPTO_set_locking_callback(void (*func) (int mode, int type,
                                                 const char *file, int line))
  {
-@@ -410,7 +541,11 @@
+@@ -410,7 +543,11 @@
       * started.
       */
      OPENSSL_init();
@@ -201,7 +201,7 @@
  }
  
  void CRYPTO_set_add_lock_callback(int (*func) (int *num, int mount, int type,
-@@ -471,9 +606,10 @@
+@@ -471,12 +608,10 @@
  
  int CRYPTO_THREADID_set_callback(void (*func) (CRYPTO_THREADID *))
  {
@@ -208,25 +208,47 @@
 -    if (threadid_callback)
 -        return 0;
 -    threadid_callback = func;
+-#ifdef OPENSSL_FIPS
+-    FIPS_crypto_threadid_set_callback(func);
+-#endif
 +    /*
-+     * Use the backup method (the address of 'errno') to identify the
-+     * thread and disallow setting the threadid callback.
++     * Setting a threadid callback is no longer allowed; the compiled-in
++     * platform-specific default is always used.
 +     */
      return 1;
  }
  
-@@ -529,7 +665,10 @@
+@@ -503,7 +641,7 @@
+     CRYPTO_THREADID_set_numeric(id, (unsigned long)find_thread(NULL));
+ #else
+-    /* For everything else, default to using the address of 'errno' */
+-    CRYPTO_THREADID_set_pointer(id, (void *)&errno);
++    /* For everything else, default to using pthread_self() */
++    CRYPTO_THREADID_set_numeric(id, (unsigned long)pthread_self());
+ #endif
+ }
  
+@@ -529,7 +667,10 @@
+ 
  void CRYPTO_set_id_callback(unsigned long (*func) (void))
  {
 -    id_callback = func;
 +    /*
-+     * Use the backup method to identify the thread/process.
-+     * Setting the id callback is disallowed.
++     * Setting a threadid callback is no longer allowed; the compiled-in
++     * platform-specific default is always used.
 +     */
  }
  
  unsigned long CRYPTO_thread_id(void)
+@@ -546,7 +687,7 @@
+ # elif defined(OPENSSL_SYS_BEOS)
+         ret = (unsigned long)find_thread(NULL);
+ # else
+-        ret = (unsigned long)getpid();
++        ret = (unsigned long)pthread_self();
+ # endif
+     } else
+         ret = id_callback();
 --- openssl-1.0.1f/crypto/cryptlib.h.~1~	Fri Feb  7 10:41:42 2014
 +++ openssl-1.0.1f/crypto/cryptlib.h	Thu Feb  6 16:04:16 2014
 @@ -104,6 +104,8 @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.