diff -pruN 0.93-9.2/debian/buildnotes 0.93-10/debian/buildnotes --- 0.93-9.2/debian/buildnotes 2007-06-14 12:38:13.000000000 +0000 +++ 0.93-10/debian/buildnotes 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -gcc works ok, except one compiler warning or error, but -almost all tests pass test60.ci fails. - -compiling with egcc causes mosts tests to fail - -Mon, 14 Jun 1999 21:41:55 -0700 - libc6 2.1.1 does not have constant io streams. - The file 'myintrinsics.c' failed to compile because it -uses non-constant initializers for *str[]. But the functions which use -*str[] always set the values anyway, so I just removed the -initialization in the declaration. diff -pruN 0.93-9.2/debian/changelog 0.93-10/debian/changelog --- 0.93-9.2/debian/changelog 2022-04-17 00:29:06.000000000 +0000 +++ 0.93-10/debian/changelog 2022-07-30 00:20:51.000000000 +0000 @@ -1,3 +1,40 @@ +clif (0.93-10) unstable; urgency=medium + + * QA upload. + * Set Debian QA Group as maintainer. (See #1011565) + * Migrations: + - debian/copyright to 1.0 format. + - debian/rules to new (reduced) format. Consequently: + ~ debian/clean: created to remove some files created from build + process. + ~ debian/docs: created to install files that were installed via + debian/rules. + ~ debian/examples: created to install files that were installed via + debian/rules. + ~ debian/install: created to install files that were installed via + debian/rules. + ~ debian/manpages: created to install files that were installed via + debian/rules. + ~ debian/source/options: created to ignore changes in some files. + * Ran wrap-and-sort. + * debian/buildnotes: renamed to README.source. + * debian/control: + - Added 'Rules-Requires-Root: no' to source stanza. + - Added Vcs-* fields. + - Bumped Standards-Version to 4.6.1. + - Re-organized the long description. + * debian/patches/: + - Added headers for patches 100 and 200. + - 300_add-GCC-hardening.diff: created to add GCC hardening. + - 400_fix-manpage.diff: created to remove an acute accent from manpage. + - 500_fix-spelling.diff: created to fix a spelling error in final binary. + * debian/salsa-ci.yml: added to provide CI tests for Salsa. + * debian/tests/control: created to provide a superficial CI test. + * debian/watch: added a fake site to explain about the current status of the + original upstream homepage. + + -- Joao Eriberto Mota Filho Fri, 29 Jul 2022 21:20:51 -0300 + clif (0.93-9.2) unstable; urgency=medium * Non-maintainer upload. @@ -56,7 +93,7 @@ clif (0.93-6) unstable; urgency=low * debian/control: + Build-depend on libelfg0-dev. * debian/rules: - + Explicitely configure with --x-includes=/usr/X11R6/include + + Explicitly configure with --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib. -- Sam Hocevar (Debian packages) Tue, 3 Aug 2004 21:29:34 +0200 @@ -136,7 +173,7 @@ clif (0.92-3) unstable; urgency=low + Get package name from changelog. + Abstract the various install dirs with variables. + Don't check rootness, as the failing commands will reveal a problem. - + Use a separete configure target. + + Use a separate configure target. * debian/README.debian: Removed as useless. -- Antti-Juhani Kaijanaho Sat, 7 Aug 1999 15:22:25 +0300 @@ -144,14 +181,14 @@ clif (0.92-3) unstable; urgency=low clif (0.92-2) unstable; urgency=low * Roman Hodek reports that config.cache is not removed on cleaning. - + -- John Lapeyre Wed, 16 Jun 1999 14:17:08 -0700 - + clif (0.92-1) unstable; urgency=low - * New upstream version. + * New upstream version. * Include author's manpage - + -- John Lapeyre Thu, 25 Mar 1999 17:31:53 -0700 clif (0.90.2-3.1) frozen unstable; urgency=low @@ -160,7 +197,7 @@ clif (0.90.2-3.1) frozen unstable; urgen * fix initializer not constant bugs with glibc2.1 -- Christian Meder Tue, 24 Nov 1998 14:33:50 +0100 - + clif (0.90.2-3) unstable; urgency=low * Added Slootman's patch for cpp syntax error @@ -178,7 +215,3 @@ clif (0.90.2-1) unstable; urgency=low * Initial Release. -- John Lapeyre Mon, 3 Aug 1998 20:56:11 -0700 - -Local variables: -mode: debian-changelog -End: diff -pruN 0.93-9.2/debian/clean 0.93-10/debian/clean --- 0.93-9.2/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/clean 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1,4 @@ +test +doc/guide_programmers.ps +doc/guide_users.ps +y.output diff -pruN 0.93-9.2/debian/control 0.93-10/debian/control --- 0.93-9.2/debian/control 2022-04-17 00:29:06.000000000 +0000 +++ 0.93-10/debian/control 2022-07-30 00:20:51.000000000 +0000 @@ -1,16 +1,23 @@ Source: clif Section: interpreters Priority: optional -Maintainer: Sam Hocevar -Build-Depends: debhelper-compat (= 13), libx11-dev, libxt-dev, texlive, libelf-dev -Standards-Version: 3.8.3 +Maintainer: Debian QA Group +Build-Depends: debhelper-compat (= 13), + libelf-dev, + libx11-dev, + libxt-dev, + texlive +Standards-Version: 4.6.1 +Rules-Requires-Root: no +Vcs-Browser: https://salsa.debian.org/debian/clif +Vcs-Git: https://salsa.debian.org/debian/clif.git Package: clif Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: C language interpreter - Clif, a C-like Interpreter Framework, is and open-ended system - for fast development of programs with C syntax. The program is - compiled and if syntactically correct, code is immediately - generated. The code is generated for a virtual machine. - The virtual machine is a part of the framework. + Clif, a C-like Interpreter Framework, is and open-ended system for + fast development of programs with C syntax. The program is compiled + and if syntactically correct, code is immediately generated. The code + is generated for a virtual machine. The virtual machine is a part of + the framework. diff -pruN 0.93-9.2/debian/copyright 0.93-10/debian/copyright --- 0.93-9.2/debian/copyright 2010-01-03 15:54:11.000000000 +0000 +++ 0.93-10/debian/copyright 2022-07-30 00:20:51.000000000 +0000 @@ -1,19 +1,78 @@ -This debian package was created by John Lapeyre . -It was later maintained by Antti-Juhani Kaijanaho and Adrian -Bunk . Current maintainer is Sam Hocevar . - -Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997 T. Hruz, L. Koren - 1998 L. Koren - Tomas Hruz and Ludovit Koren - Slovak Technical University - Namestie Slobody 17 - 812 31 Bratislava - Slovak Republic - emails: hruz@vm.stuba.sk, koren@vm.stuba.sk - -Source: -ftp://www.vm.stuba.sk/pub/csgrp/packages/clif/ - -This package is distributed under the terms of the GPL. On Debian -systems, the GNU General Public License, version 2 or later, is -available in the file /usr/share/common-licenses/GPL. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: clif +Source: ftp://www.vm.stuba.sk/pub/csgrp/packages/clif/ + +Files: * +Copyright: 1984-1990 Free Software Foundation, Inc. + 1992-2000 Ludovit Koren + 1992-1997 Tomas Hruz +License: GPL-2+ + +Files: ch-parser.c +Copyright: 1984-1990 Bob Corbett + 1984-1990 Richard Stallman +License: GPL-1+ + +Files: doc/clif.1 +Copyright: 1998-2000 Free Software Foundation, Inc. +License: Special + +Files: debian/* +Copyright: 1998-1999 John Lapeyre + 1998 Christian Meder + 1999-2000 Antti-Juhani Kaijanaho + 2001-2002 Adrian Bunk + 2003-2010 Sam Hocevar + 2015 Laurent Bigonville + 2022 Joao Eriberto Mota Filho +License: GPL-2+ + +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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, see +Comment: + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: GPL-1+ + 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 + the Free Software Foundation; either version 1, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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, see +Comment: + On Debian systems, the complete text of the GNU General + Public License version 1 can be found in "/usr/share/common-licenses/GPL-1". + +License: Special + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice + are preserved on all copies. + . + Permission is granted to copy and distribute modified versions of this + manual under the conditions for verbatim copying, provided that the + entire resulting derived work is distributed under the terms of a + permission notice identical to this one. + . + Permission is granted to copy and distribute translations of this + manual into another language, under the above conditions for modified + versions, except that this permission notice may be included in + translations approved by the Free Software Foundation instead of in + the original English. diff -pruN 0.93-9.2/debian/docs 0.93-10/debian/docs --- 0.93-9.2/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/docs 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1,5 @@ +README +TODO +doc/*.dvi +doc/*.ps +running_notes diff -pruN 0.93-9.2/debian/examples 0.93-10/debian/examples --- 0.93-9.2/debian/examples 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/examples 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1 @@ +example/* diff -pruN 0.93-9.2/debian/install 0.93-10/debian/install --- 0.93-9.2/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/install 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1,4 @@ +clif usr/bin +clif.ini usr/lib/clif +io.ci usr/lib/clif +small.hlp usr/lib/clif diff -pruN 0.93-9.2/debian/manpages 0.93-10/debian/manpages --- 0.93-9.2/debian/manpages 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/manpages 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1 @@ +doc/clif.1 diff -pruN 0.93-9.2/debian/patches/100_oldpatches.diff 0.93-10/debian/patches/100_oldpatches.diff --- 0.93-9.2/debian/patches/100_oldpatches.diff 2010-01-03 15:24:53.000000000 +0000 +++ 0.93-10/debian/patches/100_oldpatches.diff 2022-07-30 00:20:51.000000000 +0000 @@ -1,6 +1,11 @@ ---- clif-0.93.orig/doc/clif.1 -+++ clif-0.93/doc/clif.1 -@@ -300,11 +300,6 @@ +Description: patch to group changes from 1.0 format +Author: Sam Hocevar +Last-Update: 2010-01-03 +Index: clif/doc/clif.1 +=================================================================== +--- clif.orig/doc/clif.1 ++++ clif/doc/clif.1 +@@ -300,11 +300,6 @@ manual into another language, under the versions, except that this permission notice may be included in translations approved by the Free Software Foundation instead of in the original English. @@ -12,9 +17,11 @@ .SH AUTHORS See the Interpreter .B Clif ---- clif-0.93.orig/utils/yy.c -+++ clif-0.93/utils/yy.c -@@ -17,7 +17,7 @@ +Index: clif/utils/yy.c +=================================================================== +--- clif.orig/utils/yy.c ++++ clif/utils/yy.c +@@ -17,7 +17,7 @@ int yyleng; extern char yytext[]; int yymorfg; extern char *yysptr, yysbuf[]; int yytchar; @@ -23,7 +30,7 @@ extern int yylineno; struct yysvf { struct yywork *yystoff; -@@ -131,6 +131,8 @@ +@@ -131,6 +131,8 @@ main(argc,argv) int argc; char *argv[]; { @@ -32,9 +39,11 @@ info(argc,argv); init_incl(argc,argv); yylex(); ---- clif-0.93.orig/Makefile.in -+++ clif-0.93/Makefile.in -@@ -30,7 +30,7 @@ +Index: clif/Makefile.in +=================================================================== +--- clif.orig/Makefile.in ++++ clif/Makefile.in +@@ -30,7 +30,7 @@ ADD_IDIR = @ADD_IDIR@ YACC = @YACC@ YACCFLAGS = -dv LEX = @LEX@ @@ -43,9 +52,11 @@ INCLUDES = -I. -I$(srcdir) -I$(srcdir)/example X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ -lX11 ---- clif-0.93.orig/README -+++ clif-0.93/README -@@ -22,9 +22,9 @@ +Index: clif/README +=================================================================== +--- clif.orig/README ++++ clif/README +@@ -22,9 +22,9 @@ integration with the Clif. The biggest d parameter passing mechanism (for details see documentation). In our development we stress on user interfaces on all levels of the @@ -58,9 +69,11 @@ structures to Clif. A detailed description can be found in the directory doc. The ---- clif-0.93.orig/ch-lex.c -+++ clif-0.93/ch-lex.c -@@ -67,7 +67,7 @@ +Index: clif/ch-lex.c +=================================================================== +--- clif.orig/ch-lex.c ++++ clif/ch-lex.c +@@ -67,7 +67,7 @@ char yy_channeltext[YY_channelLMAX]; int yy_channelmorfg; extern char *yy_channelsptr, yy_channelsbuf[]; int yy_channeltchar; @@ -69,7 +82,7 @@ extern int yy_channellineno; struct yy_channelsvf { struct yy_channelwork *yy_channelstoff; -@@ -116,6 +116,7 @@ +@@ -116,6 +116,7 @@ int nstr_channel; extern int yy_channelp static int __lex_hack = 0; if (__lex_hack) goto yy_channelfussy; #endif @@ -77,7 +90,7 @@ while((nstr_channel = yy_channellook()) >= 0) yy_channelfussy: switch(nstr_channel){ case 0: -@@ -1142,6 +1143,7 @@ +@@ -1142,6 +1143,7 @@ int yy_channelinput_channel(void) yy_channelinput_channel() #endif { @@ -85,7 +98,7 @@ #ifndef __cplusplus return(input_channel()); #else -@@ -1155,6 +1157,7 @@ +@@ -1155,6 +1157,7 @@ yy_channeloutput_channel(c) int c; #endif { @@ -93,9 +106,11 @@ #ifndef __cplusplus output_channel(c); #else ---- clif-0.93.orig/comp_maint.c -+++ clif-0.93/comp_maint.c -@@ -3675,8 +3675,8 @@ +Index: clif/comp_maint.c +=================================================================== +--- clif.orig/comp_maint.c ++++ clif/comp_maint.c +@@ -3675,8 +3675,8 @@ error_message VPROTO((int err_no, ...)) if (warning_yes || warning_format) { char buf[2]; @@ -106,9 +121,11 @@ ERROR_FULL_INFO(spf[s].line_counter); fprintfx (stderr, "use of `%c' length character with `%c' type character\n", ---- clif-0.93.orig/init_rs.c -+++ clif-0.93/init_rs.c -@@ -190,8 +190,10 @@ +Index: clif/init_rs.c +=================================================================== +--- clif.orig/init_rs.c ++++ clif/init_rs.c +@@ -190,8 +190,10 @@ init_rs (argc1,argv1) } argc_rs = argc1; pfrs = fopen (name, "r"); @@ -120,8 +137,10 @@ #ifdef FLEX_SCANNER yy_rs_in = pfrs; ---- clif-0.93.orig/ls.l -+++ clif-0.93/ls.l +Index: clif/ls.l +=================================================================== +--- clif.orig/ls.l ++++ clif/ls.l @@ -31,6 +31,7 @@ #endif #include "global.h" @@ -130,7 +149,7 @@ #include "tables.h" #include "token.h" #include "dbg-out.h" -@@ -518,6 +519,16 @@ +@@ -518,6 +519,16 @@ yywrap () *yysptr++ = yytchar;} #else @@ -147,9 +166,11 @@ void switch_to_stdin () { ---- clif-0.93.orig/myintrinsic.c -+++ clif-0.93/myintrinsic.c -@@ -80,7 +80,11 @@ +Index: clif/myintrinsic.c +=================================================================== +--- clif.orig/myintrinsic.c ++++ clif/myintrinsic.c +@@ -80,7 +80,11 @@ static int do_fscanf PROTO((FILE *, char int transform_to_simple_type PROTO((enum global_type)); @@ -162,7 +183,7 @@ * 0 - stdin * 1 - stdout * 2 - stderr -@@ -274,6 +278,9 @@ +@@ -274,6 +278,9 @@ int cfprintf (a) char **a; { @@ -172,7 +193,7 @@ return do_fprintf (str[*(int *)a[0]], &a[2]); } -@@ -282,6 +289,9 @@ +@@ -282,6 +289,9 @@ int cprintf (a) char **a; { @@ -182,7 +203,7 @@ return do_fprintf (str[1], a); } -@@ -431,6 +441,9 @@ +@@ -431,6 +441,9 @@ int cfscanf (a) char **a; { @@ -192,7 +213,7 @@ return do_fscanf (str[*(int *)a[0]], &a[1]); } -@@ -439,6 +452,9 @@ +@@ -439,6 +452,9 @@ int cscanf (a) char **a; { @@ -202,7 +223,7 @@ return do_fscanf (str[0], a); } -@@ -452,6 +468,9 @@ +@@ -452,6 +468,9 @@ copen (a) { char *fn, *type; @@ -212,7 +233,7 @@ fn = (char *)a[0]; type = (char *)a[1]; -@@ -470,6 +489,9 @@ +@@ -470,6 +489,9 @@ cclose (a) { int *handle; @@ -222,7 +243,7 @@ handle = (int *)a[0]; handle_pointer--; -@@ -486,6 +508,9 @@ +@@ -486,6 +508,9 @@ cputc (a) char *c; int *handle; @@ -232,7 +253,7 @@ c = (char *)a[0]; handle = (int *)a[1]; -@@ -500,6 +525,9 @@ +@@ -500,6 +525,9 @@ cgetc (a) { int *handle; @@ -242,7 +263,7 @@ handle = (int *)a[0]; return (fgetc (str[*handle])); -@@ -510,6 +538,9 @@ +@@ -510,6 +538,9 @@ int cfflush (a) char **a; { @@ -252,9 +273,11 @@ return fflush (str[*(int *)a[0]]); } ---- clif-0.93.orig/pso.c -+++ clif-0.93/pso.c -@@ -29,6 +29,7 @@ +Index: clif/pso.c +=================================================================== +--- clif.orig/pso.c ++++ clif/pso.c +@@ -29,6 +29,7 @@ struct var_s #include "allocx.h" #include "flags.h" #include "global.h" @@ -262,8 +285,10 @@ #include "tables.h" #include "type.h" #include "struct.h" ---- clif-0.93.orig/virtual_machine.c -+++ clif-0.93/virtual_machine.c +Index: clif/virtual_machine.c +=================================================================== +--- clif.orig/virtual_machine.c ++++ clif/virtual_machine.c @@ -38,6 +38,7 @@ #include "input.h" /* Redefining of input function. */ #include "virtual_machine.h" @@ -272,8 +297,10 @@ #include "tables.h" #include "lex_t.h" #include "dbg-out.h" ---- clif-0.93.orig/c-lex.c -+++ clif-0.93/c-lex.c +Index: clif/c-lex.c +=================================================================== +--- clif.orig/c-lex.c ++++ clif/c-lex.c @@ -1,32 +1,85 @@ -/* A lexical scanner generated by flex */ @@ -504,7 +531,7 @@ struct yy_buffer_state { FILE *yy_input_file; -@@ -177,12 +213,16 @@ +@@ -177,12 +213,16 @@ struct yy_buffer_state */ int yy_at_bol; @@ -521,7 +548,7 @@ #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process -@@ -196,23 +236,33 @@ +@@ -196,23 +236,33 @@ struct yy_buffer_state * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 @@ -560,7 +587,7 @@ int yyleng; /* Points to current character in buffer. */ -@@ -225,66 +275,92 @@ +@@ -225,66 +275,92 @@ static int yy_start = 0; /* start state */ static int yy_did_buffer_switch_on_eof; @@ -686,7 +713,7 @@ { 0, 0, 0, 56, 54, 1, 2, 40, 54, 54, 54, 54, 54, 54, 54, 54, 54, 12, 12, 54, 54, -@@ -302,7 +378,7 @@ +@@ -302,7 +378,7 @@ static yyconst short int yy_accept[130] 0, 15, 6, 5, 0, 20, 0, 20, 0 } ; @@ -695,7 +722,7 @@ { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -@@ -334,7 +410,7 @@ +@@ -334,7 +410,7 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; @@ -704,7 +731,7 @@ { 0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, -@@ -343,7 +419,7 @@ +@@ -343,7 +419,7 @@ static yyconst int yy_meta[47] = 5, 5, 5, 5, 2, 2 } ; @@ -713,7 +740,7 @@ { 0, 0, 0, 257, 343, 343, 343, 229, 218, 227, 38, 42, 226, 35, 36, 34, 42, 59, 203, 40, 224, -@@ -362,7 +438,7 @@ +@@ -362,7 +438,7 @@ static yyconst short int yy_base[136] = 330, 332, 337, 67, 59 } ; @@ -722,7 +749,7 @@ { 0, 129, 1, 129, 129, 129, 129, 129, 130, 129, 129, 131, 129, 129, 129, 129, 129, 129, 17, 129, 129, -@@ -381,7 +457,7 @@ +@@ -381,7 +457,7 @@ static yyconst short int yy_def[136] = 129, 129, 129, 129, 129 } ; @@ -731,7 +758,7 @@ { 0, 4, 5, 6, 5, 7, 8, 4, 9, 10, 11, 4, 4, 12, 13, 14, 15, 16, 17, 18, 18, -@@ -427,7 +503,7 @@ +@@ -427,7 +503,7 @@ static yyconst short int yy_nxt[390] = 129, 129, 129, 129, 129, 129, 129, 129, 129 } ; @@ -740,7 +767,7 @@ { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -@@ -476,6 +552,9 @@ +@@ -476,6 +552,9 @@ static yyconst short int yy_chk[390] = static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; @@ -750,7 +777,7 @@ /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ -@@ -485,7 +564,6 @@ +@@ -485,7 +564,6 @@ static char *yy_last_accepting_cpos; #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "ls.l" @@ -758,7 +785,7 @@ #line 2 "ls.l" /* Clif - A C-like Interpreter Framework -@@ -519,6 +597,7 @@ +@@ -519,6 +597,7 @@ char *yytext; #endif #include "global.h" #include "mystdio.h" @@ -766,7 +793,7 @@ #include "tables.h" #include "token.h" #include "dbg-out.h" -@@ -553,7 +632,21 @@ +@@ -553,7 +632,21 @@ extern int dbg_symbols; #define NL '\n' /* In the following there is no the " character. */ /* The $, `, @ characters are not in ANSI C Standard. */ @@ -789,7 +816,7 @@ /* Macros after this point can all be overridden by user definitions in * section 1. -@@ -561,65 +654,30 @@ +@@ -561,65 +654,30 @@ extern int dbg_symbols; #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus @@ -864,7 +891,7 @@ #endif /* Amount of stuff to slurp up with each read. */ -@@ -628,7 +686,6 @@ +@@ -628,7 +686,6 @@ YY_MALLOC_DECL #endif /* Copy whatever the last rule matched to the standard output. */ @@ -872,7 +899,7 @@ #ifndef ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). -@@ -641,9 +698,10 @@ +@@ -641,9 +698,10 @@ YY_MALLOC_DECL */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ @@ -885,7 +912,7 @@ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ -@@ -653,9 +711,22 @@ +@@ -653,9 +711,22 @@ YY_MALLOC_DECL YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ @@ -911,7 +938,7 @@ #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - -@@ -676,12 +747,18 @@ +@@ -676,12 +747,18 @@ YY_MALLOC_DECL #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) #endif @@ -932,7 +959,7 @@ /* Code executed at the beginning of each rule, after yytext and yyleng * have been set up. -@@ -698,26 +775,28 @@ +@@ -698,26 +775,28 @@ YY_MALLOC_DECL #define YY_RULE_SETUP \ YY_USER_ACTION @@ -969,7 +996,7 @@ if ( ! yyin ) yyin = stdin; -@@ -725,34 +804,36 @@ +@@ -725,34 +804,36 @@ YY_DECL if ( ! yyout ) yyout = stdout; @@ -1015,7 +1042,7 @@ } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { -@@ -769,37 +850,36 @@ +@@ -769,37 +850,36 @@ yy_find_action: yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ @@ -1061,7 +1088,7 @@ { #ifdef FLEX_SCANNER spf[s].line_counter++; -@@ -812,7 +892,7 @@ +@@ -812,7 +892,7 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP @@ -1070,7 +1097,7 @@ { sscanf (yytext, "%ux", &yylval.myuint); char_counter += yyleng; -@@ -822,7 +902,7 @@ +@@ -822,7 +902,7 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP @@ -1079,7 +1106,7 @@ { sscanf (yytext, "%lx", &yylval.mylint); char_counter += yyleng; -@@ -832,7 +912,7 @@ +@@ -832,7 +912,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP @@ -1088,7 +1115,7 @@ { sscanf (yytext, "%lux", &yylval.myluint); char_counter += yyleng; -@@ -842,7 +922,7 @@ +@@ -842,7 +922,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP @@ -1097,7 +1124,7 @@ { sscanf (yytext, "%lx", &yylval.myluint); char_counter += yyleng; -@@ -852,7 +932,7 @@ +@@ -852,7 +932,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP @@ -1106,7 +1133,7 @@ { sscanf (yytext, "%x", &yylval.myint); char_counter += yyleng; -@@ -862,7 +942,7 @@ +@@ -862,7 +942,7 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP @@ -1115,7 +1142,7 @@ { sscanf (yytext, "%u", &yylval.myuint); char_counter += yyleng; -@@ -874,7 +954,7 @@ +@@ -874,7 +954,7 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP @@ -1124,7 +1151,7 @@ { sscanf (yytext, "%ld", &yylval.mylint); char_counter += yyleng; -@@ -886,7 +966,7 @@ +@@ -886,7 +966,7 @@ YY_RULE_SETUP YY_BREAK case 10: YY_RULE_SETUP @@ -1133,7 +1160,7 @@ { sscanf (yytext, "%lu", &yylval.myluint); char_counter += yyleng; -@@ -898,7 +978,7 @@ +@@ -898,7 +978,7 @@ YY_RULE_SETUP YY_BREAK case 11: YY_RULE_SETUP @@ -1142,7 +1169,7 @@ { sscanf (yytext, "%lu", &yylval.myluint); char_counter += yyleng; -@@ -910,7 +990,7 @@ +@@ -910,7 +990,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP @@ -1151,7 +1178,7 @@ { sscanf (yytext, "%d", &yylval.myint); char_counter += yyleng; -@@ -922,7 +1002,7 @@ +@@ -922,7 +1002,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP @@ -1160,7 +1187,7 @@ { sscanf (yytext, "%f", &yylval.myfloat); char_counter += yyleng; -@@ -934,7 +1014,7 @@ +@@ -934,7 +1014,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP @@ -1169,7 +1196,7 @@ { sscanf (yytext, "%Lf", &yylval.myldouble); char_counter += yyleng; -@@ -946,7 +1026,7 @@ +@@ -946,7 +1026,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP @@ -1178,7 +1205,7 @@ { sscanf (yytext, "%lf", &yylval.mydouble); char_counter += yyleng; -@@ -958,7 +1038,7 @@ +@@ -958,7 +1038,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP @@ -1187,7 +1214,7 @@ {char_counter += yyleng; yytext[0] = 0; strcat (line_buf, "'\\0'"); -@@ -967,8 +1047,9 @@ +@@ -967,8 +1047,9 @@ YY_RULE_SETUP } YY_BREAK case 17: @@ -1198,7 +1225,7 @@ { int i, j; char_counter += yyleng; -@@ -1057,7 +1138,7 @@ +@@ -1057,7 +1138,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP @@ -1207,7 +1234,7 @@ { int i; strcat (line_buf, yytext); -@@ -1082,8 +1163,9 @@ +@@ -1082,8 +1163,9 @@ YY_RULE_SETUP } YY_BREAK case 19: @@ -1218,7 +1245,7 @@ { #ifdef FLEX_SCANNER char *str; -@@ -1109,7 +1191,7 @@ +@@ -1109,7 +1191,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP @@ -1227,7 +1254,7 @@ {char name[20],*tmp_p; int w,ab=' '; char_counter += yyleng; -@@ -1158,8 +1240,9 @@ +@@ -1158,8 +1240,9 @@ YY_RULE_SETUP } YY_BREAK case 21: @@ -1238,7 +1265,7 @@ {int wide_string = 0; char_counter += yyleng; if (yytext[0] == 'l') -@@ -1183,122 +1266,122 @@ +@@ -1183,122 +1266,122 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP @@ -1385,7 +1412,7 @@ {char_counter += yyleng; strcat (line_buf, "#"); error_message (6032); -@@ -1307,7 +1390,7 @@ +@@ -1307,7 +1390,7 @@ YY_RULE_SETUP YY_BREAK case 46: YY_RULE_SETUP @@ -1394,7 +1421,7 @@ {char_counter += yyleng; strcat (line_buf, "["); error_message (6032); -@@ -1316,7 +1399,7 @@ +@@ -1316,7 +1399,7 @@ YY_RULE_SETUP YY_BREAK case 47: YY_RULE_SETUP @@ -1403,7 +1430,7 @@ {char_counter += yyleng; strcat (line_buf, "\\"); error_message (6032); -@@ -1325,7 +1408,7 @@ +@@ -1325,7 +1408,7 @@ YY_RULE_SETUP YY_BREAK case 48: YY_RULE_SETUP @@ -1412,7 +1439,7 @@ {char_counter += yyleng; strcat (line_buf, "]"); error_message (6032); -@@ -1334,7 +1417,7 @@ +@@ -1334,7 +1417,7 @@ YY_RULE_SETUP YY_BREAK case 49: YY_RULE_SETUP @@ -1421,7 +1448,7 @@ {char_counter += yyleng; strcat (line_buf, "^"); error_message (6032); -@@ -1343,7 +1426,7 @@ +@@ -1343,7 +1426,7 @@ YY_RULE_SETUP YY_BREAK case 50: YY_RULE_SETUP @@ -1430,7 +1457,7 @@ {char_counter += yyleng; strcat (line_buf, "{"); error_message (6032); -@@ -1352,7 +1435,7 @@ +@@ -1352,7 +1435,7 @@ YY_RULE_SETUP YY_BREAK case 51: YY_RULE_SETUP @@ -1439,7 +1466,7 @@ {char_counter += yyleng; strcat (line_buf, "|"); error_message (6032); -@@ -1361,7 +1444,7 @@ +@@ -1361,7 +1444,7 @@ YY_RULE_SETUP YY_BREAK case 52: YY_RULE_SETUP @@ -1448,7 +1475,7 @@ {char_counter += yyleng; strcat (line_buf, "}"); error_message (6032); -@@ -1370,7 +1453,7 @@ +@@ -1370,7 +1453,7 @@ YY_RULE_SETUP YY_BREAK case 53: YY_RULE_SETUP @@ -1457,7 +1484,7 @@ {char_counter += yyleng; strcat (line_buf, "~"); error_message (6032); -@@ -1379,7 +1462,7 @@ +@@ -1379,7 +1462,7 @@ YY_RULE_SETUP YY_BREAK case 54: YY_RULE_SETUP @@ -1466,7 +1493,7 @@ {char_counter += yyleng; strcat (line_buf, yytext); return (*yytext); /* * Returns rest simple characters -@@ -1387,36 +1470,36 @@ +@@ -1387,36 +1470,36 @@ YY_RULE_SETUP YY_BREAK case 55: YY_RULE_SETUP @@ -1512,7 +1539,7 @@ } /* Note that here we test for yy_c_buf_p "<=" to the position -@@ -1426,13 +1509,13 @@ +@@ -1426,13 +1509,13 @@ case YY_STATE_EOF(INITIAL): * end-of-buffer state). Contrast this with the test * in input(). */ @@ -1529,7 +1556,7 @@ /* Okay, we're now positioned to make the NUL * transition. We couldn't have -@@ -1445,30 +1528,30 @@ +@@ -1445,30 +1528,30 @@ case YY_STATE_EOF(INITIAL): yy_next_state = yy_try_NUL_trans( yy_current_state ); @@ -1566,7 +1593,7 @@ { /* Note: because we've taken care in * yy_get_next_buffer() to have set up -@@ -1479,7 +1562,7 @@ +@@ -1479,7 +1562,7 @@ case YY_STATE_EOF(INITIAL): * YY_NULL, it'll still work - another * YY_NULL will get returned. */ @@ -1575,7 +1602,7 @@ yy_act = YY_STATE_EOF(YY_START); goto do_action; -@@ -1487,30 +1570,30 @@ +@@ -1487,30 +1570,30 @@ case YY_STATE_EOF(INITIAL): else { @@ -1617,7 +1644,7 @@ goto yy_find_action; } break; -@@ -1521,8 +1604,7 @@ +@@ -1521,8 +1604,7 @@ case YY_STATE_EOF(INITIAL): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ @@ -1627,7 +1654,7 @@ /* yy_get_next_buffer - try to read in a new buffer * -@@ -1531,21 +1613,20 @@ +@@ -1531,21 +1613,20 @@ case YY_STATE_EOF(INITIAL): * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ @@ -1656,7 +1683,7 @@ { /* We matched a single character, the EOB, so * treat this as a final EOF. -@@ -1565,34 +1646,30 @@ +@@ -1565,34 +1646,30 @@ static int yy_get_next_buffer() /* Try to read more data. */ /* First move last chars to start of buffer. */ @@ -1698,7 +1725,7 @@ if ( b->yy_is_our_buffer ) { -@@ -1605,8 +1682,7 @@ +@@ -1605,8 +1682,7 @@ static int yy_get_next_buffer() b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ @@ -1708,7 +1735,7 @@ } else /* Can't grow it, we don't own it. */ -@@ -1616,35 +1692,35 @@ +@@ -1616,35 +1692,35 @@ static int yy_get_next_buffer() YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); @@ -1753,7 +1780,7 @@ YY_BUFFER_EOF_PENDING; } } -@@ -1652,32 +1728,31 @@ +@@ -1652,32 +1728,31 @@ static int yy_get_next_buffer() else ret_val = EOB_ACT_CONTINUE_SCAN; @@ -1798,7 +1825,7 @@ } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { -@@ -1689,30 +1764,23 @@ +@@ -1689,30 +1764,23 @@ static yy_state_type yy_get_previous_sta } return yy_current_state; @@ -1835,7 +1862,7 @@ } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { -@@ -1724,80 +1792,73 @@ +@@ -1724,80 +1792,73 @@ yy_state_type yy_current_state; yy_is_jam = (yy_current_state == 129); return yy_is_jam ? 0 : yy_current_state; @@ -1949,7 +1976,7 @@ { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() -@@ -1811,16 +1872,16 @@ +@@ -1811,16 +1872,16 @@ static int input() */ /* Reset buffer status. */ @@ -1970,7 +1997,7 @@ YY_NEW_FILE; #ifdef __cplusplus return yyinput(); -@@ -1830,90 +1891,92 @@ +@@ -1830,90 +1891,92 @@ static int input() } case EOB_ACT_CONTINUE_SCAN: @@ -2121,7 +2148,7 @@ if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); -@@ -1922,80 +1985,75 @@ +@@ -1922,80 +1985,75 @@ int size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ @@ -2249,7 +2276,7 @@ return; b->yy_n_chars = 0; -@@ -2012,29 +2070,121 @@ +@@ -2012,29 +2070,121 @@ YY_BUFFER_STATE b; b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; @@ -2384,7 +2411,7 @@ if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); -@@ -2048,47 +2198,43 @@ +@@ -2048,47 +2198,43 @@ yy_size_t size; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; @@ -2459,7 +2486,7 @@ if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); -@@ -2097,7 +2243,7 @@ +@@ -2097,7 +2243,7 @@ int len; buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; @@ -2468,7 +2495,7 @@ if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); -@@ -2107,148 +2253,164 @@ +@@ -2107,148 +2253,164 @@ int len; b->yy_is_our_buffer = 1; return b; @@ -2739,7 +2766,7 @@ /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter -@@ -2257,26 +2419,29 @@ +@@ -2257,26 +2419,29 @@ yy_size_t size; * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); @@ -2786,7 +2813,7 @@ struct el_mc { char *name; -@@ -2326,6 +2491,16 @@ +@@ -2326,6 +2491,16 @@ yywrap () *yysptr++ = yytchar;} #else @@ -2803,13 +2830,15 @@ void switch_to_stdin () { -@@ -2376,3 +2551,4 @@ +@@ -2376,3 +2551,4 @@ flush_buffer (state) } #endif /* ! FLEX_SCANNER */ + ---- clif-0.93.orig/test.c -+++ clif-0.93/test.c +Index: clif/test.c +=================================================================== +--- /dev/null ++++ clif/test.c @@ -0,0 +1,7 @@ +int main() +{ diff -pruN 0.93-9.2/debian/patches/200_manpage.diff 0.93-10/debian/patches/200_manpage.diff --- 0.93-9.2/debian/patches/200_manpage.diff 2010-01-03 15:58:40.000000000 +0000 +++ 0.93-10/debian/patches/200_manpage.diff 2022-07-30 00:20:51.000000000 +0000 @@ -1,7 +1,10 @@ -Index: clif-0.93/doc/clif.1 +Description: removed programming code from manpage +Author: Sam Hocevar +Last-Update: 2010-01-03 +Index: clif/doc/clif.1 =================================================================== ---- clif-0.93.orig/doc/clif.1 2010-01-03 16:58:23.000000000 +0100 -+++ clif-0.93/doc/clif.1 2010-01-03 16:58:30.000000000 +0100 +--- clif.orig/doc/clif.1 ++++ clif/doc/clif.1 @@ -1,17 +1,6 @@ .\" Copyright (c) 1998, 1999, 2000 Free Software Foundation -*-Text-*- .\" See section COPYING for conditions for redistribution diff -pruN 0.93-9.2/debian/patches/300_add-GCC-hardening.diff 0.93-10/debian/patches/300_add-GCC-hardening.diff --- 0.93-9.2/debian/patches/300_add-GCC-hardening.diff 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/patches/300_add-GCC-hardening.diff 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1,34 @@ +Description: add GCC hardening +Author: Joao Eriberto Mota Filho +Last-Update: 2022-07-31 +Index: clif/Makefile.in +=================================================================== +--- clif.orig/Makefile.in ++++ clif/Makefile.in +@@ -43,7 +43,7 @@ INSTALL = + INSTALL_PROGRAM = + INSTALL_DATA = + +-ALL_CFLAGS = $(ADD_IDIR) $(CFLAGS) $(X_CFLAGS) ++ALL_CFLAGS = $(ADD_IDIR) $(CFLAGS) $(CPPFLAGS) $(X_CFLAGS) + + SHELL = /bin/sh + +@@ -78,7 +78,7 @@ check: all + cd $(srcdir)/tests; ./check-them $$cwd + + clif: $(OBJS) +- $(CC) $(OBJS) $(LIBS) $(X_LIBS) $(X_EXTRA_LIBS) -o clif ++ $(CC) $(OBJS) $(LIBS) $(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS) -o clif + + dvi: doc/guide_users.dvi doc/guide_programmers.dvi + +@@ -320,7 +320,7 @@ lin_xdr.o: example/lin_xdr.c example/lin + + + $(srcdir)/utils/yy: $(srcdir)/utils/yy.c +- cd $(srcdir)/utils; $(CC) yy.c -o yy ++ cd $(srcdir)/utils; $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) yy.c -o yy + + + ############################################################# diff -pruN 0.93-9.2/debian/patches/400_fix-manpage.diff 0.93-10/debian/patches/400_fix-manpage.diff --- 0.93-9.2/debian/patches/400_fix-manpage.diff 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/patches/400_fix-manpage.diff 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1,16 @@ +Description: fix acute accent in the manpage +Author: Joao Eriberto Mota Filho +Last-Update: 2022-07-31 +Index: clif/doc/clif.1 +=================================================================== +--- clif.orig/doc/clif.1 ++++ clif/doc/clif.1 +@@ -235,7 +235,7 @@ Warn if the return statement is without + function, or with a value in + \|`\c + .B void\c +-\&\' ++\&' + function. + .TP + .B "\-Wtrigraphs" diff -pruN 0.93-9.2/debian/patches/500_fix-spelling.diff 0.93-10/debian/patches/500_fix-spelling.diff --- 0.93-9.2/debian/patches/500_fix-spelling.diff 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/patches/500_fix-spelling.diff 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1,16 @@ +Description: fix a spelling error in final binary +Author: Joao Eriberto Mota Filho +Last-Update: 2022-07-31 +Index: clif/comp_maint.c +=================================================================== +--- clif.orig/comp_maint.c ++++ clif/comp_maint.c +@@ -3262,7 +3262,7 @@ error_message VPROTO((int err_no, ...)) + print_source_line (); + ERROR_FULL_INFO(spf[s].line_counter); + fprintfx (stderr, +- "name of formal paramter does not match previous declaration\n"); ++ "name of formal parameter does not match previous declaration\n"); + break; + case 2006: + print_source_line (); diff -pruN 0.93-9.2/debian/patches/series 0.93-10/debian/patches/series --- 0.93-9.2/debian/patches/series 2010-01-03 15:59:11.000000000 +0000 +++ 0.93-10/debian/patches/series 2022-07-30 00:20:51.000000000 +0000 @@ -1,2 +1,5 @@ 100_oldpatches.diff 200_manpage.diff +300_add-GCC-hardening.diff +400_fix-manpage.diff +500_fix-spelling.diff diff -pruN 0.93-9.2/debian/README.source 0.93-10/debian/README.source --- 0.93-9.2/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/README.source 2022-07-30 00:20:11.000000000 +0000 @@ -0,0 +1,11 @@ +gcc works ok, except one compiler warning or error, but +almost all tests pass test60.ci fails. + +compiling with egcc causes mosts tests to fail + +Mon, 14 Jun 1999 21:41:55 -0700 + libc6 2.1.1 does not have constant io streams. + The file 'myintrinsics.c' failed to compile because it +uses non-constant initializers for *str[]. But the functions which use +*str[] always set the values anyway, so I just removed the +initialization in the declaration. diff -pruN 0.93-9.2/debian/rules 0.93-10/debian/rules --- 0.93-9.2/debian/rules 2022-04-17 00:29:06.000000000 +0000 +++ 0.93-10/debian/rules 2022-07-30 00:20:51.000000000 +0000 @@ -1,88 +1,12 @@ #!/usr/bin/make -f - #export DH_VERBOSE=1 -export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -CFLAGS += -O0 -else -CFLAGS += -O2 -endif -# FOR AUTOCONF 2.52 AND NEWER ONLY -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build $(DEB_HOST_GNU_TYPE) -else - confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -confflags += --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info +%: + dh $@ -configure: configure-stamp -configure-stamp: - dh_testdir - ./configure $(confflags) --prefix=/usr --sysconfdir=/etc - touch configure-stamp - -build: configure-stamp build-stamp -build-stamp: - dh_testdir - $(MAKE) +execute_after_dh_auto_build: cd doc && dvips -o guide_programmers.ps guide_programmers.dvi cd doc && dvips -o guide_users.ps guide_users.dvi cd doc && dvips -o cimcsp94.ps cimcsp94.dvi - touch build-stamp - -clean: - dh_testdir - dh_testroot - [ ! -f Makefile ] || $(MAKE) distclean - rm -rf doc/guide_programmers doc/guide_users *.ps - cd doc && rm -f cimcsp94.ps guide_programmers.ps guide_users.ps - rm -f build-stamp configure-stamp - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - $(MAKE) install DESTDIR=`pwd`/debian/clif - dh_installdirs usr/bin usr/lib/clif - dh_install clif usr/bin - dh_install small.hlp io.ci clif.ini usr/lib/clif - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs README TODO running_notes doc/*.ps doc/*.dvi - dh_installexamples example/* - dh_installmenu -# dh_installemacsen -# dh_installpam -# dh_installinit - dh_installcron - dh_installman doc/clif.1 - dh_installinfo - dh_installmime - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress -Xexamples - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -build-arch: build -build-indep: build -.PHONY: build clean build-arch build-indep binary-indep binary-arch binary install configure diff -pruN 0.93-9.2/debian/salsa-ci.yml 0.93-10/debian/salsa-ci.yml --- 0.93-9.2/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/salsa-ci.yml 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -pruN 0.93-9.2/debian/source/options 0.93-10/debian/source/options --- 0.93-9.2/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/source/options 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore = "^(c-parser.c|token.h|doc/cimcsp94.ps)$" diff -pruN 0.93-9.2/debian/tests/control 0.93-10/debian/tests/control --- 0.93-9.2/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/tests/control 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1,2 @@ +Test-Command: clif -v +Restrictions: allow-stderr, superficial diff -pruN 0.93-9.2/debian/watch 0.93-10/debian/watch --- 0.93-9.2/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ 0.93-10/debian/watch 2022-07-30 00:20:51.000000000 +0000 @@ -0,0 +1,3 @@ +version=4 +opts=dversionmangle=s/.*/0.No-Site/ \ +https://people.debian.org/~eriberto/ FakeWatchNoUpstreamSiteForThisPackage-(\d\S+)\.gz