[Astlinux-commits] SF.net SVN: astlinux:[7920] branches/1.0/package/openssl

[<abe...@us...>]

Revision: 7920
          http://sourceforge.net/p/astlinux/code/7920
Author:   abelbeck
Date:     2016-11-03 21:12:11 +0000 (Thu, 03 Nov 2016)
Log Message:
-----------
openssl, major version bump to 1.0.2j, LTS series

Modified Paths:
--------------
    branches/1.0/package/openssl/openssl-do-not-build-docs.patch
    branches/1.0/package/openssl/openssl.mk

Removed Paths:
-------------
    branches/1.0/package/openssl/openssl-dont-force-large-file.patch

Modified: branches/1.0/package/openssl/openssl-do-not-build-docs.patch
===================================================================
--- branches/1.0/package/openssl/openssl-do-not-build-docs.patch	2016-11-03 17:18:24 UTC (rev 7919)
+++ branches/1.0/package/openssl/openssl-do-not-build-docs.patch	2016-11-03 21:12:11 UTC (rev 7920)
@@ -1,6 +1,6 @@
---- openssl-1.0.1h/Makefile.org.orig	2014-06-05 11:36:09.000000000 -0500
-+++ openssl-1.0.1h/Makefile.org	2014-06-05 11:36:17.000000000 -0500
-@@ -528,7 +528,7 @@
+--- openssl-1.0.2j/Makefile.org.orig	2016-11-03 11:36:09.000000000 -0500
++++ openssl-1.0.2j/Makefile.org	2016-11-03 11:36:17.000000000 -0500
+@@ -531,7 +531,7 @@
  	@$(MAKE) SDIRS='$(SDIRS)' clean
  	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
  

Deleted: branches/1.0/package/openssl/openssl-dont-force-large-file.patch
===================================================================
--- branches/1.0/package/openssl/openssl-dont-force-large-file.patch	2016-11-03 17:18:24 UTC (rev 7919)
+++ branches/1.0/package/openssl/openssl-dont-force-large-file.patch	2016-11-03 21:12:11 UTC (rev 7920)
@@ -1,19 +0,0 @@
-[patch]: bss_file.c: don't force largefile mode
----
- crypto/bio/bss_file.c |    3 ---
- 1 file changed, 3 deletions(-)
-
-Index: openssl-1.0.1m/crypto/bio/bss_file.c
-===================================================================
---- openssl-1.0.1m.orig/crypto/bio/bss_file.c
-+++ openssl-1.0.1m/crypto/bio/bss_file.c
-@@ -78,9 +78,6 @@
-  * of 32-bit platforms which allow for sequential access of large files
-  * without extra "magic" comprise *BSD, Darwin, IRIX...
-  */
--#  ifndef _FILE_OFFSET_BITS
--#   define _FILE_OFFSET_BITS 64
--#  endif
- # endif
- 
- # include <stdio.h>

Modified: branches/1.0/package/openssl/openssl.mk
===================================================================
--- branches/1.0/package/openssl/openssl.mk	2016-11-03 17:18:24 UTC (rev 7919)
+++ branches/1.0/package/openssl/openssl.mk	2016-11-03 21:12:11 UTC (rev 7920)
@@ -4,21 +4,13 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.1u
+OPENSSL_VERSION = 1.0.2j
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib
 OPENSSL_TARGET_ARCH = generic32
 OPENSSL_CFLAGS = $(TARGET_CFLAGS)
 
-ifeq ($(BR2_PACKAGE_OPENSSL_BIN),)
-define OPENSSL_DISABLE_APPS
-	$(SED) '/^build_apps/! s/build_apps//' $(@D)/Makefile.org
-	$(SED) '/^DIRS=/ s/apps//' $(@D)/Makefile.org
-endef
-OPENSSL_PRE_CONFIGURE_HOOKS += OPENSSL_DISABLE_APPS
-endif
-
 ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
 	OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
 	# Needs to be added as BR2_PACKAGE_OCF_LINUX to work
@@ -45,11 +37,6 @@
 	OPENSSL_TARGET_ARCH = elf
 endif
 
-# Workaround for bug #3445
-ifeq ($(BR2_x86_i386),y)
-	OPENSSL_TARGET_ARCH = generic32 386
-endif
-
 define OPENSSL_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_ARGS) \
@@ -97,6 +84,21 @@
 OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS_SHARED
 endif
 
+ifeq ($(BR2_PACKAGE_PERL),)
+define OPENSSL_REMOVE_PERL_SCRIPTS
+	rm -f $(TARGET_DIR)/etc/ssl/misc/{CA.pl,tsget}
+endef
+OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_PERL_SCRIPTS
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL_BIN),)
+define OPENSSL_REMOVE_BIN
+	rm -f $(TARGET_DIR)/usr/bin/openssl
+	rm -f $(TARGET_DIR)/usr/lib/ssl/misc/{CA.*,c_*}
+endef
+OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_BIN
+endif
+
 ifneq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
 define OPENSSL_REMOVE_OPENSSL_ENGINES
 	rm -rf $(TARGET_DIR)/usr/lib/engines

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