- migrated configuration to /etc/proftpd

- move macro definitions so they don't interfere with other parts of spec

diff --git a/ftp.pamd b/ftp.pamd
index 53c7399fb339bc85509fb092782afb6739c9e2c0..bcf92045b227a06b525e1282b7847a88b48e8f86 100644 (file)
--- a/ftp.pamd
+++ b/ftp.pamd
@@ -1,5 +1,5 @@
 #%PAM-1.0
-auth           required        pam_listfile.so item=user sense=deny file=/etc/ftpd/ftpusers onerr=succeed
+auth           required        pam_listfile.so item=user sense=deny file=/etc/proftpd/ftpusers onerr=succeed
 auth           required        pam_listfile.so item=user sense=deny file=/etc/security/blacklist.ftp onerr=succeed
 #auth          required        pam_shells.so
 auth           include         system-auth

diff --git a/proftpd-mod_tls.conf b/proftpd-mod_tls.conf
index 5e7405fa80a22880ea76d60a1a13c7b7676e20c7..8fdcd1596f8b7cfce5af84638e08a32b234d7d48 100644 (file)
--- a/proftpd-mod_tls.conf
+++ b/proftpd-mod_tls.conf
@@ -7,13 +7,13 @@ TLSEngine on
 TLSLog /var/log/proftpd/tls.log
 
 # Path to CA chain file
-#TLSCACertificateFile /etc/ftpd/CA.crt
+#TLSCACertificateFile /etc/proftpd/CA.crt
 
 # Path to certificate file
-TLSRSACertificateFile /etc/ftpd/server.crt
+TLSRSACertificateFile /etc/proftpd/server.crt
 
 # Path to certificate key file
-TLSRSACertificateKeyFile /etc/ftpd/server.key
+TLSRSACertificateKeyFile /etc/proftpd/server.key
 
 # Define available TLS/SSL ciphers (allow only strong ones by default)
 TLSCipherSuite HIGH:!kDHd:!aNULL:!aDSS:!eNULL:!DES:!RC4:!RC2:!MD5:!SHA1:!SHA:!SSLv2:!SSLv3:!TLSv1:!TLSv1.1:!EXP:!EXPORT56:!LOW:!MEDIUM:!ADH:!DSS:!NULL

diff --git a/proftpd-paths.patch b/proftpd-paths.patch
index b50179dbb06f51eecc30064accf5710d24a006e5..39e56cacf84f10eba9d88fd718890ea2801b0f73 100644 (file)
--- a/proftpd-paths.patch
+++ b/proftpd-paths.patch
@@ -30,7 +30,7 @@ diff -urNpa proftpd-1.3.6.orig/include/default_paths.h proftpd-1.3.6/include/def
   */
  #ifndef PR_CONFIG_FILE_PATH
 -# define PR_CONFIG_FILE_PATH  "/etc/proftpd.conf"
-+# define PR_CONFIG_FILE_PATH  "/etc/ftpd/proftpd.conf"
++# define PR_CONFIG_FILE_PATH  "/etc/proftpd/proftpd.conf"
  #endif
  
  /* The location of your `shells' file; a newline delimited list of
@@ -39,14 +39,14 @@ diff -urNpa proftpd-1.3.6.orig/include/default_paths.h proftpd-1.3.6/include/def
   * requests.
   */
 -#define PR_SHUTMSG_PATH               "/etc/shutmsg"
-+#define PR_SHUTMSG_PATH               "/etc/ftpd/shutmsg"
++#define PR_SHUTMSG_PATH               "/etc/proftpd/shutmsg"
  
  /* Location of the file containing users that *cannot* use ftp
   * services (odd, eh?)
   */
  #ifndef PR_FTPUSERS_PATH
 -# define PR_FTPUSERS_PATH     "/etc/ftpusers"
-+# define PR_FTPUSERS_PATH     "/etc/ftpd/ftpusers"
++# define PR_FTPUSERS_PATH     "/etc/proftpd/ftpusers"
  #endif
  
  #endif /* PROFTPD_PATHS_H */

diff --git a/proftpd.conf b/proftpd.conf
index 62569344e4fd2a3ffccc4fd7a89bb29b7d0cf470..5c1ebbd1b4092b0462ac09a28fb4996c9d8e989c 100644 (file)
--- a/proftpd.conf
+++ b/proftpd.conf
@@ -46,8 +46,8 @@ Port                  21
        MaxLoginAttempts        3
 
        # Specify alternate passwd/group files to be used
