diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /nonworking | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'nonworking')
113 files changed, 0 insertions, 23003 deletions
diff --git a/nonworking/alsa-driver/alsadriver_0.9.8.bb b/nonworking/alsa-driver/alsadriver_0.9.8.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/alsa-driver/alsadriver_0.9.8.bb +++ /dev/null diff --git a/nonworking/alsa-tools/alsa-tools_1.0.4.bb b/nonworking/alsa-tools/alsa-tools_1.0.4.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/alsa-tools/alsa-tools_1.0.4.bb +++ /dev/null diff --git a/nonworking/aodv/aodv-modules-2.2.2/fix-makefile.patch b/nonworking/aodv/aodv-modules-2.2.2/fix-makefile.patch deleted file mode 100644 index 3bee769b3f..0000000000 --- a/nonworking/aodv/aodv-modules-2.2.2/fix-makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- kernel-aodv_v2.2.2/Makefile~fix-makefile 2004-05-21 23:56:52.000000000 +0200 -+++ kernel-aodv_v2.2.2/Makefile 2004-07-09 23:20:56.000000000 +0200 -@@ -35,9 +35,9 @@ - MODCFLAGS := -O3 -DMODULE -D__KERNEL__ -DLINUX - endif - ifeq ($(TARGET),arm) -- CC := arm-linux-gcc -- LD := arm-linux-ld -m armelf -r -- KPATH := /home/adhoc/ipaq/include/ -+ #CC := arm-linux-gcc -+ #LD := arm-linux-ld -m armelf -r -+ KPATH := $(KERNEL_PATH)/include/ - MODCFLAGS := -O3 -DMODULE -D__KERNEL__ -DLINUX -DARM - endif - ifeq ($(TARGET),mipsel) diff --git a/nonworking/aodv/aodv-modules_2.2.2.bb b/nonworking/aodv/aodv-modules_2.2.2.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/aodv/aodv-modules_2.2.2.bb +++ /dev/null diff --git a/nonworking/apache/apache-2.0.47/configure.patch b/nonworking/apache/apache-2.0.47/configure.patch deleted file mode 100644 index 95d43fcd1b..0000000000 --- a/nonworking/apache/apache-2.0.47/configure.patch +++ /dev/null @@ -1,903 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- httpd-2.0.47/./configure.in~configure 2003-05-21 00:46:00.000000000 -0400 -+++ httpd-2.0.47/./configure.in 2004-01-26 19:43:04.000000000 -0500 -@@ -4,8 +4,9 @@ - dnl Use ./buildconf to produce a configure script - dnl - --AC_PREREQ(2.13) --AC_INIT(ABOUT_APACHE) -+AC_PREREQ(2.57) -+AC_INIT -+AC_CONFIG_SRCDIR([ABOUT_APACHE]) - - AC_CONFIG_HEADER(include/ap_config_auto.h) - AC_CONFIG_AUX_DIR(build) -@@ -55,7 +56,7 @@ - dnl shared library support for these packages doesn't currently - dnl work on some platforms - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - - orig_prefix="$prefix" - -@@ -209,7 +210,7 @@ - APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) - ;; - *-solaris2*) -- dnl This is a hack -- we should be using AC_TRY_RUN instead -+ dnl This is a hack -- we should be using AC_RUN_IFELSE([AC_LANG_SOURCE([[]])],[],[],[]) instead - ap_platform_runtime_link_flag="-R" - dnl solaris 8 and above don't have a thundering herd - dnl not sure about rev's before this one. -@@ -286,7 +287,7 @@ - dnl ## Check for typedefs, structures, and compiler characteristics. - - AC_C_CONST --if test "$ac_cv_prog_gcc" = "yes"; then -+if test "$ac_cv_c_compiler_gnu" = "yes"; then - APR_ADDTO(NOTEST_CPPFLAGS,-DAP_HAVE_DESIGNATED_INITIALIZER) - fi - -@@ -305,9 +306,8 @@ - - dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs - AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, --[AC_TRY_COMPILE([#include <sys/types.h> --#include <time.h>], [struct tm tm; tm.tm_gmtoff;], -- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)]) -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> -+#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])]) - if test "$ac_cv_struct_tm_gmtoff" = "yes"; then - AC_DEFINE(HAVE_GMTOFF) - fi -@@ -566,7 +566,9 @@ - dnl Ensure that docs/conf is created. - test -d docs/conf||$mkdir_p docs/conf - --AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[ -+AC_CONFIG_FILES([$APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk]) -+AC_CONFIG_COMMANDS([default],[[true]],[[ - APACHE_GEN_MAKEFILES --]) -+]]) -+AC_OUTPUT - ---- httpd-2.0.47/./srclib/apr/configure.in~configure 2003-06-11 11:20:33.000000000 -0400 -+++ httpd-2.0.47/./srclib/apr/configure.in 2004-01-26 19:39:34.000000000 -0500 -@@ -4,7 +4,8 @@ - dnl Process this file with autoconf to produce a configure script. - dnl Use ./buildconf to prepare build files and run autoconf for APR. - --AC_INIT(build/apr_common.m4) -+AC_INIT -+AC_CONFIG_SRCDIR([build/apr_common.m4]) - AC_CONFIG_HEADER(include/arch/unix/apr_private.h) - AC_CONFIG_AUX_DIR(build) - -@@ -29,7 +30,7 @@ - dnl - APR_CONFIG_NICE(config.nice) - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - echo "Configuring APR library" - echo "Platform: $host" - -@@ -510,18 +511,14 @@ - dnl Linux is silly as it has pthread_rwlock_init defined - dnl but keeps the pthread_rwlock_t structure hidden unless - dnl special things are defined. -- AC_TRY_COMPILE([#include <sys/types.h> --#include <pthread.h>], -- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;], -- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> -+#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no]) - if test "$ac_cv_struct_pthread_rw" = "no"; then -- AC_TRY_COMPILE([#define _XOPEN_SOURCE 500 -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500 - #define _BSD_SOURCE - #define _SVID_SOURCE - #include <sys/types.h> --#include <pthread.h>], -- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;], -- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no) -+#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no]) - if test "$ac_cv_struct_pthread_rw" = "yes"; then - APR_ADDTO(CPPFLAGS, [-D_XOPEN_SOURCE=500 -D_BSD_SOURCE]) - APR_ADDTO(CPPFLAGS, [-D_SVID_SOURCE]) -@@ -602,7 +599,7 @@ - if test "$ac_cv_func_mmap" = "yes" && - test "$ac_cv_file__dev_zero" = "yes"; then - AC_MSG_CHECKING(for mmap that can map /dev/zero) -- AC_TRY_RUN([ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -@@ -625,7 +622,7 @@ - return 3; - } - return 0; -- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) -+ }]])],[],[ac_cv_file__dev_zero=no],[ac_cv_file__dev_zero=no]) - - AC_MSG_RESULT($ac_cv_file__dev_zero) - fi -@@ -829,7 +826,8 @@ - AC_SUBST(sendfile) - - AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ]) --AC_DECL_SYS_SIGLIST -+AC_CHECK_DECLS([sys_siglist]) -+ - - AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ]) - APR_CHECK_INET_ADDR -@@ -936,12 +934,11 @@ - # being included by itself. Check for <netinet/tcp.h> manually, - # including another header file first. - AC_CACHE_CHECK([for netinet/tcp.h], [apr_cv_hdr_netinet_tcp_h], --[AC_TRY_CPP( --[#ifdef HAVE_NETINET_IN_H -+[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#ifdef HAVE_NETINET_IN_H - #include <netinet/in.h> - #endif - #include <netinet/tcp.h> --], [apr_cv_hdr_netinet_tcp_h=yes], [apr_cv_hdr_netinet_tcp_h=no])]) -+]])],[apr_cv_hdr_netinet_tcp_h=yes],[apr_cv_hdr_netinet_tcp_h=no])]) - if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then - netinet_tcph=1 - AC_DEFINE([HAVE_NETINET_TCP_H], 1, [Defined if netinet/tcp.h is present]) -@@ -1012,7 +1009,7 @@ - if test "x$ac_cv_sizeof_voidp" != "x"; then - voidp_size=$ac_cv_sizeof_voidp - else -- AC_ERROR([Cannot determine size of void*]) -+ AC_MSG_ERROR([Cannot determine size of void*]) - fi - - dnl Checks for integer size -@@ -1351,7 +1348,7 @@ - fi - - AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <sys/types.h> - #include <sys/time.h> - #include <sys/resource.h> -@@ -1361,10 +1358,10 @@ - limit.rlim_cur = 0; - limit.rlim_max = 0; - exit(0); --}], [ -- ac_cv_struct_rlimit=yes ], [ -- ac_cv_struct_rlimit=no ], [ -- ac_cv_struct_rlimit=no ] ) ] ) -+}]])],[ -+ ac_cv_struct_rlimit=yes ],[ -+ ac_cv_struct_rlimit=no ],[ -+ ac_cv_struct_rlimit=no ]) ] ) - struct_rlimit=0 - test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1 - AC_SUBST(struct_rlimit) -@@ -1378,7 +1375,7 @@ - - # Some systems return ENOSYS from sem_open. - AC_CACHE_CHECK(for working sem_open,ac_cv_func_sem_open,[ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <errno.h> - #include <stdlib.h> - #include <fcntl.h> -@@ -1397,22 +1394,21 @@ - sem_close(psem); - sem_unlink(sem_name); - exit(0); --}], [ac_cv_func_sem_open=yes], [ac_cv_func_sem_open=no], --[ac_cv_func_sem_open=no])]) -+}]])],[ac_cv_func_sem_open=yes],[ac_cv_func_sem_open=no],[ac_cv_func_sem_open=no])]) - - # It's stupid, but not all platforms have union semun, even those that need it. - AC_MSG_CHECKING(for union semun in sys/sem.h) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> - #include <sys/ipc.h> - #include <sys/sem.h> --],[ -+]], [[ - union semun arg; - semctl(0, 0, 0, arg); --], [have_union_semun="1" union_semun=yes ] --msg=yes, [ -+]])],[have_union_semun="1" union_semun=yes -+msg=yes],[ - have_union_semun="0" --msg=no ] ) -+msg=no ]) - AC_MSG_RESULT([$msg]) - AC_SUBST(have_union_semun) - -@@ -1434,7 +1430,7 @@ - # Linux and older versions of AIX have this problem. - APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [ - AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [ -- AC_TRY_RUN([ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <sys/types.h> - #include <pthread.h> - int main() -@@ -1452,7 +1448,7 @@ - if (pthread_mutex_destroy(&mutex)) - exit(5); - exit(0); -- }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])]) -+ }]])],[apr_cv_process_shared_works=yes],[apr_cv_process_shared_works=no],[])]) - # Override detection of pthread_mutexattr_setpshared - ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works]) - -@@ -1461,15 +1457,15 @@ - if test "$ac_cv_func_pthread_mutexattr_setrobust_np" = "no"; then - AC_CACHE_CHECK([for pthread_mutexattr_setrobust_np with _POSIX_THREAD_PRIO_INHERIT], - [apr_cv_setrobust_with_prio_inherit], [ -- AC_TRY_COMPILE([#define _POSIX_THREAD_PRIO_INHERIT -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_THREAD_PRIO_INHERIT - #include <sys/types.h> --#include <pthread.h>],[ -+#include <pthread.h>]], [[ - int main() - { - pthread_mutexattr_t attr; - pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP); - return 0; -- }], [apr_cv_setrobust_with_prio_inherit=yes], [apr_cv_setrobust_with_prio_inherit=no])]) -+ }]])],[apr_cv_setrobust_with_prio_inherit=yes],[apr_cv_setrobust_with_prio_inherit=no])]) - if test "$apr_cv_setrobust_with_prio_inherit" = "yes"; then - ac_cv_func_pthread_mutexattr_setrobust_np=yes - APR_ADDTO(CPPFLAGS, -D_POSIX_THREAD_PRIO_INHERIT) -@@ -1637,7 +1633,7 @@ - if test -r "$apr_devrandom"; then - rand="1" - else -- AC_ERROR([$apr_devrandom not found or unreadable.]) -+ AC_MSG_ERROR([$apr_devrandom not found or unreadable.]) - fi - fi - -@@ -1673,9 +1669,8 @@ - dnl ----------------------------- Checking for Time Support - echo "${nl}Checking for Time Support..." - AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, --[AC_TRY_COMPILE([#include <sys/types.h> --#include <time.h>], [struct tm tm; tm.tm_gmtoff;], -- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)]) -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> -+#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])]) - - if test "$ac_cv_struct_tm_gmtoff" = "yes"; then - AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field]) -@@ -1684,14 +1679,14 @@ - dnl ----------------------------- Checking for Networking Support - echo "${nl}Checking for Networking support..." - AC_MSG_CHECKING(for in_addr in netinet/in.h) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> - #include <netinet/in.h> --],[ -+]], [[ - struct in_addr arg; - arg.s_addr = htonl(INADDR_ANY); --], [ have_in_addr="1" --msg=yes ] , [ have_in_addr="0" -+]])],[ have_in_addr="1" -+msg=yes ],[ have_in_addr="0" - msg=no ]) - AC_MSG_RESULT([$msg]) - -@@ -1898,12 +1893,13 @@ - dir=include/arch/unix - test -d $dir || $MKDIR $dir - --AC_OUTPUT([ -+AC_CONFIG_FILES([ - $MAKEFILE1 $MAKEFILE2 $MAKEFILE3 - include/apr.h - build/apr_rules.mk - apr-config --],[ -+]) -+AC_CONFIG_COMMANDS([default],[[ - for i in $SAVE_FILES; do - if cmp -s $i $i.save 2>/dev/null; then - mv $i.save $i -@@ -1912,7 +1908,8 @@ - rm -f $i.save - done - chmod +x apr-config --]) -+]],[[]]) -+AC_OUTPUT - - dnl ----------------------------- Fixup Makefiles for VPATH support - ---- httpd-2.0.47/./srclib/pcre/configure.in~configure 2002-03-20 01:56:34.000000000 -0500 -+++ httpd-2.0.47/./srclib/pcre/configure.in 2004-01-26 19:43:27.000000000 -0500 -@@ -3,7 +3,8 @@ - dnl This is required at the start; the name is the name of a file - dnl it should be seeing, to verify it is in the same directory. - --AC_INIT(dftables.c) -+AC_INIT -+AC_CONFIG_SRCDIR([dftables.c]) - - dnl Arrange to build config.h from config.in. Note that pcre.h is - dnl built differently, as it is just a "substitution" file. -@@ -101,4 +102,6 @@ - AC_SUBST(PCRE_POSIXLIB_VERSION) - - dnl This must be last; it determines what files are written as well as config.h --AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config,[chmod a+x pcre-config]) -+AC_CONFIG_FILES([Makefile pcre.h:pcre.in pcre-config]) -+AC_CONFIG_COMMANDS([default],[[chmod a+x pcre-config]],[[]]) -+AC_OUTPUT ---- httpd-2.0.47/./srclib/apr-util/xml/expat/configure.in~configure 2001-07-08 22:31:04.000000000 -0400 -+++ httpd-2.0.47/./srclib/apr-util/xml/expat/configure.in 2004-01-26 19:39:34.000000000 -0500 -@@ -10,7 +10,8 @@ - dnl in the file COPYING that comes with this distribution. - dnl - --AC_INIT(Makefile.in) -+AC_INIT -+AC_CONFIG_SRCDIR([Makefile.in]) - AC_CONFIG_AUX_DIR(conftools) - - dnl -@@ -45,7 +46,7 @@ - - AC_CONFIG_HEADER(config.h) - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - case "$host_alias" in - *os2*) - # Use a custom made libtool replacement -@@ -106,4 +107,5 @@ - - AC_CHECK_FUNCS(memmove bcopy) - --AC_OUTPUT(Makefile lib/Makefile lib/expat.h) -+AC_CONFIG_FILES([Makefile lib/Makefile lib/expat.h]) -+AC_OUTPUT ---- httpd-2.0.47/./srclib/apr-util/configure.in~configure 2003-06-12 03:27:10.000000000 -0400 -+++ httpd-2.0.47/./srclib/apr-util/configure.in 2004-01-26 19:39:34.000000000 -0500 -@@ -2,8 +2,9 @@ - dnl Process this file with autoconf to produce a configure script - dnl - --AC_PREREQ(2.13) --AC_INIT(export_vars.sh.in) -+AC_PREREQ(2.57) -+AC_INIT -+AC_CONFIG_SRCDIR([export_vars.sh.in]) - - AC_CONFIG_HEADER(include/private/apu_config.h) - AC_CONFIG_AUX_DIR(build) -@@ -29,7 +30,7 @@ - USE_VPATH=1 - fi - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - - dnl - dnl compute the top directory of the build -@@ -191,13 +192,15 @@ - dnl - dnl everthing is done. - MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile dbm/sdbm/Makefile encoding/Makefile hooks/Makefile ldap/Makefile uri/Makefile xml/Makefile misc/Makefile strmatch/Makefile xlate/Makefile $test_Makefile" --AC_OUTPUT([ -+AC_CONFIG_FILES([ - export_vars.sh - apu-config - include/private/apu_select_dbm.h - include/apr_ldap.h - include/apu.h - $MAKEFILES -- ],[ -+ ]) -+AC_CONFIG_COMMANDS([default],[[ - chmod +x apu-config --]) -+]],[[]]) -+AC_OUTPUT ---- httpd-2.0.47/acinclude.m4~configure 2002-11-29 06:05:57.000000000 -0500 -+++ httpd-2.0.47/acinclude.m4 2004-01-26 19:39:34.000000000 -0500 -@@ -4,25 +4,25 @@ - dnl AC_HELP_STRING, so let's try to call it if we can. - dnl Note: this define must be on one line so that it can be properly returned - dnl as the help string. --AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl -+AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl - - dnl APACHE_SUBST(VARIABLE) - dnl Makes VARIABLE available in generated files - dnl (do not use @variable@ in Makefiles, but $(variable)) --AC_DEFUN(APACHE_SUBST,[ -+AC_DEFUN([APACHE_SUBST],[ - APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1" - AC_SUBST($1) - ]) - - dnl APACHE_FAST_OUTPUT(FILENAME) - dnl Perform substitutions on FILENAME (Makefiles only) --AC_DEFUN(APACHE_FAST_OUTPUT,[ -+AC_DEFUN([APACHE_FAST_OUTPUT],[ - APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1" - ]) - - dnl APACHE_GEN_CONFIG_VARS - dnl Creates config_vars.mk --AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ -+AC_DEFUN([APACHE_GEN_CONFIG_VARS],[ - APACHE_SUBST(abs_srcdir) - APACHE_SUBST(bindir) - APACHE_SUBST(sbindir) -@@ -104,14 +104,14 @@ - - dnl APACHE_GEN_MAKEFILES - dnl Creates Makefiles --AC_DEFUN(APACHE_GEN_MAKEFILES,[ -+AC_DEFUN([APACHE_GEN_MAKEFILES],[ - $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES - ]) - - dnl ## APACHE_OUTPUT(file) - dnl ## adds "file" to the list of files generated by AC_OUTPUT - dnl ## This macro can be used several times. --AC_DEFUN(APACHE_OUTPUT, [ -+AC_DEFUN([APACHE_OUTPUT], [ - APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1" - ]) - -@@ -120,7 +120,7 @@ - dnl - dnl If rlim_t is not defined, define it to int - dnl --AC_DEFUN(APACHE_TYPE_RLIM_T, [ -+AC_DEFUN([APACHE_TYPE_RLIM_T], [ - AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [ - AC_TRY_COMPILE([ - #include <sys/types.h> -@@ -138,7 +138,7 @@ - ]) - - dnl APACHE_MODPATH_INIT(modpath) --AC_DEFUN(APACHE_MODPATH_INIT,[ -+AC_DEFUN([APACHE_MODPATH_INIT],[ - current_dir=$1 - modpath_current=modules/$1 - modpath_static= -@@ -147,7 +147,7 @@ - > $modpath_current/modules.mk - ])dnl - dnl --AC_DEFUN(APACHE_MODPATH_FINISH,[ -+AC_DEFUN([APACHE_MODPATH_FINISH],[ - echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk - echo "static = $modpath_static" >> $modpath_current/modules.mk - echo "shared = $modpath_shared" >> $modpath_current/modules.mk -@@ -160,7 +160,7 @@ - ])dnl - dnl - dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]]) --AC_DEFUN(APACHE_MODPATH_ADD,[ -+AC_DEFUN([APACHE_MODPATH_ADD],[ - if test -z "$3"; then - objects="mod_$1.lo" - else -@@ -203,7 +203,7 @@ - dnl setting. otherwise, fall under the "all" setting. - dnl explicit yes/no always overrides. - dnl --AC_DEFUN(APACHE_MODULE,[ -+AC_DEFUN([APACHE_MODULE],[ - AC_MSG_CHECKING(whether to enable mod_$1) - define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl - AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5)) -@@ -273,7 +273,7 @@ - dnl - dnl APACHE_LAYOUT(configlayout, layoutname) - dnl --AC_DEFUN(APACHE_LAYOUT,[ -+AC_DEFUN([APACHE_LAYOUT],[ - if test ! -f $srcdir/config.layout; then - echo "** Error: Layout file $srcdir/config.layout not found" - echo "** Error: Cannot use undefined layout '$LAYOUT'" -@@ -325,7 +325,7 @@ - dnl - dnl APACHE_ENABLE_LAYOUT - dnl --AC_DEFUN(APACHE_ENABLE_LAYOUT,[ -+AC_DEFUN([APACHE_ENABLE_LAYOUT],[ - AC_ARG_ENABLE(layout, - [ --enable-layout=LAYOUT],[ - LAYOUT=$enableval -@@ -343,7 +343,7 @@ - dnl - dnl APACHE_ENABLE_MODULES - dnl --AC_DEFUN(APACHE_ENABLE_MODULES,[ -+AC_DEFUN([APACHE_ENABLE_MODULES],[ - module_selection=default - module_default=yes - -@@ -372,7 +372,7 @@ - ]) - ]) - --AC_DEFUN(APACHE_REQUIRE_CXX,[ -+AC_DEFUN([APACHE_REQUIRE_CXX],[ - if test -z "$apache_cxx_done"; then - AC_PROG_CXX - AC_PROG_CXXCPP -@@ -389,7 +389,7 @@ - dnl and then AC_TRY_LINK to test the libraries directly for the version, - dnl but that will require someone who knows how to program openssl. - dnl --AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[ -+AC_DEFUN([APACHE_CHECK_SSL_TOOLKIT],[ - if test "x$ap_ssltk_base" = "x"; then - AC_MSG_CHECKING(for SSL/TLS toolkit base) - ap_ssltk_base="" -@@ -499,14 +499,14 @@ - dnl apache will use while generating scripts like autoconf and apxs and - dnl the default config file. - --AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[ -+AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[ - APR_EXPAND_VAR(exp_$1, [$]$1) - APACHE_SUBST(exp_$1) - APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix}) - APACHE_SUBST(rel_$1) - ]) - --AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[ -+AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[ - APACHE_SUBST_EXPANDED_ARG(exec_prefix) - APACHE_SUBST_EXPANDED_ARG(bindir) - APACHE_SUBST_EXPANDED_ARG(sbindir) ---- httpd-2.0.47/srclib/apr/build/apr_common.m4~configure 2003-04-05 16:42:20.000000000 -0500 -+++ httpd-2.0.47/srclib/apr/build/apr_common.m4 2004-01-26 19:39:34.000000000 -0500 -@@ -6,7 +6,7 @@ - dnl - dnl Saves a snapshot of the configure command-line for later reuse - dnl --AC_DEFUN(APR_CONFIG_NICE,[ -+AC_DEFUN([APR_CONFIG_NICE],[ - rm -f $1 - cat >$1<<EOF - #! /bin/sh -@@ -55,7 +55,7 @@ - - dnl APR_MKDIR_P_CHECK(fallback-mkdir-p) - dnl checks whether mkdir -p works --AC_DEFUN(APR_MKDIR_P_CHECK,[ -+AC_DEFUN([APR_MKDIR_P_CHECK],[ - AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[ - test -d conftestdir && rm -rf conftestdir - mkdir -p conftestdir/somedir >/dev/null 2>&1 -@@ -93,7 +93,7 @@ - dnl Trying to optimize this is left as an exercise to the reader who wants - dnl to put up with more autoconf craziness. I give up. - dnl --AC_DEFUN(APR_SUBDIR_CONFIG, [ -+AC_DEFUN([APR_SUBDIR_CONFIG], [ - # save our work to this point; this allows the sub-package to use it - AC_CACHE_SAVE - -@@ -158,7 +158,7 @@ - dnl - dnl Stores the variable (usually a Makefile macro) for later restoration - dnl --AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[ -+AC_DEFUN([APR_SAVE_THE_ENVIRONMENT],[ - apr_ste_save_$1="$$1" - ])dnl - -@@ -170,7 +170,7 @@ - dnl and restoring the original variable contents. This makes it possible - dnl for a user to override configure when it does something stupid. - dnl --AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[ -+AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT],[ - if test "x$apr_ste_save_$1" = "x"; then - $2$1="$$1" - $1= -@@ -192,7 +192,7 @@ - dnl - dnl Set variable iff it's currently null - dnl --AC_DEFUN(APR_SETIFNULL,[ -+AC_DEFUN([APR_SETIFNULL],[ - if test -z "$$1"; then - echo " setting $1 to \"$2\"" - $1="$2" -@@ -204,7 +204,7 @@ - dnl - dnl Set variable no matter what - dnl --AC_DEFUN(APR_SETVAR,[ -+AC_DEFUN([APR_SETVAR],[ - echo " forcing $1 to \"$2\"" - $1="$2" - ])dnl -@@ -214,7 +214,7 @@ - dnl - dnl Add value to variable - dnl --AC_DEFUN(APR_ADDTO,[ -+AC_DEFUN([APR_ADDTO],[ - if test "x$$1" = "x"; then - echo " setting $1 to \"$2\"" - $1="$2" -@@ -241,7 +241,7 @@ - dnl - dnl Remove a value from a variable - dnl --AC_DEFUN(APR_REMOVEFROM,[ -+AC_DEFUN([APR_REMOVEFROM],[ - if test "x$$1" = "x$2"; then - echo " nulling $1" - $1="" -@@ -265,7 +265,7 @@ - dnl - dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] ) - dnl --AC_DEFUN(APR_CHECK_DEFINE_FILES,[ -+AC_DEFUN([APR_CHECK_DEFINE_FILES],[ - AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ - ac_cv_define_$1=no - for curhdr in $2 -@@ -287,7 +287,7 @@ - dnl - dnl APR_CHECK_DEFINE(symbol, header_file) - dnl --AC_DEFUN(APR_CHECK_DEFINE,[ -+AC_DEFUN([APR_CHECK_DEFINE],[ - AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ - AC_EGREP_CPP(YES_IS_DEFINED, [ - #include <$2> -@@ -304,7 +304,7 @@ - dnl - dnl APR_CHECK_APR_DEFINE( symbol ) - dnl --AC_DEFUN(APR_CHECK_APR_DEFINE,[ -+AC_DEFUN([APR_CHECK_APR_DEFINE],[ - apr_old_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $INCLUDES" - AC_EGREP_CPP(YES_IS_DEFINED, [ -@@ -329,7 +329,7 @@ - fi]) - ]) - --define(APR_IFALLYES,[dnl -+define([APR_IFALLYES],[dnl - ac_rc=yes - for ac_spec in $1; do - ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` -@@ -364,14 +364,14 @@ - ]) - - --define(APR_BEGIN_DECISION,[dnl -+define([APR_BEGIN_DECISION],[dnl - ac_decision_item='$1' - ac_decision_msg='FAILED' - ac_decision='' - ]) - - --define(APR_DECIDE,[dnl -+define([APR_DECIDE],[dnl - ac_decision='$1' - ac_decision_msg='$2' - ac_decision_$1=yes -@@ -379,7 +379,7 @@ - ]) - - --define(APR_DECISION_OVERRIDE,[dnl -+define([APR_DECISION_OVERRIDE],[dnl - ac_decision='' - for ac_item in $1; do - eval "ac_decision_this=\$ac_decision_${ac_item}" -@@ -391,13 +391,13 @@ - ]) - - --define(APR_DECISION_FORCE,[dnl -+define([APR_DECISION_FORCE],[dnl - ac_decision="$1" - eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\"" - ]) - - --define(APR_END_DECISION,[dnl -+define([APR_END_DECISION],[dnl - if test ".$ac_decision" = .; then - echo "[$]0:Error: decision on $ac_decision_item failed" 1>&2 - exit 1 -@@ -417,7 +417,7 @@ - dnl A variant of AC_CHECK_SIZEOF which allows the checking of - dnl sizes of non-builtin types - dnl --AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED, -+AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED], - [changequote(<<,>>)dnl - dnl The name to #define - define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl -@@ -450,7 +450,7 @@ - dnl Tries a compile test with warnings activated so that the result - dnl is false if the code doesn't compile cleanly. - dnl --AC_DEFUN(APR_TRY_COMPILE_NO_WARNING, -+AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - [if test "x$CFLAGS_WARN" = "x"; then - apr_tcnw_flags="" - else -@@ -489,7 +489,7 @@ - dnl string. - dnl - dnl --AC_DEFUN(APR_CHECK_STRERROR_R_RC,[ -+AC_DEFUN([APR_CHECK_STRERROR_R_RC],[ - AC_MSG_CHECKING(for type of return code from strerror_r) - AC_TRY_RUN([ - #include <errno.h> -@@ -522,7 +522,7 @@ - dnl Decide which of a couple of flavors of crypt_r() is necessary for - dnl this platform. - dnl --AC_DEFUN(APR_CHECK_CRYPT_R_STYLE,[ -+AC_DEFUN([APR_CHECK_CRYPT_R_STYLE],[ - AC_CACHE_CHECK(style of crypt_r, ac_cv_crypt_r_style,[ - dnl - ac_cv_crypt_r_style=none -@@ -576,7 +576,7 @@ - dnl structure on this platform. Single UNIX Spec says d_ino, - dnl BSD uses d_fileno. Undef to find the real beast. - dnl --AC_DEFUN(APR_CHECK_DIRENT_INODE, [ -+AC_DEFUN([APR_CHECK_DIRENT_INODE], [ - AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [ - apr_cv_dirent_inode=no - AC_TRY_COMPILE([ -@@ -613,7 +613,7 @@ - dnl Note that this is worthless without DT_xxx macros, so - dnl look for one while we are at it. - dnl --AC_DEFUN(APR_CHECK_DIRENT_TYPE,[ -+AC_DEFUN([APR_CHECK_DIRENT_TYPE],[ - AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[ - apr_cv_dirent_type=no - AC_TRY_COMPILE([ -@@ -645,8 +645,8 @@ - dnl within each iteration. - dnl - changequote({,}) --define({APR_COMMA_ARGS},{patsubst([$}{1],[[}apr_whitespace{]+],[,])}) --define({APR_FOREACH}, -+define([{APR_COMMA_ARGS}],{patsubst([$}{1],[[}apr_whitespace{]+],[,])}) -+define([{APR_FOREACH}], - {ifelse($}{2,,, - [define([eachval], - $}{2)$}{1[]APR_FOREACH([$}{1], -@@ -661,7 +661,7 @@ - dnl all "." and "-" chars. If the 3rd parameter is "yes" then instead of - dnl setting to 1 or 0, we set FLAG-TO-SET to yes or no. - dnl --AC_DEFUN(APR_FLAG_HEADERS,[ -+AC_DEFUN([APR_FLAG_HEADERS],[ - AC_CHECK_HEADERS($1) - for aprt_i in $1 - do -@@ -682,7 +682,7 @@ - dnl is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET - dnl to yes or no. - dnl --AC_DEFUN(APR_FLAG_FUNCS,[ -+AC_DEFUN([APR_FLAG_FUNCS],[ - AC_CHECK_FUNCS($1) - for aprt_j in $1 - do -@@ -707,7 +707,7 @@ - dnl APR_EXPAND_VAR(fraz, $baz) - dnl $fraz is now "1/2/3" - dnl --AC_DEFUN(APR_EXPAND_VAR,[ -+AC_DEFUN([APR_EXPAND_VAR],[ - ap_last= - ap_cur="$2" - while test "x${ap_cur}" != "x${ap_last}"; -@@ -726,7 +726,7 @@ - dnl orig_path="${prefix}/bar" - dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix) - dnl $final_path now contains "bar" --AC_DEFUN(APR_PATH_RELATIVE,[ -+AC_DEFUN([APR_PATH_RELATIVE],[ - ap_stripped=`echo $2 | sed -e "s#^$3##"` - # check if the stripping was successful - if test "x$2" != "x${ap_stripped}"; then -@@ -744,12 +744,12 @@ - dnl Note: this define must be on one line so that it can be properly returned - dnl as the help string. When using this macro with a multi-line RHS, ensure - dnl that you surround the macro invocation with []s --AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])]) -+AC_DEFUN([APR_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])]) - - dnl - dnl APR_LAYOUT(configlayout, layoutname [, extravars]) - dnl --AC_DEFUN(APR_LAYOUT,[ -+AC_DEFUN([APR_LAYOUT],[ - if test ! -f $srcdir/config.layout; then - echo "** Error: Layout file $srcdir/config.layout not found" - echo "** Error: Cannot use undefined layout '$LAYOUT'" -@@ -805,7 +805,7 @@ - dnl - dnl APR_ENABLE_LAYOUT(default layout name [, extra vars]) - dnl --AC_DEFUN(APR_ENABLE_LAYOUT,[ -+AC_DEFUN([APR_ENABLE_LAYOUT],[ - AC_ARG_ENABLE(layout, - [ --enable-layout=LAYOUT],[ - LAYOUT=$enableval -@@ -826,7 +826,7 @@ - dnl a reimplementation of autoconf's argument parser, - dnl used here to allow us to co-exist layouts and argument based - dnl set ups. --AC_DEFUN(APR_PARSE_ARGUMENTS,[ -+AC_DEFUN([APR_PARSE_ARGUMENTS],[ - ac_prev= - for ac_option - do -@@ -948,7 +948,7 @@ - dnl - dnl Determine what program we can use to generate .deps-style dependencies - dnl --AC_DEFUN(APR_CHECK_DEPEND,[ -+AC_DEFUN([APR_CHECK_DEPEND],[ - dnl Try to determine what depend program we can use - dnl All GCC-variants should have -MM. - dnl If not, then we can check on those, too. ---- httpd-2.0.47/srclib/apr/build/find_apr.m4~configure 2002-11-05 17:09:19.000000000 -0500 -+++ httpd-2.0.47/srclib/apr/build/find_apr.m4 2004-01-26 19:39:34.000000000 -0500 -@@ -37,7 +37,7 @@ - dnl value of apr_config to fetch any necessary build/link information. - dnl - --AC_DEFUN(APR_FIND_APR, [ -+AC_DEFUN([APR_FIND_APR], [ - apr_found="no" - - if test "$ac_cv_emxos2" = "yes"; then ---- httpd-2.0.47/srclib/apr-util/build/find_apu.m4~configure 2002-11-05 17:13:42.000000000 -0500 -+++ httpd-2.0.47/srclib/apr-util/build/find_apu.m4 2004-01-26 19:39:34.000000000 -0500 -@@ -41,7 +41,7 @@ - dnl value of apu_config to fetch any necessary build/link information. - dnl - --AC_DEFUN(APR_FIND_APU, [ -+AC_DEFUN([APR_FIND_APU], [ - apu_found="no" - - AC_MSG_CHECKING(for APR-util) diff --git a/nonworking/apache/apache-2.0.47/init b/nonworking/apache/apache-2.0.47/init deleted file mode 100644 index 7a05c38a9a..0000000000 --- a/nonworking/apache/apache-2.0.47/init +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# apache Start the apache HTTP server. -# - -NAME=apache -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/usr/sbin/httpd -SUEXEC=/usr/lib/apache/suexec -PIDFILE=/var/run/$NAME.pid -CONF=/etc/apache/httpd.conf -APACHECTL=/usr/sbin/apachectl - -trap "" 1 -export LANG=C -export PATH - -test -f $DAEMON || exit 0 -test -f $APACHECTL || exit 0 - -# ensure we don't leak environment vars into apachectl -APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL" - -if egrep -q -i "^[[:space:]]*ServerType[[:space:]]+inet" $CONF -then - exit 0 -fi - -case "$1" in - start) - echo -n "Starting web server: $NAME" - start-stop-daemon -S -x $DAEMON - ;; - - stop) - echo -n "Stopping web server: $NAME" - start-stop-daemon -K -x $DAEMON - ;; - - reload) - echo -n "Reloading $NAME configuration" - start-stop-daemon -K --signal USR1 -x $DAEMON - ;; - - reload-modules) - echo -n "Reloading $NAME modules" - start-stop-daemon -K - start-stop-daemon -S -x $DAEMON - ;; - - restart) - $0 reload-modules - exit $? - ;; - - force-reload) - $0 reload-modules - exit $? - ;; - - *) - echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}" - exit 1 - ;; -esac - -if [ $? == 0 ]; then - echo . - exit 0 -else - echo failed - exit 1 -fi diff --git a/nonworking/apache/apache-2.0.47/pcre-configure.patch b/nonworking/apache/apache-2.0.47/pcre-configure.patch deleted file mode 100644 index 0460d17456..0000000000 --- a/nonworking/apache/apache-2.0.47/pcre-configure.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- httpd-2.0.47/srclib/pcre/configure.in~pcre-configure -+++ httpd-2.0.47/srclib/pcre/configure.in -@@ -72,7 +72,8 @@ - AC_ARG_ENABLE(newline-is-cr, - [ --enable-newline-is-cr use CR as the newline character], - if test "$enableval" = "yes"; then -- NEWLINE=-DNEWLINE=13 -+ AC_DEFINE(NEWLINE, 13) -+# NEWLINE=-DNEWLINE=13 - fi - ) - -@@ -81,7 +82,8 @@ - AC_ARG_ENABLE(newline-is-lf, - [ --enable-newline-is-lf use LF as the newline character], - if test "$enableval" = "yes"; then -- NEWLINE=-DNEWLINE=10 -+ AC_DEFINE(NEWLINE, 10) -+# NEWLINE=-DNEWLINE=10 - fi - ) - -@@ -91,7 +93,7 @@ - AC_SUBST(HAVE_STRERROR) - AC_SUBST(LIBTOOL) - AC_SUBST(LIBSUFFIX) --AC_SUBST(NEWLINE) -+#AC_SUBST(NEWLINE) - AC_SUBST(UTF8) - AC_SUBST(PCRE_MAJOR) - AC_SUBST(PCRE_MINOR) diff --git a/nonworking/apache/apache_2.0.47.bb b/nonworking/apache/apache_2.0.47.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/apache/apache_2.0.47.bb +++ /dev/null diff --git a/nonworking/aterm/aterm_0.4.2.bb b/nonworking/aterm/aterm_0.4.2.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/aterm/aterm_0.4.2.bb +++ /dev/null diff --git a/nonworking/bluez-bluefw/bluez-bluefw_0.9.bb b/nonworking/bluez-bluefw/bluez-bluefw_0.9.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/bluez-bluefw/bluez-bluefw_0.9.bb +++ /dev/null diff --git a/nonworking/bogl/bogl-utils-native_0.1.9.bb b/nonworking/bogl/bogl-utils-native_0.1.9.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/bogl/bogl-utils-native_0.1.9.bb +++ /dev/null diff --git a/nonworking/bogl/libbogl_0.1.9.bb b/nonworking/bogl/libbogl_0.1.9.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/bogl/libbogl_0.1.9.bb +++ /dev/null diff --git a/nonworking/centericq/centericq-4.9.12/configure.patch b/nonworking/centericq/centericq-4.9.12/configure.patch deleted file mode 100644 index ac646b4f3e..0000000000 --- a/nonworking/centericq/centericq-4.9.12/configure.patch +++ /dev/null @@ -1,76 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- centericq-4.9.12/./configure.in~configure.patch -+++ centericq-4.9.12/./configure.in -@@ -84,13 +84,6 @@ - else - AC_MSG_RESULT([not found or disabled]) - with_ssl="no" -- -- AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [ -- CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS" -- LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra" -- AC_DEFINE(HAVE_GNUTLS, 1, [use gnutls]) -- with_ssl="yes" -- ]) - fi - fi - ---- centericq-4.9.12/./connwrap-0.1/configure.in~configure.patch -+++ centericq-4.9.12/./connwrap-0.1/configure.in -@@ -45,29 +45,29 @@ - else - AC_MSG_RESULT([not found or disabled]) - -- AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [ -- CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS" -- LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra" -- AC_DEFINE(HAVE_GNUTLS) -- ]) -+# AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [ -+# CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS" -+# LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra" -+# AC_DEFINE(HAVE_GNUTLS) -+# ]) - fi - fi - - AC_MSG_CHECKING(for inet_aton() presence) - --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> - --], [ -+]], [[ - - struct in_addr inp; - inet_aton("address", &inp); - --], have_aton=yes, have_aton=no) -+]])],[have_aton=yes],[have_aton=no]) - - if test "$have_aton" = "yes"; then - AC_DEFINE(HAVE_INET_ATON) ---- centericq-4.9.12/libgadu-0.1/configure.in~configure.patch -+++ centericq-4.9.12/libgadu-0.1/configure.in -@@ -48,12 +48,6 @@ - AC_CHECK_LIB(ssl, main) - else - AC_MSG_RESULT([not found or disabled]) -- -- AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [ -- CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS" -- LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra" -- AC_DEFINE(HAVE_GNUTLS) -- ]) - fi - fi - diff --git a/nonworking/centericq/centericq-4.9.12/m4.patch b/nonworking/centericq/centericq-4.9.12/m4.patch deleted file mode 100644 index 60276a0ba6..0000000000 --- a/nonworking/centericq/centericq-4.9.12/m4.patch +++ /dev/null @@ -1,1956 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null -+++ centericq-4.9.7/m4/codeset.m4 -@@ -0,0 +1,23 @@ -+# codeset.m4 serial AM1 (gettext-0.10.40) -+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([AM_LANGINFO_CODESET], -+[ -+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, -+ [AC_TRY_LINK([#include <langinfo.h>], -+ [char* cs = nl_langinfo(CODESET);], -+ am_cv_langinfo_codeset=yes, -+ am_cv_langinfo_codeset=no) -+ ]) -+ if test $am_cv_langinfo_codeset = yes; then -+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1, -+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) -+ fi -+]) ---- /dev/null -+++ centericq-4.9.7/m4/gettext.m4 -@@ -0,0 +1,587 @@ -+# gettext.m4 serial 17 (gettext-0.11.5) -+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are *not* in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002. -+ -+dnl Macro to add for using GNU gettext. -+ -+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The -+dnl default (if it is not specified or empty) is 'no-libtool'. -+dnl INTLSYMBOL should be 'external' for packages with no intl directory, -+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. -+dnl If INTLSYMBOL is 'use-libtool', then a libtool library -+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, -+dnl depending on --{enable,disable}-{shared,static} and on the presence of -+dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library -+dnl $(top_builddir)/intl/libintl.a will be created. -+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -+dnl implementations (in libc or libintl) without the ngettext() function -+dnl will be ignored. If NEEDSYMBOL is specified and is -+dnl 'need-formatstring-macros', then GNU gettext implementations that don't -+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. -+dnl INTLDIR is used to find the intl libraries. If empty, -+dnl the value `$(top_builddir)/intl/' is used. -+dnl -+dnl The result of the configuration is one of three cases: -+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -+dnl and used. -+dnl Catalog format: GNU --> install in $(datadir) -+dnl Catalog extension: .mo after installation, .gmo in source tree -+dnl 2) GNU gettext has been found in the system's C library. -+dnl Catalog format: GNU --> install in $(datadir) -+dnl Catalog extension: .mo after installation, .gmo in source tree -+dnl 3) No internationalization, always use English msgid. -+dnl Catalog format: none -+dnl Catalog extension: none -+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. -+dnl The use of .gmo is historical (it was needed to avoid overwriting the -+dnl GNU format catalogs when building on a platform with an X/Open gettext), -+dnl but we keep it in order not to force irrelevant filename changes on the -+dnl maintainers. -+dnl -+AC_DEFUN([AM_GNU_GETTEXT], -+[ -+ dnl Argument checking. -+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , -+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -+])])])])]) -+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , -+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT -+])])])]) -+ define(gt_included_intl, ifelse([$1], [external], [no], [yes])) -+ define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) -+ -+ AC_REQUIRE([AM_PO_SUBDIRS])dnl -+ ifelse(gt_included_intl, yes, [ -+ AC_REQUIRE([AM_INTL_SUBDIR])dnl -+ ]) -+ -+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. -+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -+ AC_REQUIRE([AC_LIB_RPATH]) -+ -+ dnl Sometimes libintl requires libiconv, so first search for libiconv. -+ dnl Ideally we would do this search only after the -+ dnl if test "$USE_NLS" = "yes"; then -+ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then -+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT -+ dnl the configure script would need to contain the same shell code -+ dnl again, outside any 'if'. There are two solutions: -+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. -+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. -+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not -+ dnl documented, we avoid it. -+ ifelse(gt_included_intl, yes, , [ -+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) -+ ]) -+ -+ AC_MSG_CHECKING([whether NLS is requested]) -+ dnl Default is enabled NLS -+ AC_ARG_ENABLE(nls, -+ [ --disable-nls do not use Native Language Support], -+ USE_NLS=$enableval, USE_NLS=yes) -+ AC_MSG_RESULT($USE_NLS) -+ AC_SUBST(USE_NLS) -+ -+ ifelse(gt_included_intl, yes, [ -+ BUILD_INCLUDED_LIBINTL=no -+ USE_INCLUDED_LIBINTL=no -+ ]) -+ LIBINTL= -+ LTLIBINTL= -+ POSUB= -+ -+ dnl If we use NLS figure out what method -+ if test "$USE_NLS" = "yes"; then -+ gt_use_preinstalled_gnugettext=no -+ ifelse(gt_included_intl, yes, [ -+ AC_MSG_CHECKING([whether included gettext is requested]) -+ AC_ARG_WITH(included-gettext, -+ [ --with-included-gettext use the GNU gettext library included here], -+ nls_cv_force_use_gnu_gettext=$withval, -+ nls_cv_force_use_gnu_gettext=no) -+ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) -+ -+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" -+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then -+ ]) -+ dnl User does not insist on using GNU NLS library. Figure out what -+ dnl to use. If GNU gettext is available we use this. Else we have -+ dnl to fall back to GNU NLS library. -+ -+ dnl Add a version number to the cache macros. -+ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) -+ define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) -+ define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) -+ -+ AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, -+ [AC_TRY_LINK([#include <libintl.h> -+]ifelse([$2], [need-formatstring-macros], -+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -+#endif -+changequote(,)dnl -+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -+changequote([,])dnl -+], [])[extern int _nl_msg_cat_cntr; -+extern int *_nl_domain_bindings;], -+ [bindtextdomain ("", ""); -+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], -+ gt_cv_func_gnugettext_libc=yes, -+ gt_cv_func_gnugettext_libc=no)]) -+ -+ if test "$gt_cv_func_gnugettext_libc" != "yes"; then -+ dnl Sometimes libintl requires libiconv, so first search for libiconv. -+ ifelse(gt_included_intl, yes, , [ -+ AM_ICONV_LINK -+ ]) -+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL -+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) -+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL -+ dnl even if libiconv doesn't exist. -+ AC_LIB_LINKFLAGS_BODY([intl]) -+ AC_CACHE_CHECK([for GNU gettext in libintl], -+ gt_cv_func_gnugettext_libintl, -+ [gt_save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $INCINTL" -+ gt_save_LIBS="$LIBS" -+ LIBS="$LIBS $LIBINTL" -+ dnl Now see whether libintl exists and does not depend on libiconv. -+ AC_TRY_LINK([#include <libintl.h> -+]ifelse([$2], [need-formatstring-macros], -+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -+#endif -+changequote(,)dnl -+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -+changequote([,])dnl -+], [])[extern int _nl_msg_cat_cntr; -+extern -+#ifdef __cplusplus -+"C" -+#endif -+const char *_nl_expand_alias ();], -+ [bindtextdomain ("", ""); -+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], -+ gt_cv_func_gnugettext_libintl=yes, -+ gt_cv_func_gnugettext_libintl=no) -+ dnl Now see whether libintl exists and depends on libiconv. -+ if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then -+ LIBS="$LIBS $LIBICONV" -+ AC_TRY_LINK([#include <libintl.h> -+]ifelse([$2], [need-formatstring-macros], -+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -+#endif -+changequote(,)dnl -+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -+changequote([,])dnl -+], [])[extern int _nl_msg_cat_cntr; -+extern -+#ifdef __cplusplus -+"C" -+#endif -+const char *_nl_expand_alias ();], -+ [bindtextdomain ("", ""); -+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], -+ [LIBINTL="$LIBINTL $LIBICONV" -+ LTLIBINTL="$LTLIBINTL $LTLIBICONV" -+ gt_cv_func_gnugettext_libintl=yes -+ ]) -+ fi -+ CPPFLAGS="$gt_save_CPPFLAGS" -+ LIBS="$gt_save_LIBS"]) -+ fi -+ -+ dnl If an already present or preinstalled GNU gettext() is found, -+ dnl use it. But if this macro is used in GNU gettext, and GNU -+ dnl gettext is already preinstalled in libintl, we update this -+ dnl libintl. (Cf. the install rule in intl/Makefile.in.) -+ if test "$gt_cv_func_gnugettext_libc" = "yes" \ -+ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ -+ && test "$PACKAGE" != gettext; }; then -+ gt_use_preinstalled_gnugettext=yes -+ else -+ dnl Reset the values set by searching for libintl. -+ LIBINTL= -+ LTLIBINTL= -+ INCINTL= -+ fi -+ -+ ifelse(gt_included_intl, yes, [ -+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then -+ dnl GNU gettext is not found in the C library. -+ dnl Fall back on included GNU gettext library. -+ nls_cv_use_gnu_gettext=yes -+ fi -+ fi -+ -+ if test "$nls_cv_use_gnu_gettext" = "yes"; then -+ dnl Mark actions used to generate GNU NLS library. -+ INTLOBJS="\$(GETTOBJS)" -+ BUILD_INCLUDED_LIBINTL=yes -+ USE_INCLUDED_LIBINTL=yes -+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" -+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" -+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` -+ fi -+ -+ if test "$gt_use_preinstalled_gnugettext" = "yes" \ -+ || test "$nls_cv_use_gnu_gettext" = "yes"; then -+ dnl Mark actions to use GNU gettext tools. -+ CATOBJEXT=.gmo -+ fi -+ ]) -+ -+ if test "$gt_use_preinstalled_gnugettext" = "yes" \ -+ || test "$nls_cv_use_gnu_gettext" = "yes"; then -+ AC_DEFINE(ENABLE_NLS, 1, -+ [Define to 1 if translation of program messages to the user's native language -+ is requested.]) -+ else -+ USE_NLS=no -+ fi -+ fi -+ -+ if test "$USE_NLS" = "yes"; then -+ -+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then -+ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then -+ AC_MSG_CHECKING([how to link with libintl]) -+ AC_MSG_RESULT([$LIBINTL]) -+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) -+ fi -+ -+ dnl For backward compatibility. Some packages may be using this. -+ AC_DEFINE(HAVE_GETTEXT, 1, -+ [Define if the GNU gettext() function is already present or preinstalled.]) -+ AC_DEFINE(HAVE_DCGETTEXT, 1, -+ [Define if the GNU dcgettext() function is already present or preinstalled.]) -+ fi -+ -+ dnl We need to process the po/ directory. -+ POSUB=po -+ fi -+ -+ ifelse(gt_included_intl, yes, [ -+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL -+ dnl to 'yes' because some of the testsuite requires it. -+ if test "$PACKAGE" = gettext; then -+ BUILD_INCLUDED_LIBINTL=yes -+ fi -+ -+ dnl Make all variables we use known to autoconf. -+ AC_SUBST(BUILD_INCLUDED_LIBINTL) -+ AC_SUBST(USE_INCLUDED_LIBINTL) -+ AC_SUBST(CATOBJEXT) -+ AC_SUBST(INTLOBJS) -+ -+ dnl For backward compatibility. Some configure.ins may be using this. -+ nls_cv_header_intl= -+ nls_cv_header_libgt= -+ -+ dnl For backward compatibility. Some Makefiles may be using this. -+ DATADIRNAME=share -+ AC_SUBST(DATADIRNAME) -+ -+ dnl For backward compatibility. Some Makefiles may be using this. -+ INSTOBJEXT=.mo -+ AC_SUBST(INSTOBJEXT) -+ -+ dnl For backward compatibility. Some Makefiles may be using this. -+ GENCAT=gencat -+ AC_SUBST(GENCAT) -+ -+ dnl Enable libtool support if the surrounding package wishes it. -+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix -+ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) -+ ]) -+ -+ dnl For backward compatibility. Some Makefiles may be using this. -+ INTLLIBS="$LIBINTL" -+ AC_SUBST(INTLLIBS) -+ -+ dnl Make all documented variables known to autoconf. -+ AC_SUBST(LIBINTL) -+ AC_SUBST(LTLIBINTL) -+ AC_SUBST(POSUB) -+]) -+ -+ -+dnl Checks for all prerequisites of the po subdirectory, -+dnl except for USE_NLS. -+AC_DEFUN([AM_PO_SUBDIRS], -+[ -+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+ AC_REQUIRE([AC_PROG_INSTALL])dnl -+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl -+ -+ dnl Perform the following tests also if --disable-nls has been given, -+ dnl because they are needed for "make dist" to work. -+ -+ dnl Search for GNU msgfmt in the PATH. -+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. -+ dnl The second test excludes FreeBSD msgfmt. -+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -+ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && -+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], -+ :) -+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -+ -+ dnl Search for GNU xgettext 0.11 or newer in the PATH. -+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions. -+ dnl The second test excludes FreeBSD xgettext. -+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -+ [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && -+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], -+ :) -+ dnl Remove leftover from FreeBSD xgettext call. -+ rm -f messages.po -+ -+ dnl Search for GNU msgmerge 0.11 or newer in the PATH. -+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, -+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) -+ -+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. -+ dnl Test whether we really found GNU msgfmt. -+ if test "$GMSGFMT" != ":"; then -+ dnl If it is no GNU msgfmt we define it as : so that the -+ dnl Makefiles still can work. -+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && -+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then -+ : ; -+ else -+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` -+ AC_MSG_RESULT( -+ [found $GMSGFMT program is not GNU msgfmt; ignore it]) -+ GMSGFMT=":" -+ fi -+ fi -+ -+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. -+ dnl Test whether we really found GNU xgettext. -+ if test "$XGETTEXT" != ":"; then -+ dnl If it is no GNU xgettext we define it as : so that the -+ dnl Makefiles still can work. -+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && -+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then -+ : ; -+ else -+ AC_MSG_RESULT( -+ [found xgettext program is not GNU xgettext; ignore it]) -+ XGETTEXT=":" -+ fi -+ dnl Remove leftover from FreeBSD xgettext call. -+ rm -f messages.po -+ fi -+ -+ AC_OUTPUT_COMMANDS([ -+ for ac_file in $CONFIG_FILES; do -+ # Support "outfile[:infile[:infile...]]" -+ case "$ac_file" in -+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; -+ esac -+ # PO directories have a Makefile.in generated from Makefile.in.in. -+ case "$ac_file" in */Makefile.in) -+ # Adjust a relative srcdir. -+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` -+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" -+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` -+ # In autoconf-2.13 it is called $ac_given_srcdir. -+ # In autoconf-2.50 it is called $srcdir. -+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" -+ case "$ac_given_srcdir" in -+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; -+ /*) top_srcdir="$ac_given_srcdir" ;; -+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;; -+ esac -+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then -+ rm -f "$ac_dir/POTFILES" -+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" -+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" -+ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend -+ # on $ac_dir but don't depend on user-specified configuration -+ # parameters. -+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then -+ # The LINGUAS file contains the set of available languages. -+ if test -n "$ALL_LINGUAS"; then -+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" -+ fi -+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` -+ # Hide the ALL_LINGUAS assigment from automake. -+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_' -+ fi -+ case "$ac_given_srcdir" in -+ .) srcdirpre= ;; -+ *) srcdirpre='$(srcdir)/' ;; -+ esac -+ POFILES= -+ GMOFILES= -+ UPDATEPOFILES= -+ DUMMYPOFILES= -+ for lang in $ALL_LINGUAS; do -+ POFILES="$POFILES $srcdirpre$lang.po" -+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo" -+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" -+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop" -+ done -+ # CATALOGS depends on both $ac_dir and the user's LINGUAS -+ # environment variable. -+ INST_LINGUAS= -+ if test -n "$ALL_LINGUAS"; then -+ for presentlang in $ALL_LINGUAS; do -+ useit=no -+ if test "%UNSET%" != "$LINGUAS"; then -+ desiredlanguages="$LINGUAS" -+ else -+ desiredlanguages="$ALL_LINGUAS" -+ fi -+ for desiredlang in $desiredlanguages; do -+ # Use the presentlang catalog if desiredlang is -+ # a. equal to presentlang, or -+ # b. a variant of presentlang (because in this case, -+ # presentlang can be used as a fallback for messages -+ # which are not translated in the desiredlang catalog). -+ case "$desiredlang" in -+ "$presentlang"*) useit=yes;; -+ esac -+ done -+ if test $useit = yes; then -+ INST_LINGUAS="$INST_LINGUAS $presentlang" -+ fi -+ done -+ fi -+ CATALOGS= -+ if test -n "$INST_LINGUAS"; then -+ for lang in $INST_LINGUAS; do -+ CATALOGS="$CATALOGS $lang.gmo" -+ done -+ fi -+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" -+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" -+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do -+ if test -f "$f"; then -+ case "$f" in -+ *.orig | *.bak | *~) ;; -+ *) cat "$f" >> "$ac_dir/Makefile" ;; -+ esac -+ fi -+ done -+ fi -+ ;; -+ esac -+ done], -+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute -+ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it -+ # from automake. -+ eval 'ALL_LINGUAS''="$ALL_LINGUAS"' -+ # Capture the value of LINGUAS because we need it to compute CATALOGS. -+ LINGUAS="${LINGUAS-%UNSET%}" -+ ]) -+]) -+ -+ -+dnl Checks for all prerequisites of the intl subdirectory, -+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -+AC_DEFUN([AM_INTL_SUBDIR], -+[ -+ AC_REQUIRE([AC_PROG_INSTALL])dnl -+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl -+ AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ AC_REQUIRE([AC_PROG_RANLIB])dnl -+ AC_REQUIRE([AC_ISC_POSIX])dnl -+ AC_REQUIRE([AC_HEADER_STDC])dnl -+ AC_REQUIRE([AC_C_CONST])dnl -+ AC_REQUIRE([AC_C_INLINE])dnl -+ AC_REQUIRE([AC_TYPE_OFF_T])dnl -+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl -+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl -+ AC_REQUIRE([AC_FUNC_MMAP])dnl -+ AC_REQUIRE([jm_GLIBC21])dnl -+ AC_REQUIRE([gt_INTDIV0])dnl -+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl -+ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl -+ AC_REQUIRE([gt_INTTYPES_PRI])dnl -+ -+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -+stdlib.h string.h unistd.h sys/param.h]) -+ AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ -+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ -+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) -+ -+ AM_ICONV -+ AM_LANGINFO_CODESET -+ if test $ac_cv_header_locale_h = yes; then -+ AM_LC_MESSAGES -+ fi -+ -+ dnl intl/plural.c is generated from intl/plural.y. It requires bison, -+ dnl because plural.y uses bison specific features. It requires at least -+ dnl bison-1.26 because earlier versions generate a plural.c that doesn't -+ dnl compile. -+ dnl bison is only needed for the maintainer (who touches plural.y). But in -+ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put -+ dnl the rule in general Makefile. Now, some people carelessly touch the -+ dnl files or have a broken "make" program, hence the plural.c rule will -+ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not -+ dnl present or too old. -+ AC_CHECK_PROGS([INTLBISON], [bison]) -+ if test -z "$INTLBISON"; then -+ ac_verc_fail=yes -+ else -+ dnl Found it, now check the version. -+ AC_MSG_CHECKING([version of bison]) -+changequote(<<,>>)dnl -+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` -+ case $ac_prog_version in -+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -+changequote([,])dnl -+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; -+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; -+ esac -+ AC_MSG_RESULT([$ac_prog_version]) -+ fi -+ if test $ac_verc_fail = yes; then -+ INTLBISON=: -+ fi -+]) -+ -+ -+AC_DEFUN([AM_MKINSTALLDIRS], -+[ -+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -+ dnl find the mkinstalldirs script in another subdir but $(top_srcdir). -+ dnl Try to locate is. -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+ fi -+ AC_SUBST(MKINSTALLDIRS) -+]) -+ -+ -+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) -+AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) ---- /dev/null -+++ centericq-4.9.7/m4/glibc21.m4 -@@ -0,0 +1,32 @@ -+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) -+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+# Test for the GNU C Library, version 2.1 or newer. -+# From Bruno Haible. -+ -+AC_DEFUN([jm_GLIBC21], -+ [ -+ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, -+ ac_cv_gnu_library_2_1, -+ [AC_EGREP_CPP([Lucky GNU user], -+ [ -+#include <features.h> -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) -+ Lucky GNU user -+ #endif -+#endif -+ ], -+ ac_cv_gnu_library_2_1=yes, -+ ac_cv_gnu_library_2_1=no) -+ ] -+ ) -+ AC_SUBST(GLIBC21) -+ GLIBC21="$ac_cv_gnu_library_2_1" -+ ] -+) ---- /dev/null -+++ centericq-4.9.7/m4/iconv.m4 -@@ -0,0 +1,103 @@ -+# iconv.m4 serial AM4 (gettext-0.11.3) -+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -+[ -+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. -+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -+ AC_REQUIRE([AC_LIB_RPATH]) -+ -+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV -+ dnl accordingly. -+ AC_LIB_LINKFLAGS_BODY([iconv]) -+]) -+ -+AC_DEFUN([AM_ICONV_LINK], -+[ -+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and -+ dnl those with the standalone portable GNU libiconv installed). -+ -+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV -+ dnl accordingly. -+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) -+ -+ dnl Add $INCICONV to CPPFLAGS before performing the following checks, -+ dnl because if the user has installed libiconv and not disabled its use -+ dnl via --without-libiconv-prefix, he wants to use it. The first -+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. -+ am_save_CPPFLAGS="$CPPFLAGS" -+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) -+ -+ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ -+ am_cv_func_iconv="no, consider installing GNU libiconv" -+ am_cv_lib_iconv=no -+ AC_TRY_LINK([#include <stdlib.h> -+#include <iconv.h>], -+ [iconv_t cd = iconv_open("",""); -+ iconv(cd,NULL,NULL,NULL,NULL); -+ iconv_close(cd);], -+ am_cv_func_iconv=yes) -+ if test "$am_cv_func_iconv" != yes; then -+ am_save_LIBS="$LIBS" -+ LIBS="$LIBS $LIBICONV" -+ AC_TRY_LINK([#include <stdlib.h> -+#include <iconv.h>], -+ [iconv_t cd = iconv_open("",""); -+ iconv(cd,NULL,NULL,NULL,NULL); -+ iconv_close(cd);], -+ am_cv_lib_iconv=yes -+ am_cv_func_iconv=yes) -+ LIBS="$am_save_LIBS" -+ fi -+ ]) -+ if test "$am_cv_func_iconv" = yes; then -+ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) -+ fi -+ if test "$am_cv_lib_iconv" = yes; then -+ AC_MSG_CHECKING([how to link with libiconv]) -+ AC_MSG_RESULT([$LIBICONV]) -+ else -+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV -+ dnl either. -+ CPPFLAGS="$am_save_CPPFLAGS" -+ LIBICONV= -+ LTLIBICONV= -+ fi -+ AC_SUBST(LIBICONV) -+ AC_SUBST(LTLIBICONV) -+]) -+ -+AC_DEFUN([AM_ICONV], -+[ -+ AM_ICONV_LINK -+ if test "$am_cv_func_iconv" = yes; then -+ AC_MSG_CHECKING([for iconv declaration]) -+ AC_CACHE_VAL(am_cv_proto_iconv, [ -+ AC_TRY_COMPILE([ -+#include <stdlib.h> -+#include <iconv.h> -+extern -+#ifdef __cplusplus -+"C" -+#endif -+#if defined(__STDC__) || defined(__cplusplus) -+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -+#else -+size_t iconv(); -+#endif -+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") -+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) -+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` -+ AC_MSG_RESULT([$]{ac_t:- -+ }[$]am_cv_proto_iconv) -+ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, -+ [Define as const if the declaration of iconv() needs const.]) -+ fi -+]) ---- /dev/null -+++ centericq-4.9.7/m4/intdiv0.m4 -@@ -0,0 +1,72 @@ -+# intdiv0.m4 serial 1 (gettext-0.11.3) -+dnl Copyright (C) 2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([gt_INTDIV0], -+[ -+ AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ -+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], -+ gt_cv_int_divbyzero_sigfpe, -+ [ -+ AC_TRY_RUN([ -+#include <stdlib.h> -+#include <signal.h> -+ -+static void -+#ifdef __cplusplus -+sigfpe_handler (int sig) -+#else -+sigfpe_handler (sig) int sig; -+#endif -+{ -+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ -+ exit (sig != SIGFPE); -+} -+ -+int x = 1; -+int y = 0; -+int z; -+int nan; -+ -+int main () -+{ -+ signal (SIGFPE, sigfpe_handler); -+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ -+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) -+ signal (SIGTRAP, sigfpe_handler); -+#endif -+/* Linux/SPARC yields signal SIGILL. */ -+#if defined (__sparc__) && defined (__linux__) -+ signal (SIGILL, sigfpe_handler); -+#endif -+ -+ z = x / y; -+ nan = y / y; -+ exit (1); -+} -+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, -+ [ -+ # Guess based on the CPU. -+ case "$host_cpu" in -+ alpha* | i[34567]86 | m68k | s390*) -+ gt_cv_int_divbyzero_sigfpe="guessing yes";; -+ *) -+ gt_cv_int_divbyzero_sigfpe="guessing no";; -+ esac -+ ]) -+ ]) -+ case "$gt_cv_int_divbyzero_sigfpe" in -+ *yes) value=1;; -+ *) value=0;; -+ esac -+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, -+ [Define if integer division by zero raises signal SIGFPE.]) -+]) ---- /dev/null -+++ centericq-4.9.7/m4/inttypes_h.m4 -@@ -0,0 +1,28 @@ -+# inttypes_h.m4 serial 4 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, -+# doesn't clash with <sys/types.h>, and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_INTTYPES_H], -+[ -+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, -+ [AC_TRY_COMPILE( -+ [#include <sys/types.h> -+#include <inttypes.h>], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_inttypes_h=yes, -+ jm_ac_cv_header_inttypes_h=no)]) -+ if test $jm_ac_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, -+ and declares uintmax_t. ]) -+ fi -+]) ---- /dev/null -+++ centericq-4.9.7/m4/inttypes.m4 -@@ -0,0 +1,27 @@ -+# inttypes.m4 serial 1 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with -+# <sys/types.h>. -+ -+AC_DEFUN([gt_HEADER_INTTYPES_H], -+[ -+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, -+ [ -+ AC_TRY_COMPILE( -+ [#include <sys/types.h> -+#include <inttypes.h>], -+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) -+ ]) -+ if test $gt_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, -+ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.]) -+ fi -+]) ---- /dev/null -+++ centericq-4.9.7/m4/inttypes-pri.m4 -@@ -0,0 +1,32 @@ -+# inttypes-pri.m4 serial 1 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* -+# macros to non-string values. This is the case on AIX 4.3.3. -+ -+AC_DEFUN([gt_INTTYPES_PRI], -+[ -+ AC_REQUIRE([gt_HEADER_INTTYPES_H]) -+ if test $gt_cv_header_inttypes_h = yes; then -+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], -+ gt_cv_inttypes_pri_broken, -+ [ -+ AC_TRY_COMPILE([#include <inttypes.h> -+#ifdef PRId32 -+char *p = PRId32; -+#endif -+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) -+ ]) -+ fi -+ if test "$gt_cv_inttypes_pri_broken" = yes; then -+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, -+ [Define if <inttypes.h> exists and defines unusable PRI* macros.]) -+ fi -+]) ---- /dev/null -+++ centericq-4.9.7/m4/isc-posix.m4 -@@ -0,0 +1,26 @@ -+# isc-posix.m4 serial 2 (gettext-0.11.2) -+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. -+ -+# This test replaces the one in autoconf. -+# Currently this macro should have the same name as the autoconf macro -+# because gettext's gettext.m4 (distributed in the automake package) -+# still uses it. Otherwise, the use in gettext.m4 makes autoheader -+# give these diagnostics: -+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX -+ -+undefine([AC_ISC_POSIX]) -+ -+AC_DEFUN([AC_ISC_POSIX], -+ [ -+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge. -+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) -+ ] -+) ---- /dev/null -+++ centericq-4.9.7/m4/lcmessage.m4 -@@ -0,0 +1,32 @@ -+# lcmessage.m4 serial 3 (gettext-0.11.3) -+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are *not* in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper <drepper@cygnus.com>, 1995. -+ -+# Check whether LC_MESSAGES is available in <locale.h>. -+ -+AC_DEFUN([AM_LC_MESSAGES], -+[ -+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], -+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ AC_DEFINE(HAVE_LC_MESSAGES, 1, -+ [Define if your <locale.h> file defines LC_MESSAGES.]) -+ fi -+]) ---- /dev/null -+++ centericq-4.9.7/m4/lib-ld.m4 -@@ -0,0 +1,97 @@ -+# lib-ld.m4 serial 1 (gettext-0.11) -+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl Subroutines of libtool.m4, -+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -+dnl with libtool.m4. -+ -+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -+AC_DEFUN([AC_LIB_PROG_LD_GNU], -+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -+[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then -+ acl_cv_prog_gnu_ld=yes -+else -+ acl_cv_prog_gnu_ld=no -+fi]) -+with_gnu_ld=$acl_cv_prog_gnu_ld -+]) -+ -+dnl From libtool-1.4. Sets the variable LD. -+AC_DEFUN([AC_LIB_PROG_LD], -+[AC_ARG_WITH(gnu-ld, -+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ AC_MSG_CHECKING([for ld used by GCC]) -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [[\\/]* | [A-Za-z]:[\\/]*)] -+ [re_direlt='/[^/][^/]*/\.\./'] -+ # Canonicalize the path of ld -+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ AC_MSG_CHECKING([for GNU ld]) -+else -+ AC_MSG_CHECKING([for non-GNU ld]) -+fi -+AC_CACHE_VAL(acl_cv_path_LD, -+[if test -z "$LD"; then -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ acl_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some GNU ld's only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then -+ test "$with_gnu_ld" != no && break -+ else -+ test "$with_gnu_ld" != yes && break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+else -+ acl_cv_path_LD="$LD" # Let the user override the test with a path. -+fi]) -+LD="$acl_cv_path_LD" -+if test -n "$LD"; then -+ AC_MSG_RESULT($LD) -+else -+ AC_MSG_RESULT(no) -+fi -+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -+AC_LIB_PROG_LD_GNU -+]) ---- /dev/null -+++ centericq-4.9.7/m4/lib-link.m4 -@@ -0,0 +1,554 @@ -+# lib-link.m4 serial 3 (gettext-0.11.3) -+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -+dnl the libraries corresponding to explicit and implicit dependencies. -+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -+dnl augments the CPPFLAGS variable. -+AC_DEFUN([AC_LIB_LINKFLAGS], -+[ -+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -+ AC_REQUIRE([AC_LIB_RPATH]) -+ define([Name],[translit([$1],[./-], [___])]) -+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ -+ AC_LIB_LINKFLAGS_BODY([$1], [$2]) -+ ac_cv_lib[]Name[]_libs="$LIB[]NAME" -+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" -+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME" -+ ]) -+ LIB[]NAME="$ac_cv_lib[]Name[]_libs" -+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" -+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags" -+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) -+ AC_SUBST([LIB]NAME) -+ AC_SUBST([LTLIB]NAME) -+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the -+ dnl results of this search when this library appears as a dependency. -+ HAVE_LIB[]NAME=yes -+ undefine([Name]) -+ undefine([NAME]) -+]) -+ -+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -+dnl searches for libname and the libraries corresponding to explicit and -+dnl implicit dependencies, together with the specified include files and -+dnl the ability to compile and link the specified testcode. If found, it -+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -+[ -+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -+ AC_REQUIRE([AC_LIB_RPATH]) -+ define([Name],[translit([$1],[./-], [___])]) -+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -+ -+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME -+ dnl accordingly. -+ AC_LIB_LINKFLAGS_BODY([$1], [$2]) -+ -+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, -+ dnl because if the user has installed lib[]Name and not disabled its use -+ dnl via --without-lib[]Name-prefix, he wants to use it. -+ ac_save_CPPFLAGS="$CPPFLAGS" -+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) -+ -+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ -+ ac_save_LIBS="$LIBS" -+ LIBS="$LIBS $LIB[]NAME" -+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) -+ LIBS="$ac_save_LIBS" -+ ]) -+ if test "$ac_cv_lib[]Name" = yes; then -+ HAVE_LIB[]NAME=yes -+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) -+ AC_MSG_CHECKING([how to link with lib[]$1]) -+ AC_MSG_RESULT([$LIB[]NAME]) -+ else -+ HAVE_LIB[]NAME=no -+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need -+ dnl $INC[]NAME either. -+ CPPFLAGS="$ac_save_CPPFLAGS" -+ LIB[]NAME= -+ LTLIB[]NAME= -+ fi -+ AC_SUBST([HAVE_LIB]NAME) -+ AC_SUBST([LIB]NAME) -+ AC_SUBST([LTLIB]NAME) -+ undefine([Name]) -+ undefine([NAME]) -+]) -+ -+dnl Determine the platform dependent parameters needed to use rpath: -+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -+dnl hardcode_direct, hardcode_minus_L, -+dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec. -+AC_DEFUN([AC_LIB_RPATH], -+[ -+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS -+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host -+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir -+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ -+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ -+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh -+ . ./conftest.sh -+ rm -f ./conftest.sh -+ acl_cv_rpath=done -+ ]) -+ wl="$acl_cv_wl" -+ libext="$acl_cv_libext" -+ shlibext="$acl_cv_shlibext" -+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" -+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" -+ hardcode_direct="$acl_cv_hardcode_direct" -+ hardcode_minus_L="$acl_cv_hardcode_minus_L" -+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" -+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" -+ dnl Determine whether the user wants rpath handling at all. -+ AC_ARG_ENABLE(rpath, -+ [ --disable-rpath do not hardcode runtime library paths], -+ :, enable_rpath=yes) -+]) -+ -+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -+dnl the libraries corresponding to explicit and implicit dependencies. -+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -+AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -+[ -+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -+ dnl By default, look in $includedir and $libdir. -+ use_additional=yes -+ AC_LIB_WITH_FINAL_PREFIX([ -+ eval additional_includedir=\"$includedir\" -+ eval additional_libdir=\"$libdir\" -+ ]) -+ AC_ARG_WITH([lib$1-prefix], -+[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib -+ --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -+[ -+ if test "X$withval" = "Xno"; then -+ use_additional=no -+ else -+ if test "X$withval" = "X"; then -+ AC_LIB_WITH_FINAL_PREFIX([ -+ eval additional_includedir=\"$includedir\" -+ eval additional_libdir=\"$libdir\" -+ ]) -+ else -+ additional_includedir="$withval/include" -+ additional_libdir="$withval/lib" -+ fi -+ fi -+]) -+ dnl Search the library and its dependencies in $additional_libdir and -+ dnl $LDFLAGS. Using breadth-first-seach. -+ LIB[]NAME= -+ LTLIB[]NAME= -+ INC[]NAME= -+ rpathdirs= -+ ltrpathdirs= -+ names_already_handled= -+ names_next_round='$1 $2' -+ while test -n "$names_next_round"; do -+ names_this_round="$names_next_round" -+ names_next_round= -+ for name in $names_this_round; do -+ already_handled= -+ for n in $names_already_handled; do -+ if test "$n" = "$name"; then -+ already_handled=yes -+ break -+ fi -+ done -+ if test -z "$already_handled"; then -+ names_already_handled="$names_already_handled $name" -+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS -+ dnl or AC_LIB_HAVE_LINKFLAGS call. -+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` -+ eval value=\"\$HAVE_LIB$uppername\" -+ if test -n "$value"; then -+ if test "$value" = yes; then -+ eval value=\"\$LIB$uppername\" -+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" -+ eval value=\"\$LTLIB$uppername\" -+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" -+ else -+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined -+ dnl that this library doesn't exist. So just drop it. -+ : -+ fi -+ else -+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS -+ dnl and the already constructed $LIBNAME/$LTLIBNAME. -+ found_dir= -+ found_la= -+ found_so= -+ found_a= -+ if test $use_additional = yes; then -+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then -+ found_dir="$additional_libdir" -+ found_so="$additional_libdir/lib$name.$shlibext" -+ if test -f "$additional_libdir/lib$name.la"; then -+ found_la="$additional_libdir/lib$name.la" -+ fi -+ else -+ if test -f "$additional_libdir/lib$name.$libext"; then -+ found_dir="$additional_libdir" -+ found_a="$additional_libdir/lib$name.$libext" -+ if test -f "$additional_libdir/lib$name.la"; then -+ found_la="$additional_libdir/lib$name.la" -+ fi -+ fi -+ fi -+ fi -+ if test "X$found_dir" = "X"; then -+ for x in $LDFLAGS $LTLIB[]NAME; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ case "$x" in -+ -L*) -+ dir=`echo "X$x" | sed -e 's/^X-L//'` -+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then -+ found_dir="$dir" -+ found_so="$dir/lib$name.$shlibext" -+ if test -f "$dir/lib$name.la"; then -+ found_la="$dir/lib$name.la" -+ fi -+ else -+ if test -f "$dir/lib$name.$libext"; then -+ found_dir="$dir" -+ found_a="$dir/lib$name.$libext" -+ if test -f "$dir/lib$name.la"; then -+ found_la="$dir/lib$name.la" -+ fi -+ fi -+ fi -+ ;; -+ esac -+ if test "X$found_dir" != "X"; then -+ break -+ fi -+ done -+ fi -+ if test "X$found_dir" != "X"; then -+ dnl Found the library. -+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" -+ if test "X$found_so" != "X"; then -+ dnl Linking with a shared library. We attempt to hardcode its -+ dnl directory into the executable's runpath, unless it's the -+ dnl standard /usr/lib. -+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then -+ dnl No hardcoding is needed. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -+ else -+ dnl Use an explicit option to hardcode DIR into the resulting -+ dnl binary. -+ dnl Potentially add DIR to ltrpathdirs. -+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. -+ haveit= -+ for x in $ltrpathdirs; do -+ if test "X$x" = "X$found_dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ ltrpathdirs="$ltrpathdirs $found_dir" -+ fi -+ dnl The hardcoding into $LIBNAME is system dependent. -+ if test "$hardcode_direct" = yes; then -+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the -+ dnl resulting binary. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -+ else -+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then -+ dnl Use an explicit option to hardcode DIR into the resulting -+ dnl binary. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -+ dnl Potentially add DIR to rpathdirs. -+ dnl The rpathdirs will be appended to $LIBNAME at the end. -+ haveit= -+ for x in $rpathdirs; do -+ if test "X$x" = "X$found_dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ rpathdirs="$rpathdirs $found_dir" -+ fi -+ else -+ dnl Rely on "-L$found_dir". -+ dnl But don't add it if it's already contained in the LDFLAGS -+ dnl or the already constructed $LIBNAME -+ haveit= -+ for x in $LDFLAGS $LIB[]NAME; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-L$found_dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" -+ fi -+ if test "$hardcode_minus_L" != no; then -+ dnl FIXME: Not sure whether we should use -+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" -+ dnl here. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -+ else -+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH -+ dnl here, because this doesn't fit in flags passed to the -+ dnl compiler. So give up. No hardcoding. This affects only -+ dnl very old systems. -+ dnl FIXME: Not sure whether we should use -+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" -+ dnl here. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" -+ fi -+ fi -+ fi -+ fi -+ else -+ if test "X$found_a" != "X"; then -+ dnl Linking with a static library. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" -+ else -+ dnl We shouldn't come here, but anyway it's good to have a -+ dnl fallback. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" -+ fi -+ fi -+ dnl Assume the include files are nearby. -+ additional_includedir= -+ case "$found_dir" in -+ */lib | */lib/) -+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` -+ additional_includedir="$basedir/include" -+ ;; -+ esac -+ if test "X$additional_includedir" != "X"; then -+ dnl Potentially add $additional_includedir to $INCNAME. -+ dnl But don't add it -+ dnl 1. if it's the standard /usr/include, -+ dnl 2. if it's /usr/local/include and we are using GCC on Linux, -+ dnl 3. if it's already present in $CPPFLAGS or the already -+ dnl constructed $INCNAME, -+ dnl 4. if it doesn't exist as a directory. -+ if test "X$additional_includedir" != "X/usr/include"; then -+ haveit= -+ if test "X$additional_includedir" = "X/usr/local/include"; then -+ if test -n "$GCC"; then -+ case $host_os in -+ linux*) haveit=yes;; -+ esac -+ fi -+ fi -+ if test -z "$haveit"; then -+ for x in $CPPFLAGS $INC[]NAME; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-I$additional_includedir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test -d "$additional_includedir"; then -+ dnl Really add $additional_includedir to $INCNAME. -+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" -+ fi -+ fi -+ fi -+ fi -+ fi -+ dnl Look for dependencies. -+ if test -n "$found_la"; then -+ dnl Read the .la file. It defines the variables -+ dnl dlname, library_names, old_library, dependency_libs, current, -+ dnl age, revision, installed, dlopen, dlpreopen, libdir. -+ save_libdir="$libdir" -+ case "$found_la" in -+ */* | *\\*) . "$found_la" ;; -+ *) . "./$found_la" ;; -+ esac -+ libdir="$save_libdir" -+ dnl We use only dependency_libs. -+ for dep in $dependency_libs; do -+ case "$dep" in -+ -L*) -+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` -+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. -+ dnl But don't add it -+ dnl 1. if it's the standard /usr/lib, -+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux, -+ dnl 3. if it's already present in $LDFLAGS or the already -+ dnl constructed $LIBNAME, -+ dnl 4. if it doesn't exist as a directory. -+ if test "X$additional_libdir" != "X/usr/lib"; then -+ haveit= -+ if test "X$additional_libdir" = "X/usr/local/lib"; then -+ if test -n "$GCC"; then -+ case $host_os in -+ linux*) haveit=yes;; -+ esac -+ fi -+ fi -+ if test -z "$haveit"; then -+ haveit= -+ for x in $LDFLAGS $LIB[]NAME; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-L$additional_libdir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test -d "$additional_libdir"; then -+ dnl Really add $additional_libdir to $LIBNAME. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" -+ fi -+ fi -+ haveit= -+ for x in $LDFLAGS $LTLIB[]NAME; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-L$additional_libdir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test -d "$additional_libdir"; then -+ dnl Really add $additional_libdir to $LTLIBNAME. -+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" -+ fi -+ fi -+ fi -+ fi -+ ;; -+ -R*) -+ dir=`echo "X$dep" | sed -e 's/^X-R//'` -+ if test "$enable_rpath" != no; then -+ dnl Potentially add DIR to rpathdirs. -+ dnl The rpathdirs will be appended to $LIBNAME at the end. -+ haveit= -+ for x in $rpathdirs; do -+ if test "X$x" = "X$dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ rpathdirs="$rpathdirs $dir" -+ fi -+ dnl Potentially add DIR to ltrpathdirs. -+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. -+ haveit= -+ for x in $ltrpathdirs; do -+ if test "X$x" = "X$dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ ltrpathdirs="$ltrpathdirs $dir" -+ fi -+ fi -+ ;; -+ -l*) -+ dnl Handle this in the next round. -+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` -+ ;; -+ *.la) -+ dnl Handle this in the next round. Throw away the .la's -+ dnl directory; it is already contained in a preceding -L -+ dnl option. -+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` -+ ;; -+ *) -+ dnl Most likely an immediate library name. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" -+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" -+ ;; -+ esac -+ done -+ fi -+ else -+ dnl Didn't find the library; assume it is in the system directories -+ dnl known to the linker and runtime loader. (All the system -+ dnl directories known to the linker should also be known to the -+ dnl runtime loader, otherwise the system is severely misconfigured.) -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" -+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" -+ fi -+ fi -+ fi -+ done -+ done -+ if test "X$rpathdirs" != "X"; then -+ if test -n "$hardcode_libdir_separator"; then -+ dnl Weird platform: only the last -rpath option counts, the user must -+ dnl pass all path elements in one option. We can arrange that for a -+ dnl single library, but not when more than one $LIBNAMEs are used. -+ alldirs= -+ for found_dir in $rpathdirs; do -+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" -+ done -+ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. -+ acl_save_libdir="$libdir" -+ libdir="$alldirs" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ libdir="$acl_save_libdir" -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" -+ else -+ dnl The -rpath options are cumulative. -+ for found_dir in $rpathdirs; do -+ acl_save_libdir="$libdir" -+ libdir="$found_dir" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ libdir="$acl_save_libdir" -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" -+ done -+ fi -+ fi -+ if test "X$ltrpathdirs" != "X"; then -+ dnl When using libtool, the option that works for both libraries and -+ dnl executables is -R. The -R options are cumulative. -+ for found_dir in $ltrpathdirs; do -+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" -+ done -+ fi -+]) -+ -+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -+dnl unless already present in VAR. -+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -+dnl contains two or three consecutive elements that belong together. -+AC_DEFUN([AC_LIB_APPENDTOVAR], -+[ -+ for element in [$2]; do -+ haveit= -+ for x in $[$1]; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X$element"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ [$1]="${[$1]}${[$1]:+ }$element" -+ fi -+ done -+]) ---- /dev/null -+++ centericq-4.9.7/m4/lib-prefix.m4 -@@ -0,0 +1,148 @@ -+# lib-prefix.m4 serial 1 (gettext-0.11) -+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -+dnl to access previously installed libraries. The basic assumption is that -+dnl a user will want packages to use other packages he previously installed -+dnl with the same --prefix option. -+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -+dnl libraries, but is otherwise very convenient. -+AC_DEFUN([AC_LIB_PREFIX], -+[ -+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) -+ AC_REQUIRE([AC_PROG_CC]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -+ dnl By default, look in $includedir and $libdir. -+ use_additional=yes -+ AC_LIB_WITH_FINAL_PREFIX([ -+ eval additional_includedir=\"$includedir\" -+ eval additional_libdir=\"$libdir\" -+ ]) -+ AC_ARG_WITH([lib-prefix], -+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib -+ --without-lib-prefix don't search for libraries in includedir and libdir], -+[ -+ if test "X$withval" = "Xno"; then -+ use_additional=no -+ else -+ if test "X$withval" = "X"; then -+ AC_LIB_WITH_FINAL_PREFIX([ -+ eval additional_includedir=\"$includedir\" -+ eval additional_libdir=\"$libdir\" -+ ]) -+ else -+ additional_includedir="$withval/include" -+ additional_libdir="$withval/lib" -+ fi -+ fi -+]) -+ if test $use_additional = yes; then -+ dnl Potentially add $additional_includedir to $CPPFLAGS. -+ dnl But don't add it -+ dnl 1. if it's the standard /usr/include, -+ dnl 2. if it's already present in $CPPFLAGS, -+ dnl 3. if it's /usr/local/include and we are using GCC on Linux, -+ dnl 4. if it doesn't exist as a directory. -+ if test "X$additional_includedir" != "X/usr/include"; then -+ haveit= -+ for x in $CPPFLAGS; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-I$additional_includedir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test "X$additional_includedir" = "X/usr/local/include"; then -+ if test -n "$GCC"; then -+ case $host_os in -+ linux*) haveit=yes;; -+ esac -+ fi -+ fi -+ if test -z "$haveit"; then -+ if test -d "$additional_includedir"; then -+ dnl Really add $additional_includedir to $CPPFLAGS. -+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" -+ fi -+ fi -+ fi -+ fi -+ dnl Potentially add $additional_libdir to $LDFLAGS. -+ dnl But don't add it -+ dnl 1. if it's the standard /usr/lib, -+ dnl 2. if it's already present in $LDFLAGS, -+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux, -+ dnl 4. if it doesn't exist as a directory. -+ if test "X$additional_libdir" != "X/usr/lib"; then -+ haveit= -+ for x in $LDFLAGS; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-L$additional_libdir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test "X$additional_libdir" = "X/usr/local/lib"; then -+ if test -n "$GCC"; then -+ case $host_os in -+ linux*) haveit=yes;; -+ esac -+ fi -+ fi -+ if test -z "$haveit"; then -+ if test -d "$additional_libdir"; then -+ dnl Really add $additional_libdir to $LDFLAGS. -+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" -+ fi -+ fi -+ fi -+ fi -+ fi -+]) -+ -+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -+dnl acl_final_exec_prefix, containing the values to which $prefix and -+dnl $exec_prefix will expand at the end of the configure script. -+AC_DEFUN([AC_LIB_PREPARE_PREFIX], -+[ -+ dnl Unfortunately, prefix and exec_prefix get only finally determined -+ dnl at the end of configure. -+ if test "X$prefix" = "XNONE"; then -+ acl_final_prefix="$ac_default_prefix" -+ else -+ acl_final_prefix="$prefix" -+ fi -+ if test "X$exec_prefix" = "XNONE"; then -+ acl_final_exec_prefix='${prefix}' -+ else -+ acl_final_exec_prefix="$exec_prefix" -+ fi -+ acl_save_prefix="$prefix" -+ prefix="$acl_final_prefix" -+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" -+ prefix="$acl_save_prefix" -+]) -+ -+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -+dnl variables prefix and exec_prefix bound to the values they will have -+dnl at the end of the configure script. -+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -+[ -+ acl_save_prefix="$prefix" -+ prefix="$acl_final_prefix" -+ acl_save_exec_prefix="$exec_prefix" -+ exec_prefix="$acl_final_exec_prefix" -+ $1 -+ exec_prefix="$acl_save_exec_prefix" -+ prefix="$acl_save_prefix" -+]) ---- /dev/null -+++ centericq-4.9.7/m4/progtest.m4 -@@ -0,0 +1,59 @@ -+# progtest.m4 serial 2 (gettext-0.10.40) -+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are *not* in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper <drepper@cygnus.com>, 1996. -+ -+# Search path for a program which passes the given test. -+ -+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -+AC_DEFUN([AM_PATH_PROG_WITH_TEST], -+[# Extract the first word of "$2", so it can be a program name with args. -+set dummy $2; ac_word=[$]2 -+AC_MSG_CHECKING([for $ac_word]) -+AC_CACHE_VAL(ac_cv_path_$1, -+[case "[$]$1" in -+ /*) -+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in ifelse([$5], , $PATH, [$5]); do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if [$3]; then -+ ac_cv_path_$1="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+dnl If no 4th arg is given, leave the cache variable unset, -+dnl so AC_PATH_PROGS will keep looking. -+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -+])dnl -+ ;; -+esac])dnl -+$1="$ac_cv_path_$1" -+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then -+ AC_MSG_RESULT([$]$1) -+else -+ AC_MSG_RESULT(no) -+fi -+AC_SUBST($1)dnl -+]) ---- /dev/null -+++ centericq-4.9.7/m4/stdint_h.m4 -@@ -0,0 +1,28 @@ -+# stdint_h.m4 serial 2 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, -+# doesn't clash with <sys/types.h>, and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_STDINT_H], -+[ -+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, -+ [AC_TRY_COMPILE( -+ [#include <sys/types.h> -+#include <stdint.h>], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_stdint_h=yes, -+ jm_ac_cv_header_stdint_h=no)]) -+ if test $jm_ac_cv_header_stdint_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>, -+ and declares uintmax_t. ]) -+ fi -+]) ---- /dev/null -+++ centericq-4.9.7/m4/uintmax_t.m4 -@@ -0,0 +1,29 @@ -+# uintmax_t.m4 serial 6 (gettext-0.11) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+AC_PREREQ(2.13) -+ -+# Define uintmax_t to `unsigned long' or `unsigned long long' -+# if <inttypes.h> does not exist. -+ -+AC_DEFUN([jm_AC_TYPE_UINTMAX_T], -+[ -+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) -+ AC_REQUIRE([jm_AC_HEADER_STDINT_H]) -+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then -+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) -+ test $ac_cv_type_unsigned_long_long = yes \ -+ && ac_type='unsigned long long' \ -+ || ac_type='unsigned long' -+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, -+ [Define to unsigned long or unsigned long long -+ if <inttypes.h> and <stdint.h> don't define.]) -+ fi -+]) ---- /dev/null -+++ centericq-4.9.7/m4/ulonglong.m4 -@@ -0,0 +1,23 @@ -+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) -+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], -+[ -+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, -+ [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], -+ [unsigned long long ullmax = (unsigned long long) -1; -+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;], -+ ac_cv_type_unsigned_long_long=yes, -+ ac_cv_type_unsigned_long_long=no)]) -+ if test $ac_cv_type_unsigned_long_long = yes; then -+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, -+ [Define if you have the unsigned long long type.]) -+ fi -+]) diff --git a/nonworking/centericq/centericq_4.9.12.bb b/nonworking/centericq/centericq_4.9.12.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/centericq/centericq_4.9.12.bb +++ /dev/null diff --git a/nonworking/docbook-xsl/docbook-xsl_1.64.1.bb b/nonworking/docbook-xsl/docbook-xsl_1.64.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/docbook-xsl/docbook-xsl_1.64.1.bb +++ /dev/null diff --git a/nonworking/docbook/docbook_4.2.bb b/nonworking/docbook/docbook_4.2.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/docbook/docbook_4.2.bb +++ /dev/null diff --git a/nonworking/emotion/emotion_cvs.bb b/nonworking/emotion/emotion_cvs.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/emotion/emotion_cvs.bb +++ /dev/null diff --git a/nonworking/esmart/esmart_cvs.bb b/nonworking/esmart/esmart_cvs.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/esmart/esmart_cvs.bb +++ /dev/null diff --git a/nonworking/exult/exult_1.2.bb b/nonworking/exult/exult_1.2.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/exult/exult_1.2.bb +++ /dev/null diff --git a/nonworking/fbi/fbi_1.31.bb b/nonworking/fbi/fbi_1.31.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/fbi/fbi_1.31.bb +++ /dev/null diff --git a/nonworking/firebird/firebird_1.5.0.4290.bb b/nonworking/firebird/firebird_1.5.0.4290.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/firebird/firebird_1.5.0.4290.bb +++ /dev/null diff --git a/nonworking/fortune-mod/fortune-mod_1.99.1.bb b/nonworking/fortune-mod/fortune-mod_1.99.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/fortune-mod/fortune-mod_1.99.1.bb +++ /dev/null diff --git a/nonworking/freenote/freenote-1.6.1/compile.patch b/nonworking/freenote/freenote-1.6.1/compile.patch deleted file mode 100644 index de3e93ac9c..0000000000 --- a/nonworking/freenote/freenote-1.6.1/compile.patch +++ /dev/null @@ -1,3285 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- FreeNote_1.6.1_arm/FmtEngine.cpp~compile 2003-12-23 15:53:46.000000000 +0100 -+++ FreeNote_1.6.1_arm/FmtEngine.cpp 2004-02-01 18:42:32.000000000 +0100 -@@ -1,409 +1,410 @@ --/* FreeNote for Sharp SLA300, B500, C7x0 Linux PDA -- Copyright (C) 2003 Joe Kanemori.<kanemori@ymg.urban.ne.jp> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --*/ --/* --2003/12/16-19 FreeNote ver 1.5.5pre --E‹Èü•`‰æƒƒWƒbƒN‚̉ü—Ç -- --2003/12/14 FreeNote 1.5.4pre --E‹Èü•`‰æƒƒWƒbƒN‚̉ü—Ç -- --2003/11/30-2003/12/04 FreeNote 1.5.3pre --EƒxƒWƒFŠÖ”‚̃Xƒyƒ‹ƒ~ƒX‚ðC³ -- --2003/11/16 FreeNote 1.5.2pre --E‰~•`‰æ‚̃ƒWƒbƒN‚ð’ljÁ -- --2003/11/13 FreeNote 1.5.1pre --EƒXƒ€[ƒWƒ“ƒO’ljÁ --2003/11/10-12 --E‹Èü®Œ`ƒ‚[ƒh’ljÁ --2003/11/09 ’ljÁ --*/ --#include "fmtengine.h" --#include <qpointarray.h> --#include <qpe/qmath.h> --#include <math.h> --int SNAP_SIZE = 32; --int PHASE1_ANGLE = 30; --int PHASE2_ANGLE = 30; --double Surface(const QPoint& p1, const QPoint& p2) --{ -- return 0.5 * abs(p1.x() * p2.y() - p1.y() * p2.x()); --} -- --bool IsLinear(const QPoint& p1, const QPoint& p2, const QPoint& p3) --{ -- double s1 = Surface(p1, p2); -- double s2 = Surface(p2, p3); -- double s3 = Surface(p1, p3); -- if (s1 + s2 == s3) { -- return true; -- } else { -- return false; -- } --} -- --const double Angle(const QPoint& p1, const QPoint& p2) --{ -- return qATan2((double)(p2.y() - p1.y()), (double)(p2.x() - p1.x())); --} -- --const double DiffAngle(const QPoint& p1, const QPoint& p2, const QPoint& p3) --{ -- return fabs(Angle(p1, p2) - Angle(p2, p3)); --} -- --const double ToDegree(double t) --{ -- return t * 180 / M_PI; --} -- --const double ToRadian(double d) --{ -- return d * M_PI / 180; --} -- --const double Distance(const QPoint& p1, const QPoint& p2) --{ -- return hypot(p1.x() - p2.x(), p1.y() - p2.y()); --} -- --const QPoint SnapPoint(const QPoint& p) --{ -- int x = ((int)(p.x() + SNAP_SIZE / 2) / SNAP_SIZE) * SNAP_SIZE; -- int y = ((int)(p.y() + SNAP_SIZE / 2) / SNAP_SIZE) * SNAP_SIZE; -- return QPoint(x, y); --} -- --const QPoint ArrangePoint(const QPoint& p1, const QPoint& p2) --{ -- int x = p2.x(); -- int y = p2.y(); -- if (p1.x() - SNAP_SIZE / 2 <= x && p1.x() + SNAP_SIZE / 2 >= x) { -- x = p1.x(); -- } -- if (p1.y() - SNAP_SIZE / 2 <= y && p1.y() + SNAP_SIZE / 2 >= y) { -- y = p1.y(); -- } -- return QPoint(x, y); --} -- --FNPointList ReducePoints(FNPointList& p) --{ -- if (3 >= p.count()) { -- return p; -- } -- FNPointList rt; -- rt.append(p.first()); -- QPoint* p1 = p.first(); -- QPoint* p2 = p.at(1); -- QPoint* p3 = NULL; -- for (uint i = 2; i < p.count(); ++i) { -- p3 = p.at(i); -- if (false == IsLinear(*p1, *p2, *p3)) { -- rt.append(p2); -- p1 = p2; -- } -- p2 = p3; -- } -- rt.append(p3); -- return rt; --} -- --FNPointList ExtractAngle2(FNPointList& p, const int deg) --{ -- FNPointList rt; -- rt.append(p.first()); -- QPoint* st = p.first(); -- QPoint* mp = p.at(1); -- QPoint* ed = p.last(); -- for (uint i = 2; i < p.count(); ++i) { -- ed = p.at(i); -- if (ToRadian(deg) <= DiffAngle(*st, *mp, *ed)) { -- st = mp; -- rt.append(mp); -- } -- mp = ed; -- } -- rt.append(ed); -- return rt; --} -- --FNPointList ExtractAngle(FNPointList& p, const int deg) --{ -- FNPointList rt; -- rt.append(p.first()); -- QPoint* st = p.first(); -- QPoint* mp = p.at(1); -- QPoint* ed = p.last(); -- for (uint i = 2; i < p.count(); ++i) { -- ed = p.at(i); -- if (ToRadian(deg) <= DiffAngle(*st, *mp, *ed)) { -- st = mp; -- rt.append(mp); -- } -- mp = ed; -- } -- if (SNAP_SIZE / 2 > Distance(*p.first(), *p.last()) && 3 < p.count()) { -- rt.append(p.first()); -- } else { -- rt.append(ed); -- } -- return rt; --} -- --FNPointList SumupPoints(FNPointList& p) --{ -- if (3 >= p.count()) { -- return p; -- } -- FNPointList rt; -- rt.append(p.first()); -- QPoint* p1 = p.first(); -- QPoint* p2 = NULL; -- double pred = 0; -- for (uint i = 1; i < p.count() - 1; ++i) { -- p2 = p.at(i); -- double d = Distance(*p1, *p2); -- if (SNAP_SIZE / 2 < d || pred > d) { -- rt.append(p2); -- p1 = p2; -- d = 0; -- } -- pred = d; -- } -- rt.append(p.last()); -- return rt; --} -- --FNPointList SnapPoints(FNPointList& p) --{ -- FNPointList rt; -- for (uint i = 0; i < p.count(); ++i) { -- QPoint tp = SnapPoint(*p.at(i)); -- p.at(i)->setX(tp.x()); -- p.at(i)->setY(tp.y()); -- rt.append(p.at(i)); -- } -- return rt; --} -- --FNPointList ArrangePoints(FNPointList& p) --{ -- if (3 >= p.count() && 2 != p.count()) { -- return p; -- } -- FNPointList rt; -- rt.append(p.first()); -- QPoint* p1 = p.first(); -- QPoint* p2 = NULL; -- for (uint i = 1; i < p.count(); ++i) { -- p2 = p.at(i); -- QPoint tp = ArrangePoint(*p1, *p2); -- p2->setX(tp.x()); -- p2->setY(tp.y()); -- rt.append(p2); -- p1 = p2; -- } -- if (*p.first() == *p.last()) { -- QPoint tp = ArrangePoint(*p1, *p.first()); -- rt.first()->setX(tp.x()); -- rt.first()->setY(tp.y()); -- } -- return rt; --} -- --FNPointList TuningPoints(FNPointList& p) --{ -- FNPointList rt; -- if (3 >= p.count()) { -- for (uint i = 0; i < p.count(); ++i) { -- rt.append(new QPoint(*p.at(i))); -- } -- return rt; -- } -- rt.append(new QPoint(*p.at(0))); -- for (uint i = 1; i < p.count() - 1; ++i) { -- QPoint* p1 = p.at(i); -- QPoint* p2 = p.at(i + 1); -- rt.append(new QPoint(*p1)); -- if (i < p.count() - 2) { -- rt.append(new QPoint((p1->x() + p2->x())/2, (p1->y() + p2->y())/2)); -- } -- } -- rt.append(new QPoint(*p.at(p.count()-1))); -- return rt; --} -- --FNPointList ToBezier(FNPointList& p) { -- FNPointList rt; -- rt.append(new QPoint(*p.at(0))); -- for (uint i = 0; i < p.count() - 2; i += 2) { -- int x1 = p.at(i)->x(); -- int xa = p.at(i + 1)->x(); -- int x4 = p.at(i + 2)->x(); -- -- int x2 = (x1 + xa) / 2; -- int x3 = (xa + x4) / 2; -- -- int y1 = p.at(i)->y(); -- int ya = p.at(i + 1)->y(); -- int y4 = p.at(i + 2)->y(); -- -- int y2 = (y1 + ya) / 2; -- int y3 = (ya + y4) / 2; -- -- rt.append(new QPoint(x2 ,y2)); -- rt.append(new QPoint(x3 ,y3)); -- rt.append(new QPoint(x4 ,y4)); -- } -- return rt; --} -- --FNPointList ToCurves(FNPointList& p) { -- if (3 <= p.count()) { -- //ƒxƒWƒF‚É‚æ‚é•âŠ® -- return ToBezier(p); -- } else { -- FNPointList rt; -- for (uint i = 0; i < p.count(); ++i) { -- rt.append(new QPoint(*p.at(i))); -- } -- return rt; -- } --} -- --FNPointList AutoFormat(FNPointList& p) --{ -- FNPointList tp = ExtractAngle(p, PHASE1_ANGLE); -- uint n; -- do { -- n = tp.count(); -- tp = SumupPoints(tp); -- tp = ExtractAngle(tp, PHASE1_ANGLE); -- tp = ArrangePoints(tp); -- } while (n > tp.count()); -- tp = SnapPoints(tp); -- tp = ReducePoints(tp); -- FNPointList rt; -- if (2 == tp.count()) { -- if (*tp.first() == *tp.last()) { -- return rt; -- } -- } -- for (uint i = 0; i < tp.count(); ++i) { -- rt.append(new QPoint(*tp.at(i))); -- } -- return rt; --} -- --FNPointList ToEllipse(int x, int y, int w, int h) { -- FNPointList rt; -- QPointArray pa; -- pa.makeEllipse(x, y, w, h); -- for (uint i = 0; i < pa.count(); ++i) { -- rt.append(new QPoint(pa.point(i))); -- } -- return rt; --} -- --FNPointList AutoCurve(FNPointList& p) --{ -- FNPointList tp2; -- tp2.setAutoDelete(true); -- FNPointList tp4; -- tp4.setAutoDelete(true); -- QPoint sp = SnapPoint(*p.at(0)); -- QPoint ep = SnapPoint(*p.at(p.count()-1)); -- if (sp == ep) { -- //‘ȉ~ -- int sx = p.at(0)->x(); -- int sy = p.at(0)->y(); -- int ex = sx; -- int ey = sy; -- for (uint i = 1; i < p.count(); ++i) { -- QPoint tp = *p.at(i); -- if (sx > tp.x()) { -- sx = tp.x(); -- } else if (ex < tp.x()) { -- ex = tp.x(); -- } -- if (sy > tp.y()) { -- sy = tp.y(); -- } else if (ey < tp.y()) { -- ey = tp.y(); -- } -- } -- sp = SnapPoint(QPoint(sx, sy)); -- ep = SnapPoint(QPoint(ex, ey)); -- tp2.append(new QPoint(sp.x(), sp.y())); -- tp2.append(new QPoint(ep.x(), ep.y())); -- } else { -- FNPointList tp = ExtractAngle2(p, PHASE2_ANGLE); -- uint n; -- do { -- n = tp.count(); -- tp = SumupPoints(tp); -- tp = ExtractAngle2(tp, PHASE2_ANGLE); -- tp = SnapPoints(tp); -- } while (n > tp.count()); -- tp = SumupPoints(tp); -- tp = ReducePoints(tp); -- tp4 = TuningPoints(tp); -- tp2 = ToCurves(tp4); -- } -- FNPointList rt; -- if (2 == tp2.count()) { -- if (*tp2.first() == *tp2.last()) { -- return rt; -- } -- } -- for (uint i = 0; i < tp2.count(); ++i) { -- rt.append(new QPoint(*tp2.at(i))); -- } -- return rt; --} -- --FNPointList Smoothing(FNPointList& p) --{ -- int tsnap = SNAP_SIZE; -- SNAP_SIZE=8; -- FNPointList tp = ExtractAngle2(p, PHASE2_ANGLE); -- tp = SumupPoints(tp); -- tp = ReducePoints(tp); -- FNPointList tp4 = TuningPoints(tp); -- tp4.setAutoDelete(true); -- FNPointList tp2 = ToCurves(tp4); -- tp2.setAutoDelete(true); -- FNPointList rt; -- for (uint i = 0; i < tp2.count(); ++i) { -- rt.append(new QPoint(*tp2.at(i))); -- } -- SNAP_SIZE = tsnap; -- return rt; --} -- --FNPointList Reduce(FNPointList& p) --{ -- FNPointList tp = ReducePoints(p); -- FNPointList rt; -- for (uint i = 0; i < tp.count(); ++i) { -- rt.append(new QPoint(*tp.at(i))); -- } -- return rt; --} -+/* FreeNote for Sharp SLA300, B500, C7x0 Linux PDA -+ Copyright (C) 2003 Joe Kanemori.<kanemori@ymg.urban.ne.jp> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+*/ -+/* -+2003/12/16-19 FreeNote ver 1.5.5pre -+E‹Èü•`‰æƒƒWƒbƒN‚̉ü—Ç -+ -+2003/12/14 FreeNote 1.5.4pre -+E‹Èü•`‰æƒƒWƒbƒN‚̉ü—Ç -+ -+2003/11/30-2003/12/04 FreeNote 1.5.3pre -+EƒxƒWƒFŠÖ”‚̃Xƒyƒ‹ƒ~ƒX‚ðC³ -+ -+2003/11/16 FreeNote 1.5.2pre -+E‰~•`‰æ‚̃ƒWƒbƒN‚ð’ljÁ -+ -+2003/11/13 FreeNote 1.5.1pre -+EƒXƒ€[ƒWƒ“ƒO’ljÁ -+2003/11/10-12 -+E‹Èü®Œ`ƒ‚[ƒh’ljÁ -+2003/11/09 ’ljÁ -+*/ -+#include "fmtengine.h" -+#include <qpointarray.h> -+#include <qpe/qmath.h> -+#include <math.h> -+#include <stdlib.h> // abs -+int SNAP_SIZE = 32; -+int PHASE1_ANGLE = 30; -+int PHASE2_ANGLE = 30; -+double Surface(const QPoint& p1, const QPoint& p2) -+{ -+ return 0.5 * abs(p1.x() * p2.y() - p1.y() * p2.x()); -+} -+ -+bool IsLinear(const QPoint& p1, const QPoint& p2, const QPoint& p3) -+{ -+ double s1 = Surface(p1, p2); -+ double s2 = Surface(p2, p3); -+ double s3 = Surface(p1, p3); -+ if (s1 + s2 == s3) { -+ return true; -+ } else { -+ return false; -+ } -+} -+ -+const double Angle(const QPoint& p1, const QPoint& p2) -+{ -+ return qATan2((double)(p2.y() - p1.y()), (double)(p2.x() - p1.x())); -+} -+ -+const double DiffAngle(const QPoint& p1, const QPoint& p2, const QPoint& p3) -+{ -+ return fabs(Angle(p1, p2) - Angle(p2, p3)); -+} -+ -+const double ToDegree(double t) -+{ -+ return t * 180 / M_PI; -+} -+ -+const double ToRadian(double d) -+{ -+ return d * M_PI / 180; -+} -+ -+const double Distance(const QPoint& p1, const QPoint& p2) -+{ -+ return hypot(p1.x() - p2.x(), p1.y() - p2.y()); -+} -+ -+const QPoint SnapPoint(const QPoint& p) -+{ -+ int x = ((int)(p.x() + SNAP_SIZE / 2) / SNAP_SIZE) * SNAP_SIZE; -+ int y = ((int)(p.y() + SNAP_SIZE / 2) / SNAP_SIZE) * SNAP_SIZE; -+ return QPoint(x, y); -+} -+ -+const QPoint ArrangePoint(const QPoint& p1, const QPoint& p2) -+{ -+ int x = p2.x(); -+ int y = p2.y(); -+ if (p1.x() - SNAP_SIZE / 2 <= x && p1.x() + SNAP_SIZE / 2 >= x) { -+ x = p1.x(); -+ } -+ if (p1.y() - SNAP_SIZE / 2 <= y && p1.y() + SNAP_SIZE / 2 >= y) { -+ y = p1.y(); -+ } -+ return QPoint(x, y); -+} -+ -+FNPointList ReducePoints(FNPointList& p) -+{ -+ if (3 >= p.count()) { -+ return p; -+ } -+ FNPointList rt; -+ rt.append(p.first()); -+ QPoint* p1 = p.first(); -+ QPoint* p2 = p.at(1); -+ QPoint* p3 = NULL; -+ for (uint i = 2; i < p.count(); ++i) { -+ p3 = p.at(i); -+ if (false == IsLinear(*p1, *p2, *p3)) { -+ rt.append(p2); -+ p1 = p2; -+ } -+ p2 = p3; -+ } -+ rt.append(p3); -+ return rt; -+} -+ -+FNPointList ExtractAngle2(FNPointList& p, const int deg) -+{ -+ FNPointList rt; -+ rt.append(p.first()); -+ QPoint* st = p.first(); -+ QPoint* mp = p.at(1); -+ QPoint* ed = p.last(); -+ for (uint i = 2; i < p.count(); ++i) { -+ ed = p.at(i); -+ if (ToRadian(deg) <= DiffAngle(*st, *mp, *ed)) { -+ st = mp; -+ rt.append(mp); -+ } -+ mp = ed; -+ } -+ rt.append(ed); -+ return rt; -+} -+ -+FNPointList ExtractAngle(FNPointList& p, const int deg) -+{ -+ FNPointList rt; -+ rt.append(p.first()); -+ QPoint* st = p.first(); -+ QPoint* mp = p.at(1); -+ QPoint* ed = p.last(); -+ for (uint i = 2; i < p.count(); ++i) { -+ ed = p.at(i); -+ if (ToRadian(deg) <= DiffAngle(*st, *mp, *ed)) { -+ st = mp; -+ rt.append(mp); -+ } -+ mp = ed; -+ } -+ if (SNAP_SIZE / 2 > Distance(*p.first(), *p.last()) && 3 < p.count()) { -+ rt.append(p.first()); -+ } else { -+ rt.append(ed); -+ } -+ return rt; -+} -+ -+FNPointList SumupPoints(FNPointList& p) -+{ -+ if (3 >= p.count()) { -+ return p; -+ } -+ FNPointList rt; -+ rt.append(p.first()); -+ QPoint* p1 = p.first(); -+ QPoint* p2 = NULL; -+ double pred = 0; -+ for (uint i = 1; i < p.count() - 1; ++i) { -+ p2 = p.at(i); -+ double d = Distance(*p1, *p2); -+ if (SNAP_SIZE / 2 < d || pred > d) { -+ rt.append(p2); -+ p1 = p2; -+ d = 0; -+ } -+ pred = d; -+ } -+ rt.append(p.last()); -+ return rt; -+} -+ -+FNPointList SnapPoints(FNPointList& p) -+{ -+ FNPointList rt; -+ for (uint i = 0; i < p.count(); ++i) { -+ QPoint tp = SnapPoint(*p.at(i)); -+ p.at(i)->setX(tp.x()); -+ p.at(i)->setY(tp.y()); -+ rt.append(p.at(i)); -+ } -+ return rt; -+} -+ -+FNPointList ArrangePoints(FNPointList& p) -+{ -+ if (3 >= p.count() && 2 != p.count()) { -+ return p; -+ } -+ FNPointList rt; -+ rt.append(p.first()); -+ QPoint* p1 = p.first(); -+ QPoint* p2 = NULL; -+ for (uint i = 1; i < p.count(); ++i) { -+ p2 = p.at(i); -+ QPoint tp = ArrangePoint(*p1, *p2); -+ p2->setX(tp.x()); -+ p2->setY(tp.y()); -+ rt.append(p2); -+ p1 = p2; -+ } -+ if (*p.first() == *p.last()) { -+ QPoint tp = ArrangePoint(*p1, *p.first()); -+ rt.first()->setX(tp.x()); -+ rt.first()->setY(tp.y()); -+ } -+ return rt; -+} -+ -+FNPointList TuningPoints(FNPointList& p) -+{ -+ FNPointList rt; -+ if (3 >= p.count()) { -+ for (uint i = 0; i < p.count(); ++i) { -+ rt.append(new QPoint(*p.at(i))); -+ } -+ return rt; -+ } -+ rt.append(new QPoint(*p.at(0))); -+ for (uint i = 1; i < p.count() - 1; ++i) { -+ QPoint* p1 = p.at(i); -+ QPoint* p2 = p.at(i + 1); -+ rt.append(new QPoint(*p1)); -+ if (i < p.count() - 2) { -+ rt.append(new QPoint((p1->x() + p2->x())/2, (p1->y() + p2->y())/2)); -+ } -+ } -+ rt.append(new QPoint(*p.at(p.count()-1))); -+ return rt; -+} -+ -+FNPointList ToBezier(FNPointList& p) { -+ FNPointList rt; -+ rt.append(new QPoint(*p.at(0))); -+ for (uint i = 0; i < p.count() - 2; i += 2) { -+ int x1 = p.at(i)->x(); -+ int xa = p.at(i + 1)->x(); -+ int x4 = p.at(i + 2)->x(); -+ -+ int x2 = (x1 + xa) / 2; -+ int x3 = (xa + x4) / 2; -+ -+ int y1 = p.at(i)->y(); -+ int ya = p.at(i + 1)->y(); -+ int y4 = p.at(i + 2)->y(); -+ -+ int y2 = (y1 + ya) / 2; -+ int y3 = (ya + y4) / 2; -+ -+ rt.append(new QPoint(x2 ,y2)); -+ rt.append(new QPoint(x3 ,y3)); -+ rt.append(new QPoint(x4 ,y4)); -+ } -+ return rt; -+} -+ -+FNPointList ToCurves(FNPointList& p) { -+ if (3 <= p.count()) { -+ //ƒxƒWƒF‚É‚æ‚é•âŠ® -+ return ToBezier(p); -+ } else { -+ FNPointList rt; -+ for (uint i = 0; i < p.count(); ++i) { -+ rt.append(new QPoint(*p.at(i))); -+ } -+ return rt; -+ } -+} -+ -+FNPointList AutoFormat(FNPointList& p) -+{ -+ FNPointList tp = ExtractAngle(p, PHASE1_ANGLE); -+ uint n; -+ do { -+ n = tp.count(); -+ tp = SumupPoints(tp); -+ tp = ExtractAngle(tp, PHASE1_ANGLE); -+ tp = ArrangePoints(tp); -+ } while (n > tp.count()); -+ tp = SnapPoints(tp); -+ tp = ReducePoints(tp); -+ FNPointList rt; -+ if (2 == tp.count()) { -+ if (*tp.first() == *tp.last()) { -+ return rt; -+ } -+ } -+ for (uint i = 0; i < tp.count(); ++i) { -+ rt.append(new QPoint(*tp.at(i))); -+ } -+ return rt; -+} -+ -+FNPointList ToEllipse(int x, int y, int w, int h) { -+ FNPointList rt; -+ QPointArray pa; -+ pa.makeEllipse(x, y, w, h); -+ for (uint i = 0; i < pa.count(); ++i) { -+ rt.append(new QPoint(pa.point(i))); -+ } -+ return rt; -+} -+ -+FNPointList AutoCurve(FNPointList& p) -+{ -+ FNPointList tp2; -+ tp2.setAutoDelete(true); -+ FNPointList tp4; -+ tp4.setAutoDelete(true); -+ QPoint sp = SnapPoint(*p.at(0)); -+ QPoint ep = SnapPoint(*p.at(p.count()-1)); -+ if (sp == ep) { -+ //‘ȉ~ -+ int sx = p.at(0)->x(); -+ int sy = p.at(0)->y(); -+ int ex = sx; -+ int ey = sy; -+ for (uint i = 1; i < p.count(); ++i) { -+ QPoint tp = *p.at(i); -+ if (sx > tp.x()) { -+ sx = tp.x(); -+ } else if (ex < tp.x()) { -+ ex = tp.x(); -+ } -+ if (sy > tp.y()) { -+ sy = tp.y(); -+ } else if (ey < tp.y()) { -+ ey = tp.y(); -+ } -+ } -+ sp = SnapPoint(QPoint(sx, sy)); -+ ep = SnapPoint(QPoint(ex, ey)); -+ tp2.append(new QPoint(sp.x(), sp.y())); -+ tp2.append(new QPoint(ep.x(), ep.y())); -+ } else { -+ FNPointList tp = ExtractAngle2(p, PHASE2_ANGLE); -+ uint n; -+ do { -+ n = tp.count(); -+ tp = SumupPoints(tp); -+ tp = ExtractAngle2(tp, PHASE2_ANGLE); -+ tp = SnapPoints(tp); -+ } while (n > tp.count()); -+ tp = SumupPoints(tp); -+ tp = ReducePoints(tp); -+ tp4 = TuningPoints(tp); -+ tp2 = ToCurves(tp4); -+ } -+ FNPointList rt; -+ if (2 == tp2.count()) { -+ if (*tp2.first() == *tp2.last()) { -+ return rt; -+ } -+ } -+ for (uint i = 0; i < tp2.count(); ++i) { -+ rt.append(new QPoint(*tp2.at(i))); -+ } -+ return rt; -+} -+ -+FNPointList Smoothing(FNPointList& p) -+{ -+ int tsnap = SNAP_SIZE; -+ SNAP_SIZE=8; -+ FNPointList tp = ExtractAngle2(p, PHASE2_ANGLE); -+ tp = SumupPoints(tp); -+ tp = ReducePoints(tp); -+ FNPointList tp4 = TuningPoints(tp); -+ tp4.setAutoDelete(true); -+ FNPointList tp2 = ToCurves(tp4); -+ tp2.setAutoDelete(true); -+ FNPointList rt; -+ for (uint i = 0; i < tp2.count(); ++i) { -+ rt.append(new QPoint(*tp2.at(i))); -+ } -+ SNAP_SIZE = tsnap; -+ return rt; -+} -+ -+FNPointList Reduce(FNPointList& p) -+{ -+ FNPointList tp = ReducePoints(p); -+ FNPointList rt; -+ for (uint i = 0; i < tp.count(); ++i) { -+ rt.append(new QPoint(*tp.at(i))); -+ } -+ return rt; -+} ---- FreeNote_1.6.1_arm/FNCanvas.cpp~compile 2003-12-24 15:20:16.000000000 +0100 -+++ FreeNote_1.6.1_arm/FNCanvas.cpp 2004-02-01 18:43:35.000000000 +0100 -@@ -1,1227 +1,1228 @@ --/* FreeNote for Sharp SLA300, B500, C7x0 Linux PDA -- Copyright (C) 2003 Joe Kanemori.<kanemori@ymg.urban.ne.jp> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --*/ --/* --2003/12/23 ver 1.6.1 --E•Û‘¶î•ñ‚̃TƒCƒYk¬ -- --2003/12/16-19 ver 1.5.5pre --Eƒyƒ“ƒTƒCƒY‚̒ljÁ(1-8) --EƒAƒ“ƒhƒDEƒŠƒhƒD‚ÌŽÀ‘• -- --2003/12/14 ver 1.5.4pre --Eƒyƒ“ƒTƒCƒY‚ð‘I‘ð‰Â”\‚ÉB -- --2003/12/05 ver 1.5.3Apre --EƒOƒŠƒbƒh‚ÌF‚ðC³ -- --2003/12/04 ver 1.5.3pre --EƒOƒŠƒbƒh‚Ì•`‰æ‚ðˆê•”C³ -- --2003/11/10 ver 1.5.1pre --E‹Èü®Œ`ƒ‚[ƒh’ljÁ -- --2003/11/09 ver 1.5.0pre --EŽ©“®®Œ`ƒ‚[ƒh’ljÁ -- --2003/09/03 ver 1.3.4pre --EUse all quadrant OFFŽž‚É•\Ž¦ˆÊ’u‚ªƒŠƒZƒbƒg‚³‚ê‚éꇂª‚ ‚éƒoƒO‘ΉžB -- --2003/09/01-03 ver 1.3.3pre --EƒXƒNƒ[ƒ‹‚̉ü—Ç --EUse all quadrant(‘SÛŒÀ‚ðŽg—p‚·‚é)ƒƒjƒ…[‚ð’ljÁ -- --2003/08/31 FreeNote 1.3.2pre --E‘S•ûŒüƒXƒNƒ[ƒ‹ -- --2003/08/23 FreeNote 1.3.0pre --ECR“®ì‚ÌC³ -- --2003/08/15 FreeNote 1.2.1‚ðŒöŠJ --E•Û‘¶Žž‚̃oƒOC³ --EŠ®—¹ƒ_ƒCƒAƒƒO‚ÌŽ©“®Á‹Ž --EPNGƒtƒ@ƒCƒ‹‚Ö‚Ìo—Í -- --2003/08/15 FreeNote 1.2‚ðŒöŠJ --EƒIƒvƒVƒ‡ƒ“’ljÁ --EƒXƒNƒ[ƒ‹ƒKƒCƒh --EFreeƒtƒ@ƒCƒ‹ŠÖ˜A•t‚¯ --EƒAƒCƒRƒ“‚Ì•ÏX -- --2003/08/05 FreeNote 1.1.1pre‚ðŒöŠJ --E‚‘¬‹N“®Žž‚ɕ‚¶‚½ó‘Ô‚ð•ÛŽ --E•`‰æƒ‚[ƒhØ‘Ö‚¦Žž‚ÉÁ‚µƒSƒ€•\Ž¦ --E•Û‘¶ŽžŠÔ’Zk --EViewƒ‚[ƒh‚Ì‹““®‚ð•ÏX --Eƒƒjƒ…[‚ÌŒ©‚½–Ú‚ð•ÏX --*/ --#include "fncanvas.h" --#include <stdio.h> --#include <qfile.h> --#include <qmessagebox.h> --#include <qtextstream.h> --#include <qpen.h> --#include <qcolor.h> --#include <qpoint.h> --#include <qthread.h> --#include <qimage.h> --#include <math.h> --#include "fnmessagebox.h" --#include "fmtengine.h" -- --int snap(int v) { -- int tv = abs(v); -- tv = ((int)(tv + SNAP_SIZE / 2) / SNAP_SIZE) * SNAP_SIZE; -- if (0 > v) { -- return -tv; -- } else { -- return tv; -- } --} -- --FNCanvas::FNCanvas(QWidget* parent = 0, const char* name = 0, WFlags f = 0) -- :QWidget(parent, name, f), -- _pen(black, 1, SolidLine, RoundCap, RoundJoin), -- _asMode(AS_NONE), -- _drawMode(MODE_DRAW), -- _disp_offset(0), -- _eraser_l(50), -- _eraser_s(10), -- _h_step(100), -- _v_step(100), -- _margin(5), -- _scrollTiming(800), -- _viewMode(false), -- _isWaiting(false), -- _isDragging(false), -- _isHeadingEnables(false), -- _isShowGuide(false), -- _isUseAllQuadrant(false), -- _scale_x(1.0), -- _scale_y(1.0) --{ -- _tracks.setAutoDelete(true); -- this->setBackgroundMode(NoBackground); -- _timer = new QTimer(this); -- connect(_timer, SIGNAL(timeout()), this, SLOT(autoScroll())); --} -- --FNCanvas::~FNCanvas() --{ -- _timer->stop(); -- delete _timer; -- -- _tracks.clear(); -- clearList(_draws); --} -- --void FNCanvas::setScrollTiming(int v) --{ -- _scrollTiming = v; --} -- -- --void FNCanvas::setVStep(int v) --{ -- _v_step = v; --} -- --void FNCanvas::setHStep(int v) --{ -- _h_step = v; --} -- --void FNCanvas::setSEraser(int v) --{ -- _eraser_s = v; --} -- --void FNCanvas::setLEraser(int v) --{ -- _eraser_l = v; --} -- -- --void FNCanvas::setMargin(int v) --{ -- if (v < 3) { -- v = 3; -- } -- _margin = v; --} -- --void FNCanvas::setScrollMode(int as) --{ -- _asMode = as; -- redraw(); --} -- --void FNCanvas::autoScroll() --{ -- if (AS_NONE == _asMode) { -- if (MODE_FORMAT == _drawMode || MODE_CURVE == _drawMode || MODE_SMOOTH == _drawMode) { -- setOrigin(_origin.x(), _origin.y()); -- } -- return; -- } -- bool tmp = _isHeadingEnables; -- int dx = 0; -- int dy = 0; -- if (AS_BOTH == _asMode || AS_HORIZONTAL == _asMode) { -- if (_last.x() > width() * (_margin - 1) / _margin) { -- dx = _h_step; -- } else if (_last.x() < width() / _margin) { -- dx = -_h_step; -- } -- } -- if (AS_BOTH == _asMode || AS_VERTICAL == _asMode) { -- if (_last.y() > height() * (_margin - 1) / _margin) { -- dy = _v_step; -- } else if (_last.y() < height() / _margin) { -- dy = -_v_step; -- } -- } -- setOrigin(_origin.x() + dx, _origin.y() + dy); -- _isHeadingEnables = tmp; --} -- --void FNCanvas::mousePressEvent(QMouseEvent* evt) --{ -- setFocus(); -- _timer->stop(); -- _tracks.clear(); -- if (_viewMode) { -- _isWaiting = true; -- _viewMode = false; -- setOrigin((int)((evt->x()) / _scale_x) - width() / 2, (int)((evt->y()) / _scale_y) - height() / 2); -- redraw(); -- emit resetViewMode(); -- } else if (MODE_ERASE != _drawMode) { -- _last = evt->pos(); -- _tracks.append(new QPoint(_last)); -- } else { -- redraw(); -- _last = evt->pos(); -- _tracks.append(new QPoint(_last)); -- -- QPainter pbuf; -- QPainter pwin; -- pbuf.begin(&_buffer); -- pwin.begin(this); -- -- int w = _eraser_s; -- if (PENWIDTH_MAX / 2 < _pen.width()) { -- w = _eraser_l; -- } -- pbuf.setRasterOp(XorROP); -- pbuf.setPen(QPen(white, 1)); -- pbuf.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -- -- pwin.setRasterOp(XorROP); -- pwin.setPen(QPen(white, 1)); -- pwin.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -- -- pbuf.end(); -- pwin.end(); -- } -- _isDragging = true; --} -- --void FNCanvas::mouseMoveEvent(QMouseEvent* evt) --{ -- if (_isWaiting) { -- return; -- } -- if (MODE_ERASE != _drawMode) { -- QPainter pwin; -- QPainter pbuf; -- -- pwin.begin(this); -- pbuf.begin(&_buffer); -- -- pwin.setPen(_pen); -- pbuf.setPen(_pen); -- -- pwin.drawLine(_last, evt->pos()); -- pbuf.drawLine(_last, evt->pos()); -- -- pwin.end(); -- pbuf.end(); -- _last = evt->pos(); -- _tracks.append(new QPoint(_last)); -- } else { -- //redraw(); -- if (_last.x() == -1) { -- return; -- } -- QPainter pbuf; -- QPainter pwin; -- -- pbuf.begin(&_buffer); -- pwin.begin(this); -- -- int w = _eraser_s; -- if (PENWIDTH_MAX / 2 < _pen.width()) { -- w = _eraser_l; -- } -- pbuf.setRasterOp(XorROP); -- pwin.setRasterOp(XorROP); -- pbuf.setPen(QPen(white, 1)); -- pwin.setPen(QPen(white, 1)); -- pbuf.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -- pwin.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -- -- _tracks.append(new QPoint(evt->pos())); -- _last = evt->pos(); -- -- pbuf.setRasterOp(CopyROP); -- pwin.setRasterOp(CopyROP); -- QRect r = QRect(0, 0, width(), height()); -- for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -- FNPolygon* p = _draws.at(i); -- if (r.intersects(p->boundingRect())) { -- bool f = false; -- QRect selected(_last.x() - w / 2, _last.y() - w / 2, w, w); -- for (uint j = 0; j < p->points().count(); ++j) { -- QPoint& pts = p->points().at(j); -- if (selected.contains(pts)) { -- f = true; -- break; -- } -- } -- if (f) { -- p->drawShape(pbuf, f); -- p->drawShape(pwin, f); -- } -- } -- } -- pbuf.setRasterOp(XorROP); -- pwin.setRasterOp(XorROP); -- pbuf.setPen(QPen(white, 1)); -- pwin.setPen(QPen(white, 1)); -- pbuf.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -- pwin.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -- pbuf.end(); -- pwin.end(); -- } --} -- --void FNCanvas::mouseReleaseEvent(QMouseEvent* evt) --{ -- _isDragging = false; -- if (_isWaiting) { -- _isWaiting = false; -- return; -- } -- _last = evt->pos(); -- if (MODE_ERASE != _drawMode) { -- if (1 < _tracks.count()) { -- FNPolygon* p = NULL; -- if (MODE_FORMAT == _drawMode) { -- p = new FNPolygon(_pen); -- _tracks = AutoFormat(_tracks); -- } else if (MODE_CURVE == _drawMode) { -- QPoint sp = SnapPoint(*_tracks.at(0)); -- QPoint ep = SnapPoint(*_tracks.at(_tracks.count()-1)); -- _tracks = AutoCurve(_tracks); -- if (sp == ep) { -- p = new FNEllipse(_pen); -- } else if (2 < _tracks.count()) { -- p = new FNBezier(_pen); -- } else { -- p = new FNPolygon(_pen); -- } -- } else if (MODE_SMOOTH == _drawMode) { -- _tracks = Smoothing(_tracks); -- if (2 < _tracks.count()) { -- p = new FNBezier(_pen); -- } else { -- p = new FNPolygon(_pen); -- } -- } else { -- _tracks = Reduce(_tracks); -- p = new FNPolygon(_pen); -- } -- if (1 < _tracks.count()) { -- p->setPoints(_tracks); -- redobuf_flush(); -- _draws.append(p); -- } -- } -- _tracks.clear(); -- _isHeadingEnables = true; -- _timer->start(_scrollTiming, true); -- } else { -- _last = QPoint(-1, -1); -- _tracks.append(new QPoint(evt->pos())); -- redraw(); -- } --} -- --void FNCanvas::paintEvent(QPaintEvent* evt) --{ -- bitBlt(this, 0, 0, &_buffer); --} -- --void FNCanvas::resizeEvent(QResizeEvent* evt) --{ -- QPixmap save(_buffer); -- _buffer.resize(evt->size()); -- _buffer.fill(white); -- bitBlt(&_buffer, 0, 0, &save); -- redraw(); --} -- --void FNCanvas::setOrigin(QPoint& o) --{ -- this->setOrigin(o.x(), o.y()); --} -- --QPoint FNCanvas::getTopLeft() --{ -- if (0 == _draws.count() || !_isUseAllQuadrant) { -- return _origin; -- } -- -- int dx = ((FNPolygon*)_draws.at(0))->boundingRect().x(); -- int dy = ((FNPolygon*)_draws.at(0))->boundingRect().y(); -- for (uint i = 1; i < _draws.count(); ++i) { -- FNPolygon* p = _draws.at(i); -- if (dx > p->boundingRect().x()) { -- dx = p->boundingRect().x(); -- } -- if (dy > p->boundingRect().y()) { -- dy = p->boundingRect().y(); -- } -- } -- return QPoint(snap(dx), snap(dy)); --} -- -- --void FNCanvas::rebuild() --{ -- if (0 == _draws.count() || !_isUseAllQuadrant) { -- return; -- } -- -- QPoint d = getTopLeft(); -- for (uint i = 0; i < _draws.count(); ++i) { -- FNPolygon* p = _draws.at(i); -- p->translate(-d.x(), -d.y()); -- } -- -- _origin = QPoint(0, 0); --} -- -- --void FNCanvas::setOrigin(int ox, int oy) --{ -- ox = snap(ox); -- oy = snap(oy); -- _isHeadingEnables = false; -- _timer->stop(); -- -- -- int dx = 0; -- int dy = 0; -- if (!_isUseAllQuadrant) { -- if (0 > ox) { -- ox = 0; -- } -- if (0 > oy) { -- oy = 0; -- } -- dx = _origin.x() - ox; -- dy = _origin.y() - oy; -- } else { -- dx = _origin.x() - ox; -- dy = _origin.y() - oy; -- if (0 > ox) { -- ox = 0; -- } -- if (0 > oy) { -- oy = 0; -- } -- } -- for (uint i = 0; i < _tracks.count(); ++i) { -- QPoint* p = _tracks.at(i); -- p->setX(p->x() + dx); -- p->setY(p->y() + dy); -- } -- -- for (uint i = 0; i < _draws.count(); ++i) { -- FNPolygon* p = _draws.at(i); -- p->translate(dx, dy); -- } -- _origin = QPoint(ox, oy); -- emit originChanged(ox, oy); -- redraw(); --} -- --void FNCanvas::redraw() --{ -- if (!this->isVisible()) { -- return; -- } -- _buffer.fill(white); -- QPainter pbuf; -- QRect r = QRect(0, 0, width(), height()); -- pbuf.begin(&_buffer); -- if (_viewMode) { -- float wx = 0; -- float wy = 0; -- for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -- FNPolygon* p = _draws.at(i); -- QRect r = p->boundingRect(); -- if (wx < r.right()) { -- wx = r.right(); -- } -- if (wy < r.bottom()) { -- wy = r.bottom(); -- } -- } -- wx += SNAP_SIZE; -- wy += SNAP_SIZE; -- wx = snap((int)wx); -- wy = snap((int)wy); -- wx = wx + _origin.x(); -- wy = wy + _origin.y(); -- _scale_x = (float)width() / wx; -- _scale_y = (float)height() / wy; -- if (1.0f < _scale_x) { -- _scale_x = 1.0f; -- } -- if (1.0f < _scale_y) { -- _scale_y = 1.0f; -- } -- if (_scale_x > _scale_y) { -- _scale_x = _scale_y; -- } else if (_scale_x < _scale_y) { -- _scale_y = _scale_x; -- } -- for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -- FNPolygon* p = _draws.at(i); -- FNPolygon* t = NULL; -- if (p->type() == FN_BEZIER) { -- t = new FNBezier(*(FNBezier*)p); -- } else if (p->type() == FN_ELLIPSE) { -- t = new FNEllipse(*(FNEllipse*)p); -- } else { -- t = new FNPolygon(*p); -- } -- t->translate(-_origin.x(), -_origin.y()); -- for (uint j = 0; j < t->points().count(); ++j) { -- QPoint& pts = t->points().at(j); -- int x = (int)(pts.x() * _scale_x); -- int y = (int)(pts.y() * _scale_y); -- pts.setX(x); -- pts.setY(y); -- } -- double pensize = t->pen().width(); -- if (_scale_x > _scale_y) { -- pensize = pensize * _scale_y; -- } else { -- pensize = pensize * _scale_x; -- } -- if (0 >= pensize) { -- pensize = 1; -- } -- t->pen().setWidth(pensize); -- t->drawShape(pbuf); -- delete t; -- } -- } else if (MODE_ERASE != _drawMode) { -- if (MODE_FORMAT == _drawMode || MODE_CURVE == _drawMode) { -- QPen pen1(QColor(0, 240, 240), 1); -- QPen pen2(QColor(0, 0, 0), 1); -- pbuf.setPen(QPen(QColor(0, 240, 240), 1)); -- pbuf.setPen(pen1); -- for (int x = 0; x < width() + SNAP_SIZE; x += SNAP_SIZE) { -- pbuf.drawLine(x - SNAP_SIZE / 2, 0, x - SNAP_SIZE / 2, height()); -- for (int y = 0; y < height() + SNAP_SIZE; y += SNAP_SIZE) { -- pbuf.drawLine(0, y - SNAP_SIZE / 2, width(), y - SNAP_SIZE / 2); -- pbuf.drawRect(x-1,y-1,2,2); -- } -- } -- } -- if (_isShowGuide) { -- pbuf.setPen(QPen(cyan, 1, DashLine)); -- if (AS_HORIZONTAL == _asMode || AS_BOTH == _asMode) { -- if (0 != _origin.x() || _isUseAllQuadrant) { -- pbuf.drawLine(width() / _margin, 0, width() / _margin, height()); -- } -- pbuf.drawLine(width() * (_margin - 1) / _margin, 0, width() * (_margin - 1) / _margin, height()); -- } -- -- if (AS_VERTICAL == _asMode || AS_BOTH == _asMode) { -- if (0 != _origin.y() || _isUseAllQuadrant) { -- pbuf.drawLine(0, height() / _margin, width(), height() / _margin); -- } -- pbuf.drawLine(0, height() * (_margin - 1) / _margin, width(), height() * (_margin - 1) / _margin); -- } -- } -- -- for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -- FNPolygon* p = _draws.at(i); -- if (r.intersects(p->boundingRect())) { -- p->drawShape(pbuf); -- } -- } -- } else { -- int w = _eraser_s; -- if (PENWIDTH_MAX / 2 < _pen.width()) { -- w = _eraser_l; -- } -- FNPointList removes; -- for (uint i = 0; i < _tracks.count(); ++i) { -- removes.append(_tracks.at(i)); -- } -- for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -- FNPolygon* p = _draws.at(i); -- if (r.intersects(p->boundingRect())) { -- bool f = false; -- for (uint j = 0; j < _tracks.count(); ++j) { -- QPoint* pts = _tracks.at(j); -- QRect selected(pts->x() - w / 2, pts->y() - w / 2, w, w); -- for (uint k = 0; k < p->points().count(); ++k) { -- QPoint& pts2 = p->points().at(k); -- if (selected.contains(pts2)) { -- f = true; -- removes.remove(pts); -- break; -- } -- } -- if (f) { -- break; -- } -- } -- p->drawShape(pbuf, f); -- } -- } -- for (uint i = 0; i < removes.count(); ++i) { -- _tracks.remove(removes.at(i)); -- } -- /* -- if (_isDragging) { -- pbuf.setPen(QPen(black, 1)); -- pbuf.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -- } -- */ -- } -- pbuf.end(); -- repaint(); --} -- --void FNCanvas::changeColor(QRgb c) --{ -- _pen.setColor(QColor(c)); --} -- --void FNCanvas::undo() --{ -- if (MODE_ERASE != _drawMode) { -- ++_disp_offset; -- if (_disp_offset > _draws.count()) { -- _disp_offset = _draws.count(); -- } -- } else { -- _draws = _undobuf; -- _marks.clear(); -- } -- redraw(); --} -- --void FNCanvas::redo() --{ -- if (MODE_ERASE != _drawMode) { -- if (0 < _disp_offset) { -- --_disp_offset; -- } -- } -- redraw(); --} -- --void FNCanvas::clearList(FNPolygonList& list) --{ -- list.setAutoDelete(true); -- list.clear(); -- list.setAutoDelete(false); --} -- --void FNCanvas::clear() --{ -- _disp_offset = 0; -- clearList(_draws); -- _undobuf.clear(); -- setOrigin(0, 0); -- redraw(); --} -- --void FNCanvas::viewChanged(bool flg) --{ -- _tracks.clear(); -- _viewMode = flg; -- if (_viewMode) { -- if (_isUseAllQuadrant) { -- rebuild(); -- } -- setOrigin(0, 0); -- } -- redraw(); --} -- --void FNCanvas::redobuf_flush() --{ -- for (uint i = 0; i < _disp_offset; ++i) { -- FNPolygon* p = _draws.last(); -- _draws.remove(p); -- delete p; -- } -- _disp_offset = 0; --} -- --void FNCanvas::modeChanged(int mode) --{ -- _tracks.clear(); -- _drawMode = mode; -- redobuf_flush(); -- if (MODE_ERASE == _drawMode) { -- _marks.clear(); -- _undobuf = _draws; -- } else { -- if (_draws.count() != _undobuf.count()) { -- for (uint i = 0; i < _marks.count(); ++i) { -- FNPolygon* p = _marks.at(i); -- _draws.remove(p); -- } -- clearList(_marks); -- } -- } -- redraw(); --} -- --QRect FNCanvas::getMatrix(const QRect& r) const --{ -- int ox = _origin.x(); -- int oy = _origin.y(); -- const int wide = 100; -- -- int left = r.left() + ox; -- int top = r.top() + oy; -- int right = r.right() + ox; -- int bottom = r.bottom() + oy; -- -- left = (int)(left / wide) * wide; -- top = (int)(top / wide) * wide; -- right = (right % wide == 0 && left != right) ? right : (int)((right + wide) / wide) * wide; -- bottom = (bottom % wide == 0 && top != bottom) ? bottom : (int)((bottom + wide) / wide) * wide; -- -- return QRect(left - ox, top - oy, right - left, bottom - top); --} -- --void FNCanvas::CR() --{ -- if (MODE_ERASE == _drawMode) { -- return; -- } -- if (_isHeadingEnables) { -- //last‚©‚çA¶•ûŒü‚ÉŒü‚¯‚Ä’Tõ‚·‚éB -- QRect r = getMatrix(_draws.last()->boundingRect()); -- bool isSearching = true; -- r.moveBy(-100, 0); -- while (isSearching) { -- isSearching = false; -- for (uint i = 0; i < _draws.count(); ++i) { -- FNPolygon* p = _draws.at(i); -- const QRect& r2 = p->boundingRect(); -- if (r.intersects(r2)) { -- if (r.left() + 100 > r2.left()) { -- r = getMatrix(r2); -- r.moveBy(-100, 0); -- isSearching = true; -- break; -- } -- } -- } -- } -- r.moveBy(100, 0); -- //last‚ª‰æ–Ê‚Ì4/5ˆÈ‰º‚È‚ç‚ÎAƒXƒNƒ[ƒ‹ƒAƒbƒv‚·‚éB -- //‚»‚¤‚Å‚È‚¯‚ê‚ÎAƒwƒbƒfƒBƒ“ƒO‚Ì‚ÝB -- if (_last.y() > height() * 4 / 5) { -- setOrigin(_origin.x() + r.x(), _origin.y() + 50); -- } else { -- setOrigin(_origin.x() + r.x(), _origin.y()); -- } -- _isHeadingEnables = false; -- } else { -- //last‚ÌŽüˆÍ‚ɉ½‚à–³‚¢ê‡‚ÍAc‚ɃXƒNƒ[ƒ‹‚·‚éB -- setOrigin(_origin.x(), _origin.y() + 50); -- } --} -- --void FNCanvas::erase() --{ -- if (MODE_ERASE != _drawMode) { -- return; -- } -- FNPolygonList temp; -- int w = _eraser_s; -- if (PENWIDTH_MAX / 2 < _pen.width()) { -- w = _eraser_l; -- } -- QRect r = QRect(0, 0, width(), height()); -- for (uint i = 0; i < _draws.count(); ++i) { -- FNPolygon* p = _draws.at(i); -- bool f = false; -- if (r.intersects(p->boundingRect())) { -- for (uint j = 0; j < _tracks.count(); ++j) { -- QPoint* pts = _tracks.at(j); -- QRect selected(pts->x() - w / 2, pts->y() - w / 2, w, w); -- for (uint k = 0; k < p->points().count(); ++k) { -- QPoint& pts2 = p->points().at(k); -- if (selected.contains(pts2)) { -- temp.append(p); -- f = true; -- break; -- } -- } -- if (f) { -- break; -- } -- } -- } -- } -- for (uint i = 0; i < temp.count(); ++i) { -- _draws.remove(temp.at(i)); -- _marks.append(temp.at(i)); -- } -- _tracks.clear(); -- redraw(); --} -- --void FNCanvas::setPensize(int sz) --{ -- _pen.setWidth(sz); --} -- --bool FNCanvas::exportPNG(const QFileInfo& info, QPixmap& buf) --{ -- if (0 == info.fileName().length()) { -- QMessageBox::warning(0,"FreeNoteQt", "file name is empty."); -- return false; -- } -- if (info.extension(false) != "png") { -- QMessageBox::warning(0,"FreeNoteQt", "extension '.png' expected."); -- return false; -- } -- -- bool ret = buf.save(info.absFilePath(), "PNG"); -- if (ret) { -- FNMessageBox::information(0,"FreeNoteQt", "export PNG complete."); -- } else { -- QMessageBox::warning(0,"FreeNoteQt", "could not export file."); -- } -- return ret; --} -- --QString FNCanvas::mkPDFscript(FNPolygon* elm) --{ -- QString s =""; -- char buf[1024]; -- -- float r = (float)elm->pen().color().red() / 255.0f; -- float g = (float)elm->pen().color().green() / 255.0f; -- float b = (float)elm->pen().color().blue() / 255.0f; -- s += "q\n"; -- sprintf(buf, "%f %f %f RG\n", r, g, b); -- s += buf; -- QPointArray points = elm->points().copy(); -- points.translate(_origin.x(), _origin.y()); -- if (elm->type() == FN_BEZIER) { -- sprintf(buf, "%d %d m\n", points[0].x(), points[0].y()); -- s += buf; -- for (uint j = 1; j < points.count(); j += 3) { -- sprintf(buf, "%d %d %d %d %d %d c\n", -- points[j].x(), points[j].y(), -- points[j + 1].x(), points[j + 1].y(), -- points[j + 2].x(), points[j + 2].y() -- ); -- s += buf; -- } -- } else if (elm->type() == FN_ELLIPSE) { -- int x = points[0].x(); -- int y = points[0].y(); -- int ex = points[1].x(); -- int ey = points[1].y(); -- int w = ex - x; -- int h = ey - y; -- int cx = x + w/2; -- int cy = y; -- int x1 = x + 3*w/4; -- int y1 = y; -- int x2 = x + w; -- int y2 = y + h/4; -- int x3 = x + w; -- int y3 = y + h/2; -- -- sprintf(buf, "%d %d m\n%d %d %d %d %d %d c\n", cx, cy, x1, y1, x2, y2, x3, y3); -- s += buf; -- x1 = x + w; -- y1 = y + 3 * h / 4; -- x2 = x + 3 * w / 4; -- y2 = y + h; -- x3 = x + w/2; -- y3 = y + h; -- sprintf(buf, "%d %d %d %d %d %d c\n", x1, y1, x2, y2, x3, y3); -- s += buf; -- -- x1 = x + w / 4; -- y1 = y + h; -- x2 = x; -- y2 = y + 3 * h / 4; -- x3 = x; -- y3 = y + h / 2; -- sprintf(buf, "%d %d %d %d %d %d c\n", x1, y1, x2, y2, x3, y3); -- s += buf; -- x1 = x; -- y1 = y + h / 4; -- x2 = x + w / 4; -- y2 = y; -- x3 = x + w / 2; -- y3 = y; -- sprintf(buf, "%d %d %d %d %d %d c\n", x1, y1, x2, y2, x3, y3); -- s += buf; -- } else { -- sprintf(buf, "%d %d m\n", points[0].x(), points[0].y()); -- s += buf; -- for (uint j = 1; j < points.count(); ++j) { -- sprintf(buf, "%d %d l\n", points[j].x(), points[j].y()); -- s += buf; -- } -- } -- sprintf(buf, "%d w\n", elm->pen().width()); -- s += buf; -- s += "S\n"; -- s += "Q\n"; -- return s; --} -- --bool FNCanvas::exportPDF(const QFileInfo& info) --{ -- if (0 == info.fileName().length()) { -- QMessageBox::warning(0,"FreeNoteQt", "file name is empty."); -- return false; -- } -- if (info.extension(false) != "pdf") { -- QMessageBox::warning(0,"FreeNoteQt", "extension '.pdf' expected."); -- return false; -- } -- -- FILE* fp = NULL; -- if (!(fp = fopen(info.absFilePath().utf8(), "wt"))) { -- QMessageBox::warning(0,"FreeNoteQt", "could not export file."); -- return false; -- } -- -- QPoint o = getTopLeft(); -- rebuild(); -- int wx = 595; -- int wy = 842; -- char buf[1024]; -- for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -- FNPolygon* p = _draws.at(i); -- QRect r = p->boundingRect(); -- r.moveBy(_origin.x(), _origin.y()); -- if (wx < r.right()) { -- wx =r.right(); -- } -- if (wy < r.bottom()) { -- wy = r.bottom(); -- } -- } -- -- int len = 0; -- -- sprintf(buf, "1 0 0 -1 0 %d cm\n", wy); -- QString cm = buf; -- len += cm.length(); -- -- for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -- QString s = mkPDFscript(_draws.at(i)); -- len += s.length(); -- } -- -- QString header = ""; -- header += "%PDF-1.3\n"; -- header += "1 0 obj\n"; -- header += "<<\n"; -- header += "/Type /Page\n"; -- header += "/Parent 3 0 R\n"; -- header += "/Resources\n"; -- header += "<<\n"; -- header += "/ProcSet [ /PDF ]\n"; -- header += ">>\n"; -- sprintf(buf, "/MediaBox [ 0 0 %010d %010d ]\n", wx, wy); -- header += buf; -- header += "/Contents 4 0 R\n"; -- header += ">>\n"; -- header += "endobj\n"; -- header += "2 0 obj\n"; -- header += "<<\n"; -- header += "/Type /Catalog\n"; -- header += "/Pages 3 0 R\n"; -- header += "/PageLayout /OneColumn\n"; -- header += "/OpenAction [1 0 R /XYZ null null 1 ]\n"; -- header += ">>\n"; -- header += "endobj\n"; -- header += "3 0 obj\n"; -- header += "<<\n"; -- header += "/Type /Pages\n"; -- header += "/Kids [ 1 0 R ]\n"; -- header += "/Count 1\n"; -- header += ">>\n"; -- header += "endobj\n"; -- header += "4 0 obj\n"; -- sprintf(buf, "<< /Length %010d >>\n", len); -- header += buf; -- header += "stream\n"; -- -- QString footer = ""; -- footer += "xref\n"; -- footer += "0 5\n"; -- footer += "0000000000 65535 f \n"; -- footer += "0000000009 00000 n \n"; -- footer += "0000000147 00000 n \n"; -- footer += "0000000257 00000 n \n"; -- footer += "0000000316 00000 n \n"; -- footer += "trailer\n"; -- footer += "<<\n"; -- footer += "/Size 5\n"; -- footer += "/Root 2 0 R\n"; -- footer += ">>\n"; -- footer += "startxref\n"; -- -- len = cm.length(); -- len += header.length(); -- fputs(header, fp); -- fputs(cm, fp); -- -- for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -- QString s = mkPDFscript(_draws.at(i)); -- len += s.length(); -- fputs(s, fp); -- } -- QString streamfooter = "endstream\nendobj\n"; -- len += streamfooter.length(); -- fputs(streamfooter, fp); -- -- fputs(footer, fp); -- sprintf(buf, "%d\n", len); -- fputs(buf, fp); -- fputs("%%EOF\n", fp); -- fclose(fp); -- if (_isUseAllQuadrant) { -- setOrigin(-o.x(), -o.y()); -- } -- FNMessageBox::information(0,"FreeNoteQt", "export PDF complete."); -- return true; --} -- --bool FNCanvas::save(const QFileInfo& info) --{ -- if (0 == info.fileName().length()) { -- QMessageBox::warning(0,"FreeNoteQt", "file name is empty."); -- return false; -- } -- if (info.extension(false) != "free") { -- QMessageBox::warning(0,"FreeNoteQt", "extension '.free' expected."); -- return false; -- } -- FILE* fp = NULL; -- if (!(fp = fopen(info.absFilePath().utf8(), "wt"))) { -- QMessageBox::warning(0,"FreeNoteQt", "could not save file."); -- return false; -- } -- QPoint o = getTopLeft(); -- rebuild(); -- fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", fp); -- fputs("<freenote version=\"2.0\">\n", fp); -- char buf[1024]; -- for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -- FNPolygon p(*_draws.at(i)); -- p.translate(_origin.x(), _origin.y()); -- if (p.type() == FN_BEZIER) { -- sprintf(buf, "\t<bz color=\"%x\" width=\"%d\">\n", (uint)p.pen().color().rgb(), p.pen().width()); -- } else if (p.type() == FN_ELLIPSE) { -- sprintf(buf, "\t<el color=\"%x\" width=\"%d\">\n", (uint)p.pen().color().rgb(), p.pen().width()); -- } else { -- sprintf(buf, "\t<po color=\"%x\" width=\"%d\">\n", (uint)p.pen().color().rgb(), p.pen().width()); -- } -- fputs(buf, fp); -- QPointArray& points = p.points(); -- for (uint j = 0; j < points.count(); ++j) { -- QPoint point = points.point(j); -- sprintf(buf, "\t\t<p x=\"%d\" y=\"%d\"/>\n", point.x(), point.y()); -- fputs(buf, fp); -- } -- if (p.type() == FN_BEZIER) { -- fputs("\t</bz>\n", fp); -- } else if (p.type() == FN_ELLIPSE) { -- fputs("\t</el>\n", fp); -- } else { -- fputs("\t</po>\n", fp); -- } -- } -- fputs("</freenote>\n", fp); -- fclose(fp); -- if (_isUseAllQuadrant) { -- setOrigin(-o.x(), -o.y()); -- } -- FNMessageBox::information(0, "FreeNoteQt", "save complete."); -- return true; --} -- --bool FNCanvas::load(const QFileInfo& info) --{ -- if (0 == info.fileName().length()) { -- QMessageBox::warning(0,"FreeNoteQt", "file name is empty."); -- return false; -- } -- if (!info.exists()) { -- QMessageBox::warning(0,"FreeNoteQt", "file not exists."); -- return false; -- } -- FILE* fp = NULL; -- if (!(fp = fopen(info.absFilePath().utf8(), "rt"))) { -- QMessageBox::warning(0,"FreeNoteQt", "could not open file."); -- return false; -- } -- clear(); -- -- QString line; -- FNPointList points; -- points.setAutoDelete(true); -- int c; -- int w; -- QPen pen(Qt::black, 1); -- FNPolygon* polygon; -- -- char rdbuf[1024]; -- char buf[1024]; -- QString type = ""; -- while (!feof(fp)) { -- fgets(rdbuf, sizeof(rdbuf), fp); -- line = rdbuf; -- if (-1 != line.find("<fnpolygon ") || -- -1 != line.find("<po ") || -- -1 != line.find("<bz ") || -- -1 != line.find("<el ") -- ) { -- if (-1 != line.find("<el ")) { -- type = "Ellipse"; -- } else if (-1 != line.find("<bz ")) { -- type = "Bezier"; -- } else { -- type = "Polygon"; -- } -- points.clear(); -- int st = line.find("color") + 7; -- int ed = line.find("\"", st); -- strcpy(buf, line.mid(st, ed - st).utf8()); -- sscanf(buf, "%x", &c); -- st = line.find("width") + 7; -- ed = line.find("\"", st); -- strcpy(buf, line.mid(st, ed - st).utf8()); -- sscanf(buf, "%d", &w); -- } else if (-1 != line.find("<point ") || -- -1 != line.find("<p ") -- ) { -- int st = line.find("x=") + 3; -- int ed = line.find("\"", st); -- strcpy(buf, line.mid(st, ed - st).utf8()); -- int x; -- sscanf(buf, "%d", &x); -- -- st = line.find("y=") + 3; -- ed = line.find("\"", st); -- strcpy(buf, line.mid(st, ed - st).utf8()); -- int y; -- sscanf(buf, "%d", &y); -- points.append(createPts(x, y)); //ƒoƒO‘Îô -- } else if (-1 != line.find("</fnpolygon") || -- -1 != line.find("</bz") || -- -1 != line.find("</el") || -- -1 != line.find("</po")) { -- pen.setColor((QRgb)c); -- pen.setWidth(w); -- if (type == "Bezier") { -- _draws.append(polygon = createBezier(pen)); //ƒoƒO‘Îô -- } else if (type == "Ellipse") { -- _draws.append(polygon = createEllipse(pen)); //ƒoƒO‘Îô -- } else { -- _draws.append(polygon = createPolygon(pen)); //ƒoƒO‘Îô -- } -- polygon->setPoints(points); -- points.clear(); -- } -- } -- fclose(fp); -- int x = 0; -- int y = 0; -- for (uint i = 0; i < _draws.count(); ++i) { -- if (y > _draws.at(i)->boundingRect().top()) { -- y = _draws.at(i)->boundingRect().top(); -- } -- if (x > _draws.at(i)->boundingRect().left()) { -- x = _draws.at(i)->boundingRect().left(); -- } -- } -- for (uint i = 0; i < _draws.count(); ++i) { -- _draws.at(i)->translate(-x, -y); -- } -- redraw(); -- FNMessageBox::information(0,"FreeNoteQt", "load complete."); -- -- return true; --} -- --FNPolygon* FNCanvas::createPolygon(QPen& pen) --{ -- return new FNPolygon(pen); --} -- --FNPolygon* FNCanvas::createBezier(QPen& pen) --{ -- return new FNBezier(pen); --} -- -- --FNPolygon* FNCanvas::createEllipse(QPen& pen) --{ -- return new FNEllipse(pen); --} -- --QPoint* FNCanvas::createPts(int x, int y) --{ -- return new QPoint(x, y); --} -- --void FNCanvas::setGuide(bool f) --{ -- _isShowGuide = f; -- redraw(); --} -+/* FreeNote for Sharp SLA300, B500, C7x0 Linux PDA -+ Copyright (C) 2003 Joe Kanemori.<kanemori@ymg.urban.ne.jp> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+*/ -+/* -+2003/12/23 ver 1.6.1 -+E•Û‘¶î•ñ‚̃TƒCƒYk¬ -+ -+2003/12/16-19 ver 1.5.5pre -+Eƒyƒ“ƒTƒCƒY‚̒ljÁ(1-8) -+EƒAƒ“ƒhƒDEƒŠƒhƒD‚ÌŽÀ‘• -+ -+2003/12/14 ver 1.5.4pre -+Eƒyƒ“ƒTƒCƒY‚ð‘I‘ð‰Â”\‚ÉB -+ -+2003/12/05 ver 1.5.3Apre -+EƒOƒŠƒbƒh‚ÌF‚ðC³ -+ -+2003/12/04 ver 1.5.3pre -+EƒOƒŠƒbƒh‚Ì•`‰æ‚ðˆê•”C³ -+ -+2003/11/10 ver 1.5.1pre -+E‹Èü®Œ`ƒ‚[ƒh’ljÁ -+ -+2003/11/09 ver 1.5.0pre -+EŽ©“®®Œ`ƒ‚[ƒh’ljÁ -+ -+2003/09/03 ver 1.3.4pre -+EUse all quadrant OFFŽž‚É•\Ž¦ˆÊ’u‚ªƒŠƒZƒbƒg‚³‚ê‚éꇂª‚ ‚éƒoƒO‘ΉžB -+ -+2003/09/01-03 ver 1.3.3pre -+EƒXƒNƒ[ƒ‹‚̉ü—Ç -+EUse all quadrant(‘SÛŒÀ‚ðŽg—p‚·‚é)ƒƒjƒ…[‚ð’ljÁ -+ -+2003/08/31 FreeNote 1.3.2pre -+E‘S•ûŒüƒXƒNƒ[ƒ‹ -+ -+2003/08/23 FreeNote 1.3.0pre -+ECR“®ì‚ÌC³ -+ -+2003/08/15 FreeNote 1.2.1‚ðŒöŠJ -+E•Û‘¶Žž‚̃oƒOC³ -+EŠ®—¹ƒ_ƒCƒAƒƒO‚ÌŽ©“®Á‹Ž -+EPNGƒtƒ@ƒCƒ‹‚Ö‚Ìo—Í -+ -+2003/08/15 FreeNote 1.2‚ðŒöŠJ -+EƒIƒvƒVƒ‡ƒ“’ljÁ -+EƒXƒNƒ[ƒ‹ƒKƒCƒh -+EFreeƒtƒ@ƒCƒ‹ŠÖ˜A•t‚¯ -+EƒAƒCƒRƒ“‚Ì•ÏX -+ -+2003/08/05 FreeNote 1.1.1pre‚ðŒöŠJ -+E‚‘¬‹N“®Žž‚ɕ‚¶‚½ó‘Ô‚ð•ÛŽ -+E•`‰æƒ‚[ƒhØ‘Ö‚¦Žž‚ÉÁ‚µƒSƒ€•\Ž¦ -+E•Û‘¶ŽžŠÔ’Zk -+EViewƒ‚[ƒh‚Ì‹““®‚ð•ÏX -+Eƒƒjƒ…[‚ÌŒ©‚½–Ú‚ð•ÏX -+*/ -+#include "fncanvas.h" -+#include <stdio.h> -+#include <qfile.h> -+#include <qmessagebox.h> -+#include <qtextstream.h> -+#include <qpen.h> -+#include <qcolor.h> -+#include <qpoint.h> -+#include <qthread.h> -+#include <qimage.h> -+#include <math.h> -+#include <stdlib.h> // abs -+#include "fnmessagebox.h" -+#include "fmtengine.h" -+ -+int snap(int v) { -+ int tv = abs(v); -+ tv = ((int)(tv + SNAP_SIZE / 2) / SNAP_SIZE) * SNAP_SIZE; -+ if (0 > v) { -+ return -tv; -+ } else { -+ return tv; -+ } -+} -+ -+FNCanvas::FNCanvas(QWidget* parent, const char* name, WFlags f ) -+ :QWidget(parent, name, f), -+ _pen(black, 1, SolidLine, RoundCap, RoundJoin), -+ _asMode(AS_NONE), -+ _drawMode(MODE_DRAW), -+ _disp_offset(0), -+ _eraser_l(50), -+ _eraser_s(10), -+ _h_step(100), -+ _v_step(100), -+ _margin(5), -+ _scrollTiming(800), -+ _viewMode(false), -+ _isWaiting(false), -+ _isDragging(false), -+ _isHeadingEnables(false), -+ _isShowGuide(false), -+ _isUseAllQuadrant(false), -+ _scale_x(1.0), -+ _scale_y(1.0) -+{ -+ _tracks.setAutoDelete(true); -+ this->setBackgroundMode(NoBackground); -+ _timer = new QTimer(this); -+ connect(_timer, SIGNAL(timeout()), this, SLOT(autoScroll())); -+} -+ -+FNCanvas::~FNCanvas() -+{ -+ _timer->stop(); -+ delete _timer; -+ -+ _tracks.clear(); -+ clearList(_draws); -+} -+ -+void FNCanvas::setScrollTiming(int v) -+{ -+ _scrollTiming = v; -+} -+ -+ -+void FNCanvas::setVStep(int v) -+{ -+ _v_step = v; -+} -+ -+void FNCanvas::setHStep(int v) -+{ -+ _h_step = v; -+} -+ -+void FNCanvas::setSEraser(int v) -+{ -+ _eraser_s = v; -+} -+ -+void FNCanvas::setLEraser(int v) -+{ -+ _eraser_l = v; -+} -+ -+ -+void FNCanvas::setMargin(int v) -+{ -+ if (v < 3) { -+ v = 3; -+ } -+ _margin = v; -+} -+ -+void FNCanvas::setScrollMode(int as) -+{ -+ _asMode = as; -+ redraw(); -+} -+ -+void FNCanvas::autoScroll() -+{ -+ if (AS_NONE == _asMode) { -+ if (MODE_FORMAT == _drawMode || MODE_CURVE == _drawMode || MODE_SMOOTH == _drawMode) { -+ setOrigin(_origin.x(), _origin.y()); -+ } -+ return; -+ } -+ bool tmp = _isHeadingEnables; -+ int dx = 0; -+ int dy = 0; -+ if (AS_BOTH == _asMode || AS_HORIZONTAL == _asMode) { -+ if (_last.x() > width() * (_margin - 1) / _margin) { -+ dx = _h_step; -+ } else if (_last.x() < width() / _margin) { -+ dx = -_h_step; -+ } -+ } -+ if (AS_BOTH == _asMode || AS_VERTICAL == _asMode) { -+ if (_last.y() > height() * (_margin - 1) / _margin) { -+ dy = _v_step; -+ } else if (_last.y() < height() / _margin) { -+ dy = -_v_step; -+ } -+ } -+ setOrigin(_origin.x() + dx, _origin.y() + dy); -+ _isHeadingEnables = tmp; -+} -+ -+void FNCanvas::mousePressEvent(QMouseEvent* evt) -+{ -+ setFocus(); -+ _timer->stop(); -+ _tracks.clear(); -+ if (_viewMode) { -+ _isWaiting = true; -+ _viewMode = false; -+ setOrigin((int)((evt->x()) / _scale_x) - width() / 2, (int)((evt->y()) / _scale_y) - height() / 2); -+ redraw(); -+ emit resetViewMode(); -+ } else if (MODE_ERASE != _drawMode) { -+ _last = evt->pos(); -+ _tracks.append(new QPoint(_last)); -+ } else { -+ redraw(); -+ _last = evt->pos(); -+ _tracks.append(new QPoint(_last)); -+ -+ QPainter pbuf; -+ QPainter pwin; -+ pbuf.begin(&_buffer); -+ pwin.begin(this); -+ -+ int w = _eraser_s; -+ if (PENWIDTH_MAX / 2 < _pen.width()) { -+ w = _eraser_l; -+ } -+ pbuf.setRasterOp(XorROP); -+ pbuf.setPen(QPen(white, 1)); -+ pbuf.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -+ -+ pwin.setRasterOp(XorROP); -+ pwin.setPen(QPen(white, 1)); -+ pwin.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -+ -+ pbuf.end(); -+ pwin.end(); -+ } -+ _isDragging = true; -+} -+ -+void FNCanvas::mouseMoveEvent(QMouseEvent* evt) -+{ -+ if (_isWaiting) { -+ return; -+ } -+ if (MODE_ERASE != _drawMode) { -+ QPainter pwin; -+ QPainter pbuf; -+ -+ pwin.begin(this); -+ pbuf.begin(&_buffer); -+ -+ pwin.setPen(_pen); -+ pbuf.setPen(_pen); -+ -+ pwin.drawLine(_last, evt->pos()); -+ pbuf.drawLine(_last, evt->pos()); -+ -+ pwin.end(); -+ pbuf.end(); -+ _last = evt->pos(); -+ _tracks.append(new QPoint(_last)); -+ } else { -+ //redraw(); -+ if (_last.x() == -1) { -+ return; -+ } -+ QPainter pbuf; -+ QPainter pwin; -+ -+ pbuf.begin(&_buffer); -+ pwin.begin(this); -+ -+ int w = _eraser_s; -+ if (PENWIDTH_MAX / 2 < _pen.width()) { -+ w = _eraser_l; -+ } -+ pbuf.setRasterOp(XorROP); -+ pwin.setRasterOp(XorROP); -+ pbuf.setPen(QPen(white, 1)); -+ pwin.setPen(QPen(white, 1)); -+ pbuf.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -+ pwin.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -+ -+ _tracks.append(new QPoint(evt->pos())); -+ _last = evt->pos(); -+ -+ pbuf.setRasterOp(CopyROP); -+ pwin.setRasterOp(CopyROP); -+ QRect r = QRect(0, 0, width(), height()); -+ for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -+ FNPolygon* p = _draws.at(i); -+ if (r.intersects(p->boundingRect())) { -+ bool f = false; -+ QRect selected(_last.x() - w / 2, _last.y() - w / 2, w, w); -+ for (uint j = 0; j < p->points().count(); ++j) { -+ QPoint& pts = p->points().at(j); -+ if (selected.contains(pts)) { -+ f = true; -+ break; -+ } -+ } -+ if (f) { -+ p->drawShape(pbuf, f); -+ p->drawShape(pwin, f); -+ } -+ } -+ } -+ pbuf.setRasterOp(XorROP); -+ pwin.setRasterOp(XorROP); -+ pbuf.setPen(QPen(white, 1)); -+ pwin.setPen(QPen(white, 1)); -+ pbuf.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -+ pwin.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -+ pbuf.end(); -+ pwin.end(); -+ } -+} -+ -+void FNCanvas::mouseReleaseEvent(QMouseEvent* evt) -+{ -+ _isDragging = false; -+ if (_isWaiting) { -+ _isWaiting = false; -+ return; -+ } -+ _last = evt->pos(); -+ if (MODE_ERASE != _drawMode) { -+ if (1 < _tracks.count()) { -+ FNPolygon* p = NULL; -+ if (MODE_FORMAT == _drawMode) { -+ p = new FNPolygon(_pen); -+ _tracks = AutoFormat(_tracks); -+ } else if (MODE_CURVE == _drawMode) { -+ QPoint sp = SnapPoint(*_tracks.at(0)); -+ QPoint ep = SnapPoint(*_tracks.at(_tracks.count()-1)); -+ _tracks = AutoCurve(_tracks); -+ if (sp == ep) { -+ p = new FNEllipse(_pen); -+ } else if (2 < _tracks.count()) { -+ p = new FNBezier(_pen); -+ } else { -+ p = new FNPolygon(_pen); -+ } -+ } else if (MODE_SMOOTH == _drawMode) { -+ _tracks = Smoothing(_tracks); -+ if (2 < _tracks.count()) { -+ p = new FNBezier(_pen); -+ } else { -+ p = new FNPolygon(_pen); -+ } -+ } else { -+ _tracks = Reduce(_tracks); -+ p = new FNPolygon(_pen); -+ } -+ if (1 < _tracks.count()) { -+ p->setPoints(_tracks); -+ redobuf_flush(); -+ _draws.append(p); -+ } -+ } -+ _tracks.clear(); -+ _isHeadingEnables = true; -+ _timer->start(_scrollTiming, true); -+ } else { -+ _last = QPoint(-1, -1); -+ _tracks.append(new QPoint(evt->pos())); -+ redraw(); -+ } -+} -+ -+void FNCanvas::paintEvent(QPaintEvent* evt) -+{ -+ bitBlt(this, 0, 0, &_buffer); -+} -+ -+void FNCanvas::resizeEvent(QResizeEvent* evt) -+{ -+ QPixmap save(_buffer); -+ _buffer.resize(evt->size()); -+ _buffer.fill(white); -+ bitBlt(&_buffer, 0, 0, &save); -+ redraw(); -+} -+ -+void FNCanvas::setOrigin(QPoint& o) -+{ -+ this->setOrigin(o.x(), o.y()); -+} -+ -+QPoint FNCanvas::getTopLeft() -+{ -+ if (0 == _draws.count() || !_isUseAllQuadrant) { -+ return _origin; -+ } -+ -+ int dx = ((FNPolygon*)_draws.at(0))->boundingRect().x(); -+ int dy = ((FNPolygon*)_draws.at(0))->boundingRect().y(); -+ for (uint i = 1; i < _draws.count(); ++i) { -+ FNPolygon* p = _draws.at(i); -+ if (dx > p->boundingRect().x()) { -+ dx = p->boundingRect().x(); -+ } -+ if (dy > p->boundingRect().y()) { -+ dy = p->boundingRect().y(); -+ } -+ } -+ return QPoint(snap(dx), snap(dy)); -+} -+ -+ -+void FNCanvas::rebuild() -+{ -+ if (0 == _draws.count() || !_isUseAllQuadrant) { -+ return; -+ } -+ -+ QPoint d = getTopLeft(); -+ for (uint i = 0; i < _draws.count(); ++i) { -+ FNPolygon* p = _draws.at(i); -+ p->translate(-d.x(), -d.y()); -+ } -+ -+ _origin = QPoint(0, 0); -+} -+ -+ -+void FNCanvas::setOrigin(int ox, int oy) -+{ -+ ox = snap(ox); -+ oy = snap(oy); -+ _isHeadingEnables = false; -+ _timer->stop(); -+ -+ -+ int dx = 0; -+ int dy = 0; -+ if (!_isUseAllQuadrant) { -+ if (0 > ox) { -+ ox = 0; -+ } -+ if (0 > oy) { -+ oy = 0; -+ } -+ dx = _origin.x() - ox; -+ dy = _origin.y() - oy; -+ } else { -+ dx = _origin.x() - ox; -+ dy = _origin.y() - oy; -+ if (0 > ox) { -+ ox = 0; -+ } -+ if (0 > oy) { -+ oy = 0; -+ } -+ } -+ for (uint i = 0; i < _tracks.count(); ++i) { -+ QPoint* p = _tracks.at(i); -+ p->setX(p->x() + dx); -+ p->setY(p->y() + dy); -+ } -+ -+ for (uint i = 0; i < _draws.count(); ++i) { -+ FNPolygon* p = _draws.at(i); -+ p->translate(dx, dy); -+ } -+ _origin = QPoint(ox, oy); -+ emit originChanged(ox, oy); -+ redraw(); -+} -+ -+void FNCanvas::redraw() -+{ -+ if (!this->isVisible()) { -+ return; -+ } -+ _buffer.fill(white); -+ QPainter pbuf; -+ QRect r = QRect(0, 0, width(), height()); -+ pbuf.begin(&_buffer); -+ if (_viewMode) { -+ float wx = 0; -+ float wy = 0; -+ for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -+ FNPolygon* p = _draws.at(i); -+ QRect r = p->boundingRect(); -+ if (wx < r.right()) { -+ wx = r.right(); -+ } -+ if (wy < r.bottom()) { -+ wy = r.bottom(); -+ } -+ } -+ wx += SNAP_SIZE; -+ wy += SNAP_SIZE; -+ wx = snap((int)wx); -+ wy = snap((int)wy); -+ wx = wx + _origin.x(); -+ wy = wy + _origin.y(); -+ _scale_x = (float)width() / wx; -+ _scale_y = (float)height() / wy; -+ if (1.0f < _scale_x) { -+ _scale_x = 1.0f; -+ } -+ if (1.0f < _scale_y) { -+ _scale_y = 1.0f; -+ } -+ if (_scale_x > _scale_y) { -+ _scale_x = _scale_y; -+ } else if (_scale_x < _scale_y) { -+ _scale_y = _scale_x; -+ } -+ for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -+ FNPolygon* p = _draws.at(i); -+ FNPolygon* t = NULL; -+ if (p->type() == FN_BEZIER) { -+ t = new FNBezier(*(FNBezier*)p); -+ } else if (p->type() == FN_ELLIPSE) { -+ t = new FNEllipse(*(FNEllipse*)p); -+ } else { -+ t = new FNPolygon(*p); -+ } -+ t->translate(-_origin.x(), -_origin.y()); -+ for (uint j = 0; j < t->points().count(); ++j) { -+ QPoint& pts = t->points().at(j); -+ int x = (int)(pts.x() * _scale_x); -+ int y = (int)(pts.y() * _scale_y); -+ pts.setX(x); -+ pts.setY(y); -+ } -+ double pensize = t->pen().width(); -+ if (_scale_x > _scale_y) { -+ pensize = pensize * _scale_y; -+ } else { -+ pensize = pensize * _scale_x; -+ } -+ if (0 >= pensize) { -+ pensize = 1; -+ } -+ t->pen().setWidth(pensize); -+ t->drawShape(pbuf); -+ delete t; -+ } -+ } else if (MODE_ERASE != _drawMode) { -+ if (MODE_FORMAT == _drawMode || MODE_CURVE == _drawMode) { -+ QPen pen1(QColor(0, 240, 240), 1); -+ QPen pen2(QColor(0, 0, 0), 1); -+ pbuf.setPen(QPen(QColor(0, 240, 240), 1)); -+ pbuf.setPen(pen1); -+ for (int x = 0; x < width() + SNAP_SIZE; x += SNAP_SIZE) { -+ pbuf.drawLine(x - SNAP_SIZE / 2, 0, x - SNAP_SIZE / 2, height()); -+ for (int y = 0; y < height() + SNAP_SIZE; y += SNAP_SIZE) { -+ pbuf.drawLine(0, y - SNAP_SIZE / 2, width(), y - SNAP_SIZE / 2); -+ pbuf.drawRect(x-1,y-1,2,2); -+ } -+ } -+ } -+ if (_isShowGuide) { -+ pbuf.setPen(QPen(cyan, 1, DashLine)); -+ if (AS_HORIZONTAL == _asMode || AS_BOTH == _asMode) { -+ if (0 != _origin.x() || _isUseAllQuadrant) { -+ pbuf.drawLine(width() / _margin, 0, width() / _margin, height()); -+ } -+ pbuf.drawLine(width() * (_margin - 1) / _margin, 0, width() * (_margin - 1) / _margin, height()); -+ } -+ -+ if (AS_VERTICAL == _asMode || AS_BOTH == _asMode) { -+ if (0 != _origin.y() || _isUseAllQuadrant) { -+ pbuf.drawLine(0, height() / _margin, width(), height() / _margin); -+ } -+ pbuf.drawLine(0, height() * (_margin - 1) / _margin, width(), height() * (_margin - 1) / _margin); -+ } -+ } -+ -+ for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -+ FNPolygon* p = _draws.at(i); -+ if (r.intersects(p->boundingRect())) { -+ p->drawShape(pbuf); -+ } -+ } -+ } else { -+ int w = _eraser_s; -+ if (PENWIDTH_MAX / 2 < _pen.width()) { -+ w = _eraser_l; -+ } -+ FNPointList removes; -+ for (uint i = 0; i < _tracks.count(); ++i) { -+ removes.append(_tracks.at(i)); -+ } -+ for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -+ FNPolygon* p = _draws.at(i); -+ if (r.intersects(p->boundingRect())) { -+ bool f = false; -+ for (uint j = 0; j < _tracks.count(); ++j) { -+ QPoint* pts = _tracks.at(j); -+ QRect selected(pts->x() - w / 2, pts->y() - w / 2, w, w); -+ for (uint k = 0; k < p->points().count(); ++k) { -+ QPoint& pts2 = p->points().at(k); -+ if (selected.contains(pts2)) { -+ f = true; -+ removes.remove(pts); -+ break; -+ } -+ } -+ if (f) { -+ break; -+ } -+ } -+ p->drawShape(pbuf, f); -+ } -+ } -+ for (uint i = 0; i < removes.count(); ++i) { -+ _tracks.remove(removes.at(i)); -+ } -+ /* -+ if (_isDragging) { -+ pbuf.setPen(QPen(black, 1)); -+ pbuf.drawRect(_last.x() - w / 2, _last.y() - w / 2, w, w); -+ } -+ */ -+ } -+ pbuf.end(); -+ repaint(); -+} -+ -+void FNCanvas::changeColor(QRgb c) -+{ -+ _pen.setColor(QColor(c)); -+} -+ -+void FNCanvas::undo() -+{ -+ if (MODE_ERASE != _drawMode) { -+ ++_disp_offset; -+ if (_disp_offset > _draws.count()) { -+ _disp_offset = _draws.count(); -+ } -+ } else { -+ _draws = _undobuf; -+ _marks.clear(); -+ } -+ redraw(); -+} -+ -+void FNCanvas::redo() -+{ -+ if (MODE_ERASE != _drawMode) { -+ if (0 < _disp_offset) { -+ --_disp_offset; -+ } -+ } -+ redraw(); -+} -+ -+void FNCanvas::clearList(FNPolygonList& list) -+{ -+ list.setAutoDelete(true); -+ list.clear(); -+ list.setAutoDelete(false); -+} -+ -+void FNCanvas::clear() -+{ -+ _disp_offset = 0; -+ clearList(_draws); -+ _undobuf.clear(); -+ setOrigin(0, 0); -+ redraw(); -+} -+ -+void FNCanvas::viewChanged(bool flg) -+{ -+ _tracks.clear(); -+ _viewMode = flg; -+ if (_viewMode) { -+ if (_isUseAllQuadrant) { -+ rebuild(); -+ } -+ setOrigin(0, 0); -+ } -+ redraw(); -+} -+ -+void FNCanvas::redobuf_flush() -+{ -+ for (uint i = 0; i < _disp_offset; ++i) { -+ FNPolygon* p = _draws.last(); -+ _draws.remove(p); -+ delete p; -+ } -+ _disp_offset = 0; -+} -+ -+void FNCanvas::modeChanged(int mode) -+{ -+ _tracks.clear(); -+ _drawMode = mode; -+ redobuf_flush(); -+ if (MODE_ERASE == _drawMode) { -+ _marks.clear(); -+ _undobuf = _draws; -+ } else { -+ if (_draws.count() != _undobuf.count()) { -+ for (uint i = 0; i < _marks.count(); ++i) { -+ FNPolygon* p = _marks.at(i); -+ _draws.remove(p); -+ } -+ clearList(_marks); -+ } -+ } -+ redraw(); -+} -+ -+QRect FNCanvas::getMatrix(const QRect& r) const -+{ -+ int ox = _origin.x(); -+ int oy = _origin.y(); -+ const int wide = 100; -+ -+ int left = r.left() + ox; -+ int top = r.top() + oy; -+ int right = r.right() + ox; -+ int bottom = r.bottom() + oy; -+ -+ left = (int)(left / wide) * wide; -+ top = (int)(top / wide) * wide; -+ right = (right % wide == 0 && left != right) ? right : (int)((right + wide) / wide) * wide; -+ bottom = (bottom % wide == 0 && top != bottom) ? bottom : (int)((bottom + wide) / wide) * wide; -+ -+ return QRect(left - ox, top - oy, right - left, bottom - top); -+} -+ -+void FNCanvas::CR() -+{ -+ if (MODE_ERASE == _drawMode) { -+ return; -+ } -+ if (_isHeadingEnables) { -+ //last‚©‚çA¶•ûŒü‚ÉŒü‚¯‚Ä’Tõ‚·‚éB -+ QRect r = getMatrix(_draws.last()->boundingRect()); -+ bool isSearching = true; -+ r.moveBy(-100, 0); -+ while (isSearching) { -+ isSearching = false; -+ for (uint i = 0; i < _draws.count(); ++i) { -+ FNPolygon* p = _draws.at(i); -+ const QRect& r2 = p->boundingRect(); -+ if (r.intersects(r2)) { -+ if (r.left() + 100 > r2.left()) { -+ r = getMatrix(r2); -+ r.moveBy(-100, 0); -+ isSearching = true; -+ break; -+ } -+ } -+ } -+ } -+ r.moveBy(100, 0); -+ //last‚ª‰æ–Ê‚Ì4/5ˆÈ‰º‚È‚ç‚ÎAƒXƒNƒ[ƒ‹ƒAƒbƒv‚·‚éB -+ //‚»‚¤‚Å‚È‚¯‚ê‚ÎAƒwƒbƒfƒBƒ“ƒO‚Ì‚ÝB -+ if (_last.y() > height() * 4 / 5) { -+ setOrigin(_origin.x() + r.x(), _origin.y() + 50); -+ } else { -+ setOrigin(_origin.x() + r.x(), _origin.y()); -+ } -+ _isHeadingEnables = false; -+ } else { -+ //last‚ÌŽüˆÍ‚ɉ½‚à–³‚¢ê‡‚ÍAc‚ɃXƒNƒ[ƒ‹‚·‚éB -+ setOrigin(_origin.x(), _origin.y() + 50); -+ } -+} -+ -+void FNCanvas::erase() -+{ -+ if (MODE_ERASE != _drawMode) { -+ return; -+ } -+ FNPolygonList temp; -+ int w = _eraser_s; -+ if (PENWIDTH_MAX / 2 < _pen.width()) { -+ w = _eraser_l; -+ } -+ QRect r = QRect(0, 0, width(), height()); -+ for (uint i = 0; i < _draws.count(); ++i) { -+ FNPolygon* p = _draws.at(i); -+ bool f = false; -+ if (r.intersects(p->boundingRect())) { -+ for (uint j = 0; j < _tracks.count(); ++j) { -+ QPoint* pts = _tracks.at(j); -+ QRect selected(pts->x() - w / 2, pts->y() - w / 2, w, w); -+ for (uint k = 0; k < p->points().count(); ++k) { -+ QPoint& pts2 = p->points().at(k); -+ if (selected.contains(pts2)) { -+ temp.append(p); -+ f = true; -+ break; -+ } -+ } -+ if (f) { -+ break; -+ } -+ } -+ } -+ } -+ for (uint i = 0; i < temp.count(); ++i) { -+ _draws.remove(temp.at(i)); -+ _marks.append(temp.at(i)); -+ } -+ _tracks.clear(); -+ redraw(); -+} -+ -+void FNCanvas::setPensize(int sz) -+{ -+ _pen.setWidth(sz); -+} -+ -+bool FNCanvas::exportPNG(const QFileInfo& info, QPixmap& buf) -+{ -+ if (0 == info.fileName().length()) { -+ QMessageBox::warning(0,"FreeNoteQt", "file name is empty."); -+ return false; -+ } -+ if (info.extension(false) != "png") { -+ QMessageBox::warning(0,"FreeNoteQt", "extension '.png' expected."); -+ return false; -+ } -+ -+ bool ret = buf.save(info.absFilePath(), "PNG"); -+ if (ret) { -+ FNMessageBox::information(0,"FreeNoteQt", "export PNG complete."); -+ } else { -+ QMessageBox::warning(0,"FreeNoteQt", "could not export file."); -+ } -+ return ret; -+} -+ -+QString FNCanvas::mkPDFscript(FNPolygon* elm) -+{ -+ QString s =""; -+ char buf[1024]; -+ -+ float r = (float)elm->pen().color().red() / 255.0f; -+ float g = (float)elm->pen().color().green() / 255.0f; -+ float b = (float)elm->pen().color().blue() / 255.0f; -+ s += "q\n"; -+ sprintf(buf, "%f %f %f RG\n", r, g, b); -+ s += buf; -+ QPointArray points = elm->points().copy(); -+ points.translate(_origin.x(), _origin.y()); -+ if (elm->type() == FN_BEZIER) { -+ sprintf(buf, "%d %d m\n", points[0].x(), points[0].y()); -+ s += buf; -+ for (uint j = 1; j < points.count(); j += 3) { -+ sprintf(buf, "%d %d %d %d %d %d c\n", -+ points[j].x(), points[j].y(), -+ points[j + 1].x(), points[j + 1].y(), -+ points[j + 2].x(), points[j + 2].y() -+ ); -+ s += buf; -+ } -+ } else if (elm->type() == FN_ELLIPSE) { -+ int x = points[0].x(); -+ int y = points[0].y(); -+ int ex = points[1].x(); -+ int ey = points[1].y(); -+ int w = ex - x; -+ int h = ey - y; -+ int cx = x + w/2; -+ int cy = y; -+ int x1 = x + 3*w/4; -+ int y1 = y; -+ int x2 = x + w; -+ int y2 = y + h/4; -+ int x3 = x + w; -+ int y3 = y + h/2; -+ -+ sprintf(buf, "%d %d m\n%d %d %d %d %d %d c\n", cx, cy, x1, y1, x2, y2, x3, y3); -+ s += buf; -+ x1 = x + w; -+ y1 = y + 3 * h / 4; -+ x2 = x + 3 * w / 4; -+ y2 = y + h; -+ x3 = x + w/2; -+ y3 = y + h; -+ sprintf(buf, "%d %d %d %d %d %d c\n", x1, y1, x2, y2, x3, y3); -+ s += buf; -+ -+ x1 = x + w / 4; -+ y1 = y + h; -+ x2 = x; -+ y2 = y + 3 * h / 4; -+ x3 = x; -+ y3 = y + h / 2; -+ sprintf(buf, "%d %d %d %d %d %d c\n", x1, y1, x2, y2, x3, y3); -+ s += buf; -+ x1 = x; -+ y1 = y + h / 4; -+ x2 = x + w / 4; -+ y2 = y; -+ x3 = x + w / 2; -+ y3 = y; -+ sprintf(buf, "%d %d %d %d %d %d c\n", x1, y1, x2, y2, x3, y3); -+ s += buf; -+ } else { -+ sprintf(buf, "%d %d m\n", points[0].x(), points[0].y()); -+ s += buf; -+ for (uint j = 1; j < points.count(); ++j) { -+ sprintf(buf, "%d %d l\n", points[j].x(), points[j].y()); -+ s += buf; -+ } -+ } -+ sprintf(buf, "%d w\n", elm->pen().width()); -+ s += buf; -+ s += "S\n"; -+ s += "Q\n"; -+ return s; -+} -+ -+bool FNCanvas::exportPDF(const QFileInfo& info) -+{ -+ if (0 == info.fileName().length()) { -+ QMessageBox::warning(0,"FreeNoteQt", "file name is empty."); -+ return false; -+ } -+ if (info.extension(false) != "pdf") { -+ QMessageBox::warning(0,"FreeNoteQt", "extension '.pdf' expected."); -+ return false; -+ } -+ -+ FILE* fp = NULL; -+ if (!(fp = fopen(info.absFilePath().utf8(), "wt"))) { -+ QMessageBox::warning(0,"FreeNoteQt", "could not export file."); -+ return false; -+ } -+ -+ QPoint o = getTopLeft(); -+ rebuild(); -+ int wx = 595; -+ int wy = 842; -+ char buf[1024]; -+ for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -+ FNPolygon* p = _draws.at(i); -+ QRect r = p->boundingRect(); -+ r.moveBy(_origin.x(), _origin.y()); -+ if (wx < r.right()) { -+ wx =r.right(); -+ } -+ if (wy < r.bottom()) { -+ wy = r.bottom(); -+ } -+ } -+ -+ int len = 0; -+ -+ sprintf(buf, "1 0 0 -1 0 %d cm\n", wy); -+ QString cm = buf; -+ len += cm.length(); -+ -+ for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -+ QString s = mkPDFscript(_draws.at(i)); -+ len += s.length(); -+ } -+ -+ QString header = ""; -+ header += "%PDF-1.3\n"; -+ header += "1 0 obj\n"; -+ header += "<<\n"; -+ header += "/Type /Page\n"; -+ header += "/Parent 3 0 R\n"; -+ header += "/Resources\n"; -+ header += "<<\n"; -+ header += "/ProcSet [ /PDF ]\n"; -+ header += ">>\n"; -+ sprintf(buf, "/MediaBox [ 0 0 %010d %010d ]\n", wx, wy); -+ header += buf; -+ header += "/Contents 4 0 R\n"; -+ header += ">>\n"; -+ header += "endobj\n"; -+ header += "2 0 obj\n"; -+ header += "<<\n"; -+ header += "/Type /Catalog\n"; -+ header += "/Pages 3 0 R\n"; -+ header += "/PageLayout /OneColumn\n"; -+ header += "/OpenAction [1 0 R /XYZ null null 1 ]\n"; -+ header += ">>\n"; -+ header += "endobj\n"; -+ header += "3 0 obj\n"; -+ header += "<<\n"; -+ header += "/Type /Pages\n"; -+ header += "/Kids [ 1 0 R ]\n"; -+ header += "/Count 1\n"; -+ header += ">>\n"; -+ header += "endobj\n"; -+ header += "4 0 obj\n"; -+ sprintf(buf, "<< /Length %010d >>\n", len); -+ header += buf; -+ header += "stream\n"; -+ -+ QString footer = ""; -+ footer += "xref\n"; -+ footer += "0 5\n"; -+ footer += "0000000000 65535 f \n"; -+ footer += "0000000009 00000 n \n"; -+ footer += "0000000147 00000 n \n"; -+ footer += "0000000257 00000 n \n"; -+ footer += "0000000316 00000 n \n"; -+ footer += "trailer\n"; -+ footer += "<<\n"; -+ footer += "/Size 5\n"; -+ footer += "/Root 2 0 R\n"; -+ footer += ">>\n"; -+ footer += "startxref\n"; -+ -+ len = cm.length(); -+ len += header.length(); -+ fputs(header, fp); -+ fputs(cm, fp); -+ -+ for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -+ QString s = mkPDFscript(_draws.at(i)); -+ len += s.length(); -+ fputs(s, fp); -+ } -+ QString streamfooter = "endstream\nendobj\n"; -+ len += streamfooter.length(); -+ fputs(streamfooter, fp); -+ -+ fputs(footer, fp); -+ sprintf(buf, "%d\n", len); -+ fputs(buf, fp); -+ fputs("%%EOF\n", fp); -+ fclose(fp); -+ if (_isUseAllQuadrant) { -+ setOrigin(-o.x(), -o.y()); -+ } -+ FNMessageBox::information(0,"FreeNoteQt", "export PDF complete."); -+ return true; -+} -+ -+bool FNCanvas::save(const QFileInfo& info) -+{ -+ if (0 == info.fileName().length()) { -+ QMessageBox::warning(0,"FreeNoteQt", "file name is empty."); -+ return false; -+ } -+ if (info.extension(false) != "free") { -+ QMessageBox::warning(0,"FreeNoteQt", "extension '.free' expected."); -+ return false; -+ } -+ FILE* fp = NULL; -+ if (!(fp = fopen(info.absFilePath().utf8(), "wt"))) { -+ QMessageBox::warning(0,"FreeNoteQt", "could not save file."); -+ return false; -+ } -+ QPoint o = getTopLeft(); -+ rebuild(); -+ fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", fp); -+ fputs("<freenote version=\"2.0\">\n", fp); -+ char buf[1024]; -+ for (uint i = 0; i < _draws.count() - _disp_offset; ++i) { -+ FNPolygon p(*_draws.at(i)); -+ p.translate(_origin.x(), _origin.y()); -+ if (p.type() == FN_BEZIER) { -+ sprintf(buf, "\t<bz color=\"%x\" width=\"%d\">\n", (uint)p.pen().color().rgb(), p.pen().width()); -+ } else if (p.type() == FN_ELLIPSE) { -+ sprintf(buf, "\t<el color=\"%x\" width=\"%d\">\n", (uint)p.pen().color().rgb(), p.pen().width()); -+ } else { -+ sprintf(buf, "\t<po color=\"%x\" width=\"%d\">\n", (uint)p.pen().color().rgb(), p.pen().width()); -+ } -+ fputs(buf, fp); -+ QPointArray& points = p.points(); -+ for (uint j = 0; j < points.count(); ++j) { -+ QPoint point = points.point(j); -+ sprintf(buf, "\t\t<p x=\"%d\" y=\"%d\"/>\n", point.x(), point.y()); -+ fputs(buf, fp); -+ } -+ if (p.type() == FN_BEZIER) { -+ fputs("\t</bz>\n", fp); -+ } else if (p.type() == FN_ELLIPSE) { -+ fputs("\t</el>\n", fp); -+ } else { -+ fputs("\t</po>\n", fp); -+ } -+ } -+ fputs("</freenote>\n", fp); -+ fclose(fp); -+ if (_isUseAllQuadrant) { -+ setOrigin(-o.x(), -o.y()); -+ } -+ FNMessageBox::information(0, "FreeNoteQt", "save complete."); -+ return true; -+} -+ -+bool FNCanvas::load(const QFileInfo& info) -+{ -+ if (0 == info.fileName().length()) { -+ QMessageBox::warning(0,"FreeNoteQt", "file name is empty."); -+ return false; -+ } -+ if (!info.exists()) { -+ QMessageBox::warning(0,"FreeNoteQt", "file not exists."); -+ return false; -+ } -+ FILE* fp = NULL; -+ if (!(fp = fopen(info.absFilePath().utf8(), "rt"))) { -+ QMessageBox::warning(0,"FreeNoteQt", "could not open file."); -+ return false; -+ } -+ clear(); -+ -+ QString line; -+ FNPointList points; -+ points.setAutoDelete(true); -+ int c; -+ int w; -+ QPen pen(Qt::black, 1); -+ FNPolygon* polygon; -+ -+ char rdbuf[1024]; -+ char buf[1024]; -+ QString type = ""; -+ while (!feof(fp)) { -+ fgets(rdbuf, sizeof(rdbuf), fp); -+ line = rdbuf; -+ if (-1 != line.find("<fnpolygon ") || -+ -1 != line.find("<po ") || -+ -1 != line.find("<bz ") || -+ -1 != line.find("<el ") -+ ) { -+ if (-1 != line.find("<el ")) { -+ type = "Ellipse"; -+ } else if (-1 != line.find("<bz ")) { -+ type = "Bezier"; -+ } else { -+ type = "Polygon"; -+ } -+ points.clear(); -+ int st = line.find("color") + 7; -+ int ed = line.find("\"", st); -+ strcpy(buf, line.mid(st, ed - st).utf8()); -+ sscanf(buf, "%x", &c); -+ st = line.find("width") + 7; -+ ed = line.find("\"", st); -+ strcpy(buf, line.mid(st, ed - st).utf8()); -+ sscanf(buf, "%d", &w); -+ } else if (-1 != line.find("<point ") || -+ -1 != line.find("<p ") -+ ) { -+ int st = line.find("x=") + 3; -+ int ed = line.find("\"", st); -+ strcpy(buf, line.mid(st, ed - st).utf8()); -+ int x; -+ sscanf(buf, "%d", &x); -+ -+ st = line.find("y=") + 3; -+ ed = line.find("\"", st); -+ strcpy(buf, line.mid(st, ed - st).utf8()); -+ int y; -+ sscanf(buf, "%d", &y); -+ points.append(createPts(x, y)); //ƒoƒO‘Îô -+ } else if (-1 != line.find("</fnpolygon") || -+ -1 != line.find("</bz") || -+ -1 != line.find("</el") || -+ -1 != line.find("</po")) { -+ pen.setColor((QRgb)c); -+ pen.setWidth(w); -+ if (type == "Bezier") { -+ _draws.append(polygon = createBezier(pen)); //ƒoƒO‘Îô -+ } else if (type == "Ellipse") { -+ _draws.append(polygon = createEllipse(pen)); //ƒoƒO‘Îô -+ } else { -+ _draws.append(polygon = createPolygon(pen)); //ƒoƒO‘Îô -+ } -+ polygon->setPoints(points); -+ points.clear(); -+ } -+ } -+ fclose(fp); -+ int x = 0; -+ int y = 0; -+ for (uint i = 0; i < _draws.count(); ++i) { -+ if (y > _draws.at(i)->boundingRect().top()) { -+ y = _draws.at(i)->boundingRect().top(); -+ } -+ if (x > _draws.at(i)->boundingRect().left()) { -+ x = _draws.at(i)->boundingRect().left(); -+ } -+ } -+ for (uint i = 0; i < _draws.count(); ++i) { -+ _draws.at(i)->translate(-x, -y); -+ } -+ redraw(); -+ FNMessageBox::information(0,"FreeNoteQt", "load complete."); -+ -+ return true; -+} -+ -+FNPolygon* FNCanvas::createPolygon(QPen& pen) -+{ -+ return new FNPolygon(pen); -+} -+ -+FNPolygon* FNCanvas::createBezier(QPen& pen) -+{ -+ return new FNBezier(pen); -+} -+ -+ -+FNPolygon* FNCanvas::createEllipse(QPen& pen) -+{ -+ return new FNEllipse(pen); -+} -+ -+QPoint* FNCanvas::createPts(int x, int y) -+{ -+ return new QPoint(x, y); -+} -+ -+void FNCanvas::setGuide(bool f) -+{ -+ _isShowGuide = f; -+ redraw(); -+} diff --git a/nonworking/freenote/freenote_1.6.1.bb b/nonworking/freenote/freenote_1.6.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/freenote/freenote_1.6.1.bb +++ /dev/null diff --git a/nonworking/glib-1.2/glib-1.2-1.2.10/configure.patch b/nonworking/glib-1.2/glib-1.2-1.2.10/configure.patch deleted file mode 100644 index aac18a7f18..0000000000 --- a/nonworking/glib-1.2/glib-1.2-1.2.10/configure.patch +++ /dev/null @@ -1,480 +0,0 @@ ---- tmp/base/glib-1.2.10-r0/glib-1.2.10/Makefile.am Fri Oct 27 23:35:30 2000 -+++ glib-1.2.10/Makefile.am Thu Oct 30 17:06:24 2003 -@@ -70,7 +70,7 @@ - - CONFIGURE_DEPENDENCIES = acglib.m4 - --BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h -+BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h - glibconfig.h: stamp-gc-h - @: - stamp-gc-h: config.status ---- tmp/base/glib-1.2.10-r0/glib-1.2.10/configure.in Thu Mar 15 09:37:37 2001 -+++ glib-1.2.10/configure.in Thu Oct 30 17:07:57 2003 -@@ -1,10 +1,11 @@ - dnl *********************************** - dnl *** include special GLib macros *** - dnl *********************************** --builtin(include, acglib.m4)dnl -+dnl no need, just use aclocal -I . --CL -+dnl builtin(include, acglib.m4)dnl - - # require autoconf 2.13 --AC_PREREQ(2.13) -+AC_PREREQ(2.53) - - # init autoconf (and check for presence of glist.c) - AC_INIT(glist.c) -@@ -13,11 +14,48 @@ - cflags_set=${CFLAGS+set} - - # we rewrite this file -+if test "x$cross_compiling" != "xyes"; then - rm -f glibconfig-sysdefs.h -+fi -+ -+# config defines -+ -+AH_TEMPLATE([ENABLE_MEM_CHECK], -+ [Define if enabling memory checking]) -+AH_TEMPLATE([ENABLE_MEM_PROFILE], []) -+AH_TEMPLATE([GLIB_BINARY_AGE], []) -+AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], []) -+AH_TEMPLATE([GLIB_INTERFACE_AGE], []) -+AH_TEMPLATE([GLIB_MAJOR_VERSION], []) -+AH_TEMPLATE([GLIB_MINOR_VERSION], []) -+AH_TEMPLATE([GLIB_MICRO_VERSION], []) -+AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], []) -+AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], []) -+AH_TEMPLATE([G_HAVE_INLINE], []) -+AH_TEMPLATE([G_HAVE___INLINE], []) -+AH_TEMPLATE([G_HAVE___INLINE__], []) -+AH_TEMPLATE([G_THREAD_SOURCE], []) -+AH_TEMPLATE([G_VA_COPY], []) -+AH_TEMPLATE([G_VA_COPY_AS_ARRAY], []) -+AH_TEMPLATE([HAVE_BROKEN_WCTYPE], []) -+AH_TEMPLATE([HAVE_GETPWUID_R], []) -+AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], []) -+AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], []) -+AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], []) -+AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], []) -+AH_TEMPLATE([HAVE_WCHAR_H], []) -+AH_TEMPLATE([HAVE_WCTYPE_H], []) -+AH_TEMPLATE([NO_FD_SET], []) -+AH_TEMPLATE([NO_SYS_ERRLIST], []) -+AH_TEMPLATE([NO_SYS_SIGLIST], []) -+AH_TEMPLATE([NO_SYS_SIGLIST_DECL], []) -+AH_TEMPLATE([REALLOC_0_WORKS], []) -+ - - dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they - dnl are available for $ac_help expansion (don't we all *love* autoconf?) --AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl -+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE) -+#dnl - # - # The following version number definitions apply to GLib, GModule and GThread - # as a whole, so if changes occoured in any of them, they are all -@@ -38,7 +76,7 @@ - GLIB_BINARY_AGE=10 - GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION - dnl --AC_DIVERT_POP()dnl -+#AC_DIVERT_POP()dnl - - AC_SUBST(GLIB_MAJOR_VERSION) - AC_SUBST(GLIB_MINOR_VERSION) -@@ -77,17 +115,15 @@ - dnl Initialize maintainer mode - AM_MAINTAINER_MODE - --AC_CANONICAL_HOST -- - dnl figure debugging default, prior to $ac_help setup - dnl --AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl -+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl - if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then - debug_default=yes - else - debug_default=minimum - fi --AC_DIVERT_POP()dnl -+#AC_DIVERT_POP()dnl - - dnl declare --enable-* args and collect ac_help strings - AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default) -@@ -194,7 +230,9 @@ - CFLAGS=$glib_save_CFLAGS - AC_MSG_WARN( - [No ANSI prototypes found in library. (-std1 didn't work.)]) -+ , AC_MSG_WARN([Skipping test due to crosscompilation]) - ) -+ , AC_MSG_WARN([Skipping test due to crosscompilation]) - ) - LIBS=$glib_save_LIBS - -@@ -405,11 +443,13 @@ - return realloc (0, sizeof (int)) == 0; - }], - glib_cv_sane_realloc=yes -- AC_DEFINE(REALLOC_0_WORKS) - , - glib_cv_sane_realloc=no - ,) - ]) -+if test "x$glib_cv_sane_realloc" = "xyes"; then -+ AC_DEFINE(REALLOC_0_WORKS) -+fi - AC_MSG_RESULT($glib_cv_sane_realloc) - - -@@ -485,7 +525,8 @@ - ]) - if test "x$glib_cv_va_copy" = "xyes"; then - AC_DEFINE(G_VA_COPY, va_copy) --else if test "x$glib_cv___va_copy" = "xyes"; then -+else -+if test "x$glib_cv___va_copy" = "xyes"; then - AC_DEFINE(G_VA_COPY, __va_copy) - fi - fi -@@ -494,6 +535,7 @@ - fi - AC_MSG_RESULT($glib_cv_va_val_copy) - -+AC_MSG_WARN([hi mom]) - - dnl *********************** - dnl *** g_module checks *** -@@ -505,21 +547,27 @@ - G_MODULE_BROKEN_RTLD_GLOBAL=0 - G_MODULE_HAVE_DLERROR=0 - dnl *** dlopen() and dlsym() in system libraries -+AC_CHECK_FUNC(dlopen,[ -+ AC_CHECK_FUNC(dlsym,[ -+ G_MODULE_IMPL=G_MODULE_IMPL_DL -+ ], -+ )], -+) - if test -z "$G_MODULE_IMPL"; then -- AC_CHECK_FUNC(dlopen, -- AC_CHECK_FUNC(dlsym, -+ AC_CHECK_FUNC(dlopen,[ -+ AC_CHECK_FUNC(dlsym,[ - G_MODULE_IMPL=G_MODULE_IMPL_DL -- ,) -- ,) -+ ])], -+ ) - fi - dnl *** dlopen() and dlsym() in libdl - if test -z "$G_MODULE_IMPL"; then -- AC_CHECK_LIB(dl, dlopen, -- AC_CHECK_LIB(dl, dlsym, -+ AC_CHECK_LIB(dl, dlopen,[ -+ AC_CHECK_LIB(dl, dlsym,[ - G_MODULE_LIBS=-ldl - G_MODULE_IMPL=G_MODULE_IMPL_DL -- ,) -- ,) -+ ])] -+ ) - fi - dnl *** shl_load() in libdld (HP-UX) - if test -z "$G_MODULE_IMPL"; then -@@ -629,6 +677,7 @@ - AC_SUBST(G_MODULE_NEED_USCORE) - AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL) - AC_SUBST(GLIB_DEBUG_FLAGS) -+AC_MSG_WARN([hi mom]) - - - dnl *********************** -@@ -865,38 +914,50 @@ - fi - if test x"$have_threads" = xposix; then - LIBS="$LIBS $G_THREAD_LIBS" -- AC_MSG_CHECKING(whether pthread_getspecific is posix like) - # PCThreads has pthread_getspecific(pthread_key_t, void **); -- AC_TRY_COMPILE([#include <pthread.h>], -- [pthread_getspecific(0,NULL);], -- [AC_MSG_RESULT(no)], -- [AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)]) -- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like) -+ AC_CACHE_CHECK([whether pthread_getspecific is posix like], -+ [glib_cv_sys_pthread_getspecific_posix], -+ AC_TRY_COMPILE([#include <pthread.h>], -+ [pthread_getspecific(0,NULL);], -+ [glib_cv_sys_pthread_getspecific_posix=no], -+ [glib_cv_sys_pthread_getspecific_posix=yes]) -+ ) -+ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then -+ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX) -+ fi - # DCE Threads return 1 as success, posix 0. what a mess. -- AC_TRY_RUN([#include <pthread.h> -- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -- int main () { -- return !pthread_mutex_trylock (&mutex); }], -- [AC_MSG_RESULT(no)], -- [AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)]) -- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like) -+ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like], -+ [glib_cv_sys_pthread_mutex_trylock_posix], -+ AC_TRY_RUN([#include <pthread.h> -+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -+ int main () { -+ return !pthread_mutex_trylock (&mutex); }], -+ [glib_cv_sys_pthread_mutex_trylock_posix=no], -+ [glib_cv_sys_pthread_mutex_trylock_posix=yes]) -+ ) -+ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then -+ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX) -+ fi - # DCE Threads return -1 as failure, posix ETIMEDOUT. -- AC_TRY_RUN([#include <pthread.h> -- int main () { -- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -- pthread_cond_t cond = PTHREAD_COND_INITIALIZER; -- struct timeval tval; -- struct timespec tspec; -- gettimeofday (&tval, NULL); -- tspec.tv_sec = tval.tv_sec; -- tspec.tv_nsec = 0; -- return pthread_cond_timedwait (&cond,&mutex,&tspec) -- != -1;}], -- [AC_MSG_RESULT(no)], -- [AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)]) -+ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like], -+ [glib_cv_sys_pthread_cond_timedwait_posix], -+ AC_TRY_RUN([#include <pthread.h> -+ int main () { -+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -+ pthread_cond_t cond = PTHREAD_COND_INITIALIZER; -+ struct timeval tval; -+ struct timespec tspec; -+ gettimeofday (&tval, NULL); -+ tspec.tv_sec = tval.tv_sec; -+ tspec.tv_nsec = 0; -+ return pthread_cond_timedwait (&cond,&mutex,&tspec) -+ != -1;}], -+ [glib_cv_sys_pthread_cond_timedwait_posix=no], -+ [glib_cv_sys_pthread_cond_timedwait_posix=yes]) -+ ) -+ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then -+ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX) -+ fi - fi - LIBS="$glib_save_LIBS" - CFLAGS="$glib_save_CFLAGS" -@@ -940,13 +1001,14 @@ - dnl **************************************** - dnl *** GLib POLL* compatibility defines *** - dnl **************************************** -+if test x"$cross_compiling" != xyes; then - GLIB_SYSDEFS( - [#include <sys/types.h> - #include <sys/poll.h>], - POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32, - glibconfig-sysdefs.h, - =) -- -+fi - - dnl ****************************** - dnl *** output the whole stuff *** -@@ -972,16 +1034,16 @@ - *glibconfig.h*) - echo creating glibconfig.h - outfile=glibconfig.h-tmp -- cat > $outfile <<\_______EOF -+ cat > $outfile <<EOF - /* glibconfig.h - * -- * This is a generated file. Please modify `configure.in' -+ * This is a generated file. Please modify 'configure.in' - */ - - #ifndef GLIBCONFIG_H - #define GLIBCONFIG_H - --_______EOF -+EOF - - if test x$glib_limits_h = xyes; then - echo '#include <limits.h>' >> $outfile -@@ -999,7 +1061,7 @@ - echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile - fi - -- cat >> $outfile <<_______EOF -+ cat >> $outfile <<EOF - - #ifdef __cplusplus - extern "C" { -@@ -1016,60 +1078,60 @@ - #define G_MINLONG $glib_ml - #define G_MAXLONG $glib_Ml - --_______EOF -+EOF - - - ### this should always be true in a modern C/C++ compiler -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - typedef signed char gint8; - typedef unsigned char guint8; --_______EOF -+EOF - - - if test -n "$gint16"; then -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - typedef signed $gint16 gint16; - typedef unsigned $gint16 guint16; --_______EOF -+EOF - fi - - - if test -n "$gint32"; then -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - typedef signed $gint32 gint32; - typedef unsigned $gint32 guint32; --_______EOF -+EOF - fi - - - if test -n "$gint64"; then -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - ${glib_warning_guard}#define G_HAVE_GINT64 1 - - ${glib_extension}typedef signed $gint64 gint64; - ${glib_extension}typedef unsigned $gint64 guint64; - - #define G_GINT64_CONSTANT(val) $gint64_constant --_______EOF -+EOF - fi - - - if test -z "$glib_unknown_void_p"; then -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - - #define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p)) - #define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p)) - - #define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i)) - #define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u)) --_______EOF -+EOF - else - echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile - fi - - - -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - $glib_atexit - $glib_memmove - $glib_defines -@@ -1081,11 +1143,11 @@ - #else /* !__cplusplus */ - $glib_inline - #endif /* !__cplusplus */ --_______EOF -+EOF - - echo >>$outfile - if test x$g_mutex_has_default = xyes; then -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - $g_enable_threads_def G_THREADS_ENABLED - #define G_THREADS_IMPL_$g_threads_impl_def - typedef struct _GStaticMutex GStaticMutex; -@@ -1103,15 +1165,15 @@ - #define g_static_mutex_get_mutex(mutex) \ - (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \ - g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex))) --_______EOF -+EOF - else -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - $g_enable_threads_def G_THREADS_ENABLED - #define G_THREADS_IMPL_$g_threads_impl_def - typedef struct _GMutex* GStaticMutex; - #define G_STATIC_MUTEX_INIT NULL - #define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex)) --_______EOF -+EOF - fi - - echo >>$outfile -@@ -1120,15 +1182,15 @@ - g_bit_sizes="$g_bit_sizes 64" - fi - for bits in $g_bit_sizes; do -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - #define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val)) - #define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val)) - #define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val)) - #define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val)) --_______EOF -+EOF - done - -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - #define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val)) - #define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val)) - #define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val)) -@@ -1139,14 +1201,14 @@ - #define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val)) - #define G_BYTE_ORDER $g_byte_order - --_______EOF -+EOF - - if test -r glibconfig-sysdefs.h; then - cat glibconfig-sysdefs.h >>$outfile - fi - - -- cat >>$outfile <<_______EOF -+ cat >>$outfile <<EOF - - $glib_wc - -@@ -1156,7 +1218,7 @@ - #endif /* __cplusplus */ - - #endif /* GLIBCONFIG_H */ --_______EOF -+EOF - - - if cmp -s $outfile glibconfig.h; then ---- tmp/base/glib-1.2.10-r0/glib-1.2.10/gmodule/Makefile.am Thu Mar 15 09:33:10 2001 -+++ glib-1.2.10/gmodule/Makefile.am Thu Oct 30 17:06:09 2003 -@@ -42,7 +42,7 @@ - libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) - - noinst_PROGRAMS = testgmodule --testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ -+testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ - testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ - - .PHONY: files release diff --git a/nonworking/glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h b/nonworking/glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h deleted file mode 100644 index 1329e7f21c..0000000000 --- a/nonworking/glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h +++ /dev/null @@ -1,6 +0,0 @@ -#define GLIB_SYSDEF_POLLIN =1 -#define GLIB_SYSDEF_POLLOUT =4 -#define GLIB_SYSDEF_POLLPRI =2 -#define GLIB_SYSDEF_POLLERR =8 -#define GLIB_SYSDEF_POLLHUP =16 -#define GLIB_SYSDEF_POLLNVAL =32 diff --git a/nonworking/glib-1.2/glib-1.2_1.2.10.bb b/nonworking/glib-1.2/glib-1.2_1.2.10.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/glib-1.2/glib-1.2_1.2.10.bb +++ /dev/null diff --git a/nonworking/gnuboy/qtopiagnuboy-1.0.3/gcc3.patch b/nonworking/gnuboy/qtopiagnuboy-1.0.3/gcc3.patch deleted file mode 100644 index 4743863d6e..0000000000 --- a/nonworking/gnuboy/qtopiagnuboy-1.0.3/gcc3.patch +++ /dev/null @@ -1,71 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- gnuboy/gnuboy-1.0.3-qtopia2/loader.c~gcc3 2001-12-06 06:51:21.000000000 +0100 -+++ gnuboy/gnuboy-1.0.3-qtopia2/loader.c 2003-12-07 21:29:56.000000000 +0100 -@@ -11,8 +11,6 @@ - #include <stdlib.h> - #include <string.h> - --char *strdup(); -- - static int mbc_table[256] = - { - 0, 1, 1, 1, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 3, ---- gnuboy/gnuboy-1.0.3-qtopia2/main.c~gcc3 2001-09-24 02:17:56.000000000 +0200 -+++ gnuboy/gnuboy-1.0.3-qtopia2/main.c 2003-12-07 21:29:56.000000000 +0100 -@@ -7,9 +7,6 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -- --char *strdup(); -- - #include <stdarg.h> - #include <signal.h> - ---- gnuboy/gnuboy-1.0.3-qtopia2/rckeys.c~gcc3 2001-09-23 19:58:48.000000000 +0200 -+++ gnuboy/gnuboy-1.0.3-qtopia2/rckeys.c 2003-12-07 21:29:56.000000000 +0100 -@@ -4,8 +4,6 @@ - #include <stdlib.h> - #include <string.h> - --char *strdup(); -- - #include "defs.h" - #include "rc.h" - #include "input.h" ---- gnuboy/gnuboy-1.0.3-qtopia2/rcvars.c~gcc3 2001-09-23 19:59:02.000000000 +0200 -+++ gnuboy/gnuboy-1.0.3-qtopia2/rcvars.c 2003-12-07 21:29:56.000000000 +0100 -@@ -5,8 +5,6 @@ - #include <stdlib.h> - #include <string.h> - --char *strdup(); -- - #include "defs.h" - #include "rc.h" - ---- gnuboy/gnuboy-1.0.3-qtopia2/path.c~gcc3 2001-09-23 19:58:42.000000000 +0200 -+++ gnuboy/gnuboy-1.0.3-qtopia2/path.c 2003-12-07 21:29:56.000000000 +0100 -@@ -5,8 +5,6 @@ - #include <stdlib.h> - #include <string.h> - --char *strdup(); -- - #ifdef ALT_PATH_SEP - #define SEP ';' - #else ---- gnuboy/gnuboy-1.0.3-qtopia2/sys/oss/oss.c~gcc3 2001-09-23 20:01:10.000000000 +0200 -+++ gnuboy/gnuboy-1.0.3-qtopia2/sys/oss/oss.c 2003-12-07 21:30:43.000000000 +0100 -@@ -2,7 +2,6 @@ - - #include <stdlib.h> - #include <string.h> --char *strdup(); - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> diff --git a/nonworking/gnuboy/qtopiagnuboy-1.0.3/qtopiagnuboyl-hwkeys.patch b/nonworking/gnuboy/qtopiagnuboy-1.0.3/qtopiagnuboyl-hwkeys.patch deleted file mode 100644 index ef47e56e63..0000000000 --- a/nonworking/gnuboy/qtopiagnuboy-1.0.3/qtopiagnuboyl-hwkeys.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- gnuboy/qtopiagnuboyl/main.cpp~qtopiagnuboyl-hwkeys 2002-02-19 22:06:57.000000000 -0600 -+++ gnuboy/qtopiagnuboyl/main.cpp 2003-04-03 08:57:35.000000000 -0600 -@@ -8,6 +8,14 @@ - QtopiaGnuboyL mainWin(NULL, "mainWin"); - - app.showMainWidget(&mainWin); -- -- return app.exec(); -+ app.grabKeyboard(); -+ if (app.exec()) { -+ app.grabKeyboard(); -+ app.ungrabKeyboard(); -+ return 1; -+ } else { -+ app.grabKeyboard(); -+ app.ungrabKeyboard(); -+ return 0; -+ } - } ---- gnuboy/gnuboy-1.0.3-qtopia2/sys/qtopia/mainwindow.cpp~qtopiagnuboyl-hwkeys 2001-12-27 07:46:03.000000000 -0600 -+++ gnuboy/gnuboy-1.0.3-qtopia2/sys/qtopia/mainwindow.cpp 2003-04-03 08:58:52.000000000 -0600 -@@ -2,6 +2,8 @@ - - #include <qevent.h> - -+#include <qpe/qpeapplication.h> -+ - #include "mainwidget.h" - #include "mainwindow.h" - -@@ -12,6 +14,8 @@ - - m_DisplayWidget->setBackgroundColor(black); - m_DisplayWidget->setFocus(); -+ -+ QPEApplication::grabKeyboard(); - - setCentralWidget(m_DisplayWidget); - } -@@ -24,6 +28,8 @@ - { - if (m_DisplayWidget) - m_DisplayWidget->close(); -+ -+ QPEApplication::ungrabKeyboard(); - - e->ignore(); - QMainWindow::closeEvent(e); ---- gnuboy/gnuboy-1.0.3-qtopia2/sys/qtopia/mainwidget.cpp~qtopiagnuboyl-hwkeys 2001-12-27 07:46:03.000000000 -0600 -+++ gnuboy/gnuboy-1.0.3-qtopia2/sys/qtopia/mainwidget.cpp 2003-04-03 08:58:52.000000000 -0600 -@@ -16,9 +16,9 @@ - m_Keymap[(int)Qt::Key_Up] = K_UP; - m_Keymap[(int)Qt::Key_Down] = K_DOWN; - m_Keymap[(int)Qt::Key_Enter] = K_ENTER; -- m_Keymap[(int)Qt::Key_Return] = K_ENTER; // start -- m_Keymap[Qt::Key_L] = (int)'s'; // b -- m_Keymap[Qt::Key_J] = (int)'d'; // a -+ m_Keymap[(int)Qt::Key_F12] = K_ENTER; // start -+ m_Keymap[Qt::Key_F10] = (int)'s'; // b -+ m_Keymap[Qt::Key_F9] = (int)'d'; // a - m_Keymap[Qt::Key_Space] = K_SPACE; // select - } - diff --git a/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb b/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb +++ /dev/null diff --git a/nonworking/greader/greader/greader.patch b/nonworking/greader/greader/greader.patch deleted file mode 100644 index 445515b1e0..0000000000 --- a/nonworking/greader/greader/greader.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -Naur greader/src/Makefile.am greader_new/src/Makefile.am ---- greader/src/Makefile.am 2003-05-03 21:34:43.000000000 +0200 -+++ greader_new/src/Makefile.am 2004-09-12 15:21:35.000000000 +0200 -@@ -13,5 +13,5 @@ - interface.c interface.h \ - callbacks.c callbacks.h - --greader_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -+greader_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lz - -diff -Naur greader/src/Makefile.in greader_new/src/Makefile.in ---- greader/src/Makefile.in 2003-05-09 07:26:49.000000000 +0200 -+++ greader_new/src/Makefile.in 2004-09-12 15:21:41.000000000 +0200 -@@ -88,7 +88,7 @@ - greader_SOURCES = main.c support.c support.h interface.c interface.h callbacks.c callbacks.h - - --greader_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -+greader_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lz - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -diff -Naur greader/src/callbacks.c greader_new/src/callbacks.c ---- greader/src/callbacks.c 2003-06-01 21:19:38.000000000 +0200 -+++ greader_new/src/callbacks.c 2004-09-12 15:43:25.000000000 +0200 -@@ -19,8 +19,33 @@ - - #define BUFFER_SIZE 8192 - -+void -+button_press ( GtkWidget *widget, -+ GdkEventButton *event, -+ gpointer d) -+{ -+ GtkWidget *toolbar = lookup_widget(widget,"toolbar2"); -+ GtkWidget *statusbar = lookup_widget(widget,"statusbar1"); -+ GtkWidget *window = lookup_widget(widget,"main_window"); -+ -+ if(event->button == 1){ -+ if(GTK_WIDGET_VISIBLE(toolbar) && GTK_WIDGET_VISIBLE(statusbar)){ -+ gtk_widget_hide(toolbar); -+ gtk_widget_hide(statusbar); -+ gtk_window_set_decorated(window,0); -+ gtk_window_fullscreen(window); -+ }else{ -+ gtk_widget_show(toolbar); -+ gtk_widget_show(statusbar); -+ gtk_window_set_decorated(window,1); -+ gtk_window_unfullscreen(window); -+ } -+ } -+ return TRUE; -+} -+ - void main_keypress(GtkWidget *wid, GdkEventKey *kp) { -- //printf("kp is %d\n",kp->keyval); -+// printf("kp is %d\n",kp->keyval); - switch (kp->keyval) { - case 65362: on_back_button_clicked(NULL,NULL);break; //up - case 65364: on_forward_button_clicked(NULL,NULL);break; // down -diff -Naur greader/src/callbacks.h greader_new/src/callbacks.h ---- greader/src/callbacks.h 2003-05-11 04:08:29.000000000 +0200 -+++ greader_new/src/callbacks.h 2004-09-12 12:20:15.000000000 +0200 -@@ -133,3 +133,9 @@ - void - on_apply_bm_button_clicked (GtkButton *button, - gpointer user_data); -+ -+void -+button_press ( GtkWidget *widget, -+ GdkEventButton *event, -+ gpointer d); -+ -diff -Naur greader/src/interface.c greader_new/src/interface.c ---- greader/src/interface.c 2003-05-19 03:24:30.000000000 +0200 -+++ greader_new/src/interface.c 2004-09-12 12:50:33.000000000 +0200 -@@ -187,6 +187,8 @@ - g_signal_connect ((gpointer) forward_button, "clicked", - G_CALLBACK (on_forward_button_clicked), - NULL); -+ g_signal_connect(G_OBJECT(textview), "button-press-event", -+ G_CALLBACK (button_press),NULL); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (main_window, main_window, "main_window"); -diff -Naur greader/src/main.c greader_new/src/main.c ---- greader/src/main.c 2003-05-11 04:08:29.000000000 +0200 -+++ greader_new/src/main.c 2004-09-12 12:23:52.000000000 +0200 -@@ -37,6 +37,7 @@ - pr.mainwin=main_window = create_main_window (); - gtk_signal_connect(GTK_OBJECT(main_window),"key_press_event",GTK_SIGNAL_FUNC(main_keypress),NULL); - -+ - prefload(); - gtk_widget_show (main_window); - diff --git a/nonworking/greader/greader_0.61.bb b/nonworking/greader/greader_0.61.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/greader/greader_0.61.bb +++ /dev/null diff --git a/nonworking/gtkmm/gtkmm_2.2.11.bb b/nonworking/gtkmm/gtkmm_2.2.11.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/gtkmm/gtkmm_2.2.11.bb +++ /dev/null diff --git a/nonworking/gxine/gxine_0.3.3.bb b/nonworking/gxine/gxine_0.3.3.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/gxine/gxine_0.3.3.bb +++ /dev/null diff --git a/nonworking/kde/arts-native_1.2.2.bb b/nonworking/kde/arts-native_1.2.2.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/kde/arts-native_1.2.2.bb +++ /dev/null diff --git a/nonworking/ltrace/ltrace-0.3.35/no_global_includes.patch b/nonworking/ltrace/ltrace-0.3.35/no_global_includes.patch deleted file mode 100644 index 7c154861b7..0000000000 --- a/nonworking/ltrace/ltrace-0.3.35/no_global_includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ltrace-0.3.35/Makefile.old 2003-03-30 16:38:05.000000000 +0200 -+++ ltrace-0.3.35/Makefile.in 2004-08-14 20:40:50.000000000 +0200 -@@ -14,7 +14,7 @@ - docdir = $(prefix)/doc/ltrace - - CC = @CC@ --CPPFLAGS = -I$(TOPDIR) -I$(TOPDIR)/sysdeps/$(OS) -I- @DEFS@ -+CPPFLAGS = -I$(TOPDIR) -I$(TOPDIR)/sysdeps/$(OS) @DEFS@ - CFLAGS = -Wall @CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\" - LDFLAGS = - LIBS = @LIBS@ diff --git a/nonworking/ltrace/ltrace_0.3.35.bb b/nonworking/ltrace/ltrace_0.3.35.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/ltrace/ltrace_0.3.35.bb +++ /dev/null diff --git a/nonworking/lufs/lufs_0.9.7.bb b/nonworking/lufs/lufs_0.9.7.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/lufs/lufs_0.9.7.bb +++ /dev/null diff --git a/nonworking/lzma/lzma_0.01.bb b/nonworking/lzma/lzma_0.01.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/lzma/lzma_0.01.bb +++ /dev/null diff --git a/nonworking/minisip/minisip_1.0a.bb b/nonworking/minisip/minisip_1.0a.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/minisip/minisip_1.0a.bb +++ /dev/null diff --git a/nonworking/ncurses/ncurses_4.2.bb b/nonworking/ncurses/ncurses_4.2.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/ncurses/ncurses_4.2.bb +++ /dev/null diff --git a/nonworking/ocamlc/ocamlc-native_3.06.bb b/nonworking/ocamlc/ocamlc-native_3.06.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/ocamlc/ocamlc-native_3.06.bb +++ /dev/null diff --git a/nonworking/openttd/openttd_0.3.2.1.bb b/nonworking/openttd/openttd_0.3.2.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/openttd/openttd_0.3.2.1.bb +++ /dev/null diff --git a/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb b/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb +++ /dev/null diff --git a/nonworking/pixdev/pixdev-stable-0.1/braces.patch b/nonworking/pixdev/pixdev-stable-0.1/braces.patch deleted file mode 100644 index fe390c114a..0000000000 --- a/nonworking/pixdev/pixdev-stable-0.1/braces.patch +++ /dev/null @@ -1,17 +0,0 @@ -=================================================================== -RCS file: /cvsroot/pixdev/pixdev-stable/include/nxtminput.h,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -u -r1.1.1.1 -r1.2 ---- pixdev-stable/include/nxtminput.h 2003/10/10 14:51:12 1.1.1.1 -+++ pixdev-stable/include/nxtminput.h 2003/12/06 06:22:41 1.2 -@@ -54,7 +54,8 @@ - #define MAX_UNITS 4 // Maximum number of units (HH:MM:SS:[am/pm]) - - //const char *dayzn[2] = {{"AM"}, {"PM"}}; // Array of either am or pm --const short max_val[3] = { {23}, {59}, {59} }; // Max values per unit (23 = hours, 59 = min/sec) -+const short max_val[3] = { 23, 59, 59 }; -+// Max values per unit (23 = hours, 59 = min/sec) - - - /* Forward declarations */ diff --git a/nonworking/pixdev/pixdev-stable_0.1.bb b/nonworking/pixdev/pixdev-stable_0.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/pixdev/pixdev-stable_0.1.bb +++ /dev/null diff --git a/nonworking/ppp/ppp/008_pathnames.h.diff b/nonworking/ppp/ppp/008_pathnames.h.diff deleted file mode 100644 index dee0a8db29..0000000000 --- a/nonworking/ppp/ppp/008_pathnames.h.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ppp-2.4.0b4.orig/pppd/pathnames.h -+++ ppp-2.4.0b4/pppd/pathnames.h -@@ -26,7 +26,7 @@ - #define _PATH_AUTHUP _ROOT_PATH "/etc/ppp/auth-up" - #define _PATH_AUTHDOWN _ROOT_PATH "/etc/ppp/auth-down" - #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." --#define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors" -+#define _PATH_CONNERRS _ROOT_PATH "/var/log/ppp-connect-errors" - #define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/" - #define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf" - diff --git a/nonworking/ppp/ppp/011_scripts_redialer.diff b/nonworking/ppp/ppp/011_scripts_redialer.diff deleted file mode 100644 index 657f566c9d..0000000000 --- a/nonworking/ppp/ppp/011_scripts_redialer.diff +++ /dev/null @@ -1,152 +0,0 @@ ---- ppp-2.4.0b4.orig/scripts/redialer -+++ ppp-2.4.0b4/scripts/redialer -@@ -1,96 +1,69 @@ - #!/bin/sh --################################################################### - # --# These parameters control the attack dialing sequence. -+# A chatscript that will attempt to dial multiple numbers in sequence, until -+# you get connected. - # --# Maximum number of attempts to reach the telephone number(s) --MAX_ATTEMPTS=10 -- --# Delay between each of the attempts. This is a parameter to sleep --# so use "15s" for 15 seconds, "1m" for 1 minute, etc. --SLEEP_DELAY=15s -- --################################################################### -+# To use: edit /etc/peers/provider, and change the connect line to read: -+# connect "/usr/local/bin/redialer" - # --# This is a list of telephone numbers. Add new numbers if you wish --# and see the function 'callall' below for the dial process. --PHONE1=555-1212 --PHONE2=411 -+# See below for configuration. - --################################################################### -+# This is a list of chatscripts to use to get connected, and (optional) -+# telephone numbers to call for each of those chatscripts. - # --# If you use the ppp-on script, then these are passed to this routine --# automatically. There is no need to define them here. If not, then --# you will need to set the values. --# --ACCOUNT=my_account_name --PASSWORD=my_password -+# Note that in the chatscripts, you may use #NUMBER#, this will be replaced -+# with the number it is calling. You might want to use this to only have one -+# chatscript that is used for all numbers, or you might need multiple -+# chatscripts. - --################################################################### --# --# Function to initialize the modem and ensure that it is in command --# state. This may not be needed, but it doesn't hurt. --# --function initialize --{ -- chat -v TIMEOUT 3 '' AT 'OK-+++\c-OK' -- return --} -+PHONE1=123456789 -+CHAT1=/etc/chatscripts/provider - --################################################################### --# --# Script to dial a telephone --# --function callnumber --{ --chat -v \ -- ABORT '\nBUSY\r' \ -- ABORT '\nNO ANSWER\r' \ -- ABORT '\nRINGING\r\n\r\nRINGING\r' \ -- '' ATDT$1 \ -- CONNECT '' \ -- ogin:--ogin: $ACCOUNT \ -- assword: $PASSWORD --# --# If the connection was successful then end the whole script with a --# success. --# -- if [ "$?" = "0" ]; then -- exit 0 -- fi -+PHONE2=912345678 -+CHAT2=/etc/chatscripts/provider - -- return --} -+PHONE3=891234567 -+CHAT3=/etc/chatscripts/provider - --################################################################### --# --# Script to dial any telephone number --# --function callall --{ --# echo "dialing attempt number: $1" >/dev/console -- callnumber $PHONE1 --# callnumber $PHONE2 --} -+PHONE4=789123456 -+CHAT4=/etc/chatscripts/provider - --################################################################### --# --# Initialize the modem to ensure that it is in the command state --# --initialize --if [ ! "$?" = "0" ]; then -- exit 1 --fi -+PHONE5=001234567 -+CHAT5=/etc/chatscripts/provider - -+# How long to sleep between retries: - # --# Dial telephone numbers until one answers --# -+# Note that this is a parameter to sleep so use "15s" for 15 seconds, -+# "1m" for 1 minute, etc -+SLEEP_DELAY=1s -+ -+# The code below does the dialing. -+ - attempt=0 - while : ; do -- attempt=`expr $attempt + 1` -- callall $attempt -- if [ "$attempt" = "$MAX_ATTEMPTS" ]; then -- exit 1 -- fi -- sleep "$SLEEP_DELAY" -+ attempt=`expr $attempt + 1` -+ NUMBER=`eval echo '$PHONE'$attempt` -+ CHAT=`eval echo '$CHAT'$attempt` -+ if [ ! "$CHAT" ]; then -+ attempt=0 -+ else -+ logger "Dialing attempt number: $attempt" -+ sed s/#NUMBER#/$NUMBER/ $CHAT >/etc/chatscripts/tmpchat -+ /usr/sbin/chat -v -f /etc/chatscripts/tmpchat -+ rm -f /etc/chatscripts/tmpchat -+ case $? in -+ 0) logger Connection established ; exit 0;; -+ 1) logger chat: exit 1, see manpage for details. ; exit 1;; -+ 2) logger chat: exit 2, see manpage for details. ; exit 2;; -+ 3) logger chat: exit 3, see manpage for details. ;; -+ 4) logger Line busy. ;; -+ 5) logger No Carrier. ;; -+ 6) logger A call is coming. Exiting! ; exit 1;; -+ 7) logger No dialtone. ;; -+ 8) logger An error occured. Exiting! ; exit 1;; -+ *) logger chat: exit $?, see manpage for details. ;; -+ esac -+ logger "Waiting $SLEEP_DELAY seconds before next try." -+ sleep $SLEEP_DELAY -+ fi - done diff --git a/nonworking/ppp/ppp/018_ip-up_option.diff b/nonworking/ppp/ppp/018_ip-up_option.diff deleted file mode 100644 index 0dee9248e8..0000000000 --- a/nonworking/ppp/ppp/018_ip-up_option.diff +++ /dev/null @@ -1,98 +0,0 @@ ---- ppp-2.4.1/pppd/ipcp.c Thu Mar 8 06:11:12 2001 -+++ ppp-2.4.1-new/pppd/ipcp.c Tue Jun 19 15:35:36 2001 -@@ -1734,7 +1734,7 @@ - */ - if (ipcp_script_state == s_down && ipcp_script_pid == 0) { - ipcp_script_state = s_up; -- ipcp_script(_PATH_IPUP); -+ ipcp_script(path_ipup); - } - } - -@@ -1777,7 +1777,7 @@ - /* Execute the ip-down script */ - if (ipcp_script_state == s_up && ipcp_script_pid == 0) { - ipcp_script_state = s_down; -- ipcp_script(_PATH_IPDOWN); -+ ipcp_script(path_ipdown); - } - } - -@@ -1828,13 +1828,13 @@ - case s_up: - if (ipcp_fsm[0].state != OPENED) { - ipcp_script_state = s_down; -- ipcp_script(_PATH_IPDOWN); -+ ipcp_script(path_ipdown); - } - break; - case s_down: - if (ipcp_fsm[0].state == OPENED) { - ipcp_script_state = s_up; -- ipcp_script(_PATH_IPUP); -+ ipcp_script(path_ipup); - } - break; - } - ---- ppp-2.4.1/pppd/main.c Tue Mar 13 06:56:19 2001 -+++ ppp-2.4.1-new/pppd/main.c Tue Jun 19 15:35:36 2001 -@@ -233,6 +233,9 @@ - struct protent *protp; - char numbuf[16]; - -+ strlcpy(path_ipup, "/etc/ppp/ip-up", sizeof(path_ipup)); -+ strlcpy(path_ipdown, "/etc/ppp/ip-down", sizeof(path_ipdown)); -+ - link_stats_valid = 0; - new_phase(PHASE_INITIALIZE); - - ---- ppp-2.4.1/pppd/options.c Tue Mar 13 06:56:19 2001 -+++ ppp-2.4.1-new/pppd/options.c Tue Jun 19 15:38:32 2001 -@@ -85,6 +85,8 @@ - bool dump_options; /* print out option values */ - bool dryrun; /* print out option values and exit */ - char *domain; /* domain name set by domain option */ -+char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ -+char path_ipdown[MAXPATHLEN];/* pathname of ip-down script */ - - extern option_t auth_options[]; - extern struct stat devstat; -@@ -231,6 +233,12 @@ - "Print out option values after parsing all options", 1 }, - { "dryrun", o_bool, &dryrun, - "Stop after parsing, printing, and checking options", 1 }, -+ { "ip-up-script", o_string, path_ipup, -+ "Set pathname of ip-up script", -+ OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, -+ { "ip-down-script", o_string, path_ipdown, -+ "Set pathname of ip-down script", -+ OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, - - #ifdef HAVE_MULTILINK - { "multilink", o_bool, &multilink, - ---- ppp-2.4.1/pppd/pathnames.h Thu Mar 8 06:15:37 2001 -+++ ppp-2.4.1-new/pppd/pathnames.h Tue Jun 19 15:35:36 2001 -@@ -21,8 +21,6 @@ - #define _PATH_UPAPFILE _ROOT_PATH "/etc/ppp/pap-secrets" - #define _PATH_CHAPFILE _ROOT_PATH "/etc/ppp/chap-secrets" - #define _PATH_SYSOPTIONS _ROOT_PATH "/etc/ppp/options" --#define _PATH_IPUP _ROOT_PATH "/etc/ppp/ip-up" --#define _PATH_IPDOWN _ROOT_PATH "/etc/ppp/ip-down" - #define _PATH_AUTHUP _ROOT_PATH "/etc/ppp/auth-up" - #define _PATH_AUTHDOWN _ROOT_PATH "/etc/ppp/auth-down" - #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." - ---- ppp-2.4.1/pppd/pppd.h Tue Mar 13 06:54:37 2001 -+++ ppp-2.4.1-new/pppd/pppd.h Tue Jun 19 15:39:39 2001 -@@ -272,6 +272,8 @@ - extern char *bundle_name; /* bundle name for multilink */ - extern bool dump_options; /* print out option values */ - extern bool dryrun; /* check everything, print options, exit */ -+extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ -+extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ - - #ifdef PPP_FILTER - extern struct bpf_program pass_filter; /* Filter for pkts to pass */ diff --git a/nonworking/ppp/ppp/057_pppoe-interface-change b/nonworking/ppp/ppp/057_pppoe-interface-change deleted file mode 100644 index cca5a0e67e..0000000000 --- a/nonworking/ppp/ppp/057_pppoe-interface-change +++ /dev/null @@ -1,78 +0,0 @@ ---- ppp/pppd/plugins/rp-pppoe/plugin.c.orig 2003-04-07 02:09:05.000000000 +0200 -+++ ppp/pppd/plugins/rp-pppoe/plugin.c 2003-12-03 22:15:07.000000000 +0100 -@@ -114,6 +114,57 @@ - return 1; - } - -+/* from <linux/if.h> */ -+#define IFF_UP 0x1 -+#define IFF_RUNNING 0x40 -+ -+static short ifrflags_old; -+ -+static int interface_change(const char* ifname, int up) -+{ -+ int fd; -+ struct ifreq ifr; -+ -+ if (!up && ifrflags_old != 0) { -+ return 0; -+ } -+ -+ fd = socket(AF_INET, SOCK_DGRAM, 0); -+ if (fd < 0) { -+ warn("socket(AF_INET, SOCK_DGRAM, 0): %s", strerror(errno)); -+ return -1; -+ } -+ -+ strncpy(ifr.ifr_name, ifname, IFNAMSIZ); -+ if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { -+ warn("%s: unknown interface: %s", ifname, strerror(errno)); -+ return -1; -+ } -+ strncpy(ifr.ifr_name, ifname, IFNAMSIZ); -+ if (up) { -+ ifrflags_old = ifr.ifr_flags & (IFF_UP | IFF_RUNNING); -+ ifr.ifr_flags |= (IFF_UP | IFF_RUNNING); -+ } else { -+ ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING); -+ } -+ if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) { -+ warn("SIOCSIFFLAGS: %s", strerror(errno)); -+ return -1; -+ } -+ close(fd); -+ return 0; -+} -+ -+static int interface_up (const char *ifname) -+{ -+ return interface_change(ifname,1); -+} -+ -+static int interface_down (const char* ifname) -+{ -+ return interface_change(ifname,0); -+} -+ - /********************************************************************** - * %FUNCTION: PPPOEConnectDevice - * %ARGUMENTS: -@@ -142,6 +193,8 @@ - conn->peerEth[i] = (unsigned char) mac[i]; - } - } else { -+ if (interface_up(conn->ifName) < 0) -+ return -1; - discovery(conn); - if (conn->discoveryState != STATE_SESSION) { - fatal("Unable to complete PPPoE Discovery"); -@@ -243,6 +296,8 @@ - return; - } - close(conn->sessionSocket); -+ if (interface_down(conn->ifName) < 0) -+ warn("We brought %s up but failed to take it down",conn->ifName); - } - - static void diff --git a/nonworking/ppp/ppp/auth_hook_segfault b/nonworking/ppp/ppp/auth_hook_segfault deleted file mode 100644 index 59007efafd..0000000000 --- a/nonworking/ppp/ppp/auth_hook_segfault +++ /dev/null @@ -1,33 +0,0 @@ -To: md@linux.it, mjt@corpit.ru -Subject: pppd-auth-hook.patch -Message-Id: <20040604231517.3E9AD11DC4@paltus.tls.msk.ru> -Date: Sat, 5 Jun 2004 03:15:17 +0400 (MSD) -From: mjt@corpit.ru (Michael Tokarev) - -The patch below fixes pppd segfault when using auth_hook that sets -options for the user (use-after-free problem). - -/mjt - ---- ppp/pppd/auth.c.orig Mon Jun 23 18:12:04 2003 -+++ ppp/pppd/auth.c Sat Jun 5 03:11:36 2004 -@@ -1251,14 +1251,14 @@ - if (pap_auth_hook) { - ret = (*pap_auth_hook)(user, passwd, msg, &addrs, &opts); - if (ret >= 0) { -+ /* note: set_allowed_addrs() saves opts (but not addrs): don't free it! */ - if (ret) - set_allowed_addrs(unit, addrs, opts); -- BZERO(passwd, sizeof(passwd)); -+ else if (opts != 0) -+ free_wordlist(opts); - if (addrs != 0) - free_wordlist(addrs); -- if (opts != 0) { -- free_wordlist(opts); -- } -+ BZERO(passwd, sizeof(passwd)); - return ret? UPAP_AUTHACK: UPAP_AUTHNAK; - } - } - diff --git a/nonworking/ppp/ppp/cifdefroute.dif b/nonworking/ppp/ppp/cifdefroute.dif deleted file mode 100644 index 263b674f99..0000000000 --- a/nonworking/ppp/ppp/cifdefroute.dif +++ /dev/null @@ -1,283 +0,0 @@ ---- ppp/pppd/ipcp.c Wed May 31 17:20:41 2000 -+++ ppp/pppd/ipcp.c Wed May 31 17:27:19 2000 -@@ -145,7 +145,17 @@ - { "-defaultroute", o_bool, &ipcp_allowoptions[0].default_route, - "disable defaultroute option", OPT_A2COPY, - &ipcp_wantoptions[0].default_route }, - -+#ifdef __linux__ -+ { "replacedefaultroute", o_bool, -+ &ipcp_wantoptions[0].replace_default_route, -+ "Replace default route", 1 -+ }, -+ { "noreplacedefaultroute", o_bool, -+ &ipcp_allowoptions[0].replace_default_route, -+ "Never replace default route", OPT_A2COPY, -+ &ipcp_wantoptions[0].replace_default_route }, -+#endif - { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp, - "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp }, - { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp, -@@ -195,7 +205,7 @@ - ip_active_pkt - }; - --static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t)); -+static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t, bool)); - static void ipcp_script __P((char *)); /* Run an up/down script */ - static void ipcp_script_done __P((void *)); - -@@ -1344,7 +1354,12 @@ - if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE)) - return 0; - if (wo->default_route) -+#ifndef __linux__ - if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr)) -+#else -+ if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr, -+ wo->replace_default_route)) -+#endif - default_route_set[u] = 1; - if (wo->proxy_arp) - if (sifproxyarp(u, wo->hisaddr)) -@@ -1420,7 +1435,8 @@ - */ - if (demand) { - if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) { -- ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr); -+ ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr, -+ wo->replace_default_route); - if (go->ouraddr != wo->ouraddr) { - warn("Local IP address changed to %I", go->ouraddr); - script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr)); -@@ -1445,7 +1461,12 @@ - - /* assign a default route through the interface if required */ - if (ipcp_wantoptions[f->unit].default_route) -+#ifndef __linux__ - if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr)) -+#else -+ if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr, -+ wo->replace_default_route)) -+#endif - default_route_set[f->unit] = 1; - - /* Make a proxy ARP entry if requested. */ -@@ -1492,7 +1513,12 @@ - - /* assign a default route through the interface if required */ - if (ipcp_wantoptions[f->unit].default_route) -+#ifndef __linux__ - if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr)) -+#else -+ if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr, -+ wo->replace_default_route)) -+#endif - default_route_set[f->unit] = 1; - - /* Make a proxy ARP entry if requested. */ -@@ -1559,7 +1585,7 @@ - sifnpmode(f->unit, PPP_IP, NPMODE_DROP); - sifdown(f->unit); - ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr, -- ipcp_hisoptions[f->unit].hisaddr); -+ ipcp_hisoptions[f->unit].hisaddr, 0); - } - - /* Execute the ip-down script */ -@@ -1575,16 +1601,25 @@ - * proxy arp entries, etc. - */ - static void --ipcp_clear_addrs(unit, ouraddr, hisaddr) -+ipcp_clear_addrs(unit, ouraddr, hisaddr, replacedefaultroute) - int unit; - u_int32_t ouraddr; /* local address */ - u_int32_t hisaddr; /* remote address */ -+ bool replacedefaultroute; - { - if (proxy_arp_set[unit]) { - cifproxyarp(unit, hisaddr); - proxy_arp_set[unit] = 0; - } -- if (default_route_set[unit]) { -+ /* If replacedefaultroute, sifdefaultroute will be called soon -+ * with replacedefaultroute set and that will overwrite the current -+ * default route. This is the case only when doing demand, otherwise -+ * during demand, this cifdefaultroute would restore the old default -+ * route which is not what we want in this case. In the non-demand -+ * case, we'll delete the default route and restore the old if there -+ * is one saved by an sifdefaultroute with replacedefaultroute. -+ */ -+ if (!replacedefaultroute && default_route_set[unit]) { - cifdefaultroute(unit, ouraddr, hisaddr); - default_route_set[unit] = 0; - } ---- ppp/pppd/ipcp.h Wed May 31 17:20:41 2000 -+++ ppp/pppd/ipcp.h Wed May 31 15:56:17 2000 -@@ -47,6 +47,7 @@ - bool old_addrs; /* Use old (IP-Addresses) option? */ - bool req_addr; /* Ask peer to send IP address? */ - bool default_route; /* Assign default route through interface? */ -+ bool replace_default_route; /* Replace default route through interface? */ - bool proxy_arp; /* Make proxy ARP entry for peer? */ - bool neg_vj; /* Van Jacobson Compression? */ - bool old_vj; /* use old (short) form of VJ option? */ ---- ppp/pppd/pppd.8 Wed May 31 17:20:41 2000 -+++ ppp/pppd/pppd.8 Wed May 31 15:56:17 2000 -@@ -99,6 +99,13 @@ - This entry is removed when the PPP connection is broken. This option - is privileged if the \fInodefaultroute\fR option has been specified. - .TP -+.B replacedefaultroute -+This option is a flag to the defaultroute option. If defaultroute is -+set and this flag is also set, pppd replaces an existing default route -+with the new default route. -+ -+ -+.TP - .B disconnect \fIscript - Run the executable or shell command specified by \fIscript\fR after - pppd has terminated the link. This script could, for example, issue -@@ -589,7 +596,12 @@ - .TP - .B nodefaultroute - Disable the \fIdefaultroute\fR option. The system administrator who --wishes to prevent users from creating default routes with pppd -+wishes to prevent users from adding a default route with pppd -+can do so by placing this option in the /etc/ppp/options file. -+.TP -+.B noreplacedefaultroute -+Disable the \fIreplacedefaultroute\fR option. The system administrator who -+wishes to prevent users from replacing a default route with pppd - can do so by placing this option in the /etc/ppp/options file. - .TP - .B nodeflate ---- ppp/pppd/pppd.h Wed May 31 17:20:41 2000 -+++ ppp/pppd/pppd.h Wed May 31 15:56:17 2000 -@@ -416,7 +416,11 @@ - int cif6addr __P((int, eui64_t, eui64_t)); - /* Remove an IPv6 address from i/f */ - #endif -+#ifndef __linux__ - int sifdefaultroute __P((int, u_int32_t, u_int32_t)); -+#else -+int sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt)); -+#endif - /* Create default route through i/f */ - int cifdefaultroute __P((int, u_int32_t, u_int32_t)); - /* Delete default route through i/f */ ---- ppp/pppd/sys-linux.c Wed May 31 17:20:41 2000 -+++ ppp/pppd/sys-linux.c Wed May 31 17:37:23 2000 -@@ -143,6 +143,8 @@ - - static int if_is_up; /* Interface has been marked up */ - static u_int32_t default_route_gateway; /* Gateway for default route added */ -+static struct rtentry old_def_rt; /* Old default route */ -+static int default_rt_repl_rest; /* replace and restore old default rt */ - static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ - static char proxy_arp_dev[16]; /* Device for proxy arp entry */ - static u_int32_t our_old_addr; /* for detecting address changes */ -@@ -1209,6 +1211,9 @@ - p = NULL; - } - -+ SET_SA_FAMILY (rt->rt_dst, AF_INET); -+ SET_SA_FAMILY (rt->rt_gateway, AF_INET); -+ - SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16); - SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16); - SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16); -@@ -1278,19 +1283,53 @@ - /******************************************************************** - * - * sifdefaultroute - assign a default route through the address given. -+ * -+ * If the global default_rt_repl_rest flag is set, then this function -+ * already replaced the original system defaultroute with some other -+ * route and it should just replace the current defaultroute with -+ * another one, without saving the current route. Use: demand mode, -+ * when pppd sets first a defaultroute it it's temporary ppp0 addresses -+ * and then changes the temporary addresses to the addresses for the real -+ * ppp connection when it has come up. - */ - --int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) -+int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway, bool replace) - { -- struct rtentry rt; -- -- if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) { -- u_int32_t old_gateway = SIN_ADDR(rt.rt_gateway); -+ struct rtentry rt, tmp_rt; -+ struct rtentry *del_rt = NULL; - -- if (old_gateway != gateway) -- error("not replacing existing default route to %s [%I]", -- rt.rt_dev, old_gateway); -- return 0; -+ -+ if (default_rt_repl_rest) { -+ /* We have already reclaced the original defaultroute, if we -+ * are called again, we will delete the current default route -+ * and set the new default route in this function. -+ * - this is normally only the case the doing demand: */ -+ if (defaultroute_exists( &tmp_rt )) -+ del_rt = &tmp_rt; -+ } else if ( defaultroute_exists( &old_def_rt ) && -+ strcmp( old_def_rt.rt_dev, ifname ) != 0) { -+ /* We did not yet replace an existing default route, let's -+ * check if we should save and replace a default route: -+ */ -+ u_int32_t old_gateway = SIN_ADDR(old_def_rt.rt_gateway); -+ -+ if (old_gateway != gateway) { -+ if (!replace) { -+ error("not replacing default route to %s [%I]", -+ old_def_rt.rt_dev, old_gateway); -+ return 0; -+ } else { -+ // we need to copy rt_dev because we need it permanent too: -+ char * tmp_dev = malloc(strlen(old_def_rt.rt_dev)+1); -+ strcpy(tmp_dev, old_def_rt.rt_dev); -+ old_def_rt.rt_dev = tmp_dev; -+ -+ notice("replacing old default route to %s [%I]", -+ old_def_rt.rt_dev, old_gateway); -+ default_rt_repl_rest = 1; -+ del_rt = &old_def_rt; -+ } -+ } - } - - memset (&rt, '\0', sizeof (rt)); -@@ -1310,6 +1349,12 @@ - error("default route ioctl(SIOCADDRT): %m(%d)", errno); - return 0; - } -+ if (default_rt_repl_rest && del_rt) -+ if (ioctl(sock_fd, SIOCDELRT, del_rt) < 0) { -+ if ( ! ok_error ( errno )) -+ error("del old default route ioctl(SIOCDELRT): %m(%d)", errno); -+ return 0; -+ } - - default_route_gateway = gateway; - return 1; -@@ -1344,6 +1389,16 @@ - error("default route ioctl(SIOCDELRT): %m (%d)", errno); - return 0; - } -+ } -+ if (default_rt_repl_rest) { -+ notice("restoring old default route to %s [%I]", -+ old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway)); -+ if (ioctl(sock_fd, SIOCADDRT, &old_def_rt) < 0) { -+ if ( ! ok_error ( errno )) -+ error("restore default route ioctl(SIOCADDRT): %m(%d)", errno); -+ return 0; -+ } -+ default_rt_repl_rest = 0; - } - - return 1; diff --git a/nonworking/ppp/ppp/close_devfd b/nonworking/ppp/ppp/close_devfd deleted file mode 100644 index 987d964aae..0000000000 --- a/nonworking/ppp/ppp/close_devfd +++ /dev/null @@ -1,17 +0,0 @@ -Ensure that the fd returned by the connect method is closed before -running external programs. - -http://article.gmane.org/gmane.linux.ppp/1371 - -diff -ruNp ppp.orig/pppd/main.c ppp/pppd/main.c ---- ppp.orig/pppd/main.c 2004-07-12 12:55:30.000000000 +0200 -+++ ppp/pppd/main.c 2004-07-12 12:55:25.000000000 +0200 -@@ -1662,6 +1662,8 @@ run_program(prog, args, must_exist, done - closelog(); - if (the_channel->close) - (*the_channel->close)(); -+ else -+ close(devfd); - - /* Don't pass handles to the PPP device, even by accident. */ - dup2(fd_devnull, 0); diff --git a/nonworking/ppp/ppp/fix_closed_fds b/nonworking/ppp/ppp/fix_closed_fds deleted file mode 100644 index 39208ab4db..0000000000 --- a/nonworking/ppp/ppp/fix_closed_fds +++ /dev/null @@ -1,34 +0,0 @@ -sys_init() will open a socket and keep it open for the whole like of the -process. If pppd is started without all standard fds open then the socket -will get one of their numbers, which will be clobbered later by the -/dev/null fd duplicated by main(). - -See Debian bug #235192. - -diff -ruN ppp.orig/pppd/main.c ppp/pppd/main.c ---- ppp.orig/pppd/main.c 2004-02-29 18:50:12.000000000 +0100 -+++ ppp/pppd/main.c 2004-02-29 18:48:56.000000000 +0100 -@@ -385,11 +385,6 @@ - if (dryrun) - die(0); - -- /* -- * Initialize system-dependent stuff. -- */ -- sys_init(); -- - /* Make sure fds 0, 1, 2 are open to somewhere. */ - fd_devnull = open(_PATH_DEVNULL, O_RDWR); - if (fd_devnull < 0) -@@ -401,6 +396,11 @@ - fd_devnull = i; - } - -+ /* -+ * Initialize system-dependent stuff. -+ */ -+ sys_init(); -+ - #ifdef USE_TDB - pppdb = tdb_open(_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644); - if (pppdb != NULL) { diff --git a/nonworking/ppp/ppp/install_and_cc.patch b/nonworking/ppp/ppp/install_and_cc.patch deleted file mode 100644 index b521e8593c..0000000000 --- a/nonworking/ppp/ppp/install_and_cc.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff -ur ppp.old/chat/Makefile.linux ppp/chat/Makefile.linux ---- ppp.old/chat/Makefile.linux 2004-01-13 05:00:17.000000000 +0100 -+++ ppp/chat/Makefile.linux 2004-08-22 00:46:05.000000000 +0200 -@@ -21,7 +21,7 @@ - - install: chat - mkdir -p $(BINDIR) -- $(INSTALL) -s -c chat $(BINDIR) -+ $(INSTALL) -c chat $(BINDIR) - $(INSTALL) -c -m 644 chat.8 $(MANDIR)/man8 - - clean: -diff -ur ppp.old/linux/Makefile.top ppp/linux/Makefile.top ---- ppp.old/linux/Makefile.top 2002-06-10 15:56:02.000000000 +0200 -+++ ppp/linux/Makefile.top 2004-08-22 00:46:05.000000000 +0200 -@@ -3,7 +3,7 @@ - - BINDIR = $(DESTDIR)/usr/sbin - INCDIR = $(DESTDIR)/usr/include --MANDIR = $(DESTDIR)/usr/man -+MANDIR = $(DESTDIR)/usr/share/man - ETCDIR = $(DESTDIR)/etc/ppp - - # uid 0 = root -diff -ur ppp.old/pppd/plugins/Makefile.linux ppp/pppd/plugins/Makefile.linux ---- ppp.old/pppd/plugins/Makefile.linux 2004-01-13 05:00:17.000000000 +0100 -+++ ppp/pppd/plugins/Makefile.linux 2004-08-22 00:46:05.000000000 +0200 -@@ -1,8 +1,8 @@ --CC = gcc -+# CC = gcc - COPTS = -O2 -g - CFLAGS = $(COPTS) -I.. -I../../include -fPIC - LDFLAGS = -shared --INSTALL = install -o root -+INSTALL = install - - SUBDIRS := rp-pppoe - # Uncomment the next line to include the radius authentication plugin -diff -ur ppp.old/pppd/plugins/radius/Makefile.linux ppp/pppd/plugins/radius/Makefile.linux ---- ppp.old/pppd/plugins/radius/Makefile.linux 2002-10-05 06:40:14.000000000 +0200 -+++ ppp/pppd/plugins/radius/Makefile.linux 2004-08-22 00:46:05.000000000 +0200 -@@ -30,29 +30,29 @@ - install: all - $(MAKE) $(MFLAGS) -C radiusclient install - $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -s -c -m 755 radius.so $(LIBDIR) -- $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR) -- $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radius.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radattr.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radrealms.so $(LIBDIR) - $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)/man8 - $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)/man8 - - radius.so: radiusclient/lib/.libs/libradiusclient.a radius.o -- gcc -o radius.so -shared radius.o radiusclient/lib/.libs/libradiusclient.a -+ $(CC) -o radius.so -shared radius.o radiusclient/lib/.libs/libradiusclient.a - - radattr.so: radattr.o -- gcc -o radattr.so -shared radattr.o -+ $(CC) -o radattr.so -shared radattr.o - - radrealms.so: radrealms.o -- gcc -o radrealms.so -shared radrealms.o -+ $(CC) -o radrealms.so -shared radrealms.o - - radius.o: radius.c -- gcc $(CFLAGS) -c -o radius.o -fPIC radius.c -+ $(CC) $(CFLAGS) -c -o radius.o -fPIC radius.c - - radattr.o: radattr.c -- gcc $(CFLAGS) -c -o radattr.o -fPIC radattr.c -+ $(CC) $(CFLAGS) -c -o radattr.o -fPIC radattr.c - - radrealms.o: radrealms.c -- gcc $(CFLAGS) -c -o radrealms.o -fPIC radrealms.c -+ $(CC) $(CFLAGS) -c -o radrealms.o -fPIC radrealms.c - - radiusclient/lib/.libs/libradiusclient.a: - test -r radiusclient/Makefile || \ -diff -ur ppp.old/pppd/plugins/rp-pppoe/Makefile.linux ppp/pppd/plugins/rp-pppoe/Makefile.linux ---- ppp.old/pppd/plugins/rp-pppoe/Makefile.linux 2004-08-22 00:17:31.000000000 +0200 -+++ ppp/pppd/plugins/rp-pppoe/Makefile.linux 2004-08-22 00:58:13.000000000 +0200 -@@ -21,38 +21,38 @@ - all: rp-pppoe.so pppoe-discovery - - pppoe-discovery: libplugin.a pppoe-discovery.o -- gcc -o pppoe-discovery pppoe-discovery.o libplugin.a -+ $(CC) -o pppoe-discovery pppoe-discovery.o libplugin.a - - pppoe-discovery.o: pppoe-discovery.c -- gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c -+ $(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c - - rp-pppoe.so: libplugin.a plugin.o -- gcc -o rp-pppoe.so -shared plugin.o libplugin.a -+ $(CC) -o rp-pppoe.so -shared plugin.o libplugin.a - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) -+ $(INSTALL) -c -m 4750 rp-pppoe.so $(LIBDIR) - $(INSTALL) -d -m 755 $(BINDIR) -- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)/pppoe-discovery -+ $(INSTALL) -c -m 755 pppoe-discovery $(BINDIR)/pppoe-discovery - - clean: - rm -f *.o *.so - - plugin.o: plugin.c -- gcc '-DRP_VERSION="$(VERSION)"' $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c -+ $(CC) '-DRP_VERSION="$(VERSION)"' $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c - - libplugin.a: discovery.o if.o common.o debug.o -- ar -rc $@ $^ -+ $(AR) -rc $@ $^ - - discovery.o: discovery.c -- gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o discovery.o -fPIC discovery.c -+ $(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o discovery.o -fPIC discovery.c - - if.o: if.c -- gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o if.o -fPIC if.c -+ $(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o if.o -fPIC if.c - - debug.o: debug.c -- gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o debug.o -fPIC debug.c -+ $(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o debug.o -fPIC debug.c - - common.o: common.c -- gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o common.o -fPIC common.c -+ $(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o common.o -fPIC common.c - -diff -ur ppp.old/pppdump/Makefile.linux ppp/pppdump/Makefile.linux ---- ppp.old/pppdump/Makefile.linux 1999-08-12 06:39:07.000000000 +0200 -+++ ppp/pppdump/Makefile.linux 2004-08-22 00:46:05.000000000 +0200 -@@ -13,5 +13,5 @@ - - install: - mkdir -p $(BINDIR) $(MANDIR)/man8 -- $(INSTALL) -s -c pppdump $(BINDIR) -+ $(INSTALL) -c pppdump $(BINDIR) - $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)/man8 -diff -ur ppp.old/pppstats/Makefile.linux ppp/pppstats/Makefile.linux ---- ppp.old/pppstats/Makefile.linux 2002-10-27 14:00:08.000000000 +0100 -+++ ppp/pppstats/Makefile.linux 2004-08-22 00:46:05.000000000 +0200 -@@ -11,7 +11,7 @@ - COMPILE_FLAGS = -I../include - LIBS = - --INSTALL= install -o root -g daemon -+INSTALL= install - - CFLAGS = $(COPTS) $(COMPILE_FLAGS) - -@@ -19,7 +19,7 @@ - - install: pppstats - -mkdir -p $(MANDIR)/man8 -- $(INSTALL) -s -c pppstats $(BINDIR)/pppstats -+ $(INSTALL) -c pppstats $(BINDIR)/pppstats - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)/man8/pppstats.8 - - pppstats: $(PPPSTATSRCS) ---- ppp.old/pppd/Makefile.linux 2004-08-22 00:17:31.000000000 +0200 -+++ ppp/pppd/Makefile.linux 2004-08-22 01:07:20.000000000 +0200 -@@ -5,7 +5,7 @@ - - # Default installation locations - BINDIR = $(DESTDIR)/usr/sbin --MANDIR = $(DESTDIR)/usr/man -+MANDIR = $(DESTDIR)/usr/share/man - INCDIR = $(DESTDIR)/usr/include - - TARGETS = pppd -@@ -76,7 +76,7 @@ - - INCLUDE_DIRS= -I../include - --COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -+COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE - - CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) - -@@ -103,7 +103,7 @@ - ifdef USE_SRP - CFLAGS += -DUSE_SRP - TARGETS += srp-entry --EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry -+EXTRAINSTALL = $(INSTALL) -c -m 755 srp-entry $(BINDIR)/srp-entry - MANPAGES += srp-entry.8 - EXTRACLEAN += srp-entry.o - NEEDDES=y -@@ -197,7 +197,7 @@ - - ifdef FILTER - LIBS += -lpcap --CFLAGS += -DPPP_FILTER -I/usr/include/pcap -+CFLAGS += -DPPP_FILTER - endif - - ifdef HAVE_INET6 -@@ -218,14 +218,14 @@ - CFLAGS += -DMAXOCTETS - endif - --INSTALL= install -o root -+INSTALL= install - - all: $(TARGETS) - - install: pppd - mkdir -p $(BINDIR) $(MANDIR) - $(EXTRAINSTALL) -- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd -+ $(INSTALL) -c -m 755 pppd $(BINDIR)/pppd - if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ - chmod o-rx,u+s $(BINDIR)/pppd; fi - $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8 diff --git a/nonworking/ppp/ppp/makefilenew.patch b/nonworking/ppp/ppp/makefilenew.patch deleted file mode 100644 index 60b9885087..0000000000 --- a/nonworking/ppp/ppp/makefilenew.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- ppp.old/pppd/Makefile.linux 2004-08-22 00:17:31.000000000 +0200 -+++ ppp/pppd/Makefile.linux 2004-08-22 01:07:20.000000000 +0200 -@@ -5,7 +5,7 @@ - - # Default installation locations - BINDIR = $(DESTDIR)/usr/sbin --MANDIR = $(DESTDIR)/usr/man -+MANDIR = $(DESTDIR)/usr/share/man - INCDIR = $(DESTDIR)/usr/include - - TARGETS = pppd -@@ -76,7 +76,7 @@ - - INCLUDE_DIRS= -I../include - --COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -+COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE - - CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) - -@@ -103,7 +103,7 @@ - ifdef USE_SRP - CFLAGS += -DUSE_SRP - TARGETS += srp-entry --EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry -+EXTRAINSTALL = $(INSTALL) -c -m 755 srp-entry $(BINDIR)/srp-entry - MANPAGES += srp-entry.8 - EXTRACLEAN += srp-entry.o - NEEDDES=y -@@ -197,7 +197,7 @@ - - ifdef FILTER - LIBS += -lpcap --CFLAGS += -DPPP_FILTER -I/usr/include/pcap -+CFLAGS += -DPPP_FILTER - endif - - ifdef HAVE_INET6 -@@ -218,14 +218,14 @@ - CFLAGS += -DMAXOCTETS - endif - --INSTALL= install -o root -+INSTALL= install - - all: $(TARGETS) - - install: pppd - mkdir -p $(BINDIR) $(MANDIR) - $(EXTRAINSTALL) -- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd -+ $(INSTALL) -c -m 755 pppd $(BINDIR)/pppd - if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ - chmod o-rx,u+s $(BINDIR)/pppd; fi - $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8 diff --git a/nonworking/ppp/ppp/mppe-signed.patch b/nonworking/ppp/ppp/mppe-signed.patch deleted file mode 100644 index 3ba4e42adb..0000000000 --- a/nonworking/ppp/ppp/mppe-signed.patch +++ /dev/null @@ -1,284 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- ppp/pppd/chap_ms.h~mppe-signed -+++ ppp/pppd/chap_ms.h -@@ -2,6 +2,7 @@ - * chap_ms.h - Challenge Handshake Authentication Protocol definitions. - * - * Copyright (c) 1995 Eric Rosenquist. All rights reserved. -+ * Copyright (c) 2004 Holger Hans Peter Freyther <freyther@inf.fu-berlin.de> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions ---- ppp/pppd/chap_ms.c~mppe-signed -+++ ppp/pppd/chap_ms.c -@@ -2,6 +2,7 @@ - * chap_ms.c - Microsoft MS-CHAP compatible implementation. - * - * Copyright (c) 1995 Eric Rosenquist. All rights reserved. -+ * Copyright (c) 2004 Holger Hans Peter Freyther <freyther@inf.fu-berlin.de> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -110,12 +111,12 @@ - static const char rcsid[] = RCSID; - - --static void ChallengeHash __P((u_char[16], u_char *, char *, u_char[8])); --static void ascii2unicode __P((char[], int, u_char[])); --static void NTPasswordHash __P((char *, int, u_char[MD4_SIGNATURE_SIZE])); -+static void ChallengeHash __P((u_char[16], u_char *, u_char *, u_char[8])); -+static void ascii2unicode __P((u_char[], int, u_char[])); -+static void NTPasswordHash __P((u_char *, int, u_char[MD4_SIGNATURE_SIZE])); - static void ChallengeResponse __P((u_char *, u_char *, u_char[24])); - static void ChapMS_NT __P((u_char *, char *, int, u_char[24])); --static void ChapMS2_NT __P((char *, u_char[16], char *, char *, int, -+static void ChapMS2_NT __P((u_char *, u_char[16], char *, char *, int, - u_char[24])); - static void GenerateAuthenticatorResponse __P((char*, int, u_char[24], - u_char[16], u_char *, -@@ -126,7 +127,7 @@ - - #ifdef MPPE - static void Set_Start_Key __P((u_char *, char *, int)); --static void SetMasterKeys __P((char *, int, u_char[24], int)); -+static void SetMasterKeys __P((u_char *, int, u_char[24], int)); - #endif - - #ifdef MSLANMAN -@@ -224,7 +225,7 @@ - #endif - - /* Generate the expected response. */ -- ChapMS(challenge, (char *)secret, secret_len, &md); -+ ChapMS(challenge, secret, secret_len, &md); - - #ifdef MSLANMAN - /* Determine which part of response to verify against */ -@@ -255,9 +256,10 @@ - { - MS_Chap2Response *rmd; - MS_Chap2Response md; -- char saresponse[MS_AUTH_RESPONSE_LENGTH+1]; -+ u_char saresponse[MS_AUTH_RESPONSE_LENGTH+1]; - int challenge_len, response_len; - -+ BZERO(&md,sizeof(md)); - challenge_len = *challenge++; /* skip length, is 16 */ - response_len = *response++; - if (response_len != MS_CHAP2_RESPONSE_LEN) -@@ -267,8 +269,8 @@ - - /* Generate the expected response and our mutual auth. */ - ChapMS2(challenge, rmd->PeerChallenge, name, -- (char *)secret, secret_len, &md, -- (unsigned char *)saresponse, MS_CHAP2_AUTHENTICATOR); -+ secret, secret_len, &md, -+ saresponse, MS_CHAP2_AUTHENTICATOR); - - /* compare MDs and send the appropriate status */ - /* -@@ -341,8 +343,13 @@ - unsigned char *challenge, char *secret, int secret_len, - unsigned char *private) - { -+ MS_Chap2Response resp; - challenge++; /* skip length, should be 16 */ - *response++ = MS_CHAP2_RESPONSE_LEN; -+ -+ BZERO(&resp,sizeof(resp)); /* initialize */ -+ -+ - ChapMS2(challenge, - #ifdef DEBUGMPPEKEY - mschap2_peer_challenge, -@@ -350,15 +357,18 @@ - NULL, - #endif - our_name, secret, secret_len, -- (MS_Chap2Response *) response, private, -+ &resp, private, - MS_CHAP2_AUTHENTICATEE); -+ -+ /* Copy the response back */ -+ BCOPY(&resp,response,MS_CHAP2_RESPONSE_LEN); - } - - static int - chapms2_check_success(unsigned char *msg, int len, unsigned char *private) - { - if ((len < MS_AUTH_RESPONSE_LENGTH + 2) || -- strncmp((char *)msg, "S=", 2) != 0) { -+ strncmp((char*)msg, "S=", 2) != 0) { - /* Packet does not start with "S=" */ - error("MS-CHAPv2 Success packet is badly formed."); - return 0; -@@ -484,8 +494,8 @@ - - static void - ChallengeHash(u_char PeerChallenge[16], u_char *rchallenge, -- char *username, u_char Challenge[8]) -- -+ u_char *username, u_char Challenge[8]) -+ - { - SHA1_CTX sha1Context; - u_char sha1Hash[SHA1_SIGNATURE_SIZE]; -@@ -500,7 +510,7 @@ - SHA1_Init(&sha1Context); - SHA1_Update(&sha1Context, PeerChallenge, 16); - SHA1_Update(&sha1Context, rchallenge, 16); -- SHA1_Update(&sha1Context, (unsigned char *)user, strlen(user)); -+ SHA1_Update(&sha1Context, user, strlen(user)); - SHA1_Final(sha1Hash, &sha1Context); - - BCOPY(sha1Hash, Challenge, 8); -@@ -514,17 +524,17 @@ - * is machine-dependent.) - */ - static void --ascii2unicode(char ascii[], int ascii_len, u_char unicode[]) -+ascii2unicode(u_char ascii[], int ascii_len, u_char unicode[]) - { - int i; - - BZERO(unicode, ascii_len * 2); - for (i = 0; i < ascii_len; i++) -- unicode[i * 2] = (u_char) ascii[i]; -+ unicode[i * 2] = ascii[i]; - } - - static void --NTPasswordHash(char *secret, int secret_len, u_char hash[MD4_SIGNATURE_SIZE]) -+NTPasswordHash(u_char *secret, int secret_len, u_char hash[MD4_SIGNATURE_SIZE]) - { - #if defined __NetBSD__ || defined USE_OPENSSL - /* NetBSD uses the libc md4 routines which take bytes instead of bits */ -@@ -535,7 +545,7 @@ - MD4_CTX md4Context; - - MD4Init(&md4Context); -- MD4Update(&md4Context, (unsigned char *)secret, mdlen); -+ MD4Update(&md4Context, secret, mdlen); - MD4Final(hash, &md4Context); - - } -@@ -549,25 +559,25 @@ - - /* Hash the Unicode version of the secret (== password). */ - ascii2unicode(secret, secret_len, unicodePassword); -- NTPasswordHash((char *)unicodePassword, secret_len * 2, PasswordHash); -+ NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash); - - ChallengeResponse(rchallenge, PasswordHash, NTResponse); - } - - static void --ChapMS2_NT(char *rchallenge, u_char PeerChallenge[16], char *username, -+ChapMS2_NT(u_char *rchallenge, u_char PeerChallenge[16], char *username, - char *secret, int secret_len, u_char NTResponse[24]) - { - u_char unicodePassword[MAX_NT_PASSWORD * 2]; - u_char PasswordHash[MD4_SIGNATURE_SIZE]; - u_char Challenge[8]; - -- ChallengeHash(PeerChallenge, (unsigned char *)rchallenge, username, -+ ChallengeHash(PeerChallenge, rchallenge, username, - Challenge); - - /* Hash the Unicode version of the secret (== password). */ - ascii2unicode(secret, secret_len, unicodePassword); -- NTPasswordHash((char *)unicodePassword, secret_len * 2, PasswordHash); -+ NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash); - - ChallengeResponse(Challenge, PasswordHash, NTResponse); - } -@@ -627,8 +637,8 @@ - - /* Hash (x2) the Unicode version of the secret (== password). */ - ascii2unicode(secret, secret_len, unicodePassword); -- NTPasswordHash((char *)unicodePassword, secret_len * 2, PasswordHash); -- NTPasswordHash((char *)PasswordHash, sizeof(PasswordHash), -+ NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash); -+ NTPasswordHash(PasswordHash, sizeof(PasswordHash), - PasswordHashHash); - - SHA1_Init(&sha1Context); -@@ -647,7 +657,7 @@ - - /* Convert to ASCII hex string. */ - for (i = 0; i < MAX((MS_AUTH_RESPONSE_LENGTH / 2), sizeof(Digest)); i++) -- sprintf((char *)&authResponse[i * 2], "%02X", Digest[i]); -+ sprintf(&authResponse[i * 2], "%02X", Digest[i]); - } - - -@@ -695,7 +705,7 @@ - * Set mppe_xxxx_key from MS-CHAPv2 credentials. (see RFC 3079) - */ - static void --SetMasterKeys(char *secret, int secret_len, u_char NTResponse[24], int IsServer) -+SetMasterKeys(u_char *secret, int secret_len, u_char NTResponse[24], int IsServer) - { - SHA1_CTX sha1Context; - u_char unicodePassword[MAX_NT_PASSWORD * 2]; -@@ -832,36 +842,44 @@ - */ - void - ChapMS2(u_char *rchallenge, u_char *PeerChallenge, -- char *user, char *secret, int secret_len, MS_Chap2Response *response, -+ char *user, char *secret, int secret_len, MS_Chap2Response *_response, - u_char authResponse[], int authenticator) - { -+ - /* ARGSUSED */ -- u_char *p = response->PeerChallenge; -+ u_char resp[16]; -+ u_char ntresp[24]; - int i; - -- BZERO(response, sizeof(*response)); -+ /* initialize the strings */ -+ BZERO(resp, sizeof(resp)); -+ BZERO(ntresp, sizeof(ntresp)); - - /* Generate the Peer-Challenge if requested, or copy it if supplied. */ - if (!PeerChallenge) -- for (i = 0; i < sizeof(response->PeerChallenge); i++) -- *p++ = (u_char) (drand48() * 0xff); -+ for (i = 0; i < 16; i++) -+ resp[i] = (u_char) (drand48() * 0xff); - else -- BCOPY(PeerChallenge, response->PeerChallenge, -- sizeof(response->PeerChallenge)); -+ BCOPY(PeerChallenge, resp, -+ sizeof(resp)); - - /* Generate the NT-Response */ -- ChapMS2_NT((char *)rchallenge, response->PeerChallenge, user, -- secret, secret_len, response->NTResp); -+ ChapMS2_NT(rchallenge, resp, user, -+ secret, secret_len, ntresp); - - /* Generate the Authenticator Response. */ -- GenerateAuthenticatorResponse(secret, secret_len, response->NTResp, -- response->PeerChallenge, rchallenge, -+ GenerateAuthenticatorResponse(secret, secret_len, ntresp, -+ resp, rchallenge, - user, authResponse); - - #ifdef MPPE -- SetMasterKeys(secret, secret_len, response->NTResp, authenticator); -+ SetMasterKeys(secret, secret_len, ntresp, authenticator); - mppe_keys_set = 1; - #endif -+ -+ /* Copy the strings back */ -+ BCOPY(resp,_response->PeerChallenge,sizeof(_response->PeerChallenge)); -+ BCOPY(ntresp,_response->NTResp,sizeof(_response->NTResp)); - } - - #ifdef MPPE diff --git a/nonworking/ppp/ppp/no_crypt_hack b/nonworking/ppp/ppp/no_crypt_hack deleted file mode 100644 index 501409ea9b..0000000000 --- a/nonworking/ppp/ppp/no_crypt_hack +++ /dev/null @@ -1,45 +0,0 @@ -diff -ruN ppp.orig/pppd/auth.c ppp/pppd/auth.c ---- ppp.orig/pppd/auth.c 2003-06-12 02:01:21.000000000 +0200 -+++ ppp/pppd/auth.c 2003-12-02 14:48:40.000000000 +0100 -@@ -1292,8 +1292,10 @@ - } - if (secret[0] != 0 && !login_secret) { - /* password given in pap-secrets - must match */ -+#ifndef NO_CRYPT_HACK - if ((cryptpap || strcmp(passwd, secret) != 0) - && strcmp(crypt(passwd, secret), secret) != 0) -+#endif - ret = UPAP_AUTHNAK; - } - } -@@ -1495,8 +1497,10 @@ - /* - * If no passwd, don't let them login. - */ -+#ifndef NO_CRYPT_HACK - if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2 - || strcmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd) != 0) -+#endif - return (UPAP_AUTHNAK); - - #endif /* #ifdef USE_PAM */ -diff -ruN ppp.orig/pppd/Makefile.linux ppp/pppd/Makefile.linux ---- ppp.orig/pppd/Makefile.linux 2003-11-27 23:00:22.000000000 +0100 -+++ ppp/pppd/Makefile.linux 2003-12-02 14:47:53.000000000 +0100 -@@ -116,12 +116,16 @@ - #LIBS += -lshadow $(LIBS) - endif - -+ifdef NO_CRYPT_HACK -+CFLAGS += -DNO_CRYPT_HACK -+else - ifneq ($(wildcard /usr/include/crypt.h),) - CFLAGS += -DHAVE_CRYPT_H=1 - endif - ifneq ($(wildcard /usr/lib/libcrypt.*),) - LIBS += -lcrypt - endif -+endif - - ifdef NEEDDES - ifndef USE_CRYPT diff --git a/nonworking/ppp/ppp/ppp-2.3.11-oedod.dif b/nonworking/ppp/ppp/ppp-2.3.11-oedod.dif deleted file mode 100644 index e024696697..0000000000 --- a/nonworking/ppp/ppp/ppp-2.3.11-oedod.dif +++ /dev/null @@ -1,172 +0,0 @@ ---- ppp/pppd/demand.c -+++ ppp/pppd/demand.c 2000/06/28 14:54:04 -@@ -25,6 +25,8 @@ - #include <errno.h> - #include <fcntl.h> - #include <netdb.h> -+#include <unistd.h> -+#include <syslog.h> - #include <sys/param.h> - #include <sys/types.h> - #include <sys/wait.h> -@@ -32,6 +34,8 @@ - #include <sys/resource.h> - #include <sys/stat.h> - #include <sys/socket.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> - #ifdef PPP_FILTER - #include <net/if.h> - #include <net/bpf.h> -@@ -210,6 +214,14 @@ - int c, rv; - - rv = 0; -+ -+/* check for synchronous connection... */ -+ -+ if ( (p[0] == 0xFF) && (p[1] == 0x03) ) { -+ rv = loop_frame(p,n); -+ return rv; -+ } -+ - for (; n > 0; --n) { - c = *p++; - if (c == PPP_FLAG) { -@@ -288,17 +300,102 @@ - * loopback, now that the real serial link is up. - */ - void --demand_rexmit(proto) -+demand_rexmit(proto, newip) - int proto; -+ u_int32_t newip; - { - struct packet *pkt, *prev, *nextpkt; -+ unsigned short checksum; -+ unsigned short pkt_checksum = 0; -+ unsigned iphdr; -+ struct timeval tv; -+ char cv = 0; -+ char ipstr[16]; - - prev = NULL; - pkt = pend_q; - pend_q = NULL; -+ tv.tv_sec = 1; -+ tv.tv_usec = 0; -+ select(0,NULL,NULL,NULL,&tv); /* Sleep for 1 Seconds */ - for (; pkt != NULL; pkt = nextpkt) { - nextpkt = pkt->next; - if (PPP_PROTOCOL(pkt->data) == proto) { -+ if ( (proto == PPP_IP) && newip ) { -+ /* Get old checksum */ -+ -+ iphdr = (pkt->data[4] & 15) << 2; -+ checksum = *((unsigned short *) (pkt->data+14)); -+ if (checksum == 0xFFFF) { -+ checksum = 0; -+ } -+ -+ -+ if (pkt->data[13] == 17) { -+ pkt_checksum = *((unsigned short *) (pkt->data+10+iphdr)); -+ if (pkt_checksum) { -+ cv = 1; -+ if (pkt_checksum == 0xFFFF) { -+ pkt_checksum = 0; -+ } -+ } -+ else { -+ cv = 0; -+ } -+ } -+ -+ if (pkt->data[13] == 6) { -+ pkt_checksum = *((unsigned short *) (pkt->data+20+iphdr)); -+ cv = 1; -+ if (pkt_checksum == 0xFFFF) { -+ pkt_checksum = 0; -+ } -+ } -+ -+ /* Delete old Source-IP-Address */ -+ checksum -= *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; -+ checksum -= *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; -+ -+ pkt_checksum -= *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; -+ pkt_checksum -= *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; -+ -+ /* Change Source-IP-Address */ -+ * ((u_int32_t *) (pkt->data + 16)) = newip; -+ -+ /* Add new Source-IP-Address */ -+ checksum += *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; -+ checksum += *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; -+ -+ pkt_checksum += *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; -+ pkt_checksum += *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; -+ -+ /* Write new checksum */ -+ if (!checksum) { -+ checksum = 0xFFFF; -+ } -+ *((unsigned short *) (pkt->data+14)) = checksum; -+ if (pkt->data[13] == 6) { -+ *((unsigned short *) (pkt->data+20+iphdr)) = pkt_checksum; -+ } -+ if (cv && (pkt->data[13] == 17) ) { -+ *((unsigned short *) (pkt->data+10+iphdr)) = pkt_checksum; -+ } -+ -+ /* Log Packet */ -+ strcpy(ipstr,inet_ntoa(*( (struct in_addr *) (pkt->data+16)))); -+ if (pkt->data[13] == 1) { -+ syslog(LOG_INFO,"Open ICMP %s -> %s\n", -+ ipstr, -+ inet_ntoa(*( (struct in_addr *) (pkt->data+20)))); -+ } else { -+ syslog(LOG_INFO,"Open %s %s:%d -> %s:%d\n", -+ pkt->data[13] == 6 ? "TCP" : "UDP", -+ ipstr, -+ ntohs(*( (short *) (pkt->data+iphdr+4))), -+ inet_ntoa(*( (struct in_addr *) (pkt->data+20))), -+ ntohs(*( (short *) (pkt->data+iphdr+6)))); -+ } -+ } - output(0, pkt->data, pkt->length); - free(pkt); - } else { ---- ppp/pppd/ipcp.c -+++ ppp/pppd/ipcp.c 2000/06/28 12:32:05 -@@ -1454,7 +1454,7 @@ - proxy_arp_set[f->unit] = 1; - - } -- demand_rexmit(PPP_IP); -+ demand_rexmit(PPP_IP,go->ouraddr); - sifnpmode(f->unit, PPP_IP, NPMODE_PASS); - - } else { ---- ppp/pppd/ipv6cp.c -+++ ppp/pppd/ipv6cp.c 2000/06/28 12:32:06 -@@ -1153,7 +1153,7 @@ - } - - } -- demand_rexmit(PPP_IPV6); -+ demand_rexmit(PPP_IPV6,0); - sifnpmode(f->unit, PPP_IPV6, NPMODE_PASS); - - } else { ---- ppp/pppd/pppd.h -+++ ppp/pppd/pppd.h 2000/06/28 12:32:06 -@@ -359,7 +359,7 @@ - void demand_block __P((void)); /* set all NPs to queue up packets */ - void demand_unblock __P((void)); /* set all NPs to pass packets */ - void demand_discard __P((void)); /* set all NPs to discard packets */ --void demand_rexmit __P((int)); /* retransmit saved frames for an NP */ -+void demand_rexmit __P((int, u_int32_t)); /* retransmit saved frames for an NP*/ - int loop_chars __P((unsigned char *, int)); /* process chars from loopback */ - int loop_frame __P((unsigned char *, int)); /* should we bring link up? */ - diff --git a/nonworking/ppp/ppp/ppp-2.4.2-stripMSdomain b/nonworking/ppp/ppp/ppp-2.4.2-stripMSdomain deleted file mode 100644 index d52e38645d..0000000000 --- a/nonworking/ppp/ppp/ppp-2.4.2-stripMSdomain +++ /dev/null @@ -1,35 +0,0 @@ -diff -ruN ppp.orig/pppd/chap-new.c ppp/pppd/chap-new.c ---- ppp.orig/pppd/chap-new.c 2003-11-27 23:25:17.000000000 +0100 -+++ ppp/pppd/chap-new.c 2003-12-02 12:26:21.000000000 +0100 -@@ -57,6 +57,7 @@ - int chap_timeout_time = 3; - int chap_max_transmits = 10; - int chap_rechallenge_time = 0; -+int chapms_strip_domain = 0; - - /* - * Command-line options. -@@ -68,6 +69,8 @@ - "Set max #xmits for challenge", OPT_PRIO }, - { "chap-interval", o_int, &chap_rechallenge_time, - "Set interval for rechallenge", OPT_PRIO }, -+ { "chapms-strip-domain", o_bool, &chapms_strip_domain, -+ "Strip the domain prefix before the Username", 1 }, - { NULL } - }; - -@@ -338,6 +341,14 @@ - /* Null terminate and clean remote name. */ - slprintf(rname, sizeof(rname), "%.*v", len, name); - name = rname; -+ -+ /* strip the MS domain name */ -+ if (chapms_strip_domain && strrchr(rname, '\\')) { -+ char tmp[MAXNAMELEN+1]; -+ -+ strcpy(tmp, strrchr(rname, '\\') + 1); -+ strcpy(rname, tmp); -+ } - } - - if (chap_verify_hook) diff --git a/nonworking/ppp/ppp/pppdump-no-deflate b/nonworking/ppp/ppp/pppdump-no-deflate deleted file mode 100644 index b76b84911c..0000000000 --- a/nonworking/ppp/ppp/pppdump-no-deflate +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ppp-2.4.1.uus.orig/pppdump/ppp-comp.h ppp-2.4.1.uus/pppdump/ppp-comp.h ---- ppp-2.4.1.uus.orig/pppdump/ppp-comp.h 1999-03-23 04:21:01.000000000 +0100 -+++ ppp-2.4.1.uus/pppdump/ppp-comp.h 2003-08-09 23:54:49.000000000 +0200 -@@ -37,6 +37,8 @@ - #ifndef DO_BSD_COMPRESS - #define DO_BSD_COMPRESS 1 /* by default, include BSD-Compress */ - #endif -+#undef DO_DEFLATE -+#define DO_DEFLATE 0 - #ifndef DO_DEFLATE - #define DO_DEFLATE 1 /* by default, include Deflate */ - #endif diff --git a/nonworking/ppp/ppp/pppoe_discovery b/nonworking/ppp/ppp/pppoe_discovery deleted file mode 100644 index 0f84cf1709..0000000000 --- a/nonworking/ppp/ppp/pppoe_discovery +++ /dev/null @@ -1,150 +0,0 @@ -diff -ruNp ppp.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp/pppd/plugins/rp-pppoe/Makefile.linux ---- ppp.orig/pppd/plugins/rp-pppoe/Makefile.linux 2004-01-13 05:00:17.000000000 +0100 -+++ ppp/pppd/plugins/rp-pppoe/Makefile.linux 2004-07-16 19:27:40.000000000 +0200 -@@ -18,7 +18,13 @@ VERSION=3.3 - - COPTS=-O2 -g - CFLAGS=$(COPTS) -I../../../include/linux --all: rp-pppoe.so -+all: rp-pppoe.so pppoe-discovery -+ -+pppoe-discovery: libplugin.a pppoe-discovery.o -+ gcc -o pppoe-discovery pppoe-discovery.o libplugin.a -+ -+pppoe-discovery.o: pppoe-discovery.c -+ gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c - - rp-pppoe.so: libplugin.a plugin.o - gcc -o rp-pppoe.so -shared plugin.o libplugin.a -@@ -26,6 +32,8 @@ rp-pppoe.so: libplugin.a plugin.o - install: all - $(INSTALL) -d -m 755 $(LIBDIR) - $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) -+ $(INSTALL) -d -m 755 $(BINDIR) -+ $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)/pppoe-discovery - - clean: - rm -f *.o *.so -diff -ruNp ppp.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp/pppd/plugins/rp-pppoe/pppoe-discovery.c ---- ppp.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c 1970-01-01 01:00:00.000000000 +0100 -+++ ppp/pppd/plugins/rp-pppoe/pppoe-discovery.c 2004-07-16 19:26:20.000000000 +0200 -@@ -0,0 +1,119 @@ -+/* -+ * Perform PPPoE discovery -+ * -+ * Copyright (C) 2000-2001 by Roaring Penguin Software Inc. -+ * Copyright (C) 2004 Marco d'Itri <md@linux.it> -+ * -+ * This program may be distributed according to the terms of the GNU -+ * General Public License, version 2 or (at your option) any later version. -+ * -+ */ -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <errno.h> -+#include <string.h> -+ -+#include "pppoe.h" -+ -+char *xstrdup(const char *s); -+void usage(void); -+ -+int main(int argc, char *argv[]) -+{ -+ int opt; -+ PPPoEConnection *conn; -+ -+ conn = malloc(sizeof(PPPoEConnection)); -+ if (!conn) -+ fatalSys("malloc"); -+ -+ memset(conn, 0, sizeof(PPPoEConnection)); -+ -+ while ((opt = getopt(argc, argv, "I:D:VUAS:C:h")) > 0) { -+ switch(opt) { -+ case 'S': -+ conn->serviceName = xstrdup(optarg); -+ break; -+ case 'C': -+ conn->acName = xstrdup(optarg); -+ break; -+ case 'U': -+ conn->useHostUniq = 1; -+ break; -+ case 'D': -+ conn->debugFile = fopen(optarg, "w"); -+ if (!conn->debugFile) { -+ fprintf(stderr, "Could not open %s: %s\n", -+ optarg, strerror(errno)); -+ exit(1); -+ } -+ fprintf(conn->debugFile, "pppoe-discovery %s\n", VERSION); -+ break; -+ case 'I': -+ conn->ifName = xstrdup(optarg); -+ break; -+ case 'A': -+ /* this is the default */ -+ break; -+ case 'V': -+ case 'h': -+ usage(); -+ exit(0); -+ default: -+ usage(); -+ exit(1); -+ } -+ } -+ -+ /* default interface name */ -+ if (!conn->ifName) -+ conn->ifName = strdup("eth0"); -+ -+ conn->discoverySocket = -1; -+ conn->sessionSocket = -1; -+ conn->printACNames = 1; -+ -+ discovery(conn); -+ exit(0); -+} -+ -+void rp_fatal(char const *str) -+{ -+ char buf[1024]; -+ -+ printErr(str); -+ sprintf(buf, "pppoe-discovery: %.256s", str); -+ exit(1); -+} -+ -+void fatalSys(char const *str) -+{ -+ char buf[1024]; -+ int i = errno; -+ -+ sprintf(buf, "%.256s: %.256s", str, strerror(i)); -+ printErr(buf); -+ sprintf(buf, "pppoe-discovery: %.256s: %.256s", str, strerror(i)); -+ exit(1); -+} -+ -+void sysErr(char const *str) -+{ -+ rp_fatal(str); -+} -+ -+char *xstrdup(const char *s) -+{ -+ register char *ret = strdup(s); -+ if (!ret) -+ sysErr("strdup"); -+ return ret; -+} -+ -+void usage(void) -+{ -+ fprintf(stderr, "Usage: pppoe-discovery [options]\n"); -+ fprintf(stderr, "\nVersion " VERSION "\n"); -+} diff --git a/nonworking/ppp/ppp/setevn_call_file b/nonworking/ppp/ppp/setevn_call_file deleted file mode 100644 index 256b703f79..0000000000 --- a/nonworking/ppp/ppp/setevn_call_file +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN ppp.orig/pppd/options.c ppp/pppd/options.c ---- ppp.orig/pppd/options.c 2004-02-27 19:45:18.000000000 +0100 -+++ ppp/pppd/options.c 2004-02-27 19:44:48.000000000 +0100 -@@ -1448,6 +1448,7 @@ - if ((fname = (char *) malloc(l)) == NULL) - novm("call file name"); - slprintf(fname, l, "%s%s", _PATH_PEERFILES, arg); -+ script_setenv("CALL_FILE", arg, 0); - - ok = options_from_file(fname, 1, 1, 1); - -diff -ruN ppp.orig/pppd/pppd.8 ppp/pppd/pppd.8 ---- ppp.orig/pppd/pppd.8 2004-02-27 19:45:18.000000000 +0100 -+++ ppp/pppd/pppd.8 2004-02-27 19:45:13.000000000 +0100 -@@ -1569,6 +1569,9 @@ - .B LINKNAME - The logical name of the link, set with the \fIlinkname\fR option. - .TP -+.B CALL_FILE -+The value of the \fIcall\fR option. -+.TP - .B DNS1 - If the peer supplies DNS server addresses, this variable is set to the - first DNS server address supplied. diff --git a/nonworking/ppp/ppp/syslog_local2 b/nonworking/ppp/ppp/syslog_local2 deleted file mode 100644 index 32a8cead9e..0000000000 --- a/nonworking/ppp/ppp/syslog_local2 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ppp.orig/pppd/pppd.h ppp/pppd/pppd.h ---- ppp.orig/pppd/pppd.h 2003-11-28 00:30:27.000000000 +0100 -+++ ppp/pppd/pppd.h 2003-11-28 00:30:20.000000000 +0100 -@@ -812,7 +812,7 @@ - || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP) - #define LOG_PPP LOG_LOCAL2 - #else --#define LOG_PPP LOG_DAEMON -+#define LOG_PPP LOG_LOCAL2 - #endif - #endif /* LOG_PPP */ - diff --git a/nonworking/ppp/ppp/use_openssl b/nonworking/ppp/ppp/use_openssl deleted file mode 100644 index 5f111d1eaf..0000000000 --- a/nonworking/ppp/ppp/use_openssl +++ /dev/null @@ -1,150 +0,0 @@ -The built-in SHA1 code is broken on 64 bit systems. -Using a system library may be considered a good idea anyway. - - -diff -ruNp ppp.orig/pppd/chap-md5.c ppp/pppd/chap-md5.c ---- ppp.orig/pppd/chap-md5.c 2003-11-27 23:25:17.000000000 +0100 -+++ ppp/pppd/chap-md5.c 2004-07-14 16:45:46.000000000 +0200 -@@ -41,7 +41,14 @@ - #include "chap-new.h" - #include "chap-md5.h" - #include "magic.h" -+#ifdef USE_OPENSSL -+#include <openssl/md5.h> -+#define MD5Init MD5_Init -+#define MD5Update MD5_Update -+#define MD5Final MD5_Final -+#else - #include "md5.h" -+#endif - - #define MD5_HASH_SIZE 16 - #define MD5_MIN_CHALLENGE 16 -diff -ruNp ppp.orig/pppd/chap_ms.c ppp/pppd/chap_ms.c ---- ppp.orig/pppd/chap_ms.c 2004-04-14 04:40:21.000000000 +0200 -+++ ppp/pppd/chap_ms.c 2004-07-14 16:46:03.000000000 +0200 -@@ -89,8 +89,21 @@ - #include "pppd.h" - #include "chap-new.h" - #include "chap_ms.h" -+#ifdef USE_OPENSSL -+#include <openssl/md4.h> -+#define MD4Init MD4_Init -+#define MD4Update MD4_Update -+#define MD4Final MD4_Final -+#else - #include "md4.h" -+#endif -+#ifdef USE_OPENSSL -+#include <openssl/sha.h> -+#define SHA1_SIGNATURE_SIZE SHA_DIGEST_LENGTH -+#define SHA1_CTX SHA_CTX -+#else - #include "sha1.h" -+#endif - #include "pppcrypt.h" - #include "magic.h" - -@@ -513,7 +526,7 @@ ascii2unicode(char ascii[], int ascii_le - static void - NTPasswordHash(char *secret, int secret_len, u_char hash[MD4_SIGNATURE_SIZE]) - { --#ifdef __NetBSD__ -+#if defined __NetBSD__ || defined USE_OPENSSL - /* NetBSD uses the libc md4 routines which take bytes instead of bits */ - int mdlen = secret_len; - #else -diff -ruNp ppp.orig/pppd/eap.c ppp/pppd/eap.c ---- ppp.orig/pppd/eap.c 2003-06-12 02:01:21.000000000 +0200 -+++ ppp/pppd/eap.c 2004-07-14 16:45:46.000000000 +0200 -@@ -62,7 +62,14 @@ - - #include "pppd.h" - #include "pathnames.h" -+#ifdef USE_OPENSSL -+#include <openssl/md5.h> -+#define MD5Init MD5_Init -+#define MD5Update MD5_Update -+#define MD5Final MD5_Final -+#else - #include "md5.h" -+#endif - #include "eap.h" - - #ifdef USE_SRP -diff -ruNp ppp.orig/pppd/Makefile.linux ppp/pppd/Makefile.linux ---- ppp.orig/pppd/Makefile.linux 2004-07-14 16:46:44.000000000 +0200 -+++ ppp/pppd/Makefile.linux 2004-07-14 16:45:46.000000000 +0200 -@@ -10,7 +10,7 @@ INCDIR = $(DESTDIR)/usr/include - - TARGETS = pppd - --PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap-new.c md5.c ccp.c \ -+PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap-new.c ccp.c \ - ecp.c ipxcp.c auth.c options.c sys-linux.c md4.c chap_ms.c \ - demand.c utils.c tty.c eap.c chap-md5.c - -@@ -19,7 +19,7 @@ HEADERS = ccp.h chap-new.h ecp.h fsm.h i - upap.h eap.h - - MANPAGES = pppd.8 --PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap-new.o md5.o ccp.o \ -+PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap-new.o ccp.o \ - ecp.o auth.o options.o demand.o utils.o sys-linux.o ipxcp.o tty.o \ - eap.o chap-md5.o - -@@ -83,8 +83,14 @@ CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCL - ifdef CHAPMS - CFLAGS += -DCHAPMS=1 - NEEDDES=y -+ifdef USE_BUILTIN_CRYPTO - PPPDOBJS += md4.o chap_ms.o --HEADERS += md4.h chap_ms.h -+HEADERS += md4.h chap_ms.h -+else -+PPPDOBJS += chap_ms.o -+HEADERS += chap_ms.h -+NEED_OPENSSL=y -+endif - ifdef MSLANMAN - CFLAGS += -DMSLANMAN=1 - endif -@@ -95,20 +101,36 @@ endif - - # EAP SRP-SHA1 - ifdef USE_SRP --CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include --LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto -+CFLAGS += -DUSE_SRP - TARGETS += srp-entry - EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry - MANPAGES += srp-entry.8 - EXTRACLEAN += srp-entry.o - NEEDDES=y -+NEED_OPENSSL=y - else - # OpenSSL has an integrated version of SHA-1, and its implementation - # is incompatible with this local SHA-1 implementation. We must use - # one or the other, not both. -+ifdef USE_BUILTIN_CRYPTO - PPPDSRCS += sha1.c - HEADERS += sha1.h - PPPDOBJS += sha1.o -+else -+NEED_OPENSSL=y -+endif -+endif -+ -+ifdef USE_BUILTIN_CRYPTO -+PPPDSRCS += md5.c -+PPPDOBJS += md5.o -+else -+NEED_OPENSSL=y -+endif -+ -+ifdef NEED_OPENSSL -+CFLAGS += -DUSE_OPENSSL -+LIBS += -lcrypto - endif - - ifdef HAS_SHADOW diff --git a/nonworking/ppp/ppp_2.4.1+cvs20040427.bb b/nonworking/ppp/ppp_2.4.1+cvs20040427.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/ppp/ppp_2.4.1+cvs20040427.bb +++ /dev/null diff --git a/nonworking/pptp-linux/pptp-linux/makefile.patch b/nonworking/pptp-linux/pptp-linux/makefile.patch deleted file mode 100644 index ea2b5711a2..0000000000 --- a/nonworking/pptp-linux/pptp-linux/makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pptp-linux-1.5.0.orig/Makefile 2004-08-21 20:42:31.000000000 +0200 -+++ pptp-linux-1.5.0/Makefile 2004-08-21 21:57:41.000000000 +0200 -@@ -10,7 +10,7 @@ - BINDIR=$(DESTDIR)/usr/sbin - MANDIR=$(DESTDIR)/usr/share/man/man8 - --CC = gcc -+CC = $(CC) - RM = rm -f - OPTIMIZE= -O0 - DEBUG = -g diff --git a/nonworking/pptp-linux/pptp-linux/options.pptp b/nonworking/pptp-linux/pptp-linux/options.pptp deleted file mode 100644 index f446e22a6a..0000000000 --- a/nonworking/pptp-linux/pptp-linux/options.pptp +++ /dev/null @@ -1,30 +0,0 @@ -# -# Lock the port -# -lock - -# -# We don't need the tunnel server to authenticate itself -# -noauth - -# -# Turn off transmission protocols we know won't be used -# -nobsdcomp -nodeflate - -# -# We want MPPE -# (option naming specific to ppp 2.4.0 with unofficial patch) -# -#mppe-40 -mppe-128 -#mppe-stateless - -# -# We want a sane mtu/mru -# (ppp 2.4.0 with unofficial patch) -# -#mtu 1000 -#mru 1000 diff --git a/nonworking/pptp-linux/pptp-linux_1.5.0.bb b/nonworking/pptp-linux/pptp-linux_1.5.0.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/pptp-linux/pptp-linux_1.5.0.bb +++ /dev/null diff --git a/nonworking/python/python-gsl-0.2.0/cross-compile.patch b/nonworking/python/python-gsl-0.2.0/cross-compile.patch deleted file mode 100644 index 69f68c7dc0..0000000000 --- a/nonworking/python/python-gsl-0.2.0/cross-compile.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- pygsl-0.2.0/gsl_Extension.py~cross-compile 2003-11-19 10:08:53.000000000 +0100 -+++ pygsl-0.2.0/gsl_Extension.py 2004-02-16 16:32:15.000000000 +0100 -@@ -85,8 +85,8 @@ - else: - self.gsl_config_tool="gsl-config" - -- self.prefix = self.get_gsl_info('--prefix').strip() -- self.cflags = self.get_gsl_info('--cflags').strip() -+ self.prefix = os.getenv( "STAGING" )+"/target" -+ self.cflags = self.get_gsl_info('--cflags').strip() + " -I%s/python2.3/include" % os.getenv( "STAGING" ) - self.libs = self.get_gsl_info('--libs').strip() - self.version = self._split_version(self.get_gsl_info('--version').strip()) - diff --git a/nonworking/python/python-gsl_0.2.0.bb b/nonworking/python/python-gsl_0.2.0.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/python/python-gsl_0.2.0.bb +++ /dev/null diff --git a/nonworking/python/python-pycap_0.1.6.bb b/nonworking/python/python-pycap_0.1.6.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/python/python-pycap_0.1.6.bb +++ /dev/null diff --git a/nonworking/python/python-pyx_0.6.bb b/nonworking/python/python-pyx_0.6.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/python/python-pyx_0.6.bb +++ /dev/null diff --git a/nonworking/qolyester/qolyester_20040519.bb b/nonworking/qolyester/qolyester_20040519.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/qolyester/qolyester_20040519.bb +++ /dev/null diff --git a/nonworking/qtella/qtella_0.6.5.bb b/nonworking/qtella/qtella_0.6.5.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/qtella/qtella_0.6.5.bb +++ /dev/null diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/WLAN.conf b/nonworking/qtopia/qtopia-1.7.0-r0/WLAN.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/WLAN.conf +++ /dev/null diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/embeddedkonsole.patch b/nonworking/qtopia/qtopia-1.7.0-r0/embeddedkonsole.patch deleted file mode 100644 index 2e279083d8..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/embeddedkonsole.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- qtopia-free-1.6.2/src/3rdparty/applications/embeddedkonsole/qpe-embeddedkonsole.control~ Mon Jul 7 19:43:19 2003 -+++ qtopia-free-1.7.0/src/3rdparty/applications/embeddedkonsole/qpe-embeddedkonsole.control Mon Jul 7 20:01:34 2003 -@@ -5,6 +5,6 @@ - Architecture: $CPU_ARCH - Arch: $DEVICE_ARCH - Version: $QPE_VERSION-13 --Depends: qpe-libqtopia, ptydevs -+Depends: qpe-libqtopia - Description: KDE's konsole (shell terminal) - Ported to the Qtopia environment. diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/ft2.patch b/nonworking/qtopia/qtopia-1.7.0-r0/ft2.patch deleted file mode 100644 index d4818441d0..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/ft2.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- qtopia-free-1.7.0/src/plugins/fontfactories/freetype/fontfactoryttf_qws.cpp Wed Jun 4 02:59:21 2003 -+++ qtopia-free-1.7.0/src/plugins/fontfactories/freetype/fontfactoryttf_qws.cpp.new Wed Jan 14 20:10:54 2004 -@@ -31,7 +31,8 @@ - - - extern "C" { --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include <freetype/ftglyph.h> - #include <freetype/ftoutln.h> - #include <freetype/ftbbox.h> ---- qtopia-free-1.7.0/src/plugins/fontfactories/freetype/fontfactoryttf_qws.h Wed Jun 4 02:59:21 2003 -+++ qtopia-free-1.7.0/src/plugins/fontfactories/freetype/fontfactoryttf_qws.h.new Wed Jan 14 20:11:13 2004 -@@ -31,7 +31,8 @@ - - - extern "C" { --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - } - - // ascent, descent, width(ch), width(string), maxwidth? diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/konsoleEnv.patch b/nonworking/qtopia/qtopia-1.7.0-r0/konsoleEnv.patch deleted file mode 100644 index 3a19c80e04..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/konsoleEnv.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- qtopia-free-1.7.0/src/3rdparty/applications/embeddedkonsole/MyPty.cpp.~1~ Mon May 12 20:18:29 2003 -+++ qtopia-free-1.7.0/src/3rdparty/applications/embeddedkonsole/MyPty.cpp Wed Jul 23 17:35:16 2003 -@@ -163,6 +163,7 @@ - ttmode.c_cc[VINTR] = 3; - ttmode.c_cc[VERASE] = 8; - tcsetattr( STDIN_FILENO, TCSANOW, &ttmode ); -+ if(strlen(getenv("TERM"))<=0) - setenv("TERM","vt100",1); - setenv("COLORTERM","0",1); - ---- qtopia-free-1.7.0/src/3rdparty/applications/embeddedkonsole/TEWidget.cpp.~1~ Mon May 12 20:18:32 2003 -+++ qtopia-free-1.7.0/src/3rdparty/applications/embeddedkonsole/TEWidget.cpp Wed Jul 23 18:27:56 2003 -@@ -1027,9 +1027,18 @@ - if ( e->type() == QEvent::KeyPress ) - { - QKeyEvent* ke = (QKeyEvent*)e; -+ if(ke->key() == 4165) return true; // qDebug("key pressed is 0x%x, ascii is 0x%x, state %d", ke->key(), ke->ascii(), ke->state()); - - actSel=0; // Key stroke implies a screen update, so TEWidget won't - // know where the current selection is. -+ if( ke->state() == ShiftButton && ke->key() == Key_Tab) { -+ //lets hardcode this sucker -+ emitText("\\"); // expose -+ } -+ else if( ke->state() == ControlButton && ke->key() == Key_V) { -+ pasteClipboard(); -+ } -+ else - - emit keyPressedSignal(ke); // expose - ke->accept(); ---- qtopia-free-1.7.0/src/3rdparty/applications/embeddedkonsole/konsole.cpp.~1~ 2003-05-12 20:18:38.000000000 -0600 -+++ qtopia-free-1.7.0/src/3rdparty/applications/embeddedkonsole/konsole.cpp 2003-07-24 20:43:25.000000000 -0600 -@@ -736,7 +736,7 @@ - } - if( iD == -3) { - cfg.setGroup("Tabs"); -- QString tmp=cfg.readEntry("Position","Top"); -+ QString tmp=cfg.readEntry("Position","Bottom"); - - if(tmp=="Top") { // No tr - tab->setTabPosition(QTabWidget::Bottom); diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/makefile2.patch b/nonworking/qtopia/qtopia-1.7.0-r0/makefile2.patch deleted file mode 100644 index bbeabc1878..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/makefile2.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.linux.~1~ 2003-07-08 16:05:24.000000000 +1000 -+++ qtopia-free-1.7.0/src/Makefile.linux 2003-09-19 13:02:30.000000000 +1000 -@@ -71,7 +71,6 @@ - plugins/decorations/flat - - SUPPORTEDAPPS=\ -- 3rdparty/tools/atd \ - applications/addressbook \ - applications/calculator \ - applications/clock \ -@@ -107,7 +106,8 @@ - settings/language \ - tools/quicklauncher \ - tools/qcop \ -- tools/symlinker -+ tools/symlinker -+ - - $(SUPPORTEDLIBS): $(CORELIBS) - diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/nofreetype.patch b/nonworking/qtopia/qtopia-1.7.0-r0/nofreetype.patch deleted file mode 100644 index 02d3d04435..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/nofreetype.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qtopia-free-1.7.0/src/Makefile.linux Sat Jan 10 13:03:19 2004 -+++ qtopia-free-1.7.0/src/Makefile.linux.new Sat Jan 10 13:03:28 2004 -@@ -11,8 +11,7 @@ - - #Core/Misc - CORELIBS1=\ -- libraries/qtopia \ -- 3rdparty/libraries/freetype -+ libraries/qtopia - - CORELIBS2=\ - libraries/qtopia1 diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/performance.patch b/nonworking/qtopia/qtopia-1.7.0-r0/performance.patch deleted file mode 100644 index 3febefdb6d..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/performance.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- qtopia-free-1.7.0/src/tools/performance/performancetest.cpp.~1~ 2003-06-04 11:07:19.000000000 +1000 -+++ qtopia-free-1.7.0/src/tools/performance/performancetest.cpp 2003-09-19 13:21:17.000000000 +1000 -@@ -1,5 +1,6 @@ - - #include "performancetest.h" -+#include <qimage.h> - #include <qtopia/qpeapplication.h> - #include <qpushbutton.h> - #include <qframe.h> ---- qtopia-free-1.7.0/apps/Applications/performance.desktop.~1~ 2003-09-19 13:41:11.000000000 +1000 -+++ qtopia-free-1.7.0/apps/Applications/performance.desktop 2003-09-19 13:40:56.000000000 +1000 -@@ -0,0 +1,6 @@ -+[Desktop Entry] -+Comment=Performance test -+Exec=performance -+Icon=Generic -+Type=Application -+Name=Performance diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/qpe.patch b/nonworking/qtopia/qtopia-1.7.0-r0/qpe.patch deleted file mode 100644 index b1294ebc37..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/qpe.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qtopia-free-1.6.2/etc/init.d/qpe.orig Mon May 12 20:14:38 2003 -+++ qtopia-free-1.6.2/etc/init.d/qpe Mon Jul 14 04:09:17 2003 -@@ -28,7 +28,8 @@ - - rm -f /etc/rc2.d/S99x # Can't have both running! - -- $QPEDIR/bin/qpe 2>/dev/null >/dev/null & -+ $QPEDIR/bin/qpe 2>/dev/null >/dev/null; -+## & - - ;; - 'stop') diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/qt-embedded-rotation.control b/nonworking/qtopia/qtopia-1.7.0-r0/qt-embedded-rotation.control deleted file mode 100644 index 38b5cccc44..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/qt-embedded-rotation.control +++ /dev/null @@ -1,11 +0,0 @@ -Files: $QTDIR/lib/fonts/helvetica_*_{50,50i,75,75i}.* $QTDIR/lib/fonts/helvetica_*_t*5* $QTDIR/lib/fonts/fixed_*_50.* $QTDIR/lib/fonts/fixed_*_t*5* $QTDIR/lib/fonts/micro_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smallsmooth_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* -Priority: optional -Section: opie/system -Maintainer: Warwick Allison <warwick@trolltech.com> -Architecture: arm -Arch: iPAQ -Depends: libjpeg62 -Version: $QTE_VERSION-$QTE_REVISION -Description: Qt/Embedded 0,90,180 rotation fonts - The iPAQ's "normal" orientation is 270-degree rotated. - These fonts are the fonts for other angles. diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/qtopia-init.control b/nonworking/qtopia/qtopia-1.7.0-r0/qtopia-init.control deleted file mode 100644 index 40b7783c71..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/qtopia-init.control +++ /dev/null @@ -1,8 +0,0 @@ -Package: qtopia-init -Files: etc/init.d/qpe -Priority: optional -Section: base -Maintainer: Warwick Allison <warwick@trolltech.com> -Version: 1.0.0-5 -Architecture: arm -Description: qtopia init diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/qtopia-init.postinst b/nonworking/qtopia/qtopia-1.7.0-r0/qtopia-init.postinst deleted file mode 100644 index 5e106d5d35..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/qtopia-init.postinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -ln -sf /etc/init.d/qpe /etc/rc0.d/K98qpe -ln -sf /etc/init.d/qpe /etc/rc1.d/K98qpe -ln -sf /etc/init.d/qpe /etc/rc6.d/K98qpe -ln -sf /etc/init.d/qpe /etc/rc2.d/S98qpe -ln -sf /etc/init.d/qpe /etc/rc3.d/S98qpe -ln -sf /etc/init.d/qpe /etc/rc4.d/S98qpe -ln -sf /etc/init.d/qpe /etc/rc5.d/S98qpe -exit 0 diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/security.patch b/nonworking/qtopia/qtopia-1.7.0-r0/security.patch deleted file mode 100644 index 40091cc8d6..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/security.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- qtopia-free-1.6.2/src/settings/security/securitybase.ui.orig Tue Jul 22 10:12:20 2003 -+++ qtopia-free-1.7.0/src/settings/security/securitybase.ui Tue Jul 22 10:08:45 2003 -@@ -156,6 +156,12 @@ - <item> - <property> - <name>text</name> -+ <string>192.168.129.0/24</string> -+ </property> -+ </item> -+ <item> -+ <property> -+ <name>text</name> - <string>172.16.0.0/12</string> - </property> - </item> diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/storage.patch b/nonworking/qtopia/qtopia-1.7.0-r0/storage.patch deleted file mode 100644 index 44adbfe765..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/storage.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- qtopia-free-1.7.0/src/libraries/qtopia/storage.cpp.~1~ 2003-06-04 10:56:51.000000000 +1000 -+++ qtopia-free-1.7.0/src/libraries/qtopia/storage.cpp 2003-09-05 17:38:09.000000000 +1000 -@@ -179,6 +179,8 @@ - || fs.left(8) == "/dev/ram" - || fs.left(8) == "/dev/mtd" - || fs.left(9) == "/dev/mmcd" -+ || fs.left( 14 ) == "/dev/mmc/part1" //familiar -+ || fs.left(5)=="tmpfs" || fs.left(9)=="/dev/root" //openzaurus - // "which-qtopia" may be running off the SD card - && (QString(me->mnt_dir)!="/home/QtPalmtop" - && QString(me->mnt_dir)!="/opt/Qtopia") -@@ -232,6 +234,10 @@ - humanname = tr("Internal Storage") + " " + humanname.mid(13); - else if ( humanname.left(8) == "/dev/ram" ) - humanname = tr("RAM disk") + " " + humanname.mid(8); -+ else if ( humanname.left(9) == "/dev/root" ) //openzaurus -+ humanname = tr("Internal Storage") + " " + humanname.mid(9); -+ else if ( humanname.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs -+ humanname = tr("Internal Memory"); - FileSystem *fs = new FileSystem( *it, *fsit, humanname, removable, opts ); - mFileSystems.append( fs ); - } diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/timezones.control b/nonworking/qtopia/qtopia-1.7.0-r0/timezones.control deleted file mode 100644 index 223af8ecdc..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/timezones.control +++ /dev/null @@ -1,11 +0,0 @@ -Package: timezones -Files: etc/zoneinfo -Priority: optional -Section: base -Maintainer: Warwick Allison <warwick@trolltech.com> -Version: 1.0.0-6 -Architecture: arm -Description: Timezone data - These files are not included in the Familiar libc6 package. - This package contains just the non-redundant parts, and uses - about 180K with jffs2. diff --git a/nonworking/qtopia/qtopia-1.7.0-r0/unit_conversion.dat b/nonworking/qtopia/qtopia-1.7.0-r0/unit_conversion.dat deleted file mode 100644 index c19adf197f..0000000000 --- a/nonworking/qtopia/qtopia-1.7.0-r0/unit_conversion.dat +++ /dev/null @@ -1,406 +0,0 @@ -/********************************************************************** -** Copyright (C) 2001 Trolltech AS. All rights reserved. -** -** This file is part of Qtopia Environment. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -STARTTYPE Weight -STND grams - -NAME mg -RATIO 1000 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME g -RATIO 1 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME kg -RATIO 0.001 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME tonnes -RATIO 1e-06 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME carats -RATIO 5 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME oz -RATIO 0.03527336860670194 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME lb -RATIO 0.002204585537918871 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME st -RATIO 0.0001574703955656337 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME St tons -RATIO 1.102292768959636e-06 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME Lg tons -RATIO 9.841899722852103e-07 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - - -ENDTYPE - - - -STARTTYPE Distance -STND m - -NAME mm -RATIO 1000 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME cm -RATIO 100 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME m -RATIO 1 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME km -RATIO 0.001 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME points -RATIO 2834.64566929134 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME in -RATIO 39.3700787401575 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME ft -RATIO 3.280839895013123 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME yd -RATIO 1.093613298337708 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME mi -RATIO 0.0006213711922373339 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME naut. mi -RATIO 0.0005399568034557236 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - - -ENDTYPE - - - -STARTTYPE Area -STND sq m - -NAME sq mm -RATIO 1000000 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME sq cm -RATIO 10000 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME sq m -RATIO 1 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME sq km -RATIO 1e-06 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME hectares -RATIO 0.0001 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME sq in -RATIO 1550.0031000062 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME sq ft -RATIO 10.7639104167097 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME sq yd -RATIO 1.19599004630108 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME sq mi -RATIO 0.000000386102158542446 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME acres -RATIO 0.0002471053814671653 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - - -ENDTYPE - -STARTTYPE Temperatures -STND °C - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - -NAME °C -RATIO 1.0 -PREOFF 0.0 -POSTOFF 0.0 - -NAME °F -RATIO 1.8 -PREOFF -32.0 -POSTOFF +32.0 - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - -ENDTYPE - - -STARTTYPE Volume -STND litres - -NAME cu cm -RATIO 1000 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME ml -RATIO 1000 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME l -RATIO 1 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME tblspoon -RATIO 67.6280454036859 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME teaspoons -RATIO 202.884136211058 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME cu in -RATIO 61.0237440947323 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME cu ft -RATIO 0.0353146667214886 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME pt -RATIO 2.11337641886519 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME qt -RATIO 1.05668820943259 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME gal (US) -RATIO 0.264172052358148 -PREOFF 0.0 -POSTOFF 0.0 - - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - - -NAME -RATIO 1. -PREOFF 0.0 -POSTOFF 0.0 - - -ENDTYPE - -Extra units - -NAME fl oz (US) -RATIO 33.8140227018429 -PREOFF 0.0 -POSTOFF 0.0 - - diff --git a/nonworking/qtopia/qtopia_1.7.0.bb b/nonworking/qtopia/qtopia_1.7.0.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/qtopia/qtopia_1.7.0.bb +++ /dev/null diff --git a/nonworking/qualendar/qualendar_0.8.0.bb b/nonworking/qualendar/qualendar_0.8.0.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/qualendar/qualendar_0.8.0.bb +++ /dev/null diff --git a/nonworking/r/r_1.9.1.bb b/nonworking/r/r_1.9.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/r/r_1.9.1.bb +++ /dev/null diff --git a/nonworking/redland/redland_0.9.10.bb b/nonworking/redland/redland_0.9.10.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/redland/redland_0.9.10.bb +++ /dev/null diff --git a/nonworking/redland/redland_0.9.16.bb b/nonworking/redland/redland_0.9.16.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/redland/redland_0.9.16.bb +++ /dev/null diff --git a/nonworking/snmpz/snmpz_1.1.bb b/nonworking/snmpz/snmpz_1.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/snmpz/snmpz_1.1.bb +++ /dev/null diff --git a/nonworking/tetex/tetex-2.0.2/configure.patch b/nonworking/tetex/tetex-2.0.2/configure.patch deleted file mode 100644 index 66b1967742..0000000000 --- a/nonworking/tetex/tetex-2.0.2/configure.patch +++ /dev/null @@ -1,2222 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- tetex-src-2.0.2/libs/xpdf/configure.in~configure 2002-12-05 18:44:31.000000000 -0500 -+++ tetex-src-2.0.2/libs/xpdf/configure.in 2004-01-26 20:17:53.000000000 -0500 -@@ -1,25 +1,35 @@ - dnl Process this file with autoconf to produce a configure script. - dnl Copyright 1998-2002 Glyph & Cog, LLC - --AC_INIT(xpdf/xpdf.cc) -+AC_INIT -+AC_CONFIG_SRCDIR([xpdf/xpdf.cc]) - AC_CONFIG_HEADER(aconf.h) - - dnl ##### Optional features. - AC_ARG_ENABLE(a4-paper, - [ --enable-a4-paper use A4 paper size instead of Letter for - PostScript output], -+AH_TEMPLATE([A4_PAPER], [Define if using A4 paper size instead of Letter for PS output]) - AC_DEFINE(A4_PAPER)) -+ - AC_ARG_ENABLE(no-text-select, - [ --enable-no-text-select do not allow text selection], -+AH_TEMPLATE([NO_TEXT_SELECT], [Define if not allowing text selection]) - AC_DEFINE(NO_TEXT_SELECT)) -+ - AC_ARG_ENABLE(opi, - [ --enable-opi include support for OPI comments], -+AH_TEMPLATE([OPI_SUPPORT], [Define if including support for OPI comments]) - AC_DEFINE(OPI_SUPPORT)) -+ - AC_ARG_ENABLE(multithreaded, - [ --enable-multithreaded include support for multithreading], -+AH_TEMPLATE([MULTITHREADED], [Define if including support for multithreading]) - AC_DEFINE(MULTITHREADED)) -+ - AC_ARG_WITH(appdef-dir, - [ --with-appdef-dir set app-defaults directory], -+AH_TEMPLATE([APPDEFDIR], [Set to app-defaults directory]) - AC_DEFINE_UNQUOTED(APPDEFDIR, "$with_appdef_dir")) - - dnl ##### Path to xpdfrc. -@@ -34,12 +44,13 @@ - else - system_xpdfrc="$sysconfdir/xpdfrc" - fi -+AH_TEMPLATE([SYSTEM_XPDFRC], [Set to path to the xpdfrc]) - AC_DEFINE_UNQUOTED(SYSTEM_XPDFRC, "$system_xpdfrc") - - dnl ##### Checks for programs. - AC_PROG_CC - AC_ISC_POSIX --AC_PROG_CC_STDC -+ - #if test -z "$CXX" -a "$CC" = "gcc"; then - # CXX="gcc" - #fi -@@ -56,9 +67,7 @@ - dnl ##### Check for OS/2. - AC_CACHE_CHECK([for OS/2 (with EMX)], - xpdf_cv_sys_os2, --[AC_TRY_COMPILE([], --[__EMX__], --xpdf_cv_sys_os2=yes, xpdf_cv_sys_os2=no)]) -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[__EMX__]])],[xpdf_cv_sys_os2=yes],[xpdf_cv_sys_os2=no])]) - if test "$xpdf_cv_sys_os2" = yes; then - EXE=".exe" - LIBPREFIX="" -@@ -68,9 +77,7 @@ - dnl ##### Check for DOS (with DJGPP). - AC_CACHE_CHECK([for DOS (with DJGPP)], - xpdf_cv_sys_dos, --[AC_TRY_COMPILE([], --[__DJGPP__], --xpdf_cv_sys_dos=yes, xpdf_cv_sys_dos=no)]) -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[__DJGPP__]])],[xpdf_cv_sys_dos=yes],[xpdf_cv_sys_dos=no])]) - if test "$xpdf_cv_sys_dos" = yes; then - EXE=".exe" - LIBPREFIX="lib" -@@ -91,7 +98,7 @@ - dnl ##### Switch over to C++. This will make the checks below a little - dnl ##### bit stricter (requiring function prototypes in include files). - dnl ##### (99% of xpdf is written in C++.) --AC_LANG_CPLUSPLUS -+AC_LANG([C++]) - - dnl ##### Check for extra libraries needed by X. (LynxOS needs this.) - AC_CHECK_FUNC(gethostbyname) -@@ -100,34 +107,33 @@ - fi - - dnl ##### Look for header that defines select() and fd_set. -+AH_TEMPLATE([HAVE_SYS_SELECT_H], [Define if you have sys/select.h]) -+AH_TEMPLATE([HAVE_SYS_BSDTYPES_H], [Define if you have sys/bsdtypes.h]) - AC_MSG_CHECKING([select() and fd_set in sys/select.h and sys/bsdtypes.h]) --AC_TRY_COMPILE([#include <stdlib.h> -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h> - #include <stddef.h> - #include <unistd.h> --#include <sys/types.h>], -- [fd_set fds; --select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no) -+#include <sys/types.h>]], [[fd_set fds; -+select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no]) - if test $xpdf_ok = yes; then - AC_MSG_RESULT([not needed]) - else -- AC_TRY_COMPILE([#include <stdlib.h> -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h> - #include <stddef.h> - #include <unistd.h> - #include <sys/types.h> --#include <sys/select.h>], -- [fd_set fds; --select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no) -+#include <sys/select.h>]], [[fd_set fds; -+select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no]) - if test $xpdf_ok = yes; then - AC_DEFINE(HAVE_SYS_SELECT_H) - AC_MSG_RESULT([need sys/select.h]) - else -- AC_TRY_COMPILE([#include <stdlib.h> -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h> - #include <stddef.h> - #include <unistd.h> - #include <sys/types.h> --#include <sys/bsdtypes.h>], -- [fd_set fds; --select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no) -+#include <sys/bsdtypes.h>]], [[fd_set fds; -+select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no]) - if test $xpdf_ok = yes; then - AC_DEFINE(HAVE_SYS_BSDTYPES_H) - AC_MSG_RESULT([need sys/bsdtypes.h]) -@@ -138,34 +144,33 @@ - fi - - dnl ##### Look for header that defines FD_ZERO. -+AH_TEMPLATE([HAVE_STRINGS_H], [Define if you need to include strings.h.]) -+AH_TEMPLATE([HAVE_BSTRING_H], [Define if you need to include bstring.h.]) - AC_MSG_CHECKING([FD_ZERO and strings.h or bstring.h]) --AC_TRY_COMPILE([#include <stdlib.h> -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h> - #include <sys/types.h> - #ifdef HAVE_SYS_SELECT_H - #include <sys/select.h> --#endif], --[fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no) -+#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no]) - if test $xpdf_ok = yes; then - AC_MSG_RESULT([not needed]) - else -- AC_TRY_COMPILE([#include <stdlib.h> -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h> - #include <sys/types.h> - #include <strings.h> - #ifdef HAVE_SYS_SELECT_H - #include <sys/select.h> --#endif], -- [fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no) -+#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no]) - if test $xpdf_ok = yes; then - AC_DEFINE(HAVE_STRINGS_H) - AC_MSG_RESULT([need strings.h]) - else -- AC_TRY_COMPILE([#include <stdlib.h> -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h> - #include <sys/types.h> - #include <bstring.h> - #ifdef HAVE_SYS_SELECT_H - #include <sys/select.h> --#endif], -- [fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no) -+#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no]) - if test $xpdf_ok = yes; then - AC_DEFINE(HAVE_BSTRING_H) - AC_MSG_RESULT([need bstring.h]) -@@ -186,46 +191,44 @@ - dnl # This should use 'AC_CHECK_FUNCS(mkstemp)' but that fails if - dnl # the mkstemp exists in the library but isn't declared in the - dnl # include file (e.g., in cygwin 1.1.2). -+AH_TEMPLATE([HAVE_MKSTEMP], [Define if we have mkstemp]) - AC_CACHE_CHECK([for mkstemp], - xpdf_cv_func_mkstemp, --[AC_TRY_LINK([#include <stdlib.h> --#include <unistd.h>], --[mkstemp("foo");], --xpdf_cv_func_mkstemp=yes, xpdf_cv_func_mkstemp=no)]) -+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h> -+#include <unistd.h>]], [[mkstemp("foo");]])],[xpdf_cv_func_mkstemp=yes],[xpdf_cv_func_mkstemp=no])]) - if test "$xpdf_cv_func_mkstemp" = yes; then - AC_DEFINE(HAVE_MKSTEMP) - fi -+AH_TEMPLATE([HAVE_MKSTEMPS], [Define if we have mkstemps]) - dnl # Check for mkstemps, just like mkstemp. - AC_CACHE_CHECK([for mkstemps], - xpdf_cv_func_mkstemps, --[AC_TRY_LINK([#include <stdlib.h> --#include <unistd.h>], --[mkstemps("foo", 0);], --xpdf_cv_func_mkstemps=yes, xpdf_cv_func_mkstemps=no)]) -+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h> -+#include <unistd.h>]], [[mkstemps("foo", 0);]])],[xpdf_cv_func_mkstemps=yes],[xpdf_cv_func_mkstemps=no])]) - if test "$xpdf_cv_func_mkstemps" = yes; then - AC_DEFINE(HAVE_MKSTEMPS) - fi - -+AH_TEMPLATE([SELECT_TAKES_INT], [Define if select takes an int * argument instead of fd_set *]) - dnl ##### Check select argument type: on HP-UX before version 10, select - dnl ##### takes (int *) instead of (fd_set *). - AC_CACHE_CHECK([whether select takes fd_set arguments], - xpdf_cv_func_select_arg, --[AC_TRY_COMPILE([#include <sys/types.h> -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> - #include <sys/time.h> - #include <unistd.h> - #ifdef HAVE_SYS_SELECT_H - #include <sys/select.h> --#endif], --[fd_set fds; --select(1, &fds, &fds, &fds, 0);], --xpdf_cv_func_select_arg=yes, xpdf_cv_func_select_arg=no)]) -+#endif]], [[fd_set fds; -+select(1, &fds, &fds, &fds, 0);]])],[xpdf_cv_func_select_arg=yes],[xpdf_cv_func_select_arg=no])]) - if test "$xpdf_cv_func_select_arg" != yes; then - AC_DEFINE(SELECT_TAKES_INT) - fi - - dnl ##### Back to C for the library tests. --AC_LANG_C -+AC_LANG([C]) - -+AH_TEMPLATE([HAVE_FSEEK64], [Define if we have fseek64/ftell64]) - dnl ##### Check for fseeko/ftello or fseek64/ftell64 - dnl The LARGEFILE and FSEEKO macros have to be called in C, not C++, mode. - AC_SYS_LARGEFILE -@@ -289,6 +292,7 @@ - dnl ##### Look for FreeType 2.0.5+ first, and then FreeType 1.x. - dnl ##### (Note: FT_Get_Name_Index was added in FT 2.0.5, and is - dnl ##### the reason that Xpdf requires 2.0.5+.) -+AH_TEMPLATE([FREETYPE2], [Define if using freetype2]) - if test -z "$no_x"; then - smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+], - FT_Get_Name_Index, freetype/freetype.h, -@@ -334,7 +338,8 @@ - AC_SUBST(XPDF_TARGET) - - dnl ##### Write the makefiles. --AC_OUTPUT(Makefile xpdf/Makefile goo/Makefile) -+AC_CONFIG_FILES([Makefile xpdf/Makefile goo/Makefile]) -+AC_OUTPUT - - dnl ##### Warn user if X is missing. - if test -n "$no_x"; then ---- tetex-src-2.0.2/./texk/etc/autoconf/acspecific.m4~configure 2003-02-18 01:46:57.000000000 -0500 -+++ tetex-src-2.0.2/./texk/etc/autoconf/acspecific.m4 2004-01-26 20:17:53.000000000 -0500 -@@ -56,7 +56,7 @@ - dnl checking messages from result messages. - dnl Idea borrowed from dist 3.0. - dnl Internal use only. --AC_DEFUN(AC_PROG_ECHO_N, -+AC_DEFUN([AC_PROG_ECHO_N], - [if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -@@ -70,7 +70,7 @@ - fi - ]) - --AC_DEFUN(AC_PROG_CC, -+AC_DEFUN([AC_PROG_CC], - [AC_BEFORE([$0], [AC_PROG_CPP])dnl - AC_CHECK_PROG(CC, gcc, gcc) - if test -z "$CC"; then -@@ -117,7 +117,7 @@ - fi - ]) - --AC_DEFUN(AC_PROG_CXX, -+AC_DEFUN([AC_PROG_CXX], - [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl - AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, gcc) - -@@ -166,7 +166,7 @@ - dnl 77 compilers. - dnl - dnl AC_PROG_F77() --AC_DEFUN(AC_PROG_F77, -+AC_DEFUN([AC_PROG_F77], - [AC_BEFORE([$0], [AC_PROG_CPP])dnl - if test -z "$F77"; then - AC_CHECK_PROGS(F77, g77 f77 f2c) -@@ -198,7 +198,7 @@ - fi - ]) - --AC_DEFUN(AC_PROG_CC_WORKS, -+AC_DEFUN([AC_PROG_CC_WORKS], - [AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) works]) - AC_LANG_SAVE - AC_LANG_C -@@ -213,7 +213,7 @@ - cross_compiling=$ac_cv_prog_cc_cross - ]) - --AC_DEFUN(AC_PROG_CXX_WORKS, -+AC_DEFUN([AC_PROG_CXX_WORKS], - [AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS -@@ -234,7 +234,7 @@ - dnl compiler is `g77'). - dnl - dnl AC_PROG_F77_WORKS() --AC_DEFUN(AC_PROG_F77_WORKS, -+AC_DEFUN([AC_PROG_F77_WORKS], - [AC_MSG_CHECKING([whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works]) - AC_LANG_SAVE - AC_LANG_FORTRAN77 -@@ -252,7 +252,7 @@ - cross_compiling=$ac_cv_prog_f77_cross - ]) - --AC_DEFUN(AC_PROG_CC_GNU, -+AC_DEFUN([AC_PROG_CC_GNU], - [AC_CACHE_CHECK(whether we are using GNU C, ac_cv_prog_gcc, - [dnl The semicolon is to pacify NeXT's syntax-checking cpp. - cat > conftest.c <<EOF -@@ -266,7 +266,7 @@ - ac_cv_prog_gcc=no - fi])]) - --AC_DEFUN(AC_PROG_CXX_GNU, -+AC_DEFUN([AC_PROG_CXX_GNU], - [AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx, - [dnl The semicolon is to pacify NeXT's syntax-checking cpp. - cat > conftest.C <<EOF -@@ -285,7 +285,7 @@ - dnl do CPP pre-processing. - dnl - dnl AC_PROG_F77_GNU() --AC_DEFUN(AC_PROG_F77_GNU, -+AC_DEFUN([AC_PROG_F77_GNU], - [AC_CACHE_CHECK(whether we are using GNU Fortran 77, ac_cv_prog_g77, - [cat > conftest.fpp <<EOF - #ifdef __GNUC__ -@@ -298,7 +298,7 @@ - ac_cv_prog_g77=no - fi])]) - --AC_DEFUN(AC_PROG_CC_G, -+AC_DEFUN([AC_PROG_CC_G], - [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g, - [echo 'void f(){}' > conftest.c - if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then -@@ -309,7 +309,7 @@ - rm -f conftest* - ])]) - --AC_DEFUN(AC_PROG_CXX_G, -+AC_DEFUN([AC_PROG_CXX_G], - [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g, - [echo 'void f(){}' > conftest.cc - if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then -@@ -324,7 +324,7 @@ - dnl enable debugging. - dnl - dnl AC_PROG_F77_G() --AC_DEFUN(AC_PROG_F77_G, -+AC_DEFUN([AC_PROG_F77_G], - [AC_CACHE_CHECK(whether $F77 accepts -g, ac_cv_prog_f77_g, - [cat > conftest.f << EOF - program conftest -@@ -338,7 +338,7 @@ - rm -f conftest* - ])]) - --AC_DEFUN(AC_PROG_GCC_TRADITIONAL, -+AC_DEFUN([AC_PROG_GCC_TRADITIONAL], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_CPP])dnl - if test $ac_cv_prog_gcc = yes; then -@@ -360,7 +360,7 @@ - fi - ]) - --AC_DEFUN(AC_PROG_CC_C_O, -+AC_DEFUN([AC_PROG_CC_C_O], - [if test "x$CC" != xcc; then - AC_MSG_CHECKING(whether $CC and cc understand -c and -o together) - else -@@ -416,7 +416,7 @@ - dnl completeness, since a similar test exists for the C compiler. - dnl - dnl AC_PROG_F77_C_O --AC_DEFUN(AC_PROG_F77_C_O, -+AC_DEFUN([AC_PROG_F77_C_O], - [AC_BEFORE([$0], [AC_PROG_F77])dnl - AC_MSG_CHECKING(whether $F77 understand -c and -o together) - set dummy $F77; ac_f77="`echo [$]2 | -@@ -448,7 +448,7 @@ - ]) - - dnl Define SET_MAKE to set ${MAKE} if make doesn't. --AC_DEFUN(AC_PROG_MAKE_SET, -+AC_DEFUN([AC_PROG_MAKE_SET], - [AC_MSG_CHECKING(whether ${MAKE-make} sets \${MAKE}) - set dummy ${MAKE-make}; ac_make=`echo "[$]2" | sed 'y%./+-%__p_%'` - AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set, -@@ -476,17 +476,17 @@ - AC_SUBST([SET_MAKE])dnl - ]) - --AC_DEFUN(AC_PROG_RANLIB, -+AC_DEFUN([AC_PROG_RANLIB], - [AC_CHECK_PROG(RANLIB, ranlib, ranlib, :)]) - - dnl Check for mawk first since it's generally faster. --AC_DEFUN(AC_PROG_AWK, -+AC_DEFUN([AC_PROG_AWK], - [AC_CHECK_PROGS(AWK, mawk gawk nawk awk, )]) - --AC_DEFUN(AC_PROG_YACC, -+AC_DEFUN([AC_PROG_YACC], - [AC_CHECK_PROGS(YACC, 'bison -y' byacc, yacc)]) - --AC_DEFUN(AC_PROG_CPP, -+AC_DEFUN([AC_PROG_CPP], - [AC_MSG_CHECKING(how to run the C preprocessor) - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then -@@ -518,7 +518,7 @@ - AC_SUBST(CPP)dnl - ]) - --AC_DEFUN(AC_PROG_CXXCPP, -+AC_DEFUN([AC_PROG_CXXCPP], - [AC_MSG_CHECKING(how to run the C++ preprocessor) - if test -z "$CXXCPP"; then - AC_CACHE_VAL(ac_cv_prog_CXXCPP, -@@ -537,10 +537,10 @@ - - dnl Require finding the C or C++ preprocessor, whichever is the - dnl current language. --AC_DEFUN(AC_REQUIRE_CPP, -+AC_DEFUN([AC_REQUIRE_CPP], - [ifelse(AC_LANG, C, [AC_REQUIRE([AC_PROG_CPP])], [AC_REQUIRE([AC_PROG_CXXCPP])])]) - --AC_DEFUN(AC_PROG_LEX, -+AC_DEFUN([AC_PROG_LEX], - [AC_CHECK_PROG(LEX, flex, flex, lex) - if test -z "$LEXLIB" - then -@@ -554,7 +554,7 @@ - - dnl Check if lex declares yytext as a char * by default, not a char[]. - undefine([AC_DECL_YYTEXT]) --AC_DEFUN(AC_DECL_YYTEXT, -+AC_DEFUN([AC_DECL_YYTEXT], - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([AC_PROG_LEX])dnl - AC_CACHE_CHECK(lex output file root, ac_cv_prog_lex_root, -@@ -660,7 +660,7 @@ - fi - ]) - --AC_DEFUN(AC_PROG_INSTALL, -+AC_DEFUN([AC_PROG_INSTALL], - [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or -@@ -730,7 +730,7 @@ - AC_SUBST(INSTALL_DATA)dnl - ]) - --AC_DEFUN(AC_PROG_LN_S, -+AC_DEFUN([AC_PROG_LN_S], - [AC_MSG_CHECKING(whether ln -s works) - AC_CACHE_VAL(ac_cv_prog_LN_S, - [rm -f conftestdata -@@ -752,7 +752,7 @@ - AC_SUBST(LN_S)dnl - ]) - --define(AC_RSH, -+define([AC_RSH], - [errprint(__file__:__line__: [$0] has been removed; replace it with equivalent code - )m4exit(4)]) - -@@ -760,7 +760,7 @@ - dnl ### Checks for header files - - --AC_DEFUN(AC_HEADER_STDC, -+AC_DEFUN([AC_HEADER_STDC], - [AC_REQUIRE_CPP()dnl - AC_CACHE_CHECK(for ANSI C header files, ac_cv_header_stdc, - [AC_TRY_CPP([#include <stdlib.h> -@@ -794,11 +794,11 @@ - fi - ]) - --AC_DEFUN(AC_UNISTD_H, -+AC_DEFUN([AC_UNISTD_H], - [AC_OBSOLETE([$0], [; instead use AC_CHECK_HEADERS(unistd.h)])dnl - AC_CHECK_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H))]) - --AC_DEFUN(AC_USG, -+AC_DEFUN([AC_USG], - [AC_OBSOLETE([$0], - [; instead use AC_CHECK_HEADERS(string.h) and HAVE_STRING_H])dnl - AC_MSG_CHECKING([for BSD string and memory functions]) -@@ -808,7 +808,7 @@ - - dnl If memchr and the like aren't declared in <string.h>, include <memory.h>. - dnl To avoid problems, don't check for gcc2 built-ins. --AC_DEFUN(AC_MEMORY_H, -+AC_DEFUN([AC_MEMORY_H], - [AC_OBSOLETE([$0], [; instead use AC_CHECK_HEADERS(memory.h) and HAVE_MEMORY_H])dnl - AC_MSG_CHECKING(whether string.h declares mem functions) - AC_EGREP_HEADER(memchr, string.h, ac_found=yes, ac_found=no) -@@ -818,7 +818,7 @@ - fi - ]) - --AC_DEFUN(AC_HEADER_MAJOR, -+AC_DEFUN([AC_HEADER_MAJOR], - [AC_CACHE_CHECK(whether sys/types.h defines makedev, - ac_cv_header_sys_types_h_makedev, - [AC_TRY_LINK([#include <sys/types.h>], [return makedev(0, 0);], -@@ -834,7 +834,7 @@ - fi - ]) - --AC_DEFUN(AC_HEADER_DIRENT, -+AC_DEFUN([AC_HEADER_DIRENT], - [ac_header_dirent=no - AC_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h, - [ac_header_dirent=$ac_hdr; break]) -@@ -849,7 +849,7 @@ - dnl Like AC_CHECK_HEADER, except also make sure that HEADER-FILE - dnl defines the type `DIR'. dirent.h on NextStep 3.2 doesn't. - dnl AC_CHECK_HEADER_DIRENT(HEADER-FILE, ACTION-IF-FOUND) --AC_DEFUN(AC_CHECK_HEADER_DIRENT, -+AC_DEFUN([AC_CHECK_HEADER_DIRENT], - [ac_safe=`echo "$1" | sed 'y%./+-%__p_%'` - AC_MSG_CHECKING([for $1 that defines DIR]) - AC_CACHE_VAL(ac_cv_header_dirent_$ac_safe, -@@ -868,7 +868,7 @@ - dnl Like AC_CHECK_HEADERS, except succeed only for a HEADER-FILE that - dnl defines `DIR'. - dnl AC_CHECK_HEADERS_DIRENT(HEADER-FILE... [, ACTION]) --define(AC_CHECK_HEADERS_DIRENT, -+define([AC_CHECK_HEADERS_DIRENT], - [for ac_hdr in $1 - do - AC_CHECK_HEADER_DIRENT($ac_hdr, -@@ -878,7 +878,7 @@ - AC_DEFINE_UNQUOTED($ac_tr_hdr) $2])dnl - done]) - --AC_DEFUN(AC_DIR_HEADER, -+AC_DEFUN([AC_DIR_HEADER], - [AC_OBSOLETE([$0], [; instead use AC_HEADER_DIRENT])dnl - ac_header_dirent=no - for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do -@@ -902,7 +902,7 @@ - fi - ]) - --AC_DEFUN(AC_HEADER_STAT, -+AC_DEFUN([AC_HEADER_STAT], - [AC_CACHE_CHECK(whether stat file-mode macros are broken, - ac_cv_header_stat_broken, - [AC_EGREP_CPP([You lose], [#include <sys/types.h> -@@ -937,7 +937,7 @@ - fi - ]) - --AC_DEFUN(AC_DECL_SYS_SIGLIST, -+AC_DEFUN([AC_DECL_SYS_SIGLIST], - [AC_CACHE_CHECK([for sys_siglist declaration in signal.h or unistd.h], - ac_cv_decl_sys_siglist, - [AC_TRY_COMPILE([#include <sys/types.h> -@@ -952,7 +952,7 @@ - fi - ]) - --AC_DEFUN(AC_HEADER_SYS_WAIT, -+AC_DEFUN([AC_HEADER_SYS_WAIT], - [AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible], - ac_cv_header_sys_wait_h, - [AC_TRY_COMPILE([#include <sys/types.h> -@@ -975,7 +975,7 @@ - dnl ### Checks for typedefs - - --AC_DEFUN(AC_TYPE_GETGROUPS, -+AC_DEFUN([AC_TYPE_GETGROUPS], - [AC_REQUIRE([AC_TYPE_UID_T])dnl - AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups, - [AC_TRY_RUN( -@@ -1015,7 +1015,7 @@ - AC_DEFINE_UNQUOTED(GETGROUPS_T, $ac_cv_type_getgroups) - ]) - --AC_DEFUN(AC_TYPE_UID_T, -+AC_DEFUN([AC_TYPE_UID_T], - [AC_CACHE_CHECK(for uid_t in sys/types.h, ac_cv_type_uid_t, - [AC_EGREP_HEADER(uid_t, sys/types.h, - ac_cv_type_uid_t=yes, ac_cv_type_uid_t=no)]) -@@ -1025,20 +1025,20 @@ - fi - ]) - --AC_DEFUN(AC_TYPE_SIZE_T, -+AC_DEFUN([AC_TYPE_SIZE_T], - [AC_CHECK_TYPE(size_t, unsigned)]) - --AC_DEFUN(AC_TYPE_PID_T, -+AC_DEFUN([AC_TYPE_PID_T], - [AC_CHECK_TYPE(pid_t, int)]) - --AC_DEFUN(AC_TYPE_OFF_T, -+AC_DEFUN([AC_TYPE_OFF_T], - [AC_CHECK_TYPE(off_t, long)]) - --AC_DEFUN(AC_TYPE_MODE_T, -+AC_DEFUN([AC_TYPE_MODE_T], - [AC_CHECK_TYPE(mode_t, int)]) - - dnl Note that identifiers starting with SIG are reserved by ANSI C. --AC_DEFUN(AC_TYPE_SIGNAL, -+AC_DEFUN([AC_TYPE_SIGNAL], - [AC_CACHE_CHECK([return type of signal handlers], ac_cv_type_signal, - [AC_TRY_COMPILE([#include <sys/types.h> - #include <signal.h> -@@ -1059,7 +1059,7 @@ - dnl ### Checks for functions - - --AC_DEFUN(AC_FUNC_CLOSEDIR_VOID, -+AC_DEFUN([AC_FUNC_CLOSEDIR_VOID], - [AC_REQUIRE([AC_HEADER_DIRENT])dnl - AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void, - [AC_TRY_RUN([#include <sys/types.h> -@@ -1071,7 +1071,7 @@ - fi - ]) - --AC_DEFUN(AC_FUNC_FNMATCH, -+AC_DEFUN([AC_FUNC_FNMATCH], - [AC_CACHE_CHECK(for working fnmatch, ac_cv_func_fnmatch_works, - # Some versions of Solaris or SCO have a broken fnmatch function. - # So we run a test program. If we are cross-compiling, take no chance. -@@ -1084,7 +1084,7 @@ - fi - ]) - --AC_DEFUN(AC_FUNC_MMAP, -+AC_DEFUN([AC_FUNC_MMAP], - [AC_CHECK_HEADERS(unistd.h) - AC_CHECK_FUNCS(getpagesize) - AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, -@@ -1231,7 +1231,7 @@ - fi - ]) - --AC_DEFUN(AC_FUNC_GETPGRP, -+AC_DEFUN([AC_FUNC_GETPGRP], - [AC_CACHE_CHECK(whether getpgrp takes no argument, ac_cv_func_getpgrp_void, - [AC_TRY_RUN([ - /* -@@ -1292,7 +1292,7 @@ - fi - ]) - --AC_DEFUN(AC_FUNC_SETPGRP, -+AC_DEFUN([AC_FUNC_SETPGRP], - [AC_CACHE_CHECK(whether setpgrp takes no argument, ac_cv_func_setpgrp_void, - AC_TRY_RUN([ - #ifdef HAVE_UNISTD_H -@@ -1318,14 +1318,14 @@ - fi - ]) - --AC_DEFUN(AC_FUNC_VPRINTF, -+AC_DEFUN([AC_FUNC_VPRINTF], - [AC_CHECK_FUNC(vprintf, AC_DEFINE(HAVE_VPRINTF)) - if test "$ac_cv_func_vprintf" != yes; then - AC_CHECK_FUNC(_doprnt, AC_DEFINE(HAVE_DOPRNT)) - fi - ]) - --AC_DEFUN(AC_FUNC_VFORK, -+AC_DEFUN([AC_FUNC_VFORK], - [AC_REQUIRE([AC_TYPE_PID_T])dnl - AC_CHECK_HEADER(vfork.h, AC_DEFINE(HAVE_VFORK_H)) - AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works, -@@ -1428,7 +1428,7 @@ - fi - ]) - --AC_DEFUN(AC_FUNC_WAIT3, -+AC_DEFUN([AC_FUNC_WAIT3], - [AC_CACHE_CHECK(for wait3 that fills in rusage, ac_cv_func_wait3_rusage, - [AC_TRY_RUN([#include <sys/types.h> - #include <sys/time.h> -@@ -1464,7 +1464,7 @@ - fi - ]) - --AC_DEFUN(AC_FUNC_ALLOCA, -+AC_DEFUN([AC_FUNC_ALLOCA], - [AC_REQUIRE_CPP()dnl Set CPP; we run AC_EGREP_CPP conditionally. - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! -@@ -1549,7 +1549,7 @@ - AC_SUBST(ALLOCA)dnl - ]) - --AC_DEFUN(AC_FUNC_GETLOADAVG, -+AC_DEFUN([AC_FUNC_GETLOADAVG], - [ac_have_func=no # yes means we've found a way to get the load average. - - # Some systems with -lutil have (and need) -lkvm as well, some do not. -@@ -1651,7 +1651,7 @@ - AC_SUBST(KMEM_GROUP)dnl - ]) - --AC_DEFUN(AC_FUNC_UTIME_NULL, -+AC_DEFUN([AC_FUNC_UTIME_NULL], - [AC_CACHE_CHECK(whether utime accepts a null argument, ac_cv_func_utime_null, - [rm -f conftestdata; > conftestdata - # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. -@@ -1670,7 +1670,7 @@ - fi - ]) - --AC_DEFUN(AC_FUNC_STRCOLL, -+AC_DEFUN([AC_FUNC_STRCOLL], - [AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works, - [AC_TRY_RUN([#include <string.h> - main () -@@ -1685,7 +1685,7 @@ - fi - ]) - --AC_DEFUN(AC_FUNC_SETVBUF_REVERSED, -+AC_DEFUN([AC_FUNC_SETVBUF_REVERSED], - [AC_CACHE_CHECK(whether setvbuf arguments are reversed, - ac_cv_func_setvbuf_reversed, - [AC_TRY_RUN([#include <stdio.h> -@@ -1705,21 +1705,21 @@ - fi - ]) - --AC_DEFUN(AC_FUNC_GETMNTENT, -+AC_DEFUN([AC_FUNC_GETMNTENT], - [# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware. - AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS", - [AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS", - [AC_CHECK_LIB(gen, getmntent, LIBS="-lgen $LIBS")])]) - AC_CHECK_FUNC(getmntent, [AC_DEFINE(HAVE_GETMNTENT)])]) - --AC_DEFUN(AC_FUNC_STRFTIME, -+AC_DEFUN([AC_FUNC_STRFTIME], - [AC_CHECK_FUNC(strftime, [AC_DEFINE(HAVE_STRFTIME)], - [# strftime is in -lintl on SCO UNIX. - AC_CHECK_LIB(intl, strftime, - [AC_DEFINE(HAVE_STRFTIME) - LIBS="-lintl $LIBS"])])]) - --AC_DEFUN(AC_FUNC_MEMCMP, -+AC_DEFUN([AC_FUNC_MEMCMP], - [AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean, - [AC_TRY_RUN([ - main() -@@ -1733,7 +1733,7 @@ - AC_SUBST(LIBOBJS)dnl - ]) - --AC_DEFUN(AC_FUNC_SELECT_ARGTYPES, -+AC_DEFUN([AC_FUNC_SELECT_ARGTYPES], - [AC_MSG_CHECKING([types of arguments for select()]) - AC_CACHE_VAL(ac_cv_func_select_arg234,dnl - [AC_CACHE_VAL(ac_cv_func_select_arg1,dnl -@@ -1777,7 +1777,7 @@ - dnl ### Checks for structure members - - --AC_DEFUN(AC_HEADER_TIME, -+AC_DEFUN([AC_HEADER_TIME], - [AC_CACHE_CHECK([whether time.h and sys/time.h may both be included], - ac_cv_header_time, - [AC_TRY_COMPILE([#include <sys/types.h> -@@ -1789,7 +1789,7 @@ - fi - ]) - --AC_DEFUN(AC_STRUCT_TM, -+AC_DEFUN([AC_STRUCT_TM], - [AC_CACHE_CHECK([whether struct tm is in sys/time.h or time.h], - ac_cv_struct_tm, - [AC_TRY_COMPILE([#include <sys/types.h> -@@ -1801,7 +1801,7 @@ - fi - ]) - --AC_DEFUN(AC_STRUCT_TIMEZONE, -+AC_DEFUN([AC_STRUCT_TIMEZONE], - [AC_REQUIRE([AC_STRUCT_TM])dnl - AC_CACHE_CHECK([for tm_zone in struct tm], ac_cv_struct_tm_zone, - [AC_TRY_COMPILE([#include <sys/types.h> -@@ -1825,7 +1825,7 @@ - fi - ]) - --AC_DEFUN(AC_STRUCT_ST_BLOCKS, -+AC_DEFUN([AC_STRUCT_ST_BLOCKS], - [AC_CACHE_CHECK([for st_blocks in struct stat], ac_cv_struct_st_blocks, - [AC_TRY_COMPILE([#include <sys/types.h> - #include <sys/stat.h>], [struct stat s; s.st_blocks;], -@@ -1838,7 +1838,7 @@ - AC_SUBST(LIBOBJS)dnl - ]) - --AC_DEFUN(AC_STRUCT_ST_BLKSIZE, -+AC_DEFUN([AC_STRUCT_ST_BLKSIZE], - [AC_CACHE_CHECK([for st_blksize in struct stat], ac_cv_struct_st_blksize, - [AC_TRY_COMPILE([#include <sys/types.h> - #include <sys/stat.h>], [struct stat s; s.st_blksize;], -@@ -1848,7 +1848,7 @@ - fi - ]) - --AC_DEFUN(AC_STRUCT_ST_RDEV, -+AC_DEFUN([AC_STRUCT_ST_RDEV], - [AC_CACHE_CHECK([for st_rdev in struct stat], ac_cv_struct_st_rdev, - [AC_TRY_COMPILE([#include <sys/types.h> - #include <sys/stat.h>], [struct stat s; s.st_rdev;], -@@ -1862,10 +1862,10 @@ - dnl ### Checks for compiler characteristics - - --AC_DEFUN(AC_C_CROSS, -+AC_DEFUN([AC_C_CROSS], - [AC_OBSOLETE([$0], [; it has been merged into AC_PROG_CC])]) - --AC_DEFUN(AC_C_CHAR_UNSIGNED, -+AC_DEFUN([AC_C_CHAR_UNSIGNED], - [AC_CACHE_CHECK(whether char is unsigned, ac_cv_c_char_unsigned, - [if test "$GCC" = yes; then - # GCC predefines this symbol on systems where it applies. -@@ -1889,7 +1889,7 @@ - fi - ]) - --AC_DEFUN(AC_C_LONG_DOUBLE, -+AC_DEFUN([AC_C_LONG_DOUBLE], - [AC_CACHE_CHECK(for long double, ac_cv_c_long_double, - [if test "$GCC" = yes; then - ac_cv_c_long_double=yes -@@ -1906,7 +1906,7 @@ - fi - ]) - --AC_DEFUN(AC_INT_16_BITS, -+AC_DEFUN([AC_INT_16_BITS], - [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])dnl - AC_MSG_CHECKING(whether int is 16 bits) - AC_TRY_RUN([main() { exit(sizeof(int) != 2); }], -@@ -1914,7 +1914,7 @@ - AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no)) - ]) - --AC_DEFUN(AC_LONG_64_BITS, -+AC_DEFUN([AC_LONG_64_BITS], - [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])dnl - AC_MSG_CHECKING(whether long int is 64 bits) - AC_TRY_RUN([main() { exit(sizeof(long int) != 8); }], -@@ -1922,7 +1922,7 @@ - AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no)) - ]) - --AC_DEFUN(AC_C_BIGENDIAN, -+AC_DEFUN([AC_C_BIGENDIAN], - [AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian, - [ac_cv_c_bigendian=unknown - # See if sys/param.h defines the BYTE_ORDER macro. -@@ -1956,7 +1956,7 @@ - dnl Do nothing if the compiler accepts the inline keyword. - dnl Otherwise define inline to __inline__ or __inline if one of those work, - dnl otherwise define inline to be empty. --AC_DEFUN(AC_C_INLINE, -+AC_DEFUN([AC_C_INLINE], - [AC_CACHE_CHECK([for inline], ac_cv_c_inline, - [ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do -@@ -1970,7 +1970,7 @@ - esac - ]) - --AC_DEFUN(AC_C_CONST, -+AC_DEFUN([AC_C_CONST], - [dnl This message is consistent in form with the other checking messages, - dnl and with the result message. - AC_CACHE_CHECK([for working const], ac_cv_c_const, -@@ -2026,7 +2026,7 @@ - fi - ]) - --AC_DEFUN(AC_C_STRINGIZE, [ -+AC_DEFUN([AC_C_STRINGIZE], [ - AC_REQUIRE([AC_PROG_CPP]) - AC_MSG_CHECKING([for preprocessor stringizing operator]) - AC_CACHE_VAL(ac_cv_c_stringize, -@@ -2042,14 +2042,14 @@ - AC_MSG_RESULT([${ac_cv_c_stringize}]) - ])dnl - --define(AC_ARG_ARRAY, -+define([AC_ARG_ARRAY], - [errprint(__file__:__line__: [$0] has been removed; don't do unportable things with arguments - )m4exit(4)]) - - dnl Check the object extension used by the compiler: typically .o or - dnl .obj. If this is called, some other behaviour will change, - dnl determined by ac_objext. --AC_DEFUN(AC_OBJEXT, -+AC_DEFUN([AC_OBJEXT], - [AC_MSG_CHECKING([for object suffix]) - AC_CACHE_VAL(ac_cv_objext, - [rm -f conftest* -@@ -2098,7 +2098,7 @@ - dnl extremely useful macro. Thank you John. - dnl - dnl AC_F77_LIBRARY_LDFLAGS() --AC_DEFUN(AC_F77_LIBRARY_LDFLAGS, -+AC_DEFUN([AC_F77_LIBRARY_LDFLAGS], - [AC_MSG_CHECKING([for Fortran 77 libraries]) - AC_REQUIRE([AC_PROG_F77]) - AC_REQUIRE([AC_CANONICAL_HOST]) -@@ -2285,7 +2285,7 @@ - dnl ### Checks for operating system services - - --AC_DEFUN(AC_SYS_INTERPRETER, -+AC_DEFUN([AC_SYS_INTERPRETER], - [# Pull the hash mark out of the macro call to avoid m4 problems. - ac_msg="whether #! works in shell scripts" - AC_CACHE_CHECK($ac_msg, ac_cv_sys_interpreter, -@@ -2303,11 +2303,11 @@ - interpval="$ac_cv_sys_interpreter" - ]) - --define(AC_HAVE_POUNDBANG, -+define([AC_HAVE_POUNDBANG], - [errprint(__file__:__line__: [$0 has been replaced by AC_SYS_INTERPRETER, taking no arguments - ])m4exit(4)]) - --AC_DEFUN(AC_SYS_LONG_FILE_NAMES, -+AC_DEFUN([AC_SYS_LONG_FILE_NAMES], - [AC_CACHE_CHECK(for long file names, ac_cv_sys_long_file_names, - [ac_cv_sys_long_file_names=yes - # Test for long file names in all the places we know might matter: -@@ -2343,7 +2343,7 @@ - fi - ]) - --AC_DEFUN(AC_SYS_RESTARTABLE_SYSCALLS, -+AC_DEFUN([AC_SYS_RESTARTABLE_SYSCALLS], - [AC_CACHE_CHECK(for restartable system calls, ac_cv_sys_restartable_syscalls, - [AC_TRY_RUN( - [/* Exit 0 (true) if wait returns something other than -1, -@@ -2366,7 +2366,7 @@ - fi - ]) - --AC_DEFUN(AC_PATH_X, -+AC_DEFUN([AC_PATH_X], - [AC_REQUIRE_CPP()dnl Set CPP; we run AC_PATH_X_DIRECT conditionally. - # If we find X, set shell vars x_includes and x_libraries to the - # paths, otherwise set no_x=yes. -@@ -2417,7 +2417,7 @@ - - dnl Internal subroutine of AC_PATH_X. - dnl Set ac_x_includes and/or ac_x_libraries. --AC_DEFUN(AC_PATH_X_XMKMF, -+AC_DEFUN([AC_PATH_X_XMKMF], - [rm -fr conftestdir - if mkdir conftestdir; then - cd conftestdir -@@ -2455,7 +2455,7 @@ - - dnl Internal subroutine of AC_PATH_X. - dnl Set ac_x_includes and/or ac_x_libraries. --AC_DEFUN(AC_PATH_X_DIRECT, -+AC_DEFUN([AC_PATH_X_DIRECT], - [if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h -@@ -2577,7 +2577,7 @@ - ]) - - dnl Find additional X libraries, magic flags, etc. --AC_DEFUN(AC_PATH_XTRA, -+AC_DEFUN([AC_PATH_XTRA], - [AC_REQUIRE([AC_PATH_X])dnl - if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. -@@ -2690,13 +2690,13 @@ - ]) - - dnl The old Cygwin32 macro is deprecated. --AC_DEFUN(AC_CYGWIN32, -+AC_DEFUN([AC_CYGWIN32], - [AC_OBSOLETE([$0], [; instead use AC_CYGWIN])dnl - AC_CYGWIN]) - - dnl Check for Cygwin. This is a way to set the right value for - dnl EXEEXT. --AC_DEFUN(AC_CYGWIN, -+AC_DEFUN([AC_CYGWIN], - [AC_CACHE_CHECK(for Cygwin environment, ac_cv_cygwin, - [AC_TRY_COMPILE(,[ - #ifndef __CYGWIN__ -@@ -2710,7 +2710,7 @@ - - dnl Check for mingw32. This is another way to set the right value for - dnl EXEEXT. --AC_DEFUN(AC_MINGW32, -+AC_DEFUN([AC_MINGW32], - [AC_CACHE_CHECK(for mingw32 environment, ac_cv_mingw32, - [AC_TRY_COMPILE(,[return __MINGW32__;], - ac_cv_mingw32=yes, ac_cv_mingw32=no) -@@ -2719,7 +2719,7 @@ - test "$ac_cv_mingw32" = yes && MINGW32=yes]) - - dnl Check for djgpp. --AC_DEFUN(AC_DJGPP, -+AC_DEFUN([AC_DJGPP], - [AC_CACHE_CHECK(for djgpp environment, ac_cv_djgpp, - [AC_TRY_COMPILE(,[ - #if defined (DJGPP) || defined (__DJGPP__) -@@ -2732,7 +2732,7 @@ - test "$ac_cv_djgpp" = yes && HAVE_DJGPP=yes]) - - dnl Check for win32. --AC_DEFUN(AC_WIN32, -+AC_DEFUN([AC_WIN32], - [AC_CACHE_CHECK(for win32 environment, ac_cv_win32, - [AC_TRY_COMPILE(,[ - #if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) -@@ -2748,7 +2748,7 @@ - dnl add .exe for Cygwin or mingw32. Otherwise, it compiles a test - dnl executable. If this is called, the executable extensions will be - dnl automatically used by link commands run by the configure script. --AC_DEFUN(AC_EXEEXT, -+AC_DEFUN([AC_EXEEXT], - [AC_REQUIRE([AC_CYGWIN]) - AC_REQUIRE([AC_MINGW32]) - AC_MSG_CHECKING([for executable suffix]) -@@ -2780,7 +2780,7 @@ - AC_SUBST(EXEEXT)]) - - dnl Unset CC to run configure with cross compiler. --AC_DEFUN(AC_UNSET_CC, [ -+AC_DEFUN([AC_UNSET_CC], [ - ZZ= - if test "$cross_compiling" = yes && - (test "x$CC" = "xdos-gcc" || test "x$CC" = "xi386-mingw32-gcc" || test "x$CC" = "xgnuwin32gcc") ; then -@@ -2791,7 +2791,7 @@ - ]) - - dnl Restore CC that has been unset by AC_UNSET_CC --AC_DEFUN(AC_RESET_CC, [ -+AC_DEFUN([AC_RESET_CC], [ - if test "x$ZZ" = "xdos-gcc" || test "x$ZZ" = "xi386-mingw32-gcc" || test "x$ZZ" = "xgnuwin32gcc" ; then - CC=$ZZ - cross_compiling=yes -@@ -2804,7 +2804,7 @@ - dnl They aren't cached, to discourage their use. - - --AC_DEFUN(AC_AIX, -+AC_DEFUN([AC_AIX], - [AC_BEFORE([$0], [AC_TRY_COMPILE])dnl - AC_BEFORE([$0], [AC_TRY_RUN])dnl - AC_MSG_CHECKING(for AIX) -@@ -2815,7 +2815,7 @@ - ], [AC_MSG_RESULT(yes); AC_DEFINE(_ALL_SOURCE)], AC_MSG_RESULT(no)) - ]) - --AC_DEFUN(AC_MINIX, -+AC_DEFUN([AC_MINIX], - [AC_BEFORE([$0], [AC_TRY_COMPILE])dnl - AC_BEFORE([$0], [AC_TRY_RUN])dnl - AC_CHECK_HEADER(minix/config.h, MINIX=yes, MINIX=) -@@ -2826,7 +2826,7 @@ - fi - ]) - --AC_DEFUN(AC_ISC_POSIX, -+AC_DEFUN([AC_ISC_POSIX], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_BEFORE([$0], [AC_TRY_COMPILE])dnl - AC_BEFORE([$0], [AC_TRY_RUN])dnl -@@ -2848,7 +2848,7 @@ - fi - ]) - --AC_DEFUN(AC_XENIX_DIR, -+AC_DEFUN([AC_XENIX_DIR], - [AC_OBSOLETE([$0], [; instead use AC_HEADER_DIRENT])dnl - AC_REQUIRE([AC_DIR_HEADER])dnl - AC_MSG_CHECKING(for Xenix) -@@ -2864,17 +2864,17 @@ - fi - ]) - --AC_DEFUN(AC_DYNIX_SEQ, -+AC_DEFUN([AC_DYNIX_SEQ], - [AC_OBSOLETE([$0], [; instead use AC_FUNC_GETMNTENT])dnl - AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS") - ]) - --AC_DEFUN(AC_IRIX_SUN, -+AC_DEFUN([AC_IRIX_SUN], - [AC_OBSOLETE([$0], [; instead use AC_FUNC_GETMNTENT or AC_CHECK_LIB(sun, getpwnam)])dnl - AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS") - ]) - --AC_DEFUN(AC_SCO_INTL, -+AC_DEFUN([AC_SCO_INTL], - [AC_OBSOLETE([$0], [; instead use AC_FUNC_STRFTIME])dnl - AC_CHECK_LIB(intl, strftime, LIBS="-lintl $LIBS") - ]) ---- tetex-src-2.0.2/./texk/etc/autoconf/acoldnames.m4~configure 1999-01-05 08:27:38.000000000 -0500 -+++ tetex-src-2.0.2/./texk/etc/autoconf/acoldnames.m4 2004-01-26 20:17:53.000000000 -0500 -@@ -19,62 +19,62 @@ - dnl - dnl General macros. - dnl --define(AC_WARN, [indir([AC_MSG_WARN], $@)])dnl --define(AC_ERROR, [indir([AC_MSG_ERROR], $@)])dnl --AC_DEFUN(AC_PROGRAM_CHECK, [indir([AC_CHECK_PROG], $@)])dnl --AC_DEFUN(AC_PROGRAM_PATH, [indir([AC_PATH_PROG], $@)])dnl --AC_DEFUN(AC_PROGRAMS_CHECK, [indir([AC_CHECK_PROGS], $@)])dnl --AC_DEFUN(AC_PROGRAMS_PATH, [indir([AC_PATH_PROGS], $@)])dnl --AC_DEFUN(AC_PREFIX, [indir([AC_PREFIX_PROGRAM], $@)])dnl --AC_DEFUN(AC_HEADER_EGREP, [indir([AC_EGREP_HEADER], $@)])dnl --AC_DEFUN(AC_PROGRAM_EGREP, [indir([AC_EGREP_CPP], $@)])dnl --AC_DEFUN(AC_TEST_PROGRAM, [indir([AC_TRY_RUN], $@)])dnl --AC_DEFUN(AC_TEST_CPP, [indir([AC_TRY_CPP], $@)])dnl --AC_DEFUN(AC_HEADER_CHECK, [indir([AC_CHECK_HEADER], $@)])dnl --AC_DEFUN(AC_FUNC_CHECK, [indir([AC_CHECK_FUNC], $@)])dnl --AC_DEFUN(AC_HAVE_FUNCS, [indir([AC_CHECK_FUNCS], $@)])dnl --AC_DEFUN(AC_HAVE_HEADERS, [indir([AC_CHECK_HEADERS], $@)])dnl --AC_DEFUN(AC_SIZEOF_TYPE, [indir([AC_CHECK_SIZEOF], $@)])dnl -+define([AC_WARN], [indir([AC_MSG_WARN], $@)])dnl -+define([AC_ERROR], [indir([AC_MSG_ERROR], $@)])dnl -+AC_DEFUN([AC_PROGRAM_CHECK], [indir([AC_CHECK_PROG], $@)])dnl -+AC_DEFUN([AC_PROGRAM_PATH], [indir([AC_PATH_PROG], $@)])dnl -+AC_DEFUN([AC_PROGRAMS_CHECK], [indir([AC_CHECK_PROGS], $@)])dnl -+AC_DEFUN([AC_PROGRAMS_PATH], [indir([AC_PATH_PROGS], $@)])dnl -+AC_DEFUN([AC_PREFIX], [indir([AC_PREFIX_PROGRAM], $@)])dnl -+AC_DEFUN([AC_HEADER_EGREP], [indir([AC_EGREP_HEADER], $@)])dnl -+AC_DEFUN([AC_PROGRAM_EGREP], [indir([AC_EGREP_CPP], $@)])dnl -+AC_DEFUN([AC_TEST_PROGRAM], [indir([AC_TRY_RUN], $@)])dnl -+AC_DEFUN([AC_TEST_CPP], [indir([AC_TRY_CPP], $@)])dnl -+AC_DEFUN([AC_HEADER_CHECK], [indir([AC_CHECK_HEADER], $@)])dnl -+AC_DEFUN([AC_FUNC_CHECK], [indir([AC_CHECK_FUNC], $@)])dnl -+AC_DEFUN([AC_HAVE_FUNCS], [indir([AC_CHECK_FUNCS], $@)])dnl -+AC_DEFUN([AC_HAVE_HEADERS], [indir([AC_CHECK_HEADERS], $@)])dnl -+AC_DEFUN([AC_SIZEOF_TYPE], [indir([AC_CHECK_SIZEOF], $@)])dnl - dnl - dnl Specific macros. - dnl --AC_DEFUN(AC_GCC_TRADITIONAL, [indir([AC_PROG_GCC_TRADITIONAL])])dnl --AC_DEFUN(AC_MINUS_C_MINUS_O, [indir([AC_PROG_CC_C_O])])dnl --AC_DEFUN(AC_SET_MAKE, [indir([AC_PROG_MAKE_SET])])dnl --AC_DEFUN(AC_YYTEXT_POINTER, [indir([AC_DECL_YYTEXT])])dnl --AC_DEFUN(AC_LN_S, [indir([AC_PROG_LN_S])])dnl --AC_DEFUN(AC_STDC_HEADERS, [indir([AC_HEADER_STDC])])dnl --AC_DEFUN(AC_MAJOR_HEADER, [indir([AC_HEADER_MAJOR])])dnl --AC_DEFUN(AC_STAT_MACROS_BROKEN, [indir([AC_HEADER_STAT])])dnl --AC_DEFUN(AC_SYS_SIGLIST_DECLARED, [indir([AC_DECL_SYS_SIGLIST])])dnl --AC_DEFUN(AC_GETGROUPS_T, [indir([AC_TYPE_GETGROUPS])])dnl --AC_DEFUN(AC_UID_T, [indir([AC_TYPE_UID_T])])dnl --AC_DEFUN(AC_SIZE_T, [indir([AC_TYPE_SIZE_T])])dnl --AC_DEFUN(AC_PID_T, [indir([AC_TYPE_PID_T])])dnl --AC_DEFUN(AC_OFF_T, [indir([AC_TYPE_OFF_T])])dnl --AC_DEFUN(AC_MODE_T, [indir([AC_TYPE_MODE_T])])dnl --AC_DEFUN(AC_RETSIGTYPE, [indir([AC_TYPE_SIGNAL])])dnl --AC_DEFUN(AC_MMAP, [indir([AC_FUNC_MMAP])])dnl --AC_DEFUN(AC_VPRINTF, [indir([AC_FUNC_VPRINTF])])dnl --AC_DEFUN(AC_VFORK, [indir([AC_FUNC_VFORK])])dnl --AC_DEFUN(AC_WAIT3, [indir([AC_FUNC_WAIT3])])dnl --AC_DEFUN(AC_ALLOCA, [indir([AC_FUNC_ALLOCA])])dnl --AC_DEFUN(AC_GETLOADAVG, [indir([AC_FUNC_GETLOADAVG])])dnl --AC_DEFUN(AC_UTIME_NULL, [indir([AC_FUNC_UTIME_NULL])])dnl --AC_DEFUN(AC_STRCOLL, [indir([AC_FUNC_STRCOLL])])dnl --AC_DEFUN(AC_SETVBUF_REVERSED, [indir([AC_FUNC_SETVBUF_REVERSED])])dnl --AC_DEFUN(AC_TIME_WITH_SYS_TIME, [indir([AC_HEADER_TIME])])dnl --AC_DEFUN(AC_TIMEZONE, [indir([AC_STRUCT_TIMEZONE])])dnl --AC_DEFUN(AC_ST_BLOCKS, [indir([AC_STRUCT_ST_BLOCKS])])dnl --AC_DEFUN(AC_ST_BLKSIZE, [indir([AC_STRUCT_ST_BLKSIZE])])dnl --AC_DEFUN(AC_ST_RDEV, [indir([AC_STRUCT_ST_RDEV])])dnl --AC_DEFUN(AC_CROSS_CHECK, [indir([AC_C_CROSS])])dnl --AC_DEFUN(AC_CHAR_UNSIGNED, [indir([AC_C_CHAR_UNSIGNED])])dnl --AC_DEFUN(AC_LONG_DOUBLE, [indir([AC_C_LONG_DOUBLE])])dnl --AC_DEFUN(AC_WORDS_BIGENDIAN, [indir([AC_C_BIGENDIAN])])dnl --AC_DEFUN(AC_INLINE, [indir([AC_C_INLINE])])dnl --AC_DEFUN(AC_CONST, [indir([AC_C_CONST])])dnl --AC_DEFUN(AC_LONG_FILE_NAMES, [indir([AC_SYS_LONG_FILE_NAMES])])dnl --AC_DEFUN(AC_RESTARTABLE_SYSCALLS, [indir([AC_SYS_RESTARTABLE_SYSCALLS])])dnl --AC_DEFUN(AC_FIND_X, [indir([AC_PATH_X])])dnl --AC_DEFUN(AC_FIND_XTRA, [indir([AC_PATH_XTRA])])dnl -+AC_DEFUN([AC_GCC_TRADITIONAL], [indir([AC_PROG_GCC_TRADITIONAL])])dnl -+AC_DEFUN([AC_MINUS_C_MINUS_O], [indir([AC_PROG_CC_C_O])])dnl -+AC_DEFUN([AC_SET_MAKE], [indir([AC_PROG_MAKE_SET])])dnl -+AC_DEFUN([AC_YYTEXT_POINTER], [indir([AC_DECL_YYTEXT])])dnl -+AC_DEFUN([AC_LN_S], [indir([AC_PROG_LN_S])])dnl -+AC_DEFUN([AC_STDC_HEADERS], [indir([AC_HEADER_STDC])])dnl -+AC_DEFUN([AC_MAJOR_HEADER], [indir([AC_HEADER_MAJOR])])dnl -+AC_DEFUN([AC_STAT_MACROS_BROKEN], [indir([AC_HEADER_STAT])])dnl -+AC_DEFUN([AC_SYS_SIGLIST_DECLARED], [indir([AC_DECL_SYS_SIGLIST])])dnl -+AC_DEFUN([AC_GETGROUPS_T], [indir([AC_TYPE_GETGROUPS])])dnl -+AC_DEFUN([AC_UID_T], [indir([AC_TYPE_UID_T])])dnl -+AC_DEFUN([AC_SIZE_T], [indir([AC_TYPE_SIZE_T])])dnl -+AC_DEFUN([AC_PID_T], [indir([AC_TYPE_PID_T])])dnl -+AC_DEFUN([AC_OFF_T], [indir([AC_TYPE_OFF_T])])dnl -+AC_DEFUN([AC_MODE_T], [indir([AC_TYPE_MODE_T])])dnl -+AC_DEFUN([AC_RETSIGTYPE], [indir([AC_TYPE_SIGNAL])])dnl -+AC_DEFUN([AC_MMAP], [indir([AC_FUNC_MMAP])])dnl -+AC_DEFUN([AC_VPRINTF], [indir([AC_FUNC_VPRINTF])])dnl -+AC_DEFUN([AC_VFORK], [indir([AC_FUNC_VFORK])])dnl -+AC_DEFUN([AC_WAIT3], [indir([AC_FUNC_WAIT3])])dnl -+AC_DEFUN([AC_ALLOCA], [indir([AC_FUNC_ALLOCA])])dnl -+AC_DEFUN([AC_GETLOADAVG], [indir([AC_FUNC_GETLOADAVG])])dnl -+AC_DEFUN([AC_UTIME_NULL], [indir([AC_FUNC_UTIME_NULL])])dnl -+AC_DEFUN([AC_STRCOLL], [indir([AC_FUNC_STRCOLL])])dnl -+AC_DEFUN([AC_SETVBUF_REVERSED], [indir([AC_FUNC_SETVBUF_REVERSED])])dnl -+AC_DEFUN([AC_TIME_WITH_SYS_TIME], [indir([AC_HEADER_TIME])])dnl -+AC_DEFUN([AC_TIMEZONE], [indir([AC_STRUCT_TIMEZONE])])dnl -+AC_DEFUN([AC_ST_BLOCKS], [indir([AC_STRUCT_ST_BLOCKS])])dnl -+AC_DEFUN([AC_ST_BLKSIZE], [indir([AC_STRUCT_ST_BLKSIZE])])dnl -+AC_DEFUN([AC_ST_RDEV], [indir([AC_STRUCT_ST_RDEV])])dnl -+AC_DEFUN([AC_CROSS_CHECK], [indir([AC_C_CROSS])])dnl -+AC_DEFUN([AC_CHAR_UNSIGNED], [indir([AC_C_CHAR_UNSIGNED])])dnl -+AC_DEFUN([AC_LONG_DOUBLE], [indir([AC_C_LONG_DOUBLE])])dnl -+AC_DEFUN([AC_WORDS_BIGENDIAN], [indir([AC_C_BIGENDIAN])])dnl -+AC_DEFUN([AC_INLINE], [indir([AC_C_INLINE])])dnl -+AC_DEFUN([AC_CONST], [indir([AC_C_CONST])])dnl -+AC_DEFUN([AC_LONG_FILE_NAMES], [indir([AC_SYS_LONG_FILE_NAMES])])dnl -+AC_DEFUN([AC_RESTARTABLE_SYSCALLS], [indir([AC_SYS_RESTARTABLE_SYSCALLS])])dnl -+AC_DEFUN([AC_FIND_X], [indir([AC_PATH_X])])dnl -+AC_DEFUN([AC_FIND_XTRA], [indir([AC_PATH_XTRA])])dnl ---- tetex-src-2.0.2/./texk/etc/autoconf/acgeneral.m4~configure 1999-01-07 13:53:31.000000000 -0500 -+++ tetex-src-2.0.2/./texk/etc/autoconf/acgeneral.m4 2004-01-26 20:17:53.000000000 -0500 -@@ -52,7 +52,7 @@ - divert(-1)dnl Throw away output until AC_INIT is called. - changequote([, ]) - --define(AC_ACVERSION, 2.13) -+define([AC_ACVERSION], 2.13) - - dnl Some old m4's don't support m4exit. But they provide - dnl equivalent functionality by core dumping because of the -@@ -76,27 +76,27 @@ - dnl and AC_DIVERSION_ICMDS. - - dnl AC_DIVERSION_NOTICE - 1 (= 0) AC_REQUIRE'd #! /bin/sh line --define(AC_DIVERSION_NOTICE, 1)dnl copyright notice & option help strings --define(AC_DIVERSION_INIT, 2)dnl initialization code --define(AC_DIVERSION_NORMAL_4, 3)dnl AC_REQUIRE'd code, 4 level deep --define(AC_DIVERSION_NORMAL_3, 4)dnl AC_REQUIRE'd code, 3 level deep --define(AC_DIVERSION_NORMAL_2, 5)dnl AC_REQUIRE'd code, 2 level deep --define(AC_DIVERSION_NORMAL_1, 6)dnl AC_REQUIRE'd code, 1 level deep --define(AC_DIVERSION_NORMAL, 7)dnl the tests and output code --define(AC_DIVERSION_SED, 8)dnl variable substitutions in config.status --define(AC_DIVERSION_CMDS, 9)dnl extra shell commands in config.status --define(AC_DIVERSION_ICMDS, 10)dnl extra initialization in config.status -+define([AC_DIVERSION_NOTICE], 1)dnl copyright notice & option help strings -+define([AC_DIVERSION_INIT], 2)dnl initialization code -+define([AC_DIVERSION_NORMAL_4], 3)dnl AC_REQUIRE'd code, 4 level deep -+define([AC_DIVERSION_NORMAL_3], 4)dnl AC_REQUIRE'd code, 3 level deep -+define([AC_DIVERSION_NORMAL_2], 5)dnl AC_REQUIRE'd code, 2 level deep -+define([AC_DIVERSION_NORMAL_1], 6)dnl AC_REQUIRE'd code, 1 level deep -+define([AC_DIVERSION_NORMAL], 7)dnl the tests and output code -+define([AC_DIVERSION_SED], 8)dnl variable substitutions in config.status -+define([AC_DIVERSION_CMDS], 9)dnl extra shell commands in config.status -+define([AC_DIVERSION_ICMDS], 10)dnl extra initialization in config.status - - dnl Change the diversion stream to STREAM, while stacking old values. - dnl AC_DIVERT_PUSH(STREAM) --define(AC_DIVERT_PUSH, -+define([AC_DIVERT_PUSH], - [pushdef([AC_DIVERSION_CURRENT], $1)dnl - divert(AC_DIVERSION_CURRENT)dnl - ]) - - dnl Change the diversion stream to its previous value, unstacking it. - dnl AC_DIVERT_POP() --define(AC_DIVERT_POP, -+define([AC_DIVERT_POP], - [popdef([AC_DIVERSION_CURRENT])dnl - divert(AC_DIVERSION_CURRENT)dnl - ]) -@@ -108,7 +108,7 @@ - - dnl The prologue for Autoconf macros. - dnl AC_PRO(MACRO-NAME) --define(AC_PRO, -+define([AC_PRO], - [define([AC_PROVIDE_$1], )dnl - ifelse(AC_DIVERSION_CURRENT, AC_DIVERSION_NORMAL, - [AC_DIVERT_PUSH(builtin(eval, AC_DIVERSION_CURRENT - 1))], -@@ -117,7 +117,7 @@ - - dnl The Epilogue for Autoconf macros. - dnl AC_EPI() --define(AC_EPI, -+define([AC_EPI], - [AC_DIVERT_POP()dnl - ifelse(AC_DIVERSION_CURRENT, AC_DIVERSION_NORMAL, - [undivert(AC_DIVERSION_NORMAL_4)dnl -@@ -135,16 +135,16 @@ - dnl macros. We don't use this macro to define some frequently called - dnl macros that are not involved in ordering constraints, to save m4 - dnl processing. --dnl AC_DEFUN(NAME, EXPANSION) -+dnl AC_DEFUN([NAME], EXPANSION) - define([AC_DEFUN], --[define($1, [AC_PRO([$1])$2[]AC_EPI()])]) -+[define([$1], [AC_PRO([$1])$2[]AC_EPI()])]) - - - dnl ### Initialization - - - dnl AC_INIT_NOTICE() --AC_DEFUN(AC_INIT_NOTICE, -+AC_DEFUN([AC_INIT_NOTICE], - [# Guess values for system-dependent variables and create Makefiles. - # Generated automatically using autoconf version] AC_ACVERSION [ - # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -@@ -158,13 +158,13 @@ - [#] Any additions from configure.in:]) - - dnl AC_PREFIX_DEFAULT(PREFIX) --AC_DEFUN(AC_PREFIX_DEFAULT, -+AC_DEFUN([AC_PREFIX_DEFAULT], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl - ac_default_prefix=$1 - AC_DIVERT_POP()]) - - dnl AC_INIT_PARSE_ARGS() --AC_DEFUN(AC_INIT_PARSE_ARGS, -+AC_DEFUN([AC_INIT_PARSE_ARGS], - [ - # Initialize some variables set by options. - # The variables have the same names as the options, with -@@ -573,12 +573,12 @@ - dnl Try to have only one #! line, so the script doesn't look funny - dnl for users of AC_REVISION. - dnl AC_INIT_BINSH() --AC_DEFUN(AC_INIT_BINSH, -+AC_DEFUN([AC_INIT_BINSH], - [#! /bin/sh - ]) - - dnl AC_INIT(UNIQUE-FILE-IN-SOURCE-DIR) --AC_DEFUN(AC_INIT, -+AC_DEFUN([AC_INIT], - [sinclude(acsite.m4)dnl - sinclude(./aclocal.m4)dnl - AC_REQUIRE([AC_INIT_BINSH])dnl -@@ -591,7 +591,7 @@ - ]) - - dnl AC_INIT_PREPARE(UNIQUE-FILE-IN-SOURCE-DIR) --AC_DEFUN(AC_INIT_PREPARE, -+AC_DEFUN([AC_INIT_PREPARE], - [trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - - # File descriptor usage: -@@ -600,9 +600,9 @@ - # 2 errors and warnings - # 3 some systems may open it to /dev/tty - # 4 used on the Kubota Titan --define(AC_FD_MSG, 6)dnl -+define([AC_FD_MSG], 6)dnl - [#] AC_FD_MSG checking for... messages and results --define(AC_FD_CC, 5)dnl -+define([AC_FD_CC], 5)dnl - [#] AC_FD_CC compiler messages saved in config.log - if test "$silent" = yes; then - exec AC_FD_MSG>/dev/null -@@ -727,7 +727,7 @@ - - - dnl AC_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE]) --AC_DEFUN(AC_ARG_ENABLE, -+AC_DEFUN([AC_ARG_ENABLE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl - ac_help="$ac_help - [$2]" -@@ -742,7 +742,7 @@ - fi - ]) - --AC_DEFUN(AC_ENABLE, -+AC_DEFUN([AC_ENABLE], - [AC_OBSOLETE([$0], [; instead use AC_ARG_ENABLE])dnl - AC_ARG_ENABLE([$1], [ --enable-$1], [$2], [$3])dnl - ]) -@@ -752,7 +752,7 @@ - - - dnl AC_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE]) --AC_DEFUN(AC_ARG_WITH, -+AC_DEFUN([AC_ARG_WITH], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl - ac_help="$ac_help - [$2]" -@@ -767,7 +767,7 @@ - fi - ]) - --AC_DEFUN(AC_WITH, -+AC_DEFUN([AC_WITH], - [AC_OBSOLETE([$0], [; instead use AC_ARG_WITH])dnl - AC_ARG_WITH([$1], [ --with-$1], [$2], [$3])dnl - ]) -@@ -777,7 +777,7 @@ - - - dnl AC_ARG_PROGRAM() --AC_DEFUN(AC_ARG_PROGRAM, -+AC_DEFUN([AC_ARG_PROGRAM], - [if test "$program_transform_name" = s,x,x,; then - program_transform_name= - else -@@ -803,7 +803,7 @@ - - - dnl AC_REVISION(REVISION-INFO) --AC_DEFUN(AC_REVISION, -+AC_DEFUN([AC_REVISION], - [AC_REQUIRE([AC_INIT_BINSH])dnl - [# From configure.in] translit([$1], $")]) - -@@ -811,19 +811,19 @@ - - dnl Change the dots in NUMBER into commas. - dnl AC_PREREQ_SPLIT(NUMBER) --define(AC_PREREQ_SPLIT, -+define([AC_PREREQ_SPLIT], - [translit($1, ., [, ])]) - - dnl Default the ternary version number to 0 (e.g., 1, 7 -> 1, 7, 0). - dnl AC_PREREQ_CANON(MAJOR, MINOR [,TERNARY]) --define(AC_PREREQ_CANON, -+define([AC_PREREQ_CANON], - [$1, $2, ifelse([$3], , 0, [$3])]) - - dnl Complain and exit if version number 1 is less than version number 2. - dnl PRINTABLE2 is the printable version of version number 2. - dnl AC_PREREQ_COMPARE(MAJOR1, MINOR1, TERNARY1, MAJOR2, MINOR2, TERNARY2, - dnl PRINTABLE2) --define(AC_PREREQ_COMPARE, -+define([AC_PREREQ_COMPARE], - [ifelse(builtin([eval], - [$3 + $2 * 1000 + $1 * 1000000 < $6 + $5 * 1000 + $4 * 1000000]), 1, - [errprint(dnl -@@ -832,7 +832,7 @@ - - dnl Complain and exit if the Autoconf version is less than VERSION. - dnl AC_PREREQ(VERSION) --define(AC_PREREQ, -+define([AC_PREREQ], - [AC_PREREQ_COMPARE(AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), - AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), [$1])]) - -@@ -844,12 +844,12 @@ - dnl in directory DIR. These are auxiliary files used in configuration. - dnl DIR can be either absolute or relative to $srcdir. - dnl AC_CONFIG_AUX_DIR(DIR) --AC_DEFUN(AC_CONFIG_AUX_DIR, -+AC_DEFUN([AC_CONFIG_AUX_DIR], - [AC_CONFIG_AUX_DIRS($1 $srcdir/$1)]) - - dnl The default is `$srcdir' or `$srcdir/..' or `$srcdir/../..'. - dnl There's no need to call this macro explicitly; just AC_REQUIRE it. --AC_DEFUN(AC_CONFIG_AUX_DIR_DEFAULT, -+AC_DEFUN([AC_CONFIG_AUX_DIR_DEFAULT], - [AC_CONFIG_AUX_DIRS($srcdir $srcdir/.. $srcdir/../..)]) - - dnl Internal subroutine. -@@ -857,7 +857,7 @@ - dnl We look only for install-sh, so users of AC_PROG_INSTALL - dnl do not automatically need to distribute the other auxiliary files. - dnl AC_CONFIG_AUX_DIRS(DIR ...) --AC_DEFUN(AC_CONFIG_AUX_DIRS, -+AC_DEFUN([AC_CONFIG_AUX_DIRS], - [ac_aux_dir= - for ac_dir in $1; do - if test -f $ac_dir/install-sh; then -@@ -890,7 +890,7 @@ - ]) - - dnl Canonicalize the host, target, and build system types. --AC_DEFUN(AC_CANONICAL_SYSTEM, -+AC_DEFUN([AC_CANONICAL_SYSTEM], - [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl - AC_BEFORE([$0], [AC_ARG_PROGRAM]) - # Do some error checking and defaulting for the host and target type. -@@ -924,7 +924,7 @@ - - dnl Subroutines of AC_CANONICAL_SYSTEM. - --AC_DEFUN(AC_CANONICAL_HOST, -+AC_DEFUN([AC_CANONICAL_HOST], - [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl - - # Make sure we can run config.sub. -@@ -963,7 +963,7 @@ - ]) - - dnl Internal use only. --AC_DEFUN(AC_CANONICAL_TARGET, -+AC_DEFUN([AC_CANONICAL_TARGET], - [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl - AC_MSG_CHECKING(target system type) - -@@ -993,7 +993,7 @@ - ]) - - dnl Internal use only. --AC_DEFUN(AC_CANONICAL_BUILD, -+AC_DEFUN([AC_CANONICAL_BUILD], - [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl - AC_MSG_CHECKING(build system type) - -@@ -1027,7 +1027,7 @@ - dnl if the cache file is inconsistent with the current host, - dnl target and build system types, execute CMD or print a default - dnl error message. --AC_DEFUN(AC_VALIDATE_CACHED_SYSTEM_TUPLE, [ -+AC_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPLE], [ - AC_REQUIRE([AC_CANONICAL_SYSTEM]) - AC_MSG_CHECKING([cached system tuple]) - if { test x"${ac_cv_host_system_type+set}" = x"set" && -@@ -1053,7 +1053,7 @@ - - dnl Look for site or system specific initialization scripts. - dnl AC_SITE_LOAD() --define(AC_SITE_LOAD, -+define([AC_SITE_LOAD], - [# Prefer explicitly selected file to automatically selected ones. - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then -@@ -1071,7 +1071,7 @@ - ]) - - dnl AC_CACHE_LOAD() --define(AC_CACHE_LOAD, -+define([AC_CACHE_LOAD], - [if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -@@ -1082,7 +1082,7 @@ - ]) - - dnl AC_CACHE_SAVE() --define(AC_CACHE_SAVE, -+define([AC_CACHE_SAVE], - [cat > confcache <<\EOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -1136,7 +1136,7 @@ - - dnl The name of shell var CACHE-ID must contain `_cv_' in order to get saved. - dnl AC_CACHE_VAL(CACHE-ID, COMMANDS-TO-SET-IT) --define(AC_CACHE_VAL, -+define([AC_CACHE_VAL], - [dnl We used to use the below line, but it fails if the 1st arg is a - dnl shell variable, so we need the eval. - dnl if test "${$1+set}" = set; then -@@ -1149,7 +1149,7 @@ - ]) - - dnl AC_CACHE_CHECK(MESSAGE, CACHE-ID, COMMANDS) --define(AC_CACHE_CHECK, -+define([AC_CACHE_CHECK], - [AC_MSG_CHECKING([$1]) - AC_CACHE_VAL([$2], [$3]) - AC_MSG_RESULT([$]$2)]) -@@ -1160,14 +1160,14 @@ - - dnl Set VARIABLE to VALUE, verbatim, or 1. - dnl AC_DEFINE(VARIABLE [, VALUE]) --define(AC_DEFINE, -+define([AC_DEFINE], - [cat >> confdefs.h <<\EOF - [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1) - EOF - ]) - - dnl Similar, but perform shell substitutions $ ` \ once on VALUE. --define(AC_DEFINE_UNQUOTED, -+define([AC_DEFINE_UNQUOTED], - [cat >> confdefs.h <<EOF - [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1) - EOF -@@ -1180,7 +1180,7 @@ - dnl This macro protects VARIABLE from being diverted twice - dnl if this macro is called twice for it. - dnl AC_SUBST(VARIABLE) --define(AC_SUBST, -+define([AC_SUBST], - [ifdef([AC_SUBST_$1], , - [define([AC_SUBST_$1], )dnl - AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl -@@ -1189,7 +1189,7 @@ - ])]) - - dnl AC_SUBST_FILE(VARIABLE) --define(AC_SUBST_FILE, -+define([AC_SUBST_FILE], - [ifdef([AC_SUBST_$1], , - [define([AC_SUBST_$1], )dnl - AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl -@@ -1203,30 +1203,30 @@ - - - dnl AC_MSG_CHECKING(FEATURE-DESCRIPTION) --define(AC_MSG_CHECKING, -+define([AC_MSG_CHECKING], - [echo $ac_n "checking $1""... $ac_c" 1>&AC_FD_MSG - echo "configure:__oline__: checking $1" >&AC_FD_CC]) - - dnl AC_CHECKING(FEATURE-DESCRIPTION) --define(AC_CHECKING, -+define([AC_CHECKING], - [echo "checking $1" 1>&AC_FD_MSG - echo "configure:__oline__: checking $1" >&AC_FD_CC]) - - dnl AC_MSG_RESULT(RESULT-DESCRIPTION) --define(AC_MSG_RESULT, -+define([AC_MSG_RESULT], - [echo "$ac_t""$1" 1>&AC_FD_MSG]) - - dnl AC_VERBOSE(RESULT-DESCRIPTION) --define(AC_VERBOSE, -+define([AC_VERBOSE], - [AC_OBSOLETE([$0], [; instead use AC_MSG_RESULT])dnl - echo " $1" 1>&AC_FD_MSG]) - - dnl AC_MSG_WARN(PROBLEM-DESCRIPTION) --define(AC_MSG_WARN, -+define([AC_MSG_WARN], - [echo "configure: warning: $1" 1>&2]) - - dnl AC_MSG_ERROR(ERROR-DESCRIPTION) --define(AC_MSG_ERROR, -+define([AC_MSG_ERROR], - [{ echo "configure: error: $1" 1>&2; exit 1; }]) - - -@@ -1234,7 +1234,7 @@ - - - dnl AC_LANG_C() --AC_DEFUN(AC_LANG_C, -+AC_DEFUN([AC_LANG_C], - [define([AC_LANG], [C])dnl - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1245,7 +1245,7 @@ - ]) - - dnl AC_LANG_CPLUSPLUS() --AC_DEFUN(AC_LANG_CPLUSPLUS, -+AC_DEFUN([AC_LANG_CPLUSPLUS], - [define([AC_LANG], [CPLUSPLUS])dnl - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1256,7 +1256,7 @@ - ]) - - dnl AC_LANG_FORTRAN77() --AC_DEFUN(AC_LANG_FORTRAN77, -+AC_DEFUN([AC_LANG_FORTRAN77], - [define([AC_LANG], [FORTRAN77])dnl - ac_ext=f - ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&AC_FD_CC' -@@ -1266,7 +1266,7 @@ - - dnl Push the current language on a stack. - dnl AC_LANG_SAVE() --define(AC_LANG_SAVE, -+define([AC_LANG_SAVE], - [pushdef([AC_LANG_STACK], AC_LANG)]) - - dnl Restore the current language from the stack. -@@ -1283,12 +1283,12 @@ - dnl The purpose of this macro is to "configure:123: command line" - dnl written into config.log for every test run. - dnl AC_TRY_EVAL(VARIABLE) --AC_DEFUN(AC_TRY_EVAL, -+AC_DEFUN([AC_TRY_EVAL], - [{ (eval echo configure:__oline__: \"[$]$1\") 1>&AC_FD_CC; dnl - (eval [$]$1) 2>&AC_FD_CC; }]) - - dnl AC_TRY_COMMAND(COMMAND) --AC_DEFUN(AC_TRY_COMMAND, -+AC_DEFUN([AC_TRY_COMMAND], - [{ ac_try='$1'; AC_TRY_EVAL(ac_try); }]) - - -@@ -1296,12 +1296,12 @@ - - - dnl AC_BEFORE(THIS-MACRO-NAME, CALLED-MACRO-NAME) --define(AC_BEFORE, -+define([AC_BEFORE], - [ifdef([AC_PROVIDE_$2], [errprint(__file__:__line__: [$2 was called before $1 - ])])]) - - dnl AC_REQUIRE(MACRO-NAME) --define(AC_REQUIRE, -+define([AC_REQUIRE], - [ifdef([AC_PROVIDE_$1], , - [AC_DIVERT_PUSH(builtin(eval, AC_DIVERSION_CURRENT - 1))dnl - indir([$1]) -@@ -1309,11 +1309,11 @@ - ])]) - - dnl AC_PROVIDE(MACRO-NAME) --define(AC_PROVIDE, -+define([AC_PROVIDE], - [define([AC_PROVIDE_$1], )]) - - dnl AC_OBSOLETE(THIS-MACRO-NAME [, SUGGESTION]) --define(AC_OBSOLETE, -+define([AC_OBSOLETE], - [errprint(__file__:__line__: warning: [$1] is obsolete[$2] - )]) - -@@ -1323,7 +1323,7 @@ - - dnl AC_CHECK_PROG(VARIABLE, PROG-TO-CHECK-FOR, VALUE-IF-FOUND - dnl [, [VALUE-IF-NOT-FOUND] [, [PATH] [, [REJECT]]]]) --AC_DEFUN(AC_CHECK_PROG, -+AC_DEFUN([AC_CHECK_PROG], - [# Extract the first word of "$2", so it can be a program name with args. - set dummy $2; ac_word=[$]2 - AC_MSG_CHECKING([for $ac_word]) -@@ -1391,7 +1391,7 @@ - ]) - - dnl AC_PATH_PROG(VARIABLE, PROG-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND [, PATH]]) --AC_DEFUN(AC_PATH_PROG, -+AC_DEFUN([AC_PATH_PROG], - [# Extract the first word of "$2", so it can be a program name with args. - set dummy $2; ac_word=[$]2 - AC_MSG_CHECKING([for $ac_word]) -@@ -1439,7 +1439,7 @@ - - dnl AC_CHECK_PROGS(VARIABLE, PROGS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND - dnl [, PATH]]) --AC_DEFUN(AC_CHECK_PROGS, -+AC_DEFUN([AC_CHECK_PROGS], - [for ac_prog in $2 - do - AC_CHECK_PROG($1, [$]ac_prog, [$]ac_prog, , $4) -@@ -1450,7 +1450,7 @@ - - dnl AC_PATH_PROGS(VARIABLE, PROGS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND - dnl [, PATH]]) --AC_DEFUN(AC_PATH_PROGS, -+AC_DEFUN([AC_PATH_PROGS], - [for ac_prog in $2 - do - AC_PATH_PROG($1, [$]ac_prog, , $4) -@@ -1460,7 +1460,7 @@ - ])]) - - dnl Internal subroutine. --AC_DEFUN(AC_CHECK_TOOL_PREFIX, -+AC_DEFUN([AC_CHECK_TOOL_PREFIX], - [AC_REQUIRE([AC_CANONICAL_HOST])AC_REQUIRE([AC_CANONICAL_BUILD])dnl - if test $host != $build; then - ac_tool_prefix=${host_alias}- -@@ -1470,7 +1470,7 @@ - ]) - - dnl AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]]) --AC_DEFUN(AC_CHECK_TOOL, -+AC_DEFUN([AC_CHECK_TOOL], - [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl - AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, - ifelse([$3], , [$2], ), $4) -@@ -1492,10 +1492,10 @@ - dnl and it might use a cached value for the path. - dnl No big loss, I think, since most configures don't use this macro anyway. - dnl AC_PREFIX_PROGRAM(PROGRAM) --AC_DEFUN(AC_PREFIX_PROGRAM, -+AC_DEFUN([AC_PREFIX_PROGRAM], - [if test "x$prefix" = xNONE; then - changequote(<<, >>)dnl --define(<<AC_VAR_NAME>>, translit($1, [a-z], [A-Z]))dnl -+define([<<AC_VAR_NAME>>], translit($1, [a-z], [A-Z]))dnl - changequote([, ])dnl - dnl We reimplement AC_MSG_CHECKING (mostly) to avoid the ... in the middle. - echo $ac_n "checking for prefix by $ac_c" 1>&AC_FD_MSG -@@ -1517,7 +1517,7 @@ - dnl language. - dnl - dnl AC_TRY_COMPILER(TEST-PROGRAM, WORKING-VAR, CROSS-VAR) --AC_DEFUN(AC_TRY_COMPILER, -+AC_DEFUN([AC_TRY_COMPILER], - [cat > conftest.$ac_ext << EOF - ifelse(AC_LANG, [FORTRAN77], , - [ -@@ -1550,7 +1550,7 @@ - dnl the link succeeds, execute ACTION-IF-FOUND; otherwise, execute - dnl ACTION-IF-NOT-FOUND. - --AC_DEFUN(AC_TRY_LINK_FUNC, -+AC_DEFUN([AC_TRY_LINK_FUNC], - AC_TRY_LINK(dnl - ifelse([$1], [main], , dnl Avoid conflicting decl of main. - [/* Override any gcc2 internal prototype to avoid an error. */ -@@ -1571,7 +1571,7 @@ - dnl [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) - dnl Search for a library defining FUNC, if it's not already available. - --AC_DEFUN(AC_SEARCH_LIBS, -+AC_DEFUN([AC_SEARCH_LIBS], - [AC_PREREQ([2.13]) - AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1], - [ac_func_search_save_LIBS="$LIBS" -@@ -1595,7 +1595,7 @@ - - dnl AC_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND - dnl [, OTHER-LIBRARIES]]]) --AC_DEFUN(AC_CHECK_LIB, -+AC_DEFUN([AC_CHECK_LIB], - [AC_MSG_CHECKING([for $2 in -l$1]) - dnl Use a cache variable name containing both the library and function name, - dnl because the test really is for library $1 defining function $2, not -@@ -1641,12 +1641,12 @@ - - dnl AC_HAVE_LIBRARY(LIBRARY, [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND - dnl [, OTHER-LIBRARIES]]]) --AC_DEFUN(AC_HAVE_LIBRARY, -+AC_DEFUN([AC_HAVE_LIBRARY], - [AC_OBSOLETE([$0], [; instead use AC_CHECK_LIB])dnl - changequote(<<, >>)dnl --define(<<AC_LIB_NAME>>, dnl -+define([<<AC_LIB_NAME>>], dnl - patsubst(patsubst($1, <<lib\([^\.]*\)\.a>>, <<\1>>), <<-l>>, <<>>))dnl --define(<<AC_CV_NAME>>, ac_cv_lib_<<>>AC_LIB_NAME)dnl -+define([<<AC_CV_NAME>>], ac_cv_lib_<<>>AC_LIB_NAME)dnl - changequote([, ])dnl - AC_MSG_CHECKING([for -l[]AC_LIB_NAME]) - AC_CACHE_VAL(AC_CV_NAME, -@@ -1674,7 +1674,7 @@ - - - dnl AC_TRY_CPP(INCLUDES, [ACTION-IF-TRUE [, ACTION-IF-FALSE]]) --AC_DEFUN(AC_TRY_CPP, -+AC_DEFUN([AC_TRY_CPP], - [AC_REQUIRE_CPP()dnl - cat > conftest.$ac_ext <<EOF - [#]line __oline__ "configure" -@@ -1703,14 +1703,14 @@ - - dnl AC_EGREP_HEADER(PATTERN, HEADER-FILE, ACTION-IF-FOUND [, - dnl ACTION-IF-NOT-FOUND]) --AC_DEFUN(AC_EGREP_HEADER, -+AC_DEFUN([AC_EGREP_HEADER], - [AC_EGREP_CPP([$1], [#include <$2>], [$3], [$4])]) - - dnl Because this macro is used by AC_PROG_GCC_TRADITIONAL, which must - dnl come early, it is not included in AC_BEFORE checks. - dnl AC_EGREP_CPP(PATTERN, PROGRAM, [ACTION-IF-FOUND [, - dnl ACTION-IF-NOT-FOUND]]) --AC_DEFUN(AC_EGREP_CPP, -+AC_DEFUN([AC_EGREP_CPP], - [AC_REQUIRE_CPP()dnl - cat > conftest.$ac_ext <<EOF - [#]line __oline__ "configure" -@@ -1740,7 +1740,7 @@ - - dnl AC_TRY_COMPILE(INCLUDES, FUNCTION-BODY, - dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) --AC_DEFUN(AC_TRY_COMPILE, -+AC_DEFUN([AC_TRY_COMPILE], - [cat > conftest.$ac_ext <<EOF - ifelse(AC_LANG, [FORTRAN77], - [ program main -@@ -1773,7 +1773,7 @@ - - dnl AC_COMPILE_CHECK(ECHO-TEXT, INCLUDES, FUNCTION-BODY, - dnl ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) --AC_DEFUN(AC_COMPILE_CHECK, -+AC_DEFUN([AC_COMPILE_CHECK], - [AC_OBSOLETE([$0], [; instead use AC_TRY_COMPILE or AC_TRY_LINK, and AC_MSG_CHECKING and AC_MSG_RESULT])dnl - ifelse([$1], , , [AC_CHECKING([for $1]) - ])dnl -@@ -1782,7 +1782,7 @@ - - dnl AC_TRY_LINK(INCLUDES, FUNCTION-BODY, - dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) --AC_DEFUN(AC_TRY_LINK, -+AC_DEFUN([AC_TRY_LINK], - [cat > conftest.$ac_ext <<EOF - ifelse(AC_LANG, [FORTRAN77], - [ -@@ -1817,7 +1817,7 @@ - - dnl AC_TRY_RUN(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE - dnl [, ACTION-IF-CROSS-COMPILING]]]) --AC_DEFUN(AC_TRY_RUN, -+AC_DEFUN([AC_TRY_RUN], - [if test "$cross_compiling" = yes; then - ifelse([$4], , - [errprint(__file__:__line__: warning: [AC_TRY_RUN] called without default to allow cross compiling -@@ -1831,7 +1831,7 @@ - - dnl Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler. - dnl AC_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE]]) --AC_DEFUN(AC_TRY_RUN_NATIVE, -+AC_DEFUN([AC_TRY_RUN_NATIVE], - [cat > conftest.$ac_ext <<EOF - [#]line __oline__ "configure" - #include "confdefs.h" -@@ -1859,7 +1859,7 @@ - - - dnl AC_CHECK_HEADER(HEADER-FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) --AC_DEFUN(AC_CHECK_HEADER, -+AC_DEFUN([AC_CHECK_HEADER], - [dnl Do the transliteration at runtime so arg 1 can be a shell variable. - ac_safe=`echo "$1" | sed 'y%./+-%__p_%'` - AC_MSG_CHECKING([for $1]) -@@ -1877,7 +1877,7 @@ - ]) - - dnl AC_CHECK_HEADERS(HEADER-FILE... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) --AC_DEFUN(AC_CHECK_HEADERS, -+AC_DEFUN([AC_CHECK_HEADERS], - [for ac_hdr in $1 - do - AC_CHECK_HEADER($ac_hdr, -@@ -1892,7 +1892,7 @@ - dnl ### Checking for the existence of files - - dnl AC_CHECK_FILE(FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) --AC_DEFUN(AC_CHECK_FILE, -+AC_DEFUN([AC_CHECK_FILE], - [AC_REQUIRE([AC_PROG_CC]) - dnl Do the transliteration at runtime so arg 1 can be a shell variable. - ac_safe=`echo "$1" | sed 'y%./+-%__p_%'` -@@ -1919,7 +1919,7 @@ - ]) - - dnl AC_CHECK_FILES(FILE... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) --AC_DEFUN(AC_CHECK_FILES, -+AC_DEFUN([AC_CHECK_FILES], - [for ac_file in $1 - do - AC_CHECK_FILE($ac_file, -@@ -1935,7 +1935,7 @@ - - - dnl AC_CHECK_FUNC(FUNCTION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) --AC_DEFUN(AC_CHECK_FUNC, -+AC_DEFUN([AC_CHECK_FUNC], - [AC_MSG_CHECKING([for $1]) - AC_CACHE_VAL(ac_cv_func_$1, - [AC_TRY_LINK( -@@ -1974,7 +1974,7 @@ - ]) - - dnl AC_CHECK_FUNCS(FUNCTION... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) --AC_DEFUN(AC_CHECK_FUNCS, -+AC_DEFUN([AC_CHECK_FUNCS], - [for ac_func in $1 - do - AC_CHECK_FUNC($ac_func, -@@ -1986,7 +1986,7 @@ - ]) - - dnl AC_REPLACE_FUNCS(FUNCTION...) --AC_DEFUN(AC_REPLACE_FUNCS, -+AC_DEFUN([AC_REPLACE_FUNCS], - [AC_CHECK_FUNCS([$1], , [LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"]) - AC_SUBST(LIBOBJS)dnl - ]) -@@ -1996,12 +1996,12 @@ - - - dnl AC_CHECK_SIZEOF(TYPE [, CROSS-SIZE]) --AC_DEFUN(AC_CHECK_SIZEOF, -+AC_DEFUN([AC_CHECK_SIZEOF], - [changequote(<<, >>)dnl - dnl The name to #define. --define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl -+define([<<AC_TYPE_NAME>>], translit(sizeof_$1, [a-z *], [A-Z_P]))dnl - dnl The cache variable name. --define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl -+define([<<AC_CV_NAME>>], translit(ac_cv_sizeof_$1, [ *], [_p]))dnl - changequote([, ])dnl - AC_MSG_CHECKING(size of $1) - AC_CACHE_VAL(AC_CV_NAME, -@@ -2024,7 +2024,7 @@ - - - dnl AC_CHECK_TYPE(TYPE, DEFAULT) --AC_DEFUN(AC_CHECK_TYPE, -+AC_DEFUN([AC_CHECK_TYPE], - [AC_REQUIRE([AC_HEADER_STDC])dnl - AC_MSG_CHECKING(for $1) - AC_CACHE_VAL(ac_cv_type_$1, -@@ -2047,13 +2047,13 @@ - - - dnl AC_CONFIG_HEADER(HEADER-TO-CREATE ...) --AC_DEFUN(AC_CONFIG_HEADER, -+AC_DEFUN([AC_CONFIG_HEADER], - [define([AC_LIST_HEADER], $1)]) - - dnl Link each of the existing files SOURCE... to the corresponding - dnl link name in DEST... - dnl AC_LINK_FILES(SOURCE..., DEST...) --AC_DEFUN(AC_LINK_FILES, -+AC_DEFUN([AC_LINK_FILES], - [dnl - define([AC_LIST_FILES], ifdef([AC_LIST_FILES], [AC_LIST_FILES ],)[$1])dnl - define([AC_LIST_LINKS], ifdef([AC_LIST_LINKS], [AC_LIST_LINKS ],)[$2])]) -@@ -2062,7 +2062,7 @@ - dnl Use diversions instead of macros so we can be robust in the - dnl presence of commas in $1 and/or $2. - dnl AC_OUTPUT_COMMANDS(EXTRA-CMDS, INIT-CMDS) --AC_DEFUN(AC_OUTPUT_COMMANDS, -+AC_DEFUN([AC_OUTPUT_COMMANDS], - [AC_DIVERT_PUSH(AC_DIVERSION_CMDS)dnl - [$1] - AC_DIVERT_POP()dnl -@@ -2071,7 +2071,7 @@ - AC_DIVERT_POP()]) - - dnl AC_CONFIG_SUBDIRS(DIR ...) --AC_DEFUN(AC_CONFIG_SUBDIRS, -+AC_DEFUN([AC_CONFIG_SUBDIRS], - [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl - define([AC_LIST_SUBDIRS], ifdef([AC_LIST_SUBDIRS], [AC_LIST_SUBDIRS ],)[$1])dnl - subdirs="AC_LIST_SUBDIRS" -@@ -2081,7 +2081,7 @@ - dnl The big finish. - dnl Produce config.status, config.h, and links; and configure subdirs. - dnl AC_OUTPUT([FILE...] [, EXTRA-CMDS] [, INIT-CMDS]) --define(AC_OUTPUT, -+define([AC_OUTPUT], - [trap '' 1 2 15 - AC_CACHE_SAVE - trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 -@@ -2176,7 +2176,7 @@ - dnl This is a subroutine of AC_OUTPUT. - dnl It is called inside configure, outside of config.status. - dnl AC_OUTPUT_MAKE_DEFS() --define(AC_OUTPUT_MAKE_DEFS, -+define([AC_OUTPUT_MAKE_DEFS], - [# Transform confdefs.h into DEFS. - dnl Using a here document instead of a string reduces the quoting nightmare. - # Protect against shell expansion while executing Makefile rules. -@@ -2199,7 +2199,7 @@ - dnl here document whose contents are going into config.status, but - dnl upon returning, the here document is being quoted. - dnl AC_OUTPUT_FILES(FILE...) --define(AC_OUTPUT_FILES, -+define([AC_OUTPUT_FILES], - [# Protect against being on the right side of a sed subst in config.status. - changequote(, )dnl - sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; -@@ -2380,7 +2380,7 @@ - dnl This is a subroutine of AC_OUTPUT. It is called inside a quoted - dnl here document whose contents are going into config.status. - dnl AC_OUTPUT_HEADER(HEADER-FILE...) --define(AC_OUTPUT_HEADER, -+define([AC_OUTPUT_HEADER], - [changequote(<<, >>)dnl - # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where - # NAME is the cpp macro being defined and VALUE is the value it is being given. -@@ -2507,7 +2507,7 @@ - dnl This is a subroutine of AC_OUTPUT. It is called inside a quoted - dnl here document whose contents are going into config.status. - dnl AC_OUTPUT_LINKS(SOURCE..., DEST...) --define(AC_OUTPUT_LINKS, -+define([AC_OUTPUT_LINKS], - [EOF - - cat >> $CONFIG_STATUS <<EOF -@@ -2564,7 +2564,7 @@ - dnl This is a subroutine of AC_OUTPUT. - dnl It is called after running config.status. - dnl AC_OUTPUT_SUBDIRS(DIRECTORY...) --define(AC_OUTPUT_SUBDIRS, -+define([AC_OUTPUT_SUBDIRS], - [ - if test "$no_recursion" != yes; then - ---- tetex-src-2.0.2/./texk/etc/autoconf/acsite.m4~configure 1998-03-04 08:19:45.000000000 -0500 -+++ tetex-src-2.0.2/./texk/etc/autoconf/acsite.m4 2004-01-26 20:17:53.000000000 -0500 -@@ -4,7 +4,7 @@ - - - dnl kb_AC_LIBTOOL_REPLACE_FUNCS(FUNCTION-NAME...) --AC_DEFUN(kb_AC_LIBTOOL_REPLACE_FUNCS, -+AC_DEFUN([kb_AC_LIBTOOL_REPLACE_FUNCS], - [for ac_func in $1 - do - AC_CHECK_FUNC($ac_func, , [LIBTOOL_LIBOBJS="$LIBTOOL_LIBOBJS ${ac_func}.lo"]) -@@ -16,7 +16,7 @@ - dnl Check if gcc asm for i386 needs external symbols with an underscore. - dnl Peter Breitenlohner, April 15, 1996. - undefine([pb_AC_ASM_UNDERSCORE]) --AC_DEFUN(pb_AC_ASM_UNDERSCORE, -+AC_DEFUN([pb_AC_ASM_UNDERSCORE], - [AC_REQUIRE_CPP()dnl - AC_CACHE_CHECK(whether gcc asm needs underscore, pb_cv_asm_underscore, - [ -@@ -58,7 +58,7 @@ - dnl From automake distribution, by Jim Meyering: - dnl Add --enable-maintainer-mode option to configure. - --AC_DEFUN(AM_MAINTAINER_MODE, -+AC_DEFUN([AM_MAINTAINER_MODE], - [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, ---- tetex-src-2.0.2/./texk/etc/autoconf/autoheader.m4~configure 1999-01-05 08:28:37.000000000 -0500 -+++ tetex-src-2.0.2/./texk/etc/autoconf/autoheader.m4 2004-01-26 20:17:53.000000000 -0500 -@@ -67,7 +67,7 @@ - - define([AC_HAVE_LIBRARY], [# - changequote(<<, >>)dnl --define(<<AC_LIB_NAME>>, dnl -+define([<<AC_LIB_NAME>>], dnl - patsubst(patsubst($1, <<lib\([^\.]*\)\.a>>, <<\1>>), <<-l>>, <<>>))dnl - changequote([, ])dnl - ifelse([$2], , [ ---- tetex-src-2.0.2/./texk/acklibtool.m4~configure 1997-10-03 07:38:16.000000000 -0400 -+++ tetex-src-2.0.2/./texk/acklibtool.m4 2004-01-26 20:17:53.000000000 -0500 -@@ -3,7 +3,7 @@ - dnl - dnl - dnl Find the script, check for subprogs, etc. --AC_DEFUN(kb_AC_PROG_LIBTOOL, -+AC_DEFUN([kb_AC_PROG_LIBTOOL], - [AC_REQUIRE([AC_PROG_RANLIB]) - AC_REQUIRE([AC_CANONICAL_HOST]) - # -@@ -49,7 +49,7 @@ - dnl - dnl - dnl Like AC_REPLACE_FUNCS, but add to LTLIBOBJS instead of LIBOBJS. --AC_DEFUN(kb_AC_KLIBTOOL_REPLACE_FUNCS, -+AC_DEFUN([kb_AC_KLIBTOOL_REPLACE_FUNCS], - [ dnl cannot require this function, since it doesn't have a provide call. - AC_CHECK_FUNCS($1,, LTLIBOBJS="$LTLIBOBJS $ac_func.lo") - AC_SUBST(LTLIBOBJS)dnl ---- tetex-src-2.0.2/./utils/texinfo/m4/gettext.m4~configure 2002-09-20 16:30:58.000000000 -0400 -+++ tetex-src-2.0.2/./utils/texinfo/m4/gettext.m4 2004-01-26 20:17:53.000000000 -0500 -@@ -65,8 +65,8 @@ - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT - ])])])]) -- define(gt_included_intl, ifelse([$1], [external], [no], [yes])) -- define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) -+ define([gt_included_intl], ifelse([$1], [external], [no], [yes])) -+ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) - - AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ ---- tetex-src-2.0.2/./utils/texinfo/acinclude.m4~configure 2002-09-29 12:18:16.000000000 -0400 -+++ tetex-src-2.0.2/./utils/texinfo/acinclude.m4 2004-01-26 20:17:53.000000000 -0500 -@@ -2,7 +2,7 @@ - - #serial 3 - --AC_DEFUN(jm_CHECK_DECLARATION, -+AC_DEFUN([jm_CHECK_DECLARATION], - [ - AC_REQUIRE([AC_HEADER_STDC])dnl - test -z "$ac_cv_header_memory_h" && AC_CHECK_HEADERS(memory.h) -@@ -33,7 +33,7 @@ - - dnl jm_CHECK_DECLARATIONS(INCLUDES, FUNCTION... [, ACTION-IF-DECLARED - dnl [, ACTION-IF-NOT-DECLARED]]) --AC_DEFUN(jm_CHECK_DECLARATIONS, -+AC_DEFUN([jm_CHECK_DECLARATIONS], - [ - for jm_func in $2 - do -@@ -51,7 +51,7 @@ - dnl This is just a wrapper function to encapsulate this kludge. - dnl Putting it in a separate file like this helps share it between - dnl different packages. --AC_DEFUN(txi_CHECK_DECLS, -+AC_DEFUN([txi_CHECK_DECLS], - [ - headers=' - #include <stdio.h> diff --git a/nonworking/tetex/tetex_2.0.2.bb b/nonworking/tetex/tetex_2.0.2.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/tetex/tetex_2.0.2.bb +++ /dev/null diff --git a/nonworking/unison/unison-2.9.1/debian.patch b/nonworking/unison/unison-2.9.1/debian.patch deleted file mode 100644 index 4fd666e97e..0000000000 --- a/nonworking/unison/unison-2.9.1/debian.patch +++ /dev/null @@ -1,10982 +0,0 @@ ---- unison-2.9.1.orig/uitext.ml -+++ unison-2.9.1/uitext.ml -@@ -297,7 +297,9 @@ - (ProceedImmediately, List.rev_append prev ril))); - (["q"], - ("exit " ^ Uutil.myName ^ " without propagating any changes"), -- fun () -> raise Sys.Break); -+ (fun () -> -+ newLine(); -+ raise Sys.Break)); - (["/"], - ("skip"), - (fun () -> ---- unison-2.9.1.orig/debian/unison.dirs -+++ unison-2.9.1/debian/unison.dirs -@@ -0,0 +1 @@ -+usr/bin ---- unison-2.9.1.orig/debian/README.Debian -+++ unison-2.9.1/debian/README.Debian -@@ -0,0 +1,19 @@ -+Documentation for Unison is in the manual, which is available -+in HTML, PostScript and text formats in /usr/share/doc/unison. -+The same documentation can also be accessed over the command -+line, and you can list the available topics by executing -+'unison -doc topics'. Of particular interest for new users -+is the tutorial at 'unison -doc tutorial'. -+ -+The most common usage of this package is to use ssh to connect -+to the remote host via to synchronise files. The 'Install' -+section of the manual details how to set up ssh with a key -+file and authentication agent to avoid repeatedly entering -+passwords or pass-phrases. Assuming your key file remains -+private, this is a more secure authentication method than -+passwords. -+ -+The GTK+ interface for Unison is now available separately in -+the unison-gtk package. -+ -+ -- Robert McQueen <robot101@debian.org> Wed, 29 Aug 2001 21:18:29 +0100 ---- unison-2.9.1.orig/debian/unison.doc-base -+++ unison-2.9.1/debian/unison.doc-base -@@ -0,0 +1,20 @@ -+Document: unison-manual -+Title: Unison Installation and Usage Manual -+Author: Benjamin Pierce <bcpierce@cis.upenn.edu> -+Abstract: Unison is a file-synchronization tool for Unix and -+ Windows. It allows two replicas of a collection of files and -+ directories to be stored on different hosts (or different -+ disks on the same host), modified separately, and then brought -+ up to date by propagating the changes in each replica to the -+ other. This manual describes how to install and use Unison. -+Section: Apps/Tools -+ -+Format: postscript -+Files: /usr/share/doc/unison/unison-manual.ps.gz -+ -+Format: text -+Files: /usr/share/doc/unison/unison-manual.text.gz -+ -+Format: HTML -+Index: /usr/share/doc/unison/unison-manual.html -+Files: /usr/share/doc/unison/unison-manual.html ---- unison-2.9.1.orig/debian/changelog -+++ unison-2.9.1/debian/changelog -@@ -0,0 +1,103 @@ -+unison (2.9.1-1) unstable; urgency=medium -+ -+ * New upstream version. (closes: #142748) -+ * Medium urgency to make woody release. Rationale: -+ - upstream versions of unison are rarely, if ever, broken, and if -+ they are, are fixed within days. this release has had a week or -+ two to sweat it out. -+ - the previous version had problems on windows. seeing as -+ cross-platform compatibility is a major feature of unison, this -+ could cause long-term aggrivation for people hoping to sync their -+ woody box with their windows box. -+ - unison's protocol is version specific, and if I waited until sid -+ released to upload this new version, I'd have to provide an old -+ version in sid sooner than I'd have liked. -+ - it'd really annoy me if the version in woody wasn't the latest -+ when it released. =) -+ -+ -- Robert McQueen <robot101@debian.org> Wed, 24 Apr 2002 19:05:08 +0100 -+ -+unison (2.8.1-2) unstable; urgency=low -+ -+ * Moved to main. -+ -+ -- Robert McQueen <robot101@debian.org> Sat, 30 Mar 2002 04:13:46 +0000 -+ -+unison (2.8.1-1) unstable; urgency=low -+ -+ * New upstream version. (closes: #138576) -+ * Added menu entry for unison-gtk. (closes: #133039) -+ * Changed 'lablgtk, libgtk1.2-dev' build dep to 'liblablgtk-ocaml-dev'. -+ * Updated manpage for new/removed options. -+ -+ -- Robert McQueen <robot101@debian.org> Fri, 29 Mar 2002 19:22:33 +0000 -+ -+unison (2.7.7-1) unstable; urgency=medium -+ -+ * New upstream version. Fixes bugs in connecting and the client -+ startup sequence. -+ -+ -- Robert McQueen <robot101@debian.org> Sun, 23 Sep 2001 19:27:27 +0100 -+ -+unison (2.7.1-2) unstable; urgency=low -+ -+ * Added libgtk1.2-dev build dep, but this is really a bug in lablgtk. -+ * Optimised debian/rules to only call shell once to set a variable, and -+ use that instead of an elaborate (and fallible) if construct. -+ -+ -- Robert McQueen <robot101@debian.org> Thu, 30 Aug 2001 12:57:44 +0100 -+ -+unison (2.7.1-1) unstable; urgency=low -+ -+ * New upstream version. (closes: #106983) -+ * Moved package to non-US/main - it recommends ssh. (closes: #109406) -+ * Added the GTK interface version in a seperate unison-gtk package. -+ (closes: #105911) -+ * Added symlinks from unison-gtk's documentation and manpage to -+ unison's. -+ * Amended the manpage to detail the unison-gtk binary and changed -+ command line options. -+ * Install 'NEWS' file as upstream changelog, which it is, and remove -+ some extraneous docs. -+ -+ -- Robert McQueen <robot101@debian.org> Thu, 30 Aug 2001 01:21:14 +0100 -+ -+unison (2.6.11-2) unstable; urgency=low -+ -+ * Added newline before descriptions are returned. (closes: #86621) -+ * Fixed gratuitous debhelperism - version 3 is not required. -+ (closes: #97563) -+ -+ -- Robert McQueen <robot101@debian.org> Tue, 15 May 2001 20:36:43 +0100 -+ -+unison (2.6.11-1) unstable; urgency=low -+ -+ * New upstream version. -+ -+ -- Robert McQueen <robot101@debian.org> Mon, 30 Apr 2001 19:06:03 +0100 -+ -+unison (2.6.1-2) unstable; urgency=low -+ -+ * Fixed to take account of no native (ocamlopt) compiler on some archs. -+ * Minor debian/rules cleanups. -+ -+ -- Robert McQueen <robot101@debian.org> Thu, 28 Dec 2000 18:23:55 +0000 -+ -+unison (2.6.1-1) unstable; urgency=low -+ -+ * Package adopted by new Debian maintainer. (closes: #75968) -+ * New upstream version. (closes: #65601) -+ -+ -- Robert McQueen <robot101@debian.org> Fri, 10 Nov 2000 23:12:02 +0000 -+ -+unison (1.180-2) unstable; urgency=low -+ -+ * Changed the architecture field from all to any. -+ -+ -- Sven LUTHER <luther@debian.org> Mon, 10 Jan 2000 19:50:16 +0100 -+ -+unison (1.180-1) unstable; urgency=low -+ -+ * Initial release. -+ -+ -- Sven LUTHER <luther@debian.org> Tue, 21 Dec 1999 12:15:49 +0100 ---- unison-2.9.1.orig/debian/unison-gtk.dirs -+++ unison-2.9.1/debian/unison-gtk.dirs -@@ -0,0 +1,3 @@ -+usr/bin -+usr/share/doc -+usr/share/man/man1 ---- unison-2.9.1.orig/debian/copyright -+++ unison-2.9.1/debian/copyright -@@ -0,0 +1,22 @@ -+Unison was packaged for Debian -+by Robert McQueen <robot101@debian.org> -+on Fri, 10 Nov 2000 23:12:02 +0000. -+ -+It was downloaded from: -+ http://www.cis.upenn.edu/~bcpierce/unison/download/stable/ -+ -+Benjamin Pierce <bcpierce@cis.upenn.edu> is the Unison project -+leader. -+ -+This program is free software; you can redistribute it and/or -+modify it under the terms of the GNU General Public License as -+published by the Free Software Foundation; either version 2 of -+the License, or (at your option) any later version. -+ -+This program is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+On Debian systems, the complete text of the GNU General Public -+License can be found in /usr/share/common-licenses/GPL file. ---- unison-2.9.1.orig/debian/unison.docs -+++ unison-2.9.1/debian/unison.docs -@@ -0,0 +1,5 @@ -+BUGS.txt -+TODO.txt -+unison-manual.txt -+debian/unison-manual.html -+debian/unison-manual.ps ---- unison-2.9.1.orig/debian/unison.1 -+++ unison-2.9.1/debian/unison.1 -@@ -0,0 +1,219 @@ -+.\" Hey, EMACS: -*- nroff -*- -+.\" First parameter, NAME, should be all caps -+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -+.\" other parameters are allowed: see man(7), man(1) -+.TH UNISON 1 "September 23, 2001" -+.\" Please adjust this date whenever revising the manpage. -+.\" -+.\" Some roff macros, for reference: -+.\" .nh disable hyphenation -+.\" .hy enable hyphenation -+.\" .ad l left justify -+.\" .ad b justify to both left and right margins -+.\" .nf disable filling -+.\" .fi enable filling -+.\" .br insert line break -+.\" .sp <n> insert n+1 empty lines -+.\" for manpage-specific macros, see man(7) -+.SH NAME -+unison \- a file-synchronization tool for Unix and Windows -+.SH SYNOPSIS -+.B unison -+.RI [ options ] -+.br -+.B unison -+root1 root2 -+.RI [ options ] -+.br -+.B unison -+profilename -+.RI [ options ] -+.br -+.B unison-gtk -+.RI [ options ] -+.SH DESCRIPTION -+This manual page briefly documents Unison, and was written for the -+Debian GNU/Linux distribution because the original program does not -+have a manual page. For a full description, please refer to the -+inbuilt documentation or the manuals in /usr/share/doc/unison/. The -+unison-gtk binary has similar command-line options, but allows the user -+to select and create profiles and configure options from within the -+program. -+.PP -+Unison is a file-synchronization tool for Unix and Windows. It allows -+two replicas of a collection of files and directories to be stored on -+different hosts (or different disks on the same host), modified -+separately, and then brought up to date by propagating the changes in -+each replica to the other. -+.PP -+Unison offers several advantages over various synchronization methods -+such as CVS, Coda, rsync, Intellisync, etc. Unison can run on and -+synchronize between Windows and many UNIX platforms. Unison requires -+no root privileges, system access or kernel changes to function. Unison -+can synchronize changes to files and directories in both directions, -+on the same machine, or across a network using ssh or a direct -+socket connection. -+.PP -+Transfers are optimised using a version of the rsync protocol, making -+it ideal for slower links. Unison has a clear and precise specification, -+and is resilient to failure due to its careful handling of the replicas -+and its private structures. -+.SH OPTIONS -+All Unison options are long, starting with one dash (`-') only. -+A summary of options is included here. For a complete description, -+see the inbuilt documentation or the manuals in /usr/share/doc/unison/. -+.TP -+.B \-addprefsto -+specify a file to add new preferences to in interactive mode -+.TP -+.B \-addversionno -+add version number to name of unison executable on server -+.TP -+.B \-auto -+automatically accept default actions -+.TP -+.B \-backup xxx -+add a regexp to the backup list -+.TP -+.B \-backups -+keep backup copies of files (deprecated: use 'backup') -+.TP -+.B \-batch -+batch mode: ask no questions at all -+.TP -+.B \-contactquietly -+suppress the 'contacting server' message during startup -+.TP -+.B \-debug xxx -+debug module xxx ('all' -> everything, 'verbose' -> more) -+.TP -+.B \-doc xxx -+show documentation ('-doc topics' lists topics) -+.TP -+.B \-dumbtty -+do not try to change terminal settings in text UI -+.TP -+.B \-editor xxx -+command for displaying the output of the -merge program -+.TP -+.B \-fastcheck -+do fast (and slightly unsafe) update detection on windows -+.TP -+.B \-follow xxx -+add a regexp to the follow list -+.TP -+.B \-force xxx -+force changes from this replica to the other -+.TP -+.B \-group -+synchronize group -+.TP -+.B \-height n -+height (in lines) of main window in graphical interface -+.TP -+.B \-ignore xxx -+add a regexp to the ignore list -+.TP -+.B \-ignorecase -+ignore upper/lowercase spelling of filenames -+.TP -+.B \-ignorenot xxx -+add a regexp to the ignorenot list -+.TP -+.B \-killserver -+kill server when done (even when using sockets) -+.TP -+.B \-log -+record actions in file specified by logfile preference -+.TP -+.B \-logfile xxx -+log file name -+.TP -+.B \-maxbackups n -+number of backed up versions of a file to keep -+.TP -+.B \-merge xxx -+command for merging conflicting files -+.TP -+.B \-merge2 xxx -+command for merging files (when no common version exists) -+.TP -+.B \-numericids -+don't map uid/gid values by user/group names -+.TP -+.B \-owner -+synchronize owner -+.TP -+.B \-path xxx -+path to synchronize -+.TP -+.B \-perms n -+part of the permissions which is synchronized -+.TP -+.B \-prefer xxx -+choose this replica's version in case of conflict -+.TP -+.B \-root xxx -+root of a replica -+.TP -+.B \-rootalias xxx -+register alias for canonical root names -+.TP -+.B \-rshargs xxx -+other arguments (if any) for remote shell command -+.TP -+.B \-rshcmd xxx -+path to the rsh executable -+.TP -+.B \-servercmd xxx -+name of unison executable on remote server -+.TP -+.B \-silent -+print nothing (except error messages) -+.TP -+.B \-socket xxx -+act as a server on a socket -+.TP -+.B \-sortbysize -+list changed files by size, not name -+.TP -+.B \-sortfirst xxx -+add a regexp to the sortfirst list -+.TP -+.B \-sortlast xxx -+add a regexp to the sortlast list -+.TP -+.B \-sortnewfirst -+list new before changed files -+.TP -+.B \-sshcmd xxx -+path to the ssh executable -+.TP -+.B \-statusdepth n -+status display depth for local files -+.TP -+.B \-terse -+suppress status messages -+.TP -+.B \-testserver -+exit immediately after the connection to the server -+.TP -+.B \-times -+synchronize modification times -+.TP -+.B \-ui xxx -+select user interface ('text' or 'graphic') -+.TP -+.B \-version -+print version and exit -+.PP -+Some preferences are just boolean flags. Others take numeric or string -+arguments, indicated in the preferences list by n or xxx. Most of the -+string preferences can be given several times; the arguments are -+accumulated into a list internally. -+.SH SEE ALSO -+The program is documented fully in the in-built documentation and the -+manual, available as HTML, PostScript and text in /usr/share/doc/unison/. -+.SH AUTHOR -+This manual page was written by Robert McQueen <robot101@debian.org>, -+for the Debian GNU/Linux system (but may be used by others). ---- unison-2.9.1.orig/debian/control -+++ unison-2.9.1/debian/control -@@ -0,0 +1,37 @@ -+Source: unison -+Section: net -+Priority: optional -+Maintainer: Robert McQueen <robot101@debian.org> -+Build-Depends: debhelper, ocaml (>= 3.00-1), liblablgtk-ocaml-dev -+Standards-Version: 3.5.6 -+ -+Package: unison -+Architecture: any -+Depends: ${shlibs:Depends} -+Recommends: ssh -+Description: A file-synchronization tool for Unix and Windows -+ Unison is a file-synchronization tool for Unix and Windows, written -+ in OCaml. It allows two replicas of a collection of files and -+ directories to be stored on different hosts (or different disks -+ on the same host), modified separately, and then brought up to -+ date by propagating the changes in each replica to the other. -+ . -+ Unison offers several advantages over various synchronization methods -+ such as CVS, Coda, rsync, Intellisync, etc. Unison can run on and -+ synchronize between Windows and many UNIX platforms. Unison requires -+ no root privileges, system access or kernel changes to function. Unison -+ can synchronize changes to files and directories in both directions, -+ on the same machine, or across a network using ssh or a direct -+ socket connection. -+ . -+ Transfers are optimised using a version of the rsync protocol, -+ making it ideal for slower links. Unison has a clear and precise -+ specification, and is resilient to failure due to its careful -+ handling of the replicas and its private structures. -+ -+Package: unison-gtk -+Architecture: any -+Depends: ${shlibs:Depends}, unison (= ${Source-Version}) -+Description: A file-synchronization tool for Unix and Windows - GTK interface -+ This package adds the optional GTK interface to the file synchronization -+ tool 'unison'. ---- unison-2.9.1.orig/debian/rules -+++ unison-2.9.1/debian/rules -@@ -0,0 +1,76 @@ -+#!/usr/bin/make -f -+ -+# export DH_VERBOSE=1 -+export DH_COMPAT=2 -+ -+# set $(NATIVE) to true if this arch has an optimising compiler -+NATIVE := $(shell test -x /usr/bin/ocamlopt && echo true || echo false) -+ -+build: build-stamp -+build-stamp: -+ dh_testdir -+# if we have the optimising compiler, build natively with debugging because -+# we can strip it later. if we don't, disable debugging because stripping -+# the non-native binaries removes the bytecode and leaves you with the -+# interpreter, and a somewhat useless binary... =) -+ $(MAKE) UISTYLE=gtk NATIVE=$(NATIVE) DEBUGGING=$(NATIVE) -+ mv unison unison-gtk -+ $(MAKE) UISTYLE=text NATIVE=$(NATIVE) DEBUGGING=$(NATIVE) -+ $(CURDIR)/unison -doc all > $(CURDIR)/unison-manual.txt -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp configure-stamp -+ rm -f unison-manual.txt unison-gtk -+ -$(MAKE) clean -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ install -o root -g root -m 755 unison $(CURDIR)/debian/unison/usr/bin -+ install -o root -g root -m 755 unison-gtk $(CURDIR)/debian/unison-gtk/usr/bin -+ ln -s unison $(CURDIR)/debian/unison-gtk/usr/share/doc/unison-gtk -+ ln -s unison.1.gz $(CURDIR)/debian/unison-gtk/usr/share/man/man1/unison-gtk.1.gz -+ -+binary-indep: build install -+ -+binary-arch: build install -+# dh_testversion -+ dh_testdir -+ dh_testroot -+# dh_installdebconf -+ dh_installdocs -+# dh_installexamples -+ dh_installmenu -+# dh_installemacsen -+# dh_installpam -+# dh_installinit -+# dh_installcron -+ dh_installman debian/unison.1 -+# dh_installinfo -+# dh_undocumented -+ dh_installchangelogs NEWS -+# dh_link -+# only strip it if it's native or it breaks -+ set -e; \ -+ if [ -x "/usr/bin/ocamlopt" ]; then \ -+ dh_strip; \ -+ fi -+ dh_compress -+ dh_fixperms -+# dh_suidregister -+# dh_makeshlibs -+ dh_installdeb -+# dh_perl -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install configure ---- unison-2.9.1.orig/debian/unison-manual.html -+++ unison-2.9.1/debian/unison-manual.html -@@ -0,0 +1,4136 @@ -+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" -+ "http://www.w3.org/TR/REC-html40/loose.dtd"> -+<HTML> -+<HEAD><TITLE></TITLE> -+<META http-equiv="Content-Type" content="text/html; charset= ISO-8859-1"> -+</HEAD> -+<BODY BGCOLOR=silver TEXT=black> -+<!--HTMLHEAD--> -+<!--ENDHTML--> -+<!--CUT DEF section 1 --> -+<BR> -+<BR> -+ -+<DIV ALIGN=center> -+ <FONT SIZE=6>Unison File Synchronizer<BR></FONT><A HREF="http://www.cis.upenn.edu/~bcpierce/unison"><FONT SIZE=4>http://www.cis.upenn.edu/</FONT><FONT SIZE=4>~</FONT><FONT SIZE=4>bcpierce/unison</FONT></A><FONT SIZE=4><BR><BR></FONT><FONT SIZE=5>Version -+ 2.9.1<BR><BR></FONT><FONT SIZE=6>User Manual and Reference -+ </FONT></DIV> -+<BR> -+<!--TOC section Contents--> -+ -+<H2>Contents</H2> -+ <BLOCKQUOTE> -+ <A HREF="#intro"><FONT SIZE=4><B>Preface</B></FONT></A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#people">People</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#copying">Copying</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#bugs">Reporting Bugs</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#contrib">How You Can Help</A><BR><A HREF="#install"><FONT SIZE=4><B>Installation</B></FONT></A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#download">Downloading Unison</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#afterinstall">Running Unison</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#upgrading">Upgrading</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#ports">Contributed Ports</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#building">Building Unison from Scratch</A><BR> <A HREF="#build-unix">Unix</A><BR> <A HREF="#build-win">Windows</A><BR> <A HREF="#build-opts">Installation Options</A><BR><A HREF="#tutorial"><FONT SIZE=4><B>Tutorial</B></FONT></A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#prelim">Preliminaries</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#local">Local Usage</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#remote">Remote Usage</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#rshmeth">Remote Shell Method</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#socketmeth">Socket Method</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#usingit">Using Unison for All Your Files</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#further">Going Further</A><BR><A HREF="#basics"><FONT SIZE=4><B>Basic Concepts</B></FONT></A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#roots">Roots</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#paths">Paths</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#updates">What is an Update?</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#conflicts">What is a Conflict?</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#recon">Reconciliation</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#failures">Invariants</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#caveats">Caveats and Shortcomings</A><BR><A HREF="#reference"><FONT SIZE=4><B>Reference</B></FONT></A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#running">Running Unison</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#unisondir">The <TT>.unison</TT> Directory</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#archives">Archive Files</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#prefs">Preferences</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#profile">Profiles</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#profileegs">Sample Profiles</A><BR> <A HREF="#minimalprofile">A Minimal Profile</A><BR> <A HREF="#basicprofile">A Basic Profile</A><BR> <A HREF="#powerprofile">A Power-User Profile</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#backups">Keeping Backups</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#merge">Merging Conflicting Versions</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#ui">The User Interface</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#exit">Exit code</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#pathspec">Path specification</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#ignore">Ignoring Paths</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#symlinks">Symbolic Links</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#perms">Permissions</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#crossplatform">Cross-Platform Synchronization</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#speed">Slow Links</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#fastcheck">Fast Update Detection</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#click">Click-starting Unison</A><BR><A HREF="#advice"><FONT SIZE=4><B>Advice</B></FONT></A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#faq">Frequently Asked Questions</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#problems">Common Problems</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#tips">Tricks and Tips</A><BR><A HREF="#ssh"><FONT SIZE=4><B>Installing Ssh</B></FONT></A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#ssh-unix">Unix</A><BR> <FONT SIZE=4><FONT FACE=symbol>·</FONT></FONT><A HREF="#ssh-win">Windows</A><BR><A HREF="#news"><FONT SIZE=4><B>Changes in Version 2.9.1</B></FONT></A><BR> -+ </BLOCKQUOTE> -+ Unison is a file-synchronization tool for Unix and Windows. -+It allows two replicas of a collection of files and directories to be -+stored on different hosts (or different disks on the same host), -+modified separately, and then brought up to date by propagating the -+changes in each replica to the other.<BR> -+<BR> -+Unison -+shares a number of features with tools such as configuration -+management packages (<A HREF="http://www.cyclic.com/">CVS</A>, -+<A HREF="http://www.XCF.Berkeley.EDU/~jmacd/prcs.html">PRCS</A>, -+etc.), -+distributed filesystems -+(<A HREF="http://www.coda.cs.cmu.edu/">Coda</A>, -+etc.), -+uni-directional mirroring utilities -+(<A HREF="http://samba.anu.edu.au/rsync/">rsync</A>, -+etc.), -+and other synchronizers -+(<A HREF="http://www.pumatech.com">Intellisync</A>, -+<A HREF="http://www.merl.com/reports/TR99-14/">Reconcile</A>, -+etc). -+However, there are several points where it differs: -+<UL> -+<LI> -+Unison runs on both Windows (95, 98, NT, and 2k) and Unix (Solaris, -+ Linux, etc.) systems. Moreover, Unison works <EM>across</EM> -+ platforms, allowing you to synchronize a Windows laptop with a -+ Unix server, for example. -+ -+<LI>Unlike a distributed filesystem, Unison is a user-level program: -+ there is no need to hack (or own!) the kernel, or to have -+ superuser privileges on either host. -+ -+<LI>Unlike simple mirroring or backup utilities, Unison can deal -+ with updates to both replicas of a distributed directory structure. -+ Updates that do not conflict are propagated automatically. -+ Conflicting updates are detected and displayed. -+ -+<LI>Unison works between any pair of machines connected to the -+ internet, communicating over either a direct socket link or -+ tunneling over an <TT>rsh</TT> or an encrypted <TT>ssh</TT> connection. -+ It is careful with network bandwidth, and runs well over slow links -+ such as PPP connections. Transfers of small updates to large files are -+ optimized using a compression protocol similar to rsync. -+ -+<LI>Unison has a clear and precise specification, described -+below. -+<LI>Unison is resilient to failure. It is careful to leave the -+ replicas and its own private structures in a sensible state at all -+ times, even in case of abnormal termination or communication -+ failures. -+ -+<LI>Unison is free; full source code is available under the GNU -+Public License. -+</UL>There is a moderated, very-low-volume -+<A HREF="http://groups.yahoo.com/group/unison-announce">announcement list</A> -+for new Unison releases; the archives of this list are available at the -+above link. There is also a moderated (but higher volume) -+<A HREF="http://groups.yahoo.com/group/unison-users">discussion list</A> for -+Unison users.<BR> -+<BR> -+<hr><!--TOC section <A NAME="intro"></A>Preface--> -+ -+<H2><A NAME="intro"></A>Preface</H2><!--TOC subsection <A NAME="people"></A>People--> -+ -+<H3><A NAME="people"></A>People</H3><UL> -+<LI> -+<A HREF="http://www.cis.upenn.edu/~bcpierce">Benjamin Pierce</A> -+ is the Unison project leader. Zhe Yang is a full-time postdoc on the -+ project. -+ -+<LI>The current version of Unison was designed and implemented by -+ <A HREF="http://www.cis.upenn.edu/~tjim">Trevor Jim</A>, -+ Benjamin Pierce, -+and -+ Jérôme Vouillon, -+with -+ Sylvain Gommier and -+ Matthieu Goulay. -+ -+<LI>Our implementation of the rsync protocol was built by -+ Norman Ramsey and Sylvain Gommier. It is is based on -+ Andrew Tridgell's thesis work and inspired by his rsync utility. -+ -+<LI>The mirroring and merging functionality was implemented by -+ Sylvain Roy. -+ -+<LI>Jacques Garrigue contributed the original Gtk version of the user -+ interface. -+ -+<LI>Sundar Balasubramaniam helped build a prototype implementation of -+an earlier synchronizer in Java. Insik Shin and -+<A HREF="http://www.cis.upenn.edu/~lee">Insup Lee</A> contributed design -+ideas to this implementation. Cedric Fournet contributed to an even -+earlier prototype. -+</UL><!--TOC subsection <A NAME="copying"></A>Copying--> -+ -+<H3><A NAME="copying"></A>Copying</H3>Unison is free software. You are free to change and redistribute it -+under the terms of the GNU General Public License. Please see the -+file COPYING in the Unison distribution for more information.<BR> -+<BR> -+<!--TOC subsection <A NAME="bugs"></A>Reporting Bugs--> -+ -+<H3><A NAME="bugs"></A>Reporting Bugs</H3>If Unison is not working the way you expect, here are some steps to -+follow: <BR> -+<BR> -+<UL> -+<LI> -+First, try running Unison with the <TT>-debug all</TT> command line option. -+This will cause Unison to generate a detailed trace of what it's -+doing, which may make it clearer where the problem is occurring. -+ -+<LI>Second, send mail to <A HREF="mailto:unison-help@cis.upenn.edu"><TT>unison-help@cis.upenn.edu</TT></A> describing the problem and we'll try to -+fix it. Make sure to include the version of Unison you are using (<TT>unison -version</TT>), the kind of machine(s) you are running it on, a -+record of what gets printed when the <TT>-debug all</TT> option is included, -+and as much information as you can about what went wrong. -+ -+<LI>If you think the problem you're having might have been encountered -+by others (e.g., if it seems like a configuration problem, not a real -+bug), then you may be able to get some help from the Unison users' -+mailing list, <A HREF="mailto:unison-users@groups.yahoo.com"><TT>unison-users@groups.yahoo.com</TT></A>. -+</UL><!--TOC subsection <A NAME="contrib"></A>How You Can Help--> -+ -+<H3><A NAME="contrib"></A>How You Can Help</H3>Unison is a part-time project for its developers: we work on it -+because we enjoy making something that is useful for us and for the -+community, but we all have other jobs to do. If you like Unison and -+want to help improve it, your contributions would be very welcome. -+For more details on how the code is organized, etc., see the file <TT>CONTRIB</TT> in the source distribution. <BR> -+<BR> -+If you don't feel like hacking, you can help us by simply letting us -+know how you like Unison. Even a short note like ``I'm using it; -+works fine'' or ``I looked at it but it's not quite what I want -+because...'' will give us valuable information.<BR> -+<BR> -+<hr><!--TOC section <A NAME="install"></A>Installation--> -+ -+<H2><A NAME="install"></A>Installation</H2>Unison is designed to be easy to install. The following sequence of -+steps should get you a fully working installation in a few minutes. (If -+you run into trouble, you may find the suggestions in -+the <A HREF="#advice">Advice</A> section helpful.)<BR> -+<BR> -+Unison can be used with either of two user interfaces: -+<OL> -+<LI> -+ -+a simple textual interface, suitable for dumb terminals (and -+running from scripts), and -+ -+<LI>a more sophisticated grapical interface, based on Gtk. -+</OL>You will need to install a copy of Unison on every machine that you -+want to synchronize. However, you only need the version with a -+graphical user interface (if you want a GUI at all) on the machine -+where you're actually going to display the interface (the <EM>client</EM> -+machine). Other machines that you synchronize with can get along just -+fine with the textual version.<BR> -+<BR> -+<!--TOC subsection <A NAME="download"></A>Downloading Unison--> -+ -+<H3><A NAME="download"></A>Downloading Unison</H3>If a pre-built binary of Unison is available for the client machine's -+architecture, just download it and put it somewhere in your search -+path (if you're going to invoke it from the command line) or on your -+desktop (if you'll be click-starting it).<BR> -+<BR> -+The executable file for the graphical version (with a name including -+<CODE>gtkui</CODE>) actually provides <EM>both</EM> interfaces: the graphical one -+appears by default, while the textual interface can be selected by including -+<CODE>-ui text</CODE> on the command line. The <CODE>textui</CODE> executable -+provides just the textual interface.<BR> -+<BR> -+If you don't see a pre-built executable for your architecture, you'll -+need to build it yourself. See the <A HREF="#building">Building Unison</A> section. -+(There are also a small number of ``contributed ports'' to other -+architectures that are not maintained by us. See -+the <A HREF="#ports">Contributed Ports</A> section to check what's available.)<BR> -+<BR> -+Check to make sure that what you have downloaded is really executable. -+Either click-start it, or type <FONT SIZE=4><TT>unison -version</TT></FONT> at the command -+line. <BR> -+<BR> -+Unison can be used in several different modes: with -+different directories on a single machine, with a -+remote machine over a direct socket connection, with a remote machine -+using <CODE>rsh</CODE> (on Unix systems), or with a remote Unix system (from either -+a Unix or a Windows client) using ssh -+for authentication and secure transfer. If you intend to use the last option, you may need to install ssh; see the <A HREF="#ssh">Installing Ssh</A> section.<BR> -+<BR> -+<!--TOC subsection <A NAME="afterinstall"></A>Running Unison--> -+ -+<H3><A NAME="afterinstall"></A>Running Unison</H3> Once you've got Unison installed on at least one system, read -+the <A HREF="#tutorial">Tutorial</A> section of the user manual (or type <FONT SIZE=4><TT>unison -doc -+ tutorial</TT></FONT>) for instructions on how to get started.<BR> -+<BR> -+<!--TOC subsection <A NAME="upgrading"></A>Upgrading--> -+ -+<H3><A NAME="upgrading"></A>Upgrading</H3>Upgrading to a new version of Unison should be as simple as throwing -+away the old binary and installing the new one.<BR> -+<BR> -+Before upgrading, it is a good idea to use the <EM>old</EM> version to -+make sure all your replicas are completely synchronized. A new -+version of Unison will sometimes introduce a different format for the -+archive files used to remember information about the previous state of -+the replicas. In this case, the old archive will be ignored (not -+deleted --- if you roll back to the previous version of Unison, you will -+find the old archives intact), which means that any differences -+between the replicas will show up as conflicts and need to be resolved -+manually. <BR> -+<BR> -+<!--TOC subsection <A NAME="ports"></A>Contributed Ports--> -+ -+<H3><A NAME="ports"></A>Contributed Ports</H3>A few people have offered to maintain pre-built executables, easy -+installation scripts, etc., for particular architectures. They are not -+maintained by us and are not guaranteed to work, be kept up to date with -+our latest releases, etc., but you may find them useful. Here's what's -+available at the moment:<BR> -+<BR> -+<UL> -+<LI> -+<A HREF="mailto:dpelleg+unison@cs.cmu.edu">Dan Pelleg</A> has ported -+unison to FreeBSD. This means that any FreeBSD -+user with an up-to-date ``ports'' collection can install unison by doing: -+<CODE>cd /usr/ports/net/unison; make && make install</CODE>. -+(Make sure your ``ports'' collection is fully up to date before doing -+this, to ensure that you get the most recent Unison version that has been -+compiled for FreeBSD.)<BR> -+<BR> -+FreeBSD binaries can also be obtained directly from -+<BLOCKQUOTE> -+<A HREF="http://www.freebsd.org/cgi/ports.cgi?query=unison&stype=all">http://www.freebsd.org/cgi/ports.cgi?query=unison&stype=all</A>. -+</BLOCKQUOTE> -+<LI>Andrew Pitts has built binaries for some versions of Unison for the -+Linux-PPC platform. They can be found in -+<A HREF="ftp://ftp.cl.cam.ac.uk/papers/amp12/unison/">ftp://ftp.cl.cam.ac.uk/papers/amp12/unison/</A>. <BR> -+<BR> -+ -+<LI><A HREF="mailto:robot101@debian.org">Robert McQueen</A> maintains -+a Debian package for Unison. The homepage is located at -+<BLOCKQUOTE> -+<A HREF="http://packages.debian.org/testing/non-us/unison.html">http://packages.debian.org/testing/non-us/unison.html</A>. -+</BLOCKQUOTE> -+<LI><A HREF="mailto:crisco+unison@bic.mni.mcgill.ca">Chris Cocosco</A> -+provides binaries for Unison under SGI IRIX (6.5). They can be found in -+<BLOCKQUOTE> -+<A HREF="www.bic.mni.mcgill.ca/users/crisco/unison.irix/">www.bic.mni.mcgill.ca/users/crisco/unison.irix/</A>. -+</BLOCKQUOTE> -+</UL><!--TOC subsection <A NAME="building"></A>Building Unison from Scratch--> -+ -+<H3><A NAME="building"></A>Building Unison from Scratch</H3>If a pre-built image is not available, you will need to compile it from -+scratch; the sources are available from the same place as the binaries.<BR> -+<BR> -+In principle, Unison should work on any platform to which OCaml has been -+ported and on which the <CODE>Unix</CODE> module is fully implemented. In -+particular, it has been tested on many flavors of Windows (98, NT, 2000) -+and Unix (Solaris, Linux, FreeBSD, MacOS X), and on both 32- and 64-bit -+architectures. <BR> -+<BR> -+Unison does not work (and probably never will) on MacOS versions 8 or 9. <BR> -+<BR> -+<!--TOC subsubsection <A NAME="build-unix"></A>Unix--> -+ -+<H4><A NAME="build-unix"></A>Unix</H4>You'll need the Objective Caml compiler (version 3.04 or later<A NAME="text1"></A><A HREF="#note1"><SUP><FONT SIZE=2>1</FONT></SUP></A>), which -+is available from its official site <A HREF="http://caml.inria.fr">http://caml.inria.fr</A>. Building and -+installing OCaml on Unix systems is very straightforward; follow the -+instructions in the distribution. You'll probably want to build the -+native-code compiler in addition to the bytecode compiler, but this is -+not absolutely necessary.<BR> -+<BR> -+(Quick start: on many systems, the following sequence of commands will -+get you a working and installed compiler: first do <TT>make world opt</TT>, -+then <TT>su</TT> to root, then do <TT>make install</TT>.)<BR> -+<BR> -+You'll also need the GNU make utility, standard on many Unix -+systems. (Type <FONT SIZE=4><TT>make --version</TT></FONT> to check that you've got the -+GNU version.)<BR> -+<BR> -+Once you've got OCaml installed, grab a copy of the Unison sources, -+unzip and untar them, change to the new <FONT SIZE=4><TT>unison</TT></FONT> directory, and -+type -+<PRE> -+ make UISTYLE=text -+</PRE> -+The result should be an executable file called <FONT SIZE=4><TT>unison</TT></FONT>.<BR> -+<BR> -+Type <FONT SIZE=4><TT>./unison</TT></FONT> to make sure the program is executable. You -+should get back a usage message.<BR> -+<BR> -+If you want to build a graphical user interface, choose one of the -+following: -+<UL> -+<LI> -+Gtk interface:<BR>You will need Gtk (version 1.2 or later, available from -+ <A HREF="http://www.gtk.org">http://www.gtk.org</A> and standard -+ on many Unix installations). -+ -+ You also need the get LablGtk (version 1.1.3 is known to work). Grab the -+ developers' tarball from -+ <BLOCKQUOTE> -+ <A HREF="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html">http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html</A>, -+ </BLOCKQUOTE> -+ untar it, and follow the instructions to build and install it.<BR> -+<BR> -+ (Quick start: <TT>make configure</TT>, then <TT>make</TT>, then <TT>make -+ opt</TT>, then <TT>su</TT> and <TT>make install</TT>.)<BR> -+<BR> -+ Now build unison. If your search paths are set up correctly, typing -+<PRE> -+ make UISTYLE=gtk -+</PRE> -+ should build a <CODE>unison</CODE> executable with a Gtk graphical interface. -+</UL>If this step does not work, don't worry: Unison works fine with the -+textual interface.<BR> -+<BR> -+Put the <CODE>unison</CODE> executable somewhere in your search path, either -+by adding the Unison directory to your PATH variable or by copying the -+executable to some standard directory where executables are stored.<BR> -+<BR> -+<!--TOC subsubsection <A NAME="build-win"></A>Windows--> -+ -+<H4><A NAME="build-win"></A>Windows</H4>Although the binary distribution should work on any version of Windows, -+some people may want to build Unison from scratch on those systems too.<BR> -+<BR> -+<!--TOC paragraph Bytecode version:--> -+ -+<H5> Bytecode version:</H5> The simpler but slower compilation option to build a Unison executable is to build a bytecode version. You need first install Windows version of the OCaml compiler (version 3.04 or later, available from <A HREF="http://caml.inria.fr">http://caml.inria.fr</A>). Then grab a copy of Unison sources and type -+<PRE> -+ make UISTYLE=text NATIVE=false -+</PRE> -+to compile the bytecode. The result should be an executable file called <CODE>unison.exe</CODE>.<BR> -+<BR> -+<!--TOC paragraph Native version:--> -+ -+<H5> Native version:</H5> To build a more efficient, native version of Unison on Windows, you can choose between two options. Both options require the OCaml distribution version 3.04 as well as the Cygwin layer, which provides certain GNU tools. The two options differ in the C compiler employed: MS Visual C++ (MSVC) vs. Cygwin GNU C.<BR> -+<BR> -+The tradeoff? -+<UL> -+<LI> -+Only the MSVC option can produce statically linked Unison executable. -+ -+<LI>The Cygwin GNU C option requires only free software. -+</UL>The files ``INSTALL.win32-msvc'' and ``INSTALL.win32-cygwin-gnuc'' describe -+the building procedures for the respective options.<BR> -+<BR> -+<!--TOC subsubsection <A NAME="build-opts"></A>Installation Options--> -+ -+<H4><A NAME="build-opts"></A>Installation Options</H4>The <CODE>Makefile</CODE> in the distribution includes several switches that -+can be used to control how Unison is built. Here are the most useful -+ones: -+<UL> -+<LI> -+Building with <CODE>NATIVE=true</CODE> uses the native-code OCaml -+compiler, yielding an executable that will run quite a bit faster. We use -+this for building distribution versions. -+ -+<LI>Building with <CODE>make DEBUGGING=true</CODE> generates debugging -+symbols. -+ -+<LI>Building with <CODE>make STATIC=true</CODE> generates a (mostly) -+statically linked executable. We use this for building distribution -+versions, for portability. -+</UL> -+<hr><!--TOC section <A NAME="tutorial"></A>Tutorial--> -+ -+<H2><A NAME="tutorial"></A>Tutorial</H2><!--TOC subsection <A NAME="prelim"></A>Preliminaries--> -+ -+<H3><A NAME="prelim"></A>Preliminaries</H3>Unison can be used with either of two user interfaces: -+<OL> -+<LI> -+ -+a straightforward textual interface and -+ -+<LI>a more sophisticated graphical interface -+</OL> -+The textual interface is more convenient for running from scripts and -+works on dumb terminals; the graphical interface is better for most -+interactive use. For this tutorial, you can use either.<BR> -+<BR> -+The command-line arguments to both versions are identical. -+The graphical version can be run directly by clicking on its icon, but -+this requires a little set-up (see the <A HREF="#click">Click-starting Unison</A> section). -+For this tutorial, we assume that you're starting it from the command -+line. <BR> -+<BR> -+Unison can synchronize files and directories on a single machine, or -+between two machines on network. (The same program runs on both -+machines; the only difference is which one is responsible for -+displaying the user interface.) If you're only interested in a -+single-machine setup, then let's call that machine the <EM>client</EM>. If -+you're synchronizing two machines, let's call them <EM>client</EM> and -+<EM>server</EM>.<BR> -+<BR> -+<!--TOC subsection <A NAME="local"></A>Local Usage--> -+ -+<H3><A NAME="local"></A>Local Usage</H3>Let's get the client machine set up first, and see how to synchronize -+two directories on a single machine.<BR> -+<BR> -+Follow the instructions in the <A HREF="#install">Installation</A> section to either -+download or build an executable version of Unison, and install it -+somewhere on your search path. (If you just want to use the textual user -+interface, download the appropriate textui binary. If you just want to -+the graphical interface---or if you will use both interfaces [the gtkui -+binary actually has both compiled in]---then download the gtkui binary.)<BR> -+<BR> -+Create a small test directory <TT>a.tmp</TT> containing a couple of files -+and/or subdirectories, e.g., -+<PRE> -+ mkdir a.tmp -+ touch a.tmp/a a.tmp/b -+ mkdir a.tmp/d -+ touch a.tmp/d/f -+</PRE> -+Copy this directory to b.tmp: -+<PRE> -+ cp -r a.tmp b.tmp -+</PRE>Now try synchronizing <TT>a.tmp</TT> and <TT>b.tmp</TT>. (Since they are -+identical, synchronizing them won't propagate any changes, but Unison -+will remember the current state of both directories so that it will be -+able to tell next time what has changed.) Type: -+<PRE> -+ unison a.tmp b.tmp -+</PRE><BR><EM>Textual Interface:</EM><UL> -+<LI> -+ -+You should see a message notifying you that all the files are actually -+equal and then get returned to the command line. -+</UL><BR><EM>Graphical Interface:</EM><UL> -+<LI> -+ -+You should get a big empty window with a message at the bottom -+notifying you that all files are identical. Choose the Exit item from -+the File menu to get back to the command line. -+</UL>Next, make some changes in a.tmp and/or b.tmp. For example: -+<PRE> -+ rm a.tmp/a -+ echo "Hello" > a.tmp/b -+ echo "Hello" > b.tmp/b -+ date > b.tmp/c -+ echo "Hi there" > a.tmp/d/h -+ echo "Hello there" > b.tmp/d/h -+</PRE> -+Run Unison again: -+<PRE> -+ unison a.tmp b.tmp -+</PRE>This time, the user interface will display only the files that have -+changed. If a file has been modified in just one -+replica, then it will be displayed with an arrow indicating the -+direction that the change needs to be propagated. For example, -+<PRE> -+ <--- new file c [f] -+</PRE> -+indicates that the file <TT>c</TT> has been modified only in the second -+replica, and that the default action is therefore to propagate the new -+version to the first replica. To <B>f</B>ollw Unison's recommendation, -+press the ``f'' at the prompt.<BR> -+<BR> -+If both replicas are modified and their contents are different, then -+the changes are in conflict: <TT><-?-></TT> is displayed to indicate -+that Unison needs guidance on which replica should override the -+other. -+<PRE> -+ new file <-?-> new file d/h [] -+</PRE> -+By default, neither version will be propagated and both -+replicas will remain as they are. <BR> -+<BR> -+If both replicas have been modified but their new contents are the same -+(as with the file <TT>b</TT>), then no propagation is necessary and -+nothing is shown. Unison simply notes that the file is up to date.<BR> -+<BR> -+These display conventions are used by both versions of the user -+interface. The only difference lies in the way in which Unison's -+default actions are either accepted or overriden by the user.<BR> -+<BR> -+<BR><EM>Textual Interface:</EM><UL> -+<LI> -+ -+The status of each modified file is displayed, in turn. -+When the copies of a file in the two replicas are not identical, the -+user interface will ask for instructions as to how to propagate the -+change. If some default action is indicated (by an arrow), you can -+simply press Return to go on to the next changed file. If you want to -+do something different with this file, press ``<CODE><</CODE>'' or ``<CODE>></CODE>'' to force -+the change to be propagated from right to left or from left to right, -+or else press ``<CODE>/</CODE>'' to skip this file and leave both replicas alone. -+When it reaches the end of the list of modified files, Unison will ask -+you one more time whether it should proceed with the updates that have -+been selected.<BR> -+<BR> -+When Unison stops to wait for input from the user, pressing ``<CODE>?</CODE>'' -+will always give a list of possible responses and their meanings. -+</UL><BR><EM>Graphical Interface:</EM><UL> -+<LI> -+ -+The main window shows all the files that have been modified in either -+<TT>a.tmp</TT> or <TT>b.tmp</TT>. To override a default action (or to select -+an action in the case when there is no default), first select the file, either -+by clicking on its name or by using the up- and down-arrow keys. Then -+press either the left-arrow or ``<CODE><</CODE>'' key (to cause the version in a.tmp to -+propagate to b.tmp) or the right-arrow or ``<CODE>></CODE>'' key (which makes the b.tmp -+version override a.tmp).<BR> -+<BR> -+Every keyboard command can also be invoked from the menus at the top -+of the user interface. (Conversely, each menu item is annotated with -+its keyboard equivalent, if it has one.)<BR> -+<BR> -+When you are satisfied with the directions for the propagation of changes -+as shown in the main window, click the ``Go'' button to set them in -+motion. A check sign will be displayed next to each filename -+when the file has been dealt with. -+</UL><!--TOC subsection <A NAME="remote"></A>Remote Usage--> -+ -+<H3><A NAME="remote"></A>Remote Usage</H3>Next, we'll get Unison set up to synchronize replicas on two different -+machines.<BR> -+<BR> -+Follow the instructions in the Installation section to download or -+build an executable version of Unison on the server machine, and -+install it somewhere on your search path. (It doesn't matter whether -+you install the textual or graphical version, since the copy of Unison on -+the server doesn't need to display any user interface at all.) <BR> -+<BR> -+It is important that the version of Unison installed on the server -+machine is the same as the version of Unison on the client machine. -+But some flexibility on the version of Unison at the client side can -+be achieved by using the <CODE>-addversionno</CODE> option; see -+the <A HREF="#prefs">Preferences</A> section.<BR> -+<BR> -+Now there is a decision to be made. Unison provides two methods for -+communicating between the client and the server: -+<UL> -+<LI> -+<EM>Remote shell method</EM>: To use this method, you must have -+ some way of invoking remote commands on the server from the client's -+ command line, using a facility such as <CODE>ssh</CODE> or <CODE>rsh</CODE>. -+ This method is more convenient (since there is no need to manually -+ start a ``unison server'' process on the server) and also more -+ secure (especially if you use <CODE>ssh</CODE>).<BR> -+<BR> -+ -+<LI><EM>Socket method</EM>: This method requires only that you can get -+ TCP packets from the client to the server and back. A draconian -+ firewall can prevent this, but otherwise it should work anywhere. -+</UL>Decide which of these you want to try, and continue with -+the <A HREF="#rshmeth">Remote Shell Method</A> section or -+the <A HREF="#socketmeth">Socket Method</A> section, as appropriate.<BR> -+<BR> -+<!--TOC subsection <A NAME="rshmeth"></A>Remote Shell Method--> -+ -+<H3><A NAME="rshmeth"></A>Remote Shell Method</H3>The standard remote shell facility on Unix systems is <CODE>rsh</CODE>. -+A drop-in replacement for <CODE>rsh</CODE> is <CODE>ssh</CODE>, which provides the -+same functionality but much better security. (Ssh is available from -+<A HREF="ftp://ftp.cs.hut.fi/pub/ssh/">ftp://ftp.cs.hut.fi/pub/ssh/</A>; up-to-date binaries for some -+architectures can also be found at -+<A HREF="ftp://ftp.faqs.org/ssh/contrib">ftp://ftp.faqs.org/ssh/contrib</A>. See section <A HREF="#ssh-win">A.2</A> -+for installation instructions for the Windows version.) Both <CODE>rsh</CODE> and -+<CODE>ssh</CODE> require some coordination between the client and server -+machines to establish that the client is allowed to invoke commands on -+the server; please refer to the <CODE>rsh</CODE> or <CODE>ssh</CODE> documentation -+for information on how to set this up. The examples in this section -+use <CODE>ssh</CODE>, but you can substitute <CODE>rsh</CODE> for <CODE>ssh</CODE> if -+you wish.<BR> -+<BR> -+First, test that we can invoke Unison on the server from the client. -+Typing -+<PRE> -+ ssh <I>remotehostname</I> unison -version -+</PRE> -+should print the same version information as running -+<PRE> -+ unison -version -+</PRE> -+locally on the client. If remote execution fails, then either -+something is wrong with your ssh setup (e.g., ``permission denied'') -+or else the search path that's being used when executing commands on -+the server doesn't contain the <CODE>unison</CODE> executable (e.g., -+``command not found'').<BR> -+<BR> -+Create a test directory <TT>a.tmp</TT> in your home directory on the client -+machine. <BR> -+<BR> -+Test that the local unison client can start and connect to the -+remote server. Type -+<PRE> -+ unison -testServer a.tmp ssh://<I>remotehostname</I>/a.tmp -+</PRE>Now cd to your home directory and type: -+<PRE> -+ unison a.tmp ssh://remotehostname/a.tmp -+</PRE> -+The result should be that the entire directory <TT>a.tmp</TT> is propagated -+from the client to your home directory on the server.<BR> -+<BR> -+After finishing the first synchronization, change a few files and try -+synchronizing again. You should see similar results as in the local -+case.<BR> -+<BR> -+If your user name on the server is not the same as on the client, you -+need to specify it on the command line: -+<PRE> -+ unison a.tmp ssh://username@remotehostname/a.tmp -+</PRE><I>Notes:</I> -+<UL> -+<LI> -+If you want to put <CODE>a.tmp</CODE> some place other than your home -+directory on the remote host, you can give an absolute path for it by -+adding an extra slash between <CODE>remotehostname</CODE> and the beginning -+of the path: -+<PRE> -+ unison a.tmp ssh://remotehostname//absolute/path/to/a.tmp -+</PRE> -+<LI>You can give an explicit path for the <CODE>unison</CODE> executable -+ on the server by using the command-line option <FONT SIZE=4><TT>-servercmd -+ /full/path/name/of/unison</TT></FONT> or adding -+ <FONT SIZE=4><TT>servercmd=/full/path/name/of/unison</TT></FONT> to your profile (see -+ the <A HREF="#profile">Profile</A> section). Similarly, you can specify a -+ explicit path for the <CODE>rsh</CODE> or <CODE>ssh</CODE> program using the -+ option <FONT SIZE=4><TT>-rshcmd</TT></FONT> or <FONT SIZE=4><TT>-sshcmd</TT></FONT>. -+</UL><!--TOC subsection <A NAME="socketmeth"></A>Socket Method--> -+ -+<H3><A NAME="socketmeth"></A>Socket Method</H3>To run Unison over a socket connection, you must start a Unison -+``daemon'' process on the server. This process runs continuously, -+waiting for connections over a given socket from client machines -+running Unison and processing their requests in turn.<BR> -+<BR> -+<BLOCKQUOTE> -+ <B><FONT COLOR=red>Warning:</FONT></B> The socket method is -+ insecure: not only are the texts of your changes transmitted over -+ the network in unprotected form, it is also possible for anyone in -+ the world to connect to the server process and read out the contents -+ of your filesystem! (Of course, to do this they must understand the -+ protocol that Unison uses to communicate between client and server, -+ but all they need for this is a copy of the Unison sources.) -+</BLOCKQUOTE>To start the daemon, type -+<PRE> -+ unison -socket NNNN -+</PRE> -+on the server machine, where <TT>NNNN</TT> is the socket number that the -+daemon should listen on for connections from clients. (<TT>NNNN</TT> can -+be any large number that is not being used by some other program; if -+<TT>NNNN</TT> is already in use, Unison will exit with an error -+message.) Note that paths specified by the client will be interpreted -+relative to the directory in which you start the server process; this -+behavior is different from the ssh case, where the path is relative to -+your home directory on the server.<BR> -+<BR> -+Create a test directory <TT>a.tmp</TT> in your home directory on the -+client machine. Now type: -+<PRE> -+ unison a.tmp socket://<I>remotehostname</I>:NNNN/a.tmp -+</PRE> -+The result should be that the entire directory <TT>a.tmp</TT> is -+propagated from the client to the server (<TT>a.tmp</TT> will be -+created on the server in the directory that the server was started -+from). -+After finishing the first synchronization, change a few files and try -+synchronizing again. You should see similar results as in the local -+case.<BR> -+<BR> -+<!--TOC subsection <A NAME="usingit"></A>Using Unison for All Your Files--> -+ -+<H3><A NAME="usingit"></A>Using Unison for All Your Files</H3>Once you are comfortable with the basic operation of Unison, you may -+find yourself wanting to use it regularly to synchronize your commonly -+used files. There are several possible ways of going about this:<BR> -+<BR> -+<OL> -+<LI> -+ -+Synchronize your whole home directory, using the Ignore facility -+(see the <A HREF="#ignore">Ignore</A> section) -+to avoid synchronizing temporary files and things that only belong on -+one host. -+ -+<LI>Create a subdirectory called <TT>shared</TT> (or <TT>current</TT>, or -+whatever) in your home directory on each host, and put all the files -+you want to synchronize into this directory. -+ -+<LI>Create a subdirectory called <TT>shared</TT> (or <TT>current</TT>, or -+whatever) in your home directory on each host, and put <EM>links to</EM> -+all the files you want to synchronize into this directory. Use the -+<TT>follow</TT> preference (see the <A HREF="#symlinks">Symbolic Links</A> section) to make -+sure that all these links are treated transparently by Unison. -+ -+<LI>Make your home directory the root of the synchronization, but -+tell Unison to synchronize only some of the files and subdirectories -+within it. This can be accomplished by using the <TT>-path</TT> switch -+on the command line: -+<PRE> -+ unison /home/<I>username</I> ssh://<I>remotehost</I>//home/<I>username</I> -path shared -+</PRE> -+The <TT>-path</TT> option can be used as many times as needed, to -+synchronize several files or subdirectories: -+<PRE> -+ unison /home/<I>username</I> ssh://<I>remotehost</I>//home/<I>username</I> <CODE>\</CODE> -+ -path shared <CODE>\</CODE> -+ -path pub <CODE>\</CODE> -+ -path .netscape/bookmarks.html -+</PRE> -+These <CODE>-path</CODE> arguments can also be put in your preference file. -+See the <A HREF="#prefs">Preferences</A> section for an example. -+</OL>When you synchronize a large directory structure (e.g. your home -+directory) for the first time, Unison will need to spend a lot of time -+walking over all the files and building its internal data structures. -+You'll probably save time if you start off focusing Unison's attention on -+just a subset of your files, by including the option -+<TT>-path <I>some/small/subdirectory</I></TT> on the command line. When this is -+working to your satisfaction, take away the <CODE>-path</CODE> option and go -+get lunch while Unison works.<BR> -+<BR> -+If your replicas are large and at least one of them is on a Windows -+system, you may find that Unison's default method for detecting changes -+(which involves scanning the full contents of every file on every -+sync---the only completely safe way to do it under Windows) is too slow. -+In this case, you may be interested in the <TT>fastcheck</TT> preference, -+documented in the <A HREF="#fastcheck">Fast Update Checking</A> section.<BR> -+<BR> -+Most people find that they only need to maintain a profile (or -+profiles) on one of the hosts that they synchronize, since Unison is -+always initiated from this host. (For example, if you're -+synchronizing a laptop with a fileserver, you'll probably always run -+Unison on the laptop.) This is a bit different from the usual -+situation with asymmetric mirroring programs like <CODE>rdist</CODE>, where -+the mirroring operation typically needs to be initiated from the -+machine with the most recent changes. the <A HREF="#profile">Profile</A> section -+covers the syntax of Unison profiles, together with some sample profiles.<BR> -+<BR> -+<!--TOC subsection <A NAME="further"></A>Going Further--> -+ -+<H3><A NAME="further"></A>Going Further</H3>On-line documentation for the various features of Unison -+can be obtained either by typing -+<PRE> -+ unison -doc topics -+</PRE> -+at the command line, or by selecting the Help menu in the graphical -+user interface. -+The on-line information is essentially identical to this manual. -+<BR> -+<BR> -+There are two email lists for users of unison. Visit -+<BLOCKQUOTE> -+<A HREF="http://www.cis.upenn.edu/~bcpierce/unison/download.html">http://www.cis.upenn.edu/~bcpierce/unison/download.html</A> -+</BLOCKQUOTE> -+for more details.<BR> -+<BR> -+<hr><!--TOC section <A NAME="basics"></A>Basic Concepts--> -+ -+<H2><A NAME="basics"></A>Basic Concepts</H2>Unison deals in a few straightforward concepts. -+(A more mathematical development of these concepts can be found in -+<A HREF="http://www.cis.upenn.edu/~bcpierce/papers/snc-mobicom.ps.gz">``<EM>What is a File Synchronizer?</EM>''</A> by Sundar Balasubramaniam and -+Benjamin Pierce [MobiCom 1998]. A more up-to-date version can be -+found in a -+<A HREF="http://www.cis.upenn.edu/~bcpierce/papers/snc-tacs-2001Oct.ps">recent set of slides</A>.)<BR> -+<BR> -+<!--TOC subsection <A NAME="roots"></A>Roots--> -+ -+<H3><A NAME="roots"></A>Roots</H3>A replica's <EM>root</EM> tells Unison where to find a set of files to be -+synchronized, either on the local machine or on a remote host. -+For example, -+<PRE> -+ <I>relative/path/of/root</I> -+</PRE> -+specifies a local root relative to the directory where Unison is -+started, while -+<PRE> -+ /<I>absolute/path/of/root</I> -+</PRE> -+specifies a root relative to the top of the local filesystem, -+independent of where Unison is running. Remote roots can begin with -+<CODE>ssh://</CODE>, -+<CODE>rsh://</CODE> -+to indicate that the remote server should be started with rsh or ssh: -+<PRE> -+ ssh://<I>remotehost</I>//<I>absolute/path/of/root</I> -+ rsh://<I>user</I>@<I>remotehost</I>/<I>relative/path/of/root</I> -+</PRE> -+If the remote server is already running (in the socket mode), then the syntax -+<PRE> -+ socket://<I>remotehost</I>:<I>portnum</I>//<I>absolute/path/of/root</I> -+ socket://<I>remotehost</I>:<I>portnum</I>/<I>relative/path/of/root</I> -+</PRE> -+is used to specify the hostname and the port that the client Unison should -+use to contact it.<BR> -+<BR> -+The syntax for roots is based on that of URIs (described in RFC 2396). -+The full grammar is: -+<PRE> -+ <I>replica</I> ::= [<I>protocol</I>:]//[<I>user</I>@][<I>host</I>][:<I>port</I>][/<I>path</I>] -+ | <I>path</I> -+ -+ <I>protocol</I> ::= file -+ | socket -+ | ssh -+ | rsh -+ -+ <I>user</I> ::= [-_a-zA-Z0-9]+ -+ -+ <I>host</I> ::= [-_a-zA-Z0-9.]+ -+ -+ <I>port</I> ::= [0-9]+ -+</PRE> -+When <CODE>path</CODE> is given without any protocol prefix, the protocol is -+assumed to be <CODE>file:</CODE>. Under Windows, it is possible to -+synchronize with a remote directory using the <CODE>file:</CODE> protocol over -+the Windows Network Neighborhood. For example, -+<PRE> -+ unison foo //host/drive/bar -+</PRE> -+synchronizes the local directory <CODE>foo</CODE> with the directory -+<CODE>drive:\bar</CODE> on the machine <CODE>host</CODE>, provided that <CODE>host</CODE> -+is accessible via Network Neighborhood. When the <CODE>file:</CODE> protocol -+is used in this way, there is no need for a Unison server to be running -+on the remote host. (However, running Unison this way is only a good -+idea if the remote host is reached by a very fast network connection, -+since the full contents of every file in the remote replica will have to -+be transferred to the local machine to detect updates.)<BR> -+<BR> -+The names of roots are <EM>canonized</EM> by Unison before it uses them -+to compute the names of the corresponding archive files, so <TT>//saul//home/bcpierce/common</TT> and <TT>//saul.cis.upenn.edu/common</TT> -+will be recognized as the same replica under different names.<BR> -+<BR> -+<!--TOC subsection <A NAME="paths"></A>Paths--> -+ -+<H3><A NAME="paths"></A>Paths</H3>A <EM>path</EM> refers to a point <EM>within</EM> a set of files being -+synchronized; it is specified relative to the root of the replica.<BR> -+<BR> -+Formally, a path is just a sequence of names, separated by <CODE>/</CODE>. -+Note that the path separator character is always a forward slash, no -+matter what operating system Unison is running on. Forward slashes -+are converted to backslashes as necessary when paths are converted to -+filenames in the local filesystem on a particular host. -+(For example, suppose that we run Unison on a Windows system, synchronizing -+the local root <CODE>c:\pierce</CODE> with the root -+<CODE>ssh://saul.cis.upenn.edu/home/bcpierce</CODE> on a Unix server. Then -+the path <CODE>current/todo.txt</CODE> refers to the file -+<CODE>c:\pierce\current\todo.txt</CODE> on the client and -+<CODE>/home/bcpierce/current/todo.txt</CODE> on the server.)<BR> -+<BR> -+The empty path (i.e., the empty sequence of names) denotes the whole -+replica. Unison displays the empty path as ``<CODE>[root]</CODE>.''<BR> -+<BR> -+If <CODE>p</CODE> is a path and <CODE>q</CODE> is a path beginning with <CODE>p</CODE>, then -+<CODE>q</CODE> is said to be a <EM>descendant</EM> of <CODE>p</CODE>. (Each path is also a -+descendant of itself.)<BR> -+<BR> -+<!--TOC subsection <A NAME="updates"></A>What is an Update?--> -+ -+<H3><A NAME="updates"></A>What is an Update?</H3>The <EM>contents</EM> of a path <CODE>p</CODE> in a particular replica could be a -+file, a directory, a symbolic link, or absent (if <CODE>p</CODE> does not -+refer to anything at all in that replica). More specifically: -+<UL> -+<LI> -+If <CODE>p</CODE> refers to an ordinary file, then the -+contents of <CODE>p</CODE> are the actual contents of this file (a string of bytes) -+plus the current permission bits of the file. -+ -+<LI>If <CODE>p</CODE> refers to a symbolic link, then the contents of <CODE>p</CODE> -+are just the string specifying where the link points. -+ -+<LI>If <CODE>p</CODE> refers to a directory, then the -+contents of <CODE>p</CODE> are just the token ``DIRECTORY'' plus the current -+permission bits of the directory. -+ -+<LI>If <CODE>p</CODE> does not refer to anything in this replica, then the -+contents of <CODE>p</CODE> are the token ``ABSENT.'' -+</UL> -+Unison keeps a record of the contents of each path after each -+successful synchronization of that path (i.e., it remembers the -+contents at the last moment when they were the same in the two -+replicas). <BR> -+<BR> -+We say that a path is <EM>updated</EM> (in some replica) if its current -+contents are different from its contents the last time it was -+successfully synchronized.<BR> -+<BR> -+(What Unison actually calculates is a slight approximation to this -+definition; see the <A HREF="#caveats">Caveats and Shortcomings</A> section.)<BR> -+<BR> -+<!--TOC subsection <A NAME="conflicts"></A>What is a Conflict?--> -+ -+<H3><A NAME="conflicts"></A>What is a Conflict?</H3>A path is said to be <EM>conflicting</EM> if -+<OL> -+<LI> -+ -+it has been updated in one replica, -+ -+<LI>it or any of its descendants has been updated in the other -+ replica, -+and -+ -+<LI>its contents in the two replicas are not identical. -+</OL><!--TOC subsection <A NAME="recon"></A>Reconciliation--> -+ -+<H3><A NAME="recon"></A>Reconciliation</H3>Unison operates in several distinct stages: -+<OL> -+<LI> -+ -+On each host, it compares its archive file (which records -+the state of each path in the replica when it was last synchronized) -+with the current contents of the replica, to determine which paths -+have been updated. -+ -+<LI>It checks for ``false conflicts'' --- paths that have been -+updated on both replicas, but whose current values are identical. -+These paths are silently marked as synchronized in the archive files -+in both replicas. -+ -+<LI>It displays all the updated paths to the user. For updates that -+do not conflict, it suggests a default action (propagating the new -+contents from the updated replica to the other). Conflicting updates -+are just displayed. The user is given an opportunity to examine the -+current state of affairs, change the default actions for -+nonconflicting updates, and choose actions for conflicting updates. -+ -+<LI>It performs the selected actions, one at a time. Each action is -+performed by first transferring the new contents to a temporary file -+on the receiving host, then atomically moving them into place. -+ -+<LI>It updates its archive files to reflect the new state of the -+replicas. -+</OL><!--TOC subsection <A NAME="failures"></A>Invariants--> -+ -+<H3><A NAME="failures"></A>Invariants</H3>Given the importance and delicacy of the job that it performs, it is -+important to understand both what a synchronizer does under normal -+conditions and what can happen under unusual conditions such as system -+crashes and communication failures. <BR> -+<BR> -+Unison is careful to protect both its internal state and the state of -+the replicas at every point in this process. Specifically, the -+following guarantees are enforced: -+<UL> -+<LI> -+At every moment, each path in each replica has either (1) its <EM>original</EM> contents (i.e., no change at all has been made to this -+path), or (2) its <EM>correct</EM> final contents (i.e., the value that the -+user expected to be propagated from the other replica). -+ -+<LI>At every moment, the information stored on disk about Unison's -+private state can be either (1) unchanged, or (2) updated to reflect -+those paths that have been successfully synchronized. -+</UL> -+The upshot is that it is safe to interrupt Unison at any time, either -+manually or accidentally. <BR> -+<BR> -+If an interruption happens while it is propagating updates, then there -+may be some paths for which an update has been propagated but which -+have not been marked as synchronized in Unison's archives. This is no -+problem: the next time Unison runs, it will detect changes to these -+paths in both replicas, notice that the contents are now equal, and -+mark the paths as successfully updated when it writes back its private -+state at the end of this run.<BR> -+<BR> -+If Unison is interrupted, it may sometimes leave temporary working files -+(with suffix <CODE>.tmp</CODE>) in the replicas. It is safe to delete these -+files. Also, if the (deprecated) <CODE>backups</CODE> flag is set, Unison will -+leave around old versions of files, with names like -+<CODE>file.0.unison.bak</CODE>. These can be deleted safely, when they are no -+longer wanted.<BR> -+<BR> -+Unison is not bothered by clock skew between the different hosts on -+which it is running. It only performs comparisons between timestamps -+obtained from the same host, and the only assumption it makes about -+them is that the clock on each system always runs forward. -+<BR> -+<BR> -+If Unison finds that its archive files have been deleted (or that the -+archive format has changed and they cannot be read, or that they don't -+exist because this is the first run of Unison on these particular -+roots), it takes a conservative approach: it behaves as though the -+replicas had both been completely empty at the point of the last -+synchronization. The effect of this is that, on the first run, files -+that exist in only one replica will be propagated to the other, while -+files that exist in both replicas but are unequal will be marked as -+conflicting. <BR> -+<BR> -+Touching a file without changing its contents should never -+affect Unison's behavior. (On Unix, it uses file modtimes for a quick -+first pass to tell which files have definitely <EM>not</EM> changed; then -+for each file that might have changed -+it computes a fingerprint of the file's contents and compares it -+against the last-synchronized contents.)<BR> -+<BR> -+It is safe to ``brainwash'' Unison by deleting its archive files -+<EM>on both replicas</EM>. The next time it runs, it will assume that -+all the files it sees in the replicas are new. <BR> -+<BR> -+It is safe to modify files while Unison is working. If Unison -+discovers that it has propagated an out-of-date change, or that the -+file it is updating has changed on the target replica, it will signal -+a failure for that file. Run Unison again to propagate the latest -+change. -+<BR> -+<BR> -+Changes to the ignore patterns from the user interface (e.g., using -+the `i' key) are immediately reflected in the current profile.<BR> -+<BR> -+<!--TOC subsection <A NAME="caveats"></A>Caveats and Shortcomings--> -+ -+<H3><A NAME="caveats"></A>Caveats and Shortcomings</H3>Here are some things to be careful of when using Unison. A complete -+list of bugs can be found in the file BUGS.txt in the source distribution.<BR> -+<BR> -+<UL> -+<LI> -+In the interests of speed, the update detection algorithm may -+ (depending on which OS architecture that you run Unison on) -+ actually use an approximation to the definition given in -+ the <A HREF="#updates">What is an Update?</A> section. <BR> -+<BR> -+ In particular, the Unix -+ implementation does not compare the actual contents of files to their -+ previous contents, but simply looks at each file's inode number and -+ modtime; if neither of these have changed, then it concludes that the -+ file has not been changed.<BR> -+<BR> -+ Under normal circumstances, this approximation is safe, in the sense -+ that it may sometimes detect ``false updates'' will never miss a real -+ one. However, it is possible to fool it, for example by using -+ <CODE>retouch</CODE> to change a file's modtime back to a time in the past. -+ <BR> -+<BR> -+ -+<LI>If you synchronize between a single-user filesystem and a shared -+Unix server, you should pay attention to your permission bits: by -+default, Unison will synchronize permissions verbatim, which may leave -+group-writable files on the server that could be written over by a lot of -+people. <BR> -+<BR> -+You can control this by setting your <CODE>umask</CODE> on both computers to -+something like 022, masking out the ``world write'' and ``group write'' -+permission bits. <BR> -+<BR> -+ -+<LI>The graphical user interface is currently single-threaded. This -+means that if Unison is performing some long-running operation, the -+display will not be repainted until it finishes. We recommend not -+trying to do anything with the user interface while Unison is in the -+middle of detecting changes or propagating files.<BR> -+<BR> -+ -+<LI>Unison does not currently understand hard links. -+</UL><hr><!--TOC section <A NAME="reference"></A>Reference--> -+ -+<H2><A NAME="reference"></A>Reference</H2>This section covers the features of Unison in detail. <BR> -+<BR> -+<!--TOC subsection <A NAME="running"></A>Running Unison--> -+ -+<H3><A NAME="running"></A>Running Unison</H3>There are several ways to start Unison. -+<UL> -+<LI> -+Typing ``<TT>unison </TT><TT><I>profile</I></TT>'' on the command line. Unison -+will look for a file <TT><I>profile</I></TT><TT>.prf</TT> in the <CODE>.unison</CODE> -+directory. If this file does not specify a pair of roots, Unison will -+prompt for them and add them to the information specified by the profile. -+ -+<LI>Typing ``<TT>unison </TT><TT><I>profile</I></TT><TT> </TT><TT><I>root1</I></TT><TT> </TT><TT><I>root2</I></TT>'' on the command -+line. -+In this case, Unison will use <TT><I>profile</I></TT>, which should not contain -+any <TT>root</TT> directives. -+ -+<LI>Typing ``<TT>unison </TT><TT><I>root1</I></TT><TT> </TT><TT><I>root2</I></TT>'' on the command line. This -+has the same effect as typing ``<TT>unison default </TT><TT><I>root1</I></TT><TT> </TT><TT><I>root2</I></TT>.'' -+ -+<LI>Typing just ``<TT>unison</TT>'' (or invoking Unison by clicking on -+a desktop icon). In this case, Unison will ask for the profile to use -+for synchronization (or create a new one, if necessary). -+</UL><!--TOC subsection <A NAME="unisondir"></A>The <TT>.unison</TT> Directory--> -+ -+<H3><A NAME="unisondir"></A>The <TT>.unison</TT> Directory</H3>Unison stores a variety of information in a private directory on each -+host. If the environment variable <TT>UNISON</TT> is defined, then its -+value will be used as the name of this directory. If <TT>UNISON</TT> is -+not defined, then the name of the directory depends on which -+operating system you are using. In Unix, the default is to use -+<TT>$HOME/.unison</TT>. -+In Windows, if the environment variable -+<TT>USERPROFILE</TT> is defined, then the directory will be -+<TT>$USERPROFILE</TT><TT>\</TT><TT>.unison</TT>; -+otherwise if <TT>HOME</TT> is defined, it will be -+<TT>$HOME</TT><TT>\</TT><TT>.unison</TT>; -+otherwise, it will be -+<TT>c:</TT><TT>\</TT><TT>.unison</TT>.<BR> -+<BR> -+The archive file for each replica is found in the <TT>.unison</TT> -+directory on that replica's host. Profiles (described below) are -+always taken from the <TT>.unison</TT> directory on the client host.<BR> -+<BR> -+Note that Unison maintains a completely different set of archive files -+for each pair of roots.<BR> -+<BR> -+We do not recommend synchronizing the whole <TT>.unison</TT> directory, -+as this will involve frequent propagation of large archive files. It -+should be safe to do it, though, if you really want to. -+(Synchronizing the profile files in the <TT>.unison</TT> directory is -+definitely OK.) <BR> -+<BR> -+<!--TOC subsection <A NAME="archives"></A>Archive Files--> -+ -+<H3><A NAME="archives"></A>Archive Files</H3>The name of the archive file on each replica is calculated from -+<UL> -+<LI> -+the <EM>canonical names</EM> of all the hosts (short names like -+ <CODE>saul</CODE> are converted into full addresses like <CODE>saul.cis.upenn.edu</CODE>), -+ -+<LI>the paths to the replicas on all the hosts (again, relative -+ pathnames, symbolic links, etc. are converted into full, absolute paths), and -+ -+<LI>an internal version number that is changed whenever a new Unison -+ release changes the format of the information stored in the archive. -+</UL> -+This method should work well for most users. However, it is occasionally -+useful to change the way archive names are generated. Unison provides -+two ways of doing this.<BR> -+<BR> -+The function that finds the canonical hostname of the local host (which -+is used, for example, in calculating the name of the archive file used to -+remember which files have been synchronized) normally uses the -+<CODE>gethostname</CODE> operating system call. However, if the environment -+variable <CODE>UNISONLOCALHOSTNAME</CODE> is set, its value will be used -+instead. This makes it easier to use Unison in situations where a -+machine's name changes frequently (e.g., because it is a laptop and gets -+moved around a lot).<BR> -+<BR> -+A more powerful way of changing archive names is provided by the -+<CODE>rootalias</CODE> preference. The preference file may contain any number of -+lines of the form: -+<PRE> -+ rootalias = //<I>hostnameA</I>//<I>path-to-replicaA</I> -> //<I>hostnameB</I>//<I>path-to-replicaB</I> -+</PRE> -+When calculating the name of the archive files for a given pair of roots, -+Unison replaces any root that matches the left-hand side of any rootalias -+rule by the corresponding right-hand side.<BR> -+<BR> -+So, if you need to relocate a root on one of the hosts, you can add a -+rule of the form: -+<PRE> -+ rootalias = //<I>new-hostname</I>//<I>new-path</I> -> //<I>old-hostname</I>//<I>old-path</I> -+</PRE><EM>Warning</EM>: The <CODE>rootalias</CODE> option is dangerous and should only -+be used if you are sure you know what you're doing. In particular, it -+should only be used if you are positive that either (1) both the original -+root and the new alias refer to the same set of files, or (2) the files -+have been relocated so that the original name is now invalid and will -+never be used again. (If the original root and the alias refer to -+different sets of files, Unison's update detector could get confused.) -+After introducing a new <CODE>rootalias</CODE>, it is a good idea to run Unison -+a few times interactively (with the <CODE>batch</CODE> flag off, etc.) and -+carefully check that things look reasonable---in particular, that update -+detection is working as expected.<BR> -+<BR> -+<!--TOC subsection <A NAME="prefs"></A>Preferences--> -+ -+<H3><A NAME="prefs"></A>Preferences</H3>Many details of Unison's behavior are configurable by user-settable -+``preferences.'' <BR> -+<BR> -+Some preferences are boolean-valued; these are often called <EM>flags</EM>. -+Others take numeric or string arguments, indicated in the preferences -+list by <TT>n</TT> or <TT>xxx</TT>. Most of the string preferences can be -+given several times; the arguments are accumulated into a list -+internally.<BR> -+<BR> -+There are two ways to set the values of preferences: temporarily, by -+providing command-line arguments to a particular run of Unison, or -+permanently, by adding commands to a <EM>profile</EM> in the <TT>.unison</TT> -+directory on the client host. The order of preferences (either on the -+command line or in preference files) is not significant.<BR> -+<BR> -+To set the value of a preference <TT>p</TT> from the command line, add an -+argument <TT>-p</TT> (for a boolean flag) or <TT>-p n</TT> or <TT>-p xxx</TT> -+(for a numeric or string preference) anywhere on the command line. There -+is currently no way to set a boolean flag to <CODE>false</CODE> on the command -+line (all the boolean preferences default to <CODE>false</CODE>, so this is -+only a restriction if you've set one to <CODE>true</CODE> in your profile and want -+to reset it temporarily to <CODE>false</CODE> from the command line).<BR> -+<BR> -+Here are all the preferences supported by Unison. (This list can be -+ obtained by typing <TT>unison -help</TT>.) -+<BLOCKQUOTE> -+<PRE>Usage: unison [options] -+ or unison root1 root2 [options] -+ or unison profilename [options] -+ -+Options: -+ -addprefsto xxx file to add new prefs to -+ -addversionno add version number to name of unison executable on server -+ -auto automatically accept default actions -+ -backup xxx add a regexp to the backup list -+ -backups keep backup copies of files (deprecated: use 'backup') -+ -batch batch mode: ask no questions at all -+ -contactquietly Suppress the 'contacting server' message during startup -+ -debug xxx debug module xxx ('all' -> everything, 'verbose' -> more) -+ -doc xxx show documentation ('-doc topics' lists topics) -+ -dumbtty do not try to change terminal settings in text UI -+ -editor xxx command for displaying the output of the merge program -+ -fastcheck xxx do fast update detection (`true', `false', or `default') -+ -follow xxx add a regexp to the follow list -+ -force xxx force changes from this replica to the other -+ -group synchronize group -+ -height n height (in lines) of main window in graphical interface -+ -ignore xxx add a regexp to the ignore list -+ -ignorecase ignore upper/lowercase spelling of filenames -+ -ignorenot xxx add a regexp to the ignorenot list -+ -key xxx define a keyboard shortcut for this profile -+ -killserver kill server when done (even when using sockets) -+ -label xxx provide a descriptive string label for this profile -+ -log record actions in file specified by logfile preference -+ -logfile xxx Log file name -+ -maxbackups n number of backed up versions of a file -+ -merge xxx command for merging conflicting files -+ -merge2 xxx command for merging files (when no common version exists) -+ -numericids don't map uid/gid values by user/group names -+ -owner synchronize owner -+ -path xxx path to synchronize -+ -perms n part of the permissions which is synchronized -+ -prefer xxx choose this replica's version for conflicting changes -+ -root xxx root of a replica -+ -rootalias xxx Register alias for canonical root names -+ -rshargs xxx other arguments (if any) for remote shell command -+ -rshcmd xxx path to the rsh executable -+ -servercmd xxx name of unison executable on remote server -+ -silent print nothing (except error messages) -+ -socket xxx act as a server on a socket -+ -sortbysize list changed files by size, not name -+ -sortfirst xxx add a regexp to the sortfirst list -+ -sortlast xxx add a regexp to the sortlast list -+ -sortnewfirst list new before changed files -+ -sshcmd xxx path to the ssh executable -+ -statusdepth n status display depth for local files -+ -terse suppress status messages -+ -testserver exit immediately after the connection to the server -+ -times synchronize modification times -+ -ui xxx select user interface ('text' or 'graphic') -+ -version print version and exit -+ -xferbycopying optimize transfers using local copies, if possible -+</PRE> -+</BLOCKQUOTE> -+Here, in more detail, are what they do. Many are discussed in even greater -+detail in other sections of the manual. -+<DL COMPACT=compact> -+<DT> -+addprefsto <TT>xxx</TT><DD> -+By default, new preferences added by Unison (e.g., new <CODE>ignore</CODE> clauses) will be appended to whatever preference file Unison was told to load at the beginning of the run. Setting the preference <TT>addprefsto </TT><TT><I>filename</I></TT> makes Unison -+ add new preferences to the file named <TT><I>filename</I></TT> instead.<BR> -+<BR> -+ -+<DT>addversionno <DD> -+When this flag is set to <TT>true</TT>, Unison will use <TT>unison-</TT><TT><I>currentversionnumber</I></TT> instead of just <CODE>unison</CODE> as the remote server command. This allows multiple binaries for different versions of unison to coexist conveniently on the same server: whichever version is run on the client, the same version will be selected on the server.<BR> -+<BR> -+ -+<DT>auto <DD> -+When set to <TT>true</TT>, this flag causes the user interface to skip asking for confirmations except for non-conflicting changes. (More precisely, when the user interface is done setting the propagation direction for one entry and is about to move to the next, it will skip over all non-conflicting entries and go directly to the next conflict.)<BR> -+<BR> -+ -+<DT>backup <TT>xxx</TT><DD> -+Including the preference <TT>-backup </TT><TT><I>pathspec</I></TT> causes Unison to make back up for each path that matches <TT><I>pathspec</I></TT>. More precisely, for each path that matches this <TT><I>pathspec</I></TT>, Unison will keep several old versions of a file as a backup whenever a change is propagated. These backup files are left in the directory specified by the environment variable <TT>UNISONBACKUPDIR</TT> (<CODE>.unison/backup/</CODE> by default). The newest backed up copy willhave the same name as the original; older versions will be named with extensions <CODE>.n.unibck</CODE>. The number of versions that are kept is determined by the <CODE>maxbackups</CODE> preference.<BR> -+<BR> -+ The syntax of <TT><I>pathspec</I></TT> is described in the <A HREF="#pathspec">Path Specification</A> section.<BR> -+<BR> -+ -+<DT>backups <DD> -+When this flag is <TT>true</TT>, Unison will keep the old version of a file as a backup whenever a change is propagated. These backup files are left in the same directory, with extension <CODE>.bak</CODE>. This flag is probably less useful for most users than the t backup flag.<BR> -+<BR> -+ -+<DT>batch <DD> -+When this is set to <TT>true</TT>, the user interface will ask no questions at all. Non-conflicting changes will be propagated; conflicts will be skipped.<BR> -+<BR> -+ -+<DT>contactquietly <DD> -+If this flag is set, Unison will skip displaying the `Contacting server' window (which some users find annoying) during startup.<BR> -+<BR> -+ -+<DT>debug <TT>xxx</TT><DD> -+This preference is used to make Unison print various sorts of information about what it is doing internally on the standard error stream. It can be used many times, each time with the name of a module for which debugging information should be printed. Possible arguments for <CODE>debug</CODE> can be found by looking for calls to <CODE>Util.debug</CODE> in the sources (using, e.g., <CODE>grep</CODE>). Setting <CODE>-debug all</CODE> causes information from <EM>all</EM> modules to be printed (this mode of usage is the first one to try, if you are trying to understand something that Unison seems to be doing wrong); <CODE>-debug verbose</CODE> turns on some additional debugging output from some modules (e.g., it will show exactly what bytes are being sent across the network).<BR> -+<BR> -+ -+<DT>diff <TT>xxx</TT><DD> -+This preference can be used to control the name (and command-line arguments) of the system utility used to generate displays of file differences. The default is `<CODE>diff</CODE>'. The diff program should expect two file names as arguments<BR> -+<BR> -+ -+<DT>doc <TT>xxx</TT><DD> -+The command-line argument <TT>-doc </TT><TT><I>secname</I></TT> causes unison to display section <TT><I>secname</I></TT> of the manual on the standard output and then exit. Use <CODE>-doc all</CODE> to display the whole manual, which includes exactly the same information as the printed and HTML manuals, modulo formatting. Use <CODE>-doc topics</CODE> to obtain a list of the names of the various sections that can be printed.<BR> -+<BR> -+ -+<DT>dumbtty <DD> -+When set to <CODE>true</CODE>, this flag makes the text mode user interface avoid trying to change any of the terminal settings. (Normally, Unison puts the terminal in `raw mode', so that it can do things like overwriting the current line.) This is useful, for example, when Unison runs in a shell inside of Emacs. <BR> -+<BR> -+When <CODE>dumbtty</CODE> is set, commands to the user interface need to be followed by a carriage return before Unison will execute them. (When it is off, Unison recognizes keystrokes as soon as they are typed.)<BR> -+<BR> -+This preference has no effect on the graphical user interface.<BR> -+<BR> -+ -+<DT>editor <TT>xxx</TT><DD> -+This preference is used when unison wants to display the output of the merge program when its return value is not 0. User changes the file as he wants and then save it, unison will take this version for the synchronisation. By default the value is `emacs'.<BR> -+<BR> -+ -+<DT>fastcheck <TT>xxx</TT><DD> -+When this preference is set to <CODE>true</CODE>, -+ Unison will use file creation times as `pseudo inode numbers' -+ when scanning replicas for updates, instead of reading the full contents of every file. Under Windows, this may cause Unison to miss propagating an update if the create time, modification time, and length of the file are all unchanged by the update (this is not easy to achieve, but it can be done). However, Unison will never <EM>overwrite</EM> such an update with a change from the other replica, since it always does a safe check for updates just before propagating a change. Thus, it is reasonable to use this switch under Windows most of the time and occasionally run Unison once with <TT>fastcheck</TT> set to -+ <CODE>false</CODE>, if you are worried that Unison may have overlooked an update. The default value of the preference is <CODE>auto</CODE>, which causes Unison to use fast checking on Unix replicas (where it is safe) and slow checking on Windows replicas. For backward compatibility, <CODE>yes</CODE>, <CODE>no</CODE>, and <CODE>default</CODE> can be used in place of <CODE>true</CODE>, <CODE>false</CODE>, and <CODE>auto</CODE>. See the <A HREF="#fastcheck">Fast Checking</A> section for more information.<BR> -+<BR> -+ -+<DT>follow <TT>xxx</TT><DD> -+Including the preference <TT>-follow </TT><TT><I>pathspec</I></TT> causes Unison to treat symbolic links matching <TT><I>pathspec</I></TT> as `invisible' and behave as if the object pointed to by the link had appeared literally at this position in the replica. See the <A HREF="#symlinks">Symbolic Links</A> section for more details. The syntax of <TT><I>pathspec></I></TT> is described in the <A HREF="#pathspec">Path Specification</A> section.<BR> -+<BR> -+ -+<DT>force <TT>xxx</TT><DD> -+Including the preference <TT>-force </TT><TT><I>root</I></TT> causes Unison to resolve all differences (even non-conflicting changes) in favor of <TT><I>root</I></TT>. This effectively changes Unison from a synchronizer into a mirroring utility. <BR> -+<BR> -+You can also specify <CODE>-force newer</CODE> (or <CODE>-force older</CODE>) to force Unison to choose the file with the later (earlier) modtime. In this case, the <CODE>-times</CODE> preference must also be enabled.<BR> -+<BR> -+This preference should be used only if you are <EM>sure</EM> you know what you are doing!<BR> -+<BR> -+ -+<DT>group <DD> -+When this flag is set to <CODE>true</CODE>, the group attributes of the files are synchronized. Whether the group names or the group identifiers are synchronizeddepends on the preference <TT>numerids</TT>.<BR> -+<BR> -+ -+<DT>height <TT>n </TT><DD> -+Used to set the height (in lines) of the main window in the graphical user interface.<BR> -+<BR> -+ -+<DT>ignore <TT>xxx</TT><DD> -+Including the preference <TT>-ignore </TT><TT><I>pathspec</I></TT> causes Unison to completely ignore paths that match <TT><I>pathspec</I></TT> (as well as their children). This is useful for avoiding synchronizing temporary files, object files, etc. The syntax of <TT><I>pathspec</I></TT> is described in the <A HREF="#pathspec">Path Specification</A> section, and further details on ignoring paths is found in the <A HREF="#ignore">Ignoring Paths</A> section.<BR> -+<BR> -+ -+<DT>ignorecase <DD> -+When set to <TT>true</TT>, this flag causes Unison to use the Windows semantics for capitalization of filenames---i.e., files in the two replicas whose names differ in (upper- and lower-case) `spelling' are treated as the same file. This flag is set automatically when either host is running Windows. In rare circumstances it is also useful to set it manually (e.g. when running Unison on a Unix system with a FAT [Windows] volume mounted).<BR> -+<BR> -+ -+<DT>ignorenot <TT>xxx</TT><DD> -+This preference overrides the preference <TT>ignore</TT>. -+ It gives a list of patterns -+ (in the same format as -+ <CODE>ignore</CODE>) for paths that should definitely <EM>not</EM> be ignored, -+ whether or not they happen to match one of the <CODE>ignore</CODE> patterns. -+ <BR> -+<BR> -+Note that the semantics of t ignore and <TT>ignorenot</TT> is a -+ little counter-intuitive. When detecting updates, Unison examines -+ paths in depth-first order, starting from the roots of the replicas -+ and working downwards. Before examining each path, it checks whether -+ it matches t ignore and does not match t ignorenot; in this case -+ it skips this path <EM>and all its descendants</EM>. This means that, -+ if some parent of a given path matches an <TT>ignore</TT> pattern, then -+ it will be skipped even if the path itself matches an <TT>ignorenot</TT> -+ pattern. In particular, putting <TT>ignore = Path *</TT> in your profile -+ and then using t ignorenot to select particular paths to be -+ synchronized will not work. Instead, you should use the <TT>path</TT> -+ preference to choose particular paths to synchronize.<BR> -+<BR> -+ -+<DT>key <TT>xxx</TT><DD> -+Used in a profile to define a numeric key (0-9) that can be used in the graphical user interface to switch immediately to this profile.<BR> -+<BR> -+ -+<DT>killserver <DD> -+When set to <CODE>true</CODE>, this flag causes Unison to kill the remote server process when the synchronization is finished. This behavior is the default for <CODE>ssh</CODE> connections, so this preference is not normally needed when running over <CODE>ssh</CODE>; it is provided so that socket-mode servers can be killed off after a single run of Unison, rather than waiting to accept future connections. (Some users prefer to start a remote socket server for each run of Unison, rather than leaving one running all the time.)<BR> -+<BR> -+ -+<DT>label <TT>xxx</TT><DD> -+Used in a profile to provide a descriptive string documenting its settings. (This is useful for users that switch between several profiles, especially using the `fast switch' feature of the graphical user interface.)<BR> -+<BR> -+ -+<DT>log <DD> -+When this flag is set, Unison will log all changes to the filesystems -+ on a file.<BR> -+<BR> -+ -+<DT>logfile <TT>xxx</TT><DD> -+By default, logging messages will be appended to the file -+ <CODE>unison.log</CODE> in your HOME directory. Set this preference if -+ you prefer another file.<BR> -+<BR> -+ -+<DT>maxbackups <TT>n </TT><DD> -+This preference specifies the number of backup versions that will be kept by unison, for each path that matches the predicate <CODE>backup</CODE>. The default is 2.<BR> -+<BR> -+ -+<DT>merge <TT>xxx</TT><DD> -+This preference can be used to run a merge program which will create a new version of the file with the last backup and the both replicas. This new version will be used for the synchronization. See the <A HREF="#merge">Merging Conflicting Versions</A> section for further detail.<BR> -+<BR> -+ -+<DT>merge2 <TT>xxx</TT><DD> -+This preference can be used to run a merge program which will create a new version of the file with the last backup and the both replicas. This new version will be used for the synchronization. See the <A HREF="#merge">Merging Conflicting Versions</A> section for further detail.<BR> -+<BR> -+ -+<DT>numericids <DD> -+When this flag is set to <CODE>true</CODE>, groups and users are synchronized numerically, rather than by name. <BR> -+<BR> -+The special uid 0 and the special group 0 are never mapped via user/group names even if this preference is not set.<BR> -+<BR> -+ -+<DT>owner <DD> -+When this flag is set to <CODE>true</CODE>, the owner attributes of the files are synchronized. Whether the owner names or the owner identifiers are synchronizeddepends on the preference extttnumerids.<BR> -+<BR> -+ -+<DT>path <TT>xxx</TT><DD> -+When no <CODE>path</CODE> preference is given, Unison will simply synchronize the two entire replicas, beginning from the given pair of roots. If one or more <CODE>path</CODE> preferences are given, then Unison will synchronize only these paths and their children. (This is useful for doing a fast synch of just one directory, for example.) Note that <TT>path</TT> preferences are intepreted literally---they are not regular expressions.<BR> -+<BR> -+ -+<DT>perms <TT>n </TT><DD> -+The integer value of this preference is a mask indicating which permission bits should be synchronized. It is set by default to 0<I>o</I>1777: all bits but the set-uid and set-gid bits are synchronised (synchronizing theses latter bits can be a security hazard). If you want to synchronize all bits, you can set the value of this preference to -1.<BR> -+<BR> -+ -+<DT>prefer <TT>xxx</TT><DD> -+Including the preference <TT>-prefer </TT><TT><I>root</I></TT> causes Unison always to resolve conflicts in favor of <TT><I>root</I></TT>, rather than asking for guidance from the user. (The syntax of <TT><I>root</I></TT> is the same as for the <CODE>root</CODE> preference, plus the special values <CODE>newer</CODE> and <CODE>older</CODE>.) <BR> -+<BR> -+This preference should be used only if you are <EM>sure</EM> you know what you are doing!<BR> -+<BR> -+ -+<DT>root <TT>xxx</TT><DD> -+Each use of this preference names the root of one of the replicas for Unison to synchronize. Exactly two roots are needed, so normal modes of usage are either to give two values for <CODE>root</CODE> in the profile, or to give no values in the profile and provide two on the command line. Details of the syntax of roots can be found in the <A HREF="#roots">Roots</A> section.<BR> -+<BR> -+The two roots can be given in either order; Unison will sort them into a canonical order before doing anything else. It also tries to `canonize' the machine names and paths that appear in the roots, so that, if Unison is invoked later with a slightly different name for the same root, it will be able to locate the correct archives.<BR> -+<BR> -+ -+<DT>rootalias <TT>xxx</TT><DD> -+When calculating the name of the archive files for a given pair of roots, Unison replaces any roots matching the left-hand side of any rootalias rule by the corresponding right-hand side.<BR> -+<BR> -+ -+<DT>rshargs <TT>xxx</TT><DD> -+The string value of this preference will be passed as additional arguments (besides the host name and the name of the Unison executable on the remote system) to the <CODE>ssh</CODE> or <CODE>rsh</CODE> command used to invoke the remote server. (This option is used for passing arguments to both <TT>rsh</TT> or <TT>ssh</TT>---that's why its name is <TT>rshargs</TT> rather than <TT>sshargs</TT>.)<BR> -+<BR> -+ -+<DT>rshcmd <TT>xxx</TT><DD> -+This preference can be used to explicitly set the name of the rsh executable (e.g., giving a full path name), if necessary.<BR> -+<BR> -+ -+<DT>servercmd <TT>xxx</TT><DD> -+This preference can be used to explicitly set the name of the Unison executable on the remote server (e.g., giving a full path name), if necessary.<BR> -+<BR> -+ -+<DT>silent <DD> -+When this preference is set to <TT>true</TT>, the textual user interface will print nothing at all, except in the case of errors. Setting <TT>silent</TT> to true automatically sets the <TT>batch</TT> preference to <TT>true</TT>.<BR> -+<BR> -+ -+<DT>sortbysize <DD> -+When this flag is set, the user interface will list changed files by size (smallest first) rather than by name. This is useful, for example, for synchronizing over slow links, since it puts very large files at the end of the list where they will not prevent smaller files from being transferred quickly.<BR> -+<BR> -+This preference (as well as the other sorting flags, but not the sorting preferences that require patterns as arguments) can be set interactively and temporarily using the 'Sort' menu in the graphical user interface.<BR> -+<BR> -+ -+<DT>sortfirst <TT>xxx</TT><DD> -+Each argument to <TT>sortfirst</TT> is a pattern <TT><I>pathspec</I></TT>, which describes a set of paths. Files matching any of these patterns will be listed first in the user interface. The syntax of <TT><I>pathspec</I></TT> is described in the <A HREF="#pathspec">Path Specification</A> section.<BR> -+<BR> -+ -+<DT>sortlast <TT>xxx</TT><DD> -+Similar to <CODE>sortfirst</CODE>, except that files matching one of these patterns will be listed at the very end.<BR> -+<BR> -+ -+<DT>sortnewfirst <DD> -+When this flag is set, the user interface will list newly created files before all others. This is useful, for example, for checking that newly created files are not `junk', i.e., ones that should be ignored or deleted rather than synchronized.<BR> -+<BR> -+ -+<DT>sshcmd <TT>xxx</TT><DD> -+This preference can be used to explicitly set the name of the ssh executable (e.g., giving a full path name), if necessary.<BR> -+<BR> -+ -+<DT>sshversion <TT>xxx</TT><DD> -+This preference can be used to control which version of ssh should be used to connect to the server. Legal values are 1 and 2, which will cause unison to try to use <CODE>ssh1</CODE> or<CODE>ssh2</CODE> instead of just <CODE>ssh</CODE> to invoke ssh. The default value is empty, which will make unison use whatever version of ssh is installed as the default `ssh' command.<BR> -+<BR> -+ -+<DT>statusdepth <TT>n </TT><DD> -+This preference suppresses the display of status messages -+ during update detection on the local machine for paths deeper than -+ the specified cutoff. -+ (Displaying too many local status messages can slow down update -+ detection somewhat.)<BR> -+<BR> -+ -+<DT>terse <DD> -+When this preference is set to <TT>true</TT>, the user interface will not print status messages.<BR> -+<BR> -+ -+<DT>testserver <DD> -+Setting this flag on the command line causes Unison to attempt to connect to the remote server and, if successful, print a message and immediately exit. Useful for debugging installation problems. Should not be set in preference files.<BR> -+<BR> -+ -+<DT>times <DD> -+When this flag is set to <CODE>true</CODE>, file modification times (but not directory modtimes) are propagated.<BR> -+<BR> -+ -+<DT>ui <TT>xxx</TT><DD> -+This preference selects either the graphical or the textual user interface. Legal values are <CODE>graphic</CODE> or <CODE>text</CODE>. <BR> -+<BR> -+If the Unison executable was compiled with only a textual interface, this option has no effect. (The pre-compiled binaries are all compiled with both interfaces available.)<BR> -+<BR> -+ -+<DT>version <DD> -+Print the current version number and exit. (This option only makes sense on the command line.)<BR> -+<BR> -+ -+<DT>xferbycopying <DD> -+When this preference is set, Unison will try to avoid transferring file contents across the network by recognizing when a file with the required contents already exists in the target replica. This usually allows file moves to be propagated very quickly. The default value is exttttrue. </DL> -+ <!--TOC subsection <A NAME="profile"></A>Profiles--> -+ -+<H3><A NAME="profile"></A>Profiles</H3>A <EM>profile</EM> is a text file that specifies permanent settings for -+roots, paths, ignore patterns, and other preferences, so that they do -+not need to be typed at the command line every time Unison is run. -+Profiles should reside in the <CODE>.unison</CODE> directory on the client -+machine. If Unison is started with just one argument <TT><I>name</I></TT> on -+the command line, it looks for a profile called <TT><I>name</I></TT><TT>.prf</TT> in -+the <CODE>.unison</CODE> directory. If it is started with no arguments, it -+scans the <CODE>.unison</CODE> directory for files whose names end in -+<CODE>.prf</CODE> and offers a menu (provided that the Unison executable is compiled with the graphical user interface). If a file named <CODE>default.prf</CODE> is -+found, its settings will be offered as the default choices.<BR> -+<BR> -+To set the value of a preference <TT>p</TT> permanently, add to the -+appropriate profile a line of the form -+<PRE> -+ p = true -+</PRE> -+for a boolean flag or -+<PRE> -+ p = <value> -+</PRE> -+for a preference of any other type. <BR> -+<BR> -+Whitespaces around <TT>p</TT> and <TT>xxx</TT> are ignored. -+A profile may also include blank lines, and lines beginning -+with <TT>#</TT>; both kinds of lines are ignored.<BR> -+<BR> -+When Unison starts, it first reads the profile and then the command -+line, so command-line options will override settings from the -+profile. <BR> -+<BR> -+Profiles may also include lines of the form <TT>include -+ </TT><TT><I>name</I></TT>, which will cause the file <TT><I>name</I></TT> (or -+<TT><I>name</I></TT><TT>.prf</TT>, if <TT><I>name</I></TT> does not exist in the -+<CODE>.unison</CODE> directory) to be read at the point, and included as if -+its contents, instead of the <TT>include</TT> line, was part of the -+profile. Include lines allows settings common to several profiles to -+be stored in one place.<BR> -+<BR> -+A profile may include a preference `<TT>label = </TT><TT><I>desc</I></TT>' to -+provide a description of the options selected in this profile. The -+string <TT><I>desc</I></TT> is listed along with the profile name in the profile -+selection dialog, and displayed in the top-right corner of the main -+Unison window in the graphical user interface.<BR> -+<BR> -+The graphical user-interface also supports one-key shortcuts for commonly -+used profiles. If a profile contains a preference of the form -+`<TT>key = </TT><TT><I>n</I></TT>', where <TT><I>n</I></TT> is a single digit, then -+pressing this digit key will cause Unison to immediately switch to -+this profile and begin synchronization again from scratch. In this -+case, all actions that have been selected for a set of changes -+currently being displayed will be discarded.<BR> -+<BR> -+<!--TOC subsection <A NAME="profileegs"></A>Sample Profiles--> -+ -+<H3><A NAME="profileegs"></A>Sample Profiles</H3><!--TOC subsubsection <A NAME="minimalprofile"></A>A Minimal Profile--> -+ -+<H4><A NAME="minimalprofile"></A>A Minimal Profile</H4>Here is a very minimal profile file, such as might be found in <TT>.unison/default.prf</TT>: -+<PRE> -+ # Roots of the synchronization -+ root = /home/bcpierce -+ root = ssh://saul//home/bcpierce -+ -+ # Paths to synchronize -+ path = current -+ path = common -+ path = .netscape/bookmarks.html -+</PRE><!--TOC subsubsection <A NAME="basicprofile"></A>A Basic Profile--> -+ -+<H4><A NAME="basicprofile"></A>A Basic Profile</H4>Here is a more sophisticated profile, illustrating some other useful -+features. -+<PRE> -+ # Roots of the synchronization -+ root = /home/bcpierce -+ root = ssh://saul//home/bcpierce -+ -+ # Paths to synchronize -+ path = current -+ path = common -+ path = .netscape/bookmarks.html -+ -+ # Some regexps specifying names and paths to ignore -+ ignore = Name temp.* -+ ignore = Name *~ -+ ignore = Name .*~ -+ ignore = Path */pilot/backup/Archive_* -+ ignore = Name *.o -+ ignore = Name *.tmp -+ -+ # Window height -+ height = 37 -+ -+ # Keep a backup copy of the entire replica -+ backup = Name * -+ -+ # Use this command for displaying diffs -+ diff = diff -y -W 79 --suppress-common-lines -+ -+ # Log actions to the terminal -+ log = true -+</PRE><!--TOC subsubsection <A NAME="powerprofile"></A>A Power-User Profile--> -+ -+<H4><A NAME="powerprofile"></A>A Power-User Profile</H4>When Unison is used with large replicas, it is often convenient to be -+able to synchronize just a part of the replicas on a given run (this -+saves the time of detecting updates in the other parts). This can be -+accomplished by splitting up the profile into several parts --- a common -+part containing most of the preference settings, plus one ``top-level'' -+file for each set of paths that need to be synchronized. (The <TT>include</TT> mechanism can also be used to allow the same set of preference -+settings to be used with different roots.)<BR> -+<BR> -+The collection -+of profiles implementing this scheme might look as follows. -+The file <TT>default.prf</TT> is empty except for an <TT>include</TT> -+directive: -+<PRE> -+ # Include the contents of the file common -+ include common -+</PRE> -+Note that the name of the common file is <TT>common</TT>, not <TT>common.prf</TT>; this prevents Unison from offering <TT>common</TT> as one of -+the list of profiles in the opening dialog (in the graphical UI).<BR> -+<BR> -+The file <TT>common</TT> contains the real preferences: -+<PRE> -+ # (... other preferences ...) -+ -+ # If any new preferences are added by Unison (e.g. 'ignore' -+ # preferences added via the graphical UI), then store them in the -+ # file 'common' rathen than in the top-level preference file -+ addprefsto = common -+ -+ # regexps specifying names and paths to ignore -+ ignore = Name temp.* -+ ignore = Name *~ -+ ignore = Name .*~ -+ ignore = Path */pilot/backup/Archive_* -+ ignore = Name *.o -+ ignore = Name *.tmp -+</PRE> -+Note that there are no <TT>path</TT> preferences in <TT>common</TT>. This -+means that, when we invoke Unison with the default profile (e.g., by -+typing '<TT>unison default</TT>' or just '<TT>unison</TT>' on the command -+line), the whole replicas will be synchronized. (If we <EM>never</EM> want -+to synchronize the whole replicas, then <TT>default.prf</TT> would instead -+include settings for all the paths that are usually synchronized.)<BR> -+<BR> -+To synchronize just part of the replicas, Unison is invoked with an -+alternate preference file---e.g., doing '<TT>unison papers</TT>', where the -+preference file <TT>papers.prf</TT> contains -+<PRE> -+ path = current/papers -+ path = older/papers -+ include common -+</PRE> -+causes Unison to synchronize just the subdirectories <TT>current/papers</TT> -+and <TT>older/papers</TT>.<BR> -+<BR> -+The <TT>key</TT> preference can be used in combination with the graphical UI -+to quickly switch between different sets of paths. For example, if the -+file <TT>mail.prf</TT> contains -+<PRE> -+ path = Mail -+ batch = true -+ key = 2 -+ include common -+</PRE> -+then pressing 2 will cause Unison to look for updates in the <TT>Mail</TT> -+subdirectory and (because the <TT>batch</TT> flag is set) immediately -+propagate any that it finds.<BR> -+<BR> -+<!--TOC subsection <A NAME="backups"></A>Keeping Backups--> -+ -+<H3><A NAME="backups"></A>Keeping Backups</H3>Unison can maintain full backups of the last-synchronized versions of -+some of the files in each replica; these function both as backups in the -+usual sense and as the ``common version'' when invoking external merge -+programs.<BR> -+<BR> -+The backed up files are stored in a directory <CODE>~/.unison/backup</CODE> on -+each host. The name of this directory can be changed by setting the -+environment variable <CODE>UNISONBACKUPDIR</CODE>. -+Files are added to the backup directory whenever unison updates its -+archive. This means that -+<UL> -+<LI> -+When unison reconstructs its archive from scratch (e.g., -+ because of an upgrade, or because the archive files have been -+ manually deleted), all files will be backed up. -+ -+<LI>Otherwise, each file will be backed up the first time unison -+ propagates an update for it. -+</UL> -+It is safe to manually delete files from the backup directory (or to -+throw away the directory itself). Before unison uses any of these files -+for anything important, it checks that its fingerprint matches the one -+that it expects.<BR> -+<BR> -+The preference <CODE>backup</CODE> controls which files are actually backed -+up: for example, giving the preference `<CODE>backup = Path *</CODE>' causes -+backing up of all files. The preference <CODE>backupversions</CODE> -+controls how many previous versions of each file are kept. The -+default is value 2 (i.e., the last synchronized version plus one backup). -+For backward compatibility, the <CODE>backups</CODE> preference is also -+still supported, but <CODE>backup</CODE> is now preferred.<BR> -+<BR> -+<!--TOC subsection <A NAME="merge"></A>Merging Conflicting Versions--> -+ -+<H3><A NAME="merge"></A>Merging Conflicting Versions</H3>Both user interfaces offer a `merge' command that can be used to -+interactively merge conflicting versions of a file. It is invoked by -+selecting a conflicting file and pressing `<CODE>m</CODE>'.<BR> -+<BR> -+The actual merging is performed by an external program. The -+preferences <CODE>merge</CODE> and <CODE>merge2</CODE> control how this program is -+invoked. If a backup exists for this file (see the <CODE>backup</CODE> -+preference), then the <CODE>merge</CODE> preference is used for this -+purpose; otherwise <CODE>merge2</CODE> is used. In both cases, the value of -+the preference should be a string representing the command that should -+be passed to a shell to invoke the merge program. Within this string, -+the special substrings <CODE>CURRENT1</CODE>, <CODE>CURRENT2</CODE>, <CODE>NEW</CODE>, -+and <CODE>OLD</CODE> may appear at any point. Unison will substitute these -+substrings as follows before invoking the command: -+<UL> -+<LI> -+<CODE>CURRENT1</CODE> is replaced by the name of the -+ local copy of the file; -+ -+<LI><CODE>CURRENT2</CODE> is replaced by the name of a temporary -+ file, into which the contents of the remote copy of the file have -+ been transferred by Unison prior to performing the merge; -+ -+<LI><CODE>NEW</CODE> is replaced by the name of a temporary file -+ that Unison expects to be written by the merge program when it -+ finishes, giving the desired new contents of the file; and -+ -+<LI><CODE>OLD</CODE> is replaced by the name of the backed up copy -+ of the original version of the file (i.e., its state at the end of -+ the last successful run of Unison), if one exists. Substitution of -+ <CODE>OLD</CODE> applies only to <CODE>merge</CODE>, not <CODE>merge2</CODE>). -+</UL> -+For example, on Unix systems setting the <CODE>merge</CODE> preference to -+<PRE> -+ merge = diff3 -m CURRENT1 OLD CURRENT2 > NEW -+</PRE> -+will tell Unison to use the external <CODE>diff3</CODE> program for merging. -+A large number of external merging programs are available. For example, -+<CODE>emacs</CODE> users may find the following settings convenient: -+<PRE> -+ merge2 = emacs -q --eval '(ediff-merge-files "CURRENT1" "CURRENT2" -+ nil "NEW")' -+ merge = emacs -q --eval '(ediff-merge-files-with-ancestor -+ "CURRENT1" "CURRENT2" "OLD" nil "NEW")' -+</PRE> -+(These commands are displayed here on two lines to avoid running off the -+edge of the page. In your preference file, each command should be written on a -+single line.) <BR> -+<BR> -+If the external program exits without leaving any file at the path -+<CODE>NEW</CODE>, Unison considers the merge to have failed. If the merge -+program writes a file called <CODE>NEW</CODE> but exits with a non-zero status -+code, then Unison considers the merge to have succeeded but to have -+generated conflicts. In this case, it attempts to invoke an external -+editor so that the user can resolve the conflicts. The value of the -+<CODE>editor</CODE> preference controls what editor is invoked by Unison. The -+default is <CODE>emacs</CODE>.<BR> -+<BR> -+<BLOCKQUOTE> -+<I>Please send us suggestions for other useful values of the -+</I><CODE><I>merge2</I></CODE><I> and </I><CODE><I>merge</I></CODE><I> preferences---we'd like to give several -+examples in the manual.) -+</I></BLOCKQUOTE><!--TOC subsection <A NAME="ui"></A>The User Interface--> -+ -+<H3><A NAME="ui"></A>The User Interface</H3>Both the textual and the graphical user interfaces are intended to be -+mostly self-explanatory. Here are just a few tricks: -+<UL> -+<LI> -+By default, when running on Unix the textual user interface will -+try to put the terminal into the ``raw mode'' so that it reads the input a -+character at a time rather than a line at a time. (This means you can -+type just the single keystroke ``<CODE>></CODE>'' to tell Unison to -+propagate a file from left to right, rather than ``<CODE>></CODE> Enter.'')<BR> -+<BR> -+There are some situations, though, where this will not work --- for -+example, when Unison is running in a shell window inside Emacs. -+Setting the <CODE>dumbtty</CODE> preference will force Unison to leave the -+terminal alone and process input a line at a time. -+</UL><!--TOC subsection <A NAME="exit"></A>Exit code--> -+ -+<H3><A NAME="exit"></A>Exit code</H3>When running in the textual mode, Unison returns an exit status, which -+describes whether, and at which level, the synchronization was successful. -+The exit status could be useful when Unison is invoked from a script. -+Currently, there are four possible values for the exit status: -+<UL> -+<LI> -+0: successful synchronization; everything is up-to-date now. -+ -+<LI>1: some files were skipped, but all file transfers were successful. -+ -+<LI>2: non-fatal failures occurred during file transfer. -+ -+<LI>3: a fatal error occurred, or the execution was interrupted. -+</UL>The graphical interface does not return any useful information through the -+exit status.<BR> -+<BR> -+<!--TOC subsection <A NAME="pathspec"></A>Path specification--> -+ -+<H3><A NAME="pathspec"></A>Path specification</H3> -+Several Unison preferences (e.g., <CODE>ignore</CODE>/<CODE>ignorenot</CODE>, -+<CODE>follow</CODE>, <CODE>sortfirst</CODE>/<CODE>sortlast</CODE>, <CODE>backup</CODE>) -+specify individual paths or sets of paths. These preferences share a -+common syntax based on regular-expressions. Each preference -+is associated with a list of path patterns; the paths specified are those -+that match any one of the path pattern.<BR> -+<BR> -+<UL> -+<LI> -+Pattern preferences can be given on the command line, -+ or, more often, stored in profiles, using the same syntax as other preferences. -+ For example, a profile line of the form -+<PRE> -+ ignore = <TT><I>pattern</I></TT> -+</PRE> -+adds <TT><I>pattern</I></TT> to the list of patterns to be ignored.<BR> -+<BR> -+ -+<LI>Each <TT><I>pattern</I></TT> can have one of three forms. The most -+general form is a Posix extended regular expression introduced by the -+keyword <CODE>Regex</CODE>. (The collating sequences and character classes of -+full Posix regexps are not currently supported). -+<PRE> -+ Regex <TT><I>regexp</I></TT> -+</PRE> -+For convenience, two other styles of pattern are also recognized: -+<PRE> -+ Name <TT><I>name</I></TT> -+</PRE> -+matches any path in which the last component matches <TT><I>name</I></TT>, while -+<PRE> -+ Path <TT><I>path</I></TT> -+</PRE> -+matches exactly the path <TT><I>path</I></TT>. -+The <TT><I>name</I></TT> and <TT><I>path</I></TT> arguments of the latter forms of -+patterns are <EM>not</EM> regular expressions. Instead, -+standard ``globbing'' conventions can be used in <TT><I>name</I></TT> and -+<TT><I>path</I></TT>: -+<UL> -+<LI> -+a <CODE>?</CODE> matches any single character except <CODE>/</CODE> -+ -+<LI>a <CODE>*</CODE> matches any sequence of characters not including <CODE>/</CODE> -+ -+<LI><CODE>[xyz]</CODE> matches any character from the set {<TT><I>x</I></TT>, -+ <TT><I>y</I></TT>, <TT><I>z</I></TT> } -+ -+<LI><CODE>{a,bb,ccc}</CODE> matches any one of <CODE>a</CODE>, <CODE>bb</CODE>, or -+ <CODE>ccc</CODE>. -+</UL> -+ -+<LI> -+The path separator in path patterns is always the -+forward-slash character ``/'' --- even when the client or server is -+running under Windows, where the normal separator character is a -+backslash. This makes it possible to use the same set of path -+patterns for both Unix and Windows file systems. -+</UL>Some examples of path patterns appear in the <A HREF="#ignore">Ignoring -+ Paths</A> section.<BR> -+<BR> -+<!--TOC subsection <A NAME="ignore"></A>Ignoring Paths--> -+ -+<H3><A NAME="ignore"></A>Ignoring Paths</H3>Most users of Unison will find that their replicas contain lots of -+files that they don't ever want to synchronize --- temporary files, -+very large files, old stuff, architecture-specific binaries, etc. -+They can instruct Unison to ignore these paths using patterns -+introduced in the <A HREF="#pathspec">Path Patterns</A> section.<BR> -+<BR> -+For example, the following pattern will make Unison ignore any -+path containing the name <CODE>CVS</CODE> or a name ending in <CODE>.cmo</CODE>: -+<PRE> -+ ignore = Name {CVS,*.cmo} -+</PRE> -+The next pattern makes Unison ignore the path <CODE>a/b</CODE>: -+<PRE> -+ ignore = Path a/b -+</PRE> -+This pattern makes Unison ignore any path beginning with <CODE>a/b</CODE> -+and ending with a name ending by <CODE>.ml</CODE>. -+<PRE> -+ ignore = Regex a/b/.*\.ml -+</PRE> -+Note that regular expression patterns are ``anchored'': they must -+match the whole path, not just a substring of the path.<BR> -+<BR> -+Here are a few extra points regarding the <TT>ignore</TT> preference. -+<UL> -+<LI> -+If a directory is ignored, all its descendents will be too. -+ -+ -+<LI>The user interface provides some convenient commands for adding -+ new patterns to be ignored. To ignore a particular file, select it -+ and press ``<TT>i</TT>''. To ignore all files with the same extension, -+ select it and press ``<TT>E</TT>'' (with the shift key). To ignore all -+ files with the same name, no matter what directory they appear in, -+ select it and press ``<TT>N</TT>''. -+These new patterns become permanent: they -+are immediately added to the current profile on disk.<BR> -+<BR> -+ -+<LI>If you use the <CODE>include</CODE> directive to include a common -+collection of preferences in several top-level preference files, you will -+probably also want to set the <CODE>addprefsto</CODE> preference to the name of -+this file. This will cause any new ignore patterns that you add from -+inside Unison to be appended to this file, instead of whichever top-level -+preference file you started Unison with. <BR> -+<BR> -+ -+<LI>Ignore patterns can also be specified on the command line, if -+you like (this is probably not very useful), using an option like -+<CODE>-ignore 'Name temp.txt'</CODE>. -+</UL> <!--TOC subsection <A NAME="symlinks"></A>Symbolic Links--> -+ -+<H3><A NAME="symlinks"></A>Symbolic Links</H3>Ordinarily, Unison treats symbolic links in Unix replicas as -+``opaque'': it considers the contents of the link to be just the -+string specifying where the link points, and it will propagate changes in -+this string to the other replica.<BR> -+<BR> -+It is sometimes useful to treat a symbolic link ``transparently,'' -+acting as though whatever it points to were physically <EM>in</EM> the -+replica at the point where the symbolic link appears. To tell Unison -+to treat a link in this manner, add a line of the form -+<PRE> -+ follow = <TT><I>pathspec</I></TT> -+</PRE> -+to the profile, where <TT><I>pathspec</I></TT> is a path pattern as described in -+the <A HREF="#pathspec">Path Patterns</A> section.<BR> -+<BR> -+Windows file systems do not support symbolic links; Unison will refuse -+to propagate an opaque symbolic link from Unix to Windows and flag the -+path as erroneous. When a Unix replica is to be synchronized with a -+Windows system, all symbolic links should match either an -+<CODE>ignore</CODE> pattern or a <CODE>follow</CODE> pattern.<BR> -+<BR> -+<!--TOC subsection <A NAME="perms"></A>Permissions--> -+ -+<H3><A NAME="perms"></A>Permissions</H3>Synchronizing the permission bits of files is slightly tricky when two -+different filesytems are involved (e.g., when synchronizing a Windows -+client and a Unix server). In detail, here's how it works: -+<UL> -+<LI> -+When the permission bits of an existing file or directory are -+changed, the values of those bits that make sense on <EM>both</EM> -+operating systems will be propagated to the other replica. The other -+bits will not be changed. -+ -+<LI>When a newly created file is propagated to a remote replica, the -+permission bits that make sense in both operating systems are also -+propagated. The values of the other bits are set to default values -+(they are taken from the current umask, if the receiving host is a -+Unix system). -+ -+<LI>For security reasons, the Unix <CODE>setuid</CODE> and <CODE>setgid</CODE> -+bits are not propagated. -+ -+<LI>The Unix owner and group ids are not propagated. (What would -+this mean, in general?) All files are created with the owner and -+group of the server process. -+</UL><!--TOC subsection <A NAME="crossplatform"></A>Cross-Platform Synchronization--> -+ -+<H3><A NAME="crossplatform"></A>Cross-Platform Synchronization</H3>If you use Unison to synchronize files between Windows and Unix -+systems, there are a few special issues to be aware of.<BR> -+<BR> -+<B>Case conflicts.</B> In Unix, filenames are case sensitive: -+<TT>foo</TT> and <TT>FOO</TT> can refer to different files. In -+Windows, on the other hand, filenames are not case sensitive: -+<TT>foo</TT> and <TT>FOO</TT> can only refer to the same file. This -+means that a Unix <TT>foo</TT> and <TT>FOO</TT> cannot be synchronized -+onto a Windows system --- Windows won't allow two different files to -+have the ``same'' name. Unison detects this situation for you, and -+reports that it cannot synchronize the files. <BR> -+<BR> -+You can deal with a case conflict in a couple of ways. If you need to -+have both files on the Windows system, your only choice is to rename -+one of the Unix files to avoid the case conflict, and re-synchronize. -+If you don't need the files on the Windows system, you can simply -+disregard Unison's warning message, and go ahead with the -+synchronization; Unison won't touch those files. If you don't want to -+see the warning on each synchronization, you can tell Unison to ignore -+the files (see the <A HREF="#ignore">Ignore</A> section).<BR> -+<BR> -+<B>Illegal filenames.</B> Unix allows some filenames that are -+illegal in Windows. For example, colons (`:') are not allowed in -+Windows filenames, but they are legal in Unix filenames. This means -+that a Unix file <TT>foo:bar</TT> can't be synchronized to a Windows -+system. As with case conflicts, Unison detects this situation for -+you, and you have the same options: you can either rename the Unix -+file and re-synchronize, or you can ignore it.<BR> -+<BR> -+<!--TOC subsection <A NAME="speed"></A>Slow Links--> -+ -+<H3><A NAME="speed"></A>Slow Links</H3>Unison is built to run well even over relatively slow links such as -+modems and DSL connections. <BR> -+<BR> -+Unison uses the ``rsync protocol'' designed by Andrew Tridgell and Paul -+Mackerras to greatly speed up transfers of large files in which only -+small changes have been made. More information about the rsync protocol -+can be found at the rsync web site (<A HREF="http://samba.anu.edu.au/rsync/">http://samba.anu.edu.au/rsync/</A>).<BR> -+<BR> -+If you are using Unison with <TT>ssh</TT>, you may get some speed -+improvement by enabling <TT>ssh</TT>'s compression feature. Do this by -+adding the option ``<TT>-rshargs -C</TT>'' to the command line or ``<TT>rshargs = -C</TT>'' to your profile. <BR> -+<BR> -+<!--TOC subsection <A NAME="fastcheck"></A>Fast Update Detection--> -+ -+<H3><A NAME="fastcheck"></A>Fast Update Detection</H3>If your replicas are large and at least one of them is on a Windows -+system, you may find that Unison's default method for detecting changes -+(which involves scanning the full contents of every file on every -+sync---the only completely safe way to do it under Windows) is too slow. -+Unison provides a preference <TT>fastcheck</TT> that, when set to -+<CODE>yes</CODE>, causes it to use file creation times as 'pseudo inode -+numbers' when scanning replicas for updates, instead of reading the full -+contents of every file. <BR> -+<BR> -+When <CODE>fastcheck</CODE> is set to <CODE>no</CODE>, -+Unison will perform slow checking---re-scanning the contents of each file -+on each synchronization---on all replicas. When <CODE>fastcheck</CODE> is set -+to <CODE>default</CODE> (which, naturally, is the default), Unison will use -+fast checks on Unix replicas and slow checks on Windows replicas.<BR> -+<BR> -+This strategy may cause Unison to miss propagating an update if the -+create time, modification time, and length of the file are all unchanged -+by the update (this is not easy to achieve, but it can be done). -+However, Unison will never <EM>overwrite</EM> such an update with a change -+from the other replica, since it always does a safe check for updates -+just before propagating a change. Thus, it is reasonable to use this -+switch most of the time and occasionally run Unison once with <TT>fastcheck</TT> set to <CODE>no</CODE>, if you are worried that Unison may have -+overlooked an update.<BR> -+<BR> -+<!--TOC subsection <A NAME="click"></A>Click-starting Unison--> -+ -+<H3><A NAME="click"></A>Click-starting Unison</H3>On Windows NT/2k systems, the graphical version of Unison can be -+invoked directly by clicking on its icon. On Windows 95/98 systems, -+click-starting also works, <EM>as long as you are not using ssh</EM>. -+Due to an incompatibility with ocaml and Windows 95/98 that is not -+under our control, you must start Unison from a DOS window in Windows -+95/98 if you want to use ssh.<BR> -+<BR> -+When you click on the Unison icon, two windows will be created: -+Unison's regular window, plus a console window, which is used only for -+giving your password to ssh (if you do not use ssh to connect, you can -+ignore this window). When your password is requested, you'll need to -+activate the console window (e.g., by clicking in it) before typing. -+If you start Unison from a DOS window, Unison's regular window will -+appear and you will type your password in the DOS window you were -+using.<BR> -+<BR> -+To use Unison in this mode, you must first create a profile (see -+the <A HREF="#profile">Profile</A> section). Use your favorite editor for this. <BR> -+<BR> -+<hr><!--TOC section <A NAME="advice"></A>Advice--> -+ -+<H2><A NAME="advice"></A>Advice</H2><!--TOC subsection <A NAME="faq"></A>Frequently Asked Questions--> -+ -+<H3><A NAME="faq"></A>Frequently Asked Questions</H3>(See the <A HREF="#problems">Common Problems</A> section and the <A HREF="#tips">Tips -+ and Tricks</A> section for further suggestions.)<BR> -+<BR> -+<UL> -+<LI> -+<EM>What are the differences between Unison and rsync?</EM><BR> -+<BR> -+Rsync is a mirroring tool; Unison is a synchronizer. That is, rsync -+needs to be told ``this replica contains the true versions of all the -+files; please make the other replica look exactly the same.'' Unison -+is capable of recognizing updates in both replicas and deciding which way -+they should be propagated.<BR> -+<BR> -+Both Unison and rsync use the so-called ``rsync algorithm,'' by Andrew -+Tridgell and Paul Mackerras, for performing updates. This algorithm -+streamlines updates in small parts of large files by transferring only -+the parts that have changed.<BR> -+<BR> -+ -+<LI><EM>What are the differences between Unison and CVS?</EM><BR> -+<BR> -+Both CVS and Unison can be used to keep a remote replica of a -+directory structure up to date with a central repository. Both are -+capable of propagating updates in both directions and recognizing -+conflicting updates. Both use the rsync protocol for file transfer.<BR> -+<BR> -+Unison's main advantage is being somewhat more automatic and easier to -+use, especially on large groups of files. CVS requires manual -+notification whenever files are added or deleted. Moving files is a -+bit tricky. And if you decide to move a directory... well, heaven -+help you.<BR> -+<BR> -+CVS, on the other hand, is a full-blown version control system, and it -+has <EM>lots</EM> of other features (version history, multiple branches, -+etc.) that Unison (which is just a file synchronizer) doesn't have.<BR> -+<BR> -+ -+<LI><EM>Is it OK to mount my remote filesystem using NFS and -+ run unison locally, or should I run a remote server process?</EM><BR> -+<BR> -+NFS-mounting the replicas is fine, as long as the local network is -+fast enough. Unison needs to read a lot of files (in particular, it -+needs to check the last-modified time of every file in the repository -+every time it runs), so if the link bandwidth is low then running a -+remote server is much better.<BR> -+<BR> -+ -+<LI><EM>When I run Unison on Windows, it creates two different -+ windows, the main user interface and a blank console window. Is -+ there any way to get rid of the second one?</EM><BR> -+<BR> -+The extra console window is there for ssh to use to get your password. -+Unfortunately, in the present version of unison the window will appear -+whether you're using ssh or not.<BR> -+<BR> -+Karl Moerder contributed some scripts that he uses to make the command -+window a bit more attractive. He starts unison from a shortcut to a -+<CODE>.cmd</CODE> file. This lets him control the attributes of the command -+window, making it small and gray and centering the passphrase request. -+His scripts can be found at -+<A HREF="http://www.cis.upenn.edu/~bcpierce/unison/download/resources/karls-winhax.zip">http://www.cis.upenn.edu/~bcpierce/unison/download/resources/karls-winhax.zip</A>.<BR> -+<BR> -+It is also possible to get rid of the window entirely (for users that -+only want socket mode connections) by playing games with icons. -+If you make a symbolic link to the executable, you can edit the -+properties box to make this window come up iconic. That way when you -+click on the link, you seem to just get a unison window (except on the -+task bar, where the text window shows). <BR> -+<BR> -+ -+<LI><EM>Will unison behave correctly if used transitively? That is, -+ if I synchronize both between </EM><CODE><EM>host1:dir</EM></CODE><EM> and </EM><CODE><EM>host2:dir</EM></CODE><EM> and -+ between </EM><CODE><EM>host2:dir</EM></CODE><EM> and </EM><CODE><EM>host3:dir</EM></CODE><EM> at different times? Are -+ there any problems if the ``connectivity graph'' has loops?</EM><BR> -+<BR> -+This mode of usage will work fine. As far as each ``host pair'' is -+concerned, filesystem updates made by Unison when synchronizing any other -+pairs of hosts are exactly the same as ordinary user changes to the -+filesystem. So if a file started out having been modified on just one -+machine, then every time Unison is run on a pair of hosts where one has -+heard about the change and the other hasn't will result in the change -+being propagated to the other host. Running unison between machines -+where both have already heard about the change will leave that file -+alone. So, no matter what the connectivity graph looks like (as long as -+it is not partitioned), eventually everyone will agree on the new value -+of the file.<BR> -+<BR> -+The only thing to be careful of is changing the file <EM>again</EM> on the first -+machine (or, in fact, any other machine) before all the machines have -+heard about the first change -- this can result in Unison reporting -+conflicting changes to the file, which you'll then have to resolve by -+hand.<BR> -+<BR> -+ -+<LI><EM>What will happen if I try to synchronize a special file (e.g., -+something in </EM><CODE><EM>/dev</EM></CODE><EM>, </EM><CODE><EM>/proc</EM></CODE><EM>, etc.)?</EM><BR> -+<BR> -+Unison will refuse to synchronize such files. It only understands -+ordinary files, directories, and symlinks.<BR> -+<BR> -+ -+<LI><EM>Is it OK to run several copies of Unison concurrently?</EM><BR> -+<BR> -+Unison is built to handle this case, but this functionality has not been -+extensively tested. Keep your eyes open.<BR> -+<BR> -+ -+<LI><EM>What will happen if I do a local (or NFS, etc.) sync and some -+ file happens to be part of both replicas?</EM><BR> -+<BR> -+It will look to Unison as though somebody else has been modifying the -+files it is trying to synchronize, and it will fail (safely) on these -+files.<BR> -+<BR> -+ -+<LI><EM>What happens if Unison gets killed while it is working? Do I -+ have to kill it nicely, or can I use </EM><EM><TT>kill -9</TT></EM><EM>? What if the network -+ goes down during a synchronization? What if one machine crashes but -+ the other keeps running?</EM><BR> -+<BR> -+Don't worry; be happy. See the <A HREF="#failures">Invariants</A> section.<BR> -+<BR> -+ -+<LI><EM>What about race conditions when both Unison and some other -+ program or user are both trying to write to a file at exactly the same -+ moment?</EM> <BR> -+<BR> -+Unison works hard to make these ``windows of danger'' as short as -+possible, but they cannot be eliminated completely.<BR> -+<BR> -+ -+<LI><EM>The Unix file locking mechanism doesn't work very well under -+ NFS. Is this a problem for Unison?</EM><BR> -+<BR> -+No.<BR> -+<BR> -+ -+<LI><EM>On Windows systems, it looks like the </EM><EM><TT>root</TT></EM><EM> preferences -+ are specified using backslashes, but </EM><EM><TT>path</TT></EM><EM> and </EM><EM><TT>ignore</TT></EM><EM> -+ preferences are specified with forward slashes. What's up with that?</EM> <BR> -+<BR> -+Unison uses two sorts of paths: native filesystem paths, which use the -+syntax of the host filesystem, and ``portable'' paths relative to the -+roots of the replicas, which always use / to separate the path -+components. Roots are native filesystem paths; the others are -+root-relative.</UL><!--TOC subsection <A NAME="problems"></A>Common Problems--> -+ -+<H3><A NAME="problems"></A>Common Problems</H3>If you're having problems with Unison, the suggestions in this section -+may help. <BR> -+<BR> -+A general recommendation is that, if you've gotten into a state you don't -+understand, deleting the archive files on both replicas (files with names -+like <TT>arNNNNNNNNNNNNNNN</TT> in the <TT>.unison</TT> directory) will return -+you to a blank slate. If the replicas are identical, then deleting the -+archives is always safe. If they are not identical, then deleting the -+archives will cause all files that exist on one side but not the other to -+be copied, and will report conflicts for all non-identical files that -+do exist on both sides.<BR> -+<BR> -+(If you think the behavior you're observing is an actual bug, -+then you might consider <EM>moving</EM> the archives to somewhere else -+instead of deleting them, so that you can try to replicate the bad -+behavior and tell us what more clearly happened.)<BR> -+<BR> -+<UL> -+<LI> -+<EM>The text mode user interface fails with -+``</EM><CODE><EM>Uncaught exception Sys_blocked_io</EM></CODE><EM>'' when running over ssh2.</EM><BR> -+<BR> -+The problem here is that ssh2 puts its standard file descriptors into -+non-blocking mode. But unison and ssh share the same stderr (so that -+error messages from the server are displayed), and the nonblocking -+setting interferes with Unison's interaction with the user. This can be -+corrected by redirecting the stderr when invoking Unison: -+<PRE> -+ unison -ui text <other args> 2>/dev/tty -+</PRE> -+(The redirection syntax is a bit shell-specific. On some shells, e.g., -+ csh and tcsh, you may need to write -+<PRE> -+ unison -ui text <other args> > & /dev/tty -+</PRE> -+instead.) <BR> -+<BR> -+ -+<LI><EM>What does the following mean?</EM> -+<PRE> -+ Propagating updates [accounting/fedscwh3qt2000.wb3] -+ failed: error in renaming locally: -+ /DANGER.README: permission denied -+</PRE>It means that unison is having trouble creating the temporary file -+DANGER.README, which it uses as a "commit log" for operations (such as -+renaming its temporary file <TT>accounting/fedscwh3qt2000.wb3.unison.tmp</TT> to -+the real location <TT>accounting/fedscwh3qt2000.wb3</TT>) that may leave the -+filesystem in a bad state if they are interrupted in the middle. This is -+pretty unlikely, since the rename operation happens fast, but it is -+possible; if it happens, the commit log will be left around and Unison -+will notice (and tell you) the next time it runs that the consistency of -+that file needs to be checked.<BR> -+<BR> -+The specific problem here is that Unison is trying to create -+DANGER.README in the directory specified by your HOME environment -+variable, which seems to be set to /, where you do not have write -+permission.<BR> -+<BR> -+ -+<LI><EM>The command line</EM> -+<PRE> -+ unison work ssh://remote.dcs.ed.ac.uk/work -+</PRE> -+<EM>fails, with ``</EM><EM><TT>fatal error: could not connect to server.</TT></EM><EM>'' -+But when I connect directly with </EM><EM><TT>ssh remote.dcs.ed.ac.uk/work</TT></EM><EM>, -+I see that my </EM><EM><TT>PATH</TT></EM><EM> variable is correctly set, and the unison -+executable is found. </EM><BR> -+<BR> -+In the first case, Unison is using <TT>ssh</TT> to execute a command, and -+in the second, it is giving you an interactive remote shell. Under -+some ssh configurations, these two use different startup sequences. -+You can test whether this is the problem here by trying, e.g., -+<PRE> -+ ssh remote.dcs.ed.ac.uk 'echo $PATH' -+</PRE> -+and seeing whether your <TT>PATH</TT> is the same as when you do -+<PRE> -+ ssh remote.dcs.ed.ac.uk -+ [give password and wait for connection] -+ echo $PATH -+</PRE>This seems to be controlled by the configuration of ssh, but we have -+not understood all the details---if someone does, please let us know.<BR> -+<BR> -+ -+<LI><EM>I'm having trouble getting unison working with openssh -+ under Windows. Any suggestions?</EM> -+ -+ <A HREF="http://www.apocalypse.org/pub/u/antony">Antony Courtney</A> -+ contributed the following comment. -+ <BLOCKQUOTE> -+ I ran in to some difficulties trying to use this ssh client with -+ Unison, and tracked down at least one of the problems. I thought -+ I'd share my experiences, and provide a 'known good' solution for -+ other users who might want to use this Windows / Unison / ssh / -+ Cygwin combination. -+ -+ If you launch Unison from bash, it fails (at least for me). -+ Running <CODE>unison_win32-gtkui.exe</CODE>, I get a dialog box that -+ reads: -+<PRE> -+ Fatal error: Error in checkServer: Broken pipe [read()] -+</PRE> -+ and a message is printed to stderr in the bash window that reads: -+<PRE> -+ ssh: unison_win32-gtkui.exe: no address associated with hostname. -+</PRE> -+ My guess is that this is caused by some incompatibility between -+ the Ocaml Win32 library routines and Cygwin with regard to setting -+ up argv[] for child processes. -+ </BLOCKQUOTE>The solution is to launch Unison from a DOS command prompt instead; -+or see section <A HREF="#click">5.18</A>.<BR> -+<BR> -+ -+<LI><EM>When I use ssh to log into the server, everything looks fine -+ (and I can see the Unison binary in my path). -+ But when I do '</EM><EM><TT>ssh <server> unison</TT></EM><EM>' it fails. Why?</EM><BR> -+<BR> -+[Thanks to Nick Phillips for the following explanation.]<BR> -+<BR> -+It's simple. If you start ssh, enter your password etc. and then end up -+in a shell, you have a login shell.<BR> -+<BR> -+If you do "ssh myhost.com unison" then unison is not run in a login shell.<BR> -+<BR> -+This means that different shell init scripts are used, and most people seem -+to have their shell init scripts set up all wrong.<BR> -+<BR> -+With bash, for example, your <CODE>.bash_profile</CODE> <EM>only</EM> gets used if -+you start -+a login shell. This usually means that you've logged in on the system console, -+on a terminal, or remotely. If you start an xterm from the command line -+you won't get a login shell in it. If you start a command remotely from -+the ssh or rsh command line you also won't get a login shell to run it in -+(this is of course a Good Thing -- you may want to run interactive commands -+from it, for example to ask what type of terminal they're using today).<BR> -+<BR> -+If people insist on setting their <CODE>PATH</CODE> in their -+<CODE>.bash_profile</CODE>, then they -+should probably do at least one of the following: -+<OL> -+<LI> -+ -+ -+stop it; -+ -+<LI> -+read the bash manual, section "INVOCATION"; -+ -+<LI> -+set their path in their <CODE>.bashrc</CODE>; -+ -+<LI> -+get their sysadmin to set a sensible system-wide default path; -+ -+<LI> -+ source their <CODE>.bash_profile</CODE> from their <CODE>.bashrc</CODE> ... -+</OL> -+It's pretty similar for most shells.<BR> -+<BR> -+ -+<LI><EM>Unison crashes with an ``out of memory'' error when used to -+ synchronize really huge directories (e.g., with hundreds of thousands -+ of files).</EM><BR> -+<BR> -+You may need to increase your maximum stack size. On Linux and Solaris -+systems, for example, you can do this using the <TT>ulimit</TT> command (see -+the <TT>bash</TT> documentation for details).<BR> -+<BR> -+ -+<LI><EM>Unison seems to be unable to copy a single really huge file. -+ I get something like this:</EM> -+<PRE> -+ Error in querying file information: -+ Value too large for defined data type [lstat(...)] -+</PRE>This is a limitation in the OCaml interface to the Unix system calls. -+(The problem is that the OCaml library uses 32-bit integers to represent -+file positions. The maximal positive 'int' in OCaml is about 2.1E9. We -+hope that the OCaml team will someday provide an alternative interface -+that uses 64-bit integers.<BR> -+<BR> -+ -+<LI><EM>Why does unison run so slowly the first time I start it?</EM><BR> -+<BR> -+On the first synchronization, unison doesn't have any ``memory'' of what -+your replicas used to look like, so it has to go through, fingerprint -+every file, transfer the fingerprints across the network, and compare -+them to what's on the other side. Having done this once, it stashes away -+the information so that in future runs almost all of the work can be done -+locally on each side.<BR> -+<BR> -+ -+<LI><EM>I can't seem to override the paths selected in the profile by -+ using a </EM><EM><TT>-path</TT></EM><EM> argument on the command line.</EM><BR> -+<BR> -+Right: the <TT>path</TT> preference is additive (each use adds an entry to -+the list of paths within the replicas that Unison will try to -+synchronize), and there is no way to remove entries once they have gotten -+into this list. The solution is to split your preference file into -+different ``top-level'' files containing different sets of <TT>path</TT> -+preferences and make them all include a common preference file to avoid -+repeating the non-path preferences. See the <A HREF="#profileegs">Profile -+ Examples</A> section for a complete example. <BR> -+<BR> -+ -+<LI><EM>I can't seem to override the roots selected in the profile by -+ listing the roots on the command line. I get ``Fatal error: Wrong -+ number of roots (2 expected; 4 provided).''</EM><BR> -+<BR> -+Roots should be provided <EM>either</EM> in the preference file <EM>or</EM> on -+the command line, not both. See the <A HREF="#profileegs">Profile -+ Examples</A> section for further advice.<BR> -+<BR> -+ -+<LI><EM>I am trying to compile unison 2.7.7 using OCaml 3.04. I get ``Values do not match'' error.</EM> -+ -+ Unison 2.7.7 compiles with Ocaml 3.02. Later versions of OCaml, -+ include version 3.04, require by default all parameter labels for -+ function calls if they are declared in the interface. Adding the -+ compilation option ``<CODE>-nolabels</CODE>'' (by inserting a line -+ ``<CODE>CAMLFLAGS+=-nolabels</CODE>'' to the file named ``<CODE>Makefile.OCaml</CODE>'') -+ should solve the problem. To compile the graphical user interface for Unison 2.7.7, use LablGtk 1.1.2 instead of LablGtk 1.1.3.</UL><!--TOC subsection <A NAME="tips"></A>Tricks and Tips--> -+ -+<H3><A NAME="tips"></A>Tricks and Tips</H3><UL> -+<LI> -+<EM>Is it possible to run Unison from </EM><EM><TT>inetd</TT></EM><EM> (the Unix -+ internet services daemon)?</EM><BR> -+<BR> -+We haven't tried this ourselves, but Toby Johnson has contributed a -+detailed -+<A HREF="http://www.cis.upenn.edu/~bcpierce/unison/download/resources/xinetd-chroot-howto.txt">chroot -+ min-HOWTO</A> describing how to do it. (Yan Seiner wrote an earlier -+<A HREF="http://www.cis.upenn.edu/~bcpierce/unison/download/resources/inetd-howto.txt">howto</A>, -+on which Toby's is based.)<BR> -+<BR> -+ -+<LI><EM>Is there a way to get Unison not to prompt me for a -+ password every time I run it (e.g., so that I can run it every -+ half hour from a shell script)?</EM> -+ -+ It's actually <TT>ssh</TT> that's asking for the password. If you're -+ running the Unison client on a Unix system, you should check out the -+ 'ssh-agent' facility in ssh. If you do -+<PRE> -+ ssh-agent bash -+</PRE> -+ (or <TT>ssh-agent startx</TT>, when you first log in) it will start you a -+ shell (or an X Windows session) in which all processes and -+ sub-processes are part of the same ssh-authorization group. If, inside -+ any shell belonging to this authorization group, you run the <TT>ssh-add</TT> program, it will prompt you <EM>once</EM> for a password and -+ then remember it for the duration of the bash session. You can then -+ use Unison over <TT>ssh</TT>---or even run it repeatedly from a shell -+ script---without giving your password again.<BR> -+<BR> -+ It may also be possible to configure <TT>ssh</TT> so that it does not -+ require any password: just enter an empty password when you create a -+ pair of keys. If you think it is safe enough to keep your private key -+ unencrypted on your client machine, this solution should work even -+ under Windows.<BR> -+<BR> -+ -+<LI><EM>Is there a way, under Windows, to click-start Unison and make -+ it synchronize according to a particular profile?</EM><BR> -+<BR> -+Greg Sullivan sent us the following useful trick: <BR> -+<BR> -+<BLOCKQUOTE> -+In order to make syncing a particular profile ``clickable'' from the -+Win98 desktop, when the profile uses <TT>ssh</TT>, you need to create a <TT>.bat</TT> file that contains nothing but ``<TT>unison profile-name</TT>'' -+(assuming <TT>unison.exe</TT> is in the <TT>PATH</TT>). I first tried the -+``obvious'' strategy of creating a shortcut on the desktop with the -+actual command line ``<TT>unison profile</TT>, but that hangs. The <TT>.bat</TT> file trick works, though, because it runs <TT>command.com</TT> and -+then invokes the <TT>.bat</TT> file. -+</BLOCKQUOTE> -+<LI><EM>Can Unison be used with SSH's port forwarding features?</EM><BR> -+<BR> -+Mark Thomas says the following procedure works for him: -+<BLOCKQUOTE> -+After having problems with unison spawning a command line ssh in Windows -+I noticed that unison also supports a socket mode of communication (great -+software!) so I tried the port forwarding feature of ssh using a -+graphical SSH terminal TTSSH: -+<BLOCKQUOTE> -+<A HREF="http://www.zip.com.au/~roca/ttssh.html">http://www.zip.com.au/~roca/ttssh.html</A> -+</BLOCKQUOTE>To use unison I start TTSHH with port forwarding enabled and login to -+the Linux box where the unison server (<CODE>unison -socket xxxx</CODE>) is -+started automatically. In windows I just run unison and -+connect to localhost (<CODE>unison socket://localhost:xxxx/ ...</CODE>) -+</BLOCKQUOTE> -+<LI><EM>How can I use Unison from a laptop whose hostname changes -+ depending on where it is plugged into the network?</EM><BR> -+<BR> -+See the discussion of the <TT>rootalias</TT> preference in -+the <A HREF="#archives">Archive Files</A> section.<BR> -+<BR> -+ -+<LI><EM>It's annoying that (on Unix systems) I have to type an ssh -+ passphrase into a console window, rather than being asked for it in a -+ dialog box. Is there a better way?</EM><BR> -+<BR> -+We have some ideas about how this might be done (by allocating a PTY and -+using it to talk to ssh), but we haven't implemented them yet. If you'd -+like to have a crack at it, we'd be glad to discuss ideas and incorporate -+patches. <BR> -+<BR> -+In the meantime, tmb has contributed a script that uses <TT>expectk</TT> to -+do what's needed. It's available at -+<A HREF="http://www.cis.upenn.edu/ bcpierce/unison/download/resources/expectk-startup">http://www.cis.upenn.edu/ bcpierce/unison/download/resources/expectk-startup</A>.</UL><hr><!--TOC section <A NAME="ssh"></A>Installing Ssh--> -+ -+<H2><A NAME="ssh"></A>Installing Ssh</H2>Your local host will need just an ssh client; the remote host needs an -+ssh server (or daemon), which is available on Unix -+systems.<A NAME="text2"></A><A HREF="#note2"><SUP><FONT SIZE=2>2</FONT></SUP></A> -+Unison is known to work with ssh version 1.2.27 (Unix) and version -+1.2.14 (Windows); other versions may or may not work.<BR> -+<BR> -+<!--TOC subsection <A NAME="ssh-unix"></A>Unix--> -+ -+<H3><A NAME="ssh-unix"></A>Unix</H3><OL> -+<LI> -+ -+Install <CODE>ssh</CODE>. -+<OL> -+<LI> -+ -+ -+Become root. (If you do not have administrator permissions, ask your -+ system manager to install an ssh client and an ssh server for you and -+ skip this section.) -+ -+<LI>Download <CODE>ssh-1.2.27.tar.gz</CODE> from <A HREF="ftp://ftp.ssh.com/pub/ssh/">ftp://ftp.ssh.com/pub/ssh/</A>. -+ -+<LI>Install it: -+<UL> -+<LI> -+ Unpack the archive (<CODE>gunzip ssh-1.2.27.tar.gz</CODE> and -+ then <CODE>tar xvf ssh-1.2.27.tar.gz</CODE>). -+ -+<LI>following instructions in <CODE>INSTALL</CODE>, enter -+ <CODE>./configure</CODE>, <CODE>make</CODE>, and -+ <CODE>make install</CODE>. -+ -+<LI>to run the ssh daemon: -+<UL> -+<LI> -+find the server daemon <CODE>sshd</CODE> (e.g., -+ <CODE>/usr/local/sbin/sshd</CODE> on RedHat-Linux systems). -+ -+<LI>put its full pathname in the system initialization script to have it -+ run at startup (this script is called -+ <CODE>/etc/rc.d/rc.sysinit</CODE> on RedHat-Linux, for example). -+</UL> -+</UL> -+ -+<LI>Once a server is running on the remote host and a client is -+available on the -+ local host, you should be able to connect with ssh in the same way as -+ with rsh (e.g., <CODE>ssh foobar</CODE>, then enter your password). -+</OL> -+ -+ -+<LI>If you like, you can now set up ssh so that you only need to type -+your password once per X session, rather than every time you run -+Unison (this is not necessary for using ssh with Unison, but it -+saves typing). -+<OL> -+<LI> -+ -+ -+ Build your keys : -+ <UL> -+<LI> -+ -+ enter <CODE>ssh-keygen</CODE> and type a passphrase as required. -+ -+<LI>your private key is now in <CODE>~/.ssh/identity</CODE> (this file -+ must remain -+ private) and your public key in <CODE>~/.ssh/identity.pub</CODE>. -+ </UL> -+ -+<LI>Allow user-mode secure connection. -+<UL> -+<LI> -+ -+ append contents of the local file <CODE>~/.ssh/identity.pub</CODE> to the file -+ <CODE>~/.ssh/authorized_keys</CODE> on the remote system. -+ -+<LI>Test that you can connect by starting <CODE>ssh</CODE> and giving -+ the passphrase you just chose instead of your remote password. -+</UL> -+ -+ -+<LI>Create an agent to manage authentication for you : -+<UL> -+<LI> -+ -+start <CODE>ssh-agent</CODE> with the parent program whose children will be granted -+ automatic connections (e.g., <CODE>ssh-agent bash</CODE> or -+ <CODE>ssh-agent startx</CODE>). -+ -+<LI>enter <CODE>ssh-add</CODE> to enter your passphrase and enable -+automatic login for connections to come. -+ -+<LI>you should now be able to run Unison using SSH without giving -+ any passphrase or password. -+ -+<LI>to kill the agent, enter <CODE>ssh-agent -k</CODE>, or simply exit the -+ program you launched using <CODE>ssh-agent</CODE>. -+</UL> -+</OL> -+ -+</OL><!--TOC subsection <A NAME="ssh-win"></A>Windows--> -+ -+<H3><A NAME="ssh-win"></A>Windows</H3> -+Many Windows implementations of ssh only provide graphical interfaces, -+but Unison requires an ssh client that it can invoke with a -+command-line interface. A suitable version of ssh can be installed as -+follows.<BR> -+<BR> -+<OL> -+<LI> -+ -+Download an <CODE>ssh</CODE> executable. -+ -+Warning: there are many implementations and ports of ssh for -+Windows, and not all of them will work with Unison. We have gotten -+Unison to work with Cygwin's port of openssh, and we suggest you use -+that one. Here's how to install it: -+<OL> -+<LI> -+ -+First, create a new folder on your desktop to hold temporary -+ installation files. It can have any name you like, but in these -+ instructions we'll assume that you call it <CODE>Foo</CODE>. -+ -+<LI>Direct your web browser to www.cygwin.com, and click on the -+ ``Install now!'' link. This will download a file, <CODE>setup.exe</CODE>; -+ save it in the directory <CODE>Foo</CODE>. The file <CODE>setup.exe</CODE> is a -+ small program that will download the actual install files from -+ the Internet when you run it. -+ -+<LI>Start <CODE>setup.exe</CODE> (by double-clicking). This brings up a -+ series of dialogs that you will have to go through. Select -+ ``Install from Internet.'' For ``Local Package Directory'' select -+ the directory <CODE>Foo</CODE>. For ``Select install root directory'' we -+ recommend that you use the default, <CODE>C:\cygwin</CODE>. The next -+ dialog asks you to select the way that you want to connect to the -+ network to download the installation files; we have used ``Use IE5 -+ Settings'' successfully, but you may need to make a different -+ selection depending on your networking setup. The next dialog gives -+ a list of mirrors; select one close to you. -+ -+ Next you are asked to select which packages to install. The default -+ settings in this dialog download a lot of packages that are not -+ strictly necessary to run Unison with ssh. If you don't want to -+ install a package, click on it until ``skip'' is shown. For a -+ minimum installation, select only the packages ``cygwin'' and -+ ``openssh,'' which come to about 1900KB; the full installation is -+ much larger. <BR> -+<BR> -+ <BLOCKQUOTE> <EM>Note that you are plan to build unison using the free -+ CygWin GNU C compiler, you need to install essential development -+ packages such as ``gcc'', ``make'', ``fileutil'', etc; we refer to -+ the file ``INSTALL.win32-cygwin-gnuc'' in the source distribution -+ for further details. -+ </EM></BLOCKQUOTE> After the packages are downloaded and installed, the next dialog -+ allows you to choose whether to ``Create Desktop Icon'' and ``Add to -+ Start Menu.'' You make the call. -+ -+<LI>You can now delete the directory <CODE>Foo</CODE> and its contents. -+</OL><BR> -+ -+<LI>You must set the environment variables HOME and PATH. -+ Ssh will create a directory <CODE>.ssh</CODE> in the directory given -+ by HOME, so that it has a place to keep data like your public and -+ private keys. PATH must be set to include the Cygwin <CODE>bin</CODE> -+ directory, so that Unison can find the ssh executable. -+ <UL> -+<LI> -+ -+ On Windows 95/98, add the lines -+<PRE> -+ set PATH=%PATH%;<SSHDIR> -+ set HOME=<HOMEDIR> -+</PRE> -+ to the file <CODE>C:\AUTOEXEC.BAT</CODE>, where <CODE><HOMEDIR></CODE> is the -+ directory where you want ssh to create its <CODE>.ssh</CODE> directory, -+ and <CODE><SSHDIR></CODE> is the directory where the executable -+ <CODE>ssh.exe</CODE> is stored; if you've installed Cygwin in the -+ default location, this is <CODE>C:\cygwin\bin</CODE>. You will have to -+ reboot your computer to take the changes into account. -+ -+<LI>On Windows NT/2k, open the environment variables dialog box: -+ <UL> -+<LI> -+ Windows NT: My Computer/Properties/Environment -+ -+<LI>Windows 2k: My Computer/Properties/Advanced/Environment -+ variables -+ </UL> -+ then select Path and edit its value by appending <CODE>;<SSHDIR></CODE> -+ to it, where <CODE><SSHDIR></CODE> is the full name of the directory -+ that includes the ssh executable; if you've installed Cygwin in -+ the default location, this is <CODE>C:\cygwin\bin</CODE>. -+ </UL> -+ -+<LI>Test ssh from a DOS shell by typing -+<PRE> -+ ssh <remote host> -l <login name> -+</PRE> -+ You should get a prompt for your password on <CODE><remote host></CODE>, -+ followed by a working connection. -+ -+<LI>Note that <CODE>ssh-keygen</CODE> may not work (fails with -+ ``gethostname: no such file or directory'') on some systems. This is -+ OK: you can use ssh with your regular password for the remote -+ system. -+ -+<LI>You should now be able to use Unison with an ssh connection. If -+ you are logged in with a different user name on the local and remote -+ hosts, provide your remote user name when providing the remote root -+ (i.e., <CODE>//username@host/path...</CODE>). -+</OL><hr><!--TOC section <A NAME="news"></A>Changes in Version 2.9.1--> -+ -+<H2><A NAME="news"></A>Changes in Version 2.9.1</H2>Changes since 2.8.19: -+ <UL> -+<LI> -+ -+Fixed a bug due to a wrong assumption -+ -+<LI>Changing profile works again under Windows -+ -+<LI>Fixed a bug due to a wrong assumption -+ -+<LI>fixed the Makefile -+ -+ </UL> -+Changes since 2.8.1: -+ <UL> -+<LI> -+ -+Statistic window (transfer rate, amount of data transferred). -+ [NB: not available Cygwin version.] -+ -+<LI>symlinks works under the cygwin version (which is dynamically linked). -+ -+<LI>File movement hack: Unison now tries to use local copy instead of -+ transfer for moved or copied files. It is controled by a boolean option -+ ``xferbycopying''. -+ -+<LI>Fixed deadlock when synchronizing between Windows and Unix -+ -+<LI>Small improvements: -+ <UL> -+<LI> -+ If neither the <BR>tt USERPROFILE nor the <BR>tt HOME environment -+ variables are set, then Unison will put its temporary commit log -+ (called <BR>tt DANGER.README) into the directory named by the -+ <BR>tt UNISON environment variable, if any; otherwise it will use -+ <BR>tt C:. -+ -+<LI>alternative set of values for fastcheck: yes = true; no = false; default -+ = auto. -+ -+<LI>-silent implies -contactquietly -+ </UL> -+ -+<LI>Source code: -+ <UL> -+<LI> -+ Code reorganization and tidying. (Started breaking up some of the -+ basic utility modules so that the non-unison-specific stuff can be -+ made available for other projects.) -+ -+<LI>several Makefile and docs changes (for release); -+ -+<LI>further comments in ``update.ml''; -+ -+<LI>connection information are not stored in global variables anymore. -+ </UL> -+ -+ </UL> -+Changes since 2.7.78: -+ <UL> -+<LI> -+ -+Small bugfix to textual user interface under Unix (to avoid leaving -+ the terminal in a bad state where it would not echo inputs after Unison -+ exited). -+ -+ </UL> -+Changes since 2.7.39: -+ <UL> -+<LI> -+ -+Improvements to the main web page (stable and beta version docs are -+ now both accessible). -+ -+<LI>User manual revised. -+ -+<LI>Added some new preferences: -+<UL> -+<LI> -+``sshcmd'' and ``rshcmd'' for specifying paths to ssh and rsh programs. -+ -+<LI>``contactquietly'' for suppressing the ``contacting server'' message -+during Unison startup (under the graphical UI). -+</UL> -+ -+<LI>Bug fixes: -+<UL> -+<LI> -+Fixed small bug in UI that neglected to change the displayed column -+ headers if loading a new profile caused the roots to change. -+ -+<LI>Fixed a bug that would put the text UI into an infinite loop if it -+ encountered a conflict when run in batch mode. -+ -+<LI>Added some code to try to fix the display of non-Ascii characters in -+ filenames on Windows systems in the GTK UI. (This code is currently -+ untested---if you're one of the people that had reported problems with -+ display of non-ascii filenames, we'd appreciate knowing if this actually -+ fixes things.) -+ -+<LI>`<CODE>-prefer/-force newer</CODE>' works properly now. -+ (The bug was reported by Sebastian Urbaniak and Sean Fulton.) -+</UL> -+ -+<LI>User interface and Unison behavior: -+<UL> -+<LI> -+Renamed `Proceed' to `Go' in the graphical UI. -+ -+<LI>Added exit status for the textual user interface. -+ -+<LI>Paths that are not synchronized because of conflicts or errors during -+ update detection are now noted in the log file. -+ -+<LI><CODE>[END]</CODE> messages in log now use a briefer format -+ -+<LI>Changed the text UI startup sequence so that -+ <BR>tt ./unison -ui text will use the default profile instead of failing. -+ -+<LI>Made some improvements to the error messages. -+ -+<LI>Added some debugging messages to remote.ml. -+</UL> -+ -+ </UL> -+Changes since 2.7.7: -+ <UL> -+<LI> -+ -+Incorporated, once again, a multi-threaded transport sub-system. -+ It transfers several files at the same time, thereby making much -+ more effective use of available network bandwidth. Unlike the -+ earlier attempt, this time we do not rely on the native thread -+ library of OCaml. Instead, we implement a light-weight, -+ non-preemptive multi-thread library in OCaml directly. This version -+ appears stable. <BR> -+<BR> -+ Some adjustments to unison are made to accommodate the multi-threaded -+ version. These include, in particular, changes to the -+ user interface and logging, for example: -+ <UL> -+<LI> -+ Two log entries for each transferring task, one for the -+ beginning, one for the end. -+ -+<LI>Suppressed warning messages against removing temp files left -+ by a previous unison run, because warning does not work nicely -+ under multi-threading. The temp file names are made less likely -+ to coincide with the name of a file created by the user. They -+ take the form<BR><CODE>.#<filename>.<serial>.unison.tmp</CODE>. -+ </UL> -+ -+<LI>Added a new command to the GTK user interface: pressing 'f' causes -+ Unison to start a new update detection phase, using as paths <EM>just</EM> -+ those paths that have been detected as changed and not yet marked as -+ successfully completed. Use this command to quickly restart Unison on -+ just the set of paths still needing attention after a previous run. -+ -+<LI>Made the <TT>ignorecase</TT> preference user-visible, and changed the -+ initialization code so that it can be manually set to true, even if -+ neither host is running Windows. (This may be useful, e.g., when using -+ Unison running on a Unix system with a FAT volume mounted.) -+ -+<LI>Small improvements and bug fixes: -+ <UL> -+<LI> -+ Errors in preference files now generate fatal errors rather than -+ warnings at startup time. (I.e., you can't go on from them.) Also, -+ we fixed a bug that was preventing these warnings from appearing in the -+ text UI, so some users who have been running (unsuspectingly) with -+ garbage in their prefs files may now get error reports. -+ -+<LI>Error reporting for preference files now provides file name and -+ line number. -+ -+<LI>More intelligible message in the case of identical change to the same -+ files: ``Nothing to do: replicas have been changed only in identical -+ ways since last sync.'' -+ -+<LI>Files with prefix '.#' excluded when scanning for preference -+ files. -+ -+<LI>Rsync instructions are send directly instead of first -+ marshaled. -+ -+<LI>Won't try forever to get the fingerprint of a continuously changing file: -+ unison will give up after certain number of retries. -+ -+<LI>Other bug fixes, including the one reported by Peter Selinger -+ (<CODE>force=older preference</CODE> not working). -+ </UL> -+ -+<LI>Compilation: -+ <UL> -+<LI> -+ Upgraded to the new OCaml 3.04 compiler, with the LablGtk -+ 1.2.3 library (patched version used for compiling under Windows). -+ -+<LI>Added the option to compile unison on the Windows platform with -+ Cygwin GNU C compiler. This option only supports building -+ dynamically linked unison executables. -+ </UL> -+ -+ </UL> -+Changes since 2.7.4: -+ <UL> -+<LI> -+ -+Fixed a silly (but debilitating) bug in the client startup sequence. -+ -+ </UL> -+Changes since 2.7.1: -+ <UL> -+<LI> -+ -+Added <CODE>addprefsto</CODE> preference, which (when set) controls which -+preference file new preferences (e.g. new ignore patterns) are added to. -+ -+<LI>Bug fix: read the initial connection header one byte at a time, so -+that we don't block if the header is shorter than expected. (This bug -+did not affect normal operation --- it just made it hard to tell when you -+were trying to use Unison incorrectly with an old version of the server, -+since it would hang instead of giving an error message.) -+ -+ </UL> -+Changes since 2.6.59: -+ <UL> -+<LI> -+ -+Changed <CODE>fastcheck</CODE> from a boolean to a string preference. Its -+ legal values are <CODE>yes</CODE> (for a fast check), <CODE>no</CODE> (for a safe -+ check), or <CODE>default</CODE> (for a fast check---which also happens to be -+ safe---when running on Unix and a safe check when on Windows). The default -+ is <CODE>default</CODE>. -+ -+<LI>Several preferences have been renamed for consistency. All -+ preference names are now spelled out in lowercase. For backward -+ compatibility, the old names still work, but they are not mentioned in -+ the manual any more. -+ -+<LI>The temp files created by the 'diff' and 'merge' commands are now -+ named by <EM>pre</EM>pending a new prefix to the file name, rather than -+ appending a suffix. This should avoid confusing diff/merge programs -+ that depend on the suffix to guess the type of the file contents. -+ -+<LI>We now set the keepalive option on the server socket, to make sure -+ that the server times out if the communication link is unexpectedly broken. -+ -+<LI>Bug fixes: -+<UL> -+<LI> -+When updating small files, Unison now closes the destination file. -+ -+<LI>File permissions are properly updated when the file is behind a -+ followed link. -+ -+<LI>Several other small fixes. -+</UL> -+ -+ </UL> -+Changes since 2.6.38: -+ <UL> -+<LI> -+ -+Major Windows performance improvement! <BR> -+<BR> -+We've added a preference <CODE>fastcheck</CODE> that makes Unison look only at -+a file's creation time and last-modified time to check whether it has -+changed. This should result in a huge speedup when checking for updates -+in large replicas.<BR> -+<BR> -+ When this switch is set, Unison will use file creation times as -+ 'pseudo inode numbers' when scanning Windows replicas for updates, -+ instead of reading the full contents of every file. This may cause -+ Unison to miss propagating an update if the create time, -+ modification time, and length of the file are all unchanged by -+ the update (this is not easy to achieve, but it can be done). -+ However, Unison will never <EM>overwrite</EM> such an update with -+ a change from the other replica, since it -+ always does a safe check for updates just before propagating a -+ change. Thus, it is reasonable to use this switch most of the time -+ and occasionally run Unison once with <TT>fastcheck</TT> set to false, -+ if you are worried that Unison may have overlooked an update.<BR> -+<BR> -+ Warning: This change is has not yet been thoroughly field-tested. If you -+ set the <CODE>fastcheck</CODE> preference, pay careful attention to what -+ Unison is doing.<BR> -+<BR> -+ -+<LI>New functionality: centralized backups and merging -+<UL> -+<LI> -+This version incorporates two pieces of major new functionality, -+ implemented by Sylvain Roy during a summer internship at Penn: a -+ <EM>centralized backup</EM> facility that keeps a full backup of -+ (selected files -+ in) each replica, and a <EM>merging</EM> feature that allows Unison to -+ invoke an external file-merging tool to resolve conflicting changes to -+ individual files. -+ -+ -+<LI>Centralized backups: -+<UL> -+<LI> -+ Unison now maintains full backups of the last-synchronized versions -+ of (some of) the files in each replica; these function both as -+ backups in the usual sense -+ and as the ``common version'' when invoking external -+ merge programs. -+ -+<LI>The backed up files are stored in a directory /.unison/backup on each -+ host. (The name of this directory can be changed by setting -+ the environment variable <CODE>UNISONBACKUPDIR</CODE>.) -+ -+<LI>The predicate <CODE>backup</CODE> controls which files are actually -+ backed up: -+ giving the preference '<CODE>backup = Path *</CODE>' causes backing up -+ of all files. -+ -+<LI>Files are added to the backup directory whenever unison updates -+ its archive. This means that -+ <UL> -+<LI> -+ When unison reconstructs its archive from scratch (e.g., -+ because of an upgrade, or because the archive files have -+ been manually deleted), all files will be backed up. -+ -+<LI>Otherwise, each file will be backed up the first time unison -+ propagates an update for it. -+ </UL> -+ -+<LI>The preference <CODE>backupversions</CODE> controls how many previous -+ versions of each file are kept. The default is 2 (i.e., the last -+ synchronized version plus one backup). -+ -+<LI>For backward compatibility, the <CODE>backups</CODE> preference is also -+ still supported, but <CODE>backup</CODE> is now preferred. -+ -+<LI>It is OK to manually delete files from the backup directory (or to throw -+ away the directory itself). Before unison uses any of these files for -+ anything important, it checks that its fingerprint matches the one -+ that it expects. -+</UL><BR> -+ -+<LI>Merging: -+<UL> -+<LI> -+ Both user interfaces offer a new 'merge' command, invoked by pressing -+ 'm' (with a changed file selected). -+ -+<LI>The actual merging is performed by an external program. -+ The preferences <CODE>merge</CODE> and <CODE>merge2</CODE> control how this -+ program is invoked. If a backup exists for this file (see the -+ <CODE>backup</CODE> preference), then the <CODE>merge</CODE> preference is used for -+ this purpose; otherwise <CODE>merge2</CODE> is used. In both cases, the -+ value of the preference should be a string representing the command -+ that should be passed to a shell to invoke the -+ merge program. Within this string, the special substrings -+ <CODE>CURRENT1</CODE>, <CODE>CURRENT2</CODE>, <CODE>NEW</CODE>, and <CODE>OLD</CODE> may appear -+ at any point. Unison will substitute these as follows before invoking -+ the command: -+ <UL> -+<LI> -+ <CODE>CURRENT1</CODE> is replaced by the name of the local -+ copy of the file; -+ -+<LI><CODE>CURRENT2</CODE> is replaced by the name of a temporary -+ file, into which the contents of the remote copy of the file have -+ been transferred by Unison prior to performing the merge; -+ -+<LI><CODE>NEW</CODE> is replaced by the name of a temporary -+ file that Unison expects to be written by the merge program when -+ it finishes, giving the desired new contents of the file; and -+ -+<LI><CODE>OLD</CODE> is replaced by the name of the backed up -+ copy of the original version of the file (i.e., its state at the -+ end of the last successful run of Unison), if one exists -+ (applies only to <CODE>merge</CODE>, not <CODE>merge2</CODE>). -+ </UL> -+ For example, on Unix systems setting the <CODE>merge</CODE> preference to -+<PRE> -+ merge = diff3 -m CURRENT1 OLD CURRENT2 > NEW -+</PRE> -+ will tell Unison to use the external <CODE>diff3</CODE> program for merging. <BR> -+<BR> -+ A large number of external merging programs are available. For -+ example, <CODE>emacs</CODE> users may find the following convenient: -+<PRE> -+ merge2 = emacs -q --eval '(ediff-merge-files "CURRENT1" "CURRENT2" -+ nil "NEW")' -+ merge = emacs -q --eval '(ediff-merge-files-with-ancestor -+ "CURRENT1" "CURRENT2" "OLD" nil "NEW")' -+</PRE> -+(These commands are displayed here on two lines to avoid running off the -+edge of the page. In your preference file, each should be written on a -+single line.) <BR> -+<BR> -+ -+<LI>If the external program exits without leaving any file at the -+ path <CODE>NEW</CODE>, -+ Unison considers the merge to have failed. If the merge program writes -+ a file called <CODE>NEW</CODE> but exits with a non-zero status code, -+ then Unison -+ considers the merge to have succeeded but to have generated conflicts. -+ In this case, it attempts to invoke an external editor so that the -+ user can resolve the conflicts. The value of the <CODE>editor</CODE> -+ preference controls what editor is invoked by Unison. The default -+ is <CODE>emacs</CODE>.<BR> -+<BR> -+ -+<LI>Please send us suggestions for other useful values of the -+ <CODE>merge2</CODE> and <CODE>merge</CODE> preferences -- we'd like to give several -+ examples in the manual. -+</UL> -+</UL><BR> -+ -+<LI>Smaller changes: -+<UL> -+<LI> -+When one preference file includes another, unison no longer adds the -+ suffix '<CODE>.prf</CODE>' to the included file by default. If a file with -+ precisely the given name exists in the .unison directory, it will be used; -+ otherwise Unison will -+ add <CODE>.prf</CODE>, as it did before. (This change means that included -+ preference files can be named <CODE>blah.include</CODE> instead of -+ <CODE>blah.prf</CODE>, so that unison will not offer them in its 'choose -+ a preference file' dialog.) -+ -+<LI>For Linux systems, we now offer both a statically linked and a dynamically -+ linked executable. The static one is larger, but will probably run on more -+ systems, since it doesn't depend on the same versions of dynamically -+ linked library modules being available. -+ -+<LI>Fixed the <CODE>force</CODE> and <CODE>prefer</CODE> preferences, which were -+ getting the propagation direction exactly backwards. -+ -+<LI>Fixed a bug in the startup code that would cause unison to crash -+ when the default profile (<CODE>~/.unison/default.prf</CODE>) does not exist. -+ -+<LI>Fixed a bug where, on the run when a profile is first created, -+ Unison would confusingly display the roots in reverse order in the user -+ interface. -+</UL><BR> -+ -+<LI>For developers: -+<UL> -+<LI> -+We've added a module dependency diagram to the source distribution, in -+ <CODE>src/DEPENDENCIES.ps</CODE>, to help new prospective developers with -+ navigating the code. -+</UL> -+ -+ </UL> -+Changes since 2.6.11: -+ <UL> -+<LI> -+ -+<B>Incompatible change:</B> -+ Archive format has changed. <BR> -+<BR> -+ -+<LI><B>Incompatible change:</B> -+ The startup sequence has been completely rewritten -+and greatly simplified. The main user-visible change is that the -+<CODE>defaultpath</CODE> preference has been removed. Its effect can be -+approximated by using multiple profiles, with <CODE>include</CODE> directives -+to incorporate common settings. All uses of <CODE>defaultpath</CODE> in -+existing profiles should be changed to <CODE>path</CODE>.<BR> -+<BR> -+Another change in startup behavior that will affect some users is that it -+is no longer possible to specify roots <EM>both</EM> in the profile <EM>and</EM> on the command line.<BR> -+<BR> -+You can achieve a similar effect, though, by breaking your profile into -+two: -+<PRE> -+ -+ default.prf = -+ root = blah -+ root = foo -+ include common -+ -+ common.prf = -+ <everything else> -+</PRE> -+Now do -+<PRE> -+ unison common root1 root2 -+</PRE> -+when you want to specify roots explicitly.<BR> -+<BR> -+ -+<LI>The <CODE>-prefer</CODE> and <CODE>-force</CODE> options have been extended to -+allow users to specify that files with more recent modtimes should be -+propagated, writing either <CODE>-prefer newer</CODE> or <CODE>-force newer</CODE>. -+(For symmetry, Unison will also accept <CODE>-prefer older</CODE> or -+<CODE>-force older</CODE>.) The <CODE>-force older/newer</CODE> options can only be -+used when <CODE>-times</CODE> is also set.<BR> -+<BR> -+The graphical user interface provides access to these facilities on a -+one-off basis via the <CODE>Actions</CODE> menu.<BR> -+<BR> -+ -+<LI>Names of roots can now be ``aliased'' to allow replicas to be -+relocated without changing the name of the archive file where Unison -+stores information between runs. (This feature is for experts only. See -+the ``Archive Files'' section of the manual for more information.)<BR> -+<BR> -+ -+<LI>Graphical user-interface: -+<UL> -+<LI> -+A new command is provided in the Synchronization menu for -+ switching to a new profile without restarting Unison from scratch. -+ -+<LI>The GUI also supports one-key shortcuts for commonly -+used profiles. If a profile contains a preference of the form -+'<CODE>key = n</CODE>', where <CODE>n</CODE> is a single digit, then pressing this -+key will cause Unison to immediately switch to this profile and begin -+synchronization again from scratch. (Any actions that may have been -+selected for a set of changes currently being displayed will be -+discarded.) <BR> -+<BR> -+ -+<LI>Each profile may include a preference '<CODE>label = <string></CODE>' giving a -+ descriptive string that described the options selected in this profile. -+ The string is listed along with the profile name in the profile selection -+ dialog, and displayed in the top-right corner of the main Unison window. -+</UL><BR> -+ -+<LI>Minor: -+<UL> -+<LI> -+Fixed a bug that would sometimes cause the 'diff' display to order -+ the files backwards relative to the main user interface. (Thanks -+ to Pascal Brisset for this fix.) -+ -+<LI>On Unix systems, the graphical version of Unison will check the -+ <CODE>DISPLAY</CODE> variable and, if it is not set, automatically fall back -+ to the textual user interface. -+ -+<LI>Synchronization paths (<CODE>path</CODE> preferences) are now matched -+ against the ignore preferences. So if a path is both specified in a -+ <CODE>path</CODE> preference and ignored, it will be skipped. -+ -+<LI>Numerous other bugfixes and small improvements. -+</UL> -+ -+ </UL> -+Changes since 2.6.1: -+ <UL> -+<LI> -+ -+The synchronization of modification times has been disabled for -+ directories.<BR> -+<BR> -+ -+<LI>Preference files may now include lines of the form -+ <CODE>include <name></CODE>, which will cause <CODE>name.prf</CODE> to be read -+ at that point.<BR> -+<BR> -+ -+<LI>The synchronization of permission between Windows and Unix now -+ works properly.<BR> -+<BR> -+ -+<LI>A binding <CODE>CYGWIN=binmode</CODE> in now added to the environment -+ so that the Cygwin port of OpenSSH works properly in a non-Cygwin -+ context.<BR> -+<BR> -+ -+<LI>The <CODE>servercmd</CODE> and <CODE>addversionno</CODE> preferences can now -+ be used together: <CODE>-addversionno</CODE> appends an appropriate -+ <CODE>-NNN</CODE> to the server command, which is found by using the value -+ of the <CODE>-servercmd</CODE> preference if there is one, or else just -+ <CODE>unison</CODE>.<BR> -+<BR> -+ -+<LI>Both <CODE>'-pref=val'</CODE> and <CODE>'-pref val'</CODE> are now allowed for -+ boolean values. (The former can be used to set a preference to false.)<BR> -+<BR> -+ -+<LI>Lot of small bugs fixed. -+ -+ </UL> -+Changes since 2.5.31: -+ <UL> -+<LI> -+ -+The <CODE>log</CODE> preference is now set to <CODE>true</CODE> by default, -+ since the log file seems useful for most users. -+ -+<LI>Several miscellaneous bugfixes (most involving symlinks). -+ -+ </UL> -+Changes since 2.5.25: -+ <UL> -+<LI> -+ -+<B>Incompatible change:</B> -+ Archive format has changed (again). <BR> -+<BR> -+ -+<LI>Several significant bugs introduced in 2.5.25 have been fixed. -+ -+ </UL> -+Changes since 2.5.1: -+ <UL> -+<LI> -+ -+<B>Incompatible change:</B> -+ Archive format has changed. Make sure you -+synchronize your replicas before upgrading, to avoid spurious -+conflicts. The first sync after upgrading will be slow.<BR> -+<BR> -+ -+<LI>New functionality: -+<UL> -+<LI> -+Unison now synchronizes file modtimes, user-ids, and group-ids. <BR> -+<BR> -+These new features are controlled by a set of new preferences, all of -+which are currently <CODE>false</CODE> by default. <BR> -+<BR> -+<UL> -+<LI> -+When the <CODE>times</CODE> preference is set to <CODE>true</CODE>, file -+modification times are propaged. (Because the representations of time -+may not have the same granularity on both replicas, Unison may not always -+be able to make the modtimes precisely equal, but it will get them as -+close as the operating systems involved allow.) -+ -+<LI>When the <CODE>owner</CODE> preference is set to <CODE>true</CODE>, file -+ownership information is synchronized. -+ -+<LI>When the <CODE>group</CODE> preference is set to <CODE>true</CODE>, group -+information is synchronized. -+ -+<LI>When the <CODE>numericIds</CODE> preference is set to <CODE>true</CODE>, owner -+and group information is synchronized numerically. By default, owner and -+group numbers are converted to names on each replica and these names are -+synchronized. (The special user id 0 and the special group 0 are never -+mapped via user/group names even if this preference is not set.) -+</UL><BR> -+ -+<LI>Added an integer-valued preference <CODE>perms</CODE> that can be used to -+control the propagation of permission bits. The value of this preference -+is a mask indicating which permission bits should be synchronized. It is -+set by default to 0<I>o</I>1777: all bits but the set-uid and set-gid bits are -+synchronised (synchronizing theses latter bits can be a security hazard). -+If you want to synchronize all bits, you can set the value of this -+preference to -1.<BR> -+<BR> -+ -+<LI>Added a <CODE>log</CODE> preference (default <CODE>false</CODE>), which makes -+Unison keep a complete record of the changes it makes to the replicas. -+By default, this record is written to a file called <CODE>unison.log</CODE> in -+the user's home directory (the value of the <CODE>HOME</CODE> environment -+variable). If you want it someplace else, set the <CODE>logfile</CODE> -+preference to the full pathname you want Unison to use.<BR> -+<BR> -+ -+<LI>Added an <CODE>ignorenot</CODE> preference that maintains a set of patterns -+ for paths that should definitely <EM>not</EM> be ignored, whether or not -+ they match an <CODE>ignore</CODE> pattern. (That is, a path will now be ignored -+ iff it matches an ignore pattern and does not match any ignorenot patterns.) -+</UL> -+ -+ -+<LI>User-interface improvements: -+<UL> -+<LI> -+Roots are now displayed in the user interface in the same order -+as they were given on the command line or in the preferences file. -+ -+<LI>When the <CODE>batch</CODE> preference is set, the graphical user interface no -+ longer waits for user confirmation when it displays a warning message: it -+ simply pops up an advisory window with a Dismiss button at the bottom and -+ keeps on going. -+ -+<LI>Added a new preference for controlling how many status messages are -+ printed during update detection: <CODE>statusdepth</CODE> controls the maximum -+ depth for paths on the local machine (longer paths are not displayed, nor -+ are non-directory paths). The value should be an integer; default is 1. -+ -+<LI>Removed the <CODE>trace</CODE> and <CODE>silent</CODE> preferences. They did -+not seem very useful, and there were too many preferences for controlling -+output in various ways. -+ -+<LI>The text UI now displays just the default command (the one that -+will be used if the user just types <CODE><return></CODE>) instead of all -+available commands. Typing <CODE>?</CODE> will print the full list of -+possibilities. -+ -+<LI>The function that finds the canonical hostname of the local host -+(which is used, for example, in calculating the name of the archive file -+used to remember which files have been synchronized) normally uses the -+<CODE>gethostname</CODE> operating system call. However, if the environment -+variable <CODE>UNISONLOCALHOSTNAME</CODE> is set, its value will now be used -+instead. This makes it easier to use Unison in situations where a -+machine's name changes frequently (e.g., because it is a laptop and gets -+moved around a lot). -+ -+<LI>File owner and group are now displayed in the ``detail window'' at -+the bottom of the screen, when unison is configured to synchronize them. -+</UL><BR> -+ -+<LI>For hackers: -+<UL> -+<LI> -+Updated to Jacques Garrigue's new version of <CODE>lablgtk</CODE>, which -+ means we can throw away our local patched version. <BR> -+<BR> -+ If you're compiling the GTK version of unison from sources, you'll need -+ to update your copy of lablgtk to the developers release, available from -+ <A HREF="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html">http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html</A><BR> -+<BR> -+ (Warning: installing lablgtk under Windows is currently a bit -+ challenging.) <BR> -+<BR> -+ -+<LI>The TODO.txt file (in the source distribution) has been cleaned up -+and reorganized. The list of pending tasks should be much easier to -+make sense of, for people that may want to contribute their programming -+energies. There is also a separate file BUGS.txt for open bugs. -+ -+<LI>The Tk user interface has been removed (it was not being maintained -+and no longer compiles). -+ -+<LI>The <CODE>debug</CODE> preference now prints quite a bit of additional -+information that should be useful for identifying sources of problems. -+ -+<LI>The version number of the remote server is now checked right away -+ during the connection setup handshake, rather than later. (Somebody -+ sent a bug report of a server crash that turned out to come from using -+ inconsistent versions: better to check this earlier and in a way that -+ can't crash either client or server.) -+ -+<LI>Unison now runs correctly on 64-bit architectures (e.g. Alpha -+linux). We will not be distributing binaries for these architectures -+ourselves (at least for a while) but if someone would like to make them -+available, we'll be glad to provide a link to them. -+</UL><BR> -+ -+<LI>Bug fixes: -+<UL> -+<LI> -+Pattern matching (e.g. for <CODE>ignore</CODE>) is now case-insensitive -+ when Unison is in case-insensitive mode (i.e., when one of the replicas -+ is on a windows machine). -+ -+<LI>Some people had trouble with mysterious failures during -+ propagation of updates, where files would be falsely reported as having -+ changed during synchronization. This should be fixed. -+ -+<LI>Numerous smaller fixes. -+</UL> -+ -+ </UL> -+Changes since 2.4.1: -+ <UL> -+<LI> -+ -+Added a number of 'sorting modes' for the user interface. By -+default, conflicting changes are displayed at the top, and the rest of -+the entries are sorted in alphabetical order. This behavior can be -+changed in the following ways: -+<UL> -+<LI> -+Setting the <CODE>sortnewfirst</CODE> preference to <CODE>true</CODE> causes -+newly created files to be displayed before changed files. -+ -+<LI>Setting <CODE>sortbysize</CODE> causes files to be displayed in -+increasing order of size. -+ -+<LI>Giving the preference <CODE>sortfirst=<pattern></CODE> (where -+<CODE><pattern></CODE> is a path descriptor in the same format as 'ignore' and 'follow' -+patterns, causes paths matching this pattern to be displayed first. -+ -+<LI>Similarly, giving the preference <CODE>sortlast=<pattern></CODE> -+causes paths matching this pattern to be displayed last. -+</UL> -+The sorting preferences are described in more detail in the user manual. -+The <CODE>sortnewfirst</CODE> and <CODE>sortbysize</CODE> flags can also be accessed -+from the 'Sort' menu in the grpahical user interface.<BR> -+<BR> -+ -+<LI>Added two new preferences that can be used to change unison's -+fundamental behavior to make it more like a mirroring tool instead of -+a synchronizer. -+<UL> -+<LI> -+Giving the preference <CODE>prefer</CODE> with argument <CODE><root></CODE> -+(by adding <CODE>-prefer <root></CODE> to the command line or <CODE>prefer=<root></CODE>) -+to your profile) means that, if there is a conflict, the contents of -+<CODE><root></CODE> -+should be propagated to the other replica (with no questions asked). -+Non-conflicting changes are treated as usual. -+ -+<LI>Giving the preference <CODE>force</CODE> with argument <CODE><root></CODE> -+will make unison resolve <EM>all</EM> differences in favor of the given -+root, even if it was the other replica that was changed. -+</UL> -+These options should be used with care! (More information is available in -+the manual.)<BR> -+<BR> -+ -+<LI>Small changes: -+<UL> -+<LI> -+ -+Changed default answer to 'Yes' in all two-button dialogs in the -+ graphical interface (this seems more intuitive).<BR> -+<BR> -+ -+<LI>The <CODE>rsync</CODE> preference has been removed (it was used to -+activate rsync compression for file transfers, but rsync compression is -+now enabled by default). -+ -+<LI>In the text user interface, the arrows indicating which direction -+changes are being -+ propagated are printed differently when the user has overridded Unison's -+ default recommendation (<CODE>====></CODE> instead of <CODE>----></CODE>). This -+ matches the behavior of the graphical interface, which displays such -+ arrows in a different color. -+ -+<LI>Carriage returns (Control-M's) are ignored at the ends of lines in -+ profiles, for Windows compatibility. -+ -+<LI>All preferences are now fully documented in the user manual. -+</UL> -+ -+ </UL> -+Changes since 2.3.12: -+ <UL> -+<LI> -+ -+<B>Incompatible change:</B> -+ Archive format has changed. Make sure you -+synchronize your replicas before upgrading, to avoid spurious -+conflicts. The first sync after upgrading will be slow.<BR> -+<BR> -+ -+<LI>New/improved functionality: -+<UL> -+<LI> -+A new preference -sortbysize controls the order in which changes -+ are displayed to the user: when it is set to true, the smallest -+ changed files are displayed first. (The default setting is false.) -+ -+<LI>A new preference -sortnewfirst causes newly created files to be -+ listed before other updates in the user interface. -+ -+<LI>We now allow the ssh protocol to specify a port. -+ -+<LI>Incompatible change: The unison: protocol is deprecated, and we added -+ file: and socket:. You may have to modify your profiles in the -+ .unison directory. -+ If a replica is specified without an explicit protocol, we now -+ assume it refers to a file. (Previously "//saul/foo" meant to use -+ SSH to connect to saul, then access the foo directory. Now it means -+ to access saul via a remote file mechanism such as samba; the old -+ effect is now achieved by writing <TT>ssh://saul/foo</TT>.) -+ -+<LI>Changed the startup sequence for the case where roots are given but -+ no profile is given on the command line. The new behavior is to -+ use the default profile (creating it if it does not exist), and -+ temporarily override its roots. The manual claimed that this case -+ would work by reading no profile at all, but AFAIK this was never -+ true. -+ -+<LI>In all user interfaces, files with conflicts are always listed first -+ -+<LI>A new preference 'sshversion' can be used to control which version -+ of ssh should be used to connect to the server. Legal values are 1 and 2. -+ (Default is empty, which will make unison use whatever version of ssh -+ is installed as the default 'ssh' command.) -+ -+<LI>The situation when the permissions of a file was updated the same on -+ both side is now handled correctly (we used to report a spurious conflict)</UL><BR> -+ -+<LI>Improvements for the Windows version: -+<UL> -+<LI> -+The fact that filenames are treated case-insensitively under -+Windows should now be handled correctly. The exact behavior is described -+in the cross-platform section of the manual. -+ -+<LI>It should be possible to synchronize with Windows shares, e.g., -+ //host/drive/path. -+ -+<LI>Workarounds to the bug in syncing root directories in Windows. -+The most difficult thing to fix is an ocaml bug: Unix.opendir fails on -+c: in some versions of Windows. -+</UL><BR> -+ -+<LI>Improvements to the GTK user interface (the Tk interface is no -+longer being maintained): -+<UL> -+<LI> -+The UI now displays actions differently (in blue) when they have been -+ explicitly changed by the user from Unison's default recommendation. -+ -+<LI>More colorful appearance. -+ -+<LI>The initial profile selection window works better. -+ -+<LI>If any transfers failed, a message to this effect is displayed along with -+ 'Synchronization complete' at the end of the transfer phase (in case they -+ may have scrolled off the top). -+ -+<LI>Added a global progress meter, displaying the percentage of <EM>total</EM> -+ bytes that have been transferred so far. -+</UL><BR> -+ -+<LI>Improvements to the text user interface: -+<UL> -+<LI> -+The file details will be displayed automatically when a -+ conflict is been detected. -+ -+<LI>when a warning is generated (e.g. for a temporary -+ file left over from a previous run of unison) Unison will no longer -+ wait for a response if it is running in -batch mode. -+ -+<LI>The UI now displays a short list of possible inputs each time it waits -+ for user interaction. -+ -+<LI>The UI now quits immediately (rather than looping back and starting -+ the interaction again) if the user presses 'q' when asked whether to -+ propagate changes. -+ -+<LI>Pressing 'g' in the text user interface will proceed immediately -+ with propagating updates, without asking any more questions. -+</UL><BR> -+ -+<LI>Documentation and installation changes: -+<UL> -+<LI> -+The manual now includes a FAQ, plus sections on common problems and -+on tricks contributed by users. -+ -+<LI>Both the download page and the download directory explicitly say -+what are the current stable and beta-test version numbers. -+ -+<LI>The OCaml sources for the up-to-the-minute developers' version (not -+guaranteed to be stable, or even to compile, at any given time!) are now -+available from the download page. -+ -+<LI>Added a subsection to the manual describing cross-platform -+ issues (case conflicts, illegal filenames) -+</UL><BR> -+ -+<LI>Many small bug fixes and random improvements.<BR> -+<BR> -+ -+ </UL> -+Changes since 2.3.1: -+ <UL> -+<LI> -+ -+Several bug fixes. The most important is a bug in the rsync -+module that would occasionally cause change propagation to fail with a -+'rename' error. -+ -+ </UL> -+Changes since 2.2: -+ <UL> -+<LI> -+ -+The multi-threaded transport system is now disabled by default. -+(It is not stable enough yet.) -+ -+<LI>Various bug fixes. -+ -+<LI>A new experimental feature: <BR> -+<BR> -+ The final component of a -path argument may now be the wildcard -+ specifier <CODE>*</CODE>. When Unison sees such a path, it expands this path on -+ the client into into the corresponding list of paths by listing the -+ contents of that directory. <BR> -+<BR> -+ Note that if you use wildcard paths from the command line, you will -+ probably need to use quotes or a backslash to prevent the * from -+ being interpreted by your shell.<BR> -+<BR> -+ If both roots are local, the contents of the first one will be used -+ for expanding wildcard paths. (Nb: this is the first one <EM>after</EM> the -+ canonization step -- i.e., the one that is listed first in the user -+ interface -- not the one listed first on the command line or in the -+ preferences file.) -+ -+ </UL> -+Changes since 2.1: -+ <UL> -+<LI> -+ -+The transport subsystem now includes an implementation by -+Sylvain Gommier and Norman Ramsey of Tridgell and Mackerras's -+<CODE>rsync</CODE> protocol. This protocol achieves much faster -+transfers when only a small part of a large file has been changed by -+sending just diffs. This feature is mainly helpful for transfers over -+slow links---on fast local area networks it can actually degrade -+performance---so we have left it off by default. Start unison with -+the <CODE>-rsync</CODE> option (or put <CODE>rsync=true</CODE> in your preferences -+file) to turn it on.<BR> -+<BR> -+ -+<LI>``Progress bars'' are now diplayed during remote file transfers, -+showing what percentage of each file has been transferred so far.<BR> -+<BR> -+ -+<LI>The version numbering scheme has changed. New releases will now -+ be have numbers like 2.2.30, where the second component is -+ incremented on every significant public release and the third -+ component is the ``patch level.''<BR> -+<BR> -+ -+<LI>Miscellaneous improvements to the GTK-based user interface. -+ -+<LI>The manual is now available in PDF format.<BR> -+<BR> -+ -+<LI>We are experimenting with using a multi-threaded transport -+subsystem to transfer several files at the same time, making -+much more effective use of available network bandwidth. This feature -+is not completely stable yet, so by default it is disabled in the -+release version of Unison.<BR> -+<BR> -+If you want to play with the multi-threaded version, you'll need to -+recompile Unison from sources (as described in the documentation), -+setting the THREADS flag in Makefile.OCaml to true. Make sure that -+your OCaml compiler has been installed with the <CODE>-with-pthreads</CODE> -+configuration option. (You can verify this by checking whether the -+file <CODE>threads/threads.cma</CODE> in the OCaml standard library -+directory contains the string <CODE>-lpthread</CODE> near the end.) -+ -+ </UL> -+Changes since 1.292: -+ <UL> -+<LI> -+ -+Reduced memory footprint (this is especially important during -+the first run of unison, where it has to gather information about all -+the files in both repositories). -+ -+<LI>Fixed a bug that would cause the socket server under NT to fail -+ after the client exits. -+ -+<LI>Added a SHIFT modifier to the Ignore menu shortcut keys in GTK -+ interface (to avoid hitting them accidentally). -+ -+ </UL> -+Changes since 1.231: -+ <UL> -+<LI> -+ -+Tunneling over ssh is now supported in the Windows version. See -+the installation section of the manual for detailed instructions.<BR> -+<BR> -+ -+<LI>The transport subsystem now includes an implementation of the -+<CODE>rsync</CODE> protocol, built by Sylvain Gommier and Norman Ramsey. -+This protocol achieves much faster transfers when only a small part of -+a large file has been changed by sending just diffs. The rsync -+feature is off by default in the current version. Use the -+<CODE>-rsync</CODE> switch to turn it on. (Nb. We still have a lot of -+tuning to do: you may not notice much speedup yet.)<BR> -+<BR> -+ -+<LI>We're experimenting with a multi-threaded transport subsystem, -+written by Jerome Vouillon. The downloadable binaries are still -+single-threaded: if you want to try the multi-threaded version, you'll -+need to recompile from sources. (Say <CODE>make THREADS=true</CODE>.) -+Native thread support from the compiler is required. Use the option -+<CODE>-threads N</CODE> to select the maximal number of concurrent -+threads (default is 5). Multi-threaded -+and single-threaded clients/servers can interoperate. <BR> -+<BR> -+ -+<LI>A new GTK-based user interface is now available, thanks to -+Jacques Garrigue. The Tk user interface still works, but we'll be -+shifting development effort to the GTK interface from now on. -+ -+<LI>OCaml 3.00 is now required for compiling Unison from sources. -+The modules <CODE>uitk</CODE> and <CODE>myfileselect</CODE> have been changed to -+use labltk instead of camltk. To compile the Tk interface in Windows, -+you must have ocaml-3.00 and tk8.3. When installing tk8.3, put it in -+<CODE>c:\Tcl</CODE> rather than the suggested <CODE>c:\Program Files\Tcl</CODE>, -+and be sure to install the headers and libraries (which are not -+installed by default).<BR> -+<BR> -+ -+<LI>Added a new <CODE>-addversionno</CODE> switch, which causes unison to -+use <CODE>unison-<currentversionnumber></CODE> instead of just <CODE>unison</CODE> -+as the remote server command. This allows multiple versions of unison -+to coexist conveniently on the same server: whichever version is run -+on the client, the same version will be selected on the server. -+ -+ </UL> -+Changes since 1.219: -+ <UL> -+<LI> -+ -+<B>Incompatible change:</B> -+ Archive format has changed. Make sure you -+synchronize your replicas before upgrading, to avoid spurious -+conflicts. The first sync after upgrading will be slow.<BR> -+<BR> -+ -+<LI>This version fixes several annoying bugs, including: -+<UL> -+<LI> -+Some cases where propagation of file permissions was not -+working. -+ -+<LI>umask is now ignored when creating directories -+ -+<LI>directories are create writable, so that a read-only directory and -+ its contents can be propagated. -+ -+<LI>Handling of warnings generated by the server. -+ -+<LI>Synchronizing a path whose parent is not a directory on both sides is -+now flagged as erroneous. -+ -+<LI>Fixed some bugs related to symnbolic links and nonexistant roots. -+<UL> -+<LI> -+ -+ When a change (deletion or new contents) is propagated onto a -+ 'follow'ed symlink, the file pointed to by the link is now changed. -+ (We used to change the link itself, which doesn't fit our assertion -+ that 'follow' means the link is completely invisible) -+ -+<LI>When one root did not exist, propagating the other root on top of it -+ used to fail, becuase unison could not calculate the working directory -+ into which to write changes. This should be fixed. -+</UL> -+</UL><BR> -+ -+<LI>A human-readable timestamp has been added to Unison's archive files.<BR> -+<BR> -+ -+<LI>The semantics of Path and Name regular expressions now -+correspond better. <BR> -+<BR> -+ -+<LI>Some minor improvements to the text UI (e.g. a command for going -+back to previous items)<BR> -+<BR> -+ -+<LI>The organization of the export directory has changed --- should -+be easier to find / download things now. -+ -+ </UL> -+Changes since 1.200: -+ <UL> -+<LI> -+ -+<B>Incompatible change:</B> -+ Archive format has changed. Make sure you -+synchronize your replicas before upgrading, to avoid spurious -+conflicts. The first sync after upgrading will be slow.<BR> -+<BR> -+ -+<LI>This version has not been tested extensively on Windows.<BR> -+<BR> -+ -+<LI>Major internal changes designed to make unison safer to run -+at the same time as the replicas are being changed by the user.<BR> -+<BR> -+ -+<LI>Internal performance improvements. -+ -+ </UL> -+Changes since 1.190: -+ <UL> -+<LI> -+ -+<B>Incompatible change:</B> -+ Archive format has changed. Make sure you -+synchronize your replicas before upgrading, to avoid spurious -+conflicts. The first sync after upgrading will be slow.<BR> -+<BR> -+ -+<LI>A number of internal functions have been changed to reduce the -+amount of memory allocation, especially during the first -+synchronization. This should help power users with very big replicas.<BR> -+<BR> -+ -+<LI>Reimplementation of low-level remote procedure call stuff, in -+preparation for adding rsync-like smart file transfer in a later -+release. <BR> -+<BR> -+ -+<LI>Miscellaneous bug fixes. -+ -+ </UL> -+Changes since 1.180: -+ <UL> -+<LI> -+ -+<B>Incompatible change:</B> -+ Archive format has changed. Make sure you -+synchronize your replicas before upgrading, to avoid spurious -+conflicts. The first sync after upgrading will be slow.<BR> -+<BR> -+ -+<LI>Fixed some small bugs in the interpretation of ignore patterns. <BR> -+<BR> -+ -+<LI>Fixed some problems that were preventing the Windows version -+from working correctly when click-started.<BR> -+<BR> -+ -+<LI>Fixes to treatment of file permissions under Windows, which were -+causing spurious reports of different permissions when synchronizing -+between windows and unix systems.<BR> -+<BR> -+ -+<LI>Fixed one more non-tail-recursive list processing function, -+which was causing stack overflows when synchronizing very large -+replicas. -+ -+ </UL> -+Changes since 1.169: -+ <UL> -+<LI> -+ -+The text user interface now provides commands for ignoring -+ files. -+ -+<LI>We found and fixed some <EM>more</EM> non-tail-recursive list -+ processing functions. Some power users have reported success with -+ very large replicas. -+ -+<LI><B>Incompatible change:</B> -+ Files ending in <CODE>.tmp</CODE> are no longer ignored automatically. If you want -+to ignore such files, put an appropriate ignore pattern in your profile.<BR> -+<BR> -+ -+<LI><B>Incompatible change:</B> -+ The syntax of <TT>ignore</TT> and <TT>follow</TT> -+patterns has changed. Instead of putting a line of the form -+<PRE> -+ ignore = <regexp> -+</PRE> -+ in your profile (<TT>.unison/default.prf</TT>), you should put: -+<PRE> -+ ignore = Regexp <regexp> -+</PRE> -+Moreover, two other styles of pattern are also recognized: -+<PRE> -+ ignore = Name <name> -+</PRE> -+matches any path in which one component matches <CODE><name></CODE>, while -+<PRE> -+ ignore = Path <path> -+</PRE> -+matches exactly the path <CODE><path></CODE>.<BR> -+<BR> -+Standard ``globbing'' conventions can be used in <CODE><name></CODE> and -+<CODE><path></CODE>: -+<UL> -+<LI> -+a <CODE>?</CODE> matches any single character except <CODE>/</CODE> -+ -+<LI>a <CODE>*</CODE> matches any sequence of characters not including <CODE>/</CODE> -+ -+<LI><CODE>[xyz]</CODE> matches any character from the set {<TT><I>x</I></TT>, -+ <TT><I>y</I></TT>, <TT><I>z</I></TT> } -+ -+<LI><CODE>{a,bb,ccc}</CODE> matches any one of <CODE>a</CODE>, <CODE>bb</CODE>, or -+ <CODE>ccc</CODE>. -+</UL><BR> -+See the user manual for some examples. -+ -+ </UL> -+Changes since 1.146: -+ <UL> -+<LI> -+ -+Some users were reporting stack overflows when synchronizing -+ huge directories. We found and fixed some non-tail-recursive list -+ processing functions, which we hope will solve the problem. Please -+ give it a try and let us know. -+ -+<LI>Major additions to the documentation. -+ -+ </UL> -+Changes since 1.142: -+ <UL> -+<LI> -+ -+Major internal tidying and many small bugfixes. -+ -+<LI>Major additions to the user manual. -+ -+<LI>Unison can now be started with no arguments -- it will prompt -+automatically for the name of a profile file containing the roots to -+be synchronized. This makes it possible to start the graphical UI -+from a desktop icon. -+ -+<LI>Fixed a small bug where the text UI on NT was raising a 'no such -+ signal' exception. -+ -+ </UL> -+Changes since 1.139: -+ <UL> -+<LI> -+ -+The precompiled windows binary in the last release was compiled -+with an old OCaml compiler, causing propagation of permissions not to -+work (and perhaps leading to some other strange behaviors we've heard -+reports about). This has been corrected. If you're using precompiled -+binaries on Windows, please upgrade. -+ -+<LI>Added a <CODE>-debug</CODE> command line flag, which controls debugging -+of various modules. Say <CODE>-debug XXX</CODE> to enable debug tracing for -+module <CODE>XXX</CODE>, or <CODE>-debug all</CODE> to turn on absolutely everything. -+ -+<LI>Fixed a small bug where the text UI on NT was raising a 'no such signal' -+exception. -+ -+ </UL> -+Changes since 1.111: -+ <UL> -+<LI> -+ -+<B>Incompatible change:</B> -+ The names and formats of the preference files in -+the .unison directory have changed. In particular: -+<UL> -+<LI> -+the file ``prefs'' should be renamed to default.prf -+ -+<LI>the contents of the file ``ignore'' should be merged into -+ default.prf. Each line of the form <CODE>REGEXP</CODE> in ignore should -+ become a line of the form <CODE>ignore = REGEXP</CODE> in default.prf. -+</UL> -+ -+<LI>Unison now handles permission bits and symbolic links. See the -+manual for details.<BR> -+<BR> -+ -+<LI>You can now have different preference files in your .unison -+directory. If you start unison like this -+<PRE> -+ unison profilename -+</PRE> -+(i.e. with just one ``anonymous'' command-line argument), then the -+file <CODE>~/.unison/profilename.prf</CODE> will be loaded instead of -+<CODE>default.prf</CODE>. <BR> -+<BR> -+ -+<LI>Some improvements to terminal handling in the text user interface<BR> -+<BR> -+ -+<LI>Added a switch -killServer that terminates the remote server process -+when the unison client is shutting down, even when using sockets for -+communication. (By default, a remote server created using ssh/rsh is -+terminated automatically, while a socket server is left running.) -+ -+<LI>When started in 'socket server' mode, unison prints 'server started' on -+ stderr when it is ready to accept connections. -+ (This may be useful for scripts that want to tell when a socket-mode server -+ has finished initalization.) -+ -+<LI>We now make a nightly mirror of our current internal development -+ tree, in case anyone wants an up-to-the-minute version to hack -+ around with. -+ -+<LI>Added a file CONTRIB with some suggestions for how to help us -+make Unison better. -+ -+ </UL> -+<!--BEGIN NOTES document--> -+<HR ALIGN=left WIDTH="50%"><DL> -+<DT><A NAME="note1"></A><A HREF="#text1"><FONT SIZE=5>1</FONT></A><DD> If you are compiling Unison 2.7.7 or an earlier version, you need to -+<UL> -+<LI> -+insert a line ``<TT>CAMLFLAGS+=-nolabels</TT> to the file named ``<TT>Makefile.OCaml</TT>'' in the source directory, and -+ -+<LI>install LablGtk 1.1.1 instead of the latest version. -+</UL> -+ -+<DT><A NAME="note2"></A><A HREF="#text2"><FONT SIZE=5>2</FONT></A><DD> The Cygwin port (the <A HREF="#ssh-win">Installing Ssh on Windows</A> section) of openssh includes a ssh server program for the Windows -+ platform, but we have not yet tested Unison with this ssh server.</DL> -+<!--END NOTES--> -+<!--HTMLFOOT--> -+<!--ENDHTML--> -+ -+<!--FOOTER--> -+<HR SIZE=2> -+<BLOCKQUOTE><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by </EM><A HREF="http://para.inria.fr/~maranget/hevea/index.html"><EM>H</EM><EM><FONT SIZE=2><sup>E</sup></FONT></EM><EM>V</EM><EM><FONT SIZE=2><sup>E</sup></FONT></EM><EM>A</EM></A><EM>. -+</EM></BLOCKQUOTE></BODY> -+</HTML> -+ ---- unison-2.9.1.orig/debian/unison-manual.ps -+++ unison-2.9.1/debian/unison-manual.ps -@@ -0,0 +1,6286 @@ -+%!PS-Adobe-2.0 -+%%Creator: dvips(k) 5.86 Copyright 1999 Radical Eye Software -+%%Title: unison-manual.dvi -+%%Pages: 56 -+%%PageOrder: Ascend -+%%BoundingBox: 0 0 612 792 -+%%EndComments -+%DVIPSWebPage: (www.radicaleye.com) -+%DVIPSCommandLine: dvips -o unison-manual.ps unison-manual.dvi -+%DVIPSParameters: dpi=600, compressed -+%DVIPSSource: TeX output 2002.04.11:0113 -+%%BeginProcSet: texc.pro -+%! -+/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S -+N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72 -+mul N/landplus90{false}def/@rigin{isls{[0 landplus90{1 -1}{-1 1}ifelse 0 -+0 0]concat}if 72 Resolution div 72 VResolution div neg scale isls{ -+landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div hsize -+mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul TR[ -+matrix currentmatrix{A A round sub abs 0.00001 lt{round}if}forall round -+exch round exch]setmatrix}N/@landscape{/isls true N}B/@manualfeed{ -+statusdict/manualfeed true put}B/@copies{/#copies X}B/FMat[1 0 0 -1 0 0] -+N/FBB[0 0 0 0]N/nn 0 N/IEn 0 N/ctr 0 N/df-tail{/nn 8 dict N nn begin -+/FontType 3 N/FontMatrix fntrx N/FontBBox FBB N string/base X array -+/BitMaps X/BuildChar{CharBuilder}N/Encoding IEn N end A{/foo setfont}2 -+array copy cvx N load 0 nn put/ctr 0 N[}B/sf 0 N/df{/sf 1 N/fntrx FMat N -+df-tail}B/dfs{div/sf X/fntrx[sf 0 0 sf neg 0 0]N df-tail}B/E{pop nn A -+definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get -+}B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub} -+B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr -+1 add N}if}B/id 0 N/rw 0 N/rc 0 N/gp 0 N/cp 0 N/G 0 N/CharBuilder{save 3 -+1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx -+0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx -+sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{ -+rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp -+gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B -+/chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{ -+/cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{ -+A A add 255 and S 1 and or}ifelse}ifelse put 1 adv}B/rsh{rw cp 2 copy -+get A 0 eq{pop 128}{A 255 eq{pop 127}{A 2 idiv S 128 and or}ifelse} -+ifelse put 1 adv}B/clr{rw cp 2 index string putinterval adv}B/set{rw cp -+fillstr 0 4 index getinterval putinterval adv}B/fillstr 18 string 0 1 17 -+{2 copy 255 put pop}for N/pl[{adv 1 chg}{adv 1 chg nd}{1 add chg}{1 add -+chg nd}{adv lsh}{adv lsh nd}{adv rsh}{adv rsh nd}{1 add adv}{/rc X nd}{ -+1 add set}{1 add clr}{adv 2 chg}{adv 2 chg nd}{pop nd}]A{bind pop} -+forall N/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn -+/BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put -+}if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{ -+bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A -+mul exch 0 get A mul add .99 lt{/QV}{/RV}ifelse load def pop pop}N/eop{ -+SI restore userdict/eop-hook known{eop-hook}if showpage}N/@start{ -+userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X -+1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4 -+index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N -+/p{show}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 N/Ry 0 N/V{}B/RV/v{ -+/Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT) -+(LaserWriter 16/600)]{A length product length le{A length product exch 0 -+exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse -+end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask -+grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot} -+imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round -+exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto -+fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p -+delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M} -+B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p -3 w}B/n{ -+p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S -+rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end -+ -+%%EndProcSet -+TeXDict begin 40258431 52099146 1000 600 600 (unison-manual.dvi) -+@start -+%DVIPSBitmapFont: Fa cmmi10 10 2 -+/Fa 2 112 df<121C127FEAFF80A213C0A3127F121C1200A412011380A2120313005A12 -+06120E5A5A5A12600A19798817>59 D<EC1FC0ECFFF8903807E07E90380F801F90393F00 -+0F80017E14C0491307484814E0485A4848EB03F0120F5B121F48481307A2127F90C7FCA2 -+150F5A4815E0A2151F16C0A248EC3F8016005D157E007E5C4A5A003E495A003F495A6C49 -+5A6C6C48C7FC3807E07E3801FFF038003F8024267DA428>111 D -+E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fb cmitt10 10 28 -+/Fb 28 121 df<003FB612804815C0B7FCA27E6C15802206769B2C>45 -+D<1738177C177E17FEEE01FC160317F8EE07F0EE0FE0A2EE1FC0EE3F80A2EE7F0016FEA2 -+4B5A4B5AA24B5A4B5A151F5E4B5A4BC7FCA215FE4A5AA24A5A4A5AA24A5A4A5A143F5D4A -+C8FC14FEA2495A495AA2495A495AA2495A495A137F91C9FC13FE485AA2485A485AA2485A -+485AA2485A48CAFC5A5A5A5A12702F417CB92C>47 D<15E0EC01F0A214031407140F141F -+EC3FE0147FEB01FF133F4913C0A214DFEB3F1F01001380A2143FA21500A25CA2147EA214 -+FEA25CA21301A25CA21303A25CA21307A25CA2130FA25CA2131FA2007FB512C0B612E0A3 -+6C14C01C3477B32C>49 D<EC01FE91380FFFC0023F13F091B57E01038049EB03FE90390F -+F800FF4948133FD93FC014804A131F49C713C0017E140F13FE5B12015BA20000151F90C8 -+1380A2163FEE7F005E4B5A4B5A150F4B5AED7FF0913801FFC002075BDA3FFEC7FCECFFFC -+010313F04913C0011F90C8FCEB3FFCD97FE0EB07C0495A4890C7120F485AD807F8141F48 -+5A49EC3F80486C147FD9FF801400489038F001FEECFE074890B55A019F5CD87E015C26FE -+007F13C0007C011F5B0078D903FCC7FC2A357CB32C>I<1338137E137F8080EB3FF0EB0F -+F86D7E6DB4FC6D7F6D6C7EEC3FF06E7EEC07FC6EB4FC6E13809138007FC0ED3FE0ED1FF8 -+ED07FC1503150F151FED7FF8913801FFE00207138091381FFE004A5AECFFF0010313C001 -+0F90C7FCEB3FFCEBFFF84813E000071380D81FFEC8FCEA7FF8EAFFE05B90C9FC12FC1270 -+262A7AAD2C>62 D<ED0FC0ED1FE0153FA2157FA215FF15FBEC01F7A21403EDE7C0140715 -+C7140FA2EC1F87A2EC3F0FA2143E147EA214FCA2EB01F8A2EB03F0A2EB07E0A2EB0FC0A2 -+49B5FCA35BA290387E000F151F5BA248481480A2485AA212073A7FFC01FFF0486C4813F8 -+A36C486C13F025347DB32C>65 D<0107B512FC4914FF17C017E07F903A00FE001FF04A13 -+07EE03F8130116015CA21303EE03F05CA20107EC07E0EE0FC04A131FEE3F80010FEC7F00 -+ED03FE91B512F85E495C16F88291388001FE013FEB007FA291C77E178049141FA2137EA2 -+13FEEE3F005B5E0001157E16FE49495A4B5A0003EC0FF0ED3FE0007FB65AB75A93C7FC15 -+FC6C14E02D337EB22C>I<EB03F090380FFC7890383FFFFC5B90B5FC3801FE1F48486C5A -+EA07F8380FF00713E0D81FC05B1380123F1300485C127EA2140F12FE485CA291381FC180 -+ED87E0143FA2EC7F8F9138FF0FC05B6C5AD87E07EB1F80D87F0F133F6CB612006C13DFEC -+8FFE3907FE07FC3901F801F0232476A32C>97 D<EA7FF8487EA3127F12015BA21203A25B -+A21207A25BEBE1FC380FE7FF90B5128015C015E048130F9038FC07F0EBF8039038F001F8 -+EA3FE013C01380A2EA7F00A2127EA2140312FE4814F0A2140715E0140F15C0141FEC3F80 -+EC7F00007E5B387F01FE383F87FCEBFFF86C5B6C13C06C90C7FCEA01FC1D3375B22C>I< -+EC7F80903803FFE0010F13F8013F13FC5B9038FFC1FE3801FE003803FC01EA07F8EA0FF0 -+01E013FCEA1FC0393F80007090C8FCA2127EA312FE5AA77E007E141C007F143E6C6C13FE -+EBC00F6CB5FC6C14FC6C14F0000114C039007FFE001F2475A32C>I<913803FF804A13C0 -+A380EC001F1680A2153FA21600A25DA2157EEB03F090380FFCFEEB3FFF495B90B5FC3801 -+FE1F3803FC0FD807F85B380FF00713E0EA1FC001805B123F13005A007E5CA2140F12FE48 -+5CA291381FC180EDC7E0EC3F87A2EC7F8F02FF13C049130F6C5AD87E07EB1F80D87F0F13 -+3F6CB612006C13DFEC8FFE3907FE07FC3901F801F0233376B22C>I<147F903803FFC001 -+0F13F0013F13F84913FCEBFFC13801FE004848137E485AD80FE013FE15FC485A383F8001 -+90380007F848133F90B512F015E01580B5EAFE0014F000FCC8FCA6127E151C007F143E6C -+6C13FEEBC00F6CB5FC6C14FC6C14F0000114C039007FFE001F2475A32C>I<ED03FCED1F -+FF4B13C05D17E0EDFE1F15FCA30201EB0FC09238F8078093C7FCA40103B512F8825B7F5E -+90260007F0C7FC5DA5140F5DA5141F5DA5143F92C8FCA45C147EA514FE5CA313015CA313 -+03001C5B127F130700FF5B130F495AEBFF807E6C90C9FCEA1FFCEA07F02B457DB22C>I< -+EC07F091381FFC7891387FFEFC49B5FC5B903807FC3F90380FF01F90391FE00FF8ECC007 -+EB3F80EB7F00017E14F013FE5B12014914E0A2150F12034914C0A2151FA2ED3F80A2157F -+15FF4A13006C6C5A6D5A3800FE1F90B55A7F7FEB1FFC903807F0FC90C7FC1401A25DA214 -+03A25D003C1307007E495AB4131F4A5A49B45A90B5C7FC5C6C13F86C13E0000F90C8FC26 -+367BA32C>I<EA07FF487FA37EEA003F91C8FCA25BA2137EA213FEA25BEC3FC00001EBFF -+F090B57E81A248EBF0FEECC07E14005B12075B5BA2484813FE5D5BA2381FC0015DA2EB80 -+03003FECF03016FCEB000715E04814E1020F13F8007E14C1EDC3F000FE14C7EDCFE04814 -+FF6E13C0168048903803FE000070EB00FC263379B22C>I<140FEC1F80EC3FC0A4EC1F80 -+EC0F0091C7FCA8133FEBFFC0000313F05A487FEA1FE1EA3FC11381EA7F01127EEAFE0300 -+FC5B13075C1200130F5C131FA25C133FEC0060EC01F8137F137EEBFE0301FC13F01407EC -+0FE0141FEC3FC090B512806D13005CEB1FF8EB07E01D3475B32C>I<EA7FFFB51280A37E -+EA003F1400A25BA2137EA213FEA25BA21201A25BA21203A25BA21207A25BA2120FA25BA2 -+121FA25BA2003F1318147E1300A24813FE14FC127EEB01F81303387F87F0EA3FFF6C13E0 -+6C13C06C1300EA01FE173370B22C>108 D<D9707E137E903A79FF81FF8090B500C713C0 -+15CF92B512E002C313C348018313830203EB03F001FE13FE01FC01FC13E0120301F813F8 -+A29039F007F007000716C0A201E013E0000F010F130F01C001C01380A2001F011F131F01 -+8001801300A25E003F013F133E01001300167E167C485B007E137EA2167F00FE13FE4849 -+EB3F80170000780178130F2C247DA32C>I<3901F007F03907F81FFC390FFC7FFE486CB5 -+FC48B6128090383FFE1F14F8007E13F014E0EB7FC012FE00FC1380140049133FC6481400 -+A348485B157EA24913FE0003ECFC18167EEBF00115F8000715FE020313FC01E013F015F1 -+000F15F8EDF3F001C013FF6E13E016C0496C13806CC7EA3E0027247AA32C>I<14FE9038 -+07FF80011F13E04913F090B5FC48EB83F83903FE01FCEBF800485A4848137E485AA2485A -+90C7FC5A127EA215FE12FE4814FCA2140115F81403EC07F0A2EC0FE0007EEB1FC0EC3F80 -+007F13FFD83F8313006CB45A14F86C5B000313C0C648C7FC1F2476A32C>I<903907C00F -+C090391FF03FF090393FF8FFFCEB7FFD91B57E9039FE7FF87F01FC497ED801F801E01380 -+EDC01FECFF8000031400495AA2EBF1FCEA00015CA20103143FA24A1400A201075C167E16 -+FE5E010F13014B5A15076E485A011F495A6E485A91B55A93C7FC495BEC9FF8EC07E091C9 -+FC5BA2137EA213FEA25BA21201A25BA2387FFFE0A2B57E6C5BA2293680A32C>I<D801F8 -+EBFF802607FE0313E0260FFF0F13F848019F13FC91B512FED83F9F138190390FFE007E00 -+7E49137F4A13FF49485A12FC9138E000FE16FC49481378000015005CA249C8FCA3137E13 -+FEA25BA21201A25BA21203A25BA35B6C5A282479A32C>114 D<ECFFE0010713FC011F7F -+497F4914809038FF807FEBFC00485A5BA20003EC3F00151C6C6C90C7FC13FEEBFFF86C13 -+FF6D13C0011F13F001077F9038003FFC1401EC007EA2001C143E127F157E48147C15FC14 -+0148495A39FF803FF06CB55A6C5C6C5C000749C7FCC613E0212478A32C>I<EB01E0497E -+A31307A25CA2130FA25CA2131FA25C007FB5128015C0B6FC7E1580C66CC7FCA2137EA213 -+FEA25BA21201A25BA21203A25BA2000714C0EC03F013E0A2000F1307EC0FE0EBC01FEC3F -+C0EC7F809038E1FF006CB45A5C6C5B6C13E06C6CC7FC1C3374B22C>I<01F8EB01C0D803 -+FEEB03E0486C13075A481380D83F9F130F131F007F15C0127E013F131F00FE130000FC15 -+805B017E133F120001FE14005B5D120149137EA2EDFE180003157E9038F001FCA2140316 -+FE913807F8FC140F9038F81FF92601FC3F13F890B6FC6C15F090397FFE7FE090393FF83F -+C090390FE00F8027247AA32C>I<017E14F03901FF8001000701C013F85A4813E001C714 -+FCD83F8713001307007F1401007E15F8EAFE0F00FC13C0131FEC8003000015F0133F1400 -+15074914E0137EA2ED0FC013FE49131F1680A2ED3F005D017E137E5DEB7F836DB45A6D5B -+6D5B6D1380D900FEC7FC26247AA32C>I<003C903803800E003FECC01F267F8007EB3F80 -+123F01C0141F0007130F1580A3141F000F020013001380A2001F495BD9003E133E5A123E -+027E137E007E157C007C137CA202FC13FC00FC5D485B010113015EA20103130300FC01FC -+5BD87C0713073A7E0FFE0FC0007FB6FC6C01BF5B6C011F90C7FC6C486C5A3903F803F829 -+2479A32C>I<90391FC01F809039FFF07FE0489038F9FFF8000790B5FC4815FCD81FF013 -+F03A3FC07FE07E9039803FC0FED87F001381007E148300FE140348EC01FC16F891387F00 -+F0C71400147EA214FEA25CA201011418001E157E003F5B127F018314FE00FF15FC010313 -+01D8FE07EB03F839FC0FFC073A7E1FFE1FF0007FB612E06C15C0023F1300390FFC1FFE39 -+03F007F027247AA32C>I E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fc cmtt8 8 23 -+/Fc 23 116 df<EB0780497EAB007FB512F8B612FCA46C14F839000FC000AB6D5A1E1E7E -+A223>43 D<007FB51280B612C0A46C14801A067C9623>45 D<123E127FEAFF80A5EA7F00 -+123E0909738823>I<007FB512F8B612FCA4003F14F8C9FCA6003FB512F8B612FCA46C14 -+F81E127E9C23>61 D<EB0FC0A2497EA4EB3CF0A5EB7CF8A3EB7878EBF87CA548487EA400 -+03133F497EA290B5FCA2481480A3EBC00F000F14C0EB8007A3397FF03FF800FF14FCA300 -+7F14F81E2A7EA923>65 D<90380FE0E090383FF9F0EBFFFD4813FF5A3807FC3F380FF00F -+381FC007A2383F80031300481301127EA2007CEB00E000FC1400A25AA97EA2127C007E14 -+E0EC01F0127F7EEB8003EA1FC0EC07E0380FF00F3907FC1FC06CB512806C14006C5BEB3F -+F8EB0FE01C2B7DA923>67 D<007FB512FCB612FEA37E3907C0003EA5151C1500A3140E14 -+1FA390B5FCA5EBC01FA3140E91C7FCA9EA7FFEB5FCA36C5A1F297FA823>70 -+D<90381FC1C090387FF3E090B5FC12035AEBF83F380FE01F381FC00F1380003F13071300 -+007E1303A3007CEB01C000FC90C7FCA25AA6EC7FF815FCA27E15F8007CEB03E0127E1407 -+A27EEB800F121FEBC01FEA0FE03807F87F90B5FC7EC613FB90387FF1C090381FC0001E2B -+7EA923>I<EA7FFEB5FCA36C5AEA07C0B3A6157CA7007FB512FCB6FCA36C14F81E297EA8 -+23>76 D<39FF8001FFA26D5AA3391EE00778A3EBF00FEB700EA2EB781EA2EB381CEB3C3C -+A2EB1C38EB1E78A2EB0E70A3EB07E0A3EB03C0A290C7FCA939FFC003FFA520297FA823> -+I<3803FFF0000F13FC487F487FA2397F807F80387E001F007C130FA200FC14C0481307B3 -+A46C130FA2007C1480A2007E131F387F807F6CB51200A26C5B6C5B000313F01A2B7CA923 -+>79 D<9038FF83800003EBE3C04813FF121F5AEA7FC0EB003F00FE131F48130FA25A1407 -+A26CEB038091C7FC127E127FEA3FF06CB4FC6C13F06C13FC00017F39001FFF80010113C0 -+EB001FEC0FE01407EC03F0A20070130112F8A36C1303A26CEB07E06C130F9038E03FC090 -+B5FC15005C00F15B38703FE01C2B7DA923>83 D<3803FF80000F13E04813F8487F80EB80 -+FFEC3F80381F001FC7FC140F14FF137F0003B5FC120F5A387FF00F130012FCA25A141F7E -+6C133F387F81FF90B512FC6C14FE7E000713C73901FE01FC1F1D7D9C23>97 -+D<B47E7FA41207A7EBC1FCEBC7FF01DF13C090B512E015F09038FE0FF8EBF8039038F001 -+FCEBE000A249137EA2153EA5157E7F15FC7F14019038F803F89038FE0FF090B5FC15E001 -+DF138001CF1300380383F81F297FA823>I<EB3FC0EBFFF800037F4813FF481480381FF0 -+7F393F801FC0EB000F007E130715E05AB6FCA415C000F8C8FC7EA2007EEB01C0007FEB03 -+E0383F800713E0391FF81FC06CB5FC6C14800001EBFE006C6C5AEB1FE01B1D7D9C23> -+101 D<147F903801FFC0010713E05B5BEB3FCF140F90383E07C091C7FCA4007FB51280B6 -+12C0A36C1480D8003EC7FCB3383FFFFE487FA36C5B1B297EA823>I<133813FEA5133890 -+C7FCA6EA7FFC487EA3127FEA003EB3387FFFFEB6FCA36C13FE182A7AA923>105 -+D<EA7F80487EA3127F1203A7ECFFFC13C1A313C0EC3F00147E5CEBC1F8EBC3F0EBC7E0EB -+CFC0EBDFE0EBFFF0A2EBFCF8497EEBF07EEBE03E497E1580EC0FC01407EC03E0397FFE0F -+FFB55AA36C487E20297FA823>107 D<EA7FFEB5FCA37EEA001FB3AD007FB512C0B612E0 -+A36C14C01B297CA823>I<397E1F01F039FF7FC7FC9038FFEFFE14FF6C80390FE1FE1FEB -+C1FC01C07FEB80F8A2EB00F0AE3A7FE3FE3FE026FFF3FF13F0A3267FE3FE13E0241D819C -+23>I<38FF81FCEBC7FF01DF138090B512C0A23907FE0FE0EBF807EBF00313E0A313C0AD -+39FFFE1FFF5CA380201D7F9C23>I<133F3801FFE0487F487F487F381FC0FE383F807F38 -+3E001F007E1480007C130F00FC14C0481307A66C130FA2007C1480007E131F6CEB3F006D -+5A381FE1FE6CB45A6C5B6C5B6C5BD8003FC7FC1A1D7C9C23>I<3801FF9C000F13FE5A12 -+7FA2EAFF0000FC137E48133EA26C131C6C1300EA7FF0383FFF80000F13E06C13F838007F -+FCEB01FEEB007F0070133F00F8131F7E143F7E38FF80FFEBFFFE14FC14F814F000701380 -+181D7B9C23>115 D E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fd cmsy8 8 1 -+/Fd 1 16 df<EB7F803801FFE0000713F8487F487F487FA2481480A2B612C0A86C1480A2 -+6C1400A26C5B6C5B6C5B000113E038007F801A1A7C9D23>15 D E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fe cmr8 8 43 -+/Fe 43 122 df<14FF010713E090381F80F090383E003849137C4913FC485A1203491378 -+153092C7FCA7157CB612FCA23803E000157CB3A5486C13FE3A7FFF0FFFE0A2232F7FAE27 -+>12 D<003C13F0387E01F838FF03FCA2EB83FEA2EA7F81383D80F600011306A30003130E -+EB000CA248131C00061318000E13384813704813E0387001C00060138017157EAD23>34 -+D<13031307130E131C1338137013F0EA01E013C01203EA0780A2EA0F00A2121EA35AA45A -+A512F8A25AAB7EA21278A57EA47EA37EA2EA0780A2EA03C0120113E0EA00F01370133813 -+1C130E1307130310437AB11B>40 D<12C07E12707E7E7E120FEA0780120313C0EA01E0A2 -+EA00F0A21378A3133CA4131EA5131FA2130FAB131FA2131EA5133CA41378A313F0A2EA01 -+E0A2EA03C013801207EA0F00120E5A5A5A5A5A10437CB11B>I<123C127EB4FCA21380A2 -+127F123D1201A312031300A25A1206120E5A5A5A126009157A8714>44 -+D<123C127E12FFA4127E123C08087A8714>46 D<130C133C137CEA03FC12FFEAFC7C1200 -+B3B113FE387FFFFEA2172C7AAB23>49 D<EB7F803801FFF0380780FC380E003F48EB1F80 -+48EB0FC05A0060EB07E012F000FC14F07E1403A3007C1307C7FCA215E0140F15C0141F15 -+80EC3F00147E147C5C495A495A495A495A011EC7FC5B5B4913305B485A4848136048C7FC -+000E14E0001FB5FC5A4814C0B6FCA21C2C7DAB23>I<1230123C003FB512F8A215F05A15 -+E039700001C000601480140348EB0700140E140CC7121C5C143014705C495AA2495AA249 -+C7FCA25B130E131EA2133EA3133C137CA413FCA913781D2E7CAC23>55 -+D<4A7E4A7EA34A7EA24A7EA3EC1BF81419A2EC30FCA2EC70FEEC607EA24A7EA349486C7E -+A2010380EC000FA201066D7EA3496D7EA2011FB57EA29038180001496D7EA349147EA201 -+E0147F4980A20001ED1F801203000716C0D80FF0EC3FE0D8FFFC0103B5FCA2302F7EAE35 -+>65 D<DA1FF013C09138FFFE01903903F00F8390390F8001E3013FC71277017C143F4848 -+141F4848140F48481407A248481403121F491401123F90C8FC481500A300FE1600AB127F -+17C0A27E7F001F15016D1580120F6C6C1403EE07006C6C14066C6C140ED8007C5C013F14 -+7890390F8001E0903903F00FC0902600FFFEC7FCEC1FF02A2F7CAD33>67 -+D<DA1FF013C09138FFFE01903903F00F8390390F8001E3013FC71277017C143F4848141F -+4848140F48481407A248481403121F491401123F90C8FC481500A300FE1600A992381FFF -+FEA2007F9138001FE0EE0FC0A27E7F121F7F120F6C7EA26C7E6C6C141FEA007C013F143F -+D90F8013F3903903F007C10100B51200DA1FF813002F2F7CAD37>71 -+D<B512F0A23803FC006C5AB3B3A3487EB512F0A2142D7EAC19>73 -+D<B512F8A2D803FCC8FC6C5AB3A7160CA41618A41638A2167816F81501ED07F00003141F -+B7FCA2262D7EAC2C>76 D<90383F80303901FFF0703807C07C390F000EF0001E13074813 -+034813011400127000F01470A315307EA26C1400127E127FEA3FE013FE381FFFE06C13FC -+6C13FF00011480D8003F13E013039038003FF0EC07F81401140015FC157C12C0153CA37E -+A215787E6C14706C14F06CEB01E039F78003C039E3F00F0038E07FFE38C00FF01E2F7CAD -+27>83 D<007FB712F8A29039000FC003007C150000701638A200601618A200E0161CA248 -+160CA5C71500B3A94A7E011FB512E0A22E2D7EAC33>I<B539F003FFFCA2D803FCC7EA3F -+C06C48EC0F001606B3AB160E0000150C7F161C017C1418017E14386D5C6D146090390F80 -+01E0903907E00380902601F80FC7FC9038007FFCEC0FF02E2E7DAC35>I<B53C801FFFF0 -+01FFF8A22707FC000190C7EA3FC0D803F06D48EC1F00047E140EA26C6C027F140CA26D17 -+1C0000DBDF801318A26D1738017E9026018FC01330A2017F17706D90260307E01360A202 -+8016E0011F90260603F05BA202C01501010F90260C01F85BA202E01503010790261800FC -+90C7FCA202F05D010349EB7E06A202F8150E010149EB3F0CA202FC151C010049EB1F98A2 -+02FE15B8DA7F80EB0FF0A2023F5D92C71207A26E5D021E1403A2020E5D020C1401452E7F -+AC48>87 D<EAFFE0A3EAE000B3B3B3A7EAFFE0A30B4379B114>91 -+D<0003130C48131C000E13384813704813E0003013C0EA700100601380A2EAE00300C013 -+00A300DE137800FF13FCEB83FEA2EA7F81A2383F00FC001E1378171577AD23>I<EAFFE0 -+A31200B3B3B3A712FFA30B437FB114>I<13FF000713C0380F01F0381C00F8003F137C80 -+A2143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE1406 -+5AA3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F83901FC01E01F207D9E23>97 -+D<EA07C012FFA2120F1207AC14FE9038C7FF809038CF03E09038DC01F09038F8007C4913 -+7E49133E497F1680A2150F16C0A9ED1F80A216005D6D133E6D5B01B05B9038BC01F09038 -+0E07E0390607FF80260001FCC7FC222F7EAD27>I<EB1FE0EB7FFC3801F01E3803E00739 -+07C01F80EA0F80EA1F005A003EEB0F00007E90C7FCA2127C12FCA9127EA215C07E6C1301 -+01801380380FC0033907E007003801F03E38007FF8EB1FC01A207E9E1F>I<15F8141FA2 -+14011400ACEB0FE0EB7FF83801F81E3803E0073807C003380F8001EA1F00481300123E12 -+7EA25AA9127C127EA2003E13017EEB8003000F13073903E00EFC3A01F03CFFC038007FF0 -+90391FC0F800222F7EAD27>I<EB1F80EBFFF03803E0783807C03E380F801E381F001FEC -+0F80123E007E130715C0127C12FCA3B6FCA200FCC8FCA5127EA2003E14C0123F6C130139 -+0F80038001C013003803E00F3801F03C38007FF8EB1FC01A207E9E1F>I<EB03F0EB0FFC -+EB3E1EEB7C3F13F8EA01F0A23803E00C1400AAB512E0A23803E000B3A6487E387FFF80A2 -+182F7FAE16>I<013F13F89038FFC3FE3903E1FF1E3807807C000F140C391F003E00A200 -+3E7FA76C133EA26C6C5A00071378380FE1F0380CFFC0D81C3FC7FC90C8FCA3121E121F38 -+0FFFF814FF6C14C04814F0391E0007F848130048147C12F848143CA46C147C007C14F86C -+EB01F06CEB03E03907E01F803901FFFE0038003FF01F2D7E9D23>I<EA07C012FFA2120F -+1207AC14FE9038C3FF809038C703E09038DE01F013F8496C7EA25BA25BB2486C487E3AFF -+FE1FFFC0A2222E7EAD27>I<EA0780EA0FC0EA1FE0A4EA0FC0EA0780C7FCA8EA07C012FF -+A2120F1207B3A5EA0FE0EAFFFCA20E2E7EAD14>I<EA07C012FFA2120F1207ADEC1FFEA2 -+EC0FF0EC07C05D020EC7FC5C5C5C5CEBC3C013C7EBCFE0EBDFF013F9EBF0F8497EEBC07E -+143E80816E7E14076E7E816E7E486C487E3AFFFE07FF80A2212E7EAD25>107 -+D<EA07C012FFA2120F1207B3B3A3EA0FE0EAFFFEA20F2E7EAD14>I<2607C07FEB07F03B -+FFC3FFC03FFC903AC783F0783F3C0FCE01F8E01F803B07DC00F9C00F01F8D9FF8013C049 -+90387F000749137EA249137CB2486C01FEEB0FE03CFFFE0FFFE0FFFEA2371E7E9D3C>I< -+3807C0FE39FFC3FF809038C703E0390FDE01F0EA07F8496C7EA25BA25BB2486C487E3AFF -+FE1FFFC0A2221E7E9D27>I<EB1FE0EB7FF83801F03E3803C00F3907800780390F0003C0 -+4814E0003EEB01F0A248EB00F8A300FC14FCA9007C14F8A26CEB01F0A26CEB03E0A2390F -+8007C03907C00F803901F03E0038007FF8EB1FE01E207E9E23>I<3807C0FE39FFC7FF80 -+9038CF03E0390FDC01F03907F800FC49137E49133E49133FED1F80A3ED0FC0A8151F1680 -+A2ED3F00A26D137E6D137C5D9038FC01F09038CE07E09038C7FF80D9C1FCC7FC01C0C8FC -+A9487EEAFFFEA2222B7E9D27>I<380781F838FF87FEEB8E3FEA0F9CEA07B813B0EBF01E -+EBE000A45BB0487EB5FCA2181E7E9D1C>114 D<3801FE183807FFB8381E01F8EA3C0048 -+1378481338A21418A27E7EB41300EA7FF06CB4FC6C13C06C13F0000113F838001FFC1301 -+38C0007E143EA26C131EA27EA26C133CA26C137838FF01F038E3FFC000C0130017207E9E -+1C>I<1360A413E0A312011203A21207121FB512F0A23803E000AF1418A714383801F030 -+14703800F860EB3FE0EB0F80152A7FA81B>I<D807C013F800FF131FA2000F1301000713 -+00B21401A314033803E007EC0EFC3A01F81CFFC038007FF890391FE0F800221F7E9D27> -+I<3AFFFC01FFC0A23A0FE0007E000007147C15380003143015706C6C1360A26C6C5BA390 -+387C0180A26D48C7FCA2EB3F07EB1F06A2EB0F8CA214DCEB07D8A2EB03F0A36D5AA26D5A -+221E7F9C25>I<3BFFFC3FFE07FFA23B0FE003F001F801C09038E000F00007010114E081 -+2603E00314C0A2913807F8012701F006781380A29039F80E7C030000D90C3C1300A29039 -+7C181E06A2151F6D486C5AA2168C90391F600798A216D890390FC003F0A36D486C5AA36D -+C75A301E7F9C33>I<3AFFFC01FFC0A23A0FE0007E000007147C1538000314306D137000 -+011460A26C6C5BA2EBFC01017C5BEB7E03013E90C7FCA2EB1F06A2148EEB0F8CA2EB07D8 -+A2EB03F0A36D5AA26D5AA2495AA2130391C8FC1278EAFC06A25B131CEA7838EA7070EA3F -+E0EA0F80222B7F9C25>121 D E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Ff cmr6 6 2 -+/Ff 2 51 df<13E01201120712FF12F91201B3A7487EB512C0A212217AA01E>49 -+D<EA01FC3807FF80381C0FC0383003E0386001F0EB00F812F86C13FCA2147C1278003013 -+FCC7FC14F8A2EB01F0EB03E014C0EB0780EB0F00131E13385B5B3801C00CEA0380380600 -+185A5A383FFFF85AB512F0A216217CA01E>I E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fg cmr7 7 2 -+/Fg 2 51 df<13381378EA01F8121F12FE12E01200B3AB487EB512F8A215267BA521>49 -+D<13FF000313E0380E03F0381800F848137C48137E00787F12FC6CEB1F80A4127CC7FC15 -+005C143E147E147C5C495A495A5C495A010EC7FC5B5B903870018013E0EA018039030003 -+0012065A001FB5FC5A485BB5FCA219267DA521>I E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fh cmbx12 12 61 -+/Fh 61 123 df<ED0FFF4AB512C0020F14F0027F80903A01FFF803FC499038C000FE010F -+EB00034948497E49485B5C495A4C138001FF6E13005CA3705AEE01F893C8FCA74BB51280 -+B9FCA5C69038E00003B3B0007FD9FFC1B6FCA538467EC53E>12 D<ED0FFF4AB5EAEF8002 -+0F14FF147F903901FFF807491380010F495A495A495A5C495A8213FF4A7FADB9FCA5C690 -+38E00003B3B0007FD9FFC1B6FCA538467EC53E>I<B612F8A91D097F9A25>45 -+D<EA07C0EA1FF0EA3FF8EA7FFCEAFFFEA7EA7FFCEA3FF8EA1FF0EA07C00F0F788E1F>I< -+EC3FF849B5FC010F14E0013F14F890397FF01FFC9039FFC007FE4890380001FF48486D13 -+80000716C049147F000F16E049143F001F16F0A2003F16F8A249141F007F16FCA600FF16 -+FEB3A3007F16FCA56C6CEC3FF8A3001F16F0A2000F16E06D147F000716C06D14FF6C6C49 -+13806C6D4813006C6D485A90397FF01FFC6DB55A010F14E0010314809026003FF8C7FC2F -+427CC038>48 D<EC03C01407141F147FEB03FF133FB6FCA413C3EA0003B3B3ADB712FCA5 -+264177C038>I<ECFFE0010F13FE013F6D7E90B612E0000315F82607FC0313FE3A0FE000 -+7FFFD81F806D138048C7000F13C0488001C015E001F07F00FF6E13F07F17F881A46C5A6C -+5A6C5AC9FC17F05DA217E05D17C04B13804B1300A2ED1FFC4B5A5E4B5A4B5A4A90C7FC4A -+5A4A5AEC0FF04A5AEC3F804AC7127814FE495A494814F8D907E014F0495A495A49C8FC01 -+7C140149140348B7FC4816E05A5A5A5A5AB8FC17C0A42D417BC038>I<ECFFF0010713FF -+011F14C0017F14F049C66C7ED803F8EB3FFED807E06D7E81D80FF86D138013FE001F16C0 -+7FA66C5A6C4815806C485BC814005D5E4B5A4B5A4B5A4A5B020F1380902607FFFEC7FC15 -+F815FF16C090C713F0ED3FFCED0FFEEEFF80816F13C017E0A26F13F0A217F8A3EA0FC0EA -+3FF0487EA2487EA217F0A25D17E06C5A494913C05BD83F80491380D81FF0491300D80FFE -+EBFFFE6CB612F800015D6C6C14C0011F49C7FC010113E02D427BC038>I<163FA25E5E5D -+5DA25D5D5D5DA25D92B5FCEC01F7EC03E7140715C7EC0F87EC1F07143E147E147C14F8EB -+01F0EB03E0130714C0EB0F80EB1F00133E5BA25B485A485A485A120F5B48C7FC123E5A12 -+FCB91280A5C8000F90C7FCAC027FB61280A531417DC038>I<0007150301E0143F01FFEB -+07FF91B6FC5E5E5E5E5E16804BC7FC5D15E092C8FC01C0C9FCAAEC3FF001C1B5FC01C714 -+C001DF14F09039FFE03FFC9138000FFE01FC6D7E01F06D13804915C0497F6C4815E0C8FC -+6F13F0A317F8A4EA0F80EA3FE0487E12FF7FA317F05B5D6C4815E05B007EC74813C0123E -+003F4A1380D81FC0491300D80FF0495AD807FEEBFFFC6CB612F0C65D013F1480010F01FC -+C7FC010113C02D427BC038>I<4AB47E021F13F0027F13FC49B6FC01079038807F809039 -+0FFC001FD93FF014C04948137F4948EBFFE048495A5A1400485A120FA248486D13C0EE7F -+80EE1E00003F92C7FCA25B127FA2EC07FC91381FFF8000FF017F13E091B512F89039F9F0 -+1FFC9039FBC007FE9039FF8003FF17804A6C13C05B6F13E0A24915F0A317F85BA4127FA5 -+123FA217F07F121FA2000F4A13E0A26C6C15C06D4913806C018014006C6D485A6C9038E0 -+1FFC6DB55A011F5C010714C0010191C7FC9038003FF02D427BC038>I<121E121F13FC90 -+B712FEA45A17FC17F817F017E017C0A2481680007EC8EA3F00007C157E5E00785D15014B -+5A00F84A5A484A5A5E151FC848C7FC157E5DA24A5A14035D14074A5AA2141F5D143FA214 -+7F5D14FFA25BA35B92C8FCA35BA55BAA6D5A6D5A6D5A2F447AC238>I<EC7FF00103B5FC -+010F14C0013F14F090397F801FFC3A01FC0003FE48486D7E497F4848EC7F80163F484815 -+C0A2001F151FA27FA27F7F01FE143F6D158002C0137F02F014006C01FC5B6E485A6C9038 -+FF83FCEDE7F86CECFFE06C5D6C92C7FC6D14C06D80010F14F882013F8090B7FC48013F14 -+802607FC0F14C0260FF80314E04848C6FC496D13F0003F141F48481307496D13F8150000 -+FF157F90C8123F161F160FA21607A36D15F0127F160F6D15E06C6C141F6DEC3FC06C6CEC -+7F80D80FFE903801FF003A07FFC00FFE6C90B55AC615F0013F14C0010F91C7FC010013F0 -+2D427BC038>I<EC7FF0903807FFFE011F6D7E017F14E09039FFE03FF0489038800FF848 -+496C7E48488048486D7E001F80003F1680A2484815C08117E0A212FF17F0A617F8A45D12 -+7FA3003F5CA26C7E5D6C6C5B12076C6C133E6CEBC07C6CEBFFF8013F5B010F01C013F001 -+01130090C8FCA217E05DA2EA03C0D80FF015C0487E486C491380A217004B5A150F5E4949 -+5A6C48495A01C0EBFFE0260FF0035B6CB65A6C4AC7FC6C14F86C6C13E0D907FEC8FC2D42 -+7BC038>I<903807FFC0013F13FC48B612804815E0260FF80013F0D81FC0EB3FF848C7EA -+1FFC4815FE01C0130F486C14FF7FA66C485B6C4814FE000FC7FCC8EA3FFCED7FF8EDFFF0 -+4A13E04A13801600EC07FC4A5A5D4A5A5D4A5A92C7FCA2147E147CA31478AA91C8FCA814 -+F8EB03FE497E497FA2497FA56D5BA26D90C7FC6D5AEB00F828467AC535>63 -+D<EE1F80A24C7EA24C7EA34C7EA24B7FA34B7FA24B7FA34B7F169F031F80161F82033F80 -+ED3E07037E80157C8203FC804B7E02018115F0820203814B137F0207815D173F020F814B -+7F021F8292C77EA24A82023E80027E82027FB7FCA291B87EA2498302F0C8FCA20103834A -+157F0107834A153FA249488284011F8491C97E4984133E017E82B6020FB612F0A54C457C -+C455>65 D<B9FC18F018FE727E19E026003FFCC700077F05017F716C7E727E727EA27213 -+80A37213C0A74E1380A24E1300A24E5A4E5A4E5A4D5B05075B94B5128091B700FCC7FC18 -+F018FF19E002FCC7000113F8716C7EF01FFE727E7213801AC07213E0A27213F0A31AF8A7 -+1AF0A2601AE0604E13C0604E138095B5120005075BBA12F86119C04EC7FC18E045447CC3 -+50>I<DCFFF01470031F01FF14F04AB6EAE0010207EDF803023FEDFE0791B539E001FF0F -+4949C7EA3F9F010701F0EC0FFF4901C0804990C87E4948814948814948167F4849163F48 -+49161F5A4A160F485B19074890CAFC19035A5BA2007F1801A34994C7FC12FFAE127F7F1A -+F0A2123FA27F6C18011AE06C7F19036C6D17C06E16077E6C6DEE0F806C6DEE1F006D6C5E -+6D6C167E6D6C6C5D6D6D4A5A6D01F0EC07F0010101FEEC1FE06D903AFFF001FF80023F90 -+B6C7FC020715FC020115F0DA001F1480030001F8C8FC44467AC451>I<B9FC18F018FE72 -+7E19E026003FFEC7001F13F805017F9438003FFF060F7F727F727F727F84737E737EA273 -+7EA2737EA21B80A2851BC0A51BE0AD1BC0A51B8061A21B006162193F624F5A19FF624E5B -+06075B4E5B063F90C7FC4DB45A050F13F8BA5A19C04EC8FC18F095C9FC4B447CC356>I< -+BA12F8A485D8001F90C71201EF003F180F180318011800A2197E193EA3191EA21778A285 -+A405F890C7FCA316011603161F92B5FCA5ED001F160316011600A2F101E01778A2F103C0 -+A494C7FC1907A21A80A2190FA2191FA2193FF17F0061601807181F4DB5FCBBFC61A44344 -+7DC34A>I<BA1280A419C026003FFEC7121F1701EF007F183F181F180F180719E01803A3 -+1801A3EE01E0F000F0A419001603A31607160F167F91B6FCA59138FE007F160F16071603 -+A31601A693C9FCAFB712F0A53C447CC346>I<DCFFF01470031F01FF14F04AB6EAE00102 -+07EDF803023FEDFE0791B539E001FF0F4949C7EA3F9F010701F0EC0FFF4901C0804990C8 -+7E4948814948814948167F4849163F4849161F5A4A160F485B19074890CAFC19035A5BA2 -+007F1801A34994C8FC12FFAD057FB612F0127F7FA3003FDC0001EBF000A27F7EA26C7FA2 -+6C7F807E6C7F6C7F6D7E6D6C5D6D6C7E6D6D5C6D01F05C010101FE143F6D903AFFF001FF -+9F023F90B6120F0207EDFC030201EDF000DA001F02C01330030001FCC9FC4C467AC458> -+I<B7D88003B612FEA526003FFEC9EBF800B3A791B9FCA54AC9FCB3AAB7D88003B612FEA5 -+4F447CC358>I<B712E0A5D8001F90C7FCB3B3B3A4B712E0A523447DC32A>I<B76C0103B5 -+12F8A526003FFEC93807E0004F5A4F5A077EC7FC614E5A4E5A4E5AF01F804EC8FC187E60 -+4D5AEF07F0EF0FC04D5A4DC9FC177E4C5AEE03F04C5A4C5A4C7EEE7FF04C7E5D4B7F4B7F -+4B7FED3F3FDB7E1F7F03FC806E486C7F4B7E4B6C7F0380804B6C7F4A7F717E84717F8371 -+7F85717F83717F85717F187F727E86727F84727F86727F84B76C90B612FCA54E447CC358 -+>75 D<B712F0A526003FFECAFCB3B1F00780A4180F1900A460A360A2187EA218FE170117 -+031707171F177FEE03FFB95AA539447CC343>I<B500FE067FB512806E95B6FCA26F5EA2 -+D8003F50C7FC013D6DEE03DFA2013C6DEE079FA26E6CEE0F1FA26E6C161EA26E6C163CA3 -+6E6C1678A26E6C16F0A26E6DEC01E0A26E6DEC03C0A36E6DEC0780A26F6CEC0F00A26F6C -+141EA26F6C5CA36F6C5CA26F6C5CA26F6D485AA26F6D485AA26F6D485AA3706C48C7FCA2 -+93383FF81EA2706C5AA2706C5AA3706C5AA2705BA2705BA2705BA2B6057FB6128071C7FC -+A2173E171C61447CC36A>I<B9FC18F018FE727E19E0D8001F90C7000F7F05017F716C7E -+727E727E721380A21AC084A21AE0A91AC0A24E1380A21A00604E5A4E5A4D485A050F5B92 -+B712C096C7FC18FC18C092CBFCB3A7B712E0A543447DC34D>80 D<923807FFC092B512FE -+0207ECFFC0021F15F091267FFE0013FC902601FFF0EB1FFF010701C0010713C04990C700 -+017F49486E7F49486F7E49486F7E49486F7E48496F7E48496F1380A248496F13C0A24819 -+E091C97E4819F0A248487013F8A3007F19FCA249177FA300FF19FEAD007F19FCA36D17FF -+003F19F8A3001F19F06D5EA26C19E06E01FE5B6C912603FF8014C06C6D486D4813804B13 -+E06C9028E01F83F00F13006C903BF01E00F81FFE90267FF83E90387C3FFC90263FFC3C6D -+485AD91FFE91381EFFF0D90FFF021F5B6D01FE5D010194C7FC6D6D6CB45A023F90B512F8 -+020703E0130202006F1307030713C792C7EA07F8716C130F72131F9538FF80FF96B5FC71 -+14FEA3831AFCA27213F81AF0847213E07213C0721300F001FC48587AC454>I<B812F8EF -+FFC018F818FE727ED8001F90C7003F13E005037F05007F727E727E727EA28684A286A762 -+A24E90C7FCA24E5A61187F943801FFF005075B053F138092B7C8FC18F818E018F892C77F -+EF3FFF050F7F717F717FA2717FA2717FA785A61B0F85A2187F73131F72141EB700E06DEB -+803E72EBE0FC72EBFFF8060114F0726C13E0CC0007138050457DC354>I<DAFFE0131C01 -+0701FE133C013F9038FF807C90B6EAE0FC4815F9489038801FFF3907FC00014848EB007F -+4848143F4848140F491407007F15035B1601160012FF177CA27FA26D153C7F7F6D92C7FC -+6C7EEBFFE014FE6CEBFFF015FF6C15E016FC6C816C6F7E6C826C826C6C81011F81010781 -+1300020F80140003077FED007F82040F1380828212F082A282A27EA218007EA26C5D6C5E -+6D14036D5D6D140701F84A5A01FFEC3FF002F8EBFFE0486CB65AD8FC1F92C7FCD8F80714 -+FC48C614F0480107138031467AC43E>I<003FBA12E0A59026FE000FEB8003D87FE09338 -+003FF049171F90C71607A2007E1803007C1801A300781800A400F819F8481978A5C81700 -+B3B3A20107B8FCA545437CC24E>I<B76C010FB512F8A526003FFEC93803E000B3B3A901 -+1F17076280190F6D606F151F6D95C7FC6D6D5D197E6D6D5D6D6D1403DA7FFC4A5A6EB4EC -+3FF0020F9039F003FFE06E90B61280020193C8FC6E6C14FC030F14E09226007FFEC9FC4D -+457CC356>I<B792B6FCA526003FFECAEAFC00806D606F15016D608119036D606F15076D -+606F150F6D6081191F6D6D93C7FC61027F163E6F157E023F167C8119FC6E6D5C18016E5E -+7013036E5E8218076E6D5C180F6E5E70131F6E93C8FC705B037F143E82187E033F147C70 -+13FC6F5C17816F5C17C117C36F5C17E76F5C17FF6F5CA36F91C9FCA2705AA2705AA3705A -+A2705AA2705AA250457EC355>I<B600FE017FB691B512FEA526007FFCC8D83FFEC9EA7C -+006E82013F701778807415F86D705F6F7014016D705FA26F7014036D64814E6D14076D64 -+6F70140F6D041E94C7FCA26F023E6D5C6DDC3C7F151E81027F037C6D5CF0783F6F70147C -+023F4B6C1578A26F01016F13F86E4B6C5D16806E02036F485A4E7E04C0EEE0036E4A486C -+5DA2DCE00FEDF0076E4B6C5D16F06E4A6F48C8FC051E7F04F8705A6E4A027F131EA2DCFC -+7CEDFE3E037F0178023F133C04FE16FF033F01F85E4D8004FF17F86F496E5BA36F496E5B -+A26F604D80A26F90C86C5BA36F486F90C9FCA26F48167EA30478163C6F457EC374>I<B7 -+6C027FB5FCA5D8003F0180C9EAFC006D6D4B5AA26D6D4B5A6D6D4B5A816D4D5A6D6D4B5A -+816D4DC7FC6E6C157E826E5E6E6D495A826E4B5A6E6D495A6E7F4E5A6E6D495A6E7F4EC8 -+FC6F6C137E6F1380606FEBC1F86F13E1EFF3F06FEBF7E06F13FF606F5C8195C9FC705A16 -+3FB3A592B77EA550447EC355>89 D<903801FFE0011F13FE017F6D7E48B612E03A03FE00 -+7FF84848EB1FFC6D6D7E486C6D7EA26F7FA36F7F6C5A6C5AEA00F090C7FCA40203B5FC91 -+B6FC1307013F13F19038FFFC01000313E0000F1380381FFE00485A5B127F5B12FF5BA35D -+A26D5B6C6C5B4B13F0D83FFE013EEBFFC03A1FFF80FC7F0007EBFFF86CECE01FC66CEB80 -+07D90FFCC9FC322F7DAD36>97 D<EB7FC0B5FCA512037EB1ED0FF892B57E02C314E002CF -+14F89139DFC03FFC9139FF000FFE02FCEB03FF4A6D13804A15C04A6D13E05CEF7FF0A218 -+F8173FA318FCAC18F8A2177F18F0A3EFFFE06E15C06E5B6E491380027C491300496C495A -+903AFC1FC07FFC496CB512F0D9F00314C049C691C7FCC8EA1FF036467DC43E>I<EC3FFC -+49B512C0010F14F0013F14FC90397FF003FE9039FFC001FF0003495A48494813805B120F -+485AA2485A6F1300007F6E5AED00784991C7FCA212FFAC6C7EA3123F6DEC03C0A26C6C14 -+07000F16806D140F6C6DEB1F006C6D133E6C01F05B3A007FFC03F86DB55A010F14C00103 -+91C7FC9038003FF82A2F7CAD32>I<EE03FEED07FFA5ED001F160FB1EC3FE0903803FFFC -+010FEBFF8F013F14CF9039FFF807FF48EBC00148903880007F4890C7123F4848141F4914 -+0F121F485AA3127F5BA212FFAC127FA37F123FA26C6C141FA26C6C143F0007157F6C6C91 -+B5FC6CD9C00314FC6C9038F01FEF6DB5128F011FEBFE0F010713F89026007FC0EBF80036 -+467CC43E>I<EC3FF80103B57E010F14E0013F8090397FF83FF89039FFC007FC48496C7E -+48496C7E48486D1380485A001FED7FC05B003FED3FE0A2127F5B17F0161F12FFA290B7FC -+A401F0C9FCA5127FA27FA2123F17F06C7E16016C6C15E06C6C14036C6DEB07C06C6DEB0F -+806C01F0EB3F0090397FFE01FE011FB55A010714F0010114C09026001FFEC7FC2C2F7DAD -+33>I<EDFF80020F13E0027F13F049B512F849EB8FFC90390FFE0FFE90381FFC1F14F813 -+3FEB7FF0A2ED0FFCEBFFE0ED03F0ED00C01600ABB612F8A5C601E0C7FCB3B0007FEBFFE0 -+A527467DC522>I<DAFFE0137E010F9039FE03FF80013FEBFF8F90B812C048D9C07F133F -+489038001FF84848EB0FFC4848903907FE1F80001F9238FF0F00496D90C7FCA2003F82A8 -+001F93C7FCA26D5B000F5D6C6C495A6C6C495A6C9038C07FF04890B55A1680D8078F49C8 -+FC018013E0000F90CAFCA47F7F7F90B612C016FC6CEDFF8017E06C826C16FC7E00038200 -+0F82D81FF0C77ED83FC014074848020113808248C9FC177FA46D15FF007F17006D5C6C6C -+4A5A6C6C4A5AD80FFEEC3FF83B07FFC001FFF0000190B612C06C6C92C7FC010F14F8D900 -+7F90C8FC32427DAC38>I<EB7FC0B5FCA512037EB1ED07FE92383FFF8092B512E002C114 -+F89139C7F03FFC9138CF801F9139DF000FFE14DE14FC4A6D7E5CA25CA35CB3A7B60083B5 -+12FEA537457CC43E>I<137C48B4FC4813804813C0A24813E0A56C13C0A26C13806C1300 -+EA007C90C7FCAAEB7FC0EA7FFFA512037EB3AFB6FCA518467CC520>I<EB7FC0B5FCA512 -+037EB293387FFFE0A593380FE0004C5A4CC7FC167E5EED03F8ED07E04B5A4B5A037FC8FC -+15FEECC1FCECC3FE14C7ECDFFF91B57E82A202F97F02E17F02C07FEC807F6F7E826F7E81 -+6F7F836F7F816F7F83707E163FB60003B512F8A535457DC43B>107 -+D<EB7FC0B5FCA512037EB3B3B3A3B61280A519457CC420>I<90277F8007FEEC0FFCB590 -+263FFFC090387FFF8092B5D8F001B512E002816E4880913D87F01FFC0FE03FF8913D8FC0 -+0FFE1F801FFC0003D99F009026FF3E007F6C019E6D013C130F02BC5D02F86D496D7EA24A -+5D4A5DA34A5DB3A7B60081B60003B512FEA5572D7CAC5E>I<90397F8007FEB590383FFF -+8092B512E0028114F8913987F03FFC91388F801F000390399F000FFE6C139E14BC02F86D -+7E5CA25CA35CB3A7B60083B512FEA5372D7CAC3E>I<EC1FFC49B512C0010714F0011F14 -+FC90397FF80FFF9026FFC0017F48496C7F4848C7EA3FE000078248486E7E49140F001F82 -+A2003F82491407007F82A400FF1780AA007F1700A46C6C4A5AA2001F5E6D141F000F5E6C -+6C4A5AA26C6C6CEBFFE06C6D485B27007FF80F90C7FC6DB55A010F14F8010114C0902600 -+1FFCC8FC312F7DAD38>I<90397FC00FF8B590B57E02C314E002CF14F89139DFC03FFC91 -+39FF001FFE000301FCEB07FF6C496D13804A15C04A6D13E05C7013F0A2EF7FF8A4EF3FFC -+ACEF7FF8A318F017FFA24C13E06E15C06E5B6E4913806E4913006E495A9139DFC07FFC02 -+CFB512F002C314C002C091C7FCED1FF092C9FCADB67EA536407DAC3E>I<DA3FE0131E90 -+2603FFFC133E010F01FF137E013F1480903AFFF80FE0FE489038E003F148EBC001489038 -+8000FB4890C7127F49143F001F151F485A160F5B127FA3485AAC6C7EA46C7EA26C6C141F -+163F6C6C147F6C15FF6C6D5A6C9038E003EF6C9038F01FCF6DB5128F011FEBFE0F010313 -+F89038007FC091C7FCAD0307B512FCA536407CAC3B>I<90387F807FB53881FFE0028313 -+F0028F13F8ED8FFC91389F1FFE000313BE6C13BC14F8A214F0ED0FFC9138E007F8ED01E0 -+92C7FCA35CB3A5B612E0A5272D7DAC2E>I<90391FFC038090B51287000314FF120F381F -+F003383FC00049133F48C7121F127E00FE140FA215077EA27F01E090C7FC13FE387FFFF0 -+14FF6C14C015F06C14FC6C800003806C15806C7E010F14C0EB003F020313E0140000F014 -+3FA26C141F150FA27EA26C15C06C141FA26DEB3F8001E0EB7F009038F803FE90B55A00FC -+5CD8F03F13E026E007FEC7FC232F7CAD2C>I<EB01E0A51303A41307A2130FA2131FA213 -+3F137F13FF1203000F90B51280B7FCA4C601E0C7FCB3A3ED01E0A9150302F013C0137F15 -+0790393FF80F8090391FFC1F006DB5FC6D13FC01015B9038003FE023407EBE2C>I<D97F -+C049B4FCB50103B5FCA50003EC000F6C81B3A85EA25EA25E7E6E491380017FD901F713FE -+9138F807E76DB512C7010F1407010313FE9026007FF0EBFC00372E7CAC3E>I<B6903803 -+FFFCA5000101E09038003E006C163C80017F5D8017F8013F5D6E1301011F5D6E1303010F -+5D6E13076D5DED800F6D92C7FC15C05E6DEBE01E163E6D143CEDF07C027F1378EDF8F802 -+3F5B15FD021F5B15FF6E5BA36E5BA26E90C8FCA26E5AA26E5AA21578362C7EAB3B>I<B5 -+D8FE1FB539801FFFF0A500019027C0003FE0C7EA7C007114786E17F86C6F6C5C6E160101 -+7F6E6C5CA26E011F1403013F6F5C6E013F1407011F6F5CA26E0179140F010F048090C7FC -+6E01F95C6D02F0EBC01E15806D902681E07F5B18E003C3157C6D9139C03FF07815E76DDA -+801F5B18F803FF14F96E9039000FFDE018FF6E486D5BA36E486D5BA26E486D90C8FCA24B -+7F02075DA26E48147C4B143C4C2C7EAB51>I<B500FE90383FFFF0A5C601F0903803E000 -+6D6C495A013F4A5A6D6C49C7FC6E5B6D6C137E6DEB807C6D6D5A6DEBC1F0EDE3E06DEBF7 -+C06EB45A806E90C8FC5D6E7E6E7F6E7FA24A7F4A7F8291381F3FFCEC3E1F027C7F4A6C7E -+49486C7F01036D7F49487E02C08049486C7F49C76C7E013E6E7E017E141FB500E090B512 -+FCA5362C7EAB3B>I<B6903803FFFCA5000101E09038003E006C163C80017F5D8017F801 -+3F5D6E1301011F5D6E1303010F5D6E13076D5DED800F6D92C7FC15C05E6DEBE01E163E6D -+143CEDF07C027F1378EDF8F8023F5B15FD021F5B15FF6E5BA36E5BA26E90C8FCA26E5AA2 -+6E5AA21578A215F85D14015D001F1303D83F805B387FC007D8FFE05B140F92C9FC5C143E -+495A387FC1F8EB07F06CB45A6C5B000790CAFCEA01FC36407EAB3B>I<001FB71280A490 -+26FC001F130001E0495A5B49495A90C7485A48495B123E4A5B4A5B003C495BA24A90C7FC -+4A5A4A5AC7FC4A5A495B495BA2495B499038800780491300A2495A4948130F49481400A2 -+485B48495B485BA248495B4890C75A48485C15034848EB1FFEB7FCA4292C7DAB32>I -+E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fi cmti10 10 65 -+/Fi 65 125 df<04FFEB03F003039038E00FFC923A0FC0F01F1E923A3F00783E0F923A7E -+01F87C3FDB7C03EBFC7F03FC14F8DA01F813F905F1137EDC01E1133C913B03F00003F000 -+A314074B130760A3140F4B130F60A3010FB812C0A3903C001F80001F8000A3023F143F92 -+C790C7FCA44A5C027E147EA402FE14FE4A5CA413014A13015FA313034A13035FA313074A -+495AA44948495AA44948495AA3001CD9038090C8FC007E90380FC03F013E143E00FE011F -+5B133C017C5C3AF8780F01E0D878F0EB07C0273FE003FFC9FC390F8000FC404C82BA33> -+11 D<EE3FFC4BB51280923907E007C092391F8001E0DB3F0013F0037E13034B1307A24A -+5A18E04A48EB038094C7FCA314075DA4140F5DA3010FB7FCA25F903A001F80007EA217FE -+023F5C92C7FCA216015F5C147E16035FA214FE4A13075FA30101140F5F4AECC1C0A2161F -+1783010316805CA2EF870013074A5CEE0F8EEE079EEE03FC010FEC00F04A91C7FCA35C13 -+1FA2001C90CAFC127E5BEAFE3E133C137CEAF878EA78F0EA3FE0EA0F80344C82BA2F>I< -+EE7FE0923903FFFC7E92380FC03E92381F000F033EEB3FFE4B137F03FC14FC5D1401173D -+4A48EB01F8A21703A24A4814F0A21707A2020F15E05D170FA218C0010FB7FCA3903B001F -+80001F80A2173F143F92C71300A25FA24A147E147E17FEA25F14FE4A1301A25FA2010114 -+035CEFF070A21607010316F04AECE0E0A3EFE1C013074A14C3933803E380EE01E7933800 -+FF004948143C94C7FCA3495AA3001C90CAFC127E133E12FE133C137CEAF878EA78F0EA3F -+E0EA0F80374C82BA31>I<3901E003C03907F00FE0000F131F01F813F0001F133FA3000F -+131F3907B00F6038003000A2017013E0016013C0EBE00101C01380000113030180130000 -+035B3807000E000E5B485B485B485B48485A00C05B1C1971B92B>34 -+D<EA01E0EA07F0120F13F8121FA3120FEA07B0EA0030A21370136013E013C01201138012 -+03EA0700120E5A5A5A5A5A0D196EB919>39 D<150C151C153815F0EC01E0EC03C0EC0780 -+EC0F00141E5C147C5C5C495A1303495A5C130F49C7FCA2133EA25BA25BA2485AA212035B -+12075BA2120F5BA2121FA290C8FCA25AA2123EA2127EA2127CA412FC5AAD1278A57EA312 -+1C121EA2120E7EA26C7E6C7EA212001E5274BD22>I<140C140E80EC0380A2EC01C015E0 -+A2140015F0A21578A4157C153CAB157CA715FCA215F8A21401A215F0A21403A215E0A214 -+07A215C0140F1580A2141F1500A2143EA25CA25CA2495AA2495A5C1307495A91C7FC5B13 -+3E133C5B5B485A12035B48C8FC120E5A12785A12C01E527FBD22>I<EA03C0EA07F0120F -+121F13F8A313F0EA07B0EA003013701360A213E013C01201EA038013005A120E5A5A5A5A -+5A0D197A8819>44 D<387FFFF8A2B5FCA214F0150579941E>I<120EEA3F80127F12FFA3 -+1300127E123C0909778819>I<1703EF0780170FA2EF1F005F173E5FA25FA24C5A16035F -+4C5AA24C5AA24CC7FCA2163E167E167C5EA24B5AA24B5A15075E4B5AA24BC8FCA2153E15 -+7E157C5DA24A5AA24A5A14075D4A5AA24AC9FCA2143EA25C14FC5C495AA2495AA2495A13 -+0F5C49CAFCA2133EA25B13FC5B485AA2485AA2485A120F5B48CBFCA2123EA25AA25AA212 -+7031537FBD2A>I<EC03F8EC1FFEEC7C1F9138F80780D901E013C0903903C003E0EB0780 -+010F1301D91F0013F0A2133E137E017C130313FCA2485AA2000314075BA2120716E04913 -+0F120FA34848EB1FC0A44848EB3F80A448C7EA7F00A3157E007E14FEA25D00FE13015DA2 -+48495AA25D007C13075D4A5AA24AC7FC6C133E5C6C5B380F83E03807FF80C648C8FC243A -+77B72A>I<EC03F8EC0FFE91383C0F809138F007C0903901E003E0D903C013F090380780 -+01020013F8130E131E90391C6000FCEB3870EC30011370A213F013E0EC70030001016013 -+F813C014E0ECC00701C114F0903881800F018314E09039C7001FC001FEEB3F80D8007814 -+0090C7127E5D4A5A4A5AEC07C0EC1F80023EC7FC14FCEB01F0EB07C0495A011EC8FC137C -+4914C0484813015B485A4848130348C71380000E1407001E140F48EC1F00D83FF85B397F -+FFC07E39783FFFFCEA700FD8F0075BD8E0015B6D13C0021FC7FC263A79B72A>50 -+D<EC03FCEC1FFF91387E07C09138F003E0903903C001F0D9078013F849C7FC131E011C14 -+FC133CEB38C0EB78E0EB7060150101F014F813E0A2ECE003D971C013F090387F8007D91E -+0013E090C7EA0FC0ED1F80ED3F00157E5D49B45A4913E092C7FC9038000FC0EC03F01401 -+6E7E81A381A5007E130100FE5CA31403485C00E05C14074A5A5D4A5A007049C7FC007813 -+7E6C13F8381E07F03807FF80D801FCC8FC263A78B72A>I<16E0ED01F01503A3150716E0 -+A3150F16C0A2151F1680A2ED3F00A3157EA2157C15FC5D14015D14035D14075D140F5D14 -+1F92C7FC143EA25CECF81C153E903801F07EEB03E014C090380780FE130F49485A133EEB -+7C01137801F05BEA01E03803C003EA0FFE391FFFC3F04813FB267C01FF13403AF0003FFF -+E000601307C71400EC0FE05DA3141F5DA3143F92C7FCA4143E141C24487DB72A>I<D970 -+7C130ED9F3FE131E496C133C48B5133816784815F0EC0F019039FC0703E03A07F00307C0 -+01E0138F3A0FC001FF80497E48C7EA0F00001E5C48141E153E48143C157C485C5A4A5AC7 -+FC4A5AA24A5A140FA24A5AA24AC7FCA25C147E14FE5C1301A25C1303A2495AA3130F5CA2 -+131F5CA2133FA25C137FA391C8FC137E133C273A74B72A>55 D<133C137E13FF5AA313FE -+13FCEA00701300B2120EEA3F80127F12FFA31300127E123C102477A319>58 -+D<EB0780EB0FC0EB1FE0133FA314C01480EB0E0090C7FCB2EA03C0487E487E121FA45B12 -+07EA006013E05BA212015B120390C7FC5A120E5A121812385A5A5A13347AA319>I<14FC -+EB07FF90381F03C090383C01E090387000F049137048481378485A120748C7FC120E121E -+121C003C14F8003814F0007813011270007CEB03E000FE1307EC0FC0EC1F80147F48EBFF -+00387001FCC6485AEB0FF0495AEB3F8049C7FCEA01FE485A13F0485A5B380F81C01301A2 -+495A130791C7FC131EEA07FCEA01F0C9FCA81207EA1FC0123F127FA35B6CC8FC121E1D3C -+70BB2A>63 D<EE01C01603A21607160FA2161F83163FA2167F16FF16EF150116CFED038F -+A2ED070FA2150E151E151C1538A203707FA2EDE007A2EC01C014031580EC0700A2140EA2 -+5CA25C027FB5FCA291B6FC9139E00007F849481303A2495A130791C7FC5B130E5BA25B13 -+78137013F0EA03F8486C4A7EB56C48B512F0A3343C7BBB3E>65 D<0107B612FCEFFF8018 -+C0903B000FF0001FF04BEB07F81703021F15FC17014B14FEA2023F1400A24B1301A2147F -+18FC92C7120318F84A140718F04AEC0FE0EF1FC00101ED3F80EF7F004AEB01FEEE07F849 -+B612E05F9139F80007F0EE01FC01076E7E177F4AEC3F80A2010F16C0171F5CA2131F173F -+5CA2133FEF7F805C1800017F5D4C5A91C7485A5F49140FEE1FE0494A5A00014AB45AB748 -+C7FC16F816C037397BB83A>I<DB03FE130E92393FFF801E92B5EAE03C913903FE01F091 -+3A0FF000787CDA3FC0EB3CFC4AC7EA1FF802FE140FEB03FC49481407494815F049481403 -+495A5C49C813E05B485A5B000317C0485AA2485A1880485A94C7FCA2485AA3127F5BA312 -+FF90CBFCA41738A217784816707E17F06C5E16015F16036C6C4A5A94C7FC001F150E6D14 -+1E000F5D6D5C6C6C495A6C6CEB03C0D801FEEB0F8027007F807EC8FC6DB45A010F13E001 -+0090C9FC373D74BA3B>I<0103B612FEEFFFC018F0903B0007F8000FF84BEB03FCEF00FE -+020F157FF03F804B141F19C0021F150F19E05D1807143F19F05DA2147FA292C8FCA25C18 -+0F5CA2130119E04A151FA2130319C04A153FA201071780187F4A1600A2010F16FEA24A4A -+5A60011F15034D5A4A5D4D5A013F4B5A173F4A4AC7FC17FC017FEC03F84C5A91C7EA1FC0 -+4949B45A007F90B548C8FCB712F016803C397CB83F>I<0107B712FEA3903A000FF00007 -+4B1300187C021F153CA25DA2143FA25D1838147FA292C8FCEE03804A130718004A91C7FC -+A201015CA24A131E163E010314FE91B5FC5EA2903807F800167C4A1378A2130FA24A1370 -+A2011F14F0A24A90C8FCA2133FA25CA2137FA291CAFCA25BA25B487EB6FCA337397BB836 -+>70 D<DB03FE130E92393FFF801E92B5EAE03C913903FE01F0913A0FF000787CDA3FC0EB -+3CFC4AC7EA1FF802FE140FEB03FC49481407494815F049481403495A5C49C813E05B485A -+5B000317C0485AA2485A1880485A94C7FCA2485AA3127F5BA312FF90CBFC0307B512E0A3 -+92390007FC00705A16075FA36C150F5FA36C6C141FA2001F5E6D143F6C7E167F6C6C4A5A -+6C6CEB03EFD801FEEB07C73A007FC03F0790273FFFFC03C7FC010F01F0C8FC0100138037 -+3D74BA40>I<0103B5D8F80FB512E0A390260007F8C7381FE0004B5DA2020F153F615DA2 -+021F157F96C7FC5DA2023F5D605DA2027F14016092C7FCA24A1403605CA249B7FC60A202 -+FCC712070103150F605CA20107151F605CA2010F153F605CA2011F157F95C8FC5CA2013F -+5D5F5CA2017F14015F91C7FC491403007FD9FE01B512F8B55BA243397CB83E>I<0103B5 -+12F8A390390007F8005DA2140FA25DA2141FA25DA2143FA25DA2147FA292C7FCA25CA25C -+A21301A25CA21303A25CA21307A25CA2130FA25CA2131FA25CA2133FA25CA2137FA291C8 -+FC497EB6FCA25C25397CB820>I<0103B500F890387FFFE0A21AC090260007F8C7380FFC -+004B15E061020F4BC7FC183E4B5C18F0021F4A5A4D5A4BEB0F804DC8FC023F143C5F4B5B -+4C5A027FEB07C04CC9FCED001E5E4A5BED01FCECFE0315070101497E151FECFC7C4B7E90 -+3903FDE07FDAFFC07F1580ED003F49488014F84A131F83130F160F4A801607011F81A24A -+130383133F16014A80A2017F6E7EA291C8FC494A7F007F01FE011F13FCB55CA243397CB8 -+40>75 D<0107B512FCA25E9026000FF8C7FC5D5D141FA25DA2143FA25DA2147FA292C8FC -+A25CA25CA21301A25CA21303A25CA21307A25CA2130F170C4A141CA2011F153C17384A14 -+78A2013F157017F04A14E01601017F140317C091C71207160F49EC1F80163F4914FF0001 -+02071300B8FCA25E2E397BB834>I<902603FFF891B512E0A281D90007923807F8006F6E -+5A61020F5E81DA0E7F5DA2021E6D1307033F92C7FC141C82DA3C1F5C70130EEC380FA202 -+786D131E0307141C147082DAF003143C70133814E0150101016E1378030014705C820103 -+6E13F0604A1480163F010715C1041F5B91C7FC17E149EC0FE360010E15F31607011E15FF -+95C8FC011C80A2013C805F1338160013785F01F8157CEA03FC267FFFE0143CB51538A243 -+397CB83E>78 D<ED03FE92383FFFC09238FC07F0913903E001F891390F80007C023FC77E -+027E8002F815804948EC0FC0EB07E04948EC07E0131F4A15F049C81203137E01FE16F848 -+5AA2485AA2485AA2120F5B001F16075B123FA34848ED0FF0A448C9EA1FE0A3EF3FC0A218 -+80177F18005F5F16015F6C4B5A4C5AA24C5A6C4B5A6D4A5A001F93C7FC6D147E000F5D6C -+6CEB03F06C6C495A6C6CEB0F806C6C013FC8FC90383F01FC90381FFFE0010190C9FC353D -+74BA40>I<0107B612F817FF1880903B000FF0003FE04BEB0FF0EF03F8141FEF01FC5DA2 -+023F15FEA25DA2147FEF03FC92C7FCA24A15F817074A15F0EF0FE01301EF1FC04AEC3F80 -+EFFE0001034A5AEE0FF091B612C04CC7FCD907F8C9FCA25CA2130FA25CA2131FA25CA213 -+3FA25CA2137FA291CAFCA25BA25B1201B512FCA337397BB838>I<0103B612F017FEEFFF -+80903B0007F8003FC04BEB0FF01707020FEC03F8EF01FC5DA2021F15FEA25DA2143FEF03 -+FC5DA2027FEC07F818F092C7120F18E04AEC1FC0EF3F004A14FEEE01F80101EC0FE091B6 -+128004FCC7FC9138FC003F0103EC0F80834A6D7E8301071403A25C83010F14075F5CA201 -+1F140FA25CA2133F161F4AECE007A2017F160F180E91C7FC49020F131C007F01FE153CB5 -+913807F078040313F0CAEAFFE0EF3F80383B7CB83D>82 D<92383FC00E913901FFF01C02 -+0713FC91391FC07E3C91393F001F7C027CEB0FF84A130749481303495A4948EB01F0A249 -+5AA2011F15E091C7FCA34915C0A36E90C7FCA2806D7E14FCECFF806D13F015FE6D6D7E6D -+14E0010080023F7F14079138007FFC150F15031501A21500A2167C120EA3001E15FC5EA3 -+003E4A5AA24B5AA2007F4A5A4B5A6D49C7FC6D133ED8F9F013FC39F8FC03F839F07FFFE0 -+D8E01F138026C003FCC8FC2F3D7ABA2F>I<0007B812E0A25AD9F800EB001F01C049EB07 -+C0485AD900011403121E001C5C003C17801403123800785C00701607140700F01700485C -+A2140FC792C7FC5DA2141FA25DA2143FA25DA2147FA292C9FCA25CA25CA21301A25CA213 -+03A25CA21307A25CA2130FA25CEB3FF0007FB512F8B6FCA2333971B83B>I<003FB53980 -+0FFFFEA326007F80C7EA7F8091C8EA3F00173E49153CA2491538A20001167817705BA200 -+0316F05F5BA2000715015F5BA2000F15035F5BA2001F150794C7FC5BA2003F5D160E5BA2 -+007F151E161C90C8FCA2163C4815385A16781670A216F04B5A5E1503007E4A5A4BC8FC15 -+0E6C143E6C6C5B15F0390FC003E03907F01FC00001B5C9FC38007FFCEB1FE0373B70B83E -+>I<B500F8903803FFFEA218FCD803FEC8EA7FC049ED3F000001163E173C17385FA25F16 -+015F6D4A5AA200004BC7FC5E160E5EA25EA25E5EA26D495A7F4B5A150793C8FC150EA25D -+153C15385D1480013F5B14815DEC8380A20287C9FCA2148E149E149C14F8A26D5AA25C5C -+A25CA291CAFC131EA2373B6FB83E>I<B5D8F80FB590381FFFF06102F018E0D807FEC7D8 -+7FE0903803FE00D803F8DA3F806D5AF100F0A24F5A621903621907047F92C7FC190E16FF -+4B5DA2DB03BF5C7F0001DA073F5CA2030E5D83DB1C1F495A180303385D4EC8FC157003F0 -+140E15E0DA01C05CA2DA03805CA2DA07005CA2020E5D17C14A5DEFC3805C027802C7C9FC -+14704A14CE13FE6C6C4814DCA24A14F8A291C75B160F495D5F5B5F5B4992CAFCA249140E -+4C3B6FB853>I<01181330013813709038F001E03901C003800180130000035B3807000E -+000E5B000C1318001C1338485B00301360A2007013E000605BA238EF01DE38FF81FFA66C -+C65A003C13781C196AB92B>92 D<14F8EB07FE90381F871C90383E03FE137CEBF8011201 -+48486C5A485A120FEBC001001F5CA2EA3F801403007F5C1300A21407485C5AA2140F5D48 -+ECC1C0A2141F15831680143F1587007C017F1300ECFF076C485B9038038F8E391F0F079E -+3907FE03FC3901F000F0222677A42A>97 D<133FEA1FFFA3C67E137EA313FE5BA312015B -+A312035BA31207EBE0F8EBE7FE9038EF0F80390FFC07C013F89038F003E013E0D81FC013 -+F0A21380A2123F1300A214075A127EA2140F12FE4814E0A2141F15C05AEC3F80A215005C -+147E5C387801F8007C5B383C03E0383E07C0381E1F80D80FFEC7FCEA01F01C3B77B926> -+I<147F903803FFC090380FC1E090381F0070017E13784913383901F801F83803F0031207 -+13E0120FD81FC013F091C7FC485AA2127F90C8FCA35A5AA45AA3153015381578007C14F0 -+007EEB01E0003EEB03C0EC0F806CEB3E00380F81F83803FFE0C690C7FC1D2677A426>I< -+ED01F815FFA3150316F0A21507A216E0A2150FA216C0A2151FA21680A2153FA202F81300 -+EB07FE90381F877F90383E03FF017C5BEBF80112013803F00048485B120FEBC001121F5D -+EA3F801403127F01005BA214075A485CA2140FA248ECC1C0A2141F15C3ED8380143F1587 -+007C017F1300ECFF076C485B9038038F8E391F0F079E3907FE03FC3901F000F0253B77B9 -+2A>I<147F903803FFC090380FC1E090383F00F0017E13785B485A485A485A120F4913F8 -+001F14F0383F8001EC07E0EC1F80397F81FF00EBFFF891C7FC90C8FC5A5AA55AA2153000 -+7C14381578007E14F0003EEB01E0EC03C06CEB0F806CEB3E00380781F83803FFE0C690C7 -+FC1D2677A426>I<ED07C0ED1FF0ED3E38ED7C3CEDF8FC15F9140115F1020313F8EDF0F0 -+160014075DA4140F5DA4141F5D010FB512C05B16809039003F800092C7FCA45C147EA414 -+FE5CA413015CA413035CA413075CA4130F5CA3131F5CA391C8FC5B121CEA7E3EA2EAFE3C -+137C1378EAF8F01278EA3FC0EA0F80264C82BA19>I<EC07C0EC3FF09138FC38E0903901 -+F01FF0EB03E0903807C00FEB0F80011F1307D93F0013E05B017E130F13FE4914C0120115 -+1F1203491480A2153F1207491400A25DA249137EA215FEA25D00031301140314076C6C48 -+5A0000131FEB787BEB3FF390380FC3F0EB00031407A25DA2140F5D121C007E131F5D00FE -+49C7FC147E5C387801F8387C07E0381FFF80D803FEC8FC24367CA426>I<EB03F0EA01FF -+A3EA00075CA3130F5CA3131F5CA3133F91C8FCA35B90387E07F0EC1FFCEC783E9038FFE0 -+1F02C01380EC800F1400485A16C05B49EB1F8012035BA2153F000715005BA25D000F147E -+5B15FE5D121FD98001131C15F8163C003F01031338010013F0A216704814E0007E15F016 -+E0EDE1C000FE903801E38048903800FF000038143C263B7BB92A>I<EB01C0EB07E014F0 -+130F14E01307EB038090C7FCAB13F0EA03FCEA071EEA0E1F121CA212385B1270A25BEAF0 -+7E12E013FEC65AA212015B1203A25B12075BA2000F13E013C013C1001F13C01381A2EB83 -+801303EB0700A2130E6C5AEA07F8EA01E0143879B619>I<150E153F157FA3157E151C15 -+00ABEC1F80EC7FC0ECF1F0EB01C090380380F813071401130F130E131EEB1C03133C0138 -+13F0A2EB0007A215E0A2140FA215C0A2141FA21580A2143FA21500A25CA2147EA214FEA2 -+5CA21301A25CA213035C121C387E07E0A238FE0FC05C49C7FCEAF83EEA787CEA3FF0EA0F -+C0204883B619>I<EB03F0EA01FFA3EA00075CA3130F5CA3131F5CA3133F91C8FCA35B01 -+7EEB0F80ED3FE015F09039FE01C1F09038FC0387EC0707140E0001011C13E0EBF8389138 -+3003800270C7FC00035BEBF1C0EBF38001FFC8FCEA07FC7FEBFFC0EBE7F8380FE1FCEBC0 -+7E147F80001F809039801F81C0A21583003F013F138001001303A21507481500007E133E -+EC1E0E151E00FE6D5A48EB07F80038EB01E0243B7BB926>I<EB0FC0EA07FFA3EA001F14 -+80A2133FA21400A25BA2137EA213FEA25BA21201A25BA21203A25BA21207A25BA2120FA2 -+5BA2121FA25BA2123FA290C7FCA25AA2EA7E0EA212FE131EEAFC1CA2133C133812F81378 -+EA7870EA7CE0121FEA0F80123B79B915>I<D801E001FEEB07F03C07F803FF801FFC3C0E -+3C0F07C0783E3C1E3E3C03E1E01F261C1F78D9F3C013803C383FF001F7800F02E0140000 -+7801C013FE007018C002805B4A4848EB1F80EAF07FD8E07E5CA200000207143F01FE1700 -+495CA2030F5C0001177E495C18FE031F5C120349DA8001131C18F8033F153C0007040313 -+3849020013F0A24B1570000F17E049017E15F019E003FEECE1C0001FEE01E34949903800 -+FF000007C70038143C3E2679A444>I<D801E013FE3A07F803FF803A0E3C0F07C03A1E3E -+3C03E0261C1F787F39383FF00114E0007813C000708114804A485AEAF07FEAE07EA20000 -+140701FE5C5BA2150F00015D5B151F5E12034990383F8380160316070007027F13004913 -+7EA2160E000F147C49141E161C5E001FEC3C7849EB1FE00007C7EA0780292679A42F>I< -+147F903803FFC090380FC1F090381F00F8017E137C5B4848137E4848133E0007143F5B12 -+0F485AA2485A157F127F90C7FCA215FF5A4814FEA2140115FC5AEC03F8A2EC07F015E014 -+0F007C14C0007EEB1F80003EEB3F00147E6C13F8380F83F03803FFC0C648C7FC202677A4 -+2A>I<9039078007C090391FE03FF090393CF0787C903938F8E03E9038787FC00170497E -+ECFF00D9F0FE148013E05CEA01E113C15CA2D80003143FA25CA20107147FA24A1400A201 -+0F5C5E5C4B5A131F5EEC80035E013F495A6E485A5E6E48C7FC017F133EEC70FC90387E3F -+F0EC0F8001FEC9FCA25BA21201A25BA21203A25B1207B512C0A3293580A42A>I<3903C0 -+03F0390FF01FFC391E783C0F381C7C703A3C3EE03F8038383FC0EB7F8000781500007013 -+00151CD8F07E90C7FCEAE0FE5BA2120012015BA312035BA312075BA3120F5BA3121F5BA3 -+123F90C9FC120E212679A423>114 D<14FE903807FF8090380F83C090383E00E04913F0 -+0178137001F813F00001130313F0A215E00003EB01C06DC7FC7FEBFFC06C13F814FE6C7F -+6D13807F010F13C01300143F141F140F123E127E00FE1480A348EB1F0012E06C133E0070 -+5B6C5B381E03E06CB45AD801FEC7FC1C267AA422>I<EB0380EB07C0130FA4131F1480A3 -+133F1400A35B137E007FB5FCA2B6FC3800FC00A312015BA312035BA312075BA3120F5BA3 -+121FEB801CA2143C003F1338EB0078147014F014E0EB01C0EA3E03381F0780380F0F00EA -+07FCEA01F0183579B31C>I<13F8D803FEEB01C0D8078FEB03E0390E0F8007121E121C00 -+38140F131F007815C01270013F131F00F0130000E015805BD8007E133FA201FE14005B5D -+120149137EA215FE120349EBFC0EA20201131E161C15F813E0163CD9F003133814070001 -+ECF07091381EF8F03A00F83C78E090393FF03FC090390FC00F00272679A42D>I<01F013 -+0ED803FC133FD8071EEB7F80EA0E1F121C123C0038143F49131F0070140FA25BD8F07E14 -+0000E08013FEC6485B150E12015B151E0003141C5BA2153C000714385B5DA35DA24A5A14 -+0300035C6D48C7FC0001130E3800F83CEB7FF8EB0FC0212679A426>I<01F01507D803FC -+903903801F80D8071E903907C03FC0D80E1F130F121C123C0038021F131F49EC800F0070 -+1607A249133FD8F07E168000E0ED000313FEC64849130718000001147E5B03FE5B000316 -+0E495BA2171E00070101141C01E05B173C1738A217781770020314F05F0003010713016D -+486C485A000190391E7C07802800FC3C3E0FC7FC90393FF81FFE90390FE003F0322679A4 -+37>I<903907E007C090391FF81FF89039787C383C9038F03E703A01E01EE0FE3803C01F -+018013C0D8070014FC481480000E1570023F1300001E91C7FC121CA2C75AA2147EA214FE -+A25CA21301A24A1370A2010314F016E0001C5B007E1401010714C000FEEC0380010F1307 -+010EEB0F0039781CF81E9038387C3C393FF03FF03907C00FC027267CA427>I<13F0D803 -+FCEB01C0D8071EEB03E0D80E1F1307121C123C0038140F4914C01270A249131FD8F07E14 -+8012E013FEC648133F160012015B5D0003147E5BA215FE00075C5BA214015DA314035D14 -+070003130FEBF01F3901F87FE038007FF7EB1FC7EB000F5DA2141F003F5C48133F92C7FC -+147E147C007E13FC387001F8EB03E06C485A383C1F80D80FFEC8FCEA03F0233679A428> -+I<903903C0038090380FF007D91FF81300496C5A017F130E9038FFFE1E9038F83FFC3901 -+F007F849C65A495B1401C7485A4A5A4AC7FC141E5C5C5C495A495A495A49C8FC131E5B49 -+131C5B4848133C48481338491378000714F8390FF801F0391FFF07E0383E1FFFD83C0F5B -+00785CD8700790C7FC38F003FC38E000F021267BA422>I<BC12F8A24D02779655>124 -+D E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fj cmsy10 10 8 -+/Fj 8 111 df<007FB81280B912C0A26C17803204799641>0 D<121C127FEAFF80A5EA7F -+00121C0909799917>I<EB0380497EA7397803803C00FC147E00FE14FE397F8383FC393F -+C387F8390FE38FE03903FBBF803900FFFE00EB3FF8EB0FE0A2EB3FF8EBFFFE3903FBBF80 -+390FE38FE0393FC387F8397F8383FC39FE0380FE00FC147E0078143C390007C000A76D5A -+1F247BA62A>3 D<EB1FF0EBFFFE487F000714C04814E04814F04814F8A24814FCA3B612 -+FEA96C14FCA36C14F8A26C14F06C14E06C14C0000114006C5BEB1FF01F1F7BA42A>15 -+D<D93F801508D9FFF0151C00037F4813FE487F4814C09026C07FE0143C273F000FF01438 -+003CD907FC147848EB01FE6E6C6C13F0007091383FC00300F091391FF80FE0486EB5FC03 -+0314C06F14806F6C1300EE3FFC0040ED07F036137B9D41>24 D<EC01F8140FEC3F80ECFC -+00495A495A495AA2130F5CB3A7131F5C133F49C7FC13FEEA03F8EA7FE048C8FCEA7FE0EA -+03F8EA00FE137F6D7E131F80130FB3A7801307A26D7E6D7E6D7EEC3F80EC0FF814011D53 -+7ABD2A>102 D<12FCEAFFC0EA07F0EA01FCEA007E7F80131F80130FB3A7801307806D7E -+6D7EEB007EEC1FF0EC07F8EC1FF0EC7E00495A495A495A5C130F5CB3A7131F5C133F91C7 -+FC137E485AEA07F0EAFFC000FCC8FC1D537ABD2A>I<126012F07EA21278127CA2123C12 -+3EA2121E121FA27E7FA212077FA212037FA212017FA212007FA21378137CA2133C133EA2 -+131E131FA27F80A2130780A26D7EA2130180A2130080A21478147CA2143C143EA2141E14 -+1FA2801580A2140715C0A2140315E0A2140115F0A2140015F8A21578157CA2153C153EA2 -+151E150C1F537BBD2A>110 D E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fk cmtt10 10 86 -+/Fk 86 127 df<003C131E007F137F481480A66C1400A6007E7FA6003E133EA3003C131E -+001C131C191977B32C>34 D<010F133C90381F807EA8013F13FE4A5AA4007FB612F0B712 -+F8A4003F15F03A007E01F800A5EBFE0301FC5BA6003FB612F0B712F8A46C15F03A01F807 -+E000A30003130F01F05BA86C486C5A25337DB22C>I<EB01C0497EA6EB0FFC90387FFF80 -+48B512E00007804880391FFBEFFC393FC3E1FE903803E07F007E80127C00FC158012F815 -+7FA300FCEC3F00A2007E91C7FC127FEA3FC313FBEA1FFF6C13FC6C13FF000114C06C6C7F -+011F13F801037F14E7ECE1FEECE07F81001880007E1580150F12FFA312FE151F1600007E -+5C007F143ED83F8313FE9038C3E1FC391FFBEFF86CB55A6C5C6C5CC691C7FCEB1FF8EB03 -+E0A66D5A21417BB92C>I<D807801307D81FE0EB0F80151F487E486C133F1600007C5CD8 -+FCFC137EEAF87C15FE5D14015DA21403D8FCFC5BEA7CF8007F13075D383FF00FD81FE05B -+A23807801FC75B143F92C7FCA25C147E14FE5CA213015CA213035C13075CA2130F5C131F -+EC800FED3FC0013FEB7FE0140049EBFFF0017E13F9A2D9FE0113F801FC13F0A2120113F8 -+120313F015F90007010013F05B000F14FF49EB7FE0A20007EC3FC06C48EB0F0025417DB9 -+2C>I<EB0FC0EB3FE0497E497E80EA01F8EBF07C147E0003133E13E0A5147E147C9138FC -+3FF89039F0F87FFCEA01F1EBF3F001F7EB3FF89138E01F009038FFC03F6CEB803EA2EC00 -+7E49137C485A486C13FC00075CEBFF01D80FDF5B381F9F81383F8F8390380FC3E0387E07 -+E75D38FC03F7EB01FF5D6D1410ED007C80A26CEBFF80D87E0113C0D87F03EBE0FC3A3F87 -+F7F1F89038FFE3FF6C01C113F06C13806C9038007FC0D801FCEB1F8026357EB32C>I<EA -+0F80EA1FC0EA3FE013F0A213F8A2121F120F1200A4120113F0A2120313E01207EA0FC012 -+1FEA3F80EA7F0012FE5A5A12700D1B71B22C>I<143814FC13011303EB07F8EB0FF0EB1F -+C0EB3F80EB7F0013FE485A485A5B12075B120F5B485AA2123F90C7FCA25A127EA312FE5A -+AC7E127EA3127F7EA27F121FA26C7E7F12077F12037F6C7E6C7E137FEB3F80EB1FC0EB0F -+F0EB07F8EB03FC130113001438164272B92C>I<127012FC7E7E6C7E6C7EEA0FE06C7E6C -+7E6C7E6C7E137F7F1480131F14C0130FEB07E0A214F01303A214F81301A314FC1300AC13 -+0114F8A3130314F0A2130714E0A2EB0FC0131F1480133F14005B13FE485A485A485A485A -+EA3FC0485A48C7FC5A5A1270164279B92C>I<EB0380497EA60020140800F8143E00FE14 -+FE00FF13C1EBC7C7EBE7CF003FB512F8000F14E0000314806C140038007FFCA248B5FC48 -+1480000F14E0003F14F839FFE7CFFEEBC7C7EB07C100FE13C000F8143E00201408000014 -+00A66D5A1F247AAA2C>I<147814FCAF007FB612F0B712F8A46C15F0C700FCC7FCAF1478 -+25267DAB2C>I<EA0F80EA1FE0EA3FF0EA7FF8A213FCA3123F121F120F120013F8A21201 -+EA03F01207EA1FE0EA7FC0EAFF80130012FC12700E17718A2C>I<007FB6FCB71280A46C -+150021067B9B2C>I<121FEA3F80EA7FC0EAFFE0A5EA7FC0EA3F80EA1F000B0B708A2C>I< -+1507ED0F80151FA2153F16005D157E15FE5D14015D14035DA214075D140F5D141F5D143F -+92C7FC5C147E14FE5CA213015C13035C13075C130F5C131F5CA2133F91C8FC5B137E13FE -+5B12015B12035B12075BA2120F5B121F5B123F90C9FC5A127E12FE5AA25A127821417BB9 -+2C>I<EB03F8EB0FFE90383FFF80497F90B57E3901FE0FF03903F803F848486C7EEBE000 -+4848137EA248487FA248C7EA1F80A2003E140F007E15C0A3007C140700FC15E0AC6C140F -+007E15C0A46CEC1F80A36C6CEB3F00A26C6C137E6D13FE00075CEBF0016C6C485A3901FE -+0FF06CB55A6D5B6D5BD90FFEC7FCEB03F823357CB32C>I<1307497EA2131FA2133F137F -+13FF5A1207127FB5FC13DF139FEA7C1F1200B3AE007FB512E0B612F0A36C14E01C3477B3 -+2C>I<EB0FF890387FFF8048B512E00007804814FC391FF80FFE393FE001FF903880007F -+48C7EA3F80007E141F00FE15C0150F6C15E01507A3127E123CC8FCA2150F16C0151F1680 -+153F16005D15FE4A5A14034A5A4A5A4A5A4A5AECFF804948C7FC495A495A495AEB3FE0EB -+7F8049C8FC485A4848EB03C04848EB07E0EA1FE0485A48B6FCB7FCA36C15C023347CB32C -+>I<EB0FFC90387FFF8048B512E0000714F84880391FF807FEEBC0004848137F6D7F1680 -+151FA26C5A6CC7FCC8FC153F16005D15FE14014A5AEC1FF890381FFFF0495BA215F86D7F -+90380007FEEC00FF81ED3F80ED1FC0150FA216E01507A2123C127EB4FC150F16C0A24814 -+1F007FEC3F806DEB7F006C6C5B391FF807FE6CB55A6C5C6C14E0C66C1380D90FFCC7FC23 -+357CB32C>I<1278B712C016E0A316C000FCC7EA3F80ED7F0015FE00785CC712014A5A4A -+5A5D140F5D4A5A143F92C7FC5C147E14FE5C13015CA2495AA213075CA3495AA4495AA513 -+3F91C8FCAA131E23357CB32C>55 D<EB07FCEB3FFF90B512C0488048803907FC07F8390F -+F001FC48486C7ED83F80137E157F48C77E007EEC1F8012FE5AED0FC0A416E0A37E127E00 -+7F141F7E6D133F6C6C137F390FF001FF3807FC0F6CB6FC6C14F76C14C7013F130FD90FF8 -+13C090C7FCA2151F1680153F1600000F5C486C137E486C13FE4A5A4A5A14079038801FF0 -+391FE07FE090B55A6C91C7FC6C5B000113F838007FC023357CB32C>57 -+D<121FEA3F80EA7FC0EAFFE0A5EA7FC0EA3F80EA1F00C7FCAE121FEA3F80EA7FC0EAFFE0 -+A5EA7FC0EA3F80EA1F000B2470A32C>I<EA0F80EA1FC0EA3FE0EA7FF0A5EA3FE0EA1FC0 -+EA0F80C7FCAEEA0F80EA1FC0EA3FE0127F13F0A4123F121F120F1201120313E01207EA0F -+C0A2EA3F80EA7F005A5A12F812700C3071A32C>I<1507ED1F80153F15FF14034A1300EC -+1FFC4A5AECFFE0491380010790C7FCEB0FFCEB3FF8EB7FE048485A4890C8FCEA0FFEEA1F -+F8EA7FF0EAFFC05BA27FEA7FF0EA1FF8EA0FFEEA03FF6C13C06C6C7EEB3FF8EB0FFC6DB4 -+FC01017F6D13E0EC3FF86E7EEC07FF6E13801400153F151FED0700212A7BAD2C>I<007F -+B612F0B712F8A4003F15F0CAFCA8003FB612F0B712F8A46C15F025147DA22C>I<127012 -+FC7E6C7E13E06C7EEA1FFC6C7E3803FF80C67FEB7FF0EB1FF8EB0FFEEB03FF6D13C06D6C -+7EEC3FF8EC0FFC6EB4FC0201138080A25C02071300EC0FFCEC3FF8EC7FE049485A4990C7 -+FCEB0FFEEB1FF8EB7FF0EBFFC000035BD80FFEC8FC485AEA7FF0485A138048C9FC5A1270 -+212A7BAD2C>I<EB3FFE0003B512C0000F14F04814FC4880397FE007FF90C7FC00FEEC3F -+806C141FA3153F007EEC7F00003C5CC7EA03FEEC0FFC4A5AEC3FE04A5A4AC7FC495A495A -+5C13075C130F5CA76D5A90C9FCA8EB0380EB0FE0A2497EA36D5AA2EB038021337BB22C> -+I<EC7F80903803FFE0010F7F013F7F497F9038FFC0FE3901FE007FD803F87F4848EB1F80 -+9038E00FCF390FC03FFF48484813C091B5FCEA3F01393E03F87F903907F03FE0007EEBE0 -+1F397C0FC00FEC8007A2EAFC1F00F8EB0003A900FCEB8007D87C0F14C0A2ECC00F3A7E07 -+E01F80003EEBF03F903903F87F00393F01FFFED81F805B6E5A6C6C6C5A3907E00FC09039 -+F00007C06C6CEB0FE0D801FE131F3900FFC0FF6DB512C06D1480010FEBFE00010313F890 -+38007FC023337CB22C>I<14FE497EA4497FA214EFA2130781A214C7A2010F7FA314C390 -+381F83F0A590383F01F8A490387E00FCA549137E90B512FEA34880A29038F8003FA34848 -+EB1F80A4000715C049130FD87FFEEBFFFC6D5AB514FE6C15FC497E27347EB32C>I<007F -+B512E015F8B612FE6C8016C03903F0003FED0FE0ED07F01503A2ED01F8A6ED03F0A21507 -+ED0FE0ED1FC0EDFF8090B612005D5D15FF16C09039F0001FE0ED07F0ED03F81501ED00FC -+A216FE167EA616FE16FC1501ED03F8150FED3FF0007FB612E016C0B712806CECFE0015F0 -+27337FB22C>I<02FF13700107EBE0F84913F9013F13FD4913FFEBFF813901FE007F4848 -+131FD807F0130F1507485A491303485A150148C7FCA25A007EEC00F01600A212FE5AAB7E -+127EA3007F15F06CEC01F8A26C7EA26C6C13036D14F06C6C130716E0D803FC131F6C6CEB -+3FC03A00FF81FF806DB512006D5B010F5B6D13F00100138025357DB32C>I<007FB5FCB6 -+12C015F0816C803907E003FEEC00FFED7F80153FED1FC0ED0FE0A2150716F0150316F815 -+01A4ED00FCACED01F8A3150316F0A2150716E0150FED1FC0153FED7F80EDFF00EC03FE00 -+7FB55AB65A5D15C06C91C7FC26337EB22C>I<007FB612F0B712F8A37E3903F00001A7ED -+00F01600A4EC01E04A7EA490B5FCA5EBF003A46E5A91C8FCA5163C167EA8007FB612FEB7 -+FCA36C15FC27337EB22C>I<007FB612F8B712FCA37ED803F0C7FCA716781600A515F04A -+7EA490B5FCA5EBF001A46E5A92C7FCAD387FFFE0B5FC805C7E26337EB22C>I<903901FC -+038090390FFF87C04913EF017F13FF90B6FC4813073803FC01497E4848137F4848133F49 -+131F121F5B003F140F90C7FCA2127EED078092C7FCA212FE5AA8913803FFF84A13FCA27E -+007E6D13F89138000FC0A36C141FA27F121F6D133F120F6D137F6C7E6C6C13FF6D5A3801 -+FF076C90B5FC6D13EF011F13CF6DEB0780D901FCC7FC26357DB32C>I<D87FFEEBFFFCB5 -+4813FEA36C486C13FCD807E0EB0FC0B190B6FCA59038E0000FB3D87FFEEBFFFCB54813FE -+A36C486C13FC27337EB22C>I<007FB512F8B612FCA36C14F839000FC000B3B3A5007FB5 -+12F8B612FCA36C14F81E3379B22C>I<D87FFCEB7FF8486CEBFFFCA36C48EB7FF8D807C0 -+EB1F80153FED7F00157E5D4A5A14034A5A5D4A5A4A5A143F4AC7FC147E5CEBC1F813C3EB -+C7FCA2EBCFFEEBDFBEEBFFBF141F01FE7F496C7E13F86E7EEBF00301E07FEBC001816E7E -+A2157E153E153F811680ED0FC0A2ED07E0D87FFCEB1FFC486CEB3FFEA36C48EB1FFC2733 -+7EB22C>75 D<387FFFE0B57EA36C5BD803F0C8FCB3AE16F0ED01F8A8007FB6FCB7FCA36C -+15F025337DB22C>I<D87FE0EB0FFC486CEB1FFEA26D133F007F15FC000F15E001BC137B -+A4019E13F3A3EB9F01A2018F13E3A21483A2018713C314C7A201831383A214EFA2018113 -+03A214FFEB80FEA3147C14381400ACD87FF0EB1FFC486CEB3FFEA36C48EB1FFC27337EB2 -+2C>I<D87FF0EB7FFC486CEBFFFEA27F007FEC7FFCD807FEEB07C013DEA213DF13CFA214 -+8013C714C0A213C314E0A213C114F0A213C014F8A2147CA3143EA2141E141FA2140F1587 -+A2140715C7A2140315E71401A215F71400A215FFD87FFC137F487E153FA26C48EB1F8027 -+337EB22C>I<EB7FFF0003B512E0000F14F848804880EBE003EB800048C7127FA2007E80 -+A300FE158048141FB3A86C143FA2007E1500A3007F5CA26C6C13FEEBF00790B5FC6C5C6C -+5C000314E0C66C90C7FC21357BB32C>I<007FB512C0B612F88115FF6C15802603F00013 -+C0153FED0FE0ED07F0A2150316F81501A6150316F01507A2ED0FE0ED3FC015FF90B61280 -+160015FC5D15C001F0C8FCB0387FFF80B57EA36C5B25337EB22C>I<387FFFFCB67E15E0 -+15F86C803907E007FE1401EC007F6F7E151FA26F7EA64B5AA2153F4BC7FCEC01FE140790 -+B55A5D15E081819038E007FCEC01FE1400157F81A8160FEE1F80A5D87FFEEB1FBFB5ECFF -+00815E6C486D5AC8EA01F029347EB22C>82 D<90381FF80790B5EA0F804814CF000714FF -+5A381FF01F383FC003497E48C7FC007E147F00FE143F5A151FA46CEC0F00007E91C7FC12 -+7F7FEA3FE0EA1FFCEBFFC06C13FC0003EBFFC06C14F06C6C7F01077F9038007FFEEC07FF -+02001380153FED1FC0A2ED0FE0A20078140712FCA56CEC0FC0A26CEC1F806D133F01E0EB -+7F009038FE01FF90B55A5D00F914F0D8F83F13C0D8700790C7FC23357CB32C>I<007FB6 -+12FCB712FEA43AFC007E007EA70078153CC71400B3AF90383FFFFCA2497F6D5BA227337E -+B22C>I<3B7FFF803FFFC0B56C4813E0A36C496C13C03B03F00001F800B3AF6D13030001 -+5DA26D130700005D6D130F017F495A6D6C485AECE0FF6DB5C7FC6D5B010313F86D5B9038 -+003F802B3480B22C>I<D87FFCEB7FFC486CEBFFFEA36C48EB7FFCD80FC0EB07E06D130F -+000715C0A36D131F00031580A36D133F00011500A36D5B0000147EA4017E5BA46D485AA4 -+90381F83F0A4010F5B14C7A301075BA214EFA201035BA214FFA26D90C7FCA46D5A27347E -+B22C>I<D87FF0EB07FF486C491380A36C486D1300001FC8127CA46C6C5CA76C6C495AA4 -+143E147FA33A03E0FF83E0A214F7A201E113C3A3000101E35BA201F113C701F313E7A314 -+C1A200005DA201F713F71480A301FF13FF017F91C7FC4A7EA4013E133E29347FB22C>I< -+3A3FFF03FFE0484913F0148714076C6D13E03A01F800FE007F0000495A13FE017E5BEB7F -+03013F5B1487011F5B14CF010F5B14FF6D5BA26D90C7FCA26D5AA26D5AA2497EA2497EA2 -+497F81EB0FCF81EB1FC7EC87F0EB3F83EC03F8EB7F01017E7FEBFE00497F0001147E4913 -+7F000380491480151FD87FFEEBFFFC6D5AB514FE6C15FC497E27337EB22C>I<D87FFCEB -+7FFC486CEBFFFEA36C48EB7FFCD807F0EB0FC0151F000315806D133F12016DEB7F001200 -+6D137E017E13FE017F5BEB3F01EC81F8131FEC83F0EB0FC314C7903807E7E0A201035B14 -+EF6DB45AA292C7FC7F5C147EB0903807FFE0497FA36D5B27337EB22C>I<003FB612C048 -+15E0A4007EC7EA1FC0ED3F80A2ED7F00157E15FE4A5A003C5CC712034A5AA24A5A4A5AA2 -+4A5A4AC7FCA214FE495AA2495A495AA2495A495AA2495A49C8FCA213FE485AA24848EB03 -+C049EB07E01207485A5B121F485AA248C7FCB7FCA46C15C023337CB22C>I<387FFFFCB5 -+12FEA314FC00FCC7FCB3B3B3B512FC14FEA36C13FC17416FB92C>I<127812F87EA27E12 -+7E127F7E7F121F7F120F7F1207A27F12037F12017F12007F137E137F7F80131FA280130F -+801307801303801301801300A280147E147F8081141F81140F811407811403A281140181 -+140081157E157F811680151FA2150FED070021417BB92C>I<387FFFFCB512FEA37EC712 -+7EB3B3B3387FFFFEB5FCA36C13FC17417DB92C>I<007FB6FCB71280A46C150021067B7D -+2C>95 D<137013F812011203EA07F0EA0FE0EA1FC01380EA3F00123E127E127CA212FC5A -+A4EAFF8013C013E0A2127FA2123FEA1FC0EA0F800D1B71B82C>I<3801FFF0000713FE00 -+1F6D7E15E048809038C01FF81407EC01FC381F80000006C77EC8127EA3ECFFFE131F90B5 -+FC1203120F48EB807E383FF800EA7FC090C7FC12FE5AA47E007F14FEEB8003383FE01F6C -+B612FC6C15FE6C14BF0001EBFE1F3A003FF007FC27247CA32C>I<EA7FF0487EA3127F12 -+01AAEC1FE0ECFFF801FB13FE90B6FC16809138F07FC09138801FE091380007F049EB03F8 -+5BED01FC491300A216FE167EA816FE6D14FCA2ED01F86D13036DEB07F0150F9138801FE0 -+9138E07FC091B51280160001FB5B01F813F83900F03FC027337FB22C>I<903803FFE001 -+1F13F8017F13FE48B5FC48804848C6FCEA0FF0485A49137E4848131890C9FC5A127EA25A -+A8127EA2127F6C140F6DEB1F806C7E6D133F6C6CEB7F003907FE03FF6CB55A6C5C6C6C5B -+011F13E0010390C7FC21247AA32C>I<EC0FFE4A7EA380EC003FAAEB07F8EB3FFE90B512 -+BF4814FF5A3807FC0F380FF00348487E497E48487F90C7FC007E80A212FE5AA87E007E5C -+A2007F5C6C7E5C6C6C5A380FF0073807FC1F6CB612FC6CECBFFE6C143FEB3FFC90390FF0 -+1FFC27337DB22C>I<EB03FE90381FFFC0017F13F048B57E48803907FE03FE390FF800FF -+D81FE0EB3F805B4848EB1FC090C7120F5A007E15E015075AB7FCA416C000FCC9FC7E127E -+A2127F6CEC03C06DEB07E06C7ED80FF0130F6C6CEB3FC001FF13FF000190B512806C1500 -+013F13FC010F13F00101138023247CA32C>I<EC0FF8EC3FFE91B5FC4914805B903807FC -+7F14F090390FE03F0014C092C7FCA6007FB512FEB7FCA36C5C26000FC0C7FCB3A8003FB5 -+12F04880A36C5C21337DB22C>I<ED03F8903907F80FFC90391FFE3FFE017FB6FC48B7FC -+48ECFE7F9038FC0FF82607F003133E3A0FE001FC1CD9C0001300001F8049137EA66D13FE -+000F5CEBE0016C6C485A3903FC0FF048B5FC5D481480D99FFEC7FCEB87F80180C8FCA37F -+6C7E90B512F06C14FE48ECFF804815E04815F03A3FC0001FF848C7EA03FC007E1400007C -+157C00FC157E48153EA46C157E007E15FCD87F801303D83FE0EB0FF8D81FFCEB7FF06CB6 -+12E0000315806C1500D8003F13F8010713C028387EA42C>I<EA7FF0487EA3127F1201AA -+EC1FE0EC7FFC9038F9FFFE01FB7F90B6FC9138F03F80ECC01F02807FEC000F5B5BA25BB3 -+267FFFE0B5FCB500F11480A36C01E0140029337FB22C>I<1307EB1FC0A2497EA36D5AA2 -+0107C7FC90C8FCA7387FFFC080B5FC7EA2EA0007B3A8007FB512FCB612FEA36C14FC1F34 -+79B32C>I<140EEC3F80A2EC7FC0A3EC3F80A2EC0E0091C7FCA748B512804814C0A37EC7 -+120FB3B3A2141F003C1480007E133FB414005CEB01FEEBFFFC6C5B5C001F5B000790C7FC -+1A467CB32C>I<EA7FE0487EA3127F1201AA91381FFFF04A13F8A36E13F0913800FE004A -+5A4A5A4A5A4A5A4A5A4A5A4AC7FC14FEEBF1FC13F3EBF7FE90B5FCA2EC9F80EC0FC001FE -+7FEBFC07496C7E496C7E811400157E811680151F3A7FFFC0FFFCB500E113FEA36C01C013 -+FC27337EB22C>I<387FFFE0B57EA37EEA0003B3B3A5007FB61280B712C0A36C15802233 -+7BB22C>I<3A7F83F007E09039CFFC1FF83AFFDFFE3FFCD87FFF13FF91B57E3A07FE1FFC -+3E01FCEBF83F496C487E01F013E001E013C0A301C01380B33B7FFC3FF87FF0027F13FFD8 -+FFFE6D13F8D87FFC4913F0023F137F2D2481A32C>I<397FF01FE039FFF87FFC9038F9FF -+FE01FB7F6CB6FC00019038F03F80ECC01F02807FEC000F5B5BA25BB3267FFFE0B5FCB500 -+F11480A36C01E0140029247FA32C>I<EB07FCEB1FFF017F13C048B512F048803907FC07 -+FC390FF001FE48486C7E0180133F003F158090C7121F007EEC0FC0A348EC07E0A76C140F -+007E15C0A2007F141F6C15806D133F6C6CEB7F006D5B6C6C485A3907FC07FC6CB55A6C5C -+6C6C13C0011F90C7FCEB07FC23247CA32C>I<397FF01FE039FFF8FFF801FB13FE90B6FC -+6C158000019038F07FC09138801FE091380007F049EB03F85BED01FC491300A216FE167E -+A816FE6D14FCA2ED01F86D13036DEB07F0150F9138801FE09138E07FC091B51280160001 -+FB5B01F813F8EC3FC091C8FCAD387FFFE0B57EA36C5B27367FA32C>I<903903FC078090 -+391FFF0FC0017F13CF48B512EF4814FF3807FE07380FF00148487E49137F4848133F90C7 -+FC48141F127E150F5AA87E007E141FA26C143F7F6C6C137F6D13FF380FF0033807FC0F6C -+B6FC6C14EF6C6C138F6D130FEB07F890C7FCAD0203B5FC4A1480A36E140029367DA32C> -+I<D87FFEEB3FC0B53801FFF0020713F8021F13FC6C5B39003F7FE1ECFF019138FC00F84A -+13704A13005CA25C5CA391C8FCAF007FB512E0B67EA36C5C26247EA32C>I<90387FF870 -+0003B512F8120F5A5A387FC00F387E00034813015AA36CEB00F0007F140013F0383FFFC0 -+6C13FE6CEBFF80000314E0C66C13F8010113FCEB0007EC00FE0078147F00FC143F151F7E -+A26C143F6D133E6D13FE9038F007FC90B5FC15F815E000F8148039701FFC0020247AA32C -+>I<131E133FA9007FB6FCB71280A36C1500D8003FC8FCB1ED03C0ED07E0A5EC800F011F -+EB1FC0ECE07F6DB51280160001035B6D13F89038003FE0232E7EAD2C>I<3A7FF003FF80 -+486C487FA3007F7F0001EB000FB3A3151FA2153F6D137F3900FE03FF90B7FC6D15807F6D -+13CF902603FE07130029247FA32C>I<3A7FFF01FFFCB514FE148314016C15FC3A03E000 -+0F80A26D131F00011500A26D5B0000143EA26D137E017C137CA2017E13FC013E5BA2EB3F -+01011F5BA21483010F5BA214C701075BA214EF01035BA214FF6D90C7FCA26D5A147C2724 -+7EA32C>I<D87FFFEB7FFF6EB5FCB515806C16004A7ED807C0EB01F0A66C6C495AA3143E -+147FA2D801F0495AECFF87A214F7A201F113C700005D9038F9E3CFA201FB13EFA3D97BC1 -+90C7FC017F13FFA21480A2013F5B90381F007C29247FA32C>I<3A3FFF03FFF048018713 -+F8A36C010313F03A00FC007E005D90387E01F8013F5BEB1F83EC87E090380FCFC0903807 -+EF80EB03FF6D90C7FC5C6D5A147C14FE130180903803EF80903807CFC0EB0FC7EC83E090 -+381F01F0013F7FEB7E00017C137C49137E0001803A7FFF01FFFC1483B514FE6C15FC1401 -+27247EA32C>I<3A7FFF01FFFCB5008113FE148314816C010113FC3A03E0000F806C7E15 -+1F6D140012005D6D133E137C017E137E013E137CA2013F13FC6D5BA2EB0F815DA2EB07C1 -+ECC3E0A2EB03E3ECE7C0130114F75DEB00FFA292C7FC80A2143EA2147E147CA214FC5CA2 -+EA0C01003F5BEA7F83EB87E0EA7E0F495A387FFF806C90C8FC6C5A6C5AEA07E027367EA3 -+2C>I<003FB612E04815F0A4007EC7EA1FE0ED3FC0ED7F80EDFF004A5A003C495AC7485A -+4A5A4A5A4A5A4A5A4AC7FCEB01FC495AEB0FF0495A495A495A49C8FC4848EB01E04848EB -+03F0485A485A485A485A485AB7FCA46C15E024247DA32C>I<15FF02071380141F147F91 -+B512004913C04AC7FCEB03F85CB31307EB1FE013FF007F5BB55A49C8FC6D7E6C7FC67F13 -+1FEB07F01303B380EB01FEECFFC06D13FF6E1380141F14070200130021417BB92C>I<12 -+7812FCB3B3B3A9127806416DB92C>I<EA7FC0EAFFF813FE6D7E6C7FC67F131FEB07F013 -+03B380EB01FEECFFC06D13FF6E1380141F147F91B512004913C04AC7FCEB03F85CB31307 -+EB1FE013FF007F5BB55A49C8FC13F8EA7FC021417BB92C>I<01F81370D803FE13F8380F -+FF0148138748EBCFF0397F9FFFE0D8FF0F13C0D8FC07138039F803FE00387000F81D0A79 -+B22C>I E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fl cmbx10 10 54 -+/Fl 54 124 df<913A03FF8007FE027F9039F07FFF800103B500FDB512E0010F903A00FF -+FE0FF0D93FF8ECF81F90267FE0019038F03FF849485A4816E014804816C00200ED1FF081 -+F007C06F91C7FCA8B912E0A4000390C701C0C7FCB3ABB5D8FC3FEBFF80A43D3A7EB938> -+11 D<913803FFC0027F13F00103B512FC010FEB00FED93FF8133FD97FE0EBFF8049485A -+5A1480484A13C04A6C1380A36F1300167E93C7FCA592383FFFC0B8FCA4000390C7FCB3AB -+B5D8FC3F13FFA4303A7EB935>I<913903FFC7C0027F13FF0103B6FC010F130090383FF8 -+0190387FE003EBFFC05A14805A4A7EA281A9B8FCA4000390C7FCB3ABB5D8FC3F13FFA430 -+3A7EB935>I<B61280A819087F9620>45 D<EA0F80EA3FE0EA7FF0A2EAFFF8A5EA7FF0A2 -+EA3FE0EA0F800D0D798C1B>I<141E143E14FE1307133FB5FCA313CFEA000FB3B3A6007F -+B61280A4213779B630>49 D<EB0FFC90387FFFC048B512F0000714FC390FF03FFF261F80 -+0F1380263F000313C05AD9C00113E0486C6C13F07FA2ED7FF8A46C5A6C5A000FC7FCC8FC -+EDFFF0A216E05C16C04A138016004A5A5D4A5A4A5A4A5AEC7F8092C7FC14FEEB01F84948 -+1378495A495A495A013EC712F84914F05B4848130148B6FCA25A5A5A5A4815E0B7FCA425 -+377BB630>I<EB03FF011F13F0017F13FC3901FC07FF2603F003138048486C13C0496C13 -+E0EA0FF001FC14F0121F7FA56C4814E0A23803F001C714C04A138016004A5A4A5AEC3FF0 -+90380FFFC092C7FC15F090380007FE913801FF806E13C016E0ED7FF016F816FC153FA216 -+FEEA1FC0487E487E487EA416FCA249EB7FF8127F01C0EBFFF06C4814E06C6C4813C0260F -+FC0713806CB61200000114FC6C6C13F0010790C7FC27387CB630>I<ED07C0150FA2151F -+153F157F15FFA25C5C5C5CA2141E5C147C5C5C495A495A1307495A5C131E5B137C5B5B48 -+5A485A1207485A90C7FC121E5A127C5AB81280A4C70001EBC000AA0103B61280A429377D -+B630>I<001C15C0D81F80130701F8137F90B61280A216005D5D15F05D15804AC7FC14F0 -+90C9FCA8EB07FE90383FFFE090B512F89038FC07FC9038E003FFD98001138090C713C012 -+0EC813E0157F16F0A216F8A21206EA3F80EA7FE012FF7FA44914F0A26C4813FF90C713E0 -+007C15C06C5B6C491380D9C0071300390FF01FFE6CB512F8000114E06C6C1380D90FF8C7 -+FC25387BB630>I<EC0FF8ECFFFE0103EBFF8090390FF80FC090393FE003E090397FC001 -+F09038FF000F48EC1FF84848133F485A120F5B121FA2003FEC1FF0ED0FE04990C7FC127F -+A21408EC7FF039FFF1FFFC01F313FFD9F78013809039FF007FC049EB3FE04914F0ED1FF8 -+5B16FCA34914FEA5127FA5123F16FCA26C7E16F8000F143F6C6C14F0ED7FE06C6C14C03A -+01FF81FF806C90B51200013F13FC010F13F00101138027387CB630>I<49B47E010F13F0 -+013F13FC9038FE01FF3A01F8007F804848EB3FC04848EB1FE0150F485AED07F0121FA27F -+A27F7F01FEEB0FE0EBFF809138E01FC06CEBF03F02FC13809138FF7F006C14FC6C5C7E6C -+14FE6D7F6D14C04914E048B612F0EA07F848486C13F8261FE01F13FC383FC007EB800100 -+7F6D13FE90C7123F48140F48140715031501A21500A216FC7E6C14016D14F86C6CEB03F0 -+6D13076C6CEB0FE0D80FFEEB7FC00003B61200C614FC013F13F00103138027387CB630> -+56 D<EB03FF011F13E0017F13F83901FF03FE4848C67E4848EB7F80484814C0001FEC3F -+E0123F49EB1FF0127F16F8A212FF16FCA516FEA5007F143FA3123F157F6C7E000F14FF6C -+6C5A3903FE03DF6CB5129F6C6C131FD91FFC13FCEB00201400A216F8D80FE0133F487E48 -+6C14F0A216E0157F16C0EDFF80495A6C4848130090388007FE390FE01FF86CB55A6C14C0 -+C691C7FCEB1FF027387CB630>I<EA0F80EA3FE0EA7FF0A2EAFFF8A5EA7FF0A2EA3FE0EA -+0F80C7FCABEA0F80EA3FE0EA7FF0A2EAFFF8A5EA7FF0A2EA3FE0EA0F800D2579A41B>I< -+ED03E04B7EA24B7EA34B7EA24B7EA34B7EA292B57EA34A8015F302038015E1A202078015 -+C0020F80ED807FA2021F80ED003F4A80023E131FA2027E80027C7F02FC814A7FA2010182 -+4A7F49B77EA3498202C0C7FC010F824A147FA2011F8291C8123F4982013E151FA2017E82 -+017C8101FE83B500F80107B61280A4413A7DB948>65 D<B812C017FC17FF18C028007FF0 -+00037F04007F717E717E171F84A2717EA74D5AA260173F4D5A4D5A4C13C0040F5B91B600 -+FCC7FCA2EFFF8002F0C713F0EF3FF8717E717E717E19807113C0A319E0A719C0A25F4D13 -+8019005FEF7FFE4C485AB912F018C095C7FC17F03B397DB844>I<DB3FFCEB01C00203B5 -+EAC003021FECF00791B6EAFC0F01039039FC00FF3F4901C0EB1FFFD91FFEC77E49481403 -+D97FF080494880485B48177F4849153F4890C9FC181F485A180F123F5B1807127FA24993 -+C7FC12FFAD127F7FF003C0123FA27F001F1707A26C6C1780180F6C6D16006C6D5D6C173E -+6C6D157ED97FF85D6D6C4A5A6DB44A5A010701C0EB0FE06D01FCEBFF80010090B548C7FC -+021F14F8020314E09126003FFEC8FC3A3B7BB945>I<B612FCA439007FF800B3B3ADB612 -+FCA41E397DB824>73 D<B500F80403B512F06E5EA26E5ED8007FF1E000A2D97BFF161EA2 -+01796D5DA201786D5DA26E6C5DA36E6C4A5AA26E6C4A5AA26E6C4A5AA26E6C4A5AA26E6C -+141EA36E6D5BA26E6D5BA26F6C5BA26F6C485AA36F6C485AA26F6C485AA26F6C48C7FCA2 -+923803FF1EA36F13BCA26F13F8A2705AA2705AA213FCB500FC6D4848B612F0A2EE0F80EE -+070054397DB85B>77 D<B500FC0203B512F0A28080C66C6D90390003F0006F6E5A81017B -+7F13798101787F6E7E6E7E6E7F6E7FA26E7F6E7F6E7F6E7F6F7E153F826F13806F13C06F -+13E06F13F06F13F88117FCEE7FFEEE3FFF7013817013C17013E18218F17013F97013FDEF -+7FFF8383A28383838383187FA2183F181F01FC160FB500FC150718031801A244397DB84B -+>I<EDFFF8020FEBFF80027F14F0903A01FFC01FFC010790380007FFD91FFC010113C0D9 -+3FF06D6C7E49486E7E49486E7E48496E7E48834890C86C7EA248486F1380A248486F13C0 -+A2003F18E0A348486F13F0A400FF18F8AC007F18F06D5DA3003F18E0A26D5D001F18C0A2 -+6C6C4B13806C18006E5C6C6D4A5A6C5F6C6D4A5A6D6C4A5AD93FFC49485A6DB401075B01 -+07D9C01F90C7FC010190B512FC6D6C14F0020F1480020001F8C8FC3D3B7BB948>I<B8FC -+17F017FEEFFF8028007FF8000F13C0040113E07013F0EF7FF8EF3FFCA2EF1FFEA218FFA8 -+18FEA2EF3FFCA2EF7FF8EFFFF04C13E0040F13C091B7120017FC17E002F8C9FCB3A4B612 -+FCA438397DB841>I<B712FCEEFFE017FC17FF28007FF8000F13C004017F707F717E717E -+A2717EA284A760A24D5A604D5A4D5A04035B041F90C8FC91B612FC17E0839139F8003FFC -+EE0FFF707F707F8284A2707FA584A51A601AF084177F1901DD3FFE13E0B600FC011F1303 -+94390FFF87C071EBFF8005011400CBEA1FFC443A7DB848>82 D<D907FF130E013FEBE01E -+90B5EAF83E0003ECFE7E3A07FC01FFFE390FF0001F4848130F48481303491301007F1400 -+90C8FC167E5A163EA27F161E7F7F6D91C7FC13FC387FFFE014FEECFFF06C14FE6F7E6C81 -+6C15F06C816C81C681133F010F801301D9000F1480EC007F030F13C01503818100F0157F -+A3163FA27E17807E167F6C16007E6D14FE01E0495A01F813039039FF801FF800FC90B512 -+E0D8F83F5CD8F00749C7FC39E0007FF02A3B7BB935>I<003FB91280A4D9F800EBF003D8 -+7FC09238007FC049161F007EC7150FA2007C1707A200781703A400F818E0481701A4C892 -+C7FCB3AE010FB7FCA43B387DB742>I<B600FC011FB512C0A426007FF8C8381FC000725A -+B3B3181F013F94C7FC8060011F163E6D6C157E187C6D6C15FC6D6D495A6D6DEB07F06D01 -+F0EB1FE0DA7FFEEBFFC0021FB6C8FC02075C020014F0030F1380423A7DB849>I<B600F0 -+0103B512E0A4C601F0C83807F0006E5E017F5F6E150FA2013F5F6E151F011F94C7FC6E5D -+6D163E6F147E6D167CA26F14FC6D5E6F13016D5E6F13036D5E811707027F5D6F130F023F -+5D6F131F021F92C8FC815F6E143EEE807E6E147CEEC0FC6E5C16E016E16E5C16F36E5C16 -+FF6F5BA36F5BA26F90C9FCA26F5AA36F5AA26F5AA26F5A433A7EB848>I<B6D8E01FB500 -+FC90383FFFFCA4000101F0C7D83FFCC8EA7E006C71153C171F6E197C017F701578836E70 -+14F8013F6F5E6E1801011F4B6D5CA26E18036D4B6D5CA26D6D496D495A173C6F170F6D03 -+7C6D91C7FCEF787F6F5F6D4B6C6C131E816D02016E5BEFE01F03F8177C027F01036E1378 -+4D7E03FCEE80F8023F49486C5C15FE021F010FEDC1E04D7E03FF16C36E49EDE3C0041E7F -+049E15F76E01BC6D5C04FC15FF6E95C8FC4C80A26E5F4C143F6E5F4C141FA2037F5E4C14 -+0FA26F486E5AA2031F5E93C812036F5E5E3A7EB863>I<EB3FFE0003B512E0000F14F839 -+1FF00FFE003FEB03FF6D6C7F6E7FA26F7EA26C5A6C5AEA0380C8FCA2EC3FFF010FB5FC13 -+7F3901FFF87F00071380380FFE00EA3FF85B485A12FF5BA415FF6D5A127F263FF00713F8 -+3B1FFC1FBFFFC0390FFFFE1F0003EBF80F39003FE0032A257DA42E>97 -+D<13FFB5FCA412077EAF4AB47E020F13F0023F13FC9138FE03FFDAF00013804AEB7FC002 -+80EB3FE091C713F0EE1FF8A217FC160FA217FEAA17FCA3EE1FF8A217F06E133F6EEB7FE0 -+6E14C0903AFDF001FF80903AF8FC07FE009039F03FFFF8D9E00F13E0D9C00390C7FC2F3A -+7EB935>I<903801FFC0010F13FC017F13FFD9FF8013802603FE0013C048485AEA0FF812 -+1F13F0123F6E13804848EB7F00151C92C7FC12FFA9127FA27F123FED01E06C7E15036C6C -+EB07C06C6C14806C6C131FC69038C07E006DB45A010F13F00101138023257DA42A>I<EE -+7F80ED7FFFA4150381AF903801FF81010F13F1013F13FD9038FFC07F0003EB001FD807FC -+1307000F8048487F5B123FA2485AA312FFAA127FA27F123FA26C6C5B000F5C6C6C5B6C6C -+4913C02701FF80FD13FE39007FFFF9011F13E1010313012F3A7DB935>I<903803FF8001 -+1F13F0017F13FC3901FF83FE3A03FE007F804848133F484814C0001FEC1FE05B003FEC0F -+F0A2485A16F8150712FFA290B6FCA301E0C8FCA4127FA36C7E1678121F6C6C14F86D14F0 -+00071403D801FFEB0FE06C9038C07FC06DB51200010F13FC010113E025257DA42C>I<EC -+1FF0903801FFFC010713FF90391FF87F8090383FE0FFD9FFC113C0A2481381A24813016E -+1380A2ED3E0092C7FCA8B6FCA4000390C8FCB3ABB512FEA4223A7DB91D>I<161FD907FE -+EBFFC090387FFFE348B6EAEFE02607FE07138F260FF801131F48486C138F003F15CF4990 -+387FC7C0EEC000007F81A6003F5DA26D13FF001F5D6C6C4890C7FC3907FE07FE48B512F8 -+6D13E0261E07FEC8FC90CAFCA2123E123F7F6C7E90B512F8EDFF8016E06C15F86C816C81 -+5A001F81393FC0000F48C8138048157F5A163FA36C157F6C16006D5C6C6C495AD81FF0EB -+07FCD807FEEB3FF00001B612C06C6C91C7FC010713F02B377DA530>I<13FFB5FCA41207 -+7EAFED7FC0913803FFF8020F13FE91381F03FFDA3C01138014784A7E4A14C05CA25CA291 -+C7FCB3A3B5D8FC3F13FFA4303A7DB935>I<EA01F0EA07FC487EA2487EA56C5AA26C5AEA -+01F0C8FCA913FF127FA412077EB3A9B512F8A4153B7DBA1B>I<13FFB5FCA412077EAF92 -+380FFFE0A4923803FC0016F0ED0FE0ED1F804BC7FC157E5DEC03F8EC07E04A5A141FEC7F -+E04A7E8181A2ECCFFEEC0FFF496C7F806E7F6E7F82157F6F7E6F7E82150F82B5D8F83F13 -+F8A42D3A7EB932>107 D<13FFB5FCA412077EB3B3ACB512FCA4163A7DB91B>I<01FED97F -+E0EB0FFC00FF902601FFFC90383FFF80020701FF90B512E0DA1F81903983F03FF0DA3C00 -+903887801F000749DACF007F00034914DE6D48D97FFC6D7E4A5CA24A5CA291C75BB3A3B5 -+D8FC1FB50083B512F0A44C257DA451>I<01FEEB7FC000FF903803FFF8020F13FE91381F -+03FFDA3C011380000713780003497E6D4814C05CA25CA291C7FCB3A3B5D8FC3F13FFA430 -+257DA435>I<903801FFC0010F13F8017F13FFD9FF807F3A03FE003FE048486D7E48486D -+7E48486D7EA2003F81491303007F81A300FF1680A9007F1600A3003F5D6D1307001F5DA2 -+6C6C495A6C6C495A6C6C495A6C6C6CB45A6C6CB5C7FC011F13FC010113C029257DA430> -+I<9039FF01FF80B5000F13F0023F13FC9138FE07FFDAF00113800007496C13C06C0180EB -+7FE091C713F0EE3FF8A2EE1FFCA3EE0FFEAA17FC161FA217F8163F17F06E137F6E14E06E -+EBFFC0DAF00313809139FC07FE0091383FFFF8020F13E0020390C7FC91C9FCACB512FCA4 -+2F357EA435>I<49B4EB0780010FEBE00F013FEBF81F9039FFC07C3F0003EB803E3A07FE -+000F7F4848EB07FF121F497F123F497F127FA25B12FFAA6C7EA36C7E5D6C7E000F5C6C6C -+5B6C6C133F6CEBC0FD39007FFFF1011F13C10101130190C7FCAC037F13FEA42F357DA432 -+>I<9038FE03F000FFEB0FFEEC3FFF91387C7F809138F8FFC000075B6C6C5A5CA2913880 -+7F80ED3F00150C92C7FC91C8FCB3A2B512FEA422257EA427>I<90383FF0383903FFFEF8 -+000F13FF381FC00F383F0003007E1301007C130012FC15787E7E6D130013FCEBFFE06C13 -+FCECFF806C14C06C14F06C14F81203C614FC131F9038007FFE140700F0130114007E157E -+7E157C6C14FC6C14F8EB80019038F007F090B512C000F8140038E01FF81F257DA426>I< -+130FA55BA45BA25B5BA25A1207001FEBFFE0B6FCA3000390C7FCB21578A815F86CEB80F0 -+14816CEBC3E090383FFFC06D1380903803FE001D357EB425>I<01FFEC3FC0B5EB3FFFA4 -+000714016C80B3A35DA25DA26C5C6E4813E06CD9C03E13FF90387FFFFC011F13F0010313 -+8030257DA435>I<B539F001FFF8A4000390C7EA3F00161E6E133E6C153C6E137C6C1578 -+6E13F8017F5CECF001013F5C14F8011F495AA2ECFC07010F5CECFE0F010791C7FC6E5A6D -+131E15BE6D13BC15FC6D5BA36E5AA26E5AA26E5AA26E5AA22D257EA432>I<B500F1B538 -+803FFFA43D07FE000FF80003E06C6C010715C082028015076C6E6C148015076C01C0ED0F -+00826E485C017FED801E5D90273FF01E7F5B17C0DAF83E147C011F90393C3FE078037C14 -+F8903B0FFC781FF0F0A29139FEF00FF10107EDF9E002FF14FB6D496CB45AA24B7E6D5EA2 -+6D496C90C7FCA292C7FC6E5CA2023E147C023C143C40257EA445>I<B539F01FFFF0A400 -+0390398003F8006C01C013E06C1407D97FE05B6D6C485A6E48C7FC90381FFC3E010F5B90 -+3807FEFC6D6C5A5D6D5B6D5B6E7E6E7E814A7EA24A7E903801F3FFD903E37FD907C17FEB -+0FC049486C7E4A6C7E013E80496D7E49130F00016E7EB590383FFFF8A42D257EA432>I< -+B539F001FFF8A4000390C7EA3F00161E6E133E6C153C6E137C6C15786E13F8017F5CECF0 -+01013F5C14F8011F495AA2ECFC07010F5CECFE0F010791C7FC6E5A6D131E15BE6D13BC15 -+FC6D5BA36E5AA26E5AA26E5AA26E5AA292C8FCA25C141E003F133E387F803C38FFC07C14 -+7814F8EBC1F0EBC3E06C485A387D1F80D83FFFC9FCEA1FFCEA07F02D357EA432>I<003F -+B612C0A3D9F0031380EB800749481300003E5C003C495A007C133F5D0078495A14FF5D49 -+5B5BC6485B92C7FC495A131F5C495A017FEB03C0EBFFF014E04813C05AEC80074813005A -+49EB0F80485A003F141F4848133F9038F001FFB7FCA322257DA42A>I<B812FEA32F0380 -+9730>I E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fm cmbx12 14.4 34 -+/Fm 34 119 df<EA07F0487E487E487E487EB51280A76C13006C5A6C5A6C5A6C5A111176 -+9025>46 D<157815FC14031407141F14FF130F0007B5FCB6FCA2147F13F0EAF800C7FCB3 -+B3B3A6007FB712FEA52F4E76CD43>49 D<EC3FFE0103B512E0010F14FC013F14FF90B712 -+C048D9C07F7F2703FE000F13F8D807F801037FD80FE06D7F48486D7F48488001F0168048 -+6C6E13C07F486C6E13E07FA27013F0A56C5AA26C5AEA0FF0EA03C0C914E05EA218C05E18 -+80A24C13005F4C5A4B5B5F4B5B5F4B5B4B90C7FC4B5A5E4B5AED7FE04B5A4A5B4A48C8FC -+4A5A5D4A48EB01F04A5AEC3F804AC7FC02FEEC03E0495A495A495A495AD91F80140749C8 -+FC013E150F017FB7FC90B812C05A5A5A5A5A5A5AB9FC1880A4344E79CD43>I<91380FFF -+C091B512FC0107ECFF80011F15E090263FF8077F9026FF800113FC4848C76C7ED803F86E -+7E491680D807FC8048B416C080486D15E0A4805CA36C17C06C5B6C90C75AD801FC1680C9 -+FC4C13005FA24C5A4B5B4B5B4B13C04B5BDBFFFEC7FC91B512F816E016FCEEFF80DA0007 -+13E0030113F89238007FFE707E7013807013C018E07013F0A218F8A27013FCA218FEA2EA -+03E0EA0FF8487E487E487EB57EA318FCA25E18F891C7FC6C17F0495C6C4816E001F04A13 -+C06C484A1380D80FF84A13006CB44A5A6CD9F0075BC690B612F06D5D011F1580010302FC -+C7FCD9001F1380374F7ACD43>I<177C17FEA2160116031607160FA2161F163F167FA216 -+FF5D5DA25D5DED1FBFED3F3F153E157C15FCEC01F815F0EC03E01407EC0FC01580EC1F00 -+5C147E147C5C1301495A495A5C495A131F49C7FC133E5B13FC485A5B485A1207485A485A -+90C8FC123E127E5ABA12C0A5C96C48C7FCAF020FB712C0A53A4F7CCE43>I<D80380150E -+D807E0157E01FEEC03FED9FFF0137F91B65A5F5F5F5F5F94C7FC5E5E16F016C093C8FC15 -+F801E190C9FC01E0CAFCABEC0FFF027F13F001E3B512FE01E76E7E9026FFF8077FDAC001 -+7F49C713F8496E7E49143F4981496E7E6C481680C9FC18C08218E0A418F0A3EA0FE0487E -+487E487E487EA418E0A35B6C484A13C05B491680003EC85A003F17006C6C4A5A6D5D6C6C -+4A5AD807F8495BD803FE01075B2701FFC03F5B6C90B65A013F4AC7FC6D14F8010314C090 -+26007FF8C8FC344F79CD43>I<ED0FFF92B512E0020780021F14FC91397FFE03FE903A01 -+FFF0007F4901C0EB3F804990C7121F4948EC7FC0494814FF49484913E049485B01FF5C48 -+5BA2485B5AA2486F13C04A6D1380486F1300177E94C7FC5AA291CAFC5AA21508913801FF -+F8020713FFB54814C04A14F04AC66C7E023C6D7E4A6D7E4A6D7E7013804A15C0A24A15E0 -+7013F05C18F8A491C714FCA37EA67EA46C17F880A27E18F06C5D18E06C6D15C07E6E4913 -+806C6D15006D6C495A6D6CEB7FFC6DB448485A6D90B55A010315C0010092C7FC023F13FC -+020713C0364F7ACD43>I<91380FFF8091B512F8010314FE010F6E7E4901037F90267FF8 -+007F4948EB3FF048496D7E484980486F7E484980824817805A91C714C05A7013E0A218F0 -+B5FCA318F8A618FCA46C5DA37EA25E6C7F6C5DA26C5D6C7F6C6D137B6C6D13F390387FF8 -+03011FB512E36D14C30103028313F89039007FFE03EC00401500A218F05EA3D801F816E0 -+487E486C16C0487E486D491380A218005E5F4C5A91C7FC6C484A5A494A5A49495B6C4849 -+5BD803FC010F5B9027FF807FFEC7FC6C90B55A6C6C14F06D14C0010F49C8FC010013F036 -+4F7ACD43>57 D<171F4D7E4D7EA24D7EA34C7FA24C7FA34C7FA34C7FA24C7FA34C808304 -+7F80167E8304FE804C7E03018116F8830303814C7E03078116E083030F814C7E031F8116 -+8083033F8293C77E4B82157E8403FE824B800201835D840203834B800207835D844AB87E -+A24A83A3DA3F80C88092C97E4A84A2027E8202FE844A82010185A24A820103854A820107 -+85A24A82010F855C011F717FEBFFFCB600F8020FB712E0A55B547BD366>65 -+D<BA12C019FEF1FFC01AF01AFCD8000701F0C7000313FFDE007F7F737F070F7F737F8785 -+87858785A287A84F5BA263616361634F5B4F5B077F90C7FC4E485A060713F892B812E097 -+C8FC861AF003F0C7000313FE9539003FFF80070F13E0737F07017F87737F747E1C807413 -+C0A27413E0A31CF0A386A362A31CE0A2621CC0A250138097B5FC1C004F5B19074F5B073F -+13F04EB55ABC128098C7FC1AF81AC007F8C8FC54527CD160>I<932601FFFCEC01C0047F -+D9FFC013030307B600F81307033F03FE131F92B8EA803F0203DAE003EBC07F020F01FCC7 -+383FF0FF023F01E0EC0FF94A01800203B5FC494848C9FC4901F882494982494982494982 -+4949824990CA7E494883A2484983485B1B7F485B481A3FA24849181FA3485B1B0FA25AA2 -+98C7FC5CA2B5FCAE7EA280A2F307C07EA36C7FA21B0F6C6D1980A26C1A1F6C7F1C006C6D -+606C6D187EA26D6C606D6D4C5A6D6D16036D6D4C5A6D6D4C5A6D01FC4C5A6D6DEE7F806D -+6C6C6C4BC7FC6E01E0EC07FE020F01FEEC1FF80203903AFFE001FFF0020091B612C0033F -+93C8FC030715FCDB007F14E0040101FCC9FC525479D261>I<B812C0A5D8000701F8C7FC -+B3B3B3B2B812C0A52A527CD132>73 D<BAFC19F819FF1AE086D8000701F0C7001F13FC06 -+0113FF726C13807313C0070F13E01BF0857313F81BFCA27313FEA41BFFA81BFEA31BFC61 -+A21BF84F13F04F13E0614F13C04F13004E485A061F5B92B812F01AC04FC7FC19E003F8CB -+FCB3AEB812C0A550527CD15C>80 D<B912F0F0FF8019F819FF1AC0D8000701F0C714F006 -+0F7F060113FE727F737F737F85737F87A2737FA387A863A2616363A24F5B4F5B4F90C8FC -+4F5A06035B060F13F095B512C092B8C9FC19F819E019F89226F0000313FE9439007FFF80 -+727F727F727F727F727F8684A28684A787A71D1C75133EA38575137E73157C7513FC7314 -+01B86C6D9038F803F807039038FE07F07390B512E0736C14C0080F1400CEEA7FFC5F537C -+D164>82 D<91260FFF80130791B500F85B010702FF5B011FEDC03F49EDF07F9026FFFC00 -+6D5A4801E0EB0FFD4801800101B5FC4848C87E48488149150F001F824981123F4981007F -+82A28412FF84A27FA26D82A27F7F6D93C7FC14C06C13F014FF15F86CECFF8016FC6CEDFF -+C017F06C16FC6C16FF6C17C06C836C836D826D82010F821303010082021F16801400030F -+15C0ED007F040714E01600173F050F13F08383A200788200F882A3187FA27EA219E07EA2 -+6CEFFFC0A27F6D4B13806D17006D5D01FC4B5A01FF4B5A02C04A5A02F8EC7FF0903B1FFF -+C003FFE0486C90B65AD8FC0393C7FC48C66C14FC48010F14F048D9007F90C8FC3C5479D2 -+4B>I<003FBC1280A59126C0003F9038C0007F49C71607D87FF8060113C001E08449197F -+49193F90C8171FA2007E1A0FA3007C1A07A500FC1BE0481A03A6C994C7FCB3B3AC91B912 -+F0A553517BD05E>I<B700FE031FB512FEA5D8001F01F0CA383FFE00F307F06D626F170F -+6D62811B1F6D6D601B3F6D97C7FC6F5F6D197E821BFE6E6D5E1A016E6D5E1A036E607015 -+07A26E6D5E1A0F6E6D5E1A1F6E6070153FA26E6D93C8FC626E6E147E1AFE6F5E711301A2 -+6F6D5C19036F6D5C19076F5E71130FA26F6D5C191F6F6D5C193F6F93C9FC715BA26FEC80 -+7E19FE706D5A18C1705C18E3705C18F318F770EBFFE0A2705CA2705CA37091CAFCA2705B -+A2715AA3715AA2715AA2715A715A5F537DD166>86 D<EC7FFF0107B512F0013F14FE90B7 -+7E48D9E00F7F2703FE000113F0486C6D7F6EEB3FFC48826E131F83707FA36C496D7FA26C -+90C7FC6C5AC9FCA6037FB5FC020FB6FC91B7FC01071487013FEBF0074913803901FFFC00 -+4813F0485B485B485B4890C7FC5A5BA2485AA45EA26D5C007F151D163D6C6C02797F6C6D -+01F113F86C9026C003E1EBFFE06C9026F81FC014F06C90B5487EC6ED001F011F01FC0107 -+13E0010101E090C8FC3C387CB641>97 D<913801FFF8021FEBFF8091B612F0010315FC01 -+0F9038C00FFE903A1FFE0001FFD97FFC491380D9FFF05B4817C048495B5C5A485BA2486F -+138091C7FC486F1300705A4892C8FC5BA312FFAD127F7FA27EA2EF03E06C7F17076C6D15 -+C07E6E140F6CEE1F806C6DEC3F006C6D147ED97FFE5C6D6CEB03F8010F9038E01FF00103 -+90B55A01001580023F49C7FC020113E033387CB63C>99 D<4DB47E0407B5FCA5EE001F17 -+07B3A4913801FFE0021F13FC91B6FC010315C7010F9038E03FE74990380007F7D97FFC01 -+01B5FC49487F4849143F484980485B83485B5A91C8FC5AA3485AA412FFAC127FA36C7EA3 -+7EA26C7F5F6C6D5C7E6C6D5C6C6D49B5FC6D6C4914E0D93FFED90FEFEBFF80903A0FFFC0 -+7FCF6D90B5128F0101ECFE0FD9003F13F8020301C049C7FC41547CD24B>I<913803FFC0 -+023F13FC49B6FC010715C04901817F903A3FFC007FF849486D7E49486D7E4849130F4849 -+6D7E48178048497F18C0488191C7FC4817E0A248815B18F0A212FFA490B8FCA318E049CA -+FCA6127FA27F7EA218E06CEE01F06E14037E6C6DEC07E0A26C6DEC0FC06C6D141F6C6DEC -+3F806D6CECFF00D91FFEEB03FE903A0FFFC03FF8010390B55A010015C0021F49C7FC0201 -+13F034387CB63D>I<ED3FFC0203B5FC020F14C0023F14E09139FFF81FF0499038C03FF8 -+49EB807F49903800FFFC495A495AA2495AA2EE7FF8495AEE3FF0EE0FC093C7FCAEB712E0 -+A526007FF8C8FCB3B3A7007FB512FEA52E547CD329>I<DA3FFF14FF0103B5D8F00713C0 -+010FDAFC1F13E0013FECFF7F90267FFC0F9038FF9FF09026FFE001EBF83F48496C13E048 -+4990387FF01F4890C7D83FF813E0489338FC0FC0F0078048486E6CC7FCA2003F82A9001F -+5EA26C6C4A5AA26C5E6C6D495A6C6D495A6C6D485BDAFC0F5B4890B6C8FCD803EF14FC01 -+C314F02607C03F90C9FC91CBFCA2120FA37FA213F813FE90B7FC6C16F817FF18C06C836C -+836C836D828448B9FC12074848C700031480D81FF8EC003F4848150748486F13C083485A -+83A56D5D007F18806D5D003F18006C6C4B5AD80FFEED1FFC6C6C6CEC7FF86C01E049485A -+6C01FE011F5B6C6CB71280010F03FCC7FC010115E0D9000F01FCC8FC3C4F7CB543>I<EB -+3FF0B5FCA51203C6FCB3A4EE1FFC93B512C0030314F0030F8092391FE07FFC92393F001F -+FE037C8003F07FDAF1E081ECF3C0DAF7807F8502FFC7FC5CA25CA45CB3ACB6D8F807B612 -+C0A542537BD24B>I<137F497E000313E0487FA2487FA76C5BA26C5BC613806DC7FC90C8 -+FCADEB3FF0B5FCA512017EB3B3A6B612E0A51B547BD325>I<EB3FF0B5FCA512017EB3B3 -+B3B1B612F0A51C537BD225>108 D<D93FF0EB1FFCB591B512C0030314F0030F8092391F -+E07FFC92393F001FFE0003027C80C602F07FDAF1E081ECF3C0DAF7807F8502FFC7FC5CA2 -+5CA45CB3ACB6D8F807B612C0A542367BB54B>110 D<913801FFE0021F13FE91B612C001 -+0315F0010F9038807FFC903A1FFC000FFED97FF86D6C7E49486D7F48496D7F48496D7F4A -+147F48834890C86C7EA24883A248486F7EA3007F1880A400FF18C0AC007F1880A3003F18 -+006D5DA26C5FA26C5F6E147F6C5F6C6D4A5A6C6D495B6C6D495B6D6C495BD93FFE011F90 -+C7FC903A0FFF807FFC6D90B55A010015C0023F91C8FC020113E03A387CB643>I<903A3F -+F001FFE0B5010F13FE033FEBFFC092B612F002F301017F913AF7F8007FFE0003D9FFE0EB -+1FFFC602806D7F92C76C7F4A824A6E7F4A6E7FA2717FA285187F85A4721380AC1A0060A3 -+6118FFA2615F616E4A5BA26E4A5B6E4A5B6F495B6F4990C7FC03F0EBFFFC9126FBFE075B -+02F8B612E06F1480031F01FCC8FC030313C092CBFCB1B612F8A5414D7BB54B>I<90397F -+E003FEB590380FFF80033F13E04B13F09238FE1FF89139E1F83FFC0003D9E3E013FEC6EC -+C07FECE78014EF150014EE02FEEB3FFC5CEE1FF8EE0FF04A90C7FCA55CB3AAB612FCA52F -+367CB537>114 D<903903FFF00F013FEBFE1F90B7FC120348EB003FD80FF81307D81FE0 -+130148487F4980127F90C87EA24881A27FA27F01F091C7FC13FCEBFFC06C13FF15F86C14 -+FF16C06C15F06C816C816C81C681013F1580010F15C01300020714E0EC003F030713F015 -+010078EC007F00F8153F161F7E160FA27E17E07E6D141F17C07F6DEC3F8001F8EC7F0001 -+FEEB01FE9039FFC00FFC6DB55AD8FC1F14E0D8F807148048C601F8C7FC2C387CB635>I< -+143EA6147EA414FEA21301A313031307A2130F131F133F13FF5A000F90B6FCB8FCA42600 -+3FFEC8FCB3A9EE07C0AB011FEC0F8080A26DEC1F0015806DEBC03E6DEBF0FC6DEBFFF86D -+6C5B021F5B020313802A4D7ECB34>I<D93FF8913801FFC0B50207B5FCA50003ED001FC6 -+1607B3AE5FA35FA2017F5D173B177B6D6C14F3DC01E313F06D6CD907C3EBFFC0903A0FFF -+C03F836D90B51203010114FE6D6C13F8020701E091C7FC42377BB54B>I<B600F00107B5 -+FCA5000101F8C8EA7FE06C6DED3F00A2017F163E6E157E013F167C6E15FC6D5E6F13016D -+5E8117036D5E6F13076D5E6F130F6D5E6F131F6D93C7FC815F6E6C133E177E023F147C6F -+13FC6E5C16816E5C16C3A26EEBE3E016E76E5C16FF6E5CA26E91C8FCA26F5AA36F5AA26F -+5AA26F5AA26F5A6F5A40367DB447>I E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fn cmr10 10 90 -+/Fn 90 125 df<DA0FF813FC91397FFF07FF903B01F807DF83C0903A07E001FF0F903B1F -+8007FE1FE090393F000FFC137E16F85B9338F007804848010790C7FC1503ACB812F8A328 -+01F80003F0C7FCB3AB486C497E267FFFE0B512F0A3333B7FBA30>11 -+D<EC0FF8EC7FFE903901F80780903907E001C090391F8000E090383F0007017E497EA25B -+A2485A6F5AED018092C8FCA9ED03F0B7FCA33901F8000F1503B3AA486C497E267FFFE0B5 -+12C0A32A3B7FBA2E>I<EC0FFC91387FFF70903901F803F0903807E00790381F800FEB3F -+00137EA25B150748481303ADB7FCA33901F80003B3AB486C497E267FFFE0B512C0A32A3B -+7FBA2E>I<DA0FF0EB1FF0DA7FFEEBFFFC903B01F80F83F00F903C07E001CFC00380903C -+1F8000FF0001C090273F0007FE130F017E4948497EA2495CA248485C03076E5A03030203 -+C7FC95C8FCA9F007E0BAFCA33C01F80003F0001F1807B3AA486C496C497E267FFFE0B500 -+C1B51280A3413B7FBA45>I<133C137EA213FE1201EA03FC13F0EA07E0EA0FC0EA1F80EA -+1E005A5A5A12C00F0F6FB92A>19 D<121C127FEAFF80A8EA7F00AB123EAB121CABC7FCA8 -+121C127FEAFF80A5EA7F00121C093C79BB17>33 D<001C131C007F137F39FF80FF80A26D -+13C0A3007F137F001C131C00001300A40001130101801380A20003130301001300485B00 -+061306000E130E485B485B485B006013601A197DB92A>I<030C1303031E497EA2033E13 -+0FA2033C91C7FCA2037C5BA20378131EA303F8133EA24B133CA20201147CA24B1378A202 -+0314F8A24B5BA302071301007FB91280BA12C0A26C1880C7271F0007C0C7FC021E5CA302 -+3E130FA2023C91C8FCA2027C5BA20278131EA302F8133E007FB91280BA12C0A26C188028 -+0003E000F8C8FC4A5BA301071301A202805BA2010F1303A202005BA2491307A2011E5CA3 -+013E130FA2013C91C9FCA2017C5BA20178131EA20130130C3A4A7BB945>I<121C127FEA -+FF80A213C0A3127F121C1200A412011380A2120313005A1206120E5A5A5A12600A1979B9 -+17>39 D<146014E0EB01C0EB0380EB0700130E131E5B5BA25B485AA2485AA212075B120F -+90C7FCA25A121EA2123EA35AA65AB2127CA67EA3121EA2121F7EA27F12077F1203A26C7E -+A26C7E1378A27F7F130E7FEB0380EB01C0EB00E01460135278BD20>I<12C07E12707E7E -+7E120F6C7E6C7EA26C7E6C7EA21378A2137C133C133E131EA2131F7FA21480A3EB07C0A6 -+EB03E0B2EB07C0A6EB0F80A31400A25B131EA2133E133C137C1378A25BA2485A485AA248 -+5A48C7FC120E5A5A5A5A5A13527CBD20>I<EB0380497EA7397803803C00FC147E00FE14 -+FE397F8383FC393FC387F8390FE38FE03903FBBF803900FFFE00EB3FF8EB0FE0A2EB3FF8 -+EBFFFE3903FBBF80390FE38FE0393FC387F8397F8383FC39FE0380FE00FC147E0078143C -+390007C000A76D5A1F247BBD2A>I<15301578B3A6007FB812F8B912FCA26C17F8C80078 -+C8FCB3A6153036367BAF41>I<121C127FEAFF80A213C0A3127F121C1200A412011380A2 -+120313005A1206120E5A5A5A12600A19798817>I<B512FCA516057F941C>I<121C127FEA -+FF80A5EA7F00121C0909798817>I<150C151E153EA2153C157CA2157815F8A215F01401 -+A215E01403A215C01407A21580140FA215005CA2141E143EA2143C147CA2147814F8A25C -+1301A25C1303A2495AA25C130FA291C7FC5BA2131E133EA2133C137CA2137813F8A25B12 -+01A25B1203A25B1207A25B120FA290C8FC5AA2121E123EA2123C127CA2127812F8A25A12 -+601F537BBD2A>I<EB03F8EB1FFF90387E0FC09038F803E03901E000F048481378000714 -+7C48487FA248C77EA2481580A3007EEC0FC0A600FE15E0B3007E15C0A4007F141F6C1580 -+A36C15006D5B000F143EA26C6C5B6C6C5B6C6C485A6C6C485A90387E0FC0D91FFFC7FCEB -+03F8233A7DB72A>I<EB01C013031307131F13FFB5FCA2131F1200B3B3A8497E007FB512 -+F0A31C3879B72A>I<EB0FF0EB7FFE48B57E3903E03FE0390F000FF0000E6D7E486D7E48 -+6D7E123000706D7E126012FCB4EC7F807FA56CC7FC121CC8FCEDFF00A34A5A5D14035D4A -+5A5D140F4A5A4A5A92C7FC147C5C495A495A495A495A91C8FC011EEB01805B5B49130348 -+481400485A485A000EC75A000FB6FC5A5A485CB6FCA321387CB72A>I<EB07F8EB3FFF49 -+13C03901F80FF03903C007F848486C7E380E0001000F80381FE0006D7FA56C5A6C5AC85A -+1401A25D4A5AA24A5A5DEC0F80027EC7FCEB1FFCECFF809038000FE06E7EEC01FC816E7E -+ED7F80A216C0A2153F16E0A2121EEA7F80487EA416C049137F007F1580007EC7FC0070EC -+FF006C495A121E390F8003F83907F00FF00001B512C06C6C90C7FCEB0FF8233A7DB72A> -+I<1538A2157815F8A2140114031407A2140F141F141B14331473146314C313011483EB03 -+0313071306130C131C131813301370136013C01201EA038013005A120E120C5A12381230 -+5A12E0B712F8A3C73803F800AB4A7E0103B512F8A325397EB82A>I<0006140CD8078013 -+3C9038F003F890B5FC5D5D158092C7FC14FC38067FE090C9FCABEB07F8EB3FFE9038780F -+803907E007E090388003F0496C7E12066E7EC87EA28181A21680A4123E127F487EA490C7 -+1300485C12E000605C12700030495A00385C6C1303001E495A6C6C485A3907E03F800001 -+B5C7FC38007FFCEB1FE0213A7CB72A>I<EC3FC0903801FFF0010713FC90380FE03E9038 -+3F800790387E001F49EB3F804848137F485AA2485A000FEC3F0049131E001F91C7FCA248 -+5AA3127F90C9FCEB01FC903807FF8039FF1E07E090383801F0496C7E01607F01E0137E49 -+7FA249148016C0151FA290C713E0A57EA56C7E16C0A2121FED3F807F000F15006C6C5B15 -+FE6C6C5B6C6C485A3900FE07F090383FFFC06D90C7FCEB03FC233A7DB72A>I<12301238 -+123E003FB612E0A316C05A168016000070C712060060140E5D151800E01438485C5D5DC7 -+12014A5A92C7FC5C140E140C141C5CA25CA214F0495AA21303A25C1307A2130FA3495AA3 -+133FA5137FA96DC8FC131E233B7BB82A>I<EB03F8EB1FFF017F13C09038FC07F03901E0 -+01F848486C7E4848137C90C77E48141E000E141F001E80A3121FA27F5D01E0131E6C6C13 -+3E01FC133C6D5B6C6C6C5AECC1E06CEBF3C06C01FFC7FC6C5BEB3FFF6D13C081017F13F8 -+01F07F3903E07FFE3907801FFF48486C1380481303003E6D13C0003CEB007F007C143F00 -+78EC0FE000F814075A1503A21501A36C15C012781503007C15806CEC07006C5C6C6C131E -+D807E0137C3903F803F0C6B55A013F1380D907FCC7FC233A7DB72A>I<EB03F8EB1FFF01 -+7F13C09038FC07E03903F803F048486C7E48486C7E49137E121F48487FA2007F158090C7 -+FCA248EC1FC0A616E0A56C143FA27F123F001F147FA26C6C13FF3907E001DF0003149F38 -+01F0033900FC0F1FD93FFC13C0EB07F090C7FC153F1680A316005D000F147E487E486C5B -+A24A5A4A5A49485A6C48485A001C495A260F807FC7FC3807FFFC000113F038003FC0233A -+7DB72A>I<121C127FEAFF80A5EA7F00121CC7FCB2121C127FEAFF80A5EA7F00121C0924 -+79A317>I<121C127FEAFF80A5EA7F00121CC7FCB2121C127F5A1380A4127F121D1201A4 -+12031300A25A1206A2120E5A121812385A1260093479A317>I<007FB812F8B912FCA26C -+17F8CCFCAE007FB812F8B912FCA26C17F836167B9F41>61 D<EB3FE03801FFFE3907C03F -+80390E000FC0003CEB07F000301303007014F8007C130100FE14FC7EA4127E003CEB03F8 -+C7FCEC07F0A2EC0FE0EC1F80EC3F00147E147C5C495A5C495A5CA249C7FCA31306AA90C8 -+FCA8130EEB3F80497EA56D5A010EC7FC1E3B7CBA27>63 D<1538A3157CA315FEA34A7EA3 -+4A6C7EA202077FEC063FA2020E7FEC0C1FA2021C7FEC180FA202387FEC3007A202707FEC -+6003A202C07F1501A2D901807F81A249C77F167FA20106810107B6FCA24981010CC7121F -+A2496E7EA3496E7EA3496E7EA213E0707E1201486C81D80FFC02071380B56C90B512FEA3 -+373C7DBB3E>65 D<B712E016FC16FF0001903980007FC06C90C7EA1FE0707E707E707EA2 -+707EA283A75F16035F4C5A4C5A4C5A4C5AEEFF8091B500FCC7FCA291C7EA7F80EE1FE0EE -+07F0707E707E83707EA21880177F18C0A7188017FFA24C13005F16034C5AEE1FF8486DEB -+7FF0B812C094C7FC16F832397DB83B>I<913A01FF800180020FEBE003027F13F8903A01 -+FF807E07903A03FC000F0FD90FF0EB039F4948EB01DFD93F80EB00FF49C8127F01FE153F -+12014848151F4848150FA248481507A2485A1703123F5B007F1601A35B00FF93C7FCAD12 -+7F6DED0180A3123F7F001F160318006C7E5F6C7E17066C6C150E6C6C5D00001618017F15 -+386D6C5CD91FE05C6D6CEB03C0D903FCEB0F80902701FF803FC7FC9039007FFFFC020F13 -+F002011380313D7BBA3C>I<B712C016F816FE000190398001FF806C90C7EA3FE0EE0FF0 -+EE03F8707E707E177FA2EF3F8018C0171F18E0170F18F0A3EF07F8A418FCAC18F8A4EF0F -+F0A218E0A2171F18C0EF3F80A2EF7F0017FE4C5A4C5AEE0FF0EE3FE0486DEBFF80B8C7FC -+16F816C036397DB83F>I<B812FCA30001903880000F6C90C71201EE007E173E171E170E -+A31706A317078316C0A394C7FCA31501A21503150F91B5FCA3EC000F15031501A21500A2 -+1860A318E093C712C0A41701A3EF0380A21707A2170F173F177F486D903807FF00B9FCA3 -+33397DB839>I<B812F8A30001903880001F6C90C71201EE00FC177C173C171CA2170CA4 -+170E1706A2ED0180A21700A41503A21507151F91B5FCA3EC001F15071503A21501A692C8 -+FCAD4813C0B612C0A32F397DB836>I<DBFF8013C0020FEBF001023F13FC9139FF803F03 -+903A03FC000787D90FF0EB03CF4948EB00EF4948147F4948143F49C8121F485A4848150F -+48481507A248481503A2485A1701123F5B007F1600A448481600AB93B6FCA26C7E933800 -+7FE0EF3FC0A2123F7F121FA26C7EA26C7EA26C7E6C7E6C6C157F6D7E6D6C14FF6D6C14EF -+D90FF8EB03C7D903FEEB0783903A00FFC03F0191393FFFFC00020F01F013000200138038 -+3D7CBA41>I<B648B512FEA30001902680000313006C90C76C5AB3A491B6FCA391C71201 -+B3A6486D497EB648B512FEA337397DB83E>I<B612C0A3C6EBC0006D5AB3B3AD497EB612 -+C0A31A397EB81E>I<013FB512E0A39039001FFC00EC07F8B3B3A3123FEA7F80EAFFC0A4 -+4A5A1380D87F005B0070131F6C5C6C495A6C49C7FC380781FC3801FFF038007F80233B7D -+B82B>I<B649B5FCA3000101809038007FF06C90C8EA3F80053EC7FC173C17385F5F4C5A -+4C5A4CC8FC160E5E5E5E5E4B5AED0780030EC9FC5D153E157E15FF5C4A7F4A6C7E140E4A -+6C7E4A6C7E14704A6C7E4A6C7E14804A6C7E6F7EA26F7F707EA2707E707EA2707EA2707E -+707EA2707E707F8484486D497FB6011FEBFF80A339397DB841>I<B612E0A3000101C0C8 -+FC6C90C9FCB3AD1718A517381730A31770A317F0A216011603160FEE1FE0486D13FFB8FC -+A32D397DB834>I<B5933807FFF86E5DA20001F0FC002600DFC0ED1BF8A2D9CFE01533A3 -+D9C7F01563A3D9C3F815C3A2D9C1FCEC0183A3D9C0FEEC0303A2027F1406A36E6C130CA3 -+6E6C1318A26E6C1330A36E6C1360A26E6C13C0A3913901FC0180A3913900FE0300A2ED7F -+06A3ED3F8CA2ED1FD8A3ED0FF0A3486C6D5A487ED80FFC6D48497EB500C00203B512F8A2 -+ED018045397DB84C>I<B5913807FFFE8080C69238007FE06EEC1F80D9DFF0EC0F001706 -+EBCFF8EBC7FCA2EBC3FEEBC1FFA201C07F6E7EA26E7E6E7E81140F6E7E8114036E7E1680 -+80ED7FC016E0153FED1FF0ED0FF8A2ED07FCED03FEA2ED01FF6F1386A2EE7FC6EE3FE6A2 -+EE1FF6EE0FFEA216071603A216011600A2177E486C153E487ED80FFC151EB500C0140EA2 -+170637397DB83E>I<EC03FF021F13E09138FE01FC903901F8007ED907E0EB1F8049486D -+7ED93F80EB07F049C76C7E01FE6E7E48486E7E49157E0003167F4848ED3F80A24848ED1F -+C0A2001F17E049150F003F17F0A3007F17F8491507A300FF17FCAC007F17F86D150FA300 -+3F17F0A26C6CED1FE0A36C6CED3FC0000717806D157F000317006C6C15FEA26C6C4A5A01 -+7F4A5A6D6C495A6D6C495AD907E0EB1F80D903F8017FC7FC903900FE01FC91381FFFE002 -+0390C8FC363D7BBA41>I<B712C016F816FE000190398001FF806C90C7EA3FC0EE0FE0EE -+07F0EE03F817FC17FE1601A217FFA717FEA2EE03FCA2EE07F817F0EE0FE0EE3FC0923801 -+FF0091B512FC16F091C9FCB3A5487FB6FCA330397DB839>I<EC03FF021F13E09138FE01 -+FC903901F8007ED907E0EB1F8049486D7ED93F80EB07F049C76C7E01FE6E7E48486E7EA2 -+4848157F0007178049153F000F17C049151F001F17E0A24848ED0FF0A3007F17F8A24915 -+07A200FF17FCAC007F17F8A26D150FA2003F17F0A26C6CED1FE0A36C6CED3FC00007027C -+14804AB4FC3C03F80383807F003B01FC0701C0FEEC0E002600FE0CEBE1FC017FEC63F8D9 -+3F8CEB77F0D91FCCEB3FE0D907EE14806DB449C7FC0100D981FC130CEC1FFF0203131C91 -+C7001E131C161F183CEF807CEFC0F8EE0FFFA318F08218E07013C07013809338007E0036 -+4B7BBA41>I<B612FEEDFFE016F8000190388007FE6C90C76C7EEE3FC0707E707E707EA2 -+707EA283A65FA24C5AA24C5A4C5AEE3F8004FFC8FCED07FC91B512E05E9138000FF0ED03 -+F8ED00FE82707E707EA2161F83A583A6F00180A217F8160F1803486D01071400B66D6C5A -+04011306933800FE0ECAEA3FFCEF07F0393B7DB83D>I<D90FF813C090383FFE0190B512 -+813903F807E33907E000F74848137F4848133F48C7121F003E140F007E1407A2007C1403 -+12FC1501A36C1400A37E6D14006C7E7F13F86CB47E6C13F8ECFF806C14E06C14F86C14FE -+C680013F1480010714C0EB007F020713E0EC007FED3FF0151F150FED07F8A200C01403A2 -+1501A37EA216F07E15036C15E06C14076C15C06C140F6DEB1F80D8FBF0EB3F00D8F0FE13 -+FE39E03FFFF8010F13E0D8C00190C7FC253D7CBA2E>I<003FB812E0A3D9C003EB001F27 -+3E0001FE130348EE01F00078160000701770A300601730A400E01738481718A4C71600B3 -+B0913807FF80011FB612E0A335397DB83C>I<B6903807FFFEA3000101809038007FE06C -+90C8EA1F80EF0F001706B3B2170E6D150C80171C133F17186D6C14385F6D6C14F06D6C5C -+6D6C495A6D6CEB07806D6C49C7FC91387F807E91381FFFF8020713E09138007F80373B7D -+B83E>I<B500FC91387FFF80A30003018091380FFC006C90C8EA07E0715A6C705A6E1403 -+017F93C7FCA280013F1506A26E140E011F150C80010F5DA28001075DA26E147001031560 -+A26D6C5CA2806D4A5AA2ED8003027F91C8FCA291383FC006A215E0021F5BA2EDF01C020F -+1318A26E6C5AA215FC02035BA2EDFEE002015BA26E6C5AA36FC9FCA3153EA2151CA3393B -+7EB83E>I<B5D8FC07B5D8F001B5FCA30007902780001FFEC7EA1FF86C48C7D80FF8EC07 -+E000010307ED03C01B807F6C6F6C1500A26E5F017F6E6C1406A280013F4A6C5CA280011F -+4A6D5BEE067FA26D6C010E6D5BEE0C3FA26D6C011C6D5BEE181FA26D6C6F5BEE300FA26D -+6C6F485AEE6007A26D6C4CC7FC9338C003FCA203805D913B7F818001FE06A203C1150EDA -+3FC3C7EAFF0CA203E3151CDA1FE6EC7F98A215F6DA0FFCEC3FF0A302075E4B141FA20203 -+5E4B140FA202015E4B1407A2020093C8FC4B80503B7EB855>I<007FB590383FFFFCA3C6 -+01F801071380D97FE0D903FCC7FC013FEC01F06D6C5C5F6D6C5C6D6C13034CC8FC6D6C13 -+06160E6D6C5B6DEB8018163891387FC0306E6C5A16E06E6C5A91380FF18015FB6EB4C9FC -+5D14036E7EA26E7F6F7EA24B7E15DF9138019FF09138038FF8150F91380607FC91380E03 -+FE140C4A6C7EEC38000230804A6D7E14E04A6D7E49486D7E130391C76C7E01066E7E130E -+010C6E7E011C1401013C8101FE822607FF80010713E0B500E0013FEBFF80A339397EB83E -+>I<B500FE91383FFFE0A3000301E0913807FE00C649EC03F0017F6F5A606D6C5D6D6C14 -+0395C7FC6D6C1406A26D6C5C6D6C141C17186D6C143817306D6D5B6E6C13E05F91383FE0 -+015F91381FF003DA0FF890C8FC1606913807FC0E160C913803FE1C913801FF185E6E13B0 -+16E0157F6F5AB3A24B7E023FB512C0A33B397FB83E>I<003FB7FCA39039FC0001FE01C0 -+130349495A003EC7FC003C4A5A5E0038141F00784A5A12704B5A5E006014FF4A90C7FCA2 -+4A5A5DC712074A5AA24A5A5D143F4A5AA24A5A92C8FC5B495AA2495A5C130F4948EB0180 -+A2495A5C137F495A16034890C7FC5B1203485AEE0700485A495C001F5D48485C5E484849 -+5A49130FB8FCA329397BB833>I<EAFFF8A4EAF000B3B3B3B3A3EAFFF8A40D5378BD17>I< -+3901800180000313033907000700000E130E485B00181318003813380030133000701370 -+00601360A200E013E0485BA400CE13CE39FF80FF806D13C0A3007F137FA2393F803F8039 -+0E000E001A1974B92A>I<EAFFF8A4EA0078B3B3B3B3A3EAFFF8A40D537FBD17>I<131013 -+38137C13FE487E3803C780380783C0380F01E0381E00F04813780070131C48130E004013 -+04170D77B92A>I<EA01801203EA0700120E5A12181238123012701260A212E05AA412CE -+EAFF8013C0A3127FA2EA3F80EA0E000A197AB917>96 D<EB1FE0EBFFFC3803E03F390700 -+0F80390F8007E0486C6C7E13E06E7EA26E7E6C5A6C5AC8FCA4147FEB07FFEB3FE0EBFE00 -+EA03F8EA0FF0EA1FC0123F485A90C7FC160C12FEA31401A26C13036CEB077C903980063E -+18383FC01E3A0FE0781FF03A03FFF00FE03A007F8007C026277DA52A>I<EA03F012FFA3 -+120F1203B0EC1FE0EC7FF89038F1E03E9039F3801F809039F7000FC001FEEB07E049EB03 -+F049EB01F85BED00FCA216FEA2167E167FAA167E16FEA216FC15016D14F8ED03F07F01EE -+EB07E001C6EB0FC09039C7801F00903881E07E903800FFF8C7EA1FC0283B7EB92E>I<EB -+03FC90381FFF8090387E03E03901F80070484813F83907E001FC380FC003A2EA1F80123F -+90380001F848EB00F01500A2127E12FEAA127E127FA26C14067F001F140E6D130C000F14 -+1C6C6C13386C6C13706C6C13E039007C07C090381FFF00EB07F81F277DA525>I<ED0FC0 -+EC03FFA3EC003F150FB0EB03F8EB1FFF90387E078F9038F801EF3903F0007F4848133F48 -+48131FA24848130F123F90C7FC5AA2127E12FEAA127E127FA27EA26C6C131FA26C6C133F -+6C6C137F6C6CEBEFF03A01F801CFFF39007C078F90381FFE0FD907F813C0283B7DB92E> -+I<EB07F8EB1FFF90387C0FC03901F803E03903F001F0D807E013F8380FC0004848137CA2 -+48C7127E153E5A153F127E12FEA3B7FCA248C8FCA5127EA2127FA26C14037F001F14076C -+6C13060007140E6D131CD801F013386C6C137090387E03E090381FFF80903803FC002027 -+7EA525>I<147E903803FF8090380FC1E0EB1F8790383F0FF0137EA213FCA23901F803C0 -+91C7FCADB512FCA3D801F8C7FCB3AB487E387FFFF8A31C3B7FBA19>I<ED03F090390FF0 -+0FF890393FFC3C3C9039F81F707C3901F00FE03903E007C03A07C003E010000FECF000A2 -+48486C7EA86C6C485AA200075C6C6C485A6D485A6D48C7FC38073FFC38060FF0000EC9FC -+A4120FA213C06CB512C015F86C14FE6CECFF804815C03A0F80007FE048C7EA0FF0003E14 -+0348140116F8481400A56C1401007C15F06CEC03E0003F1407D80F80EB0F80D807E0EB3F -+003901FC01FC39007FFFF0010790C7FC26387EA52A>I<EA03F012FFA3120F1203B0EC0F -+F0EC3FFCECF03F9039F1C01F809039F3800FC0EBF70013FE496D7EA25BA35BB3A3486C49 -+7EB500C1B51280A3293A7EB92E>I<EA0380EA0FE0487EA56C5AEA0380C8FCAAEA03F012 -+FFA312071203B3AA487EB512C0A312387EB717>I<EB01C0EB07F0EB0FF8A5EB07F0EB01 -+C090C7FCAAEB01F813FFA313071301B3B3A2123C127E00FF13F01303A214E038FE07C012 -+7C383C0F00EA0FFEEA03F8154984B719>I<EA03F012FFA3120F1203B1913801FFFCA391 -+38007FC01600157C15705D4A5A4A5A4AC7FC141E1438147814FC13F1EBF3FEEBF73F01FE -+7FEBF81F496C7E8114076E7E6E7E811400157E157F811680ED1FC0486CEB3FF0B500C0B5 -+FCA3283A7EB92C>I<EA03F012FFA3120F1203B3B3AD487EB512C0A3123A7EB917>I<2703 -+F00FF0EB1FE000FFD93FFCEB7FF8913AF03F01E07E903BF1C01F83803F3D0FF3800FC700 -+1F802603F70013CE01FE14DC49D907F8EB0FC0A2495CA3495CB3A3486C496CEB1FE0B500 -+C1B50083B5FCA340257EA445>I<3903F00FF000FFEB3FFCECF03F9039F1C01F803A0FF3 -+800FC03803F70013FE496D7EA25BA35BB3A3486C497EB500C1B51280A329257EA42E>I< -+EB03FE90380FFF8090383E03E09038F800F84848137C48487F48487F4848EB0F80001F15 -+C090C712074815E0A2007EEC03F0A400FE15F8A9007E15F0A2007F14076C15E0A26C6CEB -+0FC0000F15806D131F6C6CEB3F006C6C137EC66C13F890387E03F090381FFFC0D903FEC7 -+FC25277EA52A>I<3903F01FE000FFEB7FF89038F1E07E9039F3801F803A0FF7000FC0D8 -+03FEEB07E049EB03F04914F849130116FC150016FEA3167FAA16FEA3ED01FCA26DEB03F8 -+16F06D13076DEB0FE001F614C09039F7803F009038F1E07E9038F0FFF8EC1FC091C8FCAB -+487EB512C0A328357EA42E>I<D903F813C090381FFE0190387E07819038FC01C33903F0 -+00E3000714774848133749133F001F141F485A150F48C7FCA312FEAA127FA37E6D131F12 -+1F6D133F120F6C6C137F6C6C13EF3901F801CF39007E078F90381FFE0FEB07F890C7FCAB -+ED1FE00203B5FCA328357DA42C>I<3807E01F00FFEB7FC09038E1E3E09038E387F0380F -+E707EA03E613EE9038EC03E09038FC0080491300A45BB3A2487EB512F0A31C257EA421> -+I<EBFF03000313E7380F80FF381E003F487F487F00707F12F0A2807EA27EB490C7FCEA7F -+E013FF6C13E06C13F86C7F00037FC67F01071380EB007F141F00C0EB0FC01407A26C1303 -+A37E15806C13077EEC0F00B4131E38F3C07C38E1FFF038C03F801A277DA521>I<1318A5 -+1338A31378A313F8120112031207001FB5FCB6FCA2D801F8C7FCB215C0A93800FC011580 -+EB7C03017E13006D5AEB0FFEEB01F81A347FB220>I<D803F0EB07E000FFEB01FFA3000F -+EB001F00031407B3A4150FA3151F12016D133F0000EC77F86D9038E7FF8090383F03C790 -+381FFF87903A03FC07E00029267EA42E>I<B538803FFEA33A0FF8000FF06C48EB07E000 -+03EC03C06D148000011500A26C6C1306A26D130E017E130CA26D5BA2EC8038011F1330A2 -+6D6C5AA214E001075BA2903803F180A3D901FBC7FCA214FF6D5AA2147CA31438A227257E -+A32C>I<B53A1FFFE03FFEA3260FF8009038000FF86C48017EEB03E018C00003023EEB01 -+80A26C6C013FEB0300A36C6CEC8006156FA2017E9038EFC00C15C7A2D93F016D5A158302 -+81EBF038D91F831430150102C3EBF87090260FC6001360A2D907E66D5A02EC137CA2D903 -+FCEB7F804A133FA2010192C7FC4A7FA20100141E4A130E0260130C37257EA33C>I<B538 -+807FFFA33A03FE003FF00001EC1F80000092C7FC017E131C6D13186D6C5AECC070010F5B -+6D6C5AECF180EB03FB6DB4C8FC6D5AA2147F804A7E8114CF903801C7E090380383F09038 -+0703F8EB0601496C7E011C137E49137F01787F496D7E486C80000FEC3FF0D8FFFE90B512 -+80A329247FA32C>I<B538803FFEA33A0FF8000FF06C48EB07C00003EC03806C7E16007F -+00001406A2017E5BA2137F6D5BA26D6C5AA2ECC070010F1360A26D6C5AA214F101035BA2 -+D901FBC7FCA214FF6D5AA2147CA31438A21430A214701460A25CA2EA7C0100FE5B130391 -+C8FC1306EAFC0EEA701C6C5AEA1FF0EA0FC027357EA32C>I<003FB512FCA2EB8003D83E -+0013F8003CEB07F00038EB0FE012300070EB1FC0EC3F800060137F150014FE495AA2C648 -+5A495AA2495A495A495AA290387F000613FEA2485A485A0007140E5B4848130C4848131C -+A24848133C48C7127C48EB03FC90B5FCA21F247EA325>I<B81280A2290280962A>I<BD12 -+C0A25202809653>I E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fo cmr17 17.28 11 -+/Fo 11 116 df<120FEA3FC0EA7FE0EAFFF0A6EA7FE0EA3FC0EA0F000C0C748B24>46 -+D<EC01C014031407140F143F147FEB03FF130F90B5FCB6FCEBFC7F13F01300C7FCB3B3B3 -+B3A24A7EA2010713FCB812E0A42B5E74DD42>49 D<EC0FFE91387FFFE00103B512F8010F -+14FE903A1FE00FFF8090263E000113E001FC6D6C7ED801F06E7E4848EC0FFC496E7E4848 -+6E7E48C81480000E81001E6F13C0121C003CEE7FE012380078EE3FF01270A3B46CED1FF8 -+13E0A27FA66C5A6C5A0006C913F0CA123FA318E0177FA2EFFFC0A218805E18004C5A1607 -+5F4C5A5F161F4C5A4C5A5F4CC7FC4B5A4B5A5E4B5A4B5A4B5A4B5A4BC8FC157E5D4A5A4A -+5A4A5A4A5A4A5A4AC9FC143E4A15385C495A495A49481570495A49C9FC131E5B4916F05B -+484816E0484815014848150348B8FCA25A5A5AB912C0A4355E7ADD42>I<4AB47E021F13 -+F0027F13FC49B6FC902607FE007FD90FF0EB3FC04948EB0FE049486D7E49486D7E49C76C -+7E484881484814004848157F18804848153F001F17C0A24848151F18E0A2007F17F04915 -+0FA300FF17F8A418FC1707A618FEA2170F127FA46C7E171FA2121F6D153F000F16371777 -+6C6C15676C6C15E70001ED01C77F6C6CEC03876D6CEB07076D6C130ED90FE0133CD907F8 -+01F813FC0101B512F06D14C0021F130091C8120FA218F8A418F0171FA218E0A2173F18C0 -+A2EF7F80EA07F0486CEDFF00487E4C5A5F16035F4C5A49140F6C484A5A01804A5A90C848 -+5A6C6C4AC7FC01E0495A6C6CEB07F86CB4EB3FF06C6CB512C0011F91C8FC010713FC0100 -+13E037607BDD42>57 D<B600FC057FB5FCA4C60280050F13F0D93FFECB000313804A9538 -+01FE00011F62755A130F6E61010762806D4F5AA2816D4F5AA26F17076D97C7FC81027F18 -+0EA26F171E023F181C811B3C021F183881020F60A26F17F0020760811A016E60826E4D5A -+A27015076E95C8FC82037F160EA282033F5E821A3C031F163882030F5EA27015F003075E -+8219016F5E836F4B5AA27113076F93C9FC83047F140EA283043F5CA271133C041F143883 -+040F5CA27113F004075C831801705C188170EB8380A218C77091CAFC18E7EF7FEEA218FE -+715AA3715AA2715AA3715AA3715AA260647FE163>86 D<EC03FE91381FFFE091B512F890 -+3901FE03FE903A07F0007F8049486D7ED93FC06D7E49C76C7E496E7E4914034848814848 -+1401000782491400000F8283485A1880123F49153FA2007F17C0A35BA212FF90B8FCA301 -+80CAFCA9127F7FA3123FA27F121FEF01C06C7E17036C6C1680A26C6C15070001EE0F006D -+150E6C6C151E6D6C5C6D6C5C6D6C5CD907F0EB03E0D903FC495A902700FF803FC7FC9138 -+3FFFFC020F13F00201138032417CBF3A>101 D<133C13FF487F487FA66C5B6C90C7FC13 -+3C90C8FCB3A2EB03C0EA07FF127FA41201EA007FA2133FB3B3AC497E497EB612E0A41B5F -+7DDE23>105 D<D903C0EB7FE0D807FF903803FFFCB5010F13FFDB3F0013C00378EB1FE0 -+4B6D7E0001D9C1C06D7E27007FC3808002C7C71203D93FCE81170114DC14D802F86E7E5C -+A35CA35CB3B3496C4A7F496C4A7FB6D8F003B612C0A4423F7DBE49>110 -+D<EDFF80020F13F8023F13FE9139FF007F80D903FCEB1FE0D907F0EB07F0D90FC0EB01F8 -+D93F80EB00FE49C8127F017E81496F7E48486F7E00038349150700078348486F7EA2001F -+83491501A2003F83A348486F7EA400FF1880AC007F1800A26D5DA2003F5FA36C6C4B5AA3 -+6C6C4B5A00075FA26C6C4B5A6C6C4B5AA26C6C4B5A017F4BC7FC6D6C14FE6D6C495AD90F -+F0EB07F8D903FCEB1FE0D900FFEB7F806EB5C8FC020F13F8020113C039417CBF42>I<90 -+39078003F8D807FFEB0FFFB5013F13C092387C0FE0913881F01F9238E03FF00001EB8380 -+39007F8700148FEB3F8E029CEB1FE0EE0FC00298EB030002B890C7FCA214B014F0A25CA5 -+5CB3B0497EEBFFF8B612FCA42C3F7CBE33>114 D<9139FFE00180010FEBFC03017FEBFF -+073A01FF001FCFD803F8EB03EFD807E0EB01FF48487F4848147F48C8123F003E151F007E -+150F127CA200FC1507A316037EA27E7F6C7E6D91C7FC13F8EA3FFE381FFFF06CEBFF806C -+14F86C14FF6C15C06C6C14F0011F80010714FED9007F7F02031480DA003F13C015030300 -+13E0167F00E0ED1FF0160F17F86C15071603A36C1501A37EA26C16F016037E17E06D1407 -+6DEC0FC06D1580D8FDF0141FD8F8F8EC7F00013E14FC3AF01FC00FF80107B512E0D8E001 -+148027C0003FF8C7FC2D417DBF34>I E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fp cmsy10 12 1 -+/Fp 1 25 df<D907F01780D91FFEEE01C090387FFF8090B512E0488048803907F80FFC27 -+0FE001FE1503271F80007F168090C7EA1FC0003E6E6C1407003C6E6C150000386E6C5C00 -+786E6C5C00706E6C143EDC3F80137E00F092391FE001FC4892390FFC07F870B55A705C70 -+5C706C5BDD1FFEC7FC0040EE03F842187BA44D>24 D E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fq cmtt12 12 17 -+/Fq 17 120 df<121FEA3F80EA7FC0EAFFE0A5EA7FC0EA3F80EA1F000B0B6C8A33>46 -+D<167816F8ED01FCA21503A2ED07F8A2ED0FF0A2ED1FE0A216C0153FA2ED7F80A2EDFF00 -+A24A5AA25D1403A24A5AA24A5AA24A5AA25D143FA24A5AA24AC7FCA2495AA25C1303A249 -+5AA2495AA25C131FA2495AA2495AA249C8FCA25B1201A2485AA2485AA2485AA25B121FA2 -+485AA2485AA248C9FCA25AA2127CA2264D7AC433>I<121FEA3F80EA7FC0EAFFE0A5EA7F -+C0EA3F80EA1F00C7FCB3A3121FEA3F80EA7FC0EAFFE0A5EA7FC0EA3F80EA1F000B2B6CAA -+33>58 D<EA3FFC487E12FFA2127F123F1200ABEC01FE91380FFFC04A13F0027F7F91B512 -+FE90B7FCECFE07DAF800138002E0EB7FC04AEB3FE04A131FEE0FF091C7FC16074915F816 -+03A217FC1601A9160317F8A26D140717F06E130F17E06E131FEE3FC06E137F9139F801FF -+80DAFE07130091B55A495C6E5BD97E3F13E0D93C0F138090260003FEC7FC2E3E7FBC33> -+98 D<ECFFF0010713FE011FEBFF804914C04914E048B612F048EBC01F9038FE000F485A -+485A4848EB07E049EB03C0484890C7FC5BA2127F90C9FCA25A5AA97E7EA27F003FEC01F0 -+6DEB03F86C7E6D13076C6C14F06C6C130F01FFEB1FE06CEBE07F6C90B512C06C1580013F -+14006D13FC01075B010013C0252E79AC33>I<ED7FF84B7E5CA280157F1501ABEB01FF01 -+0713C1011F13F1017F13F990B6FC5A4813813907FE003FD80FF8131F49130F4848130749 -+1303123F491301127F90C7FCA25A5AA97E7E15037F123F6D1307A26C6C130F6D131F6C6C -+133F6C6C137F2603FF81B512F091B612F8C602FD13FC6D13F96D01E113F8010F018013F0 -+D901FEC8FC2E3E7DBC33>I<ECFF80010713F0011F13FC497F90B6FC48158048018013C0 -+3A07FE003FE001F8EB0FF048481307484814F8491303003F15FC491301127F90C7FC16FE -+15005A5AB7FCA516FC48C9FC7E7EA36C7E167C6C6C14FE7F6C7E6D13016C6CEB03FC6CB4 -+130F6C9038C03FF86C90B512F06D14E06D14C0010F1400010313FC9038007FE0272E7BAC -+33>I<EA3FFC487E12FFA2127F123F1200AB4AB4FC020713C0021F13F0027F7F91B5FC90 -+B67EED07FEECF801ECF0004A7F4A7F5CA291C7FCA35BB3A43B3FFFF80FFFFC486D4813FE -+B56C4813FFA26C496C13FE6C496C13FC303D7FBC33>104 D<14E0EB03F8A2497EA36D5A -+A2EB00E091C8FCAA383FFFF8487FA47EEA0001B3AD007FB612C0B712E016F0A216E06C15 -+C0243E78BD33>I<4AB4FC263FFC0713C0267FFE1F13F000FF017F7F91B5FC6CB67E6CEC -+07FEC6EBF801ECF0004A7F4A7F5CA291C7FCA35BB3A43B3FFFF80FFFFC486D4813FEB56C -+4813FFA26C496C13FE6C496C13FC302C7FAB33>110 D<EB01FE90380FFFC0013F13F049 -+7F90B57E488048EB03FF2607FC0013804848EB7FC049133F4848EB1FE049130F4848EB07 -+F0A2007F15F890C71203A300FEEC01FCAA6C14036C15F8A26D1307003F15F06D130FA26C -+6CEB1FE06D133F6C6CEB7FC06C6CEBFF802603FF0313006CEBFFFE6C5C6D5B6D5B010F13 -+C0D901FEC7FC262E7AAC33>I<EC01FE3A3FFC0FFFC0486C4813F000FF017F7F91B512FE -+6CB7FC6CEBFE07C6D9F800138002E0EB7FC04AEB3FE04A131FEE0FF091C7FC16074915F8 -+1603A217FC1601A9160317F8A26D140717F06E130F17E06E131FEE3FC06E137F9139F801 -+FF80DAFE07130091B55A495C6E5B6E13E0020F1380DA03FEC7FC91C9FCAF383FFFF8487F -+B57EA26C5B6C5B2E427FAB33>I<ED03FE3B7FFF801FFF80B5D8C07F13E002C1B5FC02C3 -+14F014C76C9038CFFE0F39001FDFF09139FFC007E092388003C092C8FC5C5C5CA25CA25C -+A35CB2007FB512FEB7FCA46C5C2C2C7DAB33>114 D<90381FFE0F90B5EA8F80000314FF -+120F5A5AEBF007387F800190C7FC00FE147F5A153FA37E007FEC1F0001C090C7FCEA3FF8 -+EBFFC06C13FF6C14E0000314F8C680011F13FF01001480020713C0EC007FED1FE0007C14 -+0F00FEEC07F01503A27EA27F15076D14E06D130F6DEB3FC09038FE01FF90B61280160000 -+FD5C00FC14F8D8F83F13E0D8780790C7FC242E79AC33>I<EB03C0497E130FAA003FB612 -+FC4881B7FCA36C5D26000FE0C8FCB3A3161FEE3F80A5167F6E140001075C6E5A9138FE07 -+FE6DB55A6D5C6D5C6E5B021F1380DA07FCC7FC29387EB633>I<D83FFCEB1FFE486C497E -+00FF5CA2007F80003F800000EC007FB3A75EA25DA26D5B90387F800FDAE03F13FC6DB612 -+FE17FF6D806D01FE13FE01039038F83FFC010001C0C7FC302C7FAA33>I<3B7FFF8007FF -+F8B56C4813FC6E5AA24A7E6C496C13F8D80FC0C7EA0FC06D141F00071680A56D143F0003 -+1600A3EC0FC0EC1FE0A23A01F83FF07EA3EC7FF8147CA20000157C9039FCFCFCFCA3ECF8 -+7CA2017C5C017D137EECF03EA2017F133FA26D486C5AA3ECC00F90390F8007C02E2B7EAA -+33>119 D E -+%EndDVIPSBitmapFont -+%DVIPSBitmapFont: Fr cmr17 20.74 20 -+/Fr 20 123 df<BD12F8A5D8003F01F0C98001074916074B16006D193F1B1F1B071B031B -+011B00881C7EA21C3EA21C1EA31C0EA21C0FA388A6F40380A3191CA299C7FCA7193CA419 -+7CA219FC18011803180F18FF92B7FCA503C0C7FC180F180318011800197CA2193CA4191C -+A996CAFCB3AB497F81013F13FEB812E0A5597678F568>70 D<B600E00803B61280A36F62 -+A227003FBFF8080E49C7FC01071EF0A29026039FFC505BA3DA8FFE62A3DA87FF62A20283 -+6D61A302816D4E5AA302806D4E5AA26F6C4E5AA36F6C180EA36F6C60A36F6C60A26F6C60 -+A36F6D5FA36F6D4C5AA26F6D4C5AA3706C4CC7FCA3706C160EA3706C5EA2706C5EA3706C -+5EA3706D5DA2706D4A5AA3706D4A5AA3716C4AC8FCA3716C140EA2716C5CA3716C5CA371 -+6C5CA2716D5BA3716D485AA3716D485AA3726C48C9FCA295383FF80EA3726C5AA3726C5A -+A2726C5AA3725BA3496C6F5BA2497E725B496C517FD97FFC70C9FC0003B56C080F13FEB6 -+00FE073FB71280193EA3191C817678F592>77 D<B912FCF0FFF019FEF1FFC01AF8D8003F -+01F0C7000713FE0107499139003FFF804B03077F6D050113F0736C7E747EF20FFF747F74 -+7F86747F88757EA2757EA2757EA288A28789A99AC8FCA263A264A2515A641B7F64515A64 -+505B5090C9FC505A505AF23FF8F27FE0963801FF80DF0FFECAFCF17FF895380FFFE092B8 -+CBFC19F019FC03C0C7380FFF80060113E09538003FF8F11FFEF107FF737F7313E0737F74 -+7E1A3F87747E1A0F878688A3747FAB88AC1F101F38747FA47416787614701B7F496D1BF0 -+756C14E0013F01FC051F1401B8707E0907EC03C0756CEB0780759038800F009839007FE0 -+3ECF381FFFFC0A075B9938007FC06D7978F575>82 D<DB3FF815E00203B512C0021F02F8 -+1301027F14FE49B7128049D9C007EBC003D90FFEC7EA3FF0D91FF8913807F807D93FE0EC -+01FC4948913800FE0F4948153F4890C9EA1F9F4848EE0FDF49EE07FF484882000F834982 -+121F49177F003F183F5B191F127F190F5B190712FFA21903A31901A27FA36D1700A2127F -+7F7F1A006C7E7F7F6C7F806C7F14F86C7F6CEBFF8015F86CECFF806C15F86DECFF806D15 -+F06D15FF6D16E0010316F86D16FE6D6C81021F16C0020382DA003F81030781DB007F8004 -+0780DC007F7F050F14801700063F13C07213E018077213F084841AF8197F193F1AFC191F -+A2190F00E019FE1907A41903A27EA57E1AFCA27E19077E1AF86C180FA26D18F0191F6D18 -+E06D173F6D18C06DEF7F806D17FF017E4C13006D6C5E486C6C4B5AD90FF0ED0FF826FC07 -+FC4B5AD901FF4B5A486C01F0ECFFC091273FFF800F5B48010F90B548C7FC020315F80200 -+15E048020F14809226007FF8C8FC477C78F858>I<B80303B612FCA5D8003F01FCCA000F -+1400010701E0050113F89838007FE06D49725AA2765AA276C7FCB3B3B3B3646D1A1E81A3 -+1C3E6D1A3CA281027F197C1C781CF86E7E646E6C1701515A140F6E6C4D5A816E4E5A6E6D -+4CC8FC705E6E6D167E037F5F6F6C4B5ADB1FFC4B5A6F6CED0FE0DB03FF4B5A6F01C0EC7F -+806F01F0D903FFC9FCDC3FFFEB3FFC040F90B55A040315E004001580051F01FCCAFC0501 -+13C0667978F577>85 D<913803FF80021F13F891B512FE903A03FC01FF80903A07E0003F -+E0D91F80EB0FF8013EC76C7E496E7E01F06E7E48486E7F717E4848153F4982D807A06F7E -+13FC487E6D6F7E80A2717EA46C90C8FC6C5A6C5ACAFCA6EE07FF0303B5FC157F913903FF -+FE07021F138091387FF800903801FFC0010790C7FCEB1FFCEB3FF0EBFFE0485B485B4890 -+C8FC5B485A485AA2485A1A0E485AA312FF5B170FA4171FA26D153F007F163B177B6DDBF1 -+FE131C003F16E16C6C14016C6C912603C0FF13386C6CEC0F806C6C6C903A1F007F80706C -+6D017CECE1E028007FF803F8EB3FFF011FB500E06D1380010391C7000713009026003FF8 -+EC01FC474D79CB4F>97 D<ED07FE92387FFFE00203B512FC91390FFC01FF913A3FE0001F -+C0DA7F80EB03E0D901FEC812F84948157C494881494881494881013FEE07804948150349 -+48ED0BC048177F91C9EAFFE048485D00075EA2485AA2485AA27113C0003F70138049EE7F -+0095C7FC127FA35BA212FFAE127F7FA4123F7FA2121F6D1738120F19786C6C1770A26C6C -+17F019E06C6D15016C18C06D6C15036D6CED07806EED0F006D6C151E6D6C153ED903FE5D -+6D6C15F06D01C0EB03E0DA3FF0EB0FC0DA0FFE01FFC7FC0203B512FCDA007F13E0030790 -+C8FC3D4D7BCB46>99 D<191FF07FFF051FB5FCA5EF001F180784A284B3B0ED07FE92387F -+FFC00203B512F091390FFC01FC91393FE0001FDAFF80EB07814990C7EA03E1D903FCEC01 -+F14948EC0079D91FF0153D4948151D4A151F49488101FF824890C9FC48835B0007835B12 -+0F5B121FA2123F5BA2127FA35BA212FFAE127FA27FA3123FA36C7EA36C7EA200075F7F00 -+035F6C7E606C6D5D6D6C153D013F16396D6C03797F6D6C15F16D6CDA03E17FD903FEDA07 -+8113F0D900FFDA1F01EBFFF0DA7FC0137E91391FF803F80207B512E0020114809127001F -+F800EC80004C797AF758>I<ED1FFC4AB512C0020714F091391FF00FFC91397F8001FFD9 -+01FEC7EA7FC049486E7E49486E7E49486E7E49486E7E49486E7E4948140101FF824890C9 -+1380A24848EE7FC0A2485A000FEF3FE05BA2001F18F0181F485AA3007F18F8A349160FA2 -+12FF90B9FCA301E0CBFCAB127F7FA3123FA36C7EA219386C7E1978000718707F000318F0 -+6C6C17E018016C6DED03C06D6C1680013F16076D6CED0F006D6C151E6D6C5D6D6C5D6DB4 -+4A5A6D6C6C495ADA3FE0EB1F80DA0FFE01FEC7FC0203B512F8DA007F13E0DB07FEC8FC3D -+4D7BCB46>I<EE7FC0923803FFF8030F7F92383FC07F9239FF000F804A48EB3FC04A4813 -+7F4A48EBFFE04A485AEC1FE0143F15C0147F158002FF6D13C0EF7F804990C7EA0C0094C7 -+FCA3495AB3A9B812C0A5260003FEC9FCB3B3B3A7805B011F13E0001FB612F8A533797DF8 -+2F>I<14F8EA03FFB5FCA5C6FC133F131FA2130FB3B0933803FF80041F13F8047F13FE92 -+3A01FC03FF80923A03E0007FE0DB0F80EB1FF0031EC76C7E5D4B6E7E4B6E7E5D14F9DAFB -+C06E7E5D14FF92C9FC865CA35CA45CB3B3A8496C4B7FD97FFF030713F0B7D8800FB612F8 -+A54D787AF758>104 D<131EEB7F80497E487F487FA66C5B6C5B6D5A011EC7FC90C8FCB3 -+A7EB01F0EA07FFB5FCA51201EA007F133FA2131FB3B3B3A3497EEBFFFEB612FCA51E727A -+F12A>I<EB01F0EA07FFB5FCA51201EA007F133FA2131FB3B3B3B3B3AC497EEBFFFEB612 -+FEA51F787AF72A>108 D<D901F0903803FF80D807FF021F13F8B5027F13FE923A01FC03 -+FF80923A03E0007FE0DB0F80EB1FF0031EC76C7EC65C013F496E7E011F496E7E5DEB0FF1 -+DAF3C06E7E5D14F792C9FC02FF835CA35CA45CB3B3A8496C4B7FD97FFF030713F0B7D880 -+0FB612F8A54D4B7ACA58>110 D<ED07FE92387FFFE00203B512FC91390FFC03FF913A3F -+C0003FC04AC7EA0FE0D901FEEC07F8D903F8EC01FC49486E7E4948157F49486F7E49486F -+7E017F8349C96C7E4916070001844848707EA2000784491601000F84A24848701380A200 -+3F19C0A349177F007F19E0A412FF1AF0AD007F19E0A26D17FFA2003F19C0A46C6C4C1380 -+A2000F1900A26C6C4C5AA26C6C4C5A0001606D160F6C606D6C4B5A6D6C4B5AA26D6C4B5A -+D907F003FEC7FCD903FCEC03FC6D6C4A5A6D6C6CEB1FF0DA3FE0EB7FC091270FFC03FFC8 -+FC0203B512FCDA007F13E0DB07FEC9FC444D7BCB4F>I<D903E0EB1FE0D80FFFECFFFCB5 -+01037F923907E01F8092391F807FC092383E00FF4B4813E000011478D8007F13F090383F -+E1E015C0EB1FE39126E7800013C0EF7F8092C7EA3F0002EF91C7FC14EE14FE5CA45CA55C -+B3B3A480133F90B5FCB712C0A5334B7ACA3D>114 D<DA1FFFEB038049B512E0010FECF8 -+07903A3FE001FE0F01FEC7EA1F9FD801F8EC07DFD807E0EC03FF484880498048C9127F48 -+163F003E161F127E170F127C12FC1707A46C1603A27E7F6C7E7F6D92C7FCEA3FFC13FF6C -+13E06C13FF6C14F06CECFF806C15F86C15FE013F6E7E010F15E0010381010081020F14FE -+DA007F7F1503DB003F1380040713C0040113E000E081177FEF3FF06C161F170FEF07F8A2 -+17037E1701A27EA37E18F07E17036D16E0A26D15076DED0FC06D168000FE161F017CED3F -+00486C157E6DEC01F826F80FC0EB07F026F003F8EB7FC00100B6C7FC48013F13FC020713 -+80354D7CCB3E>I<02F8EE0F80D803FFEE3FFFB5030FB5FCA5C6EE000F013F1603011F82 -+A2010F82B3B3A660A460A3601307606E150E0103161E606E4B7F010116706D6C03F07F6F -+D903E013F86E6C4948EBFFF8DA1FE0EB1F00DA0FFE13FE0203B512F8DA007F13E0030790 -+C7EBC0004D4C7ACA58>117 D<B600F84AB512FCA5000191C9003F13C026007FFC040F13 -+006D4817FC011F715A62010F715A6E5F13076E4C5A130397C7FC6E5E6D170E816D5FA26F -+153C027F163881023F5EA26F15F0021F5E81020F4B5AA26F140302075E8102034BC8FCA2 -+6F5C6E150E826E5DA270133C037F143882033F5CA27013F0031F5C82030F495AA2EEFC03 -+03075C16FE030349C9FCA2705A6F130E178E6F139CA217FC705AA2705AA3705AA2705AA3 -+705AA294CAFCA25E160EA25EA2163C1638A25EA216F05EA24B5A120FD83FC01303486C5C -+486C130793CBFC5D150E5D153C6C485B495B6C48485A383C0003001F495A260FE03FCCFC -+3803FFFE6C13F838003FE04E6C7EC953>121 D<0007B912F0A302F8C8EA7FE0028015FF -+01FCC84813C049178048484B1300495D494B5A495E171F90C9485A604D5A17FF000E4B5B -+605E4C90C7FC001E5E001C4B5A161F4C5A5F167F4C5AC95B4B5B5D4B90C8FC5E150F4B5A -+4B5A5E157F4B5A5E5C4A5B4A90C9FC5D020F16704A5A5D4A5A147F4A5A5D4917F0494915 -+E092C9FC495A130F495A4A1501133F495A5C494815035A4849150791C9FC48170F484816 -+1F49EE3FC04848167F003FEE01FF484815074992B5FCBAFCA33C4A7DC946>I -+E -+%EndDVIPSBitmapFont -+end -+%%EndProlog -+%%BeginSetup -+%%Feature: *Resolution 600dpi -+TeXDict begin -+ -+%%EndSetup -+%%Page: 1 1 -+1 0 bop 1086 1574 a Fr(Unison)53 b(File)h(Sync)l(hronizer)886 -+1838 y Fq(http://www.cis.upenn.edu/)q Fp(\030)p Fq(bc)q(pier)q(ce/u)q -+(nis)q(on)1582 2278 y Fo(V)-11 b(ersion)44 b(2.9.1)997 -+3086 y Fr(User)53 b(Man)l(ual)f(and)g(Reference)1929 -+5589 y Fn(1)p eop -+%%Page: 2 2 -+2 1 bop 0 83 a Fm(Con)l(ten)l(ts)0 266 y Fl(1)77 b(Preface)3418 -+b(5)125 365 y Fn(1.1)83 b(P)n(eople)47 b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.) -+f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)134 b(5)125 465 y(1.2)83 b(Cop)n(ying)50 -+b(.)42 b(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.) -+f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)134 -+b(5)125 565 y(1.3)83 b(Rep)r(orting)28 b(Bugs)38 b(.)j(.)h(.)f(.)h(.)g -+(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.) -+h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g -+(.)f(.)h(.)f(.)134 b(5)125 664 y(1.4)83 b(Ho)n(w)28 b(Y)-7 -+b(ou)27 b(Can)h(Help)35 b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.) -+f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)134 -+b(5)0 847 y Fl(2)77 b(Installation)3252 b(6)125 946 y -+Fn(2.1)83 b(Do)n(wnloading)27 b(Unison)51 b(.)42 b(.)g(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.) -+f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)134 -+b(6)125 1046 y(2.2)83 b(Running)28 b(Unison)84 b(.)42 -+b(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g -+(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.) -+h(.)f(.)h(.)g(.)f(.)h(.)f(.)134 b(6)125 1146 y(2.3)83 -+b(Upgrading)34 b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f -+(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.) -+h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)134 -+b(6)125 1245 y(2.4)83 b(Con)n(tributed)28 b(P)n(orts)75 -+b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.) -+g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f -+(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)134 b(6)125 1345 y(2.5)83 -+b(Building)28 b(Unison)g(from)f(Scratc)n(h)43 b(.)f(.)f(.)h(.)g(.)f(.)h -+(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.) -+h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)134 b(7)315 -+1445 y(2.5.1)94 b(Unix)40 b(.)h(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.) -+f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)134 -+b(7)315 1544 y(2.5.2)94 b(Windo)n(ws)75 b(.)42 b(.)f(.)h(.)g(.)f(.)h(.) -+f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h -+(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.) -+f(.)134 b(8)315 1644 y(2.5.3)94 b(Installation)27 b(Options)68 -+b(.)41 b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.) -+f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)134 b(8)0 1826 y Fl(3)77 b(T)-8 b(utorial)3392 -+b(9)125 1926 y Fn(3.1)83 b(Preliminaries)66 b(.)42 b(.)f(.)h(.)f(.)h(.) -+g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f -+(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.) -+g(.)f(.)h(.)f(.)134 b(9)125 2026 y(3.2)83 b(Lo)r(cal)27 -+b(Usage)40 b(.)h(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.) -+f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)134 -+b(9)125 2125 y(3.3)83 b(Remote)28 b(Usage)23 b(.)42 b(.)f(.)h(.)f(.)h -+(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.) -+f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h -+(.)g(.)f(.)h(.)f(.)93 b(11)125 2225 y(3.4)83 b(Remote)28 -+b(Shell)g(Metho)r(d)78 b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f -+(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.) -+g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(11)125 -+2325 y(3.5)83 b(So)r(c)n(k)n(et)27 b(Metho)r(d)66 b(.)41 -+b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h -+(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.) -+f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(12)125 2424 y(3.6)83 -+b(Using)28 b(Unison)f(for)g(All)i(Y)-7 b(our)27 b(Files)41 -+b(.)g(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g -+(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.) -+93 b(12)125 2524 y(3.7)83 b(Going)28 b(F)-7 b(urther)25 -+b(.)42 b(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.) -+h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g -+(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(13)0 -+2707 y Fl(4)77 b(Basic)31 b(Concepts)3044 b(14)125 2806 -+y Fn(4.1)83 b(Ro)r(ots)75 b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g -+(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.) -+h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g -+(.)f(.)h(.)f(.)93 b(14)125 2906 y(4.2)83 b(P)n(aths)c(.)41 -+b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.) -+f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 -+b(15)125 3005 y(4.3)83 b(What)28 b(is)g(an)f(Up)r(date?)65 -+b(.)42 b(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.) -+f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(15)125 3105 y(4.4)83 -+b(What)28 b(is)g(a)f(Con\015ict?)h(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f -+(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.) -+h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 -+b(15)125 3205 y(4.5)83 b(Reconciliation)31 b(.)42 b(.)f(.)h(.)f(.)h(.)g -+(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.) -+h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g -+(.)f(.)h(.)f(.)93 b(15)125 3304 y(4.6)83 b(In)n(v)-5 -+b(arian)n(ts)54 b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.) -+f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 -+b(16)125 3404 y(4.7)83 b(Ca)n(v)n(eats)26 b(and)i(Shortcomings)k(.)42 -+b(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f -+(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.) -+h(.)f(.)93 b(17)0 3587 y Fl(5)77 b(Reference)3269 b(18)125 -+3686 y Fn(5.1)83 b(Running)28 b(Unison)84 b(.)42 b(.)f(.)h(.)g(.)f(.)h -+(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.) -+h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h -+(.)f(.)93 b(18)125 3786 y(5.2)83 b(The)28 b Fk(.unison)d -+Fn(Directory)20 b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.) -+f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(18)125 3885 -+y(5.3)83 b(Arc)n(hiv)n(e)27 b(Files)70 b(.)42 b(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.) -+f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)93 b(18)125 3985 y(5.4)83 b(Preferences)69 -+b(.)41 b(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.) -+f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h -+(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(19)125 -+4085 y(5.5)83 b(Pro\014les)d(.)42 b(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.) -+f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)93 b(25)125 4184 y(5.6)83 b(Sample)28 b(Pro\014les)48 -+b(.)41 b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.) -+f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(25)315 4284 -+y(5.6.1)h(A)28 b(Minimal)g(Pro\014le)73 b(.)42 b(.)f(.)h(.)f(.)h(.)g(.) -+f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 -+b(25)315 4384 y(5.6.2)h(A)28 b(Basic)f(Pro\014le)53 b(.)42 -+b(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f -+(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.) -+g(.)f(.)h(.)f(.)93 b(25)315 4483 y(5.6.3)h(A)28 b(P)n(o)n(w)n(er-User)c -+(Pro\014le)k(.)41 b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h -+(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.) -+h(.)g(.)f(.)h(.)f(.)93 b(26)125 4583 y(5.7)83 b(Keeping)27 -+b(Bac)n(kups)46 b(.)c(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h -+(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.) -+h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(27)125 -+4682 y(5.8)83 b(Merging)27 b(Con\015icting)g(V)-7 b(ersions)74 -+b(.)42 b(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.) -+h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h -+(.)f(.)93 b(27)125 4782 y(5.9)83 b(The)28 b(User)f(In)n(terface)59 -+b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.) -+g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f -+(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(28)125 4882 y(5.10)41 -+b(Exit)28 b(co)r(de)68 b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f -+(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.) -+g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f -+(.)93 b(28)125 4981 y(5.11)41 b(P)n(ath)27 b(sp)r(eci\014cation)f(.)42 -+b(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g -+(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.) -+h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(29)125 5081 y(5.12)41 -+b(Ignoring)26 b(P)n(aths)72 b(.)41 b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.) -+f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 -+b(30)125 5181 y(5.13)41 b(Sym)n(b)r(olic)28 b(Links)54 -+b(.)41 b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.) -+f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(30)125 5280 -+y(5.14)41 b(P)n(ermissions)54 b(.)41 b(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h -+(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.) -+h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h -+(.)f(.)93 b(31)1929 5589 y(2)p eop -+%%Page: 3 3 -+3 2 bop 125 83 a Fn(5.15)41 b(Cross-Platform)25 b(Sync)n(hronization)31 -+b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.) -+g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f -+(.)93 b(31)125 183 y(5.16)41 b(Slo)n(w)28 b(Links)21 -+b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.) -+h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f -+(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 -+b(31)125 282 y(5.17)41 b(F)-7 b(ast)28 b(Up)r(date)g(Detection)42 -+b(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h -+(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.) -+h(.)g(.)f(.)h(.)f(.)93 b(31)125 382 y(5.18)41 b(Clic)n(k-starting)26 -+b(Unison)j(.)42 b(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f -+(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.) -+h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(32)0 565 y Fl(6)77 -+b(Advice)3392 b(33)125 664 y Fn(6.1)83 b(F)-7 b(requen)n(tly)28 -+b(Ask)n(ed)f(Questions)43 b(.)e(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h -+(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.) -+f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(33)125 764 y(6.2)83 -+b(Common)28 b(Problems)43 b(.)e(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f -+(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.) -+f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 -+b(34)125 863 y(6.3)83 b(T)-7 b(ric)n(ks)27 b(and)g(Tips)39 -+b(.)i(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f -+(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.) -+h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(37)0 1046 y -+Fl(A)53 b(Installing)30 b(Ssh)3114 b(39)125 1146 y Fn(A.1)63 -+b(Unix)47 b(.)42 b(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f -+(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.) -+g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f -+(.)93 b(39)125 1245 y(A.2)63 b(Windo)n(ws)83 b(.)42 b(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.) -+f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h -+(.)f(.)h(.)g(.)f(.)h(.)f(.)93 b(40)0 1428 y Fl(B)57 b(Changes)31 -+b(in)g(V)-8 b(ersion)31 b(2.9.1)2645 b(42)1929 5589 y -+Fn(3)p eop -+%%Page: 4 4 -+4 3 bop 125 83 a Fn(Unison)27 b(is)h(a)f(\014le-sync)n(hronization)e -+(to)r(ol)j(for)f(Unix)h(and)f(Windo)n(ws.)37 b(It)28 -+b(allo)n(ws)e(t)n(w)n(o)h(replicas)g(of)g(a)h(collection)f(of)g -+(\014les)0 183 y(and)e(directories)f(to)h(b)r(e)h(stored)e(on)i -+(di\013eren)n(t)f(hosts)g(\(or)f(di\013eren)n(t)i(disks)f(on)g(the)h -+(same)e(host\),)i(mo)r(di\014ed)g(separately)-7 b(,)24 -+b(and)0 282 y(then)k(brough)n(t)f(up)h(to)f(date)h(b)n(y)f(propagating) -+e(the)j(c)n(hanges)e(in)i(eac)n(h)f(replica)g(to)g(the)h(other.)125 -+382 y(Unison)c(shares)g(a)g(n)n(um)n(b)r(er)h(of)f(features)h(with)g -+(to)r(ols)f(suc)n(h)h(as)f(con\014guration)f(managemen)n(t)h(pac)n(k)-5 -+b(ages)23 b(\(CVS,)j(PR)n(CS,)0 482 y(etc.\),)g(distributed)f -+(\014lesystems)f(\(Co)r(da,)h(etc.\),)h(uni-directional)e(mirroring)e -+(utilities)k(\(rsync,)f(etc.\),)g(and)g(other)f(sync)n(hro-)0 -+581 y(nizers)j(\(In)n(tellisync,)h(Reconcile,)f(etc\).)74 -+b(Ho)n(w)n(ev)n(er,)26 b(there)h(are)g(sev)n(eral)f(p)r(oin)n(ts)h -+(where)g(it)h(di\013ers:)125 747 y Fj(\017)41 b Fn(Unison)22 -+b(runs)g(on)g(b)r(oth)i(Windo)n(ws)e(\(95,)h(98,)f(NT,)h(and)g(2k\))f -+(and)h(Unix)f(\(Solaris,)h(Lin)n(ux,)g(etc.\))36 b(systems.)f(Moreo)n -+(v)n(er,)208 847 y(Unison)26 b(w)n(orks)f Fi(acr)l(oss)j -+Fn(platforms,)f(allo)n(wing)e(y)n(ou)h(to)h(sync)n(hronize)e(a)h(Windo) -+n(ws)h(laptop)f(with)i(a)e(Unix)h(serv)n(er,)f(for)208 -+946 y(example.)125 1112 y Fj(\017)41 b Fn(Unlik)n(e)26 -+b(a)g(distributed)h(\014lesystem,)g(Unison)g(is)f(a)g(user-lev)n(el)f -+(program:)35 b(there)26 b(is)g(no)h(need)f(to)h(hac)n(k)f(\(or)f(o)n -+(wn!\))37 b(the)208 1212 y(k)n(ernel,)26 b(or)h(to)g(ha)n(v)n(e)g(sup)r -+(eruser)g(privileges)f(on)h(either)h(host.)125 1378 y -+Fj(\017)41 b Fn(Unlik)n(e)33 b(simple)g(mirroring)f(or)g(bac)n(kup)h -+(utilities,)i(Unison)f(can)f(deal)g(with)g(up)r(dates)h(to)f(b)r(oth)h -+(replicas)e(of)h(a)g(dis-)208 1478 y(tributed)e(directory)e(structure.) -+46 b(Up)r(dates)32 b(that)f(do)f(not)h(con\015ict)g(are)f(propagated)f -+(automatically)-7 b(.)45 b(Con\015icting)208 1577 y(up)r(dates)27 -+b(are)g(detected)h(and)f(displa)n(y)n(ed.)125 1743 y -+Fj(\017)41 b Fn(Unison)32 b(w)n(orks)g(b)r(et)n(w)n(een)h(an)n(y)f -+(pair)g(of)h(mac)n(hines)f(connected)h(to)g(the)g(in)n(ternet,)h(comm)n -+(unicating)f(o)n(v)n(er)e(either)h(a)208 1843 y(direct)27 -+b(so)r(c)n(k)n(et)f(link)h(or)f(tunneling)i(o)n(v)n(er)d(an)i -+Fk(rsh)f Fn(or)g(an)h(encrypted)g Fk(ssh)f Fn(connection.)36 -+b(It)27 b(is)g(careful)g(with)g(net)n(w)n(ork)208 1943 -+y(bandwidth,)e(and)g(runs)f(w)n(ell)g(o)n(v)n(er)f(slo)n(w)h(links)g -+(suc)n(h)g(as)g(PPP)f(connections.)35 b(T)-7 b(ransfers)24 -+b(of)g(small)g(up)r(dates)h(to)f(large)208 2042 y(\014les)j(are)g -+(optimized)g(using)h(a)f(compression)f(proto)r(col)g(similar)h(to)h -+(rsync.)125 2208 y Fj(\017)41 b Fn(Unison)27 b(has)g(a)g(clear)g(and)g -+(precise)g(sp)r(eci\014cation,)g(describ)r(ed)h(b)r(elo)n(w.)125 -+2374 y Fj(\017)41 b Fn(Unison)36 b(is)g(resilien)n(t)g(to)g(failure.)64 -+b(It)36 b(is)h(careful)f(to)g(lea)n(v)n(e)f(the)i(replicas)e(and)i(its) -+f(o)n(wn)g(priv)-5 b(ate)36 b(structures)g(in)g(a)208 -+2474 y(sensible)27 b(state)g(at)h(all)f(times,)h(ev)n(en)f(in)h(case)f -+(of)g(abnormal)f(termination)i(or)e(comm)n(unication)h(failures.)125 -+2640 y Fj(\017)41 b Fn(Unison)27 b(is)h(free;)f(full)h(source)f(co)r -+(de)g(is)h(a)n(v)-5 b(ailable)26 b(under)h(the)h(GNU)h(Public)e -+(License.)125 2806 y(There)j(is)h(a)f(mo)r(derated,)h(v)n(ery-lo)n(w-v) -+n(olume)d(announcemen)n(t)i(list)i(for)e(new)h(Unison)g(releases;)g -+(the)g(arc)n(hiv)n(es)e(of)i(this)0 2906 y(list)26 b(are)f(a)n(v)-5 -+b(ailable)25 b(at)g(the)i(ab)r(o)n(v)n(e)d(link.)37 b(There)25 -+b(is)h(also)e(a)i(mo)r(derated)f(\(but)i(higher)e(v)n(olume\))h -+(discussion)f(list)h(for)f(Unison)0 3005 y(users.)1929 -+5589 y(4)p eop -+%%Page: 5 5 -+5 4 bop 0 83 a Fm(1)135 b(Preface)0 281 y Fh(1.1)112 -+b(P)m(eople)125 435 y Fj(\017)41 b Fn(Benjamin)27 b(Pierce)g(is)g(the)h -+(Unison)g(pro)5 b(ject)27 b(leader.)36 b(Zhe)27 b(Y)-7 -+b(ang)27 b(is)h(a)f(full-time)h(p)r(ostdo)r(c)g(on)f(the)h(pro)5 -+b(ject.)125 601 y Fj(\017)41 b Fn(The)33 b(curren)n(t)f(v)n(ersion)f -+(of)i(Unison)g(w)n(as)f(designed)h(and)g(implemen)n(ted)g(b)n(y)g(T)-7 -+b(rev)n(or)31 b(Jim,)k(Benjamin)e(Pierce,)g(and)208 700 -+y(J)n(\023)-39 b(er^)d(ome)25 b(V)-7 b(ouillon,)27 b(with)i(Sylv)-5 -+b(ain)27 b(Gommier)g(and)h(Matthieu)g(Goula)n(y)-7 b(.)125 -+866 y Fj(\017)41 b Fn(Our)29 b(implemen)n(tation)h(of)g(the)h(rsync)e -+(proto)r(col)g(w)n(as)h(built)g(b)n(y)g(Norman)g(Ramsey)f(and)h(Sylv)-5 -+b(ain)30 b(Gommier.)45 b(It)30 b(is)208 966 y(is)d(based)g(on)g(Andrew) -+h(T)-7 b(ridgell's)27 b(thesis)g(w)n(ork)f(and)i(inspired)f(b)n(y)h -+(his)f(rsync)g(utilit)n(y)-7 b(.)125 1132 y Fj(\017)41 -+b Fn(The)27 b(mirroring)f(and)h(merging)g(functionalit)n(y)g(w)n(as)g -+(implemen)n(ted)h(b)n(y)g(Sylv)-5 b(ain)27 b(Ro)n(y)-7 -+b(.)125 1298 y Fj(\017)41 b Fn(Jacques)26 b(Garrigue)g(con)n(tributed)h -+(the)h(original)e(Gtk)i(v)n(ersion)e(of)i(the)g(user)f(in)n(terface.) -+125 1464 y Fj(\017)41 b Fn(Sundar)25 b(Balasubramaniam)e(help)r(ed)j -+(build)h(a)e(protot)n(yp)r(e)g(implemen)n(tation)g(of)h(an)g(earlier)e -+(sync)n(hronizer)f(in)j(Ja)n(v)-5 b(a.)208 1564 y(Insik)24 -+b(Shin)i(and)f(Insup)g(Lee)g(con)n(tributed)g(design)g(ideas)f(to)h -+(this)h(implemen)n(tation.)36 b(Cedric)24 b(F)-7 b(ournet)25 -+b(con)n(tributed)208 1663 y(to)i(an)g(ev)n(en)g(earlier)g(protot)n(yp)r -+(e.)0 1896 y Fh(1.2)112 b(Cop)m(ying)0 2049 y Fn(Unison)34 -+b(is)h(free)f(soft)n(w)n(are.)55 b(Y)-7 b(ou)35 b(are)e(free)h(to)g(c)n -+(hange)f(and)i(redistribute)f(it)h(under)f(the)h(terms)f(of)g(the)h -+(GNU)g(General)0 2149 y(Public)27 b(License.)37 b(Please)26 -+b(see)h(the)h(\014le)g(COPYING)g(in)f(the)h(Unison)g(distribution)g -+(for)f(more)f(information.)0 2381 y Fh(1.3)112 b(Rep)s(orting)37 -+b(Bugs)0 2534 y Fn(If)28 b(Unison)g(is)f(not)h(w)n(orking)d(the)j(w)n -+(a)n(y)f(y)n(ou)g(exp)r(ect,)h(here)f(are)f(some)h(steps)h(to)f(follo)n -+(w:)125 2717 y Fj(\017)41 b Fn(First,)h(try)e(running)f(Unison)h(with)h -+(the)f Fk(-debug)h(all)e Fn(command)g(line)h(option.)73 -+b(This)40 b(will)g(cause)f(Unison)h(to)208 2817 y(generate)22 -+b(a)i(detailed)g(trace)g(of)g(what)g(it's)g(doing,)h(whic)n(h)f(ma)n(y) -+f(mak)n(e)g(it)i(clearer)e(where)g(the)i(problem)e(is)h(o)r(ccurring.) -+125 2983 y Fj(\017)41 b Fn(Second,)22 b(send)f(mail)g(to)g -+Fk(unison-help@cis.u)o(pen)o(n.)o(ed)o(u)15 b Fn(describing)21 -+b(the)g(problem)g(and)g(w)n(e'll)g(try)g(to)g(\014x)h(it.)35 -+b(Mak)n(e)208 3082 y(sure)c(to)h(include)h(the)g(v)n(ersion)e(of)h -+(Unison)g(y)n(ou)g(are)f(using)h(\()p Fk(unison)41 b(-version)p -+Fn(\),)31 b(the)i(kind)f(of)h(mac)n(hine\(s\))f(y)n(ou)208 -+3182 y(are)24 b(running)h(it)h(on,)f(a)g(record)f(of)i(what)f(gets)g -+(prin)n(ted)g(when)h(the)f Fk(-debug)41 b(all)25 b Fn(option)g(is)g -+(included,)h(and)g(as)e(m)n(uc)n(h)208 3282 y(information)i(as)h(y)n -+(ou)g(can)g(ab)r(out)h(what)g(w)n(en)n(t)f(wrong.)125 -+3448 y Fj(\017)41 b Fn(If)28 b(y)n(ou)e(think)j(the)f(problem)f(y)n -+(ou're)f(ha)n(ving)g(migh)n(t)i(ha)n(v)n(e)e(b)r(een)i(encoun)n(tered)f -+(b)n(y)h(others)e(\(e.g.,)i(if)g(it)g(seems)f(lik)n(e)g(a)208 -+3547 y(con\014guration)e(problem,)h(not)h(a)f(real)g(bug\),)h(then)g(y) -+n(ou)f(ma)n(y)g(b)r(e)h(able)f(to)h(get)f(some)g(help)h(from)f(the)h -+(Unison)g(users')208 3647 y(mailing)g(list,)h Fk(unison-users@gr)o(oup) -+o(s.)o(yah)o(oo)o(.c)o(om)p Fn(.)0 3879 y Fh(1.4)112 -+b(Ho)m(w)37 b(Y)-9 b(ou)37 b(Can)h(Help)0 4033 y Fn(Unison)29 -+b(is)h(a)f(part-time)g(pro)5 b(ject)29 b(for)g(its)h(dev)n(elop)r(ers:) -+39 b(w)n(e)30 b(w)n(ork)e(on)h(it)h(b)r(ecause)f(w)n(e)g(enjo)n(y)g -+(making)g(something)g(that)h(is)0 4132 y(useful)g(for)e(us)h(and)h(for) -+e(the)i(comm)n(unit)n(y)-7 b(,)29 b(but)h(w)n(e)f(all)g(ha)n(v)n(e)f -+(other)g(jobs)i(to)f(do.)41 b(If)30 b(y)n(ou)e(lik)n(e)h(Unison)g(and)g -+(w)n(an)n(t)g(to)g(help)0 4232 y(impro)n(v)n(e)e(it,)h(y)n(our)f(con)n -+(tributions)g(w)n(ould)h(b)r(e)g(v)n(ery)f(w)n(elcome.)37 -+b(F)-7 b(or)27 b(more)h(details)f(on)h(ho)n(w)f(the)i(co)r(de)f(is)f -+(organized,)g(etc.,)0 4331 y(see)g(the)h(\014le)g Fk(CONTRIB)d -+Fn(in)j(the)g(source)e(distribution.)125 4431 y(If)31 -+b(y)n(ou)g(don't)g(feel)h(lik)n(e)f(hac)n(king,)g(y)n(ou)f(can)h(help)h -+(us)f(b)n(y)g(simply)h(letting)f(us)h(kno)n(w)e(ho)n(w)h(y)n(ou)f(lik)n -+(e)h(Unison.)48 b(Ev)n(en)30 b(a)0 4531 y(short)g(note)h(lik)n(e)g -+(\\I'm)g(using)g(it;)i(w)n(orks)d(\014ne")g(or)h(\\I)f(lo)r(ok)n(ed)g -+(at)h(it)h(but)g(it's)f(not)g(quite)h(what)f(I)g(w)n(an)n(t)f(b)r -+(ecause...")47 b(will)0 4630 y(giv)n(e)27 b(us)g(v)-5 -+b(aluable)27 b(information.)1929 5589 y(5)p eop -+%%Page: 6 6 -+6 5 bop 0 83 a Fm(2)135 b(Installation)0 265 y Fn(Unison)35 -+b(is)g(designed)f(to)h(b)r(e)h(easy)e(to)h(install.)59 -+b(The)35 b(follo)n(wing)f(sequence)g(of)h(steps)g(should)g(get)f(y)n -+(ou)h(a)f(fully)i(w)n(orking)0 364 y(installation)31 -+b(in)g(a)g(few)g(min)n(utes.)48 b(\(If)32 b(y)n(ou)e(run)h(in)n(to)g -+(trouble,)g(y)n(ou)g(ma)n(y)f(\014nd)i(the)f(suggestions)f(in)h -+(Section)g(6)g([Advice])0 464 y(helpful.\))125 564 y(Unison)c(can)g(b)r -+(e)h(used)g(with)g(either)f(of)h(t)n(w)n(o)f(user)g(in)n(terfaces:)101 -+730 y(1.)42 b(a)27 b(simple)g(textual)h(in)n(terface,)f(suitable)h(for) -+f(dum)n(b)h(terminals)f(\(and)g(running)h(from)f(scripts\),)g(and)101 -+896 y(2.)42 b(a)27 b(more)g(sophisticated)g(grapical)e(in)n(terface,)i -+(based)h(on)f(Gtk.)125 1062 y(Y)-7 b(ou)27 b(will)h(need)f(to)h -+(install)f(a)g(cop)n(y)g(of)g(Unison)h(on)f(ev)n(ery)f(mac)n(hine)h -+(that)h(y)n(ou)f(w)n(an)n(t)g(to)g(sync)n(hronize.)35 -+b(Ho)n(w)n(ev)n(er,)26 b(y)n(ou)0 1162 y(only)f(need)g(the)h(v)n -+(ersion)d(with)j(a)f(graphical)e(user)i(in)n(terface)f(\(if)i(y)n(ou)f -+(w)n(an)n(t)f(a)h(GUI)g(at)g(all\))h(on)e(the)i(mac)n(hine)f(where)f(y) -+n(ou're)0 1261 y(actually)k(going)f(to)h(displa)n(y)g(the)g(in)n -+(terface)g(\(the)h Fi(client)g Fn(mac)n(hine\).)39 b(Other)28 -+b(mac)n(hines)g(that)g(y)n(ou)g(sync)n(hronize)f(with)h(can)0 -+1361 y(get)f(along)g(just)h(\014ne)g(with)g(the)g(textual)g(v)n -+(ersion.)0 1593 y Fh(2.1)112 b(Do)m(wnloading)37 b(Unison)0 -+1746 y Fn(If)28 b(a)f(pre-built)h(binary)f(of)h(Unison)f(is)h(a)n(v)-5 -+b(ailable)26 b(for)h(the)i(clien)n(t)e(mac)n(hine's)g(arc)n(hitecture,) -+g(just)h(do)n(wnload)f(it)h(and)f(put)i(it)0 1846 y(somewhere)f(in)h(y) -+n(our)f(searc)n(h)f(path)j(\(if)f(y)n(ou're)f(going)g(to)h(in)n(v)n(ok) -+n(e)e(it)j(from)e(the)i(command)e(line\))i(or)e(on)h(y)n(our)f(desktop) -+g(\(if)0 1946 y(y)n(ou'll)f(b)r(e)h(clic)n(k-starting)e(it\).)125 -+2045 y(The)g(executable)h(\014le)f(for)h(the)g(graphical)e(v)n(ersion)g -+(\(with)j(a)e(name)g(including)h Fk(gtkui)p Fn(\))e(actually)h(pro)n -+(vides)g Fi(b)l(oth)h Fn(in)n(ter-)0 2145 y(faces:)33 -+b(the)22 b(graphical)e(one)h(app)r(ears)g(b)n(y)g(default,)i(while)f -+(the)g(textual)g(in)n(terface)f(can)g(b)r(e)h(selected)f(b)n(y)h -+(including)f Fk(-ui)43 b(text)0 2245 y Fn(on)27 b(the)h(command)g -+(line.)37 b(The)27 b Fk(textui)e Fn(executable)j(pro)n(vides)e(just)i -+(the)g(textual)g(in)n(terface.)125 2344 y(If)20 b(y)n(ou)f(don't)h(see) -+f(a)h(pre-built)f(executable)h(for)f(y)n(our)g(arc)n(hitecture,)h(y)n -+(ou'll)f(need)h(to)g(build)g(it)g(y)n(ourself.)33 b(See)20 -+b(Section)g(2.5)0 2444 y([Building)25 b(Unison].)35 b(\(There)25 -+b(are)e(also)h(a)g(small)g(n)n(um)n(b)r(er)g(of)h(\\con)n(tributed)f(p) -+r(orts")f(to)i(other)f(arc)n(hitectures)f(that)i(are)e(not)0 -+2543 y(main)n(tained)k(b)n(y)h(us.)36 b(See)28 b(Section)g(2.4)e([Con)n -+(tributed)i(P)n(orts])e(to)h(c)n(hec)n(k)g(what's)g(a)n(v)-5 -+b(ailable.\))125 2643 y(Chec)n(k)31 b(to)h(mak)n(e)f(sure)g(that)i -+(what)e(y)n(ou)h(ha)n(v)n(e)e(do)n(wnloaded)h(is)h(really)f -+(executable.)49 b(Either)32 b(clic)n(k-start)e(it,)k(or)d(t)n(yp)r(e)0 -+2743 y Fk(unison)41 b(-version)24 b Fn(at)k(the)g(command)f(line.)125 -+2842 y(Unison)35 b(can)h(b)r(e)g(used)g(in)g(sev)n(eral)e(di\013eren)n -+(t)i(mo)r(des:)53 b(with)36 b(di\013eren)n(t)g(directories)e(on)i(a)f -+(single)h(mac)n(hine,)h(with)f(a)0 2942 y(remote)d(mac)n(hine)h(o)n(v)n -+(er)e(a)h(direct)h(so)r(c)n(k)n(et)f(connection,)i(with)f(a)g(remote)f -+(mac)n(hine)g(using)h Fk(rsh)f Fn(\(on)g(Unix)i(systems\),)g(or)0 -+3042 y(with)25 b(a)f(remote)g(Unix)h(system)f(\(from)h(either)f(a)g -+(Unix)h(or)f(a)g(Windo)n(ws)g(clien)n(t\))h(using)f(ssh)g(for)g(authen) -+n(tication)h(and)f(secure)0 3141 y(transfer.)36 b(If)28 -+b(y)n(ou)f(in)n(tend)h(to)f(use)h(the)g(last)f(option,)g(y)n(ou)g(ma)n -+(y)g(need)h(to)f(install)h(ssh;)f(see)g(Section)h(A)g([Installing)f -+(Ssh].)0 3374 y Fh(2.2)112 b(Running)37 b(Unison)0 3527 -+y Fn(Once)32 b(y)n(ou'v)n(e)f(got)h(Unison)g(installed)h(on)f(at)g -+(least)g(one)g(system,)i(read)e(Section)g(3)g([T)-7 b(utorial])32 -+b(of)g(the)h(user)f(man)n(ual)g(\(or)0 3626 y(t)n(yp)r(e)c -+Fk(unison)41 b(-doc)h(tutorial)p Fn(\))24 b(for)k(instructions)f(on)g -+(ho)n(w)g(to)g(get)h(started.)0 3859 y Fh(2.3)112 b(Upgrading)0 -+4012 y Fn(Upgrading)30 b(to)h(a)g(new)g(v)n(ersion)e(of)i(Unison)g -+(should)g(b)r(e)h(as)e(simple)h(as)g(thro)n(wing)f(a)n(w)n(a)n(y)f(the) -+i(old)g(binary)g(and)f(installing)0 4112 y(the)e(new)g(one.)125 -+4211 y(Before)h(upgrading,)h(it)h(is)f(a)g(go)r(o)r(d)g(idea)g(to)h -+(use)f(the)h Fi(old)g Fn(v)n(ersion)e(to)i(mak)n(e)e(sure)h(all)g(y)n -+(our)f(replicas)h(are)f(completely)0 4311 y(sync)n(hronized.)35 -+b(A)27 b(new)f(v)n(ersion)f(of)h(Unison)g(will)g(sometimes)g(in)n(tro)r -+(duce)g(a)g(di\013eren)n(t)g(format)g(for)g(the)g(arc)n(hiv)n(e)f -+(\014les)h(used)0 4411 y(to)c(remem)n(b)r(er)g(information)f(ab)r(out)i -+(the)f(previous)f(state)h(of)h(the)f(replicas.)34 b(In)23 -+b(this)f(case,)h(the)f(old)h(arc)n(hiv)n(e)d(will)j(b)r(e)f(ignored)0 -+4510 y(\(not)i(deleted)f(|)g(if)h(y)n(ou)f(roll)f(bac)n(k)g(to)i(the)f -+(previous)f(v)n(ersion)g(of)h(Unison,)h(y)n(ou)f(will)g(\014nd)h(the)f -+(old)g(arc)n(hiv)n(es)f(in)n(tact\),)i(whic)n(h)0 4610 -+y(means)j(that)h(an)n(y)e(di\013erences)h(b)r(et)n(w)n(een)h(the)f -+(replicas)g(will)g(sho)n(w)g(up)g(as)g(con\015icts)g(and)g(need)h(to)f -+(b)r(e)h(resolv)n(ed)e(man)n(ually)-7 b(.)0 4842 y Fh(2.4)112 -+b(Con)m(tributed)37 b(P)m(orts)0 4996 y Fn(A)f(few)g(p)r(eople)f(ha)n -+(v)n(e)f(o\013ered)h(to)h(main)n(tain)f(pre-built)g(executables,)i -+(easy)e(installation)g(scripts,)i(etc.,)g(for)e(particular)0 -+5095 y(arc)n(hitectures.)h(They)28 b(are)f(not)h(main)n(tained)g(b)n(y) -+f(us)h(and)g(are)f(not)h(guaran)n(teed)e(to)i(w)n(ork,)e(b)r(e)j(k)n -+(ept)f(up)g(to)g(date)f(with)i(our)0 5195 y(latest)e(releases,)f(etc.,) -+i(but)h(y)n(ou)d(ma)n(y)h(\014nd)h(them)g(useful.)38 -+b(Here's)27 b(what's)g(a)n(v)-5 b(ailable)27 b(at)g(the)h(momen)n(t:) -+1929 5589 y(6)p eop -+%%Page: 7 7 -+7 6 bop 125 83 a Fj(\017)41 b Fn(Dan)36 b(P)n(elleg)f(has)h(p)r(orted)g -+(unison)g(to)g(F)-7 b(reeBSD.)37 b(This)f(means)g(that)g(an)n(y)g(F)-7 -+b(reeBSD)36 b(user)g(with)h(an)f(up-to-date)208 183 y(\\p)r(orts")19 -+b(collection)i(can)g(install)g(unison)g(b)n(y)g(doing:)33 -+b Fk(cd)43 b(/usr/ports/net/u)o(ni)o(so)o(n;)37 b(make)42 -+b(&&)h(make)f(install)p Fn(.)208 282 y(\(Mak)n(e)33 b(sure)g(y)n(our)g -+(\\p)r(orts")f(collection)h(is)h(fully)g(up)h(to)e(date)h(b)r(efore)g -+(doing)f(this,)j(to)e(ensure)f(that)h(y)n(ou)f(get)h(the)208 -+382 y(most)27 b(recen)n(t)g(Unison)g(v)n(ersion)g(that)g(has)g(b)r(een) -+h(compiled)g(for)f(F)-7 b(reeBSD.\))208 514 y(F)g(reeBSD)27 -+b(binaries)g(can)g(also)g(b)r(e)h(obtained)f(directly)g(from)390 -+677 y Fk(http://www.freebs)o(d.)o(org)o(/c)o(gi)o(/po)o(rt)o(s.c)o(gi)o -+(?q)o(uer)o(y=)o(uni)o(so)o(n&s)o(ty)o(pe)o(=al)o(l)p -+Fn(.)125 841 y Fj(\017)41 b Fn(Andrew)25 b(Pitts)g(has)g(built)h -+(binaries)f(for)f(some)h(v)n(ersions)f(of)h(Unison)g(for)g(the)h(Lin)n -+(ux-PPC)e(platform.)35 b(They)26 b(can)f(b)r(e)208 941 -+y(found)i(in)h Fk(ftp://ftp.cl.cam.)o(ac)o(.uk)o(/p)o(ape)o(rs)o(/am)o -+(p1)o(2/)o(uni)o(so)o(n/)p Fn(.)125 1104 y Fj(\017)41 -+b Fn(Rob)r(ert)27 b(McQueen)g(main)n(tains)g(a)g(Debian)h(pac)n(k)-5 -+b(age)26 b(for)h(Unison.)37 b(The)28 b(homepage)e(is)i(lo)r(cated)f(at) -+390 1268 y Fk(http://packages.d)o(eb)o(ian)o(.o)o(rg)o(/te)o(st)o(ing)o -+(/n)o(on)o(-us)o(/u)o(nis)o(on)o(.ht)o(ml)o Fn(.)125 -+1432 y Fj(\017)41 b Fn(Chris)27 b(Co)r(cosco)f(pro)n(vides)g(binaries)h -+(for)g(Unison)g(under)h(SGI)g(IRIX)g(\(6.5\).)36 b(They)28 -+b(can)f(b)r(e)h(found)g(in)390 1595 y Fk(www.bic.mni.mcgil)o(l.)o(ca/)o -+(us)o(er)o(s/c)o(ri)o(sco)o(/u)o(ni)o(son)o(.i)o(rix)o(/)p -+Fn(.)0 1827 y Fh(2.5)112 b(Building)36 b(Unison)h(from)g(Scratc)m(h)0 -+1980 y Fn(If)28 b(a)e(pre-built)i(image)e(is)h(not)g(a)n(v)-5 -+b(ailable,)26 b(y)n(ou)h(will)g(need)g(to)g(compile)g(it)h(from)f -+(scratc)n(h;)f(the)i(sources)d(are)i(a)n(v)-5 b(ailable)25 -+b(from)0 2080 y(the)j(same)f(place)g(as)g(the)h(binaries.)125 -+2179 y(In)k(principle,)i(Unison)f(should)f(w)n(ork)f(on)h(an)n(y)g -+(platform)g(to)h(whic)n(h)f(OCaml)g(has)g(b)r(een)h(p)r(orted)g(and)f -+(on)g(whic)n(h)h(the)0 2279 y Fk(Unix)c Fn(mo)r(dule)i(is)f(fully)h -+(implemen)n(ted.)47 b(In)31 b(particular,)f(it)h(has)f(b)r(een)h -+(tested)g(on)f(man)n(y)g(\015a)n(v)n(ors)e(of)j(Windo)n(ws)f(\(98,)h -+(NT,)0 2379 y(2000\))26 b(and)h(Unix)h(\(Solaris,)f(Lin)n(ux,)g(F)-7 -+b(reeBSD,)28 b(MacOS)f(X\),)h(and)g(on)f(b)r(oth)h(32-)e(and)i(64-bit)f -+(arc)n(hitectures.)125 2478 y(Unison)g(do)r(es)g(not)h(w)n(ork)e(\(and) -+i(probably)e(nev)n(er)h(will\))h(on)f(MacOS)g(v)n(ersions)f(8)h(or)g -+(9.)0 2693 y Fl(2.5.1)94 b(Unix)0 2846 y Fn(Y)-7 b(ou'll)37 -+b(need)g(the)g(Ob)5 b(jectiv)n(e)36 b(Caml)h(compiler)f(\(v)n(ersion)f -+(3.04)h(or)g(later)2352 2816 y Fg(1)2388 2846 y Fn(\),)k(whic)n(h)c(is) -+h(a)n(v)-5 b(ailable)36 b(from)g(its)h(o\016cial)f(site)0 -+2946 y Fk(http://caml.inri)o(a.f)o(r)p Fn(.)30 b(Building)25 -+b(and)f(installing)h(OCaml)f(on)h(Unix)g(systems)f(is)h(v)n(ery)f -+(straigh)n(tforw)n(ard;)f(follo)n(w)h(the)0 3045 y(instructions)30 -+b(in)i(the)f(distribution.)47 b(Y)-7 b(ou'll)31 b(probably)e(w)n(an)n -+(t)i(to)f(build)i(the)f(nativ)n(e-co)r(de)f(compiler)g(in)h(addition)g -+(to)g(the)0 3145 y(b)n(yteco)r(de)c(compiler,)g(but)h(this)g(is)g(not)f -+(absolutely)g(necessary)-7 b(.)125 3245 y(\(Quic)n(k)24 -+b(start:)35 b(on)24 b(man)n(y)g(systems,)h(the)g(follo)n(wing)e -+(sequence)i(of)f(commands)g(will)h(get)g(y)n(ou)e(a)i(w)n(orking)e(and) -+h(installed)0 3344 y(compiler:)36 b(\014rst)28 b(do)f -+Fk(make)42 b(world)f(opt)p Fn(,)27 b(then)h Fk(su)f Fn(to)g(ro)r(ot,)g -+(then)h(do)g Fk(make)41 b(install)p Fn(.\))125 3444 y(Y)-7 -+b(ou'll)22 b(also)f(need)h(the)g(GNU)h(mak)n(e)e(utilit)n(y)-7 -+b(,)23 b(standard)e(on)h(man)n(y)f(Unix)h(systems.)35 -+b(\(T)n(yp)r(e)22 b Fk(make)42 b(--version)18 b Fn(to)k(c)n(hec)n(k)0 -+3544 y(that)28 b(y)n(ou'v)n(e)e(got)h(the)h(GNU)g(v)n(ersion.\))125 -+3643 y(Once)h(y)n(ou'v)n(e)g(got)h(OCaml)f(installed,)i(grab)e(a)h(cop) -+n(y)f(of)h(the)h(Unison)f(sources,)g(unzip)g(and)g(un)n(tar)g(them,)h -+(c)n(hange)e(to)0 3743 y(the)f(new)g Fk(unison)d Fn(directory)-7 -+b(,)26 b(and)i(t)n(yp)r(e)523 3904 y Fk(make)42 b(UISTYLE=text)125 -+4066 y Fn(The)27 b(result)g(should)h(b)r(e)g(an)f(executable)g(\014le)h -+(called)f Fk(unison)p Fn(.)125 4165 y(T)n(yp)r(e)g Fk(./unison)d -+Fn(to)k(mak)n(e)f(sure)g(the)h(program)d(is)j(executable.)36 -+b(Y)-7 b(ou)28 b(should)f(get)g(bac)n(k)g(a)g(usage)g(message.)125 -+4265 y(If)h(y)n(ou)e(w)n(an)n(t)h(to)h(build)g(a)f(graphical)f(user)h -+(in)n(terface,)g(c)n(ho)r(ose)f(one)i(of)f(the)h(follo)n(wing:)125 -+4426 y Fj(\017)41 b Fn(Gtk)27 b(in)n(terface:)208 4526 -+y(Y)-7 b(ou)32 b(will)g(need)g(Gtk)h(\(v)n(ersion)d(1.2)i(or)f(later,)i -+(a)n(v)-5 b(ailable)30 b(from)i Fk(http://www.gtk.o)o(rg)26 -+b Fn(and)32 b(standard)f(on)h(man)n(y)208 4625 y(Unix)27 -+b(installations\).)208 4757 y(Y)-7 b(ou)27 b(also)g(need)g(the)h(get)g -+(LablGtk)f(\(v)n(ersion)g(1.1.3)f(is)h(kno)n(wn)g(to)h(w)n(ork\).)36 -+b(Grab)27 b(the)h(dev)n(elop)r(ers')e(tarball)h(from)390 -+4921 y Fk(http://wwwfun.kur)o(im)o(s.k)o(yo)o(to)o(-u.)o(ac)o(.jp)o(/s) -+o(of)o(t/o)o(la)o(bl/)o(la)o(blg)o(tk)o(.h)o(tml)o Fn(,)p -+0 4972 1560 4 v 92 5025 a Ff(1)127 5049 y Fe(If)d(y)n(ou)g(are)f -+(compiling)g(Unison)g(2.7.7)h(or)f(an)h(earlier)f(v)n(ersion,)g(y)n(ou) -+i(need)f(to)131 5151 y Fd(\017)42 b Fe(insert)23 b(a)h(line)f(\\)p -+Fc(CAMLFLAGS+=-nolabels)30 b Fe(to)24 b(the)g(\014le)g(named)g(\\)p -+Fc(Makefile.OCaml)p Fe(")k(in)23 b(the)h(source)h(directory)-6 -+b(,)23 b(and)131 5261 y Fd(\017)42 b Fe(install)23 b(LablGtk)h(1.1.1)g -+(instead)g(of)g(the)g(latest)h(v)n(ersion.)1929 5589 -+y Fn(7)p eop -+%%Page: 8 8 -+8 7 bop 208 83 a Fn(un)n(tar)26 b(it,)j(and)e(follo)n(w)g(the)h -+(instructions)f(to)g(build)i(and)e(install)h(it.)208 -+216 y(\(Quic)n(k)f(start:)36 b Fk(make)42 b(configure)p -+Fn(,)24 b(then)k Fk(make)p Fn(,)e(then)i Fk(make)42 b(opt)p -+Fn(,)27 b(then)h Fk(su)f Fn(and)g Fk(make)42 b(install)p -+Fn(.\))208 349 y(No)n(w)27 b(build)h(unison.)36 b(If)29 -+b(y)n(our)d(searc)n(h)g(paths)h(are)g(set)h(up)f(correctly)-7 -+b(,)27 b(t)n(yping)513 548 y Fk(make)42 b(UISTYLE=gtk)208 -+747 y Fn(should)27 b(build)h(a)f Fk(unison)e Fn(executable)j(with)g(a)f -+(Gtk)h(graphical)e(in)n(terface.)125 913 y(If)i(this)f(step)h(do)r(es)f -+(not)h(w)n(ork,)e(don't)i(w)n(orry:)35 b(Unison)28 b(w)n(orks)d(\014ne) -+j(with)g(the)g(textual)g(in)n(terface.)125 1013 y(Put)23 -+b(the)h Fk(unison)d Fn(executable)i(somewhere)f(in)i(y)n(our)e(searc)n -+(h)g(path,)j(either)e(b)n(y)g(adding)g(the)h(Unison)g(directory)e(to)h -+(y)n(our)0 1112 y(P)-7 b(A)g(TH)28 b(v)-5 b(ariable)26 -+b(or)h(b)n(y)g(cop)n(ying)g(the)h(executable)f(to)g(some)g(standard)g -+(directory)f(where)h(executables)g(are)g(stored.)0 1328 -+y Fl(2.5.2)94 b(Windo)m(ws)0 1482 y Fn(Although)30 b(the)h(binary)e -+(distribution)h(should)g(w)n(ork)f(on)h(an)n(y)f(v)n(ersion)g(of)h -+(Windo)n(ws,)g(some)g(p)r(eople)g(ma)n(y)f(w)n(an)n(t)h(to)g(build)0 -+1581 y(Unison)e(from)f(scratc)n(h)f(on)h(those)h(systems)f(to)r(o.)0 -+1797 y Fl(Byteco)s(de)37 b(v)m(ersion:)82 b Fn(The)32 -+b(simpler)f(but)i(slo)n(w)n(er)d(compilation)h(option)g(to)h(build)h(a) -+e(Unison)h(executable)f(is)h(to)g(build)0 1897 y(a)h(b)n(yteco)r(de)f -+(v)n(ersion.)52 b(Y)-7 b(ou)34 b(need)f(\014rst)g(install)g(Windo)n(ws) -+g(v)n(ersion)e(of)i(the)h(OCaml)e(compiler)h(\(v)n(ersion)f(3.04)f(or)i -+(later,)0 1996 y(a)n(v)-5 b(ailable)26 b(from)i Fk(http://caml.inr)o -+(ia.)o(fr)o Fn(\).)k(Then)27 b(grab)g(a)g(cop)n(y)g(of)g(Unison)h -+(sources)e(and)h(t)n(yp)r(e)305 2162 y Fk(make)42 b(UISTYLE=text)d -+(NATIVE=false)125 2328 y Fn(to)27 b(compile)g(the)h(b)n(yteco)r(de.)37 -+b(The)28 b(result)f(should)g(b)r(e)h(an)g(executable)f(\014le)h(called) -+f Fk(unison.exe)p Fn(.)0 2544 y Fl(Nativ)m(e)j(v)m(ersion:)83 -+b Fn(T)-7 b(o)25 b(build)i(a)e(more)h(e\016cien)n(t,)g(nativ)n(e)g(v)n -+(ersion)e(of)i(Unison)g(on)g(Windo)n(ws,)g(y)n(ou)f(can)g(c)n(ho)r(ose) -+g(b)r(et)n(w)n(een)0 2644 y(t)n(w)n(o)30 b(options.)45 -+b(Both)30 b(options)g(require)f(the)i(OCaml)f(distribution)h(v)n -+(ersion)e(3.04)g(as)h(w)n(ell)g(as)g(the)h(Cygwin)f(la)n(y)n(er,)f -+(whic)n(h)0 2743 y(pro)n(vides)e(certain)h(GNU)h(to)r(ols.)39 -+b(The)29 b(t)n(w)n(o)f(options)g(di\013er)g(in)h(the)g(C)g(compiler)f -+(emplo)n(y)n(ed:)37 b(MS)29 b(Visual)g(C++)e(\(MSV)n(C\))0 -+2843 y(vs.)g(Cygwin)g(GNU)i(C.)125 2943 y(The)e(tradeo\013)6 -+b(?)125 3109 y Fj(\017)41 b Fn(Only)27 b(the)h(MSV)n(C)g(option)f(can)g -+(pro)r(duce)g(statically)g(link)n(ed)h(Unison)f(executable.)125 -+3275 y Fj(\017)41 b Fn(The)27 b(Cygwin)g(GNU)i(C)e(option)h(requires)e -+(only)h(free)g(soft)n(w)n(are.)125 3441 y(The)h(\014les)h(\\INST)-7 -+b(ALL.win32-msv)n(c")27 b(and)h(\\INST)-7 b(ALL.win32-cygwin-gn)n(uc") -+26 b(describ)r(e)i(the)h(building)g(pro)r(cedures)0 3540 -+y(for)e(the)h(resp)r(ectiv)n(e)f(options.)0 3756 y Fl(2.5.3)94 -+b(Installation)31 b(Options)0 3909 y Fn(The)d Fk(Makefile)c -+Fn(in)j(the)h(distribution)g(includes)f(sev)n(eral)f(switc)n(hes)h -+(that)h(can)f(b)r(e)h(used)f(to)h(con)n(trol)e(ho)n(w)h(Unison)g(is)g -+(built.)0 4009 y(Here)g(are)g(the)h(most)f(useful)h(ones:)125 -+4175 y Fj(\017)41 b Fn(Building)24 b(with)h Fk(NATIVE=true)20 -+b Fn(uses)k(the)g(nativ)n(e-co)r(de)g(OCaml)f(compiler,)i(yielding)f -+(an)g(executable)g(that)h(will)f(run)208 4275 y(quite)j(a)h(bit)g -+(faster.)36 b(W)-7 b(e)28 b(use)f(this)h(for)f(building)h(distribution) -+g(v)n(ersions.)125 4441 y Fj(\017)41 b Fn(Building)27 -+b(with)h Fk(make)42 b(DEBUGGING=true)22 b Fn(generates)k(debugging)h -+(sym)n(b)r(ols.)125 4607 y Fj(\017)41 b Fn(Building)33 -+b(with)h Fk(make)42 b(STATIC=true)29 b Fn(generates)j(a)h(\(mostly\))h -+(statically)f(link)n(ed)g(executable.)54 b(W)-7 b(e)34 -+b(use)g(this)g(for)208 4706 y(building)27 b(distribution)h(v)n -+(ersions,)e(for)h(p)r(ortabilit)n(y)-7 b(.)1929 5589 -+y(8)p eop -+%%Page: 9 9 -+9 8 bop 0 83 a Fm(3)135 b(T)-11 b(utorial)0 281 y Fh(3.1)112 -+b(Preliminaries)0 435 y Fn(Unison)28 b(can)f(b)r(e)h(used)f(with)h -+(either)g(of)f(t)n(w)n(o)g(user)g(in)n(terfaces:)101 -+601 y(1.)42 b(a)27 b(straigh)n(tforw)n(ard)d(textual)k(in)n(terface)f -+(and)101 767 y(2.)42 b(a)27 b(more)g(sophisticated)g(graphical)f(in)n -+(terface)0 933 y(The)21 b(textual)h(in)n(terface)e(is)i(more)e(con)n(v) -+n(enien)n(t)g(for)h(running)g(from)g(scripts)g(and)g(w)n(orks)e(on)i -+(dum)n(b)h(terminals;)h(the)f(graphical)0 1032 y(in)n(terface)27 -+b(is)g(b)r(etter)h(for)f(most)h(in)n(teractiv)n(e)e(use.)37 -+b(F)-7 b(or)27 b(this)h(tutorial,)f(y)n(ou)g(can)g(use)g(either.)125 -+1132 y(The)j(command-line)g(argumen)n(ts)f(to)h(b)r(oth)g(v)n(ersions)f -+(are)g(iden)n(tical.)45 b(The)30 b(graphical)f(v)n(ersion)g(can)h(b)r -+(e)g(run)g(directly)0 1232 y(b)n(y)i(clic)n(king)f(on)h(its)g(icon,)h -+(but)f(this)g(requires)f(a)h(little)g(set-up)g(\(see)g(Section)g(5.18)f -+([Clic)n(k-starting)f(Unison]\).)50 b(F)-7 b(or)32 b(this)0 -+1331 y(tutorial,)27 b(w)n(e)g(assume)g(that)h(y)n(ou're)e(starting)h -+(it)h(from)f(the)h(command)g(line.)125 1431 y(Unison)i(can)f(sync)n -+(hronize)g(\014les)h(and)g(directories)e(on)i(a)g(single)f(mac)n(hine,) -+i(or)e(b)r(et)n(w)n(een)h(t)n(w)n(o)f(mac)n(hines)h(on)f(net)n(w)n -+(ork.)0 1531 y(\(The)d(same)f(program)e(runs)i(on)g(b)r(oth)h(mac)n -+(hines;)f(the)h(only)f(di\013erence)g(is)g(whic)n(h)h(one)f(is)g(resp)r -+(onsible)g(for)f(displa)n(ying)h(the)0 1630 y(user)h(in)n(terface.\))36 -+b(If)27 b(y)n(ou're)e(only)h(in)n(terested)g(in)h(a)f(single-mac)n -+(hine)f(setup,)i(then)g(let's)f(call)g(that)h(mac)n(hine)f(the)h -+Fi(client)p Fn(.)37 b(If)0 1730 y(y)n(ou're)26 b(sync)n(hronizing)g(t)n -+(w)n(o)h(mac)n(hines,)g(let's)h(call)f(them)h Fi(client)g -+Fn(and)g Fi(server)p Fn(.)0 1962 y Fh(3.2)112 b(Lo)s(cal)38 -+b(Usage)0 2116 y Fn(Let's)28 b(get)f(the)h(clien)n(t)g(mac)n(hine)f -+(set)g(up)h(\014rst,)g(and)f(see)g(ho)n(w)g(to)h(sync)n(hronize)e(t)n -+(w)n(o)h(directories)f(on)h(a)g(single)g(mac)n(hine.)125 -+2215 y(F)-7 b(ollo)n(w)32 b(the)h(instructions)f(in)h(Section)g(2)g -+([Installation])f(to)h(either)g(do)n(wnload)e(or)h(build)i(an)e -+(executable)h(v)n(ersion)e(of)0 2315 y(Unison,)i(and)e(install)h(it)g -+(somewhere)e(on)h(y)n(our)g(searc)n(h)f(path.)49 b(\(If)32 -+b(y)n(ou)f(just)h(w)n(an)n(t)f(to)h(use)f(the)h(textual)g(user)f(in)n -+(terface,)0 2414 y(do)n(wnload)26 b(the)j(appropriate)d(textui)i -+(binary)-7 b(.)36 b(If)29 b(y)n(ou)e(just)h(w)n(an)n(t)f(to)h(the)g -+(graphical)e(in)n(terface|or)g(if)i(y)n(ou)f(will)h(use)g(b)r(oth)0 -+2514 y(in)n(terfaces)f([the)h(gtkui)f(binary)g(actually)g(has)g(b)r -+(oth)h(compiled)g(in]|then)g(do)n(wnload)e(the)i(gtkui)g(binary)-7 -+b(.\))125 2614 y(Create)26 b(a)h(small)h(test)g(directory)e -+Fk(a.tmp)g Fn(con)n(taining)g(a)h(couple)h(of)f(\014les)h(and/or)e(sub) -+r(directories,)g(e.g.,)305 2780 y Fk(mkdir)42 b(a.tmp)305 -+2879 y(touch)g(a.tmp/a)e(a.tmp/b)305 2979 y(mkdir)i(a.tmp/d)305 -+3079 y(touch)g(a.tmp/d/f)125 3245 y Fn(Cop)n(y)26 b(this)i(directory)f -+(to)g(b.tmp:)305 3411 y Fk(cp)43 b(-r)g(a.tmp)e(b.tmp)125 -+3577 y Fn(No)n(w)26 b(try)g(sync)n(hronizing)f Fk(a.tmp)g -+Fn(and)h Fk(b.tmp)p Fn(.)35 b(\(Since)27 b(they)g(are)f(iden)n(tical,)g -+(sync)n(hronizing)f(them)j(w)n(on't)e(propagate)0 3676 -+y(an)n(y)31 b(c)n(hanges,)h(but)g(Unison)g(will)g(remem)n(b)r(er)f(the) -+h(curren)n(t)f(state)h(of)g(b)r(oth)g(directories)f(so)g(that)h(it)g -+(will)g(b)r(e)g(able)g(to)g(tell)0 3776 y(next)c(time)g(what)f(has)h(c) -+n(hanged.\))36 b(T)n(yp)r(e:)305 3942 y Fk(unison)41 -+b(a.tmp)h(b.tmp)125 4158 y Fi(T)-6 b(extual)29 b(Interfac)l(e:)208 -+4324 y Fn(Y)-7 b(ou)30 b(should)g(see)g(a)g(message)f(notifying)h(y)n -+(ou)g(that)h(all)f(the)h(\014les)f(are)f(actually)h(equal)g(and)g(then) -+h(get)f(returned)g(to)208 4424 y(the)e(command)f(line.)125 -+4639 y Fi(Gr)l(aphic)l(al)32 b(Interfac)l(e:)208 4805 -+y Fn(Y)-7 b(ou)36 b(should)h(get)f(a)g(big)g(empt)n(y)h(windo)n(w)f -+(with)h(a)g(message)e(at)h(the)h(b)r(ottom)g(notifying)g(y)n(ou)e(that) -+i(all)g(\014les)f(are)208 4905 y(iden)n(tical.)g(Cho)r(ose)27 -+b(the)h(Exit)f(item)h(from)g(the)g(File)g(men)n(u)f(to)h(get)f(bac)n(k) -+g(to)g(the)h(command)f(line.)125 5071 y(Next,)h(mak)n(e)e(some)h(c)n -+(hanges)g(in)g(a.tmp)h(and/or)e(b.tmp.)38 b(F)-7 b(or)27 -+b(example:)1929 5589 y(9)p eop -+%%Page: 10 10 -+10 9 bop 349 83 a Fk(rm)42 b(a.tmp/a)349 183 y(echo)g("Hello")e(>)j -+(a.tmp/b)349 282 y(echo)f("Hello")e(>)j(b.tmp/b)349 382 -+y(date)f(>)h(b.tmp/c)349 482 y(echo)f("Hi)g(there")f(>)i(a.tmp/d/h)349 -+581 y(echo)f("Hello)f(there")g(>)i(b.tmp/d/h)125 747 -+y Fn(Run)28 b(Unison)f(again:)305 913 y Fk(unison)41 -+b(a.tmp)h(b.tmp)125 1079 y Fn(This)28 b(time,)i(the)f(user)f(in)n -+(terface)g(will)h(displa)n(y)f(only)h(the)g(\014les)g(that)g(ha)n(v)n -+(e)e(c)n(hanged.)40 b(If)29 b(a)f(\014le)h(has)f(b)r(een)i(mo)r -+(di\014ed)f(in)0 1179 y(just)d(one)g(replica,)f(then)h(it)g(will)g(b)r -+(e)g(displa)n(y)n(ed)e(with)j(an)e(arro)n(w)e(indicating)j(the)g -+(direction)f(that)h(the)g(c)n(hange)f(needs)g(to)h(b)r(e)0 -+1279 y(propagated.)35 b(F)-7 b(or)27 b(example,)741 1445 -+y Fk(<---)85 b(new)43 b(file)129 b(c)87 b([f])0 1611 -+y Fn(indicates)24 b(that)h(the)g(\014le)g Fk(c)g Fn(has)f(b)r(een)h(mo) -+r(di\014ed)g(only)f(in)h(the)g(second)f(replica,)h(and)f(that)h(the)g -+(default)g(action)f(is)h(therefore)0 1710 y(to)31 b(propagate)f(the)i -+(new)g(v)n(ersion)e(to)h(the)h(\014rst)f(replica.)48 -+b(T)-7 b(o)31 b Fl(f)p Fn(ollw)h(Unison's)f(recommendation,)g(press)g -+(the)h(\\f)6 b(")31 b(at)h(the)0 1810 y(prompt.)125 1910 -+y(If)e(b)r(oth)g(replicas)f(are)g(mo)r(di\014ed)h(and)g(their)g(con)n -+(ten)n(ts)f(are)g(di\013eren)n(t,)i(then)f(the)g(c)n(hanges)f(are)g(in) -+h(con\015ict:)41 b Fk(<-?->)28 b Fn(is)0 2009 y(displa)n(y)n(ed)f(to)g -+(indicate)h(that)g(Unison)f(needs)g(guidance)g(on)h(whic)n(h)f(replica) -+g(should)g(o)n(v)n(erride)f(the)i(other.)218 2175 y Fk(new)42 -+b(file)86 b(<-?->)f(new)42 b(file)129 b(d/h)86 b([])125 -+2341 y Fn(By)27 b(default,)h(neither)g(v)n(ersion)e(will)h(b)r(e)h -+(propagated)e(and)i(b)r(oth)g(replicas)e(will)i(remain)f(as)g(they)h -+(are.)125 2441 y(If)34 b(b)r(oth)h(replicas)e(ha)n(v)n(e)g(b)r(een)i -+(mo)r(di\014ed)f(but)h(their)f(new)g(con)n(ten)n(ts)g(are)f(the)i(same) -+e(\(as)h(with)h(the)f(\014le)h Fk(b)p Fn(\),)h(then)e(no)0 -+2540 y(propagation)25 b(is)j(necessary)e(and)h(nothing)h(is)f(sho)n -+(wn.)36 b(Unison)28 b(simply)f(notes)h(that)g(the)g(\014le)f(is)h(up)g -+(to)f(date.)125 2640 y(These)f(displa)n(y)g(con)n(v)n(en)n(tions)f(are) -+h(used)h(b)n(y)g(b)r(oth)g(v)n(ersions)e(of)i(the)g(user)g(in)n -+(terface.)36 b(The)26 b(only)h(di\013erence)g(lies)g(in)g(the)0 -+2740 y(w)n(a)n(y)f(in)i(whic)n(h)g(Unison's)f(default)h(actions)f(are)g -+(either)g(accepted)g(or)g(o)n(v)n(erriden)f(b)n(y)h(the)h(user.)125 -+2889 y Fi(T)-6 b(extual)29 b(Interfac)l(e:)208 3055 y -+Fn(The)e(status)h(of)g(eac)n(h)f(mo)r(di\014ed)h(\014le)g(is)f(displa)n -+(y)n(ed,)g(in)h(turn.)38 b(When)28 b(the)g(copies)f(of)h(a)f(\014le)h -+(in)g(the)g(t)n(w)n(o)f(replicas)g(are)208 3155 y(not)k(iden)n(tical,)h -+(the)f(user)g(in)n(terface)g(will)g(ask)f(for)h(instructions)g(as)g(to) -+g(ho)n(w)f(to)h(propagate)f(the)h(c)n(hange.)47 b(If)32 -+b(some)208 3254 y(default)e(action)g(is)h(indicated)f(\(b)n(y)h(an)f -+(arro)n(w\),)f(y)n(ou)h(can)g(simply)g(press)g(Return)g(to)h(go)e(on)h -+(to)h(the)f(next)h(c)n(hanged)208 3354 y(\014le.)51 b(If)33 -+b(y)n(ou)f(w)n(an)n(t)g(to)g(do)g(something)g(di\013eren)n(t)h(with)g -+(this)g(\014le,)h(press)d(\\)p Fk(<)p Fn(")g(or)h(\\)p -+Fk(>)p Fn(")f(to)h(force)g(the)h(c)n(hange)e(to)i(b)r(e)208 -+3454 y(propagated)e(from)i(righ)n(t)g(to)g(left)i(or)d(from)h(left)h -+(to)g(righ)n(t,)g(or)e(else)i(press)e(\\)p Fk(/)p Fn(")g(to)i(skip)f -+(this)h(\014le)f(and)h(lea)n(v)n(e)e(b)r(oth)208 3553 -+y(replicas)24 b(alone.)36 b(When)26 b(it)h(reac)n(hes)d(the)i(end)g(of) -+g(the)g(list)h(of)e(mo)r(di\014ed)i(\014les,)f(Unison)g(will)g(ask)f(y) -+n(ou)g(one)g(more)h(time)208 3653 y(whether)h(it)h(should)f(pro)r(ceed) -+g(with)h(the)g(up)r(dates)g(that)g(ha)n(v)n(e)f(b)r(een)h(selected.)208 -+3786 y(When)35 b(Unison)g(stops)f(to)h(w)n(ait)f(for)h(input)h(from)e -+(the)h(user,)i(pressing)c(\\)p Fk(?)p Fn(")h(will)h(alw)n(a)n(ys)e(giv) -+n(e)h(a)g(list)i(of)e(p)r(ossible)208 3885 y(resp)r(onses)26 -+b(and)h(their)h(meanings.)125 4101 y Fi(Gr)l(aphic)l(al)k(Interfac)l -+(e:)208 4267 y Fn(The)27 b(main)h(windo)n(w)g(sho)n(ws)e(all)i(the)g -+(\014les)g(that)g(ha)n(v)n(e)f(b)r(een)h(mo)r(di\014ed)g(in)g(either)g -+Fk(a.tmp)e Fn(or)h Fk(b.tmp)p Fn(.)35 b(T)-7 b(o)28 b(o)n(v)n(erride)d -+(a)208 4367 y(default)30 b(action)g(\(or)g(to)g(select)h(an)f(action)g -+(in)g(the)h(case)f(when)g(there)g(is)h(no)f(default\),)i(\014rst)e -+(select)g(the)h(\014le,)g(either)208 4467 y(b)n(y)d(clic)n(king)f(on)h -+(its)h(name)f(or)f(b)n(y)h(using)g(the)h(up-)f(and)g(do)n(wn-arro)n(w)e -+(k)n(eys.)38 b(Then)28 b(press)g(either)g(the)h(left-arro)n(w)d(or)208 -+4566 y(\\)p Fk(<)p Fn(")k(k)n(ey)h(\(to)h(cause)f(the)i(v)n(ersion)d -+(in)i(a.tmp)g(to)g(propagate)e(to)i(b.tmp\))g(or)f(the)i(righ)n(t-arro) -+n(w)28 b(or)j(\\)p Fk(>)p Fn(")g(k)n(ey)g(\(whic)n(h)208 -+4666 y(mak)n(es)26 b(the)i(b.tmp)h(v)n(ersion)d(o)n(v)n(erride)f -+(a.tmp\).)208 4799 y(Ev)n(ery)h(k)n(eyb)r(oard)g(command)h(can)h(also)e -+(b)r(e)i(in)n(v)n(ok)n(ed)f(from)g(the)h(men)n(us)g(at)g(the)g(top)g -+(of)f(the)i(user)e(in)n(terface.)36 b(\(Con-)208 4898 -+y(v)n(ersely)-7 b(,)26 b(eac)n(h)h(men)n(u)g(item)h(is)g(annotated)f -+(with)h(its)g(k)n(eyb)r(oard)e(equiv)-5 b(alen)n(t,)27 -+b(if)h(it)g(has)f(one.\))208 5031 y(When)21 b(y)n(ou)g(are)f -+(satis\014ed)h(with)h(the)g(directions)e(for)h(the)h(propagation)d(of)i -+(c)n(hanges)f(as)g(sho)n(wn)h(in)h(the)f(main)h(windo)n(w,)208 -+5131 y(clic)n(k)33 b(the)h(\\Go")f(button)h(to)g(set)g(them)g(in)g -+(motion.)56 b(A)34 b(c)n(hec)n(k)f(sign)g(will)h(b)r(e)h(displa)n(y)n -+(ed)d(next)i(to)g(eac)n(h)f(\014lename)208 5230 y(when)27 -+b(the)h(\014le)g(has)f(b)r(een)h(dealt)g(with.)1908 5589 -+y(10)p eop -+%%Page: 11 11 -+11 10 bop 0 83 a Fh(3.3)112 b(Remote)37 b(Usage)0 236 -+y Fn(Next,)28 b(w)n(e'll)f(get)h(Unison)f(set)h(up)g(to)f(sync)n -+(hronize)f(replicas)h(on)g(t)n(w)n(o)g(di\013eren)n(t)h(mac)n(hines.) -+125 336 y(F)-7 b(ollo)n(w)28 b(the)h(instructions)g(in)g(the)g -+(Installation)g(section)f(to)h(do)n(wnload)f(or)g(build)h(an)g -+(executable)g(v)n(ersion)e(of)i(Unison)0 436 y(on)d(the)g(serv)n(er)e -+(mac)n(hine,)i(and)g(install)g(it)h(somewhere)e(on)g(y)n(our)g(searc)n -+(h)g(path.)36 b(\(It)27 b(do)r(esn't)f(matter)g(whether)g(y)n(ou)f -+(install)0 535 y(the)35 b(textual)f(or)f(graphical)g(v)n(ersion,)i -+(since)f(the)g(cop)n(y)g(of)g(Unison)g(on)g(the)h(serv)n(er)e(do)r -+(esn't)h(need)g(to)h(displa)n(y)e(an)n(y)h(user)0 635 -+y(in)n(terface)27 b(at)g(all.\))125 734 y(It)j(is)g(imp)r(ortan)n(t)f -+(that)i(the)f(v)n(ersion)f(of)h(Unison)f(installed)h(on)g(the)h(serv)n -+(er)d(mac)n(hine)h(is)h(the)h(same)e(as)g(the)i(v)n(ersion)d(of)0 -+834 y(Unison)23 b(on)g(the)h(clien)n(t)f(mac)n(hine.)35 -+b(But)24 b(some)e(\015exibilit)n(y)i(on)f(the)g(v)n(ersion)f(of)h -+(Unison)g(at)h(the)f(clien)n(t)h(side)f(can)g(b)r(e)g(ac)n(hiev)n(ed)0 -+934 y(b)n(y)k(using)h(the)g Fk(-addversionno)22 b Fn(option;)27 -+b(see)g(Section)h(5.4)f([Preferences].)125 1033 y(No)n(w)e(there)h(is)f -+(a)h(decision)f(to)h(b)r(e)h(made.)36 b(Unison)25 b(pro)n(vides)g(t)n -+(w)n(o)g(metho)r(ds)h(for)g(comm)n(unicating)f(b)r(et)n(w)n(een)h(the)g -+(clien)n(t)0 1133 y(and)h(the)h(serv)n(er:)125 1290 y -+Fj(\017)41 b Fi(R)l(emote)29 b(shel)t(l)i(metho)l(d)p -+Fn(:)37 b(T)-7 b(o)28 b(use)f(this)h(metho)r(d,)g(y)n(ou)f(m)n(ust)g -+(ha)n(v)n(e)g(some)g(w)n(a)n(y)f(of)h(in)n(v)n(oking)g(remote)f -+(commands)h(on)208 1390 y(the)k(serv)n(er)f(from)h(the)g(clien)n(t's)h -+(command)f(line,)h(using)f(a)g(facilit)n(y)g(suc)n(h)g(as)g -+Fk(ssh)f Fn(or)h Fk(rsh)p Fn(.)47 b(This)31 b(metho)r(d)h(is)f(more)208 -+1489 y(con)n(v)n(enien)n(t)26 b(\(since)i(there)g(is)g(no)f(need)h(to)g -+(man)n(ually)f(start)g(a)g(\\unison)g(serv)n(er")f(pro)r(cess)h(on)g -+(the)h(serv)n(er\))f(and)g(also)208 1589 y(more)f(secure)h(\(esp)r -+(ecially)g(if)i(y)n(ou)d(use)i Fk(ssh)p Fn(\).)125 1750 -+y Fj(\017)41 b Fi(So)l(cket)29 b(metho)l(d)p Fn(:)37 -+b(This)27 b(metho)r(d)g(requires)f(only)g(that)h(y)n(ou)f(can)h(get)f -+(TCP)h(pac)n(k)n(ets)e(from)i(the)g(clien)n(t)g(to)g(the)g(serv)n(er) -+208 1850 y(and)g(bac)n(k.)36 b(A)28 b(draconian)e(\014rew)n(all)g(can)i -+(prev)n(en)n(t)e(this,)i(but)h(otherwise)d(it)i(should)g(w)n(ork)e(an)n -+(ywhere.)125 2007 y(Decide)21 b(whic)n(h)f(of)h(these)g(y)n(ou)f(w)n -+(an)n(t)g(to)g(try)-7 b(,)22 b(and)f(con)n(tin)n(ue)f(with)h(Section)g -+(3.4)e([Remote)i(Shell)g(Metho)r(d])g(or)f(Section)h(3.5)0 -+2106 y([So)r(c)n(k)n(et)27 b(Metho)r(d],)h(as)f(appropriate.)0 -+2337 y Fh(3.4)112 b(Remote)37 b(Shell)f(Metho)s(d)0 2490 -+y Fn(The)25 b(standard)g(remote)f(shell)i(facilit)n(y)f(on)g(Unix)g -+(systems)g(is)h Fk(rsh)p Fn(.)34 b(A)26 b(drop-in)f(replacemen)n(t)f -+(for)h Fk(rsh)f Fn(is)h Fk(ssh)p Fn(,)g(whic)n(h)g(pro-)0 -+2590 y(vides)18 b(the)h(same)f(functionalit)n(y)g(but)h(m)n(uc)n(h)f(b) -+r(etter)h(securit)n(y)-7 b(.)33 b(\(Ssh)19 b(is)f(a)n(v)-5 -+b(ailable)17 b(from)h Fk(ftp://ftp.cs.hut)o(.fi)o(/p)o(ub/)o(ss)o(h/)o -+Fn(;)0 2689 y(up-to-date)k(binaries)f(for)h(some)g(arc)n(hitectures)f -+(can)h(also)g(b)r(e)g(found)h(at)f Fk(ftp://ftp.faqs.or)o(g/s)o(sh)o -+(/co)o(nt)o(ri)o(b)p Fn(.)29 b(See)23 b(sec-)0 2789 y(tion)i(A.2)f(for) -+g(installation)g(instructions)g(for)g(the)h(Windo)n(ws)g(v)n(ersion.\)) -+34 b(Both)25 b Fk(rsh)e Fn(and)i Fk(ssh)e Fn(require)g(some)h(co)r -+(ordination)0 2889 y(b)r(et)n(w)n(een)33 b(the)g(clien)n(t)f(and)h -+(serv)n(er)d(mac)n(hines)i(to)h(establish)f(that)h(the)g(clien)n(t)f -+(is)h(allo)n(w)n(ed)e(to)h(in)n(v)n(ok)n(e)f(commands)h(on)h(the)0 -+2988 y(serv)n(er;)24 b(please)h(refer)g(to)g(the)h Fk(rsh)e -+Fn(or)h Fk(ssh)f Fn(do)r(cumen)n(tation)h(for)g(information)g(on)g(ho)n -+(w)g(to)g(set)g(this)h(up.)37 b(The)25 b(examples)g(in)0 -+3088 y(this)j(section)f(use)h Fk(ssh)p Fn(,)e(but)i(y)n(ou)f(can)g -+(substitute)i Fk(rsh)d Fn(for)h Fk(ssh)g Fn(if)h(y)n(ou)e(wish.)125 -+3188 y(First,)h(test)h(that)g(w)n(e)f(can)g(in)n(v)n(ok)n(e)f(Unison)i -+(on)f(the)h(serv)n(er)e(from)h(the)h(clien)n(t.)37 b(T)n(yping)349 -+3345 y Fk(ssh)42 b Fb(remotehostname)52 b Fk(unison)41 -+b(-version)0 3502 y Fn(should)27 b(prin)n(t)h(the)g(same)f(v)n(ersion)f -+(information)h(as)g(running)349 3658 y Fk(unison)41 b(-version)125 -+3815 y Fn(lo)r(cally)26 b(on)h(the)h(clien)n(t.)37 b(If)28 -+b(remote)f(execution)g(fails,)g(then)h(either)f(something)g(is)g(wrong) -+f(with)i(y)n(our)e(ssh)h(setup)h(\(e.g.,)0 3915 y(\\p)r(ermission)36 -+b(denied"\))h(or)f(else)h(the)g(searc)n(h)e(path)j(that's)f(b)r(eing)g -+(used)g(when)g(executing)g(commands)f(on)h(the)g(serv)n(er)0 -+4015 y(do)r(esn't)28 b(con)n(tain)f(the)h Fk(unison)d -+Fn(executable)i(\(e.g.,)h(\\command)e(not)i(found"\).)125 -+4114 y(Create)e(a)h(test)h(directory)f Fk(a.tmp)e Fn(in)j(y)n(our)e -+(home)i(directory)e(on)h(the)h(clien)n(t)g(mac)n(hine.)125 -+4214 y(T)-7 b(est)27 b(that)h(the)g(lo)r(cal)f(unison)g(clien)n(t)h -+(can)f(start)g(and)h(connect)f(to)h(the)g(remote)f(serv)n(er.)35 -+b(T)n(yp)r(e)436 4371 y Fk(unison)41 b(-testServer)e(a.tmp)j(ssh://)p -+Fb(remotehos)o(tn)o(ame)8 b Fk(/a.tmp)125 4528 y Fn(No)n(w)27 -+b(cd)g(to)h(y)n(our)e(home)i(directory)e(and)h(t)n(yp)r(e:)436 -+4685 y Fk(unison)41 b(a.tmp)g(ssh://remotehostn)o(ame)o(/a)o(.tm)o(p) -+125 4842 y Fn(The)23 b(result)g(should)f(b)r(e)i(that)f(the)h(en)n -+(tire)f(directory)f Fk(a.tmp)f Fn(is)i(propagated)e(from)i(the)g(clien) -+n(t)h(to)f(y)n(our)e(home)i(directory)0 4941 y(on)k(the)h(serv)n(er.) -+125 5041 y(After)h(\014nishing)f(the)h(\014rst)g(sync)n(hronization,)e -+(c)n(hange)g(a)i(few)g(\014les)f(and)h(try)f(sync)n(hronizing)f(again.) -+39 b(Y)-7 b(ou)29 b(should)f(see)0 5141 y(similar)f(results)g(as)g(in)h -+(the)g(lo)r(cal)f(case.)125 5240 y(If)h(y)n(our)e(user)h(name)g(on)g -+(the)h(serv)n(er)e(is)h(not)h(the)g(same)f(as)g(on)g(the)h(clien)n(t,)g -+(y)n(ou)e(need)i(to)f(sp)r(ecify)h(it)g(on)g(the)f(command)0 -+5340 y(line:)1908 5589 y(11)p eop -+%%Page: 12 12 -+12 11 bop 436 83 a Fk(unison)41 b(a.tmp)g(ssh://username@re)o(mot)o(eh) -+o(ost)o(na)o(me)o(/a.)o(tm)o(p)0 249 y Fi(Notes:)125 -+415 y Fj(\017)g Fn(If)26 b(y)n(ou)f(w)n(an)n(t)g(to)g(put)i -+Fk(a.tmp)c Fn(some)j(place)f(other)g(than)h(y)n(our)e(home)i(directory) -+e(on)i(the)g(remote)f(host,)h(y)n(ou)f(can)g(giv)n(e)208 -+515 y(an)31 b(absolute)h(path)g(for)f(it)i(b)n(y)e(adding)h(an)g(extra) -+f(slash)g(b)r(et)n(w)n(een)h Fk(remotehostname)26 b Fn(and)32 -+b(the)h(b)r(eginning)f(of)g(the)208 614 y(path:)643 814 -+y Fk(unison)42 b(a.tmp)f(ssh://remotehost)o(nam)o(e/)o(/ab)o(so)o(lu)o -+(te/)o(pa)o(th/)o(to)o(/a)o(.tm)o(p)125 1013 y Fj(\017)g -+Fn(Y)-7 b(ou)27 b(can)h(giv)n(e)f(an)g(explicit)i(path)f(for)f(the)h -+Fk(unison)e Fn(executable)h(on)h(the)g(serv)n(er)e(b)n(y)i(using)f(the) -+h(command-line)g(op-)208 1112 y(tion)34 b Fk(-servercmd)39 -+b(/full/path/name/)o(of/)o(un)o(iso)o(n)28 b Fn(or)33 -+b(adding)g Fk(servercmd=/full/p)o(ath)o(/n)o(ame)o(/o)o(f/)o(uni)o(so)o -+(n)208 1212 y Fn(to)28 b(y)n(our)f(pro\014le)g(\(see)h(Section)g(5.5)g -+([Pro\014le]\).)37 b(Similarly)-7 b(,)28 b(y)n(ou)g(can)g(sp)r(ecify)g -+(a)g(explicit)g(path)h(for)e(the)i Fk(rsh)e Fn(or)g Fk(ssh)208 -+1312 y Fn(program)e(using)i(the)h(option)g Fk(-rshcmd)c -+Fn(or)j Fk(-sshcmd)p Fn(.)0 1544 y Fh(3.5)112 b(So)s(c)m(k)m(et)38 -+b(Metho)s(d)0 1697 y Fn(T)-7 b(o)34 b(run)g(Unison)g(o)n(v)n(er)e(a)i -+(so)r(c)n(k)n(et)f(connection,)i(y)n(ou)f(m)n(ust)g(start)g(a)f(Unison) -+h(\\daemon")f(pro)r(cess)g(on)h(the)g(serv)n(er.)55 b(This)0 -+1797 y(pro)r(cess)27 b(runs)h(con)n(tin)n(uously)-7 b(,)27 -+b(w)n(aiting)g(for)h(connections)f(o)n(v)n(er)f(a)i(giv)n(en)f(so)r(c)n -+(k)n(et)g(from)h(clien)n(t)g(mac)n(hines)f(running)h(Unison)0 -+1897 y(and)f(pro)r(cessing)g(their)g(requests)g(in)h(turn.)208 -+2079 y Fl(W)-8 b(arning:)45 b Fn(The)32 b(so)r(c)n(k)n(et)g(metho)r(d)g -+(is)g(insecure:)46 b(not)32 b(only)g(are)f(the)i(texts)f(of)h(y)n(our)e -+(c)n(hanges)f(transmitted)208 2179 y(o)n(v)n(er)f(the)k(net)n(w)n(ork)d -+(in)i(unprotected)f(form,)i(it)f(is)g(also)e(p)r(ossible)i(for)f(an)n -+(y)n(one)f(in)i(the)g(w)n(orld)f(to)g(connect)h(to)208 -+2279 y(the)26 b(serv)n(er)f(pro)r(cess)g(and)h(read)f(out)i(the)f(con)n -+(ten)n(ts)g(of)g(y)n(our)f(\014lesystem!)36 b(\(Of)27 -+b(course,)e(to)h(do)g(this)h(they)f(m)n(ust)208 2378 -+y(understand)d(the)h(proto)r(col)e(that)i(Unison)f(uses)g(to)h(comm)n -+(unicate)f(b)r(et)n(w)n(een)g(clien)n(t)h(and)f(serv)n(er,)g(but)h(all) -+f(they)208 2478 y(need)k(for)g(this)h(is)g(a)f(cop)n(y)g(of)g(the)h -+(Unison)g(sources.\))125 2660 y(T)-7 b(o)27 b(start)g(the)h(daemon,)f -+(t)n(yp)r(e)305 2826 y Fk(unison)41 b(-socket)g(NNNN)125 -+2993 y Fn(on)23 b(the)g(serv)n(er)f(mac)n(hine,)i(where)e -+Fk(NNNN)g Fn(is)h(the)h(so)r(c)n(k)n(et)e(n)n(um)n(b)r(er)h(that)h(the) -+g(daemon)e(should)h(listen)h(on)f(for)g(connections)0 -+3092 y(from)f(clien)n(ts.)35 b(\()p Fk(NNNN)21 b Fn(can)h(b)r(e)h(an)n -+(y)e(large)g(n)n(um)n(b)r(er)h(that)h(is)f(not)g(b)r(eing)h(used)f(b)n -+(y)g(some)g(other)f(program;)h(if)30 b Fk(NNNN)20 b Fn(is)j(already)0 -+3192 y(in)30 b(use,)h(Unison)f(will)h(exit)f(with)g(an)g(error)f -+(message.\))43 b(Note)30 b(that)h(paths)f(sp)r(eci\014ed)g(b)n(y)g(the) -+g(clien)n(t)h(will)f(b)r(e)h(in)n(terpreted)0 3291 y(relativ)n(e)f(to)g -+(the)h(directory)f(in)h(whic)n(h)g(y)n(ou)e(start)i(the)g(serv)n(er)e -+(pro)r(cess;)i(this)g(b)r(eha)n(vior)e(is)i(di\013eren)n(t)g(from)f -+(the)h(ssh)g(case,)0 3391 y(where)c(the)h(path)g(is)f(relativ)n(e)g(to) -+g(y)n(our)f(home)i(directory)e(on)h(the)h(serv)n(er.)125 -+3491 y(Create)e(a)h(test)h(directory)f Fk(a.tmp)e Fn(in)j(y)n(our)e -+(home)i(directory)e(on)h(the)h(clien)n(t)g(mac)n(hine.)37 -+b(No)n(w)27 b(t)n(yp)r(e:)305 3657 y Fk(unison)41 b(a.tmp)h(socket://)p -+Fb(remoteh)o(os)o(tn)o(ame)8 b Fk(:NNNN/a.tmp)0 3823 -+y Fn(The)37 b(result)f(should)g(b)r(e)h(that)g(the)g(en)n(tire)f -+(directory)f Fk(a.tmp)f Fn(is)j(propagated)d(from)i(the)h(clien)n(t)g -+(to)f(the)h(serv)n(er)e(\()p Fk(a.tmp)0 3922 y Fn(will)g(b)r(e)g -+(created)f(on)h(the)g(serv)n(er)e(in)i(the)g(directory)f(that)h(the)g -+(serv)n(er)e(w)n(as)h(started)g(from\).)59 b(After)35 -+b(\014nishing)g(the)g(\014rst)0 4022 y(sync)n(hronization,)22 -+b(c)n(hange)h(a)g(few)g(\014les)h(and)f(try)g(sync)n(hronizing)f -+(again.)34 b(Y)-7 b(ou)24 b(should)f(see)g(similar)g(results)f(as)h(in) -+h(the)g(lo)r(cal)0 4122 y(case.)0 4354 y Fh(3.6)112 b(Using)37 -+b(Unison)h(for)f(All)f(Y)-9 b(our)36 b(Files)0 4507 y -+Fn(Once)j(y)n(ou)g(are)f(comfortable)h(with)h(the)g(basic)e(op)r -+(eration)h(of)g(Unison,)k(y)n(ou)38 b(ma)n(y)h(\014nd)h(y)n(ourself)e -+(w)n(an)n(ting)h(to)g(use)h(it)0 4607 y(regularly)26 -+b(to)h(sync)n(hronize)f(y)n(our)h(commonly)g(used)g(\014les.)37 -+b(There)27 b(are)g(sev)n(eral)e(p)r(ossible)j(w)n(a)n(ys)e(of)h(going)g -+(ab)r(out)g(this:)101 4790 y(1.)42 b(Sync)n(hronize)31 -+b(y)n(our)f(whole)i(home)g(directory)-7 b(,)32 b(using)g(the)h(Ignore)d -+(facilit)n(y)i(\(see)g(Section)h(5.12)d([Ignore]\))i(to)g(a)n(v)n(oid) -+208 4889 y(sync)n(hronizing)25 b(temp)r(orary)i(\014les)g(and)h(things) -+f(that)h(only)f(b)r(elong)h(on)f(one)g(host.)101 5055 -+y(2.)42 b(Create)28 b(a)i(sub)r(directory)e(called)i -+Fk(shared)d Fn(\(or)i Fk(current)p Fn(,)f(or)h(whatev)n(er\))f(in)i(y)n -+(our)f(home)g(directory)g(on)g(eac)n(h)g(host,)208 5155 -+y(and)e(put)h(all)g(the)f(\014les)h(y)n(ou)f(w)n(an)n(t)g(to)g(sync)n -+(hronize)f(in)n(to)i(this)g(directory)-7 b(.)1908 5589 -+y(12)p eop -+%%Page: 13 13 -+13 12 bop 101 83 a Fn(3.)42 b(Create)28 b(a)i(sub)r(directory)e(called) -+i Fk(shared)d Fn(\(or)i Fk(current)p Fn(,)f(or)h(whatev)n(er\))f(in)i -+(y)n(our)f(home)g(directory)g(on)g(eac)n(h)g(host,)208 -+183 y(and)22 b(put)i Fi(links)h(to)e Fn(all)g(the)g(\014les)g(y)n(ou)f -+(w)n(an)n(t)g(to)h(sync)n(hronize)e(in)n(to)i(this)g(directory)-7 -+b(.)34 b(Use)23 b(the)g Fk(follow)d Fn(preference)i(\(see)208 -+282 y(Section)27 b(5.13)f([Sym)n(b)r(olic)i(Links]\))g(to)f(mak)n(e)g -+(sure)g(that)h(all)f(these)h(links)f(are)g(treated)g(transparen)n(tly)f -+(b)n(y)h(Unison.)101 448 y(4.)42 b(Mak)n(e)29 b(y)n(our)g(home)h -+(directory)f(the)i(ro)r(ot)e(of)h(the)h(sync)n(hronization,)e(but)i -+(tell)g(Unison)f(to)g(sync)n(hronize)f(only)h(some)208 -+548 y(of)g(the)h(\014les)f(and)g(sub)r(directories)f(within)j(it.)45 -+b(This)31 b(can)f(b)r(e)g(accomplished)g(b)n(y)g(using)g(the)h -+Fk(-path)d Fn(switc)n(h)j(on)f(the)208 648 y(command)d(line:)513 -+847 y Fk(unison)41 b(/home/)p Fb(username)52 b Fk(ssh://)p -+Fb(remotehost)8 b Fk(//home/)p Fb(username)52 b Fk(-path)41 -+b(shared)208 1046 y Fn(The)27 b Fk(-path)e Fn(option)i(can)g(b)r(e)h -+(used)f(as)g(man)n(y)g(times)g(as)g(needed,)h(to)f(sync)n(hronize)f -+(sev)n(eral)f(\014les)j(or)e(sub)r(directories:)513 1245 -+y Fk(unison)41 b(/home/)p Fb(username)52 b Fk(ssh://)p -+Fb(remotehost)8 b Fk(//home/)p Fb(username)52 b Fk(\\)643 -+1345 y(-path)42 b(shared)f(\\)643 1445 y(-path)h(pub)g(\\)643 -+1544 y(-path)g(.netscape/bookma)o(rk)o(s.h)o(tm)o(l)208 -+1743 y Fn(These)32 b Fk(-path)g Fn(argumen)n(ts)f(can)i(also)f(b)r(e)i -+(put)g(in)f(y)n(our)f(preference)h(\014le.)53 b(See)34 -+b(Section)f(5.4)f([Preferences])g(for)g(an)208 1843 y(example.)125 -+2026 y(When)f(y)n(ou)e(sync)n(hronize)g(a)i(large)e(directory)g -+(structure)h(\(e.g.)46 b(y)n(our)29 b(home)h(directory\))g(for)g(the)h -+(\014rst)f(time,)i(Unison)0 2125 y(will)g(need)h(to)f(sp)r(end)g(a)g -+(lot)g(of)g(time)h(w)n(alking)e(o)n(v)n(er)f(all)i(the)h(\014les)f(and) -+g(building)g(its)h(in)n(ternal)e(data)h(structures.)50 -+b(Y)-7 b(ou'll)0 2225 y(probably)32 b(sa)n(v)n(e)f(time)i(if)g(y)n(ou)f -+(start)h(o\013)f(fo)r(cusing)h(Unison's)f(atten)n(tion)h(on)g(just)g(a) -+f(subset)h(of)g(y)n(our)e(\014les,)j(b)n(y)f(including)0 -+2325 y(the)26 b(option)f Fk(-path)41 b Fi(some/smal)t(l/sub)l(dir)l(e)l -+(ctory)29 b Fn(on)c(the)h(command)f(line.)36 b(When)26 -+b(this)g(is)f(w)n(orking)e(to)j(y)n(our)e(satisfaction,)0 -+2424 y(tak)n(e)j(a)n(w)n(a)n(y)e(the)j Fk(-path)e Fn(option)h(and)h(go) -+e(get)i(lunc)n(h)g(while)f(Unison)h(w)n(orks.)125 2524 -+y(If)h(y)n(our)f(replicas)g(are)g(large)f(and)i(at)g(least)f(one)h(of)g -+(them)g(is)g(on)g(a)f(Windo)n(ws)h(system,)g(y)n(ou)f(ma)n(y)h(\014nd)g -+(that)g(Unison's)0 2623 y(default)d(metho)r(d)f(for)g(detecting)g(c)n -+(hanges)f(\(whic)n(h)h(in)n(v)n(olv)n(es)e(scanning)i(the)g(full)h(con) -+n(ten)n(ts)f(of)g(ev)n(ery)e(\014le)j(on)f(ev)n(ery)e(sync|)0 -+2723 y(the)i(only)g(completely)g(safe)f(w)n(a)n(y)g(to)g(do)h(it)g -+(under)g(Windo)n(ws\))g(is)g(to)r(o)f(slo)n(w.)35 b(In)26 -+b(this)f(case,)f(y)n(ou)g(ma)n(y)h(b)r(e)g(in)n(terested)g(in)g(the)0 -+2823 y Fk(fastcheck)f Fn(preference,)j(do)r(cumen)n(ted)h(in)g(Section) -+f(5.17)f([F)-7 b(ast)28 b(Up)r(date)g(Chec)n(king].)125 -+2922 y(Most)33 b(p)r(eople)g(\014nd)h(that)g(they)g(only)f(need)h(to)f -+(main)n(tain)g(a)g(pro\014le)g(\(or)g(pro\014les\))g(on)g(one)h(of)f -+(the)h(hosts)f(that)h(they)0 3022 y(sync)n(hronize,)27 -+b(since)i(Unison)f(is)h(alw)n(a)n(ys)d(initiated)j(from)g(this)g(host.) -+39 b(\(F)-7 b(or)28 b(example,)h(if)g(y)n(ou're)e(sync)n(hronizing)g(a) -+h(laptop)0 3122 y(with)33 b(a)e(\014leserv)n(er,)h(y)n(ou'll)f -+(probably)g(alw)n(a)n(ys)f(run)i(Unison)g(on)g(the)g(laptop.\))51 -+b(This)32 b(is)g(a)f(bit)i(di\013eren)n(t)f(from)g(the)g(usual)0 -+3221 y(situation)27 b(with)h(asymmetric)f(mirroring)f(programs)f(lik)n -+(e)i Fk(rdist)p Fn(,)f(where)h(the)h(mirroring)d(op)r(eration)i(t)n -+(ypically)g(needs)g(to)0 3321 y(b)r(e)d(initiated)g(from)f(the)h(mac)n -+(hine)e(with)i(the)g(most)f(recen)n(t)g(c)n(hanges.)34 -+b(Section)24 b(5.5)e([Pro\014le])g(co)n(v)n(ers)g(the)h(syn)n(tax)g(of) -+g(Unison)0 3421 y(pro\014les,)k(together)f(with)j(some)e(sample)g -+(pro\014les.)0 3653 y Fh(3.7)112 b(Going)37 b(F)-9 b(urther)0 -+3806 y Fn(On-line)27 b(do)r(cumen)n(tation)h(for)f(the)h(v)-5 -+b(arious)26 b(features)h(of)g(Unison)h(can)f(b)r(e)h(obtained)g(either) -+f(b)n(y)g(t)n(yping)349 3972 y Fk(unison)41 b(-doc)h(topics)0 -+4138 y Fn(at)26 b(the)g(command)f(line,)i(or)d(b)n(y)i(selecting)f(the) -+h(Help)h(men)n(u)f(in)g(the)g(graphical)e(user)h(in)n(terface.)36 -+b(The)25 b(on-line)h(information)0 4238 y(is)h(essen)n(tially)g(iden)n -+(tical)g(to)h(this)g(man)n(ual.)125 4337 y(There)f(are)f(t)n(w)n(o)h -+(email)g(lists)h(for)f(users)g(of)g(unison.)37 b(Visit)208 -+4504 y Fk(http://www.cis.)o(upe)o(nn)o(.e)o(du/)o Fj(\030)p -+Fk(b)o(cpi)o(er)o(ce)o(/un)o(is)o(on/)o(do)o(wnl)o(oa)o(d.)o(htm)o(l)0 -+4670 y Fn(for)27 b(more)g(details.)1908 5589 y(13)p eop -+%%Page: 14 14 -+14 13 bop 0 83 a Fm(4)135 b(Basic)45 b(Concepts)0 265 -+y Fn(Unison)22 b(deals)g(in)h(a)f(few)h(straigh)n(tforw)n(ard)d -+(concepts.)34 b(\(A)24 b(more)d(mathematical)h(dev)n(elopmen)n(t)g(of)h -+(these)f(concepts)h(can)f(b)r(e)0 364 y(found)g(in)h(\\)p -+Fi(What)h(is)h(a)g(File)h(Synchr)l(onizer?)p Fn(")36 -+b(\(h)n(ttp://www.cis.up)r(enn.edu/)p Fj(\030)p Fn(b)r(cpierce/pap)r -+(ers/snc-mobicom.ps.gz\))0 464 y(b)n(y)21 b(Sundar)g(Balasubramaniam)e -+(and)i(Benjamin)g(Pierce)g([MobiCom)g(1998].)33 b(A)21 -+b(more)g(up-to-date)f(v)n(ersion)g(can)h(b)r(e)h(found)0 -+564 y(in)28 b(a)f(recen)n(t)g(set)h(of)f(slides)h(\(h)n -+(ttp://www.cis.up)r(enn.edu/)p Fj(\030)p Fn(b)r(cpierce/pap)r -+(ers/snc-tacs-2001O)o(ct.ps\).\))0 793 y Fh(4.1)112 b(Ro)s(ots)0 -+946 y Fn(A)26 b(replica's)f Fi(r)l(o)l(ot)h Fn(tells)f(Unison)h(where)f -+(to)h(\014nd)g(a)f(set)h(of)g(\014les)f(to)h(b)r(e)g(sync)n(hronized,)f -+(either)h(on)f(the)h(lo)r(cal)f(mac)n(hine)h(or)e(on)0 -+1046 y(a)j(remote)g(host.)37 b(F)-7 b(or)27 b(example,)262 -+1196 y Fb(relative/path/o)o(f/)o(roo)o(t)0 1346 y Fn(sp)r(eci\014es)g -+(a)h(lo)r(cal)f(ro)r(ot)f(relativ)n(e)h(to)g(the)h(directory)f(where)g -+(Unison)g(is)h(started,)f(while)262 1497 y Fk(/)p Fb(absolute/path/)o -+(of)o(/ro)o(ot)0 1647 y Fn(sp)r(eci\014es)h(a)h(ro)r(ot)e(relativ)n(e)h -+(to)g(the)h(top)g(of)f(the)h(lo)r(cal)f(\014lesystem,)h(indep)r(enden)n -+(t)g(of)g(where)f(Unison)g(is)h(running.)39 b(Remote)0 -+1746 y(ro)r(ots)27 b(can)g(b)r(egin)g(with)i Fk(ssh://)p -+Fn(,)c Fk(rsh://)g Fn(to)i(indicate)h(that)g(the)g(remote)f(serv)n(er)f -+(should)h(b)r(e)h(started)f(with)h(rsh)f(or)g(ssh:)262 -+1897 y Fk(ssh://)p Fb(remotehos)o(t)8 b Fk(//)p Fb(absolute/path/o)o -+(f/)o(roo)o(t)262 1996 y Fk(rsh://)p Fb(user)i Fk(@)p -+Fb(remotehost)g Fk(/)p Fb(relative/path/)o(of/)o(ro)o(ot)0 -+2147 y Fn(If)28 b(the)g(remote)f(serv)n(er)f(is)h(already)f(running)i -+(\(in)g(the)g(so)r(c)n(k)n(et)e(mo)r(de\),)i(then)g(the)g(syn)n(tax)262 -+2297 y Fk(socket://)p Fb(remote)o(ho)o(st)8 b Fk(:)p -+Fb(portnum)j Fk(//)p Fb(absolute/path/o)o(f/)o(ro)o(ot)262 -+2397 y Fk(socket://)p Fb(remote)o(ho)o(st)d Fk(:)p Fb(portnum)j -+Fk(/)p Fb(relative/path/of)o(/r)o(oo)o(t)0 2547 y Fn(is)27 -+b(used)h(to)g(sp)r(ecify)f(the)h(hostname)f(and)h(the)g(p)r(ort)f(that) -+h(the)g(clien)n(t)g(Unison)f(should)h(use)f(to)h(con)n(tact)f(it.)125 -+2647 y(The)g(syn)n(tax)g(for)g(ro)r(ots)f(is)i(based)f(on)g(that)h(of)g -+(URIs)g(\(describ)r(ed)f(in)h(RF)n(C)g(2396\).)35 b(The)28 -+b(full)g(grammar)e(is:)87 2797 y Fb(replica)55 b Fk(::=)43 -+b([)p Fb(protocol)10 b Fk(:]//[)p Fb(user)h Fk(@][)p -+Fb(host)h Fk(][:)p Fb(port)f Fk(][/)p Fb(path)h Fk(])479 -+2897 y(|)87 b Fb(path)87 3096 y(protocol)55 b Fk(::=)42 -+b(file)523 3195 y(|)87 b(socket)523 3295 y(|)g(ssh)523 -+3395 y(|)g(rsh)87 3594 y Fb(user)57 b Fk(::=)42 b([-_a-zA-Z0-9]+)87 -+3793 y Fb(host)57 b Fk(::=)42 b([-_a-zA-Z0-9.]+)87 3992 -+y Fb(port)57 b Fk(::=)42 b([0-9]+)0 4143 y Fn(When)35 -+b Fk(path)e Fn(is)h(giv)n(en)g(without)g(an)n(y)g(proto)r(col)f -+(pre\014x,)j(the)f(proto)r(col)e(is)h(assumed)g(to)g(b)r(e)h -+Fk(file:)p Fn(.)55 b(Under)34 b(Windo)n(ws,)0 4242 y(it)e(is)g(p)r -+(ossible)f(to)h(sync)n(hronize)e(with)i(a)g(remote)f(directory)f(using) -+i(the)g Fk(file:)d Fn(proto)r(col)i(o)n(v)n(er)f(the)i(Windo)n(ws)f -+(Net)n(w)n(ork)0 4342 y(Neigh)n(b)r(orho)r(o)r(d.)36 -+b(F)-7 b(or)27 b(example,)305 4492 y Fk(unison)41 b(foo)i -+(//host/drive/ba)o(r)0 4643 y Fn(sync)n(hronizes)34 b(the)i(lo)r(cal)g -+(directory)e Fk(foo)h Fn(with)h(the)g(directory)f Fk(drive:\\bar)d -+Fn(on)j(the)h(mac)n(hine)g Fk(host)p Fn(,)g(pro)n(vided)f(that)0 -+4742 y Fk(host)23 b Fn(is)i(accessible)f(via)g(Net)n(w)n(ork)f(Neigh)n -+(b)r(orho)r(o)r(d.)35 b(When)26 b(the)f Fk(file:)e Fn(proto)r(col)g(is) -+i(used)g(in)g(this)g(w)n(a)n(y)-7 b(,)24 b(there)h(is)f(no)h(need)0 -+4842 y(for)31 b(a)h(Unison)g(serv)n(er)e(to)i(b)r(e)g(running)g(on)f -+(the)i(remote)e(host.)50 b(\(Ho)n(w)n(ev)n(er,)31 b(running)h(Unison)g -+(this)g(w)n(a)n(y)f(is)h(only)f(a)h(go)r(o)r(d)0 4941 -+y(idea)e(if)g(the)g(remote)f(host)h(is)g(reac)n(hed)e(b)n(y)i(a)f(v)n -+(ery)g(fast)h(net)n(w)n(ork)e(connection,)i(since)g(the)g(full)g(con)n -+(ten)n(ts)f(of)h(ev)n(ery)f(\014le)h(in)0 5041 y(the)e(remote)f -+(replica)g(will)h(ha)n(v)n(e)e(to)h(b)r(e)h(transferred)f(to)g(the)h -+(lo)r(cal)f(mac)n(hine)g(to)h(detect)g(up)r(dates.\))125 -+5141 y(The)18 b(names)g(of)h(ro)r(ots)e(are)h Fi(c)l(anonize)l(d)h -+Fn(b)n(y)g(Unison)f(b)r(efore)g(it)h(uses)f(them)i(to)e(compute)h(the)g -+(names)f(of)g(the)h(corresp)r(onding)0 5240 y(arc)n(hiv)n(e)i(\014les,) -+j(so)f Fk(//saul//home/bcp)o(ie)o(rce)o(/c)o(om)o(mon)16 -+b Fn(and)23 b Fk(//saul.cis.upenn.)o(ed)o(u/c)o(om)o(mon)16 -+b Fn(will)24 b(b)r(e)f(recognized)f(as)0 5340 y(the)28 -+b(same)f(replica)g(under)g(di\013eren)n(t)h(names.)1908 -+5589 y(14)p eop -+%%Page: 15 15 -+15 14 bop 0 83 a Fh(4.2)112 b(P)m(aths)0 236 y Fn(A)34 -+b Fi(p)l(ath)h Fn(refers)e(to)h(a)g(p)r(oin)n(t)g Fi(within)h -+Fn(a)f(set)g(of)g(\014les)g(b)r(eing)g(sync)n(hronized;)i(it)f(is)f(sp) -+r(eci\014ed)g(relativ)n(e)f(to)h(the)g(ro)r(ot)g(of)g(the)0 -+336 y(replica.)125 436 y(F)-7 b(ormally)g(,)28 b(a)g(path)g(is)h(just)g -+(a)f(sequence)g(of)h(names,)f(separated)f(b)n(y)i Fk(/)p -+Fn(.)39 b(Note)29 b(that)g(the)g(path)f(separator)f(c)n(haracter)f(is)0 -+535 y(alw)n(a)n(ys)18 b(a)i(forw)n(ard)e(slash,)j(no)e(matter)h(what)g -+(op)r(erating)f(system)g(Unison)h(is)g(running)g(on.)34 -+b(F)-7 b(orw)n(ard)18 b(slashes)h(are)g(con)n(v)n(erted)0 -+635 y(to)j(bac)n(kslashes)e(as)i(necessary)e(when)j(paths)f(are)f(con)n -+(v)n(erted)g(to)h(\014lenames)g(in)g(the)h(lo)r(cal)f(\014lesystem)g -+(on)g(a)f(particular)g(host.)0 734 y(\(F)-7 b(or)18 b(example,)i(supp)r -+(ose)f(that)g(w)n(e)f(run)h(Unison)f(on)h(a)f(Windo)n(ws)g(system,)i -+(sync)n(hronizing)d(the)j(lo)r(cal)e(ro)r(ot)g Fk(c:\\pierce)d -+Fn(with)0 834 y(the)26 b(ro)r(ot)f Fk(ssh://saul.cis.up)o(en)o(n.e)o -+(du)o(/ho)o(me)o(/bc)o(pi)o(er)o(ce)20 b Fn(on)25 b(a)h(Unix)g(serv)n -+(er.)34 b(Then)26 b(the)h(path)f Fk(current/todo.tx)o(t)0 -+934 y Fn(refers)j(to)h(the)h(\014le)f Fk(c:\\pierce\\current)o(\\to)o -+(do)o(.t)o(xt)24 b Fn(on)30 b(the)g(clien)n(t)h(and)f -+Fk(/home/bcpierce/c)o(ur)o(ren)o(t/)o(tod)o(o.)o(tx)o(t)24 -+b Fn(on)0 1033 y(the)k(serv)n(er.\))125 1133 y(The)36 -+b(empt)n(y)h(path)g(\(i.e.,)j(the)d(empt)n(y)g(sequence)f(of)h(names\)) -+g(denotes)f(the)h(whole)g(replica.)63 b(Unison)37 b(displa)n(ys)f(the)0 -+1233 y(empt)n(y)28 b(path)f(as)g(\\)p Fk([root])p Fn(.")125 -+1332 y(If)f Fk(p)g Fn(is)g(a)f(path)h(and)g Fk(q)g Fn(is)g(a)f(path)h -+(b)r(eginning)g(with)h Fk(p)p Fn(,)f(then)g Fk(q)g Fn(is)g(said)g(to)f -+(b)r(e)i(a)e Fi(desc)l(endant)i Fn(of)f Fk(p)p Fn(.)36 -+b(\(Eac)n(h)25 b(path)h(is)g(also)0 1432 y(a)h(descendan)n(t)g(of)h -+(itself.\))0 1661 y Fh(4.3)112 b(What)38 b(is)e(an)j(Up)s(date?)0 -+1814 y Fn(The)30 b Fi(c)l(ontents)e Fn(of)i(a)f(path)h -+Fk(p)f Fn(in)h(a)f(particular)f(replica)h(could)g(b)r(e)h(a)f(\014le,)i -+(a)e(directory)-7 b(,)29 b(a)g(sym)n(b)r(olic)g(link,)h(or)f(absen)n(t) -+g(\(if)h Fk(p)0 1914 y Fn(do)r(es)d(not)h(refer)f(to)g(an)n(ything)g -+(at)h(all)f(in)h(that)g(replica\).)36 b(More)27 b(sp)r(eci\014cally:) -+125 2066 y Fj(\017)41 b Fn(If)34 b Fk(p)f Fn(refers)f(to)i(an)f -+(ordinary)f(\014le,)j(then)f(the)g(con)n(ten)n(ts)f(of)g -+Fk(p)g Fn(are)g(the)h(actual)f(con)n(ten)n(ts)g(of)g(this)h(\014le)g -+(\(a)f(string)g(of)208 2166 y(b)n(ytes\))27 b(plus)h(the)g(curren)n(t)f -+(p)r(ermission)f(bits)i(of)g(the)g(\014le.)125 2325 y -+Fj(\017)41 b Fn(If)24 b Fk(p)f Fn(refers)g(to)h(a)g(sym)n(b)r(olic)f -+(link,)i(then)f(the)h(con)n(ten)n(ts)e(of)h Fk(p)f Fn(are)g(just)i(the) -+f(string)f(sp)r(ecifying)h(where)g(the)g(link)g(p)r(oin)n(ts.)125 -+2484 y Fj(\017)41 b Fn(If)32 b Fk(p)f Fn(refers)g(to)g(a)g(directory)-7 -+b(,)32 b(then)g(the)g(con)n(ten)n(ts)f(of)g Fk(p)h Fn(are)e(just)i(the) -+g(tok)n(en)g(\\DIRECTOR)-7 b(Y")30 b(plus)i(the)g(curren)n(t)208 -+2584 y(p)r(ermission)27 b(bits)g(of)h(the)g(directory)-7 -+b(.)125 2743 y Fj(\017)41 b Fn(If)28 b Fk(p)f Fn(do)r(es)g(not)h(refer) -+f(to)g(an)n(ything)g(in)h(this)g(replica,)f(then)h(the)g(con)n(ten)n -+(ts)f(of)g Fk(p)g Fn(are)g(the)h(tok)n(en)f(\\ABSENT.")0 -+2896 y(Unison)f(k)n(eeps)f(a)g(record)f(of)i(the)g(con)n(ten)n(ts)f(of) -+g(eac)n(h)g(path)h(after)g(eac)n(h)e(successful)i(sync)n(hronization)e -+(of)h(that)h(path)g(\(i.e.,)h(it)0 2995 y(remem)n(b)r(ers)g(the)h(con)n -+(ten)n(ts)f(at)g(the)h(last)f(momen)n(t)h(when)g(they)f(w)n(ere)g(the)h -+(same)f(in)h(the)g(t)n(w)n(o)f(replicas\).)125 3095 y(W)-7 -+b(e)27 b(sa)n(y)g(that)g(a)g(path)h(is)f Fi(up)l(date)l(d)h -+Fn(\(in)g(some)f(replica\))g(if)h(its)f(curren)n(t)g(con)n(ten)n(ts)f -+(are)h(di\013eren)n(t)g(from)g(its)h(con)n(ten)n(ts)f(the)0 -+3195 y(last)g(time)h(it)g(w)n(as)f(successfully)g(sync)n(hronized.)125 -+3294 y(\(What)34 b(Unison)f(actually)g(calculates)f(is)h(a)g(sligh)n(t) -+g(appro)n(ximation)f(to)h(this)h(de\014nition;)j(see)c(Section)g(4.7)g -+([Ca)n(v)n(eats)0 3394 y(and)27 b(Shortcomings].\))0 -+3623 y Fh(4.4)112 b(What)38 b(is)e(a)i(Con\015ict?)0 -+3776 y Fn(A)28 b(path)g(is)f(said)g(to)h(b)r(e)g Fi(c)l(on\015icting)g -+Fn(if)101 3929 y(1.)42 b(it)28 b(has)f(b)r(een)h(up)r(dated)g(in)g(one) -+f(replica,)101 4088 y(2.)42 b(it)28 b(or)e(an)n(y)h(of)h(its)f -+(descendan)n(ts)g(has)g(b)r(een)h(up)r(dated)h(in)e(the)h(other)f -+(replica,)g(and)101 4247 y(3.)42 b(its)27 b(con)n(ten)n(ts)g(in)h(the)g -+(t)n(w)n(o)f(replicas)f(are)h(not)h(iden)n(tical.)0 4477 -+y Fh(4.5)112 b(Reconciliation)0 4630 y Fn(Unison)28 b(op)r(erates)e(in) -+i(sev)n(eral)e(distinct)i(stages:)101 4782 y(1.)42 b(On)28 -+b(eac)n(h)g(host,)h(it)h(compares)d(its)i(arc)n(hiv)n(e)e(\014le)i -+(\(whic)n(h)g(records)e(the)j(state)e(of)h(eac)n(h)f(path)h(in)g(the)h -+(replica)e(when)h(it)208 4882 y(w)n(as)h(last)h(sync)n(hronized\))g -+(with)h(the)f(curren)n(t)g(con)n(ten)n(ts)g(of)g(the)h(replica,)g(to)f -+(determine)h(whic)n(h)f(paths)g(ha)n(v)n(e)g(b)r(een)208 -+4982 y(up)r(dated.)101 5141 y(2.)42 b(It)34 b(c)n(hec)n(ks)f(for)g -+(\\false)g(con\015icts")g(|)h(paths)g(that)g(ha)n(v)n(e)f(b)r(een)h(up) -+r(dated)h(on)e(b)r(oth)i(replicas,)f(but)h(whose)e(curren)n(t)208 -+5240 y(v)-5 b(alues)39 b(are)f(iden)n(tical.)72 b(These)39 -+b(paths)h(are)e(silen)n(tly)h(mark)n(ed)g(as)f(sync)n(hronized)g(in)i -+(the)g(arc)n(hiv)n(e)e(\014les)h(in)h(b)r(oth)208 5340 -+y(replicas.)1908 5589 y(15)p eop -+%%Page: 16 16 -+16 15 bop 101 83 a Fn(3.)42 b(It)31 b(displa)n(ys)g(all)g(the)h(up)r -+(dated)g(paths)g(to)f(the)h(user.)48 b(F)-7 b(or)31 b(up)r(dates)h -+(that)g(do)f(not)h(con\015ict,)g(it)g(suggests)e(a)i(default)208 -+183 y(action)27 b(\(propagating)f(the)i(new)g(con)n(ten)n(ts)f(from)g -+(the)h(up)r(dated)h(replica)e(to)g(the)h(other\).)38 -+b(Con\015icting)27 b(up)r(dates)h(are)208 282 y(just)33 -+b(displa)n(y)n(ed.)52 b(The)32 b(user)h(is)f(giv)n(en)g(an)h(opp)r -+(ortunit)n(y)f(to)h(examine)f(the)i(curren)n(t)e(state)g(of)h -+(a\013airs,)g(c)n(hange)f(the)208 382 y(default)c(actions)e(for)h -+(noncon\015icting)h(up)r(dates,)f(and)h(c)n(ho)r(ose)e(actions)h(for)g -+(con\015icting)g(up)r(dates.)101 548 y(4.)42 b(It)27 -+b(p)r(erforms)g(the)g(selected)g(actions,)g(one)g(at)g(a)g(time.)37 -+b(Eac)n(h)26 b(action)h(is)g(p)r(erformed)g(b)n(y)g(\014rst)g -+(transferring)e(the)j(new)208 648 y(con)n(ten)n(ts)e(to)i(a)f(temp)r -+(orary)f(\014le)i(on)g(the)g(receiving)e(host,)h(then)i(atomically)d -+(mo)n(ving)h(them)h(in)n(to)f(place.)101 814 y(5.)42 -+b(It)27 b(up)r(dates)h(its)g(arc)n(hiv)n(e)e(\014les)h(to)h(re\015ect)f -+(the)h(new)g(state)f(of)h(the)g(replicas.)0 1046 y Fh(4.6)112 -+b(In)m(v)-6 b(arian)m(ts)0 1199 y Fn(Giv)n(en)30 b(the)h(imp)r(ortance) -+f(and)g(delicacy)g(of)h(the)g(job)f(that)h(it)g(p)r(erforms,)f(it)h(is) -+g(imp)r(ortan)n(t)f(to)g(understand)g(b)r(oth)h(what)f(a)0 -+1299 y(sync)n(hronizer)e(do)r(es)h(under)g(normal)g(conditions)g(and)g -+(what)h(can)f(happ)r(en)h(under)f(un)n(usual)g(conditions)g(suc)n(h)g -+(as)g(system)0 1399 y(crashes)d(and)i(comm)n(unication)e(failures.)125 -+1498 y(Unison)33 b(is)h(careful)f(to)h(protect)f(b)r(oth)i(its)f(in)n -+(ternal)f(state)g(and)h(the)g(state)g(of)g(the)g(replicas)e(at)i(ev)n -+(ery)f(p)r(oin)n(t)h(in)g(this)0 1598 y(pro)r(cess.)i(Sp)r -+(eci\014cally)-7 b(,)27 b(the)h(follo)n(wing)f(guaran)n(tees)e(are)i -+(enforced:)125 1764 y Fj(\017)41 b Fn(A)n(t)30 b(ev)n(ery)f(momen)n(t,) -+h(eac)n(h)f(path)h(in)h(eac)n(h)e(replica)g(has)g(either)h(\(1\))g(its) -+h Fi(original)h Fn(con)n(ten)n(ts)d(\(i.e.,)i(no)f(c)n(hange)f(at)g -+(all)208 1863 y(has)e(b)r(een)i(made)g(to)f(this)h(path\),)g(or)e -+(\(2\))i(its)f Fi(c)l(orr)l(e)l(ct)h Fn(\014nal)f(con)n(ten)n(ts)g -+(\(i.e.,)h(the)g(v)-5 b(alue)28 b(that)h(the)g(user)e(exp)r(ected)i(to) -+208 1963 y(b)r(e)f(propagated)d(from)j(the)g(other)f(replica\).)125 -+2129 y Fj(\017)41 b Fn(A)n(t)32 b(ev)n(ery)e(momen)n(t,)j(the)f -+(information)f(stored)g(on)h(disk)f(ab)r(out)h(Unison's)g(priv)-5 -+b(ate)31 b(state)h(can)f(b)r(e)h(either)g(\(1\))g(un-)208 -+2229 y(c)n(hanged,)26 b(or)h(\(2\))h(up)r(dated)g(to)f(re\015ect)h -+(those)f(paths)g(that)h(ha)n(v)n(e)f(b)r(een)h(successfully)f(sync)n -+(hronized.)0 2395 y(The)h(upshot)f(is)h(that)g(it)g(is)f(safe)g(to)h -+(in)n(terrupt)f(Unison)h(at)f(an)n(y)g(time,)h(either)g(man)n(ually)e -+(or)h(acciden)n(tally)-7 b(.)125 2494 y(If)29 b(an)g(in)n(terruption)g -+(happ)r(ens)g(while)g(it)h(is)f(propagating)e(up)r(dates,)i(then)h -+(there)f(ma)n(y)g(b)r(e)g(some)g(paths)g(for)f(whic)n(h)h(an)0 -+2594 y(up)r(date)f(has)f(b)r(een)h(propagated)e(but)i(whic)n(h)g(ha)n -+(v)n(e)e(not)i(b)r(een)g(mark)n(ed)e(as)h(sync)n(hronized)f(in)i -+(Unison's)g(arc)n(hiv)n(es.)35 b(This)27 b(is)0 2694 -+y(no)k(problem:)44 b(the)32 b(next)f(time)h(Unison)f(runs,)h(it)g(will) -+f(detect)h(c)n(hanges)e(to)h(these)h(paths)f(in)h(b)r(oth)f(replicas,)h -+(notice)f(that)0 2793 y(the)25 b(con)n(ten)n(ts)f(are)g(no)n(w)g -+(equal,)h(and)f(mark)g(the)h(paths)g(as)f(successfully)g(up)r(dated)i -+(when)f(it)g(writes)f(bac)n(k)g(its)h(priv)-5 b(ate)24 -+b(state)0 2893 y(at)j(the)h(end)g(of)g(this)g(run.)125 -+2993 y(If)21 b(Unison)h(is)f(in)n(terrupted,)h(it)g(ma)n(y)f(sometimes) -+g(lea)n(v)n(e)f(temp)r(orary)g(w)n(orking)g(\014les)h(\(with)h(su\016x) -+g Fk(.tmp)p Fn(\))e(in)h(the)h(replicas.)0 3092 y(It)34 -+b(is)g(safe)g(to)f(delete)i(these)f(\014les.)55 b(Also,)36 -+b(if)e(the)g(\(deprecated\))g Fk(backups)d Fn(\015ag)i(is)h(set,)i -+(Unison)e(will)g(lea)n(v)n(e)e(around)h(old)0 3192 y(v)n(ersions)25 -+b(of)i(\014les,)f(with)i(names)e(lik)n(e)g Fk(file.0.unison.bak)o -+Fn(.)31 b(These)26 b(can)h(b)r(e)g(deleted)g(safely)-7 -+b(,)26 b(when)h(they)g(are)f(no)g(longer)0 3291 y(w)n(an)n(ted.)125 -+3391 y(Unison)d(is)h(not)g(b)r(othered)g(b)n(y)f(clo)r(c)n(k)h(sk)n(ew) -+f(b)r(et)n(w)n(een)h(the)g(di\013eren)n(t)g(hosts)f(on)h(whic)n(h)g(it) -+g(is)g(running.)35 b(It)24 b(only)g(p)r(erforms)0 3491 -+y(comparisons)33 b(b)r(et)n(w)n(een)i(timestamps)g(obtained)f(from)h -+(the)g(same)g(host,)h(and)f(the)g(only)g(assumption)f(it)h(mak)n(es)f -+(ab)r(out)0 3590 y(them)28 b(is)g(that)g(the)g(clo)r(c)n(k)e(on)i(eac)n -+(h)e(system)i(alw)n(a)n(ys)e(runs)h(forw)n(ard.)125 3690 -+y(If)g(Unison)g(\014nds)h(that)g(its)f(arc)n(hiv)n(e)f(\014les)h(ha)n -+(v)n(e)f(b)r(een)i(deleted)f(\(or)g(that)h(the)f(arc)n(hiv)n(e)f -+(format)h(has)f(c)n(hanged)h(and)g(they)0 3790 y(cannot)k(b)r(e)i -+(read,)f(or)f(that)h(they)g(don't)g(exist)g(b)r(ecause)f(this)i(is)e -+(the)i(\014rst)e(run)h(of)g(Unison)g(on)f(these)h(particular)f(ro)r -+(ots\),)0 3889 y(it)e(tak)n(es)e(a)h(conserv)-5 b(ativ)n(e)27 -+b(approac)n(h:)37 b(it)29 b(b)r(eha)n(v)n(es)e(as)h(though)g(the)h -+(replicas)e(had)i(b)r(oth)g(b)r(een)g(completely)f(empt)n(y)g(at)h(the) -+0 3989 y(p)r(oin)n(t)23 b(of)g(the)h(last)e(sync)n(hronization.)34 -+b(The)23 b(e\013ect)g(of)g(this)g(is)g(that,)i(on)d(the)i(\014rst)f -+(run,)g(\014les)g(that)h(exist)e(in)i(only)e(one)h(replica)0 -+4088 y(will)34 b(b)r(e)g(propagated)e(to)h(the)i(other,)f(while)g -+(\014les)g(that)g(exist)f(in)h(b)r(oth)g(replicas)f(but)h(are)f -+(unequal)g(will)h(b)r(e)g(mark)n(ed)f(as)0 4188 y(con\015icting.)125 -+4288 y(T)-7 b(ouc)n(hing)22 b(a)h(\014le)g(without)h(c)n(hanging)e(its) -+h(con)n(ten)n(ts)g(should)g(nev)n(er)f(a\013ect)h(Unison's)g(b)r(eha)n -+(vior.)35 b(\(On)23 b(Unix,)h(it)g(uses)f(\014le)0 4387 -+y(mo)r(dtimes)30 b(for)f(a)g(quic)n(k)g(\014rst)g(pass)f(to)i(tell)f -+(whic)n(h)h(\014les)f(ha)n(v)n(e)f(de\014nitely)i Fi(not)f -+Fn(c)n(hanged;)h(then)f(for)g(eac)n(h)g(\014le)g(that)h(migh)n(t)0 -+4487 y(ha)n(v)n(e)f(c)n(hanged)g(it)i(computes)f(a)g(\014ngerprin)n(t)f -+(of)h(the)h(\014le's)f(con)n(ten)n(ts)g(and)g(compares)f(it)h(against)g -+(the)g(last-sync)n(hronized)0 4587 y(con)n(ten)n(ts.\))125 -+4686 y(It)h(is)g(safe)f(to)h(\\brain)n(w)n(ash")d(Unison)j(b)n(y)f -+(deleting)h(its)g(arc)n(hiv)n(e)e(\014les)i Fi(on)i(b)l(oth)g(r)l -+(eplic)l(as)p Fn(.)49 b(The)30 b(next)i(time)f(it)g(runs,)h(it)0 -+4786 y(will)c(assume)f(that)h(all)f(the)h(\014les)f(it)h(sees)f(in)h -+(the)g(replicas)f(are)f(new.)125 4885 y(It)21 b(is)h(safe)f(to)g(mo)r -+(dify)h(\014les)f(while)h(Unison)g(is)f(w)n(orking.)33 -+b(If)22 b(Unison)f(disco)n(v)n(ers)f(that)h(it)h(has)f(propagated)f(an) -+h(out-of-date)0 4985 y(c)n(hange,)28 b(or)g(that)h(the)g(\014le)g(it)g -+(is)g(up)r(dating)g(has)f(c)n(hanged)g(on)g(the)i(target)d(replica,)i -+(it)g(will)g(signal)f(a)g(failure)h(for)f(that)h(\014le.)0 -+5085 y(Run)f(Unison)g(again)e(to)h(propagate)f(the)i(latest)g(c)n -+(hange.)125 5184 y(Changes)e(to)i(the)h(ignore)d(patterns)i(from)f(the) -+i(user)e(in)n(terface)g(\(e.g.,)h(using)g(the)g(`i')h(k)n(ey\))e(are)g -+(immediately)h(re\015ected)0 5284 y(in)g(the)g(curren)n(t)f(pro\014le.) -+1908 5589 y(16)p eop -+%%Page: 17 17 -+17 16 bop 0 83 a Fh(4.7)112 b(Ca)m(v)m(eats)38 b(and)h(Shortcomings)0 -+236 y Fn(Here)30 b(are)g(some)g(things)h(to)f(b)r(e)h(careful)f(of)h -+(when)g(using)f(Unison.)46 b(A)31 b(complete)g(list)g(of)f(bugs)h(can)f -+(b)r(e)h(found)g(in)g(the)g(\014le)0 336 y(BUGS.txt)d(in)g(the)g -+(source)f(distribution.)125 519 y Fj(\017)41 b Fn(In)33 -+b(the)g(in)n(terests)f(of)h(sp)r(eed,)h(the)f(up)r(date)g(detection)g -+(algorithm)f(ma)n(y)g(\(dep)r(ending)h(on)g(whic)n(h)g(OS)f(arc)n -+(hitecture)208 618 y(that)27 b(y)n(ou)e(run)i(Unison)g(on\))f(actually) -+g(use)h(an)f(appro)n(ximation)f(to)i(the)g(de\014nition)g(giv)n(en)f -+(in)h(Section)f(4.3)g([What)h(is)208 718 y(an)g(Up)r(date?].)208 -+851 y(In)g(particular,)f(the)h(Unix)h(implemen)n(tation)f(do)r(es)g -+(not)g(compare)f(the)h(actual)g(con)n(ten)n(ts)f(of)h(\014les)g(to)g -+(their)g(previous)208 950 y(con)n(ten)n(ts,)g(but)h(simply)g(lo)r(oks)f -+(at)g(eac)n(h)g(\014le's)h(ino)r(de)g(n)n(um)n(b)r(er)f(and)h(mo)r -+(dtime;)g(if)g(neither)g(of)g(these)g(ha)n(v)n(e)e(c)n(hanged,)208 -+1050 y(then)i(it)g(concludes)f(that)h(the)g(\014le)f(has)g(not)h(b)r -+(een)g(c)n(hanged.)208 1183 y(Under)34 b(normal)f(circumstances,)j -+(this)e(appro)n(ximation)f(is)h(safe,)i(in)f(the)f(sense)g(that)h(it)g -+(ma)n(y)f(sometimes)g(detect)208 1282 y(\\false)h(up)r(dates")g(will)h -+(nev)n(er)f(miss)h(a)f(real)g(one.)61 b(Ho)n(w)n(ev)n(er,)36 -+b(it)g(is)g(p)r(ossible)f(to)h(fo)r(ol)g(it,)i(for)e(example)f(b)n(y)g -+(using)208 1382 y Fk(retouch)24 b Fn(to)k(c)n(hange)e(a)h(\014le's)h -+(mo)r(dtime)g(bac)n(k)f(to)g(a)h(time)g(in)g(the)g(past.)125 -+1548 y Fj(\017)41 b Fn(If)25 b(y)n(ou)f(sync)n(hronize)f(b)r(et)n(w)n -+(een)i(a)f(single-user)f(\014lesystem)i(and)g(a)f(shared)g(Unix)h(serv) -+n(er,)f(y)n(ou)g(should)g(pa)n(y)g(atten)n(tion)208 1648 -+y(to)32 b(y)n(our)g(p)r(ermission)g(bits:)48 b(b)n(y)32 -+b(default,)j(Unison)e(will)g(sync)n(hronize)e(p)r(ermissions)h(v)n -+(erbatim,)i(whic)n(h)e(ma)n(y)g(lea)n(v)n(e)208 1747 -+y(group-writable)25 b(\014les)j(on)f(the)h(serv)n(er)e(that)i(could)f -+(b)r(e)h(written)g(o)n(v)n(er)e(b)n(y)h(a)g(lot)h(of)f(p)r(eople.)208 -+1880 y(Y)-7 b(ou)26 b(can)g(con)n(trol)f(this)h(b)n(y)g(setting)h(y)n -+(our)e Fk(umask)f Fn(on)i(b)r(oth)g(computers)g(to)g(something)g(lik)n -+(e)g(022,)f(masking)g(out)i(the)208 1980 y(\\w)n(orld)f(write")h(and)g -+(\\group)f(write")h(p)r(ermission)g(bits.)125 2146 y -+Fj(\017)41 b Fn(The)22 b(graphical)f(user)h(in)n(terface)g(is)g(curren) -+n(tly)g(single-threaded.)34 b(This)22 b(means)g(that)h(if)g(Unison)g -+(is)f(p)r(erforming)g(some)208 2245 y(long-running)g(op)r(eration,)h -+(the)h(displa)n(y)f(will)g(not)h(b)r(e)g(repain)n(ted)f(un)n(til)h(it)f -+(\014nishes.)36 b(W)-7 b(e)24 b(recommend)f(not)g(trying)g(to)208 -+2345 y(do)k(an)n(ything)f(with)i(the)g(user)f(in)n(terface)g(while)g -+(Unison)h(is)f(in)h(the)g(middle)g(of)f(detecting)h(c)n(hanges)e(or)g -+(propagating)208 2445 y(\014les.)125 2611 y Fj(\017)41 -+b Fn(Unison)27 b(do)r(es)g(not)h(curren)n(tly)f(understand)g(hard)g -+(links.)1908 5589 y(17)p eop -+%%Page: 18 18 -+18 17 bop 0 83 a Fm(5)135 b(Reference)0 265 y Fn(This)28 -+b(section)f(co)n(v)n(ers)e(the)j(features)f(of)h(Unison)f(in)h(detail.) -+0 494 y Fh(5.1)112 b(Running)37 b(Unison)0 647 y Fn(There)27 -+b(are)g(sev)n(eral)e(w)n(a)n(ys)i(to)g(start)g(Unison.)125 -+797 y Fj(\017)41 b Fn(T)n(yping)d(\\)p Fk(unison)i Fb(profile)12 -+b Fn(")38 b(on)h(the)g(command)g(line.)70 b(Unison)39 -+b(will)g(lo)r(ok)f(for)h(a)f(\014le)h Fb(profile)p Fk(.prf)c -+Fn(in)k(the)208 896 y Fk(.unison)27 b Fn(directory)-7 -+b(.)44 b(If)31 b(this)g(\014le)g(do)r(es)f(not)g(sp)r(ecify)h(a)f(pair) -+g(of)g(ro)r(ots,)h(Unison)f(will)h(prompt)f(for)g(them)h(and)f(add)208 -+996 y(them)e(to)f(the)h(information)f(sp)r(eci\014ed)h(b)n(y)f(the)h -+(pro\014le.)125 1154 y Fj(\017)41 b Fn(T)n(yping)18 b(\\)p -+Fk(unison)41 b Fb(profile)55 b(root1)h(root2)12 b Fn(")19 -+b(on)g(the)h(command)e(line.)35 b(In)19 b(this)h(case,)g(Unison)f(will) -+g(use)g Fb(profile)12 b Fn(,)208 1254 y(whic)n(h)27 b(should)g(not)h -+(con)n(tain)f(an)n(y)g Fk(root)f Fn(directiv)n(es.)125 -+1411 y Fj(\017)41 b Fn(T)n(yping)32 b(\\)p Fk(unison)41 -+b Fb(root1)56 b(root2)12 b Fn(")33 b(on)g(the)h(command)f(line.)54 -+b(This)33 b(has)g(the)h(same)e(e\013ect)i(as)f(t)n(yping)g(\\)p -+Fk(unison)208 1511 y(default)40 b Fb(root1)56 b(root2)13 -+b Fn(.")125 1669 y Fj(\017)41 b Fn(T)n(yping)24 b(just)i(\\)p -+Fk(unison)p Fn(")21 b(\(or)k(in)n(v)n(oking)e(Unison)i(b)n(y)g(clic)n -+(king)f(on)h(a)g(desktop)f(icon\).)36 b(In)26 b(this)f(case,)g(Unison)g -+(will)g(ask)208 1769 y(for)i(the)h(pro\014le)f(to)g(use)g(for)h(sync)n -+(hronization)d(\(or)i(create)g(a)g(new)h(one,)f(if)h(necessary\).)0 -+1998 y Fh(5.2)112 b(The)38 b Fq(.unison)h Fh(Directory)0 -+2151 y Fn(Unison)f(stores)g(a)g(v)-5 b(ariet)n(y)37 b(of)h(information) -+g(in)h(a)f(priv)-5 b(ate)38 b(directory)f(on)h(eac)n(h)g(host.)69 -+b(If)39 b(the)g(en)n(vironmen)n(t)e(v)-5 b(ariable)0 -+2250 y Fk(UNISON)28 b Fn(is)i(de\014ned,)i(then)f(its)g(v)-5 -+b(alue)30 b(will)h(b)r(e)f(used)h(as)f(the)h(name)f(of)g(this)h -+(directory)-7 b(.)44 b(If)31 b Fk(UNISON)d Fn(is)j(not)f(de\014ned,)i -+(then)0 2350 y(the)k(name)g(of)g(the)g(directory)f(dep)r(ends)i(on)e -+(whic)n(h)h(op)r(erating)f(system)h(y)n(ou)f(are)g(using.)62 -+b(In)36 b(Unix,)j(the)d(default)g(is)g(to)0 2450 y(use)c -+Fk($HOME/.unison)p Fn(.)47 b(In)33 b(Windo)n(ws,)g(if)g(the)g(en)n -+(vironmen)n(t)f(v)-5 b(ariable)31 b Fk(USERPROFILE)e -+Fn(is)j(de\014ned,)i(then)f(the)g(directory)0 2549 y(will)27 -+b(b)r(e)f Fk($USERPROFILE)p Fj(n)p Fk(.uni)o(son)o Fn(;)21 -+b(otherwise)26 b(if)g Fk(HOME)f Fn(is)i(de\014ned,)g(it)f(will)h(b)r(e) -+g Fk($HOME)p Fj(n)p Fk(.unison)p Fn(;)21 b(otherwise,)26 -+b(it)h(will)g(b)r(e)0 2649 y Fk(c:)p Fj(n)p Fk(.unison)p -+Fn(.)125 2749 y(The)19 b(arc)n(hiv)n(e)e(\014le)j(for)e(eac)n(h)h -+(replica)f(is)h(found)h(in)f(the)h Fk(.unison)c Fn(directory)i(on)h -+(that)g(replica's)g(host.)33 b(Pro\014les)18 b(\(describ)r(ed)0 -+2848 y(b)r(elo)n(w\))28 b(are)e(alw)n(a)n(ys)g(tak)n(en)h(from)g(the)h -+Fk(.unison)d Fn(directory)h(on)h(the)h(clien)n(t)g(host.)125 -+2948 y(Note)f(that)h(Unison)g(main)n(tains)f(a)g(completely)g -+(di\013eren)n(t)h(set)f(of)h(arc)n(hiv)n(e)e(\014les)h(for)g(eac)n(h)g -+(pair)g(of)h(ro)r(ots.)125 3047 y(W)-7 b(e)26 b(do)g(not)g(recommend)g -+(sync)n(hronizing)e(the)j(whole)f Fk(.unison)d Fn(directory)-7 -+b(,)25 b(as)h(this)g(will)h(in)n(v)n(olv)n(e)e(frequen)n(t)h(propaga-)0 -+3147 y(tion)f(of)g(large)f(arc)n(hiv)n(e)g(\014les.)36 -+b(It)25 b(should)g(b)r(e)h(safe)f(to)g(do)g(it,)h(though,)f(if)h(y)n -+(ou)e(really)h(w)n(an)n(t)f(to.)36 b(\(Sync)n(hronizing)24 -+b(the)i(pro\014le)0 3247 y(\014les)i(in)f(the)h Fk(.unison)d -+Fn(directory)h(is)i(de\014nitely)g(OK.\))0 3476 y Fh(5.3)112 -+b(Arc)m(hiv)m(e)36 b(Files)0 3629 y Fn(The)28 b(name)f(of)h(the)g(arc)n -+(hiv)n(e)d(\014le)j(on)g(eac)n(h)e(replica)h(is)h(calculated)f(from)125 -+3779 y Fj(\017)41 b Fn(the)e Fi(c)l(anonic)l(al)j(names)e -+Fn(of)f(all)h(the)g(hosts)f(\(short)g(names)g(lik)n(e)g -+Fk(saul)f Fn(are)g(con)n(v)n(erted)g(in)n(to)h(full)i(addresses)c(lik)n -+(e)208 3878 y Fk(saul.cis.upenn.)o(edu)o Fn(\),)125 4036 -+y Fj(\017)k Fn(the)25 b(paths)h(to)f(the)h(replicas)f(on)g(all)g(the)h -+(hosts)f(\(again,)g(relativ)n(e)g(pathnames,)g(sym)n(b)r(olic)g(links,) -+h(etc.)g(are)f(con)n(v)n(erted)208 4136 y(in)n(to)i(full,)h(absolute)f -+(paths\),)h(and)125 4294 y Fj(\017)41 b Fn(an)28 b(in)n(ternal)g(v)n -+(ersion)g(n)n(um)n(b)r(er)g(that)h(is)g(c)n(hanged)f(whenev)n(er)g(a)g -+(new)h(Unison)g(release)e(c)n(hanges)g(the)j(format)e(of)h(the)208 -+4393 y(information)d(stored)h(in)h(the)g(arc)n(hiv)n(e.)0 -+4543 y(This)h(metho)r(d)h(should)f(w)n(ork)f(w)n(ell)i(for)e(most)i -+(users.)41 b(Ho)n(w)n(ev)n(er,)28 b(it)i(is)f(o)r(ccasionally)f(useful) -+h(to)h(c)n(hange)e(the)i(w)n(a)n(y)e(arc)n(hiv)n(e)0 -+4643 y(names)f(are)g(generated.)35 b(Unison)28 b(pro)n(vides)e(t)n(w)n -+(o)h(w)n(a)n(ys)f(of)i(doing)f(this.)125 4742 y(The)j(function)i(that)f -+(\014nds)g(the)g(canonical)e(hostname)i(of)f(the)h(lo)r(cal)g(host)f -+(\(whic)n(h)h(is)g(used,)g(for)g(example,)g(in)g(calcu-)0 -+4842 y(lating)d(the)g(name)g(of)g(the)h(arc)n(hiv)n(e)d(\014le)i(used)g -+(to)g(remem)n(b)r(er)g(whic)n(h)g(\014les)g(ha)n(v)n(e)f(b)r(een)h -+(sync)n(hronized\))f(normally)g(uses)h(the)0 4941 y Fk(gethostname)c -+Fn(op)r(erating)k(system)g(call.)40 b(Ho)n(w)n(ev)n(er,)27 -+b(if)i(the)g(en)n(vironmen)n(t)f(v)-5 b(ariable)27 b -+Fk(UNISONLOCALHOSTNA)o(ME)22 b Fn(is)29 b(set,)g(its)0 -+5041 y(v)-5 b(alue)25 b(will)h(b)r(e)g(used)f(instead.)36 -+b(This)26 b(mak)n(es)e(it)i(easier)e(to)h(use)h(Unison)f(in)h -+(situations)f(where)f(a)h(mac)n(hine's)g(name)g(c)n(hanges)0 -+5141 y(frequen)n(tly)i(\(e.g.,)h(b)r(ecause)f(it)h(is)g(a)f(laptop)g -+(and)g(gets)h(mo)n(v)n(ed)e(around)h(a)g(lot\).)125 5240 -+y(A)22 b(more)g(p)r(o)n(w)n(erful)f(w)n(a)n(y)g(of)h(c)n(hanging)f(arc) -+n(hiv)n(e)g(names)h(is)g(pro)n(vided)f(b)n(y)h(the)h -+Fk(rootalias)18 b Fn(preference.)35 b(The)22 b(preference)0 -+5340 y(\014le)28 b(ma)n(y)f(con)n(tain)g(an)n(y)f(n)n(um)n(b)r(er)i(of) -+f(lines)h(of)f(the)h(form:)1908 5589 y(18)p eop -+%%Page: 19 19 -+19 18 bop 174 83 a Fk(rootalias)40 b(=)j(//)p Fb(hostnameA)10 -+b Fk(//)p Fb(path-to-replica)o(A)52 b Fk(->)43 b(//)p -+Fb(hostnameB)9 b Fk(//)p Fb(path-to-replica)o(B)0 249 -+y Fn(When)21 b(calculating)f(the)h(name)g(of)g(the)g(arc)n(hiv)n(e)e -+(\014les)i(for)f(a)g(giv)n(en)g(pair)g(of)h(ro)r(ots,)g(Unison)g -+(replaces)f(an)n(y)g(ro)r(ot)g(that)h(matc)n(hes)0 349 -+y(the)28 b(left-hand)g(side)f(of)h(an)n(y)f(ro)r(otalias)e(rule)j(b)n -+(y)f(the)h(corresp)r(onding)e(righ)n(t-hand)g(side.)125 -+448 y(So,)h(if)h(y)n(ou)f(need)h(to)f(relo)r(cate)g(a)g(ro)r(ot)g(on)g -+(one)g(of)h(the)g(hosts,)f(y)n(ou)g(can)g(add)g(a)g(rule)h(of)f(the)h -+(form:)174 614 y Fk(rootalias)40 b(=)j(//)p Fb(new-hostname)9 -+b Fk(//)p Fb(new-path)54 b Fk(->)43 b(//)p Fb(old-hostname)8 -+b Fk(//)p Fb(old-path)125 780 y Fi(Warning)p Fn(:)44 -+b(The)31 b Fk(rootalias)c Fn(option)k(is)g(dangerous)e(and)i(should)g -+(only)g(b)r(e)g(used)g(if)h(y)n(ou)e(are)g(sure)h(y)n(ou)f(kno)n(w)g -+(what)0 880 y(y)n(ou're)e(doing.)41 b(In)29 b(particular,)g(it)g -+(should)g(only)g(b)r(e)h(used)f(if)h(y)n(ou)e(are)g(p)r(ositiv)n(e)h -+(that)h(either)f(\(1\))g(b)r(oth)h(the)f(original)f(ro)r(ot)0 -+980 y(and)36 b(the)h(new)g(alias)e(refer)h(to)h(the)g(same)f(set)g(of)h -+(\014les,)h(or)e(\(2\))h(the)g(\014les)f(ha)n(v)n(e)f(b)r(een)i(relo)r -+(cated)f(so)g(that)h(the)g(original)0 1079 y(name)31 -+b(is)f(no)n(w)h(in)n(v)-5 b(alid)31 b(and)f(will)h(nev)n(er)f(b)r(e)i -+(used)f(again.)45 b(\(If)32 b(the)f(original)e(ro)r(ot)h(and)h(the)g -+(alias)f(refer)h(to)f(di\013eren)n(t)h(sets)0 1179 y(of)c(\014les,)f -+(Unison's)h(up)r(date)g(detector)f(could)h(get)f(confused.\))37 -+b(After)27 b(in)n(tro)r(ducing)f(a)g(new)h Fk(rootalias)p -+Fn(,)c(it)28 b(is)e(a)g(go)r(o)r(d)g(idea)0 1279 y(to)j(run)h(Unison)f -+(a)h(few)g(times)f(in)n(teractiv)n(ely)g(\(with)h(the)g -+Fk(batch)e Fn(\015ag)h(o\013,)h(etc.\))43 b(and)30 b(carefully)f(c)n -+(hec)n(k)f(that)i(things)g(lo)r(ok)0 1378 y(reasonable|in)c -+(particular,)g(that)i(up)r(date)g(detection)g(is)f(w)n(orking)f(as)h -+(exp)r(ected.)0 1611 y Fh(5.4)112 b(Preferences)0 1764 -+y Fn(Man)n(y)27 b(details)g(of)h(Unison's)f(b)r(eha)n(vior)f(are)h -+(con\014gurable)f(b)n(y)h(user-settable)g(\\preferences.")125 -+1863 y(Some)32 b(preferences)f(are)h(b)r(o)r(olean-v)-5 -+b(alued;)34 b(these)e(are)f(often)i(called)f Fi(\015ags)p -+Fn(.)52 b(Others)32 b(tak)n(e)f(n)n(umeric)h(or)g(string)g(argu-)0 -+1963 y(men)n(ts,)37 b(indicated)e(in)h(the)f(preferences)f(list)h(b)n -+(y)g Fk(n)g Fn(or)f Fk(xxx)p Fn(.)58 b(Most)35 b(of)g(the)g(string)g -+(preferences)f(can)g(b)r(e)i(giv)n(en)e(sev)n(eral)0 -+2063 y(times;)28 b(the)g(argumen)n(ts)e(are)h(accum)n(ulated)g(in)n(to) -+g(a)g(list)h(in)n(ternally)-7 b(.)125 2162 y(There)26 -+b(are)h(t)n(w)n(o)g(w)n(a)n(ys)f(to)h(set)g(the)h(v)-5 -+b(alues)27 b(of)h(preferences:)36 b(temp)r(orarily)-7 -+b(,)26 b(b)n(y)h(pro)n(viding)f(command-line)h(argumen)n(ts)0 -+2262 y(to)e(a)h(particular)e(run)h(of)h(Unison,)g(or)e(p)r(ermanen)n -+(tly)-7 b(,)26 b(b)n(y)f(adding)h(commands)f(to)g(a)g -+Fi(pr)l(o\014le)i Fn(in)e(the)h Fk(.unison)d Fn(directory)h(on)0 -+2362 y(the)g(clien)n(t)g(host.)36 b(The)24 b(order)e(of)i(preferences)f -+(\(either)h(on)g(the)g(command)g(line)g(or)f(in)h(preference)f -+(\014les\))h(is)g(not)g(signi\014can)n(t.)125 2461 y(T)-7 -+b(o)25 b(set)h(the)g(v)-5 b(alue)25 b(of)h(a)f(preference)g -+Fk(p)g Fn(from)h(the)g(command)f(line,)h(add)g(an)f(argumen)n(t)g -+Fk(-p)g Fn(\(for)g(a)h(b)r(o)r(olean)f(\015ag\))g(or)g -+Fk(-p)0 2561 y(n)i Fn(or)g Fk(-p)43 b(xxx)26 b Fn(\(for)h(a)g(n)n -+(umeric)g(or)g(string)g(preference\))g(an)n(ywhere)f(on)h(the)h -+(command)f(line.)37 b(There)27 b(is)h(curren)n(tly)e(no)h(w)n(a)n(y)0 -+2660 y(to)g(set)h(a)f(b)r(o)r(olean)g(\015ag)f(to)i Fk(false)d -+Fn(on)i(the)h(command)f(line)h(\(all)g(the)f(b)r(o)r(olean)g -+(preferences)g(default)h(to)f Fk(false)p Fn(,)f(so)g(this)i(is)0 -+2760 y(only)j(a)g(restriction)f(if)i(y)n(ou'v)n(e)e(set)i(one)e(to)i -+Fk(true)e Fn(in)h(y)n(our)f(pro\014le)h(and)g(w)n(an)n(t)g(to)g(reset)g -+(it)h(temp)r(orarily)e(to)h Fk(false)e Fn(from)0 2860 -+y(the)f(command)f(line\).)125 2959 y(Here)g(are)f(all)i(the)g -+(preferences)e(supp)r(orted)i(b)n(y)f(Unison.)37 b(\(This)28 -+b(list)f(can)h(b)r(e)g(obtained)f(b)n(y)g(t)n(yping)h -+Fk(unison)41 b(-help)p Fn(.\))208 3125 y Fk(Usage:)g(unison)g -+([options])382 3225 y(or)i(unison)e(root1)g(root2)h([options])382 -+3325 y(or)h(unison)e(profilename)e([options])208 3524 -+y(Options:)295 3624 y(-addprefsto)g(xxx)216 b(file)42 -+b(to)h(add)f(new)h(prefs)e(to)295 3723 y(-addversionno)299 -+b(add)43 b(version)d(number)i(to)g(name)g(of)h(unison)e(executable)f -+(on)i(server)295 3823 y(-auto)651 b(automatically)39 -+b(accept)i(default)f(actions)295 3922 y(-backup)g(xxx)391 -+b(add)43 b(a)g(regexp)e(to)i(the)f(backup)f(list)295 -+4022 y(-backups)519 b(keep)42 b(backup)f(copies)h(of)g(files)g -+(\(deprecated:)c(use)43 b('backup'\))295 4122 y(-batch)607 -+b(batch)42 b(mode:)f(ask)i(no)g(questions)c(at)k(all)295 -+4221 y(-contactquietly)255 b(Suppress)40 b(the)j('contacting)c(server') -+h(message)h(during)g(startup)295 4321 y(-debug)g(xxx)434 -+b(debug)42 b(module)f(xxx)h(\('all')g(->)g(everything,)d('verbose')h -+(->)j(more\))295 4421 y(-doc)f(xxx)521 b(show)42 b(documentation)d -+(\('-doc)i(topics')f(lists)i(topics\))295 4520 y(-dumbtty)519 -+b(do)43 b(not)g(try)f(to)h(change)e(terminal)f(settings)g(in)j(text)f -+(UI)295 4620 y(-editor)e(xxx)391 b(command)41 b(for)h(displaying)e(the) -+i(output)f(of)i(the)f(merge)g(program)295 4719 y(-fastcheck)d(xxx)260 -+b(do)43 b(fast)f(update)f(detection)f(\(`true',)g(`false',)h(or)h -+(`default'\))295 4819 y(-follow)e(xxx)391 b(add)43 b(a)g(regexp)e(to)i -+(the)f(follow)f(list)295 4919 y(-force)g(xxx)434 b(force)42 -+b(changes)f(from)h(this)g(replica)e(to)j(the)f(other)295 -+5018 y(-group)607 b(synchronize)39 b(group)295 5118 y(-height)h(n)479 -+b(height)42 b(\(in)g(lines\))f(of)i(main)f(window)f(in)i(graphical)c -+(interface)295 5218 y(-ignore)h(xxx)391 b(add)43 b(a)g(regexp)e(to)i -+(the)f(ignore)f(list)295 5317 y(-ignorecase)387 b(ignore)42 -+b(upper/lowercase)37 b(spelling)j(of)j(filenames)1908 -+5589 y Fn(19)p eop -+%%Page: 20 20 -+20 19 bop 295 83 a Fk(-ignorenot)39 b(xxx)260 b(add)43 -+b(a)g(regexp)e(to)i(the)f(ignorenot)e(list)295 183 y(-key)i(xxx)521 -+b(define)42 b(a)h(keyboard)d(shortcut)g(for)j(this)f(profile)295 -+282 y(-killserver)387 b(kill)42 b(server)f(when)h(done)g(\(even)g(when) -+g(using)f(sockets\))295 382 y(-label)g(xxx)434 b(provide)41 -+b(a)i(descriptive)c(string)i(label)h(for)g(this)g(profile)295 -+482 y(-log)695 b(record)42 b(actions)e(in)j(file)f(specified)e(by)j -+(logfile)d(preference)295 581 y(-logfile)g(xxx)347 b(Log)43 -+b(file)f(name)295 681 y(-maxbackups)d(n)304 b(number)42 -+b(of)g(backed)f(up)i(versions)d(of)j(a)g(file)295 780 -+y(-merge)e(xxx)434 b(command)41 b(for)h(merging)f(conflicting)e(files) -+295 880 y(-merge2)h(xxx)391 b(command)41 b(for)h(merging)f(files)h -+(\(when)f(no)i(common)e(version)g(exists\))295 980 y(-numericids)387 -+b(don't)42 b(map)g(uid/gid)f(values)g(by)i(user/group)c(names)295 -+1079 y(-owner)607 b(synchronize)39 b(owner)295 1179 y(-path)i(xxx)478 -+b(path)42 b(to)h(synchronize)295 1279 y(-perms)e(n)522 -+b(part)42 b(of)h(the)f(permissions)e(which)h(is)i(synchronized)295 -+1378 y(-prefer)d(xxx)391 b(choose)42 b(this)f(replica's)f(version)h -+(for)h(conflicting)d(changes)295 1478 y(-root)i(xxx)478 -+b(root)42 b(of)h(a)g(replica)295 1577 y(-rootalias)c(xxx)260 -+b(Register)41 b(alias)g(for)i(canonical)c(root)j(names)295 -+1677 y(-rshargs)e(xxx)347 b(other)42 b(arguments)e(\(if)i(any\))g(for)g -+(remote)g(shell)f(command)295 1777 y(-rshcmd)f(xxx)391 -+b(path)42 b(to)h(the)f(rsh)h(executable)295 1876 y(-servercmd)c(xxx)260 -+b(name)42 b(of)h(unison)e(executable)f(on)i(remote)g(server)295 -+1976 y(-silent)563 b(print)42 b(nothing)f(\(except)f(error)i -+(messages\))295 2076 y(-socket)e(xxx)391 b(act)43 b(as)g(a)g(server)e -+(on)i(a)g(socket)295 2175 y(-sortbysize)387 b(list)42 -+b(changed)f(files)h(by)g(size,)g(not)g(name)295 2275 -+y(-sortfirst)d(xxx)260 b(add)43 b(a)g(regexp)e(to)i(the)f(sortfirst)e -+(list)295 2374 y(-sortlast)g(xxx)303 b(add)43 b(a)g(regexp)e(to)i(the)f -+(sortlast)e(list)295 2474 y(-sortnewfirst)299 b(list)42 -+b(new)h(before)e(changed)g(files)295 2574 y(-sshcmd)f(xxx)391 -+b(path)42 b(to)h(the)f(ssh)h(executable)295 2673 y(-statusdepth)38 -+b(n)261 b(status)42 b(display)e(depth)i(for)g(local)g(files)295 -+2773 y(-terse)607 b(suppress)41 b(status)g(messages)295 -+2873 y(-testserver)387 b(exit)42 b(immediately)d(after)j(the)g -+(connection)e(to)i(the)h(server)295 2972 y(-times)607 -+b(synchronize)39 b(modification)g(times)295 3072 y(-ui)j(xxx)565 -+b(select)42 b(user)f(interface)f(\('text')h(or)i('graphic'\))295 -+3171 y(-version)519 b(print)42 b(version)f(and)h(exit)295 -+3271 y(-xferbycopying)255 b(optimize)41 b(transfers)f(using)h(local)h -+(copies,)e(if)j(possible)0 3437 y Fn(Here,)32 b(in)f(more)g(detail,)h -+(are)e(what)h(they)g(do.)48 b(Man)n(y)30 b(are)h(discussed)f(in)i(ev)n -+(en)e(greater)g(detail)h(in)g(other)g(sections)g(of)g(the)0 -+3537 y(man)n(ual.)0 3703 y Fl(addprefsto)h Fk(xxx)40 -+b Fn(By)27 b(default,)g(new)g(preferences)f(added)h(b)n(y)f(Unison)h -+(\(e.g.,)g(new)g Fk(ignore)d Fn(clauses\))i(will)i(b)r(e)f(app)r(ended) -+208 3802 y(to)e(whatev)n(er)g(preference)g(\014le)h(Unison)g(w)n(as)f -+(told)h(to)g(load)f(at)h(the)g(b)r(eginning)g(of)g(the)g(run.)36 -+b(Setting)27 b(the)f(preference)208 3902 y Fk(addprefsto)39 -+b Fb(filename)g Fn(mak)n(es)26 b(Unison)55 b(add)28 b(new)g -+(preferences)e(to)i(the)g(\014le)f(named)h Fb(filename)39 -+b Fn(instead.)0 4068 y Fl(addv)m(ersionno)73 b Fn(When)31 -+b(this)f(\015ag)e(is)i(set)g(to)f Fk(true)p Fn(,)g(Unison)g(will)h(use) -+g Fk(unison-)p Fb(currentv)o(ers)o(io)o(nnu)o(mb)o(er)38 -+b Fn(instead)29 b(of)208 4168 y(just)38 b Fk(unison)d -+Fn(as)h(the)i(remote)f(serv)n(er)f(command.)66 b(This)37 -+b(allo)n(ws)f(m)n(ultiple)i(binaries)f(for)g(di\013eren)n(t)g(v)n -+(ersions)f(of)208 4267 y(unison)d(to)g(co)r(exist)g(con)n(v)n(enien)n -+(tly)g(on)g(the)h(same)f(serv)n(er:)47 b(whic)n(hev)n(er)32 -+b(v)n(ersion)g(is)h(run)h(on)f(the)h(clien)n(t,)h(the)f(same)208 -+4367 y(v)n(ersion)26 b(will)h(b)r(e)h(selected)g(on)f(the)h(serv)n(er.) -+0 4533 y Fl(auto)74 b Fn(When)27 b(set)g(to)g Fk(true)p -+Fn(,)f(this)h(\015ag)f(causes)g(the)i(user)e(in)n(terface)g(to)h(skip)g -+(asking)f(for)g(con\014rmations)g(except)h(for)g(non-)208 -+4633 y(con\015icting)g(c)n(hanges.)35 b(\(More)27 b(precisely)-7 -+b(,)27 b(when)h(the)f(user)g(in)n(terface)g(is)h(done)f(setting)g(the)h -+(propagation)e(direction)208 4732 y(for)35 b(one)h(en)n(try)f(and)h(is) -+g(ab)r(out)g(to)g(mo)n(v)n(e)f(to)h(the)h(next,)h(it)f(will)f(skip)g(o) -+n(v)n(er)f(all)g(non-con\015icting)h(en)n(tries)f(and)h(go)208 -+4832 y(directly)27 b(to)g(the)h(next)g(con\015ict.\))0 -+4998 y Fl(bac)m(kup)34 b Fk(xxx)40 b Fn(Including)d(the)g(preference)f -+Fk(-backup)41 b Fb(pathspec)48 b Fn(causes)35 b(Unison)i(to)g(mak)n(e)f -+(bac)n(k)g(up)h(for)f(eac)n(h)g(path)208 5098 y(that)28 -+b(matc)n(hes)g Fb(pathspec)11 b Fn(.)40 b(More)28 b(precisely)-7 -+b(,)28 b(for)g(eac)n(h)g(path)h(that)f(matc)n(hes)g(this)h -+Fb(pathspec)11 b Fn(,)29 b(Unison)g(will)g(k)n(eep)208 -+5197 y(sev)n(eral)20 b(old)j(v)n(ersions)e(of)h(a)g(\014le)h(as)f(a)g -+(bac)n(kup)g(whenev)n(er)g(a)g(c)n(hange)f(is)i(propagated.)33 -+b(These)22 b(bac)n(kup)g(\014les)h(are)f(left)h(in)208 -+5297 y(the)k(directory)f(sp)r(eci\014ed)i(b)n(y)f(the)g(en)n(vironmen)n -+(t)g(v)-5 b(ariable)26 b Fk(UNISONBACKUPDIR)21 b Fn(\()p -+Fk(.unison/backup/)g Fn(b)n(y)27 b(default\).)1908 5589 -+y(20)p eop -+%%Page: 21 21 -+21 20 bop 208 83 a Fn(The)38 b(new)n(est)f(bac)n(k)n(ed)g(up)h(cop)n(y) -+f(willha)n(v)n(e)g(the)h(same)g(name)f(as)h(the)g(original;)j(older)d -+(v)n(ersions)e(will)i(b)r(e)g(named)208 183 y(with)31 -+b(extensions)f Fk(.n.unibck)p Fn(.)44 b(The)31 b(n)n(um)n(b)r(er)g(of)g -+(v)n(ersions)e(that)i(are)f(k)n(ept)h(is)g(determined)g(b)n(y)g(the)g -+Fk(maxbackups)208 282 y Fn(preference.)208 415 y(The)c(syn)n(tax)g(of) -+34 b Fb(pathspec)39 b Fn(is)27 b(describ)r(ed)h(in)f(Section)h(5.11)e -+([P)n(ath)h(Sp)r(eci\014cation].)0 581 y Fl(bac)m(kups)75 -+b Fn(When)28 b(this)g(\015ag)f(is)g Fk(true)p Fn(,)f(Unison)i(will)f(k) -+n(eep)h(the)g(old)f(v)n(ersion)f(of)h(a)h(\014le)f(as)g(a)g(bac)n(kup)g -+(whenev)n(er)g(a)g(c)n(hange)208 681 y(is)35 b(propagated.)58 -+b(These)35 b(bac)n(kup)g(\014les)g(are)f(left)i(in)g(the)f(same)g -+(directory)-7 b(,)36 b(with)g(extension)f Fk(.bak)p Fn(.)58 -+b(This)36 b(\015ag)e(is)208 780 y(probably)26 b(less)h(useful)h(for)f -+(most)h(users)e(than)i(the)56 b(t)28 b(bac)n(kup)f(\015ag.)0 -+946 y Fl(batc)m(h)75 b Fn(When)25 b(this)g(is)f(set)h(to)g -+Fk(true)p Fn(,)e(the)i(user)f(in)n(terface)g(will)h(ask)f(no)h -+(questions)f(at)g(all.)36 b(Non-con\015icting)24 b(c)n(hanges)f(will) -+208 1046 y(b)r(e)28 b(propagated;)d(con\015icts)j(will)g(b)r(e)g(skipp) -+r(ed.)0 1212 y Fl(con)m(tactquietly)75 b Fn(If)27 b(this)g(\015ag)f(is) -+g(set,)h(Unison)f(will)h(skip)g(displa)n(ying)e(the)i(`Con)n(tacting)f -+(serv)n(er')f(windo)n(w)h(\(whic)n(h)h(some)208 1312 -+y(users)f(\014nd)i(anno)n(ying\))f(during)g(startup.)0 -+1478 y Fl(debug)k Fk(xxx)41 b Fn(This)e(preference)f(is)h(used)g(to)g -+(mak)n(e)f(Unison)h(prin)n(t)g(v)-5 b(arious)38 b(sorts)g(of)h -+(information)g(ab)r(out)g(what)g(it)g(is)208 1577 y(doing)30 -+b(in)n(ternally)g(on)g(the)h(standard)f(error)f(stream.)46 -+b(It)31 b(can)f(b)r(e)i(used)e(man)n(y)h(times,)g(eac)n(h)f(time)i -+(with)f(the)g(name)208 1677 y(of)j(a)g(mo)r(dule)g(for)g(whic)n(h)h -+(debugging)e(information)h(should)g(b)r(e)g(prin)n(ted.)58 -+b(P)n(ossible)32 b(argumen)n(ts)h(for)h Fk(debug)e Fn(can)208 -+1777 y(b)r(e)h(found)h(b)n(y)f(lo)r(oking)f(for)h(calls)g(to)g -+Fk(Util.debug)c Fn(in)34 b(the)g(sources)d(\(using,)k(e.g.,)g -+Fk(grep)p Fn(\).)52 b(Setting)34 b Fk(-debug)41 b(all)208 -+1876 y Fn(causes)31 b(information)h(from)h Fi(al)t(l)h -+Fn(mo)r(dules)e(to)h(b)r(e)g(prin)n(ted)g(\(this)g(mo)r(de)g(of)f -+(usage)g(is)g(the)i(\014rst)e(one)g(to)h(try)-7 b(,)34 -+b(if)f(y)n(ou)208 1976 y(are)25 b(trying)i(to)g(understand)f(something) -+g(that)i(Unison)e(seems)h(to)g(b)r(e)g(doing)f(wrong\);)g -+Fk(-debug)42 b(verbose)24 b Fn(turns)i(on)208 2076 y(some)g(additional) -+h(debugging)f(output)i(from)f(some)g(mo)r(dules)g(\(e.g.,)g(it)h(will)g -+(sho)n(w)e(exactly)h(what)g(b)n(ytes)g(are)f(b)r(eing)208 -+2175 y(sen)n(t)h(across)f(the)i(net)n(w)n(ork\).)0 2341 -+y Fl(di\013)j Fk(xxx)40 b Fn(This)d(preference)f(can)g(b)r(e)h(used)f -+(to)h(con)n(trol)e(the)i(name)g(\(and)f(command-line)g(argumen)n(ts\))g -+(of)g(the)h(system)208 2441 y(utilit)n(y)e(used)g(to)g(generate)f -+(displa)n(ys)g(of)h(\014le)g(di\013erences.)60 b(The)35 -+b(default)g(is)g(`)p Fk(diff)p Fn('.)58 b(The)35 b(di\013)h(program)d -+(should)208 2540 y(exp)r(ect)27 b(t)n(w)n(o)g(\014le)h(names)f(as)g -+(argumen)n(ts)0 2707 y Fl(do)s(c)32 b Fk(xxx)40 b Fn(The)24 -+b(command-line)g(argumen)n(t)f Fk(-doc)42 b Fb(secname)36 -+b Fn(causes)23 b(unison)h(to)g(displa)n(y)g(section)g -+Fb(secname)36 b Fn(of)24 b(the)h(man-)208 2806 y(ual)h(on)h(the)g -+(standard)f(output)h(and)g(then)g(exit.)37 b(Use)27 b -+Fk(-doc)42 b(all)25 b Fn(to)i(displa)n(y)f(the)h(whole)g(man)n(ual,)f -+(whic)n(h)h(includes)208 2906 y(exactly)18 b(the)i(same)f(information)g -+(as)g(the)h(prin)n(ted)f(and)h(HTML)g(man)n(uals,)g(mo)r(dulo)f -+(formatting.)34 b(Use)20 b Fk(-doc)41 b(topics)208 3005 -+y Fn(to)27 b(obtain)g(a)h(list)f(of)h(the)g(names)f(of)h(the)g(v)-5 -+b(arious)26 b(sections)h(that)h(can)f(b)r(e)h(prin)n(ted.)0 -+3171 y Fl(dum)m(btt)m(y)73 b Fn(When)33 b(set)g(to)f -+Fk(true)p Fn(,)g(this)h(\015ag)f(mak)n(es)f(the)i(text)g(mo)r(de)f -+(user)g(in)n(terface)g(a)n(v)n(oid)f(trying)h(to)g(c)n(hange)f(an)n(y)h -+(of)208 3271 y(the)26 b(terminal)f(settings.)36 b(\(Normally)-7 -+b(,)26 b(Unison)g(puts)g(the)g(terminal)f(in)h(`ra)n(w)f(mo)r(de',)h -+(so)g(that)g(it)g(can)f(do)h(things)f(lik)n(e)208 3371 -+y(o)n(v)n(erwriting)e(the)j(curren)n(t)e(line.\))37 b(This)25 -+b(is)h(useful,)g(for)f(example,)h(when)f(Unison)h(runs)f(in)h(a)f -+(shell)g(inside)h(of)f(Emacs.)208 3504 y(When)j Fk(dumbtty)e -+Fn(is)i(set,)g(commands)g(to)g(the)g(user)g(in)n(terface)f(need)i(to)f -+(b)r(e)g(follo)n(w)n(ed)f(b)n(y)h(a)g(carriage)e(return)h(b)r(efore)208 -+3603 y(Unison)g(will)h(execute)f(them.)38 b(\(When)28 -+b(it)g(is)g(o\013,)f(Unison)h(recognizes)e(k)n(eystrok)n(es)f(as)i(so)r -+(on)g(as)g(they)g(are)g(t)n(yp)r(ed.\))208 3736 y(This)g(preference)g -+(has)g(no)g(e\013ect)h(on)g(the)g(graphical)e(user)h(in)n(terface.)0 -+3902 y Fl(editor)k Fk(xxx)41 b Fn(This)24 b(preference)h(is)f(used)h -+(when)g(unison)g(w)n(an)n(ts)f(to)h(displa)n(y)f(the)h(output)h(of)f -+(the)g(merge)f(program)f(when)i(its)208 4002 y(return)i(v)-5 -+b(alue)29 b(is)f(not)g(0.)39 b(User)28 b(c)n(hanges)e(the)j(\014le)g -+(as)e(he)i(w)n(an)n(ts)e(and)h(then)h(sa)n(v)n(e)e(it,)i(unison)f(will) -+g(tak)n(e)g(this)h(v)n(ersion)208 4101 y(for)e(the)h(sync)n -+(hronisation.)34 b(By)28 b(default)g(the)g(v)-5 b(alue)27 -+b(is)h(`emacs'.)0 4267 y Fl(fastc)m(hec)m(k)34 b Fk(xxx)40 -+b Fn(When)d(this)f(preference)f(is)h(set)g(to)g Fk(true)p -+Fn(,)h(Unison)f(will)g(use)g(\014le)g(creation)f(times)h(as)f(`pseudo)h -+(ino)r(de)208 4367 y(n)n(um)n(b)r(ers')28 b(when)g(scanning)g(replicas) -+g(for)g(up)r(dates,)h(instead)f(of)h(reading)e(the)i(full)g(con)n(ten)n -+(ts)f(of)h(ev)n(ery)e(\014le.)40 b(Under)208 4467 y(Windo)n(ws,)26 -+b(this)h(ma)n(y)f(cause)g(Unison)g(to)h(miss)f(propagating)f(an)h(up)r -+(date)h(if)g(the)g(create)f(time,)h(mo)r(di\014cation)g(time,)208 -+4566 y(and)e(length)g(of)h(the)g(\014le)f(are)g(all)g(unc)n(hanged)f(b) -+n(y)h(the)h(up)r(date)g(\(this)g(is)f(not)h(easy)e(to)i(ac)n(hiev)n(e,) -+e(but)i(it)g(can)f(b)r(e)h(done\).)208 4666 y(Ho)n(w)n(ev)n(er,)32 -+b(Unison)i(will)f(nev)n(er)f Fi(overwrite)j Fn(suc)n(h)e(an)g(up)r -+(date)h(with)f(a)g(c)n(hange)f(from)h(the)h(other)f(replica,)h(since)f -+(it)208 4765 y(alw)n(a)n(ys)c(do)r(es)i(a)f(safe)h(c)n(hec)n(k)f(for)h -+(up)r(dates)h(just)f(b)r(efore)g(propagating)e(a)i(c)n(hange.)46 -+b(Th)n(us,)32 b(it)g(is)f(reasonable)e(to)i(use)208 4865 -+y(this)j(switc)n(h)f(under)h(Windo)n(ws)f(most)h(of)g(the)g(time)g(and) -+g(o)r(ccasionally)e(run)i(Unison)f(once)h(with)g Fk(fastcheck)c -+Fn(set)208 4965 y(to)j Fk(false)p Fn(,)g(if)g(y)n(ou)g(are)f(w)n -+(orried)g(that)i(Unison)f(ma)n(y)g(ha)n(v)n(e)f(o)n(v)n(erlo)r(ok)n(ed) -+e(an)j(up)r(date.)55 b(The)33 b(default)h(v)-5 b(alue)33 -+b(of)h(the)208 5064 y(preference)e(is)g Fk(auto)p Fn(,)h(whic)n(h)g -+(causes)f(Unison)g(to)h(use)g(fast)g(c)n(hec)n(king)e(on)i(Unix)g -+(replicas)f(\(where)g(it)i(is)f(safe\))f(and)208 5164 -+y(slo)n(w)25 b(c)n(hec)n(king)g(on)i(Windo)n(ws)f(replicas.)35 -+b(F)-7 b(or)26 b(bac)n(kw)n(ard)f(compatibilit)n(y)-7 -+b(,)26 b Fk(yes)p Fn(,)g Fk(no)p Fn(,)g(and)g Fk(default)e -+Fn(can)i(b)r(e)h(used)g(in)208 5264 y(place)g(of)g Fk(true)p -+Fn(,)f Fk(false)p Fn(,)g(and)h Fk(auto)p Fn(.)36 b(See)27 -+b(Section)h(5.17)e([F)-7 b(ast)28 b(Chec)n(king])f(for)g(more)f -+(information.)1908 5589 y(21)p eop -+%%Page: 22 22 -+22 21 bop 0 83 a Fl(follo)m(w)31 b Fk(xxx)40 b Fn(Including)d(the)h -+(preference)e Fk(-follow)41 b Fb(pathspec)48 b Fn(causes)36 -+b(Unison)h(to)g(treat)f(sym)n(b)r(olic)h(links)g(matc)n(hing)208 -+183 y Fb(pathspec)e Fn(as)23 b(`in)n(visible')h(and)g(b)r(eha)n(v)n(e)f -+(as)g(if)i(the)f(ob)5 b(ject)24 b(p)r(oin)n(ted)g(to)g(b)n(y)f(the)i -+(link)f(had)g(app)r(eared)f(literally)g(at)h(this)208 -+282 y(p)r(osition)29 b(in)g(the)h(replica.)41 b(See)30 -+b(Section)f(5.13)f([Sym)n(b)r(olic)i(Links])f(for)g(more)f(details.)42 -+b(The)29 b(syn)n(tax)g(of)36 b Fb(pathspec>)208 382 y -+Fn(is)27 b(describ)r(ed)g(in)h(Section)g(5.11)e([P)n(ath)h(Sp)r -+(eci\014cation].)0 548 y Fl(force)32 b Fk(xxx)41 b Fn(Including)18 -+b(the)h(preference)e Fk(-force)41 b Fb(root)32 b Fn(causes)17 -+b(Unison)h(to)h(resolv)n(e)d(all)i(di\013erences)g(\(ev)n(en)g -+(non-con\015icting)208 648 y(c)n(hanges\))k(in)i(fa)n(v)n(or)e(of)30 -+b Fb(root)13 b Fn(.)36 b(This)23 b(e\013ectiv)n(ely)h(c)n(hanges)e -+(Unison)i(from)f(a)g(sync)n(hronizer)f(in)n(to)h(a)h(mirroring)d -+(utilit)n(y)-7 b(.)208 780 y(Y)g(ou)23 b(can)h(also)e(sp)r(ecify)i -+Fk(-force)42 b(newer)21 b Fn(\(or)j Fk(-force)41 b(older)p -+Fn(\))22 b(to)h(force)g(Unison)h(to)g(c)n(ho)r(ose)e(the)i(\014le)g -+(with)h(the)f(later)208 880 y(\(earlier\))i(mo)r(dtime.)38 -+b(In)28 b(this)f(case,)g(the)h Fk(-times)d Fn(preference)i(m)n(ust)h -+(also)e(b)r(e)i(enabled.)208 1013 y(This)f(preference)g(should)g(b)r(e) -+h(used)g(only)f(if)h(y)n(ou)f(are)g Fi(sur)l(e)g Fn(y)n(ou)g(kno)n(w)f -+(what)i(y)n(ou)f(are)f(doing!)0 1179 y Fl(group)73 b -+Fn(When)26 b(this)f(\015ag)g(is)g(set)g(to)g Fk(true)p -+Fn(,)f(the)h(group)f(attributes)h(of)g(the)h(\014les)f(are)f(sync)n -+(hronized.)34 b(Whether)26 b(the)f(group)208 1279 y(names)i(or)f(the)i -+(group)f(iden)n(ti\014ers)g(are)g(sync)n(hronizeddep)r(ends)f(on)i(the) -+f(preference)g Fk(numerids)p Fn(.)0 1445 y Fl(heigh)m(t)k -+Fk(n)85 b Fn(Used)28 b(to)f(set)h(the)g(heigh)n(t)f(\(in)h(lines\))g -+(of)g(the)g(main)f(windo)n(w)g(in)h(the)g(graphical)e(user)h(in)n -+(terface.)0 1611 y Fl(ignore)k Fk(xxx)40 b Fn(Including)f(the)g -+(preference)g Fk(-ignore)h Fb(pathspec)50 b Fn(causes)38 -+b(Unison)h(to)g(completely)f(ignore)g(paths)h(that)208 -+1710 y(matc)n(h)27 b Fb(pathspec)40 b Fn(\(as)28 b(w)n(ell)f(as)h -+(their)g(c)n(hildren\).)38 b(This)28 b(is)g(useful)h(for)f(a)n(v)n -+(oiding)e(sync)n(hronizing)g(temp)r(orary)h(\014les,)208 -+1810 y(ob)5 b(ject)25 b(\014les,)h(etc.)36 b(The)26 b(syn)n(tax)f(of)32 -+b Fb(pathspec)37 b Fn(is)25 b(describ)r(ed)h(in)g(Section)f(5.11)g([P)n -+(ath)g(Sp)r(eci\014cation],)h(and)f(further)208 1910 -+y(details)i(on)g(ignoring)f(paths)i(is)f(found)h(in)g(Section)g(5.12)e -+([Ignoring)g(P)n(aths].)0 2076 y Fl(ignorecase)73 b Fn(When)29 -+b(set)f(to)g Fk(true)p Fn(,)f(this)i(\015ag)f(causes)f(Unison)h(to)g -+(use)h(the)f(Windo)n(ws)g(seman)n(tics)g(for)g(capitalization)f(of)208 -+2175 y(\014lenames|i.e.,)36 b(\014les)f(in)g(the)g(t)n(w)n(o)f -+(replicas)f(whose)h(names)h(di\013er)g(in)g(\(upp)r(er-)f(and)h(lo)n(w) -+n(er-case\))d(`sp)r(elling')j(are)208 2275 y(treated)29 -+b(as)f(the)i(same)f(\014le.)43 b(This)29 b(\015ag)g(is)g(set)h -+(automatically)e(when)i(either)f(host)g(is)h(running)f(Windo)n(ws.)42 -+b(In)30 b(rare)208 2374 y(circumstances)d(it)i(is)g(also)f(useful)h(to) -+g(set)f(it)i(man)n(ually)d(\(e.g.)41 b(when)29 b(running)f(Unison)h(on) -+f(a)h(Unix)g(system)f(with)h(a)208 2474 y(F)-9 b(A)i(T)28 -+b([Windo)n(ws])f(v)n(olume)g(moun)n(ted\).)0 2640 y Fl(ignorenot)k -+Fk(xxx)40 b Fn(This)c(preference)f(o)n(v)n(errides)e(the)j(preference)f -+Fk(ignore)p Fn(.)59 b(It)36 b(giv)n(es)f(a)g(list)h(of)g(patterns)f -+(\(in)i(the)f(same)208 2740 y(format)f(as)h Fk(ignore)p -+Fn(\))e(for)i(paths)h(that)f(should)g(de\014nitely)h -+Fi(not)f Fn(b)r(e)h(ignored,)h(whether)e(or)g(not)g(they)h(happ)r(en)f -+(to)208 2839 y(matc)n(h)27 b(one)g(of)h(the)g Fk(ignore)d -+Fn(patterns.)208 2972 y(Note)39 b(that)g(the)g(seman)n(tics)g(of)78 -+b(t)39 b(ignore)f(and)h Fk(ignorenot)c Fn(is)k(a)g(little)g(coun)n -+(ter-in)n(tuitiv)n(e.)70 b(When)40 b(detecting)208 3072 -+y(up)r(dates,)22 b(Unison)f(examines)g(paths)g(in)g(depth-\014rst)g -+(order,)g(starting)f(from)h(the)g(ro)r(ots)f(of)h(the)h(replicas)e(and) -+h(w)n(orking)208 3171 y(do)n(wn)n(w)n(ards.)43 b(Before)29 -+b(examining)h(eac)n(h)g(path,)h(it)g(c)n(hec)n(ks)e(whether)h(it)h -+(matc)n(hes)61 b(t)30 b(ignore)g(and)g(do)r(es)g(not)g(matc)n(h)208 -+3271 y(t)j(ignorenot;)i(in)e(this)h(case)e(it)h(skips)g(this)h(path)f -+Fi(and)i(al)t(l)h(its)f(desc)l(endants)p Fn(.)54 b(This)33 -+b(means)g(that,)i(if)e(some)g(paren)n(t)208 3371 y(of)28 -+b(a)g(giv)n(en)g(path)g(matc)n(hes)g(an)g Fk(ignore)e -+Fn(pattern,)j(then)f(it)h(will)g(b)r(e)g(skipp)r(ed)f(ev)n(en)g(if)h -+(the)g(path)g(itself)g(matc)n(hes)e(an)208 3470 y Fk(ignorenot)17 -+b Fn(pattern.)35 b(In)22 b(particular,)f(putting)i Fk(ignore)41 -+b(=)i(Path)f(*)21 b Fn(in)h(y)n(our)e(pro\014le)h(and)h(then)g(using)43 -+b(t)21 b(ignorenot)208 3570 y(to)g(select)h(particular)f(paths)h(to)f -+(b)r(e)i(sync)n(hronized)d(will)i(not)g(w)n(ork.)34 b(Instead,)23 -+b(y)n(ou)e(should)g(use)h(the)h Fk(path)d Fn(preference)208 -+3670 y(to)27 b(c)n(ho)r(ose)f(particular)h(paths)g(to)h(sync)n -+(hronize.)0 3836 y Fl(k)m(ey)33 b Fk(xxx)40 b Fn(Used)29 -+b(in)g(a)g(pro\014le)f(to)h(de\014ne)h(a)e(n)n(umeric)h(k)n(ey)f -+(\(0-9\))h(that)g(can)g(b)r(e)g(used)g(in)h(the)f(graphical)e(user)i -+(in)n(terface)f(to)208 3935 y(switc)n(h)f(immediately)h(to)f(this)h -+(pro\014le.)0 4101 y Fl(killserv)m(er)73 b Fn(When)30 -+b(set)g(to)g Fk(true)p Fn(,)f(this)h(\015ag)f(causes)g(Unison)h(to)f -+(kill)h(the)h(remote)e(serv)n(er)f(pro)r(cess)h(when)h(the)g(sync)n -+(hro-)208 4201 y(nization)24 b(is)g(\014nished.)36 b(This)25 -+b(b)r(eha)n(vior)e(is)h(the)h(default)g(for)f Fk(ssh)f -+Fn(connections,)h(so)g(this)h(preference)e(is)i(not)f(normally)208 -+4301 y(needed)f(when)g(running)f(o)n(v)n(er)g Fk(ssh)p -+Fn(;)h(it)g(is)g(pro)n(vided)f(so)h(that)g(so)r(c)n(k)n(et-mo)r(de)e -+(serv)n(ers)g(can)i(b)r(e)g(killed)g(o\013)g(after)g(a)g(single)208 -+4400 y(run)k(of)h(Unison,)f(rather)g(than)h(w)n(aiting)e(to)i(accept)f -+(future)h(connections.)36 b(\(Some)28 b(users)f(prefer)g(to)g(start)g -+(a)h(remote)208 4500 y(so)r(c)n(k)n(et)e(serv)n(er)g(for)h(eac)n(h)g -+(run)g(of)h(Unison,)f(rather)g(than)h(lea)n(ving)e(one)h(running)g(all) -+h(the)g(time.\))0 4666 y Fl(lab)s(el)j Fk(xxx)40 b Fn(Used)25 -+b(in)g(a)f(pro\014le)g(to)h(pro)n(vide)e(a)h(descriptiv)n(e)g(string)g -+(do)r(cumen)n(ting)h(its)g(settings.)35 b(\(This)25 b(is)g(useful)g -+(for)f(users)208 4765 y(that)37 b(switc)n(h)f(b)r(et)n(w)n(een)h(sev)n -+(eral)e(pro\014les,)j(esp)r(ecially)f(using)f(the)h(`fast)g(switc)n(h') -+g(feature)g(of)f(the)h(graphical)f(user)208 4865 y(in)n(terface.\))0 -+5031 y Fl(log)72 b Fn(When)28 b(this)g(\015ag)f(is)h(set,)f(Unison)h -+(will)g(log)e(all)i(c)n(hanges)e(to)h(the)h(\014lesystems)g(on)f(a)g -+(\014le.)0 5197 y Fl(log\014le)j Fk(xxx)40 b Fn(By)26 -+b(default,)h(logging)d(messages)h(will)h(b)r(e)g(app)r(ended)g(to)g -+(the)h(\014le)f Fk(unison.log)c Fn(in)k(y)n(our)f(HOME)g(directory)-7 -+b(.)208 5297 y(Set)28 b(this)f(preference)g(if)h(y)n(ou)f(prefer)g -+(another)g(\014le.)1908 5589 y(22)p eop -+%%Page: 23 23 -+23 22 bop 0 83 a Fl(maxbac)m(kups)33 b Fk(n)84 b Fn(This)31 -+b(preference)f(sp)r(eci\014es)h(the)h(n)n(um)n(b)r(er)e(of)h(bac)n(kup) -+f(v)n(ersions)g(that)h(will)g(b)r(e)g(k)n(ept)g(b)n(y)g(unison,)h(for) -+208 183 y(eac)n(h)26 b(path)i(that)g(matc)n(hes)f(the)h(predicate)f -+Fk(backup)p Fn(.)34 b(The)28 b(default)g(is)g(2.)0 347 -+y Fl(merge)i Fk(xxx)40 b Fn(This)28 b(preference)e(can)h(b)r(e)h(used)g -+(to)f(run)g(a)g(merge)g(program)e(whic)n(h)j(will)g(create)e(a)h(new)h -+(v)n(ersion)e(of)h(the)h(\014le)208 447 y(with)d(the)h(last)f(bac)n -+(kup)g(and)g(the)h(b)r(oth)f(replicas.)35 b(This)26 b(new)f(v)n(ersion) -+f(will)h(b)r(e)h(used)f(for)g(the)h(sync)n(hronization.)34 -+b(See)208 546 y(Section)27 b(5.8)g([Merging)f(Con\015icting)i(V)-7 -+b(ersions])26 b(for)h(further)h(detail.)0 711 y Fl(merge2)i -+Fk(xxx)40 b Fn(This)25 b(preference)f(can)g(b)r(e)h(used)g(to)g(run)g -+(a)f(merge)g(program)f(whic)n(h)h(will)h(create)f(a)h(new)g(v)n(ersion) -+e(of)i(the)g(\014le)208 810 y(with)g(the)h(last)f(bac)n(kup)g(and)g -+(the)h(b)r(oth)f(replicas.)35 b(This)26 b(new)f(v)n(ersion)f(will)h(b)r -+(e)h(used)f(for)g(the)h(sync)n(hronization.)34 b(See)208 -+910 y(Section)27 b(5.8)g([Merging)f(Con\015icting)i(V)-7 -+b(ersions])26 b(for)h(further)h(detail.)0 1074 y Fl(n)m(umericids)72 -+b Fn(When)28 b(this)h(\015ag)e(is)h(set)g(to)g Fk(true)p -+Fn(,)f(groups)g(and)h(users)f(are)g(sync)n(hronized)g(n)n(umerically)-7 -+b(,)27 b(rather)g(than)h(b)n(y)208 1174 y(name.)208 1306 -+y(The)20 b(sp)r(ecial)h(uid)f(0)h(and)f(the)h(sp)r(ecial)f(group)g(0)g -+(are)g(nev)n(er)f(mapp)r(ed)i(via)f(user/group)f(names)h(ev)n(en)g(if)h -+(this)g(preference)208 1405 y(is)27 b(not)h(set.)0 1570 -+y Fl(o)m(wner)73 b Fn(When)25 b(this)f(\015ag)f(is)g(set)h(to)f -+Fk(true)p Fn(,)g(the)h(o)n(wner)f(attributes)g(of)h(the)g(\014les)f -+(are)g(sync)n(hronized.)34 b(Whether)24 b(the)g(o)n(wner)208 -+1669 y(names)j(or)f(the)i(o)n(wner)f(iden)n(ti\014ers)g(are)g(sync)n -+(hronizeddep)r(ends)f(on)h(the)h(preference)f(extttn)n(umerids.)0 -+1834 y Fl(path)32 b Fk(xxx)41 b Fn(When)35 b(no)g Fk(path)f -+Fn(preference)g(is)h(giv)n(en,)h(Unison)f(will)h(simply)f(sync)n -+(hronize)f(the)h(t)n(w)n(o)f(en)n(tire)h(replicas,)h(b)r(e-)208 -+1933 y(ginning)g(from)h(the)g(giv)n(en)g(pair)f(of)h(ro)r(ots.)64 -+b(If)38 b(one)f(or)f(more)g Fk(path)f Fn(preferences)i(are)f(giv)n(en,) -+i(then)g(Unison)f(will)208 2033 y(sync)n(hronize)e(only)h(these)h -+(paths)g(and)f(their)h(c)n(hildren.)64 b(\(This)37 b(is)g(useful)g(for) -+g(doing)f(a)g(fast)h(sync)n(h)f(of)h(just)g(one)208 2133 -+y(directory)-7 b(,)41 b(for)e(example.\))74 b(Note)40 -+b(that)g Fk(path)e Fn(preferences)h(are)f(in)n(tepreted)i -+(literally|they)f(are)g(not)h(regular)208 2232 y(expressions.)0 -+2396 y Fl(p)s(erms)30 b Fk(n)85 b Fn(The)32 b(in)n(teger)g(v)-5 -+b(alue)33 b(of)f(this)i(preference)d(is)i(a)f(mask)h(indicating)f(whic) -+n(h)h(p)r(ermission)f(bits)h(should)f(b)r(e)i(syn-)208 -+2496 y(c)n(hronized.)57 b(It)35 b(is)g(set)g(b)n(y)f(default)i(to)e(0)p -+Fa(o)p Fn(1777:)50 b(all)34 b(bits)h(but)h(the)f(set-uid)g(and)f -+(set-gid)h(bits)g(are)f(sync)n(hronised)208 2596 y(\(sync)n(hronizing) -+23 b(theses)h(latter)g(bits)h(can)f(b)r(e)h(a)f(securit)n(y)f -+(hazard\).)35 b(If)25 b(y)n(ou)f(w)n(an)n(t)g(to)g(sync)n(hronize)f -+(all)h(bits,)i(y)n(ou)d(can)208 2695 y(set)k(the)h(v)-5 -+b(alue)28 b(of)f(this)h(preference)f(to)g Fj(\000)p Fn(1.)0 -+2860 y Fl(prefer)32 b Fk(xxx)40 b Fn(Including)d(the)g(preference)f -+Fk(-prefer)41 b Fb(root)49 b Fn(causes)36 b(Unison)h(alw)n(a)n(ys)d(to) -+j(resolv)n(e)e(con\015icts)h(in)h(fa)n(v)n(or)e(of)208 -+2959 y Fb(root)12 b Fn(,)27 b(rather)d(than)i(asking)f(for)g(guidance)g -+(from)g(the)h(user.)36 b(\(The)26 b(syn)n(tax)f(of)32 -+b Fb(root)38 b Fn(is)26 b(the)g(same)f(as)g(for)h(the)g -+Fk(root)208 3059 y Fn(preference,)g(plus)i(the)g(sp)r(ecial)f(v)-5 -+b(alues)28 b Fk(newer)d Fn(and)j Fk(older)p Fn(.\))208 -+3191 y(This)f(preference)g(should)g(b)r(e)h(used)g(only)f(if)h(y)n(ou)f -+(are)g Fi(sur)l(e)g Fn(y)n(ou)g(kno)n(w)f(what)i(y)n(ou)f(are)f(doing!) -+0 3355 y Fl(ro)s(ot)31 b Fk(xxx)41 b Fn(Eac)n(h)20 b(use)h(of)g(this)g -+(preference)f(names)h(the)h(ro)r(ot)e(of)h(one)g(of)g(the)g(replicas)f -+(for)h(Unison)g(to)g(sync)n(hronize.)33 b(Exactly)208 -+3455 y(t)n(w)n(o)24 b(ro)r(ots)g(are)h(needed,)h(so)e(normal)h(mo)r -+(des)g(of)g(usage)f(are)h(either)g(to)g(giv)n(e)f(t)n(w)n(o)h(v)-5 -+b(alues)25 b(for)g Fk(root)f Fn(in)h(the)h(pro\014le,)f(or)208 -+3554 y(to)30 b(giv)n(e)g(no)g(v)-5 b(alues)30 b(in)h(the)g(pro\014le)f -+(and)h(pro)n(vide)e(t)n(w)n(o)h(on)g(the)h(command)f(line.)47 -+b(Details)30 b(of)h(the)g(syn)n(tax)f(of)g(ro)r(ots)208 -+3654 y(can)d(b)r(e)h(found)g(in)g(Section)f(4.1)g([Ro)r(ots].)208 -+3786 y(The)h(t)n(w)n(o)g(ro)r(ots)f(can)i(b)r(e)g(giv)n(en)e(in)i -+(either)g(order;)e(Unison)i(will)g(sort)e(them)i(in)n(to)g(a)f -+(canonical)f(order)g(b)r(efore)i(doing)208 3886 y(an)n(ything)k(else.) -+55 b(It)34 b(also)e(tries)i(to)f(`canonize')g(the)i(mac)n(hine)e(names) -+g(and)h(paths)f(that)h(app)r(ear)f(in)h(the)g(ro)r(ots,)h(so)208 -+3985 y(that,)25 b(if)f(Unison)h(is)f(in)n(v)n(ok)n(ed)e(later)i(with)g -+(a)g(sligh)n(tly)g(di\013eren)n(t)g(name)g(for)g(the)g(same)g(ro)r(ot,) -+g(it)h(will)f(b)r(e)h(able)e(to)i(lo)r(cate)208 4085 -+y(the)j(correct)e(arc)n(hiv)n(es.)0 4249 y Fl(ro)s(otalias)31 -+b Fk(xxx)40 b Fn(When)28 b(calculating)e(the)h(name)g(of)f(the)i(arc)n -+(hiv)n(e)d(\014les)i(for)f(a)g(giv)n(en)g(pair)h(of)f(ro)r(ots,)g -+(Unison)h(replaces)f(an)n(y)208 4349 y(ro)r(ots)g(matc)n(hing)h(the)h -+(left-hand)g(side)g(of)f(an)n(y)g(ro)r(otalias)f(rule)h(b)n(y)g(the)h -+(corresp)r(onding)e(righ)n(t-hand)g(side.)0 4513 y Fl(rshargs)32 -+b Fk(xxx)40 b Fn(The)33 b(string)g(v)-5 b(alue)33 b(of)g(this)h -+(preference)e(will)h(b)r(e)h(passed)e(as)h(additional)f(argumen)n(ts)g -+(\(b)r(esides)i(the)f(host)208 4613 y(name)26 b(and)f(the)i(name)f(of)g -+(the)h(Unison)f(executable)f(on)h(the)h(remote)e(system\))i(to)f(the)g -+Fk(ssh)f Fn(or)g Fk(rsh)g Fn(command)h(used)208 4712 -+y(to)32 b(in)n(v)n(ok)n(e)f(the)h(remote)g(serv)n(er.)50 -+b(\(This)32 b(option)g(is)h(used)f(for)g(passing)f(argumen)n(ts)g(to)i -+(b)r(oth)f Fk(rsh)g Fn(or)f Fk(ssh)p Fn(|that's)208 4812 -+y(wh)n(y)c(its)h(name)f(is)g Fk(rshargs)e Fn(rather)i(than)g -+Fk(sshargs)p Fn(.\))0 4976 y Fl(rshcmd)k Fk(xxx)40 b -+Fn(This)26 b(preference)f(can)g(b)r(e)i(used)f(to)f(explicitly)h(set)g -+(the)g(name)g(of)g(the)g(rsh)f(executable)h(\(e.g.,)g(giving)f(a)g -+(full)208 5076 y(path)i(name\),)h(if)g(necessary)-7 b(.)0 -+5240 y Fl(serv)m(ercmd)31 b Fk(xxx)41 b Fn(This)35 b(preference)g(can)g -+(b)r(e)h(used)g(to)f(explicitly)h(set)f(the)h(name)f(of)h(the)g(Unison) -+f(executable)g(on)h(the)208 5340 y(remote)27 b(serv)n(er)e(\(e.g.,)j -+(giving)f(a)g(full)h(path)g(name\),)g(if)g(necessary)-7 -+b(.)1908 5589 y(23)p eop -+%%Page: 24 24 -+24 23 bop 0 83 a Fl(silen)m(t)72 b Fn(When)25 b(this)g(preference)f(is) -+h(set)f(to)h Fk(true)p Fn(,)e(the)i(textual)g(user)f(in)n(terface)g -+(will)h(prin)n(t)f(nothing)h(at)f(all,)h(except)g(in)g(the)208 -+183 y(case)h(of)i(errors.)35 b(Setting)29 b Fk(silent)c -+Fn(to)i(true)h(automatically)e(sets)i(the)g Fk(batch)d -+Fn(preference)i(to)h Fk(true)p Fn(.)0 349 y Fl(sortb)m(ysize)73 -+b Fn(When)25 b(this)f(\015ag)f(is)g(set,)i(the)f(user)f(in)n(terface)g -+(will)h(list)g(c)n(hanged)f(\014les)g(b)n(y)h(size)f(\(smallest)h -+(\014rst\))f(rather)g(than)208 448 y(b)n(y)j(name.)37 -+b(This)26 b(is)h(useful,)h(for)e(example,)h(for)f(sync)n(hronizing)f(o) -+n(v)n(er)g(slo)n(w)h(links,)h(since)g(it)g(puts)g(v)n(ery)f(large)f -+(\014les)i(at)208 548 y(the)h(end)f(of)h(the)g(list)g(where)f(they)h -+(will)f(not)h(prev)n(en)n(t)f(smaller)f(\014les)i(from)f(b)r(eing)h -+(transferred)e(quic)n(kly)-7 b(.)208 681 y(This)24 b(preference)f(\(as) -+h(w)n(ell)g(as)f(the)i(other)e(sorting)g(\015ags,)h(but)h(not)f(the)h -+(sorting)e(preferences)g(that)h(require)g(patterns)208 -+780 y(as)34 b(argumen)n(ts\))g(can)h(b)r(e)g(set)g(in)n(teractiv)n(ely) -+f(and)h(temp)r(orarily)f(using)g(the)i('Sort')e(men)n(u)i(in)f(the)g -+(graphical)f(user)208 880 y(in)n(terface.)0 1046 y Fl(sort\014rst)e -+Fk(xxx)40 b Fn(Eac)n(h)32 b(argumen)n(t)g(to)h Fk(sortfirst)d -+Fn(is)j(a)g(pattern)g Fb(pathspec)11 b Fn(,)35 b(whic)n(h)e(describ)r -+(es)g(a)g(set)g(of)g(paths.)54 b(Files)208 1146 y(matc)n(hing)32 -+b(an)n(y)h(of)g(these)g(patterns)g(will)g(b)r(e)h(listed)f(\014rst)g -+(in)h(the)f(user)g(in)n(terface.)53 b(The)33 b(syn)n(tax)f(of)40 -+b Fb(pathspec)k Fn(is)208 1245 y(describ)r(ed)27 b(in)h(Section)f(5.11) -+g([P)n(ath)f(Sp)r(eci\014cation].)0 1411 y Fl(sortlast)31 -+b Fk(xxx)41 b Fn(Similar)33 b(to)g Fk(sortfirst)p Fn(,)f(except)h(that) -+h(\014les)f(matc)n(hing)g(one)h(of)f(these)h(patterns)f(will)h(b)r(e)f -+(listed)h(at)g(the)208 1511 y(v)n(ery)26 b(end.)0 1677 -+y Fl(sortnew\014rst)73 b Fn(When)33 b(this)f(\015ag)f(is)h(set,)h(the)f -+(user)g(in)n(terface)f(will)h(list)h(newly)e(created)h(\014les)g(b)r -+(efore)f(all)h(others.)49 b(This)208 1777 y(is)34 b(useful,)i(for)e -+(example,)i(for)e(c)n(hec)n(king)f(that)h(newly)h(created)e(\014les)i -+(are)e(not)h(`junk',)j(i.e.,)f(ones)e(that)h(should)f(b)r(e)208 -+1876 y(ignored)26 b(or)h(deleted)h(rather)e(than)i(sync)n(hronized.)0 -+2042 y Fl(sshcmd)i Fk(xxx)40 b Fn(This)26 b(preference)g(can)f(b)r(e)h -+(used)g(to)g(explicitly)g(set)g(the)g(name)g(of)g(the)g(ssh)g -+(executable)g(\(e.g.,)g(giving)f(a)g(full)208 2142 y(path)i(name\),)h -+(if)g(necessary)-7 b(.)0 2308 y Fl(ssh)m(v)m(ersion)31 -+b Fk(xxx)41 b Fn(This)31 b(preference)f(can)h(b)r(e)g(used)g(to)g(con)n -+(trol)f(whic)n(h)h(v)n(ersion)e(of)i(ssh)g(should)g(b)r(e)g(used)g(to)g -+(connect)g(to)208 2408 y(the)c(serv)n(er.)35 b(Legal)26 -+b(v)-5 b(alues)26 b(are)g(1)h(and)f(2,)h(whic)n(h)g(will)g(cause)f -+(unison)h(to)g(try)f(to)h(use)g Fk(ssh1)e Fn(or)p Fk(ssh2)g -+Fn(instead)i(of)f(just)208 2507 y Fk(ssh)i Fn(to)i(in)n(v)n(ok)n(e)e -+(ssh.)43 b(The)29 b(default)i(v)-5 b(alue)29 b(is)h(empt)n(y)-7 -+b(,)30 b(whic)n(h)g(will)g(mak)n(e)f(unison)g(use)h(whatev)n(er)e(v)n -+(ersion)g(of)i(ssh)f(is)208 2607 y(installed)e(as)g(the)h(default)g -+(`ssh')f(command.)0 2773 y Fl(statusdepth)32 b Fk(n)85 -+b Fn(This)28 b(preference)g(suppresses)g(the)h(displa)n(y)f(of)g -+(status)h(messages)e(during)h(up)r(date)h(detection)g(on)g(the)208 -+2873 y(lo)r(cal)g(mac)n(hine)g(for)h(paths)f(deep)r(er)h(than)g(the)g -+(sp)r(eci\014ed)h(cuto\013.)44 b(\(Displa)n(ying)29 b(to)r(o)h(man)n(y) -+f(lo)r(cal)g(status)h(messages)208 2972 y(can)d(slo)n(w)f(do)n(wn)h(up) -+r(date)i(detection)e(somewhat.\))0 3138 y Fl(terse)73 -+b Fn(When)28 b(this)g(preference)f(is)g(set)h(to)f Fk(true)p -+Fn(,)f(the)i(user)f(in)n(terface)g(will)h(not)g(prin)n(t)f(status)h -+(messages.)0 3304 y Fl(testserv)m(er)74 b Fn(Setting)23 -+b(this)g(\015ag)g(on)f(the)i(command)e(line)i(causes)e(Unison)h(to)g -+(attempt)g(to)g(connect)g(to)g(the)g(remote)g(serv)n(er)208 -+3404 y(and,)31 b(if)g(successful,)g(prin)n(t)f(a)g(message)f(and)h -+(immediately)h(exit.)45 b(Useful)31 b(for)f(debugging)g(installation)g -+(problems.)208 3504 y(Should)d(not)h(b)r(e)g(set)f(in)h(preference)f -+(\014les.)0 3670 y Fl(times)71 b Fn(When)28 b(this)g(\015ag)f(is)g(set) -+h(to)f Fk(true)p Fn(,)f(\014le)i(mo)r(di\014cation)g(times)f(\(but)i -+(not)f(directory)e(mo)r(dtimes\))i(are)f(propagated.)0 -+3836 y Fl(ui)k Fk(xxx)41 b Fn(This)30 b(preference)g(selects)g(either)h -+(the)f(graphical)f(or)h(the)h(textual)g(user)f(in)n(terface.)45 -+b(Legal)29 b(v)-5 b(alues)30 b(are)g Fk(graphic)208 3935 -+y Fn(or)c Fk(text)p Fn(.)208 4068 y(If)32 b(the)g(Unison)f(executable)h -+(w)n(as)e(compiled)i(with)g(only)f(a)h(textual)f(in)n(terface,)h(this)g -+(option)g(has)f(no)g(e\013ect.)50 b(\(The)208 4168 y(pre-compiled)26 -+b(binaries)h(are)g(all)g(compiled)g(with)i(b)r(oth)f(in)n(terfaces)e(a) -+n(v)-5 b(ailable.\))0 4334 y Fl(v)m(ersion)73 b Fn(Prin)n(t)27 -+b(the)g(curren)n(t)g(v)n(ersion)e(n)n(um)n(b)r(er)j(and)f(exit.)37 -+b(\(This)27 b(option)g(only)g(mak)n(es)f(sense)h(on)g(the)h(command)f -+(line.\))0 4500 y Fl(xferb)m(ycop)m(ying)75 b Fn(When)31 -+b(this)g(preference)f(is)h(set,)g(Unison)g(will)f(try)h(to)f(a)n(v)n -+(oid)f(transferring)g(\014le)i(con)n(ten)n(ts)f(across)f(the)208 -+4599 y(net)n(w)n(ork)23 b(b)n(y)h(recognizing)f(when)h(a)g(\014le)h -+(with)g(the)g(required)f(con)n(ten)n(ts)g(already)f(exists)h(in)h(the)f -+(target)g(replica.)35 b(This)208 4699 y(usually)27 b(allo)n(ws)f -+(\014le)i(mo)n(v)n(es)e(to)h(b)r(e)h(propagated)e(v)n(ery)h(quic)n(kly) -+-7 b(.)36 b(The)28 b(default)g(v)-5 b(alue)27 b(is)h(exttttrue.)1908 -+5589 y(24)p eop -+%%Page: 25 25 -+25 24 bop 0 83 a Fh(5.5)112 b(Pro\014les)0 236 y Fn(A)20 -+b Fi(pr)l(o\014le)g Fn(is)f(a)h(text)f(\014le)h(that)g(sp)r(eci\014es)f -+(p)r(ermanen)n(t)g(settings)h(for)f(ro)r(ots,)h(paths,)h(ignore)d -+(patterns,)j(and)e(other)g(preferences,)0 336 y(so)28 -+b(that)h(they)g(do)f(not)h(need)g(to)f(b)r(e)h(t)n(yp)r(ed)g(at)g(the)g -+(command)f(line)h(ev)n(ery)e(time)i(Unison)g(is)f(run.)40 -+b(Pro\014les)27 b(should)i(reside)0 436 y(in)j(the)g -+Fk(.unison)d Fn(directory)h(on)i(the)g(clien)n(t)g(mac)n(hine.)49 -+b(If)32 b(Unison)f(is)h(started)f(with)h(just)h(one)e(argumen)n(t)g -+Fb(name)44 b Fn(on)32 b(the)0 535 y(command)38 b(line,)i(it)f(lo)r(oks) -+e(for)g(a)h(pro\014le)f(called)h Fb(name)13 b Fk(.prf)36 -+b Fn(in)i(the)h Fk(.unison)c Fn(directory)-7 b(.)67 b(If)38 -+b(it)h(is)e(started)h(with)g(no)0 635 y(argumen)n(ts,)32 -+b(it)g(scans)f(the)h Fk(.unison)d Fn(directory)i(for)g(\014les)h(whose) -+f(names)h(end)g(in)g Fk(.prf)f Fn(and)g(o\013ers)g(a)h(men)n(u)g(\(pro) -+n(vided)0 734 y(that)g(the)g(Unison)f(executable)g(is)g(compiled)h -+(with)g(the)g(graphical)d(user)i(in)n(terface\).)48 b(If)32 -+b(a)f(\014le)h(named)f Fk(default.prf)c Fn(is)0 834 y(found,)h(its)g -+(settings)f(will)h(b)r(e)g(o\013ered)f(as)g(the)h(default)g(c)n -+(hoices.)125 934 y(T)-7 b(o)27 b(set)g(the)h(v)-5 b(alue)28 -+b(of)f(a)h(preference)e Fk(p)i Fn(p)r(ermanen)n(tly)-7 -+b(,)27 b(add)g(to)h(the)g(appropriate)e(pro\014le)h(a)g(line)h(of)f -+(the)h(form)349 1100 y Fk(p)43 b(=)g(true)125 1266 y -+Fn(for)27 b(a)g(b)r(o)r(olean)g(\015ag)g(or)349 1432 -+y Fk(p)43 b(=)g(<value>)125 1598 y Fn(for)27 b(a)g(preference)g(of)g -+(an)n(y)g(other)g(t)n(yp)r(e.)125 1697 y(Whitespaces)i(around)f -+Fk(p)i Fn(and)f Fk(xxx)g Fn(are)f(ignored.)42 b(A)30 -+b(pro\014le)f(ma)n(y)g(also)g(include)h(blank)f(lines,)h(and)g(lines)f -+(b)r(eginning)0 1797 y(with)f Fk(#)p Fn(;)f(b)r(oth)h(kinds)g(of)g -+(lines)f(are)g(ignored.)125 1897 y(When)i(Unison)g(starts,)f(it)i -+(\014rst)e(reads)g(the)h(pro\014le)f(and)h(then)h(the)f(command)f -+(line,)i(so)e(command-line)h(options)f(will)0 1996 y(o)n(v)n(erride)d -+(settings)j(from)f(the)h(pro\014le.)125 2096 y(Pro\014les)e(ma)n(y)h -+(also)g(include)h(lines)g(of)g(the)g(form)g Fk(include)40 -+b Fb(name)13 b Fn(,)28 b(whic)n(h)g(will)g(cause)f(the)i(\014le)f -+Fb(name)41 b Fn(\(or)27 b Fb(name)13 b Fk(.prf)p Fn(,)0 -+2196 y(if)40 b Fb(name)47 b Fn(do)r(es)33 b(not)g(exist)g(in)h(the)g -+Fk(.unison)c Fn(directory\))j(to)g(b)r(e)h(read)e(at)i(the)f(p)r(oin)n -+(t,)i(and)f(included)f(as)g(if)h(its)g(con)n(ten)n(ts,)0 -+2295 y(instead)27 b(of)h(the)g Fk(include)d Fn(line,)i(w)n(as)g(part)g -+(of)h(the)g(pro\014le.)36 b(Include)28 b(lines)f(allo)n(ws)f(settings)i -+(common)f(to)g(sev)n(eral)f(pro\014les)0 2395 y(to)h(b)r(e)h(stored)f -+(in)h(one)f(place.)125 2494 y(A)c(pro\014le)g(ma)n(y)f(include)i(a)f -+(preference)f(`)p Fk(label)42 b(=)h Fb(desc)13 b Fn(')23 -+b(to)g(pro)n(vide)f(a)h(description)g(of)g(the)g(options)g(selected)g -+(in)h(this)0 2594 y(pro\014le.)35 b(The)26 b(string)g -+Fb(desc)38 b Fn(is)26 b(listed)f(along)g(with)h(the)g(pro\014le)e(name) -+i(in)f(the)h(pro\014le)f(selection)g(dialog,)g(and)g(displa)n(y)n(ed)g -+(in)0 2694 y(the)j(top-righ)n(t)e(corner)h(of)g(the)h(main)g(Unison)f -+(windo)n(w)g(in)h(the)g(graphical)e(user)h(in)n(terface.)125 -+2793 y(The)37 b(graphical)f(user-in)n(terface)g(also)g(supp)r(orts)h -+(one-k)n(ey)g(shortcuts)f(for)h(commonly)g(used)h(pro\014les.)66 -+b(If)38 b(a)f(pro\014le)0 2893 y(con)n(tains)25 b(a)g(preference)h(of)f -+(the)i(form)e(`)p Fk(key)43 b(=)g Fb(n)14 b Fn(',)26 -+b(where)g Fb(n)40 b Fn(is)26 b(a)f(single)h(digit,)g(then)g(pressing)f -+(this)h(digit)g(k)n(ey)g(will)g(cause)0 2993 y(Unison)i(to)g -+(immediately)g(switc)n(h)f(to)h(this)g(pro\014le)g(and)f(b)r(egin)h -+(sync)n(hronization)e(again)h(from)g(scratc)n(h.)37 b(In)28 -+b(this)g(case,)f(all)0 3092 y(actions)g(that)h(ha)n(v)n(e)e(b)r(een)i -+(selected)g(for)f(a)g(set)g(of)h(c)n(hanges)e(curren)n(tly)h(b)r(eing)h -+(displa)n(y)n(ed)e(will)i(b)r(e)g(discarded.)0 3325 y -+Fh(5.6)112 b(Sample)37 b(Pro\014les)0 3478 y Fl(5.6.1)94 -+b(A)32 b(Minimal)d(Pro\014le)0 3631 y Fn(Here)e(is)h(a)f(v)n(ery)f -+(minimal)i(pro\014le)f(\014le,)h(suc)n(h)f(as)g(migh)n(t)h(b)r(e)g -+(found)g(in)f Fk(.unison/default.p)o(rf)p Fn(:)174 3797 -+y Fk(#)44 b(Roots)d(of)i(the)f(synchronization)174 3897 -+y(root)g(=)h(/home/bcpierce)174 3996 y(root)f(=)h(ssh://saul//home/)o -+(bcp)o(ie)o(rce)174 4196 y(#)h(Paths)d(to)i(synchronize)174 -+4295 y(path)f(=)h(current)174 4395 y(path)f(=)h(common)174 -+4495 y(path)f(=)h(.netscape/bookmar)o(ks.)o(ht)o(ml)0 -+4710 y Fl(5.6.2)94 b(A)32 b(Basic)g(Pro\014le)0 4864 -+y Fn(Here)27 b(is)h(a)f(more)g(sophisticated)g(pro\014le,)g -+(illustrating)g(some)g(other)g(useful)h(features.)174 -+5030 y Fk(#)44 b(Roots)d(of)i(the)f(synchronization)174 -+5129 y(root)g(=)h(/home/bcpierce)174 5229 y(root)f(=)h -+(ssh://saul//home/)o(bcp)o(ie)o(rce)1908 5589 y Fn(25)p -+eop -+%%Page: 26 26 -+26 25 bop 174 83 a Fk(#)44 b(Paths)d(to)i(synchronize)174 -+183 y(path)f(=)h(current)174 282 y(path)f(=)h(common)174 -+382 y(path)f(=)h(.netscape/bookmar)o(ks.)o(ht)o(ml)174 -+581 y(#)h(Some)d(regexps)g(specifying)f(names)h(and)h(paths)g(to)h -+(ignore)174 681 y(ignore)e(=)j(Name)e(temp.*)174 780 -+y(ignore)f(=)j(Name)e(*~)174 880 y(ignore)f(=)j(Name)e(.*~)174 -+980 y(ignore)f(=)j(Path)e(*/pilot/backup/)o(Arc)o(hi)o(ve)o(_*)174 -+1079 y(ignore)f(=)j(Name)e(*.o)174 1179 y(ignore)f(=)j(Name)e(*.tmp)174 -+1378 y(#)i(Window)d(height)174 1478 y(height)g(=)j(37)174 -+1677 y(#)g(Keep)d(a)j(backup)d(copy)h(of)g(the)h(entire)e(replica)174 -+1777 y(backup)g(=)j(Name)e(*)174 1976 y(#)i(Use)e(this)g(command)e(for) -+j(displaying)c(diffs)174 2076 y(diff)j(=)h(diff)f(-y)h(-W)g(79)g -+(--suppress-comm)o(on-)o(li)o(nes)174 2275 y(#)h(Log)e(actions)f(to)h -+(the)h(terminal)174 2374 y(log)g(=)g(true)0 2590 y Fl(5.6.3)94 -+b(A)32 b(P)m(o)m(w)m(er-User)h(Pro\014le)0 2743 y Fn(When)d(Unison)g -+(is)f(used)h(with)g(large)e(replicas,)h(it)h(is)f(often)h(con)n(v)n -+(enien)n(t)f(to)g(b)r(e)h(able)f(to)h(sync)n(hronize)e(just)i(a)f(part) -+g(of)h(the)0 2843 y(replicas)20 b(on)g(a)g(giv)n(en)g(run)h(\(this)g -+(sa)n(v)n(es)e(the)i(time)g(of)g(detecting)g(up)r(dates)g(in)f(the)i -+(other)e(parts\).)34 b(This)20 b(can)h(b)r(e)g(accomplished)0 -+2943 y(b)n(y)30 b(splitting)i(up)f(the)g(pro\014le)f(in)n(to)g(sev)n -+(eral)f(parts)h(|)h(a)g(common)f(part)g(con)n(taining)g(most)g(of)h -+(the)g(preference)f(settings,)0 3042 y(plus)g(one)g(\\top-lev)n(el")f -+(\014le)h(for)g(eac)n(h)g(set)g(of)g(paths)h(that)f(need)h(to)f(b)r(e)h -+(sync)n(hronized.)43 b(\(The)31 b Fk(include)d Fn(mec)n(hanism)h(can)0 -+3142 y(also)e(b)r(e)h(used)f(to)h(allo)n(w)e(the)i(same)f(set)h(of)f -+(preference)g(settings)g(to)h(b)r(e)g(used)f(with)h(di\013eren)n(t)g -+(ro)r(ots.\))125 3242 y(The)23 b(collection)g(of)h(pro\014les)f -+(implemen)n(ting)h(this)g(sc)n(heme)f(migh)n(t)h(lo)r(ok)f(as)g(follo)n -+(ws.)34 b(The)24 b(\014le)g Fk(default.prf)19 b Fn(is)24 -+b(empt)n(y)0 3341 y(except)k(for)f(an)g Fk(include)e -+Fn(directiv)n(e:)174 3507 y Fk(#)44 b(Include)c(the)j(contents)d(of)j -+(the)f(file)g(common)174 3607 y(include)f(common)125 -+3773 y Fn(Note)31 b(that)g(the)h(name)f(of)g(the)g(common)g(\014le)g -+(is)g Fk(common)p Fn(,)f(not)h Fk(common.prf)p Fn(;)e(this)i(prev)n(en) -+n(ts)f(Unison)h(from)g(o\013ering)0 3873 y Fk(common)25 -+b Fn(as)i(one)g(of)h(the)g(list)g(of)f(pro\014les)g(in)h(the)g(op)r -+(ening)f(dialog)g(\(in)h(the)g(graphical)e(UI\).)125 -+3972 y(The)h(\014le)h Fk(common)d Fn(con)n(tains)i(the)h(real)e -+(preferences:)174 4138 y Fk(#)44 b(\(...)d(other)h(preferences)d(...\)) -+174 4337 y(#)44 b(If)e(any)h(new)f(preferences)d(are)j(added)g(by)h -+(Unison)e(\(e.g.)g('ignore')174 4437 y(#)j(preferences)39 -+b(added)i(via)h(the)h(graphical)d(UI\),)i(then)f(store)h(them)g(in)h -+(the)174 4537 y(#)h(file)d('common')g(rathen)g(than)h(in)h(the)f -+(top-level)e(preference)f(file)174 4636 y(addprefsto)h(=)j(common)174 -+4836 y(#)h(regexps)c(specifying)g(names)h(and)i(paths)e(to)i(ignore)174 -+4935 y(ignore)e(=)j(Name)e(temp.*)174 5035 y(ignore)f(=)j(Name)e(*~)174 -+5135 y(ignore)f(=)j(Name)e(.*~)174 5234 y(ignore)f(=)j(Path)e -+(*/pilot/backup/)o(Arc)o(hi)o(ve)o(_*)174 5334 y(ignore)f(=)j(Name)e -+(*.o)1908 5589 y Fn(26)p eop -+%%Page: 27 27 -+27 26 bop 174 83 a Fk(ignore)41 b(=)j(Name)e(*.tmp)125 -+245 y Fn(Note)30 b(that)h(there)f(are)g(no)g Fk(path)f -+Fn(preferences)g(in)i Fk(common)p Fn(.)43 b(This)30 b(means)g(that,)i -+(when)e(w)n(e)g(in)n(v)n(ok)n(e)f(Unison)i(with)g(the)0 -+345 y(default)d(pro\014le)f(\(e.g.,)h(b)n(y)f(t)n(yping)g(')p -+Fk(unison)42 b(default)p Fn(')25 b(or)h(just)j(')p Fk(unison)p -+Fn(')c(on)i(the)h(command)g(line\),)g(the)g(whole)f(replicas)0 -+444 y(will)g(b)r(e)h(sync)n(hronized.)35 b(\(If)27 b(w)n(e)g -+Fi(never)g Fn(w)n(an)n(t)g(to)f(sync)n(hronize)g(the)h(whole)g -+(replicas,)f(then)h Fk(default.prf)c Fn(w)n(ould)j(instead)0 -+544 y(include)i(settings)f(for)g(all)h(the)g(paths)f(that)h(are)f -+(usually)g(sync)n(hronized.\))125 644 y(T)-7 b(o)28 b(sync)n(hronize)g -+(just)h(part)g(of)g(the)g(replicas,)g(Unison)f(is)h(in)n(v)n(ok)n(ed)f -+(with)h(an)g(alternate)f(preference)h(\014le|e.g.,)g(doing)0 -+743 y(')p Fk(unison)41 b(papers)p Fn(',)25 b(where)j(the)g(preference)e -+(\014le)i Fk(papers.prf)c Fn(con)n(tains)174 905 y Fk(path)42 -+b(=)h(current/papers)174 1005 y(path)f(=)h(older/papers)174 -+1105 y(include)e(common)125 1267 y Fn(causes)26 b(Unison)i(to)f(sync)n -+(hronize)f(just)i(the)g(sub)r(directories)f Fk(current/papers)22 -+b Fn(and)27 b Fk(older/papers)p Fn(.)125 1367 y(The)d -+Fk(key)f Fn(preference)h(can)g(b)r(e)h(used)g(in)f(com)n(bination)g -+(with)h(the)g(graphical)e(UI)i(to)f(quic)n(kly)g(switc)n(h)g(b)r(et)n -+(w)n(een)h(di\013eren)n(t)0 1466 y(sets)i(of)h(paths.)37 -+b(F)-7 b(or)27 b(example,)g(if)h(the)g(\014le)g Fk(mail.prf)c -+Fn(con)n(tains)174 1628 y Fk(path)42 b(=)h(Mail)174 1728 -+y(batch)f(=)h(true)174 1828 y(key)g(=)g(2)174 1927 y(include)e(common) -+125 2089 y Fn(then)30 b(pressing)e(2)h(will)h(cause)f(Unison)h(to)f(lo) -+r(ok)g(for)g(up)r(dates)h(in)g(the)g Fk(Mail)e Fn(sub)r(directory)h -+(and)g(\(b)r(ecause)h(the)g Fk(batch)0 2189 y Fn(\015ag)d(is)g(set\))h -+(immediately)g(propagate)e(an)n(y)g(that)i(it)g(\014nds.)0 -+2421 y Fh(5.7)112 b(Keeping)37 b(Bac)m(kups)0 2574 y -+Fn(Unison)27 b(can)f(main)n(tain)g(full)i(bac)n(kups)e(of)h(the)g -+(last-sync)n(hronized)d(v)n(ersions)h(of)i(some)f(of)h(the)g(\014les)g -+(in)g(eac)n(h)f(replica;)g(these)0 2673 y(function)34 -+b(b)r(oth)g(as)f(bac)n(kups)g(in)h(the)g(usual)g(sense)f(and)g(as)h -+(the)g(\\common)e(v)n(ersion")g(when)i(in)n(v)n(oking)e(external)h -+(merge)0 2773 y(programs.)125 2873 y(The)d(bac)n(k)n(ed)e(up)j(\014les) -+e(are)g(stored)h(in)g(a)f(directory)g Fk(~/.unison/backup)23 -+b Fn(on)30 b(eac)n(h)f(host.)44 b(The)30 b(name)g(of)g(this)g(direc-)0 -+2972 y(tory)f(can)g(b)r(e)h(c)n(hanged)e(b)n(y)h(setting)h(the)g(en)n -+(vironmen)n(t)e(v)-5 b(ariable)29 b Fk(UNISONBACKUPDIR)o -+Fn(.)24 b(Files)30 b(are)e(added)h(to)h(the)g(bac)n(kup)0 -+3072 y(directory)c(whenev)n(er)h(unison)g(up)r(dates)h(its)g(arc)n(hiv) -+n(e.)35 b(This)28 b(means)f(that)125 3234 y Fj(\017)41 -+b Fn(When)25 b(unison)g(reconstructs)f(its)i(arc)n(hiv)n(e)d(from)i -+(scratc)n(h)f(\(e.g.,)i(b)r(ecause)e(of)i(an)e(upgrade,)h(or)f(b)r -+(ecause)h(the)h(arc)n(hiv)n(e)208 3334 y(\014les)h(ha)n(v)n(e)f(b)r -+(een)i(man)n(ually)f(deleted\),)i(all)e(\014les)g(will)h(b)r(e)g(bac)n -+(k)n(ed)f(up.)125 3498 y Fj(\017)41 b Fn(Otherwise,)26 -+b(eac)n(h)h(\014le)h(will)g(b)r(e)g(bac)n(k)n(ed)e(up)i(the)g(\014rst)f -+(time)i(unison)e(propagates)e(an)j(up)r(date)g(for)f(it.)0 -+3660 y(It)j(is)f(safe)g(to)g(man)n(ually)g(delete)g(\014les)g(from)g -+(the)h(bac)n(kup)f(directory)f(\(or)h(to)g(thro)n(w)g(a)n(w)n(a)n(y)e -+(the)j(directory)e(itself)6 b(\).)43 b(Before)0 3760 -+y(unison)30 b(uses)g(an)n(y)f(of)h(these)g(\014les)g(for)g(an)n(ything) -+f(imp)r(ortan)n(t,)i(it)f(c)n(hec)n(ks)f(that)i(its)f(\014ngerprin)n(t) -+f(matc)n(hes)h(the)g(one)g(that)h(it)0 3859 y(exp)r(ects.)125 -+3959 y(The)i(preference)g Fk(backup)e Fn(con)n(trols)h(whic)n(h)i -+(\014les)f(are)g(actually)g(bac)n(k)n(ed)f(up:)49 b(for)33 -+b(example,)i(giving)e(the)h(preference)0 4059 y(`)p Fk(backup)41 -+b(=)i(Path)f(*)p Fn(')24 b(causes)g(bac)n(king)f(up)i(of)f(all)g -+(\014les.)36 b(The)24 b(preference)g Fk(backupversions)19 -+b Fn(con)n(trols)j(ho)n(w)i(man)n(y)g(previ-)0 4158 y(ous)g(v)n -+(ersions)f(of)h(eac)n(h)g(\014le)g(are)g(k)n(ept.)35 -+b(The)25 b(default)g(is)f(v)-5 b(alue)24 b(2)g(\(i.e.,)i(the)f(last)f -+(sync)n(hronized)f(v)n(ersion)g(plus)h(one)g(bac)n(kup\).)0 -+4258 y(F)-7 b(or)27 b(bac)n(kw)n(ard)f(compatibilit)n(y)-7 -+b(,)27 b(the)h Fk(backups)d Fn(preference)i(is)g(also)g(still)g(supp)r -+(orted,)h(but)g Fk(backup)d Fn(is)j(no)n(w)f(preferred.)0 -+4489 y Fh(5.8)112 b(Merging)37 b(Con\015icting)f(V)-9 -+b(ersions)0 4643 y Fn(Both)26 b(user)g(in)n(terfaces)g(o\013er)g(a)g -+(`merge')g(command)g(that)h(can)f(b)r(e)h(used)g(to)f(in)n(teractiv)n -+(ely)f(merge)h(con\015icting)g(v)n(ersions)f(of)0 4742 -+y(a)i(\014le.)37 b(It)28 b(is)g(in)n(v)n(ok)n(ed)e(b)n(y)h(selecting)g -+(a)g(con\015icting)h(\014le)f(and)h(pressing)e(`)p Fk(m)p -+Fn('.)125 4842 y(The)c(actual)f(merging)g(is)h(p)r(erformed)g(b)n(y)g -+(an)g(external)f(program.)33 b(The)22 b(preferences)f -+Fk(merge)f Fn(and)i Fk(merge2)e Fn(con)n(trol)h(ho)n(w)0 -+4941 y(this)h(program)e(is)i(in)n(v)n(ok)n(ed.)34 b(If)22 -+b(a)g(bac)n(kup)f(exists)h(for)f(this)h(\014le)g(\(see)g(the)h -+Fk(backup)c Fn(preference\),)k(then)f(the)h Fk(merge)d -+Fn(preference)0 5041 y(is)32 b(used)g(for)g(this)g(purp)r(ose;)i -+(otherwise)e Fk(merge2)d Fn(is)j(used.)51 b(In)32 b(b)r(oth)h(cases,)f -+(the)h(v)-5 b(alue)32 b(of)g(the)h(preference)e(should)h(b)r(e)g(a)0 -+5141 y(string)i(represen)n(ting)f(the)i(command)g(that)g(should)f(b)r -+(e)h(passed)f(to)h(a)f(shell)g(to)h(in)n(v)n(ok)n(e)e(the)i(merge)f -+(program.)56 b(Within)0 5240 y(this)28 b(string,)f(the)h(sp)r(ecial)f -+(substrings)g Fk(CURRENT1)p Fn(,)e Fk(CURRENT2)p Fn(,)f -+Fk(NEW)p Fn(,)j(and)g Fk(OLD)g Fn(ma)n(y)g(app)r(ear)g(at)g(an)n(y)g(p) -+r(oin)n(t.)37 b(Unison)28 b(will)0 5340 y(substitute)g(these)g -+(substrings)f(as)g(follo)n(ws)f(b)r(efore)h(in)n(v)n(oking)g(the)h -+(command:)1908 5589 y(27)p eop -+%%Page: 28 28 -+28 27 bop 125 83 a Fj(\017)41 b Fk(CURRENT1)24 b Fn(is)j(replaced)g(b)n -+(y)g(the)h(name)g(of)f(the)h(lo)r(cal)f(cop)n(y)g(of)h(the)g(\014le;) -+125 249 y Fj(\017)41 b Fk(CURRENT2)26 b Fn(is)k(replaced)g(b)n(y)g(the) -+g(name)g(of)g(a)g(temp)r(orary)f(\014le,)i(in)n(to)f(whic)n(h)g(the)g -+(con)n(ten)n(ts)g(of)g(the)g(remote)g(cop)n(y)f(of)208 -+349 y(the)f(\014le)f(ha)n(v)n(e)g(b)r(een)h(transferred)e(b)n(y)h -+(Unison)h(prior)e(to)i(p)r(erforming)e(the)i(merge;)125 -+515 y Fj(\017)41 b Fk(NEW)19 b Fn(is)i(replaced)f(b)n(y)g(the)i(name)e -+(of)h(a)f(temp)r(orary)g(\014le)h(that)g(Unison)g(exp)r(ects)g(to)f(b)r -+(e)h(written)g(b)n(y)g(the)g(merge)f(program)208 614 -+y(when)27 b(it)h(\014nishes,)g(giving)f(the)h(desired)f(new)g(con)n -+(ten)n(ts)g(of)h(the)g(\014le;)g(and)125 780 y Fj(\017)41 -+b Fk(OLD)28 b Fn(is)i(replaced)e(b)n(y)i(the)g(name)f(of)h(the)g(bac)n -+(k)n(ed)f(up)h(cop)n(y)f(of)g(the)h(original)e(v)n(ersion)h(of)g(the)h -+(\014le)g(\(i.e.,)h(its)f(state)f(at)208 880 y(the)f(end)h(of)g(the)g -+(last)f(successful)g(run)g(of)h(Unison\),)g(if)g(one)f(exists.)39 -+b(Substitution)30 b(of)e Fk(OLD)f Fn(applies)i(only)f(to)g -+Fk(merge)p Fn(,)208 980 y(not)f Fk(merge2)p Fn(\).)0 -+1146 y(F)-7 b(or)27 b(example,)g(on)h(Unix)f(systems)h(setting)f(the)h -+Fk(merge)e Fn(preference)h(to)131 1312 y Fk(merge)41 -+b(=)i(diff3)f(-m)h(CURRENT1)d(OLD)i(CURRENT2)f(>)i(NEW)0 -+1478 y Fn(will)21 b(tell)g(Unison)g(to)g(use)f(the)h(external)f -+Fk(diff3)f Fn(program)g(for)h(merging.)34 b(A)21 b(large)e(n)n(um)n(b)r -+(er)i(of)g(external)f(merging)f(programs)0 1577 y(are)27 -+b(a)n(v)-5 b(ailable.)35 b(F)-7 b(or)27 b(example,)g -+Fk(emacs)f Fn(users)h(ma)n(y)g(\014nd)h(the)g(follo)n(wing)e(settings)i -+(con)n(v)n(enien)n(t:)174 1743 y Fk(merge2)41 b(=)j(emacs)d(-q)i -+(--eval)e('\(ediff-merge-fi)o(les)c("CURRENT1")i("CURRENT2")654 -+1843 y(nil)j("NEW"\)')174 1943 y(merge)g(=)h(emacs)f(-q)g(--eval)f -+('\(ediff-merge-fil)o(es-)o(wi)o(th)o(-an)o(ce)o(sto)o(r)654 -+2042 y("CURRENT1")e("CURRENT2")h("OLD")h(nil)i("NEW"\)')0 -+2208 y Fn(\(These)21 b(commands)e(are)h(displa)n(y)n(ed)f(here)h(on)h -+(t)n(w)n(o)e(lines)i(to)f(a)n(v)n(oid)f(running)h(o\013)h(the)g(edge)f -+(of)g(the)h(page.)34 b(In)21 b(y)n(our)e(preference)0 -+2308 y(\014le,)28 b(eac)n(h)f(command)g(should)g(b)r(e)h(written)g(on)f -+(a)h(single)f(line.\))125 2408 y(If)34 b(the)g(external)e(program)g -+(exits)h(without)h(lea)n(ving)f(an)n(y)f(\014le)i(at)g(the)g(path)f -+Fk(NEW)p Fn(,)g(Unison)g(considers)g(the)h(merge)e(to)0 -+2507 y(ha)n(v)n(e)24 b(failed.)37 b(If)26 b(the)g(merge)e(program)g -+(writes)h(a)g(\014le)h(called)f Fk(NEW)f Fn(but)i(exits)g(with)g(a)f -+(non-zero)f(status)h(co)r(de,)h(then)g(Unison)0 2607 -+y(considers)e(the)h(merge)f(to)h(ha)n(v)n(e)f(succeeded)h(but)h(to)f -+(ha)n(v)n(e)f(generated)g(con\015icts.)35 b(In)26 b(this)f(case,)g(it)g -+(attempts)h(to)f(in)n(v)n(ok)n(e)e(an)0 2707 y(external)28 -+b(editor)g(so)f(that)i(the)g(user)f(can)g(resolv)n(e)e(the)j -+(con\015icts.)39 b(The)29 b(v)-5 b(alue)28 b(of)h(the)g -+Fk(editor)d Fn(preference)h(con)n(trols)g(what)0 2806 -+y(editor)g(is)h(in)n(v)n(ok)n(ed)e(b)n(y)h(Unison.)37 -+b(The)27 b(default)h(is)g Fk(emacs)p Fn(.)208 2989 y -+Fi(Ple)l(ase)37 b(send)f(us)g(suggestions)g(for)i(other)e(useful)h -+(values)f(of)h(the)g Fk(merge2)d Fi(and)i Fk(merge)f -+Fi(pr)l(efer)l(enc)l(es|we'd)208 3088 y(like)30 b(to)g(give)h(sever)l -+(al)f(examples)h(in)f(the)g(manual.\))0 3321 y Fh(5.9)112 -+b(The)38 b(User)g(In)m(terface)0 3474 y Fn(Both)27 b(the)h(textual)f -+(and)g(the)h(graphical)e(user)g(in)n(terfaces)h(are)f(in)n(tended)i(to) -+f(b)r(e)g(mostly)g(self-explanatory)-7 b(.)35 b(Here)27 -+b(are)f(just)0 3574 y(a)h(few)h(tric)n(ks:)125 3740 y -+Fj(\017)41 b Fn(By)25 b(default,)i(when)f(running)g(on)f(Unix)h(the)h -+(textual)f(user)f(in)n(terface)g(will)h(try)g(to)g(put)g(the)g -+(terminal)g(in)n(to)g(the)g(\\ra)n(w)208 3839 y(mo)r(de")i(so)g(that)h -+(it)g(reads)e(the)i(input)g(a)g(c)n(haracter)d(at)i(a)h(time)g(rather)e -+(than)i(a)f(line)h(at)f(a)h(time.)40 b(\(This)29 b(means)f(y)n(ou)208 -+3939 y(can)e(t)n(yp)r(e)i(just)g(the)g(single)e(k)n(eystrok)n(e)g(\\)p -+Fk(>)p Fn(")g(to)h(tell)h(Unison)f(to)g(propagate)e(a)i(\014le)h(from)f -+(left)h(to)f(righ)n(t,)g(rather)f(than)208 4039 y(\\)p -+Fk(>)g Fn(En)n(ter."\))208 4171 y(There)j(are)g(some)h(situations,)g -+(though,)h(where)e(this)i(will)f(not)g(w)n(ork)f(|)h(for)g(example,)g -+(when)g(Unison)g(is)g(running)208 4271 y(in)24 b(a)h(shell)f(windo)n(w) -+g(inside)h(Emacs.)35 b(Setting)25 b(the)g Fk(dumbtty)d -+Fn(preference)h(will)i(force)f(Unison)h(to)f(lea)n(v)n(e)f(the)i -+(terminal)208 4371 y(alone)h(and)i(pro)r(cess)e(input)j(a)e(line)h(at)f -+(a)g(time.)0 4603 y Fh(5.10)112 b(Exit)36 b(co)s(de)0 -+4756 y Fn(When)c(running)e(in)i(the)f(textual)g(mo)r(de,)i(Unison)e -+(returns)f(an)h(exit)g(status,)h(whic)n(h)f(describ)r(es)f(whether,)i -+(and)f(at)g(whic)n(h)0 4856 y(lev)n(el,)k(the)e(sync)n(hronization)f(w) -+n(as)h(successful.)54 b(The)34 b(exit)f(status)h(could)f(b)r(e)h -+(useful)g(when)f(Unison)h(is)f(in)n(v)n(ok)n(ed)f(from)h(a)0 -+4956 y(script.)k(Curren)n(tly)-7 b(,)26 b(there)i(are)e(four)i(p)r -+(ossible)f(v)-5 b(alues)27 b(for)g(the)h(exit)g(status:)125 -+5122 y(0)41 b(:)c(successful)27 b(sync)n(hronization;)f(ev)n(erything)g -+(is)h(up-to-date)g(no)n(w.)125 5288 y(1)41 b(:)c(some)27 -+b(\014les)g(w)n(ere)g(skipp)r(ed,)h(but)g(all)f(\014le)h(transfers)e(w) -+n(ere)h(successful.)1908 5589 y(28)p eop -+%%Page: 29 29 -+29 28 bop 125 83 a Fn(2)41 b(:)c(non-fatal)26 b(failures)h(o)r(ccurred) -+g(during)g(\014le)h(transfer.)125 249 y(3)41 b(:)c(a)27 -+b(fatal)g(error)f(o)r(ccurred,)g(or)h(the)h(execution)f(w)n(as)g(in)n -+(terrupted.)125 415 y(The)g(graphical)f(in)n(terface)h(do)r(es)g(not)h -+(return)f(an)n(y)g(useful)h(information)f(through)g(the)h(exit)f -+(status.)0 648 y Fh(5.11)112 b(P)m(ath)37 b(sp)s(eci\014cation)0 -+801 y Fn(Sev)n(eral)31 b(Unison)h(preferences)f(\(e.g.,)i -+Fk(ignore)p Fn(/)p Fk(ignorenot)o Fn(,)28 b Fk(follow)p -+Fn(,)j Fk(sortfirst)p Fn(/)p Fk(sortl)o(ast)o Fn(,)d -+Fk(backup)p Fn(\))i(sp)r(ecify)i(indi-)0 900 y(vidual)26 -+b(paths)g(or)f(sets)h(of)g(paths.)37 b(These)25 b(preferences)h(share)f -+(a)g(common)h(syn)n(tax)f(based)h(on)g(regular-expressions.)32 -+b(Eac)n(h)0 1000 y(preference)26 b(is)g(asso)r(ciated)f(with)i(a)f -+(list)h(of)g(path)f(patterns;)h(the)g(paths)f(sp)r(eci\014ed)h(are)e -+(those)h(that)h(matc)n(h)f(an)n(y)g(one)g(of)h(the)0 -+1100 y(path)h(pattern.)125 1282 y Fj(\017)41 b Fn(P)n(attern)32 -+b(preferences)h(can)h(b)r(e)g(giv)n(en)g(on)f(the)i(command)e(line,)j -+(or,)f(more)e(often,)j(stored)d(in)h(pro\014les,)h(using)f(the)208 -+1382 y(same)27 b(syn)n(tax)f(as)h(other)g(preferences.)36 -+b(F)-7 b(or)27 b(example,)g(a)g(pro\014le)g(line)h(of)g(the)g(form)774 -+1581 y Fk(ignore)41 b(=)i Fb(pattern)208 1780 y Fn(adds)27 -+b Fb(pattern)39 b Fn(to)27 b(the)h(list)g(of)g(patterns)f(to)g(b)r(e)h -+(ignored.)125 1946 y Fj(\017)41 b Fn(Eac)n(h)e Fb(pattern)52 -+b Fn(can)41 b(ha)n(v)n(e)e(one)h(of)h(three)g(forms.)75 -+b(The)41 b(most)f(general)g(form)g(is)h(a)f(P)n(osix)f(extended)i -+(regular)208 2046 y(expression)32 b(in)n(tro)r(duced)i(b)n(y)g(the)g(k) -+n(eyw)n(ord)e Fk(Regex)p Fn(.)54 b(\(The)35 b(collating)e(sequences)g -+(and)h(c)n(haracter)e(classes)g(of)i(full)208 2146 y(P)n(osix)26 -+b(regexps)g(are)g(not)i(curren)n(tly)f(supp)r(orted\).)949 -+2345 y Fk(Regex)41 b Fb(regexp)208 2544 y Fn(F)-7 b(or)27 -+b(con)n(v)n(enience,)f(t)n(w)n(o)h(other)g(st)n(yles)g(of)g(pattern)h -+(are)e(also)h(recognized:)949 2743 y Fk(Name)41 b Fb(name)208 -+2943 y Fn(matc)n(hes)27 b(an)n(y)f(path)i(in)g(whic)n(h)g(the)f(last)h -+(comp)r(onen)n(t)f(matc)n(hes)g Fb(name)13 b Fn(,)28 -+b(while)949 3142 y Fk(Path)41 b Fb(path)208 3341 y Fn(matc)n(hes)24 -+b(exactly)h(the)g(path)g Fb(path)13 b Fn(.)36 b(The)26 -+b Fb(name)38 b Fn(and)25 b Fb(path)38 b Fn(argumen)n(ts)23 -+b(of)i(the)h(latter)f(forms)f(of)h(patterns)g(are)f Fi(not)208 -+3441 y Fn(regular)h(expressions.)36 b(Instead,)27 b(standard)g -+(\\globbing")e(con)n(v)n(en)n(tions)h(can)h(b)r(e)h(used)g(in)g -+Fb(name)40 b Fn(and)28 b Fb(path)12 b Fn(:)301 3607 y -+Fl({)41 b Fn(a)27 b Fk(?)h Fn(matc)n(hes)f(an)n(y)f(single)i(c)n -+(haracter)d(except)j Fk(/)301 3740 y Fl({)41 b Fn(a)27 -+b Fk(*)h Fn(matc)n(hes)f(an)n(y)f(sequence)i(of)f(c)n(haracters)e(not)j -+(including)g Fk(/)301 3873 y Fl({)41 b Fk([xyz])26 b -+Fn(matc)n(hes)h(an)n(y)g(c)n(haracter)e(from)i(the)h(set)g -+Fj(f)p Fk(x)o Fa(;)14 b Fk(y)p Fa(;)g Fk(z)p Fj(g)301 -+4005 y Fl({)41 b Fk({a,bb,ccc})24 b Fn(matc)n(hes)j(an)n(y)g(one)g(of)g -+Fk(a)p Fn(,)h Fk(bb)p Fn(,)f(or)f Fk(ccc)p Fn(.)125 4171 -+y Fj(\017)41 b Fn(The)26 b(path)g(separator)d(in)j(path)g(patterns)g -+(is)g(alw)n(a)n(ys)e(the)i(forw)n(ard-slash)d(c)n(haracter)h(\\/")g(|)i -+(ev)n(en)g(when)g(the)g(clien)n(t)208 4271 y(or)f(serv)n(er)f(is)i -+(running)g(under)g(Windo)n(ws,)g(where)g(the)g(normal)g(separator)d(c)n -+(haracter)h(is)j(a)e(bac)n(kslash.)35 b(This)26 b(mak)n(es)208 -+4371 y(it)i(p)r(ossible)f(to)g(use)h(the)g(same)f(set)g(of)h(path)g -+(patterns)f(for)g(b)r(oth)h(Unix)g(and)f(Windo)n(ws)g(\014le)h -+(systems.)125 4553 y(Some)f(examples)g(of)g(path)h(patterns)f(app)r -+(ear)g(in)h(Section)f(5.12)g([Ignoring)f(P)n(aths].)1908 -+5589 y(29)p eop -+%%Page: 30 30 -+30 29 bop 0 83 a Fh(5.12)112 b(Ignoring)37 b(P)m(aths)0 -+236 y Fn(Most)23 b(users)f(of)g(Unison)h(will)g(\014nd)h(that)f(their)g -+(replicas)e(con)n(tain)h(lots)h(of)g(\014les)g(that)g(they)g(don't)g -+(ev)n(er)f(w)n(an)n(t)g(to)h(sync)n(hronize)0 336 y(|)k(temp)r(orary)f -+(\014les,)h(v)n(ery)f(large)g(\014les,)h(old)g(stu\013,)h(arc)n -+(hitecture-sp)r(eci\014c)d(binaries,)i(etc.)36 b(They)27 -+b(can)g(instruct)g(Unison)g(to)0 436 y(ignore)f(these)i(paths)f(using)h -+(patterns)f(in)n(tro)r(duced)g(in)h(Section)g(5.11)e([P)n(ath)h(P)n -+(atterns].)125 535 y(F)-7 b(or)23 b(example,)i(the)g(follo)n(wing)e -+(pattern)h(will)h(mak)n(e)e(Unison)h(ignore)f(an)n(y)h(path)h(con)n -+(taining)e(the)i(name)f Fk(CVS)f Fn(or)g(a)h(name)0 635 -+y(ending)k(in)f Fk(.cmo)p Fn(:)567 801 y Fk(ignore)41 -+b(=)i(Name)f({CVS,*.cmo})125 967 y Fn(The)27 b(next)h(pattern)f(mak)n -+(es)g(Unison)g(ignore)g(the)h(path)f Fk(a/b)p Fn(:)567 -+1133 y Fk(ignore)41 b(=)i(Path)f(a/b)125 1299 y Fn(This)26 -+b(pattern)h(mak)n(es)f(Unison)h(ignore)e(an)n(y)i(path)g(b)r(eginning)f -+(with)i Fk(a/b)e Fn(and)g(ending)h(with)h(a)e(name)h(ending)g(b)n(y)f -+Fk(.ml)p Fn(.)567 1465 y Fk(ignore)41 b(=)i(Regex)e(a/b/.*\\.ml)125 -+1631 y Fn(Note)e(that)g(regular)e(expression)h(patterns)g(are)g(\\anc)n -+(hored":)58 b(they)39 b(m)n(ust)g(matc)n(h)g(the)g(whole)g(path,)j(not) -+d(just)g(a)0 1731 y(substring)27 b(of)g(the)h(path.)125 -+1830 y(Here)f(are)f(a)i(few)f(extra)g(p)r(oin)n(ts)h(regarding)d(the)j -+Fk(ignore)d Fn(preference.)125 1996 y Fj(\017)41 b Fn(If)28 -+b(a)f(directory)f(is)i(ignored,)e(all)h(its)h(descenden)n(ts)f(will)h -+(b)r(e)g(to)r(o.)125 2162 y Fj(\017)41 b Fn(The)34 b(user)h(in)n -+(terface)f(pro)n(vides)f(some)i(con)n(v)n(enien)n(t)e(commands)i(for)f -+(adding)g(new)h(patterns)g(to)g(b)r(e)g(ignored.)57 b(T)-7 -+b(o)208 2262 y(ignore)31 b(a)h(particular)f(\014le,)j(select)f(it)g -+(and)f(press)g(\\)p Fk(i)p Fn(".)50 b(T)-7 b(o)33 b(ignore)e(all)h -+(\014les)h(with)g(the)g(same)f(extension,)h(select)g(it)208 -+2362 y(and)c(press)g(\\)p Fk(E)p Fn(")f(\(with)j(the)f(shift)g(k)n -+(ey\).)43 b(T)-7 b(o)30 b(ignore)e(all)h(\014les)h(with)g(the)g(same)g -+(name,)g(no)f(matter)h(what)f(directory)208 2461 y(they)e(app)r(ear)g -+(in,)h(select)f(it)h(and)g(press)e(\\)p Fk(N)p Fn(".)h(These)g(new)g -+(patterns)h(b)r(ecome)f(p)r(ermanen)n(t:)37 b(they)27 -+b(are)g(immediately)208 2561 y(added)g(to)g(the)h(curren)n(t)f -+(pro\014le)g(on)g(disk.)125 2727 y Fj(\017)41 b Fn(If)c(y)n(ou)f(use)g -+(the)i Fk(include)c Fn(directiv)n(e)i(to)g(include)i(a)e(common)g -+(collection)g(of)h(preferences)f(in)h(sev)n(eral)e(top-lev)n(el)208 -+2827 y(preference)26 b(\014les,)h(y)n(ou)g(will)g(probably)f(also)g(w)n -+(an)n(t)h(to)g(set)g(the)g Fk(addprefsto)c Fn(preference)k(to)g(the)g -+(name)g(of)g(this)h(\014le.)208 2926 y(This)h(will)g(cause)f(an)n(y)h -+(new)g(ignore)e(patterns)i(that)h(y)n(ou)e(add)h(from)f(inside)i -+(Unison)f(to)g(b)r(e)g(app)r(ended)h(to)e(this)i(\014le,)208 -+3026 y(instead)d(of)h(whic)n(hev)n(er)e(top-lev)n(el)h(preference)f -+(\014le)i(y)n(ou)f(started)g(Unison)h(with.)125 3192 -+y Fj(\017)41 b Fn(Ignore)21 b(patterns)i(can)f(also)g(b)r(e)i(sp)r -+(eci\014ed)f(on)g(the)g(command)g(line,)h(if)f(y)n(ou)g(lik)n(e)f -+(\(this)i(is)f(probably)f(not)h(v)n(ery)e(useful\),)208 -+3291 y(using)27 b(an)g(option)g(lik)n(e)h Fk(-ignore)40 -+b('Name)i(temp.txt')p Fn(.)0 3524 y Fh(5.13)112 b(Sym)m(b)s(olic)36 -+b(Links)0 3677 y Fn(Ordinarily)-7 b(,)23 b(Unison)h(treats)f(sym)n(b)r -+(olic)g(links)h(in)g(Unix)g(replicas)e(as)i(\\opaque":)33 -+b(it)24 b(considers)e(the)i(con)n(ten)n(ts)f(of)h(the)g(link)g(to)0 -+3777 y(b)r(e)29 b(just)g(the)f(string)g(sp)r(ecifying)g(where)g(the)h -+(link)f(p)r(oin)n(ts,)h(and)f(it)h(will)f(propagate)f(c)n(hanges)g(in)h -+(this)h(string)f(to)g(the)h(other)0 3876 y(replica.)125 -+3976 y(It)j(is)g(sometimes)g(useful)g(to)g(treat)g(a)g(sym)n(b)r(olic)g -+(link)g(\\transparen)n(tly)-7 b(,")31 b(acting)g(as)h(though)g(whatev)n -+(er)f(it)h(p)r(oin)n(ts)g(to)0 4076 y(w)n(ere)25 b(ph)n(ysically)g -+Fi(in)h Fn(the)h(replica)e(at)h(the)g(p)r(oin)n(t)g(where)g(the)g(sym)n -+(b)r(olic)f(link)i(app)r(ears.)35 b(T)-7 b(o)25 b(tell)i(Unison)f(to)g -+(treat)f(a)h(link)g(in)0 4175 y(this)i(manner,)f(add)g(a)h(line)f(of)h -+(the)g(form)567 4341 y Fk(follow)41 b(=)i Fb(pathspec)0 -+4507 y Fn(to)27 b(the)h(pro\014le,)f(where)g Fb(pathspec)39 -+b Fn(is)28 b(a)f(path)h(pattern)f(as)g(describ)r(ed)g(in)h(Section)g -+(5.11)e([P)n(ath)h(P)n(atterns].)125 4607 y(Windo)n(ws)d(\014le)h -+(systems)g(do)f(not)h(supp)r(ort)g(sym)n(b)r(olic)f(links;)i(Unison)f -+(will)g(refuse)f(to)h(propagate)e(an)i(opaque)f(sym)n(b)r(olic)0 -+4707 y(link)i(from)g(Unix)h(to)f(Windo)n(ws)g(and)g(\015ag)g(the)g -+(path)h(as)e(erroneous.)35 b(When)27 b(a)f(Unix)g(replica)g(is)g(to)g -+(b)r(e)h(sync)n(hronized)e(with)0 4806 y(a)i(Windo)n(ws)g(system,)h -+(all)f(sym)n(b)r(olic)g(links)h(should)f(matc)n(h)g(either)h(an)f -+Fk(ignore)e Fn(pattern)j(or)f(a)g Fk(follow)e Fn(pattern.)1908 -+5589 y(30)p eop -+%%Page: 31 31 -+31 30 bop 0 83 a Fh(5.14)112 b(P)m(ermissions)0 236 y -+Fn(Sync)n(hronizing)29 b(the)i(p)r(ermission)f(bits)h(of)g(\014les)g -+(is)f(sligh)n(tly)g(tric)n(ky)g(when)h(t)n(w)n(o)f(di\013eren)n(t)h -+(\014lesytems)f(are)g(in)n(v)n(olv)n(ed)f(\(e.g.,)0 336 -+y(when)f(sync)n(hronizing)e(a)h(Windo)n(ws)g(clien)n(t)h(and)f(a)g -+(Unix)h(serv)n(er\).)36 b(In)27 b(detail,)h(here's)f(ho)n(w)g(it)h(w)n -+(orks:)125 502 y Fj(\017)41 b Fn(When)35 b(the)g(p)r(ermission)g(bits)g -+(of)g(an)g(existing)f(\014le)h(or)f(directory)g(are)g(c)n(hanged,)i -+(the)f(v)-5 b(alues)35 b(of)g(those)g(bits)g(that)208 -+602 y(mak)n(e)26 b(sense)i(on)f Fi(b)l(oth)h Fn(op)r(erating)f(systems) -+g(will)h(b)r(e)g(propagated)e(to)i(the)g(other)f(replica.)36 -+b(The)28 b(other)f(bits)h(will)g(not)208 701 y(b)r(e)g(c)n(hanged.)125 -+867 y Fj(\017)41 b Fn(When)32 b(a)e(newly)i(created)e(\014le)i(is)f -+(propagated)f(to)h(a)g(remote)g(replica,)g(the)h(p)r(ermission)f(bits)h -+(that)f(mak)n(e)g(sense)g(in)208 967 y(b)r(oth)23 b(op)r(erating)f -+(systems)g(are)g(also)g(propagated.)34 b(The)23 b(v)-5 -+b(alues)22 b(of)h(the)g(other)g(bits)g(are)f(set)h(to)g(default)g(v)-5 -+b(alues)23 b(\(they)208 1066 y(are)j(tak)n(en)h(from)g(the)h(curren)n -+(t)f(umask,)g(if)h(the)g(receiving)f(host)g(is)h(a)f(Unix)h(system\).) -+125 1233 y Fj(\017)41 b Fn(F)-7 b(or)27 b(securit)n(y)f(reasons,)g(the) -+i(Unix)g Fk(setuid)d Fn(and)j Fk(setgid)d Fn(bits)j(are)e(not)i -+(propagated.)125 1399 y Fj(\017)41 b Fn(The)28 b(Unix)g(o)n(wner)e(and) -+i(group)f(ids)h(are)f(not)h(propagated.)36 b(\(What)28 -+b(w)n(ould)g(this)g(mean,)g(in)g(general?\))37 b(All)28 -+b(\014les)g(are)208 1498 y(created)e(with)i(the)g(o)n(wner)f(and)g -+(group)g(of)g(the)h(serv)n(er)e(pro)r(cess.)0 1731 y -+Fh(5.15)112 b(Cross-Platform)36 b(Sync)m(hronization)0 -+1884 y Fn(If)28 b(y)n(ou)f(use)g(Unison)g(to)h(sync)n(hronize)e -+(\014les)h(b)r(et)n(w)n(een)h(Windo)n(ws)f(and)g(Unix)h(systems,)f -+(there)h(are)e(a)h(few)h(sp)r(ecial)f(issues)g(to)0 1983 -+y(b)r(e)h(a)n(w)n(are)d(of.)125 2083 y Fl(Case)44 b(con\015icts.)72 -+b Fn(In)39 b(Unix,)j(\014lenames)d(are)f(case)h(sensitiv)n(e:)59 -+b Fk(foo)38 b Fn(and)h Fk(FOO)f Fn(can)h(refer)f(to)h(di\013eren)n(t)g -+(\014les.)72 b(In)0 2183 y(Windo)n(ws,)30 b(on)f(the)g(other)g(hand,)h -+(\014lenames)f(are)g(not)g(case)g(sensitiv)n(e:)40 b -+Fk(foo)28 b Fn(and)h Fk(FOO)f Fn(can)h(only)g(refer)g(to)g(the)h(same)f -+(\014le.)0 2282 y(This)j(means)h(that)f(a)g(Unix)h Fk(foo)f -+Fn(and)g Fk(FOO)f Fn(cannot)h(b)r(e)h(sync)n(hronized)e(on)n(to)h(a)g -+(Windo)n(ws)g(system)h(|)f(Windo)n(ws)g(w)n(on't)0 2382 -+y(allo)n(w)26 b(t)n(w)n(o)h(di\013eren)n(t)g(\014les)h(to)f(ha)n(v)n(e) -+f(the)i(\\same")e(name.)36 b(Unison)27 b(detects)h(this)g(situation)f -+(for)g(y)n(ou,)f(and)i(rep)r(orts)e(that)i(it)0 2482 -+y(cannot)f(sync)n(hronize)f(the)i(\014les.)125 2581 y(Y)-7 -+b(ou)32 b(can)h(deal)f(with)i(a)e(case)g(con\015ict)h(in)g(a)g(couple)f -+(of)h(w)n(a)n(ys.)51 b(If)33 b(y)n(ou)f(need)h(to)g(ha)n(v)n(e)f(b)r -+(oth)h(\014les)g(on)f(the)h(Windo)n(ws)0 2681 y(system,)27 -+b(y)n(our)g(only)g(c)n(hoice)g(is)g(to)h(rename)f(one)g(of)h(the)g -+(Unix)g(\014les)f(to)h(a)n(v)n(oid)e(the)i(case)f(con\015ict,)h(and)f -+(re-sync)n(hronize.)35 b(If)0 2780 y(y)n(ou)29 b(don't)i(need)f(the)h -+(\014les)f(on)g(the)h(Windo)n(ws)e(system,)i(y)n(ou)f(can)f(simply)i -+(disregard)d(Unison's)i(w)n(arning)f(message,)g(and)0 -+2880 y(go)e(ahead)g(with)h(the)g(sync)n(hronization;)f(Unison)g(w)n -+(on't)h(touc)n(h)f(those)h(\014les.)37 b(If)28 b(y)n(ou)g(don't)f(w)n -+(an)n(t)h(to)f(see)h(the)g(w)n(arning)e(on)0 2980 y(eac)n(h)h(sync)n -+(hronization,)f(y)n(ou)g(can)i(tell)g(Unison)f(to)h(ignore)e(the)i -+(\014les)f(\(see)h(Section)f(5.12)g([Ignore]\).)125 3079 -+y Fl(Illegal)36 b(\014lenames.)50 b Fn(Unix)33 b(allo)n(ws)f(some)g -+(\014lenames)g(that)h(are)f(illegal)g(in)h(Windo)n(ws.)53 -+b(F)-7 b(or)32 b(example,)h(colons)f(\(`:'\))0 3179 y(are)g(not)h(allo) -+n(w)n(ed)f(in)i(Windo)n(ws)e(\014lenames,)j(but)e(they)h(are)e(legal)g -+(in)i(Unix)f(\014lenames.)53 b(This)33 b(means)g(that)h(a)e(Unix)i -+(\014le)0 3279 y Fk(foo:bar)27 b Fn(can't)j(b)r(e)g(sync)n(hronized)e -+(to)i(a)f(Windo)n(ws)h(system.)43 b(As)30 b(with)g(case)f(con\015icts,) -+h(Unison)g(detects)g(this)g(situation)0 3378 y(for)c(y)n(ou,)g(and)g(y) -+n(ou)g(ha)n(v)n(e)g(the)h(same)f(options:)35 b(y)n(ou)26 -+b(can)g(either)h(rename)f(the)h(Unix)f(\014le)h(and)g(re-sync)n -+(hronize,)d(or)i(y)n(ou)f(can)0 3478 y(ignore)h(it.)0 -+3710 y Fh(5.16)112 b(Slo)m(w)37 b(Links)0 3864 y Fn(Unison)28 -+b(is)f(built)h(to)g(run)f(w)n(ell)h(ev)n(en)f(o)n(v)n(er)e(relativ)n -+(ely)i(slo)n(w)f(links)i(suc)n(h)f(as)g(mo)r(dems)h(and)f(DSL)h -+(connections.)125 3963 y(Unison)h(uses)f(the)i(\\rsync)e(proto)r(col")f -+(designed)i(b)n(y)g(Andrew)g(T)-7 b(ridgell)29 b(and)g(P)n(aul)f(Mac)n -+(k)n(erras)e(to)j(greatly)f(sp)r(eed)i(up)0 4063 y(transfers)36 -+b(of)h(large)f(\014les)i(in)f(whic)n(h)h(only)f(small)g(c)n(hanges)f -+(ha)n(v)n(e)g(b)r(een)i(made.)66 b(More)36 b(information)h(ab)r(out)g -+(the)h(rsync)0 4162 y(proto)r(col)26 b(can)i(b)r(e)g(found)g(at)f(the)h -+(rsync)f(w)n(eb)g(site)h(\()p Fk(http://samba.anu)o(.ed)o(u.)o(au/)o -+(rs)o(yn)o(c/)p Fn(\).)125 4262 y(If)h(y)n(ou)f(are)f(using)i(Unison)f -+(with)i Fk(ssh)p Fn(,)e(y)n(ou)g(ma)n(y)g(get)g(some)g(sp)r(eed)h -+(impro)n(v)n(emen)n(t)f(b)n(y)g(enabling)g Fk(ssh)p Fn('s)g -+(compression)0 4362 y(feature.)61 b(Do)35 b(this)h(b)n(y)g(adding)f -+(the)h(option)f(\\)p Fk(-rshargs)40 b(-C)p Fn(")35 b(to)g(the)h -+(command)f(line)h(or)f(\\)p Fk(rshargs)40 b(=)j(-C)p -+Fn(")35 b(to)g(y)n(our)0 4461 y(pro\014le.)0 4694 y Fh(5.17)112 -+b(F)-9 b(ast)38 b(Up)s(date)g(Detection)0 4847 y Fn(If)22 -+b(y)n(our)e(replicas)h(are)f(large)g(and)i(at)f(least)g(one)g(of)h -+(them)g(is)f(on)g(a)g(Windo)n(ws)h(system,)g(y)n(ou)f(ma)n(y)g(\014nd)h -+(that)f(Unison's)h(default)0 4947 y(metho)r(d)i(for)g(detecting)g(c)n -+(hanges)f(\(whic)n(h)h(in)n(v)n(olv)n(es)e(scanning)h(the)h(full)h(con) -+n(ten)n(ts)e(of)h(ev)n(ery)f(\014le)h(on)g(ev)n(ery)f(sync|the)g(only)0 -+5046 y(completely)34 b(safe)f(w)n(a)n(y)g(to)g(do)h(it)g(under)g(Windo) -+n(ws\))f(is)h(to)r(o)g(slo)n(w.)54 b(Unison)34 b(pro)n(vides)e(a)i -+(preference)f Fk(fastcheck)d Fn(that,)0 5146 y(when)i(set)f(to)h -+Fk(yes)p Fn(,)f(causes)g(it)g(to)h(use)f(\014le)h(creation)e(times)i -+(as)f('pseudo)g(ino)r(de)h(n)n(um)n(b)r(ers')f(when)g(scanning)g -+(replicas)g(for)0 5245 y(up)r(dates,)d(instead)f(of)h(reading)e(the)i -+(full)h(con)n(ten)n(ts)d(of)i(ev)n(ery)e(\014le.)1908 -+5589 y(31)p eop -+%%Page: 32 32 -+32 31 bop 125 83 a Fn(When)23 b Fk(fastcheck)c Fn(is)k(set)g(to)g -+Fk(no)p Fn(,)g(Unison)g(will)g(p)r(erform)f(slo)n(w)g(c)n(hec)n -+(king|re-scanning)e(the)j(con)n(ten)n(ts)f(of)h(eac)n(h)f(\014le)h(on)0 -+183 y(eac)n(h)j(sync)n(hronization|on)f(all)h(replicas.)36 -+b(When)27 b Fk(fastcheck)c Fn(is)k(set)f(to)h Fk(default)d -+Fn(\(whic)n(h,)j(naturally)-7 b(,)26 b(is)h(the)g(default\),)0 -+282 y(Unison)h(will)f(use)h(fast)f(c)n(hec)n(ks)g(on)g(Unix)h(replicas) -+f(and)g(slo)n(w)g(c)n(hec)n(ks)f(on)h(Windo)n(ws)h(replicas.)125 -+382 y(This)23 b(strategy)g(ma)n(y)g(cause)g(Unison)h(to)g(miss)f -+(propagating)f(an)h(up)r(date)i(if)f(the)g(create)f(time,)i(mo)r -+(di\014cation)f(time,)h(and)0 482 y(length)h(of)f(the)h(\014le)f(are)g -+(all)g(unc)n(hanged)g(b)n(y)g(the)h(up)r(date)g(\(this)g(is)f(not)g -+(easy)g(to)g(ac)n(hiev)n(e,)g(but)h(it)g(can)f(b)r(e)h(done\).)36 -+b(Ho)n(w)n(ev)n(er,)0 581 y(Unison)26 b(will)g(nev)n(er)g -+Fi(overwrite)h Fn(suc)n(h)f(an)g(up)r(date)g(with)h(a)f(c)n(hange)f -+(from)g(the)i(other)f(replica,)f(since)h(it)h(alw)n(a)n(ys)d(do)r(es)i -+(a)f(safe)0 681 y(c)n(hec)n(k)32 b(for)g(up)r(dates)h(just)g(b)r(efore) -+g(propagating)d(a)j(c)n(hange.)51 b(Th)n(us,)33 b(it)g(is)g(reasonable) -+e(to)h(use)h(this)g(switc)n(h)g(most)f(of)h(the)0 780 -+y(time)c(and)f(o)r(ccasionally)f(run)h(Unison)h(once)f(with)h -+Fk(fastcheck)24 b Fn(set)29 b(to)f Fk(no)p Fn(,)g(if)h(y)n(ou)f(are)f -+(w)n(orried)g(that)i(Unison)f(ma)n(y)g(ha)n(v)n(e)0 880 -+y(o)n(v)n(erlo)r(ok)n(ed)d(an)i(up)r(date.)0 1112 y Fh(5.18)112 -+b(Clic)m(k-starting)35 b(Unison)0 1266 y Fn(On)h(Windo)n(ws)h(NT/2k)e -+(systems,)k(the)e(graphical)e(v)n(ersion)g(of)h(Unison)h(can)f(b)r(e)h -+(in)n(v)n(ok)n(ed)e(directly)h(b)n(y)h(clic)n(king)f(on)g(its)0 -+1365 y(icon.)52 b(On)33 b(Windo)n(ws)g(95/98)d(systems,)k(clic)n -+(k-starting)d(also)h(w)n(orks,)g Fi(as)j(long)h(as)e(you)h(ar)l(e)g -+(not)g(using)f(ssh)p Fn(.)53 b(Due)34 b(to)e(an)0 1465 -+y(incompatibilit)n(y)d(with)h(o)r(caml)f(and)g(Windo)n(ws)g(95/98)e -+(that)j(is)f(not)h(under)f(our)g(con)n(trol,)f(y)n(ou)h(m)n(ust)g -+(start)g(Unison)g(from)0 1565 y(a)e(DOS)h(windo)n(w)f(in)h(Windo)n(ws)f -+(95/98)e(if)j(y)n(ou)f(w)n(an)n(t)g(to)h(use)f(ssh.)125 -+1664 y(When)c(y)n(ou)f(clic)n(k)g(on)g(the)h(Unison)g(icon,)g(t)n(w)n -+(o)f(windo)n(ws)g(will)h(b)r(e)g(created:)34 b(Unison's)22 -+b(regular)f(windo)n(w,)i(plus)g(a)f(console)0 1764 y(windo)n(w,)j(whic) -+n(h)g(is)g(used)g(only)g(for)g(giving)f(y)n(our)g(passw)n(ord)f(to)i -+(ssh)g(\(if)h(y)n(ou)e(do)h(not)g(use)g(ssh)g(to)g(connect,)g(y)n(ou)g -+(can)f(ignore)0 1863 y(this)g(windo)n(w\).)36 b(When)24 -+b(y)n(our)f(passw)n(ord)e(is)j(requested,)g(y)n(ou'll)f(need)h(to)g -+(activ)-5 b(ate)24 b(the)g(console)e(windo)n(w)i(\(e.g.,)g(b)n(y)g -+(clic)n(king)0 1963 y(in)k(it\))g(b)r(efore)f(t)n(yping.)36 -+b(If)28 b(y)n(ou)f(start)f(Unison)i(from)f(a)g(DOS)g(windo)n(w,)g -+(Unison's)g(regular)f(windo)n(w)h(will)g(app)r(ear)g(and)g(y)n(ou)0 -+2063 y(will)h(t)n(yp)r(e)g(y)n(our)e(passw)n(ord)g(in)h(the)h(DOS)g -+(windo)n(w)f(y)n(ou)g(w)n(ere)g(using.)125 2162 y(T)-7 -+b(o)29 b(use)g(Unison)g(in)h(this)f(mo)r(de,)h(y)n(ou)f(m)n(ust)g -+(\014rst)h(create)e(a)h(pro\014le)g(\(see)g(Section)g(5.5)g -+([Pro\014le]\).)41 b(Use)30 b(y)n(our)e(fa)n(v)n(orite)0 -+2262 y(editor)f(for)g(this.)1908 5589 y(32)p eop -+%%Page: 33 33 -+33 32 bop 0 83 a Fm(6)135 b(Advice)0 281 y Fh(6.1)112 -+b(F)-9 b(requen)m(tly)37 b(Ask)m(ed)h(Questions)0 435 -+y Fn(\(See)28 b(Section)f(6.2)g([Common)g(Problems])g(and)g(Section)h -+(6.3)e([Tips)i(and)g(T)-7 b(ric)n(ks])26 b(for)h(further)h -+(suggestions.\))125 604 y Fj(\017)41 b Fi(What)30 b(ar)l(e)g(the)g -+(di\013er)l(enc)l(es)g(b)l(etwe)l(en)f(Unison)h(and)g(rsync?)208 -+735 y Fn(Rsync)37 b(is)g(a)g(mirroring)f(to)r(ol;)42 -+b(Unison)c(is)f(a)g(sync)n(hronizer.)65 b(That)38 b(is,)i(rsync)c -+(needs)i(to)f(b)r(e)h(told)g(\\this)f(replica)208 834 -+y(con)n(tains)24 b(the)h(true)g(v)n(ersions)e(of)i(all)g(the)g -+(\014les;)h(please)f(mak)n(e)f(the)h(other)g(replica)f(lo)r(ok)g -+(exactly)h(the)g(same.")35 b(Unison)208 934 y(is)26 b(capable)g(of)h -+(recognizing)e(up)r(dates)i(in)g(b)r(oth)g(replicas)f(and)h(deciding)g -+(whic)n(h)f(w)n(a)n(y)g(they)h(should)g(b)r(e)g(propagated.)208 -+1064 y(Both)h(Unison)h(and)f(rsync)g(use)h(the)g(so-called)e(\\rsync)h -+(algorithm,")f(b)n(y)i(Andrew)g(T)-7 b(ridgell)28 b(and)g(P)n(aul)g -+(Mac)n(k)n(erras,)208 1164 y(for)23 b(p)r(erforming)g(up)r(dates.)36 -+b(This)24 b(algorithm)f(streamlines)g(up)r(dates)h(in)h(small)e(parts)h -+(of)g(large)e(\014les)i(b)n(y)g(transferring)208 1263 -+y(only)j(the)h(parts)f(that)g(ha)n(v)n(e)g(c)n(hanged.)125 -+1424 y Fj(\017)41 b Fi(What)30 b(ar)l(e)g(the)g(di\013er)l(enc)l(es)g -+(b)l(etwe)l(en)f(Unison)h(and)g(CVS?)208 1555 y Fn(Both)g(CVS)g(and)g -+(Unison)g(can)g(b)r(e)h(used)f(to)g(k)n(eep)g(a)f(remote)h(replica)f -+(of)i(a)e(directory)g(structure)h(up)g(to)g(date)h(with)208 -+1654 y(a)39 b(cen)n(tral)f(rep)r(ository)-7 b(.)71 b(Both)39 -+b(are)g(capable)g(of)g(propagating)e(up)r(dates)j(in)g(b)r(oth)g -+(directions)f(and)g(recognizing)208 1754 y(con\015icting)27 -+b(up)r(dates.)37 b(Both)27 b(use)h(the)g(rsync)f(proto)r(col)f(for)h -+(\014le)h(transfer.)208 1884 y(Unison's)36 b(main)i(adv)-5 -+b(an)n(tage)35 b(is)i(b)r(eing)h(somewhat)e(more)h(automatic)f(and)h -+(easier)f(to)h(use,)j(esp)r(ecially)d(on)g(large)208 -+1984 y(groups)28 b(of)h(\014les.)43 b(CVS)30 b(requires)e(man)n(ual)h -+(noti\014cation)g(whenev)n(er)g(\014les)g(are)g(added)g(or)g(deleted.) -+43 b(Mo)n(ving)29 b(\014les)g(is)208 2083 y(a)e(bit)h(tric)n(ky)-7 -+b(.)36 b(And)28 b(if)g(y)n(ou)f(decide)h(to)f(mo)n(v)n(e)g(a)g -+(directory)-7 b(...)36 b(w)n(ell,)27 b(hea)n(v)n(en)g(help)g(y)n(ou.) -+208 2214 y(CVS,)c(on)f(the)h(other)f(hand,)i(is)e(a)g(full-blo)n(wn)h -+(v)n(ersion)e(con)n(trol)g(system,)i(and)g(it)g(has)f -+Fi(lots)h Fn(of)f(other)g(features)g(\(v)n(ersion)208 -+2313 y(history)-7 b(,)26 b(m)n(ultiple)j(branc)n(hes,)d(etc.\))37 -+b(that)28 b(Unison)g(\(whic)n(h)g(is)f(just)h(a)f(\014le)h(sync)n -+(hronizer\))e(do)r(esn't)i(ha)n(v)n(e.)125 2474 y Fj(\017)41 -+b Fi(Is)31 b(it)g(OK)g(to)h(mount)f(my)g(r)l(emote)h(\014lesystem)f -+(using)g(NFS)g(and)h(run)f(unison)g(lo)l(c)l(al)t(ly,)j(or)e(should)h -+(I)e(run)g(a)h(r)l(emote)208 2574 y(server)e(pr)l(o)l(c)l(ess?)208 -+2704 y Fn(NFS-moun)n(ting)d(the)g(replicas)f(is)h(\014ne,)g(as)g(long)f -+(as)g(the)i(lo)r(cal)e(net)n(w)n(ork)g(is)h(fast)g(enough.)36 -+b(Unison)27 b(needs)f(to)h(read)f(a)208 2804 y(lot)j(of)h(\014les)f -+(\(in)h(particular,)f(it)h(needs)g(to)f(c)n(hec)n(k)g(the)h(last-mo)r -+(di\014ed)f(time)h(of)g(ev)n(ery)e(\014le)i(in)f(the)h(rep)r(ository)e -+(ev)n(ery)208 2903 y(time)g(it)g(runs\),)f(so)g(if)h(the)g(link)g -+(bandwidth)g(is)g(lo)n(w)e(then)j(running)e(a)g(remote)g(serv)n(er)f -+(is)h(m)n(uc)n(h)h(b)r(etter.)125 3064 y Fj(\017)41 b -+Fi(When)27 b(I)f(run)h(Unison)f(on)h(Windows,)i(it)e(cr)l(e)l(ates)g -+(two)g(di\013er)l(ent)g(windows,)i(the)e(main)g(user)g(interfac)l(e)h -+(and)f(a)g(blank)208 3164 y(c)l(onsole)j(window.)40 b(Is)30 -+b(ther)l(e)g(any)g(way)g(to)g(get)g(rid)g(of)h(the)f(se)l(c)l(ond)g -+(one?)208 3294 y Fn(The)f(extra)g(console)f(windo)n(w)h(is)g(there)h -+(for)f(ssh)g(to)g(use)h(to)f(get)g(y)n(our)f(passw)n(ord.)41 -+b(Unfortunately)-7 b(,)30 b(in)g(the)g(presen)n(t)208 -+3394 y(v)n(ersion)c(of)h(unison)h(the)g(windo)n(w)f(will)g(app)r(ear)g -+(whether)h(y)n(ou're)e(using)h(ssh)g(or)g(not.)208 3524 -+y(Karl)17 b(Mo)r(erder)i(con)n(tributed)f(some)h(scripts)g(that)g(he)g -+(uses)g(to)g(mak)n(e)f(the)i(command)f(windo)n(w)f(a)h(bit)h(more)e -+(attractiv)n(e.)208 3623 y(He)29 b(starts)g(unison)g(from)g(a)g -+(shortcut)g(to)g(a)g Fk(.cmd)f Fn(\014le.)42 b(This)30 -+b(lets)f(him)h(con)n(trol)e(the)i(attributes)f(of)h(the)f(command)208 -+3723 y(windo)n(w,)h(making)f(it)i(small)f(and)g(gra)n(y)e(and)i(cen)n -+(tering)f(the)i(passphrase)d(request.)44 b(His)30 b(scripts)f(can)h(b)r -+(e)h(found)f(at)208 3823 y Fk(http://www.cis.)o(upe)o(nn)o(.e)o(du/)o -+Fj(\030)p Fk(b)o(cpi)o(er)o(ce)o(/un)o(is)o(on/)o(do)o(wnl)o(oa)o(d/)o -+(res)o(ou)o(rce)o(s/)o(ka)o(rls)o(-w)o(inh)o(ax)o(.zi)o(p)p -+Fn(.)208 3953 y(It)c(is)g(also)f(p)r(ossible)h(to)g(get)f(rid)h(of)g -+(the)h(windo)n(w)e(en)n(tirely)h(\(for)g(users)f(that)h(only)g(w)n(an)n -+(t)f(so)r(c)n(k)n(et)g(mo)r(de)i(connections\))208 4053 -+y(b)n(y)22 b(pla)n(ying)g(games)f(with)j(icons.)34 b(If)24 -+b(y)n(ou)e(mak)n(e)g(a)g(sym)n(b)r(olic)g(link)h(to)g(the)g -+(executable,)g(y)n(ou)f(can)h(edit)g(the)g(prop)r(erties)208 -+4152 y(b)r(o)n(x)28 b(to)h(mak)n(e)f(this)h(windo)n(w)g(come)g(up)g -+(iconic.)41 b(That)29 b(w)n(a)n(y)e(when)i(y)n(ou)g(clic)n(k)f(on)h -+(the)g(link,)h(y)n(ou)e(seem)h(to)g(just)g(get)208 4252 -+y(a)e(unison)g(windo)n(w)g(\(except)h(on)f(the)h(task)f(bar,)g(where)g -+(the)h(text)g(windo)n(w)f(sho)n(ws\).)125 4413 y Fj(\017)41 -+b Fi(Wil)t(l)27 b(unison)g(b)l(ehave)h(c)l(orr)l(e)l(ctly)f(if)h(use)l -+(d)e(tr)l(ansitively?)39 b(That)27 b(is,)i(if)e(I)g(synchr)l(onize)h(b) -+l(oth)f(b)l(etwe)l(en)f Fk(host1:dir)d Fi(and)208 4512 -+y Fk(host2:dir)28 b Fi(and)33 b(b)l(etwe)l(en)f Fk(host2:dir)c -+Fi(and)33 b Fk(host3:dir)28 b Fi(at)k(di\013er)l(ent)h(times?)46 -+b(A)n(r)l(e)32 b(ther)l(e)g(any)g(pr)l(oblems)i(if)f(the)208 -+4612 y(\\c)l(onne)l(ctivity)c(gr)l(aph")i(has)g(lo)l(ops?)208 -+4742 y Fn(This)f(mo)r(de)h(of)f(usage)f(will)i(w)n(ork)e(\014ne.)46 -+b(As)30 b(far)g(as)g(eac)n(h)g(\\host)f(pair")h(is)g(concerned,)g -+(\014lesystem)h(up)r(dates)f(made)208 4842 y(b)n(y)d(Unison)h(when)g -+(sync)n(hronizing)f(an)n(y)g(other)g(pairs)g(of)h(hosts)g(are)f -+(exactly)g(the)h(same)g(as)f(ordinary)f(user)h(c)n(hanges)208 -+4941 y(to)j(the)h(\014lesystem.)45 b(So)30 b(if)h(a)f(\014le)h(started) -+f(out)g(ha)n(ving)g(b)r(een)g(mo)r(di\014ed)h(on)f(just)i(one)e(mac)n -+(hine,)g(then)h(ev)n(ery)f(time)208 5041 y(Unison)25 -+b(is)g(run)g(on)h(a)f(pair)f(of)i(hosts)f(where)f(one)i(has)e(heard)h -+(ab)r(out)g(the)h(c)n(hange)e(and)i(the)g(other)e(hasn't)i(will)f -+(result)208 5141 y(in)g(the)h(c)n(hange)e(b)r(eing)h(propagated)f(to)h -+(the)h(other)e(host.)36 b(Running)26 b(unison)f(b)r(et)n(w)n(een)g(mac) -+n(hines)g(where)g(b)r(oth)g(ha)n(v)n(e)208 5240 y(already)j(heard)g(ab) -+r(out)i(the)g(c)n(hange)e(will)i(lea)n(v)n(e)e(that)i(\014le)g(alone.) -+42 b(So,)30 b(no)f(matter)h(what)f(the)h(connectivit)n(y)f(graph)208 -+5340 y(lo)r(oks)d(lik)n(e)g(\(as)h(long)g(as)f(it)i(is)f(not)g -+(partitioned\),)g(ev)n(en)n(tually)f(ev)n(ery)n(one)f(will)i(agree)f -+(on)h(the)g(new)g(v)-5 b(alue)27 b(of)g(the)h(\014le.)1908 -+5589 y(33)p eop -+%%Page: 34 34 -+34 33 bop 208 83 a Fn(The)31 b(only)f(thing)i(to)e(b)r(e)i(careful)e -+(of)h(is)g(c)n(hanging)f(the)h(\014le)h Fi(again)g Fn(on)f(the)g -+(\014rst)g(mac)n(hine)g(\(or,)g(in)g(fact,)h(an)n(y)f(other)208 -+183 y(mac)n(hine\))21 b(b)r(efore)g(all)g(the)h(mac)n(hines)f(ha)n(v)n -+(e)f(heard)h(ab)r(out)g(the)h(\014rst)f(c)n(hange)f({)h(this)h(can)f -+(result)g(in)h(Unison)f(rep)r(orting)208 282 y(con\015icting)27 -+b(c)n(hanges)f(to)h(the)h(\014le,)g(whic)n(h)g(y)n(ou'll)f(then)h(ha)n -+(v)n(e)e(to)i(resolv)n(e)e(b)n(y)h(hand.)125 447 y Fj(\017)41 -+b Fi(What)30 b(wil)t(l)h(happ)l(en)g(if)f(I)g(try)g(to)f(synchr)l -+(onize)i(a)f(sp)l(e)l(cial)h(\014le)f(\(e.g.,)i(something)e(in)g -+Fk(/dev)p Fi(,)e Fk(/proc)p Fi(,)g(etc.\)?)208 579 y -+Fn(Unison)19 b(will)h(refuse)f(to)g(sync)n(hronize)f(suc)n(h)h -+(\014les.)34 b(It)20 b(only)f(understands)g(ordinary)e(\014les,)k -+(directories,)f(and)f(symlinks.)125 743 y Fj(\017)41 -+b Fi(Is)29 b(it)h(OK)f(to)h(run)f(sever)l(al)h(c)l(opies)i(of)e(Unison) -+g(c)l(oncurr)l(ently?)208 875 y Fn(Unison)f(is)g(built)h(to)g(handle)f -+(this)h(case,)f(but)h(this)f(functionalit)n(y)h(has)f(not)g(b)r(een)h -+(extensiv)n(ely)f(tested.)42 b(Keep)29 b(y)n(our)208 -+975 y(ey)n(es)d(op)r(en.)125 1139 y Fj(\017)41 b Fi(What)29 -+b(wil)t(l)h(happ)l(en)g(if)g(I)f(do)h(a)f(lo)l(c)l(al)h(\(or)f(NFS,)g -+(etc.\))38 b(sync)29 b(and)h(some)f(\014le)g(happ)l(ens)h(to)f(b)l(e)g -+(p)l(art)g(of)h(b)l(oth)f(r)l(eplic)l(as?)208 1271 y -+Fn(It)c(will)g(lo)r(ok)f(to)h(Unison)g(as)f(though)h(someb)r(o)r(dy)f -+(else)h(has)g(b)r(een)g(mo)r(difying)g(the)g(\014les)g(it)h(is)e -+(trying)h(to)g(sync)n(hronize,)208 1371 y(and)i(it)h(will)g(fail)g -+(\(safely\))f(on)g(these)h(\014les.)125 1535 y Fj(\017)41 -+b Fi(What)31 b(happ)l(ens)i(if)g(Unison)e(gets)h(kil)t(le)l(d)h(while)g -+(it)f(is)g(working?)45 b(Do)32 b(I)f(have)i(to)e(kil)t(l)i(it)f(nic)l -+(ely,)h(or)f(c)l(an)g(I)f(use)h Fk(kill)208 1635 y(-9)p -+Fi(?)47 b(What)33 b(if)g(the)g(network)h(go)l(es)f(down)g(during)g(a)h -+(synchr)l(onization?)49 b(What)33 b(if)h(one)f(machine)h(cr)l(ashes)g -+(but)e(the)208 1734 y(other)e(ke)l(eps)g(running?)208 -+1866 y Fn(Don't)e(w)n(orry;)d(b)r(e)j(happ)n(y)-7 b(.)37 -+b(See)27 b(Section)h(4.6)f([In)n(v)-5 b(arian)n(ts].)125 -+2031 y Fj(\017)41 b Fi(What)27 b(ab)l(out)h(r)l(ac)l(e)f(c)l(onditions) -+i(when)f(b)l(oth)g(Unison)f(and)h(some)g(other)g(pr)l(o)l(gr)l(am)g(or) -+g(user)f(ar)l(e)h(b)l(oth)g(trying)f(to)h(write)208 2130 -+y(to)h(a)h(\014le)g(at)g(exactly)g(the)g(same)g(moment?)208 -+2262 y Fn(Unison)41 b(w)n(orks)e(hard)h(to)h(mak)n(e)g(these)g(\\windo) -+n(ws)e(of)i(danger")f(as)g(short)h(as)f(p)r(ossible,)k(but)e(they)f -+(cannot)g(b)r(e)208 2362 y(eliminated)27 b(completely)-7 -+b(.)125 2527 y Fj(\017)41 b Fi(The)30 b(Unix)f(\014le)h(lo)l(cking)h -+(me)l(chanism)g(do)l(esn)-8 b('t)29 b(work)i(very)f(wel)t(l)h(under)e -+(NFS.)h(Is)g(this)g(a)g(pr)l(oblem)h(for)g(Unison?)208 -+2659 y Fn(No.)125 2823 y Fj(\017)41 b Fi(On)31 b(Windows)j(systems,)f -+(it)g(lo)l(oks)g(like)h(the)f Fk(root)e Fi(pr)l(efer)l(enc)l(es)i(ar)l -+(e)g(sp)l(e)l(ci\014e)l(d)g(using)f(b)l(ackslashes,)k(but)c -+Fk(path)e Fi(and)208 2923 y Fk(ignore)d Fi(pr)l(efer)l(enc)l(es)j(ar)l -+(e)g(sp)l(e)l(ci\014e)l(d)h(with)f(forwar)l(d)i(slashes.)39 -+b(What's)31 b(up)e(with)i(that?)208 3055 y Fn(Unison)g(uses)g(t)n(w)n -+(o)f(sorts)g(of)h(paths:)44 b(nativ)n(e)31 b(\014lesystem)g(paths,)h -+(whic)n(h)f(use)g(the)h(syn)n(tax)e(of)i(the)f(host)g(\014lesystem,)208 -+3154 y(and)j(\\p)r(ortable")g(paths)g(relativ)n(e)g(to)h(the)g(ro)r -+(ots)f(of)h(the)g(replicas,)h(whic)n(h)e(alw)n(a)n(ys)f(use)i(/)g(to)f -+(separate)g(the)h(path)208 3254 y(comp)r(onen)n(ts.)h(Ro)r(ots)27 -+b(are)g(nativ)n(e)g(\014lesystem)g(paths;)h(the)g(others)e(are)h(ro)r -+(ot-relativ)n(e.)0 3486 y Fh(6.2)112 b(Common)37 b(Problems)0 -+3639 y Fn(If)28 b(y)n(ou're)e(ha)n(ving)h(problems)g(with)h(Unison,)f -+(the)h(suggestions)e(in)i(this)g(section)f(ma)n(y)g(help.)125 -+3738 y(A)22 b(general)e(recommendation)g(is)i(that,)h(if)g(y)n(ou'v)n -+(e)d(gotten)h(in)n(to)h(a)f(state)h(y)n(ou)e(don't)i(understand,)h -+(deleting)f(the)g(arc)n(hiv)n(e)0 3838 y(\014les)j(on)g(b)r(oth)g -+(replicas)f(\(\014les)h(with)h(names)e(lik)n(e)h Fk(arNNNNNNNNNNNNNN)o -+(N)19 b Fn(in)25 b(the)h Fk(.unison)c Fn(directory\))i(will)h(return)g -+(y)n(ou)f(to)0 3938 y(a)h(blank)g(slate.)36 b(If)25 b(the)h(replicas)e -+(are)g(iden)n(tical,)i(then)g(deleting)f(the)h(arc)n(hiv)n(es)d(is)i -+(alw)n(a)n(ys)f(safe.)35 b(If)26 b(they)g(are)e(not)h(iden)n(tical,)0 -+4037 y(then)k(deleting)g(the)g(arc)n(hiv)n(es)d(will)j(cause)f(all)g -+(\014les)h(that)f(exist)h(on)f(one)g(side)h(but)g(not)g(the)g(other)e -+(to)i(b)r(e)g(copied,)f(and)h(will)0 4137 y(rep)r(ort)e(con\015icts)g -+(for)g(all)h(non-iden)n(tical)e(\014les)i(that)g(do)f(exist)h(on)f(b)r -+(oth)h(sides.)125 4237 y(\(If)23 b(y)n(ou)f(think)i(the)f(b)r(eha)n -+(vior)f(y)n(ou're)g(observing)f(is)i(an)g(actual)f(bug,)i(then)g(y)n -+(ou)e(migh)n(t)h(consider)f Fi(moving)i Fn(the)f(arc)n(hiv)n(es)0 -+4336 y(to)33 b(somewhere)e(else)i(instead)f(of)h(deleting)f(them,)j(so) -+d(that)h(y)n(ou)f(can)g(try)h(to)f(replicate)g(the)i(bad)e(b)r(eha)n -+(vior)f(and)i(tell)g(us)0 4436 y(what)28 b(more)e(clearly)h(happ)r -+(ened.\))125 4614 y Fj(\017)41 b Fi(The)33 b(text)f(mo)l(de)h(user)g -+(interfac)l(e)g(fails)h(with)g(\\)p Fk(Uncaught)40 b(exception)g -+(Sys_blocked_io)p Fi(")26 b(when)33 b(running)f(over)208 -+4714 y(ssh2.)208 4846 y Fn(The)20 b(problem)h(here)f(is)g(that)h(ssh2)f -+(puts)h(its)g(standard)f(\014le)h(descriptors)e(in)n(to)i(non-blo)r(c)n -+(king)e(mo)r(de.)35 b(But)21 b(unison)f(and)208 4946 -+y(ssh)27 b(share)f(the)i(same)f(stderr)g(\(so)g(that)h(error)e -+(messages)g(from)h(the)h(serv)n(er)e(are)g(displa)n(y)n(ed\),)h(and)g -+(the)h(non)n(blo)r(c)n(king)208 5045 y(setting)34 b(in)n(terferes)g -+(with)i(Unison's)e(in)n(teraction)g(with)h(the)h(user.)57 -+b(This)35 b(can)g(b)r(e)g(corrected)e(b)n(y)i(redirecting)f(the)208 -+5145 y(stderr)26 b(when)i(in)n(v)n(oking)e(Unison:)425 -+5340 y Fk(unison)42 b(-ui)g(text)g(<other)f(args>)g(2>/dev/tty)1908 -+5589 y Fn(34)p eop -+%%Page: 35 35 -+35 34 bop 208 83 a Fn(\(The)23 b(redirection)g(syn)n(tax)f(is)h(a)g -+(bit)h(shell-sp)r(eci\014c.)35 b(On)23 b(some)g(shells,)h(e.g.,)g(csh)f -+(and)g(tcsh,)h(y)n(ou)f(ma)n(y)g(need)g(to)g(write)338 -+278 y Fk(unison)41 b(-ui)i(text)f(<other)f(args>)85 b(>)43 -+b(&)g(/dev/tty)208 473 y Fn(instead.\))125 637 y Fj(\017)e -+Fi(What)30 b(do)l(es)g(the)g(fol)t(lowing)i(me)l(an?)382 -+832 y Fk(Propagating)39 b(updates)i([accounting/fed)o(scw)o(h3)o(qt2)o -+(00)o(0.)o(wb3)o(])382 931 y(failed:)g(error)g(in)i(renaming)d -+(locally:)382 1031 y(/DANGER.README:)d(permission)j(denied)208 -+1226 y Fn(It)19 b(means)g(that)h(unison)f(is)g(ha)n(ving)g(trouble)g -+(creating)f(the)i(temp)r(orary)e(\014le)i(D)n(ANGER.README,)g(whic)n(h) -+f(it)h(uses)f(as)208 1326 y(a)f("commit)g(log")f(for)g(op)r(erations)h -+(\(suc)n(h)g(as)g(renaming)f(its)h(temp)r(orary)g(\014le)g -+Fk(accounting/fedscw)o(h3)o(qt)o(200)o(0.)o(wb3)o(.u)o(ni)o(son)o(.t)o -+(mp)208 1425 y Fn(to)25 b(the)i(real)e(lo)r(cation)g -+Fk(accounting/fedscw)o(h3)o(qt2)o(00)o(0.)o(wb3)o Fn(\))c(that)26 -+b(ma)n(y)f(lea)n(v)n(e)g(the)h(\014lesystem)g(in)g(a)g(bad)g(state)g -+(if)208 1525 y(they)k(are)f(in)n(terrupted)i(in)f(the)h(middle.)45 -+b(This)31 b(is)f(prett)n(y)g(unlik)n(ely)-7 b(,)31 b(since)f(the)h -+(rename)e(op)r(eration)h(happ)r(ens)g(fast,)208 1624 -+y(but)j(it)h(is)e(p)r(ossible;)k(if)d(it)h(happ)r(ens,)g(the)f(commit)h -+(log)e(will)h(b)r(e)g(left)h(around)e(and)h(Unison)g(will)g(notice)g -+(\(and)g(tell)208 1724 y(y)n(ou\))27 b(the)h(next)f(time)i(it)f(runs)f -+(that)h(the)g(consistency)e(of)i(that)g(\014le)g(needs)f(to)h(b)r(e)g -+(c)n(hec)n(k)n(ed.)208 1856 y(The)38 b(sp)r(eci\014c)g(problem)g(here)g -+(is)g(that)h(Unison)f(is)g(trying)g(to)g(create)f(D)n(ANGER.README)i -+(in)g(the)f(directory)208 1956 y(sp)r(eci\014ed)c(b)n(y)g(y)n(our)f -+(HOME)h(en)n(vironmen)n(t)g(v)-5 b(ariable,)35 b(whic)n(h)f(seems)g(to) -+g(b)r(e)h(set)f(to)h(/,)g(where)f(y)n(ou)g(do)g(not)g(ha)n(v)n(e)208 -+2055 y(write)27 b(p)r(ermission.)125 2220 y Fj(\017)41 -+b Fi(The)30 b(c)l(ommand)h(line)425 2414 y Fk(unison)42 -+b(work)g(ssh://remote.dc)o(s.)o(ed.)o(ac)o(.uk)o(/w)o(ork)208 -+2609 y Fi(fails,)33 b(with)g(\\)p Fk(fatal)41 b(error:)85 -+b(could)41 b(not)h(connect)f(to)i(server.)p Fi(")d(But)31 -+b(when)h(I)g(c)l(onne)l(ct)f(dir)l(e)l(ctly)h(with)g -+Fk(ssh)208 2709 y(remote.dcs.ed.a)o(c.u)o(k/)o(wo)o(rk)p -+Fi(,)22 b(I)28 b(se)l(e)g(that)g(my)g Fk(PATH)e Fi(variable)k(is)f(c)l -+(orr)l(e)l(ctly)f(set,)h(and)f(the)g(unison)g(exe)l(cutable)g(is)208 -+2808 y(found.)208 2940 y Fn(In)33 b(the)h(\014rst)f(case,)h(Unison)f -+(is)g(using)g Fk(ssh)f Fn(to)h(execute)g(a)g(command,)h(and)f(in)h(the) -+g(second,)g(it)f(is)g(giving)g(y)n(ou)f(an)208 3040 y(in)n(teractiv)n -+(e)21 b(remote)h(shell.)35 b(Under)23 b(some)f(ssh)g(con\014gurations,) -+g(these)h(t)n(w)n(o)f(use)g(di\013eren)n(t)h(startup)g(sequences.)34 -+b(Y)-7 b(ou)208 3140 y(can)27 b(test)h(whether)f(this)h(is)g(the)f -+(problem)h(here)f(b)n(y)g(trying,)g(e.g.,)382 3335 y -+Fk(ssh)42 b(remote.dcs.ed.ac.)o(uk)37 b('echo)k($PATH')208 -+3529 y Fn(and)27 b(seeing)g(whether)g(y)n(our)g Fk(PATH)f -+Fn(is)h(the)h(same)f(as)g(when)h(y)n(ou)f(do)382 3724 -+y Fk(ssh)42 b(remote.dcs.ed.ac.)o(uk)382 3824 y([give)f(password)g(and) -+h(wait)g(for)g(connection])382 3923 y(echo)g($PATH)208 -+4118 y Fn(This)26 b(seems)f(to)h(b)r(e)h(con)n(trolled)e(b)n(y)h(the)g -+(con\014guration)f(of)h(ssh,)g(but)h(w)n(e)f(ha)n(v)n(e)f(not)h -+(understo)r(o)r(d)f(all)h(the)h(details|if)208 4218 y(someone)f(do)r -+(es,)h(please)g(let)h(us)g(kno)n(w.)125 4382 y Fj(\017)41 -+b Fi(I'm)30 b(having)h(tr)l(ouble)e(getting)h(unison)f(working)i(with)g -+(op)l(enssh)f(under)g(Windows.)39 b(A)n(ny)30 b(suggestions?)208 -+4514 y Fn(An)n(ton)n(y)d(Courtney)g(con)n(tributed)g(the)h(follo)n -+(wing)e(commen)n(t.)390 4678 y(I)38 b(ran)f(in)h(to)f(some)g -+(di\016culties)i(trying)e(to)g(use)h(this)g(ssh)f(clien)n(t)h(with)g -+(Unison,)i(and)e(trac)n(k)n(ed)e(do)n(wn)390 4778 y(at)h(least)f(one)g -+(of)h(the)g(problems.)63 b(I)37 b(though)n(t)f(I'd)h(share)e(m)n(y)i -+(exp)r(eriences,)h(and)e(pro)n(vide)g(a)g('kno)n(wn)390 -+4878 y(go)r(o)r(d')24 b(solution)h(for)f(other)g(users)g(who)g(migh)n -+(t)h(w)n(an)n(t)f(to)g(use)h(this)g(Windo)n(ws)f(/)g(Unison)h(/)f(ssh)h -+(/)f(Cygwin)390 4977 y(com)n(bination.)390 5093 y(If)c(y)n(ou)e(launc)n -+(h)h(Unison)h(from)f(bash,)h(it)g(fails)f(\(at)h(least)e(for)h(me\).)35 -+b(Running)19 b Fk(unison_win32-gtku)o(i.e)o(xe)o Fn(,)390 -+5192 y(I)28 b(get)f(a)g(dialog)g(b)r(o)n(x)g(that)h(reads:)739 -+5340 y Fk(Fatal)41 b(error:)h(Error)f(in)i(checkServer:)38 -+b(Broken)k(pipe)f([read\(\)])1908 5589 y Fn(35)p eop -+%%Page: 36 36 -+36 35 bop 390 83 a Fn(and)28 b(a)f(message)f(is)h(prin)n(ted)h(to)f -+(stderr)g(in)h(the)g(bash)f(windo)n(w)g(that)h(reads:)739 -+228 y Fk(ssh:)42 b(unison_win32-gtk)o(ui)o(.ex)o(e:)37 -+b(no)43 b(address)d(associated)g(with)i(hostname.)390 -+374 y Fn(My)31 b(guess)g(is)g(that)g(this)h(is)f(caused)g(b)n(y)g(some) -+f(incompatibilit)n(y)i(b)r(et)n(w)n(een)f(the)g(Ocaml)g(Win32)g -+(library)390 473 y(routines)c(and)h(Cygwin)f(with)h(regard)e(to)h -+(setting)h(up)g(argv[])e(for)h(c)n(hild)g(pro)r(cesses.)208 -+635 y(The)g(solution)g(is)h(to)f(launc)n(h)g(Unison)h(from)f(a)g(DOS)h -+(command)f(prompt)h(instead;)f(or)g(see)g(section)g(5.18.)125 -+797 y Fj(\017)41 b Fi(When)34 b(I)g(use)g(ssh)h(to)f(lo)l(g)h(into)f -+(the)g(server,)j(everything)e(lo)l(oks)g(\014ne)f(\(and)h(I)f(c)l(an)g -+(se)l(e)h(the)f(Unison)g(binary)h(in)g(my)208 897 y(p)l(ath\).)k(But)29 -+b(when)h(I)g(do)h(')p Fk(ssh)42 b(<server>)f(unison)p -+Fi(')27 b(it)j(fails.)40 b(Why?)208 1028 y Fn([Thanks)27 -+b(to)g(Nic)n(k)g(Phillips)h(for)f(the)h(follo)n(wing)e(explanation.]) -+208 1159 y(It's)33 b(simple.)53 b(If)33 b(y)n(ou)f(start)h(ssh,)h(en)n -+(ter)e(y)n(our)g(passw)n(ord)f(etc.)53 b(and)33 b(then)h(end)f(up)g(in) -+g(a)g(shell,)h(y)n(ou)e(ha)n(v)n(e)g(a)h(login)208 1258 -+y(shell.)208 1389 y(If)28 b(y)n(ou)e(do)i("ssh)f(m)n(yhost.com)f -+(unison")h(then)h(unison)g(is)f(not)h(run)f(in)h(a)f(login)g(shell.)208 -+1520 y(This)36 b(means)g(that)g(di\013eren)n(t)h(shell)f(init)h -+(scripts)e(are)h(used,)i(and)e(most)g(p)r(eople)h(seem)f(to)g(ha)n(v)n -+(e)f(their)h(shell)g(init)208 1619 y(scripts)27 b(set)g(up)h(all)f -+(wrong.)208 1750 y(With)33 b(bash,)g(for)f(example,)i(y)n(our)d -+Fk(.bash_profile)c Fi(only)33 b Fn(gets)f(used)h(if)g(y)n(ou)f(start)g -+(a)g(login)f(shell.)52 b(This)33 b(usually)208 1850 y(means)28 -+b(that)h(y)n(ou'v)n(e)e(logged)g(in)i(on)g(the)g(system)f(console,)g -+(on)h(a)f(terminal,)h(or)e(remotely)-7 b(.)40 b(If)29 -+b(y)n(ou)f(start)g(an)g(xterm)208 1949 y(from)j(the)g(command)g(line)h -+(y)n(ou)e(w)n(on't)i(get)f(a)g(login)f(shell)i(in)f(it.)49 -+b(If)32 b(y)n(ou)e(start)h(a)g(command)g(remotely)g(from)g(the)208 -+2049 y(ssh)26 b(or)g(rsh)g(command)h(line)g(y)n(ou)f(also)g(w)n(on't)h -+(get)f(a)h(login)f(shell)h(to)g(run)f(it)i(in)f(\(this)g(is)g(of)g -+(course)e(a)i(Go)r(o)r(d)g(Thing)f({)208 2149 y(y)n(ou)h(ma)n(y)g(w)n -+(an)n(t)g(to)h(run)g(in)n(teractiv)n(e)e(commands)h(from)h(it,)g(for)g -+(example)f(to)h(ask)f(what)h(t)n(yp)r(e)g(of)g(terminal)f(they're)208 -+2248 y(using)g(to)r(da)n(y\).)208 2379 y(If)k(p)r(eople)g(insist)h(on)f -+(setting)g(their)g Fk(PATH)f Fn(in)h(their)g Fk(.bash_profile)p -+Fn(,)c(then)32 b(they)f(should)g(probably)f(do)h(at)g(least)208 -+2479 y(one)c(of)g(the)h(follo)n(wing:)284 2641 y(1.)41 -+b(stop)28 b(it;)284 2769 y(2.)41 b(read)27 b(the)h(bash)f(man)n(ual,)g -+(section)g("INV)n(OCA)-7 b(TION";)284 2898 y(3.)41 b(set)28 -+b(their)f(path)h(in)g(their)g Fk(.bashrc)p Fn(;)284 3027 -+y(4.)41 b(get)28 b(their)f(sysadmin)g(to)h(set)f(a)g(sensible)h -+(system-wide)f(default)h(path;)284 3156 y(5.)41 b(source)27 -+b(their)g Fk(.bash_profile)22 b Fn(from)28 b(their)f -+Fk(.bashrc)e Fn(...)208 3318 y(It's)i(prett)n(y)h(similar)e(for)h(most) -+h(shells.)125 3480 y Fj(\017)41 b Fi(Unison)30 b(cr)l(ashes)g(with)h -+(an)f(\\out)g(of)h(memory")f(err)l(or)h(when)f(use)l(d)g(to)g(synchr)l -+(onize)h(r)l(e)l(al)t(ly)g(huge)g(dir)l(e)l(ctories)g(\(e.g.,)208 -+3579 y(with)f(hundr)l(e)l(ds)g(of)g(thousands)h(of)f(\014les\).)208 -+3710 y Fn(Y)-7 b(ou)28 b(ma)n(y)g(need)g(to)g(increase)f(y)n(our)g -+(maxim)n(um)h(stac)n(k)g(size.)39 b(On)28 b(Lin)n(ux)g(and)g(Solaris)f -+(systems,)h(for)g(example,)g(y)n(ou)208 3810 y(can)f(do)g(this)h(using) -+f(the)h Fk(ulimit)d Fn(command)j(\(see)f(the)h Fk(bash)e -+Fn(do)r(cumen)n(tation)h(for)g(details\).)125 3972 y -+Fj(\017)41 b Fi(Unison)29 b(se)l(ems)h(to)g(b)l(e)f(unable)h(to)g(c)l -+(opy)h(a)f(single)g(r)l(e)l(al)t(ly)h(huge)f(\014le.)39 -+b(I)30 b(get)f(something)i(like)g(this:)382 4161 y Fk(Error)41 -+b(in)i(querying)d(file)i(information:)382 4260 y(Value)f(too)i(large)e -+(for)i(defined)d(data)i(type)g([lstat\(...\)])208 4449 -+y Fn(This)26 b(is)g(a)f(limitation)i(in)f(the)g(OCaml)g(in)n(terface)f -+(to)h(the)h(Unix)f(system)g(calls.)36 b(\(The)26 b(problem)g(is)g(that) -+g(the)h(OCaml)208 4549 y(library)i(uses)i(32-bit)f(in)n(tegers)g(to)h -+(represen)n(t)e(\014le)j(p)r(ositions.)46 b(The)31 b(maximal)g(p)r -+(ositiv)n(e)f('in)n(t')i(in)f(OCaml)f(is)h(ab)r(out)208 -+4649 y(2.1E9.)42 b(W)-7 b(e)31 b(hop)r(e)f(that)g(the)h(OCaml)e(team)h -+(will)h(someda)n(y)e(pro)n(vide)f(an)i(alternativ)n(e)f(in)n(terface)h -+(that)g(uses)g(64-bit)208 4748 y(in)n(tegers.)125 4910 -+y Fj(\017)41 b Fi(Why)30 b(do)l(es)g(unison)g(run)f(so)h(slow)t(ly)h -+(the)f(\014rst)f(time)h(I)f(start)h(it?)208 5041 y Fn(On)i(the)i -+(\014rst)e(sync)n(hronization,)h(unison)f(do)r(esn't)i(ha)n(v)n(e)d(an) -+n(y)i(\\memory")e(of)i(what)g(y)n(our)e(replicas)h(used)h(to)g(lo)r(ok) -+208 5141 y(lik)n(e,)h(so)f(it)g(has)g(to)g(go)g(through,)h -+(\014ngerprin)n(t)e(ev)n(ery)g(\014le,)j(transfer)d(the)i(\014ngerprin) -+n(ts)e(across)f(the)j(net)n(w)n(ork,)f(and)208 5240 y(compare)27 -+b(them)h(to)g(what's)g(on)g(the)h(other)f(side.)38 b(Ha)n(ving)28 -+b(done)g(this)g(once,)g(it)h(stashes)e(a)n(w)n(a)n(y)g(the)h -+(information)g(so)208 5340 y(that)f(in)h(future)g(runs)f(almost)g(all)h -+(of)f(the)h(w)n(ork)e(can)i(b)r(e)g(done)f(lo)r(cally)g(on)g(eac)n(h)g -+(side.)1908 5589 y(36)p eop -+%%Page: 37 37 -+37 36 bop 125 83 a Fj(\017)41 b Fi(I)32 b(c)l(an)-8 b('t)32 -+b(se)l(em)h(to)f(override)i(the)f(p)l(aths)g(sele)l(cte)l(d)g(in)g(the) -+f(pr)l(o\014le)i(by)f(using)f(a)h Fk(-path)d Fi(ar)l(gument)i(on)h(the) -+f(c)l(ommand)208 183 y(line.)208 315 y Fn(Righ)n(t:)39 -+b(the)29 b Fk(path)e Fn(preference)h(is)g(additiv)n(e)h(\(eac)n(h)f -+(use)h(adds)f(an)g(en)n(try)h(to)f(the)h(list)g(of)g(paths)g(within)g -+(the)g(replicas)208 415 y(that)d(Unison)g(will)h(try)f(to)g(sync)n -+(hronize\),)f(and)h(there)h(is)f(no)g(w)n(a)n(y)f(to)h(remo)n(v)n(e)e -+(en)n(tries)i(once)g(they)g(ha)n(v)n(e)f(gotten)h(in)n(to)208 -+515 y(this)i(list.)37 b(The)28 b(solution)f(is)g(to)h(split)g(y)n(our)e -+(preference)h(\014le)h(in)n(to)f(di\013eren)n(t)h(\\top-lev)n(el")e -+(\014les)h(con)n(taining)g(di\013eren)n(t)208 614 y(sets)32 -+b(of)h Fk(path)e Fn(preferences)g(and)i(mak)n(e)f(them)h(all)g(include) -+g(a)f(common)g(preference)g(\014le)h(to)f(a)n(v)n(oid)g(rep)r(eating)g -+(the)208 714 y(non-path)27 b(preferences.)36 b(See)27 -+b(Section)h(5.6)e([Pro\014le)h(Examples])f(for)h(a)h(complete)f -+(example.)125 880 y Fj(\017)41 b Fi(I)29 b(c)l(an)-8 -+b('t)28 b(se)l(em)h(to)g(override)i(the)e(r)l(o)l(ots)g(sele)l(cte)l(d) -+h(in)f(the)g(pr)l(o\014le)h(by)f(listing)h(the)f(r)l(o)l(ots)g(on)g -+(the)g(c)l(ommand)h(line.)39 b(I)29 b(get)208 980 y(\\F)-6 -+b(atal)29 b(err)l(or:)40 b(Wr)l(ong)29 b(numb)l(er)g(of)i(r)l(o)l(ots)e -+(\(2)h(exp)l(e)l(cte)l(d;)h(4)f(pr)l(ovide)l(d\).")208 -+1112 y Fn(Ro)r(ots)20 b(should)h(b)r(e)h(pro)n(vided)e -+Fi(either)i Fn(in)g(the)f(preference)g(\014le)g Fi(or)h -+Fn(on)f(the)g(command)g(line,)i(not)e(b)r(oth.)35 b(See)22 -+b(Section)f(5.6)208 1212 y([Pro\014le)26 b(Examples])g(for)i(further)f -+(advice.)125 1378 y Fj(\017)41 b Fi(I)29 b(am)h(trying)g(to)g(c)l -+(ompile)h(unison)f(2.7.7)i(using)d(OCaml)h(3.04.)41 b(I)30 -+b(get)f(\\V)-6 b(alues)29 b(do)i(not)e(match")h(err)l(or.)208 -+1511 y Fn(Unison)36 b(2.7.7)f(compiles)h(with)g(Ocaml)g(3.02.)62 -+b(Later)35 b(v)n(ersions)g(of)h(OCaml,)i(include)e(v)n(ersion)f(3.04,)i -+(require)e(b)n(y)208 1611 y(default)44 b(all)g(parameter)f(lab)r(els)h -+(for)g(function)h(calls)f(if)g(they)h(are)e(declared)h(in)g(the)h(in)n -+(terface.)86 b(Adding)45 b(the)208 1710 y(compilation)c(option)i(\\)p -+Fk(-nolabels)p Fn(")37 b(\(b)n(y)43 b(inserting)f(a)g(line)g(\\)p -+Fk(CAMLFLAGS+=-nola)o(be)o(ls)o Fn(")36 b(to)43 b(the)g(\014le)f(named) -+208 1810 y(\\)p Fk(Makefile.OCaml)o Fn("\))33 b(should)38 -+b(solv)n(e)f(the)i(problem.)69 b(T)-7 b(o)38 b(compile)h(the)g -+(graphical)d(user)i(in)n(terface)g(for)g(Unison)208 1910 -+y(2.7.7,)26 b(use)h(LablGtk)h(1.1.2)e(instead)i(of)f(LablGtk)h(1.1.3.)0 -+2142 y Fh(6.3)112 b(T)-9 b(ric)m(ks)36 b(and)j(Tips)125 -+2295 y Fj(\017)i Fi(Is)29 b(it)h(p)l(ossible)h(to)f(run)f(Unison)h(fr)l -+(om)g Fk(inetd)d Fi(\(the)j(Unix)f(internet)g(servic)l(es)i(daemon\)?) -+208 2428 y Fn(W)-7 b(e)35 b(ha)n(v)n(en't)f(tried)i(this)f(ourselv)n -+(es,)g(but)h(T)-7 b(ob)n(y)34 b(Johnson)g(has)h(con)n(tributed)g(a)f -+(detailed)i(c)n(hro)r(ot)e(min-HO)n(WTO)208 2528 y(describing)26 -+b(ho)n(w)h(to)h(do)f(it.)37 b(\(Y)-7 b(an)28 b(Seiner)g(wrote)e(an)i -+(earlier)e(ho)n(wto,)h(on)g(whic)n(h)h(T)-7 b(ob)n(y's)26 -+b(is)i(based.\))125 2694 y Fj(\017)41 b Fi(Is)30 b(ther)l(e)h(a)h(way)f -+(to)g(get)g(Unison)f(not)h(to)g(pr)l(ompt)g(me)g(for)h(a)f(p)l(asswor)l -+(d)h(every)g(time)f(I)f(run)h(it)f(\(e.g.,)j(so)e(that)g(I)g(c)l(an)208 -+2793 y(run)d(it)i(every)h(half)g(hour)f(fr)l(om)g(a)h(shel)t(l)g -+(script\)?)208 2926 y Fn(It's)26 b(actually)f Fk(ssh)g -+Fn(that's)h(asking)f(for)g(the)h(passw)n(ord.)35 b(If)26 -+b(y)n(ou're)f(running)g(the)i(Unison)f(clien)n(t)g(on)f(a)h(Unix)g -+(system,)208 3026 y(y)n(ou)g(should)i(c)n(hec)n(k)e(out)i(the)g -+('ssh-agen)n(t')e(facilit)n(y)i(in)f(ssh.)37 b(If)28 -+b(y)n(ou)f(do)469 3225 y Fk(ssh-agent)40 b(bash)208 3424 -+y Fn(\(or)31 b Fk(ssh-agent)39 b(startx)p Fn(,)31 b(when)h(y)n(ou)e -+(\014rst)i(log)f(in\))h(it)g(will)g(start)f(y)n(ou)g(a)g(shell)g(\(or)g -+(an)h(X)g(Windo)n(ws)f(session\))g(in)208 3524 y(whic)n(h)24 -+b(all)h(pro)r(cesses)f(and)h(sub-pro)r(cesses)e(are)h(part)g(of)h(the)h -+(same)e(ssh-authorization)f(group.)35 b(If,)26 b(inside)f(an)n(y)f -+(shell)208 3624 y(b)r(elonging)32 b(to)h(this)h(authorization)d(group,) -+j(y)n(ou)e(run)h(the)h Fk(ssh-add)c Fn(program,)j(it)g(will)h(prompt)f -+(y)n(ou)f Fi(onc)l(e)i Fn(for)e(a)208 3723 y(passw)n(ord)e(and)h(then)i -+(remem)n(b)r(er)e(it)h(for)g(the)g(duration)f(of)h(the)h(bash)e -+(session.)49 b(Y)-7 b(ou)32 b(can)g(then)g(use)g(Unison)g(o)n(v)n(er) -+208 3823 y Fk(ssh)p Fn(|or)25 b(ev)n(en)i(run)h(it)g(rep)r(eatedly)f -+(from)g(a)g(shell)h(script|without)f(giving)g(y)n(our)g(passw)n(ord)e -+(again.)208 3956 y(It)h(ma)n(y)f(also)h(b)r(e)g(p)r(ossible)g(to)g -+(con\014gure)f Fk(ssh)g Fn(so)g(that)i(it)f(do)r(es)g(not)g(require)f -+(an)n(y)h(passw)n(ord:)34 b(just)27 b(en)n(ter)e(an)h(empt)n(y)208 -+4055 y(passw)n(ord)35 b(when)j(y)n(ou)f(create)f(a)h(pair)g(of)h(k)n -+(eys.)66 b(If)37 b(y)n(ou)g(think)h(it)g(is)g(safe)f(enough)g(to)g(k)n -+(eep)g(y)n(our)g(priv)-5 b(ate)37 b(k)n(ey)208 4155 y(unencrypted)27 -+b(on)g(y)n(our)g(clien)n(t)h(mac)n(hine,)f(this)h(solution)f(should)g -+(w)n(ork)f(ev)n(en)h(under)h(Windo)n(ws.)125 4321 y Fj(\017)41 -+b Fi(Is)25 b(ther)l(e)h(a)f(way,)j(under)d(Windows,)j(to)e(click-start) -+g(Unison)f(and)h(make)g(it)f(synchr)l(onize)i(ac)l(c)l(or)l(ding)g(to)e -+(a)h(p)l(articular)208 4421 y(pr)l(o\014le?)208 4553 -+y Fn(Greg)g(Sulliv)-5 b(an)28 b(sen)n(t)g(us)f(the)h(follo)n(wing)f -+(useful)h(tric)n(k:)390 4736 y(In)39 b(order)e(to)h(mak)n(e)g(syncing)g -+(a)g(particular)f(pro\014le)h(\\clic)n(k)-5 b(able")37 -+b(from)h(the)h(Win98)f(desktop,)j(when)390 4836 y(the)h(pro\014le)e -+(uses)h Fk(ssh)p Fn(,)i(y)n(ou)d(need)i(to)f(create)f(a)g -+Fk(.bat)g Fn(\014le)h(that)h(con)n(tains)e(nothing)h(but)g(\\)p -+Fk(unison)390 4935 y(profile-name)p Fn(")27 b(\(assuming)k -+Fk(unison.exe)d Fn(is)j(in)h(the)g Fk(PATH)p Fn(\).)f(I)h(\014rst)f -+(tried)h(the)g(\\ob)n(vious")e(strategy)390 5035 y(of)e(creating)f(a)h -+(shortcut)g(on)g(the)h(desktop)e(with)i(the)g(actual)e(command)h(line)h -+(\\)p Fk(unison)40 b(profile)p Fn(,)26 b(but)390 5135 -+y(that)c(hangs.)34 b(The)22 b Fk(.bat)d Fn(\014le)j(tric)n(k)f(w)n -+(orks,)g(though,)i(b)r(ecause)e(it)h(runs)f Fk(command.com)c -+Fn(and)k(then)h(in)n(v)n(ok)n(es)390 5234 y(the)28 b -+Fk(.bat)e Fn(\014le.)1908 5589 y(37)p eop -+%%Page: 38 38 -+38 37 bop 125 83 a Fj(\017)41 b Fi(Can)30 b(Unison)f(b)l(e)h(use)l(d)g -+(with)g(SSH's)f(p)l(ort)h(forwar)l(ding)i(fe)l(atur)l(es?)208 -+216 y Fn(Mark)26 b(Thomas)h(sa)n(ys)f(the)i(follo)n(wing)f(pro)r -+(cedure)f(w)n(orks)g(for)h(him:)390 382 y(After)f(ha)n(ving)f(problems) -+f(with)i(unison)g(spa)n(wning)e(a)h(command)g(line)h(ssh)f(in)h(Windo)n -+(ws)f(I)h(noticed)f(that)390 482 y(unison)31 b(also)e(supp)r(orts)i(a)f -+(so)r(c)n(k)n(et)g(mo)r(de)h(of)f(comm)n(unication)g(\(great)g(soft)n -+(w)n(are!\))45 b(so)30 b(I)h(tried)f(the)i(p)r(ort)390 -+581 y(forw)n(arding)26 b(feature)h(of)h(ssh)f(using)g(a)g(graphical)f -+(SSH)j(terminal)e(TTSSH:)545 714 y Fk(http://www.zip.co)o(m.a)o(u/)o -+Fj(\030)p Fk(ro)o(ca)o(/t)o(tss)o(h.)o(htm)o(l)390 847 -+y Fn(T)-7 b(o)22 b(use)g(unison)g(I)h(start)e(TTSHH)i(with)g(p)r(ort)f -+(forw)n(arding)e(enabled)j(and)f(login)f(to)h(the)h(Lin)n(ux)f(b)r(o)n -+(x)g(where)390 946 y(the)33 b(unison)f(serv)n(er)e(\()p -+Fk(unison)42 b(-socket)e(xxxx)p Fn(\))31 b(is)h(started)g -+(automatically)-7 b(.)50 b(In)32 b(windo)n(ws)g(I)g(just)h(run)390 -+1046 y(unison)28 b(and)f(connect)g(to)h(lo)r(calhost)f(\()p -+Fk(unison)41 b(socket://localho)o(st:)o(xx)o(xx)o(/)d(...)p -+Fn(\))125 1212 y Fj(\017)j Fi(How)34 b(c)l(an)g(I)g(use)f(Unison)h(fr)l -+(om)h(a)f(laptop)i(whose)f(hostname)f(changes)h(dep)l(ending)h(on)e -+(wher)l(e)h(it)f(is)g(plugge)l(d)h(into)208 1312 y(the)29 -+b(network?)208 1445 y Fn(See)e(the)h(discussion)f(of)h(the)f -+Fk(rootalias)d Fn(preference)j(in)h(Section)g(5.3)e([Arc)n(hiv)n(e)h -+(Files].)125 1611 y Fj(\017)41 b Fi(It's)33 b(annoying)g(that)g(\(on)g -+(Unix)g(systems\))f(I)h(have)i(to)d(typ)l(e)i(an)f(ssh)g(p)l(assphr)l -+(ase)i(into)e(a)g(c)l(onsole)h(window,)i(r)l(ather)208 -+1710 y(than)29 b(b)l(eing)i(aske)l(d)f(for)h(it)f(in)f(a)i(dialo)l(g)g -+(b)l(ox.)39 b(Is)29 b(ther)l(e)h(a)g(b)l(etter)g(way?)208 -+1843 y Fn(W)-7 b(e)28 b(ha)n(v)n(e)g(some)g(ideas)f(ab)r(out)i(ho)n(w)f -+(this)g(migh)n(t)h(b)r(e)g(done)f(\(b)n(y)g(allo)r(cating)g(a)g(PTY)g -+(and)g(using)g(it)h(to)g(talk)f(to)g(ssh\),)208 1943 -+y(but)e(w)n(e)f(ha)n(v)n(en't)f(implemen)n(ted)j(them)f(y)n(et.)35 -+b(If)26 b(y)n(ou'd)f(lik)n(e)g(to)h(ha)n(v)n(e)e(a)h(crac)n(k)f(at)h -+(it,)h(w)n(e'd)g(b)r(e)g(glad)e(to)i(discuss)f(ideas)208 -+2042 y(and)i(incorp)r(orate)f(patc)n(hes.)208 2175 y(In)j(the)h(mean)n -+(time,)h(tm)n(b)f(has)f(con)n(tributed)g(a)g(script)h(that)g(uses)f -+Fk(expectk)e Fn(to)i(do)h(what's)f(needed.)44 b(It's)29 -+b(a)n(v)-5 b(ailable)208 2275 y(at)27 b Fk(http://www.cis.u)o(pen)o(n.) -+o(edu)o(/)37 b(bcpierce/unison/d)o(ow)o(nlo)o(ad)o(/re)o(so)o(ur)o(ces) -+o(/e)o(xpe)o(ct)o(k-)o(sta)o(rt)o(up)p Fn(.)1908 5589 -+y(38)p eop -+%%Page: 39 39 -+39 38 bop 0 83 a Fm(A)134 b(Installing)46 b(Ssh)0 265 -+y Fn(Y)-7 b(our)37 b(lo)r(cal)f(host)h(will)h(need)f(just)h(an)f(ssh)g -+(clien)n(t;)42 b(the)c(remote)f(host)g(needs)g(an)g(ssh)g(serv)n(er)e -+(\(or)i(daemon\),)i(whic)n(h)e(is)0 364 y(a)n(v)-5 b(ailable)35 -+b(on)h(Unix)h(systems.)990 334 y Fg(2)1090 364 y Fn(Unison)f(is)h(kno)n -+(wn)f(to)g(w)n(ork)f(with)i(ssh)f(v)n(ersion)f(1.2.27)f(\(Unix\))k(and) -+e(v)n(ersion)f(1.2.14)0 464 y(\(Windo)n(ws\);)28 b(other)f(v)n(ersions) -+f(ma)n(y)h(or)f(ma)n(y)h(not)h(w)n(ork.)0 697 y Fh(A.1)112 -+b(Unix)101 850 y Fn(1.)42 b(Install)27 b Fk(ssh)p Fn(.)243 -+1016 y(\(a\))41 b(Become)27 b(ro)r(ot.)37 b(\(If)28 b(y)n(ou)f(do)h -+(not)g(ha)n(v)n(e)e(administrator)g(p)r(ermissions,)h(ask)g(y)n(our)g -+(system)g(manager)g(to)g(install)390 1115 y(an)h(ssh)f(clien)n(t)h(and) -+f(an)g(ssh)h(serv)n(er)d(for)i(y)n(ou)g(and)h(skip)f(this)h(section.\)) -+238 1248 y(\(b\))42 b(Do)n(wnload)27 b Fk(ssh-1.2.27.tar.g)o(z)21 -+b Fn(from)28 b Fk(ftp://ftp.ssh.c)o(om/)o(pu)o(b/s)o(sh)o(/)p -+Fn(.)247 1381 y(\(c\))42 b(Install)28 b(it:)462 1514 -+y Fj(\017)41 b Fn(Unpac)n(k)28 b(the)g(arc)n(hiv)n(e)d(\()p -+Fk(gunzip)42 b(ssh-1.2.27.tar.g)o(z)21 b Fn(and)28 b(then)g -+Fk(tar)42 b(xvf)h(ssh-1.2.27.tar.)o(gz)p Fn(\).)462 1630 -+y Fj(\017)e Fn(follo)n(wing)27 b(instructions)g(in)h -+Fk(INSTALL)p Fn(,)d(en)n(ter)i Fk(./configure)p Fn(,)c -+Fk(make)p Fn(,)j(and)i Fk(make)42 b(install)p Fn(.)462 -+1746 y Fj(\017)f Fn(to)28 b(run)f(the)h(ssh)g(daemon:)597 -+1863 y Fl({)42 b Fn(\014nd)28 b(the)g(serv)n(er)d(daemon)i -+Fk(sshd)f Fn(\(e.g.,)i Fk(/usr/local/sbin/)o(ssh)o(d)21 -+b Fn(on)28 b(RedHat-Lin)n(ux)f(systems\).)597 1979 y -+Fl({)42 b Fn(put)34 b(its)g(full)h(pathname)e(in)i(the)f(system)g -+(initialization)f(script)h(to)f(ha)n(v)n(e)g(it)h(run)g(at)g(startup)f -+(\(this)687 2078 y(script)27 b(is)g(called)h Fk(/etc/rc.d/rc.sy)o(sin)o -+(it)21 b Fn(on)27 b(RedHat-Lin)n(ux,)h(for)f(example\).)238 -+2211 y(\(d\))42 b(Once)25 b(a)f(serv)n(er)f(is)i(running)g(on)f(the)i -+(remote)e(host)h(and)f(a)h(clien)n(t)g(is)g(a)n(v)-5 -+b(ailable)24 b(on)g(the)i(lo)r(cal)e(host,)h(y)n(ou)f(should)390 -+2311 y(b)r(e)39 b(able)f(to)g(connect)g(with)h(ssh)f(in)g(the)h(same)e -+(w)n(a)n(y)g(as)h(with)g(rsh)g(\(e.g.,)j Fk(ssh)h(foobar)p -+Fn(,)d(then)g(en)n(ter)e(y)n(our)390 2411 y(passw)n(ord\).)101 -+2577 y(2.)42 b(If)31 b(y)n(ou)e(lik)n(e,)i(y)n(ou)f(can)g(no)n(w)g(set) -+h(up)f(ssh)h(so)e(that)i(y)n(ou)f(only)g(need)h(to)f(t)n(yp)r(e)h(y)n -+(our)e(passw)n(ord)g(once)h(p)r(er)g(X)h(session,)208 -+2676 y(rather)f(than)h(ev)n(ery)f(time)i(y)n(ou)e(run)h(Unison)g -+(\(this)h(is)f(not)g(necessary)e(for)i(using)g(ssh)g(with)g(Unison,)i -+(but)e(it)h(sa)n(v)n(es)208 2776 y(t)n(yping\).)243 2942 -+y(\(a\))41 b(Build)28 b(y)n(our)e(k)n(eys)h(:)462 3075 -+y Fj(\017)41 b Fn(en)n(ter)28 b Fk(ssh-keygen)23 b Fn(and)28 -+b(t)n(yp)r(e)f(a)g(passphrase)f(as)h(required.)462 3191 -+y Fj(\017)41 b Fn(y)n(our)27 b(priv)-5 b(ate)28 b(k)n(ey)f(is)h(no)n(w) -+g(in)g Fk(~/.ssh/identity)22 b Fn(\(this)29 b(\014le)f(m)n(ust)g -+(remain)g(priv)-5 b(ate\))28 b(and)g(y)n(our)f(public)545 -+3291 y(k)n(ey)g(in)h Fk(~/.ssh/identity.p)o(ub)o Fn(.)238 -+3423 y(\(b\))42 b(Allo)n(w)27 b(user-mo)r(de)g(secure)g(connection.)462 -+3556 y Fj(\017)41 b Fn(app)r(end)26 b(con)n(ten)n(ts)e(of)h(the)g(lo)r -+(cal)g(\014le)g Fk(~/.ssh/identity)o(.pu)o(b)19 b Fn(to)25 -+b(the)g(\014le)g Fk(~/.ssh/authorize)o(d_k)o(ey)o(s)545 -+3656 y Fn(on)j(the)g(remote)f(system.)462 3772 y Fj(\017)41 -+b Fn(T)-7 b(est)30 b(that)g(y)n(ou)e(can)h(connect)h(b)n(y)f(starting)f -+Fk(ssh)h Fn(and)g(giving)g(the)h(passphrase)d(y)n(ou)i(just)h(c)n(hose) -+e(instead)545 3872 y(of)g(y)n(our)e(remote)h(passw)n(ord.)247 -+4005 y(\(c\))42 b(Create)27 b(an)g(agen)n(t)g(to)g(manage)g(authen)n -+(tication)g(for)g(y)n(ou)g(:)462 4137 y Fj(\017)41 b -+Fn(start)29 b Fk(ssh-agent)c Fn(with)k(the)g(paren)n(t)f(program)e -+(whose)i(c)n(hildren)g(will)h(b)r(e)g(gran)n(ted)f(automatic)g(connec-) -+545 4237 y(tions)g(\(e.g.,)f Fk(ssh-agent)40 b(bash)26 -+b Fn(or)h Fk(ssh-agent)40 b(startx)p Fn(\).)462 4353 -+y Fj(\017)h Fn(en)n(ter)27 b Fk(ssh-add)e Fn(to)i(en)n(ter)f(y)n(our)g -+(passphrase)g(and)h(enable)g(automatic)g(login)f(for)h(connections)f -+(to)h(come.)462 4470 y Fj(\017)41 b Fn(y)n(ou)24 b(should)h(no)n(w)f(b) -+r(e)h(able)f(to)g(run)h(Unison)f(using)h(SSH)g(without)g(giving)f(an)n -+(y)g(passphrase)e(or)i(passw)n(ord.)462 4586 y Fj(\017)41 -+b Fn(to)19 b(kill)f(the)h(agen)n(t,)g(en)n(ter)f Fk(ssh-agent)40 -+b(-k)p Fn(,)20 b(or)d(simply)h(exit)h(the)g(program)d(y)n(ou)i(launc)n -+(hed)g(using)g Fk(ssh-agent)p Fn(.)p 0 4657 1560 4 v -+92 4711 a Ff(2)127 4734 y Fe(The)30 b(Cygwin)g(p)r(ort)f(\(Section)j -+(A.2)d([Installing)g(Ssh)h(on)g(Windo)n(ws]\))g(of)f(op)r(enssh)h -+(includes)g(a)g(ssh)f(serv)n(er)g(program)f(for)h(the)h(Windo)n(ws)0 -+4813 y(platform,)22 b(but)i(w)n(e)g(ha)n(v)n(e)h(not)f(y)n(et)h(tested) -+g(Unison)f(with)f(this)h(ssh)f(serv)n(er.)1908 5589 y -+Fn(39)p eop -+%%Page: 40 40 -+40 39 bop 0 83 a Fh(A.2)112 b(Windo)m(ws)0 236 y Fn(Man)n(y)29 -+b(Windo)n(ws)f(implemen)n(tations)h(of)g(ssh)g(only)g(pro)n(vide)f -+(graphical)g(in)n(terfaces,)g(but)i(Unison)f(requires)f(an)h(ssh)g -+(clien)n(t)0 336 y(that)f(it)g(can)f(in)n(v)n(ok)n(e)f(with)i(a)f -+(command-line)g(in)n(terface.)37 b(A)28 b(suitable)f(v)n(ersion)f(of)i -+(ssh)f(can)g(b)r(e)h(installed)g(as)f(follo)n(ws.)101 -+515 y(1.)42 b(Do)n(wnload)26 b(an)h Fk(ssh)g Fn(executable.)208 -+647 y(W)-7 b(arning:)34 b(there)23 b(are)g(man)n(y)g(implemen)n -+(tations)h(and)f(p)r(orts)h(of)f(ssh)h(for)f(Windo)n(ws,)h(and)f(not)h -+(all)g(of)f(them)i(will)e(w)n(ork)208 746 y(with)28 b(Unison.)38 -+b(W)-7 b(e)28 b(ha)n(v)n(e)f(gotten)h(Unison)g(to)g(w)n(ork)e(with)j -+(Cygwin's)e(p)r(ort)h(of)g(op)r(enssh,)g(and)f(w)n(e)h(suggest)f(y)n -+(ou)g(use)208 846 y(that)g(one.)37 b(Here's)27 b(ho)n(w)g(to)g(install) -+h(it:)243 1010 y(\(a\))41 b(First,)32 b(create)f(a)g(new)g(folder)g(on) -+g(y)n(our)f(desktop)h(to)g(hold)g(temp)r(orary)f(installation)h -+(\014les.)47 b(It)32 b(can)f(ha)n(v)n(e)f(an)n(y)390 -+1110 y(name)e(y)n(ou)e(lik)n(e,)i(but)g(in)g(these)f(instructions)h(w)n -+(e'll)f(assume)g(that)h(y)n(ou)f(call)g(it)h Fk(Foo)p -+Fn(.)238 1241 y(\(b\))42 b(Direct)36 b(y)n(our)e(w)n(eb)i(bro)n(wser)d -+(to)j(www.cygwin.com,)h(and)e(clic)n(k)g(on)g(the)h(\\Install)f(no)n -+(w!")60 b(link.)h(This)36 b(will)390 1341 y(do)n(wnload)28 -+b(a)g(\014le,)i Fk(setup.exe)p Fn(;)c(sa)n(v)n(e)h(it)j(in)f(the)g -+(directory)f Fk(Foo)p Fn(.)40 b(The)29 b(\014le)g Fk(setup.exe)c -+Fn(is)k(a)g(small)f(program)390 1440 y(that)g(will)g(do)n(wnload)e(the) -+i(actual)f(install)h(\014les)f(from)h(the)g(In)n(ternet)f(when)h(y)n -+(ou)f(run)g(it.)247 1572 y(\(c\))42 b(Start)34 b Fk(setup.exe)d -+Fn(\(b)n(y)k(double-clic)n(king\).)56 b(This)35 b(brings)e(up)i(a)f -+(series)f(of)i(dialogs)e(that)i(y)n(ou)e(will)i(ha)n(v)n(e)e(to)390 -+1671 y(go)f(through.)53 b(Select)33 b(\\Install)f(from)h(In)n(ternet.") -+53 b(F)-7 b(or)32 b(\\Lo)r(cal)g(P)n(ac)n(k)-5 b(age)30 -+b(Directory")i(select)h(the)g(directory)390 1771 y Fk(Foo)p -+Fn(.)i(F)-7 b(or)26 b(\\Select)g(install)g(ro)r(ot)f(directory")f(w)n -+(e)i(recommend)f(that)i(y)n(ou)e(use)h(the)g(default,)h -+Fk(C:\\cygwin)p Fn(.)33 b(The)390 1870 y(next)k(dialog)e(asks)h(y)n(ou) -+g(to)g(select)h(the)g(w)n(a)n(y)e(that)i(y)n(ou)f(w)n(an)n(t)f(to)i -+(connect)f(to)h(the)g(net)n(w)n(ork)e(to)h(do)n(wnload)390 -+1970 y(the)29 b(installation)g(\014les;)g(w)n(e)f(ha)n(v)n(e)g(used)h -+(\\Use)f(IE5)g(Settings")g(successfully)-7 b(,)29 b(but)h(y)n(ou)e(ma)n -+(y)g(need)h(to)f(mak)n(e)g(a)390 2070 y(di\013eren)n(t)k(selection)f -+(dep)r(ending)h(on)g(y)n(our)e(net)n(w)n(orking)g(setup.)49 -+b(The)32 b(next)g(dialog)f(giv)n(es)f(a)h(list)h(of)g(mirrors;)390 -+2169 y(select)c(one)f(close)g(to)g(y)n(ou.)390 2285 y(Next)21 -+b(y)n(ou)f(are)g(ask)n(ed)f(to)h(select)h(whic)n(h)f(pac)n(k)-5 -+b(ages)19 b(to)i(install.)34 b(The)21 b(default)g(settings)f(in)h(this) -+g(dialog)e(do)n(wnload)390 2384 y(a)34 b(lot)g(of)h(pac)n(k)-5 -+b(ages)32 b(that)j(are)e(not)h(strictly)g(necessary)f(to)h(run)g -+(Unison)g(with)h(ssh.)57 b(If)35 b(y)n(ou)e(don't)i(w)n(an)n(t)e(to)390 -+2484 y(install)f(a)g(pac)n(k)-5 b(age,)31 b(clic)n(k)h(on)f(it)i(un)n -+(til)f(\\skip")f(is)h(sho)n(wn.)49 b(F)-7 b(or)31 b(a)h(minim)n(um)h -+(installation,)f(select)g(only)g(the)390 2584 y(pac)n(k)-5 -+b(ages)33 b(\\cygwin")h(and)h(\\op)r(enssh,")g(whic)n(h)g(come)g(to)g -+(ab)r(out)f(1900KB;)f(the)i(full)h(installation)e(is)h(m)n(uc)n(h)390 -+2683 y(larger.)545 2822 y Fi(Note)27 b(that)h(you)f(ar)l(e)h(plan)f(to) -+h(build)g(unison)e(using)h(the)h(fr)l(e)l(e)f(CygWin)h(GNU)f(C)h(c)l -+(ompiler,)h(you)f(ne)l(e)l(d)545 2922 y(to)j(instal)t(l)g(essential)g -+(development)h(p)l(ackages)g(such)e(as)h(\\gc)l(c",)g(\\make",)g -+(\\\014leutil",)f(etc;)h(we)g(r)l(efer)545 3021 y(to)f(the)g(\014le)g -+(\\INST)-6 b(ALL.win32-cygwin-gnuc")30 b(in)g(the)g(sour)l(c)l(e)f -+(distribution)i(for)f(further)g(details.)390 3160 y Fn(After)c(the)f -+(pac)n(k)-5 b(ages)23 b(are)h(do)n(wnloaded)g(and)h(installed,)h(the)f -+(next)h(dialog)d(allo)n(ws)h(y)n(ou)g(to)h(c)n(ho)r(ose)f(whether)h(to) -+390 3260 y(\\Create)h(Desktop)i(Icon")f(and)g(\\Add)h(to)f(Start)h(Men) -+n(u.")36 b(Y)-7 b(ou)28 b(mak)n(e)e(the)i(call.)238 3391 -+y(\(d\))42 b(Y)-7 b(ou)28 b(can)f(no)n(w)g(delete)h(the)g(directory)e -+Fk(Foo)h Fn(and)g(its)h(con)n(ten)n(ts.)101 3555 y(2.)42 -+b(Y)-7 b(ou)32 b(m)n(ust)h(set)g(the)h(en)n(vironmen)n(t)e(v)-5 -+b(ariables)31 b(HOME)i(and)f(P)-7 b(A)g(TH.)53 b(Ssh)33 -+b(will)g(create)f(a)h(directory)e Fk(.ssh)h Fn(in)h(the)208 -+3655 y(directory)23 b(giv)n(en)h(b)n(y)h(HOME,)f(so)g(that)h(it)h(has)e -+(a)g(place)h(to)g(k)n(eep)f(data)g(lik)n(e)h(y)n(our)e(public)j(and)e -+(priv)-5 b(ate)25 b(k)n(eys.)35 b(P)-7 b(A)g(TH)208 3755 -+y(m)n(ust)27 b(b)r(e)h(set)g(to)f(include)h(the)g(Cygwin)f -+Fk(bin)g Fn(directory)-7 b(,)26 b(so)h(that)h(Unison)g(can)f(\014nd)h -+(the)g(ssh)f(executable.)307 3919 y Fj(\017)41 b Fn(On)28 -+b(Windo)n(ws)f(95/98,)e(add)j(the)g(lines)565 4067 y -+Fk(set)42 b(PATH=\045PATH\045;<SSH)o(DI)o(R>)565 4166 -+y(set)g(HOME=<HOMEDIR>)390 4314 y Fn(to)29 b(the)g(\014le)f -+Fk(C:\\AUTOEXEC.BAT)p Fn(,)23 b(where)28 b Fk(<HOMEDIR>)d -+Fn(is)j(the)h(directory)e(where)h(y)n(ou)g(w)n(an)n(t)g(ssh)g(to)g -+(create)g(its)390 4414 y Fk(.ssh)h Fn(directory)-7 b(,)29 -+b(and)h Fk(<SSHDIR>)c Fn(is)k(the)g(directory)f(where)g(the)h -+(executable)g Fk(ssh.exe)d Fn(is)j(stored;)g(if)g(y)n(ou'v)n(e)390 -+4514 y(installed)k(Cygwin)f(in)h(the)g(default)h(lo)r(cation,)f(this)g -+(is)g Fk(C:\\cygwin\\bin)p Fn(.)50 b(Y)-7 b(ou)34 b(will)g(ha)n(v)n(e)e -+(to)i(reb)r(o)r(ot)f(y)n(our)390 4613 y(computer)27 b(to)h(tak)n(e)f -+(the)h(c)n(hanges)e(in)n(to)h(accoun)n(t.)307 4744 y -+Fj(\017)41 b Fn(On)28 b(Windo)n(ws)f(NT/2k,)g(op)r(en)g(the)h(en)n -+(vironmen)n(t)f(v)-5 b(ariables)26 b(dialog)h(b)r(o)n(x:)456 -+4876 y Fl({)41 b Fn(Windo)n(ws)28 b(NT:)g(My)f(Computer/Prop)r -+(erties/En)n(vironmen)n(t)456 4991 y Fl({)41 b Fn(Windo)n(ws)28 -+b(2k:)36 b(My)28 b(Computer/Prop)r(erties/Adv)-5 b(anced/En)n(vironmen) -+n(t)22 b(v)-5 b(ariables)390 5122 y(then)36 b(select)g(P)n(ath)e(and)h -+(edit)h(its)g(v)-5 b(alue)35 b(b)n(y)h(app)r(ending)f -+Fk(;<SSHDIR>)d Fn(to)j(it,)j(where)d Fk(<SSHDIR>)d Fn(is)k(the)f(full) -+390 5222 y(name)29 b(of)g(the)h(directory)e(that)h(includes)h(the)f -+(ssh)g(executable;)h(if)g(y)n(ou'v)n(e)e(installed)h(Cygwin)g(in)g(the) -+h(default)390 5322 y(lo)r(cation,)d(this)h(is)g Fk(C:\\cygwin\\bin)p -+Fn(.)1908 5589 y(40)p eop -+%%Page: 41 41 -+41 40 bop 101 83 a Fn(3.)42 b(T)-7 b(est)27 b(ssh)g(from)h(a)f(DOS)h -+(shell)f(b)n(y)h(t)n(yping)469 282 y Fk(ssh)42 b(<remote)f(host>)h(-l)g -+(<login)f(name>)208 482 y Fn(Y)-7 b(ou)27 b(should)h(get)f(a)g(prompt)h -+(for)f(y)n(our)f(passw)n(ord)g(on)h Fk(<remote)41 b(host>)p -+Fn(,)25 b(follo)n(w)n(ed)i(b)n(y)g(a)g(w)n(orking)f(connection.)101 -+648 y(4.)42 b(Note)34 b(that)g Fk(ssh-keygen)c Fn(ma)n(y)j(not)h(w)n -+(ork)f(\(fails)h(with)h(\\gethostname:)48 b(no)34 b(suc)n(h)g(\014le)g -+(or)f(directory"\))g(on)h(some)208 747 y(systems.)i(This)28 -+b(is)f(OK:)g(y)n(ou)g(can)g(use)g(ssh)h(with)g(y)n(our)e(regular)g -+(passw)n(ord)g(for)h(the)h(remote)f(system.)101 913 y(5.)42 -+b(Y)-7 b(ou)31 b(should)h(no)n(w)f(b)r(e)i(able)e(to)h(use)g(Unison)f -+(with)i(an)e(ssh)h(connection.)49 b(If)32 b(y)n(ou)g(are)e(logged)h(in) -+h(with)h(a)e(di\013eren)n(t)208 1013 y(user)d(name)h(on)h(the)f(lo)r -+(cal)g(and)g(remote)g(hosts,)g(pro)n(vide)g(y)n(our)f(remote)g(user)h -+(name)g(when)h(pro)n(viding)e(the)i(remote)208 1112 y(ro)r(ot)c -+(\(i.e.,)i Fk(//username@host/p)o(ath)o(..)o(.)p Fn(\).)1908 -+5589 y(41)p eop -+%%Page: 42 42 -+42 41 bop 0 83 a Fm(B)134 b(Changes)46 b(in)e(V)-11 b(ersion)45 -+b(2.9.1)0 265 y Fn(Changes)27 b(since)g(2.8.19:)125 431 -+y Fj(\017)41 b Fn(Fixed)27 b(a)h(bug)f(due)h(to)f(a)g(wrong)g -+(assumption)125 597 y Fj(\017)41 b Fn(Changing)26 b(pro\014le)h(w)n -+(orks)f(again)g(under)i(Windo)n(ws)125 763 y Fj(\017)41 -+b Fn(Fixed)27 b(a)h(bug)f(due)h(to)f(a)g(wrong)g(assumption)125 -+929 y Fj(\017)41 b Fn(\014xed)27 b(the)h(Mak)n(e\014le)0 -+1095 y(Changes)f(since)g(2.8.1:)125 1261 y Fj(\017)41 -+b Fn(Statistic)27 b(windo)n(w)h(\(transfer)f(rate,)f(amoun)n(t)i(of)f -+(data)g(transferred\).)36 b([NB:)28 b(not)f(a)n(v)-5 -+b(ailable)27 b(Cygwin)g(v)n(ersion.])125 1427 y Fj(\017)41 -+b Fn(symlinks)27 b(w)n(orks)f(under)h(the)h(cygwin)f(v)n(ersion)f -+(\(whic)n(h)i(is)g(dynamically)e(link)n(ed\).)125 1593 -+y Fj(\017)41 b Fn(File)29 b(mo)n(v)n(emen)n(t)g(hac)n(k:)40 -+b(Unison)29 b(no)n(w)g(tries)g(to)h(use)f(lo)r(cal)g(cop)n(y)f(instead) -+i(of)f(transfer)g(for)g(mo)n(v)n(ed)f(or)h(copied)g(\014les.)208 -+1693 y(It)e(is)h(con)n(troled)e(b)n(y)i(a)f(b)r(o)r(olean)g(option)g -+(\\xferb)n(ycop)n(ying".)125 1859 y Fj(\017)41 b Fn(Fixed)27 -+b(deadlo)r(c)n(k)g(when)h(sync)n(hronizing)e(b)r(et)n(w)n(een)h(Windo)n -+(ws)g(and)h(Unix)125 2025 y Fj(\017)41 b Fn(Small)27 -+b(impro)n(v)n(emen)n(ts:)301 2191 y Fl({)41 b Fn(If)28 -+b(neither)g(the)390 2291 y(tt)g(USERPR)n(OFILE)f(nor)f(the)390 -+2390 y(tt)i(HOME)g(en)n(vironmen)n(t)e(v)-5 b(ariables)26 -+b(are)h(set,)h(then)g(Unison)f(will)h(put)g(its)g(temp)r(orary)f -+(commit)g(log)g(\(called)390 2490 y(tt)h(D)n(ANGER.README\))h(in)n(to)e -+(the)h(directory)e(named)i(b)n(y)f(the)390 2589 y(tt)h(UNISON)h(en)n -+(vironmen)n(t)d(v)-5 b(ariable,)27 b(if)h(an)n(y;)f(otherwise)f(it)j -+(will)e(use)390 2689 y(tt)h(C:.)301 2822 y Fl({)41 b -+Fn(alternativ)n(e)27 b(set)g(of)h(v)-5 b(alues)27 b(for)g(fastc)n(hec)n -+(k:)36 b(y)n(es)27 b(=)g(true;)h(no)f(=)g(false;)g(default)h(=)g(auto.) -+301 2955 y Fl({)41 b Fn(-silen)n(t)27 b(implies)h(-con)n(tactquietly) -+125 3121 y Fj(\017)41 b Fn(Source)26 b(co)r(de:)301 3287 -+y Fl({)41 b Fn(Co)r(de)28 b(reorganization)d(and)j(tidying.)37 -+b(\(Started)28 b(breaking)f(up)h(some)f(of)h(the)g(basic)f(utilit)n(y)i -+(mo)r(dules)f(so)f(that)390 3386 y(the)h(non-unison-sp)r(eci\014c)f -+(stu\013)h(can)f(b)r(e)h(made)g(a)n(v)-5 b(ailable)26 -+b(for)h(other)g(pro)5 b(jects.\))301 3519 y Fl({)41 b -+Fn(sev)n(eral)26 b(Mak)n(e\014le)h(and)g(do)r(cs)g(c)n(hanges)g(\(for)g -+(release\);)301 3652 y Fl({)41 b Fn(further)28 b(commen)n(ts)f(in)h -+(\\up)r(date.ml";)301 3785 y Fl({)41 b Fn(connection)27 -+b(information)g(are)g(not)g(stored)g(in)h(global)f(v)-5 -+b(ariables)26 b(an)n(ymore.)0 3951 y(Changes)h(since)g(2.7.78:)125 -+4117 y Fj(\017)41 b Fn(Small)28 b(bug\014x)h(to)g(textual)g(user)f(in)n -+(terface)g(under)h(Unix)g(\(to)g(a)n(v)n(oid)e(lea)n(ving)h(the)h -+(terminal)g(in)g(a)f(bad)h(state)g(where)208 4217 y(it)f(w)n(ould)f -+(not)g(ec)n(ho)g(inputs)h(after)g(Unison)f(exited\).)0 -+4383 y(Changes)g(since)g(2.7.39:)125 4549 y Fj(\017)41 -+b Fn(Impro)n(v)n(emen)n(ts)26 b(to)h(the)h(main)g(w)n(eb)f(page)g -+(\(stable)g(and)h(b)r(eta)f(v)n(ersion)g(do)r(cs)g(are)f(no)n(w)h(b)r -+(oth)h(accessible\).)125 4715 y Fj(\017)41 b Fn(User)27 -+b(man)n(ual)g(revised.)125 4881 y Fj(\017)41 b Fn(Added)28 -+b(some)f(new)g(preferences:)301 5047 y Fl({)41 b Fn(\\sshcmd")27 -+b(and)g(\\rshcmd")f(for)i(sp)r(ecifying)f(paths)h(to)f(ssh)g(and)h(rsh) -+f(programs.)301 5180 y Fl({)41 b Fn(\\con)n(tactquietly")31 -+b(for)h(suppressing)g(the)h(\\con)n(tacting)e(serv)n(er")f(message)h -+(during)h(Unison)h(startup)f(\(under)390 5279 y(the)c(graphical)e -+(UI\).)1908 5589 y(42)p eop -+%%Page: 43 43 -+43 42 bop 125 83 a Fj(\017)41 b Fn(Bug)27 b(\014xes:)301 -+246 y Fl({)41 b Fn(Fixed)33 b(small)g(bug)g(in)g(UI)h(that)f(neglected) -+g(to)g(c)n(hange)f(the)h(displa)n(y)n(ed)f(column)h(headers)f(if)h -+(loading)f(a)h(new)390 346 y(pro\014le)27 b(caused)g(the)h(ro)r(ots)f -+(to)g(c)n(hange.)301 476 y Fl({)41 b Fn(Fixed)26 b(a)g(bug)f(that)h(w)n -+(ould)g(put)g(the)g(text)g(UI)h(in)n(to)e(an)h(in\014nite)g(lo)r(op)g -+(if)g(it)g(encoun)n(tered)f(a)g(con\015ict)h(when)g(run)390 -+576 y(in)i(batc)n(h)f(mo)r(de.)301 706 y Fl({)41 b Fn(Added)22 -+b(some)e(co)r(de)h(to)g(try)f(to)h(\014x)g(the)g(displa)n(y)g(of)f -+(non-Ascii)h(c)n(haracters)e(in)i(\014lenames)f(on)h(Windo)n(ws)g -+(systems)390 806 y(in)31 b(the)f(GTK)g(UI.)h(\(This)g(co)r(de)f(is)g -+(curren)n(tly)f(un)n(tested|if)i(y)n(ou're)e(one)h(of)g(the)h(p)r -+(eople)f(that)h(had)f(rep)r(orted)390 905 y(problems)21 -+b(with)h(displa)n(y)e(of)i(non-ascii)e(\014lenames,)i(w)n(e'd)f -+(appreciate)f(kno)n(wing)h(if)g(this)h(actually)f(\014xes)g(things.\)) -+301 1036 y Fl({)41 b Fn(`)p Fk(-prefer/-force)d(newer)p -+Fn(')20 b(w)n(orks)h(prop)r(erly)g(no)n(w.)34 b(\(The)23 -+b(bug)f(w)n(as)f(rep)r(orted)h(b)n(y)f(Sebastian)h(Urbaniak)f(and)390 -+1135 y(Sean)28 b(F)-7 b(ulton.\))125 1299 y Fj(\017)41 -+b Fn(User)27 b(in)n(terface)g(and)g(Unison)h(b)r(eha)n(vior:)301 -+1462 y Fl({)41 b Fn(Renamed)28 b(`Pro)r(ceed')e(to)i(`Go')f(in)h(the)g -+(graphical)e(UI.)301 1592 y Fl({)41 b Fn(Added)28 b(exit)g(status)g -+(for)f(the)h(textual)f(user)g(in)n(terface.)301 1722 -+y Fl({)41 b Fn(P)n(aths)31 b(that)i(are)e(not)i(sync)n(hronized)e(b)r -+(ecause)g(of)i(con\015icts)f(or)f(errors)f(during)i(up)r(date)h -+(detection)f(are)g(no)n(w)390 1822 y(noted)c(in)g(the)g(log)e(\014le.) -+301 1952 y Fl({)41 b Fk([END])26 b Fn(messages)g(in)i(log)e(no)n(w)h -+(use)h(a)f(briefer)g(format)301 2083 y Fl({)41 b Fn(Changed)27 -+b(the)h(text)g(UI)g(startup)f(sequence)g(so)g(that)390 -+2182 y(tt)h(./unison)f(-ui)h(text)g(will)g(use)f(the)h(default)g -+(pro\014le)f(instead)h(of)f(failing.)301 2312 y Fl({)41 -+b Fn(Made)28 b(some)f(impro)n(v)n(emen)n(ts)f(to)h(the)h(error)e -+(messages.)301 2443 y Fl({)41 b Fn(Added)28 b(some)f(debugging)g -+(messages)f(to)h(remote.ml.)0 2606 y(Changes)g(since)g(2.7.7:)125 -+2767 y Fj(\017)41 b Fn(Incorp)r(orated,)25 b(once)g(again,)h(a)g(m)n -+(ulti-threaded)g(transp)r(ort)f(sub-system.)36 b(It)27 -+b(transfers)e(sev)n(eral)f(\014les)j(at)f(the)h(same)208 -+2866 y(time,)41 b(thereb)n(y)d(making)g(m)n(uc)n(h)g(more)g(e\013ectiv) -+n(e)g(use)g(of)g(a)n(v)-5 b(ailable)38 b(net)n(w)n(ork)f(bandwidth.)69 -+b(Unlik)n(e)39 b(the)g(earlier)208 2966 y(attempt,)c(this)e(time)h(w)n -+(e)f(do)g(not)g(rely)g(on)f(the)i(nativ)n(e)f(thread)f(library)g(of)h -+(OCaml.)53 b(Instead,)35 b(w)n(e)e(implemen)n(t)g(a)208 -+3066 y(ligh)n(t-w)n(eigh)n(t,)26 b(non-preemptiv)n(e)h(m)n(ulti-thread) -+g(library)f(in)i(OCaml)f(directly)-7 b(.)37 b(This)27 -+b(v)n(ersion)f(app)r(ears)h(stable.)208 3197 y(Some)h(adjustmen)n(ts)g -+(to)h(unison)f(are)g(made)g(to)g(accommo)r(date)g(the)g(m)n -+(ulti-threaded)h(v)n(ersion.)38 b(These)28 b(include,)h(in)208 -+3297 y(particular,)d(c)n(hanges)g(to)i(the)g(user)e(in)n(terface)h(and) -+h(logging,)e(for)h(example:)301 3460 y Fl({)41 b Fn(Tw)n(o)27 -+b(log)g(en)n(tries)g(for)g(eac)n(h)g(transferring)e(task,)i(one)h(for)f -+(the)h(b)r(eginning,)f(one)h(for)f(the)h(end.)301 3590 -+y Fl({)41 b Fn(Suppressed)28 b(w)n(arning)f(messages)f(against)h(remo)n -+(ving)g(temp)i(\014les)f(left)h(b)n(y)e(a)h(previous)f(unison)h(run,)g -+(b)r(ecause)390 3690 y(w)n(arning)d(do)r(es)h(not)g(w)n(ork)f(nicely)h -+(under)g(m)n(ulti-threading.)36 b(The)26 b(temp)h(\014le)g(names)e(are) -+h(made)g(less)f(lik)n(ely)h(to)390 3790 y(coincide)h(with)i(the)f(name) -+f(of)g(a)h(\014le)f(created)g(b)n(y)h(the)g(user.)36 -+b(They)27 b(tak)n(e)g(the)h(form)390 3889 y Fk(.#<filename>.<ser)o(ia)o -+(l>.)o(un)o(is)o(on.)o(tm)o(p)p Fn(.)125 4053 y Fj(\017)41 -+b Fn(Added)31 b(a)f(new)g(command)g(to)h(the)f(GTK)h(user)e(in)n -+(terface:)42 b(pressing)30 b('f)6 b(')31 b(causes)f(Unison)g(to)g -+(start)g(a)g(new)h(up)r(date)208 4152 y(detection)21 -+b(phase,)h(using)f(as)f(paths)i Fi(just)e Fn(those)h(paths)g(that)h(ha) -+n(v)n(e)e(b)r(een)i(detected)f(as)g(c)n(hanged)f(and)h(not)g(y)n(et)g -+(mark)n(ed)208 4252 y(as)31 b(successfully)g(completed.)49 -+b(Use)32 b(this)g(command)g(to)f(quic)n(kly)g(restart)g(Unison)h(on)f -+(just)i(the)f(set)f(of)h(paths)g(still)208 4352 y(needing)27 -+b(atten)n(tion)g(after)h(a)f(previous)f(run.)125 4515 -+y Fj(\017)41 b Fn(Made)34 b(the)h Fk(ignorecase)c Fn(preference)j -+(user-visible,)i(and)f(c)n(hanged)f(the)h(initialization)g(co)r(de)f -+(so)h(that)g(it)g(can)g(b)r(e)208 4615 y(man)n(ually)28 -+b(set)h(to)g(true,)h(ev)n(en)f(if)h(neither)f(host)g(is)g(running)g -+(Windo)n(ws.)42 b(\(This)29 b(ma)n(y)g(b)r(e)g(useful,)i(e.g.,)e(when)g -+(using)208 4714 y(Unison)e(running)g(on)h(a)f(Unix)h(system)f(with)h(a) -+f(F)-9 b(A)i(T)28 b(v)n(olume)f(moun)n(ted.\))125 4878 -+y Fj(\017)41 b Fn(Small)27 b(impro)n(v)n(emen)n(ts)f(and)i(bug)f -+(\014xes:)301 5041 y Fl({)41 b Fn(Errors)20 b(in)j(preference)f -+(\014les)h(no)n(w)f(generate)f(fatal)i(errors)d(rather)i(than)h(w)n -+(arnings)e(at)i(startup)f(time.)36 b(\(I.e.,)24 b(y)n(ou)390 -+5141 y(can't)i(go)f(on)h(from)g(them.\))37 b(Also,)26 -+b(w)n(e)g(\014xed)g(a)f(bug)h(that)g(w)n(as)f(prev)n(en)n(ting)g(these) -+h(w)n(arnings)f(from)g(app)r(earing)390 5240 y(in)h(the)g(text)g(UI,)g -+(so)f(some)g(users)g(who)g(ha)n(v)n(e)f(b)r(een)i(running)f(\(unsusp)r -+(ectingly\))i(with)f(garbage)d(in)j(their)f(prefs)390 -+5340 y(\014les)j(ma)n(y)f(no)n(w)g(get)g(error)f(rep)r(orts.)1908 -+5589 y(43)p eop -+%%Page: 44 44 -+44 43 bop 301 83 a Fl({)41 b Fn(Error)25 b(rep)r(orting)i(for)g -+(preference)g(\014les)g(no)n(w)g(pro)n(vides)f(\014le)i(name)g(and)f -+(line)h(n)n(um)n(b)r(er.)301 216 y Fl({)41 b Fn(More)21 -+b(in)n(telligible)i(message)d(in)j(the)f(case)g(of)g(iden)n(tical)g(c)n -+(hange)f(to)h(the)g(same)g(\014les:)34 b(\\Nothing)21 -+b(to)h(do:)34 b(replicas)390 315 y(ha)n(v)n(e)27 b(b)r(een)h(c)n -+(hanged)e(only)h(in)h(iden)n(tical)g(w)n(a)n(ys)e(since)h(last)g -+(sync.")301 448 y Fl({)41 b Fn(Files)28 b(with)g(pre\014x)f('.#')h -+(excluded)g(when)g(scanning)e(for)h(preference)g(\014les.)301 -+581 y Fl({)41 b Fn(Rsync)28 b(instructions)f(are)f(send)i(directly)f -+(instead)h(of)f(\014rst)h(marshaled.)301 714 y Fl({)41 -+b Fn(W)-7 b(on't)29 b(try)g(forev)n(er)e(to)h(get)h(the)g(\014ngerprin) -+n(t)e(of)i(a)f(con)n(tin)n(uously)g(c)n(hanging)f(\014le:)39 -+b(unison)29 b(will)g(giv)n(e)e(up)i(after)390 814 y(certain)e(n)n(um)n -+(b)r(er)h(of)f(retries.)301 946 y Fl({)41 b Fn(Other)d(bug)g(\014xes,)j -+(including)d(the)h(one)f(rep)r(orted)f(b)n(y)h(P)n(eter)f(Selinger)h -+(\()p Fk(force=older)h(preference)34 b Fn(not)390 1046 -+y(w)n(orking\).)125 1212 y Fj(\017)41 b Fn(Compilation:)301 -+1378 y Fl({)g Fn(Upgraded)25 b(to)h(the)g(new)f(OCaml)g(3.04)g -+(compiler,)g(with)h(the)g(LablGtk)g(1.2.3)e(library)g(\(patc)n(hed)i(v) -+n(ersion)e(used)390 1478 y(for)j(compiling)g(under)h(Windo)n(ws\).)301 -+1611 y Fl({)41 b Fn(Added)35 b(the)f(option)g(to)f(compile)h(unison)g -+(on)f(the)h(Windo)n(ws)g(platform)f(with)i(Cygwin)e(GNU)i(C)f -+(compiler.)390 1710 y(This)28 b(option)f(only)g(supp)r(orts)g(building) -+h(dynamically)f(link)n(ed)h(unison)f(executables.)0 1876 -+y(Changes)g(since)g(2.7.4:)125 2042 y Fj(\017)41 b Fn(Fixed)27 -+b(a)h(silly)f(\(but)h(debilitating\))h(bug)e(in)h(the)g(clien)n(t)f -+(startup)h(sequence.)0 2208 y(Changes)f(since)g(2.7.1:)125 -+2374 y Fj(\017)41 b Fn(Added)33 b Fk(addprefsto)c Fn(preference,)k -+(whic)n(h)g(\(when)g(set\))g(con)n(trols)f(whic)n(h)g(preference)g -+(\014le)h(new)g(preferences)f(\(e.g.)208 2474 y(new)27 -+b(ignore)g(patterns\))g(are)g(added)g(to.)125 2640 y -+Fj(\017)41 b Fn(Bug)27 b(\014x:)39 b(read)27 b(the)i(initial)g -+(connection)e(header)h(one)g(b)n(yte)g(at)g(a)g(time,)h(so)f(that)h(w)n -+(e)f(don't)g(blo)r(c)n(k)g(if)h(the)g(header)e(is)208 -+2740 y(shorter)f(than)h(exp)r(ected.)37 b(\(This)28 b(bug)f(did)h(not)g -+(a\013ect)f(normal)g(op)r(eration)f(|)i(it)g(just)g(made)f(it)h(hard)f -+(to)g(tell)h(when)208 2839 y(y)n(ou)23 b(w)n(ere)h(trying)f(to)i(use)f -+(Unison)g(incorrectly)f(with)i(an)f(old)g(v)n(ersion)f(of)i(the)f(serv) -+n(er,)g(since)g(it)h(w)n(ould)f(hang)f(instead)208 2939 -+y(of)k(giving)g(an)g(error)f(message.\))0 3105 y(Changes)h(since)g -+(2.6.59:)125 3271 y Fj(\017)41 b Fn(Changed)27 b Fk(fastcheck)e -+Fn(from)k(a)f(b)r(o)r(olean)g(to)g(a)g(string)g(preference.)39 -+b(Its)29 b(legal)e(v)-5 b(alues)29 b(are)e Fk(yes)h Fn(\(for)g(a)g -+(fast)h(c)n(hec)n(k\),)208 3371 y Fk(no)f Fn(\(for)h(a)g(safe)f(c)n -+(hec)n(k\),)h(or)g Fk(default)d Fn(\(for)j(a)g(fast)g(c)n(hec)n(k|whic) -+n(h)f(also)g(happ)r(ens)h(to)g(b)r(e)h(safe|when)f(running)f(on)208 -+3470 y(Unix)f(and)h(a)f(safe)g(c)n(hec)n(k)g(when)h(on)f(Windo)n(ws\).) -+37 b(The)28 b(default)g(is)f Fk(default)p Fn(.)125 3636 -+y Fj(\017)41 b Fn(Sev)n(eral)31 b(preferences)g(ha)n(v)n(e)g(b)r(een)i -+(renamed)f(for)g(consistency)-7 b(.)50 b(All)33 b(preference)f(names)g -+(are)f(no)n(w)h(sp)r(elled)g(out)h(in)208 3736 y(lo)n(w)n(ercase.)49 -+b(F)-7 b(or)32 b(bac)n(kw)n(ard)e(compatibilit)n(y)-7 -+b(,)34 b(the)f(old)f(names)g(still)h(w)n(ork,)f(but)i(they)e(are)g(not) -+g(men)n(tioned)h(in)g(the)208 3836 y(man)n(ual)26 b(an)n(y)h(more.)125 -+4002 y Fj(\017)41 b Fn(The)25 b(temp)h(\014les)g(created)f(b)n(y)g(the) -+h('di\013)6 b(')27 b(and)e('merge')g(commands)g(are)g(no)n(w)g(named)g -+(b)n(y)g Fi(pr)l(e)p Fn(p)r(ending)i(a)e(new)h(pre\014x)208 -+4101 y(to)d(the)h(\014le)f(name,)h(rather)f(than)g(app)r(ending)h(a)f -+(su\016x.)35 b(This)24 b(should)f(a)n(v)n(oid)f(confusing)h -+(di\013/merge)g(programs)e(that)208 4201 y(dep)r(end)28 -+b(on)f(the)h(su\016x)g(to)f(guess)g(the)h(t)n(yp)r(e)g(of)f(the)h -+(\014le)g(con)n(ten)n(ts.)125 4367 y Fj(\017)41 b Fn(W)-7 -+b(e)33 b(no)n(w)f(set)h(the)g(k)n(eepaliv)n(e)e(option)i(on)f(the)h -+(serv)n(er)e(so)r(c)n(k)n(et,)i(to)g(mak)n(e)f(sure)g(that)h(the)h -+(serv)n(er)d(times)i(out)f(if)i(the)208 4467 y(comm)n(unication)26 -+b(link)i(is)g(unexp)r(ectedly)g(brok)n(en.)125 4633 y -+Fj(\017)41 b Fn(Bug)27 b(\014xes:)301 4799 y Fl({)41 -+b Fn(When)28 b(up)r(dating)g(small)f(\014les,)h(Unison)g(no)n(w)e -+(closes)h(the)h(destination)f(\014le.)301 4932 y Fl({)41 -+b Fn(File)28 b(p)r(ermissions)f(are)f(prop)r(erly)h(up)r(dated)h(when)g -+(the)g(\014le)g(is)f(b)r(ehind)i(a)e(follo)n(w)n(ed)f(link.)301 -+5064 y Fl({)41 b Fn(Sev)n(eral)26 b(other)h(small)h(\014xes.)0 -+5230 y(Changes)f(since)g(2.6.38:)1908 5589 y(44)p eop -+%%Page: 45 45 -+45 44 bop 125 83 a Fj(\017)41 b Fn(Ma)5 b(jor)26 b(Windo)n(ws)h(p)r -+(erformance)g(impro)n(v)n(emen)n(t!)208 214 y(W)-7 b(e'v)n(e)31 -+b(added)g(a)g(preference)g Fk(fastcheck)d Fn(that)k(mak)n(es)e(Unison)h -+(lo)r(ok)g(only)g(at)h(a)f(\014le's)g(creation)f(time)i(and)g(last-)208 -+314 y(mo)r(di\014ed)e(time)h(to)f(c)n(hec)n(k)f(whether)h(it)h(has)e(c) -+n(hanged.)44 b(This)30 b(should)g(result)g(in)g(a)g(h)n(uge)f(sp)r -+(eedup)i(when)f(c)n(hec)n(king)208 413 y(for)d(up)r(dates)g(in)h(large) -+e(replicas.)208 545 y(When)j(this)h(switc)n(h)f(is)g(set,)h(Unison)f -+(will)h(use)f(\014le)g(creation)f(times)i(as)e('pseudo)h(ino)r(de)h(n)n -+(um)n(b)r(ers')e(when)i(scanning)208 644 y(Windo)n(ws)24 -+b(replicas)f(for)h(up)r(dates,)i(instead)e(of)h(reading)e(the)i(full)g -+(con)n(ten)n(ts)f(of)h(ev)n(ery)e(\014le.)36 b(This)24 -+b(ma)n(y)g(cause)g(Unison)208 744 y(to)37 b(miss)g(propagating)e(an)i -+(up)r(date)h(if)g(the)g(create)e(time,)41 b(mo)r(di\014cation)c(time,)k -+(and)c(length)g(of)h(the)f(\014le)h(are)e(all)208 844 -+y(unc)n(hanged)25 b(b)n(y)g(the)h(up)r(date)h(\(this)f(is)g(not)g(easy) -+f(to)g(ac)n(hiev)n(e,)g(but)i(it)f(can)f(b)r(e)i(done\).)36 -+b(Ho)n(w)n(ev)n(er,)24 b(Unison)i(will)g(nev)n(er)208 -+943 y Fi(overwrite)32 b Fn(suc)n(h)g(an)f(up)r(date)h(with)g(a)f(c)n -+(hange)g(from)g(the)h(other)f(replica,)g(since)h(it)g(alw)n(a)n(ys)d -+(do)r(es)j(a)f(safe)g(c)n(hec)n(k)g(for)208 1043 y(up)r(dates)f(just)i -+(b)r(efore)e(propagating)e(a)i(c)n(hange.)45 b(Th)n(us,)31 -+b(it)g(is)g(reasonable)d(to)j(use)f(this)h(switc)n(h)g(most)f(of)h(the) -+g(time)208 1142 y(and)23 b(o)r(ccasionally)e(run)i(Unison)g(once)g -+(with)g Fk(fastcheck)d Fn(set)j(to)g(false,)h(if)f(y)n(ou)g(are)f(w)n -+(orried)f(that)j(Unison)f(ma)n(y)f(ha)n(v)n(e)208 1242 -+y(o)n(v)n(erlo)r(ok)n(ed)i(an)k(up)r(date.)208 1373 y(W)-7 -+b(arning:)34 b(This)23 b(c)n(hange)g(is)g(has)g(not)h(y)n(et)f(b)r(een) -+h(thoroughly)e(\014eld-tested.)36 b(If)24 b(y)n(ou)e(set)i(the)g -+Fk(fastcheck)c Fn(preference,)208 1473 y(pa)n(y)26 b(careful)h(atten)n -+(tion)h(to)f(what)h(Unison)f(is)h(doing.)125 1636 y Fj(\017)41 -+b Fn(New)27 b(functionalit)n(y:)37 b(cen)n(tralized)27 -+b(bac)n(kups)g(and)g(merging)301 1798 y Fl({)41 b Fn(This)c(v)n(ersion) -+f(incorp)r(orates)f(t)n(w)n(o)h(pieces)h(of)g(ma)5 b(jor)36 -+b(new)h(functionalit)n(y)-7 b(,)39 b(implemen)n(ted)f(b)n(y)f(Sylv)-5 -+b(ain)37 b(Ro)n(y)390 1898 y(during)f(a)g(summer)h(in)n(ternship)f(at)g -+(P)n(enn:)54 b(a)36 b Fi(c)l(entr)l(alize)l(d)j(b)l(ackup)e -+Fn(facilit)n(y)f(that)h(k)n(eeps)f(a)g(full)h(bac)n(kup)f(of)390 -+1998 y(\(selected)e(\014les)h(in\))f(eac)n(h)f(replica,)i(and)f(a)g -+Fi(mer)l(ging)h Fn(feature)e(that)i(allo)n(ws)e(Unison)h(to)g(in)n(v)n -+(ok)n(e)e(an)i(external)390 2097 y(\014le-merging)26 -+b(to)r(ol)i(to)f(resolv)n(e)f(con\015icting)h(c)n(hanges)g(to)g -+(individual)h(\014les.)301 2227 y Fl({)41 b Fn(Cen)n(tralized)27 -+b(bac)n(kups:)462 2356 y Fj(\003)41 b Fn(Unison)28 b(no)n(w)g(main)n -+(tains)f(full)i(bac)n(kups)e(of)h(the)h(last-sync)n(hronized)d(v)n -+(ersions)g(of)i(\(some)g(of)6 b(\))28 b(the)h(\014les)f(in)545 -+2456 y(eac)n(h)e(replica;)f(these)h(function)h(b)r(oth)f(as)g(bac)n -+(kups)f(in)h(the)g(usual)g(sense)g(and)f(as)h(the)g(\\common)f(v)n -+(ersion")545 2555 y(when)j(in)n(v)n(oking)e(external)h(merge)g -+(programs.)462 2670 y Fj(\003)41 b Fn(The)31 b(bac)n(k)n(ed)f(up)g -+(\014les)h(are)f(stored)f(in)i(a)f(directory)60 b(/.unison/bac)n(kup)29 -+b(on)h(eac)n(h)g(host.)46 b(\(The)31 b(name)f(of)545 -+2770 y(this)e(directory)f(can)g(b)r(e)h(c)n(hanged)e(b)n(y)i(setting)f -+(the)h(en)n(vironmen)n(t)f(v)-5 b(ariable)26 b Fk(UNISONBACKUPDIR)p -+Fn(.\))462 2884 y Fj(\003)41 b Fn(The)h(predicate)f Fk(backup)e -+Fn(con)n(trols)h(whic)n(h)h(\014les)h(are)e(actually)h(bac)n(k)n(ed)f -+(up:)65 b(giving)41 b(the)h(preference)545 2984 y(')p -+Fk(backup)g(=)h(Path)f(*)p Fn(')27 b(causes)g(bac)n(king)f(up)i(of)g -+(all)f(\014les.)462 3098 y Fj(\003)41 b Fn(Files)35 b(are)e(added)i(to) -+f(the)h(bac)n(kup)f(directory)f(whenev)n(er)g(unison)h(up)r(dates)h -+(its)f(arc)n(hiv)n(e.)56 b(This)35 b(means)545 3198 y(that)622 -+3313 y Fj(\001)42 b Fn(When)21 b(unison)f(reconstructs)g(its)h(arc)n -+(hiv)n(e)d(from)j(scratc)n(h)e(\(e.g.,)j(b)r(ecause)f(of)f(an)h -+(upgrade,)g(or)e(b)r(ecause)687 3412 y(the)28 b(arc)n(hiv)n(e)d -+(\014les)j(ha)n(v)n(e)e(b)r(een)i(man)n(ually)f(deleted\),)h(all)g -+(\014les)f(will)h(b)r(e)g(bac)n(k)n(ed)f(up.)622 3527 -+y Fj(\001)42 b Fn(Otherwise,)26 b(eac)n(h)h(\014le)h(will)g(b)r(e)g -+(bac)n(k)n(ed)e(up)i(the)g(\014rst)f(time)i(unison)e(propagates)e(an)j -+(up)r(date)g(for)f(it.)462 3641 y Fj(\003)41 b Fn(The)33 -+b(preference)f Fk(backupversions)27 b Fn(con)n(trols)k(ho)n(w)h(man)n -+(y)g(previous)g(v)n(ersions)f(of)i(eac)n(h)f(\014le)g(are)g(k)n(ept.) -+545 3741 y(The)c(default)g(is)g(2)f(\(i.e.,)h(the)g(last)f(sync)n -+(hronized)f(v)n(ersion)g(plus)i(one)f(bac)n(kup\).)462 -+3856 y Fj(\003)41 b Fn(F)-7 b(or)23 b(bac)n(kw)n(ard)e(compatibilit)n -+(y)-7 b(,)24 b(the)g Fk(backups)c Fn(preference)i(is)i(also)e(still)h -+(supp)r(orted,)h(but)g Fk(backup)d Fn(is)i(no)n(w)545 -+3955 y(preferred.)462 4070 y Fj(\003)41 b Fn(It)d(is)f(OK)f(to)h(man)n -+(ually)f(delete)h(\014les)g(from)g(the)h(bac)n(kup)e(directory)g(\(or)g -+(to)h(thro)n(w)f(a)n(w)n(a)n(y)f(the)j(direc-)545 4169 -+y(tory)32 b(itself)6 b(\).)52 b(Before)31 b(unison)h(uses)g(an)n(y)f -+(of)h(these)g(\014les)h(for)e(an)n(ything)h(imp)r(ortan)n(t,)h(it)f(c)n -+(hec)n(ks)f(that)i(its)545 4269 y(\014ngerprin)n(t)27 -+b(matc)n(hes)g(the)h(one)f(that)h(it)g(exp)r(ects.)301 -+4399 y Fl({)41 b Fn(Merging:)462 4528 y Fj(\003)g Fn(Both)29 -+b(user)g(in)n(terfaces)f(o\013er)g(a)h(new)g('merge')f(command,)h(in)n -+(v)n(ok)n(ed)f(b)n(y)g(pressing)g('m')i(\(with)g(a)e(c)n(hanged)545 -+4628 y(\014le)g(selected\).)462 4742 y Fj(\003)41 b Fn(The)24 -+b(actual)g(merging)e(is)i(p)r(erformed)f(b)n(y)h(an)f(external)g -+(program.)34 b(The)23 b(preferences)g Fk(merge)f Fn(and)h -+Fk(merge2)545 4842 y Fn(con)n(trol)c(ho)n(w)g(this)h(program)d(is)j(in) -+n(v)n(ok)n(ed.)33 b(If)20 b(a)f(bac)n(kup)g(exists)h(for)f(this)h -+(\014le)g(\(see)f(the)h Fk(backup)e Fn(preference\),)545 -+4941 y(then)30 b(the)e Fk(merge)f Fn(preference)h(is)g(used)h(for)f -+(this)h(purp)r(ose;)f(otherwise)g Fk(merge2)e Fn(is)j(used.)39 -+b(In)29 b(b)r(oth)g(cases,)545 5041 y(the)22 b(v)-5 b(alue)21 -+b(of)g(the)g(preference)f(should)h(b)r(e)g(a)g(string)f(represen)n -+(ting)g(the)h(command)f(that)i(should)e(b)r(e)i(passed)545 -+5141 y(to)28 b(a)f(shell)h(to)f(in)n(v)n(ok)n(e)f(the)j(merge)d -+(program.)35 b(Within)29 b(this)f(string,)f(the)h(sp)r(ecial)g -+(substrings)e Fk(CURRENT1)p Fn(,)545 5240 y Fk(CURRENT2)p -+Fn(,)33 b Fk(NEW)p Fn(,)g(and)h Fk(OLD)f Fn(ma)n(y)h(app)r(ear)f(at)h -+(an)n(y)g(p)r(oin)n(t.)57 b(Unison)34 b(will)g(substitute)h(these)g(as) -+e(follo)n(ws)545 5340 y(b)r(efore)28 b(in)n(v)n(oking)e(the)i(command:) -+1908 5589 y(45)p eop -+%%Page: 46 46 -+46 45 bop 622 83 a Fj(\001)42 b Fk(CURRENT1)24 b Fn(is)j(replaced)g(b)n -+(y)g(the)h(name)g(of)f(the)h(lo)r(cal)f(cop)n(y)g(of)h(the)g(\014le;) -+622 199 y Fj(\001)42 b Fk(CURRENT2)33 b Fn(is)j(replaced)f(b)n(y)h(the) -+h(name)f(of)g(a)g(temp)r(orary)f(\014le,)k(in)n(to)d(whic)n(h)g(the)h -+(con)n(ten)n(ts)e(of)i(the)687 298 y(remote)27 b(cop)n(y)f(of)i(the)g -+(\014le)g(ha)n(v)n(e)e(b)r(een)i(transferred)e(b)n(y)i(Unison)f(prior)f -+(to)i(p)r(erforming)f(the)h(merge;)622 414 y Fj(\001)42 -+b Fk(NEW)24 b Fn(is)i(replaced)f(b)n(y)g(the)h(name)g(of)g(a)f(temp)r -+(orary)g(\014le)h(that)g(Unison)f(exp)r(ects)h(to)g(b)r(e)g(written)g -+(b)n(y)g(the)687 513 y(merge)g(program)g(when)i(it)g(\014nishes,)f -+(giving)g(the)h(desired)f(new)h(con)n(ten)n(ts)f(of)g(the)h(\014le;)g -+(and)622 629 y Fj(\001)42 b Fk(OLD)25 b Fn(is)i(replaced)f(b)n(y)g(the) -+i(name)e(of)h(the)g(bac)n(k)n(ed)f(up)h(cop)n(y)f(of)h(the)g(original)e -+(v)n(ersion)h(of)g(the)i(\014le)f(\(i.e.,)687 728 y(its)34 -+b(state)g(at)g(the)h(end)g(of)f(the)h(last)f(successful)g(run)g(of)g -+(Unison\),)i(if)f(one)f(exists)g(\(applies)g(only)g(to)687 -+828 y Fk(merge)p Fn(,)25 b(not)j Fk(merge2)p Fn(\).)545 -+944 y(F)-7 b(or)27 b(example,)h(on)f(Unix)h(systems)f(setting)h(the)g -+Fk(merge)d Fn(preference)i(to)676 1059 y Fk(merge)42 -+b(=)h(diff3)e(-m)i(CURRENT1)d(OLD)j(CURRENT2)d(>)j(NEW)545 -+1175 y Fn(will)28 b(tell)g(Unison)g(to)f(use)h(the)g(external)e -+Fk(diff3)g Fn(program)g(for)h(merging.)545 1274 y(A)k(large)e(n)n(um)n -+(b)r(er)i(of)f(external)g(merging)f(programs)f(are)i(a)n(v)-5 -+b(ailable.)44 b(F)-7 b(or)30 b(example,)h Fk(emacs)d -+Fn(users)i(ma)n(y)545 1374 y(\014nd)e(the)g(follo)n(wing)f(con)n(v)n -+(enien)n(t:)720 1489 y Fk(merge2)41 b(=)i(emacs)f(-q)g(--eval)f -+('\(ediff-merge-fil)o(es)c("CURRENT1")j("CURRENT2")1199 -+1589 y(nil)j("NEW"\)')720 1689 y(merge)e(=)i(emacs)f(-q)h(--eval)e -+('\(ediff-merge-fi)o(le)o(s-w)o(it)o(h-a)o(nc)o(es)o(tor)1199 -+1788 y("CURRENT1")f("CURRENT2")f("OLD")j(nil)g("NEW"\)')545 -+1904 y Fn(\(These)29 b(commands)g(are)f(displa)n(y)n(ed)g(here)g(on)h -+(t)n(w)n(o)f(lines)h(to)g(a)n(v)n(oid)e(running)i(o\013)g(the)g(edge)g -+(of)g(the)g(page.)545 2004 y(In)f(y)n(our)f(preference)f(\014le,)i(eac) -+n(h)f(should)g(b)r(e)h(written)g(on)f(a)h(single)f(line.\))462 -+2119 y Fj(\003)41 b Fn(If)30 b(the)g(external)f(program)e(exits)i -+(without)h(lea)n(ving)e(an)n(y)h(\014le)g(at)h(the)f(path)h -+Fk(NEW)p Fn(,)e(Unison)i(considers)e(the)545 2219 y(merge)35 -+b(to)g(ha)n(v)n(e)f(failed.)61 b(If)35 b(the)h(merge)f(program)e -+(writes)i(a)g(\014le)g(called)g Fk(NEW)g Fn(but)g(exits)h(with)g(a)f -+(non-)545 2318 y(zero)29 b(status)h(co)r(de,)h(then)f(Unison)g -+(considers)f(the)h(merge)f(to)h(ha)n(v)n(e)f(succeeded)h(but)g(to)g(ha) -+n(v)n(e)f(generated)545 2418 y(con\015icts.)48 b(In)32 -+b(this)g(case,)f(it)h(attempts)g(to)f(in)n(v)n(ok)n(e)f(an)h(external)f -+(editor)h(so)g(that)g(the)h(user)f(can)g(resolv)n(e)545 -+2518 y(the)e(con\015icts.)40 b(The)28 b(v)-5 b(alue)28 -+b(of)h(the)g Fk(editor)d Fn(preference)h(con)n(trols)g(what)i(editor)f -+(is)g(in)n(v)n(ok)n(ed)f(b)n(y)h(Unison.)545 2617 y(The)g(default)g(is) -+g Fk(emacs)p Fn(.)462 2733 y Fj(\003)41 b Fn(Please)23 -+b(send)h(us)g(suggestions)e(for)h(other)h(useful)g(v)-5 -+b(alues)24 b(of)f(the)i Fk(merge2)c Fn(and)j Fk(merge)e -+Fn(preferences)h({)g(w)n(e'd)545 2832 y(lik)n(e)28 b(to)f(giv)n(e)g -+(sev)n(eral)f(examples)h(in)g(the)h(man)n(ual.)125 2996 -+y Fj(\017)41 b Fn(Smaller)27 b(c)n(hanges:)301 3161 y -+Fl({)41 b Fn(When)26 b(one)e(preference)g(\014le)h(includes)g(another,) -+f(unison)h(no)f(longer)g(adds)g(the)i(su\016x)e(')p Fk(.prf)p -+Fn(')g(to)g(the)i(included)390 3261 y(\014le)c(b)n(y)f(default.)36 -+b(If)22 b(a)f(\014le)g(with)i(precisely)d(the)i(giv)n(en)f(name)g -+(exists)g(in)h(the)g(.unison)g(directory)-7 b(,)21 b(it)h(will)g(b)r(e) -+g(used;)390 3360 y(otherwise)32 b(Unison)g(will)h(add)f -+Fk(.prf)p Fn(,)g(as)g(it)h(did)f(b)r(efore.)51 b(\(This)33 -+b(c)n(hange)e(means)h(that)h(included)g(preference)390 -+3460 y(\014les)e(can)f(b)r(e)g(named)h Fk(blah.include)25 -+b Fn(instead)30 b(of)h Fk(blah.prf)p Fn(,)d(so)h(that)i(unison)f(will)h -+(not)f(o\013er)g(them)h(in)g(its)390 3559 y('c)n(ho)r(ose)c(a)g -+(preference)g(\014le')g(dialog.\))301 3691 y Fl({)41 -+b Fn(F)-7 b(or)34 b(Lin)n(ux)g(systems,)i(w)n(e)e(no)n(w)g(o\013er)g(b) -+r(oth)h(a)f(statically)g(link)n(ed)h(and)f(a)g(dynamically)g(link)n(ed) -+g(executable.)390 3790 y(The)d(static)g(one)g(is)g(larger,)f(but)h -+(will)h(probably)e(run)g(on)h(more)f(systems,)i(since)f(it)g(do)r -+(esn't)g(dep)r(end)h(on)f(the)390 3890 y(same)c(v)n(ersions)f(of)i -+(dynamically)e(link)n(ed)i(library)e(mo)r(dules)i(b)r(eing)f(a)n(v)-5 -+b(ailable.)301 4021 y Fl({)41 b Fn(Fixed)34 b(the)f Fk(force)e -+Fn(and)i Fk(prefer)e Fn(preferences,)j(whic)n(h)f(w)n(ere)f(getting)h -+(the)h(propagation)d(direction)i(exactly)390 4121 y(bac)n(kw)n(ards.) -+301 4253 y Fl({)41 b Fn(Fixed)i(a)e(bug)h(in)h(the)f(startup)g(co)r(de) -+g(that)h(w)n(ould)f(cause)f(unison)h(to)g(crash)f(when)i(the)f(default) -+h(pro\014le)390 4352 y(\()p Fk(~/.unison/default)o(.pr)o(f)p -+Fn(\))22 b(do)r(es)27 b(not)h(exist.)301 4484 y Fl({)41 -+b Fn(Fixed)31 b(a)g(bug)g(where,)g(on)g(the)g(run)g(when)g(a)f -+(pro\014le)h(is)f(\014rst)h(created,)g(Unison)g(w)n(ould)f(confusingly) -+h(displa)n(y)390 4583 y(the)d(ro)r(ots)f(in)h(rev)n(erse)d(order)i(in)g -+(the)h(user)f(in)n(terface.)125 4748 y Fj(\017)41 b Fn(F)-7 -+b(or)27 b(dev)n(elop)r(ers:)301 4913 y Fl({)41 b Fn(W)-7 -+b(e'v)n(e)24 b(added)g(a)f(mo)r(dule)i(dep)r(endency)f(diagram)f(to)h -+(the)g(source)f(distribution,)i(in)f Fk(src/DEPENDENCIES)o(.p)o(s)p -+Fn(,)390 5012 y(to)k(help)g(new)f(prosp)r(ectiv)n(e)g(dev)n(elop)r(ers) -+f(with)i(na)n(vigating)e(the)i(co)r(de.)0 5177 y(Changes)f(since)g -+(2.6.11:)125 5340 y Fj(\017)41 b Fl(Incompatible)30 b(c)m(hange:)74 -+b Fn(Arc)n(hiv)n(e)27 b(format)g(has)g(c)n(hanged.)1908 -+5589 y(46)p eop -+%%Page: 47 47 -+47 46 bop 125 83 a Fj(\017)41 b Fl(Incompatible)29 b(c)m(hange:)74 -+b Fn(The)27 b(startup)f(sequence)h(has)f(b)r(een)i(completely)e -+(rewritten)h(and)g(greatly)f(simpli\014ed.)208 183 y(The)i(main)g -+(user-visible)g(c)n(hange)f(is)h(that)h(the)f Fk(defaultpath)c -+Fn(preference)k(has)g(b)r(een)h(remo)n(v)n(ed.)37 b(Its)29 -+b(e\013ect)g(can)f(b)r(e)208 282 y(appro)n(ximated)c(b)n(y)j(using)f(m) -+n(ultiple)h(pro\014les,)e(with)i Fk(include)d Fn(directiv)n(es)h(to)i -+(incorp)r(orate)d(common)i(settings.)37 b(All)208 382 -+y(uses)27 b(of)g Fk(defaultpath)c Fn(in)28 b(existing)f(pro\014les)g -+(should)g(b)r(e)h(c)n(hanged)f(to)h Fk(path)p Fn(.)208 -+515 y(Another)23 b(c)n(hange)g(in)h(startup)g(b)r(eha)n(vior)e(that)i -+(will)g(a\013ect)g(some)g(users)e(is)i(that)g(it)h(is)e(no)h(longer)f -+(p)r(ossible)g(to)h(sp)r(ecify)208 614 y(ro)r(ots)i Fi(b)l(oth)i -+Fn(in)g(the)g(pro\014le)f Fi(and)h Fn(on)f(the)h(command)g(line.)208 -+747 y(Y)-7 b(ou)27 b(can)g(ac)n(hiev)n(e)g(a)g(similar)g(e\013ect,)h -+(though,)f(b)n(y)h(breaking)e(y)n(our)g(pro\014le)h(in)n(to)g(t)n(w)n -+(o:)295 1046 y Fk(default.prf)39 b(=)469 1146 y(root)j(=)h(blah)469 -+1245 y(root)f(=)h(foo)469 1345 y(include)e(common)295 -+1544 y(common.prf)e(=)469 1644 y(<everything)g(else>)208 -+1843 y Fn(No)n(w)27 b(do)295 2042 y Fk(unison)41 b(common)g(root1)g -+(root2)208 2242 y Fn(when)27 b(y)n(ou)g(w)n(an)n(t)g(to)h(sp)r(ecify)f -+(ro)r(ots)g(explicitly)-7 b(.)125 2408 y Fj(\017)41 b -+Fn(The)18 b Fk(-prefer)e Fn(and)i Fk(-force)e Fn(options)i(ha)n(v)n(e)f -+(b)r(een)i(extended)f(to)h(allo)n(w)e(users)g(to)i(sp)r(ecify)f(that)h -+(\014les)f(with)h(more)f(recen)n(t)208 2507 y(mo)r(dtimes)37 -+b(should)g(b)r(e)h(propagated,)g(writing)f(either)h Fk(-prefer)i(newer) -+c Fn(or)g Fk(-force)41 b(newer)p Fn(.)64 b(\(F)-7 b(or)37 -+b(symmetry)-7 b(,)208 2607 y(Unison)37 b(will)h(also)f(accept)g -+Fk(-prefer)k(older)36 b Fn(or)g Fk(-force)42 b(older)p -+Fn(.\))65 b(The)38 b Fk(-force)j(older/newer)33 b Fn(options)k(can)208 -+2707 y(only)27 b(b)r(e)h(used)f(when)h Fk(-times)d Fn(is)j(also)e(set.) -+208 2839 y(The)e(graphical)f(user)g(in)n(terface)h(pro)n(vides)f -+(access)g(to)h(these)g(facilities)g(on)g(a)g(one-o\013)g(basis)f(via)h -+(the)g Fk(Actions)e Fn(men)n(u.)125 3005 y Fj(\017)41 -+b Fn(Names)30 b(of)g(ro)r(ots)f(can)h(no)n(w)g(b)r(e)g(\\aliased")f(to) -+h(allo)n(w)f(replicas)g(to)i(b)r(e)f(relo)r(cated)g(without)g(c)n -+(hanging)f(the)i(name)f(of)208 3105 y(the)h(arc)n(hiv)n(e)d(\014le)j -+(where)f(Unison)h(stores)e(information)h(b)r(et)n(w)n(een)h(runs.)45 -+b(\(This)31 b(feature)g(is)f(for)g(exp)r(erts)g(only)-7 -+b(.)46 b(See)208 3205 y(the)28 b(\\Arc)n(hiv)n(e)e(Files")h(section)g -+(of)h(the)g(man)n(ual)e(for)i(more)e(information.\))125 -+3371 y Fj(\017)41 b Fn(Graphical)26 b(user-in)n(terface:)301 -+3537 y Fl({)41 b Fn(A)28 b(new)g(command)g(is)f(pro)n(vided)g(in)h(the) -+g(Sync)n(hronization)e(men)n(u)i(for)f(switc)n(hing)h(to)f(a)h(new)g -+(pro\014le)f(without)390 3636 y(restarting)f(Unison)i(from)f(scratc)n -+(h.)301 3769 y Fl({)41 b Fn(The)e(GUI)g(also)f(supp)r(orts)g(one-k)n -+(ey)f(shortcuts)h(for)g(commonly)g(used)h(pro\014les.)69 -+b(If)39 b(a)f(pro\014le)g(con)n(tains)f(a)390 3869 y(preference)22 -+b(of)h(the)f(form)h(')p Fk(key)42 b(=)h(n)p Fn(',)24 -+b(where)e Fk(n)g Fn(is)g(a)h(single)f(digit,)h(then)g(pressing)f(this)h -+(k)n(ey)f(will)g(cause)g(Unison)390 3968 y(to)k(immediately)h(switc)n -+(h)f(to)g(this)g(pro\014le)g(and)g(b)r(egin)g(sync)n(hronization)e -+(again)h(from)h(scratc)n(h.)35 b(\(An)n(y)27 b(actions)390 -+4068 y(that)h(ma)n(y)f(ha)n(v)n(e)f(b)r(een)i(selected)g(for)f(a)g(set) -+h(of)f(c)n(hanges)f(curren)n(tly)h(b)r(eing)h(displa)n(y)n(ed)e(will)i -+(b)r(e)g(discarded.\))301 4201 y Fl({)41 b Fn(Eac)n(h)34 -+b(pro\014le)h(ma)n(y)f(include)h(a)g(preference)f(')p -+Fk(label)42 b(=)h(<string>)p Fn(')32 b(giving)i(a)h(descriptiv)n(e)f -+(string)h(that)g(de-)390 4301 y(scrib)r(ed)27 b(the)g(options)f -+(selected)g(in)h(this)g(pro\014le.)36 b(The)27 b(string)e(is)i(listed)g -+(along)e(with)i(the)g(pro\014le)f(name)h(in)g(the)390 -+4400 y(pro\014le)g(selection)g(dialog,)g(and)g(displa)n(y)n(ed)g(in)h -+(the)g(top-righ)n(t)e(corner)g(of)i(the)g(main)f(Unison)h(windo)n(w.) -+125 4566 y Fj(\017)41 b Fn(Minor:)301 4732 y Fl({)g Fn(Fixed)27 -+b(a)e(bug)h(that)h(w)n(ould)e(sometimes)h(cause)g(the)g('di\013)6 -+b(')28 b(displa)n(y)d(to)h(order)f(the)h(\014les)g(bac)n(kw)n(ards)e -+(relativ)n(e)h(to)390 4832 y(the)j(main)g(user)f(in)n(terface.)36 -+b(\(Thanks)27 b(to)h(P)n(ascal)d(Brisset)i(for)g(this)h(\014x.\))301 -+4965 y Fl({)41 b Fn(On)25 b(Unix)h(systems,)g(the)f(graphical)f(v)n -+(ersion)g(of)h(Unison)h(will)f(c)n(hec)n(k)g(the)g Fk(DISPLAY)e -+Fn(v)-5 b(ariable)24 b(and,)i(if)g(it)g(is)f(not)390 -+5064 y(set,)j(automatically)e(fall)i(bac)n(k)f(to)g(the)h(textual)g -+(user)f(in)n(terface.)301 5197 y Fl({)41 b Fn(Sync)n(hronization)29 -+b(paths)g(\()p Fk(path)g Fn(preferences\))g(are)g(no)n(w)g(matc)n(hed)h -+(against)e(the)j(ignore)d(preferences.)43 b(So)30 b(if)390 -+5297 y(a)d(path)h(is)g(b)r(oth)g(sp)r(eci\014ed)f(in)h(a)g -+Fk(path)e Fn(preference)g(and)i(ignored,)e(it)i(will)g(b)r(e)g(skipp)r -+(ed.)1908 5589 y(47)p eop -+%%Page: 48 48 -+48 47 bop 301 83 a Fl({)41 b Fn(Numerous)27 b(other)g(bug\014xes)g(and) -+h(small)f(impro)n(v)n(emen)n(ts.)0 243 y(Changes)g(since)g(2.6.1:)125 -+398 y Fj(\017)41 b Fn(The)27 b(sync)n(hronization)f(of)h(mo)r -+(di\014cation)h(times)g(has)f(b)r(een)h(disabled)f(for)g(directories.) -+125 558 y Fj(\017)41 b Fn(Preference)27 b(\014les)i(ma)n(y)f(no)n(w)g -+(include)h(lines)g(of)g(the)g(form)f Fk(include)41 b(<name>)p -+Fn(,)27 b(whic)n(h)h(will)h(cause)f Fk(name.prf)e Fn(to)j(b)r(e)208 -+658 y(read)d(at)i(that)g(p)r(oin)n(t.)125 818 y Fj(\017)41 -+b Fn(The)27 b(sync)n(hronization)f(of)h(p)r(ermission)g(b)r(et)n(w)n -+(een)h(Windo)n(ws)f(and)h(Unix)g(no)n(w)f(w)n(orks)e(prop)r(erly)-7 -+b(.)125 978 y Fj(\017)41 b Fn(A)32 b(binding)h Fk(CYGWIN=binmode)27 -+b Fn(in)33 b(no)n(w)f(added)g(to)g(the)h(en)n(vironmen)n(t)f(so)g(that) -+h(the)g(Cygwin)f(p)r(ort)g(of)g(Op)r(enSSH)208 1078 y(w)n(orks)25 -+b(prop)r(erly)i(in)h(a)f(non-Cygwin)g(con)n(text.)125 -+1238 y Fj(\017)41 b Fn(The)34 b Fk(servercmd)d Fn(and)j -+Fk(addversionno)c Fn(preferences)j(can)h(no)n(w)g(b)r(e)h(used)f -+(together:)50 b Fk(-addversionno)29 b Fn(app)r(ends)208 -+1338 y(an)34 b(appropriate)g Fk(-NNN)g Fn(to)h(the)g(serv)n(er)f -+(command,)i(whic)n(h)f(is)h(found)f(b)n(y)g(using)g(the)g(v)-5 -+b(alue)35 b(of)h(the)f Fk(-servercmd)208 1438 y Fn(preference)26 -+b(if)i(there)g(is)f(one,)h(or)e(else)i(just)g Fk(unison)p -+Fn(.)125 1598 y Fj(\017)41 b Fn(Both)26 b Fk('-pref=val')d -+Fn(and)k Fk('-pref)41 b(val')25 b Fn(are)h(no)n(w)g(allo)n(w)n(ed)g -+(for)g(b)r(o)r(olean)h(v)-5 b(alues.)36 b(\(The)27 b(former)f(can)h(b)r -+(e)g(used)g(to)208 1697 y(set)g(a)g(preference)g(to)h(false.\))125 -+1858 y Fj(\017)41 b Fn(Lot)27 b(of)g(small)h(bugs)f(\014xed.)0 -+2012 y(Changes)g(since)g(2.5.31:)125 2167 y Fj(\017)41 -+b Fn(The)27 b Fk(log)g Fn(preference)f(is)i(no)n(w)f(set)h(to)f -+Fk(true)f Fn(b)n(y)h(default,)h(since)g(the)g(log)f(\014le)g(seems)g -+(useful)h(for)g(most)f(users.)125 2327 y Fj(\017)41 b -+Fn(Sev)n(eral)26 b(miscellaneous)g(bug\014xes)h(\(most)h(in)n(v)n -+(olving)e(symlinks\).)0 2482 y(Changes)h(since)g(2.5.25:)125 -+2636 y Fj(\017)41 b Fl(Incompatible)30 b(c)m(hange:)74 -+b Fn(Arc)n(hiv)n(e)27 b(format)g(has)g(c)n(hanged)f(\(again\).)125 -+2796 y Fj(\017)41 b Fn(Sev)n(eral)26 b(signi\014can)n(t)h(bugs)g(in)n -+(tro)r(duced)g(in)h(2.5.25)e(ha)n(v)n(e)g(b)r(een)i(\014xed.)0 -+2951 y(Changes)f(since)g(2.5.1:)125 3105 y Fj(\017)41 -+b Fl(Incompatible)24 b(c)m(hange:)69 b Fn(Arc)n(hiv)n(e)21 -+b(format)h(has)f(c)n(hanged.)35 b(Mak)n(e)21 b(sure)h(y)n(ou)f(sync)n -+(hronize)g(y)n(our)g(replicas)g(b)r(efore)208 3205 y(upgrading,)26 -+b(to)h(a)n(v)n(oid)f(spurious)h(con\015icts.)37 b(The)27 -+b(\014rst)h(sync)f(after)g(upgrading)f(will)i(b)r(e)g(slo)n(w.)125 -+3365 y Fj(\017)41 b Fn(New)27 b(functionalit)n(y:)301 -+3526 y Fl({)41 b Fn(Unison)28 b(no)n(w)f(sync)n(hronizes)f(\014le)h(mo) -+r(dtimes,)h(user-ids,)f(and)g(group-ids.)390 3639 y(These)e(new)g -+(features)g(are)f(con)n(trolled)g(b)n(y)g(a)h(set)g(of)g(new)g -+(preferences,)g(all)g(of)g(whic)n(h)g(are)f(curren)n(tly)g -+Fk(false)f Fn(b)n(y)390 3739 y(default.)462 3871 y Fj(\003)41 -+b Fn(When)35 b(the)g Fk(times)e Fn(preference)g(is)h(set)h(to)f -+Fk(true)p Fn(,)h(\014le)f(mo)r(di\014cation)g(times)h(are)e(propaged.) -+56 b(\(Because)545 3971 y(the)28 b(represen)n(tations)c(of)j(time)g(ma) -+n(y)f(not)h(ha)n(v)n(e)f(the)h(same)f(gran)n(ularit)n(y)f(on)h(b)r(oth) -+h(replicas,)f(Unison)h(ma)n(y)545 4070 y(not)f(alw)n(a)n(ys)e(b)r(e)i -+(able)g(to)g(mak)n(e)f(the)h(mo)r(dtimes)g(precisely)f(equal,)h(but)g -+(it)g(will)g(get)g(them)g(as)g(close)f(as)g(the)545 4170 -+y(op)r(erating)i(systems)g(in)n(v)n(olv)n(ed)f(allo)n(w.\))462 -+4283 y Fj(\003)41 b Fn(When)29 b(the)f Fk(owner)d Fn(preference)i(is)g -+(set)h(to)g Fk(true)p Fn(,)e(\014le)h(o)n(wnership)g(information)g(is)g -+(sync)n(hronized.)462 4397 y Fj(\003)41 b Fn(When)29 -+b(the)f Fk(group)d Fn(preference)i(is)g(set)h(to)g Fk(true)p -+Fn(,)e(group)g(information)h(is)h(sync)n(hronized.)462 -+4510 y Fj(\003)41 b Fn(When)23 b(the)g Fk(numericIds)18 -+b Fn(preference)k(is)g(set)g(to)g Fk(true)p Fn(,)g(o)n(wner)f(and)h -+(group)g(information)f(is)h(sync)n(hronized)545 4610 -+y(n)n(umerically)-7 b(.)49 b(By)31 b(default,)i(o)n(wner)e(and)g(group) -+g(n)n(um)n(b)r(ers)g(are)g(con)n(v)n(erted)f(to)h(names)h(on)f(eac)n(h) -+g(replica)545 4709 y(and)f(these)f(names)g(are)g(sync)n(hronized.)41 -+b(\(The)30 b(sp)r(ecial)f(user)g(id)h(0)f(and)g(the)h(sp)r(ecial)f -+(group)f(0)i(are)e(nev)n(er)545 4809 y(mapp)r(ed)g(via)f(user/group)f -+(names)h(ev)n(en)g(if)h(this)g(preference)f(is)g(not)h(set.\))301 -+4941 y Fl({)41 b Fn(Added)35 b(an)f(in)n(teger-v)-5 b(alued)33 -+b(preference)h Fk(perms)e Fn(that)i(can)g(b)r(e)h(used)f(to)g(con)n -+(trol)f(the)i(propagation)d(of)i(p)r(er-)390 5041 y(mission)d(bits.)49 -+b(The)32 b(v)-5 b(alue)31 b(of)g(this)h(preference)f(is)g(a)g(mask)g -+(indicating)g(whic)n(h)h(p)r(ermission)f(bits)g(should)h(b)r(e)390 -+5141 y(sync)n(hronized.)k(It)27 b(is)h(set)f(b)n(y)g(default)h(to)f(0)p -+Fa(o)p Fn(1777:)35 b(all)27 b(bits)h(but)g(the)f(set-uid)h(and)f -+(set-gid)g(bits)h(are)e(sync)n(hro-)390 5240 y(nised)31 -+b(\(sync)n(hronizing)e(theses)h(latter)g(bits)h(can)f(b)r(e)h(a)f -+(securit)n(y)f(hazard\).)45 b(If)31 b(y)n(ou)e(w)n(an)n(t)h(to)g(sync)n -+(hronize)f(all)390 5340 y(bits,)f(y)n(ou)f(can)g(set)h(the)g(v)-5 -+b(alue)27 b(of)h(this)g(preference)f(to)g Fj(\000)p Fn(1.)1908 -+5589 y(48)p eop -+%%Page: 49 49 -+49 48 bop 301 83 a Fl({)41 b Fn(Added)f(a)g Fk(log)e -+Fn(preference)h(\(default)h Fk(false)p Fn(\),)h(whic)n(h)e(mak)n(es)g -+(Unison)g(k)n(eep)g(a)h(complete)f(record)f(of)i(the)390 -+183 y(c)n(hanges)26 b(it)i(mak)n(es)f(to)g(the)h(replicas.)35 -+b(By)28 b(default,)g(this)f(record)f(is)i(written)f(to)h(a)f(\014le)g -+(called)g Fk(unison.log)d Fn(in)390 282 y(the)j(user's)f(home)h -+(directory)e(\(the)i(v)-5 b(alue)27 b(of)f(the)h Fk(HOME)f -+Fn(en)n(vironmen)n(t)f(v)-5 b(ariable\).)36 b(If)27 b(y)n(ou)f(w)n(an)n -+(t)g(it)h(someplace)390 382 y(else,)h(set)f(the)h Fk(logfile)d -+Fn(preference)i(to)g(the)h(full)g(pathname)g(y)n(ou)f(w)n(an)n(t)g -+(Unison)g(to)h(use.)301 508 y Fl({)41 b Fn(Added)28 b(an)g -+Fk(ignorenot)c Fn(preference)j(that)h(main)n(tains)f(a)g(set)h(of)f -+(patterns)h(for)f(paths)g(that)h(should)g(de\014nitely)390 -+607 y Fi(not)36 b Fn(b)r(e)h(ignored,)h(whether)e(or)f(not)i(they)f -+(matc)n(h)h(an)f Fk(ignore)e Fn(pattern.)63 b(\(That)36 -+b(is,)j(a)d(path)g(will)h(no)n(w)f(b)r(e)390 707 y(ignored)27 -+b(i\013)h(it)g(matc)n(hes)f(an)g(ignore)f(pattern)i(and)f(do)r(es)h -+(not)f(matc)n(h)h(an)n(y)e(ignorenot)h(patterns.\))125 -+866 y Fj(\017)41 b Fn(User-in)n(terface)26 b(impro)n(v)n(emen)n(ts:)301 -+1024 y Fl({)41 b Fn(Ro)r(ots)20 b(are)g(no)n(w)g(displa)n(y)n(ed)f(in)i -+(the)g(user)f(in)n(terface)g(in)g(the)h(same)f(order)f(as)h(they)h(w)n -+(ere)f(giv)n(en)f(on)i(the)f(command)390 1124 y(line)28 -+b(or)f(in)h(the)g(preferences)e(\014le.)301 1250 y Fl({)41 -+b Fn(When)21 b(the)g Fk(batch)d Fn(preference)i(is)g(set,)i(the)f -+(graphical)d(user)i(in)n(terface)g(no)g(longer)f(w)n(aits)h(for)f(user) -+h(con\014rmation)390 1349 y(when)k(it)g(displa)n(ys)e(a)h(w)n(arning)f -+(message:)34 b(it)24 b(simply)f(p)r(ops)g(up)h(an)f(advisory)f(windo)n -+(w)h(with)h(a)f(Dismiss)h(button)390 1449 y(at)k(the)g(b)r(ottom)g(and) -+f(k)n(eeps)g(on)g(going.)301 1574 y Fl({)41 b Fn(Added)e(a)e(new)h -+(preference)f(for)g(con)n(trolling)f(ho)n(w)h(man)n(y)g(status)h -+(messages)e(are)h(prin)n(ted)g(during)h(up)r(date)390 -+1674 y(detection:)60 b Fk(statusdepth)34 b Fn(con)n(trols)j(the)j -+(maxim)n(um)e(depth)i(for)e(paths)h(on)f(the)h(lo)r(cal)g(mac)n(hine)f -+(\(longer)390 1774 y(paths)28 b(are)f(not)i(displa)n(y)n(ed,)e(nor)g -+(are)g(non-directory)g(paths\).)38 b(The)29 b(v)-5 b(alue)28 -+b(should)g(b)r(e)g(an)g(in)n(teger;)g(default)g(is)390 -+1873 y(1.)301 1999 y Fl({)41 b Fn(Remo)n(v)n(ed)28 b(the)h -+Fk(trace)d Fn(and)j Fk(silent)d Fn(preferences.)39 b(They)28 -+b(did)h(not)g(seem)f(v)n(ery)g(useful,)h(and)f(there)h(w)n(ere)e(to)r -+(o)390 2099 y(man)n(y)g(preferences)g(for)g(con)n(trolling)f(output)i -+(in)g(v)-5 b(arious)26 b(w)n(a)n(ys.)301 2224 y Fl({)41 -+b Fn(The)33 b(text)g(UI)h(no)n(w)e(displa)n(ys)g(just)h(the)h(default)f -+(command)g(\(the)g(one)g(that)g(will)g(b)r(e)h(used)e(if)i(the)f(user)f -+(just)390 2324 y(t)n(yp)r(es)22 b Fk(<return>)p Fn(\))d(instead)j(of)f -+(all)h(a)n(v)-5 b(ailable)21 b(commands.)34 b(T)n(yping)21 -+b Fk(?)h Fn(will)g(prin)n(t)f(the)i(full)f(list)g(of)g(p)r -+(ossibilities.)301 2449 y Fl({)41 b Fn(The)30 b(function)g(that)f -+(\014nds)h(the)g(canonical)e(hostname)h(of)g(the)h(lo)r(cal)f(host)g -+(\(whic)n(h)g(is)h(used,)f(for)g(example,)h(in)390 2549 -+y(calculating)k(the)h(name)g(of)g(the)g(arc)n(hiv)n(e)e(\014le)i(used)g -+(to)g(remem)n(b)r(er)f(whic)n(h)h(\014les)f(ha)n(v)n(e)g(b)r(een)h -+(sync)n(hronized\))390 2649 y(normally)k(uses)h(the)g -+Fk(gethostname)c Fn(op)r(erating)j(system)h(call.)74 -+b(Ho)n(w)n(ev)n(er,)41 b(if)g(the)f(en)n(vironmen)n(t)f(v)-5 -+b(ariable)390 2748 y Fk(UNISONLOCALHOSTNA)o(ME)31 b Fn(is)37 -+b(set,)i(its)f(v)-5 b(alue)37 b(will)g(no)n(w)g(b)r(e)h(used)f -+(instead.)65 b(This)37 b(mak)n(es)g(it)g(easier)f(to)h(use)390 -+2848 y(Unison)28 b(in)g(situations)f(where)g(a)g(mac)n(hine's)g(name)h -+(c)n(hanges)e(frequen)n(tly)h(\(e.g.,)h(b)r(ecause)f(it)h(is)g(a)f -+(laptop)g(and)390 2948 y(gets)g(mo)n(v)n(ed)g(around)g(a)g(lot\).)301 -+3073 y Fl({)41 b Fn(File)24 b(o)n(wner)f(and)h(group)f(are)g(no)n(w)g -+(displa)n(y)n(ed)g(in)h(the)h(\\detail)e(windo)n(w")g(at)h(the)g(b)r -+(ottom)h(of)f(the)g(screen,)g(when)390 3173 y(unison)k(is)f -+(con\014gured)g(to)g(sync)n(hronize)f(them.)125 3332 -+y Fj(\017)41 b Fn(F)-7 b(or)27 b(hac)n(k)n(ers:)301 3490 -+y Fl({)41 b Fn(Up)r(dated)23 b(to)g(Jacques)e(Garrigue's)g(new)h(v)n -+(ersion)f(of)i Fk(lablgtk)p Fn(,)e(whic)n(h)h(means)g(w)n(e)h(can)f -+(thro)n(w)f(a)n(w)n(a)n(y)g(our)h(lo)r(cal)390 3590 y(patc)n(hed)28 -+b(v)n(ersion.)390 3703 y(If)j(y)n(ou're)e(compiling)h(the)g(GTK)g(v)n -+(ersion)f(of)h(unison)g(from)g(sources,)f(y)n(ou'll)h(need)g(to)g(up)r -+(date)h(y)n(our)e(cop)n(y)g(of)390 3802 y(lablgtk)18 -+b(to)g(the)h(dev)n(elop)r(ers)e(release,)i(a)n(v)-5 b(ailable)17 -+b(from)h Fk(http://wwwfun.ku)o(rim)o(s.)o(kyo)o(to)o(-u)o(.ac)o(.j)o -+(p/s)o(of)o(t/o)o(la)o(bl)o(/la)o(bl)o(gtk)o(.h)o(tm)o(l)390 -+3915 y Fn(\(W)-7 b(arning:)37 b(installing)27 b(lablgtk)g(under)g -+(Windo)n(ws)h(is)f(curren)n(tly)g(a)g(bit)h(c)n(hallenging.\))301 -+4041 y Fl({)41 b Fn(The)28 b(TODO.txt)h(\014le)f(\(in)h(the)f(source)f -+(distribution\))i(has)e(b)r(een)i(cleaned)f(up)g(and)g(reorganized.)36 -+b(The)29 b(list)f(of)390 4140 y(p)r(ending)33 b(tasks)f(should)g(b)r(e) -+h(m)n(uc)n(h)g(easier)e(to)i(mak)n(e)e(sense)i(of,)g(for)g(p)r(eople)f -+(that)h(ma)n(y)f(w)n(an)n(t)g(to)g(con)n(tribute)390 -+4240 y(their)c(programming)d(energies.)36 b(There)27 -+b(is)g(also)g(a)g(separate)f(\014le)i(BUGS.txt)g(for)g(op)r(en)f(bugs.) -+301 4365 y Fl({)41 b Fn(The)28 b(Tk)f(user)g(in)n(terface)g(has)g(b)r -+(een)h(remo)n(v)n(ed)e(\(it)j(w)n(as)d(not)i(b)r(eing)f(main)n(tained)h -+(and)f(no)g(longer)g(compiles\).)301 4491 y Fl({)41 b -+Fn(The)31 b Fk(debug)e Fn(preference)h(no)n(w)g(prin)n(ts)h(quite)g(a)f -+(bit)i(of)f(additional)f(information)g(that)h(should)g(b)r(e)g(useful)h -+(for)390 4591 y(iden)n(tifying)c(sources)e(of)i(problems.)301 -+4716 y Fl({)41 b Fn(The)29 b(v)n(ersion)e(n)n(um)n(b)r(er)h(of)h(the)g -+(remote)f(serv)n(er)e(is)j(no)n(w)f(c)n(hec)n(k)n(ed)f(righ)n(t)h(a)n -+(w)n(a)n(y)f(during)h(the)h(connection)f(setup)390 4816 -+y(handshak)n(e,)h(rather)f(than)h(later.)41 b(\(Someb)r(o)r(dy)29 -+b(sen)n(t)g(a)g(bug)g(rep)r(ort)f(of)h(a)g(serv)n(er)e(crash)h(that)i -+(turned)f(out)g(to)390 4916 y(come)g(from)f(using)g(inconsisten)n(t)h -+(v)n(ersions:)37 b(b)r(etter)30 b(to)e(c)n(hec)n(k)g(this)h(earlier)f -+(and)g(in)h(a)g(w)n(a)n(y)e(that)i(can't)g(crash)390 -+5015 y(either)f(clien)n(t)f(or)g(serv)n(er.\))301 5141 -+y Fl({)41 b Fn(Unison)26 b(no)n(w)g(runs)g(correctly)e(on)i(64-bit)g -+(arc)n(hitectures)f(\(e.g.)36 b(Alpha)26 b(lin)n(ux\).)37 -+b(W)-7 b(e)27 b(will)f(not)g(b)r(e)h(distributing)390 -+5240 y(binaries)g(for)g(these)g(arc)n(hitectures)f(ourselv)n(es)g(\(at) -+h(least)g(for)g(a)g(while\))h(but)g(if)g(someone)f(w)n(ould)g(lik)n(e)g -+(to)g(mak)n(e)390 5340 y(them)h(a)n(v)-5 b(ailable,)27 -+b(w)n(e'll)g(b)r(e)h(glad)f(to)h(pro)n(vide)e(a)h(link)h(to)f(them.) -+1908 5589 y(49)p eop -+%%Page: 50 50 -+50 49 bop 125 83 a Fj(\017)41 b Fn(Bug)27 b(\014xes:)301 -+247 y Fl({)41 b Fn(P)n(attern)20 b(matc)n(hing)g(\(e.g.)35 -+b(for)20 b Fk(ignore)p Fn(\))f(is)i(no)n(w)f(case-insensitiv)n(e)f -+(when)i(Unison)g(is)g(in)g(case-insensitiv)n(e)e(mo)r(de)390 -+346 y(\(i.e.,)28 b(when)g(one)f(of)h(the)g(replicas)e(is)i(on)f(a)g -+(windo)n(ws)g(mac)n(hine\).)301 477 y Fl({)41 b Fn(Some)21 -+b(p)r(eople)f(had)h(trouble)f(with)h(m)n(ysterious)e(failures)h(during) -+h(propagation)d(of)j(up)r(dates,)h(where)e(\014les)h(w)n(ould)390 -+576 y(b)r(e)28 b(falsely)f(rep)r(orted)g(as)g(ha)n(ving)g(c)n(hanged)f -+(during)h(sync)n(hronization.)35 b(This)28 b(should)f(b)r(e)h(\014xed.) -+301 707 y Fl({)41 b Fn(Numerous)27 b(smaller)g(\014xes.)0 -+871 y(Changes)g(since)g(2.4.1:)125 1032 y Fj(\017)41 -+b Fn(Added)24 b(a)g(n)n(um)n(b)r(er)g(of)g('sorting)f(mo)r(des')h(for)g -+(the)h(user)e(in)n(terface.)35 b(By)24 b(default,)h(con\015icting)f(c)n -+(hanges)f(are)g(displa)n(y)n(ed)208 1132 y(at)28 b(the)h(top,)f(and)h -+(the)g(rest)f(of)g(the)h(en)n(tries)f(are)f(sorted)h(in)g(alphab)r -+(etical)h(order.)38 b(This)28 b(b)r(eha)n(vior)f(can)h(b)r(e)h(c)n -+(hanged)208 1231 y(in)e(the)h(follo)n(wing)f(w)n(a)n(ys:)301 -+1395 y Fl({)41 b Fn(Setting)35 b(the)f Fk(sortnewfirst)29 -+b Fn(preference)k(to)h Fk(true)f Fn(causes)g(newly)h(created)f(\014les) -+h(to)g(b)r(e)g(displa)n(y)n(ed)f(b)r(efore)390 1495 y(c)n(hanged)27 -+b(\014les.)301 1625 y Fl({)41 b Fn(Setting)28 b Fk(sortbysize)c -+Fn(causes)i(\014les)i(to)f(b)r(e)h(displa)n(y)n(ed)f(in)h(increasing)e -+(order)g(of)i(size.)301 1756 y Fl({)41 b Fn(Giving)27 -+b(the)h(preference)f Fk(sortfirst=<patte)o(rn>)21 b Fn(\(where)27 -+b Fk(<pattern>)d Fn(is)j(a)g(path)h(descriptor)e(in)i(the)g(same)390 -+1855 y(format)f(as)g('ignore')g(and)g('follo)n(w')g(patterns,)g(causes) -+g(paths)g(matc)n(hing)g(this)h(pattern)f(to)h(b)r(e)g(displa)n(y)n(ed)e -+(\014rst.)301 1986 y Fl({)41 b Fn(Similarly)-7 b(,)34 -+b(giving)d(the)j(preference)d Fk(sortlast=<pattern)o(>)c -+Fn(causes)k(paths)i(matc)n(hing)f(this)h(pattern)f(to)h(b)r(e)390 -+2085 y(displa)n(y)n(ed)27 b(last.)208 2249 y(The)38 b(sorting)g -+(preferences)g(are)g(describ)r(ed)g(in)h(more)f(detail)h(in)g(the)g -+(user)g(man)n(ual.)69 b(The)39 b Fk(sortnewfirst)34 b -+Fn(and)208 2349 y Fk(sortbysize)23 b Fn(\015ags)k(can)g(also)f(b)r(e)i -+(accessed)f(from)g(the)h('Sort')f(men)n(u)h(in)g(the)g(grpahical)e -+(user)h(in)n(terface.)125 2512 y Fj(\017)41 b Fn(Added)24 -+b(t)n(w)n(o)f(new)h(preferences)f(that)i(can)e(b)r(e)i(used)f(to)f(c)n -+(hange)g(unison's)h(fundamen)n(tal)g(b)r(eha)n(vior)e(to)i(mak)n(e)f -+(it)i(more)208 2612 y(lik)n(e)i(a)g(mirroring)f(to)r(ol)h(instead)g(of) -+h(a)f(sync)n(hronizer.)301 2776 y Fl({)41 b Fn(Giving)20 -+b(the)h(preference)e Fk(prefer)f Fn(with)i(argumen)n(t)f -+Fk(<root>)f Fn(\(b)n(y)i(adding)g Fk(-prefer)40 b(<root>)18 -+b Fn(to)i(the)g(command)390 2875 y(line)29 b(or)e Fk(prefer=<root>)p -+Fn(\))c(to)28 b(y)n(our)f(pro\014le\))h(means)f(that,)i(if)f(there)g -+(is)g(a)g(con\015ict,)g(the)h(con)n(ten)n(ts)e(of)h Fk(<root>)390 -+2975 y Fn(should)e(b)r(e)h(propagated)d(to)i(the)h(other)e(replica)h -+(\(with)h(no)f(questions)f(ask)n(ed\).)36 b(Non-con\015icting)25 -+b(c)n(hanges)g(are)390 3074 y(treated)i(as)g(usual.)301 -+3205 y Fl({)41 b Fn(Giving)36 b(the)g(preference)f Fk(force)f -+Fn(with)i(argumen)n(t)f Fk(<root>)e Fn(will)j(mak)n(e)f(unison)g -+(resolv)n(e)f Fi(al)t(l)j Fn(di\013erences)f(in)390 3305 -+y(fa)n(v)n(or)26 b(of)i(the)g(giv)n(en)e(ro)r(ot,)h(ev)n(en)g(if)h(it)g -+(w)n(as)f(the)h(other)f(replica)g(that)h(w)n(as)e(c)n(hanged.)208 -+3468 y(These)h(options)g(should)g(b)r(e)h(used)g(with)g(care!)36 -+b(\(More)27 b(information)g(is)g(a)n(v)-5 b(ailable)26 -+b(in)i(the)g(man)n(ual.\))125 3632 y Fj(\017)41 b Fn(Small)27 -+b(c)n(hanges:)301 3796 y Fl({)41 b Fn(Changed)31 b(default)h(answ)n(er) -+d(to)j('Y)-7 b(es')31 b(in)h(all)f(t)n(w)n(o-button)f(dialogs)g(in)i -+(the)f(graphical)f(in)n(terface)h(\(this)h(seems)390 -+3895 y(more)27 b(in)n(tuitiv)n(e\).)301 4026 y Fl({)41 -+b Fn(The)19 b Fk(rsync)d Fn(preference)i(has)g(b)r(een)h(remo)n(v)n(ed) -+e(\(it)i(w)n(as)f(used)g(to)h(activ)-5 b(ate)18 b(rsync)g(compression)f -+(for)h(\014le)g(transfers,)390 4125 y(but)28 b(rsync)f(compression)f -+(is)i(no)n(w)f(enabled)g(b)n(y)g(default\).)301 4256 -+y Fl({)41 b Fn(In)25 b(the)g(text)g(user)f(in)n(terface,)h(the)g(arro)n -+(ws)d(indicating)j(whic)n(h)f(direction)g(c)n(hanges)g(are)f(b)r(eing)i -+(propagated)e(are)390 4355 y(prin)n(ted)h(di\013eren)n(tly)f(when)h -+(the)g(user)f(has)g(o)n(v)n(erridded)f(Unison's)h(default)h -+(recommendation)e(\()p Fk(====>)g Fn(instead)390 4455 -+y(of)28 b Fk(---->)p Fn(\).)37 b(This)29 b(matc)n(hes)e(the)i(b)r(eha)n -+(vior)e(of)h(the)h(graphical)d(in)n(terface,)i(whic)n(h)g(displa)n(ys)f -+(suc)n(h)h(arro)n(ws)e(in)i(a)390 4555 y(di\013eren)n(t)g(color.)301 -+4685 y Fl({)41 b Fn(Carriage)25 b(returns)i(\(Con)n(trol-M's\))f(are)g -+(ignored)g(at)h(the)h(ends)f(of)g(lines)g(in)h(pro\014les,)e(for)h -+(Windo)n(ws)g(compati-)390 4785 y(bilit)n(y)-7 b(.)301 -+4915 y Fl({)41 b Fn(All)28 b(preferences)f(are)f(no)n(w)h(fully)i(do)r -+(cumen)n(ted)e(in)h(the)g(user)f(man)n(ual.)0 5079 y(Changes)g(since)g -+(2.3.12:)125 5240 y Fj(\017)41 b Fl(Incompatible)24 b(c)m(hange:)69 -+b Fn(Arc)n(hiv)n(e)21 b(format)h(has)f(c)n(hanged.)35 -+b(Mak)n(e)21 b(sure)h(y)n(ou)f(sync)n(hronize)g(y)n(our)g(replicas)g(b) -+r(efore)208 5340 y(upgrading,)26 b(to)h(a)n(v)n(oid)f(spurious)h -+(con\015icts.)37 b(The)27 b(\014rst)h(sync)f(after)g(upgrading)f(will)i -+(b)r(e)g(slo)n(w.)1908 5589 y(50)p eop -+%%Page: 51 51 -+51 50 bop 125 83 a Fj(\017)41 b Fn(New/impro)n(v)n(ed)25 -+b(functionalit)n(y:)301 249 y Fl({)41 b Fn(A)27 b(new)g(preference)f -+(-sortb)n(ysize)e(con)n(trols)h(the)i(order)f(in)h(whic)n(h)f(c)n -+(hanges)f(are)h(displa)n(y)n(ed)g(to)g(the)h(user:)36 -+b(when)390 349 y(it)28 b(is)g(set)f(to)h(true,)f(the)h(smallest)g(c)n -+(hanged)e(\014les)i(are)e(displa)n(y)n(ed)h(\014rst.)36 -+b(\(The)28 b(default)g(setting)g(is)f(false.\))301 482 -+y Fl({)41 b Fn(A)28 b(new)f(preference)g(-sortnew\014rst)f(causes)g -+(newly)i(created)e(\014les)i(to)f(b)r(e)h(listed)f(b)r(efore)h(other)e -+(up)r(dates)i(in)g(the)390 581 y(user)f(in)n(terface.)301 -+714 y Fl({)41 b Fn(W)-7 b(e)28 b(no)n(w)f(allo)n(w)g(the)h(ssh)f(proto) -+r(col)f(to)i(sp)r(ecify)g(a)f(p)r(ort.)301 847 y Fl({)41 -+b Fn(Incompatible)32 b(c)n(hange:)45 b(The)32 b(unison:)45 -+b(proto)r(col)31 b(is)h(deprecated,)h(and)e(w)n(e)h(added)g(\014le:)46 -+b(and)32 b(so)r(c)n(k)n(et:.)49 b(Y)-7 b(ou)390 946 y(ma)n(y)35 -+b(ha)n(v)n(e)f(to)i(mo)r(dify)g(y)n(our)e(pro\014les)g(in)i(the)g -+(.unison)f(directory)-7 b(.)60 b(If)36 b(a)f(replica)f(is)i(sp)r -+(eci\014ed)f(without)h(an)390 1046 y(explicit)c(proto)r(col,)f(w)n(e)f -+(no)n(w)h(assume)f(it)i(refers)e(to)h(a)g(\014le.)48 -+b(\(Previously)29 b("//saul/fo)r(o")f(mean)n(t)j(to)g(use)g(SSH)390 -+1146 y(to)h(connect)f(to)h(saul,)g(then)g(access)e(the)i(fo)r(o)g -+(directory)-7 b(.)47 b(No)n(w)31 b(it)i(means)e(to)g(access)g(saul)g -+(via)g(a)g(remote)g(\014le)390 1245 y(mec)n(hanism)c(suc)n(h)h(as)e -+(sam)n(ba;)h(the)h(old)f(e\013ect)h(is)g(no)n(w)f(ac)n(hiev)n(ed)f(b)n -+(y)i(writing)f Fk(ssh://saul/foo)p Fn(.\))301 1378 y -+Fl({)41 b Fn(Changed)32 b(the)h(startup)f(sequence)g(for)f(the)i(case)f -+(where)g(ro)r(ots)f(are)g(giv)n(en)h(but)h(no)f(pro\014le)g(is)g(giv)n -+(en)g(on)g(the)390 1478 y(command)h(line.)54 b(The)33 -+b(new)g(b)r(eha)n(vior)f(is)h(to)g(use)g(the)h(default)f(pro\014le)g -+(\(creating)f(it)i(if)f(it)h(do)r(es)f(not)g(exist\),)390 -+1577 y(and)27 b(temp)r(orarily)f(o)n(v)n(erride)f(its)i(ro)r(ots.)36 -+b(The)27 b(man)n(ual)f(claimed)h(that)g(this)g(case)g(w)n(ould)f(w)n -+(ork)g(b)n(y)h(reading)e(no)390 1677 y(pro\014le)i(at)h(all,)f(but)h -+(AF)-9 b(AIK)28 b(this)g(w)n(as)e(nev)n(er)h(true.)301 -+1810 y Fl({)41 b Fn(In)28 b(all)f(user)g(in)n(terfaces,)g(\014les)g -+(with)i(con\015icts)e(are)g(alw)n(a)n(ys)e(listed)j(\014rst)301 -+1943 y Fl({)41 b Fn(A)21 b(new)g(preference)f('ssh)n(v)n(ersion')f(can) -+h(b)r(e)h(used)g(to)g(con)n(trol)e(whic)n(h)i(v)n(ersion)e(of)i(ssh)f -+(should)h(b)r(e)g(used)g(to)f(connect)390 2042 y(to)29 -+b(the)g(serv)n(er.)38 b(Legal)28 b(v)-5 b(alues)28 b(are)g(1)h(and)f -+(2.)40 b(\(Default)30 b(is)e(empt)n(y)-7 b(,)30 b(whic)n(h)e(will)h -+(mak)n(e)f(unison)h(use)f(whatev)n(er)390 2142 y(v)n(ersion)e(of)i(ssh) -+f(is)h(installed)f(as)g(the)h(default)g('ssh')g(command.\))301 -+2275 y Fl({)41 b Fn(The)30 b(situation)f(when)h(the)g(p)r(ermissions)e -+(of)i(a)f(\014le)h(w)n(as)e(up)r(dated)i(the)g(same)f(on)g(b)r(oth)h -+(side)g(is)f(no)n(w)g(handled)390 2374 y(correctly)d(\(w)n(e)i(used)f -+(to)h(rep)r(ort)f(a)g(spurious)f(con\015ict\))125 2540 -+y Fj(\017)41 b Fn(Impro)n(v)n(emen)n(ts)26 b(for)h(the)h(Windo)n(ws)f -+(v)n(ersion:)301 2707 y Fl({)41 b Fn(The)e(fact)g(that)g(\014lenames)g -+(are)e(treated)i(case-insensitiv)n(ely)e(under)i(Windo)n(ws)f(should)h -+(no)n(w)f(b)r(e)h(handled)390 2806 y(correctly)-7 b(.)36 -+b(The)27 b(exact)g(b)r(eha)n(vior)g(is)g(describ)r(ed)g(in)h(the)g -+(cross-platform)e(section)h(of)g(the)h(man)n(ual.)301 -+2939 y Fl({)41 b Fn(It)28 b(should)g(b)r(e)g(p)r(ossible)f(to)g(sync)n -+(hronize)f(with)i(Windo)n(ws)g(shares,)e(e.g.,)h(//host/driv)n(e/path.) -+301 3072 y Fl({)41 b Fn(W)-7 b(ork)i(arounds)29 b(to)h(the)h(bug)f(in)h -+(syncing)e(ro)r(ot)h(directories)f(in)i(Windo)n(ws.)44 -+b(The)31 b(most)f(di\016cult)h(thing)g(to)f(\014x)390 -+3171 y(is)e(an)f(o)r(caml)g(bug:)37 b(Unix.op)r(endir)28 -+b(fails)f(on)g(c:)37 b(in)28 b(some)f(v)n(ersions)f(of)h(Windo)n(ws.) -+125 3337 y Fj(\017)41 b Fn(Impro)n(v)n(emen)n(ts)26 b(to)h(the)h(GTK)f -+(user)g(in)n(terface)g(\(the)i(Tk)e(in)n(terface)g(is)g(no)h(longer)e -+(b)r(eing)i(main)n(tained\):)301 3504 y Fl({)41 b Fn(The)29 -+b(UI)f(no)n(w)g(displa)n(ys)g(actions)f(di\013eren)n(tly)i(\(in)f -+(blue\))h(when)g(they)g(ha)n(v)n(e)e(b)r(een)i(explicitly)f(c)n(hanged) -+g(b)n(y)g(the)390 3603 y(user)f(from)g(Unison's)h(default)g -+(recommendation.)301 3736 y Fl({)41 b Fn(More)27 b(colorful)g(app)r -+(earance.)301 3869 y Fl({)41 b Fn(The)28 b(initial)g(pro\014le)f -+(selection)g(windo)n(w)g(w)n(orks)f(b)r(etter.)301 4002 -+y Fl({)41 b Fn(If)27 b(an)n(y)e(transfers)g(failed,)h(a)g(message)e(to) -+i(this)g(e\013ect)h(is)e(displa)n(y)n(ed)g(along)g(with)i('Sync)n -+(hronization)d(complete')390 4101 y(at)k(the)g(end)f(of)h(the)g -+(transfer)f(phase)g(\(in)h(case)f(they)g(ma)n(y)g(ha)n(v)n(e)g -+(scrolled)f(o\013)i(the)g(top\).)301 4234 y Fl({)41 b -+Fn(Added)24 b(a)e(global)g(progress)e(meter,)k(displa)n(ying)e(the)h(p) -+r(ercen)n(tage)e(of)i Fi(total)g Fn(b)n(ytes)g(that)g(ha)n(v)n(e)e(b)r -+(een)i(transferred)390 4334 y(so)k(far.)125 4500 y Fj(\017)41 -+b Fn(Impro)n(v)n(emen)n(ts)26 b(to)h(the)h(text)g(user)f(in)n(terface:) -+301 4666 y Fl({)41 b Fn(The)28 b(\014le)g(details)f(will)h(b)r(e)g -+(displa)n(y)n(ed)e(automatically)h(when)h(a)f(con\015ict)g(is)h(b)r -+(een)g(detected.)301 4799 y Fl({)41 b Fn(when)32 b(a)g(w)n(arning)e(is) -+i(generated)f(\(e.g.)49 b(for)32 b(a)f(temp)r(orary)g(\014le)h(left)h -+(o)n(v)n(er)d(from)h(a)h(previous)e(run)i(of)g(unison\))390 -+4898 y(Unison)c(will)g(no)f(longer)f(w)n(ait)h(for)g(a)h(resp)r(onse)e -+(if)i(it)g(is)g(running)f(in)h(-batc)n(h)f(mo)r(de.)301 -+5031 y Fl({)41 b Fn(The)28 b(UI)g(no)n(w)f(displa)n(ys)f(a)h(short)g -+(list)h(of)g(p)r(ossible)f(inputs)h(eac)n(h)f(time)h(it)g(w)n(aits)f -+(for)g(user)g(in)n(teraction.)301 5164 y Fl({)41 b Fn(The)33 -+b(UI)g(no)n(w)f(quits)h(immediately)g(\(rather)f(than)h(lo)r(oping)f -+(bac)n(k)f(and)i(starting)f(the)h(in)n(teraction)f(again\))g(if)390 -+5264 y(the)c(user)f(presses)g('q')g(when)h(ask)n(ed)e(whether)i(to)f -+(propagate)f(c)n(hanges.)1908 5589 y(51)p eop -+%%Page: 52 52 -+52 51 bop 301 83 a Fl({)41 b Fn(Pressing)21 b('g')h(in)h(the)g(text)g -+(user)f(in)n(terface)g(will)h(pro)r(ceed)f(immediately)g(with)h -+(propagating)e(up)r(dates,)j(without)390 183 y(asking)j(an)n(y)f(more)h -+(questions.)125 349 y Fj(\017)41 b Fn(Do)r(cumen)n(tation)27 -+b(and)h(installation)f(c)n(hanges:)301 515 y Fl({)41 -+b Fn(The)32 b(man)n(ual)f(no)n(w)g(includes)g(a)g(F)-9 -+b(A)n(Q,)31 b(plus)h(sections)f(on)g(common)g(problems)g(and)g(on)h -+(tric)n(ks)e(con)n(tributed)390 614 y(b)n(y)e(users.)301 -+747 y Fl({)41 b Fn(Both)33 b(the)g(do)n(wnload)e(page)h(and)h(the)g(do) -+n(wnload)f(directory)f(explicitly)i(sa)n(y)f(what)g(are)g(the)h(curren) -+n(t)f(stable)390 847 y(and)c(b)r(eta-test)f(v)n(ersion)f(n)n(um)n(b)r -+(ers.)301 980 y Fl({)41 b Fn(The)27 b(OCaml)e(sources)g(for)h(the)h -+(up-to-the-min)n(ute)f(dev)n(elop)r(ers')f(v)n(ersion)g(\(not)i(guaran) -+n(teed)e(to)h(b)r(e)h(stable,)f(or)390 1079 y(ev)n(en)h(to)h(compile,)f -+(at)h(an)n(y)f(giv)n(en)f(time!\))38 b(are)27 b(no)n(w)g(a)n(v)-5 -+b(ailable)26 b(from)h(the)h(do)n(wnload)e(page.)301 1212 -+y Fl({)41 b Fn(Added)21 b(a)e(subsection)h(to)f(the)i(man)n(ual)e -+(describing)g(cross-platform)e(issues)j(\(case)f(con\015icts,)i -+(illegal)e(\014lenames\))125 1378 y Fj(\017)41 b Fn(Man)n(y)26 -+b(small)i(bug)f(\014xes)g(and)h(random)e(impro)n(v)n(emen)n(ts.)0 -+1544 y(Changes)h(since)g(2.3.1:)125 1710 y Fj(\017)41 -+b Fn(Sev)n(eral)32 b(bug)i(\014xes.)56 b(The)34 b(most)f(imp)r(ortan)n -+(t)h(is)g(a)f(bug)h(in)g(the)h(rsync)e(mo)r(dule)h(that)g(w)n(ould)g(o) -+r(ccasionally)e(cause)208 1810 y(c)n(hange)26 b(propagation)f(to)j -+(fail)g(with)g(a)f('rename')g(error.)0 1976 y(Changes)g(since)g(2.2:) -+125 2142 y Fj(\017)41 b Fn(The)27 b(m)n(ulti-threaded)g(transp)r(ort)g -+(system)g(is)h(no)n(w)f(disabled)g(b)n(y)g(default.)38 -+b(\(It)28 b(is)g(not)f(stable)g(enough)g(y)n(et.\))125 -+2308 y Fj(\017)41 b Fn(V)-7 b(arious)26 b(bug)h(\014xes.)125 -+2474 y Fj(\017)41 b Fn(A)27 b(new)h(exp)r(erimen)n(tal)f(feature:)208 -+2607 y(The)34 b(\014nal)h(comp)r(onen)n(t)f(of)g(a)g(-path)h(argumen)n -+(t)e(ma)n(y)h(no)n(w)g(b)r(e)h(the)g(wildcard)f(sp)r(eci\014er)g -+Fk(*)p Fn(.)57 b(When)35 b(Unison)g(sees)208 2707 y(suc)n(h)28 -+b(a)h(path,)g(it)g(expands)f(this)i(path)f(on)f(the)h(clien)n(t)g(in)n -+(to)g(in)n(to)g(the)g(corresp)r(onding)e(list)i(of)g(paths)f(b)n(y)h -+(listing)g(the)208 2806 y(con)n(ten)n(ts)d(of)i(that)g(directory)-7 -+b(.)208 2939 y(Note)29 b(that)h(if)h(y)n(ou)e(use)g(wildcard)g(paths)h -+(from)f(the)h(command)g(line,)g(y)n(ou)f(will)h(probably)f(need)h(to)f -+(use)h(quotes)f(or)208 3039 y(a)e(bac)n(kslash)f(to)h(prev)n(en)n(t)g -+(the)h(*)f(from)g(b)r(eing)h(in)n(terpreted)f(b)n(y)g(y)n(our)g(shell.) -+208 3171 y(If)k(b)r(oth)g(ro)r(ots)f(are)g(lo)r(cal,)i(the)f(con)n(ten) -+n(ts)f(of)h(the)g(\014rst)g(one)g(will)g(b)r(e)g(used)g(for)g -+(expanding)f(wildcard)g(paths.)47 b(\(Nb:)208 3271 y(this)28 -+b(is)g(the)g(\014rst)g(one)g Fi(after)g Fn(the)h(canonization)e(step)h -+({)f(i.e.,)i(the)f(one)g(that)g(is)g(listed)g(\014rst)g(in)g(the)h -+(user)e(in)n(terface)g({)208 3371 y(not)g(the)h(one)f(listed)h(\014rst) -+g(on)f(the)h(command)f(line)h(or)f(in)g(the)h(preferences)f(\014le.\))0 -+3537 y(Changes)g(since)g(2.1:)125 3703 y Fj(\017)41 b -+Fn(The)29 b(transp)r(ort)e(subsystem)i(no)n(w)f(includes)h(an)g -+(implemen)n(tation)g(b)n(y)g(Sylv)-5 b(ain)28 b(Gommier)h(and)g(Norman) -+f(Ramsey)208 3802 y(of)k(T)-7 b(ridgell)32 b(and)g(Mac)n(k)n(erras's)e -+Fk(rsync)g Fn(proto)r(col.)51 b(This)33 b(proto)r(col)e(ac)n(hiev)n(es) -+g(m)n(uc)n(h)h(faster)g(transfers)g(when)g(only)208 3902 -+y(a)e(small)h(part)f(of)h(a)f(large)g(\014le)h(has)f(b)r(een)i(c)n -+(hanged)e(b)n(y)g(sending)h(just)g(di\013s.)48 b(This)31 -+b(feature)f(is)h(mainly)g(helpful)h(for)208 4002 y(transfers)23 -+b(o)n(v)n(er)g(slo)n(w)h(links|on)g(fast)h(lo)r(cal)f(area)g(net)n(w)n -+(orks)f(it)i(can)f(actually)g(degrade)g(p)r(erformance|so)f(w)n(e)h(ha) -+n(v)n(e)208 4101 y(left)i(it)f(o\013)h(b)n(y)f(default.)36 -+b(Start)25 b(unison)g(with)h(the)g Fk(-rsync)d Fn(option)i(\(or)g(put)g -+Fk(rsync=true)d Fn(in)j(y)n(our)f(preferences)h(\014le\))208 -+4201 y(to)i(turn)h(it)g(on.)125 4367 y Fj(\017)41 b Fn(\\Progress)20 -+b(bars")i(are)g(no)n(w)h(dipla)n(y)n(ed)g(during)g(remote)g(\014le)h -+(transfers,)f(sho)n(wing)g(what)g(p)r(ercen)n(tage)g(of)g(eac)n(h)g -+(\014le)h(has)208 4467 y(b)r(een)k(transferred)e(so)h(far.)125 -+4633 y Fj(\017)41 b Fn(The)24 b(v)n(ersion)f(n)n(um)n(b)r(ering)h(sc)n -+(heme)g(has)g(c)n(hanged.)35 b(New)25 b(releases)e(will)i(no)n(w)f(b)r -+(e)h(ha)n(v)n(e)e(n)n(um)n(b)r(ers)h(lik)n(e)g(2.2.30,)g(where)208 -+4732 y(the)32 b(second)g(comp)r(onen)n(t)g(is)g(incremen)n(ted)g(on)g -+(ev)n(ery)f(signi\014can)n(t)h(public)h(release)e(and)h(the)h(third)f -+(comp)r(onen)n(t)g(is)208 4832 y(the)c(\\patc)n(h)e(lev)n(el.")125 -+4998 y Fj(\017)41 b Fn(Miscellaneous)26 b(impro)n(v)n(emen)n(ts)g(to)i -+(the)g(GTK-based)e(user)h(in)n(terface.)125 5164 y Fj(\017)41 -+b Fn(The)27 b(man)n(ual)g(is)h(no)n(w)f(a)n(v)-5 b(ailable)26 -+b(in)i(PDF)g(format.)1908 5589 y(52)p eop -+%%Page: 53 53 -+53 52 bop 125 83 a Fj(\017)41 b Fn(W)-7 b(e)38 b(are)f(exp)r(erimen)n -+(ting)h(with)h(using)f(a)f(m)n(ulti-threaded)h(transp)r(ort)f -+(subsystem)h(to)g(transfer)g(sev)n(eral)e(\014les)i(at)208 -+183 y(the)32 b(same)f(time,)i(making)e(m)n(uc)n(h)h(more)f(e\013ectiv)n -+(e)g(use)h(of)g(a)n(v)-5 b(ailable)30 b(net)n(w)n(ork)g(bandwidth.)50 -+b(This)32 b(feature)f(is)h(not)208 282 y(completely)27 -+b(stable)g(y)n(et,)h(so)f(b)n(y)g(default)h(it)g(is)g(disabled)f(in)h -+(the)g(release)e(v)n(ersion)g(of)h(Unison.)208 415 y(If)h(y)n(ou)f(w)n -+(an)n(t)g(to)g(pla)n(y)g(with)h(the)g(m)n(ulti-threaded)g(v)n(ersion,)e -+(y)n(ou'll)h(need)h(to)f(recompile)g(Unison)h(from)f(sources)f(\(as)208 -+515 y(describ)r(ed)31 b(in)h(the)g(do)r(cumen)n(tation\),)h(setting)e -+(the)h(THREADS)h(\015ag)d(in)i(Mak)n(e\014le.OCaml)f(to)g(true.)49 -+b(Mak)n(e)31 b(sure)208 614 y(that)22 b(y)n(our)f(OCaml)g(compiler)h -+(has)f(b)r(een)i(installed)f(with)h(the)f Fk(-with-pthreads)17 -+b Fn(con\014guration)j(option.)35 b(\(Y)-7 b(ou)22 b(can)208 -+714 y(v)n(erify)f(this)i(b)n(y)f(c)n(hec)n(king)f(whether)h(the)g -+(\014le)h Fk(threads/threads.)o(cm)o(a)16 b Fn(in)23 -+b(the)g(OCaml)e(standard)g(library)g(directory)208 814 -+y(con)n(tains)26 b(the)i(string)f Fk(-lpthread)d Fn(near)j(the)h -+(end.\))0 980 y(Changes)f(since)g(1.292:)125 1146 y Fj(\017)41 -+b Fn(Reduced)26 b(memory)g(fo)r(otprin)n(t)h(\(this)g(is)g(esp)r -+(ecially)f(imp)r(ortan)n(t)g(during)g(the)i(\014rst)e(run)g(of)h -+(unison,)g(where)f(it)h(has)f(to)208 1245 y(gather)g(information)h(ab)r -+(out)h(all)f(the)h(\014les)f(in)h(b)r(oth)g(rep)r(ositories\).)125 -+1411 y Fj(\017)41 b Fn(Fixed)27 b(a)h(bug)f(that)h(w)n(ould)f(cause)g -+(the)h(so)r(c)n(k)n(et)e(serv)n(er)g(under)i(NT)f(to)h(fail)g(after)f -+(the)h(clien)n(t)g(exits.)125 1577 y Fj(\017)41 b Fn(Added)31 -+b(a)g(SHIFT)h(mo)r(di\014er)f(to)g(the)g(Ignore)f(men)n(u)h(shortcut)g -+(k)n(eys)f(in)i(GTK)e(in)n(terface)h(\(to)g(a)n(v)n(oid)f(hitting)i -+(them)208 1677 y(acciden)n(tally\).)0 1843 y(Changes)27 -+b(since)g(1.231:)125 2009 y Fj(\017)41 b Fn(T)-7 b(unneling)22 -+b(o)n(v)n(er)f(ssh)h(is)g(no)n(w)g(supp)r(orted)g(in)h(the)f(Windo)n -+(ws)g(v)n(ersion.)34 b(See)22 b(the)h(installation)f(section)g(of)g -+(the)h(man)n(ual)208 2109 y(for)k(detailed)g(instructions.)125 -+2275 y Fj(\017)41 b Fn(The)d(transp)r(ort)g(subsystem)g(no)n(w)g -+(includes)h(an)f(implemen)n(tation)h(of)g(the)g Fk(rsync)d -+Fn(proto)r(col,)k(built)g(b)n(y)e(Sylv)-5 b(ain)208 2374 -+y(Gommier)29 b(and)h(Norman)g(Ramsey)-7 b(.)44 b(This)30 -+b(proto)r(col)f(ac)n(hiev)n(es)g(m)n(uc)n(h)h(faster)g(transfers)f -+(when)h(only)g(a)g(small)g(part)208 2474 y(of)c(a)f(large)g(\014le)h -+(has)g(b)r(een)g(c)n(hanged)f(b)n(y)h(sending)g(just)h(di\013s.)36 -+b(The)27 b(rsync)e(feature)h(is)g(o\013)g(b)n(y)g(default)g(in)g(the)h -+(curren)n(t)208 2574 y(v)n(ersion.)41 b(Use)30 b(the)g -+Fk(-rsync)d Fn(switc)n(h)j(to)g(turn)f(it)h(on.)43 b(\(Nb.)h(W)-7 -+b(e)31 b(still)f(ha)n(v)n(e)e(a)h(lot)h(of)g(tuning)g(to)f(do:)41 -+b(y)n(ou)29 b(ma)n(y)g(not)208 2673 y(notice)e(m)n(uc)n(h)g(sp)r(eedup) -+h(y)n(et.\))125 2839 y Fj(\017)41 b Fn(W)-7 b(e're)35 -+b(exp)r(erimen)n(ting)g(with)h(a)f(m)n(ulti-threaded)g(transp)r(ort)f -+(subsystem,)k(written)d(b)n(y)g(Jerome)g(V)-7 b(ouillon.)60 -+b(The)208 2939 y(do)n(wnloadable)30 b(binaries)i(are)f(still)i -+(single-threaded:)45 b(if)33 b(y)n(ou)f(w)n(an)n(t)f(to)i(try)f(the)g -+(m)n(ulti-threaded)h(v)n(ersion,)f(y)n(ou'll)208 3039 -+y(need)27 b(to)h(recompile)f(from)g(sources.)36 b(\(Sa)n(y)27 -+b Fk(make)42 b(THREADS=true)p Fn(.\))32 b(Nativ)n(e)c(thread)f(supp)r -+(ort)g(from)h(the)g(compiler)208 3138 y(is)h(required.)41 -+b(Use)29 b(the)h(option)f Fk(-threads)40 b(N)29 b Fn(to)g(select)g(the) -+h(maximal)f(n)n(um)n(b)r(er)g(of)g(concurren)n(t)f(threads)g(\(default) -+208 3238 y(is)f(5\).)37 b(Multi-threaded)27 b(and)h(single-threaded)e -+(clien)n(ts/serv)n(ers)f(can)i(in)n(terop)r(erate.)125 -+3404 y Fj(\017)41 b Fn(A)28 b(new)g(GTK-based)e(user)h(in)n(terface)g -+(is)h(no)n(w)f(a)n(v)-5 b(ailable,)27 b(thanks)g(to)h(Jacques)e -+(Garrigue.)36 b(The)28 b(Tk)g(user)f(in)n(terface)208 -+3504 y(still)g(w)n(orks,)f(but)j(w)n(e'll)e(b)r(e)h(shifting)g(dev)n -+(elopmen)n(t)f(e\013ort)g(to)h(the)g(GTK)f(in)n(terface)g(from)g(no)n -+(w)g(on.)125 3670 y Fj(\017)41 b Fn(OCaml)24 b(3.00)g(is)h(no)n(w)f -+(required)g(for)h(compiling)f(Unison)h(from)g(sources.)34 -+b(The)26 b(mo)r(dules)f Fk(uitk)e Fn(and)i Fk(myfileselect)208 -+3769 y Fn(ha)n(v)n(e)35 b(b)r(een)i(c)n(hanged)f(to)h(use)f(labltk)h -+(instead)f(of)h(camltk.)64 b(T)-7 b(o)37 b(compile)f(the)h(Tk)g(in)n -+(terface)f(in)h(Windo)n(ws,)i(y)n(ou)208 3869 y(m)n(ust)32 -+b(ha)n(v)n(e)f(o)r(caml-3.00)g(and)h(tk8.3.)51 b(When)33 -+b(installing)f(tk8.3,)h(put)g(it)g(in)g Fk(c:\\Tcl)d -+Fn(rather)i(than)g(the)h(suggested)208 3968 y Fk(c:\\Program)39 -+b(Files\\Tcl)p Fn(,)30 b(and)i(b)r(e)h(sure)f(to)g(install)g(the)h -+(headers)e(and)i(libraries)e(\(whic)n(h)h(are)g(not)g(installed)g(b)n -+(y)208 4068 y(default\).)125 4234 y Fj(\017)41 b Fn(Added)33 -+b(a)f(new)g Fk(-addversionno)27 b Fn(switc)n(h,)34 b(whic)n(h)e(causes) -+f(unison)h(to)h(use)f Fk(unison-<currentv)o(ers)o(io)o(nn)o(umb)o(er)o -+(>)208 4334 y Fn(instead)37 b(of)h(just)h Fk(unison)c -+Fn(as)j(the)g(remote)f(serv)n(er)g(command.)67 b(This)38 -+b(allo)n(ws)f(m)n(ultiple)h(v)n(ersions)f(of)g(unison)h(to)208 -+4433 y(co)r(exist)28 b(con)n(v)n(enien)n(tly)g(on)h(the)h(same)f(serv)n -+(er:)38 b(whic)n(hev)n(er)28 b(v)n(ersion)f(is)j(run)f(on)g(the)g -+(clien)n(t,)h(the)g(same)e(v)n(ersion)g(will)208 4533 -+y(b)r(e)g(selected)f(on)g(the)h(serv)n(er.)0 4699 y(Changes)f(since)g -+(1.219:)125 4865 y Fj(\017)41 b Fl(Incompatible)24 b(c)m(hange:)69 -+b Fn(Arc)n(hiv)n(e)21 b(format)h(has)f(c)n(hanged.)35 -+b(Mak)n(e)21 b(sure)h(y)n(ou)f(sync)n(hronize)g(y)n(our)g(replicas)g(b) -+r(efore)208 4965 y(upgrading,)26 b(to)h(a)n(v)n(oid)f(spurious)h -+(con\015icts.)37 b(The)27 b(\014rst)h(sync)f(after)g(upgrading)f(will)i -+(b)r(e)g(slo)n(w.)125 5131 y Fj(\017)41 b Fn(This)27 -+b(v)n(ersion)f(\014xes)h(sev)n(eral)f(anno)n(ying)g(bugs,)i(including:) -+301 5297 y Fl({)41 b Fn(Some)28 b(cases)e(where)h(propagation)f(of)h -+(\014le)h(p)r(ermissions)f(w)n(as)f(not)i(w)n(orking.)1908 -+5589 y(53)p eop -+%%Page: 54 54 -+54 53 bop 301 83 a Fl({)41 b Fn(umask)27 b(is)h(no)n(w)f(ignored)f -+(when)i(creating)e(directories)301 216 y Fl({)41 b Fn(directories)26 -+b(are)h(create)g(writable,)g(so)g(that)h(a)f(read-only)f(directory)g -+(and)h(its)h(con)n(ten)n(ts)f(can)g(b)r(e)h(propagated.)301 -+349 y Fl({)41 b Fn(Handling)28 b(of)f(w)n(arnings)f(generated)h(b)n(y)g -+(the)h(serv)n(er.)301 482 y Fl({)41 b Fn(Sync)n(hronizing)26 -+b(a)i(path)f(whose)g(paren)n(t)g(is)h(not)f(a)g(directory)g(on)g(b)r -+(oth)h(sides)f(is)h(no)n(w)f(\015agged)f(as)h(erroneous.)301 -+614 y Fl({)41 b Fn(Fixed)28 b(some)f(bugs)g(related)g(to)h(symn)n(b)r -+(olic)f(links)g(and)h(nonexistan)n(t)f(ro)r(ots.)462 -+747 y Fj(\003)41 b Fn(When)33 b(a)f(c)n(hange)f(\(deletion)i(or)e(new)h -+(con)n(ten)n(ts\))g(is)g(propagated)f(on)n(to)g(a)h('follo)n(w'ed)g -+(symlink,)h(the)g(\014le)545 847 y(p)r(oin)n(ted)e(to)e(b)n(y)h(the)h -+(link)f(is)f(no)n(w)h(c)n(hanged.)43 b(\(W)-7 b(e)30 -+b(used)g(to)g(c)n(hange)f(the)h(link)g(itself,)i(whic)n(h)d(do)r(esn't) -+i(\014t)545 946 y(our)c(assertion)f(that)i('follo)n(w')f(means)g(the)h -+(link)g(is)g(completely)f(in)n(visible\))462 1063 y Fj(\003)41 -+b Fn(When)34 b(one)f(ro)r(ot)f(did)i(not)f(exist,)i(propagating)c(the)i -+(other)g(ro)r(ot)g(on)f(top)i(of)f(it)g(used)h(to)f(fail,)h(b)r(ecuase) -+545 1162 y(unison)25 b(could)h(not)f(calculate)f(the)i(w)n(orking)d -+(directory)h(in)n(to)h(whic)n(h)h(to)f(write)g(c)n(hanges.)34 -+b(This)26 b(should)f(b)r(e)545 1262 y(\014xed.)125 1428 -+y Fj(\017)41 b Fn(A)27 b(h)n(uman-readable)f(timestamp)i(has)f(b)r(een) -+h(added)g(to)f(Unison's)h(arc)n(hiv)n(e)d(\014les.)125 -+1594 y Fj(\017)41 b Fn(The)27 b(seman)n(tics)g(of)h(P)n(ath)e(and)i -+(Name)f(regular)f(expressions)g(no)n(w)h(corresp)r(ond)f(b)r(etter.)125 -+1760 y Fj(\017)41 b Fn(Some)27 b(minor)g(impro)n(v)n(emen)n(ts)f(to)i -+(the)g(text)g(UI)f(\(e.g.)37 b(a)27 b(command)h(for)f(going)f(bac)n(k)h -+(to)g(previous)g(items\))125 1926 y Fj(\017)41 b Fn(The)32 -+b(organization)e(of)i(the)h(exp)r(ort)f(directory)f(has)h(c)n(hanged)f -+(|)h(should)g(b)r(e)h(easier)e(to)h(\014nd)h(/)f(do)n(wnload)f(things) -+208 2026 y(no)n(w.)0 2192 y(Changes)c(since)g(1.200:)125 -+2358 y Fj(\017)41 b Fl(Incompatible)24 b(c)m(hange:)69 -+b Fn(Arc)n(hiv)n(e)21 b(format)h(has)f(c)n(hanged.)35 -+b(Mak)n(e)21 b(sure)h(y)n(ou)f(sync)n(hronize)g(y)n(our)g(replicas)g(b) -+r(efore)208 2457 y(upgrading,)26 b(to)h(a)n(v)n(oid)f(spurious)h -+(con\015icts.)37 b(The)27 b(\014rst)h(sync)f(after)g(upgrading)f(will)i -+(b)r(e)g(slo)n(w.)125 2623 y Fj(\017)41 b Fn(This)27 -+b(v)n(ersion)f(has)h(not)h(b)r(een)g(tested)g(extensiv)n(ely)f(on)g -+(Windo)n(ws.)125 2790 y Fj(\017)41 b Fn(Ma)5 b(jor)22 -+b(in)n(ternal)i(c)n(hanges)f(designed)g(to)h(mak)n(e)g(unison)g(safer)f -+(to)h(run)g(at)g(the)h(same)e(time)i(as)e(the)i(replicas)e(are)g(b)r -+(eing)208 2889 y(c)n(hanged)j(b)n(y)h(the)h(user.)125 -+3055 y Fj(\017)41 b Fn(In)n(ternal)26 b(p)r(erformance)h(impro)n(v)n -+(emen)n(ts.)0 3221 y(Changes)g(since)g(1.190:)125 3387 -+y Fj(\017)41 b Fl(Incompatible)24 b(c)m(hange:)69 b Fn(Arc)n(hiv)n(e)21 -+b(format)h(has)f(c)n(hanged.)35 b(Mak)n(e)21 b(sure)h(y)n(ou)f(sync)n -+(hronize)g(y)n(our)g(replicas)g(b)r(efore)208 3487 y(upgrading,)26 -+b(to)h(a)n(v)n(oid)f(spurious)h(con\015icts.)37 b(The)27 -+b(\014rst)h(sync)f(after)g(upgrading)f(will)i(b)r(e)g(slo)n(w.)125 -+3653 y Fj(\017)41 b Fn(A)29 b(n)n(um)n(b)r(er)g(of)g(in)n(ternal)f -+(functions)h(ha)n(v)n(e)f(b)r(een)i(c)n(hanged)e(to)g(reduce)h(the)g -+(amoun)n(t)g(of)g(memory)f(allo)r(cation,)g(esp)r(e-)208 -+3753 y(cially)f(during)g(the)h(\014rst)f(sync)n(hronization.)35 -+b(This)28 b(should)f(help)h(p)r(o)n(w)n(er)e(users)h(with)h(v)n(ery)f -+(big)g(replicas.)125 3919 y Fj(\017)41 b Fn(Reimplemen)n(tation)29 -+b(of)g(lo)n(w-lev)n(el)e(remote)i(pro)r(cedure)f(call)h(stu\013,)h(in)g -+(preparation)d(for)i(adding)f(rsync-lik)n(e)g(smart)208 -+4018 y(\014le)f(transfer)g(in)h(a)f(later)g(release.)125 -+4184 y Fj(\017)41 b Fn(Miscellaneous)26 b(bug)h(\014xes.)0 -+4350 y(Changes)g(since)g(1.180:)125 4516 y Fj(\017)41 -+b Fl(Incompatible)24 b(c)m(hange:)69 b Fn(Arc)n(hiv)n(e)21 -+b(format)h(has)f(c)n(hanged.)35 b(Mak)n(e)21 b(sure)h(y)n(ou)f(sync)n -+(hronize)g(y)n(our)g(replicas)g(b)r(efore)208 4616 y(upgrading,)26 -+b(to)h(a)n(v)n(oid)f(spurious)h(con\015icts.)37 b(The)27 -+b(\014rst)h(sync)f(after)g(upgrading)f(will)i(b)r(e)g(slo)n(w.)125 -+4782 y Fj(\017)41 b Fn(Fixed)27 b(some)g(small)h(bugs)f(in)h(the)g(in)n -+(terpretation)e(of)i(ignore)e(patterns.)125 4948 y Fj(\017)41 -+b Fn(Fixed)33 b(some)f(problems)h(that)g(w)n(ere)f(prev)n(en)n(ting)g -+(the)i(Windo)n(ws)e(v)n(ersion)g(from)h(w)n(orking)e(correctly)h(when)h -+(clic)n(k-)208 5048 y(started.)125 5214 y Fj(\017)41 -+b Fn(Fixes)24 b(to)h(treatmen)n(t)f(of)h(\014le)g(p)r(ermissions)f -+(under)g(Windo)n(ws,)h(whic)n(h)g(w)n(ere)f(causing)g(spurious)g(rep)r -+(orts)f(of)i(di\013eren)n(t)208 5313 y(p)r(ermissions)h(when)i(sync)n -+(hronizing)e(b)r(et)n(w)n(een)h(windo)n(ws)g(and)h(unix)g(systems.)1908 -+5589 y(54)p eop -+%%Page: 55 55 -+55 54 bop 125 83 a Fj(\017)41 b Fn(Fixed)36 b(one)g(more)g -+(non-tail-recursiv)n(e)d(list)k(pro)r(cessing)e(function,)k(whic)n(h)d -+(w)n(as)g(causing)f(stac)n(k)g(o)n(v)n(er\015o)n(ws)f(when)208 -+183 y(sync)n(hronizing)25 b(v)n(ery)i(large)f(replicas.)0 -+349 y(Changes)h(since)g(1.169:)125 515 y Fj(\017)41 b -+Fn(The)27 b(text)h(user)f(in)n(terface)g(no)n(w)g(pro)n(vides)f -+(commands)h(for)g(ignoring)f(\014les.)125 681 y Fj(\017)41 -+b Fn(W)-7 b(e)35 b(found)h(and)g(\014xed)f(some)g Fi(mor)l(e)h -+Fn(non-tail-recursiv)n(e)d(list)i(pro)r(cessing)f(functions.)61 -+b(Some)35 b(p)r(o)n(w)n(er)g(users)f(ha)n(v)n(e)208 780 -+y(rep)r(orted)26 b(success)h(with)h(v)n(ery)f(large)f(replicas.)125 -+946 y Fj(\017)41 b Fl(Incompatible)e(c)m(hange:)54 b -+Fn(Files)35 b(ending)h(in)g Fk(.tmp)e Fn(are)h(no)h(longer)e(ignored)h -+(automatically)-7 b(.)60 b(If)36 b(y)n(ou)f(w)n(an)n(t)g(to)208 -+1046 y(ignore)26 b(suc)n(h)h(\014les,)h(put)g(an)f(appropriate)f -+(ignore)g(pattern)i(in)g(y)n(our)e(pro\014le.)125 1212 -+y Fj(\017)41 b Fl(Incompatible)28 b(c)m(hange:)72 b Fn(The)25 -+b(syn)n(tax)g(of)h Fk(ignore)d Fn(and)j Fk(follow)d Fn(patterns)i(has)g -+(c)n(hanged.)35 b(Instead)26 b(of)f(putting)208 1312 -+y(a)i(line)h(of)f(the)h(form)949 1511 y Fk(ignore)41 -+b(=)i(<regexp>)208 1710 y Fn(in)27 b(y)n(our)g(pro\014le)g(\()p -+Fk(.unison/default.)o(pr)o(f)p Fn(\),)22 b(y)n(ou)27 -+b(should)g(put:)949 1910 y Fk(ignore)41 b(=)i(Regexp)e(<regexp>)208 -+2109 y Fn(Moreo)n(v)n(er,)24 b(t)n(w)n(o)j(other)g(st)n(yles)g(of)h -+(pattern)f(are)g(also)f(recognized:)949 2308 y Fk(ignore)41 -+b(=)i(Name)f(<name>)208 2507 y Fn(matc)n(hes)27 b(an)n(y)f(path)i(in)g -+(whic)n(h)g(one)f(comp)r(onen)n(t)g(matc)n(hes)g Fk(<name>)p -+Fn(,)e(while)949 2707 y Fk(ignore)41 b(=)i(Path)f(<path>)208 -+2906 y Fn(matc)n(hes)27 b(exactly)g(the)h(path)f Fk(<path>)p -+Fn(.)208 3039 y(Standard)g(\\globbing")e(con)n(v)n(en)n(tions)h(can)h -+(b)r(e)h(used)g(in)g Fk(<name>)d Fn(and)i Fk(<path>)p -+Fn(:)301 3205 y Fl({)41 b Fn(a)27 b Fk(?)h Fn(matc)n(hes)f(an)n(y)f -+(single)i(c)n(haracter)d(except)j Fk(/)301 3337 y Fl({)41 -+b Fn(a)27 b Fk(*)h Fn(matc)n(hes)f(an)n(y)f(sequence)i(of)f(c)n -+(haracters)e(not)j(including)g Fk(/)301 3470 y Fl({)41 -+b Fk([xyz])26 b Fn(matc)n(hes)h(an)n(y)g(c)n(haracter)e(from)i(the)h -+(set)g Fj(f)p Fk(x)p Fa(;)14 b Fk(y)p Fa(;)g Fk(z)p Fj(g)301 -+3603 y Fl({)41 b Fk({a,bb,ccc})24 b Fn(matc)n(hes)j(an)n(y)g(one)g(of)g -+Fk(a)p Fn(,)h Fk(bb)p Fn(,)f(or)f Fk(ccc)p Fn(.)208 3769 -+y(See)h(the)h(user)f(man)n(ual)g(for)g(some)g(examples.)0 -+3935 y(Changes)g(since)g(1.146:)125 4101 y Fj(\017)41 -+b Fn(Some)31 b(users)g(w)n(ere)f(rep)r(orting)h(stac)n(k)g(o)n(v)n -+(er\015o)n(ws)d(when)k(sync)n(hronizing)e(h)n(uge)h(directories.)48 -+b(W)-7 b(e)32 b(found)g(and)f(\014xed)208 4201 y(some)c -+(non-tail-recursiv)n(e)e(list)k(pro)r(cessing)d(functions,)j(whic)n(h)f -+(w)n(e)g(hop)r(e)g(will)g(solv)n(e)f(the)i(problem.)38 -+b(Please)26 b(giv)n(e)i(it)208 4301 y(a)f(try)g(and)g(let)h(us)g(kno)n -+(w.)125 4467 y Fj(\017)41 b Fn(Ma)5 b(jor)26 b(additions)h(to)h(the)g -+(do)r(cumen)n(tation.)0 4633 y(Changes)f(since)g(1.142:)125 -+4799 y Fj(\017)41 b Fn(Ma)5 b(jor)26 b(in)n(ternal)h(tidying)g(and)h -+(man)n(y)f(small)g(bug\014xes.)125 4965 y Fj(\017)41 -+b Fn(Ma)5 b(jor)26 b(additions)h(to)h(the)g(user)e(man)n(ual.)125 -+5131 y Fj(\017)41 b Fn(Unison)26 b(can)f(no)n(w)h(b)r(e)h(started)e -+(with)i(no)f(argumen)n(ts)f({)g(it)i(will)g(prompt)f(automatically)f -+(for)g(the)i(name)f(of)g(a)g(pro\014le)208 5230 y(\014le)31 -+b(con)n(taining)f(the)h(ro)r(ots)f(to)h(b)r(e)g(sync)n(hronized.)46 -+b(This)31 b(mak)n(es)f(it)i(p)r(ossible)e(to)h(start)g(the)g(graphical) -+e(UI)j(from)e(a)208 5330 y(desktop)d(icon.)1908 5589 -+y(55)p eop -+%%Page: 56 56 -+56 55 bop 125 83 a Fj(\017)41 b Fn(Fixed)27 b(a)h(small)f(bug)g(where)g -+(the)h(text)g(UI)g(on)f(NT)h(w)n(as)f(raising)f(a)h('no)h(suc)n(h)f -+(signal')g(exception.)0 249 y(Changes)g(since)g(1.139:)125 -+415 y Fj(\017)41 b Fn(The)22 b(precompiled)h(windo)n(ws)f(binary)f(in)i -+(the)h(last)e(release)f(w)n(as)h(compiled)h(with)g(an)f(old)h(OCaml)f -+(compiler,)h(causing)208 515 y(propagation)29 b(of)j(p)r(ermissions)f -+(not)h(to)g(w)n(ork)e(\(and)i(p)r(erhaps)g(leading)f(to)h(some)f(other) -+g(strange)g(b)r(eha)n(viors)f(w)n(e'v)n(e)208 614 y(heard)35 -+b(rep)r(orts)h(ab)r(out\).)64 b(This)36 b(has)g(b)r(een)h(corrected.)63 -+b(If)37 b(y)n(ou're)e(using)h(precompiled)g(binaries)g(on)g(Windo)n -+(ws,)208 714 y(please)26 b(upgrade.)125 880 y Fj(\017)41 -+b Fn(Added)26 b(a)f Fk(-debug)f Fn(command)h(line)h(\015ag,)g(whic)n(h) -+g(con)n(trols)e(debugging)h(of)g(v)-5 b(arious)25 b(mo)r(dules.)36 -+b(Sa)n(y)25 b Fk(-debug)42 b(XXX)24 b Fn(to)208 980 y(enable)j(debug)g -+(tracing)g(for)g(mo)r(dule)h Fk(XXX)p Fn(,)e(or)h Fk(-debug)41 -+b(all)27 b Fn(to)g(turn)h(on)f(absolutely)g(ev)n(erything.)125 -+1146 y Fj(\017)41 b Fn(Fixed)27 b(a)h(small)f(bug)g(where)g(the)h(text) -+g(UI)g(on)f(NT)h(w)n(as)f(raising)f(a)h('no)h(suc)n(h)f(signal')g -+(exception.)0 1312 y(Changes)g(since)g(1.111:)125 1478 -+y Fj(\017)41 b Fl(Incompatible)30 b(c)m(hange:)74 b Fn(The)28 -+b(names)f(and)g(formats)g(of)g(the)h(preference)f(\014les)h(in)g(the)g -+(.unison)f(directory)f(ha)n(v)n(e)208 1577 y(c)n(hanged.)35 -+b(In)28 b(particular:)301 1743 y Fl({)41 b Fn(the)28 -+b(\014le)g(\\prefs")e(should)i(b)r(e)g(renamed)f(to)g(default.prf)301 -+1876 y Fl({)41 b Fn(the)28 b(con)n(ten)n(ts)f(of)h(the)g(\014le)g -+(\\ignore")e(should)h(b)r(e)h(merged)f(in)n(to)h(default.prf.)38 -+b(Eac)n(h)26 b(line)i(of)g(the)g(form)f Fk(REGEXP)390 -+1976 y Fn(in)h(ignore)e(should)i(b)r(ecome)f(a)g(line)h(of)g(the)g -+(form)f Fk(ignore)41 b(=)i(REGEXP)25 b Fn(in)j(default.prf.)125 -+2142 y Fj(\017)41 b Fn(Unison)27 b(no)n(w)g(handles)g(p)r(ermission)g -+(bits)h(and)g(sym)n(b)r(olic)f(links.)36 b(See)28 b(the)g(man)n(ual)f -+(for)g(details.)125 2308 y Fj(\017)41 b Fn(Y)-7 b(ou)27 -+b(can)g(no)n(w)g(ha)n(v)n(e)g(di\013eren)n(t)h(preference)e(\014les)i -+(in)g(y)n(our)e(.unison)h(directory)-7 b(.)36 b(If)28 -+b(y)n(ou)f(start)g(unison)g(lik)n(e)h(this)774 2507 y -+Fk(unison)41 b(profilename)208 2707 y Fn(\(i.e.)36 b(with)26 -+b(just)f(one)g(\\anon)n(ymous")e(command-line)h(argumen)n(t\),)h(then)h -+(the)f(\014le)g Fk(~/.unison/profile)o(na)o(me.)o(pr)o(f)208 -+2806 y Fn(will)i(b)r(e)h(loaded)f(instead)h(of)f Fk(default.prf)p -+Fn(.)125 2972 y Fj(\017)41 b Fn(Some)27 b(impro)n(v)n(emen)n(ts)f(to)i -+(terminal)f(handling)g(in)h(the)g(text)g(user)f(in)n(terface)125 -+3138 y Fj(\017)41 b Fn(Added)24 b(a)f(switc)n(h)g(-killServ)n(er)e -+(that)j(terminates)f(the)h(remote)f(serv)n(er)e(pro)r(cess)i(when)g -+(the)h(unison)f(clien)n(t)h(is)f(sh)n(utting)208 3238 -+y(do)n(wn,)j(ev)n(en)f(when)i(using)f(so)r(c)n(k)n(ets)f(for)g(comm)n -+(unication.)36 b(\(By)26 b(default,)h(a)f(remote)g(serv)n(er)e(created) -+i(using)f(ssh/rsh)208 3337 y(is)i(terminated)h(automatically)-7 -+b(,)26 b(while)i(a)f(so)r(c)n(k)n(et)g(serv)n(er)f(is)h(left)h -+(running.\))125 3504 y Fj(\017)41 b Fn(When)23 b(started)f(in)h('so)r -+(c)n(k)n(et)f(serv)n(er')f(mo)r(de,)i(unison)g(prin)n(ts)f('serv)n(er)f -+(started')h(on)h(stderr)f(when)g(it)i(is)e(ready)g(to)g(accept)208 -+3603 y(connections.)38 b(\(This)29 b(ma)n(y)f(b)r(e)h(useful)g(for)f -+(scripts)g(that)g(w)n(an)n(t)g(to)g(tell)h(when)g(a)f(so)r(c)n(k)n -+(et-mo)r(de)f(serv)n(er)g(has)h(\014nished)208 3703 y(initalization.\)) -+125 3869 y Fj(\017)41 b Fn(W)-7 b(e)38 b(no)n(w)f(mak)n(e)g(a)g(nigh)n -+(tly)h(mirror)e(of)i(our)f(curren)n(t)g(in)n(ternal)g(dev)n(elopmen)n -+(t)g(tree,)j(in)e(case)f(an)n(y)n(one)f(w)n(an)n(ts)h(an)208 -+3968 y(up-to-the-min)n(ute)27 b(v)n(ersion)f(to)h(hac)n(k)g(around)g -+(with.)125 4134 y Fj(\017)41 b Fn(Added)28 b(a)f(\014le)h(CONTRIB)f -+(with)h(some)f(suggestions)f(for)h(ho)n(w)g(to)h(help)f(us)h(mak)n(e)f -+(Unison)g(b)r(etter.)1908 5589 y(56)p eop -+%%Trailer -+end -+userdict /end-hook known{end-hook}if -+%%EOF ---- unison-2.9.1.orig/debian/unison-gtk.menu -+++ unison-2.9.1/debian/unison-gtk.menu -@@ -0,0 +1,3 @@ -+?package(unison-gtk):needs="x11" section="Apps/Net" \ -+ title="Unison (GTK)" command="/usr/bin/unison-gtk" \ -+ longtitle="Unison file synchronizer (GTK interface)" diff --git a/nonworking/unison/unison_2.9.1.bb b/nonworking/unison/unison_2.9.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/unison/unison_2.9.1.bb +++ /dev/null diff --git a/nonworking/vlc/vlc_0.7.2.bb b/nonworking/vlc/vlc_0.7.2.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/vlc/vlc_0.7.2.bb +++ /dev/null diff --git a/nonworking/xfce/xfce_4.0.4.bb b/nonworking/xfce/xfce_4.0.4.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/xfce/xfce_4.0.4.bb +++ /dev/null diff --git a/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch b/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch deleted file mode 100644 index dbddb41bee..0000000000 --- a/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- xc/programs/xterm/util.c.orig 2003-03-18 00:24:46.000000000 +0000 -+++ xc/programs/xterm/util.c 2003-03-18 00:21:37.000000000 +0000 -@@ -1336,7 +1336,7 @@ - } - #endif - ReverseOldColors(); -- update_reversevideo(); -+ // update_reversevideo(); - } - - void -@@ -2111,10 +2111,12 @@ - { -+ /* - update_delete_del(); - update_old_fkeys(); - update_hp_fkeys(); - update_sco_fkeys(); - update_sun_fkeys(); - update_sun_kbd(); -+ */ - } - - void -@@ -2145,8 +2147,8 @@ - } - - if (save != term->keyboard.type) { -- update_keyboard_type(); -- } -+ //update_keyboard_type(); -+ } - } - - void diff --git a/nonworking/xfree86/xfree86-4.3.0/host.def b/nonworking/xfree86/xfree86-4.3.0/host.def deleted file mode 100644 index 586c04f5f2..0000000000 --- a/nonworking/xfree86/xfree86-4.3.0/host.def +++ /dev/null @@ -1,22 +0,0 @@ -#define KDriveXServer YES -#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension -fexpensive-optimizations -fomit-frame-pointer -O2 -march=armv4 -mtune=xscale -mapcs-32 -#define TinyXServer YES -#define CrossCompiling YES -#define TouchScreen YES -#define ItsyCompilerBug YES -#undef BuildRandR -#define BuildRandR YES -#define BuildXInputLib YES -#define ProjectRoot /usr/X11R6 -#define Freetype2Dir $(TOP)/extras/freetype2 -#define Freetype2LibDir $(TOP)/exports/lib -#define BuildXTrueType YES -#define BuildScreenSaverExt YES -#define BuildScreenSaverLibrary YES -#define SharedLibXss YES -#define ServerXdmcpDefines -#define XfbdevServer YES -#define HasTsLib YES -#define BuildXResExt YES -#define XResExtension YES -#define BuildXcursorgen NO diff --git a/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch b/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch deleted file mode 100644 index 2c5355c9e4..0000000000 --- a/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- xc/programs/Xserver/hw/kdrive/linux/keyboard.c.orig 2001-11-08 10:26:24.000000000 +0000 -+++ xc/programs/Xserver/hw/kdrive/linux/keyboard.c 2003-03-11 21:13:09.000000000 +0000 -@@ -397,12 +397,13 @@ - static struct termios LinuxTermios; - static int LinuxKbdType; - --void -+int - LinuxKeyboardEnable (int fd, void *closure) - { - struct termios nTty; - unsigned char buf[256]; - int n; -+ int fd_orig_flags; - - ioctl (fd, KDGKBMODE, &LinuxKbdTrans); - tcgetattr (fd, &LinuxTermios); -@@ -420,9 +421,18 @@ - tcsetattr(fd, TCSANOW, &nTty); - /* - * Flush any pending keystrokes -+ * -+ * Also set to nonblock, just to be safe - */ -+ fd_orig_flags = fcntl( fd , F_GETFL, 0 ); -+ fcntl ( fd, F_SETFL, fd_orig_flags | O_NONBLOCK ); -+ - while ((n = read (fd, buf, sizeof (buf))) > 0) -- ; -+ ; -+ -+ fcntl ( fd , F_SETFL, fd_orig_flags ); -+ -+ return fd; - } - - void diff --git a/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch b/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch deleted file mode 100644 index dc1cc86343..0000000000 --- a/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- xc/programs/Xserver/hw/kdrive/linux/tslib.c.orig 2002-11-05 05:28:06.000000000 +0000 -+++ xc/programs/Xserver/hw/kdrive/linux/tslib.c 2003-03-11 21:11:37.000000000 +0000 -@@ -119,6 +119,29 @@ - int TsInputType; - - int -+TslibEnable (int not_needed_fd, void *closure) -+{ -+ KdMouseInfo *mi = closure; -+ int fd = 0; -+ -+ if(!(tsDev = ts_open(mi->name, 0))) { -+ fprintf(stderr, "%s() failed to open %s\n", __func__, mi->name ); -+ return -1; /* XXX Not sure what to return here */ -+ } -+ -+ ts_config(tsDev); -+ fd=ts_fd(tsDev); -+ -+ return fd; -+} -+ -+void -+TslibDisable (int fd, void *closure) -+{ -+ ts_close(tsDev); -+} -+ -+int - TslibInit (void) - { - int i; -@@ -128,7 +151,7 @@ - - if (!TsInputType) - TsInputType = KdAllocInputType (); -- -+ - for (mi = kdMouseInfo; mi; mi = next) - { - next = mi->next; -@@ -148,14 +171,25 @@ - break; - } - } -+ } else { -+ -+ if(!(tsDev = ts_open(mi->name,0))) -+ continue; -+ ts_config(tsDev); -+ fd=ts_fd(tsDev); -+ - } - - if (fd > 0 && tsDev != 0) - { - mi->driver = (void *) fd; - mi->inputType = TsInputType; -- if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi)) -- n++; -+ if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi)) -+ n++; -+ -+ /* Set callbacks for vt switches etc */ -+ KdRegisterFdEnableDisable (fd, TslibEnable, TslibDisable); -+ - } - else - if (fd > 0) close(fd); diff --git a/nonworking/xfree86/xfree86_4.3.0.bb b/nonworking/xfree86/xfree86_4.3.0.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/xfree86/xfree86_4.3.0.bb +++ /dev/null diff --git a/nonworking/xlibs/xext_6.4.3.bb b/nonworking/xlibs/xext_6.4.3.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/xlibs/xext_6.4.3.bb +++ /dev/null diff --git a/nonworking/xlibs/xmu_6.2.3.bb b/nonworking/xlibs/xmu_6.2.3.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/xlibs/xmu_6.2.3.bb +++ /dev/null diff --git a/nonworking/xmlbench/xmlbench_1.3.1.bb b/nonworking/xmlbench/xmlbench_1.3.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/xmlbench/xmlbench_1.3.1.bb +++ /dev/null diff --git a/nonworking/zaurss/zaurss_0.4.2.bb b/nonworking/zaurss/zaurss_0.4.2.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/zaurss/zaurss_0.4.2.bb +++ /dev/null diff --git a/nonworking/zethereal/zethereal_1.0.0.bb b/nonworking/zethereal/zethereal_1.0.0.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/nonworking/zethereal/zethereal_1.0.0.bb +++ /dev/null |