=== Applying patches on top of PostgreSQL commit ID b7dc5da1969cb0756739feb393eea51a8265ca04 === === applying patch ./v20-0001-Automatic-client-side-column-level-encryption.patch patching file doc/src/sgml/acronyms.sgml patching file doc/src/sgml/catalogs.sgml patching file doc/src/sgml/charset.sgml patching file doc/src/sgml/datatype.sgml patching file doc/src/sgml/ddl.sgml patching file doc/src/sgml/func.sgml Hunk #1 succeeded at 24897 (offset 1 line). Hunk #2 succeeded at 25421 (offset 1 line). patching file doc/src/sgml/glossary.sgml patching file doc/src/sgml/libpq.sgml Hunk #1 succeeded at 2261 (offset -1 lines). Hunk #2 succeeded at 3386 (offset -1 lines). Hunk #3 succeeded at 3424 (offset -1 lines). Hunk #4 succeeded at 3580 (offset -1 lines). Hunk #5 succeeded at 4546 (offset -1 lines). Hunk #6 succeeded at 4749 (offset -1 lines). Hunk #7 succeeded at 5299 (offset -1 lines). Hunk #8 succeeded at 5309 (offset -1 lines). Hunk #9 succeeded at 5368 (offset -1 lines). Hunk #10 succeeded at 5429 (offset -1 lines). Hunk #11 succeeded at 5558 (offset -1 lines). Hunk #12 succeeded at 9149 (offset -1 lines). patching file doc/src/sgml/protocol.sgml patching file doc/src/sgml/ref/allfiles.sgml patching file doc/src/sgml/ref/alter_column_encryption_key.sgml patching file doc/src/sgml/ref/alter_column_master_key.sgml patching file doc/src/sgml/ref/comment.sgml patching file doc/src/sgml/ref/copy.sgml patching file doc/src/sgml/ref/create_column_encryption_key.sgml patching file doc/src/sgml/ref/create_column_master_key.sgml patching file doc/src/sgml/ref/create_table.sgml patching file doc/src/sgml/ref/discard.sgml patching file doc/src/sgml/ref/drop_column_encryption_key.sgml patching file doc/src/sgml/ref/drop_column_master_key.sgml patching file doc/src/sgml/ref/grant.sgml patching file doc/src/sgml/ref/pg_dump.sgml Hunk #1 succeeded at 723 (offset -21 lines). patching file doc/src/sgml/ref/pg_dumpall.sgml patching file doc/src/sgml/ref/psql-ref.sgml patching file doc/src/sgml/reference.sgml patching file src/backend/access/common/printsimple.c patching file src/backend/access/common/printtup.c patching file src/backend/access/hash/hashvalidate.c patching file src/backend/bootstrap/bootparse.y patching file src/backend/catalog/aclchk.c Hunk #6 succeeded at 2758 (offset 14 lines). Hunk #7 succeeded at 2869 (offset 14 lines). Hunk #8 succeeded at 2900 (offset 14 lines). Hunk #9 succeeded at 3016 (offset 14 lines). Hunk #10 succeeded at 3098 (offset 14 lines). patching file src/backend/catalog/dependency.c patching file src/backend/catalog/heap.c patching file src/backend/catalog/index.c patching file src/backend/catalog/namespace.c patching file src/backend/catalog/objectaddress.c patching file src/backend/catalog/toasting.c patching file src/backend/commands/Makefile patching file src/backend/commands/alter.c patching file src/backend/commands/cluster.c patching file src/backend/commands/colenccmds.c patching file src/backend/commands/createas.c Hunk #2 succeeded at 201 (offset -11 lines). Hunk #3 succeeded at 528 (offset -11 lines). patching file src/backend/commands/discard.c patching file src/backend/commands/dropcmds.c patching file src/backend/commands/event_trigger.c patching file src/backend/commands/meson.build patching file src/backend/commands/seclabel.c patching file src/backend/commands/tablecmds.c Hunk #2 succeeded at 66 (offset 1 line). Hunk #3 succeeded at 673 (offset 2 lines). Hunk #4 succeeded at 711 (offset 2 lines). Hunk #5 succeeded at 910 (offset -32 lines). Hunk #6 succeeded at 1005 (offset -10 lines). Hunk #7 succeeded at 1311 (offset -10 lines). Hunk #8 succeeded at 1330 (offset -10 lines). Hunk #9 succeeded at 1339 (offset -10 lines). Hunk #10 succeeded at 1372 (offset -10 lines). Hunk #11 succeeded at 1395 (offset -10 lines). Hunk #12 succeeded at 1424 (offset -10 lines). Hunk #13 succeeded at 2758 (offset -10 lines). Hunk #14 succeeded at 3328 (offset -10 lines). Hunk #15 succeeded at 3448 (offset -10 lines). Hunk #16 succeeded at 7186 (offset -14 lines). Hunk #17 succeeded at 7324 (offset -14 lines). Hunk #18 succeeded at 7334 (offset -14 lines). Hunk #19 succeeded at 20971 with fuzz 2 (offset -5 lines). patching file src/backend/commands/variable.c patching file src/backend/commands/view.c patching file src/backend/nodes/nodeFuncs.c patching file src/backend/parser/gram.y Hunk #3 succeeded at 601 with fuzz 1. Hunk #13 succeeded at 6508 (offset 54 lines). Hunk #14 succeeded at 6554 (offset 54 lines). Hunk #15 succeeded at 7096 (offset 54 lines). Hunk #16 succeeded at 7909 (offset 54 lines). Hunk #17 succeeded at 9456 (offset 54 lines). Hunk #18 succeeded at 10153 (offset 54 lines). Hunk #19 succeeded at 10506 (offset 54 lines). Hunk #20 succeeded at 11694 (offset 54 lines). Hunk #21 succeeded at 17867 (offset 54 lines). Hunk #22 succeeded at 17936 (offset 54 lines). Hunk #23 succeeded at 18448 (offset 54 lines). Hunk #24 succeeded at 18553 (offset 54 lines). patching file src/backend/parser/parse_param.c patching file src/backend/parser/parse_relation.c patching file src/backend/parser/parse_utilcmd.c patching file src/backend/tcop/backend_startup.c patching file src/backend/tcop/postgres.c patching file src/backend/tcop/utility.c Hunk #2 succeeded at 131 (offset -1 lines). Hunk #3 succeeded at 1437 (offset -22 lines). Hunk #4 succeeded at 1921 (offset -22 lines). Hunk #5 succeeded at 2250 (offset -22 lines). Hunk #6 succeeded at 2671 (offset -22 lines). Hunk #7 succeeded at 2797 (offset -22 lines). Hunk #8 succeeded at 2960 (offset -22 lines). Hunk #9 succeeded at 3109 (offset -22 lines). Hunk #10 succeeded at 3742 (offset -22 lines). patching file src/backend/utils/adt/acl.c patching file src/backend/utils/adt/varlena.c patching file src/backend/utils/cache/lsyscache.c Hunk #2 succeeded at 2703 (offset 22 lines). Hunk #3 succeeded at 3736 (offset 22 lines). patching file src/backend/utils/cache/plancache.c patching file src/backend/utils/mb/mbutils.c patching file src/bin/pg_dump/common.c patching file src/bin/pg_dump/dumputils.c patching file src/bin/pg_dump/pg_backup.h patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #1 succeeded at 3634 (offset 53 lines). patching file src/bin/pg_dump/pg_backup_db.c patching file src/bin/pg_dump/pg_dump.c Hunk #5 succeeded at 1134 (offset -1 lines). Hunk #6 succeeded at 6076 (offset -3 lines). Hunk #7 succeeded at 8864 (offset -3 lines). Hunk #8 succeeded at 8929 with fuzz 1 (offset -3 lines). Hunk #9 succeeded at 9021 (offset 11 lines). Hunk #10 succeeded at 9080 (offset 11 lines). Hunk #11 succeeded at 9149 (offset 11 lines). Hunk #12 succeeded at 9188 (offset 11 lines). Hunk #13 succeeded at 10845 (offset 14 lines). Hunk #14 succeeded at 14326 (offset 14 lines). Hunk #15 succeeded at 16554 (offset 14 lines). Hunk #16 succeeded at 19086 (offset 20 lines). patching file src/bin/pg_dump/pg_dump.h patching file src/bin/pg_dump/pg_dump_sort.c patching file src/bin/pg_dump/pg_dumpall.c patching file src/bin/pg_dump/t/002_pg_dump.pl patching file src/bin/psql/command.c patching file src/bin/psql/describe.c patching file src/bin/psql/describe.h patching file src/bin/psql/help.c patching file src/bin/psql/settings.h patching file src/bin/psql/startup.c patching file src/bin/psql/tab-complete.c patching file src/common/Makefile patching file src/common/colenc.c patching file src/common/meson.build patching file src/include/access/printtup.h patching file src/include/catalog/Makefile patching file src/include/catalog/heap.h patching file src/include/catalog/meson.build patching file src/include/catalog/namespace.h patching file src/include/catalog/pg_amop.dat patching file src/include/catalog/pg_amproc.dat patching file src/include/catalog/pg_attribute.h patching file src/include/catalog/pg_colenckey.h patching file src/include/catalog/pg_colenckeydata.h patching file src/include/catalog/pg_colmasterkey.h patching file src/include/catalog/pg_opclass.dat patching file src/include/catalog/pg_operator.dat patching file src/include/catalog/pg_opfamily.dat patching file src/include/catalog/pg_proc.dat Hunk #3 succeeded at 12263 (offset -5 lines). patching file src/include/catalog/pg_type.dat patching file src/include/catalog/pg_type.h patching file src/include/commands/colenccmds.h patching file src/include/commands/tablecmds.h patching file src/include/common/colenc.h patching file src/include/libpq/libpq-be.h patching file src/include/libpq/protocol.h patching file src/include/nodes/parsenodes.h Hunk #3 succeeded at 2270 (offset 2 lines). Hunk #4 succeeded at 2463 (offset 2 lines). Hunk #5 succeeded at 3966 (offset 2 lines). patching file src/include/parser/kwlist.h patching file src/include/parser/parse_param.h patching file src/include/tcop/cmdtaglist.h patching file src/include/utils/acl.h patching file src/include/utils/lsyscache.h Hunk #1 succeeded at 166 (offset 2 lines). Hunk #2 succeeded at 206 (offset 2 lines). patching file src/include/utils/plancache.h patching file src/interfaces/libpq/Makefile patching file src/interfaces/libpq/exports.txt patching file src/interfaces/libpq/fe-connect.c Hunk #2 succeeded at 1836 (offset 6 lines). Hunk #3 succeeded at 4737 (offset 28 lines). patching file src/interfaces/libpq/fe-encrypt-openssl.c patching file src/interfaces/libpq/fe-encrypt.h patching file src/interfaces/libpq/fe-exec.c patching file src/interfaces/libpq/fe-protocol3.c patching file src/interfaces/libpq/fe-trace.c patching file src/interfaces/libpq/libpq-fe.h patching file src/interfaces/libpq/libpq-int.h patching file src/interfaces/libpq/meson.build Hunk #2 FAILED at 119. 1 out of 2 hunks FAILED -- saving rejects to file src/interfaces/libpq/meson.build.rej patching file src/interfaces/libpq/nls.mk Hunk #1 succeeded at 4 with fuzz 2 (offset 1 line). patching file src/interfaces/libpq/t/010_encrypt.pl patching file src/interfaces/libpq/test/.gitignore patching file src/interfaces/libpq/test/Makefile patching file src/interfaces/libpq/test/meson.build patching file src/test/Makefile patching file src/test/column_encryption/.gitignore patching file src/test/column_encryption/Makefile patching file src/test/column_encryption/meson.build patching file src/test/column_encryption/t/001_column_encryption.pl patching file src/test/column_encryption/t/002_cmk_rotation.pl patching file src/test/column_encryption/test_client.c patching file src/test/column_encryption/test_run_decrypt.pl patching file src/test/meson.build Hunk #1 succeeded at 9 (offset -1 lines). patching file src/test/regress/expected/column_encryption.out patching file src/test/regress/expected/object_address.out patching file src/test/regress/expected/oidjoins.out patching file src/test/regress/expected/opr_sanity.out patching file src/test/regress/expected/type_sanity.out patching file src/test/regress/parallel_schedule patching file src/test/regress/pg_regress_main.c patching file src/test/regress/sql/column_encryption.sql patching file src/test/regress/sql/object_address.sql patching file src/test/regress/sql/type_sanity.sql patching file src/tools/pgindent/typedefs.list Hunk #4 succeeded at 816 (offset -1 lines). Hunk #5 succeeded at 1767 (offset -5 lines).