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

sthibault pushed a commit to branch sid
in repository glibc.

commit 2ad7a31030e450d0d1952d7302e7cdbd10299105
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Sat Aug 20 21:59:00 2016 +0200

    hurd-i386/tg-sysvshm.diff: Update from topgit
---
 debian/changelog                         | 1 +
 debian/patches/hurd-i386/tg-sysvshm.diff | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b20e358..d5af48b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ glibc (2.23-5) UNRELEASED; urgency=medium
   * hurd-i386/libpthread_version.diff: Really fix pthread_setcancelstate
     aliasing.
   * libc0.3.symbols.hurd-i386: Update symbols.
+  * hurd-i386/tg-sysvshm.diff: Update from topgit.
 
  -- Samuel Thibault <sthiba...@debian.org>  Tue, 09 Aug 2016 01:45:00 +0200
 
diff --git a/debian/patches/hurd-i386/tg-sysvshm.diff 
b/debian/patches/hurd-i386/tg-sysvshm.diff
index 40db37d..74c8c64 100644
--- a/debian/patches/hurd-i386/tg-sysvshm.diff
+++ b/debian/patches/hurd-i386/tg-sysvshm.diff
@@ -39,7 +39,7 @@ Subject: [PATCH] Implement SysV shared memory for GNU/Hurd.
          trampoline longjmp-ts catch-exc exc2signal hurdkill sigunwind \
 --- /dev/null
 +++ b/hurd/sysvshm.c
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,97 @@
 +/* Copyright (C) 2005 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -128,6 +128,7 @@ Subject: [PATCH] Implement SysV shared memory for GNU/Hurd.
 +        *pshm = shm->next;
 +        *size = shm->size;
 +        __mutex_unlock (&sysvshm_lock);
++        free (shm);
 +        return 0;
 +      }
 +      pshm = &shm->next;
@@ -165,7 +166,7 @@ Subject: [PATCH] Implement SysV shared memory for GNU/Hurd.
 +#define SHM_PRIV_KEY_START INT_MAX
 +#define SHM_PRIV_KEY_END ((INT_MAX / 2) + 1)
 +
-+#define SHM_PREFIX "shm-"
++#define SHM_PREFIX            "sysvshm-"
 +#define SHM_DIR _PATH_DEV "shm/"
 +
 +/* The maximum number of characters in a shared memory segment file name.

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

Reply via email to