From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] compat-cyrus-sasl: New package.
Date: Wed, 27 Apr 2016 11:18:53 +0200
Message-ID: <1461748733-24090-1-git-send-email-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5989675313424240189=="
List-Id: <development.lists.ipfire.org>

--===============5989675313424240189==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

As a result of a *.so bump in the latest cyrus-sasl package
and binaries wich are still linked against the old version
we have to create a compatibility package to cover this
bump.

Fixes #10892.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 compat-cyrus-sasl/compat-cyrus-sasl.nm             | 74 ++++++++++++++++++++=
++
 .../patches/cyrus-sasl-2.1.23-db5.patch            | 22 +++++++
 2 files changed, 96 insertions(+)
 create mode 100644 compat-cyrus-sasl/compat-cyrus-sasl.nm
 create mode 100644 compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch

diff --git a/compat-cyrus-sasl/compat-cyrus-sasl.nm b/compat-cyrus-sasl/compa=
t-cyrus-sasl.nm
new file mode 100644
index 0000000..38dd9d4
--- /dev/null
+++ b/compat-cyrus-sasl/compat-cyrus-sasl.nm
@@ -0,0 +1,74 @@
+############################################################################=
###
+# IPFire.org    - An Open Source Firewall Solution                          =
  #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>               =
    #
+############################################################################=
###
+
+name       =3D compat-cyrus-sasl
+version    =3D 2.1.25
+release    =3D 2.1
+
+thisapp    =3D cyrus-sasl-%{version}
+
+groups     =3D System/Libraries
+url        =3D http://asg.web.cmu.edu/sasl/sasl-library.html
+license    =3D BSD
+summary    =3D The Cyrus SASL library.
+
+description
+	The cyrus-sasl package contains the Cyrus implementation of SASL.
+	SASL is the Simple Authentication and Security Layer, a method for
+	adding authentication support to connection-based protocols.
+end
+
+source_dl  =3D ftp://ftp.cyrusimap.org/cyrus-sasl/
+
+build
+	requires
+		automake
+		libdb-devel
+		openssl-devel
+		pam-devel
+	end
+
+	prepare_cmds
+		# for aarch64
+		for i in $(find . -name config.guess -or -name config.sub); do
+			cp -vf %{datadir}/automake-*/config.{guess,sub} $(dirname ${i})
+		done
+	end
+
+	configure_options +=3D \
+		--sysconfdir=3D/etc \
+		--with-configdir=3D%{libdir}/sasl2:/etc/sasl2 \
+		--with-plugindir=3D%{libdir}/sasl2 \
+		--with-dbpath=3D/var/lib/sasl/sasldb2 \
+		--with-saslauthd=3D/var/run/saslauthd \
+		--mandir=3D/usr/share/man
+
+	PARALLELISMFLAGS =3D # Disabled
+
+	install
+		# Only install libraries.
+		mkdir -pv %{BUILDROOT}%{libdir}
+		install -m 755 lib/.libs/libsasl2.so.2.0.25 %{BUILDROOT}%{libdir}
+		ln -svf libsasl2.so.2.0.25 %{BUILDROOT}%{libdir}/libpcre.so.2
+	end
+end
+
+packages
+	package %{name}
+		provides
+			cyrus-sasl =3D %{thisver}
+			cyrus-sasl-libs =3D %{thisver}
+		end
+
+		conflicts
+			cyrus-sasl <=3D %{thisver}
+			cyrus-sasl-libs <=3D %{thisver}
+		end
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch b/compat-c=
yrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch
new file mode 100644
index 0000000..ff831cd
--- /dev/null
+++ b/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch
@@ -0,0 +1,22 @@
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -100,7 +100,7 @@ static int berkeleydb_open(const sasl_ut
+     ret =3D db_create(mbdb, NULL, 0);
+     if (ret =3D=3D 0 && *mbdb !=3D NULL)
+     {
+-#if DB_VERSION_MAJOR =3D=3D 4 && DB_VERSION_MINOR >=3D 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR =3D=3D 4) && (DB_VERSION_M=
INOR >=3D 1))
+ 	ret =3D (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret =3D (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- a/utils/dbconverter-2.c
++++ b/utils/dbconverter-2.c
+@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
+     ret =3D db_create(mbdb, NULL, 0);
+     if (ret =3D=3D 0 && *mbdb !=3D NULL)
+     {
+-#if DB_VERSION_MAJOR =3D=3D 4 && DB_VERSION_MINOR >=3D 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR =3D=3D 4) && (DB_VERSION_M=
INOR >=3D 1))
+ 	ret =3D (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret =3D (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
--=20
2.5.5


--===============5989675313424240189==--