FreeBSD Bugzilla – Attachment 147104 Details for
Bug 193480
Update misc/mbuffer to 2014.03.10 to prevent core dumps on 11.0-CURRENT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Update misc/mbuffer to 2014.03.10
mbuffer-2014.03.10.diff (text/plain), 3.35 KB, created by
Fabian Keil
on 2014-09-09 09:56:07 UTC
(
hide
)
Description:
Update misc/mbuffer to 2014.03.10
Filename:
MIME Type:
Creator:
Fabian Keil
Created:
2014-09-09 09:56:07 UTC
Size:
3.35 KB
patch
obsolete
>From 315985abaf80e3e9a93c2e60befd8a7f28796cc9 Mon Sep 17 00:00:00 2001 >From: Fabian Keil <fk@fabiankeil.de> >Date: Mon, 8 Sep 2014 12:06:49 +0200 >Subject: [PATCH] misc/mbuffer: Update to 2014.03.10 > >- Update the pkg-descr >- Fix version display > >Upstream changes according to the ChangeLog: > >20140310: >- added memory advise for buffer memory >- compatibility fix for Solars st driver >- prevent buffer overflow attack via defaults file >- ignore defaults file from other users >- updated documentation for use with cron >- minor bugfixes > >20140126: >- new feature: set option defaults in ~/.mbuffer.rc >- enhancement: write status to the log file >- enhancement: added option to suppress status logging >- fix: formatting fix for summary message > >One of those "minor bugfixes" prevents a reproducible core >dump on 11.0-CURRENT: > >fk@r500 ~ $mbuffer >Assertion failed: (err == 0), function main, file mbuffer.c, line 2097. >Abort trap (core dumped) >--- > misc/mbuffer/Makefile | 12 ++++++++++-- > misc/mbuffer/distinfo | 4 ++-- > misc/mbuffer/pkg-descr | 18 ++++++++++-------- > 3 files changed, 22 insertions(+), 12 deletions(-) > >diff --git misc/mbuffer/Makefile misc/mbuffer/Makefile >index ef7ae67..1ab7a21 100644 >--- misc/mbuffer/Makefile >+++ misc/mbuffer/Makefile >@@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME= mbuffer >-PORTVERSION= 2013.02.20 >-PORTREVISION= 1 >+PORTVERSION= 2014.03.10 > CATEGORIES= misc > MASTER_SITES= http://www.maier-komor.de/software/mbuffer/ > DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} >@@ -36,9 +35,18 @@ CONFIGURE_ARGS+=ac_cv_search_mhash_init=no > USE_OPENSSL= yes > .endif > >+# Prevent sendfile() from being detected by configure and rejected >+# by mbuffer.c due to being "unable to send from buffers". >+CONFIGURE_ARGS+=ac_cv_search_sendfile=no >+ > .include <bsd.port.pre.mk> > > post-patch: > @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' ${WRKSRC}/configure > >+post-configure: >+ # Rename variables to make sure they aren't redefined through mhash.h >+ @${REINPLACE_CMD} -E -e 's@(PACKAGE|VERSION)@MBUFFER_\1@' \ >+ ${WRKSRC}/config.h ${WRKSRC}/mbuffer.c >+ > .include <bsd.port.post.mk> >diff --git misc/mbuffer/distinfo misc/mbuffer/distinfo >index 863fd12..7dd6756 100644 >--- misc/mbuffer/distinfo >+++ misc/mbuffer/distinfo >@@ -1,2 +1,2 @@ >-SHA256 (mbuffer-20130220.tgz) = 1d549c3ac7e29c6064b63195141a61253095831cf5d16f419ae6cc342f12c512 >-SIZE (mbuffer-20130220.tgz) = 120519 >+SHA256 (mbuffer-20140310.tgz) = ab90b6fdce16db2bf08bcda0bc5d2bfb053a9a163d2a24f95fbf246460549b99 >+SIZE (mbuffer-20140310.tgz) = 122422 >diff --git misc/mbuffer/pkg-descr misc/mbuffer/pkg-descr >index ecdbca7..1a6f0ac 100644 >--- misc/mbuffer/pkg-descr >+++ misc/mbuffer/pkg-descr >@@ -1,12 +1,14 @@ > mbuffer is a tool for buffering data streams. It is also a replacement > for buffer with additional functionality: > >-- display of i/o speed >-- optional use of memory mapped i/o for huge buffer files >-- multithreaded instead of shared memory ipc >-- multi-volume support >-- auto-loader support >-- network support >-- buffer compatible command-line options >+- multi-target network output >+- on the fly hash calculation >+- display of I/O speed >+- optional use of memory mapped I/O for huge buffers >+- multithreaded instead of sharedmemory ipc >+- multi volume support >+- autoloader support >+- networking support >+- command-line options compatible to buffer > >-WWW: http://www.maier-komor.de/mbuffer.html >+WWW: http://www.maier-komor.de/mbuffer.html >-- >1.9.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 193480
: 147104