diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-08-17 16:25:22 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-08-17 16:25:52 +0200 |
| commit | 9e497b5b5e1f50f9d3b6df85008b1b2a9aeb45f6 (patch) | |
| tree | c884f5abde88a1fed13013453c6a3f2f83595a4a /ubuntu/maverick/tdebase/debian | |
| parent | 63b881d00ae2604da5dcec6aa6684ad8fba45e93 (diff) | |
| download | tde-packaging-9e497b5b5e1f50f9d3b6df85008b1b2a9aeb45f6.tar.gz tde-packaging-9e497b5b5e1f50f9d3b6df85008b1b2a9aeb45f6.zip | |
Use standard way to install setuid binaries on Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick/tdebase/debian')
| -rwxr-xr-x | ubuntu/maverick/tdebase/debian/rules | 4 | ||||
| -rw-r--r-- | ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian | 3 | ||||
| -rw-r--r-- | ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.postinst | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index b423a1c6b..c2be9ec9b 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -29,6 +29,8 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_BUILD_PARALLEL = true DEB_FIXPERMS_EXCLUDE := \ + opt/trinity/bin/kcheckpass \ + opt/trinity/bin/tdekbdledsync \ opt/trinity/bin/tdesud \ opt/trinity/bin/tdmtsak @@ -246,8 +248,6 @@ binary-install/tdebase-trinity-bin:: install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/system.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/autostart/ - chmod +s debian/tdebase-trinity-bin/opt/trinity/bin/kcheckpass - chmod +s debian/tdebase-trinity-bin/opt/trinity/bin/tdekbdledsync binary-install/ksmserver-trinity:: install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian index 07cf159e7..6501cf36b 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian @@ -1,4 +1,7 @@ +tdebase-bin-trinity: setuid-binary opt/trinity/bin/kcheckpass 4711 root/root +tdebase-bin-trinity: setuid-binary opt/trinity/bin/tdekbdledsync 4711 root/root tdebase-bin-trinity: setgid-binary opt/trinity/bin/tdesud 2755 root/nogroup +tdebase-bin-trinity: setuid-binary opt/trinity/bin/tdmtsak 4711 root/root tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.postinst b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.postinst index e23d07de2..454d0690d 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.postinst +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.postinst @@ -11,8 +11,6 @@ fi case "$1" in configure) - chmod +s /opt/trinity/bin/kcheckpass || true - chmod +s /opt/trinity/bin/tdekbdledsync || true ;; abort-upgrade) ;; |