Date: Mon, 24 Sep 2018 14:29:28 +0200 From: Mathieu Arnold <mat@FreeBSD.org> To: Alex Dupre <ale@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r480603 - in head/security/trezord: . files Message-ID: <20180924122928.q45x4xmpq4bfdwcy@ogg.in.absolight.net> In-Reply-To: <201809241215.w8OCF97f060499@repo.freebsd.org> References: <201809241215.w8OCF97f060499@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--45csjld7dr5yfypl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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.ht= ml#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 >=20 > Modified: head/security/trezord/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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$ > =20 > PORTNAME=3D trezord > -PORTVERSION=3D 2.0.21 > +PORTVERSION=3D 2.0.23 > DISTVERSIONPREFIX=3D v > CATEGORIES=3D security > =20 > @@ -18,8 +18,7 @@ USE_GITHUB=3D yes > GH_ACCOUNT=3D trezor > GH_PROJECT=3D ${PORTNAME}-go > GO_PKGNAME=3D github.com/${GH_ACCOUNT}/${GH_PROJECT} > - > -PATCH_STRIP=3D -p1 > +GH_TAGNAME=3D 0e82873 > =20 > PLIST_FILES=3D bin/${GH_PROJECT} > =20 >=20 > Modified: head/security/trezord/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 =3D 1535444563 > -SHA256 (trezor-trezord-go-v2.0.21_GH0.tar.gz) =3D e8987e2f998555d354297d= 0c00a79f0f3eb8343cff8e96241646638d7350f52a > -SIZE (trezor-trezord-go-v2.0.21_GH0.tar.gz) =3D 953365 > +TIMESTAMP =3D 1537790982 > +SHA256 (trezor-trezord-go-v2.0.23-0e82873_GH0.tar.gz) =3D 87f35998295242= 9d4f8303966ce750985fb1be484e3ee22ed636594b0dcc4345 > +SIZE (trezor-trezord-go-v2.0.23-0e82873_GH0.tar.gz) =3D 954886 >=20 > Modified: head/security/trezord/files/extra-patch-usb_webusb.go > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/security/trezord/files/extra-patch-usb_webusb.go Mon Sep 24 12:0= 1:39 2018 (r480602) > +++ head/security/trezord/files/extra-patch-usb_webusb.go Mon Sep 24 12:1= 5: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 uint1= 6) 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, > } > =20 > func (b *WebUSB) identify(dev lowlevel.Device) string { > @@ -30,7 +28,7 @@ index eb8cadd..1366074 100644 > } > =20 > type WUD struct { > -@@ -279,6 +293,12 @@ func (d *WUD) finishReadQueue() { > +@@ -331,6 +339,12 @@ func (d *WUD) finishReadQueue() { > } > =20 > 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") >=20 >=20 --=20 Mathieu Arnold --45csjld7dr5yfypl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAluo2KdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkhY9w/9EX4PbaR+Azg+f6HICls3mXCCPmFyrE//KI21j1TgSiCIZw69wtQcXgHl LcQ5teUTAhlQxKxpCOFMpKHbOLPLshinlI8JNWnO/6LQOK9DBXzyi1Djcri/qEIm wkkdKEWN/+jLrCfRkDsp5NWDOlXfek1VaX7KB4Yf9acOIAJ2E0J+19BwLiffYZHG yCPw3rre59bCCFZW3KDWCylwgwdHE8lh4YVl30fFmU7XuMyTBSiJixi7HGNC/n5u JlRuJz7WOw5Qg/Kj1Hco8q+0fggbSaVb6h/nKf3x+9BBy375MWY+8i8BiwhOzxQm iK6RzS2K8I5HqM0mmNXwNv9xKEcjIyg5o1yd8ynN4uRtzh69ujERUUQSM+f/0g4Y LZBx8nJNjQvBn7dnPTyFRSVMgUee3lBKb9jP6C9sh08RXrbDyrQoDw6ymxfZals0 pU1pszNaMI+cgT9TkG309mJeYN8B3yRxVlna95m1rrqtmROsAPqxyFwxMqFlRUMZ TZbHKdNKJ/mklh0F9d+NuyTdoq6SutiJAwz4lwDcGGUg1Worg77EtrO1IHJUGRZ7 XBt46jNzaBOIfr5wO7tcLNr5fWO8rl/niUGoCvVL8ETeyH11mcvzj//9zjDIYxTn PcaMRNUd6YVAjU+57JYoJNQLeHN+FhDyRTzsB87krZoN7Jt+hYY= =rDO4 -----END PGP SIGNATURE----- --45csjld7dr5yfypl--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180924122928.q45x4xmpq4bfdwcy>