diff options
author | Arthur Gautier <baloo@superbaloo.net> | 2021-09-14 16:23:28 +0000 |
---|---|---|
committer | Arthur Gautier <baloo@superbaloo.net> | 2021-09-14 16:23:28 +0000 |
commit | e3f62ec19aaeb5cf5121b0921db64df234acd115 (patch) | |
tree | cc006b49722d3a7f243d32bd22f5650eddefa482 /pkgs/tools/security | |
parent | d66edf145015f30d3c91954ea46cd4ebda311d23 (diff) |
swtpm: 0.5.2 -> 0.6.0
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/swtpm/default.nix | 37 | ||||
-rw-r--r-- | pkgs/tools/security/swtpm/python-installation.patch | 60 |
2 files changed, 9 insertions, 88 deletions
diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index 2bd0326d4d920..daceff1486e3c 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -1,68 +1,49 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitHub, fetchpatch , autoreconfHook , pkg-config -, libtasn1, openssl, fuse, glib, libseccomp +, libtasn1, openssl, fuse, glib, libseccomp, json-glib , libtpms , unixtools, expect, socat , gnutls , perl -, python3, python3Packages }: stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk="; + sha256 = "sha256-7YzdwGAGECj7PhaCOf/dLSILPXqtbylCkN79vuFBw5Y="; }; - pythonPath = with python3Packages; requiredPythonModules [ - setuptools - cryptography - ]; - patches = [ - # upstream looks for /usr directory in $prefix to check - # whether or not to proceed with installation of python - # tools (swtpm_setup utility). - ./python-installation.patch + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/stefanberger/swtpm/pull/527.patch"; + sha256 = "sha256-cpKHP15a27ifmmswSgHoNzGPO6TY/ZuJIfM5xLOlqlU="; + }) ]; - prePatch = '' - patchShebangs src/swtpm_setup/setup.py - patchShebangs samples/setup.py - ''; - nativeBuildInputs = [ pkg-config unixtools.netstat expect socat perl # for pod2man autoreconfHook - python3 ]; buildInputs = [ libtpms openssl libtasn1 libseccomp - fuse glib + fuse glib json-glib gnutls - python3.pkgs.wrapPython ]; - propagatedBuildInputs = pythonPath; configureFlags = [ "--with-cuse" ]; - postInstall = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath" - ''; - enableParallelBuilding = true; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/swtpm/python-installation.patch b/pkgs/tools/security/swtpm/python-installation.patch deleted file mode 100644 index d2689f051c5b9..0000000000000 --- a/pkgs/tools/security/swtpm/python-installation.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 353794feb596d95e3f8893e39b174c5a89d1013e -Author: Arthur Gautier <baloo@superbaloo.net> -Date: Wed Feb 17 02:27:40 2021 +0000 - - python-install - - Signed-off-by: Arthur Gautier <baloo@superbaloo.net> - -diff --git a/samples/Makefile.am b/samples/Makefile.am -index 7d69bf8..1803bb9 100644 ---- a/samples/Makefile.am -+++ b/samples/Makefile.am -@@ -39,19 +39,9 @@ python-uninstall: - $(PIP3) uninstall -y $(PY_PACKAGE_NAME) - - if PYTHON_INSTALLATION --install-exec-local: $(PY_PACKAGE) -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ -- else \ -- $(MAKE) python-install; \ -- fi -+install-exec-local: python-install - --uninstall-local: -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Cleanup for distcheck build not implemented" ; \ -- else \ -- $(MAKE) python-uninstall; \ -- fi -+uninstall-local: python-uninstall - endif - - -diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am -index 529eefe..533b1b3 100644 ---- a/src/swtpm_setup/Makefile.am -+++ b/src/swtpm_setup/Makefile.am -@@ -29,19 +29,9 @@ python-uninstall: - $(PIP3) uninstall -y $(PY_PACKAGE_NAME) - - if PYTHON_INSTALLATION --install-exec-local: $(PY_PACKAGE) -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ -- else \ -- $(MAKE) python-install; \ -- fi -+install-exec-local: python-install - --uninstall-local: -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Cleanup for distcheck build not implemented" ; \ -- else \ -- $(MAKE) python-uninstall; \ -- fi -+uninstall-local: python-uninstall - endif - - # for out-of-tree builds we need to clean up |