From dad707e42ed01f8968171b6854f2fadd68bdfe97 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Sun, 25 Feb 2007 18:20:31 +0000
Subject: EncapPackages: Upgrade openssl to 0.9.8e

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2877 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/epkg/Makefile                              |   2 +-
 encap/src/encap-profiles/bcfg2-openssl-0.9.8d.ep | 104 -----------------------
 encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep | 104 +++++++++++++++++++++++
 encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep  |   2 +-
 encap/src/encap-profiles/bcfg2-python-2.4.4.ep   |   2 +-
 5 files changed, 107 insertions(+), 107 deletions(-)
 delete mode 100644 encap/src/encap-profiles/bcfg2-openssl-0.9.8d.ep
 create mode 100644 encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep

(limited to 'encap')

diff --git a/encap/epkg/Makefile b/encap/epkg/Makefile
index a96bded8e..a09762b2e 100644
--- a/encap/epkg/Makefile
+++ b/encap/epkg/Makefile
@@ -14,7 +14,7 @@ export PATH LDFLAGS CPPFLAGS
 
 ZLIB = zlib-1.2.3
 LIBTAR = libtar-1.2.11
-OPENSSL = openssl-0.9.8c
+OPENSSL = openssl-0.9.8e
 CURL = curl-7.15.4
 FGET = fget-1.3.3
 EXPAT = expat-2.0.0
diff --git a/encap/src/encap-profiles/bcfg2-openssl-0.9.8d.ep b/encap/src/encap-profiles/bcfg2-openssl-0.9.8d.ep
deleted file mode 100644
index fa57375a2..000000000
--- a/encap/src/encap-profiles/bcfg2-openssl-0.9.8d.ep
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-openssl-0.9.8d"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.21" />
-
-<environment
-        variable="CC"
-        value="gcc -static-libgcc"
-        type="set"
-/>
-
-<environment
-        variable="PATH"
-PLATFORM_IF_MATCH(solaris)
-        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
-PLATFORM_ELSE
-        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
-PLATFORM_ENDIF
-        type="prepend"
-/>
-
-PLATFORM_IF_MATCH(linux)
-PLATFORM_ELSE
-<environment
-        variable="MAKE"
-        value="gmake"
-        type="set"
-/>
-PLATFORM_ENDIF
-
-<environment
-        variable="LDFLAGS"
-PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
-PLATFORM_ELSE_IF_MATCH(aix)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
-PLATFORM_ELSE_IF_MATCH(solaris)
-        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
-PLATFORM_ELSE
-PLATFORM_ENDIF
-        type="set"
-/>
-
-<environment
-        variable="CPPFLAGS"
-        value="-I/usr/local/lib/bcfg2/include"
-        type="set"
-/>
-
-<source
-url="http://encapsrcdist/mirror/openssl/openssl-0.9.8d.tar.gz
-     http://mirror.opensysadmin.com/openssl/openssl-0.9.8d.tar.gz
-     http://www.openssl.org/source/openssl-0.9.8d.tar.gz"
-	use_objdir="no"
->
-
-<configure>
-if [ -f config.orig ]; then cp config.orig config; fi
-cat config | sed s:CC\=ccc:CC\=gcc:g | sed s:CC\=cc:CC\=gcc:g > config.bcfg2
-mv config config.orig
-cp config.bcfg2 config
-chmod 755 config
-./config \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-	zlib-dynamic shared no-asm \
-	-L/usr/local/lib/bcfg2/lib \
-	-I/usr/local/lib/bcfg2/include
-</configure>
-
-<build type="append">
-    ${MAKE} test || true
-</build>
-
-</source>
-
-<prepackage>
-# Put source back to pristine state
-rm ${builddir}/config
-cp ${builddir}/config.orig ${builddir}/config
-chmod 755 ${builddir}/config
-# Make man pages available from /usr/local/lib/bcfg2/man
-mv lib/bcfg2/ssl/man lib/bcfg2/
-# Other stuff...
-test -d bin || mkdir bin
-ln -sf ../lib/bcfg2/bin/openssl bin/b2-openssl
-# Make "this encap is installed" sentinal file available in /usr/local/var/encap
-test -d var || mkdir var
-test -d var/encap || mkdir var/encap
-touch var/encap/${ENCAP_PKGNAME}
-</prepackage>
-
-<encapinfo>
-description openssl - SSL encryption tool and library
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep b/encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep
new file mode 100644
index 000000000..7faef6ec7
--- /dev/null
+++ b/encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-openssl-0.9.8e"
+>
+
+<prereq package="m4-1.4.4" />
+<prereq package="bcfg2-zlib-1.2.3" />
+<prereq package="bcfg2-pkg-config-0.21" />
+
+<environment
+        variable="CC"
+        value="gcc -static-libgcc"
+        type="set"
+/>
+
+<environment
+        variable="PATH"
+PLATFORM_IF_MATCH(solaris)
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
+PLATFORM_ELSE
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
+PLATFORM_ENDIF
+        type="prepend"
+/>
+
+PLATFORM_IF_MATCH(linux)
+PLATFORM_ELSE
+<environment
+        variable="MAKE"
+        value="gmake"
+        type="set"
+/>
+PLATFORM_ENDIF
+
+<environment
+        variable="LDFLAGS"
+PLATFORM_IF_MATCH(linux)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+PLATFORM_ELSE_IF_MATCH(aix)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE_IF_MATCH(solaris)
+        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE
+PLATFORM_ENDIF
+        type="set"
+/>
+
+<environment
+        variable="CPPFLAGS"
+        value="-I/usr/local/lib/bcfg2/include"
+        type="set"
+/>
+
+<source
+url="http://encapsrcdist/mirror/openssl/openssl-0.9.8e.tar.gz
+     http://mirror.opensysadmin.com/openssl/openssl-0.9.8e.tar.gz
+     http://www.openssl.org/source/openssl-0.9.8e.tar.gz"
+	use_objdir="no"
+>
+
+<configure>
+if [ -f config.orig ]; then cp config.orig config; fi
+cat config | sed s:CC\=ccc:CC\=gcc:g | sed s:CC\=cc:CC\=gcc:g > config.bcfg2
+mv config config.orig
+cp config.bcfg2 config
+chmod 755 config
+./config \
+	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
+	zlib-dynamic shared no-asm \
+	-L/usr/local/lib/bcfg2/lib \
+	-I/usr/local/lib/bcfg2/include
+</configure>
+
+<build type="append">
+    ${MAKE} test || true
+</build>
+
+</source>
+
+<prepackage>
+# Put source back to pristine state
+rm ${builddir}/config
+cp ${builddir}/config.orig ${builddir}/config
+chmod 755 ${builddir}/config
+# Make man pages available from /usr/local/lib/bcfg2/man
+mv lib/bcfg2/ssl/man lib/bcfg2/
+# Other stuff...
+test -d bin || mkdir bin
+ln -sf ../lib/bcfg2/bin/openssl bin/b2-openssl
+# Make "this encap is installed" sentinal file available in /usr/local/var/encap
+test -d var || mkdir var
+test -d var/encap || mkdir var/encap
+touch var/encap/${ENCAP_PKGNAME}
+</prepackage>
+
+<encapinfo>
+description openssl - SSL encryption tool and library
+</encapinfo>
+
+</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
index a5a993205..1328d8dfa 100644
--- a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
+++ b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
@@ -10,7 +10,7 @@
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-pkg-config-0.21" />
-<prereq package="bcfg2-openssl-0.9.8d" />
+<prereq package="bcfg2-openssl-0.9.8e" />
 <prereq package="bcfg2-python-2.4.4" />
 
 <environment
diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
index 65ee1ee31..83b993f05 100644
--- a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
+++ b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
@@ -12,7 +12,7 @@
 <prereq package="bcfg2-gzip-1.2.4b" />
 <prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-readline-5.2" />
-<prereq package="bcfg2-openssl-0.9.8d" />
+<prereq package="bcfg2-openssl-0.9.8e" />
 
 <environment
         variable="CC"
-- 
cgit v1.2.3-1-g7c22