From e0862b65ecdcddc89e2e01923dcb80e20b476620 Mon Sep 17 00:00:00 2001 From: guoxiaoqi Date: Sat, 21 Mar 2020 19:14:53 +0800 Subject: [PATCH] add missing saslauthd.sysconfig for saslauthd.service --- cyrus-sasl.spec | 11 +++++++++-- saslauthd.service | 2 +- saslauthd.sysconfig | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 saslauthd.sysconfig diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 677d5e0..10be36e 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -6,13 +6,14 @@ Name: cyrus-sasl Version: 2.1.27 -Release: 9 +Release: 10 Summary: The Cyrus SASL API Implementation License: BSD with advertising URL: https://www.cyrusimap.org/sasl/ Source0: https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz Source1: saslauthd.service +Source2: saslauthd.sysconfig Patch0: 0003-Prevent-double-free-of-RC4-context.patch Patch1: fix-CVE-2019-19906.patch @@ -179,8 +180,10 @@ install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-server install -m755 saslauthd/testsaslauthd $RPM_BUILD_ROOT%{_sbindir}/testsaslauthd install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man8/ install -m644 -p saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8 -install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} $RPM_BUILD_ROOT/etc/sysconfig +install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/etc/sysconfig +install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} install -m644 -p %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service +install -m644 -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2 install -m755 -d $RPM_BUILD_ROOT/%{_libdir}/sasl2 @@ -224,6 +227,7 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} %{_libdir}/sasl2/*gssapi*.so* %{_libdir}/sasl2/libscram.so* %{_libdir}/sasl2/libgs2.so* +%config(noreplace) /etc/sysconfig/saslauthd %{_unitdir}/saslauthd.service %ghost /run/saslauthd @@ -257,6 +261,9 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} %changelog +* Sat Mar 21 2020 openEuler Buildteam - 2.1.27-10 +- add missing saslauthd.sysconfig for saslauthd.service + * Tue Mar 10 2020 openEuler Buildteam - 2.1.27-9 - fix CVE-2019-19906 diff --git a/saslauthd.service b/saslauthd.service index cb07600..0460550 100644 --- a/saslauthd.service +++ b/saslauthd.service @@ -4,7 +4,7 @@ Description=SASL authentication daemon. [Service] Type=forking EnvironmentFile=/etc/sysconfig/saslauthd -ExecStart=/usr/sbin/saslauthd -m /run/saslauthd -a pam +ExecStart=/usr/sbin/saslauthd -m /run/saslauthd -a pam $FLAGS RuntimeDirectory=saslauthd [Install] diff --git a/saslauthd.sysconfig b/saslauthd.sysconfig new file mode 100644 index 0000000..c5d8db6 --- /dev/null +++ b/saslauthd.sysconfig @@ -0,0 +1 @@ +FLAGS= -- Gitee