tags 675454 + patch tags 675454 + pending thanks Dear maintainer,
I've prepared an NMU for pvm (versioned as 3.4.5-12.5) and uploaded it to DELAYED/4. Please feel free to tell me if I should delay it longer. Regards. Samuel
diff -u pvm-3.4.5/debian/changelog pvm-3.4.5/debian/changelog --- pvm-3.4.5/debian/changelog +++ pvm-3.4.5/debian/changelog @@ -1,3 +1,10 @@ +pvm (3.4.5-12.5) unstable; urgency=low + + * Non-maintainer upload. + * Fix 22-fix_FTBFS4hurd.patch (Closes: #675454). + + -- Samuel Thibault <[email protected]> Sun, 17 Jun 2012 01:29:03 +0200 + pvm (3.4.5-12.4) unstable; urgency=low * Non-maintainer upload. diff -u pvm-3.4.5/debian/patches/22-fix_FTBFS4hurd.patch pvm-3.4.5/debian/patches/22-fix_FTBFS4hurd.patch --- pvm-3.4.5/debian/patches/22-fix_FTBFS4hurd.patch +++ pvm-3.4.5/debian/patches/22-fix_FTBFS4hurd.patch @@ -1,8 +1,8 @@ -Index: pvm-3.4.5+nmu/src/pvmd.c +Index: pvm-3.4.5/src/pvmd.c =================================================================== ---- pvm-3.4.5+nmu.orig/src/pvmd.c 2011-08-19 21:06:13.000000000 +0000 -+++ pvm-3.4.5+nmu/src/pvmd.c 2011-08-19 21:22:43.000000000 +0000 -@@ -3836,7 +3836,8 @@ +--- pvm-3.4.5.orig/src/pvmd.c 2012-06-01 18:10:25.141905977 +0200 ++++ pvm-3.4.5/src/pvmd.c 2012-06-01 18:11:36.440407519 +0200 +@@ -3836,7 +3836,8 @@ forkexec(flags, name, argv, nenv, env, i int pid; /* task pid */ int pfd[2]; /* pipe back from task */ struct task *tp; /* new task context */ @@ -12,7 +12,7 @@ struct stat sb; char **ep, **eplist; int i; -@@ -3868,6 +3869,24 @@ +@@ -3868,10 +3869,28 @@ forkexec(flags, name, argv, nenv, env, i eplist = CINDEX(name, '/') ? nullep : epaths; for (ep = eplist; *ep; ep++) { @@ -37,7 +37,12 @@ (void)strcpy(path, *ep); if (path[0]) (void)strcat(path, "/"); -@@ -3939,12 +3958,14 @@ +- (void)strncat(path, name, sizeof(path) - strlen(path) - 1); ++ (void)strcat(path, name); + #ifdef IMA_OS2 + (void)strcat(path,".exe"); /* no *.cmd !!! */ + #endif +@@ -3939,12 +3958,14 @@ forkexec(flags, name, argv, nenv, env, i if (socketpair(AF_UNIX, SOCK_STREAM, 0, pfd) == -1) { pvmlogperror("forkexec() socketpair"); task_free(tp); @@ -52,7 +57,7 @@ return PvmOutOfRes; } #endif -@@ -4077,6 +4098,7 @@ +@@ -4077,6 +4098,7 @@ forkexec(flags, name, argv, nenv, env, i (void)close(pfd[0]); (void)close(pfd[1]); task_free(tp); @@ -60,7 +65,7 @@ return PvmOutOfRes; } (void)close(pfd[1]); -@@ -4094,12 +4116,14 @@ +@@ -4094,12 +4116,14 @@ forkexec(flags, name, argv, nenv, env, i tp->t_a_out = STRALLOC(name); *tpp = tp;
