me/guix
Archived
1
0
Fork 0
Code Activity

gnu: patch: Update to 2.7.6.

Browse source 
* gnu/packages/base.scm (patch): Update to 2.7.6.
* gnu/packages/patches/patch-hurd-path-max.patch: Adjust to upstream changes.
This commit is contained in:
Marius Bakke 2018-03-14 22:00:05 +01:00
parent 7473319524
commit ec07ba1ff7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/base.scm
View file

@ -217,14 +217,14 @@ standard utility.")
(define-public patch (define-public patch
(package (package
(name "patch") (name "patch")
(version "2.7.5") (version "2.7.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/patch/patch-" (uri (string-append "mirror://gnu/patch/patch-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx")) "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"))
(patches (search-patches "patch-hurd-path-max.patch")))) (patches (search-patches "patch-hurd-path-max.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("ed" ,ed))) (native-inputs `(("ed" ,ed)))

15
gnu/packages/patches/patch-hurd-path-max.patch
View file

@ -13,7 +13,7 @@ Subject: [PATCH] Do not rely on PATH_MAX when reading a symlink target.
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/util.c b/src/util.c diff --git a/src/util.c b/src/util.c
index 82a7e37..c4c0f9d 100644 index 1cc08ba..67dbd3a 100644
--- a/src/util.c --- a/src/util.c
+++ b/src/util.c +++ b/src/util.c
@@ -460,12 +460,12 @@ move_file (char const *from, bool *from_needs_removal, @@ -460,12 +460,12 @@ move_file (char const *from, bool *from_needs_removal,
@ -31,18 +31,19 @@ index 82a7e37..c4c0f9d 100644
size += i; size += i;
if (i != 0 || close (fd) != 0) if (i != 0 || close (fd) != 0)
read_fatal (); read_fatal ();
@@ -610,9 +610,9 @@ copy_file (char const *from, char const *to, struct stat *tost, @@ -610,10 +610,10 @@ copy_file (char const *from, char const *to, struct stat *tost,
if (S_ISLNK (mode)) if (S_ISLNK (mode))
{ {
- char *buffer = xmalloc (PATH_MAX); - char *buffer = xmalloc (PATH_MAX + 1);
+ char *buffer = xmalloc (tost->st_size + 1); + char *buffer = xmalloc (tost->st_size + 1);
ssize_t r;
- if (safe_readlink (from, buffer, PATH_MAX) < 0) - if ((r = safe_readlink (from, buffer, PATH_MAX)) < 0)
+ if (safe_readlink (from, buffer, tost->st_size) < 0) + if ((r = safe_readlink (from, buffer, tost->st_size)) < 0)
pfatal ("Can't read %s %s", "symbolic link", from); pfatal ("Can't read %s %s", "symbolic link", from);
buffer[r] = '\0';
if (safe_symlink (buffer, to) != 0) if (safe_symlink (buffer, to) != 0)
pfatal ("Can't create %s %s", "symbolic link", to);
-- --
2.4.2 2.16.2