--- rpms/e-smith-base/sme10/e-smith-base.spec 2016/02/04 23:19:17 1.2 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2017/02/27 23:32:32 1.35 @@ -1,17 +1,39 @@ -# $Id: e-smith-base.spec,v 1.1 2016/02/04 23:18:11 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.34 2017/02/17 19:39:37 unnilennium Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 1 +%define release 32 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz +Patch0: e-smith-base-5.8.0-cpuspeed.patch +Patch1: e-smith-base-5.8.0-remove_obsolete_services.patch +Patch2: e-smith-base-5.8.0-remove_ctrlaltdel.patch +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 + 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 @@ -21,13 +43,11 @@ Requires: e-smith-daemontools >= 1.7.1-0 Requires: perl(Locale::gettext) Requires: perl(Crypt::Cracklib) Requires: perl(Date::Manip) -Requires: perl(Data::UUID) Requires: perl(Net::IPv4Addr) +Requires: perl(Digest::SHA1) Requires: /usr/sbin/irqbalance -Requires: /usr/sbin/cpuspeed Requires: /usr/sbin/smartd Requires: dbus -Requires: hal Requires: acpid Requires: rssh Requires: bridge-utils @@ -35,17 +55,18 @@ Requires: vconfig Requires: e-smith-bootloader Requires: mdadm Requires: pv -Requires: pam_abl +Requires: dhcp 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 Obsoletes: e-smith-serial-console Obsoletes: sshell Obsoletes: e-smith-rp-pppoe -Obsoletes: perl-Data-UUID BuildRequires: perl, perl(Test::Inline) >= 0.12 BuildRequires: e-smith-devtools >= 1.13.1-03 BuildRequires: gettext @@ -57,6 +78,105 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* 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] + +* Tue Apr 12 2016 Jean-Philipe Pialasse 5.8.0-12.sme +- fix getting locale for db configuration [SME: 9378] + +* Mon Apr 11 2016 Jean-Philipe Pialasse 5.8.0-11.sme +- rearange startup [SME: 9352] +- let systemd handle following unsupervised services: +- bootstrap-console, rsyslog, irqbalance, crond, acpid, smartd +- disable from systemd services whith link in rc7.d +- let bootstrap-console run at every reboot and handle surpevised services startup + +* Mon Apr 11 2016 Daniel Berteaud 5.8.0-9.sme +- Remove ctrlaltdel service entry [SME: 9437] + +* Mon Apr 11 2016 Daniel Berteaud 5.8.0-8.sme +- Remove obsolete services [SME: 9420] + +* Tue Mar 29 2016 Jean-Philipe Pialasse 5.8.0-7.sme +- added requires dhcp [SME: 9392] + +* Wed Mar 23 2016 Jean-Philipe Pialasse 5.8.0-6.sme +- add Requires perl(Digest::SHA1) for console [SME: 9372] + +* Fri Mar 18 2016 Jean-Philipe Pialasse 5.8.0-5.sme +- fix conflict perl-Data-UUID vs uuid-perl [SME: 9344] + +* Fri Mar 18 2016 Jean-Philipe Pialasse 5.8.0-3.sme +- remove cpuspeed Requires and support [SME: 9337] +- remove pam_abl Requires [SME: 9341] + +* Fri Mar 18 2016 Jean-Philipe Pialasse 5.8.0-2.sme +- Remove Requires: hal [SME: 9342] +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, + by assuming the date is correct and changing the weekday. + Sat Dec 25 2005 --> Sat Dec 24 2005 or Sun Dec 25 2005 or Sat Dec 31 2005 or .... + Mon Feb 21 2006 --> Mon Feb 20 2006 or Tue Feb 21 2006 or Mon Feb 27 2006 or .... + Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or .... + Sat Mar 10 2008 --> Sat Mar 08 2008 or Mon Mar 10 2008 or Sat Mar 15 2008 or .... + Mon Apr 21 2013 --> Mon Apr 15 2013 or Sun Apr 21 2013 or Mon Apr 22 2013 or .... + Tue Sep 30 2015 --> Tue Sep 29 2015 or Wed Sep 30 2015 or Tue Oct 06 2015 or .... + * Fri Feb 5 2016 Daniel Berteaud 5.8.0-1.sme - Roll new stream for sme10 @@ -72,7 +192,8 @@ e-smith server and gateway software - ba * 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 +* 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 @@ -261,7 +382,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 @@ -657,19 +779,24 @@ 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 + Sat Mar 10 2008 --> Sat Mar 08 2008 or Mon Mar 10 2008 or Sat Mar 15 2008 or .... - Fix dyndns custom gettext [SME: 4032] -* Sat Mar 07 2008 Stephen Noble 4.18-98 +* Fri Mar 07 2008 Stephen Noble 4.18-98 + Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or .... - revised gettext messages [SME: 631] -* Sat Mar 07 2008 Stephen Noble 4.18-97 +* Fri Mar 07 2008 Stephen Noble 4.18-97 + Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or .... - gettext messages [SME: 631] -* Sat Mar 07 2008 Stephen Noble 4.18-96 +* Fri Mar 07 2008 Stephen Noble 4.18-96 + Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or .... - 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 + Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or .... - EthernetAssign shouldn't be translated [SME: 3947] * Sun Feb 17 2008 Stephen Noble 4.18-94 @@ -1074,12 +1201,12 @@ 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 6 2006 Gordon Rowell 4.16.0-23 - 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 6 2006 Gordon Rowell 4.16.0-22 - Correct argument ordering in last change [SME: 790, SME: 1541] * Sun May 28 2006 Charlie Brady 4.16.0-21 @@ -1220,7 +1347,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 @@ -1270,7 +1398,7 @@ 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 9 2006 Charlie Brady 4.15.8-49 - Make bootp support optional, defaulting to 'deny'. [SME: 660] * Thu Feb 9 2006 Gavin Weight 4.15.8-48 @@ -1358,14 +1486,15 @@ 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 2 2006 Charlie Brady 4.15.8-23 - 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 @@ -1770,6 +1899,28 @@ e-smith server and gateway software - ba %prep %setup +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%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 %pre /sbin/e-smith/create-system-user smelastsys 2999 \ @@ -1789,11 +1940,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