packpack - change error code handling

build/env

@@ -0,0 +1 @@
+VTE_VERSION=4205

build/userwrapper.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+useradd -u 1000 abauer
+usermod -a -G sudo abauer 2>/dev/null || :
+usermod -a -G wheel abauer 2>/dev/null || :
+usermod -a -G adm abauer 2>/dev/null || :
+export HOME=/home/abauer
+exec chroot --userspec=abauer / $@

build/zoneminder_0.0.1-1.dsc

@@ -0,0 +1,22 @@
+Format: 3.0 (native)
+Source: zoneminder
+Binary: zoneminder, zoneminder-doc, zoneminder-dbg
+Architecture: any all
+Version: 0.0.1-1
+Maintainer: Dmitry Smirnov <onlyjob@debian.org>
+Uploaders: Vagrant Cascadian <vagrant@debian.org>
+Homepage: http://www.zoneminder.com/
+Standards-Version: 3.9.6
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git
+Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree, cmake, libavdevice-dev (>= 6:10~), libavcodec-dev (>= 6:10~), libavformat-dev (>= 6:10~), libavutil-dev (>= 6:10~), libswscale-dev (>= 6:10~), libbz2-dev, libgcrypt-dev, libcurl4-gnutls-dev, libgnutls-openssl-dev, libjpeg-dev, libmysqlclient-dev, libpcre3-dev, libpolkit-gobject-1-dev, libv4l-dev (>= 0.8.3) [!hurd-any], libvlc-dev, libdate-manip-perl, libdbd-mysql-perl, libphp-serialization-perl, libsys-mmap-perl [!hurd-any], libwww-perl, libdata-uuid-perl, libjs-jquery, libjs-mootools
+Package-List:
+ zoneminder deb net optional arch=any
+ zoneminder-dbg deb debug extra arch=any
+ zoneminder-doc deb doc optional arch=all
+Checksums-Sha1:
+ 12323d19c3162b637d77225dc35884570e68d3cc 8560812 zoneminder_0.0.1-1.tar.xz
+Checksums-Sha256:
+ 409bda9379113acb6b910c3c2f174cbe5f52d484f774b016bc746f82f3720876 8560812 zoneminder_0.0.1-1.tar.xz
+Files:
+ 766a443eddca4aba97b99eaa3e44e600 8560812 zoneminder_0.0.1-1.tar.xz

build/zoneminder_0.0.1-1_amd64.changes

@@ -0,0 +1,36 @@
+Format: 1.8
+Date: Mon, 16 Jan 2017 14:30:56 +0000
+Source: zoneminder
+Binary: zoneminder zoneminder-doc zoneminder-dbg
+Architecture: source amd64 all
+Version: 0.0.1-1
+Distribution: UNRELEASED
+Urgency: medium
+Maintainer: Dmitry Smirnov <onlyjob@debian.org>
+Changed-By: PackPack <build@tarantool.org>
+Description:
+ zoneminder - video camera security and surveillance solution
+ zoneminder-dbg - Zoneminder -- debugging symbols
+ zoneminder-doc - ZoneMinder documentation
+Changes:
+ zoneminder (0.0.1-1) UNRELEASED; urgency=medium
+ .
+   * Automated build
+Checksums-Sha1:
+ fd752fbd8062560ce40cb9d8b40fc527ee6a19a3 1437 zoneminder_0.0.1-1.dsc
+ 12323d19c3162b637d77225dc35884570e68d3cc 8560812 zoneminder_0.0.1-1.tar.xz
+ f462c114a008c456a382179c510e13bf77c24e84 15778224 zoneminder-dbg_0.0.1-1_amd64.deb
+ 9a6f5f47788e4ef5981146e88051cce64c3af2e5 5279822 zoneminder-doc_0.0.1-1_all.deb
+ f8bb76ac456158e5581a944cb36e772659633ccd 6062224 zoneminder_0.0.1-1_amd64.deb
+Checksums-Sha256:
+ f715293f7ccca919284d8bd37eeefc67491a415775adc617c1e6518a19654c6a 1437 zoneminder_0.0.1-1.dsc
+ 409bda9379113acb6b910c3c2f174cbe5f52d484f774b016bc746f82f3720876 8560812 zoneminder_0.0.1-1.tar.xz
+ 7acddb8e8b80cbf9f46cecd3af391b5901d839a0dc782fcba075d0308287f11d 15778224 zoneminder-dbg_0.0.1-1_amd64.deb
+ 0533671c98073785bb5b2c362b90c2b455e6109f0a75bed1cbb92da2139438ec 5279822 zoneminder-doc_0.0.1-1_all.deb
+ 50dd13c1353ce6321a93e42823fdeac00165cb203c46eda9281e6d53688c2e6a 6062224 zoneminder_0.0.1-1_amd64.deb
+Files:
+ c95a93b548b217779c32b85b9344537b 1437 net optional zoneminder_0.0.1-1.dsc
+ 766a443eddca4aba97b99eaa3e44e600 8560812 net optional zoneminder_0.0.1-1.tar.xz
+ 858572962e27a75f55a5c9b422a4d5c8 15778224 debug extra zoneminder-dbg_0.0.1-1_amd64.deb
+ 5eb22e715496e5d4001b455070f081d8 5279822 doc optional zoneminder-doc_0.0.1-1_all.deb
+ a732cc42c90e03b2bd4f7f6ed4a9f1d5 6062224 net optional zoneminder_0.0.1-1_amd64.deb

