r1825 - in glibc-package/branches/glibc-2.5/debian: . patches patches/any patches/arm
Author: aurel32
Date: 2006-10-01 20:28:40 +0000 (Sun, 01 Oct 2006)
New Revision: 1825
Removed:
glibc-package/branches/glibc-2.5/debian/patches/any/cvs-getcwd_c.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/any/local-ldso-disable-hwcap.diff
glibc-package/branches/glibc-2.5/debian/patches/arm/local-no-hwcap.diff
glibc-package/branches/glibc-2.5/debian/patches/series
glibc-package/branches/glibc-2.5/debian/shlibver
Log:
* Remove any/cvs-getcwd_c.diff (merged upstream).
* Update arm/local-no-hwcap.diff.
* Update any/local-ldso-disable-hwcap.diff.
* *Temporarily* disable the following patches, they need to be ported:
- locale/iso4217-RON.diff
- localedata/locales_CH.diff
- localedata/supported.diff
- localedata/locale-hy_AM.diff
- localedata/new-catalan-locales.diff
- localedata/locale-csb_PL.diff
- localedata/locale-te_IN.diff
- localedata/locale-nr_ZA.diff
- localedata/locale-en_NZ.diff
- localedata/dz_BT-collation.diff
- localedata/update-ZA.diff
- localedata/locale-ia.diff
- localedata/locales-sr.diff
- localedata/tailor-iso14651_t1.diff
- localedata/fix-lang.diff
- localedata/fix-unknown-symbols.diff
- localedata/first_weekday.diff
- localedata/sort-UTF8-first.diff
- all/submitted-new-brf-encoding.diff
- all/submitted-uninitialized-byte-LC_CTYPE.diff
- any/submitted-strfmon.diff
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-10-01 19:29:36 UTC (rev 1824)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-10-01 20:28:40 UTC (rev 1825)
@@ -1,4 +1,4 @@
-glibc (2.4.999-1) UNRELEASED; urgency=low
+glibc (2.5-0exp1) UNRELEASED; urgency=low
* New upstream version 2.5.
@@ -15,9 +15,34 @@
* Remove mips/cvs-resource.diff (merged upstream).
* Remove powerpc/cvs-procfs.diff (merged upstream).
* Remove any/cvs-argp_h.diff (merged upstream).
+ * Remove any/cvs-getcwd_c.diff (merged upstream).
* Remove any/cvs-sysctl.diff (merged upstream).
* Remove any/cvs-thread_signals.diff (merged upstream).
* Remove any/cvs-uio_h.diff (merged upstream).
+ * Update arm/local-no-hwcap.diff.
+ * Update any/local-ldso-disable-hwcap.diff.
+ * *Temporarily* disable the following patches, they need to be ported:
+ - locale/iso4217-RON.diff
+ - localedata/locales_CH.diff
+ - localedata/supported.diff
+ - localedata/locale-hy_AM.diff
+ - localedata/new-catalan-locales.diff
+ - localedata/locale-csb_PL.diff
+ - localedata/locale-te_IN.diff
+ - localedata/locale-nr_ZA.diff
+ - localedata/locale-en_NZ.diff
+ - localedata/dz_BT-collation.diff
+ - localedata/update-ZA.diff
+ - localedata/locale-ia.diff
+ - localedata/locales-sr.diff
+ - localedata/tailor-iso14651_t1.diff
+ - localedata/fix-lang.diff
+ - localedata/fix-unknown-symbols.diff
+ - localedata/first_weekday.diff
+ - localedata/sort-UTF8-first.diff
+ - all/submitted-new-brf-encoding.diff
+ - all/submitted-uninitialized-byte-LC_CTYPE.diff
+ - any/submitted-strfmon.diff
-- Aurelien Jarno <aurel32@debian.org> Sun, 1 Oct 2006 19:50:37 +0200
Deleted: glibc-package/branches/glibc-2.5/debian/patches/any/cvs-getcwd_c.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/cvs-getcwd_c.diff 2006-10-01 19:29:36 UTC (rev 1824)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/cvs-getcwd_c.diff 2006-10-01 20:28:40 UTC (rev 1825)
@@ -1,19 +0,0 @@
-Use larger of PATH_MAX and page size when allocating buffer.
-See BZ2418
-Note: CVS 1.24 does not build, MAX macro is undefined
-
-Index: glibc-2.3.6/sysdeps/unix/sysv/linux/getcwd.c
-===================================================================
---- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/getcwd.c
-+++ glibc-2.3.6/sysdeps/unix/sysv/linux/getcwd.c
-@@ -86,7 +86,9 @@
- return NULL;
- }
-
-- alloc_size = PATH_MAX;
-+ alloc_size = __getpagesize ();
-+ if (alloc_size < PATH_MAX)
-+ alloc_size = PATH_MAX;
- }
-
- if (buf == NULL)
Modified: glibc-package/branches/glibc-2.5/debian/patches/any/local-ldso-disable-hwcap.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/local-ldso-disable-hwcap.diff 2006-10-01 19:29:36 UTC (rev 1824)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/local-ldso-disable-hwcap.diff 2006-10-01 20:28:40 UTC (rev 1825)
@@ -76,6 +76,6 @@
continue; \
+ if (disable_hwcap && lib->hwcap != 0) \
+ continue; \
- if (_DL_PLATFORMS_COUNT && platform != -1 \
+ if (_DL_PLATFORMS_COUNT \
&& (lib->hwcap & _DL_HWCAP_PLATFORM) != 0 \
&& (lib->hwcap & _DL_HWCAP_PLATFORM) != platform) \
Modified: glibc-package/branches/glibc-2.5/debian/patches/arm/local-no-hwcap.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/arm/local-no-hwcap.diff 2006-10-01 19:29:36 UTC (rev 1824)
+++ glibc-package/branches/glibc-2.5/debian/patches/arm/local-no-hwcap.diff 2006-10-01 20:28:40 UTC (rev 1825)
@@ -2,12 +2,12 @@
--- ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h Mon Jul 23 12:57:23 2001
+++ ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h Sun Feb 10 06:37:00 2002
-@@ -67,7 +67,7 @@
- HWCAP_ARM_VFP = 1 << 6,
- HWCAP_ARM_EDSP = 1 << 7,
-
-- HWCAP_IMPORTANT = (HWCAP_ARM_HALF | HWCAP_ARM_FAST_MULT)
-+ HWCAP_IMPORTANT = HWCAP_ARM_FAST_MULT
+@@ -54,7 +54,7 @@
+ return GLRO(dl_arm_cap_flags)[idx];
};
+-#define HWCAP_IMPORTANT (HWCAP_ARM_HALF | HWCAP_ARM_FAST_MULT)
++#define HWCAP_IMPORTANT HWCAP_ARM_FAST_MULT
+
static inline int
+ __attribute__ ((unused))
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-01 19:29:36 UTC (rev 1824)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-01 20:28:40 UTC (rev 1825)
@@ -3,7 +3,7 @@
localedata/locale-no_NO.diff -p0
localedata/locale-eu_FR.diff -p0
locale/iso3166-RS.diff
-locale/iso4217-RON.diff -p0
+#locale/iso4217-RON.diff -p0
localedata/locale-ku_TR.diff -p0
#localedata/discard-dz_BT.diff # not needed when complex-collate is applied
locale/fix-exhausted-memory.diff
@@ -16,32 +16,32 @@
locale/fix-C-first_weekday.diff -p0
localedata/tl_PH-yesexpr.diff
localedata/fo_FO-date_fmt.diff
-localedata/locales_CH.diff
+#localedata/locales_CH.diff
localedata/locales-fr.diff
localedata/locales_GB.diff -p0
-localedata/supported.diff
+#localedata/supported.diff
localedata/locale-sa_IN.diff -p0
localedata/locale-en_DK.diff
-localedata/locale-hy_AM.diff
+#localedata/locale-hy_AM.diff
localedata/locale-pl_PL.diff -p0
localedata/locale-wo_SN.diff -p0
-localedata/new-catalan-locales.diff
-localedata/locale-csb_PL.diff
-localedata/locale-te_IN.diff
-localedata/locale-nr_ZA.diff
-localedata/locale-en_NZ.diff
-localedata/dz_BT-collation.diff
-localedata/update-ZA.diff
-localedata/locale-ia.diff
+#localedata/new-catalan-locales.diff
+#localedata/locale-csb_PL.diff
+#localedata/locale-te_IN.diff
+#localedata/locale-nr_ZA.diff
+#localedata/locale-en_NZ.diff
+#localedata/dz_BT-collation.diff
+#localedata/update-ZA.diff
+#localedata/locale-ia.diff
localedata/locale-zh_TW.diff -p0
localedata/new-valencian-locale.diff
localedata/locale-se_NO.diff
-localedata/locales-sr.diff
-localedata/tailor-iso14651_t1.diff -p0
-localedata/fix-lang.diff
-localedata/fix-unknown-symbols.diff
-localedata/first_weekday.diff -p0
-localedata/sort-UTF8-first.diff -p0
+#localedata/locales-sr.diff
+#localedata/tailor-iso14651_t1.diff -p0
+#localedata/fix-lang.diff
+#localedata/fix-unknown-symbols.diff
+#localedata/first_weekday.diff -p0
+#localedata/sort-UTF8-first.diff -p0
localedata/local-all-no-archive.diff
#alpha/submitted-pic.diff -p0 # g: suspended
@@ -91,10 +91,9 @@
all/local-remove-manual.diff
all/local-ru_RU.diff -p1
all/local-pt_BR.diff -p1
-all/submitted-new-brf-encoding.diff -p0
-all/submitted-uninitialized-byte-LC_CTYPE.diff
+#all/submitted-new-brf-encoding.diff -p0
+#all/submitted-uninitialized-byte-LC_CTYPE.diff
-any/cvs-getcwd_c.diff -p1
any/local-__thread.diff -p0
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
@@ -121,4 +120,4 @@
any/local-version-sanity.diff -p1
any/local-dynamic-resolvconf.diff -p1
any/submitted-nis-netgrp.diff
-any/submitted-strfmon.diff
+#any/submitted-strfmon.diff
Modified: glibc-package/branches/glibc-2.5/debian/shlibver
===================================================================
--- glibc-package/branches/glibc-2.5/debian/shlibver 2006-10-01 19:29:36 UTC (rev 1824)
+++ glibc-package/branches/glibc-2.5/debian/shlibver 2006-10-01 20:28:40 UTC (rev 1825)
@@ -1 +1 @@
-shlib_dep_ver = 2.4.999-1
+shlib_dep_ver = 2.5
Reply to: