Compare commits
6 Commits
11_0_0-4_e
...
11_0_0-6_e
Author | SHA1 | Date | |
---|---|---|---|
3cbe389a9e | |||
78dae4cbef | |||
fdf0c054bd | |||
684a6ac418 | |||
454c1e0203 | |||
e4a2703cd4 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
||||
*.log
|
||||
*spec-20*
|
||||
*.tar.xz
|
||||
*.bak
|
||||
|
@@ -6,7 +6,14 @@ SMEServer Koozali developed git repo for smeserver-proftpd smeserver
|
||||
<br />https://wiki.koozali.org/
|
||||
|
||||
## Bugzilla
|
||||
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-proftpd&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)\
|
||||
Show list of outstanding bugs:
|
||||
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-proftpd&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-proftpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-proftpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-proftpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-proftpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-proftpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-proftpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
And a list of outstanding Legacy bugs: (e-smith-proftpd) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-proftpd&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
|
||||
|
||||
## Description
|
||||
|
@@ -1 +0,0 @@
|
||||
sme10
|
@@ -1,5 +1,6 @@
|
||||
{
|
||||
#check if TLS is enabled
|
||||
use esmith::ssl;
|
||||
#check if TLS is enabled
|
||||
if (($ftp{TLSEnable} || 'on') eq 'on') {
|
||||
|
||||
#check if TLS is required: values "on", "off"
|
||||
@@ -18,15 +19,16 @@
|
||||
my $chain_file = $modSSL{CertificateChainFile} ||
|
||||
"# no chain cert";
|
||||
$chain_file = "# no chain cert" unless -e $chain_file;
|
||||
|
||||
|
||||
$chain_file = ( $chain_file eq "# no chain cert" )? $chain_file : "TLSCertificateChainFile $chain_file";
|
||||
|
||||
my $ciphers = $modSSL{CipherSuite} || $ftp{CipherSuite} || $smeCiphers;
|
||||
$OUT .= <<SSL_END;
|
||||
|
||||
<IfModule mod_tls.c>
|
||||
TLSEngine on
|
||||
TLSLog /var/log/proftpd/tls.log
|
||||
TLSProtocol TLSv1.1 TLSv1.2
|
||||
TLSProtocol $smeSSLprotocol
|
||||
TLSCipherSuite $ciphers
|
||||
TLSOptions NoCertRequest AllowClientRenegotiations
|
||||
TLSRSACertificateFile $crt
|
||||
TLSRSACertificateKeyFile $key
|
||||
|
@@ -18,6 +18,6 @@
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#----------------------------------------------------------------------
|
||||
exec \
|
||||
/usr/local/bin/setuidgid smelog \
|
||||
/usr/local/bin/multilog t s5000000 \
|
||||
/usr/bin/setuidgid smelog \
|
||||
/usr/bin/multilog t s5000000 \
|
||||
/var/log/ftp
|
||||
|
@@ -4,7 +4,7 @@ Summary: smeserver specific proftpd configuration files and templates
|
||||
%define name smeserver-proftpd
|
||||
Name: %{name}
|
||||
%define version 11.0.0
|
||||
%define release 4
|
||||
%define release 6
|
||||
Version: %{version}
|
||||
Release: %{release}%{?dist}
|
||||
License: GPL
|
||||
@@ -17,10 +17,22 @@ BuildRequires: smeserver-devtools
|
||||
Requires: smeserver-base >= 4.15.0-05, proftpd
|
||||
Requires: smeserver-lib >= 1.15.1-33
|
||||
Requires: iptables
|
||||
# as long as we use tcpsvd
|
||||
Requires: ipsvd
|
||||
# daemontools bins in use
|
||||
Requires: /usr/bin/setuidgid
|
||||
Requires: /usr/bin/multilog
|
||||
Provides: e-smith-proftpd
|
||||
AutoReqProv: no
|
||||
|
||||
%changelog
|
||||
* Sun Jan 26 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-6.sme
|
||||
- adding requirement for deamontools bin [SME: 12566]
|
||||
|
||||
* Sat Jan 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
|
||||
- use esmith::ssl to set ciphers and protocol [SME: 12825]
|
||||
add TLSCipherSuite usage and order ciphers by strength
|
||||
|
||||
* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-4.sme
|
||||
- Update createlinks to create smeserver-package-update event[SME: 12579]
|
||||
|
||||
|
Reference in New Issue
Block a user