From 85760a8bec6cfe5fe3186aea64e66977a13070b2 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 31 Oct 2023 05:55:54 +0000 Subject: [PATCH] steghide, bump version (#9711) --- .../steghide/patches/steghide-0.5.1.patchset | 97 ------------------- .../patches/steghide-gcc11-0.5.1.patchset | 36 ------- app-crypt/steghide/steghide-0.5.1.1.recipe | 80 +++++++++++++++ app-crypt/steghide/steghide-0.5.1.recipe | 74 -------------- 4 files changed, 80 insertions(+), 207 deletions(-) delete mode 100644 app-crypt/steghide/patches/steghide-0.5.1.patchset delete mode 100644 app-crypt/steghide/patches/steghide-gcc11-0.5.1.patchset create mode 100644 app-crypt/steghide/steghide-0.5.1.1.recipe delete mode 100644 app-crypt/steghide/steghide-0.5.1.recipe diff --git a/app-crypt/steghide/patches/steghide-0.5.1.patchset b/app-crypt/steghide/patches/steghide-0.5.1.patchset deleted file mode 100644 index 413de95f4..000000000 --- a/app-crypt/steghide/patches/steghide-0.5.1.patchset +++ /dev/null @@ -1,97 +0,0 @@ -From 87cb97a99e1432c6e63f436a3c6eedbcff8ce2ba Mon Sep 17 00:00:00 2001 -From: nys <33534144+nysnatuss@users.noreply.github.com> -Date: Fri, 29 Dec 2017 21:48:53 +0000 -Subject: fix steghide code - - -diff --git a/src/AuData.h b/src/AuData.h -index b4ccc9a..ebb4663 100644 ---- a/src/AuData.h -+++ b/src/AuData.h -@@ -26,22 +26,30 @@ - - // AuMuLawAudioData - typedef AudioDataImpl AuMuLawAudioData ; -+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 AuPCM8AudioData ; -+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 AuPCM16AudioData ; -+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 AuPCM32AudioData ; -+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/src/AuSampleValues.cc b/src/AuSampleValues.cc -index 64709f3..de884e8 100644 ---- a/src/AuSampleValues.cc -+++ b/src/AuSampleValues.cc -@@ -21,17 +21,25 @@ - #include "AuSampleValues.h" - - // AuMuLawSampleValue -+template <> - const BYTE AuMuLawSampleValue::MinValue = 0 ; -+template <> - const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ; - - // AuPCM8SampleValue -+template <> - const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ; -+template <> - const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ; - - // AuPCM16SampleValue -+template <> - const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ; -+template <> - const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ; - - // AuPCM32SampleValue -+template <> - const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ; -+template <> - const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ; -diff --git a/src/MHashPP.cc b/src/MHashPP.cc -old mode 100755 -new mode 100644 -index 27b3d73..1c4023b ---- a/src/MHashPP.cc -+++ b/src/MHashPP.cc -@@ -120,13 +120,13 @@ std::string MHashPP::getAlgorithmName () - - std::string MHashPP::getAlgorithmName (hashid id) - { -- char *name = mhash_get_hash_name (id) ; -+ unsigned char *name = mhash_get_hash_name (id) ; - std::string retval ; - if (name == NULL) { - retval = std::string ("") ; - } - else { -- retval = std::string (name) ; -+ retval = std::string (reinterpret_cast(name)) ; - } - free (name) ; - return retval ; --- -2.37.3 - - diff --git a/app-crypt/steghide/patches/steghide-gcc11-0.5.1.patchset b/app-crypt/steghide/patches/steghide-gcc11-0.5.1.patchset deleted file mode 100644 index 8755b5082..000000000 --- a/app-crypt/steghide/patches/steghide-gcc11-0.5.1.patchset +++ /dev/null @@ -1,36 +0,0 @@ -From bc7fef66be7fdc063cb62925609912e994780e0d Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 24 Mar 2023 13:43:26 +0100 -Subject: gcc11 fix - - -diff --git a/src/Arguments.h b/src/Arguments.h -index 018326c..1f907a7 100644 ---- a/src/Arguments.h -+++ b/src/Arguments.h -@@ -100,7 +100,7 @@ class Arguments { - static const VERBOSITY Default_Verbosity = NORMAL ; - static const unsigned long Default_Radius = 0 ; // there is no default radius for all file formats - static const unsigned int Max_Algorithm = 3 ; -- static const float Default_Goal = 100.0 ; -+ static constexpr float Default_Goal = 100.0 ; - static const DEBUGCOMMAND Default_DebugCommand = NONE ; - static const bool Default_Check = false ; - static const unsigned int Default_DebugLevel = 0 ; -diff --git a/src/ProgressOutput.h b/src/ProgressOutput.h -index 3a235a3..394939f 100644 ---- a/src/ProgressOutput.h -+++ b/src/ProgressOutput.h -@@ -64,7 +64,7 @@ class ProgressOutput { - **/ - void done (float rate, float avgweight = NoAvgWeight) const ; - -- static const float NoAvgWeight = -1.0 ; -+ static constexpr float NoAvgWeight = -1.0 ; - - protected: - std::string vcompose (const char *msgfmt, va_list ap) const ; --- -2.37.3 - - diff --git a/app-crypt/steghide/steghide-0.5.1.1.recipe b/app-crypt/steghide/steghide-0.5.1.1.recipe new file mode 100644 index 000000000..dce8221dd --- /dev/null +++ b/app-crypt/steghide/steghide-0.5.1.1.recipe @@ -0,0 +1,80 @@ +SUMMARY="A Steganography Program" +DESCRIPTION="Steghide is a steganography program that is able to hide data in \ +various kinds of image and audio files. The color respectivly \ +sample-frequencies are not changed thus making the embedding resistant against \ +first-order statistical tests." +HOMEPAGE="http://steghide.sourceforge.net/" +COPYRIGHT="2001-2003 Stefan Hetzl" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://github.com/museoa/steghide/archive/refs/tags/$portVersion.tar.gz" +CHECKSUM_SHA256="7121f0d963494a5463a30d3bf561f460b14da5314a3c424f69808df3e0f561b3" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +commandBinDir=$binDir +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +PROVIDES=" + steghide$secondaryArchSuffix = $portVersion + cmd:steghide$commandSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libmcrypt$secondaryArchSuffix + lib:libmhash$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku_devel + devel:libintl$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libmcrypt$secondaryArchSuffix + devel:libmhash$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoreconf + cmd:gcc$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + " + +PATCH() +{ + cd src + sed -i -e "/^docdir =/ d;" Makefile.am +} + +BUILD() +{ + cd src + touch ./NEWS + touch ./AUTHORS + touch ./ChangeLog + autoreconf -vfi + runConfigure --omit-dirs binDir ./configure \ + --bindir=$commandBinDir + make $jobArgs +} + +INSTALL() +{ + cd src + make install +} + +TEST() +{ + cd src + make check +} diff --git a/app-crypt/steghide/steghide-0.5.1.recipe b/app-crypt/steghide/steghide-0.5.1.recipe deleted file mode 100644 index a4e6f890d..000000000 --- a/app-crypt/steghide/steghide-0.5.1.recipe +++ /dev/null @@ -1,74 +0,0 @@ -SUMMARY="A Steganography Program" -DESCRIPTION="Steghide is a steganography program that is able to hide data in \ -various kinds of image and audio files. The color respectivly \ -sample-frequencies are not changed thus making the embedding resistant against \ -first-order statistical tests." -HOMEPAGE="http://steghide.sourceforge.net/" -COPYRIGHT="2001-2003 Stefan Hetzl" -LICENSE="GNU GPL v2" -REVISION="5" -SOURCE_URI="https://downloads.sourceforge.net/steghide/steghide-$portVersion.tar.bz2" -CHECKSUM_SHA256="a2c7f879a3e22860879889106cc49e486000653f81448264affa0fd616a47da1" -PATCHES="steghide-$portVersion.patchset" -if [ "$targetArchitecture" != x86_gcc2 ]; then - PATCHES+=" - steghide-gcc11-$portVersion.patchset - " -fi - -ARCHITECTURES="all" - -PROVIDES=" - steghide = $portVersion - cmd:steghide = $portVersion - " -REQUIRES=" - haiku - lib:libintl - lib:libjpeg - lib:libmcrypt - lib:libmhash - lib:libz - " - -BUILD_REQUIRES=" - haiku_devel - devel:libintl - devel:libjpeg - devel:libmcrypt - devel:libmhash - devel:libz - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoreconf - cmd:gcc - cmd:gettext - cmd:libtoolize - cmd:make - " - -PATCH() -{ - sed -i -e "/^docdir =/ d;" Makefile.am -} - -BUILD() -{ - touch ./NEWS - touch ./AUTHORS - touch ./ChangeLog - autoreconf -vfi - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install -} - -TEST() -{ - make check -}