flashrom: Update wip/flashrom to 0.9.9

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: flashrom: Update wip/flashrom to 0.9.9
From: Mateusz Poszwa <old4%o2.pl@localhost>
Date: Mon, 30 Jan 2017 20:39:07 +0000
Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Mon Jan 30 21:39:07 2017 +0100
Changeset:	e501200065b78bef619b661c7a25fe76aaa8cc6f

Modified Files:
	flashrom/Makefile
	flashrom/distinfo
	flashrom/patches/patch-hwaccess.c
Added Files:
	flashrom/patches/patch-platform.h
Removed Files:
	flashrom/patches/patch-flashrom.c

Log Message:
flashrom: Update wip/flashrom to 0.9.9

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e501200065b78bef619b661c7a25fe76aaa8cc6f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 flashrom/Makefile                 |  9 +++---
 flashrom/distinfo                 | 12 ++++----
 flashrom/patches/patch-flashrom.c | 22 -------------
 flashrom/patches/patch-hwaccess.c | 65 ++++++++-------------------------------
 flashrom/patches/patch-platform.h | 31 +++++++++++++++++++
 5 files changed, 54 insertions(+), 85 deletions(-)

diffs:
diff --git a/flashrom/Makefile b/flashrom/Makefile
index 67acc88..92d4478 100644
--- a/flashrom/Makefile
+++ b/flashrom/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.9 2016/02/26 10:24:12 jperkin Exp $
 #
 
-DISTNAME=	flashrom-0.9.7
+DISTNAME=	flashrom-0.9.9
 PKGNAME=	${DISTNAME:S/-r/pre/}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.flashrom.org/releases/
@@ -10,9 +10,9 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	jakllsch%NetBSD.org@localhost
 HOMEPAGE=	http://www.flashrom.org/
 COMMENT=	Universal (coreboot/LinuxBIOS) flash utility
-LICENSE=        gnu-gpl-v2
+LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+=	gmake pkg-config
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -26,7 +26,7 @@ SUBST_FILES.pciutils=	Makefile
 SUBST_FILES.pciutils+=	hwaccess.h
 SUBST_MESSAGE.pciutils=	adjusting pciutils headers
 SUBST_STAGE.pciutils=	pre-configure
-SUBST_SED.pciutils+= -e 's,<pci/pci.h>,<pciutils/pci.h>,g'
+SUBST_SED.pciutils+=	-e 's,<pci/pci.h>,<pciutils/pci.h>,g'
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
 LDFLAGS+=	-lpci
@@ -43,5 +43,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/flashrom.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/flashrom.8
 
 .include "../../devel/libftdi/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .include "../../sysutils/pciutils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/flashrom/distinfo b/flashrom/distinfo
index bc6fe24..280dbc1 100644
--- a/flashrom/distinfo
+++ b/flashrom/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.10 2016/12/22 21:07:17 joerg Exp $
 
-SHA1 (flashrom-0.9.7.tar.bz2) = d08b4073ea3ebf63f03c3e502f4291f50ef348ee
-RMD160 (flashrom-0.9.7.tar.bz2) = e160e0ac1e0e138702f3f467707175df96b7e6b1
-SHA512 (flashrom-0.9.7.tar.bz2) = a226c1ac3f9c7822b74ca14b7f9b53013110b2cdb66b1f936593c693ee54f19d643cc3a97a9635c05f2c959aca817668006f609ddb503a84d0bf5d510065674e
-Size (flashrom-0.9.7.tar.bz2) = 408883 bytes
-SHA1 (patch-flashrom.c) = 9867fa7ff7d0a55bff5fc0e6c8c6c901af6211f8
-SHA1 (patch-hwaccess.c) = a76c1def47b8b3a79c8d024c43c510f3989bd6d9
+SHA1 (flashrom-0.9.9.tar.bz2) = f083c61dcfcb1c794d5238a479cb42aca33558cd
+RMD160 (flashrom-0.9.9.tar.bz2) = 1dc23e946bfcd0381068a36c3c7d0fdd6f676e21
+SHA512 (flashrom-0.9.9.tar.bz2) = 155445ce7acab97f91596aad704aa2211da1c3f71fb463fc65c621dfea41e44b5de7db801c5b5cfc37450e8a8cfed5b202553715d999710422c830a0c38ae153
+Size (flashrom-0.9.9.tar.bz2) = 495199 bytes
+SHA1 (patch-hwaccess.c) = 666c0266eaf94782ba8ce033b599f975a103932b
+SHA1 (patch-platform.h) = efefdfcaa9e893c65b3b7e01b26a599d5c28a8df
diff --git a/flashrom/patches/patch-flashrom.c b/flashrom/patches/patch-flashrom.c
deleted file mode 100644
index d4d10b3..0000000
--- a/flashrom/patches/patch-flashrom.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-flashrom.c,v 1.1 2014/03/06 15:46:39 joerg Exp $
-
---- flashrom.c.orig	2014-03-02 13:42:29.000000000 +0000
-+++ flashrom.c
-@@ -1738,7 +1738,7 @@ int selfcheck(void)
- 	 * For 'flashchips' we check the first element to be non-null. In the
- 	 * other cases there exist use cases where the first element can be
- 	 * null. */
--	if (flashchips == NULL || flashchips[0].vendor == NULL) {
-+	if (flashchips[0].vendor == NULL) {
- 		msg_gerr("Flashchips table miscompilation!\n");
- 		ret = 1;
- 	}
-@@ -1746,7 +1746,7 @@ int selfcheck(void)
- 		if (selfcheck_eraseblocks(chip))
- 			ret = 1;
- 
--#if CONFIG_INTERNAL == 1
-+#if 0 && CONFIG_INTERNAL == 1
- 	if (chipset_enables == NULL) {
- 		msg_gerr("Chipset enables table does not exist!\n");
- 		ret = 1;
diff --git a/flashrom/patches/patch-hwaccess.c b/flashrom/patches/patch-hwaccess.c
index fe0c320..4b34010 100644
--- a/flashrom/patches/patch-hwaccess.c
+++ b/flashrom/patches/patch-hwaccess.c
@@ -2,71 +2,30 @@ $NetBSD: patch-hwaccess.c,v 1.1 2016/12/22 21:07:17 joerg Exp $
 
 It is UB whether define() is not handled inside macro expansions.
 
---- hwaccess.c.orig	2016-12-22 15:40:41.401773946 +0000
+--- hwaccess.c.orig	2016-03-06 22:32:16.000000000 +0000
 +++ hwaccess.c
-@@ -18,16 +18,40 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-  */
- 
--#define IS_X86	(defined(__i386__) || defined(__x86_64__) || defined(__amd64__))
--#define IS_MIPS	(defined (__mips) || defined (__mips__) || defined (__MIPS__) || defined (mips))
--#define IS_PPC	(defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__))
--#define IS_ARM	(defined (__arm__) || defined (_ARM))
-+#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
-+#define IS_X86	1
-+#else
-+#define IS_X86	0
-+#endif
-+#if defined (__mips) || defined (__mips__) || defined (__MIPS__) || defined (mips)
-+#define IS_MIPS	1
-+#else
-+#define IS_MIPS	0
-+#endif
-+#if defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__)
-+#define IS_PPC	1
-+#else
-+#define IS_PPC	0
-+#endif
-+#if defined (__arm__) || defined (_ARM)
-+#define IS_ARM	1
-+#else
-+#define IS_ARM	0
-+#endif
- #if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM)
- #error Unknown architecture
- #endif
- 
--#define IS_LINUX	(defined(__gnu_linux__) || defined(__linux__))
--#define IS_MACOSX	(defined(__APPLE__) && defined(__MACH__))
-+#if defined(__gnu_linux__) || defined(__linux__)
-+#define IS_LINUX	1
-+#else
-+#define IS_LINUX	0
-+#endif
-+#if defined(__APPLE__) && defined(__MACH__)
-+#define IS_MACOSX	1
-+#else
-+#define IS_MACOSX	0
-+#endif
- #if !(IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__DJGPP__) || defined(__LIBPAYLOAD__) || defined(__sun))
+@@ -37,9 +37,21 @@
  #error "Unknown operating system"
  #endif
-@@ -45,8 +69,16 @@
- #include "flash.h"
- #include "hwaccess.h"
  
 -#define USE_IOPL	(IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__))
 -#define USE_DEV_IO	(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__))
-+#if IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__)
+-#define USE_IOPERM	(defined(__gnu_hurd__))
++#if	IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__)
 +#define USE_IOPL	1
 +#else
 +#define USE_IOPL	0
 +#endif
-+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__))
++#if	defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 +#define USE_DEV_IO	1
 +#else
 +#define USE_DEV_IO	0
 +#endif
++#if	defined(__gnu_hurd__)
++#define USE_IOPERM 1
++#else
++#define USE_IOPERM 0
++#endif
  
- #if IS_X86 && USE_DEV_IO
- int io_fd;
+ #if USE_IOPERM
+ #include <sys/io.h>
diff --git a/flashrom/patches/patch-platform.h b/flashrom/patches/patch-platform.h
new file mode 100644
index 0000000..114c7b8
--- /dev/null
+++ b/flashrom/patches/patch-platform.h
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Macro expansion producing 'defined' has undefined behavior
+
+--- platform.h.orig	2016-02-25 20:10:26.000000000 +0000
++++ platform.h
+@@ -25,9 +25,21 @@
+ #define __PLATFORM_H__ 1
+ 
+ // Helper defines for operating systems
+-#define IS_LINUX	(defined(__gnu_linux__) || defined(__linux__))
+-#define IS_MACOSX	(defined(__APPLE__) && defined(__MACH__)) /* yes, both. */
+-#define IS_WINDOWS	(defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__))
++#if	defined(__gnu_linux__) || defined(__linux__)
++#define IS_LINUX 1
++#else
++#define IS_LINUX 0
++#endif
++#if	defined(__APPLE__) && defined(__MACH__) /* yes, both. */
++#define IS_MACOSX 1
++#else
++#define IS_MACOSX 0
++#endif
++#if	defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__)
++#define IS_WINDOWS 1
++#else
++#define IS_WINDOWS 0
++#endif
+ 
+ // Likewise for target architectures
+ #if defined (__i386__) || defined (__x86_64__) || defined(__amd64__)
Prev by Date: flashrom: Import flashrom-0.9.7 as wip/flashrom
Next by Date: lld-git: Regenerate patches and update PLIST
Previous by Thread: flashrom: Import flashrom-0.9.7 as wip/flashrom
Next by Thread: lld-git: Regenerate patches and update PLIST
Indexes:
Home | Main Index | Thread Index | Old Index