diff options
| author |   Erik Hovland <erik@hovland.org> | 2006-05-25 19:13:15 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-25 19:13:15 +0000 |
| commit | 50076d5bd9edd61236ce44e5ce13dd269f2f7a52 (patch) | |
| tree | 9bb8d87579c761d82522271f150969d72bf36222 | |
| parent | 86c7a226dcf5dbd77f68509c625f8cd78a89e17c (diff) | |
| download | openembedded-50076d5bd9edd61236ce44e5ce13dd269f2f7a52.tar.gz | |
gpe-package 0.3 | GPE Settings: fixes the use of gpe-package having to be root
* provides a script to be installed in /usr/bin that wraps gpe-package
launching in gpe-su
* patches the gpe-package makefile to install gpe-package in /usr/sbin
and strips the setuid bit (and execute bits from group and other).
* removes the postinst script that added the setuid bit.
| -rw-r--r-- | packages/gpe-package/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gpe-package/files/gpe-package | 2 | ||||
| -rw-r--r-- | packages/gpe-package/files/sbin-and-no-suid-install.patch | 15 | ||||
| -rw-r--r-- | packages/gpe-package/gpe-package_0.3.bb | 15 |
4 files changed, 27 insertions, 5 deletions
diff --git a/packages/gpe-package/files/.mtn2git_empty b/packages/gpe-package/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-package/files/.mtn2git_empty diff --git a/packages/gpe-package/files/gpe-package b/packages/gpe-package/files/gpe-package new file mode 100644 index 0000000000..2555dfb975 --- /dev/null +++ b/packages/gpe-package/files/gpe-package @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/gpe-su -c /usr/sbin/gpe-package diff --git a/packages/gpe-package/files/sbin-and-no-suid-install.patch b/packages/gpe-package/files/sbin-and-no-suid-install.patch new file mode 100644 index 0000000000..10a90f1d30 --- /dev/null +++ b/packages/gpe-package/files/sbin-and-no-suid-install.patch @@ -0,0 +1,15 @@ +--- gpe-package-0.3/Makefile 2005-08-26 06:14:00.000000000 -0700 ++++ gpe-package-0.3-oe/Makefile 2006-05-24 16:51:02.459320395 -0700 +@@ -52,9 +52,9 @@ + mkdir -p $(DESTDIR)/CONTROL + sed -e s/VERSION/$(VERSION)/ < familiar/control > $(DESTDIR)/CONTROL/control + mkdir -p $(DESTDIR)/etc/gpe +- mkdir -p $(DESTDIR)/$(PREFIX)/bin +- $(INSTALL) -m 4755 $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) +- $(STRIP) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ mkdir -p $(DESTDIR)/$(PREFIX)/sbin ++ $(INSTALL) -m 0744 $(PACKAGE) $(DESTDIR)$(PREFIX)/sbin/$(PACKAGE) ++ $(STRIP) $(DESTDIR)$(PREFIX)/sbin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps + for i in $(PIXMAPS); do install -m 644 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done + mkdir -p $(DESTDIR)$(PREFIX)/share/applications diff --git a/packages/gpe-package/gpe-package_0.3.bb b/packages/gpe-package/gpe-package_0.3.bb index d74b0df5a3..55cc4ef2a8 100644 --- a/packages/gpe-package/gpe-package_0.3.bb +++ b/packages/gpe-package/gpe-package_0.3.bb @@ -1,14 +1,19 @@ LICENSE = "GPL" -PR = "r1" +PR = "r2" inherit gpe pkgconfig DESCRIPTION = "A package manager GUI for GPE" -DEPENDS = "ipkg libgpewidget" +DEPENDS = "ipkg libgpewidget gpe-su" RDEPENDS = "gpe-icons" SECTION = "gpe" PRIORITY = "optional" -pkg_postinst () { -#!/bin/sh -chmod u+s /usr/bin/gpe-package +SRC_URI += " file://sbin-and-no-suid-install.patch;patch=1 \ + file://gpe-package" + +FILES_${PN} += " /usr/bin/gpe-package" + +do_install_append() { + install -d ${D}/usr/bin + install -m 0755 ${WORKDIR}/gpe-package ${D}/usr/bin } |