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

Merge pull request #110897 from LeSuisse/trousers-0.3.15 

trousers: 0.3.14 -> 0.3.15
This commit is contained in:
Luke Granger-Brown 2021-04-24 23:43:11 +01:00 committed by GitHub
parent fe9a9942e2 82a6b7b258
commit 9839cda8dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
View File

@ -7,10 +7,10 @@ diff -ur trousers-0.3.11.2.orig/src/tcsd/tcsd_conf.c trousers-0.3.11.2/src/tcsd/
+#ifndef ALLOW_NON_TSS_CONFIG_FILE +#ifndef ALLOW_NON_TSS_CONFIG_FILE
/* make sure user/group TSS owns the conf file */ /* make sure user/group TSS owns the conf file */
if (pw->pw_uid != stat_buf.st_uid || grp->gr_gid != stat_buf.st_gid) { if (stat_buf.st_uid != 0 || grp->gr_gid != stat_buf.st_gid) {
LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file, LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file,
@@ -775,6 +776,7 @@ @@ -775,6 +776,7 @@
LogError("TCSD config file (%s) must be mode 0600", tcsd_config_file); LogError("TCSD config file (%s) must be mode 0640", tcsd_config_file);
return TCSERR(TSS_E_INTERNAL_ERROR); return TCSERR(TSS_E_INTERNAL_ERROR);
} }
+#endif +#endif

10
pkgs/tools/security/trousers/default.nix
View File

@ -1,17 +1,15 @@
{ lib, stdenv, fetchurl, openssl, pkg-config }: { lib, stdenv, fetchurl, openssl, pkg-config, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "trousers"; pname = "trousers";
version = "0.3.14"; version = "0.3.15";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz";
sha256 = "0iwgsbrbb7nfqgl61x8aailwxm8akxh9gkcwxhsvf50x4qx72l6f"; sha256 = "0zy7r9cnr2gvwr2fb1q4fc5xnvx405ymcbrdv7qsqwl3a4zfjnqy";
}; };
sourceRoot = "."; nativeBuildInputs = [ pkg-config autoreconfHook ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]; buildInputs = [ openssl ];
patches = [ ./allow-non-tss-config-file-owner.patch ]; patches = [ ./allow-non-tss-config-file-owner.patch ];