Hello community, here is the log from the commit of package pure-ftpd for openSUSE:Factory checked in at 2017-06-16 10:54:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pure-ftpd (Old) and /work/SRC/openSUSE:Factory/.pure-ftpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pure-ftpd" Fri Jun 16 10:54:31 2017 rev:48 rq:503787 version:1.0.46 Changes: -------- --- /work/SRC/openSUSE:Factory/pure-ftpd/pure-ftpd.changes 2017-05-29 22:19:27.449618198 +0200 +++ /work/SRC/openSUSE:Factory/.pure-ftpd.new/pure-ftpd.changes 2017-06-16 10:54:32.877487427 +0200 @@ -1,0 +2,32 @@ +Thu Jun 15 08:40:15 UTC 2017 - [email protected] + +- Version update to 1.0.46: + * Fix build with openssl-1.1 + * The Perl and Python wrappers are gone + * TLS v1.0 sessions are now refused + * Unmaintained contributions have been removed + * File globbing could take up to `GLOB_TIMEOUT` seconds + (17 seconds by default) when matching some patterns, no matter what the + configured recursion level was. +- Refresh patches: + * pure-ftpd-1.0.20_config.patch + * pure-ftpd-1.0.20_doc.patch +- Drop patch pure-ftpd-1.0.32-portrange.patch + * The upstream no longer provide pure-config.pl/py scripts for launching + * This also means the initscript and service were tweaked to reflect this +- Disable xinetd on systemd having versions where we can stick to socket + based services instead + * By default it does not make sense to have this service socket activated + tho so leave it to user to provide this + +------------------------------------------------------------------- +Wed Jun 14 11:32:59 UTC 2017 - [email protected] + +- Fix broken pure-ftpd.init script. We cannot use startproc to run + /usr/sbin/pure-config.pl, because the utility assumes that the + name of that executable matches the name of the started process, + which it does not in our case. Furthermore, the start script will + write a status message to stdout, so we don't have to do it in + the init script. [bsc#1042690] + +------------------------------------------------------------------- Old: ---- pure-ftpd-1.0.32-portrange.patch pure-ftpd-1.0.43.tar.gz pure-ftpd-1.0.43.tar.gz.sig New: ---- pure-ftpd-1.0.46.tar.gz pure-ftpd-1.0.46.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pure-ftpd.spec ++++++ --- /var/tmp/diff_new_pack.3ZLSYo/_old 2017-06-16 10:54:33.801357370 +0200 +++ /var/tmp/diff_new_pack.3ZLSYo/_new 2017-06-16 10:54:33.805356807 +0200 @@ -17,7 +17,7 @@ Name: pure-ftpd -Version: 1.0.43 +Version: 1.0.46 Release: 0 Summary: A Lightweight, Fast, and Secure FTP Server License: BSD-3-Clause @@ -40,12 +40,10 @@ Patch5: %{name}-1.0.20_ftpwho_path.patch # PATCH-FIX-UPSTREAM %{name}-1.0.32-default_tcp_sedrcv_buffer_size.patch Patch7: %{name}-1.0.32-default_tcp_sedrcv_buffer_size.patch -# PATCH-FEATURE-OPENSUSE %{name}-1.0.32-portrange.patch -- Add PassivePortRange to "%numpairc_switch_for". -Patch8: %{name}-1.0.32-portrange.patch # PATCH-FIX-OPENSUSE: bnc#789833 # won't be upstreamed, can be dropped when systemd will be only one init system and kernel get AUDIT_LOGINUID_IMMUTABLE -Patch9: pure-ftpd-1.0.36-cap-audit-control.patch -Patch10: pure-ftpd-apparmor.patch +Patch8: pure-ftpd-1.0.36-cap-audit-control.patch +Patch9: pure-ftpd-apparmor.patch BuildRequires: libcap-devel BuildRequires: mysql-devel BuildRequires: openldap2-devel @@ -79,12 +77,11 @@ %patch2 %patch5 %patch7 -%patch8 -%patch9 -p1 -%patch10 -p2 +%patch8 -p1 +%patch9 -p2 %build -CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector -fvisibility=hidden" +#CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector -fvisibility=hidden" %configure \ --with-rfc2640 \ --sysconfdir=%{_sysconfdir}/%{name} \ @@ -109,26 +106,18 @@ --with-tls \ --with-boring \ --with-peruserlimits \ - --with-largefile %{_target_cpu}-suse-linux \ --with-virtualchroot make %{?_smp_mflags} -cat configuration-file/pure-config.pl |grep -v "^print" | grep -v "^exec" > configuration-file/pure-config-args -echo "print join(\" \", @flg);" >> configuration-file/pure-config-args %install make DESTDIR=%{buildroot} install %{?_smp_mflags} install -dD -m 0755 \ - %{buildroot}%{_sysconfdir}/{%{name},%{name}/vhosts,pam.d,xinetd.d,openldap/schema} -install -m 0755 \ - configuration-file/pure-config.pl \ - configuration-file/pure-config-args \ - %{buildroot}%{_sbindir} -install -m 0644 configuration-file/pure-ftpd.conf \ - %{buildroot}%{_sysconfdir}/%{name} + %{buildroot}%{_sysconfdir}/{%{name},%{name}/vhosts,pam.d,openldap/schema} +install -m 0644 pure-ftpd.conf %{buildroot}%{_sysconfdir}/%{name} install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/pure-ftpd -install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/xinetd.d/pure-ftpd + install -m 0644 pureftpd.schema %{buildroot}%{_sysconfdir}/openldap/schema/ install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ @@ -140,6 +129,7 @@ install -D -m0644 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}.service ln -sf service %{buildroot}%{_sbindir}/rc%{name} %else +install -Dm 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/xinetd.d/pure-ftpd install -D -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/init.d/%{name} mkdir -p %{buildroot}%{_sbindir} ln -sf %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} @@ -177,7 +167,7 @@ %files %defattr(-, root, root) -%doc AUTHORS CONTACT COPYING NEWS THANKS README README.Contrib +%doc AUTHORS CONTACT COPYING NEWS THANKS README %doc README.Configuration-File HISTORY README.Virtual-Users README.AppArmor %doc README.LDAP pureftpd-ldap.conf README.MySQL README.PGSQL README.TLS %{_mandir}/man8/* @@ -193,13 +183,13 @@ %config %{_sysconfdir}/openldap/schema/pureftpd.schema %config %{_sysconfdir}/pam.d/pure-ftpd %config(noreplace) %{_sysconfdir}/%{name}/pure-ftpd.conf -%config(noreplace) %{_sysconfdir}/xinetd.d/pure-ftpd %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %config(noreplace) %{_sysconfdir}/apparmor/profiles/extras/usr.sbin.pure-ftpd %if 0%{?suse_version} > 1140 %{_unitdir}/%{name}.service %else +%config(noreplace) %{_sysconfdir}/xinetd.d/pure-ftpd %{_sysconfdir}/init.d/%{name} %endif ++++++ pure-ftpd-1.0.20_config.patch ++++++ --- /var/tmp/diff_new_pack.3ZLSYo/_old 2017-06-16 10:54:33.829353429 +0200 +++ /var/tmp/diff_new_pack.3ZLSYo/_new 2017-06-16 10:54:33.833352866 +0200 @@ -1,34 +1,34 @@ -Index: configuration-file/pure-ftpd.conf.in +Index: pure-ftpd.conf.in =================================================================== ---- configuration-file/pure-ftpd.conf.in.orig -+++ configuration-file/pure-ftpd.conf.in -@@ -37,19 +37,20 @@ BrokenClientsCompatibility no +--- pure-ftpd.conf.in.orig ++++ pure-ftpd.conf.in +@@ -37,19 +37,20 @@ BrokenClientsCompatibility no # Maximum number of simultaneous users --MaxClientsNumber 50 -+MaxClientsNumber 10 +-MaxClientsNumber 50 ++MaxClientsNumber 10 - # Fork in background -- --Daemonize yes -+## systemd users: you shall not change the value to yes unless you modify the -+## appropriate pure-ftpd.service -+Daemonize no +-# Run as a background process ++# Run as a background process, do not change as systemd needs this to be ++# foreground +-Daemonize yes ++Daemonize no - # Maximum number of sim clients with the same IP address --MaxClientsPerIP 8 -+MaxClientsPerIP 3 + # Maximum number of simultaneous clients with the same IP address +-MaxClientsPerIP 8 ++MaxClientsPerIP 3 -@@ -59,6 +60,9 @@ MaxClientsPerIP 8 - VerboseLog no + +@@ -59,6 +60,9 @@ MaxClientsPerIP 8 + VerboseLog no +# Allow dot-files @@ -37,129 +37,61 @@ # List dot-files even when the client doesn't send "-a". -@@ -68,7 +72,7 @@ DisplayDotFiles yes +@@ -68,7 +72,7 @@ DisplayDotFiles yes - # Don't allow authenticated users - have a public anonymous FTP only. + # Disallow authenticated users - Act only as a public FTP server. --AnonymousOnly no -+AnonymousOnly yes +-AnonymousOnly no ++AnonymousOnly yes -@@ -107,23 +111,23 @@ MaxIdleTime 15 +@@ -106,23 +110,23 @@ MaxIdleTime 15 # LDAP configuration file (see README.LDAP) --# LDAPConfigFile /etc/pureftpd-ldap.conf -+# LDAPConfigFile /etc/pure-ftpd/pureftpd-ldap.conf +-# LDAPConfigFile /etc/pureftpd-ldap.conf ++# LDAPConfigFile /etc/pure-ftpd/pureftpd-ldap.conf # MySQL configuration file (see README.MySQL) --# MySQLConfigFile /etc/pureftpd-mysql.conf -+# MySQLConfigFile /etc/pure-ftpd/pureftpd-mysql.conf +-# MySQLConfigFile /etc/pureftpd-mysql.conf ++# MySQLConfigFile /etc/pure-ftpd/pureftpd-mysql.conf - # Postgres configuration file (see README.PGSQL) + # PostgreSQL configuration file (see README.PGSQL) --# PGSQLConfigFile /etc/pureftpd-pgsql.conf -+# PGSQLConfigFile /etc/pure-ftpd/pureftpd-pgsql.conf +-# PGSQLConfigFile /etc/pureftpd-pgsql.conf ++# PGSQLConfigFile /etc/pure-ftpd/pureftpd-pgsql.conf # PureDB user database (see README.Virtual-Users) --# PureDB /etc/pureftpd.pdb -+# PureDB /etc/pure-ftpd/pureftpd.pdb +-# PureDB /etc/pureftpd.pdb ++# PureDB /etc/pure-ftpd/pureftpd.pdb # Path to pure-authd socket (see README.Authentication-Modules) -@@ -134,7 +138,7 @@ MaxIdleTime 15 +@@ -133,7 +137,7 @@ MaxIdleTime 15 # If you want to enable PAM authentication, uncomment the following line --# PAMAuthentication yes -+PAMAuthentication yes - - - -@@ -177,7 +181,7 @@ MaxLoad 4 - - # Port range for passive connections replies. - for firewalling. - --# PassivePortRange 30000 50000 -+PassivePortRange 30000 30100 - - - -@@ -230,14 +234,26 @@ AntiWarez yes - - # File creation mask. <umask for files>:<umask for dirs> . - # 177:077 if you feel paranoid. -+# Note: on SUSE systems umask is overrided by pam_umask inherited from -+# /etc/pam.d/common-session. In case the system-wide default does not -+# fit you, you can either -+# -+# 1.) add line 'session optional pam_umask.so umask=$value' into -+# /etc/pam.d/pure-ftpd, so all changes in common-session will apply -+# for pure-ftpd as well, but config file will be still ignored -+# -+# 2.) replace the line 'session include common-session' in -+# /etc/pam.d/pure-ftpd by the content of /etc/pam.d/common-session, -+# remove the line 'session optional pam_umask.so' and uncomment the -+# line below - --Umask 133:022 -+#Umask 177:077 - - - - # Minimum UID for an authenticated user to log in. - --MinUID 100 -+MinUID 40 +-# PAMAuthentication yes ++PAMAuthentication yes -@@ -257,7 +273,7 @@ AllowAnonymousFXP no - # even if they own them. If TrustedGID is enabled, this group - # will have access to dot-files, though. +@@ -176,7 +180,7 @@ MaxLoad 4 --ProhibitDotFilesWrite no -+ProhibitDotFilesWrite yes + # Port range for passive connections - keep it as broad as possible. +-# PassivePortRange 30000 50000 ++PassivePortRange 30000 30100 -@@ -270,13 +286,13 @@ ProhibitDotFilesRead no - # Never overwrite files. When a file whose name already exist is uploaded, - # it get automatically renamed to file.1, file.2, file.3, ... --AutoRename no -+AutoRename yes - - - - # Disallow anonymous users to upload new files (no = upload is allowed) - --AnonymousCantUpload no -+AnonymousCantUpload yes - - - -@@ -373,7 +389,7 @@ MaxDiskUsage 99 - - # Set to 'yes' if you don't want your users to rename files. - --#NoRename yes -+NoRename yes - - - -@@ -459,3 +475,4 @@ CustomerProof yes - - # FileSystemCharset big5 - # ClientCharset big5 -+ Index: pureftpd-mysql.conf =================================================================== --- pureftpd-mysql.conf.orig ++++++ pure-ftpd-1.0.20_doc.patch ++++++ --- /var/tmp/diff_new_pack.3ZLSYo/_old 2017-06-16 10:54:33.845351177 +0200 +++ /var/tmp/diff_new_pack.3ZLSYo/_new 2017-06-16 10:54:33.849350614 +0200 @@ -5,40 +5,27 @@ =================================================================== --- README.Configuration-File.orig +++ README.Configuration-File -@@ -4,12 +4,12 @@ flag recommended and avoids DNS lookups. +@@ -8,12 +8,12 @@ For example, the '-H' switch is recommen - To enable this, just add it to the server name: + To enable this feature, just add it right after the executable name: - /usr/local/sbin/pure-ftpd -H + /usr/sbin/pure-ftpd -H - Alternative long options are also supported. Here's an equivalent of the - previous command: + Long options are also supported. This is equivalent to the previous + command: - /usr/local/sbin/pure-ftpd --dontresolve + /usr/sbin/pure-ftpd --dontresolve - But you can use traditional configuration files over command-line options. + As an alternative to command-line switches, Pure-FTPd can use a + configuration file. The set of supported features is the same no +@@ -25,7 +25,7 @@ the package installation prefix. -@@ -20,17 +20,17 @@ options. Then, the server will be starte - Please have a look at the 'configuration-files' directory. Copy the sample - configuration file called 'pure-ftpd.conf' to a suitable location, say /etc: + Tweak it according to your needs, and start the server using that file: -- cd configuration-files -- cp pure-ftpd.conf /etc -+ mkdir /etc/pure-ftpd/ -+ cp pure-ftpd.conf /etc/pure-ftpd/ +- /usr/local/sbin/pure-ftpd /etc/pure-ftpd.conf ++ /usr/sbin/pure-ftpd /etc/pure-ftpd.conf --Edit /etc/pure-ftpd.conf according to your needs. -+Edit /etc/pure-ftpd/pure-ftpd.conf according to your needs. - - Then, to start the server, just run the following command: - - chmod 755 pure-config.pl - ./pure-config.pl /etc/pure-ftpd.conf - --This is a simple Perl script that will run /usr/local/sbin/pure-ftpd with -+This is a simple Perl script that will run /usr/sbin/pure-ftpd with - the right options, according to the configuration file. - - We also provide a Python version of this program ('pure-config.py'). + Note the absence of switches. In order to avoid confusion, either a + configuration file or a set of command-line switches can be used. ++++++ pure-ftpd-1.0.43.tar.gz -> pure-ftpd-1.0.46.tar.gz ++++++ ++++ 6276 lines of diff (skipped) ++++++ pure-ftpd.init ++++++ --- /var/tmp/diff_new_pack.3ZLSYo/_old 2017-06-16 10:54:34.057321337 +0200 +++ /var/tmp/diff_new_pack.3ZLSYo/_new 2017-06-16 10:54:34.057321337 +0200 @@ -55,10 +55,7 @@ case "$1" in start) - echo -n "Starting pure-ftpd" - #FTPD_ARGS=`/usr/sbin/pure-config-args /etc/pure-ftpd/pure-ftpd.conf` - #startproc $FTPD_BIN $FTPD_ARGS - startproc /usr/sbin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf --daemonize + $FTPD_BIN /etc/pure-ftpd/pure-ftpd.conf --daemonize rc_status -v ;; stop) ++++++ pure-ftpd.service ++++++ --- /var/tmp/diff_new_pack.3ZLSYo/_old 2017-06-16 10:54:34.097315707 +0200 +++ /var/tmp/diff_new_pack.3ZLSYo/_new 2017-06-16 10:54:34.101315144 +0200 @@ -3,9 +3,7 @@ After=syslog.target network.target [Service] -Type=forking -PIDFile=/var/run/pure-ftpd.pid -ExecStart=/usr/sbin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf --daemonize +ExecStart=/usr/sbin/pure-ftpd /etc/pure-ftpd/pure-ftpd.conf [Install] WantedBy=multi-user.target
