rpms/gaim-gadugadu/devel dead.package,NONE,1.1
by fedora-extras-commits@redhat.com
Author: raven
Update of /cvs/extras/rpms/gaim-gadugadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16308/devel
Added Files:
dead.package
Log Message:
Added dead.package
--- NEW FILE dead.package ---
Obsolete package.
16 years, 3 months
rpms/gaim-gadugadu/FC-6 dead.package,NONE,1.1
by fedora-extras-commits@redhat.com
Author: raven
Update of /cvs/extras/rpms/gaim-gadugadu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16308/FC-6
Added Files:
dead.package
Log Message:
Added dead.package
--- NEW FILE dead.package ---
Obsolete package.
16 years, 3 months
rpms/mod_fcgid/devel .cvsignore, 1.2, 1.3 configuration.htm, 1.1, 1.2 doc.htm, 1.1, 1.2 mod_fcgid.spec, 1.2, 1.3 sources, 1.2, 1.3
by fedora-extras-commits@redhat.com
Author: pghmcfc
Update of /cvs/extras/rpms/mod_fcgid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11373
Modified Files:
.cvsignore configuration.htm doc.htm mod_fcgid.spec sources
Log Message:
Update to 2.0
Source is now hosted at sourceforge.net
Update docs
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 6 Sep 2006 13:08:59 -0000 1.2
+++ .cvsignore 31 Oct 2006 18:37:08 -0000 1.3
@@ -1 +1 @@
-mod_fcgid.1.10.tar.gz
+mod_fcgid.2.0.tar.gz
Index: configuration.htm
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/configuration.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configuration.htm 6 Sep 2006 13:08:59 -0000 1.1
+++ configuration.htm 31 Oct 2006 18:37:08 -0000 1.2
@@ -9,62 +9,62 @@
<body>
-<p><b><a name="regular fastcgi"></a>This is a for regular fastcgi. </b><p>LoadModule fcgid_module
+<p><b><a name="regular fastcgi"></a>This is a for regular fastcgi. </b><p>LoadModule fcgid_module
modules/mod_fcgid.so<p>
-<Location /fcgid><br>
- SetHandler fcgid-script<br>
- Options ExecCGI<br>
- allow from all<br>
+<Location /fcgid><br>
+ SetHandler fcgid-script<br>
+ Options ExecCGI<br>
+ allow from all<br>
</Location><p>
<hr>
-<p><b><a name="suEXEC"></a>This is for suEXEC. Please get more information about suEXEC <a href="http://httpd.apache.org/docs-2.0/suexec.html">here</a>. </b><p>LoadModule fcgid_module
+<p><b><a name="suEXEC"></a>This is for suEXEC. Please get more information about suEXEC <a href="http://httpd.apache.org/docs-2.0/suexec.html">here</a>. </b><p>LoadModule fcgid_module
modules/mod_fcgid.so<p>
-<Location /fcgid><br>
- SetHandler fcgid-script<br>
- Options ExecCGI<br>
- allow from all<br>
+<Location /fcgid><br>
+ SetHandler fcgid-script<br>
+ Options ExecCGI<br>
+ allow from all<br>
</Location><p>
-<VirtualHost 192.168.1.89><br>
- ServerAdmin <a href="mailto:webmaster@host.foo.com">webmaster(a)host.foo.com<br>
-</a> DocumentRoot /usr/local/apache2/htdocs/<br>
- ServerName host.foo.com<br>
- SuexecUserGroup pqf pqf<br>
+<VirtualHost 192.168.1.89><br>
+ ServerAdmin <a href="mailto:webmaster@host.foo.com">webmaster(a)host.foo.com<br>
+</a> DocumentRoot /usr/local/apache2/htdocs/<br>
+ ServerName host.foo.com<br>
+ SuexecUserGroup pqf pqf<br>
</VirtualHost><p>
¡¡
<hr>
-<p><b><a name="PHP"></a>This is for fastcgi-mode PHP (UNIX)</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>
-<Directory /usr/local/apache2/htdocs/php><br>
- SetHandler fcgid-script<br>
- FCGIWrapper /usr/local/bin/php .php<br>
- Options ExecCGI<br>
- allow from all<br>
-</Directory><p><b>This works too:</b><p>LoadModule fcgid_module
+<p><b><a name="PHP"></a>This is for fastcgi-mode PHP (UNIX)</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>
+<Directory /usr/local/apache2/htdocs/php><br>
+ SetHandler fcgid-script<br>
+ FCGIWrapper /usr/local/bin/php .php<br>
+ Options ExecCGI<br>
+ allow from all<br>
+</Directory><p><b>This works too:</b><p>LoadModule fcgid_module
modules/mod_fcgid.so <p>
-AddHandler fcgid-script .php<br>
-<Directory /usr/local/apache2/htdocs/php><br>
- FCGIWrapper /usr/local/bin/php .php<br>
- Options ExecCGI<br>
- allow from all<br>
+AddHandler fcgid-script .php<br>
+<Directory /usr/local/apache2/htdocs/php><br>
+ FCGIWrapper /usr/local/bin/php .php<br>
+ Options ExecCGI<br>
+ allow from all<br>
</Directory><p><b># Please make sure:<br>
# php is configured with --enable-fastcgi option<br>
# check error_log(with debug level), if
any thing goes wrong</b>
<hr>
-<p><b><a name="suPHP"></a>This is for suPHP ( UNIX )</b>
-<p>LoadModule fcgid_module modules/mod_fcgid.so<br>
+<p><b><a name="suPHP"></a>This is for suPHP ( UNIX )</b>
+<p>LoadModule fcgid_module modules/mod_fcgid.so<br>
<br>
-<VirtualHost *:80><br>
- ServerName test2.example.com<br>
- DocumentRoot /usr/local/apache2/htdocs/test2.example.com/<br>
- SuexecUserGroup pqf pqf<br>
+<VirtualHost *:80><br>
+ ServerName test2.example.com<br>
+ DocumentRoot /usr/local/apache2/htdocs/test2.example.com/<br>
+ SuexecUserGroup pqf pqf<br>
</VirtualHost><br>
<br>
-<Directory /usr/local/apache2/htdocs/test2.example.com/><br>
- AddHandler fcgid-script .php<br>
- Options ExecCGI<br>
- allow from all<br>
- FCGIWrapper /usr/local/apache2/htdocs/test2.example.com/php .php<br>
+<Directory /usr/local/apache2/htdocs/test2.example.com/><br>
+ AddHandler fcgid-script .php<br>
+ Options ExecCGI<br>
+ allow from all<br>
+ FCGIWrapper /usr/local/apache2/htdocs/test2.example.com/php .php<br>
</Directory></p>
<p>
<b>
@@ -79,23 +79,89 @@
<hr>
<p><br>
-<b><a name="PHP-Windows"></a>This is for fastcgi-mode PHP ( Windows )</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>
-<Directory "C:/Apache2/htdocs/php/"><br>
- SetHandler fcgid-script<br>
- Options execCGI<br>
- AllowOverride None<br>
- Order allow,deny<br>
- Allow from all<br>
- FCGIWrapper "c:/php/php.exe" .php<br>
-</Directory><p><b>This works too:</b><p>LoadModule fcgid_module modules/mod_fcgid.so <p>
-AddHandler fcgid-script .php<br>
-<Directory "C:/Apache2/htdocs/php/"><br>
- FCGIWrapper "c:/php/php.exe" .php<br>
- Options ExecCGI<br>
- allow from all<br>
+<b><a name="PHP-Windows"></a>This is for fastcgi-mode PHP ( Windows )</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>
+<Directory "C:/Apache2/htdocs/php/"><br>
+ SetHandler fcgid-script<br>
+ Options execCGI<br>
+ AllowOverride None<br>
+ Order allow,deny<br>
+ Allow from all<br>
+ FCGIWrapper "c:/php/php.exe" .php<br>
+</Directory><p><b>This works too:</b><p>LoadModule fcgid_module modules/mod_fcgid.so <p>
+AddHandler fcgid-script .php<br>
+<Directory "C:/Apache2/htdocs/php/"><br>
+ FCGIWrapper "c:/php/php.exe" .php<br>
+ Options ExecCGI<br>
+ allow from all<br>
</Directory><br>
<hr>
+<p><b><a name="Authenticator"></a>This is for Authenticator</b></p>
+<p>LoadModule fcgid_module modules/mod_fcgid.so
+<p><Location /fcgid><br>
+ SetHandler fcgid-script<br>
+ Options ExecCGI<br>
+ allow from all<br>
+ AuthType Basic<br>
+ AuthName ProtectedRealm<br>
+ FastCgiAuthenticator /some/path/authenticator<br>
+ require valid-user<br>
+</Location><br>
+</p>
+<p><b>Another configuration: <a name="FastCgiAuthenticatorAuthoritative">FastCgiAuthenticatorAuthoritative</a>
+(default On)</b></p>
+<p>Setting the <code>FastCgiAuthenticatorAuthoritative</code> directive
+explicitly to <em>Off</em> allows authentication to be passed on to lower level
+modules</p>
+
+<hr>
+<p><b><a name="Authorizer"></a>This is for Authorizer</b></p>
+
+<p>LoadModule fcgid_module modules/mod_fcgid.so
+<p><Location /fcgid><br>
+ SetHandler fcgid-script<br>
+ Options ExecCGI<br>
+ allow from all<br>
+ AuthType Basic<br>
+ AuthName ProtectedRealm<br>
+ FastCgiAuthorizer /some/place/Authorizer<br>
+</Location></p>
+
+<p><b>Another configuration: <a name="FastCgiAuthorizerAuthoritative">FastCgiAuthorizerAuthoritative</a>
+(default On)</b></p>
+
+<p>Setting the <code>FastCgiAuthorizerAuthoritative</code> directive explicitly
+to <em>Off</em> allows authorization to be passed on to lower level modules</p>
+
+<hr>
+<p><b><a name="AccessChecker"></a>This is for AccessChecker</b></p>
+<p>LoadModule fcgid_module modules/mod_fcgid.so
+<p><Location /fcgid><br>
+ SetHandler fcgid-script<br>
+ Options ExecCGI<br>
+ allow from all<br>
+ FastCgiAccessChecker /some/place/access-checker<br>
+</Location><br>
+</p>
+<p><b>Another configuration: </b><a name="FastCgiAccessCheckerAuthoritative"><b>FastCgiAccessCheckerAuthoritative</b></a><b>
+(default On)</b></p>
+<p>Setting the <code>FastCgiAccessCheckerAuthoritative</code> directive
+explicitly to <em>Off</em> allows access checking to be passed on to lower level
+modules</p>
+<p>¡¡</p>
+<p>¡¡</p>
+
+<p>¡¡</p>
+<p>¡¡</p>
+<p>¡¡</p>
+<p>¡¡</p>
+<p>¡¡</p>
+<p>¡¡</p>
+<p>¡¡</p>
+<p>¡¡</p>
+<p>¡¡</p>
+<p>¡¡</p>
+<p>¡¡</p>
<p>¡¡</p>
<p>¡¡</p>
<p>¡¡</p>
Index: doc.htm
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/doc.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doc.htm 6 Sep 2006 13:08:59 -0000 1.1
+++ doc.htm 31 Oct 2006 18:37:08 -0000 1.2
@@ -51,7 +51,10 @@
(non-PHP, non-Ruby, non-Python) </a><p><a href="configuration.htm#suEXEC">Configuration
for suEXEC fastcgi</a><p><a href="configuration.htm#PHP">Configuration for PHP
(UNIX)</a><p><a href="configuration.htm#suPHP">Configuration for suPHP (UNIX)</a><p><a href="configuration.htm#PHP-Windows">Configuration
-for PHP (Windows)</a><p>
+for PHP (Windows)</a><p><a href="configuration.htm#Authenticator">Configuration
+for Authenticator</a><p><a href="configuration.htm#Authorizer">Configuration
+for Authorizer</a><p><a href="configuration.htm#AccessChecker">Configuration
+for AccessChecker</a><p>
<hr>
<ul>
<li><h2><b><font size="4">There are
@@ -90,9 +93,16 @@
fastcgi application. <p><b>IPCCommTimeout n (20 seconds)</b><p>The communication
timeout to a fastcgi application. Please increase this value if your CGI have a
slow initialization or slow respond.<p><b>OutputBufferSize n (64k bytes)</b><p>CGI
-output cache buffer size.<p><b>PHP_Fix_Pathinfo_Enable</b><b> n(n=0/1, default 0)</b><p>If
+output cache buffer size.<p><b>PHP_Fix_Pathinfo_Enable</b><b> n(n=0/1, default 0)</b><p>If
you are using PHP and set cgi.fix_pathinfo=1 in php.ini, set
-PHP_Fix_Pathinfo_Enable 1.
+PHP_Fix_Pathinfo_Enable 1.<p><b>MaxRequestsPerProcess n (-1)</b><p>(Added in
+version 1.11, patch from Robert L Mathews)<p>Adds a MaxRequestsPerProcess parameter that allows mod_fcgid to
+exit after handling a certain number of requests, similar to the existing ProcessLifeTime option. <p>This solves a problem with PHP in FastCGI mode. By default, PHP stops
+accepting new FastCGI connections after handling 500 requests; unfortunately, there is a potential race condition during the PHP cleanup code in which
+PHP can be shutting down but still have the socket open, so mod_fcgid under heavy load can send request number 501 to PHP and have it "accepted", but then
+PHP appears to simply exit, causing errors.<p>If you are using PHP, you should
+set it to 500. -1 mean fastcgi process will not exit no matter how many requests
+it has handled.<br>
</td>
Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_fcgid.spec 6 Sep 2006 13:47:08 -0000 1.2
+++ mod_fcgid.spec 31 Oct 2006 18:37:08 -0000 1.3
@@ -10,13 +10,13 @@
%endif
Name: mod_fcgid
-Version: 1.10
-Release: 7%{?dist}
+Version: 2.0
+Release: 1%{?dist}
Summary: Apache2 module for high-performance server-side scripting
Group: System Environment/Daemons
License: GPL
URL: http://fastcgi.coremail.cn/
-Source0: http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz
+Source0: http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
Source1: fcgid.conf
Source2: fastcgi.te
Source3: fastcgi.fc
@@ -144,6 +144,11 @@
%endif
%changelog
+* Mon Oct 30 2006 Paul Howarth <paul(a)city-fan.org> 2.0-1
+- Update to 2.0
+- Source is now hosted at sourceforge.net
+- Update docs
+
* Wed Sep 6 2006 Paul Howarth <paul(a)city-fan.org> 1.10-7
- Include the right README* files
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 6 Sep 2006 13:08:59 -0000 1.2
+++ sources 31 Oct 2006 18:37:08 -0000 1.3
@@ -1 +1 @@
-6c36b18548ca64864ed3dd4cb759062f mod_fcgid.1.10.tar.gz
+3aa51f1e293e6d881028295a23021dae mod_fcgid.2.0.tar.gz
16 years, 3 months
rpms/q/FC-6 .cvsignore,1.3,1.4 q.spec,1.4,1.5 sources,1.3,1.4
by fedora-extras-commits@redhat.com
Author: gemi
Update of /cvs/extras/rpms/q/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10950/FC-6
Modified Files:
.cvsignore q.spec sources
Log Message:
new version 7.5
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/q/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 30 Aug 2006 11:46:23 -0000 1.3
+++ .cvsignore 31 Oct 2006 18:31:13 -0000 1.4
@@ -1 +1 @@
-q-7.4.tar.gz
+q-7.5.tar.gz
Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/FC-6/q.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- q.spec 30 Aug 2006 11:46:23 -0000 1.4
+++ q.spec 31 Oct 2006 18:31:13 -0000 1.5
@@ -1,11 +1,11 @@
Name: q
-Version: 7.4
+Version: 7.5
Release: 1%{?dist}
Summary: Equational programming language
Group: Development/Languages
License: GPL
-Source: http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.4.tar.gz
+Source: http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
URL: http://q-lang.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ImageMagick-devel
@@ -154,6 +154,9 @@
%changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 7.5-1
+- new version 7.5
+
* Wed Aug 30 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 7.4-1
- new version 7.4
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/q/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 30 Aug 2006 11:46:23 -0000 1.3
+++ sources 31 Oct 2006 18:31:13 -0000 1.4
@@ -1 +1 @@
-0b6ddd02028aee60f5ee1cd1f8cc008a q-7.4.tar.gz
+d556ee55016ff9f3ce328bb7962157fe q-7.5.tar.gz
16 years, 3 months
rpms/q/FC-5 .cvsignore,1.3,1.4 q.spec,1.3,1.4 sources,1.3,1.4
by fedora-extras-commits@redhat.com
Author: gemi
Update of /cvs/extras/rpms/q/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10950/FC-5
Modified Files:
.cvsignore q.spec sources
Log Message:
new version 7.5
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/q/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 30 Aug 2006 11:46:22 -0000 1.3
+++ .cvsignore 31 Oct 2006 18:31:12 -0000 1.4
@@ -1 +1 @@
-q-7.4.tar.gz
+q-7.5.tar.gz
Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/FC-5/q.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- q.spec 30 Aug 2006 11:46:22 -0000 1.3
+++ q.spec 31 Oct 2006 18:31:12 -0000 1.4
@@ -1,11 +1,11 @@
Name: q
-Version: 7.4
+Version: 7.5
Release: 1%{?dist}
Summary: Equational programming language
Group: Development/Languages
License: GPL
-Source: http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.4.tar.gz
+Source: http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
URL: http://q-lang.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ImageMagick-devel
@@ -154,6 +154,9 @@
%changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 7.5-1
+- new version 7.5
+
* Wed Aug 30 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 7.4-1
- new version 7.4
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/q/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 30 Aug 2006 11:46:22 -0000 1.3
+++ sources 31 Oct 2006 18:31:12 -0000 1.4
@@ -1 +1 @@
-0b6ddd02028aee60f5ee1cd1f8cc008a q-7.4.tar.gz
+d556ee55016ff9f3ce328bb7962157fe q-7.5.tar.gz
16 years, 3 months
rpms/q/devel q-7.5-curlopt.patch,NONE,1.1 q.spec,1.5,1.6
by fedora-extras-commits@redhat.com
Author: gemi
Update of /cvs/extras/rpms/q/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10629
Modified Files:
q.spec
Added Files:
q-7.5-curlopt.patch
Log Message:
patch for curloptions
q-7.5-curlopt.patch:
--- NEW FILE q-7.5-curlopt.patch ---
--- q-7.5/modules/curl/curl.c.curlopt 2006-10-31 19:19:44.000000000 +0100
+++ q-7.5/modules/curl/curl.c 2006-10-31 19:24:10.000000000 +0100
@@ -313,9 +313,9 @@
#if LIBCURL_VERSION_NUM < 0x070a00
#define CURLOPT_NOSIGNAL (-1)
#endif
-#if LIBCURL_VERSION_NUM < 0x070402
+
#define CURLOPT_PASSWDFUNCTION (-1)
-#endif
+
#if LIBCURL_VERSION_NUM < 0x070702
#define CURLOPT_HEADERFUNCTION (-1)
#endif
@@ -1006,10 +1006,6 @@
cb = (int(*)())progress_cb;
dataopt = CURLOPT_PROGRESSDATA;
break;
- case CURLOPT_PASSWDFUNCTION:
- cb = (int(*)())passwd_cb;
- dataopt = CURLOPT_PASSWDDATA;
- break;
case CURLOPT_HEADERFUNCTION:
cb = (int(*)())header_cb;
dataopt = CURLOPT_WRITEHEADER;
Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/devel/q.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- q.spec 31 Oct 2006 16:15:09 -0000 1.5
+++ q.spec 31 Oct 2006 18:27:23 -0000 1.6
@@ -1,11 +1,12 @@
Name: q
Version: 7.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Equational programming language
Group: Development/Languages
License: GPL
Source: http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
+Patch0: q-7.5-curlopt.patch
URL: http://q-lang.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ImageMagick-devel
@@ -64,6 +65,7 @@
%prep
%setup -q
+%patch0 -p1
sed -i 's|/usr/sbin/apxs2|/usr/sbin/apxs -I../src -L../src|' mod_q/Makefile
sed -i 's|@libtool@|libtool|' src/Makefile.in
@@ -154,6 +156,9 @@
%changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 7.5-2
+- patch for curl options
+
* Tue Oct 31 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 7.5-1
- new version 7.5
16 years, 3 months
extras-buildsys/common ssl-client-test.py, NONE, 1.1 ssl-server-test.py, NONE, 1.1
by fedora-extras-commits@redhat.com
Author: dcbw
Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9665/common
Added Files:
ssl-client-test.py ssl-server-test.py
Log Message:
2006-10-31 Dan Williams <dcbw(a)redhat.com>
* common/ssl-client-test.py
common/ssl-server-test.py
- Two utilities to test the functionality of SSLConnection class
and the SSL server/client classes
--- NEW FILE ssl-client-test.py ---
import threading
import time
import random
import OpenSSL
import socket
import SSLCommon
import SSLConnection
import sys, os
import urllib
import base64
import types
client_start = False
threadlist_lock = threading.Lock()
threadlist = {}
timed_out = 0
class TestClient(threading.Thread):
def __init__(self, certs, num):
self._ctx = SSLCommon.CreateSSLContext(certs)
self._timeout = 20
self._host = "localhost"
self._port = 8888
self.num = i
threading.Thread.__init__(self)
def get_host_info(self, host):
x509 = {}
if isinstance(host, types.TupleType):
host, x509 = host
import urllib
auth, host = urllib.splituser(host)
if auth:
import base64
auth = base64.encodestring(urllib.unquote(auth))
auth = string.join(string.split(auth), "") # get rid of whitespace
extra_headers = [
("Authorization", "Basic " + auth)
]
else:
extra_headers = None
return host, extra_headers, x509
def _make_connection(self):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
con = OpenSSL.SSL.Connection(self._ctx, sock)
sock = SSLConnection.SSLConnection(con)
sock.connect((self._host, self._port))
return sock
def run(self):
request = "ping" * 40
while not client_start:
time.sleep(0.05)
i = 0
while i < 5:
reply = None
try:
sock = self._make_connection()
# Send request
sock.sendall(request)
# Wait for response
print "Waiting for response"
reply = sock.recv(1024)
sock.close()
except OpenSSL.SSL.Error, e:
reply = "OpenSSL Error (%s)" % e
except socket.error, e:
reply = "Socket error (%s)" % e
except socket.timeout, e:
reply = "Socket timeout (%s)" % e
threadlist_lock.acquire()
timed_out = timed_out + 1
threadlist_lock.release()
print "TRY(%d / %d): %s" % (self.num, i, reply)
time.sleep(0.05)
i = i + 1
threadlist_lock.acquire()
del threadlist[self]
threadlist_lock.release()
if __name__ == '__main__':
if len(sys.argv) < 4:
print "Usage: python %s key_and_cert ca_cert peer_ca_cert" % sys.argv[0]
sys.exit(1)
certs = {}
certs['key_and_cert'] = sys.argv[1]
certs['ca_cert'] = sys.argv[2]
certs['peer_ca_cert'] = sys.argv[3]
i = 100
while i > 0:
t = TestClient(certs, i)
threadlist[t] = None
print "Created thread %d." % i
t.start()
i = i - 1
time.sleep(3)
print "Unleashing threads."
client_start = True
while True:
try:
time.sleep(0.25)
threadlist_lock.acquire()
if len(threadlist) == 0:
break
threadlist_lock.release()
except KeyboardInterrupt:
os._exit(0)
print "All done. (%d timed out)" % timed_out
--- NEW FILE ssl-server-test.py ---
import os, sys
import socket
import time
import SSLCommon
import SocketServer
response = "pong" * 20
class ReqHandler(SocketServer.StreamRequestHandler):
def handle(self):
print "Starting handler"
# Read the request
string = self.rfile.read(100)
if len(string) > 0:
print "request was: '%s' (%d)" % (string, len(string))
else:
print "request was zero-length"
# Write the response
self.wfile.write(response)
if __name__ == '__main__':
if len(sys.argv) < 4:
print "Usage: python %s key_and_cert ca_cert peer_ca_cert" % sys.argv[0]
sys.exit(1)
certs = {}
certs['key_and_cert'] = sys.argv[1]
certs['ca_cert'] = sys.argv[2]
certs['peer_ca_cert'] = sys.argv[3]
print "Starting the server."
server = SSLCommon.PlgBaseSSLServer(('localhost', 8888), ReqHandler, certs)
server.serve_forever()
16 years, 3 months
extras-buildsys ChangeLog,1.213,1.214
by fedora-extras-commits@redhat.com
Author: dcbw
Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9665
Modified Files:
ChangeLog
Log Message:
2006-10-31 Dan Williams <dcbw(a)redhat.com>
* common/ssl-client-test.py
common/ssl-server-test.py
- Two utilities to test the functionality of SSLConnection class
and the SSL server/client classes
Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- ChangeLog 31 Oct 2006 17:57:36 -0000 1.213
+++ ChangeLog 31 Oct 2006 18:10:42 -0000 1.214
@@ -1,5 +1,12 @@
2006-10-31 Dan Williams <dcbw(a)redhat.com>
+ * common/ssl-client-test.py
+ common/ssl-server-test.py
+ - Two utilities to test the functionality of SSLConnection class
+ and the SSL server/client classes
+
+2006-10-31 Dan Williams <dcbw(a)redhat.com>
+
* server/PackageJob.py
- Fixes for older python versions that don't have yum.Errors.* but
yum-utils' repomd module instead
16 years, 3 months
extras-buildsys/server PackageJob.py,1.55,1.56
by fedora-extras-commits@redhat.com
Author: dcbw
Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6285/server
Modified Files:
PackageJob.py
Log Message:
2006-10-31 Dan Williams <dcbw(a)redhat.com>
* server/PackageJob.py
- Fixes for older python versions that don't have yum.Errors.* but
yum-utils' repomd module instead
- Fixes for Yum 3.x logging changes
Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- PackageJob.py 31 Oct 2006 16:46:21 -0000 1.55
+++ PackageJob.py 31 Oct 2006 17:57:36 -0000 1.56
@@ -32,12 +32,19 @@
from plague import DebugUtils
import yum
+use_repomd = False
try:
import repomd.mdErrors
+ use_repomd = True
except ImportError:
pass
-from yum.logger import Logger
+use_yum_logger = False
+try:
+ from yum.logger import Logger
+ use_yum_logger = True
+except ImportError:
+ pass
CVS_CMD = "/usr/bin/cvs"
MAKE_CMD = "/usr/bin/make"
@@ -497,10 +504,17 @@
depsolve_root = os.path.dirname(yum_config) + '/'
base.doConfigSetup(fn=yum_config, root=depsolve_root)
+
threshold = 0
if DEBUG:
threshold = 5
- base.log = Logger(threshold=threshold, file_object=sys.stdout)
+ if use_yum_logger == True:
+ # For yum 2.x and earlier
+ base.log = logger.Logger(threshold=threshold, file_object=sys.stdout)
+ else:
+ # Use python logging module (yum 3.x and later)
+ base.doLoggingSetup(threshold, 1)
+
try:
base.doRepoSetup()
except yum.Errors.RepoError, exc:
@@ -528,14 +542,18 @@
for dep in srpm.requiresList():
if dep.startswith("rpmlib("):
continue
- try:
- pkg = base.returnPackageByDep(dep)
- except repomd.mdErrors.PackageSackError, exc:
- raise DepError(str(exc))
- except yum.Errors.PackageSackError, exc:
- raise DepError(str(exc))
- except yum.Errors.YumBaseError, exc:
- raise DepError(str(exc))
+ if use_repomd:
+ try:
+ pkg = base.returnPackageByDep(dep)
+ except repomd.mdErrors.PackageSackError, exc:
+ raise DepError(str(exc))
+ else:
+ try:
+ pkg = base.returnPackageByDep(dep)
+ except yum.Errors.PackageSackError, exc:
+ raise DepError(str(exc))
+ except yum.Errors.YumBaseError, exc:
+ raise DepError(str(exc))
except DepError, exc:
self._last_depsolve_error = str(exc)
print "%s (%s/%s): Depsolve Error: %s" % (self.uid, self.package, arch, str(exc))
16 years, 3 months