diff options
Diffstat (limited to 'meta/recipes-extended')
100 files changed, 4640 insertions, 0 deletions
diff --git a/meta/recipes-extended/at/at-3.1.10.2/configure.patch b/meta/recipes-extended/at/at-3.1.10.2/configure.patch new file mode 100644 index 0000000000..f6720111d6 --- /dev/null +++ b/meta/recipes-extended/at/at-3.1.10.2/configure.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | # Fix cross-compilation issues in configure.ac | ||
2 | # Derived from an OE patch for at-3.1.8 | ||
3 | |||
4 | --- at-3.1.10.2.orig/configure.in 2005-08-04 20:16:02.000000000 -0700 | ||
5 | +++ at-3.1.10.2/configure.in 2010-07-21 15:52:38.000000000 -0700 | ||
6 | @@ -37,12 +37,11 @@ | ||
7 | AC_MSG_RESULT(no) | ||
8 | ;; | ||
9 | esac | ||
10 | +if [ X"${cross_compiling}" = Xno ]; then | ||
11 | AC_MSG_CHECKING(Trying to compile a trivial ANSI C program) | ||
12 | -AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], | ||
13 | - AC_MSG_RESULT(yes), | ||
14 | - AC_MSG_RESULT(no) | ||
15 | - AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.), | ||
16 | - AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)) | ||
17 | +AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) | ||
18 | + AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)],[AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)]) | ||
19 | +fi | ||
20 | |||
21 | AC_MSG_CHECKING(__attribute__((noreturn))) | ||
22 | AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], | ||
diff --git a/meta/recipes-extended/at/at-3.1.12/configure.patch b/meta/recipes-extended/at/at-3.1.12/configure.patch new file mode 100644 index 0000000000..6ab528d0b2 --- /dev/null +++ b/meta/recipes-extended/at/at-3.1.12/configure.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | # Fix cross-compilation issues in configure.ac | ||
2 | # Derived from an OE patch for at-3.1.8 | ||
3 | |||
4 | --- at-3.1.12.orig/configure.ac 2009-11-23 07:11:52.000000000 -0800 | ||
5 | +++ at-3.1.12/configure.ac 2010-07-20 16:23:14.000000000 -0700 | ||
6 | @@ -38,12 +38,11 @@ | ||
7 | AC_MSG_RESULT(no) | ||
8 | ;; | ||
9 | esac | ||
10 | +if [ X"${cross_compiling}" = Xno ]; then | ||
11 | AC_MSG_CHECKING(Trying to compile a trivial ANSI C program) | ||
12 | -AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], | ||
13 | - AC_MSG_RESULT(yes), | ||
14 | - AC_MSG_RESULT(no) | ||
15 | - AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.), | ||
16 | - AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)) | ||
17 | +AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) | ||
18 | + AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)], [AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)]) | ||
19 | +fi | ||
20 | |||
21 | AC_MSG_CHECKING(__attribute__((noreturn))) | ||
22 | AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], | ||
diff --git a/meta/recipes-extended/at/at.inc b/meta/recipes-extended/at/at.inc new file mode 100644 index 0000000000..64ae9c2b6a --- /dev/null +++ b/meta/recipes-extended/at/at.inc | |||
@@ -0,0 +1,11 @@ | |||
1 | DESCRIPTION = "Delayed job execution and batch processing" | ||
2 | SECTION = "base" | ||
3 | DEPENDS = "flex" | ||
4 | RCONFLICTS_${PN} = "atd" | ||
5 | RREPLACES_${PN} = "atd" | ||
6 | |||
7 | inherit autotools | ||
8 | |||
9 | do_install () { | ||
10 | oe_runmake "IROOT=${D}" install | ||
11 | } | ||
diff --git a/meta/recipes-extended/at/at_3.1.10.2.bb b/meta/recipes-extended/at/at_3.1.10.2.bb new file mode 100644 index 0000000000..ff4cf489b3 --- /dev/null +++ b/meta/recipes-extended/at/at_3.1.10.2.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | require at.inc | ||
2 | |||
3 | LICENSE="GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" | ||
5 | |||
6 | PR = "r0" | ||
7 | |||
8 | SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.tar.gz \ | ||
9 | file://configure.patch \ | ||
10 | file://nonrootinstall.patch \ | ||
11 | file://use-ldflags.patch" | ||
12 | |||
13 | SRC_URI[md5sum] = "485688690a0aae53224c4150867da334" | ||
14 | SRC_URI[sha256sum] = "35c4ab4248ba5898ccaddc5efe8722a8f3639deeb07623fa2d41f740e337690f" | ||
diff --git a/meta/recipes-extended/at/at_3.1.12.bb b/meta/recipes-extended/at/at_3.1.12.bb new file mode 100644 index 0000000000..141168dc9a --- /dev/null +++ b/meta/recipes-extended/at/at_3.1.12.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | require at.inc | ||
2 | |||
3 | LICENSE="GPLv2+ & GPLv3+" | ||
4 | LIC_FILES_CHKSUM = "file://Copyright;md5=dffa11c636884752fbf0b2a159b2883a" | ||
5 | |||
6 | PR = "r0" | ||
7 | |||
8 | SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ | ||
9 | file://configure.patch \ | ||
10 | file://nonrootinstall.patch \ | ||
11 | file://use-ldflags.patch" | ||
12 | |||
13 | SRC_URI[md5sum] = "1e67991776148fb319fd77a2e599a765" | ||
14 | SRC_URI[sha256sum] = "7c55c6ab4fbe8add9e68f31b2b0ebf3fe805c9a4e7cfb2623a3d8a4789cc18f3" | ||
diff --git a/meta/recipes-extended/at/files/nonrootinstall.patch b/meta/recipes-extended/at/files/nonrootinstall.patch new file mode 100644 index 0000000000..f760e85ae8 --- /dev/null +++ b/meta/recipes-extended/at/files/nonrootinstall.patch | |||
@@ -0,0 +1,75 @@ | |||
1 | # Modify install rules to disable file ownership changes | ||
2 | # Disable stripping binaries | ||
3 | # Derived from an OE patch for at-3.1.8 | ||
4 | |||
5 | --- at-3.1.10.2.orig/Makefile.in 2005-08-29 01:08:28.000000000 -0700 | ||
6 | +++ at-3.1.10.2/Makefile.in 2010-07-21 17:06:01.000000000 -0700 | ||
7 | @@ -40,6 +40,10 @@ | ||
8 | LIBS = @LIBS@ | ||
9 | LIBOBJS = @LIBOBJS@ | ||
10 | INSTALL = @INSTALL@ | ||
11 | +ifeq ($(IROOT),) | ||
12 | +INSTALLOWN = -g root -o root | ||
13 | +DAEMONOWN = -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) | ||
14 | +endif | ||
15 | PAMLIB = @PAMLIB@ | ||
16 | |||
17 | CLONES = atq atrm | ||
18 | @@ -88,35 +92,38 @@ | ||
19 | $(CC) -c $(CFLAGS) $(DEFS) $*.c | ||
20 | |||
21 | install: all | ||
22 | - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir) | ||
23 | - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir) | ||
24 | - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir) | ||
25 | - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir) | ||
26 | - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir) | ||
27 | - $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) | ||
28 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(etcdir) | ||
29 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(bindir) | ||
30 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(sbindir) | ||
31 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(docdir) | ||
32 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(atdocdir) | ||
33 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(ATJOB_DIR) | ||
34 | + $(INSTALL) $(DAEMONOWN) -m 755 -d $(IROOT)$(ATSPOOL_DIR) | ||
35 | chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) | ||
36 | touch $(IROOT)$(LFILE) | ||
37 | chmod 600 $(IROOT)$(LFILE) | ||
38 | +ifeq ($(IROOT),) | ||
39 | chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) | ||
40 | - test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/ | ||
41 | - $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir) | ||
42 | +endif | ||
43 | + test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) $(INSTALLOWN) -m 600 at.deny $(IROOT)$(etcdir)/ | ||
44 | + $(INSTALL) $(INSTALLOWN) -m 4755 at $(IROOT)$(bindir) | ||
45 | $(LN_S) -f at $(IROOT)$(bindir)/atq | ||
46 | $(LN_S) -f at $(IROOT)$(bindir)/atrm | ||
47 | - $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) | ||
48 | - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) | ||
49 | - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) | ||
50 | - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) | ||
51 | - $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir) | ||
52 | - $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir) | ||
53 | - $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/ | ||
54 | + $(INSTALL) $(INSTALLOWN) -m 755 batch $(IROOT)$(bindir) | ||
55 | + $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man1dir) | ||
56 | + $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man5dir) | ||
57 | + $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man8dir) | ||
58 | + $(INSTALL) $(INSTALLOWN) -m 755 atd $(IROOT)$(sbindir) | ||
59 | + $(INSTALL) $(INSTALLOWN) -m 755 atrun $(IROOT)$(sbindir) | ||
60 | + $(INSTALL) $(INSTALLOWN) -m 644 at.1 $(IROOT)$(man1dir)/ | ||
61 | cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 | ||
62 | - $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/ | ||
63 | + $(INSTALL) $(INSTALLOWN) -m 644 atd.8 $(IROOT)$(man8dir)/ | ||
64 | sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman | ||
65 | - $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 | ||
66 | + $(INSTALL) $(INSTALLOWN) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 | ||
67 | rm -f tmpman | ||
68 | - $(INSTALL) -g root -o root -m 644 at_allow.5 $(IROOT)$(man5dir)/ | ||
69 | + $(INSTALL) $(INSTALLOWN) -m 644 at_allow.5 $(IROOT)$(man5dir)/ | ||
70 | cd $(IROOT)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 | ||
71 | - $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir) | ||
72 | + $(INSTALL) $(INSTALLOWN) -m 644 $(DOCS) $(IROOT)$(atdocdir) | ||
73 | rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ | ||
74 | $(IROOT)$(mandir)/cat1/atq.1* | ||
75 | rm -f $(IROOT)$(mandir)/cat1/atd.8* | ||
diff --git a/meta/recipes-extended/at/files/use-ldflags.patch b/meta/recipes-extended/at/files/use-ldflags.patch new file mode 100644 index 0000000000..7d3d91a19a --- /dev/null +++ b/meta/recipes-extended/at/files/use-ldflags.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | # Ensure use of $LDFLAGS during build | ||
2 | # Derived from an OE patch for at-3.1.8 | ||
3 | |||
4 | --- at-3.1.12.orig/Makefile.in 2009-11-23 07:11:52.000000000 -0800 | ||
5 | +++ at-3.1.12/Makefile.in 2010-07-20 16:28:04.000000000 -0700 | ||
6 | @@ -65,13 +65,13 @@ | ||
7 | all: at atd atrun | ||
8 | |||
9 | at: $(ATOBJECTS) | ||
10 | - $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) | ||
11 | + $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) $(LDFLAGS) | ||
12 | rm -f $(CLONES) | ||
13 | $(LN_S) -f at atq | ||
14 | $(LN_S) -f at atrm | ||
15 | |||
16 | atd: $(RUNOBJECTS) | ||
17 | - $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) | ||
18 | + $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(LDFLAGS) | ||
19 | |||
20 | y.tab.c y.tab.h: parsetime.y | ||
21 | $(YACC) -d parsetime.y | ||
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc new file mode 100644 index 0000000000..42e89180d1 --- /dev/null +++ b/meta/recipes-extended/bash/bash.inc | |||
@@ -0,0 +1,29 @@ | |||
1 | DESCRIPTION = "An sh-compatible command language interpreter." | ||
2 | HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" | ||
3 | SECTION = "base/shell" | ||
4 | |||
5 | # GPLv2+ (< 4.0), GPLv3+ (>= 4.0) | ||
6 | LICENSE = "GPLv3+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
8 | DEPENDS = "ncurses" | ||
9 | |||
10 | inherit autotools gettext | ||
11 | |||
12 | PARALLEL_MAKE = "" | ||
13 | |||
14 | bindir = "/bin" | ||
15 | sbindir = "/sbin" | ||
16 | |||
17 | EXTRA_OECONF = "--with-ncurses" | ||
18 | export CC_FOR_BUILD = "${BUILD_CC}" | ||
19 | |||
20 | do_configure () { | ||
21 | gnu-configize | ||
22 | oe_runconf | ||
23 | } | ||
24 | |||
25 | pkg_postinst () { | ||
26 | touch $D${sysconfdir}/shells | ||
27 | grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells | ||
28 | grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells | ||
29 | } | ||
diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb new file mode 100644 index 0000000000..ee563d626a --- /dev/null +++ b/meta/recipes-extended/bash/bash_3.2.48.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | DESCRIPTION = "An sh-compatible command language interpreter." | ||
2 | HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" | ||
3 | SECTION = "base/shell" | ||
4 | |||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a" | ||
7 | DEPENDS = "ncurses" | ||
8 | |||
9 | PR = "r6" | ||
10 | |||
11 | SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \ | ||
12 | http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0 \ | ||
13 | http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-050;apply=yes;striplevel=0 \ | ||
14 | http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-051;apply=yes;striplevel=0" | ||
15 | |||
16 | inherit autotools gettext | ||
17 | |||
18 | PARALLEL_MAKE = "" | ||
19 | |||
20 | bindir = "/bin" | ||
21 | sbindir = "/sbin" | ||
22 | |||
23 | EXTRA_OECONF = "--with-ncurses" | ||
24 | export CC_FOR_BUILD = "${BUILD_CC}" | ||
25 | |||
26 | do_configure () { | ||
27 | gnu-configize | ||
28 | oe_runconf | ||
29 | } | ||
30 | |||
31 | pkg_postinst () { | ||
32 | touch $D${sysconfdir}/shells | ||
33 | grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells | ||
34 | grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells | ||
35 | } | ||
diff --git a/meta/recipes-extended/bash/bash_4.1.bb b/meta/recipes-extended/bash/bash_4.1.bb new file mode 100644 index 0000000000..6f0ced757e --- /dev/null +++ b/meta/recipes-extended/bash/bash_4.1.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require bash.inc | ||
2 | |||
3 | PR = "r0" | ||
4 | |||
5 | SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz \ | ||
6 | http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-001;apply=yes;striplevel=0 \ | ||
7 | http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-002;apply=yes;striplevel=0 \ | ||
8 | http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-003;apply=yes;striplevel=0 \ | ||
9 | http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-004;apply=yes;striplevel=0 \ | ||
10 | http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-005;apply=yes;striplevel=0 \ | ||
11 | http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-006;apply=yes;striplevel=0 \ | ||
12 | http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-007;apply=yes;striplevel=0 \ | ||
13 | " | ||
diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb new file mode 100644 index 0000000000..eaef5f3f33 --- /dev/null +++ b/meta/recipes-extended/bc/bc_1.06.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | DESCRIPTION = "An arbitrary precision calculator language." | ||
2 | HOMEPAGE = "http://www.gnu.org/software/bc/bc.html" | ||
3 | BUGTRACKER = "" | ||
4 | |||
5 | LICENSE = "GPLv2+ & LGPLv2.1" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
7 | file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ | ||
8 | file://bc/bcdefs.h;endline=31;md5=46dffdaf10a99728dd8ce358e45d46d8 \ | ||
9 | file://dc/dc.h;endline=25;md5=2f9c558cdd80e31b4d904e48c2374328 \ | ||
10 | file://lib/number.c;endline=31;md5=99434a0898abca7784acfd36b8191199" | ||
11 | |||
12 | SECTION = "base" | ||
13 | DEPENDS = "flex" | ||
14 | PR = "r0" | ||
15 | |||
16 | SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz" | ||
17 | |||
18 | inherit autotools | ||
diff --git a/meta/recipes-extended/byacc/byacc.inc b/meta/recipes-extended/byacc/byacc.inc new file mode 100644 index 0000000000..c6a5e38f77 --- /dev/null +++ b/meta/recipes-extended/byacc/byacc.inc | |||
@@ -0,0 +1,14 @@ | |||
1 | DESCRIPTION = "Berkeley Yacc" | ||
2 | SECTION = "devel" | ||
3 | LICENSE = "public domain" | ||
4 | |||
5 | SRC_URI = "ftp://invisible-island.net/byacc/byacc-${PV}.tgz" | ||
6 | EXTRA_OECONF += "--program-transform-name='s,^,b,'" | ||
7 | |||
8 | BBCLASSEXTEND = "native" | ||
9 | |||
10 | inherit autotools | ||
11 | |||
12 | do_configure() { | ||
13 | oe_runconf | ||
14 | } | ||
diff --git a/meta/recipes-extended/byacc/byacc_20100610.bb b/meta/recipes-extended/byacc/byacc_20100610.bb new file mode 100644 index 0000000000..48d0e4e425 --- /dev/null +++ b/meta/recipes-extended/byacc/byacc_20100610.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | PR = "r0" | ||
2 | |||
3 | require byacc.inc | ||
4 | |||
5 | SRC_URI[md5sum] = "b9715b9a2867c221176b597e8f73cbc9" | ||
6 | SRC_URI[sha256sum] = "1364c7fe382de659e8b9841a1736b645345a460d2f4302303e80c02235a2a575" | ||
diff --git a/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch b/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch new file mode 100644 index 0000000000..648c725bba --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | # Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined. | ||
2 | # This is needed to configure correctly with newer versions of autoconf. | ||
3 | |||
4 | diff -urN cpio-2.8.orig/m4/extensions.m4 cpio-2.8/m4/extensions.m4 | ||
5 | --- cpio-2.8.orig/m4/extensions.m4 2006-10-12 04:34:45.000000000 -0700 | ||
6 | +++ cpio-2.8/m4/extensions.m4 2010-07-23 14:37:36.000000000 -0700 | ||
7 | @@ -1,4 +1,4 @@ | ||
8 | -# serial 4 -*- Autoconf -*- | ||
9 | +# serial 5 -*- Autoconf -*- | ||
10 | # Enable extensions on systems that normally disable them. | ||
11 | |||
12 | # Copyright (C) 2003, 2006 Free Software Foundation, Inc. | ||
13 | @@ -16,6 +16,7 @@ | ||
14 | # ------------------------ | ||
15 | # Enable extensions on systems that normally disable them, | ||
16 | # typically due to standards-conformance issues. | ||
17 | +m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [ | ||
18 | AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
19 | [ | ||
20 | AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
21 | @@ -48,7 +49,7 @@ | ||
22 | AC_DEFINE([__EXTENSIONS__]) | ||
23 | AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
24 | AC_DEFINE([_TANDEM_SOURCE]) | ||
25 | -]) | ||
26 | +])]) | ||
27 | |||
28 | # gl_USE_SYSTEM_EXTENSIONS | ||
29 | # ------------------------ | ||
diff --git a/meta/recipes-extended/cpio/cpio-2.8/statdef.patch b/meta/recipes-extended/cpio/cpio-2.8/statdef.patch new file mode 100644 index 0000000000..dfa0d9150a --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.8/statdef.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | # Avoid multiple stat definitions | ||
2 | # Patch taken from cpio mailing list posting 2010-03-19 | ||
3 | |||
4 | diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h | ||
5 | --- cpio-2.11.orig/src/filetypes.h 2010-02-12 02:19:23.000000000 -0800 | ||
6 | +++ cpio-2.11/src/filetypes.h 2010-07-23 13:17:25.000000000 -0700 | ||
7 | @@ -82,4 +82,6 @@ | ||
8 | #define lstat stat | ||
9 | #endif | ||
10 | int lstat (); | ||
11 | +#ifndef stat | ||
12 | int stat (); | ||
13 | +#endif | ||
diff --git a/meta/recipes-extended/cpio/cpio_2.8.bb b/meta/recipes-extended/cpio/cpio_2.8.bb new file mode 100644 index 0000000000..be9a64735b --- /dev/null +++ b/meta/recipes-extended/cpio/cpio_2.8.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | require cpio_v2.inc | ||
2 | |||
3 | LICENSE = "GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b7f772ea3a2489231cb4872656cac34b" | ||
5 | |||
6 | PR = "r0" | ||
7 | |||
8 | SRC_URI += "file://m4extensions.patch" | ||
9 | |||
10 | SRC_URI[md5sum] = "0caa356e69e149fb49b76bacc64615a1" | ||
11 | SRC_URI[sha256sum] = "601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978" | ||
12 | |||
13 | # Required to build with gcc 4.3 and later: | ||
14 | CFLAGS += "-fgnu89-inline" | ||
diff --git a/meta/recipes-extended/cpio/cpio_v2.inc b/meta/recipes-extended/cpio/cpio_v2.inc new file mode 100644 index 0000000000..b571986ef7 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio_v2.inc | |||
@@ -0,0 +1,39 @@ | |||
1 | DESCRIPTION = "GNU cpio is a program to manage archives of files" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/cpio/" | ||
3 | SECTION = "base" | ||
4 | |||
5 | DEPENDS = "texinfo-native" | ||
6 | |||
7 | SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ | ||
8 | file://statdef.patch \ | ||
9 | " | ||
10 | |||
11 | inherit autotools gettext | ||
12 | |||
13 | S = "${WORKDIR}/cpio-${PV}" | ||
14 | |||
15 | do_install () { | ||
16 | autotools_do_install | ||
17 | install -d ${D}${base_bindir}/ | ||
18 | mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio.${PN}" | ||
19 | case ${TARGET_OS} in | ||
20 | *-uclibc*) ;; | ||
21 | *) mv "${D}${libexecdir}/rmt" "${D}${libexecdir}/rmt.${PN}" ;; | ||
22 | esac | ||
23 | } | ||
24 | |||
25 | pkg_postinst_${PN} () { | ||
26 | update-alternatives --install ${base_bindir}/cpio cpio cpio.${PN} 100 | ||
27 | if [ -f ${libexecdir}/rmt.${PN} ] | ||
28 | then | ||
29 | update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 50 | ||
30 | fi | ||
31 | } | ||
32 | |||
33 | pkg_prerm_${PN} () { | ||
34 | update-alternatives --remove cpio cpio.${PN} | ||
35 | if [ -f ${libexecdir}/rmt.${PN} ] | ||
36 | then | ||
37 | update-alternatives --remove rmt rmt.${PN} | ||
38 | fi | ||
39 | } | ||
diff --git a/meta/recipes-extended/cracklib/cracklib_2.8.16.bb b/meta/recipes-extended/cracklib/cracklib_2.8.16.bb new file mode 100644 index 0000000000..9789737f98 --- /dev/null +++ b/meta/recipes-extended/cracklib/cracklib_2.8.16.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | DESCRIPTION = "A pro-active password checker library" | ||
2 | HOMEPAGE = "http://sourceforge.net/projects/cracklib" | ||
3 | |||
4 | LICENSE = "LGPLv2.1+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" | ||
6 | |||
7 | DEPENDS = "" | ||
8 | PR ="r0" | ||
9 | |||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz" | ||
11 | |||
12 | inherit autotools gettext | ||
diff --git a/meta/recipes-extended/cwautomacros/cwautomacros_20090610.bb b/meta/recipes-extended/cwautomacros/cwautomacros_20090610.bb new file mode 100644 index 0000000000..9c03eece53 --- /dev/null +++ b/meta/recipes-extended/cwautomacros/cwautomacros_20090610.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | DESCRIPTION = "cwautomacros" | ||
2 | SECTION = "base" | ||
3 | HOMEPAGE = "http://cwautomacros.berlios.de/" | ||
4 | LICENSE = "GPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" | ||
6 | |||
7 | SRC_URI = http://download.berlios.de/cwautomacros/cwautomacros-${PV}.tar.bz2 | ||
8 | |||
9 | PR = "r0" | ||
10 | |||
11 | do_install() { | ||
12 | oe_runmake CWAUTOMACROSPREFIX=${D}${prefix} install | ||
13 | } | ||
14 | |||
15 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch new file mode 100644 index 0000000000..a65c433d57 --- /dev/null +++ b/meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html | ||
2 | |||
3 | 2007-04-16 Mike Frysinger <vapier@gentoo.org> | ||
4 | |||
5 | * Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can | ||
6 | override if they so choose. | ||
7 | * Only set CFLAGS/CXXFLAGS if user did not specify any. | ||
8 | |||
9 | ed had already taken GPLv3 when this patch out, so it should be GPLv3. | ||
10 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
11 | |||
12 | Index: ed-1.4/configure | ||
13 | =================================================================== | ||
14 | --- ed-1.4.orig/configure 2009-07-10 19:54:33.000000000 +0800 | ||
15 | +++ ed-1.4/configure 2010-08-05 17:41:51.000000000 +0800 | ||
16 | @@ -26,12 +26,6 @@ | ||
17 | mandir='$(datadir)/man' | ||
18 | sysconfdir='$(prefix)/etc' | ||
19 | program_prefix= | ||
20 | -CC= | ||
21 | -CXX= | ||
22 | -CPPFLAGS= | ||
23 | -CFLAGS='-Wall -W -O2' | ||
24 | -CXXFLAGS='-Wall -W -O2' | ||
25 | -LDFLAGS= | ||
26 | |||
27 | # Loop over all args | ||
28 | while [ x"$1" != x ] ; do | ||
29 | @@ -111,6 +105,14 @@ | ||
30 | esac | ||
31 | done | ||
32 | |||
33 | +# Defaults if the user did not select any | ||
34 | +if [ x"${CFLAGS+set}" != xset ] ; then | ||
35 | + CFLAGS='-Wall -W -O2' | ||
36 | +fi | ||
37 | +if [ x"${CXXFLAGS+set}" != xset ] ; then | ||
38 | + CXXFLAGS='-Wall -W -O2' | ||
39 | +fi | ||
40 | + | ||
41 | # Find the source files, if location was not specified. | ||
42 | srcdirtext= | ||
43 | if [ x"${srcdir}" = x ] ; then | ||
diff --git a/meta/recipes-extended/ed/ed_0.5.bb b/meta/recipes-extended/ed/ed_0.5.bb new file mode 100644 index 0000000000..e14bf0e5a4 --- /dev/null +++ b/meta/recipes-extended/ed/ed_0.5.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | DESCRIPTION = "GNU ed is a line-oriented text editor" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/ed/" | ||
3 | SECTION = "base" | ||
4 | LICENSE = "GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=6ddd5335ef96fb858a138230af773710 \ | ||
6 | file://main.c;beginline=1;endline=17;md5=36d4b85e5ae9028e918d1cc775c2475e" | ||
7 | |||
8 | PR = "r0" | ||
9 | SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/ed/ed-${PV}.tar.bz2" | ||
10 | |||
11 | inherit autotools | ||
diff --git a/meta/recipes-extended/ed/ed_1.4.bb b/meta/recipes-extended/ed/ed_1.4.bb new file mode 100644 index 0000000000..0243769e90 --- /dev/null +++ b/meta/recipes-extended/ed/ed_1.4.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | DESCRIPTION = "a line-oriented text editor" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/ed/" | ||
3 | BUGTRACKER = "" | ||
4 | |||
5 | LICENSE = "GPLv3+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ | ||
7 | file://ed.h;endline=20;md5=294d5da73d15cd444ca2260fa2538296 \ | ||
8 | file://main.c;endline=24;md5=122be7f2751ae819c803441972c7f45b" | ||
9 | |||
10 | SECTION = "base" | ||
11 | PR = "r0" | ||
12 | |||
13 | SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz \ | ||
14 | file://ed-1.2-build.patch" | ||
15 | |||
16 | do_configure() { | ||
17 | ${S}/configure | ||
18 | } | ||
19 | |||
20 | do_install() { | ||
21 | oe_runmake 'DESTDIR=${D}' install | ||
22 | } | ||
diff --git a/meta/recipes-extended/ethtool/ethtool_2.6.34.bb b/meta/recipes-extended/ethtool/ethtool_2.6.34.bb new file mode 100644 index 0000000000..9658f630a1 --- /dev/null +++ b/meta/recipes-extended/ethtool/ethtool_2.6.34.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." | ||
2 | HOMEPAGE = "http://sourceforge.net/projects/gkernel/" | ||
3 | SECTION = "console/network" | ||
4 | LICENSE = "GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
6 | file://ethtool.c;firstline=4;endline=16;md5=6db6b005b8390ea76cb85a2c7bda8e6b" | ||
7 | PR = "r0" | ||
8 | |||
9 | SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/ethtool-${PV}.tar.gz" | ||
10 | |||
11 | inherit autotools | ||
diff --git a/meta/recipes-extended/gamin/gamin/no-abstract-sockets.patch b/meta/recipes-extended/gamin/gamin/no-abstract-sockets.patch new file mode 100644 index 0000000000..b8aacfb23c --- /dev/null +++ b/meta/recipes-extended/gamin/gamin/no-abstract-sockets.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | --- /tmp/configure.in 2007-04-30 13:08:49.000000000 +0200 | ||
2 | +++ gamin-0.1.8/configure.in 2007-04-30 13:10:53.285251000 +0200 | ||
3 | @@ -354,51 +354,6 @@ | ||
4 | AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure]) | ||
5 | fi | ||
6 | |||
7 | -#### Abstract sockets | ||
8 | - | ||
9 | -AC_MSG_CHECKING(abstract socket namespace) | ||
10 | -AC_LANG_PUSH(C) | ||
11 | -AC_RUN_IFELSE([AC_LANG_PROGRAM( | ||
12 | -[[ | ||
13 | -#include <sys/types.h> | ||
14 | -#include <stdlib.h> | ||
15 | -#include <string.h> | ||
16 | -#include <stdio.h> | ||
17 | -#include <sys/socket.h> | ||
18 | -#include <sys/un.h> | ||
19 | -#include <errno.h> | ||
20 | -]], | ||
21 | -[[ | ||
22 | - int listen_fd; | ||
23 | - struct sockaddr_un addr; | ||
24 | - | ||
25 | - listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); | ||
26 | - | ||
27 | - if (listen_fd < 0) | ||
28 | - { | ||
29 | - fprintf (stderr, "socket() failed: %s\n", strerror (errno)); | ||
30 | - exit (1); | ||
31 | - } | ||
32 | - | ||
33 | - memset (&addr, '\0', sizeof (addr)); | ||
34 | - addr.sun_family = AF_UNIX; | ||
35 | - strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); | ||
36 | - addr.sun_path[0] = '\0'; /* this is what makes it abstract */ | ||
37 | - | ||
38 | - if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) | ||
39 | - { | ||
40 | - fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", | ||
41 | - strerror (errno)); | ||
42 | - exit (1); | ||
43 | - } | ||
44 | - else | ||
45 | - exit (0); | ||
46 | -]])], | ||
47 | - [have_abstract_sockets=yes], | ||
48 | - [have_abstract_sockets=no]) | ||
49 | -AC_LANG_POP(C) | ||
50 | -AC_MSG_RESULT($have_abstract_sockets) | ||
51 | - | ||
52 | if test x$enable_abstract_sockets = xyes; then | ||
53 | if test x$have_abstract_sockets = xno; then | ||
54 | AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) | ||
diff --git a/meta/recipes-extended/gamin/gamin_0.1.10.bb b/meta/recipes-extended/gamin/gamin_0.1.10.bb new file mode 100644 index 0000000000..21f1da434c --- /dev/null +++ b/meta/recipes-extended/gamin/gamin_0.1.10.bb | |||
@@ -0,0 +1,30 @@ | |||
1 | DESCRIPTION = "Gamin is a file and directory monitoring system defined to \ | ||
2 | be a subset of the FAM (File Alteration Monitor) system." | ||
3 | HOMEPAGE = "http://people.gnome.org/~veillard/gamin/" | ||
4 | |||
5 | LICENSE = "LGPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=412a9be54757a155d0b997b52b519f62" | ||
7 | |||
8 | DEPENDS = "glib-2.0" | ||
9 | PROVIDES = "fam" | ||
10 | PR = "r2" | ||
11 | |||
12 | SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \ | ||
13 | file://no-abstract-sockets.patch" | ||
14 | |||
15 | inherit autotools pkgconfig | ||
16 | |||
17 | EXTRA_OECONF = "--without-python" | ||
18 | |||
19 | PACKAGES += "lib${PN} lib${PN}-dev lib${PN}-dbg" | ||
20 | FILES_${PN} = "${libexecdir}" | ||
21 | FILES_${PN}-dbg = "${libexecdir}/.debug" | ||
22 | FILES_lib${PN} = "${libdir}/lib*.so.*" | ||
23 | FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \ | ||
24 | ${libdir}/lib*.a ${libdir}/lib*.so" | ||
25 | FILES_lib${PN}-dbg = "${libdir}/.debug/" | ||
26 | |||
27 | RDEPENDS_lib${PN} = "${PN}" | ||
28 | |||
29 | LEAD_SONAME = "libgamin-1.so" | ||
30 | |||
diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb new file mode 100644 index 0000000000..4bfa23d2e9 --- /dev/null +++ b/meta/recipes-extended/gawk/gawk_3.1.5.bb | |||
@@ -0,0 +1,30 @@ | |||
1 | DESCRIPTION = "A program that you can use to select particular records in a \ | ||
2 | file and perform operations upon them." | ||
3 | HOMEPAGE = "www.gnu.org/software/gawk" | ||
4 | BUGTRACKER = "bug-gawk@gnu.org" | ||
5 | SECTION = "console/utils" | ||
6 | |||
7 | # gawk <= 3.1.5: GPLv2 | ||
8 | # gawk >= 3.1.6: GPLv3 | ||
9 | LICENSE = "GPLv2" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
11 | |||
12 | RDEPENDS_gawk += "gawk-common" | ||
13 | RDEPENDS_pgawk += "gawk-common" | ||
14 | PR = "r0" | ||
15 | |||
16 | SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz" | ||
17 | |||
18 | inherit autotools gettext update-alternatives | ||
19 | |||
20 | PACKAGES += "gawk-common pgawk" | ||
21 | |||
22 | FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk" | ||
23 | FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*" | ||
24 | FILES_pgawk = "${bindir}/pgawk*" | ||
25 | FILES_${PN}-dbg += "${libexecdir}/awk/.debug" | ||
26 | |||
27 | ALTERNATIVE_NAME = "awk" | ||
28 | ALTERNATIVE_PATH = "gawk" | ||
29 | ALTERNATIVE_LINK = "${bindir}/awk" | ||
30 | ALTERNATIVE_PRIORITY = "100" | ||
diff --git a/meta/recipes-extended/images/poky-image-basic.bb b/meta/recipes-extended/images/poky-image-basic.bb new file mode 100644 index 0000000000..537a6e4122 --- /dev/null +++ b/meta/recipes-extended/images/poky-image-basic.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | IMAGE_FEATURES += "apps-console-core " | ||
2 | |||
3 | IMAGE_INSTALL = "\ | ||
4 | ${POKY_BASE_INSTALL} \ | ||
5 | task-poky-basic \ | ||
6 | " | ||
7 | |||
8 | inherit poky-image | ||
diff --git a/meta/recipes-extended/images/poky-image-lsb.bb b/meta/recipes-extended/images/poky-image-lsb.bb new file mode 100644 index 0000000000..8424d91bb4 --- /dev/null +++ b/meta/recipes-extended/images/poky-image-lsb.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | IMAGE_FEATURES += "apps-console-core " | ||
2 | |||
3 | IMAGE_INSTALL = "\ | ||
4 | ${POKY_BASE_INSTALL} \ | ||
5 | task-poky-basic \ | ||
6 | task-poky-lsb \ | ||
7 | " | ||
8 | |||
9 | inherit poky-image | ||
diff --git a/meta/recipes-extended/iptables/iptables_1.4.8.bb b/meta/recipes-extended/iptables/iptables_1.4.8.bb new file mode 100644 index 0000000000..ad707d30bc --- /dev/null +++ b/meta/recipes-extended/iptables/iptables_1.4.8.bb | |||
@@ -0,0 +1,31 @@ | |||
1 | DESCRIPTION = "iptables is the userspace command line program used to configure the Linux 2.4.x and 2.6.x IPv4 packet filtering ruleset" | ||
2 | HOMEPAGE = "http://www.netfilter.org/" | ||
3 | BUGTRACKER = "http://bugzilla.netfilter.org/" | ||
4 | LICENSE = "GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ | ||
6 | file://iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef" | ||
7 | |||
8 | PR = "r0" | ||
9 | |||
10 | RRECOMMENDS_${PN} = "kernel-module-x-tables \ | ||
11 | kernel-module-ip-tables \ | ||
12 | kernel-module-iptable-filter \ | ||
13 | kernel-module-iptable-nat \ | ||
14 | kernel-module-nf-defrag-ipv4 \ | ||
15 | kernel-module-nf-conntrack \ | ||
16 | kernel-module-nf-conntrack-ipv4 \ | ||
17 | kernel-module-nf-nat \ | ||
18 | kernel-module-ipt-masquerade" | ||
19 | FILES_${PN}-dbg =+ "${libexecdir}/xtables/.debug" | ||
20 | |||
21 | SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2" | ||
22 | |||
23 | inherit autotools | ||
24 | |||
25 | EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \ | ||
26 | ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}" | ||
27 | |||
28 | do_configure_prepend() { | ||
29 | # they are all libtool m4 files | ||
30 | rm -rf ${S}/m4 | ||
31 | } | ||
diff --git a/meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff b/meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff new file mode 100644 index 0000000000..98aae0d457 --- /dev/null +++ b/meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff | |||
@@ -0,0 +1,22 @@ | |||
1 | Index: trunk/ping.c | ||
2 | =================================================================== | ||
3 | --- trunk.orig/ping.c 2010-07-23 21:26:53.000000000 -0700 | ||
4 | +++ trunk/ping.c 2010-07-23 21:28:27.000000000 -0700 | ||
5 | @@ -1059,7 +1059,7 @@ | ||
6 | i = j; | ||
7 | i -= IPOPT_MINOFF; | ||
8 | if (i <= 0) | ||
9 | - continue; | ||
10 | + break; | ||
11 | if (i == old_rrlen | ||
12 | && !strncmp((char *)cp, old_rr, i) | ||
13 | && !(options & F_FLOOD)) { | ||
14 | @@ -1096,7 +1096,7 @@ | ||
15 | i = j; | ||
16 | i -= 5; | ||
17 | if (i <= 0) | ||
18 | - continue; | ||
19 | + break; | ||
20 | flags = *++cp; | ||
21 | printf("\nTS: "); | ||
22 | cp++; | ||
diff --git a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff new file mode 100644 index 0000000000..86bbf0d39a --- /dev/null +++ b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff | |||
@@ -0,0 +1,41 @@ | |||
1 | Index: trunk/ping.c | ||
2 | =================================================================== | ||
3 | --- trunk.orig/ping.c 2010-05-07 23:13:54.000000000 -0700 | ||
4 | +++ trunk/ping.c 2010-05-07 23:23:22.000000000 -0700 | ||
5 | @@ -883,9 +883,36 @@ | ||
6 | case ICMP_SR_FAILED: | ||
7 | printf("Source Route Failed\n"); | ||
8 | break; | ||
9 | + case ICMP_NET_UNKNOWN: | ||
10 | + printf("Destination Net Unknown\n"); | ||
11 | + break; | ||
12 | + case ICMP_HOST_UNKNOWN: | ||
13 | + printf("Destination Host Unknown\n"); | ||
14 | + break; | ||
15 | + case ICMP_HOST_ISOLATED: | ||
16 | + printf("Source Host Isolated\n"); | ||
17 | + break; | ||
18 | + case ICMP_NET_ANO: | ||
19 | + printf("Destination Net Prohibited\n"); | ||
20 | + break; | ||
21 | + case ICMP_HOST_ANO: | ||
22 | + printf("Destination Host Prohibited\n"); | ||
23 | + break; | ||
24 | + case ICMP_NET_UNR_TOS: | ||
25 | + printf("Destination Net Unreachable for Type of Service\n"); | ||
26 | + break; | ||
27 | + case ICMP_HOST_UNR_TOS: | ||
28 | + printf("Destination Host Unreachable for Type of Service\n"); | ||
29 | + break; | ||
30 | case ICMP_PKT_FILTERED: | ||
31 | printf("Packet filtered\n"); | ||
32 | break; | ||
33 | + case ICMP_PREC_VIOLATION: | ||
34 | + printf("Precedence Violation\n"); | ||
35 | + break; | ||
36 | + case ICMP_PREC_CUTOFF: | ||
37 | + printf("Precedence Cutoff\n"); | ||
38 | + break; | ||
39 | default: | ||
40 | printf("Dest Unreachable, Bad Code: %d\n", code); | ||
41 | break; | ||
diff --git a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff new file mode 100644 index 0000000000..9f05769f71 --- /dev/null +++ b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff | |||
@@ -0,0 +1,24 @@ | |||
1 | Index: trunk/arping.c | ||
2 | =================================================================== | ||
3 | --- trunk.orig/arping.c 2010-05-07 23:13:52.000000000 -0700 | ||
4 | +++ trunk/arping.c 2010-05-07 23:41:16.000000000 -0700 | ||
5 | @@ -182,12 +182,17 @@ | ||
6 | if (start.tv_sec==0) | ||
7 | start = tv; | ||
8 | |||
9 | - if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)) | ||
10 | + if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500) | ||
11 | finish(); | ||
12 | |||
13 | - if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) { | ||
14 | + if ((!timeout) && (count == 0)) | ||
15 | + finish(); | ||
16 | + | ||
17 | + if ( count!=0 && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) { | ||
18 | send_pack(s, src, dst, | ||
19 | (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he); | ||
20 | + if (count >= 0) | ||
21 | + count--; | ||
22 | if (count == 0 && unsolicited) | ||
23 | finish(); | ||
24 | } | ||
diff --git a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff new file mode 100644 index 0000000000..2a924258da --- /dev/null +++ b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff | |||
@@ -0,0 +1,14 @@ | |||
1 | Index: trunk/ping_common.c | ||
2 | =================================================================== | ||
3 | --- trunk.orig/ping_common.c 2010-05-07 23:13:51.000000000 -0700 | ||
4 | +++ trunk/ping_common.c 2010-05-07 23:22:33.000000000 -0700 | ||
5 | @@ -872,7 +872,8 @@ | ||
6 | printf("%spipe %d", comma, pipesize); | ||
7 | comma = ", "; | ||
8 | } | ||
9 | - if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { | ||
10 | + if (ntransmitted > 1 && nreceived && | ||
11 | + (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { | ||
12 | int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1); | ||
13 | printf("%sipg/ewma %d.%03d/%d.%03d ms", | ||
14 | comma, ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000); | ||
diff --git a/meta/recipes-extended/iputils/files/debian/targets.diff b/meta/recipes-extended/iputils/files/debian/targets.diff new file mode 100644 index 0000000000..b5e907a8d0 --- /dev/null +++ b/meta/recipes-extended/iputils/files/debian/targets.diff | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: trunk/Makefile | ||
2 | =================================================================== | ||
3 | --- trunk.orig/Makefile 2010-05-07 23:43:00.000000000 -0700 | ||
4 | +++ trunk/Makefile 2010-05-07 23:47:10.000000000 -0700 | ||
5 | @@ -16,7 +16,7 @@ | ||
6 | CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g | ||
7 | CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) | ||
8 | |||
9 | -IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd | ||
10 | +IPV4_TARGETS=tracepath ping arping clockdiff | ||
11 | IPV6_TARGETS=tracepath6 traceroute6 ping6 | ||
12 | TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) | ||
13 | |||
diff --git a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff new file mode 100644 index 0000000000..7e6c97c14a --- /dev/null +++ b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff | |||
@@ -0,0 +1,29 @@ | |||
1 | Index: trunk/tracepath.c | ||
2 | =================================================================== | ||
3 | --- trunk.orig/tracepath.c 2010-05-07 23:13:52.000000000 -0700 | ||
4 | +++ trunk/tracepath.c 2010-05-07 23:24:09.000000000 -0700 | ||
5 | @@ -338,9 +338,9 @@ | ||
6 | base_port = atoi(p+1); | ||
7 | } else | ||
8 | base_port = 44444; | ||
9 | - he = gethostbyname(argv[0]); | ||
10 | + he = gethostbyname2(argv[0], AF_INET); | ||
11 | if (he == NULL) { | ||
12 | - herror("gethostbyname"); | ||
13 | + herror("gethostbyname2"); | ||
14 | exit(1); | ||
15 | } | ||
16 | memcpy(&target.sin_addr, he->h_addr, 4); | ||
17 | Index: trunk/ping.c | ||
18 | =================================================================== | ||
19 | --- trunk.orig/ping.c 2010-05-07 23:23:22.000000000 -0700 | ||
20 | +++ trunk/ping.c 2010-05-07 23:24:09.000000000 -0700 | ||
21 | @@ -250,7 +250,7 @@ | ||
22 | if (argc == 1) | ||
23 | options |= F_NUMERIC; | ||
24 | } else { | ||
25 | - hp = gethostbyname(target); | ||
26 | + hp = gethostbyname2(target, AF_INET); | ||
27 | if (!hp) { | ||
28 | fprintf(stderr, "ping: unknown host %s\n", target); | ||
29 | exit(2); | ||
diff --git a/meta/recipes-extended/iputils/iputils_s20100418.bb b/meta/recipes-extended/iputils/iputils_s20100418.bb new file mode 100644 index 0000000000..3f793eca57 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils_s20100418.bb | |||
@@ -0,0 +1,78 @@ | |||
1 | DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ | ||
2 | tracepath, tracepath6, ping, ping6 and arping." | ||
3 | HOMEPAGE = "http://www.skbuff.net/iputils" | ||
4 | SECTION = "console/network" | ||
5 | |||
6 | LICENSE = "BSD & GPLv2+" | ||
7 | |||
8 | DEPENDS = "sysfsutils openssl" | ||
9 | |||
10 | PR = "r0" | ||
11 | |||
12 | SRC_URI = "http://www.skbuff.net/iputils/${PN}-${PV}.tar.bz2 \ | ||
13 | file://debian/fix-dead-host-ping-stats.diff \ | ||
14 | file://debian/add-icmp-return-codes.diff \ | ||
15 | file://debian/use_gethostbyname2.diff \ | ||
16 | file://debian/targets.diff \ | ||
17 | file://debian/fix-arping-timeouts.diff \ | ||
18 | file://debian/CVE-2010-2529.diff \ | ||
19 | " | ||
20 | |||
21 | # man is not compiled here, since it requires docbook-utils-native | ||
22 | # which is not available in poky | ||
23 | |||
24 | do_compile () { | ||
25 | oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}" all | ||
26 | } | ||
27 | |||
28 | do_install () { | ||
29 | install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8 | ||
30 | # SUID root programs | ||
31 | install -m 4555 ping ${D}${base_bindir}/ping.${PN} | ||
32 | install -m 4555 ping6 ${D}${base_bindir}/ping6.${PN} | ||
33 | install -m 4555 traceroute6 ${D}${base_bindir}/ | ||
34 | # Other programgs | ||
35 | for i in arping tracepath tracepath6; do | ||
36 | install -m 0755 $i ${D}${base_bindir}/ | ||
37 | done | ||
38 | # Manual pages for things we build packages for | ||
39 | # for i in tracepath.8 traceroute6.8 ping.8 arping.8; do | ||
40 | # install -m 0644 doc/$i ${D}${mandir}/man8/ || true | ||
41 | # done | ||
42 | } | ||
43 | |||
44 | # Busybox also provides ping and ping6, so use update-alternatives | ||
45 | # Also fixup SUID bit for applications that need it | ||
46 | pkg_postinst_${PN}-ping () { | ||
47 | chmod 4555 ${base_bindir}/ping.${PN} | ||
48 | update-alternatives --install ${base_bindir}/ping ping ping.${PN} 100 | ||
49 | } | ||
50 | pkg_prerm_${PN}-ping () { | ||
51 | update-alternatives --remove ping ping.${PN} | ||
52 | } | ||
53 | |||
54 | pkg_postinst_${PN}-ping6 () { | ||
55 | chmod 4555 ${base_bindir}/ping6.${PN} | ||
56 | update-alternatives --install ${base_bindir}/ping6 ping6 ping6.${PN} 100 | ||
57 | } | ||
58 | pkg_prerm_${PN}-ping6 () { | ||
59 | update-alternatives --remove ping6 ping6.${PN} | ||
60 | } | ||
61 | |||
62 | pkg_postinst_${PN}-traceroute6 () { | ||
63 | chmod 4555 ${base_bindir}/traceroute6 | ||
64 | } | ||
65 | |||
66 | PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6" | ||
67 | |||
68 | ALLOW_EMPTY_${PN} = "1" | ||
69 | RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6" | ||
70 | |||
71 | FILES_${PN} = "" | ||
72 | FILES_${PN}-ping = "${base_bindir}/ping.${PN}" | ||
73 | FILES_${PN}-ping6 = "${base_bindir}/ping6.${PN}" | ||
74 | FILES_${PN}-arping = "${base_bindir}/arping" | ||
75 | FILES_${PN}-tracepath = "${base_bindir}/tracepath" | ||
76 | FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6" | ||
77 | FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" | ||
78 | FILES_${PN}-doc = "${mandir}/man8" | ||
diff --git a/meta/recipes-extended/less/less_436.bb b/meta/recipes-extended/less/less_436.bb new file mode 100644 index 0000000000..872a127f43 --- /dev/null +++ b/meta/recipes-extended/less/less_436.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | DESCRIPTION = "Less is a program similar to more, i.e. a terminal \ | ||
2 | based program for viewing text files and the output from other \ | ||
3 | programs. Less offers many features beyond those that more does." | ||
4 | HOMEPAGE = "http://www.greenwoodsoftware.com/" | ||
5 | SECTION = "console/utils" | ||
6 | |||
7 | # (GPLv2+ (<< 418), GPLv3+ (>= 418)) | less | ||
8 | # less is a 2-clause BSD-like permissive license | ||
9 | LICENSE = "GPLv3+ | less" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | ||
11 | file://LICENSE;md5=fd5ccf3de28f72a0254fa8768ec8180c" | ||
12 | DEPENDS = "ncurses" | ||
13 | PR = "r0" | ||
14 | |||
15 | SRC_URI = "http://www.greenwoodsoftware.com/${PN}/${PN}-${PV}.tar.gz" | ||
16 | |||
17 | |||
18 | inherit autotools update-alternatives | ||
19 | |||
20 | do_install () { | ||
21 | oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install | ||
22 | mv ${D}${bindir}/less ${D}${bindir}/less.${PN} | ||
23 | } | ||
24 | |||
25 | ALTERNATIVE_NAME = "less" | ||
26 | ALTERNATIVE_PATH = "less.${PN}" | ||
27 | ALTERNATIVE_PRIORITY = "100" | ||
diff --git a/meta/recipes-extended/libuser/libuser-0.56.16/disable-sgml-doc.patch b/meta/recipes-extended/libuser/libuser-0.56.16/disable-sgml-doc.patch new file mode 100644 index 0000000000..a2017c5724 --- /dev/null +++ b/meta/recipes-extended/libuser/libuser-0.56.16/disable-sgml-doc.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Disable generating docs from sgml, which requries linuxdoc-tools. | ||
2 | |||
3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
4 | Index: libuser-0.56.16/docs/Makefile.am | ||
5 | =================================================================== | ||
6 | --- libuser-0.56.16.orig/docs/Makefile.am 2010-08-12 13:29:43.000000000 +0800 | ||
7 | +++ libuser-0.56.16/docs/Makefile.am 2010-08-12 13:29:51.000000000 +0800 | ||
8 | @@ -14,8 +14,8 @@ | ||
9 | |||
10 | sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml | ||
11 | [ -d sgml ] || mkdir sgml | ||
12 | - cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml | ||
13 | +# cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml | ||
14 | |||
15 | sgml/libuser.html: $(srcdir)/sgml/libuser.sgml | ||
16 | [ -d sgml ] || mkdir sgml | ||
17 | - cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml | ||
18 | +# cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml | ||
diff --git a/meta/recipes-extended/libuser/libuser_0.56.16.bb b/meta/recipes-extended/libuser/libuser_0.56.16.bb new file mode 100644 index 0000000000..d72430ec0f --- /dev/null +++ b/meta/recipes-extended/libuser/libuser_0.56.16.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | DESCRIPTION = "The libuser library implements a standardized interface for manipulating and administering user and group accounts" | ||
2 | HOMEPAGE = "https://fedorahosted.org/libuser/" | ||
3 | BUGTRACKER = "https://fedorahosted.org/libuser/newticket" | ||
4 | |||
5 | LICENSE = "LGPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ | ||
7 | file://lib/user.h;endline=19;md5=9bc141f2e0d3e8b97ecdc945b2ed1ec7 \ | ||
8 | file://samples/testuser.c;endline=19;md5=61e8c05bd37ce1cba5590071f6e17500" | ||
9 | |||
10 | SECTION = "base" | ||
11 | |||
12 | SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \ | ||
13 | file://disable-sgml-doc.patch;patch=1" | ||
14 | PR = "r0" | ||
15 | |||
16 | DEPENDS = "gettext libpam glib-2.0 xz-native" | ||
17 | |||
18 | EXTRA_OECONF += "--disable-gtk-doc --without-python" | ||
19 | |||
20 | inherit autotools | ||
diff --git a/meta/recipes-extended/minicom/minicom-2.3/gcc4-scope.patch b/meta/recipes-extended/minicom/minicom-2.3/gcc4-scope.patch new file mode 100644 index 0000000000..5bd47bd354 --- /dev/null +++ b/meta/recipes-extended/minicom/minicom-2.3/gcc4-scope.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | --- minicom-2.1/src/window.c.orig 2006-06-14 17:49:53.000000000 +0200 | ||
2 | +++ minicom-2.1/src/window.c 2006-06-14 17:50:14.000000000 +0200 | ||
3 | @@ -62,7 +62,7 @@ | ||
4 | static char *CS, *SF, *SR, *VB, *BL; | ||
5 | static char *VE, *VI, *KS, *KE; | ||
6 | static char *CD, *CL, *IC, *DC; | ||
7 | -static char *BC, *CR, *NL; | ||
8 | +static char *mcBC, *CR, *NL; | ||
9 | #if ST_LINE | ||
10 | static char *TS, *FS, *DS; | ||
11 | #endif | ||
12 | @@ -322,8 +322,8 @@ | ||
13 | else if (NL != CNULL && x == 0 && x == curx && y == cury + 1) | ||
14 | outstr(NL); | ||
15 | #endif | ||
16 | - else if (BC != CNULL && y == cury && x == curx - 1) | ||
17 | - outstr(BC); | ||
18 | + else if (mcBC != CNULL && y == cury && x == curx - 1) | ||
19 | + outstr(mcBC); | ||
20 | else | ||
21 | outstr(tgoto(CM, x, y)); | ||
22 | curx = x; | ||
23 | @@ -1918,7 +1918,7 @@ | ||
24 | CL = tgetstr("cl", &_tptr); | ||
25 | IC = tgetstr("ic", &_tptr); | ||
26 | DC = tgetstr("dc", &_tptr); | ||
27 | - BC = tgetstr("bc", &_tptr); | ||
28 | + mcBC = tgetstr("bc", &_tptr); | ||
29 | CR = tgetstr("cr", &_tptr); | ||
30 | NL = tgetstr("nl", &_tptr); | ||
31 | AC = tgetstr("ac", &_tptr); | ||
32 | @@ -1967,10 +1967,10 @@ | ||
33 | _has_am = tgetflag("am"); | ||
34 | _mv_standout = tgetflag("ms"); | ||
35 | if (tgetflag("bs")) { | ||
36 | - if (BC == CNULL) BC = "\b"; | ||
37 | + if (mcBC == CNULL) mcBC = "\b"; | ||
38 | } | ||
39 | else | ||
40 | - BC = CNULL; | ||
41 | + mcBC = CNULL; | ||
42 | |||
43 | /* Special IBM box-drawing characters */ | ||
44 | D_UL = 201; | ||
diff --git a/meta/recipes-extended/minicom/minicom-2.3/rename-conflicting-functions.patch b/meta/recipes-extended/minicom/minicom-2.3/rename-conflicting-functions.patch new file mode 100644 index 0000000000..c344203267 --- /dev/null +++ b/meta/recipes-extended/minicom/minicom-2.3/rename-conflicting-functions.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | --- minicom-2.3/src/minicom.c-orig 2009-06-08 14:49:07.000000000 +0200 | ||
2 | +++ minicom-2.3/src/minicom.c 2009-06-08 14:50:23.000000000 +0200 | ||
3 | @@ -63,6 +63,10 @@ | ||
4 | } | ||
5 | #endif /*DEBUG*/ | ||
6 | |||
7 | +#ifdef __USE_GNU | ||
8 | +#define getline minicom_getline | ||
9 | +#endif | ||
10 | + | ||
11 | /* | ||
12 | * Sub - menu's. | ||
13 | */ | ||
diff --git a/meta/recipes-extended/minicom/minicom_2.3.bb b/meta/recipes-extended/minicom/minicom_2.3.bb new file mode 100644 index 0000000000..a114e30c99 --- /dev/null +++ b/meta/recipes-extended/minicom/minicom_2.3.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SECTION = "console/network" | ||
2 | DEPENDS = "ncurses" | ||
3 | LICENSE = "GPL" | ||
4 | SRC_URI = "http://alioth.debian.org/frs/download.php/2332/minicom-${PV}.tar.gz \ | ||
5 | file://rename-conflicting-functions.patch \ | ||
6 | " | ||
7 | |||
8 | # file://gcc4-scope.patch;patch=1 \ | ||
9 | |||
10 | inherit autotools gettext | ||
11 | |||
12 | do_install() { | ||
13 | for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done | ||
14 | } | ||
15 | |||
16 | SRC_URI[md5sum] = "0ebe7a91898384ca906787cc4e2c3f25" | ||
17 | SRC_URI[sha256sum] = "2acbc3d4a07e1134ee285a72fa44bbc27703b02dba02be68db9e6fd8320356fb" | ||
diff --git a/meta/recipes-extended/mktemp/files/disable-strip.patch b/meta/recipes-extended/mktemp/files/disable-strip.patch new file mode 100644 index 0000000000..d6bc528a21 --- /dev/null +++ b/meta/recipes-extended/mktemp/files/disable-strip.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | diff --git a/Makefile.in b/Makefile.in | ||
2 | index 37b3cc9..f1026f3 100644 | ||
3 | --- a/Makefile.in | ||
4 | +++ b/Makefile.in | ||
5 | @@ -95,7 +95,7 @@ install-dirs: | ||
6 | $(DESTDIR)$(mandir)/man1 | ||
7 | |||
8 | install-binaries: $(PROG) | ||
9 | - $(INSTALL) -m 0555 -s $(PROG) $(DESTDIR)$(bindir)/$(PROG) | ||
10 | + $(INSTALL) -m 0555 $(PROG) $(DESTDIR)$(bindir)/$(PROG) | ||
11 | |||
12 | install-man: | ||
13 | $(INSTALL) -m 0444 $(srcdir)/mktemp.$(mantype) \ | ||
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb new file mode 100644 index 0000000000..a34827450c --- /dev/null +++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | DESCRIPTION = "Allow safe temporary file creation from shell scripts." | ||
2 | HOMEPAGE = "http://www.mktemp.org/" | ||
3 | BUGTRACKER = "http://www.mktemp.org/bugs" | ||
4 | SECTION = "console/utils" | ||
5 | LICENSE = "ISC style" | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4" | ||
7 | |||
8 | PR = "r0" | ||
9 | |||
10 | SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${P}.tar.gz \ | ||
11 | file://disable-strip.patch \ | ||
12 | " | ||
13 | |||
14 | inherit autotools update-alternatives | ||
15 | |||
16 | EXTRA_OECONF = "--with-libc" | ||
17 | |||
18 | do_install_append () { | ||
19 | mkdir ${D}${base_bindir} | ||
20 | mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp.${PN} | ||
21 | } | ||
22 | |||
23 | ALTERNATIVE_NAME = "mktemp" | ||
24 | ALTERNATIVE_LINK = "${base_bindir}/mktemp" | ||
25 | ALTERNATIVE_PATH = "${base_bindir}/mktemp.${PN}" | ||
26 | ALTERNATIVE_PRIORITY = "100" | ||
diff --git a/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h b/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h new file mode 100644 index 0000000000..92c527a51e --- /dev/null +++ b/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h | |||
@@ -0,0 +1,75 @@ | |||
1 | /* | ||
2 | * config.h Automatically generated configuration includefile | ||
3 | * | ||
4 | * NET-TOOLS A collection of programs that form the base set of the | ||
5 | * NET-3 Networking Distribution for the LINUX operating | ||
6 | * system. | ||
7 | * | ||
8 | * DO NOT EDIT DIRECTLY | ||
9 | * | ||
10 | */ | ||
11 | |||
12 | /* | ||
13 | * | ||
14 | * Internationalization | ||
15 | * | ||
16 | * The net-tools package has currently been translated to French, | ||
17 | * German and Brazilian Portugese. Other translations are, of | ||
18 | * course, welcome. Answer `n' here if you have no support for | ||
19 | * internationalization on your system. | ||
20 | * | ||
21 | */ | ||
22 | #define I18N 1 | ||
23 | |||
24 | /* | ||
25 | * | ||
26 | * Protocol Families. | ||
27 | * | ||
28 | */ | ||
29 | #define HAVE_AFUNIX 1 | ||
30 | #define HAVE_AFINET 1 | ||
31 | #define HAVE_AFINET6 1 | ||
32 | #define HAVE_AFIPX 0 | ||
33 | #define HAVE_AFATALK 0 | ||
34 | #define HAVE_AFAX25 0 | ||
35 | #define HAVE_AFNETROM 1 | ||
36 | #define HAVE_AFROSE 0 | ||
37 | #define HAVE_AFX25 0 | ||
38 | #define HAVE_AFECONET 0 | ||
39 | #define HAVE_AFDECnet 0 | ||
40 | #define HAVE_AFASH 0 | ||
41 | |||
42 | /* | ||
43 | * | ||
44 | * Device Hardware types. | ||
45 | * | ||
46 | */ | ||
47 | #define HAVE_HWETHER 1 | ||
48 | #define HAVE_HWARC 1 | ||
49 | #define HAVE_HWSLIP 1 | ||
50 | #define HAVE_HWPPP 1 | ||
51 | #define HAVE_HWTUNNEL 1 | ||
52 | #define HAVE_HWSTRIP 1 | ||
53 | #define HAVE_HWTR 1 | ||
54 | #define HAVE_HWAX25 0 | ||
55 | #define HAVE_HWROSE 0 | ||
56 | #define HAVE_HWNETROM 1 | ||
57 | #define HAVE_HWX25 0 | ||
58 | #define HAVE_HWFR 1 | ||
59 | #define HAVE_HWSIT 0 | ||
60 | #define HAVE_HWFDDI 0 | ||
61 | #define HAVE_HWHIPPI 0 | ||
62 | #define HAVE_HWASH 0 | ||
63 | #define HAVE_HWHDLCLAPB 0 | ||
64 | #define HAVE_HWIRDA 1 | ||
65 | #define HAVE_HWEC 0 | ||
66 | #define HAVE_HWIB 0 | ||
67 | |||
68 | /* | ||
69 | * | ||
70 | * Other Features. | ||
71 | * | ||
72 | */ | ||
73 | #define HAVE_FW_MASQUERADE 1 | ||
74 | #define HAVE_IP_TOOLS 1 | ||
75 | #define HAVE_MII 1 | ||
diff --git a/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.make b/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.make new file mode 100644 index 0000000000..ec516f27ee --- /dev/null +++ b/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.make | |||
@@ -0,0 +1,36 @@ | |||
1 | I18N=1 | ||
2 | HAVE_AFUNIX=1 | ||
3 | HAVE_AFINET=1 | ||
4 | HAVE_AFINET6=1 | ||
5 | # HAVE_AFIPX=0 | ||
6 | # HAVE_AFATALK=0 | ||
7 | # HAVE_AFAX25=0 | ||
8 | HAVE_AFNETROM=1 | ||
9 | # HAVE_AFROSE=0 | ||
10 | # HAVE_AFX25=0 | ||
11 | # HAVE_AFECONET=0 | ||
12 | # HAVE_AFDECnet=0 | ||
13 | # HAVE_AFASH=0 | ||
14 | HAVE_HWETHER=1 | ||
15 | HAVE_HWARC=1 | ||
16 | HAVE_HWSLIP=1 | ||
17 | HAVE_HWPPP=1 | ||
18 | HAVE_HWTUNNEL=1 | ||
19 | HAVE_HWSTRIP=1 | ||
20 | HAVE_HWTR=1 | ||
21 | # HAVE_HWAX25=0 | ||
22 | # HAVE_HWROSE=0 | ||
23 | HAVE_HWNETROM=1 | ||
24 | # HAVE_HWX25=0 | ||
25 | HAVE_HWFR=1 | ||
26 | # HAVE_HWSIT=0 | ||
27 | # HAVE_HWFDDI=0 | ||
28 | # HAVE_HWHIPPI=0 | ||
29 | # HAVE_HWASH=0 | ||
30 | # HAVE_HWHDLCLAPB=0 | ||
31 | HAVE_HWIRDA=1 | ||
32 | # HAVE_HWEC=0 | ||
33 | # HAVE_HWIB=0 | ||
34 | HAVE_FW_MASQUERADE=1 | ||
35 | HAVE_IP_TOOLS=1 | ||
36 | HAVE_MII=1 | ||
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb new file mode 100644 index 0000000000..031169c067 --- /dev/null +++ b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb | |||
@@ -0,0 +1,77 @@ | |||
1 | SUMMARY="A collection of programs that form the base set of the NET-3 networking distribution for the Linux operating system" | ||
2 | HOMEPAGE = "http://net-tools.berlios.de/" | ||
3 | BUGTRACKER = "http://bugs.debian.org/net-tools" | ||
4 | LICENSE = "GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ | ||
6 | file://ifconfig.c;startline=11;endline=15;md5=da4c7bb79a5d0798faa99ef869721f4a" | ||
7 | PR = "r0" | ||
8 | |||
9 | SRC_URI = "ftp://ftp.debian.org/debian/pool/main/n/net-tools/net-tools_1.60.orig.tar.gz \ | ||
10 | ftp://ftp.debian.org/debian/pool/main/n/net-tools/${PN}_${PV}.diff.gz;apply=no \ | ||
11 | file://net-tools-config.h \ | ||
12 | file://net-tools-config.make" | ||
13 | |||
14 | S = "${WORKDIR}/net-tools-1.60" | ||
15 | |||
16 | inherit gettext | ||
17 | |||
18 | # The Makefile is lame, no parallel build | ||
19 | PARALLEL_MAKE = "" | ||
20 | |||
21 | # Unlike other Debian packages, net-tools *.diff.gz contains another series of | ||
22 | # patches maintained by quilt. So manually apply them before applying other local | ||
23 | # patches. Also remove all temp files before leaving, because do_patch() will pop | ||
24 | # up all previously applied patches in the start | ||
25 | nettools_do_patch() { | ||
26 | cd ${S} | ||
27 | patch -p1 < ${WORKDIR}/${PN}_${PV}.diff | ||
28 | QUILT_PATCHES=${S}/debian/patches quilt push -a | ||
29 | rm -rf ${S}/patches ${S}/.pc | ||
30 | } | ||
31 | |||
32 | # We invoke base do_patch at end, to incorporate any local patch | ||
33 | python do_patch() { | ||
34 | bb.build.exec_func('nettools_do_patch', d) | ||
35 | bb.build.exec_func('patch_do_patch', d) | ||
36 | } | ||
37 | |||
38 | do_configure() { | ||
39 | # net-tools has its own config mechanism requiring "make config" | ||
40 | # we pre-generate desired options and copy to source directory instead | ||
41 | cp ${WORKDIR}/net-tools-config.h ${S}/config.h | ||
42 | cp ${WORKDIR}/net-tools-config.make ${S}/config.make | ||
43 | } | ||
44 | |||
45 | do_compile() { | ||
46 | # net-tools use COPTS/LOPTS to allow adding custom options | ||
47 | export COPTS="$CFLAGS" | ||
48 | export LOPTS="$LDFLAGS" | ||
49 | unset CFLAGS | ||
50 | unset LDFLAGS | ||
51 | |||
52 | oe_runmake | ||
53 | } | ||
54 | |||
55 | do_install() { | ||
56 | oe_runmake 'BASEDIR=${D}' install | ||
57 | |||
58 | for app in ${D}/${base_sbindir}/* ${D}/${base_bindir}/*; do | ||
59 | mv $app $app.${PN} | ||
60 | done | ||
61 | } | ||
62 | |||
63 | pkg_postinst_${PN} () { | ||
64 | for app in arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach ; do | ||
65 | update-alternatives --install ${base_sbindir}/$app $app $app.${PN} 100 | ||
66 | done | ||
67 | |||
68 | for app in dnsdomainname domainname hostname netstat nisdomainname ypdomainname ; do | ||
69 | update-alternatives --install ${base_bindir}/$app $app $app.${PN} 100 | ||
70 | done | ||
71 | } | ||
72 | |||
73 | pkg_prerm_${PN} () { | ||
74 | for app in arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach dnsdomainname domainname hostname netstat nisdomainname ypdomainname ; do | ||
75 | update-alternatives --remove $app $app.${PN} | ||
76 | done | ||
77 | } | ||
diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/meta/recipes-extended/pax/pax_3.4.bb new file mode 100644 index 0000000000..32804ba0c1 --- /dev/null +++ b/meta/recipes-extended/pax/pax_3.4.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | DESCRIPTION = "pax (Portable Archive eXchange) is the POSIX standard archive tool" | ||
2 | HOMEPAGE = "http://www.openbsd.org/cgi-bin/cvsweb/src/bin/pax/" | ||
3 | BUGTRACKER = "http://www.openbsd.org/query-pr.html" | ||
4 | |||
5 | LICENSE = "BSD" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=4b0b674dfdc56daa3832d4069b820ea0 \ | ||
7 | file://src/pax.h;endline=40;md5=309d3e241c1d82069228e5a51e9b8d60 \ | ||
8 | file://src/cpio.h;endline=40;md5=c3b4bbff6133a83387968617bbae8ac4 \ | ||
9 | file://lib/vis.h;endline=40;md5=b283f759abd4a5ad7e014b80f51fc053" | ||
10 | |||
11 | SECTION = "base" | ||
12 | PR = "r0" | ||
13 | |||
14 | SRC_URI = "ftp://ftp.suse.com/pub/people/kukuk/pax/pax-${PV}.tar.bz2" | ||
15 | |||
16 | inherit autotools | ||
diff --git a/meta/recipes-extended/perl/libconvert-asn1-perl_0.21.bb b/meta/recipes-extended/perl/libconvert-asn1-perl_0.21.bb new file mode 100644 index 0000000000..3292ee338f --- /dev/null +++ b/meta/recipes-extended/perl/libconvert-asn1-perl_0.21.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | DESCRIPTION = "Convert::ASN1 - ASN.1 Encode/Decode library" | ||
2 | SECTION = "libs" | ||
3 | LICENSE = "Artistic|GPL" | ||
4 | PR = "r0" | ||
5 | |||
6 | SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Convert-ASN1-${PV}.tar.gz" | ||
7 | |||
8 | S = "${WORKDIR}/Convert-ASN1-${PV}" | ||
9 | |||
10 | inherit cpan | ||
11 | |||
12 | BBCLASSEXTEND="native" | ||
13 | |||
14 | PACKAGE_ARCH = "all" | ||
diff --git a/meta/recipes-extended/perl/libtimedate-perl_1.20.bb b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb new file mode 100644 index 0000000000..84406adfb0 --- /dev/null +++ b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | DESCRIPTION = "TimeDate - parser for absolute times" | ||
2 | SECTION = "libs" | ||
3 | # You can redistribute it and/or modify it under the same terms as Perl itself. | ||
4 | LICENSE = "Artistic|GPL" | ||
5 | PR = "r2" | ||
6 | |||
7 | |||
8 | SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-${PV}.tar.gz" | ||
9 | |||
10 | S = "${WORKDIR}/TimeDate-${PV}" | ||
11 | |||
12 | inherit cpan | ||
13 | |||
14 | BBCLASSEXTEND="native" | ||
15 | |||
16 | RDEPENDS_${PN}_virtclass-native = "" | ||
17 | RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local" | ||
18 | PACKAGE_ARCH = "all" | ||
19 | |||
20 | SRC_URI[md5sum] = "7da7452bce4c684e4238e6d09b390200" | ||
21 | SRC_URI[sha256sum] = "f8251a791f6692c69952b4af697c01df93981ad1ab133279d034656a03cd3755" | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.7/install.patch b/meta/recipes-extended/procps/procps-3.2.7/install.patch new file mode 100644 index 0000000000..9f1ef6915d --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.7/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.7/linux-limits.patch b/meta/recipes-extended/procps/procps-3.2.7/linux-limits.patch new file mode 100644 index 0000000000..dcd66163ad --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.7/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.7/pagesz-not-constant.patch b/meta/recipes-extended/procps/procps-3.2.7/pagesz-not-constant.patch new file mode 100644 index 0000000000..8e9e1ebfe1 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.7/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.7/procmodule.patch b/meta/recipes-extended/procps/procps-3.2.7/procmodule.patch new file mode 100644 index 0000000000..fabfabaa59 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.7/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.7/procps.init b/meta/recipes-extended/procps/procps-3.2.7/procps.init new file mode 100644 index 0000000000..739dcf4be7 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.7/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.7/psmodule.patch b/meta/recipes-extended/procps/procps-3.2.7/psmodule.patch new file mode 100644 index 0000000000..f298c1c1c4 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.7/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.7/sysctl.conf b/meta/recipes-extended/procps/procps-3.2.7/sysctl.conf new file mode 100644 index 0000000000..34e7488bf7 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.7/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 | ||
diff --git a/meta/recipes-extended/procps/procps.inc b/meta/recipes-extended/procps/procps.inc new file mode 100644 index 0000000000..2de32d2c83 --- /dev/null +++ b/meta/recipes-extended/procps/procps.inc | |||
@@ -0,0 +1,16 @@ | |||
1 | DESCRIPTION = "Procps is the package that has a bunch \ | ||
2 | of small useful utilities that give information \ | ||
3 | about processes using the /proc filesystem. The package \ | ||
4 | includes the programs ps, top, vmstat, w, kill, and skill." | ||
5 | HOMEPAGE = "http://procps.sf.net" | ||
6 | SECTION = "base" | ||
7 | PRIORITY = "optional" | ||
8 | LICENSE = "GPL" | ||
9 | DEPENDS = "ncurses" | ||
10 | |||
11 | FILES_${PN} += "${base_libdir}/libproc-*.so" | ||
12 | |||
13 | SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ | ||
14 | file://install.patch;patch=1" | ||
15 | |||
16 | inherit autotools | ||
diff --git a/meta/recipes-extended/procps/procps_3.2.7.bb b/meta/recipes-extended/procps/procps_3.2.7.bb new file mode 100644 index 0000000000..6da975adc7 --- /dev/null +++ b/meta/recipes-extended/procps/procps_3.2.7.bb | |||
@@ -0,0 +1,64 @@ | |||
1 | require procps.inc | ||
2 | |||
3 | PR = "r8" | ||
4 | |||
5 | inherit update-rc.d | ||
6 | |||
7 | INITSCRIPT_NAME = "procps.sh" | ||
8 | INITSCRIPT_PARAMS = "start 30 S ." | ||
9 | |||
10 | SRC_URI += "file://procmodule.patch;patch=1 \ | ||
11 | file://psmodule.patch;patch=1 \ | ||
12 | file://linux-limits.patch;patch=1 \ | ||
13 | file://sysctl.conf \ | ||
14 | file://procps.init \ | ||
15 | " | ||
16 | |||
17 | FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ | ||
18 | ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ | ||
19 | ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ | ||
20 | ${base_sbindir}/sysctl.${PN}" | ||
21 | |||
22 | CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" | ||
23 | |||
24 | EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ | ||
25 | CPPFLAGS=-I${STAGING_INCDIR} \ | ||
26 | LDFLAGS="${LDFLAGS}" \ | ||
27 | CURSES=-lncurses \ | ||
28 | install='install -D' \ | ||
29 | ldconfig=echo" | ||
30 | |||
31 | do_install_append () { | ||
32 | install -d ${D}${sysconfdir} | ||
33 | install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf | ||
34 | install -d ${D}${sysconfdir}/init.d | ||
35 | install -m 0755 ${WORKDIR}/procps.init ${D}${sysconfdir}/init.d/procps.sh | ||
36 | |||
37 | mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} | ||
38 | mv ${D}${bindir}/top ${D}${bindir}/top.${PN} | ||
39 | mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} | ||
40 | mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN} | ||
41 | mv ${D}${bindir}/free ${D}${bindir}/free.${PN} | ||
42 | mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN} | ||
43 | mv ${D}${bindir}/pkill ${D}${bindir}/pkill.${PN} | ||
44 | } | ||
45 | |||
46 | pkg_postinst() { | ||
47 | update-alternatives --install ${bindir}/top top top.${PN} 90 | ||
48 | update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 90 | ||
49 | update-alternatives --install ${base_bindir}/ps ps ps.${PN} 90 | ||
50 | update-alternatives --install ${base_bindir}/kill kill kill.${PN} 90 | ||
51 | update-alternatives --install ${bindir}/free free free.${PN} 90 | ||
52 | update-alternatives --install ${base_sbindir}/sysctl sysctl sysctl.${PN} 90 | ||
53 | update-alternatives --install ${bindir}/pkill pkill pkill.${PN} 90 | ||
54 | } | ||
55 | |||
56 | pkg_postrm() { | ||
57 | update-alternatives --remove top top.${PN} | ||
58 | update-alternatives --remove ps ps.${PN} | ||
59 | update-alternatives --remove uptime uptime.${PN} | ||
60 | update-alternatives --remove kill kill.${PN} | ||
61 | update-alternatives --remove free free.${PN} | ||
62 | update-alternatives --remove sysctl sysctl.${PN} | ||
63 | update-alternatives --remove pkill pkill.${PN} | ||
64 | } | ||
diff --git a/meta/recipes-extended/quota/quota_3.17.bb b/meta/recipes-extended/quota/quota_3.17.bb new file mode 100644 index 0000000000..495e3072ce --- /dev/null +++ b/meta/recipes-extended/quota/quota_3.17.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | DESCRIPTION = "display disk usage and limits" | ||
2 | SECTION = "base" | ||
3 | HOMEPAGE = "http://sourceforge.net/projects/linuxquota/" | ||
4 | BUGTRACKER = "http://sourceforge.net/tracker/?group_id=18136&atid=118136" | ||
5 | LICENSE = "BSD & GPLv2+ & LGPLv2.1+" | ||
6 | LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad24027f0651028ec \ | ||
7 | file://rquota_server.c;beginline=1;endline=20;md5=91cf52a9aa19e13c2797bd2bf785d7c4 \ | ||
8 | file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb" | ||
9 | PR = "r0" | ||
10 | |||
11 | SRC_URI = "http://downloads.sourceforge.net/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz" | ||
12 | |||
13 | S = ${WORKDIR}/quota-tools | ||
14 | |||
15 | inherit autotools | ||
16 | |||
17 | do_install() { | ||
18 | oe_runmake prefix=${D}${prefix} install | ||
19 | } | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/login_defs_pam.sed b/meta/recipes-extended/shadow/shadow-4.1.4.2/login_defs_pam.sed new file mode 100644 index 0000000000..0a1f3be4af --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/login_defs_pam.sed | |||
@@ -0,0 +1,32 @@ | |||
1 | /^FAILLOG_ENAB/b comment | ||
2 | /^LASTLOG_ENAB/b comment | ||
3 | /^MAIL_CHECK_ENAB/b comment | ||
4 | /^OBSCURE_CHECKS_ENAB/b comment | ||
5 | /^PORTTIME_CHECKS_ENAB/b comment | ||
6 | /^QUOTAS_ENAB/b comment | ||
7 | /^MOTD_FILE/b comment | ||
8 | /^FTMP_FILE/b comment | ||
9 | /^NOLOGINS_FILE/b comment | ||
10 | /^ENV_HZ/b comment | ||
11 | /^ENV_TZ/b comment | ||
12 | /^PASS_MIN_LEN/b comment | ||
13 | /^SU_WHEEL_ONLY/b comment | ||
14 | /^CRACKLIB_DICTPATH/b comment | ||
15 | /^PASS_CHANGE_TRIES/b comment | ||
16 | /^PASS_ALWAYS_WARN/b comment | ||
17 | /^PASS_MAX_LEN/b comment | ||
18 | /^PASS_MIN_LEN/b comment | ||
19 | /^CHFN_AUTH/b comment | ||
20 | /^CHSH_AUTH/b comment | ||
21 | /^ISSUE_FILE/b comment | ||
22 | /^LOGIN_STRING/b comment | ||
23 | /^ULIMIT/b comment | ||
24 | /^ENVIRON_FILE/b comment | ||
25 | |||
26 | b exit | ||
27 | |||
28 | : comment | ||
29 | s:^:#: | ||
30 | |||
31 | : exit | ||
32 | |||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chfn b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chfn new file mode 100644 index 0000000000..baf7698bba --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chfn | |||
@@ -0,0 +1,14 @@ | |||
1 | # | ||
2 | # The PAM configuration file for the Shadow `chfn' service | ||
3 | # | ||
4 | |||
5 | # This allows root to change user infomation without being | ||
6 | # prompted for a password | ||
7 | auth sufficient pam_rootok.so | ||
8 | |||
9 | # The standard Unix authentication modules, used with | ||
10 | # NIS (man nsswitch) as well as normal /etc/passwd and | ||
11 | # /etc/shadow entries. | ||
12 | auth include common-auth | ||
13 | account include common-account | ||
14 | session include common-session | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chpasswd b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chpasswd new file mode 100644 index 0000000000..9e3efa68ba --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chpasswd | |||
@@ -0,0 +1,4 @@ | |||
1 | # The PAM configuration file for the Shadow 'chpasswd' service | ||
2 | # | ||
3 | |||
4 | password include common-password | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chsh b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chsh new file mode 100644 index 0000000000..8fb169f64e --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chsh | |||
@@ -0,0 +1,19 @@ | |||
1 | # | ||
2 | # The PAM configuration file for the Shadow `chsh' service | ||
3 | # | ||
4 | |||
5 | # This will not allow a user to change their shell unless | ||
6 | # their current one is listed in /etc/shells. This keeps | ||
7 | # accounts with special shells from changing them. | ||
8 | auth required pam_shells.so | ||
9 | |||
10 | # This allows root to change user shell without being | ||
11 | # prompted for a password | ||
12 | auth sufficient pam_rootok.so | ||
13 | |||
14 | # The standard Unix authentication modules, used with | ||
15 | # NIS (man nsswitch) as well as normal /etc/passwd and | ||
16 | # /etc/shadow entries. | ||
17 | auth include common-auth | ||
18 | account include common-account | ||
19 | session include common-session | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/login b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/login new file mode 100644 index 0000000000..e41eb04ec1 --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/login | |||
@@ -0,0 +1,91 @@ | |||
1 | # | ||
2 | # The PAM configuration file for the Shadow `login' service | ||
3 | # | ||
4 | |||
5 | # Enforce a minimal delay in case of failure (in microseconds). | ||
6 | # (Replaces the `FAIL_DELAY' setting from login.defs) | ||
7 | # Note that other modules may require another minimal delay. (for example, | ||
8 | # to disable any delay, you should add the nodelay option to pam_unix) | ||
9 | auth optional pam_faildelay.so delay=3000000 | ||
10 | |||
11 | # Outputs an issue file prior to each login prompt (Replaces the | ||
12 | # ISSUE_FILE option from login.defs). Uncomment for use | ||
13 | # auth required pam_issue.so issue=/etc/issue | ||
14 | |||
15 | # Disallows root logins except on tty's listed in /etc/securetty | ||
16 | # (Replaces the `CONSOLE' setting from login.defs) | ||
17 | # Note that it is included as a "requisite" module. No password prompts will | ||
18 | # be displayed if this module fails to avoid having the root password | ||
19 | # transmitted on unsecure ttys. | ||
20 | # You can change it to a "required" module if you think it permits to | ||
21 | # guess valid user names of your system (invalid user names are considered | ||
22 | # as possibly being root). | ||
23 | auth [success=ok ignore=ignore user_unknown=ignore default=die] pam_securetty.so | ||
24 | |||
25 | # Disallows other than root logins when /etc/nologin exists | ||
26 | # (Replaces the `NOLOGINS_FILE' option from login.defs) | ||
27 | auth requisite pam_nologin.so | ||
28 | |||
29 | # SELinux needs to be the first session rule. This ensures that any | ||
30 | # lingering context has been cleared. Without out this it is possible | ||
31 | # that a module could execute code in the wrong domain. | ||
32 | # When the module is present, "required" would be sufficient (When SELinux | ||
33 | # is disabled, this returns success.) | ||
34 | session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close | ||
35 | |||
36 | # This module parses environment configuration file(s) | ||
37 | # and also allows you to use an extended config | ||
38 | # file /etc/security/pam_env.conf. | ||
39 | # | ||
40 | # parsing /etc/environment needs "readenv=1" | ||
41 | session required pam_env.so readenv=1 | ||
42 | # locale variables are also kept into /etc/default/locale in etch | ||
43 | # reading this file *in addition to /etc/environment* does not hurt | ||
44 | session required pam_env.so readenv=1 envfile=/etc/default/locale | ||
45 | |||
46 | # Standard Un*x authentication. | ||
47 | auth include common-auth | ||
48 | |||
49 | # This allows certain extra groups to be granted to a user | ||
50 | # based on things like time of day, tty, service, and user. | ||
51 | # Please edit /etc/security/group.conf to fit your needs | ||
52 | # (Replaces the `CONSOLE_GROUPS' option in login.defs) | ||
53 | auth optional pam_group.so | ||
54 | |||
55 | # Uncomment and edit /etc/security/time.conf if you need to set | ||
56 | # time restrainst on logins. | ||
57 | # (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs | ||
58 | # as well as /etc/porttime) | ||
59 | # account requisite pam_time.so | ||
60 | |||
61 | # Uncomment and edit /etc/security/access.conf if you need to | ||
62 | # set access limits. | ||
63 | # (Replaces /etc/login.access file) | ||
64 | # account required pam_access.so | ||
65 | |||
66 | # Sets up user limits according to /etc/security/limits.conf | ||
67 | # (Replaces the use of /etc/limits in old login) | ||
68 | session required pam_limits.so | ||
69 | |||
70 | # Prints the last login info upon succesful login | ||
71 | # (Replaces the `LASTLOG_ENAB' option from login.defs) | ||
72 | session optional pam_lastlog.so | ||
73 | |||
74 | # Prints the motd upon succesful login | ||
75 | # (Replaces the `MOTD_FILE' option in login.defs) | ||
76 | session optional pam_motd.so | ||
77 | |||
78 | # Prints the status of the user's mailbox upon succesful login | ||
79 | # (Replaces the `MAIL_CHECK_ENAB' option from login.defs). | ||
80 | # | ||
81 | # This also defines the MAIL environment variable | ||
82 | # However, userdel also needs MAIL_DIR and MAIL_FILE variables | ||
83 | # in /etc/login.defs to make sure that removing a user | ||
84 | # also removes the user's mail spool file. | ||
85 | # See comments in /etc/login.defs | ||
86 | session optional pam_mail.so standard | ||
87 | |||
88 | # Standard Un*x account and session | ||
89 | account include common-account | ||
90 | password include common-password | ||
91 | session include common-session | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/newusers b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/newusers new file mode 100644 index 0000000000..4aa3dde48b --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/newusers | |||
@@ -0,0 +1,4 @@ | |||
1 | # The PAM configuration file for the Shadow 'newusers' service | ||
2 | # | ||
3 | |||
4 | password include common-password | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/passwd b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/passwd new file mode 100644 index 0000000000..f534992435 --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/passwd | |||
@@ -0,0 +1,5 @@ | |||
1 | # | ||
2 | # The PAM configuration file for the Shadow `passwd' service | ||
3 | # | ||
4 | |||
5 | password include common-password | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/su b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/su new file mode 100644 index 0000000000..8e35137f37 --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/su | |||
@@ -0,0 +1,60 @@ | |||
1 | # | ||
2 | # The PAM configuration file for the Shadow `su' service | ||
3 | # | ||
4 | |||
5 | # This allows root to su without passwords (normal operation) | ||
6 | auth sufficient pam_rootok.so | ||
7 | |||
8 | # Uncomment this to force users to be a member of group root | ||
9 | # before they can use `su'. You can also add "group=foo" | ||
10 | # to the end of this line if you want to use a group other | ||
11 | # than the default "root" (but this may have side effect of | ||
12 | # denying "root" user, unless she's a member of "foo" or explicitly | ||
13 | # permitted earlier by e.g. "sufficient pam_rootok.so"). | ||
14 | # (Replaces the `SU_WHEEL_ONLY' option from login.defs) | ||
15 | # auth required pam_wheel.so | ||
16 | |||
17 | # Uncomment this if you want wheel members to be able to | ||
18 | # su without a password. | ||
19 | # auth sufficient pam_wheel.so trust | ||
20 | |||
21 | # Uncomment this if you want members of a specific group to not | ||
22 | # be allowed to use su at all. | ||
23 | # auth required pam_wheel.so deny group=nosu | ||
24 | |||
25 | # Uncomment and edit /etc/security/time.conf if you need to set | ||
26 | # time restrainst on su usage. | ||
27 | # (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs | ||
28 | # as well as /etc/porttime) | ||
29 | # account requisite pam_time.so | ||
30 | |||
31 | # This module parses environment configuration file(s) | ||
32 | # and also allows you to use an extended config | ||
33 | # file /etc/security/pam_env.conf. | ||
34 | # | ||
35 | # parsing /etc/environment needs "readenv=1" | ||
36 | session required pam_env.so readenv=1 | ||
37 | # locale variables are also kept into /etc/default/locale in etch | ||
38 | # reading this file *in addition to /etc/environment* does not hurt | ||
39 | session required pam_env.so readenv=1 envfile=/etc/default/locale | ||
40 | |||
41 | # Defines the MAIL environment variable | ||
42 | # However, userdel also needs MAIL_DIR and MAIL_FILE variables | ||
43 | # in /etc/login.defs to make sure that removing a user | ||
44 | # also removes the user's mail spool file. | ||
45 | # See comments in /etc/login.defs | ||
46 | # | ||
47 | # "nopen" stands to avoid reporting new mail when su'ing to another user | ||
48 | session optional pam_mail.so nopen | ||
49 | |||
50 | # Sets up user limits, please uncomment and read /etc/security/limits.conf | ||
51 | # to enable this functionality. | ||
52 | # (Replaces the use of /etc/limits in old login) | ||
53 | # session required pam_limits.so | ||
54 | |||
55 | # The standard Unix authentication modules, used with | ||
56 | # NIS (man nsswitch) as well as normal /etc/passwd and | ||
57 | # /etc/shadow entries. | ||
58 | auth include common-auth | ||
59 | account include common-account | ||
60 | session include common-session | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/securetty b/meta/recipes-extended/shadow/shadow-4.1.4.2/securetty new file mode 100644 index 0000000000..28fa0afb72 --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/securetty | |||
@@ -0,0 +1,206 @@ | |||
1 | # /etc/securetty: list of terminals on which root is allowed to login. | ||
2 | # See securetty(5) and login(1). | ||
3 | console | ||
4 | |||
5 | # Standard serial ports | ||
6 | ttyS0 | ||
7 | ttyS1 | ||
8 | ttyS2 | ||
9 | ttyS3 | ||
10 | |||
11 | # Samsung ARM SoCs | ||
12 | ttySAC0 | ||
13 | ttySAC1 | ||
14 | ttySAC2 | ||
15 | ttySAC3 | ||
16 | |||
17 | # TI OMAP SoCs | ||
18 | ttyO0 | ||
19 | ttyO1 | ||
20 | ttyO2 | ||
21 | ttyO3 | ||
22 | |||
23 | # USB dongles | ||
24 | ttyUSB0 | ||
25 | ttyUSB1 | ||
26 | ttyUSB2 | ||
27 | |||
28 | # PowerMac | ||
29 | ttyPZ0 | ||
30 | ttyPZ1 | ||
31 | ttyPZ2 | ||
32 | ttyPZ3 | ||
33 | |||
34 | # Embedded MPC platforms | ||
35 | ttyPSC0 | ||
36 | ttyPSC1 | ||
37 | ttyPSC2 | ||
38 | ttyPSC3 | ||
39 | ttyPSC4 | ||
40 | ttyPSC5 | ||
41 | |||
42 | # PA-RISC mux ports | ||
43 | ttyB0 | ||
44 | ttyB1 | ||
45 | |||
46 | # Standard hypervisor virtual console | ||
47 | hvc0 | ||
48 | |||
49 | # Oldstyle Xen console | ||
50 | xvc0 | ||
51 | |||
52 | # Standard consoles | ||
53 | tty1 | ||
54 | tty2 | ||
55 | tty3 | ||
56 | tty4 | ||
57 | tty5 | ||
58 | tty6 | ||
59 | tty7 | ||
60 | tty8 | ||
61 | tty9 | ||
62 | tty10 | ||
63 | tty11 | ||
64 | tty12 | ||
65 | tty13 | ||
66 | tty14 | ||
67 | tty15 | ||
68 | tty16 | ||
69 | tty17 | ||
70 | tty18 | ||
71 | tty19 | ||
72 | tty20 | ||
73 | tty21 | ||
74 | tty22 | ||
75 | tty23 | ||
76 | tty24 | ||
77 | tty25 | ||
78 | tty26 | ||
79 | tty27 | ||
80 | tty28 | ||
81 | tty29 | ||
82 | tty30 | ||
83 | tty31 | ||
84 | tty32 | ||
85 | tty33 | ||
86 | tty34 | ||
87 | tty35 | ||
88 | tty36 | ||
89 | tty37 | ||
90 | tty38 | ||
91 | tty39 | ||
92 | tty40 | ||
93 | tty41 | ||
94 | tty42 | ||
95 | tty43 | ||
96 | tty44 | ||
97 | tty45 | ||
98 | tty46 | ||
99 | tty47 | ||
100 | tty48 | ||
101 | tty49 | ||
102 | tty50 | ||
103 | tty51 | ||
104 | tty52 | ||
105 | tty53 | ||
106 | tty54 | ||
107 | tty55 | ||
108 | tty56 | ||
109 | tty57 | ||
110 | tty58 | ||
111 | tty59 | ||
112 | tty60 | ||
113 | tty61 | ||
114 | tty62 | ||
115 | tty63 | ||
116 | |||
117 | # Local X displays (allows empty passwords with pam_unix's nullok_secure) | ||
118 | :0 | ||
119 | :0.0 | ||
120 | :0.1 | ||
121 | :1 | ||
122 | :1.0 | ||
123 | :1.1 | ||
124 | :2 | ||
125 | :2.0 | ||
126 | :2.1 | ||
127 | :3 | ||
128 | :3.0 | ||
129 | :3.1 | ||
130 | |||
131 | # Embedded Freescale i.MX ports | ||
132 | ttymxc0 | ||
133 | ttymxc1 | ||
134 | ttymxc2 | ||
135 | ttymxc3 | ||
136 | ttymxc4 | ||
137 | ttymxc5 | ||
138 | |||
139 | # Standard serial ports, with devfs | ||
140 | tts/0 | ||
141 | tts/1 | ||
142 | |||
143 | # Standard consoles, with devfs | ||
144 | vc/1 | ||
145 | vc/2 | ||
146 | vc/3 | ||
147 | vc/4 | ||
148 | vc/5 | ||
149 | vc/6 | ||
150 | vc/7 | ||
151 | vc/8 | ||
152 | vc/9 | ||
153 | vc/10 | ||
154 | vc/11 | ||
155 | vc/12 | ||
156 | vc/13 | ||
157 | vc/14 | ||
158 | vc/15 | ||
159 | vc/16 | ||
160 | vc/17 | ||
161 | vc/18 | ||
162 | vc/19 | ||
163 | vc/20 | ||
164 | vc/21 | ||
165 | vc/22 | ||
166 | vc/23 | ||
167 | vc/24 | ||
168 | vc/25 | ||
169 | vc/26 | ||
170 | vc/27 | ||
171 | vc/28 | ||
172 | vc/29 | ||
173 | vc/30 | ||
174 | vc/31 | ||
175 | vc/32 | ||
176 | vc/33 | ||
177 | vc/34 | ||
178 | vc/35 | ||
179 | vc/36 | ||
180 | vc/37 | ||
181 | vc/38 | ||
182 | vc/39 | ||
183 | vc/40 | ||
184 | vc/41 | ||
185 | vc/42 | ||
186 | vc/43 | ||
187 | vc/44 | ||
188 | vc/45 | ||
189 | vc/46 | ||
190 | vc/47 | ||
191 | vc/48 | ||
192 | vc/49 | ||
193 | vc/50 | ||
194 | vc/51 | ||
195 | vc/52 | ||
196 | vc/53 | ||
197 | vc/54 | ||
198 | vc/55 | ||
199 | vc/56 | ||
200 | vc/57 | ||
201 | vc/58 | ||
202 | vc/59 | ||
203 | vc/60 | ||
204 | vc/61 | ||
205 | vc/62 | ||
206 | vc/63 | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch new file mode 100644 index 0000000000..7a2ff2e24e --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | # commit message copied from openembedded: | ||
2 | # commit 246c80637b135f3a113d319b163422f98174ee6c | ||
3 | # Author: Khem Raj <raj.khem@gmail.com> | ||
4 | # Date: Wed Jun 9 13:37:03 2010 -0700 | ||
5 | # | ||
6 | # shadow-4.1.4.2: Add patches to support dots in login id. | ||
7 | # | ||
8 | # Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | # | ||
10 | # comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11 | ||
11 | |||
12 | Index: shadow-4.1.4.2/libmisc/chkname.c | ||
13 | =================================================================== | ||
14 | --- shadow-4.1.4.2.orig/libmisc/chkname.c 2009-04-28 12:14:04.000000000 -0700 | ||
15 | +++ shadow-4.1.4.2/libmisc/chkname.c 2010-06-03 17:43:20.638973857 -0700 | ||
16 | @@ -61,6 +61,7 @@ static bool is_valid_name (const char *n | ||
17 | ( ('0' <= *name) && ('9' >= *name) ) || | ||
18 | ('_' == *name) || | ||
19 | ('-' == *name) || | ||
20 | + ('.' == *name) || | ||
21 | ( ('$' == *name) && ('\0' == *(name + 1)) ) | ||
22 | )) { | ||
23 | return false; | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch new file mode 100644 index 0000000000..124065c7f9 --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | # commit message copied from openembedded: | ||
2 | # commit 246c80637b135f3a113d319b163422f98174ee6c | ||
3 | # Author: Khem Raj <raj.khem@gmail.com> | ||
4 | # Date: Wed Jun 9 13:37:03 2010 -0700 | ||
5 | # | ||
6 | # shadow-4.1.4.2: Add patches to support dots in login id. | ||
7 | # | ||
8 | # Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | # | ||
10 | # comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11 | ||
11 | |||
12 | http://bugs.gentoo.org/283725 | ||
13 | https://alioth.debian.org/tracker/index.php?func=detail&aid=311740&group_id=30580&atid=411480 | ||
14 | |||
15 | Index: shadow-4.1.4.2/libmisc/env.c | ||
16 | =================================================================== | ||
17 | --- shadow-4.1.4.2.orig/libmisc/env.c 2009-04-27 13:07:56.000000000 -0700 | ||
18 | +++ shadow-4.1.4.2/libmisc/env.c 2010-06-03 17:44:51.456408474 -0700 | ||
19 | @@ -251,7 +251,7 @@ void sanitize_env (void) | ||
20 | if (strncmp (*cur, *bad, strlen (*bad)) != 0) { | ||
21 | continue; | ||
22 | } | ||
23 | - if (strchr (*cur, '/') != NULL) { | ||
24 | + if (strchr (*cur, '/') == NULL) { | ||
25 | continue; /* OK */ | ||
26 | } | ||
27 | for (move = cur; NULL != *move; move++) { | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch new file mode 100644 index 0000000000..6682fe8078 --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | # commit message copied from openembedded: | ||
2 | # commit 246c80637b135f3a113d319b163422f98174ee6c | ||
3 | # Author: Khem Raj <raj.khem@gmail.com> | ||
4 | # Date: Wed Jun 9 13:37:03 2010 -0700 | ||
5 | # | ||
6 | # shadow-4.1.4.2: Add patches to support dots in login id. | ||
7 | # | ||
8 | # Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | # | ||
10 | # comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11 | ||
11 | |||
12 | http://bugs.gentoo.org/300790 | ||
13 | http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.html | ||
14 | |||
15 | 2009-11-05 Nicolas François <nicolas.francois@centraliens.net> | ||
16 | |||
17 | * NEWS, src/groupmod.c: Fixed groupmod when configured with | ||
18 | --enable-account-tools-setuid. | ||
19 | |||
20 | Index: shadow-4.1.4.2/src/groupmod.c | ||
21 | =================================================================== | ||
22 | --- shadow-4.1.4.2.orig/src/groupmod.c 2009-06-05 15:16:58.000000000 -0700 | ||
23 | +++ shadow-4.1.4.2/src/groupmod.c 2010-06-03 17:45:43.828952613 -0700 | ||
24 | @@ -720,7 +720,7 @@ int main (int argc, char **argv) | ||
25 | { | ||
26 | struct passwd *pampw; | ||
27 | pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */ | ||
28 | - if (NULL == pamh) { | ||
29 | + if (NULL == pampw) { | ||
30 | fprintf (stderr, | ||
31 | _("%s: Cannot determine your user name.\n"), | ||
32 | Prog); | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch new file mode 100644 index 0000000000..f67251c840 --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | # commit message copied from openembedded: | ||
2 | # commit 246c80637b135f3a113d319b163422f98174ee6c | ||
3 | # Author: Khem Raj <raj.khem@gmail.com> | ||
4 | # Date: Wed Jun 9 13:37:03 2010 -0700 | ||
5 | # | ||
6 | # shadow-4.1.4.2: Add patches to support dots in login id. | ||
7 | # | ||
8 | # Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | # | ||
10 | # comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11 | ||
11 | |||
12 | http://bugs.gentoo.org/show_bug.cgi?id=301957 | ||
13 | https://alioth.debian.org/scm/browser.php?group_id=30580 | ||
14 | |||
15 | Index: shadow-4.1.4.2/src/su.c | ||
16 | =================================================================== | ||
17 | --- shadow-4.1.4.2.orig/src/su.c 2009-07-23 13:38:56.000000000 -0700 | ||
18 | +++ shadow-4.1.4.2/src/su.c 2010-06-03 17:46:47.718944010 -0700 | ||
19 | @@ -378,7 +378,7 @@ int main (int argc, char **argv) | ||
20 | #endif | ||
21 | #endif /* !USE_PAM */ | ||
22 | |||
23 | - sanitize_env (); | ||
24 | + /* sanitize_env (); */ | ||
25 | |||
26 | (void) setlocale (LC_ALL, ""); | ||
27 | (void) bindtextdomain (PACKAGE, LOCALEDIR); | ||
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch new file mode 100644 index 0000000000..36d7be6fd0 --- /dev/null +++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch | |||
@@ -0,0 +1,102 @@ | |||
1 | # patch is from openembedded: | ||
2 | # commit 2db61370333f7a2fc1dbb86385734883387e0217 | ||
3 | # Author: Martin Jansa <Martin.Jansa@gmail.com> | ||
4 | # Date: Fri Apr 2 07:34:46 2010 +0200 | ||
5 | # | ||
6 | # shadow: fix do_install with automake-1.11 | ||
7 | # | ||
8 | # Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | # | ||
10 | # comment added by Kevin Tian <kevin.tian@intel.com> | ||
11 | |||
12 | man_nopan is for !USE_PAM already included in man_MANS and automake-1.11 hates to install some file twice | ||
13 | |||
14 | diff -uNr shadow-4.1.4.2.orig/man/Makefile.am shadow-4.1.4.2/man/Makefile.am | ||
15 | --- shadow-4.1.4.2.orig/man/Makefile.am 2009-03-14 15:40:10.000000000 +0100 | ||
16 | +++ shadow-4.1.4.2/man/Makefile.am 2010-04-02 07:31:17.000000000 +0200 | ||
17 | @@ -163,7 +163,6 @@ | ||
18 | $(man_MANS) \ | ||
19 | $(man_XMANS) \ | ||
20 | $(addprefix login.defs.d/,$(login_defs_v)) \ | ||
21 | - $(man_nopam) \ | ||
22 | id.1 \ | ||
23 | id.1.xml \ | ||
24 | sulogin.8 \ | ||
25 | diff -uNr shadow-4.1.4.2.orig/man/fr/Makefile.am shadow-4.1.4.2/man/fr/Makefile.am | ||
26 | --- shadow-4.1.4.2.orig/man/fr/Makefile.am 2008-09-06 18:44:45.000000000 +0200 | ||
27 | +++ shadow-4.1.4.2/man/fr/Makefile.am 2010-04-02 07:42:11.000000000 +0200 | ||
28 | @@ -52,7 +52,6 @@ | ||
29 | |||
30 | EXTRA_DIST = \ | ||
31 | $(man_MANS) \ | ||
32 | - $(man_nopam) \ | ||
33 | id.1 | ||
34 | |||
35 | include ../generate_translations.mak | ||
36 | diff -uNr shadow-4.1.4.2.orig/man/it/Makefile.am shadow-4.1.4.2/man/it/Makefile.am | ||
37 | --- shadow-4.1.4.2.orig/man/it/Makefile.am 2008-09-06 18:44:45.000000000 +0200 | ||
38 | +++ shadow-4.1.4.2/man/it/Makefile.am 2010-04-02 07:42:20.000000000 +0200 | ||
39 | @@ -46,7 +46,6 @@ | ||
40 | |||
41 | EXTRA_DIST = \ | ||
42 | $(man_MANS) \ | ||
43 | - $(man_nopam) \ | ||
44 | id.1 \ | ||
45 | logoutd.8 | ||
46 | |||
47 | diff -uNr shadow-4.1.4.2.orig/man/ja/Makefile.am shadow-4.1.4.2/man/ja/Makefile.am | ||
48 | --- shadow-4.1.4.2.orig/man/ja/Makefile.am 2007-12-31 17:48:28.000000000 +0100 | ||
49 | +++ shadow-4.1.4.2/man/ja/Makefile.am 2010-04-02 07:42:17.000000000 +0200 | ||
50 | @@ -49,7 +49,6 @@ | ||
51 | |||
52 | EXTRA_DIST = \ | ||
53 | $(man_MANS) \ | ||
54 | - $(man_nopam) \ | ||
55 | id.1 \ | ||
56 | shadow.3 \ | ||
57 | sulogin.8 | ||
58 | diff -uNr shadow-4.1.4.2.orig/man/pl/Makefile.am shadow-4.1.4.2/man/pl/Makefile.am | ||
59 | --- shadow-4.1.4.2.orig/man/pl/Makefile.am 2008-09-06 18:44:45.000000000 +0200 | ||
60 | +++ shadow-4.1.4.2/man/pl/Makefile.am 2010-04-02 07:42:07.000000000 +0200 | ||
61 | @@ -49,7 +49,6 @@ | ||
62 | |||
63 | EXTRA_DIST = \ | ||
64 | $(man_MANS) \ | ||
65 | - $(man_nopam) \ | ||
66 | getspnam.3 \ | ||
67 | id.1 \ | ||
68 | shadow.3 \ | ||
69 | diff -uNr shadow-4.1.4.2.orig/man/ru/Makefile.am shadow-4.1.4.2/man/ru/Makefile.am | ||
70 | --- shadow-4.1.4.2.orig/man/ru/Makefile.am 2010-04-02 07:39:00.000000000 +0200 | ||
71 | +++ shadow-4.1.4.2/man/ru/Makefile.am 2010-04-02 07:42:01.000000000 +0200 | ||
72 | @@ -54,7 +54,6 @@ | ||
73 | |||
74 | EXTRA_DIST = \ | ||
75 | $(man_MANS) \ | ||
76 | - $(man_nopam) \ | ||
77 | id.1 \ | ||
78 | sulogin.8 | ||
79 | |||
80 | diff -uNr shadow-4.1.4.2.orig/man/sv/Makefile.am shadow-4.1.4.2/man/sv/Makefile.am | ||
81 | --- shadow-4.1.4.2.orig/man/sv/Makefile.am 2008-09-06 18:44:45.000000000 +0200 | ||
82 | +++ shadow-4.1.4.2/man/sv/Makefile.am 2010-04-02 07:42:24.000000000 +0200 | ||
83 | @@ -53,8 +53,7 @@ | ||
84 | endif | ||
85 | |||
86 | EXTRA_DIST = \ | ||
87 | - $(man_MANS) \ | ||
88 | - $(man_nopam) | ||
89 | + $(man_MANS) | ||
90 | |||
91 | include ../generate_translations.mak | ||
92 | |||
93 | --- shadow-4.1.4.2.orig/man/ru/Makefile.am 2010-04-02 07:54:09.000000000 +0200 | ||
94 | +++ shadow-4.1.4.2/man/ru/Makefile.am 2010-04-02 07:51:57.000000000 +0200 | ||
95 | @@ -1,7 +1,6 @@ | ||
96 | mandir = @mandir@/ru | ||
97 | |||
98 | man_MANS = \ | ||
99 | - $(man_nopam) \ | ||
100 | chage.1 \ | ||
101 | chfn.1 \ | ||
102 | chgpasswd.8 \ | ||
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc new file mode 100644 index 0000000000..fcbcb3eb75 --- /dev/null +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -0,0 +1,121 @@ | |||
1 | DESCRIPTION = "Tools to change and administer password and group data." | ||
2 | HOMEPAGE = "http://pkg-shadow.alioth.debian.org/" | ||
3 | BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580" | ||
4 | SECTION = "base utils" | ||
5 | LICENSE = "BSD | Artistic" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ | ||
7 | file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe" | ||
8 | |||
9 | PAM_PLUGINS = " libpam-runtime \ | ||
10 | pam-plugin-faildelay \ | ||
11 | pam-plugin-securetty \ | ||
12 | pam-plugin-nologin \ | ||
13 | pam-plugin-env \ | ||
14 | pam-plugin-group \ | ||
15 | pam-plugin-limits \ | ||
16 | pam-plugin-lastlog \ | ||
17 | pam-plugin-motd \ | ||
18 | pam-plugin-mail \ | ||
19 | pam-plugin-shells \ | ||
20 | pam-plugin-rootok" | ||
21 | |||
22 | DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | ||
23 | RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" | ||
24 | |||
25 | # since we deduce from ${SERIAL_CONSOLE} | ||
26 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
27 | |||
28 | # Additional Policy files for PAM | ||
29 | PAM_SRC_URI = "file://pam.d/chfn \ | ||
30 | file://pam.d/chpasswd \ | ||
31 | file://pam.d/chsh \ | ||
32 | file://pam.d/login \ | ||
33 | file://pam.d/newusers \ | ||
34 | file://pam.d/passwd \ | ||
35 | file://pam.d/su" | ||
36 | |||
37 | SRC_URI = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2 \ | ||
38 | file://login_defs_pam.sed \ | ||
39 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | ||
40 | file://securetty" | ||
41 | |||
42 | inherit autotools gettext | ||
43 | |||
44 | EXTRA_OECONF += "--without-audit \ | ||
45 | --without-libcrack \ | ||
46 | ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)} \ | ||
47 | --without-selinux" | ||
48 | |||
49 | do_install_append() { | ||
50 | # Ensure that the image has as /var/spool/mail dir so shadow can put mailboxes there if the user | ||
51 | # reconfigures Shadow to default (see sed below). | ||
52 | install -d ${D}${localstatedir}/spool/mail | ||
53 | |||
54 | if [ -e ${WORKDIR}/pam.d ]; then | ||
55 | install -d ${D}${sysconfdir}/pam.d/ | ||
56 | install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ | ||
57 | # Remove defaults that are not used when supporting PAM | ||
58 | sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs | ||
59 | fi | ||
60 | |||
61 | # Enable CREATE_HOME by default. | ||
62 | sed -i 's/#CREATE_HOME/CREATE_HOME/g' ${D}${sysconfdir}/login.defs | ||
63 | |||
64 | # As we are on an embedded system ensure the users mailbox is in ~/ not | ||
65 | # /var/spool/mail by default as who knows where or how big /var is. | ||
66 | # The system MDA will set this later anyway. | ||
67 | sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs | ||
68 | sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs | ||
69 | |||
70 | # disable checking emails at all | ||
71 | sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs | ||
72 | |||
73 | # now we don't have a mail system. disable mail creation for now | ||
74 | sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd | ||
75 | sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd | ||
76 | |||
77 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} | ||
78 | for i in passwd chfn newgrp chsh ; do | ||
79 | mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN} | ||
80 | done | ||
81 | |||
82 | mv ${D}${sbindir}/chpasswd ${D}${sbindir}/chpasswd.${PN} | ||
83 | mv ${D}${sbindir}/vigr ${D}${base_sbindir}/vigr.${PN} | ||
84 | mv ${D}${sbindir}/vipw ${D}${base_sbindir}/vipw.${PN} | ||
85 | mv ${D}${bindir}/login ${D}${base_bindir}/login.${PN} | ||
86 | |||
87 | # Ensure we add a suitable securetty file to the package that has most common embedded TTYs defined. | ||
88 | if [ ! -z "${SERIAL_CONSOLE}" ]; then | ||
89 | # our SERIAL_CONSOLE contains baud rate too and sometime -L option as well. | ||
90 | # the following pearl :) takes that and converts it into newline sepated tty's and appends | ||
91 | # them into securetty. So if a machine has a weird looking console device node (e.g. ttyAMA0) that securetty | ||
92 | # does not know then it will get appended to securetty and root login will be allowed on | ||
93 | # that console. | ||
94 | echo "${SERIAL_CONSOLE}" | sed -e 's/[0-9][0-9]\|\-L//g'|tr "[ ]" "[\n]" >> ${WORKDIR}/securetty | ||
95 | fi | ||
96 | install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty | ||
97 | } | ||
98 | |||
99 | pkg_postinst_${PN} () { | ||
100 | update-alternatives --install ${bindir}/passwd passwd passwd.${PN} 200 | ||
101 | update-alternatives --install ${sbindir}/chpasswd chpasswd chpasswd.${PN} 200 | ||
102 | update-alternatives --install ${bindir}/chfn chfn chfn.${PN} 200 | ||
103 | update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 200 | ||
104 | update-alternatives --install ${bindir}/chsh chsh chsh.${PN} 200 | ||
105 | update-alternatives --install ${base_bindir}/login login login.${PN} 200 | ||
106 | update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 200 | ||
107 | update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200 | ||
108 | |||
109 | if [ "x$D" != "x" ]; then | ||
110 | exit 1 | ||
111 | fi | ||
112 | |||
113 | pwconv | ||
114 | grpconv | ||
115 | } | ||
116 | |||
117 | pkg_prerm_${PN} () { | ||
118 | for i in passwd chpasswd chfn newgrp chsh login vipw vigr ; do | ||
119 | update-alternatives --remove $i $i.${PN} | ||
120 | done | ||
121 | } | ||
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.2.bb b/meta/recipes-extended/shadow/shadow_4.1.4.2.bb new file mode 100644 index 0000000000..bc00c099bf --- /dev/null +++ b/meta/recipes-extended/shadow/shadow_4.1.4.2.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | require shadow.inc | ||
2 | |||
3 | PR = "r0" | ||
4 | |||
5 | SRC_URI += "file://shadow.automake-1.11.patch \ | ||
6 | file://shadow-4.1.3-dots-in-usernames.patch \ | ||
7 | file://shadow-4.1.4.2-env-reset-keep-locale.patch \ | ||
8 | file://shadow-4.1.4.2-groupmod-pam-check.patch \ | ||
9 | file://shadow-4.1.4.2-su_no_sanitize_env.patch" | ||
10 | |||
11 | EXTRA_OECONF_libc-uclibc += " --with-nscd=no " | ||
diff --git a/meta/recipes-extended/sysstat/files/99_sysstat b/meta/recipes-extended/sysstat/files/99_sysstat new file mode 100644 index 0000000000..0b0ec30de0 --- /dev/null +++ b/meta/recipes-extended/sysstat/files/99_sysstat | |||
@@ -0,0 +1 @@ | |||
d root root 0755 /var/log/sa none | |||
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc new file mode 100644 index 0000000000..564bc7da07 --- /dev/null +++ b/meta/recipes-extended/sysstat/sysstat.inc | |||
@@ -0,0 +1,33 @@ | |||
1 | DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." | ||
2 | HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/" | ||
3 | LICENSE = "GPLv2+" | ||
4 | SECTION = "console/utils" | ||
5 | |||
6 | DEPENDS = "virtual/libintl" | ||
7 | |||
8 | SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \ | ||
9 | file://99_sysstat" | ||
10 | |||
11 | inherit autotools | ||
12 | |||
13 | do_install() { | ||
14 | autotools_do_install | ||
15 | |||
16 | # don't install /var/log/sa when populating rootfs. Do it through volatile | ||
17 | |||
18 | rm -rf ${D}/var | ||
19 | install -d ${D}/etc/default/volatiles | ||
20 | install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles | ||
21 | } | ||
22 | |||
23 | pkg_postinst_${PN} () { | ||
24 | /etc/init.d/populate-volatile.sh update | ||
25 | } | ||
26 | |||
27 | |||
28 | FILES_${PN} += "${libdir}/sa" | ||
29 | |||
30 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
31 | LDFLAGS_append_linux-uclibc = " -lintl" | ||
32 | LDFLAGS_append_linux-uclibceabi = " -lintl" | ||
33 | LDFLAGS_append_linux-uclibcspe = " -lintl" | ||
diff --git a/meta/recipes-extended/sysstat/sysstat_9.1.4.bb b/meta/recipes-extended/sysstat/sysstat_9.1.4.bb new file mode 100644 index 0000000000..d7b7e667d6 --- /dev/null +++ b/meta/recipes-extended/sysstat/sysstat_9.1.4.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require sysstat.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" | ||
4 | |||
5 | PR = "r0" | ||
6 | |||
7 | |||
diff --git a/meta/recipes-extended/tar/tar-1.17/gcc43build.patch b/meta/recipes-extended/tar/tar-1.17/gcc43build.patch new file mode 100644 index 0000000000..cc5f0e13d0 --- /dev/null +++ b/meta/recipes-extended/tar/tar-1.17/gcc43build.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | # Fix errors when built with gcc 4.3 | ||
2 | # Patch taken from Debian bug #452096 | ||
3 | |||
4 | diff -urN tar-1.17.orig/lib/argp-fmtstream.h tar-1.17/lib/argp-fmtstream.h | ||
5 | --- tar-1.17.orig/lib/argp-fmtstream.h 2006-01-11 12:24:05.000000000 -0800 | ||
6 | +++ tar-1.17/lib/argp-fmtstream.h 2010-07-22 22:36:12.000000000 -0700 | ||
7 | @@ -198,7 +198,11 @@ | ||
8 | #endif | ||
9 | |||
10 | #ifndef ARGP_FS_EI | ||
11 | -#define ARGP_FS_EI extern inline | ||
12 | + #if defined __GNUC_STDC_INLINE__ | ||
13 | + #define ARGP_FS_EI extern inline __attribute__((__gnu_inline__)) | ||
14 | + #else | ||
15 | + #define ARGP_FS_EI extern inline | ||
16 | + #endif | ||
17 | #endif | ||
18 | |||
19 | ARGP_FS_EI size_t | ||
20 | diff -urN tar-1.17.orig/lib/argp.h tar-1.17/lib/argp.h | ||
21 | --- tar-1.17.orig/lib/argp.h 2007-03-30 00:09:11.000000000 -0700 | ||
22 | +++ tar-1.17/lib/argp.h 2010-07-22 22:38:44.000000000 -0700 | ||
23 | @@ -580,7 +580,11 @@ | ||
24 | # endif | ||
25 | |||
26 | # ifndef ARGP_EI | ||
27 | -# define ARGP_EI extern __inline__ | ||
28 | +# if defined __GNUC_STDC_INLINE__ | ||
29 | +# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__)) | ||
30 | +# else | ||
31 | +# define ARGP_EI extern __inline__ | ||
32 | +# endif | ||
33 | # endif | ||
34 | |||
35 | ARGP_EI void | ||
diff --git a/meta/recipes-extended/tar/tar-1.17/m4extensions.patch b/meta/recipes-extended/tar/tar-1.17/m4extensions.patch new file mode 100644 index 0000000000..11b981aa92 --- /dev/null +++ b/meta/recipes-extended/tar/tar-1.17/m4extensions.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | # Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined. | ||
2 | # This is needed to configure correctly with newer versions of autoconf. | ||
3 | |||
4 | --- tar-1.17/m4/extensions.m4.orig 2010-07-22 22:21:35.000000000 -0700 | ||
5 | +++ tar-1.17/m4/extensions.m4 2010-07-22 22:23:41.000000000 -0700 | ||
6 | @@ -1,4 +1,4 @@ | ||
7 | -# serial 4 -*- Autoconf -*- | ||
8 | +# serial 5 -*- Autoconf -*- | ||
9 | # Enable extensions on systems that normally disable them. | ||
10 | |||
11 | # Copyright (C) 2003, 2006 Free Software Foundation, Inc. | ||
12 | @@ -16,6 +16,7 @@ | ||
13 | # ------------------------ | ||
14 | # Enable extensions on systems that normally disable them, | ||
15 | # typically due to standards-conformance issues. | ||
16 | +m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [ | ||
17 | AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
18 | [ | ||
19 | AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
20 | @@ -48,7 +49,7 @@ | ||
21 | AC_DEFINE([__EXTENSIONS__]) | ||
22 | AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
23 | AC_DEFINE([_TANDEM_SOURCE]) | ||
24 | -]) | ||
25 | +])]) | ||
26 | |||
27 | # gl_USE_SYSTEM_EXTENSIONS | ||
28 | # ------------------------ | ||
diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc new file mode 100644 index 0000000000..cf72d4893b --- /dev/null +++ b/meta/recipes-extended/tar/tar.inc | |||
@@ -0,0 +1,25 @@ | |||
1 | DESCRIPTION = "GNU tar saves many files together into a single tape \ | ||
2 | or disk archive, and can restore individual files from the archive." | ||
3 | HOMEPAGE = "http://www.gnu.org/software/tar/" | ||
4 | SECTION = "base" | ||
5 | |||
6 | SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" | ||
7 | |||
8 | inherit autotools gettext | ||
9 | |||
10 | do_install () { | ||
11 | autotools_do_install | ||
12 | install -d ${D}${base_bindir} | ||
13 | mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN} | ||
14 | mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN} | ||
15 | } | ||
16 | |||
17 | pkg_postinst_${PN} () { | ||
18 | update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100 | ||
19 | update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100 | ||
20 | } | ||
21 | |||
22 | pkg_prerm_${PN} () { | ||
23 | update-alternatives --remove tar tar.${PN} | ||
24 | update-alternatives --remove rmt rmt.${PN} | ||
25 | } | ||
diff --git a/meta/recipes-extended/tar/tar_1.17.bb b/meta/recipes-extended/tar/tar_1.17.bb new file mode 100644 index 0000000000..be74542091 --- /dev/null +++ b/meta/recipes-extended/tar/tar_1.17.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require tar.inc | ||
2 | |||
3 | LICENSE = "GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
5 | |||
6 | PR = "r0" | ||
7 | |||
8 | SRC_URI += "file://m4extensions.patch \ | ||
9 | file://gcc43build.patch \ | ||
10 | " | ||
11 | |||
12 | SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290" | ||
13 | SRC_URI[sha256sum] = "19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492" | ||
diff --git a/meta/recipes-extended/tar/tar_1.23.bb b/meta/recipes-extended/tar/tar_1.23.bb new file mode 100644 index 0000000000..093c0b43ce --- /dev/null +++ b/meta/recipes-extended/tar/tar_1.23.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require tar.inc | ||
2 | |||
3 | LICENSE = "GPLv3" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" | ||
5 | |||
6 | PR = "r0" | ||
7 | |||
8 | SRC_URI[md5sum] = "41e2ca4b924ec7860e51b43ad06cdb7e" | ||
9 | SRC_URI[sha256sum] = "c9328372db62fbb1d94c9e4e3cefc961111af46de47085b635359c00a0eebe36" | ||
diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-poky-basic.bb new file mode 100644 index 0000000000..bbd4205ce9 --- /dev/null +++ b/meta/recipes-extended/tasks/task-poky-basic.bb | |||
@@ -0,0 +1,156 @@ | |||
1 | # | ||
2 | # Copyright (C) 2010 Intel Corporation | ||
3 | # | ||
4 | |||
5 | DESCRIPTION = "Create Basic Image Tasks" | ||
6 | PR = "r1" | ||
7 | |||
8 | PACKAGES = "\ | ||
9 | task-poky-basic \ | ||
10 | task-poky-base-utils \ | ||
11 | task-poky-base-utils-dbg \ | ||
12 | task-poky-base-utils-dev \ | ||
13 | task-poky-basic-libs \ | ||
14 | task-poky-basic-libs-dbg \ | ||
15 | task-poky-basic-libs-dev \ | ||
16 | task-poky-basic-utils \ | ||
17 | task-poky-basic-utils-dbg \ | ||
18 | task-poky-basic-utils-dev \ | ||
19 | task-poky-basic-extended \ | ||
20 | task-poky-basic-extended-dbg \ | ||
21 | task-poky-basic-extended-dev \ | ||
22 | task-poky-dev-utils \ | ||
23 | task-poky-dev-utils-dbg \ | ||
24 | task-poky-dev-utils-dev \ | ||
25 | task-poky-multiuser \ | ||
26 | task-poky-multiuser-dbg \ | ||
27 | task-poky-multiuser-dev \ | ||
28 | task-poky-initscripts \ | ||
29 | task-poky-initscripts-dbg \ | ||
30 | task-poky-initscripts-dev \ | ||
31 | task-poky-rpm \ | ||
32 | task-poky-rpm-dbg \ | ||
33 | task-poky-rpm-dev \ | ||
34 | task-poky-sys-services \ | ||
35 | task-poky-sys-services-dbg \ | ||
36 | task-poky-sys-services-dev \ | ||
37 | " | ||
38 | |||
39 | ALLOW_EMPTY = "1" | ||
40 | |||
41 | RDEPENDS_task-poky-basic = "\ | ||
42 | task-poky-base-utils \ | ||
43 | task-poky-basic-libs \ | ||
44 | task-poky-basic-utils \ | ||
45 | task-poky-basic-extended \ | ||
46 | task-poky-dev-utils \ | ||
47 | task-poky-multiuser \ | ||
48 | task-poky-initscripts \ | ||
49 | task-poky-rpm \ | ||
50 | task-poky-sys-services \ | ||
51 | " | ||
52 | |||
53 | RDEPENDS_task-poky-base-utils = "\ | ||
54 | busybox \ | ||
55 | dropbear \ | ||
56 | " | ||
57 | |||
58 | RDEPENDS_task-poky-basic-libs = "\ | ||
59 | glib-2.0 \ | ||
60 | " | ||
61 | |||
62 | RDEPENDS_task-poky-basic-utils = "\ | ||
63 | bash \ | ||
64 | acl \ | ||
65 | attr \ | ||
66 | bc \ | ||
67 | coreutils \ | ||
68 | cpio \ | ||
69 | e2fsprogs \ | ||
70 | ed \ | ||
71 | file \ | ||
72 | findutils \ | ||
73 | gawk \ | ||
74 | gmp \ | ||
75 | grep \ | ||
76 | makedevs \ | ||
77 | mktemp \ | ||
78 | ncurses \ | ||
79 | net-tools \ | ||
80 | pax \ | ||
81 | popt \ | ||
82 | procps \ | ||
83 | psmisc \ | ||
84 | sed \ | ||
85 | tar \ | ||
86 | time \ | ||
87 | udev \ | ||
88 | util-linux \ | ||
89 | zlib \ | ||
90 | " | ||
91 | |||
92 | RDEPENDS_task-poky-basic-extended = "\ | ||
93 | iproute2 \ | ||
94 | iputils \ | ||
95 | iptables \ | ||
96 | module-init-tools \ | ||
97 | # openssh \ | ||
98 | openssl \ | ||
99 | " | ||
100 | |||
101 | RDEPENDS_task-poky-dev-utils = "\ | ||
102 | byacc \ | ||
103 | diffutils \ | ||
104 | m4 \ | ||
105 | make \ | ||
106 | patch \ | ||
107 | binutils \ | ||
108 | " | ||
109 | |||
110 | RDEPENDS_task-poky-initscripts = "\ | ||
111 | initscripts \ | ||
112 | sysvinit \ | ||
113 | ethtool \ | ||
114 | # mingetty \ | ||
115 | # sysklogd \ | ||
116 | " | ||
117 | |||
118 | RDEPENDS_task-poky-multiuser = "\ | ||
119 | cracklib \ | ||
120 | gzip \ | ||
121 | libuser \ | ||
122 | libpam \ | ||
123 | shadow \ | ||
124 | sudo \ | ||
125 | " | ||
126 | |||
127 | RDEPENDS_task-poky-rpm = "\ | ||
128 | beecrypt \ | ||
129 | rpm \ | ||
130 | " | ||
131 | |||
132 | RDEPENDS_task-poky-sys-services = "\ | ||
133 | # at \ | ||
134 | bzip2 \ | ||
135 | # cronie \ | ||
136 | # crontabs \ | ||
137 | dbus \ | ||
138 | dbus-glib \ | ||
139 | python-dbus \ | ||
140 | elfutils \ | ||
141 | gzip \ | ||
142 | hal \ | ||
143 | less \ | ||
144 | libcap \ | ||
145 | libevent \ | ||
146 | # logrotate \ | ||
147 | nfs-utils \ | ||
148 | pciutils \ | ||
149 | libpcre \ | ||
150 | portmap \ | ||
151 | # rpcbind \ | ||
152 | sysfsutils \ | ||
153 | tcp-wrappers \ | ||
154 | tzdata \ | ||
155 | " | ||
156 | |||
diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-poky-lsb.bb new file mode 100644 index 0000000000..4718f3b760 --- /dev/null +++ b/meta/recipes-extended/tasks/task-poky-lsb.bb | |||
@@ -0,0 +1,103 @@ | |||
1 | # | ||
2 | # Copyright (C) 2010 Intel Corporation | ||
3 | # | ||
4 | |||
5 | DESCRIPTION = "Create Small Image Tasks" | ||
6 | PR = "r1" | ||
7 | |||
8 | PACKAGES = "\ | ||
9 | task-poky-lsb \ | ||
10 | task-poky-sys-extended \ | ||
11 | task-poky-sys-extended-dbg \ | ||
12 | task-poky-sys-extended-dev \ | ||
13 | task-poky-db \ | ||
14 | task-poky-db-dbg \ | ||
15 | task-poky-db-dev \ | ||
16 | task-poky-misc \ | ||
17 | task-poky-misc-dbg \ | ||
18 | task-poky-misc-dev \ | ||
19 | task-poky-perl \ | ||
20 | task-poky-perl-dbg \ | ||
21 | task-poky-perl-dev \ | ||
22 | task-poky-python \ | ||
23 | task-poky-python-dbg \ | ||
24 | task-poky-python-dev \ | ||
25 | task-poky-tcl \ | ||
26 | task-poky-tcl-dbg \ | ||
27 | task-poky-tcl-dev \ | ||
28 | " | ||
29 | |||
30 | ALLOW_EMPTY = "1" | ||
31 | |||
32 | RDEPENDS_task-poky-lsb = "\ | ||
33 | task-poky-sys-extended \ | ||
34 | task-poky-db \ | ||
35 | task-poky-misc \ | ||
36 | task-poky-perl \ | ||
37 | task-poky-python \ | ||
38 | task-poky-tcl \ | ||
39 | " | ||
40 | |||
41 | # | ||
42 | # GPLv2 Should List | ||
43 | RDEPENDS_task-poky-sys-extended = "\ | ||
44 | curl \ | ||
45 | diffutils \ | ||
46 | gamin \ | ||
47 | hdparm \ | ||
48 | # libaio \ | ||
49 | libxml2 \ | ||
50 | lrzsz \ | ||
51 | lzo \ | ||
52 | # mdadm \ | ||
53 | minicom \ | ||
54 | neon \ | ||
55 | parted \ | ||
56 | pth \ | ||
57 | quota \ | ||
58 | # screen \ | ||
59 | setserial \ | ||
60 | sysstat \ | ||
61 | unzip \ | ||
62 | # watchdog \ | ||
63 | which \ | ||
64 | zip \ | ||
65 | " | ||
66 | |||
67 | RDEPENDS_task-poky-db = "\ | ||
68 | db \ | ||
69 | sqlite3 \ | ||
70 | " | ||
71 | |||
72 | RDEPENDS_task-poky-perl = "\ | ||
73 | gdbm \ | ||
74 | perl \ | ||
75 | zlib \ | ||
76 | " | ||
77 | |||
78 | |||
79 | RDEPENDS_task-poky-python = "\ | ||
80 | expat \ | ||
81 | gdbm \ | ||
82 | gmp \ | ||
83 | ncurses \ | ||
84 | openssl \ | ||
85 | python \ | ||
86 | readline \ | ||
87 | zip \ | ||
88 | " | ||
89 | |||
90 | RDEPENDS_task-poky-tcl = "\ | ||
91 | tcl \ | ||
92 | " | ||
93 | |||
94 | RDEPENDS_task-poky-misc = "\ | ||
95 | elfutils \ | ||
96 | gettext \ | ||
97 | lsof \ | ||
98 | ncurses \ | ||
99 | strace \ | ||
100 | libusb1 \ | ||
101 | usbutils \ | ||
102 | zlib \ | ||
103 | " | ||
diff --git a/meta/recipes-extended/time/files/debian.patch b/meta/recipes-extended/time/files/debian.patch new file mode 100644 index 0000000000..40df19da45 --- /dev/null +++ b/meta/recipes-extended/time/files/debian.patch | |||
@@ -0,0 +1,1299 @@ | |||
1 | --- time-1.7.orig/configure.in | ||
2 | +++ time-1.7/configure.in | ||
3 | @@ -1,11 +1,8 @@ | ||
4 | dnl Process this file with autoconf to produce a configure script. | ||
5 | AC_INIT(time.c) | ||
6 | -VERSION=1.7 | ||
7 | -AC_SUBST(VERSION) | ||
8 | -PACKAGE=time | ||
9 | -AC_SUBST(PACKAGE) | ||
10 | +AM_INIT_AUTOMAKE(time, 1.7) | ||
11 | |||
12 | -AC_ARG_PROGRAM | ||
13 | +AM_MAINTAINER_MODE | ||
14 | |||
15 | dnl Checks for programs. | ||
16 | AC_PROG_CC | ||
17 | @@ -15,7 +12,7 @@ | ||
18 | dnl Checks for header files. | ||
19 | AC_HEADER_STDC | ||
20 | AC_HEADER_SYS_WAIT | ||
21 | -AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h) | ||
22 | +AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h sys/resource.h) | ||
23 | |||
24 | dnl Checks for typedefs, structures, and compiler characteristics. | ||
25 | AC_C_CONST | ||
26 | --- time-1.7.orig/version.texi | ||
27 | +++ time-1.7/version.texi | ||
28 | @@ -1,3 +1,3 @@ | ||
29 | -@set UPDATED 12 June 1996 | ||
30 | +@set UPDATED 9 May 2002 | ||
31 | @set EDITION 1.7 | ||
32 | @set VERSION 1.7 | ||
33 | --- time-1.7.orig/time.c | ||
34 | +++ time-1.7/time.c | ||
35 | @@ -147,6 +147,10 @@ | ||
36 | NULL | ||
37 | }; | ||
38 | |||
39 | + | ||
40 | +/* If true, do not show the exit message */ | ||
41 | +static boolean quiet; | ||
42 | + | ||
43 | /* If true, show an English description next to each statistic. */ | ||
44 | static boolean verbose; | ||
45 | |||
46 | @@ -172,6 +176,7 @@ | ||
47 | {"help", no_argument, NULL, 'h'}, | ||
48 | {"output-file", required_argument, NULL, 'o'}, | ||
49 | {"portability", no_argument, NULL, 'p'}, | ||
50 | + {"quiet", no_argument,NULL, 'q'}, | ||
51 | {"verbose", no_argument, NULL, 'v'}, | ||
52 | {"version", no_argument, NULL, 'V'}, | ||
53 | {NULL, no_argument, NULL, 0} | ||
54 | @@ -333,7 +338,8 @@ | ||
55 | else if (WIFSIGNALED (resp->waitstatus)) | ||
56 | fprintf (fp, "Command terminated by signal %d\n", | ||
57 | WTERMSIG (resp->waitstatus)); | ||
58 | - else if (WIFEXITED (resp->waitstatus) && WEXITSTATUS (resp->waitstatus)) | ||
59 | + else if (WIFEXITED (resp->waitstatus) && WEXITSTATUS (resp->waitstatus) | ||
60 | + && !quiet) | ||
61 | fprintf (fp, "Command exited with non-zero status %d\n", | ||
62 | WEXITSTATUS (resp->waitstatus)); | ||
63 | |||
64 | @@ -523,6 +529,7 @@ | ||
65 | char *format; /* Format found in environment. */ | ||
66 | |||
67 | /* Initialize the option flags. */ | ||
68 | + quiet = false; | ||
69 | verbose = false; | ||
70 | outfile = NULL; | ||
71 | outfp = stderr; | ||
72 | @@ -536,7 +543,7 @@ | ||
73 | if (format) | ||
74 | output_format = format; | ||
75 | |||
76 | - while ((optc = getopt_long (argc, argv, "+af:o:pvV", longopts, (int *) 0)) | ||
77 | + while ((optc = getopt_long (argc, argv, "+af:o:pqvV", longopts, (int *) 0)) | ||
78 | != EOF) | ||
79 | { | ||
80 | switch (optc) | ||
81 | @@ -555,6 +562,9 @@ | ||
82 | case 'p': | ||
83 | output_format = posix_format; | ||
84 | break; | ||
85 | + case 'q': | ||
86 | + quiet = true; | ||
87 | + break; | ||
88 | case 'v': | ||
89 | verbose = true; | ||
90 | break; | ||
91 | @@ -642,9 +652,9 @@ | ||
92 | fflush (outfp); | ||
93 | |||
94 | if (WIFSTOPPED (res.waitstatus)) | ||
95 | - exit (WSTOPSIG (res.waitstatus)); | ||
96 | + exit (WSTOPSIG (res.waitstatus) + 128); | ||
97 | else if (WIFSIGNALED (res.waitstatus)) | ||
98 | - exit (WTERMSIG (res.waitstatus)); | ||
99 | + exit (WTERMSIG (res.waitstatus) + 128); | ||
100 | else if (WIFEXITED (res.waitstatus)) | ||
101 | exit (WEXITSTATUS (res.waitstatus)); | ||
102 | } | ||
103 | @@ -657,7 +667,7 @@ | ||
104 | fprintf (stream, "\ | ||
105 | Usage: %s [-apvV] [-f format] [-o file] [--append] [--verbose]\n\ | ||
106 | [--portability] [--format=format] [--output=file] [--version]\n\ | ||
107 | - [--help] command [arg...]\n", | ||
108 | + [--quiet] [--help] command [arg...]\n", | ||
109 | program_name); | ||
110 | exit (status); | ||
111 | } | ||
112 | --- time-1.7.orig/resuse.h | ||
113 | +++ time-1.7/resuse.h | ||
114 | @@ -36,19 +36,8 @@ | ||
115 | # include <sys/rusage.h> | ||
116 | #else | ||
117 | # define TV_MSEC tv_usec / 1000 | ||
118 | -# if HAVE_WAIT3 | ||
119 | +# if HAVE_SYS_RESOURCE_H | ||
120 | # include <sys/resource.h> | ||
121 | -# else | ||
122 | -/* Process resource usage structure. */ | ||
123 | -struct rusage | ||
124 | -{ | ||
125 | - struct timeval ru_utime; /* User time used. */ | ||
126 | - struct timeval ru_stime; /* System time used. */ | ||
127 | - int ru_maxrss, ru_ixrss, ru_idrss, ru_isrss, | ||
128 | - ru_minflt, ru_majflt, ru_nswap, ru_inblock, | ||
129 | - ru_oublock, ru_msgsnd, ru_msgrcv, ru_nsignals, | ||
130 | - ru_nvcsw, ru_nivcsw; | ||
131 | -}; | ||
132 | # endif | ||
133 | #endif | ||
134 | |||
135 | --- time-1.7.orig/time.texi | ||
136 | +++ time-1.7/time.texi | ||
137 | @@ -11,6 +11,12 @@ | ||
138 | @finalout | ||
139 | @end iftex | ||
140 | |||
141 | +@dircategory Individual utilities | ||
142 | +@direntry | ||
143 | +* time: (time). Run programs and summarize | ||
144 | + system resource usage. | ||
145 | +@end direntry | ||
146 | + | ||
147 | @ifinfo | ||
148 | This file documents the the GNU @code{time} command for running programs | ||
149 | and summarizing the system resources they use. | ||
150 | @@ -185,6 +191,10 @@ | ||
151 | sys %S | ||
152 | @end example | ||
153 | |||
154 | +@item -q | ||
155 | +@itemx --quiet | ||
156 | +Suppress non-zero error code from the executed program. | ||
157 | + | ||
158 | @item -v | ||
159 | @itemx --verbose | ||
160 | @cindex format | ||
161 | --- time-1.7.orig/time.info | ||
162 | +++ time-1.7/time.info | ||
163 | @@ -1,5 +1,10 @@ | ||
164 | -This is Info file ./time.info, produced by Makeinfo-1.55 from the input | ||
165 | -file time.texi. | ||
166 | +This is time.info, produced by makeinfo version 4.1 from time.texi. | ||
167 | + | ||
168 | +INFO-DIR-SECTION Individual utilities | ||
169 | +START-INFO-DIR-ENTRY | ||
170 | +* time: (time). Run programs and summarize | ||
171 | + system resource usage. | ||
172 | +END-INFO-DIR-ENTRY | ||
173 | |||
174 | This file documents the the GNU `time' command for running programs | ||
175 | and summarizing the system resources they use. | ||
176 | @@ -31,7 +36,7 @@ | ||
177 | |||
178 | * Resource Measurement:: Measuring program resource use. | ||
179 | |||
180 | - -- The Detailed Node Listing -- | ||
181 | + --- The Detailed Node Listing --- | ||
182 | |||
183 | Measuring Program Resource Use | ||
184 | |||
185 | @@ -58,14 +63,14 @@ | ||
186 | The `time' command runs another program, then displays information | ||
187 | about the resources used by that program, collected by the system while | ||
188 | the program was running. You can select which information is reported | ||
189 | -and the format in which it is shown (*note Setting Format::.), or have | ||
190 | +and the format in which it is shown (*note Setting Format::), or have | ||
191 | `time' save the information in a file instead of displaying it on the | ||
192 | -screen (*note Redirecting::.). | ||
193 | +screen (*note Redirecting::). | ||
194 | |||
195 | The resources that `time' can report on fall into the general | ||
196 | categories of time, memory, and I/O and IPC calls. Some systems do not | ||
197 | provide much information about program resource use; `time' reports | ||
198 | -unavailable information as zero values (*note Accuracy::.). | ||
199 | +unavailable information as zero values (*note Accuracy::). | ||
200 | |||
201 | The format of the `time' command is: | ||
202 | |||
203 | @@ -132,6 +137,10 @@ | ||
204 | user %U | ||
205 | sys %S | ||
206 | |||
207 | +`-q' | ||
208 | +`--quiet' | ||
209 | + Suppress non-zero error code from the executed program. | ||
210 | + | ||
211 | `-v' | ||
212 | `--verbose' | ||
213 | Use the built-in verbose format, which displays each available | ||
214 | @@ -174,7 +183,7 @@ | ||
215 | The resource specifiers, which are a superset of those recognized by | ||
216 | the `tcsh' builtin `time' command, are listed below. Not all resources | ||
217 | are measured by all versions of Unix, so some of the values might be | ||
218 | -reported as zero (*note Accuracy::.). | ||
219 | +reported as zero (*note Accuracy::). | ||
220 | |||
221 | * Menu: | ||
222 | |||
223 | @@ -308,11 +317,11 @@ | ||
224 | `-o FILE' | ||
225 | `--output=FILE' | ||
226 | Write the resource use statistics to FILE. By default, this | ||
227 | - *overwrites* the file, destroying the file's previous contents. | ||
228 | + _overwrites_ the file, destroying the file's previous contents. | ||
229 | |||
230 | `-a' | ||
231 | `--append' | ||
232 | - *Append* the resource use information to the output file instead | ||
233 | + _Append_ the resource use information to the output file instead | ||
234 | of overwriting it. This option is only useful with the `-o' or | ||
235 | `--output' option. | ||
236 | |||
237 | @@ -437,7 +446,7 @@ | ||
238 | |||
239 | `-a' | ||
240 | `--append' | ||
241 | - *Append* the resource use information to the output file instead | ||
242 | + _Append_ the resource use information to the output file instead | ||
243 | of overwriting it. | ||
244 | |||
245 | `-f FORMAT' | ||
246 | @@ -462,17 +471,17 @@ | ||
247 | |||
248 | |||
249 | Tag Table: | ||
250 | -Node: Top934 | ||
251 | -Node: Resource Measurement1725 | ||
252 | -Node: Setting Format3678 | ||
253 | -Node: Format String4907 | ||
254 | -Node: Time Resources6214 | ||
255 | -Node: Memory Resources6844 | ||
256 | -Node: I/O Resources7549 | ||
257 | -Node: Command Info8747 | ||
258 | -Node: Redirecting8964 | ||
259 | -Node: Examples9754 | ||
260 | -Node: Accuracy12064 | ||
261 | -Node: Invoking time13586 | ||
262 | +Node: Top1115 | ||
263 | +Node: Resource Measurement1908 | ||
264 | +Node: Setting Format3858 | ||
265 | +Node: Format String5164 | ||
266 | +Node: Time Resources6470 | ||
267 | +Node: Memory Resources7100 | ||
268 | +Node: I/O Resources7805 | ||
269 | +Node: Command Info9003 | ||
270 | +Node: Redirecting9220 | ||
271 | +Node: Examples10010 | ||
272 | +Node: Accuracy12320 | ||
273 | +Node: Invoking time13842 | ||
274 | |||
275 | End Tag Table | ||
276 | --- time-1.7.orig/time.html | ||
277 | +++ time-1.7/time.html | ||
278 | @@ -0,0 +1,1021 @@ | ||
279 | +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" | ||
280 | + "http://www.w3.org/TR/html40/loose.dtd"> | ||
281 | +<HTML> | ||
282 | +<!-- Created on September, 1 2003 by texi2html 1.66 --> | ||
283 | +<!-- | ||
284 | +Written by: Lionel Cons <Lionel.Cons@cern.ch> (original author) | ||
285 | + Karl Berry <karl@freefriends.org> | ||
286 | + Olaf Bachmann <obachman@mathematik.uni-kl.de> | ||
287 | + and many others. | ||
288 | +Maintained by: Many creative people <dev@texi2html.cvshome.org> | ||
289 | +Send bugs and suggestions to <users@texi2html.cvshome.org> | ||
290 | + | ||
291 | +--> | ||
292 | +<HEAD> | ||
293 | +<TITLE>Measuring Program Resource Use</TITLE> | ||
294 | + | ||
295 | +<META NAME="description" CONTENT="Measuring Program Resource Use"> | ||
296 | +<META NAME="keywords" CONTENT="Measuring Program Resource Use"> | ||
297 | +<META NAME="resource-type" CONTENT="document"> | ||
298 | +<META NAME="distribution" CONTENT="global"> | ||
299 | +<META NAME="Generator" CONTENT="texi2html 1.66"> | ||
300 | + | ||
301 | +</HEAD> | ||
302 | + | ||
303 | +<BODY LANG="en" BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000FF" VLINK="#800080" ALINK="#FF0000"> | ||
304 | + | ||
305 | +<A NAME="SEC_Top"></A> | ||
306 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
307 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
308 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
309 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
310 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
311 | +</TR></TABLE> | ||
312 | +<H1>Measuring Program Resource Use</H1> | ||
313 | + | ||
314 | +<P> | ||
315 | + | ||
316 | +This file documents the the GNU <CODE>time</CODE> command for running programs | ||
317 | +and summarizing the system resources they use. | ||
318 | +This is edition 1.7, for version 1.7. | ||
319 | +</P> | ||
320 | +<P> | ||
321 | + | ||
322 | +</P> | ||
323 | +<TABLE BORDER="0" CELLSPACING="0"> | ||
324 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC1">1. Measuring Program Resource Use</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Measuring program resource use.</TD></TR> | ||
325 | +<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> | ||
326 | +</TH></TR> | ||
327 | +<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> -- The Detailed Node Listing --- | ||
328 | +</TH></TR> | ||
329 | +<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> | ||
330 | +</TH></TR> | ||
331 | +<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP">Measuring Program Resource Use | ||
332 | +</TH></TR> | ||
333 | +<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> | ||
334 | +</TH></TR> | ||
335 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC2">1.1 Setting the Output Format</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Selecting the information reported by <CODE>time</CODE>.</TD></TR> | ||
336 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC3">1.2 The Format String</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">The information <CODE>time</CODE> can report.</TD></TR> | ||
337 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC8">1.3 Redirecting Output</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Writing the information to a file.</TD></TR> | ||
338 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC9">1.4 Examples</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Examples of using <CODE>time</CODE>.</TD></TR> | ||
339 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC10">1.5 Accuracy</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Limitations on the accuracy of <CODE>time</CODE> output.</TD></TR> | ||
340 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC11">1.6 Running the <CODE>time</CODE> Command</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Summary of the options to the <CODE>time</CODE> command.</TD></TR> | ||
341 | +<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> | ||
342 | +</TH></TR> | ||
343 | +<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP">The Format String | ||
344 | +</TH></TR> | ||
345 | +<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> | ||
346 | +</TH></TR> | ||
347 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC4">1.2.1 Time Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> | ||
348 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC5">1.2.2 Memory Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> | ||
349 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC6">1.2.3 I/O Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> | ||
350 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC7">1.2.4 Command Info</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> | ||
351 | +</TABLE> | ||
352 | +<P> | ||
353 | + | ||
354 | +<HR SIZE=1> | ||
355 | +<A NAME="SEC1"></A> | ||
356 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
357 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> < </A>]</TD> | ||
358 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC2"> > </A>]</TD> | ||
359 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[ << ]</TD> | ||
360 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
361 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
362 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
363 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
364 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
365 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
366 | +</TR></TABLE> | ||
367 | +<A NAME="Resource Measurement"></A> | ||
368 | +<H1> 1. Measuring Program Resource Use </H1> | ||
369 | +<!--docid::SEC1::--> | ||
370 | +<P> | ||
371 | + | ||
372 | +The <CODE>time</CODE> command runs another program, then displays information | ||
373 | +about the resources used by that program, collected by the system while | ||
374 | +the program was running. You can select which information is reported | ||
375 | +and the format in which it is shown (see section <A HREF="time.html#SEC2">1.1 Setting the Output Format</A>), or have | ||
376 | +<CODE>time</CODE> save the information in a file instead of displaying it on the | ||
377 | +screen (see section <A HREF="time.html#SEC8">1.3 Redirecting Output</A>). | ||
378 | +</P> | ||
379 | +<P> | ||
380 | + | ||
381 | +The resources that <CODE>time</CODE> can report on fall into the general | ||
382 | +categories of time, memory, and I/O and IPC calls. Some systems do not | ||
383 | +provide much information about program resource use; <CODE>time</CODE> | ||
384 | +reports unavailable information as zero values (see section <A HREF="time.html#SEC10">1.5 Accuracy</A>). | ||
385 | +</P> | ||
386 | +<P> | ||
387 | + | ||
388 | +The format of the <CODE>time</CODE> command is: | ||
389 | +</P> | ||
390 | +<P> | ||
391 | + | ||
392 | +<TABLE><tr><td> </td><td class=example><pre>time [option<small>...</small>] <VAR>command</VAR> [<VAR>arg</VAR><small>...</small>] | ||
393 | +</pre></td></tr></table><P> | ||
394 | + | ||
395 | +<A NAME="IDX1"></A> | ||
396 | +<CODE>time</CODE> runs the program <VAR>command</VAR>, with any given arguments | ||
397 | +<VAR>arg</VAR><small>...</small>. When <VAR>command</VAR> finishes, <CODE>time</CODE> displays | ||
398 | +information about resources used by <VAR>command</VAR>. | ||
399 | +</P> | ||
400 | +<P> | ||
401 | + | ||
402 | +Here is an example of using <CODE>time</CODE> to measure the time and other | ||
403 | +resources used by running the program <CODE>grep</CODE>: | ||
404 | +</P> | ||
405 | +<P> | ||
406 | + | ||
407 | +<TABLE><tr><td> </td><td class=example><pre>eg$ time grep nobody /etc/aliases | ||
408 | +nobody:/dev/null | ||
409 | +etc-files:nobody | ||
410 | +misc-group:nobody | ||
411 | +0.07user 0.50system 0:06.69elapsed 8%CPU (0avgtext+489avgdata 324maxresident)k | ||
412 | +46inputs+7outputs (43major+251minor)pagefaults 0swaps | ||
413 | +</pre></td></tr></table><P> | ||
414 | + | ||
415 | +Mail suggestions and bug reports for GNU <CODE>time</CODE> to | ||
416 | +<CODE>bug-gnu-utils@prep.ai.mit.edu</CODE>. Please include the version of | ||
417 | +<CODE>time</CODE>, which you can get by running `<SAMP>time --version</SAMP>', and the | ||
418 | +operating system and C compiler you used. | ||
419 | +</P> | ||
420 | +<P> | ||
421 | + | ||
422 | +<TABLE BORDER="0" CELLSPACING="0"> | ||
423 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC2">1.1 Setting the Output Format</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Selecting the information reported by <CODE>time</CODE>.</TD></TR> | ||
424 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC3">1.2 The Format String</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">The information <CODE>time</CODE> can report.</TD></TR> | ||
425 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC8">1.3 Redirecting Output</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Writing the information to a file.</TD></TR> | ||
426 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC9">1.4 Examples</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Examples of using <CODE>time</CODE>.</TD></TR> | ||
427 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC10">1.5 Accuracy</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Limitations on the accuracy of <CODE>time</CODE> output.</TD></TR> | ||
428 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC11">1.6 Running the <CODE>time</CODE> Command</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Summary of the options to the <CODE>time</CODE> command.</TD></TR> | ||
429 | +</TABLE> | ||
430 | +<P> | ||
431 | + | ||
432 | +<A NAME="Setting Format"></A> | ||
433 | +<HR SIZE="6"> | ||
434 | +<A NAME="SEC2"></A> | ||
435 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
436 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> < </A>]</TD> | ||
437 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC3"> > </A>]</TD> | ||
438 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> | ||
439 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
440 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
441 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
442 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
443 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
444 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
445 | +</TR></TABLE> | ||
446 | +<H2> 1.1 Setting the Output Format </H2> | ||
447 | +<!--docid::SEC2::--> | ||
448 | +<P> | ||
449 | + | ||
450 | +<CODE>time</CODE> uses a <EM>format string</EM> to determine which information to | ||
451 | +display about the resources used by the command it runs. See section <A HREF="time.html#SEC3">1.2 The Format String</A>, for the interpretation of the format string contents. | ||
452 | +</P> | ||
453 | +<P> | ||
454 | + | ||
455 | +You can specify a format string with the command line options listed | ||
456 | +below. If no format is specified on the command line, but the | ||
457 | +<CODE>TIME</CODE> environment variable is set, its value is used as the format | ||
458 | +string. Otherwise, the default format built into <CODE>time</CODE> is used: | ||
459 | +</P> | ||
460 | +<P> | ||
461 | + | ||
462 | +<TABLE><tr><td> </td><td class=example><pre>%Uuser %Ssystem %Eelapsed %PCPU (%Xtext+%Ddata %Mmax)k | ||
463 | +%Iinputs+%Ooutputs (%Fmajor+%Rminor)pagefaults %Wswaps | ||
464 | +</pre></td></tr></table><P> | ||
465 | + | ||
466 | +The command line options to set the format are: | ||
467 | +</P> | ||
468 | +<P> | ||
469 | + | ||
470 | +</P> | ||
471 | +<DL COMPACT> | ||
472 | +<DT><CODE>-f <VAR>format</VAR></CODE> | ||
473 | +<DD><DT><CODE>--format=<VAR>format</VAR></CODE> | ||
474 | +<DD>Use <VAR>format</VAR> as the format string. | ||
475 | +<P> | ||
476 | + | ||
477 | +</P> | ||
478 | +<DT><CODE>-p</CODE> | ||
479 | +<DD><DT><CODE>--portability</CODE> | ||
480 | +<DD>Use the following format string, for conformance with POSIX standard | ||
481 | +1003.2: | ||
482 | +<P> | ||
483 | + | ||
484 | +<TABLE><tr><td> </td><td class=example><pre>real %e | ||
485 | +user %U | ||
486 | +sys %S | ||
487 | +</pre></td></tr></table><P> | ||
488 | + | ||
489 | +</P> | ||
490 | +<DT><CODE>-q</CODE> | ||
491 | +<DD><DT><CODE>--quiet</CODE> | ||
492 | +<DD>Suppress non-zero error code from the executed program. | ||
493 | +<P> | ||
494 | + | ||
495 | +</P> | ||
496 | +<DT><CODE>-v</CODE> | ||
497 | +<DD><DT><CODE>--verbose</CODE> | ||
498 | +<DD><A NAME="IDX2"></A> | ||
499 | +Use the built-in verbose format, which displays each available piece of | ||
500 | +information on the program's resource use on its own line, with an | ||
501 | +English description of its meaning. | ||
502 | +</DL> | ||
503 | +<P> | ||
504 | + | ||
505 | +<A NAME="Format String"></A> | ||
506 | +<HR SIZE="6"> | ||
507 | +<A NAME="SEC3"></A> | ||
508 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
509 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC2"> < </A>]</TD> | ||
510 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC4"> > </A>]</TD> | ||
511 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> | ||
512 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
513 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
514 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
515 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
516 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
517 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
518 | +</TR></TABLE> | ||
519 | +<H2> 1.2 The Format String </H2> | ||
520 | +<!--docid::SEC3::--> | ||
521 | +<P> | ||
522 | + | ||
523 | +<A NAME="IDX3"></A> | ||
524 | +<A NAME="IDX4"></A> | ||
525 | +The <EM>format string</EM> controls the contents of the <CODE>time</CODE> output. | ||
526 | +It consists of <EM>resource specifiers</EM> and <EM>escapes</EM>, interspersed | ||
527 | +with plain text. | ||
528 | +</P> | ||
529 | +<P> | ||
530 | + | ||
531 | +A backslash introduces an <EM>escape</EM>, which is translated | ||
532 | +into a single printing character upon output. The valid escapes are | ||
533 | +listed below. An invalid escape is output as a question mark followed | ||
534 | +by a backslash. | ||
535 | +</P> | ||
536 | +<P> | ||
537 | + | ||
538 | +</P> | ||
539 | +<DL COMPACT> | ||
540 | +<DT><CODE>\t</CODE> | ||
541 | +<DD>a tab character | ||
542 | +<P> | ||
543 | + | ||
544 | +</P> | ||
545 | +<DT><CODE>\n</CODE> | ||
546 | +<DD>a newline | ||
547 | +<P> | ||
548 | + | ||
549 | +</P> | ||
550 | +<DT><CODE>\\</CODE> | ||
551 | +<DD>a literal backslash | ||
552 | +</DL> | ||
553 | +<P> | ||
554 | + | ||
555 | +<CODE>time</CODE> always prints a newline after printing the resource use | ||
556 | +information, so normally format strings do not end with a newline | ||
557 | +character (or `<SAMP>\n</SAMP>'). | ||
558 | +</P> | ||
559 | +<P> | ||
560 | + | ||
561 | +A resource specifier consists of a percent sign followed by another | ||
562 | +character. An invalid resource specifier is output as a question mark | ||
563 | +followed by the invalid character. Use `<SAMP>%%</SAMP>' to output a literal | ||
564 | +percent sign. | ||
565 | +</P> | ||
566 | +<P> | ||
567 | + | ||
568 | +The resource specifiers, which are a superset of those recognized by the | ||
569 | +<CODE>tcsh</CODE> builtin <CODE>time</CODE> command, are listed below. Not all | ||
570 | +resources are measured by all versions of Unix, so some of the values | ||
571 | +might be reported as zero (see section <A HREF="time.html#SEC10">1.5 Accuracy</A>). | ||
572 | +</P> | ||
573 | +<P> | ||
574 | + | ||
575 | +<TABLE BORDER="0" CELLSPACING="0"> | ||
576 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC4">1.2.1 Time Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> | ||
577 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC5">1.2.2 Memory Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> | ||
578 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC6">1.2.3 I/O Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> | ||
579 | +<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC7">1.2.4 Command Info</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> | ||
580 | +</TABLE> | ||
581 | +<P> | ||
582 | + | ||
583 | +<A NAME="Time Resources"></A> | ||
584 | +<HR SIZE="6"> | ||
585 | +<A NAME="SEC4"></A> | ||
586 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
587 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC3"> < </A>]</TD> | ||
588 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC5"> > </A>]</TD> | ||
589 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> | ||
590 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
591 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
592 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
593 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
594 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
595 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
596 | +</TR></TABLE> | ||
597 | +<H3> 1.2.1 Time Resources </H3> | ||
598 | +<!--docid::SEC4::--> | ||
599 | +<P> | ||
600 | + | ||
601 | +</P> | ||
602 | +<DL COMPACT> | ||
603 | +<DT><CODE>E</CODE> | ||
604 | +<DD>Elapsed real (wall clock) time used by the process, in | ||
605 | +[hours:]minutes:seconds. | ||
606 | +<P> | ||
607 | + | ||
608 | +</P> | ||
609 | +<DT><CODE>e</CODE> | ||
610 | +<DD>Elapsed real (wall clock) time used by the process, in | ||
611 | +seconds. | ||
612 | +<P> | ||
613 | + | ||
614 | +</P> | ||
615 | +<DT><CODE>S</CODE> | ||
616 | +<DD>Total number of CPU-seconds used by the system on behalf of the process | ||
617 | +(in kernel mode), in seconds. | ||
618 | +<P> | ||
619 | + | ||
620 | +</P> | ||
621 | +<DT><CODE>U</CODE> | ||
622 | +<DD>Total number of CPU-seconds that the process used directly (in user | ||
623 | +mode), in seconds. | ||
624 | +<P> | ||
625 | + | ||
626 | +</P> | ||
627 | +<DT><CODE>P</CODE> | ||
628 | +<DD>Percentage of the CPU that this job got. This is just user + system | ||
629 | +times divied by the total running time. | ||
630 | +</DL> | ||
631 | +<P> | ||
632 | + | ||
633 | +<A NAME="Memory Resources"></A> | ||
634 | +<HR SIZE="6"> | ||
635 | +<A NAME="SEC5"></A> | ||
636 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
637 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC4"> < </A>]</TD> | ||
638 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC6"> > </A>]</TD> | ||
639 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> | ||
640 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
641 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
642 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
643 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
644 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
645 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
646 | +</TR></TABLE> | ||
647 | +<H3> 1.2.2 Memory Resources </H3> | ||
648 | +<!--docid::SEC5::--> | ||
649 | +<P> | ||
650 | + | ||
651 | +</P> | ||
652 | +<DL COMPACT> | ||
653 | +<DT><CODE>M</CODE> | ||
654 | +<DD>Maximum resident set size of the process during its lifetime, in | ||
655 | +Kilobytes. | ||
656 | +<P> | ||
657 | + | ||
658 | +</P> | ||
659 | +<DT><CODE>t</CODE> | ||
660 | +<DD>Average resident set size of the process, in Kilobytes. | ||
661 | +<P> | ||
662 | + | ||
663 | +</P> | ||
664 | +<DT><CODE>K</CODE> | ||
665 | +<DD>Average total (data+stack+text) memory use of the process, in Kilobytes. | ||
666 | +<P> | ||
667 | + | ||
668 | +</P> | ||
669 | +<DT><CODE>D</CODE> | ||
670 | +<DD>Average size of the process's unshared data area, in Kilobytes. | ||
671 | +<P> | ||
672 | + | ||
673 | +</P> | ||
674 | +<DT><CODE>p</CODE> | ||
675 | +<DD>Average size of the process's unshared stack, in Kilobytes. | ||
676 | +<P> | ||
677 | + | ||
678 | +</P> | ||
679 | +<DT><CODE>X</CODE> | ||
680 | +<DD>Average size of the process's shared text, in Kilobytes. | ||
681 | +<P> | ||
682 | + | ||
683 | +</P> | ||
684 | +<DT><CODE>Z</CODE> | ||
685 | +<DD>System's page size, in bytes. This is a per-system constant, but | ||
686 | +varies between systems. | ||
687 | +</DL> | ||
688 | +<P> | ||
689 | + | ||
690 | +<A NAME="I/O Resources"></A> | ||
691 | +<HR SIZE="6"> | ||
692 | +<A NAME="SEC6"></A> | ||
693 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
694 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC5"> < </A>]</TD> | ||
695 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC7"> > </A>]</TD> | ||
696 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> | ||
697 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
698 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
699 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
700 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
701 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
702 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
703 | +</TR></TABLE> | ||
704 | +<H3> 1.2.3 I/O Resources </H3> | ||
705 | +<!--docid::SEC6::--> | ||
706 | +<P> | ||
707 | + | ||
708 | +</P> | ||
709 | +<DL COMPACT> | ||
710 | +<DT><CODE>F</CODE> | ||
711 | +<DD>Number of major, or I/O-requiring, page faults that occurred while the | ||
712 | +process was running. These are faults where the page has actually | ||
713 | +migrated out of primary memory. | ||
714 | +<P> | ||
715 | + | ||
716 | +</P> | ||
717 | +<DT><CODE>R</CODE> | ||
718 | +<DD>Number of minor, or recoverable, page faults. These are pages that are | ||
719 | +not valid (so they fault) but which have not yet been claimed by other | ||
720 | +virtual pages. Thus the data in the page is still valid but the system | ||
721 | +tables must be updated. | ||
722 | +<P> | ||
723 | + | ||
724 | +</P> | ||
725 | +<DT><CODE>W</CODE> | ||
726 | +<DD>Number of times the process was swapped out of main memory. | ||
727 | +<P> | ||
728 | + | ||
729 | +</P> | ||
730 | +<DT><CODE>c</CODE> | ||
731 | +<DD>Number of times the process was context-switched involuntarily (because | ||
732 | +the time slice expired). | ||
733 | +<P> | ||
734 | + | ||
735 | +</P> | ||
736 | +<DT><CODE>w</CODE> | ||
737 | +<DD>Number of times that the program was context-switched voluntarily, for | ||
738 | +instance while waiting for an I/O operation to complete. | ||
739 | +<P> | ||
740 | + | ||
741 | +</P> | ||
742 | +<DT><CODE>I</CODE> | ||
743 | +<DD>Number of file system inputs by the process. | ||
744 | +<P> | ||
745 | + | ||
746 | +</P> | ||
747 | +<DT><CODE>O</CODE> | ||
748 | +<DD>Number of file system outputs by the process. | ||
749 | +<P> | ||
750 | + | ||
751 | +</P> | ||
752 | +<DT><CODE>r</CODE> | ||
753 | +<DD>Number of socket messages received by the process. | ||
754 | +<P> | ||
755 | + | ||
756 | +</P> | ||
757 | +<DT><CODE>s</CODE> | ||
758 | +<DD>Number of socket messages sent by the process. | ||
759 | +<P> | ||
760 | + | ||
761 | +</P> | ||
762 | +<DT><CODE>k</CODE> | ||
763 | +<DD>Number of signals delivered to the process. | ||
764 | +</DL> | ||
765 | +<P> | ||
766 | + | ||
767 | +<A NAME="Command Info"></A> | ||
768 | +<HR SIZE="6"> | ||
769 | +<A NAME="SEC7"></A> | ||
770 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
771 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC6"> < </A>]</TD> | ||
772 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC8"> > </A>]</TD> | ||
773 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> | ||
774 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
775 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
776 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
777 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
778 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
779 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
780 | +</TR></TABLE> | ||
781 | +<H3> 1.2.4 Command Info </H3> | ||
782 | +<!--docid::SEC7::--> | ||
783 | +<P> | ||
784 | + | ||
785 | +</P> | ||
786 | +<DL COMPACT> | ||
787 | +<DT><CODE>C</CODE> | ||
788 | +<DD>Name and command line arguments of the command being timed. | ||
789 | +<P> | ||
790 | + | ||
791 | +</P> | ||
792 | +<DT><CODE>x</CODE> | ||
793 | +<DD>Exit status of the command. | ||
794 | +</DL> | ||
795 | +<P> | ||
796 | + | ||
797 | +<A NAME="Redirecting"></A> | ||
798 | +<HR SIZE="6"> | ||
799 | +<A NAME="SEC8"></A> | ||
800 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
801 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC7"> < </A>]</TD> | ||
802 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC9"> > </A>]</TD> | ||
803 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> | ||
804 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
805 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
806 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
807 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
808 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
809 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
810 | +</TR></TABLE> | ||
811 | +<H2> 1.3 Redirecting Output </H2> | ||
812 | +<!--docid::SEC8::--> | ||
813 | +<P> | ||
814 | + | ||
815 | +By default, <CODE>time</CODE> writes the resource use statistics to the | ||
816 | +standard error stream. The options below make it write the statistics | ||
817 | +to a file instead. Doing this can be useful if the program you're | ||
818 | +running writes to the standard error or you're running <CODE>time</CODE> | ||
819 | +noninteractively or in the background. | ||
820 | +</P> | ||
821 | +<P> | ||
822 | + | ||
823 | +</P> | ||
824 | +<DL COMPACT> | ||
825 | +<DT><CODE>-o <VAR>file</VAR></CODE> | ||
826 | +<DD><DT><CODE>--output=<VAR>file</VAR></CODE> | ||
827 | +<DD>Write the resource use statistics to <VAR>file</VAR>. By default, this | ||
828 | +<EM>overwrites</EM> the file, destroying the file's previous contents. | ||
829 | +<P> | ||
830 | + | ||
831 | +</P> | ||
832 | +<DT><CODE>-a</CODE> | ||
833 | +<DD><DT><CODE>--append</CODE> | ||
834 | +<DD><EM>Append</EM> the resource use information to the output file instead | ||
835 | +of overwriting it. This option is only useful with the `<SAMP>-o</SAMP>' or | ||
836 | +`<SAMP>--output</SAMP>' option. | ||
837 | +</DL> | ||
838 | +<P> | ||
839 | + | ||
840 | +<A NAME="Examples"></A> | ||
841 | +<HR SIZE="6"> | ||
842 | +<A NAME="SEC9"></A> | ||
843 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
844 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC8"> < </A>]</TD> | ||
845 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC10"> > </A>]</TD> | ||
846 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> | ||
847 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
848 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
849 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
850 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
851 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
852 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
853 | +</TR></TABLE> | ||
854 | +<H2> 1.4 Examples </H2> | ||
855 | +<!--docid::SEC9::--> | ||
856 | +<P> | ||
857 | + | ||
858 | +Run the command `<SAMP>wc /etc/hosts</SAMP>' and show the default information: | ||
859 | +</P> | ||
860 | +<P> | ||
861 | + | ||
862 | +<TABLE><tr><td> </td><td class=example><pre>eg$ time wc /etc/hosts | ||
863 | + 35 111 1134 /etc/hosts | ||
864 | +0.00user 0.01system 0:00.04elapsed 25%CPU (0avgtext+0avgdata 0maxresident)k | ||
865 | +1inputs+1outputs (0major+0minor)pagefaults 0swaps | ||
866 | +</pre></td></tr></table><P> | ||
867 | + | ||
868 | +Run the command `<SAMP>ls -Fs</SAMP>' and show just the user, system, and | ||
869 | +wall-clock time: | ||
870 | +</P> | ||
871 | +<P> | ||
872 | + | ||
873 | +<TABLE><tr><td> </td><td class=example><pre>eg$ time -f "\t%E real,\t%U user,\t%S sys" ls -Fs | ||
874 | +total 16 | ||
875 | +1 account/ 1 db/ 1 mail/ 1 run/ | ||
876 | +1 backups/ 1 emacs/ 1 msgs/ 1 rwho/ | ||
877 | +1 crash/ 1 games/ 1 preserve/ 1 spool/ | ||
878 | +1 cron/ 1 log/ 1 quotas/ 1 tmp/ | ||
879 | + 0:00.03 real, 0.00 user, 0.01 sys | ||
880 | +</pre></td></tr></table><P> | ||
881 | + | ||
882 | +Edit the file `<TT>.bashrc</TT>' and have <CODE>time</CODE> append the elapsed time | ||
883 | +and number of signals to the file `<TT>log</TT>', reading the format string | ||
884 | +from the environment variable <CODE>TIME</CODE>: | ||
885 | +</P> | ||
886 | +<P> | ||
887 | + | ||
888 | +<TABLE><tr><td> </td><td class=example><pre>eg$ export TIME="\t%E,\t%k" # If using bash or ksh | ||
889 | +eg$ setenv TIME "\t%E,\t%k" # If using csh or tcsh | ||
890 | +eg$ time -a -o log emacs .bashrc | ||
891 | +eg$ cat log | ||
892 | + 0:16.55, 726 | ||
893 | +</pre></td></tr></table><P> | ||
894 | + | ||
895 | +Run the command `<SAMP>sleep 4</SAMP>' and show all of the information about it | ||
896 | +verbosely: | ||
897 | +</P> | ||
898 | +<P> | ||
899 | + | ||
900 | +<TABLE><tr><td> </td><td class=example><pre>eg$ time -v sleep 4 | ||
901 | + Command being timed: "sleep 4" | ||
902 | + User time (seconds): 0.00 | ||
903 | + System time (seconds): 0.05 | ||
904 | + Percent of CPU this job got: 1% | ||
905 | + Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.26 | ||
906 | + Average shared text size (kbytes): 36 | ||
907 | + Average unshared data size (kbytes): 24 | ||
908 | + Average stack size (kbytes): 0 | ||
909 | + Average total size (kbytes): 60 | ||
910 | + Maximum resident set size (kbytes): 32 | ||
911 | + Average resident set size (kbytes): 24 | ||
912 | + Major (requiring I/O) page faults: 3 | ||
913 | + Minor (reclaiming a frame) page faults: 0 | ||
914 | + Voluntary context switches: 11 | ||
915 | + Involuntary context switches: 0 | ||
916 | + Swaps: 0 | ||
917 | + File system inputs: 3 | ||
918 | + File system outputs: 1 | ||
919 | + Socket messages sent: 0 | ||
920 | + Socket messages received: 0 | ||
921 | + Signals delivered: 1 | ||
922 | + Page size (bytes): 4096 | ||
923 | + Exit status: 0 | ||
924 | +</pre></td></tr></table><P> | ||
925 | + | ||
926 | +<A NAME="Accuracy"></A> | ||
927 | +<HR SIZE="6"> | ||
928 | +<A NAME="SEC10"></A> | ||
929 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
930 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC9"> < </A>]</TD> | ||
931 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC11"> > </A>]</TD> | ||
932 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> | ||
933 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
934 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
935 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
936 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
937 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
938 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
939 | +</TR></TABLE> | ||
940 | +<H2> 1.5 Accuracy </H2> | ||
941 | +<!--docid::SEC10::--> | ||
942 | +<P> | ||
943 | + | ||
944 | +The elapsed time is not collected atomically with the execution of the | ||
945 | +program; as a result, in bizarre circumstances (if the <CODE>time</CODE> | ||
946 | +command gets stopped or swapped out in between when the program being | ||
947 | +timed exits and when <CODE>time</CODE> calculates how long it took to run), it | ||
948 | +could be much larger than the actual execution time. | ||
949 | +</P> | ||
950 | +<P> | ||
951 | + | ||
952 | +When the running time of a command is very nearly zero, some values | ||
953 | +(e.g., the percentage of CPU used) may be reported as either zero (which | ||
954 | +is wrong) or a question mark. | ||
955 | +</P> | ||
956 | +<P> | ||
957 | + | ||
958 | +Most information shown by <CODE>time</CODE> is derived from the <CODE>wait3</CODE> | ||
959 | +system call. The numbers are only as good as those returned by | ||
960 | +<CODE>wait3</CODE>. Many systems do not measure all of the resources that | ||
961 | +<CODE>time</CODE> can report on; those resources are reported as zero. The | ||
962 | +systems that measure most or all of the resources are based on 4.2 or | ||
963 | +4.3BSD. Later BSD releases use different memory management code that | ||
964 | +measures fewer resources. | ||
965 | +</P> | ||
966 | +<P> | ||
967 | + | ||
968 | +On systems that do not have a <CODE>wait3</CODE> call that returns status | ||
969 | +information, the <CODE>times</CODE> system call is used instead. It provides | ||
970 | +much less information than <CODE>wait3</CODE>, so on those systems <CODE>time</CODE> | ||
971 | +reports most of the resources as zero. | ||
972 | +</P> | ||
973 | +<P> | ||
974 | + | ||
975 | +The `<SAMP>%I</SAMP>' and `<SAMP>%O</SAMP>' values are allegedly only "real" input | ||
976 | +and output and do not include those supplied by caching devices. The | ||
977 | +meaning of "real" I/O reported by `<SAMP>%I</SAMP>' and `<SAMP>%O</SAMP>' may be | ||
978 | +muddled for workstations, especially diskless ones. | ||
979 | +</P> | ||
980 | +<P> | ||
981 | + | ||
982 | +<A NAME="Invoking time"></A> | ||
983 | +<HR SIZE="6"> | ||
984 | +<A NAME="SEC11"></A> | ||
985 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
986 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC10"> < </A>]</TD> | ||
987 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ > ]</TD> | ||
988 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> | ||
989 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> | ||
990 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> | ||
991 | +<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
992 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
993 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
994 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
995 | +</TR></TABLE> | ||
996 | +<H2> 1.6 Running the <CODE>time</CODE> Command </H2> | ||
997 | +<!--docid::SEC11::--> | ||
998 | +<P> | ||
999 | + | ||
1000 | +The format of the <CODE>time</CODE> command is: | ||
1001 | +</P> | ||
1002 | +<P> | ||
1003 | + | ||
1004 | +<TABLE><tr><td> </td><td class=example><pre>time [option<small>...</small>] <VAR>command</VAR> [<VAR>arg</VAR><small>...</small>] | ||
1005 | +</pre></td></tr></table><P> | ||
1006 | + | ||
1007 | +<A NAME="IDX5"></A> | ||
1008 | +<CODE>time</CODE> runs the program <VAR>command</VAR>, with any given arguments | ||
1009 | +<VAR>arg</VAR><small>...</small>. When <VAR>command</VAR> finishes, <CODE>time</CODE> displays | ||
1010 | +information about resources used by <VAR>command</VAR> (on the standard error | ||
1011 | +output, by default). If <VAR>command</VAR> exits with non-zero status or is | ||
1012 | +terminated by a signal, <CODE>time</CODE> displays a warning message and the | ||
1013 | +exit status or signal number. | ||
1014 | +</P> | ||
1015 | +<P> | ||
1016 | + | ||
1017 | +Options to <CODE>time</CODE> must appear on the command line before | ||
1018 | +<VAR>command</VAR>. Anything on the command line after <VAR>command</VAR> is | ||
1019 | +passed as arguments to <VAR>command</VAR>. | ||
1020 | +</P> | ||
1021 | +<P> | ||
1022 | + | ||
1023 | +</P> | ||
1024 | +<DL COMPACT> | ||
1025 | +<DT><CODE>-o <VAR>file</VAR></CODE> | ||
1026 | +<DD><DT><CODE>--output=<VAR>file</VAR></CODE> | ||
1027 | +<DD>Write the resource use statistics to <VAR>file</VAR>. | ||
1028 | +<P> | ||
1029 | + | ||
1030 | +</P> | ||
1031 | +<DT><CODE>-a</CODE> | ||
1032 | +<DD><DT><CODE>--append</CODE> | ||
1033 | +<DD><EM>Append</EM> the resource use information to the output file instead | ||
1034 | +of overwriting it. | ||
1035 | +<P> | ||
1036 | + | ||
1037 | +</P> | ||
1038 | +<DT><CODE>-f <VAR>format</VAR></CODE> | ||
1039 | +<DD><DT><CODE>--format=<VAR>format</VAR></CODE> | ||
1040 | +<DD>Use <VAR>format</VAR> as the format string. | ||
1041 | +<P> | ||
1042 | + | ||
1043 | +</P> | ||
1044 | +<DT><CODE>--help</CODE> | ||
1045 | +<DD>Print a summary of the command line options to <CODE>time</CODE> and exit. | ||
1046 | +<P> | ||
1047 | + | ||
1048 | +</P> | ||
1049 | +<DT><CODE>-p</CODE> | ||
1050 | +<DD><DT><CODE>--portability</CODE> | ||
1051 | +<DD>Use the POSIX format. | ||
1052 | +<P> | ||
1053 | + | ||
1054 | +</P> | ||
1055 | +<DT><CODE>-v</CODE> | ||
1056 | +<DD><DT><CODE>--verbose</CODE> | ||
1057 | +<DD><A NAME="IDX6"></A> | ||
1058 | +Use the built-in verbose format. | ||
1059 | +<P> | ||
1060 | + | ||
1061 | +</P> | ||
1062 | +<DT><CODE>-V</CODE> | ||
1063 | +<DD><DT><CODE>--version</CODE> | ||
1064 | +<DD><A NAME="IDX7"></A> | ||
1065 | +Print the version number of <CODE>time</CODE> and exit. | ||
1066 | +</DL> | ||
1067 | +<P> | ||
1068 | + | ||
1069 | +<HR SIZE="6"> | ||
1070 | +<A NAME="SEC_Contents"></A> | ||
1071 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
1072 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
1073 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
1074 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
1075 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
1076 | +</TR></TABLE> | ||
1077 | +<H1>Table of Contents</H1> | ||
1078 | +<BLOCKQUOTE> | ||
1079 | +<A NAME="TOC1" HREF="time.html#SEC1">1. Measuring Program Resource Use</A> | ||
1080 | +<BR> | ||
1081 | +<BLOCKQUOTE> | ||
1082 | +<A NAME="TOC2" HREF="time.html#SEC2">1.1 Setting the Output Format</A> | ||
1083 | +<BR> | ||
1084 | +<A NAME="TOC3" HREF="time.html#SEC3">1.2 The Format String</A> | ||
1085 | +<BR> | ||
1086 | +<BLOCKQUOTE> | ||
1087 | +<A NAME="TOC4" HREF="time.html#SEC4">1.2.1 Time Resources</A> | ||
1088 | +<BR> | ||
1089 | +<A NAME="TOC5" HREF="time.html#SEC5">1.2.2 Memory Resources</A> | ||
1090 | +<BR> | ||
1091 | +<A NAME="TOC6" HREF="time.html#SEC6">1.2.3 I/O Resources</A> | ||
1092 | +<BR> | ||
1093 | +<A NAME="TOC7" HREF="time.html#SEC7">1.2.4 Command Info</A> | ||
1094 | +<BR> | ||
1095 | +</BLOCKQUOTE> | ||
1096 | +<A NAME="TOC8" HREF="time.html#SEC8">1.3 Redirecting Output</A> | ||
1097 | +<BR> | ||
1098 | +<A NAME="TOC9" HREF="time.html#SEC9">1.4 Examples</A> | ||
1099 | +<BR> | ||
1100 | +<A NAME="TOC10" HREF="time.html#SEC10">1.5 Accuracy</A> | ||
1101 | +<BR> | ||
1102 | +<A NAME="TOC11" HREF="time.html#SEC11">1.6 Running the <CODE>time</CODE> Command</A> | ||
1103 | +<BR> | ||
1104 | +</BLOCKQUOTE> | ||
1105 | +</BLOCKQUOTE> | ||
1106 | +<HR SIZE=1> | ||
1107 | +<A NAME="SEC_OVERVIEW"></A> | ||
1108 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
1109 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
1110 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
1111 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
1112 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
1113 | +</TR></TABLE> | ||
1114 | +<H1>Short Table of Contents</H1> | ||
1115 | +<BLOCKQUOTE> | ||
1116 | +<A NAME="TOC1" HREF="time.html#SEC1">1. Measuring Program Resource Use</A> | ||
1117 | +<BR> | ||
1118 | + | ||
1119 | +</BLOCKQUOTE> | ||
1120 | +<HR SIZE=1> | ||
1121 | +<A NAME="SEC_About"></A> | ||
1122 | +<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> | ||
1123 | +<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> | ||
1124 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> | ||
1125 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> | ||
1126 | +<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> | ||
1127 | +</TR></TABLE> | ||
1128 | +<H1>About this document</H1> | ||
1129 | +This document was generated | ||
1130 | +by | ||
1131 | +using <A HREF="http://texi2html.cvshome.org"><I>texi2html</I></A> | ||
1132 | +<P></P> | ||
1133 | +The buttons in the navigation panels have the following meaning: | ||
1134 | +<P></P> | ||
1135 | +<table border = "1"> | ||
1136 | +<TR> | ||
1137 | +<TH> Button </TH> | ||
1138 | +<TH> Name </TH> | ||
1139 | +<TH> Go to </TH> | ||
1140 | +<TH> From 1.2.3 go to</TH> | ||
1141 | +</TR> | ||
1142 | +<TR> | ||
1143 | +<TD ALIGN="CENTER"> | ||
1144 | + [ < ] </TD> | ||
1145 | +<TD ALIGN="CENTER"> | ||
1146 | +Back | ||
1147 | +</TD> | ||
1148 | +<TD> | ||
1149 | +previous section in reading order | ||
1150 | +</TD> | ||
1151 | +<TD> | ||
1152 | +1.2.2 | ||
1153 | +</TD> | ||
1154 | +</TR> | ||
1155 | +<TR> | ||
1156 | +<TD ALIGN="CENTER"> | ||
1157 | + [ > ] </TD> | ||
1158 | +<TD ALIGN="CENTER"> | ||
1159 | +Forward | ||
1160 | +</TD> | ||
1161 | +<TD> | ||
1162 | +next section in reading order | ||
1163 | +</TD> | ||
1164 | +<TD> | ||
1165 | +1.2.4 | ||
1166 | +</TD> | ||
1167 | +</TR> | ||
1168 | +<TR> | ||
1169 | +<TD ALIGN="CENTER"> | ||
1170 | + [ << ] </TD> | ||
1171 | +<TD ALIGN="CENTER"> | ||
1172 | +FastBack | ||
1173 | +</TD> | ||
1174 | +<TD> | ||
1175 | +beginning of this chapter or previous chapter | ||
1176 | +</TD> | ||
1177 | +<TD> | ||
1178 | +1 | ||
1179 | +</TD> | ||
1180 | +</TR> | ||
1181 | +<TR> | ||
1182 | +<TD ALIGN="CENTER"> | ||
1183 | + [ Up ] </TD> | ||
1184 | +<TD ALIGN="CENTER"> | ||
1185 | +Up | ||
1186 | +</TD> | ||
1187 | +<TD> | ||
1188 | +up section | ||
1189 | +</TD> | ||
1190 | +<TD> | ||
1191 | +1.2 | ||
1192 | +</TD> | ||
1193 | +</TR> | ||
1194 | +<TR> | ||
1195 | +<TD ALIGN="CENTER"> | ||
1196 | + [ >> ] </TD> | ||
1197 | +<TD ALIGN="CENTER"> | ||
1198 | +FastForward | ||
1199 | +</TD> | ||
1200 | +<TD> | ||
1201 | +next chapter | ||
1202 | +</TD> | ||
1203 | +<TD> | ||
1204 | +2 | ||
1205 | +</TD> | ||
1206 | +</TR> | ||
1207 | +<TR> | ||
1208 | +<TD ALIGN="CENTER"> | ||
1209 | + [Top] </TD> | ||
1210 | +<TD ALIGN="CENTER"> | ||
1211 | +Top | ||
1212 | +</TD> | ||
1213 | +<TD> | ||
1214 | +cover (top) of document | ||
1215 | +</TD> | ||
1216 | +<TD> | ||
1217 | + | ||
1218 | +</TD> | ||
1219 | +</TR> | ||
1220 | +<TR> | ||
1221 | +<TD ALIGN="CENTER"> | ||
1222 | + [Contents] </TD> | ||
1223 | +<TD ALIGN="CENTER"> | ||
1224 | +Contents | ||
1225 | +</TD> | ||
1226 | +<TD> | ||
1227 | +table of contents | ||
1228 | +</TD> | ||
1229 | +<TD> | ||
1230 | + | ||
1231 | +</TD> | ||
1232 | +</TR> | ||
1233 | +<TR> | ||
1234 | +<TD ALIGN="CENTER"> | ||
1235 | + [Index] </TD> | ||
1236 | +<TD ALIGN="CENTER"> | ||
1237 | +Index | ||
1238 | +</TD> | ||
1239 | +<TD> | ||
1240 | +concept index | ||
1241 | +</TD> | ||
1242 | +<TD> | ||
1243 | + | ||
1244 | +</TD> | ||
1245 | +</TR> | ||
1246 | +<TR> | ||
1247 | +<TD ALIGN="CENTER"> | ||
1248 | + [ ? ] </TD> | ||
1249 | +<TD ALIGN="CENTER"> | ||
1250 | +About | ||
1251 | +</TD> | ||
1252 | +<TD> | ||
1253 | +this page | ||
1254 | +</TD> | ||
1255 | +<TD> | ||
1256 | + | ||
1257 | +</TD> | ||
1258 | +</TR> | ||
1259 | +</TABLE> | ||
1260 | + <P> | ||
1261 | + where the <STRONG> Example </STRONG> assumes that the current position | ||
1262 | + is at <STRONG> Subsubsection One-Two-Three </STRONG> of a document of | ||
1263 | + the following structure:</P> | ||
1264 | + <UL> | ||
1265 | + <LI> 1. Section One | ||
1266 | + <UL> | ||
1267 | + <LI>1.1 Subsection One-One | ||
1268 | + <UL> | ||
1269 | + <LI>...</LI> | ||
1270 | + </UL> | ||
1271 | + <LI>1.2 Subsection One-Two | ||
1272 | + <UL> | ||
1273 | + <LI>1.2.1 Subsubsection One-Two-One</LI> | ||
1274 | + <LI>1.2.2 Subsubsection One-Two-Two</LI> | ||
1275 | + <LI>1.2.3 Subsubsection One-Two-Three | ||
1276 | + <STRONG><== Current Position </STRONG></LI> | ||
1277 | + <LI>1.2.4 Subsubsection One-Two-Four</LI> | ||
1278 | + </UL> | ||
1279 | + </LI> | ||
1280 | + <LI>1.3 Subsection One-Three | ||
1281 | + <UL> | ||
1282 | + <LI>...</LI> | ||
1283 | + </UL> | ||
1284 | + </LI> | ||
1285 | + <LI>1.4 Subsection One-Four</LI> | ||
1286 | + </UL> | ||
1287 | + </LI> | ||
1288 | + </UL> | ||
1289 | + | ||
1290 | +<HR SIZE=1> | ||
1291 | +<BR> | ||
1292 | +<FONT SIZE="-1"> | ||
1293 | +This document was generated | ||
1294 | +by <I>root</I> on <I>September, 1 2003</I> | ||
1295 | +using <A HREF="http://texi2html.cvshome.org"><I>texi2html</I></A> | ||
1296 | +</FONT> | ||
1297 | + | ||
1298 | +</BODY> | ||
1299 | +</HTML> | ||
diff --git a/meta/recipes-extended/time/time.inc b/meta/recipes-extended/time/time.inc new file mode 100644 index 0000000000..8d31b47a0c --- /dev/null +++ b/meta/recipes-extended/time/time.inc | |||
@@ -0,0 +1,7 @@ | |||
1 | DESCRIPTION = "time measures many of the CPU resources, such as time and \ | ||
2 | memory, that other programs use." | ||
3 | HOMEPAGE = "http://www.gnu.org/software/time/" | ||
4 | SECTION = "utils" | ||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" | ||
7 | |||
diff --git a/meta/recipes-extended/time/time_1.7.bb b/meta/recipes-extended/time/time_1.7.bb new file mode 100644 index 0000000000..1030489b6f --- /dev/null +++ b/meta/recipes-extended/time/time_1.7.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require time.inc | ||
2 | |||
3 | SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \ | ||
4 | file://debian.patch;patch=1" | ||
5 | # file://autofoo.patch;patch=1 \ | ||
6 | # file://compile.patch;patch=1" | ||
7 | S = "${WORKDIR}/time-${PV}" | ||
8 | |||
9 | inherit autotools | ||
diff --git a/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch b/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch new file mode 100644 index 0000000000..568d4233fd --- /dev/null +++ b/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | # glibc also implements the function group_member. To avoid name conflict, | ||
2 | # here let us append a "_" to which's version. | ||
3 | # | ||
4 | # Signed-off-by Dexuan Cui <dexuan.cui@intel.com>, 2010-08-20 | ||
5 | # (this patch is licensed under GPLv2) | ||
6 | |||
7 | --- which-2.18/bash.c | ||
8 | +++ which-2.18/bash.c | ||
9 | @@ -45,7 +45,12 @@ | ||
10 | * - changed all occurences of 'gid_t' into 'GID_T'. | ||
11 | * - exported functions needed in which.c | ||
12 | */ | ||
13 | -static int group_member (GID_T gid); | ||
14 | + | ||
15 | +/* | ||
16 | + * glibc also implements the function group_member. To avoid name conflict, | ||
17 | + * here let us append a "_" to which's version. | ||
18 | + */ | ||
19 | +static int _group_member (GID_T gid); | ||
20 | static char* extract_colon_unit (char const* string, int *p_index); | ||
21 | |||
22 | /*=========================================================================== | ||
23 | @@ -200,8 +205,8 @@ | ||
24 | |||
25 | /* From bash-2.05b / general.c / line 805 */ | ||
26 | /* Return non-zero if GID is one that we have in our groups list. */ | ||
27 | -int | ||
28 | -group_member (GID_T gid) | ||
29 | +static int | ||
30 | +_group_member (GID_T gid) | ||
31 | { | ||
32 | #if defined (HAVE_GETGROUPS) | ||
33 | register int i; | ||
34 | @@ -290,7 +295,7 @@ | ||
35 | return (X_BIT (u_mode_bits (finfo.st_mode))) ? (FS_EXISTS | FS_EXECABLE) : FS_EXISTS; | ||
36 | |||
37 | /* Otherwise, if we are in the owning group, the group permissions apply. */ | ||
38 | - if (group_member (finfo.st_gid)) | ||
39 | + if (_group_member (finfo.st_gid)) | ||
40 | return (X_BIT (g_mode_bits (finfo.st_mode))) ? (FS_EXISTS | FS_EXECABLE) : FS_EXISTS; | ||
41 | |||
42 | /* Otherwise, if we are in the other group, the other permissions apply. */ | ||
43 | @@ -331,7 +336,7 @@ | ||
44 | /* Given a string containing units of information separated by colons, | ||
45 | return the next one pointed to by (P_INDEX), or NULL if there are no more. | ||
46 | Advance (P_INDEX) to the character after the colon. */ | ||
47 | -char* | ||
48 | +static char* | ||
49 | extract_colon_unit (char const* string, int* p_index) | ||
50 | { | ||
51 | int i, start, len; | ||
diff --git a/meta/recipes-extended/which/which-2.20/remove-declaration.patch b/meta/recipes-extended/which/which-2.20/remove-declaration.patch new file mode 100644 index 0000000000..09b81439b6 --- /dev/null +++ b/meta/recipes-extended/which/which-2.20/remove-declaration.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | Remove the declaration of group_member since it has already been | ||
2 | declared in unistd.h | ||
3 | |||
4 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
5 | |||
6 | diff -ruN which-2.20-orig/bash.c which-2.20/bash.c | ||
7 | --- which-2.20-orig/bash.c 2010-08-03 12:59:08.897088878 +0800 | ||
8 | +++ which-2.20/bash.c 2010-08-03 13:17:23.406097212 +0800 | ||
9 | @@ -46,7 +46,6 @@ | ||
10 | * - changed all occurences of 'gid_t' into 'GID_T'. | ||
11 | * - exported functions needed in which.c | ||
12 | */ | ||
13 | -static int group_member (GID_T gid); | ||
14 | static char* extract_colon_unit (char const* string, int* p_index); | ||
15 | |||
16 | /*=========================================================================== | ||
diff --git a/meta/recipes-extended/which/which_2.18.bb b/meta/recipes-extended/which/which_2.18.bb new file mode 100644 index 0000000000..b177949788 --- /dev/null +++ b/meta/recipes-extended/which/which_2.18.bb | |||
@@ -0,0 +1,40 @@ | |||
1 | DESCRIPTION = "Which is a utility that prints out the full path of the \ | ||
2 | executables that bash(1) would execute when the passed \ | ||
3 | program names would have been entered on the shell prompt. \ | ||
4 | It does this by using the exact same algorithm as bash." | ||
5 | HOMEPAGE = "http://www.xs4all.nl/~carlo17/which/" | ||
6 | BUGTRACKER = "n/a" | ||
7 | |||
8 | LICENSE = "GPLv2+" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
10 | |||
11 | PR = "r0" | ||
12 | |||
13 | SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \ | ||
14 | file://fix_name_conflict_group_member.patch" | ||
15 | |||
16 | DEPENDS = "cwautomacros-native" | ||
17 | |||
18 | inherit autotools | ||
19 | |||
20 | do_configure_prepend() { | ||
21 | OLD="@ACLOCAL_CWFLAGS@" | ||
22 | NEW="-I ${STAGING_DIR_NATIVE}/${datadir}/cwautomacros/m4" | ||
23 | sed -i "s#${OLD}#${NEW}#g" `grep -rl ${OLD} ${S}` | ||
24 | } | ||
25 | do_install_append() { | ||
26 | mv ${D}/${bindir}/which ${D}/${bindir}/which.${PN} | ||
27 | } | ||
28 | |||
29 | pkg_postinst_${PN}() { | ||
30 | if [ "${PN}" = "${BPN}" ] ; then | ||
31 | update-alternatives --install ${bindir}/which which which.${PN} 100 | ||
32 | fi | ||
33 | } | ||
34 | |||
35 | pkg_prerm_${PN}() { | ||
36 | if [ "${PN}" = "${BPN}" ] ; then | ||
37 | update-alternatives --remove which which.${PN} | ||
38 | fi | ||
39 | } | ||
40 | |||
diff --git a/meta/recipes-extended/which/which_2.20.bb b/meta/recipes-extended/which/which_2.20.bb new file mode 100644 index 0000000000..b7730de3b3 --- /dev/null +++ b/meta/recipes-extended/which/which_2.20.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | DESCRIPTION = "which - shows the full path of (shell) commands." | ||
2 | SECTION = "libs" | ||
3 | LICENSE = "GPLv3+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ | ||
5 | file://which.c;beginline=1;endline=17;md5=a9963693af2272e7a8df6f231164e7a2" | ||
6 | HOMEPAGE = "http://ftp.gnu.org/gnu/which/" | ||
7 | DEPENDS = "cwautomacros-native" | ||
8 | |||
9 | inherit autotools | ||
10 | |||
11 | PR = "r0" | ||
12 | |||
13 | SRC_URI = "http://ftp.gnu.org/gnu/which/which-${PV}.tar.gz \ | ||
14 | file://remove-declaration.patch" | ||
15 | |||
16 | do_configure_prepend() { | ||
17 | sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am | ||
18 | } | ||
19 | |||
20 | do_install() { | ||
21 | autotools_do_install | ||
22 | mv ${D}${bindir}/which ${D}${bindir}/which.${PN} | ||
23 | } | ||
24 | |||
25 | pkg_postinst_${PN} () { | ||
26 | if [ "${PN}" = "${BPN}" ] ; then | ||
27 | update-alternatives --install ${bindir}/which which which.${PN} 100 | ||
28 | fi | ||
29 | } | ||
30 | |||
31 | pkg_prerm_${PN} () { | ||
32 | if [ "${PN}" = "${BPN}" ] ; then | ||
33 | update-alternatives --remove which which.${PN} | ||
34 | fi | ||
35 | } | ||
diff --git a/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch b/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch new file mode 100644 index 0000000000..8602a88702 --- /dev/null +++ b/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch | |||
@@ -0,0 +1,84 @@ | |||
1 | From d588b6530e1382a624898b3f4307f636c72c80a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pierre Habouzit <madcoder@debian.org> | ||
3 | Date: Wed, 28 Nov 2007 10:13:08 +0100 | ||
4 | Subject: [PATCH] Disable services from inetd.conf if a service with the same id exists. | ||
5 | |||
6 | This way, if a service is enabled in /etc/xinetd* _and_ in | ||
7 | /etc/inetd.conf, the one (even if disabled) from /etc/xinetd* takes | ||
8 | precedence. | ||
9 | |||
10 | Signed-off-by: Pierre Habouzit <madcoder@debian.org> | ||
11 | --- | ||
12 | xinetd/inet.c | 22 +++++++++++++++++++--- | ||
13 | 1 files changed, 19 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/xinetd/inet.c b/xinetd/inet.c | ||
16 | index 1cb2ba2..8caab45 100644 | ||
17 | --- a/xinetd/inet.c | ||
18 | +++ b/xinetd/inet.c | ||
19 | @@ -23,6 +23,8 @@ | ||
20 | #include "parsesup.h" | ||
21 | #include "nvlists.h" | ||
22 | |||
23 | +static psi_h iter ; | ||
24 | + | ||
25 | static int get_next_inet_entry( int fd, pset_h sconfs, | ||
26 | struct service_config *defaults); | ||
27 | |||
28 | @@ -32,12 +34,15 @@ void parse_inet_conf_file( int fd, struct configuration *confp ) | ||
29 | struct service_config *default_config = CNF_DEFAULTS( confp ); | ||
30 | |||
31 | line_count = 0; | ||
32 | + iter = psi_create (sconfs); | ||
33 | |||
34 | for( ;; ) | ||
35 | { | ||
36 | if (get_next_inet_entry(fd, sconfs, default_config) == -2) | ||
37 | break; | ||
38 | } | ||
39 | + | ||
40 | + psi_destroy(iter); | ||
41 | } | ||
42 | |||
43 | static int get_next_inet_entry( int fd, pset_h sconfs, | ||
44 | @@ -46,7 +51,7 @@ static int get_next_inet_entry( int fd, pset_h sconfs, | ||
45 | char *p; | ||
46 | str_h strp; | ||
47 | char *line = next_line(fd); | ||
48 | - struct service_config *scp; | ||
49 | + struct service_config *scp, *tmp; | ||
50 | unsigned u, i; | ||
51 | const char *func = "get_next_inet_entry"; | ||
52 | char *name = NULL, *rpcvers = NULL, *rpcproto = NULL; | ||
53 | @@ -405,7 +410,16 @@ static int get_next_inet_entry( int fd, pset_h sconfs, | ||
54 | SC_SPECIFY( scp, A_SOCKET_TYPE ); | ||
55 | SC_SPECIFY( scp, A_WAIT ); | ||
56 | |||
57 | - if( ! pset_add(sconfs, scp) ) | ||
58 | + for ( tmp = SCP( psi_start( iter ) ) ; tmp ; tmp = SCP( psi_next(iter)) ){ | ||
59 | + if (EQ(SC_ID(scp), SC_ID(tmp))) { | ||
60 | + parsemsg(LOG_DEBUG, func, "removing duplicate service %s", SC_NAME(scp)); | ||
61 | + sc_free(scp); | ||
62 | + scp = NULL; | ||
63 | + break; | ||
64 | + } | ||
65 | + } | ||
66 | + | ||
67 | + if( scp && ! pset_add(sconfs, scp) ) | ||
68 | { | ||
69 | out_of_memory( func ); | ||
70 | pset_destroy(args); | ||
71 | @@ -414,7 +428,9 @@ static int get_next_inet_entry( int fd, pset_h sconfs, | ||
72 | } | ||
73 | |||
74 | pset_destroy(args); | ||
75 | - parsemsg( LOG_DEBUG, func, "added service %s", SC_NAME(scp)); | ||
76 | + if (scp) { | ||
77 | + parsemsg( LOG_DEBUG, func, "added service %s", SC_NAME(scp)); | ||
78 | + } | ||
79 | return 0; | ||
80 | } | ||
81 | |||
82 | -- | ||
83 | 1.5.3.6.2040.g15e6 | ||
84 | |||
diff --git a/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch b/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch new file mode 100644 index 0000000000..d243692769 --- /dev/null +++ b/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch | |||
@@ -0,0 +1,77 @@ | |||
1 | From a3410b0bc81ab03a889d9ffc14e351badf8372f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pierre Habouzit <madcoder@debian.org> | ||
3 | Date: Mon, 26 Nov 2007 16:02:04 +0100 | ||
4 | Subject: [PATCH] Various fixes from the previous maintainer. | ||
5 | |||
6 | --- | ||
7 | xinetd/child.c | 20 +++++++++++++++++--- | ||
8 | xinetd/service.c | 8 ++++---- | ||
9 | 2 files changed, 21 insertions(+), 7 deletions(-) | ||
10 | |||
11 | diff --git a/xinetd/child.c b/xinetd/child.c | ||
12 | index 89ee54c..48e9615 100644 | ||
13 | --- a/xinetd/child.c | ||
14 | +++ b/xinetd/child.c | ||
15 | @@ -284,6 +284,7 @@ void child_process( struct server *serp ) | ||
16 | connection_s *cp = SERVER_CONNECTION( serp ) ; | ||
17 | struct service_config *scp = SVC_CONF( sp ) ; | ||
18 | const char *func = "child_process" ; | ||
19 | + int fd, null_fd; | ||
20 | |||
21 | signal_default_state(); | ||
22 | |||
23 | @@ -296,9 +297,22 @@ void child_process( struct server *serp ) | ||
24 | signals_pending[0] = -1; | ||
25 | signals_pending[1] = -1; | ||
26 | |||
27 | - Sclose(0); | ||
28 | - Sclose(1); | ||
29 | - Sclose(2); | ||
30 | + if ( ( null_fd = open( "/dev/null", O_RDONLY ) ) == -1 ) | ||
31 | + { | ||
32 | + msg( LOG_ERR, func, "open('/dev/null') failed: %m") ; | ||
33 | + _exit( 1 ) ; | ||
34 | + } | ||
35 | + | ||
36 | + for ( fd = 0 ; fd <= MAX_PASS_FD ; fd++ ) | ||
37 | + { | ||
38 | + if ( fd != null_fd && dup2( null_fd, fd ) == -1 ) | ||
39 | + { | ||
40 | + msg( LOG_ERR, func, "dup2(%d, %d) failed: %m") ; | ||
41 | + _exit( 1 ) ; | ||
42 | + } | ||
43 | + } | ||
44 | + if ( null_fd > MAX_PASS_FD ) | ||
45 | + (void) Sclose( null_fd ) ; | ||
46 | |||
47 | |||
48 | #ifdef DEBUG_SERVER | ||
49 | diff --git a/xinetd/service.c b/xinetd/service.c | ||
50 | index 3d68d78..0132d6c 100644 | ||
51 | --- a/xinetd/service.c | ||
52 | +++ b/xinetd/service.c | ||
53 | @@ -745,8 +745,8 @@ static status_e failed_service(struct service *sp, | ||
54 | return FAILED; | ||
55 | |||
56 | if ( last == NULL ) { | ||
57 | - last = SAIN( calloc( 1, sizeof(union xsockaddr) ) ); | ||
58 | - SVC_LAST_DGRAM_ADDR(sp) = (union xsockaddr *)last; | ||
59 | + SVC_LAST_DGRAM_ADDR(sp) = SAIN( calloc( 1, sizeof(union xsockaddr) ) ); | ||
60 | + last = SAIN( SVC_LAST_DGRAM_ADDR(sp) ); | ||
61 | } | ||
62 | |||
63 | (void) time( ¤t_time ) ; | ||
64 | @@ -772,8 +772,8 @@ static status_e failed_service(struct service *sp, | ||
65 | return FAILED; | ||
66 | |||
67 | if( last == NULL ) { | ||
68 | - last = SAIN6(calloc( 1, sizeof(union xsockaddr) ) ); | ||
69 | - SVC_LAST_DGRAM_ADDR( sp ) = (union xsockaddr *)last; | ||
70 | + SVC_LAST_DGRAM_ADDR(sp) = SAIN6(calloc( 1, sizeof(union xsockaddr) ) ); | ||
71 | + last = SAIN6(SVC_LAST_DGRAM_ADDR(sp)); | ||
72 | } | ||
73 | |||
74 | (void) time( ¤t_time ) ; | ||
75 | -- | ||
76 | 1.5.3.6.2040.g15e6 | ||
77 | |||
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch b/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch new file mode 100644 index 0000000000..2b76fe3d41 --- /dev/null +++ b/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch | |||
@@ -0,0 +1,110 @@ | |||
1 | From f44b218ccc779ab3f4aed072390ccf129d94b58d Mon Sep 17 00:00:00 2001 | ||
2 | From: David Madore <david@pleiades.stars> | ||
3 | Date: Mon, 24 Mar 2008 12:45:36 +0100 | ||
4 | Subject: [PATCH] xinetd should be able to listen on IPv6 even in -inetd_compat mode | ||
5 | |||
6 | xinetd does not bind to IPv6 addresses (and does not seem to have an | ||
7 | option to do so) when used in -inetd_compat mode. As current inetd's | ||
8 | are IPv6-aware, this is a problem: this means xinetd cannot be used as | ||
9 | a drop-in inetd replacement. | ||
10 | |||
11 | The attached patch is a suggestion: it adds a -inetd_ipv6 global | ||
12 | option that, if used, causes inetd-compatibility lines to have an | ||
13 | implicit "IPv6" option. Perhaps this is not the best solution, but | ||
14 | there should definitely be a way to get inetd.conf to be read in | ||
15 | IPv6-aware mode. | ||
16 | --- | ||
17 | xinetd/confparse.c | 1 + | ||
18 | xinetd/inet.c | 17 +++++++++++++++++ | ||
19 | xinetd/options.c | 3 +++ | ||
20 | xinetd/xinetd.man | 6 ++++++ | ||
21 | 4 files changed, 27 insertions(+), 0 deletions(-) | ||
22 | |||
23 | diff --git a/xinetd/confparse.c b/xinetd/confparse.c | ||
24 | index db9f431..d7b0bcc 100644 | ||
25 | --- a/xinetd/confparse.c | ||
26 | +++ b/xinetd/confparse.c | ||
27 | @@ -40,6 +40,7 @@ | ||
28 | #include "inet.h" | ||
29 | #include "main.h" | ||
30 | |||
31 | +extern int inetd_ipv6; | ||
32 | extern int inetd_compat; | ||
33 | |||
34 | /* | ||
35 | diff --git a/xinetd/inet.c b/xinetd/inet.c | ||
36 | index 8caab45..2e617ae 100644 | ||
37 | --- a/xinetd/inet.c | ||
38 | +++ b/xinetd/inet.c | ||
39 | @@ -25,6 +25,8 @@ | ||
40 | |||
41 | static psi_h iter ; | ||
42 | |||
43 | +extern int inetd_ipv6; | ||
44 | + | ||
45 | static int get_next_inet_entry( int fd, pset_h sconfs, | ||
46 | struct service_config *defaults); | ||
47 | |||
48 | @@ -360,6 +362,21 @@ static int get_next_inet_entry( int fd, pset_h sconfs, | ||
49 | } | ||
50 | SC_SERVER_ARGV(scp)[u] = p; | ||
51 | } | ||
52 | + | ||
53 | + /* Set the IPv6 flag if we were passed the -inetd_ipv6 option */ | ||
54 | + if ( inetd_ipv6 ) | ||
55 | + { | ||
56 | + nvp = nv_find_value( service_flags, "IPv6" ); | ||
57 | + if ( nvp == NULL ) | ||
58 | + { | ||
59 | + parsemsg( LOG_WARNING, func, "inetd.conf - Bad foo %s", name ) ; | ||
60 | + pset_destroy(args); | ||
61 | + sc_free(scp); | ||
62 | + return -1; | ||
63 | + } | ||
64 | + M_SET(SC_XFLAGS(scp), nvp->value); | ||
65 | + } | ||
66 | + | ||
67 | /* Set the reuse flag, as this is the default for inetd */ | ||
68 | nvp = nv_find_value( service_flags, "REUSE" ); | ||
69 | if ( nvp == NULL ) | ||
70 | diff --git a/xinetd/options.c b/xinetd/options.c | ||
71 | index b058b6a..dc2f3a0 100644 | ||
72 | --- a/xinetd/options.c | ||
73 | +++ b/xinetd/options.c | ||
74 | @@ -30,6 +30,7 @@ int logprocs_option ; | ||
75 | unsigned logprocs_option_arg ; | ||
76 | int stayalive_option=0; | ||
77 | char *program_name ; | ||
78 | +int inetd_ipv6 = 0 ; | ||
79 | int inetd_compat = 0 ; | ||
80 | int dont_fork = 0; | ||
81 | |||
82 | @@ -128,6 +129,8 @@ int opt_recognize( int argc, char *argv[] ) | ||
83 | fprintf(stderr, "\n"); | ||
84 | exit(0); | ||
85 | } | ||
86 | + else if ( strcmp ( &argv[ arg ][ 1 ], "inetd_ipv6" ) == 0 ) | ||
87 | + inetd_ipv6 = 1; | ||
88 | else if ( strcmp ( &argv[ arg ][ 1 ], "inetd_compat" ) == 0 ) | ||
89 | inetd_compat = 1; | ||
90 | } | ||
91 | diff --git a/xinetd/xinetd.man b/xinetd/xinetd.man | ||
92 | index c76c3c6..c9dd803 100644 | ||
93 | --- a/xinetd/xinetd.man | ||
94 | +++ b/xinetd/xinetd.man | ||
95 | @@ -106,6 +106,12 @@ This option causes xinetd to read /etc/inetd.conf in addition to the | ||
96 | standard xinetd config files. /etc/inetd.conf is read after the | ||
97 | standard xinetd config files. | ||
98 | .TP | ||
99 | +.BI \-inetd_ipv6 | ||
100 | +This option causes xinetd to bind to IPv6 (AF_INET6) addresses for | ||
101 | +inetd compatibility lines (see previous option). This only affects | ||
102 | +how /etc/inetd.conf is interpreted and thus only has any effect if | ||
103 | +the \-inetd_compat option is also used. | ||
104 | +.TP | ||
105 | .BI \-cc " interval" | ||
106 | This option instructs | ||
107 | .B xinetd | ||
108 | -- | ||
109 | 1.5.5.rc0.127.gb4337 | ||
110 | |||
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.conf b/meta/recipes-extended/xinetd/xinetd/xinetd.conf new file mode 100644 index 0000000000..9e6ea2577e --- /dev/null +++ b/meta/recipes-extended/xinetd/xinetd/xinetd.conf | |||
@@ -0,0 +1,11 @@ | |||
1 | # Simple configuration file for xinetd | ||
2 | # | ||
3 | # Some defaults, and include /etc/xinetd.d/ | ||
4 | |||
5 | defaults | ||
6 | { | ||
7 | |||
8 | |||
9 | } | ||
10 | |||
11 | includedir /etc/xinetd.d | ||
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.init b/meta/recipes-extended/xinetd/xinetd/xinetd.init new file mode 100644 index 0000000000..26dbea7415 --- /dev/null +++ b/meta/recipes-extended/xinetd/xinetd/xinetd.init | |||
@@ -0,0 +1,57 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # /etc/init.d/xinetd -- script to start and stop xinetd. | ||
4 | |||
5 | if test -f /etc/default/xinetd; then | ||
6 | . /etc/default/xinetd | ||
7 | fi | ||
8 | |||
9 | |||
10 | test -x /usr/sbin/xinetd || exit 0 | ||
11 | |||
12 | checkportmap () { | ||
13 | if grep "^[^ *#]" /etc/xinetd.conf | grep -q 'rpc/'; then | ||
14 | if ! rpcinfo -u localhost portmapper >/dev/null 2>&1; then | ||
15 | echo | ||
16 | echo "WARNING: portmapper inactive - RPC services unavailable!" | ||
17 | echo " Commenting out or removing the RPC services from" | ||
18 | echo " the /etc/xinetd.conf file will remove this message." | ||
19 | echo | ||
20 | fi | ||
21 | fi | ||
22 | } | ||
23 | |||
24 | case "$1" in | ||
25 | start) | ||
26 | checkportmap | ||
27 | echo -n "Starting internet superserver: xinetd" | ||
28 | start-stop-daemon --start --quiet --background --exec /usr/sbin/xinetd -- -pidfile /var/run/xinetd.pid $XINETD_OPTS | ||
29 | echo "." | ||
30 | ;; | ||
31 | stop) | ||
32 | echo -n "Stopping internet superserver: xinetd" | ||
33 | start-stop-daemon --stop --signal 3 --quiet --exec /usr/sbin/xinetd | ||
34 | echo "." | ||
35 | ;; | ||
36 | reload) | ||
37 | echo -n "Reloading internet superserver configuration: xinetd" | ||
38 | start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd | ||
39 | echo "." | ||
40 | ;; | ||
41 | force-reload) | ||
42 | echo "$0 force-reload: Force Reload is deprecated" | ||
43 | echo -n "Forcefully reloading internet superserver configuration: xinetd" | ||
44 | start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd | ||
45 | echo "." | ||
46 | ;; | ||
47 | restart) | ||
48 | $0 stop | ||
49 | $0 start | ||
50 | ;; | ||
51 | *) | ||
52 | echo "Usage: /etc/init.d/xinetd {start|stop|reload|force-reload|restart}" | ||
53 | exit 1 | ||
54 | ;; | ||
55 | esac | ||
56 | |||
57 | exit 0 | ||
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.14.bb b/meta/recipes-extended/xinetd/xinetd_2.3.14.bb new file mode 100644 index 0000000000..122be2c18d --- /dev/null +++ b/meta/recipes-extended/xinetd/xinetd_2.3.14.bb | |||
@@ -0,0 +1,45 @@ | |||
1 | DESCRIPTION = "Highly configurable, modular and secure inetd" | ||
2 | HOMEPAGE = "http://www.xinetd.org" | ||
3 | |||
4 | # xinetd is a BSD-like license | ||
5 | LICENSE = "xinetd" | ||
6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8" | ||
7 | |||
8 | DEPENDS = "" | ||
9 | PR ="r0" | ||
10 | |||
11 | SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ | ||
12 | file://xinetd.init \ | ||
13 | file://xinetd.conf \ | ||
14 | file://Various-fixes-from-the-previous-maintainer.patch \ | ||
15 | file://Disable-services-from-inetd.conf-if-a-service-with-t.patch \ | ||
16 | file://xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch \ | ||
17 | " | ||
18 | |||
19 | inherit autotools update-rc.d | ||
20 | |||
21 | INITSCRIPT_NAME = "xinetd" | ||
22 | INITSCRIPT_PARAMS = "defaults" | ||
23 | |||
24 | EXTRA_OECONF="--disable-nls" | ||
25 | |||
26 | do_configure() { | ||
27 | # Looks like configure.in is broken, so we are skipping | ||
28 | # rebuilding configure and are just using the shipped one | ||
29 | oe_runconf | ||
30 | } | ||
31 | |||
32 | do_install() { | ||
33 | # Same here, the Makefile does some really stupid things, | ||
34 | # but since we only want two files why not override | ||
35 | # do_install from autotools and doing it ourselfs? | ||
36 | install -d "${D}/usr/sbin" | ||
37 | install -d "${D}/etc/init.d" | ||
38 | install -d "${D}/etc/xinetd.d" | ||
39 | install -m 644 "${WORKDIR}/xinetd.conf" "${D}/etc" | ||
40 | install -m 755 "${WORKDIR}/xinetd.init" "${D}/etc/init.d/xinetd" | ||
41 | install -m 755 "${S}/xinetd/xinetd" "${D}/usr/sbin" | ||
42 | install -m 755 "${S}/xinetd/itox" "${D}/usr/sbin" | ||
43 | } | ||
44 | |||
45 | CONFFILES_${PN} = "${sysconfdir}/xinetd.conf" | ||
diff --git a/meta/recipes-extended/xz/xz_4.999.9beta.bb b/meta/recipes-extended/xz/xz_4.999.9beta.bb new file mode 100644 index 0000000000..ca76182344 --- /dev/null +++ b/meta/recipes-extended/xz/xz_4.999.9beta.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | DESCRIPTION = "utils for managing LZMA compressed files" | ||
2 | HOMEPAGE = "http://tukaani.org/xz/" | ||
3 | SECTION = "base" | ||
4 | |||
5 | LICENSE = "GPLv2+ & GPLv3+ & LGPLv2.1+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \ | ||
7 | file://COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe \ | ||
8 | file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
9 | file://COPYING.LGPLv2.1;md5=fbc093901857fcd118f065f900982c24 \ | ||
10 | file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 " | ||
11 | |||
12 | SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz" | ||
13 | |||
14 | DEPENDS = "gettext" | ||
15 | |||
16 | PR = "r0" | ||
17 | |||
18 | inherit autotools | ||
19 | |||
20 | BBCLASSEXTEND = "native" | ||