[prev in list] [next in list] [prev in thread] [next in thread]
List: fink-commits
Subject: [cvs] dists/10.4/unstable/main/finkinfo/utils bacula.info, 1.2.2.19,
From: Benjamin Reed <rangerrick () users ! sourceforge ! net>
Date: 2007-04-30 2:48:32
Message-ID: E1HiLwl-0002bc-HZ () mail ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22221/main/finkinfo/utils
Modified Files:
Tag: pangocairo-branch
bacula.info bacula.patch clamav.info coreutils.info
coreutils.patch jless.info man.info man.patch modglue.info
p7zip.info prime-dict.info sshfs.info sshfs.patch
Log Message:
merge from head
Index: p7zip.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/p7zip.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- p7zip.info 19 Feb 2006 00:34:55 -0000 1.2
+++ p7zip.info 30 Apr 2007 02:48:29 -0000 1.2.2.1
@@ -1,16 +1,19 @@
Package: p7zip
-Version: 4.33
-Revision: 1001
+Version: 4.44
+Revision: 1002
GCC: 4.0
Description: File archiver with highest compression ratio
License: GPL/LGPL
-Maintainer: ASARI Takashi <asari@sodan.ecc.u-tokyo.ac.jp>
+Maintainer: Todai Fink Team <fink@sodan.ecc.u-tokyo.ac.jp>
Source: mirror:sourceforge:%n/%n_%v_src_all.tar.bz2
-Source-MD5: 6333633173f6bcd851ed087402af60d2
+Source-MD5: 78b04bed16a1e7e91b5bf2f1f84ab811
SourceDirectory: %n_%v
-PatchScript: /bin/cp -f makefile.macosx makefile.machine
+PatchScript: <<
+ /usr/bin/sed -i.bak '9s|${DEST_HOME}|%i|' install.sh
+ /bin/cp -f makefile.macosx makefile.machine
+<<
CompileScript: /usr/bin/make all2
InstallScript: <<
@@ -18,10 +21,6 @@
/usr/bin/sed -i.bak -e "2s|%i|%p|" %i/bin/7z
/usr/bin/sed -i.bak -e "2s|%i|%p|" %i/bin/7za
/bin/mv %i/bin/7z.bak %i/bin/7za.bak .
- /usr/bin/install -m 755 -d %i/share/doc
- /bin/cp -R DOCS %i/share/doc/%n
- /usr/bin/find %i/share/doc/%n -type f | /usr/bin/xargs /bin/chmod 644
- /usr/bin/find %i/share/doc -type d | /usr/bin/xargs /bin/chmod 755
<<
Homepage: http://p7zip.sourceforge.net/
Index: man.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/man.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- man.info 17 Mar 2006 12:48:26 -0000 1.2
+++ man.info 30 Apr 2007 02:48:29 -0000 1.2.2.1
@@ -1,9 +1,9 @@
Package: man
-Version: 1.6c
-Revision: 2
+Version: 1.6e
+Revision: 1
Maintainer: Todai Fink Team <fink@sodan.ecc.u-tokyo.ac.jp>
Source: http://primates.ximian.com/~flucifredi/man/man-%v.tar.gz
-Source-MD5: ac1e7d60dfedb7d1c6f398ae5b038996
+Source-MD5: d8187cd756398baefc48ba7d60ff6a8a
Depends: jgroff, nkf
License: GPL
Homepage: http://primates.ximian.com/~flucifredi/man/
Index: sshfs.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/sshfs.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- sshfs.patch 20 Jan 2007 15:54:01 -0000 1.1.2.2
+++ sshfs.patch 30 Apr 2007 02:48:29 -0000 1.1.2.3
@@ -1,27 +1,78 @@
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
-
++++ new/Makefile.in 2007-04-19 03:54:33.000000000 -0700
+@@ -597,8 +597,13 @@
+ uninstall-local:
+ rm -f "$(DESTDIR)$(libdir)/sshnodelay.so"
+ifeq "$(shell uname)" "Darwin"
-+all-local:
++sshnodelay.so:
++ $(CC) -Wall -dynamiclib $(CFLAGS) $(sshnodelay_libs) -install_name \
"$(DESTDIR)$(libdir)/sshnodelay.so" sshnodelay.c -o sshnodelay.so +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/README.MacFUSE new/README.MacFUSE
+--- old/README.MacFUSE 1969-12-31 16:00:00.000000000 -0800
++++ new/README.MacFUSE 2007-04-19 03:54:33.000000000 -0700
+@@ -0,0 +1,7 @@
++MacFUSE Project Page:
++
++http://code.google.com/p/macfuse/
++
++Making a Universal build of sshfs:
++
++CFLAGS="-D__FreeBSD__=10 -DSSH_NODELAY_WORKAROUND -O -g -arch i386 -arch ppc \
-isysroot /Developer/SDKs/MacOSX10.4u.sdk" LDFLAGS="-arch i386 -arch ppc" ./configure \
--prefix=/usr/local --disable-dependency-tracking +diff -Naur old/cache.c new/cache.c
+--- old/cache.c 2006-08-16 01:51:21.000000000 -0700
++++ new/cache.c 2007-04-19 03:54:33.000000000 -0700
+@@ -116,9 +116,20 @@
+ pthread_mutex_unlock(&cache.lock);
+ }
+
++static int cache_del_children(const char *key, void *val_, const char *path)
++{
++ (void) val_;
++ if (strncmp(key, path, strlen(path)) == 0)
++ return TRUE;
++ else
++ return FALSE;
++}
++
+ static void cache_do_rename(const char *from, const char *to)
+ {
+ pthread_mutex_lock(&cache.lock);
++ g_hash_table_foreach_remove(cache.table, (GHRFunc) cache_del_children,
++ (char *) from);
+ cache_purge(from);
+ cache_purge(to);
+ cache_purge_parent(from);
+@@ -250,12 +261,14 @@
+ const struct stat *stbuf)
+ {
+ int err = ch->filler(ch->h, name, 0, 0);
+- if (!err && (stbuf->st_mode & S_IFMT)) {
+- char *fullpath;
++ if (!err) {
+ g_ptr_array_add(ch->dir, g_strdup(name));
+- fullpath = g_strdup_printf("%s/%s", !ch->path[1] ? "" : ch->path, name);
+- cache_add_attr(fullpath, stbuf);
+- g_free(fullpath);
++ if (stbuf->st_mode & S_IFMT) {
++ char *fullpath =
++ g_strdup_printf("%s/%s", !ch->path[1] ? "" : ch->path, name);
++ cache_add_attr(fullpath, stbuf);
++ g_free(fullpath);
++ }
+ }
+ return err;
+ }
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
++++ new/sshfs.c 2007-04-19 04:10:38.000000000 -0700
@@ -18,7 +18,9 @@
#include <string.h>
#include <stdint.h>
@@ -32,12 +83,21 @@
#include <pthread.h>
#include <netdb.h>
#include <signal.h>
-@@ -100,6 +102,31 @@
+@@ -30,6 +32,9 @@
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
+ #include <glib.h>
++#if (__FreeBSD__ >= 10)
++#include <libgen.h>
++#endif
+
+ #include "cache.h"
+
+@@ -100,6 +105,32 @@
#define SSHNODELAY_SO "sshnodelay.so"
+#if (__FreeBSD__ >= 10)
-+
+#undef sem_t
+
+#undef sem_init
@@ -59,48 +119,211 @@
+#define LIBDIR "/usr/local/lib"
+#endif
+
++static char sshfs_program_path[PATH_MAX] = { 0 };
++
+#endif
+
struct buffer {
uint8_t *p;
size_t len;
-@@ -147,6 +174,9 @@
+@@ -124,6 +155,7 @@
+ struct timeval start;
+ void *data;
+ request_func end_func;
++ size_t len;
+ struct list_head list;
+ };
+
+@@ -147,6 +179,7 @@
int is_seq;
int connver;
int modifver;
-+#if (__FreeBSD__ >= 10)
+ int refs;
-+#endif
};
struct sshfs {
-@@ -687,8 +717,10 @@
+@@ -157,7 +190,9 @@
+ char *workarounds;
+ int rename_workaround;
+ int nodelay_workaround;
++ int nodelaysrv_workaround;
+ int truncate_workaround;
++ int buflimit_workaround;
+ int transform_symlinks;
+ int follow_symlinks;
+ int no_check_root;
+@@ -184,6 +219,9 @@
+ unsigned blksize;
+ char *progname;
+ long modifver;
++ unsigned outstanding_len;
++ unsigned max_outstanding_len;
++ pthread_cond_t outstanding_cond;
+ };
+
+ static struct sshfs sshfs;
+@@ -270,16 +308,24 @@
+ static struct fuse_opt workaround_opts[] = {
+ SSHFS_OPT("none", rename_workaround, 0),
+ SSHFS_OPT("none", nodelay_workaround, 0),
++ SSHFS_OPT("none", nodelaysrv_workaround, 0),
+ SSHFS_OPT("none", truncate_workaround, 0),
++ SSHFS_OPT("none", buflimit_workaround, 0),
+ SSHFS_OPT("all", rename_workaround, 1),
+ SSHFS_OPT("all", nodelay_workaround, 1),
++ SSHFS_OPT("all", nodelaysrv_workaround, 1),
+ SSHFS_OPT("all", truncate_workaround, 1),
++ SSHFS_OPT("all", buflimit_workaround, 1),
+ SSHFS_OPT("rename", rename_workaround, 1),
+ SSHFS_OPT("norename", rename_workaround, 0),
+ SSHFS_OPT("nodelay", nodelay_workaround, 1),
+ SSHFS_OPT("nonodelay", nodelay_workaround, 0),
++ SSHFS_OPT("nodelaysrv", nodelaysrv_workaround, 1),
++ SSHFS_OPT("nonodelaysrv", nodelaysrv_workaround, 0),
+ SSHFS_OPT("truncate", truncate_workaround, 1),
+ SSHFS_OPT("notruncate", truncate_workaround, 0),
++ SSHFS_OPT("buflimit", buflimit_workaround, 1),
++ SSHFS_OPT("nobuflimit", buflimit_workaround, 0),
+ FUSE_OPT_END
+ };
+
+@@ -627,13 +673,36 @@
+ _exit(1);
+ }
+
++#ifdef SSH_NODELAY_WORKAROUND
+ static int do_ssh_nodelay_workaround(void)
+ {
++#if (__FreeBSD__ >= 10)
++ char *oldpreload = getenv("DYLD_INSERT_LIBRARIES");
++#else
+ char *oldpreload = getenv("LD_PRELOAD");
++#endif
+ char *newpreload;
+ char sopath[PATH_MAX];
+ int res;
+
++#if (__FreeBSD__ >= 10)
++ char *sshfs_program_path_base = NULL;
++ if (!sshfs_program_path[0]) {
++ goto nobundle;
++ }
++ sshfs_program_path_base = dirname(sshfs_program_path);
++ if (!sshfs_program_path_base) {
++ goto nobundle;
++ }
++ snprintf(sopath, sizeof(sopath), "%s/%s", sshfs_program_path_base,
++ SSHNODELAY_SO);
++ res = access(sopath, R_OK);
++ if (res == -1) {
++ goto nobundle;
++ }
++ goto pathok;
++nobundle:
++#endif
+ snprintf(sopath, sizeof(sopath), "%s/%s", LIBDIR, SSHNODELAY_SO);
+ res = access(sopath, R_OK);
+ if (res == -1) {
+@@ -657,17 +726,26 @@
+ return -1;
+ }
+ }
++#if (__FreeBSD__ >= 10)
++pathok:
++#endif
+
+ newpreload = g_strdup_printf("%s%s%s",
+ oldpreload ? oldpreload : "",
+ oldpreload ? " " : "",
+ sopath);
+
++#if (__FreeBSD__ >= 10)
++ if (!newpreload || setenv("DYLD_INSERT_LIBRARIES", newpreload, 1) == -1)
++ fprintf(stderr, "warning: failed set DYLD_INSERT_LIBRARIES for ssh nodelay \
workaround\n"); ++#else
+ if (!newpreload || setenv("LD_PRELOAD", newpreload, 1) == -1)
+ fprintf(stderr, "warning: failed set LD_PRELOAD for ssh nodelay \
workaround\n"); ++#endif
+ g_free(newpreload);
+ return 0;
+ }
++#endif
+
+ static int start_ssh(void)
+ {
+@@ -687,8 +765,15 @@
} else if (pid == 0) {
int devnull;
-+#if !(__FreeBSD__ >= 10)
++#ifdef SSH_NODELAY_WORKAROUND
if (sshfs.nodelay_workaround && do_ssh_nodelay_workaround() == -1)
fprintf(stderr, "warning: ssh nodelay workaround disabled\n");
+#endif
++
++ if (sshfs.nodelaysrv_workaround) {
++ /* Hack to work around missing TCP_NODELAY setting in sshd */
++ sshfs.ssh_args.argv[1] = "-X";
++ }
devnull = open("/dev/null", O_WRONLY);
-@@ -1768,6 +1800,9 @@
+@@ -822,7 +907,7 @@
+ unsigned nout = 0;
+
+ assert(count <= SFTP_MAX_IOV - 1);
+- buf_init(&buf, 5);
++ buf_init(&buf, 9);
+ buf_add_uint32(&buf, iov_length(iov, count) + 5);
+ buf_add_uint8(&buf, type);
+ buf_add_uint32(&buf, id);
+@@ -947,8 +1032,13 @@
+ GUINT_TO_POINTER(id));
+ if (req == NULL)
+ fprintf(stderr, "request %i not found\n", id);
+- else
++ else {
++ int was_over = sshfs.outstanding_len > sshfs.max_outstanding_len;
++ sshfs.outstanding_len -= req->len;
++ if (was_over && sshfs.outstanding_len <= sshfs.max_outstanding_len)
++ pthread_cond_broadcast(&sshfs.outstanding_cond);
+ g_hash_table_remove(sshfs.reqtab, GUINT_TO_POINTER(id));
++ }
+ pthread_mutex_unlock(&sshfs.lock);
+ if (req != NULL) {
+ struct timeval now;
+@@ -1046,7 +1136,7 @@
+ static int sftp_init()
+ {
+ int res = -1;
+- uint32_t version;
++ uint32_t version = 0;
+ struct buffer buf;
+ buf_init(&buf, 0);
+ if (sftp_send_iov(SSH_FXP_INIT, PROTO_VERSION, NULL, 0) == -1)
+@@ -1342,6 +1432,11 @@
+ pthread_mutex_unlock(&sshfs.lock);
+ goto out;
+ }
++ req->len = iov_length(iov, count) + 9;
++ sshfs.outstanding_len += req->len;
++ while (sshfs.outstanding_len > sshfs.max_outstanding_len)
++ pthread_cond_wait(&sshfs.outstanding_cond, &sshfs.lock);
++
+ g_hash_table_insert(sshfs.reqtab, GUINT_TO_POINTER(id), req);
+ gettimeofday(&req->start, NULL);
+ DEBUG("[%05i] %s\n", id, type_name(type));
+@@ -1768,6 +1863,7 @@
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 @@
+@@ -1851,6 +1947,19 @@
return sshfs_flush(path, fi);
}
-+#if (__FreeBSD__ >= 10)
-+
+static void sshfs_file_put(struct sshfs_file *sf)
+{
+ sf->refs--;
@@ -114,34 +337,156 @@
+ 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;
+@@ -1861,7 +1970,7 @@
+ }
+ buf_free(handle);
+ chunk_put_locked(sf->readahead);
+- g_free(sf);
++ sshfs_file_put(sf);
+ return 0;
+ }
+
+@@ -2084,6 +2193,7 @@
+ }
+ list_del(&req->list);
+ pthread_cond_broadcast(&sf->write_finished);
++ sshfs_file_put(sf);
+ }
+
+ static int sshfs_write(const char *path, const char *wbuf, size_t size,
+@@ -2110,7 +2220,7 @@
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
+- sshfs_write_end, 0, sf, NULL);
++ sshfs_write_end, 0, sshfs_file_get(sf), NULL);
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)
+@@ -2330,6 +2440,7 @@
{
+ pthread_mutex_init(&sshfs.lock, NULL);
+ pthread_mutex_init(&sshfs.lock_write, NULL);
++ pthread_cond_init(&sshfs.outstanding_cond, NULL);
+ sshfs.reqtab = g_hash_table_new(NULL, NULL);
+ if (!sshfs.reqtab) {
+ fprintf(stderr, "failed to create hash table\n");
+@@ -2396,8 +2507,12 @@
+ " none no workarounds enabled\n"
+ " all all workarounds enabled\n"
+ " [no]rename fix renaming to existing file (default: off)\n"
++#ifdef SSH_NODELAY_WORKAROUND
+ " [no]nodelay set nodelay tcp flag in ssh (default: on)\n"
++#endif
++" [no]nodelaysrv set nodelay tcp flag in sshd (default: on)\n"
+ " [no]truncate fix truncate for old servers (default: off)\n"
++" [no]buflimit fix buffer fillup bug in server (default: on)\n"
+ " -o idmap=TYPE user/group ID mapping, possible types are:\n"
+ " none no translation of the ID space (default)\n"
+ " user only translate UID of connecting user\n"
+@@ -2476,7 +2591,12 @@
+ exit(1);
+
+ case KEY_VERSION:
+#if (__FreeBSD__ >= 10)
-+ if (fi) {
-+ fi->flags |= O_CREAT;
-+ }
++ fprintf(stderr, "SSHFS version %s (MacFUSE, %d, %s, %s)\n",
++ PACKAGE_VERSION, 8, __DATE__, __TIME__);
++#else
+ fprintf(stderr, "SSHFS version %s\n", PACKAGE_VERSION);
+#endif
- return sshfs_open_common(path, mode, fi);
+ #if FUSE_VERSION >= 25
+ fuse_opt_add_arg(outargs, "--version");
+ sshfs_fuse_main(outargs);
+@@ -2542,8 +2662,17 @@
+ fuse_opt_insert_arg(args, 1, "-olarge_read");
}
++#if (__FreeBSD__ >= 10)
++int main(int argc, char *argv[], __unused char *envp[], char **exec_path)
++#else
+ int main(int argc, char *argv[])
++#endif
+ {
++#if (__FreeBSD__ >= 10)
++ if (!realpath(*exec_path, sshfs_program_path)) {
++ memset(sshfs_program_path, 0, PATH_MAX);
++ }
++#endif
+ int res;
+ struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
+ char *tmp;
+@@ -2554,8 +2683,14 @@
+ sshfs.blksize = 4096;
+ sshfs.max_read = 65536;
+ sshfs.nodelay_workaround = 1;
++ sshfs.nodelaysrv_workaround = 0;
++#if (__FreeBSD__ >= 10)
++ sshfs.rename_workaround = 1;
++#else
+ sshfs.rename_workaround = 0;
++#endif
+ sshfs.truncate_workaround = 0;
++ sshfs.buflimit_workaround = 1;
+ sshfs.ssh_ver = 2;
+ sshfs.progname = argv[0];
+ ssh_add_arg("ssh");
+@@ -2567,6 +2702,14 @@
+ parse_workarounds() == -1)
+ exit(1);
+
++ if (sshfs.buflimit_workaround)
++ /* Work around buggy sftp-server in OpenSSH. Without this on
++ a slow server a 10Mbyte buffer would fill up and the server
++ would abort */
++ sshfs.max_outstanding_len = 8388608;
++ else
++ sshfs.max_outstanding_len = ~0;
++
+ if (!sshfs.host) {
+ fprintf(stderr, "missing host\n");
+ fprintf(stderr, "see `%s -h' for usage\n", argv[0]);
+diff -Naur old/sshnodelay.c new/sshnodelay.c
+--- old/sshnodelay.c 2006-02-01 01:43:22.000000000 -0800
++++ new/sshnodelay.c 2007-04-19 03:54:33.000000000 -0700
+@@ -5,6 +5,31 @@
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
+
++#if (__FreeBSD__ >= 10)
++
++int custom_connect(int sock, const struct sockaddr *addr, socklen_t addrlen);
++
++typedef struct interpose_s {
++ void *new_func;
++ void *orig_func;
++} interpose_t;
++
++static const interpose_t interposers[] \
++ __attribute__ ((section("__DATA, __interpose"))) = {
++ { (void *)custom_connect, (void *)connect },
++ };
++
++int custom_connect(int sock, const struct sockaddr *addr, socklen_t addrlen)
++{
++ int res = connect(sock, addr, addrlen);
++ if (!res && addr->sa_family == AF_INET) {
++ int opt = 1;
++ setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
++ }
++ return res;
++}
++
++#else
+ int connect(int sock, const struct sockaddr *addr, socklen_t addrlen)
+ {
+ int (*next_connect)(int, const struct sockaddr *, socklen_t) =
+@@ -14,5 +39,5 @@
+ int opt = 1;
+ setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
+ }
+- return res;
+ }
++#endif
Index: man.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/man.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- man.patch 17 Mar 2006 12:48:26 -0000 1.2
+++ man.patch 30 Apr 2007 02:48:29 -0000 1.2.2.1
@@ -1,7 +1,7 @@
-diff -Naur man-1.6c.orig/configure man-1.6c/configure
---- man-1.6c.orig/configure Thu Jan 12 01:24:20 2006
-+++ man-1.6c/configure Fri Mar 17 12:09:56 2006
-@@ -818,6 +818,8 @@
+diff -Naur man-1.6e.orig/configure man-1.6e/configure
+--- man-1.6e.orig/configure 2006-05-01 17:56:14.000000000 +0000
++++ man-1.6e/configure 2007-04-28 01:08:05.000000000 +0000
+@@ -827,6 +827,8 @@
then
DEF_NLSPATH="/usr/share/locale/%L/%N:/usr/lib/locale/%N/%L"
deflocalepath=`echo $NLSPATH:$DEF_NLSPATH | sed 's/:/ /g'`
@@ -10,7 +10,7 @@
for i in $deflocalepath; do
if [ x$deflocale = x ]; then
tstdir=`echo $i | sed -e 's/%N//; s/%L//'`
-@@ -867,7 +869,7 @@
+@@ -876,7 +878,7 @@
locale=$deflocale
fi
echo
@@ -19,7 +19,7 @@
fi
if [ x$suid = x -a x$sgid = x ]; then
-@@ -1272,6 +1274,7 @@
+@@ -1281,6 +1283,7 @@
echo "$ce" >> $infile
echo "Creating $infile from $infile.in"
sed -e '
@@ -27,9 +27,80 @@
s,@version@,$version,
s,@CC@,$CC,
s,@BUILD_CC@,$BUILD_CC,
-diff -Naur man-1.6c.orig/man2html/Makefile.in man-1.6c/man2html/Makefile.in
---- man-1.6c.orig/man2html/Makefile.in Sat Aug 20 23:26:06 2005
-+++ man-1.6c/man2html/Makefile.in Wed Mar 15 22:24:15 2006
+diff -Naur man-1.6e.orig/gencat/gencat.c man-1.6e/gencat/gencat.c
+--- man-1.6e.orig/gencat/gencat.c 2006-08-02 18:11:44.000000000 +0000
++++ man-1.6e/gencat/gencat.c 2007-04-28 01:53:58.000000000 +0000
+@@ -43,6 +43,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
++#ifdef NOT_POSIX
+ #ifdef SYSV
+ #include <sys/fcntl.h>
+ #include <string.h>
+@@ -54,6 +55,11 @@
+ #include <unistd.h>
+ #endif
+ #include <sys/file.h>
++#else /* ! NOT_POSIX */
++#include <string.h>
++#include <fcntl.h>
++#include <unistd.h>
++#endif /* ! NOT_POSIX */
+ #include <sys/stat.h>
+ #include "gencat.h"
+
+diff -Naur man-1.6e.orig/gencat/genlib.c man-1.6e/gencat/genlib.c
+--- man-1.6e.orig/gencat/genlib.c 2006-08-02 18:11:44.000000000 +0000
++++ man-1.6e/gencat/genlib.c 2007-04-28 02:00:35.000000000 +0000
+@@ -49,6 +49,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef NOT_POSIX
+ #ifdef SYSV
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -73,6 +74,11 @@
+ #endif
+
+ #include <sys/file.h>
++#else /* ! NOT_POSIX */
++#include <sys/types.h>
++#include <unistd.h>
++#include <string.h>
++#endif /* ! NOT_POSIX */
+ #include <ctype.h>
+ #include "msgcat.h"
+ #include "gencat.h"
+@@ -85,6 +91,15 @@
+ #define L_INCR SEEK_CUR
+ #endif
+
++#ifndef NOT_POSIX
++#ifndef bcopy
++#define bcopy(src, dst, length) memmove(dst, src, length)
++#endif
++#ifndef bzero
++#define bzero(b, length) memset(b, '\0', length)
++#endif
++#endif /* ! NOT_POSIX */
++
+ static char *curline = NULL;
+ static long lineno = 0;
+
+@@ -92,7 +107,7 @@
+ char *cptr;
+ char *msg;
+ {
+- fprintf(stderr, "gencat: %s on line %d\n", msg, lineno);
++ fprintf(stderr, "gencat: %s on line %ld\n", msg, lineno);
+ fprintf(stderr, "%s\n", curline);
+ if (cptr) {
+ char *tptr;
+diff -Naur man-1.6e.orig/man2html/Makefile.in man-1.6e/man2html/Makefile.in
+--- man-1.6e.orig/man2html/Makefile.in 2006-04-25 06:44:15.000000000 +0000
++++ man-1.6e/man2html/Makefile.in 2007-04-28 01:08:05.000000000 +0000
@@ -1,7 +1,7 @@
CC = @CC@
CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
@@ -39,9 +110,9 @@
mandir = $(DESTDIR)$(PREFIX)@mandir@
vardir = $(DESTDIR)$(PREFIX)/var
httpdir = $(DESTDIR)$(PREFIX)/home/httpd
-diff -Naur man-1.6c.orig/manpager.in man-1.6c/manpager.in
---- man-1.6c.orig/manpager.in Thu Jan 1 00:00:00 1970
-+++ man-1.6c/manpager.in Wed Mar 15 23:07:55 2006
+diff -Naur man-1.6e.orig/manpager.in man-1.6e/manpager.in
+--- man-1.6e.orig/manpager.in 1970-01-01 00:00:00.000000000 +0000
++++ man-1.6e/manpager.in 2006-03-15 23:07:55.000000000 +0000
@@ -0,0 +1,13 @@
+#! /bin/sh
+# Fink specific script to convert Japanese texts
@@ -56,9 +127,9 @@
+ 0) $filter | $pager;;
+ *) for f in "$@"; do $filter "$f" | $pager; done;;
+esac
-diff -Naur man-1.6c.orig/msgs/Makefile.in man-1.6c/msgs/Makefile.in
---- man-1.6c.orig/msgs/Makefile.in Sat Aug 20 23:26:06 2005
-+++ man-1.6c/msgs/Makefile.in Fri Mar 17 12:31:53 2006
+diff -Naur man-1.6e.orig/msgs/Makefile.in man-1.6e/msgs/Makefile.in
+--- man-1.6e.orig/msgs/Makefile.in 2006-06-09 21:55:08.000000000 +0000
++++ man-1.6e/msgs/Makefile.in 2007-04-28 01:19:58.000000000 +0000
@@ -1,6 +1,8 @@
+GENERATED = mess.ja_JP.SJIS mess.ja_JP.UTF-8 mess.zh_TW
@@ -69,13 +140,13 @@
+ ../src/makemsg -c $$i $$i.catin; \
cat $$i.codeset $$i.catin > $$i.catin2; \
echo "==== Making $$i.cat ====" ;\
- ./gencat $$i.cat $$i.catin2; done; \
+ LC_ALL=en_US.UTF-8 ./gencat $$i.cat $$i.catin2; done; \
@@ -10,7 +12,7 @@
sh ./inst.sh "@languages@" "$(DESTDIR)@locale@"
clean:
- rm -f gencat gencat.out core *~ *.cat *.catin *.catin2
-+ rm -f gencat sjiscorr gencat.out core *~ *.cat *.catin *.catin2 $(GENERATED)
++ rm -f gencat gencat.out core *~ *.cat *.catin *.catin2 $(GENERATED) *.tmp*
spotless:
rm -f Makefile
@@ -88,23 +159,22 @@
ln -s /usr/bin/gencat gencat; \
else \
cp gencat207fix.sh gencat; \
-@@ -31,4 +33,13 @@
- cd ../gencat; \
+@@ -32,3 +34,12 @@
make; \
fi
-+
+
+mess.ja_JP.SJIS: mess.ja gencat
+ $(SHELL) ./mksjismess.sh
+
+mess.ja_JP.UTF-8: mess.ja
-+ iconv -f euc-jp -t utf-8 $< > $@
++ iconv -f euc-jp -t utf-8 $< > $@.tmp && mv $@.tmp $@
+
+mess.zh_TW: mess.zh_TW.UTF-8 gencat
+ $(SHELL) ./mkbig5mess.sh
-
-diff -Naur man-1.6c.orig/msgs/big5test.in man-1.6c/msgs/big5test.in
---- man-1.6c.orig/msgs/big5test.in Thu Jan 1 00:00:00 1970
-+++ man-1.6c/msgs/big5test.in Fri Mar 17 12:29:11 2006
++
+diff -Naur man-1.6e.orig/msgs/big5test.in man-1.6e/msgs/big5test.in
+--- man-1.6e.orig/msgs/big5test.in 1970-01-01 00:00:00.000000000 +0000
++++ man-1.6e/msgs/big5test.in 2006-03-17 12:29:11.000000000 +0000
@@ -0,0 +1,6 @@
+$ codeset=big5
+$quote "
@@ -112,29 +182,29 @@
+1 "¥\\""
+2 "¥\a"
+3 "¥\"
-diff -Naur man-1.6c.orig/msgs/mess.ja_JP.SJIS.codeset \
man-1.6c/msgs/mess.ja_JP.SJIS.codeset
---- man-1.6c.orig/msgs/mess.ja_JP.SJIS.codeset Thu Jan 1 00:00:00 1970
-+++ man-1.6c/msgs/mess.ja_JP.SJIS.codeset Fri Mar 17 10:50:25 2006
+diff -Naur man-1.6e.orig/msgs/mess.ja_JP.SJIS.codeset \
man-1.6e/msgs/mess.ja_JP.SJIS.codeset +--- \
man-1.6e.orig/msgs/mess.ja_JP.SJIS.codeset 1970-01-01 00:00:00.000000000 +0000 ++++ \
man-1.6e/msgs/mess.ja_JP.SJIS.codeset 2006-03-17 10:50:25.000000000 +0000 @@ -0,0 +1 \
@@ +$ codeset=shift_jis
-diff -Naur man-1.6c.orig/msgs/mess.ja_JP.UTF-8.codeset \
man-1.6c/msgs/mess.ja_JP.UTF-8.codeset
---- man-1.6c.orig/msgs/mess.ja_JP.UTF-8.codeset Thu Jan 1 00:00:00 1970
-+++ man-1.6c/msgs/mess.ja_JP.UTF-8.codeset Fri Mar 17 10:18:37 2006
+diff -Naur man-1.6e.orig/msgs/mess.ja_JP.UTF-8.codeset \
man-1.6e/msgs/mess.ja_JP.UTF-8.codeset +--- \
man-1.6e.orig/msgs/mess.ja_JP.UTF-8.codeset 1970-01-01 00:00:00.000000000 +0000 ++++ \
man-1.6e/msgs/mess.ja_JP.UTF-8.codeset 2006-03-17 10:18:37.000000000 +0000 @@ -0,0 \
+1 @@ +$ codeset=utf-8
-diff -Naur man-1.6c.orig/msgs/mess.zh_TW.UTF-8.codeset \
man-1.6c/msgs/mess.zh_TW.UTF-8.codeset
---- man-1.6c.orig/msgs/mess.zh_TW.UTF-8.codeset Thu Jan 1 00:00:00 1970
-+++ man-1.6c/msgs/mess.zh_TW.UTF-8.codeset Fri Mar 17 12:15:19 2006
+diff -Naur man-1.6e.orig/msgs/mess.zh_TW.UTF-8.codeset \
man-1.6e/msgs/mess.zh_TW.UTF-8.codeset +--- \
man-1.6e.orig/msgs/mess.zh_TW.UTF-8.codeset 1970-01-01 00:00:00.000000000 +0000 ++++ \
man-1.6e/msgs/mess.zh_TW.UTF-8.codeset 2006-03-17 12:15:19.000000000 +0000 @@ -0,0 \
+1 @@ +$ codeset=utf-8
-diff -Naur man-1.6c.orig/msgs/mess.zh_TW.codeset man-1.6c/msgs/mess.zh_TW.codeset
---- man-1.6c.orig/msgs/mess.zh_TW.codeset Thu Jan 1 00:00:00 1970
-+++ man-1.6c/msgs/mess.zh_TW.codeset Fri Mar 17 12:31:01 2006
+diff -Naur man-1.6e.orig/msgs/mess.zh_TW.codeset man-1.6e/msgs/mess.zh_TW.codeset
+--- man-1.6e.orig/msgs/mess.zh_TW.codeset 1970-01-01 00:00:00.000000000 +0000
++++ man-1.6e/msgs/mess.zh_TW.codeset 2006-03-17 12:31:01.000000000 +0000
@@ -0,0 +1 @@
+$ codeset=big5
-diff -Naur man-1.6c.orig/msgs/mkbig5mess.sh man-1.6c/msgs/mkbig5mess.sh
---- man-1.6c.orig/msgs/mkbig5mess.sh Thu Jan 1 00:00:00 1970
-+++ man-1.6c/msgs/mkbig5mess.sh Fri Mar 17 12:30:19 2006
+diff -Naur man-1.6e.orig/msgs/mkbig5mess.sh man-1.6e/msgs/mkbig5mess.sh
+--- man-1.6e.orig/msgs/mkbig5mess.sh 1970-01-01 00:00:00.000000000 +0000
++++ man-1.6e/msgs/mkbig5mess.sh 2006-03-17 12:30:19.000000000 +0000
@@ -0,0 +1,13 @@
+#! /bin/sh
+set -e
@@ -149,9 +219,9 @@
+else
+ sed 's/\\/\\\\/g;s/@b/\\/g;s/@a/@/g' mess.zh_TW.tmp2 > mess.zh_TW
+fi
-diff -Naur man-1.6c.orig/msgs/mksjismess.sh man-1.6c/msgs/mksjismess.sh
---- man-1.6c.orig/msgs/mksjismess.sh Thu Jan 1 00:00:00 1970
-+++ man-1.6c/msgs/mksjismess.sh Fri Mar 17 11:55:35 2006
+diff -Naur man-1.6e.orig/msgs/mksjismess.sh man-1.6e/msgs/mksjismess.sh
+--- man-1.6e.orig/msgs/mksjismess.sh 1970-01-01 00:00:00.000000000 +0000
++++ man-1.6e/msgs/mksjismess.sh 2006-03-17 11:55:35.000000000 +0000
@@ -0,0 +1,13 @@
+#! /bin/sh
+set -e
@@ -166,9 +236,9 @@
+else
+ sed 's/\\/\\\\/g;s/@b/\\/g;s/@a/@/g' mess.ja.tmp2 > mess.ja_JP.SJIS
+fi
-diff -Naur man-1.6c.orig/msgs/sjistest.in man-1.6c/msgs/sjistest.in
---- man-1.6c.orig/msgs/sjistest.in Thu Jan 1 00:00:00 1970
-+++ man-1.6c/msgs/sjistest.in Fri Mar 17 11:22:59 2006
+diff -Naur man-1.6e.orig/msgs/sjistest.in man-1.6e/msgs/sjistest.in
+--- man-1.6e.orig/msgs/sjistest.in 1970-01-01 00:00:00.000000000 +0000
++++ man-1.6e/msgs/sjistest.in 2006-03-17 11:22:59.000000000 +0000
@@ -0,0 +1,6 @@
+$ codeset=shift_jis
+$quote "
@@ -176,9 +246,9 @@
+1 "•\\""
+2 "•\a"
+3 "•\"
-diff -Naur man-1.6c.orig/src/man.conf.fink.in man-1.6c/src/man.conf.fink.in
---- man-1.6c.orig/src/man.conf.fink.in Thu Jan 1 00:00:00 1970
-+++ man-1.6c/src/man.conf.fink.in Wed Mar 15 23:05:38 2006
+diff -Naur man-1.6e.orig/src/man.conf.fink.in man-1.6e/src/man.conf.fink.in
+--- man-1.6e.orig/src/man.conf.fink.in 1970-01-01 00:00:00.000000000 +0000
++++ man-1.6e/src/man.conf.fink.in 2006-03-15 23:05:38.000000000 +0000
@@ -0,0 +1,142 @@
+# man.conf from @version@
+#
Index: bacula.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/bacula.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- bacula.patch 20 Jan 2007 15:54:01 -0000 1.1.2.1
+++ bacula.patch 30 Apr 2007 02:48:29 -0000 1.1.2.2
@@ -18,5 +18,3 @@
bacula-fd: Makefile
@for I in ${fd_subdirs}; \
do (cd $$I; echo "==>Entering directory `pwd`"; \
-
-
Index: coreutils.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/coreutils.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- coreutils.patch 21 Jun 2006 03:36:15 -0000 1.2
+++ coreutils.patch 30 Apr 2007 02:48:29 -0000 1.2.2.1
@@ -1,10 +1,48 @@
-diff -Naur coreutils-5.96.orig/tests/lang-default coreutils-5.96/tests/lang-default
---- coreutils-5.96.orig/tests/lang-default 2000-10-31 19:33:30.000000000 +0000
-+++ coreutils-5.96/tests/lang-default 2006-06-21 03:07:22.000000000 +0000
-@@ -4,5 +4,5 @@
+diff -Naur coreutils-6.9.orig/tests/chgrp/basic coreutils-6.9/tests/chgrp/basic
+--- coreutils-6.9.orig/tests/chgrp/basic 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/tests/chgrp/basic 2007-04-17 14:23:52.000000000 +0000
+@@ -1,6 +1,12 @@
+ #!/bin/sh
+ # make sure chgrp is reasonable
- for i in \
- LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_TIME; do
-- eval "$i=; export $i"
-+ eval "$i=C; export $i"
- done
++case `uname -sr` in
++ Darwin\ [1-7].*)
++ echo 1>&2 "$0: skipping this test; Darwin <= 7 (MacOS X <= 10.3) lacks lchown(2)"
++ exit 77 ;;
++esac
++
+ # Copyright (C) 2000-2007 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+diff -Naur coreutils-6.9.orig/tests/chown/basic coreutils-6.9/tests/chown/basic
+--- coreutils-6.9.orig/tests/chown/basic 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/tests/chown/basic 2007-04-17 14:23:48.000000000 +0000
+@@ -1,6 +1,12 @@
+ #!/bin/sh
+ # make sure chown --from=... works
+
++case `uname -sr` in
++ Darwin\ [1-7].*)
++ echo 1>&2 "$0: skipping this test; Darwin <= 7 (MacOS X <= 10.3) lacks lchown(2)"
++ exit 77 ;;
++esac
++
+ # Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+diff -Naur coreutils-6.9.orig/tests/misc/pwd-long coreutils-6.9/tests/misc/pwd-long
+--- coreutils-6.9.orig/tests/misc/pwd-long 2007-03-18 21:36:43.000000000 +0000
++++ coreutils-6.9/tests/misc/pwd-long 2007-04-17 12:59:33.000000000 +0000
+@@ -1,6 +1,12 @@
+ #!/bin/sh
+ # Ensure that pwd works even when run from a very deep directory.
+
++case `uname -sr` in
++ Darwin\ [1-8].*)
++ echo 1>&2 "$0: skipping this test; Darwin seems to have some bug"
++ exit 77 ;;
++esac
++
+ # Copyright (C) 2006-2007 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
Index: bacula.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/bacula.info,v
retrieving revision 1.2.2.19
retrieving revision 1.2.2.20
diff -u -d -r1.2.2.19 -r1.2.2.20
--- bacula.info 2 Mar 2007 19:42:02 -0000 1.2.2.19
+++ bacula.info 30 Apr 2007 02:48:29 -0000 1.2.2.20
@@ -1,8 +1,8 @@
Package: bacula
-Version: 2.0.2
+Version: 2.0.3
Revision: 2
GCC: 4.0
-Source-MD5: 299883ddd460336cfb613fd6d9bff989
+Source-MD5: 443d2560ace95173a0d8ba465de493ef
Source: mirror:sourceforge:bacula/bacula-%v.tar.gz
License: GPL
Maintainer: Charles Galpin <cgalpin@users.sourceforge.net>
@@ -37,6 +37,7 @@
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
+SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
ConfigureParams: --bindir=%p/bin --sbindir=%p/sbin --without-postgresql \
--without-mysql --with-sqlite=%p/include --with-scriptdir=%p/lib/bacula \
--sysconfdir=%p/etc/bacula --enable-gnome --enable-largefile \
--with-working-dir=%p/lib/bacula --with-pid-dir=%p/var/run \
--with-subsys-dir=%p/var/run/subsys --mandir=%p/share/man \
--with-readline=%p/include/readline --disable-dependency-tracking \
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH" \
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config CompileScript: <<
@@ -147,5 +148,3 @@
bacula-* packages
<<
-
-
Index: jless.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/jless.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- jless.info 6 Feb 2006 19:48:23 -0000 1.1
+++ jless.info 30 Apr 2007 02:48:29 -0000 1.1.2.1
@@ -1,18 +1,17 @@
Package: jless
-Version: 358-iso254
-Revision: 1012
-Source: mirror:gnu:less/less-358.tar.gz
-Source2: http://www.io.com/~kazushi/less/less-%v.patch.gz
-Source-MD5: 692a94060a50dd35a4d65176cb899444
-Source2-MD5: 4ccb02cfcdd9aafc2b147d56c895716a
-SourceDirectory: less-358
-PatchScript: zcat ../less-358-iso254.patch.gz | patch -p1
+Version: 382-iso258
+Revision: 1
+Source: mirror:gnu:less/less-382.tar.gz
+Source2: http://www25.big.jp/~jam/less/less-%v.patch.gz
+Source-MD5: 103fe4aef6297b93f0f73f38cc3b1bd7
+Source2-MD5: bc42654a79a727c15b87596708a22333
+SourceDirectory: less-382
+PatchScript: zcat ../less-%v.patch.gz | patch -p1
BuildDepends: libncurses5 (>= 5.4-20041023-1006)
Depends: ncurses (>= 5.4-20041023-1006), libncurses5-shlibs (>= 5.4-20041023-1006)
-GCC: 4.0
-ConfigureParams: --mandir='${prefix}/share/man'
+ConfigureParams: --mandir='${prefix}/share/man' --with-regex=posix
InstallScript: make install prefix=%i binprefix=j manprefix=j
-DocFiles: COPYING INSTALL LICENSE NEWS README.*
+DocFiles: COPYING LICENSE NEWS README.*
Description: Featureful text pager with ISO 2022 code extension
DescDetail: <<
GNU less is a featureful replacement for the more command. It reads
@@ -24,7 +23,7 @@
decompression feature for compress and gzip files.
<<
License: GPL
-Homepage: http://www.pobox.com/~jam/less/
+Homepage: http://www25.big.jp/~jam/less/
Maintainer: None <fink-devel@lists.sourceforge.net>
DescPackaging: <<
Originally packaged by Masanori Sekino.
Index: coreutils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/coreutils.info,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- coreutils.info 21 Nov 2006 06:34:36 -0000 1.8
+++ coreutils.info 30 Apr 2007 02:48:29 -0000 1.8.2.1
@@ -1,19 +1,19 @@
Package: coreutils
-Version: 5.96
+Version: 6.9
Epoch: 1
-Revision: 5
-BuildDepends: expat, help2man, libgettext3-dev, gettext-bin, gettext-tools, \
libiconv-dev +Revision: 3
+BuildDepends: expat1, help2man, libgettext3-dev, gettext-bin, gettext-tools, \
libiconv-dev Depends: libgettext3-shlibs, libiconv
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
Source: mirror:gnu:%n/%n-%v.tar.bz2
-Source-MD5: bf55d069d82128fd754a090ce8b5acff
+Source-MD5: c9607d8495f16e98906e7ed2d9751a06
Patch: %n.patch
ConfigureParams: --bindir=%p/lib/%N/bin --mandir=%p/lib/%N/share/man \
--infodir=%p/share/info CompileScript: <<
./configure %c
make
- case `uname -r` in [1-7].*) ;; *) make check;; esac
+ make check
<<
InstallScript: <<
#!/bin/sh -ev
@@ -32,6 +32,8 @@
ff=`basename "$f"`
case $ff in
\[) ;;
+ rm) go ln -s "$f" "$ff.gnu";;
+ rm.1) go ln -s "$f" "$ff.gnu.1";;
*) go ln -s "$f" "g$ff";;
esac
done
@@ -52,6 +54,9 @@
The commands are named with 'g' prefix like 'gls' or 'gcp'. If you want
to use them as 'ls' or 'cp', add %p/lib/coreutils/bin to your PATH
or install the coreutils-default package.
+
+As the exception, the 'rm' command is named as 'rm.gnu' instead of 'grm'
+because the cwp-su package has another 'grm'.
<<
DescUsage: <<
The exotic commands like mknod may or may not work in a useful manner
@@ -63,7 +68,6 @@
DescPort: <<
charset.alias is deleted because it is empty on Darwin anyway and
causes unnecessary conflicts between packages.
-The make check fails on MacOS X <= 10.3 due to lack of lchown().
<<
SplitOff: <<
Package: coreutils-default
@@ -71,7 +75,6 @@
Depends: coreutils (>= %e:%v-%r)
Conflicts: fileutils (<< 1:5-1), textutils (<< 1:5-1), shellutils (<< 1:5-1)
Replaces: fileutils (<< 1:5-1), textutils (<< 1:5-1), shellutils (<< 1:5-1)
- Provides: fileutils, textutils, shellutils
DescDetail: <<
The GNU Core Utilities are the basic file, shell and text manipulation
utilities of the GNU operating system. These are the core utilities
@@ -86,6 +89,9 @@
Symlink to tsort (topological sort) is not created because it breaks
other packages. The GNU version of tsort doesn't output files that are
part of a cycle, while the BSD tsort that ships with Darwin does.
+
+Symlink to base64 is not created because it conflicts against
+the base64 package.
<<
InstallScript: <<
#!/bin/sh -ev
@@ -98,7 +104,7 @@
for f in "$dd/"*; do
ff=`basename "$f"`
case $ff in
- md5sum*|readlink*|tsort*) ;;
+ md5sum*|readlink*|tsort*|base64*) ;;
*) go ln -s "$f" "%i/$d/$ff";;
esac
done
@@ -112,7 +118,7 @@
SplitOff2: <<
Package: fileutils
Description: Placeholder to help migration coreutils
- Depends: coreutils-default (>= %e:%v-%r)
+ Depends: coreutils-default (>= %e:%v-%r), fink-obsolete-packages
InstallScript: <<
mkdir -p %i/share/doc
ln -s %N %i/share/doc/%n
@@ -121,7 +127,7 @@
SplitOff3: <<
Package: textutils
Description: Placeholder to help migration coreutils
- Depends: coreutils-default (>= %e:%v-%r)
+ Depends: coreutils-default (>= %e:%v-%r), fink-obsolete-packages
InstallScript: <<
mkdir -p %i/share/doc
ln -s %N %i/share/doc/%n
@@ -130,7 +136,7 @@
SplitOff4: <<
Package: shellutils
Description: Placeholder to help migration coreutils
- Depends: coreutils-default (>= %e:%v-%r)
+ Depends: coreutils-default (>= %e:%v-%r), fink-obsolete-packages
InstallScript: <<
mkdir -p %i/share/doc
ln -s %N %i/share/doc/%n
Index: sshfs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/sshfs.info,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- sshfs.info 20 Jan 2007 15:54:01 -0000 1.3.2.2
+++ sshfs.info 30 Apr 2007 02:48:29 -0000 1.3.2.3
@@ -1,10 +1,10 @@
Package: sshfs
Version: 1.7
-Revision: 3
+Revision: 4
Source: mirror:sourceforge:fuse/%n-fuse-%v.tar.gz
Source-MD5: e91a2fed1da952a375798408dc6e41a0
PatchFile: %n.patch
-PatchFile-MD5: ded7579df87a384d2b74cf6413ba923f
+PatchFile-MD5: 5ccd9314751aa3ea628776888914d178
BuildDepends: fuse-dev, glib2-dev, pkgconfig, libgettext3-dev, fink (>= 0.24.12)
Depends: fuse-shlibs, glib2-shlibs, libgettext3-shlibs
@@ -25,7 +25,7 @@
<<
DescUsage: <<
Invoking sshfs with the options
--oping_diskarb,volname="finder volume name"
+-oreconnect,kill_on_unmount,volname="finder volume name"
will probably improve its interaction with the Finder.
<<
License: GPL
Index: modglue.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/modglue.info,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- modglue.info 14 Mar 2007 14:13:13 -0000 1.2.2.2
+++ modglue.info 30 Apr 2007 02:48:29 -0000 1.2.2.3
@@ -1,9 +1,9 @@
Package: modglue
-Version: 1.7
-Revision: 2
+Version: 1.8
+Revision: 1
#Source: http://www.aei.mpg.de/~peekas/modglue/%n-%v.tar.gz
Source: http://www.aei.mpg.de/~peekas/cadabra/%n-%v.tar.gz
-Source-MD5: 3e5c0c9ec9fdd5d17614f744641525b3
+Source-MD5: 0837c40fabf0c838931918ad89ae28e9
License: GPL
BuildDependsOnly: true
BuildDepends: libsigc++2
Index: clamav.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/clamav.info,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -d -r1.10.2.2 -r1.10.2.3
--- clamav.info 9 Mar 2007 01:13:29 -0000 1.10.2.2
+++ clamav.info 30 Apr 2007 02:48:29 -0000 1.10.2.3
@@ -1,6 +1,6 @@
Info3: <<
Package: clamav
-Version: 0.90.1
+Version: 0.90.2
Revision: 51
Description: Clam Anti-Virus scanner
@@ -43,7 +43,7 @@
Homepage: http://www.clamav.net/
License: GPL
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: cd11c05b5476262eaea4fa3bd7dc25bf
+Source-MD5: 39d1f07a399b551b55096b6ec7325c33
BuildDepends: gmp (>= 4.1.4-1), bzip2, bzip2-dev, system-openssl-dev
Depends: clamav2-shlibs (=%v-%r), unrar
Index: prime-dict.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/prime-dict.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- prime-dict.info 15 Mar 2006 22:12:31 -0000 1.2
+++ prime-dict.info 30 Apr 2007 02:48:29 -0000 1.2.2.1
@@ -1,7 +1,6 @@
Package: prime-dict
Version: 0.8.7
Revision: 1001
-GCC: 4.0
Description: Dictionary files for PRIME input method
License: GPL
Maintainer: Todai Fink Team <fink@sodan.ecc.u-tokyo.ac.jp>
@@ -22,4 +21,9 @@
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
+DescPackaging: <<
+The revision >= 1001 is an artifact of a bogus GCC field before.
+It can be copied to non-10.4 system, and should be restored
+at the upstream update.
+<<
Homepage: http://taiyaki.org/prime/
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic