[openbsc] 02/02: Use gbp-pq for patch management
Ruben Undheim
rubund-guest at moszumanska.debian.org
Sat May 14 14:36:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository openbsc.
commit afdf2704816731e8e9747f50a029f14f9f32a139
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Sat May 14 16:35:44 2016 +0200
Use gbp-pq for patch management
---
debian/changelog | 6 ++
debian/patches/correct_spelling_errors.patch | 90 +++++++++++++++-------------
debian/patches/fix_failing_test.patch | 15 +++--
debian/patches/fix_include_dir.patch | 33 +++++-----
debian/patches/gnutls.patch | 42 +++++++------
debian/patches/set_version_explicitly.patch | 15 +++--
6 files changed, 121 insertions(+), 80 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4da7159..87b0799 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openbsc (0.15.0-3) UNRELEASED; urgency=medium
+
+ * Use gbp-pq for patch management
+
+ -- Ruben Undheim <ruben.undheim at gmail.com> Sat, 14 May 2016 16:35:31 +0200
+
openbsc (0.15.0-2) unstable; urgency=medium
* debian/control:
diff --git a/debian/patches/correct_spelling_errors.patch b/debian/patches/correct_spelling_errors.patch
index f885645..1094336 100644
--- a/debian/patches/correct_spelling_errors.patch
+++ b/debian/patches/correct_spelling_errors.patch
@@ -1,11 +1,21 @@
From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Sat, 14 May 2016 16:34:18 +0200
Subject: Fix some typos in stdout output
-Index: openbsc/openbsc/src/ipaccess/ipaccess-config.c
-===================================================================
---- openbsc.orig/openbsc/src/ipaccess/ipaccess-config.c 2016-02-20 09:29:47.426867611 +0100
-+++ openbsc/openbsc/src/ipaccess/ipaccess-config.c 2016-02-20 09:29:47.422867686 +0100
-@@ -797,11 +797,11 @@
+---
+ openbsc/src/ipaccess/ipaccess-config.c | 4 ++--
+ openbsc/src/libbsc/abis_om2000_vty.c | 2 +-
+ openbsc/src/libbsc/bsc_api.c | 4 ++--
+ openbsc/src/libmsc/smpp_smsc.c | 2 +-
+ openbsc/src/libmsc/smpp_vty.c | 4 ++--
+ openbsc/src/osmo-bsc/osmo_bsc_vty.c | 2 +-
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c
+index c42c7bb..a370011 100644
+--- a/openbsc/src/ipaccess/ipaccess-config.c
++++ b/openbsc/src/ipaccess/ipaccess-config.c
+@@ -797,11 +797,11 @@ static void print_usage(void)
static void print_help(void)
{
#if 0
@@ -19,11 +29,11 @@ Index: openbsc/openbsc/src/ipaccess/ipaccess-config.c
printf(" -u --unit-id UNIT_ID\t\tSet the Unit ID of the BTS\n");
printf(" -o --oml-ip IP\t\tSet primary OML IP (IP of your BSC)\n");
printf(" -i --ip-address IP/MASK\tSet static IP address + netmask of BTS\n");
-Index: openbsc/openbsc/src/libbsc/abis_om2000_vty.c
-===================================================================
---- openbsc.orig/openbsc/src/libbsc/abis_om2000_vty.c 2016-02-20 09:29:47.426867611 +0100
-+++ openbsc/openbsc/src/libbsc/abis_om2000_vty.c 2016-02-20 09:29:47.422867686 +0100
-@@ -327,7 +327,7 @@
+diff --git a/openbsc/src/libbsc/abis_om2000_vty.c b/openbsc/src/libbsc/abis_om2000_vty.c
+index 8325e29..1875c46 100644
+--- a/openbsc/src/libbsc/abis_om2000_vty.c
++++ b/openbsc/src/libbsc/abis_om2000_vty.c
+@@ -327,7 +327,7 @@ DEFUN(om2k_con_list_tei, om2k_con_list_tei_cmd,
DEFUN(cfg_bts_is_conn_list, cfg_bts_is_conn_list_cmd,
"is-connection-list (add|del) <0-2047> <0-2047> <0-255>",
@@ -32,11 +42,11 @@ Index: openbsc/openbsc/src/libbsc/abis_om2000_vty.c
"Add to IS list\n" "Delete from IS list\n"
"ICP1\n" "ICP2\n" "Contiguity Index\n")
{
-Index: openbsc/openbsc/src/libbsc/bsc_api.c
-===================================================================
---- openbsc.orig/openbsc/src/libbsc/bsc_api.c 2016-02-20 09:29:47.426867611 +0100
-+++ openbsc/openbsc/src/libbsc/bsc_api.c 2016-02-20 09:29:47.422867686 +0100
-@@ -136,7 +136,7 @@
+diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c
+index 504f044..d0cde6a 100644
+--- a/openbsc/src/libbsc/bsc_api.c
++++ b/openbsc/src/libbsc/bsc_api.c
+@@ -136,7 +136,7 @@ static void assignment_t10_timeout(void *_conn)
struct gsm_subscriber_connection *conn =
(struct gsm_subscriber_connection *) _conn;
@@ -45,7 +55,7 @@ Index: openbsc/openbsc/src/libbsc/bsc_api.c
/*
* normal release on the secondary channel but only if the
-@@ -476,7 +476,7 @@
+@@ -476,7 +476,7 @@ static void handle_ass_fail(struct gsm_subscriber_connection *conn,
gh = msgb_l3(msg);
if (msgb_l3len(msg) - sizeof(*gh) != 1) {
@@ -54,11 +64,24 @@ Index: openbsc/openbsc/src/libbsc/bsc_api.c
msgb_l3len(msg) - sizeof(*gh));
rr_failure = NULL;
} else {
-Index: openbsc/openbsc/src/libmsc/smpp_vty.c
-===================================================================
---- openbsc.orig/openbsc/src/libmsc/smpp_vty.c 2016-02-20 09:29:47.426867611 +0100
-+++ openbsc/openbsc/src/libmsc/smpp_vty.c 2016-02-20 09:29:47.422867686 +0100
-@@ -385,7 +385,7 @@
+diff --git a/openbsc/src/libmsc/smpp_smsc.c b/openbsc/src/libmsc/smpp_smsc.c
+index c1ec22f..7a63ab5 100644
+--- a/openbsc/src/libmsc/smpp_smsc.c
++++ b/openbsc/src/libmsc/smpp_smsc.c
+@@ -756,7 +756,7 @@ static int smpp_pdu_rx(struct osmo_esme *esme, struct msgb *msg __uses)
+ case QUERY_SM:
+ case REPLACE_SM:
+ case SUBMIT_MULTI:
+- LOGP(DSMPP, LOGL_NOTICE, "[%s] Unimplemented PDU Commmand "
++ LOGP(DSMPP, LOGL_NOTICE, "[%s] Unimplemented PDU Command "
+ "0x%08x\n", esme->system_id, cmd_id);
+ break;
+ default:
+diff --git a/openbsc/src/libmsc/smpp_vty.c b/openbsc/src/libmsc/smpp_vty.c
+index c0695fe..517caa2 100644
+--- a/openbsc/src/libmsc/smpp_vty.c
++++ b/openbsc/src/libmsc/smpp_vty.c
+@@ -385,7 +385,7 @@ DEFUN(cfg_no_esme_defaultroute, cfg_esme_no_defaultroute_cmd,
DEFUN(cfg_esme_del_src_imsi, cfg_esme_del_src_imsi_cmd,
"deliver-src-imsi",
@@ -67,7 +90,7 @@ Index: openbsc/openbsc/src/libmsc/smpp_vty.c
{
struct osmo_smpp_acl *acl = vty->index;
-@@ -396,7 +396,7 @@
+@@ -396,7 +396,7 @@ DEFUN(cfg_esme_del_src_imsi, cfg_esme_del_src_imsi_cmd,
DEFUN(cfg_esme_no_del_src_imsi, cfg_esme_no_del_src_imsi_cmd,
"no deliver-src-imsi", NO_STR
@@ -76,11 +99,11 @@ Index: openbsc/openbsc/src/libmsc/smpp_vty.c
{
struct osmo_smpp_acl *acl = vty->index;
-Index: openbsc/openbsc/src/osmo-bsc/osmo_bsc_vty.c
-===================================================================
---- openbsc.orig/openbsc/src/osmo-bsc/osmo_bsc_vty.c 2016-02-20 09:29:47.426867611 +0100
-+++ openbsc/openbsc/src/osmo-bsc/osmo_bsc_vty.c 2016-02-20 09:29:47.422867686 +0100
-@@ -688,7 +688,7 @@
+diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/openbsc/src/osmo-bsc/osmo_bsc_vty.c
+index 8103ffc..cbe4c6d 100644
+--- a/openbsc/src/osmo-bsc/osmo_bsc_vty.c
++++ b/openbsc/src/osmo-bsc/osmo_bsc_vty.c
+@@ -688,7 +688,7 @@ DEFUN(cfg_msc_no_acc_lst_name,
DEFUN(cfg_net_bsc_mid_call_text,
cfg_net_bsc_mid_call_text_cmd,
"mid-call-text .TEXT",
@@ -89,16 +112,3 @@ Index: openbsc/openbsc/src/osmo-bsc/osmo_bsc_vty.c
{
struct osmo_bsc_data *data = osmo_bsc_data(vty);
char *txt = argv_concat(argv, argc, 0);
-Index: openbsc/openbsc/src/libmsc/smpp_smsc.c
-===================================================================
---- openbsc.orig/openbsc/src/libmsc/smpp_smsc.c 2016-02-19 20:13:19.425462608 +0100
-+++ openbsc/openbsc/src/libmsc/smpp_smsc.c 2016-02-20 09:30:13.570378990 +0100
-@@ -756,7 +756,7 @@
- case QUERY_SM:
- case REPLACE_SM:
- case SUBMIT_MULTI:
-- LOGP(DSMPP, LOGL_NOTICE, "[%s] Unimplemented PDU Commmand "
-+ LOGP(DSMPP, LOGL_NOTICE, "[%s] Unimplemented PDU Command "
- "0x%08x\n", esme->system_id, cmd_id);
- break;
- default:
diff --git a/debian/patches/fix_failing_test.patch b/debian/patches/fix_failing_test.patch
index f9a3ba5..09cc800 100644
--- a/debian/patches/fix_failing_test.patch
+++ b/debian/patches/fix_failing_test.patch
@@ -1,12 +1,17 @@
From: Ruben Undheim <ruben.undheim at gmail.com>
-Subject: Fix a little bug in the code which makes the tests fail
- for this particular release. This was fixed upstream just after making
- the release.
+Date: Sat, 14 May 2016 16:34:18 +0200
+Subject: Fix a little bug in the code which makes the tests fail for this
+ particular release. This was fixed upstream just after making the release.
Forwarded: https://github.com/osmocom/openbsc/commit/fa07b489dc3e14579b34365c0a0f1b5d5a70138f
+---
+ openbsc/src/gprs/gprs_sgsn.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
---- openbsc-0.15.0.orig/openbsc/src/gprs/gprs_sgsn.c
-+++ openbsc-0.15.0/openbsc/src/gprs/gprs_sgsn.c
+diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c
+index 9b11c35..ae172d6 100644
+--- a/openbsc/src/gprs/gprs_sgsn.c
++++ b/openbsc/src/gprs/gprs_sgsn.c
@@ -41,8 +41,6 @@
#include <time.h>
diff --git a/debian/patches/fix_include_dir.patch b/debian/patches/fix_include_dir.patch
index 1eb338d..7b70a9e 100644
--- a/debian/patches/fix_include_dir.patch
+++ b/debian/patches/fix_include_dir.patch
@@ -1,33 +1,38 @@
From: Ruben Undheim <ruben.undheim at gmail.com>
-Subjection: Since the header files for libsmpp34 aren't in /usr/include, LIBSMPP34_CFLAGS
- must be used wherever libsmpp34 is used.
+Date: Sat, 14 May 2016 16:34:18 +0200
+Subject: fix_include_dir
Forwarded: https://github.com/osmocom/openbsc/commit/2259c7528e583a10628d0690d7cabfa749b23257
+---
+ openbsc/src/libmsc/Makefile.am | 2 +-
+ openbsc/src/utils/Makefile.am | 2 +-
+ openbsc/tests/smpp/Makefile.am | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
-Index: openbsc/openbsc/src/libmsc/Makefile.am
-===================================================================
---- openbsc.orig/openbsc/src/libmsc/Makefile.am 2016-02-07 16:00:02.477261978 +0100
-+++ openbsc/openbsc/src/libmsc/Makefile.am 2016-02-07 16:00:04.000000000 +0100
+diff --git a/openbsc/src/libmsc/Makefile.am b/openbsc/src/libmsc/Makefile.am
+index 18bfa0c..e2598e4 100644
+--- a/openbsc/src/libmsc/Makefile.am
++++ b/openbsc/src/libmsc/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) $(LIBSMPP34_CFLAGS)
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \
$(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBCRYPTO_CFLAGS)
-Index: openbsc/openbsc/src/utils/Makefile.am
-===================================================================
---- openbsc.orig/openbsc/src/utils/Makefile.am 2016-02-07 16:00:02.477261978 +0100
-+++ openbsc/openbsc/src/utils/Makefile.am 2016-02-07 16:00:04.000000000 +0100
+diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am
+index f6255a0..c9c70c3 100644
+--- a/openbsc/src/utils/Makefile.am
++++ b/openbsc/src/utils/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) $(LIBSMPP34_CFLAGS)
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(SQLITE3_CFLAGS)
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
-Index: openbsc/openbsc/tests/smpp/Makefile.am
-===================================================================
---- openbsc.orig/openbsc/tests/smpp/Makefile.am 2016-02-07 15:23:29.019875246 +0100
-+++ openbsc/openbsc/tests/smpp/Makefile.am 2016-02-07 16:01:58.172990165 +0100
+diff --git a/openbsc/tests/smpp/Makefile.am b/openbsc/tests/smpp/Makefile.am
+index b3d4568..31a8870 100644
+--- a/openbsc/tests/smpp/Makefile.am
++++ b/openbsc/tests/smpp/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)/src/libmsc
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)/src/libmsc $(LIBSMPP34_CFLAGS)
diff --git a/debian/patches/gnutls.patch b/debian/patches/gnutls.patch
index 5e74ddb..3221922 100644
--- a/debian/patches/gnutls.patch
+++ b/debian/patches/gnutls.patch
@@ -1,12 +1,20 @@
From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Sat, 14 May 2016 16:34:18 +0200
Subject: To avoid problems with the OpenSSL license and GPL,
link with gnutls-openssl instead.
-Index: openbsc/openbsc/configure.ac
-===================================================================
---- openbsc.orig/openbsc/configure.ac 2016-02-19 20:39:10.824145024 +0100
-+++ openbsc/openbsc/configure.ac 2016-02-19 20:39:10.820145095 +0100
-@@ -27,7 +27,8 @@
+---
+ openbsc/configure.ac | 3 ++-
+ openbsc/src/libmsc/auth.c | 2 +-
+ openbsc/src/libmsc/db.c | 2 +-
+ openbsc/src/osmo-bsc_nat/bsc_nat.c | 2 +-
+ 4 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/openbsc/configure.ac b/openbsc/configure.ac
+index 6bc0504..b6f9104 100644
+--- a/openbsc/configure.ac
++++ b/openbsc/configure.ac
+@@ -27,7 +27,8 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.7.0)
PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0)
PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.6.4)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1)
@@ -16,10 +24,10 @@ Index: openbsc/openbsc/configure.ac
# Enabke/disable the NAT?
AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires SCCP])],
-Index: openbsc/openbsc/src/libmsc/auth.c
-===================================================================
---- openbsc.orig/openbsc/src/libmsc/auth.c 2016-02-19 20:13:19.417462737 +0100
-+++ openbsc/openbsc/src/libmsc/auth.c 2016-02-19 20:40:13.607032169 +0100
+diff --git a/openbsc/src/libmsc/auth.c b/openbsc/src/libmsc/auth.c
+index 0a2f59e..8a55001 100644
+--- a/openbsc/src/libmsc/auth.c
++++ b/openbsc/src/libmsc/auth.c
@@ -27,7 +27,7 @@
#include <osmocom/gsm/comp128.h>
@@ -29,10 +37,10 @@ Index: openbsc/openbsc/src/libmsc/auth.c
#include <stdlib.h>
-Index: openbsc/openbsc/src/libmsc/db.c
-===================================================================
---- openbsc.orig/openbsc/src/libmsc/db.c 2016-02-19 20:13:19.421462672 +0100
-+++ openbsc/openbsc/src/libmsc/db.c 2016-02-19 20:40:27.318789122 +0100
+diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c
+index 9f26590..deb9399 100644
+--- a/openbsc/src/libmsc/db.c
++++ b/openbsc/src/libmsc/db.c
@@ -38,7 +38,7 @@
#include <osmocom/core/statistics.h>
#include <osmocom/core/rate_ctr.h>
@@ -42,10 +50,10 @@ Index: openbsc/openbsc/src/libmsc/db.c
/* Semi-Private-Interface (SPI) for the subscriber code */
void subscr_direct_free(struct gsm_subscriber *subscr);
-Index: openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c
-===================================================================
---- openbsc.orig/openbsc/src/osmo-bsc_nat/bsc_nat.c 2016-02-19 20:13:19.433462478 +0100
-+++ openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c 2016-02-19 20:39:58.791294787 +0100
+diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c
+index 56c6286..80d18cd 100644
+--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c
++++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c
@@ -69,7 +69,7 @@
#include <osmocom/abis/ipa.h>
diff --git a/debian/patches/set_version_explicitly.patch b/debian/patches/set_version_explicitly.patch
index fe16180..16666a1 100644
--- a/debian/patches/set_version_explicitly.patch
+++ b/debian/patches/set_version_explicitly.patch
@@ -1,9 +1,16 @@
From: Ruben Undheim <ruben.undheim at gmail.com>
-Subject: This sets the package version explicitly to avoid the
- dependency on git in the package build process.
+Date: Sat, 14 May 2016 16:34:18 +0200
+Subject: This sets the package version explicitly to avoid the dependency on
+ git in the package build process.
---- openbsc-0.15.0.orig/openbsc/configure.ac
-+++ openbsc-0.15.0/openbsc/configure.ac
+---
+ openbsc/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/openbsc/configure.ac b/openbsc/configure.ac
+index fc30b5e..6bc0504 100644
+--- a/openbsc/configure.ac
++++ b/openbsc/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script
AC_INIT([openbsc],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openbsc.git
More information about the debian-science-commits
mailing list