privatize ldns library (only used for drill(1))
authorJohn Marino <draco@marino.st>
Tue, 26 Jan 2016 21:00:09 +0000 (22:00 +0100)
committerJohn Marino <draco@marino.st>
Tue, 26 Jan 2016 21:19:47 +0000 (22:19 +0100)
This is the first conversion in a series to rename base libraries
so that they are only used by base assets.  Libraries such as ldns and
ssh have been getting picked up by dports with undesirable results.

These libraries are getting renamed to libprivate_<name>.*.
Coincidentially, FreeBSD-CURRENT is using a similar scheme with
libprivate<name>.*.  FreeBSD Release 10 used the scheme
/usr/lib/private/lib<name>* and DF did not want to follow that.

There may be some breakage for any third party software (including
dports) that have linked to libldns erroneously.  Recompiling and
linking against port libldns should resolve those issues.  Removing
the base libldns.* files is necessary and unavoidable.

Makefile_upgrade.inc
lib/libldns/Makefile
share/mk/bsd.libnames.mk
usr.bin/drill/Makefile

index b3c69e4..5b8fc94 100644 (file)
@@ -2271,6 +2271,7 @@ TO_REMOVE+=/usr/games/piano
 TO_REMOVE+=/usr/share/man/man6/piano.6.gz
 TO_REMOVE+=/usr/games/hide/hangman
 TO_REMOVE+=/usr/lib/kgzldr.o
+TO_REMOVE+=/usr/lib/libldns.*
 
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
index 25def32..7442a74 100644 (file)
@@ -2,7 +2,7 @@
 
 LDNS=          ${.CURDIR}/../../contrib/ldns
 
-LIB=           ldns
+LIB=           private_ldns
 SHLIB_MAJOR=   1
 
 SRCS  =                rdata.c util.c rr.c packet.c wire2host.c \
index d2d1ab3..f74e10d 100644 (file)
@@ -45,7 +45,7 @@ LIBKICONV?=   ${DESTDIR}${LIBDIR}/libkiconv.a
 LIBKINFO?=     ${DESTDIR}${LIBDIR}/libkinfo.a
 LIBKVM?=       ${DESTDIR}${LIBDIR}/libkvm.a
 LIBL?=         ${DESTDIR}${LIBDIR}/libl.a
-LIBLDNS?=      ${DESTDIR}${LIBDIR}/libldns.a
+LIBLDNS?=      ${DESTDIR}${LIBDIR}/libprivate_ldns.a
 LIBLN?=                "don't use LIBLN, use LIBL"
 LIBLUKS?=      ${DESTDIR}${LIBDIR}/libluks.a
 LIBLVM?=       ${DESTDIR}${LIBDIR}/liblvm.a
index 9fdf09f..c7e11ac 100644 (file)
@@ -7,7 +7,7 @@ WARNS?= 2
 
 .PATH: ${.CURDIR}/../../contrib/ldns/drill
 
-LDADD+=        -lldns -lcrypto
+LDADD+=        -lprivate_ldns -lcrypto
 DPADD+=        ${LIBLDNS} ${LIBCRYPTO}
 CFLAGS+=-I${.CURDIR} -I${LDNS} -I${LDNS}/drill -I${LDNSBASE}