Commit 9f705ce8 authored by Peter Pentchev's avatar Peter Pentchev
Browse files

Update the Debian packaging for mbuffer-20200929.

parent acc7f241
mbuffer (20200929+ds2-1) UNRELEASED; urgency=medium
* New upstream release:
- do not exclude .hg_archival.txt from the repacked tarball,
the new mkversion.sh tool needs it
- refresh the patches, mostly line numbers
- add another Makefile fixup to the usr-tree autopkgtest
-- Peter Pentchev <roam@debian.org> Wed, 14 Oct 2020 10:57:35 +0300
mbuffer (20200505+ds1-1) unstable; urgency=medium
* Switch the upstream URLs to the HTTPS protocol now that the server
......
......@@ -6,24 +6,27 @@ Description: Fix the build file and directory dependencies.
has been updated after the object files within it.
Forwarded: no
Author: Peter Pentchev <roam@ringlet.net>
Last-Update: 2020-02-10
Last-Update: 2020-10-14
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,10 +50,13 @@
@@ -53,8 +53,9 @@
all: $(TARGET) idev.so tapetest.so have-af
-$(OBJECTS): build config.h Makefile
+$(OBJECTS): build/created.stamp config.h Makefile
$(OBJECTS): config.h Makefile
-build:
- mkdir build
+build/created.stamp:
+ [ -d build ] || mkdir build
+ touch build/created.stamp
+
+build/%.o: build/created.stamp
build/%.o: %.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
@@ -196,6 +197,6 @@
idev.so: idev.c config.h
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS)
-$(DEPS): | build
+$(DEPS): | build/created.stamp
include $(DEPS)
......@@ -5,12 +5,12 @@ Last-Update: 2019-10-03
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@
@@ -57,7 +57,7 @@
mkdir build
build/%.o: %.c
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
$(TARGET): $(OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
build/%.d: %.c
$(CC) -MM -MG -MT $(@:%.d=%.o) $(CFLAGS) $< -o $@
......@@ -8,9 +8,9 @@ Last-Update: 2018-03-22
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,7 @@
SOURCES = log.c network.c mbuffer.c hashing.c input.c common.c settings.c globals.c
@@ -45,7 +45,7 @@
OBJECTS = $(SOURCES:%.c=build/%.o)
DEPS = $(SOURCES:%.c=build/%.d)
-TESTTREE = /bin /usr/bin
+TESTTREE ?= /bin /usr/bin
......
......@@ -5,7 +5,7 @@ Last-Update: 2018-04-11
--- a/Makefile.in
+++ b/Makefile.in
@@ -182,7 +182,7 @@
@@ -191,10 +191,10 @@
./mbuffer -P90 --md5 -i INSTALL -o /dev/null
tapetest.so: tapetest.c config.h
......@@ -15,3 +15,6 @@ Last-Update: 2018-04-11
idev.so: idev.c config.h
- $(CC) $(CFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS)
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS)
$(DEPS): | build
......@@ -5,7 +5,7 @@ Last-Update: 2019-01-23
--- a/ChangeLog
+++ b/ChangeLog
@@ -152,7 +152,7 @@
@@ -164,7 +164,7 @@
- fix: potential infinite loop on output error
20150412:
......@@ -14,7 +14,7 @@ Last-Update: 2019-01-23
- fix: clear sa_flags and sa_mask before use, although ignored
20141227:
@@ -178,7 +178,7 @@
@@ -190,7 +190,7 @@
20130220:
- reverted incorrect fix for -P 100, which may lead to data corruption
......@@ -23,7 +23,7 @@ Last-Update: 2019-01-23
- bail out if any output fails to initialize
- refixed hang on -P 100
- reduced sending overhead
@@ -302,7 +302,7 @@
@@ -314,7 +314,7 @@
20081207:
- fixed some typos in man page
- TCP buffer tuning could be a little bit more intelligent
......@@ -32,7 +32,7 @@ Last-Update: 2019-01-23
- tuneable TCP buffer with option --tcpbuffer
20081113:
@@ -340,7 +340,7 @@
@@ -352,7 +352,7 @@
- docu update
20080910:
......@@ -41,7 +41,7 @@ Last-Update: 2019-01-23
- new LICENSE: GPLv3
- fixed a race-condition in logging
- adjusted CFLAGS for gcc
@@ -453,7 +453,7 @@
@@ -465,7 +465,7 @@
changed all floats to double
20060421:
......@@ -50,7 +50,7 @@ Last-Update: 2019-01-23
- fixed a warning
20060324:
@@ -462,7 +462,7 @@
@@ -474,7 +474,7 @@
performance as it requires a higher number of I/O ops. On systems
without full synchronous data integrity support, no difference will
be observable concerning performance. Systems that support it, will
......@@ -59,7 +59,7 @@ Last-Update: 2019-01-23
more precise with -c.
- changed errormessages to include offset
- added support for Solaris' directio hinting
@@ -544,7 +544,7 @@
@@ -556,7 +556,7 @@
20050125:
- fixed operation of low watermark (-p)
......@@ -68,7 +68,7 @@ Last-Update: 2019-01-23
- start output before input thread
- more minor fixes
@@ -674,7 +674,7 @@
@@ -686,7 +686,7 @@
- experimental feature: output to multiple volumes
20010426:
......@@ -77,7 +77,7 @@ Last-Update: 2019-01-23
(credits go to Padraig Brady <padraig@antefacto.com>)
- Bugfix: fixed incorrect display of total datatransfer for >2GB
- Cosmetic: on sighup print newline on stderr
@@ -688,7 +688,7 @@
@@ -700,7 +700,7 @@
20010124:
- Bugfix: outputThread terminated too early in certain cases
......@@ -89,7 +89,7 @@ Last-Update: 2019-01-23
- a little bit more verbose debugging info
--- a/configure.in
+++ b/configure.in
@@ -127,7 +127,7 @@
@@ -125,7 +125,7 @@
AC_SEARCH_LIBS(hstrerror,resolv socket nsl,AC_DEFINE([HAVE_HSTRERROR], [1], [Define to 1 if you have the hstrerror() function]),)
AC_SEARCH_LIBS(getaddrinfo,resolv socket nsl ,AC_DEFINE([HAVE_GETADDRINFO], [1], [Define to 1 if you have the getaddrinfo() function]) ,AC_MSG_WARN(support for systems without getaddrinfo is deprecated and will be removed in the future))
AC_SEARCH_LIBS(socket,socket,,AC_MSG_ERROR(could not find the library containing network functions!))
......@@ -131,7 +131,7 @@ Last-Update: 2019-01-23
return -1;
}
infomsg("end of volume - last block on volume: %lld\n",Numout);
@@ -1179,7 +1179,7 @@
@@ -1170,7 +1170,7 @@
/* multi volume input consistency checking */
if ((NumVolumes != 1) && (!Infile))
......@@ -164,16 +164,16 @@ Last-Update: 2019-01-23
warningmsg("unable to create socket for input: %s\n",strerror(errno));
--- a/settings.c
+++ b/settings.c
@@ -537,7 +537,7 @@
@@ -558,7 +558,7 @@
(void) fprintf(stderr,
"mbuffer version " PACKAGE_VERSION "\n"\
"mbuffer version " VERSION "\n"\
"Copyright 2001-2019 - T. Maier-Komor\n"\
- "License: GPLv3 - see file LICENSE\n"\
+ "License: GPLv3 - see the LICENSE file\n"\
"This program comes with ABSOLUTELY NO WARRANTY!!!\n"
"Donations via PayPal to thomas@maier-komor.de are welcome and support this work!\n"
"\n"
@@ -566,7 +566,7 @@
@@ -587,7 +587,7 @@
"-m <size> : memory <size> of buffer in b,k,M,G,%% (default: %llu%c)\n"
#endif
#ifdef _POSIX_MEMLOCK_RANGE
......@@ -182,7 +182,7 @@ Last-Update: 2019-01-23
#endif
"-d : use blocksize of device for output\n"
"-D <size> : assumed output device size (default: infinite/auto-detect)\n"
@@ -578,9 +578,9 @@
@@ -599,9 +599,9 @@
"--truncate : truncate next file (must be passed before -o)\n"
"-I <h>:<p> : use network port <port> as input, allow only host <h> to connect\n"
"-I <p> : use network port <port> as input\n"
......@@ -194,7 +194,7 @@ Last-Update: 2019-01-23
"-T <file> : as -t but uses <file> as buffer\n"
"-l <file> : use <file> for logging messages\n"
"-u <num> : pause <num> milliseconds after each write\n"
@@ -596,7 +596,7 @@
@@ -617,7 +617,7 @@
"-e : stop processing on any kind of error\n"
#if defined HAVE_LIBCRYPTO || defined HAVE_LIBMD5 || defined HAVE_LIBMHASH || defined HAVE_LIBDL
"-H\n"
......@@ -203,7 +203,7 @@ Last-Update: 2019-01-23
"--hash <a> : use algorithm <a>, if <a> is 'list' possible algorithms are listed\n"
#endif
"--pid : print PID of this instance\n"
@@ -660,9 +660,9 @@
@@ -683,9 +683,9 @@
return (unsigned long long) d;
default:
if (argv[c][-2] == '-')
......
......@@ -26,5 +26,6 @@ sed -e 's/check:.*test0/check: test0/;
s/test6: mbuffer/test6:/;
s/test7: mbuffer/test7:/;
s/@TAR@/tar/;
s/@SH@/sh/;' Makefile.in > Makefile
s/@SH@/sh/;
s/^include.*DEPS.*//;' Makefile.in > Makefile
make check TESTTREE=/usr
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment