CVS commit: pkgsrc/net/vsftpd

["Juraj Lutter" <otis%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   otis
Date:           Tue Jan 10 20:36:33 UTC 2023

Modified Files:
        pkgsrc/net/vsftpd: Makefile distinfo
Added Files:
        pkgsrc/net/vsftpd/files/smf: manifest.xml

Log Message:
vsftpd: update to 3.0.5

Changelog:

Since 3.0.3:
- Fix build on Fedora 33 (one warning, one incorrect libcap used).
- Fix SSL build (terrible grep for symbol in vsf_findlibs.sh)!
- Fix runtime SIGSYS crashes on Fedora 33 (seccomp sandbox policy tweaks).
- Reject HTTP verbs pre-login.
- Disable TLS prior to v1.2 by default.
- Close the control connection after 10 unknown commands pre-login.
- Reject any TLS ALPN advertisement that's not 'ftp'.
- Add ssl_sni_hostname option to require a match on incoming SNI hostname.

Since 3.0.4:
- Fix ALPN callback to correctly select the 'ftp' string if present. Works
with FileZilla-3.55.0.
- Fix a couple of seccomp policy issues with Fedora 34.

And while here, also add a SunOS SMF manifest.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/net/vsftpd/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/vsftpd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/vsftpd/files/smf/manifest.xml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/vsftpd/Makefile
diff -u pkgsrc/net/vsftpd/Makefile:1.51 pkgsrc/net/vsftpd/Makefile:1.52
--- pkgsrc/net/vsftpd/Makefile:1.51     Sun Feb  9 20:58:37 2020
+++ pkgsrc/net/vsftpd/Makefile  Tue Jan 10 20:36:33 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2020/02/09 20:58:37 rillig Exp $
+# $NetBSD: Makefile,v 1.52 2023/01/10 20:36:33 otis Exp $
 
-DISTNAME=      vsftpd-3.0.3
-PKGREVISION=   3
+DISTNAME=      vsftpd-3.0.5
 CATEGORIES=    net
 MASTER_SITES=  https://security.appspot.com/downloads/
 

Index: pkgsrc/net/vsftpd/distinfo
diff -u pkgsrc/net/vsftpd/distinfo:1.20 pkgsrc/net/vsftpd/distinfo:1.21
--- pkgsrc/net/vsftpd/distinfo:1.20     Tue Oct 26 11:07:09 2021
+++ pkgsrc/net/vsftpd/distinfo  Tue Jan 10 20:36:33 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 11:07:09 nia Exp $
+$NetBSD: distinfo,v 1.21 2023/01/10 20:36:33 otis Exp $
 
-BLAKE2s (vsftpd-3.0.3.tar.gz) = 1d7b862a7ab588b7828df53e3ac39269f05b83ebf170da49d88c30a3abed9f5b
-SHA512 (vsftpd-3.0.3.tar.gz) = 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
-Size (vsftpd-3.0.3.tar.gz) = 196649 bytes
+BLAKE2s (vsftpd-3.0.5.tar.gz) = 1419b1d21f1cbe8d7c7409bcc0783cb612746f2945ef1b75614336003e7be955
+SHA512 (vsftpd-3.0.5.tar.gz) = 9e9f9bde8c460fbc6b1d29ca531327fb2e40e336358f1cc19e1da205ef81b553719a148ad4613ceead25499d1ac3f03301a0ecd3776e5c228acccb7f9461a7ee
+Size (vsftpd-3.0.5.tar.gz) = 197778 bytes
 SHA1 (patch-aa) = 57fdc476df4b7ada021c7fd6e8bad6db2b2e0c48
 SHA1 (patch-ab) = df9252f99d06a4742713c36ce6bff8908da171f7
 SHA1 (patch-ac) = dacaeae7daac73ceb014653bd8c0553aceb62516

Added files:

Index: pkgsrc/net/vsftpd/files/smf/manifest.xml
diff -u /dev/null pkgsrc/net/vsftpd/files/smf/manifest.xml:1.1
--- /dev/null   Tue Jan 10 20:36:33 2023
+++ pkgsrc/net/vsftpd/files/smf/manifest.xml    Tue Jan 10 20:36:33 2023
@@ -0,0 +1,34 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='export'>
+  <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
+    <dependency name='network' grouping='require_all' restart_on='refresh' type='service'>
+      <service_fmri value='svc:/milestone/network:default'/>
+    </dependency>
+    <dependency name='filesystem' grouping='require_all' restart_on='refresh' type='service'>
+      <service_fmri value='svc:/system/filesystem/local'/>
+    </dependency>
+    <instance name='default' enabled='false'>
+       <dependency name='config' grouping='require_all' restart_on='none' type='path'>
+        <service_fmri value='file://localhost/@PKG_SYSCONFDIR@/vsftpd.conf' />
+       </dependency>
+       <exec_method type='method' name='start' exec='@PREFIX@/libexec/vsftpd %{vsftpd_params}' timeout_seconds='60'/>
+       <exec_method type='method' name='stop'  exec=':kill' timeout_seconds='60'/>
+       <property_group name='startd' type='framework'>
+        <propval name='duration' type='astring' value='child'/>
+        <propval name='ignore_error' type='astring' value='core,signal'/>
+       </property_group>
+       <property_group name='application' type='application'>
+        <propval name='vsftpd_params' type='astring' value='@PKG_SYSCONFDIR@/vsftpd.conf' />
+       </property_group>
+       <template>
+        <common_name>
+          <loctext xml:lang='C'>Very Secure FTP Daemon</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='vsftpd' section='8' manpath='@PREFIX@/@PKGMANDIR@'/>
+        </documentation>
+       </template>
+    </instance>
+  </service>
+</service_bundle>