This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit 96e1519634d7d13876968395cc5014480f8f9fa2
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Thu Sep 21 00:39:09 2017 +0200
patches/hurd-i386/local-no_unsupported_ioctls.diff: New patch
---
debian/changelog | 1 +
.../hurd-i386/local-no_unsupported_ioctls.diff | 63 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 65 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index dd09bda..d0d9ac6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ glibc (2.24-18) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* libc0.3.symbols.hurd-i386: Update with proc_set/get_exe RPCs.
* patches/hurd-i386/tg-hurdsig-SA_SIGINFO.diff: Always define SA_SIGINFO.
+ * patches/hurd-i386/local-no_unsupported_ioctls.diff: New patch.
-- Aurelien Jarno <aure...@debian.org> Sat, 26 Aug 2017 11:11:58 +0200
diff --git a/debian/patches/hurd-i386/local-no_unsupported_ioctls.diff
b/debian/patches/hurd-i386/local-no_unsupported_ioctls.diff
new file mode 100644
index 0000000..fbf83c1
--- /dev/null
+++ b/debian/patches/hurd-i386/local-no_unsupported_ioctls.diff
@@ -0,0 +1,63 @@
+These ioctls are not actually supported (and will probably not be in the
+close future), and are not available on Linux either, so don't expose
+them to application at the risk of them complaining that they don't work
+(e.g. xterm using TIOCLSET).
+
+---
+ sysdeps/mach/hurd/bits/ioctls.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/sysdeps/mach/hurd/bits/ioctls.h
++++ b/sysdeps/mach/hurd/bits/ioctls.h
+@@ -272,11 +272,13 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_
+ #define FIOSETOWN _IOW('f', 124, int) /* set owner */
+ #define FIOGETOWN _IOR('f', 123, int) /* get owner */
+
++#if 0
+ /* socket i/o controls */
+ #define SIOCSHIWAT _IOW('s', 0, int) /* set high
watermark */
+ #define SIOCGHIWAT _IOR('s', 1, int) /* get high
watermark */
+ #define SIOCSLOWAT _IOW('s', 2, int) /* set low
watermark */
+ #define SIOCGLOWAT _IOR('s', 3, int) /* get low
watermark */
++#endif
+ #define SIOCATMARK _IOR('s', 7, int) /* at oob mark?
*/
+ #define SIOCSPGRP _IOW('s', 8, int) /* set process
group */
+ #define SIOCGPGRP _IOR('s', 9, int) /* get process
group */
+@@ -336,7 +338,9 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_
+ # define OTIOCGETD _IOR('t', 0, int) /* get line discipline */
+ # define OTIOCSETD _IOW('t', 1, int) /* set line discipline */
+ #endif
++#if 0
+ #define TIOCHPCL _IO('t', 2) /* hang up on last
close */
++#endif
+ #define TIOCGETP _IOR('t', 8,struct sgttyb)/* get parameters --
gtty */
+ #define TIOCSETP _IOW('t', 9,struct sgttyb)/* set parameters --
stty */
+ #define TIOCSETN _IOW('t',10,struct sgttyb)/* as above, but no
flushtty*/
+@@ -389,10 +393,12 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_
+ #define PENDIN 0x20000000 /* tp->t_rawq needs
reread */
+ #define DECCTQ 0x40000000 /* only ^Q starts after
^S */
+ #define NOFLSH 0x80000000 /* no output flush on
signal */
++#if 0
+ #define TIOCLBIS _IOW('t', 127, int) /* bis local mode bits
*/
+ #define TIOCLBIC _IOW('t', 126, int) /* bic local mode bits
*/
+ #define TIOCLSET _IOW('t', 125, int) /* set entire local
mode word */
+ #define TIOCLGET _IOR('t', 124, int) /* get local modes */
++#endif
+ #define LCRTBS (CRTBS>>16)
+ #define LPRTERA (PRTERA>>16)
+ #define LCRTERA (CRTERA>>16)
+@@ -408,12 +414,14 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_
+ #define LPENDIN (PENDIN>>16)
+ #define LDECCTQ (DECCTQ>>16)
+ #define LNOFLSH (NOFLSH>>16)
++#if 0
+ #define TIOCSLTC _IOW('t',117,struct ltchars)/* set local
special chars*/
+ #define TIOCGLTC _IOR('t',116,struct ltchars)/* get local
special chars*/
+ #define OTIOCCONS _IO('t', 98) /* for hp300 -- sans int arg */
+ #define OTTYDISC 0
+ #define NETLDISC 1
+ #define NTTYDISC 2
++#endif
+
+ /* From 4.4 <sys/ttydev.h>. */
+ #ifdef USE_OLD_TTY
diff --git a/debian/patches/series b/debian/patches/series
index 6b23294..1225c75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -145,6 +145,7 @@ hurd-i386/tg-magic-pid.diff
hurd-i386/tg-mlockall.diff
hurd-i386/cvs-truncate64.diff
hurd-i386/cvs-send-recv-posix.diff
+hurd-i386/local-no_unsupported_ioctls.diff
i386/local-biarch.diff
i386/local-cmov.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
