Make this package compile and run with recent C++ from gcc4.

Take maintainership.

Anglicise some of the text in DESCR.

11 files changed, 152 insertions, 9 deletions

diff --git a/security/steghide/DESCR b/security/steghide/DESCR
index a400f79c17c..852c9071d60 100644
--- a/security/steghide/DESCR
+++ b/security/steghide/DESCR
@@ -1,9 +1,10 @@
-Steghide is a steganography program that is able to hide
-data in various kinds of image- and audio-files. The color-
-respectively sample-frequencies are not changed thus making the
-embedding resistant against first-order statistical tests.
+Steghide is a steganography program that is able to hide data in
+various kinds of image and audio files.  The original color and sample
+frequencies are not changed thus making the embedding resistant
+against first-order statistical tests.
+
 Features:
   * compression of embedded data
   * encryption of embedded data
-  * embedding of a checksum to verify the integrity of the extracted data
+  * embedding a checksum to verify the integrity of the extracted data
   * support for JPEG, BMP, WAV and AU files
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index a53dfd3a8d7..08f0b3361ed 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2006/08/13 23:32:22 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/10/02 19:03:11 agc Exp $
 
 DISTNAME=		steghide-0.5.1
 PKGREVISION=		3
 CATEGORIES=		security
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=steghide/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		agc@NetBSD.org
 HOMEPAGE=		http://steghide.sourceforge.net/
-COMMENT=		Steganography program
+COMMENT=		Hides data (steganography) in audio or graphics files
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
diff --git a/security/steghide/distinfo b/security/steghide/distinfo
index 0ea17802a27..99a93dd2d10 100644
--- a/security/steghide/distinfo
+++ b/security/steghide/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2006/05/11 16:23:57 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/10/02 19:03:11 agc Exp $
 
 SHA1 (steghide-0.5.1.tar.gz) = a6d204744fabfe5751ab5e2d889ac373c0b0a30c
 RMD160 (steghide-0.5.1.tar.gz) = e17507444b8bb91e6e29d46ec02fa39f7f2f44e8
@@ -6,3 +6,11 @@ Size (steghide-0.5.1.tar.gz) = 476125 bytes
 SHA1 (patch-aa) = 7bf2c4237f697a6d50b730aefdc9e922d6794c49
 SHA1 (patch-ab) = 6e914fdad61d3830a899a32a535e3f329cb0514b
 SHA1 (patch-ac) = 58a578aa593d49cfc19e8c5fcdc0520c658ec9f9
+SHA1 (patch-ad) = 5b803f38a1524b54881b2179e71f12a8ce5e5a68
+SHA1 (patch-ae) = 8b6c11700230ec5406e5adb2fb7ade03863b587f
+SHA1 (patch-af) = e6afa604dc0f5e769970bac0df9021302b013918
+SHA1 (patch-ag) = 3daf2e616ae364385529a881604bc88dfb86bea7
+SHA1 (patch-ah) = c19a9ae3976147704c7e0b45f437c12ecd850c77
+SHA1 (patch-ai) = 9ae6443ee9a997a859456a712327cc7d17ede0f4
+SHA1 (patch-aj) = 36039401484d85cec20bc157b29f55e219a762b3
+SHA1 (patch-ak) = 404abb1935208b9eba9711677e1514154486543b
diff --git a/security/steghide/patches/patch-ad b/security/steghide/patches/patch-ad
new file mode 100644
index 00000000000..6370e4efb4a
--- /dev/null
+++ b/security/steghide/patches/patch-ad
@@ -0,0 +1,35 @@
+$NetBSD: patch-ad,v 1.1 2007/10/02 19:03:11 agc Exp $
+
+--- src/AuData.h	2007/10/01 22:01:34	1.1
++++ src/AuData.h	2007/10/01 22:01:45
+@@ -26,22 +26,22 @@
+ 
+ // AuMuLawAudioData
+ typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ;
+-inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
+-inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
++template <> inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
++template <> inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
+ 
+ // AuPCM8AudioData
+ typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ;
+-inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
+-inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
++template <> inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
++template <> inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
+ 
+ // AuPCM16AudioData
+ typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ;
+-inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
+-inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
++template <> inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
++template <> inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
+ 
+ // AuPCM32AudioData
+ typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ;
+-inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
+-inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
++template <> inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
++template <> inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
+ 
+ #endif // ndef SH_AUDATA_H
diff --git a/security/steghide/patches/patch-ae b/security/steghide/patches/patch-ae
new file mode 100644
index 00000000000..3b8272747e5
--- /dev/null
+++ b/security/steghide/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2007/10/02 19:03:12 agc Exp $
+
+--- src/AudioData.h	2007/10/01 22:02:55	1.1
++++ src/AudioData.h	2007/10/01 21:59:44
+@@ -41,6 +41,7 @@
+ 
+ 	virtual void read (BinaryIO* io, UWORD32 n = NoLimit) = 0 ;
+ 	virtual void write (BinaryIO* io, UWORD32 n = NoLimit) = 0 ;
++	virtual ~AudioData() {}
+ } ;
+ 
+ /**
diff --git a/security/steghide/patches/patch-af b/security/steghide/patches/patch-af
new file mode 100644
index 00000000000..dcec62df096
--- /dev/null
+++ b/security/steghide/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2007/10/02 19:03:12 agc Exp $
+
+--- src/CvrStgObject.h	2007/10/01 22:04:18	1.1
++++ src/CvrStgObject.h	2007/10/01 21:59:44
+@@ -62,6 +62,8 @@
+ 	 * The derived class should check the condition(s) given above in its Implementation of this function.
+ 	 **/
+ 	virtual void replaceSample (const SamplePos pos, const SampleValue* s) = 0 ;
++
++	virtual ~CvrStgObject() {}
+ } ;
+ 
+ #endif //ndef SH_CVRSTGOBJECT_H
diff --git a/security/steghide/patches/patch-ag b/security/steghide/patches/patch-ag
new file mode 100644
index 00000000000..9d5cc2f4259
--- /dev/null
+++ b/security/steghide/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2007/10/02 19:03:12 agc Exp $
+
+--- src/EmbData.h	2003-09-29 12:51:49.000000000 +0100
++++ src/EmbData.h	2007-10-02 08:34:47.000000000 +0100
+@@ -21,6 +21,8 @@
+ #ifndef SH_EMBDATA_H
+ #define SH_EMBDATA_H
+ 
++#define _Bool	bool
++
+ #include <string>
+ #include <vector>
+ 
diff --git a/security/steghide/patches/patch-ah b/security/steghide/patches/patch-ah
new file mode 100644
index 00000000000..b3c8ff75e1f
--- /dev/null
+++ b/security/steghide/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2007/10/02 19:03:12 agc Exp $
+
+--- src/MCryptPP.h	2003-09-28 16:30:30.000000000 +0100
++++ src/MCryptPP.h	2007-10-02 08:35:33.000000000 +0100
+@@ -27,6 +27,8 @@
+ 
+ #include <string>
+ 
++#define _Bool	bool
++
+ #include <mcrypt.h>
+ 
+ class BitString ;
diff --git a/security/steghide/patches/patch-ai b/security/steghide/patches/patch-ai
new file mode 100644
index 00000000000..18699515a5d
--- /dev/null
+++ b/security/steghide/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2007/10/02 19:03:13 agc Exp $
+
+--- src/MHashKeyGen.h	2003-09-28 16:30:30.000000000 +0100
++++ src/MHashKeyGen.h	2007-10-02 08:36:35.000000000 +0100
+@@ -23,6 +23,8 @@
+ 
+ #include <vector>
+ 
++#define _Bool	bool
++
+ #include <mhash.h>
+ 
+ class MHashKeyGen {
diff --git a/security/steghide/patches/patch-aj b/security/steghide/patches/patch-aj
new file mode 100644
index 00000000000..8e2a4ae7258
--- /dev/null
+++ b/security/steghide/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2007/10/02 19:03:13 agc Exp $
+
+--- src/MHashPP.cc	2003-10-05 11:17:50.000000000 +0100
++++ src/MHashPP.cc	2007-10-02 08:39:47.000000000 +0100
+@@ -21,6 +21,8 @@
+ #include <cstdlib>
+ #include <string>
+ 
++#define _Bool   bool
++
+ #include <mhash.h>
+ 
+ #include "BitString.h"
+@@ -120,7 +122,7 @@
+ 
+ std::string MHashPP::getAlgorithmName (hashid id)
+ {
+-	char *name = mhash_get_hash_name (id) ;
++	char *name = (char *)mhash_get_hash_name (id) ;
+ 	std::string retval ;
+ 	if (name == NULL) {
+ 		retval = std::string ("<algorithm not found>") ;
diff --git a/security/steghide/patches/patch-ak b/security/steghide/patches/patch-ak
new file mode 100644
index 00000000000..21326f58e35
--- /dev/null
+++ b/security/steghide/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2007/10/02 19:03:13 agc Exp $
+
+--- src/MHashPP.h	2003-09-28 16:30:30.000000000 +0100
++++ src/MHashPP.h	2007-10-02 08:37:12.000000000 +0100
+@@ -21,6 +21,8 @@
+ #ifndef SH_MHASHPP_H
+ #define SH_MHASHPP_H
+ 
++#define _Bool   bool
++
+ #include <mhash.h>
+ 
+ #include "common.h"