[DRE-commits] [ruby-passenger] 06/11: Add fix_ftbfs_fortify_source.patch.

Felix Geyer fgeyer at moszumanska.debian.org
Sat Nov 23 10:22:06 UTC 2013


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

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

commit b9cb2f7cddd4db7ca2ed749d019d39ad196843da
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Nov 22 18:55:08 2013 +0100

    Add fix_ftbfs_fortify_source.patch.
---
 debian/changelog                              |  1 +
 debian/patches/fix_ftbfs_fortify_source.patch | 14 ++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a5914f7..878e647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ruby-passenger (4.0.20-1) UNRELEASED; urgency=low
   * New upstream release.
   * Refresh fix_install_path.patch.
   * Build for Ruby 2.0 instead of 1.8.
+  * Add fix_ftbfs_fortify_source.patch.
 
  -- Felix Geyer <fgeyer at debian.org>  Thu, 10 Oct 2013 23:06:56 +0200
 
diff --git a/debian/patches/fix_ftbfs_fortify_source.patch b/debian/patches/fix_ftbfs_fortify_source.patch
new file mode 100644
index 0000000..3e50a0f
--- /dev/null
+++ b/debian/patches/fix_ftbfs_fortify_source.patch
@@ -0,0 +1,14 @@
+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 98027a8..dc88126 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 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



More information about the Pkg-ruby-extras-commits mailing list