From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jan 30 05:20:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D4B416A418 for ; Wed, 30 Jan 2008 05:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3242A13C468 for ; Wed, 30 Jan 2008 05:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m0U5K2s6024214 for ; Wed, 30 Jan 2008 05:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m0U5K2o4024213; Wed, 30 Jan 2008 05:20:02 GMT (envelope-from gnats) Resent-Date: Wed, 30 Jan 2008 05:20:02 GMT Resent-Message-Id: <200801300520.m0U5K2o4024213@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Maxwell Krohn Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22A6A16A468 for ; Wed, 30 Jan 2008 05:10:30 +0000 (UTC) (envelope-from max@freebsd-6.pdos.lcs.mit.edu) Received: from freebsd-6.pdos.lcs.mit.edu (freebsd6.pdos.lcs.mit.edu [18.26.4.198]) by mx1.freebsd.org (Postfix) with ESMTP id B11D613C45B for ; Wed, 30 Jan 2008 05:10:29 +0000 (UTC) (envelope-from max@freebsd-6.pdos.lcs.mit.edu) Received: from freebsd-6.pdos.lcs.mit.edu (localhost [127.0.0.1]) by freebsd-6.pdos.lcs.mit.edu (8.13.8/8.13.8) with ESMTP id m0U4cKKb052683 for ; Tue, 29 Jan 2008 23:38:20 -0500 (EST) (envelope-from max@freebsd-6.pdos.lcs.mit.edu) Received: (from root@localhost) by freebsd-6.pdos.lcs.mit.edu (8.13.8/8.13.8/Submit) id m0U4cK9R052682; Tue, 29 Jan 2008 23:38:20 -0500 (EST) (envelope-from max) Message-Id: <200801300438.m0U4cK9R052682@freebsd-6.pdos.lcs.mit.edu> Date: Tue, 29 Jan 2008 23:38:20 -0500 (EST) From: Maxwell Krohn To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/120141: upgrade of sfslite to 1.2.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Maxwell Krohn List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 05:20:04 -0000 >Number: 120141 >Category: ports >Synopsis: upgrade of sfslite to 1.2.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jan 30 05:20:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Maxwell Krohn >Release: FreeBSD 6.2-RELEASE-p9 i386 >Organization: OKWS >Environment: System: FreeBSD freebsd-6.pdos.lcs.mit.edu 6.2-RELEASE-p9 FreeBSD 6.2-RELEASE-p9 #12: Fri Jan 4 12:23:08 EST 2008 max@freebsd-6.pdos.lcs.mit.edu:/usr/obj/usr/src/sys/PDOS i386 >Description: upgrade; note deletion of patch files. >How-To-Repeat: >Fix: diff -ruN devel/sfslite.orig/Makefile devel/sfslite/Makefile --- devel/sfslite.orig/Makefile Tue Jan 29 22:35:52 2008 +++ devel/sfslite/Makefile Tue Jan 29 22:36:39 2008 @@ -6,7 +6,7 @@ # PORTNAME= sfslite -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.3 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://dist.okws.org/dist/ @@ -65,9 +65,5 @@ PKG_PREFIX=${PREFIX} ${SH} ${PKG_INSTALL} ${PKGNAME} PRE-INSTALL .include - -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 -.endif .include diff -ruN devel/sfslite.orig/distinfo devel/sfslite/distinfo --- devel/sfslite.orig/distinfo Tue Jan 29 22:35:52 2008 +++ devel/sfslite/distinfo Tue Jan 29 22:37:23 2008 @@ -1,3 +1,3 @@ -MD5 (sfslite-1.2.2.tar.gz) = a819f483eb2a0508f363c2f9cb2326e4 -SHA256 (sfslite-1.2.2.tar.gz) = 8b78bede2a2dc4d6756652a71ac22969490ab0bc2218b3651f2374067b146089 -SIZE (sfslite-1.2.2.tar.gz) = 1269819 +MD5 (sfslite-1.2.3.tar.gz) = 6948d99624977a6cc43fd8b586f5a60e +SHA256 (sfslite-1.2.3.tar.gz) = 248882e541a5d503e402f0d2088b4a548be8ea8a572e6cec3b23e7fda9da0582 +SIZE (sfslite-1.2.3.tar.gz) = 1298113 diff -ruN devel/sfslite.orig/files/patch-async-arena.h devel/sfslite/files/patch-async-arena.h --- devel/sfslite.orig/files/patch-async-arena.h Tue Jan 29 22:35:52 2008 +++ devel/sfslite/files/patch-async-arena.h Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- async/arena.h.orig 2005-11-01 16:20:29.000000000 +0000 -+++ async/arena.h 2007-07-12 22:38:10.000000000 +0000 -@@ -61,7 +61,7 @@ - #ifdef DMALLOC - char *_strdup_leap (const char *, int, const char *str) - { return strcpy ((char *) alloc (1 + strlen (str), 1), str); } -- char *dmalloc_strdup (const char *, int, const char *str, int) -+ char *dmalloc_strndup (const char *, int, const char *str, int, int) - { return strcpy ((char *) alloc (1 + strlen (str), 1), str); } - #endif /* DMALLOC */ - diff -ruN devel/sfslite.orig/files/patch-async-daemonize.C devel/sfslite/files/patch-async-daemonize.C --- devel/sfslite.orig/files/patch-async-daemonize.C Tue Jan 29 22:35:52 2008 +++ devel/sfslite/files/patch-async-daemonize.C Wed Dec 31 19:00:00 1969 @@ -1,45 +0,0 @@ ---- async/daemonize.C.orig 2005-11-01 16:20:30.000000000 +0000 -+++ async/daemonize.C 2007-07-12 22:38:51.000000000 +0000 -@@ -49,18 +49,18 @@ - const str &logfile, int flags, mode_t mode) - { - #ifdef PATH_LOGGER -- char *av[] = { PATH_LOGGER, "-p", NULL, "-t", NULL, NULL, NULL }; -+ char *av[] = { (char *)PATH_LOGGER, (char *)"-p", NULL, (char *)"-t", NULL, NULL, NULL }; - av[2] = const_cast (priority.cstr ()); - - if (line) - av[5] = const_cast (line.cstr ()); - else -- av[5] = "log started"; -+ av[5] = (char *)"log started"; - - if (tag) - av[4] = const_cast (tag.cstr ()); - else -- av[4] = ""; -+ av[4] = (char *)""; - - pid_t pid; - int status; -@@ -93,9 +93,9 @@ - start_logger () - { - #ifdef PATH_LOGGER -- char *av[] = { PATH_LOGGER, "-p", -+ char *av[] = { (char *)PATH_LOGGER, (char *)"-p", - const_cast (syslog_priority.cstr ()), -- "-t", "", NULL}; -+ (char *)"-t", (char *)"", NULL}; - int fds[2]; - - close (0); -@@ -177,7 +177,7 @@ - piddir = builddir; - str path = strbuf () << piddir << "/" << progname << ".pid"; - struct stat sb; -- if (str2file (path, strbuf ("%d\n", int (getpid ())), 0444, &sb)) -+ if (str2file (path, strbuf ("%d\n", int (getpid ())), 0444, false, &sb)) - pidfiles.push_back (pidfile (path, sb)); - } - } diff -ruN devel/sfslite.orig/files/patch-async-parseopt.C devel/sfslite/files/patch-async-parseopt.C --- devel/sfslite.orig/files/patch-async-parseopt.C Tue Jan 29 22:35:52 2008 +++ devel/sfslite/files/patch-async-parseopt.C Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- async/parseopt.C.orig 2005-11-01 16:20:32.000000000 +0000 -+++ async/parseopt.C 2007-07-12 22:38:53.000000000 +0000 -@@ -24,7 +24,7 @@ - #include "amisc.h" - #include "parseopt.h" - --char *parseargs::errorbuf = ""; -+char *parseargs::errorbuf = (char *)""; - - static inline int - isspc (char c) diff -ruN devel/sfslite.orig/files/patch-async-suio_vuprintf.C devel/sfslite/files/patch-async-suio_vuprintf.C --- devel/sfslite.orig/files/patch-async-suio_vuprintf.C Tue Jan 29 22:35:52 2008 +++ devel/sfslite/files/patch-async-suio_vuprintf.C Wed Dec 31 19:00:00 1969 @@ -1,42 +0,0 @@ ---- async/suio_vuprintf.C.orig 2005-11-01 16:20:33.000000000 +0000 -+++ async/suio_vuprintf.C 2007-07-12 22:38:56.000000000 +0000 -@@ -139,7 +139,7 @@ - int dprec; /* a copy of prec if [diouxX], 0 otherwise */ - int realsz; /* field size expanded by dprec */ - int size; /* size of converted field or string */ -- char *xdigs = ""; /* digits for [xX] conversion */ -+ char *xdigs = (char *)""; /* digits for [xX] conversion */ - - char buf[BUF]; /* space for %c, %[diouxX], %[eEfgG] */ - char ox[2]; /* space for 0x hex-prefix */ -@@ -392,7 +392,7 @@ - /* NOSTRICT */ - _uquad = (u_long) va_arg (ap, void *); - base = HEX; -- xdigs = "0123456789abcdef"; -+ xdigs = (char *)"0123456789abcdef"; - flags |= HEXPREFIX; - ch = 'x'; - goto nosign; -@@ -435,10 +435,10 @@ - base = DEC; - goto nosign; - case 'X': -- xdigs = "0123456789ABCDEF"; -+ xdigs = (char *)"0123456789ABCDEF"; - goto hex; - case 'x': -- xdigs = "0123456789abcdef"; -+ xdigs = (char *)"0123456789abcdef"; - hex: - _uquad = UARG (); - base = HEX; -@@ -498,7 +498,7 @@ - break; - - default: -- cp = "bug in vfprintf: bad base"; -+ cp = (char *)"bug in vfprintf: bad base"; - size = strlen (cp); - goto skipsize; - } diff -ruN devel/sfslite.orig/files/patch-async-sysconf.h devel/sfslite/files/patch-async-sysconf.h --- devel/sfslite.orig/files/patch-async-sysconf.h Tue Jan 29 22:35:52 2008 +++ devel/sfslite/files/patch-async-sysconf.h Wed Dec 31 19:00:00 1969 @@ -1,30 +0,0 @@ ---- async/sysconf.h.orig Thu Aug 30 16:57:16 2007 -+++ async/sysconf.h Fri Sep 14 01:46:21 2007 -@@ -495,15 +495,16 @@ - #include - - #undef memcpy -+#undef memmove - #undef xfree - - #if DMALLOC_VERSION_MAJOR < 5 || \ - (DMALLOC_VERSION_MAJOR == 5 && DMALLOC_VERSION_MINOR < 5) - - #define memcpy(to, from, len) \ -- _dmalloc_memcpy((char *) (to), (const char *) (from), len) -+ _dmalloc_memcpy(__FILE__, __LINE__, (char *) (to), (const char *) (from), len) - #define memmove(to, from, len) \ -- _dmalloc_bcopy((const char *) (from), (char *) (to), len) -+ _dmalloc_bcopy(__FILE__, __LINE__, (const char *) (from), (char *) (to), len) - - #endif /* version < 5.5 */ - -@@ -515,7 +516,7 @@ - dmalloc_malloc (f, l, s, DMALLOC_FUNC_MALLOC, 0, 0) - #define _xfree_leap(f, l, p) dmalloc_free (f, l, p, DMALLOC_FUNC_FREE) - #undef xstrdup --#define xstrdup(__s) ((char *) dmalloc_strdup(__FILE__, __LINE__, __s, 1)) -+#define xstrdup(__s) ((char *) dmalloc_strndup(__FILE__, __LINE__, __s, -1, 1)) - #endif /* DMALLOC_VERSION_MAJOR >= 5 */ - - static inline void diff -ruN devel/sfslite.orig/files/patch-crypt-getsysnoise.C devel/sfslite/files/patch-crypt-getsysnoise.C --- devel/sfslite.orig/files/patch-crypt-getsysnoise.C Tue Jan 29 22:35:52 2008 +++ devel/sfslite/files/patch-crypt-getsysnoise.C Wed Dec 31 19:00:00 1969 @@ -1,81 +0,0 @@ ---- crypt/getsysnoise.C.orig 2005-11-01 16:20:36.000000000 +0000 -+++ crypt/getsysnoise.C 2007-07-12 22:38:59.000000000 +0000 -@@ -27,57 +27,57 @@ - #include - - char *const noiseprogs[][5] = { -- { PATH_PS, "laxwww" }, -- { PATH_PS, "-al" }, -- { PATH_LS, "-nfail", "/tmp/." }, -+ { (char *)PATH_PS, (char *)"laxwww" }, -+ { (char *)PATH_PS, (char *)"-al" }, -+ { (char *)PATH_LS, (char *)"-nfail", (char *)"/tmp/." }, - #ifdef PATH_NETSTAT -- { PATH_NETSTAT, "-s" }, -- { PATH_NETSTAT, "-an" }, -- { PATH_NETSTAT, "-in" }, -+ { (char *)PATH_NETSTAT, (char *)"-s" }, -+ { (char *)PATH_NETSTAT, (char *)"-an" }, -+ { (char *)PATH_NETSTAT, (char *)"-in" }, - #endif /* PATH_NETSTAT */ - #ifdef PATH_NTPQ -- { PATH_NTPQ, "-np" }, -+ { (char *)PATH_NTPQ, (char *)"-np" }, - #endif /* PATH_NTPQ */ - #ifdef PATH_W -- { PATH_W }, -+ { (char *)PATH_W }, - #endif /* PATH_W */ - #ifdef PATH_NFSSTAT -- { PATH_NFSSTAT }, -+ { (char *)PATH_NFSSTAT }, - #endif /* PATH_NFSSTAT */ - #ifdef PATH_VNSTAT -- { PATH_VMSTAT }, -- { PATH_VMSTAT, "-i" }, -- { PATH_VMSTAT, "-s" }, -+ { (char *)PATH_VMSTAT }, -+ { (char *)PATH_VMSTAT, (char *)"-i" }, -+ { (char *)PATH_VMSTAT, (char *)"-s" }, - #endif /* PATH_VNSTAT */ - #ifdef PATH_IOSTAT - #if defined (__linux__) || defined (__osf__) -- { PATH_IOSTAT }, -+ { (char *)PATH_IOSTAT }, - #else /* not linux or osf */ -- { PATH_IOSTAT, "-I" }, -+ { (char *)PATH_IOSTAT, (char *)"-I" }, - #endif /* not linux or osf */ - #endif /* PATH_IOSTAT */ - #ifdef PATH_LSOF -- { PATH_LSOF, "-bwn", -+ { (char *)PATH_LSOF, (char *)"-bwn", - # ifdef LSOF_DEVCACHE -- "-Di" -+ (char *)"-Di" - # endif /* LSOF_DEVCACHE */ - }, - #else /* no lsof */ - # ifdef PATH_FSTAT -- { PATH_FSTAT }, -+ { (char *)PATH_FSTAT }, - # endif /* PATH_FSTAT */ - # ifdef PATH_PSTAT -- { PATH_PSTAT, "-f" }, -+ { (char *)PATH_PSTAT, (char *)"-f" }, - # endif /* PATH_PSTAT */ - #endif /* no lsof */ - #ifdef PATH_PSTAT -- { PATH_PSTAT, "-t" }, -+ { (char *)PATH_PSTAT, (char *)"-t" }, - # if defined (__OpenBSD__) || defined (__NetBSD__) || defined (__FreeBSD__) -- { PATH_PSTAT, "-v" }, -+ { (char *)PATH_PSTAT, (char *)"-v" }, - # endif /* open/net/freebsd */ - #endif /* PATH_PSTAT */ - #ifdef PATH_NFSSTAT -- { PATH_NFSSTAT }, -+ { (char *)PATH_NFSSTAT }, - #endif /* PATH_NFSSTAT */ - #if 0 - { PATH_RUP }, diff -ruN devel/sfslite.orig/files/patch-rpcc-rpcc.C devel/sfslite/files/patch-rpcc-rpcc.C --- devel/sfslite.orig/files/patch-rpcc-rpcc.C Tue Jan 29 22:35:52 2008 +++ devel/sfslite/files/patch-rpcc-rpcc.C Wed Dec 31 19:00:00 1969 @@ -1,58 +0,0 @@ ---- rpcc/rpcc.C.orig 2005-07-15 23:21:51.000000000 +0000 -+++ rpcc/rpcc.C 2007-07-12 22:39:01.000000000 +0000 -@@ -152,8 +152,8 @@ - void (*fn) (str) = NULL; - int len; - -- av.push_back (PATH_CPP); -- av.push_back ("-DRPCC"); -+ av.push_back ((char *)PATH_CPP); -+ av.push_back ((char *)"-DRPCC"); - av.push_back (NULL); - - for (an = 1; an < argc; an++) { -@@ -213,38 +213,38 @@ - - switch (mode) { - case HEADER: -- av[2] = "-DRPCC_H"; -+ av[2] = (char *)"-DRPCC_H"; - fn = genheader; - if (!outfile) - outfile = strbuf ("%.*sh", len - 1, basename); - break; - case CFILE: -- av[2] = "-DRPCC_C"; -+ av[2] = (char *)"-DRPCC_C"; - fn = gencfile; - if (!outfile) - outfile = strbuf ("%.*sC", len - 1, basename); - break; - case PYTHON: -- av[2] = "-DRPCC_P"; -+ av[2] = (char *)"-DRPCC_P"; - fn = genpython; - if (!outfile) - outfile = strbuf ("%.*spy", len - 1, basename); - break; - case PYL: -- av[2] = "-DRPCC_PYL"; -+ av[2] = (char *)"-DRPCC_PYL"; - fn = genpyc_lib; - // foo.x -> foo_lib.C - if (!outfile) - outfile = strbuf ("%.*s_lib.C", len - 2, basename); - break; - case PYH: -- av[2] = "-DRPCC_PYH"; -+ av[2] = (char *)"-DRPCC_PYH"; - fn = genpyh; - if (!outfile) - outfile = strbuf ("%.*sh", len -1, basename); - break; - case PYS: -- av[2] = "-DRPCC_PYS"; -+ av[2] = (char *)"-DRPCC_PYS"; - fn = genpyc_so; - // foo.x -> foo_so.C - if (!outfile) diff -ruN devel/sfslite.orig/pkg-plist devel/sfslite/pkg-plist --- devel/sfslite.orig/pkg-plist Tue Jan 29 22:35:52 2008 +++ devel/sfslite/pkg-plist Tue Jan 29 23:36:08 2008 @@ -35,6 +35,7 @@ include/sfslite-%%VERSION%%/%%TAG%%/dns.h include/sfslite-%%VERSION%%/%%TAG%%/dnsimpl.h include/sfslite-%%VERSION%%/%%TAG%%/dnsparse.h +include/sfslite-%%VERSION%%/%%TAG%%/dynenum.h include/sfslite-%%VERSION%%/%%TAG%%/err.h include/sfslite-%%VERSION%%/%%TAG%%/esign.h include/sfslite-%%VERSION%%/%%TAG%%/fdlim.h @@ -65,6 +66,7 @@ include/sfslite-%%VERSION%%/%%TAG%%/prng.h include/sfslite-%%VERSION%%/%%TAG%%/qhash.h include/sfslite-%%VERSION%%/%%TAG%%/rabin.h +include/sfslite-%%VERSION%%/%%TAG%%/rclist.h include/sfslite-%%VERSION%%/%%TAG%%/refcnt.h include/sfslite-%%VERSION%%/%%TAG%%/rex.h include/sfslite-%%VERSION%%/%%TAG%%/rpctypes.h >Release-Note: >Audit-Trail: >Unformatted: