View | Details | Raw Unified | Return to bug 120141
Collapse All | Expand All

(-)devel/sfslite/Makefile (-5 / +1 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	sfslite
8
PORTNAME=	sfslite
9
PORTVERSION=	1.2.2
9
PORTVERSION=	1.2.3
10
PORTREVISION=	1
10
PORTREVISION=	1
11
CATEGORIES=	devel
11
CATEGORIES=	devel
12
MASTER_SITES=	http://dist.okws.org/dist/
12
MASTER_SITES=	http://dist.okws.org/dist/
Lines 65-73 Link Here
65
	PKG_PREFIX=${PREFIX} ${SH} ${PKG_INSTALL} ${PKGNAME} PRE-INSTALL
65
	PKG_PREFIX=${PREFIX} ${SH} ${PKG_INSTALL} ${PKGNAME} PRE-INSTALL
66
66
67
.include <bsd.port.pre.mk>
67
.include <bsd.port.pre.mk>
68
69
.if ${OSVERSION} >= 700042
70
BROKEN=		Does not compile with GCC 4.2
71
.endif
72
68
73
.include <bsd.port.post.mk>
69
.include <bsd.port.post.mk>
(-)devel/sfslite/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (sfslite-1.2.2.tar.gz) = a819f483eb2a0508f363c2f9cb2326e4
1
MD5 (sfslite-1.2.3.tar.gz) = 6948d99624977a6cc43fd8b586f5a60e
2
SHA256 (sfslite-1.2.2.tar.gz) = 8b78bede2a2dc4d6756652a71ac22969490ab0bc2218b3651f2374067b146089
2
SHA256 (sfslite-1.2.3.tar.gz) = 248882e541a5d503e402f0d2088b4a548be8ea8a572e6cec3b23e7fda9da0582
3
SIZE (sfslite-1.2.2.tar.gz) = 1269819
3
SIZE (sfslite-1.2.3.tar.gz) = 1298113
(-)devel/sfslite/files/patch-async-arena.h (-11 lines)
Lines 1-11 Link Here
1
--- async/arena.h.orig	2005-11-01 16:20:29.000000000 +0000
2
+++ async/arena.h	2007-07-12 22:38:10.000000000 +0000
3
@@ -61,7 +61,7 @@
4
 #ifdef DMALLOC
5
   char *_strdup_leap (const char *, int, const char *str)
6
     { return strcpy ((char *) alloc (1 + strlen (str), 1), str); }
7
-  char *dmalloc_strdup (const char *, int, const char *str, int)
8
+  char *dmalloc_strndup (const char *, int, const char *str, int, int)
9
     { return strcpy ((char *) alloc (1 + strlen (str), 1), str); }
10
 #endif /* DMALLOC */
11
 
(-)devel/sfslite/files/patch-async-daemonize.C (-45 lines)
Lines 1-45 Link Here
1
--- async/daemonize.C.orig	2005-11-01 16:20:30.000000000 +0000
2
+++ async/daemonize.C	2007-07-12 22:38:51.000000000 +0000
3
@@ -49,18 +49,18 @@
4
 	      const str &logfile, int flags, mode_t mode)
5
 {
6
 #ifdef PATH_LOGGER
7
-  char *av[] = { PATH_LOGGER, "-p", NULL, "-t", NULL, NULL, NULL };
8
+  char *av[] = { (char *)PATH_LOGGER, (char *)"-p", NULL, (char *)"-t", NULL, NULL, NULL };
9
   av[2] = const_cast<char *> (priority.cstr ());
10
   
11
   if (line)
12
     av[5] = const_cast<char *> (line.cstr ());
13
   else
14
-    av[5] = "log started";
15
+    av[5] = (char *)"log started";
16
 
17
   if (tag)
18
     av[4] = const_cast<char *> (tag.cstr ());
19
   else 
20
-    av[4] = "";
21
+    av[4] = (char *)"";
22
 
23
   pid_t pid;
24
   int status;
25
@@ -93,9 +93,9 @@
26
 start_logger ()
27
 {
28
 #ifdef PATH_LOGGER
29
-  char *av[] = { PATH_LOGGER, "-p",
30
+  char *av[] = { (char *)PATH_LOGGER, (char *)"-p",
31
 		 const_cast<char *> (syslog_priority.cstr ()),
32
-		 "-t", "", NULL};
33
+		 (char *)"-t", (char *)"", NULL};
34
   int fds[2];
35
 
36
   close (0);
37
@@ -177,7 +177,7 @@
38
       piddir = builddir;
39
     str path = strbuf () << piddir << "/" << progname << ".pid";
40
     struct stat sb;
41
-    if (str2file (path, strbuf ("%d\n", int (getpid ())), 0444, &sb))
42
+    if (str2file (path, strbuf ("%d\n", int (getpid ())), 0444, false, &sb))
43
       pidfiles.push_back (pidfile (path, sb));
44
   }
45
 }
