--- rpms/e-smith-base/sme10/e-smith-base.spec 2016/04/13 15:06:37 1.15 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2017/04/12 21:53:32 1.36 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.14 2016/04/12 07:23:30 unnilennium Exp $ +# $Id: e-smith-base.spec,v 1.35 2017/02/27 23:32:32 unnilennium Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 13 +%define release 33 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -16,8 +16,25 @@ Patch2: e-smith-base-5.8.0-remove_ctrlal Patch3: e-smith-base-5.8.0-movese_services_to_systemd.patch Patch4: e-smith-base-5.8.0-LOCALE.patch Patch5: e-smith-base-5.8.0-install_on_every_reboot.patch +Patch6: e-smith-base-5.8.0-PasswordSet.patch +Patch7: e-smith-base-5.8.0-console_wrapper.patch +Patch8: e-smith-base-5.8.0-postinstall.patch +Patch9: e-smith-base-5.8.0-fix_forward_field_display.patch +Patch10: e-smith-base-5.8.0.bz9631.SetHostnameByHostnamectl.patch +Patch11: e-smith-base-5.8.0.bz9398.DeprecatedRsyslogSyntax.patch +Patch12: e-smith-base-5.8.0.bz9641.fix-startup-path.patch +Patch13: e-smith-base-5.8.0-mariadb.patch +Patch14: e-smith-base-5.8.0.bz9687.local-link.patch +Patch15: e-smith-base-5.8.0-bz9688.skipredirect.patch +Patch16: e-smith-base-5.8.0-bz9672.servicesystemd.patch +Patch17: e-smith-base-5.8.0.bz9724.locale_sysconfig.patch +Patch18: e-smith-base-5.8.0-allow_32bits_mask.patch +Patch19: e-smith-base-5.8.0-ip_route_syntax.patch +Patch20: e-smith-base-5.8.0.bz9550.fixconsolerestore.patch +Patch21: e-smith-base-5.8.0.bz10121-moretranslationlinks.patch +Patch22: e-smith-base-5.8.0.bz9478-move-smtpd-to-qpsmtpd.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot -BuildArch: noarch Requires: pwauth Requires: e-smith-lib >= 2.2.0-2 Requires: server-manager-images, server-manager @@ -44,6 +61,7 @@ Requires: diald Requires: /usr/bin/passwd Requires: nss-pam-ldapd Requires: uuid-perl +Requires: kbd Obsoletes: nss_ldap < 254 Requires: cpu >= 1.4.3 Obsoletes: rlinetd, e-smith-mod_ssl @@ -61,6 +79,65 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Wed Apr 12 2017 Jean-Philipe Pialasse 5.8.0-33.sme +- change smtpd to qpsmtpd for default service access [SME: 9478] + +* Mon Feb 27 2017 Jean-Philipe Pialasse 5.8.0-32.sme +- add translation links for manager to most language variations we support [SME: 11121] + +* Fri Feb 17 2017 Jean-Philipe Pialasse 5.8.0-31.sme +- prevent restoration from being called on regular and post-upgrade reboot [SME: 9550] +- console restoration can be launched again from console + +* Thu Feb 9 2017 Daniel Berteaud 5.8.0-30.sme +- Use ip route syntax to define routes to local network [SME: 10083] + +* Tue Sep 6 2016 Daniel Berteaud 5.8.0-29.sme +- Allow /32 masks on the external interface, in which case we don't + check if the gateway is on the correct network) [SME: 9610] + +* Thu Aug 04 2016 Jean-Philipe Pialasse 5.8.0-28.sme +- fix config db locale property [SME: 9724] + +* Sat Jul 23 2016 Jean-Philipe Pialasse 5.8.0-27.sme +- adapt e-smith service command to systemd [SME: 9672] + +* Fri Jul 22 2016 Jean-Philipe Pialasse 5.8.0-26.sme +- add systemd skip redirect to e-smith-service [SME: 9688] + +* Thu Jul 21 2016 Jean-Philipe Pialasse 5.8.0-25.sme +- fix broken link /etc/init.d/supervise/local link [SME: 9687] + +* Mon Jul 18 2016 Jean-Philipe Pialasse 5.8.0-22.sme +- fix mysqld to mariadb [SME: 9438] + +* Sat Jul 16 2016 Jean-Philipe Pialasse 5.8.0-21.sme +- fix missing path to chkconfig [SME: 9641] + +* Thu Jul 14 2016 stephane de Labrusse 5.8.0-20.sme +- Fix deprecated syntax '*' in rsyslog [SME: 9398] +- Added e-smith-base-5.8.0.bz9398.DeprecatedRsyslogSyntax.patch + +* Mon Jul 4 2016 stephane de Labrusse 5.8.0-19.sme +- Set the hostname by hostnamectl [SME: 9631] +- Stefano Zamboni + +* Sun Jun 12 2016 Jean-Philipe Pialasse 5.8.0-18.sme +- fix Lang and keyboard layout configured are not used [SME: 9539] + +* Thu Jun 2 2016 Daniel Berteaud 5.8.0-17.sme +- Fix display of email forward fields since smtpd entry has been merged + qpsmtpd [SME: 9552] + +* Sun May 29 2016 Jean-Philipe Pialasse 5.8.0-16.sme +- Allow bootstrap to start services after post-install configuration [SME: 9530] + +* Thu May 12 2016 Daniel Berteaud 5.8.0-15.sme +- Use a C wrapper for the console to replace perl-suid [SME: 9393] + +* Wed Apr 13 2016 Jean-Philipe Pialasse 5.8.0-14.sme +- fix password not asked after signal-event post-install [SME: 9445] + * Wed Apr 13 2016 Jean-Philipe Pialasse 5.8.0-13.sme - only start services on regular boot [SME: 9436] @@ -1832,6 +1909,23 @@ e-smith server and gateway software - ba %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \ @@ -1851,11 +1945,13 @@ done /sbin/e-smith/generate-lexicons -xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console +xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console.pl perl createlinks /sbin/e-smith/buildtests 10e-smith-base +gcc -o root/sbin/e-smith/console console_wrapper.c + %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/selinux