diff --git a/atto.patch b/atto.patch deleted file mode 100644 index 5ec176c..0000000 --- a/atto.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 4631d1ab56bc60932ddba4cee71906564d68b8a2 Mon Sep 17 00:00:00 2001 -From: Joey Hess -Date: Wed, 24 Mar 2021 12:11:50 -0400 -Subject: [PATCH] Fix build with attoparsec-0.14 - -It changed parseOnly in the ByteString.Lazy module to take a lazy, not -strict ByteString. In all these cases though, we actually had a strict -ByteString, so the most efficient fix, which also happens to avoid needing -ifdefs, is to use the non-lazy module instead. - -This commit was sponsored by Denis Dzyubenko on Patreon. ---- - CHANGELOG | 1 + - Logs/ContentIdentifier/Pure.hs | 2 +- - Logs/Line.hs | 2 +- - Logs/MapLog.hs | 7 ++++--- - Logs/Remote/Pure.hs | 2 +- - Logs/Trust/Pure.hs | 2 +- - Logs/UUIDBased.hs | 7 ++++--- - 7 files changed, 13 insertions(+), 10 deletions(-) - -Index: git-annex-8.20210310/Logs/ContentIdentifier/Pure.hs -=================================================================== ---- git-annex-8.20210310.orig/Logs/ContentIdentifier/Pure.hs -+++ git-annex-8.20210310/Logs/ContentIdentifier/Pure.hs -@@ -17,7 +17,7 @@ import Utility.Base64 - import qualified Data.ByteString as S - import qualified Data.ByteString.Char8 as S8 - import qualified Data.ByteString.Lazy as L --import qualified Data.Attoparsec.ByteString.Lazy as A -+import qualified Data.Attoparsec.ByteString as A - import qualified Data.Attoparsec.ByteString.Char8 as A8 - import Data.ByteString.Builder - import Data.List.NonEmpty (NonEmpty(..)) -Index: git-annex-8.20210310/Logs/Line.hs -=================================================================== ---- git-annex-8.20210310.orig/Logs/Line.hs -+++ git-annex-8.20210310/Logs/Line.hs -@@ -9,7 +9,7 @@ module Logs.Line where - - import Common - --import qualified Data.Attoparsec.ByteString.Lazy as A -+import qualified Data.Attoparsec.ByteString as A - import Data.Attoparsec.ByteString.Char8 (isEndOfLine) - import qualified Data.DList as D - -Index: git-annex-8.20210310/Logs/MapLog.hs -=================================================================== ---- git-annex-8.20210310.orig/Logs/MapLog.hs -+++ git-annex-8.20210310/Logs/MapLog.hs -@@ -24,7 +24,8 @@ import Utility.QuickCheck - - import qualified Data.ByteString.Lazy as L - import qualified Data.Map.Strict as M --import qualified Data.Attoparsec.ByteString.Lazy as A -+import qualified Data.Attoparsec.ByteString as A -+import qualified Data.Attoparsec.ByteString.Lazy as AL - import qualified Data.Attoparsec.ByteString.Char8 as A8 - import Data.ByteString.Builder - -@@ -49,8 +50,8 @@ buildMapLog fieldbuilder valuebuilder = - nl = charUtf8 '\n' - - parseMapLog :: Ord f => A.Parser f -> A.Parser v -> L.ByteString -> MapLog f v --parseMapLog fieldparser valueparser = fromMaybe M.empty . A.maybeResult -- . A.parse (mapLogParser fieldparser valueparser) -+parseMapLog fieldparser valueparser = fromMaybe M.empty . AL.maybeResult -+ . AL.parse (mapLogParser fieldparser valueparser) - - mapLogParser :: Ord f => A.Parser f -> A.Parser v -> A.Parser (MapLog f v) - mapLogParser fieldparser valueparser = M.fromListWith best <$> parseLogLines go -Index: git-annex-8.20210310/Logs/Remote/Pure.hs -=================================================================== ---- git-annex-8.20210310.orig/Logs/Remote/Pure.hs -+++ git-annex-8.20210310/Logs/Remote/Pure.hs -@@ -27,7 +27,7 @@ import Utility.QuickCheck - import qualified Data.ByteString.Lazy as L - import qualified Data.Map as M - import Data.Char --import qualified Data.Attoparsec.ByteString.Lazy as A -+import qualified Data.Attoparsec.ByteString as A - import Data.ByteString.Builder - - calcRemoteConfigMap :: L.ByteString -> M.Map UUID RemoteConfig -Index: git-annex-8.20210310/Logs/Trust/Pure.hs -=================================================================== ---- git-annex-8.20210310.orig/Logs/Trust/Pure.hs -+++ git-annex-8.20210310/Logs/Trust/Pure.hs -@@ -14,7 +14,7 @@ import Types.TrustLevel - import Logs.UUIDBased - - import qualified Data.ByteString.Lazy as L --import qualified Data.Attoparsec.ByteString.Lazy as A -+import qualified Data.Attoparsec.ByteString as A - import qualified Data.Attoparsec.ByteString.Char8 as A8 - import Data.ByteString.Builder - -Index: git-annex-8.20210310/Logs/UUIDBased.hs -=================================================================== ---- git-annex-8.20210310.orig/Logs/UUIDBased.hs -+++ git-annex-8.20210310/Logs/UUIDBased.hs -@@ -41,7 +41,8 @@ import Logs.Line - - import qualified Data.ByteString as S - import qualified Data.ByteString.Lazy as L --import qualified Data.Attoparsec.ByteString.Lazy as A -+import qualified Data.Attoparsec.ByteString as A -+import qualified Data.Attoparsec.ByteString.Lazy as AL - import qualified Data.Attoparsec.ByteString.Char8 as A8 - import Data.ByteString.Builder - import qualified Data.DList as D -@@ -63,8 +64,8 @@ parseLogOld :: A.Parser a -> L.ByteStrin - parseLogOld = parseLogOldWithUUID . const - - parseLogOldWithUUID :: (UUID -> A.Parser a) -> L.ByteString -> Log a --parseLogOldWithUUID parser = fromMaybe M.empty . A.maybeResult -- . A.parse (logParserOld parser) -+parseLogOldWithUUID parser = fromMaybe M.empty . AL.maybeResult -+ . AL.parse (logParserOld parser) - - logParserOld :: (UUID -> A.Parser a) -> A.Parser (Log a) - logParserOld parser = M.fromListWith best <$> parseLogLines go diff --git a/git-annex-8.20210310.tar.gz b/git-annex-8.20210310.tar.gz deleted file mode 100644 index 575ccdb..0000000 --- a/git-annex-8.20210310.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba1b80404c73e3205029a34c419494ae450aab2fc8ec503b4a6612bb49c3b595 -size 8661112 diff --git a/git-annex-8.20210330.tar.gz b/git-annex-8.20210330.tar.gz new file mode 100644 index 0000000..5d047fb --- /dev/null +++ b/git-annex-8.20210330.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ca55080e9564182a5ad2e9e584db6f0b2f421bbc5ad32d5a152b7c7d04956a0 +size 8706036 diff --git a/git-annex.changes b/git-annex.changes index c5da5e4..8696e62 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Tue Apr 6 08:36:35 UTC 2021 - Ondřej Súkup + +- add persistent.patch - support new persistent library + +------------------------------------------------------------------- +Wed Mar 31 14:32:42 UTC 2021 - Ondřej Súkup + +- drop atto.patch + +------------------------------------------------------------------- +Wed Mar 31 14:28:17 UTC 2021 - psimons@suse.com + +- Update git-annex to version 8.20210330. + git-annex (8.20210330) upstream; urgency=medium + + * Behavior change: When autoenabling special remotes of type S3, weddav, + or glacier, do not take login credentials from environment variables, + as the user may not be expecting the autoenable to happen, or may + have those set for other purposes and not intend git-annex to use them. + * New annex.supportunlocked config that can be set to false to avoid + some expensive things needed to support unlocked files, if you do not + use them. + * Fix bug importing from a special remote into a subdirectory more than + one level deep, which generated unusual git trees that could confuse + git merge. + * borg: Fix a bug that prevented importing keys of type URL and WORM. + * borg: Support importing files that are hard linked in the borg backup. + * export: When a submodule is in the tree to be exported, skip it. + * import: When the previously exported tree contained a submodule, + preserve it in the imported tree so it does not get deleted. + * export --json: Fill in the file field. + * rmurl: When youtube-dl was used for an url, it no longer needs to be + prefixed with "yt:" in order to be removed. + * rmurl: If an url is both used by the web and also claimed by another + special remote, fix a bug that caused the url to to not be removed. + * unregisterurl: Fix a bug that caused an url to not be unregistered + when it is claimed by a special remote other than the web. + * whereis: Don't include yt: prefix when showing url to content + retrieved with youtube-dl. + * webdav: Work around some buggy webdav server behavior involving + renaming files. + * Make --debug also enable debugging in child git-annex processes. + * fsck: When --from is used in combination with --all or similar options, + do not verify required content, which can't be checked properly when + operating on keys. + * Sped up git-annex init in a clone of an existing repository. + * Improved display of errors when accessing a git http remote fails. + * Fix build with attoparsec-0.14. + + -- Joey Hess Tue, 30 Mar 2021 13:01:17 -0400 + ------------------------------------------------------------------- Thu Mar 25 09:47:23 UTC 2021 - Ondřej Súkup diff --git a/git-annex.spec b/git-annex.spec index 94239e9..dfdd662 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -17,13 +17,13 @@ Name: git-annex -Version: 8.20210310 +Version: 8.20210330 Release: 0 Summary: Manage files with git, without checking their contents into git License: AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT AND GPL-2.0-only URL: https://hackage.haskell.org/package/%{name} Source0: https://github.com/peti/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: atto.patch +Patch0: persistent.patch BuildRequires: bash-completion BuildRequires: chrpath BuildRequires: curl diff --git a/persistent.patch b/persistent.patch new file mode 100644 index 0000000..f75e7bf --- /dev/null +++ b/persistent.patch @@ -0,0 +1,67 @@ +From 8868a3a4c7bfaa356d8c0eb7c6abb8b980f63d99 Mon Sep 17 00:00:00 2001 +From: Joey Hess +Date: Thu, 1 Apr 2021 12:19:47 -0400 +Subject: Fix build with persistent-2.12.0.1 + +persistent stopped using askLogFunc, and the thing to use is askLoggerIO +from monad-logger. Bumped the dep to the first version that contained that. + +Note that the i386ancient build uses a newer monad-logger than 0.3.10, +so the new versioned dep should not break it, and presumably nothing else +either. + +This commit was sponsored by Noam Kremen on Patreon. +--- + CHANGELOG | 6 ++++++ + Database/Handle.hs | 6 +++--- + doc/bugs/git-annex_8.20210330_fails_to_build_in_brew.mdwn | 2 ++ + .../comment_1_ddf94a16e7075c218473b01b15fdca3d._comment | 14 ++++++++++++++ + git-annex.cabal | 2 +- + 5 files changed, 26 insertions(+), 4 deletions(-) + create mode 100644 doc/bugs/git-annex_8.20210330_fails_to_build_in_brew/comment_1_ddf94a16e7075c218473b01b15fdca3d._comment + +diff --git a/CHANGELOG b/CHANGELOG +index 6f0e0bf35..33c80fa5b 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,9 @@ ++git-annex (8.20210331) UNRELEASED; urgency=medium ++ ++ * Fix build with persistent-2.12.0.1 ++ ++ -- Joey Hess Thu, 01 Apr 2021 12:17:26 -0400 ++ + git-annex (8.20210330) upstream; urgency=medium + + * Behavior change: When autoenabling special remotes of type S3, weddav, +diff --git a/Database/Handle.hs b/Database/Handle.hs +index 2109ad9ac..d7f1822dc 100644 +--- a/Database/Handle.hs ++++ b/Database/Handle.hs +@@ -26,7 +26,7 @@ import qualified Database.Sqlite as Sqlite + import Control.Monad + import Control.Monad.IO.Class (liftIO) + import Control.Monad.IO.Unlift (MonadUnliftIO, withRunInIO) +-import Control.Monad.Logger (MonadLogger) ++import Control.Monad.Logger (MonadLoggerIO, askLoggerIO) + import Control.Concurrent + import Control.Concurrent.Async + import Control.Exception (throwIO, BlockedIndefinitelyOnMVar(..)) +@@ -245,7 +245,7 @@ runSqliteRobustly tablename db a = do + -- Like withSqlConn, but more robust. + withSqlConnRobustly + :: (MonadUnliftIO m +- , MonadLogger m ++ , MonadLoggerIO m + , IsPersistBackend backend + , BaseBackend backend ~ SqlBackend + , BackendCompatible SqlBackend backend +@@ -254,7 +254,7 @@ withSqlConnRobustly + -> (backend -> m a) + -> m a + withSqlConnRobustly open f = do +- logFunc <- askLogFunc ++ logFunc <- askLoggerIO + withRunInIO $ \run -> bracket + (open logFunc) + closeRobustly