summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/bitlbee-fix-tests.patch33
-rw-r--r--gnu/packages/patches/bitlbee-memset-fix.patch15
-rw-r--r--gnu/packages/patches/dmd-getpw.patch19
-rw-r--r--gnu/packages/patches/dmd-tests-longer-sleeps.patch52
4 files changed, 0 insertions, 119 deletions
diff --git a/gnu/packages/patches/bitlbee-fix-tests.patch b/gnu/packages/patches/bitlbee-fix-tests.patch
deleted file mode 100644
index 52bb6c605d..0000000000
--- a/gnu/packages/patches/bitlbee-fix-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Pass the correct number of arguments to 'nick_strip' and 'nick_ok' in tests.
-
-Patch by Mark H Weaver <mhw@netris.org>.
-
---- bitlbee/tests/check_nick.c.orig 2013-11-27 17:54:54.000000000 -0500
-+++ bitlbee/tests/check_nick.c 2014-03-05 23:41:45.761230468 -0500
-@@ -30,7 +30,7 @@ START_TEST(test_nick_strip)
- for (i = 0; get[i]; i++) {
- char copy[60];
- strcpy(copy, get[i]);
-- nick_strip(copy);
-+ nick_strip(NULL, copy);
- fail_unless (strcmp(copy, expected[i]) == 0,
- "(%d) nick_strip broken: %s -> %s (expected: %s)",
- i, get[i], copy, expected[i]);
-@@ -45,7 +45,7 @@ START_TEST(test_nick_ok_ok)
- int i;
-
- for (i = 0; nicks[i]; i++) {
-- fail_unless (nick_ok(nicks[i]) == 1,
-+ fail_unless (nick_ok(NULL, nicks[i]) == 1,
- "nick_ok() failed: %s", nicks[i]);
- }
- }
-@@ -58,7 +58,7 @@ START_TEST(test_nick_ok_notok)
- int i;
-
- for (i = 0; nicks[i]; i++) {
-- fail_unless (nick_ok(nicks[i]) == 0,
-+ fail_unless (nick_ok(NULL, nicks[i]) == 0,
- "nick_ok() succeeded for invalid: %s", nicks[i]);
- }
- }
diff --git a/gnu/packages/patches/bitlbee-memset-fix.patch b/gnu/packages/patches/bitlbee-memset-fix.patch
deleted file mode 100644
index 1d801e0070..0000000000
--- a/gnu/packages/patches/bitlbee-memset-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix the size argument to 'memset'.
-
-Patch by Mark H Weaver <mhw@netris.org>.
-
---- bitlbee/lib/md5.c.orig 2013-11-27 17:54:54.000000000 -0500
-+++ bitlbee/lib/md5.c 2014-03-05 21:39:04.739746093 -0500
-@@ -159,7 +159,7 @@ void md5_finish(struct MD5Context *ctx,
- ctx->buf[2] = cvt32(ctx->buf[2]);
- ctx->buf[3] = cvt32(ctx->buf[3]);
- memcpy(digest, ctx->buf, 16);
-- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
-+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
- }
-
- void md5_finish_ascii(struct MD5Context *context, char *ascii)
diff --git a/gnu/packages/patches/dmd-getpw.patch b/gnu/packages/patches/dmd-getpw.patch
deleted file mode 100644
index c4f9c35951..0000000000
--- a/gnu/packages/patches/dmd-getpw.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-When bootstrapping and running as PID 1, /etc/{passwd,shadow} may be unavailable.
-Gracefully handle that.
-
-diff --git a/modules/dmd/support.scm b/modules/dmd/support.scm
-index 9b592c5..602e409 100644
---- a/modules/dmd/support.scm
-+++ b/modules/dmd/support.scm
-@@ -151,7 +151,10 @@ There is NO WARRANTY, to the extent permitted by law.")))
-
-
- ;; Home directory of the user.
--(define user-homedir (passwd:dir (getpwuid (getuid))))
-+(define user-homedir
-+ (or (false-if-exception (passwd:dir (getpwuid (getuid))))
-+ (getenv "HOME")
-+ "/"))
-
- ;; Logfile.
- (define default-logfile
diff --git a/gnu/packages/patches/dmd-tests-longer-sleeps.patch b/gnu/packages/patches/dmd-tests-longer-sleeps.patch
deleted file mode 100644
index 708000f351..0000000000
--- a/gnu/packages/patches/dmd-tests-longer-sleeps.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Increase sleep times in tests, for slower machines.
-
-Patch by Mark H Weaver <mhw@netris.org>.
-
---- dmd/tests/basic.sh 2013-11-30 17:22:00.000000000 -0500
-+++ dmd/tests/basic.sh 2014-02-16 02:18:34.036376953 -0500
-@@ -46,7 +46,7 @@
- dmd -I -s "$socket" -c "$conf" -l "$log" &
- dmd_pid=$!
-
--sleep 1 # XXX: wait till it's up
-+sleep 3 # XXX: wait till it's up
- kill -0 $dmd_pid
- test -S "$socket"
- $deco status dmd | grep -E '(Start.*dmd|Stop.*test)'
---- dmd/tests/respawn.sh 2013-12-01 16:50:37.000000000 -0500
-+++ dmd/tests/respawn.sh 2014-02-16 02:19:16.958251953 -0500
-@@ -39,7 +39,7 @@
- i=0
- while ! test -f "$1" && test $i -lt 20
- do
-- sleep 0.3
-+ sleep 1
- i=`expr $i + 1`
- done
- test -f "$1"
-@@ -65,14 +65,14 @@
- #:provides '(test1)
- #:start (make-forkexec-constructor
- "$SHELL" "-c"
-- "echo \$\$ > $service1_pid ; while true ; do sleep 1 ; done")
-+ "echo \$\$ > $service1_pid ; while true ; do sleep 3 ; done")
- #:stop (make-kill-destructor)
- #:respawn? #t)
- (make <service>
- #:provides '(test2)
- #:start (make-forkexec-constructor
- "$SHELL" "-c"
-- "echo \$\$ > $service2_pid ; while true ; do sleep 1 ; done")
-+ "echo \$\$ > $service2_pid ; while true ; do sleep 3 ; done")
- #:stop (make-kill-destructor)
- #:respawn? #t))
- (start 'test1)
-@@ -82,7 +82,7 @@
- dmd -I -s "$socket" -c "$conf" -l "$log" &
- dmd_pid=$!
-
--sleep 1 # XXX: wait till it's up
-+sleep 3 # XXX: wait till it's up
- kill -0 $dmd_pid
- test -S "$socket"
- $deco status test1 | grep started