diff --git a/git-annex-8.20210330.tar.gz b/git-annex-8.20210330.tar.gz deleted file mode 100644 index 5d047fb..0000000 --- a/git-annex-8.20210330.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ca55080e9564182a5ad2e9e584db6f0b2f421bbc5ad32d5a152b7c7d04956a0 -size 8706036 diff --git a/git-annex-8.20210428.tar.gz b/git-annex-8.20210428.tar.gz new file mode 100644 index 0000000..8593c49 --- /dev/null +++ b/git-annex-8.20210428.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f25d7e80445387595585573134f89752d2a889fdffd73a48e5d49eadb625b3c2 +size 8765307 diff --git a/git-annex.changes b/git-annex.changes index 8696e62..beef849 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Thu Apr 29 09:42:49 UTC 2021 - Ondřej Súkup + +- drop persistent.patch + +------------------------------------------------------------------- +Thu Apr 29 09:27:23 UTC 2021 - psimons@suse.com + +- Update git-annex to version 8.20210428. + git-annex (8.20210428) upstream; urgency=medium + + * New annex.private and remote.name.annex-private configs that can + prevent storing information about a repository and remotes in the + git-annex branch. + * initremote: Added --private option to set up a private special remote. + * importfeed: Made "checking known urls" phase run 12 times faster. + * Added --debugfilter (and annex.debugfilter) + * diffdriver: Support unlocked files. + * forget: Preserve currently exported trees, avoiding problems with + exporttree remotes in some unusual circumstances. + * fsck: When downloading content from a remote, if the content is able + to be verified during the transfer, skip checksumming it a second time. + * directory: When cp supports reflinks, use it. + * Avoid excess commits to the git-annex branch when stall detection is + enabled. + * git-annex-config: Allow setting annex.securehashesonly, which has + otherwise been supported since 2019, but was missing from the list of + allowed repo-global configs. + * init: Fix a crash when the repo's was cloned from a repo that had an + adjusted branch checked out, and the origin remote is not named "origin". + * Fix some bugs that made git-annex not see recently recorded status + information when configured with annex.alwayscommit=false. + * When mincopies is set to a larger value than numcopies, make sure that + mincopies is satisfied. Before, it assumed a sane configuration would + have numcopies larger or equal to mincopies. It's still a good idea + not to configure git-annex this way. + * Avoid more than 1 gpg password prompt at the same time, which + could happen occasionally before when concurrency is enabled. + * Fix build with persistent-2.12.0.1 + + -- Joey Hess Wed, 28 Apr 2021 12:13:24 -0400 + ------------------------------------------------------------------- Tue Apr 6 08:36:35 UTC 2021 - Ondřej Súkup diff --git a/git-annex.spec b/git-annex.spec index dfdd662..029cca6 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -17,13 +17,12 @@ Name: git-annex -Version: 8.20210330 +Version: 8.20210428 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: persistent.patch +Source0: https://github.com/opensuse-haskell/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: bash-completion BuildRequires: chrpath BuildRequires: curl @@ -46,6 +45,7 @@ BuildRequires: ghc-concurrent-output-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-connection-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-criterion-devel BuildRequires: ghc-crypto-api-devel BuildRequires: ghc-cryptonite-devel BuildRequires: ghc-data-default-devel @@ -63,7 +63,6 @@ BuildRequires: ghc-filepath-devel BuildRequires: ghc-free-devel BuildRequires: ghc-git-lfs-devel BuildRequires: ghc-hinotify-devel -BuildRequires: ghc-hslogger-devel BuildRequires: ghc-http-client-devel BuildRequires: ghc-http-client-restricted-devel BuildRequires: ghc-http-client-tls-devel @@ -168,7 +167,7 @@ Supplements: (%{name} and bash-completion) Optional dependency offering bash completion for git-annex %prep -%autosetup -p1 +%autosetup %build %define cabal_configure_options -ftestsuite diff --git a/persistent.patch b/persistent.patch deleted file mode 100644 index f75e7bf..0000000 --- a/persistent.patch +++ /dev/null @@ -1,67 +0,0 @@ -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