Attachment #49503 for bug #75590

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

Lines 35-44 Link Here

(-)stegdetect.patch/Makefile (-4 lines)
35		35
36	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
37		37
38	.if ${OSVERSION} >= 502126
39	BROKEN= "Does not compile on FreeBSD >= 5.x"
40	.endif
41
42	post-patch:	38	post-patch:
43	${REINPLACE_CMD} 's/$$(JPEGLIB)/$$(JPEGLIB) -lcrypto/' \	39	${REINPLACE_CMD} 's/$$(JPEGLIB)/$$(JPEGLIB) -lcrypto/' \
44	${WRKSRC}/Makefile.in	40	${WRKSRC}/Makefile.in

Line 0 Link Here

(-)stegdetect.patch/files/patch-break_jsteg.c (+11 lines)
	1	--- break_jsteg.c Fri Dec 21 01:11:32 2001
	2	+++ /tmp/break_jsteg.c.diff Wed Dec 29 03:32:38 2004
	3	@@ -162,7 +162,7 @@
	4	jstegob->skip = bytes - sizeof(jstegob->coeff);
	5
	6	if (jsbits < max \|\| off + jsbits > bits) {
	7	- warnx(__FUNCTION__": bad size in bits, %d", bits);
	8	+ warnx("break_jsteg_prepare: bad size in bits, %d", bits);
	9	return (NULL);
	10	}
	11




--- common.c	Tue Jan 22 19:25:38 2002
+++ common.c.diff	Wed Dec 29 03:35:11 2004
@@ -85,7 +85,7 @@
 
 	if (datasrc->bytes_in_buffer == 0) {
 		if (! (*datasrc->fill_input_buffer) (cinfo))
-			err(1, __FUNCTION__": fill_input");
+			err(1, "jpeg_getc: fill_input");
 	}
 	datasrc->bytes_in_buffer--;
 	return GETJOCTET(*datasrc->next_input_byte++);
@@ -297,7 +297,7 @@
 
 	dcts = malloc(bits * sizeof (short));
 	if (dcts == NULL) {
-		warn(__FUNCTION__": malloc");
+		warn("prepare_all: malloc");
 		return (-1);
 	}
 
@@ -362,7 +362,7 @@
 	if (pdcts != NULL) {
 		dcts = malloc(bits * sizeof (short));
 		if (dcts == NULL) {
-			warn(__FUNCTION__": malloc");
+			warn("prepare_normal: malloc");
 			return (-1);
 		}
 	}
@@ -410,7 +410,7 @@
 		/* XXX - wasteful */
 		back[comp] = calloc(off, sizeof (char));
 		if (back[comp] == NULL) {
-			warn(__FUNCTION__": calloc");
+			warn("prepare_jphide: calloc");
 			goto err;
 		}
 	}
@@ -418,7 +418,7 @@
 	if (pdcts != NULL) {
 		dcts = malloc(mbits * sizeof (short));
 		if (dcts == NULL) {
-			warn(__FUNCTION__": malloc");
+			warn("prepare_jphide: malloc");
 			goto err;
 		}
 	}




--- stegdetect.c	Sat Jan 26 23:51:16 2002
+++ /tmp/stegdetect.c.diff	Wed Dec 29 03:32:38 2004
@@ -1198,7 +1198,7 @@
 		flag = 1;
 		strlcat(outbuf, " f5(***)", sizeof(outbuf));
 
-	no_f5:
+	no_f5:;
 	}
 
 	if (scans & FLAG_DOINVIS) {
@@ -1237,7 +1237,7 @@
 			strlcat(outbuf, tmp, sizeof(outbuf));
 		}
 		
-	no_invisiblesecrets:
+	no_invisiblesecrets:;
 	}
 
 	if ((scans & FLAG_CHECKHDRS)) {
@@ -1301,7 +1301,7 @@
 		}
 
 		free(dcts);
-	jsteg_error:
+	jsteg_error:;
 	}
 
 	if ((scans & FLAG_DOOUTGUESS) && prepare_normal(&dcts, &bits) != -1) {

Return to bug 75590

Line 0 Link Here

(-)stegdetect.patch/files/patch-common.c (+47 lines)
	1	--- common.c Tue Jan 22 19:25:38 2002
	2	+++ common.c.diff Wed Dec 29 03:35:11 2004
	3	@@ -85,7 +85,7 @@
	4
	5	if (datasrc->bytes_in_buffer == 0) {
	6	if (! (*datasrc->fill_input_buffer) (cinfo))
	7	- err(1, __FUNCTION__": fill_input");
	8	+ err(1, "jpeg_getc: fill_input");
	9	}
	10	datasrc->bytes_in_buffer--;
	11	return GETJOCTET(*datasrc->next_input_byte++);
	12	@@ -297,7 +297,7 @@
	13
	14	dcts = malloc(bits * sizeof (short));
	15	if (dcts == NULL) {
	16	- warn(__FUNCTION__": malloc");
	17	+ warn("prepare_all: malloc");
	18	return (-1);
	19	}
	20
	21	@@ -362,7 +362,7 @@
	22	if (pdcts != NULL) {
	23	dcts = malloc(bits * sizeof (short));
	24	if (dcts == NULL) {
	25	- warn(__FUNCTION__": malloc");
	26	+ warn("prepare_normal: malloc");
	27	return (-1);
	28	}
	29	}
	30	@@ -410,7 +410,7 @@
	31	/* XXX - wasteful */
	32	back[comp] = calloc(off, sizeof (char));
	33	if (back[comp] == NULL) {
	34	- warn(__FUNCTION__": calloc");
	35	+ warn("prepare_jphide: calloc");
	36	goto err;
	37	}
	38	}
	39	@@ -418,7 +418,7 @@
	40	if (pdcts != NULL) {
	41	dcts = malloc(mbits * sizeof (short));
	42	if (dcts == NULL) {
	43	- warn(__FUNCTION__": malloc");
	44	+ warn("prepare_jphide: malloc");
	45	goto err;
	46	}
	47	}

Line 0 Link Here

(-)stegdetect.patch/files/patch-stegdetect.c (+29 lines)
	1	--- stegdetect.c Sat Jan 26 23:51:16 2002
	2	+++ /tmp/stegdetect.c.diff Wed Dec 29 03:32:38 2004
	3	@@ -1198,7 +1198,7 @@
	4	flag = 1;
	5	strlcat(outbuf, " f5(***)", sizeof(outbuf));
	6
	7	- no_f5:
	8	+ no_f5:;
	9	}
	10
	11	if (scans & FLAG_DOINVIS) {
	12	@@ -1237,7 +1237,7 @@
	13	strlcat(outbuf, tmp, sizeof(outbuf));
	14	}
	15
	16	- no_invisiblesecrets:
	17	+ no_invisiblesecrets:;
	18	}
	19
	20	if ((scans & FLAG_CHECKHDRS)) {
	21	@@ -1301,7 +1301,7 @@
	22	}
	23
	24	free(dcts);
	25	- jsteg_error:
	26	+ jsteg_error:;
	27	}
	28
	29	if ((scans & FLAG_DOOUTGUESS) && prepare_normal(&dcts, &bits) != -1) {