Fix broken patch (missing @) by using the upstream version now that it's
available.

PR: 246615
Reported by: jkim
Obtained from: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=6e6abd0cdfe4bb96f6412aebc511f10bf254a820