ports/143639: [PATCH] security/stegdetect Unbreak, take maintainership

[Rob Farmer]

>Number:         143639
>Category:       ports
>Synopsis:       [PATCH] security/stegdetect Unbreak, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 07 12:00:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD coretwo.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r203511: Fri Feb  5 00:56:20 PST 2010     root@:/usr/obj/usr/src/sys/CORETWO  amd64
>Description:
* Unbreak
* Add a MASTER_SITE
* Add OPTIONS for the GUI
* Take maintainership
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/stegdetect/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile	16 Dec 2009 01:00:48 -0000	1.30
+++ Makefile	7 Feb 2010 10:50:28 -0000
@@ -10,17 +10,20 @@
 PORTREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	http://www.outguess.org/ \
-		http://distfiles.master.finkmirrors.net/
+		http://distfiles.master.finkmirrors.net/ \
+		http://www.predatorlabs.net/dl/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	rfarmer at predatorlabs.net
 COMMENT=	Automated tool for detecting steganographic content in JPEGs
 
+OPTIONS=	X11 "Build xsteg" On
+
+.include <bsd.port.options.mk>
+
 .if !defined(WITHOUT_X11)
 LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 .endif
 
-BROKEN=		does not build
-
 # Note: stegdetect includes a modified version of jpeg-6b linked statically
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
Index: files/patch-xsteg.c
===================================================================
RCS file: files/patch-xsteg.c
diff -N files/patch-xsteg.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-xsteg.c	7 Feb 2010 10:38:51 -0000
@@ -0,0 +1,32 @@
+--- xsteg.c.orig	2010-02-07 02:37:05.398520068 -0800
++++ xsteg.c	2010-02-07 02:38:33.877232865 -0800
+@@ -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 @@
+ 	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 @@
+ 	gtk_widget_show(window);
+ 
+ 	event_init();
+-	event_sigcb = signal_cb;
+-
++	
+ 	add_gtk_timeout();
+ 
+ 	event_dispatch();


>Release-Note:
>Audit-Trail:
>Unformatted: