[Git][debian-proftpd-team/proftpd][master] The Debian part for version 1.3.6a.

Hilmar Preuße gitlab at salsa.debian.org
Mon Oct 14 09:27:49 BST 2019 


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


Commits:
518d4a17 by Hilmar Preuße at 2019-10-14T08:27:15Z
The Debian part for version 1.3.6a.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- debian/patches/spelling_errors
- + debian/proftpd-dev.lintian-overrides
- debian/proftpd-substvars


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+proftpd-dfsg (1.3.6a-1) UNRELEASED; urgency=medium
+
+  * New upstream patch release. Obsoletes patches included in upstream:
+    - upstream_4372_CVE-2019-12815.diff
+    - upstream_4312, upstream_4312_fix_version
+    - upstream_4356
+    - upstream_4335
+    - upstream_4336 (although not mentioned in upstream changelog)
+    - github_pr_710 (although not mentioned in upstream changelog)
+    - github_pr_594 (although not mentioned in upstream changelog)
+    - upstream_pull_567 = Bug#4314
+  * Lintian Override: proftpd-dev: pkg-config-multi-arch-wrong-dir
+    (file is generated during build).
+
+ -- Hilmar Preusse <hille42 at web.de>  Sun, 13 Oct 2019 23:25:03 +0200
+
 proftpd-dfsg (1.3.6-6) unstable; urgency=medium
 
   * Document that proftpd read all files from /etc/proftpd/conf.d/


=====================================
debian/control
=====================================
@@ -42,7 +42,7 @@ Depends: adduser,
 Conflicts: ftp-server
 Breaks: proftpd (<< 1.3.2)
 Replaces: proftpd (<< 1.3.2)
-Provides: ftp-server, proftpd, proftpd-abi-1.3.6
+Provides: ftp-server, proftpd, proftpd-abi-1.3.6a
 Suggests: openbsd-inetd | inet-superserver,
           openssl,
           proftpd-mod-ldap,


=====================================
debian/patches/series
=====================================
@@ -9,13 +9,13 @@ mod_cap
 odbc
 reproducible_build
 spelling_errors
-upstream_4335
-upstream_4336
-upstream_4312
-upstream_4312_fix_version
-github_pr_710
-upstream_4356
+# upstream_4335
+# upstream_4336
+# upstream_4312
+# upstream_4312_fix_version
+# github_pr_710
+# upstream_4356
 wrong-path-for-interpreter_perl.diff
-github_pr_594
-upstream_pull_567
-upstream_4372_CVE-2019-12815.diff
+# github_pr_594
+# upstream_pull_567
+# upstream_4372_CVE-2019-12815.diff


=====================================
debian/patches/spelling_errors
=====================================
@@ -3,10 +3,8 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
 Last-Update: 2017-01-09
 Forwarded: https://github.com/proftpd/proftpd/pull/666
 
-Index: proftpd-dfsg/contrib/mod_sftp/date.c
-===================================================================
---- proftpd-dfsg.orig/contrib/mod_sftp/date.c	2018-01-15 21:09:11.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sftp/date.c	2018-01-15 21:09:11.000000000 +0100
+--- proftpd-dfsg-1.3.6a.orig/contrib/mod_sftp/date.c
++++ proftpd-dfsg-1.3.6a/contrib/mod_sftp/date.c
 @@ -124,7 +124,7 @@
        case '?':
          /* Ignore unsupported options */
@@ -16,11 +14,9 @@ Index: proftpd-dfsg/contrib/mod_sftp/date.c
          break;
      }
    }
-Index: proftpd-dfsg/contrib/mod_sftp/keys.c
-===================================================================
---- proftpd-dfsg.orig/contrib/mod_sftp/keys.c	2018-01-15 21:09:11.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sftp/keys.c	2018-01-15 21:09:11.000000000 +0100
-@@ -995,7 +995,7 @@
+--- proftpd-dfsg-1.3.6a.orig/contrib/mod_sftp/keys.c
++++ proftpd-dfsg-1.3.6a/contrib/mod_sftp/keys.c
+@@ -1062,7 +1062,7 @@
  
      if (sftp_keys_validate_ecdsa_params(curve, point) < 0) {
        (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
@@ -29,7 +25,7 @@ Index: proftpd-dfsg/contrib/mod_sftp/keys.c
        EC_POINT_free(point);
        EC_KEY_free(ec);
        return NULL;
-@@ -1975,7 +1975,7 @@
+@@ -2042,7 +2042,7 @@
        if (sftp_keys_validate_ecdsa_params(EC_KEY_get0_group(ec),
            EC_KEY_get0_public_key(ec)) < 0) {
          (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
@@ -38,7 +34,7 @@ Index: proftpd-dfsg/contrib/mod_sftp/keys.c
          EC_KEY_free(ec);
          EVP_PKEY_free(pkey);
          return -1;
-@@ -1983,7 +1983,7 @@
+@@ -2050,7 +2050,7 @@
  
        if (validate_ecdsa_private_key(ec)) {
          (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
@@ -47,11 +43,9 @@ Index: proftpd-dfsg/contrib/mod_sftp/keys.c
          EC_KEY_free(ec);
          EVP_PKEY_free(pkey);
          return -1;
-Index: proftpd-dfsg/contrib/mod_tls.c
-===================================================================
---- proftpd-dfsg.orig/contrib/mod_tls.c	2018-01-15 21:09:11.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_tls.c	2018-01-15 21:09:11.000000000 +0100
-@@ -2142,7 +2142,7 @@
+--- proftpd-dfsg-1.3.6a.orig/contrib/mod_tls.c
++++ proftpd-dfsg-1.3.6a/contrib/mod_tls.c
+@@ -2167,7 +2167,7 @@
    if (idx < 0) {
      pr_trace_msg(trace_channel, 12,
        "unable to check certificate CommonName against '%s': "
@@ -60,7 +54,7 @@ Index: proftpd-dfsg/contrib/mod_tls.c
      return 0;
    }
  
-@@ -2150,7 +2150,7 @@
+@@ -2175,7 +2175,7 @@
    if (cn_entry == NULL) {
      pr_trace_msg(trace_channel, 12,
        "unable to check certificate CommonName against '%s': "
@@ -69,7 +63,7 @@ Index: proftpd-dfsg/contrib/mod_tls.c
      return 0;
    }
  
-@@ -2159,7 +2159,7 @@
+@@ -2184,7 +2184,7 @@
    if (cn_asn1 == NULL) {
      pr_trace_msg(trace_channel, 12,
        "unable to check certificate CommonName against '%s': "
@@ -78,10 +72,8 @@ Index: proftpd-dfsg/contrib/mod_tls.c
        tls_get_errors());
      return 0;
    }
-Index: proftpd-dfsg/doc/utils/ftpwho.html
-===================================================================
---- proftpd-dfsg.orig/doc/utils/ftpwho.html	2018-01-15 21:09:11.000000000 +0100
-+++ proftpd-dfsg/doc/utils/ftpwho.html	2018-01-15 21:09:11.000000000 +0100
+--- proftpd-dfsg-1.3.6a.orig/doc/utils/ftpwho.html
++++ proftpd-dfsg-1.3.6a/doc/utils/ftpwho.html
 @@ -14,7 +14,7 @@
  
  The <B>ftpwho</B> command shows process information for all active proftpd
@@ -91,10 +83,8 @@ Index: proftpd-dfsg/doc/utils/ftpwho.html
  master proftpd <I>standalone</I> server.
  
  <H2>OPTIONS</H2>
-Index: proftpd-dfsg/utils/ftpwho.1.in
-===================================================================
---- proftpd-dfsg.orig/utils/ftpwho.1.in	2018-01-15 21:09:11.000000000 +0100
-+++ proftpd-dfsg/utils/ftpwho.1.in	2018-01-15 21:09:11.000000000 +0100
+--- proftpd-dfsg-1.3.6a.orig/utils/ftpwho.1.in
++++ proftpd-dfsg-1.3.6a/utils/ftpwho.1.in
 @@ -10,7 +10,7 @@
  The
  .BI ftpwho
@@ -104,10 +94,8 @@ Index: proftpd-dfsg/utils/ftpwho.1.in
  spawned from inetd are counted separately from those created by a
  master proftpd
  .I standalone
-Index: proftpd-dfsg/contrib/mod_ldap.c
-===================================================================
---- proftpd-dfsg.orig/contrib/mod_ldap.c	2018-01-15 21:09:11.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_ldap.c	2018-01-15 21:09:11.000000000 +0100
+--- proftpd-dfsg-1.3.6a.orig/contrib/mod_ldap.c
++++ proftpd-dfsg-1.3.6a/contrib/mod_ldap.c
 @@ -930,7 +930,7 @@
    cached_quota->nelts = 1;
  


=====================================
debian/proftpd-dev.lintian-overrides
=====================================
@@ -0,0 +1 @@
+proftpd-dev: pkg-config-multi-arch-wrong-dir
\ No newline at end of file


=====================================
debian/proftpd-substvars
=====================================
@@ -1 +1 @@
-proftpd:Depends=proftpd-abi-1.3.6 
+proftpd:Depends=proftpd-abi-1.3.6a 



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

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

More information about the Pkg-proftpd-maintainers mailing list