Author: adconrad
Date: 2013-01-28 12:15:13 +0000 (Mon, 28 Jan 2013)
New Revision: 5466
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-linuxthreads29.diff
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-memusage_no_mremap.diff
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-readdir_r.diff
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-undef-glibc.diff
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-use-thr-primitives.diff
Log:
* Rebase kfreebsd patches missed in the previous upload due to quilt:
- debian/patches/kfreebsd/local-undef-glibc.diff: Unfuzz.
- debian/patches/kfreebsd/local-use-thr-primitives.diff: Unfuzz.
- debian/patches/kfreebsd/local-linuxthreads29.diff: Unfuzz.
- debian/patches/kfreebsd/local-readdir_r.diff: Track file rename.
- debian/patches/kfreebsd/local-memusage_no_mremap.diff: Unfuzz.
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-28 09:05:57 UTC
(rev 5465)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-28 12:15:13 UTC
(rev 5466)
@@ -1,6 +1,11 @@
eglibc (2.17-0experimental1) UNRELEASED; urgency=low
- *
+ * Rebase kfreebsd patches missed in the previous upload due to quilt:
+ - debian/patches/kfreebsd/local-undef-glibc.diff: Unfuzz.
+ - debian/patches/kfreebsd/local-use-thr-primitives.diff: Unfuzz.
+ - debian/patches/kfreebsd/local-linuxthreads29.diff: Unfuzz.
+ - debian/patches/kfreebsd/local-readdir_r.diff: Track file rename.
+ - debian/patches/kfreebsd/local-memusage_no_mremap.diff: Unfuzz.
-- Adam Conrad <adcon...@0c3.net> Mon, 28 Jan 2013 02:05:01 -0700
Modified:
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-linuxthreads29.diff
===================================================================
---
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-linuxthreads29.diff
2013-01-28 09:05:57 UTC (rev 5465)
+++
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-linuxthreads29.diff
2013-01-28 12:15:13 UTC (rev 5466)
@@ -12,7 +12,7 @@
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -876,6 +876,7 @@
- #endif
+ }
}
+#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
Modified:
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-memusage_no_mremap.diff
===================================================================
---
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-memusage_no_mremap.diff
2013-01-28 09:05:57 UTC (rev 5465)
+++
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-memusage_no_mremap.diff
2013-01-28 12:15:13 UTC (rev 5466)
@@ -11,7 +11,7 @@
+#include <_G_config.h>
+#ifdef _G_HAVE_MREMAP
- /* `mmap' replacement. We do not have to keep track of the sizesince
+ /* `mremap' replacement. We do not have to keep track of the size since
`munmap' will get it as a parameter. */
@@ -739,6 +741,7 @@
/* Return the pointer to the user buffer. */
Modified:
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-readdir_r.diff
===================================================================
---
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-readdir_r.diff
2013-01-28 09:05:57 UTC (rev 5465)
+++
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-readdir_r.diff
2013-01-28 12:15:13 UTC (rev 5466)
@@ -2,8 +2,8 @@
sysdeps/unix/readdir_r.c | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
---- a/sysdeps/unix/readdir_r.c
-+++ b/sysdeps/unix/readdir_r.c
+--- a/sysdeps/posix/readdir_r.c
++++ b/sysdeps/posix/readdir_r.c
@@ -114,15 +114,32 @@
if (dp != NULL)
Modified:
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-undef-glibc.diff
===================================================================
---
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-undef-glibc.diff
2013-01-28 09:05:57 UTC (rev 5465)
+++
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-undef-glibc.diff
2013-01-28 12:15:13 UTC (rev 5466)
@@ -14,5 +14,5 @@
these macros to test for features in specific releases. */
+#undef __GLIBC__
#define __GLIBC__ 2
- #define __GLIBC_MINOR__ 16
+ #define __GLIBC_MINOR__ 17
Modified:
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-use-thr-primitives.diff
===================================================================
---
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-use-thr-primitives.diff
2013-01-28 09:05:57 UTC (rev 5465)
+++
glibc-package/branches/eglibc-2.17/debian/patches/kfreebsd/local-use-thr-primitives.diff
2013-01-28 12:15:13 UTC (rev 5466)
@@ -57,7 +57,7 @@
--- a/linuxthreads/descr.h
+++ b/linuxthreads/descr.h
@@ -26,6 +26,42 @@
- #include <lowlevellock.h>
+ #include <hp-timing.h>
#include <tls.h>
+
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tznci-0000jp...@vasks.debian.org
