/[smeserver]/rpms/e-smith-base/sme10/e-smith-base.spec

Diff of /rpms/e-smith-base/sme10/e-smith-base.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.3 by unnilennium,
Fri Mar 18 06:46:46 2016 UTC
+Revision 1.47 by jpp,
Sat May 23 05:31:30 2020 UTC
 Line 1
- # $Id: e-smith-base.spec,v 1.2 2016/02/04 23:19:17 vip-ire Exp $
+ # $Id: e-smith-base.spec,v 1.46 2020/05/17 16:19:53 chrissn Exp $
  Summary: e-smith server and gateway - base module
  %define name e-smith-base
  Name: %{name}
  %define version 5.8.0
- %define release 2
+ %define release 43
  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
+ Patch22: e-smith-base-5.8.0.bz9478-move-smtpd-to-qpsmtpd.patch
+ Patch23: e-smith-base-5.8.0-expand_route_bond0.patch
+ Patch24: e-smith-base-5.8.0.bz10519.xinet-cleaning.patch
+ Patch25: e-smith-base-5.8.0-modify-default-city.patch
+ Patch26: e-smith-base-5.8.0.bz8876-set-system-name.patch
+ Patch27: e-smith-base-5.8.0-bz9677-suid_wrapper.patch
+ Patch28: e-smith-base-5.8.0-enable_smartd.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
-Line 21 
 Requires: e-smith-daemontools >= 1.7.1-0
+Line 50 
 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: acpid
-Line 34 
 Requires: vconfig
+Line 62 
 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
-Line 56 
 AutoReqProv: no
+Line 85 
 AutoReqProv: no
  e-smith server and gateway software - base module.
  %changelog
+ * Sat May 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-43.sme
+ - enable smartd for existing installation [SME: 5890]
+ * Sun May 17 2020 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 5.8.0-42.sme
+ - Enable smartd by default [SME: 5890]
+ - Credit to Chris Burnat
+ * Wed Dec 18 2019 Michel Begue <mab974@gmail.com> 5.8.0-41.sme
+ - Add a link to manager C wrapper to execute userpassword's cgi to replace perl-suid [SME: 9677]
+ * Fri Nov 22 2019 John Crisp <jcrisp@safeandsoundit.co.uk> 5.8.0-40.sme
+ - fix SystemName [SME: 8876]
+ * Tue Jan 22 2019 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-39.sme
+ - modify the default city and company [SME: 10715]
+ * Tue Feb 13 2018 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-38.sme
+ - cleaning xinetd.conf fragment out of the package [SME: 10219]
+ * Wed Nov 15 2017 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-37.sme
+ - revert previous change - wrong package
+ * Tue Nov 14 2017 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-36.sme
+ - added post transaction rule for ntp [SME: 10190]
+ - thank you to Stefano Zamboni for this work
+ * Thu May 4 2017 Daniel Berteaud <daniel@firewall-services.com> 5.8.0-35.sme
+ - Expand route-bond0 when nic bonding is enabled [SME: 10272]
+ * Sat Apr 15 2017 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-34.sme
+ - improve regex to catch local [SME: 9724]
+ * Wed Apr 12 2017 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-33.sme
+ - change smtpd to qpsmtpd for default service access [SME: 9478]
+ * Mon Feb 27 2017 Jean-Philipe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 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 <daniel@firewall-services.com> 5.8.0-30.sme
+ - Use ip route syntax to define routes to local network [SME: 10083]
+ * Tue Sep 6 2016 Daniel Berteaud <daniel@firewall-services.com> 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 <tests@pialasse.com> 5.8.0-28.sme
+ - fix config db locale property [SME: 9724]
+ * Sat Jul 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-27.sme
+ - adapt e-smith service command to systemd [SME: 9672]
+ * Fri Jul 22 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-26.sme
+ - add systemd skip redirect to e-smith-service  [SME: 9688]
+ * Thu Jul 21 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-25.sme
+ - fix broken link /etc/init.d/supervise/local link [SME: 9687]
+ * Mon Jul 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-22.sme
+ - fix mysqld to mariadb  [SME: 9438]
+ * Sat Jul 16 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-21.sme
+ - fix missing path to chkconfig [SME: 9641]
+ * Thu Jul 14 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 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 <stephdl@de-labrusse.fr> 5.8.0-19.sme
+ - Set the hostname by hostnamectl [SME: 9631]
+ - Stefano Zamboni <zamboni@mind-at-work.it>
+ * Sun Jun 12 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-18.sme
+ - fix Lang and keyboard layout configured are not used [SME: 9539]
+ * Thu Jun 2 2016 Daniel Berteaud <daniel@firewall-services.com> 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 <tests@pialasse.com> 5.8.0-16.sme
+ - Allow bootstrap to start services after post-install configuration [SME: 9530]
+ * Thu May 12 2016 Daniel Berteaud <daniel@firewall-services.com> 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 <tests@pialasse.com> 5.8.0-14.sme
+ - fix password not asked after signal-event post-install [SME: 9445]
+ * Wed Apr 13 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-13.sme
+ - only start services on regular boot  [SME: 9436]
+ * Tue Apr 12 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-12.sme
+ - fix getting locale for db configuration  [SME: 9378]
+ * Mon Apr 11 2016 Jean-Philipe Pialasse <tests@pialasse.com> 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 <daniel@firewall-services.com> 5.8.0-9.sme
+ - Remove ctrlaltdel service entry [SME: 9437]
+ * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 5.8.0-8.sme
+ - Remove obsolete services [SME: 9420]
+ * Tue Mar 29 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-7.sme
+ - added requires dhcp [SME: 9392]
+ * Wed Mar 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-6.sme
+ - add Requires perl(Digest::SHA1) for console [SME: 9372]
+ * Fri Mar 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-5.sme
+ - fix conflict  perl-Data-UUID vs uuid-perl [SME: 9344]
+ * Fri Mar 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 5.8.0-2.sme
  - Remove Requires: hal [SME: 9342]
  - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
