diff --git a/abicheck-1.2-fortify-source-f8.patch b/abicheck-1.2-fortify-source-f8.patch new file mode 100644 index 0000000..5c12e48 --- /dev/null +++ b/abicheck-1.2-fortify-source-f8.patch @@ -0,0 +1,86 @@ +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 2007-10-05 14:03:36.000000000 +0200 +@@ -3538,5 +3538,82 @@ + 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:__fread_chk ++ libc.so.6:__fread_unlocked_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:__readlinkat_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-fortify-source-fc6.patch b/abicheck-1.2-fortify-source-fc6.patch deleted file mode 100644 index 3c46d57..0000000 --- a/abicheck-1.2-fortify-source-fc6.patch +++ /dev/null @@ -1,84 +0,0 @@ -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 2006-08-28 12:28:14.000000000 +0200 -@@ -3538,5 +3538,80 @@ - 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:__readlinkat_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.spec b/abicheck.spec index 4dd4d0d..e7b526b 100644 --- a/abicheck.spec +++ b/abicheck.spec @@ -12,7 +12,7 @@ Patch0: abicheck-1.2-fc3.patch Patch1: abicheck-1.2-tests.patch Patch2: abicheck-1.2-bindings-fc4.patch Patch3: abicheck-1.2-libgcc.patch -Patch4: abicheck-1.2-fortify-source-fc6.patch +Patch4: abicheck-1.2-fortify-source-f8.patch Patch5: abicheck-1.2-ldlinux.patch Patch6: abicheck-1.2-undefined-symbol.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) @@ -31,7 +31,7 @@ Binary Interface). %patch1 -p1 -b .tests %patch2 -p1 -b .bindings-fc4 %patch3 -p1 -b .libgcc -%patch4 -p1 -b .fortify-source-fc5 +%patch4 -p1 -b .fortify-source-f8 %patch5 -p1 -b .ldlinux %patch6 -p1 -b .undefined-symbol sed -i -e 's!/usr/lib/!%{_libdir}/!g' test/Makefile @@ -66,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Oct 5 2007 Michael Schwendt - 1.2-15 - Patch unbound_match. +- Update fortify-source patch. * Thu Aug 2 2007 Michael Schwendt - 1.2-14 - Clarify licence (LGPLv2).