Accepting request 1239834 from devel:languages:haskell

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1239834
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git-annex?expand=0&rev=45

0001-persistent-2.12.0.1-include-the-code-from-persistent.patch

@@ -1,137 +1,14 @@
-From 58b3b46b517358295c7041a92ce135e7c8013eec Mon Sep 17 00:00:00 2001
-From: Peter Simons <simons@cryp.to>
-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(-)
-
-diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs
-index bbf67dcfb1..3a399f7765 100644
---- a/Database/ContentIdentifier.hs
-+++ b/Database/ContentIdentifier.hs
-@@ -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,
-diff --git a/Database/Export.hs b/Database/Export.hs
-index 2f0da8b231..6de86c7925 100644
---- a/Database/Export.hs
-+++ b/Database/Export.hs
-@@ -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,
-diff --git a/Database/Fsck.hs b/Database/Fsck.hs
-index cce5528100..2ff4eb6bb5 100644
---- a/Database/Fsck.hs
-+++ b/Database/Fsck.hs
-@@ -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,
-diff --git a/Database/ImportFeed.hs b/Database/ImportFeed.hs
-index 2d44b0b9ea..84cd24bdab 100644
---- a/Database/ImportFeed.hs
-+++ b/Database/ImportFeed.hs
-@@ -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,
-diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs
-index 2e40e39db3..6b36cd09d5 100644
---- a/Database/Keys/SQL.hs
-+++ b/Database/Keys/SQL.hs
-@@ -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
- 
 diff --git a/git-annex.cabal b/git-annex.cabal
-index 31e66f9f27..7bf1a8ae0c 100644
+index 864efa527e..68b5552b37 100644
 --- a/git-annex.cabal
 +++ b/git-annex.cabal
-@@ -247,8 +247,7 @@ Executable git-annex
+@@ -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,
+    aeson (>= 2.0.0),
--- 
-2.42.0
-

git-annex-10.20240808.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e96e06db663953c0160ebf734e84775e9fc24af0b9771f3c1a61caabaf14e885
-size 9417070

git-annex-10.20250115.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:238d62c22be515478a1648aef95433d4179df7c142227010ba73d3e8e6b54d94
+size 9174647

git-annex.changes

@@ -1,3 +1,188 @@
+-------------------------------------------------------------------
+Wed Jan 15 16:38:16 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- 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 <psimons@suse.com>
+
+- Update git-annex to version 10.20250102.
+
+    * Added config `url.<base>.annexInsteadOf` corresponding to git's
+      `url.<base>.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 <psimons@suse.com>
+
+- Update git-annex to version 10.20241202.
+  git-annex (10.20241202) upstream; urgency=medium
+
+    * add: Consistently treat files in a dotdir as dotfiles, even
+      when ran inside that dotdir.
+    * add: When adding a dotfile as a non-large file, mention that it's a
+      dotfile.
+    * p2phttp: Added --directory option which serves multiple git-annex
+      repositories located inside a directory.
+    * When remote.name.annexUrl is an annex+http(s) url, that
+      uses the same hostname as remote.name.url, which is itself a http(s)
+      url, they are assumed to share a username and password. This avoids
+      unnecessary duplicate password prompts.
+    * git-remote-annex: Fix a reversion introduced in version 10.20241031
+      that broke cloning from a special remote.
+    * git-remote-annex: Fix cloning from a special remote on a crippled
+      filesystem.
+    * git-remote-annex: Fix buggy behavior when annex.stalldetection is
+      configured.
+    * git-remote-annex: Require git version 2.31 or newer, since old
+      ones had a buggy git bundle command.
+    * S3: Support versioning=yes with a readonly bucket.
+      (Needs aws-0.24.3)
+    * S3: Send git-annex or other configured User-Agent.
+      (Needs aws-0.24.3)
+    * S3: Fix infinite loop and memory blowup when importing from an
+      unversioned S3 bucket that is large enough to need pagination.
+    * S3: Use significantly less memory when importing from a
+      versioned S3 bucket.
+    * vpop: Only update state after successful checkout.
+
+   -- Joey Hess <id@joeyh.name>  Mon, 02 Dec 2024 12:31:08 -0400
+
+-------------------------------------------------------------------
+Thu Oct 31 21:20:43 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20241031.
+  git-annex (10.20241031) upstream; urgency=medium
+
+    * Sped up proxied downloads from special remotes, by streaming.
+    * Added GETORDERED request to external special remote protocol.
+      When the external special remote responds with ORDERED, it can stream
+      through a proxy.
+    * p2phttp: Support serving unauthenticated users while requesting
+      authentication for operations that need it. Eg, --unauth-readonly
+      can be combined with --authenv.
+    * p2phttp: Allow unauthenticated users to lock content by default.
+    * p2phttp: Added --unauth-nolocking option to prevent unauthenticated
+      users from locking content.
+    * Allow enabling the servant build flag with older versions of stm,
+      allowing building with ghc 9.0.2.
+    * git-remote-annex: Fix bug that prevented using it with external special
+      remotes, leading to protocol error messages involving "GITMANIFEST".
+    * adjust: Allow any order of options when combining --hide-missing with
+      options like --unlock.
+    * Support P2P protocol version 4. This allows DATA-PRESENT to be sent
+      after PUT (and in the HTTP P2P protocol, v4/put has a data-present
+      parameter). When used with a proxy to a special remote like a S3
+      bucket, this allows a custom client to upload content to S3 itself,
+      and then use the P2P protocol to inform the proxy that the content has
+      been stored there, which will result in the same git-annex branch state
+      updates as sending DATA via the proxy.
+    * Fix hang when receiving a large file into a proxied special remote.
+
+   -- Joey Hess <id@joeyh.name>  Thu, 31 Oct 2024 17:19:56 -0400
+
+-------------------------------------------------------------------
+Mon Sep 30 23:17:41 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20240927.
+  git-annex (10.20240927) upstream; urgency=medium
+
+    * Detect when a preferred content expression contains "not present",
+      which would lead to repeatedly getting and then dropping files,
+      and make it never match. This also applies to
+      "not balanced" and "not sizebalanced".
+    * Fix --explain display of onlyingroup preferred content expression.
+    * Allow maxsize to be set to 0 to stop checking maxsize for a repository.
+    * Fix bug that prevented anything being stored in an empty
+      repository whose preferred content expression uses sizebalanced.
+    * sim: New command, can be used to simulate networks of repositories
+      and see how preferred content and other configuration makes file
+      content flow through it.
+
+   -- Joey Hess <id@joeyh.name>  Mon, 30 Sep 2024 19:15:35 -0400
+
+-------------------------------------------------------------------
+Sat Aug 31 23:51:02 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20240831.
+  git-annex (10.20240831) upstream; urgency=medium
+
+    * Special remotes configured with exporttree=yes annexobjects=yes
+      can store objects in .git/annex/objects, as well as an exported tree.
+    * Support proxying to special remotes configured with
+      exporttree=yes annexobjects=yes, and allow such remotes to be used as
+      cluster nodes.
+    * post-retrieve: When proxying is enabled for an exporttree=yes
+      special remote (or it is a cluster node) and the configured
+      remote.name.annex-tracking-branch is received, the tree is
+      exported to the special remote.
+    * Support "balanced=", "fullybalanced=", "sizebalanced=" and
+      "fullysizebalanced=" in preferred content expressions.
+    * Added --rebalance option.
+    * Added the annex.fullybalancedthreshhold git config.
+    * maxsize: New command to tell git-annex how large the expected maximum
+      size of a repository is, and to display repository sizes.
+    * vicfg: Include maxsize configuration.
+    * info: Improved speed by using new repository size tracking.
+    * lookupkey: Allow using --ref in a bare repository.
+    * export: Added --from option.
+    * git-remote-annex: Store objects in exportree=yes special remotes
+      in the same paths used by annexobjects=yes. This is a backwards
+      compatible change.
+    * updateproxy, updatecluster: Prevent using an exporttree=yes special
+      remote that does not have annexobjects=yes, since it will not work.
+    * The config versioning=true is now reserved for use by versioned special
+      remotes. External special remotes should not use that config for their
+      own purposes.
+
+   -- Joey Hess <id@joeyh.name>  Sat, 31 Aug 2024 19:48:17 -0400
+
 -------------------------------------------------------------------
 Thu Aug  8 19:27:29 UTC 2024 - Peter Simons <psimons@suse.com>
 

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.20240808
+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
@@ -69,8 +69,6 @@ BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-conduit-prof
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-containers-prof
-BuildRequires:  ghc-criterion-devel
-BuildRequires:  ghc-criterion-prof
 BuildRequires:  ghc-crypto-api-devel
 BuildRequires:  ghc-crypto-api-prof
 BuildRequires:  ghc-crypton-devel
@@ -162,6 +160,14 @@ BuildRequires:  ghc-sandi-devel
 BuildRequires:  ghc-sandi-prof
 BuildRequires:  ghc-securemem-devel
 BuildRequires:  ghc-securemem-prof
+BuildRequires:  ghc-servant-client-core-devel
+BuildRequires:  ghc-servant-client-core-prof
+BuildRequires:  ghc-servant-client-devel
+BuildRequires:  ghc-servant-client-prof
+BuildRequires:  ghc-servant-devel
+BuildRequires:  ghc-servant-prof
+BuildRequires:  ghc-servant-server-devel
+BuildRequires:  ghc-servant-server-prof
 BuildRequires:  ghc-shakespeare-devel
 BuildRequires:  ghc-shakespeare-prof
 BuildRequires:  ghc-socks-devel
@@ -228,6 +234,7 @@ BuildRequires:  git-core
 BuildRequires:  gpg2
 BuildRequires:  lsof
 BuildRequires:  rsync
+BuildRequires:  sqlite3-devel
 Requires(post): desktop-file-utils
 Requires(post): hicolor-icon-theme
 Requires(postun): desktop-file-utils
@@ -271,7 +278,7 @@ Optional dependency offering bash completion for git-annex
 %autosetup -p1
 
 %build
-%define cabal_configure_options -ftestsuite
+%define cabal_configure_options -f+assistant -f+crypton -f+dbus -f+magicmime -f+pairing -f+production -f+servant -f+torrentparser -f-benchmark
 %ghc_bin_build
 
 %check