- my mistake, back to ipv6 ready

Changed files:
    proftpd-glibc.patch -> 1.3
    proftpd-umode_t.patch -> 1.3
    proftpd.conf -> 1.9
    proftpd.spec -> 1.146

diff --git a/proftpd-glibc.patch b/proftpd-glibc.patch
index a06528170668bb85ac9cffdc97823e5af8ccc4a2..3302b7cb0f568505ea38e39d165390856c6d08c5 100644 (file)
--- a/proftpd-glibc.patch
+++ b/proftpd-glibc.patch
@@ -1,14 +1,14 @@
-diff -Naur proftpd-1.2.8-orig/modules/mod_ls.c proftpd-1.2.8/modules/mod_ls.c
---- proftpd-1.2.8-orig/modules/mod_ls.c        Mon Feb 24 19:15:17 2003
-+++ proftpd-1.2.8/modules/mod_ls.c     Thu Mar 20 01:45:46 2003
-@@ -30,6 +30,10 @@
+diff -Nur proftpd-1.2.0pre1/modules/mod_ls.c proftpd-1.2.0pre1.pld/modules/mod_ls.c
+--- proftpd-1.2.0pre1/modules/mod_ls.c Sun Oct 18 04:24:41 1998
++++ proftpd-1.2.0pre1.pld/modules/mod_ls.c     Wed Feb 10 17:02:17 1999
+@@ -23,7 +23,9 @@
+  */
  
  #include "conf.h"
- 
+-
 +#if ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
 +#include <asm/types.h>
 +#endif /* GNU libc-2.1 */
-+
  #ifndef GLOB_ABORTED
  #define GLOB_ABORTED GLOB_ABEND
  #endif

diff --git a/proftpd-umode_t.patch b/proftpd-umode_t.patch
index d217da5e32464656f5f93838eaa8a70d2b0d4734..2ac777aaf844781f03e1065227a93d9ee8d51c7f 100644 (file)
--- a/proftpd-umode_t.patch
+++ b/proftpd-umode_t.patch
@@ -1,12 +1,12 @@
-diff -Naur proftpd-1.2.8-orig/config.h.in proftpd-1.2.8/config.h.in
---- proftpd-1.2.8-orig/config.h.in     Tue Feb 25 19:56:37 2003
-+++ proftpd-1.2.8/config.h.in  Thu Mar 20 01:40:47 2003
-@@ -133,7 +133,7 @@
- #undef inline
+diff -ruN proftpd-1.1.6pl2-old/config.h.in proftpd-1.1.6pl2/config.h.in
+--- proftpd-1.1.6pl2-old/config.h.in   Mon Sep  7 21:15:42 1998
++++ proftpd-1.1.6pl2/config.h.in       Fri Sep 18 22:35:32 1998
+@@ -69,7 +69,7 @@
+ #undef ino_t
  
- /* Define to `int' if <sys/types.h> doesn't define.  */
--#undef mode_t
-+/* #undef mode_t */
+ /* Define to `mode_t' if <sys/types.h> doesn't define. */
+-#undef umode_t
++/* #undef umode_t */
  
- /* Define to `long' if <sys/types.h> doesn't define.  */
- #undef off_t
+ /* Define if your system has _pw_stayopen variable (Irix specific?) */
+ #undef HAVE__PW_STAYOPEN

diff --git a/proftpd.conf b/proftpd.conf
index eff35c92f5ac52812fef5252e5647780dafa48dd..731ac6cec5733e89964c20ea559ca4a43c9c7977 100644 (file)
--- a/proftpd.conf
+++ b/proftpd.conf
@@ -5,10 +5,15 @@
 
 ServerName                     "ProFTPD"
 ServerType                     inetd
-#ServerType                    standalone
 DeferWelcome                   off
 DefaultServer                  on
 
+<Global>
+       # Set this to "on" if you are running in standalone mode!
+       UseTCPD                 off
+       TCPDServiceName         ftp
+</Global>
+
 # If you want .message files to work with browsers, you probably
 # want to uncomment the next line
 #MultilineRFC2228              on

diff --git a/proftpd.spec b/proftpd.spec
index cefe0f6feee3282641fdea5968aaf791cc719c8f..9c216b9df0bb4fbde9111df8bec30b4069588ab8 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -14,8 +14,8 @@ Summary(pl):  PROfesionalny serwer FTP
 Summary(pt_BR):        Servidor FTP profissional, com sintaxe de configuração semelhante à do apache
 Summary(zh_CN):        Ò×ÓÚ¹ÜÀíµÄ,°²È«µÄ FTP ·þÎñÆ÷
 Name:          proftpd
-Version:       1.2.8
-Release:       2
+Version:       1.2.5
+Release:       5
 Epoch:         1
 License:       GPL
 Group:         Daemons
@@ -171,18 +171,18 @@ standalone.
 
 %prep
 %setup  -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-#%patch7 -p1
-#%patch8 -p1
-#%patch9 -p1
-#%patch10 -p0
-#%patch11 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p0
+%patch11 -p1
 install -m644 %{SOURCE7} contrib/mod_tcpd.c
 
 %build
@@ -190,16 +190,10 @@ install -m644 %{SOURCE7} contrib/mod_tcpd.c
 RUN_DIR=%{_localstatedir} ; export RUN_DIR
 %configure \
        --enable-autoshadow \
-       --with-modules=mod_ratio:mod_readme\
-       %{?_with_ldap::mod_ldap}\
-       %{?_with_quota::mod_quota}\
-       %{?_with_linuxprivs::mod_linuxprivs}\
-       %{?_with_mysql::mod_sql:mod_sql_mysql} \
-       %{?!_without_ipv6:--enable-ipv6}\
-       %{?_without_ssl:--disable-tls}\
+       --with-modules=mod_ratio:mod_readme%{?!_without_ipv6::mod_tcpd}%{?!_without_pam::mod_pam}%{?_with_ldap::mod_ldap}%{?_with_quota::mod_quota}%{?_with_linuxprivs::mod_linuxprivs}%{?_with_mysql::mod_sql:mod_sql_mysql} \
+       %{?!_without_ipv6:--enable-ipv6} \
+       %{?_without_ssl:--disable-tls} \
        --enable-sendfile
-#      %{?!_without_pam::auth_mod_pam}\
-#      %{?!_without_ipv6::mod_tcpd}\
 
 %{__make}
 
@@ -288,8 +282,8 @@ fi
 %files common
 %defattr(644,root,root,755)
 %doc sample-configurations/{virtual,anonymous}.conf ChangeLog README
-%doc contrib/README.modules README.PAM
-%doc README.mod_sql README.LDAP doc/*html
+%doc README.linux-* contrib/README.modules README.IPv6 README.PAM
+%doc README.TLS README.mod_sql README.LDAP doc/*html
 
 %attr(750,root,ftp) %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf