[SCM] transportation simulator branch, master, updated. debian/102.2.2.ds1-1-21-g99a3ce9

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 37f955fbde5157d6448284c643fbf87c0dc3f1d0
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Wed Feb 16 23:03:41 2011 +0100

    Add replacement for non-free SHA-1 implementation.

diff --git a/debian/control b/debian/control
index 5560ded..9d87b84 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Ansgar Burchardt <ansgar at debian.org>, Clint Adams <clint at gnu.org>
-Build-Depends: debhelper (>= 7), libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, imagemagick, libpng12-dev, libbz2-dev
+Build-Depends: debhelper (>= 7), libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, imagemagick, libpng12-dev, libbz2-dev, libssl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.simutrans.com/
 Vcs-Git: git://git.debian.org/git/pkg-games/simutrans.git
diff --git a/debian/patches/series b/debian/patches/series
index cbce4aa..bcfc336 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 revert-svn-1937.diff
 path-for-game-data.diff
 config.diff
+sha1-replacement.diff
diff --git a/debian/patches/sha1-replacement.diff b/debian/patches/sha1-replacement.diff
new file mode 100644
index 0000000..9fd9c73
--- /dev/null
+++ b/debian/patches/sha1-replacement.diff
@@ -0,0 +1,101 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Wed, 16 Feb 2011 21:28:04 +0100
+Subject: Provide replacement for non-free SHA-1 implementation
+--- simutrans.orig/Makefile
++++ simutrans/Makefile
+@@ -24,6 +24,9 @@
+ endif
+ 
+ 
++# for utils/sha1.*
++LIBS += -lcrypto
++
+ ifeq ($(OSTYPE),amiga)
+   STD_LIBS ?= -lz -lbz2 -lunix -lpthread -lSDL_mixer -lsmpeg -lvorbisfile -lvorbis -logg
+   CFLAGS += -mcrt=newlib -DUSE_C -DBIG_ENDIAN -gstabs+
+--- /dev/null
++++ simutrans/utils/sha1.cc
+@@ -0,0 +1,43 @@
++/*
++ * sha1.cc
++ *
++ * (C) 2011, Ansgar Burchardt <ansgar at debian.org>
++ *
++ * This file may be used under the Artistic license.
++ */
++
++#include "sha1.h"
++#include <stdexcept>
++
++SHA1::SHA1()
++{
++  EVP_MD_CTX_init(&m_md_ctx);
++  Reset();
++}
++
++SHA1::~SHA1()
++{
++  EVP_MD_CTX_cleanup(&m_md_ctx);
++}
++
++void SHA1::Reset()
++{
++  if (!EVP_DigestInit_ex(&m_md_ctx, EVP_sha1(), 0))
++    throw std::runtime_error("EVP_DigestInit_ex failed.");
++}
++
++bool SHA1::Result(unsigned char *md_value)
++{
++  return EVP_DigestFinal_ex(&m_md_ctx, md_value, 0);
++}
++
++void SHA1::Input(const char *mess, unsigned int length)
++{
++  if (!EVP_DigestUpdate(&m_md_ctx, mess, length))
++    throw std::runtime_error("EVP_DigestUpdate failed.");
++}
++
++void SHA1::Input(char mess)
++{
++  Input(&mess, 1);
++}
+--- /dev/null
++++ simutrans/utils/sha1.h
+@@ -0,0 +1,27 @@
++/*
++ * sha1.h
++ *
++ * (C) 2011, Ansgar Burchardt <ansgar at debian.org>
++ *
++ * This file may be used under the Artistic license.
++ */
++
++#ifndef _SHA1_H_
++#define _SHA1_H_
++
++#include <openssl/evp.h>
++
++class SHA1
++{
++  public:
++    SHA1();
++    ~SHA1();
++    void Reset();
++    bool Result(unsigned char *md_value);
++    void Input(const char *mess, unsigned int length);
++    void Input(char mess);
++  private:
++    EVP_MD_CTX m_md_ctx;
++};
++
++#endif
+--- simutrans.orig/utils/checksum.h
++++ simutrans/utils/checksum.h
+@@ -2,6 +2,7 @@
+ #define _CHECKSUM_H_
+ 
+ #include "sha1.h"
++#include "../simtypes.h"
+ 
+ class SHA1;
+ 

-- 
transportation simulator