]> granicus.if.org Git - sudo/commitdiff
Build .deb packages with selinux support.
authorTodd C. Miller <Todd.Miller@courtesan.com>
Thu, 7 Jun 2012 17:59:36 +0000 (13:59 -0400)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Thu, 7 Jun 2012 17:59:36 +0000 (13:59 -0400)
mkpkg
sudo.pp

diff --git a/mkpkg b/mkpkg
index 3d7fb0a441c8ad515817d81134895a61a2626302..c4b61122204dbf270c181572ec9547b2db7ae164 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 a4ac2ddbf34d7ea73737caaee769d99e8fb4486e..8b701368ecf430b3bad9cadc0d129859cff1b8ef 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