calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

Update calculate-server.

Browse Source
atratsevskiy
Mike Hiretsky 13 years ago
parent 6d3c53a02d
commit 7171ff4775
4 changed files with 320 additions and 2 deletions
Show Stats Download Patch File Download Diff File

9
sys-apps/calculate-server/ChangeLog
Unescape View File

@ -1,7 +1,14 @@
# ChangeLog for sys-apps/calculate-server
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-server-2.1.13-r1 (01 Apr 2011)
01 Apr 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-server-2.1.13-r1.ebuild,
+files/calculate-server-2.1.13-rename_cl_update.patch:
Update for rename cl-update.
*calculate-server-2.1.13 (14 Dec 2010)
14 Dec 2010; Самоукин Алексей <as@calculate.ru>

4
sys-apps/calculate-server/Manifest
Unescape View File

@ -1,5 +1,7 @@
AUX calculate-server-2.1.13-rename_cl_update.patch 4885 RMD160 0eb4083d8a6e381fbc88044d9f6b8eba8b837bf5 SHA1 10ad7a4967f58049a71b1e2e7fa2e1289a5c8072 SHA256 87d7435e5a987f18644022bef20f7c4deafd1fd162a3a3656999aff74eebaa59
DIST calculate-server-2.1.13.tar.bz2 157717 RMD160 42d15a964a8c94774003d89ddc6bd834d20b1d5d SHA1 08e47e64aa8173b76a73693346d465ed62ac2ea1 SHA256 c748759f792c21dd28f2659bfeccf2a707c08f36a5d49766ceb6b922a98e930e
EBUILD calculate-server-2.1.13-r1.ebuild 5100 RMD160 cfd90849cfad751b1f3cc6d09856741c9fee385d SHA1 c8e2200e6ddfb564936576ea91921a1bdff9f9fe SHA256 1243e409464e60533bc40045dd628edd73f91f13fec6f13ddd26c4b38a14bc54
EBUILD calculate-server-2.1.13.ebuild 4947 RMD160 a003a07f1beffce6744bb3fc14019cedb3e1b53b SHA1 4450efaa9b9ed085530e6787b751e4a7e7166f11 SHA256 4165f070332916040090730041d852ba5bc37f1eedfba1dbdbe773b2013adb25
EBUILD calculate-server-9999.ebuild 982 RMD160 870c42d025013fd7f7d0fe8cde686546e3bc2d70 SHA1 90b5183a071503257a8842d2592096e0dc0aa49a SHA256 01b0741043617d45c6ce8089c207684eab1aa7c8610bf3cc33bac1124c67df52
MISC ChangeLog 5235 RMD160 cee4d11ea2e350c19614e0e536db5fed61c687af SHA1 bb6aab0557318662d76788b9bb130eb412544aad SHA256 6ddcec274ea1497f86b43a6a94365719b335197f1375eeed27713090d66e9f89
MISC ChangeLog 5465 RMD160 554d09d5289f913c8f0e90cc545eff1b3bb6d502 SHA1 2c41cc9d26e3f224c713a9bbfbc788c61bf5d0c7 SHA256 fdf8175c0e7c3f05722296264894bd231af47bb3846ed61b03af2c1b4d767031
MISC metadata.xml 286 RMD160 e243725ec1a1302cab0d0efee76a4a926e855916 SHA1 6071aa604ea5a1ba8e1772e8f37a24f26b893d8d SHA256 aab7ddde310df96da76277d5ae340a4b0926bec3b354bfb2fea3288081036d74

170
sys-apps/calculate-server/calculate-server-2.1.13-r1.ebuild
Unescape View File

@ -0,0 +1,170 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program for configuring services Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="=sys-apps/calculate-lib-2.1.8-r1
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=net-fs/samba-3.4.6[acl,client,cups,ldap,netapi,pam,server,smbclient]
<net-fs/samba-4.0.0
|| ( <net-mail/dovecot-1.2.0[pop3d,ldap,pam,ssl]
>=net-mail/dovecot-1.2.0[ldap,pam,ssl]
)
>=mail-mta/postfix-2.2[ldap,pam,ssl]
|| ( <net-ftp/proftpd-1.3.3[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,radius,ssl,tcpd]
)
>=mail-filter/procmail-3.22
>=net-dns/bind-9.6.1_p1[sdb-ldap]
>=net-proxy/squid-3.0.14[ldap,pam,ssl]
>=net-misc/dhcp-3.1.2_p1
>=media-gfx/imagemagick-6.6"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# change cl-update to cl-update-server
epatch "${FILESDIR}/calculate-server-2.1.13-rename_cl_update.patch"
}
pkg_postinst() {
if [ -d /var/calculate/server-data/mail/imap ] || \
[ -d /var/calculate/server-data/samba/win/profiles ] || \
[ -d /var/calculate/server-data/samba/unix/profiles ] || \
[ -d /var/calculate/server-data/samba/win/netlogon ];
then
ewarn "Data found in directories of previous version calculate-server"
fi
if [ -d /var/calculate/server-data/mail/imap ];
then
if ! [ -d /var/calculate/server-data/mail~ ];
then
if mv /var/calculate/server-data/mail/imap \
/var/calculate/server-data/mail~ && \
rmdir /var/calculate/server-data/mail && \
mv /var/calculate/server-data/mail~ \
/var/calculate/server-data/mail;
then
ewarn
ewarn "Data from /var/calculate/server-data/mail/imap"
ewarn "was moved to /var/calculate/server-data/mail"
MAILUPDATE="TRUE"
fi
fi
if ! [ "${MAILUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/mail/imap"
eerror "Please manualy move /var/calculate/server-data/mail/imap"
eerror "to /var/calculate/server-data/mail"
fi
fi
if [ -d /var/calculate/server-data/samba/win/profiles ];
then
SAMBAUPDATE=""
if ! [ -d /var/calculate/server-data/samba/profiles/win ];
then
if mkdir -p /var/calculate/server-data/samba/profiles && \
mv /var/calculate/server-data/samba/win/profiles \
/var/calculate/server-data/samba/profiles/win;
then
ewarn
ewarn "Data from /var/calculate/server-data/samba/win/profiles"
ewarn "was moved to /var/calculate/server-data/samba/profiles/win"
SAMBAUPDATE="TRUE"
fi
fi
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/samba/win/profiles"
eerror "Please manualy move "
eerror "/var/calculate/server-data/samba/win/profiles"
eerror "to /var/calculate/server-data/samba/profiles/win"
fi
fi
if [ -d /var/calculate/server-data/samba/unix/profiles ]; \
then
SAMBAUPDATE=""
if ! [ -d /var/calculate/server-data/samba/profiles/unix ];
then
if mkdir -p /var/calculate/server-data/samba/profiles && \
mv -f /var/calculate/server-data/samba/unix/profiles \
/var/calculate/server-data/samba/profiles/unix;
then
rmdir /var/calculate/server-data/samba/unix
ewarn
ewarn "Data from /var/calculate/server-data/samba/unix/profiles"
ewarn "was moved to /var/calculate/server-data/samba/profiles/unix"
SAMBAUPDATE="TRUE"
fi
fi
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/samba/unix/profiles"
eerror "Please manualy move "
eerror "/var/calculate/server-data/samba/unix/profiles"
eerror "to /var/calculate/server-data/samba/profiles/unix"
fi
fi
if [ -d /var/calculate/server-data/samba/win/netlogon ];
then
SAMBAUPDATE=""
if ! [ -d /var/calculate/server-data/samba/netlogon ];
then
if mv -f /var/calculate/server-data/samba/win/netlogon \
/var/calculate/server-data/samba/netlogon;
then
rmdir /var/calculate/server-data/samba/win
ewarn
ewarn "Data form /var/calculate/server-data/samba/win/netlogon"
ewarn "was moved to /var/calculate/server-data/samba/netlogon"
SAMBAUPDATE="TRUE"
fi
fi
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/samba/win/netlogon"
eerror "Please manualy move "
eerror "/var/calculate/server-data/samba/win/netlogon"
eerror "/var/calculate/server-data/samba/netlogon"
fi
fi
if [ "${MAILUPDATE}" == "TRUE" ];
then
ewarn
ewarn "Please update mail service by the command:"
ewarn "\tcl-update mail"
fi
if [ "${SAMBAUPDATE}" == "TRUE" ];
then
ewarn
ewarn "Please update samba service by the command:"
ewarn "\tcl-update samba"
fi
ewarn
ewarn "WARNING!!! If you have the samba service, then update it by the command:"
ewarn "\tcl-update samba"
}

139
sys-apps/calculate-server/files/calculate-server-2.1.13-rename_cl_update.patch
Unescape View File

@ -0,0 +1,139 @@
commit e125137ad2ac373bcf5816567d8209a9a1b11920
Author: Самоукин Алексей <as@calculate.ru>
Date: Fri Apr 1 12:36:31 2011 +0400
Rename cl-update to cl-update-server.
diff --git pym/cl_ldap.py pym/cl_ldap.py
index e76f252..6806945 100644
--- pym/cl_ldap.py
+++ pym/cl_ldap.py
@@ -8887,7 +8887,7 @@ class cl_ldap(shareLdap):
'cl-setup':6,
'cl-passwd':7,
'cl-backup':8,
- 'cl-update':9,
+ 'cl-update-server':9,
'cl-rebuild':10,
'execserv':11,
'cl-replication':12,
@@ -11139,7 +11139,7 @@ service")
{
'progAccess':(9,),
'helpChapter':_("Examples"),
- 'help':pcs(" cl-update samba", self.column_width,
+ 'help':pcs(" cl-update-server samba", self.column_width,
"# "+_("update config files Samba services") + ".",
self.consolewidth-self.column_width)
},
diff --git scripts/cl-update scripts/cl-update
deleted file mode 100644
index 752dcde..0000000
--- scripts/cl-update
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/python
-#-*- coding: utf-8 -*-
-
-# Copyright 2008-2010 Mir Calculate Ltd. http://www.calculate-linux.org
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import sys
-import os
-sys.path.insert(0,os.path.abspath('/usr/lib/calculate/calculate-lib/pym'))
-sys.path.insert(0,os.path.abspath('/usr/lib/calculate/calculate-server/pym'))
-import cl_base
-tr = cl_base.lang()
-tr.setGlobalDomain('cl_server')
-tr.setLanguage(sys.modules[__name__])
-import cl_ldap
-
-if __name__ == "__main__":
- ldapObj = cl_ldap.cl_ldap("cl-update")
- optObj = cl_ldap.tsOpt(ldapObj,[])
- flagError = False
- if not optObj.flagHelp and optObj.params.has_key('service') and\
- not optObj.errorOpt:
- # Настройка сервера LDAP
- flagError = True
- obj = cl_ldap.servLdap()
- if obj.updateLdapServer(optObj.opt, optObj.params['service']):
- flagError = False
- if flagError:
- sys.exit(1)
- else:
- sys.exit(0)
\ No newline at end of file
diff --git scripts/cl-update-server scripts/cl-update-server
new file mode 100644
index 0000000..d65a753
--- /dev/null
+++ scripts/cl-update-server
@@ -0,0 +1,42 @@
+#!/usr/bin/python
+#-*- coding: utf-8 -*-
+
+# Copyright 2008-2010 Mir Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+import os
+sys.path.insert(0,os.path.abspath('/usr/lib/calculate/calculate-lib/pym'))
+sys.path.insert(0,os.path.abspath('/usr/lib/calculate/calculate-server/pym'))
+import cl_base
+tr = cl_base.lang()
+tr.setGlobalDomain('cl_server')
+tr.setLanguage(sys.modules[__name__])
+import cl_ldap
+
+if __name__ == "__main__":
+ ldapObj = cl_ldap.cl_ldap("cl-update-server")
+ optObj = cl_ldap.tsOpt(ldapObj,[])
+ flagError = False
+ if not optObj.flagHelp and optObj.params.has_key('service') and\
+ not optObj.errorOpt:
+ # Настройка сервера LDAP
+ flagError = True
+ obj = cl_ldap.servLdap()
+ if obj.updateLdapServer(optObj.opt, optObj.params['service']):
+ flagError = False
+ if flagError:
+ sys.exit(1)
+ else:
+ sys.exit(0)
\ No newline at end of file
diff --git setup.py setup.py
index 88c87e9..d0e34be 100755
--- setup.py
+++ setup.py
@@ -154,7 +154,7 @@ setup(
"./scripts/cl-passwd",
"./scripts/cl-setup",
"./scripts/cl-backup",
- "./scripts/cl-update",
+ "./scripts/cl-update-server",
"./scripts/cl-rebuild",
"./scripts/cl-replication",
"./scripts/execserv",
Write Preview
Loading…
Cancel
Save