[Git][debian-proftpd-team/proftpd][master] Merge request: Fix some issues reported by lintian.

Hilmar Preuße gitlab at salsa.debian.org
Wed Mar 25 20:19:15 GMT 2020 


Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
bfe00cec by Hilmar Preusse at 2020-03-25T21:18:18+01:00
Merge request: Fix some issues reported by lintian.

- - - - -


4 changed files:

- debian/changelog
- debian/copyright
- debian/rules
- + debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,18 @@ proftpd-dfsg (1.3.6c-3) UNRELEASED; urgency=medium
 
   * Remove surplus BD on libattr1-dev (Closes: #953917).
 
+ [ Debian Janitor <janitor at jelmer.uk> ]
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * debian/copyright: use spaces rather than tabs to start continuation
+    lines.
+  * Wrap long lines in changelog entries: 1.3.5~rc1-2, 1.3.3a-6, 1.3.3a-
+    4, 1.3.3a-2, 1.3.2a-1, 1.3.2-3, 1.3.1-17, 1.3.1-10, 1.3.0-26, 1.2.10-
+    23, 1.2.10-9, 1.2.10-3, 1.2.10-2, 1.2.9-12, 1.2.9-8, 1.2.0pre9-1.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+  * Refer to specific version of license .
+
  -- Hilmar Preusse <hille42 at web.de>  Sun, 15 Mar 2020 10:42:33 +0100
 
 proftpd-dfsg (1.3.6c-2) unstable; urgency=medium
@@ -136,7 +148,7 @@ proftpd-dfsg (1.3.6-2) unstable; urgency=medium
 
   [ Francesco Paolo Lovergine ]
   * Updated Vcs-* fields to reflect moving to salsa from alioth.
-  * Updated maintenance team list for migration from alioth. 
+  * Updated maintenance team list for migration from alioth.
   * Policy bumped to 4.1.4, no changes required.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 29 Apr 2018 11:00:03 +0200
@@ -431,9 +443,8 @@ proftpd-dfsg (1.3.5~rc1-2) experimental; urgency=low
     the update-inetd tool superfluous.
     (closes: #626527)
   * Added Suggests for the new -geoip module.
-  * New patch: `contrib_hardening_flags' adds hardening flags to contrib/ modules.
-    (Thanks Simon Ruderich for the patch).
-    (closes: #668196)
+  * New patch: `contrib_hardening_flags' adds hardening flags to contrib/
+    modules. (Thanks Simon Ruderich for the patch). (closes: #668196)
   * Added hardening-includes b-d.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Jan 2013 10:57:37 +0100
@@ -678,8 +689,8 @@ proftpd-dfsg (1.3.3d-1) unstable; urgency=low
 
 proftpd-dfsg (1.3.3a-6) unstable; urgency=high
 
-  * [SECURITY] 3536.dpatch fixes insufficient bounds checking in sql_prepare_where()
-    function as found in mod_sql.c. This is CVE-2010-4652.
+  * [SECURITY] 3536.dpatch fixes insufficient bounds checking in
+    sql_prepare_where() function as found in mod_sql.c. This is CVE-2010-4652.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 28 Jan 2011 09:54:52 +0100
 
@@ -695,8 +706,8 @@ proftpd-dfsg (1.3.3a-5) unstable; urgency=high
 
 proftpd-dfsg (1.3.3a-4) unstable; urgency=high
 
-  * [SECURITY,PATCH] 3519.dpatch fixes Inappropriate directory traversal allowed by
-    mod_site_misc. This vulnerability can be used to:
+  * [SECURITY,PATCH] 3519.dpatch fixes Inappropriate directory traversal allowed
+    by mod_site_misc. This vulnerability can be used to:
      - create a directory located outside the writable directory
      - delete a directory located outside the writable directory
      - create a symlink located outside the writable directory
@@ -715,17 +726,14 @@ proftpd-dfsg (1.3.3a-2) unstable; urgency=medium
 
   * A few upstream fixes taken from 1.3.3b bug fixing release. Most fixes
     are NULL dereferences that cause segfaults at run time.
-  * New patches:
-        3481.dpatch: Problem with SFTP directory listings.
-        3483.dpatch: NULL pointer dereference handling SITE command in mod_quotatab
-        3487.dpatch: Null pointer dereference with EPRT/EPSV/PASV/PORT command
-                     during data transfer.
-        3492.dpatch: Null pointer dereference during data transfer due to
-                     RNFR/RNTO.
-        3494.dpatch: Null pointer dereference for IPv6-enabled proftpd when no
-                     DefaultServer configured.
-        3501.dpatch: <Anonymous> logins with "AuthAliasOnly on" still handled
-                     as anonymous logins.
+  * New patches:     3481.dpatch: Problem with SFTP directory listings.
+    3483.dpatch: NULL pointer dereference handling SITE command in mod_quotatab
+    3487.dpatch: Null pointer dereference with EPRT/EPSV/PASV/PORT command
+    during data transfer.     3492.dpatch: Null pointer dereference during data
+    transfer due to                  RNFR/RNTO.     3494.dpatch: Null pointer
+    dereference for IPv6-enabled proftpd when no                  DefaultServer
+    configured.     3501.dpatch: <Anonymous> logins with "AuthAliasOnly on"
+    still handled                  as anonymous logins.
   * Updated pt_BR.po template.
     (closes: #595889)
 
@@ -911,16 +919,16 @@ proftpd-dfsg (1.3.2a-1) unstable; urgency=low
   * Removed obsolete patches: 3190, 3196.
   * Removed obsolete proftpd-common conflicting.
   * Policy bumped to 3.8.2 (no changes).
-  * Now proftpd-basic Provides: proftpd-abi-<version>, which is useful for external
-    plugins. All plugins created with external sources has to depend on the
-    specified ABI in order to avoid breakages at upgrade time by mixing
+  * Now proftpd-basic Provides: proftpd-abi-<version>, which is useful for
+    external plugins. All plugins created with external sources has to depend on
+    the specified ABI in order to avoid breakages at upgrade time by mixing
     mixed versions.
   * File debian/control is templated to depend on upstream version for ABI
     interface automagically at build time.
   * The cron.monthly ftpstats job has been removed and merged with logrotate.
     (closes: #522199)
-  * Now postinst disables old monthly cron jobs at upgrade time. Added a note about
-    new logrotation scheduling policy in proftpd-basic.NEWS.
+  * Now postinst disables old monthly cron jobs at upgrade time. Added a note
+    about new logrotation scheduling policy in proftpd-basic.NEWS.
   * Fixed proftpd-basic.NEWS file contents.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 17 Jul 2009 13:28:38 +0200
@@ -932,7 +940,8 @@ proftpd-dfsg (1.3.2-3) unstable; urgency=medium
     after odbc.patch. My oversight...
     (closes: #519029)
   * [PATCH] Added 3204.dpatch to provide a better prxs to third-parties module.
-    It properly manages DESTDIR and module $Libraries$. And also provides --help :)
+    It properly manages DESTDIR and module $Libraries$. And also provides --help
+    :)
   * Removed 3188.dpatch because obsoleted by 3204.dpatch.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 10 Mar 2009 10:28:12 +0100
@@ -997,10 +1006,10 @@ proftpd-dfsg (1.3.2-1) unstable; urgency=low
 
 proftpd-dfsg (1.3.1-17) unstable; urgency=high
 
-  * Security: added 3173.dpatch patch to manage a critical encoding-dependent SQL
-    injection with SQL-based authentication.
-    See http://bugs.proftpd.org/show_bug.cgi?id=3173. This is fixed in 1.3.2.
-    Thanks TJ for backported patch.
+  * Security: added 3173.dpatch patch to manage a critical encoding-dependent
+    SQL injection with SQL-based authentication. See
+    http://bugs.proftpd.org/show_bug.cgi?id=3173. This is fixed in 1.3.2. Thanks
+    TJ for backported patch.
   * Now debian/rules removes at cleaning time a couple of .la files
     under contrib/ still around after building. This fixes a recently discovered
     FTBS error due to those files.
@@ -1098,9 +1107,9 @@ proftpd-dfsg (1.3.1-10) unstable; urgency=low
   * Commented better tls.conf templates in order to simplify SSL/TTL certs
     generation for users. Changed /etc/ssl/{private/certs} paths used for
     coherence.
-  * Added a /usr/sbin/proftpd-gencert utility to generate or re-create a self-signed
-    SSL/TLS certificate. This is inspired to the exim4 sample script and
-    useful for lazy people.
+  * Added a /usr/sbin/proftpd-gencert utility to generate or re-create a
+    self-signed SSL/TLS certificate. This is inspired to the exim4 sample script
+    and useful for lazy people.
   * Added openssl as suggested package. It is required in order to run
     proftpd-gencert.
   * Now set IdentLookups off in default proftpd.conf.
@@ -1311,8 +1320,8 @@ proftpd-dfsg (1.3.1-1) unstable; urgency=low
 
 proftpd-dfsg (1.3.0-26) UNRELEASED; urgency=low
 
-  * Added a modules_order patch to manage modules that use their own build script.
-    See http://bugs.proftpd.org/show_bug.cgi?id=2974
+  * Added a modules_order patch to manage modules that use their own build
+    script. See http://bugs.proftpd.org/show_bug.cgi?id=2974
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 05 Oct 2007 23:25:28 +0200
 
@@ -1707,8 +1716,8 @@ proftpd (1.2.10-24) unstable; urgency=low
 
 proftpd (1.2.10-23) unstable; urgency=low
 
-  * Managing nicely bad configs now, and other minor changes to init script now done.
-    (closes: #41089, #326943)
+  * Managing nicely bad configs now, and other minor changes to init script now
+    done. (closes: #41089, #326943)
   * Updated de.po template.
     (closes: #326799)
 
@@ -1963,7 +1972,8 @@ proftpd (1.2.10-4) unstable; urgency=low
 
 proftpd (1.2.10-3) experimental; urgency=low
 
-  * Revised patch 21.sendfile_with_large_files due to type mismatch in a function call :-(
+  * Revised patch 21.sendfile_with_large_files due to type mismatch in a
+    function call :-(
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri,  5 Nov 2004 13:38:11 +0100
 
@@ -1972,9 +1982,10 @@ proftpd (1.2.10-2) experimental; urgency=low
   * Merging changes from 1.2.9-19:
        - new debconf templates: cs.po, da.po, de.po
        - built with --enable-sendfile which should reduce average CPU load.
-       - added patch for >2GB files with sendfile(): 21.sendfile_with_large_files.
-         See See http://bugs.proftpd.org/show_bug.cgi?id=2509 for original patch.
-         Hint: run autoconf2.50 after applying cvs patch to the original tree.
+       - added patch for >2GB files with sendfile():
+         21.sendfile_with_large_files. See See
+         http://bugs.proftpd.org/show_bug.cgi?id=2509 for original patch. Hint:
+         run autoconf2.50 after applying cvs patch to the original tree.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri,  5 Nov 2004 11:04:43 +0100
 
@@ -2058,10 +2069,10 @@ proftpd (1.2.9-13) unstable; urgency=low
 
 proftpd (1.2.9-12) unstable; urgency=high
 
-  * Removed all autoconf-related rules within Makefile.in, so patch 07.autoconf.diff
-    has changed. Previous patch tried to force the use of a recent autoconf
-    instead. This freezes configure in the form issued by upstream.
-    (closes: #248612)
+  * Removed all autoconf-related rules within Makefile.in, so patch
+    07.autoconf.diff has changed. Previous patch tried to force the use of a
+    recent autoconf instead. This freezes configure in the form issued by
+    upstream. (closes: #248612)
   * Autotools file config.(guess|sub) moved into the build-tree.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 12 May 2004 15:00:07 +0200
@@ -2093,9 +2104,8 @@ proftpd (1.2.9-9) unstable; urgency=low
 proftpd (1.2.9-8) unstable; urgency=high
 
   * netbase versioning uniformed to 4.13 for each package.
-  * The no-end saga of ucf, again. Version -7 missed modifications done in -6 for
-    #239528, due to cvs repository outdated status.
-    (closes: #244020)
+  * The no-end saga of ucf, again. Version -7 missed modifications done in -6
+    for #239528, due to cvs repository outdated status. (closes: #244020)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 13 Apr 2004 13:51:47 +0200
 
@@ -2879,7 +2889,8 @@ proftpd (1.2.0pre9-2) unstable; urgency=low
 
 proftpd (1.2.0pre9-1) unstable; urgency=low
 
-  * New upstream version, closes: #43842, #38203, #48274, #46407, #40085, #33206.
+  * New upstream version, closes: #43842, #38203, #48274, #46407, #40085,
+    #33206.
   * Included patch from Madarasz Gergely so it works on 2.0 kernels again
     (adopted upstream), closes: #47138.
   * Database client libraries are linked dynamically, closes: #47147.


=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ProFTPD
 Upstream-Contact: The ProFTPD Project team, TJ Saunders <tj at castaglia.org>
 Source: http://www.proftpd.org/
@@ -7,9 +7,9 @@ Comment: The DFSG tarball is created by removing by hand the rfc/ folder
 
 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, 2008 The ProFTPD Project team
+ 	2001, 2008 TJ Saunders <tj at castaglia.org>
 License: GPL-2+
 
 License: GPL-2+
@@ -28,7 +28,6 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
- .
 Comment: As a special exemption, Public Flood Software/MacGyver aka Habeeb J. Dihu
  and other respective copyright holders give permission to link this program
  with OpenSSL, and distribute the resulting executable, without including
@@ -36,7 +35,7 @@ Comment: As a special exemption, Public Flood Software/MacGyver aka Habeeb J. Di
 
 Files: src/xferlog* include/xferlog.h contrib/xferstats.holger-preiss
 Copyright: 1999-2000, WU-FTPD Development Group
-	1998, Holger Preiss (TU Dresden)
+ 	1998, Holger Preiss (TU Dresden)
 License: Academic
 
 License: Academic
@@ -67,7 +66,7 @@ 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>
+ 	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:
@@ -94,7 +93,7 @@ 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-2012, Francesco Paolo Lovergine <frankie 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>
 License: GPL-2+


=====================================
debian/rules
=====================================
@@ -33,7 +33,7 @@ ifeq (,$(DEB_BUILD_GNU_TYPE))
 endif
 
 # XAttr does not exist on KFreeBSD
-# 
+#
 XATTR_NOT_EXISTS := kfreebsd-amd64 kfreebsd-i386
 ifneq (,$(filter $(DEB_HOST_ARCH), $(XATTR_NOT_EXISTS)))
   BUILDNOTXATTR=--disable-xattr


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/proftpd/proftpd/issues
+Bug-Submit: https://github.com/proftpd/proftpd/issues/new
+Repository: https://github.com/proftpd/proftpd.git
+Repository-Browse: https://github.com/proftpd/proftpd



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/bfe00cec899cacc9f6739b306e5cd1d07ac71816

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/bfe00cec899cacc9f6739b306e5cd1d07ac71816
You're receiving this email because of your account on salsa.debian.org.

More information about the Pkg-proftpd-maintainers mailing list