Received: by mail.netbsd.org (Postfix, from userid 605) id AC59684D71; Thu, 21 Sep 2017 09:48:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 39AC984D6D for ; Thu, 21 Sep 2017 09:48:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id h_LcvK2uFfJV for ; Thu, 21 Sep 2017 09:48:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7937884CE0 for ; Thu, 21 Sep 2017 09:48:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 776FAFA9A; Thu, 21 Sep 2017 09:48:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_150598733673140" MIME-Version: 1.0 Date: Thu, 21 Sep 2017 09:48:56 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/sysutils/e2fsprogs To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20170921094856.776FAFA9A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_150598733673140 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_150598733673140 Content-Disposition: inline Content-Length: 4359 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/e2fsprogs/Makefile diff -u pkgsrc/sysutils/e2fsprogs/Makefile:1.24 pkgsrc/sysutils/e2fsprogs/Makefile:1.25 --- pkgsrc/sysutils/e2fsprogs/Makefile:1.24 Sat Feb 11 15:10:33 2017 +++ pkgsrc/sysutils/e2fsprogs/Makefile Thu Sep 21 09:48:56 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2017/02/11 15:10:33 tron Exp $ +# $NetBSD: Makefile,v 1.25 2017/09/21 09:48:56 jperkin Exp $ DISTNAME= e2fsprogs-1.43.4 CATEGORIES= sysutils @@ -12,6 +12,7 @@ COMMENT= Second extended file system (ex LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND modified-bsd AND mit GNU_CONFIGURE= yes +USE_LANGUAGES= c99 USE_TOOLS+= makeinfo gmake INFO_FILES= yes Index: pkgsrc/sysutils/e2fsprogs/distinfo diff -u pkgsrc/sysutils/e2fsprogs/distinfo:1.22 pkgsrc/sysutils/e2fsprogs/distinfo:1.23 --- pkgsrc/sysutils/e2fsprogs/distinfo:1.22 Sat Feb 11 15:10:33 2017 +++ pkgsrc/sysutils/e2fsprogs/distinfo Thu Sep 21 09:48:56 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2017/02/11 15:10:33 tron Exp $ +$NetBSD: distinfo,v 1.23 2017/09/21 09:48:56 jperkin Exp $ SHA1 (e2fsprogs-1.43.4.tar.xz) = 3073dfe3d67075d3ae68e41e78120f14a18ac9ba RMD160 (e2fsprogs-1.43.4.tar.xz) = cb6fb31aa7242d3e72f0427aac0271848d467ffe @@ -11,8 +11,11 @@ SHA1 (patch-an) = 1199b17c4e65b8825b78fc SHA1 (patch-ao) = a8fcacf506b003bf40ecadd5260ff0a6628ad2e6 SHA1 (patch-as) = be316e404840a47422edbee65177bf6a9c94b335 SHA1 (patch-aw) = 544634d6603762dabaeffe950440f533c6495b32 +SHA1 (patch-debugfs_debugfs.c) = 6092c8e61fcdda2e5b669dad26b6c335cc45c4c5 SHA1 (patch-e2fsck_jfs__user.h) = 2fd21cedabc4356a0d76a6caa1dbf73461750800 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-lib_uuid_gen__uuid.c) = 083ac45a8d2d30a5c272720fb9a6a1785c97eee2 +SHA1 (patch-misc_create__inode.c) = 7b9b49bc6bdcf5845bb81414faed987c74228940 Added files: Index: pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c diff -u /dev/null pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c:1.1 --- /dev/null Thu Sep 21 09:48:56 2017 +++ pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c Thu Sep 21 09:48:56 2017 @@ -0,0 +1,16 @@ +$NetBSD: patch-debugfs_debugfs.c,v 1.1 2017/09/21 09:48:56 jperkin Exp $ + +Fix build on SunOS. + +--- debugfs/debugfs.c.orig 2016-09-02 04:17:32.000000000 +0000 ++++ debugfs/debugfs.c +@@ -26,6 +26,9 @@ extern char *optarg; + #include + #endif + #include ++#ifdef __sun ++#include ++#endif + + #include "debugfs.h" + #include "uuid/uuid.h" Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c diff -u /dev/null pkgsrc/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c:1.1 --- /dev/null Thu Sep 21 09:48:56 2017 +++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c Thu Sep 21 09:48:56 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_uuid_gen__uuid.c,v 1.1 2017/09/21 09:48:56 jperkin Exp $ + +Fix build on SunOS. + +--- lib/uuid/gen_uuid.c.orig 2016-09-02 04:17:32.000000000 +0000 ++++ lib/uuid/gen_uuid.c +@@ -267,7 +267,7 @@ static int get_node_id(unsigned char *no + for (i = 0; i < n; i+= ifreq_size(*ifrp) ) { + ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i); + strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ); +-#ifdef SIOCGIFHWADDR ++#if defined(SIOCGIFHWADDR) && !defined(__sun) + if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0) + continue; + a = (unsigned char *) &ifr.ifr_hwaddr.sa_data; Index: pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c diff -u /dev/null pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c:1.1 --- /dev/null Thu Sep 21 09:48:56 2017 +++ pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c Thu Sep 21 09:48:56 2017 @@ -0,0 +1,16 @@ +$NetBSD: patch-misc_create__inode.c,v 1.1 2017/09/21 09:48:56 jperkin Exp $ + +Fix build on SunOS. + +--- misc/create_inode.c.orig 2017-01-31 06:08:02.000000000 +0000 ++++ misc/create_inode.c +@@ -22,6 +22,9 @@ + #include + #endif + #include ++#ifdef __sun ++#include ++#endif + #include + #include + #include --_----------=_150598733673140--