Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/net In directory vz-cvs-3.sog:/tmp/cvs-serv30280
Modified Files: sshfs.info sshfs.patch Log Message: sshfs: regenerated patch from jhowarth Index: sshfs.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/net/sshfs.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sshfs.info 19 Nov 2011 23:24:43 -0000 1.1 +++ sshfs.info 20 Mar 2012 05:57:20 -0000 1.2 @@ -1,10 +1,10 @@ Package: sshfs Version: 2.3 -Revision: 1 +Revision: 2 Source: mirror:sourceforge:fuse/%n-fuse-%v.tar.gz Source-MD5: f72f12fda186dbd92382f70d25662ed3 PatchFile: %n.patch -PatchFile-MD5: b183be0432ed9e71b6c4ae282b81ea77 +PatchFile-MD5: f6f06587bba57badd7a05a3d36c74883 BuildDepends: fuse4x-dev, glib2-dev, pkgconfig, libgettext8-dev Depends: fuse4x-shlibs, glib2-shlibs, libgettext8-shlibs Index: sshfs.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/net/sshfs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sshfs.patch 19 Nov 2011 23:24:43 -0000 1.1 +++ sshfs.patch 20 Mar 2012 05:57:20 -0000 1.2 @@ -1,9 +1,6 @@ -# from the macports port - -diff --git a/Makefile.am b/Makefile.am -index a80788b..99e1dc8 100644 ---- a/Makefile.am -+++ b/Makefile.am +diff -uNr sshfs-fuse-2.3/Makefile.am sshfs-fuse-2.3.patched/Makefile.am +--- sshfs-fuse-2.3/Makefile.am 2010-06-24 05:32:56.000000000 -0400 ++++ sshfs-fuse-2.3.patched/Makefile.am 2012-03-13 21:05:29.000000000 -0400 @@ -2,14 +2,14 @@ bin_PROGRAMS = sshfs @@ -21,11 +18,510 @@ EXTRA_DIST = sshnodelay.c FAQ.txt CLEANFILES = sshnodelay.so -diff --git a/cache.c b/cache.c -index bb23f8f..5b635f2 100644 ---- a/cache.c -+++ b/cache.c -@@ -559,6 +559,9 @@ struct fuse_operations *cache_init(struct fuse_cache_operations *oper) +diff -uNr sshfs-fuse-2.3/Makefile.in sshfs-fuse-2.3.patched/Makefile.in +--- sshfs-fuse-2.3/Makefile.in 2011-07-01 08:28:28.000000000 -0400 ++++ sshfs-fuse-2.3.patched/Makefile.in 2012-03-13 21:06:26.000000000 -0400 +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11.3 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software ++# Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -51,11 +51,12 @@ + CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" + PROGRAMS = $(bin_PROGRAMS) +-am__sshfs_SOURCES_DIST = sshfs.c cache.c cache.h compat/fuse_opt.c \ +- compat/fuse_opt.h ++am__sshfs_SOURCES_DIST = sshfs.c cache.c cache.h \ ++ compat/darwin_semaphore.h compat/darwin_semaphore.c \ ++ compat/fuse_opt.c compat/fuse_opt.h + @FUSE_OPT_COMPAT_TRUE@am__objects_1 = sshfs-fuse_opt.$(OBJEXT) + am_sshfs_OBJECTS = sshfs-sshfs.$(OBJEXT) sshfs-cache.$(OBJEXT) \ +- $(am__objects_1) ++ sshfs-darwin_semaphore.$(OBJEXT) $(am__objects_1) + sshfs_OBJECTS = $(am_sshfs_OBJECTS) + am__DEPENDENCIES_1 = + sshfs_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -92,6 +93,12 @@ + am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__uninstall_files_from_dir = { \ ++ test -z "$$files" \ ++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ ++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ ++ $(am__cd) "$$dir" && rm -f $$files; }; \ ++ } + man1dir = $(mandir)/man1 + NROFF = nroff + MANS = $(dist_man_MANS) +@@ -101,12 +108,16 @@ + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) + am__remove_distdir = \ +- { test ! -d "$(distdir)" \ +- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr "$(distdir)"; }; } ++ if test -d "$(distdir)"; then \ ++ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -rf "$(distdir)" \ ++ || { sleep 5 && rm -rf "$(distdir)"; }; \ ++ else :; fi + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print ++am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ ++ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' + distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ +@@ -197,10 +208,11 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-sshfs_SOURCES = sshfs.c cache.c cache.h $(am__append_1) ++sshfs_SOURCES = sshfs.c cache.c cache.h compat/darwin_semaphore.h \ ++ compat/darwin_semaphore.c $(am__append_1) + sshfs_LDADD = $(SSHFS_LIBS) + sshfs_CFLAGS = $(SSHFS_CFLAGS) +-sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=26 -DLIBDIR=\"$(libdir)\" ++sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=26 -DLIBDIR=\"$(libdir)\" -Icompat + EXTRA_DIST = sshnodelay.c FAQ.txt + CLEANFILES = sshnodelay.so + dist_man_MANS = sshfs.1 +@@ -209,7 +221,7 @@ + + .SUFFIXES: + .SUFFIXES: .c .o .obj +-am--refresh: ++am--refresh: Makefile + @: + $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ +@@ -245,10 +257,8 @@ + $(am__aclocal_m4_deps): + + config.h: stamp-h1 +- @if test ! -f $@; then \ +- rm -f stamp-h1; \ +- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ +- else :; fi ++ @if test ! -f $@; then rm -f stamp-h1; else :; fi ++ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 +@@ -297,7 +307,7 @@ + + clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +-sshfs$(EXEEXT): $(sshfs_OBJECTS) $(sshfs_DEPENDENCIES) ++sshfs$(EXEEXT): $(sshfs_OBJECTS) $(sshfs_DEPENDENCIES) $(EXTRA_sshfs_DEPENDENCIES) + @rm -f sshfs$(EXEEXT) + $(sshfs_LINK) $(sshfs_OBJECTS) $(sshfs_LDADD) $(LIBS) + +@@ -308,6 +318,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sshfs-cache.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sshfs-darwin_semaphore.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sshfs-fuse_opt.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sshfs-sshfs.Po@am__quote@ + +@@ -353,6 +364,20 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sshfs_CPPFLAGS) $(CPPFLAGS) $(sshfs_CFLAGS) $(CFLAGS) -c -o sshfs-cache.obj `if test -f 'cache.c'; then $(CYGPATH_W) 'cache.c'; else $(CYGPATH_W) '$(srcdir)/cache.c'; fi` + ++sshfs-darwin_semaphore.o: compat/darwin_semaphore.c ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sshfs_CPPFLAGS) $(CPPFLAGS) $(sshfs_CFLAGS) $(CFLAGS) -MT sshfs-darwin_semaphore.o -MD -MP -MF $(DEPDIR)/sshfs-darwin_semaphore.Tpo -c -o sshfs-darwin_semaphore.o `test -f 'compat/darwin_semaphore.c' || echo '$(srcdir)/'`compat/darwin_semaphore.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/sshfs-darwin_semaphore.Tpo $(DEPDIR)/sshfs-darwin_semaphore.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/darwin_semaphore.c' object='sshfs-darwin_semaphore.o' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sshfs_CPPFLAGS) $(CPPFLAGS) $(sshfs_CFLAGS) $(CFLAGS) -c -o sshfs-darwin_semaphore.o `test -f 'compat/darwin_semaphore.c' || echo '$(srcdir)/'`compat/darwin_semaphore.c ++ ++sshfs-darwin_semaphore.obj: compat/darwin_semaphore.c ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sshfs_CPPFLAGS) $(CPPFLAGS) $(sshfs_CFLAGS) $(CFLAGS) -MT sshfs-darwin_semaphore.obj -MD -MP -MF $(DEPDIR)/sshfs-darwin_semaphore.Tpo -c -o sshfs-darwin_semaphore.obj `if test -f 'compat/darwin_semaphore.c'; then $(CYGPATH_W) 'compat/darwin_semaphore.c'; else $(CYGPATH_W) '$(srcdir)/compat/darwin_semaphore.c'; fi` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/sshfs-darwin_semaphore.Tpo $(DEPDIR)/sshfs-darwin_semaphore.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/darwin_semaphore.c' object='sshfs-darwin_semaphore.obj' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sshfs_CPPFLAGS) $(CPPFLAGS) $(sshfs_CFLAGS) $(CFLAGS) -c -o sshfs-darwin_semaphore.obj `if test -f 'compat/darwin_semaphore.c'; then $(CYGPATH_W) 'compat/darwin_semaphore.c'; else $(CYGPATH_W) '$(srcdir)/compat/darwin_semaphore.c'; fi` ++ + sshfs-fuse_opt.o: compat/fuse_opt.c + @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sshfs_CPPFLAGS) $(CPPFLAGS) $(sshfs_CFLAGS) $(CFLAGS) -MT sshfs-fuse_opt.o -MD -MP -MF $(DEPDIR)/sshfs-fuse_opt.Tpo -c -o sshfs-fuse_opt.o `test -f 'compat/fuse_opt.c' || echo '$(srcdir)/'`compat/fuse_opt.c + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/sshfs-fuse_opt.Tpo $(DEPDIR)/sshfs-fuse_opt.Po +@@ -401,9 +426,7 @@ + sed -n '/\.1[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ +- test -z "$$files" || { \ +- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } ++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -514,7 +537,11 @@ + $(am__remove_distdir) + + dist-bzip2: distdir +- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 ++ $(am__remove_distdir) ++ ++dist-lzip: distdir ++ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__remove_distdir) + + dist-lzma: distdir +@@ -522,7 +549,7 @@ + $(am__remove_distdir) + + dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz ++ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__remove_distdir) + + dist-tarZ: distdir +@@ -553,6 +580,8 @@ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ ++ *.tar.lz*) \ ++ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ +@@ -572,6 +601,7 @@ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ +@@ -600,8 +630,16 @@ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: +- @$(am__cd) '$(distuninstallcheck_dir)' \ +- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ++ @test -n '$(distuninstallcheck_dir)' || { \ ++ echo 'ERROR: trying to run $@ with an empty' \ ++ '$$(distuninstallcheck_dir)' >&2; \ ++ exit 1; \ ++ }; \ ++ $(am__cd) '$(distuninstallcheck_dir)' || { \ ++ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ ++ exit 1; \ ++ }; \ ++ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ +@@ -635,10 +673,15 @@ + + installcheck: installcheck-am + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++ if test -z '$(STRIP)'; then \ ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install; \ ++ else \ ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ ++ fi + mostlyclean-generic: + + clean-generic: +@@ -731,8 +774,8 @@ + + .PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \ + clean clean-binPROGRAMS clean-generic ctags dist dist-all \ +- dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \ +- dist-zip distcheck distclean distclean-compile \ ++ dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \ ++ dist-xz dist-zip distcheck distclean distclean-compile \ + distclean-generic distclean-hdr distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-binPROGRAMS install-data \ +diff -uNr sshfs-fuse-2.3/aclocal.m4 sshfs-fuse-2.3.patched/aclocal.m4 +--- sshfs-fuse-2.3/aclocal.m4 2011-07-01 08:28:27.000000000 -0400 ++++ sshfs-fuse-2.3.patched/aclocal.m4 2012-03-13 21:05:42.000000000 -0400 +@@ -1,7 +1,8 @@ +-# generated automatically by aclocal 1.11.1 -*- Autoconf -*- ++# generated automatically by aclocal 1.11.3 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, ++# Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -156,7 +157,7 @@ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-_PKG_TEXT])[]dnl ++_PKG_TEXT])dnl + ]) + elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) +@@ -167,7 +168,7 @@ + + _PKG_TEXT + +-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl ++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl + ]) + else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +@@ -177,12 +178,15 @@ + fi[]dnl + ])# PKG_CHECK_MODULES + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software ++# Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + ++# serial 1 ++ + # AM_AUTOMAKE_VERSION(VERSION) + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been +@@ -192,7 +196,7 @@ + [am__api_version='1.11' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11.1], [], ++m4_if([$1], [1.11.3], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -208,19 +212,21 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11.1])dnl ++[AM_AUTOMAKE_VERSION([1.11.3])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + ++# serial 1 ++ + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets + # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to + # `$srcdir', `$srcdir/..', or `$srcdir/../..'. +@@ -302,14 +308,14 @@ + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +-# Free Software Foundation, Inc. ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, ++# 2010, 2011 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 10 ++# serial 12 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -349,6 +355,7 @@ + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. ++ rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. +@@ -413,7 +420,7 @@ + break + fi + ;; +- msvisualcpp | msvcmsys) ++ msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. +@@ -478,10 +485,13 @@ + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' ++ am__nodep='_no' + fi + AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) + AC_SUBST([AMDEPBACKSLASH])dnl + _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++AC_SUBST([am__nodep])dnl ++_AM_SUBST_NOTMAKE([am__nodep])dnl + ]) + + # Generate code to set up dependency tracking. -*- Autoconf -*- +@@ -715,12 +725,15 @@ + done + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, ++# Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + ++# serial 1 ++ + # AM_PROG_INSTALL_SH + # ------------------ + # Define $install_sh. +@@ -887,12 +900,15 @@ + fi + ]) + +-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, ++# Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + ++# serial 1 ++ + # AM_PROG_MKDIR_P + # --------------- + # Check for `mkdir -p'. +@@ -915,13 +931,14 @@ + + # Helper functions for option handling. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software ++# Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 4 ++# serial 5 + + # _AM_MANGLE_OPTION(NAME) + # ----------------------- +@@ -929,13 +946,13 @@ + [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + + # _AM_SET_OPTION(NAME) +-# ------------------------------ ++# -------------------- + # Set option NAME. Presently that only means defining a flag for this option. + AC_DEFUN([_AM_SET_OPTION], + [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + + # _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- ++# ------------------------ + # OPTIONS is a space-separated list of Automake options. + AC_DEFUN([_AM_SET_OPTIONS], + [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +@@ -1011,12 +1028,14 @@ + fi + AC_MSG_RESULT(yes)]) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + ++# serial 1 ++ + # AM_PROG_INSTALL_STRIP + # --------------------- + # One issue with vendor `install' (even GNU) is that you can't +@@ -1039,13 +1058,13 @@ + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Copyright (C) 2006, 2008 Free Software Foundation, Inc. ++# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 ++# serial 3 + + # _AM_SUBST_NOTMAKE(VARIABLE) + # --------------------------- +@@ -1054,13 +1073,13 @@ + AC_DEFUN([_AM_SUBST_NOTMAKE]) + + # AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- ++# -------------------------- + # Public sister of _AM_SUBST_NOTMAKE. + AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + + # Check how to create a tarball. -*- Autoconf -*- + +-# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -1082,10 +1101,11 @@ + # a tarball read from stdin. + # $(am__untar) < result.tar + AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. +-AM_MISSING_PROG([AMTAR], [tar]) ++[# Always define AMTAR for backward compatibility. Yes, it's still used ++# in the wild :-( We should find a proper way to deprecate it ... ++AC_SUBST([AMTAR], ['$${TAR-tar}']) + m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) + AC_MSG_CHECKING([how to create a $1 tar archive]) +diff -uNr sshfs-fuse-2.3/cache.c sshfs-fuse-2.3.patched/cache.c +--- sshfs-fuse-2.3/cache.c 2010-06-24 05:32:56.000000000 -0400 ++++ sshfs-fuse-2.3.patched/cache.c 2012-03-13 21:05:29.000000000 -0400 +@@ -559,6 +559,9 @@ cache.next_oper = oper; cache_unity_fill(oper, &cache_oper); @@ -35,7 +531,7 @@ if (cache.on) { cache_fill(oper, &cache_oper); pthread_mutex_init(&cache.lock, NULL); -@@ -593,3 +596,7 @@ int cache_parse_options(struct fuse_args *args) +@@ -593,3 +596,7 @@ return fuse_opt_parse(args, &cache, cache_opts, NULL); } @@ -43,11 +539,10 @@ +#ifdef __APPLE__ +int cache_enabled; +#endif -diff --git a/cache.h b/cache.h -index cec9ca4..8ca0989 100644 ---- a/cache.h -+++ b/cache.h -@@ -27,3 +27,7 @@ int cache_parse_options(struct fuse_args *args); +diff -uNr sshfs-fuse-2.3/cache.h sshfs-fuse-2.3.patched/cache.h +--- sshfs-fuse-2.3/cache.h 2010-06-24 05:32:56.000000000 -0400 ++++ sshfs-fuse-2.3.patched/cache.h 2012-03-13 21:05:29.000000000 -0400 +@@ -27,3 +27,7 @@ void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr); void cache_invalidate(const char *path); uint64_t cache_get_write_ctr(void); @@ -55,11 +550,9 @@ +#ifdef __APPLE__ +extern int cache_enabled; +#endif -diff --git a/compat/darwin_semaphore.c b/compat/darwin_semaphore.c -new file mode 100644 -index 0000000..e45fd9a ---- /dev/null -+++ b/compat/darwin_semaphore.c +diff -uNr sshfs-fuse-2.3/compat/darwin_semaphore.c sshfs-fuse-2.3.patched/compat/darwin_semaphore.c +--- sshfs-fuse-2.3/compat/darwin_semaphore.c 1969-12-31 19:00:00.000000000 -0500 ++++ sshfs-fuse-2.3.patched/compat/darwin_semaphore.c 2012-03-13 21:05:29.000000000 -0400 @@ -0,0 +1,229 @@ +/* + * Copyright (C) 2000,02 Free Software Foundation, Inc. @@ -290,11 +783,9 @@ + + return res; +} -diff --git a/compat/darwin_semaphore.h b/compat/darwin_semaphore.h -new file mode 100644 -index 0000000..3f03e41 ---- /dev/null -+++ b/compat/darwin_semaphore.h +diff -uNr sshfs-fuse-2.3/compat/darwin_semaphore.h sshfs-fuse-2.3.patched/compat/darwin_semaphore.h +--- sshfs-fuse-2.3/compat/darwin_semaphore.h 1969-12-31 19:00:00.000000000 -0500 ++++ sshfs-fuse-2.3.patched/compat/darwin_semaphore.h 2012-03-13 21:05:29.000000000 -0400 @@ -0,0 +1,69 @@ +/* Copyright (C) 2000,02 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -365,10 +856,61 @@ + + +#endif /* semaphore.h */ -diff --git a/sshfs.c b/sshfs.c -index 22bda6b..9698c74 100644 ---- a/sshfs.c -+++ b/sshfs.c +diff -uNr sshfs-fuse-2.3/configure sshfs-fuse-2.3.patched/configure +--- sshfs-fuse-2.3/configure 2011-07-01 08:28:28.000000000 -0400 ++++ sshfs-fuse-2.3.patched/configure 2012-03-13 21:05:57.000000000 -0400 +@@ -578,6 +578,7 @@ + am__fastdepCC_FALSE + am__fastdepCC_TRUE + CCDEPMODE ++am__nodep + AMDEPBACKSLASH + AMDEP_FALSE + AMDEP_TRUE +@@ -2387,11 +2388,11 @@ + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +-# Always define AMTAR for backward compatibility. ++# Always define AMTAR for backward compatibility. Yes, it's still used ++# in the wild :-( We should find a proper way to deprecate it ... ++AMTAR='$${TAR-tar}' + +-AMTAR=${AMTAR-"${am_missing_run}tar"} +- +-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' ++am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + +@@ -3241,6 +3242,7 @@ + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' ++ am__nodep='_no' + fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= +@@ -3265,6 +3267,7 @@ + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. ++ rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. +@@ -3324,7 +3327,7 @@ + break + fi + ;; +- msvisualcpp | msvcmsys) ++ msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. +diff -uNr sshfs-fuse-2.3/sshfs.c sshfs-fuse-2.3.patched/sshfs.c +--- sshfs-fuse-2.3/sshfs.c 2011-07-01 08:11:13.000000000 -0400 ++++ sshfs-fuse-2.3.patched/sshfs.c 2012-03-13 21:05:29.000000000 -0400 @@ -20,7 +20,11 @@ #include <string.h> #include <stdint.h> @@ -409,7 +951,7 @@ struct buffer { uint8_t *p; size_t len; -@@ -167,6 +185,9 @@ struct sshfs_file { +@@ -167,6 +185,9 @@ int connver; int modifver; int refs; @@ -419,7 +961,7 @@ }; struct sshfs { -@@ -207,6 +228,10 @@ struct sshfs { +@@ -207,6 +228,10 @@ int server_version; unsigned remote_uid; unsigned local_uid; @@ -430,7 +972,7 @@ int remote_uid_detected; unsigned blksize; char *progname; -@@ -661,8 +686,17 @@ static int buf_get_attrs(struct buffer *buf, struct stat *stbuf, int *flagsp) +@@ -661,8 +686,17 @@ } } @@ -448,7 +990,7 @@ memset(stbuf, 0, sizeof(struct stat)); stbuf->st_mode = mode; -@@ -765,11 +799,33 @@ static void ssh_add_arg(const char *arg) +@@ -765,11 +799,33 @@ #ifdef SSH_NODELAY_WORKAROUND static int do_ssh_nodelay_workaround(void) { @@ -482,7 +1024,7 @@ snprintf(sopath, sizeof(sopath), "%s/%s", LIBDIR, SSHNODELAY_SO); res = access(sopath, R_OK); if (res == -1) { -@@ -794,16 +850,24 @@ static int do_ssh_nodelay_workaround(void) +@@ -794,16 +850,24 @@ return -1; } } @@ -507,7 +1049,7 @@ g_free(newpreload); return 0; } -@@ -1500,6 +1564,10 @@ static void sftp_detect_uid() +@@ -1500,6 +1564,10 @@ sshfs.remote_uid = stbuf.st_uid; sshfs.local_uid = getuid(); @@ -518,7 +1060,7 @@ sshfs.remote_uid_detected = 1; DEBUG("remote_uid = %i\n", sshfs.remote_uid); -@@ -2120,6 +2188,14 @@ static int sshfs_chown(const char *path, uid_t uid, gid_t gid) +@@ -2120,6 +2188,14 @@ buf_init(&buf, 0); buf_add_path(&buf, path); buf_add_uint32(&buf, SSH_FILEXFER_ATTR_UIDGID); @@ -533,7 +1075,7 @@ buf_add_uint32(&buf, uid); buf_add_uint32(&buf, gid); err = sftp_request(SSH_FXP_SETSTAT, &buf, SSH_FXP_STATUS, NULL); -@@ -2203,6 +2279,9 @@ static int sshfs_open_common(const char *path, mode_t mode, +@@ -2203,6 +2279,9 @@ sf = g_new0(struct sshfs_file, 1); list_init(&sf->write_reqs); pthread_cond_init(&sf->write_finished, NULL); @@ -543,7 +1085,7 @@ /* Assume random read after open */ sf->is_seq = 0; sf->refs = 1; -@@ -2236,11 +2315,21 @@ static int sshfs_open_common(const char *path, mode_t mode, +@@ -2236,11 +2315,21 @@ } if (!err) { @@ -565,7 +1107,7 @@ g_free(sf); } buf_free(&buf); -@@ -2295,14 +2384,32 @@ static int sshfs_fsync(const char *path, int isdatasync, +@@ -2295,14 +2384,32 @@ static void sshfs_file_put(struct sshfs_file *sf) { @@ -598,7 +1140,7 @@ } static int sshfs_release(const char *path, struct fuse_file_info *fi) -@@ -3076,6 +3183,15 @@ static int read_password(void) +@@ -3076,6 +3183,15 @@ perror("Failed to allocate locked page for password"); return -1; } @@ -614,7 +1156,7 @@ /* Don't use fgets() because password might stay in memory */ for (n = 0; n < max_password; n++) { -@@ -3123,7 +3239,7 @@ static void set_ssh_command(void) +@@ -3123,7 +3239,7 @@ replace_arg(&sshfs.ssh_args.argv[0], sshfs.ssh_command); } else { @@ -623,7 +1165,7 @@ sshfs.ssh_command) == -1) _exit(1); } -@@ -3227,8 +3343,13 @@ static int ssh_connect(void) +@@ -3227,8 +3343,13 @@ return 0; } @@ -638,7 +1180,7 @@ int res; struct fuse_args args = FUSE_ARGS_INIT(argc, argv); char *tmp; -@@ -3236,6 +3357,10 @@ int main(int argc, char *argv[]) +@@ -3236,6 +3357,10 @@ const char *sftp_server; int libver; @@ -649,7 +1191,7 @@ g_thread_init(NULL); sshfs.blksize = 4096; -@@ -3243,7 +3368,11 @@ int main(int argc, char *argv[]) +@@ -3243,7 +3368,11 @@ sshfs.max_write = 65536; sshfs.nodelay_workaround = 1; sshfs.nodelaysrv_workaround = 0; @@ -661,7 +1203,7 @@ sshfs.truncate_workaround = 0; sshfs.buflimit_workaround = 1; sshfs.ssh_ver = 2; -@@ -3257,6 +3386,10 @@ int main(int argc, char *argv[]) +@@ -3257,6 +3386,10 @@ ssh_add_arg("-a"); ssh_add_arg("-oClearAllForwardings=yes"); @@ -672,10 +1214,9 @@ if (fuse_opt_parse(&args, &sshfs, sshfs_opts, sshfs_opt_proc) == -1 || parse_workarounds() == -1) exit(1); -diff --git a/sshnodelay.c b/sshnodelay.c -index 7518089..efe393c 100644 ---- a/sshnodelay.c -+++ b/sshnodelay.c +diff -uNr sshfs-fuse-2.3/sshnodelay.c sshfs-fuse-2.3.patched/sshnodelay.c +--- sshfs-fuse-2.3/sshnodelay.c 2010-06-24 05:32:56.000000000 -0400 ++++ sshfs-fuse-2.3.patched/sshnodelay.c 2012-03-13 21:05:29.000000000 -0400 @@ -5,6 +5,32 @@ #include <netinet/in.h> #include <netinet/tcp.h> @@ -709,7 +1250,7 @@ int connect(int sock, const struct sockaddr *addr, socklen_t addrlen) { int (*next_connect)(int, const struct sockaddr *, socklen_t) = -@@ -16,3 +42,5 @@ int connect(int sock, const struct sockaddr *addr, socklen_t addrlen) +@@ -16,3 +42,5 @@ } return res; } ------------------------------------------------------------------------------ This SF email is sponsosred by: Try Windows Azure free for 90 days Click Here http://p.sf.net/sfu/sfd2d-msazure _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs