libsec (2.10+3) unstable; urgency=low

  * libsec1-dev provides libacl1-dev (to satisfy some build dependencies; but
    these are different librariesm only some packages, e. g. coreutils,
    support both)
  * Strip binaries
  * Build depends on libsunavl-dev instead of libsunavl1-dev (new ABI)
  * Added libsec-libsunavl2.patch
  * Switched to native version scheme (for newer dpkg-source)

5 files changed, 41 insertions, 2 deletions

diff --git a/libsec/debian/changelog b/libsec/debian/changelog
index 930666f..c648c49 100644
--- a/libsec/debian/changelog
+++ b/libsec/debian/changelog
@@ -1,3 +1,15 @@
+libsec (2.10+3) unstable; urgency=low
+
+  * libsec1-dev provides libacl1-dev (to satisfy some build dependencies; but
+    these are different librariesm only some packages, e. g. coreutils,
+    support both)
+  * Strip binaries
+  * Build depends on libsunavl-dev instead of libsunavl1-dev (new ABI)
+  * Added libsec-libsunavl2.patch
+  * Switched to native version scheme (for newer dpkg-source)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Wed, 18 Dec 2013 19:07:32 +0400
+
 libsec (2.10-2) unstable; urgency=low
 
   * Use headers from uts-dev
diff --git a/libsec/debian/control b/libsec/debian/control
index 37768a4..db923bf 100644
--- a/libsec/debian/control
+++ b/libsec/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  gcc-multilib,
  flex,
  illumos-source-2.10,
- lib32sunavl1-dev, libsunavl1-dev,
+ lib32sunavl-dev, libsunavl-dev,
  lib32idmap1-dev, libidmap1-dev,
  quilt,
  symlinks,
@@ -29,7 +29,7 @@ Package: libsec1-dev
 Section: libdevel
 Priority: optional
 Architecture: illumos-any
-Provides: libsec-dev
+Provides: libsec-dev, libacl1-dev
 Depends: libsec1 (= ${binary:Version}), ${misc:Depends}, libc-dev
 Description: file access control library (development files)
  This package contains the header files and symlinks needed
diff --git a/libsec/debian/patches/libsec-libsunavl2.patch b/libsec/debian/patches/libsec-libsunavl2.patch
new file mode 100644
index 0000000..c91b0ca
--- /dev/null
+++ b/libsec/debian/patches/libsec-libsunavl2.patch
@@ -0,0 +1,25 @@
+Index: libsec/usr/src/common/acl/acl_common.c
+===================================================================
+--- libsec.orig/usr/src/common/acl/acl_common.c	2013-12-18 19:05:14.762726726 +0400
++++ libsec/usr/src/common/acl/acl_common.c	2013-12-18 19:07:20.202053880 +0400
+@@ -31,6 +31,7 @@
+ #include <sys/sysmacros.h>
+ #include <acl/acl_common.h>
+ #else
++#include <libsunavl.h>
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+Index: libsec/usr/src/lib/libsec/Makefile.com
+===================================================================
+--- libsec.orig/usr/src/lib/libsec/Makefile.com	2013-12-18 19:05:15.091533092 +0400
++++ libsec/usr/src/lib/libsec/Makefile.com	2013-12-18 19:08:21.353561535 +0400
+@@ -44,7 +44,7 @@
+ 
+ CFLAGS +=	$(CCVERBOSE)
+ CPPFLAGS +=	-I$(SRCDIR) -I. -I../../../common/acl
+-LDLIBS += -lc -lavl -lidmap
++LDLIBS += -lc -lsunavl -lidmap
+ 
+ CERRWARN +=	-_gcc=-Wno-parentheses
+ CERRWARN +=	-_gcc=-Wno-uninitialized
diff --git a/libsec/debian/patches/series b/libsec/debian/patches/series
index 1fcd8e6..13ee1fa 100644
--- a/libsec/debian/patches/series
+++ b/libsec/debian/patches/series
@@ -4,3 +4,4 @@ libsec-acl.y-bad_entry_type-implicit.patch
 libsec-acl.y-realloc.patch
 libsec-flex.patch
 #libsec-acl-headers.patch
+libsec-libsunavl2.patch
diff --git a/libsec/debian/rules b/libsec/debian/rules
index a0eeafc..df6a3de 100755
--- a/libsec/debian/rules
+++ b/libsec/debian/rules
@@ -81,6 +81,7 @@ binary-stamp: build-stamp
 	dh_makeshlibs -- -c4
 	dh_installdeb
 	dh_shlibdeps
+	dh_strip
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb