From: Sree Harsha Totakura <sreeharsha@totakura.in>
To: guix-devel@gnu.org
Subject: [PATCH] gnu: curl, gnurl: Fix failing testcase 172.
Date: Tue, 11 Feb 2014 19:17:33 +0100 [thread overview]
Message-ID: <1392142653-15612-1-git-send-email-sreeharsha@totakura.in> (raw)
In-Reply-To: <52F9F5E8.9050701@totakura.in>
* gnu/packages/patches/curl-fix-test172.patch: New file.
* gnu-system.am (dist_patch_DATA): Add the patch file.
* gnu/packages/gnunet.scm (gnurl): Apply the patch file.
* gnu/packages/curl.scm (curl): Apply the patch file.
---
gnu-system.am | 1 +
gnu/packages/curl.scm | 7 ++++++-
gnu/packages/gnunet.scm | 5 ++++-
gnu/packages/patches/curl-fix-test172.patch | 13 +++++++++++++
4 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 gnu/packages/patches/curl-fix-test172.patch
diff --git a/gnu-system.am b/gnu-system.am
index 3e9108c..8229cf0 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -242,6 +242,7 @@ dist_patch_DATA = \
gnu/packages/patches/cdparanoia-fpic.patch \
gnu/packages/patches/cmake-fix-tests.patch \
gnu/packages/patches/cpio-gets-undeclared.patch \
+ gnu/packages/patches/curl-fix-test172.patch \
gnu/packages/patches/dbus-localstatedir.patch \
gnu/packages/patches/diffutils-gets-undeclared.patch \
gnu/packages/patches/dmd-getpw.patch \
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 7072ed3..a9bfa76 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -22,6 +22,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages gnutls)
#:use-module (gnu packages groff)
@@ -42,7 +43,11 @@
version ".tar.lzma"))
(sha256
(base32
- "13bhfs41yf60ys2hrikqxjwfzaj0gm91kqzsgc5fr4grzmpm38nx"))))
+ "13bhfs41yf60ys2hrikqxjwfzaj0gm91kqzsgc5fr4grzmpm38nx"))
+ (patches
+ ;; This patch fixes testcase 172 which uses a hardcoded cookie
+ ;; expiration value which is expired as of Feb 1, 2014.
+ (list (search-patch "curl-fix-test172.patch")))))
(build-system gnu-build-system)
(inputs `(("gnutls" ,gnutls)
("gss" ,gss)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 1529f96..f3448a7 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -144,7 +144,10 @@ and support for SSL3 and TLS.")
version ".tar.bz2"))
(sha256
(base32
- "0kpi9wx9lg938b982smjg54acdwswdshs2bzf10sj5r6zmb05ygp"))))
+ "0kpi9wx9lg938b982smjg54acdwswdshs2bzf10sj5r6zmb05ygp"))
+ ;; This patch fixes testcase 172 which uses a hardcoded cookie
+ ;; expiration value which is expired as of Feb 1, 2014.
+ (patches (list (search-patch "curl-fix-test172.patch")))))
(build-system gnu-build-system)
(inputs `(("gnutls" ,gnutls)
("libidn" ,libidn)
diff --git a/gnu/packages/patches/curl-fix-test172.patch b/gnu/packages/patches/curl-fix-test172.patch
new file mode 100644
index 0000000..8f1637f
--- /dev/null
+++ b/gnu/packages/patches/curl-fix-test172.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/data/test172 b/tests/data/test172
+index b3efae9..3d53418 100644
+--- a/tests/data/test172
++++ b/tests/data/test172
+@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
+
+ .%HOSTIP TRUE /silly/ FALSE 0 ismatch this
+ .%HOSTIP TRUE / FALSE 0 partmatch present
+-%HOSTIP FALSE /we/want/ FALSE 1391252187 nodomain value
++%HOSTIP FALSE /we/want/ FALSE 2139150993 nodomain value
+ </file>
+ </client>
+
--
1.7.10.4
next prev parent reply other threads:[~2014-02-11 18:18 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-30 16:36 Gnunet-0.10.0 recipe Sree Harsha Totakura
2014-01-30 16:37 ` [PATCH 1/2] gnu: gnunet: Remove Gstreamer dependency Sree Harsha Totakura
2014-01-30 16:37 ` [PATCH 2/2] gnu: gnunet: Add gnunet-0.10.0 Sree Harsha Totakura
2014-01-30 21:11 ` Ludovic Courtès
2014-01-30 22:41 ` [PATCH] gnu: gnunet: Add GNUnet-0.10.0 Sree Harsha Totakura
2014-02-10 22:04 ` [PATCH 1/2] gnu: gnunet: Remove Gstreamer dependency Ludovic Courtès
2014-01-30 22:39 ` Gnunet-0.10.0 recipe Andreas Enge
2014-01-30 22:56 ` Sree Harsha Totakura
2014-01-30 23:33 ` Sree Harsha Totakura
2014-01-30 23:33 ` [PATCH] gnu: gnunet: Add GNUnet-0.10.0 Sree Harsha Totakura
2014-01-31 16:17 ` Mark H Weaver
2014-02-02 18:28 ` Ludovic Courtès
2014-02-10 22:15 ` Ludovic Courtès
2014-02-10 22:33 ` Andreas Enge
2014-02-11 8:05 ` Ludovic Courtès
2014-02-11 8:25 ` Andreas Enge
2014-02-11 14:11 ` Andreas Enge
2014-02-11 10:05 ` Sree Harsha Totakura
2014-02-11 10:10 ` Andreas Enge
2014-02-11 10:47 ` Ludovic Courtès
2014-02-11 18:17 ` Sree Harsha Totakura [this message]
2014-02-11 19:00 ` [PATCH] gnu: curl, gnurl: Fix failing testcase 172 Andreas Enge
2014-01-31 8:54 ` Gnunet-0.10.0 recipe Andreas Enge
2014-02-03 22:17 ` Andreas Enge
2014-02-03 23:00 ` Ludovic Courtès
2014-02-05 17:27 ` Andreas Enge
2014-02-11 20:49 ` Andreas Enge
2014-02-11 22:17 ` Sree Harsha Totakura
2014-02-12 15:15 ` (unknown), Sree Harsha Totakura
2014-02-12 15:15 ` [PATCH] gnu: gnunet: Fix failing testcases Sree Harsha Totakura
2014-02-12 17:37 ` Ludovic Courtès
2014-02-12 17:36 ` none Ludovic Courtès
2014-02-12 17:38 ` none Sree Harsha Totakura
2014-02-12 19:25 ` none Andreas Enge
2014-02-12 20:30 ` none Ludovic Courtès
2014-02-12 20:53 ` none Andreas Enge
2014-02-04 0:18 ` Gnunet-0.10.0 recipe Sree Harsha Totakura
2014-01-31 16:05 ` Ludovic Courtès
2014-02-03 22:19 ` Andreas Enge
2014-02-03 22:57 ` Ludovic Courtès
2014-02-04 0:21 ` Sree Harsha Totakura
2014-02-04 8:06 ` Christian Grothoff
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=1392142653-15612-1-git-send-email-sreeharsha@totakura.in \
--to=sreeharsha@totakura.in \
--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).