[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2321: more fixes from bug 3548

Mats Wichmann mats at linuxfoundation.org
Thu Oct 25 21:21:13 UTC 2012


------------------------------------------------------------
revno: 2321
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Thu 2012-10-25 15:21:13 -0600
message:
  more fixes from bug 3548
removed:
  dynchk/libs/libglib-2.0/g_string_append_c_inline.c
  libchk/libffi_so_6.c
added:
  libchk/libffi_so_5.c
modified:
  dynchk/libs/libglib-2.0/g_variant_get_va.c
  dynchk/libs/libglib-2.0/g_variant_new_parsed_va.c
  dynchk/libs/libglib-2.0/g_variant_new_va.c
  dynchk/libs/libglib-2.0/gen.mk
  elfchk/dtneeded.c
  elfchk/dynsyms.c
  libchk/libglib_2_0_so_0.c
  libchk/libs.c
  libchk/libs.h
  libchk/libs.mk
  package/Makefile
-------------- next part --------------
=== removed file 'dynchk/libs/libglib-2.0/g_string_append_c_inline.c'
--- a/dynchk/libs/libglib-2.0/g_string_append_c_inline.c	2012-10-24 17:25:41 +0000
+++ b/dynchk/libs/libglib-2.0/g_string_append_c_inline.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 <glib-2.0/glib.h>
-#undef g_string_append_c_inline
-static GString *(*funcptr) (GString * , gchar ) = 0;
-
-extern int __lsb_check_params;
-GString * g_string_append_c_inline (GString * arg0 , gchar arg1 )
-{
-	int reset_flag = __lsb_check_params;
-	GString * ret_value  ;
-	__lsb_output(4, "Invoking wrapper for g_string_append_c_inline()");
-	if(!funcptr)
-		funcptr = dlsym(RTLD_NEXT, "g_string_append_c_inline");
-	if(!funcptr) {
-		__lsb_output(-1, "Failed to load g_string_append_c_inline. 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, "g_string_append_c_inline() - validating");
-		if( arg0 ) {
-		validate_RWaddress( arg0, "g_string_append_c_inline - arg0 (gstring)");
-		}
-		validate_NULL_TYPETYPE(  arg0, "g_string_append_c_inline - arg0 (gstring)");
-		validate_NULL_TYPETYPE(  arg1, "g_string_append_c_inline - arg1 (c)");
-	}
-	ret_value = funcptr(arg0, arg1);
-	__lsb_check_params = reset_flag;
-	return ret_value;
-}
-

=== modified file 'dynchk/libs/libglib-2.0/g_variant_get_va.c'
--- a/dynchk/libs/libglib-2.0/g_variant_get_va.c	2012-10-24 17:25:41 +0000
+++ b/dynchk/libs/libglib-2.0/g_variant_get_va.c	2012-10-25 21:21:13 +0000
@@ -4,11 +4,12 @@
 #include "../../misc/lsb_output.h"
 #include "stdlib.h"
 #include <glib-2.0/glib.h>
+#include <stdarg.h>
 #undef g_variant_get_va
-static void(*funcptr) (GVariant * , const gchar * , const gchar * * , struct __va_list_tag * []) = 0;
+static void(*funcptr) (GVariant * , const gchar * , const gchar * * , va_list * ) = 0;
 
 extern int __lsb_check_params;
-void g_variant_get_va (GVariant * arg0 , const gchar * arg1 , const gchar * * arg2 , struct __va_list_tag * arg3 [1])
+void g_variant_get_va (GVariant * arg0 , const gchar * arg1 , const gchar * * arg2 , va_list * arg3 )
 {
 	int reset_flag = __lsb_check_params;
 	__lsb_output(4, "Invoking wrapper for g_variant_get_va()");
@@ -34,6 +35,9 @@
 		validate_RWaddress( arg2, "g_variant_get_va - arg2 (endptr)");
 		}
 		validate_NULL_TYPETYPE(  arg2, "g_variant_get_va - arg2 (endptr)");
+		if( arg3 ) {
+		validate_RWaddress( arg3, "g_variant_get_va - arg3 (app)");
+		}
 		validate_NULL_TYPETYPE(  arg3, "g_variant_get_va - arg3 (app)");
 	}
 	funcptr(arg0, arg1, arg2, arg3);

=== modified file 'dynchk/libs/libglib-2.0/g_variant_new_parsed_va.c'
--- a/dynchk/libs/libglib-2.0/g_variant_new_parsed_va.c	2012-10-24 17:25:41 +0000
+++ b/dynchk/libs/libglib-2.0/g_variant_new_parsed_va.c	2012-10-25 21:21:13 +0000
@@ -4,11 +4,12 @@
 #include "../../misc/lsb_output.h"
 #include "stdlib.h"
 #include <glib-2.0/glib.h>
+#include <stdarg.h>
 #undef g_variant_new_parsed_va
-static GVariant *(*funcptr) (const gchar * , struct __va_list_tag * []) = 0;
+static GVariant *(*funcptr) (const gchar * , va_list * ) = 0;
 
 extern int __lsb_check_params;
-GVariant * g_variant_new_parsed_va (const gchar * arg0 , struct __va_list_tag * arg1 [1])
+GVariant * g_variant_new_parsed_va (const gchar * arg0 , va_list * arg1 )
 {
 	int reset_flag = __lsb_check_params;
 	GVariant * ret_value  ;
@@ -27,6 +28,9 @@
 		validate_Rdaddress( arg0, "g_variant_new_parsed_va - arg0 (format)");
 		}
 		validate_NULL_TYPETYPE(  arg0, "g_variant_new_parsed_va - arg0 (format)");
+		if( arg1 ) {
+		validate_RWaddress( arg1, "g_variant_new_parsed_va - arg1 (app)");
+		}
 		validate_NULL_TYPETYPE(  arg1, "g_variant_new_parsed_va - arg1 (app)");
 	}
 	ret_value = funcptr(arg0, arg1);

=== modified file 'dynchk/libs/libglib-2.0/g_variant_new_va.c'
--- a/dynchk/libs/libglib-2.0/g_variant_new_va.c	2012-10-24 17:25:41 +0000
+++ b/dynchk/libs/libglib-2.0/g_variant_new_va.c	2012-10-25 21:21:13 +0000
@@ -4,11 +4,12 @@
 #include "../../misc/lsb_output.h"
 #include "stdlib.h"
 #include <glib-2.0/glib.h>
+#include <stdarg.h>
 #undef g_variant_new_va
-static GVariant *(*funcptr) (const gchar * , const gchar * * , struct __va_list_tag * []) = 0;
+static GVariant *(*funcptr) (const gchar * , const gchar * * , va_list * ) = 0;
 
 extern int __lsb_check_params;
-GVariant * g_variant_new_va (const gchar * arg0 , const gchar * * arg1 , struct __va_list_tag * arg2 [1])
+GVariant * g_variant_new_va (const gchar * arg0 , const gchar * * arg1 , va_list * arg2 )
 {
 	int reset_flag = __lsb_check_params;
 	GVariant * ret_value  ;
@@ -31,6 +32,9 @@
 		validate_RWaddress( arg1, "g_variant_new_va - arg1 (endptr)");
 		}
 		validate_NULL_TYPETYPE(  arg1, "g_variant_new_va - arg1 (endptr)");
+		if( arg2 ) {
+		validate_RWaddress( arg2, "g_variant_new_va - arg2 (app)");
+		}
 		validate_NULL_TYPETYPE(  arg2, "g_variant_new_va - arg2 (app)");
 	}
 	ret_value = funcptr(arg0, arg1, arg2);

=== modified file 'dynchk/libs/libglib-2.0/gen.mk'
--- a/dynchk/libs/libglib-2.0/gen.mk	2012-10-24 14:50:16 +0000
+++ b/dynchk/libs/libglib-2.0/gen.mk	2012-10-25 21:21:13 +0000
@@ -1073,7 +1073,6 @@
 g_strfreev.o \
 g_string_append.o \
 g_string_append_c.o \
-g_string_append_c_inline.o \
 g_string_append_len.o \
 g_string_append_unichar.o \
 g_string_append_uri_escaped.o \

=== modified file 'elfchk/dtneeded.c'
--- a/elfchk/dtneeded.c	2012-10-19 18:23:41 +0000
+++ b/elfchk/dtneeded.c	2012-10-25 21:21:13 +0000
@@ -3228,7 +3228,7 @@
 #if defined __s390x__
 	"libdl.so.2",
 #endif /* defined __s390x__ */
-	"libffi.so.6",
+	"libffi.so.5",
 	"libfontconfig.so.1",
 	"libfreetype.so.6",
 	"libgcc_s.so.1",

=== modified file 'elfchk/dynsyms.c'
--- a/elfchk/dynsyms.c	2012-10-19 18:23:41 +0000
+++ b/elfchk/dynsyms.c	2012-10-25 21:21:13 +0000
@@ -430391,7 +430391,6 @@
 	{"g_strfreev","",0,LSB_Toolkit_Gtk},
 	{"g_string_append","",0,LSB_Toolkit_Gtk},
 	{"g_string_append_c","",0,LSB_Toolkit_Gtk},
-	{"g_string_append_c_inline","",0,LSB_Toolkit_Gtk},
 	{"g_string_append_len","",0,LSB_Toolkit_Gtk},
 	{"g_string_append_printf","",0,LSB_Toolkit_Gtk},
 	{"g_string_append_unichar","",0,LSB_Toolkit_Gtk},

=== added file 'libchk/libffi_so_5.c'
--- a/libchk/libffi_so_5.c	1970-01-01 00:00:00 +0000
+++ b/libchk/libffi_so_5.c	2012-10-25 21:21:13 +0000
@@ -0,0 +1,28 @@
+/* Generated file, do not edit */
+#include <stdlib.h>
+#include "elfchk.h"
+struct versym libffi_so_5[] = {
+	{"ffi_call","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_closure_alloc","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_closure_free","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_java_ptrarray_to_raw","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_java_raw_call","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_java_raw_size","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_java_raw_to_ptrarray","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_prep_cif","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_prep_cif_var","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_prep_closure","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_prep_closure_loc","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_prep_java_raw_closure","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_prep_java_raw_closure_loc","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_prep_raw_closure","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_prep_raw_closure_loc","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_ptrarray_to_raw","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_raw_call","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_raw_size","",0,LSB_Toolkit_Independent,0,1},
+	{"ffi_raw_to_ptrarray","",0,LSB_Toolkit_Independent,0,1},
+	{0,0}};
+
+struct classinfo *libffi_so_5_classinfo[] = {
+
+	NULL	};

=== removed file 'libchk/libffi_so_6.c'
--- a/libchk/libffi_so_6.c	2012-10-19 18:23:41 +0000
+++ b/libchk/libffi_so_6.c	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/* Generated file, do not edit */
-#include <stdlib.h>
-#include "elfchk.h"
-struct versym libffi_so_6[] = {
-	{"ffi_call","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_closure_alloc","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_closure_free","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_java_ptrarray_to_raw","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_java_raw_call","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_java_raw_size","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_java_raw_to_ptrarray","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_prep_cif","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_prep_cif_var","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_prep_closure","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_prep_closure_loc","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_prep_java_raw_closure","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_prep_java_raw_closure_loc","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_prep_raw_closure","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_prep_raw_closure_loc","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_ptrarray_to_raw","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_raw_call","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_raw_size","",0,LSB_Toolkit_Independent,0,1},
-	{"ffi_raw_to_ptrarray","",0,LSB_Toolkit_Independent,0,1},
-	{0,0}};
-
-struct classinfo *libffi_so_6_classinfo[] = {
-
-	NULL	};

=== modified file 'libchk/libglib_2_0_so_0.c'
--- a/libchk/libglib_2_0_so_0.c	2012-10-24 14:50:16 +0000
+++ b/libchk/libglib_2_0_so_0.c	2012-10-25 21:21:13 +0000
@@ -1202,7 +1202,6 @@
 	{"g_strfreev","",0,LSB_Toolkit_Gtk,0,1},
 	{"g_string_append","",0,LSB_Toolkit_Gtk,0,1},
 	{"g_string_append_c","",0,LSB_Toolkit_Gtk,0,1},
-	{"g_string_append_c_inline","",0,LSB_Toolkit_Gtk,0,1},
 	{"g_string_append_len","",0,LSB_Toolkit_Gtk,0,1},
 	{"g_string_append_printf","",0,LSB_Toolkit_Gtk,0,1},
 	{"g_string_append_unichar","",0,LSB_Toolkit_Gtk,0,1},

=== modified file 'libchk/libs.c'
--- a/libchk/libs.c	2012-10-19 18:23:41 +0000
+++ b/libchk/libs.c	2012-10-25 21:21:13 +0000
@@ -115,7 +115,7 @@
 #if defined __i386__
 	{LSB_Base,"libdl.so.2",libdl_so_2,libdl_so_2_classinfo},
 #endif
-	{LSB_Toolkit_Independent,"libffi.so.6",libffi_so_6,libffi_so_6_classinfo},
+	{LSB_Toolkit_Independent,"libffi.so.5",libffi_so_5,libffi_so_5_classinfo},
 	{LSB_Graphics,"libfontconfig.so.1",libfontconfig_so_1,libfontconfig_so_1_classinfo},
 	{LSB_Graphics,"libfreetype.so.6",libfreetype_so_6,libfreetype_so_6_classinfo},
 #if defined __s390x__

=== modified file 'libchk/libs.h'
--- a/libchk/libs.h	2012-10-19 18:23:41 +0000
+++ b/libchk/libs.h	2012-10-25 21:21:13 +0000
@@ -149,8 +149,8 @@
 extern struct versym libdl_so_2[];
 extern struct classinfo *libdl_so_2_classinfo[];
 #endif
-extern struct versym libffi_so_6[];
-extern struct classinfo *libffi_so_6_classinfo[];
+extern struct versym libffi_so_5[];
+extern struct classinfo *libffi_so_5_classinfo[];
 extern struct versym libfontconfig_so_1[];
 extern struct classinfo *libfontconfig_so_1_classinfo[];
 extern struct versym libfreetype_so_6[];

=== modified file 'libchk/libs.mk'
--- a/libchk/libs.mk	2012-10-19 18:23:41 +0000
+++ b/libchk/libs.mk	2012-10-25 21:21:13 +0000
@@ -16,7 +16,7 @@
 	libcups_so_2.o \
 	libcupsimage_so_2.o \
 	libdl_so_2.o \
-	libffi_so_6.o \
+	libffi_so_5.o \
 	libfontconfig_so_1.o \
 	libfreetype_so_6.o \
 	libgcc_s_so_1.o \
@@ -87,7 +87,7 @@
 	libcups_so_2.c \
 	libcupsimage_so_2.c \
 	libdl_so_2.c \
-	libffi_so_6.c \
+	libffi_so_5.c \
 	libfontconfig_so_1.c \
 	libfreetype_so_6.c \
 	libgcc_s_so_1.c \

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-10-24 17:25:41 +0000
+++ b/package/Makefile	2012-10-25 21:21:13 +0000
@@ -20,7 +20,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