--- rpms/e-smith-base/sme9/e-smith-base.spec 2013/12/15 01:21:33 1.58 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2019/01/27 03:48:47 1.110 @@ -1,65 +1,44 @@ -# $Id: e-smith-base.spec,v 1.57 2013/12/15 00:54:07 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.4.0 -%define release 55 +%define version 5.6.0 +%define release 36 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz -Patch0: e-smith-base-5.4.0-runlevel_4.patch -Patch1: e-smith-base-5.4.0-local_event.patch -Patch2: e-smith-base-5.4.0-noapmd.patch -Patch3: e-smith-base-5.4.0-rsysloglink.patch -Patch4: e-smith-base-5.4.0-optimize_user_modify_unix.patch -Patch5: e-smith-base-5.4.0-user_modify_in_bootstrap.patch -Patch6: e-smith-base-5.4.0-pppoeMlimit.patch -Patch7: e-smith-base-5.4.0-microcode.patch -Patch8: e-smith-base-5.4.0-PostUpgradeRestore.patch -Patch9: e-smith-base-5.4.0-inittab.patch -Patch10: e-smith-base-5.4.0-pwauth.patch -Patch11: e-smith-base-5.4.0-uidgid.patch -Patch12: e-smith-base-5.4.0-fixwww.patch -Patch13: e-smith-base-5.4.0-SystemName.patch -Patch14: e-smith-base-5.4.0-existing_hwaddr.patch -Patch15: e-smith-base-5.4.0-remove_syslogd_templates.patch -Patch16: e-smith-base-5.4.0-rsyslog_templates.patch -Patch17: e-smith-base-5.4.0-rsyslog_db.patch -Patch18: e-smith-base-5.4.0-rsyslog.conf.patch -Patch19: e-smith-base-5.4.0-rate_limit.patch -Patch20: e-smith-base-5.4.0-no_modprobe.patch -Patch21: e-smith-base-5.4.0-more_rsyslog.patch -Patch22: e-smith-base-5.4.0-ConsoleBackupText.patch -Patch23: e-smith-base-5.4.0-NICBonding.patch -Patch24: e-smith-base-5.4.0-rename_pam_ldap_conf.patch -Patch25: e-smith-base-5.4.0-fix_bash-in_run_pppoe_conf.patch -Patch26: e-smith-base-5.4.0-StartService.patch -Patch27: e-smith-base-5.4.0-rcesmith-removal.patch -Patch28: e-smith-base-5.4.0-add_template_to_ssl.pem.patch -Patch29: e-smith-base-5.4.0-init-accounts.patch -Patch30: e-smith-base-5.4.0-do_not_remove_utf8.patch -Patch31: e-smith-base-5.4.0-space_lf_on_receive.patch -Patch32: e-smith-base-5.4.0-disable_ipv6.patch -Patch33: e-smith-base-5.4.0-fix_group_create_with_ldap_auth.patch -Patch34: e-smith-base-5.4.0-OldSystemName.patch -Patch35: e-smith-base-5.4.0-OldServerName.patch -Patch36: e-smith-base-5.4.0-ConsoleBackupCompressionLevel.patch -Patch37: e-smith-base-5.4.0-ConsoleBackupBetterText.patch -Patch38: e-smith-base-5.4.0-pwauth_ibay.patch -Patch39: e-smith-base-5.4.0-manageRAID.patch -Patch40: e-smith-base-5.4.0-add_new_disk_to_raid1.patch -Patch41: e-smith-base-5.4.0-remove_hwaddress.patch -Patch42: e-smith-base-5.4.0-do_not_hardcode_nic_names.patch -Patch43: e-smith-base-5.4.0-remove_interface_swap.patch -Patch44: e-smith-base-5.4.0-define_udev_post_service.patch -Patch45: e-smith-base-5.4.0-load_bonding.patch -Patch46: e-smith-base-5.4.0-add_bond0_templates_metadata_back.patch -Patch47: e-smith-base-5.4.0-dont_reload_init.patch -Patch48: e-smith-base-5.4.0-set_servername.patch -Patch49: e-smith-base-5.4.0-restart_rsyslog.patch +Patch1: e-smith-base-5.6.0-console.patch +Patch2: e-smith-base-5.6.0_added_verification_of_pptp_clients_against_dhcp.patch +Patch3: e-smith-base-5.6.0_console_verification_dhcp_vs_pptp.patch +Patch4: e-smith-base-5.6.0_remove_10runparts_for_anacron_compatibility.patch +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 +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 @@ -75,7 +54,6 @@ Requires: perl(Data::UUID) Requires: perl(Net::IPv4Addr) Requires: /usr/sbin/irqbalance Requires: /usr/sbin/cpuspeed -Requires: /sbin/microcode_ctl Requires: /usr/sbin/smartd Requires: dbus Requires: hal @@ -108,6 +86,149 @@ 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] + +* 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.sme +- Fix PPPoE after a post-upgrade [SME: 8493] + +* Thu Jul 3 2014 Ian Wells 5.6.0-8.sme +- Remove dependency on microcode_ctl [SME: 8468] + +* Sun May 11 2014 stephane de Labrusse 5.6.0-7.sme +- Prevent emailing about the normal, weekly, checks of RAID arrays, by Mark Casey +- [SME: 7748] + +* Tue May 06 2014 stephane de Labrusse 5.6.0-6.sme +- remove /etc/e-smith/templates/etc/crontab/10runparts for anacron compatibility +- [SME: 8364] + +* Wed Apr 23 2014 stephane de Labrusse 5.6.0-5.sme +- Add a verification in the console of number of pptp clients against ip allowed in dhcpd +- [SME: 8312] + +* Sun Apr 6 2014 stephane de Labrusse 5.6.0-4.sme +- Add a verification in remoteaccess panel of number of pptp clients against ip allowed in dhcpd +- [SME: 8312] + +* Sat Apr 5 2014 Ian Wells 5.6.0-3.sme +- Ensure console is run with taint checking [SME: 8311] +- Non-functional perl::Critic changes. + +* Sun Mar 23 2014 Ian Wells 5.6.0-2.sme +- Roll new stream to really remove obsolete images [SME: 7962] + +* Sun Mar 23 2014 Ian Wells 5.6.0-1.sme +- Roll new stream to remove obsolete images [SME: 7962] + +* Thu Mar 20 2014 Ian Wells 5.4.0-62.sme +- Move console backup to e-smith-backup [SME: 3324] + +* Sun Mar 16 2014 Ian Wells 5.4.0-61.sme +- Remove support.pl from e-smith-base and move to smeserver-support [SME: 8264] + +* Sat Mar 15 2014 Ian Wells 5.4.0-60.sme +- Console restore should reboot [SME: 8259] + +* Sat Mar 8 2014 Ian Wells 5.4.0-59.sme +- Boostrap console should only offer restore if no password set [SME: 8259] + +* Thu Mar 6 2014 Ian Wells 5.4.0-58.sme +- Add restore backup as a console item for freshly installed servers [SME: 8259] +- Non-code changes to perform_restore.pm + +* Sun Feb 16 2014 Ian Wells 5.4.0-57.sme +- Refer to removable media not CDROM in console restore [SME: 8214] + +* Tue Jan 28 2014 Ian Wells 5.4.0-56.sme +- Remove insecure SSL ciphers [SME: 8138] + * Sun Dec 15 2013 Daniel Berteaud 5.4.0-55.sme - Restart rsyslog in logrotate event [SME: 8065] @@ -197,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 @@ -593,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 @@ -1010,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 @@ -1156,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 @@ -1206,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 @@ -1294,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 @@ -1706,7 +1834,6 @@ e-smith server and gateway software - ba %prep %setup -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -1735,31 +1862,6 @@ e-smith server and gateway software - ba %patch26 -p1 %patch27 -p1 %patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 - -# We cannot remove an empy files or folders with a patch, see [SME: 7289] -# We remove this because it contains an empty template-begin file -rm -rf root/etc/e-smith/templates/etc/ldap.secret/ %pre /sbin/e-smith/create-system-user smelastsys 2999 \ @@ -1786,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)' \ @@ -1837,6 +1940,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