diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 22:33:17 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 22:33:17 +0200 |
commit | 4b929acf6739c1a60616f2a1edaf513b8e3dcc84 (patch) | |
tree | f25103b54e5edbcface07e28fe999101b7872d97 /pkgs/os-specific/linux | |
parent | 7e912475961c791737f545eeaa3b898b1224a94b (diff) | |
parent | ee1b8e4c7b9134dd8ae18d3476dff1691de20d0f (diff) | |
download | nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.gz nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.bz2 nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.lz nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.xz nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.zst nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/mmc-utils/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/setools/default.nix | 12 | ||||
-rw-r--r-- | pkgs/os-specific/linux/usbip/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch | 13 |
4 files changed, 27 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index e0b87f2010ac..297faa2a6042 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "2018-03-27"; + version = "2018-12-14"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d"; - sha256 = "01llwan5j40mv5p867f31lm87qh0hcyhy892say60y5pxc0mzpyn"; + rev = "aef913e31b659462fe6b9320d241676cba97f67b"; + sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7"; }; makeFlags = "CC=${stdenv.cc.targetPrefix}cc"; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 039d875060a2..1e82c4921595 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "2017-11-10"; + version = "4.2.0"; src = fetchFromGitHub { - owner = "TresysTechnology"; + owner = "SELinuxProject"; repo = pname; - rev = "a1aa0f33f5c428d3f9fe82960ed5de36f38047f7"; - sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn"; + rev = version; + sha256 = "1bjwcvr6rjx79cdcvaxn68bdrnl4f2a8gnnqsngdxhkhwpddksjy"; }; nativeBuildInputs = [ bison flex swig ]; @@ -34,8 +34,8 @@ buildPythonApplication rec { ''; meta = { - description = "SELinux Tools"; - homepage = https://github.com/TresysTechnology/setools/wiki; + description = "SELinux Policy Analysis Tools"; + homepage = https://github.com/SELinuxProject/setools; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index 1bb92d7dce1b..61f2c4540465 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -5,6 +5,11 @@ stdenv.mkDerivation { src = kernel.src; + patches = [ + # fixes build with gcc8 + ./fix-snprintf-truncation.patch + ]; + nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ udev ]; diff --git a/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch b/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch new file mode 100644 index 000000000000..63fca9ddbfe5 --- /dev/null +++ b/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch @@ -0,0 +1,13 @@ +diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c +index 8159fd98680b..7d6eb3e3fe1e 100644 +--- a/tools/usb/usbip/libsrc/vhci_driver.c ++++ b/tools/usb/usbip/libsrc/vhci_driver.c +@@ -111,7 +111,7 @@ static int parse_status(const char *value) + static int refresh_imported_device_list(void) + { + const char *attr_status; +- char status[MAX_STATUS_NAME+1] = "status"; ++ char status[MAX_STATUS_NAME+2] = "status"; + int i, ret; + + for (i = 0; i < vhci_driver->ncontrollers; i++) { |