--- rpms/e-smith-base/sme10/e-smith-base.spec	2020/06/23 19:01:52	1.49
+++ rpms/e-smith-base/sme10/e-smith-base.spec	2020/06/28 02:45:31	1.50
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.48 2020/05/25 02:32:01 jpp Exp $
+# $Id: e-smith-base.spec,v 1.49 2020/06/23 19:01:52 jpp Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.8.0
-%define release 45
+%define release 46
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -41,6 +41,7 @@ Patch27: e-smith-base-5.8.0-bz9677-suid_
 Patch28: e-smith-base-5.8.0-enable_smartd.patch
 Patch29: e-smith-base-5.8.0.bz8156.wildcard-certificate-and-subjaltname.patch
 Patch30: e-smith-base-5.8.0-bz9590-cleanup.patch
+Patch31: e-smith-base-5.8.0-bz6536-bz10974-validate_subnet.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: pwauth
@@ -54,6 +55,7 @@ Requires: perl(Crypt::Cracklib)
 Requires: perl(Date::Manip)
 Requires: perl(Net::IPv4Addr)
 Requires: perl(Digest::SHA1)
+Requires: perl(Net::Netmask)
 Requires: /usr/sbin/irqbalance
 Requires: /usr/sbin/smartd
 Requires: dbus
@@ -87,6 +89,12 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-46.sme
+- validate submask on remote access panel [SME: 6536]
+  accept netmask bit and convert it
+- validate subnet mask on local network panel [SME: 10974]
+  accept netmask bit and convert it
+
 * Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-45.sme
 - remove info.txt [SME: 9590]
 
@@ -1986,6 +1994,8 @@ e-smith server and gateway software - ba
 %patch29 -p1
 %patch30 -p1
 rm  -rf root/home/e-smith/web/common/edition/info.txt
+%patch31 -p1
+
 
 %pre
 /sbin/e-smith/create-system-user smelastsys 2999 \