pure-ftpd: version bumped to 1.0.42.

lunar-linux · Mar 11, 2016 · 52dc5cd · 52dc5cd
1 parent d843c36
commit 52dc5cd
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 36 deletions.
diff --git a/ftp/pure-ftpd/BUILD b/ftp/pure-ftpd/BUILD
@@ -1,19 +1,14 @@
-(
+OPTS+=" --with-everything \
+        --bindir=/usr/bin \
+        --sbindir=/usr/bin" &&
 
-  if module_installed Linux-PAM;  then
-    OPTS+=" --with-pam"
-  fi
+default_build &&
 
-  ./configure  --sysconfdir=/etc        \
-               --prefix=/usr            \
-               --mandir=/usr/share/man  \
-               --localstatedir=/var     \
-               --with-everything        \
-               $OPTS                   &&
-  default_make  &&
-  gather_docs *.conf  &&
-  if [ ! -f /etc/ftpusers ]; then
-    cp pam/ftpusers /etc
-  fi
+gather_docs *.conf &&
 
-) > $C_FIFO 2>&1
+if [ ! -f /etc/ftpusers ]; then
+  cp pam/ftpusers /etc
+fi
+
+install -Dm755 configuration-file/pure-config.pl /usr/bin/pure-config.pl
+install -Dm644 -t /etc/pure-ftpd/ configuration-file/pure-ftpd.conf $SCRIPT_DIRECTORY/welcome.msg
diff --git a/ftp/pure-ftpd/CONFIGURE b/ftp/pure-ftpd/CONFIGURE
@@ -1,13 +1,13 @@
-if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
+if ! grep -q CONFIGURED $MODULE_CONFIG; then
 
-  if    query  "Do you want to disable banner? " y
-      then OPTS=$OPTS" --without-banner"
+  if query  "Do you want to disable banner? " y
+    then OPTS=$OPTS" --without-banner"
   fi
 
-  if    query  "Do you want to enable large file support? " y
-      then OPTS=$OPTS" --with-largefile"
+  if query  "Do you want to enable large file support? " y
+    then OPTS=$OPTS" --with-largefile"
   fi
 
-   echo  'CONFIGURED="y"'  >>  $MODULE_CONFIG
-   echo  'OPTS='\"$OPTS\"    >>  $MODULE_CONFIG
+  echo 'CONFIGURED="y"' >> $MODULE_CONFIG
+  echo 'OPTS='\"$OPTS\" >> $MODULE_CONFIG
 fi
diff --git a/ftp/pure-ftpd/CONFLICTS b/ftp/pure-ftpd/CONFLICTS
@@ -1,4 +1,3 @@
-conflicts wu-ftpd
 conflicts vsftpd
 conflicts proftpd
 
diff --git a/ftp/pure-ftpd/DEPENDS b/ftp/pure-ftpd/DEPENDS
@@ -1,2 +1,7 @@
-optional_depends  "mysql"        "--with-mysql"  "--without-mysql"  "for MySQL user auth"
-optional_depends  "openssl"      "--with-tls"    ""                 "for SSL/TLS support"
+optional_depends Linux-PAM "--with-pam" "" "for PAM support"
+optional_depends openssl   "--with-tls" "" "for SSL/TLS support"
+
+optional_depends %MYSQL \
+                 "--with-mysql" \
+                 "--without-mysql" \
+                 "for MySQL user auth"
diff --git a/ftp/pure-ftpd/DETAILS b/ftp/pure-ftpd/DETAILS
@@ -1,13 +1,11 @@
           MODULE=pure-ftpd
-         VERSION=1.0.36
+         VERSION=1.0.42
           SOURCE=$MODULE-$VERSION.tar.bz2
