diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 4ce1cfd09e8bd86f81a3e485757fa729cb281853..c6bb2c8558af31c5be9e1647606180724b143627 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -1,6 +1,6 @@ -%define anolis_release 3 +%define anolis_release 4 -%global usrgrp_name saslauth +%global username saslauth %global plugindir %{_libdir}/sasl2 Name: cyrus-sasl @@ -23,7 +23,7 @@ BuildRequires: gdbm-devel BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: pam-devel -BuildRequires: mysql-devel +BuildRequires: mariadb-connector-c-devel BuildRequires: libpq-devel BuildRequires: zlib-devel BuildRequires: openldap-devel @@ -35,9 +35,8 @@ BuildRequires: make Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel Requires: /sbin/nologin -Requires: systemd -Provides: user(%{usrgrp_name}) -Provides: group(%{usrgrp_name}) +Provides: user(%{username}) +Provides: group(%{username}) %description This is the Cyrus SASL API implementation. It can be used on the client @@ -52,8 +51,8 @@ The %{name}-lib package contains shared libraries needed by applications using the Cyrus SASL library. %package devel -Requires: %{name}-lib%{?_isa} = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: pkgconfig Summary: Files needed for developing applications with Cyrus SASL @@ -62,7 +61,7 @@ The %{name}-devel package contains files needed for developing and compiling applications which use the Cyrus SASL library. %package gssapi -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} Summary: GSSAPI authentication support for Cyrus SASL %description gssapi @@ -71,7 +70,7 @@ support GSSAPI authentication. GSSAPI is commonly used for Kerberos authentication. %package plain -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} Summary: PLAIN and LOGIN authentication support for Cyrus SASL %description plain @@ -79,7 +78,7 @@ The %{name}-plain package contains the Cyrus SASL plugins which support PLAIN and LOGIN authentication schemes. %package md5 -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} Summary: CRAM-MD5 and DIGEST-MD5 authentication support for Cyrus SASL %description md5 @@ -87,7 +86,7 @@ The %{name}-md5 package contains the Cyrus SASL plugins which support CRAM-MD5 and DIGEST-MD5 authentication schemes. %package ntlm -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} Summary: NTLM authentication support for Cyrus SASL %description ntlm @@ -95,14 +94,14 @@ The %{name}-ntlm package contains the Cyrus SASL plugin which supports the NTLM authentication scheme. %package scram -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} Summary: SCRAM auxprop support for Cyrus SASL %description scram The %{name}-scram package contains the Cyrus SASL plugin which supports the SCRAM authentication scheme. %package gs2 -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} Summary: GS2 support for Cyrus SASL %description gs2 @@ -110,7 +109,7 @@ The %{name}-gs2 package contains the Cyrus SASL plugin which supports the GS2 authentication scheme. %package sql -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} Summary: SQL auxprop support for Cyrus SASL %description sql @@ -118,13 +117,22 @@ The %{name}-sql package contains the Cyrus SASL plugin which supports using a RDBMS for storing shared secrets. %package ldap -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} Summary: LDAP auxprop support for Cyrus SASL %description ldap The %{name}-ldap package contains the Cyrus SASL plugin which supports using a directory server, accessed using LDAP, for storing shared secrets. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{EVR} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + + %prep %autosetup @@ -132,28 +140,28 @@ a directory server, accessed using LDAP, for storing shared secrets. find %{_builddir}/%{name}-%{version} -maxdepth 1 -name 'dlcompat-*' -exec rm -rf {} \; %build - APPEND_CFLAGS="" INC_DIR="$( mysql_config --include )" if [ "x$INC_DIR" != "x-I%{_includedir}" ] ; then APPEND_CFLAGS="$APPEND_CFLAGS $INC_DIR" -fi +fi CFLAGS="$CFLAGS $APPEND_CFLAGS" +export CFLAGS -autoreconf -f -%configure --with-pic \ - --disable-static \ +%configure \ + --disable-static \ --enable-shared \ --disable-java \ --with-plugindir=%{plugindir} \ --with-configdir=%{plugindir}:%{_sysconfdir}/sasl2 \ --disable-krb4 \ - --enable-gassapi \ + --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \ --with-gss_impl=mit \ --with-rc4 \ + --with-dblib=gdbm \ --with-dbpath=/etc/sasl2/sasldb2 \ - --with-saslauthd=/run/saslauthd \ + --with-saslauthd=/run/saslauthd --without-pwcheck \ --without-pwcheck \ --with-ldap \ --with-devrandom=/dev/urandom \ @@ -167,8 +175,11 @@ autoreconf -f --enable-httpform \ --disable-otp \ --enable-ldapdb \ - --enable-sql --with-mysql --with-pgsql --without-sqlite -%{make_build} + --enable-sql --with-mysql=yes --with-pgsql=yes \ + --without-sqlite + + +%{make_build} sasldir=%{plugindir} %{make_build} -C saslauthd testsaslauthd %{make_build} -C sample @@ -195,10 +206,10 @@ find %{buildroot} -type f \( -name '*.la' -o -name '*.a' \) -delete -print make check %{?_smp_mflags} %pre -getent group %{usrgrp_name} >/dev/null || groupadd -g 76 -r %{usrgrp_name} -getent passwd %{usrgrp_name} >/dev/null || \ - useradd -r -g %{usrgrp_name} -d /run/saslauthd \ - -s /sbin/nologin -c "Saslauthd User" %{usrgrp_name} +getent group %{username} >/dev/null || groupadd -g 76 -r %{username} +getent passwd %{username} >/dev/null || \ + useradd -r -g %{username} -d /run/saslauthd \ + -s /sbin/nologin -c "Saslauthd User" %{username} %post %systemd_post saslauthd.service @@ -210,7 +221,6 @@ getent passwd %{usrgrp_name} >/dev/null || \ %systemd_postun_with_restart saslauthd.service %files -%doc saslauthd/LDAP_SASLAUTHD %{_mandir}/man8/* %{_sbindir}/pluginviewer %{_sbindir}/saslauthd @@ -263,7 +273,14 @@ getent passwd %{usrgrp_name} >/dev/null || \ %files gs2 %{plugindir}/libgs2.so* +%files doc +%doc saslauthd/LDAP_SASLAUTHD +%doc README INSTALL.TXT ChangeLog AUTHORS + %changelog +* Fri Feb 10 2023 happy_orange - 2.1.28-4 +- add doc package + * Tue Mar 22 2022 Chunmei Xu - 2.1.28-3 - remove dependency with libdb