use LibreSSL instead of OpenSSL.

e6fa2961 · Kazuhiko Shiozaki · 6ec683a6 · e6fa2961 · e6fa2961 · e6fa2961
Commit e6fa2961 authored Sep 24, 2015 by Kazuhiko Shiozaki
90 changed files
--- a/component/accords/buildout.cfg
+++ b/component/accords/buildout.cfg
@@ -2,9 +2,9 @@
 extends =
  ../autoconf/buildout.cfg
  ../automake/buildout.cfg
-  ../libtool/buildout.cfg
  ../git/buildout.cfg
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg
+  ../libtool/buildout.cfg
  ../libuuid/buildout.cfg

 parts = accords
@@ -29,11 +29,11 @@ configure-command =
  autoreconf --install
  ./configure
 configure-options =
-  --with-ssl=${openssl:location}
+  --with-ssl=${libressl:location}
  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
 environment =
-  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include
-  LDFLAGS =-Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
+  CPPFLAGS =-I${libuuid:location}/include -I${libressl:location}/include
+  LDFLAGS =-Wl,-rpath=${libressl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
  LIBTOOL=libtool
  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s


--- a/component/apache-php/buildout.cfg
+++ b/component/apache-php/buildout.cfg
@@ -11,6 +11,7 @@ extends =
  ../libiconv/buildout.cfg
  ../libjpeg/buildout.cfg
  ../libpng/buildout.cfg
+  ../libressl/buildout.cfg
  ../libtool/buildout.cfg
  ../mariadb/buildout.cfg
  ../openldap/buildout.cfg
@@ -43,7 +44,7 @@ configure-options =
  --with-gettext=${gettext:location}
  --with-ldap=${openldap:location}
  --with-imap-ssl
-  --with-openssl=${openssl:location}
+  --with-openssl=${libressl:location}
  --enable-libxml
  --enable-mbstring
  --enable-session
@@ -56,7 +57,7 @@ configure-options =
 # XXX we could mkdir tmp there

 environment =
-  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${libressl:location}/lib/pkgconfig
  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
  LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
  TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
@@ -86,7 +87,7 @@ configure-options =
  --with-gettext=${gettext:location}
  --with-ldap=${openldap:location}
  --with-imap-ssl
-  --with-openssl=${openssl:location}
+  --with-openssl=${libressl:location}
  --enable-libxml
  --enable-mbstring
  --enable-session
@@ -100,7 +101,7 @@ configure-options =
 # XXX we could mkdir tmp there

 environment =
-  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${libressl:location}/lib/pkgconfig
  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
  LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
  TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}

--- a/component/apache-wsgi/buildout.cfg
+++ b/component/apache-wsgi/buildout.cfg
@@ -2,17 +2,17 @@

 extends = 
  ../apache/buildout.cfg
-  ../python-2.7/buildout.cfg
  ../bzip2/buildout.cfg
+  ../file/buildout.cfg
  ../gdbm/buildout.cfg
  ../gettext/buildout.cfg
  ../libexpat/buildout.cfg
+  ../libressl/buildout.cfg
  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
+  ../python-2.7/buildout.cfg
  ../readline/buildout.cfg
  ../sqlite3/buildout.cfg
  ../zlib/buildout.cfg
-  ../file/buildout.cfg

 parts =
  apache-wsgi
