--- rpms/e-smith-base/sme10/e-smith-base.spec 2020/12/10 03:47:38 1.78 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2020/12/11 17:50:15 1.79 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.77 2020/12/09 16:57:44 jpp Exp $ +# $Id: e-smith-base.spec,v 1.78 2020/12/10 03:47:38 jpp Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 65 +%define release 66 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -58,6 +58,7 @@ Patch44: e-smith-base-5.8.0-bz11229.patc Patch45: e-smith-base-5.8.0-bz11006-lpdexcludeandfewservices.patch Patch46: e-smith-base-5.8.0-bz11231-systemd-preset-all-workaround.patch Patch47: e-smith-base-5.8.0-bz11119-local2systemd.patch +Patch48: e-smith-base-5.8.0-bz11250-drop-pptpd.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: pwauth @@ -99,6 +100,7 @@ Obsoletes: rlinetd, e-smith-mod_ssl Obsoletes: e-smith-serial-console Obsoletes: sshell Obsoletes: e-smith-rp-pppoe +Obsoletes: e-smith-pptpd BuildRequires: perl, perl(Test::Inline) >= 0.12 BuildRequires: e-smith-devtools >= 1.13.1-03 BuildRequires: gettext @@ -110,6 +112,9 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Fri Dec 11 2020 Jean-Philipe Pialasse 5.8.0-66.sme +- drop pptpd support [SME: 11250] + * Wed Dec 09 2020 Jean-Philipe Pialasse 5.8.0-65.sme - add bash-completion [SME: 11244] - improve local service to systemd [SME: 11119] @@ -2112,6 +2117,7 @@ rm root/etc/rc.d/init.d/supervise/dhcpd %patch47 -p1 rm -rf root/var/service/local root/var/service/syslog rm -rf root/etc/rc.d/init.d/local +%patch48 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \