On Mon, Mar 30, 2020 at 03:59:02PM -0600, Stuart Henderson wrote: > CVSROOT: /cvs > Module name: ports > Changes by: [email protected] 2020/03/30 15:59:02 > > Modified files: > net/freeradius3: Tag: OPENBSD_6_6 Makefile distinfo > net/freeradius3/patches: Tag: OPENBSD_6_6 > patch-raddb_radiusd_conf_in > patch-src_main_tls_c > net/freeradius3/pkg: Tag: OPENBSD_6_6 PLIST-iodbc PLIST-main > PLIST-mysql PLIST-pgsql > > Log message: > MFC update to freeradius (3.0.19->3.0.21) - the previous version > 3.0.20 fixed a crash in EAP-PWD when concurrent EAP-pwd handshakes are > initiated; 3.0.21 reverts a change made in 3.0.20 that causes a crash > with duplicate clients. >
it seems there is a problem with the patches on -stable, are they still needed? +++ Tue Mar 31 14:16:59 MDT 2020 ===> Patching for freeradius-server-3.0.21 ===> Applying OpenBSD patch patch-configure Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-configure,v 1.9 2019/04/18 17:27:18 sthen Exp $ | |Don't allow picking up collectdclient, freeradius autoconf's "smart" |library detection doesn't offer a nice way to do it. | |Index: configure |--- configure.orig |+++ configure -------------------------- Patching file configure using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 7133. done ===> Applying OpenBSD patch patch-doc_README Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-doc_README,v 1.3 2018/04/19 20:48:31 sthen Exp $ | |Be explicit about the path; there is also /usr/sbin/radiusd in base. | |Index: doc/README |--- doc/README.orig |+++ doc/README -------------------------- Patching file doc/README using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 120. Hunk #2 succeeded at 166. done ===> Applying OpenBSD patch patch-raddb_certs_Makefile Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-raddb_certs_Makefile,v 1.7 2018/03/08 14:09:43 sthen Exp $ | |Don't rely on gmake. | |Index: raddb/certs/Makefile |--- raddb/certs/Makefile.orig |+++ raddb/certs/Makefile -------------------------- Patching file raddb/certs/Makefile using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 20. Hunk #2 succeeded at 44. done ===> Applying OpenBSD patch patch-raddb_radiusd_conf_in Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-raddb_radiusd_conf_in,v 1.4.4.1 2020/03/30 21:59:02 sthen Exp $ |Index: raddb/radiusd.conf.in |--- raddb/radiusd.conf.in.orig |+++ raddb/radiusd.conf.in -------------------------- Patching file raddb/radiusd.conf.in using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 135. Hunk #2 succeeded at 501. done ===> Applying OpenBSD patch patch-scripts_libtool_mk Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-scripts_libtool_mk,v 1.2 2015/12/10 09:56:45 sthen Exp $ | |Don't hide command lines. | |--- scripts/libtool.mk.orig Wed Nov 11 15:50:54 2015 |+++ scripts/libtool.mk Wed Nov 11 15:51:19 2015 -------------------------- Patching file scripts/libtool.mk using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 69. done ===> Applying OpenBSD patch patch-src_main_detail_c Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-src_main_detail_c,v 1.5 2017/05/30 13:12:30 sthen Exp $ | |Cope with 32-bit arch with 64-bit time variables. | |Index: src/main/detail.c |--- src/main/detail.c.orig |+++ src/main/detail.c -------------------------- Patching file src/main/detail.c using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 784. done ===> Applying OpenBSD patch patch-src_main_radsniff_c Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-src_main_radsniff_c,v 1.4 2018/01/16 13:47:46 sthen Exp $ | |OpenBSD libpcap uses nonstandard "bpf_timeval" variables which are a |different size to timeval on some arch.. | |This patch is enough to let it build but is incomplete and unlikely to |allow radsniff to actually work. | |Index: src/main/radsniff.c |--- src/main/radsniff.c.orig |+++ src/main/radsniff.c -------------------------- Patching file src/main/radsniff.c using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 1003. Hunk #2 succeeded at 1038. Hunk #3 succeeded at 1135. Hunk #4 succeeded at 1259. Hunk #5 succeeded at 1339. Hunk #6 succeeded at 1489. Hunk #7 succeeded at 1510. Hunk #8 succeeded at 1539. Hunk #9 succeeded at 1621. done ===> Applying OpenBSD patch patch-src_main_tls_c Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-src_main_tls_c,v 1.7.4.1 2020/03/30 21:59:02 sthen Exp $ | |Index: src/main/tls.c |--- src/main/tls.c.orig |+++ src/main/tls.c -------------------------- Patching file src/main/tls.c using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 2122. Hunk #2 succeeded at 2334. Hunk #3 succeeded at 3222. Hunk #4 succeeded at 3232. Hunk #5 succeeded at 3243. done ===> Applying OpenBSD patch patch-src_modules_rlm_eap_types_rlm_eap_fast_eap_fast_c Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_fast_eap_fast_c,v 1.1 2018/10/24 17:15:25 jsing Exp $ | |Index: src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c |--- src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c.orig |+++ src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c -------------------------- Patching file src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c using Plan A... Hunk #1 failed at 44. 1 out of 1 hunks failed--saving rejects to src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c.rej done ***> patch-src_modules_rlm_eap_types_rlm_eap_fast_eap_fast_c did not apply cleanly ===> Applying OpenBSD patch patch-src_modules_rlm_eap_types_rlm_eap_fast_rlm_eap_fast_c Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_fast_rlm_eap_fast_c,v 1.1 2018/10/24 17:15:25 jsing Exp $ | |Index: src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c |--- src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c.orig |+++ src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c -------------------------- Patching file src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 181. Hunk #2 succeeded at 205. done ===> Applying OpenBSD patch patch-src_modules_rlm_realm_trustrouter_c Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-src_modules_rlm_realm_trustrouter_c,v 1.3 2019/04/18 17:27:18 sthen Exp $ | |Index: src/modules/rlm_realm/trustrouter.c |--- src/modules/rlm_realm/trustrouter.c.orig |+++ src/modules/rlm_realm/trustrouter.c -------------------------- Patching file src/modules/rlm_realm/trustrouter.c using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 323. Hunk #2 succeeded at 331. done ===> Applying OpenBSD patch patch-src_modules_rlm_unix_rlm_unix_c Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-src_modules_rlm_unix_rlm_unix_c,v 1.1 2015/11/19 14:19:05 sthen Exp $ |--- src/modules/rlm_unix/rlm_unix.c.orig Thu Nov 19 14:13:59 2015 |+++ src/modules/rlm_unix/rlm_unix.c Thu Nov 19 14:14:18 2015 -------------------------- Patching file src/modules/rlm_unix/rlm_unix.c using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 218. done *** Error 1 in net/freeradius3 (/home/ports//infrastructure/mk/bsd.port.mk:2660 '/build/tmp/pobj//freeradius-server-3.0.21/.patch_done': @if...) *** Error 1 in net/freeradius3 (/home/ports//infrastructure/mk/bsd.port.mk:2006 '/home/packages/amd64/all/freeradius-3.0.21.tgz') *** Error 1 in net/freeradius3 (/home/ports//infrastructure/mk/bsd.port.mk:2472 '_internal-package') *** Error 1 in net/freeradius3 (/home/ports//infrastructure/mk/bsd.port.mk:2451 'package') --- Tue Mar 31 14:24:49 MDT 2020
