hurd: Fix missing BSD macros after including termios.h then ioctl.h

  * debian/patches/hurd-i386/git-ioctls-bsd.diff

debian/changelog

@@ -10,6 +10,8 @@ glibc (2.37-13) UNRELEASED; urgency=medium
     interrupts.
   * debian/patches/hurd-i386/git-exec-intr.diff: Fix "invalid destination"
     errors during ghc builds.
+  * debian/patches/hurd-i386/git-ioctls-bsd.diff: Fix missing BSD macros after
+    including termios.h then ioctl.h
  -- Aurelien Jarno <aurel32@debian.org>  Thu, 12 Oct 2023 20:25:42 +0200

debian/patches/hurd-i386/git-ioctls-bsd.diff

+commit 2fb85a37874c09fb22cd069f7c3c7fd6d8eb2f8f
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Sat Dec 2 21:24:58 2023 +0100
+
+    hurd: [!__USE_MISC] Do not #undef BSD macros in ioctls
+    
+    When e.g. including termios.h first and then sys/ioctl.h, without e.g.
+    _BSD_SOURCE, the latter would #undef e.g. ECHO, without defining it.
+
+diff --git a/sysdeps/mach/hurd/bits/ioctls.h b/sysdeps/mach/hurd/bits/ioctls.h
+index 943d5e4287..1b2fd6b33f 100644
+--- a/sysdeps/mach/hurd/bits/ioctls.h
++++ b/sysdeps/mach/hurd/bits/ioctls.h
+@@ -25,6 +25,7 @@
+ /* These macros are also defined in <bits/termios.h> (with numerically
+    identical values) but this serves to shut up cpp's complaining. */
+ 
++#ifdef __USE_MISC
+ #ifdef NL0
+ # undef NL0
+ #endif
+@@ -82,6 +83,7 @@
+ #ifdef NOFLSH
+ # undef NOFLSH
+ #endif
++#endif
+ 
+ /* Hurd ioctl request are made up of several fields:
+ 

debian/patches/series

@@ -41,6 +41,7 @@ hurd-i386/git-main_stack.diff
 hurd-i386/git-statfs_f_ffree.patch
 hurd-i386/git-send_interrupt.diff
 hurd-i386/git-exec-intr.diff
+hurd-i386/git-ioctls-bsd.diff
 
 hurd-i386/local-enable-ldconfig.diff
 hurd-i386/tg-sysvshm.diff