[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2092: fix two mistyped interface names from POSIX addition (bug 3469)

Mats Wichmann mats at linuxfoundation.org
Fri Mar 8 15:32:50 UTC 2013


------------------------------------------------------------
revno: 2092
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2013-03-08 08:32:50 -0700
message:
  fix two mistyped interface names from POSIX addition (bug 3469)
modified:
  headers/All/5.0/ctype.h.defs
  headers/All/5.0/strings.h.defs
  headers/ctype.h
  headers/strings.h
  package/Makefile
  stub_libs/5.0/IA32/libc.Version
  stub_libs/5.0/IA32/libc.c
  stub_libs/5.0/IA64/libc.Version
  stub_libs/5.0/IA64/libc.c
  stub_libs/5.0/PPC32/libc.Version
  stub_libs/5.0/PPC32/libc.c
  stub_libs/5.0/PPC64/libc.Version
  stub_libs/5.0/PPC64/libc.c
  stub_libs/5.0/S390/libc.Version
  stub_libs/5.0/S390/libc.c
  stub_libs/5.0/S390X/libc.Version
  stub_libs/5.0/S390X/libc.c
  stub_libs/5.0/x86-64/libc.Version
  stub_libs/5.0/x86-64/libc.c
-------------- next part --------------
=== modified file 'headers/All/5.0/ctype.h.defs'
--- a/headers/All/5.0/ctype.h.defs	2013-03-06 23:47:19 +0000
+++ b/headers/All/5.0/ctype.h.defs	2013-03-08 15:32:50 +0000
@@ -11,8 +11,8 @@
 extern int isascii(int __c);
 extern int isblank(int);
 extern int isblank_l(int c, locale_t locale);
-extern int iscnrtl_l(int c, locale_t locale);
 extern int iscntrl(int);
+extern int iscntrl_l(int c, locale_t locale);
 extern int isdigit(int);
 extern int isdigit_l(int c, locale_t locale);
 extern int isgraph(int);

=== modified file 'headers/All/5.0/strings.h.defs'
--- a/headers/All/5.0/strings.h.defs	2013-03-06 23:47:19 +0000
+++ b/headers/All/5.0/strings.h.defs	2013-03-08 15:32:50 +0000
@@ -5,13 +5,13 @@
 extern int ffs(int __i);
 extern char *index(const char *__s, int __c);
 extern char *rindex(const char *__s, int __c);
-extern int stncasecmp_l(const char *s1, const char *s2, size_t n,
-			locale_t locale);
 extern int strcasecmp(const char *__s1, const char *__s2);
 extern int strcasecmp_l(const char *s1, const char *s2, locale_t locale);
 extern int strcoll_l(const char *s1, const char *s2, locale_t locale);
 extern ssize_t strfmon_l(char *s, size_t maxsize, locale_t locale,
 			 const char *format);
 extern int strncasecmp(const char *__s1, const char *__s2, size_t __n);
+extern int strncasecmp_l(const char *s1, const char *s2, size_t n,
+			 locale_t locale);
 extern size_t strxfrm_l(char *s1, const char *s2, size_t n,
 			locale_t locale);

=== modified file 'headers/ctype.h'
--- a/headers/ctype.h	2013-03-06 23:47:19 +0000
+++ b/headers/ctype.h	2013-03-08 15:32:50 +0000
@@ -155,7 +155,7 @@
     extern int isalnum_l(int c, locale_t locale);
     extern int isalpha_l(int c, locale_t locale);
     extern int isblank_l(int c, locale_t locale);
-    extern int iscnrtl_l(int c, locale_t locale);
+    extern int iscntrl_l(int c, locale_t locale);
     extern int isdigit_l(int c, locale_t locale);
     extern int isgraph_l(int c, locale_t locale);
     extern int islower_l(int c, locale_t locale);

=== modified file 'headers/strings.h'
--- a/headers/strings.h	2013-03-07 15:21:54 +0000
+++ b/headers/strings.h	2013-03-08 15:32:50 +0000
@@ -25,13 +25,13 @@
     extern int strcasecmp(const char *__s1, const char *__s2);
     extern int strncasecmp(const char *__s1, const char *__s2, size_t __n);
 #if __LSB_VERSION__ >= 50
-    extern int stncasecmp_l(const char *s1, const char *s2, size_t n,
-			    locale_t locale);
     extern int strcasecmp_l(const char *s1, const char *s2,
 			    locale_t locale);
     extern int strcoll_l(const char *s1, const char *s2, locale_t locale);
     extern ssize_t strfmon_l(char *s, size_t maxsize, locale_t locale,
 			     const char *format);
+    extern int strncasecmp_l(const char *s1, const char *s2, size_t n,
+			     locale_t locale);
     extern size_t strxfrm_l(char *s1, const char *s2, size_t n,
 			    locale_t locale);
 #endif				/* __LSB_VERSION__ >= 5.0 */

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-03-07 15:21:54 +0000
+++ b/package/Makefile	2013-03-08 15:32:50 +0000
@@ -46,7 +46,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=2
+RPM_PACKAGE_RELEASE=3
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)

=== modified file 'stub_libs/5.0/IA32/libc.Version'
--- a/stub_libs/5.0/IA32/libc.Version	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/IA32/libc.Version	2013-03-08 15:32:50 +0000
@@ -961,7 +961,7 @@
   isalnum_l;
   isalpha_l;
   isblank_l;
-  iscnrtl_l;
+  iscntrl_l;
   isdigit_l;
   isgraph_l;
   islower_l;
@@ -987,10 +987,10 @@
   newlocale;
   realpath;
   sendfile64;
-  stncasecmp_l;
   strcasecmp_l;
   strcoll_l;
   strfmon_l;
+  strncasecmp_l;
   strxfrm_l;
   tolower_l;
   toupper_l;

=== modified file 'stub_libs/5.0/IA32/libc.c'
--- a/stub_libs/5.0/IA32/libc.c	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/IA32/libc.c	2013-03-08 15:32:50 +0000
@@ -477,8 +477,8 @@
 void isatty() {} ;
 void isblank() {} ;
 void isblank_l() {} ;
-void iscnrtl_l() {} ;
 void iscntrl() {} ;
+void iscntrl_l() {} ;
 void isdigit() {} ;
 void isdigit_l() {} ;
 void isgraph() {} ;
@@ -808,7 +808,6 @@
 void statvfs() {} ;
 void statvfs64() {} ;
 void stime() {} ;
-void stncasecmp_l() {} ;
 void stpcpy() {} ;
 void stpncpy() {} ;
 void strcasecmp() {} ;
@@ -829,6 +828,7 @@
 void strftime() {} ;
 void strlen() {} ;
 void strncasecmp() {} ;
+void strncasecmp_l() {} ;
 void strncat() {} ;
 void strncmp() {} ;
 void strncpy() {} ;

=== modified file 'stub_libs/5.0/IA64/libc.Version'
--- a/stub_libs/5.0/IA64/libc.Version	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/IA64/libc.Version	2013-03-08 15:32:50 +0000
@@ -955,7 +955,7 @@
   isalnum_l;
   isalpha_l;
   isblank_l;
-  iscnrtl_l;
+  iscntrl_l;
   isdigit_l;
   isgraph_l;
   islower_l;
@@ -981,10 +981,10 @@
   newlocale;
   realpath;
   sendfile64;
-  stncasecmp_l;
   strcasecmp_l;
   strcoll_l;
   strfmon_l;
+  strncasecmp_l;
   strxfrm_l;
   tolower_l;
   toupper_l;

=== modified file 'stub_libs/5.0/IA64/libc.c'
--- a/stub_libs/5.0/IA64/libc.c	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/IA64/libc.c	2013-03-08 15:32:50 +0000
@@ -477,8 +477,8 @@
 void isatty() {} ;
 void isblank() {} ;
 void isblank_l() {} ;
-void iscnrtl_l() {} ;
 void iscntrl() {} ;
+void iscntrl_l() {} ;
 void isdigit() {} ;
 void isdigit_l() {} ;
 void isgraph() {} ;
@@ -808,7 +808,6 @@
 void statvfs() {} ;
 void statvfs64() {} ;
 void stime() {} ;
-void stncasecmp_l() {} ;
 void stpcpy() {} ;
 void stpncpy() {} ;
 void strcasecmp() {} ;
@@ -829,6 +828,7 @@
 void strftime() {} ;
 void strlen() {} ;
 void strncasecmp() {} ;
+void strncasecmp_l() {} ;
 void strncat() {} ;
 void strncmp() {} ;
 void strncpy() {} ;

=== modified file 'stub_libs/5.0/PPC32/libc.Version'
--- a/stub_libs/5.0/PPC32/libc.Version	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/PPC32/libc.Version	2013-03-08 15:32:50 +0000
@@ -914,7 +914,7 @@
   isalnum_l;
   isalpha_l;
   isblank_l;
-  iscnrtl_l;
+  iscntrl_l;
   isdigit_l;
   isgraph_l;
   islower_l;
@@ -940,10 +940,10 @@
   newlocale;
   realpath;
   sendfile64;
-  stncasecmp_l;
   strcasecmp_l;
   strcoll_l;
   strfmon_l;
+  strncasecmp_l;
   strxfrm_l;
   tolower_l;
   toupper_l;

=== modified file 'stub_libs/5.0/PPC32/libc.c'
--- a/stub_libs/5.0/PPC32/libc.c	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/PPC32/libc.c	2013-03-08 15:32:50 +0000
@@ -495,8 +495,8 @@
 void isatty() {} ;
 void isblank() {} ;
 void isblank_l() {} ;
-void iscnrtl_l() {} ;
 void iscntrl() {} ;
+void iscntrl_l() {} ;
 void isdigit() {} ;
 void isdigit_l() {} ;
 void isgraph() {} ;
@@ -836,7 +836,6 @@
 void statvfs() {} ;
 void statvfs64() {} ;
 void stime() {} ;
-void stncasecmp_l() {} ;
 void stpcpy() {} ;
 void stpncpy() {} ;
 void strcasecmp() {} ;
@@ -859,6 +858,7 @@
 void strftime() {} ;
 void strlen() {} ;
 void strncasecmp() {} ;
+void strncasecmp_l() {} ;
 void strncat() {} ;
 void strncmp() {} ;
 void strncpy() {} ;

=== modified file 'stub_libs/5.0/PPC64/libc.Version'
--- a/stub_libs/5.0/PPC64/libc.Version	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/PPC64/libc.Version	2013-03-08 15:32:50 +0000
@@ -393,8 +393,8 @@
   isatty;
   isblank;
   isblank_l;
-  iscnrtl_l;
   iscntrl;
+  iscntrl_l;
   isdigit;
   isdigit_l;
   isgraph;
@@ -702,7 +702,6 @@
   statvfs;
   statvfs64;
   stime;
-  stncasecmp_l;
   stpcpy;
   stpncpy;
   strcasecmp;
@@ -722,6 +721,7 @@
   strftime;
   strlen;
   strncasecmp;
+  strncasecmp_l;
   strncat;
   strncmp;
   strncpy;

=== modified file 'stub_libs/5.0/PPC64/libc.c'
--- a/stub_libs/5.0/PPC64/libc.c	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/PPC64/libc.c	2013-03-08 15:32:50 +0000
@@ -495,8 +495,8 @@
 void isatty() {} ;
 void isblank() {} ;
 void isblank_l() {} ;
-void iscnrtl_l() {} ;
 void iscntrl() {} ;
+void iscntrl_l() {} ;
 void isdigit() {} ;
 void isdigit_l() {} ;
 void isgraph() {} ;
@@ -836,7 +836,6 @@
 void statvfs() {} ;
 void statvfs64() {} ;
 void stime() {} ;
-void stncasecmp_l() {} ;
 void stpcpy() {} ;
 void stpncpy() {} ;
 void strcasecmp() {} ;
@@ -859,6 +858,7 @@
 void strftime() {} ;
 void strlen() {} ;
 void strncasecmp() {} ;
+void strncasecmp_l() {} ;
 void strncat() {} ;
 void strncmp() {} ;
 void strncpy() {} ;

=== modified file 'stub_libs/5.0/S390/libc.Version'
--- a/stub_libs/5.0/S390/libc.Version	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/S390/libc.Version	2013-03-08 15:32:50 +0000
@@ -922,7 +922,7 @@
   isalnum_l;
   isalpha_l;
   isblank_l;
-  iscnrtl_l;
+  iscntrl_l;
   isdigit_l;
   isgraph_l;
   islower_l;
@@ -948,10 +948,10 @@
   newlocale;
   realpath;
   sendfile64;
-  stncasecmp_l;
   strcasecmp_l;
   strcoll_l;
   strfmon_l;
+  strncasecmp_l;
   strxfrm_l;
   tolower_l;
   toupper_l;

=== modified file 'stub_libs/5.0/S390/libc.c'
--- a/stub_libs/5.0/S390/libc.c	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/S390/libc.c	2013-03-08 15:32:50 +0000
@@ -495,8 +495,8 @@
 void isatty() {} ;
 void isblank() {} ;
 void isblank_l() {} ;
-void iscnrtl_l() {} ;
 void iscntrl() {} ;
+void iscntrl_l() {} ;
 void isdigit() {} ;
 void isdigit_l() {} ;
 void isgraph() {} ;
@@ -836,7 +836,6 @@
 void statvfs() {} ;
 void statvfs64() {} ;
 void stime() {} ;
-void stncasecmp_l() {} ;
 void stpcpy() {} ;
 void stpncpy() {} ;
 void strcasecmp() {} ;
@@ -859,6 +858,7 @@
 void strftime() {} ;
 void strlen() {} ;
 void strncasecmp() {} ;
+void strncasecmp_l() {} ;
 void strncat() {} ;
 void strncmp() {} ;
 void strncpy() {} ;

=== modified file 'stub_libs/5.0/S390X/libc.Version'
--- a/stub_libs/5.0/S390X/libc.Version	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/S390X/libc.Version	2013-03-08 15:32:50 +0000
@@ -914,7 +914,7 @@
   isalnum_l;
   isalpha_l;
   isblank_l;
-  iscnrtl_l;
+  iscntrl_l;
   isdigit_l;
   isgraph_l;
   islower_l;
@@ -940,10 +940,10 @@
   newlocale;
   realpath;
   sendfile64;
-  stncasecmp_l;
   strcasecmp_l;
   strcoll_l;
   strfmon_l;
+  strncasecmp_l;
   strxfrm_l;
   tolower_l;
   toupper_l;

=== modified file 'stub_libs/5.0/S390X/libc.c'
--- a/stub_libs/5.0/S390X/libc.c	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/S390X/libc.c	2013-03-08 15:32:50 +0000
@@ -495,8 +495,8 @@
 void isatty() {} ;
 void isblank() {} ;
 void isblank_l() {} ;
-void iscnrtl_l() {} ;
 void iscntrl() {} ;
+void iscntrl_l() {} ;
 void isdigit() {} ;
 void isdigit_l() {} ;
 void isgraph() {} ;
@@ -836,7 +836,6 @@
 void statvfs() {} ;
 void statvfs64() {} ;
 void stime() {} ;
-void stncasecmp_l() {} ;
 void stpcpy() {} ;
 void stpncpy() {} ;
 void strcasecmp() {} ;
@@ -859,6 +858,7 @@
 void strftime() {} ;
 void strlen() {} ;
 void strncasecmp() {} ;
+void strncasecmp_l() {} ;
 void strncat() {} ;
 void strncmp() {} ;
 void strncpy() {} ;

=== modified file 'stub_libs/5.0/x86-64/libc.Version'
--- a/stub_libs/5.0/x86-64/libc.Version	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/x86-64/libc.Version	2013-03-08 15:32:50 +0000
@@ -947,7 +947,7 @@
   isalnum_l;
   isalpha_l;
   isblank_l;
-  iscnrtl_l;
+  iscntrl_l;
   isdigit_l;
   isgraph_l;
   islower_l;
@@ -973,10 +973,10 @@
   newlocale;
   realpath;
   sendfile64;
-  stncasecmp_l;
   strcasecmp_l;
   strcoll_l;
   strfmon_l;
+  strncasecmp_l;
   strxfrm_l;
   tolower_l;
   toupper_l;

=== modified file 'stub_libs/5.0/x86-64/libc.c'
--- a/stub_libs/5.0/x86-64/libc.c	2013-03-06 23:47:19 +0000
+++ b/stub_libs/5.0/x86-64/libc.c	2013-03-08 15:32:50 +0000
@@ -477,8 +477,8 @@
 void isatty() {} ;
 void isblank() {} ;
 void isblank_l() {} ;
-void iscnrtl_l() {} ;
 void iscntrl() {} ;
+void iscntrl_l() {} ;
 void isdigit() {} ;
 void isdigit_l() {} ;
 void isgraph() {} ;
@@ -808,7 +808,6 @@
 void statvfs() {} ;
 void statvfs64() {} ;
 void stime() {} ;
-void stncasecmp_l() {} ;
 void stpcpy() {} ;
 void stpncpy() {} ;
 void strcasecmp() {} ;
@@ -829,6 +828,7 @@
 void strftime() {} ;
 void strlen() {} ;
 void strncasecmp() {} ;
+void strncasecmp_l() {} ;
 void strncat() {} ;
 void strncmp() {} ;
 void strncpy() {} ;



More information about the lsb-messages mailing list