Hello community,
here is the log from the commit of package pure-ftpd for openSUSE:Factory
checked in at 2012-08-31 09:56:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pure-ftpd (Old)
and /work/SRC/openSUSE:Factory/.pure-ftpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pure-ftpd", Maintainer is "mvysko...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pure-ftpd/pure-ftpd.changes 2012-05-03
11:00:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pure-ftpd.new/pure-ftpd.changes 2012-08-31
09:56:10.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Aug 29 07:14:29 UTC 2012 - mvysko...@suse.cz
+
+- add gpg signature file for easier verification
+
+-------------------------------------------------------------------
+Wed Aug 29 04:33:03 UTC 2012 - crrodrig...@opensuse.org
+
+- systemd: Do not fork in the background
+
+-------------------------------------------------------------------
New:
----
pure-ftpd-1.0.36.tar.bz2.gpg
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pure-ftpd.spec ++++++
--- /var/tmp/diff_new_pack.a8zJco/_old 2012-08-31 09:56:12.000000000 +0200
+++ /var/tmp/diff_new_pack.a8zJco/_new 2012-08-31 09:56:12.000000000 +0200
@@ -34,6 +34,7 @@
Source5: %{name}.firewall
#http://pkgs.fedoraproject.org/gitweb/?p=pure-ftpd.git;a=blob_plain;f=pure-ftpd.service
Source6: pure-ftpd.service
+Source1000:
ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.bz2.gpg
# 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.
++++++ pure-ftpd-1.0.20_config.patch ++++++
--- /var/tmp/diff_new_pack.a8zJco/_old 2012-08-31 09:56:12.000000000 +0200
+++ /var/tmp/diff_new_pack.a8zJco/_new 2012-08-31 09:56:12.000000000 +0200
@@ -1,8 +1,8 @@
Index: configuration-file/pure-ftpd.conf.in
===================================================================
---- 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 @@
+--- configuration-file/pure-ftpd.conf.in.orig 2012-08-29 09:05:46.928152475
+0200
++++ configuration-file/pure-ftpd.conf.in 2012-08-29 09:07:01.064801607
+0200
+@@ -37,19 +37,20 @@
# Maximum number of simultaneous users
@@ -11,7 +11,14 @@
-@@ -49,7 +49,7 @@
+ # 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
+
+
# Maximum number of sim clients with the same IP address
@@ -20,7 +27,7 @@
-@@ -59,6 +59,9 @@
+@@ -59,6 +60,9 @@
VerboseLog no
@@ -30,7 +37,7 @@
# List dot-files even when the client doesn't send "-a".
-@@ -68,7 +71,7 @@
+@@ -68,7 +72,7 @@
# Don't allow authenticated users - have a public anonymous FTP only.
@@ -39,7 +46,7 @@
-@@ -107,23 +110,23 @@
+@@ -107,23 +111,23 @@
# LDAP configuration file (see README.LDAP)
@@ -67,7 +74,7 @@
# Path to pure-authd socket (see README.Authentication-Modules)
-@@ -134,7 +137,7 @@
+@@ -134,7 +138,7 @@
# If you want to enable PAM authentication, uncomment the following line
@@ -76,7 +83,7 @@
-@@ -177,7 +180,7 @@
+@@ -177,7 +181,7 @@
# Port range for passive connections replies. - for firewalling.
@@ -85,7 +92,7 @@
-@@ -230,14 +233,26 @@
+@@ -230,14 +234,26 @@
# File creation mask. <umask for files>:<umask for dirs> .
# 177:077 if you feel paranoid.
@@ -114,7 +121,7 @@
-@@ -257,7 +272,7 @@
+@@ -257,7 +273,7 @@
# even if they own them. If TrustedGID is enabled, this group
# will have access to dot-files, though.
@@ -123,7 +130,7 @@
-@@ -270,13 +285,13 @@
+@@ -270,13 +286,13 @@
# Never overwrite files. When a file whose name already exist is uploaded,
# it get automatically renamed to file.1, file.2, file.3, ...
@@ -139,7 +146,7 @@
-@@ -373,7 +388,7 @@
+@@ -373,7 +389,7 @@
# Set to 'yes' if you don't want your users to rename files.
@@ -148,15 +155,15 @@
-@@ -449,3 +464,4 @@
+@@ -449,3 +465,4 @@
# FileSystemCharset big5
# ClientCharset big5
+
Index: 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
+--- pureftpd-mysql.conf.orig 2012-08-29 09:05:46.928152475 +0200
++++ pureftpd-mysql.conf 2012-08-29 09:05:50.166268187 +0200
@@ -19,17 +19,18 @@
# Optional : define the location of mysql.sock if the server runs on this
host.
@@ -183,8 +190,8 @@
# Mandatory : database to open.
Index: pureftpd-pgsql.conf
===================================================================
---- pureftpd-pgsql.conf.orig 2012-04-10 13:13:50.172790238 +0200
-+++ pureftpd-pgsql.conf 2012-04-10 13:13:55.840987643 +0200
+--- pureftpd-pgsql.conf.orig 2012-08-29 09:05:46.928152475 +0200
++++ pureftpd-pgsql.conf 2012-08-29 09:05:50.166268187 +0200
@@ -16,6 +16,7 @@
# PGSQLPort .s.PGSQL.5432
++++++ pure-ftpd.service ++++++
--- /var/tmp/diff_new_pack.a8zJco/_old 2012-08-31 09:56:12.000000000 +0200
+++ /var/tmp/diff_new_pack.a8zJco/_new 2012-08-31 09:56:12.000000000 +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-config.pl /etc/pure-ftpd/pure-ftpd.conf
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
