Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714483077260000"
MIME-Version: 1.0
Date: Tue, 30 Apr 2024 13:17:57 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/misc/cabal-install
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20240430131757.09673FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714483077260000
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	pho
Date:		Tue Apr 30 13:17:56 UTC 2024

Modified Files:
	pkgsrc/misc/cabal-install: Makefile buildlink3.mk distinfo
Added Files:
	pkgsrc/misc/cabal-install/patches: patch-src_Distribution_Client_Tar.hs

Log Message:
misc/cabal-install: Update to 3.10.2.1

The release note is too long to paste here:
https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.10.2.0.md


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/misc/cabal-install/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/cabal-install/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/cabal-install/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/cabal-install/patches/patch-src_Distribution_Client_Tar.hs

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


--_----------=_1714483077260000
Content-Disposition: inline
Content-Length: 4262
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/misc/cabal-install/Makefile
diff -u pkgsrc/misc/cabal-install/Makefile:1.14 pkgsrc/misc/cabal-install/Makefile:1.15
--- pkgsrc/misc/cabal-install/Makefile:1.14	Thu Nov  2 06:37:15 2023
+++ pkgsrc/misc/cabal-install/Makefile	Tue Apr 30 13:17:56 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2023/11/02 06:37:15 pho Exp $
+# $NetBSD: Makefile,v 1.15 2024/04/30 13:17:56 pho Exp $
 
-DISTNAME=	cabal-install-3.10.1.0
+# NOTE: Cannot update to >=3.10.3.0 because they depend on GHC 10.
+DISTNAME=	cabal-install-3.10.2.1
 PKGNAME=	${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	pho@cielonegro.org
@@ -10,8 +10,8 @@ COMMENT=	Command-line interface for Caba
 LICENSE=	modified-bsd
 
 HASKELL_UNRESTRICT_DEPENDENCIES+=	\
-	base	\
-	resolv
+	tar	\
+	zlib
 
 INSTALLATION_DIRS+=	share/bash-completion/completions
 post-install:

Index: pkgsrc/misc/cabal-install/buildlink3.mk
diff -u pkgsrc/misc/cabal-install/buildlink3.mk:1.4 pkgsrc/misc/cabal-install/buildlink3.mk:1.5
--- pkgsrc/misc/cabal-install/buildlink3.mk:1.4	Thu Nov  2 06:37:15 2023
+++ pkgsrc/misc/cabal-install/buildlink3.mk	Tue Apr 30 13:17:56 2024
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2023/11/02 06:37:15 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2024/04/30 13:17:56 pho Exp $
 
 BUILDLINK_TREE+=	cabal-install
 
 .if !defined(CABAL_INSTALL_BUILDLINK3_MK)
 CABAL_INSTALL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.cabal-install+=	cabal-install>=3.8.1
-BUILDLINK_ABI_DEPENDS.cabal-install+=	cabal-install>=3.10.1.0nb1
+BUILDLINK_API_DEPENDS.cabal-install+=	cabal-install>=3.10.2
+BUILDLINK_ABI_DEPENDS.cabal-install+=	cabal-install>=3.10.2.1
 BUILDLINK_PKGSRCDIR.cabal-install?=	../../misc/cabal-install
 
 .include "../../devel/hs-async/buildlink3.mk"

Index: pkgsrc/misc/cabal-install/distinfo
diff -u pkgsrc/misc/cabal-install/distinfo:1.8 pkgsrc/misc/cabal-install/distinfo:1.9
--- pkgsrc/misc/cabal-install/distinfo:1.8	Sun Oct 29 03:57:49 2023
+++ pkgsrc/misc/cabal-install/distinfo	Tue Apr 30 13:17:56 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2023/10/29 03:57:49 pho Exp $
+$NetBSD: distinfo,v 1.9 2024/04/30 13:17:56 pho Exp $
 
-BLAKE2s (cabal-install-3.10.1.0.tar.gz) = ccf9aed815fb6f91ece9bb6de86535ac4aede2eb57d13b35f000450bf524abab
-SHA512 (cabal-install-3.10.1.0.tar.gz) = 4c4c437a93eebd4628922ad889f2ddb01dca7aa7c7af4696e7c7ea54b44ac158adf9a91963117d962d18d8a9ed4324581d7024f0767c8e9c99c40f8e63f669bc
-Size (cabal-install-3.10.1.0.tar.gz) = 699213 bytes
+BLAKE2s (cabal-install-3.10.2.1.tar.gz) = 08077ecc04b938daebe6ce5de58aeebf081b5291ccae4ebd4d5ec4ca9eb5a827
+SHA512 (cabal-install-3.10.2.1.tar.gz) = f87f3872e385d50b056dbdc6acda32b333743e24e36e3cffed02d088d83a37d9b44dcba43908e7f4cd0a83ec4802350b915c021991e3e6806bf7f4a0c99b6890
+Size (cabal-install-3.10.2.1.tar.gz) = 705129 bytes
+SHA1 (patch-src_Distribution_Client_Tar.hs) = 7eccb03656f6923ed766b4e153ff2f4a7bd9551d

Added files:

Index: pkgsrc/misc/cabal-install/patches/patch-src_Distribution_Client_Tar.hs
diff -u /dev/null pkgsrc/misc/cabal-install/patches/patch-src_Distribution_Client_Tar.hs:1.1
--- /dev/null	Tue Apr 30 13:17:56 2024
+++ pkgsrc/misc/cabal-install/patches/patch-src_Distribution_Client_Tar.hs	Tue Apr 30 13:17:56 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_Distribution_Client_Tar.hs,v 1.1 2024/04/30 13:17:56 pho Exp $
+
+Fix an API incompatibility with tar-0.6. Upstream has already fixed this in
+3.10.3.0:
+https://github.com/haskell/cabal/commit/51e6483f95ecb4f395dce36e47af296902a75143
+
+--- src/Distribution/Client/Tar.hs.orig	2024-04-30 13:08:28.902873171 +0000
++++ src/Distribution/Client/Tar.hs
+@@ -57,8 +57,15 @@ extractTarGzFile :: FilePath -- ^ Destin
+                  -> FilePath -- ^ Tarball
+                 -> IO ()
+ extractTarGzFile dir expected tar =
+-  Tar.unpack dir . Tar.checkTarbomb expected . Tar.read
+-  . GZipUtils.maybeDecompress =<< BS.readFile tar
++  Tar.unpackAndCheck
++    ( \x ->
++        SomeException <$> Tar.checkEntryTarbomb expected x
++          <|> SomeException <$> Tar.checkEntrySecurity x
++    )
++    dir
++  . Tar.read
++  . GZipUtils.maybeDecompress
++  =<< BS.readFile tar
+ 
+ instance (Exception a, Exception b) => Exception (Either a b) where
+   toException (Left  e) = toException e


--_----------=_1714483077260000--