-Line 1091 
 e-smith server and gateway software - ba
+Line 1243 
 e-smith server and gateway software - ba
  * Fri Jun 9 2006 Gavin Weight <gweight@gmail.com> 4.16.0-24
  - Remove lines for creating symlink to statusreport from spec file. [SME: 450]
- * Mon Jun 6 2006 Gordon Rowell <gordonr@gormand.com.au> 4.16.0-23
+ * Tue Jun 6 2006 Gordon Rowell <gordonr@gormand.com.au> 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 <gordonr@gormand.com.au> 4.16.0-22
+ * Tue Jun 6 2006 Gordon Rowell <gordonr@gormand.com.au> 4.16.0-22
  - Correct argument ordering in last change [SME: 790, SME: 1541]
  * Sun May 28 2006 Charlie Brady <charlie_brady@mitel.com> 4.16.0-21
-Line 1288 
 e-smith server and gateway software - ba
+Line 1440 
 e-smith server and gateway software - ba
  * Sat Feb 11 2006 Shad L. Lords <slords@mail.com> 4.15.8-50
  - Run kudzu -q from inittab [SME: 727]
- * Tue Feb 9 2006 Charlie Brady <charlie_brady@mitel.com> 4.15.8-49
+ * Thu Feb 9 2006 Charlie Brady <charlie_brady@mitel.com> 4.15.8-49
  - Make bootp support optional, defaulting to 'deny'. [SME: 660]
  * Thu Feb 9 2006 Gavin Weight <gweight@gmail.com> 4.15.8-48
-Line 1376 
 e-smith server and gateway software - ba
+Line 1528 
 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 <charlieb@e-smith.com> 4.15.8-23
+ * Mon Jan 2 2006 Charlie Brady <charlieb@e-smith.com> 4.15.8-23
  - Use regexp as well as cracklib to check admin password in console.
    [SME: 335]
-Line 1789 
 e-smith server and gateway software - ba
+Line 1941 
 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
+ %patch22 -p1
+ %patch23 -p1
+ %patch24 -p1
+ %patch25 -p1
+ %patch26 -p1
+ %patch27 -p1
+ %patch28 -p1
  %pre
  /sbin/e-smith/create-system-user smelastsys 2999 \
      'sme last system user marker' /tmp /bin/false
  %post
+ LEXICONS=$(find /etc/e-smith/locale/*/etc/e-smith/web/panels/password/cgi-bin/userpassword -type f)
+ for lexicon in $LEXICONS
+ do
+     if [ -f $lexicon ]
+     then
+         cd $(dirname "$lexicon")
+         mv ./userpassword ../../../functions
+     fi
+ done
  %build
- LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \
+ LEXICONS=$(find root/etc/e-smith/web/functions -type f | grep -v CVS)
-     -type f | grep -v CVS)
  for lexicon in $LEXICONS
  do
-Line 1808 
 done
+Line 1999 
 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
+ # Force creation of potentially empty directories
+ mkdir -p root/etc/e-smith/web/panels/password/cgi-bin
+ ln -s ../../../functions/wrapper root/etc/e-smith/web/panels/password/cgi-bin/userpassword
  %install
  rm -rf $RPM_BUILD_ROOT
  mkdir -p $RPM_BUILD_ROOT/etc/selinux

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1