svn commit: r480603 - in head/security/trezord: . files

Mathieu Arnold mat at FreeBSD.org
Mon Sep 24 12:29:30 UTC 2018


On Mon, Sep 24, 2018 at 12:15:09PM +0000, Alex Dupre wrote:
> Log:
>   Update to 2.0.23 release.

0e82873 is not 2.0.23 release:

$ git describe --tags 0e82873
v2.0.23-20-g0e82873

Please read this to learn how to correctly handle using intermediate
commits:

https://www.freebsd.org/doc/en/books/porters-handbook/makefile-distfiles.html#makefile-master_sites-github-ex5

> Deleted:
>   head/security/trezord/files/patch-freebsd
> Modified:
>   head/security/trezord/Makefile
>   head/security/trezord/distinfo
>   head/security/trezord/files/extra-patch-usb_webusb.go
> 
> Modified: head/security/trezord/Makefile
> ==============================================================================
> --- head/security/trezord/Makefile	Mon Sep 24 12:01:39 2018	(r480602)
> +++ head/security/trezord/Makefile	Mon Sep 24 12:15:09 2018	(r480603)
> @@ -2,7 +2,7 @@
>  # $FreeBSD$
>  
>  PORTNAME=	trezord
> -PORTVERSION=	2.0.21
> +PORTVERSION=	2.0.23
>  DISTVERSIONPREFIX=	v
>  CATEGORIES=	security
>  
> @@ -18,8 +18,7 @@ USE_GITHUB=	yes
>  GH_ACCOUNT=	trezor
>  GH_PROJECT=	${PORTNAME}-go
>  GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
> -
> -PATCH_STRIP=	-p1
> +GH_TAGNAME=	0e82873
>  
>  PLIST_FILES=	bin/${GH_PROJECT}
>  
> 
> Modified: head/security/trezord/distinfo
> ==============================================================================
> --- head/security/trezord/distinfo	Mon Sep 24 12:01:39 2018	(r480602)
> +++ head/security/trezord/distinfo	Mon Sep 24 12:15:09 2018	(r480603)
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1535444563
> -SHA256 (trezor-trezord-go-v2.0.21_GH0.tar.gz) = e8987e2f998555d354297d0c00a79f0f3eb8343cff8e96241646638d7350f52a
> -SIZE (trezor-trezord-go-v2.0.21_GH0.tar.gz) = 953365
> +TIMESTAMP = 1537790982
> +SHA256 (trezor-trezord-go-v2.0.23-0e82873_GH0.tar.gz) = 87f359982952429d4f8303966ce750985fb1be484e3ee22ed636594b0dcc4345
> +SIZE (trezor-trezord-go-v2.0.23-0e82873_GH0.tar.gz) = 954886
> 
> Modified: head/security/trezord/files/extra-patch-usb_webusb.go
> ==============================================================================
> --- head/security/trezord/files/extra-patch-usb_webusb.go	Mon Sep 24 12:01:39 2018	(r480602)
> +++ head/security/trezord/files/extra-patch-usb_webusb.go	Mon Sep 24 12:15:09 2018	(r480603)
> @@ -1,8 +1,6 @@
> -diff --git a/usb/webusb.go b/usb/webusb.go
> -index eb8cadd..1366074 100644
> ---- a/usb/webusb.go
> -+++ b/usb/webusb.go
> -@@ -226,13 +232,21 @@ func (b *WebUSB) matchVidPid(vid uint16, pid uint16) bool {
> +--- usb/webusb.go.orig	2018-09-21 13:31:27 UTC
> ++++ usb/webusb.go
> +@@ -274,13 +274,21 @@ func (b *WebUSB) matchVidPid(vid uint16,
>   }
>   
>   func (b *WebUSB) identify(dev lowlevel.Device) string {
> @@ -30,7 +28,7 @@ index eb8cadd..1366074 100644
>   }
>   
>   type WUD struct {
> -@@ -279,6 +293,12 @@ func (d *WUD) finishReadQueue() {
> +@@ -331,6 +339,12 @@ func (d *WUD) finishReadQueue() {
>   }
>   
>   func (d *WUD) readWrite(buf []byte, endpoint uint8) (int, error) {
> @@ -43,7 +41,7 @@ index eb8cadd..1366074 100644
>   	d.mw.Println("webusb - rw - start")
>   	for {
>   		d.mw.Println("webusb - rw - checking closed")
> -@@ -291,7 +311,7 @@ func (d *WUD) readWrite(buf []byte, endpoint uint8) (int, error) {
> +@@ -343,7 +357,7 @@ func (d *WUD) readWrite(buf []byte, endp
>   		d.mw.Println("webusb - rw - lock transfer mutex")
>   		d.transferMutex.Lock()
>   		d.mw.Println("webusb - rw - actual interrupt transport")
> 
> 

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20180924/42ee3173/attachment.sig>


More information about the svn-ports-head mailing list