r6802 - in glibc-package/branches/glibc-2.22/debian/patches: alpha amd64 any localedata
Author: aurel32
Date: 2015-12-11 16:49:27 +0000 (Fri, 11 Dec 2015)
New Revision: 6802
Removed:
glibc-package/branches/glibc-2.22/debian/patches/alpha/submitted-PTR_MANGLE.diff
glibc-package/branches/glibc-2.22/debian/patches/amd64/local-biarch.diff
glibc-package/branches/glibc-2.22/debian/patches/any/local-base.diff
glibc-package/branches/glibc-2.22/debian/patches/any/local-globfree-clear.diff
glibc-package/branches/glibc-2.22/debian/patches/any/local-sysctl.diff
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-rlimit.diff
glibc-package/branches/glibc-2.22/debian/patches/localedata/locale-tt_RU.diff
Log:
Remove old patches not used anymore and not even in patches/series
Mostly leftovers from badly done merges
Deleted: glibc-package/branches/glibc-2.22/debian/patches/alpha/submitted-PTR_MANGLE.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/alpha/submitted-PTR_MANGLE.diff 2015-12-11 15:03:39 UTC (rev 6801)
+++ glibc-package/branches/glibc-2.22/debian/patches/alpha/submitted-PTR_MANGLE.diff 2015-12-11 16:49:27 UTC (rev 6802)
@@ -1,40 +0,0 @@
-2011-03-26 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/unix/alpha/sysdep.h (PTR_MANGLE): Move out of ASSEMBLER
- ifdef.
- (PTR_DEMANGLE): Likewise.
-
----
- sysdeps/unix/alpha/sysdep.h | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/sysdeps/unix/alpha/sysdep.h
-+++ b/sysdeps/unix/alpha/sysdep.h
-@@ -154,6 +154,8 @@
-
- #else /* !ASSEMBLER */
-
-+#include <stdint.h>
-+
- /* In order to get __set_errno() definition in INLINE_SYSCALL. */
- #include <errno.h>
-
-@@ -334,11 +336,11 @@
- _sc_ret = _sc_0, _sc_err = _sc_19; \
- }
-
-+#endif /* ASSEMBLER */
-+
- /* Pointer mangling support. Note that tls access is slow enough that
- we don't deoptimize things by placing the pointer check value there. */
-
--#include <stdint.h>
--
- #if !IS_IN (libc) && IS_IN (rtld)
- # ifdef __ASSEMBLER__
- # define PTR_MANGLE(dst, src, tmp) \
-@@ -382,4 +384,3 @@
- # endif
- #endif
-
--#endif /* ASSEMBLER */
Deleted: glibc-package/branches/glibc-2.22/debian/patches/amd64/local-biarch.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/amd64/local-biarch.diff 2015-12-11 15:03:39 UTC (rev 6801)
+++ glibc-package/branches/glibc-2.22/debian/patches/amd64/local-biarch.diff 2015-12-11 16:49:27 UTC (rev 6802)
@@ -1,27 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Allow ldconfig to work on x86-64/i386 biarch systems
-
----
- sysdeps/unix/sysv/linux/x86_64/dl-cache.h | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
---- a/sysdeps/unix/sysv/linux/x86_64/dl-cache.h
-+++ b/sysdeps/unix/sysv/linux/x86_64/dl-cache.h
-@@ -27,7 +27,7 @@
- size_t len = strlen (dir); \
- char path[len + 4]; \
- memcpy (path, dir, len + 1); \
-- if (len >= 6 && ! memcmp (path + len - 6, "/lib64", 6)) \
-+ if (len >= 6 && ! memcmp (path + len - 6, "/lib32", 6)) \
- { \
- len -= 2; \
- path[len] = '\0'; \
-@@ -41,7 +41,7 @@
- add_dir (path); \
- if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4)) \
- { \
-- memcpy (path + len, "64", 3); \
-+ memcpy (path + len, "32", 3); \
- add_dir (path); \
- memcpy (path + len, "x32", 4); \
- add_dir (path); \
Deleted: glibc-package/branches/glibc-2.22/debian/patches/any/local-base.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/local-base.diff 2015-12-11 15:03:39 UTC (rev 6801)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/local-base.diff 2015-12-11 16:49:27 UTC (rev 6802)
@@ -1,64 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: hjl libc-base patch
-
-2003-05-15 <hongjiu.lu@intel.com>
-
- * elf/do-lookup.h (FCT): Try the base version, the first
- version and then the default version, in that order, for
- the old unversioned reference.
-
---- elf/do-lookup.h.base 2003-05-15 09:29:25.000000000 -0700
-+++ elf/do-lookup.h 2003-05-15 09:24:24.000000000 -0700
-@@ -52,7 +52,8 @@ FCT (const char *undef_name, unsigned lo
- const ElfW(Sym) *sym;
- #if ! VERSIONED
- int num_versions = 0;
-- const ElfW(Sym) *versioned_sym = NULL;
-+ const ElfW(Sym) *default_version = NULL;
-+ const ElfW(Sym) *first_version = NULL;
- #endif
-
- map = list[i];
-@@ -155,16 +156,29 @@ FCT (const char *undef_name, unsigned lo
- public interface should be returned. */
- if (verstab != NULL)
- {
-- if ((verstab[symidx] & 0x7fff)
-- >= ((flags & DL_LOOKUP_RETURN_NEWEST) ? 2 : 3))
-+ ElfW(Half) ndx = verstab[symidx] & 0x7fff;
-+ if (ndx >= ((flags & DL_LOOKUP_RETURN_NEWEST) ? 2 : 3))
- {
- /* Don't accept hidden symbols. */
- if ((verstab[symidx] & 0x8000) == 0 && num_versions++ == 0)
- /* No version so far. */
-- versioned_sym = sym;
-+ default_version = sym;
-
- continue;
- }
-+ if ((flags & DL_LOOKUP_RETURN_NEWEST) == 0 && ndx != 0)
-+ {
-+ /* ndx == 1 is the base version. We will use it for
-+ old unversioned application. */
-+ if (ndx != 1)
-+ {
-+ /* We remember the first version and keep looking
-+ for the base version. */
-+ if (ndx == 2)
-+ first_version = sym;
-+ continue;
-+ }
-+ }
- }
- #endif
-
-@@ -179,7 +193,8 @@ FCT (const char *undef_name, unsigned lo
- #if VERSIONED
- sym = NULL;
- #else
-- sym = num_versions == 1 ? versioned_sym : NULL;
-+ sym = first_version ?: (num_versions == 1
-+ ? default_version : NULL);
- #endif
-
- if (sym != NULL)
Deleted: glibc-package/branches/glibc-2.22/debian/patches/any/local-globfree-clear.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/local-globfree-clear.diff 2015-12-11 15:03:39 UTC (rev 6801)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/local-globfree-clear.diff 2015-12-11 16:49:27 UTC (rev 6802)
@@ -1,24 +0,0 @@
-# DP: Description: Workaround patch to make globfree() clear pglob->gl_pathc
-# DP: Related bugs: #264884
-# DP: Dpatch author: Jeff Licquia
-# DP: Patch author: Jeff Licquia <licquia@progeny.com>
-# DP: Upstream status: Not submitted
-# DP: Status Details: (gotom) I think it's harmless, but I doubt it's sanity.
-# It's applied for sarge LFS conformance.
-# However my test does not show any problems. Moreover,
-# if gl_pathv is not cleared after GLOB_ABORTED under
-# gl_pathc == 0, it's glob() bug.
-# This patch should be reconsidered to apply after sarge.
-# DP: Date: 2004-07-22
-
---- glibc-2.3.2-old/sysdeps/generic/glob.c 2004-07-26 17:49:07.000000000 -0400
-+++ glibc-2.3.2/sysdeps/generic/glob.c 2004-07-26 17:51:14.000000000 -0400
-@@ -1105,6 +1105,8 @@
- if (pglob->gl_pathv[pglob->gl_offs + i] != NULL)
- free ((__ptr_t) pglob->gl_pathv[pglob->gl_offs + i]);
- free ((__ptr_t) pglob->gl_pathv);
-+ pglob->gl_pathc = 0;
-+ pglob->gl_pathv = NULL;
- }
- }
- #if defined _LIBC && !defined globfree
Deleted: glibc-package/branches/glibc-2.22/debian/patches/any/local-sysctl.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/local-sysctl.diff 2015-12-11 15:03:39 UTC (rev 6801)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/local-sysctl.diff 2015-12-11 16:49:27 UTC (rev 6802)
@@ -1,52 +0,0 @@
---- sysdeps/unix/sysv/linux/arm/ioperm.c.orig
-+++ sysdeps/unix/sysv/linux/arm/ioperm.c
-@@ -49,6 +49,8 @@
-
- #define PATH_ARM_SYSTYPE "/etc/arm_systype"
- #define PATH_CPUINFO "/proc/cpuinfo"
-+#define PATH_PORTBASE "/proc/bus/isa/portbase"
-+#define PATH_PORTSHIFT "/proc/bus/isa/portshift"
-
- #define MAX_PORT 0x10000
-
-@@ -100,15 +102,25 @@
- {
- char systype[256];
- int i, n;
-- static int iobase_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_BASE };
-- static int ioshift_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_SHIFT };
-+ FILE * fp;
-+
- size_t len = sizeof(io.base);
-
-- 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")))
- {
-- io.initdone = 1;
-- return 0;
-+ n = fscanf (fp, "%li", &io.io_base);
-+ fclose(fp);
-+
-+ if (n == 1 && (fp = fopen(PATH_PORTSHIFT, "r")))
-+ {
-+ n = fscanf (fp, "%i", &io.shift);
-+ fclose(fp);
-+ if (n == 1)
-+ {
-+ io.initdone = 1;
-+ return 0;
-+ }
-+ }
- }
-
- n = readlink (PATH_ARM_SYSTYPE, systype, sizeof (systype) - 1);
-@@ -127,8 +139,6 @@
- }
- else
- {
-- FILE * fp;
--
- fp = fopen (PATH_CPUINFO, "r");
- if (! fp)
- return -1;
Deleted: glibc-package/branches/glibc-2.22/debian/patches/any/submitted-rlimit.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/submitted-rlimit.diff 2015-12-11 15:03:39 UTC (rev 6801)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/submitted-rlimit.diff 2015-12-11 16:49:27 UTC (rev 6802)
@@ -1,35 +0,0 @@
-2005-06-20 Jakub Jelinek <jakub@redhat.com>
-
- * sysdeps/unix/sysv/linux/bits/resource.h (RLIMIT_NICE,
- RLIMIT_RTPRIO): Add.
- (RLIMIT_NLIMITS): Adjust.
- * sysdeps/unix/sysv/linux/alpha/bits/resource.h (RLIMIT_NICE,
- RLIMIT_RTPRIO): Add.
- (RLIMIT_NLIMITS): Adjust.
- * sysdeps/unix/sysv/linux/mips/bits/resource.h (RLIMIT_NICE,
- RLIMIT_RTPRIO): Add.
- (RLIMIT_NLIMITS): Adjust.
- * sysdeps/unix/sysv/linux/sparc/bits/resource.h (RLIMIT_NICE,
- RLIMIT_RTPRIO): Add.
- (RLIMIT_NLIMITS): Adjust.
-
-
-diff --git a/sysdeps/unix/sysv/linux/bits/resource.h b/sysdeps/unix/sysv/linux/bits/resource.h
-index ca2c9f0..40b581b 100644
---- a/sysdeps/unix/sysv/linux/bits/resource.h
-+++ b/sysdeps/unix/sysv/linux/bits/resource.h
-@@ -100,7 +100,13 @@ enum __rlimit_resource
- __RLIMIT_RTPRIO = 14,
- #define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-
-- __RLIMIT_NLIMITS = 15,
-+ /* Maximum CPU time that a process scheduled under a real-time
-+ scheduling policy may consume without making a blocking
-+ system call. */
-+ __RLIMIT_RTTIME = 15,
-+#define RLIMIT_RTTIME __RLIMIT_RTTIME
-+
-+ __RLIMIT_NLIMITS = 16,
- __RLIM_NLIMITS = __RLIMIT_NLIMITS
- #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
- #define RLIM_NLIMITS __RLIM_NLIMITS
Deleted: glibc-package/branches/glibc-2.22/debian/patches/localedata/locale-tt_RU.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/localedata/locale-tt_RU.diff 2015-12-11 15:03:39 UTC (rev 6801)
+++ glibc-package/branches/glibc-2.22/debian/patches/localedata/locale-tt_RU.diff 2015-12-11 16:49:27 UTC (rev 6802)
@@ -1,18 +0,0 @@
-2010-05-04 Andreas Schwab <schwab@redhat.com>
-
- * SUPPORTED (SUPPORTED-LOCALES): Fix name of tt_RU.UTF-8@iqtelif
- locale.
-
-diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
-index a1ebcac..d665961 100644
---- a/localedata/SUPPORTED
-+++ b/localedata/SUPPORTED
-@@ -386,7 +386,7 @@ tr_TR.UTF-8/UTF-8 \
- tr_TR/ISO-8859-9 \
- ts_ZA/UTF-8 \
- tt_RU.UTF-8/UTF-8 \
--tt_RU@iqtelif.UTF-8/UTF-8 \
-+tt_RU.UTF-8@iqtelif/UTF-8 \
- ug_CN/UTF-8 \
- uk_UA.UTF-8/UTF-8 \
- uk_UA/KOI8-U \
Reply to: