De partner van MISTERBABEL voor toegangscontrole en tijdregistratie

2015-09-08 Thread Toegangscontrole 
Uw partner voor toegangscontrole en tijdregistratie

U bent op zoek naar een partner voor oplossingen op het gebied van
toegangscontrole, tijdregistratie ?

Beheer de aanwezigheid van uw personeel en controleer de toegang tot uw
hoofdingang dankzij een prikkloksysteem en een toegangscontrolesysteem.

Geschikt voor zowel de kleinhandel, de horeca en KMO's.

http://www.debesteleverancier.be/toegangscontrole/gratis-offerte.htm?lng=nl=controleacces_campaign=controleacces_source=admr_medium=email=debian-glibc@lists.debian.org
---
Online versie: 
http://mailing.fb.bb1.mailbb.be/c9018/e55248960/hc98d4/l270353/index.html
Deze e-mail werd verstuurd naar debian-glibc@lists.debian.org.
Profiel aanpassen: 
http://mailing.fb.bb1.mailbb.be/c9018/e55248960/hc98d4/l270355/index.html
Uitschrijven: 
http://mailing.fb.bb1.mailbb.be/c9018/e55248960/hc98d4/l270354/index.html
Privacy policy: 
http://mailing.fb.bb1.mailbb.be/c9018/e55248960/hc98d4/l270356/index.html

Bug#797831: glibc: further problems with stage1

2015-09-08 Thread Helmut Grohne 
Hi Aurelien,

On Tue, Sep 08, 2015 at 07:58:13PM +0200, Aurelien Jarno wrote:
> Thanks for the patch and the detailed explanation. The changes make sense,
> so I have applied the patch.

Thank you.

> That said looking as this part of the code as a whole, it ends up being a
> bit complicated. Basically we define defaults value before the case, but
> then we basically handle all cases. Then we use a for loop as a if, as
> $templates contains either zero or one value.

I concur with that observation.

> The complexity comes from the fact this piece of code has been forked from
> the non-staged one. I therefore wonder if we should try to either:
> 1) Simplify it.
> 2) make it as common as possible with the non-stage code. I believe it's
> not a problem if we generate debhelper files that we don't use in
> practice, as long as the stage ones are correct.

Maybe we should try 3) merge it into the non-stage code? Having these
two cases separate has the disadvantage that they will go out of sync as
the non-staged variant is adapted to the current needs. We should strive
for minimal differences in stage1 to minimize its maintenance cost.

So what actually is the difference between these two implementations of
the debhelper-common target? If I am not mistaken it is:
 * Generate fewer debhelper templates. As you observed there is no harm
   in just generating them anyway.
 * Interpolate more variables, in particular RTLD_SO. They are not used
   in the libc-dev templates. The computation of the shell variable
   rtld_so would probably result in garbage as
   debian/tmp-*/usr/bin/iconv will be missing, but maybe it still
   succeeds (from an exit code pov).
 * Remove lines containing LIBDIR in stage1. Unless I am missing
   something, this is the only relevant difference.

So maybe one could have something along the lines.

ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
STAGE1_TEMPLATE_FILTER=
else
STAGE1_TEMPLATE_FILTER=sed -e "/LIBDIR.*\.a /d" $$t
fi

and then add "$(STAGE1_TEMPLATE_FILTER);" to the pile of sed invocations
in the non-stage1 code path while eliminating the stage1 block
altogether. Do you think this idea would be worth trying and preparing a
proper patch? Do you have a better name for that strange make variable?

Helmut

Bug#797831: glibc: further problems with stage1

2015-09-08 Thread Aurelien Jarno 
On 2015-09-08 20:44, Helmut Grohne wrote:
> Hi Aurelien,
> 
> On Tue, Sep 08, 2015 at 07:58:13PM +0200, Aurelien Jarno wrote:
> > Thanks for the patch and the detailed explanation. The changes make sense,
> > so I have applied the patch.
> 
> Thank you.
> 
> > That said looking as this part of the code as a whole, it ends up being a
> > bit complicated. Basically we define defaults value before the case, but
> > then we basically handle all cases. Then we use a for loop as a if, as
> > $templates contains either zero or one value.
> 
> I concur with that observation.
> 
> > The complexity comes from the fact this piece of code has been forked from
> > the non-staged one. I therefore wonder if we should try to either:
> > 1) Simplify it.
> > 2) make it as common as possible with the non-stage code. I believe it's
> > not a problem if we generate debhelper files that we don't use in
> > practice, as long as the stage ones are correct.
> 
> Maybe we should try 3) merge it into the non-stage code? Having these
> two cases separate has the disadvantage that they will go out of sync as
> the non-staged variant is adapted to the current needs. We should strive
> for minimal differences in stage1 to minimize its maintenance cost.

Your option 3), was actually the step I wanted to do after option 2) ;-)

> So what actually is the difference between these two implementations of
> the debhelper-common target? If I am not mistaken it is:
>  * Generate fewer debhelper templates. As you observed there is no harm
>in just generating them anyway.
>  * Interpolate more variables, in particular RTLD_SO. They are not used
>in the libc-dev templates. The computation of the shell variable
>rtld_so would probably result in garbage as
>debian/tmp-*/usr/bin/iconv will be missing, but maybe it still
>succeeds (from an exit code pov).
>  * Remove lines containing LIBDIR in stage1. Unless I am missing
>something, this is the only relevant difference.
> 
> So maybe one could have something along the lines.
> 
> ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
> STAGE1_TEMPLATE_FILTER=
> else
> STAGE1_TEMPLATE_FILTER=sed -e "/LIBDIR.*\.a /d" $$t
> fi

You can even get rid of the call to sed there and just set
directly STAGE1_TEMPLATE_FILTER=-e "/LIBDIR.*\.a /d" $$t so
that it can be used in the same sed invocation. OTOH I don't
think we really care about performance

> and then add "$(STAGE1_TEMPLATE_FILTER);" to the pile of sed invocations
> in the non-stage1 code path while eliminating the stage1 block
> altogether. Do you think this idea would be worth trying and preparing a
> proper patch? 

Yes I think it would be a good idea.

> Do you have a better name for that strange make variable?

I think the name is fine.

Aurelien

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

r6527 - in glibc-package/branches/glibc-2.21/debian: . patches/kfreebsd

2015-09-08 Thread Aurelien Jarno 
Author: aurel32
Date: 2015-09-08 19:10:36 + (Tue, 08 Sep 2015)
New Revision: 6527

Modified:
   glibc-package/branches/glibc-2.21/debian/changelog
   glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-sysdeps.diff
Log:
kfreebsd/local-sysdeps.diff: update to revision 5772 (from glibc-bsd).
Closes: #764692, #785796.

Modified: glibc-package/branches/glibc-2.21/debian/changelog
===
--- glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 18:14:27 UTC 
(rev 6526)
+++ glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 19:10:36 UTC 
(rev 6527)
@@ -17,7 +17,10 @@
 #797538.
   * Drop loongson-2f flavour on mipsel as this machine is not supported
 anymore (default to R2 ISA).
+  * kfreebsd/local-sysdeps.diff: update to revision 5772 (from glibc-bsd).
+Closes: #764692, #785796.
 
+
   [ Helmut Grohne ]
   * Fix some issues with stage 1.  Closes: #797831.
 

Modified: 
glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-sysdeps.diff
===
--- 
glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-sysdeps.diff
2015-09-08 18:14:27 UTC (rev 6526)
+++ 
glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-sysdeps.diff
2015-09-08 19:10:36 UTC (rev 6527)
@@ -962,7 +962,7 @@
 +
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/fcntl.h
-@@ -0,0 +1,226 @@
+@@ -0,0 +1,230 @@
 +/* O_*, F_*, FD_* bit values for FreeBSD.
 +   Copyright (C) 1991-1992, 1997-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -1113,6 +1113,10 @@
 +#define F_SETLK64 12  /* Set record locking info (non-blocking).  */
 +#define F_SETLKW6413  /* Set record locking info (blocking).  */
 +
