zoneminder: Address pkglint issues (minor edit)

Add comments to patches and adjust existing comments. Use ${TRUE} in Makefile.
2019-06-19 08:50:31 -04:00 · 2019-06-19 08:50:31 -04:00 · 05c09936ed
parent d9cf73c13b
commit 05c09936ed
15 changed files with 48 additions and 24 deletions
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@ -249,8 +249,8 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/zm ${DESTDIR}${PREFIX}/share/examples/rc.d/zoneminder
 .endif
 	${INSTALL_DATA} ${WRKSRC}/db/*.sql ${DESTDIR}${PREFIX}/share/zoneminder/db/
-	rmdir ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/events || true
-	rmdir ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/images || true
+	rmdir ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/events || ${TRUE}
+	rmdir ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/images || ${TRUE}
 	${LN} -s ${ZM_CACHE}/temp ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/temp
 	${LN} -s ${ZM_CACHE}/events ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/events
 	${LN} -s ${ZM_CACHE}/images ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/images
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@ -5,26 +5,26 @@ RMD160 (ZoneMinder-1.29.0.tar.gz) = d744a68552651489cc17f369c11baa3cc45621ff
 SHA512 (ZoneMinder-1.29.0.tar.gz) = 4716e0788db29880eeafc817fe63662d07c3b805214b4d2eb29b346dd3493b0215c9e79370e3414220c812065eefbe253548a70d8128c253aa4535f66f9544df
 Size (ZoneMinder-1.29.0.tar.gz) = 9302624 bytes
 SHA1 (patch-Makefile_am) = d3b66d8d741b739e2e6b354cef29881d8bcde31c
-SHA1 (patch-configure_ac) = aa258339263476b672b7683d8a6f0f378f8f7d6b
+SHA1 (patch-configure_ac) = 689230f4d7526ab3d47142b111102b9bc4ff409c
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 841d897662958698a4dfcb95dd5bc43bb5fed568
 SHA1 (patch-scripts_zm_in) = a05727261bb8be6b707e9a14ae4ff52ea3770d51
 SHA1 (patch-src_Makefile_am) = 0f6571c9d5a3e688544f93d687d266e1b71f0f43
-SHA1 (patch-src_zm__event.cpp) = 3e114b280c3a19e0520c24f148fb1b2e2400e709
-SHA1 (patch-src_zm__monitor.cpp) = 7139b1d0ea094afd99e96d30092f78c362c7b993
-SHA1 (patch-src_zm__rtp__source.cpp) = 5341938eefe5def49dc8f3e3b760d86cabd17772
+SHA1 (patch-src_zm__event.cpp) = 83d0d3f5de5d3a7b1ea81917bd9c5264c8129637
+SHA1 (patch-src_zm__monitor.cpp) = 4a0f2bd9a180092e3aa7ba8c0626e0907d45ab32
+SHA1 (patch-src_zm__rtp__source.cpp) = 50d2621b474de5defb94b019ba2084f67a5b2665
 SHA1 (patch-src_zm__sdp.cpp) = ed89bc14ae557281bb43baca9c90b78d801d8eb1
-SHA1 (patch-src_zm__thread.h) = e537fa7e359a7b63dc557b12675ee7c6b8aa7f15
-SHA1 (patch-src_zm__timer.h) = 12048c839da9ba497b54d93100cc8ca7d537391e
-SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760
-SHA1 (patch-src_zm__utils.h) = dbda8ba527f08b0337f6d2afa155ce4adc733e1e
+SHA1 (patch-src_zm__thread.h) = a2af2ae87ba07cd51695c73082f8da319ff5f9a7
+SHA1 (patch-src_zm__timer.h) = 218dfae75b8c9a7b0c5542a2437b350743d11e5f
+SHA1 (patch-src_zm__utils.cpp) = f0e15990b7f801303259af8c9b86731b74327fe6
+SHA1 (patch-src_zm__utils.h) = 4ffb7eafa8602076766fd4ae00be797866a229d9
 SHA1 (patch-src_zm_comms_cpp) = bd3c3e6dd4d11ea0845d2da662e99169cd6e6680
 SHA1 (patch-src_zm_comms_h) = 75ceba7e2c725c02a09cb2203a94142b1a987bce
-SHA1 (patch-src_zm_logger_cpp) = 67f2db12ecbdcfd4d90b6e8a2b9bcb6dab159044
+SHA1 (patch-src_zm_logger_cpp) = f8f11cd1a969435d727186b816aec612d74e55db
 SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d
 SHA1 (patch-src_zm_signal_cpp) = 0e53c30d408cf926d9a1f05a683e10cd8b9f2d8e
-SHA1 (patch-src_zm_thread_cpp) = 885fd7205815ec024a8ff5b2212404d4d0ef6b6b
+SHA1 (patch-src_zm_thread_cpp) = f6e603bbf505fc0ed6f3a8150613687c5dab0df0
 SHA1 (patch-src_zmc_cpp) = 9fee2df53603a26a086fc2d8a56b29e4059f3ed1
-SHA1 (patch-src_zmf.cpp) = a059b9ae068037c6f68c16dab861ed830dd1c7e2
-SHA1 (patch-src_zmu.cpp) = 9495fed676d67e5ba687e37564974f220d2ea4e7
-SHA1 (patch-web_Makefile.am) = ddb3815fa1b1799658034789302c8d3840f2b894
+SHA1 (patch-src_zmf.cpp) = a69ef31d3b9fa31081e32fd4db15e12627c75bc5
+SHA1 (patch-src_zmu.cpp) = 3c3bd2b82a19d50c91f8b6ad311caf9a195af120
+SHA1 (patch-web_Makefile.am) = e1568a9960590f8b2deb74c7068d1a2b91169a47
 SHA1 (patch-web_ajax_stream_php) = e8f811e63bedec03345b74db72c3d8014b3cc7f6
--- a/zoneminder/patches/patch-configure_ac
+++ b/zoneminder/patches/patch-configure_ac
@ -1,10 +1,6 @@
 $NetBSD: patch-configure_ac,v 1.4 2015/04/07 12:54:36 dsainty Exp $

-Recognise lower-case "netbsd" as BSD.
-
-Correct shell test = syntax.
-
-Allow Pkgsrc to manage dlopen() support.
+Remediate == (bashism) in configure.ac

 --- configure.ac.orig	2016-02-03 18:40:30.000000000 +0000
 +++ configure.ac
--- a/zoneminder/patches/patch-src_zm__event.cpp
+++ b/zoneminder/patches/patch-src_zm__event.cpp
@ -1,6 +1,6 @@
 $NetBSD: patch-src_zm__event.cpp,v 1.2 2018/07/14 15:03:57 gdt Exp $

-zoneminder uses %ld for time_t, which is troublesome on NetBSD mrm and
+zoneminder uses %ld for time_t, which is troublesome on NetBSD arm and
 presumably i386.  (Note that there are multiple patch files for the
 same issue.)

@ -8,6 +8,8 @@ Not yet sent upstream -- needs update to latest release first, where
 it might be fixed, or the patch might simply need to be rebased.
 Also, this fix is expedient and probably a better fix is appropriate.

+Avoid sendfile code when sendfile doesn't exist.
+
 --- src/zm_event.cpp.orig	2016-02-03 18:40:30.000000000 +0000
 +++ src/zm_event.cpp
@@ -36,11 +36,13 @@
--- a/zoneminder/patches/patch-src_zm__monitor.cpp
+++ b/zoneminder/patches/patch-src_zm__monitor.cpp
@ -1,5 +1,9 @@
 $NetBSD: patch-src_zm__monitor.cpp,v 1.1 2017/02/15 00:54:25 joerg Exp $

+\todo Explain mem_ptr change.
+
+Avoid type error (suseconds_t is not long).  To be addressed upstream once caught up.
+
 --- src/zm_monitor.cpp.orig	2016-02-03 18:40:30.000000000 +0000
 +++ src/zm_monitor.cpp
@@ -160,7 +160,7 @@ bool Monitor::MonitorLink::connect()
@ -25,7 +29,7 @@ $NetBSD: patch-src_zm__monitor.cpp,v 1.1 2017/02/15 00:54:25 joerg Exp $
                         break;
                     case 'f' :
 -                        d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%02ld", ts_time->tv_usec/10000 );
-+		      d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%02ld", (long) ts_time->tv_usec/10000 );
+		         d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%02ld", (long) ts_time->tv_usec/10000 );
                         found_macro = true;
                         break;
                 }
--- a/zoneminder/patches/patch-src_zmrtpsource.cpp
+++ b/zoneminder/patches/patch-src_zmrtpsource.cpp
@ -1,5 +1,7 @@
 $NetBSD: patch-src_zm__rtp__source.cpp,v 1.2 2018/07/14 15:03:57 gdt Exp $

+Fix type issue with tv_sec; see earlier patches.
+
 --- src/zm_rtp_source.cpp.orig	2015-02-05 02:52:37.000000000 +0000
 +++ src/zm_rtp_source.cpp
@@ -197,7 +197,7 @@ void RtpSource::updateRtcpData( uint32_t
@ -17,7 +19,7 @@ $NetBSD: patch-src_zm__rtp__source.cpp,v 1.2 2018/07/14 15:03:57 gdt Exp $
     {
 -        Debug( 5, "lastSrNtpTime: %ld.%06ld, rtpTime: %x", mLastSrTimeNtp.tv_sec, mLastSrTimeNtp.tv_usec, rtpTime );
 -        Debug( 5, "ntpTime: %ld.%06ld, rtpTime: %x", ntpTime.tv_sec, ntpTime.tv_usec, rtpTime );
-+      Debug( 5, "lastSrNtpTime: %jd.%06ld, rtpTime: %x", (intmax_t) mLastSrTimeNtp.tv_sec, mLastSrTimeNtp.tv_usec, rtpTime );
+        Debug( 5, "lastSrNtpTime: %jd.%06ld, rtpTime: %x", (intmax_t) mLastSrTimeNtp.tv_sec, mLastSrTimeNtp.tv_usec, rtpTime );
 +        Debug( 5, "ntpTime: %jd.%06ld, rtpTime: %x", (intmax_t) ntpTime.tv_sec, ntpTime.tv_usec, rtpTime );
 
         double diffNtpTime = tvDiffSec( mBaseTimeNtp, ntpTime );
--- a/zoneminder/patches/patch-src_zm__thread.h
+++ b/zoneminder/patches/patch-src_zm__thread.h
@ -6,6 +6,8 @@ pthread_t is opaque, and under NetBSD is a pointer.  It's being abused here,
 but the value is only used for logging, and casting pthread_self() is more
 portable than syscall(SYS_gettid).

+\todo Fix correctly upstream.
+
 --- src/zm_thread.h.orig	2016-02-03 18:40:30.000000000 +0000
 +++ src/zm_thread.h
@@ -22,20 +22,21 @@
--- a/zoneminder/patches/patch-src_zm__timer.h
+++ b/zoneminder/patches/patch-src_zm__timer.h
@ -22,7 +22,7 @@ portable than syscall(SYS_gettid).
 #endif
     public:
 -        TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)pid() ) )
-+    TimerException( const std::string &message ) : Exception( stringtf( ("(%d) "+message).c_str(), (intmax_t)pid() ) )
+        TimerException( const std::string &message ) : Exception( stringtf( ("(%d) "+message).c_str(), (intmax_t)pid() ) )
         {
         }
     };
--- a/zoneminder/patches/patch-src_zm__utils.cpp
+++ b/zoneminder/patches/patch-src_zm__utils.cpp
@ -1,5 +1,7 @@
 $NetBSD: patch-src_zm__utils.cpp,v 1.1 2013/03/24 16:47:47 joerg Exp $

+\todo Explain
+
 --- src/zm_utils.cpp.orig	2011-06-21 09:19:11.000000000 +0000
 +++ src/zm_utils.cpp
@@ -38,21 +38,6 @@ const std::string stringtf( const char *
--- a/zoneminder/patches/patch-src_zm__utils.h
+++ b/zoneminder/patches/patch-src_zm__utils.h
@ -1,5 +1,7 @@
 $NetBSD: patch-src_zm__utils.h,v 1.2 2015/04/05 08:51:08 dsainty Exp $

+\todo Explain
+
 --- src/zm_utils.h.orig	2015-04-01 17:20:39.840273017 +1300
 +++ src/zm_utils.h	2015-04-01 17:28:57.376293647 +1300
@@ -33,7 +33,6 @@
--- a/zoneminder/patches/patch-src_zm_logger_cpp
+++ b/zoneminder/patches/patch-src_zm_logger_cpp
@ -1,8 +1,14 @@
 $NetBSD: patch-src_zm_logger_cpp,v 1.5 2018/07/14 15:03:57 gdt Exp $

+Use libgen.h for basename.
+
+Kludge around const for basename.
+
 If the system has syscall() but not SYS_gettid [E.g. NetBSD], don't attempt
 to use SYS_gettid.

+Fix time types (sizes).
+
 --- src/zm_logger.cpp.orig	2016-02-03 18:40:30.000000000 +0000
 +++ src/zm_logger.cpp
@@ -33,9 +33,11 @@
--- a/zoneminder/patches/patch-src_zm_thread_cpp
+++ b/zoneminder/patches/patch-src_zm_thread_cpp
@ -3,6 +3,8 @@ $NetBSD: patch-src_zm_thread_cpp,v 1.2 2013/03/24 16:47:47 joerg Exp $
 pthread_mutex_timedlock() is not available on NetBSD 5.0, and not required
 in ZoneMinder.

+Work around varying notion of an undefined mpid on pthread/not.
+
 --- src/zm_thread.cpp.orig	2016-02-03 18:40:30.000000000 +0000
 +++ src/zm_thread.cpp
@@ -72,6 +72,7 @@ void Mutex::lock()
--- a/zoneminder/patches/patch-src_zmf.cpp
+++ b/zoneminder/patches/patch-src_zmf.cpp
@ -1,5 +1,7 @@
 $NetBSD: patch-src_zmf.cpp,v 1.1 2017/02/15 00:54:25 joerg Exp $

+\todo Explain
+
 --- src/zmf.cpp.orig	2017-02-15 00:51:13.260940737 +0000
 +++ src/zmf.cpp
@@ -293,7 +293,7 @@ int main( int argc, char *argv[] )
--- a/zoneminder/patches/patch-src_zmu.cpp
+++ b/zoneminder/patches/patch-src_zmu.cpp
@ -1,5 +1,7 @@
 $NetBSD: patch-src_zmu.cpp,v 1.2 2018/07/14 15:03:57 gdt Exp $

+time types
+
 --- src/zmu.cpp.orig	2016-02-03 18:40:30.000000000 +0000
 +++ src/zmu.cpp
@@ -519,14 +519,14 @@ int main( int argc, char *argv[] )
--- a/zoneminder/patches/patch-web_Makefile.am
+++ b/zoneminder/patches/patch-web_Makefile.am
@ -1,5 +1,7 @@
 $NetBSD: patch-web_Makefile.am,v 1.1 2013/03/24 16:47:47 joerg Exp $

+Don't set owners; see previous
+
 --- web/Makefile.am.orig	2013-03-24 15:56:43.000000000 +0000
 +++ web/Makefile.am
@@ -21,7 +21,7 @@ dist_web_DATA = \