From 2c11926528df4459de9c4b6eca3f45c6d3908f06 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 13 Aug 2010 09:35:21 -0700 Subject: procps: Move from meta-moblin to meta-lsb Signed-off-by: Saul Wold --- .../packages/procps/procps-3.2.7/install.patch | 27 --------- .../procps/procps-3.2.7/linux-limits.patch | 13 ----- .../procps/procps-3.2.7/pagesz-not-constant.patch | 22 -------- .../packages/procps/procps-3.2.7/procmodule.patch | 36 ------------ .../packages/procps/procps-3.2.7/procps.init | 6 -- .../packages/procps/procps-3.2.7/psmodule.patch | 21 ------- .../packages/procps/procps-3.2.7/sysctl.conf | 64 ---------------------- 7 files changed, 189 deletions(-) delete mode 100644 meta-moblin/packages/procps/procps-3.2.7/install.patch delete mode 100644 meta-moblin/packages/procps/procps-3.2.7/linux-limits.patch delete mode 100644 meta-moblin/packages/procps/procps-3.2.7/pagesz-not-constant.patch delete mode 100644 meta-moblin/packages/procps/procps-3.2.7/procmodule.patch delete mode 100644 meta-moblin/packages/procps/procps-3.2.7/procps.init delete mode 100644 meta-moblin/packages/procps/procps-3.2.7/psmodule.patch delete mode 100644 meta-moblin/packages/procps/procps-3.2.7/sysctl.conf (limited to 'meta-moblin/packages/procps/procps-3.2.7') diff --git a/meta-moblin/packages/procps/procps-3.2.7/install.patch b/meta-moblin/packages/procps/procps-3.2.7/install.patch deleted file mode 100644 index 9f1ef6915..000000000 --- a/meta-moblin/packages/procps/procps-3.2.7/install.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 -+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 -@@ -30,7 +30,10 @@ - install := install -D --owner 0 --group 0 - - # Lame x86-64 /lib64 and /usr/lib64 abomination: --lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+# lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+ -+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. -+lib64 := lib - - usr/bin := $(DESTDIR)/usr/bin/ - bin := $(DESTDIR)/bin/ -@@ -211,10 +214,10 @@ - ###### install - - $(BINFILES) : all -- $(install) --mode a=rx $(notdir $@) $@ -+ $(install) -m 555 $(notdir $@) $@ - - $(MANFILES) : all -- $(install) --mode a=r $(notdir $@) $@ -+ $(install) -m 444 $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice diff --git a/meta-moblin/packages/procps/procps-3.2.7/linux-limits.patch b/meta-moblin/packages/procps/procps-3.2.7/linux-limits.patch deleted file mode 100644 index dcd66163a..000000000 --- a/meta-moblin/packages/procps/procps-3.2.7/linux-limits.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pwdx.c b/pwdx.c -index cb96a52..29ebce2 100644 ---- a/pwdx.c -+++ b/pwdx.c -@@ -13,7 +13,7 @@ - #include - #include - #include --#include -+#include - #include - #include - diff --git a/meta-moblin/packages/procps/procps-3.2.7/pagesz-not-constant.patch b/meta-moblin/packages/procps/procps-3.2.7/pagesz-not-constant.patch deleted file mode 100644 index 8e9e1ebfe..000000000 --- a/meta-moblin/packages/procps/procps-3.2.7/pagesz-not-constant.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: procps-3.2.1/proc/devname.c -=================================================================== ---- procps-3.2.1.orig/proc/devname.c 2004-03-18 05:43:50.000000000 +1100 -+++ procps-3.2.1/proc/devname.c 2005-04-02 10:40:17.462138000 +1000 -@@ -227,7 +227,7 @@ - - /* number --> name */ - unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) { -- static char buf[PAGE_SIZE]; -+ static char buf[4096]; - char *restrict tmp = buf; - unsigned dev = dev_t_dev; - unsigned i = 0; -@@ -249,7 +249,7 @@ - if((flags&ABBREV_TTY) && !strncmp(tmp,"tty", 3) && tmp[3]) tmp += 3; - if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4; - /* gotta check before we chop or we may chop someone else's memory */ -- if(chop + (unsigned long)(tmp-buf) <= sizeof buf) -+ if(chop + (unsigned long)(tmp-buf) < sizeof buf) - tmp[chop] = '\0'; - /* replace non-ASCII characters with '?' and return the number of chars */ - for(;;){ diff --git a/meta-moblin/packages/procps/procps-3.2.7/procmodule.patch b/meta-moblin/packages/procps/procps-3.2.7/procmodule.patch deleted file mode 100644 index fabfabaa5..000000000 --- a/meta-moblin/packages/procps/procps-3.2.7/procmodule.patch +++ /dev/null @@ -1,36 +0,0 @@ -*** procps-3.2.5/proc/module.mk.orig Sun Jul 24 11:53:49 2005 ---- procps-3.2.5/proc/module.mk Sun Jul 24 11:54:32 2005 -*************** -*** 96,102 **** - #################### install rules ########################### - - $(lib)$(SOFILE) : proc/$(SONAME) -! $(install) --mode a=rx $< $@ - - ifneq ($(SOLINK),$(SOFILE)) - .PHONY: $(lib)$(SOLINK) ---- 96,102 ---- - #################### install rules ########################### - - $(lib)$(SOFILE) : proc/$(SONAME) -! $(install) -m 555 $< $@ - - ifneq ($(SOLINK),$(SOFILE)) - .PHONY: $(lib)$(SOLINK) -*************** -*** 115,121 **** - $(ldconfig) - - $(usr/lib)$(ANAME) : proc/$(ANAME) -! $(install) --mode a=r $< $@ - - # Junk anyway... supposed to go in /usr/include/$(NAME) - #INSTALL += $(addprefix $(include),$(HDRFILES)) ---- 115,121 ---- - $(ldconfig) - - $(usr/lib)$(ANAME) : proc/$(ANAME) -! $(install) -m 444 $< $@ - - # Junk anyway... supposed to go in /usr/include/$(NAME) - #INSTALL += $(addprefix $(include),$(HDRFILES)) diff --git a/meta-moblin/packages/procps/procps-3.2.7/procps.init b/meta-moblin/packages/procps/procps-3.2.7/procps.init deleted file mode 100644 index 739dcf4be..000000000 --- a/meta-moblin/packages/procps/procps-3.2.7/procps.init +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -SYSCTL_CONF="/etc/sysctl.conf" -if [ -f "${SYSCTL_CONF}" ]; then - /sbin/sysctl -q -p "${SYSCTL_CONF}" -fi diff --git a/meta-moblin/packages/procps/procps-3.2.7/psmodule.patch b/meta-moblin/packages/procps/procps-3.2.7/psmodule.patch deleted file mode 100644 index f298c1c1c..000000000 --- a/meta-moblin/packages/procps/procps-3.2.7/psmodule.patch +++ /dev/null @@ -1,21 +0,0 @@ -*** procps-3.2.5/ps/module.mk.orig Sun Jul 24 11:54:40 2005 ---- procps-3.2.5/ps/module.mk Sun Jul 24 11:55:02 2005 -*************** -*** 33,40 **** - - - $(bin)ps: ps/ps -! $(install) --mode a=rx $< $@ - - $(man1)ps.1 : ps/ps.1 -! $(install) --mode a=r $< $@ - -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz ---- 33,40 ---- - - - $(bin)ps: ps/ps -! $(install) -m 555 $< $@ - - $(man1)ps.1 : ps/ps.1 -! $(install) -m 444 $< $@ - -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz diff --git a/meta-moblin/packages/procps/procps-3.2.7/sysctl.conf b/meta-moblin/packages/procps/procps-3.2.7/sysctl.conf deleted file mode 100644 index 34e7488bf..000000000 --- a/meta-moblin/packages/procps/procps-3.2.7/sysctl.conf +++ /dev/null @@ -1,64 +0,0 @@ -# This configuration file is taken from Debian. -# -# /etc/sysctl.conf - Configuration file for setting system variables -# See sysctl.conf (5) for information. -# - -#kernel.domainname = example.com - -# Uncomment the following to stop low-level messages on console -#kernel.printk = 4 4 1 7 - -##############################################################3 -# Functions previously found in netbase -# - -# Uncomment the next two lines to enable Spoof protection (reverse-path filter) -# Turn on Source Address Verification in all interfaces to -# prevent some spoofing attacks -net.ipv4.conf.default.rp_filter=1 -net.ipv4.conf.all.rp_filter=1 - -# Uncomment the next line to enable TCP/IP SYN cookies -#net.ipv4.tcp_syncookies=1 - -# Uncomment the next line to enable packet forwarding for IPv4 -#net.ipv4.ip_forward=1 - -# Uncomment the next line to enable packet forwarding for IPv6 -#net.ipv6.conf.all.forwarding=1 - - -################################################################### -# Additional settings - these settings can improve the network -# security of the host and prevent against some network attacks -# including spoofing attacks and man in the middle attacks through -# redirection. Some network environments, however, require that these -# settings are disabled so review and enable them as needed. -# -# Ignore ICMP broadcasts -#net.ipv4.icmp_echo_ignore_broadcasts = 1 -# -# Ignore bogus ICMP errors -#net.ipv4.icmp_ignore_bogus_error_responses = 1 -# -# Do not accept ICMP redirects (prevent MITM attacks) -#net.ipv4.conf.all.accept_redirects = 0 -#net.ipv6.conf.all.accept_redirects = 0 -# _or_ -# Accept ICMP redirects only for gateways listed in our default -# gateway list (enabled by default) -# net.ipv4.conf.all.secure_redirects = 1 -# -# Do not send ICMP redirects (we are not a router) -#net.ipv4.conf.all.send_redirects = 0 -# -# Do not accept IP source route packets (we are not a router) -#net.ipv4.conf.all.accept_source_route = 0 -#net.ipv6.conf.all.accept_source_route = 0 -# -# Log Martian Packets -#net.ipv4.conf.all.log_martians = 1 -# - -#kernel.shmmax = 141762560 -- cgit v1.2.3