++#if __USE_BSD || __POSIX_VISIBLE >= 200809
++#define   F_DUPFD_CLOEXEC 17  /* Like F_DUPFD, but FD_CLOEXEC is set 
*/
++#endif
++
 +#if defined __USE_BSD || defined __USE_UNIX98
 +# define F_GETOWN 5   /* Get owner of socket (receiver of SIGIO).  */
 +# define F_SETOWN 6   /* Set owner of socket (receiver of SIGIO).  */
@@ -21209,7 +21213,7 @@
 +#endif /* netinet/ip_icmp.h */
 --- /dev/null
 +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/tcp.h
-@@ -0,0 +1,267 @@
+@@ -0,0 +1,269 @@
 +/* netinet/tcp.h
 +   Copyright (C) 2002 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -21287,13 +21291,16 @@
 +#define MAX_SACK_BLKS   6   /* Max # SACK blocks stored at receiver side 
*/   
 +#define TCP_MAX_SACK4   /* MAX # SACKs sent in any segment */
 +
-+# ifdef __FAVOR_BSD
 +/*
 + * TCP header.
 + * Per RFC 793, September, 1981.
 + */
 +struct tcphdr
 +  {
++__extension__ union
++{
++  struct
++  {
 +u_int16_t th_sport;   /* source port */
 +u_int16_t th_dport;   /* destination port */
 +tcp_seq th_seq;   /* sequence number */
@@ -21317,10 +21324,8 @@
 +u_int16_t th_sum; /* checksum */
 +u_int16_t th_urp; /* urgent pointer */
 +};
-+
-+# else /* !__FAVOR_BSD */
-+struct tcphdr
-+  {
++  struct
++  {
 +u_int16_t source;
 +u_int16_t dest;
 +u_int32_t seq;
@@ -21352,7 +21357,8 @@
 +u_int16_t check;
 +u_int16_t urg_ptr;
 +};
-+# endif /* __FAVOR_BSD */
++};
++};
 +
 +enum
 +{

r6530 - in glibc-package/branches/glibc-2.21/debian: . testsuite-checking

2015-09-08 Thread Aurelien Jarno 
Author: aurel32
Date: 2015-09-08 20:46:19 + (Tue, 08 Sep 2015)
New Revision: 6530

Modified:
   glibc-package/branches/glibc-2.21/debian/changelog
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
Log:
testsuite-checking/expected-results-mips*: sort the files. Remove
failures due to old kernel now that all buildds run jessie.

Modified: glibc-package/branches/glibc-2.21/debian/changelog
===
--- glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 20:41:44 UTC 
(rev 6529)
+++ glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 20:46:19 UTC 
(rev 6530)
@@ -25,6 +25,8 @@
 conformtest for sys/stat.h to fail for O32 ABI. They were previously
 under the failing test run-conformtest.out, but it has been lost in
 the conversion to the new format.
+  * testsuite-checking/expected-results-mips*: sort the files. Remove
+failures due to old kernel now that all buildds run jessie.
 
   [ Helmut Grohne ]
   * Fix some issues with stage 1.  Closes: #797831.

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
2015-09-08 20:41:44 UTC (rev 6529)
+++ 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
2015-09-08 20:46:19 UTC (rev 6530)
@@ -1,8 +1,11 @@
 #
 # Allowed failures for mips-linux-gnu-libc
 #
-posix/annexc
-stdio-common/bug22
+conform/POSIX2008/sys/stat.h/conform
+conform/POSIX/sys/stat.h/conform
+conform/UNIX98/sys/stat.h/conform
+conform/XOPEN2K8/sys/stat.h/conform
+conform/XOPEN2K/sys/stat.h/conform
 elf/check-execstack
 elf/check-localplt
 elf/tst-audit1
@@ -10,13 +13,10 @@
 elf/tst-audit8
 elf/tst-audit9
 nptl/tst-cond16
+posix/annexc
+posix/tst-waitid
 rt/tst-cpuclock2
+rt/tst-cputimer1
 rt/tst-mqueue5
 rt/tst-timer
-posix/tst-waitid
-rt/tst-cputimer1
-conform/POSIX/sys/stat.h/conform
-conform/POSIX2008/sys/stat.h/conform
-conform/UNIX98/sys/stat.h/conform
-conform/XOPEN2K/sys/stat.h/conform
-conform/XOPEN2K8/sys/stat.h/conform
+stdio-common/bug22

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32
   2015-09-08 20:41:44 UTC (rev 6529)
+++ 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32
   2015-09-08 20:46:19 UTC (rev 6530)
@@ -1,18 +1,18 @@
 #
 # Allowed failures for mips32-linux-gnu-mipsn32
 #
-posix/annexc
-stdio-common/bug22
 elf/check-execstack
 elf/check-localplt
-math/test-misc
 elf/tst-audit1
 elf/tst-audit2
 elf/tst-audit8
 elf/tst-audit9
+math/test-misc
 nptl/tst-cond16
+posix/annexc
+posix/tst-waitid
 rt/tst-cpuclock2
+rt/tst-cputimer1
 rt/tst-mqueue5
 rt/tst-timer
-posix/tst-waitid
-rt/tst-cputimer1
+stdio-common/bug22

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
 2015-09-08 20:41:44 UTC (rev 6529)
+++ 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
 2015-09-08 20:46:19 UTC (rev 6530)
@@ -1,25 +1,21 @@
 #
 # Allowed failures for mips32el-linux-gnu-mipsn32
 #
-posix/annexc
-stdio-common/bug22
 elf/check-execstack
 elf/check-localplt
-math/test-double
-math/test-fenv
-math/test-idouble
-math/test-misc
 elf/tst-audit1
 elf/tst-audit2
 elf/tst-audit8
 elf/tst-audit9
+math/test-double
+math/test-fenv
+math/test-idouble
+math/test-misc
 nptl/tst-cond16
+posix/annexc
+posix/tst-waitid
 rt/tst-cpuclock2
+rt/tst-cputimer1
 rt/tst-mqueue5
 rt/tst-timer
-elf/tst-tls2
-nptl/tst-tls2
-elf/tst-tls3
-nptl/tst-tls3
-posix/tst-waitid
-rt/tst-cputimer1
+stdio-common/bug22

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64
===
---

r6528 - in glibc-package/branches/glibc-2.21/debian: . testsuite-checking

2015-09-08 Thread Aurelien Jarno 
Author: aurel32
Date: 2015-09-08 20:18:39 + (Tue, 08 Sep 2015)
New Revision: 6528

Modified:
   glibc-package/branches/glibc-2.21/debian/changelog
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
Log:
testsuite-checking/expected-results-mips*: allow the new tst-audit9
fail, like the others tst-auditX.

Modified: glibc-package/branches/glibc-2.21/debian/changelog
===
--- glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 19:10:36 UTC 
(rev 6527)
+++ glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 20:18:39 UTC 
(rev 6528)
@@ -19,8 +19,9 @@
 anymore (default to R2 ISA).
   * kfreebsd/local-sysdeps.diff: update to revision 5772 (from glibc-bsd).
 Closes: #764692, #785796.
+  * testsuite-checking/expected-results-mips*: allow the new tst-audit9
+fail, like the others tst-auditX.
 
-
   [ Helmut Grohne ]
   * Fix some issues with stage 1.  Closes: #797831.
 

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
2015-09-08 19:10:36 UTC (rev 6527)
+++ 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
2015-09-08 20:18:39 UTC (rev 6528)
@@ -8,6 +8,7 @@
 elf/tst-audit1
 elf/tst-audit2
 elf/tst-audit8
+elf/tst-audit9
 nptl/tst-cond16
 rt/tst-cpuclock2
 rt/tst-mqueue5

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32
   2015-09-08 19:10:36 UTC (rev 6527)
+++ 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32
   2015-09-08 20:18:39 UTC (rev 6528)
@@ -9,6 +9,7 @@
 elf/tst-audit1
 elf/tst-audit2
 elf/tst-audit8
+elf/tst-audit9
 nptl/tst-cond16
 rt/tst-cpuclock2
 rt/tst-mqueue5

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
 2015-09-08 19:10:36 UTC (rev 6527)
+++ 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
 2015-09-08 20:18:39 UTC (rev 6528)
@@ -12,6 +12,7 @@
 elf/tst-audit1
 elf/tst-audit2
 elf/tst-audit8
+elf/tst-audit9
 nptl/tst-cond16
 rt/tst-cpuclock2
 rt/tst-mqueue5

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64
2015-09-08 19:10:36 UTC (rev 6527)
+++ 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64
2015-09-08 20:18:39 UTC (rev 6528)
@@ -9,6 +9,7 @@
 elf/tst-audit1
 elf/tst-audit2
 elf/tst-audit8
+elf/tst-audit9
 nptl/tst-cond16
 rt/tst-cpuclock2
 rt/tst-mqueue5

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64
  2015-09-08 19:10:36 UTC (rev 6527)
+++ 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64
  2015-09-08 20:18:39 UTC (rev 6528)
@@ -10,6 +10,7 @@
 elf/tst-audit1
 elf/tst-audit2
 elf/tst-audit8
+elf/tst-audit9
 nptl/tst-cond16
 rt/tst-cpuclock2
 rt/tst-mqueue5

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
  2015-09-08 19:10:36 UTC (rev 6527)
+++

r6529 - in glibc-package/branches/glibc-2.21/debian: . testsuite-checking

2015-09-08 Thread Aurelien Jarno 
Author: aurel32
Date: 2015-09-08 20:41:44 + (Tue, 08 Sep 2015)
New Revision: 6529

Modified:
   glibc-package/branches/glibc-2.21/debian/changelog
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
   
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
Log:
testsuite-checking/expected-results-mips(el)-linux-gnu-libc: allow
conformtest for sys/stat.h to fail for O32 ABI. They were previously
under the failing test run-conformtest.out, but it has been lost in
the conversion to the new format.

Modified: glibc-package/branches/glibc-2.21/debian/changelog
===
--- glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 20:18:39 UTC 
(rev 6528)
+++ glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 20:41:44 UTC 
(rev 6529)
@@ -21,6 +21,10 @@
 Closes: #764692, #785796.
   * testsuite-checking/expected-results-mips*: allow the new tst-audit9
 fail, like the others tst-auditX.
+  * testsuite-checking/expected-results-mips(el)-linux-gnu-libc: allow
+conformtest for sys/stat.h to fail for O32 ABI. They were previously
+under the failing test run-conformtest.out, but it has been lost in
+the conversion to the new format.
 
   [ Helmut Grohne ]
   * Fix some issues with stage 1.  Closes: #797831.

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
2015-09-08 20:18:39 UTC (rev 6528)
+++ 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
2015-09-08 20:41:44 UTC (rev 6529)
@@ -15,3 +15,8 @@
 rt/tst-timer
 posix/tst-waitid
 rt/tst-cputimer1
+conform/POSIX/sys/stat.h/conform
+conform/POSIX2008/sys/stat.h/conform
+conform/UNIX98/sys/stat.h/conform
+conform/XOPEN2K/sys/stat.h/conform
+conform/XOPEN2K8/sys/stat.h/conform

Modified: 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
===
--- 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
  2015-09-08 20:18:39 UTC (rev 6528)
+++ 
glibc-package/branches/glibc-2.21/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
  2015-09-08 20:41:44 UTC (rev 6529)
@@ -20,3 +20,8 @@
 nptl/tst-tls3
 posix/tst-waitid
 rt/tst-cputimer1
+conform/POSIX/sys/stat.h/conform
+conform/POSIX2008/sys/stat.h/conform
+conform/UNIX98/sys/stat.h/conform
+conform/XOPEN2K/sys/stat.h/conform
+conform/XOPEN2K8/sys/stat.h/conform

r6524 - in glibc-package/branches/glibc-2.21/debian: . rules.d

2015-09-08 Thread Aurelien Jarno 
Author: aurel32
Date: 2015-09-08 16:49:26 + (Tue, 08 Sep 2015)
New Revision: 6524

Modified:
   glibc-package/branches/glibc-2.21/debian/changelog
   glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
Log:
rules.d/debhelper.mk: replace GLIBC_VERSION before LIBC.  Closes:
#797538.

Modified: glibc-package/branches/glibc-2.21/debian/changelog
===
--- glibc-package/branches/glibc-2.21/debian/changelog  2015-09-07 23:32:09 UTC 
(rev 6523)
+++ glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 16:49:26 UTC 
(rev 6524)
@@ -12,6 +12,10 @@
 libpthread/sysdeps/pthread/semaphore.h instead of the latter just
 including the former, since the latter is what gets installed.
 
+  [ Aurelien Jarno ]
+  * rules.d/debhelper.mk: replace GLIBC_VERSION before LIBC.  Closes:
+#797538.
+
  -- Aurelien Jarno   Sat, 29 Aug 2015 00:43:44 +0200
 
 glibc (2.21-0experimental1) experimental; urgency=medium

Modified: glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
===
--- glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk   
2015-09-07 23:32:09 UTC (rev 6523)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk   
2015-09-08 16:49:26 UTC (rev 6524)
@@ -160,14 +160,14 @@
for x in `find debian/debhelper.in -maxdepth 1 -type f`; do \
  y=debian/`basename $$x`; \
  cp $$x $$y; \
+ sed -e "s#GLIBC_VERSION#$(GLIBC_VERSION)#" -i $$y; \
+ sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$y; \
  sed -e "s#BUILD-TREE#$(build-tree)#" -i $$y; \
  sed -e "s#LIBC#$(libc)#" -i $$y; \
  sed -e "s#EXIT_CHECK##" -i $$y; \
  sed -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" -i $$y; \
  sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" -i $$y; \
  sed -e "/NOHWCAP/r debian/script.in/nohwcap.sh" -i $$y; \
- sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$y; \
- sed -e "s#GLIBC_VERSION#$(GLIBC_VERSION)#" -i $$y; \
  case $$y in \
*.install) \
  sed -e "s/^#.*//" -i $$y ; \

Bug#797831: glibc: further problems with stage1

2015-09-08 Thread Aurelien Jarno 
On 2015-09-02 23:19, Helmut Grohne wrote:
> Source: glibc
> Version: 2.21-0experimental1
> Tags: patch
> User: helm...@debian.org
> Usertags: rebootstrap
> 
> Hi Aurelien,

Hi,
 
> thank you very much for applying #766877 and uploading to experimental.
> This has moved us a big step closer to a working stage1. We are not
> quite there yet. At this point I estimate a remaining patch stack for
> the following problems:
> 
>  * stage1 fails to build for various reasons
>  * stage1 libc6-dev not installable due to dependency on libc6
>  * wrong set of packages being built for stage1
>  * dh_shlibdeps fails
>  * linux headers cannot be found
>  * various hurd things
> 
> Even though I still carry patches for these, it is not clear that all of
> these problems are still reproducible. The above list is meant as an
> outlook, not a cumulative bug report.
> 
> This particular bug shall address only the first of those problems
> above, because I have a good understanding and can answer your
> questions. I am attaching a patch and also explain the individual hunks
> in what follows. All of them apply to stage1-specific code.
> 
> -   *:/lib32 | *:/lib64 | *:/libx32 | *:/lib/arm-linux-gnueabi*) \
> +   *:/lib32 | *:/lib64 | *:/libo32 | *:/libx32 | 
> *:/lib/arm-linux-gnueabi*) \
> 
> The code fails to identify a certain mips architecture multilib build
> and thus places the multilib build into the main package.
> 
> +   *:* ) \
> +   templates="" \
> + ;; \
> 
> This extra case ensures that no templates are interpolated for optimized
> builds (e.g. libc6-i686). These do not generate development packages
> anyway, so dropping them (for stage1) is the right thing to do. Failing
> to do so again overwrites the main package.
> 
> - -e "/$$libdir.*.a /d" \
> + -e "/LIBDIR.*\.a /d" \
> 
> The immediate error resulting from this sed invocation is that the
> command "u" is not understood by sed. $libdir becomes
> "/usr/lib/triplet".  Thus the resulting sed command starts with "//u"
> which sed does not like. Fixing the escaping is not enough however,
> since LIBDIR is not yet interpolated. That only happens a few lines
> later. So instead, the match needs to target non-interpolated filenames
> and thus match LIBDIR.
> 
> I hope that the level of detail given is sufficient. If not, please ask.

