debian/0000775000000000000000000000000012267271174007201 5ustar debian/compat0000664000000000000000000000000212253751050010366 0ustar 7 debian/preinst0000775000000000000000000000137612253751051010612 0ustar #!/bin/sh set -e abort=false if [ -L /usr/share/zoneminder/events ]; then l=$(readlink /usr/share/zoneminder/events) if [ "$l" != "/var/cache/zoneminder/events" ]; then abort=true fi fi if [ -L /usr/share/zoneminder/images ]; then l=$(readlink /usr/share/zoneminder/images ) if [ "$l" != "/var/cache/zoneminder/images" ]; then abort=true fi fi if [ "$abort" = "true" ]; then cat >&2 << EOF Aborting installation of zoneminder due to non-default symlinks in /usr/share/zoneminder for the images and/or events directory, which could result in loss of data. Please move your data in each of these directories to /var/cache/zoneminder before installing zoneminder from the package. EOF exit 1 fi #DEBHELPER# exit 0 debian/README.Debian0000664000000000000000000000365612253751050011243 0ustar zoneminder for Debian --------------------- There is one manual step to get the web interface working. You need to link /etc/zm/apache.conf to /etc/apache2/conf.d/zoneminder.conf, then reload the apache config (i.e. /etc/init.d/apache2 reload) Changing the location for images and events ------------------------------------------- Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/. This package modifies that by changing /usr/share/zoneminder/images and /usr/share/zoneminder/events to symlinks to directories under /var/cache/zoneminder. There are numerous places these could be put and ways to do it. But, at the moment, if you change this, an upgrade will fail with a warning about these locations having changed (the reason for this was that previously, an upgrade would silently revert the changes and cause event loss - refer bug #608793). If you do want to change the location, here are a couple of suggestions. (thanks to vagrant@freegeek.org): These lines in fstab could allow you to bind-mount an alternate location /dev/sdX1 /otherdrive ext3 defaults 0 2 /otherdrive/zoneminder/images /var/cache/zoneminder/images bind defaults 0 2 /otherdrive/zoneminder/events /var/cache/zoneminder/events bind defaults 0 2 or if you have a separate partition for each: /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2 /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2 -- Peter Howard , Sun, 16 Jan 2010 01:35:51 +1100 Access to /dev/video* --------------------- For cameras which require access to /dev/video*, zoneminder may need the www-data user added to the video group in order to see those cameras: adduser www-data video Note that all web applications running on the zoneminder server will then have access to all video devices on the system. -- Vagrant Cascadian Sun, 27 Mar 2011 13:06:56 -0700 debian/docs0000664000000000000000000000001212253751050010034 0ustar README.md debian/patches/0000775000000000000000000000000012267271062010624 5ustar debian/patches/port-to-avconv.patch0000664000000000000000000000116312267064407014547 0ustar Description: Port from ffmpeg to avconv Author: Dmitrijs Ledkovs Bug-Ubuntu: https://bugs.launchpad.net/bugs/1253071 --- zoneminder-1.25.0.orig/configure.ac +++ zoneminder-1.25.0/configure.ac @@ -252,8 +252,8 @@ AC_CHECK_FUNCS([gethostbyname gethostnam AC_CHECK_FUNCS([syscall sleep usleep ioctl ioctlsocket sigaction]) # Other programs -AC_CHECK_PROG(OPT_FFMPEG,ffmpeg,yes,no) -AC_PATH_PROG(PATH_FFMPEG,ffmpeg) +AC_CHECK_PROG(OPT_FFMPEG,avconv,yes,no) +AC_PATH_PROG(PATH_FFMPEG,avconv) AC_CHECK_PROG(OPT_NETPBM,pnmscale,yes,no) AC_PATH_PROG(PATH_NETPBM,pnmscale) if test "$OPT_NETPBM" == "yes"; then debian/patches/vendor_perl0000664000000000000000000000217712253751051013071 0ustar use the proper perl path on debian systems. http://bugs.debian.org/551746 http://bugs.debian.org/553092 Index: repository/configure.ac =================================================================== --- repository.orig/configure.ac 2011-06-26 16:42:44.332540000 +1000 +++ repository/configure.ac 2011-06-26 16:42:51.265037638 +1000 @@ -357,17 +357,9 @@ AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory]) AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf") -# Slight hack for non-standard perl install paths -if test "$prefix" != "NONE"; then - PERL_SITE_PREFIX=`perl -V:siteprefix | sed -e "s/.*='\(.*\)';/\1/"` - PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"` - PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"` - EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path" - PERL_MM_PARMS="PREFIX=$prefix" -else - EXTRA_PERL_LIB="# Include from system perl paths only" - PERL_MM_PARMS= -fi +EXTRA_PERL_LIB="# Include from system perl paths only" +PERL_MM_PARMS="INSTALLDIRS=vendor" + AC_SUBST(PERL_MM_PARMS) AC_SUBST(EXTRA_PERL_LIB) debian/patches/libv4l1-videodev.h0000664000000000000000000000270512253751051014055 0ustar Use libv4l1-videodev.h from libv4l-dev (>= 0.8.3-1), as it is no longer shipped as linux/videodev.h in linux-libc-dev. http://bugs.debian.org/619813 Index: ZoneMinder-1.26.4/configure.ac =================================================================== --- ZoneMinder-1.26.4.orig/configure.ac 2013-12-03 17:10:55.458414363 +1100 +++ ZoneMinder-1.26.4/configure.ac 2013-12-03 17:11:00.822290301 +1100 @@ -303,7 +303,7 @@ AC_CHECK_HEADERS(ucontext.h,,,) AC_CHECK_HEADERS(sys/syscall.h,,,) AC_CHECK_HEADERS(pthread.h,,,) -AC_CHECK_HEADERS(linux/videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),) +AC_CHECK_HEADERS(libv4l1-videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),) AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_HAS_V4L2,1),AC_SUBST(ZM_HAS_V4L2,0),) if test "$ZM_HAS_V4L1" == "1" || test "$ZM_HAS_V4L2" == "1"; then AC_SUBST(ZM_HAS_V4L,1) Index: ZoneMinder-1.26.4/src/zm_local_camera.h =================================================================== --- ZoneMinder-1.26.4.orig/src/zm_local_camera.h 2013-12-03 17:10:48.122582847 +1100 +++ ZoneMinder-1.26.4/src/zm_local_camera.h 2013-12-03 17:13:31.874796744 +1100 @@ -26,9 +26,9 @@ #if ZM_HAS_V4L -#ifdef HAVE_LINUX_VIDEODEV_H -#include -#endif // HAVE_LINUX_VIDEODEV_H +#ifdef HAVE_LIBV4L1_VIDEODEV_H +#include +#endif // HAVE_LIB4VL1_VIDEODEV_H #ifdef HAVE_LINUX_VIDEODEV2_H #include #endif // HAVE_LINUX_VIDEODEV2_H debian/patches/use_libjs-mootools0000664000000000000000000000176212253751051014401 0ustar use mootools shipped by debian, rather than the zoneminder included mootools. http://bugs.debian.org/585590 Index: zoneminder/web/skins/classic/includes/functions.php =================================================================== --- zoneminder.orig/web/skins/classic/includes/functions.php 2011-07-22 03:40:07.000000000 -0700 +++ zoneminder/web/skins/classic/includes/functions.php 2011-09-28 07:03:59.582380536 -0700 @@ -62,9 +62,8 @@ - - - + + Forwarded: no Index: zoneminder-1.26.5/src/zm_signal.cpp =================================================================== --- zoneminder-1.26.5.orig/src/zm_signal.cpp 2013-12-16 13:42:36.000000000 -0200 +++ zoneminder-1.26.5/src/zm_signal.cpp 2014-01-20 15:40:19.682883736 -0200 @@ -67,7 +67,9 @@ ip = (void *)(uc->uc_mcontext.gregs[REG_RIP]); #else cr2 = info->si_addr; +#if defined(REG_EIP) ip = (void *)(uc->uc_mcontext.gregs[REG_EIP]); +#endif #endif // defined(__x86_64__) // Print the signal address and instruction pointer if available debian/patches/dir_creation0000664000000000000000000000243012253751050013203 0ustar Index: ZoneMinder-1.26.4/Makefile.am =================================================================== --- ZoneMinder-1.26.4.orig/Makefile.am 2013-12-02 10:40:22.531996673 +1100 +++ ZoneMinder-1.26.4/Makefile.am 2013-12-03 15:33:16.297389727 +1100 @@ -18,14 +18,3 @@ zm.conf.in \ zmconfgen.pl.in -# Yes, you are correct. This is a HACK! -install-data-hook: - ( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) ) - ( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi ) - ( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi ) - -uninstall-hook: - @-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp ) - @-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi ) - @-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi ) - @-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi ) debian/patches/do_not_check_for_updates_by_default0000664000000000000000000000234112253751051017753 0ustar Default to not checking for updated versions of ZoneMinder, as users should get updates through the package. Also prevents "phoning home" to zoneminder.com. Index: zoneminder/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in =================================================================== --- zoneminder.orig/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in 2011-12-12 14:48:18.183612192 -0800 +++ zoneminder/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in 2012-05-13 15:10:34.057470903 -0700 @@ -1290,7 +1290,7 @@ }, { name => "ZM_CHECK_FOR_UPDATES", - default => "yes", + default => "no", description => "Check with zoneminder.com for updated versions", help => "From ZoneMinder version 1.17.0 onwards new versions are expected to be more frequent. To save checking manually for each new version ZoneMinder can check with the zoneminder.com website to determine the most recent release. These checks are infrequent, about once per week, and no personal or system information is transmitted other than your current version number. If you do not wish these checks to take place or your ZoneMinder system has no internet access you can switch these check off with this configuration variable", type => $types{boolean}, debian/patches/dont_always_use_sse2_ssse3_instructions_all_archs.patch0000664000000000000000000004151212267271062023760 0ustar Description: Make sure we don't use any sse related instructions for all archs Author: Ricardo Salveti de Araujo Forwarded: no Index: zoneminder-1.26.5/src/zm_image.cpp =================================================================== --- zoneminder-1.26.5.orig/src/zm_image.cpp 2013-12-16 13:42:36.000000000 -0200 +++ zoneminder-1.26.5/src/zm_image.cpp 2014-01-20 17:00:00.719048135 -0200 @@ -146,10 +146,13 @@ { /* Assign the blend pointer to function */ if(config.fast_image_blends) { +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) if(config.cpu_extensions && sseversion >= 20) { fptr_blend = &sse2_fastblend; /* SSE2 fast blend */ Debug(2,"Blend: Using SSE2 fast blend function"); - } else { + } else +#endif + { fptr_blend = &std_fastblend; /* standard fast blend */ Debug(2,"Blend: Using fast blend function"); } @@ -177,6 +180,7 @@ /* Assign the delta functions */ if(config.cpu_extensions) { +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) if(sseversion >= 35) { /* SSSE3 available */ fptr_delta8_rgba = &ssse3_delta8_rgba; @@ -202,7 +206,9 @@ // fptr_delta8_abgr = &std_delta8_abgr; fptr_delta8_gray8 = &sse2_delta8_gray8; Debug(2,"Delta: Using SSE2 delta functions"); - } else { + } else +#endif + { /* No suitable SSE version available */ fptr_delta8_rgba = &std_delta8_rgba; fptr_delta8_bgra = &std_delta8_bgra; @@ -221,6 +227,7 @@ Debug(2,"Delta: CPU extensions disabled, using standard delta functions"); } +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* Use SSSE3 deinterlace functions? */ if(config.cpu_extensions && sseversion >= 35) { fptr_deinterlace_4field_rgba = &ssse3_deinterlace_4field_rgba; @@ -229,7 +236,9 @@ fptr_deinterlace_4field_abgr = &ssse3_deinterlace_4field_abgr; fptr_deinterlace_4field_gray8 = &ssse3_deinterlace_4field_gray8; Debug(2,"Deinterlace: Using SSSE3 delta functions"); - } else { + } else +#endif + { fptr_deinterlace_4field_rgba = &std_deinterlace_4field_rgba; fptr_deinterlace_4field_bgra = &std_deinterlace_4field_bgra; fptr_deinterlace_4field_argb = &std_deinterlace_4field_argb; @@ -238,11 +247,14 @@ Debug(2,"Deinterlace: Using standard delta functions"); } +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* Use SSE2 aligned memory copy? */ if(config.cpu_extensions && sseversion >= 20) { fptr_imgbufcpy = &sse2_aligned_memcpy; Debug(2,"Image buffer copy: Using SSE2 aligned memcpy"); - } else { + } else +#endif + { fptr_imgbufcpy = &memcpy; Debug(2,"Image buffer copy: Using standard memcpy"); } @@ -2987,9 +2999,8 @@ /************************************************* BLEND FUNCTIONS *************************************************/ - -__attribute__((noinline,__target__("sse2"))) void sse2_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) { #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) +__attribute__((noinline,__target__("sse2"))) void sse2_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) { static uint32_t divider = 0; static uint32_t clearmask = 0; static double current_blendpercent = 0.0; @@ -3048,10 +3059,8 @@ : "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (clearmask), "m" (divider) : "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif __attribute__((noinline)) void std_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) { static int divider = 0; @@ -3329,9 +3338,9 @@ } } +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* Grayscale SSE2 */ __attribute__((noinline,__target__("sse2"))) void sse2_delta8_gray8(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) __asm__ __volatile__ ( "sub $0x10, %0\n\t" @@ -3352,14 +3361,12 @@ : "r" (col1), "r" (col2), "r" (result), "r" (count) : "%xmm1", "%xmm2", "%xmm3", "%xmm4", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* RGB32: RGBA SSE2 */ __attribute__((noinline,__target__("sse2"))) void sse2_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) __asm__ __volatile__ ( "mov $0x1F1F1F1F, %%eax\n\t" @@ -3407,14 +3414,12 @@ : "r" (col1), "r" (col2), "r" (result), "r" (count) : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* RGB32: BGRA SSE2 */ __attribute__((noinline,__target__("sse2"))) void sse2_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) __asm__ __volatile__ ( "mov $0x1F1F1F1F, %%eax\n\t" @@ -3462,14 +3467,12 @@ : "r" (col1), "r" (col2), "r" (result), "r" (count) : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* RGB32: ARGB SSE2 */ __attribute__((noinline,__target__("sse2"))) void sse2_delta8_argb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) __asm__ __volatile__ ( "mov $0x1F1F1F1F, %%eax\n\t" @@ -3518,14 +3521,12 @@ : "r" (col1), "r" (col2), "r" (result), "r" (count) : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* RGB32: ABGR SSE2 */ __attribute__((noinline,__target__("sse2"))) void sse2_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) __asm__ __volatile__ ( "mov $0x1F1F1F1F, %%eax\n\t" @@ -3574,14 +3575,12 @@ : "r" (col1), "r" (col2), "r" (result), "r" (count) : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* RGB32: RGBA SSSE3 */ __attribute__((noinline,__target__("ssse3"))) void ssse3_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) __asm__ __volatile__ ( "mov $0x1F1F1F1F, %%eax\n\t" @@ -3626,14 +3625,12 @@ : "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask) : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* RGB32: BGRA SSSE3 */ __attribute__((noinline,__target__("ssse3"))) void ssse3_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) __asm__ __volatile__ ( "mov $0x1F1F1F1F, %%eax\n\t" @@ -3678,14 +3675,12 @@ : "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask) : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* RGB32: ARGB SSSE3 */ __attribute__((noinline,__target__("ssse3"))) void ssse3_delta8_argb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) __asm__ __volatile__ ( "mov $0x1F1F1F1F, %%eax\n\t" @@ -3731,14 +3726,12 @@ : "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask) : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* RGB32: ABGR SSSE3 */ __attribute__((noinline,__target__("ssse3"))) void ssse3_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) __asm__ __volatile__ ( "mov $0x1F1F1F1F, %%eax\n\t" @@ -3784,10 +3777,8 @@ : "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask) : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif /************************************************* CONVERT FUNCTIONS *************************************************/ @@ -3988,9 +3979,9 @@ } } +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* RGBA to grayscale SSSE3 */ __attribute__((noinline,__target__("ssse3"))) void ssse3_convert_rgba_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) __asm__ __volatile__ ( "mov $0x1F1F1F1F, %%eax\n\t" @@ -4029,14 +4020,12 @@ : "r" (col1), "r" (result), "r" (count), "m" (*movemask) : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* Converts a YUYV image into grayscale by extracting the Y channel */ __attribute__((noinline,__target__("ssse3"))) void ssse3_convert_yuyv_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) unsigned long i = 0; __attribute__((aligned(16))) static const uint8_t movemask1[16] = {0,2,4,6,8,10,12,14,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; @@ -4074,10 +4063,8 @@ #endif : "%xmm3", "%xmm4", "cc", "memory" ); -#else - Panic("SSE function called on a non x86\\x86-64 platform"); -#endif } +#endif /* YUYV to RGB24 - relocated from zm_local_camera.cpp */ __attribute__((noinline)) void zm_convert_yuyv_rgb(const uint8_t* col1, uint8_t* result, unsigned long count) { @@ -4651,6 +4638,7 @@ } } +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* Grayscale SSSE3 */ __attribute__((noinline,__target__("ssse3"))) void ssse3_deinterlace_4field_gray8(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) { @@ -4779,7 +4767,9 @@ : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory" ); } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* RGBA SSSE3 */ __attribute__((noinline,__target__("ssse3"))) void ssse3_deinterlace_4field_rgba(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) { __attribute__((aligned(16))) static const uint8_t movemask2[16] = {1,1,1,1,1,0,0,2,9,9,9,9,9,8,8,10}; @@ -4955,7 +4945,9 @@ #endif ); } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* BGRA SSSE3 */ __attribute__((noinline,__target__("ssse3"))) void ssse3_deinterlace_4field_bgra(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) { __attribute__((aligned(16))) static const uint8_t movemask2[16] = {1,1,1,1,1,2,2,0,9,9,9,9,9,10,10,8}; @@ -5131,7 +5123,9 @@ #endif ); } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* ARGB SSSE3 */ __attribute__((noinline,__target__("ssse3"))) void ssse3_deinterlace_4field_argb(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) { __attribute__((aligned(16))) static const uint8_t movemask2[16] = {2,2,2,2,2,1,1,3,10,10,10,10,10,9,9,11}; @@ -5307,7 +5301,9 @@ #endif ); } +#endif +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* ABGR SSSE3 */ __attribute__((noinline,__target__("ssse3"))) void ssse3_deinterlace_4field_abgr(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) { __attribute__((aligned(16))) static const uint8_t movemask2[16] = {2,2,2,2,2,3,3,1,10,10,10,10,10,11,11,9}; @@ -5483,4 +5479,5 @@ #endif ); } +#endif Index: zoneminder-1.26.5/src/zm_local_camera.cpp =================================================================== --- zoneminder-1.26.5.orig/src/zm_local_camera.cpp 2013-12-16 13:42:36.000000000 -0200 +++ zoneminder-1.26.5/src/zm_local_camera.cpp 2014-01-20 16:54:58.000000000 -0200 @@ -457,10 +457,13 @@ subpixelorder = ZM_SUBPIX_ORDER_NONE; } else if(palette == V4L2_PIX_FMT_YUYV && colours == ZM_COLOUR_GRAY8) { /* Fast YUYV->Grayscale conversion by extracting the Y channel */ +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) if(config.cpu_extensions && sseversion >= 35) { conversion_fptr = &ssse3_convert_yuyv_gray8; Debug(2,"Using SSSE3 YUYV->grayscale fast conversion"); - } else { + } else +#endif + { conversion_fptr = &std_convert_yuyv_gray8; Debug(2,"Using standard YUYV->grayscale fast conversion"); } @@ -569,10 +572,13 @@ } } else if((palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422) && colours == ZM_COLOUR_GRAY8) { /* Fast YUYV->Grayscale conversion by extracting the Y channel */ +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) if(config.cpu_extensions && sseversion >= 35) { conversion_fptr = &ssse3_convert_yuyv_gray8; Debug(2,"Using SSSE3 YUYV->grayscale fast conversion"); - } else { + } else +#endif + { conversion_fptr = &std_convert_yuyv_gray8; Debug(2,"Using standard YUYV->grayscale fast conversion"); } Index: zoneminder-1.26.5/src/zm_utils.cpp =================================================================== --- zoneminder-1.26.5.orig/src/zm_utils.cpp 2014-01-20 16:59:05.619046240 -0200 +++ zoneminder-1.26.5/src/zm_utils.cpp 2014-01-20 16:59:54.603047924 -0200 @@ -190,10 +190,10 @@ #endif } +#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) /* SSE2 aligned memory copy. Useful for big copying of aligned memory like image buffers in ZM */ /* For platforms without SSE2 we will use standard x86 asm memcpy or glibc's memcpy() */ __attribute__((noinline,__target__("sse2"))) void* sse2_aligned_memcpy(void* dest, const void* src, size_t bytes) { -#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE)) if(bytes > 128) { unsigned int remainder = bytes % 128; const uint8_t* lastsrc = (uint8_t*)src + (bytes - remainder); @@ -234,12 +234,9 @@ /* Standard memcpy */ __asm__ __volatile__("cld; rep movsb" :: "S"(src), "D"(dest), "c"(bytes) : "cc", "memory"); } -#else - /* Non x86\x86-64 platform, use memcpy */ - memcpy(dest,src,bytes); -#endif return dest; } +#endif void timespec_diff(struct timespec *start, struct timespec *end, struct timespec *diff) { if (((end->tv_nsec)-(start->tv_nsec))<0) { debian/watch0000664000000000000000000000012112253751051010214 0ustar version=3 http://www.zoneminder.com/downloads.html \ .*/ZoneMinder-(.*).tar.gz debian/rules0000775000000000000000000000675312253751051010264 0ustar #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d - -f 1) POSTINST_VERSION := $(shell egrep ^VERSION= debian/postinst | cut -d = -f 2) # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export CFLAGS = $(shell dpkg-buildflags --get CFLAGS) export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) CFLAGS += -Wall -g CPPFLAGS += -D__STDC_CONSTANT_MACROS CXXFLAGS += -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO %: dh $@ --with autoreconf override_dh_auto_configure: ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes override_dh_clean: # check to make sure that postinst contains the correct upstream version [ $(UPSTREAM_VERSION) = $(POSTINST_VERSION) ] # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean dh_clean override_dh_install: # Add here commands to install the package into debian/zm. $(MAKE) install DESTDIR=$(CURDIR)/debian/zoneminder RUNDIR=$(CURDIR)/debian/zoneminder/var/run ZM_RUNDIR=$(CURDIR)/debian/zoneminder/var/run install -D -m 0644 db/zm_create.sql $(CURDIR)/debian/zoneminder/usr/share/zoneminder/db install -D -m 0644 db/zm_update-*.sql $(CURDIR)/debian/zoneminder/usr/share/zoneminder/db install -D -m 0644 debian/apache.conf $(CURDIR)/debian/zoneminder/etc/zm # # NOTE: This is a short-term kludge; hopefully changes in the next # upstream version will render this unnecessary. rm -rf debian/zoneminder/usr/share/zoneminder/events rm -rf debian/zoneminder/usr/share/zoneminder/images rm -rf debian/zoneminder/usr/share/zoneminder/temp ln -s /var/cache/zoneminder/events debian/zoneminder/usr/share/zoneminder/ ln -s /var/cache/zoneminder/images debian/zoneminder/usr/share/zoneminder/ ln -s /var/cache/zoneminder/temp debian/zoneminder/usr/share/zoneminder/ # remove zoneminder-shipped mootools, as it is now patched to use mootools # shipped from the libjs-mootools package. http://bugs.debian.org/585590 rm -rf debian/zoneminder/usr/share/zoneminder/tools/mootools rm -f debian/zoneminder/usr/share/zoneminder/js/mootools.ext.js # # This is a slightly lesser kludge; moving the cgi stuff to # /usr/share/zoneminder/cgi-bin breaks one set of behavior, # having it just in /usr/lib/cgi-bin breaks another bit of # behavior. # ln -s /usr/lib/cgi-bin debian/zoneminder/usr/share/zoneminder/ override_dh_fixperms: dh_fixperms chown root:root debian/zoneminder/etc/zm/zm.conf override_dh_auto_test: # do not run tests... debian/postrm0000664000000000000000000000053112253751051010437 0ustar #! /bin/sh # set -e # to be reinstated later if [ "$1" = "purge" ]; then echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm fi #DEBHELPER# debian/copyright0000664000000000000000000000220312253751050011120 0ustar This package was originally debianized by matrix on Mon, 7 Mar 2005 02:07:57 -0500. It was re-done for submission to the Debian project by Peter Howard on Fri, 8 Dec 2006 10:19:43 +1100 It was downloaded from http://www.zoneminder.com/downloads Copyright: Copyright 2002 Philip Coombes License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian GNU/Linux systems, the text of the GPL can be found in /usr/share/common-licenses/GPL-2. debian/init.d0000664000000000000000000000321612253756446010320 0ustar #!/bin/sh ### BEGIN INIT INFO # Provides: zoneminder # Required-Start: $network $remote_fs $syslog # Required-Stop: $network $remote_fs $syslog # Should-Start: mysql # Should-Stop: mysql # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Control ZoneMinder as a Service ### END INIT INFO # description: Control ZoneMinder as a Service # chkconfig: 2345 20 20 # Source function library. #. /etc/rc.d/init.d/functions prog=ZoneMinder ZM_PATH_BIN="/usr/bin" command="$ZM_PATH_BIN/zmpkg.pl" start() { echo -n "Starting $prog: " zmfix -a $command start RETVAL=$? [ $RETVAL = 0 ] && echo success [ $RETVAL != 0 ] && echo failure echo [ $RETVAL = 0 ] && touch /var/lock/zm return $RETVAL } stop() { echo -n "Stopping $prog: " # # Why is this status check being done? # as $command stop returns 1 if zoneminder # is stopped, which will result in # this returning 1, which will stuff # dpkg when it tries to stop zoneminder before # uninstalling . . . # result=`$command status` if [ ! "$result" = "running" ]; then echo "Zoneminder already stopped" echo RETVAL=0 else $command stop RETVAL=$? [ $RETVAL = 0 ] && echo success [ $RETVAL != 0 ] && echo failure echo [ $RETVAL = 0 ] && rm -f /var/lock/zm fi } status() { result=`$command status` if [ "$result" = "running" ]; then echo "ZoneMinder is running" RETVAL=0 else echo "ZoneMinder is stopped" RETVAL=1 fi } case "$1" in 'start') start ;; 'stop') stop ;; 'restart' | 'force-reload') stop start ;; 'status') status ;; *) echo "Usage: $0 { start | stop | restart | status }" RETVAL=1 ;; esac exit $RETVAL debian/control0000664000000000000000000000375712267066066010622 0ustar Source: zoneminder Section: net Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Peter Howard Uploaders: Vagrant Cascadian DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libphp-serialization-perl, libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libsys-mmap-perl, dh-autoreconf, libavdevice-dev, libgnutls-dev Standards-Version: 3.9.3 Homepage: http://www.zoneminder.com/ Vcs-Hg: http://hg.debian.org/hg/collab-maint/zoneminder Package: zoneminder Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2 | httpd, libapache2-mod-php5, php5, php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-tools-perl, libmime-lite-perl, mysql-server, mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libjs-mootools, libsys-mmap-perl, zip, javascript-common, libnet-sftp-foreign-perl Description: Linux video camera security and surveillance solution ZoneMinder is intended for use in single or multi-camera video security applications, including commercial or home CCTV, theft prevention and child or family member or home monitoring and other care scenarios. It supports capture, analysis, recording, and monitoring of video data coming from one or more video or network cameras attached to a Linux system. ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom cameras using a variety of protocols. It is suitable for use as a home video security system and for commercial or professional video security and surveillance. It can also be integrated into a home automation system via X.10 or other protocols. debian/source/0000775000000000000000000000000012253751051010471 5ustar debian/source/format0000664000000000000000000000001412253751051011677 0ustar 3.0 (quilt) debian/dirs0000664000000000000000000000020012253751050010044 0ustar var/log/zm var/lib/zm var/cache/zoneminder/events var/cache/zoneminder/images var/cache/zoneminder/temp usr/share/zoneminder/db debian/apache.conf0000664000000000000000000000032312253751050011256 0ustar Alias /zm /usr/share/zoneminder php_flag register_globals off Options Indexes FollowSymLinks DirectoryIndex index.php debian/postinst0000664000000000000000000000363612253751051011007 0ustar #! /bin/sh set -e VERSION=1.26.5 if [ "$1" = "configure" ]; then # # Get mysql started if it isn't # if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then invoke-rc.d mysql start fi if $(/etc/init.d/mysql status >/dev/null 2>&1); then mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload # test if database if already present... if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql fi # get old version from upgrade... OLD_ZM_VERSION=${2%-*} if [ -z "$OLD_ZM_VERSION" ]; then # fall back to getting version from database itself, which may not necessarily be accurate? OLD_ZM_VERSION=$(echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' | mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm ) fi if [ -n "$OLD_ZM_VERSION" ] && [ "$OLD_ZM_VERSION" != "$VERSION" ] ; then echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql # stop zoneminder before performing database upgrade. invoke-rc.d zoneminder stop || true zmupdate.pl --nointeractive --version $OLD_ZM_VERSION fi else echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.' fi chown www-data:www-data /var/log/zm chown www-data:www-data /var/lib/zm/ if [ -z "$2" ]; then chown www-data:www-data -R /var/cache/zoneminder fi fi # Ensure zoneminder is stopped... if [ -x "/etc/init.d/zoneminder" ]; then if invoke-rc.d zoneminder status ; then invoke-rc.d zoneminder stop || exit $? fi fi #DEBHELPER# debian/changelog0000664000000000000000000003465112267271170011060 0ustar zoneminder (1.26.5-1ubuntu3) trusty; urgency=medium * dont_always_use_sse2_ssse3_instructions_all_archs.patch: - Refreshing patch covering a missing function call -- Ricardo Salveti de Araujo Mon, 20 Jan 2014 17:00:41 -0200 zoneminder (1.26.5-1ubuntu2) trusty; urgency=medium * dont_always_use_sse2_ssse3_instructions_all_archs.patch: - Don't expect sse2 and sss3 instructions to be available for all architectures * check_for_reg_eip.patch: check for REG_EIP before using it -- Ricardo Salveti de Araujo Mon, 20 Jan 2014 11:07:43 -0200 zoneminder (1.26.5-1ubuntu1) trusty; urgency=medium * Merge from Debian unstable. Remaining changes: - debian/control: Add libnet-sftp-foreign-perl to dependencies. - debian/control: Apache2 transition. - Port from ffmpeg to avconv. - Still build-depending on libgnutls-dev -- Ricardo Salveti de Araujo Sun, 19 Jan 2014 22:07:18 -0200 zoneminder (1.26.5-1) unstable; urgency=low * New upstream version (Closes: #694131) * Change Build-Depends on libgnutls-dev to libgnutls-openssl-dev (Closes: #731560) -- Peter Howard Tue, 17 Dec 2013 01:02:10 +1000 zoneminder (1.25.0-4ubuntu3) trusty; urgency=low * Port from ffmpeg to avconv. (LP: #1253071) -- Dmitrijs Ledkovs Sat, 23 Nov 2013 14:04:26 +0000 zoneminder (1.25.0-4ubuntu2) saucy; urgency=low * debia/rules: Apache2 transition. -- Chuck Short Thu, 11 Jul 2013 10:37:43 -0500 zoneminder (1.25.0-4ubuntu1) raring; urgency=low * Merge from Debian unstable. Remaining changes: - debian/patches/fix-ftbfs-libav9.patch: Fix compilation against libav 9. - debian/patches/debian/patches/zoneminder-1.25.0-kernel35.patch: Fix FTBFS on amd64. - debian/control: Add libnet-sftp-foreign-perl to dependencies. -- Logan Rosen Thu, 21 Feb 2013 15:07:22 -0500 zoneminder (1.25.0-4) unstable; urgency=high * Add CVE-2013-0232 patch [SECURITY] CVE-2013-0232: Shell escape commands with untrusted content. Thanks to James McCoy (Closes: #698910) Thanks also to Salvatore Bonaccorso -- Peter Howard Tue, 12 Jun 2013 12:02:10 +1000 zoneminder (1.25.0-3ubuntu2) raring; urgency=low [ Reinhard Tartler ] * fix-ftbfs-libav9.patch: Fix compilation against libav 9, LP: #1082605 -- Reinhard Tartler Sat, 24 Nov 2012 08:51:20 +0000 zoneminder (1.25.0-3ubuntu1) raring; urgency=low * Fix FTBFS on amd64. * Merge from Debian unstable. (LP: #1074962) Remaining changes: - Add libnet-sftp-foreign-perl to dependencies. -- Paolo Rotolo Mon, 05 Nov 2012 21:50:05 +0100 zoneminder (1.25.0-3) unstable; urgency=low * debian/rules: Export CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS, to ensure hardening build flags are enabled. -- Vagrant Cascadian Tue, 28 Aug 2012 12:10:03 -0700 zoneminder (1.25.0-2) unstable; urgency=low [ Vagrant Cascadian ] * Add a patch to disable checking for updated versions by default, as upgrades should happen through package management. * Use dpkg-buildflags in debian/rules to set default compiler flags. * Ensure zoneminder is stopped before starting (Closes: #657407). [ Peter Howard ] * Fix postinst to add permission for table creation during upgrade (Closes: #657407). -- Vagrant Cascadian Thu, 23 Aug 2012 12:40:34 -0700 zoneminder (1.25.0-1.1ubuntu1) quantal; urgency=low * Add libnet-sftp-foreign-perl to dependencies (LP: #1006890). -- Paolo Rotolo Fri, 01 Jun 2012 16:11:20 +0100 zoneminder (1.25.0-1.1) unstable; urgency=low * Non-maintainer upload. * Fix "ftbfs with GCC-4.7": add patch Fix-FTBFS-with-gcc-4.7 from Cyril Brulebois: fix missing includes. (Closes: #667428) -- gregor herrmann Sun, 13 May 2012 17:02:21 +0200 zoneminder (1.25.0-1) unstable; urgency=low * Fix typo in libv4l1-videodev.h patch that caused v4l1 support to be dropped. * Fail to build if version in postinst doesn't match upstream version. * Add Build-Depends: libavdevice-dev to fix MPEG streaming (Closes: #515558). * debian/rules: Convert to using debhelper overrides. * Set debian/compat to 7. * Simplify debian/watch file. * Refresh debian/patches/use_libjs-mootools. * Refresh debian/patches/libv4l1-videodev.h. * Remove dependencies on php4 and related packages. * Remove build-dependencies on libmysqlclient14-dev and libmysqlclient15-dev. * Update Build-Depends to use libjpeg-dev instead of libjpeg62-dev (Closes: #647114). * Add patch to fix build by testing for C headers rather than C++ headers. Thanks to Ryan Niebur. (Closes: #654230) * Add a patch to fix build problems caused by API changes in libav 0.8. Thanks again to Ryan Niebur. (Closes: #654230) * -- Vagrant Cascadian Mon, 16 Jan 2012 11:58:05 -0800 zoneminder (1.24.4-1) unstable; urgency=low [ Peter Howard ] * Initial release of 1.24.4 (Closes: #634985). - Fix 32/64-bit type declarations (Closes: #614404). * Update patches. [ Vagrant Cascadian ] * Add patch to fix FTBFS by using libv4l1-videodev.h from libv4l-dev. Thanks to Andreas Metzler for reporting the issue. (Closes: #619813). * Document adding the www-data user to the video group in README.Debian. (Closes: #611324) * Depend on libsys-mmap-perl to enable mapped memory support. (Closes: #607331) * Update libjs-mootools patch to use -nc variants (Closes: #635075). * Depend on javascript-common, to ensure that /javascript is available in the web server. * Set the upstream version in postinst at build time. * Use dh-autoreconf to properly clean up autogenerated files during build. * Add Vcs-HG to debian/control. * Add Build-Depends: libv4l-dev, libbz2-dev, dh-autoreconf, libsys-mmap-perl. -- Vagrant Cascadian Sun, 24 Jul 2011 16:44:30 +0200 zoneminder (1.24.2-9) unstable; urgency=low * Apply patch from Ubuntu to fix FTBFS with ffmpeg 0.6: - Add -D__STDC_CONSTANT_MACROS to CPPFLAGS (closes: 614080). * Update Standards-Version to 3.9.1, no changes necessary. -- Vagrant Cascadian Sun, 20 Feb 2011 23:43:02 -0800 zoneminder (1.24.2-8) unstable; urgency=medium [ Vagrant Cascadian ] * Apply patch to fix V4L2 cameras without crop support (closes: #608790). Thanks to piratebab. * Add preinst script which aborts if dangerous symlinks exist. (closes: #608793) [ Peter Howard ] * Added to README.Debian with info about images and events directories. (closes: #608793) -- Vagrant Cascadian Sat, 15 Jan 2011 19:39:26 -0800 zoneminder (1.24.2-7) unstable; urgency=medium * Do not set ownership of /var/cache/zoneminder when upgrading, which fixes a regression causing upgrades to take inordinately long with large installations (closes: #597040). -- Vagrant Cascadian Fri, 17 Sep 2010 11:24:41 -0700 zoneminder (1.24.2-6) unstable; urgency=low * Only remove database on purge. This requires only creating the database if it doesn't already exist, and upgrading the database only if the database is an older version (closes: #497107). * Do not prompt the user on database upgrades by using the --nointeractive flag when calling zmupdate.pl from postinst (closes: #595902). -- Vagrant Cascadian Fri, 10 Sep 2010 10:06:06 -0700 zoneminder (1.24.2-5) unstable; urgency=low [ Peter Howard ] * Add zip dependency (closes: #494261) * Add debian/watch file (closes: #545552) * Use packaged libjs-mootools (closes: #585590) * Miscellaneous cleanups [ Vagrant Cascadian ] * Add vagrant@debian.org as uploader * Update Standards-Version to 3.9.0, no changes necessary. -- Vagrant Cascadian Fri, 23 Jul 2010 18:12:50 -0500 zoneminder (1.24.2-4.1) unstable; urgency=low * Non-maintainer upload. * Fix "package removed, processes still running": apply patch to debian/postinst by Vagrant Cascadian: use invoke-rc.d and run mysql-related actions only when mysql is running (closes: #583648). -- gregor herrmann Thu, 01 Jul 2010 19:47:10 +0200 zoneminder (1.24.2-4) unstable; urgency=high * Update init.d to list mysql dependency (closes: #583505) * Change depenency from libmime-perl to libmime-tools-perl (closes: #585589) * Problems in changelog format fixed (closes: #585592) * Fix debian-rules-ignores-make-clean-error (closes: #585593) -- Peter Howard Mon, 14 jun 2010 15:02:10 +1000 zoneminder (1.24.2-3) unstable; urgency=high * Changes symbols to build with libjpeg8 (closes: #565326, #568327) * Note: location of all perl files should have been fixed in previous release (closes: #553096) -- Peter Howard Mon, 26 apr 2010 15:02:10 +1000 zoneminder (1.24.2-2) unstable; urgency=high * Remove custom perl parth from zmpkg.pl, fix location of manpages. (closes: #551746, #553092) * Fix GCC4.4 bug (closes: #531717) * Fix potential bug in postinst script -- Peter Howard Sat, 14 Nov 2009 15:02:10 +1000 zoneminder (1.24.2-1) unstable; urgency=high * Initial release of zoneminder 1.24.2 -- Peter Howard Fri, 11 Sep 2009 07:02:50 +1000 zoneminder (1.24.1-1) unstable; urgency=high * Initial release of zoneminder 1.24.1, closing CVE-2008-3882, CVE-2008-3881, CVE-2008-3880 (closes: #497640) * Change syslog dependency to rsyslog. (closes: #526918) * Add missing perl depenency. * Restore patch to disable "check for updates" by default. * Removed spurious '$' in init script. (closes: #486064) * Change permission of zm.conf from 0600 to 0400 for CVE-2008-6755 (closes: #528252) -- Peter Howard Sat, 16 May 2009 07:02:50 +1000 zoneminder (1.23.3-4) unstable; urgency=high * update to get it building with latest unstable. Thanks to waldi@debian.org (closes: #517569) -- Peter Howard Thu, 16 Apr 2009 01:02:50 +1000 zoneminder (1.23.3-3) unstable; urgency=high * ffmpeg confirmed working (closes: #475145) * Fix upgrade problem intrudouced in 1.23.3-1 (closes: #481637) * Include libmime-lite-perl in dependencies (closes: #486312) -- Peter Howard Thu, 18 Sep 2008 01:02:50 +1000 zoneminder (1.23.3-2) unstable; urgency=high * ffmpeg finally working? -- Peter Howard Wed, 13 Aug 2008 01:02:50 +1000 zoneminder (1.23.3-1) unstable; urgency=high * Initial version for 1.23.3 - security fix. (closes: #479034) -- Peter Howard Wed, 19 Mar 2008 01:02:50 +1000 zoneminder (1.23.2-2) unstable; urgency=low * Update to init.d (closes: #468856) * Add dependency on logging daemon (closes: #471277) -- Peter Howard Wed, 19 Mar 2008 01:02:50 +1000 zoneminder (1.23.2-1) unstable; urgency=low * Initial version for 1.23.2 (closes: #464152) * Zoneminder 1.23.2 upstream includes fix for GCC 4.3 (closes: #454980) * Includes ffmpeg patch by Alexander Kushnirenko -- Peter Howard Sat, 01 Mar 2008 16:02:50 +1000 zoneminder (1.22.3-10) unstable; urgency=low * Fix bug introduced in -9 where perl is put under /usr/local (closes: #457507) -- Peter Howard Mon, 24 Dec 2007 16:02:50 +1000 zoneminder (1.22.3-9) unstable; urgency=low * Starting zoneminder via init script now invokes "zmfix -a" (closes: #481637) * Change apache2-mpm-prefork dependency to apache2 * Temp dir for export under /var/cache/zoneminder (but linked back to /usr/share/zoneminder for now) * Redo use of gnutls rather than openssl for md5 hashes -- Peter Howard Mon, 10 Dec 2007 16:02:50 +1000 zoneminder (1.22.3-8) unstable; urgency=low * Build now includes libpcre3 (closes: #437533) * "Monitor Presets" patch now applied to package during build. -- Peter Howard Sat, 18 Aug 2007 14:35:23 +1000 zoneminder (1.22.3-7) unstable; urgency=low * Turn off debug trace and crash dump on build (closes:#414857,#414891) * Additional perl libraries added in dependencies (closes:#416291) * Change preferred PHP version from 4 to 5 -- Peter Howard Sun, 29 Jul 2007 15:11:13 +1000 zoneminder (1.22.3-6) unstable; urgency=low * Removed a similar bash only statment from zmpkg.pl (closes:414882) -- Peter Howard Sat, 14 Apr 2007 11:46:56 +1000 zoneminder (1.22.3-5) unstable; urgency=low * Installs with "phone home" feature turned off by default, and permissions on /etc/zm/zm.conf fixed (now the 0600 it s hould be) (closes:415349) * Removed "stupid bash-ism" on mysqld check in postinst file. -- Peter Howard Fri, 6 Apr 2007 15:50:00 +1000 zoneminder (1.22.3-4) unstable; urgency=low * Put libmysqlclient-15-dev in front of -14-dev so sbuild works (closes: #414410) -- Peter Howard Mon, 12 Mar 2007 11:38:56 +1100 zoneminder (1.22.3-3) unstable; urgency=low * Clean up of postinstall, postrm ; user "zm" definitely was a mistake * Also in postinstall: check and start MySQL if it's not running. * init.d script now checks if zoneminder isn't running and still returns 0 (which helps uninstalling) * Addition of php5 dependency options as well as php4. -- Peter Howard Mon, 26 Feb 2007 10:40:52 +1100 zoneminder (1.22.3-2) unstable; urgency=low * Added zmuser in the mysql creation; this should fix the install problem for people, but needs to be cleaned up (in -3) -- Peter Howard Fri, 16 Feb 2007 14:16:03 +1100 zoneminder (1.22.3-1) unstable; urgency=low * Initial Version. (closes: #248393) * Patched out use of openssl; uses gnutls instead for MD5 hashes. * Removed MakeMaker-inserted Perl licensing (with authors permission) in various scripts; replaced with GPL. -- Peter Howard Wed, 7 Feb 2007 14:09:01 +1100