build/zoneminder_0.0.1.orig.tar.xz

@@ -0,0 +1 @@
+zoneminder-0.0.1.tar.xz

debian

@@ -0,0 +1 @@
+distros/ubuntu1604

packpack

@@ -0,0 +1 @@
+Subproject commit 24c0184c966ad5e466aad0ee00a6cd4b0541e82f

src/snprintf.cpp

@@ -0,0 +1,25 @@
+snprintf( swap_path, sizeof(swap_path), "%s/zmswap-m%d/zmswap-q%06d", config.path_swap, monitor->Id(), connkey );
+
+int len = snprintf(NULL, 0, "/zmswap-m%d", monitor->Id());
+
+
+  int swap_path_length = strlen(config.path_swap) + snprintf(NULL, 0, "/zmswap-m%d", monitor->Id() ) + snprintf(NULL, 0, "/zmswap-q%06d", connkey ) + 1; // +1 for NULL terminator
+
+  if ( connkey && playback_buffer > 0 ) {
+
+    if ( swap_path_length + max_swap_len_suffix > PATH_MAX ) {
+      Error( "Swap Path is too long. %d > %d ", swap_path_length+max_swap_len_suffix, PATH_MAX );
+    } else {
+      swap_path = (char *)malloc( swap_path_length+max_swap_len_suffix );
+      Debug( 3, "Checking swap image path %s", config.path_swap );
+      strncpy( swap_path, config.path_swap, swap_path_length );
+      if ( checkSwapPath( swap_path, false ) ) {
+        snprintf( &(swap_path[swap_path_length]), max_swap_len_suffix, "/zmswap-m%d", monitor->Id() );
+        if ( checkSwapPath( swap_path, true ) ) {
+          snprintf( &(swap_path[swap_path_length]), max_swap_len_suffix, "/zmswap-q%06d", connkey );
+          if ( checkSwapPath( swap_path, true ) ) {
+            buffered_playback = true;
+          }
+        }
+      }
+

utils/packpack/startpackpack.sh

@@ -1,23 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 # packpack setup file for the ZoneMinder project
 # Written by Andrew Bauer
 
 # Check to see if this script has access to all the commands it needs
 for CMD in set echo curl repoquery git ln mkdir patch rmdir; do
-  type $CMD &> /dev/null
+  type $CMD 2>&1 > /dev/null
 
   if [ $? -ne 0 ]; then
     echo
     echo "ERROR: The script cannot find the required command \"${CMD}\"."
     echo
-    exit -1
+    exit $?
   fi
 done
 
 # Verify OS & DIST environment variables have been set before calling this script
 if [ -z "${OS}" ] || [ -z "${DIST}" ]; then
     echo "ERROR: both OS and DIST environment variables must be set"
-    exit -1
+    exit 1
 fi
 
 # Steps common to all builds
@@ -40,11 +40,10 @@ else
     curl -L https://github.com/FriendsOfCake/crud/archive/v${CRUDVER}.tar.gz > build/crud-${CRUDVER}.tar.gz
     if [ $? -ne 0 ]; then
         echo "ERROR: Crud tarball retreival failed..."
-        exit -1
+        exit $?
     fi
 fi
 
-
 # Steps common to Redhat distros
 if [ "${OS}" == "el" ] || [ "${OS}" == "fedora" ]; then
     echo "Begin Redhat build..."
@@ -67,7 +66,11 @@ if [ "${OS}" == "el" ] || [ "${OS}" == "fedora" ]; then
         curl $result > build/zmrepo.noarch.rpm
     else
         echo "ERROR: Failed to retrieve zmrepo rpm..."
-        echo -1
+        if [ $? -ne 0  ]; then
+            echo $?
+        else
+            echo 1
+        fi
     fi
 
     echo "Starting packpack..."