Hello community,
here is the log from the commit of package proftpd for openSUSE:Factory checked in at 2013-05-02 11:31:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/proftpd (Old)
and /work/SRC/openSUSE:Factory/.proftpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proftpd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/proftpd/proftpd.changes 2012-12-21 14:57:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.proftpd.new/proftpd.changes 2013-05-02 11:31:49.000000000 +0200
@@ -1,0 +2,22 @@
+Wed May 1 20:35:19 UTC 2013 - chris@computersalat.de
+
+- update to 1.3.4c
+ * Added Spanish translation.
+ * Fixed several mod_sftp issues, including SFTPPassPhraseProvider,
+ handling of symlinks for REALPATH requests, and response code logging.
+ * Fixed symlink race for creating directories when UserOwner is in effect.
+ * Increased performance of FTP directory listings.
+- rebase and rename patches (remove version string)
+ * proftpd-1.3.4a-dist.patch -> proftpd-dist.patch
+ * proftpd-1.3.4a-ftpasswd.patch -> proftpd-ftpasswd.patch
+ * proftpd-1.3.4a-strip.patch -> proftpd-strip.patch
+
+-------------------------------------------------------------------
+Fri Feb 8 00:19:19 UTC 2013 - chris@computersalat.de
+
+- fix proftpd.conf (rebase basic.conf patch)
+ * IdentLookups is now a seperate module
+ <IfModule mod_ident.c> IdentLookups on/off </IfModule>
+ is needed and module is not built cause crrodriguez disabled it.
+
+-------------------------------------------------------------------
Old:
----
proftpd-1.3.4a-basic.conf.patch
proftpd-1.3.4a-dist.patch
proftpd-1.3.4a-ftpasswd.patch
proftpd-1.3.4a-strip.patch
proftpd-1.3.4b.tar.gz
proftpd-1.3.4b.tar.gz.asc
New:
----
proftpd-1.3.4c.tar.gz
proftpd-1.3.4c.tar.gz.asc
proftpd-basic.conf.patch
proftpd-dist.patch
proftpd-ftpasswd.patch
proftpd-strip.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ proftpd.spec ++++++
--- /var/tmp/diff_new_pack.uTzSSn/_old 2013-05-02 11:31:52.000000000 +0200
+++ /var/tmp/diff_new_pack.uTzSSn/_new 2013-05-02 11:31:52.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package proftpd
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -22,7 +22,7 @@
Group: Productivity/Networking/Ftp/Servers
# Please save your time and do not update to "rc" versions.
# We only accept updates for "STABLE" Versions
-Version: 1.3.4b
+Version: 1.3.4c
Release: 0
Url: http://www.proftpd.org/
Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
@@ -33,13 +33,13 @@
Source14: %{name}.conf.tmpfile
Source15: %{name}.keyring
#PATCH-FIX-openSUSE: pam, logrotate, xinet
-Patch100: %{name}-1.3.4a-dist.patch
+Patch100: %{name}-dist.patch
#PATCH-FIX-openSUSE: provide a useful default config
-Patch101: %{name}-1.3.4a-basic.conf.patch
+Patch101: %{name}-basic.conf.patch
#PATCH-FIX: provide more info on usage ;)
-Patch102: %{name}-1.3.4a-ftpasswd.patch
+Patch102: %{name}-ftpasswd.patch
#PATCH-FIX: fix strip
-Patch103: %{name}-1.3.4a-strip.patch
+Patch103: %{name}-strip.patch
#PATCH-FIX-openSUSE: file-contains-date-and-time
Patch104: %{name}-no_BuildDate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ proftpd-1.3.4b.tar.gz -> proftpd-1.3.4c.tar.gz ++++++
/work/SRC/openSUSE:Factory/proftpd/proftpd-1.3.4b.tar.gz /work/SRC/openSUSE:Factory/.proftpd.new/proftpd-1.3.4c.tar.gz differ: char 5, line 1
++++++ proftpd-basic.conf.patch ++++++
Index: sample-configurations/basic.conf
===================================================================
--- sample-configurations/basic.conf.orig
+++ sample-configurations/basic.conf
@@ -3,19 +3,29 @@
# and a single anonymous login. It assumes that you have a user/group
# "nobody" and "ftp" for normal operation and anon.
-ServerName "ProFTPD Default Installation"
-ServerType standalone
-DefaultServer on
+ServerName "ProFTPD"
+ServerType standalone
+DefaultServer on
# Port 21 is the standard FTP port.
-Port 21
+Port 21
+
+# FireWall PortRange for PASV
+PassivePorts 40000 40999
+
+# Set DebugLevel to values between 0 and 9
+# default is 0
+DebugLevel 0
+
+# SystemLog -- Redirect syslogging to a file
+SystemLog /var/log/proftpd/proftpd.log
# Don't use IPv6 support by default.
-UseIPv6 off
+UseIPv6 off
# Umask 022 is a good standard umask to prevent new dirs and files
# from being group and world writable.
-Umask 022
+Umask 022
# To prevent DoS attacks, set the maximum number of child processes
# to 30. If you need to allow more than 30 concurrent connections
@@ -23,43 +33,192 @@ Umask 022
# in standalone mode, in inetd mode you should use an inetd server
# that allows you to limit maximum number of processes per service
# (such as xinetd).
-MaxInstances 30
+MaxInstances 30
# Set the user and group under which the server will run.
-User nobody
-Group nogroup
-
-# To cause every FTP user to be "jailed" (chrooted) into their home
-# directory, uncomment this line.
-#DefaultRoot ~
+User ftp
+Group ftp
-# Normally, we want files to be overwriteable.
-AllowOverwrite on
+# Some logging formats
+LogFormat default "%h %l %u %t \"%r\" %s %b"
+LogFormat auth "%v [%P] %h %t \"%r\" %s"
+LogFormat write "%h %l %u %t \"%r\" %s %b"
+
+# ------------------------------
+# Global Settings
+# ------------------------------
+<Global>
+
+ # ------------------------------
+ # Login
+ # ------------------------------
+
+ ServerIdent on "FTP server ready"
+ DeferWelcome on
+ #DisplayConnect /etc/proftpd/msg
+
+ <IfModule mod_ident.c>
+ IdentLookups off
+ </IfModule>
+ UseFtpUsers off
+ RequireValidShell off
+
+ TimeoutLogin 60
+ MaxLoginAttempts 3
+ #MaxClientsPerHost none
+ #MaxClientsPerUser 1 "Only one connection at a time."
+
+ # ------------------------------
+ # Authentication
+ # ------------------------------
+
+ ### PAM Authentication
+ # AuthPAM: default: on
+ AuthPAM off
+
+ # changed AuthPAMConfig file
+ AuthPAMConfig proftpd
+ ### PAM Authentication
+
+ AuthUserFile /etc/proftpd/auth/passwd
+ AuthGroupFile /etc/group
+
+ ### order of auth modules
+ #AuthOrder mod_auth_unix.c mod_auth_file.c
+ AuthOrder mod_auth_file.c
+
+ # ------------------------------
+ # Post-Login
+ # ------------------------------
+
+ DisplayLogin welcome.msg
+ DisplayChdir .message
+ AllowOverride off
+
+ TimeoutIdle 600
+ TimeoutNoTransfer 900
+ TimeoutStalled 300
+ TimeoutSession 3600
+
+ # ------------------------------
+ # Session
+ # ------------------------------
+
+ # To cause every FTP user to be "jailed" (chrooted) into their home
+ # directory, uncomment this line.
+ DefaultRoot ~ web,!users
+
+ DenyFilter \*.*/
+ ListOptions "-A +R" strict
+ UseGlobbing off
+
+ ShowSymlinks on
+ TimesGMT on
+
+ # ------------------------------
+ # Up- & Download
+ # ------------------------------
+
+ # having to delete before uploading is a pain ;)
+ AllowOverwrite on
+ AllowRetrieveRestart on
+ HiddenStores on
+ DeleteAbortedStores on
+ #AllowStoreRestart off # is contrary to "DeleteAbortedStores"
+
+ # ------------------------------
+ # Logging
+ # ------------------------------
+
+ WtmpLog off
+ TransferLog /var/log/proftpd/xferlog
+
+ # Record all logins
+ ExtendedLog /var/log/proftpd/auth.log AUTH auth
+
+ # Logging file/dir access
+ ExtendedLog /var/log/proftpd/access.log WRITE,READ write
+
+ # Paranoia logging level....
+ ExtendedLog /var/log/proftpd/paranoid.log ALL default
+
+ # SQLLogFile
+ #SQLLogFile /var/log/proftpd/SQL.log
+</Global>
# Bar use of SITE CHMOD by default
<Limit SITE_CHMOD>
DenyAll
</Limit>
+#####
+# Include other confs
+#Include /etc/proftpd/conf.d/*.conf
+
+#####
+
+# ------------------------------
+# Anonymous Settings
+# ------------------------------
# A basic anonymous configuration, no upload directories. If you do not
# want anonymous users, simply delete this entire <Anonymous> section.