Update server.

13 years ago · 078a145c55
parent 824cff2920
commit 078a145c55
7 changed files with 64 additions and 10 deletions
--- a/sys-apps/calculate-server/ChangeLog
+++ b/sys-apps/calculate-server/ChangeLog
@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $

+*calculate-server-2.1.15-r3 (13 Dec 2011)
+
+  13 Dec 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  -calculate-server-2.1.15-r2.ebuild, +calculate-server-2.1.15-r3.ebuild,
+  files/calculate-server-2.1.15-fix_proftpd.patch:
+  Update patch
+
 *calculate-server-2.1.15-r2 (12 Dec 2011)

  12 Dec 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
--- a/sys-apps/calculate-server/Manifest
+++ b/sys-apps/calculate-server/Manifest
@ -6,7 +6,7 @@ AUX calculate-server-2.1.14-fix_add_dns_rec.patch 649 RMD160 dbe869d596486428d10
 AUX calculate-server-2.1.14-fix_dovecot.patch 502 RMD160 c7d4c76dc49a3894e7534572643e321696ae5a58 SHA1 1d62d3b5c9a5628cbb133bc615f8af06d6e844b5 SHA256 4f9ed8f74dd50244f1b6ac5f8a1b991a0f973fb2c05eac23e0509c2d31458baa
 AUX calculate-server-2.1.14-remote_distfiles.patch 892 RMD160 8d6a74fa561dcb35749f823103231890a93572f5 SHA1 b9aacc5e6fa755eb12fed2f4cb34d8a6c0765a01 SHA256 3f01a01874c38e81a86940255b55fa250a2c0f85726fdd6974b4b9e3ac1bdc34
 AUX calculate-server-2.1.14-rename_param.patch 1980 RMD160 2d5e449e1da1f9dc7f3c2ddf11125842309675c4 SHA1 75aab35370256629d82eca9347d5d1fc07706b2d SHA256 d09e00c52625b4320a753cc519250d396f92742181af2a6f7a95b060812cf99d
-AUX calculate-server-2.1.15-fix_proftpd.patch 920 RMD160 40aba387f80a655608777b93dc7dad34b5bee1f8 SHA1 f740059bce43306115203a89979eab1d00b1ad83 SHA256 631cccef379d13c249837a7b26e2a428ac79f1fd389178010f10fa91ea4b09f9
+AUX calculate-server-2.1.15-fix_proftpd.patch 971 RMD160 b700c569d093e1718e5da7549f27a095ea54ca5f SHA1 5c3604f7121d37bed72e7840d604c9f963cfb0bf SHA256 33a0bf2b688d8e332085839834ec87a4dbb2e3cf89c52cdd40e777951c1c6a76
 DIST calculate-server-2.1.13.tar.bz2 157717 RMD160 42d15a964a8c94774003d89ddc6bd834d20b1d5d SHA1 08e47e64aa8173b76a73693346d465ed62ac2ea1 SHA256 c748759f792c21dd28f2659bfeccf2a707c08f36a5d49766ceb6b922a98e930e
 DIST calculate-server-2.1.14.tar.bz2 167957 RMD160 a2d349f1cd6a6107f7e32b79b5189e5a0530b440 SHA1 3f23fb09fb7b67f14d48c8ffb3edc03e5eef95a9 SHA256 3c5b4de78df05c545884995d50fd5b8b53c6d9742d91e699d8fd1d9020168e05
 DIST calculate-server-2.1.15.tar.bz2 168350 RMD160 8b6723d9007f6ba73af0690ea8a49a3047ec6eff SHA1 ebda1375fd7dc95e4f4404f99d30f50d5788aa4e SHA256 3bc8f28dc3c583d1ec51d9653fc92d047c0f2064f3745a34195ba133cfc66d8c
@ -22,7 +22,7 @@ EBUILD calculate-server-2.1.14-r5.ebuild 5468 RMD160 16579e73a24efa9d175beeccdca
 EBUILD calculate-server-2.1.14-r6.ebuild 5589 RMD160 dcb93ec7edc9f02e2b64ea93367f031c48e34744 SHA1 a8e2de5e67bc267f89c5c8cf790ffc6cb8f4045c SHA256 465564fac36634ec7741b5dc417bc2df56c0e4d3474d37006ce3c938d68d16e6
 EBUILD calculate-server-2.1.14.ebuild 4966 RMD160 0a71a8217e53bec9c87669713e3007a5097e9b19 SHA1 6c284957f2841655facc4301cc7a9945d5f95876 SHA256 a7d071a4a1b10e1a03ebec2509be004ddcad0831976a05e88aa2ebbbee4fa986
 EBUILD calculate-server-2.1.15-r1.ebuild 5297 RMD160 3c2e0ef3aa437dd622751b77ee54de386688f59d SHA1 f3992918608d04aad76ce96fa4f984f4fa321394 SHA256 3c580af7a0259bf15ad59ec97d34f6affc6ffc3258439e8d8c49eeb730104c98
