Build .deb packages with selinux support.

--HG--
branch : 1.7

diff --git a/mkpkg b/mkpkg
index 9f4f328353319bfcc2666fd54f8f6827c61c68f7..69698f7264971ff2ce115eb311f3fba8f8ca83dc 100755 (executable)
--- a/mkpkg
+++ b/mkpkg
@@ -207,6 +207,7 @@ case "$osversion" in
            configure_opts="${configure_opts}${configure_opts+$tab}--with-ldap
                --with-ldap-conf-file=/etc/sudo-ldap.conf"
        fi
+       configure_opts="${configure_opts}${configure_opts+$tab}--with-selinux"
        configure_opts="--prefix=/usr
                --with-all-insults
                --with-pam

diff --git a/sudo.pp b/sudo.pp
index ca6f985a1ba7bda078a67caa34a87db22e8b2307..c1f3bc3206d3970d88d46964696c6cd7a4a2357a 100644 (file)
--- a/sudo.pp
+++ b/sudo.pp
@@ -230,10 +230,10 @@ still allow people to get their work done."
        osdirs=`echo $osdirs | tr " " "\n" | sort -u`
 
 %depend [deb]
-       libc6, libpam0g, libpam-modules, zlib1g
+       libc6, libpam0g, libpam-modules, zlib1g, libselinux1
 
 %fixup [deb]
-       # Add Conflicts, Replaces headers and add libldap depedency as needed.
+       # Add Conflicts, Replaces headers and add libldap2 depedency as needed.
        if test -z "%{flavor}"; then
            echo "Conflicts: sudo-ldap" >> %{pp_wrkdir}/%{name}/DEBIAN/control
            echo "Replaces: sudo-ldap" >> %{pp_wrkdir}/%{name}/DEBIAN/control
@@ -241,7 +241,7 @@ still allow people to get their work done."
            echo "Conflicts: sudo" >> %{pp_wrkdir}/%{name}/DEBIAN/control
            echo "Replaces: sudo" >> %{pp_wrkdir}/%{name}/DEBIAN/control
            cp -p %{pp_wrkdir}/%{name}/DEBIAN/control %{pp_wrkdir}/%{name}/DEBIAN/control.$$
-           sed 's/^\(Depends:.*\) *$/\1, libldap/' %{pp_wrkdir}/%{name}/DEBIAN/control.$$ > %{pp_wrkdir}/%{name}/DEBIAN/control
+           sed 's/^\(Depends:.*\) *$/\1, libldap2/' %{pp_wrkdir}/%{name}/DEBIAN/control.$$ > %{pp_wrkdir}/%{name}/DEBIAN/control
            rm -f %{pp_wrkdir}/%{name}/DEBIAN/control.$$
        fi