From nobody Mon Nov 14 14:06:59 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N9rj02Vxqz4hD20; Mon, 14 Nov 2022 14:07:00 +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 4N9rj020dBz3smS; Mon, 14 Nov 2022 14:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668434820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NvmfP29AiNxNaoG76CIsLuGCE9F2ZACodJF7W06Q2Uk=; b=XWw0PmQJz26KSfd/FBt7LGInWQGkL80Elj3bLhT4BwLyGfS+tUBnrmpndMJhh8ZHcklYzJ kphsnVPwX5NgVVSf+lGXKRb0IaH91+S/9JKjuCs1Ku91tFfc8jaCox8HM2I/La8k6HYyJu r+C4Z/foNTuV9Zr+bxlGqswad8aX/9XQpXNnnU7inVGAQk6mm+VO+yDt7SNcoT4kVNHLSJ 4Xl9gUPPaJNIzusTy4Lyfa951j+vOwudxHmIaI1xOEUsEk0THNfpouttaINvld51yzGfiM YS9Jlap00NKKIdLfto+jL77VBEBK91YdVE0cm+egu6AWbLZwYyDE4lL4FTxyVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668434820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NvmfP29AiNxNaoG76CIsLuGCE9F2ZACodJF7W06Q2Uk=; b=G33l6+COK/DE6CtBDui0ApBhVjI2GdRtDcq20KV8hfwsVKVXQcYENLUMZhPcqSTwkI1DR8 gSC3KfMTPtsO0y0ry3kFtlwbb81xrfhjSBH33zt0f+/3u7ckhCIcF5gsiiXA3NTJSEU454 /ApADIS6wn9/5hkrQhfNMC+G9M7XFQ6lHCTIi8V4CRwZvQgRir2jvd23WrnZG5CGqUdQqy JUKl3dNE3af7idNuuK0uhrogrKQCZSh509Ar7TvKCWmy/B9F7YcMk9fknI68o2lufs+jkj yWu3MD8nMEXz7TNenDbmqDmQAuYfd+2+/1MbkM6M4Gbr3nwh+J7Pzawk+jCQqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668434820; a=rsa-sha256; cv=none; b=MivCemWJuk7i1a2FxSN3jxVr7Np5QytTH6XpwHscOPtq5qgKLaw9YUBrMPuEeMu4d5O/4N eIT1dg3/wmMDlRx3rKp3pSa9AsODI7ReWQmKS3eG6fbci6lrEIiqsE4rs//GhxJZ6LgMNz rgqoDJdQLtEkEUITAWSCiUJCLQo09Q3GkuAh1kT27QodXhmbK9jjCA8/OOBwJi9AcmA1jP SRrKyGiS5VgpM5NhyTUK4Efzkjbkme/X9lyfIClnT9qzkacZeTEP4IjA9VgGn1cfpoq0fE jvapr3RVOS3GC8qLKYHSQ+2oi78xfkLWMblefvtw6XWTw1z5jy1nABx0+PWnow== 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 4N9rj0108dzlGt; Mon, 14 Nov 2022 14:07:00 +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 2AEE70EL069433; Mon, 14 Nov 2022 14:07:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AEE6xG9069432; Mon, 14 Nov 2022 14:06:59 GMT (envelope-from git) Date: Mon, 14 Nov 2022 14:06:59 GMT Message-Id: <202211141406.2AEE6xG9069432@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tilman Keskinoz Subject: git: 80ccb4096cf5 - main - devel/libnfc: Update to 1.8.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arved X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80ccb4096cf564c09f65cba6e0900f33b4bc8a08 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arved: URL: https://cgit.FreeBSD.org/ports/commit/?id=80ccb4096cf564c09f65cba6e0900f33b4bc8a08 commit 80ccb4096cf564c09f65cba6e0900f33b4bc8a08 Author: Tilman Keskinoz AuthorDate: 2022-11-14 14:06:02 +0000 Commit: Tilman Keskinoz CommitDate: 2022-11-14 14:06:43 +0000 devel/libnfc: Update to 1.8.0 * Switch mastersite to github * Fix nfc-scan-device for ACR_122_USB * Bump PORTREVISION of dependencies because of shared library bump PR: 261667 Submitted by: Stefan Ehmann Approved by: maintainer timeout (ca. 9 months) --- devel/libfreefare/Makefile | 2 +- devel/libnfc/Makefile | 8 +++----- devel/libnfc/distinfo | 5 +++-- devel/libnfc/files/patch-libnfc_drivers_acr122__usb.c | 12 ++++++++++++ devel/libnfc/pkg-plist | 6 ++++-- sysutils/nfcutils/Makefile | 1 + 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/devel/libfreefare/Makefile b/devel/libfreefare/Makefile index ce32310bd214..a32a4e1575f7 100644 --- a/devel/libfreefare/Makefile +++ b/devel/libfreefare/Makefile @@ -1,7 +1,7 @@ PORTNAME= libfreefare PORTVERSION= 0.4.0 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= romain@FreeBSD.org diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile index 4394e47970e1..f5c604c0ec3e 100644 --- a/devel/libnfc/Makefile +++ b/devel/libnfc/Makefile @@ -1,9 +1,7 @@ PORTNAME= libnfc -PORTVERSION= 1.7.1 -PORTREVISION= 5 +PORTVERSION= 1.8.0 CATEGORIES= devel -MASTER_SITES= http://dl.bintray.com/nfc-tools/sources/ \ - http://romain.blogreen.org/distfiles/ +MASTER_SITES= https://github.com/nfc-tools/libnfc/releases/download/libnfc-${PORTVERSION}/ MAINTAINER= romain@FreeBSD.org COMMENT= Near Field Communication (NFC) library @@ -25,8 +23,8 @@ PN532_UART_DESC=PN532 UART driver PN53X_USB_DESC= PN53X USB driver GNU_CONFIGURE= yes -USE_LDCONFIG= yes USES= gmake libtool pathfix pkgconfig readline tar:bzip2 +USE_LDCONFIG= yes MAKE_ENV= INSTALL_STRIP_FLAG="${STRIP}" CFLAGS+= -D__BSD_VISIBLE diff --git a/devel/libnfc/distinfo b/devel/libnfc/distinfo index efdc3cc7a755..c9134874ad22 100644 --- a/devel/libnfc/distinfo +++ b/devel/libnfc/distinfo @@ -1,2 +1,3 @@ -SHA256 (libnfc-1.7.1.tar.bz2) = 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072 -SIZE (libnfc-1.7.1.tar.bz2) = 484309 +TIMESTAMP = 1643747630 +SHA256 (libnfc-1.8.0.tar.bz2) = 6d9ad31c86408711f0a60f05b1933101c7497683c2e0d8917d1611a3feba3dd5 +SIZE (libnfc-1.8.0.tar.bz2) = 553511 diff --git a/devel/libnfc/files/patch-libnfc_drivers_acr122__usb.c b/devel/libnfc/files/patch-libnfc_drivers_acr122__usb.c new file mode 100644 index 000000000000..c4e7373cdc2f --- /dev/null +++ b/devel/libnfc/files/patch-libnfc_drivers_acr122__usb.c @@ -0,0 +1,12 @@ +--- libnfc/drivers/acr122_usb.c.orig 2022-02-01 22:26:36 UTC ++++ libnfc/drivers/acr122_usb.c +@@ -419,6 +419,9 @@ acr122_usb_open(const nfc_context *context, const nfc_ + continue; + // Reset device + usb_reset(data.pudh); ++ // Reopen the device ++ if ((data.pudh = usb_open(dev)) == NULL) ++ continue; + // Retrieve end points + acr122_usb_get_end_points(dev, &data); + // Claim interface diff --git a/devel/libnfc/pkg-plist b/devel/libnfc/pkg-plist index 983103eb9cf7..0d8148ec5d9e 100644 --- a/devel/libnfc/pkg-plist +++ b/devel/libnfc/pkg-plist @@ -1,4 +1,5 @@ bin/nfc-anticol +bin/nfc-barcode bin/nfc-dep-initiator bin/nfc-dep-target bin/nfc-emulate-forum-tag2 @@ -23,10 +24,11 @@ include/nfc/nfc-types.h include/nfc/nfc.h lib/libnfc.a lib/libnfc.so -lib/libnfc.so.5 -lib/libnfc.so.5.0.1 +lib/libnfc.so.6 +lib/libnfc.so.6.0.0 libdata/pkgconfig/libnfc.pc man/man1/nfc-anticol.1.gz +man/man1/nfc-barcode.1.gz man/man1/nfc-dep-initiator.1.gz man/man1/nfc-dep-target.1.gz man/man1/nfc-emulate-forum-tag2.1.gz diff --git a/sysutils/nfcutils/Makefile b/sysutils/nfcutils/Makefile index 9f9ab8d916db..b0ae9cf38f44 100644 --- a/sysutils/nfcutils/Makefile +++ b/sysutils/nfcutils/Makefile @@ -1,5 +1,6 @@ PORTNAME= nfcutils PORTVERSION= 0.1.2 +PORTREVISION= 1 DISTVERSIONPREFIX=v CATEGORIES= sysutils