merge 2.4.0 release

.travis.yml

@@ -10,12 +10,10 @@ env:
   - OS=centos7
 
 install:
-  - if [[ "$OS" == "debian" ]]; then docker build -t libsmbios-debian-testing -f pkg/dockerfiles/Dockerfile-debian-testing .; fi
-  - if [[ "$OS" == "centos7" ]]; then ./pkg/build-dockerfile.sh centos7; fi
+  - ./pkg/build-dockerfile.sh $OS
 
 script:
-  - if [[ "$OS" == "debian" ]]; then docker run -t -v `pwd`:/build libsmbios-debian-testing pkg/mk-rel-deb.sh; fi
-  - if [[ "$OS" == "centos7" ]]; then mkdir -p output; docker run -v `pwd`/dist:/dist centos7-libsmbios; fi
+  - docker run -e CI=true -t -v `pwd`/dist:/build/dist libsmbios-$OS
 
 deploy:
   provider: releases

Makefile-std

@@ -9,7 +9,7 @@ EXTRA_DIST =
 EXTRA_PROGRAMS=
 
 CLEANFILES += $(EXTRA_PROGRAMS)
-CLEANFILES += po/*.gmo src/python/libsmbios_c/__pycache__/ src/pyunit/__pycache__/
+CLEANFILES += po/*.gmo src/python/libsmbios_c/__pycache__/ src/pyunit/__pycache__/ src/py-cli/__pycache__/
 DISTCLEANFILES += pkg/$(PACKAGE).spec
 
 
@@ -21,7 +21,7 @@ distclean-local:
 
 .PHONY: git-tag
 git-tag:
-	git tag -u libsmbios -m "tag for official release: $(PACKAGE_STRING)" v$(PACKAGE_VERSION)
+	git tag -s -m "tag for official release: $(PACKAGE_STRING)" v$(PACKAGE_VERSION)
 
 .PHONY: get-version
 get-version:
@@ -55,17 +55,6 @@ install-exec-hook:
 # set default project. can be overridden on cmdline with 'make -e ...'
 PROJECT=home:$(USER)
 
-.PHONY: upload_buildservice
-upload_buildservice: dist
-	[ -n "$(PROJECT)" ] || (echo "Must specify PROJECT"; exit 1)
-	osc co $(PROJECT) $(PACKAGE)
-	rm -f $(PROJECT)/$(PACKAGE)/*
-	cp ${PACKAGE}*.tar.bz2 $(PROJECT)/$(PACKAGE)
-	cp */${PACKAGE}.spec $(PROJECT)/$(PACKAGE)
-	cd $(PROJECT)/$(PACKAGE); osc addremove
-	cd $(PROJECT)/$(PACKAGE); yes | osc updatepacmetafromspec
-	cd $(PROJECT)/$(PACKAGE); osc ci -m "scripted source update"
-
 TOPDIR := $(shell cd $(top_builddir);pwd)
 BUILDDIR = $(TOPDIR)/_rpmbuild
 RPMDIR = $(TOPDIR)
@@ -85,7 +74,7 @@ AM_RPM_DEFINES = --define "_topdir $(TOPDIR)" \
 .PHONY: rpm srpm
 rpm: pkg/$(PACKAGE_NAME).spec dist
 	mkdir -p $(BUILDDIR)
-	rpmbuild $(AM_RPM_DEFINES) -ba --nodeps $(SPECFILE)
+	rpmbuild $(AM_RPM_DEFINES) $(CI) -ba --nodeps $(SPECFILE)
 	rm -rf $(BUILDDIR)
 
 srpm: pkg/$(PACKAGE_NAME).spec dist
@@ -103,7 +92,7 @@ debmagic: dist-xz
 	chmod +x $(DEB_TMP_BUILDDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian/rules
 	cd $(DEB_TMP_BUILDDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) ; \
 	mv debian/changelog.in debian/changelog; \
-	dch -D $(DIST) "Built from source $(DESCRIBE)" -v "$(PACKAGE_VERSION)-0" ;\
+	dch -b -D $(DIST) "Built from source $(DESCRIBE)" -v "$(PACKAGE_VERSION)-0" ;\
 	dpkg-buildpackage -us -uc -D -rfakeroot ; \
 	mv ../*.deb $(TOPDIR)/dist/ ; \
 	cd -

Makefile.am

@@ -11,6 +11,7 @@ include_HEADERS=
 noinst_PROGRAMS=
 check_PROGRAMS =
 check_SCRIPTS =
+man1_MANS =
 
 noinst_LTLIBRARIES =
 lib_LTLIBRARIES=
@@ -34,30 +35,22 @@ endif
 
 include Makefile-std
 
-if BUILD_LIBSMBIOS_CXX
-include src/libsmbios_c++/Makefile.am
-endif
-
 include src/libsmbios_c/Makefile.am
 include src/python/Makefile.am
 include src/py-cli/Makefile.am
 include src/bin/Makefile.am
 include src/pyunit/Makefile.am
 
-if CPPUNIT_PRESENT
-include src/cppunit/Makefile.am
-endif
-
 pkgconfdir=$(sysconfdir)/$(PACKAGE)
 if HAVE_PYTHON
 dist_pkgconf_DATA=etc/logging.conf
 endif
 
 pcdir = ${libdir}/pkgconfig
-pc_DATA = pkg/libsmbios_c.pc pkg/libsmbios_c++.pc
+pc_DATA = pkg/libsmbios_c.pc
 DISTCLEANFILES += pkg/*.pc *-uninstalled.pc pkg/config* pkg/depcomp
 
-CLEANFILES+=_buildtemp smbios-utils*.rpm out/libsmbios_c out/libsmbios_c++
+CLEANFILES+=_buildtemp smbios-utils*.rpm out/libsmbios_c
 DISTCLEANFILES += out ABOUT-NLS Makefile.in aclocal.m4 autom4te.cache/ configure m4/
 DISTCLEANFILES += pkg/compile pkg/install-sh pkg/ltmain.sh pkg/missing
 DISTCLEANFILES += pkg/mkinstall* pkg/py-compile pkg/test-driver
@@ -94,9 +87,6 @@ coverage:
 if HAVE_DOXYGEN
 all: doxygen
 DOXYGEN_DEPS=out/libsmbios_c/html/index.html
-if BUILD_LIBSMBIOS_CXX
-DOXYGEN_DEPS+=out/libsmbios_c++/html/index.html
-endif
 doxygen: $(DOXYGEN_DEPS)
 else
 all:
@@ -113,13 +103,16 @@ export DOT HAVE_DOT top_builddir top_srcdir
 out/libsmbios_c/html/index.html: $(top_srcdir)/pkg/libsmbios_c.dox $(wildcard $(top_srcdir)/src/include/smbios_c/*.h)
 	doxygen $< > out/$$(basename $< .dox).out
 
-out/libsmbios_c++/html/index.html: $(top_srcdir)/pkg/libsmbios_c++.dox $(wildcard $(top_srcdir)/src/include/smbios/*.h)
-	doxygen $< > out/$$(basename $< .dox).out
+out/scripts/%.1 : src/bin/%
+	mkdir -p out/scripts
+	-$(HELP2MAN) --output=$@ --name=$^ --version-string=$(PACKAGE_VERSION) "LD_LIBRARY_PATH=$$PWD/out/.libs python3 $^"
+
+out/%.1 : out/%
+	-$(HELP2MAN) --output=$@ --name=$^ --version-string=$(PACKAGE_VERSION) $^
 
 ########## END DOCS ################
 
 EXTRA_DIST += \
- pkg/libsmbios_c++.dox  \
  pkg/libsmbios_c.dox    \
  pkg/libsmbios.spec 	\
  pkg/scripts 		\

README.md

@@ -1,5 +1,6 @@
 # libsmbios
 [![Build Status](https://travis-ci.org/dell/libsmbios.png)](https://travis-ci.org/dell/libsmbios)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/dell-libsmbios/badge.svg)](https://scan.coverity.com/projects/dell-libsmbios)
 libsmbios provides a library to interface with the SMBIOS tables.
 It also provides extensions for proprietary methods of interfacing with Dell specific
 SMBIOS tables.

configure.ac

@@ -60,9 +60,6 @@ AC_SUBST([RELEASE_EXTRA], [release_extra_version()])
 AC_DEFINE_UNQUOTED(LIBSMBIOS_RELEASE_MAJOR,$RELEASE_MAJOR,"Major release version")
 AC_DEFINE_UNQUOTED(LIBSMBIOS_RELEASE_MINOR,$RELEASE_MINOR,"Minor release version")
 
-# Ensure we use c++11 instead of c++14
-CXXFLAGS="$CXXFLAGS -std=c++11"
-
 if test "$enable_shared" != "no"; then
     AC_DEFINE([LIBSMBIOS_C_ALL_DYN_LINK],[1],[Enable dynamic libraries to build])
     CFLAGS="$CFLAGS -DLIBSMBIOS_C_ALL_DYN_LINK"
@@ -86,12 +83,6 @@ AC_SUBST([LIBSMBIOS_C_SONAME], [libsmbios_c.so.$LIBSMBIOS_C_SO_MAJOR])
 AC_SUBST([LIBSMBIOS_CPLUSPLUS_SO_MAJOR], [$(($LIBSMBIOS_CPLUSPLUS_LIBTOOL_CURRENT - $LIBSMBIOS_CPLUSPLUS_LIBTOOL_AGE))])
 AC_SUBST([LIBSMBIOS_CPLUSPLUS_SONAME], [libsmbios.so.$LIBSMBIOS_CPLUSPLUS_SO_MAJOR])
 
-dnl Help line for libsmbios_cxx
-AC_ARG_ENABLE([libsmbios_cxx],
-    AS_HELP_STRING([--enable-libsmbios_cxx],[Enable build of the c++ libsmbios.so library. This library is deprecated, most things should migrate to libsmbios_c.so. default: disabled]),
-    [want_libsmbios_cxx=$enableval], [want_libsmbios_cxx=no])
-AM_CONDITIONAL(BUILD_LIBSMBIOS_CXX, [test x$want_libsmbios_cxx == xyes])
-
 dnl Help line for doxygen
 AC_ARG_ENABLE(doxygen,
     AS_HELP_STRING([--disable-doxygen],[Disable API docs build via Doxygen. default: enabled if doxygen present]),
@@ -121,8 +112,6 @@ fi
 AC_PROG_CC
 AC_PROG_CC_C99
 AM_PROG_CC_C_O
-AC_PROG_CXX
-AC_PROG_CPP
 AC_PROG_INSTALL
 
 dnl Check for python support
@@ -177,6 +166,9 @@ if test x$wantgraphviz != xyes ; then
     AM_CONDITIONAL(HAVE_DOT, [false])
 fi
 
+#generate man pages for anything executable
+AC_PATH_PROG(HELP2MAN, help2man, false)
+
 # the manual assembly in the media direct sources fails to build on ia64 as it
 # relies on more registers than available on ia64; there's no ia64 system with
 # media direct, so it's disabled on ia64
@@ -195,17 +187,13 @@ AM_CONDITIONAL(BUILD_LINUX,   [test -n "$linux_os"])
 AM_CONDITIONAL(BUILD_WINDOWS, [test -n "$windows_os"])
 
 PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
-PKG_CHECK_MODULES([CPPUNIT],[cppunit],[],[echo "CPPUNIT not found, disabling CPPUNIT dependent modules"])
-AM_CONDITIONAL(CPPUNIT_PRESENT, [test -n "$CPPUNIT_LIBS"])
 
 # generate files and exit
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([pkg/libsmbios.spec])
 AC_CONFIG_FILES([po/Makefile.in])
 AC_CONFIG_FILES([libsmbios_c-uninstalled.pc:pkg/libsmbios_c-uninstalled.pc.in])
 AC_CONFIG_FILES([pkg/libsmbios_c.pc])
-AC_CONFIG_FILES([libsmbios_c++-uninstalled.pc:pkg/libsmbios_c++-uninstalled.pc.in])
-AC_CONFIG_FILES([pkg/libsmbios_c++.pc])
 AC_CONFIG_FILES([out/public-include/smbios/dlopen.h:pkg/dlopen.h.in])
 AC_CONFIG_FILES([out/public-include/smbios_c/dlopen.h:pkg/dlopen.h.in])
 AC_CONFIG_FILES([pkg/pkginfo])

debian/changelog

@@ -8,6 +8,7 @@ libsmbios (2.4.0-1) UNRELEASED; urgency=medium
     - No longer installs sh script with bashisms (Closes: #772330)
     - Drops unsupported RBU based flashing (Closes: #496546)
     - Fixes improper function definition (Closes: #748243)
+    - Generate man pages with help2man (Closes: #748023)
   * No longer build deprecated C++ library.
     - No longer installs broken dellMediaDirectCtl (Closes: #715812)
   * debian/control:
@@ -23,8 +24,10 @@ libsmbios (2.4.0-1) UNRELEASED; urgency=medium
     - Rename libsmbios2 -> libsmbios-c2
       Provides/Conflicts/Replaces to make a good transition both for
       Debian & Ubuntu.
+    - Build depends on help2man.
   * debian/copyright:
     - Fix long lines (Closes: #803607, #803608, #803609)
+    - Remove references to C++ stuff
   * debian/rules:
     - Switch to new debhelper format
     - Enable hardening flags

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -6,7 +6,7 @@ Uploaders: tony mancill <[email protected]>, Mario Limonciello <mario.limoncie
 Vcs-Git: https://salsa.debian.org/efi-team/libsmbios.git
 Vcs-Browser: https://salsa.debian.org/efi-team/libsmbios
 Homepage: https://github.com/dell/libsmbios/
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                dh-python,
                dh-autoreconf,
                autotools-dev,
@@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 9),
                autoconf,
                automake,
                libtool,
+               help2man,
                autopoint
 Standards-Version: 4.1.3
 

debian/copyright

@@ -2,11 +2,9 @@ This package was debianized by Jose Luis Tallon <[email protected]> on
 Fri,  1 Jul 2005 23:34:21 +0200.
 
 It was downloaded from:
-    <http://linux.dell.com/libsmbios/download/libsmbios/>
-and subsequently stripped of its cppunit/platform directory as it
-included memory dumps of a proprietary BIOS.
+    <https://github.com/dell/libsmbios>
 
-The files bin-{un,}supported/getopt.[ch] are copyright:
+The files src/bin/getopt.[ch] are copyright:
     Copyright (c) 2001, 2002 Steve Mertz <[email protected]>
 and licensed under a BSD alike license:
 
@@ -38,65 +36,6 @@ and licensed under a BSD alike license:
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-======================================================================
-
-Portions of the configuration system under include/smbios/config/ are
-taken and modified from the boost c++ library and are copyright:
-    (C) Copyright John Maddock 2001 - 2003.
-    (C) Copyright Aleksey Gurtovoy 2002 - 2003.
-    (C) Copyright Beman Dawes 2001 - 2003.
-    (C) Copyright Bill Kempf 2001 - 2002.
-    (C) Copyright Darin Adler 2001 - 2002.
-    (C) Copyright David Abrahams 2002 - 2003.
-    (C) Copyright Douglas Gregor 2002.
-    (C) Copyright Eric Friedman 2003.
-    (C) Copyright Gennaro Prota 2003.
-    (C) Copyright Guillaume Melquiond 2003.
-    (C) Copyright Jens Maurer 2001 - 2003.
-    (C) Copyright Martin Wille 2003.
-    (C) Copyright Peter Dimov 2001.
-    (C) Copyright Synge Todo 2003.
-    Copyright (C) 2005 Dell Inc.
-and licensed under the boost 1.0 license:
-
-======================================================================
-
-    Boost Software License - Version 1.0 - August 17th, 2003
-
-    Permission is hereby granted, free of charge, to any person or organization
-    obtaining a copy of the software and accompanying documentation covered by
-    this license (the "Software") to use, reproduce, display, distribute,
-    execute, and transmit the Software, and to prepare derivative works of the
-    Software, and to permit third-parties to whom the Software is furnished to
-    do so, all subject to the following:
-
-    The copyright notices in the Software and this entire statement, including
-    the above license grant, this restriction and the following disclaimer,
-    must be included in all copies of the Software, in whole or in part, and
-    all derivative works of the Software, unless such copies or derivative
-    works are solely in the form of machine-executable object code generated by
-    a source language processor.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-    SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-    FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-
-======================================================================
-
-bin-supported/wakeupCtl.cpp is copyright:
- * Copyright (C) 2005 David Greaves <[email protected]>
-and licensed under the GPL version 2 or later (see below).
-
-If not otherwise specified, libsmbios is copyright:
-    Copyright (C) 2005 Dell Inc.
-    by Michael Brown <[email protected]>
-and dual licensed under the Open Software License version 2.1 and the
-GPL version 2 or later:
-
 ======================================================================
 
  * Licensed under the Open Software License version 2.1

debian/smbios-utils.install

@@ -1,4 +1,4 @@
 debian/tmp/usr/sbin/*		usr/sbin
 debian/tmp/usr/share/smbios*    usr/share
 debian/tmp/etc/*                etc
-
+debian/tmp/usr/share/man*	usr/share

debian/smbios-utils.links

@@ -1,3 +1,6 @@
 usr/sbin/smbios-wireless-ctl    usr/sbin/dellWirelessCtl
 usr/sbin/smbios-sys-info        usr/sbin/getSystemId
 usr/sbin/smbios-lcd-brightness  usr/sbin/dellLcdBrightness
+usr/share/man/man1/smbios-wireless-ctl.1	usr/share/man/man1/dellWirelessCtl.1
+usr/share/man/man1/smbios-sys-info.1		usr/share/man/man1/getSystemId.1
+usr/share/man/man1/smbios-lcd-brightness.1	usr/share/man/man1/dellLcdBrightness.1