Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
dcdb
dcdb
Commits
e8cbcd22
Commit
e8cbcd22
authored
Jun 08, 2019
by
Micha Müller
Browse files
Update OpenSSL, freeIPMI, BACnet dependencies
parent
1b36acdf
Changes
6
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
e8cbcd22
...
...
@@ -8,11 +8,11 @@ SOURCEFORGE_MROR = vorboss
CASSANDRA_VERSION
=
3.0.18
MOSQUITTO_VERSION
=
1.5.5
BOOST_VERSION
=
1.70.0
OPENSSL_VERSION
=
1.
0.2l
OPENSSL_VERSION
=
1.
1.1c
CPPDRV_VERSION
=
2.10.0
LIBUV_VERSION
=
1.24.0
BACNET-STACK_VERSION
=
0.8.
5
FREEIPMI_VERSION
=
1.
5.5
BACNET-STACK_VERSION
=
0.8.
6
FREEIPMI_VERSION
=
1.
6.3
NET-SNMP_VERSION
=
5.8
BOOST_VERSION_U
=
$(
subst
.,_,
$(BOOST_VERSION)
)
...
...
@@ -30,11 +30,11 @@ DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.o
DISTFILES_HASHES
=
apache-cassandra-3.0.18.tar.gz|94dbdaa58b366166c53f881b8e266bc8
;
\
mosquitto-1.5.5.tar.gz|a17dffc6f63b2a4ab2eb5c51139e60e9
;
\
boost_1_70_0.tar.gz|fea771fe8176828fabf9c09242ee8c26
;
\
openssl-1.
0.2l
.tar.gz|
f85123cd390e864dfbe517e7616e656
6
;
\
openssl-1.
1.1c
.tar.gz|
15e21da6efe8aa0e0768ffd8cd37a5f
6
;
\
cpp-driver-2.10.0.tar.gz|6d15dd2cccd2efd1fdc86089d26971d0
;
\
libuv-v1.24.0.tar.gz|90320330757253b07404d2a97f59c66b
;
\
bacnet-stack-0.8.
5
.tgz|
66b69111d91432fa67a7c6c1a653434d
;
\
freeipmi-1.
5.5
.tar.gz|b
8abfefee0b757f351d8fab777e3c1bb
;
\
bacnet-stack-0.8.
6
.tgz|
544ebd42ed959deb2213209b66bbc460
;
\
freeipmi-1.
6.3
.tar.gz|b
2d97e20db9b81b460ce1b9dad5bf54e
;
\
net-snmp-5.8.tar.gz|63bfc65fbb86cdb616598df1aff6458a
include
common.mk
...
...
@@ -132,7 +132,7 @@ depsinstall: $(foreach f,$(DISTFILESPATHS),$(DCDBDEPSPATH)/$(f)/.installed)
$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.built
:
$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.patched
@
echo
"Building OpenSSL library..."
cd
$
(
@D
)
&&
./Configure shared
--prefix
=
$(DCDBDEPLOYPATH)
$(OPENSSL_TARGET)
cd
$
(
@D
)
&&
./Configure shared
--prefix
=
$(DCDBDEPLOYPATH)
--openssldir
=
$(DCDBDEPLOYPATH)
$(OPENSSL_TARGET)
cd
$
(
@D
)
&&
make
&&
touch
$
(
@
)
$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.installed
:
$(DCDBDEPSPATH)/openssl-$(OPENSSL_VERSION)/.built | $(DCDBDEPLOYPATH)
...
...
collectagent/config/collectagent.conf
View file @
e8cbcd22
...
...
@@ -14,9 +14,9 @@ global {
restAPI
{
address
127
.
0
.
0
.
1
:
8080
certificate
../../
deps
/
openssl
-
1
.
0
.
2
l
/
certs
/
demo
/
ca
-
cert
.
pem
privateKey
../../
deps
/
openssl
-
1
.
0
.
2
l
/
certs
/
demo
/
ca
-
cert
.
pem
dhFile
../../
deps
/
openssl
-
1
.
0
.
2
l
/
crypto
/
dh
/
dh2048
.
pem
certificate
../../
deps
/
openssl
-
1
.
1
.
1
c
/
test
/
certs
/
ca
-
cert
.
pem
privateKey
../../
deps
/
openssl
-
1
.
1
.
1
c
/
test
/
certs
/
ca
-
key
.
pem
dhFile
../../
deps
/
openssl
-
1
.
1
.
1
c
/
crypto
/
dh
/
dh2048
.
pem
user
admin
{
password
admin
...
...
config.mk
View file @
e8cbcd22
...
...
@@ -6,5 +6,10 @@ DEFAULT_VERSION = 0.3
GIT_VERSION
=
$(
shell
git describe
--tags
2>/dev/null|sed
's/-\([0-9]*\)/.\1/'
)
VERSION
:=
$(
if
$(GIT_VERSION)
,
$(GIT_VERSION)
,
$(DEFAULT_VERSION)
)
CXXFLAGS
=
-std
=
c++11
-O2
-g
-Wall
-fmessage-length
=
0
-DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-DBOOST_LOG_DYN_LINK
-DVERSION
=
\"
$(VERSION)
\"
-Wno-unused-function
-Wno-unused-variable
CXXFLAGS
=
-std
=
c++11
-O2
-g
-Wall
-fmessage-length
=
0
\
-DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
\
-DBOOST_LOG_DYN_LINK
-DVERSION
=
\"
$(VERSION)
\"
\
-Wno-unused-function
\
-Wno-unused-variable
OS
=
$(
shell
uname
-s
)
dcdbpusher/config/dcdbpusher.conf
View file @
e8cbcd22
...
...
@@ -12,9 +12,9 @@ global {
restAPI
{
address
127
.
0
.
0
.
1
:
8000
certificate
../../
deps
/
openssl
-
1
.
0
.
2
l
/
certs
/
demo
/
ca
-
cert
.
pem
privateKey
../../
deps
/
openssl
-
1
.
0
.
2
l
/
certs
/
demo
/
ca
-
cert
.
pem
dhFile
../../
deps
/
openssl
-
1
.
0
.
2
l
/
crypto
/
dh
/
dh2048
.
pem
certificate
../../
deps
/
openssl
-
1
.
1
.
1
c
/
test
/
certs
/
ca
-
cert
.
pem
privateKey
../../
deps
/
openssl
-
1
.
1
.
1
c
/
test
/
certs
/
ca
-
key
.
pem
dhFile
../../
deps
/
openssl
-
1
.
1
.
1
c
/
crypto
/
dh
/
dh2048
.
pem
user
admin
{
password
admin
...
...
patches/bacnet-stack-0.8.
5
.patch
→
patches/bacnet-stack-0.8.
6
.patch
View file @
e8cbcd22
File moved
patches/freeipmi-1.
5.5
.patch
→
patches/freeipmi-1.
6.3
.patch
View file @
e8cbcd22
--- freeipmi-1.
5.5
/Makefile.am 201
6-10-27 00:41:32
.000000000 +0200
+++ freeipmi-1.
5.5
/Makefile.am 201
7
-0
1-25 13:50:49.450235819
+0
1
00
--- freeipmi-1.
6.3
/Makefile.am 201
8-07-31 01:07:25
.000000000 +0200
+++ freeipmi-1.
6.3
/Makefile.am 201
9
-0
6-08 10:47:08.139423052
+0
2
00
@@ -3,35 +3,7 @@
ACLOCAL_AMFLAGS = -I config
...
...
@@ -37,9 +37,9 @@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
--- freeipmi-1.
5.5
/Makefile.in 201
6-11-02 23:52:45
.000000000 +0100
+++ freeipmi-1.
5.5
/Makefile.in 201
7
-0
1-25 13:50:43.978208271
+0
1
00
@@ -
310
,35 +
310
,7 @@
--- freeipmi-1.
6.3
/Makefile.in 201
9-01-24 00:22:16
.000000000 +0100
+++ freeipmi-1.
6.3
/Makefile.in 201
9
-0
6-08 10:46:38.879029494
+0
2
00
@@ -
417
,35 +
417
,7 @@
# include directory for aclocal
ACLOCAL_AMFLAGS = -I config
SUBDIRS = \
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment