From 32595ff2b02d919e9474be4b7a25d8c2726f7aea Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Fri, 29 Aug 2025 15:11:27 +0200 Subject: [PATCH 1/3] io-classes: renamed src directory for io-classes Just to be more consistent with other public sublibraries. --- io-classes/io-classes.cabal | 2 +- .../{src => io-classes}/Control/Concurrent/Class/MonadMVar.hs | 0 .../{src => io-classes}/Control/Concurrent/Class/MonadSTM.hs | 0 .../Control/Concurrent/Class/MonadSTM/TArray.hs | 0 .../Control/Concurrent/Class/MonadSTM/TBQueue.hs | 0 .../Control/Concurrent/Class/MonadSTM/TChan.hs | 0 .../Control/Concurrent/Class/MonadSTM/TMVar.hs | 0 .../Control/Concurrent/Class/MonadSTM/TQueue.hs | 0 .../Control/Concurrent/Class/MonadSTM/TSem.hs | 0 .../Control/Concurrent/Class/MonadSTM/TVar.hs | 0 .../{src => io-classes}/Control/Monad/Class/MonadAsync.hs | 0 .../{src => io-classes}/Control/Monad/Class/MonadEventlog.hs | 0 io-classes/{src => io-classes}/Control/Monad/Class/MonadFork.hs | 0 io-classes/{src => io-classes}/Control/Monad/Class/MonadST.hs | 0 io-classes/{src => io-classes}/Control/Monad/Class/MonadSTM.hs | 0 .../Control/Monad/Class/MonadSTM/Internal.hs | 0 io-classes/{src => io-classes}/Control/Monad/Class/MonadSay.hs | 0 io-classes/{src => io-classes}/Control/Monad/Class/MonadTest.hs | 0 .../{src => io-classes}/Control/Monad/Class/MonadThrow.hs | 0 io-classes/{src => io-classes}/Control/Monad/Class/MonadTime.hs | 0 .../{src => io-classes}/Control/Monad/Class/MonadTimer.hs | 0 .../{src => io-classes}/Control/Monad/Class/MonadUnique.hs | 0 22 files changed, 1 insertion(+), 1 deletion(-) rename io-classes/{src => io-classes}/Control/Concurrent/Class/MonadMVar.hs (100%) rename io-classes/{src => io-classes}/Control/Concurrent/Class/MonadSTM.hs (100%) rename io-classes/{src => io-classes}/Control/Concurrent/Class/MonadSTM/TArray.hs (100%) rename io-classes/{src => io-classes}/Control/Concurrent/Class/MonadSTM/TBQueue.hs (100%) rename io-classes/{src => io-classes}/Control/Concurrent/Class/MonadSTM/TChan.hs (100%) rename io-classes/{src => io-classes}/Control/Concurrent/Class/MonadSTM/TMVar.hs (100%) rename io-classes/{src => io-classes}/Control/Concurrent/Class/MonadSTM/TQueue.hs (100%) rename io-classes/{src => io-classes}/Control/Concurrent/Class/MonadSTM/TSem.hs (100%) rename io-classes/{src => io-classes}/Control/Concurrent/Class/MonadSTM/TVar.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadAsync.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadEventlog.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadFork.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadST.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadSTM.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadSTM/Internal.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadSay.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadTest.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadThrow.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadTime.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadTimer.hs (100%) rename io-classes/{src => io-classes}/Control/Monad/Class/MonadUnique.hs (100%) diff --git a/io-classes/io-classes.cabal b/io-classes/io-classes.cabal index 1038dbd0..2285c873 100644 --- a/io-classes/io-classes.cabal +++ b/io-classes/io-classes.cabal @@ -63,7 +63,7 @@ common warnings library import: warnings - hs-source-dirs: src + hs-source-dirs: io-classes -- At this experiment/prototype stage everything is exposed. -- This has to be tidied up once the design becomes clear. diff --git a/io-classes/src/Control/Concurrent/Class/MonadMVar.hs b/io-classes/io-classes/Control/Concurrent/Class/MonadMVar.hs similarity index 100% rename from io-classes/src/Control/Concurrent/Class/MonadMVar.hs rename to io-classes/io-classes/Control/Concurrent/Class/MonadMVar.hs diff --git a/io-classes/src/Control/Concurrent/Class/MonadSTM.hs b/io-classes/io-classes/Control/Concurrent/Class/MonadSTM.hs similarity index 100% rename from io-classes/src/Control/Concurrent/Class/MonadSTM.hs rename to io-classes/io-classes/Control/Concurrent/Class/MonadSTM.hs diff --git a/io-classes/src/Control/Concurrent/Class/MonadSTM/TArray.hs b/io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TArray.hs similarity index 100% rename from io-classes/src/Control/Concurrent/Class/MonadSTM/TArray.hs rename to io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TArray.hs diff --git a/io-classes/src/Control/Concurrent/Class/MonadSTM/TBQueue.hs b/io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TBQueue.hs similarity index 100% rename from io-classes/src/Control/Concurrent/Class/MonadSTM/TBQueue.hs rename to io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TBQueue.hs diff --git a/io-classes/src/Control/Concurrent/Class/MonadSTM/TChan.hs b/io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TChan.hs similarity index 100% rename from io-classes/src/Control/Concurrent/Class/MonadSTM/TChan.hs rename to io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TChan.hs diff --git a/io-classes/src/Control/Concurrent/Class/MonadSTM/TMVar.hs b/io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TMVar.hs similarity index 100% rename from io-classes/src/Control/Concurrent/Class/MonadSTM/TMVar.hs rename to io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TMVar.hs diff --git a/io-classes/src/Control/Concurrent/Class/MonadSTM/TQueue.hs b/io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TQueue.hs similarity index 100% rename from io-classes/src/Control/Concurrent/Class/MonadSTM/TQueue.hs rename to io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TQueue.hs diff --git a/io-classes/src/Control/Concurrent/Class/MonadSTM/TSem.hs b/io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TSem.hs similarity index 100% rename from io-classes/src/Control/Concurrent/Class/MonadSTM/TSem.hs rename to io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TSem.hs diff --git a/io-classes/src/Control/Concurrent/Class/MonadSTM/TVar.hs b/io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TVar.hs similarity index 100% rename from io-classes/src/Control/Concurrent/Class/MonadSTM/TVar.hs rename to io-classes/io-classes/Control/Concurrent/Class/MonadSTM/TVar.hs diff --git a/io-classes/src/Control/Monad/Class/MonadAsync.hs b/io-classes/io-classes/Control/Monad/Class/MonadAsync.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadAsync.hs rename to io-classes/io-classes/Control/Monad/Class/MonadAsync.hs diff --git a/io-classes/src/Control/Monad/Class/MonadEventlog.hs b/io-classes/io-classes/Control/Monad/Class/MonadEventlog.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadEventlog.hs rename to io-classes/io-classes/Control/Monad/Class/MonadEventlog.hs diff --git a/io-classes/src/Control/Monad/Class/MonadFork.hs b/io-classes/io-classes/Control/Monad/Class/MonadFork.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadFork.hs rename to io-classes/io-classes/Control/Monad/Class/MonadFork.hs diff --git a/io-classes/src/Control/Monad/Class/MonadST.hs b/io-classes/io-classes/Control/Monad/Class/MonadST.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadST.hs rename to io-classes/io-classes/Control/Monad/Class/MonadST.hs diff --git a/io-classes/src/Control/Monad/Class/MonadSTM.hs b/io-classes/io-classes/Control/Monad/Class/MonadSTM.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadSTM.hs rename to io-classes/io-classes/Control/Monad/Class/MonadSTM.hs diff --git a/io-classes/src/Control/Monad/Class/MonadSTM/Internal.hs b/io-classes/io-classes/Control/Monad/Class/MonadSTM/Internal.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadSTM/Internal.hs rename to io-classes/io-classes/Control/Monad/Class/MonadSTM/Internal.hs diff --git a/io-classes/src/Control/Monad/Class/MonadSay.hs b/io-classes/io-classes/Control/Monad/Class/MonadSay.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadSay.hs rename to io-classes/io-classes/Control/Monad/Class/MonadSay.hs diff --git a/io-classes/src/Control/Monad/Class/MonadTest.hs b/io-classes/io-classes/Control/Monad/Class/MonadTest.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadTest.hs rename to io-classes/io-classes/Control/Monad/Class/MonadTest.hs diff --git a/io-classes/src/Control/Monad/Class/MonadThrow.hs b/io-classes/io-classes/Control/Monad/Class/MonadThrow.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadThrow.hs rename to io-classes/io-classes/Control/Monad/Class/MonadThrow.hs diff --git a/io-classes/src/Control/Monad/Class/MonadTime.hs b/io-classes/io-classes/Control/Monad/Class/MonadTime.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadTime.hs rename to io-classes/io-classes/Control/Monad/Class/MonadTime.hs diff --git a/io-classes/src/Control/Monad/Class/MonadTimer.hs b/io-classes/io-classes/Control/Monad/Class/MonadTimer.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadTimer.hs rename to io-classes/io-classes/Control/Monad/Class/MonadTimer.hs diff --git a/io-classes/src/Control/Monad/Class/MonadUnique.hs b/io-classes/io-classes/Control/Monad/Class/MonadUnique.hs similarity index 100% rename from io-classes/src/Control/Monad/Class/MonadUnique.hs rename to io-classes/io-classes/Control/Monad/Class/MonadUnique.hs From a97427a7a3798e58fbef4108ececdc0f191508c6 Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Thu, 4 Sep 2025 08:42:42 +0200 Subject: [PATCH 2/3] Updated SECURITY.md file This is required to transfer the repository to the intersect. --- SECURITY.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/SECURITY.md b/SECURITY.md index 6d68e556..b56b863c 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,2 +1,19 @@ +# Security Policy + +## Reporting a Vulnerability + +Please report (suspected) security vulnerabilities to security@intersectmbo.org. You will receive a +response from us within 48 hours. If the issue is confirmed, we will release a patch as soon +as possible. + +Please provide a clear and concise description of the vulnerability, including: + +* the affected version(s) of all packages included in ouroboros-network repository, +* steps that can be followed to exercise the vulnerability, +* any workarounds or mitigations + +If you have developed any code or utilities that can help demonstrate the suspected +vulnerability, please mention them in your email but ***DO NOT*** attempt to include them as +attachments as this may cause your Email to be blocked by spam filters. See the security file in the [Cardano engineering handbook](https://github.com/input-output-hk/cardano-engineering-handbook/blob/main/SECURITY.md). From e705813a76e728002f587552e9f27b64db0128b0 Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Thu, 4 Sep 2025 21:15:41 +0200 Subject: [PATCH 3/3] check-stylish script updated --- .../Control/Concurrent/Class/MonadSTM.hs | 16 +++++++--------- scripts/check-stylish.sh | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/io-classes/io-classes/Control/Concurrent/Class/MonadSTM.hs b/io-classes/io-classes/Control/Concurrent/Class/MonadSTM.hs index 464ba1f2..9a75d4d8 100644 --- a/io-classes/io-classes/Control/Concurrent/Class/MonadSTM.hs +++ b/io-classes/io-classes/Control/Concurrent/Class/MonadSTM.hs @@ -1,14 +1,12 @@ -- | This module corresponds to "Control.Concurrent.STM" in "stm" package -- -module Control.Concurrent.Class.MonadSTM - (module STM) - where +module Control.Concurrent.Class.MonadSTM (module STM) where -import Control.Monad.Class.MonadSTM as STM -import Control.Concurrent.Class.MonadSTM.TVar as STM -import Control.Concurrent.Class.MonadSTM.TMVar as STM -import Control.Concurrent.Class.MonadSTM.TChan as STM -import Control.Concurrent.Class.MonadSTM.TQueue as STM +import Control.Concurrent.Class.MonadSTM.TArray as STM import Control.Concurrent.Class.MonadSTM.TBQueue as STM -import Control.Concurrent.Class.MonadSTM.TArray as STM +import Control.Concurrent.Class.MonadSTM.TChan as STM +import Control.Concurrent.Class.MonadSTM.TMVar as STM +import Control.Concurrent.Class.MonadSTM.TQueue as STM +import Control.Concurrent.Class.MonadSTM.TVar as STM +import Control.Monad.Class.MonadSTM as STM diff --git a/scripts/check-stylish.sh b/scripts/check-stylish.sh index 199e6903..c670cc0f 100755 --- a/scripts/check-stylish.sh +++ b/scripts/check-stylish.sh @@ -6,4 +6,4 @@ export LC_ALL=C.UTF-8 [[ -x '/usr/bin/fd' ]] && FD="fd" || FD="fdfind" $FD . './io-sim' -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell.yaml -i -$FD . './io-classes' -e hs -E Setup.hs -E src/Control/Concurrent/Class/MonadSTM.hs -X stylish-haskell -c .stylish-haskell.yaml -i +$FD . './io-classes' -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell.yaml -i