Skip to content

Commit e66f8f1

Browse files
author
Szilárd Pfeiffer
committed
Merge branch '7.0.1'
2 parents 48fb15d + 34b6321 commit e66f8f1

File tree

11 files changed

+21
-437
lines changed

11 files changed

+21
-437
lines changed

‎.circleci/config.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ jobs:
44
docker:
55
- image: balasys/zorpgpl-circleci:7.0
66
environment:
7-
- PACKAGE: zorp
8-
- OBS_PROJECT_URL: security:/Zorp:/7:/0:/1:/alpha2
9-
- OBS_PROJECT_DIR: security:Zorp:7:0:1:alpha2/zorp
7+
- PACKAGE: "zorp"
8+
- OBS_PROJECT_URL: "security:/Zorp:/7:/0:/1"
9+
- OBS_PROJECT_DIR: "security:Zorp:7:0:1/zorp"
1010
working_directory: ~/zorp
1111
steps:
1212
- checkout
@@ -16,7 +16,6 @@ jobs:
1616
- run: source ci/build.sh
1717
- run: source ci/obs_prepare.sh
1818
- run: source ci/obs_commit.sh
19-
2019
workflows:
2120
version: 2
2221
build_and_test:

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "ci"]
22
path = ci
33
url = [email protected]:Balasys/ci-scripts.git
4-
branch = 7.0.1-alpha1
4+
branch = 7.0

‎.travis.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎README

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
[![Travis Build Status](https://secure.travis-ci.org/Balasys/zorp.svg?branch=6.0.11)](http://travis-ci.org/Balasys/zorp)
1+
[![CircleCI Build Status](https://circleci.com/gh/Balasys/zorp.svg?style=svg)](https://circleci.com/gh/Balasys/zorp)
22
[![Coverity Scan Build Status](https://scan.coverity.com/projects/Balasys-zorp/badge.svg)](https://scan.coverity.com/projects/Balasys-zorp)
3-
[![HitCount](https://hitt.herokuapp.com/nelsonic/hits.svg)](https://github.com/8alasys/zorp/hits)
43

54
This is Zorp, welcome.
65
----------------------

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.0.1~alpha2
1+
7.0.1

‎configure.ac

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ dnl ***************************************************************************
2121
dnl Dependencies
2222

2323
GLIB_MIN_VERSION="2.32.0"
24-
ZORPLL_MIN_VERSION="7.0.1.0~alpha0"
25-
ZORPLIC_MIN_VERSION="7.0.1.0~alpha0"
26-
ZORPMISC_MIN_VERSION="7.0.1.0~alpha0"
24+
ZORPLL_MIN_VERSION="7.0.1.0"
25+
ZORPLIC_MIN_VERSION="7.0.1.0"
26+
ZORPMISC_MIN_VERSION="7.0.1.0"
2727
OPENSSL_MIN_VERSION=1.1.0
2828
OPENSSL_MAX_VERSION=1.1.2
2929
PYTHON_MIN_VERSION="2.7"
@@ -209,9 +209,9 @@ PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MIN_VERSION openssl < $OPENSSL_M
209209
AC_MSG_ERROR(Cannot find OpenSSL library $OPENSSL_MIN_VERSION <= version < $OPENSSL_MAX_VERSION: is pkg-config in path?)
210210
)
211211

212-
PKG_CHECK_MODULES(LIBPYTHON, python-2.7 >= $PYTHON_MIN_VERSION,,
212+
PKG_CHECK_MODULES(PYTHON, python-2.7 >= $PYTHON_MIN_VERSION,,
213213
AC_MSG_ERROR(Cannot find Python library version >= $PYTHON_MIN_VERSION: is pkg-config in path?))
214-
PKG_CHECK_MODULES(LIBPYTHON, python-2.7 < $PYTHON_MAX_VERSION,,
214+
PKG_CHECK_MODULES(PYTHON, python-2.7 < $PYTHON_MAX_VERSION,,
215215
AC_MSG_ERROR(Cannot find Python library version >= $PYTHON_MAX_VERSION: is pkg-config in path?))
216216

217217

@@ -312,8 +312,8 @@ fi
312312
GENERAL_CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I$top_srcdir/lib $COVERAGE_CXXFLAGS $WARNING_CXXFLAGS $DIRECTORY_CXXFLAGS"
313313

314314
# Dependencies outside the source tree
315-
DEPS_CXXFLAGS="$ZORPLL_CFLAGS $ZORPLIC_CFLAGS $ZORPMISC_CFLAGS $LIBPYTHON_CFLAGS $OPENSSL_CFLAGS"
316-
DEPS_LIBS="$ZORPLL_LIBS $ZORPLIC_LIBS $ZORPMISC_LIBS $LIBPYTHON_LIBS $PYTHON_DEPS $COREDUMP_LIBS $OPENSSL_LIBS"
315+
DEPS_CXXFLAGS="$ZORPLL_CFLAGS $ZORPLIC_CFLAGS $ZORPMISC_CFLAGS $PYTHON_CFLAGS $OPENSSL_CFLAGS"
316+
DEPS_LIBS="$ZORPLL_LIBS $ZORPLIC_LIBS $ZORPMISC_LIBS $PYTHON_LIBS $PYTHON_DEPS $COREDUMP_LIBS $OPENSSL_LIBS"
317317
# zorp library libs
318318
LIBZORP_CXXFLAGS="$GENERAL_CXXFLAGS $DEPS_CXXFLAGS $GLIB_CXXFLAGS $GMODULE_CXXFLAGS $GTHREAD_CXXFLAGS $PYTHON_CXXFLAGS $OPENSSL_CXXFLAGS $PCAP_CXXFLAGS"
319319
LIBZORP_LIBS="$DEPS_LIBS $GLIB_LIBS $GMODULE_LIBS $GTHREAD_LIBS $PYTHON_LIBS $OPENSSL_LIBS $PCAP_LIBS"

‎debian/changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
zorp (7.0.1~alpha2) zorp70gpl; urgency=low
1+
zorp (7.0.1) zorp70gpl; urgency=low
22

33
* New upstream version.
44

5-
-- BalaSys Development Team <[email protected]> Mon, 04 Feb 2019 20:19:30 +0100
5+
-- BalaSys Development Team <[email protected]> Wed, 06 Feb 2019 10:19:47 +0100

‎debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Section: net
33
Priority: optional
44
Maintainer: BalaSys Development Team <[email protected]>
55
Standards-Version: 3.9.0
6-
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
6+
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
77

88
Package: zorp
99
Section: net

‎dist.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# default environment parameters
22
RELEASE_TAG=${RELEASE_TAG:-zorp70gpl}
33
SNAPSHOT_VERSION=${SNAPSHOT_VERSION:-}
4-
SOURCE_REVISION=${SOURCE_REVISION:-ssh+git://[email protected]/var/scm/git/zorp/zorp-core#HEAD_detached_at_v7.0.1-alpha2#3d4c18e465209ab57a9f82be63573b60d1bb3864}
4+
SOURCE_REVISION=${SOURCE_REVISION:-ssh+git://[email protected]/var/scm/git/zorp/zorp-core#HEAD_detached_at_v7.0.1#e15ef80896863b6c72428cca7cb5ef36707355c3}
55
ZORP_PACKAGE_LICENSE=${ZORP_PACKAGE_LICENSE:-gpl}

‎rpm/zorp-7_0-1.spec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: zorp
2-
Version: 7.0.1~alpha2
3-
Release: 0.1%{?dist}
2+
Version: 7.0.1
3+
Release: 1%{?dist}
44
URL: https://balasys.github.io/zorp/
55
%if 0%{?fedora}
66
%else
@@ -353,6 +353,8 @@ Standalone daemon that handles zones and updates dynamic zones.
353353

354354

355355
%changelog
356+
* Wed Dec 5 2018 Balasys Development Team <[email protected]> - 7.0.1-1
357+
- New upstream release 7.0.1
356358
* Wed Nov 21 2018 Balasys Development Team <[email protected]> - 7.0.1-0.2
357359
- New upstream release 7.0.1~alpha2
358360
* Thu May 17 2018 Balasys Development Team <[email protected]> - 7.0.1-0.1

0 commit comments

Comments
 (0)