--- rpms/e-smith-base/sme9/e-smith-base.spec 2015/06/11 20:13:30 1.90 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2019/01/27 03:48:47 1.110 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.89 2015/03/31 16:52:29 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.109 2019/01/27 03:46:41 jpp Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.6.0 -%define release 20 +%define release 36 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -25,6 +25,20 @@ Patch12: e-smith-base-5.6.0-default_to_n Patch13: e-smith-base-5.6.0-only_reset_access_for_private_server.patch Patch14: e-smith-base-5.6.0-only_fire_ip_change_on_wan.patch Patch15: e-smith-base-5.6.0-dummy_nic.patch +Patch16: e-smith-base-5.6.0-disable_selinux.patch +Patch17: e-smith-base-5.6.0_sha256_cert.patch +Patch18: e-smith-base-5.6.0-update_mime_types.patch +Patch19: e-smith-base-5.6.0-ssl_update.patch +Patch20: e-smith-base-5.6.0-reload_ssl_when_renew_cert.patch +Patch21: e-smith-base-5.6.0-display_http_server_manager.patch +Patch22: e-smith-base-5.6.0-add_forward_column.patch +Patch23: e-smith-base-5.6.0-allow_32bits_mask.patch +Patch24: e-smith-base-5.6.0-ip_route_syntax.patch +Patch25: e-smith-base-5.8.0-expand_route_bond0.patch +Patch26: e-smith-base-5.6.0.bz10520.xinet-cleaning.patch +Patch27: e-smith-base-5.6.0-modify-default-city.patch +Patch28: e-smith-base-5.6.0.bz10455.dhcpd-posttransaction.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -72,6 +86,61 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sat Jan 26 2019 Jean-Philipe Pialasse 5.6.0-36.sme +- fix unwanted start of non SME dhcpd deamon on update [SME: 10455] +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, + by assuming the date is correct and changing the weekday. + +* Sun Nov 25 2018 John Crisp 5.6.0-35.sme +- modify the default city and company [SME: 8168] + +* Tue Feb 13 2018 Jean-Philipe Pialasse 5.6.0-34.sme +- cleaning xinetd.conf fragment out of the package [SME: 10520] + +* Wed Nov 15 2017 Jean-Philipe Pialasse 5.6.0-33.sme +- revert previous change, wrong package + +* Wed Nov 15 2017 Jean-Philipe Pialasse 5.6.0-32.sme +- added post transaction rule for ntp [SME: 10454] +- backport of SME10 [SME: 10190] +- thank you to Stefano Zamboni for this work + +* Thu May 4 2017 Daniel Berteaud 5.6.0-31.sme +- Backport from sme10: Expand route-bond0 when nic bonding is enabled + [SME: 10270] + +* Thu Feb 9 2017 Daniel Berteaud 5.6.0-30.sme +- Use ip route syntax to define routes to local network [SME: 9905] + +* Tue Sep 13 2016 Daniel Berteaud 5.6.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: 9765] + +* Sun Jan 31 2016 Daniel Berteaud 5.6.0-28.sme +- Add a column to display forwarding address [SME: 9174] + +* Sun Jan 31 2016 Daniel Berteaud 5.6.0-27.sme +- Correctly display http URL to the server-manager in the console [SME: 9163] + +* Sun Jan 17 2016 Daniel Berteaud 5.6.0-26.sme +- Fire ssl-update event when default cert is renewed [SME: 2257] + +* Sun Jan 17 2016 Daniel Berteaud 5.6.0-25.sme +- Expand /home/e-smith/ssl.pem/pem during ssl-update [SME: 9152] + +* Wed Sep 30 2015 Daniel Berteaud 5.6.0-24.sme + Tue Sep 30 2015 --> Tue Sep 29 2015 or Wed Sep 30 2015 or Tue Oct 06 2015 or .... +- Update /etc/mime.types templates [SME: 9078] + +* Mon Aug 24 2015 Charlie Brady 5.6.0-23.sme +- Use sha256 algorithm for signature of SSL cert. [SME: 8615] + +* Thu Jun 25 2015 Daniel Berteaud 5.6.0-22.sme +- Fix including /etc/selinux directory [SME: 8954] + +* Thu Jun 25 2015 Daniel Berteaud 5.6.0-21.sme +- Add templates for /etc/selinux/config [SME: 8954] + * Thu Jun 11 2015 Daniel Berteaud 5.6.0-20.sme - Add dummy NIC support as InternalInterface [SME: 7200] @@ -249,7 +318,8 @@ e-smith server and gateway software - ba * Mon Apr 22 2013 Ian Wells 5.4.0-28.sme - Replacement of rc.e-smith by moving code into e-smith-service [SME: 7267] -* Mon Apr 21 2013 chris burnat 5.4.0-27.sme +* Sun Apr 21 2013 chris burnat 5.4.0-27.sme + Mon Apr 21 2013 --> Mon Apr 15 2013 or Sun Apr 21 2013 or Mon Apr 22 2013 or .... - Fix the way '.' works in bash [SME: 7532] * Fri Mar 22 2013 Daniel Berteaud 5.4.0-26.sme @@ -645,19 +715,19 @@ e-smith server and gateway software - ba * Wed Mar 12 2008 Shad L. Lords 4.18.0-100 - Cleanup SAVE/ADD tag mixup [SME: 4045] -* Sat Mar 10 2008 Shad L. Lords 4.18-99 +* Mon Mar 10 2008 Shad L. Lords 4.18-99 - Fix dyndns custom gettext [SME: 4032] -* Sat Mar 07 2008 Stephen Noble 4.18-98 +* Fri Mar 07 2008 Stephen Noble 4.18-98 - revised gettext messages [SME: 631] -* Sat Mar 07 2008 Stephen Noble 4.18-97 +* Fri Mar 07 2008 Stephen Noble 4.18-97 - gettext messages [SME: 631] -* Sat Mar 07 2008 Stephen Noble 4.18-96 +* Fri Mar 07 2008 Stephen Noble 4.18-96 - remove duplicate system password has been changed [SME: 3974] -* Sat Mar 07 2008 Stephen Noble 4.18-95 +* Fri Mar 07 2008 Stephen Noble 4.18-95 - EthernetAssign shouldn't be translated [SME: 3947] * Sun Feb 17 2008 Stephen Noble 4.18-94 @@ -1062,12 +1132,14 @@ e-smith server and gateway software - ba * Fri Jun 9 2006 Gavin Weight 4.16.0-24 - Remove lines for creating symlink to statusreport from spec file. [SME: 450] -* Mon Jun 6 2006 Gordon Rowell 4.16.0-23 +* Tue Jun 06 2006 Gordon Rowell 4.16.0-23 + Mon Jun 06 2006 --> Mon Jun 05 2006 or Tue Jun 06 2006 or Mon Jun 12 2006 or .... - Allow for admin account when locking null passwords, and perform check in post-upgrade so that the password screen will be presented after the reboot [SME: 1529] -* Mon Jun 6 2006 Gordon Rowell 4.16.0-22 +* Tue Jun 06 2006 Gordon Rowell 4.16.0-22 + Mon Jun 06 2006 --> Mon Jun 05 2006 or Tue Jun 06 2006 or Mon Jun 12 2006 or .... - Correct argument ordering in last change [SME: 790, SME: 1541] * Sun May 28 2006 Charlie Brady 4.16.0-21 @@ -1208,7 +1280,8 @@ e-smith server and gateway software - ba * Wed Feb 22 2006 Charlie Brady 4.15.9-04 - Remove default fragment for AdminEmail [SME: 863] -* Mon Feb 21 2006 Gordon Rowell 4.15.9-03 +* Tue Feb 21 2006 Gordon Rowell 4.15.9-03 + Mon Feb 21 2006 --> Mon Feb 20 2006 or Tue Feb 21 2006 or Mon Feb 27 2006 or .... - Change 'Reconfigure' to lower case in menu [SME: 2] * Mon Feb 20 2006 Gordon Rowell 4.15.9-02 @@ -1258,7 +1331,8 @@ e-smith server and gateway software - ba * Sat Feb 11 2006 Shad L. Lords 4.15.8-50 - Run kudzu -q from inittab [SME: 727] -* Tue Feb 9 2006 Charlie Brady 4.15.8-49 +* Thu Feb 09 2006 Charlie Brady 4.15.8-49 + Tue Feb 09 2006 --> Tue Feb 07 2006 or Thu Feb 09 2006 or Tue Feb 14 2006 or .... - Make bootp support optional, defaulting to 'deny'. [SME: 660] * Thu Feb 9 2006 Gavin Weight 4.15.8-48 @@ -1346,14 +1420,16 @@ e-smith server and gateway software - ba - Don't add obsolete ipsec net-pf aliases to modprobe.conf, and remove them if found. [SME: 390] -* Sun Jan 2 2006 Charlie Brady 4.15.8-23 +* Mon Jan 02 2006 Charlie Brady 4.15.8-23 + Sun Jan 02 2006 --> Sun Jan 01 2006 or Mon Jan 02 2006 or Sun Jan 08 2006 or .... - Use regexp as well as cracklib to check admin password in console. [SME: 335] * Mon Jan 2 2006 Gordon Rowell 4.15.8-22 - Change heuristic for finding disks in manageRAID.pl [SME: 342] -* Sat Dec 25 2005 Gordon Rowell 4.15.8-21 +* Sun Dec 25 2005 Gordon Rowell 4.15.8-21 + Sat Dec 25 2005 --> Sat Dec 24 2005 or Sun Dec 25 2005 or Sat Dec 31 2005 or .... - Move testInternet console menu item to smeserver-support [SME: 364] * Fri Dec 16 2005 Charlie Brady 4.15.8-20 @@ -1773,6 +1849,19 @@ e-smith server and gateway software - ba %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \ @@ -1799,6 +1888,7 @@ perl createlinks %install rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/etc/selinux (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ --file /etc/cron.daily/conf-mod_ssl 'attr(0544,root,root)' \ @@ -1851,6 +1941,7 @@ rm -rf $RPM_BUILD_ROOT --dir /etc/e-smith/skel/user/.ssh 'attr(0700,root,root)' \ --file /var/service/local/run 'attr(0750,root,root)' \ --file /etc/sysconfig/modules/dummy.modules 'attr(0755,root,root)' \ + --dir /etc/selinux 'attr(0755,root,root)' \ > %{name}-%{version}-%{release}-filelist mkdir -p $RPM_BUILD_ROOT/home/e-smith/db