Bugfix for http://www.calculate-linux.ru/boards/6/topics/3872

sys-apps/calculate-server/ChangeLog

@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculate-server-2.1.12-r2 (21 Jul 2010)
+
+  21 Jul 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  -calculate-server-2.1.12-r1.ebuild, +calculate-server-2.1.12-r2.ebuild,
+  +files/calculate-server-2.1.12-r2.patch:
+  Add bugfix for calculate-server.
+
   04 May 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
   calculate-server-9999.ebuild:
   Fix git path.

sys-apps/calculate-server/Manifest

@@ -1,7 +1,8 @@
+AUX calculate-server-2.1.12-r2.patch 1817 RMD160 e2cd6149d0745b7f5859d6d601d3a98a5f5f3f83 SHA1 9ec8885c5d76a0750efd3c09275a2576f71e1213 SHA256 e10c157154d76ed6aa9dfde26a2137a7ee6f9a7d3acf64ba0db2dd14cd2875f5
 DIST calculate-server-2.1.10.tar.bz2 153544 RMD160 b5c6085aef1e3eb57cf5c356ab9dcef6d1352f45 SHA1 b8f666b308293f74e1be135e5fc362014e8f2763 SHA256 ff015464535b833936df041466f21105a841ac9853cb545bb99c9f0096e55559
 DIST calculate-server-2.1.12.tar.bz2 156962 RMD160 beb1d50b72bbb592c666a81504e955a99e4341c4 SHA1 c38413bbf7d257e78888453f5a94ec15071c432b SHA256 c866814d014c5beb84b24febc8491d1d8cbebb6b545b21c4ff601d05b593b36b
 EBUILD calculate-server-2.1.10-r1.ebuild 4837 RMD160 4573182b01d66e75b0d81d280f7ddb74b69f6828 SHA1 a5e462f7200f86f4e93e0d999eea7a1a8bde7a62 SHA256 fb3e3d434b67d8ed3402515190f60554405eb1b85ac28e1492d43c6de2f0d13d
-EBUILD calculate-server-2.1.12-r1.ebuild 4837 RMD160 1d41e0f9d9c10aa8a063ab30a43f8cdc59889fb5 SHA1 2661378a8bca1566d40f235c859dc0ebf1ad3c21 SHA256 93eb60ef741ee09175c973fb3ffdb6017fe7b2e4813bfd18baa5f9742acd7738
+EBUILD calculate-server-2.1.12-r2.ebuild 4972 RMD160 f431cdfdfac5efaa8c7b68035b3fb632d9bf8e5f SHA1 abb0fe6b7ac23e1eeba9fb750078331845110a67 SHA256 78f7d53519ec35ea09a6f7a6187a0ec4eec196c933c7b0b300d691d92a8e4e32
 EBUILD calculate-server-9999.ebuild 982 RMD160 870c42d025013fd7f7d0fe8cde686546e3bc2d70 SHA1 90b5183a071503257a8842d2592096e0dc0aa49a SHA256 01b0741043617d45c6ce8089c207684eab1aa7c8610bf3cc33bac1124c67df52
-MISC ChangeLog 3390 RMD160 a90c81217916817cba8ec579b9a4b4f87829b413 SHA1 bbaeca3b392c0bde4f62333374f178f43065a61d SHA256 19c851eb9e8a26b0aa25f4b0746d3edab9e37003e0c383ad9b33b6da553a49da
+MISC ChangeLog 3646 RMD160 03f9be518dc6196b1148ab81949c4ae379896ce1 SHA1 97c199975d647fa1560983f67183043cac783d91 SHA256 eb90850c665ed04d417e4d6595a01ecd0b4ce998e1a22fed444cbef59a629936
 MISC metadata.xml 286 RMD160 e243725ec1a1302cab0d0efee76a4a926e855916 SHA1 6071aa604ea5a1ba8e1772e8f37a24f26b893d8d SHA256 aab7ddde310df96da76277d5ae340a4b0926bec3b354bfb2fea3288081036d74

sys-apps/calculate-server/calculate-server-2.1.12-r2.ebuild

@@ -34,6 +34,13 @@ DEPEND="~sys-apps/calculate-lib-2.1.8
 
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# bugfix range absent in dhcp.conf
+	epatch "${FILESDIR}/calculate-server-2.1.12-r2.patch"
+}
 
 pkg_postinst() {
 	if [ -d /var/calculate/server-data/mail/imap ] || \

sys-apps/calculate-server/files/calculate-server-2.1.12-r2.patch

@@ -0,0 +1,47 @@
+diff --git a/profile/dhcp/etc/dhcp/dhcpd.conf b/profile/dhcp/etc/dhcp/dhcpd.conf
+index 3284616..554d249 100644
+--- a/profile/dhcp/etc/dhcp/dhcpd.conf
++++ b/profile/dhcp/etc/dhcp/dhcpd.conf
+@@ -12,8 +12,8 @@ authoritative;
+ update-static-leases on;
+ 
+ # basic default DHCP info
+-default-lease-time 600;
+-max-lease-time 7200;
++default-lease-time 6000;
++max-lease-time 72000;
+ 
+ #?sr_dns_set==on#
+ on commit {
+diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
+index bb9f3a3..28d35fc 100644
+--- a/pym/cl_ldap.py
++++ b/pym/cl_ldap.py
+@@ -7560,6 +7560,9 @@ outdated. If the backup is obsolete, use cl-backup."))
+             service = "ldap"
+             if not self.restartLdapServer():
+                 return False
++            # Устанавливаем автозапуск демона
++            if not self.setDaemonAutostart("slapd"):
++                return False
+             self.printOK(_("Restarting service %s")%"LDAP" + " ...")
+         # Перезапускаем остальные сервисы
+         if not flagError:
+@@ -19758,6 +19761,8 @@ eth0, eth1, ... etc."%net)
+          # Проверка сущестовования сети в конфигурационном файле
+         if not self.isExistingNet(net):
+             return False
++        dhcpObj = dncpTxt()
++        xmlNodesNet = dhcpObj.getXMLNet(network)
+         # ip роутера
+         router = ""
+         if options.has_key("router"):
+@@ -21183,6 +21188,8 @@ network %s")%net)
+         # Проверка на диапазон
+         for rang in ranges:
+             ipNet, listRange = rang
++            if not listRange:
++                continue
+             minIp, maxIp = sorted([self.getNumberIP(listRange[0]),
+                                 self.getNumberIP(listRange[1])])
+             if minIp == maxIp: