NetBSD Problem Report #52563

From mcy@indiana.local  Wed Sep 20 15:48:24 2017
Return-Path: <mcy@indiana.local>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 567667A1FC
	for <gnats-bugs@www.netbsd.org>; Wed, 20 Sep 2017 15:48:24 +0000 (UTC)
Message-Id: <201709201548.v8KFmMWM009767@indiana.local>
Date: Wed, 20 Sep 2017 11:48:22 -0400 (EDT)
From: mcy@lm7.fr
Reply-To: mcy@lm7.fr
To: gnats-bugs@www.netbsd.org
Cc:
Subject: [patch] sysutils/e2fsprogs: fix FTBFS on SunOS
X-Send-Pr-Version: 3.113.1
X-GNATS-Notify:

>Number:         52563
>Category:       pkg
>Synopsis:       [patch] sysutils/e2fsprogs: fix FTBFS on SunOS
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Sep 20 15:50:00 +0000 2017
>Closed-Date:    Thu Sep 21 09:52:22 +0000 2017
>Last-Modified:  Thu Sep 21 09:52:22 +0000 2017
>Originator:     Matteo Cypriani
>Release:        SunOS 5.11
>Organization:

>Environment:
System: SunOS indiana 5.11 illumos-919f1431f0 i86pc i386 i86pc
Architecture: i86pc
>Description:
The attached patch fixes multiple problems when building on OpenIndiana.
>How-To-Repeat:
>Fix:
From 6afd7c204616dc870fbcd551ddc785df29032bed Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <mcy@lm7.fr>
Date: Tue, 19 Sep 2017 03:12:37 -0400
Subject: [PATCH] sysutils/e2fsprogs: fix FTBFS on SunOS

---
 sysutils/e2fsprogs/Makefile            |  5 +++++
 sysutils/e2fsprogs/distinfo            |  1 +
 sysutils/e2fsprogs/patches/patch-sunos | 41 ++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 sysutils/e2fsprogs/patches/patch-sunos

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 0f3ecc90e58..dd23a295c86 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.24 2017/02/11 15:10:33 tron Exp $

 DISTNAME=	e2fsprogs-1.43.4
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/${DISTNAME:S/e2fsprogs-/v/}/ \
 		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
@@ -28,6 +29,10 @@ CONFIGURE_ARGS+=	--disable-fsck
 .endif
 #CONFIGURE_ARGS+=	--mandir=${PREFIX}/man

+.if ${OPSYS} == "SunOS"
+USE_LANGUAGES=		c99
+.endif
+
 EGDIR=			${PREFIX}/share/examples/ext2fs
 CONF_FILES+=		${EGDIR}/mke2fs.conf ${PKG_SYSCONFDIR}/mke2fs.conf
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} root_sysconfdir=${EGDIR:Q}
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 13d29ab9e02..204490b37cc 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -16,3 +16,4 @@ SHA1 (patch-lib_ext2fs_bitops.c) = 0ca90ee35d255b8f590a216554a22b738c6083bc
 SHA1 (patch-lib_ext2fs_bitops.h) = 8eec77c83bf85423a1420b18405e9ba655131528
 SHA1 (patch-lib_ext2fs_ext2fs.h) = 2811fd3eff03dd4fb7f72df4c854d2c33b37846f
 SHA1 (patch-lib_ext2fs_tdb.c) = dd50993cd0beba0451cfb3422ca9f54700ee0e38
+SHA1 (patch-sunos) = d154addf088b0606fd5d623035ac738416320609
diff --git a/sysutils/e2fsprogs/patches/patch-sunos b/sysutils/e2fsprogs/patches/patch-sunos
new file mode 100644
index 00000000000..c8bfea12faf
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-sunos
@@ -0,0 +1,41 @@
+$NetBSD$
+
+Solaris support.
+--- debugfs/debugfs.c.orig	ven. sept.  2 00:17:32 2016
++++ debugfs/debugfs.c		mar. sept. 19 01:27:18 2017
+@@ -26,6 +26,9 @@
+ #include <errno.h>
+ #endif
+ #include <fcntl.h>
++#if defined(sun) || defined(__sun__)
++#include <sys/mkdev.h>
++#endif
+ 
+ #include "debugfs.h"
+ #include "uuid/uuid.h"
+--- lib/uuid/gen_uuid.c.orig	ven. sept.  2 00:17:32 2016
++++ lib/uuid/gen_uuid.c		mar. sept. 19 01:14:34 2017
+@@ -270,7 +270,11 @@
+ #ifdef SIOCGIFHWADDR
+ 		if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
+ 			continue;
++#if defined(sun) || defined(__sun__)
++		a = (unsigned char *) &ifr.ifr_enaddr;
++#else /* sun */
+ 		a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
++#endif /* sun */
+ #else
+ #ifdef SIOCGENADDR
+ 		if (ioctl(sd, SIOCGENADDR, &ifr) < 0)
+--- misc/create_inode.c.orig	mar. janv. 31 01:08:02 2017
++++ misc/create_inode.c		mar. sept. 19 01:23:46 2017
+@@ -22,6 +22,9 @@
+ #include <attr/xattr.h>
+ #endif
+ #include <sys/ioctl.h>
++#if defined(sun) || defined(__sun__)
++#include <sys/mkdev.h>
++#endif
+ #include <ext2fs/ext2fs.h>
+ #include <ext2fs/ext2_types.h>
+ #include <ext2fs/fiemap.h>
-- 
2.13.5

>Release-Note:

>Audit-Trail:
From: "Jonathan Perkin" <jperkin@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/52563 CVS commit: pkgsrc/sysutils/e2fsprogs
Date: Thu, 21 Sep 2017 09:48:56 +0000

 Module Name:	pkgsrc
 Committed By:	jperkin
 Date:		Thu Sep 21 09:48:56 UTC 2017

 Modified Files:
 	pkgsrc/sysutils/e2fsprogs: Makefile distinfo
 Added Files:
 	pkgsrc/sysutils/e2fsprogs/patches: patch-debugfs_debugfs.c
 	    patch-lib_uuid_gen__uuid.c patch-misc_create__inode.c

 Log Message:
 e2fsprogs: Fix build on SunOS.

 Patches provided by Matteo Cypriani in PR#52563.


 To generate a diff of this commit:
 cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/e2fsprogs/Makefile
 cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/e2fsprogs/distinfo
 cvs rdiff -u -r0 -r1.1 \
     pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c \
     pkgsrc/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c \
     pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c

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

State-Changed-From-To: open->closed
State-Changed-By: jperkin@NetBSD.org
State-Changed-When: Thu, 21 Sep 2017 09:52:22 +0000
State-Changed-Why:
Applied with a couple of minor changes, thanks!


>Unformatted:

Home	PR Database Search