-       #AuthUserFile           /etc/ftpd/passwd
-       #AuthGroupFile          /etc/ftpd/group
+       #AuthUserFile           /etc/proftpd/passwd
+       #AuthGroupFile          /etc/proftpd/group
 
        # Set the default method of data transfer
        DefaultTransferMode     binary
@@ -81,4 +81,4 @@ Port                  21
 </Global>
 
 # Load additional config files (modules etc.)
-Include /etc/ftpd/conf.d/*.conf
+Include /etc/proftpd/conf.d/*.conf

diff --git a/proftpd.init b/proftpd.init
index 71ac08730552a8ef1058c48689ae5e44ebfb1c70..b86c9ffa523cf5bb4dc60fc4b05ae9999f3b06f7 100644 (file)
--- a/proftpd.init
+++ b/proftpd.init
@@ -7,7 +7,7 @@
 #              operating systems.
 # processname: proftpd
 # pidfile:     /var/run/proftpd.pid
-# config:      /etc/ftpd/proftpd.conf
+# config:      /etc/proftpd/proftpd.conf
 
 
 # Source function library

diff --git a/proftpd.spec b/proftpd.spec
index fcd03cacffcf2fdb8f1f6611c061c5e48ac0aa58..2b7c882fdaa36a949f9fc793b59159b32fd9d77a 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -24,7 +24,7 @@ Summary(pt_BR.UTF-8): Servidor FTP profissional, com sintaxe de configuração s
 Summary(zh_CN.UTF-8):  易于管理的,安全的 FTP 服务器
 Name:          proftpd
 Version:       1.3.6
-Release:       4
+Release:       5
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Daemons
@@ -71,10 +71,59 @@ BuildRequires:      postgresql-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir             /etc/ftpd
+%define                _sysconfdir             /etc/proftpd
 %define                _localstatedir          /var/run
 %define                _libexecdir             %{_prefix}/%{_lib}/%{name}
 
+# macro called at module post scriptlet
+%define        module_post \
+if [ "$1" = "1" ]; then \
+       if grep -iEqs "^ServerType[[:space:]]+inetd" %{_sysconfdir}/proftpd.conf; then \
+               %service -q rc-inetd reload \
+       elif grep -iEqs "^ServerType[[:space:]]+standalone" %{_sysconfdir}/proftpd.conf; then \
+               %service -q proftpd restart \
+       fi \
+fi
+
+# macro called at module postun scriptlet
+%define        module_postun \
+if [ "$1" = "0" ]; then \
+       if grep -iEqs "^ServerType[[:space:]]+inetd" %{_sysconfdir}/proftpd.conf; then \
+               %service -q rc-inetd reload \
+       elif grep -iEqs "^ServerType[[:space:]]+standalone" %{_sysconfdir}/proftpd.conf; then \
+               %service -q proftpd restart \
+       fi \
+fi
+
+%define module_triggerun \
+if [ $1 -le 1 ]; then \
+        exit 0 \
+fi \
+[ -d /etc/proftpd/conf.d ] || mkdir -p /etc/proftpd 2>/dev/null || : \
+%if "%1" == "mod_tls" \
+for f in /etc/ftpd/{conf.d/mod_tls.conf,server.crt,server.key}; do \
+       f=${f##*/} \
+       [ -f "/etc/ftpd/$f" ] && mv "/etc/ftpd/$f" /etc/proftpd 2>/dev/null || : \
+       [ -f "/etc/ftpd/conf.d/$f" ] && mv "/etc/ftpd/conf.d/$f" /etc/proftpd/conf.d 2>/dev/null || : \
+done \
+%else \
+[ -f /etc/ftpd/conf.d/%1.conf ] && mv /etc/ftpd/conf.d/%1.conf /etc/proftpd/conf.d 2>/dev/null || : \
+%endif \
+sed -i -e 's|/etc/ftpd|/etc/proftpd|g' /etc/ftpd/conf.d/%1.conf 2>/dev/null \
+[ -n "$(find /etc/ftpd/conf.d -type d -empty 2>/dev/null)" ] && rmdir /etc/ftpd/conf.d 2>/dev/null || : \
+[ -n "$(find /etc/ftpd -type d -empty 2>/dev/null)" ] && rmdir /etc/ftpd 2>/dev/null || :
+
+# it's sooo annoying to write them
+%define        module_scripts() \
+%post %1 \
+%module_post \
+\
+%postun %1 \
+%module_postun \
+\
+%triggerun %1 -- proftpd-%1 \
+%module_triggerun
+
 %description
 ProFTPD is a highly configurable FTP daemon for Unix and Unix-like
 operating systems. ProFTPD is designed to be somewhat of a "drop-in"
@@ -606,33 +655,34 @@ if [ "$2" != 1 ]; then
        %service -q proftpd restart
 fi
 
-# macro called at module post scriptlet
-%define        module_post \
-if [ "$1" = "1" ]; then \
-       if grep -iEqs "^ServerType[[:space:]]+inetd" %{_sysconfdir}/proftpd.conf; then \
-               %service -q rc-inetd reload \
-       elif grep -iEqs "^ServerType[[:space:]]+standalone" %{_sysconfdir}/proftpd.conf; then \
-               %service -q proftpd restart \
-       fi \
+%triggerun common -- proftpd-common < 2:1.3.6-5
+if [ $1 -le 1 ]; then
+       exit 0
 fi
-
-# macro called at module postun scriptlet
-%define        module_postun \
-if [ "$1" = "0" ]; then \
-       if grep -iEqs "^ServerType[[:space:]]+inetd" %{_sysconfdir}/proftpd.conf; then \
-               %service -q rc-inetd reload \
-       elif grep -iEqs "^ServerType[[:space:]]+standalone" %{_sysconfdir}/proftpd.conf; then \
-               %service -q proftpd restart \
-       fi \
+[ -d /etc/proftpd/conf.d ] || mkdir -p /etc/proftpd/conf.d 2>/dev/null || :
+for f in /etc/ftpd/{conf.d/mod_{auth_file,clamav,ident}.conf,ftpusers,ftpusers.default,proftpd.conf}; do
+       f=${f##*/}
+       [ -f "/etc/ftpd/$f" ] && mv "/etc/ftpd/$f" /etc/proftpd 2>/dev/null || :
+       [ -f "/etc/ftpd/conf.d/$f" ] && mv "/etc/ftpd/conf.d/$f" /etc/proftpd/conf.d 2>/dev/null || :
+done
+find /etc/proftpd -type f 2>/dev/null | xargs sed -i -e 's|/etc/ftpd|/etc/proftpd|g' 2>/dev/null
+[ -n "$(find /etc/ftpd/conf.d -type d -empty 2>/dev/null)" ] && rmdir /etc/ftpd 2>/dev/null || :
+[ -n "$(find /etc/ftpd -type d -empty 2>/dev/null)" ] && rmdir /etc/ftpd 2>/dev/null || :
+
+%triggerpostun common -- proftpd-common < 2:1.3.6-5
+echo
+echo "Warning! Configuration has been migrated to /etc/proftpd."
+echo
+
+%triggerun anonftp -- proftpd-anonftp < 2:1.3.6-5
+if [ $1 -le 1 ]; then
+        exit 0
 fi
-
-# it's sooo annoying to write them
-%define        module_scripts() \
-%post %1 \
-%module_post \
-\
-%postun %1 \
-%module_postun
+[ -d /etc/proftpd/conf.d ] || mkdir -p /etc/proftpd 2>/dev/null || :
+[ -f /etc/ftpd/conf.d/anonftp.conf ] && mv /etc/ftpd/conf.d/anonftp.conf /etc/proftpd/conf.d 2>/dev/null || :
+sed -i -e 's|/etc/ftpd|/etc/proftpd|g' /etc/ftpd/conf.d/anonftp.conf 2>/dev/null
+[ -n "$(find /etc/ftpd/conf.d -type d -empty 2>/dev/null)" ] && rmdir /etc/ftpd 2>/dev/null || :
+[ -n "$(find /etc/ftpd -type d -empty 2>/dev/null)" ] && rmdir /etc/ftpd 2>/dev/null || :
 
 %module_scripts mod_auth_pam
 %module_scripts mod_ldap