X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 6289DDC0E90 for ; Sun, 21 Feb 2016 18:35:03 +0000 (UTC) Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 2AFD7DC07A4 for ; Sun, 21 Feb 2016 18:35:02 +0000 (UTC) Received: from mfilter30-d.gandi.net (mfilter30-d.gandi.net [217.70.178.161]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id A377941C08B; Sun, 21 Feb 2016 19:35:01 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter30-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter30-d.gandi.net (mfilter30-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id LKm_kHNCiehz; Sun, 21 Feb 2016 19:35:00 +0100 (CET) X-Originating-IP: 82.236.42.167 Received: from localhost.localdomain (bip.im [82.236.42.167]) (Authenticated sender: marc.vertes@ugrid.net) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 716E041C087; Sun, 21 Feb 2016 19:34:59 +0100 (CET) From: Marc Vertes To: alpine-aports@lists.alpinelinux.org Cc: Kaarle Ritvanen Subject: [alpine-aports] [PATCH 1/3] main/zoneminder: fix zm_logger patch Date: Sun, 21 Feb 2016 18:34:38 +0000 Message-Id: <1456079680-6896-1-git-send-email-marc.vertes@ugrid.net> X-Mailer: git-send-email 2.7.1 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: From: Kaarle Ritvanen --- main/zoneminder/APKBUILD | 8 ++++---- main/zoneminder/musl-fix.patch | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/main/zoneminder/APKBUILD b/main/zoneminder/APKBUILD index 84a29a7..44ab6ca 100644 --- a/main/zoneminder/APKBUILD +++ b/main/zoneminder/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kaarle Ritvanen pkgname=zoneminder pkgver=1.29.0 -pkgrel=5 +pkgrel=6 pkgdesc="Video camera surveillance system" url="http://www.zoneminder.com/" arch="x86_64" @@ -88,19 +88,19 @@ package() { md5sums="b4de8dd3fd86fc72e929e116e926d901 zoneminder-1.29.0.tar.gz ab1fe4fb2392b82acf18ca8412fb927f zoneminder.initd -b95482fefbf22e8a89fb061805d05f03 musl-fix.patch +8b56092baa50847b6b6146693aad0df4 musl-fix.patch c7b793be7b48685197acfb5b79470f2c 0001-security-hardening-make-static-files-non-writable-by.patch 1429766dc44764dc77c735f4320b5a44 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch 24359849eef7c5293f63136e704fdca4 zm-additional.sql" sha256sums="34e1f0d4b616e320e557f8e3fbe278d3ab70f30f6278cc153b44f2193c85ddbd zoneminder-1.29.0.tar.gz 887174a6d1489bdcfbadf760758b14ef4e184dfcae728e15cb0e697e61e1c42f zoneminder.initd -829551a83e62ff84fcba7a0f88105a0b6d15d89a66e1e98dc50098c30c48672f musl-fix.patch +0b6589e096bd2e2f3fa4518309cf6b549c792883aae7014bb978dbc34cce10e6 musl-fix.patch 7090caf93886b01032a8c4e5585f37e6a3e7ac59cdfdfddfd8150c03dacfd93f 0001-security-hardening-make-static-files-non-writable-by.patch a830478a806e36d41016d3c2663d892fafa65b580d3bccccc131fe114c842834 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch dea3a1b493bc7d7dbe9c431f565b9e916fb8a8bd29fcd74947b14592ef7f4494 zm-additional.sql" sha512sums="71a397df83c92de3b977832bb0a11791a3a756e7219e0cf3dc6c5c30fa0dd488ea00a925433669bf4e79873df980a852f2c805d1b7c9c8a06b6c39b9a16a2fda zoneminder-1.29.0.tar.gz fa993a86c21697467c8f63ce584531f8e2c3da977b65e6557161b4b91807b1c78b14fb64f6f54c50fddcb51b54bae6dff45776f5a69bfcc635a5c2927a292b57 zoneminder.initd -b2c4e31fd0a31f034be3029eab4f2943e07e95e64bb2d8eb38d93b790059d694a9a007e98b0f9b4c47ecfe91296bc21a3795b8a4aaf5b2a83071251456e533da musl-fix.patch +8b49745f787d8a98f093569d44786950658d2adb32bb5d0c6c245c1da6019dc4520d2e05a6610cbea79451d2fb2e3ee054ed221e94d6829bf6278d21a3c11fde musl-fix.patch a7e58312c804f58ac41ee569fefffa99e65beba29f07eff36fb3cf2aa4fd68e1fc903feb73ab0c1fc6c58442251076042b537ab21156b956d7854a86bde14307 0001-security-hardening-make-static-files-non-writable-by.patch 8a35bfc782792ca559d6cf78e3e17f0caa45e19981cea12090b4f0ececa98bd9a121d2918e06e991ae5c06ab876ffddc94cd4f9db640f510314a3d09a6d90b4c 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch 0bb99af417441e2c12cb3b8c00ecb8d76bdc343d39092a222841ae0bd684eeba1783a8bccf5630dae56f64992f8a09ec16e0cbc7069665e1ee3b62dd3f96c3a9 zm-additional.sql" diff --git a/main/zoneminder/musl-fix.patch b/main/zoneminder/musl-fix.patch index fd48cd5..90b0f38 100644 --- a/main/zoneminder/musl-fix.patch +++ b/main/zoneminder/musl-fix.patch @@ -21,14 +21,22 @@ bool Logger::smInitialised = false; Logger *Logger::smInstance = 0; -@@ -504,7 +504,9 @@ +@@ -504,7 +504,8 @@ va_list argPtr; struct timeval timeVal; - const char * const file = basename(filepath); -+ char *s = strdup(filepath); -+ const char * const file = basename(s); -+ free(s); ++ char *path = strdup(filepath); ++ const char *file = basename(path); if ( level < PANIC || level > DEBUG9 ) Panic( "Invalid logger level %d", level ); +@@ -617,6 +618,8 @@ + //priority |= LOG_DAEMON; + syslog( priority, "%s [%s]", classString, syslogStart ); + } ++ ++ free(path); + + if ( level <= FATAL ) + { -- 2.7.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---