diff --git a/abicheck-1.2-fortify-source-fc5.patch b/abicheck-1.2-fortify-source-fc5.patch new file mode 100644 index 0000000..86e1f4d --- /dev/null +++ b/abicheck-1.2-fortify-source-fc5.patch @@ -0,0 +1,83 @@ +diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl +--- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 ++++ abicheck-1.2/abicheck.pl 2005-08-15 20:54:04.000000000 +0200 +@@ -3538,5 +3538,79 @@ + libnsl.so.1:readColdStartFile + libnsl.so.1:writeColdStartFile + ); ++ ++ # ++ # These are _FORTIFY_SOURCE symbols. ++ # ++ push(@{$public}, qw( ++ libc.so.6:__chk_fail ++ libc.so.6:__confstr_chk ++ libc.so.6:__fgets_chk ++ libc.so.6:__fgets_unlocked_chk ++ libc.so.6:__fgetws_chk ++ libc.so.6:__fgetws_unlocked_chk ++ libc.so.6:__fprintf_chk ++ libc.so.6:__fwprintf_chk ++ libc.so.6:__getcwd_chk ++ libc.so.6:__getdomainname_chk ++ libc.so.6:__getgroups_chk ++ libc.so.6:__gethostname_chk ++ libc.so.6:__getlogin_r_chk ++ libc.so.6:__gets_chk ++ libc.so.6:__getwd_chk ++ libc.so.6:__mbsnrtowcs_chk ++ libc.so.6:__mbsrtowcs_chk ++ libc.so.6:__mbstowcs_chk ++ libc.so.6:__memcpy_chk ++ libc.so.6:__memmove_chk ++ libc.so.6:__mempcpy_chk ++ libc.so.6:__memset_chk ++ libc.so.6:__pread64_chk ++ libc.so.6:__pread_chk ++ libc.so.6:__printf_chk ++ libc.so.6:__ptsname_r_chk ++ libc.so.6:__read_chk ++ libc.so.6:__readlink_chk ++ libc.so.6:__realpath_chk ++ libc.so.6:__recv_chk ++ libc.so.6:__recvfrom_chk ++ libc.so.6:__snprintf_chk ++ libc.so.6:__sprintf_chk ++ libc.so.6:__stack_chk_fail ++ libc.so.6:__stpcpy_chk ++ libc.so.6:__stpncpy_chk ++ libc.so.6:__strcat_chk ++ libc.so.6:__strcpy_chk ++ libc.so.6:__strncat_chk ++ libc.so.6:__strncpy_chk ++ libc.so.6:__swprintf_chk ++ libc.so.6:__syslog_chk ++ libc.so.6:__ttyname_r_chk ++ libc.so.6:__vfprintf_chk ++ libc.so.6:__vfwprintf_chk ++ libc.so.6:__vprintf_chk ++ libc.so.6:__vsnprintf_chk ++ libc.so.6:__vsprintf_chk ++ libc.so.6:__vswprintf_chk ++ libc.so.6:__vsyslog_chk ++ libc.so.6:__vwprintf_chk ++ libc.so.6:__wcpcpy_chk ++ libc.so.6:__wcpncpy_chk ++ libc.so.6:__wcrtomb_chk ++ libc.so.6:__wcscat_chk ++ libc.so.6:__wcscpy_chk ++ libc.so.6:__wcsncat_chk ++ libc.so.6:__wcsncpy_chk ++ libc.so.6:__wcsnrtombs_chk ++ libc.so.6:__wcsrtombs_chk ++ libc.so.6:__wcstombs_chk ++ libc.so.6:__wctomb_chk ++ libc.so.6:__wmemcpy_chk ++ libc.so.6:__wmemmove_chk ++ libc.so.6:__wmempcpy_chk ++ libc.so.6:__wmemset_chk ++ libc.so.6:__wprintf_chk ++ ) ++ ); + } + } diff --git a/abicheck-1.2-libgcc.patch b/abicheck-1.2-libgcc.patch new file mode 100644 index 0000000..f0e4585 --- /dev/null +++ b/abicheck-1.2-libgcc.patch @@ -0,0 +1,23 @@ +diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl +--- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 ++++ abicheck-1.2/abicheck.pl 2005-08-15 21:10:15.000000000 +0200 +@@ -3498,6 +3498,19 @@ + libc.so.6:__ctype_b_loc + libc.so.6:__ctype_tolower_loc + libc.so.6:__ctype_toupper_loc ++ ++ libgcc_s.so.1:__divdi3 ++ libgcc_s.so.1:__register_frame ++ libgcc_s.so.1:__frame_state_for ++ libgcc_s.so.1:__umoddi3 ++ libgcc_s.so.1:__udivdi3 ++ libgcc_s.so.1:__register_frame_table ++ libgcc_s.so.1:__deregister_frame_info ++ libgcc_s.so.1:__deregister_frame ++ libgcc_s.so.1:__cxa_finalize ++ libgcc_s.so.1:__moddi3 ++ libgcc_s.so.1:__register_frame_info_table ++ libgcc_s.so.1:__register_frame_info + ); + + @{$private} = qw( diff --git a/abicheck.dbfile.FORTIFY_SOURCE b/abicheck.dbfile.FORTIFY_SOURCE deleted file mode 100644 index a13368a..0000000 --- a/abicheck.dbfile.FORTIFY_SOURCE +++ /dev/null @@ -1,67 +0,0 @@ -libc.so.6|__chk_fail|public -libc.so.6|__confstr_chk|public -libc.so.6|__fgets_chk|public -libc.so.6|__fgets_unlocked_chk|public -libc.so.6|__fgetws_chk|public -libc.so.6|__fgetws_unlocked_chk|public -libc.so.6|__fprintf_chk|public -libc.so.6|__fwprintf_chk|public -libc.so.6|__getcwd_chk|public -libc.so.6|__getdomainname_chk|public -libc.so.6|__getgroups_chk|public -libc.so.6|__gethostname_chk|public -libc.so.6|__getlogin_r_chk|public -libc.so.6|__gets_chk|public -libc.so.6|__getwd_chk|public -libc.so.6|__mbsnrtowcs_chk|public -libc.so.6|__mbsrtowcs_chk|public -libc.so.6|__mbstowcs_chk|public -libc.so.6|__memcpy_chk|public -libc.so.6|__memmove_chk|public -libc.so.6|__mempcpy_chk|public -libc.so.6|__memset_chk|public -libc.so.6|__pread64_chk|public -libc.so.6|__pread_chk|public -libc.so.6|__printf_chk|public -libc.so.6|__ptsname_r_chk|public -libc.so.6|__read_chk|public -libc.so.6|__readlink_chk|public -libc.so.6|__realpath_chk|public -libc.so.6|__recv_chk|public -libc.so.6|__recvfrom_chk|public -libc.so.6|__snprintf_chk|public -libc.so.6|__sprintf_chk|public -libc.so.6|__stack_chk_fail|public -libc.so.6|__stpcpy_chk|public -libc.so.6|__stpncpy_chk|public -libc.so.6|__strcat_chk|public -libc.so.6|__strcpy_chk|public -libc.so.6|__strncat_chk|public -libc.so.6|__strncpy_chk|public -libc.so.6|__swprintf_chk|public -libc.so.6|__syslog_chk|public -libc.so.6|__ttyname_r_chk|public -libc.so.6|__vfprintf_chk|public -libc.so.6|__vfwprintf_chk|public -libc.so.6|__vprintf_chk|public -libc.so.6|__vsnprintf_chk|public -libc.so.6|__vsprintf_chk|public -libc.so.6|__vswprintf_chk|public -libc.so.6|__vsyslog_chk|public -libc.so.6|__vwprintf_chk|public -libc.so.6|__wcpcpy_chk|public -libc.so.6|__wcpncpy_chk|public -libc.so.6|__wcrtomb_chk|public -libc.so.6|__wcscat_chk|public -libc.so.6|__wcscpy_chk|public -libc.so.6|__wcsncat_chk|public -libc.so.6|__wcsncpy_chk|public -libc.so.6|__wcsnrtombs_chk|public -libc.so.6|__wcsrtombs_chk|public -libc.so.6|__wcstombs_chk|public -libc.so.6|__wctomb_chk|public -libc.so.6|__wmemcpy_chk|public -libc.so.6|__wmemmove_chk|public -libc.so.6|__wmempcpy_chk|public -libc.so.6|__wmemset_chk|public -libc.so.6|__wprintf_chk|public diff --git a/abicheck.spec b/abicheck.spec index 1fadac2..8104244 100644 --- a/abicheck.spec +++ b/abicheck.spec @@ -8,10 +8,11 @@ License: LGPL Group: Applications/File URL: http://abicheck.sourceforge.net/ Source0: http://dl.sf.net/abicheck/%{name}-%{version}.tar.gz -Source1: abicheck.dbfile.FORTIFY_SOURCE Patch0: abicheck-1.2-fc3.patch Patch1: abicheck-1.2-test-static.patch Patch2: abicheck-1.2-bindings-fc4.patch +Patch3: abicheck-1.2-libgcc.patch +Patch4: abicheck-1.2-fortify-source-fc5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Requires: binutils perl @@ -27,6 +28,8 @@ Binary Interface). %patch -p1 -b .fc3 %patch1 -p1 -b .test-static %patch2 -p1 -b .bindings-fc4 +%patch3 -p1 -b .libgcc +%patch4 -p1 -b .fortify-source-fc5 sed -i -e 's!/usr/lib/!%{_libdir}/!g' test/Makefile @@ -40,7 +43,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 install -p -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir} install -p -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install -p -m 0644 %{SOURCE1} dbfile.FORTIFY_SOURCE %clean @@ -50,12 +52,16 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING ChangeLog INTRO README -%doc dbfile.FORTIFY_SOURCE %{_bindir}/abicheck %{_mandir}/man1/abicheck.1* %changelog +* Mon Aug 15 2005 Michael Schwendt - 1.2-8 +- Add libgcc symbols. +- Add more _FORTIFY_SOURCE symbols. +- Override symbol classification by default. + * Thu Aug 11 2005 Michael Schwendt - 1.2-7 - Add an override file in %%doc which can be specified with option -O to modify the symbol classification for binaries