23086524 Upgrade libconfuse to 3.0
authorRich Burridge <rich.burridge@oracle.com>
Thu, 28 Apr 2016 17:31:58 -0700
changeset 5877 5ebb85c9ad3d
parent 5876 8f21d5176e60
child 5878 85ea3e08eed7
23086524 Upgrade libconfuse to 3.0
components/libconfuse/Makefile
components/libconfuse/libconfuse.copyright
components/libconfuse/libconfuse.p5m
components/libconfuse/patches/confuse.h.patch
components/libconfuse/patches/test-Makefile.am.patch
components/libconfuse/patches/test-Makefile.in.patch
components/libconfuse/test/results-all.master
--- a/components/libconfuse/Makefile	Wed Apr 27 13:56:35 2016 +0200
+++ b/components/libconfuse/Makefile	Thu Apr 28 17:31:58 2016 -0700
@@ -26,15 +26,15 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libconfuse
-COMPONENT_VERSION=	2.6
+COMPONENT_VERSION=	3.0
 COMPONENT_SRC_NAME=	confuse
 COMPONENT_PROJECT_URL=	http://www.nongnu.org/confuse/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e8d653159b152f3850a7224b3eb604955795dbd3fd6603816ee46411ea53e84a
-COMPONENT_ARCHIVE_URL=	http://bzero.se/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+    sha256:f1f326d9443103036d19c32d3f3efec3a85c3b081d99534463668d29992c4648
+COMPONENT_ARCHIVE_URL=	https://github.com/martinh/$(COMPONENT_NAME)/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/libconfuse
 
-TPNO=			6306
+TPNO=			28034
 
 TEST_TARGET= install $(TEST_32_and_64)
 SYSTEM_TEST_TARGET= configure $(SYSTEM_TEST_32_and_64)
@@ -46,20 +46,27 @@
 # This is really only needed to get the test target to pass.
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
+# Needed for "gmake test" to work successfully.
+# If SHELLOPTS is exported (as it is by the userland makefiles),
+# then all shell options get exported to child invocations of bash,
+# which results in test failures due to nounset and xtrace being
+# set unexpectedly, and errors such as "$1: unbound variable" and
+# diffs failing due to script tracing in output files.
+unexport SHELLOPTS
+
 COMPONENT_TEST_DIR =		$(@D)/tests
 
 COMPONENT_SYSTEM_TEST_DIR =	$(@D)/tests
 
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
-# The additional libconfuse specific set of transforms to be applied to the
-# test results to try to normalize them.
 COMPONENT_TEST_TRANSFORMS += \
-	'-e "s|^make.*: Leaving directory.*$$|XXX_CC_XXX|g" ' \
-	'-e "s|^make.*: Entering directory.*$$|XXX_CC_XXX|g" ' \
-	'-e "s|^make.*: Nothing to be.*$$|XXX_CC_XXX|g" ' \
-	'-e "s|^.*$(CC).*$$|XXX_CC_XXX|g" ' \
-	'-e "/^XXX_CC_XXX$$/d" '
+	'-n ' \
+	'-e "/TOTAL/p" ' \
+	'-e "/SKIP/p" ' \
+	'-e "/PASS/p" ' \
+	'-e "/FAIL/p" ' \
+	'-e "/ERROR/p" '
 
 # Needed to build the test programs.
 COMPONENT_PRE_SYSTEM_TEST_ACTION += \
--- a/components/libconfuse/libconfuse.copyright	Wed Apr 27 13:56:35 2016 +0200
+++ b/components/libconfuse/libconfuse.copyright	Thu Apr 28 17:31:58 2016 -0700
@@ -1,5 +1,7 @@
 ISC License:
-Copyright (c) Year(s), Company or Person's Name <E-mail address>
+============
+Copyright (c) 2002,2003,2007 Martin Hedenfalk <[email protected]>
+Copyright (c) 2015 Peter Rosin <[email protected]>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
--- a/components/libconfuse/libconfuse.p5m	Wed Apr 27 13:56:35 2016 +0200
+++ b/components/libconfuse/libconfuse.p5m	Thu Apr 28 17:31:58 2016 -0700
@@ -48,16 +48,14 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2009/151
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-
 file path=usr/include/confuse.h
-link path=usr/lib/$(MACH64)/libconfuse.so target=./libconfuse.so.0.0.0
-link path=usr/lib/$(MACH64)/libconfuse.so.0 target=./libconfuse.so.0.0.0
-file path=usr/lib/$(MACH64)/libconfuse.so.0.0.0
+link path=usr/lib/$(MACH64)/libconfuse.so target=./libconfuse.so.1.0.0
+link path=usr/lib/$(MACH64)/libconfuse.so.1 target=./libconfuse.so.1.0.0
+file path=usr/lib/$(MACH64)/libconfuse.so.1.0.0
 file path=usr/lib/$(MACH64)/pkgconfig/libconfuse.pc
-link path=usr/lib/libconfuse.so target=./libconfuse.so.0.0.0
-link path=usr/lib/libconfuse.so.0 target=./libconfuse.so.0.0.0
-file path=usr/lib/libconfuse.so.0.0.0
+link path=usr/lib/libconfuse.so target=./libconfuse.so.1.0.0
+link path=usr/lib/libconfuse.so.1 target=./libconfuse.so.1.0.0
+file path=usr/lib/libconfuse.so.1.0.0
 file path=usr/lib/pkgconfig/libconfuse.pc
 file path=usr/share/doc/confuse/doc/Doxyfile
 file path=usr/share/doc/confuse/doc/Doxyfile.in
@@ -66,29 +64,123 @@
 file path=usr/share/doc/confuse/doc/doxygen-header.html
 file path=usr/share/doc/confuse/doc/doxygen.css
 file path=usr/share/doc/confuse/doc/html/annotated.html
-file path=usr/share/doc/confuse/doc/html/confuse_8h-source.html
+file path=usr/share/doc/confuse/doc/html/arrowdown.png
+file path=usr/share/doc/confuse/doc/html/arrowright.png
+file path=usr/share/doc/confuse/doc/html/bc_s.png
+file path=usr/share/doc/confuse/doc/html/bdwn.png
+file path=usr/share/doc/confuse/doc/html/classes.html
+file path=usr/share/doc/confuse/doc/html/closed.png
 file path=usr/share/doc/confuse/doc/html/confuse_8h.html
+file path=usr/share/doc/confuse/doc/html/confuse_8h_source.html
+file path=usr/share/doc/confuse/doc/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+file path=usr/share/doc/confuse/doc/html/doc.png
+file path=usr/share/doc/confuse/doc/html/doxygen.css
 file path=usr/share/doc/confuse/doc/html/doxygen.png
+file path=usr/share/doc/confuse/doc/html/dynsections.js
 file path=usr/share/doc/confuse/doc/html/examples.html
 file path=usr/share/doc/confuse/doc/html/files.html
+file path=usr/share/doc/confuse/doc/html/folderclosed.png
+file path=usr/share/doc/confuse/doc/html/folderopen.png
 file path=usr/share/doc/confuse/doc/html/ftpconf_8c-example.html
 file path=usr/share/doc/confuse/doc/html/functions.html
 file path=usr/share/doc/confuse/doc/html/functions_vars.html
 file path=usr/share/doc/confuse/doc/html/globals.html
+file path=usr/share/doc/confuse/doc/html/globals_defs.html
+file path=usr/share/doc/confuse/doc/html/globals_enum.html
 file path=usr/share/doc/confuse/doc/html/globals_eval.html
 file path=usr/share/doc/confuse/doc/html/globals_func.html
 file path=usr/share/doc/confuse/doc/html/globals_type.html
 file path=usr/share/doc/confuse/doc/html/index.html
+file path=usr/share/doc/confuse/doc/html/jquery.js
+file path=usr/share/doc/confuse/doc/html/nav_f.png
+file path=usr/share/doc/confuse/doc/html/nav_g.png
+file path=usr/share/doc/confuse/doc/html/nav_h.png
+file path=usr/share/doc/confuse/doc/html/open.png
 file path=usr/share/doc/confuse/doc/html/reread_8c-example.html
+file path=usr/share/doc/confuse/doc/html/search/all_0.html
+file path=usr/share/doc/confuse/doc/html/search/all_0.js
+file path=usr/share/doc/confuse/doc/html/search/all_1.html
+file path=usr/share/doc/confuse/doc/html/search/all_1.js
+file path=usr/share/doc/confuse/doc/html/search/all_2.html
+file path=usr/share/doc/confuse/doc/html/search/all_2.js
+file path=usr/share/doc/confuse/doc/html/search/all_3.html
+file path=usr/share/doc/confuse/doc/html/search/all_3.js
+file path=usr/share/doc/confuse/doc/html/search/all_4.html
+file path=usr/share/doc/confuse/doc/html/search/all_4.js
+file path=usr/share/doc/confuse/doc/html/search/all_5.html
+file path=usr/share/doc/confuse/doc/html/search/all_5.js
+file path=usr/share/doc/confuse/doc/html/search/all_6.html
+file path=usr/share/doc/confuse/doc/html/search/all_6.js
+file path=usr/share/doc/confuse/doc/html/search/all_7.html
+file path=usr/share/doc/confuse/doc/html/search/all_7.js
+file path=usr/share/doc/confuse/doc/html/search/all_8.html
+file path=usr/share/doc/confuse/doc/html/search/all_8.js
+file path=usr/share/doc/confuse/doc/html/search/all_9.html
+file path=usr/share/doc/confuse/doc/html/search/all_9.js
+file path=usr/share/doc/confuse/doc/html/search/all_a.html
+file path=usr/share/doc/confuse/doc/html/search/all_a.js
+file path=usr/share/doc/confuse/doc/html/search/all_b.html
+file path=usr/share/doc/confuse/doc/html/search/all_b.js
+file path=usr/share/doc/confuse/doc/html/search/classes_0.html
+file path=usr/share/doc/confuse/doc/html/search/classes_0.js
+file path=usr/share/doc/confuse/doc/html/search/close.png
+file path=usr/share/doc/confuse/doc/html/search/defines_0.html
+file path=usr/share/doc/confuse/doc/html/search/defines_0.js
+file path=usr/share/doc/confuse/doc/html/search/enums_0.html
+file path=usr/share/doc/confuse/doc/html/search/enums_0.js
+file path=usr/share/doc/confuse/doc/html/search/enumvalues_0.html
+file path=usr/share/doc/confuse/doc/html/search/enumvalues_0.js
+file path=usr/share/doc/confuse/doc/html/search/files_0.html
+file path=usr/share/doc/confuse/doc/html/search/files_0.js
+file path=usr/share/doc/confuse/doc/html/search/functions_0.html
+file path=usr/share/doc/confuse/doc/html/search/functions_0.js
+file path=usr/share/doc/confuse/doc/html/search/mag_sel.png
+file path=usr/share/doc/confuse/doc/html/search/nomatches.html
+file path=usr/share/doc/confuse/doc/html/search/pages_0.html
+file path=usr/share/doc/confuse/doc/html/search/pages_0.js
+file path=usr/share/doc/confuse/doc/html/search/search.css
+file path=usr/share/doc/confuse/doc/html/search/search.js
+file path=usr/share/doc/confuse/doc/html/search/search_l.png
+file path=usr/share/doc/confuse/doc/html/search/search_m.png
+file path=usr/share/doc/confuse/doc/html/search/search_r.png
+file path=usr/share/doc/confuse/doc/html/search/searchdata.js
+file path=usr/share/doc/confuse/doc/html/search/typedefs_0.html
+file path=usr/share/doc/confuse/doc/html/search/typedefs_0.js
+file path=usr/share/doc/confuse/doc/html/search/variables_0.html
+file path=usr/share/doc/confuse/doc/html/search/variables_0.js
+file path=usr/share/doc/confuse/doc/html/search/variables_1.html
+file path=usr/share/doc/confuse/doc/html/search/variables_1.js
+file path=usr/share/doc/confuse/doc/html/search/variables_2.html
+file path=usr/share/doc/confuse/doc/html/search/variables_2.js
+file path=usr/share/doc/confuse/doc/html/search/variables_3.html
+file path=usr/share/doc/confuse/doc/html/search/variables_3.js
+file path=usr/share/doc/confuse/doc/html/search/variables_4.html
+file path=usr/share/doc/confuse/doc/html/search/variables_4.js
+file path=usr/share/doc/confuse/doc/html/search/variables_5.html
+file path=usr/share/doc/confuse/doc/html/search/variables_5.js
+file path=usr/share/doc/confuse/doc/html/search/variables_6.html
+file path=usr/share/doc/confuse/doc/html/search/variables_6.js
+file path=usr/share/doc/confuse/doc/html/search/variables_7.html
+file path=usr/share/doc/confuse/doc/html/search/variables_7.js
+file path=usr/share/doc/confuse/doc/html/search/variables_8.html
+file path=usr/share/doc/confuse/doc/html/search/variables_8.js
+file path=usr/share/doc/confuse/doc/html/search/variables_9.html
+file path=usr/share/doc/confuse/doc/html/search/variables_9.js
+file path=usr/share/doc/confuse/doc/html/search/variables_a.html
+file path=usr/share/doc/confuse/doc/html/search/variables_a.js
 file path=usr/share/doc/confuse/doc/html/simple_8c-example.html
+file path=usr/share/doc/confuse/doc/html/splitbar.png
 file path=usr/share/doc/confuse/doc/html/structcfg__defvalue__t.html
 file path=usr/share/doc/confuse/doc/html/structcfg__opt__t.html
 file path=usr/share/doc/confuse/doc/html/structcfg__t.html
-file path=usr/share/doc/confuse/doc/html/tab_b.gif
-file path=usr/share/doc/confuse/doc/html/tab_l.gif
-file path=usr/share/doc/confuse/doc/html/tab_r.gif
+file path=usr/share/doc/confuse/doc/html/sync_off.png
+file path=usr/share/doc/confuse/doc/html/sync_on.png
+file path=usr/share/doc/confuse/doc/html/tab_a.png
+file path=usr/share/doc/confuse/doc/html/tab_b.png
+file path=usr/share/doc/confuse/doc/html/tab_h.png
+file path=usr/share/doc/confuse/doc/html/tab_s.png
 file path=usr/share/doc/confuse/doc/html/tabs.css
-file path=usr/share/doc/confuse/doc/html/tutorial.css
+file path=usr/share/doc/confuse/doc/html/unioncfg__simple__t.html
 file path=usr/share/doc/confuse/doc/html/unioncfg__value__t.html
 file path=usr/share/doc/confuse/doc/listing1.c
 file path=usr/share/doc/confuse/doc/listing2.c
--- a/components/libconfuse/patches/confuse.h.patch	Wed Apr 27 13:56:35 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- confuse-2.6/src/confuse.h	Sat Oct 13 08:11:54 2007
-+++ confuse-2.6/src/confuse.h.new	Tue Jul 19 08:12:27 2011
[email protected]@ -42,6 +42,7 @@
- 
- #include <stdio.h>
- #include <stdarg.h>
-+#include <locale.h>
- 
- #if defined(_WIN32) && !defined(__GNUC__)
- # ifdef HAVE__FILENO
--- a/components/libconfuse/patches/test-Makefile.am.patch	Wed Apr 27 13:56:35 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- confuse-2.6/tests/Makefile.am	Sat Oct 13 06:29:34 2007
-+++ confuse-2.6/tests/Makefile.am.new	Wed Jun 29 07:36:01 2011
[email protected]@ -4,6 +4,7 @@
- check_PROGRAMS=$(TESTS)
- 
- LDADD=-L../src ../src/libconfuse.la $(LTLIBINTL)
-+LIBADD=-lsocket -lnsl
- 
- EXTRA_DIST=a.conf b.conf check_confuse.h
- CLEANFILES=*~
--- a/components/libconfuse/patches/test-Makefile.in.patch	Wed Apr 27 13:56:35 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
---- confuse-2.6/tests/Makefile.in	Sat Dec 29 02:56:13 2007
-+++ confuse-2.6/tests/Makefile.in.new	Tue Jul 12 10:27:06 2011
[email protected]@ -91,10 +91,12 @@
- suite_single_SOURCES = suite_single.c
- suite_single_OBJECTS = suite_single.$(OBJEXT)
- suite_single_LDADD = $(LDADD)
-+suite_single_LIBADD = $(LIBADD)
- suite_single_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
- suite_validate_SOURCES = suite_validate.c
- suite_validate_OBJECTS = suite_validate.$(OBJEXT)
- suite_validate_LDADD = $(LDADD)
-+suite_validate_LIBADD = $(LIBADD)
- suite_validate_DEPENDENCIES = ../src/libconfuse.la \
- 	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
[email protected]@ -242,6 +244,7 @@
- 	single_title_sections quote_before_print
- 
- LDADD = -L../src ../src/libconfuse.la $(LTLIBINTL)
-+LIBADD = -lsocket -lnsl
- EXTRA_DIST = a.conf b.conf check_confuse.h
- CLEANFILES = *~
- @[email protected]_CFLAGS = -Wall -Werror
[email protected]@ -308,10 +311,10 @@
- 	$(LINK) $(suite_list_LDFLAGS) $(suite_list_OBJECTS) $(suite_list_LDADD) $(LIBS)
- suite_single$(EXEEXT): $(suite_single_OBJECTS) $(suite_single_DEPENDENCIES) 
- 	@rm -f suite_single$(EXEEXT)
--	$(LINK) $(suite_single_LDFLAGS) $(suite_single_OBJECTS) $(suite_single_LDADD) $(LIBS)
-+	$(LINK) $(suite_single_LDFLAGS) $(suite_single_OBJECTS) $(suite_single_LIBADD) $(suite_single_LDADD) $(LIBS)
- suite_validate$(EXEEXT): $(suite_validate_OBJECTS) $(suite_validate_DEPENDENCIES) 
- 	@rm -f suite_validate$(EXEEXT)
--	$(LINK) $(suite_validate_LDFLAGS) $(suite_validate_OBJECTS) $(suite_validate_LDADD) $(LIBS)
-+	$(LINK) $(suite_validate_LDFLAGS) $(suite_validate_OBJECTS) $(suite_validate_LIBADD) $(suite_validate_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
--- a/components/libconfuse/test/results-all.master	Wed Apr 27 13:56:35 2016 +0200
+++ b/components/libconfuse/test/results-all.master	Thu Apr 28 17:31:58 2016 -0700
@@ -1,64 +1,21 @@
-/usr/gnu/bin/make  suite_single suite_dup suite_func suite_list suite_validate list_plus_syntax section_title_dupes single_title_sections quote_before_print
-source='suite_single.c' object='suite_single.o' libtool=no \
-depfile='.deps/suite_single.Po' tmpdepfile='.deps/suite_single.TPo' \
-depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
-mkdir .libs
-creating suite_single
-source='suite_dup.c' object='suite_dup.o' libtool=no \
-depfile='.deps/suite_dup.Po' tmpdepfile='.deps/suite_dup.TPo' \
-depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
-creating suite_dup
-source='suite_func.c' object='suite_func.o' libtool=no \
-depfile='.deps/suite_func.Po' tmpdepfile='.deps/suite_func.TPo' \
-depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
-creating suite_func
-source='suite_list.c' object='suite_list.o' libtool=no \
-depfile='.deps/suite_list.Po' tmpdepfile='.deps/suite_list.TPo' \
-depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
-creating suite_list
-source='suite_validate.c' object='suite_validate.o' libtool=no \
-depfile='.deps/suite_validate.Po' tmpdepfile='.deps/suite_validate.TPo' \
-depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
-creating suite_validate
-source='list_plus_syntax.c' object='list_plus_syntax.o' libtool=no \
-depfile='.deps/list_plus_syntax.Po' tmpdepfile='.deps/list_plus_syntax.TPo' \
-depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
-creating list_plus_syntax
-source='section_title_dupes.c' object='section_title_dupes.o' libtool=no \
-depfile='.deps/section_title_dupes.Po' tmpdepfile='.deps/section_title_dupes.TPo' \
-depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
-creating section_title_dupes
-source='single_title_sections.c' object='single_title_sections.o' libtool=no \
-depfile='.deps/single_title_sections.Po' tmpdepfile='.deps/single_title_sections.TPo' \
-depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
-creating single_title_sections
-source='quote_before_print.c' object='quote_before_print.o' libtool=no \
-depfile='.deps/quote_before_print.Po' tmpdepfile='.deps/quote_before_print.TPo' \
-depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
-creating quote_before_print
-/usr/gnu/bin/make  check-TESTS
-[buf]:1: invalid boolean value for option 'bool'
-[buf]:1: premature end of file
-[buf]:1: no such option 'option'
-[buf]:1: no such option 'nonexistent'
-[buf]:1: no such option 'subnonexistent'
 PASS: suite_single
 PASS: suite_dup
-[buf]:1: no such option 'unalias'
 PASS: suite_func
-[buf]:1: no such option 'section'
-[buf]:1: no such option 'section'
-[buf]:1: invalid boolean value for option 'bool'
-[buf]:1: premature end of file
-[buf]:2: no such option 'nonexistent'
-[buf]:1: no such option 'subnonexistent'
 PASS: suite_list
 PASS: suite_validate
 PASS: list_plus_syntax
-[buf]:3: found duplicate title 'title_one'
 PASS: section_title_dupes
 PASS: single_title_sections
+PASS: section_remove
 PASS: quote_before_print
-==================
-All 9 tests passed
-==================
+PASS: include
+PASS: searchpath
+PASS: env
+PASS: ignore_parm
+# TOTAL: 14
+# PASS:  14
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0