diff --git a/utils/packpack/autosetup.patch b/utils/packpack/autosetup.patch deleted file mode 100644 index 3955e975e..000000000 --- a/utils/packpack/autosetup.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/packpack/pack/rpm.mk 2017-01-14 14:01:50.364217882 -0600 -+++ b/packpack/pack/rpm.mk 2017-01-14 14:01:19.594985311 -0600 -@@ -23,11 +23,13 @@ - -e 's/Release:\([ ]*\).*/Release: $(RELEASE)%{dist}/' \ - -e 's/Source0:\([ ]*\).*/Source0: $(TARBALL)/' \ - -e 's/%setup .*/%setup -q -n $(PRODUCT)-$(VERSION)/' \ -+ -e 's/%autosetup -n .*/%autosetup -n $(PRODUCT)-$(VERSION)/' \ - -i $@.tmp - grep -F "Version: $(VERSION)" $@.tmp && \ - grep -F "Release: $(RELEASE)" $@.tmp && \ - grep -F "Source0: $(TARBALL)" $@.tmp && \ -- grep -F "%setup -q -n $(PRODUCT)-$(VERSION)" $@.tmp || \ -+ (grep -F "%setup -q -n $(PRODUCT)-$(VERSION)" $@.tmp || \ -+ grep -F "%autosetup" $@.tmp) || \ - (echo "Failed to patch RPM spec" && exit 1) - @ mv -f $@.tmp $@ - @echo diff --git a/utils/packpack/deb.mk.patch b/utils/packpack/deb.mk.patch deleted file mode 100644 index 0cf0100f2..000000000 --- a/utils/packpack/deb.mk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/packpack/pack/deb.mk 2017-01-15 16:41:32.938418279 -0600 -+++ b/packpack/pack/deb.mk 2017-02-16 15:44:43.267900717 -0600 -@@ -14,7 +14,7 @@ - DPKG_BUILD:=$(PRODUCT)_$(DEB_VERSION)-$(RELEASE)_$(DPKG_ARCH).build - DPKG_DSC:=$(PRODUCT)_$(DEB_VERSION)-$(RELEASE).dsc - DPKG_ORIG_TARBALL:=$(PRODUCT)_$(DEB_VERSION).orig.tar.$(TARBALL_COMPRESSOR) --DPKG_DEBIAN_TARBALL:=$(PRODUCT)_$(DEB_VERSION)-$(RELEASE).debian.tar.$(TARBALL_COMPRESSOR) -+DPKG_DEBIAN_TARBALL:=$(PRODUCT)_$(DEB_VERSION)-$(RELEASE).tar.$(TARBALL_COMPRESSOR) - - # gh-7: Ubuntu/Debian should export DEBIAN_FRONTEND=noninteractive - export DEBIAN_FRONTEND=noninteractive diff --git a/utils/packpack/fixautosetup.patch b/utils/packpack/fixautosetup.patch deleted file mode 100644 index c9f1da3b4..000000000 --- a/utils/packpack/fixautosetup.patch +++ /dev/null @@ -1,22 +0,0 @@ -From fed25ab3e7609478d80b4d49916c6b22def1588c Mon Sep 17 00:00:00 2001 -From: Andy Bauer -Date: Mon, 27 Feb 2017 20:31:21 -0600 -Subject: [PATCH] config sed to replace only the first occurance of %autosetup - ---- - pack/rpm.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pack/rpm.mk b/pack/rpm.mk -index 7ead710..a17a9b9 100644 ---- a/packpack/pack/rpm.mk -+++ b/packpack/pack/rpm.mk -@@ -24,7 +24,7 @@ $(BUILDDIR)/$(RPMSPEC): $(RPMSPECIN) - -e 's/Release:\([ ]*\).*/Release: $(RELEASE)%{dist}/' \ - -e 's/Source0:\([ ]*\).*/Source0: $(TARBALL)/' \ - -e 's/%setup.*/%setup -q -n $(PRODUCT)-$(VERSION)/' \ -- -e 's/%autosetup.*/%autosetup -n $(PRODUCT)-$(VERSION)/' \ -+ -e '0,/%autosetup.*/ s/%autosetup.*/%autosetup -n $(PRODUCT)-$(VERSION)/' \ - -i $@.tmp - grep -F "Version: $(VERSION)" $@.tmp && \ - grep -F "Release: $(RELEASE)" $@.tmp && \ diff --git a/utils/packpack/fixdebperms.patch b/utils/packpack/fixdebperms.patch deleted file mode 100644 index d2609d8ee..000000000 --- a/utils/packpack/fixdebperms.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/distros/ubuntu1204/rules 2017-03-05 11:46:18.707725975 -0600 -+++ b/distros/ubuntu1204/rules 2017-03-05 12:33:30.639678284 -0600 -@@ -58,8 +58,10 @@ - - override_dh_fixperms: - dh_fixperms -- ## 637685 -- chmod -c o-r $(CURDIR)/debian/zoneminder/etc/zm/zm.conf -+ # -+ # As requested by the Debian Webapps Policy Manual §3.2.1 -+ chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf -+ chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf - - override_dh_installinit: - dh_installinit --no-start ---- a/distros/ubuntu1604/rules 2017-03-05 11:46:18.707725975 -0600 -+++ b/distros/ubuntu1604/rules 2017-03-05 12:35:43.960426310 -0600 -@@ -58,8 +58,10 @@ - - override_dh_fixperms: - dh_fixperms -- ## 637685 -- chmod -c o-r $(CURDIR)/debian/zoneminder/etc/zm/zm.conf -+ # -+ # As requested by the Debian Webapps Policy Manual §3.2.1 -+ chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf -+ chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf - - override_dh_installinit: - dh_installinit --no-start diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index 4e8389411..a951c5644 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -12,7 +12,7 @@ set -ev # General sanity checks checksanity () { # 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 + for CMD in set echo curl repoquery git ln mkdir rmdir; do type $CMD 2>&1 > /dev/null if [ $? -ne 0 ]; then @@ -111,12 +111,6 @@ if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${TRAVIS}" != "true" ]; then if [ "${OS}" == "el" ] || [ "${OS}" == "fedora" ]; then echo "Begin Redhat build..." - # fix %autosetup support - fixed upstream - #patch --dry-run --silent -f -p1 < utils/packpack/fixautosetup.patch 2>/dev/null - #if [ $? -eq 0 ]; then - # patch -p1 < utils/packpack/fixautosetup.patch - #fi - ln -sf distros/redhat rpm # The rpm specfile requires the Crud submodule folder to be empty @@ -148,10 +142,6 @@ if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${TRAVIS}" != "true" ]; then # Steps common to Debian based distros elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ]; then echo "Begin Debian build..." - - # patch debian build scripts to apply correct permissions to zm.conf - patch --silent -f -p1 < utils/packpack/fixdebperms.patch 2>&1 > /dev/null - movecrud if [ "${DIST}" == "trusty" ] || [ "${DIST}" == "precise" ]; then @@ -173,10 +163,6 @@ if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${TRAVIS}" != "true" ]; then # We were not triggered via cron so just build and test trusty elif [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "trusty" ]; then echo "Begin Ubuntu Trusty build..." - - # patch debian build scripts to apply correct permissions to zm.conf - patch --silent -f -p1 < utils/packpack/fixdebperms.patch 2>&1 > /dev/null - commonprep movecrud @@ -190,7 +176,3 @@ elif [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "trusty" ]; then installtrusty fi fi - -exit 0 - -