fixes for push to Factory

OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=2

proftpd.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 29 11:18:55 UTC 2011 - chris@computersalat.de
+
+- push to Factory
+  o fix changelog (not in sequence)
+  o fix license (GPL -> GPLv2+)
+  o remove Author from description
+  o remove obsolete extra source proftpd.conf
+
 -------------------------------------------------------------------
 Fri Apr  8 22:08:55 UTC 2011 - chris@computersalat.de
 
@@ -19,7 +28,7 @@ Sun Jan 30 20:40:10 UTC 2011 - chris@computersalat.de
   + Fixed handling of SFTP uploads when compression is used.
 
 -------------------------------------------------------------------
-Fri Oct 22 03:26:10 UTC 2010 - mseben@gmail.com
+Fri Oct 22 23:26:10 UTC 2010 - mseben@gmail.com
 
 - update to 1.3.3c
   + Fixed Telnet IAC stack overflow vulnerability (ZDI-CAN-925)

proftpd.conf

@@ -1,71 +0,0 @@
-# This sample configuration file illustrates configuring two
-# anonymous directories, and a guest (same thing as anonymous but
-# requires a valid password to login)
-
-ServerName			"ProFTPD Anonymous Server"
-ServerType			standalone
-DefaultServer			on
-
-# Port 21 is the standard FTP port.
-Port				21
-
-# If you don't want normal users logging in at all, uncomment this
-# next section
-#<Limit LOGIN>
-#  DenyAll
-#</Limit>
-
-# Set the user and group that the server normally runs at.
-User				nobody
-Group				nogroup
-
-# To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
-# at once, simply increase this value.  Note that this ONLY works
-# 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
-
-# Set the maximum number of seconds a data connection is allowed
-# to "stall" before being aborted.
-TimeoutStalled			300
-
-# We want 'welcome.msg' displayed at login, and '.message' displayed
-# in each newly chdired directory.
-DisplayLogin			welcome.msg
-DisplayChdir			.message
-
-# Our "basic" anonymous configuration
-<Anonymous ~ftp>
-
-  # Allow logins if they are disabled above.
-  <Limit LOGIN>
-    AllowAll
-  </Limit>
-
-  # Maximum clients with message
-  MaxClients			5 "Sorry, max %m users -- try again later"
-
-  User				ftp
-  Group				ftp
-  # We want clients to be able to login with "anonymous" as well as "ftp"
-  UserAlias			anonymous ftp
-
-  # Limit WRITE everywhere in the anonymous chroot
-  <Limit WRITE>
-    DenyAll
-  </Limit>
-
-  # An upload directory that allows storing files but not retrieving
-  # or creating directories.
-  #<Directory uploads/*>
-    #<Limit READ>
-    #  DenyAll
-    #</Limit>
-    #
-    #<Limit STOR>
-    #  AllowAll
-    #</Limit>
-  #</Directory>
-</Anonymous>

proftpd.spec

@@ -23,7 +23,7 @@ Summary:        Highly configurable GPL-licensed FTP server software
 # We only accept updates for "STABLE" Versions
 Version:        1.3.3e
 Release:        1
-License:        GPL
+License:        GPLv2+
 Group:          Productivity/Networking/Ftp/Servers
 Autoreqprov:    on
 Url:            http://www.proftpd.org/
@@ -35,13 +35,20 @@ Patch100:       %{name}-1.3.3-dist.patch
 Patch101:       %{name}-1.3.2a-basic.conf.patch
 Patch102:       %{name}-1.3.1-ftpasswd.patch
 Patch103:       %{name}-1.3.3-strip.patch
-#
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  krb5-devel
+BuildRequires:  libacl-devel
+BuildRequires:  libattr-devel
+BuildRequires:  mysql-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openldap2-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pam-devel
 BuildRequires:  pkg-config
-BuildRequires:  krb5-devel libacl-devel libattr-devel mysql-devel
+BuildRequires:  postgresql-devel
-BuildRequires:  openldap2-devel openssl-devel pam-devel postgresql-devel
+BuildRequires:  sqlite3-devel
-BuildRequires:  sqlite3-devel unixODBC-devel
+BuildRequires:  tcpd-devel
-BuildRequires:  tcpd-devel ncurses-devel
+BuildRequires:  unixODBC-devel
 Requires:       logrotate
 
 
@@ -50,24 +57,6 @@ 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.
 
-  Authors:
-        Jesse Sipprell <jss@inflicted.net>
-          Original proftpd author and former project co-maintainer
-        Habeeb J. Dihu <macgyver@tos.net>
-          Original mod_pam author and former project co-maintainer
-        Mark Lowes <hamster@vom.org.uk>
-          Head documentation hacker and webmaster
-        TJ Saunders <tj@castaglia.org>
-          ProFTPD developer, current maintainer
-        John Morrissey <jwm@horde.net>
-          ProFTPD developer
-        Charles Seeger <seeger@cise.ufl.edu>
-          ProFTPD developer
-        Daniel Roesen <droesen@entire-systems.com>
-          RPM packaging maintainer
-        Andrew Houghton <aah@acm.org>
-          SQL support maintainer
-
 %package ldap
 Summary:        LDAP Module for ProFTPD
 Group:          Productivity/Networking/Ftp/Servers
@@ -76,7 +65,6 @@ Requires:       %{name} = %{version}
 %description ldap
 This is the LDAP Module for ProFTPD
 
-
 %package mysql
 Summary:        MySQL Module for ProFTPD
 Group:          Productivity/Networking/Ftp/Servers
@@ -85,7 +73,6 @@ Requires:       %{name} = %{version}
 %description mysql
 This is the MySQL Module for ProFTPD
 
-
 %package pgsql
 Summary:        PostgreSQL Module for ProFTPD
 Group:          Productivity/Networking/Ftp/Servers
@@ -94,7 +81,6 @@ Requires:       %{name} = %{version}
 %description pgsql
 This is the PostgreSQL Module for ProFTPD
 
-
 %package radius
 Summary:        Radius Module for ProFTPD
 Group:          Productivity/Networking/Ftp/Servers
@@ -103,7 +89,6 @@ Requires:       %{name} = %{version}
 %description radius
 This is the Radius Module for ProFTPD
 
-
 %package sqlite
 Summary:        SQLite Module for ProFTPD
 Group:          Productivity/Networking/Ftp/Servers
@@ -112,7 +97,6 @@ Requires:       %{name} = %{version}
 %description sqlite
 This is the SQLite Module for ProFTPD
 
-
 %package devel
 Summary:        Development files for ProFTPD
 Group:          Development/Libraries/C and C++
@@ -121,7 +105,6 @@ Requires:       %{name} = %{version}
 %description devel
 This package contains Development files for ProFTPD
 
-
 %package doc
 Summary:        Documentation for ProFTPD
 Group:          Documentation/HTML
@@ -130,7 +113,6 @@ Requires:       %{name} = %{version}
 %description doc
 Here are Documentation for ProFTPD
 
-
 %prep
 %setup -q
 %{__rm} README.AIX