[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2373: fix two mistyped interface names from POSIX addition (bug 3469)
Mats Wichmann
mats at linuxfoundation.org
Fri Mar 8 15:39:16 UTC 2013
------------------------------------------------------------
revno: 2373
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Fri 2013-03-08 08:39:16 -0700
message:
fix two mistyped interface names from POSIX addition (bug 3469)
removed:
dynchk/libs/libc/iscnrtl_l.c
dynchk/libs/libc/stncasecmp_l.c
added:
dynchk/libs/libc/iscntrl_l.c
dynchk/libs/libc/strncasecmp_l.c
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/liblsbdynchk.Version.x86_64
dynchk/libs/libasound/snd_input_buffer_open.c
dynchk/libs/libasound/snd_pcm_bytes_to_frames.c
dynchk/libs/libasound/snd_pcm_bytes_to_samples.c
dynchk/libs/libc/gen.mk
dynchk/libs/libc/swab.c
dynchk/tests/header_list.h
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-06 23:52:21 +0000
+++ b/dynchk/liblsbdynchk.Version.i686 2013-03-08 15:39:16 +0000
@@ -2192,7 +2192,7 @@
isalnum_l;
isalpha_l;
isblank_l;
- iscnrtl_l;
+ iscntrl_l;
isdigit_l;
isgraph_l;
islower_l;
@@ -2217,10 +2217,10 @@
lutimes;
newlocale;
sendfile64;
- stncasecmp_l;
strcasecmp_l;
strcoll_l;
strfmon_l;
+ strncasecmp_l;
strxfrm_l;
tolower_l;
toupper_l;
=== modified file 'dynchk/liblsbdynchk.Version.ia64'
--- a/dynchk/liblsbdynchk.Version.ia64 2013-03-06 23:52:21 +0000
+++ b/dynchk/liblsbdynchk.Version.ia64 2013-03-08 15:39:16 +0000
@@ -2187,7 +2187,7 @@
isalnum_l;
isalpha_l;
isblank_l;
- iscnrtl_l;
+ iscntrl_l;
isdigit_l;
isgraph_l;
islower_l;
@@ -2212,10 +2212,10 @@
lutimes;
newlocale;
sendfile64;
- stncasecmp_l;
strcasecmp_l;
strcoll_l;
strfmon_l;
+ strncasecmp_l;
strxfrm_l;
tolower_l;
toupper_l;
=== modified file 'dynchk/liblsbdynchk.Version.ppc'
--- a/dynchk/liblsbdynchk.Version.ppc 2013-03-06 23:52:21 +0000
+++ b/dynchk/liblsbdynchk.Version.ppc 2013-03-08 15:39:16 +0000
@@ -2183,7 +2183,7 @@
isalnum_l;
isalpha_l;
isblank_l;
- iscnrtl_l;
+ iscntrl_l;
isdigit_l;
isgraph_l;
islower_l;
@@ -2208,10 +2208,10 @@
lutimes;
newlocale;
sendfile64;
- stncasecmp_l;
strcasecmp_l;
strcoll_l;
strfmon_l;
+ strncasecmp_l;
strxfrm_l;
tolower_l;
toupper_l;
=== modified file 'dynchk/liblsbdynchk.Version.ppc64'
--- a/dynchk/liblsbdynchk.Version.ppc64 2013-03-06 23:52:21 +0000
+++ b/dynchk/liblsbdynchk.Version.ppc64 2013-03-08 15:39:16 +0000
@@ -2159,7 +2159,7 @@
isalnum_l;
isalpha_l;
isblank_l;
- iscnrtl_l;
+ iscntrl_l;
isdigit_l;
isgraph_l;
islower_l;
@@ -2184,10 +2184,10 @@
lutimes;
newlocale;
sendfile64;
- stncasecmp_l;
strcasecmp_l;
strcoll_l;
strfmon_l;
+ strncasecmp_l;
strxfrm_l;
tolower_l;
toupper_l;
=== modified file 'dynchk/liblsbdynchk.Version.s390'
--- a/dynchk/liblsbdynchk.Version.s390 2013-03-06 23:52:21 +0000
+++ b/dynchk/liblsbdynchk.Version.s390 2013-03-08 15:39:16 +0000
@@ -2182,7 +2182,7 @@
isalnum_l;
isalpha_l;
isblank_l;
- iscnrtl_l;
+ iscntrl_l;
isdigit_l;
isgraph_l;
islower_l;
@@ -2207,10 +2207,10 @@
lutimes;
newlocale;
sendfile64;
- stncasecmp_l;
strcasecmp_l;
strcoll_l;
strfmon_l;
+ strncasecmp_l;
strxfrm_l;
tolower_l;
toupper_l;
=== modified file 'dynchk/liblsbdynchk.Version.s390x'
--- a/dynchk/liblsbdynchk.Version.s390x 2013-03-06 23:52:21 +0000
+++ b/dynchk/liblsbdynchk.Version.s390x 2013-03-08 15:39:16 +0000
@@ -2170,7 +2170,7 @@
isalnum_l;
isalpha_l;
isblank_l;
- iscnrtl_l;
+ iscntrl_l;
isdigit_l;
isgraph_l;
islower_l;
@@ -2195,10 +2195,10 @@
lutimes;
newlocale;
sendfile64;
- stncasecmp_l;
strcasecmp_l;
strcoll_l;
strfmon_l;
+ strncasecmp_l;
strxfrm_l;
tolower_l;
toupper_l;
=== modified file 'dynchk/liblsbdynchk.Version.x86_64'
--- a/dynchk/liblsbdynchk.Version.x86_64 2013-03-06 23:52:21 +0000
+++ b/dynchk/liblsbdynchk.Version.x86_64 2013-03-08 15:39:16 +0000
@@ -2171,7 +2171,7 @@
isalnum_l;
isalpha_l;
isblank_l;
- iscnrtl_l;
+ iscntrl_l;
isdigit_l;
isgraph_l;
islower_l;
@@ -2196,10 +2196,10 @@
lutimes;
newlocale;
sendfile64;
- stncasecmp_l;
strcasecmp_l;
strcoll_l;
strfmon_l;
+ strncasecmp_l;
strxfrm_l;
tolower_l;
toupper_l;
=== modified file 'dynchk/libs/libasound/snd_input_buffer_open.c'
--- a/dynchk/libs/libasound/snd_input_buffer_open.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libasound/snd_input_buffer_open.c 2013-03-08 15:39:16 +0000
@@ -4,7 +4,7 @@
#include "../../misc/lsb_output.h"
#include "stdlib.h"
#include <alsa/input.h>
-#include <sys/types.h>
+#include <lsb/types.h>
#undef snd_input_buffer_open
static int(*funcptr) (snd_input_t * * , const char * , ssize_t ) = 0;
=== modified file 'dynchk/libs/libasound/snd_pcm_bytes_to_frames.c'
--- a/dynchk/libs/libasound/snd_pcm_bytes_to_frames.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libasound/snd_pcm_bytes_to_frames.c 2013-03-08 15:39:16 +0000
@@ -4,7 +4,7 @@
#include "../../misc/lsb_output.h"
#include "stdlib.h"
#include <alsa/pcm.h>
-#include <sys/types.h>
+#include <lsb/types.h>
#undef snd_pcm_bytes_to_frames
static snd_pcm_sframes_t(*funcptr) (snd_pcm_t * , ssize_t ) = 0;
=== modified file 'dynchk/libs/libasound/snd_pcm_bytes_to_samples.c'
--- a/dynchk/libs/libasound/snd_pcm_bytes_to_samples.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libasound/snd_pcm_bytes_to_samples.c 2013-03-08 15:39:16 +0000
@@ -4,7 +4,7 @@
#include "../../misc/lsb_output.h"
#include "stdlib.h"
#include <alsa/pcm.h>
-#include <sys/types.h>
+#include <lsb/types.h>
#undef snd_pcm_bytes_to_samples
static long int(*funcptr) (snd_pcm_t * , ssize_t ) = 0;
=== modified file 'dynchk/libs/libc/gen.mk'
--- a/dynchk/libs/libc/gen.mk 2013-03-06 23:52:21 +0000
+++ b/dynchk/libs/libc/gen.mk 2013-03-08 15:39:16 +0000
@@ -424,8 +424,8 @@
isatty.o \
isblank.o \
isblank_l.o \
-iscnrtl_l.o \
iscntrl.o \
+iscntrl_l.o \
isdigit.o \
isdigit_l.o \
isgraph.o \
@@ -735,7 +735,6 @@
statvfs.o \
statvfs64.o \
stime.o \
-stncasecmp_l.o \
stpcpy.o \
stpncpy.o \
strcasecmp.o \
@@ -753,6 +752,7 @@
strfmon_l.o \
strftime.o \
strncasecmp.o \
+strncasecmp_l.o \
strncat.o \
strncmp.o \
strncpy.o \
=== removed file 'dynchk/libs/libc/iscnrtl_l.c'
--- a/dynchk/libs/libc/iscnrtl_l.c 2013-03-06 23:52:21 +0000
+++ b/dynchk/libs/libc/iscnrtl_l.c 1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-// Generated by gen_lib.pl
-
-#include "../../tests/type_tests.h"
-#include "../../misc/lsb_output.h"
-#include "stdlib.h"
-#include <locale.h>
-#include <ctype.h>
-#undef iscnrtl_l
-static int(*funcptr) (int , locale_t ) = 0;
-
-extern int __lsb_check_params;
-int iscnrtl_l (int arg0 , locale_t arg1 )
-{
- int reset_flag = __lsb_check_params;
- int ret_value ;
- __lsb_output(4, "Invoking wrapper for iscnrtl_l()");
- if(!funcptr)
- #if 1
- funcptr = dlvsym(RTLD_NEXT, "iscnrtl_l", "GLIBC_2.3");
- #endif
- if(!funcptr) {
- __lsb_output(-1, "Failed to load iscnrtl_l. Probably the library was loaded using dlopen, we don't support this at the moment.");
- exit(1);
- }
- if(__lsb_check_params)
- {
- __lsb_check_params=0;
- __lsb_output(4, "iscnrtl_l() - validating");
- validate_NULL_TYPETYPE( arg0, "iscnrtl_l - arg0 (c)");
- validate_NULL_TYPETYPE( arg1, "iscnrtl_l - arg1 (locale)");
- }
- ret_value = funcptr(arg0, arg1);
- __lsb_check_params = reset_flag;
- return ret_value;
-}
-
=== added file 'dynchk/libs/libc/iscntrl_l.c'
--- a/dynchk/libs/libc/iscntrl_l.c 1970-01-01 00:00:00 +0000
+++ b/dynchk/libs/libc/iscntrl_l.c 2013-03-08 15:39:16 +0000
@@ -0,0 +1,36 @@
+// Generated by gen_lib.pl
+
+#include "../../tests/type_tests.h"
+#include "../../misc/lsb_output.h"
+#include "stdlib.h"
+#include <locale.h>
+#include <ctype.h>
+#undef iscntrl_l
+static int(*funcptr) (int , locale_t ) = 0;
+
+extern int __lsb_check_params;
+int iscntrl_l (int arg0 , locale_t arg1 )
+{
+ int reset_flag = __lsb_check_params;
+ int ret_value ;
+ __lsb_output(4, "Invoking wrapper for iscntrl_l()");
+ if(!funcptr)
+ #if 1
+ funcptr = dlvsym(RTLD_NEXT, "iscntrl_l", "GLIBC_2.3");
+ #endif
+ if(!funcptr) {
+ __lsb_output(-1, "Failed to load iscntrl_l. Probably the library was loaded using dlopen, we don't support this at the moment.");
+ exit(1);
+ }
+ if(__lsb_check_params)
+ {
+ __lsb_check_params=0;
+ __lsb_output(4, "iscntrl_l() - validating");
+ validate_NULL_TYPETYPE( arg0, "iscntrl_l - arg0 (c)");
+ validate_NULL_TYPETYPE( arg1, "iscntrl_l - arg1 (locale)");
+ }
+ ret_value = funcptr(arg0, arg1);
+ __lsb_check_params = reset_flag;
+ return ret_value;
+}
+
=== removed file 'dynchk/libs/libc/stncasecmp_l.c'
--- a/dynchk/libs/libc/stncasecmp_l.c 2013-03-06 23:52:21 +0000
+++ b/dynchk/libs/libc/stncasecmp_l.c 1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-// Generated by gen_lib.pl
-
-#include "../../tests/type_tests.h"
-#include "../../misc/lsb_output.h"
-#include "stdlib.h"
-#include <stddef.h>
-#include <locale.h>
-#include <strings.h>
-#undef stncasecmp_l
-static int(*funcptr) (const char * , const char * , size_t , locale_t ) = 0;
-
-extern int __lsb_check_params;
-int stncasecmp_l (const char * arg0 , const char * arg1 , size_t arg2 , locale_t arg3 )
-{
- int reset_flag = __lsb_check_params;
- int ret_value ;
- __lsb_output(4, "Invoking wrapper for stncasecmp_l()");
- if(!funcptr)
- #if 1
- funcptr = dlvsym(RTLD_NEXT, "stncasecmp_l", "GLIBC_2.3");
- #endif
- if(!funcptr) {
- __lsb_output(-1, "Failed to load stncasecmp_l. Probably the library was loaded using dlopen, we don't support this at the moment.");
- exit(1);
- }
- if(__lsb_check_params)
- {
- __lsb_check_params=0;
- __lsb_output(4, "stncasecmp_l() - validating");
- validate_Rdaddress( arg0, "stncasecmp_l - arg0 (s1)");
- validate_NULL_TYPETYPE( arg0, "stncasecmp_l - arg0 (s1)");
- validate_Rdaddress( arg1, "stncasecmp_l - arg1 (s2)");
- validate_NULL_TYPETYPE( arg1, "stncasecmp_l - arg1 (s2)");
- validate_NULL_TYPETYPE( arg2, "stncasecmp_l - arg2 (n)");
- validate_NULL_TYPETYPE( arg3, "stncasecmp_l - arg3 (locale)");
- }
- ret_value = funcptr(arg0, arg1, arg2, arg3);
- __lsb_check_params = reset_flag;
- return ret_value;
-}
-
=== added file 'dynchk/libs/libc/strncasecmp_l.c'
--- a/dynchk/libs/libc/strncasecmp_l.c 1970-01-01 00:00:00 +0000
+++ b/dynchk/libs/libc/strncasecmp_l.c 2013-03-08 15:39:16 +0000
@@ -0,0 +1,41 @@
+// Generated by gen_lib.pl
+
+#include "../../tests/type_tests.h"
+#include "../../misc/lsb_output.h"
+#include "stdlib.h"
+#include <stddef.h>
+#include <locale.h>
+#include <strings.h>
+#undef strncasecmp_l
+static int(*funcptr) (const char * , const char * , size_t , locale_t ) = 0;
+
+extern int __lsb_check_params;
+int strncasecmp_l (const char * arg0 , const char * arg1 , size_t arg2 , locale_t arg3 )
+{
+ int reset_flag = __lsb_check_params;
+ int ret_value ;
+ __lsb_output(4, "Invoking wrapper for strncasecmp_l()");
+ if(!funcptr)
+ #if 1
+ funcptr = dlvsym(RTLD_NEXT, "strncasecmp_l", "GLIBC_2.3");
+ #endif
+ if(!funcptr) {
+ __lsb_output(-1, "Failed to load strncasecmp_l. Probably the library was loaded using dlopen, we don't support this at the moment.");
+ exit(1);
+ }
+ if(__lsb_check_params)
+ {
+ __lsb_check_params=0;
+ __lsb_output(4, "strncasecmp_l() - validating");
+ validate_Rdaddress( arg0, "strncasecmp_l - arg0 (s1)");
+ validate_NULL_TYPETYPE( arg0, "strncasecmp_l - arg0 (s1)");
+ validate_Rdaddress( arg1, "strncasecmp_l - arg1 (s2)");
+ validate_NULL_TYPETYPE( arg1, "strncasecmp_l - arg1 (s2)");
+ validate_NULL_TYPETYPE( arg2, "strncasecmp_l - arg2 (n)");
+ validate_NULL_TYPETYPE( arg3, "strncasecmp_l - arg3 (locale)");
+ }
+ ret_value = funcptr(arg0, arg1, arg2, arg3);
+ __lsb_check_params = reset_flag;
+ return ret_value;
+}
+
=== modified file 'dynchk/libs/libc/swab.c'
--- a/dynchk/libs/libc/swab.c 2013-02-28 19:00:04 +0000
+++ b/dynchk/libs/libc/swab.c 2013-03-08 15:39:16 +0000
@@ -3,7 +3,7 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <sys/types.h>
+#include <lsb/types.h>
#include <unistd.h>
#undef swab
static void(*funcptr) (const void * , void * , ssize_t ) = 0;
=== modified file 'dynchk/tests/header_list.h'
--- a/dynchk/tests/header_list.h 2013-02-21 13:54:52 +0000
+++ b/dynchk/tests/header_list.h 2013-03-08 15:39:16 +0000
@@ -264,6 +264,7 @@
#include <locale.h>
#include <lsb/pthread.h>
#include <lsb/time.h>
+#include <lsb/types.h>
#include <math.h>
#include <mqueue.h>
#include <ncursesw/curses.h>
=== modified file 'elfchk/dynsyms.c'
--- a/elfchk/dynsyms.c 2013-03-06 23:52:21 +0000
+++ b/elfchk/dynsyms.c 2013-03-08 15:39:16 +0000
@@ -440636,7 +440636,6 @@
{"isblank","GLIBC_2.2.5",0,LSB_Base},
#endif
{"isblank_l","GLIBC_2.3",0,LSB_Base},
- {"iscnrtl_l","GLIBC_2.3",0,LSB_Base},
#if defined __i386__
{"iscntrl","GLIBC_2.0",0,LSB_Base},
#endif
@@ -440658,6 +440657,7 @@
#if defined __x86_64__
{"iscntrl","GLIBC_2.2.5",0,LSB_Base},
#endif
+ {"iscntrl_l","GLIBC_2.3",0,LSB_Base},
#if defined __i386__
{"isdigit","GLIBC_2.0",0,LSB_Base},
#endif
@@ -453944,7 +453944,6 @@
#if defined __x86_64__
{"stime","GLIBC_2.2.5",0,LSB_Base},
#endif
- {"stncasecmp_l","GLIBC_2.3",0,LSB_Base},
#if defined __i386__
{"stpcpy","GLIBC_2.0",0,LSB_Base},
#endif
@@ -454317,6 +454316,7 @@
#if defined __x86_64__
{"strncasecmp","GLIBC_2.2.5",0,LSB_Base},
#endif
+ {"strncasecmp_l","GLIBC_2.3",0,LSB_Base},
#if defined __i386__
{"strncat","GLIBC_2.0",0,LSB_Base},
#endif
=== modified file 'libchk/libc_so_6.c'
--- a/libchk/libc_so_6.c 2013-03-06 23:52:21 +0000
+++ b/libchk/libc_so_6.c 2013-03-08 15:39:16 +0000
@@ -7623,7 +7623,6 @@
{"isblank","GLIBC_2.2.5",0,LSB_Core,4,1},
#endif
{"isblank_l","GLIBC_2.3",0,LSB_Core,0,1},
- {"iscnrtl_l","GLIBC_2.3",0,LSB_Core,0,1},
#if defined __i386__
{"iscntrl","GLIBC_2.0",0,LSB_Core,4,1},
#endif
@@ -7642,6 +7641,7 @@
#if defined __x86_64__
{"iscntrl","GLIBC_2.2.5",0,LSB_Core,4,1},
#endif
+ {"iscntrl_l","GLIBC_2.3",0,LSB_Core,0,1},
#if defined __i386__
{"isdigit","GLIBC_2.0",0,LSB_Core,4,1},
#endif
@@ -13155,7 +13155,6 @@
#if defined __x86_64__
{"stime","GLIBC_2.2.5",0,LSB_Core,4,1},
#endif
- {"stncasecmp_l","GLIBC_2.3",0,LSB_Core,0,1},
#if defined __i386__
{"stpcpy","GLIBC_2.0",0,LSB_Core,4,1},
#endif
@@ -13477,6 +13476,7 @@
#if defined __x86_64__
{"strncasecmp","GLIBC_2.2.5",0,LSB_Core,4,1},
#endif
+ {"strncasecmp_l","GLIBC_2.3",0,LSB_Core,0,1},
#if defined __i386__
{"strncat","GLIBC_2.0",0,LSB_Core,4,1},
#endif
=== modified file 'libchk/libc_so_6_1.c'
--- a/libchk/libc_so_6_1.c 2013-03-06 23:52:21 +0000
+++ b/libchk/libc_so_6_1.c 2013-03-08 15:39:16 +0000
@@ -1320,10 +1320,10 @@
{"isblank","GLIBC_2.2",0,LSB_Core,4,1},
#endif
{"isblank_l","GLIBC_2.3",0,LSB_Core,0,1},
- {"iscnrtl_l","GLIBC_2.3",0,LSB_Core,0,1},
#if defined __ia64__
{"iscntrl","GLIBC_2.2",0,LSB_Core,4,1},
#endif
+ {"iscntrl_l","GLIBC_2.3",0,LSB_Core,0,1},
#if defined __ia64__
{"isdigit","GLIBC_2.2",0,LSB_Core,4,1},
#endif
@@ -2262,7 +2262,6 @@
#if defined __ia64__
{"stime","GLIBC_2.2",0,LSB_Core,4,1},
#endif
- {"stncasecmp_l","GLIBC_2.3",0,LSB_Core,0,1},
#if defined __ia64__
{"stpcpy","GLIBC_2.2",0,LSB_Core,8,1},
#endif
@@ -2317,6 +2316,7 @@
#if defined __ia64__
{"strncasecmp","GLIBC_2.2",0,LSB_Core,4,1},
#endif
+ {"strncasecmp_l","GLIBC_2.3",0,LSB_Core,0,1},
#if defined __ia64__
{"strncat","GLIBC_2.2",0,LSB_Core,8,1},
#endif
=== modified file 'package/Makefile'
--- a/package/Makefile 2013-03-06 23:52:21 +0000
+++ b/package/Makefile 2013-03-08 15:39:16 +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=1
+RPM_PACKAGE_RELEASE=2
# Derive date string for daily snapshots
ISO_DATE:=$(shell date +"%Y%m%d")
More information about the lsb-messages
mailing list