rpms/openchange
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/openchange.git#ebb8ea7f5937f64923577e046bc1f6753ea991d5
This commit is contained in:
DistroBaker 2020-12-01 23:53:13 +00:00
parent 71a3dcd386
commit a195557fe8
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
openchange-2.3-samba-4.13.patch Normal file
View File

@ -0,0 +1,40 @@
diff -up openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c.samba-4.13 openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c
--- openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c.samba-4.13 2020-11-13 13:37:00.953428673 +0100
+++ openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c 2020-11-13 13:38:36.541453531 +0100
@@ -753,7 +753,7 @@ _PUBLIC_ enum MAPISTATUS OpenProfile(str
_PUBLIC_ enum MAPISTATUS LoadProfile(struct mapi_context *mapi_ctx,
struct mapi_profile *profile)
{
- enum credentials_use_kerberos use_krb = CRED_AUTO_USE_KERBEROS;
+ enum credentials_use_kerberos use_krb = CRED_USE_KERBEROS_DESIRED;
/* Sanity checks */
OPENCHANGE_RETVAL_IF(!mapi_ctx, MAPI_E_NOT_INITIALIZED, NULL);
@@ -777,9 +777,9 @@ _PUBLIC_ enum MAPISTATUS LoadProfile(str
* another API in the profile */
if (profile->kerberos) {
if (!strncmp(profile->kerberos, "yes", 3)) {
- use_krb = CRED_MUST_USE_KERBEROS;
+ use_krb = CRED_USE_KERBEROS_REQUIRED;
} else {
- use_krb = CRED_DONT_USE_KERBEROS;
+ use_krb = CRED_USE_KERBEROS_DISABLED;
}
}
/* additionally, don't set the username in the ccache if kerberos
@@ -787,13 +787,13 @@ _PUBLIC_ enum MAPISTATUS LoadProfile(str
* credentials. cli_credentials_guess probably gets the right
* thing anyway in the situations where kerberos is in use */
if (profile->username && *(profile->username)
- && use_krb != CRED_MUST_USE_KERBEROS) {
+ && use_krb != CRED_USE_KERBEROS_REQUIRED) {
cli_credentials_set_username(profile->credentials, profile->username, CRED_SPECIFIED);
}
if (profile->password && *(profile->password)) {
cli_credentials_set_password(profile->credentials, profile->password, CRED_SPECIFIED);
}
- if (use_krb != CRED_AUTO_USE_KERBEROS) {
+ if (use_krb != CRED_USE_KERBEROS_DESIRED) {
cli_credentials_set_kerberos_state(profile->credentials, use_krb);
}

7
openchange.spec
View File

@ -23,7 +23,7 @@
Name: openchange
Version: 2.3
Release: 33%{?dist}
Release: 34%{?dist}
Summary: Provides access to Microsoft Exchange servers using native protocols
License: GPLv3+ and Public Domain
URL: http://www.openchange.org/
@ -92,6 +92,7 @@ Patch14: openchange-2.3-covscan.patch
Patch15: openchange-2.3-samba-4.10-macros.patch
Patch16: openchange-2.3-samba-4.11.patch
Patch17: openchange-2.3-samba-4.12.patch
Patch18: openchange-2.3-samba-4.13.patch
%description
OpenChange provides libraries to access Microsoft Exchange servers
@ -166,6 +167,7 @@ This package provides the server elements for OpenChange.
%patch15 -p1 -b .samba-4.10-macros
%patch16 -p1 -b .samba-4.11
%patch17 -p1 -b .samba-4.12
%patch18 -p1 -b .samba-4.13
%build
./autogen.sh
@ -310,6 +312,9 @@ cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchan
%endif
%changelog
* Mon Nov 30 2020 Milan Crha <mcrha@redhat.com> - 2.3-34
- Add patch to build against samba 4.13
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild