diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-25 13:16:02 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-25 13:26:44 +0000 |
| commit | 58eab1efe8a08dc06020c9c494111c81d7a2f860 (patch) | |
| tree | 0e8a040a6b31510cf59bdab423e1a39b1ae11fa0 | |
| parent | 67ef956a27f195cf4c5e3b6b62712b98dae3624b (diff) | |
| download | aports-58eab1efe8a08dc06020c9c494111c81d7a2f860.tar.bz2 aports-58eab1efe8a08dc06020c9c494111c81d7a2f860.tar.xz | |
testing/libtls-standalone: change SOVERSION
avoid conflict with libressl's libtls by change the soversion to
something completely different.
| -rw-r--r-- | testing/libtls-standalone/APKBUILD | 5 | ||||
| -rw-r--r-- | testing/libtls-standalone/Makefile | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/testing/libtls-standalone/APKBUILD b/testing/libtls-standalone/APKBUILD index a05d7dbf34..8c903a1502 100644 --- a/testing/libtls-standalone/APKBUILD +++ b/testing/libtls-standalone/APKBUILD @@ -2,14 +2,13 @@ pkgname=libtls-standalone pkgver=2.7.4 _namever=${pkgname}${pkgver%.*} -pkgrel=2 +pkgrel=3 pkgdesc="libtls extricated from libressl sources" url="http://www.libressl.org/" arch="all" license="ISC" depends="" makedepends="libbsd-dev openssl-dev" -replaces="libressl-libtls libressl2.7-libtls" subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc" source="https://ftp.openbsd.org/pub/OpenBSD/libressl/libressl-$pkgver.tar.gz Makefile @@ -56,7 +55,7 @@ package() { } sha512sums="1cd82a1bff4f655251b5feb0c850f4164e0fd548e4b404407370f74dcc75c205f42efc7787a157eecac84cbbe46af48cb63f46b3fef75f4a0a9ea19a5863a691 libressl-2.7.4.tar.gz -c898c5b9c426a09291dcf7df4336476d7296cea62b080ef245670adea77765877d989f492d66db998fefb36c1cca8e26d10801227654f5565ee642cf47ffaa98 Makefile +b551cf31dd7d1d2d8be427c0a4410f031e66da7f39b27399135f7e6ad8d8e382c91d0adc32da3709b94ee23763e4ca5d5d46616d428919089824401b16f7ea55 Makefile be8216d08a6992ca65a8e3f1e010645833899465090179f269a62de5fcfe2711d463fe1aa57e408492648878fa2ee53377c4509ef48a2aafe3f267cce73e9209 tls_compat.c 0b8fca899e1f7b51979d69458be23c77c1b7f265ed60de76cf5cfb9eb5742111cf50813bd35384831301523a6a0562a20acf1aec22dc0d9ad653271d45ede915 tls_compat.h 71d36fe25c95a0a45497e3f699b01dddcaae9053dd1b1e2419df94272c47024cf6516c51c902129201061601b04a72551904b15a332a4cf53358983b5db73618 test_program.c diff --git a/testing/libtls-standalone/Makefile b/testing/libtls-standalone/Makefile index 7b6806ecb4..64c794aa2a 100644 --- a/testing/libtls-standalone/Makefile +++ b/testing/libtls-standalone/Makefile @@ -4,8 +4,8 @@ LIBDIR = ${PREFIX}/lib INCLUDEDIR = ${PREFIX}/include LIBRESSL_VERSION = 1.0 -LIBTLS_SOVERSION = 17 -LIBTLS_FULLVERSION = 17.0.1 +LIBTLS_SOVERSION = 1.1 +LIBTLS_FULLVERSION = 1.1.0 OPENSSL_CFLAGS = $(shell pkgconf openssl --cflags) OPENSSL_LIBS = $(shell pkgconf openssl --libs) @@ -35,7 +35,7 @@ SOURCES = \ OBJECTS = ${SOURCES:.c=.o} -all: dumpconfig libtls.so.${LIBTLS_FULLVERSION} libtls.pc +all: dumpconfig libtls.so.${LIBTLS_FULLVERSION} libtls.so.${LIBTLS_SOVERSION} libtls.pc dumpconfig: @echo "Building with:" @@ -46,18 +46,21 @@ dumpconfig: .c.o: ${CC} ${CFLAGS} -o $@ -c $< +libtls.so.${LIBTLS_SOVERSION}: libtls.so.${LIBTLS_FULLVERSION} + ln -s $< $@ + libtls.so.${LIBTLS_FULLVERSION}: ${OBJECTS} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${OPENSSL_LIBS} check: test_program - LD_PRELOAD=./libtls.so.${LIBTLS_FULLVERSION} ./test_program + LD_LIBRARY_PATH=$$PWD ./test_program test_program: test_program.c ${CC} -I${LIBRESSL_SRCDIR}/include -o $@ test_program.c ./libtls.so.${LIBTLS_FULLVERSION} clean: rm -f ${OBJECTS} - rm -f libtls.so.${LIBTLS_FULLVERSION} + rm -f libtls.so.${LIBTLS_FULLVERSION} libtls.so.${LIBTLS_SOVERSION} rm -f test_program install: |