[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/13] gnu: subversion: Propagate env variables to hooks.
From: |
Eric Bavier |
Subject: |
[PATCH 01/13] gnu: subversion: Propagate env variables to hooks. |
Date: |
Thu, 20 Nov 2014 23:40:56 -0600 |
* gnu/packages/patches/subversion-propagate-env-to-hooks.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/version-control.scm (subversion): Use it.
---
gnu-system.am | 1 +
.../subversion-propagate-env-to-hooks.patch | 14 ++++++++++++++
gnu/packages/version-control.scm | 8 +++++---
3 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 gnu/packages/patches/subversion-propagate-env-to-hooks.patch
diff --git a/gnu-system.am b/gnu-system.am
index d39d869..5fd18e8 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -418,6 +418,7 @@ dist_patch_DATA =
\
gnu/packages/patches/soprano-find-clucene.patch \
gnu/packages/patches/source-highlight-regexrange-test.patch \
gnu/packages/patches/sqlite-large-page-size-fix.patch \
+ gnu/packages/patches/subversion-propagate-env-to-hooks.patch \
gnu/packages/patches/superlu-dist-scotchmetis.patch \
gnu/packages/patches/tcsh-fix-autotest.patch \
gnu/packages/patches/teckit-cstdio.patch \
diff --git a/gnu/packages/patches/subversion-propagate-env-to-hooks.patch
b/gnu/packages/patches/subversion-propagate-env-to-hooks.patch
new file mode 100644
index 0000000..55cecab
--- /dev/null
+++ b/gnu/packages/patches/subversion-propagate-env-to-hooks.patch
@@ -0,0 +1,14 @@
+* Hooks need to inherit environment variables such as PATH, otherwise simple
+ things like `ls` might fail in a hook.
+
+--- subversion-1.7.18/subversion/libsvn_repos/hooks.c 2011-07-26
11:48:50.000000000 -0500
++++ subversion-1.7.18/subversion/libsvn_repos/hooks.c 2014-09-27
11:53:37.444830624 -0500
+@@ -196,7 +196,7 @@
+ (apr_err, _("Can't create null stdout for hook '%s'"), cmd);
+ }
+
+- err = svn_io_start_cmd2(&cmd_proc, ".", cmd, args, FALSE,
++ err = svn_io_start_cmd2(&cmd_proc, ".", cmd, args, TRUE,
+ FALSE, stdin_handle, result != NULL, null_handle,
+ TRUE, NULL, pool);
+
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 0b52f0c..5d2eb58 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -297,11 +297,13 @@ property manipulation.")
(version "1.7.18")
(source (origin
(method url-fetch)
- (uri (string-append
"http://archive.apache.org/dist/subversion/subversion-"
- version ".tar.bz2"))
+ (uri (string-append "http://archive.apache.org/dist/subversion/"
+ "subversion-" version ".tar.bz2"))
(sha256
(base32
- "06nrqnn3qq1hhskkcdbm0ilk2xv6ay2gyf2c7qvxp6xncb782wzn"))))
+ "06nrqnn3qq1hhskkcdbm0ilk2xv6ay2gyf2c7qvxp6xncb782wzn"))
+ (patches
+ (list (search-patch
"subversion-propagate-env-to-hooks.patch")))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-after
--
1.7.9.5
- [PATCH 00/13] Add gourmet (and dependent python packages), Eric Bavier, 2014/11/21
- [PATCH 01/13] gnu: subversion: Propagate env variables to hooks.,
Eric Bavier <=
- Re: [PATCH 01/13] gnu: subversion: Propagate env variables to hooks., Ludovic Courtès, 2014/11/21
- Re: [PATCH 01/13] gnu: subversion: Propagate env variables to hooks., Eric Bavier, 2014/11/21
- Re: [PATCH 01/13] gnu: subversion: Propagate env variables to hooks., Eric Bavier, 2014/11/22
- Re: [PATCH 01/13] gnu: subversion: Propagate env variables to hooks., Ludovic Courtès, 2014/11/22
- Re: [PATCH 01/13] gnu: subversion: Propagate env variables to hooks., Eric Bavier, 2014/11/25
- Re: [PATCH 01/13] gnu: subversion: Propagate env variables to hooks., Ludovic Courtès, 2014/11/25
- Re: [PATCH 01/13] gnu: subversion: Propagate env variables to hooks., Eric Bavier, 2014/11/25
- Re: [PATCH 01/13] gnu: subversion: Propagate env variables to hooks., Ludovic Courtès, 2014/11/25
[PATCH 03/13] gnu: Add python-sqlalchemy., Eric Bavier, 2014/11/21