From: Eric Bavier <ericbavier@gmail.com>
To: guix-devel@gnu.org
Cc: Eric Bavier <bavier@member.fsf.org>
Subject: [PATCH 01/13] gnu: subversion: Propagate env variables to hooks.
Date: Thu, 20 Nov 2014 23:40:56 -0600 [thread overview]
Message-ID: <1416548468-28421-2-git-send-email-bavier@member.fsf.org> (raw)
In-Reply-To: <1416548468-28421-1-git-send-email-bavier@member.fsf.org>
* 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
next prev parent reply other threads:[~2014-11-21 5:40 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-21 5:40 [PATCH 00/13] Add gourmet (and dependent python packages) Eric Bavier
2014-11-21 5:40 ` Eric Bavier [this message]
2014-11-21 22:02 ` [PATCH 01/13] gnu: subversion: Propagate env variables to hooks Ludovic Courtès
2014-11-21 22:24 ` Eric Bavier
2014-11-22 5:15 ` Eric Bavier
2014-11-22 11:02 ` Ludovic Courtès
2014-11-25 5:42 ` Eric Bavier
2014-11-25 8:03 ` Ludovic Courtès
2014-11-25 16:51 ` Eric Bavier
2014-11-25 17:09 ` Ludovic Courtès
2014-11-21 5:40 ` [PATCH 02/13] gnu: python: Add sqlite input Eric Bavier
2014-11-21 9:28 ` Ludovic Courtès
2014-11-21 13:11 ` Eric Bavier
2014-11-21 5:40 ` [PATCH 03/13] gnu: Add python-sqlalchemy Eric Bavier
2014-11-21 22:03 ` Ludovic Courtès
2014-11-21 5:40 ` [PATCH 04/13] gnu: Export symbols in (gnu packages image) upfront Eric Bavier
2014-11-21 5:41 ` [PATCH 05/13] gnu: Export ghostscript module symbols up-front Eric Bavier
2014-11-21 22:04 ` Ludovic Courtès
2014-11-21 22:27 ` Eric Bavier
2014-11-21 5:41 ` [PATCH 06/13] gnu: Add python-pillow Eric Bavier
2014-11-21 22:05 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 07/13] gnu: Add python-distutils-extra Eric Bavier
2014-11-21 22:07 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 08/13] gnu: Add python-elib.intl Eric Bavier
2014-11-21 22:06 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 09/13] guix: Add MPL1.1 license Eric Bavier
2014-11-21 22:08 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 10/13] gnu: Add python-pycairo Eric Bavier
2014-11-21 22:11 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 11/13] gnu: Add python-pygobject Eric Bavier
2014-11-21 22:12 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 12/13] gnu: Add python2-pygtk Eric Bavier
2014-11-21 22:10 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 13/13] gnu: Add gourmet Eric Bavier
2014-11-21 22:13 ` Ludovic Courtès
2014-11-21 9:21 ` [PATCH 00/13] Add gourmet (and dependent python packages) Andreas Enge
2014-11-21 21:27 ` Ludovic Courtès
2014-12-02 3:09 ` Eric Bavier
2014-12-02 8:33 ` Ludovic Courtès
2014-12-02 10:56 ` Andreas Enge
2014-12-02 12:49 ` Ludovic Courtès
2014-12-02 20:05 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416548468-28421-2-git-send-email-bavier@member.fsf.org \
--to=ericbavier@gmail.com \
--cc=bavier@member.fsf.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).