PG11-beta3+0725patch.log
application/octet-stream
Filename: PG11-beta3+0725patch.log
Type: application/octet-stream
Part: 0
$ patch -p1 < data-at-rest-encryption-wip-2018.07.25.patch patching file src/backend/access/transam/xlog.c Hunk #4 succeeded at 1242 (offset -1 lines). Hunk #5 succeeded at 1296 (offset -1 lines). Hunk #6 succeeded at 1592 (offset -1 lines). Hunk #7 succeeded at 2476 (offset -1 lines). Hunk #8 succeeded at 2492 (offset -1 lines). Hunk #9 succeeded at 2641 (offset -1 lines). Hunk #10 succeeded at 4733 (offset -39 lines). Hunk #11 succeeded at 4845 (offset -41 lines). Hunk #12 succeeded at 5233 (offset -41 lines). Hunk #13 succeeded at 5294 (offset -41 lines). Hunk #14 succeeded at 11859 (offset -79 lines). patching file src/backend/access/transam/xloginsert.c patching file src/backend/access/transam/xlogreader.c patching file src/backend/access/transam/xlogutils.c patching file src/backend/bootstrap/bootstrap.c patching file src/backend/commands/dbcommands.c patching file src/backend/postmaster/pgstat.c Hunk #7 succeeded at 4704 (offset -3 lines). Hunk #8 succeeded at 4728 (offset -3 lines). Hunk #9 succeeded at 4770 (offset -3 lines). Hunk #10 succeeded at 4897 (offset -3 lines). Hunk #11 succeeded at 4919 (offset -3 lines). Hunk #12 succeeded at 4935 (offset -3 lines). Hunk #13 succeeded at 4945 (offset -3 lines). Hunk #14 succeeded at 5057 (offset -3 lines). Hunk #15 succeeded at 5109 (offset -3 lines). Hunk #16 succeeded at 5151 (offset -3 lines). Hunk #17 succeeded at 5172 (offset -3 lines). Hunk #18 succeeded at 5186 (offset -3 lines). Hunk #19 succeeded at 5293 (offset -3 lines). Hunk #20 succeeded at 5333 (offset -3 lines). Hunk #21 succeeded at 5358 (offset -3 lines). Hunk #22 succeeded at 5404 (offset -3 lines). Hunk #23 succeeded at 5452 (offset -3 lines). Hunk #24 succeeded at 5499 (offset -3 lines). Hunk #25 succeeded at 5536 (offset -3 lines). Hunk #26 succeeded at 5554 (offset -3 lines). Hunk #27 succeeded at 5628 (offset -3 lines). Hunk #28 succeeded at 5678 (offset -3 lines). Hunk #29 succeeded at 5830 (offset -3 lines). Hunk #30 succeeded at 6594 (offset -3 lines). patching file src/backend/postmaster/postmaster.c patching file src/backend/replication/basebackup.c patching file src/backend/replication/logical/reorderbuffer.c Hunk #9 FAILED at 2464. Hunk #10 succeeded at 2494 (offset 1 line). Hunk #11 succeeded at 2516 (offset 1 line). Hunk #12 succeeded at 2568 (offset 1 line). Hunk #13 succeeded at 2585 (offset 1 line). 1 out of 13 hunks FAILED -- saving rejects to file src/backend/replication/logical/reorderbuffer.c.rej patching file src/backend/replication/walsender.c Hunk #2 succeeded at 2324 (offset -4 lines). Hunk #3 succeeded at 2344 (offset -4 lines). Hunk #4 succeeded at 2454 (offset -12 lines). patching file src/backend/storage/file/buffile.c patching file src/backend/storage/file/copydir.c patching file src/backend/storage/file/fd.c patching file src/backend/storage/file/reinit.c patching file src/backend/storage/page/bufpage.c patching file src/backend/storage/smgr/Makefile patching file src/backend/storage/smgr/encryption.c patching file src/backend/storage/smgr/md.c Hunk #10 succeeded at 2042 (offset 1 line). patching file src/backend/tcop/postgres.c patching file src/backend/utils/init/miscinit.c Hunk #1 succeeded at 1510 (offset -12 lines). patching file src/backend/utils/misc/guc.c Hunk #3 succeeded at 1721 (offset -7 lines). Hunk #4 succeeded at 3897 (offset -7 lines). Hunk #5 succeeded at 10812 (offset -19 lines). patching file src/backend/utils/misc/postgresql.conf.sample patching file src/bin/Makefile patching file src/bin/initdb/Makefile patching file src/bin/initdb/initdb.c Hunk #5 succeeded at 1082 (offset -6 lines). Hunk #6 succeeded at 1134 (offset -6 lines). Hunk #7 succeeded at 1278 (offset -6 lines). Hunk #8 succeeded at 1506 (offset -6 lines). Hunk #9 succeeded at 2479 (offset -6 lines). Hunk #10 succeeded at 2589 (offset -6 lines). Hunk #11 succeeded at 3101 (offset -6 lines). Hunk #12 succeeded at 3143 (offset -6 lines). Hunk #13 succeeded at 3194 (offset -6 lines). Hunk #14 succeeded at 3239 (offset -6 lines). Hunk #15 succeeded at 3291 (offset -6 lines). Hunk #16 succeeded at 3472 (offset -6 lines). patching file src/bin/pg_controldata/pg_controldata.c patching file src/bin/pg_keysetup/Makefile patching file src/bin/pg_keysetup/pg_keysetup.c patching file src/bin/pg_resetwal/Makefile patching file src/bin/pg_resetwal/pg_resetwal.c patching file src/bin/pg_rewind/Makefile patching file src/bin/pg_rewind/parsexlog.c Hunk #2 succeeded at 316 (offset -8 lines). patching file src/bin/pg_rewind/pg_rewind.c Hunk #1 succeeded at 28 (offset -1 lines). Hunk #2 succeeded at 70 with fuzz 2 (offset -2 lines). Hunk #3 succeeded at 95 with fuzz 1 (offset -5 lines). Hunk #4 FAILED at 137. Hunk #5 succeeded at 162 (offset -9 lines). Hunk #6 succeeded at 247 (offset -9 lines). Hunk #7 succeeded at 449 (offset -9 lines). 1 out of 7 hunks FAILED -- saving rejects to file src/bin/pg_rewind/pg_rewind.c.rej patching file src/bin/pg_upgrade/check.c patching file src/bin/pg_upgrade/controldata.c Hunk #1 FAILED at 58. Hunk #2 succeeded at 195 (offset 60 lines). Hunk #3 succeeded at 485 (offset 60 lines). Hunk #4 succeeded at 567 (offset 60 lines). Hunk #5 succeeded at 633 (offset 60 lines). Hunk #6 succeeded at 701 (offset 60 lines). 1 out of 6 hunks FAILED -- saving rejects to file src/bin/pg_upgrade/controldata.c.rej patching file src/bin/pg_upgrade/pg_upgrade.h patching file src/bin/pg_waldump/Makefile patching file src/bin/pg_waldump/pg_waldump.c Hunk #2 succeeded at 216 with fuzz 2 (offset -2 lines). Hunk #3 succeeded at 533 (offset -9 lines). Hunk #4 succeeded at 898 (offset -9 lines). Hunk #5 succeeded at 938 (offset -9 lines). Hunk #6 succeeded at 946 (offset -9 lines). Hunk #7 succeeded at 982 (offset -9 lines). Hunk #8 succeeded at 1006 (offset -9 lines). Hunk #9 succeeded at 1072 (offset -9 lines). Hunk #10 succeeded at 1222 (offset -9 lines). patching file src/common/string.c patching file src/include/access/xlog.h patching file src/include/access/xlog_internal.h patching file src/include/catalog/pg_control.h patching file src/include/common/string.h patching file src/include/miscadmin.h patching file src/include/pgstat.h patching file src/include/storage/copydir.h patching file src/include/storage/encryption.h patching file src/include/storage/fd.h patching file src/include/storage/reinit.h patching file src/include/storage/smgr.h patching file src/test/modules/buffile/Makefile patching file src/test/modules/buffile/README patching file src/test/modules/buffile/buffile--1.0.sql patching file src/test/modules/buffile/buffile.c patching file src/test/modules/buffile/buffile.control patching file src/test/modules/buffile/expected/test_00.out patching file src/test/modules/buffile/expected/test_01.out patching file src/test/modules/buffile/expected/test_02.out patching file src/test/modules/buffile/expected/test_03.out patching file src/test/modules/buffile/expected/test_04.out patching file src/test/modules/buffile/expected/test_05.out patching file src/test/modules/buffile/expected/test_06.out patching file src/test/modules/buffile/expected/test_07.out patching file src/test/modules/buffile/expected/test_08.out patching file src/test/modules/buffile/expected/test_09.out patching file src/test/modules/buffile/expected/test_10.out patching file src/test/modules/buffile/expected/test_11.out patching file src/test/modules/buffile/expected/test_12.out patching file src/test/modules/buffile/sql/test_00.sql patching file src/test/modules/buffile/sql/test_01.sql patching file src/test/modules/buffile/sql/test_02.sql patching file src/test/modules/buffile/sql/test_03.sql patching file src/test/modules/buffile/sql/test_04.sql patching file src/test/modules/buffile/sql/test_05.sql patching file src/test/modules/buffile/sql/test_06.sql patching file src/test/modules/buffile/sql/test_07.sql patching file src/test/modules/buffile/sql/test_08.sql patching file src/test/modules/buffile/sql/test_09.sql patching file src/test/modules/buffile/sql/test_10.sql patching file src/test/modules/buffile/sql/test_11.sql patching file src/test/modules/buffile/sql/test_12.sql $