Attachment 18594 Details for Bug 15820 – Patch for v4-22-test, v4-21-test and maybe v4-20-test

[patch] Patch for v4-22-test, v4-21-test and maybe v4-20-test

BZ15820.patch (text/plain), 3.87 KB, created by Martin Schwenke on 2025-03-05 04:14:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Schwenke

Created: 2025-03-05 04:14:34 UTC

Size: 3.87 KB

patch

obsolete

>From 8568b51ebeebfc14c89b324cae09da2da601319a Mon Sep 17 00:00:00 2001
>From: Martin Schwenke <mschwenke@ddn.com>
>Date: Wed, 5 Mar 2025 09:16:20 +1100
>Subject: [PATCH] ctdb-utils: Fix incorrect FSF address
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15820
>
>Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>
>Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
>Autobuild-Date(master): Wed Mar  5 03:40:15 UTC 2025 on atb-devel-224
>
>(cherry picked from commit 9675d8aed8e3368f0a797490f3bf85d8026e5acc)
>---
> ctdb/utils/pmda/Install     | 3 +--
> ctdb/utils/pmda/Remove      | 3 +--
> ctdb/utils/pmda/domain.h    | 3 +--
> ctdb/utils/pmda/help        | 3 +--
> ctdb/utils/pmda/pmda_ctdb.c | 3 +--
> ctdb/utils/pmda/pmns        | 3 +--
> 6 files changed, 6 insertions(+), 12 deletions(-)
>
>diff --git a/ctdb/utils/pmda/Install b/ctdb/utils/pmda/Install
>index a56a63506a8..bd12b7486cf 100644
>--- a/ctdb/utils/pmda/Install
>+++ b/ctdb/utils/pmda/Install
>@@ -13,8 +13,7 @@
> # for more details.
> #
> # You should have received a copy of the GNU General Public License along
>-# with this program; if not, write to the Free Software Foundation, Inc.,
>-# 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
>+# with this program; if not, see <https://www.gnu.org/licenses/>.
> #
> # Install the ctdb PMDA and/or PMNS
> #
>diff --git a/ctdb/utils/pmda/Remove b/ctdb/utils/pmda/Remove
>index 7d1c509e50e..8bf0fe76e15 100644
>--- a/ctdb/utils/pmda/Remove
>+++ b/ctdb/utils/pmda/Remove
>@@ -13,8 +13,7 @@
> # for more details.
> #
> # You should have received a copy of the GNU General Public License along
>-# with this program; if not, write to the Free Software Foundation, Inc.,
>-# 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
>+# with this program; if not, see <https://www.gnu.org/licenses/>.
> #
> # Remove the ctdb PMDA
> #
>diff --git a/ctdb/utils/pmda/domain.h b/ctdb/utils/pmda/domain.h
>index 0bed7fef599..b00d32d90dc 100644
>--- a/ctdb/utils/pmda/domain.h
>+++ b/ctdb/utils/pmda/domain.h
>@@ -13,7 +13,6 @@
>  * GNU General Public License for more details.
>  *
>  * You should have received a copy of the GNU General Public License
>- * along with this program; if not, write to the Free Software
>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
>  */
> #define CTDB 110
>diff --git a/ctdb/utils/pmda/help b/ctdb/utils/pmda/help
>index 0e9984eab3a..26b5385b0da 100644
>--- a/ctdb/utils/pmda/help
>+++ b/ctdb/utils/pmda/help
>@@ -12,8 +12,7 @@
> # for more details.
> #
> # You should have received a copy of the GNU General Public License along
>-# with this program; if not, write to the Free Software Foundation, Inc.,
>-# 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
>+# with this program; if not, see <https://www.gnu.org/licenses/>.
> #
> # ctdb PMDA help file in the ASCII format
> #
>diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c
>index 4f7933de9c5..7ac8a3b38d1 100644
>--- a/ctdb/utils/pmda/pmda_ctdb.c
>+++ b/ctdb/utils/pmda/pmda_ctdb.c
>@@ -15,8 +15,7 @@
>  * for more details.
>  *
>  * You should have received a copy of the GNU General Public License along
>- * with this program; if not, write to the Free Software Foundation, Inc.,
>- * 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
>+ * with this program; if not, see <https://www.gnu.org/licenses/>.
>  */
> 
> #include "replace.h"
>diff --git a/ctdb/utils/pmda/pmns b/ctdb/utils/pmda/pmns
>index dc7e3ac2bfa..c9f6644d52f 100644
>--- a/ctdb/utils/pmda/pmns
>+++ b/ctdb/utils/pmda/pmns
>@@ -15,8 +15,7 @@
>  * for more details.
>  *
>  * You should have received a copy of the GNU General Public License along
>- * with this program; if not, write to the Free Software Foundation, Inc.,
>- * 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
>+ * with this program; if not, see <https://www.gnu.org/licenses/>.
>  */
> 
> ctdb {
>-- 
>2.47.2
>

Flags:

asn: review+

Actions: View

Attachments on bug 15820: 18594