From 5fa8b083cc270fd30ab5526cd40683afd3035931 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 19 Dec 2016 18:41:42 +0100 Subject: Integrate Debian packaging changes debian/control: * restructure to make it easier to incorporate further changes * update package descriptions * update project URL debian/rules: * use proper hardening syntax * restructure to make it easier to incorporate further changes * remove useless comment debian/compat: update compatibility version debian/coryright: update to match Debian format Change-Id: I49cc9239b15dc77d782914ca2547e601d049acdc Related: OS#1694 --- debian/compat | 2 +- debian/control | 86 +++++++++++++++++++++++------- debian/copyright | 158 +++++++++++++++++++++++++++++++++++++++++++------------ debian/rules | 14 +---- 4 files changed, 194 insertions(+), 66 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011eb..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index c37a5caf9..79f18dfc4 100644 --- a/debian/control +++ b/debian/control @@ -1,54 +1,102 @@ Source: openbsc +Maintainer: Harald Welte Section: net Priority: optional -Maintainer: Harald Welte -Build-Depends: debhelper (>= 7.0.0~), autotools-dev, pkg-config, libgtp0-dev, libosmocore-dev, libosmo-sccp-dev, libdbi0-dev, dh-autoreconf, libosmo-abis-dev, libosmo-netif-dev, libdbd-sqlite3, libpcap-dev, libssl-dev, libc-ares-dev, libsmpp34-dev -Standards-Version: 3.8.4 -Homepage: http://openbsc.osmocom.org/ +Build-Depends: debhelper (>= 9), + autotools-dev, + pkg-config, + libgtp0-dev, + libosmocore-dev, + libosmo-sccp-dev, + libdbi0-dev, + dh-autoreconf, + libosmo-abis-dev, + libosmo-netif-dev, + libdbd-sqlite3, + libpcap-dev, + libssl-dev, + libc-ares-dev, + libsmpp34-dev +Standards-Version: 3.9.8 Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git Vcs-Browser: http://openbsc.osmocom.org/trac/browser +Homepage: https://projects.osmocom.org/projects/openbsc Package: osmocom-bsc Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: GSM Base Station Controller; BSC-only version of OpenBSC. Needs a real MSC! - Classical BSC which requires MSC to operate. +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: GSM Base Station Controller + This is the BSC-only version of OpenBSC. It requires a Mobile Switching Center + (MSC) to operate. + . + You might rather prefer to use osmocom-nitb which is considered a + "GSM Network-in-a-Box" and does not depend on a MSC. Package: osmocom-nitb Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libdbd-sqlite3 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbd-sqlite3 Description: GSM Network-in-a-Box, implements BSC, MSC, SMSC, HLR, VLR - All the GSM network components bundled together. + This is the Network-in-a-Box version of OpenBSC. It has all the GSM network + components bundled together. When using osmocom-nitb, there is no need for a + Mobile Switching Center (MSC) which is needed when using osmocom-bsc. Package: osmocom-ipaccess-utils Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: Command line utilities for ip.access nanoBTS - Utilities specific for ip.access unit. + This package contains utilities that are specific for nanoBTS when being used + together with OpenBSC. It contains mainly three tools: ipaccess-find, + ipaccess-config and ipaccess-proxy. Package: osmocom-bs11-utils Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: Command line utilities for Siemens BS-11 BTS - Utilities specific for BS-11 unit. + There is a tool in this package for configuring the Siemens BS-11 BTS. + Additionally, it contains one tool for making use of an ISDN-card and the + public telephone network as frequency standard for the E1 line. Package: osmocom-sgsn Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Suggests: osmocom-bsc Description: Osmocom Serving GPRS Support Node - SGSN implementation. + This is an implementation of the GPRS Serving GPRS Support Node (SGSN). As + such it implements the GPRS Mobility Management (GMM) and SM (Session + Management). + . + The SGSN connects via the Gb-interface to the BSS (like the osmo-pcu or an + ip.access nanoBTS), and it connects via the GTP protocol to a Gateway GPRS + Support Node (GGSN) like openggsn. Package: osmocom-gbproxy Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: osmocom-sgsn Description: Osmocom GPRS Gb Interface Proxy - Proxy for Gb interface. + The purpose of the Gb proxy is to aggregate the Gb links of multiple + BSS's and present them in one Gb link to the SGSN. + . + This package is part of OpenBSC and closely related to osmocom-sgsn. Package: osmocom-bsc-nat Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: osmocom-bsc Description: Osmocom Base Station Controller Network Address Translation - Network address translation for BSC. + This NAT is useful for masquerading multiple BSCs behind one. It listens + for incoming BSCs on port 5000 and connects to a specified Mobile Switching + Center (MSC). + . + This package is part of OpenBSC and closely related to osmocom-bsc. Package: osmo-gtphub Architecture: any diff --git a/debian/copyright b/debian/copyright index fbac90ccd..1e4dee1c2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,47 +1,137 @@ -This work was packaged for Debian by: +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: OpenBSC +Source: http://openbsc.osmocom.org/ - Harald Welte on Tue, 24 Aug 2010 10:55:04 +0200 +Files: * +Copyright: 2008-2015 Harald Welte + 2008-2015 Holger Hans Peter Freyther + 2009-2015 On-Waves + 2008 Jan Luebbe + 2008,2010-2011 Daniel Willmann + 2009,2011,2013 Andreas Eversberg + 2009,2011 Dieter Spaar + 2009 Mike Haben + 2010 Sylvain Munaut <246tnt@gmail.com> + 2012-2013 Pablo Neira Ayuso + 2013-2015 Sysmocom s.f.m.c. GmbH (Jacob Erlbeck) + 2014 Alexander Chemeris +License: AGPL-3+ +Comment: Contributions by Stefan Schmidt as well -It was downloaded from: +Files: wireshark/0001-abis_oml.patch + wireshark/0002-ericsson_rbs2409.patch + wireshark/0003-lucent-hnb.patch + wireshark/0005-rsl-hsl.patch +Copyright: 1998 Gerald Combs + 2007,2011 Anders Broman + 2009 Holger Hans Peter Freyther + 2009-2011 Harald Welte +License: GPL-2+ - git://bs11-abis.gnumonks.org/openbsc.git +Files: openbsc/include/mISDNif.h +Copyright: 2008 Karsten Keil +License: LGPL-2.1 -Upstream Authors: +Files: openbsc/src/libmgcp/g711common.h +Copyright: 2009 Abramo Bagnara +License: GPL-2+ - Harald Welte - Dieter Spaar - Holger Hans Peter Freyther - Sylvain Munaut - Daniel Willmann - Jan Luebbe - Mike Haben - Andreas Eversberg +Files: openbsc/git-version-gen +Copyright: 2007-2010 Free Software Foundation +License: GPL-3+ -Copyright: +Files: openbsc/osmoappdesc.py + openbsc/tests/smpp_test_runner.py + openbsc/tests/ctrl_test_runner.py + openbsc/tests/vty_test_runner.py +Copyright: 2013 Katerina Barone-Adesi + 2013 Jacob Erlbeck + 2013-2014 Holger Hans Peter Freyther +License: GPL-3+ - Copyright (C) 2008-2010 Harald Welte - Copyright (C) 2008-2009 Dieter Spaar - Copyright (C) 2008-2010 Holger Hans Peter Freyther - Copyright (C) 2009-2010 Sylvain Munaut - Copyright (C) 2009-2010 On-Waves - Copyright (C) 2008 Daniel Willmann - Copyright (C) 2008 Jan Luebbe - Copyright (C) 2009 by Mike Haben - Copyright (C) 2009 Andreas Eversberg +Files: openbsc/src/libbsc/bsc_ctrl_lookup.c +Copyright: 2010-2011 Daniel Willmann + 2010-2011 On-Waves +License: GPL-2+ -License: +Files: openbsc/src/libmsc/mncc_sock.c + openbsc/src/libmsc/mncc_builtin.c +Copyright: 2008-2010 Harald Welte + 2009 Andreas Eversberg + 2012 Holger Hans Peter Freyther +License: GPL-2+ - GNU General Public License, Version 2 or later +Files: debian/* +Copyright: 2012-2015 Holger Hans Peter Freyther + 2016 Ruben Undheim +License: GPL-2+ -The Debian packaging is: - Copyright (C) 2010 Harald Welte +License: AGPL-3+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . -# Please chose a license for your packaging work. If the program you package -# uses a mainstream license, using the same license is the safest choice. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. -# If you just want it to be GPL version 3, leave the following lines in. -and is licensed under the GPL version 3, -see "/usr/share/common-licenses/GPL-3". +License: GPL-2+ + This package is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or (at + your option) any later version. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public + License version 2 can be found in "/usr/share/common-licenses/GPL-2". + + +License: GPL-3+ + This package is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or (at + your option) any later version. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public + License version 3 can be found in "/usr/share/common-licenses/GPL-3". + + +License: LGPL-2.1 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; version + 2.1 of the License. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License version 2.1 can be found in + "/usr/share/common-licenses/LGPL-2.1". diff --git a/debian/rules b/debian/rules index ee632a2b9..4e187a6cf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -17,10 +7,10 @@ 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') -export DEB_BUILD_HARDENING=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh --sourcedirectory=openbsc --with autoreconf $@ + dh $@ --sourcedirectory=openbsc --with autoreconf # This is needed for debian stable (squeeze) override_dh_autoreconf: -- cgit v1.2.3