r5830 - in glibc-package/branches/glibc-branch-wheezy/debian: . patches patches/kfreebsd
Author: ps-guest
Date: 2013-11-30 08:22:58 +0000 (Sat, 30 Nov 2013)
New Revision: 5830
Added:
glibc-package/branches/glibc-branch-wheezy/debian/patches/kfreebsd/local-initgroups-order.diff
Modified:
glibc-package/branches/glibc-branch-wheezy/debian/changelog
glibc-package/branches/glibc-branch-wheezy/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/branches/glibc-branch-wheezy/debian/patches/series.kfreebsd-amd64
glibc-package/branches/glibc-branch-wheezy/debian/patches/series.kfreebsd-i386
Log:
bring kfreebsd changes from branch eglibc-2.13 into glibc-branch-wheezy
Modified: glibc-package/branches/glibc-branch-wheezy/debian/changelog
===================================================================
--- glibc-package/branches/glibc-branch-wheezy/debian/changelog 2013-11-30 03:30:29 UTC (rev 5829)
+++ glibc-package/branches/glibc-branch-wheezy/debian/changelog 2013-11-30 08:22:58 UTC (rev 5830)
@@ -1,5 +1,6 @@
eglibc (2.13-39) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* debian/testsuite-checking/compare.sh: Disable failing the build on test
regressions to ease the pain of ongoing stable/security maintenance.
* patches/any/cvs-CVE-2012-44xx.diff: backport overflow fixes in strcoll
@@ -7,6 +8,12 @@
* patches/any/CVE-2013-0242.diff: Backport buffer overrun in regexp matcher
addressing CVE-2013-0242 (Closes: #699399).
+ [ Petr Salinger ]
+ * patches/kfreebsd/local-initgroups-order.diff: always put supplied extra
+ gid as the first entry of group list in setgroups(). Closes: #699593.
+ * inline is not keyword in c89 mode, use __inline. Closes: #704598.
+ * sys_ktimer_settime have 4 parameters. Closes: #712196.
+
-- Aurelien Jarno <aurel32@debian.org> Fri, 29 Nov 2013 21:59:21 +0100
eglibc (2.13-38) unstable; urgency=low
Added: glibc-package/branches/glibc-branch-wheezy/debian/patches/kfreebsd/local-initgroups-order.diff
===================================================================
--- glibc-package/branches/glibc-branch-wheezy/debian/patches/kfreebsd/local-initgroups-order.diff (rev 0)
+++ glibc-package/branches/glibc-branch-wheezy/debian/patches/kfreebsd/local-initgroups-order.diff 2013-11-30 08:22:58 UTC (rev 5830)
@@ -0,0 +1,38 @@
+
+ setgroups(size, groups) changes egid on kfreebsd,
+ precisely groups[0] is the new egid
+
+ initgroups(user, gid) prepares the "groups" list
+ via internal_getgrouplist().
+ It puts supplied gid as the first entry in all but NSCD cases.
+ Fix the remaining NSCD case, see #698102, #699593.
+
+
+--- a/nscd/nscd_initgroups.c
++++ b/nscd/nscd_initgroups.c
+@@ -145,15 +145,23 @@
+ }
+
+ /* Check whether GROUP is part of the mix. If not, add it. */
++ /* The GROUP have to be in the first entry */
+ if (retval >= 0)
+ {
+ int cnt;
++ gid_t sg, tg;
++ sg = group;
+ for (cnt = 0; cnt < retval; ++cnt)
+- if ((*groupsp)[cnt] == group)
++ {
++ tg = (*groupsp)[cnt];
++ (*groupsp)[cnt] = sg;
++ if (tg == group)
+ break;
++ sg = tg;
++ }
+
+ if (cnt == retval)
+- (*groupsp)[retval++] = group;
++ (*groupsp)[retval++] = sg;
+ }
+
+ out_close:
Modified: glibc-package/branches/glibc-branch-wheezy/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-branch-wheezy/debian/patches/kfreebsd/local-sysdeps.diff 2013-11-30 03:30:29 UTC (rev 5829)
+++ glibc-package/branches/glibc-branch-wheezy/debian/patches/kfreebsd/local-sysdeps.diff 2013-11-30 08:22:58 UTC (rev 5830)
@@ -23159,7 +23159,7 @@
+ * Given a filesystem name, determine if it is resident in the kernel,
+ * and if it is resident, return its xvfsconf structure.
+ */
-+static inline int
++static __inline int
+getvfsbyname(const char *fsname, struct xvfsconf *vfcp)
+{
+ struct xvfsconf *xvfsp;
@@ -24889,7 +24889,7 @@
+sys_clock_settime - clock_settime i:ip __syscall_clock_settime
+sys_ktimer_create - ktimer_create i:iPp __syscall_ktimer_create
+sys_ktimer_gettime - ktimer_gettime i:ip __syscall_ktimer_gettime
-+sys_ktimer_settime - ktimer_settime i:ip __syscall_ktimer_settime
++sys_ktimer_settime - ktimer_settime i:iipp __syscall_ktimer_settime
+sys_ktimer_getoverrun - ktimer_getoverrun i:i __syscall_ktimer_getoverrun
+sys_ktimer_delete - ktimer_delete i:i __syscall_ktimer_delete
+sys_execve - execve i:ppp __syscall_execve
Modified: glibc-package/branches/glibc-branch-wheezy/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/branches/glibc-branch-wheezy/debian/patches/series.kfreebsd-amd64 2013-11-30 03:30:29 UTC (rev 5829)
+++ glibc-package/branches/glibc-branch-wheezy/debian/patches/series.kfreebsd-amd64 2013-11-30 08:22:58 UTC (rev 5830)
@@ -10,3 +10,4 @@
kfreebsd/local-sysdeps.diff
kfreebsd/local-undef-glibc.diff
kfreebsd/local-use-thr-primitives.diff
+kfreebsd/local-initgroups-order.diff
Modified: glibc-package/branches/glibc-branch-wheezy/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/branches/glibc-branch-wheezy/debian/patches/series.kfreebsd-i386 2013-11-30 03:30:29 UTC (rev 5829)
+++ glibc-package/branches/glibc-branch-wheezy/debian/patches/series.kfreebsd-i386 2013-11-30 08:22:58 UTC (rev 5830)
@@ -10,3 +10,4 @@
kfreebsd/local-sysdeps.diff
kfreebsd/local-undef-glibc.diff
kfreebsd/local-use-thr-primitives.diff
+kfreebsd/local-initgroups-order.diff
Reply to: