diff -Nru linux-ftpd-ssl-0.17.36+0.3/debian/changelog linux-ftpd-ssl-0.17.36+really0.17/debian/changelog --- linux-ftpd-ssl-0.17.36+0.3/debian/changelog 2021-11-24 09:11:08.000000000 +0000 +++ linux-ftpd-ssl-0.17.36+really0.17/debian/changelog 2022-09-08 09:14:01.000000000 +0000 @@ -1,8 +1,20 @@ -linux-ftpd-ssl (0.17.36+0.3-2.2build1) jammy; urgency=medium +linux-ftpd-ssl (0.17.36+really0.17-2) unstable; urgency=medium - * No-change rebuild against openssl3 + * QA upload. + * Don't conflict with ftpd. + * Set Priority optional (was: extra). - -- Simon Chopin Wed, 24 Nov 2021 10:11:08 +0100 + -- Bastian Germann Thu, 08 Sep 2022 11:14:01 +0200 + +linux-ftpd-ssl (0.17.36+really0.17-1) unstable; urgency=medium + + * QA upload. + * Ignore cert file with -z nossl set. + * Drop outdated README.SSL. + * d/copyright: Convert to machine-readable format. + + MIT-CMU is not applicable (nowhere in upstream code). + + -- Bastian Germann Wed, 07 Sep 2022 09:39:57 +0200 linux-ftpd-ssl (0.17.36+0.3-2.2) unstable; urgency=medium diff -Nru linux-ftpd-ssl-0.17.36+0.3/debian/control linux-ftpd-ssl-0.17.36+really0.17/debian/control --- linux-ftpd-ssl-0.17.36+0.3/debian/control 2019-08-12 16:39:22.000000000 +0000 +++ linux-ftpd-ssl-0.17.36+really0.17/debian/control 2022-09-08 09:14:01.000000000 +0000 @@ -1,8 +1,7 @@ Source: linux-ftpd-ssl Section: net -Priority: extra -Maintainer: Mats Erik Andersson -Uploaders: Alberto Gonzalez Iniesta +Priority: optional +Maintainer: Debian QA Group Build-Depends: bison, debhelper (>= 10~), libpam0g-dev | libpam-dev, libssl-dev, cmake Standards-Version: 3.9.8 @@ -10,8 +9,7 @@ Architecture: any Depends: openbsd-inetd | inet-superserver, libpam-modules, openssl, ${shlibs:Depends}, ${misc:Depends} Provides: ftp-server -Conflicts: ftp-server, ftpd -Replaces: ftpd +Conflicts: ftp-server Description: FTP server with SSL encryption support This is the netkit ftp server with encryption support. . diff -Nru linux-ftpd-ssl-0.17.36+0.3/debian/copyright linux-ftpd-ssl-0.17.36+really0.17/debian/copyright --- linux-ftpd-ssl-0.17.36+0.3/debian/copyright 2017-01-24 14:35:15.000000000 +0000 +++ linux-ftpd-ssl-0.17.36+really0.17/debian/copyright 2022-09-07 07:39:57.000000000 +0000 @@ -1,46 +1,100 @@ -This package was split from netstd by Herbert Xu herbert@debian.org on -Thu, 1 Apr 1999 16:42:48 +1000. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Comment: This package was split from netstd by Herbert Xu herbert@debian.org +Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ + ftp://ftp.uni-mainz.de/pub/software/security/ssl/SSL-MZapps/linux-ftpd-0.17+ssl-0.3.diff.gz + +Files: * +Copyright: 1985-1994 The Regents of the University of California. + All rights reserved. +License: BSD-4-clause-UC -netstd was created by Peter Tobias tobias@et-inf.fho-emden.de on -Wed, 20 Jul 1994 17:23:21 +0200. - -It was downloaded from ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/. +Files: debian/patches/016-family_independence.diff + debian/patches/020-support_ipv6.diff +Copyright: 2010, Mats Erik Andersson +License: BSD-4-clause-UC +Comment: The license of the original software applies to these patches. -Copyright: - -/************************************************************************ - Copyright 1988, 1991 by Carnegie Mellon University - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, provided -that the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of Carnegie Mellon University not be used -in advertising or publicity pertaining to distribution of the software -without specific, written prior permission. - -CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. -IN NO EVENT SHALL CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. -************************************************************************/ - -/* - * The modifications to support SSLeay were done by Tim Hudson - * tjh@cryptsoft.com - * - * You can do whatever you like with these patches except pretend that - * you wrote them. - * - */ +Files: debian/patches/500-ssl.diff +License: BSD-4-clause-UC and linux-ftpd-ssl -Files: debian/patches/16-family_independence.diff - debian/patches/20-support_ipv6.diff -Copyright: 2010, Mats Erik Andersson -License: BSD -X-Comment: The license of the original software applies to these patches. +Files: support/setproctitle.c +Copyright: 1983, 1995 Eric P. Allman + 1988, 1993 The Regents of the University of California. All rights reserved. +License: BSD-4-clause-UC + +Files: ftpd/logutmp.c +Copyright: 1988, 1993 The Regents of the University of California. All rights reserved. + 1996, Jason Downs. All rights reserved. +License: BSD-4-clause-UC + +Files: ftpd/ftpusers.5 +Copyright: 1994 Peter Tobias (tobias@server.et-inf.fho-emden.de) +License: GPL + This file may be distributed under the GNU General Public License. +Comment: + See /usr/share/common-licenses/GPL for the complete license text. + +Files: support/setproctitle.3 +Copyright: 1994, 1995 Christopher G. Demetriou + All rights reserved. +License: BSD-4-clause-Demetriou + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Christopher G. Demetriou + for the NetBSD Project. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +License: BSD-4-clause-UC + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +License: linux-ftpd-ssl + The modifications to support SSLeay were done by Tim Hudson + tjh@cryptsoft.com + . + You can do whatever you like with these patches except pretend that + you wrote them. diff -Nru linux-ftpd-ssl-0.17.36+0.3/debian/patches/500-ssl.diff linux-ftpd-ssl-0.17.36+really0.17/debian/patches/500-ssl.diff --- linux-ftpd-ssl-0.17.36+0.3/debian/patches/500-ssl.diff 2018-12-01 18:07:30.000000000 +0000 +++ linux-ftpd-ssl-0.17.36+really0.17/debian/patches/500-ssl.diff 2022-09-07 07:39:57.000000000 +0000 @@ -1349,7 +1349,7 @@ + } + + /* Add in any certificates if you want to here ... */ -+ if (ssl_cert_file) { ++ if (ssl_active_flag && ssl_cert_file) { + if (!SSL_CTX_use_certificate_file(ssl_ctx, ssl_cert_file, + X509_FILETYPE_PEM)) { + BIO_printf(bio_err,"Error loading %s: ",ssl_cert_file); diff -Nru linux-ftpd-ssl-0.17.36+0.3/debian/patches/600-better_conformity.diff linux-ftpd-ssl-0.17.36+really0.17/debian/patches/600-better_conformity.diff --- linux-ftpd-ssl-0.17.36+0.3/debian/patches/600-better_conformity.diff 2017-01-24 14:35:15.000000000 +0000 +++ linux-ftpd-ssl-0.17.36+really0.17/debian/patches/600-better_conformity.diff 2022-09-07 07:39:57.000000000 +0000 @@ -951,7 +951,7 @@ + } + /* Add in any certificates if you want to here ... */ - if (ssl_cert_file) { + if (ssl_active_flag && ssl_cert_file) { - if (!SSL_CTX_use_certificate_file(ssl_ctx, ssl_cert_file, - X509_FILETYPE_PEM)) { - BIO_printf(bio_err,"Error loading %s: ",ssl_cert_file); diff -Nru linux-ftpd-ssl-0.17.36+0.3/debian/README.Debian linux-ftpd-ssl-0.17.36+really0.17/debian/README.Debian --- linux-ftpd-ssl-0.17.36+0.3/debian/README.Debian 2017-01-24 14:35:15.000000000 +0000 +++ linux-ftpd-ssl-0.17.36+really0.17/debian/README.Debian 2022-09-07 07:39:57.000000000 +0000 @@ -75,6 +75,14 @@ ftp stream tcp4 nowait root /usr/sbin/tcpd /usr/sbin/in.ftpd +Running ftpd without SSL +------------------------ + +Please use the server argument -z nossl to run ftpd without SSL configuration. +This is especially helpful when you transition from the linux-ftpd package's +ftpd (which does not have SSL support) to ftpd-ssl. + + Globbing Attacks ---------------- diff -Nru linux-ftpd-ssl-0.17.36+0.3/debian/README.SSL linux-ftpd-ssl-0.17.36+really0.17/debian/README.SSL --- linux-ftpd-ssl-0.17.36+0.3/debian/README.SSL 2017-01-24 14:35:15.000000000 +0000 +++ linux-ftpd-ssl-0.17.36+really0.17/debian/README.SSL 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -The SSL patches were downloaded from -ftp://ftp.uni-mainz.de/pub/software/security/ssl/SSL-MZapps/linux-ftpd-0.17+ssl-0.3.diff.gz - -The packages was build in the following way: - -apt-get source linux-ftpd -mv linux-ftpd-0.17 linux-ftpd-ssl-0.17.18+0.3 -cd linux-ftpd-ssl-0.17.18+0.3 -zcat ../linux-ftpd-0.17+ssl-0.3.diff.gz | patch -p1 -#don't fix problems with applied patches ! -cd .. -cp -a linux-ftpd-ssl-0.17.18+0.3 linux-ftpd-ssl-0.17.18+0.3.orig -cd linux-ftpd-ssl-0.17.18+0.3 -zcat ../linux-ftpd-ssl_0.17.12+0.3-2.diff.gz | patch -p1 diff -Nru linux-ftpd-ssl-0.17.36+0.3/debian/watch linux-ftpd-ssl-0.17.36+really0.17/debian/watch --- linux-ftpd-ssl-0.17.36+0.3/debian/watch 2017-01-24 14:35:15.000000000 +0000 +++ linux-ftpd-ssl-0.17.36+really0.17/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -version=3 - -# check for new debian package of our upstream, linux-ftpd -# the other possible upstreams are long dead - -opts="uversionmangle=s/(.*)-(.*)/$1.$2+0.3/" http://ftp.debian.org/debian/pool/main/l/linux-ftpd/linux-ftpd_(.*).dsc