-   SOURCE_URL[0]=ftp://ftp.pureftpd.org/pub/$MODULE/releases
-   SOURCE_URL[1]=$SFORGE_URL/pureftpd
-   SOURCE_URL[2]=http://sunsite.rediris.es/sites/ftp.fr.pureftpd.org/pub/$MODULE/releases
-      SOURCE_VFY=sha1:54d7e25ad4dd3d0ae29032705401e56467b122d5
+      SOURCE_URL=http://download.pureftpd.org/pub/pure-ftpd/releases/
+      SOURCE_VFY=sha256:efd11295998453e31dbeef9159624beabbac2643a338134ae8c2ef529aa2ec10
         WEB_SITE=http://www.pureftpd.org
          ENTERED=20010922
-         UPDATED=20130116
+         UPDATED=20160311
            SHORT="An efficient, lightweight, and secure FTP server"
 
 cat << EOF

diff --git a/ftp/pure-ftpd/POST_INSTALL b/ftp/pure-ftpd/POST_INSTALL
@@ -1,4 +1,14 @@
-if  [  -x  /etc/init.d/pure-ftpd.sh  ]; then
-   rm /etc/init.d/pure-ftpd.sh 
+if [ -x /etc/init.d/pure-ftpd.sh ]; then
+  rm /etc/init.d/pure-ftpd.sh
 fi
 
+sedit 's|NoAnonymous\s.*no|NoAnonymous yes|' /etc/pure-ftpd/pure-ftpd.conf
+sedit 's|# /usr/sbin/pure-config.pl /usr/etc/pure-ftpd.conf|# /usr/bin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf|' /etc/pure-ftpd/pure-ftpd.conf
+sedit 's|#PIDFile\s.*/var/run/pure-ftpd.pid|PIDFile /run/pure-ftpd.pid|' /etc/pure-ftpd/pure-ftpd.conf
+sedit 's|# AltLog\s.*clf:/var/log/pureftpd.log|AltLog clf:/var/log/pureftpd.log|' /etc/pure-ftpd/pure-ftpd.conf
+sedit 's|# TLS\s.*1|TLS 1|' /etc/pure-ftpd/pure-ftpd.conf
+sedit 's|# TLSCipherSuite\s.*HIGH|TLSCipherSuite HIGH:MEDIUM:+TLSv1|' /etc/pure-ftpd/pure-ftpd.conf
+sedit 's|# CertFile\s.*/etc/ssl/private/pure-ftpd.pem|CertFile /etc/ssl/private/pure-ftpd.pem|' /etc/pure-ftpd/pure-ftpd.conf
+sedit "/# FortunesFile/a FortunesFile \/etc\/pure-ftpd\/welcome.msg" /etc/pure-ftpd/pure-ftpd.conf
+
+#sedit 's|SyslogFacility\s.*ftp|SyslogFacility none|' /etc/pure-ftpd/pure-ftpd.conf
diff --git a/ftp/pure-ftpd/logrotate.d/pure-ftpd b/ftp/pure-ftpd/logrotate.d/pure-ftpd
@@ -0,0 +1,7 @@
+/var/log/pureftpd.log
+{
+        monthly
+        missingok
+        notifempty
+        compress
+}
diff --git a/ftp/pure-ftpd/systemd.d/pure-ftpd.service b/ftp/pure-ftpd/systemd.d/pure-ftpd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Pure-FTPd server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/pure-ftpd.pid
+ExecStart=/usr/bin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ftp/pure-ftpd/welcome.msg b/ftp/pure-ftpd/welcome.msg
@@ -0,0 +1 @@
+Welcome to the FTP server.
diff --git a/ftp/pure-ftpd/xinetd.d/pure-ftpd b/ftp/pure-ftpd/xinetd.d/pure-ftpd
@@ -5,8 +5,8 @@ service ftp
    wait        = no
    user        = root
    disable     = no
-   server      = /usr/sbin/pure-ftpd
-   server_args = -b 
+   server      = /usr/bin/pure-ftpd
+   server_args = -b
    per_source  = 8
    log_type    = FILE /var/log/xinetd/pure-ftpd
    log_on_success = PID HOST USERID EXIT DURATION