← Back to branch summary

~ubuntu-branches/ubuntu/hardy/lighttpd/hardy

« back to all changes in this revision

Viewing changes to debian/patches/01_use_bin_sh.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Jeremie Corbier
  • Date: 2006-09-22 19:16:08 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060922191608-i9jngvf1wtf3j5rd
Tags: 1.4.12~20060907-1ubuntu1
Merge from debian unstable:
-> Keep the additional dependency on libterm-readline-perl-perl.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_use_bin_sh.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 01_use_bin_sh.dpatch by Torsten Marek <shlomme@gmx.net>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: Use /bin/sh to execute external programs instead of getting
6
 
## DP: the shell from $SHELL (See ticket #388)
7
 
 
8
 
@DPATCH@
9
 
diff -urNad lighttpd-1.4.8~/src/proc_open.c lighttpd-1.4.8/src/proc_open.c
10
 
--- lighttpd-1.4.8~/src/proc_open.c     2005-08-11 00:26:39.000000000 +0200
11
 
+++ lighttpd-1.4.8/src/proc_open.c      2005-11-26 12:12:02.000000000 +0100
12
 
@@ -223,12 +223,13 @@
13
 
 /* {{{ proc_open */
14
 
 int proc_open(proc_handler_t *proc, const char *command) {
15
 
        pid_t child;
16
 
-       const char *shell;
17
 
+       const char *shell = "/bin/sh";
18
 
 
19
 
-       if (NULL == (shell = getenv(SHELLENV))) {
20
 
+/*     if (NULL == (shell = getenv(SHELLENV))) {
21
 
                fprintf(stderr, "env %s is required", SHELLENV);
22
 
                return -1;
23
 
        }
24
 
+*/
25
 
 
26
 
        if (proc_open_pipes(proc) != 0) {
27
 
                return -1;