Commit 09327c92 authored by Thorsten Alteholz's avatar Thorsten Alteholz

Import Debian changes 1.12.0-2

libsmpp34 (1.12.0-2) unstable; urgency=medium

  * move to unstable
  * debian/control: move to debian-mobcom maintainer
  * debian/control: add salsa URLs
  * debian/control: use dh11
  * debian/control: bump standard to 4.1.4 (no changes)
  * debian/rules: set DH_BUILD_MAINT_OPTIONS instead of DH_BUILD_OPTIONS
parent 72197881
libsmpp34 (1.12.0-2) unstable; urgency=medium
* move to unstable
* debian/control: move to debian-mobcom maintainer
* debian/control: add salsa URLs
* debian/control: use dh11
* debian/control: bump standard to 4.1.4 (no changes)
* debian/rules: set DH_BUILD_MAINT_OPTIONS instead of DH_BUILD_OPTIONS
-- Thorsten Alteholz <debian@alteholz.de> Mon, 09 Apr 2018 19:47:14 +0100
libsmpp34 (1.12.0-1) experimental; urgency=medium
* New upstream release (use osmocom fork now)
......
......@@ -4,12 +4,12 @@ Uploaders: Ruben Undheim <ruben.undheim@gmail.com>
, Thorsten Alteholz <debian@alteholz.de>
Section: libs
Priority: optional
Build-Depends: debhelper (>= 10),
Build-Depends: debhelper (>= 11),
, libxml2-dev
, pkg-config
Standards-Version: 4.1.2
Vcs-Browser: https://anonscm.debian.org/cgit/debian-mobcom/libsmpp34.git
Vcs-Git: https://anonscm.debian.org/git/debian-mobcom/libsmpp34.git
Standards-Version: 4.1.4
Vcs-Browser: https://salsa.debian.org/debian-mobcom-team/libsmpp34.git
Vcs-Git: https://salsa.debian.org/debian-mobcom-team/libsmpp34.git
Homepage: http://c-open-smpp-34.sourceforge.net/
Package: libsmpp34-0
......
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libsmpp34
Source: http://c-open-smpp-34.sourceforge.net/
......
Description: Just fixing a typo in some text output to prevent a lintian.
Author: Ruben Undheim <ruben.undheim@gmail.com>
--- libsmpp34-1.10.orig/src/smpp34_dumpPdu.c
+++ libsmpp34-1.10/src/smpp34_dumpPdu.c
@@ -70,7 +70,7 @@ smpp34_dumpPdu(uint32_t type, uint8_t *d
#par,inst par,dummy_b);\
if( lenval >= left ){\
PUTLOG("[%s:%08X(%s)]", par, inst par,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
snprintf((char*)dest, left, "%s", l_dest);\
@@ -88,7 +88,7 @@ smpp34_dumpPdu(uint32_t type, uint8_t *d
"%-30s[%04X] [%s]\n",#par,inst par,dummy_b);\
if( lenval >= left ){\
PUTLOG("[%s:%04X(%s)]", par, inst par,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
snprintf((char*)dest, left, "%s", l_dest);\
@@ -106,7 +106,7 @@ smpp34_dumpPdu(uint32_t type, uint8_t *d
#par,inst par, dummy_b);\
if( lenval >= left ){\
PUTLOG("[%s:%02X(%s)]", par, inst par,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
snprintf((char*)dest, left, "%s", l_dest);\
@@ -118,7 +118,7 @@ smpp34_dumpPdu(uint32_t type, uint8_t *d
#par, inst par);\
if( lenval >= left ){\
PUTLOG("[%s:%s(%s)]", par, inst par, \
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
PUTLOG("[%s:%s(%s)]", par, inst par, "OK");\
@@ -145,7 +145,7 @@ smpp34_dumpPdu(uint32_t type, uint8_t *d
lenval = *((inst par) - 1);\
if( (lenval + 33) >= left ){\
PUTLOG("[%s:%s(%s)]", par, inst par, \
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
PUTLOG("[%s:%s(%s)]", par, "<bin>", "OK");\
@@ -172,7 +172,7 @@ smpp34_dumpPdu(uint32_t type, uint8_t *d
memcpy(&l_lenval, ((inst par) - sizeof(uint16_t)), sizeof(uint16_t));\
if( (l_lenval + 33) >= left ){\
PUTLOG("[%s:%s(%s)]", par, inst par, \
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
PUTLOG("[%s:%s(%s)]", par, "<bin>", "OK");\
--- libsmpp34-1.10.orig/src/smpp34_pack.c
+++ libsmpp34-1.10/src/smpp34_pack.c
@@ -65,7 +65,7 @@ smpp34_pack(uint32_t type, uint8_t *ptrB
lenval = sizeof(uint32_t);\
if( lenval >= left ){\
PUTLOG("[%s:%08X(%s)]", par, inst par,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
_str(inst par,dummy_b);\
@@ -83,7 +83,7 @@ smpp34_pack(uint32_t type, uint8_t *ptrB
lenval = sizeof(uint16_t);\
if( lenval >= left ){\
PUTLOG("[%s:%04X(%s)]", par, inst par,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
_str(inst par,dummy_b);\
@@ -100,7 +100,7 @@ smpp34_pack(uint32_t type, uint8_t *ptrB
lenval = sizeof(uint8_t);\
if( lenval >= left ){\
PUTLOG("[%s:%02X(%s)]", par, inst par,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
_str(inst par,dummy_b);\
@@ -125,7 +125,7 @@ smpp34_pack(uint32_t type, uint8_t *ptrB
lenval = strlen((char*)inst par) + 1;\
if( lenval > left ){\
PUTLOG("[len(%s):%d(%s)]", par, lenval, \
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
if( lenval > sizeval ){\
@@ -145,7 +145,7 @@ smpp34_pack(uint32_t type, uint8_t *ptrB
lenval = *((inst par) - 1);\
if( lenval >= left ){\
PUTLOG("[leng %s:%d(%s)]", par, lenval,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
if( lenval >= sizeval ){\
@@ -164,7 +164,7 @@ smpp34_pack(uint32_t type, uint8_t *ptrB
memcpy(&l_lenval, ((inst par) - sizeof(uint16_t)), sizeof(uint16_t));\
if( l_lenval >= left ){\
PUTLOG("[leng %s:%d(%s)]", par, l_lenval,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
if( l_lenval > sizeval ){\
--- libsmpp34-1.10.orig/src/smpp34_unpack.c
+++ libsmpp34-1.10/src/smpp34_unpack.c
@@ -62,7 +62,7 @@ smpp34_unpack(uint32_t type, void* tt, u
lenval = sizeof( uint32_t );\
if( lenval > left ){\
PUTLOG("[%s:%08X(%s)]", par, inst par,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
memcpy(&inst par, aux, lenval);\
@@ -80,7 +80,7 @@ smpp34_unpack(uint32_t type, void* tt, u
lenval = sizeof( uint16_t );\
if( lenval > left ){\
PUTLOG("[%s:%04X(%s)]", par, inst par,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
}\
memcpy(&inst par, aux, lenval);\
@@ -98,7 +98,7 @@ smpp34_unpack(uint32_t type, void* tt, u
lenval = sizeof( uint8_t );\
if( lenval > left ){\
PUTLOG("[%s:%02X(%s)]", par, inst par,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
memcpy(&inst par, aux, lenval);\
@@ -131,7 +131,7 @@ smpp34_unpack(uint32_t type, void* tt, u
lenval = strlen( (char*) aux ) + 1;\
if( lenval > left ){\
PUTLOG("[len(%s):%d(%s)]", par, lenval, \
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
if( lenval > size ){\
@@ -149,7 +149,7 @@ smpp34_unpack(uint32_t type, void* tt, u
lenval = *((inst par) - 1);\
if( lenval > left ){\
PUTLOG("[leng %s:%d(%s)]", par, lenval,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
if( lenval > size ){\
@@ -167,7 +167,7 @@ smpp34_unpack(uint32_t type, void* tt, u
memcpy(&l_lenval, (inst par - sizeof(uint16_t)), sizeof(uint16_t));\
if( l_lenval > left ){\
PUTLOG("[leng %s:%d(%s)]", par, l_lenval,\
- "Value lenght exceed buffer lenght");\
+ "Value length exceed buffer length");\
return( -1 );\
};\
if( l_lenval > size ){\
--- libsmpp34-1.10.orig/test_apps/recv_and_unpack.inc
+++ libsmpp34-1.10/test_apps/recv_and_unpack.inc
@@ -3,7 +3,7 @@
/* Read from socket (This is a sample, must be more complex) **********/
ret = recv(sock_tcp, local_buffer, 4, MSG_PEEK);
if( ret != 4 ){ printf("Error in recv(PEEK)\n");return( -1 );};
- memcpy(&tempo, local_buffer, sizeof(uint32_t)); /* get lenght PDU */
+ memcpy(&tempo, local_buffer, sizeof(uint32_t)); /* get length PDU */
local_buffer_len = ntohl( tempo );
ret = recv(sock_tcp, local_buffer, local_buffer_len, 0);
if( ret != local_buffer_len ){
......@@ -5,7 +5,7 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_BUILD_OPTIONS = parallel=1
#export DEB_BUILD_OPTIONS = parallel=1
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
......@@ -15,7 +15,7 @@ VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m
%:
dh $@ --with autoreconf
dh $@ --no-parallel --with autoreconf
## Note! Workaround for the binary-dir present in the source dir -->
.PHONY: binary
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment