rpm/proftpd
SHA256
1
0
Fork 0
forked from pool/proftpd
Code Pull Requests Activity

Accepting request 705245 from network

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/705245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/proftpd?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger 2019-05-27 06:38:07 +00:00 committed by Git OBS Bridge
commit 781f84d3fb
9 changed files with 97 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proftpd-1.3.5e.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8307dc0103a8e716b99745919be7f09b54708c57c7d5aa70262f7593dc56bc9d
size 29968142

7
proftpd-1.3.5e.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - https://gpgtools.org
iEYEABECAAYFAljqnpEACgkQt46JP6URl2perACgjwSNGXCRyoRFQRsIY2s+1aXd
IZgAoPP5fcWOlP0i2/Dl8tnQrYFtI0gG
=wGie
-----END PGP SIGNATURE-----

3
proftpd-1.3.6.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf
size 20251898

7
proftpd-1.3.6.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - https://gpgtools.org
iEYEABECAAYFAljq8/4ACgkQt46JP6URl2oeRgCgnSKx9AkHLREqrmWZo+3i6moP
IjYAn1UICZqevlqSkXr9dFBbI1850pTv
=mcPy
-----END PGP SIGNATURE-----

4
proftpd-ftpasswd.patch
View File

@ -2,7 +2,7 @@ Index: contrib/ftpasswd
===================================================================
--- contrib/ftpasswd.orig
+++ contrib/ftpasswd
@@ -34,8 +34,8 @@ use Getopt::Long;
@@ -32,8 +32,8 @@ use Getopt::Long;
$Getopt::Long::auto_abbrev = 0;
my $program = basename($0);
@ -13,7 +13,7 @@ Index: contrib/ftpasswd
my $shell_file = "/etc/shells";
my $default_cracklib_dict = "/usr/lib/cracklib_dict";
my $cracklib_dict;
@@ -1074,6 +1074,46 @@ usage: $program [--help] [--hash|--group
@@ -1109,6 +1109,46 @@ usage: $program [--help] [--hash|--group
--version
Displays the version of $program.

16
proftpd-no_BuildDate.patch
View File

@ -65,13 +65,13 @@ Index: include/version.h
-#include "buildstamp.h"
-
/* Application version (in various forms) */
#define PROFTPD_VERSION_NUMBER 0x0001030511
#define PROFTPD_VERSION_TEXT "1.3.5e"
#define PROFTPD_VERSION_NUMBER 0x0001030605
#define PROFTPD_VERSION_TEXT "1.3.6"
Index: src/main.c
===================================================================
--- src/main.c.orig
+++ src/main.c
@@ -2435,8 +2435,8 @@ static void standalone_main(void) {
@@ -1883,8 +1883,8 @@ static void standalone_main(void) {
init_bindings();
@ -80,9 +80,9 @@ Index: src/main.c
+ pr_log_pri(PR_LOG_NOTICE, "ProFTPD %s standalone mode STARTUP",
+ PROFTPD_VERSION_TEXT " " PR_STATUS);
pr_pidfile_write();
daemon_loop();
@@ -2491,7 +2491,6 @@ static void show_settings(void) {
if (pr_pidfile_write() < 0) {
fprintf(stderr, "error opening PidFile '%s': %s\n", pr_pidfile_get(),
@@ -1944,7 +1944,6 @@ static void show_settings(void) {
printf("%s", " Platform: " PR_PLATFORM " [unknown]\n");
#endif /* !HAVE_UNAME */
@ -90,11 +90,11 @@ Index: src/main.c
printf("%s", " Built With:\n configure " PR_BUILD_OPTS "\n\n");
printf("%s", " CFLAGS: " PR_BUILD_CFLAGS "\n");
@@ -3009,7 +3008,6 @@ int main(int argc, char *argv[], char **
@@ -2523,7 +2522,6 @@ int main(int argc, char *argv[], char **
printf("ProFTPD Version: %s", PROFTPD_VERSION_TEXT " " PR_STATUS "\n");
printf(" Scoreboard Version: %08x\n", PR_SCOREBOARD_VERSION);
- printf(" Built: %s\n\n", BUILD_STAMP);
modules_list(PR_MODULES_LIST_FL_SHOW_VERSION);
modules_list2(NULL, PR_MODULES_LIST_FL_SHOW_VERSION);
exit(0);

66
proftpd.changes
View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Tue Mar 26 11:35:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Fix the Factory build: select the appropriate OpenSSL version
to build with.
-------------------------------------------------------------------
Wed Mar 20 18:46:47 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Reduce hard dependency on systemd to only that which is
necessary for building and installation.
- Modernize RPM macro use (%make_install, %tmpfiles_create).
- Strip emphasis from description and trim other platform mentions.
-------------------------------------------------------------------
Wed Jul 11 08:05:29 UTC 2018 - chris@computersalat.de
- update to 1.3.6
* Support for using Redis for caching, logging; see the doc/howto/Redis.html
documentation.
* Fixed mod_sql_postgres SSL support (Issue #415).
* Support building against LibreSSL instead of OpenSSL (Issue #361).
* Better support on AIX for login restraictions (Bug #4285).
* TimeoutLogin (and other timeouts) were not working properly for SFTP
connections (Bug#4299).
* Handling of the SIGILL and SIGINT signals, by the daemon process, now causes
the child processes to be terminated as well (Issue #461).
* RPM .spec file naming changed to conform to Fedora guidelines.
* Fix for "AllowChrootSymlinks off" checking each component for symlinks
(CVE-2017-7418).
-New Modules:
* mod_redis, mod_tls_redis, mod_wrap2_redis
With Redis now supported as a caching mechanism, similar to Memcache,
there are now Redis-using modules: mod_redis (for configuring the Redis
connection information), mod_tls_redis (for caching SSL sessions and
OCSP information using Redis), and mod_wrap2_redis (for using ACLs stored
in Redis).
-Changed Modules:
* mod_ban
The mod_ban module's BanCache directive can now use Redis-based caching;
see doc/contrib/mod_ban.html#BanCache.
-New Configuration Directives
* SQLPasswordArgon2, SQLPasswordScrypt
The key lengths for Argon2 and Scrypt-based passwords are now configurable
via these new directives; previously, the key length had been hardcoded
to be 32 bytes, which is not interoperable with all other implementations
(Issue #454).
-Changed Configuration Directives
* AllowChrootSymlinks
When "AllowChrootSymlinks off" was used, only the last portion of the
DefaultRoot path would be checked to see if it was a symlink. Now,
each component of the DefaultRoot path will be checked to see if it is
a symlink when "AllowChrootSymlinks off" is used.
* Include
The Include directive can now be used within a <Limit> section, e.g.:
<Limit LOGIN>
Include /path/to/allowed.txt
DenyAll
</Limit>
-API Changes
* A new JSON API has been added, for use by third-party modules.
- remove obsolete proftpd_include-in-limit-section.patch
- rebase patches
* proftpd-ftpasswd.patch
* proftpd-no_BuildDate.patch
-------------------------------------------------------------------
Tue Jul 10 11:57:58 UTC 2018 - chris@computersalat.de

26
proftpd.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package proftpd
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,17 +12,17 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: proftpd
Summary: Highly configurable GPL-licensed FTP server software
Summary: Configurable GPL-licensed FTP server software
# Please save your time and do not update to "rc" versions.
# We only accept updates for "STABLE" Versions
License: GPL-2.0-or-later
Group: Productivity/Networking/Ftp/Servers
Version: 1.3.5e
Version: 1.3.6
Release: 0
Url: http://www.proftpd.org/
Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
@ -45,8 +45,6 @@ Patch102: %{name}-ftpasswd.patch
Patch103: %{name}-strip.patch
#PATCH-FIX-openSUSE: file-contains-date-and-time
Patch104: %{name}-no_BuildDate.patch
#PATCH-Feature-back-port: include-in-limit-section
Patch105: %{name}_include-in-limit-section.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#BuildRequires: gpg-offline
BuildRequires: fdupes
@ -58,12 +56,12 @@ BuildRequires: libGeoIP-devel
BuildRequires: mysql-devel
BuildRequires: ncurses-devel
BuildRequires: openldap2-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: pkg-config
BuildRequires: postgresql-devel
BuildRequires: sqlite3-devel
BuildRequires: unixODBC-devel
BuildRequires: pkgconfig(libssl) < 1.1
Requires: logrotate
%if 0%{?lang_package:1} > 0
@ -71,17 +69,16 @@ Recommends: %{name}-lang
%endif
%if 0%{?suse_version} >= 1210
BuildRequires: systemd
%{?systemd_requires}
BuildRequires: systemd-rpm-macros
%{?systemd_ordering}
%define has_systemd 1
%else
Requires(pre): %insserv_prereq
%endif
%description
ProFTPD is a highly configurable FTP daemon for Unix and Unix-like
operating systems. See the README.ports file for more details about
the platforms on which ProFTPD in known or thought to build and run.
ProFTPD is a configurable FTP daemon for Unix and Unix-like
operating systems.
%{?lang_package}
@ -151,7 +148,6 @@ rm README.AIX
%patch102
%patch103
%patch104
%patch105
%build
rm contrib/mod_wrap.c
@ -184,7 +180,7 @@ export CXXFLAGS="$CFLAGS"
make %{?_smp_mflags}
%install
%makeinstall INSTALL_USER=`id -un` INSTALL_GROUP=`id -gn`
%make_install INSTALL_USER=`id -un` INSTALL_GROUP=`id -gn`
install -D -m 0644 contrib/dist/rpm/ftp.pamd %{buildroot}/%{_sysconfdir}/pam.d/%{name}
install -D -m 0644 contrib/dist/rpm/%{name}.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
#
@ -231,7 +227,7 @@ ln -sf %{_sysconfdir}/init.d/%{name} %{buildroot}/%{_sbindir}/rc%{name}
%post
%if 0%{?has_systemd}
%service_add_post %{name}.service
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf || :
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
%else
%{fillup_and_insserv -f proftpd}
install -d %{_localstatedir}/run/%{name}

47
proftpd_include-in-limit-section.patch
View File

@ -1,47 +0,0 @@
Index: RELEASE_NOTES
===================================================================
--- RELEASE_NOTES.orig
+++ RELEASE_NOTES
@@ -20,6 +20,16 @@ ChangeLog files.
+ Fixed regression where all normal FTP users were handled as anonymous
users.
+ + Changed Configuration Directives
+
+ Include
+ The Include directive can now be used within a <Limit> section, e.g.:
+
+ <Limit LOGIN>
+ Include /path/to/allowed.txt
+ DenyAll
+ </Limit>
+
1.3.5c
---------
Index: doc/modules/mod_core.html
===================================================================
--- doc/modules/mod_core.html.orig
+++ doc/modules/mod_core.html
@@ -510,7 +510,7 @@ See also: <a href="#HideGroup"><code>Hid
<h2><a name="Include">Include</a></h2>
<strong>Syntax:</strong> Include <em>path|pattern</em><br>
<strong>Default:</strong> None<br>
-<strong>Context:</strong> server config, <code>&lt;VirtualHost&gt;</code>, <code>&lt;Global&gt;</code>, <code>&lt;Anonymous&gt;</code>, <code>&lt;Directory&gt;</code><br>
+<strong>Context:</strong> server config, <code>&lt;VirtualHost&gt;</code>, <code>&lt;Global&gt;</code>, <code>&lt;Anonymous&gt;</code>, <code>&lt;Limit&gt;</code>, <code>&lt;Directory&gt;</code><br>
<strong>Module:</strong> mod_core<br>
<strong>Compatibility:</strong> 1.2.10rc1 and later
Index: modules/mod_core.c
===================================================================
--- modules/mod_core.c.orig
+++ modules/mod_core.c
@@ -334,7 +334,7 @@ MODRET add_include(cmd_rec *cmd) {
int res;
CHECK_ARGS(cmd, 1);
- CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_ANON|CONF_GLOBAL|CONF_DIR);
+ CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_ANON|CONF_GLOBAL|CONF_LIMIT|CONF_DIR);
/* Make sure the given path is a valid path. */