Refresh our patches

debian/patches/Fix-typos-and-inconsistencies-in-doxygen2man-help-text.patch

@@ -7,10 +7,10 @@ Subject: Fix typos and inconsistencies in doxygen2man help text
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/doxygen2man/doxygen2man.c b/doxygen2man/doxygen2man.c
-index 73f705d..903c09d 100644
+index 3dab47d..1405676 100644
 --- a/doxygen2man/doxygen2man.c
 +++ b/doxygen2man/doxygen2man.c
-@@ -1187,7 +1187,7 @@ static void usage(char *name)
+@@ -1191,7 +1191,7 @@ static void usage(char *name)
  	printf(" using the name of the generated .xml file. This file will usually be called\n");
  	printf(" something like <include-file>_8h.xml, eg qbipcs_8h.xml\n");
  	printf("\n");
@@ -19,7 +19,7 @@ index 73f705d..903c09d 100644
  	printf(" would do with any other man page.\n");
  	printf("\n");
  	printf("       -a            Print ASCII dump of man pages to stdout\n");
-@@ -1195,18 +1195,18 @@ static void usage(char *name)
+@@ -1199,18 +1199,18 @@ static void usage(char *name)
  	printf("       -P            Print PARAMS section\n");
  	printf("       -g            Print general man page for the whole header file\n");
  	printf("       -c            Use the Copyright date from the header file (if one can be found)\n");

debian/patches/hurd-dev-shm-is-a-tmpfs-here-as-well.patch

@@ -12,10 +12,10 @@ Signed-off-by: Ferenc Wágner <wferi@debian.org>
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/lib/ipc_setup.c b/lib/ipc_setup.c
-index 0ef9bb6..ff1d57f 100644
+index 0de7115..2230723 100644
 --- a/lib/ipc_setup.c
 +++ b/lib/ipc_setup.c
-@@ -666,7 +666,7 @@ handle_new_connection(struct qb_ipcs_service *s,
+@@ -676,7 +676,7 @@ handle_new_connection(struct qb_ipcs_service *s,
  
  	memset(&response, 0, sizeof(response));
  
@@ -24,7 +24,7 @@ index 0ef9bb6..ff1d57f 100644
  	desc_len = snprintf(c->description, CONNECTION_DESCRIPTION - sizeof suffix,
  			    "/dev/shm/qb-%d-%d-%d-XXXXXX", s->pid, ugp->pid, c->setup.u.us.sock);
  	if (desc_len < 0) {
-@@ -927,7 +927,7 @@ retry_accept:
+@@ -937,7 +937,7 @@ retry_accept:
  
  void remove_tempdir(const char *name)
  {
@@ -34,7 +34,7 @@ index 0ef9bb6..ff1d57f 100644
  	char *slash = strrchr(name, '/');
  
 diff --git a/lib/unix.c b/lib/unix.c
-index f59cd0b..b1e4952 100644
+index 6bd3cc2..6a06410 100644
 --- a/lib/unix.c
 +++ b/lib/unix.c
 @@ -126,7 +126,7 @@ qb_sys_mmap_file_open(char *path, const char *file, size_t bytes,

debian/patches/hurd-the-socket-tests-are-expected-to-fail.patch

@@ -7,10 +7,10 @@ Subject: hurd: the socket tests are expected to fail
  1 file changed, 25 insertions(+), 18 deletions(-)
 
 diff --git a/tests/check_ipc.c b/tests/check_ipc.c
-index f430f4b..c0b96d6 100644
+index f847bb1..30ed19f 100644
 --- a/tests/check_ipc.c
 +++ b/tests/check_ipc.c
-@@ -2392,30 +2392,37 @@ make_soc_suite(void)
+@@ -2395,30 +2395,37 @@ make_soc_suite(void)
  	Suite *s = suite_create("socket");
  	TCase *tc;
  

debian/patches/tests-always-run-the-SHM-suite-just-expect-failures.patch

@@ -26,10 +26,10 @@ index 5f1f536..2347648 100644
 +
  #endif
 diff --git a/tests/check_ipc.c b/tests/check_ipc.c
-index 3aa4bfa..f430f4b 100644
+index aba1709..f847bb1 100644
 --- a/tests/check_ipc.c
 +++ b/tests/check_ipc.c
-@@ -2353,28 +2353,34 @@ make_shm_suite(void)
+@@ -2356,28 +2356,34 @@ make_shm_suite(void)
  	TCase *tc;
  	Suite *s = suite_create("shm");
  
@@ -49,7 +49,7 @@ index 3aa4bfa..f430f4b 100644
 -	add_tcase(s, tc, test_ipc_service_ref_count_shm, 9);
 -	add_tcase(s, tc, test_ipc_server_perms, 7);
 -	add_tcase(s, tc, test_ipc_stress_connections_shm, 3600 /* ? */);
--	add_tcase(s, tc, test_ipc_dispatch_shm_native_prio_dlock, 15);
+-	add_tcase(s, tc, test_ipc_disp_shm_native_prio_dlock, 15);
 +#undef  add_cond_tcase
 +#ifdef DISABLE_IPC_SHM
 +#define add_cond_tcase(func, timeout) add_tcase_xfail(s, tc, func, timeout)
@@ -72,10 +72,10 @@ index 3aa4bfa..f430f4b 100644
 +	add_cond_tcase(test_ipc_service_ref_count_shm, 9);
 +	add_cond_tcase(test_ipc_server_perms, 7);
 +	add_cond_tcase(test_ipc_stress_connections_shm, 3600 /* ? */);
-+	add_cond_tcase(test_ipc_dispatch_shm_native_prio_dlock, 15);
++	add_cond_tcase(test_ipc_disp_shm_native_prio_dlock, 15);
  #if HAVE_GLIB
--	add_tcase(s, tc, test_ipc_dispatch_shm_glib_prio_dlock, 15);
-+	add_cond_tcase(test_ipc_dispatch_shm_glib_prio_dlock, 15);
+-	add_tcase(s, tc, test_ipc_disp_shm_glib_prio_dlock, 15);
++	add_cond_tcase(test_ipc_disp_shm_glib_prio_dlock, 15);
  #endif
  #ifdef HAVE_FAILURE_INJECTION
 -	add_tcase(s, tc, test_ipcc_truncate_when_unlink_fails_shm, 8);
@@ -83,7 +83,7 @@ index 3aa4bfa..f430f4b 100644
  #endif
  
  	return s;
-@@ -2421,19 +2427,12 @@ main(void)
+@@ -2424,19 +2430,12 @@ main(void)
  	int32_t number_failed;
  	SRunner *sr;
  	Suite *s;