SF.net SVN: gar:[22322] csw/mgar/pkg/openssl1/trunk

[chninkel at users.sourceforge.net]

Revision: 22322
          http://gar.svn.sourceforge.net/gar/?rev=22322&view=rev
Author:   chninkel
Date:     2013-10-27 18:14:13 +0000 (Sun, 27 Oct 2013)
Log Message:
-----------
openssl1/trunk: enable use of solaris issetugid function

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/openssl1/trunk/files/make_issetugid_support_configurable.patch

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2013-10-27 15:38:23 UTC (rev 22321)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2013-10-27 18:14:13 UTC (rev 22322)
@@ -112,6 +112,12 @@
 # crazy during library migration
 PATCHFILES += 0007-enables-symbols-versioning.patch
 
+# openssl currently only uses issetugid on freebsd and openbsd 
+# althought it is also available on Solaris 10
+# We make issetugid support configurable via preprocessor flag
+# to be able to enable it for Solaris
+PATCHFILES += make_issetugid_support_configurable.patch
+
 # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
 ifneq ($(shell /usr/bin/uname -r),5.9)
 # There is a problem with this patch under sparc when using tls protocol
@@ -176,12 +182,16 @@
 sparcv8plus+vis_OS_COMPILER	= solaris-sparcv9+vis-cc-sunw
 sparcv9_OS_COMPILER		= solaris64-sparcv9-cc-sunw
 
+# Solaris has the issetugid function since libc version interface SUNW_1.21
+# but openssl doesn't use it by default so we manually enable it
+CONFIGURE_FLAGS = -DHAVE_ISSETUGID
+
 # --libdir must only be given if the directory is actually different from lib or the creation will fail
 # as the directory is already there
 LIBDIR_64 = --libdir=lib/64
 LIBDIR = $(LIBDIR_$(MEMORYMODEL))
 
-CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR) $(LIBDIR)
+CONFIGURE_ARGS = --prefix=$(prefix) shared $(CONFIGURE_FLAGS) $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR) $(LIBDIR)
 
 # PKCS11 is only for Solaris 10 so we must create solaris 10 specific packages
 ifneq ($(shell /usr/bin/uname -r),5.9)

Added: csw/mgar/pkg/openssl1/trunk/files/make_issetugid_support_configurable.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/make_issetugid_support_configurable.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/make_issetugid_support_configurable.patch	2013-10-27 18:14:13 UTC (rev 22322)
@@ -0,0 +1,11 @@
+--- a/crypto/uid.c	2013-02-11 16:02:48.000000000 +0100
++++ b/crypto/uid.c	2013-10-26 17:43:36.481546990 +0200
+@@ -56,7 +56,7 @@
+ #include <openssl/crypto.h>
+ #include <openssl/opensslconf.h>
+ 
+-#if defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2)
++#if defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) || defined(HAVE_ISSETUGID)
+ 
+ #include OPENSSL_UNISTD
+ 

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