pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/git-annex
Module Name: pkgsrc
Committed By: pho
Date: Sun Nov 8 18:10:53 UTC 2026
Modified Files:
pkgsrc/sysutils/git-annex: Makefile distinfo options.mk
pkgsrc/sysutils/git-annex/patches: patch-git-annex.cabal
Removed Files:
pkgsrc/sysutils/git-annex/patches: patch-Utility_DirWatcher_Kqueue.hs
Log Message:
sysutils/git-annex: update to git-annex-10.20261026
git-annex (10.20261026) upstream; urgency=high
* This releases fixes a security hole that allowed private data
exfiltration from special remotes. (CVE-2026-112818)
https://git-annex.branchable.com/security/cross_repository_data_exfiltration_via_special_remote/
* verifyremote: New command, used to verify the configuration of special
remotes is safe.
* enableremote: Display configuration and prompt for verifyremote to be
run. Until it is verified, the special remote cannot be used,
and git pushes to all remotes will be prevented.
* When a special remote has been autoenabled, allow it to be used without
verification, but prevent sending annexed files or git pushes to any
remote until it is verified.
* After upgrading git-annex, existing special remotes will continue to work
as before. If a special remote could have been configured by a third
party, you should verify its configuration using the
`git-annex verifyremote` command.
* Changes to special remote configuration received in the git-annex
branch no longer take effect until git-annex verifyremote is run to
review and verify the new configuration.
* init: When run in an already initialized repository, avoid
autoenabling new special remotes, since files received from
them could leak out via other git-annex processes running in the
repository.
* init --autoenable: Refuse to perform probably unsafe action unless
forced.
* Added remote.name.annex-verified git config.
* git-annex.cabal: Added Memory build flag to support building with
older versions of crypton that don't use ram.
-- Joey Hess <id%joeyh.name@localhost> Mon, 26 Oct 2026 14:00:00 -0400
git-annex (10.20261020) upstream; urgency=medium
* adjust --hide-unwanted: New option to make an adjusted branch
containing only wanted files.
* push: Force push to remote git-annex branch when it has been
supersceded by a transition.
* Fix handling of --sameas special remotes with onlyencryptcreds=yes.
* Linux standalone builds bundled CA certs updated for
EMudhra Intermediate CA Compromise.
-- Joey Hess <id%joeyh.name@localhost> Tue, 20 Oct 2026 16:45:06 -0400
git-annex (10.20261006) upstream; urgency=medium
* Fix stack build.
-- Joey Hess <id%joeyh.name@localhost> Tue, 06 Oct 2026 10:06:34 -0400
git-annex (10.20261005) upstream; urgency=medium
* Fix mask special remote to not hang after the first file.
* Fix concurrent import of identical files to not fail with
"transfer already in progress".
* Also fixes possible data corruption when importing identical small files.
* Use git-credential in more situations when accessing urls that need a
password or other authentication, including the web, bittorrent and
httpalso special remotes, and git-annex addurl and importfeed.
* external: Fix DOWNLOAD-URL to support git-credential, which it
was already documented to do.
* external: Support git-credential in TRANSFER-RETRIEVE-URL,
CHECKPRESENT-URL, and RETRIEVEIMPORT-URL
* webdav: Fix a hang when credentials are not available.
(Reversion introduced in 10.20260901)
* export: Display a warning when the user is either in the middle
of an export conflict, or has been unsafely writing directly to a
remote that is configured with exporttree=yes but without
importtree=yes.
* importfeed: Avoid displaying empty feed titles.
* Allow retrieval from some importtree=yes special remotes when there
is no recorded content identifier.
* Automate updating remote.name.annexUrl for annex+https servers,
by re-probing the http remote's annex.url config when unable to connect
to an annex+https server.
* test, testremote: Support --tap output when built with TastyTap build
flag.
* testremote: Add --ensure-readonly mode.
* Support bup 0.34, while also still working with previous versions.
* When built with Botan, also use it for HMAC.
* NoLLMDependencies: Update for crypton.
* NoLLMDependencies: Update for tls.
* Support building with QuickCheck 2.17.
* Support building with crypton 1.1.0.
-- Joey Hess <id%joeyh.name@localhost> Mon, 05 Oct 2026 10:44:55 -0400
git-annex (10.20260901) upstream; urgency=medium
* Behavior change: drop --auto --from a remote does not any longer
try to drop content that is not known to be present on the remote.
This avoids unncessary work and makes it consistent with the behavior
of git-annex sync and push.
* External special remote protocol extended to support IMPORTKEY.
* git-annex-remote-internetarchive supports --no-content imports.
* diffdriver: Avoid crashing when git passes an (undocumented) 8th
parameter.
* The preferred content groupwanted expression will no longer
consider a groupwanted expression of "" to be set, which allows
another group's groupwanted expression to be used instead.
* Fixed buggy handling of preferred content
"balanced=groupname:lackingcopies"
* Expand preferred content "lackingcopies" and "approxlackingcopies"
expression syntax to support "groupname:number"
* Expand preferred content "copies", "lackingcopies", and
"approxlackingcopies" expression syntax to support group limits which
can include/exclude multiple groups. Eg
"copies=archive+backup-offsite=3"
* Also expanded --lackingcopies, --approxlackingcopies, and --copies
with the same syntax.
* Expand preferred content "balanced", "fullybalanced",
"sizebalanced" and "fullysizebalanced" expression syntax to support
group limits as well. Eg
"balanced=backup:lackingcopies=archive-offsite"
* importfeed: Fix reporting and logging of problems with feeds.
* importfeed: When adding an url, indicate which feed it is from.
* Fix reversion in 8.20200226 that broke git-annex benchmark --databases
* Remove the ParallelBuild cabal flag and add cabal.project that
enables parallel build by default with ghc 9.8+ and cabal-install 3.12.
* NoLLMDependencies: Update for warp and magic.
* git-annex.cabal: Pin magic to 1.1 avoiding build failure on Windows
with newer version.
* stack.yaml: Update to lts-24.52
-- Joey Hess <id%joeyh.name@localhost> Tue, 01 Sep 2026 11:25:45 -0400
git-annex (10.20260717) upstream; urgency=medium
* External special remote protocol extended to support import.
Developers of external special remotes should consider if import makes
sense for them and add support.
* Support importtree=yes with rsync special remotes.
* Added git-annex-remote-internetarchive special remote that imports an
Internet Archive item and serves as an example for how to easily write
importtree=yes external special remotes.
https://git-annex.branchable.com/tips/how_to_make_a_simple_importtree_special_remote/
* Added DOWNLOAD-URL extension to the external special remote protocol.
* git-annex is guaranteed to not contain LLM generated code,
and will attempt to remain buildable with versions of dependencies
that predate the addition of any LLM generated code.
See https://git-annex.branchable.com/no_llm_code/
* git-annex.cabal: Added NoLLMDependencies build flag.
* Added stack-NoLLMDependencies.yaml
* Avoid redundant hash verification after a hash verification fails.
* Fix build with time-1.15.
-- Joey Hess <id%joeyh.name@localhost> Mon, 20 Jul 2026 13:04:47 -0400
git-annex (10.20260624) upstream; urgency=medium
* Added Botan build flag, which speeds up checksumming significantly
for most existing hash backends.
* Added Blake3 build flag, which is the fastest available
cryptographically secure hash.
Thanks to edef for implementing this.
* When b3sum is in PATH, use it for faster blake3 hashing.
* Added XXH3 build flag, which is the fastest available
non-cryptographically secure hash, and is a smaller hash
than MD5 or SHA1.
* Improve handling of synced/master and similar branches, by
only creating such branches when necessary to push to a non-bare
remote, and by removing the local synced branch once its changes
are merged.
* put: New command.
* move: Fix bug where an interrupted command other than move could
be treated as an interrupted move, resulting in dropping content
when not allowed by numcopies.
* Fix build with http-types-0.12.5
* merge, post-receive: Fix bug that prevented merging any synced/
branches into the current branch.
(Reversion introduced in 10.20260601)
* git-annex.cabal: Remove unused dependency on old-locale.
* Remove dependencies on securemem and byteable.
-- Joey Hess <id%joeyh.name@localhost> Thu, 25 Jun 2026 12:28:43 -0400
git-annex (10.20260601) upstream; urgency=medium
* Avoid an error message displaying a password embedded in a git remote url.
(Reversion introduced in 10.20260421)
* Fix use of annex.commitmessage
(Reversion introduced in 10.20250115)
* disableremote: Avoid (temporarily) clearing size tracking information
for other repos than the one being disabled.
* Fix bug that prevented remote.name.annex-web-options from always taking
effect, and sometimes caused it to be used in situations where it
should not be.
* map: Don't try to use dot -Tx11 to display the map, that no longer
works in commonly available builds of graphviz.
* push: Avoid updating a view branch or adjusted branch.
* pull: Avoid propagating adjusted branch changes to the original branch.
* get, copy: Added --wanted option, which only transfers files
that are preferred content.
* fsck, drop, whereis: Support --failed option.
* Display an introduction before other debug output.
-- Joey Hess <id%joeyh.name@localhost> Mon, 01 Jun 2026 11:53:04 -0400
git-annex (10.20260525) upstream; urgency=medium
* Fix reversion introduced in 10.20260421 that caused commands
like git-annex copy to stop early due to SIGPIPE.
* p2phttp: Avoid hanging after HEAD request.
-- Joey Hess <id%joeyh.name@localhost> Tue, 26 May 2026 07:49:42 -0400
git-annex (10.20260520) upstream; urgency=medium
* Behavior change: git-annex sync now defaults to syncing content,
for consistency with push and pull. However, to avoid surprising
behavior, this only affects repositories that have preferred content
configured.
(Use --no-content or configure annex.synccontent to avoid this.)
* Behavior change to git-annex pull and push's handling of unwanted
files. While previously both commands dropped unwanted files from
both the remote and the local repository, now pull only drops unwanted
files from the local repository, and push only drops unwanted files
from the remote.
* info: Report the total size of unused keys found by the last run
of git-annex unused.
* push: When pushing to a bare git repository, display git push
progress before the display of pushed branches.
* push, pull, assist: Fix behavior of --content to override the
annex.synccontent configuration.
* Send git-annex (or other configured) User-Agent when connecting to
annex+http remotes.
* Support GIT_SSL_CAINFO, GIT_SSL_CAPATH, http.sslCAPath, and http.sslCAPath
when connecting to https servers.
* Linux standalone builds now bundle CA certs. They are used only when
the system does not have its own CA cert store.
* Linux standalone build supports using Fedora's CA cert store location.
-- Joey Hess <id%joeyh.name@localhost> Wed, 20 May 2026 09:16:07 -0400
git-annex (10.20260421) upstream; urgency=medium
* disableremote: New command.
* Fix annexUrl to inherit any password that is set in the remote url.
* Add DELEGATE extension to the external special remote protocol.
* Avoid dying of an exception when when stdout gets closed by eg head(1),
and avoid a crash loop when stderr is closed and git-annex dies of an
exception.
Fixes reversion introduced in version 10.20230407.
* Improve UUID sanitization.
* Deal with breaking changes to test concurrency in tasty-1.5.4.
-- Joey Hess <id%joeyh.name@localhost> Tue, 21 Apr 2026 14:39:56 -0400
git-annex (10.20260316) upstream; urgency=medium
* Added CHECKPRESENT-URL extension to the external special remote protocol.
* Fix reversion in previous version that caused auto-initializing of
local git remotes that have annex-ignore set.
* Fix bug that caused git credential to be rejected when a http request
failed for some reason other than 401.
* Importing from the directory special remote will no longer add sizes
to keys, which overrode backends that generate unsized keys.
* Fix retrival from http git remotes of keys with '%' in their names.
* Fix behavior when initremote is used with --sameas=
combined with --private.
* web, S3, git: Fix bugs in checking if content is present on a remote
when configuration does not allow accessing it.
* httpalso: Fix bugs in handling content not being present on the remote.
* adb: Avoid deleting contents of a non-empty directory when
removing the last exported file from the directory.
* Improve display of http exceptions.
-- Joey Hess <id%joeyh.name@localhost> Mon, 16 Mar 2026 06:53:22 -0400
git-annex (10.20260213) upstream; urgency=medium
* When used with git forges that allow Push to Create, the remote's
annex-uuid is re-probed after the initial push.
* addurl, importfeed: Enable --verifiable by default.
* fromkey, registerurl: When passed an url, generate a VURL key.
* unregisterurl: Unregister both VURL and URL keys.
* Fix behavior of local git remotes that have annex-ignore
set to be the same as ssh git remotes.
* Added annex.security.allow-insecure-https config, which allows
using old http servers that use TLS 1.2 without Extended Main
Secret support.
* p2phttp: Commit git-annex branch changes promptly.
* p2phttp: Fix a server stall by disabling warp's slowloris attack
prevention.
* p2phttp: Added --cpus option.
* Avoid ever starting more capabilities than the number of cpus.
* fsck: Support repairing a corrupted file in a versioned S3 remote.
* Fix incorrect transfer direction in remote transfer log when
downloading from a local git remote.
* Fix bug that prevented 2 clones of a local git remote
from concurrently downloading the same file.
* rsync: Avoid deleting contents of a non-empty directory when
removing the last exported file from the directory.
* unregisterurl: Fix display of action to not be "registerurl".
* The OsPath build flag requires file-io 0.2.0, which fixes several
issues.
* Remove deprecated commands direct, indirect, proxy, and transferkeys.
* Deprecate undo command.
* Remove undo action from kde and nautilus integrations.
* Fix build on BSDs. Thanks, Greg Steuck
-- Joey Hess <id%joeyh.name@localhost> Fri, 13 Feb 2026 12:53:48 -0400
git-annex (10.20260115) upstream; urgency=medium
* New git configs annex.initwanted, annex.initrequired, and
annex.initgroups.
* Fix bug that could result in a tree imported from a remote containing
missing git blobs.
* fix: Populate unlocked pointer files in situations where a git command,
like git reset or git stash, leaves them unpopulated.
* Pass www-authenticate headers in to to git credential, to support
eg, git-credential-oauth.
* import: Fix display of some import errors.
* external: Respond to GETGITREMOTENAME during INITREMOTE with the remote
name.
* When displaying sqlite error messages, include the path to the database.
* webapp: Remove support for local pairing; use wormhole pairing instead.
* git-annex.cabal: Removed pairing build flag, and no longer depends
on network-multicast or network-info.
* Remove support for building with old versions of persistent and
persistent-sqlite.
* Removed support for building with ghc older than 9.6.6.
* stack.yaml: Update to lts-24.26.
-- Joey Hess <id%joeyh.name@localhost> Fri, 16 Jan 2026 11:09:14 -0400
git-annex (10.20251215) upstream; urgency=medium
* Added annex.trashbin configuration.
* Added --presentsince, --lackingsince, and --changedsince file
matching options.
* Added TRANSFER-RETRIEVE-URL extension to the external special remote
protocol.
* S3: Remote can be configured with an x-amz-tagging header.
(Needs aws-0.25)
* S3: Support Google Cloud Storage
(Needs aws-0.25.1)
* S3: Support restore=yes, when used with storageclass=DEEP_ARCHIVE and
similar. This is equivilant to the now deprecated Amazon Glacier.
(Needs aws-0.25.2)
* Add a build warning when the version of aws being built against is
too old to support all features.
* stack.yaml: Use aws-0.25.2.
-- Joey Hess <id%joeyh.name@localhost> Mon, 15 Dec 2025 13:23:29 -0400
git-annex (10.20251114) upstream; urgency=medium
* p2p --pair: Fix to work with external P2P networks.
* p2phttp: Significant robustness fixes for bugs that caused the
server to stall.
* p2phttp: Fix a file descriptor leak.
* p2phttp: Added the --lockedfiles option.
* dropunused: Run the annex.secure-erase-command
(or .git/hooks/secure-erase-annex) when deleting
temp and bad object files.
* remotedaemon: Avoid crashing when run with --debug.
-- Joey Hess <id%joeyh.name@localhost> Fri, 14 Nov 2025 12:46:45 -0400
git-annex (10.20251029) upstream; urgency=medium
* Support ssh remotes with '#' and '?' in the path to the repository,
the same way git does.
* assistant: Fix reversion that caused files to be added locked by
default.
-- Joey Hess <id%joeyh.name@localhost> Wed, 29 Oct 2025 10:04:43 -0400
git-annex (10.20250929) upstream; urgency=medium
* enableremote: Allow type= to be provided when it does not change the
type of the special remote.
* importfeed: Fix encoding issues parsing feeds when built with OsPath.
* Fix build with ghc 9.0.2.
* Remove the Servant build flag; always build with support for
annex+http urls and git-annex p2phttp.
-- Joey Hess <id%joeyh.name@localhost> Mon, 29 Sep 2025 11:28:09 -0400
git-annex (10.20250925) upstream; urgency=medium
* Fix bug that made changes to a special remote sometimes be missed when
importing a tree from it. After upgrading, any such missed changes
will be included in the next tree imported from a special remote.
Fixes reversion introduced in version 10.20230626.
* Fix crash operating on filenames that are exactly 21 bytes long
and begin with a utf-8 character.
* Fix hang that could occur when using git-annex adjust on a branch with
a number of files greater than annex.queuesize.
* Fix bug that could cause an invalid utf-8 sequence to be used in a
temporary filename when the input filename was valid utf-8.
* Improve performance when used with a local git remote that has a
large working tree.
* drop: --fast support when dropping from a remote.
* Added annex.assistant.allowunlocked config.
* Add git-remote-p2p-annex and git-remote-tor-annex to standalone builds.
* enableremote: Disallow using type= to attempt to change the type of an
existing remote.
* Add build warnings when git-annex is built without the OsPath
build flag.
* version: Report on whether it was built with the OsPath build flag.
* Avoid leaking file descriptors to child processes started by git-annex
in some situations. Note that when not built with the OsPath build
flag, these leaks can still happen.
* git-annex.cabal: Turn on the OsPath build flag by default.
* p2phttp: Fix a hang that could occur when used with --directory,
and a repository in the directory got removed.
* Removed support for building with unmaintained cryptonite, use crypton.
-- Joey Hess <id%joeyh.name@localhost> Thu, 25 Sep 2025 13:20:38 -0400
git-annex (10.20250828) upstream; urgency=medium
* p2p: Added --enable option, which can be used to enable P2P networks
provided by external commands git-annex-p2p-<netname>
* Added git-remote-p2p-annex, which allows git pull and push to
P2P networks provided by commands git-annex-p2p-<netname>
* S3: Default to signature=v4 when using an AWS endpoint, since some
AWS regions need v4 and all support it. When host= is used to specify
a different S3 host, the default remains signature=v2.
* webapp: Support setting up S3 buckets in regions that need v4
signatures.
* S3: When initremote is given the name of a bucket that already exists,
automatically set datacenter to the right value, rather than needing it
to be explicitly set.
* info: Added --show option to pick which parts of the info to calculate
and display.
* Improve behavior when there are special remotes configured with
autoenable=yes with names that conflict with other remotes.
* adjust: When another branch has been manually merged into the adjusted
branch, re-adjusting errors out, rather than losing that merge commit.
* sync: When another branch has been manually merged into an adjusted
branch, error out rather than only displaying a warning.
* initremote: New onlyencryptcreds=yes which can be used along with
embedcreds=yes, to only encrypt the embedded creds, without encrypting
the content of the special remote. Useful for exporttree/importtree
remotes.
* Don't allow the type of encryption of an existing special remote to be
changed. Fixes reversion introduced in version 7.20191230.
* tahoe: Support tahoe-lafs command versions newer than 1.16.
* tahoe: Fix bug that made initremote require an encryption= parameter,
despite git-annex encryption not being used with this special remote.
Fixes reversion introduced in version 7.20191230.
* Improved error message when yt-dlp is not installed and is needed to
get a file from the web.
* The annex.youtube-dl-command git config is no longer used, git-annex
always runs the yt-dlp command, rather than the old youtube-dl command.
* Removed support for git versions older than 2.22.
* Bump aws build dependency to 0.24.1.
* stack.yaml: Update to lts-24.2.
-- Joey Hess <id%joeyh.name@localhost> Fri, 29 Aug 2025 11:42:37 -0400
git-annex (10.20250721) upstream; urgency=medium
* Improved workaround for git 2.50 bug, avoding an occasional test suite
failure, as well as some situations where an unlocked file did not get
populated when adding another file to the repository with the same
content.
* Add --url option and url= preferred content expression, to match
content that is recorded as present in an url.
* p2phttp: Scan multilevel directories with --directory.
* p2phttp: Added --socket option.
* Fix bug in handling of linked worktrees on filesystems not supporting
symlinks, that caused annexed file content to be stored in the wrong
location inside the git directory, and also caused pointer files to not
get populated.
* fsck: Fix location of annexed files when run in linked worktrees
that have experienced the above bug.
* Fix symlinks generated to annexed content when in adjusted unlocked
branch in a linked worktree on a filesystem not supporting symlinks.
-- Joey Hess <id%joeyh.name@localhost> Tue, 22 Jul 2025 14:11:26 -0400
git-annex (10.20250630) upstream; urgency=medium
* Work around git 2.50 bug that caused it to crash when there is a merge
conflict with an unlocked annexed file.
* Skip and warn when a tree import includes empty filenames,
which can happen with eg a S3 bucket.
* Avoid a problem with temp file names ending in whitespace on
filesystems like VFAT that don't support such filenames.
* webapp: Rename "Upgrade Repository" to "Convert Repository"
to avoid confusion with git-annex upgrade.
-- Joey Hess <id%joeyh.name@localhost> Mon, 30 Jun 2025 10:05:18 -0400
git-annex (10.20250605) upstream; urgency=medium
* sync: Push the current branch first, rather than a synced branch,
to better support git forges (gitlab, gitea, forgejo, etc.) which
use push-to-create with the first pushed branch becoming the default
branch.
* Added annex.fastcopy and remote.name.annex-fastcopy config setting.
When set, this allows the copy_file_range syscall to be used, which
can eg allow for server-side copies on NFS. (For fastest copying,
also disable annex.verify or remote.name.annex-verify.)
* map: Support --json option.
* map: Improve display of remote names.
* When annex.freezecontent-command or annex.thawcontent-command is
configured but fails, prevent initialization. This allows the user to
fix their configuration and avoid crippled filesystem detection
entering an adjusted branch.
* assistant: Avoid hanging at startup when a process has a *.lock file
open in the .git directory.
* Windows: Fix duplicate file bug that could occur when files were
supposed to be moved across devices.
-- Joey Hess <id%joeyh.name@localhost> Thu, 05 Jun 2025 14:10:36 -0400
git-annex (10.20250520) upstream; urgency=medium
* Preferred content now supports "balanced=groupname:lackingcopies"
to make files be evenly balanced amoung as many repositories as are
needed to satisfy numcopies.
* map: Fix buggy handling of remotes that are bare git repositories
accessed via ssh.
* map: Avoid looping forever with mutually recursive paths between
repositories accessed via ssh.
* whereused: Fix bug that could find matches from grafts
in remote git-annex branches.
* Windows: Fix bug that can cause git status to show annexed files as
modified when built with OsPath.
-- Joey Hess <id%joeyh.name@localhost> Tue, 20 May 2025 10:25:47 -0400
git-annex (10.20250416) upstream; urgency=medium
* Added the mask special remote.
* updatecluster, updateproxy: When a remote that has no annex-uuid is
configured as annex-cluster-node, warn and avoid writing bad data to
the git-annex branch.
* Fix build without the assistant.
* fsck: Avoid complaining about required content of dead repositories.
* drop: Avoid redundant object directory thawing.
* httpalso: Windows url fix.
* Added remote.name.annex-web-options config, which is a per-remote
version of the annex.web-options config.
* migrate: Fix --remove-size to work when a file is not present.
Fixes reversion introduced in version 10.20231129.
* Support git remotes that use a IPV6 link-local address with a zone ID.
* Support git remotes that use an url with a user name that is URL
encoded, or in the case of an "scp-style" url, a user name that must be
encoded to be legal in an URL.
* Fix git-lfs special remote ssh endpoint discovery when the repository
path is URL encoded.
-- Joey Hess <id%joeyh.name@localhost> Wed, 16 Apr 2025 13:34:40 -0400
git-annex (10.20250320) upstream; urgency=medium
* Added the compute special remote.
* addcomputed: New command, adds a file that is generated by a compute
special remote.
* recompute: New command, recomputes computed files.
* findcomputed: New command, displays information about computed files.
* Support help.autocorrect settings "prompt", "never", and "immediate".
* Allow setting remote.foo.annex-tracking-branch to a branch name
that contains "/", as long as it's not a remote tracking branch.
* Added OsPath build flag, which speeds up git-annex's operations on files.
* git-lfs: Added an optional apiurl parameter.
(This needs version 1.2.5 of the haskell git-lfs library to be used.)
* fsck: Remember the files that are checked, so a later run with --more
will skip them, without needing to use --incremental.
-- Joey Hess <id%joeyh.name@localhost> Thu, 20 Mar 2025 13:10:48 -0400
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/git-annex/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/git-annex/distinfo \
pkgsrc/sysutils/git-annex/options.mk
cvs rdiff -u -r1.1 -r0 \
pkgsrc/sysutils/git-annex/patches/patch-Utility_DirWatcher_Kqueue.hs
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/git-annex/Makefile
diff -u pkgsrc/sysutils/git-annex/Makefile:1.17 pkgsrc/sysutils/git-annex/Makefile:1.18
--- pkgsrc/sysutils/git-annex/Makefile:1.17 Wed Jan 7 08:48:51 2026
+++ pkgsrc/sysutils/git-annex/Makefile Sun Nov 8 18:10:53 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2026/01/07 08:48:51 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2026/11/08 18:10:53 pho Exp $
-DISTNAME= git-annex-10.20250115
-PKGNAME= ${DISTNAME}
-PKGREVISION= 6
+DISTNAME= git-annex-10.20261026
+PKGNAME= ${DISTNAME:tl}
CATEGORIES= sysutils
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -18,6 +17,9 @@ DEPENDS+= git-base-[0-9]*:../../devel/gi
HASKELL_ENABLE_DYNAMIC_EXECUTABLE= no
.include "options.mk"
+.include "../../mk/bsd.fast.prefs.mk"
+
+CONFIGURE_ARGS+= -f -TastyTap
# Setup dependencies
.include "../../devel/hs-split/buildlink3.mk"
@@ -25,20 +27,6 @@ HASKELL_ENABLE_DYNAMIC_EXECUTABLE= no
.include "../../devel/hs-async/buildlink3.mk"
.include "../../devel/hs-utf8-string/buildlink3.mk"
-# Optional dependencies that we always enable
-CONFIGURE_ARGS+= -f Pairing
-.include "../../net/hs-network-multicast/buildlink3.mk"
-.include "../../net/hs-network-info/buildlink3.mk"
-
-CONFIGURE_ARGS+= -f TorrentParser
-.include "../../net/hs-torrent/buildlink3.mk"
-
-CONFIGURE_ARGS+= -f MagicMime
-.include "../../misc/hs-magic/buildlink3.mk"
-
-CONFIGURE_ARGS+= -f Benchmark
-.include "../../benchmarks/hs-criterion/buildlink3.mk"
-
# Mandatory runtime dependencies
.include "../../net/hs-network-uri/buildlink3.mk"
.include "../../devel/hs-optparse-applicative/application.mk"
@@ -51,7 +39,6 @@ CONFIGURE_ARGS+= -f Benchmark
.include "../../devel/hs-safesemaphore/buildlink3.mk"
.include "../../devel/hs-async/buildlink3.mk"
.include "../../sysutils/hs-disk-free-space/buildlink3.mk"
-.include "../../sysutils/hs-filepath-bytestring/buildlink3.mk"
.include "../../devel/hs-ifelse/buildlink3.mk"
.include "../../devel/hs-monad-logger/buildlink3.mk"
.include "../../math/hs-free/buildlink3.mk"
@@ -67,9 +54,7 @@ CONFIGURE_ARGS+= -f Benchmark
.include "../../www/hs-http-conduit/buildlink3.mk"
.include "../../www/hs-http-client-restricted/buildlink3.mk"
.include "../../devel/hs-conduit/buildlink3.mk"
-.include "../../devel/hs-old-locale/buildlink3.mk"
.include "../../databases/hs-persistent-sqlite/buildlink3.mk"
-.include "../../devel/hs-persistent/buildlink3.mk"
.include "../../devel/hs-persistent-template/buildlink3.mk"
.include "../../devel/hs-unliftio-core/buildlink3.mk"
.include "../../devel/hs-microlens/buildlink3.mk"
@@ -80,11 +65,8 @@ CONFIGURE_ARGS+= -f Benchmark
.include "../../www/hs-feed/buildlink3.mk"
.include "../../textproc/hs-regex-tdfa/buildlink3.mk"
.include "../../net/hs-socks/buildlink3.mk"
-.include "../../devel/hs-byteable/buildlink3.mk"
.include "../../devel/hs-stm-chans/buildlink3.mk"
-.include "../../security/hs-securemem/buildlink3.mk"
.include "../../security/hs-crypto-api/buildlink3.mk"
-.include "../../devel/hs-memory/buildlink3.mk"
.include "../../devel/hs-split/buildlink3.mk"
.include "../../textproc/hs-attoparsec/buildlink3.mk"
.include "../../devel/hs-concurrent-output/buildlink3.mk"
@@ -95,12 +77,39 @@ CONFIGURE_ARGS+= -f Benchmark
.include "../../devel/hs-tasty-quickcheck/buildlink3.mk"
.include "../../devel/hs-tasty-rerun/buildlink3.mk"
.include "../../devel/hs-ansi-terminal/buildlink3.mk"
-.include "../../net/hs-aws/buildlink3.mk"
.include "../../www/hs-dav/buildlink3.mk"
.include "../../net/hs-network/buildlink3.mk"
.include "../../net/hs-network-bsd/buildlink3.mk"
.include "../../devel/hs-git-lfs/buildlink3.mk"
.include "../../time/hs-clock/buildlink3.mk"
+.include "../../www/hs-servant/buildlink3.mk"
+.include "../../www/hs-servant-server/buildlink3.mk"
+.include "../../www/hs-servant-client/buildlink3.mk"
+.include "../../www/hs-servant-client-core/buildlink3.mk"
+.include "../../www/hs-warp/buildlink3.mk"
+.include "../../www/hs-warp-tls/buildlink3.mk"
+.include "../../net/hs-crypton-connection/buildlink3.mk"
+.include "../../security/hs-crypton-x509-store/buildlink3.mk"
+.include "../../net/hs-aws/buildlink3.mk"
+.include "../../devel/hs-persistent/buildlink3.mk"
.include "../../security/hs-crypton/buildlink3.mk"
+.include "../../security/hs-tls/buildlink3.mk"
+.include "../../devel/hs-memory/buildlink3.mk"
+.include "../../devel/hs-file-io/buildlink3.mk"
+.if ${MACHINE_ARCH} != "aarch64" && empty(MACHINE_ARCH:M*arm*)
+. include "../../security/hs-blake3/buildlink3.mk"
+.endif
+.include "../../net/hs-torrent/buildlink3.mk"
+.include "../../misc/hs-magic/buildlink3.mk"
+.include "../../benchmarks/hs-criterion/buildlink3.mk"
+.if ${OPSYS} == "Linux"
+. include "../../devel/hs-hinotify/buildlink3.mk"
+.elif ${OPSYS} == "Darwin"
+. include "../../devel/hs-hfsevents/buildlink3.mk"
+.endif
+.include "../../net/hs-torrent/buildlink3.mk"
+.include "../../misc/hs-magic/buildlink3.mk"
+.include "../../benchmarks/hs-criterion/buildlink3.mk"
+
.include "../../mk/haskell.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/git-annex/distinfo
diff -u pkgsrc/sysutils/git-annex/distinfo:1.3 pkgsrc/sysutils/git-annex/distinfo:1.4
--- pkgsrc/sysutils/git-annex/distinfo:1.3 Sun Feb 2 04:31:03 2025
+++ pkgsrc/sysutils/git-annex/distinfo Sun Nov 8 18:10:53 2026
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2025/02/02 04:31:03 pho Exp $
+$NetBSD: distinfo,v 1.4 2026/11/08 18:10:53 pho Exp $
-BLAKE2s (git-annex-10.20250115.tar.gz) = 2fe2666743941dfb881db34b23d0e8e5e858e142c693a9ba7e23291b4581a592
-SHA512 (git-annex-10.20250115.tar.gz) = 11d59302d71ab659bcd2208096f2f06f6834e2ab5a258340de23b03bee2071c6cacef347dd54068e3a029ced82eae03c36d095d116398a1166f3439fd91da051
-Size (git-annex-10.20250115.tar.gz) = 1533006 bytes
-SHA1 (patch-Utility_DirWatcher_Kqueue.hs) = d4ef7908d32b9396cb3f5661f78f7d7176ab6e47
-SHA1 (patch-git-annex.cabal) = 9dee8b00cb531d31a8a54c5fbb25f5242ab813a6
+BLAKE2s (git-annex-10.20261026.tar.gz) = 744713fb627be999e576df7a3765c4b88d740e4b9ed5bacb254ba4be2bfd9206
+SHA512 (git-annex-10.20261026.tar.gz) = 5c3fd591af36ad4d92ebb189af9f4e2e654ead515f7266a49148000ee4057551bc92bd8b65bed6038345d464a31d9ff4f100ac7eed46824ba50748038fbd4e30
+Size (git-annex-10.20261026.tar.gz) = 1600097 bytes
+SHA1 (patch-git-annex.cabal) = 58aba342fb5fc52bc729c2f90971388e6eb16a67
Index: pkgsrc/sysutils/git-annex/options.mk
diff -u pkgsrc/sysutils/git-annex/options.mk:1.3 pkgsrc/sysutils/git-annex/options.mk:1.4
--- pkgsrc/sysutils/git-annex/options.mk:1.3 Sun Feb 2 04:31:03 2025
+++ pkgsrc/sysutils/git-annex/options.mk Sun Nov 8 18:10:53 2026
@@ -1,53 +1,16 @@
-# $NetBSD: options.mk,v 1.3 2025/02/02 04:31:03 pho Exp $
+# $NetBSD: options.mk,v 1.4 2026/11/08 18:10:53 pho Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.git-annex
-PKG_SUPPORTED_OPTIONS= ${PKG_SUGGESTED_OPTIONS} debug
-PKG_SUGGESTED_OPTIONS= dbus git-annex-servant git-annex-assistant
+PKG_SUPPORTED_OPTIONS= dbus debug
+PKG_SUGGESTED_OPTIONS= dbus
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-###
-### Enable seravnt, enabling using annex+http urls and git-annex p2phttp
-###
-.if ${PKG_OPTIONS:Mgit-annex-servant}
-CONFIGURE_ARGS+= -f +Servant
-. include "../../www/hs-servant/buildlink3.mk"
-. include "../../www/hs-servant-server/buildlink3.mk"
-. include "../../www/hs-servant-client/buildlink3.mk"
-. include "../../www/hs-servant-client-core/buildlink3.mk"
-. include "../../www/hs-warp/buildlink3.mk"
-. include "../../www/hs-warp-tls/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= -f -Servant
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "SunOS"
+PKG_SUPPORTED_OPTIONS+= git-annex-assistant
+PKG_SUGGESTED_OPTIONS+= git-annex-assistant
.endif
-###
-### Enable git-annex assistant, webapp, and watch command
-###
-.if ${PKG_OPTIONS:Mgit-annex-assistant}
-CONFIGURE_ARGS+= -f +assistant
-. include "../../sysutils/hs-mountpoints/buildlink3.mk"
-. include "../../www/hs-yesod/buildlink3.mk"
-. include "../../www/hs-yesod-static/buildlink3.mk"
-. include "../../www/hs-yesod-form/buildlink3.mk"
-. include "../../www/hs-yesod-core/buildlink3.mk"
-. include "../../www/hs-path-pieces/buildlink3.mk"
-. include "../../www/hs-warp/buildlink3.mk"
-. include "../../www/hs-warp-tls/buildlink3.mk"
-. include "../../www/hs-wai/buildlink3.mk"
-. include "../../www/hs-wai-extra/buildlink3.mk"
-. include "../../devel/hs-blaze-builder/buildlink3.mk"
-. include "../../www/hs-clientsession/buildlink3.mk"
-. include "../../textproc/hs-shakespeare/buildlink3.mk"
-. if ${OPSYS} == "Linux"
-. include "../../devel/hs-hinotify/buildlink3.mk"
-. elif ${OPSYS} == "Darwin"
-. include "../../devel/hs-hfsevents/buildlink3.mk"
-. endif
-.else
-CONFIGURE_ARGS+= -f -assistant
-.endif
+.include "../../mk/bsd.options.mk"
###
### Enable D-Bus and desktop notification support
@@ -68,3 +31,23 @@ CONFIGURE_ARGS+= -f +DebugLocks
.else
CONFIGURE_ARGS+= -f -DebugLocks
.endif
+
+###
+### Enable git-annex assistant, webapp, and watch command
+###
+.if ${PKG_OPTIONS:Mgit-annex-assistant}
+CONFIGURE_ARGS+= -f +assistant
+. include "../../sysutils/hs-mountpoints/buildlink3.mk"
+. include "../../www/hs-path-pieces/buildlink3.mk"
+. include "../../www/hs-wai/buildlink3.mk"
+. include "../../www/hs-wai-extra/buildlink3.mk"
+. include "../../devel/hs-blaze-builder/buildlink3.mk"
+. include "../../www/hs-clientsession/buildlink3.mk"
+. include "../../textproc/hs-shakespeare/buildlink3.mk"
+. include "../../www/hs-yesod/buildlink3.mk"
+. include "../../www/hs-yesod-static/buildlink3.mk"
+. include "../../www/hs-yesod-form/buildlink3.mk"
+. include "../../www/hs-yesod-core/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= -f -assistant
+.endif
Index: pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal
diff -u pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal:1.2 pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal:1.3
--- pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal:1.2 Sun Feb 2 04:31:03 2025
+++ pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal Sun Nov 8 18:10:53 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-git-annex.cabal,v 1.2 2025/02/02 04:31:03 pho Exp $
+$NetBSD: patch-git-annex.cabal,v 1.3 2026/11/08 18:10:53 pho Exp $
Hunk #0:
Remove -O or -j options. In pkgsrc we handle it via mk/haskell.mk. This
@@ -12,9 +12,9 @@ Hunk #1:
--- git-annex.cabal.orig 2001-09-09 01:46:40.000000000 +0000
+++ git-annex.cabal
-@@ -290,20 +290,6 @@ Executable git-annex
- -- Some things don't work with the non-threaded RTS.
- GHC-Options: -threaded
+@@ -328,17 +328,6 @@ Executable git-annex
+ else
+ Build-Depends: ram, crypton (>= 1.1.0)
- -- Fully optimize for production.
- if flag(Production)
@@ -27,13 +27,10 @@ Hunk #1:
- else
- GHC-Options: -O0
-
-- if flag(ParallelBuild)
-- GHC-Options: -j
--
-- Avoid linking with unused dynamic libraries.
if os(linux) || os(freebsd)
GHC-Options: -optl-Wl,--as-needed
-@@ -487,7 +473,6 @@ Executable git-annex
+@@ -541,7 +530,6 @@ Executable git-annex
Other-Modules: Utility.DirWatcher.Kqueue
if flag(Dbus)
Home |
Main Index |
Thread Index |
Old Index