From cdb5f8c222d6bd43ae72f8b7dde25de654e356a4 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 10 Jan 2022 09:54:06 +0000 Subject: [PATCH 1/2] update ebuild to reflect current version and changes; fixes #1 Signed-off-by: Michael Kaufmann (d00p) --- profiles/eapi | 2 +- sys-auth/libnss-extrausers/metadata.xml | 9 +++ www-apps/froxlor/Manifest | 2 +- ...-0.10.25.ebuild => froxlor-0.10.32.ebuild} | 75 +++++++------------ www-apps/froxlor/froxlor-9999.ebuild | 75 +++++++------------ www-apps/froxlor/metadata.xml | 3 - 6 files changed, 61 insertions(+), 105 deletions(-) create mode 100644 sys-auth/libnss-extrausers/metadata.xml rename www-apps/froxlor/{froxlor-0.10.25.ebuild => froxlor-0.10.32.ebuild} (75%) diff --git a/profiles/eapi b/profiles/eapi index 7ed6ff8..7f8f011 100644 --- a/profiles/eapi +++ b/profiles/eapi @@ -1 +1 @@ -5 +7 diff --git a/sys-auth/libnss-extrausers/metadata.xml b/sys-auth/libnss-extrausers/metadata.xml new file mode 100644 index 0000000..c6f7bee --- /dev/null +++ b/sys-auth/libnss-extrausers/metadata.xml @@ -0,0 +1,9 @@ + + + + + release@froxlor.org + Upstream Provider + + nss module to have an additional passwd, shadow and group file. + diff --git a/www-apps/froxlor/Manifest b/www-apps/froxlor/Manifest index 1dc3c57..a54a73e 100644 --- a/www-apps/froxlor/Manifest +++ b/www-apps/froxlor/Manifest @@ -1 +1 @@ -DIST froxlor-0.10.25.tar.gz 2516439 BLAKE2B 4b822fbccca3a5d7672b07f39f3229068ff13507457c92c23aedf7685787146f2b447c1e87207492bf9952168dfd9246d9e08b27991385df7390dae561042428 SHA512 8e6759c98af01d76e3f023b364f83dd013296eadb60c2b2d97a1a528e1b29c762d4e74f4a3b0081e2a4f6989003db3e9a63acc24ba8d3961e173f269362169d3 +DIST froxlor-0.10.32.tar.gz 2578319 BLAKE2B a56322ac470866d56e5d8e81ee9e5f461bd85868a27261aa6fe74b31c1f2367caf0f7eb969d943c2936948fe8b0256de4b2b28c83cf3460abc2fd384e44081bd SHA512 affc7d034f80e0286abb103039c973c2c6b62f62658495cf941bfe07b82fbe384e3d5bfb152b5ac05c1a385ee53597be4e2eded781d9039182b5769a3a4eac0a diff --git a/www-apps/froxlor/froxlor-0.10.25.ebuild b/www-apps/froxlor/froxlor-0.10.32.ebuild similarity index 75% rename from www-apps/froxlor/froxlor-0.10.25.ebuild rename to www-apps/froxlor/froxlor-0.10.32.ebuild index 072e146..59bef85 100644 --- a/www-apps/froxlor/froxlor-0.10.25.ebuild +++ b/www-apps/froxlor/froxlor-0.10.32.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -19,25 +19,19 @@ HOMEPAGE="https://www.froxlor.org/" LICENSE="GPL-2" SLOT="0" -IUSE="awstats bind domainkey +dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pdns pureftpd quota ssl vsftpd" +IUSE="awstats bind +dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pdns pureftpd quota ssl" DEPEND=" + virtual/mysql >=mail-mta/postfix-2.4[mysql,ssl=] virtual/cron - >=dev-lang/php-7.1:*[bcmath,cli,ctype,curl,filter,gd,json,mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib,zip] + >=dev-lang/php-7.1:*[bcmath,cli,ctype,curl,filter,gd,json(+),mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib,zip] pureftpd? ( net-ftp/pure-ftpd[mysql,ssl=] ) - vsftpd? ( - net-ftp/vsftpd[pam,ssl=] - sys-auth/pam_mysql - ) !pureftpd? ( - ( !vsftpd? ( - net-ftp/proftpd[mysql,ssl=] - ftpquota? ( net-ftp/proftpd[softquota] ) - ) - ) + net-ftp/proftpd[mysql,ssl=] + ftpquota? ( net-ftp/proftpd[softquota] ) ) awstats? ( www-misc/awstats @@ -45,12 +39,8 @@ DEPEND=" !awstats? ( app-admin/webalizer ) - bind? ( net-dns/bind - domainkey? ( mail-filter/opendkim[ssl=] ) - ) - pdns? ( net-dns/pdns[mysql] - domainkey? ( mail-filter/opendkim[ssl=] ) - ) + bind? ( net-dns/bind ) + pdns? ( net-dns/pdns[mysql] ) ssl? ( dev-libs/openssl ) lighttpd? ( www-servers/lighttpd[php,ssl=] ) nginx? ( @@ -93,19 +83,18 @@ DEPEND=" >=mail-mta/postfix-2.4[dovecot-sasl] ) !dovecot? ( dev-libs/cyrus-sasl[mysql,ssl=] - net-libs/courier-authlib[crypt,mysql] + net-libs/courier-authlib[mysql] net-mail/courier-imap >=mail-mta/postfix-2.4[sasl] ) - mailquota? ( >=mail-mta/postfix-2.4[vda] ) quota? ( sys-fs/quotatool )" RDEPEND="${DEPEND}" -REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm ) vsftpd? ( !ftpquota ) pdns? ( !bind )" +REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm ) pdns? ( !bind )" # we need that to set the standardlanguage later -LANGS="de en fr it nl pt sv" +LANGS="cs de en fr it nl pt sv" for X in ${LANGS} ; do IUSE="${IUSE} l10n_${X}" done @@ -138,13 +127,15 @@ src_install() { elif use l10n_fr ; then MYLANG="Français" elif use l10n_it ; then - MYLANG="Italian" + MYLANG="Italiano" elif use l10n_nl ; then - MYLANG="Dutch" + MYLANG="Nederlands" elif use l10n_pt ; then MYLANG="Português" elif use l10n_sv ; then - MYLANG="Swedish" + MYLANG="Svenska" + elif use l10n_cs ; then + MYLANG="Česká republika" fi if [[ ${MYLANG} != '' ]] ; then @@ -160,8 +151,8 @@ src_install() { einfo "Switching settings to fit 'lighttpd'" sed -e "s|/etc/init.d/apache2 reload|/etc/init.d/lighttpd restart|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver restart-command" sed -e "s|'webserver', 'apache2'|'webserver', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver version" - sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/lighttpd/froxlor-vhosts.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" - sed -e "s|'apacheconf_diroptions', '/etc/apache2/diroptions.conf'|'apacheconf_diroptions', '/etc/lighttpd/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file" + sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/lighttpd/vj/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" + sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/lighttpd/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file" sed -e "s|'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'|'apacheconf_htpasswddir', '/etc/lighttpd/htpasswd/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver htpasswd directory" sed -e "s|'httpuser', 'www-data'|'httpuser', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user" sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group" @@ -170,15 +161,16 @@ src_install() { einfo "Switching settings to fit 'nginx'" sed -e "s|/etc/init.d/apache2 reload|/etc/init.d/nginx restart|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver restart-command" sed -e "s|'webserver', 'apache2'|'webserver', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver version" - sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/nginx/froxlor-vhosts.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" - sed -e "s|'apacheconf_diroptions', '/etc/apache2/diroptions.conf'|'apacheconf_diroptions', '/etc/nginx/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file" + sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/nginx/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" + sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/nginx/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file" sed -e "s|'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'|'apacheconf_htpasswddir', '/etc/nginx/htpasswd/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver htpasswd directory" sed -e "s|'httpuser', 'www-data'|'httpuser', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user" sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group" sed -e "s|'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'|'fastcgi_ipcdir', '/var/run/nginx/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change php-ipc directory" else einfo "Switching settings to fit 'apache2'" - sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" + sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" + sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file" sed -e "s|'httpuser', 'www-data'|'httpuser', 'apache'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user" sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'apache'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group" fi @@ -195,17 +187,9 @@ src_install() { einfo "Switching 'fpm' to 'On'" sed -e "s|'phpfpm', 'enabled', '0'|'phpfpm', 'enabled', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set fpm to 'On'" - einfo "Setting configdir for fpm" - sed -e "s|'phpfpm', 'configdir', '/etc/php-fpm.d/'|'phpfpm', 'configdir', '/etc/php/fpm-php5.3/fpm.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set configdir for 'fpm'" - -# ewarn "tell here what to do for including fpm.d/*.conf" -# einfo "Enable custom configdir for fpm" -# sed -e "s|;include=/etc/php/fpm-php5.3/fpm.d/*.conf|include=/etc/php/fpm-php5.3/fpm.d/*.conf|g" -i "/etc/php/fpm-php5.3/php-fpm.conf" || die "Unable to set custom configdir for 'fpm'" - -# einfo "Checking for directory /etc/php/fpm-php5.3/fpm.d/" -# if [ ! -d /etc/php/fpm-php5.3/fpm.d/ ]; then -# dodir "/etc/php/fpm-php5.3/fpm.d/" -# fi +# how to get version of required/installed php package? +# einfo "Setting configdir for fpm" +# sed -e "s|'phpfpm', 'configdir', '/etc/php-fpm.d/'|'phpfpm', 'configdir', '/etc/php/fpm-php5.3/fpm.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set configdir for 'fpm'" fi @@ -245,15 +229,6 @@ src_install() { sed -e "s|'mail_quota_enabled', '0'|'mail_quota_enabled', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set mailquota to 'On'" fi - # default value is dkim_enabled='0' - if use domainkey && use bind ; then - einfo "Switching 'domainkey' to 'On'" - sed -e "s|'use_dkim', '0'|'use_dkim', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set domainkey to 'On'" - - einfo "Setting dkim-path to gentoo value" - sed -e "s|'dkim_prefix', '/etc/postfix/dkim/'|'dkim_prefix', '/etc/mail/dkim-filter/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set domainkey prefix" - fi - # default value is ssl_enabled='1' if ! use ssl ; then einfo "Switching 'SSL' to 'Off'" diff --git a/www-apps/froxlor/froxlor-9999.ebuild b/www-apps/froxlor/froxlor-9999.ebuild index 072e146..59bef85 100644 --- a/www-apps/froxlor/froxlor-9999.ebuild +++ b/www-apps/froxlor/froxlor-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -19,25 +19,19 @@ HOMEPAGE="https://www.froxlor.org/" LICENSE="GPL-2" SLOT="0" -IUSE="awstats bind domainkey +dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pdns pureftpd quota ssl vsftpd" +IUSE="awstats bind +dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pdns pureftpd quota ssl" DEPEND=" + virtual/mysql >=mail-mta/postfix-2.4[mysql,ssl=] virtual/cron - >=dev-lang/php-7.1:*[bcmath,cli,ctype,curl,filter,gd,json,mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib,zip] + >=dev-lang/php-7.1:*[bcmath,cli,ctype,curl,filter,gd,json(+),mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib,zip] pureftpd? ( net-ftp/pure-ftpd[mysql,ssl=] ) - vsftpd? ( - net-ftp/vsftpd[pam,ssl=] - sys-auth/pam_mysql - ) !pureftpd? ( - ( !vsftpd? ( - net-ftp/proftpd[mysql,ssl=] - ftpquota? ( net-ftp/proftpd[softquota] ) - ) - ) + net-ftp/proftpd[mysql,ssl=] + ftpquota? ( net-ftp/proftpd[softquota] ) ) awstats? ( www-misc/awstats @@ -45,12 +39,8 @@ DEPEND=" !awstats? ( app-admin/webalizer ) - bind? ( net-dns/bind - domainkey? ( mail-filter/opendkim[ssl=] ) - ) - pdns? ( net-dns/pdns[mysql] - domainkey? ( mail-filter/opendkim[ssl=] ) - ) + bind? ( net-dns/bind ) + pdns? ( net-dns/pdns[mysql] ) ssl? ( dev-libs/openssl ) lighttpd? ( www-servers/lighttpd[php,ssl=] ) nginx? ( @@ -93,19 +83,18 @@ DEPEND=" >=mail-mta/postfix-2.4[dovecot-sasl] ) !dovecot? ( dev-libs/cyrus-sasl[mysql,ssl=] - net-libs/courier-authlib[crypt,mysql] + net-libs/courier-authlib[mysql] net-mail/courier-imap >=mail-mta/postfix-2.4[sasl] ) - mailquota? ( >=mail-mta/postfix-2.4[vda] ) quota? ( sys-fs/quotatool )" RDEPEND="${DEPEND}" -REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm ) vsftpd? ( !ftpquota ) pdns? ( !bind )" +REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm ) pdns? ( !bind )" # we need that to set the standardlanguage later -LANGS="de en fr it nl pt sv" +LANGS="cs de en fr it nl pt sv" for X in ${LANGS} ; do IUSE="${IUSE} l10n_${X}" done @@ -138,13 +127,15 @@ src_install() { elif use l10n_fr ; then MYLANG="Français" elif use l10n_it ; then - MYLANG="Italian" + MYLANG="Italiano" elif use l10n_nl ; then - MYLANG="Dutch" + MYLANG="Nederlands" elif use l10n_pt ; then MYLANG="Português" elif use l10n_sv ; then - MYLANG="Swedish" + MYLANG="Svenska" + elif use l10n_cs ; then + MYLANG="Česká republika" fi if [[ ${MYLANG} != '' ]] ; then @@ -160,8 +151,8 @@ src_install() { einfo "Switching settings to fit 'lighttpd'" sed -e "s|/etc/init.d/apache2 reload|/etc/init.d/lighttpd restart|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver restart-command" sed -e "s|'webserver', 'apache2'|'webserver', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver version" - sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/lighttpd/froxlor-vhosts.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" - sed -e "s|'apacheconf_diroptions', '/etc/apache2/diroptions.conf'|'apacheconf_diroptions', '/etc/lighttpd/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file" + sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/lighttpd/vj/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" + sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/lighttpd/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file" sed -e "s|'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'|'apacheconf_htpasswddir', '/etc/lighttpd/htpasswd/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver htpasswd directory" sed -e "s|'httpuser', 'www-data'|'httpuser', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user" sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group" @@ -170,15 +161,16 @@ src_install() { einfo "Switching settings to fit 'nginx'" sed -e "s|/etc/init.d/apache2 reload|/etc/init.d/nginx restart|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver restart-command" sed -e "s|'webserver', 'apache2'|'webserver', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver version" - sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/nginx/froxlor-vhosts.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" - sed -e "s|'apacheconf_diroptions', '/etc/apache2/diroptions.conf'|'apacheconf_diroptions', '/etc/nginx/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file" + sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/nginx/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" + sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/nginx/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file" sed -e "s|'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'|'apacheconf_htpasswddir', '/etc/nginx/htpasswd/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver htpasswd directory" sed -e "s|'httpuser', 'www-data'|'httpuser', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user" sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group" sed -e "s|'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'|'fastcgi_ipcdir', '/var/run/nginx/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change php-ipc directory" else einfo "Switching settings to fit 'apache2'" - sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" + sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory" + sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file" sed -e "s|'httpuser', 'www-data'|'httpuser', 'apache'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user" sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'apache'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group" fi @@ -195,17 +187,9 @@ src_install() { einfo "Switching 'fpm' to 'On'" sed -e "s|'phpfpm', 'enabled', '0'|'phpfpm', 'enabled', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set fpm to 'On'" - einfo "Setting configdir for fpm" - sed -e "s|'phpfpm', 'configdir', '/etc/php-fpm.d/'|'phpfpm', 'configdir', '/etc/php/fpm-php5.3/fpm.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set configdir for 'fpm'" - -# ewarn "tell here what to do for including fpm.d/*.conf" -# einfo "Enable custom configdir for fpm" -# sed -e "s|;include=/etc/php/fpm-php5.3/fpm.d/*.conf|include=/etc/php/fpm-php5.3/fpm.d/*.conf|g" -i "/etc/php/fpm-php5.3/php-fpm.conf" || die "Unable to set custom configdir for 'fpm'" - -# einfo "Checking for directory /etc/php/fpm-php5.3/fpm.d/" -# if [ ! -d /etc/php/fpm-php5.3/fpm.d/ ]; then -# dodir "/etc/php/fpm-php5.3/fpm.d/" -# fi +# how to get version of required/installed php package? +# einfo "Setting configdir for fpm" +# sed -e "s|'phpfpm', 'configdir', '/etc/php-fpm.d/'|'phpfpm', 'configdir', '/etc/php/fpm-php5.3/fpm.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set configdir for 'fpm'" fi @@ -245,15 +229,6 @@ src_install() { sed -e "s|'mail_quota_enabled', '0'|'mail_quota_enabled', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set mailquota to 'On'" fi - # default value is dkim_enabled='0' - if use domainkey && use bind ; then - einfo "Switching 'domainkey' to 'On'" - sed -e "s|'use_dkim', '0'|'use_dkim', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set domainkey to 'On'" - - einfo "Setting dkim-path to gentoo value" - sed -e "s|'dkim_prefix', '/etc/postfix/dkim/'|'dkim_prefix', '/etc/mail/dkim-filter/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set domainkey prefix" - fi - # default value is ssl_enabled='1' if ! use ssl ; then einfo "Switching 'SSL' to 'Off'" diff --git a/www-apps/froxlor/metadata.xml b/www-apps/froxlor/metadata.xml index 47de440..f864ddc 100644 --- a/www-apps/froxlor/metadata.xml +++ b/www-apps/froxlor/metadata.xml @@ -9,8 +9,6 @@ use AWStats instead of Webalizer Adds support for writing BIND configuration files - Adds support for writing DKIM DNS-Records and - Filters for them use Dovecot instead of Courier Adds support for FCGId Adds support for FTP Quotas for use with ProFTPd @@ -23,7 +21,6 @@ use Power-DNS instead of Bind use pure-FTPd instead of ProFTPd Adds support for Filesystem-Quotas - use vsFTPd instead of ProFTPd cpe:/a:froxlor:froxlor From 91bb30381eb0a7b5936ddad07fb766e91a4ee7e9 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 10 Feb 2022 07:19:04 +0000 Subject: [PATCH 2/2] update ebuild to current stable version 0.10.33 Signed-off-by: Michael Kaufmann (d00p) --- www-apps/froxlor/Manifest | 2 +- .../froxlor/{froxlor-0.10.32.ebuild => froxlor-0.10.33.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename www-apps/froxlor/{froxlor-0.10.32.ebuild => froxlor-0.10.33.ebuild} (100%) diff --git a/www-apps/froxlor/Manifest b/www-apps/froxlor/Manifest index a54a73e..bcf7dc8 100644 --- a/www-apps/froxlor/Manifest +++ b/www-apps/froxlor/Manifest @@ -1 +1 @@ -DIST froxlor-0.10.32.tar.gz 2578319 BLAKE2B a56322ac470866d56e5d8e81ee9e5f461bd85868a27261aa6fe74b31c1f2367caf0f7eb969d943c2936948fe8b0256de4b2b28c83cf3460abc2fd384e44081bd SHA512 affc7d034f80e0286abb103039c973c2c6b62f62658495cf941bfe07b82fbe384e3d5bfb152b5ac05c1a385ee53597be4e2eded781d9039182b5769a3a4eac0a +DIST froxlor-0.10.33.tar.gz 2578273 BLAKE2B ae58fdf4061a5aa234a57767b2ebc52a1dfc5dd5caffbd18d7e2136c06f8900451f7d9b9f2f7f81fd8ed2b8f996f08510204a53ca8976031c2f2b5b56c4071ed SHA512 801a02b4b1e70eb05180468707b1b01c6571459067b8ddbb4ceaf3f587b38331649f7d82ed0941355b8b7cddb8dc56ed11fda37c719ab476e7309c8d49ba8abe diff --git a/www-apps/froxlor/froxlor-0.10.32.ebuild b/www-apps/froxlor/froxlor-0.10.33.ebuild similarity index 100% rename from www-apps/froxlor/froxlor-0.10.32.ebuild rename to www-apps/froxlor/froxlor-0.10.33.ebuild