From owner-dev-commits-ports-main@freebsd.org Sun May 23 06:59:33 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF43F641126; Sun, 23 May 2021 06:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fnrn160R0z4dFw; Sun, 23 May 2021 06:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B1A0513431; Sun, 23 May 2021 06:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14N6xXGP004536; Sun, 23 May 2021 06:59:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14N6xXeL004535; Sun, 23 May 2021 06:59:33 GMT (envelope-from git) Date: Sun, 23 May 2021 06:59:33 GMT Message-Id: <202105230659.14N6xXeL004535@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: e9f100aa362c - main - net/isboot-kmod: Update to 0.2.14 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9f100aa362c0379a4e56a23cba9064b4a4dc90e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 May 2021 06:59:33 -0000 The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9f100aa362c0379a4e56a23cba9064b4a4dc90e commit e9f100aa362c0379a4e56a23cba9064b4a4dc90e Author: John Nielsen AuthorDate: 2021-05-11 05:04:29 +0000 Commit: Li-Wen Hsu CommitDate: 2021-05-23 06:57:08 +0000 net/isboot-kmod: Update to 0.2.14 PR: 255578 --- net/isboot-kmod/Makefile | 19 +++++++------- net/isboot-kmod/distinfo | 5 ++-- net/isboot-kmod/files/patch-isboot.c | 50 ------------------------------------ 3 files changed, 12 insertions(+), 62 deletions(-) diff --git a/net/isboot-kmod/Makefile b/net/isboot-kmod/Makefile index 3c39f1002c1e..1a4f95b99084 100644 --- a/net/isboot-kmod/Makefile +++ b/net/isboot-kmod/Makefile @@ -1,23 +1,22 @@ PORTNAME= isboot-kmod -PORTVERSION= 0.2.13 -PORTREVISION= 1 +PORTVERSION= 0.2.14 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' -BROKEN_FreeBSD_14= no member named 'tqh_first' in 'struct ifnethead' +ONLY_FOR_ARCHS= amd64 i386 USES= kmod uidfix + +USE_GITHUB= yes +GH_ACCOUNT= jnielsendotnet +GH_PROJECT= isboot + SUB_FILES= pkg-message WRKSRC_SUBDIR= src PLIST_FILES= ${KMODDIR}/isboot.ko @@ -29,6 +28,6 @@ VIMAGE_CFLAGS= -DVIMAGE post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKDIR}/${DISTNAME} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/.. && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/net/isboot-kmod/distinfo b/net/isboot-kmod/distinfo index cc183510c340..96dc7af469b3 100644 --- a/net/isboot-kmod/distinfo +++ b/net/isboot-kmod/distinfo @@ -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 --git a/net/isboot-kmod/files/patch-isboot.c b/net/isboot-kmod/files/patch-isboot.c deleted file mode 100644 index de80988bb9c0..000000000000 --- a/net/isboot-kmod/files/patch-isboot.c +++ /dev/null @@ -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);