Merge branch '7.0.1'

Balasys · Sep 6, 2019 · e66f8f1 · e66f8f1
2 parents 48fb15d + 34b6321
commit e66f8f1
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 437 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,9 +4,9 @@ jobs:
     docker:
       - image: balasys/zorpgpl-circleci:7.0
     environment:
-      - PACKAGE: zorp
-      - OBS_PROJECT_URL: security:/Zorp:/7:/0:/1:/alpha2
-      - OBS_PROJECT_DIR: security:Zorp:7:0:1:alpha2/zorp
+      - PACKAGE: "zorp"
+      - OBS_PROJECT_URL: "security:/Zorp:/7:/0:/1"
+      - OBS_PROJECT_DIR: "security:Zorp:7:0:1/zorp"
     working_directory: ~/zorp
     steps:
       - checkout
@@ -16,7 +16,6 @@ jobs:
       - run: source ci/build.sh
       - run: source ci/obs_prepare.sh
       - run: source ci/obs_commit.sh
-
 workflows:
   version: 2
   build_and_test:

diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "ci"]
 	path = ci
 	url = [email protected]:Balasys/ci-scripts.git
-	branch = 7.0.1-alpha1
+	branch = 7.0
diff --git a/.travis.yml b/.travis.yml
diff --git a/README b/README
@@ -1,6 +1,5 @@
-[![Travis Build Status](https://secure.travis-ci.org/Balasys/zorp.svg?branch=6.0.11)](http://travis-ci.org/Balasys/zorp)
+[![CircleCI Build Status](https://circleci.com/gh/Balasys/zorp.svg?style=svg)](https://circleci.com/gh/Balasys/zorp)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/Balasys-zorp/badge.svg)](https://scan.coverity.com/projects/Balasys-zorp)
-[![HitCount](https://hitt.herokuapp.com/nelsonic/hits.svg)](https://github.com/8alasys/zorp/hits)
 
 This is Zorp, welcome.
 ----------------------

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.0.1~alpha2
+7.0.1
diff --git a/configure.ac b/configure.ac
@@ -21,9 +21,9 @@ dnl ***************************************************************************
 dnl Dependencies
 
 GLIB_MIN_VERSION="2.32.0"
-ZORPLL_MIN_VERSION="7.0.1.0~alpha0"
-ZORPLIC_MIN_VERSION="7.0.1.0~alpha0"
-ZORPMISC_MIN_VERSION="7.0.1.0~alpha0"
+ZORPLL_MIN_VERSION="7.0.1.0"
+ZORPLIC_MIN_VERSION="7.0.1.0"
+ZORPMISC_MIN_VERSION="7.0.1.0"
 OPENSSL_MIN_VERSION=1.1.0
 OPENSSL_MAX_VERSION=1.1.2
 PYTHON_MIN_VERSION="2.7"
@@ -209,9 +209,9 @@ PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MIN_VERSION openssl < $OPENSSL_M
         AC_MSG_ERROR(Cannot find OpenSSL library $OPENSSL_MIN_VERSION <= version < $OPENSSL_MAX_VERSION: is pkg-config in path?)
 )
 
-PKG_CHECK_MODULES(LIBPYTHON, python-2.7 >= $PYTHON_MIN_VERSION,,
+PKG_CHECK_MODULES(PYTHON, python-2.7 >= $PYTHON_MIN_VERSION,,
 	AC_MSG_ERROR(Cannot find Python library version >= $PYTHON_MIN_VERSION: is pkg-config in path?))
-PKG_CHECK_MODULES(LIBPYTHON, python-2.7 < $PYTHON_MAX_VERSION,,
+PKG_CHECK_MODULES(PYTHON, python-2.7 < $PYTHON_MAX_VERSION,,
 	AC_MSG_ERROR(Cannot find Python library version >= $PYTHON_MAX_VERSION: is pkg-config in path?))
 
 
@@ -312,8 +312,8 @@ fi
 GENERAL_CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I$top_srcdir/lib $COVERAGE_CXXFLAGS $WARNING_CXXFLAGS $DIRECTORY_CXXFLAGS"
 
 # Dependencies outside the source tree
-DEPS_CXXFLAGS="$ZORPLL_CFLAGS $ZORPLIC_CFLAGS $ZORPMISC_CFLAGS $LIBPYTHON_CFLAGS $OPENSSL_CFLAGS"
-DEPS_LIBS="$ZORPLL_LIBS $ZORPLIC_LIBS $ZORPMISC_LIBS $LIBPYTHON_LIBS $PYTHON_DEPS $COREDUMP_LIBS $OPENSSL_LIBS"
+DEPS_CXXFLAGS="$ZORPLL_CFLAGS $ZORPLIC_CFLAGS $ZORPMISC_CFLAGS $PYTHON_CFLAGS $OPENSSL_CFLAGS"
+DEPS_LIBS="$ZORPLL_LIBS $ZORPLIC_LIBS $ZORPMISC_LIBS $PYTHON_LIBS $PYTHON_DEPS $COREDUMP_LIBS $OPENSSL_LIBS"
 # zorp library libs
 LIBZORP_CXXFLAGS="$GENERAL_CXXFLAGS $DEPS_CXXFLAGS $GLIB_CXXFLAGS $GMODULE_CXXFLAGS $GTHREAD_CXXFLAGS $PYTHON_CXXFLAGS $OPENSSL_CXXFLAGS $PCAP_CXXFLAGS"
 LIBZORP_LIBS="$DEPS_LIBS $GLIB_LIBS $GMODULE_LIBS $GTHREAD_LIBS $PYTHON_LIBS $OPENSSL_LIBS $PCAP_LIBS"

diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-zorp (7.0.1~alpha2) zorp70gpl; urgency=low
+zorp (7.0.1) zorp70gpl; urgency=low
 
   * New upstream version.
 
- -- BalaSys Development Team <[email protected]>  Mon, 04 Feb 2019 20:19:30 +0100
+ -- BalaSys Development Team <[email protected]>  Wed, 06 Feb 2019 10:19:47 +0100
diff --git a/debian/control b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: BalaSys Development Team <[email protected]>
 Standards-Version: 3.9.0
-Build-Depends: libpython2.7-dev, libzorpll7.0-dev (>=7.0.1.0~alpha0), gperf, debhelper (>= 9), dh-autoreconf, python-dnspython, python-radix, autoconf, autoconf-archive, automake, libtool, libboost-test-dev, python-openssl, python-netaddr, xsltproc, docbook-xsl, dh-systemd
+Build-Depends: libpython2.7-dev, libzorpll7.0-dev (>=7.0.1.0), gperf, debhelper (>= 9), dh-autoreconf, python-dnspython, python-radix, autoconf, autoconf-archive, automake, libtool, libboost-test-dev, python-openssl, python-netaddr, xsltproc, docbook-xsl, dh-systemd
 
 Package: zorp
 Section: net

diff --git a/dist.conf b/dist.conf
@@ -1,5 +1,5 @@
 # default environment parameters
 RELEASE_TAG=${RELEASE_TAG:-zorp70gpl}
 SNAPSHOT_VERSION=${SNAPSHOT_VERSION:-}
-SOURCE_REVISION=${SOURCE_REVISION:-ssh+git://[email protected]/var/scm/git/zorp/zorp-core#HEAD_detached_at_v7.0.1-alpha2#3d4c18e465209ab57a9f82be63573b60d1bb3864}
+SOURCE_REVISION=${SOURCE_REVISION:-ssh+git://[email protected]/var/scm/git/zorp/zorp-core#HEAD_detached_at_v7.0.1#e15ef80896863b6c72428cca7cb5ef36707355c3}
 ZORP_PACKAGE_LICENSE=${ZORP_PACKAGE_LICENSE:-gpl}
diff --git a/rpm/zorp-7_0-1.spec b/rpm/zorp-7_0-1.spec
@@ -1,6 +1,6 @@
 Name:			zorp
-Version:		7.0.1~alpha2
-Release:		0.1%{?dist}
+Version:		7.0.1
+Release:		1%{?dist}
 URL:			https://balasys.github.io/zorp/
 %if 0%{?fedora}
 %else
@@ -353,6 +353,8 @@ Standalone daemon that handles zones and updates dynamic zones.
 
 
 %changelog
+* Wed Dec 5 2018 Balasys Development Team <[email protected]> - 7.0.1-1
+  - New upstream release 7.0.1
 * Wed Nov 21 2018 Balasys Development Team <[email protected]> - 7.0.1-0.2
   - New upstream release 7.0.1~alpha2
 * Thu May 17 2018 Balasys Development Team <[email protected]> - 7.0.1-0.1