[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2375: roll back part of memcpy uplift: was only for x86_64 (bug 3470)
Mats Wichmann
mats at linuxfoundation.org
Fri Mar 8 17:20:28 UTC 2013
------------------------------------------------------------
revno: 2375
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Fri 2013-03-08 10:20:28 -0700
message:
roll back part of memcpy uplift: was only for x86_64 (bug 3470)
modified:
dynchk/liblsbdynchk.Version.i686
dynchk/liblsbdynchk.Version.ia64
dynchk/liblsbdynchk.Version.ppc
dynchk/liblsbdynchk.Version.ppc64
dynchk/liblsbdynchk.Version.s390
dynchk/liblsbdynchk.Version.s390x
dynchk/libs/libc/memcpy.c
elfchk/dynsyms.c
libchk/libc_so_6.c
libchk/libc_so_6_1.c
package/Makefile
-------------- next part --------------
=== modified file 'dynchk/liblsbdynchk.Version.i686'
--- a/dynchk/liblsbdynchk.Version.i686 2013-03-08 15:53:17 +0000
+++ b/dynchk/liblsbdynchk.Version.i686 2013-03-08 17:20:28 +0000
@@ -1221,6 +1221,7 @@
memccpy;
memchr;
memcmp;
+ memcpy;
memmem;
memmove;
memset;
@@ -1703,10 +1704,6 @@
pthread_mutexattr_setrobust;
};
-GLIBC_2.14 {
- memcpy;
-};
-
GLIBC_2.15 {
posix_spawn;
posix_spawnp;
=== modified file 'dynchk/liblsbdynchk.Version.ia64'
--- a/dynchk/liblsbdynchk.Version.ia64 2013-03-08 15:53:17 +0000
+++ b/dynchk/liblsbdynchk.Version.ia64 2013-03-08 17:20:28 +0000
@@ -791,10 +791,6 @@
pthread_mutexattr_setrobust;
};
-GLIBC_2.14 {
- memcpy;
-};
-
GLIBC_2.15 {
posix_spawn;
posix_spawnp;
@@ -1499,6 +1495,7 @@
memccpy;
memchr;
memcmp;
+ memcpy;
memmem;
memmove;
memrchr;
=== modified file 'dynchk/liblsbdynchk.Version.ppc'
--- a/dynchk/liblsbdynchk.Version.ppc 2013-03-08 15:53:17 +0000
+++ b/dynchk/liblsbdynchk.Version.ppc 2013-03-08 17:20:28 +0000
@@ -1217,6 +1217,7 @@
memccpy;
memchr;
memcmp;
+ memcpy;
memmem;
memmove;
memset;
@@ -1697,10 +1698,6 @@
pthread_mutexattr_setrobust;
};
-GLIBC_2.14 {
- memcpy;
-};
-
GLIBC_2.15 {
posix_spawn;
posix_spawnp;
=== modified file 'dynchk/liblsbdynchk.Version.ppc64'
--- a/dynchk/liblsbdynchk.Version.ppc64 2013-03-08 15:53:17 +0000
+++ b/dynchk/liblsbdynchk.Version.ppc64 2013-03-08 17:20:28 +0000
@@ -777,10 +777,6 @@
pthread_mutexattr_setrobust;
};
-GLIBC_2.14 {
- memcpy;
-};
-
GLIBC_2.15 {
posix_spawn;
posix_spawnp;
@@ -1529,6 +1525,7 @@
memccpy;
memchr;
memcmp;
+ memcpy;
memmem;
memmove;
memrchr;
=== modified file 'dynchk/liblsbdynchk.Version.s390'
--- a/dynchk/liblsbdynchk.Version.s390 2013-03-08 15:53:17 +0000
+++ b/dynchk/liblsbdynchk.Version.s390 2013-03-08 17:20:28 +0000
@@ -1220,6 +1220,7 @@
memccpy;
memchr;
memcmp;
+ memcpy;
memmem;
memmove;
memset;
@@ -1702,10 +1703,6 @@
pthread_mutexattr_setrobust;
};
-GLIBC_2.14 {
- memcpy;
-};
-
GLIBC_2.15 {
posix_spawn;
posix_spawnp;
=== modified file 'dynchk/liblsbdynchk.Version.s390x'
--- a/dynchk/liblsbdynchk.Version.s390x 2013-03-08 15:53:17 +0000
+++ b/dynchk/liblsbdynchk.Version.s390x 2013-03-08 17:20:28 +0000
@@ -777,10 +777,6 @@
pthread_mutexattr_setrobust;
};
-GLIBC_2.14 {
- memcpy;
-};
-
GLIBC_2.15 {
posix_spawn;
posix_spawnp;
@@ -1485,6 +1481,7 @@
memccpy;
memchr;
memcmp;
+ memcpy;
memmem;
memmove;
memrchr;
=== modified file 'dynchk/libs/libc/memcpy.c'
--- a/dynchk/libs/libc/memcpy.c 2013-03-08 15:53:17 +0000
+++ b/dynchk/libs/libc/memcpy.c 2013-03-08 17:20:28 +0000
@@ -16,25 +16,25 @@
__lsb_output(4, "Invoking wrapper for memcpy()");
if(!funcptr)
#if defined __i386__
- funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.14");
+ funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.0");
#endif
#if defined __ia64__
- funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.14");
+ funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.2");
#endif
#if defined __powerpc__ && !defined __powerpc64__
- funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.14");
+ funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.0");
#endif
#if defined __powerpc64__
- funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.14");
+ funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.3");
#endif
#if defined __s390__ && !defined __s390x__
- funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.14");
+ funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.0");
#endif
#if defined __x86_64__
funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.14");
#endif
#if defined __s390x__
- funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.14");
+ funcptr = dlvsym(RTLD_NEXT, "memcpy", "GLIBC_2.2");
#endif
if(!funcptr) {
__lsb_output(-1, "Failed to load memcpy. Probably the library was loaded using dlopen, we don't support this at the moment.");
=== modified file 'elfchk/dynsyms.c'
--- a/elfchk/dynsyms.c 2013-03-08 15:53:17 +0000
+++ b/elfchk/dynsyms.c 2013-03-08 17:20:28 +0000
@@ -443262,22 +443262,22 @@
{"memcmp","GLIBC_2.2.5",0,LSB_Base},
#endif
#if defined __i386__
- {"memcpy","GLIBC_2.14",0,LSB_Base},
+ {"memcpy","GLIBC_2.0",0,LSB_Base},
#endif
#if defined __ia64__
- {"memcpy","GLIBC_2.14",0,LSB_Base},
+ {"memcpy","GLIBC_2.2",0,LSB_Base},
#endif
#if defined __powerpc__ && !defined __powerpc64__
- {"memcpy","GLIBC_2.14",0,LSB_Base},
+ {"memcpy","GLIBC_2.0",0,LSB_Base},
#endif
#if defined __powerpc64__
- {"memcpy","GLIBC_2.14",0,LSB_Base},
+ {"memcpy","GLIBC_2.3",0,LSB_Base},
#endif
#if defined __s390__ && !defined __s390x__
- {"memcpy","GLIBC_2.14",0,LSB_Base},
+ {"memcpy","GLIBC_2.0",0,LSB_Base},
#endif
#if defined __s390x__
- {"memcpy","GLIBC_2.14",0,LSB_Base},
+ {"memcpy","GLIBC_2.2",0,LSB_Base},
#endif
#if defined __x86_64__
{"memcpy","GLIBC_2.14",0,LSB_Base},
=== modified file 'libchk/libc_so_6.c'
--- a/libchk/libc_so_6.c 2013-03-08 15:53:17 +0000
+++ b/libchk/libc_so_6.c 2013-03-08 17:20:28 +0000
@@ -8764,19 +8764,19 @@
{"memcmp","GLIBC_2.2.5",0,LSB_Core,4,1},
#endif
#if defined __i386__
- {"memcpy","GLIBC_2.14",0,LSB_Core,4,1},
+ {"memcpy","GLIBC_2.0",0,LSB_Core,4,1},
#endif
#if defined __powerpc__ && !defined __powerpc64__
- {"memcpy","GLIBC_2.14",0,LSB_Core,4,1},
+ {"memcpy","GLIBC_2.0",0,LSB_Core,4,1},
#endif
#if defined __powerpc64__
- {"memcpy","GLIBC_2.14",0,LSB_Core,8,1},
+ {"memcpy","GLIBC_2.3",0,LSB_Core,8,1},
#endif
#if defined __s390__ && !defined __s390x__
- {"memcpy","GLIBC_2.14",0,LSB_Core,4,1},
+ {"memcpy","GLIBC_2.0",0,LSB_Core,4,1},
#endif
#if defined __s390x__
- {"memcpy","GLIBC_2.14",0,LSB_Core,8,1},
+ {"memcpy","GLIBC_2.2",0,LSB_Core,8,1},
#endif
#if defined __x86_64__
{"memcpy","GLIBC_2.14",0,LSB_Core,8,1},
=== modified file 'libchk/libc_so_6_1.c'
--- a/libchk/libc_so_6_1.c 2013-03-08 15:53:17 +0000
+++ b/libchk/libc_so_6_1.c 2013-03-08 17:20:28 +0000
@@ -1531,7 +1531,7 @@
{"memcmp","GLIBC_2.2",0,LSB_Core,4,1},
#endif
#if defined __ia64__
- {"memcpy","GLIBC_2.14",0,LSB_Core,8,1},
+ {"memcpy","GLIBC_2.2",0,LSB_Core,8,1},
#endif
#if defined __ia64__
{"memmem","GLIBC_2.2",0,LSB_Core,8,1},
=== modified file 'package/Makefile'
--- a/package/Makefile 2013-03-08 15:53:17 +0000
+++ b/package/Makefile 2013-03-08 17:20:28 +0000
@@ -24,7 +24,7 @@
# We define this here instead of directly in the spec file as
# we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=3
+RPM_PACKAGE_RELEASE=4
# Derive date string for daily snapshots
ISO_DATE:=$(shell date +"%Y%m%d")
More information about the lsb-messages
mailing list