Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/tools/security/gnupg/21.nix

@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     readline libusb gnutls adns openldap zlib bzip2
   ];
 
+  patches = [ ./fix-libusb-include-path.patch ];
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
   ''; #" fix Emacs syntax highlighting :-(

pkgs/tools/security/gnupg/fix-libusb-include-path.patch

@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -8872,7 +8872,7 @@
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb include dir" >&5
+ $as_echo_n "checking libusb include dir... " >&6; }
+    usb_incdir_found="no"
+-   for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do
++   for _incdir in "$($PKG_CONFIG --variable=includedir libusb-1.0)/libusb-1.0"; do
+      _libusb_save_cppflags=$CPPFLAGS
+      if test -n "${_incdir}"; then
+        CPPFLAGS="-I${_incdir} ${CPPFLAGS}"

pkgs/tools/security/nitrokey-app/FixInstallDestination.patch

@@ -1,35 +1,57 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 16393a8..3991d2a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -219,18 +219,18 @@ IF(NOT WIN32)
+@@ -251,23 +251,23 @@
+       #      ${CMAKE_SOURCE_DIR}/data/icons/48x48
+       #      ${CMAKE_SOURCE_DIR}/data/icons/128x128
+     ${CMAKE_SOURCE_DIR}/data/icons/
+-    DESTINATION usr/share/icons/
++    DESTINATION share/icons/
+   )
+ 
+   install(FILES
+     ${CMAKE_SOURCE_DIR}/data/nitrokey-app.desktop
+-    DESTINATION usr/share/applications
++    DESTINATION share/applications
+   )
+ 
+   install(FILES
+     ${CMAKE_SOURCE_DIR}/data/icons/hicolor/128x128/apps/nitrokey-app.png
+-    DESTINATION usr/share/pixmaps
++    DESTINATION share/pixmaps
+   )
+ 
    # Install Nitrokey udev rules
    install(FILES
-     ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules
--    DESTINATION /etc/udev/rules.d
-+    DESTINATION etc/udev/rules.d
+    ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules
+-   DESTINATION usr/lib/udev/rules.d
++   DESTINATION lib/udev/rules.d
    )
  
    # Install autocompletion scripts
+@@ -278,7 +278,7 @@
+ 
    install(FILES
-     ${CMAKE_SOURCE_DIR}/data//bash-autocomplete/nitrokey-app
--    DESTINATION /etc/bash_completion.d
-+    DESTINATION etc/bash_completion.d
+    ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo
+-   DESTINATION usr/share/locale/de_DE/LC_MESSAGES
++   DESTINATION share/locale/de_DE/LC_MESSAGES
    )
  
    install(FILES
-     ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo
--    DESTINATION /usr/share/locale/de_DE/LC_MESSAGES
-+    DESTINATION share/locale/de_DE/LC_MESSAGES
-   )
- 
-   install(FILES
-@@ -238,7 +238,7 @@ IF(NOT WIN32)
+@@ -286,7 +286,7 @@
      ${CMAKE_SOURCE_DIR}/images/quit.png
      ${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png
      ${CMAKE_SOURCE_DIR}/images/settings.png
--    DESTINATION /usr/share/nitrokey
+-    DESTINATION usr/share/nitrokey
 +    DESTINATION share/nitrokey
    )
  
  ENDIF () # NOT WIN32
+@@ -299,7 +299,7 @@
+   ${resources_ouput}
+ )
+ 
+-INSTALL(TARGETS nitrokey-app DESTINATION usr/bin)
++INSTALL(TARGETS nitrokey-app DESTINATION bin)
+ 
+ TARGET_LINK_LIBRARIES(nitrokey-app
+   ${QT_LIBRARIES}

pkgs/tools/security/nitrokey-app/default.nix

@@ -1,21 +1,18 @@
-{ stdenv, cmake, fetchFromGitHub, libappindicator-gtk2, libnotify, libusb1, pkgconfig
-, qt5 }:
+{ stdenv, cmake, fetchFromGitHub, libusb1, pkgconfig, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "nitrokey-app";
-  version = "0.4";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-app";
     rev = "v${version}";
-    sha256 = "0h131847pllsr7rk7nn8vlj74byb5f14cl9h3g3pmlq5zj8ylfkx";
+    sha256 = "0acb2502r3wa0mry6h8sz1k16zaa4bgnhxwxqd1vd1y42xc6g9bw";
   };
 
   buildInputs = [
     cmake
-    libappindicator-gtk2
-    libnotify
     libusb1
     pkgconfig
     qt5.qtbase
@@ -24,6 +21,7 @@ stdenv.mkDerivation rec {
      ./FixInstallDestination.patch
      ./HeaderPath.patch
   ];
+  cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO";
   meta = {
     description      = "Provides extra functionality for the Nitrokey Pro and Storage";
     longDescription  = ''

pkgs/tools/security/sudo/default.nix

@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.18";
+  name = "sudo-1.8.18p1";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "04xywg2f9x2kfw81abdf8gsraldaz5v0w0x2zi8aqlgsjygfj6c5";
+    sha256 = "0d4l6y03khmzdd8vhfnq8lrb8gcxplzf7gav0a9sd08jf8f4g875";
   };
 
   configureFlags = [