From: Benoît Canet <benoit.canet.cont...@gmail.com>
Committer: Nadav Har'El <n...@scylladb.com>
Branch: master
setup: Make Fedora26 take the compat openssl header
Using the default openssl-devel package would break
lua sec and start a dependency mess.
Use the compatibility header package so the build
and run will work just fine.
Signed-off-by: Benoît Canet <ben...@scylladb.com>
Message-Id: <20170724130703.7055-2-ben...@scylladb.com>
---
diff --git a/scripts/setup.py b/scripts/setup.py
--- a/scripts/setup.py
+++ b/scripts/setup.py
@@ -29,63 +29,63 @@ class Fedora(object):
'flex', 'bison', 'maven-shade-plugin', 'python-dpkt',
'tcpdump', 'gdb',
'gnutls-utils', 'openssl', 'p11-kit', 'patch', 'wget',
'unzip', 'ncurses', 'ncurses-devel', 'libstdc++-static',
'openssl-libs',
- 'openssl-devel', 'libedit-devel', 'yaml-cpp-devel'
+ 'libedit-devel', 'yaml-cpp-devel'
]
ec2_packages = standard_ec2_packages
test_packages = ['openssl-devel']
ec2_post_install = standard_ec2_post_install
class Fedora_19(object):
- packages = ['java-1.7.0-openjdk', 'python-requests']
+ packages =
['java-1.7.0-openjdk', 'python-requests', 'openssl-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
version = '19'
class Fedora_20(object):
- packages = ['java-1.7.0-openjdk', 'python-requests']
+ packages =
['java-1.7.0-openjdk', 'python-requests', 'openssl-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
version = '20'
class Fedora_21(object):
- packages = ['java-1.7.0-openjdk', 'python-requests']
+ packages =
['java-1.7.0-openjdk', 'python-requests', 'openssl-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
version = '21'
class Fedora_22(object):
- packages = ['java-1.8.0-openjdk', 'python-requests']
+ packages =
['java-1.8.0-openjdk', 'python-requests', 'openssl-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
version = '22'
class Fedora_23(object):
- packages = ['java-1.8.0-openjdk', 'python2-requests']
+ packages =
['java-1.8.0-openjdk', 'python2-requests', 'openssl-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
version = '23'
class Fedora_24(object):
- packages = ['java-1.8.0-openjdk', 'python2-requests']
+ packages =
['java-1.8.0-openjdk', 'python2-requests', 'openssl-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
version = '24'
class Fedora_25(object):
- packages = ['java-1.8.0-openjdk', 'python2-requests']
+ packages =
['java-1.8.0-openjdk', 'python2-requests', 'openssl-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
version = '25'
class Fedora_26(object):
- packages = ['java-1.8.0-openjdk', 'python2-requests']
+ packages =
['java-1.8.0-openjdk', 'python2-requests', 'compat-openssl10-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
