From 0f4fa33b79c34869798b6eecf7b38e3db25c5a20638383d697573d78fe3ca132 Mon Sep 17 00:00:00 2001 From: Andrey Karepin Date: Sun, 15 Jun 2014 15:02:49 +0000 Subject: [PATCH 1/3] Accepting request 237223 from home:ckornacker:branches:network Revert upstream commit 080e51c7fa0421eb2f0210d34cf0ac48a228b1e9 cyrus-sasl-revert_gssapi_flags.patch (bnc#775279) OBS-URL: https://build.opensuse.org/request/show/237223 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=49 --- cyrus-sasl-revert_gssapi_flags.patch | 15 +++++++++++++++ cyrus-sasl.changes | 6 ++++++ cyrus-sasl.spec | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 cyrus-sasl-revert_gssapi_flags.patch diff --git a/cyrus-sasl-revert_gssapi_flags.patch b/cyrus-sasl-revert_gssapi_flags.patch new file mode 100644 index 0000000..6dd6c79 --- /dev/null +++ b/cyrus-sasl-revert_gssapi_flags.patch @@ -0,0 +1,15 @@ +--- a/plugins/gssapi.c ++++ b/plugins/gssapi.c +@@ -1583,10 +1583,10 @@ static int gssapi_client_mech_step(void *conn_context, + } + + /* Setup req_flags properly */ +- req_flags = GSS_C_INTEG_FLAG; ++ req_flags = GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG; + if (params->props.max_ssf > params->external_ssf) { + /* We are requesting a security layer */ +- req_flags |= GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG; ++ req_flags |= GSS_C_INTEG_FLAG; + /* Any SSF bigger than 1 is confidentiality. */ + /* Let's check if the client of the API requires confidentiality, + and it wasn't already provided by an external layer */ diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index d86f449..6075140 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 13 11:03:45 UTC 2014 - ckornacker@suse.com + +- Revert upstream commit 080e51c7fa0421eb2f0210d34cf0ac48a228b1e9 + cyrus-sasl-revert_gssapi_flags.patch (bnc#775279) + ------------------------------------------------------------------- Sat Nov 2 20:47:58 UTC 2013 - jengelh@inai.de diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index ddf1ed7..45353b1 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -34,6 +34,7 @@ Patch1: shared_link_on_ppc.patch Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix-sasl-header.diff +Patch8: cyrus-sasl-revert_gssapi_flags.patch PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: db-devel @@ -170,6 +171,7 @@ fi %patch5 -p1 %patch6 %patch7 -p1 +%patch8 -p1 %build find . -name "*.cvsignore" -exec rm -fv "{}" "+" From 340d247a16bdb58ec5c9e693c83ef50aadd54bf7d926a898f8caf74a13608140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 25 Jul 2014 12:38:31 +0000 Subject: [PATCH 2/3] Accepting request 241591 from home:posophe:branches:network Fixes for systemd OBS-URL: https://build.opensuse.org/request/show/241591 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=50 --- cyrus-sasl-saslauthd.changes | 7 +++++++ cyrus-sasl-saslauthd.spec | 2 +- cyrus-sasl.changes | 7 +++++++ cyrus-sasl.spec | 1 - 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index 005beac..3ea255d 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jul 19 12:54:50 UTC 2014 - p.drouand@gmail.com + +- Remove insserv dependency; it's unneeded with systemd' systems +- Remove insserv and fillup dependency in cyrus-sasl package; there + is neither sysconfig or init file + ------------------------------------------------------------------- Tue Apr 1 10:32:37 UTC 2014 - varkoly@suse.com diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index d0855a1..216ad3b 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -34,7 +34,7 @@ Patch1: shared_link_on_ppc.patch Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix-sasl-header.diff -PreReq: %insserv_prereq %fillup_prereq +PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: db-devel BuildRequires: krb5-devel diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index 6075140..fd4131a 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jul 19 12:54:50 UTC 2014 - p.drouand@gmail.com + +- Remove insserv dependency; it's unneeded with systemd' systems +- Remove insserv and fillup dependency in cyrus-sasl package; there + is neither sysconfig or init file + ------------------------------------------------------------------- Fri Jun 13 11:03:45 UTC 2014 - ckornacker@suse.com diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 45353b1..9b4e5a4 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -35,7 +35,6 @@ Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix-sasl-header.diff Patch8: cyrus-sasl-revert_gssapi_flags.patch -PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: db-devel BuildRequires: krb5-mini-devel From 2ad2e0bfca586a210da8a9aaf1fa4fd162a6e3ad70b7e9d4ffc2053f28153f47 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 30 Jul 2014 09:46:04 +0000 Subject: [PATCH 3/3] Accepting request 242924 from home:sfalken:branches:network 1 OBS-URL: https://build.opensuse.org/request/show/242924 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=51 --- cyrus-sasl-saslauthd.changes | 5 +++++ cyrus-sasl-saslauthd.spec | 6 +++--- cyrus-sasl.changes | 5 +++++ cyrus-sasl.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index 3ea255d..ed76929 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 29 23:33:45 UTC 2014 - sfalken@opensuse.org + +- Changed references to /var/run, to /run in order to clear rpmlint check failure, due to files being installed to /var/run + ------------------------------------------------------------------- Sat Jul 19 12:54:50 UTC 2014 - p.drouand@gmail.com diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index 216ad3b..2be3c2c 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -82,7 +82,7 @@ autoreconf -f -i export CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS -DLDAP_DEPRECATED" %configure --with-plugindir=%{_libdir}/sasl2 \ --with-configdir=/etc/sasl2/:%{_libdir}/sasl2 \ - --with-saslauthd=/var/run/sasl2/ \ + --with-saslauthd=/run/sasl2/ \ --enable-checkapop=no \ --enable-cram=no \ --enable-digest=no \ @@ -112,7 +112,7 @@ make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install cd .. cd saslauthd make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install -install -m 755 -d $RPM_BUILD_ROOT/var/run/sasl2 +install -m 755 -d $RPM_BUILD_ROOT/run/sasl2 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 install -m 644 saslauthd.mdoc $RPM_BUILD_ROOT/%{_mandir}/man8/saslauthd.8 mkdir -p $RPM_BUILD_ROOT/usr/bin @@ -144,7 +144,7 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_unitdir} %defattr(-,root,root) /var/adm/fillup-templates/sysconfig.saslauthd %{_unitdir}/saslauthd.service -%dir %attr(0755, root, root) %ghost /var/run/sasl2 +%dir %attr(0755, root, root) %ghost /run/sasl2 /usr/sbin/* /usr/bin/* %doc %{_mandir}/man8/*.gz diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index fd4131a..f26b0ee 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 29 23:31:35 UTC 2014 - sfalken@opensuse.org + +- Changed --with-saslauthd=/var/run/sasl2 in %build to /run/sasl2 to clear rpmlint check failure + ------------------------------------------------------------------- Sat Jul 19 12:54:50 UTC 2014 - p.drouand@gmail.com diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 9b4e5a4..be4e462 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -179,7 +179,7 @@ export CFLAGS="%optflags -fno-strict-aliasing" %configure --with-pic \ --with-plugindir=%{_libdir}/sasl2 \ --with-configdir=/etc/sasl2/:%{_libdir}/sasl2 \ - --with-saslauthd=/var/run/sasl2/ \ + --with-saslauthd=/run/sasl2/ \ --enable-pam \ --enable-sample \ --enable-login \