Attachment 224641 Details for Bug 226982 – Update the port to 0.2.14

[patch] Update the port to 0.2.14

isboot-0.2.14.patch (text/plain), 4.06 KB, created by John Nielsen on 2021-05-03 20:03:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Nielsen

Created: 2021-05-03 20:03:28 UTC

Size: 4.06 KB

patch

obsolete

>diff -ruN isboot-kmod.orig/Makefile isboot-kmod/Makefile
>--- isboot-kmod.orig/Makefile	2019-04-06 00:04:50.000000000 -0600
>+++ isboot-kmod/Makefile	2021-05-03 13:13:18.241490000 -0600
>@@ -1,23 +1,17 @@
> # $FreeBSD: head/net/isboot-kmod/Makefile 498052 2019-04-06 06:04:50Z antoine $
> 
> PORTNAME=	isboot-kmod
>-PORTVERSION=	0.2.13
>-PORTREVISION=	1
>+DISTVERSION=	0.2.14
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	jnielsendotnet
>+GH_PROJECT=	isboot
> CATEGORIES=	net
>-MASTER_SITES=	http://www.peach.ne.jp/archives/isboot/
>-DISTNAME=	isboot-${PORTVERSION}
> 
> MAINTAINER=	john@jnielsen.net
>-COMMENT=	Kernel module enabling iSCSI boot
>+COMMENT=	Kernel module enabling iSCSI/IBFT boot
> 
> LICENSE=	BSD2CLAUSE
> 
>-BROKEN_aarch64=		fails to compile: /usr/src/sys/sys/bus.h:724:10: fatal error: 'device_if.h' file not found
>-BROKEN_armv6=		fails to compile: implicit declaration of function 'cp15_pmccntr_get' is invalid in C99
>-BROKEN_armv7=		fails to compile: /usr/src/sys/sys/bus.h:724:10: fatal error: 'device_if.h' file not found
>-BROKEN_FreeBSD_12=	no member named 'tqh_first' in 'struct ifnethead'
>-BROKEN_FreeBSD_13=	no member named 'tqh_first' in 'struct ifnethead'
>-
> USES=		kmod uidfix
> SUB_FILES=	pkg-message
> WRKSRC_SUBDIR=	src
>@@ -30,6 +24,6 @@
> 
> post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	cd ${WRKDIR}/${DISTNAME} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC}/.. && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>diff -ruN isboot-kmod.orig/distinfo isboot-kmod/distinfo
>--- isboot-kmod.orig/distinfo	2015-11-07 07:54:52.000000000 -0700
>+++ isboot-kmod/distinfo	2021-05-03 13:09:36.731065000 -0600
>@@ -1,2 +1,3 @@
>-SHA256 (isboot-0.2.13.tar.gz) = b73ec64fbf96160242b19c47c13b666204b6943f248d6c3832f5cd3b60b1c030
>-SIZE (isboot-0.2.13.tar.gz) = 30293
>+TIMESTAMP = 1620068976
>+SHA256 (jnielsendotnet-isboot-0.2.14_GH0.tar.gz) = 8ebc00888630b09e4740552c27980bb09fc5a638780043a078270ee6b1ad8097
>+SIZE (jnielsendotnet-isboot-0.2.14_GH0.tar.gz) = 30405
>diff -ruN isboot-kmod.orig/files/patch-isboot.c isboot-kmod/files/patch-isboot.c
>--- isboot-kmod.orig/files/patch-isboot.c	2016-05-06 08:34:57.000000000 -0600
>+++ isboot-kmod/files/patch-isboot.c	1969-12-31 17:00:00.000000000 -0700
>@@ -1,50 +0,0 @@
>---- isboot.c.orig	2015-11-05 16:50:51 UTC
>-+++ isboot.c
>-@@ -347,9 +347,9 @@ isboot_set_v4gw(struct sockaddr_in *gate
>- 	netmask.sin_addr.s_addr = htonl(0);
>- 
>- 	/* delete gateway if exists */
>--	error = rtrequest(RTM_DELETE, (struct sockaddr *)&dst,
>-+	error = rtrequest_fib(RTM_DELETE, (struct sockaddr *)&dst,
>- 	    (struct sockaddr *)gateway, (struct sockaddr *)&netmask,
>--	    0, NULL);
>-+	    0, NULL, RT_DEFAULT_FIB);
>- 	if (error) {
>- 		if (error != ESRCH) {
>- 			printf("rtrequest RTM_DELETE error %d\n",
>-@@ -359,9 +359,9 @@ isboot_set_v4gw(struct sockaddr_in *gate
>- 	}
>- 
>- 	/* set new default gateway */
>--	error = rtrequest(RTM_ADD, (struct sockaddr *)&dst,
>-+	error = rtrequest_fib(RTM_ADD, (struct sockaddr *)&dst,
>- 	    (struct sockaddr *)gateway, (struct sockaddr *)&netmask,
>--	    RTF_GATEWAY | RTF_STATIC, NULL);
>-+	    RTF_GATEWAY | RTF_STATIC, NULL, RT_DEFAULT_FIB);
>- 	if (error) {
>- 		printf("rtrequest RTM_ADD error %d\n", error);
>- 		return (error);
>-@@ -391,9 +391,9 @@ isboot_set_v6gw(struct sockaddr_in6 *gat
>- 	memset(&netmask.sin6_addr, 0, 16);
>- 
>- 	/* delete gateway if exists */
>--	error = rtrequest(RTM_DELETE, (struct sockaddr *)&dst,
>-+	error = rtrequest_fib(RTM_DELETE, (struct sockaddr *)&dst,
>- 	    (struct sockaddr *)gateway, (struct sockaddr *)&netmask,
>--	    0, NULL);
>-+	    0, NULL, RT_DEFAULT_FIB);
>- 	if (error) {
>- 		if (error != ESRCH) {
>- 			printf("rtrequest RTM_DELETE error %d\n",
>-@@ -403,9 +403,9 @@ isboot_set_v6gw(struct sockaddr_in6 *gat
>- 	}
>- 
>- 	/* set new default gateway */
>--	error = rtrequest(RTM_ADD, (struct sockaddr *)&dst,
>-+	error = rtrequest_fib(RTM_ADD, (struct sockaddr *)&dst,
>- 	    (struct sockaddr *)gateway, (struct sockaddr *)&netmask,
>--	    RTF_GATEWAY | RTF_STATIC, NULL);
>-+	    RTF_GATEWAY | RTF_STATIC, NULL, RT_DEFAULT_FIB);
>- 	if (error) {
>- 		printf("rtrequest RTM_ADD error %d\n", error);
>- 		return (error);

Flags:

john: maintainer-approval-

Actions: View | Diff

Attachments on bug 226982: 191871 | 224641