Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pure ftp drop #27

Merged
merged 21 commits into from
Feb 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 109 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
# use the shared Yast defaults
inherit_from:
/usr/share/YaST2/data/devtools/data/rubocop_yast_style.yml

# Offense count: 2
Lint/UnderscorePrefixedVariableName:
Exclude:
- 'src/modules/FtpServer.rb'

# Offense count: 67
Metrics/AbcSize:
Max: 268

# Offense count: 4
Metrics/BlockNesting:
Max: 4

# Offense count: 2
# Configuration parameters: CountComments.
Metrics/ClassLength:
Max: 879

# Offense count: 11
Metrics/CyclomaticComplexity:
Max: 115

# Offense count: 90
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
# URISchemes: http, https
Metrics/LineLength:
Max: 153

# Offense count: 79
# Configuration parameters: CountComments.
Metrics/MethodLength:
Max: 479

# Offense count: 4
# Configuration parameters: CountComments.
Metrics/ModuleLength:
Max: 1051

# Offense count: 13
Metrics/PerceivedComplexity:
Max: 150

# Offense count: 9
Style/Documentation:
Exclude:
- 'spec/**/*'
- 'test/**/*'
- 'src/clients/ftp-server.rb'
- 'src/clients/ftp-server_auto.rb'
- 'src/include/ftp-server/complex.rb'
- 'src/include/ftp-server/dialogs.rb'
- 'src/include/ftp-server/helps.rb'
- 'src/include/ftp-server/wid_functions.rb'
- 'src/include/ftp-server/wizards.rb'
- 'src/include/ftp-server/write_load.rb'
- 'src/modules/FtpServer.rb'

# Offense count: 3
# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
Style/FileName:
Exclude:
- 'src/clients/ftp-server.rb'
- 'src/clients/ftp-server_auto.rb'
- 'src/modules/FtpServer.rb'

# Offense count: 14
# Configuration parameters: MinBodyLength.
Style/GuardClause:
Exclude:
- 'src/include/ftp-server/dialogs.rb'
- 'src/include/ftp-server/write_load.rb'

# Offense count: 7
Style/IfInsideElse:
Exclude:
- 'src/clients/ftp-server.rb'
- 'src/include/ftp-server/write_load.rb'

# Offense count: 168
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: snake_case, camelCase
Style/MethodName:
Exclude:
- 'src/clients/ftp-server.rb'
- 'src/include/ftp-server/complex.rb'
- 'src/include/ftp-server/dialogs.rb'
- 'src/include/ftp-server/helps.rb'
- 'src/include/ftp-server/wid_functions.rb'
- 'src/include/ftp-server/wizards.rb'
- 'src/include/ftp-server/write_load.rb'
- 'src/modules/FtpServer.rb'

# Offense count: 19
Style/MultilineTernaryOperator:
Exclude:
- 'src/include/ftp-server/write_load.rb'

# Offense count: 20
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: snake_case, camelCase
Style/VariableName:
Exclude:
- 'src/clients/ftp-server.rb'
- 'src/include/ftp-server/helps.rb'
- 'src/modules/FtpServer.rb'
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "yast/rake"

Yast::Tasks.configuration do |conf|
#lets ignore license check for now
# lets ignore license check for now
conf.skip_license_check << /.*/
end
9 changes: 9 additions & 0 deletions package/yast2-ftp-server.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Feb 8 15:07:37 UTC 2018 - jreidinger@suse.com

- convert starting on demand from Xinetd to systemd sockets due
to drop of Xinetd (fate#323373)
- Drop pure-ftp as it does not provide systemd socket and we want
to support only one backend to reduce the maintenance cost
- 4.0.1

-------------------------------------------------------------------
Mon Jan 29 19:35:29 UTC 2018 - knut.anderssen@suse.com

Expand Down
5 changes: 2 additions & 3 deletions package/yast2-ftp-server.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@


Name: yast2-ftp-server
Version: 4.0.0
Version: 4.0.1
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2

# SuSEFirewall2 replace by firewalld (fate#323460)
Requires: yast2 >= 4.0.39
Requires: yast2-inetd
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we only support one backend pure-ftpd can be removed from the description.

BuildRequires: update-desktop-files
# SuSEFirewall2 replace by firewalld (fate#323460)
BuildRequires: yast2 >= 4.0.39
Expand All @@ -43,7 +42,7 @@ Group: System/YaST

%description
This package contains the YaST2 component for FTP configuration. It can
configure two daemons: pure-ftpd and vsftpd.
configure vsftpd.

%prep
%setup -n %{name}-%{version}
Expand Down
Loading