diff options
author | Qing He <qing.he@intel.com> | 2010-11-10 15:57:07 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2010-11-14 21:07:45 -0800 |
commit | 3155cdeb0dbc8de482bd328af00b82dd012da01e (patch) | |
tree | a0fe683981342119a32e903f42aadf3a7c10c75b /meta/recipes-extended/procps/procps-3.2.8 | |
parent | 1a76da9a2d2d9db6409313e7a4d90ee040dfb59c (diff) | |
download | poky-3155cdeb0dbc8de482bd328af00b82dd012da01e.tar.gz |
procps: upgrade to version 3.2.8
from 3.2.7
also update license info
[sgw@linux.intel.com: added gmake-3.82 patch to correct location]
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/procps/procps-3.2.8')
8 files changed, 206 insertions, 0 deletions
diff --git a/meta/recipes-extended/procps/procps-3.2.8/install.patch b/meta/recipes-extended/procps/procps-3.2.8/install.patch new file mode 100644 index 0000000000..9f1ef6915d --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.8/install.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | --- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 | ||
2 | +++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 | ||
3 | @@ -30,7 +30,10 @@ | ||
4 | install := install -D --owner 0 --group 0 | ||
5 | |||
6 | # Lame x86-64 /lib64 and /usr/lib64 abomination: | ||
7 | -lib64 := lib$(shell [ -d /lib64 ] && echo 64) | ||
8 | +# lib64 := lib$(shell [ -d /lib64 ] && echo 64) | ||
9 | + | ||
10 | +# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. | ||
11 | +lib64 := lib | ||
12 | |||
13 | usr/bin := $(DESTDIR)/usr/bin/ | ||
14 | bin := $(DESTDIR)/bin/ | ||
15 | @@ -211,10 +214,10 @@ | ||
16 | ###### install | ||
17 | |||
18 | $(BINFILES) : all | ||
19 | - $(install) --mode a=rx $(notdir $@) $@ | ||
20 | + $(install) -m 555 $(notdir $@) $@ | ||
21 | |||
22 | $(MANFILES) : all | ||
23 | - $(install) --mode a=r $(notdir $@) $@ | ||
24 | + $(install) -m 444 $(notdir $@) $@ | ||
25 | |||
26 | install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) | ||
27 | cd $(usr/bin) && $(ln_f) skill snice | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch b/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch new file mode 100644 index 0000000000..dcd66163ad --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | diff --git a/pwdx.c b/pwdx.c | ||
2 | index cb96a52..29ebce2 100644 | ||
3 | --- a/pwdx.c | ||
4 | +++ b/pwdx.c | ||
5 | @@ -13,7 +13,7 @@ | ||
6 | #include <stdlib.h> | ||
7 | #include <sys/types.h> | ||
8 | #include <regex.h> | ||
9 | -#include <limits.h> | ||
10 | +#include <linux/limits.h> | ||
11 | #include <unistd.h> | ||
12 | #include <errno.h> | ||
13 | |||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/pagesz-not-constant.patch b/meta/recipes-extended/procps/procps-3.2.8/pagesz-not-constant.patch new file mode 100644 index 0000000000..8e9e1ebfe1 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.8/pagesz-not-constant.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Index: procps-3.2.1/proc/devname.c | ||
2 | =================================================================== | ||
3 | --- procps-3.2.1.orig/proc/devname.c 2004-03-18 05:43:50.000000000 +1100 | ||
4 | +++ procps-3.2.1/proc/devname.c 2005-04-02 10:40:17.462138000 +1000 | ||
5 | @@ -227,7 +227,7 @@ | ||
6 | |||
7 | /* number --> name */ | ||
8 | unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) { | ||
9 | - static char buf[PAGE_SIZE]; | ||
10 | + static char buf[4096]; | ||
11 | char *restrict tmp = buf; | ||
12 | unsigned dev = dev_t_dev; | ||
13 | unsigned i = 0; | ||
14 | @@ -249,7 +249,7 @@ | ||
15 | if((flags&ABBREV_TTY) && !strncmp(tmp,"tty", 3) && tmp[3]) tmp += 3; | ||
16 | if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4; | ||
17 | /* gotta check before we chop or we may chop someone else's memory */ | ||
18 | - if(chop + (unsigned long)(tmp-buf) <= sizeof buf) | ||
19 | + if(chop + (unsigned long)(tmp-buf) < sizeof buf) | ||
20 | tmp[chop] = '\0'; | ||
21 | /* replace non-ASCII characters with '?' and return the number of chars */ | ||
22 | for(;;){ | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch b/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch new file mode 100644 index 0000000000..fabfabaa59 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | *** procps-3.2.5/proc/module.mk.orig Sun Jul 24 11:53:49 2005 | ||
2 | --- procps-3.2.5/proc/module.mk Sun Jul 24 11:54:32 2005 | ||
3 | *************** | ||
4 | *** 96,102 **** | ||
5 | #################### install rules ########################### | ||
6 | |||
7 | $(lib)$(SOFILE) : proc/$(SONAME) | ||
8 | ! $(install) --mode a=rx $< $@ | ||
9 | |||
10 | ifneq ($(SOLINK),$(SOFILE)) | ||
11 | .PHONY: $(lib)$(SOLINK) | ||
12 | --- 96,102 ---- | ||
13 | #################### install rules ########################### | ||
14 | |||
15 | $(lib)$(SOFILE) : proc/$(SONAME) | ||
16 | ! $(install) -m 555 $< $@ | ||
17 | |||
18 | ifneq ($(SOLINK),$(SOFILE)) | ||
19 | .PHONY: $(lib)$(SOLINK) | ||
20 | *************** | ||
21 | *** 115,121 **** | ||
22 | $(ldconfig) | ||
23 | |||
24 | $(usr/lib)$(ANAME) : proc/$(ANAME) | ||
25 | ! $(install) --mode a=r $< $@ | ||
26 | |||
27 | # Junk anyway... supposed to go in /usr/include/$(NAME) | ||
28 | #INSTALL += $(addprefix $(include),$(HDRFILES)) | ||
29 | --- 115,121 ---- | ||
30 | $(ldconfig) | ||
31 | |||
32 | $(usr/lib)$(ANAME) : proc/$(ANAME) | ||
33 | ! $(install) -m 444 $< $@ | ||
34 | |||
35 | # Junk anyway... supposed to go in /usr/include/$(NAME) | ||
36 | #INSTALL += $(addprefix $(include),$(HDRFILES)) | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch b/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch new file mode 100644 index 0000000000..23310e0592 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Fix for stricter Makefile parser in Make 3.82 take from Gentoo bugzilla: | ||
2 | http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-process/procps/files/procps-3.2.8%2Bgmake-3.82.patch?revision=1.1 | ||
3 | |||
4 | Index: procps-3.2.8/Makefile | ||
5 | =================================================================== | ||
6 | --- procps-3.2.8.orig/Makefile | ||
7 | +++ procps-3.2.8/Makefile | ||
8 | @@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES) | ||
9 | # want this rule first, use := on ALL, and ALL not filled in yet | ||
10 | all: do_all | ||
11 | |||
12 | --include */module.mk | ||
13 | +-include proc/module.mk | ||
14 | +-include ps/module.mk | ||
15 | |||
16 | do_all: $(ALL) | ||
17 | |||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/procps.init b/meta/recipes-extended/procps/procps-3.2.8/procps.init new file mode 100644 index 0000000000..739dcf4be7 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.8/procps.init | |||
@@ -0,0 +1,6 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | SYSCTL_CONF="/etc/sysctl.conf" | ||
4 | if [ -f "${SYSCTL_CONF}" ]; then | ||
5 | /sbin/sysctl -q -p "${SYSCTL_CONF}" | ||
6 | fi | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch b/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch new file mode 100644 index 0000000000..f298c1c1c4 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | *** procps-3.2.5/ps/module.mk.orig Sun Jul 24 11:54:40 2005 | ||
2 | --- procps-3.2.5/ps/module.mk Sun Jul 24 11:55:02 2005 | ||
3 | *************** | ||
4 | *** 33,40 **** | ||
5 | |||
6 | |||
7 | $(bin)ps: ps/ps | ||
8 | ! $(install) --mode a=rx $< $@ | ||
9 | |||
10 | $(man1)ps.1 : ps/ps.1 | ||
11 | ! $(install) --mode a=r $< $@ | ||
12 | -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz | ||
13 | --- 33,40 ---- | ||
14 | |||
15 | |||
16 | $(bin)ps: ps/ps | ||
17 | ! $(install) -m 555 $< $@ | ||
18 | |||
19 | $(man1)ps.1 : ps/ps.1 | ||
20 | ! $(install) -m 444 $< $@ | ||
21 | -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/sysctl.conf b/meta/recipes-extended/procps/procps-3.2.8/sysctl.conf new file mode 100644 index 0000000000..34e7488bf7 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.8/sysctl.conf | |||
@@ -0,0 +1,64 @@ | |||
1 | # This configuration file is taken from Debian. | ||
2 | # | ||
3 | # /etc/sysctl.conf - Configuration file for setting system variables | ||
4 | # See sysctl.conf (5) for information. | ||
5 | # | ||
6 | |||
7 | #kernel.domainname = example.com | ||
8 | |||
9 | # Uncomment the following to stop low-level messages on console | ||
10 | #kernel.printk = 4 4 1 7 | ||
11 | |||
12 | ##############################################################3 | ||
13 | # Functions previously found in netbase | ||
14 | # | ||
15 | |||
16 | # Uncomment the next two lines to enable Spoof protection (reverse-path filter) | ||
17 | # Turn on Source Address Verification in all interfaces to | ||
18 | # prevent some spoofing attacks | ||
19 | net.ipv4.conf.default.rp_filter=1 | ||
20 | net.ipv4.conf.all.rp_filter=1 | ||
21 | |||
22 | # Uncomment the next line to enable TCP/IP SYN cookies | ||
23 | #net.ipv4.tcp_syncookies=1 | ||
24 | |||
25 | # Uncomment the next line to enable packet forwarding for IPv4 | ||
26 | #net.ipv4.ip_forward=1 | ||
27 | |||
28 | # Uncomment the next line to enable packet forwarding for IPv6 | ||
29 | #net.ipv6.conf.all.forwarding=1 | ||
30 | |||
31 | |||
32 | ################################################################### | ||
33 | # Additional settings - these settings can improve the network | ||
34 | # security of the host and prevent against some network attacks | ||
35 | # including spoofing attacks and man in the middle attacks through | ||
36 | # redirection. Some network environments, however, require that these | ||
37 | # settings are disabled so review and enable them as needed. | ||
38 | # | ||
39 | # Ignore ICMP broadcasts | ||
40 | #net.ipv4.icmp_echo_ignore_broadcasts = 1 | ||
41 | # | ||
42 | # Ignore bogus ICMP errors | ||
43 | #net.ipv4.icmp_ignore_bogus_error_responses = 1 | ||
44 | # | ||
45 | # Do not accept ICMP redirects (prevent MITM attacks) | ||
46 | #net.ipv4.conf.all.accept_redirects = 0 | ||
47 | #net.ipv6.conf.all.accept_redirects = 0 | ||
48 | # _or_ | ||
49 | # Accept ICMP redirects only for gateways listed in our default | ||
50 | # gateway list (enabled by default) | ||
51 | # net.ipv4.conf.all.secure_redirects = 1 | ||
52 | # | ||
53 | # Do not send ICMP redirects (we are not a router) | ||
54 | #net.ipv4.conf.all.send_redirects = 0 | ||
55 | # | ||
56 | # Do not accept IP source route packets (we are not a router) | ||
57 | #net.ipv4.conf.all.accept_source_route = 0 | ||
58 | #net.ipv6.conf.all.accept_source_route = 0 | ||
59 | # | ||
60 | # Log Martian Packets | ||
61 | #net.ipv4.conf.all.log_martians = 1 | ||
62 | # | ||
63 | |||
64 | #kernel.shmmax = 141762560 | ||