[Glibc-bsd-commits] r5566 - in trunk/freebsd-libs/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-22 22:13:04 +0000 (Mon, 22 Sep 2014)
New Revision: 5566

Added:
   trunk/freebsd-libs/debian/patches/pty_decls.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/series
Log:
Match up libutil.h declarations of openpty, forkpty with those in
GNU libc pty.h, in case an application includes both (fixes FTBFS of
ruby2.1)


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2014-09-21 15:38:34 UTC (rev 5565)
+++ trunk/freebsd-libs/debian/changelog	2014-09-22 22:13:04 UTC (rev 5566)
@@ -1,3 +1,12 @@
+freebsd-libs (10.1~svn271690-2) UNRELEASED; urgency=medium
+
+  [ Steven Chamberlain ]
+  * Match up libutil.h declarations of openpty, forkpty with those in
+    GNU libc pty.h, in case an application includes both (fixes FTBFS of
+    ruby2.1)
+
+ -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Mon, 22 Sep 2014 23:11:27 +0100
+
 freebsd-libs (10.1~svn271690-1) experimental; urgency=medium
 
   [ Steven Chamberlain]

Added: trunk/freebsd-libs/debian/patches/pty_decls.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/pty_decls.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/pty_decls.diff	2014-09-22 22:13:04 UTC (rev 5566)
@@ -0,0 +1,20 @@
+--- a/lib/libutil/libutil.h
++++ b/lib/libutil/libutil.h
+@@ -94,7 +94,7 @@
+ int	extattr_string_to_namespace(const char *_string, int *_attrnamespace);
+ int	flopen(const char *_path, int _flags, ...);
+ int	forkpty(int *_amaster, char *_name,
+-	    struct termios *_termp, struct winsize *_winp);
++	    const struct termios *_termp, const struct winsize *_winp);
+ void	hexdump(const void *_ptr, int _length, const char *_hdr, int _flags);
+ int	humanize_number(char *_buf, size_t _len, int64_t _number,
+ 	    const char *_suffix, int _scale, int _flags);
+@@ -110,7 +110,7 @@
+ int	kld_load(const char *_name);
+ int	login_tty(int _fd);
+ int	openpty(int *_amaster, int *_aslave, char *_name,
+-	    struct termios *_termp, struct winsize *_winp);
++	    const struct termios *_termp, const struct winsize *_winp);
+ int	pidfile_close(struct pidfh *_pfh);
+ int	pidfile_fileno(const struct pidfh *_pfh);
+ struct pidfh *

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2014-09-21 15:38:34 UTC (rev 5565)
+++ trunk/freebsd-libs/debian/patches/series	2014-09-22 22:13:04 UTC (rev 5566)
@@ -28,3 +28,4 @@
 rlimit.diff
 libdwarf_off64_t.diff
 makefiles.diff
+pty_decls.diff