-Patch4: %{name}-string2-pointer-arith.patch
-Patch5: %{name}-linuxthreads-lock.patch
-Patch6: %{name}-pthread_create-manpage.patch
-Patch9: %{name}-paths.patch
-Patch10: %{name}-vaargs.patch
-Patch11: %{name}-getaddrinfo-workaround.patch
-Patch12: %{name}-postshell.patch
-Patch13: %{name}-pl.po-update.patch
-Patch14: %{name}-missing-nls.patch
-Patch16: %{name}-java-libc-wait.patch
-Patch17: %{name}-morelocales.patch
-Patch18: %{name}-lthrds_noomit.patch
-Patch19: %{name}-no_opt_override.patch
-Patch20: %{name}-gcc33.patch
-#Patch21: %{name}-sanity.patch
-Patch22: %{name}-secureexec.patch
-Patch23: %{name}-kernel_includes.patch
-Patch24: %{name}-sparc64_pause.patch
-Patch25: %{name}-linuxthreads.patch
-Patch26: %{name}-alpha-fix-as-syntax.patch
-Patch27: %{name}-soinit-EH_FRAME.patch
+Patch4: %{name}-linuxthreads-lock.patch
+Patch5: %{name}-pthread_create-manpage.patch
+Patch6: %{name}-paths.patch
+Patch7: %{name}-i786.patch
+Patch8: %{name}-postshell.patch
+Patch9: %{name}-missing-nls.patch
+Patch10: %{name}-java-libc-wait.patch
+Patch11: %{name}-lthrds_noomit.patch
+Patch12: %{name}-no_opt_override.patch
+# this is broken (hardcoded /usr/src/linux)
+Patch13: %{name}-kernel_includes.patch
+Patch14: %{name}-includes.patch
+Patch15: %{name}-soinit-EH_FRAME.patch
+Patch16: %{name}-sparc-errno_fix.patch
+Patch17: %{name}-make.patch
+Patch18: %{name}-tests-noproc.patch
+Patch19: %{name}-new-charsets.patch
+Patch20: %{name}-sr_CS.patch
+Patch21: %{name}-alpha-div.patch
+Patch22: %{name}-alpha-relro.patch
+Patch23: %{name}-sparc64-dl-machine.patch
+Patch24: %{name}-csu-quotes.patch
+# PaX
+Patch30: %{name}-pax_iconvconfig.patch
+Patch31: %{name}-pax_dl-execstack.patch