Attachment #64413 for bug #95793

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




#

PORTNAME=	stegdetect
PORTVERSION=	0.6
PORTREVISION=	3
CATEGORIES=	security
MASTER_SITES=	http://www.outguess.org/ \
		http://distfiles.master.finkmirrors.net/

MAINTAINER=	rainer.alves@gmail.com
COMMENT=	Automated tool for detecting steganographic content in JPEGs

.if !defined(WITHOUT_X11)
BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent


# Note: stegdetect includes a modified version of jpeg-6b linked statically
GNU_CONFIGURE=	yes
USE_GMAKE=	yes
CONFIGURE_ARGS+=--program-prefix=''
MAN1=		stegdetect.1 stegbreak.1

.if defined(WITHOUT_X11)
PLIST_SUB+=	X11="@comment "
.else
USE_GNOME=	gtk12
CONFIGURE_ENV+=	PATH_GTKCONFIG="${GTK_CONFIG}"
PLIST_SUB+=	X11=""
.endif

post-patch:
	${REINPLACE_CMD} 's;/usr/include/event;${LOCALBASE}/include;g' \
	${WRKSRC}/configure
.if defined(WITHOUT_X11)
	${REINPLACE_CMD} 's/gtk-config//g' ${WRKSRC}/configure
.endif

Lines 1-3 Link Here

(-)security/stegdetect/distinfo (-3 / +3 lines)
1	MD5 (stegdetect-0.5.tar.gz) = 6f3708bb15fd629ced835d12f561e82b	1	MD5 (stegdetect-0.6.tar.gz) = 850a3551b5c450b9f450a919ad021767
2	SHA256 (stegdetect-0.5.tar.gz) = 16b19374af45a64fec309b6c6f435bcdb08e4f881d1900a71ba8f8785cd39cc1	2	SHA256 (stegdetect-0.6.tar.gz) = 71149fc9fc58c44a49a38c7013d22d8a861e45acb1074b6c3004b314c8e81a8d
3	SIZE (stegdetect-0.5.tar.gz) = 1278105	3	SIZE (stegdetect-0.6.tar.gz) = 1269001




--- Makefile.in.orig	Tue Aug 31 11:59:42 2004
+++ Makefile.in	Sat Apr 15 03:04:17 2006
@@ -70,7 +70,7 @@
 
 JPEGDIR = ./jpeg-6b
 JPEGINC = -I$(JPEGDIR)
-JPEGLIB = -L$(JPEGDIR) -ljpeg
+JPEGLIB = -L$(JPEGDIR) -ljpeg -lcrypto
 JPEGDEP = $(JPEGDIR)/libjpeg.a
 
 FILEDIR = ./file
@@ -330,19 +330,23 @@
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
+    	if test "$$target" = "install"; then \
+	  ($(MAKE) $(AM_MAKEFLAGS) $$target-am) || exit 1; \
+	else \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    echo "Making $$target in $$subdir"; \
+	    if test "$$subdir" = "."; then \
+	      dot_seen=yes; \
+	      local_target="$$target-am"; \
+	    else \
+	      local_target="$$target"; \
+	    fi; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	     || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  done; \
+	  if test "$$dot_seen" = "no"; then \
+	    $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
 mostlyclean-recursive clean-recursive distclean-recursive \

Lines 1-10 Link Here

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




--- common.c.orig	Sun Aug 29 20:11:00 2004
+++ common.c	Sat Apr 15 00:11:40 2006
@@ -85,7 +85,7 @@
 
 	if (datasrc->bytes_in_buffer == 0) {
 		if (! (*datasrc->fill_input_buffer) (cinfo))
-			err(1, "%s: fill_input", __FUNCTION__);
+			err(1, "jpeg_getc: fill_input");
 	}
 	datasrc->bytes_in_buffer--;
 	return GETJOCTET(*datasrc->next_input_byte++);
@@ -308,7 +308,7 @@
 
 	dcts = malloc(bits * sizeof (short));
 	if (dcts == NULL) {
-		warn("%s: malloc", __FUNCTION__);
+		warn("prepare_all: malloc");
 		return (-1);
 	}
 
@@ -374,7 +374,7 @@
 	if (pdcts != NULL) {
 		dcts = malloc(bits * sizeof (short));
 		if (dcts == NULL) {
-			warn("%s: malloc", __FUNCTION__);
+			warn("prepare_normal: malloc");
 			return (-1);
 		}
 	}
@@ -422,7 +422,7 @@
 		/* XXX - wasteful */
 		back[comp] = calloc(off, sizeof (char));
 		if (back[comp] == NULL) {
-			warn("%s: calloc", __FUNCTION__);
+			warn("prepare_jphide: calloc");
 			goto err;
 		}
 	}
@@ -430,7 +430,7 @@
 	if (pdcts != NULL) {
 		dcts = malloc(mbits * sizeof (short));
 		if (dcts == NULL) {
-			warn("%s: malloc", __FUNCTION__);
+			warn("prepare_jphide: malloc");
 			goto err;
 		}

Lines 1-14 Link Here

(-)security/stegdetect/files/patch-file-Makefile.in (-14 lines)
1	--- file/Makefile.in.orig Thu Oct 16 11:42:44 2003
2	+++ file/Makefile.in Thu Oct 16 11:42:50 2003
3	@@ -504,9 +504,8 @@
4	done >> $@
5
6	magic.inc: magic
7	- echo -n "\"" > $@
8	- sed -e 's/\\/\\\\/g' -e 's/"/\\\"/g' magic >> $@
9	- echo -n "\"" >> $@
10	+ sed -e 's/\\/\\\\/g' -e 's/"/\\\"/g' \
11	+ -e 's/^/"/' -e 's/$.*$/\1"/' magic > $@
12
13	file.1: Makefile file.man
14	@rm -f $@




--- stegdetect.c.orig	Sat Apr 15 00:14:05 2006
+++ stegdetect.c	Sat Apr 15 00:14:40 2006
@@ -1227,7 +1227,7 @@
 			strlcat(outbuf, quality(tmp, stars), sizeof(outbuf));
 			flag = 1;
 		}
-	no_f5:
+	no_f5:;
 	a_wasted_var = 0;
 	}
 
@@ -1267,7 +1267,7 @@
@@ -1237,7 +1237,7 @@
 			strlcat(outbuf, tmp, sizeof(outbuf));
 		}
 		
-	no_invisiblesecrets:
+	no_invisiblesecrets:;
 	a_wasted_var = 0;
 	}
 
@@ -1332,7 +1332,7 @@
@@ -1301,7 +1301,7 @@
 		}
 
 		free(dcts);
