[DRE-commits] [ruby-passenger] 05/11: drop fix_ftbfs_fortify_source.patch, applied upstream

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-passenger.

commit 932e24ee0f2ab29faa9e3dd286ce32f9ea7aa7c6
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jan 16 14:36:22 2014 +0100

    drop fix_ftbfs_fortify_source.patch, applied upstream
---
 debian/changelog                              |  2 ++
 debian/patches/fix_ftbfs_fortify_source.patch | 14 --------------
 debian/patches/series                         |  1 -
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16edadd..15c8676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ruby-passenger (4.0.35-1) unstable; urgency=low
   * Imported Upstream version 4.0.35
   * Drop rubygems from Depends since it is shipped by Ruby1.9+
   * Bump Standards-Version to 3.9.5 (no changes needed)
+  * debian/patches:
+    - drop fix_ftbfs_fortify_source.patch, applied upstream
 
  -- Cédric Boutillier <boutil at debian.org>  Thu, 16 Jan 2014 12:53:56 +0100
 
diff --git a/debian/patches/fix_ftbfs_fortify_source.patch b/debian/patches/fix_ftbfs_fortify_source.patch
deleted file mode 100644
index 3e50a0f..0000000
--- a/debian/patches/fix_ftbfs_fortify_source.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix FTBFS with -D_FORTIFY_SOURCE=2
-Author: Felix Geyer <fgeyer at debian.org>
-
---- ruby-passenger-4.0.20.orig/ext/common/agents/TempDirToucher.c
-+++ ruby-passenger-4.0.20/ext/common/agents/TempDirToucher.c
-@@ -113,7 +113,7 @@ initialize(int argc, char *argv[]) {
- 	parseArguments(argc, argv);
- 
- 	if (logFile != NULL) {
--		fd = open(logFile, O_WRONLY | O_APPEND | O_CREAT);
-+		fd = open(logFile, O_WRONLY | O_APPEND | O_CREAT, 0644);
- 		if (fd == -1) {
- 			e = errno;
- 			fprintf(stderr, ERROR_PREFIX
diff --git a/debian/patches/series b/debian/patches/series
index dc88126..98027a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix_install_path.patch
 no_jsoncpp.patch
-fix_ftbfs_fortify_source.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-passenger.git