Commit graph

44 commits

Author SHA1 Message Date
bad
ac94255eb6 Apply r456 from svn repository to update.mli:
* Small patch from Stephane Glondu to make Unison compile with Ocaml 3.12.

PKGREVISION++
2010-08-24 19:01:59 +00:00
wiz
ef3f5088cc Update to 2.32.52, ok tonio.
Set license.

Changes since 2.32.44:

    * Improvement to the code for resuming directory transfers: (1) make sure file information (permissions, ...) has been properly set when using a previously transferred temp file (2) make sure previously transferred directories are writable (other changes made in the developer version of Unison require a protocol change)
    * Got rid of the 16MiB marshalling limit by marshalling to a bigarray
    * Ignore one hour differences for deciding whether a file may have been updated. This avoids slow update detection after daylight saving time changes under Windows. This makes it slightly more likely to miss an update, but that should be safe enough.
    * Improved Unison icon under Windows
    * Case sensitivity information put in the archive (in a backward compatible way) and checked when the archive is loaded
    * Uses improved emulation of "select" call provided by Ocaml 3.11 under Windows (the GUI does not freeze as much during synchronization)
    * Upgraded to GPL version 3 and added copyright notice to documentation files.
    * Unison can sometimes fail to transfer a file, giving the unhelpful message "Destination updated during synchronization" even though the file has not been changed. This can be caused by programs that change either the file's contents *or* the file's extended attributes without changing its modification time. I'm not sure what is the best fix for this – it is not Unison's fault, but it makes Unison's behavior puzzling – but at least Unison can be more helpful about suggesting a workaround (running once with 'fastcheck' set to false). The failure message has been changed to give this advice.
    * Text UI
          o During update detection, display status by updating a single line rather than generating a new line of output every so often. That should be less confusing.
          o In repeat mode, don't save the archives when there is no update. Indeed, in this mode, we should minimize the amount of work performed and it is unlikely that the archives have changed much.
    * Bugfixes
          o Fixed quotation of paths and names when writing to a preference file
          o Fixed bug resulting in slow performances when transferring a file using our rsync implementation from a 64-bit architecture to a 32-bit architecture.
          o Fixed bug in Lwt_unix.run which could make it fail with a Not_found exception (see [Not_found raised in tryCopyMovedFile] errors)
          o Properly deals with non-conformant AppleDouble files produced by Mac OS X.
          o Fixed bug that results in Unison missing ressource fork changes
          o Applied a patch from Karl M to make the GTK2 version build with OCaml 3.11 on Windows.
          o Added some extra debugging code to remote.ml to give more informative error messages when people encounter the longstanding "assert failed during file transfer" bug.
          o Applied patch from Antoine Reilles for NetBSD compilation
          o Resizing the update window vertically no longer moves the status label. Fix contributed by Pedro Melo.

Changes since 2.31:

    * Minor fixes and improvements:
          o Ignore one hour differences when deciding whether a file may have been updated. This avoids slow update detection after daylight saving time changes under Windows. This makes Unison slightly more likely to miss an update, but it should be safe enough.
          o Fix a small bug that was affecting mainly windows users. We need to commit the archives at the end of the sync even if there are no updates to propagate because some files (in fact, if we've just switched to DST on windows, a LOT of files) might have new modtimes in the archive. (Changed the text UI only. It's less clear where to change the GUI.)
          o Don't delete the temp file when a transfer fails due to a fingerprint mismatch (so that we can have a look and see why!) We've also added more debugging code togive more informative error messages when we encounter the dreaded and longstanding "assert failed during file transfer" bug

Changes since 2.27:

    * If Unison is interrupted during a directory transfer, it will now leave the partially transferred directory intact in a temporary location. (This maintains the invariant that new files/directories are transferred either completely or not at all.) The next time Unison is run, it will continue filling in this temporary directory, skipping transferring files that it finds are already there.
    * We've added experimental support for invoking an external file transfer tool for whole-file copies instead of Unison's built-in transfer protocol. Three new preferences have been added:
          o copyprog is a string giving the name (and command-line switches, if needed) of an external program that can be used to copy large files efficiently. By default, rsync is invoked, but other tools such as scp can be used instead by changing the value of this preference. (Although this is not its primary purpose, rsync is actually a pretty fast way of copying files that don't already exist on the receiving host.) For files that do already exist on (but that have been changed in one replica), Unison will always use its built-in implementation of the rsync algorithm.
          o Added a "copyprogrest" preference, so that we can give different command lines for invoking the external copy utility depending on whether a partially transferred file already exists or not. (Rsync doesn't seem to care about this, but other utilities may.)
          o copythreshold is an integer (-1 by default), indicating above what filesize (in megabytse the external copying utility specified by copyprog. Specifying 0 will cause ALL copies to use the external program; a negative number will prevent any files from using it. (Default is -1.)
      Thanks to Alan Schmitt for a huge amount of hacking and o an anonymous sponsor for suggesting and underwriting this extension.
    * Small improvements:
          o Added a new preference, dontchmod. By default, Unison uses the chmod system call to set the permission bits of files after it has copied them. Butin some circumstances (and under some operating systems), the chmod call always fails. Setting this preference completely prevents Unison from ever calling chmod.
          o Don't ignore files that look like backup files if the backuplocation preference  set to central
          o Shortened the names of several preferences. The old names are also still supported, for backwards compatibility, but they do not appear in the documentation.
          o Lots of little documentation tidying. (In particular, preferences are separated into Basic and Advanced! This should hopefully make Unison a little more approachable for new users.
          o Unison can sometimes fail to transfer a file, giving the unhelpful message "Destination updated during synchronization"
#

    * Further improvements to the OS X GUI (thanks to Alan Schmitt and Craig Federighi).

# Very preliminary support for triggering Unison from an external filesystem-watching utility. The current implementation is very simple, not efficient, and almost completely untested—not ready for real users. But if someone wants to help improve it (e.g., by writing a filesystem watcher for your favorite OS), please make yourself known!

On the Unison side, the new behavior is very simple:

    * use the text UI
    * start Unison with the command-line flag "-repeat FOO", where FOO is name of a file where Unison should look for notifications of changes
    * when it starts up, Unison will read the whole contents of this file (on both hosts), which should be a newline-separated list of paths (relative to the root of the synchronization) and synchronize just these paths, as if it had been started with the "-path=xxx" option for each one of them
    * when it finishes, it will sleep for a few seconds and then examine the watchfile again; if anything has been added, it will read the new paths, synchronize them, and go back to sleep
    * that's it!

To use this to drive Unison "incrementally," just start it in this mode and start up a tool (on each host) to watch for new changes to the filesystem and append the appropriate paths to the watchfile. Hopefully such tools should not be too hard to write.
# Bug fixes:

    * Fixed a bug that was causing new files to be created with permissions 0x600 instead of using a reasonable default (like 0x644), if the 'perms' flag was set to 0. (Bug reported by Ben Crowell.)
    * Follow maxthreads preference when transferring directories.
2009-11-20 20:18:47 +00:00
sno
6f7368d4db bump revision because of graphics/jpeg update 2009-08-26 19:56:37 +00:00
joerg
62d1ba2bac Remove @dirrm entries from PLISTs 2009-06-14 18:03:28 +00:00
tonio
737b6f6851 Update net/unison to 2.27.53
Enable full destdir support.

Changes since 2.17:
* Several small fixes to the GTK2 UI to make it work better under Windows
* The backup functionality has been completely rewritten. The external
  interface has not changed, but numerous bugs, irregular behaviors, and
  cross-platform inconsistencies have been corrected.
* Some important safety improvements:
  o Added a new mountpoint preference, which can be used to specify a path
    that must exist in both replicas at the end of update detection
  o The confirmation of “big deletes” is now controlled by a boolean
preference confirmbigdeletes. Default is true, which gives the same behavior
as previously. (This functionality is at least partly superceded by the
mountpoint preference, but it has been left in place in case it is useful to
some people.)
  o If Unison is asked to “follow” a symbolic link but there is nothing at
the other end of the link, it will now flag this path as an error, rather
than treating the symlink itself as missing or deleted. This avoids a
potentially dangerous situation where a followed symlink points to an
external filesystem that might be offline when Unison is run (whereupon
Unison would cheerfully delete the corresponding files in the other
replica!).
* Smaller changes:
  o Added forcepartial and preferpartial preferences, which behave like force
and prefer but can be specified on a per-path basis. [Thanks to Alan Schmitt
for this.]
  o A bare-bones self test feature was added, which runs unison through some
of its paces and checks that the results are as expected. The coverage of the
tests is still very limited, but the facility has already been very useful in
debugging the new backup functionality (especially in exposing some subtle
cross-platform issues).
  o Refined debugging code so that the verbosity of individual modules can be
controlled separately. Instead of just putting '-debug verbose' on the
command line, you can put '-debug update+', which causes all the extra
messages in the Update module, but not other modules, to be printed. Putting
'-debug verbose' causes all modules to print with maximum verbosity.
  o Removed mergebatch preference. (It never seemed very useful, and its
semantics were confusing.)
  o Rewrote some of the merging functionality, for better cooperation with
external Harmony instances.
  o Changed the temp file prefix from .# to .unison.
  o Compressed the output from the text user interface (particularly when run
with the -terse flag) to make it easier to interpret the results when Unison
is run several times in succession from a script.
  o Changed the order of arguments to the default diff command (so that the +
and - annotations in diff's output are reversed).
  o Small fix to ctime (non-)handling in update detection under windows with
fastcheck.
2008-07-25 20:03:03 +00:00
wiz
3528e06345 Fix paths for GConf, libglade, libart, libsigc++, lablgtk moves.
Bump PKGREVISION.
2007-09-21 13:03:25 +00:00
tonio
1cf1101701 Add optional support for the lablgtk2 interface for unison
Patch provided by Brian de Alwis in pkg/35114
2006-12-11 23:00:31 +00:00
reed
5abef9be14 Over 1200 files touched but no revisions bumped :)
RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).
2006-04-06 06:21:32 +00:00
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
rillig
b71a1d488b Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
2005-12-05 20:49:47 +00:00
tonio
fc91d4439a Do not generate INSTALL at post-install stage: unison requires a preference
directory or try to create it: it causes the build to fail under darwin

More: the INSTALL file is not necessary, since unison -doc install will show it
2005-10-27 12:54:06 +00:00
tonio
cd8295953c Update net/unison to 2.13.16 (Fix PR 31345)
Update maintainer, i'm taking this one
2005-09-27 14:46:08 +00:00
tonio
fdb57bc070 update unison to the latest recommended stable version: 2.12.0
Main changelog entries:
- Incompatible change: Archive format has changed.
- Substantial reworking of the internal logic of the text UI
- Finder flags now synchronized (for mac osx users)
- Workaround for transferring large files using rsync.

Approved by cube@
2005-08-03 12:42:13 +00:00
rillig
1d3b35f846 Make pty.c always include <errno.h> in addition to <sys/errno.h>. Otherwise
errno may be undefined.
2005-07-30 21:57:42 +00:00
jlam
585534220c Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:
USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison
2005-05-22 20:07:36 +00:00
adrianp
6b71b6fa52 - Update unison to 2.10.2
- Lots of changes, in summary:
	- out of the box OS X and OpenBSD support
	- limit the number of simultaneous file transfers
	- support for ocaml >3.07
	- Files larger than 2Gb are now supported
	- Major tidying and enhancement of 'merge' functionality
2005-04-24 12:48:43 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
agc
b12d62efb5 Add RMD160 digests. 2005-02-24 12:13:41 +00:00
adrianp
6184014a75 - Patch unison so it now works with ocaml 3.08.2
- Bump to nb4
- Thanks to Antoine Reilles for supplying the patch
2005-02-04 22:54:52 +00:00
jmmv
c33d2074af Adjust dependencies after ocaml has been splitted into three different
packages: ocaml, ocaml-graphics and labltk.  Bump PKGREVISION.
2004-12-24 17:21:01 +00:00
tv
c487cb967a Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
2004-10-03 00:12:51 +00:00
grant
6eab5759a3 replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. 2004-01-24 14:50:05 +00:00
agc
3ad1bdbf06 Move WRKSRC definition away from the first paragraph in a Makefile. 2004-01-20 12:18:15 +00:00
jlam
22645a942c bl3ify 2004-01-05 11:28:07 +00:00
martti
8cee801716 COMMENT should start with a capital letter. 2003-07-21 17:10:16 +00:00
grant
ca3be631f2 s/netbsd.org/NetBSD.org/ 2003-07-17 22:50:55 +00:00
jtb
bb03236c6b Remove build time dependency on bash.
Build with posix threads if supported ocaml.
2003-06-29 23:52:03 +00:00
jtb
b683565843 Build with native code compilers on systems where they're available,
which now includes powerpc and sparc.
Bump PKGREVISION.
2003-06-23 20:36:13 +00:00
agc
1cf87833d6 When constructing the WRKSRC definition, use ${PKGNAME_NOREV} rather than
${PKGNAME}, so that the WRKSRC definition is immune from any subsequent
PKGREVISION changes. With thanks to jmc for the nudge.
2003-06-18 09:22:14 +00:00
jschauma
e366d0c694 Use tech-pkg@ in favor of packages@ as MAINTAINER for orphaned packages.
Should anybody feel like they could be the maintainer for any of thewe packages,
please adjust.
2003-06-02 01:15:31 +00:00
jmmv
0916498c1b Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz. 2003-03-29 12:40:00 +00:00
uebayasi
17a82619c3 Fix malformed BUILD_DEPENDS line. PR#18305 by Christopher Richards. 2002-09-16 14:38:33 +00:00
sommerfeld
b605844695 Saw a bash: command not found during install; added BUILD_DEPENDS on bash2 2002-09-01 14:33:46 +00:00
dmcmahill
3ef644d15a set HOME to WRKSRC during build to avoid looking for a users home directory 2002-06-15 22:11:24 +00:00
deberg
6d552724e0 update to unison 2.9.1 2002-06-01 04:41:30 +00:00
dmcmahill
3b7fb782dd make DIST_SUBDIR include the package version since the source tarball
has no version number.  Will hopefully avoid at least some checksum complaints.
2002-01-17 13:19:45 +00:00
zuntum
d038a73ebd Move pkg/ files into package's toplevel directory 2001-10-31 22:52:58 +00:00
hubertf
e19bdfaa30 Update to unison-2.7.7. Changes:
* Many changes to the internal data structures (not backward compatible!)
 * Centralized backups
 * Lots of bug fixes
 * Many other feature enhancements

Requested by Ben Wong <benjamin.wong@cc.gatech.edu>.
While there, fix the dependency on ocaml, and install some docs.

PACKAGE DEVELOPERS: please don't just include binaries into pkgs!
2001-09-28 23:54:36 +00:00
wiz
433b62957e Move to sha1 checksum, and/or add distfile sizes. 2001-04-21 11:23:08 +00:00
agc
bbc67fac91 + move the distfile digest/checksum value from files/md5 to distinfo
+ move the patch digest/checksum values from files/patch-sum to distinfo
2001-04-17 11:53:33 +00:00
hubertf
e32afb6fea Change BUILD_DEPENDS semantics:
first component is now a package name+version/pattern, no more
executable/patchname/whatnot.

While there, introduce BUILD_USES_MSGFMT as shorthand to pull in
devel/gettext unless /usr/bin/msgfmt exists (i.e. on post-1.5 -current).

Patch by Alistair Crooks <agc@netbsd.org>
2001-03-27 03:19:43 +00:00
wiz
a13ea108bb Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. 2001-02-17 17:52:59 +00:00
dmcmahill
98809be61b we don't have ocamlopt on non-i386 so don't try and use it on non-i386,
use ocamlc in that case.  Fixes recently noted compile problems on alpha.
2001-02-03 09:07:21 +00:00
mjl
59fcada031 Initial import of unison, a file synchronisation tool. 2001-01-11 01:45:36 +00:00