From 631e6af02a807bc286496e043299ee3c24aef2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 17 Nov 2020 13:59:59 +0300 Subject: [PATCH] =?UTF-8?q?sys-apps/calculate-server:=20=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B0=20ejabberd-20.04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculate-server-2.1.19-r16.ebuild | 195 ++++++++++++++++++ ...late-server-2.1.19-fix_ejabber_20.04.patch | 57 +++++ 2 files changed, 252 insertions(+) create mode 100644 sys-apps/calculate-server/calculate-server-2.1.19-r16.ebuild create mode 100644 sys-apps/calculate-server/files/calculate-server-2.1.19-fix_ejabber_20.04.patch diff --git a/sys-apps/calculate-server/calculate-server-2.1.19-r16.ebuild b/sys-apps/calculate-server/calculate-server-2.1.19-r16.ebuild new file mode 100644 index 000000000..8a79679c2 --- /dev/null +++ b/sys-apps/calculate-server/calculate-server-2.1.19-r16.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +PYTHON_COMPAT=(python{2_6,2_7}) + +inherit distutils-r1 eutils + +SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2 + http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2" + +DESCRIPTION="Configuration utility for Linux services" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="calculate_nomail +calculate_nodhcp +calculate_noftp +calculate_nojabber +calculate_nonamed +calculate_nosamba +calculate_noproxy" + +DEPEND="=sys-apps/calculate-lib-2.1.12-r5 + >=net-nds/openldap-2.3[-minimal] + >=sys-auth/pam_ldap-180[ssl] + >=sys-auth/nss_ldap-239 + !=net-fs/samba-4[acl,client,cups,ldap,pam] + ) + ) + !calculate_nomail? ( + || ( =net-mail/dovecot-1.2.0[ldap,pam,ssl(+)] + ) + >=mail-filter/procmail-3.22 + dev-python/pymilter-python2 + >=mail-mta/postfix-2.2[ldap,pam,ssl,sasl,dovecot-sasl] + ) + !calculate_noftp? ( + || ( =net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,ssl,tcpd] + ) + ) + !calculate_nojabber? ( + || ( >=net-im/ejabberd-2.1.8[mod_pubsub,ldap] + >=net-im/ejabberd-16.04-r1[ldap] ) + || ( media-gfx/imagemagick + media-gfx/graphicsmagick ) + ) + !calculate_nonamed? ( >=net-dns/bind-9.6.1_p1[sdb-ldap] ) + !calculate_noproxy? ( >=net-proxy/squid-3.0.14[ldap,pam,ssl] ) + !calculate_nodhcp? ( >=net-misc/dhcp-3.1.2_p1 )" + +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/calculate-server-2.1.19-fix_sortmilter.patch + "${FILESDIR}"/calculate-server-2.1.19-fix_mailservice.patch + "${FILESDIR}"/calculate-server-2.1.19-fix_certgen.patch + "${FILESDIR}"/calculate-server-2.1.19-fix_jabber.patch + "${FILESDIR}"/calculate-server-2.1.19-fix_gendh.patch + "${FILESDIR}"/calculate-server-2.1.19-fix_samba4.11.patch + "${FILESDIR}"/calculate-server-2.1.19-fix_ejabber_20.04.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" +} diff --git a/sys-apps/calculate-server/files/calculate-server-2.1.19-fix_ejabber_20.04.patch b/sys-apps/calculate-server/files/calculate-server-2.1.19-fix_ejabber_20.04.patch new file mode 100644 index 000000000..ab0687cad --- /dev/null +++ b/sys-apps/calculate-server/files/calculate-server-2.1.19-fix_ejabber_20.04.patch @@ -0,0 +1,57 @@ +diff --git a/profile/jabber/etc/jabber/ejabberd.yml b/profile/jabber/etc/jabber/ejabberd.yml +index 6706b1e..e4e44c2 100644 +--- a/profile/jabber/etc/jabber/ejabberd.yml ++++ b/profile/jabber/etc/jabber/ejabberd.yml +@@ -58,6 +58,35 @@ acl: + local: + user_regexp: + - "" ++#?pkg(ejabber)>=20.04# ++access: ++ announce: ++ - allow: admin ++ c2s: ++ - deny: blocked ++ - allow ++ configure: ++ - allow: admin ++ local: ++ - allow: local ++ muc: ++ - allow ++ muc_admin: ++ - allow: admin ++ pubsub_createnode: ++ - allow ++ register: ++ - allow ++host_config: ++ "localhost": ++ access: ++ c2s: ++ - allow: admin ++ - deny ++ register: ++ - deny ++#pkg# ++#?pkg(ejabber)<20.04# + access: + announce: + admin: allow +@@ -91,6 +120,7 @@ host_config: + all: deny + register: + all: deny ++#pkg# + language: "en" + modules: + mod_adhoc: [] +@@ -122,7 +152,7 @@ modules: + mod_pubsub: + access_createnode: pubsub_createnode + plugins: +- - "default" ++ - "flat" + - "pep" + mod_register: + welcome_message: