[Git][debian-proftpd-team/proftpd-mod-tar][master] 2 commits: Add patches from upstream to fix build using GCC 15.
Hilmar Preuße (@hilmar)
gitlab at salsa.debian.org
Thu Mar 6 22:57:39 GMT 2025
Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd-mod-tar
Commits:
c2a665c5 by Hilmar Preuße at 2025-03-06T23:48:24+01:00
Add patches from upstream to fix build using GCC 15.
- - - - -
86411933 by Hilmar Preuße at 2025-03-06T23:56:28+01:00
Finalize for upload.
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/real_0.4_1.patch
- + debian/patches/real_0.4_2.patch
- + debian/patches/real_0.4_3.patch
- + debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,14 @@
-proftpd-mod-tar (0.4-3) UNRELEASED; urgency=medium
+proftpd-mod-tar (0.4-3) unstable; urgency=medium
+ [ Hilmar Preuße ]
+ * Add patches from upstream to fix build using GCC 15 (Closes: #1097659).
+ * Bump Standards version, no changes needed.
+
+ [ Debian Janitor ]
* Remove constraints unnecessary since buster:
+ Build-Depends: Drop versioned constraint on proftpd-dev.
- -- Debian Janitor <janitor at jelmer.uk> Sat, 23 Jul 2022 04:59:41 -0000
+ -- Hilmar Preuße <hille42 at debian.org> Thu, 06 Mar 2025 23:54:22 +0100
proftpd-mod-tar (0.4-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 13),
zlib1g-dev,
libarchive-dev
Rules-Requires-Root: no
-Standards-Version: 4.5.1
+Standards-Version: 4.7.2
Homepage: http://www.castaglia.org/proftpd/modules/mod_tar.html
Vcs-Browser: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-tar
Vcs-Git: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-tar.git
=====================================
debian/copyright
=====================================
@@ -26,5 +26,6 @@ License: GPL-2+
Files: debian/*
Copyright: 2011, Fabrizio Regalli <fabreg at fabreg.it>
+ 2016-2025 Hilmar Preuße
License: GPL-2+
=====================================
debian/patches/real_0.4_1.patch
=====================================
@@ -0,0 +1,21 @@
+diff --git a/mod_tar.c b/mod_tar.c
+index ba6ce5f..4774755 100644
+--- a/mod_tar.c
++++ b/mod_tar.c
+@@ -1,6 +1,6 @@
+ /*
+ * ProFTPD - mod_tar
+- * Copyright (c) 2009-2017 TJ Saunders
++ * Copyright (c) 2009-2021 TJ Saunders
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -987,7 +987,7 @@ MODRET tar_pre_retr(cmd_rec *cmd) {
+ }
+
+ MODRET tar_log_retr(cmd_rec *cmd) {
+- char *path;
++ const char *path;
+
+ if (tar_engine == FALSE) {
+ return PR_DECLINED(cmd);
=====================================
debian/patches/real_0.4_2.patch
=====================================
@@ -0,0 +1,22 @@
+diff --git a/mod_tar.c b/mod_tar.c
+index 4774755..3b7108b 100644
+--- a/mod_tar.c
++++ b/mod_tar.c
+@@ -1,6 +1,6 @@
+ /*
+ * ProFTPD - mod_tar
+- * Copyright (c) 2009-2021 TJ Saunders
++ * Copyright (c) 2009-2022 TJ Saunders
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -1082,8 +1082,7 @@ static int tar_sess_init(void) {
+ }
+
+ static int tar_init(void) {
+- pr_log_debug(DEBUG0, MOD_TAR_VERSION ": using libarchive %s",
+- archive_version_string());
++ pr_log_debug(DEBUG0, MOD_TAR_VERSION ": using %s", archive_version_string());
+ return 0;
+ }
+
=====================================
debian/patches/real_0.4_3.patch
=====================================
@@ -0,0 +1,61 @@
+diff --git a/mod_tar.c b/mod_tar.c
+index 2a17275..80e569f 100644
+--- a/mod_tar.c
++++ b/mod_tar.c
+@@ -1,6 +1,6 @@
+ /*
+ * ProFTPD - mod_tar
+- * Copyright (c) 2009-2022 TJ Saunders
++ * Copyright (c) 2009-2025 TJ Saunders
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -671,38 +671,40 @@ static char *tar_get_flags(char *path, size_t path_len, unsigned long *flags) {
+
+ /* usage: TarEnable on|off */
+ MODRET set_tarenable(cmd_rec *cmd) {
+- int bool = -1;
++ int enabled = -1;
+ config_rec *c;
+
+ CHECK_ARGS(cmd, 1);
+ CHECK_CONF(cmd, CONF_DIR|CONF_DYNDIR);
+
+- bool = get_boolean(cmd, 1);
+- if (bool == -1)
++ enabled = get_boolean(cmd, 1);
++ if (enabled == -1) {
+ CONF_ERROR(cmd, "expected Boolean parameter");
++ }
+
+ c = add_config_param(cmd->argv[0], 1, NULL);
+ c->argv[0] = palloc(c->pool, sizeof(int));
+- *((int *) c->argv[0]) = bool;
++ *((int *) c->argv[0]) = enabled;
+
+ return PR_HANDLED(cmd);
+ }
+
+ /* usage: TarEngine on|off */
+ MODRET set_tarengine(cmd_rec *cmd) {
+- int bool = -1;
++ int engine = -1;
+ config_rec *c;
+
+ CHECK_ARGS(cmd, 1);
+ CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL|CONF_ANON);
+
+- bool = get_boolean(cmd, 1);
+- if (bool == -1)
++ engine = get_boolean(cmd, 1);
++ if (engine == -1) {
+ CONF_ERROR(cmd, "expected Boolean parameter");
++ }
+
+ c = add_config_param(cmd->argv[0], 1, NULL);
+ c->argv[0] = palloc(c->pool, sizeof(int));
+- *((int *) c->argv[0]) = bool;
++ *((int *) c->argv[0]) = engine;
+
+ c->flags |= CF_MERGEDOWN;
+ return PR_HANDLED(cmd);
=====================================
debian/patches/series
=====================================
@@ -0,0 +1,3 @@
+real_0.4_1.patch
+real_0.4_2.patch
+real_0.4_3.patch
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-tar/-/compare/1f34e59d68d818b06841fce0bbaafba462e655b6...86411933dc854dbee3db361a9c8e698a16517962
--
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-tar/-/compare/1f34e59d68d818b06841fce0bbaafba462e655b6...86411933dc854dbee3db361a9c8e698a16517962
You're receiving this email because of your account on salsa.debian.org.
More information about the Pkg-proftpd-maintainers
mailing list