[trousers/f17] New upstream bug fix release

[Steve Grubb]

commit ba23187042838a5957ebe4aeee31a18dc2b7f4f3
Author: Steve <sgrubb at redhat.com>
Date:   Mon Aug 27 14:27:20 2012 -0400

    New upstream bug fix release
    
    - Update init scripts to not try to load modules
    - bz #781666 - CVE-2012-0698 DoS vulnerability in tcsd

 trousers-init.patch |   40 +++++++++++++++++++++++++---------------
 trousers.spec       |   11 ++++++++---
 2 files changed, 33 insertions(+), 18 deletions(-)
---
diff --git a/trousers-init.patch b/trousers-init.patch
index 8597067..ac2c568 100644
--- a/trousers-init.patch
+++ b/trousers-init.patch
@@ -1,6 +1,7 @@
---- dist/fedora/fedora.initrd.tcsd.orig	2010-05-01 13:16:32.000000000 +0200
-+++ dist/fedora/fedora.initrd.tcsd	2010-05-01 13:16:53.000000000 +0200
-@@ -1,51 +1,46 @@
+diff -ur trousers-0.3.6.orig/dist/fedora/fedora.initrd.tcsd trousers-0.3.6/dist/fedora/fedora.initrd.tcsd
+--- trousers-0.3.6.orig/dist/fedora/fedora.initrd.tcsd	2012-08-27 14:02:50.182402046 -0400
++++ trousers-0.3.6/dist/fedora/fedora.initrd.tcsd	2012-08-27 14:05:43.429406285 -0400
+@@ -1,77 +1,55 @@
  #!/bin/bash
  #
 -# Init file for the TrouSerS TCG Core Services daemon
@@ -40,8 +41,6 @@
  prog="tcsd"
 +config="/etc/tcsd.conf"
 +PID_FILE="/var/run/tcsd.pid"
-+INSMOD="/sbin/insmod"
-+LSMOD="/sbin/lsmod"
 +GREP="/bin/grep"
  
  # source function library
@@ -74,19 +73,30 @@
 -INSMOD=/sbin/insmod
 -LSMOD=/sbin/lsmod
 -GREP=/bin/grep
+-
+-load_drivers()
+-{
+-	for d in `echo /lib/modules/$(uname -r)/kernel/drivers/char/tpm/tpm_*`; do
+-		$INSMOD $d
+-		if test $? -eq 0; then
+-			break;
+-		fi
+-	done
+-}
+-
+-check_drivers()
+-{
+-	$LSMOD | $GREP tpm_
+-}
 +test $EUID = 0	||	exit 4
  
- load_drivers()
- {
-@@ -64,14 +59,15 @@
- 
  start()
  {
 -	test -x $TCSD || exit 5
 -	test -f /etc/tcsd.conf || exit 6
+-	check_drivers || load_drivers || failure
 +	test -x $exec || exit 5
 +	test -f $config || exit 6
- 	check_drivers || load_drivers || failure
  	echo -n $"Starting $prog: "
 -	$TCSD $OPTIONS && success || failure
 +	$exec $OPTIONS && success || failure
@@ -98,7 +108,7 @@
  }
  
  stop()
-@@ -79,32 +75,59 @@
+@@ -79,32 +57,59 @@
  	echo -n $"Stopping $prog: "
  	killproc $prog
  	RETVAL=$?
@@ -111,8 +121,8 @@
 +restart() {
 +	stop
 +	start
- }
- 
++}
++
 +reload() {
 +	restart
 +}
@@ -124,8 +134,8 @@
 +rh_status() {
 +	# run checks to determine if the service is running or use generic status
 +	status $prog
-+}
-+
+ }
+ 
 +rh_status_q() {
 +	rh_status >/dev/null 2>&1
 +}
diff --git a/trousers.spec b/trousers.spec
index ed0df1d..8b20c2f 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -1,7 +1,7 @@
 Name: trousers
 Summary: TCG's Software Stack v1.2
-Version: 0.3.6
-Release: 2%{?dist}
+Version: 0.3.9
+Release: 1%{?dist}
 License: CPL
 Group: System Environment/Libraries
 Url: http://trousers.sourceforge.net
@@ -47,7 +47,7 @@ applications.
 
 %prep
 %setup -q
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
 
 sed -i -e 's|/var/tpm|/var/lib/tpm|g' -e 's|/usr/local/var|/var|g' man/man5/tcsd.conf.5.in man/man8/tcsd.8.in
@@ -118,6 +118,11 @@ fi
 %{_libdir}/libtddl.a
 
 %changelog
+* Mon Aug 27 2012 Steve Grubb <sgrubb at redhat.com> 0.3.9-1
+- New upstream bug fix release
+- Update init scripts to not try to load modules
+- bz #781666 - CVE-2012-0698 DoS vulnerability in tcsd
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild