gentoo auto-resync : 23:10:2023 - 08:35:49

5 files changed, 101 insertions, 8 deletions

diff --git a/dev-haskell/simple-sendfile/Manifest b/dev-haskell/simple-sendfile/Manifest
index 09ea8b285cab..b662643d0150 100644
--- a/dev-haskell/simple-sendfile/Manifest
+++ b/dev-haskell/simple-sendfile/Manifest
@@ -1,3 +1,6 @@
+AUX simple-sendfile-0.2.30-musl-1.2.4.patch 1689 BLAKE2B d9ecd61a845f93cc7040bff20abfb19f61e942cd3e16c092621d52f0a229543af9ede36c632d1bcc5ce422dbf5829cd94c357c82fc82785ca84c62d49d3b07f4 SHA512 cdfdb0edf9a244593d7ef2ed4ee84bad75366531136201610d2d3752a5370ca10669ec2f004837afcd763e4b140eaa245a14209964515272456d7bb6657466d5
 DIST simple-sendfile-0.2.28.tar.gz 343120 BLAKE2B fd6a5e083707e113fe4637ee8242b6036f813deec2ad2adf7d9e91338b4d15ef950d35e6cfc69be569601272f8beb12b823e4528d6a9933f3bc04533835f9240 SHA512 9a08d4ba26cd05b1fff3e72bd0846260d4c04921a5ca1f86258c61e51ee5ccf8e14dd2aea0bee44590572feba1832b2562b75b5f71f004c705f02cd0a0f000d1
-EBUILD simple-sendfile-0.2.28.ebuild 856 BLAKE2B 5ed86034e5965123711ee0a6f611a93fcad4d5369a81847aaa02fc4c4df9aa9215f81c0d70f305a914ecd8bb8916d1505ddb96982665aa4706fbfbc2d9028df2 SHA512 237815f695a1947d4c04a400918ceb8f8adc2a998c0e8626b2f5efc7faf9cf1cb9c96517b3eee89f3eaf244adede6c05db66b67fa7d200cc0f02eb1e540b86bc
-MISC metadata.xml 538 BLAKE2B b4f0e405a013865e9a2a21d9737a841f192bb046dcb76085d985e6b596ba3855e0cc3f2b310b42d816e0f8702e4153a821a54da4ef50620588965096edd0c30d SHA512 0f1ca825e713c66be5f2b3b25f31452efb49dc281fb5dcac229493e7011b4113bde548045b69abda3e0b58004847699decd301e4d13ee48504ed253329d1bdca
+DIST simple-sendfile-0.2.30.tar.gz 343470 BLAKE2B ed9ef76782ed310207aa3a04c78b92c11eb3d25e2df934216feeedde29a5963d04b38832b5604e987dc4ca8b83ec653000cb7298761e13e96f477e7fb5767e7d SHA512 ae624939d54bf5ed8aa2c0727a29696730ba6b1d520f28bdc5b42a8e4c4bc03980821639fb8e16702a360dbd0396aea8a997055d22812bef3d22ffaaac53f759
+EBUILD simple-sendfile-0.2.28.ebuild 856 BLAKE2B eaad9223d83cc38cbf4fd292788584924bc07989b28189e1c55c21b1f7b15393a4b715d161e357f1a827bf62ba279d1f9676a120ace3920a6c7b98d7f26e1254 SHA512 f4422140eb9871a06fca885087c876b2a9955083c34f4a335a7a45315e68902c3ddf9401795395ee7267ae311397fb5cb23ea2580e208b30471bc9bd835c8de6
+EBUILD simple-sendfile-0.2.30-r1.ebuild 917 BLAKE2B 0ffe88f18cc3de70e1daf9afe45971a9c74a789e166cd4e331fd69ed0203a96981654a8a7a2e9d454540b81a3330d3b841da841243012434fdaa9698da6ee5f5 SHA512 e2a162460441c0eb46bb0b0d439c89d503dcfdc1635a8137400c99d276a49365363d89055b769b73fee6734e1bd3e79938799f79d2b6c319b096dd1c9ae37e83
+MISC metadata.xml 351 BLAKE2B 93aadf71499cedd37e1cd6878e3f95fce8f3a99836ba3b8cfc68d1fa07cca51ec0943f62fedea355b9df2389c7f17e14c420f2f9a3b2caf7ef2701136b8086e3 SHA512 b85b7cfb07dd6d9bae86d5c87a5cd2e7c65290e8f4f49cf6953485c71bc0758ba3fef9996b09da912703c13a12af288e83e7513a48fdfb422a316ef271523644
diff --git a/dev-haskell/simple-sendfile/files/simple-sendfile-0.2.30-musl-1.2.4.patch b/dev-haskell/simple-sendfile/files/simple-sendfile-0.2.30-musl-1.2.4.patch
new file mode 100644
index 000000000000..0dc669f7e697
--- /dev/null
+++ b/dev-haskell/simple-sendfile/files/simple-sendfile-0.2.30-musl-1.2.4.patch
@@ -0,0 +1,56 @@
+From c16550e29f6c6cbe35e133c347a82821fa67f284 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Sun, 18 Jun 2023 21:52:42 +0000
+Subject: [PATCH] Fix build on musl 1.2.4
+
+Remove references to the deprecated LFS64 compatibility symbols, and
+replace them with the normal interfaces. All calls are automatically 64
+bit on musl, and define _FILE_OFFSET_BITS=64 to make sure calls on glibc
+are 64 bits.
+---
+ Network/Sendfile/Linux.hsc | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/Network/Sendfile/Linux.hsc b/Network/Sendfile/Linux.hsc
+index 4f7adab..96bfb04 100644
+--- a/Network/Sendfile/Linux.hsc
++++ b/Network/Sendfile/Linux.hsc
+@@ -1,6 +1,8 @@
+ {-# LANGUAGE ForeignFunctionInterface #-}
+ {-# LANGUAGE CPP #-}
+ 
++#define _FILE_OFFSET_BITS 64
++
+ module Network.Sendfile.Linux (
+     sendfile
+   , sendfile'
+@@ -34,9 +36,6 @@ import System.Posix.Types
+ #include <sys/sendfile.h>
+ #include <sys/socket.h>
+ 
+-isLargeOffset :: Bool
+-isLargeOffset = sizeOf (0 :: COff) == 8
+-
+ isLargeSize :: Bool
+ isLargeSize = sizeOf (0 :: CSize) == 8
+ 
+@@ -142,15 +141,7 @@ sendfileloop dst src offp len hook = do
+ 
+ -- Dst Src in order. take care
+ foreign import ccall unsafe "sendfile"
+-    c_sendfile32 :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+-
+-foreign import ccall unsafe "sendfile64"
+-    c_sendfile64 :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+-
+-c_sendfile :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+-c_sendfile
+-  | isLargeOffset = c_sendfile64
+-  | otherwise     = c_sendfile32
++    c_sendfile :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+ 
+ ----------------------------------------------------------------
+ 
+-- 
+2.41.0
+
diff --git a/dev-haskell/simple-sendfile/metadata.xml b/dev-haskell/simple-sendfile/metadata.xml
index 615151a0ab7e..382a399478bc 100644
--- a/dev-haskell/simple-sendfile/metadata.xml
+++ b/dev-haskell/simple-sendfile/metadata.xml
@@ -5,11 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Cross platform library for the sendfile system call.
-		This library tries to call minimum system calls which
-		are the bottleneck of web servers.
-	</longdescription>
 	<use>
 		<flag name="allow-bsd">Allow use of BSD sendfile (disable on
 		GNU/kFreeBSD)</flag>
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
index 52fd65a4bbff..cb3de660fcc8 100644
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
+++ b/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # ebuild generated by hackport 0.6.9999
 
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.30-r1.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.30-r1.ebuild
new file mode 100644
index 000000000000..2e20703f9fe4
--- /dev/null
+++ b/dev-haskell/simple-sendfile/simple-sendfile-0.2.30-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Cross platform library for the sendfile system call"
+HOMEPAGE="https://hackage.haskell.org/package/simple-sendfile"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+allow-bsd"
+
+RDEPEND="dev-haskell/network:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/conduit
+		dev-haskell/conduit-extra
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/resourcet )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.30-musl-1.2.4.patch"
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag allow-bsd allow-bsd)
+}