2
0
Эх сурвалжийг харах

pkg/kamailio/deb: don't build tlsa for xenial [skip ci]

We are getting errors on build:
> gcc -shared -g -m64 -Wl,-O2 -Wl,-E  -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions tls_domain.o tls_cfg.o tls_init.o tls_verify.o tls_locking.o tls_select.o tls_dump_vf.o tls_bio.o tlsa_mod.o tls_server.o tls_rpc.o tls_ct_wrq.o tls_rand.o tls_map.o tls_util.o tls_config.o  -lm /usr/lib/x86_64-linux-gnu/libssl.a /usr/lib/x86_64-linux-gnu/libcrypto.a   -o tlsa.so
> /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libssl.a(s3_meth.o): relocation R_X86_64_32 against `.rodata' can not be used when making a shared object; recompile with -fPIC
> /usr/lib/x86_64-linux-gnu/libssl.a: error adding symbols: Bad value
> collect2: error: ld returned 1 exit status
> ../../Makefile.rules:191: recipe for target 'tlsa.so' failed
Victor Seva 1 жил өмнө
parent
commit
4b500ae453

+ 3 - 0
pkg/kamailio/deb/debian/backports/xenial

@@ -64,6 +64,9 @@ sed -i -e '/^ libwolfssl-dev,/d' \
 sed -i -e '/^PACKAGE_GROUPS += tls_wolfssl/d' ${DIST}/rules
 sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += tls_wolfssl' ${DIST}/rules
 
+# tlsa build fails
+sed -i -e 's/KTLS_INCLUDE_TLSA=yes/KTLS_INCLUDE_TLSA=no/' ${DIST}/rules
+
 wrap-and-sort -sat -d ${DIST}
 
 # clean backports scripts

+ 1 - 1
pkg/kamailio/deb/xenial/rules

@@ -21,7 +21,7 @@ export JAVA_HOME=/usr/lib/jvm/java-gcj
 export RADCLI=1
 export WOLFSSL_INTERNAL=no
 # tlsa
-export KTLS_INCLUDE_TLSA=yes
+export KTLS_INCLUDE_TLSA=no
 export LIBSSL_STATIC_SRCLIB=yes
 export LIBSSL_STATIC_SRCPATH=/usr/$(LIBDIR)