=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 00:04:30 UTC 2025
On branch cf/5284
nothing to commit, working tree clean
=== applying patch ./Grant-revoke-role-membership-in-a-database-v13.patch
Applied patch to 'contrib/basebackup_to_shell/basebackup_to_shell.c' cleanly.
Applied patch to 'contrib/file_fdw/file_fdw.c' cleanly.
Applied patch to 'contrib/pg_stat_statements/pg_stat_statements.c' cleanly.
Applied patch to 'contrib/pgrowlocks/pgrowlocks.c' cleanly.
Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/grant.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/revoke.sgml' cleanly.
Applied patch to 'doc/src/sgml/user-manag.sgml' cleanly.
Applied patch to 'src/backend/backup/basebackup_server.c' cleanly.
Applied patch to 'src/backend/catalog/aclchk.c' cleanly.
Applied patch to 'src/backend/catalog/catalog.c' cleanly.
Applied patch to 'src/backend/catalog/namespace.c' cleanly.
Applied patch to 'src/backend/catalog/objectaddress.c' cleanly.
Applied patch to 'src/backend/commands/alter.c' cleanly.
Applied patch to 'src/backend/commands/copy.c' cleanly.
Applied patch to 'src/backend/commands/dbcommands.c' cleanly.
Applied patch to 'src/backend/commands/indexcmds.c' cleanly.
Applied patch to 'src/backend/commands/subscriptioncmds.c' cleanly.
Applied patch to 'src/backend/commands/user.c' with conflicts.
Applied patch to 'src/backend/parser/gram.y' cleanly.
Applied patch to 'src/backend/replication/walreceiver.c' cleanly.
Applied patch to 'src/backend/replication/walsender.c' cleanly.
Applied patch to 'src/backend/rewrite/rowsecurity.c' cleanly.
Applied patch to 'src/backend/storage/ipc/procarray.c' cleanly.
Applied patch to 'src/backend/storage/ipc/signalfuncs.c' cleanly.
Applied patch to 'src/backend/tcop/utility.c' cleanly.
Applied patch to 'src/backend/utils/adt/acl.c' cleanly.
Applied patch to 'src/backend/utils/adt/dbsize.c' cleanly.
Applied patch to 'src/backend/utils/adt/genfile.c' cleanly.
Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly.
Applied patch to 'src/backend/utils/cache/catcache.c' cleanly.
Applied patch to 'src/backend/utils/cache/relcache.c' cleanly.
Applied patch to 'src/backend/utils/init/postinit.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_funcs.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_dumpall.c' cleanly.
Applied patch to 'src/include/catalog/pg_auth_members.h' cleanly.
Applied patch to 'src/include/commands/user.h' cleanly.
Applied patch to 'src/include/nodes/parsenodes.h' cleanly.
Applied patch to 'src/include/utils/acl.h' cleanly.
Applied patch to 'src/test/regress/expected/oidjoins.out' cleanly.
Falling back to direct application...
Applied patch to 'src/test/regress/parallel_schedule' cleanly.
Falling back to direct application...
U src/backend/commands/user.c
diff --cc src/backend/commands/user.c
index 0db174e6f1,f56cc3eaba..0000000000
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@@ -817,8 -818,8 +818,13 @@@ AlterRole(ParseState *pstate, AlterRole
  							   "BYPASSRLS", "BYPASSRLS")));
  	}
  
++<<<<<<< ours
 +	/* To add or drop members, you need ADMIN OPTION. */
 +	if (drolemembers && !is_admin_of_role(currentUserId, roleid))
++=======
+ 	/* To add members to a role, you need ADMIN OPTION. */
+ 	if (drolemembers && !is_admin_of_role(currentUserId, roleid, InvalidOid))
++>>>>>>> theirs
  		ereport(ERROR,
  				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
  				 errmsg("permission denied to alter role"),