Thanks for the patch and the detailed explanation. The changes make sense,
so I have applied the patch.

That said looking as this part of the code as a whole, it ends up being a
bit complicated. Basically we define defaults value before the case, but
then we basically handle all cases. Then we use a for loop as a if, as
$templates contains either zero or one value.

The complexity comes from the fact this piece of code has been forked from
the non-staged one. I therefore wonder if we should try to either:
1) Simplify it.
2) make it as common as possible with the non-stage code. I believe it's
not a problem if we generate debhelper files that we don't use in
practice, as long as the stage ones are correct.

> Otherwise, please consider applying the patch. I would appreciate
> another experimental upload that also includes the hurd changes staged
> to SVN by Samuel Thibault already within a month from now. Thank you for
> your support.

For what I understood, Samuel has committed is change in both the unstable
and experimental branches, so the changes should have been in the last
upload to experimental. That said he has done a few more changes in the
meantime.

Aurelien

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

r6525 - in glibc-package/branches/glibc-2.21/debian: . rules.d

2015-09-08 Thread Aurelien Jarno 
Author: aurel32
Date: 2015-09-08 17:53:15 + (Tue, 08 Sep 2015)
New Revision: 6525

Modified:
   glibc-package/branches/glibc-2.21/debian/changelog
   glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
Log:
Fix some issues with stage 1.  Closes: #797831.

Modified: glibc-package/branches/glibc-2.21/debian/changelog
===
--- glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 16:49:26 UTC 
(rev 6524)
+++ glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 17:53:15 UTC 
(rev 6525)
@@ -15,6 +15,9 @@
   [ Aurelien Jarno ]
   * rules.d/debhelper.mk: replace GLIBC_VERSION before LIBC.  Closes:
 #797538.
+  
+  [ Helmut Grohne ]
+  * Fix some issues with stage 1.  Closes: #797831.
 
  -- Aurelien Jarno   Sat, 29 Aug 2015 00:43:44 +0200
 

Modified: glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
===
--- glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk   
2015-09-08 16:49:26 UTC (rev 6524)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk   
2015-09-08 17:53:15 UTC (rev 6525)
@@ -206,10 +206,13 @@
case "$$curpass:$$slibdir" in \
  libc:*) \
;; \
- *:/lib32 | *:/lib64 | *:/libx32 | *:/lib/arm-linux-gnueabi*) \
+ *:/lib32 | *:/lib64 | *:/libo32 | *:/libx32 | 
*:/lib/arm-linux-gnueabi*) \
pass="-alt" \
suffix="-$(curpass)" \
;; \
+ *:* ) \
+   templates="" \
+   ;; \
esac ; \
for t in $$templates ; do \
  for s in debian/$$t$$pass.* ; do \
