steghide #12263 (not only)

6 files changed, 19 insertions, 33 deletions

diff --git a/crypto/steghide/BUILD b/crypto/steghide/BUILD
deleted file mode 100755
index ac94d4ccbf..0000000000
--- a/crypto/steghide/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-patch -p1 < $SCRIPT_DIRECTORY/steghide-0.5.1-gcc34.patch  &&
-sedit  's:$(LIBTOOL) --mode=link::'  src/Makefile.in      &&
-default_build 
diff --git a/crypto/steghide/DEPENDS b/crypto/steghide/DEPENDS
index 15a5db2ece..846906d17a 100755
--- a/crypto/steghide/DEPENDS
+++ b/crypto/steghide/DEPENDS
@@ -1,3 +1,4 @@
+depends  g++        &&
 depends  libtool    &&
 depends  libmcrypt  &&
 depends  mhash      &&
diff --git a/crypto/steghide/DETAILS b/crypto/steghide/DETAILS
index 7a97947b1f..ada89daae5 100755
--- a/crypto/steghide/DETAILS
+++ b/crypto/steghide/DETAILS
@@ -1,12 +1,18 @@
            SPELL=steghide
          VERSION=0.5.1
+      PATCHLEVEL=1
+
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
      SOURCE_HASH=sha512:66271e820d7de6de5fe485ae92d1cc1360ad336138d4a5220cfda205cfa465e1ace74e1c832d9a43a71bbbca12426d20baf6433145470f9f32880ca5bf0fea5b
+
+         SOURCE2=steghide_0.5.1-9.diff.gz
+  SOURCE2_URL[0]=http://ftp.de.debian.org/debian/pool/main/s/steghide/$SOURCE2
+    SOURCE2_HASH=sha512:7d1da57aaa8ec49c9db330f949c30baa8e2bc828c5c11c302f235275ece3e176a381aeb0816dc7b77b8f9355dc8f63c7fd0f4a9d79291f62ee4dddf08a79a935
+
         WEB_SITE=http://steghide.sourceforge.net
          ENTERED=20020209
-         UPDATED=20020320
       LICENSE[0]=GPL
         KEYWORDS="crypto"
            SHORT="A steganography program"
diff --git a/crypto/steghide/HISTORY b/crypto/steghide/HISTORY
index af5bf1c3f2..99431e938c 100644
--- a/crypto/steghide/HISTORY
+++ b/crypto/steghide/HISTORY
@@ -1,3 +1,9 @@
+2008-08-21 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS, PRE_BUILD: added patch steghide_0.5.1-9.diff.gz from debian
+	* BUILD, steghide-0.5.1-gcc34.patch: removed
+	* DEPENDS: added g++
+	* *: #12263
+
 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.
 
diff --git a/crypto/steghide/PRE_BUILD b/crypto/steghide/PRE_BUILD
new file mode 100755
index 0000000000..e4256b2d36
--- /dev/null
+++ b/crypto/steghide/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+
+unpack_file 2         &&
+zcat $SOURCE_CACHE/$SOURCE2 | patch -p1
diff --git a/crypto/steghide/steghide-0.5.1-gcc34.patch b/crypto/steghide/steghide-0.5.1-gcc34.patch
deleted file mode 100644
index 01b49a50c7..0000000000
--- a/crypto/steghide/steghide-0.5.1-gcc34.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN ../tmp-orig/steghide-0.5.1/src/AuSampleValues.cc ./src/AuSampleValues.cc
---- ../tmp-orig/steghide-0.5.1/src/AuSampleValues.cc	2003-09-28 17:30:30.000000000 +0200
-+++ ./src/AuSampleValues.cc	2004-09-30 10:20:54.982240968 +0200
-@@ -21,17 +21,17 @@
- #include "AuSampleValues.h"
- 
- // AuMuLawSampleValue
--const BYTE AuMuLawSampleValue::MinValue = 0 ;
--const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
-+template <> const BYTE AuMuLawSampleValue::MinValue = 0 ;
-+template <> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
- 
- // AuPCM8SampleValue
--const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
--const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
-+template <> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
-+template <> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
- 
- // AuPCM16SampleValue
--const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
--const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
-+template <> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
-+template <> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
- 
- // AuPCM32SampleValue
--const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
--const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
-+template <> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
-+template <> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;