From 20aed3aacf38867104f6c6de04b789c40bf66d0b Mon Sep 17 00:00:00 2001 From: "rjt@cambridgebroadband.com" Date: Mon, 14 Feb 2005 16:25:07 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into flotta.cambridgebroadband.com:/development/openembedded/openembedded 2005/02/14 16:21:19+00:00 cambridgebroadband.com!rjt oops. forgot to up PR for the change to packages/gpe-session-scripts/files/xdefaults.patch 2005/02/11 16:44:53+00:00 cambridgebroadband.com!rjt make sudo install setuid 2005/02/11 16:41:56+00:00 cambridgebroadband.com!rjt fix rebuilding of pygtk 2005/02/11 16:39:20+00:00 cambridgebroadband.com!rjt changes to keep font size sane with new rxvt-unicode BKrev: 4210d0e3Wxo_xX5mKAME4nnoSflXeQ --- packages/gpe-session-scripts/files/xdefaults.patch | 7 +++ .../gpe-session-scripts_0.62.bb | 2 +- packages/python/python-pygtk-0_0.6.12.bb | 2 +- packages/sudo/sudo-1.6.8p6/nonrootinstall.patch | 56 ++++++++++++++++++++++ packages/sudo/sudo-1.6.8p6/nostrip.patch | 20 ++++++++ packages/sudo/sudo_1.6.8p6.bb | 1 + 6 files changed, 86 insertions(+), 2 deletions(-) diff --git a/packages/gpe-session-scripts/files/xdefaults.patch b/packages/gpe-session-scripts/files/xdefaults.patch index e69de29bb2..7eb752847f 100644 --- a/packages/gpe-session-scripts/files/xdefaults.patch +++ b/packages/gpe-session-scripts/files/xdefaults.patch @@ -0,0 +1,7 @@ +--- gpe-session-scripts-0.62/X11/Xdefaults.old 2004-11-26 23:40:15.000000000 +0000 ++++ gpe-session-scripts-0.62/X11/Xdefaults 2004-11-26 23:40:17.000000000 +0000 +@@ -1,2 +1,3 @@ + Rxvt*scrollBar_right: true +-Rxvt*font: Mono-6 ++Rxvt*font: xft:Mono:pixelsize=10 ++ diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb index 4b55b3aecd..0329156840 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r9" +PR = "r10" inherit gpe diff --git a/packages/python/python-pygtk-0_0.6.12.bb b/packages/python/python-pygtk-0_0.6.12.bb index 4975d9dc2f..bb28f1f123 100644 --- a/packages/python/python-pygtk-0_0.6.12.bb +++ b/packages/python/python-pygtk-0_0.6.12.bb @@ -21,7 +21,7 @@ FILES_${PN} = "${libdir}/${PYTHON_DIR}/" do_configure_prepend() { echo ${LDFLAGS} > /tmp/ldflags - rm aclocal.m4 + rm -f aclocal.m4 } do_stage() { diff --git a/packages/sudo/sudo-1.6.8p6/nonrootinstall.patch b/packages/sudo/sudo-1.6.8p6/nonrootinstall.patch index e69de29bb2..db174b373f 100644 --- a/packages/sudo/sudo-1.6.8p6/nonrootinstall.patch +++ b/packages/sudo/sudo-1.6.8p6/nonrootinstall.patch @@ -0,0 +1,56 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +Index: sudo-1.6.8p5/Makefile.in +=================================================================== +--- sudo-1.6.8p5.orig/Makefile.in 2004-11-25 12:27:00.000000000 -0500 ++++ sudo-1.6.8p5/Makefile.in 2005-01-21 18:02:00.447440568 -0500 +@@ -81,10 +81,16 @@ + mandirform = $(mandir)/$(mantype)$(mansectform) + + # User and group ids the installed files should be "owned" by ++ifeq ($(DESTDIR),) ++install_owncmd = -o $(install_uid) -g $(install_gid) ++endif + install_uid = 0 + install_gid = 0 + + # User, group, and mode the sudoers file should be "owned" by (configure) ++ifeq ($(DESTDIR),) ++sudoers_owncmd = -o $(sudoers_uid) -g $(sudoers_gid) ++endif + sudoers_uid = @SUDOERS_UID@ + sudoers_gid = @SUDOERS_GID@ + sudoers_mode = @SUDOERS_MODE@ +@@ -301,12 +307,11 @@ + $(DESTDIR)$(noexecdir) + + install-binaries: $(PROGS) +- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 -s sudo $(DESTDIR)$(sudodir)/sudo ++ $(INSTALL) $(install_owncmd) -m 4555 -s sudo $(DESTDIR)$(sudodir)/sudo ++ $(INSTALL) $(install_owncmd) -m 0555 -s visudo $(DESTDIR)$(visudodir)/visudo + rm -f $(DESTDIR)$(sudodir)/sudoedit + ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit + +- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo +- + install-noexec: sudo_noexec.la + $(LIBTOOL) --mode=install $(INSTALL) sudo_noexec.la $(DESTDIR)$(noexecdir) + +@@ -319,11 +324,11 @@ + $(srcdir)/sudoers $(DESTDIR)$(sudoersdir)/sudoers + + install-man: +- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) ++ $(INSTALL) $(install_owncmd) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) + @rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) + ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) +- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) +- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) ++ $(INSTALL) $(install_owncmd) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) ++ $(INSTALL) $(install_owncmd) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) + @MAN_POSTINSTALL@ + + check: diff --git a/packages/sudo/sudo-1.6.8p6/nostrip.patch b/packages/sudo/sudo-1.6.8p6/nostrip.patch index e69de29bb2..287d43a8e7 100644 --- a/packages/sudo/sudo-1.6.8p6/nostrip.patch +++ b/packages/sudo/sudo-1.6.8p6/nostrip.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: sudo-1.6.8p5/Makefile.in +=================================================================== +--- sudo-1.6.8p5.orig/Makefile.in 2005-01-21 18:19:05.762568976 -0500 ++++ sudo-1.6.8p5/Makefile.in 2005-01-21 18:19:34.701169640 -0500 +@@ -307,8 +307,8 @@ + $(DESTDIR)$(noexecdir) + + install-binaries: $(PROGS) +- $(INSTALL) $(install_owncmd) -m 4555 -s sudo $(DESTDIR)$(sudodir)/sudo +- $(INSTALL) $(install_owncmd) -m 0555 -s visudo $(DESTDIR)$(visudodir)/visudo ++ $(INSTALL) $(install_owncmd) -m 4555 sudo $(DESTDIR)$(sudodir)/sudo ++ $(INSTALL) $(install_owncmd) -m 0555 visudo $(DESTDIR)$(visudodir)/visudo + rm -f $(DESTDIR)$(sudodir)/sudoedit + ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit + diff --git a/packages/sudo/sudo_1.6.8p6.bb b/packages/sudo/sudo_1.6.8p6.bb index f9d55411f8..5b2f3716f5 100644 --- a/packages/sudo/sudo_1.6.8p6.bb +++ b/packages/sudo/sudo_1.6.8p6.bb @@ -5,3 +5,4 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ file://noexec-link.patch;patch=1" include sudo.inc +PR = "r1" -- cgit v1.2.3