--- rpms/e-smith-base/sme10/e-smith-base.spec	2019/11/22 14:51:52	1.44
+++ rpms/e-smith-base/sme10/e-smith-base.spec	2019/12/20 19:38:15	1.45
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.43 2019/01/23 04:18:17 jpp Exp $
+# $Id: e-smith-base.spec,v 1.44 2019/11/22 14:51:52 jcrisp Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.8.0
-%define release 40
+%define release 41
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -37,6 +37,7 @@ Patch23: e-smith-base-5.8.0-expand_route
 Patch24: e-smith-base-5.8.0.bz10519.xinet-cleaning.patch
 Patch25: e-smith-base-5.8.0-modify-default-city.patch
 Patch26: e-smith-base-5.8.0.bz8876-set-system-name.patch
+Patch27: e-smith-base-5.8.0-bz9677-suid_wrapper.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: pwauth
@@ -83,6 +84,9 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Wed Dec 18 2019 Michel Begue <mab974@gmail.com> 5.8.0-41.sme
+- Add a link to manager C wrapper to execute userpassword's cgi to replace perl-suid [SME: 9677]
+
 * Fri Nov 22 2019 John Crisp <jcrisp@safeandsoundit.co.uk> 5.8.0-40.sme
 - fix SystemName [SME: 8876]
 
@@ -1956,17 +1960,28 @@ e-smith server and gateway software - ba
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 %pre
 /sbin/e-smith/create-system-user smelastsys 2999 \
     'sme last system user marker' /tmp /bin/false
 
 %post
+LEXICONS=$(find /etc/e-smith/locale/*/etc/e-smith/web/panels/password/cgi-bin/userpassword -type f)
+
+for lexicon in $LEXICONS
+do
+    if [ -f $lexicon ]
+    then
+        cd $(dirname "$lexicon")
+        mv ./userpassword ../../../functions
+    fi
+done
+
 
 %build
 
-LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \
-    -type f | grep -v CVS)
+LEXICONS=$(find root/etc/e-smith/web/functions -type f | grep -v CVS)
 
 for lexicon in $LEXICONS
 do
@@ -1982,6 +1997,10 @@ perl createlinks
 
 gcc -o root/sbin/e-smith/console console_wrapper.c
 
+# Force creation of potentially empty directories
+mkdir -p root/etc/e-smith/web/panels/password/cgi-bin
+ln -s ../../../functions/wrapper root/etc/e-smith/web/panels/password/cgi-bin/userpassword
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/selinux