[Git][debian-proftpd-team/proftpd][master] 6 commits: Fix for #1066117.
Hilmar Preuße (@hilmar-guest)
gitlab at salsa.debian.org
Wed Mar 13 10:58:28 GMT 2024
Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd
Commits:
e605a8d8 by Hilmar Preuße at 2024-03-13T08:23:21+01:00
Fix for #1066117.
- - - - -
a2028be7 by Hilmar Preuße at 2024-03-13T08:43:50+01:00
Remove some trailing white space.
- - - - -
205967aa by Hilmar Preuße at 2024-03-13T08:45:21+01:00
Reorganize/Update d/changelog.
- - - - -
846c29a5 by Hilmar Preuße at 2024-03-13T09:39:19+01:00
Lintian: E: proftpd-dev: depends-on-obsolete-package
- - - - -
62d0a71b by Hilmar Preuße at 2024-03-13T09:48:05+01:00
Add DEP-3 header to patches, remove obsolete patch.
- - - - -
bc188ce5 by Hilmar Preuße at 2024-03-13T09:48:31+01:00
Finalize for upload.
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/control.in
- debian/copyright
- debian/patches/01_disable_inet_connect_ipv4_test.diff
- debian/patches/02_disable_redis_sentinel_conn_new_test.diff
- − debian/patches/03_disable_all_non_api_tests.diff
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+proftpd-dfsg (1.3.8.b+dfsg-2) unstable; urgency=medium
+
+ * Add libnsl-dev to BD (Closes: #1066117).
+ * Reorganize/Update d/changelog.
+ * Lintian: E: proftpd-dev: depends-on-obsolete-package
+ * Add DEP-3 header to patches, remove obsolete patch.
+
+ -- Hilmar Preusse <hille42 at web.de> Wed, 13 Mar 2024 09:48:15 +0100
+
proftpd-dfsg (1.3.8.b+dfsg-1) unstable; urgency=high
* New upstream release. Contains bug fix for CVE-2023-48795.
@@ -25,7 +34,7 @@ proftpd-dfsg (1.3.8+dfsg-8) unstable; urgency=medium
proftpd-dfsg (1.3.8+dfsg-7) unstable; urgency=medium
* Partially reverted changes in -6. The new proftpd-run.service has been
- dropped in favour of what seems the simplest approach.
+ dropped in favour of what seems the simplest approach.
* Revised NEWS/README files to reflect changes.
* Removed now obsolete Breaks/Conflicts hints in d/control.in.
@@ -34,8 +43,8 @@ proftpd-dfsg (1.3.8+dfsg-7) unstable; urgency=medium
proftpd-dfsg (1.3.8+dfsg-6) unstable; urgency=medium
* Added a postrm to force stop of systemd units at remove time. This is due
- because the new way of installing service/socket now does not trigger stopping
- at remove time.
+ because the new way of installing service/socket now does not trigger stopping
+ at remove time.
* Updated the README.Debian file to reflect changes in service management.
-- Francesco Paolo Lovergine <frankie at debian.org> Thu, 22 Jun 2023 08:26:48 +0200
@@ -50,7 +59,7 @@ proftpd-dfsg (1.3.8+dfsg-5) unstable; urgency=medium
* Replaced deprecated which command in postinst/rm.
* Stripped obsolete proftpd-basic virtual package (Closes: #1038311).
* Policy bumped to 4.6.2. No changes required.
- * Introduced a new systemd service to start the main socket/service
+ * Introduced a new systemd service to start the main socket/service
on the basis of the proftpd.conf configuration (standalone/inetd).
(Closes: #1038416)
* Added an entry to NEWS file to explain the change in unit files.
=====================================
debian/control
=====================================
@@ -11,6 +11,7 @@ Build-Depends: debhelper-compat (= 13),
libcap-dev [linux-any],
libldap-dev,
default-libmysqlclient-dev,
+ libnsl-dev,
libncurses-dev,
libpam-dev,
libpcre2-dev,
@@ -79,7 +80,7 @@ Depends: libacl1-dev,
proftpd-core (=${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Suggests: pkg-config
+Suggests: pkgconf
Description: Versatile, virtual-hosting FTP daemon - development files
ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
Protocol daemon supports also hidden directories, virtual hosts, and
@@ -274,4 +275,3 @@ Description: Versatile, virtual-hosting FTP daemon - tcpwrapper module
This module is contained in the contrib/mod_wrap.c file for ProFTPD 1.2+. It
enables the daemon to use the common tcpwrappers access control library while
in standalone mode, and in a very configurable manner.
-
=====================================
debian/control.in
=====================================
@@ -11,6 +11,7 @@ Build-Depends: debhelper-compat (= 13),
libcap-dev [linux-any],
libldap-dev,
default-libmysqlclient-dev,
+ libnsl-dev,
libncurses-dev,
libpam-dev,
libpcre2-dev,
@@ -79,7 +80,7 @@ Depends: libacl1-dev,
proftpd-core (=${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Suggests: pkg-config
+Suggests: pkgconf
Description: Versatile, virtual-hosting FTP daemon - development files
ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
Protocol daemon supports also hidden directories, virtual hosts, and
=====================================
debian/copyright
=====================================
@@ -9,9 +9,27 @@ Files-Excluded:
Files: *
Copyright: 1997, 1998 Public Flood Software
- 1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver at tos.net>
- 2001, 2008 The ProFTPD Project team
- 2001, 2008 TJ Saunders <tj at castaglia.org>
+ 1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver at tos.net>
+ 2001, 2024 The ProFTPD Project team
+ 2001, 2024 TJ Saunders <tj at castaglia.org>
+License: GPL-2+
+
+Files: src/xferlog* include/xferlog.h contrib/xferstats.holger-preiss
+Copyright: 1999-2000, WU-FTPD Development Group
+ 1998, Holger Preiss (TU Dresden)
+License: Academic
+
+Files: contrib/mod_tls.c
+Copyright: 2000-2002, Peter 'Luna' Runestig <peter at runestig.com>
+ 2002-2010 TJ Saunders <tj at castaglia.org>
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: 1997-2000, Johnie Ingram <johnie at debian.org>
+ 2001-2002, Ivo Timmermans <ivo at debian.org>
+ 2002-2003, Paul Martin <pm at debian.org>
+ 2003-2023, Francesco Paolo Lovergine <frankie at debian.org>
+ 2016-2024, Hilmar Preusse <hille42 at web.de>
License: GPL-2+
License: GPL-2+
@@ -35,11 +53,6 @@ Comment: As a special exemption, Public Flood Software/MacGyver aka Habeeb J. Di
with OpenSSL, and distribute the resulting executable, without including
the source code for OpenSSL in the source distribution.
-Files: src/xferlog* include/xferlog.h contrib/xferstats.holger-preiss
-Copyright: 1999-2000, WU-FTPD Development Group
- 1998, Holger Preiss (TU Dresden)
-License: Academic
-
License: Academic
Copyright (c) 1994 Washington University in Saint Louis.
All rights reserved.
@@ -66,9 +79,6 @@ License: Academic
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-Files: contrib/mod_tls.c
-Copyright: 2000-2002, Peter 'Luna' Runestig <peter at runestig.com>
- 2002-2010 TJ Saunders <tj at castaglia.org>
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without modifi-
cation, are permitted provided that the following conditions are met:
@@ -92,11 +102,3 @@ License: BSD-3-clause
ER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABI-
LITY, 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.
-
-Files: debian/*
-Copyright: 1997-2000, Johnie Ingram <johnie at debian.org>
- 2001-2002, Ivo Timmermans <ivo at debian.org>
- 2002-2003, Paul Martin <pm at debian.org>
- 2003-2012, Francesco Paolo Lovergine <frankie at debian.org>
- 2016-2022, Hilmar Preusse <hille42 at web.de>
-License: GPL-2+
=====================================
debian/patches/01_disable_inet_connect_ipv4_test.diff
=====================================
@@ -1,3 +1,7 @@
+Description: Disable inet_connect_ipv4 test.
+Author: Hilmar Preusse <hille42 at web.de>
+Forwarded: not needed
+
--- proftpd.orig/tests/api/inet.c
+++ proftpd/tests/api/inet.c
@@ -1171,7 +1171,7 @@
=====================================
debian/patches/02_disable_redis_sentinel_conn_new_test.diff
=====================================
@@ -1,3 +1,7 @@
+Description: Disable redis_sentinel_conn_new_test test.
+Author: Hilmar Preusse <hille42 at web.de>
+Forwarded: not needed
+
--- proftpd.orig/tests/api/redis.c
+++ proftpd/tests/api/redis.c
@@ -4917,7 +4917,7 @@
=====================================
debian/patches/03_disable_all_non_api_tests.diff deleted
=====================================
@@ -1,11 +0,0 @@
---- proftpd.orig/tests/Makefile.in
-+++ proftpd/tests/Makefile.in
-@@ -145,7 +145,7 @@
- check-utils:
- perl tests.pl --file-pattern '^t\/utils\/'
-
--check: check-api running-tests
-+check: check-api
-
- clean:
- $(LIBTOOL) --mode=clean $(RM) *.o *.gcda *.gcno api/*.o api/*.gcda api/*.gcno api-tests$(EXEEXT) api-tests.log
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/230e9feb22bcf1c9871ceeee319d58fd2c896db8...bc188ce577dadef58b6a064845f0da4430497361
--
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/230e9feb22bcf1c9871ceeee319d58fd2c896db8...bc188ce577dadef58b6a064845f0da4430497361
You're receiving this email because of your account on salsa.debian.org.
More information about the Pkg-proftpd-maintainers
mailing list