(-)devel/sfslite/files/patch-async-parseopt.C (-11 lines)
Lines 1-11 Link Here
1
--- async/parseopt.C.orig	2005-11-01 16:20:32.000000000 +0000
2
+++ async/parseopt.C	2007-07-12 22:38:53.000000000 +0000
3
@@ -24,7 +24,7 @@
4
 #include "amisc.h"
5
 #include "parseopt.h"
6
 
7
-char *parseargs::errorbuf = "";
8
+char *parseargs::errorbuf = (char *)"";
9
 
10
 static inline int
11
 isspc (char c)
(-)devel/sfslite/files/patch-async-suio_vuprintf.C (-42 lines)
Lines 1-42 Link Here
1
--- async/suio_vuprintf.C.orig	2005-11-01 16:20:33.000000000 +0000
2
+++ async/suio_vuprintf.C	2007-07-12 22:38:56.000000000 +0000
3
@@ -139,7 +139,7 @@
4
   int dprec;			/* a copy of prec if [diouxX], 0 otherwise */
5
   int realsz;			/* field size expanded by dprec */
6
   int size;			/* size of converted field or string */
7
-  char *xdigs = "";		/* digits for [xX] conversion */
8
+  char *xdigs = (char *)"";	/* digits for [xX] conversion */
9
 
10
   char buf[BUF];                /* space for %c, %[diouxX], %[eEfgG] */
11
   char ox[2];                   /* space for 0x hex-prefix */
12
@@ -392,7 +392,7 @@
13
       /* NOSTRICT */
14
       _uquad = (u_long) va_arg (ap, void *);
15
       base = HEX;
16
-      xdigs = "0123456789abcdef";
17
+      xdigs = (char *)"0123456789abcdef";
18
       flags |= HEXPREFIX;
19
       ch = 'x';
20
       goto nosign;
21
@@ -435,10 +435,10 @@
22
       base = DEC;
23
       goto nosign;
24
     case 'X':
25
-      xdigs = "0123456789ABCDEF";
26
+      xdigs = (char *)"0123456789ABCDEF";
27
       goto hex;
28
     case 'x':
29
-      xdigs = "0123456789abcdef";
30
+      xdigs = (char *)"0123456789abcdef";
31
     hex:
32
       _uquad = UARG ();
33
       base = HEX;
34
@@ -498,7 +498,7 @@
35
 	  break;
36
 
37
 	default:
38
-	  cp = "bug in vfprintf: bad base";
39
+	  cp = (char *)"bug in vfprintf: bad base";
40
 	  size = strlen (cp);
41
 	  goto skipsize;
42
 	}
(-)devel/sfslite/files/patch-async-sysconf.h (-30 lines)
Lines 1-30 Link Here
1
--- async/sysconf.h.orig	Thu Aug 30 16:57:16 2007
2
+++ async/sysconf.h	Fri Sep 14 01:46:21 2007
3
@@ -495,15 +495,16 @@
4
 #include <dmalloc.h>
5
 
6
 #undef memcpy
7
+#undef memmove
8
 #undef xfree
9
 
10
 #if DMALLOC_VERSION_MAJOR < 5  || \
11
      (DMALLOC_VERSION_MAJOR == 5 && DMALLOC_VERSION_MINOR < 5)
12
 
13
 #define memcpy(to, from, len) \
14
-  _dmalloc_memcpy((char *) (to), (const char *) (from), len)
15
+  _dmalloc_memcpy(__FILE__, __LINE__, (char *) (to), (const char *) (from), len)
16
 #define memmove(to, from, len) \
17
-  _dmalloc_bcopy((const char *) (from), (char *) (to), len)
18
+  _dmalloc_bcopy(__FILE__, __LINE__, (const char *) (from), (char *) (to), len)
19
 
20
 #endif /* version < 5.5 */
21
 
22
@@ -515,7 +516,7 @@
23
   dmalloc_malloc (f, l, s, DMALLOC_FUNC_MALLOC, 0, 0)
24
 #define _xfree_leap(f, l, p) dmalloc_free (f, l, p, DMALLOC_FUNC_FREE)
25
 #undef xstrdup 
26
-#define xstrdup(__s) ((char *) dmalloc_strdup(__FILE__, __LINE__, __s, 1))
27
+#define xstrdup(__s) ((char *) dmalloc_strndup(__FILE__, __LINE__, __s, -1, 1))
28
 #endif /* DMALLOC_VERSION_MAJOR >= 5 */
29
 
30
 static inline void
(-)devel/sfslite/files/patch-crypt-getsysnoise.C (-81 lines)
Lines 1-81 Link Here
1
--- crypt/getsysnoise.C.orig	2005-11-01 16:20:36.000000000 +0000
2
+++ crypt/getsysnoise.C	2007-07-12 22:38:59.000000000 +0000
3
@@ -27,57 +27,57 @@
4
 #include <sys/resource.h>
5
 
6
 char *const noiseprogs[][5] = {
7
-  { PATH_PS, "laxwww" },
8
-  { PATH_PS, "-al" },
9
-  { PATH_LS, "-nfail", "/tmp/." },
10
+  { (char *)PATH_PS, (char *)"laxwww" },
11
+  { (char *)PATH_PS, (char *)"-al" },
12
+  { (char *)PATH_LS, (char *)"-nfail", (char *)"/tmp/." },
13
 #ifdef PATH_NETSTAT
14
-  { PATH_NETSTAT, "-s" },
15
-  { PATH_NETSTAT, "-an" },
16
-  { PATH_NETSTAT, "-in" },
17
+  { (char *)PATH_NETSTAT, (char *)"-s" },
18
+  { (char *)PATH_NETSTAT, (char *)"-an" },
19
+  { (char *)PATH_NETSTAT, (char *)"-in" },
20
 #endif /* PATH_NETSTAT */
21
 #ifdef PATH_NTPQ
22
-  { PATH_NTPQ, "-np" },
23
+  { (char *)PATH_NTPQ, (char *)"-np" },
24
 #endif /* PATH_NTPQ */
25
 #ifdef PATH_W
26
-  { PATH_W },
27
+  { (char *)PATH_W },
28
 #endif /* PATH_W */
29
 #ifdef PATH_NFSSTAT
30
-  { PATH_NFSSTAT },
31
+  { (char *)PATH_NFSSTAT },
32
 #endif /* PATH_NFSSTAT */
33
 #ifdef PATH_VNSTAT
34
-  { PATH_VMSTAT },
35
-  { PATH_VMSTAT, "-i" },
36
-  { PATH_VMSTAT, "-s" },
37
+  { (char *)PATH_VMSTAT },
38
+  { (char *)PATH_VMSTAT, (char *)"-i" },
39
+  { (char *)PATH_VMSTAT, (char *)"-s" },
40
 #endif /* PATH_VNSTAT */
41
 #ifdef PATH_IOSTAT
42
 #if defined (__linux__) || defined (__osf__)
43
-  { PATH_IOSTAT },
44
+  { (char *)PATH_IOSTAT },
45
 #else /* not linux or osf */
46
-  { PATH_IOSTAT, "-I" },
47
+  { (char *)PATH_IOSTAT, (char *)"-I" },
48
 #endif /* not linux or osf */
49
 #endif /* PATH_IOSTAT */
50
 #ifdef PATH_LSOF
51
-  { PATH_LSOF, "-bwn",
52
+  { (char *)PATH_LSOF, (char *)"-bwn",
53
 # ifdef LSOF_DEVCACHE
54
-    "-Di"
55
+    (char *)"-Di"
56
 # endif /* LSOF_DEVCACHE */
57
   },
58
 #else /* no lsof */
59
 # ifdef PATH_FSTAT
60
-  { PATH_FSTAT },
61
+  { (char *)PATH_FSTAT },
62
 # endif /* PATH_FSTAT */
63
 # ifdef PATH_PSTAT
64
-  { PATH_PSTAT, "-f" },
65
+  { (char *)PATH_PSTAT, (char *)"-f" },
66
 # endif /* PATH_PSTAT */
67
 #endif /* no lsof */
68
 #ifdef PATH_PSTAT
69
-  { PATH_PSTAT, "-t" },
70
+  { (char *)PATH_PSTAT, (char *)"-t" },
71
 # if defined (__OpenBSD__) || defined (__NetBSD__) || defined (__FreeBSD__)
72
-  { PATH_PSTAT, "-v" },
73
+  { (char *)PATH_PSTAT, (char *)"-v" },
74
 # endif /* open/net/freebsd */
75
 #endif /* PATH_PSTAT */
76
 #ifdef PATH_NFSSTAT
77
-  { PATH_NFSSTAT },
78
+  { (char *)PATH_NFSSTAT },
79
 #endif /* PATH_NFSSTAT */
80
 #if 0
81
   { PATH_RUP },
(-)devel/sfslite/files/patch-rpcc-rpcc.C (-58 lines)
Lines 1-58 Link Here
1
--- rpcc/rpcc.C.orig	2005-07-15 23:21:51.000000000 +0000
2
+++ rpcc/rpcc.C	2007-07-12 22:39:01.000000000 +0000
3
@@ -152,8 +152,8 @@
4
   void (*fn) (str) = NULL;
5
   int len;
6
 
7
-  av.push_back (PATH_CPP);
8
-  av.push_back ("-DRPCC");
9
+  av.push_back ((char *)PATH_CPP);
10
+  av.push_back ((char *)"-DRPCC");
11
   av.push_back (NULL);
12
 
13
   for (an = 1; an < argc; an++) {
14
@@ -213,38 +213,38 @@
15
 
16
   switch (mode) {
17
   case HEADER:
18
-    av[2] = "-DRPCC_H";
19
+    av[2] = (char *)"-DRPCC_H";
20
     fn = genheader;
21
     if (!outfile)
22
       outfile = strbuf ("%.*sh", len - 1, basename);
23
     break;
24
   case CFILE:
25
-    av[2] = "-DRPCC_C";
26
+    av[2] = (char *)"-DRPCC_C";
27
     fn = gencfile;
28
     if (!outfile)
29
       outfile = strbuf ("%.*sC", len - 1, basename);
30
     break;
31
   case PYTHON:
32
-    av[2] = "-DRPCC_P";
33
+    av[2] = (char *)"-DRPCC_P";
34
     fn = genpython;
35
     if (!outfile)
36
       outfile = strbuf ("%.*spy", len - 1, basename);
37
      break;
38
   case PYL:
39
-    av[2] = "-DRPCC_PYL";
40
+    av[2] = (char *)"-DRPCC_PYL";
41
     fn = genpyc_lib;
42
     // foo.x -> foo_lib.C
43
     if (!outfile)
44
       outfile = strbuf ("%.*s_lib.C", len - 2, basename);
45
     break;
46
   case PYH:
47
-    av[2] = "-DRPCC_PYH";
48
+    av[2] = (char *)"-DRPCC_PYH";
49
     fn = genpyh;
50
     if (!outfile)
51
       outfile = strbuf ("%.*sh", len -1, basename);
52
     break;
53
   case PYS:
54
-    av[2] = "-DRPCC_PYS";
55
+    av[2] = (char *)"-DRPCC_PYS";
56
     fn = genpyc_so;
57
     // foo.x -> foo_so.C
58
     if (!outfile)
(-)devel/sfslite/pkg-plist (+2 lines)
Lines 35-40 Link Here
35
include/sfslite-%%VERSION%%/%%TAG%%/dns.h
35
include/sfslite-%%VERSION%%/%%TAG%%/dns.h
36
include/sfslite-%%VERSION%%/%%TAG%%/dnsimpl.h
36
include/sfslite-%%VERSION%%/%%TAG%%/dnsimpl.h
37
include/sfslite-%%VERSION%%/%%TAG%%/dnsparse.h
37
include/sfslite-%%VERSION%%/%%TAG%%/dnsparse.h
38
include/sfslite-%%VERSION%%/%%TAG%%/dynenum.h
38
include/sfslite-%%VERSION%%/%%TAG%%/err.h
39
include/sfslite-%%VERSION%%/%%TAG%%/err.h
39
include/sfslite-%%VERSION%%/%%TAG%%/esign.h
40
include/sfslite-%%VERSION%%/%%TAG%%/esign.h
40
include/sfslite-%%VERSION%%/%%TAG%%/fdlim.h
41
include/sfslite-%%VERSION%%/%%TAG%%/fdlim.h
Lines 65-70 Link Here
65
include/sfslite-%%VERSION%%/%%TAG%%/prng.h
66
include/sfslite-%%VERSION%%/%%TAG%%/prng.h
66
include/sfslite-%%VERSION%%/%%TAG%%/qhash.h
67
include/sfslite-%%VERSION%%/%%TAG%%/qhash.h
67
include/sfslite-%%VERSION%%/%%TAG%%/rabin.h
68
include/sfslite-%%VERSION%%/%%TAG%%/rabin.h
69
include/sfslite-%%VERSION%%/%%TAG%%/rclist.h
68
include/sfslite-%%VERSION%%/%%TAG%%/refcnt.h
70
include/sfslite-%%VERSION%%/%%TAG%%/refcnt.h
69
include/sfslite-%%VERSION%%/%%TAG%%/rex.h
71
include/sfslite-%%VERSION%%/%%TAG%%/rex.h
70
include/sfslite-%%VERSION%%/%%TAG%%/rpctypes.h
72
include/sfslite-%%VERSION%%/%%TAG%%/rpctypes.h

Return to bug 120141