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

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

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

-Revision 1.3 by slords,
Sat Feb  2 14:59:33 2013 UTC
+Revision 1.39 by vip-ire,
Sat Jun  8 09:09:47 2013 UTC
 Line 1
- # $Id: e-smith-base.spec,v 1.2 2013/01/31 17:55:53 vip-ire Exp $
+ # $Id: e-smith-base.spec,v 1.38 2013/06/07 16:33:57 vip-ire Exp $
  Summary: e-smith server and gateway - base module
  %define name e-smith-base
  Name: %{name}
  %define version 5.4.0
- %define release 3
+ %define release 37
  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
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
- Requires: mod_auth_external
+ BuildArch: noarch
+ Requires: pwauth
  Requires: e-smith-lib >= 2.2.0-2
  Requires: server-manager-images, server-manager
  Requires: e-smith-formmagick >= 1.4.0-12
-Line 37 
 Requires: e-smith-bootloader
+Line 69 
 Requires: e-smith-bootloader
  Requires: mdadm
  Requires: pv
  Requires: pam_abl
- Requires: nss_pam_ldapd
+ Requires: diald
+ Requires: /usr/bin/passwd
+ Requires: nss-pam-ldapd
+ Obsoletes: nss_ldap < 254
  Requires: cpu >= 1.4.3
  Obsoletes: rlinetd, e-smith-mod_ssl
  Obsoletes: e-smith-serial-console
-Line 47 
 Obsoletes: perl-Data-UUID
+Line 82 
 Obsoletes: perl-Data-UUID
  BuildRequires: perl, perl(Test::Inline) >= 0.12
  BuildRequires: e-smith-devtools >= 1.13.1-03
  BuildRequires: gettext
- %ifarch i386
- Requires: apmd
- %endif
  %define dbfiles accounts configuration domains hosts networks
  AutoReqProv: no
-Line 58 
 AutoReqProv: no
+Line 90 
 AutoReqProv: no
  e-smith server and gateway software - base module.
  %changelog
- * Sat Feb 2 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-3.sme
+ * Sat Jun 8 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-37.sme
+ - Continue escaping control chars in rsyslog, just replace LF with space [SME: 7662]
+ * Fri Jun 7 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-36.sme
+ - Don't escape control characters in rsyslog [SME: 7662]
+ * Thu Jun 6 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-35.sme
+ - Use UTF-8 in the console [SME: 7591]
+ * Sun May 19 2013 Ian Wells <esmith@wellsi.com> 5.4.0-34.sme
+ - Remove redundant parts of init-accounts [SME: 3550]
+ * Sat May 18 2013 chris burnat <devlist@burnat.com> 5.4.0-33.sme
+ - Add_template_to_ssl.pem, codes by JP Pialasse [SME: 7601]
+ * Tue May 07 2013 Ian Wells <esmith@wellsi.com> 5.4.0-32.sme
+ - Require diald [SME: 7279]
+ * Mon May 06 2013 Ian Wells <esmith@wellsi.com> 5.4.0-31.sme
+ - Removal of rc.e-smith now functionality is in e-smith-service [SME: 7267]
+ * Sun May 05 2013 Ian Wells <esmith@wellsi.com> 5.4.0-30.sme
+ - Revert last change. [SME: 7227]
+ * Sat May 04 2013 Ian Wells <esmith@wellsi.com> 5.4.0-29.sme
+ - Suppress template text from /etc/inittab [SME: 7227]
+ * Mon Apr 22 2013 Ian Wells <esmith@wellsi.com> 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 <devlist@burnat.com> 5.4.0-27.sme
+ - Fix the way '.' works in bash [SME: 7532]
+ * Fri Mar 22 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-26.sme
+ - rename /etc/ldap.conf to /etc/pam_ldap.conf (and same for .secret) [SME: 7289]
+ * Sat Mar 16 2013 Ian Wells <esmith@wellsi.com> 5.4.0-25.sme
+ - Always define InternalInterface NICBonding [SME: 7498]
+ * Sat Mar 16 2013 Terry Fage <trex1512@yahoo.com.au> 5.4.0-24.sme
+ - In the console refer to removable media instead of USB disk [SME: 7414]
+ * Sat Mar 16 2013 Shad L. Lords <slords@mail.com> 5.4.0-23.sme
+ - Fix a few more syslog => rsyslog items [SME: 7221]
+ * Sat Mar 16 2013 Shad L. Lords <slords@mail.com> 5.4.0-22.sme
+ - Remove modprobe stuff [SME: 7261]
+ * Sat Mar 16 2013 Shad L. Lords <slords@mail.com> 5.4.0-21.sme
+ - Don't be as agressive on rate limiting [SME: 7470]
+ * Sat Mar 16 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-20.sme
+ - Change syslog templates to rsyslog [SME: 7221]
+ * Fri Mar 15 2013 Ian Wells <esmith@wellsi.com> 5.4.0-19.sme
+ - Ensure existing_hwaddr is always initialized [SME: 7471]
+ * Thu Mar 14 2013 Ian Wells <esmith@wellsi.com> 5.4.0-18.sme
+ - Change System Name from mitel-networks-server to sme-server [SME: 7485]
+ * Sat Mar 9 2013 Shad L. Lords <slords@mail.com> 5.4.0-17.sme
+ - Fix user www creation in init-accounts [SME: 7319]
+ * Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 5.4.0-16.sme
+ - Update package and path for pwauth [SME: 7319]
+ - Update init-accounts to set uid/gid correctly for pwauth
+ * Thu Feb 28 2013 Shad L. Lords <slords@mail.com> 5.4.0-15.sme
+ - Remove fragments in inittab that are no longer needed [SME: 7227]
+ * Mon Feb 25 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-14.sme
+ - Post-upgrades not fired after restore from console [SME: 7390]
+ * Sat Feb 23 2013 Ian Wells <esmith@wellsi.com> 5.4.0-13.sme
+ - Remove microcode_ctl service as now udev-driven [SME: 7397]
+ * Thu Feb 21 2013 Ian Wells <esmith@wellsi.com> 5.4.0-12.sme
+ - Increase memory limit for pppoe to 100Mb matching SME8 solution [SME: 7391]
+ * Thu Feb 21 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-11.sme
+ - Optimize user-modify-unix script and link it in bootstrap-ldap-save [SME: 7387]
+ * Tue Feb 19 2013 Shad L. Lords <slords@mail.com> 5.4.0-10.sme
+ - Add /usr/bin/passwd as a required package [SME: 7350]
+ * Sat Feb 9 2013 Ian Wells <esmith@wellsi.com> 5.4.0-9.sme
+ - Update symlink to not conflict with /etc/init.d [SME: 7322]
+ * Thu Feb 7 2013 Ian Wells <esmith@wellsi.com> 5.4.0-8.sme
+ - Add symbolic links from rsyslog to syslog to start the
+   the transition from syslog to rsyslog [SME: 7322]
+ * Wed Feb 6 2013 Shad L. Lords <slords@mail.com> 5.4.0-7.sme
+ - Remove apmd service and change package to noarch [SME: 7312]
+ * Sun Feb 3 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-6.sme
+ - Add a daemontools service to run signal-event local [SME: 7230]
+ * Sat Feb 2 2013 Shad L. Lords <slords@mail.com> 5.4.0-5.sme
+ - Obsolete nss_ldap so upgrades work [SME: 7273]
+ * Sat Feb 2 2013 Shad L. Lords <slords@mail.com> 5.4.0-4.sme
+ - Helps to spell requirements correctly
+ * Sat Feb 2 2013 Shad L. Lords <slords@mail.com> 5.4.0-3.sme
  - Change nss_ldap to nss-pam-ldapd [SME: 7272]
  * Thu Jan 31 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-2.sme
-Line 1494 
 e-smith server and gateway software - ba
+Line 1630 
 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
+ %patch29 -p1
+ %patch30 -p1
+ %patch31 -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 smelog 1002 \
-     'smelog log user' /var/log/smelog /bin/false
  /sbin/e-smith/create-system-user smelastsys 2999 \
      'sme last system user marker' /tmp /bin/false
-Line 1505 
 e-smith server and gateway software - ba
+Line 1674 
 e-smith server and gateway software - ba
  %build
- %if "%_build_arch" == "i386"
- echo "enabled" >  root/etc/e-smith/db/configuration/defaults/apmd/status
- %else
- echo "disabled" >  root/etc/e-smith/db/configuration/defaults/apmd/status
- %endif
  LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \
      -type f | grep -v CVS)
-Line 1578 
 rm -rf $RPM_BUILD_ROOT
+Line 1741 
 rm -rf $RPM_BUILD_ROOT
      --dir /var/service/ippp/log/supervise 'attr(0700,root,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)' \
      > %{name}-%{version}-%{release}-filelist
  mkdir -p $RPM_BUILD_ROOT/home/e-smith/db

 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