Mailinglist Archive: opensuse-commit (941 mails)
| < Previous | Next > |
commit pure-ftpd for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 12 Apr 2012 09:46:45 +0200
- Message-id: <20120412074645.4593220227@hilbert.suse.de>
Hello community,
here is the log from the commit of package pure-ftpd for openSUSE:Factory
checked in at 2012-04-12 09:46:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pure-ftpd (Old)
and /work/SRC/openSUSE:Factory/.pure-ftpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pure-ftpd", Maintainer is "MVyskocil@xxxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pure-ftpd/pure-ftpd.changes 2011-09-23
12:42:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pure-ftpd.new/pure-ftpd.changes 2012-04-12
09:46:43.000000000 +0200
@@ -1,0 +2,38 @@
+Tue Apr 10 11:39:50 UTC 2012 - mvyskocil@xxxxxxx
+
+- update to 1.0.36 :
+ - Sync built-in glob(3) code with OpenBSD-current, and remove code we
+don't use instead of ifdef'ing it.
+ - Repair checkproc() on Linux when support for capabitilies is
+compiled in. Reported by Eric Gouyer.
+ - Don't read /dev/*random every time we need a value. Just use
+arc4random() everywhere and seed it before we possibly chroot().
+ - Add support for MFMT, with the same code as SITE UTIME.
+ - Support 2-arguments SITE UTIME.
+ - LDAP: Add LDAPDefaultHomeDirectory, suggested by Landry Breuil.
+ - Add SSL_OP_NO_SSLv3 to SSL options if the list of ciphers is
+prefixed by -S: , needed by Brad.
+ - Use more paranoid compiler options whenever possible, and preliminary
+uncluttering of the autoconf script.
+ - Try to cache locale-related data at startup after tzset(), rather
+than during a session.
+ - Fix quota computation after rename() overwrites an existing file.
+Reported by Hiramoto Koujo, thanks!
+ - Improved autoconf detection of -fstack-protector and -fPIE
+ - If 10 digits are not enough to print the size of a file in an
+ls-like output, bump the max number of digits to 18. This adds support for
+files up to 1 exabyte.
+ - Don't display dot files (except . and ..) if dot_read_ok is 0 in
+donlist() - but not in sglob() yet. This change is purely cosmetic. There are
+many ways to figure out if a file exists.
+
+- document bnc#756306: pure-ftpd umask setting not working properly
+ * /etc/pure-ftpd/pure-ftpd.conf contains a note about a side-effect of
pam_umask
+
+- add native pure-ftpd.service for systemd-powered systems
+
+- use the same way how to start the daemon in sysvinit script and put
+ $remote_fs dependency
+ usr/sbin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf --daemonize
+
+-------------------------------------------------------------------
Old:
----
pure-ftpd-1.0.32-cap-audit-write.patch
pure-ftpd-1.0.32.tar.bz2
New:
----
pure-ftpd-1.0.36.tar.bz2
pure-ftpd.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pure-ftpd.spec ++++++
--- /var/tmp/diff_new_pack.OQj1PZ/_old 2012-04-12 09:46:44.000000000 +0200
+++ /var/tmp/diff_new_pack.OQj1PZ/_new 2012-04-12 09:46:44.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pure-ftpd
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,18 +20,20 @@
%define with_oes 0
Name: pure-ftpd
-Version: 1.0.32
-Release: 2
-License: BSD-3-Clause
+Version: 1.0.36
+Release: 0
Summary: A Lightweight, Fast, and Secure FTP Server
-Url: http://www.pureftpd.org
+License: BSD-3-Clause
Group: Productivity/Networking/Ftp/Servers
+Url: http://www.pureftpd.org
Source:
ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.bz2
Source1: %{name}.init
Source2: %{name}.pamd
Source3: %{name}.xinetd
Source4: %{name}.xml
Source5: %{name}.firewall
+#http://pkgs.fedoraproject.org/gitweb/?p=pure-ftpd.git;a=blob_plain;f=pure-ftpd.service
+Source6: pure-ftpd.service
# PATCH-FEATURE-OPENSUSE %{name}-1.0.20_config.patch -- Custom service configs.
Patch: %{name}-1.0.20_config.patch
# PATCH-FEATURE-OPENSUSE %{name}-1.0.20_doc.patch -- Adjust command paths on
documentation.
@@ -43,22 +45,26 @@
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-UPSTREAM: bnc#700611
-#https://github.com/jedisct1/pure-ftpd/commit/ac36eb8dd05506b0ffdd78e2f2e85a7ecc9f0fbb
-Patch9: pure-ftpd-1.0.32-cap-audit-write.patch
# OES patches - see %with_oes
Patch100: %{name}-1.0.20-oes_remote_server.patch
Patch101: pure-ftpd-1.0.22-oes-bugfix-534424.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: libcap-devel
BuildRequires: mysql-devel
BuildRequires: openldap2-devel
BuildRequires: pam-devel
BuildRequires: postgresql-devel
-BuildRequires: libcap-devel
PreReq: %insserv_prereq
PreReq: coreutils
Provides: ftp-server
Provides: pureftpd
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%{!?_initddir: %global _initddir /etc/init.d}
+%if 0%{?suse_version} > 1140
+BuildRequires: systemd
+%{?systemd_requires}
+%define have_systemd 1
+%endif
%description
Pure-FTPd is a fast, production-quality, and standard-conforming FTP
@@ -78,7 +84,6 @@
%patch5
%patch7
%patch8
-%patch9 -p1
# uncomment this if you want to have the OES remote_server feature
%if %{with_oes}
%patch100 -p0
@@ -140,20 +145,38 @@
%{__install} -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
%{__install} -m 644 %{S:5}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%name
+%if 0%{?have_systemd}
+%{__install} -D -m0644 %{S:2} %{buildroot}%{_unitdir}/%{name}.service
+%endif
+
%clean
%{__rm} -rf %{buildroot}
+%pre
+%if 0%{?have_systemd}
+%service_add_pre %{name}.service
+%endif
+
%preun
%stop_on_removal %{name}
+%if 0%{?have_systemd}
+%service_del_preun %{name}.service
+%endif
%post
if [ -f etc/pure-ftpd.conf ]; then
mv etc/pure-ftpd.conf etc/pure-ftpd/pure-ftpd.conf
fi
+%if 0%{?have_systemd}
+%service_add_post %{name}.service
+%endif
%postun
%insserv_cleanup
%restart_on_update %{name}
+%if 0%{?have_systemd}
+%service_del_postun %{name}.service
+%endif
%files
%defattr(-, root, root)
@@ -174,5 +197,8 @@
%config(noreplace) %{_sysconfdir}/%{name}/pure-ftpd.conf
%config(noreplace) %{_sysconfdir}/xinetd.d/pure-ftpd
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%name
+%if 0%{?have_systemd}
+%{_unitdir}/%{name}.service
+%endif
%changelog
++++++ pure-ftpd-1.0.20_config.patch ++++++
--- /var/tmp/diff_new_pack.OQj1PZ/_old 2012-04-12 09:46:44.000000000 +0200
+++ /var/tmp/diff_new_pack.OQj1PZ/_new 2012-04-12 09:46:44.000000000 +0200
@@ -1,8 +1,8 @@
Index: configuration-file/pure-ftpd.conf.in
===================================================================
---- configuration-file/pure-ftpd.conf.in.orig
-+++ configuration-file/pure-ftpd.conf.in
-@@ -37,7 +37,7 @@ BrokenClientsCompatibility no
+--- configuration-file/pure-ftpd.conf.in.orig 2012-04-10 13:13:50.172790238
+0200
++++ configuration-file/pure-ftpd.conf.in 2012-04-10 13:28:29.870404545
+0200
+@@ -37,7 +37,7 @@
# Maximum number of simultaneous users
@@ -11,7 +11,7 @@
-@@ -49,7 +49,7 @@ Daemonize yes
+@@ -49,7 +49,7 @@
# Maximum number of sim clients with the same IP address
@@ -20,7 +20,7 @@
-@@ -59,6 +59,9 @@ MaxClientsPerIP 8
+@@ -59,6 +59,9 @@
VerboseLog no
@@ -30,7 +30,7 @@
# List dot-files even when the client doesn't send "-a".
-@@ -68,7 +71,7 @@ DisplayDotFiles yes
+@@ -68,7 +71,7 @@
# Don't allow authenticated users - have a public anonymous FTP only.
@@ -39,7 +39,7 @@
-@@ -107,23 +110,23 @@ MaxIdleTime 15
+@@ -107,23 +110,23 @@
# LDAP configuration file (see README.LDAP)
@@ -67,7 +67,7 @@
# Path to pure-authd socket (see README.Authentication-Modules)
-@@ -134,7 +137,7 @@ MaxIdleTime 15
+@@ -134,7 +137,7 @@
# If you want to enable PAM authentication, uncomment the following line
@@ -76,7 +76,7 @@
-@@ -177,7 +180,7 @@ MaxLoad 4
+@@ -177,7 +180,7 @@
# Port range for passive connections replies. - for firewalling.
@@ -85,12 +85,25 @@
-@@ -231,13 +234,13 @@ AntiWarez yes
+@@ -230,14 +233,26 @@
+
# 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
++#Umask 177:077
@@ -101,7 +114,7 @@
-@@ -257,7 +260,7 @@ AllowAnonymousFXP no
+@@ -257,7 +272,7 @@
# even if they own them. If TrustedGID is enabled, this group
# will have access to dot-files, though.
@@ -110,8 +123,8 @@
-@@ -270,13 +273,13 @@ ProhibitDotFilesRead no
- # Never overwrite files. When a file whoose name already exist is uploaded,
+@@ -270,13 +285,13 @@
+ # 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
@@ -126,7 +139,7 @@
-@@ -372,7 +375,7 @@ MaxDiskUsage 99
+@@ -373,7 +388,7 @@
# Set to 'yes' if you don't want your users to rename files.
@@ -135,15 +148,15 @@
-@@ -442,3 +445,4 @@ CustomerProof yes
+@@ -449,3 +464,4 @@
# FileSystemCharset big5
# ClientCharset big5
+
Index: pureftpd-mysql.conf
===================================================================
---- pureftpd-mysql.conf.orig
-+++ pureftpd-mysql.conf
+--- pureftpd-mysql.conf.orig 2012-04-10 13:13:50.172790238 +0200
++++ pureftpd-mysql.conf 2012-04-10 13:13:55.839987609 +0200
@@ -19,17 +19,18 @@
# Optional : define the location of mysql.sock if the server runs on this
host.
@@ -170,9 +183,9 @@
# Mandatory : database to open.
Index: pureftpd-pgsql.conf
===================================================================
---- pureftpd-pgsql.conf.orig
-+++ pureftpd-pgsql.conf
-@@ -16,6 +16,7 @@ PGSQLPort 5432
+--- pureftpd-pgsql.conf.orig 2012-04-10 13:13:50.172790238 +0200
++++ pureftpd-pgsql.conf 2012-04-10 13:13:55.840987643 +0200
+@@ -16,6 +16,7 @@
# PGSQLPort .s.PGSQL.5432
# Mandatory : user to bind the server as.
++++++ pure-ftpd-1.0.20_virtualhosts.patch ++++++
--- /var/tmp/diff_new_pack.OQj1PZ/_old 2012-04-12 09:46:44.000000000 +0200
+++ /var/tmp/diff_new_pack.OQj1PZ/_new 2012-04-12 09:46:44.000000000 +0200
@@ -1,8 +1,8 @@
Index: src/ftpd.h
===================================================================
---- src/ftpd.h.orig
-+++ src/ftpd.h
-@@ -393,7 +393,7 @@ extern int opt_a, opt_C, opt_d, opt_F, o
+--- src/ftpd.h.orig 2012-04-10 13:13:50.081787071 +0200
++++ src/ftpd.h 2012-04-10 13:15:02.434306712 +0200
+@@ -411,7 +411,7 @@
#endif
#ifndef VHOST_PATH
++++++ pure-ftpd-1.0.32-default_tcp_sedrcv_buffer_size.patch ++++++
--- /var/tmp/diff_new_pack.OQj1PZ/_old 2012-04-12 09:46:44.000000000 +0200
+++ /var/tmp/diff_new_pack.OQj1PZ/_new 2012-04-12 09:46:44.000000000 +0200
@@ -1,8 +1,8 @@
Index: configure
===================================================================
---- configure.orig
-+++ configure
-@@ -11160,107 +11160,12 @@ else
+--- configure.orig 2012-04-10 13:11:53.944741960 +0200
++++ configure 2012-04-10 13:12:09.310277199 +0200
+@@ -12650,107 +12650,12 @@
$as_echo "no" >&6; }
fi
++++++ pure-ftpd-1.0.32.tar.bz2 -> pure-ftpd-1.0.36.tar.bz2 ++++++
++++ 20290 lines of diff (skipped)
++++++ pure-ftpd.init ++++++
--- /var/tmp/diff_new_pack.OQj1PZ/_old 2012-04-12 09:46:45.000000000 +0200
+++ /var/tmp/diff_new_pack.OQj1PZ/_new 2012-04-12 09:46:45.000000000 +0200
@@ -13,8 +13,8 @@
#
### BEGIN INIT INFO
# Provides: pure-ftpd
-# Required-Start: network-remotefs $syslog
-# Required-Stop: network-remotefs $syslog
+# Required-Start: network-remotefs $syslog $remote_fs
+# Required-Stop: network-remotefs $syslog $remote_fs
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: Start pure-ftpd ftp server.
@@ -56,8 +56,9 @@
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
+ #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
rc_status -v
;;
stop)
++++++ pure-ftpd.service ++++++
[Unit]
Description=Pure-FTPd FTP server
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
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
here is the log from the commit of package pure-ftpd for openSUSE:Factory
checked in at 2012-04-12 09:46:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pure-ftpd (Old)
and /work/SRC/openSUSE:Factory/.pure-ftpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pure-ftpd", Maintainer is "MVyskocil@xxxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pure-ftpd/pure-ftpd.changes 2011-09-23
12:42:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pure-ftpd.new/pure-ftpd.changes 2012-04-12
09:46:43.000000000 +0200
@@ -1,0 +2,38 @@
+Tue Apr 10 11:39:50 UTC 2012 - mvyskocil@xxxxxxx
+
+- update to 1.0.36 :
+ - Sync built-in glob(3) code with OpenBSD-current, and remove code we
+don't use instead of ifdef'ing it.
+ - Repair checkproc() on Linux when support for capabitilies is
+compiled in. Reported by Eric Gouyer.
+ - Don't read /dev/*random every time we need a value. Just use
+arc4random() everywhere and seed it before we possibly chroot().
+ - Add support for MFMT, with the same code as SITE UTIME.
+ - Support 2-arguments SITE UTIME.
+ - LDAP: Add LDAPDefaultHomeDirectory, suggested by Landry Breuil.
+ - Add SSL_OP_NO_SSLv3 to SSL options if the list of ciphers is
+prefixed by -S: , needed by Brad.
+ - Use more paranoid compiler options whenever possible, and preliminary
+uncluttering of the autoconf script.
+ - Try to cache locale-related data at startup after tzset(), rather
+than during a session.
+ - Fix quota computation after rename() overwrites an existing file.
+Reported by Hiramoto Koujo, thanks!
+ - Improved autoconf detection of -fstack-protector and -fPIE
+ - If 10 digits are not enough to print the size of a file in an
+ls-like output, bump the max number of digits to 18. This adds support for
+files up to 1 exabyte.
+ - Don't display dot files (except . and ..) if dot_read_ok is 0 in
+donlist() - but not in sglob() yet. This change is purely cosmetic. There are
+many ways to figure out if a file exists.
+
+- document bnc#756306: pure-ftpd umask setting not working properly
+ * /etc/pure-ftpd/pure-ftpd.conf contains a note about a side-effect of
pam_umask
+
+- add native pure-ftpd.service for systemd-powered systems
+
+- use the same way how to start the daemon in sysvinit script and put
+ $remote_fs dependency
+ usr/sbin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf --daemonize
+
+-------------------------------------------------------------------
Old:
----
pure-ftpd-1.0.32-cap-audit-write.patch
pure-ftpd-1.0.32.tar.bz2
New:
----
pure-ftpd-1.0.36.tar.bz2
pure-ftpd.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pure-ftpd.spec ++++++
--- /var/tmp/diff_new_pack.OQj1PZ/_old 2012-04-12 09:46:44.000000000 +0200
+++ /var/tmp/diff_new_pack.OQj1PZ/_new 2012-04-12 09:46:44.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pure-ftpd
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,18 +20,20 @@
%define with_oes 0
Name: pure-ftpd
-Version: 1.0.32
-Release: 2
-License: BSD-3-Clause
+Version: 1.0.36
+Release: 0
Summary: A Lightweight, Fast, and Secure FTP Server
-Url: http://www.pureftpd.org
+License: BSD-3-Clause
Group: Productivity/Networking/Ftp/Servers
+Url: http://www.pureftpd.org
Source:
ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.bz2
Source1: %{name}.init
Source2: %{name}.pamd
Source3: %{name}.xinetd
Source4: %{name}.xml
Source5: %{name}.firewall
+#http://pkgs.fedoraproject.org/gitweb/?p=pure-ftpd.git;a=blob_plain;f=pure-ftpd.service
+Source6: pure-ftpd.service
# PATCH-FEATURE-OPENSUSE %{name}-1.0.20_config.patch -- Custom service configs.
Patch: %{name}-1.0.20_config.patch
# PATCH-FEATURE-OPENSUSE %{name}-1.0.20_doc.patch -- Adjust command paths on
documentation.
@@ -43,22 +45,26 @@
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-UPSTREAM: bnc#700611
-#https://github.com/jedisct1/pure-ftpd/commit/ac36eb8dd05506b0ffdd78e2f2e85a7ecc9f0fbb
-Patch9: pure-ftpd-1.0.32-cap-audit-write.patch
# OES patches - see %with_oes
Patch100: %{name}-1.0.20-oes_remote_server.patch
Patch101: pure-ftpd-1.0.22-oes-bugfix-534424.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: libcap-devel
BuildRequires: mysql-devel
BuildRequires: openldap2-devel
BuildRequires: pam-devel
BuildRequires: postgresql-devel
-BuildRequires: libcap-devel
PreReq: %insserv_prereq
PreReq: coreutils
Provides: ftp-server
Provides: pureftpd
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%{!?_initddir: %global _initddir /etc/init.d}
+%if 0%{?suse_version} > 1140
+BuildRequires: systemd
+%{?systemd_requires}
+%define have_systemd 1
+%endif
%description
Pure-FTPd is a fast, production-quality, and standard-conforming FTP
@@ -78,7 +84,6 @@
%patch5
%patch7
%patch8
-%patch9 -p1
# uncomment this if you want to have the OES remote_server feature
%if %{with_oes}
%patch100 -p0
@@ -140,20 +145,38 @@
%{__install} -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
%{__install} -m 644 %{S:5}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%name
+%if 0%{?have_systemd}
+%{__install} -D -m0644 %{S:2} %{buildroot}%{_unitdir}/%{name}.service
+%endif
+
%clean
%{__rm} -rf %{buildroot}
+%pre
+%if 0%{?have_systemd}
+%service_add_pre %{name}.service
+%endif
+
%preun
%stop_on_removal %{name}
+%if 0%{?have_systemd}
+%service_del_preun %{name}.service
+%endif
%post
if [ -f etc/pure-ftpd.conf ]; then
mv etc/pure-ftpd.conf etc/pure-ftpd/pure-ftpd.conf
fi
+%if 0%{?have_systemd}
+%service_add_post %{name}.service
+%endif
%postun
%insserv_cleanup
%restart_on_update %{name}
+%if 0%{?have_systemd}
+%service_del_postun %{name}.service
+%endif
%files
%defattr(-, root, root)
@@ -174,5 +197,8 @@
%config(noreplace) %{_sysconfdir}/%{name}/pure-ftpd.conf
%config(noreplace) %{_sysconfdir}/xinetd.d/pure-ftpd
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%name
+%if 0%{?have_systemd}
+%{_unitdir}/%{name}.service
+%endif
%changelog
++++++ pure-ftpd-1.0.20_config.patch ++++++
--- /var/tmp/diff_new_pack.OQj1PZ/_old 2012-04-12 09:46:44.000000000 +0200
+++ /var/tmp/diff_new_pack.OQj1PZ/_new 2012-04-12 09:46:44.000000000 +0200
@@ -1,8 +1,8 @@
Index: configuration-file/pure-ftpd.conf.in
===================================================================
---- configuration-file/pure-ftpd.conf.in.orig
-+++ configuration-file/pure-ftpd.conf.in
-@@ -37,7 +37,7 @@ BrokenClientsCompatibility no
+--- configuration-file/pure-ftpd.conf.in.orig 2012-04-10 13:13:50.172790238
+0200
++++ configuration-file/pure-ftpd.conf.in 2012-04-10 13:28:29.870404545
+0200
+@@ -37,7 +37,7 @@
# Maximum number of simultaneous users
@@ -11,7 +11,7 @@
-@@ -49,7 +49,7 @@ Daemonize yes
+@@ -49,7 +49,7 @@
# Maximum number of sim clients with the same IP address
@@ -20,7 +20,7 @@
-@@ -59,6 +59,9 @@ MaxClientsPerIP 8
+@@ -59,6 +59,9 @@
VerboseLog no
@@ -30,7 +30,7 @@
# List dot-files even when the client doesn't send "-a".
-@@ -68,7 +71,7 @@ DisplayDotFiles yes
+@@ -68,7 +71,7 @@
# Don't allow authenticated users - have a public anonymous FTP only.
@@ -39,7 +39,7 @@
-@@ -107,23 +110,23 @@ MaxIdleTime 15
+@@ -107,23 +110,23 @@
# LDAP configuration file (see README.LDAP)
@@ -67,7 +67,7 @@
# Path to pure-authd socket (see README.Authentication-Modules)
-@@ -134,7 +137,7 @@ MaxIdleTime 15
+@@ -134,7 +137,7 @@
# If you want to enable PAM authentication, uncomment the following line
@@ -76,7 +76,7 @@
-@@ -177,7 +180,7 @@ MaxLoad 4
+@@ -177,7 +180,7 @@
# Port range for passive connections replies. - for firewalling.
@@ -85,12 +85,25 @@
-@@ -231,13 +234,13 @@ AntiWarez yes
+@@ -230,14 +233,26 @@
+
# 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
++#Umask 177:077
@@ -101,7 +114,7 @@
-@@ -257,7 +260,7 @@ AllowAnonymousFXP no
+@@ -257,7 +272,7 @@
# even if they own them. If TrustedGID is enabled, this group
# will have access to dot-files, though.
@@ -110,8 +123,8 @@
-@@ -270,13 +273,13 @@ ProhibitDotFilesRead no
- # Never overwrite files. When a file whoose name already exist is uploaded,
+@@ -270,13 +285,13 @@
+ # 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
@@ -126,7 +139,7 @@
-@@ -372,7 +375,7 @@ MaxDiskUsage 99
+@@ -373,7 +388,7 @@
# Set to 'yes' if you don't want your users to rename files.
@@ -135,15 +148,15 @@
-@@ -442,3 +445,4 @@ CustomerProof yes
+@@ -449,3 +464,4 @@
# FileSystemCharset big5
# ClientCharset big5
+
Index: pureftpd-mysql.conf
===================================================================
---- pureftpd-mysql.conf.orig
-+++ pureftpd-mysql.conf
+--- pureftpd-mysql.conf.orig 2012-04-10 13:13:50.172790238 +0200
++++ pureftpd-mysql.conf 2012-04-10 13:13:55.839987609 +0200
@@ -19,17 +19,18 @@
# Optional : define the location of mysql.sock if the server runs on this
host.
@@ -170,9 +183,9 @@
# Mandatory : database to open.
Index: pureftpd-pgsql.conf
===================================================================
---- pureftpd-pgsql.conf.orig
-+++ pureftpd-pgsql.conf
-@@ -16,6 +16,7 @@ PGSQLPort 5432
+--- pureftpd-pgsql.conf.orig 2012-04-10 13:13:50.172790238 +0200
++++ pureftpd-pgsql.conf 2012-04-10 13:13:55.840987643 +0200
+@@ -16,6 +16,7 @@
# PGSQLPort .s.PGSQL.5432
# Mandatory : user to bind the server as.
++++++ pure-ftpd-1.0.20_virtualhosts.patch ++++++
--- /var/tmp/diff_new_pack.OQj1PZ/_old 2012-04-12 09:46:44.000000000 +0200
+++ /var/tmp/diff_new_pack.OQj1PZ/_new 2012-04-12 09:46:44.000000000 +0200
@@ -1,8 +1,8 @@
Index: src/ftpd.h
===================================================================
---- src/ftpd.h.orig
-+++ src/ftpd.h
-@@ -393,7 +393,7 @@ extern int opt_a, opt_C, opt_d, opt_F, o
+--- src/ftpd.h.orig 2012-04-10 13:13:50.081787071 +0200
++++ src/ftpd.h 2012-04-10 13:15:02.434306712 +0200
+@@ -411,7 +411,7 @@
#endif
#ifndef VHOST_PATH
++++++ pure-ftpd-1.0.32-default_tcp_sedrcv_buffer_size.patch ++++++
--- /var/tmp/diff_new_pack.OQj1PZ/_old 2012-04-12 09:46:44.000000000 +0200
+++ /var/tmp/diff_new_pack.OQj1PZ/_new 2012-04-12 09:46:44.000000000 +0200
@@ -1,8 +1,8 @@
Index: configure
===================================================================
---- configure.orig
-+++ configure
-@@ -11160,107 +11160,12 @@ else
+--- configure.orig 2012-04-10 13:11:53.944741960 +0200
++++ configure 2012-04-10 13:12:09.310277199 +0200
+@@ -12650,107 +12650,12 @@
$as_echo "no" >&6; }
fi
++++++ pure-ftpd-1.0.32.tar.bz2 -> pure-ftpd-1.0.36.tar.bz2 ++++++
++++ 20290 lines of diff (skipped)
++++++ pure-ftpd.init ++++++
--- /var/tmp/diff_new_pack.OQj1PZ/_old 2012-04-12 09:46:45.000000000 +0200
+++ /var/tmp/diff_new_pack.OQj1PZ/_new 2012-04-12 09:46:45.000000000 +0200
@@ -13,8 +13,8 @@
#
### BEGIN INIT INFO
# Provides: pure-ftpd
-# Required-Start: network-remotefs $syslog
-# Required-Stop: network-remotefs $syslog
+# Required-Start: network-remotefs $syslog $remote_fs
+# Required-Stop: network-remotefs $syslog $remote_fs
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: Start pure-ftpd ftp server.
@@ -56,8 +56,9 @@
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
+ #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
rc_status -v
;;
stop)
++++++ pure-ftpd.service ++++++
[Unit]
Description=Pure-FTPd FTP server
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
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |