summaryrefslogtreecommitdiffstats
path: root/encap/src
diff options
context:
space:
mode:
Diffstat (limited to 'encap/src')
-rw-r--r--encap/src/encap-profiles/Makefile4
-rw-r--r--encap/src/encap-profiles/bcfg2-0.9.2.ep1
-rw-r--r--encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep104
-rw-r--r--encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep99
-rw-r--r--encap/src/encap-profiles/bcfg2-python-2.4.4.ep16
5 files changed, 1 insertions, 223 deletions
diff --git a/encap/src/encap-profiles/Makefile b/encap/src/encap-profiles/Makefile
index e40cf20fe..d16033350 100644
--- a/encap/src/encap-profiles/Makefile
+++ b/encap/src/encap-profiles/Makefile
@@ -23,9 +23,7 @@ BCFG2_GZIP := $(basename $(wildcard bcfg2-gzip-*.ep))
BCFG2_LIBXML2 := $(basename $(wildcard bcfg2-libxml2-*.ep))
BCFG2_LIBXSLT := $(basename $(wildcard bcfg2-libxslt-*.ep))
BCFG2_LXML := $(basename $(wildcard bcfg2-lxml-*.ep))
-BCFG2_OPENSSL := $(basename $(wildcard bcfg2-openssl-*.ep))
BCFG2_PKG_CONFIG := $(basename $(wildcard bcfg2-pkg-config-*.ep))
-BCFG2_PYOPENSSL := $(basename $(wildcard bcfg2-pyopenssl-*.ep))
BCFG2_PYREX := $(basename $(wildcard bcfg2-pyrex-*.ep))
BCFG2_PYTHON := $(basename $(wildcard bcfg2-python-[0-9].[0-9]*.ep))
BCFG2_READLINE := $(basename $(wildcard bcfg2-readline-*.ep))
@@ -37,7 +35,7 @@ OSTIARTY_DOC := $(basename $(wildcard ostiary-doc-*.ep))
PATCH := $(basename $(wildcard patch-*.ep))
RUNIT := $(basename $(wildcard runit-[0-9].[0-9]*.ep))
-sources_ep := $(sort $(BCFG2) $(BCFG2_CHEETAH) $(BCFG2_ELEMENTTREE) $(BCFG2_GZIP) $(BCFG2_OPENSSL) $(BCFG2_PKG_CONFIG) $(BCFG2_PYOPENSSL) $(BCFG2_PYTHON) $(BCFG2_READLINE) $(BCFG2_ZLIB) $(MAKESELF) $(OSTIARTY) $(PATCH) $(RUNIT))
+sources_ep := $(sort $(BCFG2) $(BCFG2_CHEETAH) $(BCFG2_ELEMENTTREE) $(BCFG2_GZIP) $(BCFG2_PKG_CONFIG) $(BCFG2_PYTHON) $(BCFG2_READLINE) $(BCFG2_ZLIB) $(MAKESELF) $(OSTIARTY) $(PATCH) $(RUNIT))
sources_sh := $(sort $(M4))
diff --git a/encap/src/encap-profiles/bcfg2-0.9.2.ep b/encap/src/encap-profiles/bcfg2-0.9.2.ep
index 4802c9bfe..a7105cb16 100644
--- a/encap/src/encap-profiles/bcfg2-0.9.2.ep
+++ b/encap/src/encap-profiles/bcfg2-0.9.2.ep
@@ -17,7 +17,6 @@
<prereq package="patch-2.5.9" />
<prereq package="bcfg2-pkg-config-0.21" />
<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-pyopenssl-0.6" />
<prereq package="bcfg2-elementtree-1.2.6" />
<environment
diff --git a/encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep b/encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep
deleted file mode 100644
index 7faef6ec7..000000000
--- a/encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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
deleted file mode 100644
index 1328d8dfa..000000000
--- a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
- profile_ver="1.0"
- pkgspec="bcfg2-pyopenssl-0.6"
->
-
-<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.8e" />
-<prereq package="bcfg2-python-2.4.4" />
-
-<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 -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/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/pyopenssl/pyOpenSSL-0.6.tar.gz
- http://mirror.opensysadmin.com/pyopenssl/pyOpenSSL-0.6.tar.gz
- http://umn.dl.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-0.6.tar.gz"
->
-
-<configure>
-/usr/local/lib/bcfg2/bin/python setup.py build_ext \
--I/usr/local/lib/bcfg2/include/openssl \
--L/usr/local/lib/bcfg2/lib/
-</configure>
-
-<build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install>
-
-<clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean
-</clean>
-
-</source>
-
-<prepackage type="set">
-# 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 pyOpenSSL - Python interface to the OpenSSL library
-</encapinfo>
-
-</encap_profile>
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 83b993f05..36a1f9d1d 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,6 @@
<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.8e" />
<environment
variable="CC"
@@ -68,9 +67,6 @@ url="http://encapsrcdist/mirror/python/Python-2.4.4.tgz
if [ -f setup.py.orig ]; then cp setup.py.orig setup.py; fi
cat setup.py \
| sed s:\/usr\/local\/:\/usr\/local\/lib\/bcfg2\/:g \
-| sed s:\/usr\/local\/lib\/bcfg2\/ssl\/include:\/usr\/local\/lib\/bcfg2\/include:g \
-| sed s:\/usr\/contrib\/ssl\/include\/:\/usr\/local\/lib\/bcfg2\/include\/openssl\/:g \
-| sed s:\/usr\/local\/lib\/bcfg2\/ssl\/lib:\/usr\/local\/lib\/bcfg2\/lib:g \
> setup.py.bcfg2
mv setup.py setup.py.orig
cp setup.py.bcfg2 setup.py
@@ -85,18 +81,6 @@ PLATFORM_ENDIF
--without-cxx
</configure>
-<build type="append"><![CDATA[
-# Make sure linking to openssl worked
-${builddir}/python -c "from httplib import HTTPS" || HS="no"; \
-if [ "${HS}x" = "nox" ]; then \
- printf "ERROR: HTTPS fails (usually a problem with linking against "; \
- printf "openssl), aborting...\n"; \
- exit 1; \
-else \
- printf "INFO: HTTPS works\n"; \
-fi
-]]></build>
-
</source>
<prepackage><![CDATA[
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 01:28:42 +0000