master+patch.log

application/octet-stream

Filename: master+patch.log
Type: application/octet-stream
Part: 0
Message: Re: "WIP: Data at rest encryption" patch and, PostgreSQL 11-beta3
$ git branch
* master
$ patch -p 1 < ../data-at-rest-encryption-wip-2018.07.25.patch
patching file src/backend/access/transam/xlog.c
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
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 2331 (offset 3 lines).
Hunk #3 succeeded at 2351 (offset 3 lines).
Hunk #4 succeeded at 2469 (offset 3 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
Hunk #2 succeeded at 3408 (offset 6 lines).
Hunk #3 succeeded at 3466 (offset 6 lines).
patching file src/backend/utils/init/miscinit.c
patching file src/backend/utils/misc/guc.c
Hunk #2 succeeded at 195 (offset 1 line).
Hunk #3 succeeded at 1729 (offset 1 line).
Hunk #4 succeeded at 3920 (offset 16 lines).
Hunk #5 succeeded at 10847 (offset 16 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 1089 (offset 1 line).
Hunk #6 succeeded at 1141 (offset 1 line).
Hunk #7 succeeded at 1285 (offset 1 line).
Hunk #8 succeeded at 1513 (offset 1 line).
Hunk #9 succeeded at 2486 (offset 1 line).
Hunk #10 succeeded at 2596 (offset 1 line).
Hunk #11 succeeded at 3108 (offset 1 line).
Hunk #12 succeeded at 3150 (offset 1 line).
Hunk #13 succeeded at 3201 (offset 1 line).
Hunk #14 succeeded at 3246 (offset 1 line).
Hunk #15 succeeded at 3298 (offset 1 line).
Hunk #16 succeeded at 3479 (offset 1 line).
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
patching file src/bin/pg_rewind/pg_rewind.c
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
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
$