.openchange.metadata

@@ -1 +0,0 @@
-901e6d8fa4f9f4a1d41c3ad97d967da316d0ad17 SOURCES/openchange-2.3-VULCAN.tar.gz

SOURCES/openchange-2.3-disable-server-reqs.patch

@@ -1,12 +0,0 @@
-diff -up openchange-openchange-2.3-VULCAN/configure.ac.disable-server-reqs openchange-openchange-2.3-VULCAN/configure.ac
---- openchange-openchange-2.3-VULCAN/configure.ac.disable-server-reqs	2021-06-17 21:40:49.938611315 +0200
-+++ openchange-openchange-2.3-VULCAN/configure.ac	2021-06-17 21:41:18.616614841 +0200
-@@ -436,7 +436,7 @@ dnl AC_SUBST(MYSQL_LIBS)
- dnl ----------------------------------------------------------------------------
- dnl Check for memcached
- dnl ----------------------------------------------------------------------------
--PKG_CHECK_MODULES([MEMCACHED], [libmemcached >= 1.0.18], [], [AC_MSG_ERROR(memcached >= 1.0.18 required to build mapistore library)])
-+dnl PKG_CHECK_MODULES([MEMCACHED], [libmemcached >= 1.0.18], [], [AC_MSG_ERROR(memcached >= 1.0.18 required to build mapistore library)])
- 
- dnl ----------------------------------------------------------------------------
- dnl Check for Flex

SOURCES/openchange-2.3-samba-4.11.2.patch

@@ -0,0 +1,34 @@
+diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h
+--- openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12	2020-01-27 11:33:02.941846935 +0100
++++ openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h	2020-01-27 11:33:19.170846710 +0100
+@@ -103,7 +103,9 @@ __BEGIN_DECLS
+ struct ldb_dn *samdb_search_dn(struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, const char *, ...) _PRINTF_ATTRIBUTE(4,5);
+ struct dom_sid *dom_sid_add_rid(TALLOC_CTX *, const struct dom_sid *, uint32_t);
+ bool encode_pw_buffer(uint8_t buffer[516], const char *, int);
++#if 0 /* removed in samba 4.12 */
+ void arcfour_crypt_blob(uint8_t *, int, const DATA_BLOB *);
++#endif
+ 
+ /* The following public definitions come from libmapiadmin/mapiadmin.c */
+ struct mapiadmin_ctx *mapiadmin_init(struct mapi_session *);
+diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c
+--- openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12	2020-01-27 11:25:31.398853179 +0100
++++ openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c	2020-01-27 11:31:27.490848255 +0100
+@@ -592,6 +592,9 @@ _PUBLIC_ enum MAPISTATUS mapiadmin_user_
+  */
+ _PUBLIC_ enum MAPISTATUS mapiadmin_user_add(struct mapiadmin_ctx *mapiadmin_ctx)
+ {
++	OC_DEBUG(3, "mapiadmin_user_add(): is disabled");
++	return MAPI_E_UNABLE_TO_COMPLETE;
++#if 0 /* disable it, use samba function directly, if needed (no 'arcfour_crypt_blob' in samba 4.12) */
+ 	TALLOC_CTX			*mem_ctx;
+ 	NTSTATUS			status;
+ 	enum MAPISTATUS			retval;
+@@ -732,6 +735,7 @@ again:
+ 
+ 	talloc_free(mem_ctx);
+ 	return MAPI_E_SUCCESS;
++#endif
+ }
+ 
+ /**

SOURCES/openchange-2.3-samba-4.12.patch

@@ -1,37 +1,3 @@
-diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h
---- openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12	2020-01-27 11:33:02.941846935 +0100
-+++ openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h	2020-01-27 11:33:19.170846710 +0100
-@@ -103,7 +103,9 @@ __BEGIN_DECLS
- struct ldb_dn *samdb_search_dn(struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, const char *, ...) _PRINTF_ATTRIBUTE(4,5);
- struct dom_sid *dom_sid_add_rid(TALLOC_CTX *, const struct dom_sid *, uint32_t);
- bool encode_pw_buffer(uint8_t buffer[516], const char *, int);
-+#if 0 /* removed in samba 4.12 */
- void arcfour_crypt_blob(uint8_t *, int, const DATA_BLOB *);
-+#endif
- 
- /* The following public definitions come from libmapiadmin/mapiadmin.c */
- struct mapiadmin_ctx *mapiadmin_init(struct mapi_session *);
-diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c
---- openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12	2020-01-27 11:25:31.398853179 +0100
-+++ openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c	2020-01-27 11:31:27.490848255 +0100
-@@ -592,6 +592,9 @@ _PUBLIC_ enum MAPISTATUS mapiadmin_user_
-  */
- _PUBLIC_ enum MAPISTATUS mapiadmin_user_add(struct mapiadmin_ctx *mapiadmin_ctx)
- {
-+	OC_DEBUG(3, "mapiadmin_user_add(): is disabled");
-+	return MAPI_E_UNABLE_TO_COMPLETE;
-+#if 0 /* disable it, use samba function directly, if needed (no 'arcfour_crypt_blob' in samba 4.12) */
- 	TALLOC_CTX			*mem_ctx;
- 	NTSTATUS			status;
- 	enum MAPISTATUS			retval;
-@@ -732,6 +735,7 @@ again:
- 
- 	talloc_free(mem_ctx);
- 	return MAPI_E_SUCCESS;
-+#endif
- }
- 
- /**
 diff -up openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.12 openchange-openchange-2.3-VULCAN/ndr_mapi.c
 --- openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.12	2020-01-27 11:04:07.136870938 +0100
 +++ openchange-openchange-2.3-VULCAN/ndr_mapi.c	2020-01-27 11:12:29.978863985 +0100

SPECS/openchange.spec

@@ -1,4 +1,4 @@
-%global samba_version 4.13
+%global samba_version 4.2.0-2
 %global talloc_version 2.0.5
 %global nickname VULCAN
 
@@ -23,7 +23,8 @@
 
 Name: openchange
 Version: 2.3
-Release: 41%{?dist}
+Release: 32%{?dist}
+Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
 URL: http://www.openchange.org/
@@ -32,7 +33,6 @@ Source1: doxygen_to_devhelp.xsl
 
 ### Build Dependencies ###
 
-BuildRequires: make
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@@ -43,6 +43,7 @@ BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: libical-devel
 BuildRequires: libldb-devel
+BuildRequires: libmemcached-devel
 BuildRequires: libtalloc-devel >= %{talloc_version}
 BuildRequires: libtdb-devel
 BuildRequires: pkgconfig
@@ -55,12 +56,8 @@ BuildRequires: samba-common >= %{samba_version}
 BuildRequires: samba-devel >= %{samba_version}
 BuildRequires: samba-libs >= %{samba_version}
 BuildRequires: samba-pidl >= %{samba_version}
-BuildRequires: zlib-devel
-
-%if %{build_server_package}
-BuildRequires: libmemcached-devel
 BuildRequires: sqlite-devel
-%endif
+BuildRequires: zlib-devel
 
 # Certain versions of libtevent have incorrect
 # internal ABI versions
@@ -95,18 +92,18 @@ Patch13: openchange-2.3-disable-python3.patch
 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
+Patch17: openchange-2.3-samba-4.11.2.patch
-Patch18: openchange-2.3-samba-4.13.patch
+Patch18: openchange-2.3-samba-4.12.patch
-%if !%{build_server_package}
+Patch19: openchange-2.3-samba-4.13.patch
-Patch19: openchange-2.3-disable-server-reqs.patch
-%endif
 Patch20: openchange-2.3-samba-4.15.patch
+
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
 using native protocols.
 
 %package devel
 Summary: Developer tools for OpenChange libraries
+Group: Development/Libraries
 Requires: openchange = %{version}-%{release}
 %if %{build_server_package}
 Requires: openchange-server = %{version}-%{release}
@@ -119,6 +116,7 @@ using native protocols.
 
 %package devel-docs
 Summary: Developer documentation for OpenChange libraries
+Group: Development/Libraries
 Requires: devhelp
 Requires: openchange = %{version}-%{release}
 BuildArch: noarch
@@ -128,6 +126,7 @@ This package contains developer documentation for Openchange.
 
 %package client
 Summary: User tools for OpenChange libraries
+Group: Applications/System
 Requires: openchange = %{version}-%{release}
 
 %description client
@@ -137,6 +136,7 @@ Microsoft Exchange servers using native protocols.
 %if %{build_python_package}
 %package python
 Summary: Python bindings for OpenChange libraries
+Group: Development/Libraries
 Requires: openchange = %{version}-%{release}
 
 %description python
@@ -146,6 +146,7 @@ This module contains a wrapper that allows the use of OpenChange via Python.
 %if %{build_server_package}
 %package server
 Summary: Server-side modules for OpenChange
+Group: Applications/System
 Requires: openchange = %{version}-%{release}
 Requires: sqlite
 
@@ -173,11 +174,9 @@ This package provides the server elements for OpenChange.
 %patch14 -p1 -b .covscan
 %patch15 -p1 -b .samba-4.10-macros
 %patch16 -p1 -b .samba-4.11
-%patch17 -p1 -b .samba-4.12
+%patch17 -p1 -b .samba-4.11.2
-%patch18 -p1 -b .samba-4.13
+%patch18 -p1 -b .samba-4.12
-%if !%{build_server_package}
+%patch19 -p1 -b .samba-4.13
-%patch19 -p1 -b .disable-server-reqs
-%endif
 %patch20 -p1 -b .samba-4.15
 
 %build
@@ -207,7 +206,7 @@ xsltproc -o openchange-libmapi++.devhelp --stringparam "booktitle" "C++ bindings
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%make_install
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # This makes the right links, as rpmlint requires that the
 # ldconfig-created links be recorded in the RPM.
@@ -263,10 +262,14 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi++
 cp openchange-libmapi++.devhelp $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi++
 cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi++
 
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %if %{build_server_package}
-%ldconfig_scriptlets server
+%post server -p /sbin/ldconfig
+
+%postun server -p /sbin/ldconfig
 %endif
 
 %files
@@ -323,71 +326,39 @@ cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchan
 %endif
 
 %changelog
-* Wed May 31 2023 Milan Crha <mcrha@redhat.com> - 2.3-41
+* Wed May 31 2023 Milan Crha <mcrha@redhat.com> - 2.3-32
-- Related: #2190415 (Rebuild against samba 4.18)
+- Related: #2190417 (Rebuild for samba rebase to 4.18.x)
 
-* Thu Oct 27 2022 Milan Crha <mcrha@redhat.com> - 2.3-40
+* Thu Oct 27 2022 Milan Crha <mcrha@redhat.com> - 2.3-31
-- Related: #2131993 (Rebuild against samba 4.17)
+- Related: #2132051 - Rebuild for samba rebase to 4.17.x
 
-* Wed May 04 2022 Milan Crha <mcrha@redhat.com> - 2.3-39
+* Wed May 04 2022 Milan Crha <mcrha@redhat.com> - 2.3-30
-- Related: #2081618 (Rebuild against samba 4.16)
+- Related: #2081620 - Rebuild for samba rebase to 4.16.x
 
-* Wed Dec 01 2021 Milan Crha <mcrha@redhat.com> - 2.3-38
+* Thu Nov 25 2021 Milan Crha <mcrha@redhat.com> - 2.3-29
-- Related: #2013578 (Add patch to build against samba 4.15)
+- Related: #2013596 - Rebuild for samba rebase to 4.15.x
-- Avoid build time dependencies related to server, when it's not built
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.3-37
+* Wed May 12 2021 Milan Crha <mcrha@redhat.com> - 2.3-28
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Related: #1944657 - Rebuild for samba rebase to 4.14.4
-  Related: rhbz#1991688
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3-36
+* Fri Nov 13 2020 Milan Crha <mcrha@redhat.com> - 2.3-27
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuild for newer samba
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-35
+* Mon Jun 08 2020 Milan Crha <mcrha@redhat.com> - 2.3-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* 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
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2.3-32
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 27 2020 Milan Crha <mcrha@redhat.com> - 2.3-30
 - Add patch to build against samba 4.12
 
-* Fri Aug 30 2019 Milan Crha <mcrha@redhat.com> - 2.3-29
+* Mon Apr 20 2020 Milan Crha <mcrha@redhat.com> - 2.3-25
-- Rebuild for newer libldb
+- Add patch to build against samba 4.11.2
-- Add patch to build against samba 4.11
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-28
+* Mon Dec 02 2019 Milan Crha <mcrha@redhat.com> - 2.3-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+- Rebuild for newer samba and libldb
 
-* Thu Feb 14 2019 Milan Crha <mcrha@redhat.com> - 2.3-27
+* Thu Jul 19 2018 Milan Crha <mcrha@redhat.com> - 2.3-23
-- Add patch to build against samba 4.10 semi-public macro changes
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 19 2018 Milan Crha <mcrha@redhat.com> - 2.3-25
 - Address some of the Coverity Scan and clang issues
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-24
+* Tue Apr 17 2018 Milan Crha <mcrha@redhat.com> - 2.3-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Apr 17 2018 Milan Crha <mcrha@redhat.com> - 2.3-23
 - Switch to python3 (partly) and disable python3 build dependency by default
 
-* Mon Mar 19 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.3-22
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
 * Wed Mar 07 2018 Milan Crha <mcrha@redhat.com> - 2.3-21
 - Do not copy content of libmapi++/ into includedir (RH bug #1548719)