r6813 - in glibc-package/branches/glibc-2.22/debian: . patches patches/any

[Aurelien Jarno]

Author: aurel32
Date: 2015-12-12 09:32:42 + (Sat, 12 Dec 2015)
New Revision: 6813

Removed:
   glibc-package/branches/glibc-2.22/debian/patches/any/local-stdio-lock.diff
Modified:
   glibc-package/branches/glibc-2.22/debian/changelog
   glibc-package/branches/glibc-2.22/debian/patches/series
Log:
debian/patches/any/local-stdio-lock.diff: drop, it was needed for
LinuxThreads support.

Modified: glibc-package/branches/glibc-2.22/debian/changelog
===
--- glibc-package/branches/glibc-2.22/debian/changelog  2015-12-11 23:30:57 UTC 
(rev 6812)
+++ glibc-package/branches/glibc-2.22/debian/changelog  2015-12-12 09:32:42 UTC 
(rev 6813)
@@ -18,6 +18,8 @@
 another way.
   * debian/patches/alpha/submitted-rtld-fPIC.diff: drop, fixed upstream
 another way.
+  * debian/patches/any/local-stdio-lock.diff: drop, it was needed for
+LinuxThreads support.
 
  -- Aurelien Jarno   Thu, 10 Dec 2015 23:41:13 +0100
 

Deleted: 
glibc-package/branches/glibc-2.22/debian/patches/any/local-stdio-lock.diff
===
--- glibc-package/branches/glibc-2.22/debian/patches/any/local-stdio-lock.diff  
2015-12-11 23:30:57 UTC (rev 6812)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/local-stdio-lock.diff  
2015-12-12 09:32:42 UTC (rev 6813)
@@ -1,32 +0,0 @@

- bits/stdio-lock.h |   17 +
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
 a/bits/stdio-lock.h
