Hello community, here is the log from the commit of package libsmbios for openSUSE:Factory checked in at 2017-10-28 14:16:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsmbios (Old) and /work/SRC/openSUSE:Factory/.libsmbios.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsmbios" Sat Oct 28 14:16:58 2017 rev:38 rq:535170 version:2.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libsmbios/libsmbios.changes 2017-03-29 13:19:53.608147030 +0200 +++ /work/SRC/openSUSE:Factory/.libsmbios.new/libsmbios.changes 2017-10-28 14:16:59.001865342 +0200 @@ -1,0 +2,8 @@ +Fri Sep 22 13:09:57 UTC 2017 - [email protected] + +- Update to version 2.3.3 + Shipping and new DellEMC systems may use dell_rbu driver to + perform BIOS updates on the system. + [fate#322804] + +------------------------------------------------------------------- Old: ---- v2.3.2.tar.gz New: ---- v2.3.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsmbios.spec ++++++ --- /var/tmp/diff_new_pack.ovNua4/_old 2017-10-28 14:16:59.793836380 +0200 +++ /var/tmp/diff_new_pack.ovNua4/_new 2017-10-28 14:16:59.793836380 +0200 @@ -1,7 +1,7 @@ # # spec file for package libsmbios # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,82 +16,164 @@ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +# these are all substituted by autoconf +%define major 2 +%define minor 3 +%define micro 3 +%define extra %{nil} +%define pot_file libsmbios +%define lang_dom libsmbios-2.3-x86_64 +%define release_version 2.3.3 + +%define release_name libsmbios +%define other_name libsmbios2 +# %%if 0%%{?suse_version} +# %%define release_name libsmbios2 +# %%define other_name libsmbios +# %%endif + +%{!?build_python: %define build_python 1} +%{?_with_python: %define build_python 1} +%{?_without_python: %undefine build_python} + +# run_unit_tests not defined by default as cppunit +# not available in OS on several major OS +%{?_without_unit_tests: %undefine run_unit_tests} +%{?_with_unit_tests: %define run_unit_tests 1} + +%{!?as_needed: %define as_needed 1} +%{?_without_as_needed: %undefine as_needed} +%{?_with_as_needed: %define as_needed 1} + +# some distros already have fdupes macro. If not, we just set it to something innocuous +%{?!fdupes: %define fdupes /usr/sbin/hardlink -c -v} + +%define cppunit_BR cppunit-devel +%define pkgconfig_BR pkgconfig +%define ctypes_BR python-ctypes +%define fdupes_BR hardlink +%define valgrind_BR valgrind +# Some variable definitions so that we can be compatible between SUSE Build service and Fedora build system +# SUSE: fedora_version suse_version rhel_version centos_version sles_version +# Fedora: fedora dist fc8 fc9 + +# suse/sles +%if 0%{?suse_version} +%if 0%{?suse_version} < 1000 + %define valgrind_BR %{nil} + # sles 9 doesnt have as_needed + %undefine as_needed +%endif +%if 0%{?suse_version} >= 1020 + # suse never added python-ctypes provides to python 2.5 :( + %define ctypes_BR %{nil} +%endif +%if 0%{?suse_version} > 1020 + %define fdupes_BR fdupes +%else + %define fdupes_BR %{nil} + %define fdupes echo fdupes disabled +%endif +%endif -Name: libsmbios -Version: 2.3.2 -Release: 0 -Summary: Libraries to get information from standard BIOS tables -License: GPL-2.0+ or OSL-2.1 -Group: System/Management +# rhel (should work on OBS and EPEL) +%if 0%{?rhel} +%if 0%{?rhel} < 5 + %define fdupes echo fdupes disabled + %define fdupes_BR %{nil} +%endif +%if 0%{?rhel} < 4 + # dont yet have rhel3 valgrind + %define valgrind_BR %{nil} + # no python-ctypes for python <= 2.2 + %undefine build_python + # rhel3 doesnt have -as-needed + %undefine as_needed +%endif +%endif + +%define python_devel_BR %{nil} +%if 0%{?build_python} + %define python_devel_BR python-devel + # per fedora and suse python packaging guidelines + # suse: will define py_sitedir for us + # fedora: use the !? code below to define when it isnt already + + # pure python stuff goes here + %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} + + # arch-dep python stuff goes here + %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} + +%endif +# if unit tests are disabled, get rid of a few BuildRequires +%{!?run_unit_tests: %define cppunit_BR %{nil}} +%{!?run_unit_tests: %define valgrind_BR %{nil}} + +Name: %{release_name} +Version: 2.3.3 +Release: 3%{?dist} +Summary: Libsmbios C/C++ shared libraries +License: GPL-2.0+ or OSL-2.1 +Group: System Environment/Libraries Url: https://github.com/dell/libsmbios -Source0: https://github.com/dell/libsmbios/archive/v%{version}.tar.gz +Source: https://github.com/dell/libsmbios/archive/v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: autoconf -BuildRequires: autogen BuildRequires: automake -BuildRequires: doxygen -BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRequires: libcppunit-devel BuildRequires: libtool -BuildRequires: pkgconfig -BuildRequires: python-base -BuildRequires: pkgconfig(libxml-2.0) -# Modules: dcdbas.ko -Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) -# Generated with: extract-modaliases dcdbas -# libsmbios only ever makes sense on intel compatible arches, no DMI tables on ppc, s390, etc. -ExclusiveArch: ia64 %{ix86} x86_64 +BuildRequires: strace libxml2-devel gcc-c++ gettext doxygen %{valgrind_BR} %{cppunit_BR} %{fdupes_BR} %{pkgconfig_BR} %{python_devel_BR} +# uncomment for official fedora +Obsoletes: libsmbios-libs < 2.0.0 +Provides: libsmbios-libs = 0:%{version}-%{release} +Obsoletes: %{other_name} <= 0:%{version}-%{release} +Provides: %{other_name} = 0:%{version}-%{release} + +# libsmbios only ever makes sense on intel compatible arches +# no DMI tables on ppc, s390, etc. +ExclusiveArch: x86_64 ia64 %{ix86} %description -Libsmbios is a library and utilities that can be used by client programs -to get information from standard BIOS tables, such as the SMBIOS table. - -%package devel -Summary: Development files for libsmios -Group: Development/Libraries/C and C++ -Requires: libsmbios2 = %{version} -Requires: libstdc++-devel - -%description devel Libsmbios is a library and utilities that can be used by client programs to get information from standard BIOS tables, such as the SMBIOS table. -This package contains the necessary files to compile new client programs -against libsmbios. +This package provides the C-based libsmbios library, with a C interface. + +This package also has a C++-based library, with a C++ interface. It is not +actively maintained, but provided for backwards compatibility. New programs +should use the libsmbios C interface. -%package -n libsmbios2 -Summary: Libraries to get information from standard BIOS tables -Group: System/Management -Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) - -%description -n libsmbios2 -Libsmbios is a library and utilities that can be used by client programs -to get information from standard BIOS tables, such as the SMBIOS table. %package -n python-smbios Summary: Python interface to Libsmbios C library -Group: Development/Libraries/Python -Requires: libsmbios2 = %{version} -Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) -%if %{?suse_version: 0%{?suse_version} > 1110} %{!?suse_version:1} -BuildArch: noarch -%endif +Group: System Environment/Libraries +Requires: %{release_name} = %{version}-%{release} +Requires: python %{ctypes_BR} %description -n python-smbios -This package provides a Python interface to libsmbios. +This package provides a Python interface to libsmbios + +%package -n smbios-utils +Summary: Meta-package that pulls in all smbios binaries and python scripts +Group: Applications/System +Requires: smbios-utils-bin +%if 0%{?build_python} +Requires: smbios-utils-python +%endif +Obsoletes: libsmbios-bin < 0:2.0.0 +Provides: libsmbios-bin = %{version}-%{release} +Obsoletes: libsmbios-unsupported-bin < 0:2.0.0 +Provides: libsmbios-unsupported-bin = %{version}-%{release} + +%description -n smbios-utils +This is a meta-package that pulls in the binary libsmbios executables as well +as the python executables. %package -n smbios-utils-bin Summary: Binary utilities that use libsmbios -Group: System/Management -Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) -# libsmbios-unsupported-bin was last used in openSUSE 11.4 (libsmbios-unsupported-bin-2.0.2) -Obsoletes: libsmbios-unsupported-bin <= 2.0.2 -Provides: libsmbios-unsupported-bin = %{version} +Group: Applications/System +Requires: %{release_name} = %{version}-%{release} %description -n smbios-utils-bin Get BIOS information, such as System product name, product id, service tag and @@ -99,12 +181,8 @@ %package -n smbios-utils-python Summary: Python executables that use libsmbios -Group: System/Management -Requires: python-smbios = %{version} -Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) -# libsmbios-bin was last used in openSUSE 11.4 (libsmbios-bin-2.0.2) -Obsoletes: libsmbios-bin <= 2.0.2 -Provides: libsmbios-bin = %{version} +Group: Applications/System +Requires: python-smbios = %{version}-%{release} %description -n smbios-utils-python Get BIOS information, such as System product name, product id, service tag and @@ -112,11 +190,26 @@ cards/bluetooth on Dell laptops. Set BIOS password on select Dell systems. Update BIOS on select Dell systems. Set LCD brightness on select Dell laptops. +# name the devel package libsmbios-devel regardless of package name, per suse/fedora convention +%package -n libsmbios-devel +Summary: Development headers and archives +Group: Development/Libraries +Requires: %{release_name} = %{version}-%{release} +Provides: libsmbios2-devel = %{version}-%{release} +Obsoletes: libsmbios2-devel < %{version}-%{release} + +%description -n libsmbios-devel +Libsmbios is a library and utilities that can be used by client programs to get +information from standard BIOS tables, such as the SMBIOS table. + +This package contains the headers and .a files necessary to compile new client +programs against libsmbios. + %package -n yum-dellsysid Summary: YUM plugin to retrieve the Dell System ID -Group: System/Packages -Requires: smbios-utils-python = %{version} -Requires: yum +# yum plugin and supporting functions first appeared in 2.2.0 +Group: Development/Tools +Requires: smbios-utils-python >= 2.2.0 %description -n yum-dellsysid Libsmbios is a library and utilities that can be used by client programs to get @@ -125,119 +218,206 @@ This package contains a YUM plugin which allows the use of certain substitutions in yum repository configuration files on Dell systems. + %prep -%setup -q +: '########################################' +: '########################################' +: '#' +: '# build_python: %{?build_python}' +: '# run_unit_tests: %{?run_unit_tests}' +: '# rhel: %{?rhel}' +: '# suse_version: %{?suse_version}' +: '#' +: '########################################' +: '########################################' +%setup -q -n libsmbios-%{version} +find . -type d -exec chmod -f 755 {} \; +find doc src -type f -exec chmod -f 644 {} \; +find ./src/cppunit/ -name "*.sh" -type f -exec chmod 755 '{}' \; %build -./autogen.sh -%configure --disable-rpath +# this line lets us build an RPM directly from a git tarball +# and retains any customized version information we might have +[ -e ./configure ] || ./autogen.sh --no-configure + +mkdir _build +cd _build +echo '../configure "$@"' > configure +chmod +x ./configure + +%configure \ + %{?!as_needed:--disable-as-needed} %{?!build_python:--disable-python} \ + --enable-libsmbios_cxx + +mkdir -p out/libsmbios_c +mkdir -p out/libsmbios_c++ +make CFLAGS="-Werror" %{?_smp_mflags} 2>&1 | tee build-%{_arch}.log + +echo \%doc _build/build-%{_arch}.log > buildlogs.txt + +%check +runtest() { + mkdir _$1$2 +%if 0%{?run_unit_tests} + pushd _$1$2 + ../configure + make -e $1 CFLAGS="$CFLAGS -DDEBUG_OUTPUT_ALL" 2>&1 | tee $1$2.log + touch -r ../configure.ac $1$2-%{_arch}.log + make -e $1 2>&1 | tee $1$2.log + popd + echo \%doc _$1$2/$1$2-%{_arch}.log >> _build/buildlogs.txt +%endif +} -make %{?_smp_mflags} +if [ -d /usr/include/cppunit ]; then + # run this first since it is slightly faster than valgrind + VALGRIND="strace -f" runtest check strace > /dev/null || echo FAILED strace check +fi + +if [ -e /usr/bin/valgrind -a -d /usr/include/cppunit ]; then + runtest valgrind > /dev/null || echo FAILED valgrind check +fi + +if [ -d /usr/include/cppunit ]; then + runtest check > /dev/null || echo FAILED check +fi + +if [ ! -d /usr/include/cppunit ]; then + echo "Unit tests skipped due to missing cppunit." +fi %install -%make_install +rm -rf %{buildroot} +mkdir %{buildroot} -# Install headers -install -dp -m 0755 %{buildroot}%{_includedir} -cp -a src/include/* %{buildroot}/%{_includedir}/ +cd _build +TOPDIR=.. +make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +mkdir -p %{buildroot}/%{_includedir} +mkdir -p %{buildroot}/%{_bindir} +cp -a $TOPDIR/src/include/* %{buildroot}/%{_includedir}/ cp -a out/public-include/* %{buildroot}/%{_includedir}/ -find %{buildroot}/%{_includedir} out/libsmbios_c++ out/libsmbios_c -exec touch -r configure.ac {} \; - -# Remove *.la files (package provides pkg-config files), remove static libraries rm -f %{buildroot}/%{_libdir}/lib*.{la,a} +find %{buildroot}/%{_includedir} out/libsmbios_c++ out/libsmbios_c -exec touch -r $TOPDIR/configure.ac {} \; -# Prepare doc files for devel package -mv out/libsmbios_c out/libsmbios_c-%{_arch} mv out/libsmbios_c++ out/libsmbios_c++-%{_arch} +mv out/libsmbios_c out/libsmbios_c-%{_arch} -# Manually install the doc files for the devel package in order to fix duplicates with "fdupes -s" -install -dp -m 0755 %{buildroot}%{_defaultdocdir}/%{name}-devel -cp -a COPYING COPYING-GPL COPYING-OSL NEWS README TODO %{buildroot}%{_defaultdocdir}/%{name}-devel/ -cp -a src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt %{buildroot}%{_defaultdocdir}/%{name}-devel/ -cp -a out/libsmbios_c-%{_arch} %{buildroot}%{_defaultdocdir}/%{name}-devel/ -cp -a out/libsmbios_c++-%{_arch} %{buildroot}%{_defaultdocdir}/%{name}-devel/ - -# -rename libsmbios.mo libsmbios-2.2-x86_64.mo $(find %{buildroot}/%{_datadir} -name libsmbios.mo) +rename %{pot_file}.mo %{lang_dom}.mo $(find %{buildroot}/%{_datadir} -name %{pot_file}.mo) +%find_lang %{lang_dom} -# Remove unneeded locales -%if 0%{?suse_version} && 0%{?suse_version} < 1140 -rm -rf %{buildroot}%{_datadir}/locale/en/ -rm -rf %{buildroot}%{_datadir}/locale/en@boldquot/ -rm -rf %{buildroot}%{_datadir}/locale/en@quot/ +touch files-yum-dellsysid +touch files-smbios-utils-python +touch files-python-smbios + +%if 0%{?build_python} + +# backwards compatible: +ln -s %{_sbindir}/dellWirelessCtl %{buildroot}/%{_bindir}/dellWirelessCtl +ln -s smbios-sys-info %{buildroot}/%{_sbindir}/getSystemId +ln -s smbios-wireless-ctl %{buildroot}/%{_sbindir}/dellWirelessCtl +ln -s smbios-lcd-brightness %{buildroot}/%{_sbindir}/dellLcdBrightness + +cat > files-python-smbios <<-EOF + %doc COPYING-GPL COPYING-OSL + %{python_sitelib}/* +EOF + +cat > files-smbios-utils-python <<-EOF + %doc COPYING-GPL COPYING-OSL + %doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt + %dir %{_sysconfdir}/libsmbios + %config(noreplace) %{_sysconfdir}/libsmbios/* + + # python utilities + %{_sbindir}/smbios-sys-info + %{_sbindir}/smbios-token-ctl + %{_sbindir}/smbios-passwd + %{_sbindir}/smbios-wakeup-ctl + %{_sbindir}/smbios-wireless-ctl + %{_sbindir}/smbios-lcd-brightness +# %%{_sbindir}/smbios-keyboard-ctl +# %%{_sbindir}/smbios-thermal-ctl + %{_sbindir}/smbios-battery-ctl + + # used by HAL in old location, so keep it around until HAL is updated. + %{_sbindir}/dellLEDCtl + %{_sbindir}/dellLcdBrightness + %{_sbindir}/dellMediaDirectCtl + %{_sbindir}/getSystemId + %{_sbindir}/dellWirelessCtl + %{_bindir}/dellWirelessCtl + + # data files + %{_datadir}/smbios-utils +EOF + +cat > files-yum-dellsysid <<-EOF + %doc COPYING-GPL COPYING-OSL + # YUM Plugin + %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/* + %{_exec_prefix}/lib/yum-plugins/* + # SUSE build has anal directory ownership check. RPM which owns all dirs *must* + # be installed at buildtime. + %if 0%{?suse_version} >= 1100 + %dir %{_sysconfdir}/yum + %dir %{_sysconfdir}/yum/pluginconf.d/ + %dir %{_exec_prefix}/lib/yum-plugins/ + %endif +EOF %endif -%find_lang %{name}-2.2-x86_64 - -%fdupes -s %{buildroot} +# hardlink files to save some space. +%fdupes $RPM_BUILD_ROOT %clean rm -rf %{buildroot} -%post -n libsmbios2 -p /sbin/ldconfig +%post -n %{release_name} -p /sbin/ldconfig +%postun -n %{release_name} -p /sbin/ldconfig -%postun -n libsmbios2 -p /sbin/ldconfig +%files -f _build/%{lang_dom}.lang +%defattr(-,root,root,-) +%{_libdir}/libsmbios_c.so.* +%{_libdir}/libsmbios.so.* -%files devel +%files -n libsmbios-devel -f _build/buildlogs.txt %defattr(-,root,root,-) -%doc %{_defaultdocdir}/%{name}-devel/ -%{_includedir}/smbios/ -%{_includedir}/smbios_c/ +%doc COPYING-GPL COPYING-OSL src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt +%{_includedir}/smbios +%{_includedir}/smbios_c %{_libdir}/libsmbios.so %{_libdir}/libsmbios_c.so -%{_libdir}/pkgconfig/libsmbios_c*.pc +%{_libdir}/pkgconfig/*.pc +%doc _build/out/libsmbios_c++-%{_arch} +%doc _build/out/libsmbios_c-%{_arch} -%files -n libsmbios2 -f %{name}-2.2-x86_64.lang +%files -n smbios-utils +# opensuse 11.1 enforces non-empty file list :( %defattr(-,root,root,-) -%{_libdir}/libsmbios.so.2* -%{_libdir}/libsmbios_c.so.2* - -%files -n python-smbios -%defattr(-,root,root,-) -%doc COPYING-GPL COPYING-OSL NEWS README TODO -%{python_sitelib}/libsmbios_c/ +%doc COPYING-GPL COPYING-OSL +# no other files. %files -n smbios-utils-bin %defattr(-,root,root,-) -%doc COPYING-GPL COPYING-OSL NEWS README TODO -%defattr(555,root,root,-) -# legacy C++ -%{_sbindir}/dellLEDCtl -%ifnarch ia64 -%{_sbindir}/dellMediaDirectCtl -%endif +%doc COPYING-GPL COPYING-OSL +%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt + # new C utilities -%{_sbindir}/smbios-get-ut-data %{_sbindir}/smbios-state-byte-ctl -%{_sbindir}/smbios-sys-info-lite +%{_sbindir}/smbios-get-ut-data %{_sbindir}/smbios-upflag-ctl +%{_sbindir}/smbios-sys-info-lite %{_sbindir}/smbios-keyboard-ctl %{_sbindir}/smbios-thermal-ctl -%files -n smbios-utils-python +%files -n python-smbios -f _build/files-python-smbios +%defattr(-,root,root,-) + +%files -n smbios-utils-python -f _build/files-smbios-utils-python +%defattr(-,root,root,-) + +%files -n yum-dellsysid -f _build/files-yum-dellsysid %defattr(-,root,root,-) -%doc COPYING-GPL COPYING-OSL NEWS README TODO -%dir %{_sysconfdir}/libsmbios -%config(noreplace) %{_sysconfdir}/libsmbios/* -%defattr(555,root,root,-) -# python utilities -%{_sbindir}/smbios-lcd-brightness -%{_sbindir}/smbios-passwd -%{_sbindir}/smbios-battery-ctl -%{_sbindir}/smbios-sys-info -%{_sbindir}/smbios-token-ctl -%{_sbindir}/smbios-wakeup-ctl -%{_sbindir}/smbios-wireless-ctl -%defattr(-,root,root,-) -%{_datadir}/smbios-utils/ - -%files -n yum-dellsysid -%defattr(-,root,root,-) -%doc COPYING-GPL COPYING-OSL NEWS README TODO -%dir %{_sysconfdir}/yum -%dir %{_sysconfdir}/yum/pluginconf.d -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/dellsysid.conf -%dir %{_exec_prefix}/lib/yum-plugins -%{_exec_prefix}/lib/yum-plugins/dellsysid.* %changelog ++++++ v2.3.2.tar.gz -> v2.3.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/.gitignore new/libsmbios-2.3.3/.gitignore --- old/libsmbios-2.3.2/.gitignore 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/.gitignore 2017-03-09 13:36:53.000000000 +0100 @@ -43,3 +43,6 @@ po/quot.sed po/remove-potcdate.sin +# docker build process +/Dockerfile +/*-entrypoint.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/Makefile.am new/libsmbios-2.3.3/Makefile.am --- old/libsmbios-2.3.2/Makefile.am 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/Makefile.am 2017-03-09 13:36:53.000000000 +0100 @@ -18,8 +18,8 @@ TESTS= AM_CPPFLAGS = -I$(top_builddir)/out/include -I$(top_srcdir)/src/include -DLIBSMBIOS_LOCALEDIR=\"$(localedir)\" -AM_CFLAGS = -Wall -AM_CXXFLAGS = -Wall +AM_CFLAGS = -Wall -fPIC +AM_CXXFLAGS = -Wall -fPIC AM_LDADD = $(LIBINTL) AM_LDFLAGS = -L$(top_builddir)/out/ @@ -91,7 +91,10 @@ ########## DOCS ################ all: doxygen if HAVE_DOXYGEN -DOXYGEN_DEPS=out/libsmbios_c/html/index.html out/libsmbios_c++/html/index.html +DOXYGEN_DEPS=out/libsmbios_c/html/index.html +if BUILD_LIBSMBIOS_CXX +DOXYGEN_DEPS+=out/libsmbios_c++/html/index.html +endif doxygen: $(DOXYGEN_DEPS) endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/README new/libsmbios-2.3.3/README --- old/libsmbios-2.3.2/README 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ -Dependencies: - -To build a libsmbios tarball, you will need the following dependencies, in whichever -devel package convention in use by your distribution: - -- libxml - -When building from a git-checkout, you will need the following additional dependencies - -- autoconf - -- automake - -- gettext - -- libtool - -MANDRIVA NOTE: The following is the package list required for Mandriva, submitted by a user: - - urpmi gcc-c++ - urpmi git - urpmi autoconf - urpmi automake - urpmi autopoint - urpmi gettext - urpmi gettext-autopoint - urpmi gettext-tools - urpmi gettext-devel - urpmi libtool - urpmi libxml - urpmi libxml2-devel - -To Build: - -Libmsbios is a standard autotools package. Build it like any autotools package: - $ ./configure - $ make - -To build from a git checkout: - $ ./autogen.sh # autogen.sh internally runs configure automatically - $ make - -[RECOMMENDED] Out of tree build. To build in a separate dir, leaving a clean -source tree: - $ mkdir _build - $ ../configure - $ make - - -To Install: - -Standard autotools package: - $ make install - - -Documentation is in doxygen format. To view the docs, run "make doxygen", then -look in the out/libsmbios_c/html/index.html. Docs are also built as part of -"make all". - -These docs are posted on the web at http://.../.. (need permanent address here) - -This software is dual-licensed under GPL/OSL. - - * Copyright (C) 2005 Dell Inc. - * by Michael Brown <[email protected]> - * Licensed under the Open Software License version 2.1 - * - * Alternatively, you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2 of the License, - * or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/README.md new/libsmbios-2.3.3/README.md --- old/libsmbios-2.3.2/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/libsmbios-2.3.3/README.md 2017-03-09 13:36:53.000000000 +0100 @@ -0,0 +1,64 @@ +# 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. + +Dependencies +-- +To build a libsmbios tarball, you will need the following dependencies, in whichever -devel package convention in use by your distribution: +1. libxml + +When building from a git-checkout, you will need the following additional dependencies +1. autoconf +2. automake +3. gettext +4. libtool + +Building: +-- +libmsbios is a standard autotools package. Build it like any autotools package: +``` +$ ./configure + $ make +``` +To build from a git checkout: +``` + $ ./autogen.sh # autogen.sh internally runs configure automatically + $ make +``` +*RECOMMENDED* Out of tree build. To build in a separate dir, leaving a clean +source tree: +``` + $ mkdir _build + $ ../configure + $ make +``` + +To Install: + +Standard autotools package: +``` +$ make install +``` + +Documentation is in doxygen format. To view the docs, run "make doxygen", then +look in the out/libsmbios_c/html/index.html. Docs are also built as part of +"make all". + +License +-- +This software is dual-licensed under GPL/OSL. + + * Copyright (C) 2005-2016 Dell Inc. + * by Michael Brown <[email protected]> + * Licensed under the Open Software License version 2.1 + * + * Alternatively, you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, + * or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/autogen.sh new/libsmbios-2.3.3/autogen.sh --- old/libsmbios-2.3.2/autogen.sh 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/autogen.sh 2017-03-09 13:36:53.000000000 +0100 @@ -10,7 +10,7 @@ cd $SCRIPT_DIR -autoreconf -i -f -Wno-portability +autoreconf -v -i -f run_configure=true for arg in $*; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/configure.ac new/libsmbios-2.3.3/configure.ac --- old/libsmbios-2.3.2/configure.ac 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/configure.ac 2017-03-09 13:36:53.000000000 +0100 @@ -13,7 +13,7 @@ # m4_define([release_major_version], [2]) m4_define([release_minor_version], [3]) -m4_define([release_micro_version], [1]) +m4_define([release_micro_version], [3]) # if you define any "extra" version info, include a leading dot (".") m4_define([release_extra_version], []) @@ -45,7 +45,7 @@ AC_CONFIG_AUX_DIR([pkg]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([subdir-objects tar-ustar dist-bzip2 dist-xz no-define -Wno-portability ]) +AM_INIT_AUTOMAKE([subdir-objects dist-xz no-define foreign]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.14]) AC_GNU_SOURCE @@ -60,6 +60,9 @@ 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++98 instead of c++14 +CXXFLAGS="$CXXFLAGS -std=c++98" + 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" @@ -85,23 +88,23 @@ dnl Help line for doxygen AC_ARG_ENABLE([libsmbios_cxx], - AS_HELP_STRING([--disable-libsmbios_cxx],[Disable build of the c++ libsmbios.so library. This library is deprecated, most things should migrate to libsmbios_c.so. default: enabled]), - [want_libsmbios_cxx=$enableval], [want_libsmbios_cxx=yes]) + AS_HELP_STRING([--enable-libsmbios_cxx],[Disable 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), + AS_HELP_STRING([--disable-doxygen],[Disable API docs build via Doxygen. default: enabled if doxygen present]), [wantdoxygen=$enableval], [wantdoxygen=yes]) dnl Help line for graphviz AC_ARG_ENABLE(graphviz, - AS_HELP_STRING(--disable-graphviz,Enhance API docs with pretty graphs and pictures. default: enabled if graphviz present), + AS_HELP_STRING([--disable-graphviz],[Enhance API docs with pretty graphs and pictures. default: enabled if graphviz present]), [wantgraphviz=$enableval], [wantgraphviz=yes]) dnl Help line for graphviz AC_ARG_ENABLE(python, - AS_HELP_STRING(--disable-python,Build and install python utilities. default: enabled if python present), + AS_HELP_STRING([--disable-python],[Build and install python utilities. default: enabled if python present]), [wantpython=$enableval], [wantpython=yes]) AC_ARG_ENABLE(as-needed, @@ -212,3 +215,17 @@ AC_CONFIG_FILES([out/public-include/smbios_c/dlopen.h:pkg/dlopen.h.in]) AC_CONFIG_FILES([pkg/pkginfo]) AC_OUTPUT + +# ============================================== +# Display final informations about configuration +# ============================================== +AC_MSG_NOTICE([ +============================================================================== +Build configuration: + c++ library: ${want_libsmbios_cxx} + doxygen: ${wantdoxygen} + graphviz: ${wantgraphviz} + python: ${wantpython} + as-needed: ${wantasneeded} +============================================================================== +]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/pkg/build-dockerfile.sh new/libsmbios-2.3.3/pkg/build-dockerfile.sh --- old/libsmbios-2.3.2/pkg/build-dockerfile.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libsmbios-2.3.3/pkg/build-dockerfile.sh 2017-03-09 13:36:53.000000000 +0100 @@ -0,0 +1,7 @@ +#!/bin/bash + +cur_dir=$(cd $(dirname $0); pwd) + +cp $cur_dir/dockerfiles/Dockerfile.${1} $cur_dir/../Dockerfile +cp $cur_dir/dockerfiles/${1}-entrypoint.sh $cur_dir/../ +docker build -t ${1}-libsmbios -- . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/pkg/dockerfiles/Dockerfile.centos6 new/libsmbios-2.3.3/pkg/dockerfiles/Dockerfile.centos6 --- old/libsmbios-2.3.2/pkg/dockerfiles/Dockerfile.centos6 1970-01-01 01:00:00.000000000 +0100 +++ new/libsmbios-2.3.3/pkg/dockerfiles/Dockerfile.centos6 2017-03-09 13:36:53.000000000 +0100 @@ -0,0 +1,15 @@ +FROM centos:6 + +VOLUME /output + +ENV OUTPUT_DIR /output +ENV BUILD_DIR /build + +RUN yum install -y \ + rpm-build gettext-devel libxml2-devel cppunit-devel xz libtool git gcc-c++ hardlink doxygen \ + && yum clean all + +WORKDIR $BUILD_DIR +COPY . . + +CMD ["./centos6-entrypoint.sh"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/pkg/dockerfiles/centos6-entrypoint.sh new/libsmbios-2.3.3/pkg/dockerfiles/centos6-entrypoint.sh --- old/libsmbios-2.3.2/pkg/dockerfiles/centos6-entrypoint.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libsmbios-2.3.3/pkg/dockerfiles/centos6-entrypoint.sh 2017-03-09 13:36:53.000000000 +0100 @@ -0,0 +1,5 @@ +#!/bin/sh + +./pkg/mk-rel-rpm.sh +cp $BUILD_DIR/_builddir/*.rpm $OUTPUT_DIR +cp $BUILD_DIR/_builddir/x86_64/*.rpm $OUTPUT_DIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/pkg/libsmbios.spec.in new/libsmbios-2.3.3/pkg/libsmbios.spec.in --- old/libsmbios-2.3.2/pkg/libsmbios.spec.in 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/pkg/libsmbios.spec.in 2017-03-09 13:36:53.000000000 +0100 @@ -216,7 +216,7 @@ %setup -q -n libsmbios-%{version} find . -type d -exec chmod -f 755 {} \; find doc src -type f -exec chmod -f 644 {} \; -chmod 755 src/cppunit/*.sh +find ./src/cppunit/ -name "*.sh" -type f -exec chmod 755 '{}' \; %build # this line lets us build an RPM directly from a git tarball @@ -299,17 +299,15 @@ ln -s smbios-sys-info %{buildroot}/%{_sbindir}/getSystemId ln -s smbios-wireless-ctl %{buildroot}/%{_sbindir}/dellWirelessCtl ln -s smbios-lcd-brightness %{buildroot}/%{_sbindir}/dellLcdBrightness -ln -s smbios-rbu-bios-update %{buildroot}/%{_sbindir}/dellBiosUpdate cat > files-python-smbios <<-EOF - %doc COPYING-GPL COPYING-OSL README + %doc COPYING-GPL COPYING-OSL %{python_sitelib}/* EOF cat > files-smbios-utils-python <<-EOF - %doc COPYING-GPL COPYING-OSL README + %doc COPYING-GPL COPYING-OSL %doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt - %doc doc/pkgheader.sh %dir %{_sysconfdir}/libsmbios %config(noreplace) %{_sysconfdir}/libsmbios/* @@ -319,18 +317,17 @@ %{_sbindir}/smbios-passwd %{_sbindir}/smbios-wakeup-ctl %{_sbindir}/smbios-wireless-ctl - %{_sbindir}/smbios-rbu-bios-update %{_sbindir}/smbios-lcd-brightness %{_sbindir}/smbios-keyboard-ctl %{_sbindir}/smbios-thermal-ctl %{_sbindir}/smbios-battery-ctl - # symlinks: backwards compat + # used by HAL in old location, so keep it around until HAL is updated. + %{_sbindir}/dellLEDCtl %{_sbindir}/dellLcdBrightness + %{_sbindir}/dellMediaDirectCtl %{_sbindir}/getSystemId %{_sbindir}/dellWirelessCtl - %{_sbindir}/dellBiosUpdate - # used by HAL in old location, so keep it around until HAL is updated. %{_bindir}/dellWirelessCtl # data files @@ -338,7 +335,7 @@ EOF cat > files-yum-dellsysid <<-EOF - %doc COPYING-GPL COPYING-OSL README + %doc COPYING-GPL COPYING-OSL # YUM Plugin %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/* %{_exec_prefix}/lib/yum-plugins/* @@ -368,7 +365,7 @@ %files -n libsmbios-devel -f _build/buildlogs.txt %defattr(-,root,root,-) -%doc COPYING-GPL COPYING-OSL README src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt +%doc COPYING-GPL COPYING-OSL src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt %{_includedir}/smbios %{_includedir}/smbios_c %{_libdir}/libsmbios.so @@ -380,22 +377,14 @@ %files -n smbios-utils # opensuse 11.1 enforces non-empty file list :( %defattr(-,root,root,-) -%doc COPYING-GPL COPYING-OSL README +%doc COPYING-GPL COPYING-OSL # no other files. %files -n smbios-utils-bin %defattr(-,root,root,-) -%doc COPYING-GPL COPYING-OSL README +%doc COPYING-GPL COPYING-OSL %doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt -%doc doc/pkgheader.sh -# -# legacy C++ -%{_sbindir}/dellBiosUpdate-compat -%{_sbindir}/dellLEDCtl -%ifnarch ia64 -%{_sbindir}/dellMediaDirectCtl -%endif -# + # new C utilities %{_sbindir}/smbios-state-byte-ctl %{_sbindir}/smbios-get-ut-data @@ -414,10 +403,10 @@ %defattr(-,root,root,-) %changelog -* Fri Jul 06 2010 Michael Brown <michael-e_brown at dell.com> - 2.2.26-1 +* Tue Jul 06 2010 Michael Brown <michael-e_brown at dell.com> - 2.2.26-1 - implement CSV export of token settings from smbios-token-ctl -* Fri Jul 06 2010 Michael Brown <michael-e_brown at dell.com> - 2.2.25-1 +* Tue Jul 06 2010 Michael Brown <michael-e_brown at dell.com> - 2.2.25-1 - Fix breakage resulting from improperly fixing up constructors for MemoryAccess/CmosAccess. Fixes CLI utilities. * Fri Jun 11 2010 Michael Brown <michael-e_brown at dell.com> - 2.2.23-1 @@ -431,10 +420,10 @@ * Mon May 18 2009 Matt Domsch <[email protected]> - 2.2.16-3 - split yum plugin into yum-dellsysid package -* Mon Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.16-1 +* Tue Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.16-1 - add gcc 4.4 support -* Mon Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.15-1 +* Tue Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.15-1 - update to lastest upstream. - fixes bug in bios update on systems with versions like x.y.z. @@ -495,7 +484,7 @@ file handle when it is not needed (which is most of the time). it only leaves it open when it is scanning, so speed is not impacted. -* Tue Aug 6 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.8 +* Mon Aug 6 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.8 - new upstream * Tue Apr 3 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/pkg/libsmbios_c++.dox new/libsmbios-2.3.3/pkg/libsmbios_c++.dox --- old/libsmbios-2.3.2/pkg/libsmbios_c++.dox 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/pkg/libsmbios_c++.dox 2017-03-09 13:36:53.000000000 +0100 @@ -1791,18 +1791,6 @@ XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify a XML DTD, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_DTD = - # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program # listings (including syntax highlighting and cross-referencing information) to # the XML output. Note that enabling this will significantly increase the size diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/pkg/libsmbios_c.dox new/libsmbios-2.3.3/pkg/libsmbios_c.dox --- old/libsmbios-2.3.2/pkg/libsmbios_c.dox 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/pkg/libsmbios_c.dox 2017-03-09 13:36:53.000000000 +0100 @@ -1791,18 +1791,6 @@ XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify a XML DTD, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_DTD = - # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program # listings (including syntax highlighting and cross-referencing information) to # the XML output. Note that enabling this will significantly increase the size diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/pkg/mk-rel-rpm.sh new/libsmbios-2.3.3/pkg/mk-rel-rpm.sh --- old/libsmbios-2.3.2/pkg/mk-rel-rpm.sh 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/pkg/mk-rel-rpm.sh 2017-03-09 13:36:53.000000000 +0100 @@ -21,16 +21,3 @@ ../autogen.sh make rpm RPM_DEFINES="--without unit-tests" make distcheck - -make git-tag -eval "$(make get-version)" - -DEST=$LIBSMBIOS_TOPDIR/download/$PACKAGE/$PACKAGE-$PACKAGE_VERSION/ -mkdir -p $DEST -for i in *.tar.{gz,bz2} *.zip *.src.rpm; do - [ -e $i ] || continue - [ ! -e $DEST/$(basename $i) ] || continue - cp $i $DEST -done - -git push --tags origin master:master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/src/bin/smbios-keyboard-ctl new/libsmbios-2.3.3/src/bin/smbios-keyboard-ctl --- old/libsmbios-2.3.2/src/bin/smbios-keyboard-ctl 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/src/bin/smbios-keyboard-ctl 2017-03-09 13:36:53.000000000 +0100 @@ -400,7 +400,7 @@ #Timeout value cbRes2 byte2 [5:0] timeout = get_byte(res[smi.cbRES2] ,3) & 0x3F - print _("\n Keyboard illumination timeout has bee set at: %d %s") % (timeout, time_unit) + print _("\n Keyboard illumination timeout has been set at: %d %s") % (timeout, time_unit) verboseLog.info ( _(" Note - Timeout value of 0 means its always ON ")) #cbRes3 byte0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/src/cppunit/Makefile.am new/libsmbios-2.3.3/src/cppunit/Makefile.am --- old/libsmbios-2.3.2/src/cppunit/Makefile.am 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/src/cppunit/Makefile.am 2017-03-09 13:36:53.000000000 +0100 @@ -6,6 +6,7 @@ src/cppunit/test_data \ src/cppunit/system_dumps +if BUILD_LIBSMBIOS_CXX TESTS += src/cppunit/runtests.sh UT_CFLAGS= @@ -16,10 +17,12 @@ UT_CFLAGS += -DBUILD_WINDOWS endif +TEST_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) $(UT_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/src/libsmbios_c++/common + # convenience library for test stuff check_LTLIBRARIES = out/libtestmain.la out_libtestmain_la_SOURCES = src/cppunit/outputctl.h src/cppunit/main.cpp src/cppunit/main.h -out_libtestmain_la_LIBADD = $(CPPUNIT_LIBS) out/libsmbios.la out/libsmbios_c.la +out_libtestmain_la_LIBADD = $(CPPUNIT_LIBS) out/libsmbios_c.la out/libsmbios.la out_libtestmain_la_LDFLAGS = $(AM_LDFLAGS) -static # convenience library for XML stuff @@ -29,8 +32,6 @@ out_libxmlutil_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/src/libsmbios_c++/common out_libxmlutil_la_LDFLAGS = $(AM_LDFLAGS) -static -TEST_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_srcdir)/src/libsmbios_c++/common $(UT_CFLAGS) - check_PROGRAMS += out/testPlatform out_testPlatform_SOURCES = src/cppunit/testPlatform.h src/cppunit/testPlatform.cpp out_testPlatform_LDADD = out/libxmlutil.la out/libtestmain.la $(AM_LDADD) @@ -66,4 +67,4 @@ out_testC_memory_cmos_LDADD = out/libtestmain.la $(AM_LDADD) out_testC_memory_cmos_LDFLAGS = $(AM_LDFLAGS) -static out_testC_memory_cmos_CPPFLAGS = $(CPPUNIT_CFLAGS) $(AM_CPPFLAGS) $(UT_CFLAGS) - +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/src/cppunit/runtests.sh new/libsmbios-2.3.3/src/cppunit/runtests.sh --- old/libsmbios-2.3.2/src/cppunit/runtests.sh 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/src/cppunit/runtests.sh 2017-03-09 13:36:53.000000000 +0100 @@ -74,5 +74,5 @@ [ -e $i ] || continue [ ${RUN_C_TEST} -ne 1 ] || run_test testC_token $i "\n\nRunning TOKEN test for $i" [ ${RUN_C_TEST} -ne 1 ] || run_test testC_smbios $i "\n\nRunning SMBIOS test for $i" -[ ${RUN_CPP_TEST} -ne 1 ] || run_test testPlatform $i "\n\nRunning PLATFORM test for $i" +[ ${RUN_CPP_TEST:=1} -ne 1 ] || run_test testPlatform $i "\n\nRunning PLATFORM test for $i" done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/src/cppunit/system_dumps/PE1850/testInput.xml new/libsmbios-2.3.3/src/cppunit/system_dumps/PE1850/testInput.xml --- old/libsmbios-2.3.2/src/cppunit/system_dumps/PE1850/testInput.xml 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/src/cppunit/system_dumps/PE1850/testInput.xml 2017-03-09 13:36:53.000000000 +0100 @@ -3,11 +3,20 @@ <systemInfo> <idByte>0x16c</idByte> <systemName>PowerEdge 1850</systemName> - <serviceTag></serviceTag> + <serviceTag>394DR1S</serviceTag> <assetTag></assetTag> <biosVersion>P19</biosVersion> <vendorName>Dell Computer Corporation</vendorName> <isDellSystem>1</isDellSystem> </systemInfo> <smbios offset="0x000e0000"/> + <testsToSkip> + <test name="testServiceTag"> + <reason>Broken testcase</reason> + </test> + <test name="testServiceTagWriting"> + <reason>Broken testcase</reason> + </test> + </testsToSkip> + </TESTINPUT> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/src/include/smbios/config/compiler/gcc.hpp new/libsmbios-2.3.3/src/include/smbios/config/compiler/gcc.hpp --- old/libsmbios-2.3.2/src/include/smbios/config/compiler/gcc.hpp 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/src/include/smbios/config/compiler/gcc.hpp 2017-03-09 13:36:53.000000000 +0100 @@ -113,12 +113,3 @@ # error "Compiler too old. GCC > 3.0 required" #endif // -#if (__GNUC__ > 5) -# if defined(LIBSMBIOS_ASSERT_CONFIG) -# error "Unknown compiler version - please run the configure tests and report the results" -# else -# warning "Unknown compiler version - please run the configure tests and report the results" -# endif -#endif - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/src/include/smbios_c/config/compiler/gcc.h new/libsmbios-2.3.3/src/include/smbios_c/config/compiler/gcc.h --- old/libsmbios-2.3.2/src/include/smbios_c/config/compiler/gcc.h 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/src/include/smbios_c/config/compiler/gcc.h 2017-03-09 13:36:53.000000000 +0100 @@ -24,12 +24,3 @@ # error "GCC versions < 2.90 not supported" #endif // -#if (__GNUC__ > 5) -# if defined(LIBSMBIOS_C_ASSERT_CONFIG) -# error "Unknown compiler version - please run the configure tests and report the results" -# else -# warning "Unknown compiler version - please run the configure tests and report the results" -# endif -#endif - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/src/libsmbios_c/smbios/smbios.c new/libsmbios-2.3.3/src/libsmbios_c/smbios/smbios.c --- old/libsmbios-2.3.2/src/libsmbios_c/smbios/smbios.c 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/src/libsmbios_c/smbios/smbios.c 2017-03-09 13:36:53.000000000 +0100 @@ -71,8 +71,14 @@ const char *smbios_strerror(const struct smbios_struct *cur) { + char *ret; struct smbios_table *table = smbios_table_factory(SMBIOS_DEFAULTS | SMBIOS_NO_ERR_CLEAR); - const char *ret = smbios_table_strerror(table); - smbios_table_free(table); + if (table) { + /* leak */ + ret = strdup(smbios_table_strerror(table)); + smbios_table_free(table); + } else { + ret = ""; + } return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmbios-2.3.2/src/libsmbios_c/smbios/smbios_obj.c new/libsmbios-2.3.3/src/libsmbios_c/smbios/smbios_obj.c --- old/libsmbios-2.3.2/src/libsmbios_c/smbios/smbios_obj.c 2016-08-23 20:47:22.000000000 +0200 +++ new/libsmbios-2.3.3/src/libsmbios_c/smbios/smbios_obj.c 2017-03-09 13:36:53.000000000 +0100 @@ -96,7 +96,6 @@ out_init_fail: // fail. init_smbios_* functions are responsible for free-ing memory if they // return failure. - toReturn->initialized = 0; toReturn = 0; out:
