diff --git a/0001-persistent-2.12.0.1-include-the-code-from-persistent.patch b/0001-persistent-2.12.0.1-include-the-code-from-persistent.patch index 696d087..e9c296f 100644 --- a/0001-persistent-2.12.0.1-include-the-code-from-persistent.patch +++ b/0001-persistent-2.12.0.1-include-the-code-from-persistent.patch @@ -1,157 +1,14 @@ -From 58b3b46b517358295c7041a92ce135e7c8013eec Mon Sep 17 00:00:00 2001 -From: Peter Simons -Date: Thu, 10 Aug 2023 15:39:56 +0200 -Subject: [PATCH] persistent >= 2.12.0.1 includes the code from - persistent-template - -persistent-template has been deprecated. ---- - Database/ContentIdentifier.hs | 2 -- - Database/Export.hs | 3 --- - Database/Fsck.hs | 3 --- - Database/ImportFeed.hs | 3 --- - Database/Keys/SQL.hs | 3 --- - git-annex.cabal | 3 +-- - 6 files changed, 1 insertion(+), 16 deletions(-) - -Index: git-annex-10.20240927/Database/ContentIdentifier.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/ContentIdentifier.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/ContentIdentifier.hs 2024-10-26 13:36:42.452641193 +0000 -@@ -12,10 +12,8 @@ - {-# LANGUAGE RankNTypes #-} - {-# LANGUAGE DataKinds, FlexibleInstances #-} - {-# LANGUAGE UndecidableInstances #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.ContentIdentifier ( - ContentIdentifierHandle, -Index: git-annex-10.20240927/Database/Export.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/Export.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/Export.hs 2024-10-26 13:36:42.452641193 +0000 -@@ -5,17 +5,14 @@ - - Licensed under the GNU AGPL version 3 or higher. - -} - --{-# LANGUAGE CPP #-} - {-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-} - {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} - {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} - {-# LANGUAGE RankNTypes #-} - {-# LANGUAGE DataKinds, FlexibleInstances #-} - {-# LANGUAGE UndecidableInstances #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.Export ( - ExportHandle, -Index: git-annex-10.20240927/Database/Fsck.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/Fsck.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/Fsck.hs 2024-10-26 13:36:42.452641193 +0000 -@@ -5,7 +5,6 @@ - - Licensed under the GNU AGPL version 3 or higher. - -} - --{-# LANGUAGE CPP #-} - {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} - {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} - {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} -@@ -13,10 +12,8 @@ - {-# LANGUAGE RankNTypes #-} - {-# LANGUAGE UndecidableInstances #-} - {-# LANGUAGE TypeOperators #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.Fsck ( - FsckHandle, -Index: git-annex-10.20240927/Database/ImportFeed.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/ImportFeed.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/ImportFeed.hs 2024-10-26 13:36:42.452641193 +0000 -@@ -6,17 +6,14 @@ - - Licensed under the GNU AGPL version 3 or higher. - -} - --{-# LANGUAGE CPP #-} - {-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-} - {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts, EmptyDataDecls #-} - {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} - {-# LANGUAGE RankNTypes #-} - {-# LANGUAGE DataKinds, FlexibleInstances #-} - {-# LANGUAGE UndecidableInstances #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.ImportFeed ( - ImportFeedDbHandle, -Index: git-annex-10.20240927/Database/Keys/SQL.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/Keys/SQL.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/Keys/SQL.hs 2024-10-26 13:36:42.453641181 +0000 -@@ -5,17 +5,14 @@ - - Licensed under the GNU AGPL version 3 or higher. - -} - --{-# LANGUAGE CPP #-} - {-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-} - {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} - {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} - {-# LANGUAGE RankNTypes, ScopedTypeVariables #-} - {-# LANGUAGE DataKinds, FlexibleInstances #-} - {-# LANGUAGE UndecidableInstances #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.Keys.SQL where - -Index: git-annex-10.20240927/git-annex.cabal -=================================================================== ---- git-annex-10.20240927.orig/git-annex.cabal 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/git-annex.cabal 2024-10-26 13:36:42.453641181 +0000 +diff --git a/git-annex.cabal b/git-annex.cabal +index 864efa527e..68b5552b37 100644 +--- a/git-annex.cabal ++++ b/git-annex.cabal @@ -249,8 +249,7 @@ Executable git-annex - time (>= 1.5.0), + time (>= 1.9.1), old-locale, persistent-sqlite (>= 2.8.1), - persistent (>= 2.8.1), -- persistent-template, +- persistent-template (>= 2.8.0), + persistent (>= 2.12.0.2), unliftio-core, microlens, - aeson, -Index: git-annex-10.20240927/Database/RepoSize.hs -=================================================================== ---- git-annex-10.20240927.orig/Database/RepoSize.hs 2024-09-30 23:15:57.000000000 +0000 -+++ git-annex-10.20240927/Database/RepoSize.hs 2024-10-26 13:37:26.311088729 +0000 -@@ -5,7 +5,6 @@ - - Licensed under the GNU AGPL version 3 or higher. - -} - --{-# LANGUAGE CPP #-} - {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} - {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} - {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} -@@ -13,10 +12,8 @@ - {-# LANGUAGE RankNTypes #-} - {-# LANGUAGE UndecidableInstances #-} - {-# LANGUAGE TypeOperators #-} --#if MIN_VERSION_persistent_template(2,8,0) - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE StandaloneDeriving #-} --#endif - - module Database.RepoSize ( - RepoSizeHandle, + aeson (>= 2.0.0), diff --git a/git-annex-10.20241202.tar.gz b/git-annex-10.20241202.tar.gz deleted file mode 100644 index 42be531..0000000 --- a/git-annex-10.20241202.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aeedee875a487ce6b9e5913a951efa1d17a050825d70300a4a5b4323f7895c66 -size 9563132 diff --git a/git-annex-10.20250115.tar.gz b/git-annex-10.20250115.tar.gz new file mode 100644 index 0000000..df16b5c --- /dev/null +++ b/git-annex-10.20250115.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:238d62c22be515478a1648aef95433d4179df7c142227010ba73d3e8e6b54d94 +size 9174647 diff --git a/git-annex.changes b/git-annex.changes index 44944f3..95c4da0 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Wed Jan 15 16:38:16 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250115. + + * Improve handing of ssh connection problems during + remote annex.uuid discovery. + * log: Support --key, as well as --branch and --unused. + * Avoid verification error when addurl --verifiable is used + with an url claimed by a special remote other than the web. + * Fix installation on Android. + * Allow enableremote of an existing webdav special remote that has + read-only access. + * git-remote-annex: Use enableremote rather than initremote. + * Windows: Fix permission denied error when dropping files that + have the readonly attribute set. + * Added freezecontent-annex and thawcontent-annex hooks that + correspond to the git configs annex.freezecontent and + annex.thawcontent. + * Added secure-erase-annex hook that corresponds to the git config + annex.secure-erase-command. + * Added commitmessage-annex hook that corresponds to the git config + annex.commitmessage-command. + * Added http-headers-annex hook that corresponds to the git config + annex.http-headers-command. + * Added git configs annex.post-update-command and annex.pre-commit-command + that correspond to the post-update-annex and pre-commit-annex hooks. + * Added annex.pre-init-command git config and pre-init-annex hook + that is run before git-annex repository initialization. + * Linux standalone builds' bundled rsync updated to fix security holes. + +------------------------------------------------------------------- +Thu Jan 2 16:32:11 UTC 2025 - Peter Simons + +- Update git-annex to version 10.20250102. + + * Added config `url..annexInsteadOf` corresponding to git's + `url..pushInsteadOf`, to configure the urls to use for accessing + the git-annex repositories on a server without needing to configure + remote.name.annexUrl in each repository. + * Work around git hash-object --stdin-paths's odd stripping of carriage + return from the end of the line (some windows infection), avoiding + crashing when the repo contains a filename ending in a carriage return. + * Document that settting preferred content to "" is the same as the + default unset behavior. + * sync: Avoid misleading warning about future preferred content + transition when preferred content is set to "". + * Honor annex.addunlocked configuration when importing a tree from a + special remote. + * Removed the i386ancient standalone tarball build for linux, which + was increasingly unable to support new git-annex features. + * Removed support for building with ghc older than 9.0.2, + and with older versions of haskell libraries than are in current Debian + stable. + * stack.yaml: Update to lts-23.2. + +- Refresh "0001-persistent-2.12.0.1-include-the-code-from-persistent.patch". + Most patches to git-annex itself are now unnecessary. We only need to drop + persistent-templates from the list of build dependencies. + ------------------------------------------------------------------- Mon Dec 2 16:37:14 UTC 2024 - Peter Simons diff --git a/git-annex.spec b/git-annex.spec index 4a501d5..3bd1a3b 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -1,7 +1,7 @@ # # spec file for package git-annex # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: git-annex -Version: 10.20241202 +Version: 10.20250115 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