--- rpms/e-smith-base/sme9/e-smith-base.spec 2014/09/10 07:43:21 1.75 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2016/01/31 21:55:35 1.99 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.74 2014/07/25 13:32:54 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.98 2016/01/17 21:30:12 vip-ire Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.6.0 -%define release 10 +%define release 27 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -17,6 +17,20 @@ Patch4: e-smith-base-5.6.0_remove_10runp Patch5: e-smith-base-5.6.0-mdevent.patch Patch6: e-smith-base-5.6.0-pppoe_after_post_upgrade.patch Patch7: e-smith-base-5.6.0-symlink_udev-post.patch +Patch8: e-smith-base-5.6.0-detect_conf_change_single_nic.patch +Patch9: e-smith-base-5.6.0-service_runlevel_4.patch +Patch10: e-smith-base-5.6.0-ensure_apache_alias_www.patch +Patch11: e-smith-base-5.6.0-specify_dhcpd_configuration_file.patch +Patch12: e-smith-base-5.6.0-default_to_no_on_quit_console_app.patch +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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -64,10 +78,62 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Wed Sep 10 2014 Daniel Berteaud 5.6.0-10 +* 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] + +* Tue Sep 30 2015 Daniel Berteaud 5.6.0-24.sme +- 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] + +* Tue Mar 31 2015 Daniel Berteaud 5.6.0-19.sme +- Only fire the ip-change event when IP is assigned to WAN nic + (Code by Charlie Brady and John Crisp) [SME: 8896] + +* Tue Mar 31 2015 Daniel Berteaud 5.6.0-18.sme +- Only reset service access when switching to or from private server mode + (Code by Charlie Brady) [SME: 8879] + +* Sun Jan 11 2015 Stephane de Labrusse 5.6.0-17.sme +- When quiting the console app with unsaved changes set the default selected +- answer to NO Hsing-Foo Wang [SME: 8616] + +* Tue Jan 6 2015 Stephane de Labrusse 5.6.0-16.sme +- Added a comment to specify the real configuration file of dhcpd [SME: 8386] + +* Sat Jan 3 2015 Stephane de Labrusse 5.6.0-15.sme +- Modified the patch of daniel e-smith-base-5.6.0-ensure_apache_alias_www.patch +- Ensure www group exists and that apache is an alias of www [SME: 8549] + +* Sun Nov 2 2014 Daniel Berteaud 5.6.0-13.sme +- Ensure www group exists and that apache is an alias of www [SME: 8549] + +* Sun Nov 2 2014 Daniel Berteaud 5.6.0-12.sme +- Check were running runlevel 4, not 7 in service wrapper [SME: 8637] + +* Sun Sep 21 2014 Daniel Berteaud 5.6.0-11.sme +- Correctly update NIC configuration on single NIC systems [SME: 8561] + +* Wed Sep 10 2014 Daniel Berteaud 5.6.0-10.sme - Symlink udev-post service in rc7 [SME: 8542] -* Fri Jul 25 2014 Daniel Berteaud 5.6.0-9 +* Fri Jul 25 2014 Daniel Berteaud 5.6.0-9.sme - Fix PPPoE after a post-upgrade [SME: 8493] * Thu Jul 3 2014 Ian Wells 5.6.0-8.sme @@ -1726,6 +1792,21 @@ e-smith server and gateway software - ba %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 + %pre /sbin/e-smith/create-system-user smelastsys 2999 \ 'sme last system user marker' /tmp /bin/false @@ -1751,6 +1832,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)' \ @@ -1802,6 +1884,8 @@ rm -rf $RPM_BUILD_ROOT --dir /var/log/ippp 'attr(2750,smelog,smelog)' \ --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