- updated to pre4

Changed files:
    proftpd-betterlog.patch -> 1.2
    proftpd-libcap.patch -> 1.2
    proftpd.spec -> 1.27

diff --git a/proftpd-betterlog.patch b/proftpd-betterlog.patch
index 8f839350455a86afb137e3e5674f9c3df79952be..466e04474e7456b18a7558c22b4145f63003f32a 100644 (file)
--- a/proftpd-betterlog.patch
+++ b/proftpd-betterlog.patch
@@ -1,11 +1,12 @@
---- proftpd-1.2.0pre1/modules/mod_auth.c.betterlog     Thu Feb 11 14:03:09 1999
-+++ proftpd-1.2.0pre1/modules/mod_auth.c       Thu Feb 11 14:03:34 1999
-@@ -514,7 +514,11 @@
+diff -ur proftpd-1.2.0pre4.orig/modules/mod_auth.c proftpd-1.2.0pre4/modules/mod_auth.c
+--- proftpd-1.2.0pre4.orig/modules/mod_auth.c  Mon Aug 30 05:43:57 1999
++++ proftpd-1.2.0pre4/modules/mod_auth.c       Wed Sep  1 13:59:36 1999
+@@ -525,7 +525,11 @@
    c = _auth_resolve_user(p,&user,&ourname,&anonname);
  
    if(!user) {
--    log_pri(LOG_NOTICE,"failed login, '%s' is not a UserAlias.",origuser);
-+      log_auth(LOG_NOTICE,"USER %s: user is not a UserAlias from %s [%s] to %s:%i",
+-    log_pri(LOG_NOTICE,"failed login from %s, '%s' is not a UserAlias.",inet_ascii(p,session.c->remote_ipaddr),origuser);
++    log_auth(LOG_NOTICE,"USER %s: user is not a UserAlias from %s [%s] to %s:%i",
 +               user,session.c->remote_name,
 +             inet_ascii(p,session.c->remote_ipaddr),
 +             inet_ascii(p,session.c->local_ipaddr),
@@ -13,12 +14,12 @@
      goto auth_failure;
    }
  
-@@ -522,7 +526,11 @@
+@@ -533,7 +537,11 @@
    aclp = login_check_limits(main_server->conf,FALSE,TRUE,&i);
  
    if((pw = auth_getpwnam(p,user)) == NULL) {
--    log_pri(LOG_NOTICE,"failed login, can't find user '%s'",user);
-+      log_auth(LOG_NOTICE,"USER %s: no such user found from %s [%s] to %s:%i",
+-    log_pri(LOG_NOTICE,"failed login from %s, can't find user '%s'",inet_ascii(p,session.c->remote_ipaddr),user);
++    log_auth(LOG_NOTICE,"USER %s: no such user found from %s [%s] to %s:%i",
 +               user,session.c->remote_name,
 +             inet_ascii(p,session.c->remote_ipaddr),
 +             inet_ascii(p,session.c->local_ipaddr),

diff --git a/proftpd-libcap.patch b/proftpd-libcap.patch
index ef2bb8fd1bf6ce49623628736fdd8d60d7c11bea..36c5bb82ca106836347f340e3c5648e510cd8863 100644 (file)
--- a/proftpd-libcap.patch
+++ b/proftpd-libcap.patch
@@ -17,7 +17,7 @@ diff -Nur proftpd-1.2.0pre3/contrib/mod_linuxprivs.c proftpd-1.2.0pre3.pld/contr
  #include "conf.h"
  #include "privs.h"
  
--#include "../contrib/libcap/capability.h"
+-#include "../contrib/libcap/include/sys/capability.h"
 +#include "/usr/include/sys/capability.h"
  
  static cap_t capabilities = 0;

diff --git a/proftpd.spec b/proftpd.spec
index f27dcb909d7de97dc1cd7b16ba13e4878ee43d7f..f48906e68b68ee3a461087b0dc81aebf90a62ccd 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -1,8 +1,8 @@
 Summary:       PROfessional FTP Daemon with apache-like configuration syntax
 Summary(pl):   PROfesionalny serwer FTP  
 Name:          proftpd
-Version:       1.2.0pre3
-Release:       4
+Version:       1.2.0pre4
+Release:       1
 Copyright:     GPL
 Group:         Daemons
 Group(pl):     Serwery
@@ -20,7 +20,6 @@ Patch4:               %{name}-libcap.patch
 Patch5:                %{name}-release.patch
 Patch6:                %{name}-noautopriv.patch
 Patch7:                %{name}-betterlog.patch
-Patch8:                %{name}-xferlog.patch
 URL:           http://www.proftpd.org
 #BuildRequires:        /lib/libcap.so
 Requires:      logrotate
@@ -57,7 +56,6 @@ z dokumentacj
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 autoconf