Update of /cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21765/stable/crypto/finkinfo
Modified Files: db41-ssl.info db42-ssl.info Added Files: aqbanking.info db42-ssl.patch db43-ssl.info gnome-vfs-ssl.info gnome-vfs-ssl.patch gnucash-hbci.info gnucash-hbci.patch gwenhywfar.info Log Message: gnucash -> stable --- NEW FILE: aqbanking.info --- Package: aqbanking Version: 1.0.4 Revision: 1beta Source: mirror:sourceforge:%n/%n-%vbeta.tar.gz Source-MD5: 029fbb9d3cd43f0e1d1d21b3680ab633 GCC: 3.3 BuildDepends: openssl097-dev, gwenhywfar (>= 1.7.2-1), ktoblzcheck, libofx1, gettext-dev, gettext-bin, gettext-tools, libiconv-dev Depends: %N-shlibs (= %v-%r) NoSetLDFlags: True BuildDependsOnly: True # Line 817 contains --msgid-bugs-address which our (old) gettext doesn't grok PatchScript: echo "817d" | patch Makefile.in ConfigureParams: --with-openssl-includes=%p/include --with-openssl-libs=%p/lib --disable-dependency-tracking CompileScript: << #! /bin/sh -ev export LIBRARY_PATH=%p/lib ./configure %c find . -name Makefile | xargs perl -pi.bak -e "s|-L%p/lib||g" make << InstallScript: << make install DESTDIR=%d find %i -name "*.la" | xargs perl -pi.bak -e "s|-L%b/([^\s\']*)||g" find %i -name "*.la.bak" | xargs rm -rf << Description: Online banking library Splitoff: << Package: %N-shlibs Description: Shared libraries for aqbanking Files: << lib/libaqbanking.0.dylib lib/libaqbanking.0.0.6.dylib lib/libaqbankingpp.0.dylib lib/libaqbankingpp.0.0.0.dylib lib/gwenhywfar/plugins/17/* lib/aqbanking/plugins/0/* << Depends: openssl097-shlibs, libofx1-shlibs, gwenhywfar-shlibs (>= 1.7.2-1), ktoblzcheck-shlibs Shlibs: << %p/lib/libaqbanking.0.dylib 1.0.0 %n (>= 1.0.4-1beta) %p/lib/libaqbankingpp.0.dylib 1.0.0 %n (>= 1.0.4-1beta) << DocFiles: COPYING README << DocFiles: COPYING README DescDetail: << AqBanking is a generic OnlineBanking interface. It allows multiple backends (currently HBCI) and multiple frontends (e.g. KDE, GNOME, console) to be used. << DescPackaging: << # The author doesn't seem to like using .la's in Makefile.am, causing the # wrong library to be linked if an installed library is available. So we must # remove all -L%p/lib from the generated Makefiles and set LIBRARY_PATH so that # %p/lib comes last. # Remove --msgid-bugs-address which our (old) gettext doesn't grok << Maintainer: Peter O'Gorman <[EMAIL PROTECTED]> License: GPL HomePage: http://aqbanking.sourceforge.net/ --- NEW FILE: gnucash-hbci.patch --- diff -u -d -b -w -u -r1.7 ltmain.sh --- foo/ltmain.sh 29 Aug 2002 04:12:30 -0000 1.7 +++ foo/ltmain.sh 13 May 2003 12:33:35 -0000 @@ -2370,7 +2370,11 @@ ;; esac if grep "^installed=no" $deplib > /dev/null; then - path="-L$absdir/$objdir" + if test -d "$absdir/$objdir"; then + path="$absdir/$objdir" + else + path="$absdir" + fi else eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then @@ -2380,11 +2384,56 @@ if test "$absdir" != "$libdir"; then $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 fi - path="-L$absdir" + path="$absdir" + fi + depdepl= + case $host in + *-*-darwin*) + # we do not want to link against static libs, but need to link against shared + eval deplibrary_names=`sed -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" + fi + + case " $newlib_search_path " in + *" $path "*) ;; + *) newlib_search_path="$newlib_search_path $path" ;; + esac + path="" fi ;; + *) + path="-L$path" + ;; + esac + + ;; + -l*) + case $host in + *-*-darwin*) + # Again, we only want to link against shared libraries + eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` + for tmp in $newlib_search_path ; do + if test -f "$tmp/lib$tmp_libs.dylib" ; then + eval depdepl="$tmp/lib$tmp_libs.dylib" + break + fi + done + path="" + ;; *) continue ;; esac + ;; + *) continue ;; + esac + case " $deplibs " in + *" $depdepl "*) ;; + *) deplibs="$deplibs $depdepl" ;; + esac case " $deplibs " in *" $path "*) ;; *) deplibs="$deplibs $path" ;; --- gnucash-1.8.3/src/scm/main.scm.old Thu May 15 00:28:39 2003 +++ gnucash-1.8.3/src/scm/main.scm Thu May 15 00:48:28 2003 @@ -316,8 +316,8 @@ (define (locale-prefixes) ;; Mac OS X. 10.1 and earlier don't have LC_MESSAGES. Fall back to ;; LC_ALL for those systems. - (let* ((locale (or (false-if-exception (setlocale LC_MESSAGES)) - (setlocale LC_ALL))) + (let* ((locale (or (false-if-exception (getenv "LANG")) + (getenv "LANG"))) (strings (cond ((not (string? locale)) '()) ((equal? locale "C") '()) ((<= (string-length locale) 4) (list locale)) --- gnucash-1.8.10/src/import-export/hbci/Makefile.in.bak 2004-12-17 23:11:25.000000000 +0900 +++ gnucash-1.8.10/src/import-export/hbci/Makefile.in 2004-12-17 23:13:54.000000000 +0900 @@ -278,10 +278,10 @@ libgncmod_hbci_la_LDFLAGS = -module libgncmod_hbci_la_LIBADD = \ - ${top_builddir}/src/gnc-module/libgncmodule.la \ - ${top_builddir}/src/engine/libgncmod-engine.la \ - ${top_builddir}/src/import-export/libgncmod-generic-import.la \ - ${top_builddir}/src/gnome/libgncgnome.la \ + @PREFIX@/lib/libgncmodule.la \ + @PREFIX@/lib/gnucash/libgncmod-engine.la \ + @PREFIX@/lib/gnucash/libgncmod-generic-import.la \ + @PREFIX@/lib/libgncgnome.la \ ${GLADE_LIBS} \ ${GLIB_LIBS} \ ${GNOMEUI_LIBS} \ @@ -338,10 +338,10 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libgncmod_hbci_la_DEPENDENCIES = \ -${top_builddir}/src/gnc-module/libgncmodule.la \ -${top_builddir}/src/engine/libgncmod-engine.la \ -${top_builddir}/src/import-export/libgncmod-generic-import.la \ -${top_builddir}/src/gnome/libgncgnome.la [EMAIL PROTECTED]@/lib/libgncmodule.la \ [EMAIL PROTECTED]@/lib/gnucash/libgncmod-engine.la \ [EMAIL PROTECTED]@/lib/gnucash/libgncmod-generic-import.la \ [EMAIL PROTECTED]@/lib/libgncgnome.la libgncmod_hbci_la_OBJECTS = dialog-daterange.lo dialog-hbcitrans.lo \ dialog-pass.lo gnc-hbci-cb.lo gnc-hbci-getbalance.lo \ gnc-hbci-gettrans.lo gnc-hbci-kvp.lo gnc-hbci-trans-templ.lo \ Index: db41-ssl.info =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo/db41-ssl.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- db41-ssl.info 27 Apr 2005 03:29:14 -0000 1.1 +++ db41-ssl.info 26 May 2005 13:52:41 -0000 1.2 @@ -1,9 +1,9 @@ Package: db41-ssl Version: 4.1.25 -Revision: 19 +Revision: 22 Source: http://www.sleepycat.com/update/snapshot/db-%v.tar.gz -Replaces: db, db3, db31 (<< 3.1.17-8), db4, db41, db4-ssl, db42-ssl, db42 -Conflicts: db3, db31 (<< 3.1.17-8), db4, db41, db4-ssl, db42-ssl, db42 +Replaces: db, db3, db31 (<< 3.1.17-8), db4, db41, db4-ssl, db42-ssl, db42, db43-ssl, db43 +Conflicts: db3, db31 (<< 3.1.17-8), db4, db41, db4-ssl, db42-ssl, db42, db43-ssl, db43 Depends: %N-shlibs (= %v-%r) | db41-shlibs (=%v-%r) BuildDependsOnly: true NoSetLDFlags: true @@ -28,7 +28,12 @@ make << InstallScript: << +#! /bin/sh -ev (cd build_unix; make install prefix=%I docdir=%I/share/doc/db41-ssl-doc/docs includedir=%I/include/db4) +binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify" +for binfile in $binfiles ; do + mv %i/bin/$binfile %i/bin/$binfile.%N +done << SplitOff: << Package: %N-shlibs @@ -36,7 +41,7 @@ Conflicts: db4-shlibs (= 4.1.24-5), db4-ssl-shlibs (= 4.1.24-5), db41-shlibs Provides: db41-shlibs Description: Shared Libraries for db41-ssl - Files: lib/libdb-4.1.dylib lib/libdb_cxx-4.1.dylib + Files: lib/libdb-4.1.dylib lib/libdb_cxx-4.1.dylib lib/libdb-4.1.la lib/libdb_cxx-4.1.la Shlibs: << %p/lib/libdb-4.1.dylib 4.1.0 %n (>= 4.1.25-15) %p/lib/libdb_cxx-4.1.dylib 4.1.0 %n (>= 4.1.25-15) @@ -46,11 +51,26 @@ SplitOff2: << Package: %N-bin Depends: %N-shlibs (= %v-%r) - Conflicts: db3-bin, db31 (<< 3.1.17-2), db4-bin, db4-ssl-bin, db41-bin, db42-ssl-bin, db42-bin - Replaces: db3-bin, db4 (<< 4.0.14-4), db31 (<< 3.1.17-2), db4-bin, db4-ssl-bin, db41-bin, db42-ssl-bin, db42-bin + Conflicts: db3-bin (<< 3.3.11-25), db31 (<< 3.1.17-2), db4-ssl-bin (<< 4.0.14-24), db4-bin (<< 4.0.14-24), db41-bin, db42-bin (<< 4.2.52-14), db42-ssl-bin (<< 4.2.52-14) + Replaces: db3-bin (<< 3.3.11-25), db4 (<< 4.0.14-4), db31 (<< 3.1.17-2), db4-ssl-bin (<< 4.0.14-24), db4-bin (<< 4.0.14-24), db41-bin, db42-bin (<< 4.2.52-14), db42-ssl-bin (<< 4.2.52-14) Description: Binary utilities for db41-ssl Files: bin DocFiles: LICENSE + PostInstScript: << + binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify" + priority=`echo %N | sed -e 's/[^0-9]//g'` + for binfile in $binfiles ; do + update-alternatives --install %p/bin/$binfile $binfile %p/bin/$binfile.%N $priority + done + << + PreRmScript: << + if [ $1 != "upgrade" ]; then + binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify" + for binfile in $binfiles ; do + update-alternatives --remove $binfile %p/bin/$binfile.%N + done + fi +<< << SplitOff3: << Package: %N-doc Index: db42-ssl.info =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo/db42-ssl.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- db42-ssl.info 27 Apr 2005 03:29:14 -0000 1.1 +++ db42-ssl.info 26 May 2005 13:52:41 -0000 1.2 @@ -1,16 +1,16 @@ Package: db42-ssl Version: 4.2.52 -Revision: 12 +Revision: 16 Source: http://www.sleepycat.com/update/snapshot/db-%v.tar.gz -Replaces: db, db3, db31 (<< 3.1.17-8), db4, db41, db4-ssl, db41-ssl, db42 -Conflicts: db3, db31 (<< 3.1.17-8), db4, db41, db4-ssl, db41-ssl, db42 +Replaces: db, db3, db31 (<< 3.1.17-8), db4, db41, db4-ssl, db41-ssl, db42, db43, db43-ssl +Conflicts: db3, db31 (<< 3.1.17-8), db4, db41, db4-ssl, db41-ssl, db42, db43, db43-ssl Depends: %N-shlibs (= %v-%r) | db42-shlibs (=%v-%r) BuildDependsOnly: true NoSetLDFlags: true NoSetCPPFlags: true SetCFlags: -Os SetCXXFlags: -Os -#Patch: %n.patch +Patch: %n.patch ConfigureParams: --enable-compat185 --enable-cxx --enable-dump185 --enable-dynamic --includedir=%p/include/db4 GCC: 3.3 CompileScript: << @@ -20,7 +20,7 @@ LIBDBCXX="libdb_cxx-4.2.la" cd build_unix; F77=no ../dist/configure %c -perl -pi -e 's,api_java,,g' Makefile +perl -pi.bak -e 's,api_java,,g' Makefile make UTIL_PROGS="" rm ".libs/$LIBDB" $LIBDB make SOLINK="\$(LIBTOOL) --mode=link --tag=CC gcc $VERSIONS" UTIL_PROGS="" @@ -29,7 +29,12 @@ make << InstallScript: << +#! /bin/sh -ev (cd build_unix; make install prefix=%I docdir=%I/share/doc/db42-ssl-doc/docs includedir=%I/include/db4) +binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify" +for binfile in $binfiles ; do + mv %i/bin/$binfile %i/bin/$binfile.%N +done << SplitOff: << Package: %N-shlibs @@ -37,7 +42,7 @@ Conflicts: db42-shlibs Provides: db42-shlibs Description: Shared Libraries for db42-ssl - Files: lib/libdb-4.2.dylib lib/libdb_cxx-4.2.dylib + Files: lib/libdb-4.2.dylib lib/libdb_cxx-4.2.dylib lib/libdb-4.2.la lib/libdb_cxx-4.2.la Shlibs: << %p/lib/libdb-4.2.dylib 4.2.0 %n (>= 4.2.50-1) %p/lib/libdb_cxx-4.2.dylib 4.2.0 %n (>= 4.2.50-1) @@ -47,11 +52,26 @@ SplitOff2: << Package: %N-bin Depends: %N-shlibs (= %v-%r) - Conflicts: db3-bin, db31 (<< 3.1.17-2), db4-bin, db4-ssl-bin, db41-bin, db42-bin, db41-ssl-bin - Replaces: db3-bin, db4 (<< 4.0.14-4), db31 (<< 3.1.17-2), db4-bin, db4-ssl-bin, db41-bin, db42-bin, db41-ssl-bin + Conflicts: db3-bin (<< 3.3.11-25), db31 (<< 3.1.17-2), db4-ssl-bin (<< 4.0.14-24), db4-bin (<< 4.0.14-24), db41-ssl-bin (<< 4.1.25-20), db42-bin, db41-bin (<< 4.1.25-20) + Replaces: db3-bin (<< 3.3.11-25), db4 (<< 4.0.14-4), db31 (<< 3.1.17-2), db4-ssl-bin (<< 4.0.14-24), db4-bin (<< 4.0.14-24), db41-ssl-bin (<< 4.1.25-20), db42-bin, db41-bin (<< 4.1.25-20) Description: Binary utilities for db42-ssl Files: bin DocFiles: LICENSE + PostInstScript: << + binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify" + priority=`echo %N | sed -e 's/[^0-9]//g'` + for binfile in $binfiles ; do + update-alternatives --install %p/bin/$binfile $binfile %p/bin/$binfile.%N $priority + done + << + PreRmScript: << + if [ $1 != "upgrade" ]; then + binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify" + for binfile in $binfiles ; do + update-alternatives --remove $binfile %p/bin/$binfile.%N + done + fi +<< << SplitOff3: << Package: %N-doc --- NEW FILE: gnome-vfs-ssl.patch --- diff -Naur gnome-vfs-1.0.5.old/Makefile.in gnome-vfs-1.0.5.new/Makefile.in --- gnome-vfs-1.0.5.old/Makefile.in Sat Mar 16 05:51:15 2002 +++ gnome-vfs-1.0.5.new/Makefile.in Fri May 10 00:52:27 2002 @@ -188,7 +188,7 @@ cxxflags_set = @cxxflags_set@ l = @l@ @[EMAIL PROTECTED] = doc [EMAIL PROTECTED]@SUBDIRS_GNOME = doc test [EMAIL PROTECTED]@SUBDIRS_GNOME = doc SUBDIRS = libgnomevfs libgnomevfs-pthread idl modules devel-docs $(SUBDIRS_GNOME) po diff -Naur gnome-vfs-1.0.5.old/config.h.in gnome-vfs-1.0.5.new/config.h.in --- gnome-vfs-1.0.5.old/config.h.in Fri Mar 15 12:34:58 2002 +++ gnome-vfs-1.0.5.new/config.h.in Wed May 22 02:06:21 2002 @@ -111,6 +111,12 @@ /* Define if you have the statvfs function. */ #undef HAVE_STATVFS +/* Define if you have the strptime function. */ +#undef HAVE_STRPTIME + +/* Define if you have the readdir_r function. */ +#undef HAVE_READDIR_R + /* Define if you have the stpcpy function. */ #undef HAVE_STPCPY diff -Naur gnome-vfs-1.0.5.old/configure gnome-vfs-1.0.5.new/configure --- gnome-vfs-1.0.5.old/configure Fri Mar 15 15:57:17 2002 +++ gnome-vfs-1.0.5.new/configure Wed Jun 12 06:56:52 2002 @@ -3608,7 +3608,7 @@ darwin* | rhapsody*) case "$host_os" in rhapsody* | darwin1.[012]) - allow_undefined_flag='-undefined suppress' + allow_undefined_flag='-undefined suppress -flat_namespace' ;; *) # Darwin 1.3 on allow_undefined_flag='-flat_namespace -undefined suppress' @@ -3617,7 +3617,7 @@ # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -8869,7 +8869,7 @@ fi -for ac_func in getdtablesize open64 lseek64 statvfs +for ac_func in getdtablesize open64 lseek64 statvfs strptime readdir_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:8876: checking for $ac_func" >&5 diff -Naur gnome-vfs-1.0.5.old/devel-docs/Makefile.in gnome-vfs-1.0.5.new/devel-docs/Makefile.in --- gnome-vfs-1.0.5.old/devel-docs/Makefile.in Sat Mar 16 05:51:24 2002 +++ gnome-vfs-1.0.5.new/devel-docs/Makefile.in Fri May 10 00:52:27 2002 @@ -193,7 +193,7 @@ TEXT_FILES = gnome-vfs-mime-type-handling.txt -docdir = $(prefix)/doc +docdir = $(prefix)/share/doc doc_DATA = mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff -Naur gnome-vfs-1.0.5.old/libgnomevfs/Makefile.in gnome-vfs-1.0.5.new/libgnomevfs/Makefile.in --- gnome-vfs-1.0.5.old/libgnomevfs/Makefile.in Sat Mar 16 05:51:17 2002 +++ gnome-vfs-1.0.5.new/libgnomevfs/Makefile.in Fri May 10 00:56:28 2002 @@ -208,7 +208,7 @@ libgnomevfsinclude_HEADERS = gnome-vfs-application-registry.h gnome-vfs-async-ops.h gnome-vfs-backend.h gnome-vfs-cancellable-ops.h gnome-vfs-cancellation.h gnome-vfs-configuration.h gnome-vfs-context.h gnome-vfs-directory-filter.h gnome-vfs-directory.h gnome-vfs-file-info.h gnome-vfs-file-size.h gnome-vfs-find-directory.h gnome-vfs-handle.h gnome-vfs-inet-connection.h gnome-vfs-init.h gnome-vfs-iobuf.h gnome-vfs-messages.h gnome-vfs-method.h gnome-vfs-mime-handlers.h gnome-vfs-mime-info.h gnome-vfs-mime-magic.h gnome-vfs-mime-monitor.h gnome-vfs-mime-sniff-buffer.h gnome-vfs-mime.h gnome-vfs-module-callback-module-api.h gnome-vfs-module-callback.h gnome-vfs-module-shared.h gnome-vfs-module.h gnome-vfs-ops.h gnome-vfs-parse-ls.h gnome-vfs-private-utils.h gnome-vfs-private.h gnome-vfs-regexp-filter.h gnome-vfs-result.h gnome-vfs-seekable.h gnome-vfs-shellpattern-filter.h gnome-vfs-soc ket-buffer.h gnome-vfs-socket.h gnome-vfs-ssl-private.h gnome-vfs-ssl.h gnome-vfs-standard-callbacks.h gnome-vfs-transform.h gnome-vfs-types.h gnome-vfs-uri.h gnome-vfs-utils.h gnome-vfs-xfer.h gnome-vfs.h $(NULL) -libgnomevfs_la_SOURCES = fnmatch.c gnome-vfs-application-registry.c gnome-vfs-async-ops.c gnome-vfs-backend.c gnome-vfs-cancellable-ops.c gnome-vfs-cancellation.c gnome-vfs-configuration.c gnome-vfs-context.c gnome-vfs-directory-filter.c gnome-vfs-directory.c gnome-vfs-file-info.c gnome-vfs-find-directory.c gnome-vfs-handle.c gnome-vfs-i18n.c gnome-vfs-inet-connection.c gnome-vfs-init.c gnome-vfs-iobuf.c gnome-vfs-messages.c gnome-vfs-method.c gnome-vfs-mime-handlers.c gnome-vfs-mime-info.c gnome-vfs-mime-magic.c gnome-vfs-mime-monitor.c gnome-vfs-mime-sniff-buffer.c gnome-vfs-mime.c gnome-vfs-module-callback-module-api.c gnome-vfs-module-callback-private.c gnome-vfs-module-callback.c gnome-vfs-module-shared.c gnome-vfs-module.c gnome-vfs-ops.c gnome-vfs-parse-ls.c gnome-vfs-private-utils.c gnome-vfs-private.c gnome-vfs-process.c gnome-vfs-regexp-filter.c gnome-vfs-result.c gnome- vfs-seekable.c gnome-vfs-shellpattern-filter.c gnome-vfs-socket-buffer.c gnome-vfs-socket.c gnome-vfs-ssl.c gnome-vfs-transform.c gnome-vfs-uri.c gnome-vfs-utils.c gnome-vfs-xfer.c fnmatch.h gnome-vfs-mime-private.h gnome-vfs-mime-sniff-buffer-private.h gnome-vfs-module-callback-private.h gnome-vfs-process.h $(NULL) +libgnomevfs_la_SOURCES = strptime.c fnmatch.c gnome-vfs-application-registry.c gnome-vfs-async-ops.c gnome-vfs-backend.c gnome-vfs-cancellable-ops.c gnome-vfs-cancellation.c gnome-vfs-configuration.c gnome-vfs-context.c gnome-vfs-directory-filter.c gnome-vfs-directory.c gnome-vfs-file-info.c gnome-vfs-find-directory.c gnome-vfs-handle.c gnome-vfs-i18n.c gnome-vfs-inet-connection.c gnome-vfs-init.c gnome-vfs-iobuf.c gnome-vfs-messages.c gnome-vfs-method.c gnome-vfs-mime-handlers.c gnome-vfs-mime-info.c gnome-vfs-mime-magic.c gnome-vfs-mime-monitor.c gnome-vfs-mime-sniff-buffer.c gnome-vfs-mime.c gnome-vfs-module-callback-module-api.c gnome-vfs-module-callback-private.c gnome-vfs-module-callback.c gnome-vfs-module-shared.c gnome-vfs-module.c gnome-vfs-ops.c gnome-vfs-parse-ls.c gnome-vfs-private-utils.c gnome-vfs-private.c gnome-vfs-process.c gnome-vfs-regexp-filter.c gnome-vfs-res ult.c gnome-vfs-seekable.c gnome-vfs-shellpattern-filter.c gnome-vfs-socket-buffer.c gnome-vfs-socket.c gnome-vfs-ssl.c gnome-vfs-transform.c gnome-vfs-uri.c gnome-vfs-utils.c gnome-vfs-xfer.c fnmatch.h gnome-vfs-mime-private.h gnome-vfs-mime-sniff-buffer-private.h gnome-vfs-module-callback-private.h gnome-vfs-process.h $(NULL) noinst_HEADERS = gnome-vfs-backend-private.h @@ -228,7 +228,7 @@ LIBS = @LIBS@ libgnomevfs_la_LDFLAGS = libgnomevfs_la_DEPENDENCIES = libcharset/libcharset.la -libgnomevfs_la_OBJECTS = fnmatch.lo gnome-vfs-application-registry.lo \ +libgnomevfs_la_OBJECTS = strptime.lo fnmatch.lo gnome-vfs-application-registry.lo \ gnome-vfs-async-ops.lo gnome-vfs-backend.lo \ gnome-vfs-cancellable-ops.lo gnome-vfs-cancellation.lo \ gnome-vfs-configuration.lo gnome-vfs-context.lo \ @@ -494,6 +494,7 @@ || exit 1; \ fi; \ done +strptime.lo strptime.o : strptime.c fnmatch.lo fnmatch.o : fnmatch.c ../config.h fnmatch.h gnome-vfs-application-registry.lo gnome-vfs-application-registry.o : \ gnome-vfs-application-registry.c ../config.h \ diff -Naur gnome-vfs-1.0.5.old/libgnomevfs/fnmatch.c gnome-vfs-1.0.5.new/libgnomevfs/fnmatch.c --- gnome-vfs-1.0.5.old/libgnomevfs/fnmatch.c Tue Jul 17 03:21:06 2001 +++ gnome-vfs-1.0.5.new/libgnomevfs/fnmatch.c Fri May 10 00:52:27 2002 @@ -54,6 +54,9 @@ /* Match STRING against the filename pattern PATTERN, returning zero if it matches, nonzero if not. */ +#if defined(__APPLE__) +__private_extern__ +#endif int fnmatch (pattern, string, flags) const char *pattern; diff -Naur gnome-vfs-1.0.5.old/libgnomevfs/gnome-vfs-backend.c gnome-vfs-1.0.5.new/libgnomevfs/gnome-vfs-backend.c --- gnome-vfs-1.0.5.old/libgnomevfs/gnome-vfs-backend.c Sun Nov 25 09:48:21 2001 +++ gnome-vfs-1.0.5.new/libgnomevfs/gnome-vfs-backend.c Fri May 10 00:52:27 2002 @@ -70,7 +70,7 @@ g_strdown (backend_lower); short_name = g_strdup_printf ("gnomevfs-%s", backend); - backend_filename = g_module_build_path (NULL, short_name); + backend_filename = g_module_build_path ("<LIBDIR>", short_name); gmod = g_module_open (backend_filename, G_MODULE_BIND_LAZY); if (gmod == NULL) { diff -Naur gnome-vfs-1.0.5.old/libgnomevfs/gnome-vfs-mime.h gnome-vfs-1.0.5.new/libgnomevfs/gnome-vfs-mime.h --- gnome-vfs-1.0.5.old/libgnomevfs/gnome-vfs-mime.h Fri Mar 15 12:33:01 2002 +++ gnome-vfs-1.0.5.new/libgnomevfs/gnome-vfs-mime.h Fri May 10 00:52:27 2002 @@ -25,12 +25,12 @@ #define GNOME_VFS_MIME_H #include <ctype.h> +#include <sys/types.h> #include <dirent.h> #include <libgnomevfs/gnome-vfs-uri.h> #include <stdio.h> #include <string.h> #include <sys/stat.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { diff -Naur gnome-vfs-1.0.5.old/libgnomevfs/strptime.c gnome-vfs-1.0.5.new/libgnomevfs/strptime.c --- gnome-vfs-1.0.5.old/libgnomevfs/strptime.c Thu Jan 1 09:00:00 1970 +++ gnome-vfs-1.0.5.new/libgnomevfs/strptime.c Tue May 21 22:56:58 2002 @@ -0,0 +1,368 @@ +/* + * Copyright (c) 1994 Powerdog Industries. All rights reserved. + * + * Redistribution and use in source and binary forms, without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgement: + * This product includes software developed by Powerdog Industries. + * 4. The name of Powerdog Industries may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY POWERDOG INDUSTRIES ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE POWERDOG INDUSTRIES BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <config.h> + +#ifndef HAVE_STRPTIME + +#include <time.h> +#include <ctype.h> +#include <locale.h> +#include <string.h> + +#define asizeof(a) (sizeof (a) / sizeof ((a)[0])) + +struct dtconv { + char *abbrev_month_names[12]; + char *month_names[12]; + char *abbrev_weekday_names[7]; + char *weekday_names[7]; + char *time_format; + char *sdate_format; + char *dtime_format; + char *am_string; + char *pm_string; + char *ldate_format; +}; + +static struct dtconv En_US = { + { "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }, + { "January", "February", "March", "April", + "May", "June", "July", "August", + "September", "October", "November", "December" }, + { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }, + { "Sunday", "Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday" }, + "%H:%M:%S", + "%m/%d/%y", + "%a %b %e %T %Z %Y", + "AM", + "PM", + "%A, %B, %e, %Y" +}; + +#if defined(__APPLE__) +__private_extern__ +#endif +char * +strptime(char *buf, char *fmt, struct tm *tm) +{ + char c, *ptr; + int i, len = 0; + + ptr = fmt; + while (*ptr != 0) + { + if (*buf == 0) + break; + + c = *ptr++; + + if (c != '%') + { + if (isspace(c)) + while (*buf != 0 && isspace(*buf)) + buf++; + else if (c != *buf++) + return 0; + continue; + } + + c = *ptr++; + switch (c) + { + case 0: + case '%': + if (*buf++ != '%') + return 0; + break; + + case 'C': + buf = strptime(buf, En_US.ldate_format, tm); + if (buf == 0) + return 0; + break; + + case 'c': + buf = strptime(buf, "%x %X", tm); + if (buf == 0) + return 0; + break; + + case 'D': + buf = strptime(buf, "%m/%d/%y", tm); + if (buf == 0) + return 0; + break; + + case 'R': + buf = strptime(buf, "%H:%M", tm); + if (buf == 0) + return 0; + break; + + case 'r': + buf = strptime(buf, "%I:%M:%S %p", tm); + if (buf == 0) + return 0; + break; + + case 'T': + buf = strptime(buf, "%H:%M:%S", tm); + if (buf == 0) + return 0; + break; + + case 'X': + buf = strptime(buf, En_US.time_format, tm); + if (buf == 0) + return 0; + break; + + case 'x': + buf = strptime(buf, En_US.sdate_format, tm); + if (buf == 0) + return 0; + break; + + case 'j': + if (!isdigit(*buf)) + return 0; + + for (i = 0; *buf != 0 && isdigit(*buf); buf++) + { + i *= 10; + i += *buf - '0'; + } + if (i > 365) + return 0; + + tm->tm_yday = i; + break; + + case 'M': + case 'S': + if (*buf == 0 || isspace(*buf)) + break; + + if (!isdigit(*buf)) + return 0; + + for (i = 0; *buf != 0 && isdigit(*buf); buf++) + { + i *= 10; + i += *buf - '0'; + } + if (i > 59) + return 0; + + if (c == 'M') + tm->tm_min = i; + else + tm->tm_sec = i; + + if (*buf != 0 && isspace(*buf)) + while (*ptr != 0 && !isspace(*ptr)) + ptr++; + break; + + case 'H': + case 'I': + case 'k': + case 'l': + if (!isdigit(*buf)) + return 0; + + for (i = 0; *buf != 0 && isdigit(*buf); buf++) + { + i *= 10; + i += *buf - '0'; + } + if (c == 'H' || c == 'k') { + if (i > 23) + return 0; + } else if (i > 11) + return 0; + + tm->tm_hour = i; + + if (*buf != 0 && isspace(*buf)) + while (*ptr != 0 && !isspace(*ptr)) + ptr++; + break; + + case 'p': + len = strlen(En_US.am_string); + if (strncasecmp(buf, En_US.am_string, len) == 0) + { + if (tm->tm_hour > 12) + return 0; + if (tm->tm_hour == 12) + tm->tm_hour = 0; + buf += len; + break; + } + + len = strlen(En_US.pm_string); + if (strncasecmp(buf, En_US.pm_string, len) == 0) + { + if (tm->tm_hour > 12) + return 0; + if (tm->tm_hour != 12) + tm->tm_hour += 12; + buf += len; + break; + } + + return 0; + + case 'A': + case 'a': + for (i = 0; i < asizeof(En_US.weekday_names); i++) + { + len = strlen(En_US.weekday_names[i]); + if (strncasecmp(buf, + En_US.weekday_names[i], + len) == 0) + break; + + len = strlen(En_US.abbrev_weekday_names[i]); + if (strncasecmp(buf, + En_US.abbrev_weekday_names[i], + len) == 0) + break; + } + if (i == asizeof(En_US.weekday_names)) + return 0; + + tm->tm_wday = i; + buf += len; + break; + + case 'd': + case 'e': + if (!isdigit(*buf)) + return 0; + + for (i = 0; *buf != 0 && isdigit(*buf); buf++) + { + i *= 10; + i += *buf - '0'; + } + if (i > 31) + return 0; + + tm->tm_mday = i; + + if (*buf != 0 && isspace(*buf)) + while (*ptr != 0 && !isspace(*ptr)) + ptr++; + break; + + case 'B': + case 'b': + case 'h': + for (i = 0; i < asizeof(En_US.month_names); i++) + { + len = strlen(En_US.month_names[i]); + if (strncasecmp(buf, + En_US.month_names[i], + len) == 0) + break; + + len = strlen(En_US.abbrev_month_names[i]); + if (strncasecmp(buf, + En_US.abbrev_month_names[i], + len) == 0) + break; + } + if (i == asizeof(En_US.month_names)) + return 0; + + tm->tm_mon = i; + buf += len; + break; + + case 'm': + if (!isdigit(*buf)) + return 0; + + for (i = 0; *buf != 0 && isdigit(*buf); buf++) + { + i *= 10; + i += *buf - '0'; + } + if (i < 1 || i > 12) + return 0; + + tm->tm_mon = i - 1; + + if (*buf != 0 && isspace(*buf)) + while (*ptr != 0 && !isspace(*ptr)) + ptr++; + break; + + case 'Y': + case 'y': + if (*buf == 0 || isspace(*buf)) + break; + + if (!isdigit(*buf)) + return 0; + + for (i = 0; *buf != 0 && isdigit(*buf); buf++) + { + i *= 10; + i += *buf - '0'; + } + if (c == 'y' && i < 69) /* Unix Epoch pivot year */ + i += 100; + if (c == 'Y') + i -= 1900; + if (i < 0) + return 0; + + tm->tm_year = i; + + if (*buf != 0 && isspace(*buf)) + while (*ptr != 0 && !isspace(*ptr)) + ptr++; + break; + } + } + + return buf; +} + +#endif /* !HAVE_STRPTIME */ + diff -Naur gnome-vfs-1.0.5.old/libgnomevfs-pthread/Makefile.in gnome-vfs-1.0.5.new/libgnomevfs-pthread/Makefile.in --- gnome-vfs-1.0.5.old/libgnomevfs-pthread/Makefile.in Sat Mar 16 05:51:20 2002 +++ gnome-vfs-1.0.5.new/libgnomevfs-pthread/Makefile.in Fri May 10 00:52:27 2002 @@ -199,7 +199,7 @@ libgnomevfs_pthread_la_SOURCES = gnome-vfs-pthread.c gnome-vfs-thread-pool.c gnome-vfs-async-job-map.c gnome-vfs-async-ops.c gnome-vfs-job-slave.c gnome-vfs-job.c -libgnomevfs_pthread_la_LDFLAGS = -module -avoid-version +libgnomevfs_pthread_la_LDFLAGS = -export_dynamic -avoid-version -module mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff -Naur gnome-vfs-1.0.5.old/ltmain.sh gnome-vfs-1.0.5.new/ltmain.sh --- gnome-vfs-1.0.5.old/ltmain.sh Fri Mar 15 15:57:11 2002 +++ gnome-vfs-1.0.5.new/ltmain.sh Fri May 10 19:04:10 2002 @@ -2892,7 +2892,18 @@ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else + save_deplibs="$deplibs" + for conv in $convenience; do + tmp_deplibs= + for test_deplib in $deplibs; do + if test "$test_deplib" != "$conv"; then + tmp_deplibs="$tmp_deplibs $test_deplib" + fi + done + deplibs="$tmp_deplibs" + done eval cmds=\"$archive_cmds\" + deplibs="$save_deplibs" fi IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do diff -Naur gnome-vfs-1.0.5.old/modules/Makefile.in gnome-vfs-1.0.5.new/modules/Makefile.in --- gnome-vfs-1.0.5.old/modules/Makefile.in Sat Mar 16 05:51:22 2002 +++ gnome-vfs-1.0.5.new/modules/Makefile.in Fri May 10 00:52:27 2002 @@ -199,7 +199,7 @@ @[EMAIL PROTECTED] = libcdda.la @[EMAIL PROTECTED] = -module_flags = -export_dynamic -avoid-version +module_flags = -export_dynamic -avoid-version -module modulesdir = $(libdir)/vfs/modules modules_LTLIBRARIES = $(CDDA_LTLIBS) libextfs.la libfile.la libvfs-test.la $(HTTP_LTLIBS) libbzip2.la libgzip.la libftp.la libnntp.la libvfs-pipe.la libvfs-translate.la libdesktop.la $(NULL) @@ -268,6 +268,7 @@ ### `ftp' method libftp_la_SOURCES = ftp-method.c ftp-method.h +libftp_la_LDFLAGS = $(module_flags) libftp_la_LDFLAGS = $(module_flags) diff -Naur gnome-vfs-1.0.5.old/modules/file-method.c gnome-vfs-1.0.5.new/modules/file-method.c --- gnome-vfs-1.0.5.old/modules/file-method.c Fri Mar 15 12:33:01 2002 +++ gnome-vfs-1.0.5.new/modules/file-method.c Tue May 21 23:07:17 2002 @@ -31,13 +31,15 @@ #include <glib.h> #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> +#include <sys/types.h> #include <dirent.h> #include <errno.h> #include <fcntl.h> #include <limits.h> +#ifdef HAVE_MALLOC_H #include <malloc.h> +#endif #include <sys/stat.h> -#include <sys/types.h> #include <unistd.h> #include <stdio.h> #include <utime.h> @@ -53,6 +55,44 @@ #include "gnome-vfs-module-shared.h" #include "file-method.h" + +#ifndef HAVE_READDIR_R +#include <pthread.h> + +static int +readdir_r (DIR *dirp, + struct dirent *entry, + struct dirent **result) +{ + static int readdir_mutex_inited = 0; + static pthread_mutex_t readdir_mutex; + struct dirent *tmp; + int old_errno; + + if (!readdir_mutex_inited) { + readdir_mutex_inited = 1; + pthread_mutex_init (&readdir_mutex, NULL); + } + + old_errno = errno; + errno = 0; + + pthread_mutex_lock (&readdir_mutex); + if ((tmp = readdir(dirp)) != NULL) + memcpy (entry, tmp, sizeof (*entry)); + pthread_mutex_unlock (&readdir_mutex); + + if (errno && !tmp) + return errno; + + if (!errno) + errno = old_errno; + + *result = (tmp) ? entry : NULL; + + return 0; +} +#endif /* HAVE_READDIR_R */ #ifdef PATH_MAX #define GET_PATH_MAX() PATH_MAX diff -NurB gnome-vfs-1.0.5-orig/doc/about.sgml gnome-vfs-1.0.5/doc/about.sgml --- gnome-vfs-1.0.5-orig/doc/about.sgml 2004-04-01 02:12:47.000000000 -0500 +++ gnome-vfs-1.0.5/doc/about.sgml 2004-04-01 02:13:19.000000000 -0500 @@ -83,7 +83,7 @@ <para> The GnomeVFS equivalent is very similar, but you will notice slightly different data types. The consistent returning of a GnomeVFSResult also necessitated moving the return value of read into - a pass-back-value pointer <variable>bytes_read</variable>: + a pass-back-value pointer <varname>bytes_read</varname>: <programlisting> GnomeVFSResult gnome_vfs_read (GnomeVFSHandle *handle, gpointer buffer, diff -NurB gnome-vfs-1.0.5-orig/doc/gnome-vfs-docs.sgml gnome-vfs-1.0.5/doc/gnome-vfs-docs.sgml --- gnome-vfs-1.0.5-orig/doc/gnome-vfs-docs.sgml 2004-04-01 02:12:47.000000000 -0500 +++ gnome-vfs-1.0.5/doc/gnome-vfs-docs.sgml 2004-04-01 02:40:00.000000000 -0500 @@ -18,7 +18,6 @@ <!entity gnome-vfs-inet-connection SYSTEM "sgml/inet-connection.sgml"> <!entity gnome-vfs-init SYSTEM "sgml/init.sgml"> <!entity gnome-vfs-iobuf SYSTEM "sgml/iobuf.sgml"> -<!entity gnome-vfs-list-sort SYSTEM "sgml/list-sort.sgml"> <!entity gnome-vfs-method SYSTEM "sgml/method.sgml"> <!entity gnome-vfs-mime-handlers SYSTEM "sgml/mime-handlers.sgml"> <!entity gnome-vfs-mime-info SYSTEM "sgml/mime-info.sgml"> @@ -94,7 +93,7 @@ without the use of threads. </para> &gnome-vfs-async-ops; - <--FIXME: should we display this?gnome-vfs-cancellable-ops--> + <!--FIXME: should we display this?gnome-vfs-cancellable-ops--> &gnome-vfs-ops; &gnome-vfs-directory; &gnome-vfs-xfer; @@ -136,12 +135,12 @@ read-write, seeking, etc). Modules are dynamically loaded based upon the URI scheme passed into the high-level GnomeVFS APIs. </para> - &writing-modules; &gnome-vfs-method; &gnome-vfs-module-shared; &gnome-vfs-module; &gnome-vfs-module-callback-module-api; </chapter> + &writing-modules; <chapter id="everything-else"> <title>Other APIs</title> @@ -152,11 +151,10 @@ &gnome-vfs-directory-filter; &gnome-vfs-file-size; &gnome-vfs-find-directory; - <--FIXME: I think this should be private: gnome-vfs-handle--> + <!--FIXME: I think this should be private: gnome-vfs-handle--> &gnome-vfs-inet-connection; &gnome-vfs-init; &gnome-vfs-iobuf; - &gnome-vfs-list-sort; &gnome-vfs-module-callback; &gnome-vfs-standard-callbacks; &gnome-vfs-parse-ls; diff -NurB gnome-vfs-1.0.5-orig/doc/gnome-vfs-sections.txt gnome-vfs-1.0.5/doc/gnome-vfs-sections.txt --- gnome-vfs-1.0.5-orig/doc/gnome-vfs-sections.txt 2004-04-01 02:12:47.000000000 -0500 +++ gnome-vfs-1.0.5/doc/gnome-vfs-sections.txt 2004-04-01 03:16:07.000000000 -0500 @@ -194,7 +194,7 @@ <SECTION> <FILE>find-directory</FILE> -<TITLE>Find Directory</TITLE> +<TITLE>Find Directory Section</TITLE> gnome_vfs_find_directory </SECTION> @@ -224,6 +224,7 @@ <SECTION> <FILE>init</FILE> +<TITLE>Init Section</TITLE> gnome_vfs_init gnome_vfs_initialized gnome_vfs_shutdown diff -NurB gnome-vfs-1.0.5-orig/doc/tmpl/list-sort.sgml gnome-vfs-1.0.5/doc/tmpl/list-sort.sgml --- gnome-vfs-1.0.5-orig/doc/tmpl/list-sort.sgml 2004-04-01 02:12:47.000000000 -0500 +++ gnome-vfs-1.0.5/doc/tmpl/list-sort.sgml 1969-12-31 19:00:00.000000000 -0500 @@ -1,38 +0,0 @@ -<!-- ##### SECTION Title ##### --> -list-sort - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### USER_FUNCTION GnomeVFSListCompareFunc ##### --> -<para> - -</para> - [EMAIL PROTECTED]: [EMAIL PROTECTED]: [EMAIL PROTECTED]: [EMAIL PROTECTED]: - - -<!-- ##### FUNCTION gnome_vfs_list_sort ##### --> -<para> - -</para> - [EMAIL PROTECTED]: [EMAIL PROTECTED]: [EMAIL PROTECTED]: [EMAIL PROTECTED]: - - diff -NurB gnome-vfs-1.0.5-orig/doc/tmpl/standard-callbacks.sgml gnome-vfs-1.0.5/doc/tmpl/standard-callbacks.sgml --- gnome-vfs-1.0.5-orig/doc/tmpl/standard-callbacks.sgml 2004-04-01 02:12:47.000000000 -0500 +++ gnome-vfs-1.0.5/doc/tmpl/standard-callbacks.sgml 2004-04-01 02:32:34.000000000 -0500 @@ -24,7 +24,7 @@ </para> -</para><informaltable pgwide=1 frame="none" role="params"> +<informaltable pgwide=1 frame="none" role="params"> <tgroup cols="2"> <colspec colwidth="2*"> <colspec colwidth="8*"> diff -NurB gnome-vfs-1.0.5-orig/doc/writing-modules.sgml gnome-vfs-1.0.5/doc/writing-modules.sgml --- gnome-vfs-1.0.5-orig/doc/writing-modules.sgml 2004-04-01 02:12:47.000000000 -0500 +++ gnome-vfs-1.0.5/doc/writing-modules.sgml 2004-04-01 02:21:20.000000000 -0500 @@ -6,7 +6,6 @@ GNOME Virtual File System. </para> </abstract> - </artheader> <sect1 id="Introduction"> <title>Introduction</title> --- NEW FILE: db43-ssl.info --- Package: db43-ssl Version: 4.3.27 Revision: 1 Source: ftp://ftp.sleepycat.com/releases/db-%v.tar.gz Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, db42, db43 Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, db42, db43 Depends: db43-ssl-shlibs (= %v-%r) | db43-shlibs (=%v-%r) BuildDependsOnly: true NoSetLDFlags: true NoSetCPPFlags: true SetCFlags: -Os SetCXXFlags: -Os #Patch: %n.patch ConfigureParams: --enable-compat185 --enable-cxx --includedir=%p/include/db4 GCC: 3.3 CompileScript: << #! /bin/sh -ex VERSIONS="-avoid-version -XCClinker -current_version -XCClinker %v -XCClinker -compatibility_version -XCClinker 4.3 -no-undefined" LIBDB="libdb-4.3.la" LIBDBCXX="libdb_cxx-4.3.la" cd build_unix; F77=no ../dist/configure %c perl -pi.bak -e 's,api_java,,g' Makefile make UTIL_PROGS="" rm ".libs/$LIBDB" $LIBDB make SOLINK="\$(LIBTOOL) --mode=link --tag=CC gcc $VERSIONS" UTIL_PROGS="" rm ".libs/$LIBDBCXX" $LIBDBCXX make XSOLINK="\$(LIBTOOL) --mode=link --tag=CXX g++ $VERSIONS" UTIL_PROGS="" make << InstallScript: << #! /bin/sh -ev (cd build_unix; make install prefix=%I docdir=%I/share/doc/db43-ssl-doc/docs includedir=%I/include/db4) binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify" for binfile in $binfiles ; do mv %i/bin/$binfile %i/bin/$binfile.%N done << SplitOff: << Package: %N-shlibs Replaces: db43-shlibs Conflicts: db43-shlibs Description: Shared Libraries for db43 Files: lib/libdb-4.3.dylib lib/libdb_cxx-4.3.dylib lib/libdb-4.3.la lib/libdb_cxx-4.3.la Shlibs: << %p/lib/libdb-4.3.dylib 4.3.0 %n (>= 4.3.21-1) %p/lib/libdb_cxx-4.3.dylib 4.3.0 %n (>= 4.3.21-1) << DocFiles: LICENSE << SplitOff2: << Package: %N-bin Depends: %N-shlibs (= %v-%r) Conflicts: db3-bin (<< 3.3.11-25), db31 (<< 3.1.17-2), db4-ssl-bin (<< 4.0.14-24), db4-bin (<< 4.0.14-24), db41-ssl-bin (<< 4.1.25-20), db42-ssl-bin (<< 4.2.52-14), db41-bin (<< 4.1.25-20), db42-bin (<< 4.2.52-14), db43-bin Replaces: db3-bin, db4 (<< 4.0.14-4), db31 (<< 3.1.17-2), db4-ssl-bin (<< 4.0.14-24), db4-bin (<< 4.0.14-24), db41-ssl-bin (<< 4.1.25-20), db42-ssl-bin (<< 4.2.52-14), db41-bin (<< 4.1.25-20), db42-bin (<< 4.2.52-14), db43-bin Description: Binary utilities for db43-ssl Files: bin DocFiles: LICENSE PostInstScript: << binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify" priority=`echo %N | sed -e 's/[^0-9]//g'` for binfile in $binfiles ; do update-alternatives --install %p/bin/$binfile $binfile %p/bin/$binfile.%N $priority done << PreRmScript: << if [ $1 != "upgrade" ]; then binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify" for binfile in $binfiles ; do update-alternatives --remove $binfile %p/bin/$binfile.%N done fi << << SplitOff3: << Package: %N-doc Description: Documentation for db43-ssl Files: share/doc/db43-ssl-doc DocFiles: LICENSE << DocFiles: LICENSE README License: OSI-Approved Description: Berkeley DB embedded database - non crypto Homepage: http://www.sleepycat.com/ Maintainer: Peter O'Gorman <[EMAIL PROTECTED]> Source-MD5: fcc481d52c3b80e20a328f8c0cb042bd --- NEW FILE: gnucash-hbci.info --- Package: gnucash-hbci Version: 1.8.11 Revision: 21 Depends: gnucash (= %v-%r), aqbanking-shlibs (>= 1.0.4-1beta) BuildDepends: guppi16-dev (>= 0.40.3-2), g-wrap-dev (>= 1.3.4-3), gal21, gdk-pixbuf, glib, orbit-dev, libjpeg, libpng3, libtiff, netpbm, giflib, gdbm3, gmp, bonobo-dev, control-center-dev (>= 1.4.0.5-6), gconf-dev, glibwww, gnome-core-dev (>= 1.4.1-4), gnome-libs-dev, gnome-print-dev, gtkhtml1.1-dev (>= 1.1.7-12), oaf-dev, expat, guile16-dev, libole2, libwww, gnome-vfs-dev (>= 1.0.5-5) | gnome-vfs-ssl-dev (>= 1.0.5-7), libtool14, libofx1, doxygen, popt, imlib (>= 1.9.14-2), esound, opensp4-dev, libghttp, libglade, gettext-dev, gettext-bin, gettext-tools, libiconv-dev, texinfo, fink (>= 0.20.1-1), pkgconfig, aqbanking (>= 1.0.4-1beta), gwenhywfar (>= 1.7.2-1), ktoblzcheck, db43-ssl | db43 Source: mirror:sourceforge:gnucash/gnucash-%v.tar.gz Source-MD5: 62f94331936e37ed1b1d28b5a1863bb3 PatchScript: << #!/bin/sh -ex sed -e 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1 perl -pi.bak -e "s#need_relink=yes#need_relink=no#" ltmain.sh << NoSetLDFlags: true NoSetCPPFlags: true ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info --enable-prefer-db1=no --disable-static --enable-hbci --with-hbci-prefix=%p --enable-error-on-warning=no --libexecdir=%p/lib CompileScript: << #!/bin/sh -ex export LTDL_LIBRARY_PATH=%p/lib #export DYLD_LIBRARY_PATH=%p/lib export LIBRARY_PATH=%p/lib export CPATH=%p/include export CPPFLAGS="-no-cpp-precomp" guile16-build ./configure %c mv libtool libtool.old sed -e 's/^hardcode_direct.*/hardcode_direct=no/' -e 's/^hardcode_libdir_flag_spec.*/hardcode_libdir_flag_spec=\"\ \"/' < libtool.old > libtool chmod +x libtool echo "all:" > intl/Makefile echo "install:" >> intl/Makefile echo "#define HAVE_GETTEXT 1" >> config.h cd src/import-export/hbci/ guile16-build make LIBINTL="" LTLIBINTL="" USE_INCLUDED_LIBINTL="no" INTLLIBS="-lintl" << InstallScript: << #! /bin/sh export LTDL_LIBRARY_PATH=%p/lib export LIBRARY_PATH=%p/lib export CPATH=%p/include export CPPFLAGS="-no-cpp-precomp" cd src/import-export/hbci/ guile16-build make DESTDIR=%d install << DocFiles: COPYING doc/README.HBCI Description: Home Banking (Germany) modules for gnucash License: GPL Maintainer: Peter O'Gorman <[EMAIL PROTECTED]> Homepage: http://www.gnucash.org --- NEW FILE: gnome-vfs-ssl.info --- Package: gnome-vfs-ssl Version: 1.0.5 Revision: 30 Source: mirror:gnome:sources/gnome-vfs/1.0/gnome-vfs-%v.tar.bz2 Source-MD5: e2a17a6b178f54c43968241258f3e729 Depends: %N-shlibs (= %v-%r) | gnome-vfs-shlibs (= %v-%r) BuildDepends: pkgconfig, gtk-doc (>= 0.9-4), openssl097-dev, audiofile, db3 (>= 3.3.11-23), esound, glib, libjpeg, libpng3, libtiff, netpbm, orbit-dev (>= 0.5.17-15), readline (>= 4.3-15), giflib, imlib (>= 1.9.14-14), gconf (>= 1.0.9-21), gconf-dev (>= 1.0.9-21), gnome-libs-dev (>= 1.4.2-19), oaf-dev (>= 0.6.10-22), guile-dev (>= 1.4-16), libxml, popt, gettext-dev, gettext-bin, gettext-tools, libiconv-dev GCC: 3.3 Provides: gnome-vfs Conflicts: gnome-vfs Replaces: gnome-vfs PatchScript: sed -e 's|<LIBDIR>|%p/lib|g' <%a/%n.patch | patch -p1 UpdatePoMakefile: true SetCC: gcc-3.3 SetCPPFLAGS: -no-cpp-precomp SetLIBS: -L%p/lib NoSetLDFLAGS: true ConfigureParams: --with-openssl-libs=%p/lib --mandir=%p/share/man CompileScript: << ./configure %c make sed -e 's/-lssl//g' -e 's/-lcrypto//g' <libgnomevfs/.libs/libgnomevfs.lai >libgnomevfs.la << InstallScript: << make install DESTDIR=%d rm -f %i/lib/charset.alias install -c -m 644 libgnomevfs.la %i/lib/ << SplitOff: << Package: %N-shlibs Depends: gnome-mime-data, gtk+ (>= 1.2.10-20), oaf (>= 0.6.10-22), gconf-shlibs (>= 1.0.9-21), openssl097-shlibs Conflicts: gnome-vfs-shlibs Replaces: %N (<= 1.0.5-1), gnome-vfs (<= 1.0.5-1), gnome-vfs-shlibs Files: lib/libgnomevfs.0.0.0.dylib lib/libgnomevfs.0.dylib Shlibs: %p/lib/libgnomevfs.0.dylib 1.0.0 %n (>= 1.0.5-18) | gnome-vfs-shlibs (>= 1.0.5-18) DocFiles: AUTHORS COPYING* ChangeLog NEWS README << SplitOff2: << Package: %N-dev BuildDependsOnly: True Depends: %N-shlibs (= %v-%r) | gnome-vfs-shlibs (= %v-%r) Replaces: %N (<< 1.0.5-8), gnome-vfs (<= 1.0.5-8), gnome-vfs-dev Files: bin/*-config include lib/libgnomevfs.dylib lib/*.la lib/*.a lib/*.so lib/*.sh lib/gnome-vfs-1.0 DocFiles: AUTHORS COPYING* ChangeLog NEWS README << DocFiles: AUTHORS COPYING* ChangeLog NEWS README ConfFiles: %p/etc/vfs/modules/default-modules.conf Description: The GNOME virtual file-system libraries - SSL DescDetail: << GNOME VFS is the GNOME virtual file system. It is the foundation of the Nautilus file manager. It provides a modular architecture and ships with several modules that implement support for file systems, http, ftp and others. It provides a URI-based API, a backend supporting asynchronous file operations, a MIME type manipulation library and other features. << DescPort: << This patch does: - include <sys/types.h> before <dirent.h> - removed '#include <molloc.h>' - insert -module libtool flags for modules - insert '-flat_namespace' along with '-undefined suppress' for OS X 10.1 - add strptime() and readdir_r() - does not build test programs Newer openjade gives errors instead of warnings for some doc/ defects: http://bugs.gentoo.org/show_bug.cgi?id=46266 So use the patch from: http://mirror.hamakor.org.il/pub/mirrors/gentoo-portage/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch << DescPackaging: << Although this package has a GPL/LGPL license, it is marked Restrictive since it links to openssl. Remove -lssl and -lcrypto from *.la files to make dependent programs depends on those crypto libraries through gnome-vfs-ssl. Originally packaged by Masanori Sekino. << License: Restrictive Maintainer: None <fink-devel@lists.sourceforge.net> Homepage: http://www.gnome.org/ --- NEW FILE: gwenhywfar.info --- Package: gwenhywfar Version: 1.7.2 Revision: 2 Maintainer: Peter O'Gorman <[EMAIL PROTECTED]> BuildDependsOnly: true NoSetLDFlags: true NoSetCPPFlags: true SetCFlags: -Os SetCXXFlags: -Os BuildDepends: openssl097-dev, gettext-dev, gettext-bin, gettext-tools, libiconv-dev Depends: %N-shlibs PatchScript:<< #! /bin/sh -ev cd tools/dlgtest mv Makefile.in Makefile.in.bak cat Makefile.in.bak | sed -e 's#-L/mingw/lib -L../../src @[EMAIL PROTECTED]' -e 's#-lgwenui#-lgwenui -L../../src @[EMAIL PROTECTED]' > Makefile.in << ConfigureParams: --disable-dependency-tracking --with-openssl-includes=%p/include --with-openssl-libs=%p/lib Source: mirror:sourceforge:%n/%n-%v.tar.gz Source-MD5: a09a39dbfb375f682e641cf0811f8dba CompileScript: << #!/bin/sh -ev export LIBRARY_PATH=%p/lib export CPATH=%p/include ./configure %c find . -name Makefile | xargs perl -pi -e 's|-L%p/lib||g' make libgwenhywfar_la_LDFLAGS="-version-info 24:2:7 -Wl,-single_module" << InstallScript: << make libgwenhywfar_la_LDFLAGS="-version-info 24:2:7 -Wl,-single_module -Wl,-init,_GWEN_Init" install DESTDIR=%d find %i -name "*.la" | xargs perl -pi.bak -e "s|-L%b/([^\s\']*)||g" find %i -name "*.la.bak" | xargs rm -rf << DocFiles: COPYING README Description: Utility Library for aqbanking/openhbci-tng DescPort: << Bad link order fix (only affects static case, but what the hell) needs -singe_module to call __attribute__((constructor)) init routine << DescDetail: << This is Gwenhywfar, a multi-platform helper library for networking and security applications and libraries. It is heavily used by libchipcard www.libchipcard.de and OpenHBCI-TNG (The Next Generation) www.openhbci.de. << Splitoff: << Package: %N-shlibs Description: Shared libraries for gwenhywfar Files: << lib/libgwenhywfar.17.dylib lib/libgwenhywfar.17.7.2.dylib lib/libgwenpp.16.dylib lib/libgwenpp.16.0.0.dylib lib/libgwenui.1.dylib lib/libgwenui.1.0.1.dylib << Depends: openssl097-shlibs DocFiles: COPYING Shlibs: << %p/lib/libgwenhywfar.17.dylib 25.0.0 %n (>= 1.7.2-1) %p/lib/libgwenpp.16.dylib 17.0.0 %n (>= 1.7.2-1) %p/lib/libgwenui.1.dylib 2.0.0 %n (>= 1.7.2-1) << << Homepage: http://gwenhywfar.sourceforge.net License: LGPL --- NEW FILE: db42-ssl.patch --- *** foo/mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 --- foo/mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 *************** *** 440,446 **** c_mp->stat.st_pages--; alloc_bhp = NULL; R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); - MUTEX_LOCK(dbenv, &hp->hash_mutex); /* * We can't use the page we found in the pool if DB_MPOOL_NEW --- 440,445 ---- *************** *** 455,460 **** --- 454,462 ---- b_incr = 0; goto alloc; } + + /* We can use the page -- get the bucket lock. */ + MUTEX_LOCK(dbenv, &hp->hash_mutex); break; case SECOND_MISS: /* *** foo/mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 --- foo/mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 *************** *** 285,290 **** --- 285,291 ---- bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) if (bhp->priority != UINT32_T_MAX && bhp->priority > MPOOL_BASE_DECREMENT) + bhp->priority -= MPOOL_BASE_DECREMENT; MUTEX_UNLOCK(dbenv, &hp->hash_mutex); } } *** foo/lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 --- foo/lock/lock.c 2004-01-30 10:55:58.000000000 -0800 *************** *** 2216,2226 **** dp = (u_int8_t *)dp + \ sizeof(db_pgno_t); \ } while (0) ! #define COPY_OBJ(dp, obj) do { \ ! memcpy(dp, obj->data, obj->size); \ ! dp = (u_int8_t *)dp + \ ! ALIGN(obj->size, \ ! sizeof(u_int32_t)); \ } while (0) #define GET_COUNT(dp, count) do { \ --- 2216,2227 ---- dp = (u_int8_t *)dp + \ sizeof(db_pgno_t); \ } while (0) ! #define COPY_OBJ(dp, obj) do { \ ! memcpy(dp, \ ! (obj)->data, (obj)->size); \ ! dp = (u_int8_t *)dp + \ ! ALIGN((obj)->size, \ ! sizeof(u_int32_t)); \ } while (0) #define GET_COUNT(dp, count) do { \ *************** *** 2339,2345 **** for (i = 0; i < nlocks; i = j) { PUT_PCOUNT(dp, obj[i].ulen); PUT_SIZE(dp, obj[i].size); ! COPY_OBJ(dp, obj); lock = (DB_LOCK_ILOCK *)obj[i].data; for (j = i + 1; j <= i + obj[i].ulen; j++) { lock = (DB_LOCK_ILOCK *)obj[j].data; --- 2340,2346 ---- for (i = 0; i < nlocks; i = j) { PUT_PCOUNT(dp, obj[i].ulen); PUT_SIZE(dp, obj[i].size); ! COPY_OBJ(dp, &obj[i]); lock = (DB_LOCK_ILOCK *)obj[i].data; for (j = i + 1; j <= i + obj[i].ulen; j++) { lock = (DB_LOCK_ILOCK *)obj[j].data; ------------------------------------------------------- This SF.Net email is sponsored by Yahoo. Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits