Attachment 206474 Details for Bug 239800 – SVN patch

[patch] SVN patch

sysutils_flashrom_1.1.diff (text/plain), 3.90 KB, created by Michael Zhilin on 2019-08-12 12:48:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Zhilin

Created: 2019-08-12 12:48:48 UTC

Size: 3.90 KB

patch

obsolete

>Index: sysutils/flashrom/Makefile
>===================================================================
>--- sysutils/flashrom/Makefile	(revision 508717)
>+++ sysutils/flashrom/Makefile	(working copy)
>@@ -1,51 +1,51 @@
> # Created by: Alexander Logvinov <ports@logvinov.com>
> # $FreeBSD$
> 
> PORTNAME=	flashrom
>-PORTVERSION=	1.0
>-PORTREVISION=	1
>+PORTVERSION=	1.1
> CATEGORIES=	sysutils
> MASTER_SITES=	https://download.flashrom.org/releases/
>+DISTVERSIONPREFIX=	v
> 
> MAINTAINER=	mizhka@gmail.com
> COMMENT=	Utility for reading, writing, verifying, and erasing flash ROM chips
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> NOT_FOR_ARCHS=		aarch64
> NOT_FOR_ARCHS_REASON=	./hwaccess.h:126:2: error: Unable to determine endianness.
> 
> LIB_DEPENDS=	libpci.so:devel/libpci
> 
> USES=		gmake tar:bzip2
> 
> MAKE_ENV=	WARNERROR=no
> 
> PLIST_FILES=	bin/flashrom \
> 		man/man8/flashrom.8.gz
> PORTDOCS=	*
> 
> OPTIONS_DEFINE=		BUSPIRATE DOCS FTDI
> OPTIONS_DEFINE_amd64=	DMIDECODE
> OPTIONS_DEFINE_i386=	DMIDECODE
>-OPTIONS_DEFAULT=	FTDI
>+OPTIONS_DEFAULT=	
> OPTIONS_DEFAULT_amd64=	DMIDECODE
> OPTIONS_DEFAULT_i386=	DMIDECODE
> 
> DMIDECODE_DESC=		Use dmidecode to gather DMI information
> FTDI_DESC=		Enable external FT2232SPI flasher support
> 
> DMIDECODE_RUN_DEPENDS=	dmidecode:sysutils/dmidecode
> 
> FTDI_LIB_DEPENDS=	libftdi1.so:devel/libftdi1
> FTDI_USES=		pkgconfig
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/flashrom ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/flashrom.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
> 	cd ${WRKSRC}/Documentation && ${INSTALL_DATA} *.txt ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>Index: sysutils/flashrom/distinfo
>===================================================================
>--- sysutils/flashrom/distinfo	(revision 508717)
>+++ sysutils/flashrom/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1514932004
>-SHA256 (flashrom-1.0.tar.bz2) = 3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64
>-SIZE (flashrom-1.0.tar.bz2) = 321693
>+TIMESTAMP = 1565613761
>+SHA256 (flashrom-v1.1.tar.bz2) = aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19
>+SIZE (flashrom-v1.1.tar.bz2) = 348458
>Index: sysutils/flashrom/files/patch-serial.c
>===================================================================
>--- sysutils/flashrom/files/patch-serial.c	(revision 508717)
>+++ sysutils/flashrom/files/patch-serial.c	(nonexistent)
>@@ -1,28 +0,0 @@
>-Avoid hang of serprog under FreeBSD
>-
>-Use case is flashrom+serprog to read SPI flash (MX25L6406) via Arduino
>-Nano V3.  Actual command is:
>-
>-/usr/local/bin/flashrom -p serprog:dev=/dev/cuaU0:57600 -c MX25L6406E/MX25L6408E -r tcw770.dump
>-
>-Using flashrom 0.9.9 it hangs after 5 seconds on read from tty ("ttyin").
>-The problem is that kernel method "ttydisc_rint" ignore same bytes.  It
>-happens due to enabled IEXTEN local flag of termios.  TTY cuts few bytes,
>-Arduino reads 11264 bytes, but flashrom gets 11244 bytes (corrupted) and
>-waits for remaining 20 bytes.
>-
>-The fix is simple: turn off IEXTEN local flag.
>-
>-https://patchwork.coreboot.org/patch/4498/
>-
>---- serial.c.orig	2016-11-18 19:39:55 UTC
>-+++ serial.c
>-@@ -203,7 +203,7 @@ int serialport_config(fdtype fd, int bau
>- 	}
>- 	wanted.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS);
>- 	wanted.c_cflag |= (CS8 | CLOCAL | CREAD);
>--	wanted.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
>-+	wanted.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG | IEXTEN);
>- 	wanted.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR);
>- 	wanted.c_oflag &= ~OPOST;
>- 	if (tcsetattr(fd, TCSANOW, &wanted) != 0) {
>
>Property changes on: sysutils/flashrom/files/patch-serial.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 239800: 206474