diff --git a/libzonecfg/debian/changelog b/libzonecfg/debian/changelog index 4b6047b..43589e5 100644 --- a/libzonecfg/debian/changelog +++ b/libzonecfg/debian/changelog @@ -1,3 +1,13 @@ +libzonecfg (2.10+1) unstable; urgency=medium + + * Rebuilt with gnu ld to correctly link to libxml2 + (libzonecfg-use-gnuld.patch) + * Use native version scheme (for new dpkg-source) + * Strip binaries + * Added libzonecfg1-dbg + + -- Igor Pashev Sat, 05 Apr 2014 16:20:28 +0400 + libzonecfg (2.10-1) unstable; urgency=low * Initial release. diff --git a/libzonecfg/debian/control b/libzonecfg/debian/control index b8e12b0..f5320fe 100644 --- a/libzonecfg/debian/control +++ b/libzonecfg/debian/control @@ -25,7 +25,6 @@ Homepage: https://www.illumos.org Package: libzonecfg-data Section: libs -Priority: optional Architecture: all Depends: ${misc:Depends} Description: shared files for the libzonecfg library @@ -33,7 +32,6 @@ Description: shared files for the libzonecfg library Package: libzonecfg1 Section: libs -Priority: standard Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Architecture: illumos-any @@ -41,9 +39,18 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libzonecfg-data Description: zones configuration library This package contains libzonecfg shared library. +Package: libzonecfg1-dbg +Section: libs +Priority: extra +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Architecture: illumos-any +Depends: libzonecfg1 (= ${binary:Version}) +Description: zones configuration library: debug info + This package contains detached debug info for libzonecfg shared library. + Package: libzonecfg1-dev Section: libdevel -Priority: optional Architecture: illumos-any Provides: libzonecfg-dev Depends: libzonecfg1 (= ${binary:Version}), ${misc:Depends}, libc1-dev, @@ -54,7 +61,6 @@ Description: zones configuration library (development files) Package: lib32zonecfg1 Section: libs -Priority: standard Architecture: illumos-amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, libzonecfg-data Description: zones configuration library (32 bit) @@ -64,7 +70,6 @@ Description: zones configuration library (32 bit) Package: lib32zonecfg1-dev Section: libdevel -Priority: optional Architecture: illumos-amd64 Provides: lib32zonecfg-dev Depends: lib32zonecfg1 (= ${binary:Version}), libzonecfg1-dev (= ${binary:Version}), diff --git a/libzonecfg/debian/patches/libzonecfg-use-gnuld.patch b/libzonecfg/debian/patches/libzonecfg-use-gnuld.patch new file mode 100644 index 0000000..4381b06 --- /dev/null +++ b/libzonecfg/debian/patches/libzonecfg-use-gnuld.patch @@ -0,0 +1,30 @@ +Index: libzonecfg/usr/src/lib/libzonecfg/common/mapfile-vers +=================================================================== +--- libzonecfg.orig/usr/src/lib/libzonecfg/common/mapfile-vers 2012-10-08 04:25:42.000000000 +0400 ++++ libzonecfg/usr/src/lib/libzonecfg/common/mapfile-vers 2014-04-05 16:05:00.580952172 +0400 +@@ -36,9 +36,8 @@ + # MAPFILE HEADER END + # + +-$mapfile_version 2 + +-SYMBOL_VERSION SUNWprivate_1.1 { ++SUNWprivate_1.1 { + global: + endzoneent; + getzoneent; +Index: libzonecfg/usr/src/lib/Makefile.lib +=================================================================== +--- libzonecfg.orig/usr/src/lib/Makefile.lib 2014-04-05 16:04:58.039833413 +0400 ++++ libzonecfg/usr/src/lib/Makefile.lib 2014-04-05 16:10:19.345463535 +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) + diff --git a/libzonecfg/debian/patches/series b/libzonecfg/debian/patches/series index 837be5f..745129e 100644 --- a/libzonecfg/debian/patches/series +++ b/libzonecfg/debian/patches/series @@ -1,3 +1,4 @@ libzonecfg-illumos-3253-workaround.patch libzonecfg-dtd-location.patch libzonecfg-uuid.h.patch +libzonecfg-use-gnuld.patch diff --git a/libzonecfg/debian/rules b/libzonecfg/debian/rules index 8423363..979ad4f 100755 --- a/libzonecfg/debian/rules +++ b/libzonecfg/debian/rules @@ -21,6 +21,10 @@ unpack-stamp: # Not used and buggy: echo > usr/src/Makefile.msg.targ + + # use gnu ld, also patched mapfile and makefiles + sed -e '/LD_ALTEXEC/d' -i usr/env.sh + echo 'export BDIRECT=' >> usr/env.sh touch $@ patch: patch-stamp @@ -81,6 +85,7 @@ binary-stamp: build-stamp dh_makeshlibs -- -c4 dh_installdeb dh_shlibdeps + dh_strip --dbg-package=libzonecfg1-dbg dh_gencontrol dh_md5sums dh_builddeb @@ -89,6 +94,6 @@ binary-stamp: build-stamp clean: unpatch dh_testdir dh_testroot + rm -rf usr .pc dh_clean - rm -rf usr