From 2e293cabd903870988afadbf6da56041144ee815 Mon Sep 17 00:00:00 2001
From: "Jean-Marc Pigeon (Delson)" <jmp@safe.ca>
Date: Sun, 22 Jun 2025 14:25:03 -0400
Subject: [PATCH] Working out reading email for dovecot

---
 Makefile                    | 8 ++++++--
 Makefile.dist               | 2 +-
 conf/{ => dovecot}/passfile | 0
 mailleur.spec.in            | 6 +++---
 4 files changed, 10 insertions(+), 6 deletions(-)
 rename conf/{ => dovecot}/passfile (100%)

diff --git a/Makefile b/Makefile
index 88fbbbb..26f503e 100644
--- a/Makefile
+++ b/Makefile
@@ -195,20 +195,24 @@ install	:
 	   @ # Creating all needed system directory
 	   @ install -d $(DESTDIR)/$(DATADIR)/$(APPN)/
 	   @ install -d $(DESTDIR)/$(ETCDIR)/$(APPN)/
+	   @ install -d $(DESTDIR)/$(ETCDIR)/$(APPN)/dovecot
 	   @ install -d $(DESTDIR)/$(ETCDIR)/pki/$(APPN)/
 	   @ install -d $(DESTDIR)/$(ETCDIR)/sysconfig/
 	   @ install -d $(DESTDIR)/$(LIBDIR)/$(APPN)/
 	   @ install -d $(DESTDIR)/$(SBINDIR)/
-	   @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/queue
 	   @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/in-logs
+	   @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/mails
+	   @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/queue
 	   @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/out-logs
 	   @ cp -a					\
 		bin/*					\
 	   	$(DESTDIR)/$(SBINDIR)/
 	   @ cp -a					\
 		conf/$(APPN).conf			\
-		conf/passfile				\
 	   	$(DESTDIR)/$(ETCDIR)/$(APPN)
+	   @ cp -a					\
+		conf/dovecot				\
+	   	$(DESTDIR)/$(ETCDIR)/$(APPN)/
 	   @ cp -a					\
 		certs/root-safe_CA.pem			\
 	   	$(DESTDIR)/$(ETCDIR)/pki/$(APPN)
diff --git a/Makefile.dist b/Makefile.dist
index a081014..54b92af 100644
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -47,7 +47,7 @@ tarfile	: clean
 		$(APLV)/certs/
 	  @ cp -a 						\
 		conf/*.conf					\
-		conf/passfile					\
+		conf/dovecot					\
 		$(APLV)/conf/
 	  @ cp -a lib/{*.c,*.h} $(APLV)/lib/
 	  @ cp -a linux/*	$(APLV)/linux/
diff --git a/conf/passfile b/conf/dovecot/passfile
similarity index 100%
rename from conf/passfile
rename to conf/dovecot/passfile
diff --git a/mailleur.spec.in b/mailleur.spec.in
index ba1f4eb..d6adb23 100644
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -31,12 +31,12 @@ search about email exchange within time and transaction context.
 #-----------------------------------------------------------------------------
 %files			
 %defattr(-,root,root,-)
-%attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%attr(0640,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/passfile
 %attr(0755,root,root) %{_datadir}/%{name}/linux/osukiss/receiver
 %attr(0755,root,root) %{_datadir}/%{name}/linux/osukiss/sorter
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/pki/%{name}/*
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%{_sysconfdir}/%{name}/dovecot/passfile
 %{_sbindir}/chkspf
 %{_sbindir}/feeder
 %attr(0755,%{name},mail) %{_sbindir}/receiver
@@ -47,7 +47,7 @@ search about email exchange within time and transaction context.
 %attr(0754,root,root) %{_libdir}/%{name}/support/crdb.sh
 %attr(0754,root,root) %{_libdir}/%{name}/support/dummy-cert.sh
 %attr(0754,root,root) %{_libdir}/%{name}/support/starting.sh
-%attr(0755,%{name},mail) %dir %{spooldir}/%{name}/{queue,in-logs,out-logs}
+%attr(0755,%{name},mail) %dir %{spooldir}/%{name}/{in-logs,mails,queue,out-logs}
 #-----------------------------------------------------------------------------
 
 %preun
-- 
2.47.3