@@ -219,7 +222,7 @@
  cp $$s $$t ; \
fi ; \
sed -i \
-   -e "/$$libdir.*.a /d" \
+   -e "/LIBDIR.*\.a /d" \
-e "s#TMPDIR#debian/tmp-$$curpass#g" \
-e "s#RTLDDIR#$$rtlddir#g" \
-e "s#SLIBDIR#$$slibdir#g" \

r6526 - in glibc-package/branches/glibc-2.21/debian: . control.in sysdeps

2015-09-08 Thread Aurelien Jarno 
Author: aurel32
Date: 2015-09-08 18:14:27 + (Tue, 08 Sep 2015)
New Revision: 6526

Modified:
   glibc-package/branches/glibc-2.21/debian/changelog
   glibc-package/branches/glibc-2.21/debian/control
   glibc-package/branches/glibc-2.21/debian/control.in/opt
   glibc-package/branches/glibc-2.21/debian/sysdeps/mipsel.mk
Log:
Drop loongson-2f flavour on mipsel as this machine is not supported
anymore (default to R2 ISA).

Modified: glibc-package/branches/glibc-2.21/debian/changelog
===
--- glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 17:53:15 UTC 
(rev 6525)
+++ glibc-package/branches/glibc-2.21/debian/changelog  2015-09-08 18:14:27 UTC 
(rev 6526)
@@ -15,7 +15,9 @@
   [ Aurelien Jarno ]
   * rules.d/debhelper.mk: replace GLIBC_VERSION before LIBC.  Closes:
 #797538.
