Date: Mon, 23 Sep 2002 18:47:28 +0200 (CEST) From: Tilman Linneweh <tilman@arved.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tilman@arved.de Subject: ports/43295: [Maintainer-update] Fix Build security/steghide Message-ID: <200209231647.g8NGlS9a069749@sauna.arved.de>
next in thread | raw e-mail | index | archive | help
>Number: 43295
>Category: ports
>Synopsis: [Maintainer-update] Fix Build security/steghide
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 23 09:50:07 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Tilman Linneweh
>Release: FreeBSD 4.6-STABLE i386
>Organization:
BSD Usergroup Austria
>Environment:
System: FreeBSD sauna.arved.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jul 7 20:02:41 CEST 2002 tilman@sauna.arved.de:/usr/obj/usr/src/sys/SAUNA i386
>Description:
My attempt to Fix build on CURRENT broke it on STABLE :-(
>How-To-Repeat:
>Fix:
--- steghide.diff.20020923 begins here ---
Index: files/patch-src-jpegfile.cc
===================================================================
RCS file: /home/ncvs/ports/security/steghide/files/patch-src-jpegfile.cc,v
retrieving revision 1.1
diff -u -r1.1 patch-src-jpegfile.cc
--- files/patch-src-jpegfile.cc 1 Sep 2002 17:35:49 -0000 1.1
+++ files/patch-src-jpegfile.cc 23 Sep 2002 16:38:41 -0000
@@ -1,10 +1,11 @@
---- src/jpegfile.cc.orig Thu Sep 26 20:50:05 2002
-+++ src/jpegfile.cc Thu Sep 26 20:50:33 2002
-@@ -19,6 +19,7 @@
+--- src/jpegfile.cc.orig Tue May 14 07:48:06 2002
++++ src/jpegfile.cc Mon Sep 23 18:37:37 2002
+@@ -19,6 +19,8 @@
*/
#include <iostream>
+#include <vector>
++#include <string>
#include "cvrstgfile.h"
#include "jpegbase.h"
Index: files/patch-src-jpeghufftable.cc
===================================================================
RCS file: /home/ncvs/ports/security/steghide/files/patch-src-jpeghufftable.cc,v
retrieving revision 1.1
diff -u -r1.1 patch-src-jpeghufftable.cc
--- files/patch-src-jpeghufftable.cc 1 Sep 2002 17:35:49 -0000 1.1
+++ files/patch-src-jpeghufftable.cc 23 Sep 2002 16:39:52 -0000
@@ -1,10 +1,11 @@
---- src/jpeghufftable.cc.orig Thu Sep 26 21:02:04 2002
-+++ src/jpeghufftable.cc Thu Sep 26 21:22:37 2002
-@@ -22,13 +22,14 @@
+--- src/jpeghufftable.cc.orig Tue May 14 07:48:06 2002
++++ src/jpeghufftable.cc Mon Sep 23 18:39:13 2002
+@@ -22,13 +22,15 @@
#include <limits.h>
#include <iostream>
+#include <vector>
++#include <string>
#include "error.h"
#include "binaryio.h"
@@ -16,7 +17,7 @@
: JpegSegment (JpegElement::MarkerDHT)
{
tableclass = 0xFF ;
-@@ -36,7 +37,7 @@
+@@ -36,7 +38,7 @@
lengthremaining = lr ;
}
@@ -25,7 +26,7 @@
: JpegSegment (JpegElement::MarkerDHT)
{
tableclass = 0xFF ;
-@@ -81,7 +82,7 @@
+@@ -81,7 +83,7 @@
return tabledestid ;
}
@@ -34,7 +35,7 @@
{
assert (b.size() == 16) ;
-@@ -236,7 +237,7 @@
+@@ -236,7 +238,7 @@
for (unsigned int l = 1 ; l <= Len_bits ; l++) {
io->write8 ((unsigned char) getBits(l)) ;
}
--- steghide.diff.20020923 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209231647.g8NGlS9a069749>