Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package git-annex for openSUSE:Factory checked in at 2023-04-04 21:25:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-annex (Old) and /work/SRC/openSUSE:Factory/.git-annex.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-annex" Tue Apr 4 21:25:28 2023 rev:29 rq:1076515 version:10.20230329 Changes: -------- --- /work/SRC/openSUSE:Factory/git-annex/git-annex.changes 2023-01-28 18:52:35.909096396 +0100 +++ /work/SRC/openSUSE:Factory/.git-annex.new.19717/git-annex.changes 2023-04-04 21:25:42.842996079 +0200 @@ -1,0 +2,82 @@ +Thu Mar 30 17:09:14 UTC 2023 - Peter Simons <psim...@suse.com> + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + +------------------------------------------------------------------- +Wed Mar 29 20:09:41 UTC 2023 - Peter Simons <psim...@suse.com> + +- Update git-annex to version 10.20230329. + * sync: Fix parsing of gcrypt::rsync:// urls that use a relative path. + * Avoid failure to update adjusted branch --unlock-present after git-annex + drop when annex.adjustedbranchrefresh=1 + * Avoid leaving repo with a detached head when there is a failure + checking out an updated adjusted branch. + * view: Support annex.maxextensionlength when generating filenames for + the view branch. + * Windows: Support urls like "file:///c:/path" + * addurl, importfeed: Fix failure when annex.securehashesonly is set. + * Copy with a reflink when exporting a tree to a directory special remote. + * Fix bug that caused broken protocol to be used with external remotes + that use exporttree=yes. In some cases this could result in the wrong + content being exported to, or retrieved from the remote. + * Support VERSION 2 in the external special remote protocol, which is + identical to VERSION 1, but avoids external remote programs neededing + to work around the above bug. External remote program that support + exporttree=yes are recommended to be updated to send VERSION 2. + * Using git-annex view in an adjusted branch, or git-annex adjust in a + view branch, will enter an adjusted view branch. + * sync: Fix a reversion that prevented sending files to exporttree=yes + remotes when annex-tracking-branch was configured to branch:subdir + (Introduced in version 10.20230214) + * status: This command is deprecated because it was only needed in direct + mode; git status --short is very similar. + * Windows: Support long filenames in more (possibly all) of the code. + * Added arm64 build for ancient kernels, needed to support Android phones + whose kernels are too old to support kernels used by the current arm64 + build. + * importfeed: Display feed title. + * init: Support being ran in a repository that has a newline in its path. + * copy: When --from and --to are combined and the content is already + present on the destination remote, update location tracking as + necessary. + * Fixed spelling of some messages and added a .codespellrc + Thanks, Yaroslav Halchenko + * Fix more breakage caused by git's fix for CVE-2022-24765, this time + involving a remote that is a local bare repository not owned by the + current user. + * info: Fix reversion in last release involving handling of unsupported + input by continuing to handle any other inputs, before exiting nonzero + at the end. + * git-annex.cabal: Move webapp build deps under the Assistant build flag + so git-annex can be built again without yesod etc installed. + * Improve error message when unable to read a sqlite database due to + permissions problem. + * sync: Fix a bug that caused files to be removed from an + importtree=yes exporttree=yes special remote when the remote's + annex-tracking-branch was not the currently checked out branch. + * S3: Support a region= configuration useful for some non-Amazon S3 + implementations. This feature needs git-annex to be built with aws-0.24. + * view: New field?=glob and ?tag syntax that includes a directory "_" + in the view for files that do not have the specified metadata set. + * Added annex.viewunsetdirectory git config to change the name of the + "_" directory in a view. + * Changed the name of view branches to include the parent branch. + Existing view branches checked out using an old name will still work. + * sync: Avoid pushing view branches to remotes. + * sync: When run in a view branch, refresh the view branch to reflect any + changes that have been made to the parent branch or metadata. + * sync: When run in a view branch, avoid updating synced/ branches, + or trying to merge anything from remotes. + * Support http urls that contain ":" that is not followed by a port + number, the same as git does. + * sync: Warn when the adjusted basis ref cannot be found, as happens eg when + the user has renamed branches. + * Sped up view branch construction by 50%. + * info, enableremotemote, renameremote: Avoid a confusing message when more + than one repository matches the user provided name. + * info: Exit nonzero when the input is not supported. + +- Apply "0001-persistent-2.12.0.1-include-the-code-from-persistent.patch" + to avoid depending on the obsolete persistent-templates package. + +------------------------------------------------------------------- Old: ---- git-annex-10.20230126.tar.gz New: ---- 0001-persistent-2.12.0.1-include-the-code-from-persistent.patch git-annex-10.20230329.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-annex.spec ++++++ --- /var/tmp/diff_new_pack.4BALGt/_old 2023-04-04 21:25:43.506999848 +0200 +++ /var/tmp/diff_new_pack.4BALGt/_new 2023-04-04 21:25:43.514999893 +0200 @@ -17,113 +17,209 @@ Name: git-annex -Version: 10.20230126 +Version: 10.20230329 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/opensuse-haskell/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: 0001-persistent-2.12.0.1-include-the-code-from-persistent.patch BuildRequires: bash-completion BuildRequires: chrpath BuildRequires: curl BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-Cabal-prof BuildRequires: ghc-DAV-devel +BuildRequires: ghc-DAV-prof BuildRequires: ghc-IfElse-devel +BuildRequires: ghc-IfElse-prof BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-SafeSemaphore-devel +BuildRequires: ghc-SafeSemaphore-prof BuildRequires: ghc-aeson-devel +BuildRequires: ghc-aeson-prof BuildRequires: ghc-ansi-terminal-devel +BuildRequires: ghc-ansi-terminal-prof BuildRequires: ghc-async-devel +BuildRequires: ghc-async-prof BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-attoparsec-prof BuildRequires: ghc-aws-devel +BuildRequires: ghc-aws-prof +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-blaze-builder-devel +BuildRequires: ghc-blaze-builder-prof BuildRequires: ghc-bloomfilter-devel +BuildRequires: ghc-bloomfilter-prof BuildRequires: ghc-byteable-devel +BuildRequires: ghc-byteable-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-case-insensitive-prof BuildRequires: ghc-clientsession-devel +BuildRequires: ghc-clientsession-prof BuildRequires: ghc-concurrent-output-devel +BuildRequires: ghc-concurrent-output-prof BuildRequires: ghc-conduit-devel +BuildRequires: ghc-conduit-prof BuildRequires: ghc-connection-devel +BuildRequires: ghc-connection-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-cryptonite-devel +BuildRequires: ghc-cryptonite-prof BuildRequires: ghc-data-default-devel +BuildRequires: ghc-data-default-prof BuildRequires: ghc-dbus-devel +BuildRequires: ghc-dbus-prof BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-directory-devel +BuildRequires: ghc-directory-prof BuildRequires: ghc-disk-free-space-devel +BuildRequires: ghc-disk-free-space-prof BuildRequires: ghc-dlist-devel +BuildRequires: ghc-dlist-prof BuildRequires: ghc-edit-distance-devel +BuildRequires: ghc-edit-distance-prof BuildRequires: ghc-exceptions-devel +BuildRequires: ghc-exceptions-prof BuildRequires: ghc-fdo-notify-devel +BuildRequires: ghc-fdo-notify-prof BuildRequires: ghc-feed-devel +BuildRequires: ghc-feed-prof BuildRequires: ghc-filepath-bytestring-devel +BuildRequires: ghc-filepath-bytestring-prof BuildRequires: ghc-filepath-devel +BuildRequires: ghc-filepath-prof BuildRequires: ghc-free-devel -BuildRequires: ghc-git-lfs-devel +BuildRequires: ghc-free-prof BuildRequires: ghc-hinotify-devel +BuildRequires: ghc-hinotify-prof BuildRequires: ghc-http-client-devel +BuildRequires: ghc-http-client-prof BuildRequires: ghc-http-client-restricted-devel +BuildRequires: ghc-http-client-restricted-prof BuildRequires: ghc-http-client-tls-devel +BuildRequires: ghc-http-client-tls-prof BuildRequires: ghc-http-conduit-devel +BuildRequires: ghc-http-conduit-prof BuildRequires: ghc-http-types-devel +BuildRequires: ghc-http-types-prof BuildRequires: ghc-magic-devel +BuildRequires: ghc-magic-prof BuildRequires: ghc-memory-devel +BuildRequires: ghc-memory-prof BuildRequires: ghc-microlens-devel +BuildRequires: ghc-microlens-prof BuildRequires: ghc-monad-control-devel +BuildRequires: ghc-monad-control-prof BuildRequires: ghc-monad-logger-devel +BuildRequires: ghc-monad-logger-prof BuildRequires: ghc-mountpoints-devel +BuildRequires: ghc-mountpoints-prof BuildRequires: ghc-mtl-devel +BuildRequires: ghc-mtl-prof BuildRequires: ghc-network-bsd-devel +BuildRequires: ghc-network-bsd-prof BuildRequires: ghc-network-devel BuildRequires: ghc-network-info-devel +BuildRequires: ghc-network-info-prof BuildRequires: ghc-network-multicast-devel +BuildRequires: ghc-network-multicast-prof +BuildRequires: ghc-network-prof BuildRequires: ghc-network-uri-devel +BuildRequires: ghc-network-uri-prof BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-old-locale-prof BuildRequires: ghc-optparse-applicative-devel +BuildRequires: ghc-optparse-applicative-prof BuildRequires: ghc-path-pieces-devel +BuildRequires: ghc-path-pieces-prof BuildRequires: ghc-persistent-devel +BuildRequires: ghc-persistent-prof BuildRequires: ghc-persistent-sqlite-devel -BuildRequires: ghc-persistent-template-devel +BuildRequires: ghc-persistent-sqlite-prof BuildRequires: ghc-process-devel +BuildRequires: ghc-process-prof BuildRequires: ghc-random-devel +BuildRequires: ghc-random-prof BuildRequires: ghc-regex-tdfa-devel +BuildRequires: ghc-regex-tdfa-prof BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-resourcet-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-sandi-devel +BuildRequires: ghc-sandi-prof BuildRequires: ghc-securemem-devel +BuildRequires: ghc-securemem-prof BuildRequires: ghc-shakespeare-devel +BuildRequires: ghc-shakespeare-prof BuildRequires: ghc-socks-devel +BuildRequires: ghc-socks-prof BuildRequires: ghc-split-devel +BuildRequires: ghc-split-prof BuildRequires: ghc-stm-chans-devel +BuildRequires: ghc-stm-chans-prof BuildRequires: ghc-stm-devel +BuildRequires: ghc-stm-prof BuildRequires: ghc-tagsoup-devel +BuildRequires: ghc-tagsoup-prof BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-hunit-prof +BuildRequires: ghc-tasty-prof BuildRequires: ghc-tasty-quickcheck-devel +BuildRequires: ghc-tasty-quickcheck-prof BuildRequires: ghc-tasty-rerun-devel +BuildRequires: ghc-tasty-rerun-prof BuildRequires: ghc-template-haskell-devel +BuildRequires: ghc-template-haskell-prof BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof BuildRequires: ghc-time-devel +BuildRequires: ghc-time-prof BuildRequires: ghc-torrent-devel +BuildRequires: ghc-torrent-prof BuildRequires: ghc-transformers-devel +BuildRequires: ghc-transformers-prof BuildRequires: ghc-unix-compat-devel +BuildRequires: ghc-unix-compat-prof BuildRequires: ghc-unix-devel +BuildRequires: ghc-unix-prof BuildRequires: ghc-unliftio-core-devel +BuildRequires: ghc-unliftio-core-prof BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-utf8-string-devel +BuildRequires: ghc-utf8-string-prof BuildRequires: ghc-uuid-devel +BuildRequires: ghc-uuid-prof BuildRequires: ghc-vector-devel +BuildRequires: ghc-vector-prof BuildRequires: ghc-wai-devel BuildRequires: ghc-wai-extra-devel +BuildRequires: ghc-wai-extra-prof +BuildRequires: ghc-wai-prof BuildRequires: ghc-warp-devel +BuildRequires: ghc-warp-prof BuildRequires: ghc-warp-tls-devel +BuildRequires: ghc-warp-tls-prof BuildRequires: ghc-yesod-core-devel +BuildRequires: ghc-yesod-core-prof BuildRequires: ghc-yesod-devel BuildRequires: ghc-yesod-form-devel +BuildRequires: ghc-yesod-form-prof +BuildRequires: ghc-yesod-prof BuildRequires: ghc-yesod-static-devel +BuildRequires: ghc-yesod-static-prof BuildRequires: git-core BuildRequires: gpg2 BuildRequires: lsof @@ -168,7 +264,7 @@ Optional dependency offering bash completion for git-annex %prep -%autosetup +%autosetup -p1 %build %define cabal_configure_options -ftestsuite ++++++ 0001-persistent-2.12.0.1-include-the-code-from-persistent.patch ++++++ >From 924aab1061129a9ed1b158c5df874bf13c5d44fc Mon Sep 17 00:00:00 2001 From: Peter Simons <sim...@cryp.to> Date: Thu, 30 Mar 2023 09:35:58 +0200 Subject: [PATCH] persistent >= 2.12.0.1 include the code from persistent-template persistent-template has been deprecated. --- Database/ContentIdentifier.hs | 3 --- Database/Export.hs | 3 --- Database/Fsck.hs | 3 --- Database/Keys/SQL.hs | 3 --- git-annex.cabal | 3 +-- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs index aa595a98c..7d868438d 100644 --- a/Database/ContentIdentifier.hs +++ b/Database/ContentIdentifier.hs @@ -5,17 +5,14 @@ - Licensed under the GNU AGPL version 3 or higher. -} -{-# LANGUAGE CPP #-} {-# LANGUAGE QuasiQuotes, TypeFamilies, 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.ContentIdentifier ( ContentIdentifierHandle, diff --git a/Database/Export.hs b/Database/Export.hs index b5c58afd0..346cffbef 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, 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 61e932e3d..0bb7b7b29 100644 --- a/Database/Fsck.hs +++ b/Database/Fsck.hs @@ -5,17 +5,14 @@ - Licensed under the GNU AGPL version 3 or higher. -} -{-# LANGUAGE CPP #-} {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} {-# LANGUAGE DataKinds, FlexibleInstances #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE UndecidableInstances #-} -#if MIN_VERSION_persistent_template(2,8,0) {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE StandaloneDeriving #-} -#endif module Database.Fsck ( FsckHandle, diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs index c97a4280b..55666c597 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, 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 65f10351c..f656e7e91 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -347,8 +347,7 @@ Executable git-annex time (>= 1.5.0), old-locale, persistent-sqlite (>= 2.8.1), - persistent (>= 2.8.1), - persistent-template, + persistent (>= 2.12.0.2), unliftio-core, microlens, aeson, -- 2.39.2 ++++++ git-annex-10.20230126.tar.gz -> git-annex-10.20230329.tar.gz ++++++ /work/SRC/openSUSE:Factory/git-annex/git-annex-10.20230126.tar.gz /work/SRC/openSUSE:Factory/.git-annex.new.19717/git-annex-10.20230329.tar.gz differ: char 13, line 1
