diff --git a/Fix-CVE-2020-24330-CVE-2020-24331-CVE-2020-24332.patch b/Fix-CVE-2020-24330-CVE-2020-24331-CVE-2020-24332.patch deleted file mode 100644 index 10031e08829305dabe3b1db8279092596290067d..0000000000000000000000000000000000000000 --- a/Fix-CVE-2020-24330-CVE-2020-24331-CVE-2020-24332.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: trousers-0.3.14/src/tcs/ps/tcsps.c -=================================================================== ---- trousers-0.3.14.orig/src/tcs/ps/tcsps.c -+++ trousers-0.3.14/src/tcs/ps/tcsps.c -@@ -72,7 +72,7 @@ get_file() - } - - /* open and lock the file */ -- system_ps_fd = open(tcsd_options.system_ps_file, O_CREAT|O_RDWR, 0600); -+ system_ps_fd = open(tcsd_options.system_ps_file, O_CREAT|O_RDWR|O_NOFOLLOW, 0600); - if (system_ps_fd < 0) { - LogError("system PS: open() of %s failed: %s", - tcsd_options.system_ps_file, strerror(errno)); -Index: trousers-0.3.14/src/tcsd/svrside.c -=================================================================== ---- trousers-0.3.14.orig/src/tcsd/svrside.c -+++ trousers-0.3.14/src/tcsd/svrside.c -@@ -473,6 +473,7 @@ main(int argc, char **argv) - } - return TCSERR(TSS_E_INTERNAL_ERROR); - } -+ setgid(pwd->pw_gid); - setuid(pwd->pw_uid); - #endif - #endif -Index: trousers-0.3.14/src/tcsd/tcsd_conf.c -=================================================================== ---- trousers-0.3.14.orig/src/tcsd/tcsd_conf.c -+++ trousers-0.3.14/src/tcsd/tcsd_conf.c -@@ -743,7 +743,7 @@ conf_file_init(struct tcsd_config *conf) - #ifndef SOLARIS - struct group *grp; - struct passwd *pw; -- mode_t mode = (S_IRUSR|S_IWUSR); -+ mode_t mode = (S_IRUSR|S_IWUSR|S_IRGRP); - #endif /* SOLARIS */ - TSS_RESULT result; - -@@ -798,15 +798,15 @@ conf_file_init(struct tcsd_config *conf) - } - - /* 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, -- TSS_USER_NAME, TSS_GROUP_NAME); -+ "root", TSS_GROUP_NAME); - return TCSERR(TSS_E_INTERNAL_ERROR); - } - -- /* make sure only the tss user can manipulate the config file */ -+ /* make sure only the tss user can read (but not manipulate) the config file */ - if (((stat_buf.st_mode & 0777) ^ mode) != 0) { -- 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); - } - #endif /* SOLARIS */ diff --git a/trousers-0.3.14.tar.gz b/trousers-0.3.14.tar.gz deleted file mode 100644 index 3e26da13a21ab9f33da9d9e69ffa973c0becd39a..0000000000000000000000000000000000000000 Binary files a/trousers-0.3.14.tar.gz and /dev/null differ diff --git a/trousers-0.3.15.tar.gz b/trousers-0.3.15.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5cf7abae02fd3dc62cd7426f6167042953b899c1 Binary files /dev/null and b/trousers-0.3.15.tar.gz differ diff --git a/trousers.spec b/trousers.spec index 4c3a44165768d6e9e9a455531a1d9128ffaa1c5a..1ecb093c0ce7218d8c3a0179af985af417271bd0 100644 --- a/trousers.spec +++ b/trousers.spec @@ -1,14 +1,14 @@ Name: trousers -Version: 0.3.14 -Release: 5 +Version: 0.3.15 +Release: 1 Summary: The open-source TCG Software Stack License: BSD Url: http://trousers.sourceforge.net -Source0: https://sourceforge.net/projects/trousers/files/trousers/0.3.14/trousers-0.3.14.tar.gz +Source0: https://sourceforge.net/projects/trousers/files/trousers/%{version}/trousers-%{version}.tar.gz #Acknowledge Source1 from Fedora. Source1: tcsd.service -Patch0: Fix-CVE-2020-24330-CVE-2020-24331-CVE-2020-24332.patch +BuildRequires: make gettext-devel autoconf automake BuildRequires: libtool openssl-devel systemd Requires(pre): shadow-utils Requires(post): systemd-units @@ -42,6 +42,8 @@ Includes header files, static library and other development files using trousers %build +chmod +x ./bootstrap.sh +./bootstrap.sh %configure --with-gui=openssl %make_build -k @@ -93,20 +95,23 @@ exit 0 %changelog -* Tue Sep 29 2020 Hugel - 1.9.8-5 +* Sat Jan 23 2021 panxiaohe - 0.3.15-1 +- update to 0.3.15 + +* Tue Sep 29 2020 Hugel - 0.3.14-5 - require /etc/tcsd.conf to be owned by root:tss mode 640 for CVE-2020-24331 -* Mon Sep 14 2020 wangchen - 1.9.8-4 +* Mon Sep 14 2020 wangchen - 0.3.14-4 - Fix CVE-2020-24330 CVE-2020-24331 CVE-2020-24332 -* Sat Mar 21 2020 openEuler Buildteam - 1.9.8-3 +* Sat Mar 21 2020 openEuler Buildteam - 0.3.14-3 - Add tss account used by the trousers package to sandbox the tcsd daemon -* Sat Dec 21 2019 openEuler Buildteam - 1.9.8-2 +* Sat Dec 21 2019 openEuler Buildteam - 0.3.14-2 - Modify requires -* Mon Oct 14 2019 openEuler Buildteam - 1.9.8-1 -- update to 0.3.13 +* Mon Oct 14 2019 openEuler Buildteam - 0.3.14-1 +- update to 0.3.14 * Wed Sep 4 2019 Zaiwang Li - 0.3.13-12 - Init package