[openbsc] 01/01: Link with gnutls instead of openssl

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository openbsc.

commit 27bb8eed0a8647de82b6874ae41b0186ea58886f
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Feb 19 20:34:48 2016 +0100

    Link with gnutls instead of openssl
---
 debian/control              |  2 +-
 debian/patches/gnutls.patch | 79 +++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index ecc14ae..64fde6f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
                libosmo-netif-dev,
                libdbd-sqlite3,
                libpcap-dev,
-               libssl-dev,
+               libgnutls28-dev,
                libc-ares-dev,
                libsmpp34-dev
 Standards-Version: 3.9.7
diff --git a/debian/patches/gnutls.patch b/debian/patches/gnutls.patch
new file mode 100644
index 0000000..71ccd48
--- /dev/null
+++ b/debian/patches/gnutls.patch
@@ -0,0 +1,79 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openbsc (0.15.0-1) UNRELEASED; urgency=low
+ .
+   * Initial release (Closes: #806583)
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+Bug-Debian: https://bugs.debian.org/806583
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: openbsc/openbsc/configure.ac
+===================================================================
+--- openbsc.orig/openbsc/configure.ac	2016-02-19 20:39:10.824145024 +0100
++++ openbsc/openbsc/configure.ac	2016-02-19 20:39:10.820145095 +0100
+@@ -27,7 +27,8 @@
+ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0)
+ PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.6.4)
+ PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1)
+-PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= 0.9.5)
++#PKG_CHECK_MODULES(LIBCRYPTO, gnutls)
++AC_SUBST(LIBCRYPTO_LIBS, -lgnutls-openssl)
+ 
+ # Enabke/disable the NAT?
+ AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires SCCP])],
+Index: openbsc/openbsc/src/libmsc/auth.c
+===================================================================
+--- openbsc.orig/openbsc/src/libmsc/auth.c	2016-02-19 20:13:19.417462737 +0100
++++ openbsc/openbsc/src/libmsc/auth.c	2016-02-19 20:40:13.607032169 +0100
+@@ -27,7 +27,7 @@
+ 
+ #include <osmocom/gsm/comp128.h>
+ 
+-#include <openssl/rand.h>
++#include <gnutls/openssl.h>
+ 
+ #include <stdlib.h>
+ 
+Index: openbsc/openbsc/src/libmsc/db.c
+===================================================================
+--- openbsc.orig/openbsc/src/libmsc/db.c	2016-02-19 20:13:19.421462672 +0100
++++ openbsc/openbsc/src/libmsc/db.c	2016-02-19 20:40:27.318789122 +0100
+@@ -38,7 +38,7 @@
+ #include <osmocom/core/statistics.h>
+ #include <osmocom/core/rate_ctr.h>
+ 
+-#include <openssl/rand.h>
++#include <gnutls/openssl.h>
+ 
+ /* Semi-Private-Interface (SPI) for the subscriber code */
+ void subscr_direct_free(struct gsm_subscriber *subscr);
+Index: openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c
+===================================================================
+--- openbsc.orig/openbsc/src/osmo-bsc_nat/bsc_nat.c	2016-02-19 20:13:19.433462478 +0100
++++ openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c	2016-02-19 20:39:58.791294787 +0100
+@@ -69,7 +69,7 @@
+ 
+ #include <osmocom/abis/ipa.h>
+ 
+-#include <openssl/rand.h>
++#include <gnutls/openssl.h>
+ 
+ #include "../../bscconfig.h"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 36c6aa1..43f03e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_include_dir.patch
 set_version_explicitly.patch
 correct_spelling_errors.patch
 fix_failing_test.patch
+gnutls.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openbsc.git