@@ -27,8 +27,8 @@ configure-options =
  --with-threads

 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${libressl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${libressl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
  LD_RUN_PATH=${buildout:parts-directory}/${:_buildout_section_name_}/lib
  
 [apache-wsgi]

--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
@@ -6,9 +6,9 @@ parts =
 extends =
  ../gdbm/buildout.cfg
  ../libexpat/buildout.cfg
+  ../libressl/buildout.cfg
  ../libuuid/buildout.cfg
  ../libxml2/buildout.cfg
-  ../openssl/buildout.cfg
  ../pcre/buildout.cfg
  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
@@ -65,7 +65,7 @@ configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_na
                    --enable-ssl
                    --disable-lua
                    --with-included-apr
-                    --with-ssl=${openssl:location}
+                    --with-ssl=${libressl:location}
                    --with-z=${zlib:location}
                    --with-expat=${libexpat:location}
                    --with-libxml2=${libxml2:location}/include/libxml2
@@ -86,9 +86,9 @@ configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_na

 environment =
  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig
+  CPPFLAGS =-I${libuuid:location}/include -I${libressl:location}/include
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libressl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib

 [apache-antiloris]
 # Note: Shall react on each build of apache and reinstall itself
@@ -143,7 +143,7 @@ configure-options = --disable-static
                    --enable-so
                    --enable-ssl
                    --with-included-apr
-                    --with-ssl=${openssl:location}
+                    --with-ssl=${libressl:location}
                    --with-z=${zlib:location}
                    --with-expat=${libexpat:location}
                    --with-pcre=${pcre:location}
@@ -163,9 +163,9 @@ configure-options = --disable-static

 environment =
  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig
  CPPFLAGS =-I${libuuid:location}/include
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libressl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib

 [apache-antiloris-apache-2.2]
 # Note: Shall react on each build of apache and reinstall itself

--- a/component/boinc-client/buildout.cfg
+++ b/component/boinc-client/buildout.cfg
@@ -4,16 +4,16 @@ parts =
  boinc

 extends =
-  ../curl/buildout.cfg
-  ../openssl/buildout.cfg
-  ../zlib/buildout.cfg
-  ../subversion/buildout.cfg
-  ../m4/buildout.cfg
  ../automake/buildout.cfg
+  ../curl/buildout.cfg
+  ../gnutls/buildout.cfg
+  ../libressl/buildout.cfg
  ../libtool/buildout.cfg
-  ../pkgconfig/buildout.cfg
+  ../m4/buildout.cfg
  ../openldap/buildout.cfg
-  ../gnutls/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../subversion/buildout.cfg
+  ../zlib/buildout.cfg
  ../../stack/slapos.cfg

 [download-boinc]
@@ -32,7 +32,7 @@ command = cp ${download-boinc:location}/${download-boinc:filename} ${buildout:pa
  cd ${buildout:parts-directory} && \
  ./${download-boinc:filename}
 #boinc client is a binary: write LD_LABRARY_PATH
-ld_library = ${curl:location}/lib:${openssl:location}/lib:${zlib:location}/lib
+ld_library = ${curl:location}/lib:${libressl:location}/lib:${zlib:location}/lib
 location = ${buildout:parts-directory}/BOINC

 [boinc-patch]
@@ -73,7 +73,7 @@ configure-options =
  --disable-manager
  --disable-server
  --with-pkg-config
-  --with-ssl=${openssl:location}
+  --with-ssl=${libressl:location}
  --with-libldap=${openldap:location}/lib
  --with-libgnutls=${gnutls:location}/lib
  --with-libcurl=${curl:location}/lib
@@ -86,9 +86,9 @@ patch-options = -p1

 environment =
  PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:${subversion:location}/bin:${curl:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig
  M4=${m4:location}/bin/m4
  CFLAGS=-fPIC
-  CPPFLAGS=-I${openssl:location}/include -I${zlib:location}/include
-  LDFLAGS = -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${libressl:location}/include -I${zlib:location}/include
+  LDFLAGS = -L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
  ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal
--- a/component/boinc/buildout.cfg
+++ b/component/boinc/buildout.cfg
@@ -5,17 +5,17 @@ parts=
  boinc  

 extends =
-  ../subversion/buildout.cfg
-  ../m4/buildout.cfg
  ../automake/buildout.cfg
-  ../libtool/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../openssl/buildout.cfg
+  ../curl/buildout.cfg
  ../cyrus-sasl/buildout.cfg
-  ../openldap/buildout.cfg
  ../gnutls/buildout.cfg
+  ../libressl/buildout.cfg
+  ../libtool/buildout.cfg
+  ../m4/buildout.cfg
  ../mariadb/buildout.cfg
-  ../curl/buildout.cfg
+  ../openldap/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../subversion/buildout.cfg
  ../../stack/slapos.cfg

 [mariadb]
@@ -59,7 +59,7 @@ configure-options =
  --disable-manager
  --disable-client
  --with-pkg-config
-  --with-ssl=${openssl:location}
+  --with-ssl=${libressl:location}
  --with-libsasl2=${cyrus-sasl:location}/lib
  --with-libldap=${openldap:location}/lib
  --with-libgnutls=${gnutls:location}/lib
@@ -69,10 +69,10 @@ configure-options =

 environment =
  PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:${subversion:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig
  M4=${m4:location}/bin/m4
-  CPPFLAGS=-I${openssl:location}/include -I${mariadb:location}/include
-  LDFLAGS = -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${mariadb:location}/lib -Wl,-rpath=${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${libressl:location}/include -I${mariadb:location}/include
+  LDFLAGS = -L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib -L${mariadb:location}/lib -Wl,-rpath=${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
  MYSQL_CONFIG=${mariadb:location}/bin/mysql_config
  ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal

--- a/component/cclient/buildout.cfg
+++ b/component/cclient/buildout.cfg
@@ -3,7 +3,7 @@

 [buildout]
 extends =
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg

 parts =
  cclient-patch
@@ -25,10 +25,10 @@ configure-command = true
 make-options = 
  slx
  SSLTYPE=unix
-  SSLDIR=${openssl:location}
+  SSLDIR=${libressl:location}
  SSLCRYPTO=-lcrypto
  IP=6
-  SSLLIB=${openssl:location}/lib
+  SSLLIB=${libressl:location}/lib
  EXTRACFLAGS=-fPIC
  CCLIENT=${buildout:parts-directory}
  -j1

--- a/component/couchdb/buildout.cfg
+++ b/component/couchdb/buildout.cfg
 [buildout]

 extends =
-  ../openssl/buildout.cfg
  ../curl/buildout.cfg
  ../erlang/buildout.cfg
  ../icu/buildout.cfg
+  ../libressl/buildout.cfg
  ../spidermonkey/buildout.cfg

 parts = couchdb

--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
@@ -3,7 +3,7 @@

 [buildout]
 extends =
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg
  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg
@@ -30,7 +30,7 @@ configure-options =
  --disable-sspi
  --without-gnutls
  --without-spnego
-  --with-ssl=${openssl:location}
+  --with-ssl=${libressl:location}
  --with-zlib=${zlib:location}
  --without-nss
  --without-libmetalink
@@ -41,5 +41,5 @@ configure-options =

 environment =
  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig
+  LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libressl:location}/lib
--- a/component/erlang/buildout.cfg
+++ b/component/erlang/buildout.cfg
 [buildout]
 extends =
-  ../openssl/buildout.cfg
+  ../java/buildout.cfg
+  ../libressl/buildout.cfg
  ../ncurses/buildout.cfg
  ../zlib/buildout.cfg
-  ../java/buildout.cfg

 parts = erlang

@@ -12,7 +12,7 @@ recipe = slapos.recipe.cmmi
 url = http://www.erlang.org/download/otp_src_R14B04.tar.gz
 md5sum = 4b469729f103f52702bfb1fb24529dc0
 configure-options =
-    --with-ssl=${openssl:location}
+    --with-ssl=${libressl:location}
    --with-java
    --enable-dynamic-ssl-lib
    --enable-shared-zlib

--- a/component/gdal/buildout.cfg
+++ b/component/gdal/buildout.cfg
 [buildout]
 extends =
-  ../numpy/buildout.cfg
  ../curl/buildout.cfg
  ../geos/buildout.cfg
  ../giflib/buildout.cfg
  ../jasper/buildout.cfg
  ../libexpat/buildout.cfg
+  ../libressl/buildout.cfg
+  ../numpy/buildout.cfg
  ../pcre/buildout.cfg
  ../proj4/buildout.cfg
  ../sqlite3/buildout.cfg
@@ -35,7 +36,7 @@ configure-options =
  --with-xml2=${libxml2:location}/bin/xml2-config
 environment =
  CPPFLAGS=-I${pcre:location}/include
-  LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -Wl,-rpath=${curl:location}/lib -Wl,-rpath=${geos:location}/lib -Wl,-rpath=${giflib:location}/lib -Wl,-rpath=${jasper:location}/lib -Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${libtiff:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${webp:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -Wl,-rpath=${curl:location}/lib -Wl,-rpath=${geos:location}/lib -Wl,-rpath=${giflib:location}/lib -Wl,-rpath=${jasper:location}/lib -Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${libtiff:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${webp:location}/lib -Wl,-rpath=${zlib:location}/lib

 [gdal-python]
 recipe = zc.recipe.egg:custom

--- a/component/git/buildout.cfg
+++ b/component/git/buildout.cfg
@@ -6,7 +6,7 @@ extends =
  ../curl/buildout.cfg
  ../gettext/buildout.cfg
  ../libexpat/buildout.cfg
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg
  ../pcre/buildout.cfg
  ../perl/buildout.cfg
  ../xz-utils/buildout.cfg
@@ -20,7 +20,7 @@ url = https://www.kernel.org/pub/software/scm/git/git-2.5.1.tar.xz
 md5sum = 55b9c496ea2d87148a2bfe1b6f6edd02
 configure-options =
  --with-curl=${curl:location}
-  --with-openssl=${openssl:location}
+  --with-openssl=${libressl:location}
  --with-zlib=${zlib:location}
  --with-libpcre=${pcre:location}
  --with-expat=${libexpat:location}
@@ -30,7 +30,7 @@ environment =
  NO_TCLTK=y
  PATH=${curl:location}/bin:${gettext:location}/bin:${xz-utils:location}/bin:%(PATH)s
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${zlib:location}/lib

 [gitweb]
 <= git

--- a/component/haproxy/buildout.cfg
+++ b/component/haproxy/buildout.cfg
@@ -3,7 +3,7 @@

 [buildout]
 extends =
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg
  ../pcre/buildout.cfg
  ../zlib/buildout.cfg

@@ -22,12 +22,12 @@ make-options =
  ARCH="$(uname -m 2>/dev/null|grep -E '^(x86_64|i[3456]86)$')"
  PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
  USE_OPENSSL=1
-  SSL_INC=${openssl:location}/include
-  SSL_LIB=${openssl:location}/lib
+  SSL_INC=${libressl:location}/include
+  SSL_LIB=${libressl:location}/lib
  USE_PCRE=1
  USE_ZLIB=1
  ZLIB_INC=${zlib:location}/include
  ZLIB_LIB=${zlib:location}/lib
-  ADDLIB="-Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  ADDLIB="-Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
 environment =
  PATH=${pcre:location}/bin:%(PATH)s
--- a/component/kumo/buildout.cfg
+++ b/component/kumo/buildout.cfg
 [buildout]
 extends =
-  ../tokyocabinet/buildout.cfg
+  ../libressl/buildout.cfg
  ../messagepack/buildout.cfg
-  ../openssl/buildout.cfg
+  ../tokyocabinet/buildout.cfg
  ../zlib/buildout.cfg

 parts = kumo
@@ -22,5 +22,5 @@ configure-options =
  --with-msgpack=${messagepack:location}

 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${libressl:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${libressl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libressl:location}/lib
--- a/component/m2crypto/buildout.cfg
+++ b/component/m2crypto/buildout.cfg
@@ -3,7 +3,7 @@

 [buildout]
 extends =
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg
  ../swig/buildout.cfg
 parts =
  M2Crypto
@@ -13,11 +13,11 @@ recipe = zc.recipe.egg:custom
 egg = M2Crypto
 environment = M2Crypto-env
 rpath =
-  ${openssl:location}/lib/
+  ${libressl:location}/lib/
 include-dirs =
-  ${openssl:location}/include
+  ${libressl:location}/include
 library-dirs =
-  ${openssl:location}/lib
+  ${libressl:location}/lib

 [M2Crypto-env]
 PATH = ${swig:location}/bin:%(PATH)s
--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -7,9 +7,9 @@ extends =
  ../groonga/buildout.cfg
  ../jemalloc/buildout.cfg
  ../libaio/buildout.cfg
+  ../libressl/buildout.cfg
  ../libxml2/buildout.cfg
  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
  ../pcre/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../readline/buildout.cfg
@@ -44,13 +44,13 @@ configure-options =
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
  -DWITHOUT_MROONGA_STORAGE_ENGINE=1
  -DWITHOUT_DAEMON_EXAMPLE=1
-  -DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${zlib:location}/lib
+  -DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${libressl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${zlib:location}/include"
+  -DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${libressl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${zlib:location}/include"
+  -DCMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${libressl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${zlib:location}/lib
 environment =
  CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${zlib:location}/include
-  CMAKE_LIBRARY_PATH=${libaio:location}/lib:{libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${zlib:location}/lib
+  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${libressl:location}/include:${pcre:location}/include:${readline5:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${libaio:location}/lib:{libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${libressl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${zlib:location}/lib
  LDFLAGS=-L${jemalloc:location}/lib -Wl,-rpath=${jemalloc:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${pcre:location}/lib -L${zlib:location}/lib

 [mroonga-mariadb]

--- a/component/mydumper/buildout.cfg
+++ b/component/mydumper/buildout.cfg
@@ -3,10 +3,10 @@
 extends =
    ../cmake/buildout.cfg
    ../glib/buildout.cfg
-    ../pkgconfig/buildout.cfg
-    ../openssl/buildout.cfg
-    ../pcre/buildout.cfg
+    ../libressl/buildout.cfg
    ../mariadb/buildout.cfg
+    ../pcre/buildout.cfg
+    ../pkgconfig/buildout.cfg

 parts = mydumper

@@ -22,10 +22,10 @@ cmake-command = ${cmake:location}/bin/cmake
 mysql-config = ${mariadb:location}/bin/mysql_config
 mysqllib = ${mariadb:location}/lib
 path = ${pkgconfig:location}/bin
-pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/:${openssl:location}/lib/pkgconfig/
-libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/:${openssl:location}/lib/
-includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include:${openssl:location}/include/
-cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include -I${openssl:location}/include/
+pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/:${libressl:location}/lib/pkgconfig/
+libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/:${libressl:location}/lib/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include:${libressl:location}/include/
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include -I${libressl:location}/include/
 mysql-include-dir = ${mariadb:location}/include
 mydumper-patches =
   ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1

--- a/component/mysql-python/buildout.cfg
+++ b/component/mysql-python/buildout.cfg
 [buildout]
 extends =
+  ../libressl/buildout.cfg
  ../mariadb/buildout.cfg
-  ../openssl/buildout.cfg
  ../zlib/buildout.cfg

 parts =
@@ -16,8 +16,8 @@ egg = MySQL-python
 environment = mysql-python-env
 library-dirs =
  ${zlib:location}/lib/
-  ${openssl:location}/lib/
+  ${libressl:location}/lib/
 rpath =
  ${mariadb:location}/lib/
  ${zlib:location}/lib/
-  ${openssl:location}/lib/
+  ${libressl:location}/lib/
--- a/component/mysql-tritonn-5.0/buildout.cfg
+++ b/component/mysql-tritonn-5.0/buildout.cfg
@@ -6,13 +6,13 @@
 extends =
  ../autoconf/buildout.cfg
  ../automake/buildout.cfg
-  ../zlib/buildout.cfg
  ../bison/buildout.cfg
  ../flex/buildout.cfg
+  ../libressl/buildout.cfg
  ../libtool/buildout.cfg
  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
  ../readline/buildout.cfg
+  ../zlib/buildout.cfg

 parts =
    mysql-tritonn-5.0
@@ -66,7 +66,7 @@ configure-command =
 configure-options =
  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
  --with-senna
-  --with-openssl=${openssl:location}
+  --with-openssl=${libressl:location}
  --without-mecab
  --enable-thread-safe-client
  --with-charset=utf8
@@ -89,4 +89,4 @@ patches =
 environment =
    PATH=${senna:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
    CPPFLAGS=-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline5:location}/include
-    LDFLAGS=-L${senna:location}/lib -L${readline5:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline5:location}/lib
+    LDFLAGS=-L${senna:location}/lib -L${readline5:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline5:location}/lib
--- a/component/neon/buildout.cfg
+++ b/component/neon/buildout.cfg
@@ -2,8 +2,8 @@
 parts =
  neon
 extends =
+  ../libressl/buildout.cfg
  ../libxml2/buildout.cfg
-  ../openssl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg

@@ -23,6 +23,6 @@ configure-options =

 environment =
  PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
-  CPPFLAGS=-I${openssl:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libxml2:location}/lib
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
+  CPPFLAGS=-I${libressl:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libxml2:location}/lib
--- a/component/nginx/buildout.cfg
+++ b/component/nginx/buildout.cfg
@@ -3,7 +3,7 @@ extends =
  ../coreutils/buildout.cfg
  ../git/buildout.cfg
  ../libexpat/buildout.cfg
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg
  ../pcre/buildout.cfg
  ../zlib/buildout.cfg

@@ -21,8 +21,8 @@ configure-options=
  --with-http_ssl_module
  --with-mail
  --with-mail_ssl_module
-  --with-ld-opt="-L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
-  --with-cc-opt="-I ${openssl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
+  --with-ld-opt="-L ${libressl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  --with-cc-opt="-I ${libressl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"

 [nginx-dav-ext-module]
 recipe = hexagonit.recipe.download
@@ -39,8 +39,8 @@ configure-options =
  --with-mail
  --with-mail_ssl_module
  --error-log-path=var/log/nginx.error.log
-  --with-ld-opt=" -L ${libexpat:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
-  --with-cc-opt="-I ${libexpat:location}/include -I ${openssl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
+  --with-ld-opt=" -L ${libexpat:location}/lib -L ${libressl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  --with-cc-opt="-I ${libexpat:location}/include -I ${libressl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
  --with-http_dav_module 
  --add-module='${nginx-dav-ext-module:location}'

@@ -65,8 +65,8 @@ strip-top-level-dir = true
 configure-options=
  --with-ipv6
  --with-http_ssl_module
-  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
+  --with-ld-opt="-L ${zlib:location}/lib -L ${libressl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libressl:location}/lib"
+  --with-cc-opt="-I ${pcre:location}/include -I ${libressl:location}/include -I ${zlib:location}/include"
  --add-module=${hexaglobe-nginx-module:location}/sub_module
 # --add-module=${hexaglobe-nginx-module:location}/nginx-upstream-fair

@@ -81,8 +81,8 @@ git-executable = ${git:location}/bin/git
 configure-options=
  --with-ipv6
  --with-http_ssl_module
-  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
+  --with-ld-opt="-L ${zlib:location}/lib -L ${libressl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libressl:location}/lib"
+  --with-cc-opt="-I ${pcre:location}/include -I ${libressl:location}/include -I ${zlib:location}/include"
  --add-module=${nginx-push-stream-module:location}

 [nginx-push-stream-output]

--- a/component/nodejs/buildout.cfg
+++ b/component/nodejs/buildout.cfg
 [buildout]
 extends =
  ../git/buildout.cfg
+  ../libressl/buildout.cfg
  ../pkgconfig/buildout.cfg
-  ../openssl/buildout.cfg
  ../zlib/buildout.cfg

 parts =
@@ -17,14 +17,14 @@ recipe = slapos.recipe.cmmi
 url = http://nodejs.org/dist/v0.10.36/node-v0.10.36.tar.gz
 md5sum = 4b3527b830f2dacaba01aececd509c6f
 configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
+  --openssl-includes=${libressl:location}/include
+  --openssl-libpath=${libressl:location}/lib
 environment =
  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig/
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${libressl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

 [nodejs-0.8]
 # Server-side Javascript.
@@ -32,14 +32,14 @@ recipe = slapos.recipe.cmmi
 url = http://nodejs.org/dist/v0.8.23/node-v0.8.23.tar.gz
 md5sum = 22fe54ac365f52d3d80ecf748e7323d5
 configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
+  --openssl-includes=${libressl:location}/include
+  --openssl-libpath=${libressl:location}/lib
 environment =
  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig/
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${libressl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

 [nodejs-0.6]
 # Server-side Javascript.
@@ -47,27 +47,27 @@ recipe = slapos.recipe.cmmi
 url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz
 md5sum = 0da985a0bf820400af92363b9f453fe4
 configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
+  --openssl-includes=${libressl:location}/include
+  --openssl-libpath=${libressl:location}/lib
 environment =
  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig/
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${libressl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

 [nodejs-0.4]
 recipe = slapos.recipe.cmmi
 url = http://nodejs.org/dist/node-v0.4.12.tar.gz
 md5sum = a6375eaa43db5356bf443e25b828ae16
 configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
+  --openssl-includes=${libressl:location}/include
+  --openssl-libpath=${libressl:location}/lib
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig/
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${libressl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

 [npm]
 # Node.js Package Manager

--- a/component/openldap/buildout.cfg
+++ b/component/openldap/buildout.cfg
@@ -2,9 +2,9 @@
 parts =
  openldap
 extends =
-  ../groff/buildout.cfg
-  ../openssl/buildout.cfg
  ../cyrus-sasl/buildout.cfg
+  ../groff/buildout.cfg
+  ../libressl/buildout.cfg

 [openldap]
 recipe = slapos.recipe.cmmi
@@ -23,6 +23,6 @@ configure-options =
  --with-tls=openssl

 environment =
-  CPPFLAGS=-I${openssl:location}/include -I${cyrus-sasl:location}/include
-  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${cyrus-sasl:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib
+  CPPFLAGS=-I${libressl:location}/include -I${cyrus-sasl:location}/include
+  LDFLAGS=-L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib -L${cyrus-sasl:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib
  PATH=${groff:location}/bin:%(PATH)s
--- a/component/openssh/buildout.cfg
+++ b/component/openssh/buildout.cfg
@@ -6,7 +6,7 @@

 [buildout]
 extends = 
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg

 parts =
  openssh
@@ -19,8 +19,8 @@ url = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz
 configure-option = 
  -I${zlib:location}/include
  -L${zlib:location}/lib
-  -I${openssl:location}/include
-  -L${openssl:location}/lib
-  --with-ssl-dir=${openssl:location}/lib
+  -I${libressl:location}/include
+  -L${libressl:location}/lib
+  --with-ssl-dir=${libressl:location}/lib
  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
  --libdir=lib
--- a/component/openvpn/buildout.cfg
+++ b/component/openvpn/buildout.cfg
 [buildout]
 extends =
+  ../flex/buildout.cfg
+  ../libressl/buildout.cfg
  ../lzo/buildout.cfg
  ../patch/buildout.cfg
-  ../openssl/buildout.cfg
-  ../flex/buildout.cfg

 parts =
  openvpn
@@ -23,10 +23,10 @@ configure-options =
 environment =
  LZO_LIBS=-L${lzo:location}/lib -llzo2
  LZO_CFLAGS=-I${lzo:location}/include
-  OPENSSL_SSL_LIBS="-L${openssl:location}/lib -lssl" 
-  OPENSSL_SSL_CFLAGS="-I${openssl:location}/include/" 
-  OPENSSL_CRYPTO_LIBS="-L${openssl:location}/lib -lcrypto" 
-  OPENSSL_CRYPTO_CFLAGS="-I${openssl:location}/include"
-  LDFLAGS =-Wl,-rpath=${lzo:location}/lib -Wl,-rpath=${flex:location}/lib -Wl,-rpath=${openssl:location}/lib
+  OPENSSL_SSL_LIBS="-L${libressl:location}/lib -lssl" 
+  OPENSSL_SSL_CFLAGS="-I${libressl:location}/include/" 
+  OPENSSL_CRYPTO_LIBS="-L${libressl:location}/lib -lcrypto" 
+  OPENSSL_CRYPTO_CFLAGS="-I${libressl:location}/include"
+  LDFLAGS =-Wl,-rpath=${lzo:location}/lib -Wl,-rpath=${flex:location}/lib -Wl,-rpath=${libressl:location}/lib
  CPPFLAGS=-I${lzo:location}/include -I${flex:location}/include

--- a/component/perl-Crypt-SSLeay/buildout.cfg
+++ b/component/perl-Crypt-SSLeay/buildout.cfg
 [buildout]
 extends =
+  ../libressl/buildout.cfg
  ../perl/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../component/zlib/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
  perl-Crypt-SSLeay

@@ -12,9 +12,9 @@ modules =
  G/GA/GAAS/URI-1.60.tar.gz
  N/NA/NANIS/Crypt-SSLeay-0.64.tar.gz
 cpan-configuration =
-  make_arg=('OTHERLDFLAGS="-L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${openssl:location}/lib -Wl,-R${openssl:location}/lib"')
-  makepl_arg=('INC=-I${openssl:location}/include')
+  make_arg=('OTHERLDFLAGS="-L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libressl:location}/lib -Wl,-R${libressl:location}/lib"')
+  makepl_arg=('INC=-I${libressl:location}/include')
 environment =
-  OPENSSL_PREFIX=${openssl:location}
+  OPENSSL_PREFIX=${libressl:location}
 perl = perl

--- a/component/perl-DBD-MySQL/buildout.cfg
+++ b/component/perl-DBD-MySQL/buildout.cfg
 [buildout]
 extends =
-  ../mysql-tritonn-5.0/buildout.cfg
+  ../libressl/buildout.cfg
  ../mariadb/buildout.cfg
+  ../mysql-tritonn-5.0/buildout.cfg

 parts =
  perl-DBD-MySQL
@@ -21,11 +22,11 @@ patch-options = -p1
 configure-command =
  ${perl:location}/bin/perl Makefile.PL --mysql_config=${mysql-tritonn-5.0:location}/bin/mysql_config
 environment =
-  OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mysql-tritonn-5.0:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib
+  OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mysql-tritonn-5.0:location}/lib/mysql -Wl,-rpath=${libressl:location}/lib

 [perl-DBD-mariadb]
 <= perl-DBD-MySQL-common
 configure-command =
  ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config
 environment =
-  OTHERLDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -Wl,-rpath=${openssl:location}/lib
+  OTHERLDFLAGS=-L${zlib:location}/lib -L${libressl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -Wl,-rpath=${libressl:location}/lib
--- a/component/postfix/buildout.cfg
+++ b/component/postfix/buildout.cfg
@@ -3,10 +3,10 @@

 [buildout]
 extends =
+  ../cyrus-sasl/buildout.cfg
  ../libdb/buildout.cfg
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg
  ../pcre/buildout.cfg
-  ../cyrus-sasl/buildout.cfg

 [postfix]
 recipe = slapos.recipe.cmmi
@@ -18,5 +18,5 @@ patches =
  ${:_profile_base_location_}/noroot.patch#738bcc97b8044c45b58708bdf3a84b8e
  ${:_profile_base_location_}/skip-libdb-check.patch#f7fdbd8787874b535fee548b0139c0d8
 configure-command = make
-configure-options = makefiles CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl:location}/include -I${cyrus-sasl:location}/include/sasl' AUXLIBS='-L${openssl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -L${cyrus-sasl:location}/lib -lssl -lpcre -ldb -lcrypto -lsasl2 -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib'
+configure-options = makefiles CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${libressl:location}/include -I${cyrus-sasl:location}/include/sasl' AUXLIBS='-L${libressl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -L${cyrus-sasl:location}/lib -lssl -lpcre -ldb -lcrypto -lsasl2 -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib'
 make-targets = non-interactive-package install_root=${:location}
--- a/component/postgresql/buildout.cfg
+++ b/component/postgresql/buildout.cfg
 [buildout]
 extends = 
-  ../openssl/buildout.cfg
-  ../readline/buildout.cfg
-  ../zlib/buildout.cfg
+  ../libressl/buildout.cfg
  ../ncurses/buildout.cfg
  ../perl/buildout.cfg
+  ../readline/buildout.cfg
+  ../zlib/buildout.cfg
 parts = postgresql


@@ -18,8 +18,8 @@ url = http://ftp.postgresql.org/pub/source/v9.1.13/postgresql-9.1.13.tar.bz2
 md5sum = f50e201b4ef7e0581bf32a1a32c9f14c
 configure-options = --with-openssl --with-perl
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libressl:location}/include -I${ncurses:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c


 [postgresql92]
@@ -28,5 +28,5 @@ url = http://ftp.postgresql.org/pub/source/v9.2.8/postgresql-9.2.8.tar.bz2
 md5sum = c5c65a9b45ee53ead0b659be21ca1b97
 configure-options = --with-openssl
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libressl:location}/include -I${ncurses:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c
--- a/component/pycurl/buildout.cfg
+++ b/component/pycurl/buildout.cfg
 [buildout]
 extends =
  ../curl/buildout.cfg
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg

 parts =
  pycurl

 [pycurl-env]
-PATH = ${curl:location}/bin:${openssl:location}/bin:%(PATH)s
+PATH = ${curl:location}/bin:${libressl:location}/bin:%(PATH)s
 PYCURL_SSL_LIBRARY=openssl
-CPPFLAGS=-I${openssl:location}/include
-CFLAGS=-I${openssl:location}/include
+CPPFLAGS=-I${libressl:location}/include
+CFLAGS=-I${libressl:location}/include

 [pycurl]
 recipe = zc.recipe.egg:custom
@@ -18,5 +18,5 @@ egg = pycurl

 rpath =
  ${curl:location}/lib/
-  ${openssl:location}/lib/
+  ${libressl:location}/lib/
 environment = pycurl-env
--- a/component/python-2.4/buildout.cfg
+++ b/component/python-2.4/buildout.cfg
@@ -3,8 +3,8 @@ extends =
  ../bzip2/buildout.cfg
  ../gdbm/buildout.cfg
  ../gettext/buildout.cfg
+  ../libressl/buildout.cfg
  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
  ../readline/buildout.cfg
  ../sqlite3/buildout.cfg
  ../zlib/buildout.cfg
@@ -58,8 +58,8 @@ configure-options =
  --with-threads

 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${libressl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${libressl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib

 [pythonbin2.4]
 # XXX/Note: This is hackish way to have fully featured python interpreter

--- a/component/python-2.6/buildout.cfg
+++ b/component/python-2.6/buildout.cfg
@@ -3,14 +3,14 @@
 # XXX: Extends shall not jump out of software
 extends =
  ../bzip2/buildout.cfg
+  ../file/buildout.cfg
  ../gdbm/buildout.cfg
  ../gettext/buildout.cfg
+  ../libressl/buildout.cfg
  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
  ../readline/buildout.cfg
  ../sqlite3/buildout.cfg
  ../zlib/buildout.cfg
-  ../file/buildout.cfg

 parts =
    python2.6
@@ -47,8 +47,8 @@ configure-options =
 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
 # which would otherwise load the system libmagic.so with ctypes
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${libressl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${libressl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib

 [bootstrap2.6]
 recipe = zc.recipe.egg

--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
 [buildout]
 extends =
  ../bzip2/buildout.cfg
+  ../file/buildout.cfg
  ../gdbm/buildout.cfg
  ../gettext/buildout.cfg
  ../libexpat/buildout.cfg
  ../libffi/buildout.cfg
+  ../libressl/buildout.cfg
  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
  ../readline/buildout.cfg
  ../sqlite3/buildout.cfg
-  ../zlib/buildout.cfg
-  ../file/buildout.cfg
  ../xz-utils/buildout.cfg
+  ../zlib/buildout.cfg

 parts =
    python2.7
@@ -56,5 +56,5 @@ make-targets = make profile-opt && make install
 # which would otherwise load the system libmagic.so with ctypes
 environment =
  PATH=${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${libressl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${libressl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
--- a/component/python-cryptography/buildout.cfg
+++ b/component/python-cryptography/buildout.cfg
 [buildout]
 extends =
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg
  ../pkgconfig/buildout.cfg

 parts =
@@ -14,9 +14,9 @@ setup-eggs = ${python-cryptography-prep:eggs}

 [python-cryptography-env]
 PATH = ${pkgconfig:location}/bin:%(PATH)s
-PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig
-LD_LIBRARY_PATH = ${openssl:location}/lib
-CPATH = ${openssl:location}/include
+PKG_CONFIG_PATH = ${libressl:location}/lib/pkgconfig
+LD_LIBRARY_PATH = ${libressl:location}/lib
+CPATH = ${libressl:location}/include

 [python-cryptography-prep]
 recipe = zc.recipe.egg

--- a/component/python-kerberos/buildout.cfg
+++ b/component/python-kerberos/buildout.cfg
 [buildout]
 extends =
-#  ../openssl/buildout.cfg
+#  ../libressl/buildout.cfg
  ../kerberos/buildout.cfg
 #  ../pkgconfig/buildout.cfg

@@ -15,7 +15,7 @@ environment = python-kerberos-env

 [python-kerberos-env]
 PATH = ${kerberos:location}/bin:%(PATH)s
-#PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig
+#PKG_CONFIG_PATH = ${libressl:location}/lib/pkgconfig
 LD_LIBRARY_PATH = ${kerberos:location}/lib
 CPATH = ${kerberos:location}/include


--- a/component/python-ldap-python/buildout.cfg
+++ b/component/python-ldap-python/buildout.cfg
@@ -3,8 +3,8 @@ parts =
  python-ldap
 extends =
  ../cyrus-sasl/buildout.cfg
+  ../libressl/buildout.cfg
  ../openldap/buildout.cfg
-  ../openssl/buildout.cfg

 [python-ldap-python]
 recipe = zc.recipe.egg:custom
@@ -15,12 +15,12 @@ patch-options = -p1
 rpath =
  ${openldap:location}/lib
  ${cyrus-sasl:location}/lib
-  ${openssl:location}/lib
+  ${libressl:location}/lib
 include-dirs =
  ${openldap:location}/include
  ${cyrus-sasl:location}/include/sasl
-  ${openssl:location}/include
+  ${libressl:location}/include
 library-dirs =
  ${openldap:location}/lib
  ${cyrus-sasl:location}/lib
-  ${openssl:location}/lib
+  ${libressl:location}/lib
--- a/component/re6stnet/buildout.cfg
+++ b/component/re6stnet/buildout.cfg
 [buildout]
 extends =
  ../../stack/slapos.cfg
-  ../git/buildout.cfg
  ../babeld/buildout.cfg
+  ../git/buildout.cfg
+  ../libressl/buildout.cfg
  ../openvpn/buildout.cfg

 develop = 
@@ -38,7 +39,7 @@ update-command = ${:command}
 [environment]
 # Note: For now original PATH is appended to the end, as not all tools are
 #       provided by SlapOS
-PATH=${openvpn:location}/sbin:${babeld:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin::${buildout:bin-directory}:${xz-utils:location}/bin:$PATH
+PATH=${openvpn:location}/sbin:${babeld:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${ncurses:location}/bin:${libressl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin::${buildout:bin-directory}:${xz-utils:location}/bin:$PATH

 [re6stnet]
 recipe = zc.recipe.egg

--- a/component/ruby/buildout.cfg
+++ b/component/ruby/buildout.cfg
@@ -3,9 +3,9 @@
 extends =
  ../gdbm/buildout.cfg
  ../libffi/buildout.cfg
+  ../libressl/buildout.cfg
  ../libyaml/buildout.cfg
  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
  ../readline/buildout.cfg
  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg
@@ -19,8 +19,8 @@ configure-options =
  --with-out-ext=tk,tk/tkutil,win32,win32ole
 environment =
  PATH=${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${openssl:location}/include -I${readline:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib  -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${libressl:location}/include -I${readline:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${libressl:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib  -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${libressl:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
  PKG_CONFIG_PATH=${libyaml:location}/lib/



--- a/component/serf/buildout.cfg
+++ b/component/serf/buildout.cfg
@@ -3,8 +3,8 @@ parts =
  serf
 extends =
  ../apache/buildout.cfg
+  ../libressl/buildout.cfg
  ../libuuid/buildout.cfg
-  ../openssl/buildout.cfg
  ../zlib/buildout.cfg

 [serf]
@@ -14,7 +14,7 @@ md5sum = 4f8e76c9c6567aee1d66aba49f76a58b
 configure-options =
  --with-apr=${apache:location}/bin/apr-1-config
  --with-apr-util=${apache:location}/bin/apu-1-config
-  --with-openssl=${openssl:location}
+  --with-openssl=${libressl:location}
 environment =
  CFLAGS=-I${zlib:location}/include -I${libuuid:location}/include
  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
--- a/component/shellinabox/buildout.cfg
+++ b/component/shellinabox/buildout.cfg
@@ -3,9 +3,9 @@ extends =
  ../autoconf/buildout.cfg
  ../automake/buildout.cfg
  ../git/buildout.cfg
+  ../libressl/buildout.cfg
  ../libtool/buildout.cfg
  ../m4/buildout.cfg
-  ../openssl/buildout.cfg
  ../patch/buildout.cfg
  ../zlib/buildout.cfg

@@ -25,9 +25,9 @@ patches =
    ${:_profile_base_location_}/0001-Switch-to-IPv6.patch#b61cb099c00e15a5fcaf6c98134fff45
    ${:_profile_base_location_}/0002-Allow-to-run-entire-command-path.patch#a506b4d83021e24c830f767501c1d3fc
 environment =
-    CFLAGS = -I${zlib:location}/include -I${openssl:location}/include
-    LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
-    PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig/
+    CFLAGS = -I${zlib:location}/include -I${libressl:location}/include
+    LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib
+    PKG_CONFIG_PATH = ${libressl:location}/lib/pkgconfig/

 [shellinabox-git-repository]
 ; This version has much more features, but does not support IPv6 (support unix domain though)
@@ -45,6 +45,6 @@ configure-command =
  ./configure
 environment =
  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
-  CFLAGS = -I${zlib:location}/include -I${openssl:location}/include
-  LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
-  PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig/
+  CFLAGS = -I${zlib:location}/include -I${libressl:location}/include
+  LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib
+  PKG_CONFIG_PATH = ${libressl:location}/lib/pkgconfig/
--- a/component/slapos/buildout.cfg
+++ b/component/slapos/buildout.cfg
@@ -4,11 +4,12 @@ extends =
  ../../stack/slapos.cfg
  ../gdbm/buildout.cfg
  ../gettext/buildout.cfg
+  ../libressl/buildout.cfg
  ../m4/buildout.cfg
+  ../patch/buildout.cfg
  ../python-2.7/buildout.cfg
  ../sqlite3/buildout.cfg
  ../swig/buildout.cfg
-  ../patch/buildout.cfg

 parts =
  slapos
@@ -26,12 +27,12 @@ allowed-eggs-from-site-packages =
 [environment]
 # Note: For now original PATH is appended to the end, as not all tools are
 #       provided by SlapOS
-PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:${patch:location}/bin:$PATH
-CFLAGS=-I${bzip2:location}/include -I${gdbm:location}/include -I${gettext:location}/include -I${glib:location}/include -I${libxml2:location}/include -I${libxslt:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${popt:location}/include -I${readline:location}/include -I${sqlite3:location}/include -I${zlib:location}/include
+PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${libressl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:${patch:location}/bin:$PATH
+CFLAGS=-I${bzip2:location}/include -I${gdbm:location}/include -I${gettext:location}/include -I${glib:location}/include -I${libxml2:location}/include -I${libxslt:location}/include -I${ncurses:location}/include -I${libressl:location}/include -I${popt:location}/include -I${readline:location}/include -I${sqlite3:location}/include -I${zlib:location}/include
 CPPFLAGS=${:CFLAGS}
-LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${python2.7:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig
-LD_LIBRARY_PATH=${bzip2:location}/lib:${gdbm:location}/lib:${gettext:location}/lib:${glib:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${popt:location}/lib:${readline:location}/lib:${sqlite3:location}/lib:${zlib:location}/lib
+LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig:${libressl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${python2.7:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig
+LD_LIBRARY_PATH=${bzip2:location}/lib:${gdbm:location}/lib:${gettext:location}/lib:${glib:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${ncurses:location}/lib:${libressl:location}/lib:${popt:location}/lib:${readline:location}/lib:${sqlite3:location}/lib:${zlib:location}/lib

 [cfg-environment]
 # Section exposes SlapOS default environment as configuration file.
@@ -67,11 +68,11 @@ output = ${buildout:directory}/environment.sh
 recipe = zc.recipe.egg:custom
 egg = pyOpenSSL
 include-dirs =
-  ${openssl:location}/include/
+  ${libressl:location}/include/
 library-dirs =
-  ${openssl:location}/lib/
+  ${libressl:location}/lib/
 rpath =
-  ${openssl:location}/lib/
+  ${libressl:location}/lib/

 #############################################


--- a/component/stunnel/buildout.cfg
+++ b/component/stunnel/buildout.cfg
 [buildout]
-extends = ../openssl/buildout.cfg
+extends = ../libressl/buildout.cfg

 parts =
  stunnel
@@ -12,7 +12,7 @@ configure-options =
  --enable-ipv6
  --disable-libwrap
  --disable-fips
-  --with-ssl=${openssl:location}
+  --with-ssl=${libressl:location}
 environment =
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${libressl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/subversion/buildout.cfg
+++ b/component/subversion/buildout.cfg
@@ -5,15 +5,15 @@
 extends =
  ../apache/buildout.cfg
  ../libexpat/buildout.cfg
+  ../libressl/buildout.cfg
  ../libuuid/buildout.cfg
  ../neon/buildout.cfg
-  ../openssl/buildout.cfg
  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../serf/buildout.cfg
  ../sqlite3/buildout.cfg
-  ../zlib/buildout.cfg
  ../swig/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
  subversion

@@ -51,9 +51,9 @@ configure-options =
 make-targets = install -j1
 environment =
  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${serf:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${libressl:location}/lib/pkgconfig:${serf:location}/lib/pkgconfig
  CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
-  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${openssl:location}/lib
+  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libressl:location}/lib

 [subversion-1.9]
 recipe = hexagonit.recipe.cmmi
@@ -92,6 +92,6 @@ make-targets =

 environment =
  PATH=${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${libressl:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig
  CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
--- a/component/trafficserver/buildout.cfg
+++ b/component/trafficserver/buildout.cfg
 [buildout]
 extends =
-  ../../component/lua/buildout.cfg
-  ../../component/hwloc/buildout.cfg
-  ../../component/pkgconfig/buildout.cfg
-  ../../component/libtool/buildout.cfg
-  ../../component/make/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../component/tcl/buildout.cfg
-  ../../component/libxml2/buildout.cfg
-  ../../component/pcre/buildout.cfg
-  ../../component/libcap/buildout.cfg
-  ../../component/flex/buildout.cfg
-  ../../component/ncurses/buildout.cfg
-  ../../component/curl/buildout.cfg
-  ../../component/zlib/buildout.cfg
+  ../curl/buildout.cfg
+  ../flex/buildout.cfg
+  ../hwloc/buildout.cfg
+  ../libcap/buildout.cfg
+  ../libressl/buildout.cfg
+  ../libtool/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../lua/buildout.cfg
+  ../make/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../pcre/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../tcl/buildout.cfg
+  ../zlib/buildout.cfg

 parts =
  trafficserver
@@ -24,7 +24,7 @@ url = http://apache.claz.org/trafficserver/trafficserver-4.2.3.tar.bz2
 md5sum = 1d06a6e9063ceea3f19dbb84752ec710
 configure-options =
  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --with-openssl=${openssl:location}
+  --with-openssl=${libressl:location}
  --with-xml=libxml2
  --with-libxml2=${libxml2:location}
  --with-pcre=${pcre:location}
@@ -37,7 +37,7 @@ configure-options =
  --enable-experimental-plugins
 environment =
  PATH=${make:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  LDFLAGS =-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS =-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -Wl,-rpath=${libressl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 make-target =
  check
  install
--- a/component/w3m/buildout.cfg
+++ b/component/w3m/buildout.cfg
 [buildout]
 extends =
  ../garbage-collector/buildout.cfg
+  ../libressl/buildout.cfg
  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg
@@ -16,7 +16,7 @@ md5sum = 1b845a983a50b8dec0169ac48479eacc
 url = http://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz
 configure-options =
  --with-gc=${garbage-collector:location}
-  --with-ssl=${openssl:location}
+  --with-ssl=${libressl:location}
  --with-termlib=ncurses
  --disable-nls
  --disable-image
@@ -39,6 +39,6 @@ patches =

 environment =
  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig
  CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/ -I${garbage-collector:location}/include
-  LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${libressl:location}/lib -Wl,-rpath=${libressl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/wget/buildout.cfg
+++ b/component/wget/buildout.cfg
 [buildout]
 extends =
-  ../openssl/buildout.cfg
+  ../libressl/buildout.cfg
  ../pcre/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../xz-utils/buildout.cfg
@@ -17,7 +17,7 @@ configure-options =
  --enable-opie
  --disable-iri
  --with-ssl=openssl
-  --with-libssl-prefix=${openssl:location}
+  --with-libssl-prefix=${libressl:location}
  --with-zlib-lib=${zlib:location}

 patch-options =
@@ -28,6 +28,6 @@ patches =

 environment =
  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${openssl:location}/lib
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -I${pcre:location}/include
+  PKG_CONFIG_PATH=${libressl:location}/lib/pkgconfig
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libressl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libressl:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${libressl:location}/include -I${pcre:location}/include
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
@@ -7,11 +7,11 @@ extends =
  ../freetype/buildout.cfg
  ../gnutls/buildout.cfg
  ../intltool/buildout.cfg
+  ../libressl/buildout.cfg
  ../libtool/buildout.cfg
  ../libuuid/buildout.cfg
  ../libxml2/buildout.cfg
  ../libxslt/buildout.cfg
-  ../openssl/buildout.cfg
  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg
@@ -523,7 +523,7 @@ configure-options =
  --with-xkb-path=${xkeyboard-config:location}/share/X11/xkb
  --with-sha1=libgcrypt
 environment =
-  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${libressl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
  CPPFLAGS=-I${bzip2:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${zlib:location}/include
  PATH=${pkgconfig:location}/bin:%(PATH)s
  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/software/ajaxplorer/instance-apachephp.cfg
+++ b/software/ajaxplorer/instance-apachephp.cfg
@@ -148,7 +148,7 @@ post = $${stunnel:post-rotate-script}

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${basedirectory:services}/ca

--- a/software/ajaxplorer/software.cfg
+++ b/software/ajaxplorer/software.cfg
@@ -35,7 +35,7 @@ md5sum = 4c7936accb3658871b635158198b7905
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apachephp.cfg
 output = ${buildout:directory}/template-apachephp.cfg
-md5sum = 8be713bd2656e184651c8ec10579d668
+md5sum = 22b0a1fe037163527733fb899e61b1e3
 mode = 0644

 [instance-mariadb]

--- a/software/apache-frontend/common.cfg
+++ b/software/apache-frontend/common.cfg
@@ -65,7 +65,7 @@ mode = 0644
 [template-apache-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-frontend.cfg
-md5sum = f65456f704a32c43822b1efefc7ae4b7
+md5sum = dfb058313be712c73d6fd4f42ffd74d2
 output = ${buildout:directory}/template-apache-frontend.cfg
 mode = 0644


--- a/software/apache-frontend/instance-apache-frontend.cfg
+++ b/software/apache-frontend/instance-apache-frontend.cfg
@@ -357,7 +357,7 @@ wrapper-path = $${directory:bin}/apache-configtest

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${directory:service}/certificate_authority

--- a/software/backupserver/software.cfg
+++ b/software/backupserver/software.cfg
@@ -3,7 +3,7 @@ extends =
  ../../component/dash/buildout.cfg
  ../../component/dcron/buildout.cfg
  ../../component/logrotate/buildout.cfg
-  ../../component/openssl/buildout.cfg
+  ../../component/libressl/buildout.cfg
  ../../component/nginx/buildout.cfg
  ../../component/rdiff-backup/buildout.cfg
 #   ../../component/duplicity/buildout.cfg

--- a/software/cloudooo/software.cfg
+++ b/software/cloudooo/software.cfg
@@ -69,7 +69,7 @@ extra-context =
    key libreoffice_bin_location libreoffice-bin:location
    key libxcb_location libxcb:location
    key mesa_location mesa:location
-    key openssl_location openssl:location
+    key openssl_location libressl:location
    key pixman_location pixman:location
    key poppler_location poppler:location
    key template_cloudooo template-cloudooo:target

--- a/software/davstorage/common.cfg
+++ b/software/davstorage/common.cfg
@@ -44,6 +44,6 @@ mode = 0644
 [instance-davstorage]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-davstorage.cfg
-md5sum = b83b0351a0f46aac35d52e681270ff03
+md5sum = 60cd3e324d2e79fcca77abd514842935
 output = ${buildout:directory}/template-davstorage.cfg
 mode = 0644
--- a/software/davstorage/instance-davstorage.cfg
+++ b/software/davstorage/instance-davstorage.cfg
@@ -56,7 +56,7 @@ source = ${application:location}

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${basedirectory:services}/certificate_authority

--- a/software/erp5testnode/instance-default.cfg
+++ b/software/erp5testnode/instance-default.cfg
@@ -97,7 +97,7 @@ key-file = $${directory:shellinabox}/private.key

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${basedirectory:services}/ca

--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
@@ -55,7 +55,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg
 output = ${buildout:directory}/template-default.cfg
 mode = 0644
-md5sum = 22ffc8e212dcf2db8ad94cf0e5ac4772
+md5sum = 302c68ec4dc55cc171854fbd07dd6b7b

 [versions]
 PyXML = 0.8.5

--- a/software/etherpad-lite/common.cfg
+++ b/software/etherpad-lite/common.cfg
@@ -4,18 +4,18 @@ versions = versions

 extends =
  ../../stack/slapos.cfg
-  ../../component/gcc/buildout.cfg
-  ../../component/openssl/buildout.cfg
  ../../component/curl/buildout.cfg
  ../../component/dash/buildout.cfg
  ../../component/dcron/buildout.cfg
+  ../../component/gcc/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../component/libressl/buildout.cfg
  ../../component/logrotate/buildout.cfg
  ../../component/lxml-python/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
-  ../../component/gzip/buildout.cfg
-  ../../component/git/buildout.cfg
  ../../component/nodejs/buildout.cfg
  ../../component/postgresql/buildout.cfg
+  ../../component/python-2.7/buildout.cfg

 parts =
  postgresql

--- a/software/gateone/software.cfg
+++ b/software/gateone/software.cfg
@@ -2,17 +2,17 @@

 extends =
  ../../component/dash/buildout.cfg
-  ../../component/git/buildout.cfg
  ../../component/dcron/buildout.cfg
+  ../../component/dtach/buildout.cfg
+  ../../component/gateone/buildout.cfg
+  ../../component/git/buildout.cfg
  ../../component/gzip/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../component/logrotate/buildout.cfg
  ../../component/kerberos/buildout.cfg
-  ../../component/python-kerberos/buildout.cfg
-  ../../component/gateone/buildout.cfg
-  ../../component/dtach/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
+  ../../component/libressl/buildout.cfg
+  ../../component/logrotate/buildout.cfg
  ../../component/nginx/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/python-kerberos/buildout.cfg
  ../../stack/slapos.cfg

 parts = 
@@ -85,7 +85,7 @@ extra-context =
    key gateone_location gateone-repository:location
    key logrotate_location logrotate:location
    key nginx_location nginx:location
-    key openssl_location openssl:location
+    key openssl_location libressl:location
    key readline_location readline:location
    key template_nginx_conf template-nginx-conf:target
    key template_logrotate_base template-logrotate-base:rendered

--- a/software/html5ide/instance-html5ide.cfg
+++ b/software/html5ide/instance-html5ide.cfg
@@ -156,7 +156,7 @@ crl = $${:ca-dir}/crl/

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${cadirectory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${directory:service}/certificate_authority

--- a/software/html5ide/software.cfg
+++ b/software/html5ide/software.cfg
@@ -24,7 +24,7 @@ mode = 0644
 [template-html5-ide]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-html5ide.cfg
-md5sum = e4d8adb5b7f0e5bf6ea12e47c5a13f8e
+md5sum = 77fdc268f653c2a80a2d82eaa0cce56f
 output = ${buildout:directory}/template-html5ide.cfg
 mode = 0644


--- a/software/ipython_notebook/software.cfg
+++ b/software/ipython_notebook/software.cfg
@@ -4,10 +4,10 @@ extends =
  ../../stack/slapos.cfg
  ../../stack/monitor/buildout.cfg
  ../../component/ipython/buildout.cfg
-  ../../component/scipy/buildout.cfg
-  ../../component/scikit-learn/buildout.cfg
+  ../../component/libressl/buildout.cfg
  ../../component/pandas/buildout.cfg
-  ../../component/openssl/buildout.cfg
+  ../../component/scikit-learn/buildout.cfg
+  ../../component/scipy/buildout.cfg
 parts =
  monitor-eggs
  slapos-cookbook

--- a/software/kumofs/instance.cfg
+++ b/software/kumofs/instance.cfg
@@ -11,6 +11,6 @@ kumo_gateway_binary = ${kumo:location}/bin/kumo-gateway
 kumo_manager_binary = ${kumo:location}/bin/kumo-manager
 kumo_server_binary = ${kumo:location}/bin/kumo-server
 dcrond_binary = ${dcron:location}/sbin/crond
-openssl_binary = ${openssl:location}/bin/openssl
+openssl_binary = ${libressl:location}/bin/openssl
 rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
 stunnel_binary = ${stunnel:location}/bin/stunnel
--- a/software/kumofs/software.cfg
+++ b/software/kumofs/software.cfg
@@ -35,7 +35,7 @@ eggs =
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 056a4af7128fd9e31da42c85cc039420
+md5sum = 6709533a7ff8f302addaffc173bd0f23
 output = ${buildout:directory}/template.cfg
 mode = 0644


--- a/software/kvm/common.cfg
+++ b/software/kvm/common.cfg
@@ -5,14 +5,14 @@ extends =
  ../../component/curl/buildout.cfg
  ../../component/dash/buildout.cfg
  ../../component/dcron/buildout.cfg
+  ../../component/dcron/buildout.cfg
  ../../component/gzip/buildout.cfg
-  ../../component/qemu-kvm/buildout.cfg
+  ../../component/libressl/buildout.cfg
  ../../component/logrotate/buildout.cfg
-  ../../component/noVNC/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../component/dcron/buildout.cfg
  ../../component/netcat/buildout.cfg
+  ../../component/noVNC/buildout.cfg
  ../../component/pycurl/buildout.cfg
+  ../../component/qemu-kvm/buildout.cfg
  ../../stack/slapos.cfg
  ../../stack/nodejs.cfg
  ../../stack/resilient/buildout.cfg
@@ -90,7 +90,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 41eb12b66bd1af86b1b98b2166e86417
+md5sum = e9998e45316ad3cb6773d66a71757d77
 output = ${buildout:directory}/template.cfg
 mode = 0644

@@ -167,7 +167,7 @@ mode = 0644
 [template-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-frontend.cfg.in
-md5sum = cdb690495e9eb007d2b7d2f8e12f5c59
+md5sum = 0d870f816230332df6c1623bf2f66918
 output = ${buildout:directory}/template-frontend.cfg
 mode = 0644

@@ -216,7 +216,7 @@ rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/instance-kvm-
 md5sum = 26a181a48046ce88570adb32334747ef
 context =
    key apache_location apache:location
-    raw openssl_executable_location ${openssl:location}/bin/openssl
+    raw openssl_executable_location ${libressl:location}/bin/openssl
    raw template_apache_conf ${template-apache-conf:location}/${template-apache-conf:filename}


--- a/software/kvm/instance-for-erp5testnode.cfg.in
+++ b/software/kvm/instance-for-erp5testnode.cfg.in
@@ -56,7 +56,7 @@ context =
    raw debian_amd64_netinst_location ${debian-amd64-netinst.iso:location}/${debian-amd64-netinst.iso:filename}
    raw novnc_location ${noVNC:location}
    raw netcat_bin ${netcat:location}/bin/netcat
-    raw openssl_executable_location ${openssl:location}/bin/openssl
+    raw openssl_executable_location ${libressl:location}/bin/openssl
    raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
    raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
    raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel

--- a/software/kvm/instance-frontend.cfg.in
+++ b/software/kvm/instance-frontend.cfg.in
@@ -76,7 +76,7 @@ port = $${frontend-instance:port}

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${basedirectory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${basedirectory:services}/certificate_authority

--- a/software/kvm/instance.cfg.in
+++ b/software/kvm/instance.cfg.in
@@ -55,7 +55,7 @@ context =
    key storage_dict slap-configuration:storage-dict
    key slapparameter_dict slap-configuration:configuration
    key computer_id slap-configuration:computer
-    raw openssl_executable_location ${openssl:location}/bin/openssl
+    raw openssl_executable_location ${libressl:location}/bin/openssl
    $${:extra-context}

 [dynamic-template-kvm-cluster-parameters]
@@ -91,7 +91,7 @@ context =
    raw logrotate_cfg ${template-logrotate-base:rendered}
    raw novnc_location ${noVNC:location}
    raw netcat_bin ${netcat:location}/bin/netcat
-    raw openssl_executable_location ${openssl:location}/bin/openssl
+    raw openssl_executable_location ${libressl:location}/bin/openssl
    raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
    raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
    raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel

--- a/software/kvm/software-for-erp5testnode.cfg
+++ b/software/kvm/software-for-erp5testnode.cfg
@@ -5,6 +5,6 @@ extends = development.cfg
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-for-erp5testnode.cfg.in
-md5sum = e0af93ba7209cabd5db6d9afcb15c2aa
+md5sum = fe11d0c7afb75b73685bbec08f6a57bc
 output = ${buildout:directory}/template.cfg
 mode = 0644
\ No newline at end of file
--- a/software/mariadb/instance-mariadb.cfg
+++ b/software/mariadb/instance-mariadb.cfg
@@ -57,7 +57,7 @@ mysql-tzinfo-to-sql-binary = ${mariadb:location}/bin/mysql_tzinfo_to_sql

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${basedirectory:services}/ca

--- a/software/mariadb/software.cfg
+++ b/software/mariadb/software.cfg
@@ -48,7 +48,7 @@ mode = 0644
 [instance-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
-md5sum = 79f86f8c74335b2b9ec81d6a02164cbf
+md5sum = ec77721f4064e4bf2662a14228d92532
 output = ${buildout:directory}/template-mariadb.cfg
 mode = 0644


--- a/software/memcached/instance.cfg
+++ b/software/memcached/instance.cfg
@@ -9,6 +9,6 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 dcrond_binary = ${dcron:location}/sbin/crond
 memcached_binary = ${memcached:location}/bin/memcached
-openssl_binary = ${openssl:location}/bin/openssl
+openssl_binary = ${libressl:location}/bin/openssl
 rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
 stunnel_binary = ${stunnel:location}/bin/stunnel
--- a/software/memcached/software.cfg
+++ b/software/memcached/software.cfg
@@ -30,7 +30,7 @@ eggs =
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 837caf9897332a5f70c72438f1dc5bae
+md5sum = 3c227c9ec9d834075a1dd116a6238841
 output = ${buildout:directory}/template.cfg
 mode = 0644


--- a/software/mysql-5.1/instance.cfg
+++ b/software/mysql-5.1/instance.cfg
@@ -14,7 +14,7 @@ mysql_binary = ${mysql-5.1:location}/bin/mysql
 mysql_install_binary = ${mysql-5.1:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mysql-5.1:location}/bin/mysql_upgrade
 mysqld_binary = ${mysql-5.1:location}/libexec/mysqld
-openssl_binary = ${openssl:location}/bin/openssl
+openssl_binary = ${libressl:location}/bin/openssl
 perl_binary = ${perl:location}/bin/perl
 rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
 stunnel_binary = ${stunnel:location}/bin/stunnel
--- a/software/mysql-5.1/software.cfg
+++ b/software/mysql-5.1/software.cfg
@@ -39,7 +39,7 @@ eggs =
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 2764597a6e4fe243cdf6e37b6535e767
+md5sum = becada40060f80ada699fd82ad6b9d0b
 output = ${buildout:directory}/template.cfg
 mode = 0644


--- a/software/re6stnet/software.cfg
+++ b/software/re6stnet/software.cfg
 [buildout]

 extends =
-  ../../component/re6stnet/buildout.cfg
+  ../../component/apache/buildout.cfg
  ../../component/dash/buildout.cfg
-  ../../component/git/buildout.cfg
  ../../component/dcron/buildout.cfg
+  ../../component/git/buildout.cfg
  ../../component/gzip/buildout.cfg
-  ../../component/openssl/buildout.cfg
+  ../../component/libressl/buildout.cfg
  ../../component/logrotate/buildout.cfg
-  ../../component/apache/buildout.cfg
+  ../../component/re6stnet/buildout.cfg
  ../../stack/slapos.cfg

 develop = 
@@ -84,7 +84,7 @@ extra-context =
    key apache_location apache:location
    key dash_location dash:location
    key logrotate_location logrotate:location
-    key openssl_location openssl:location
+    key openssl_location libressl:location
    key template_apache_conf template-apache-conf:target
    key template_re6stnet template-re6stnet:target
    key template_re6st_registry_conf template-re6st-registry-conf:target

--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -54,7 +54,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = c48384a3f380b4fffafe8fc372b95435
+md5sum = 91f71d215d7ba28961a9a3cca5a1b968
 mode = 0644

 [template-runner-import-script]

--- a/software/slaprunner/instance-runner.cfg
+++ b/software/slaprunner/instance-runner.cfg
@@ -381,7 +381,7 @@ wrapper-path = $${directory:scripts}/gunicorn-graceful

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${directory:services}/certificate_authority

--- a/stack/boinc/buildout.cfg
+++ b/stack/boinc/buildout.cfg
@@ -34,7 +34,7 @@ eggs =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-boinc.cfg
 output = ${buildout:directory}/template-boinc.cfg
-md5sum = 5eb6057311fb1f73a54b72a40ead47c2
+md5sum = ba8af76d09b1d52f51fbf474ac2c31c7
 mode = 0644

 #Template for deploying MySQL Database Server

--- a/stack/boinc/instance-boinc.cfg
+++ b/stack/boinc/instance-boinc.cfg
@@ -88,7 +88,7 @@ post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
 # Certificate stuffs
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${basedirectory:services}/ca

--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -5,54 +5,55 @@ find-links +=
 extends =
 # Exact version of Zope
  https://raw.github.com/zopefoundation/Zope/2.13.22/versions.cfg
+  ../../component/6tunnel/buildout.cfg
+  ../../component/aspell/buildout.cfg
+  ../../component/cloudooo/buildout.cfg
+  ../../component/coreutils/buildout.cfg
  ../../component/cups/buildout.cfg
+  ../../component/dash/buildout.cfg
  ../../component/dbus/buildout.cfg
  ../../component/file/buildout.cfg
+  ../../component/findutils/buildout.cfg
+  ../../component/findutils/buildout.cfg
  ../../component/fonts/buildout.cfg
  ../../component/ghostscript/buildout.cfg
  ../../component/git/buildout.cfg
  ../../component/graphviz/buildout.cfg
+  ../../component/grep/buildout.cfg
  ../../component/gzip/buildout.cfg
  ../../component/haproxy/buildout.cfg
  ../../component/hookbox/buildout.cfg
-  ../../component/findutils/buildout.cfg
-  ../../component/librsvg/buildout.cfg
  ../../component/imagemagick/buildout.cfg
  ../../component/inkscape/buildout.cfg
+  ../../component/jsl/buildout.cfg
  ../../component/kumo/buildout.cfg
  ../../component/libdmtx/buildout.cfg
  ../../component/libffi/buildout.cfg
  ../../component/libpng/buildout.cfg
  ../../component/libreoffice-bin/buildout.cfg
+  ../../component/libressl/buildout.cfg
+  ../../component/librsvg/buildout.cfg
  ../../component/mesa/buildout.cfg
  ../../component/numpy/buildout.cfg
-  ../../component/percona-toolkit/buildout.cfg
  ../../component/patch/buildout.cfg
+  ../../component/percona-toolkit/buildout.cfg
  ../../component/pillow/buildout.cfg
+  ../../component/poppler/buildout.cfg
+  ../../component/postfix/buildout.cfg
  ../../component/pycrypto-python/buildout.cfg
  ../../component/pysvn-python/buildout.cfg
  ../../component/python-ldap-python/buildout.cfg
  ../../component/rdiff-backup/buildout.cfg
+  ../../component/sed/buildout.cfg
  ../../component/stunnel/buildout.cfg
  ../../component/subversion/buildout.cfg
  ../../component/tesseract/buildout.cfg
+  ../../component/userhosts/buildout.cfg
  ../../component/w3-validator/buildout.cfg
  ../../component/w3m/buildout.cfg
+  ../../component/wget/buildout.cfg
  ../../component/xorg/buildout.cfg
-  ../../component/poppler/buildout.cfg
  ../../component/zabbix/buildout.cfg
-  ../../component/sed/buildout.cfg
-  ../../component/coreutils/buildout.cfg
-  ../../component/grep/buildout.cfg
-  ../../component/dash/buildout.cfg
-  ../../component/wget/buildout.cfg
-  ../../component/aspell/buildout.cfg
-  ../../component/cloudooo/buildout.cfg
-  ../../component/jsl/buildout.cfg
-  ../../component/6tunnel/buildout.cfg
-  ../../component/findutils/buildout.cfg
-  ../../component/userhosts/buildout.cfg
-  ../../component/postfix/buildout.cfg
  ../../software/neoppod/software-common.cfg
 # keep neoppod extends last

@@ -274,7 +275,7 @@ context =
    key mariadb_location mariadb:location
    key mariadb_resiliency_after_import_script mariadb-resiliency-after-import-script:target
    key mesa_location mesa:location
-    key openssl_location openssl:location
+    key openssl_location libressl:location
    key pixman_location pixman:location
    key postfix_location postfix:location
    key root_common root-common:target
@@ -342,7 +343,7 @@ link-binary =
  ${librsvg:location}/bin/rsvg-convert
  ${mariadb:location}/bin/mysql
  ${mariadb:location}/bin/mysqldump
-  ${openssl:location}/bin/openssl
+  ${libressl:location}/bin/openssl
  ${poppler:location}/bin/pdfinfo
  ${poppler:location}/bin/pdftohtml
  ${poppler:location}/bin/pdftotext

--- a/stack/lamp/apache/instance-apache-php.cfg.in
+++ b/stack/lamp/apache/instance-apache-php.cfg.in
@@ -150,7 +150,7 @@ post = $${stunnel:post-rotate-script}

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${basedirectory:services}/ca

--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -74,7 +74,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = b2564a719fdde097f402ef80e0991903
+md5sum = d8ebf545c111dc5db6f0c6850215a02b
 mode = 0644

 [instance-apache-import]
@@ -119,7 +119,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
 output = ${buildout:directory}/instance-mariadb.cfg
-md5sum = c328d11f76373f8c5928afedf2178afd
+md5sum = ef2c8b1a75eec163e866242620c2eff9
 mode = 0644

 [instance-mariadb-import]

--- a/stack/lamp/mariadb/instance-mariadb.cfg.in
+++ b/stack/lamp/mariadb/instance-mariadb.cfg.in
@@ -158,7 +158,7 @@ post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${basedirectory:services}/ca

--- a/stack/lapp/apache/instance-apache-php.cfg.in
+++ b/stack/lapp/apache/instance-apache-php.cfg.in
@@ -150,7 +150,7 @@ post = $${stunnel:post-rotate-script}

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${basedirectory:services}/ca

--- a/stack/lapp/buildout.cfg
+++ b/stack/lapp/buildout.cfg
@@ -62,7 +62,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = 7a0670c747f2f21a79c240bfbfbf9f6e
+md5sum = 3271fdd5e91ef4e472a3bf201bfe55cc
 mode = 0644

 [instance-apache-import]
@@ -107,7 +107,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/postgres/instance-postgres.cfg.in
 output = ${buildout:directory}/instance-postgres.cfg
-md5sum = a2370d9a23e436166b20203f66412608
+md5sum = b4674f4b1f37f0131622e1e8a5aecccb
 mode = 0644

 [instance-postgres-import]

--- a/stack/lapp/postgres/instance-postgres.cfg.in
+++ b/stack/lapp/postgres/instance-postgres.cfg.in
@@ -148,7 +148,7 @@ post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${basedirectory:services}/ca

--- a/stack/monitor/buildout.cfg
+++ b/stack/monitor/buildout.cfg
@@ -5,7 +5,7 @@ extends =
  ../../component/curl/buildout.cfg
  ../../component/dash/buildout.cfg
  ../../component/dcron/buildout.cfg
-  ../../component/openssl/buildout.cfg
+  ../../component/libressl/buildout.cfg

 parts =
  slapos-cookbook
@@ -41,7 +41,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/monitor.cfg.in
 output = ${buildout:directory}/monitor.cfg
 filename = monitor.cfg
-md5sum = 51284c0aeb62eccd37f8a4e1621ee28c
+md5sum = 35fbf41888037d81cb79047e82815c90
 mode = 0644

 [monitor-bin]

--- a/stack/monitor/monitor.cfg.in
+++ b/stack/monitor/monitor.cfg.in
@@ -205,7 +205,7 @@ crl = $${monitor-directory:ca-dir}/crl/

 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
+openssl-binary = ${libressl:location}/bin/openssl
 ca-dir = $${monitor-directory:ca-dir}
 requests-directory = $${cadirectory:requests}
 wrapper = $${monitor-directory:service}/certificate_authority

--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -20,12 +20,13 @@ extensions +=
 # Use shacache and lxml
 extends =
  ../component/git/buildout.cfg
+  ../component/libressl/buildout.cfg
  ../component/lxml-python/buildout.cfg
  ../component/python-2.7/buildout.cfg
+  ../component/python-PyYAML/buildout.cfg
  ../component/python-cffi/buildout.cfg
  ../component/python-cliff/buildout.cfg
  ../component/python-cryptography/buildout.cfg
-  ../component/python-PyYAML/buildout.cfg

 # Separate from site eggs
 allowed-eggs-from-site-packages =