[DRE-commits] [thin] 03/05: Refresh patches
Antonio Terceiro
terceiro at moszumanska.debian.org
Mon Mar 9 17:11:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository thin.
commit 79b13eb4a7e99b211e99ef63ecfaf457f11c8101
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Mar 9 14:03:47 2015 -0300
Refresh patches
---
debian/changelog | 4 +++
debian/patches/dont-allow-install | 41 +++++++++-------------
debian/patches/fix_hardening_FTBFS.patch | 18 ----------
.../patches/fix_require_path_for_thin_parser.patch | 28 ---------------
debian/patches/series | 2 --
5 files changed, 20 insertions(+), 73 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a35d186..38afe14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
thin (1.6.3-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Patches:
+ - dont-allow-install: refreshed
+ - fix_require_path_for_thin_parser.patch: removed, fixed upstream
+ - fix_hardening_FTBFS.patch: removed, fixed upstream
-- Antonio Terceiro <terceiro at debian.org> Mon, 09 Mar 2015 13:47:18 -0300
diff --git a/debian/patches/dont-allow-install b/debian/patches/dont-allow-install
index 390978c..5ab35fd 100644
--- a/debian/patches/dont-allow-install
+++ b/debian/patches/dont-allow-install
@@ -1,19 +1,17 @@
# remove the code to install thin's init script ("thin install"), the Debian package does that.
-Index: ruby-thin/lib/thin/controllers/service.rb
-===================================================================
---- ruby-thin.orig/lib/thin/controllers/service.rb 2012-01-10 00:56:06.000000000 -0800
-+++ ruby-thin/lib/thin/controllers/service.rb 2012-01-10 01:06:12.000000000 -0800
-@@ -32,30 +32,7 @@
+--- a/lib/thin/controllers/service.rb
++++ b/lib/thin/controllers/service.rb
+@@ -32,30 +32,7 @@ module Thin
end
def install(config_files_path=DEFAULT_CONFIG_PATH)
- if File.exist?(INITD_PATH)
-- log ">> Thin service already installed at #{INITD_PATH}"
+- log_info "Thin service already installed at #{INITD_PATH}"
- else
-- log ">> Installing thin service at #{INITD_PATH} ..."
+- log_info "Installing thin service at #{INITD_PATH} ..."
- sh "mkdir -p #{File.dirname(INITD_PATH)}"
-- log "writing #{INITD_PATH}"
+- log_info "writing #{INITD_PATH}"
- File.open(INITD_PATH, 'w') do |f|
- f << ERB.new(File.read(TEMPLATE)).result(binding)
- end
@@ -22,24 +20,17 @@ Index: ruby-thin/lib/thin/controllers/service.rb
-
- sh "mkdir -p #{config_files_path}"
-
-- log ''
-- log "To configure thin to start at system boot:"
-- log "on RedHat like systems:"
-- log " sudo /sbin/chkconfig --level 345 #{NAME} on"
-- log "on Debian-like systems (Ubuntu):"
-- log " sudo /usr/sbin/update-rc.d -f #{NAME} defaults"
-- log "on Gentoo:"
-- log " sudo rc-update add #{NAME} default"
-- log ''
-- log "Then put your config files in #{config_files_path}"
+- log_info ''
+- log_info "To configure thin to start at system boot:"
+- log_info "on RedHat like systems:"
+- log_info " sudo /sbin/chkconfig --level 345 #{NAME} on"
+- log_info "on Debian-like systems (Ubuntu):"
+- log_info " sudo /usr/sbin/update-rc.d -f #{NAME} defaults"
+- log_info "on Gentoo:"
+- log_info " sudo rc-update add #{NAME} default"
+- log_info ''
+- log_info "Then put your config files in #{config_files_path}"
+ log ">> Thin service is already installed at #{INITD_PATH} by the debian package"
end
private
-@@ -72,4 +49,4 @@
- end
- end
- end
--end
-\ No newline at end of file
-+end
diff --git a/debian/patches/fix_hardening_FTBFS.patch b/debian/patches/fix_hardening_FTBFS.patch
deleted file mode 100644
index d21b67d..0000000
--- a/debian/patches/fix_hardening_FTBFS.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Use %s as a formatting string in VALIDATE_MAX_LENGTH to
- compile with -Werror=format-security for hardening purposes
-Bug-Debian: http://bugs.debian.org/676211
-Author: Ryan Niebur <ryan at debian.org>
-
-Index: thin/ext/thin_parser/thin.c
-===================================================================
---- thin.orig/ext/thin_parser/thin.c 2012-02-07 12:51:55.000000000 -0800
-+++ thin/ext/thin_parser/thin.c 2012-06-16 01:53:36.000000000 -0700
-@@ -47,7 +47,7 @@
- #define DEF_MAX_LENGTH(N,length) const size_t MAX_##N##_LENGTH = length; const char *MAX_##N##_LENGTH_ERR = "HTTP element " # N " is longer than the " # length " allowed length."
-
- /** Validates the max length of given input and throws an HttpParserError exception if over. */
--#define VALIDATE_MAX_LENGTH(len, N) if(len > MAX_##N##_LENGTH) { rb_raise(eHttpParserError, MAX_##N##_LENGTH_ERR); }
-+#define VALIDATE_MAX_LENGTH(len, N) if(len > MAX_##N##_LENGTH) { rb_raise(eHttpParserError, "%s", MAX_##N##_LENGTH_ERR); }
-
- /** Defines global strings in the init method. */
- #define DEF_GLOBAL(N, val) global_##N = rb_obj_freeze(rb_str_new2(val)); rb_global_variable(&global_##N)
diff --git a/debian/patches/fix_require_path_for_thin_parser.patch b/debian/patches/fix_require_path_for_thin_parser.patch
deleted file mode 100644
index 2edb810..0000000
--- a/debian/patches/fix_require_path_for_thin_parser.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Subject: Fix require path for thin_parser due to Debian installation path
-
-* lib/thin.rb: Use standard search path rules for thin_parser.
-
-Author: Laurent Arnoud <laurent at spkdev.net>, Christian Hofstaedtler <zeha at debian.org>
-Forwarded: not-needed
-Last-Update: 2014-02-26
-Index: ruby-thin/lib/thin.rb
-===================================================================
---- ruby-thin.orig/lib/thin.rb 2012-01-10 00:56:06.000000000 -0800
-+++ ruby-thin/lib/thin.rb 2012-01-10 01:06:12.000000000 -0800
-@@ -6,6 +6,7 @@
- require 'openssl'
- require 'eventmachine'
- require 'rack'
-+require 'rbconfig'
-
- module Thin
- ROOT = File.expand_path(File.dirname(__FILE__))
-@@ -38,7 +39,7 @@
- require "#{Thin::ROOT}/thin/version"
- require "#{Thin::ROOT}/thin/statuses"
- require "#{Thin::ROOT}/rack/adapter/loader"
--require "#{Thin::ROOT}/thin_parser"
-+require "thin_parser"
-
- module Rack
- module Adapter
diff --git a/debian/patches/series b/debian/patches/series
index 5b587ff..7ab0f89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
fix-init-script
dont-allow-install
-fix_require_path_for_thin_parser.patch
-fix_hardening_FTBFS.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/thin.git
More information about the Pkg-ruby-extras-commits
mailing list