-  
+  * Drop loongson-2f flavour on mipsel as this machine is not supported
+anymore (default to R2 ISA).
+
   [ Helmut Grohne ]
   * Fix some issues with stage 1.  Closes: #797831.
 

Modified: glibc-package/branches/glibc-2.21/debian/control
===
--- glibc-package/branches/glibc-2.21/debian/control2015-09-08 17:53:15 UTC 
(rev 6525)
+++ glibc-package/branches/glibc-2.21/debian/control2015-09-08 18:14:27 UTC 
(rev 6526)
@@ -919,23 +919,6 @@
  needs to be installed on Alpha EV67/68 and EV7 machines. If you install
  this on an older machine, it won't even be used.
 
-Package: libc6-loongson2f
-Architecture: mipsel
-Section: libs
-Priority: extra
-Multi-Arch: same
-Pre-Depends: libc6 (= ${binary:Version})
-Depends: ${misc:Depends}
-Build-Profiles: 
-Description: GNU C Library: Shared libraries (Loongson 2F optimized)
- Contains the standard libraries that are used by nearly all programs on
- the system. This package includes shared versions of the standard C
- library and the standard math library, as well as many others.
- .
- This set of libraries is optimized for the Loongson 2F. It only
- needs to be installed on Lemote Loongson 2F machines. If you install
- this on a non-Loongson, it won't even be used.
-
 Package: libnss-dns-udeb
 XC-Package-Type: udeb
 Architecture: any

Modified: glibc-package/branches/glibc-2.21/debian/control.in/opt
===
--- glibc-package/branches/glibc-2.21/debian/control.in/opt 2015-09-08 
17:53:15 UTC (rev 6525)
+++ glibc-package/branches/glibc-2.21/debian/control.in/opt 2015-09-08 
18:14:27 UTC (rev 6526)
@@ -104,20 +104,3 @@
  needs to be installed on Alpha EV67/68 and EV7 machines. If you install
  this on an older machine, it won't even be used.
 
-Package: libc6-loongson2f
-Architecture: mipsel
-Section: libs
-Priority: extra
-Multi-Arch: same
-Pre-Depends: libc6 (= ${binary:Version})
-Depends: ${misc:Depends}
-Build-Profiles: 
-Description: GNU C Library: Shared libraries (Loongson 2F optimized)
- Contains the standard libraries that are used by nearly all programs on
- the system. This package includes shared versions of the standard C
- library and the standard math library, as well as many others.
- .
- This set of libraries is optimized for the Loongson 2F. It only
- needs to be installed on Lemote Loongson 2F machines. If you install
- this on a non-Loongson, it won't even be used.
-

Modified: glibc-package/branches/glibc-2.21/debian/sysdeps/mipsel.mk
===
--- glibc-package/branches/glibc-2.21/debian/sysdeps/mipsel.mk  2015-09-08 
17:53:15 UTC (rev 6525)
+++ glibc-package/branches/glibc-2.21/debian/sysdeps/mipsel.mk  2015-09-08 
18:14:27 UTC (rev 6526)
@@ -55,17 +55,6 @@
 
 endef
 
-# build a loongson-2f optimized library
-GLIBC_PASSES += loongson2f
-DEB_ARCH_REGULAR_PACKAGES += libc6-loongson2f
-loongson2f_add-ons = $(add-ons)
-loongson2f_configure_target = mips32el-linux-gnu
-loongson2f_CC = $(CC) -mabi=32
-loongson2f_CXX = $(CXX) -mabi=32
-loongson2f_extra_cflags = -march=loongson2f -mtune=loongson2f -O2
-loongson2f_extra_config_options = $(extra_config_options)
-loongson2f_slibdir = /lib/$(DEB_HOST_MULTIARCH)/loongson2f
-
 # Need to put a tri-arch aware version of ldd in the base package
 define mipsn32_extra_install
 cp debian/tmp-mipsn32/usr/bin/ldd debian/tmp-libc/usr/bin