Solène Rapenne <[email protected]> wrote: > Le Sun, 12 Jun 2022 07:21:24 -0600 (MDT), > Omar Polo <[email protected]> a écrit : > > > CVSROOT: /cvs > > Module name: ports > > Changes by: [email protected] 2022/06/12 07:21:24 > > > > Modified files: > > net/prosody : Tag: OPENBSD_7_1 Makefile distinfo > > net/prosody/pkg: Tag: OPENBSD_7_1 prosody.rc > > > > Log message: > > update net/prosody to 0.12.1; from Lucas, thanks! > > > > While here backport of the tweak to prosody.rc from aja@, the `|| return > > 1' is no longer needed. > > > > doesn't compile because of patches
I forgot to delete the two upstreamed patches... apologize. Now it should compile. Thanks, Omar Polo > +++ Sun Jun 12 13:20:13 MDT 2022 > ===> Patching for prosody-0.12.1 > ===> Applying OpenBSD patch patch-certs_makefile > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: certs/makefile > > |--- certs/makefile.orig > |+++ certs/makefile > > -------------------------- > Patching file certs/makefile using Plan A... > Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 > succeeded at 14. > done > ===> Applying OpenBSD patch patch-core_certmanager_lua > > > > Hmm... Looks like a unified diff to me... > > > > The text leading up to this was: > > > > -------------------------- > > > > |Index: core/certmanager.lua > |--- core/certmanager.lua.orig > |+++ core/certmanager.lua > -------------------------- > Patching file core/certmanager.lua using Plan A... > Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 > succeeded at 202. > done > ===> Applying OpenBSD patch patch-makefile > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |fix directories > | > |Index: makefile > |--- makefile.orig > |+++ makefile > -------------------------- > Patching file makefile using Plan A... > Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 > succeeded at 1. > done > ===> Applying OpenBSD patch patch-plugins_mod_admin_socket_lua > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Upstream fix for older LuaSocket > |ref: https://hg.prosody.im/timber/rev/55590a970de7 > | > |Index: plugins/mod_admin_socket.lua > |--- plugins/mod_admin_socket.lua.orig > |+++ plugins/mod_admin_socket.lua > -------------------------- > Patching file plugins/mod_admin_socket.lua using Plan A... > Hunk #1 failed at 2. > 1 out of 1 hunks failed--saving rejects to plugins/mod_admin_socket.lua.rej > done > ***> patch-plugins_mod_admin_socket_lua did not apply cleanly > ===> Applying OpenBSD patch patch-prosody_cfg_lua_dist > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: prosody.cfg.lua.dist > |--- prosody.cfg.lua.dist.orig > |+++ prosody.cfg.lua.dist > -------------------------- > Patching file prosody.cfg.lua.dist using Plan A... > Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 > succeeded at 23. > Hunk #2 succeeded at 183. > done > ===> Applying OpenBSD patch patch-util-src_pposix_c > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Define _BSD_SOURCE to make initgroups(3) visible > | > |Index: util-src/pposix.c > |--- util-src/pposix.c.orig > |+++ util-src/pposix.c > -------------------------- > Patching file util-src/pposix.c using Plan A... > Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 > succeeded at 31. > done > ===> Applying OpenBSD patch patch-util-src_table_c > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: util-src/table.c > |--- util-src/table.c.orig > |+++ util-src/table.c > -------------------------- > Patching file util-src/table.c using Plan A... > Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 > succeeded at 8. > done > ===> Applying OpenBSD patch patch-util_adminstream_lua > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Upstream fix for older LuaSocket > |ref: https://hg.prosody.im/timber/rev/55590a970de7 > | > |Index: util/adminstream.lua > |--- util/adminstream.lua.orig > |+++ util/adminstream.lua > -------------------------- > Patching file util/adminstream.lua using Plan A... > Hunk #1 failed at 139. > 1 out of 1 hunks failed--saving rejects to util/adminstream.lua.rej > done > ***> patch-util_adminstream_lua did not apply cleanly > ===> Applying OpenBSD patch patch-util_prosodyctl_lua > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: util/prosodyctl.lua > |--- util/prosodyctl.lua.orig > |+++ util/prosodyctl.lua > -------------------------- > Patching file util/prosodyctl.lua using Plan A... > Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 > succeeded at 180. > Hunk #2 succeeded at 221. > done > ===> Failed patches: > patch-plugins_mod_admin_socket_lua > patch-util_adminstream_lua > > *** Error 1 in net/prosody (/home/ports//infrastructure/mk/bsd.port.mk:2842 > '/build/tmp/pobj//prosody-0.12.1/.patch_done': @if cd /home/port...) > *** Error 2 in net/prosody (/home/ports//infrastructure/mk/bsd.port.mk:2139 > '/home/packages/amd64/all/prosody-0.12.1.tgz': @cd /home/ports/n...) > *** Error 2 in net/prosody (/home/ports//infrastructure/mk/bsd.port.mk:2628 > '_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CA...) > *** Error 2 in net/prosody (/home/ports//infrastructure/mk/bsd.port.mk:2607 > 'package': @lock=prosody-0.12.1; export _LOCKS_HELD=" prosody-0...) > --- Sun Jun 12 13:20:38 MDT 2022
