summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog32
-rw-r--r--debian/compat2
-rw-r--r--debian/control42
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/libsmpp34-0.docs0
-rw-r--r--debian/libsmpp34-0.install (renamed from debian/libsmpp0.install)0
-rw-r--r--debian/libsmpp34-0.symbols29
-rw-r--r--debian/libsmpp34-dev.install2
-rw-r--r--debian/libsmpp34.pc.in11
-rw-r--r--debian/patches/fixed_typo.patch182
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules45
-rw-r--r--debian/source/format2
-rw-r--r--debian/watch2
14 files changed, 292 insertions, 60 deletions
diff --git a/debian/changelog b/debian/changelog
index c0c3948..bd5dfc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,24 @@
-libsmpp34 (1.12) UNRELEASED; urgency=medium
+libsmpp34 (1.12.0-1) experimental; urgency=medium
- [ Holger Hans Peter Freyther ]
- * Move forward towards a new release.
+ * New upstream release (use osmocom fork now)
- [ Harald Welte ]
- * it's been four years with various cleanups
- * SMPP_DELIVERY_RECEIPT_* constants
- * SMPP ESM class parameter definitions
- * smpp34_tlv_for_each() helper macro
+ -- Thorsten Alteholz <debian@alteholz.de> Sat, 09 Dec 2017 17:14:27 +0100
- -- Harald Welte <laforge@nataraja.de.gnumonks.org> Mon, 14 Aug 2017 19:08:37 +0200
+libsmpp34 (1.10-2) unstable; urgency=low
-libsmpp34 (1.10z1) stable; urgency=low
+ * debian/control: add myself to uploaders
+ * debian/control: move package to debian-mobcom and change URLs
+ * debian/control: change maintainer to debian-mobcom-maintainers
+ * debian/control: use dh10
+ * debian/control: bump standard to 4.1.2 (no changes)
+ * debian/control: remove redundant dependency of dh-autoreconf
+ * debian/control: add pkg-config dependency
+ * debian/rules: don't allow parallel builds
- * Add depedency from libsmpp34-dev to the main library
+ -- Thorsten Alteholz <debian@alteholz.de> Fri, 08 Dec 2017 18:49:29 +0100
- -- Holger Hans Peter Freyther <holger@freyther.de> Tue, 24 Sep 2013 13:33:45 +0200
+libsmpp34 (1.10-1) unstable; urgency=low
-libsmpp34 (1.10) stable; urgency=low
+ * Initial release (Closes: #813295)
- * Initial release.
-
- -- Holger Hans Peter Freyther <holger@freyther.de> Sun, 22 Sep 2013 14:34:19 +0200
+ -- Ruben Undheim <ruben.undheim@gmail.com> Fri, 05 Feb 2016 12:45:23 +0100
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index e612a4f..14d7ca6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,18 @@
Source: libsmpp34
-Maintainer: Holger Freyther <holger@moiji-mobile.com>
+Maintainer: Debian Mobcom Maintainers <Debian-mobcom-maintainers@lists.alioth.debian.org>
+Uploaders: Ruben Undheim <ruben.undheim@gmail.com>
+ , Thorsten Alteholz <debian@alteholz.de>
Section: libs
Priority: optional
-Build-Depends: debhelper (>= 9),
- autotools-dev,
- autoconf,
- automake,
- libtool,
- dh-autoreconf,
- libdpkg-perl,
- git,
- pkg-config,
- libxml2-dev
-Standards-Version: 3.9.6
-Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmocore.git;a=summary
-Vcs-Git: git://git.osmocom.org/libosmocore.git
-Homepage: https://projects.osmocom.org/projects/libsmpp34
+Build-Depends: debhelper (>= 10),
+ , 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
+Homepage: http://c-open-smpp-34.sourceforge.net/
-Package: libsmpp0
-Section: libs
+Package: libsmpp34-0
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends},
@@ -35,7 +29,7 @@ Package: libsmpp34-dev
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libsmpp0 (= ${binary:Version}),
+Depends: libsmpp34-0 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libsmpp34
This library is an implementation for providing the PDU handling of the
@@ -45,15 +39,3 @@ Description: Development files for libsmpp34
Messaging Entities, Routing Entitites and Message Centres.
.
This package contains the development files for the library.
-
-Package: libsmpp34-utils
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Utilities for SMPP
-
-Package: libsmpp34-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: libsmpp0 (= ${binary:Version}), ${misc:Depends}
-Description: Debug symbols for libsmpp34
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/libsmpp34-0.docs b/debian/libsmpp34-0.docs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/debian/libsmpp34-0.docs
diff --git a/debian/libsmpp0.install b/debian/libsmpp34-0.install
index 3ddde58..3ddde58 100644
--- a/debian/libsmpp0.install
+++ b/debian/libsmpp34-0.install
diff --git a/debian/libsmpp34-0.symbols b/debian/libsmpp34-0.symbols
new file mode 100644
index 0000000..f52b4fd
--- /dev/null
+++ b/debian/libsmpp34-0.symbols
@@ -0,0 +1,29 @@
+libsmpp34.so.0 libsmpp34-0 #MINVER#
+ build_dad@Base 1.10
+ build_tlv@Base 1.10
+ build_udad@Base 1.10
+ destroy_dad@Base 1.10
+ destroy_tlv@Base 1.10
+ destroy_udad@Base 1.10
+ nothing@Base 1.10
+ ptrerror@Base 1.10
+ smpp34_dumpBuf@Base 1.10
+ smpp34_dumpPdu2@Base 1.10
+ smpp34_dumpPdu@Base 1.10
+ smpp34_errno@Base 1.10
+ smpp34_pack2@Base 1.10
+ smpp34_pack@Base 1.10
+ smpp34_strerror@Base 1.10
+ smpp34_unpack2@Base 1.10
+ smpp34_unpack@Base 1.10
+ str_addr_npi@Base 1.10
+ str_addr_ton@Base 1.10
+ str_command_id@Base 1.10
+ str_command_status@Base 1.10
+ str_tlv_id@Base 1.10
+ test_dest_flag@Base 1.10
+ test_interface_version@Base 1.10
+ test_sequence_number@Base 1.10
+ valueDec_08@Base 1.10
+ valueDec_16@Base 1.10
+ valueDec_32@Base 1.10
diff --git a/debian/libsmpp34-dev.install b/debian/libsmpp34-dev.install
index 91180f6..7df81cd 100644
--- a/debian/libsmpp34-dev.install
+++ b/debian/libsmpp34-dev.install
@@ -1,5 +1,3 @@
usr/include/*
usr/lib/*/lib*.so
-usr/lib/*/*.a
-usr/lib/*/lib*.la
usr/lib/*/pkgconfig/*
diff --git a/debian/libsmpp34.pc.in b/debian/libsmpp34.pc.in
new file mode 100644
index 0000000..d6401b7
--- /dev/null
+++ b/debian/libsmpp34.pc.in
@@ -0,0 +1,11 @@
+prefix=$PREFIX
+exec_prefix=${prefix}/bin
+libdir=$LIBDIR
+includedir=${prefix}/include/libsmpp34
+
+Name: libsmpp34
+Description: Open PDU SMPP packaging and unpackaging tool
+Version: $VERSION
+Requires:
+Libs: -lsmpp34
+Cflags: -I${includedir}
diff --git a/debian/patches/fixed_typo.patch b/debian/patches/fixed_typo.patch
new file mode 100644
index 0000000..38b3692
--- /dev/null
+++ b/debian/patches/fixed_typo.patch
@@ -0,0 +1,182 @@
+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 ){
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c16c64e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+#applied upstream: fixed_typo.patch
diff --git a/debian/rules b/debian/rules
index bedd9e0..3809c96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,44 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_OPTIONS = parallel=1
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+PKD = $(abspath $(dir $(MAKEFILE_LIST)))
+PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
-DEBIAN := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
-DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1)
-VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
%:
- dh $@ --with autoreconf --fail-missing
+ dh $@ --with autoreconf
+
+## Note! Workaround for the binary-dir present in the source dir -->
+.PHONY: binary
+binary:
+ dh $@
+## <--
+
+override_dh_auto_configure:
+ dh_auto_configure -- --includedir=/usr/include/libsmpp34
+ cat debian/libsmpp34.pc.in | sed 's/$$VERSION/${VER}/' | sed 's/$$PREFIX/\/usr/' \
+ | sed 's#$$LIBDIR#/usr/lib/$(DEB_HOST_MULTIARCH)#' > debian/libsmpp34.pc
+
+override_dh_auto_install:
+ dh_auto_install
+ install -D -m 644 debian/libsmpp34.pc debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libsmpp34.pc
+
+
+override_dh_clean:
+ dh_clean
+ rm -f debian/libsmpp34.pc
+
-override_dh_strip:
- dh_strip --dbg-package=libsmpp34-dbg
+get-orig-source: $(info I: $(PKG)_$(VER))
+ @echo "# Downloading..."
+ uscan --noconf --verbose --rename --destdir=$(CURDIR) --force-download --download-version $(VER) $(PKD)
-override_dh_autoreconf:
- echo $(VERSION) > .tarball-version
- dh_autoreconf
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..eb7986d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=4
+opts="mode=git, dversionmangle=s/\+ds//" https://git.osmocom.org/libsmpp34 refs/tags/([\d\.]+) debian uupdate
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 02:55:47 +0000