rpms/viewvc/F-10 viewvc-allow-tar.patch, NONE, 1.1 viewvc.spec, 1.13, 1.14

[bojan]

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3915

Modified Files:
	viewvc.spec 
Added Files:
	viewvc-allow-tar.patch 
Log Message:
Attempt to fix allow_tar.
Patch by Patrick Monnerat.

viewvc-allow-tar.patch:
 popen.py |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE viewvc-allow-tar.patch ---
--- lib/popen.py	2009-05-07 08:56:47.000000000 +0200
+++ lib/popen.py.regtread	2009-07-30 20:03:16.000000000 +0200
@@ -307,9 +307,13 @@
   def __init__(self, srcfd, destfile):
     self.srcfd = srcfd
     self.destfile = destfile
+    self.server = destfile.server.self()
     threading.Thread.__init__(self)
 
   def run(self):
+    ts = hasattr(sapi.server, 'registerThread')
+    if ts:
+      sapi.server.registerThread(self.server)
     try:
       while 1:
         s = os.read(self.srcfd, 1024)
@@ -318,6 +322,8 @@
         self.destfile.write(s)
     finally:
       os.close(self.srcfd)
+      if ts:
+        sapi.server.unregisterThread()
 
 class _pipe:
   "Wrapper for a file which can wait() on a child process at close time."


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-10/viewvc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- viewvc.spec	7 May 2009 06:52:16 -0000	1.13
+++ viewvc.spec	10 Aug 2009 23:53:45 -0000	1.14
@@ -17,7 +17,7 @@
 
 Name:           viewvc
 Version:        1.0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -27,6 +27,7 @@ Source0:        http://www.viewvc.org/%{
 Source1:        viewvc.conf
 Source2:        README.httpd
 Patch0:         viewvc-temp-location.patch
+Patch1:         viewvc-allow-tar.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -66,6 +67,7 @@ with decent performance when run under A
 %prep
 %setup -q
 %patch0 -p0 -b .temp-location
+%patch1 -p0 -b .allow-tar
 
 %build
 
@@ -147,6 +149,10 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.8-2
+- fix allow_tar
+- patch by Patrick Monnerat
+
 * Thu May  7 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.8-1
 - Bump up to 1.0.8