-+++ b/bits/stdio-lock.h
-@@ -46,12 +46,21 @@
- 
- #if defined _LIBC && IS_IN (libc)
- # define _IO_acquire_lock(_fp) \
--  _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp));  
\
--  _IO_flockfile (_fp)
-+  { \
-+  _IO_FILE *_IO_acquire_lock_file = _fp; \
-+  __libc_cleanup_region_start (1, (void (*) (void *)) _IO_acquire_lock_fct, 
&_IO_acquire_lock_file); \
-+  _IO_flockfile (_IO_acquire_lock_file)
-+
-+# define _IO_acquire_lock_clear_flags2(_fp) \
-+  { \
-+  _IO_FILE *_IO_acquire_lock_file = _fp; \
-+  __libc_cleanup_region_start (1, (void (*) (void *)) 
_IO_acquire_lock_clear_flags2_fct, &_IO_acquire_lock_file); \
-+  _IO_flockfile (_IO_acquire_lock_file)
- 
- # define _IO_release_lock(_fp) \
--  _IO_funlockfile (_fp);\
--  _IO_cleanup_region_end (0)
-+  __libc_cleanup_region_end (1); \
-+   }
-+
- #endif
- 
- #endif /* bits/stdio-lock.h */

Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-11 
23:30:57 UTC (rev 6812)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-12 
09:32:42 UTC (rev 6813)
@@ -204,7 +204,6 @@
 any/local-no-pagesize.diff
 any/local-nss-upgrade.diff
 any/local-stubs_h.diff
-any/local-stdio-lock.diff
 any/local-tcsetaddr.diff
 any/local-tst-mktime2.diff
 any/submitted-nis-netgrp.diff

Re: r6813 - in glibc-package/branches/glibc-2.22/debian: . patches patches/any

[Samuel Thibault]

Aurelien Jarno, on Sat 12 Dec 2015 09:32:42 +, wrote:
> debian/patches/any/local-stdio-lock.diff: drop, it was needed for
> LinuxThreads support.

I believe we need it for hurd-i386's libpthread too.

Samuel

Re: r6813 - in glibc-package/branches/glibc-2.22/debian: . patches patches/any

[Aurelien Jarno]

On 2015-12-12 10:53, Samuel Thibault wrote:
> Aurelien Jarno, on Sat 12 Dec 2015 09:32:42 +, wrote:
> > debian/patches/any/local-stdio-lock.diff: drop, it was needed for
> > LinuxThreads support.
> 
> I believe we need it for hurd-i386's libpthread too.

Can you please check? If it is still need, please just revert the patch
and try to get the change upstream.

Aurelien

-- 
Aurelien Jarno  GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://www.aurel32.net

r6814 - in glibc-package/branches/glibc-2.22/debian: . patches patches/any

[Aurelien Jarno]

Author: aurel32
Date: 2015-12-12 17:02:35 + (Sat, 12 Dec 2015)
New Revision: 6814

Added:
   
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-bits-libc-stdio-lock.diff
Removed:
   
glibc-package/branches/glibc-2.22/debian/patches/any/unsubmitted-scanf-includes.diff
Modified:
   glibc-package/branches/glibc-2.22/debian/changelog
   glibc-package/branches/glibc-2.22/debian/patches/series
Log:
debian/patches/any/unsubmitted-scanf-includes.diff: replace the hack by
the upstream fix patches/any/cvs-bits-libc-stdio-lock.diff. This also
stop installing  and .  Closes:
#404532, #639697.

Modified: glibc-package/branches/glibc-2.22/debian/changelog
===
--- glibc-package/branches/glibc-2.22/debian/changelog  2015-12-12 09:32:42 UTC 
(rev 6813)
+++ glibc-package/branches/glibc-2.22/debian/changelog  2015-12-12 17:02:35 UTC 
(rev 6814)
@@ -20,6 +20,10 @@
 another way.
   * debian/patches/any/local-stdio-lock.diff: drop, it was needed for
 LinuxThreads support.
+  * debian/patches/any/unsubmitted-scanf-includes.diff: replace the hack by
+the upstream fix patches/any/cvs-bits-libc-stdio-lock.diff. This also
+stop installing  and .  Closes:
+#404532, #639697.
 
  -- Aurelien Jarno   Thu, 10 Dec 2015 23:41:13 +0100
 

Added: 
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-bits-libc-stdio-lock.diff
===
--- 
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-bits-libc-stdio-lock.diff
  (rev 0)
+++ 
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-bits-libc-stdio-lock.diff
  2015-12-12 17:02:35 UTC (rev 6814)
@@ -0,0 +1,78 @@
+2015-09-03  Joseph Myers  
+
+   * Makefile (headers): Remove bits/libc-lock.h.
+   * libio/Makefile (headers): Remove bits/stdio-lock.h.
+
+   * libio/libio.h [_IO_MTSAFE_IO]: Remove include of
+and commented-out include of .
+   * include/libio.h [!_ISOMAC && _IO_MTSAFE_IO]: Include
+   .
+   * stdio-common/scanf15.c (_IO_MTSAFE_IO): Undefine.
+   * stdio-common/scanf17.c (_IO_MTSAFE_IO): Likewise.
+
+--- a/Makefile
 b/Makefile
+@@ -58,7 +58,7 @@ endif # $(AUTOCONF) = no
+  subdir_objs subdir_stubs subdir_testclean\
+  $(addprefix install-, no-libc.a bin lib data headers others)
+ 
+-headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \
++headers := limits.h values.h features.h gnu-versions.h \
+  bits/xopen_lim.h gnu/libc-version.h stdc-predef.h
+ 
+ echo-headers: subdir_echo-headers
+--- a/include/libio.h
 b/include/libio.h
+@@ -1,3 +1,6 @@
++#if !defined _ISOMAC && defined _IO_MTSAFE_IO
++# include 
++#endif
+ #include 
+ 
+ #ifndef _ISOMAC
+--- a/libio/Makefile
 b/libio/Makefile
+@@ -22,7 +22,7 @@ subdir   := libio
+ 
+ include ../Makeconfig
+ 
+-headers   := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h \
++headers   := stdio.h libio.h _G_config.h bits/stdio.h \
+  bits/sys_errlist.h bits/stdio2.h bits/stdio-ldbl.h bits/libio-ldbl.h
+ 
+ routines  :=\
+--- a/libio/libio.h
 b/libio/libio.h
+@@ -145,11 +145,7 @@ struct _IO_jump_t;  struct _IO_FILE;
+ 
+ /* Handle lock.  */
+ #ifdef _IO_MTSAFE_IO
+-# if defined __GLIBC__ && __GLIBC__ >= 2
+-#  include 
+-# else
+-/*# include */
+-# endif
++/* _IO_lock_t defined in internal headers during the glibc build.  */
+ #else
+ typedef void _IO_lock_t;
+ #endif
+--- a/stdio-common/scanf15.c
 b/stdio-common/scanf15.c
+@@ -1,6 +1,7 @@
+ #undef _GNU_SOURCE
+ #define _XOPEN_SOURCE 600
+ #undef _LIBC
++#undef _IO_MTSAFE_IO
+ /* The following macro definitions are a hack.  They word around disabling
+the GNU extension while still using a few internal headers.  */
+ #define u_char unsigned char
+--- a/stdio-common/scanf17.c
 b/stdio-common/scanf17.c
+@@ -1,6 +1,7 @@
+ #undef _GNU_SOURCE
+ #define _XOPEN_SOURCE 600
+ #undef _LIBC
++#undef _IO_MTSAFE_IO
+ /* The following macro definitions are a hack.  They word around disabling
+the GNU extension while still using a few internal headers.  */
+ #define u_char unsigned char

Deleted: 
glibc-package/branches/glibc-2.22/debian/patches/any/unsubmitted-scanf-includes.diff
===
--- 
glibc-package/branches/glibc-2.22/debian/patches/any/unsubmitted-scanf-includes.diff
2015-12-12 09:32:42 UTC (rev 6813)
+++ 
glibc-package/branches/glibc-2.22/debian/patches/any/unsubmitted-scanf-includes.diff
2015-12-12 17:02:35 UTC (rev 6814)
@@ -1,16 +0,0 @@
-diff --git a/stdio-common/Makefile b/stdio-common/Makefile
-index 16f8f1b..be58f0f 100644
 a/stdio-common/Makefile
-+++ b/stdio-common/Makefile
-@@ -110,9 +110,9 @@ CFLAGS-siglist.c = $(fno-unit-at-a-time)
- # GNU 

Bug#806882: libc-bin: unable to set pts permissions (and open a terminal...)

[Jakub Wilk]

* Aurelien Jarno , 2015-12-04, 18:11:
In that case given the issue is due to a user misconfiguration, I 
guess we should just try to detect it, display a note and fail the 
installation.


Warning the user would be certainly a good idea. But of course that 
would only help if the devpts filesystem was misconfigured at 
installation time. For me, this wasn't the case.


What was the issue on your case?


I had schroot configured to mount /dev/pts with default permissions. 
(This should not be the problem for most schroot users. By default 
schroot bind-mounts /dev/pts from the host.) So my /dev/pts permissions 
were fine on upgrade; they only broke later, when I tried to build a 
package.


In another mail Aurelien wrote:


usertags 806882 + serious
thanks


tag 806882 + serious
thanks

Due to a typo, this bug didn't get upgraded to serious.


FWIW, it wasn't a typo. :) It's an actual usertag of mine:
https://udd.debian.org/cgi-bin/bts-usertags.cgi?tag=serious=jwilk%40debian.org

--
Jakub Wilk

r6815 - in glibc-package/branches/glibc-2.22/debian: . rules.d sysdeps

[Aurelien Jarno]

Author: aurel32
Date: 2015-12-12 18:40:50 + (Sat, 12 Dec 2015)
New Revision: 6815

Removed:
   glibc-package/branches/glibc-2.22/debian/sysdeps/arm.mk
Modified:
   glibc-package/branches/glibc-2.22/debian/changelog
   glibc-package/branches/glibc-2.22/debian/control
   glibc-package/branches/glibc-2.22/debian/rules.d/control.mk
Log:
debian/control, debian/rules.d/control.mk, debian/sysdeps/arm.mk: remove
support for the ARM old-ABI architecture, it is not supported upstream
anymore.

Modified: glibc-package/branches/glibc-2.22/debian/changelog
===
--- glibc-package/branches/glibc-2.22/debian/changelog  2015-12-12 17:02:35 UTC 
(rev 6814)
+++ glibc-package/branches/glibc-2.22/debian/changelog  2015-12-12 18:40:50 UTC 
(rev 6815)
@@ -24,6 +24,9 @@
 the upstream fix patches/any/cvs-bits-libc-stdio-lock.diff. This also
 stop installing  and .  Closes:
 #404532, #639697.
+  * debian/control, debian/rules.d/control.mk, debian/sysdeps/arm.mk: remove
+support for the ARM old-ABI architecture, it is not supported upstream
+anymore.
 
  -- Aurelien Jarno   Thu, 10 Dec 2015 23:41:13 +0100
 

Modified: glibc-package/branches/glibc-2.22/debian/control
===
--- glibc-package/branches/glibc-2.22/debian/control2015-12-12 17:02:35 UTC 
(rev 6814)
+++ glibc-package/branches/glibc-2.22/debian/control2015-12-12 18:40:50 UTC 
(rev 6815)
@@ -156,7 +156,7 @@
  be removed once nothing on the system depends on it.
 
 Package: libc6
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
 Section: libs
 Priority: required
 Multi-Arch: same
@@ -185,7 +185,7 @@
  and the standard math library, as well as many others.
 
 Package: libc6-dev
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
 Section: libdevel
 Priority: optional
 Multi-Arch: same
@@ -200,7 +200,7 @@
  and link programs which use the standard C library.
 
 Package: libc6-dbg
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
 Section: debug
 Priority: extra
 Multi-Arch: same
@@ -212,7 +212,7 @@
  library.
 
 Package: libc6-pic
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
 Section: libdevel
 Priority: optional
 Multi-Arch: same
@@ -228,7 +228,7 @@
 
 Package: libc6-udeb
 XC-Package-Type: udeb
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
 Section: debian-installer
 Priority: extra
 Provides: libc6, libc-udeb, ${locale-compat:Depends}

Modified: glibc-package/branches/glibc-2.22/debian/rules.d/control.mk
===
--- glibc-package/branches/glibc-2.22/debian/rules.d/control.mk 2015-12-12 
17:02:35 UTC (rev 6814)
+++ glibc-package/branches/glibc-2.22/debian/rules.d/control.mk 2015-12-12 
18:40:50 UTC (rev 6815)
@@ -1,7 +1,7 @@
 libc_packages := libc6 libc6.1 libc0.1 libc0.3
 libc0_1_archs := kfreebsd-amd64 kfreebsd-i386
 libc0_3_archs := hurd-i386
-libc6_archs   := amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel 
mipsn32 mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc 
sparc64 s390x sh4 x32
+libc6_archs   := amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 
mipsn32el mips64 mips64el powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x 
sh4 x32
 libc6_1_archs := alpha
 
 control_deps := $(wildcard debian/control.in/*) $(addprefix 
debian/control.in/, $(libc_packages))

Deleted: glibc-package/branches/glibc-2.22/debian/sysdeps/arm.mk
===
---