Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3153/main/finkinfo/utils
Modified Files:
Tag: pangocairo-branch
bacula.info bacula.patch
Added Files:
Tag: pangocairo-branch
curlftpfs.info sshfs.info sshfs.patch
Log Message:
merge from head (pangocairo-root-7)
--- NEW FILE: sshfs.info ---
Package: sshfs
Version: 1.7
Revision: 3
Source: mirror:sourceforge:fuse/%n-fuse-%v.tar.gz
Source-MD5: e91a2fed1da952a375798408dc6e41a0
PatchFile: %n.patch
PatchFile-MD5: ded7579df87a384d2b74cf6413ba923f
BuildDepends: fuse-dev, glib2-dev, pkgconfig, libgettext3-dev, fink (>= 0.24.12)
Depends: fuse-shlibs, glib2-shlibs, libgettext3-shlibs
ConfigureParams: --disable-dependency-tracking
# pick up fuse_opt_parse
NoSetLDFLAGS: True
SetLDFLAGS: -L%p/lib -lfuse
#CompileScript: CFLAGS="-D__FreeBSD__=10 -O -g" ./configure --prefix=%p
--disable-dependency-tracking
DocFiles: README COPYING NEWS FAQ.txt
Description: FUSE ssh filesystem
DescDetail: <<
This is a filesystem client based on the SSH File Transfer
Protocol. Since most SSH servers already support this protocol it is
very easy to set up: i.e. on the server side there's nothing to do.
On the client side mounting the filesystem is as easy as logging into
the server with ssh: "sshfs host: mountpoint"
<<
DescUsage: <<
Invoking sshfs with the options
-oping_diskarb,volname="finder volume name"
will probably improve its interaction with the Finder.
<<
License: GPL
Homepage: http://fuse.sourceforge.net/sshfs.html
Maintainer: Brendan Cully <[EMAIL PROTECTED]>
Index: bacula.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/bacula.info,v
retrieving revision 1.2.2.10
retrieving revision 1.2.2.11
diff -u -d -r1.2.2.10 -r1.2.2.11
--- bacula.info 16 Jan 2007 16:03:24 -0000 1.2.2.10
+++ bacula.info 20 Jan 2007 15:54:00 -0000 1.2.2.11
@@ -1,8 +1,8 @@
Package: bacula
-Version: 2.0.0
+Version: 2.0.1
Revision: 2
GCC: 4.0
-Source-MD5: fbf990e64eb895a674c52c0de5acf0cd
+Source-MD5: a96b09064add09a3361facdf309c8e84
Source: mirror:sourceforge:bacula/bacula-%v.tar.gz
Depends: sqlite-shlibs, libncurses5-shlibs (>= 5.4-20041023-1006)
--- NEW FILE: sshfs.patch ---
diff -Naur old/Makefile.in new/Makefile.in
--- old/Makefile.in 2006-08-17 03:07:05.000000000 -0700
+++ new/Makefile.in 2007-01-05 23:13:17.000000000 -0800
@@ -588,6 +588,9 @@
uninstall-local
+ifeq "$(shell uname)" "Darwin"
+all-local:
+else
all-local: sshnodelay.so
install-exec-local: sshnodelay.so
@@ -599,6 +602,7 @@
sshnodelay.so:
$(CC) -Wall -W -s --shared -fPIC $(sshnodelay_libs) sshnodelay.c -o
sshnodelay.so
+endif
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -Naur old/sshfs.c new/sshfs.c
--- old/sshfs.c 2006-08-18 03:34:08.000000000 -0700
+++ new/sshfs.c 2007-01-05 21:07:40.000000000 -0800
@@ -18,7 +18,9 @@
#include <string.h>
#include <stdint.h>
#include <errno.h>
+#if !(__FreeBSD__ >= 10)
#include <semaphore.h>
+#endif
#include <pthread.h>
#include <netdb.h>
#include <signal.h>
@@ -100,6 +102,31 @@
#define SSHNODELAY_SO "sshnodelay.so"
+#if (__FreeBSD__ >= 10)
+
+#undef sem_t
+
+#undef sem_init
+#undef sem_destroy
+#undef sem_post
+#undef sem_wait
+
+#include <mach/mach.h>
+
+typedef semaphore_t sem_t;
+
+#define sem_init(s, a, b) \
+ semaphore_create(mach_task_self(), (s), SYNC_POLICY_FIFO, 0)
+#define sem_destroy(s) semaphore_destroy(mach_task_self(), (semaphore_t)*(s))
+#define sem_post(s) semaphore_signal((semaphore_t)*(s))
+#define sem_wait(s) semaphore_wait((semaphore_t)*(s))
+
+#ifndef LIBDIR
+#define LIBDIR "/usr/local/lib"
+#endif
+
+#endif
+
struct buffer {
uint8_t *p;
size_t len;
@@ -147,6 +174,9 @@
int is_seq;
int connver;
int modifver;
+#if (__FreeBSD__ >= 10)
+ int refs;
+#endif
};
struct sshfs {
@@ -687,8 +717,10 @@
} else if (pid == 0) {
int devnull;
+#if !(__FreeBSD__ >= 10)
if (sshfs.nodelay_workaround && do_ssh_nodelay_workaround() == -1)
fprintf(stderr, "warning: ssh nodelay workaround disabled\n");
+#endif
devnull = open("/dev/null", O_WRONLY);
@@ -1768,6 +1800,9 @@
pthread_cond_init(&sf->write_finished, NULL);
/* Assume random read after open */
sf->is_seq = 0;
+#if (__FreeBSD__ >= 10)
+ sf->refs = 1;
+#endif
sf->next_pos = 0;
sf->modifver= sshfs.modifver;
sf->connver = sshfs.connver;
@@ -1851,6 +1886,23 @@
return sshfs_flush(path, fi);
}
+#if (__FreeBSD__ >= 10)
+
+static void sshfs_file_put(struct sshfs_file *sf)
+{
+ sf->refs--;
+ if (!sf->refs)
+ g_free(sf);
+}
+
+static struct sshfs_file *sshfs_file_get(struct sshfs_file *sf)
+{
+ sf->refs++;
+ return sf;
+}
+
+#endif
+
static int sshfs_release(const char *path, struct fuse_file_info *fi)
{
struct sshfs_file *sf = get_sshfs_file(fi);
@@ -2109,8 +2161,13 @@
iov[1].iov_base = (void *) wbuf;
iov[1].iov_len = size;
if (!sshfs.sync_write && !sf->write_error)
+#if (__FreeBSD__ >= 10)
+ err = sftp_request_send(SSH_FXP_WRITE, iov, 2, sshfs_write_begin,
+ sshfs_write_end, 0, sshfs_file_get(sf), NULL);
+#else
err = sftp_request_send(SSH_FXP_WRITE, iov, 2, sshfs_write_begin,
sshfs_write_end, 0, sf, NULL);
+#endif
else
err = sftp_request_iov(SSH_FXP_WRITE, iov, 2, SSH_FXP_STATUS, NULL);
buf_free(&buf);
@@ -2149,6 +2206,11 @@
static int sshfs_create(const char *path, mode_t mode,
struct fuse_file_info *fi)
{
+#if (__FreeBSD__ >= 10)
+ if (fi) {
+ fi->flags |= O_CREAT;
+ }
+#endif
return sshfs_open_common(path, mode, fi);
}
Index: bacula.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/bacula.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- bacula.patch 6 Feb 2006 19:03:19 -0000 1.1
+++ bacula.patch 20 Jan 2007 15:54:01 -0000 1.1.2.1
@@ -18,3 +18,5 @@
bacula-fd: Makefile
@for I in ${fd_subdirs}; \
do (cd $$I; echo "==>Entering directory `pwd`"; \
+
+
--- NEW FILE: curlftpfs.info ---
Package: curlftpfs
Version: 0.9
Revision: 1
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: 7e29eb1963d4023bb7ea530a1b4274c4
BuildDepends: <<
fuse-dev,
glib2-dev,
libcurl4,
libgettext3-dev,
libiconv-dev,
pkgconfig,
system-openssl-dev
<<
Depends: <<
fuse-shlibs,
glib2-shlibs,
libcurl4-shlibs,
libgettext3-shlibs,
libiconv
<<
ConfigureParams: --disable-dependency-tracking --mandir=%i/share/man
SetLDFLAGS: -L%p/lib/system-openssl/lib
DocFiles: AUTHORS ChangeLog COPYING NEWS README
Description: FUSE ftp filesystem
DescDetail: <<
CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE and libcurl.
Features
CurlFtpFS differentiates itself from other FTP filesystems because it features:
* SSLv3 and TLSv1 support
* connecting through tunneling HTTP proxies
* automatic reconnection if the server times out
* transform absolute symlinks to point back into the ftp file system
<<
DescUsage: <<
To connect to an FTP server:
mkdir mountpoint
curlftpfs hostname mountpoint -oping_diskarb,volname="Volume Name"
To disconnect:
umount mountpoint
or eject from the Finder.
See curlftpfs man page for more options.
<<
License: GPL
Homepage: http://curlftpfs.sourceforge.net/
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
