public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libosinfo: 1.5.0 -> 1.6.0

Browse Source
This commit is contained in:
Jonathan Ringer 2019-08-20 18:25:37 -07:00
parent f080d7afa2
commit 038fbf0178
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/libraries/libosinfo/default.nix
View File

@ -1,44 +1,32 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, gtk-doc, docbook_xsl
, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, substituteAll
, vala ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libosinfo"; pname = "libosinfo";
version = "1.5.0"; version = "1.6.0";
src = fetchurl { src = fetchurl {
url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz";
sha256 = "12b0xj9fz9q91d1pz9xm6aqap5k1ip0m9m3qvqmwjy1lk1kjasdz"; sha256 = "1iwh35mahch1ls3sgq7wz8kamxrxisrff5ciqzyh2qxlrqf5qf1w";
}; };
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig vala intltool gobject-introspection gtk-doc docbook_xsl pkgconfig vala gettext gobject-introspection gtk-doc docbook_xsl
]; ];
buildInputs = [ glib libsoup libxml2 libxslt ]; buildInputs = [ glib libsoup libxml2 libxslt ];
checkInputs = [ check curl perl ]; checkInputs = [ check curl perl ];
patches = [ patches = [
./osinfo-db-data-dir.patch (substituteAll {
# https://nvd.nist.gov/vuln/detail/CVE-2019-13313 src = ./osinfo-db-data-dir.patch;
(fetchpatch { osinfo_db_data_dir = "${osinfo-db}/share";
url = "https://gitlab.com/libosinfo/libosinfo/commit/3654abee6ead9f11f8bb9ba8fc71efd6fa4dabbc.patch";
name = "CVE-2019-13313-1.patch";
sha256 = "1lybywfj6b41zfjk33ap90bab5l84lf5y3kif7vd2b6wq5r91rcn";
})
(fetchpatch {
url = "https://gitlab.com/libosinfo/libosinfo/commit/08fb8316b4ac42fe74c1fa5ca0ac593222cdf81a.patch";
name = "CVE-2019-13313-2.patch";
sha256 = "1f6rhkrgy3j8nmidk97wnz6p35zs1dsd63d3np76q7qs7ra74w9z";
}) })
]; ];
postPatch = ''
patchShebangs .
substituteInPlace osinfo/osinfo_loader.c --subst-var-by OSINFO_DB_DATA_DIR "${osinfo-db}/share"
'';
configureFlags = [ configureFlags = [
"--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids" "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids"
"--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids" "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids"

2
pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch
View File

@ -5,7 +5,7 @@
path = g_getenv("OSINFO_SYSTEM_DIR"); path = g_getenv("OSINFO_SYSTEM_DIR");
if (!path) if (!path)
- path = DATA_DIR "/osinfo"; - path = DATA_DIR "/osinfo";
+ path = "@OSINFO_DB_DATA_DIR@/osinfo"; + path = "@osinfo_db_data_dir@/osinfo";
file = g_file_new_for_path(path); file = g_file_new_for_path(path);
} }