diff -Nru libsmbios-2.4.0/configure.ac libsmbios-2.4.1/configure.ac --- libsmbios-2.4.0/configure.ac 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/configure.ac 2018-02-14 19:28:09.000000000 +0000 @@ -13,7 +13,7 @@ # m4_define([release_major_version], [2]) m4_define([release_minor_version], [4]) -m4_define([release_micro_version], [0]) +m4_define([release_micro_version], [1]) # if you define any "extra" version info, include a leading dot (".") m4_define([release_extra_version], []) diff -Nru libsmbios-2.4.0/debian/changelog libsmbios-2.4.1/debian/changelog --- libsmbios-2.4.0/debian/changelog 2018-02-06 18:40:46.000000000 +0000 +++ libsmbios-2.4.1/debian/changelog 2018-02-14 20:04:18.000000000 +0000 @@ -1,3 +1,12 @@ +libsmbios (2.4.1-1) unstable; urgency=medium + + * New upstream microversion. + - Better compatbility with help2man + - Fixes some issues found with new gcc. + * debian: cleanup old conffile (Closes: #890064) + + -- Mario Limonciello Wed, 14 Feb 2018 14:04:18 -0600 + libsmbios (2.4.0-1) unstable; urgency=medium * New upstream version. diff -Nru libsmbios-2.4.0/debian/control libsmbios-2.4.1/debian/control --- libsmbios-2.4.0/debian/control 2018-02-06 18:40:46.000000000 +0000 +++ libsmbios-2.4.1/debian/control 2018-02-14 20:04:18.000000000 +0000 @@ -8,8 +8,6 @@ Homepage: https://github.com/dell/libsmbios/ Build-Depends: debhelper (>= 10), dh-python, - dh-autoreconf, - autotools-dev, doxygen, graphviz, python3, diff -Nru libsmbios-2.4.0/debian/smbios-utils.postinst libsmbios-2.4.1/debian/smbios-utils.postinst --- libsmbios-2.4.0/debian/smbios-utils.postinst 1970-01-01 00:00:00.000000000 +0000 +++ libsmbios-2.4.1/debian/smbios-utils.postinst 2018-02-14 20:04:18.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +#DEBHELPER# +dpkg-maintscript-helper rm_conffile \ + /etc/yum/pluginconf.d/dellsysid.conf 2.4.0-2~ smbios-utils -- "$@" + diff -Nru libsmbios-2.4.0/debian/smbios-utils.postrm libsmbios-2.4.1/debian/smbios-utils.postrm --- libsmbios-2.4.0/debian/smbios-utils.postrm 1970-01-01 00:00:00.000000000 +0000 +++ libsmbios-2.4.1/debian/smbios-utils.postrm 2018-02-14 20:04:18.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +#DEBHELPER# +dpkg-maintscript-helper rm_conffile \ + /etc/yum/pluginconf.d/dellsysid.conf 2.4.0-2~ smbios-utils -- "$@" + diff -Nru libsmbios-2.4.0/debian/smbios-utils.preinst libsmbios-2.4.1/debian/smbios-utils.preinst --- libsmbios-2.4.0/debian/smbios-utils.preinst 1970-01-01 00:00:00.000000000 +0000 +++ libsmbios-2.4.1/debian/smbios-utils.preinst 2018-02-14 20:04:18.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +#DEBHELPER# +dpkg-maintscript-helper rm_conffile \ + /etc/yum/pluginconf.d/dellsysid.conf 2.4.0-2~ smbios-utils -- "$@" + diff -Nru libsmbios-2.4.0/Makefile.am libsmbios-2.4.1/Makefile.am --- libsmbios-2.4.0/Makefile.am 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/Makefile.am 2018-02-14 19:28:09.000000000 +0000 @@ -105,10 +105,10 @@ out/scripts/%.1 : src/bin/% mkdir -p out/scripts - -$(HELP2MAN) --output=$@ --name=$^ --version-string=$(PACKAGE_VERSION) "LD_LIBRARY_PATH=$$PWD/out/.libs python3 $^" + -$(HELP2MAN) --output=$@ --name=$^ "LD_LIBRARY_PATH=$$PWD/out/.libs python3 $^" out/%.1 : out/% - -$(HELP2MAN) --output=$@ --name=$^ --version-string=$(PACKAGE_VERSION) $^ + -$(HELP2MAN) --output=$@ --name=$^ $^ ########## END DOCS ################ diff -Nru libsmbios-2.4.0/pkg/debian/control libsmbios-2.4.1/pkg/debian/control --- libsmbios-2.4.0/pkg/debian/control 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/pkg/debian/control 2018-02-14 19:28:09.000000000 +0000 @@ -8,8 +8,6 @@ Homepage: https://github.com/dell/libsmbios/ Build-Depends: debhelper (>= 10), dh-python, - dh-autoreconf, - autotools-dev, doxygen, graphviz, python3, diff -Nru libsmbios-2.4.0/pkg/debian/smbios-utils.postinst libsmbios-2.4.1/pkg/debian/smbios-utils.postinst --- libsmbios-2.4.0/pkg/debian/smbios-utils.postinst 1970-01-01 00:00:00.000000000 +0000 +++ libsmbios-2.4.1/pkg/debian/smbios-utils.postinst 2018-02-14 19:28:09.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +#DEBHELPER# +dpkg-maintscript-helper rm_conffile \ + /etc/yum/pluginconf.d/dellsysid.conf 2.4.0-2~ smbios-utils -- "$@" + diff -Nru libsmbios-2.4.0/pkg/debian/smbios-utils.postrm libsmbios-2.4.1/pkg/debian/smbios-utils.postrm --- libsmbios-2.4.0/pkg/debian/smbios-utils.postrm 1970-01-01 00:00:00.000000000 +0000 +++ libsmbios-2.4.1/pkg/debian/smbios-utils.postrm 2018-02-14 19:28:09.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +#DEBHELPER# +dpkg-maintscript-helper rm_conffile \ + /etc/yum/pluginconf.d/dellsysid.conf 2.4.0-2~ smbios-utils -- "$@" + diff -Nru libsmbios-2.4.0/pkg/debian/smbios-utils.preinst libsmbios-2.4.1/pkg/debian/smbios-utils.preinst --- libsmbios-2.4.0/pkg/debian/smbios-utils.preinst 1970-01-01 00:00:00.000000000 +0000 +++ libsmbios-2.4.1/pkg/debian/smbios-utils.preinst 2018-02-14 19:28:09.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +#DEBHELPER# +dpkg-maintscript-helper rm_conffile \ + /etc/yum/pluginconf.d/dellsysid.conf 2.4.0-2~ smbios-utils -- "$@" + diff -Nru libsmbios-2.4.0/pkg/dockerfiles/Dockerfile.debian libsmbios-2.4.1/pkg/dockerfiles/Dockerfile.debian --- libsmbios-2.4.0/pkg/dockerfiles/Dockerfile.debian 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/pkg/dockerfiles/Dockerfile.debian 2018-02-14 19:28:09.000000000 +0000 @@ -3,10 +3,8 @@ RUN echo "deb-src http://deb.debian.org/debian/ testing main" >> /etc/apt/sources.list RUN apt-get update -qq && apt-get install -yq --no-install-recommends \ build-essential \ - autotools-dev \ debhelper \ devscripts \ - dh-autoreconf \ doxygen \ fakeroot \ git \ diff -Nru libsmbios-2.4.0/pkg/libsmbios.spec.in libsmbios-2.4.1/pkg/libsmbios.spec.in --- libsmbios-2.4.0/pkg/libsmbios.spec.in 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/pkg/libsmbios.spec.in 2018-02-14 19:28:09.000000000 +0000 @@ -18,33 +18,32 @@ %define other_name libsmbios %endif -%{!?build_python: %define build_python 1} -%{?_with_python: %define build_python 1} +%{!?build_python: %global build_python 1} +%{?_with_python: %global 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} +%{?_with_unit_tests: %global run_unit_tests 1} -%{!?as_needed: %define as_needed 1} +%{!?as_needed: %global as_needed 1} %{?_without_as_needed: %undefine as_needed} -%{?_with_as_needed: %define as_needed 1} +%{?_with_as_needed: %global as_needed 1} -%define pkgconfig_BR pkgconfig -%define ctypes_BR python-ctypes -%define valgrind_BR valgrind +%global pkgconfig_BR pkgconfig +%global 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 -%define python_devel_BR %{nil} +%global python_devel_BR %{nil} %if 0%{?build_python} - %define python_devel_BR python34-devel + %global python_devel_BR python34-devel %endif # if unit tests are disabled, get rid of a few BuildRequires -%{!?run_unit_tests: %define valgrind_BR %{nil}} +%{!?run_unit_tests: %global valgrind_BR %{nil}} Name: %{release_name} Version: %{release_version} @@ -55,6 +54,10 @@ Source: libsmbios-%{version}.tar.xz URL: http://github.com/dell/libsmbios Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext-devel +BuildRequires: libtool BuildRequires: strace libxml2-devel gcc-c++ gettext doxygen help2man %{valgrind_BR} %{pkgconfig_BR} %{python_devel_BR} # uncomment for official fedora Obsoletes: libsmbios-libs < 2.0.0 @@ -76,7 +79,7 @@ Summary: Python interface to Libsmbios C library Group: System Environment/Libraries Requires: %{release_name} = 0:%{version}-%{release} -Requires: python3 %{ctypes_BR} +Requires: python3 %description -n python3-smbios This package provides a Python3 interface to libsmbios @@ -216,7 +219,7 @@ cat > files-python-smbios <<-EOF %doc COPYING-GPL COPYING-OSL - %{python3_sitelib}/* + %{python3_sitearch}/* EOF cat > files-smbios-utils-python <<-EOF @@ -296,6 +299,85 @@ %defattr(-,root,root,-) %changelog +* Mon Dec 11 2017 Pete Walter - 2.3.3-2 +- Remove obsolete python-ctypes requires (#1399686) + +* Tue Nov 14 2017 Pete Walter - 2.3.3-1 +- Update to 2.3.3 + +* Thu Aug 03 2017 Fedora Release Engineering - 2.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Fedora Release Engineering - 2.3.0-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Mar 09 2016 Peter Jones - 2.3.0-2 +- Once again, don't complain about compilers newer than tested with in the + public headers. +- Fix up bad %%global vs %%define directives +- Fix up bad old changelog dates +- Note there's a missing changelog here from the 2.3.0 rebase + +* Thu Feb 25 2016 Peter Jones - 2.2.28-16 +- Don't complain about compilers newer than tested with in the public + headers. + +* Thu Feb 04 2016 Fedora Release Engineering - 2.2.28-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Sep 1 2015 Srinivas G Gowda - 2.2.28-14 +- Fixes Bug 852719: Dell Open Manage falis to start when libsmbios in EPEL branch is used. +- Patch re-enables display of "OEM String" in smbios-sys-info-lite. + +* Wed Jun 17 2015 Fedora Release Engineering - 2.2.28-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 2.2.28-12 +- Rebuilt for GCC 5 C++11 ABI change + +* Sun Aug 17 2014 Fedora Release Engineering - 2.2.28-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.2.28-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 2.2.28-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 2.2.28-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 2.2.28-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 28 2012 Fedora Release Engineering - 2.2.28-6 +- Rebuilt for c++ ABI breakage + +* Fri Jan 13 2012 Fedora Release Engineering - 2.2.28-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Jun 30 2011 Praveen K Paladugu 2.2.28-4 +- Adding the right tar ball, coz files were missing from the previous version. + +* Thu Jun 30 2011 Praveen K Paladugu - 2.2.28-3 +- Fixing the build failure of version 2.2.26-4. +- The updated sources adds support for the compiler version available in F15 and other fixes. + +* Tue Feb 08 2011 Fedora Release Engineering - 2.2.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Sep 27 2010 Matt Domsch - 2.2.26-3 +- build for Fedora 15 + +* Wed Jul 21 2010 David Malcolm - 2.2.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Tue Jul 06 2010 Michael Brown - 2.2.26-1 - implement CSV export of token settings from smbios-token-ctl diff -Nru libsmbios-2.4.0/src/bin/smbios-battery-ctl libsmbios-2.4.1/src/bin/smbios-battery-ctl --- libsmbios-2.4.0/src/bin/smbios-battery-ctl 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-battery-ctl 2018-02-14 19:28:09.000000000 +0000 @@ -20,7 +20,6 @@ # the following vars are all substituted on install # this bin isnt byte-compiled, so this is ok -__VERSION__="uninstalled-version" pythondir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "python") clidir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "py-cli") # end vars @@ -33,6 +32,8 @@ from libsmbios_c import smbios_token, smbios, smi, system_info as sysinfo, localedir, GETTEXT_PACKAGE from libsmbios_c.trace_decorator import traceLog, getLog +__VERSION__=sysinfo.get_library_version_string() + locale.setlocale(locale.LC_ALL, '') gettext.install(GETTEXT_PACKAGE, localedir) diff -Nru libsmbios-2.4.0/src/bin/smbios-get-ut-data.c libsmbios-2.4.1/src/bin/smbios-get-ut-data.c --- libsmbios-2.4.0/src/bin/smbios-get-ut-data.c 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-get-ut-data.c 2018-02-14 19:28:09.000000000 +0000 @@ -81,7 +81,7 @@ memory_obj_factory(MEMORY_UNIT_TEST_MODE | MEMORY_GET_SINGLETON, args); break; case 255: - printf(_("Libsmbios: %s\n"), smbios_get_library_version_string()); + printf("%s\n", smbios_get_library_version_string()); exit(0); break; default: diff -Nru libsmbios-2.4.0/src/bin/smbios-keyboard-ctl libsmbios-2.4.1/src/bin/smbios-keyboard-ctl --- libsmbios-2.4.0/src/bin/smbios-keyboard-ctl 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-keyboard-ctl 2018-02-14 19:28:09.000000000 +0000 @@ -22,7 +22,6 @@ # the following vars are all substituted on install # this bin isnt byte-compiled, so this is ok -__VERSION__="uninstalled-version" pythondir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "python") clidir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "py-cli") # end vars @@ -35,6 +34,8 @@ from libsmbios_c import smbios_token, smbios, smi, system_info as sysinfo, localedir, GETTEXT_PACKAGE from libsmbios_c.trace_decorator import traceLog, getLog +__VERSION__=sysinfo.get_library_version_string() + locale.setlocale(locale.LC_ALL, '') gettext.install(GETTEXT_PACKAGE, localedir) diff -Nru libsmbios-2.4.0/src/bin/smbios-lcd-brightness libsmbios-2.4.1/src/bin/smbios-lcd-brightness --- libsmbios-2.4.0/src/bin/smbios-lcd-brightness 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-lcd-brightness 2018-02-14 19:28:09.000000000 +0000 @@ -21,7 +21,6 @@ # the following vars are all substituted on install # this bin isnt byte-compiled, so this is ok -__VERSION__="uninstalled-version" pythondir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "python") clidir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "py-cli") # end vars @@ -33,6 +32,9 @@ import cli from libsmbios_c import smi, smbios_token, localedir, GETTEXT_PACKAGE from libsmbios_c.trace_decorator import traceLog, getLog +from libsmbios_c import system_info as sysinfo + +__VERSION__=sysinfo.get_library_version_string() locale.setlocale(locale.LC_ALL, '') gettext.install(GETTEXT_PACKAGE, localedir) diff -Nru libsmbios-2.4.0/src/bin/smbios-passwd libsmbios-2.4.1/src/bin/smbios-passwd --- libsmbios-2.4.0/src/bin/smbios-passwd 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-passwd 2018-02-14 19:28:09.000000000 +0000 @@ -20,7 +20,6 @@ # the following vars are all substituted on install # this bin isnt byte-compiled, so this is ok -__VERSION__="uninstalled-version" pythondir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "python") clidir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "py-cli") # end vars @@ -32,6 +31,9 @@ import cli from libsmbios_c import smi, localedir, GETTEXT_PACKAGE from libsmbios_c.trace_decorator import traceLog, getLog +from libsmbios_c import system_info as sysinfo + +__VERSION__=sysinfo.get_library_version_string() locale.setlocale(locale.LC_ALL, '') gettext.install(GETTEXT_PACKAGE, localedir) diff -Nru libsmbios-2.4.0/src/bin/smbios-state-byte-ctl.c libsmbios-2.4.1/src/bin/smbios-state-byte-ctl.c --- libsmbios-2.4.0/src/bin/smbios-state-byte-ctl.c 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-state-byte-ctl.c 2018-02-14 19:28:09.000000000 +0000 @@ -48,6 +48,7 @@ { 2, "cmos_file", N_("Debug: CMOS dump file to use instead of physical cmos"), "c", 1 }, { 3, "set", N_("Set CMOS state byte to new value"), "s", 1 }, { 4, "owner", N_("Set state byte owner"), "o", 1 }, + { 255, "version", N_("Display libsmbios version information"), "v", 0 }, { 0, NULL, NULL, NULL, 0 } }; @@ -82,6 +83,10 @@ case 4: owner = strtoul( args, 0, 0 ); break; + case 255: + printf("%s\n", smbios_get_library_version_string()); + exit(0); + break; default: break; } diff -Nru libsmbios-2.4.0/src/bin/smbios-sys-info libsmbios-2.4.1/src/bin/smbios-sys-info --- libsmbios-2.4.0/src/bin/smbios-sys-info 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-sys-info 2018-02-14 19:28:09.000000000 +0000 @@ -19,7 +19,6 @@ # the following vars are all substituted on install # this bin isnt byte-compiled, so this is ok -__VERSION__="uninstalled-version" pythondir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "python") clidir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "py-cli") # end vars @@ -32,6 +31,8 @@ from libsmbios_c import system_info as sysinfo, smbios, localedir, GETTEXT_PACKAGE from libsmbios_c.trace_decorator import traceLog, getLog +__VERSION__=sysinfo.get_library_version_string() + locale.setlocale(locale.LC_ALL, '') gettext.install(GETTEXT_PACKAGE, localedir) diff -Nru libsmbios-2.4.0/src/bin/smbios-sys-info-lite.c libsmbios-2.4.1/src/bin/smbios-sys-info-lite.c --- libsmbios-2.4.0/src/bin/smbios-sys-info-lite.c 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-sys-info-lite.c 2018-02-14 19:28:09.000000000 +0000 @@ -84,7 +84,7 @@ memory_obj_factory(MEMORY_UNIT_TEST_MODE | MEMORY_GET_SINGLETON, args); break; case 255: - printf( _("Libsmbios version: %s\n"), smbios_get_library_version_string()); + printf("%s\n", smbios_get_library_version_string()); exit(0); break; default: diff -Nru libsmbios-2.4.0/src/bin/smbios-thermal-ctl libsmbios-2.4.1/src/bin/smbios-thermal-ctl --- libsmbios-2.4.0/src/bin/smbios-thermal-ctl 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-thermal-ctl 2018-02-14 19:28:09.000000000 +0000 @@ -20,7 +20,6 @@ # the following vars are all substituted on install # this bin isnt byte-compiled, so this is ok -__VERSION__="uninstalled-version" pythondir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "python") clidir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "py-cli") # end vars @@ -33,6 +32,8 @@ from libsmbios_c import smbios_token, smbios, smi, system_info as sysinfo, localedir, GETTEXT_PACKAGE from libsmbios_c.trace_decorator import traceLog, getLog +__VERSION__=sysinfo.get_library_version_string() + locale.setlocale(locale.LC_ALL, '') gettext.install(GETTEXT_PACKAGE, localedir) diff -Nru libsmbios-2.4.0/src/bin/smbios-token-ctl libsmbios-2.4.1/src/bin/smbios-token-ctl --- libsmbios-2.4.0/src/bin/smbios-token-ctl 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-token-ctl 2018-02-14 19:28:09.000000000 +0000 @@ -25,7 +25,6 @@ # the following vars are all substituted on install # this bin isnt byte-compiled, so this is ok -__VERSION__="uninstalled-version" pythondir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "python") clidir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "py-cli") # end vars @@ -37,6 +36,9 @@ import cli from libsmbios_c import smbios_token, localedir, GETTEXT_PACKAGE, pkgdatadir from libsmbios_c.trace_decorator import traceLog, getLog +from libsmbios_c import system_info as sysinfo + +__VERSION__=sysinfo.get_library_version_string() locale.setlocale(locale.LC_ALL, '') gettext.install(GETTEXT_PACKAGE, localedir) diff -Nru libsmbios-2.4.0/src/bin/smbios-upflag-ctl.c libsmbios-2.4.1/src/bin/smbios-upflag-ctl.c --- libsmbios-2.4.0/src/bin/smbios-upflag-ctl.c 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-upflag-ctl.c 2018-02-14 19:28:09.000000000 +0000 @@ -84,7 +84,7 @@ sysinfo_set_up_boot_flag( flag ); break; case 255: - printf( _("Libsmbios version: %s\n"), smbios_get_library_version_string()); + printf("%s\n", smbios_get_library_version_string()); exit(0); break; default: diff -Nru libsmbios-2.4.0/src/bin/smbios-wakeup-ctl libsmbios-2.4.1/src/bin/smbios-wakeup-ctl --- libsmbios-2.4.0/src/bin/smbios-wakeup-ctl 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-wakeup-ctl 2018-02-14 19:28:09.000000000 +0000 @@ -22,7 +22,6 @@ # the following vars are all substituted on install # this bin isnt byte-compiled, so this is ok -__VERSION__="uninstalled-version" pythondir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "python") clidir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "py-cli") # end vars @@ -34,6 +33,9 @@ import cli from libsmbios_c import smbios_token, localedir, GETTEXT_PACKAGE from libsmbios_c.trace_decorator import traceLog, getLog +from libsmbios_c import system_info as sysinfo + +__VERSION__=sysinfo.get_library_version_string() locale.setlocale(locale.LC_ALL, '') gettext.install(GETTEXT_PACKAGE, localedir) diff -Nru libsmbios-2.4.0/src/bin/smbios-wireless-ctl libsmbios-2.4.1/src/bin/smbios-wireless-ctl --- libsmbios-2.4.0/src/bin/smbios-wireless-ctl 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/bin/smbios-wireless-ctl 2018-02-14 19:28:09.000000000 +0000 @@ -20,7 +20,6 @@ # the following vars are all substituted on install # this bin isnt byte-compiled, so this is ok -__VERSION__="uninstalled-version" pythondir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "python") clidir=os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "..", "py-cli") # end vars @@ -33,6 +32,8 @@ from libsmbios_c import smbios_token, smbios, smi, system_info as sysinfo, localedir, GETTEXT_PACKAGE from libsmbios_c.trace_decorator import traceLog, getLog +__VERSION__=sysinfo.get_library_version_string() + locale.setlocale(locale.LC_ALL, '') gettext.install(GETTEXT_PACKAGE, localedir) diff -Nru libsmbios-2.4.0/src/libsmbios_c/memory/memory_linux.c libsmbios-2.4.1/src/libsmbios_c/memory/memory_linux.c --- libsmbios-2.4.0/src/libsmbios_c/memory/memory_linux.c 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/libsmbios_c/memory/memory_linux.c 2018-02-14 19:28:09.000000000 +0000 @@ -44,8 +44,8 @@ int mem_errno; bool rw; void *lastMapping; - u64 lastMappedOffset; - u64 mappingSize; + off_t lastMappedOffset; + size_t mappingSize; }; #define READ_MMAP 0 @@ -98,7 +98,7 @@ #define debug_dump_buffer(...) do {} while(0) #endif -static void remap(struct linux_data *private_data, u64 offset, bool rw) +static void remap(struct linux_data *private_data, off_t offset, bool rw) { int flags = rw ? PROT_WRITE : PROT_READ; off_t mmoff = offset % private_data->mappingSize; diff -Nru libsmbios-2.4.0/src/python/Makefile.am libsmbios-2.4.1/src/python/Makefile.am --- libsmbios-2.4.0/src/python/Makefile.am 2018-02-06 18:33:58.000000000 +0000 +++ libsmbios-2.4.1/src/python/Makefile.am 2018-02-14 19:28:09.000000000 +0000 @@ -1,6 +1,6 @@ # vim:noexpandtab:autoindent:tabstop=8:shiftwidth=8:filetype=make:nocindent:tw=0: -pkgpythondir=$(pythondir)/libsmbios_c +pkgpythondir=$(pyexecdir)/libsmbios_c if HAVE_PYTHON pkgpython_PYTHON = \