From c1840c5bb555ba09c09bdeb2f29305681038317f Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 26 Apr 2021 00:17:37 +0200 Subject: [PATCH 01/16] build: Activate .DELETE_ON_ERROR. Since m4 lacks the -o option to specify an output file, we redirect stdout in several recipes, in particular in the recipe that creates lopsub.h from lopsub.h.m4. If the m4 command fails, lopsub.h will be incomplete or empty, yet it will be considered as up-to-date by make(1). This patch teaches make(1) to remove such incomplete output files on errors. --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Makefile b/Makefile index c0057a3..31c2102 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,13 @@ endif .ONESHELL: .SHELLFLAGS := -ec +# Recipes which redirect stdout to the target of the rule (i.e., constructs +# like cmd > $@) create empty or incomplete output files if the command fails, +# for example when cmd was not found. Since the target exists and is uptodate +# in this case, this may lead to all sorts of problems. The following target +# makes sure that such files are removed. +.DELETE_ON_ERROR: + PREFIX ?= /usr/local M4 := m4 LN := ln -f -- 2.39.2 From 73d2280b56e07b3115c14deaa994114a462afd33 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 26 Apr 2021 00:56:16 +0200 Subject: [PATCH 02/16] build: Improve handling of compiler options. Introduce LLS_CFLAGS and STRICT_CFLAGS to avoid duplicating the flags in the various cc recipes. We don't touch CFLAGS or CPPFLAGS in the Makefile but include it the cc commands to let the user override our settings. --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 31c2102..f7e19fb 100644 --- a/Makefile +++ b/Makefile @@ -95,13 +95,16 @@ lsg_objs := lopsubgen.o lsg.o lopsubgen.lsg.o lopsub.o version.o liblopsub_objs := config_file.o lopsub.o version.o lopsubex_objs := lopsubex.o lopsubex.lsg.o $(liblopsub_objs) +LLS_CFLAGS := -g -fPIC +STRICT_CFLAGS := -Wall + $(lsg_objs) $(liblopsub_objs) $(lopsubex_objs): %.o: %.c lopsubgen.o config_file.o: - $(CC) -g -c -fPIC -o $@ ${@:.o=.c} + $(CC) $(CPPFLAGS) $(LLS_CFLAGS) $(CFLAGS) -c -o $@ ${@:.o=.c} lsg1.o: lsg.c lsg.h - $(CC) -g -DSTAGE1 -Wall -c $< -o $@ + $(CC) $(CPPFLAGS) $(LLS_CFLAGS) $(STRICT_CFLAGS) $(CFLAGS) -DSTAGE1 -c -o $@ $< %.o: %.c - $(CC) -Wall -I. -g -c -fPIC -o $@ $< + $(CC) -I. $(CPPFLAGS) $(LLS_CFLAGS) $(STRICT_CFLAGS) $(CFLAGS) -c -o $@ $< # linking lopsubgen-stage1: $(lsg1_objs) -- 2.39.2 From 45901057b4103eeb745e080521678c0e43e0eca1 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 26 Apr 2021 00:57:12 +0200 Subject: [PATCH 03/16] build: Error out on implicit function declarations. Replacing lopsub.h by an empty file builds a buggy lopsubgen-stage1 executable which segfaults due to a format string mismatch caused by the implicit declaration of lls_version(). In this package all functions are supposed to be declared, so let's fail the build if any undeclared functions are found. Tested-by: Alex Gietz --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f7e19fb..548c96f 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,7 @@ lopsubex_objs := lopsubex.o lopsubex.lsg.o $(liblopsub_objs) LLS_CFLAGS := -g -fPIC STRICT_CFLAGS := -Wall +STRICT_CFLAGS += -Werror-implicit-function-declaration $(lsg_objs) $(liblopsub_objs) $(lopsubex_objs): %.o: %.c lopsubgen.o config_file.o: -- 2.39.2 From 0a3588cdf56966a58decbbf62793dcc90217651c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 27 Jun 2023 23:04:56 +0200 Subject: [PATCH 04/16] Makefile: Add -ffile-prefix-map to CC to avoid embedding build paths. Signed-off-by: Andre Noll --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 548c96f..97d135a 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,8 @@ INSTALL := install GZIP := gzip -fn9 ZCAT := zcat +CC += -ffile-prefix-map=$(CURDIR)=. + dummy != $(M4) /dev/null || printf 'failed' ifeq ($(dummy), failed) $(error m4 is required to build this package) -- 2.39.2 From f2c158bdb336bb5cf8f3bdc57e7155c441200330 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 13 Feb 2022 20:29:17 +0100 Subject: [PATCH 05/16] Fix documentation of [introduction] and [conclusion]. These texts should *not* contain roff source code. --- lopsub-suite.5.m4 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lopsub-suite.5.m4 b/lopsub-suite.5.m4 index 0244c38..cd607a5 100644 --- a/lopsub-suite.5.m4 +++ b/lopsub-suite.5.m4 @@ -144,9 +144,7 @@ way with and .BR [/conclusion] . Both texts will become part of the manual page, but are not not part -of the short or long help. Like for the -.B section -directive, arbitrary roff source may be included here. +of the short or long help. .TP .B aux_info_prefix This text is shown at the bottom of each command before the value of the -- 2.39.2 From a927190dc47ea0048a482030dccd2981b6310530 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 13 Feb 2022 20:29:52 +0100 Subject: [PATCH 06/16] Improve error message of lls_check_arg_count(). When min_argc == max_argc, the function checks whether exactly this many arguments are given. In the error case, it says exactly N non-option args allowed, M given which reads a bit weird. With the patch applied the message becomes exactly N non-option args required, M given --- lopsub.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lopsub.c b/lopsub.c index a9e401f..cbf6661 100644 --- a/lopsub.c +++ b/lopsub.c @@ -736,10 +736,11 @@ int lls_check_arg_count(const struct lls_parse_result *lpr, xasprintf(errctx, "no non-option args allowed, " "%u given", lpr->num_inputs); else - xasprintf(errctx, "%s %u non-option args allowed, " - "%u given", min_argc < max_argc? - "at most" : "exactly", - max_argc, lpr->num_inputs); + xasprintf(errctx, "%s %u non-option args %s, %u given", + min_argc < max_argc? "at most" : "exactly", + max_argc, + min_argc < max_argc? "allowed" : "required", + lpr->num_inputs); return -E_LLS_BAD_ARG_COUNT; } return 1; -- 2.39.2 From 6a4c0e8fe5ba1b8060132b12d549e82dbd3411e2 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 13 Feb 2022 20:46:20 +0100 Subject: [PATCH 07/16] lls_parse_arg(): Avoid NULL pointer dereference. If a string option with multiple=false is given twice at the command line, the second and all subsequent calls to lls_parse_arg() discard the previous value stored in lor->value[0]. However, if the option takes an optional argument and was first specified without argument, lor->value remains NULL because the first call to lls_parse_arg() returned early due to the shortcut at the beginning of the function while the second call skips the allocation because lor->given is increased also when no argument is given, so it equals one during the second call. Thus, the attempt to free lor->value[0] further down in the function results in a NULL pointer dereference. Fix this by checking lor->value rather then lor->given. To make this work we have to move up the code which frees the old string value. While at it, reduce memory usage by not over-sizing the array. We now only allocate space for idx + 1 values rather than lor->given + 1. This is different in the case mentioned above. --- lopsub.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lopsub.c b/lopsub.c index cbf6661..b5017c3 100644 --- a/lopsub.c +++ b/lopsub.c @@ -632,17 +632,23 @@ static int lls_parse_arg(struct lls_arg *la, const struct lls_option *opts, bool multiple; int idx, ret; - if (!la->arg) - goto success; - if (opt->arg_info == LLS_NO_ARGUMENT) { + if (la->arg && opt->arg_info == LLS_NO_ARGUMENT) { xasprintf(errctx, "arg: %s, option: %s", la->arg, opt->name); return -E_LLS_ARG_GIVEN; } multiple = opt->flags & LLS_MULTIPLE; + if (opt->arg_type == LLS_STRING && !opt->values && !multiple) { + if (lor->value) { /* discard previous value */ + free(lor->value[0].string_val); + free(lor->value); + lor->value = NULL; + } + } + if (!la->arg) + goto success; idx = multiple? lor->given : 0; - if (lor->given == 0 || multiple) { - ret = xrealloc(&lor->value, - (lor->given + 1) * sizeof(*lor->value)); + if (!lor->value || multiple) { + ret = xrealloc(&lor->value, (idx + 1) * sizeof(*lor->value)); if (ret < 0) { xasprintf(errctx, "option value array for --%s", opt->name); @@ -651,8 +657,6 @@ static int lls_parse_arg(struct lls_arg *la, const struct lls_option *opts, } switch (opt->arg_type) { case LLS_STRING: - if (!opt->values && lor->given > 0 && !multiple) - free(lor->value[idx].string_val); if (opt->values) { ret = check_enum_arg(la->arg, opt, errctx); if (ret < 0) -- 2.39.2 From 9a547f189f01a8ff6b1a0f01f5588d53b940dedb Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 28 Jun 2023 16:45:43 +0200 Subject: [PATCH 08/16] lopsub-1.0.4 --- NEWS | 7 +++++++ debian/changelog | 9 +++++++++ debian/copyright | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 13a7ed2..8508f44 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +Noteworthy changes in lopsub-1.0.4 (2023-07-02) +=============================================== +* make the build reproducible (Chris Lamb, Vagrant Cascadian) +* improvements to the build system +* documentation fixes +* avoid NULL pointer dereference in argument parsing + Noteworthy changes in lopsub-1.0.3 (2019-05-19) =============================================== * build a shared library instead of a static one diff --git a/debian/changelog b/debian/changelog index e9ea703..08cd28f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +liblopsub (1.0.4-1) unstable; urgency=low + + * Make the build reproducible (Chris Lamb, Vagrant Cascadian). Closes: + #1039617, #1039618 + * Avoid crash due to a NULL pointer dereference in certain cases + * Minor cleanups and fixes, see NEWS for details. + + -- Andre Noll Sun, 02 Jul 2023 14:12:13 +0200 + liblopsub (1.0.3-2) unstable; urgency=low * Make the output of lopsubgen reproducible. diff --git a/debian/copyright b/debian/copyright index 95fcd00..ee4fb2b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Copyright 2016 Andre Noll +Copyright 2016-2023 Andre Noll This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 3 -- 2.39.2 From 94ee4f0831ad0c3de5eabd821a8bd42c86571a30 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 31 Oct 2023 21:55:53 +0100 Subject: [PATCH 09/16] Makefile: Include Makefile.local if it exists. This provides a way to support local recipes. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 97d135a..ac9656e 100644 --- a/Makefile +++ b/Makefile @@ -151,4 +151,4 @@ clean: distclean: clean $(RM) *.lsg.c *.lsg.h lopsubgen.c config_file.c lopsubgen-stage1 \ lopsub.h lopsub.7 lopsub-suite.5 version.c - +-include Makefile.local -- 2.39.2 From 7cc5bb8c56295d91f2bd45c10d483dedebe79c97 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 31 Oct 2023 20:52:06 +0100 Subject: [PATCH 10/16] Don't print invalid line numbers in error messages. If yylex() fails, yyget_lineno() should not be called because it accesses uninitialized memory: ==23686== Use of uninitialised value of size 4 ==23686== at 0x46FA85D: _itoa_word (_itoa.c:178) ==23686== by 0x4704E14: __printf_buffer (vfprintf-process-arg.c:155) ==23686== by 0x471B91C: __vsprintf_internal (iovsprintf.c:62) ==23686== by 0x47010DD: sprintf (sprintf.c:30) ==23686== by 0x45A019F: lls_convert_config (config_file.l:272) ==23686== by 0x804F0BA: parse_options (misma.c:741) ==23686== by 0x804A879: main (misma.c:1529) Just omit printing the line number for now. --- config_file.l | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config_file.l b/config_file.l index f603b8e..58aab83 100644 --- a/config_file.l +++ b/config_file.l @@ -268,8 +268,7 @@ int lls_convert_config(const char *buf, size_t nbytes, const char *subcmd, if (errctx) { *errctx = malloc(100); if (*errctx) - sprintf(*errctx, "error at line %d", - yyget_lineno(yyscanner)); + sprintf(*errctx, "yylex error"); } } yy_delete_buffer(yybs, yyscanner); -- 2.39.2 From b1d260c20c7df69bea7b9882928f8329e786db77 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 31 Oct 2023 21:08:45 +0100 Subject: [PATCH 11/16] Fix typo in config file test program. This code is #ifdef'ed out, so the typo was never noticed. Add a comment which explains how to create a binary from the .l file while at it. --- config_file.l | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config_file.l b/config_file.l index 58aab83..37cb0ac 100644 --- a/config_file.l +++ b/config_file.l @@ -285,6 +285,7 @@ free_argv: } #if 0 +/* flex -o t.c config_file.l && cc -o tcf t.c */ int main(void) { char buf[100 * 1024]; @@ -300,7 +301,7 @@ int main(void) exit(EXIT_FAILURE); argc = ret; for (i = 0; i < argc; i++) - printf("argv[%d]: %s\n", i, rargv[i]); + printf("argv[%d]: %s\n", i, argv[i]); return EXIT_SUCCESS; } #endif -- 2.39.2 From 3a365ff8b88a29a5774f19a50e0aa8a9d713517f Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 31 Oct 2023 21:30:16 +0100 Subject: [PATCH 12/16] Fix flag option parsing bug in config file parser. The old code misparses the config file if it contains a flag option which is followed by a newline which starts with whitespace. In this case, since newlines belong to the [[:space:]] class, the option is regarded as an option with argumment. Fix this by s/:space:/:blank:/. The [[:blank:]] class only contains space and tab. which is what the code expects. --- config_file.l | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config_file.l b/config_file.l index 37cb0ac..66c1b76 100644 --- a/config_file.l +++ b/config_file.l @@ -21,7 +21,7 @@ %s SC_SCANNING IDENTIFIER [a-zA-Z]+[a-zA-Z0-9_-]* -EQUALS [[:space:]]*=[[:space:]]* +EQUALS [[:blank:]]*=[[:blank:]]* OPTION [a-zA-Z]+[a-zA-Z0-9_-]* %{ @@ -47,10 +47,10 @@ OPTION [a-zA-Z]+[a-zA-Z0-9_-]* %% /* skip comments and whitespace */ -^[[:space:]]*#.*\n ; -[[:space:]]|\n+ ; +^[[:blank:]]*#.*\n ; +[[:blank:]]|\n+ ; -\[[[:space:]]*{IDENTIFIER}[[:space:]]*\][[:space:]]*\n { +\[[[:blank:]]*{IDENTIFIER}[[:blank:]]*\][[:blank:]]*\n { int i, j; const char *subcmd = yyget_extra(yyscanner)->subcmd; @@ -71,9 +71,9 @@ OPTION [a-zA-Z]+[a-zA-Z0-9_-]* BEGIN(SC_SCANNING); } -{OPTION}[[:space:]]*\n add_option(yyscanner); +{OPTION}[[:blank:]]*\n add_option(yyscanner); -{OPTION}({EQUALS}|[[:space:]]+) { +{OPTION}({EQUALS}|[[:blank:]]+) { int ret = add_option(yyscanner); if (ret < 0) -- 2.39.2 From b4d4de17a5c87427c5c06a9926e9e39c96f42102 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 1 Feb 2024 12:47:49 +0100 Subject: [PATCH 13/16] debian: 64-bit time_t transition. As part of the 64-bit time_t transition required to support 32-bit architectures in 2038 and beyond (https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified liblopsub as a source package shipping runtime libraries whose ABI either is affected by the change in size of time_t, or could not be analyzed via abi-compliance-checker (and therefore to be on the safe side we assume is affected). To ensure that inconsistent combinations of libraries with their reverse-dependencies are never installed together, it is necessary to have a library transition, which is most easily done by renaming the runtime library package. Since turning on 64-bit time_t is being handled centrally through a change to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is important that libraries affected by this ABI change all be uploaded close together in time. Therefore I have prepared a 0-day NMU for liblopsub which will initially be uploaded to experimental if possible, then to unstable after packages have cleared binary NEW. Signed-off-by: Andre Noll --- debian/changelog | 7 +++++++ debian/control | 7 +++++-- debian/{liblopsub1.install => liblopsub1t64.install} | 0 debian/liblopsub1t64.lintian-overrides | 1 + debian/rules | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) rename debian/{liblopsub1.install => liblopsub1t64.install} (100%) create mode 100644 debian/liblopsub1t64.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 08cd28f..44bbaeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +liblopsub (1.0.4-1.1) experimental; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. + + -- Steve Langasek Thu, 01 Feb 2024 09:30:36 +0000 + liblopsub (1.0.4-1) unstable; urgency=low * Make the build reproducible (Chris Lamb, Vagrant Cascadian). Closes: diff --git a/debian/control b/debian/control index 004a71d..fe135b9 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,10 @@ Homepage: http://people.tuebingen.mpg.de/maan/lopsub Vcs-Browser: http://git.tuebingen.mpg.de/lopsub.git Vcs-Git: git://git.tuebingen.mpg.de/lopsub.git -Package: liblopsub1 +Package: liblopsub1t64 +Provides: ${t64:Provides} +Replaces: liblopsub1 +Breaks: liblopsub1 (<< ${source:Version}) Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Long Option Parser for Subcommands @@ -25,7 +28,7 @@ Homepage: http://people.tuebingen.mpg.de/maan/lopsub Package: liblopsub-dev Architecture: any -Depends: ${shlibs:Depends}, liblopsub1 (= ${binary:Version}), ${misc:Depends} +Depends: ${shlibs:Depends}, liblopsub1t64 (= ${binary:Version}), ${misc:Depends} Description: Long Option Parser for Subcommand - headers Lopsub is an open source library written in C which aims to ease the task of creating, documenting and parsing the options of Unix diff --git a/debian/liblopsub1.install b/debian/liblopsub1t64.install similarity index 100% rename from debian/liblopsub1.install rename to debian/liblopsub1t64.install diff --git a/debian/liblopsub1t64.lintian-overrides b/debian/liblopsub1t64.lintian-overrides new file mode 100644 index 0000000..bac78b9 --- /dev/null +++ b/debian/liblopsub1t64.lintian-overrides @@ -0,0 +1 @@ +liblopsub1t64: package-name-doesnt-match-sonames liblopsub1 diff --git a/debian/rules b/debian/rules index 3e73eac..3b5e4f1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ # invoked with the package root as the current directory. sourcepackage := liblopsub -package := liblopsub1 +package := liblopsub1t64 devpackage := liblopsub-dev define checkdir -- 2.39.2 From 92e558a3df52b9a1dcfdf1a018c5268081d52b47 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 30 Oct 2023 17:55:24 +0100 Subject: [PATCH 14/16] Add target to create a static library. It's sometimes handy to create a static version of the library, although this is generally frowned upon. No standard target depends on the new liblopsub.a target, so the static library is not build by default. One has to explicitly run "make liblopsub.a" to build it. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index ac9656e..89cbc2e 100644 --- a/Makefile +++ b/Makefile @@ -116,6 +116,9 @@ lopsubgen: $(lsg_objs) $(CC) -Wall -g -o $@ $(lsg_objs) $(REALNAME): $(liblopsub_objs) $(CC) --shared -Wl,-soname,liblopsub.so.$(MAJOR_VERSION) -o $@ $^ +liblopsub.a: $(liblopsub_objs) + $(AR) -rcs $@ $^ + lopsubex: $(lopsubex_objs) $(REALNAME) $(CC) -Wall -g -o $@ $(lopsubex_objs) -- 2.39.2 From b156a0cabd42582e9c430ae4a284f8815746914e Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sun, 3 Mar 2024 16:47:53 +0100 Subject: [PATCH 15/16] debian: Final version of 64-bit time_t transition. This partially reverts reverts commit b4d4de17a5c8, replacing it with the version that has been uploaded to unstable. It adds a versioned build-dependency on dpkg-dev to guard against accidental backports with a wrong ABI. Signed-off-by: Andre Noll --- debian/changelog | 6 +++--- debian/control | 2 +- debian/liblopsub1t64.install | 2 -- debian/liblopsub1t64.lintian-overrides | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 debian/liblopsub1t64.install delete mode 100644 debian/liblopsub1t64.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 44bbaeb..53995e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -liblopsub (1.0.4-1.1) experimental; urgency=medium +liblopsub (1.0.4-1.1) unstable; urgency=medium * Non-maintainer upload. - * Rename libraries for 64-bit time_t transition. + * Rename libraries for 64-bit time_t transition. Closes: #1062407 - -- Steve Langasek Thu, 01 Feb 2024 09:30:36 +0000 + -- Steve Langasek Fri, 01 Mar 2024 05:37:06 +0000 liblopsub (1.0.4-1) unstable; urgency=low diff --git a/debian/control b/debian/control index fe135b9..f488fe2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: liblopsub Section: libdevel Priority: optional Maintainer: Andre Noll -Build-Depends: m4, flex, debhelper (>= 10.0) +Build-Depends: dpkg-dev (>= 1.22.5), m4, flex, debhelper (>= 10.0) Standards-Version: 4.3.0 Homepage: http://people.tuebingen.mpg.de/maan/lopsub Vcs-Browser: http://git.tuebingen.mpg.de/lopsub.git diff --git a/debian/liblopsub1t64.install b/debian/liblopsub1t64.install deleted file mode 100644 index 6234859..0000000 --- a/debian/liblopsub1t64.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/man/man7/* -debian/tmp/usr/lib/*/liblopsub.so.* diff --git a/debian/liblopsub1t64.lintian-overrides b/debian/liblopsub1t64.lintian-overrides deleted file mode 100644 index bac78b9..0000000 --- a/debian/liblopsub1t64.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -liblopsub1t64: package-name-doesnt-match-sonames liblopsub1 -- 2.39.2 From 021b2093bdd3150ed07428ab0b6b27564993560f Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 29 Apr 2024 02:26:26 +0200 Subject: [PATCH 16/16] lopsubgen.suite: Fix homepage link. There is no tilde in the URL. This affects the lopbsupgen man page. --- lopsubgen.suite | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lopsubgen.suite b/lopsubgen.suite index d8166ab..f65bb99 100644 --- a/lopsubgen.suite +++ b/lopsubgen.suite @@ -113,6 +113,6 @@ lopsub-suite(5), lopsub(7) Homepage: - .UR http://people.tuebingen.mpg.de/~maan/lopsub + .UR http://people.tuebingen.mpg.de/maan/lopsub .UE [/section] -- 2.39.2