API tools faq
paste
Advertisement
Guest User

Patch for steghide 0.5.1

a guest
Sep 6th, 2010
361
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.26 KB | None | 0 0
raw download clone embed print report
  1. Patch needed to compile steghide 0.5.1 with GCC 4.3.5 on Linux.
  2. (Includes http://www.freebsd.org/cgi/cvsweb.cgi/ports/security/steghide/files/ )
  3.  
  4. Index: Makefile.in
  5. ===================================================================
  6. --- Makefile.in 2003-10-15 13:31:28.000000000 +0530
  7. +++ Makefile.in 2010-09-06 19:55:08.000000000 +0530
  8. @@ -161,7 +161,7 @@ AUTOMAKE_OPTIONS = dist-bzip2 dist-zip
  9.  SUBDIRS = m4 intl po doc src tests
  10.  docdir = $(prefix)/share/doc/$(PACKAGE)
  11.  EXTRA_DIST = config.rpath mkinstalldirs  ABOUT-NLS BUGS CREDITS HISTORY LEAME depcomp
  12. -doc_DATA = ABOUT-NLS BUGS COPYING CREDITS HISTORY INSTALL LEAME README TODO
  13. +doc_DATA = BUGS CREDITS HISTORY LEAME README TODO
  14.  MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
  15.  config.sub configure depcomp install-sh missing mkinstalldirs steghide.doxygen steghide.spec
  16.  
  17. Index: src/AuData.h
  18. ===================================================================
  19. --- src/AuData.h    2003-09-28 21:00:29.000000000 +0530
  20. +++ src/AuData.h    2010-09-06 19:55:08.000000000 +0530
  21. @@ -26,22 +26,30 @@
  22.  
  23.  // AuMuLawAudioData
  24.  typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ;
  25. +template<>
  26.  inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
  27. +template<>
  28.  inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
  29.  
  30.  // AuPCM8AudioData
  31.  typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ;
  32. +template<>
  33.  inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
  34. +template<>
  35.  inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
  36.  
  37.  // AuPCM16AudioData
  38.  typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ;
  39. +template<>
  40.  inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
  41. +template<>
  42.  inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
  43.  
  44.  // AuPCM32AudioData
  45.  typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ;
  46. +template<>
  47.  inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
  48. +template<>
  49.  inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
  50.  
  51.  #endif // ndef SH_AUDATA_H
  52. Index: src/MHashPP.h
  53. ===================================================================
  54. --- src/MHashPP.h   2003-09-28 21:00:30.000000000 +0530
  55. +++ src/MHashPP.h   2010-09-06 19:55:08.000000000 +0530
  56. @@ -21,6 +21,7 @@
  57.  #ifndef SH_MHASHPP_H
  58.  #define SH_MHASHPP_H
  59.  
  60. +#define _Bool bool
  61.  #include <mhash.h>
  62.  
  63.  #include "common.h"
  64. Index: src/Makefile.in
  65. ===================================================================
  66. --- src/Makefile.in 2003-10-15 13:31:29.000000000 +0530
  67. +++ src/Makefile.in 2010-09-06 19:55:08.000000000 +0530
  68. @@ -190,7 +190,7 @@ WavChunkHeader.cc WavChunkUnused.cc WavF
  69.  WavPCMSampleValue.cc error.cc main.cc msg.cc SMDConstructionHeuristic.cc
  70.  
  71.  localedir = $(datadir)/locale
  72. -LIBTOOL = $(SHELL) libtool
  73. +LIBTOOL = $(SHELL) /usr/bin/libtool
  74.  MAINTAINERCLEANFILES = Makefile.in
  75.  subdir = src
  76.  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  77. @@ -278,7 +278,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile
  78.     $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
  79.     $(AM_CXXFLAGS) $(CXXFLAGS)
  80.  CXXLD = $(CXX)
  81. -CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
  82. +CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
  83.     $(AM_LDFLAGS) $(LDFLAGS) -o $@
  84.  DIST_SOURCES = $(steghide_SOURCES)
  85.  HEADERS = $(noinst_HEADERS)
  86. Index: src/AuSampleValues.cc
  87. ===================================================================
  88. --- src/AuSampleValues.cc   2003-09-28 21:00:30.000000000 +0530
  89. +++ src/AuSampleValues.cc   2010-09-06 19:55:08.000000000 +0530
  90. @@ -21,17 +21,17 @@
  91.  #include "AuSampleValues.h"
  92.  
  93.  // AuMuLawSampleValue
  94. -const BYTE AuMuLawSampleValue::MinValue = 0 ;
  95. -const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
  96. +template<> const BYTE AuMuLawSampleValue::MinValue = 0 ;
  97. +template<> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
  98.  
  99.  // AuPCM8SampleValue
  100. -const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
  101. -const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
  102. +template <> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
  103. +template <> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
  104.  
  105.  // AuPCM16SampleValue
  106. -const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
  107. -const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
  108. +template <> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
  109. +template <> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
  110.  
  111.  // AuPCM32SampleValue
  112. -const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
  113. -const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
  114. +template <> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
  115. +template <> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
  116. Index: src/MHashPP.cc
  117. ===================================================================
  118. --- src/MHashPP.cc  2003-10-05 15:47:50.000000000 +0530
  119. +++ src/MHashPP.cc  2010-09-06 19:55:08.000000000 +0530
  120. @@ -21,6 +21,7 @@
  121.  #include <cstdlib>
  122.  #include <string>
  123.  
  124. +#define _Bool bool
  125.  #include <mhash.h>
  126.  
  127.  #include "BitString.h"
  128. @@ -120,7 +121,7 @@ std::string MHashPP::getAlgorithmName ()
  129.  
  130.  std::string MHashPP::getAlgorithmName (hashid id)
  131.  {
  132. -   char *name = mhash_get_hash_name (id) ;
  133. +   char *name = (char *) mhash_get_hash_name (id) ;
  134.     std::string retval ;
  135.     if (name == NULL) {
  136.         retval = std::string ("<algorithm not found>") ;
  137. Index: src/MHashKeyGen.h
  138. ===================================================================
  139. --- src/MHashKeyGen.h   2003-09-28 21:00:30.000000000 +0530
  140. +++ src/MHashKeyGen.h   2010-09-06 19:55:08.000000000 +0530
  141. @@ -23,6 +23,7 @@
  142.  
  143.  #include <vector>
  144.  
  145. +#define _Bool bool
  146.  #include <mhash.h>
  147.  
  148.  class MHashKeyGen {
  149. Index: src/Graph.cc
  150. ===================================================================
  151. --- src/Graph.cc    2003-10-12 03:24:26.000000000 +0530
  152. +++ src/Graph.cc    2010-09-06 19:55:08.000000000 +0530
  153. @@ -23,6 +23,8 @@
  154.  #include <map>
  155.  #include <vector>
  156.  
  157. +#include <limits.h>
  158. +
  159.  #include "BitString.h"
  160.  #include "CvrStgFile.h"
  161.  #include "Edge.h"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!