6 files changed, 0 insertions, 186 deletions
diff --git a/security/stegdetect/files/patch-Makefile.in b/security/stegdetect/files/patch-Makefile.in
deleted file mode 100644
index 6b9361d548d8..000000000000
--- a/security/stegdetect/files/patch-Makefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
---- Makefile.in.orig	2004-08-31 14:59:42 UTC
-+++ Makefile.in
-@@ -70,7 +70,7 @@ AUTOMAKE_OPTIONS = foreign no-dependenci
- 
- 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 @@ check-recursive installcheck-recursive i
- 	@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 \
diff --git a/security/stegdetect/files/patch-break_jsteg.c b/security/stegdetect/files/patch-break_jsteg.c
deleted file mode 100644
index 9dbe0fdab5e6..000000000000
--- a/security/stegdetect/files/patch-break_jsteg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- break_jsteg.c.orig	2004-08-29 23:11:00 UTC
-+++ break_jsteg.c
-@@ -162,7 +162,7 @@ break_jsteg_prepare(char *filename, shor
- 	jstegob->skip = bytes - sizeof(jstegob->coeff);
- 
- 	if (jsbits < max || off + jsbits > bits) {
--		warnx("%s: bad size in bits, %d", __FUNCTION__, bits);
-+		warnx("break_jsteg_prepare: bad size in bits, %d", bits);
- 		return (NULL);
- 	}
- 
diff --git a/security/stegdetect/files/patch-common.c b/security/stegdetect/files/patch-common.c
deleted file mode 100644
index 6c29c8067a57..000000000000
--- a/security/stegdetect/files/patch-common.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- common.c.orig	2004-08-29 23:11:00 UTC
-+++ common.c
-@@ -85,7 +85,7 @@ jpeg_getc(j_decompress_ptr cinfo)
- 
- 	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 @@ prepare_all_gradx(short **pdcts, int *pb
- 
- 	dcts = malloc(bits * sizeof (short));
- 	if (dcts == NULL) {
--		warn("%s: malloc", __FUNCTION__);
-+		warn("prepare_all: malloc");
- 		return (-1);
- 	}
- 
-@@ -374,7 +374,7 @@ prepare_normal(short **pdcts, int *pbits
- 	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 @@ prepare_jphide(short **pdcts, int *pbits
- 		/* 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 @@ prepare_jphide(short **pdcts, int *pbits
- 	if (pdcts != NULL) {
- 		dcts = malloc(mbits * sizeof (short));
- 		if (dcts == NULL) {
--			warn("%s: malloc", __FUNCTION__);
-+			warn("prepare_jphide: malloc");
- 			goto err;
- 		}
- 	}
diff --git a/security/stegdetect/files/patch-stegdeimage.c b/security/stegdetect/files/patch-stegdeimage.c
deleted file mode 100644
index d3ffb0094765..000000000000
--- a/security/stegdetect/files/patch-stegdeimage.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- stegdeimage.c.orig	2004-08-29 23:11:00 UTC
-+++ stegdeimage.c
-@@ -70,9 +70,6 @@ dodeimage(char *file1, char *file2)
- 	struct jpeg_error_mgr dsterr;
- 	FILE *fp;
- 
--	if (jpg_open("/home/stego_analysis/compress/dscf0033.jpg") == -1)
--		return;
--
- 	for (comp = 0; comp < 3; comp++) {
- 		ohib[comp] = hib[comp];
- 		owib[comp] = wib[comp];
diff --git a/security/stegdetect/files/patch-stegdetect.c b/security/stegdetect/files/patch-stegdetect.c
deleted file mode 100644
index 921c7d6357b3..000000000000
--- a/security/stegdetect/files/patch-stegdetect.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- stegdetect.c.orig	2004-09-03 04:01:35 UTC
-+++ stegdetect.c
-@@ -78,7 +78,6 @@ char *progname;
- float DCThist[257];
- float scale = 1;		/* Sensitivity scaling */
- 
--static int debug = 0;
- static int quiet = 0;
- static int ispositive = 0;	/* Current images contain stego */
- static char *transformname;	/* Current transform name */
-@@ -1227,7 +1226,7 @@ detect(char *filename, int scans)
- 			strlcat(outbuf, quality(tmp, stars), sizeof(outbuf));
- 			flag = 1;
- 		}
--	no_f5:
-+	no_f5:;
- 	a_wasted_var = 0;
- 	}
- 
-@@ -1267,7 +1266,7 @@ detect(char *filename, int scans)
- 			strlcat(outbuf, tmp, sizeof(outbuf));
- 		}
- 		
--	no_invisiblesecrets:
-+	no_invisiblesecrets:;
- 	a_wasted_var = 0;
- 	}
- 
-@@ -1332,7 +1331,7 @@ detect(char *filename, int scans)
- 		}
- 
- 		free(dcts);
--	jsteg_error:
-+	jsteg_error:;
- 	a_wasted_var = 0;
- 	}
- 
diff --git a/security/stegdetect/files/patch-xsteg.c b/security/stegdetect/files/patch-xsteg.c
deleted file mode 100644
index 6ac76e028cd2..000000000000
--- a/security/stegdetect/files/patch-xsteg.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- xsteg.c.orig	2004-08-31 14:58:21 UTC
-+++ xsteg.c
-@@ -56,9 +56,6 @@
- #define FLAG_DOINVIS	0x0008
- #define FLAG_DOF5	0x0010
- 
--extern int (*event_sigcb)(void);
--extern int event_gotsig;
--
- struct event start_ev;
- struct event gtk_ev;
- int quit = 0;
-@@ -744,8 +741,7 @@ chld_handler(int sig)
- 	sigprocmask(SIG_BLOCK, &set, &oldset);
- 
- 	while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
--		if (WIFEXITED(status) || WIFSIGNALED(status))
--			event_gotsig = 1;
-+		;
- 	}
- 
- 	signal(SIGCHLD, chld_handler);
-@@ -1106,8 +1102,7 @@ main(int argc, char *argv[] )
- 	gtk_widget_show(window);
- 
- 	event_init();
--	event_sigcb = signal_cb;
--
-+	
- 	add_gtk_timeout();
- 
- 	event_dispatch();