pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/openssl Add a target configuration for Tru64 ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6a4f316b8860
branches: trunk
changeset: 531693:6a4f316b8860
user: tnn <tnn%pkgsrc.org@localhost>
date: Sat Aug 04 14:29:43 2007 +0000
description:
Add a target configuration for Tru64 with gcc.
diffstat:
security/openssl/Makefile | 12 ++++++++-
security/openssl/PLIST.osf1 | 3 ++
security/openssl/distinfo | 6 ++--
security/openssl/patches/patch-ac | 18 ++++++++++----
security/openssl/patches/patch-af | 47 +++++++++++++++++++++++++++++---------
5 files changed, 64 insertions(+), 22 deletions(-)
diffs (218 lines):
diff -r 9d90dee60eea -r 6a4f316b8860 security/openssl/Makefile
--- a/security/openssl/Makefile Sat Aug 04 14:19:15 2007 +0000
+++ b/security/openssl/Makefile Sat Aug 04 14:29:43 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2007/07/18 13:11:15 tron Exp $
+# $NetBSD: Makefile,v 1.127 2007/08/04 14:29:43 tnn Exp $
OPENSSL_SNAPSHOT?= # empty
OPENSSL_STABLE?= # empty
@@ -77,6 +77,14 @@
CONFIGURE_ARGS+= irix64-mips4-cc
. endif
. endif
+.elif ${OPSYS} == "OSF1"
+PLIST_OPSYS= PLIST.osf1
+CONFIGURE_SCRIPT= ./Configure
+. if !empty(CC_VERSION:Mgcc*)
+CONFIGURE_ARGS+= alpha-gcc-rpath
+. else
+CONFIGURE_ARGS+= alpha-cc-rpath
+. endif
.elif ${OPSYS} == "Darwin"
.include "../../mk/dlopen.buildlink3.mk"
@@ -93,7 +101,7 @@
CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS}
CONFIGURE_ENV+= PERL=${PERL5:Q}
-PLIST_OPSYS= ${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//}
+PLIST_OPSYS?= ${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//}
.if exists(${PLIST_OPSYS})
PLIST_SHLIB= ${PLIST_OPSYS}
.else
diff -r 9d90dee60eea -r 6a4f316b8860 security/openssl/PLIST.osf1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssl/PLIST.osf1 Sat Aug 04 14:29:43 2007 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.osf1,v 1.1 2007/08/04 14:29:43 tnn Exp $
+lib/libcrypto.so
+lib/libssl.so
diff -r 9d90dee60eea -r 6a4f316b8860 security/openssl/distinfo
--- a/security/openssl/distinfo Sat Aug 04 14:19:15 2007 +0000
+++ b/security/openssl/distinfo Sat Aug 04 14:29:43 2007 +0000
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.54 2007/04/26 21:11:05 tron Exp $
+$NetBSD: distinfo,v 1.55 2007/08/04 14:29:43 tnn Exp $
SHA1 (openssl-0.9.7i.tar.gz) = 4c23925744d43272fa19615454da44e01465eb06
RMD160 (openssl-0.9.7i.tar.gz) = 0dce52c5793a0c37f17b620f7d26bbf9e4fcf755
Size (openssl-0.9.7i.tar.gz) = 3280907 bytes
SHA1 (patch-aa) = f2489178263220535bdc9b6975afee0215bd7cef
-SHA1 (patch-ac) = ee8229a330cb5fcdd31cceaa14f3cadcba4858bf
+SHA1 (patch-ac) = e3f33b72468ab47b40a426f44e08ea903d83fa26
SHA1 (patch-ad) = 2581d06c21ed6d1c9a554289591031a6eb66a686
SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8
-SHA1 (patch-af) = ae68092ede9db0c4a29c99987965fe34bd5c6213
+SHA1 (patch-af) = f62ac6e23a480eba3edcb3b886276e933556b02f
SHA1 (patch-ah) = 5245d7ca407af952cfa028e46cf7a54dc0f50f6f
SHA1 (patch-ai) = f960775a57551a70806517b439606099000ea97e
SHA1 (patch-ak) = 7f9960a97cbe83c381c2a4565ca3a6e4e661bf54
diff -r 9d90dee60eea -r 6a4f316b8860 security/openssl/patches/patch-ac
--- a/security/openssl/patches/patch-ac Sat Aug 04 14:19:15 2007 +0000
+++ b/security/openssl/patches/patch-ac Sat Aug 04 14:29:43 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.30 2006/06/12 22:46:51 joerg Exp $
+$NetBSD: patch-ac,v 1.31 2007/08/04 14:29:43 tnn Exp $
---- Configure.orig 2006-06-12 20:46:06.000000000 +0000
+--- Configure.orig 2007-08-04 14:54:41.000000000 +0200
+++ Configure
@@ -180,7 +180,7 @@ my %table=(
"solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT
DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-x86_64.o:::dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -11,7 +11,15 @@
"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT
DES_UNROLL::::::::::dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### SPARC Solaris with GNU C setups
-@@ -412,10 +412,25 @@ my %table=(
+@@ -364,6 +364,7 @@ my %table=(
+ "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared:::.so",
+ "alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared:::.so",
+ "alpha-cc-rpath", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared-rpath:::.so",
++"alpha-gcc-rpath", "gcc:-O3::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared-rpath-gcc:::.so",
+ #
+ # This probably belongs in a different section.
+ #
+@@ -412,10 +413,25 @@ my %table=(
"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK
RC4_CHAR:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-ia64-ecc", "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK
RC4_CHAR:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT
DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-x86_64.o:::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -40,7 +48,7 @@
"FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2
BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK
RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
-@@ -845,6 +860,10 @@ PROCESS_ARGS:
+@@ -845,6 +861,10 @@ PROCESS_ARGS:
{
$libs.=$_." ";
}
@@ -51,7 +59,7 @@
elsif (/^-[^-]/ or /^\+/)
{
$flags.=$_." ";
-@@ -1323,7 +1342,7 @@ while (<IN>)
+@@ -1323,7 +1343,7 @@ while (<IN>)
elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
{
my $sotmp = $1;
diff -r 9d90dee60eea -r 6a4f316b8860 security/openssl/patches/patch-af
--- a/security/openssl/patches/patch-af Sat Aug 04 14:19:15 2007 +0000
+++ b/security/openssl/patches/patch-af Sat Aug 04 14:29:43 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.19 2007/04/26 21:11:05 tron Exp $
+$NetBSD: patch-af,v 1.20 2007/08/04 14:29:43 tnn Exp $
---- Makefile.org.orig 2005-10-11 21:20:55.000000000 +0100
-+++ Makefile.org 2007-04-26 21:57:40.000000000 +0100
-@@ -28,6 +28,7 @@
+--- Makefile.org.orig 2007-08-04 15:31:35.000000000 +0200
++++ Makefile.org
+@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
# Do not edit this manually. Use Configure --openssldir=DIR do change this!
OPENSSLDIR=/usr/local/ssl
@@ -10,7 +10,7 @@
# NO_IDEA - Define to build without the IDEA algorithm
# NO_RC4 - Define to build without the RC4 algorithm
-@@ -195,7 +196,7 @@
+@@ -195,7 +196,7 @@ TESTS = alltests
MAKEFILE= Makefile
@@ -19,7 +19,7 @@
MAN1=1
MAN3=3
MANSUFFIX=
-@@ -291,11 +292,13 @@
+@@ -291,11 +292,13 @@ link-shared:
tmp="$(SHARED_LIBS_LINK_EXTS)"; \
for i in $(SHLIBDIRS); do \
prev=lib$$i$(SHLIB_EXT); \
@@ -33,7 +33,7 @@
done; \
fi
-@@ -310,8 +313,7 @@
+@@ -310,8 +313,7 @@ do_gnu-shared:
fi; \
( set -x; ${CC} ${SHARED_LDFLAGS} \
-shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
@@ -43,7 +43,7 @@
-Wl,--whole-archive lib$$i.a \
-Wl,--no-whole-archive $$libs ${EX_LIBS} ) || exit 1; \
libs="-l$$i $$libs"; \
-@@ -327,7 +329,7 @@
+@@ -327,7 +329,7 @@ do_darwin-shared:
fi; \
( set -x; ${CC} ${SHARED_LDFLAGS} \
--verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
@@ -52,7 +52,30 @@
-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \
-install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1; \
libs="-l`basename $$i${SHLIB_EXT} .dylib` $$libs"; \
-@@ -427,6 +429,7 @@
+@@ -410,6 +412,22 @@ do_tru64-shared-rpath:
+ done; \
+ fi
+
++do_tru64-shared-rpath-gcc:
++ if ${DETECT_GNU_LD}; then \
++ $(MAKE) do_gnu-shared; \
++ else \
++ libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
++ if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
++ libs="$(LIBKRB5) $$libs"; \
++ fi; \
++ ( set -x; ${CC} ${SHARED_LDFLAGS} \
++ -shared -Wl,-msym -o lib$$i.so \
++ -Wl,-rpath,${INSTALLTOP}/lib \
++ -Wl,-set_version,"${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
++ -Wl,-all lib$$i.a -Wl,-none $$libs ${EX_LIBS} ) || exit 1; \
++ libs="-l$$i $$libs"; \
++ done; \
++ fi
+
+ # This assumes that GNU utilities are *not* used
+ do_solaris-shared:
+@@ -427,6 +445,7 @@ do_solaris-shared:
-o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-Wl,-Bsymbolic \
@@ -60,7 +83,7 @@
$${MINUSZ}allextract lib$$i.a $${MINUSZ}defaultextract \
$$libs ${EX_LIBS} ) || exit 1; \
libs="-l$$i $$libs"; \
-@@ -534,7 +537,7 @@
+@@ -534,7 +553,7 @@ do_hpux-shared:
# HP/UX-64bit: +forceload
# AIX: -bnogc
# SHAREDFLAGS would be:
@@ -69,7 +92,7 @@
# Tru64 Unix: -shared \
# -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}"
# Solaris: -G -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-@@ -771,16 +774,14 @@
+@@ -771,16 +790,14 @@ dist:
dist_pem_h:
(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
@@ -88,7 +111,7 @@
@headerlist="$(EXHEADER)"; for i in $$headerlist ;\
do \
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-@@ -875,35 +876,53 @@
+@@ -875,35 +892,53 @@ install_docs:
for i in doc/apps/*.pod; do \
fn=`basename $$i .pod`; \
if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
Home |
Main Index |
Thread Index |
Old Index