kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/security/zoneminder/patches/patch-Makefile_am

28 lines
1.1 KiB
Text
Raw Normal View History

Update ZoneMinder from 1.25.0 to 1.28.1. Numerous changes, documented at: https://github.com/ZoneMinder/ZoneMinder/releases Addresses two security advisories: https://github.com/ZoneMinder/ZoneMinder/releases/tag/v1.28.0 http://secunia.com/advisories/62918/ Pkgsrc changes: patch-src_zm_signal_h is no longer necessary because zm_signal.h uses HAVE_EXECINFO_H. patch-src_zmf_cpp appears to be applied upstream. patch-configure_ac no longer needs to set PATH_BUILD to PREFIX/share/zoneminder, so that zmupdate.pl can locate the database build scripts as installed files. Upstream has now implemented this via the ZM_PATH_DATA entry in zm.conf, and adds a ZM_PATH_DATA/db subdirectory. src/Makefile.am no longer setuid's zmfix, as zmfix was removed from ZoneMinder 1.26.6. The code now uses clock_gettime(), which on some systems (like Linux), calls for -lrt. Since the build system isn't aware of this, but Pkgsrc is, just set PTHREAD_AUTO_VARS=yes. The PHP code now uses PDO for DB access, but it looks like there are some straggling dependencies on the raw MySQL driver, so both are pulled in.
2015-04-05 10:51:08 +02:00
$NetBSD: patch-Makefile_am,v 1.3 2015/04/05 08:51:08 dsainty Exp $
ZoneMinder version 1.25.0: ZoneMinder is intended for use in single or multi-camera video security applications, including commercial or home CCTV, theft prevention and child, family member or home monitoring and other domestic care scenarios such as nanny cam installations. It supports capture, analysis, recording, and monitoring of video data coming from one or more video or network cameras attached to a 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 DIY 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.
2013-03-15 03:01:46 +01:00
Disable the hacks around ownership setup so Pkgsrc can take responsibility.
Don't install zm.conf at all - let Pkgsrc install it into EGDIR.
Fix build with Clang and as unprivileged user.
2013-03-24 17:47:47 +01:00
--- Makefile.am.orig 2011-05-20 09:39:37.000000000 +0000
+++ Makefile.am
Update ZoneMinder from 1.25.0 to 1.28.1. Numerous changes, documented at: https://github.com/ZoneMinder/ZoneMinder/releases Addresses two security advisories: https://github.com/ZoneMinder/ZoneMinder/releases/tag/v1.28.0 http://secunia.com/advisories/62918/ Pkgsrc changes: patch-src_zm_signal_h is no longer necessary because zm_signal.h uses HAVE_EXECINFO_H. patch-src_zmf_cpp appears to be applied upstream. patch-configure_ac no longer needs to set PATH_BUILD to PREFIX/share/zoneminder, so that zmupdate.pl can locate the database build scripts as installed files. Upstream has now implemented this via the ZM_PATH_DATA entry in zm.conf, and adds a ZM_PATH_DATA/db subdirectory. src/Makefile.am no longer setuid's zmfix, as zmfix was removed from ZoneMinder 1.26.6. The code now uses clock_gettime(), which on some systems (like Linux), calls for -lrt. Since the build system isn't aware of this, but Pkgsrc is, just set PTHREAD_AUTO_VARS=yes. The PHP code now uses PDO for DB access, but it looks like there are some straggling dependencies on the raw MySQL driver, so both are pulled in.
2015-04-05 10:51:08 +02:00
@@ -5,8 +5,8 @@
ZoneMinder version 1.25.0: ZoneMinder is intended for use in single or multi-camera video security applications, including commercial or home CCTV, theft prevention and child, family member or home monitoring and other domestic care scenarios such as nanny cam installations. It supports capture, analysis, recording, and monitoring of video data coming from one or more video or network cameras attached to a 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 DIY 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.
2013-03-15 03:01:46 +01:00
webgroup = @WEB_GROUP@
Update ZoneMinder from 1.25.0 to 1.28.1. Numerous changes, documented at: https://github.com/ZoneMinder/ZoneMinder/releases Addresses two security advisories: https://github.com/ZoneMinder/ZoneMinder/releases/tag/v1.28.0 http://secunia.com/advisories/62918/ Pkgsrc changes: patch-src_zm_signal_h is no longer necessary because zm_signal.h uses HAVE_EXECINFO_H. patch-src_zmf_cpp appears to be applied upstream. patch-configure_ac no longer needs to set PATH_BUILD to PREFIX/share/zoneminder, so that zmupdate.pl can locate the database build scripts as installed files. Upstream has now implemented this via the ZM_PATH_DATA entry in zm.conf, and adds a ZM_PATH_DATA/db subdirectory. src/Makefile.am no longer setuid's zmfix, as zmfix was removed from ZoneMinder 1.26.6. The code now uses clock_gettime(), which on some systems (like Linux), calls for -lrt. Since the build system isn't aware of this, but Pkgsrc is, just set PTHREAD_AUTO_VARS=yes. The PHP code now uses PDO for DB access, but it looks like there are some straggling dependencies on the raw MySQL driver, so both are pulled in.
2015-04-05 10:51:08 +02:00
zmconfigdir = @ZM_CONFIG_DIR@
ZoneMinder version 1.25.0: ZoneMinder is intended for use in single or multi-camera video security applications, including commercial or home CCTV, theft prevention and child, family member or home monitoring and other domestic care scenarios such as nanny cam installations. It supports capture, analysis, recording, and monitoring of video data coming from one or more video or network cameras attached to a 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 DIY 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.
2013-03-15 03:01:46 +01:00
Update ZoneMinder from 1.25.0 to 1.28.1. Numerous changes, documented at: https://github.com/ZoneMinder/ZoneMinder/releases Addresses two security advisories: https://github.com/ZoneMinder/ZoneMinder/releases/tag/v1.28.0 http://secunia.com/advisories/62918/ Pkgsrc changes: patch-src_zm_signal_h is no longer necessary because zm_signal.h uses HAVE_EXECINFO_H. patch-src_zmf_cpp appears to be applied upstream. patch-configure_ac no longer needs to set PATH_BUILD to PREFIX/share/zoneminder, so that zmupdate.pl can locate the database build scripts as installed files. Upstream has now implemented this via the ZM_PATH_DATA entry in zm.conf, and adds a ZM_PATH_DATA/db subdirectory. src/Makefile.am no longer setuid's zmfix, as zmfix was removed from ZoneMinder 1.26.6. The code now uses clock_gettime(), which on some systems (like Linux), calls for -lrt. Since the build system isn't aware of this, but Pkgsrc is, just set PTHREAD_AUTO_VARS=yes. The PHP code now uses PDO for DB access, but it looks like there are some straggling dependencies on the raw MySQL driver, so both are pulled in.
2015-04-05 10:51:08 +02:00
-zmconfig_DATA = \
ZoneMinder version 1.25.0: ZoneMinder is intended for use in single or multi-camera video security applications, including commercial or home CCTV, theft prevention and child, family member or home monitoring and other domestic care scenarios such as nanny cam installations. It supports capture, analysis, recording, and monitoring of video data coming from one or more video or network cameras attached to a 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 DIY 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.
2013-03-15 03:01:46 +01:00
- zm.conf
Update ZoneMinder from 1.25.0 to 1.28.1. Numerous changes, documented at: https://github.com/ZoneMinder/ZoneMinder/releases Addresses two security advisories: https://github.com/ZoneMinder/ZoneMinder/releases/tag/v1.28.0 http://secunia.com/advisories/62918/ Pkgsrc changes: patch-src_zm_signal_h is no longer necessary because zm_signal.h uses HAVE_EXECINFO_H. patch-src_zmf_cpp appears to be applied upstream. patch-configure_ac no longer needs to set PATH_BUILD to PREFIX/share/zoneminder, so that zmupdate.pl can locate the database build scripts as installed files. Upstream has now implemented this via the ZM_PATH_DATA entry in zm.conf, and adds a ZM_PATH_DATA/db subdirectory. src/Makefile.am no longer setuid's zmfix, as zmfix was removed from ZoneMinder 1.26.6. The code now uses clock_gettime(), which on some systems (like Linux), calls for -lrt. Since the build system isn't aware of this, but Pkgsrc is, just set PTHREAD_AUTO_VARS=yes. The PHP code now uses PDO for DB access, but it looks like there are some straggling dependencies on the raw MySQL driver, so both are pulled in.
2015-04-05 10:51:08 +02:00
+#zmconfig_DATA = \
ZoneMinder version 1.25.0: ZoneMinder is intended for use in single or multi-camera video security applications, including commercial or home CCTV, theft prevention and child, family member or home monitoring and other domestic care scenarios such as nanny cam installations. It supports capture, analysis, recording, and monitoring of video data coming from one or more video or network cameras attached to a 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 DIY 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.
2013-03-15 03:01:46 +01:00
+# zm.conf
SUBDIRS = \
src \
Update ZoneMinder from 1.25.0 to 1.28.1. Numerous changes, documented at: https://github.com/ZoneMinder/ZoneMinder/releases Addresses two security advisories: https://github.com/ZoneMinder/ZoneMinder/releases/tag/v1.28.0 http://secunia.com/advisories/62918/ Pkgsrc changes: patch-src_zm_signal_h is no longer necessary because zm_signal.h uses HAVE_EXECINFO_H. patch-src_zmf_cpp appears to be applied upstream. patch-configure_ac no longer needs to set PATH_BUILD to PREFIX/share/zoneminder, so that zmupdate.pl can locate the database build scripts as installed files. Upstream has now implemented this via the ZM_PATH_DATA entry in zm.conf, and adds a ZM_PATH_DATA/db subdirectory. src/Makefile.am no longer setuid's zmfix, as zmfix was removed from ZoneMinder 1.26.6. The code now uses clock_gettime(), which on some systems (like Linux), calls for -lrt. Since the build system isn't aware of this, but Pkgsrc is, just set PTHREAD_AUTO_VARS=yes. The PHP code now uses PDO for DB access, but it looks like there are some straggling dependencies on the raw MySQL driver, so both are pulled in.
2015-04-05 10:51:08 +02:00
@@ -20,7 +20,7 @@
ZoneMinder version 1.25.0: ZoneMinder is intended for use in single or multi-camera video security applications, including commercial or home CCTV, theft prevention and child, family member or home monitoring and other domestic care scenarios such as nanny cam installations. It supports capture, analysis, recording, and monitoring of video data coming from one or more video or network cameras attached to a 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 DIY 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.
2013-03-15 03:01:46 +01:00
zmconfgen.pl.in
# Yes, you are correct. This is a HACK!
-install-data-hook:
+pkgsrc-disabled-install-data-hook:
Update ZoneMinder from 1.25.0 to 1.28.1. Numerous changes, documented at: https://github.com/ZoneMinder/ZoneMinder/releases Addresses two security advisories: https://github.com/ZoneMinder/ZoneMinder/releases/tag/v1.28.0 http://secunia.com/advisories/62918/ Pkgsrc changes: patch-src_zm_signal_h is no longer necessary because zm_signal.h uses HAVE_EXECINFO_H. patch-src_zmf_cpp appears to be applied upstream. patch-configure_ac no longer needs to set PATH_BUILD to PREFIX/share/zoneminder, so that zmupdate.pl can locate the database build scripts as installed files. Upstream has now implemented this via the ZM_PATH_DATA entry in zm.conf, and adds a ZM_PATH_DATA/db subdirectory. src/Makefile.am no longer setuid's zmfix, as zmfix was removed from ZoneMinder 1.26.6. The code now uses clock_gettime(), which on some systems (like Linux), calls for -lrt. Since the build system isn't aware of this, but Pkgsrc is, just set PTHREAD_AUTO_VARS=yes. The PHP code now uses PDO for DB access, but it looks like there are some straggling dependencies on the raw MySQL driver, so both are pulled in.
2015-04-05 10:51:08 +02:00
( cd $(DESTDIR)$(zmconfigdir); chown $(webuser):$(webgroup) $(zmconfig_DATA); chmod 600 $(zmconfig_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_SOCKDIR); then mkdir -p $(DESTDIR)$(ZM_SOCKDIR); fi; if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_SOCKDIR); chmod u+w $(DESTDIR)$(ZM_SOCKDIR); fi )
Reference in a new issue Copy permalink