summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2013-07-16 10:08:03 +0000
committerHans de Graaff <graaff@gentoo.org>2013-07-16 10:08:03 +0000
commit53924ecb3569578bdefd103a30d0bcb5f9dddfaf (patch)
tree98795b00a07ad9dfdedb40621ec05378431447e5 /www-servers
parentCleanup. (diff)
downloadgentoo-2-53924ecb3569578bdefd103a30d0bcb5f9dddfaf.tar.gz
gentoo-2-53924ecb3569578bdefd103a30d0bcb5f9dddfaf.tar.bz2
gentoo-2-53924ecb3569578bdefd103a30d0bcb5f9dddfaf.zip
Cleanup.
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/thin/ChangeLog6
-rw-r--r--www-servers/thin/files/thin-1.2.5-tests.patch27
2 files changed, 5 insertions, 28 deletions
diff --git a/www-servers/thin/ChangeLog b/www-servers/thin/ChangeLog
index d951863a0046..06aa9b6a2b56 100644
--- a/www-servers/thin/ChangeLog
+++ b/www-servers/thin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/thin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/ChangeLog,v 1.23 2013/07/16 10:07:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/ChangeLog,v 1.24 2013/07/16 10:08:03 graaff Exp $
+
+ 16 Jul 2013; Hans de Graaff <graaff@gentoo.org>
+ -files/thin-1.2.5-tests.patch:
+ Cleanup.
16 Jul 2013; Hans de Graaff <graaff@gentoo.org> -thin-1.2.11.ebuild,
-thin-1.3.1.ebuild, -thin-1.5.1.ebuild:
diff --git a/www-servers/thin/files/thin-1.2.5-tests.patch b/www-servers/thin/files/thin-1.2.5-tests.patch
deleted file mode 100644
index ae65539d8aaf..000000000000
--- a/www-servers/thin/files/thin-1.2.5-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-unchanged:
---- a/spec/request/processing_spec.rb
-+++ b/spec/request/processing_spec.rb
-@@ -44,6 +44,7 @@ describe Request, 'processing' do
- end
-
- it "should set body external encoding to ASCII_8BIT" do
-+ pending("Ruby 1.9 compatible implementations only") unless StringIO.instance_methods.include? :external_encoding
- Request.new.body.external_encoding.should == Encoding::ASCII_8BIT
- end
- end
-\ No newline at end of file
-only in patch2:
-unchanged:
---- a/spec/server_spec.rb
-+++ b/spec/server_spec.rb
-@@ -12,6 +12,10 @@ describe Server do
- end
-
- it "should set lower maximum_connections size when too large" do
-+ # root users under Linux will not have a limitation on maximum
-+ # connections, so we cannot really run this test under that
-+ # condition.
-+ pending("only for non-root users") if Process.euid == 0
- @server.maximum_connections = 100_000
- @server.config
- @server.maximum_connections.should < 100_000