Bug#347744: patch

[Guillem Jover]

Hi,

On Sun, Jan 15, 2006 at 11:59:28PM +0100, Bart Martens wrote:
> I've added -lsepol in configure and I've added a build-depends
> libsepol1-dev, and now it seems to work fine.  Patch attached.

Thanks for the patch, but it's not completely correct. The file to patch
is m4/libs.m4 (in any case not configure if there's a configure.ac), and
libsepol should only be needed when statically linking. For dynamic we
don't need to list transitive libs. Although it would be nice to not
have to hardcode such lib list there, a .pc file may be in order, neither
the libsepol1-dev package. I may file a bug later on.

> diff -ru dpkg-1.13.11.1_orig/configure dpkg-1.13.11.1/configure
> --- dpkg-1.13.11.1_orig/configure 2006-01-12 09:16:28.0 +0100
> +++ dpkg-1.13.11.1/configure  2006-01-15 23:47:23.0 +0100
> @@ -12353,9 +12353,9 @@
>  _ACEOF
>  
>if test "x$with_selinux" = "xstatic"; then
> - dpkg_selinux_libs="-Wl,-Bstatic -lselinux -Wl,-Bdynamic"
> + dpkg_selinux_libs="-Wl,-Bstatic -lselinux -lsepol 
> -Wl,-Bdynamic"
>else
> - dpkg_selinux_libs="-lselinux"
> + dpkg_selinux_libs="-lselinux -lsepol"
>fi
>SELINUX_LIBS="${SELINUX_LIBS:+$SELINUX_LIBS 
> }$dpkg_selinux_libs"
>with_selinux="yes"

Attached the correct patch snippet.

We'll be fixing this on next upload once we've sorted out the
transition. ;)

regards,
guillem
diff -Naur dpkg-1.13.11.1.orig/m4/libs.m4 dpkg-1.13.11.1/m4/libs.m4
--- dpkg-1.13.11.1.orig/m4/libs.m4  2005-10-19 11:07:27.0 +0300
+++ dpkg-1.13.11.1/m4/libs.m4   2006-01-16 05:00:46.0 +0200
@@ -71,7 +71,7 @@
[AC_DEFINE(WITH_SELINUX, 1,
[Define to 1 to compile in SELinux supoprt])
 if test "x$with_selinux" = "xstatic"; then
-   dpkg_selinux_libs="-Wl,-Bstatic -lselinux -Wl,-Bdynamic"
+   dpkg_selinux_libs="-Wl,-Bstatic -lselinux -lsepol 
-Wl,-Bdynamic"
 else
dpkg_selinux_libs="-lselinux"
 fi

Bug#347744: patch

[Bart Martens]

package dpkg
tags 347744 patch
thanks


I've added -lsepol in configure and I've added a build-depends
libsepol1-dev, and now it seems to work fine.  Patch attached.

diff -ru dpkg-1.13.11.1_orig/configure dpkg-1.13.11.1/configure
--- dpkg-1.13.11.1_orig/configure   2006-01-12 09:16:28.0 +0100
+++ dpkg-1.13.11.1/configure2006-01-15 23:47:23.0 +0100
@@ -12353,9 +12353,9 @@
 _ACEOF
 
 if test "x$with_selinux" = "xstatic"; then
-   dpkg_selinux_libs="-Wl,-Bstatic -lselinux -Wl,-Bdynamic"
+   dpkg_selinux_libs="-Wl,-Bstatic -lselinux -lsepol 
-Wl,-Bdynamic"
 else
-   dpkg_selinux_libs="-lselinux"
+   dpkg_selinux_libs="-lselinux -lsepol"
 fi
 SELINUX_LIBS="${SELINUX_LIBS:+$SELINUX_LIBS 
}$dpkg_selinux_libs"
 with_selinux="yes"
diff -ru dpkg-1.13.11.1_orig/debian/changelog dpkg-1.13.11.1/debian/changelog
--- dpkg-1.13.11.1_orig/debian/changelog2006-01-15 23:49:46.0 
+0100
+++ dpkg-1.13.11.1/debian/changelog 2006-01-15 23:44:19.0 +0100
@@ -1,3 +1,11 @@
+dpkg (1.13.11.1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * configure: Add -lsepol.  (Closes: #347744.)
+  * debian/control: Add build-depends libsepol1-dev.
+
+ -- Bart Martens <[EMAIL PROTECTED]>  Sun, 15 Jan 2006 23:40:16 +0100
+
 dpkg (1.13.11.1) unstable; urgency=low
 
   * Change maintainers to new team.
diff -ru dpkg-1.13.11.1_orig/debian/control dpkg-1.13.11.1/debian/control
--- dpkg-1.13.11.1_orig/debian/control  2006-01-12 08:55:55.0 +0100
+++ dpkg-1.13.11.1/debian/control   2006-01-15 23:48:00.0 +0100
@@ -6,7 +6,7 @@
 Origin: debian
 Bugs: debbugs://bugs.debian.org
 Standards-Version: 3.6.1.0
-Build-Depends: debhelper (>= 4.1.81), libncurses5-dev | libncurses-dev, 
zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libselinux1-dev [!hurd-i386]
+Build-Depends: debhelper (>= 4.1.81), libncurses5-dev | libncurses-dev, 
zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libselinux1-dev [!hurd-i386], 
libsepol1-dev [!hurd-i386]
 
 Package: dpkg
 Architecture: any