8faec82 Always use bundled libsbuf — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Always use bundled libsbuf

Baptiste Daroussin committed 11 years ago

commit 8faec82d6fb56b84b19c8b61452700c4ab61daeb
parent 046ab96

4 files changed +19 -26

modified configure.ac

@@ -195,18 +195,6 @@ AC_CHECK_HEADERS([gelf.h libelf.h], [

 	]])
 	)])
 AC_CHECK_HEADER([sys/sbuf.h], [
 	AC_DEFINE(HAVE_SYS_SBUF_H, 1, [Define to 1 if you have the <sys/sbuf.h> header file.])
 	AC_CHECK_LIB(sbuf, sbuf_new, [
 		AC_DEFINE(HAVE_LIBSBUF, 1, [Define to 1 if you have the 'sbuf' library (-lsbuf).])
 		LIBSBUF_LIB="-lsbuf"
 	])
 ], [
 	LIBSBUF_LIB="\$(top_builddir)/external/libsbuf.la"
 	LIBSBUF_BUNDLED="libsbuf.la"
 	LIBSBUF_INCLUDE="-I\$(top_srcdir)/external/libsbuf"
 ])
 AC_CHECK_HEADER([execinfo.h], [
 	AC_DEFINE(HAVE_EXECINFO_H, 1, [Define to 1 if you have the <execinfo.h> header file.])
 	AC_CHECK_LIB(execinfo, backtrace, [

modified external/Makefile.am

@@ -63,14 +63,14 @@ noinst_HEADERS= expat/amiga/expat_68k.h \

 		uthash/utlist.h \
 		config.h
 EXTRA_LTLIBRARIES=	libelf.la libsbuf.la
 EXTRA_LTLIBRARIES=	libelf.la
 noinst_LTLIBRARIES=	libucl.la libucl_static.la \
 					libsqlite.la libsqlite_static.la \
 					libyaml.la libyaml_static.la \
 					libexpat.la libexpat_static.la \
 					@LIBELF_BUNDLED@ \
 					@LIBSBUF_BUNDLED@
 			libsqlite.la libsqlite_static.la \
 			libyaml.la libyaml_static.la \
 			libexpat.la libexpat_static.la \
 			libsbuf.la libsbuf_static.la \
 			@LIBELF_BUNDLED@
 libelf_la_SOURCES=	libelf/elf.c \
 			libelf/elf_begin.c \

@@ -132,8 +132,12 @@ libelf_la_SOURCES= libelf/elf.c \

 			libelf/libelf_convert.c
 libelf_la_CFLAGS=	-I$(top_srcdir)/external/libelf
 libsbuf_la_SOURCES=	libsbuf/subr_sbuf.c
 libsbuf_la_CFLAGS=	-I$(top_srcdir)/external/libsbuf
 libsbuf_la_SOURCES=	libsbuf/subr_sbuf.c -shared
 sbuf_common_CFLAGS=	-I$(top_srcdir)/external/libsbuf
 libsbuf_la_CFLAGS=	$(sbuf_common_CFLAGS) -shared
 libsbuf_static_la_SOURCES=	${libsbuf_la_SOURCES}
 libsbuf_static_la_CFLAGS=	$(sbuf_common_CFLAGS) -static
 libsbuf_static_la_LDFLAGS=	-all-static
 ucl_common_cflags=	-I$(top_srcdir)/external//libucl/uthash \
 			-I$(top_srcdir)/external/libucl/include  \

modified libpkg/Makefile.am

@@ -2,8 +2,8 @@ EXTRA_DIST= libpkg.ver

 pkg_common_cflags=	-I$(top_srcdir)/libpkg \
 			@LIBELF_INCLUDE@ \
 			@LIBSBUF_INCLUDE@ \
 			@LDNS_CFLAGS@ \
 			-I$(top_srcdir)/external/libsbuf \
 			-I$(top_srcdir)/external/expat/lib \
 			-I$(top_srcdir)/external/libucl/include \
 			-I$(top_srcdir)/external/uthash \

@@ -55,9 +55,9 @@ libpkg_la_LIBADD= $(top_builddir)/external/libucl.la \

 			$(top_builddir)/external/libsqlite.la \
 			$(top_builddir)/external/libyaml.la \
 			$(top_builddir)/external/libexpat.la \
 			$(top_builddir)/external/libsbuf.la \
 			@REPOS_LDADD@ \
 			@LIBELF_LIB@ \
 			@LIBSBUF_LIB@ \
 			@LIBEXECINFO_LIB@ \
 			@LDNS_LIBS@ \
 			-larchive \

@@ -78,7 +78,9 @@ libpkg_static_la_LIBADD= $(top_builddir)/external/libucl_static.la \

 			$(top_builddir)/external/libsqlite_static.la \
 			$(top_builddir)/external/libexpat_static.la \
 			$(top_builddir)/external/libyaml_static.la \
 			$(top_builddir)/external/libsbuf_static.la \
 			@REPOS_LDADD_STATIC@
 EXTRA_libpkg_static_la_DEPENDENCIES=	@REPOS_LDADD_STATIC@
 libpkg_static_la_LDFLAGS=	-all-static

@@ -92,4 +94,4 @@ noinst_HEADERS= private/db_upgrades.h \

 			private/pkgdb.h \
 			private/utils.h
 SUBDIRS = repo .
 \ No newline at end of file
 SUBDIRS = repo .

modified src/Makefile.am

@@ -37,7 +37,7 @@ pkg_SOURCES= add.c \

 			which.c
 pkg_LDADD=	$(top_builddir)/libpkg/libpkg.la \
 			@LIBSBUF_LIB@ \
 		$(top_builddir)/external/libsbuf.la \
 			@LIBJAIL_LIB@ \
 			-lutil \
 			-lcrypto

@@ -47,10 +47,9 @@ pkg_CFLAGS= -I$(top_srcdir)/libpkg \

 			-DGITHASH=\"$(GIT_HEAD)\"
 pkg_static_SOURCES=
 pkg_static_LDADD= $(top_builddir)/libpkg/libpkg_static.la \
 			$(top_builddir)/external/libexpat_static.la \
 			$(top_builddir)/external/libsbuf_static.la \
 			$(pkg_OBJECTS) \
 			@LIBJAIL_LIB@ \
 			@LIBSBUF_LIB@ \
 			@LIBEXECINFO_LIB@ \
 			@LIBELF_LIB@ \
 			@LDNS_LIBS@ \