Control: tags -1 patch
I am uploading a NMU with the attached changes.
diff -Nru gridengine-8.1.9+dfsg/debian/changelog gridengine-8.1.9+dfsg/debian/changelog --- gridengine-8.1.9+dfsg/debian/changelog 2025-04-11 10:13:45.000000000 +0200 +++ gridengine-8.1.9+dfsg/debian/changelog 2026-02-10 12:42:39.000000000 +0100 @@ -1,3 +1,14 @@ +gridengine (8.1.9+dfsg-13.2) unstable; urgency=medium + + * Non-maintainer upload + * Drop retired Uploader: Mark Hymers (Closes: #1107173) + * Add Build-Depends: libcrypt-dev (Closes: #1106932) + * Verbosely list BSD license (Closes: #1121298) + * Fix several build failures with gcc-15 (Closes: #1114138) + * Inlude termios.h instead of deprecated termio.h + + -- Bastian Germann <[email protected]> Tue, 10 Feb 2026 12:42:39 +0100 + gridengine (8.1.9+dfsg-13.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru gridengine-8.1.9+dfsg/debian/control gridengine-8.1.9+dfsg/debian/control --- gridengine-8.1.9+dfsg/debian/control 2025-04-07 12:06:28.000000000 +0200 +++ gridengine-8.1.9+dfsg/debian/control 2026-02-10 12:42:39.000000000 +0100 @@ -3,13 +3,13 @@ Priority: optional Maintainer: Debian HPC Team <[email protected]> Uploaders: Dave Love <[email protected]>, - Afif Elghraoui <[email protected]>, + Afif Elghraoui <[email protected]>, Laszlo Kajan <[email protected]>, - Mark Hymers <[email protected]>, Michael Banck <[email protected]> Build-Depends: debhelper (>= 12.8), tcsh | c-shell, + libcrypt-dev, libdb-dev, libssl-dev, libtirpc-dev, @@ -30,6 +30,7 @@ libxft-dev, libmunge-dev, Standards-Version: 4.6.0.1 +Rules-Requires-Root: binary-targets Homepage: https://arc.liv.ac.uk/trac/SGE/ Vcs-Git: https://salsa.debian.org/hpc-team/gridengine Vcs-Browser: https://salsa.debian.org/hpc-team/gridengine diff -Nru gridengine-8.1.9+dfsg/debian/patches/callback-declaration.patch gridengine-8.1.9+dfsg/debian/patches/callback-declaration.patch --- gridengine-8.1.9+dfsg/debian/patches/callback-declaration.patch 1970-01-01 01:00:00.000000000 +0100 +++ gridengine-8.1.9+dfsg/debian/patches/callback-declaration.patch 2026-02-10 12:42:39.000000000 +0100 @@ -0,0 +1,12 @@ +--- gridengine-8.1.9+dfsg.orig/source/3rdparty/qmon/Xmt310/Xmt/NameToWidget.c ++++ gridengine-8.1.9+dfsg/source/3rdparty/qmon/Xmt310/Xmt/NameToWidget.c +@@ -186,7 +186,8 @@ static Widget NameListToWidget(register + static Widget NameListToWidget(); + #endif + +-typedef Widget (*NameMatchProc)(); ++typedef Widget (*NameMatchProc)(XrmNameList, XrmBindingList, int, WidgetList, ++ int, int, int *, int *); + + #if NeedFunctionPrototypes + static Widget MatchExactChildren(XrmNameList names, XrmBindingList bindings, diff -Nru gridengine-8.1.9+dfsg/debian/patches/getenv.patch gridengine-8.1.9+dfsg/debian/patches/getenv.patch --- gridengine-8.1.9+dfsg/debian/patches/getenv.patch 1970-01-01 01:00:00.000000000 +0100 +++ gridengine-8.1.9+dfsg/debian/patches/getenv.patch 2026-02-10 12:42:39.000000000 +0100 @@ -0,0 +1,22 @@ +--- gridengine-8.1.9+dfsg.orig/source/3rdparty/qmake/job.c ++++ gridengine-8.1.9+dfsg/source/3rdparty/qmake/job.c +@@ -2170,7 +2170,7 @@ exec_command (char **argv, char **envp) + case ENOEXEC: + { + /* The file is not executable. Try it as a shell script. */ +- extern char *getenv (); ++ extern char *getenv (const char *); + char *shell; + char **new_argv; + int argc; +--- gridengine-8.1.9+dfsg.orig/source/3rdparty/qmake/read.c ++++ gridengine-8.1.9+dfsg/source/3rdparty/qmake/read.c +@@ -2760,7 +2760,7 @@ tilde_expand (const char *name) + #ifndef VMS + if (name[1] == '/' || name[1] == '\0') + { +- extern char *getenv (); ++ extern char *getenv (const char *); + char *home_dir; + int is_variable; + diff -Nru gridengine-8.1.9+dfsg/debian/patches/missing-include.patch gridengine-8.1.9+dfsg/debian/patches/missing-include.patch --- gridengine-8.1.9+dfsg/debian/patches/missing-include.patch 1970-01-01 01:00:00.000000000 +0100 +++ gridengine-8.1.9+dfsg/debian/patches/missing-include.patch 2026-02-10 12:42:39.000000000 +0100 @@ -0,0 +1,11 @@ +--- gridengine-8.1.9+dfsg.orig/source/common/sge_ijs_comm.h ++++ gridengine-8.1.9+dfsg/source/common/sge_ijs_comm.h +@@ -37,6 +37,8 @@ + #include "comm/cl_commlib.h" + #include "comm/cl_connection_list.h" + ++#include <sys/ioctl.h> ++ + #define BUFSIZE 64*1024 + #define COMM_HANDLE cl_com_handle_t + diff -Nru gridengine-8.1.9+dfsg/debian/patches/pwd.patch gridengine-8.1.9+dfsg/debian/patches/pwd.patch --- gridengine-8.1.9+dfsg/debian/patches/pwd.patch 1970-01-01 01:00:00.000000000 +0100 +++ gridengine-8.1.9+dfsg/debian/patches/pwd.patch 2026-02-10 12:42:39.000000000 +0100 @@ -0,0 +1,26 @@ +From: Bastian Germann <[email protected]> +Subject: Drop superfluous declarations for pwd.h functions + +Bug-Debian: https://bugs.debian.org/1114138 +--- +--- gridengine-8.1.9+dfsg.orig/source/3rdparty/qmon/Xmt310/Xmt/FindFile.c ++++ gridengine-8.1.9+dfsg/source/3rdparty/qmon/Xmt310/Xmt/FindFile.c +@@ -37,7 +37,6 @@ + #endif + + #ifndef SYSV386 +-extern struct passwd *getpwuid(), *getpwnam(); + #endif + + #ifndef X_NOT_STDC_ENV +--- gridengine-8.1.9+dfsg.orig/source/3rdparty/qmake/make.h ++++ gridengine-8.1.9+dfsg/source/3rdparty/qmake/make.h +@@ -477,7 +477,7 @@ long int lseek (); + + #ifdef HAVE_GETCWD + # if !defined(VMS) && !defined(__DECC) +-char *getcwd (); ++# include <pwd.h> + # endif + #else + char *getwd (); diff -Nru gridengine-8.1.9+dfsg/debian/patches/series gridengine-8.1.9+dfsg/debian/patches/series --- gridengine-8.1.9+dfsg/debian/patches/series 2025-03-06 16:00:48.000000000 +0100 +++ gridengine-8.1.9+dfsg/debian/patches/series 2026-02-10 12:42:39.000000000 +0100 @@ -13,3 +13,8 @@ riscv64.patch fix-gcc14-ftbfs.patch support-loong64 +pwd.patch +termios.patch +missing-include.patch +callback-declaration.patch +getenv.patch diff -Nru gridengine-8.1.9+dfsg/debian/patches/termios.patch gridengine-8.1.9+dfsg/debian/patches/termios.patch --- gridengine-8.1.9+dfsg/debian/patches/termios.patch 1970-01-01 01:00:00.000000000 +0100 +++ gridengine-8.1.9+dfsg/debian/patches/termios.patch 2026-02-10 12:42:39.000000000 +0100 @@ -0,0 +1,91 @@ +From: Bastian Germann <[email protected]> +Subject: Include termios.h on unknown systems +--- +--- gridengine-8.1.9+dfsg.orig/source/libs/uti/sge_pty.c ++++ gridengine-8.1.9+dfsg/source/libs/uti/sge_pty.c +@@ -58,7 +58,7 @@ + # include <sys/ioctl.h> + # include <termios.h> + #else +-# include <termio.h> ++# include <termios.h> + #endif + + #include "uti/sge_rmon.h" +--- gridengine-8.1.9+dfsg.orig/source/libs/gdi/sge_gdi_ctx.c ++++ gridengine-8.1.9+dfsg/source/libs/gdi/sge_gdi_ctx.c +@@ -61,7 +61,7 @@ + #elif defined(FREEBSD) || defined(NETBSD) + # include <termios.h> + #else +-# include <termio.h> ++# include <termios.h> + #endif + + #include "comm/commlib.h" +--- gridengine-8.1.9+dfsg.orig/source/3rdparty/qtcsh/sh.h ++++ gridengine-8.1.9+dfsg/source/3rdparty/qtcsh/sh.h +@@ -280,7 +280,7 @@ static inline void ignore(intptr_t a) + # ifndef _UWIN + # include <termios.h> + # else +-# include <termio.h> ++# include <termios.h> + # endif /* _UWIN */ + # if SYSVREL > 3 + # undef TIOCGLTC /* we don't need those, since POSIX has them */ +--- gridengine-8.1.9+dfsg.orig/source/clients/common/sge_client_ijs.c ++++ gridengine-8.1.9+dfsg/source/clients/common/sge_client_ijs.c +@@ -50,7 +50,7 @@ + # include <termios.h> + # include <sys/ioctl.h> + #else +-# include <termio.h> ++# include <termios.h> + #endif + + #include <sys/timeb.h> +--- gridengine-8.1.9+dfsg.orig/source/clients/qsh/qsh.c ++++ gridengine-8.1.9+dfsg/source/clients/qsh/qsh.c +@@ -102,7 +102,7 @@ + #elif defined(FREEBSD) || defined(NETBSD) + # include <termios.h> + #else +-# include <termio.h> ++# include <termios.h> + #endif + + #include "uti/sge_pty.h" +--- gridengine-8.1.9+dfsg.orig/source/daemons/shepherd/sge_shepherd_ijs.c ++++ gridengine-8.1.9+dfsg/source/daemons/shepherd/sge_shepherd_ijs.c +@@ -59,7 +59,7 @@ + # include <sys/ioctl.h> + # include <termios.h> + #else +-# include <termio.h> ++# include <termios.h> + #endif + + #include "uti/sge_stdlib.h" +--- gridengine-8.1.9+dfsg.orig/source/daemons/shepherd/shepherd.c ++++ gridengine-8.1.9+dfsg/source/daemons/shepherd/shepherd.c +@@ -100,7 +100,7 @@ + #elif defined(FREEBSD) || defined(NETBSD) + # include <termios.h> + #else +-# include <termio.h> ++# include <termios.h> + #endif + + #include "sge_ijs_comm.h" +--- gridengine-8.1.9+dfsg.orig/source/libs/ijs/sge_ijs_lib.c ++++ gridengine-8.1.9+dfsg/source/libs/ijs/sge_ijs_lib.c +@@ -16,7 +16,7 @@ + #elif defined(FREEBSD) || defined(NETBSD) + # include <termios.h> + #else +-# include <termio.h> ++# include <termios.h> + #endif + + #include "uti/sge_rmon.h" diff -Nru gridengine-8.1.9+dfsg/debian/rules gridengine-8.1.9+dfsg/debian/rules --- gridengine-8.1.9+dfsg/debian/rules 2025-04-11 10:13:39.000000000 +0200 +++ gridengine-8.1.9+dfsg/debian/rules 2026-02-10 12:42:39.000000000 +0100 @@ -22,6 +22,7 @@ include /usr/share/dpkg/default.mk +CFLAGS += -fpermissive export SGE_INPUT_CFLAGS = $(CPPFLAGS) $(CFLAGS) export SGE_INPUT_LDFLAGS = $(LDFLAGS) diff -Nru gridengine-8.1.9+dfsg/debian/scripts/init_cluster gridengine-8.1.9+dfsg/debian/scripts/init_cluster --- gridengine-8.1.9+dfsg/debian/scripts/init_cluster 2023-08-13 17:40:33.000000000 +0200 +++ gridengine-8.1.9+dfsg/debian/scripts/init_cluster 2026-02-10 12:42:39.000000000 +0100 @@ -4,8 +4,31 @@ # Mainly used from gridengine-master postinst # # Copyright (C) 2008 Mark Hymers <[email protected]> -# Licensed under the BSD license as found in /usr/share/common-licenses/BSD +# All rights reserved. # +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, 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. set -e
