Commit 284612ac authored by Julien Muchembled's avatar Julien Muchembled

re6stnet: update and cleanup

../../stack/slapos.cfg is removed from component/*/buildout.cfg
because we normally don't specify it in component/
The OBS package will need to extend it.
parents d88878e6 c1f24e68
[buildout] [buildout]
extends =
../../stack/slapos.cfg
parts = babeld parts = babeld
[babeld] [babeld]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://lab.nexedi.com/rafael/babeld/repository/archive.tar.gz?ref=v1.6.0-nxd1 url = http://git.erp5.org/gitweb/babeld.git/snapshot/v1.6.2-nxd1.tar.xz
md5sum = 1f269d01321103873b8d245df19984f0 md5sum = 336d25fd7630052ccb3a61d3603029b9
configure-command = configure-command =
echo "No configure.." echo "No configure.."
......
[buildout] [buildout]
extends = extends =
../lzo/buildout.cfg ../lzo/buildout.cfg
../patch/buildout.cfg
../openssl/buildout.cfg ../openssl/buildout.cfg
../flex/buildout.cfg ../flex/buildout.cfg
...@@ -10,16 +9,11 @@ parts = ...@@ -10,16 +9,11 @@ parts =
[openvpn] [openvpn]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://swupdate.openvpn.org/community/releases/openvpn-2.3.6.tar.gz url = http://swupdate.openvpn.org/community/releases/openvpn-2.3.8.tar.xz
md5sum = 6ca03fe0fd093e0d01601abee808835c md5sum = acc5ea4b08ad53173784520acbd4e9c3
patch-binary = ${patch:location}/bin/patch
patches =
${:_profile_base_location_}/openvpn-ciphernone.patch#462b53a45da2fa686822618c4faafd19
patch-options = -p0
configure-options = configure-options =
--disable-plugin-auth-pam --disable-plugin-auth-pam
--enable-static --enable-static
/bin/bash: q: command not found
environment = environment =
LZO_LIBS=-L${lzo:location}/lib -llzo2 LZO_LIBS=-L${lzo:location}/lib -llzo2
LZO_CFLAGS=-I${lzo:location}/include LZO_CFLAGS=-I${lzo:location}/include
...@@ -29,4 +23,3 @@ environment = ...@@ -29,4 +23,3 @@ environment =
OPENSSL_CRYPTO_CFLAGS="-I${openssl:location}/include" OPENSSL_CRYPTO_CFLAGS="-I${openssl:location}/include"
LDFLAGS =-Wl,-rpath=${lzo:location}/lib -Wl,-rpath=${flex:location}/lib -Wl,-rpath=${openssl:location}/lib LDFLAGS =-Wl,-rpath=${lzo:location}/lib -Wl,-rpath=${flex:location}/lib -Wl,-rpath=${openssl:location}/lib
CPPFLAGS=-I${lzo:location}/include -I${flex:location}/include CPPFLAGS=-I${lzo:location}/include -I${flex:location}/include
--- src/openvpn/crypto_backend.h
+++ src/openvpn/crypto_backend.h
@@ -237,8 +237,7 @@
*
* @return true iff the cipher is a CBC mode cipher.
*/
-bool cipher_kt_mode_cbc(const cipher_kt_t *cipher)
- __attribute__((nonnull));
+bool cipher_kt_mode_cbc(const cipher_kt_t *cipher);
/**
* Check if the supplied cipher is a supported OFB or CFB mode cipher.
@@ -247,8 +246,7 @@
*
* @return true iff the cipher is a OFB or CFB mode cipher.
*/
-bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher)
- __attribute__((nonnull));
+bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher);
/**
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
../openssl/buildout.cfg ../openssl/buildout.cfg
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../python-cffi/buildout.cfg
parts = parts =
python-cryptography python-cryptography
......
[buildout] [buildout]
extends = extends =
./common.cfg ../babeld/buildout.cfg
../openvpn/buildout.cfg
../python-cryptography/buildout.cfg
parts = parts =
babeld
re6stnet re6stnet
[versions] [re6stnet]
re6stnet = 0.435 recipe = zc.recipe.egg
eggs =
${python-cffi:egg}
${python-cryptography:egg}
pyOpenSSL
re6stnet
# Note: For now original PATH is appended to the end, as not all tools are
# provided by SlapOS
initialization =
import os
os.environ['PATH'] = "${openvpn:location}/sbin:${babeld:location}/bin:${openssl:location}/bin:${python2.7:location}/bin:" + os.environ['PATH']
[buildout]
extends =
../../../stack/slapos.cfg
../git/buildout.cfg
../babeld/buildout.cfg
../openvpn/buildout.cfg
parts =
babeld
re6stnet
[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
[re6stnet]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
${python-cffi:egg}
${python-cryptography:egg}
pyOpenSSL
re6stnet
script =
re6stnet
re6st-conf
re6st-registry
initialization =
import os
os.environ['PATH'] = os.path.expandvars('${environment:PATH}')
entry-points =
re6stnet=re6st.cli.node:main
re6st-conf=re6st.cli.conf:main
re6st-registry=re6st.cli.registry:main
[versions]
re6stnet = 0.435
[buildout]
extends =
./common.cfg
develop =
re6stnet-repository
parts =
babeld
re6stnet-develop
re6stnet
[re6stnet-repository]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/re6stnet.git
branch = master
git-executable = ${git:location}/bin/git
[re6stnet-develop]
recipe = zc.recipe.egg:develop
setup = ${re6stnet-repository:location}
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
extends = extends =
../../component/re6stnet/buildout.cfg ../../component/re6stnet/buildout.cfg
../../component/dash/buildout.cfg ../../component/dash/buildout.cfg
../../component/git/buildout.cfg
../../component/dcron/buildout.cfg ../../component/dcron/buildout.cfg
../../component/gzip/buildout.cfg ../../component/gzip/buildout.cfg
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
...@@ -11,19 +10,14 @@ extends = ...@@ -11,19 +10,14 @@ extends =
../../component/apache/buildout.cfg ../../component/apache/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
develop =
${:parts-directory}/re6stnet-repository
parts = parts =
slapos-cookbook-develop
slapos-cookbook slapos-cookbook
eggs eggs
dash dash
babeld babeld
re6stnet-develop
re6stnet re6stnet
template template
slapos.cookbook-repository
check-recipe
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -44,18 +38,6 @@ eggs = ...@@ -44,18 +38,6 @@ eggs =
miniupnpc miniupnpc
re6stnet re6stnet
[re6stnet-repository]
repository = http://git.erp5.org/repos/re6stnet.git
branch = re6st-slapos
revision = 8130c7380cbf3f13bdc4e5ecb8e792fb7d2b7b2e
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git
branch = re6st-master
git-executable = ${git:location}/bin/git
[download-base] [download-base]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
...@@ -95,7 +77,7 @@ extra-context = ...@@ -95,7 +77,7 @@ extra-context =
[template-re6stnet] [template-re6stnet]
< = download-base < = download-base
filename = instance-re6stnet.cfg.in filename = instance-re6stnet.cfg.in
md5sum = a5000a513877bdab10f160ac0aaac95f md5sum = 1f074a64d330e62213810a023ebce01e
[template-logrotate-base] [template-logrotate-base]
< = template-jinja2-base < = template-jinja2-base
...@@ -121,13 +103,6 @@ md5sum = 5dc218f887faeffc466e41c7d6191e49 ...@@ -121,13 +103,6 @@ md5sum = 5dc218f887faeffc466e41c7d6191e49
filename = wrapper.in filename = wrapper.in
md5sum = 69e63cb58267335e21da772bd867657e md5sum = 69e63cb58267335e21da772bd867657e
[check-recipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command =
grep parts ${buildout:develop-eggs-directory}/re6stnet.egg-link
[versions] [versions]
apache-libcloud = 0.17.0 apache-libcloud = 0.17.0
ecdsa = 0.13 ecdsa = 0.13
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment