tags 577061 + patch
tags 577061 + pending
thanks

Dear maintainer,

I've prepared an NMU for setools (versioned as 3.3.6.ds-7.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer.

--
Jakub Wilk
diff -u setools-3.3.6.ds/debian/changelog setools-3.3.6.ds/debian/changelog
--- setools-3.3.6.ds/debian/changelog
+++ setools-3.3.6.ds/debian/changelog
@@ -1,3 +1,13 @@
+setools (3.3.6.ds-7.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * libsefs built with GCC 4.3 is not binary-compatible with itself built with
+    GCC 4.4. That's because mangling of va_list has changed in GCC 4.4. To
+    cope with this situation, provide compatibility aliases for the affected
+    symbols and update symbol files accordingly.      (Closes: #577061).
+
+ -- Jakub Wilk <jw...@debian.org>  Thu, 13 May 2010 17:40:33 +0200
+
 setools (3.3.6.ds-7) unstable; urgency=low
 
   * Bug fix: "FTBFS with Python 2.6 as default", thanks to Jakub Wilk
diff -u setools-3.3.6.ds/debian/libsefs4.symbols.armel setools-3.3.6.ds/debian/libsefs4.symbols.armel
--- setools-3.3.6.ds/debian/libsefs4.symbols.armel
+++ setools-3.3.6.ds/debian/libsefs4.symbols.armel
@@ -26,11 +26,17 @@
  _zn11sefs_fcfile11runquerymapep10sefs_querypfip11sefs_fclistpk10sefs_entrypve...@vers_4.0 3.3.4.ds
  _zn11sefs_fcfile14appendfilelistepk11apol_vec...@vers_4.0 3.3.4.ds
  _zn11sefs_fcfilec1epfvpvpk11sefs_fclistipkcs0_e...@vers_4.0 3.3.4.ds
+ _zn11sefs_fcfilec1epfvpvpk11sefs_fclistipkcst9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn11sefs_fcfilec1epk11apol_vectorpfvpvpk11sefs_fclistipkcs3_e...@vers_4.0 3.3.4.ds
+ _zn11sefs_fcfilec1epk11apol_vectorpfvpvpk11sefs_fclistipkcst9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn11sefs_fcfilec1epkcpfvpvpk11sefs_fclistis1_s2_e...@vers_4.0 3.3.4.ds
+ _zn11sefs_fcfilec1epkcpfvpvpk11sefs_fclistis1_st9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn11sefs_fcfilec2epfvpvpk11sefs_fclistipkcs0_e...@vers_4.0 3.3.4.ds
+ _zn11sefs_fcfilec2epfvpvpk11sefs_fclistipkcst9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn11sefs_fcfilec2epk11apol_vectorpfvpvpk11sefs_fclistipkcs3_e...@vers_4.0 3.3.4.ds
+ _zn11sefs_fcfilec2epk11apol_vectorpfvpvpk11sefs_fclistipkcst9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn11sefs_fcfilec2epkcpfvpvpk11sefs_fclistis1_s2_e...@vers_4.0 3.3.4.ds
+ _zn11sefs_fcfilec2epkcpfvpvpk11sefs_fclistis1_st9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn11sefs_fcfiled...@vers_4.0 3.3.4.ds
  _zn11sefs_fcfiled...@vers_4.0 3.3.4.ds
  _zn11sefs_fcfiled...@vers_4.0 3.3.4.ds
@@ -39,7 +45,9 @@
  _zn11sefs_fclist15associatepolicyep11apol_pol...@vers_4.0 3.3.4.ds
  _zn11sefs_fclist8runqueryep10sefs_qu...@vers_4.0 3.3.4.ds
  _zn11sefs_fclistc1e16sefs_fclist_typepfvpvpks_ipkcs1_e...@vers_4.0 3.3.4.ds
+ _zn11sefs_fclistc1e16sefs_fclist_typepfvpvpks_ipkcst9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn11sefs_fclistc2e16sefs_fclist_typepfvpvpks_ipkcs1_e...@vers_4.0 3.3.4.ds
+ _zn11sefs_fclistc2e16sefs_fclist_typepfvpvpks_ipkcst9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn11sefs_fclistd...@vers_4.0 3.3.4.ds
  _zn11sefs_fclistd...@vers_4.0 3.3.4.ds
  _zn11sefs_fclistd...@vers_4.0 3.3.4.ds
@@ -49,7 +57,9 @@
  _zn15sefs_filesystem12isquerymatchepk10sefs_querypkcs4_pk6stat64p11apol_vectorp14apol_mls_ra...@vers_4.0 3.3.4.ds
  _zn15sefs_filesystem8getentryepk17sefs_context_nodejpkcy...@vers_4.0 3.3.4.ds
  _zn15sefs_filesystemc1epkcpfvpvpk11sefs_fclistis1_s2_e...@vers_4.0 3.3.4.ds
+ _zn15sefs_filesystemc1epkcpfvpvpk11sefs_fclistis1_st9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn15sefs_filesystemc2epkcpfvpvpk11sefs_fclistis1_s2_e...@vers_4.0 3.3.4.ds
+ _zn15sefs_filesystemc2epkcpfvpvpk11sefs_fclistis1_st9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn15sefs_filesystemd...@vers_4.0 3.3.4.ds
  _zn15sefs_filesystemd...@vers_4.0 3.3.4.ds
  _zn15sefs_filesystemd...@vers_4.0 3.3.4.ds
@@ -60,9 +70,13 @@
  _zn7sefs_db4savee...@vers_4.0 3.3.4.ds
  _zn7sefs_db8getentryepk17sefs_context_nodejpkcy...@vers_4.0 3.3.4.ds
  _zn7sefs_dbc1ep15sefs_filesystempfvpvpk11sefs_fclistipkcs2_e...@vers_4.0 3.3.4.ds
+ _zn7sefs_dbc1ep15sefs_filesystempfvpvpk11sefs_fclistipkcst9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn7sefs_dbc1epkcpfvpvpk11sefs_fclistis1_s2_e...@vers_4.0 3.3.4.ds
+ _zn7sefs_dbc1epkcpfvpvpk11sefs_fclistis1_st9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn7sefs_dbc2ep15sefs_filesystempfvpvpk11sefs_fclistipkcs2_e...@vers_4.0 3.3.4.ds
+ _zn7sefs_dbc2ep15sefs_filesystempfvpvpk11sefs_fclistipkcst9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn7sefs_dbc2epkcpfvpvpk11sefs_fclistis1_s2_e...@vers_4.0 3.3.4.ds
+ _zn7sefs_dbc2epkcpfvpvpk11sefs_fclistis1_st9__va_liste...@vers_4.0 3.3.6.ds-7.1~
  _zn7sefs_dbd...@vers_4.0 3.3.4.ds
  _zn7sefs_dbd...@vers_4.0 3.3.4.ds
  _zn7sefs_dbd...@vers_4.0 3.3.4.ds
@@ -78,6 +92,7 @@
  _znk11sefs_fclist11fclist_typ...@vers_4.0 3.3.4.ds
  _znk11sefs_fclist15associatepolic...@vers_4.0 3.3.4.ds
  _znk11sefs_fclist9handlemsgeipk...@vers_4.0 3.3.4.ds
+ _znk11sefs_fclist9handlemsgeipkcst9__va_l...@vers_4.0 3.3.6.ds-7.1~
  _znk15sefs_filesystem4roo...@vers_4.0 3.3.4.ds
  _znk15sefs_filesystem5isml...@vers_4.0 3.3.4.ds
  _znk7sefs_db5isml...@vers_4.0 3.3.4.ds
only in patch2:
unchanged:
--- setools-3.3.6.ds.orig/libsefs/src/fcfile.cc
+++ setools-3.3.6.ds/libsefs/src/fcfile.cc
@@ -689,3 +689,16 @@
 	}
 	return fcfile->fileList();
 }
+
+#if defined(__ARM_EABI__) && defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+// va_list mangling has been changed in g++ 4.4.
+// Add ABI <= g++-4.3 compatibility aliases.
+__asm__(".globl _ZN11sefs_fcfileC1EPFvPvPK11sefs_fclistiPKcS0_ES0_\n.set _ZN11sefs_fcfileC1EPFvPvPK11sefs_fclistiPKcS0_ES0_,_ZN11sefs_fcfileC1EPFvPvPK11sefs_fclistiPKcSt9__va_listES0_");
+__asm__(".globl _ZN11sefs_fcfileC1EPK11apol_vectorPFvPvPK11sefs_fclistiPKcS3_ES3_\n.set _ZN11sefs_fcfileC1EPK11apol_vectorPFvPvPK11sefs_fclistiPKcS3_ES3_,_ZN11sefs_fcfileC1EPK11apol_vectorPFvPvPK11sefs_fclistiPKcSt9__va_listES3_");
+__asm__(".globl _ZN11sefs_fcfileC1EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_\n.set _ZN11sefs_fcfileC1EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_,_ZN11sefs_fcfileC1EPKcPFvPvPK11sefs_fclistiS1_St9__va_listES2_");
+__asm__(".globl _ZN11sefs_fcfileC2EPFvPvPK11sefs_fclistiPKcS0_ES0_\n.set _ZN11sefs_fcfileC2EPFvPvPK11sefs_fclistiPKcS0_ES0_,_ZN11sefs_fcfileC2EPFvPvPK11sefs_fclistiPKcSt9__va_listES0_");
+__asm__(".globl _ZN11sefs_fcfileC2EPK11apol_vectorPFvPvPK11sefs_fclistiPKcS3_ES3_\n.set _ZN11sefs_fcfileC2EPK11apol_vectorPFvPvPK11sefs_fclistiPKcS3_ES3_,_ZN11sefs_fcfileC2EPK11apol_vectorPFvPvPK11sefs_fclistiPKcSt9__va_listES3_");
+__asm__(".globl _ZN11sefs_fcfileC2EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_\n.set _ZN11sefs_fcfileC2EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_,_ZN11sefs_fcfileC2EPKcPFvPvPK11sefs_fclistiS1_St9__va_listES2_");
+__asm__(".globl _ZN15sefs_filesystemC1EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_\n.set _ZN15sefs_filesystemC1EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_,_ZN15sefs_filesystemC1EPKcPFvPvPK11sefs_fclistiS1_St9__va_listES2_");
+__asm__(".globl _ZN15sefs_filesystemC2EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_\n.set _ZN15sefs_filesystemC2EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_,_ZN15sefs_filesystemC2EPKcPFvPvPK11sefs_fclistiS1_St9__va_listES2_");
+#endif
only in patch2:
unchanged:
--- setools-3.3.6.ds.orig/libsefs/src/fclist.cc
+++ setools-3.3.6.ds/libsefs/src/fclist.cc
@@ -764,3 +764,11 @@
 		return false;
 	}
 }
+
+#if defined(__ARM_EABI__) && defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+// va_list mangling has been changed in g++ 4.4.
+// Add ABI <= g++-4.3 compatibility aliases.
+__asm__(".globl _ZN11sefs_fclistC1E16sefs_fclist_typePFvPvPKS_iPKcS1_ES1_\n.set _ZN11sefs_fclistC1E16sefs_fclist_typePFvPvPKS_iPKcS1_ES1_,_ZN11sefs_fclistC1E16sefs_fclist_typePFvPvPKS_iPKcSt9__va_listES1_");
+__asm__(".globl _ZN11sefs_fclistC2E16sefs_fclist_typePFvPvPKS_iPKcS1_ES1_\n.set _ZN11sefs_fclistC2E16sefs_fclist_typePFvPvPKS_iPKcS1_ES1_,_ZN11sefs_fclistC2E16sefs_fclist_typePFvPvPKS_iPKcSt9__va_listES1_");
+__asm__(".globl _ZNK11sefs_fclist9handleMsgEiPKcPv\n.set _ZNK11sefs_fclist9handleMsgEiPKcPv,_ZNK11sefs_fclist9handleMsgEiPKcSt9__va_list");
+#endif
only in patch2:
unchanged:
--- setools-3.3.6.ds.orig/libsefs/src/db.cc
+++ setools-3.3.6.ds/libsefs/src/db.cc
@@ -1302,3 +1302,12 @@
 {
 	return sefs_db::isDB(filename);
 }
+
+#if defined(__ARM_EABI__) && defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+// va_list mangling has been changed in g++ 4.4.
+// Add ABI <= g++-4.3 compatibility aliases.
+__asm__(".globl _ZN7sefs_dbC1EP15sefs_filesystemPFvPvPK11sefs_fclistiPKcS2_ES2_\n.set _ZN7sefs_dbC1EP15sefs_filesystemPFvPvPK11sefs_fclistiPKcS2_ES2_,_ZN7sefs_dbC1EP15sefs_filesystemPFvPvPK11sefs_fclistiPKcSt9__va_listES2_");
+__asm__(".globl _ZN7sefs_dbC1EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_\n.set _ZN7sefs_dbC1EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_,_ZN7sefs_dbC1EPKcPFvPvPK11sefs_fclistiS1_St9__va_listES2_");
+__asm__(".globl _ZN7sefs_dbC2EP15sefs_filesystemPFvPvPK11sefs_fclistiPKcS2_ES2_\n.set _ZN7sefs_dbC2EP15sefs_filesystemPFvPvPK11sefs_fclistiPKcS2_ES2_,_ZN7sefs_dbC2EP15sefs_filesystemPFvPvPK11sefs_fclistiPKcSt9__va_listES2_");
+__asm__(".globl _ZN7sefs_dbC2EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_\n.set _ZN7sefs_dbC2EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_,_ZN7sefs_dbC2EPKcPFvPvPK11sefs_fclistiS1_St9__va_listES2_");
+#endif
only in patch2:
unchanged:
--- setools-3.3.6.ds.orig/libsefs/src/filesystem.cc
+++ setools-3.3.6.ds/libsefs/src/filesystem.cc
@@ -731,3 +731,10 @@
 	}
 	return dev_name;
 }
+
+#if defined(__ARM_EABI__) && defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+// va_list mangling has been changed in g++ 4.4.
+// Add ABI <= g++-4.3 compatibility aliases.
+__asm__(".globl _ZN15sefs_filesystemC1EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_\n.set _ZN15sefs_filesystemC1EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_,_ZN15sefs_filesystemC1EPKcPFvPvPK11sefs_fclistiS1_St9__va_listES2_");
+__asm__(".globl _ZN15sefs_filesystemC2EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_\n.set _ZN15sefs_filesystemC2EPKcPFvPvPK11sefs_fclistiS1_S2_ES2_,_ZN15sefs_filesystemC2EPKcPFvPvPK11sefs_fclistiS1_St9__va_listES2_");
+#endif

Attachment: signature.asc
Description: Digital signature

Reply via email to