--- rpms/e-smith-base/sme8/e-smith-base.spec 2013/06/29 20:50:43 1.155 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2015/03/31 15:48:18 1.170 @@ -1,82 +1,20 @@ -# $Id: e-smith-base.spec,v 1.154 2013/06/29 17:46:49 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.169 2015/01/16 14:02:30 stephdl Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 82 +%define release 95 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons -Source: %{name}-%{version}.tar.gz -Patch1: e-smith-base-5.2.0-sambaRole.patch -Patch2: e-smith-base-5.2.0-smartd40.patch -Patch3: e-smith-base-5.2.0-usbRev70drive.patch -Patch4: e-smith-base-5.2.0-FixLabelArray.patch -Patch5: e-smith-base-5.2.0-straysymlink.patch -Patch6: e-smith-base-5.2.0-nonetworkdrivers.patch -Patch7: e-smith-base-5.2.0-checkIPOverlap.patch -Patch8: e-smith-base-5.2.0-adapter-translation-fixes.patch -Patch9: e-smith-base-5.2.0-FixLocale_External.patch -Patch10: e-smith-base-5.2.0-perform_restore-hal.patch -Patch11: e-smith-base-5.2.0-generate-2048-bits-keys.patch -Patch12: e-smith-base-5.2.0-perform_backup-hal.patch -Patch13: e-smith-base-5.2.0-hwaddress.patch -Patch14: e-smith-base-5.2.0-sha1.patch -Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch -Patch16: e-smith-base-5.2.0-gettext.patch -Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch -Patch18: e-smith-base-5.2.0-no-nic.patch -Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch -Patch20: e-smith-base-5.2.0-freebusy-user-modify-fix.patch -Patch21: e-smith-base-5.2.0-condrestart.patch -Patch22: e-smith-base-5.2.0-condrestart.patch2 -Patch23: e-smith-base-5.2.0-cpuspeed.patch -Patch24: e-smith-base-5.2.0-nss_ldap.patch -Patch25: e-smith-base-5.2.0-ibay_groups.patch -Patch26: e-smith-base-5.2.0-keep_external.patch -Patch27: e-smith-base-5.2.0-checkMaxUsers.patch -Patch28: e-smith-base-5.2.0-apmd64bit.patch -Patch29: e-smith-base-5.2.0-relocate_dhclient_conf.patch -Patch30: e-smith-base-5.2.0-echo-options.patch -Patch31: e-smith-base-5.2.0-migrateHWaddr.patch -Patch32: e-smith-base-5.2.0-relocate_dhcpd_leases_file.patch -Patch33: e-smith-base-5.2.0-fix_empty_file_test.patch -Patch34: e-smith-base-5.2.0-cpu-conf.patch -Patch35: e-smith-base-5.2.0-ldap-auth.patch -Patch36: e-smith-base-5.2.0-enable-cpu.patch -Patch37: e-smith-base-5.2.0-better-ldap.patch -Patch38: e-smith-base-5.2.0-add-extra-ldap.patch -Patch39: e-smith-base-5.2.0-cpu-can-delete.patch -Patch40: e-smith-base-5.2.0-supp-groups.patch -Patch41: e-smith-base-5.2.0-fix_gpasswd_path.patch -Patch42: e-smith-base-5.2.0-fix-gid.patch -Patch43: e-smith-base-5.2.0-weak-updates.patch -Patch44: e-smith-base-5.2.0-apache_alias_for_www.patch -Patch45: e-smith-base-5.2.0-no-nic2.patch -Patch46: e-smith-base-5.2.0-list-only-write-enabled-backup-targets.patch -Patch47: e-smith-base-5.2.0-string-fix.patch -Patch48: e-smith-base-5.2.0-dont_set_gecos_in_ldap.patch -Patch49: e-smith-base-5.2.0-initExternal.patch -Patch50: e-smith-base-5.2.0-ConsoleNetwork.patch -Patch51: e-smith-base-5.2.0-ConsoleNetworkText.patch -Patch52: e-smith-base-5.2.0-CipherSuite.patch -Patch53: e-smith-base-5.2.0-updatedb.patch -Patch54: e-smith-base-5.2.0-pppoeMlimit.patch -Patch55: e-smith-base-5.2.0-PostUpgradeRestore.patch -Patch56: e-smith-base-5.2.0-optimize_user_modify_unix.patch -Patch57: e-smith-base-5.2.0-user_modify_in_bootstrap.patch -Patch58: e-smith-base-5.2.0-ConsoleBackupText.patch -Patch59: e-smith-base-5.2.0-existing_hwaddr.patch -Patch60: e-smith-base-5.2.0-add_template_to_ssl.pem.patch -Patch61: e-smith-base-5.2.0-fix_group_create_with_ldap_auth.patch -Patch62: e-smith-base-5.2.0-fix_www_name_with_ldap.patch -Patch63: e-smith-base-5.2.0-mdevent.patch -Patch64: e-smith-base-5.2.0-OldSystemName.patch -Patch65: e-smith-base-5.2.0-OldServerName.patch -Patch66: e-smith-base-5.2.0-do_not_remove_utf8.patch -Patch67: e-smith-base-5.2.0-ConsoleBackupCompressionLevel.patch +Source: e-smith-base-5.2.0.90.tar.gz +Patch1: e-smith-base-5.2.0-reset_ibay_default_type.patch +Patch2: e-smith-base-5.2.0_added_verification_of_pptp_clients_against_dhcp.patch +Patch3: e-smith-base-5.2.0_console_verification_dhcp_vs_pptp.patch +Patch4: e-smith-base-5.2.0-default_to_no_on_quit_console_app.patch +Patch5: e-smith-base-5.2.0-only_fire_ip_change_on_wan.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -124,6 +62,49 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Tue Mar 31 2015 Daniel Berteaud 5.2.0-95.sme +- Only fire the ip-change event when IP is assigned to WAN nic + (Code by Charlie Brady and John Crisp) [SME: 8891] + +* Sun Jan 11 2015 Stephane de Labrusse 5.2.0-94.sme +- When quiting the console app with unsaved changes set the default selected +- answer to NO, Hsing-Foo Wang [SME: 8794] + +* Wed Apr 23 2014 stephane de Labrusse 5.2.0-93.sme +- Add a verification in the console of number of pptp clients against ip allowed in dhcpd +- [SME: 8298] + +* Sun Apr 6 2014 stephane de Labrusse 5.2.0-92.sme +- Add a verification in remoteaccess panel of number of pptp clients against ip allowed in dhcpd +- [SME: 8298] + +* Mon Mar 10 2014 Chris Burnat 5.2.0-91.sme +- Reset primary ibay default type [SME: 8267] + +* Mon Feb 17 2014 Ian Wells 5.2.0-90.sme +- Remove old images and roll new tarball [SME: 8213] + +* Sun Feb 16 2014 Ian Wells 5.2.0-89.sme +- Refer to removable media not CDROM in console restore [SME: 8212] + +* Fri Feb 7 2014 Daniel Berteaud 5.2.0-88.sme +- Add the apache group if it's missing [SME: 7932] + +* Mon Jan 13 2014 Ian Wells 5.2.0-87.sme +- Remove insecure SSL ciphers [SME: 7916] + +* Mon Jan 13 2014 Ian Wells 5.2.0-86.sme +- Change System Name from mitel-networks-server to sme-server [SME: 8131] + +* Sat Sep 14 2013 Ian Wells 5.2.0-85.sme +- Reverse change: Use UTF-8 in the console [SME: 7699] + +* Sun Jul 7 2013 Ian Wells 5.2.0-84.sme +- Improve text in console backup for success and failure [SME: 3121] + +* Mon Jul 01 2013 Ian Wells 5.2.0-83.sme +- Compression level of the console backup is now -6 by default [SME: 6304] + * Sat Jun 29 2013 Ian Wells 5.2.0-82.sme - Console USB Backup, allow user setting of compression level [SME: 6304] @@ -1601,68 +1582,6 @@ e-smith server and gateway software - ba %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 -%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 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 -%patch58 -p1 -%patch59 -p1 -%patch60 -p1 -%patch61 -p1 -%patch62 -p1 -%patch63 -p1 -%patch64 -p1 -%patch65 -p1 -%patch66 -p1 -%patch67 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]