imspector: Fix build with openssl 1.0.1.

diff --git a/lfs/imspector b/lfs/imspector
index 51654c5ad6db6c40025f06cfc6703ff9eff55e02..5cea87279c143edc587440509392e911c93b0808 100644 (file)
--- a/lfs/imspector
+++ b/lfs/imspector
@@ -29,10 +29,10 @@ VER        = 20101008
 THISAPP    = imspector-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/imspector
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = imspector
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -77,13 +77,19 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/imspector-20101008-ssl.patch
        cd $(DIR_SRC)/imspector && sed -e "s/^SSL_LIBS.*/& -lcrypto/" -i Makefile
        cd $(DIR_SRC)/imspector && make install
+
        -mv /usr/etc/imspector /etc/imspector
        -mv /etc/imspector/imspector /etc/imspector
+
        install -v -m 755 $(DIR_CONF)/imspector/imspector.conf /etc/imspector.conf
        install -v -m 644 $(DIR_SRC)/config/backup/includes/imspector /var/ipfire/backup/addons/includes/imspector
+
        chmod 755 /srv/web/ipfire/cgi-bin/imspector.cgi
        chown nobody:nobody -R /var/log/imspector
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/patches/imspector-20101008-ssl.patch b/src/patches/imspector-20101008-ssl.patch
new file mode 100644 (file)
index 0000000..32ac766
--- /dev/null
+++ b/src/patches/imspector-20101008-ssl.patch
@@ -0,0 +1,11 @@
+--- imspector/sslstate.h       2010-02-23 18:21:56.000000000 +0100
++++ imspector/sslstate.h       2013-12-14 15:40:04.796370688 +0100
+@@ -52,7 +52,7 @@
+               int sslverify;            //!< Our VERIFY_ choice.
+               
+               bool localdebugmode;      //!< Saves us from passing this around.
+-              SSL_METHOD *method;       //!< openssl method handle.
++              const SSL_METHOD *method;       //!< openssl method handle.
+               SSL_CTX *connectctx;      //!< Our IM server-sde CTX.
+               SSL_CTX *ctx;             //!< Our IM client-side CTX.
+