-	jsteg_error:
+	jsteg_error:;
 	a_wasted_var = 0;
 	}
 
 	if ((scans & FLAG_DOOUTGUESS) && prepare_normal(&dcts, &bits) != -1) {

Lines 1-5 Link Here

(-)security/stegdetect/pkg-plist (-2 / +2 lines)
1	bin/stegdetect	1	bin/stegdetect
2	bin/stegbreak	2	bin/stegbreak
		3	bin/stegcompare
		4	bin/stegdeimage
3	%%X11%%bin/xsteg	5	%%X11%%bin/xsteg
4	share/stegbreak/rules.ini
5	@dirrm share/stegbreak

Return to bug 95793

Lines 6-19 Link Here

(-)security/stegdetect/Makefile (-11 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= stegdetect	8	PORTNAME= stegdetect
9	PORTVERSION= 0.5	9	PORTVERSION= 0.6
10	PORTREVISION= 3
11	CATEGORIES= security	10	CATEGORIES= security
12	MASTER_SITES= http://www.mirrors.wiretapped.net/security/steganography/stegdetect/ \	11	MASTER_SITES= http://www.outguess.org/ \
13	http://www.outguess.org/	12	http://distfiles.master.finkmirrors.net/
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= rainer.alves@gmail.com
16	COMMENT= An automated tool for detecting steganographic content in jpegs	15	COMMENT= Automated tool for detecting steganographic content in JPEGs
17		16
18	.if !defined(WITHOUT_X11)	17	.if !defined(WITHOUT_X11)
19	BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent	18	BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
Lines 21-41 Link Here
21		20
22	# Note: stegdetect includes a modified version of jpeg-6b linked statically	21	# Note: stegdetect includes a modified version of jpeg-6b linked statically
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
24	WRKSRC= ${WRKDIR}/${PORTNAME}	23	USE_GMAKE= yes
25	USE_REINPLACE= yes	24	CONFIGURE_ARGS+=--program-prefix=''
26	MAN1= stegdetect.1 stegbreak.1	25	MAN1= stegdetect.1 stegbreak.1
27		26
28	.if defined(WITHOUT_X11)	27	.if defined(WITHOUT_X11)
29	PLIST_SUB+= X11="@comment "	28	PLIST_SUB+= X11="@comment "
30	.else	29	.else
31	USE_GNOME= gtk12	30	USE_GNOME= gtk12
32	CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}"	31	CONFIGURE_ENV+= PATH_GTKCONFIG="${GTK_CONFIG}"
33	PLIST_SUB+= X11=""	32	PLIST_SUB+= X11=""
34	.endif	33	.endif
35		34
36	post-patch:	35	post-patch:
37	${REINPLACE_CMD} 's/$$(JPEGLIB)/$$(JPEGLIB) -lcrypto/' \	36	${REINPLACE_CMD} 's;/usr/include/event;${LOCALBASE}/include;g' \
38	${WRKSRC}/Makefile.in	37	${WRKSRC}/configure
39	.if defined(WITHOUT_X11)	38	.if defined(WITHOUT_X11)
40	${REINPLACE_CMD} 's/gtk-config//g' ${WRKSRC}/configure	39	${REINPLACE_CMD} 's/gtk-config//g' ${WRKSRC}/configure
41	.endif	40	.endif

Line 0 Link Here

(-)security/stegdetect/files/patch-Makefile.in (+47 lines)
	1	--- Makefile.in.orig Tue Aug 31 11:59:42 2004
	2	+++ Makefile.in Sat Apr 15 03:04:17 2006
	3	@@ -70,7 +70,7 @@
	4
	5	JPEGDIR = ./jpeg-6b
	6	JPEGINC = -I$(JPEGDIR)
	7	-JPEGLIB = -L$(JPEGDIR) -ljpeg
	8	+JPEGLIB = -L$(JPEGDIR) -ljpeg -lcrypto
	9	JPEGDEP = $(JPEGDIR)/libjpeg.a
	10
	11	FILEDIR = ./file
	12	@@ -330,19 +330,23 @@
	13	@set fnord $(MAKEFLAGS); amf=$$2; \
	14	dot_seen=no; \
	15	target=`echo $@ \| sed s/-recursive//`; \
	16	- list='$(SUBDIRS)'; for subdir in $$list; do \
	17	- echo "Making $$target in $$subdir"; \
	18	- if test "$$subdir" = "."; then \
	19	- dot_seen=yes; \
	20	- local_target="$$target-am"; \
	21	- else \
	22	- local_target="$$target"; \
	23	+ if test "$$target" = "install"; then \
	24	+ ($(MAKE) $(AM_MAKEFLAGS) $$target-am) \|\| exit 1; \
	25	+ else \
	26	+ list='$(SUBDIRS)'; for subdir in $$list; do \
	27	+ echo "Making $$target in $$subdir"; \
	28	+ if test "$$subdir" = "."; then \
	29	+ dot_seen=yes; \
	30	+ local_target="$$target-am"; \
	31	+ else \
	32	+ local_target="$$target"; \
	33	+ fi; \
	34	+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
	35	+ \|\| case "$$amf" in =) exit 1;; k) fail=yes;; *) exit 1;; esac; \
	36	+ done; \
	37	+ if test "$$dot_seen" = "no"; then \
	38	+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" \|\| exit 1; \
	39	fi; \
	40	- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
	41	- \|\| case "$$amf" in =) exit 1;; k) fail=yes;; *) exit 1;; esac; \
	42	- done; \
	43	- if test "$$dot_seen" = "no"; then \
	44	- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" \|\| exit 1; \
	45	fi; test -z "$$fail"
	46
	47	mostlyclean-recursive clean-recursive distclean-recursive \

Lines 1-46 Link Here

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

Lines 1-29 Link Here

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