r1766 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/patches/any trunk/debian trunk/debian/patches/any
Author: aurel32
Date: 2006-08-20 15:00:06 +0000 (Sun, 20 Aug 2006)
New Revision: 1766
Added:
glibc-package/trunk/debian/patches/any/local-bashisms.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/any/local-bashisms.diff
glibc-package/branches/glibc-2.4/debian/patches/any/local-sysctl.diff
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-sysctl.diff
Log:
* patches/any/local-sysctl.diff: fix for arm.
* patches/any/local-bashisms.diff: fix bashisms in the testsuite.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-18 14:26:16 UTC (rev 1765)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-20 15:00:06 UTC (rev 1766)
@@ -20,7 +20,7 @@
- Remove any/local-linuxthreads-sizefix.diff (not necessary anymore).
- Update hppa/submitted-lt.diff.
- debian/shlibver: Bump up to 2.4-1.
- - Add any/local-bashisms.diff: fix invalid test operator (==)
+ - Update any/local-bashisms.diff: fix invalid test operator (==)
in run-iconv-test.sh
- debian/rules.d/build.mk: don't try to build html documentation.
- debian/sysdeps/hppa.mk: use ports and linuxthreads add-ons
@@ -142,12 +142,31 @@
-- Clint Adams <schizo@debian.org> Sun, 28 May 2006 03:28:14 +0200
-glibc (2.3.6.ds1-2) UNRELEASED; urgency=low
+glibc (2.3.6.ds1-3) UNRELEASED; urgency=low
- * rules.d/build.mk: removed the call to texi2html.
+ * patches/any/local-sysctl.diff: fix for arm.
+ * patches/any/local-bashisms.diff: fix bashisms in the testsuite.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 15 Aug 2006 23:58:46 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 17 Aug 2006 01:14:40 +0200
+glibc (2.3.6.ds1-2) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * rules.d/build.mk: removed the call to texi2html. (Closes: #383276).
+ * New debian/patches/any/cvs-ctermid.diff from upstream to fix a segfault in
+ ctermid(NULL). Thanks Denis for the hint. (Closes: #380504, #383362).
+ * New debian/patches/localedata/reverted-for-etch.diff: revert a few
+ locales changes done in 2.3.6.ds1-1 and refused by the release managers:
+ - locales/vi_VN: Various fixes
+ - locales/ru_RU: Use U2002 for thousands_sep and mon_throusands_sep.
+
+ [ Denis Barbier ]
+ * debian/patches/localedata/cvs-localedata.diff: A new test target
+ tst-strfmon1 was previously added into localedata/Makefile,
+ so add localedata/tst-strfmon1.c to really perform this test.
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 17 Aug 2006 00:32:25 +0200
+
glibc (2.3.6.ds1-1) unstable; urgency=low
[ Denis Barbier ]
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-bashisms.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-bashisms.diff 2006-08-18 14:26:16 UTC (rev 1765)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-bashisms.diff 2006-08-20 15:00:06 UTC (rev 1766)
@@ -11,3 +11,23 @@
echo $ac_n " suntzu: ASCII -> $to -> ASCII $ac_c"
$PROG -f ASCII -t $to testdata/suntzus |
$PROG -f $to -t ASCII > $temp1 ||
+Index: glibc-2.4.orig/linuxthreads/tst-tls2.sh
+===================================================================
+--- glibc-2.4/linuxthreads/tst-tls2.sh 2003-09-02 02:29:31.000000000 +0200
++++ glibc-2.4/linuxthreads/tst-tls2.sh 2006-08-20 16:28:09.430784935 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ common_objpfx=$1; shift
+ elf_objpfx=$1; shift
+Index: glibc-2.4/nptl/tst-tls6.sh
+===================================================================
+--- glibc-2.4.orig/nptl/tst-tls6.sh 2003-09-03 00:02:59.000000000 +0200
++++ glibc-2.4/nptl/tst-tls6.sh 2006-08-20 16:28:31.045608966 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ common_objpfx=$1; shift
+ elf_objpfx=$1; shift
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-sysctl.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-sysctl.diff 2006-08-18 14:26:16 UTC (rev 1765)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-sysctl.diff 2006-08-20 15:00:06 UTC (rev 1766)
@@ -100,7 +100,7 @@
- if (! sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0)
- && ! sysctl (ioshift_name, 3, &io.shift, &len, NULL, 0))
-+ if (fp = fopen (PATH_PORTBASE, "r"))
++ if ((fp = fopen (PATH_PORTBASE, "r")))
{
- io.initdone = 1;
- return 0;
@@ -109,7 +109,7 @@
+
+ if (n == 1 && (fp = fopen(PATH_PORTSHIFT, "r")))
+ {
-+ n = fscanf (fp, "%i", &io.io_shift);
++ n = fscanf (fp, "%i", &io.shift);
+ fclose(fp);
+ if (n == 1)
+ {
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-08-18 14:26:16 UTC (rev 1765)
+++ glibc-package/trunk/debian/changelog 2006-08-20 15:00:06 UTC (rev 1766)
@@ -1,6 +1,7 @@
glibc (2.3.6.ds1-3) UNRELEASED; urgency=low
- *
+ * patches/any/local-sysctl.diff: fix for arm.
+ * patches/any/local-bashisms.diff: fix bashisms in the testsuite.
-- Aurelien Jarno <aurel32@debian.org> Thu, 17 Aug 2006 01:14:40 +0200
Added: glibc-package/trunk/debian/patches/any/local-bashisms.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-bashisms.diff 2006-08-18 14:26:16 UTC (rev 1765)
+++ glibc-package/trunk/debian/patches/any/local-bashisms.diff 2006-08-20 15:00:06 UTC (rev 1766)
@@ -0,0 +1,21 @@
+# Fix some bashims in the testsuite. The fix is a bit ugly, so I think it has
+# to be rewritten before sending it upstream.
+
+diff -Nurd glibc-2.3.6.orig/linuxthreads/tst-tls2.sh glibc-2.3.6/linuxthreads/tst-tls2.sh
+--- glibc-2.3.6.orig/linuxthreads/tst-tls2.sh 2003-09-02 02:29:31.000000000 +0200
++++ glibc-2.3.6/linuxthreads/tst-tls2.sh 2006-08-20 16:28:09.430784935 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ common_objpfx=$1; shift
+ elf_objpfx=$1; shift
+diff -Nurd glibc-2.3.6.orig/nptl/tst-tls6.sh glibc-2.3.6/nptl/tst-tls6.sh
+--- glibc-2.3.6.orig/nptl/tst-tls6.sh 2003-09-03 00:02:59.000000000 +0200
++++ glibc-2.3.6/nptl/tst-tls6.sh 2006-08-20 16:28:31.045608966 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ common_objpfx=$1; shift
+ elf_objpfx=$1; shift
Modified: glibc-package/trunk/debian/patches/any/local-sysctl.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-sysctl.diff 2006-08-18 14:26:16 UTC (rev 1765)
+++ glibc-package/trunk/debian/patches/any/local-sysctl.diff 2006-08-20 15:00:06 UTC (rev 1766)
@@ -100,7 +100,7 @@
- if (! sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0)
- && ! sysctl (ioshift_name, 3, &io.shift, &len, NULL, 0))
-+ if (fp = fopen (PATH_PORTBASE, "r"))
++ if ((fp = fopen (PATH_PORTBASE, "r")))
{
- io.initdone = 1;
- return 0;
@@ -109,7 +109,7 @@
+
+ if (n == 1 && (fp = fopen(PATH_PORTSHIFT, "r")))
+ {
-+ n = fscanf (fp, "%i", &io.io_shift);
++ n = fscanf (fp, "%i", &io.shift);
+ fclose(fp);
+ if (n == 1)
+ {
Reply to: