From 59feea161a699636953db44972e21cc96747e44bc37be7f6c55060c18d57343f Mon Sep 17 00:00:00 2001
From: Peter Wullinger <wullinger@rz.uni-kiel.de>
Date: Mon, 30 Jan 2023 08:27:01 +0000
Subject: [PATCH] Accepting request 1060890 from
 home:kukuk:branches:server:mail

- Don't build the NIS module anymore, libnsl/NIS are deprecated

OBS-URL: https://build.opensuse.org/request/show/1060890
OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=270
---
 exim.changes |  6 ++++++
 exim.spec    | 14 +++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/exim.changes b/exim.changes
index 9fac123..8154b7d 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 25 12:56:05 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
+
+- Don't build the NIS module anymore, libnsl/NIS are deprecated
+
+-------------------------------------------------------------------
 Tue Oct 18 10:00:39 UTC 2022 - Peter Wullinger <wullinger@rz.uni-kiel.de>
 
 - add patch-cve-2022-3559 (fixes CVE-2022-3559, bsc#1204427, Bug 2915)
diff --git a/exim.spec b/exim.spec
index c97abea..1f0246e 100644
--- a/exim.spec
+++ b/exim.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package exim
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,7 +37,7 @@ Name:           exim
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  db-devel
 BuildRequires:  libidn-devel
-%if 0%{?suse_version} >= 1330
+%if 0%{?suse_version} >= 1330 && 0%{?suse_version} < 1599
 BuildRequires:  libnsl-devel
 %endif
 BuildRequires:  libspf2-devel
@@ -75,7 +75,7 @@ Requires(pre):  group(mail)
 Requires(pre):  fileutils textutils
 %endif
 Version:        4.96
-Release:        2
+Release:        0
 %if %{with_mysql}
 BuildRequires:  mysql-devel
 %endif
@@ -199,15 +199,19 @@ cat <<-EOF > Local/Makefile
 %if %{with_sqlite}
 	LOOKUP_SQLITE=yes
 %endif
+%if 0%{?suse_version} < 1599
 	LOOKUP_NIS=yes
+        LOOKUP_LIBS=-lnsl
+%else
+        # LOOKUP_NIS=yes
+%endif
 	# LOOKUP_NISPLUS=yes
 	LOOKUP_PASSWD=yes
 	# LOOKUP_WHOSON=yes
 	CYRUS_SASLAUTHD_SOCKET=/var/run/sasl2/mux
-	LOOKUP_LIBS=-llber -lnsl
 %if %{with_ldap}
 	LDAP_LIB_TYPE=OPENLDAP2
-	LOOKUP_LIBS+=-lldap
+	LOOKUP_LIBS+=-llber -lldap
 %endif
 %if %{with_mysql}
 	LOOKUP_INCLUDE+=-I /usr/include/mysql