From 29148b944e4ce04fa976395e2cb165686786bfbe Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Sat, 5 Apr 2014 19:50:41 +0400 Subject: [PATCH] libbrand (4.3) unstable; urgency=medium * New upstream snapshot * Updated debian/libbrand1.symbols * Rebuilt with gnu ld to correctly link to libxml2 (libbrand-use-gnuld.patch) * Use native version scheme (for new dpkg-source) * Strip binaries * Added libbrand1-dbg --- libbrand/debian/changelog | 12 ++++++++ libbrand/debian/control | 17 ++++++----- libbrand/debian/libbrand1.symbols | 1 + .../debian/patches/libbrand-use-gnuld.patch | 30 +++++++++++++++++++ libbrand/debian/patches/series | 1 + libbrand/debian/rules | 4 ++- 6 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 libbrand/debian/patches/libbrand-use-gnuld.patch diff --git a/libbrand/debian/changelog b/libbrand/debian/changelog index 2794bb1..3450264 100644 --- a/libbrand/debian/changelog +++ b/libbrand/debian/changelog @@ -1,3 +1,15 @@ +libbrand (4.3) unstable; urgency=medium + + * New upstream snapshot + * Updated debian/libbrand1.symbols + * Rebuilt with gnu ld to correctly link to libxml2 + (libbrand-use-gnuld.patch) + * Use native version scheme (for new dpkg-source) + * Strip binaries + * Added libbrand1-dbg + + -- Igor Pashev Sat, 05 Apr 2014 19:43:15 +0400 + libbrand (2.10-1) unstable; urgency=low * Initial release. diff --git a/libbrand/debian/control b/libbrand/debian/control index 127c1d6..444f5e5 100644 --- a/libbrand/debian/control +++ b/libbrand/debian/control @@ -5,7 +5,7 @@ Maintainer: Igor Pashev Build-Depends: dh-illumos, gcc-multilib, - illumos-source-2.10, + illumos-source-4.3, libxml2-dev, lib32xml2-dev, quilt, symlinks, @@ -15,7 +15,6 @@ Homepage: https://www.illumos.org Package: libbrand-data Section: libs -Priority: optional Architecture: all Depends: ${misc:Depends} Description: shared files for the libbrand library @@ -31,11 +30,10 @@ Description: shared files for the libbrand library Package: libbrand1 Section: libs -Priority: standard Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Architecture: illumos-any -Depends: ${shlibs:Depends}, ${misc:Depends}, libbrand-data +Depends: ${shlibs:Depends}, ${misc:Depends}, libbrand-data (>= 4.3) Description: branded zones configuration library This package contains libbrand shared library. . @@ -46,9 +44,16 @@ Description: branded zones configuration library Configuration files for each zone are placed in the /usr/share/brandz// directory. +Package: libbrand1-dbg +Section: libs +Multi-Arch: same +Architecture: illumos-any +Depends: libbrand1 (= ${binary:Version}) +Description: branded zones configuration library: debug info + This package contains detached debug info for libbrand shared library. + Package: libbrand1-dev Section: libdevel -Priority: optional Architecture: illumos-any Provides: libbrand-dev Depends: libbrand1 (= ${binary:Version}), ${misc:Depends}, libc1-dev @@ -62,7 +67,6 @@ Description: branded zones configuration library (development files) Package: lib32brand1 Section: libs -Priority: standard Architecture: illumos-amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, libbrand-data Description: branded zones configuration library (32 bit) @@ -76,7 +80,6 @@ Description: branded zones configuration library (32 bit) Package: lib32brand1-dev Section: libdevel -Priority: optional Architecture: illumos-amd64 Provides: lib32brand-dev Depends: lib32brand1 (= ${binary:Version}), libbrand1-dev (= ${binary:Version}), diff --git a/libbrand/debian/libbrand1.symbols b/libbrand/debian/libbrand1.symbols index c82898a..f6671dd 100644 --- a/libbrand/debian/libbrand1.symbols +++ b/libbrand/debian/libbrand1.symbols @@ -25,6 +25,7 @@ libbrand.so.1 libbrand1 #MINVER# brand_get_prestatechange@SUNWprivate 2.10-1 brand_get_preuninstall@SUNWprivate 2.10-1 brand_get_query@SUNWprivate 2.10-1 + brand_get_shutdown@SUNWprivate 4.3 brand_get_sysboot@SUNWprivate 2.10-1 brand_get_uninstall@SUNWprivate 2.10-1 brand_get_user_cmd@SUNWprivate 2.10-1 diff --git a/libbrand/debian/patches/libbrand-use-gnuld.patch b/libbrand/debian/patches/libbrand-use-gnuld.patch new file mode 100644 index 0000000..dfe211e --- /dev/null +++ b/libbrand/debian/patches/libbrand-use-gnuld.patch @@ -0,0 +1,30 @@ +Index: libbrand/usr/src/lib/Makefile.lib +=================================================================== +--- libbrand.orig/usr/src/lib/Makefile.lib 2014-04-05 19:36:58.202174075 +0400 ++++ libbrand/usr/src/lib/Makefile.lib 2014-04-05 19:38:19.807440560 +0400 +@@ -136,8 +136,8 @@ + + + HSONAME= -h$(SONAME) +-DYNFLAGS= $(HSONAME) $(ZTEXT) $(ZDEFS) $(BDIRECT) \ +- $(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) ++DYNFLAGS= $(HSONAME) $(ZTEXT) $(ZDEFS) \ ++ $(MAPFILES:%=-Wl,--version-script=%) + + LDLIBS= $(LDLIBS.lib) + +Index: libbrand/usr/src/lib/libbrand/common/mapfile-vers +=================================================================== +--- libbrand.orig/usr/src/lib/libbrand/common/mapfile-vers 2014-03-01 16:18:11.000000000 +0400 ++++ libbrand/usr/src/lib/libbrand/common/mapfile-vers 2014-04-05 19:38:42.641032780 +0400 +@@ -37,9 +37,8 @@ + # MAPFILE HEADER END + # + +-$mapfile_version 2 + +-SYMBOL_VERSION SUNWprivate { ++SUNWprivate { + global: + brand_allow_exclusive_ip; + brand_close; diff --git a/libbrand/debian/patches/series b/libbrand/debian/patches/series index 95e426b..4ffe388 100644 --- a/libbrand/debian/patches/series +++ b/libbrand/debian/patches/series @@ -1,2 +1,3 @@ libbrand-dtd-location.patch libbrand-zoneconfig.patch +libbrand-use-gnuld.patch diff --git a/libbrand/debian/rules b/libbrand/debian/rules index dedbe23..a3b3359 100755 --- a/libbrand/debian/rules +++ b/libbrand/debian/rules @@ -20,6 +20,7 @@ unpack-stamp: # Not used and buggy: echo > usr/src/Makefile.msg.targ + sed -e '/LD_ALTEXEC/d' -i usr/env.sh touch $@ patch: patch-stamp @@ -78,6 +79,7 @@ binary-stamp: build-stamp dh_installexamples dh_installchangelogs dh_link + dh_strip --dbg-package=libbrand1-dbg dh_compress dh_fixperms dh_makeshlibs -- -c4 @@ -91,6 +93,6 @@ binary-stamp: build-stamp clean: unpatch dh_testdir dh_testroot + rm -rf usr .pc dh_clean - rm -rf usr