=== Applying patches on top of PostgreSQL commit ID 7467939ea226ebc5608285486501b136b642c02b === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. === 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 Hunk #2 succeeded at 1424 (offset -1 lines). Hunk #3 succeeded at 2546 (offset -1 lines). patching file doc/src/sgml/charset.sgml Hunk #1 succeeded at 2399 (offset 2 lines). patching file doc/src/sgml/datatype.sgml patching file doc/src/sgml/ddl.sgml Hunk #1 succeeded at 1356 (offset -19 lines). Hunk #2 succeeded at 2543 (offset -27 lines). Hunk #3 succeeded at 2717 (offset -27 lines). patching file doc/src/sgml/func.sgml Hunk #1 succeeded at 24900 (offset 4 lines). Hunk #2 succeeded at 25424 (offset 4 lines). patching file doc/src/sgml/glossary.sgml Hunk #1 succeeded at 434 (offset 1 line). patching file doc/src/sgml/libpq.sgml Hunk #1 succeeded at 2275 (offset 13 lines). Hunk #2 succeeded at 3400 (offset 13 lines). Hunk #3 succeeded at 3438 (offset 13 lines). Hunk #4 succeeded at 3594 (offset 13 lines). Hunk #5 succeeded at 4560 (offset 13 lines). Hunk #6 succeeded at 4763 (offset 13 lines). Hunk #7 succeeded at 5313 (offset 13 lines). Hunk #8 succeeded at 5323 (offset 13 lines). Hunk #9 succeeded at 5382 (offset 13 lines). Hunk #10 succeeded at 5443 (offset 13 lines). Hunk #11 succeeded at 5572 (offset 13 lines). Hunk #12 succeeded at 9162 (offset 12 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 Hunk #2 succeeded at 87 (offset -1 lines). Hunk #3 succeeded at 351 (offset -1 lines). Hunk #4 succeeded at 757 (offset -1 lines). 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 2756 (offset 12 lines). Hunk #7 succeeded at 2867 (offset 12 lines). Hunk #8 succeeded at 2898 (offset 12 lines). Hunk #9 succeeded at 3014 (offset 12 lines). Hunk #10 succeeded at 3096 (offset 12 lines). patching file src/backend/catalog/dependency.c Hunk #2 succeeded at 1449 (offset 2 lines). 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 #1 succeeded at 35 (offset -1 lines). Hunk #2 succeeded at 66 (offset 1 line). Hunk #3 succeeded at 658 (offset -13 lines). Hunk #4 succeeded at 696 with fuzz 1 (offset -13 lines). Hunk #5 succeeded at 892 with fuzz 2 (offset -50 lines). Hunk #6 succeeded at 987 (offset -28 lines). Hunk #7 succeeded at 1282 (offset -39 lines). Hunk #8 succeeded at 1301 (offset -39 lines). Hunk #9 succeeded at 1310 (offset -39 lines). Hunk #10 succeeded at 1343 (offset -39 lines). Hunk #11 succeeded at 1366 (offset -39 lines). Hunk #12 succeeded at 1395 (offset -39 lines). Hunk #13 FAILED at 2768. Hunk #14 succeeded at 3214 (offset -112 lines). Hunk #15 succeeded at 3334 (offset -112 lines). Hunk #16 succeeded at 7112 (offset -76 lines). Hunk #17 succeeded at 7250 (offset -76 lines). Hunk #18 succeeded at 7260 (offset -76 lines). Hunk #19 succeeded at 20704 with fuzz 2 (offset -260 lines). 1 out of 19 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej patching file src/backend/commands/variable.c patching file src/backend/commands/view.c patching file src/backend/nodes/nodeFuncs.c Hunk #1 succeeded at 4526 (offset 14 lines). patching file src/backend/parser/gram.y Hunk #3 succeeded at 600 with fuzz 1 (offset -1 lines). Hunk #4 succeeded at 729 (offset -1 lines). Hunk #5 succeeded at 754 (offset -1 lines). Hunk #6 succeeded at 1006 (offset -2 lines). Hunk #7 succeeded at 2034 (offset -2 lines). Hunk #8 succeeded at 2060 (offset -2 lines). Hunk #9 succeeded at 3831 (offset -2 lines). Hunk #10 succeeded at 3848 (offset -2 lines). Hunk #11 succeeded at 3906 (offset -2 lines). Hunk #12 succeeded at 4171 (offset -5 lines). Hunk #13 succeeded at 6462 (offset 8 lines). Hunk #14 succeeded at 6508 (offset 8 lines). Hunk #15 succeeded at 7050 (offset 8 lines). Hunk #16 succeeded at 7863 (offset 8 lines). Hunk #17 succeeded at 9410 (offset 8 lines). Hunk #18 succeeded at 10107 (offset 8 lines). Hunk #19 succeeded at 10460 (offset 8 lines). Hunk #20 succeeded at 11648 (offset 8 lines). Hunk #21 succeeded at 17821 (offset 8 lines). Hunk #22 succeeded at 17890 (offset 8 lines). Hunk #23 succeeded at 18401 (offset 7 lines). Hunk #24 succeeded at 18506 (offset 7 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 Hunk #1 succeeded at 1050 with fuzz 2 (offset -42 lines). 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 Hunk #5 succeeded at 2974 (offset 6 lines). 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 Hunk #2 succeeded at 204 (offset -1 lines). Hunk #3 succeeded at 941 (offset -3 lines). 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 3637 (offset 56 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 8854 (offset -13 lines). Hunk #8 FAILED at 8932. Hunk #9 succeeded at 8965 (offset -43 lines). Hunk #10 succeeded at 9006 (offset -61 lines). Hunk #11 succeeded at 9069 (offset -67 lines). Hunk #12 succeeded at 9102 (offset -73 lines). Hunk #13 succeeded at 10636 (offset -193 lines). Hunk #14 succeeded at 14117 (offset -193 lines). Hunk #15 succeeded at 16344 (offset -194 lines). Hunk #16 succeeded at 18822 (offset -242 lines). 1 out of 16 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_dump.c.rej patching file src/bin/pg_dump/pg_dump.h Hunk #3 succeeded at 697 (offset -6 lines). Hunk #4 succeeded at 744 (offset -6 lines). Hunk #5 succeeded at 774 (offset -6 lines). 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 Hunk #2 succeeded at 1503 (offset -36 lines). Hunk #3 succeeded at 2008 (offset -36 lines). Hunk #4 succeeded at 4140 (offset -38 lines). patching file src/bin/psql/command.c patching file src/bin/psql/describe.c Hunk #9 succeeded at 4576 (offset -52 lines). 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 Hunk #5 succeeded at 2995 (offset 14 lines). Hunk #6 succeeded at 3774 (offset 14 lines). Hunk #7 succeeded at 3788 (offset 14 lines). Hunk #8 succeeded at 4113 (offset 17 lines). Hunk #9 succeeded at 4233 (offset 17 lines). 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 Hunk #2 succeeded at 72 (offset -1 lines). Hunk #3 succeeded at 138 (offset -4 lines). 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 Hunk #1 succeeded at 169 (offset 3 lines). 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 #1 succeeded at 6440 (offset 1 line). Hunk #2 succeeded at 7233 (offset 1 line). Hunk #3 succeeded at 12253 with fuzz 2 (offset -15 lines). patching file src/include/catalog/pg_type.dat Hunk #1 succeeded at 695 (offset 1 line). 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 #5 succeeded at 3959 (offset -5 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 Hunk #1 FAILED at 204. 1 out of 1 hunk FAILED -- saving rejects to file src/interfaces/libpq/exports.txt.rej patching file src/interfaces/libpq/fe-connect.c Hunk #2 succeeded at 1854 (offset 24 lines). Hunk #3 succeeded at 4722 (offset 13 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 Hunk #1 FAILED at 450. Hunk #2 FAILED at 458. Hunk #3 succeeded at 468 (offset -11 lines). Hunk #4 FAILED at 520. Hunk #5 FAILED at 663. Hunk #6 succeeded at 673 with fuzz 2 (offset -8 lines). 4 out of 6 hunks FAILED -- saving rejects to file src/interfaces/libpq/fe-trace.c.rej patching file src/interfaces/libpq/libpq-fe.h Hunk #1 succeeded at 278 (offset 2 lines). Hunk #2 succeeded at 470 (offset 2 lines). Hunk #3 succeeded at 501 (offset 2 lines). Hunk #4 succeeded at 581 (offset 2 lines). Hunk #5 succeeded at 591 (offset 2 lines). patching file src/interfaces/libpq/libpq-int.h Hunk #2 succeeded at 360 (offset -1 lines). Hunk #3 succeeded at 437 (offset -2 lines). Hunk #4 succeeded at 541 (offset -2 lines). Hunk #5 succeeded at 740 (offset -2 lines). 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 #2 succeeded at 389 with fuzz 2 (offset 9 lines). Hunk #3 succeeded at 414 (offset 8 lines). Hunk #4 succeeded at 827 (offset 10 lines). Hunk #5 succeeded at 1783 (offset 11 lines).