From 6b54c723339c71549052038798d2e71333369ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 5 Jan 2017 13:47:22 +0100 Subject: New upstream version 1.38.1 --- CMakeLists.txt | 4 +- ChangeLog | 7 + admin/generate-gsmnet | 6 +- admin/set-version | 2 +- cmake/templates/gammu.spec.in | 2 +- contrib/CMakeLists.txt | 2 +- contrib/proxy/gammu-backend | 2 +- description-pak | 2 +- docs/config/CMakeLists.txt | 2 +- docs/man/gammu-backup.5 | 2 +- docs/man/gammu-config.1 | 2 +- docs/man/gammu-detect.1 | 2 +- docs/man/gammu-smsbackup.5 | 2 +- docs/man/gammu-smsd-dbi.7 | 2 +- docs/man/gammu-smsd-files.7 | 2 +- docs/man/gammu-smsd-inject.1 | 2 +- docs/man/gammu-smsd-monitor.1 | 2 +- docs/man/gammu-smsd-mysql.7 | 2 +- docs/man/gammu-smsd-null.7 | 2 +- docs/man/gammu-smsd-odbc.7 | 2 +- docs/man/gammu-smsd-pgsql.7 | 2 +- docs/man/gammu-smsd-run.7 | 2 +- docs/man/gammu-smsd-sql.7 | 2 +- docs/man/gammu-smsd-tables.7 | 2 +- docs/man/gammu-smsd.1 | 2 +- docs/man/gammu-smsdrc.5 | 4 +- docs/man/gammu.1 | 2 +- docs/man/gammurc.5 | 4 +- docs/man/jadmaker.1 | 2 +- docs/manual/CMakeLists.txt | 2 +- docs/manual/faq/general.rst | 29 ++ docs/sql/CMakeLists.txt | 2 +- gammu-detect/main.c | 2 +- gammu.spec | 4 +- gammu/CMakeLists.txt | 2 +- gammu/CMakeTests.txt | 6 +- gammu/gammu.c | 2 +- include/CMakeLists.txt | 2 +- installer/license.txt | 2 +- libgammu/misc/coding/coding.c | 3 + libgammu/phone/at/atgen.c | 3 + libgammu/protocol/at/at.c | 3 + libgammu/service/gsmmisc.c | 12 +- libgammu/service/gsmnet.c | 1088 ++++++++++++++++++++++++---------------- locale/CMakeLists.txt | 2 +- locale/af/docs.po | 2 +- locale/af/gammu.po | 4 +- locale/ar/docs.po | 2 +- locale/ar/gammu.po | 4 +- locale/bg/docs.po | 2 +- locale/bg/gammu.po | 4 +- locale/bn/docs.po | 2 +- locale/bn/gammu.po | 4 +- locale/ca/docs.po | 2 +- locale/ca/gammu.po | 4 +- locale/cs/docs.po | 2 +- locale/cs/gammu.po | 10 +- locale/cs/libgammu.po | 2 +- locale/da/docs.po | 2 +- locale/da/gammu.po | 4 +- locale/de/docs.po | 2 +- locale/de/gammu.po | 10 +- locale/de/libgammu.po | 2 +- locale/docs.pot | 2 +- locale/el/docs.po | 2 +- locale/el/gammu.po | 4 +- locale/en_GB/docs.po | 2 +- locale/en_GB/gammu.po | 8 +- locale/es/docs.po | 2 +- locale/es/gammu.po | 4 +- locale/et/docs.po | 2 +- locale/et/gammu.po | 50 +- locale/et/libgammu.po | 26 +- locale/fi/docs.po | 2 +- locale/fi/gammu.po | 18 +- locale/fi/libgammu.po | 26 +- locale/fr/docs.po | 2 +- locale/fr/gammu.po | 8 +- locale/gammu.pot | 10 +- locale/gl/docs.po | 2 +- locale/gl/gammu.po | 4 +- locale/he/docs.po | 2 +- locale/he/gammu.po | 4 +- locale/hu/docs.po | 2 +- locale/hu/gammu.po | 4 +- locale/id/docs.po | 2 +- locale/id/gammu.po | 8 +- locale/id/libgammu.po | 2 +- locale/it/docs.po | 2 +- locale/it/gammu.po | 6 +- locale/it/libgammu.po | 2 +- locale/ko/docs.po | 2 +- locale/ko/gammu.po | 4 +- locale/libgammu.pot | 6 +- locale/nl/docs.po | 2 +- locale/nl/gammu.po | 4 +- locale/pl/docs.po | 2 +- locale/pl/gammu.po | 6 +- locale/pl/libgammu.po | 2 +- locale/pt_BR/docs.po | 2 +- locale/pt_BR/gammu.po | 8 +- locale/ro/docs.po | 2 +- locale/ro/gammu.po | 4 +- locale/ru/docs.po | 2 +- locale/ru/gammu.po | 6 +- locale/ru/libgammu.po | 2 +- locale/sk/docs.po | 2 +- locale/sk/gammu.po | 4 +- locale/sv/docs.po | 2 +- locale/sv/gammu.po | 4 +- locale/sw/docs.po | 2 +- locale/sw/gammu.po | 4 +- locale/tr/docs.po | 2 +- locale/tr/gammu.po | 8 +- locale/uk/docs.po | 2 +- locale/uk/gammu.po | 4 +- locale/zh_CN/docs.po | 2 +- locale/zh_CN/gammu.po | 4 +- locale/zh_TW/docs.po | 2 +- locale/zh_TW/gammu.po | 4 +- smsd/CMakeTests.txt | 2 +- smsd/core.c | 2 +- smsd/core.h | 2 +- smsd/inject.c | 4 +- smsd/main.c | 4 +- smsd/monitor.c | 4 +- smsd/services/dbi.c | 2 +- smsd/services/files.c | 2 +- smsd/services/mysql.c | 2 +- smsd/services/null.c | 2 +- smsd/services/null.h | 2 +- smsd/services/odbc.c | 2 +- smsd/services/pgsql.c | 2 +- smsd/services/sql.c | 2 +- tests/at-sms-encode/193.backup | 7 + tests/at-sms-encode/193.dump | 1 + tests/gen_sms_tests.py | 2 +- tests/vcal/date-time.backup | Bin 0 -> 710 bytes tests/vcal/date-time.vcs | 10 + utils/CMakeLists.txt | 2 +- 140 files changed, 961 insertions(+), 704 deletions(-) create mode 100644 tests/at-sms-encode/193.backup create mode 100644 tests/at-sms-encode/193.dump create mode 100644 tests/vcal/date-time.backup create mode 100644 tests/vcal/date-time.vcs diff --git a/CMakeLists.txt b/CMakeLists.txt index a58f563..40e0fff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # cmake build file for Gammu -# Copyright (c) 2007 - 2016 Michal Cihar +# Copyright (c) 2007 - 2017 Michal Cihar # vim: expandtab sw=4 ts=4 sts=4: cmake_minimum_required (VERSION 3.0) @@ -28,7 +28,7 @@ if (LARGE_FILES) endif (LARGE_FILES) # Set version -set (GAMMU_VERSION "1.38.0" CACHE INTERNAL "") +set (GAMMU_VERSION "1.38.1" CACHE INTERNAL "") string (REGEX REPLACE "^([0-9]*)\\.([0-9]*)\\.([0-9]*)$" "\\1" "GAMMU_VERSION_MAJOR" "${GAMMU_VERSION}") string (REGEX REPLACE "^([0-9]*)\\.([0-9]*)\\.([0-9]*)$" "\\2" "GAMMU_VERSION_MINOR" "${GAMMU_VERSION}") string (REGEX REPLACE "^([0-9]*)\\.([0-9]*)\\.([0-9]*)$" "\\3" "GAMMU_VERSION_PATCH" "${GAMMU_VERSION}") diff --git a/ChangeLog b/ChangeLog index fe1e317..657137e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,13 @@ the issue. ChangeLog ========= +20170105 - 1.38.1 + +[-] * Fixed sending SMS to numbers starting with 000. +[-] * Fixed parsing of vcalendar files with VALUE=DATE-TIME. +[-] * Fixed compatibility with D-Link dwm-157. +[-] * Updated list of GSM countries and networks. + 20161212 - 1.38.0 [-] * MySQL script for SMSD is compatible with strict mode. diff --git a/admin/generate-gsmnet b/admin/generate-gsmnet index 30ad207..ca1ec61 100755 --- a/admin/generate-gsmnet +++ b/admin/generate-gsmnet @@ -14,7 +14,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright (c) 2015 Michal Cihar +# Copyright (c) 2015 - 2017 Michal Cihar # """Generates gsmnet databse from wikipedia""" import urllib @@ -52,8 +52,8 @@ def print_countries(data): country = None result = [] for line in data.splitlines(): - if line.startswith('==== [['): - country = line[7:].split(']')[0].split('|')[-1] + if line.startswith('=== [['): + country = line[6:].split(']')[0].split('|')[-1] current = set() continue elif 'International operators' in line: diff --git a/admin/set-version b/admin/set-version index df68e73..3388931 100755 --- a/admin/set-version +++ b/admin/set-version @@ -33,7 +33,7 @@ sed -i " if ! grep -q " - $version" ChangeLog ; then sed -i -e '/^=========$/ a\ ' -e '/^=========$/ a\ -2016???? - '"$version"' +2017???? - '"$version"' ' ChangeLog fi diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in index 8302353..be209b9 100644 --- a/cmake/templates/gammu.spec.in +++ b/cmake/templates/gammu.spec.in @@ -332,7 +332,7 @@ fi %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} if [ $1 = 0 ] ; then /sbin/service gammu-smsd stop >/dev/null 2>&1 - /sbin/chkconfig --del