From 912ce912e19e00d0f96f724d0dccf3332cd4a867 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sun, 3 Nov 2013 19:04:57 +0000 Subject: [PATCH] Remove the WITH_LIBICONV_COMPAT hack that seems to do more harm than good. This caused libc to spoof the ports libiconv namespace and provide a colliding libiconv.so.3 to fool rtld. This should have been removed some time ago. --- ObsoleteFiles.inc | 6 ++++++ include/Makefile | 10 +--------- include/iconv.h | 19 ------------------- lib/Makefile | 5 ----- lib/libc/iconv/Symbol.map | 8 -------- lib/libc/iconv/iconv.c | 12 ------------ lib/libiconv_compat/Makefile | 9 --------- lib/libiconv_compat/stub.c | 8 -------- share/mk/bsd.own.mk | 5 ----- tools/build/mk/OptionalObsoleteFiles.inc | 7 ------- 10 files changed, 7 insertions(+), 82 deletions(-) delete mode 100644 lib/libiconv_compat/Makefile delete mode 100644 lib/libiconv_compat/stub.c diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 62c235986e5f..b7ddfb3a0013 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20131103: WITH_LIBICONV_COMPAT removal +OLD_FILES+=usr/include/_libiconv_compat.h +OLD_FILES+=usr/lib/libiconv.a +OLD_FILES+=usr/lib/libiconv.so +OLD_FILES+=usr/lib/libiconv.so.3 +OLD_FILES+=usr/lib/libiconv_p.a # 20131103: removal of utxrm(8), use 'utx rm' instead. OLD_FILES+=usr/sbin/utxrm OLD_FILES+=usr/share/man/man8/utxrm.8.gz diff --git a/include/Makefile b/include/Makefile index 61435ccd40d0..703245094c3b 100644 --- a/include/Makefile +++ b/include/Makefile @@ -83,15 +83,7 @@ _netipx= netipx # Handle the #define aliases for libiconv .if ${MK_ICONV} == "yes" -CLEANFILES+= _libiconv_compat.h -INCS+= _libiconv_compat.h iconv.h -_libiconv_compat.h: ${.CURDIR}/Makefile - echo "/* Indicate whether libiconv symbols are present */" > _libiconv_compat.h -.if ${MK_LIBICONV_COMPAT} == "yes" - echo "#define __LIBICONV_COMPAT" >> _libiconv_compat.h -.else - echo "#undef __LIBICONV_COMPAT" >> _libiconv_compat.h -.endif +INCS+= iconv.h .endif diff --git a/include/iconv.h b/include/iconv.h index 69cc2c7d16a6..c6b0799725cb 100644 --- a/include/iconv.h +++ b/include/iconv.h @@ -40,13 +40,6 @@ #include #include -#include <_libiconv_compat.h> -#ifdef __LIBICONV_COMPAT -#define libiconv_open iconv_open -#define libiconv_close iconv_close -#define libiconv iconv -#define libiconv_t iconv_t -#endif #ifdef __cplusplus typedef bool __iconv_bool; #elif __STDC_VERSION__ >= 199901L @@ -76,22 +69,10 @@ size_t __iconv(iconv_t, const char **, size_t *, char **, /* * GNU interfaces for iconv */ -#ifdef __LIBICONV_COMPAT -#define libiconv_open_into iconv_open_into -#define libiconvctl iconvctl -#define libiconvlist iconvlist -#define libiconv_set_relocation_prefix iconv_set_relocation_prefix -#endif - /* We have iconvctl() */ #define _ICONV_VERSION 0x0108 extern int _iconv_version; -#ifdef __LIBICONV_COMPAT -#define _libiconv_version _iconv_version -#define _LIBICONV_VERSION _ICONV_VERSION -#endif - typedef struct { void *spaceholder[64]; } iconv_allocation_t; diff --git a/lib/Makefile b/lib/Makefile index 9ac894505998..074a9173adcd 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -81,7 +81,6 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libgpib} \ ${_libgssapi} \ ${_librpcsec_gss} \ - ${_libiconv_compat} \ libipsec \ ${_libipx} \ libjail \ @@ -188,10 +187,6 @@ _libcxxrt= libcxxrt _libcplusplus= libc++ .endif -.if ${MK_LIBICONV_COMPAT} != "no" -_libiconv_compat= libiconv_compat -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif diff --git a/lib/libc/iconv/Symbol.map b/lib/libc/iconv/Symbol.map index 05df2eac2f7c..425aa3e19599 100644 --- a/lib/libc/iconv/Symbol.map +++ b/lib/libc/iconv/Symbol.map @@ -6,15 +6,7 @@ FBSD_1.2 { __iconv; __iconv_free_list; __iconv_get_list; - _libiconv_version; iconv_canonicalize; - libiconv; - libiconv_close; - libiconv_open; - libiconv_open_into; - libiconv_set_relocation_prefix; - libiconvctl; - libiconvlist; }; FBSD_1.3 { diff --git a/lib/libc/iconv/iconv.c b/lib/libc/iconv/iconv.c index f388e8b59d0f..a4faf7248442 100644 --- a/lib/libc/iconv/iconv.c +++ b/lib/libc/iconv/iconv.c @@ -47,18 +47,6 @@ #include "citrus_hash.h" #include "citrus_iconv.h" -#include <_libiconv_compat.h> -#ifdef __LIBICONV_COMPAT -__weak_reference(iconv, libiconv); -__weak_reference(iconv_open, libiconv_open); -__weak_reference(iconv_open_into, libiconv_open_into); -__weak_reference(iconv_close, libiconv_close); -__weak_reference(iconvlist, libiconvlist); -__weak_reference(iconvctl, libiconvctl); -__weak_reference(iconv_set_relocation_prefix, libiconv_set_relocation_prefix); -__weak_reference(_iconv_version, _libiconv_version); -#endif - #define ISBADF(_h_) (!(_h_) || (_h_) == (iconv_t)-1) int _iconv_version = _ICONV_VERSION; diff --git a/lib/libiconv_compat/Makefile b/lib/libiconv_compat/Makefile deleted file mode 100644 index 3d4483ae02ee..000000000000 --- a/lib/libiconv_compat/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -LIB= iconv -SHLIB_MAJOR= 3 -SRCS= stub.c - -WARNS?= 0 - -.include diff --git a/lib/libiconv_compat/stub.c b/lib/libiconv_compat/stub.c deleted file mode 100644 index b4e56a2353e2..000000000000 --- a/lib/libiconv_compat/stub.c +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Hacks to support things like the dlopen() in libkiconv.so or - * ports that want to hard-code -liconv. - * - * $FreeBSD$ - */ - -int __libiconv_stub__; diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index d694cbb8b286..528ecdbe9f34 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -368,7 +368,6 @@ __DEFAULT_NO_OPTIONS = \ DEBUG_FILES \ GPL_DTC \ HESIOD \ - LIBICONV_COMPAT \ INSTALL_AS_USER \ LLDB \ NAND \ @@ -492,10 +491,6 @@ MK_${var}:= no MK_LIBTHR:= no .endif -.if ${MK_ICONV} == "no" -MK_LIBICONV_COMPAT:= no -.endif - .if ${MK_LDNS} == "no" MK_LDNS_UTILS:= no MK_UNBOUND:= no diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index fdf11048644b..b9728817082e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3136,13 +3136,6 @@ OLD_FILES+=usr/share/man/man1/host.1.gz # to be filled in #.endif -.if ${MK_LIBICONV_COMPAT} == no -OLD_FILES+=usr/lib/libiconv.a -OLD_FILES+=usr/lib/libiconv.so -OLD_FILES+=usr/lib/libiconv.so.3 -OLD_FILES+=usr/lib/libiconv_p.a -.endif - .if ${MK_LIBCPLUSPLUS} == no OLD_LIBS+=lib/libcxxrt.so.1 OLD_FILES+=usr/lib/libc++.a