[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#685882: marked as done (unblock: zoneminder/1.25.0-3)

Your message dated Wed, 29 Aug 2012 14:21:19 +0200
with message-id <20120829122119.GS5484@radis.cristau.org>
and subject line Re: Bug#685882: unblock: zoneminder/1.25.0-3
has caused the Debian Bug report #685882,
regarding unblock: zoneminder/1.25.0-3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
685882: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685882
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package zoneminder

Zoneminder was removed from testing due to mootools briefly being removed from 
testing (Bug #682265).

Zoneminder 1.25.0-1.1 was unblocked, but didn't enter wheezy due to a release
critical bug that prevented upgrades from squeeze due to changes to the
database layout (Bug #657407), which has been fixed in zoneminder 1.25.0-2.

Zoneminder 1.25.0-2 also makes progress towards a release goal of enabling
hardening build flags, and defaults to disabling zoneminder's self-updating
features, as it will only break a packaged zoneminder install.

The debdiff for zoneminder 1.25.0-1.1 to 1.25.0-2 is attached (since that's the
version that *was* in testing).

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 <vagrant@debian.org>  Thu, 23 Aug 2012 12:40:34 -0700

Thanks for considering this request!

unblock zoneminder/1.25.0-2

live well,
  vagrant

diff -Nru zoneminder-1.25.0/debian/changelog zoneminder-1.25.0/debian/changelog
--- zoneminder-1.25.0/debian/changelog	2012-05-13 08:03:32.000000000 -0700
+++ zoneminder-1.25.0/debian/changelog	2012-08-23 13:28:46.000000000 -0700
@@ -1,3 +1,17 @@
+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 <vagrant@debian.org>  Thu, 23 Aug 2012 12:40:34 -0700
+
 zoneminder (1.25.0-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru zoneminder-1.25.0/debian/patches/do_not_check_for_updates_by_default zoneminder-1.25.0/debian/patches/do_not_check_for_updates_by_default
--- zoneminder-1.25.0/debian/patches/do_not_check_for_updates_by_default	1969-12-31 16:00:00.000000000 -0800
+++ zoneminder-1.25.0/debian/patches/do_not_check_for_updates_by_default	2012-08-23 12:36:21.000000000 -0700
@@ -0,0 +1,17 @@
+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},
diff -Nru zoneminder-1.25.0/debian/patches/series zoneminder-1.25.0/debian/patches/series
--- zoneminder-1.25.0/debian/patches/series	2012-05-13 07:59:11.000000000 -0700
+++ zoneminder-1.25.0/debian/patches/series	2012-08-23 12:36:42.000000000 -0700
@@ -10,3 +10,4 @@
 zm-ffmpeg-as-c-library
 include-avutil-mathematics-header
 Fix-FTBFS-with-gcc-4.7
+do_not_check_for_updates_by_default
diff -Nru zoneminder-1.25.0/debian/postinst zoneminder-1.25.0/debian/postinst
--- zoneminder-1.25.0/debian/postinst	2011-12-12 14:48:18.000000000 -0800
+++ zoneminder-1.25.0/debian/postinst	2012-08-23 12:35:44.000000000 -0700
@@ -26,7 +26,7 @@
 				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, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+				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 
@@ -41,4 +41,10 @@
 			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#
diff -Nru zoneminder-1.25.0/debian/rules zoneminder-1.25.0/debian/rules
--- zoneminder-1.25.0/debian/rules	2011-12-12 14:48:18.000000000 -0800
+++ zoneminder-1.25.0/debian/rules	2012-08-23 13:27:54.000000000 -0700
@@ -17,21 +17,18 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
-CPPFLAGS = -D__STDC_CONSTANT_MACROS
-CXXFLAGS = -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
+CFLAGS += -Wall -g
+CPPFLAGS += -D__STDC_CONSTANT_MACROS
+CXXFLAGS += -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO
 
 %:
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./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
+	./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

--- End Message ---
--- Begin Message --- 
On Tue, Aug 28, 2012 at 12:45:15 -0700, Vagrant Cascadian wrote:

> Updated debian/rules to export the various *FLAGS variables, and added LDFLAGS,
> to catch all the cases lintian complains about regarding hardening build flags.
> 
> Uploaded zoneminder 1.25.0-3, new debdiff (against 1.25.0-1.1) attached...
> 
Unblocked, thanks.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: