diff options
| author | Erik Hovland <erik@hovland.org> | 2006-05-27 15:14:57 +0200 |
|---|---|---|
| committer | Rene Wagner <rw@handhelds.org> | 2006-05-27 15:14:57 +0200 |
| commit | bce772260cdf827e0439bc4ca23f888bf0447c53 (patch) | |
| tree | 88ae8704c1e1072c5774223057a492f3bb8fb69b | |
| parent | 80f0fde420a8cd778aeab94d9550b406f0021cad (diff) | |
gpe-package: don't try to install suid root. provide a gpe-su based wrapper script instead.
Signed-off-by: Rene Wagner <rw@handhelds.org>
3 files changed, 28 insertions, 2 deletions
diff --git a/org.handhelds.familiar/packages/gpe-package/files/gpe-package b/org.handhelds.familiar/packages/gpe-package/files/gpe-package new file mode 100644 index 0000000..2555dfb --- /dev/null +++ b/org.handhelds.familiar/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/org.handhelds.familiar/packages/gpe-package/files/sbin-and-no-suid-install.patch b/org.handhelds.familiar/packages/gpe-package/files/sbin-and-no-suid-install.patch new file mode 100644 index 0000000..10a90f1 --- /dev/null +++ b/org.handhelds.familiar/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/org.handhelds.familiar/packages/gpe-package/gpe-package_0.3.bb b/org.handhelds.familiar/packages/gpe-package/gpe-package_0.3.bb index 0084b7e..55cc4ef 100644 --- a/org.handhelds.familiar/packages/gpe-package/gpe-package_0.3.bb +++ b/org.handhelds.familiar/packages/gpe-package/gpe-package_0.3.bb @@ -1,10 +1,19 @@ LICENSE = "GPL" -PR = "r0" +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" +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 +} |