-EBUILD calculate-server-2.1.15-r2.ebuild 5425 RMD160 ca258dad95400b26d37cb526ce55bd8ddf55b071 SHA1 5c66d2fc8420b7ea45feed339ea5a1a0312c640a SHA256 7ab65757f9f6c19d943b95cf11e0b60cd08e58c2cde04cfb1f39688de63e1778
+EBUILD calculate-server-2.1.15-r3.ebuild 5425 RMD160 ca258dad95400b26d37cb526ce55bd8ddf55b071 SHA1 5c66d2fc8420b7ea45feed339ea5a1a0312c640a SHA256 7ab65757f9f6c19d943b95cf11e0b60cd08e58c2cde04cfb1f39688de63e1778
 EBUILD calculate-server-9999.ebuild 1037 RMD160 e064aafa6280bde8c3eee916ff18c53ec15155b9 SHA1 8e12835d6c5ddcfee9abb20f2c7608a58338270d SHA256 9990fc856334757de45a58372b6b2d0e727e621697cd90abec72bc3388907914
-MISC ChangeLog 8293 RMD160 086113b538e020d25d11239cbdc15ea594077e59 SHA1 b733a97b083e7225af6925bd513e2377299d7f73 SHA256 c64554e72a8dd11520958ea4b682ccff94b964942a7e846e2a782e0fa8754e6a
+MISC ChangeLog 8537 RMD160 8a124da9b28ad622f29ba85a6b4c05010ce2d160 SHA1 f2ad0f3092267e294d4348180ab9a4c50a58b09d SHA256 087c6aa62c268ce0e3f95c2e2ea1fb74e2ef360418fd7af9784d333ad6abb0de
 MISC metadata.xml 286 RMD160 e243725ec1a1302cab0d0efee76a4a926e855916 SHA1 6071aa604ea5a1ba8e1772e8f37a24f26b893d8d SHA256 aab7ddde310df96da76277d5ae340a4b0926bec3b354bfb2fea3288081036d74
--- a/sys-apps/calculate-server/calculate-server-2.1.15-r3.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.1.15-r3.ebuild
--- a/sys-apps/calculate-server/files/calculate-server-2.1.15-fix_proftpd.patch
+++ b/sys-apps/calculate-server/files/calculate-server-2.1.15-fix_proftpd.patch
@ -1,14 +1,14 @@
-commit b59c6e04000a15d7171a21a19a18e60a1a4e656b
+commit b36881f7b430342d8578f5aaaed442fa19949983
 Author: Mike Hiretsky <mh@calculate.ru>
-Date:   Mon Dec 12 13:39:21 2011 +0400
+Date:   Tue Dec 13 10:19:17 2011 +0400

-    Fix proftpd 1.3.4
+    Fix proftpd.conf

 diff --git a/profile/ftp/etc/proftpd/proftpd.conf b/profile/ftp/etc/proftpd/proftpd.conf
-index bbf59dc..0a6ee23 100644
+index bbf59dc..3a477b6 100644
 --- a/profile/ftp/etc/proftpd/proftpd.conf
 +++ b/profile/ftp/etc/proftpd/proftpd.conf
-@@ -69,9 +69,16 @@ DefaultRoot #-sr_ftp_path-#
+@@ -69,9 +69,20 @@ DefaultRoot #-sr_ftp_path-#
 </Anonymous>
 
 LDAPServer            #-os_net_hostname-#.#-os_net_domain-#
@ -16,11 +16,15 @@ index bbf59dc..0a6ee23 100644
 LDAPDNInfo            "#-ld_ftp_dn-#" #-ld_ftp_pw-#
 LDAPAuthBinds         on
 LDAPDoAuth            on "uid=%v,ou=Users,#-ld_ftp_dn-#"
+!LDAPBindDN
+!LDAPUsers
 +#pkg#
 +#?pkg(net-ftp/proftpd)>=1.3.4#
 +LDAPBindDN            "#-ld_ftp_dn-#" #-ld_ftp_pw-#
 +LDAPAuthBinds         on
-+LDAPUsers             "uid=%v,ou=Users,#-ld_ftp_dn-# (uid=%v)
+LDAPUsers             "uid=%v,ou=Users,#-ld_ftp_dn-#" (uid=%v)
+!LDAPDNInfo
+!LDAPDoAuth
 +#pkg#
 LDAPDefaultAuthScheme SSHA
 LDAPGenerateHomedir off
--- a/sys-apps/calculate-utilities/ChangeLog
+++ b/sys-apps/calculate-utilities/ChangeLog
@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $

+*calculate-utilities-2.2.27-r1 (13 Dec 2011)
+
+  13 Dec 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +calculate-utilities-2.2.27-r1.ebuild:
+  Update for server
+
 *calculate-utilities-2.2.27 (12 Dec 2011)

  12 Dec 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@ -28,7 +28,8 @@ EBUILD calculate-utilities-2.2.26-r7.ebuild 873 RMD160 322e2102585109318f21a0931
 EBUILD calculate-utilities-2.2.26-r8.ebuild 873 RMD160 f820806548da2eed1e0e2eb430b80a0f599e7971 SHA1 f420ab95ef64bbe93898a488ea60526361cc14d2 SHA256 644c61f3fed44ab60b86e5b5c47cdddfbffcfca9ecfc7fe067a7fba43e0f06bc
 EBUILD calculate-utilities-2.2.26-r9.ebuild 879 RMD160 cbd90bc7a4c775bf6e235e38a08348dfe2419941 SHA1 dae3f0cdad9306eb7ee435a2b95d96bb80c906e4 SHA256 d76c6ee327ccea3c17870de9dec93e27359a260bd9930728e831da6f0a752723
 EBUILD calculate-utilities-2.2.26.ebuild 858 RMD160 689a2c02fbba4a04bc6103d21e1c28eea9c1b084 SHA1 ec3fdd0e02e7e24bf06286997cb41fdf861c034f SHA256 3e72263a6417c5bd713b5329d48fb0e2a26782a249c975ffc2bc3ddb1558e860
+EBUILD calculate-utilities-2.2.27-r1.ebuild 861 RMD160 70075e64c09a6ef6826aca6a87386ec40b1c4b31 SHA1 d181ca185f1fc8498eaf7043832d1d4cf32479ae SHA256 d70fe0cdac200fb91fd1092d55158f3e87584fa8c93c968fb2214be3999b3747
 EBUILD calculate-utilities-2.2.27.ebuild 861 RMD160 d840018012b50f856de0042966facf8ee93007b9 SHA1 3f805525a322977dcb6cc442dcd933c90855c175 SHA256 1a2a97e4dde488e880820a5a97ff974ae3dd068c2d894a9b962c35d24dad4eec
 EBUILD calculate-utilities-2.2.9999.ebuild 842 RMD160 f2c0fdc1068614b71a37f2226dcde4883ebd2876 SHA1 99f673a52934f552589baf6d12ed9bffc03b8ebd SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1
 EBUILD calculate-utilities-3.0.9999.ebuild 441 RMD160 ec17f871ec70a322cff866048e50c150931e0e95 SHA1 d0e036ba01e6a71ad14e6f3e6735bbd0f325df99 SHA256 30c6cd4ce478016cb75458314ea4e745ccb1501be33f14c3a2593d9d0e670c9c
-MISC ChangeLog 36047 RMD160 f75acb32bdc69bbdbf56a3d08e12d31f4e775bff SHA1 ba9a45abf4629bf8557ba98c802a33b8932a499e SHA256 e5ffbfcf711bbe91c05fbe9c4f895b4a310edeb27090395e1661ad7facfe28a1
+MISC ChangeLog 36215 RMD160 7cc29b772c2127a28bb144aade0a038689eac590 SHA1 93450eeb3324496c3312fad8d85b786ddc466e06 SHA256 f44c7a27a68fc24ef64b143c71beb44a705d4843aa3bda26bccfa0bd8b078d63
--- a/sys-apps/calculate-utilities/calculate-utilities-2.2.27-r1.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.27-r1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+DESCRIPTION="Calculate Utilities meta package"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="
+cl_assemble
+cl_builder
+cl_client
+cl_desktop
+cl_installgui
+cl_server
+"
+
+RDEPEND="${RDEPEND}
+	=sys-apps/calculate-install-2.2.27
+	=sys-apps/calculate-templates-2.2.27
+	=sys-apps/calculate-lib-2.2.27
+	=sys-apps/calculate-i18n-2.2.27
+
+	cl_assemble? ( =sys-apps/calculate-assemble-2.2.27 )
+	cl_builder? ( =sys-apps/calculate-builder-2.2.27 )
+	cl_client? ( =sys-apps/calculate-client-2.2.27 )
+	cl_desktop? ( =sys-apps/calculate-desktop-2.2.27 )
+	cl_installgui? ( =app-misc/calculate-install-gui-2.2.27 )
+
+	cl_server? ( =sys-apps/calculate-server-2.1.15-r3 )
+"