[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: patches/kfreebsd/local-sysdeps.diff: update to revision 6075 (from glibc-bsd).



This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch glibc-2.23
in repository glibc.

commit 2840ea8995a0196fcaf09744b7366df35810685b
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Tue Jun 28 14:52:21 2016 +0200

    patches/kfreebsd/local-sysdeps.diff: update to revision 6075 (from glibc-bsd).
---
 debian/changelog                           | 2 ++
 debian/patches/kfreebsd/local-sysdeps.diff | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 332cef7..c8377f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ glibc (2.23-0experimental4) UNRELEASED; urgency=medium
   * debian/patches/git-updates.diff: update from upstream stable branch.
   * debian/rules.d/build.mk: allow a test to fail without having a .out
     file.
+  * patches/kfreebsd/local-sysdeps.diff: update to revision 6075 (from
+    glibc-bsd).
 
  -- Aurelien Jarno <aurel32@debian.org>  Tue, 28 Jun 2016 12:45:35 +0200
 
diff --git a/debian/patches/kfreebsd/local-sysdeps.diff b/debian/patches/kfreebsd/local-sysdeps.diff
index dd5c68e..ebd77a4 100644
--- a/debian/patches/kfreebsd/local-sysdeps.diff
+++ b/debian/patches/kfreebsd/local-sysdeps.diff
@@ -3613,20 +3613,20 @@
 +
 +
 +/* Structure large enough to hold any socket address (with the historical
-+   exception of AF_UNIX).  We reserve 128 bytes.  */
++   exception of AF_UNIX).  */
 +#if ULONG_MAX > 0xffffffff
 +# define __ss_aligntype	__uint64_t
 +#else
 +# define __ss_aligntype	__uint32_t
 +#endif
-+#define _SS_SIZE	128
-+#define _SS_PADSIZE	(_SS_SIZE - (2 * sizeof (__ss_aligntype)))
++#define _SS_PADSIZE \
++  (_SS_SIZE - __SOCKADDR_COMMON_SIZE - sizeof (__ss_aligntype))
 +
 +struct sockaddr_storage
 +  {
 +    __SOCKADDR_COMMON (ss_);	/* Address family, etc.  */
-+    __ss_aligntype __ss_align;	/* Force desired alignment.  */
 +    char __ss_padding[_SS_PADSIZE];
++    __ss_aligntype __ss_align;	/* Force desired alignment.  */
 +  };
 +
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: