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 - [email protected] + +- 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 - [email protected] + +- 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. <Anonymous ~ftp> - User ftp - Group ftp - - # We want clients to be able to login with "anonymous" as well as "ftp" - UserAlias anonymous ftp - - # Limit the maximum number of anonymous logins - MaxClients 10 - - # We want 'welcome.msg' displayed at login, and '.message' displayed - # in each newly chdired directory. - DisplayLogin welcome.msg - DisplayChdir .message - - # Limit WRITE everywhere in the anonymous chroot - <Limit WRITE> - DenyAll - </Limit> + # Limit LOGIN + #<Limit LOGIN> + # Order Allow,Deny + # Allow from .examples.net,113.141.114.1 + # Deny from All + #</Limit> + + # Limit WRITE everywhere in the anonymous chroot + <Limit WRITE> + DenyAll + </Limit> + + # LoginPasswordPrompt -- Configure to display the passwort prompt or not + LoginPasswordPrompt off + + # DirFakeMode -- Hide real file/directory permissions + DirFakeMode 0640 + + # DirFakeUser -- Hide real file/directory owner + DirFakeUser On + + # DirFakeGroup -- Hide real file/directory group + DirFakeGroup On + + # We want clients to be able to login with "anonymous" as well as "ftp" + UserAlias anonymous ftp + + # Limit the maximum number of anonymous logins + MaxClients 10 + #MaxRetrieveFileSize 512 Mb + + # Limit Up/Downloads to 255 K/sec + #TransferRate APPE,RETR,STOR,STOU 255 + + # We want 'welcome.msg' displayed at login, and '.message' displayed + # in each newly chdired directory. + DisplayLogin welcome.msg + DisplayChdir .message + + #<Directory pub> + # <Limit ALL> + # Order Allow,Deny + # Allow from .examples.net,113.141.114.1 + # Deny from All + # </Limit> + #</Directory> + + # 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-dist.patch ++++++ Index: contrib/dist/rpm/ftp.pamd =================================================================== --- contrib/dist/rpm/ftp.pamd.orig +++ contrib/dist/rpm/ftp.pamd @@ -1,6 +1,7 @@ #%PAM-1.0 + auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed -auth required pam_unix.so shadow nullok +#auth required pam_unix.so shadow nullok # If this is enabled, anonymous logins will fail because the 'ftp' user does # not have a "valid" shell, as listed in /etc/shells. @@ -11,5 +12,8 @@ auth required pam_unix.so shadow n # #auth required pam_shells.so -account required pam_unix.so -session required pam_unix.so +auth required pam_unix2.so +auth required pam_shells.so +account required pam_unix2.so +password required pam_unix2.so +session required pam_unix2.so Index: contrib/dist/rpm/proftpd.logrotate =================================================================== --- contrib/dist/rpm/proftpd.logrotate.orig +++ contrib/dist/rpm/proftpd.logrotate @@ -1,10 +1,16 @@ -/var/log/proftpd/*.log /var/log/xferlog { +/var/log/proftpd/xferlog /var/log/proftpd/*.log { compress - missingok + dateext + maxage 365 + rotate 99 + size=+4096k notifempty + missingok + create 640 root root sharedscripts postrotate - test -f /var/lock/subsys/proftpd && /usr/bin/killall -HUP proftpd || : + /etc/init.d/proftpd reload + #/etc/init.d/xinetd reload endscript } Index: contrib/dist/rpm/xinetd =================================================================== --- contrib/dist/rpm/xinetd.orig +++ contrib/dist/rpm/xinetd @@ -2,13 +2,15 @@ # description: The ProFTPD FTP server service ftp { - flags = REUSE socket_type = stream + protocol = tcp wait = no +# bind = IP + instances = 30 user = root server = /usr/sbin/in.proftpd - log_on_success += DURATION - log_on_failure += USERID - nice = 10 + log_on_success += PID HOST USERID EXIT DURATION + log_on_failure += HOST USERID ATTEMPT +# nice = 10 disable = yes } ++++++ proftpd-ftpasswd.patch ++++++ Index: contrib/ftpasswd =================================================================== --- contrib/ftpasswd.orig +++ contrib/ftpasswd @@ -33,8 +33,8 @@ use Getopt::Long; $Getopt::Long::auto_abbrev = 0; my $program = basename($0); -my $default_passwd_file = "./ftpd.passwd"; -my $default_group_file = "./ftpd.group"; +my $default_passwd_file = "/etc/proftpd/auth/passwd"; +my $default_group_file = "/etc/proftpd/auth/group"; my $shell_file = "/etc/shells"; my $default_cracklib_dict = "/usr/lib/cracklib_dict"; my $cracklib_dict; @@ -921,6 +921,46 @@ usage: $program [--help] [--hash|--group --version Displays the version of $program. +Creating Files + +The ftpasswd program can create and update files for both AuthUserFile and + AuthGroupFile. When it is used for the first time, the program will create + the necessary file. If that file already exists, ftpasswd will update it + with the new information. + +ftpasswd must first know what type of file to create. Use either the + --passwd option (for handling AuthUserFiles), or the --group option + (for handling AuthGroupFiles); this is required. + +When creating an AuthUserFile, the following options are also + required: --name, --uid, --home, and --shell. + This information is required by proftpd to authenticate a user. The optional + parameters for an AuthUserFile include --gid + (defaults to the given --uid argument when not provided) + and --gecos (not used by proftpd at all). For example: + + ftpasswd --passwd --name=bob --uid=1001 --home=/home/bob --shell=/bin/false + +creates an account for user bob. + +To create a file with a name or location other than the default + (which, for --passwd mode is /etc/proftpd/auth/passwd), use the --file option. + +For example, to create the alternate password file in /usr/local/etc/ftpd/passwd: + + ftpasswd --passwd --file=/usr/local/etc/ftpd/passwd --name=bob --uid=1001 \ + --home=/home/bob --shell=/bin/false + +For AuthGroupFiles, use --group: + + ftpasswd --group --name=group-name --gid=group-id --member=user-member1 \ + --member=user-member2 ... --member=user-memberN + +The most common change to these files is made to AuthUserFiles, to change + a user's password. The --change-password option was provided just for this scenario: + + ftpasswd --passwd --name=user --change-password + END_OF_USAGE exit 0; ++++++ proftpd-no_BuildDate.patch ++++++ --- /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 @@ -76,5 +76,5 @@ -#include "buildstamp.h" - /* Application version (in various forms) */ - #define PROFTPD_VERSION_NUMBER 0x0001030406 - #define PROFTPD_VERSION_TEXT "1.3.4b" + #define PROFTPD_VERSION_NUMBER 0x0001030407 + #define PROFTPD_VERSION_TEXT "1.3.4c" ++++++ proftpd-strip.patch ++++++ Index: ltmain.sh =================================================================== --- ltmain.sh.orig +++ ltmain.sh @@ -2056,7 +2056,10 @@ func_mode_install () ;; esac if test -n "$tstripme" && test -n "$striplib"; then - func_show_eval "$striplib $destdir/$realname" 'exit $?' + #func_show_eval "$striplib $destdir/$realname" 'exit $?' + echo "strip patch" + func_quote_for_expand "$striplib $destdir/$realname" + func_echo $func_quote_for_expand_result fi if test "$#" -gt 0; then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
