- updated to pre9

Changed files:
    proftpd-release.patch -> 1.2

diff --git a/proftpd-release.patch b/proftpd-release.patch
index 1fb4ba663cea676e23afa97a467c2f1e4bd3133e..cb98b29e2bd6ba05d4a3df8e3b5c40fda2c37aba 100644 (file)
--- a/proftpd-release.patch
+++ b/proftpd-release.patch
@@ -1,16 +1,16 @@
-diff -Nur proftpd-1.2.0pre3/src/main.c proftpd-1.2.0pre3.pld/src/main.c
---- proftpd-1.2.0pre3/src/main.c       Wed Mar 10 02:20:56 1999
-+++ proftpd-1.2.0pre3.pld/src/main.c   Fri May 28 15:01:50 1999
-@@ -625,7 +625,7 @@
- 
-   log_pri(pri,log);
+diff -ur proftpd-1.2.0pre9.orig/src/main.c proftpd-1.2.0pre9/src/main.c
+--- proftpd-1.2.0pre9.orig/src/main.c  Mon Oct 11 06:28:50 1999
++++ proftpd-1.2.0pre9/src/main.c       Thu Oct 28 15:12:26 1999
+@@ -640,7 +640,7 @@
+   log_pri(pri, log);
+   
    if(standalone && master)
--    log_pri(LOG_NOTICE,"ProFTPD %s standalone mode SHUTDOWN",VERSION);
-+    log_pri(LOG_NOTICE,"ProFTPD %s standalone mode SHUTDOWN","PLD Linux");
+-    log_pri(LOG_NOTICE, "ProFTPD %s standalone mode SHUTDOWN", VERSION);
++    log_pri(LOG_NOTICE, "ProFTPD %s standalone mode SHUTDOWN","PLD Linux");
+   
    end_login(exitcode);
  }
- 
-@@ -894,9 +894,9 @@
+@@ -944,9 +944,9 @@
      if(id && id->argc > 1)
        send_response("220","%s",(char*)id->argv[1]);
      else if(get_param_int(server->conf,"DeferWelcome",FALSE) == 1)
@@ -22,33 +22,7 @@ diff -Nur proftpd-1.2.0pre3/src/main.c proftpd-1.2.0pre3.pld/src/main.c
             server->ServerName,server->ServerAddress);
    }
    else
-@@ -1505,10 +1505,10 @@
- {
- #if 0
-   if(abort_core)
--    log_pri(LOG_NOTICE,"ProFTPD received SIGABRT signal, generating core file in %s",_prepare_core());
-+    log_pri(LOG_NOTICE,"ProFTPD received SIGABRT signal, generating core file in %s",_prepare_core());
-   else
- #endif
--    log_pri(LOG_NOTICE,"ProFTPD received SIGABRT signal, no core dump.");
-+    log_pri(LOG_NOTICE,"ProFTPD received SIGABRT signal, no core dump.");
-   
-   signal(SIGABRT,SIG_DFL);
-   end_login_noexit();
-@@ -1542,10 +1542,10 @@
-         PRIVS_RELINQUISH
-       }
- 
--      log_pri(LOG_NOTICE,"ProFTPD killed (signal %d)",sig);
-+      log_pri(LOG_NOTICE,"ProFTPD killed (signal %d)",sig);
-     }
-   } else
--    log_pri(LOG_ERR,"ProFTPD terminating (signal %d)",sig);
-+    log_pri(LOG_ERR,"ProFTPD terminating (signal %d)",sig);
- 
-   if(master && mpid == getpid()) {
-     PRIVS_ROOT
-@@ -1553,7 +1553,7 @@
+@@ -1618,7 +1618,7 @@
      log_rm_run();
      PRIVS_RELINQUISH
      if(standalone)
@@ -57,7 +31,7 @@ diff -Nur proftpd-1.2.0pre3/src/main.c proftpd-1.2.0pre3.pld/src/main.c
    }
  
    _internal_abort();  
-@@ -1878,7 +1878,7 @@
+@@ -1943,7 +1943,7 @@
        addl_bindings(s);
      }
  
@@ -66,7 +40,7 @@ diff -Nur proftpd-1.2.0pre3/src/main.c proftpd-1.2.0pre3.pld/src/main.c
    server_loop();
  }
  
-@@ -2001,7 +2001,7 @@
+@@ -2098,7 +2098,7 @@
        break;
      */
      case 'v':