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

Take maintainership.

Anglicise some of the text in DESCR.

8 files changed, 134 insertions, 0 deletions

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"