--- rpms/smeserver-mailman/contribs10/smeserver-mailman.spec	2021/02/22 17:16:35	1.3
+++ rpms/smeserver-mailman/contribs10/smeserver-mailman.spec	2022/04/10 21:14:10	1.8
@@ -1,4 +1,4 @@
-# $Id: smeserver-mailman.spec,v 1.2 2021/02/22 17:02:30 jpp Exp $
+# $Id: smeserver-mailman.spec,v 1.7 2022/04/10 20:18:28 jpp Exp $
 # Authority: gordonr
 # Name: Gordon Rowell
 
@@ -9,7 +9,7 @@ Summary: Mailman configuration for SME s
 %define name smeserver-mailman
 Name: %{name}
 %define version 1.5.0
-%define release 8
+%define release 13
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -27,11 +27,30 @@ Provides: e-smith-mailman
 AutoReqProv: no
 Patch0: smeserver-mailman-1.5.0.bz2411.Backup_mailman.patch
 Patch1: smeserver-mailman-1.5.0-locale-2016-03-09.patch
+Patch2: smeserver-mailman-1.5.0-locale-2021-08-22.patch
+Patch3: smeserver-mailman-1.5.0-bz11278-systemd.patch
+Patch4: smeserver-mailman-1.5.0-bz11278-wrapper.patch
 
 %description
 Add Mailman integration to the SME server.
 
 %changelog
+* Sun Apr 10 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.5.0-13.sme
+- add c wrapper with setuid [SME: 11278]
+
+* Sun Apr 10 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.5.0-12.sme
+- fix missing service start [SME: 11278]
+  add update event
+
+* Tue Mar 15 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.5.0-11.sme
+- fix www line  should be after apache line in /etc/group [SME: 8056]
+
+* Mon Aug 23 2021 Terry Fage <terry.fage@gmail.com> 1.5.0-10.sme
+- apply locale 2021-08-22 patch
+
+* Thu Jun 03 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.5.0-9.sme
+- fix conflicting folders [SME: 11278]
+
 * Mon Feb 22 2021 JP Pialasse <tests@pialasse.com> 1.5.0-8.sme
 - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
   by assuming the date is correct and changing the weekday.
@@ -299,12 +318,15 @@ Add Mailman integration to the SME serve
 %setup
 %patch0 -p1
 %patch1 -p1
-
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 #/bin/rm -r root/opt/mailman
 
 %build
 perl createlinks
+gcc -o root//usr/lib/mailman/bin/smelist smelist.c
 mkdir -p root/usr/lib/mailman/aliases
 
 mkdir -p root/opt
@@ -315,20 +337,16 @@ do
     mkdir -p root/var/spool/mailman/qfiles/$dir
 done
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f e-smith-%{version}-filelist
 /sbin/e-smith/genfilelist \
-    --dir '/usr/lib/mailman' 'attr(02775,root,mailman)' \
-    --dir '/usr/lib/mailman/bin' 'attr(02775,root,mailman)' \
     --dir '/var/spool/mailman' 'attr(02775,root,mailman)' \
     --dir '/usr/lib/mailman/aliases' 'attr(02775,mailman,mailman)' \
     --file '/usr/lib/mailman/bin/post-install' 'attr(0755,root,mailman)' \
     --file '/usr/lib/mailman/bin/smelist' 'attr(04755,root,mailman)' \
-    --dir '/usr/lib/mailman/Mailman' 'attr(02775,root,mailman)' \
-    --dir '/usr/lib/mailman/Mailman/MTA' 'attr(02775,root,mailman)' \
+    --file '/usr/lib/mailman/bin/smelist.pl' 'attr(02755,root,root)' \
     --file '/usr/lib/mailman/Mailman/MTA/SME.py' 'attr(02775,root,mailman)' \
     --dir  '/var/spool/mailman/qfiles' 'attr(02770,mailman,mailman)' \
     --dir  '/var/spool/mailman/qfiles/archive' 'attr(02770,mailman,mailman)' \
@@ -342,6 +360,13 @@ rm -f e-smith-%{version}-filelist
     --dir  '/var/spool/mailman/qfiles/virgin' 'attr(02770,mailman,mailman)' \
     $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 
+sed -i -e '/\/usr\/lib\/mailman$/d ; /\/usr\/lib\/mailman\/bin$/d ; /\/usr\/lib\/mailman\/Mailman$/d ; /\/usr\/lib\/mailman\/Mailman\/MTA$/d ' %{name}-%{version}-filelist
+#those will conflict with mailman rpm on sme10
+#    --dir '/usr/lib/mailman' 'attr(02775,root,mailman)' \
+#    --dir '/usr/lib/mailman/bin' 'attr(02775,root,mailman)' \
+#   --dir '/usr/lib/mailman/Mailman' 'attr(02775,root,mailman)' \
+#  --dir '/usr/lib/mailman/Mailman/MTA' 'attr(02775,root,mailman)' \
+
 # SME10 to avoid error 
 #/usr/lib/rpm/brp-python-bytecompile
 # fix for unwanted listed compiled python files
@@ -364,11 +389,9 @@ rm -rf $RPM_BUILD_ROOT
     "Mailman user" /usr/lib/mailman /bin/false
 
 #mailman wants that the apache group appears  before the www group in /etc/group [SME: 8056]
-TEST=$(grep -P '^www|apache' /etc/group)
-TEST2='www:x:102:admin
-apache:x:102:'
-
-if [[ $TEST == $TEST2 ]]; then
+TEST=`egrep "^apache:" /etc/group -n| cut -f1 -d:`
+TEST2=`egrep "^www:" /etc/group -n| cut -f1 -d:`
+if [[ $TEST > $TEST2 ]]; then
     WWW=$(sed -n '/^www/p' /etc/group)
     sed -i '/^www/d' /etc/group
     echo $WWW >> /etc/group