diff options
author | 2008-01-20 08:52:14 +0000 | |
---|---|---|
committer | 2008-01-20 08:52:14 +0000 | |
commit | 3799f208b471160b3136bb1c57e51afa440bb3f7 (patch) | |
tree | 70ca1a08032e3904e952223bc688a22378dac082 | |
parent | Replacing LDFLAGS="-Wl,-z,relro" with LDFLAGS="-Wl,-O1". As pointed out by Mi... (diff) | |
download | phreak-3799f208b471160b3136bb1c57e51afa440bb3f7.tar.gz phreak-3799f208b471160b3136bb1c57e51afa440bb3f7.tar.bz2 phreak-3799f208b471160b3136bb1c57e51afa440bb3f7.zip |
Catalyst: Update the specs, remove unnecessary packages from the overlay (as they are in the tree).
svn path=/; revision=401
41 files changed, 78 insertions, 1174 deletions
diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/Manifest b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/Manifest deleted file mode 100644 index 3ef466e..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/Manifest +++ /dev/null @@ -1,45 +0,0 @@ -AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600 -MD5 d481354b916628f42634cebe8f10f464 files/crypto-loop.confd 412 -RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b files/crypto-loop.confd 412 -SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600 files/crypto-loop.confd 412 -AUX crypto-loop.initd 1658 RMD160 e3c33dee5da2747d6daf15590ff1422a42f7159c SHA1 37ac097ee38a349d503d28dda7b608c78c6ede54 SHA256 a5da900822b835dc2c54ed4152961f5802cb9cf7aac0a78afde893393af53624 -MD5 33e0a0784b1aa55939f0dca97fcd1010 files/crypto-loop.initd 1658 -RMD160 e3c33dee5da2747d6daf15590ff1422a42f7159c files/crypto-loop.initd 1658 -SHA256 a5da900822b835dc2c54ed4152961f5802cb9cf7aac0a78afde893393af53624 files/crypto-loop.initd 1658 -AUX util-linux-2.13-hwclock-rtc.patch 1844 RMD160 8960731d8d28779e2f6a135ba28405ba44f1e6b2 SHA1 645cbf9543fd6c1c4ae99d2fd667731614b1b606 SHA256 c74826d17422224b8bc0f88cab07b0e5d5f585868ba5603e1af672c2ecc62706 -MD5 c540d90bf39651e0e6038597245e0608 files/util-linux-2.13-hwclock-rtc.patch 1844 -RMD160 8960731d8d28779e2f6a135ba28405ba44f1e6b2 files/util-linux-2.13-hwclock-rtc.patch 1844 -SHA256 c74826d17422224b8bc0f88cab07b0e5d5f585868ba5603e1af672c2ecc62706 files/util-linux-2.13-hwclock-rtc.patch 1844 -AUX util-linux-2.13-ioprio-syscalls.patch 353 RMD160 a71a1423c1b6fa96320285d8a29fd1963c18d8d1 SHA1 bfc15114d82572e87e02486cf2d91d4ad82a3e57 SHA256 1f8cf8fb0da439072a423f1161ae401ea348c84e8b16811161ce3e46ef9d1aed -MD5 97f6c7f799cca0f0ee204cab47dc4ff0 files/util-linux-2.13-ioprio-syscalls.patch 353 -RMD160 a71a1423c1b6fa96320285d8a29fd1963c18d8d1 files/util-linux-2.13-ioprio-syscalls.patch 353 -SHA256 1f8cf8fb0da439072a423f1161ae401ea348c84e8b16811161ce3e46ef9d1aed files/util-linux-2.13-ioprio-syscalls.patch 353 -AUX util-linux-2.13-locale.patch 3028 RMD160 243732d4e353932908837a3b354e4b7486ed052f SHA1 0f1aec83d55d48112d4a9e954a3c64632e0cd9f3 SHA256 0de4bf7f4d9ae84f42ca656ccaadf814ff5f72325bcc3e687e7dbc7a5034a06f -MD5 2bc51f870c2b167290521010a077b797 files/util-linux-2.13-locale.patch 3028 -RMD160 243732d4e353932908837a3b354e4b7486ed052f files/util-linux-2.13-locale.patch 3028 -SHA256 0de4bf7f4d9ae84f42ca656ccaadf814ff5f72325bcc3e687e7dbc7a5034a06f files/util-linux-2.13-locale.patch 3028 -AUX util-linux-2.13-losetup-P.patch 409 RMD160 54d634f91acd0726038c26b0bfb7c784bf6e59e6 SHA1 7f4d5915fe003d25fc794cfe09a97f6449003a36 SHA256 f128a1e16b57904bd3937119d255b390ed256a4c13991cb13614176fb0c69700 -MD5 57027b9325b4d45672308ef4331c4f7a files/util-linux-2.13-losetup-P.patch 409 -RMD160 54d634f91acd0726038c26b0bfb7c784bf6e59e6 files/util-linux-2.13-losetup-P.patch 409 -SHA256 f128a1e16b57904bd3937119d255b390ed256a4c13991cb13614176fb0c69700 files/util-linux-2.13-losetup-P.patch 409 -AUX util-linux-2.13-script-SIGWINCH.patch 1338 RMD160 276f52d6f07dfa145eac7693d79531193a12d666 SHA1 4524f74d0ed8a7242667c3532e733fb9d8d4a23f SHA256 edf47e56e844a4af3efe643501ee5905be3957e3c76c97925df87bb61921e619 -MD5 4f5302b6506666bf3cda76a6d3f45929 files/util-linux-2.13-script-SIGWINCH.patch 1338 -RMD160 276f52d6f07dfa145eac7693d79531193a12d666 files/util-linux-2.13-script-SIGWINCH.patch 1338 -SHA256 edf47e56e844a4af3efe643501ee5905be3957e3c76c97925df87bb61921e619 files/util-linux-2.13-script-SIGWINCH.patch 1338 -AUX util-linux-2.13-setuid-checks.patch 1860 RMD160 9146bad2a5593424f52cea4615e4fe53cff60654 SHA1 c4da69c54a735c9fa717ef9c0dc07d11cd731181 SHA256 aec9802cace8538a77e006721b05bf50436b116f5e56d7468ca85ffc253d7e0a -MD5 a03d42a8a617b87e344735644a80ec5a files/util-linux-2.13-setuid-checks.patch 1860 -RMD160 9146bad2a5593424f52cea4615e4fe53cff60654 files/util-linux-2.13-setuid-checks.patch 1860 -SHA256 aec9802cace8538a77e006721b05bf50436b116f5e56d7468ca85ffc253d7e0a files/util-linux-2.13-setuid-checks.patch 1860 -AUX util-linux-2.13-uclibc.patch 1627 RMD160 3c52bac5b792c3ee6ccf69324729793314f279af SHA1 d85ad97b602daec290cc28858269ae4bcc0666f3 SHA256 7f0c5dcf91d3143c99006ada59ccb7842427933ad14e39c88bfaa7985d91a392 -MD5 69910b26908f68c1b5fddf52a91a7b7a files/util-linux-2.13-uclibc.patch 1627 -RMD160 3c52bac5b792c3ee6ccf69324729793314f279af files/util-linux-2.13-uclibc.patch 1627 -SHA256 7f0c5dcf91d3143c99006ada59ccb7842427933ad14e39c88bfaa7985d91a392 files/util-linux-2.13-uclibc.patch 1627 -DIST util-linux-ng-2.13-1.diff.bz2 40468 RMD160 defb0fa7abb39963d1d168c4fbf8352ceb2a916c SHA1 75aacfac824660fd7c2d7fa900394ef2d34a74e2 SHA256 6606666808f510cc8aeead408e14d3226b06219b0752ca3badea7acd154929cd -DIST util-linux-ng-2.13.tar.bz2 2702618 RMD160 499b1c5c2060b23d8bf504122a22122af99eb7fa SHA1 089638d9d3d57a22f80069f7f149b7521e689804 SHA256 002412e93d8e85b1796fdbe65bbb0a4d193d0317a7155fda4270667e08bdfbfc -EBUILD util-linux-2.13-r2.ebuild 2420 RMD160 cf497228d22b6f3f0c5a6b80a7824887de527172 SHA1 434720501c11f981ed2a22df866b3bce5095351f SHA256 b4433a9d0b237909f02dcb5a1e0bd5acc5fc06ae2234176e2f221db2567e891e -MD5 2ea8f28bf33b9c6da7fe376b2823f652 util-linux-2.13-r2.ebuild 2420 -RMD160 cf497228d22b6f3f0c5a6b80a7824887de527172 util-linux-2.13-r2.ebuild 2420 -SHA256 b4433a9d0b237909f02dcb5a1e0bd5acc5fc06ae2234176e2f221db2567e891e util-linux-2.13-r2.ebuild 2420 -MD5 4186a662d6ee50db80a1c9cf2dd171a9 files/digest-util-linux-2.13-r2 527 -RMD160 20a4700f7250f9138eb296421bc58acf852a30e8 files/digest-util-linux-2.13-r2 527 -SHA256 23cad3dd4dad96298070df7d75f7a574c279618378f393c2a85c7af8a9014c82 files/digest-util-linux-2.13-r2 527 diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/crypto-loop.confd b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/crypto-loop.confd deleted file mode 100644 index 6a88434..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/crypto-loop.confd +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/conf.d/crypto-loop: Configuration file for /etc/init.d/crypto-loop - -# More info can be found in the init.d script - -# Specify loopback configurations here. The format of this file is -# shown in the following commented-out example. One line per loopback -# configuration. For possible hash values, see `man hashalot`. - -# loop=/dev/loop0 hash='' cipher=serpent keysize=256 device=/dev/system/test other='' diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/crypto-loop.initd b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/crypto-loop.initd deleted file mode 100755 index 21e0ef9..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/crypto-loop.initd +++ /dev/null @@ -1,65 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.2 2007/10/05 23:26:57 vapier Exp $ - -depend() { - need checkroot modules - before localmount -} - -start() { - local status="0" - - ebegin "Starting crypto loop devices" - - if [[ -e /etc/conf.d/crypto-loop ]] ; then - egrep "^loop" /etc/conf.d/crypto-loop | \ - while read loopline ; do - eval ${loopline} - - local configured=$(awk -v MOUNT="${device}" \ - '($2 == MOUNT) { print "yes" }' /proc/mounts) - - if [[ ${configured} != "yes" ]] ; then - einfo " Loop ${loop} on device ${device} (cipher ${cipher}, key size ${keysize}): " - - if [[ -n ${hash} ]] ; then - /usr/sbin/hashalot -n ${keysize} ${hash} </dev/tty|\ - /sbin/losetup -p 0 -e ${cipher}-${keysize} ${loop} ${device} ${other} - else - /sbin/losetup -e ${cipher}-${keysize} ${loop} ${device} ${other} - fi - - if [[ $? -ne 0 ]] ; then - ewarn "Failure configuring ${loop}. Skipping." - status=1 - fi - else - ewarn " Loop ${loop} on device ${device} are already configured" - fi - done - fi - ewend ${status} "Failed to start some loop devices." - - # We do not fail if some loop devices did not start ... - return 0 -} - -stop() { - local status="0" - for loop in $(ls /dev/loop[0-9]) ; do - losetup ${loop} &> /dev/null - if [[ $? == 0 ]] ; then - umount ${loop} &>/dev/null || swapoff "${loop}" &>/dev/null - if ! /sbin/losetup -d ${loop} &> /dev/null ; then - ewarn "Failure deconfiguring ${loop}." - status=1 - fi - fi - done - ewend ${status} -} - - -# vim:ts=4 diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/digest-util-linux-2.13-r2 b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/digest-util-linux-2.13-r2 deleted file mode 100644 index 35f8c62..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/digest-util-linux-2.13-r2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 601caadc3248fcd6b5911fc6339451e9 util-linux-ng-2.13-1.diff.bz2 40468 -RMD160 defb0fa7abb39963d1d168c4fbf8352ceb2a916c util-linux-ng-2.13-1.diff.bz2 40468 -SHA256 6606666808f510cc8aeead408e14d3226b06219b0752ca3badea7acd154929cd util-linux-ng-2.13-1.diff.bz2 40468 -MD5 2175a6e64ba0cf8ff05402eaee33e4b0 util-linux-ng-2.13.tar.bz2 2702618 -RMD160 499b1c5c2060b23d8bf504122a22122af99eb7fa util-linux-ng-2.13.tar.bz2 2702618 -SHA256 002412e93d8e85b1796fdbe65bbb0a4d193d0317a7155fda4270667e08bdfbfc util-linux-ng-2.13.tar.bz2 2702618 diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-hwclock-rtc.patch b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-hwclock-rtc.patch deleted file mode 100644 index b62433c..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-hwclock-rtc.patch +++ /dev/null @@ -1,74 +0,0 @@ -http://bugs.gentoo.org/179780 - -From: Matthias Koenig <mkoenig@suse.de> -Date: Thu, 20 Sep 2007 09:11:18 +0000 (+0200) -Subject: hwclock: fix --rtc option -X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=5d1f6bae3b298809ecd63b3e55f6ab30caaa4dbf - -hwclock: fix --rtc option - -The --rtc option does not set the name of the device correctly. -It still uses /dev/rtc even if the --rtc option is given. - -Testcase: -$ mv /dev/rtc /dev/foo -$ hwclock --show --debug --rtc=/dev/foo -hwclock from util-linux-2.13-rc2 -Using /dev interface to clock. -Last drift adjustment done at 1190198135 seconds after 1969 -Last calibration done at 1190198135 seconds after 1969 -Hardware clock is on local time -Assuming hardware clock is kept in local time. -Waiting for clock tick... -hwclock: open() of /dev/rtc failed, errno=2: No such file or directory. -...got clock tick - -Co-Author: Karel Zak <kzak@redhat.com> -Signed-off-by: Matthias Koenig <mkoenig@suse.de> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - -diff --git a/hwclock/rtc.c b/hwclock/rtc.c -index f8e626e..724daf9 100644 ---- a/hwclock/rtc.c -+++ b/hwclock/rtc.c -@@ -104,24 +104,21 @@ open_rtc(void) { - "/dev/misc/rtc", - NULL - }; -- char **p = fls; -- char *fname = rtc_dev_name ? : *p; -- -- do { -- int fd = open(fname, O_RDONLY); -- -- if (fd < 0 && errno == ENOENT) { -- if (fname == rtc_dev_name) -- break; -- fname = *++p; -- } else { -- rtc_dev_name = *p; -- return fd; -- } -- } while(fname); -- -- if (!rtc_dev_name) -- rtc_dev_name = *fls; -+ char **p; -+ -+ /* --rtc option has been given */ -+ if (rtc_dev_name) -+ return open(rtc_dev_name, O_RDONLY); -+ -+ for (p=fls; *p; ++p) { -+ int fd = open(*p, O_RDONLY); -+ -+ if (fd < 0 && errno == ENOENT) -+ continue; -+ rtc_dev_name = *p; -+ return fd; -+ } -+ rtc_dev_name = *fls; /* default */ - return -1; - } - diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-ioprio-syscalls.patch b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-ioprio-syscalls.patch deleted file mode 100644 index f558ff6..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-ioprio-syscalls.patch +++ /dev/null @@ -1,16 +0,0 @@ -Just stub this cruft for crappy arches - -http://bugs.gentoo.org/190613 - ---- schedutils/ionice.c -+++ schedutils/ionice.c -@@ -39,7 +39,8 @@ - # define __NR_ioprio_set 196 - # define __NR_ioprio_get 218 - # else --# error "Unsupported arch" -+# define __NR_ioprio_set -1 -+# define __NR_ioprio_get -1 - # endif - - # define SYS_ioprio_get __NR_ioprio_get diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-locale.patch b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-locale.patch deleted file mode 100644 index feb46f9..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-locale.patch +++ /dev/null @@ -1,121 +0,0 @@ -http://bugs.gentoo.org/191111 -http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/614 - -Move all locale/nls related includes to nls.h and make sure they are only -pulled in when ENABLE_NLS. When !ENABLE_NLS, don't include any locale/nls -related headers and stub out setlocale() as well. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - include/nls.h | 5 ++++- - misc-utils/cal.c | 1 - - misc-utils/look.c | 1 - - misc-utils/write.c | 1 - - text-utils/colrm.c | 2 +- - text-utils/more.c | 1 - - text-utils/pg.c | 2 -- - 7 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/include/nls.h b/include/nls.h -index f571ca5..e9f7927 100644 ---- a/include/nls.h -+++ b/include/nls.h -@@ -9,6 +9,8 @@ int main(int argc, char *argv[]); - - #ifdef ENABLE_NLS - # include <libintl.h> -+# include <locale.h> -+# include <nl_types.h> - # define _(Text) gettext (Text) - # ifdef gettext_noop - # define N_(String) gettext_noop (String) -@@ -16,9 +18,10 @@ int main(int argc, char *argv[]); - # define N_(String) (String) - # endif - #else --# include <locale.h> - # undef bindtextdomain - # define bindtextdomain(Domain, Directory) /* empty */ -+# undef setlocale -+# define setlocale(Category, Locale) /* empty */ - # undef textdomain - # define textdomain(Domain) /* empty */ - # define _(Text) (Text) -diff --git a/misc-utils/cal.c b/misc-utils/cal.c -index f5ede93..77333d8 100644 ---- a/misc-utils/cal.c -+++ b/misc-utils/cal.c -@@ -63,7 +63,6 @@ - #include <string.h> - #include <time.h> - #include <unistd.h> --#include <locale.h> - #include "errs.h" - #include "nls.h" - -diff --git a/misc-utils/look.c b/misc-utils/look.c -index 5c7e30c..9e25596 100644 ---- a/misc-utils/look.c -+++ b/misc-utils/look.c -@@ -59,7 +59,6 @@ - #include <strings.h> - #include <ctype.h> - #include <getopt.h> --#include <locale.h> - #include "pathnames.h" - #include "nls.h" - -diff --git a/misc-utils/write.c b/misc-utils/write.c -index b3c96d1..46b8f0a 100644 ---- a/misc-utils/write.c -+++ b/misc-utils/write.c -@@ -54,7 +54,6 @@ - #include <pwd.h> - #include <string.h> - #include <stdlib.h> --#include <locale.h> - #include <signal.h> - #include <sys/param.h> - #include <sys/signal.h> -diff --git a/text-utils/colrm.c b/text-utils/colrm.c -index 5e18a6f..e8b1ea4 100644 ---- a/text-utils/colrm.c -+++ b/text-utils/colrm.c -@@ -40,8 +40,8 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <locale.h> - -+#include "nls.h" - #include "widechar.h" - - /* -diff --git a/text-utils/more.c b/text-utils/more.c -index 19c4417..5dcae7b 100644 ---- a/text-utils/more.c -+++ b/text-utils/more.c -@@ -55,7 +55,6 @@ - #include <sys/file.h> - #include <sys/wait.h> - #include <a.out.h> --#include <locale.h> - #include "xstrncpy.h" - #include "nls.h" - #include "widechar.h" -diff --git a/text-utils/pg.c b/text-utils/pg.c -index 10bdd15..3e1b25e 100644 ---- a/text-utils/pg.c -+++ b/text-utils/pg.c -@@ -49,8 +49,6 @@ - #include <unistd.h> - #include <signal.h> - #include <setjmp.h> --#include <locale.h> --#include <nl_types.h> - #include <libgen.h> - - #ifdef HAVE_NCURSES_H --- -1.5.3.rc7 - diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-losetup-P.patch b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-losetup-P.patch deleted file mode 100644 index 65ac030..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-losetup-P.patch +++ /dev/null @@ -1,15 +0,0 @@ -loop-aes patch forgets to include -P in getopt call - -http://bugs.gentoo.org/201981 - ---- mount/lomount.c -+++ mount/lomount.c -@@ -1249,7 +1249,7 @@ - - delete = 0; - progname = argv[0]; -- while ((c = getopt(argc,argv,"aC:de:FG:H:I:K:o:p:rRs:S:Tv")) != -1) { -+ while ((c = getopt(argc,argv,"aC:de:FG:H:I:K:o:p:rRs:S:TvP:")) != -1) { - switch (c) { - case 'a': /* show status of all loops */ - option_a = 1; diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-script-SIGWINCH.patch b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-script-SIGWINCH.patch deleted file mode 100644 index e8ed571..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-script-SIGWINCH.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 2b8bbb5fb0f024ea3917fedbbbaf0fab1c1f6555 -Author: Karel Zak <kzak@redhat.com> -Date: Fri Oct 5 12:22:13 2007 +0200 - - script: dies on SIGWINCH - - The "doinput" process doesn't make a difference between SIGWINCH and - SIGCHILD. This process also sends unnecessary SIGWINCH to child (the - signal is ignored by child). Fixed. - - Signed-off-by: Karel Zak <kzak@redhat.com> - -diff --git a/misc-utils/script.c b/misc-utils/script.c -index d3272df..3b957d8 100644 ---- a/misc-utils/script.c -+++ b/misc-utils/script.c -@@ -99,6 +99,7 @@ int tflg = 0; - static char *progname; - - int die; -+int resized; - - static void - die_if_link(char *fn) { -@@ -235,8 +236,14 @@ doinput() { - if (die == 0 && child && kill(child, 0) == -1 && errno == ESRCH) - die = 1; - -- while (die == 0 && (cc = read(0, ibuf, BUFSIZ)) > 0) -- (void) write(master, ibuf, cc); -+ while (die == 0) { -+ if ((cc = read(0, ibuf, BUFSIZ)) > 0) -+ (void) write(master, ibuf, cc); -+ else if (cc == -1 && errno == EINTR && resized) -+ resized = 0; -+ else -+ break; -+ } - - done(); - } -@@ -255,11 +262,10 @@ finish(int dummy) { - - void - resize(int dummy) { -+ resized = 1; - /* transmit window change information to the child */ - (void) ioctl(0, TIOCGWINSZ, (char *)&win); - (void) ioctl(slave, TIOCSWINSZ, (char *)&win); -- -- kill(child, SIGWINCH); - } - - /* - - diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-setuid-checks.patch b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-setuid-checks.patch deleted file mode 100644 index a3758dd..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-setuid-checks.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Ludwig Nussel <ludwig.nussel@suse.de> -Date: Thu, 20 Sep 2007 12:57:20 +0000 (+0200) -Subject: mount: doesn't drop privileges properly when calling helpers -X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=ebbeb2c7ac1b00b6083905957837a271e80b187e - -mount: doesn't drop privileges properly when calling helpers - -{,u}mount calls setuid() and setgid() in the wrong order and doesn't checking -the return value of set{u,g}id(() when running helpers like mount.nfs. - -Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - -diff --git a/mount/mount.c b/mount/mount.c -index 40699f3..5bc2b30 100644 ---- a/mount/mount.c -+++ b/mount/mount.c -@@ -634,8 +634,12 @@ check_special_mountprog(const char *spec, const char *node, const char *type, in - char *oo, *mountargs[10]; - int i = 0; - -- setuid(getuid()); -- setgid(getgid()); -+ if(setgid(getgid()) < 0) -+ die(EX_FAIL, _("mount: cannot set group id: %s"), strerror(errno)); -+ -+ if(setuid(getuid()) < 0) -+ die(EX_FAIL, _("mount: cannot set user id: %s"), strerror(errno)); -+ - oo = fix_opts_string (flags, extra_opts, NULL); - mountargs[i++] = mountprog; /* 1 */ - mountargs[i++] = (char *) spec; /* 2 */ -diff --git a/mount/umount.c b/mount/umount.c -index b3100c9..3221619 100644 ---- a/mount/umount.c -+++ b/mount/umount.c -@@ -102,8 +102,12 @@ check_special_umountprog(const char *spec, const char *node, - char *umountargs[8]; - int i = 0; - -- setuid(getuid()); -- setgid(getgid()); -+ if(setgid(getgid()) < 0) -+ die(EX_FAIL, _("umount: cannot set group id: %s"), strerror(errno)); -+ -+ if(setuid(getuid()) < 0) -+ die(EX_FAIL, _("umount: cannot set user id: %s"), strerror(errno)); -+ - umountargs[i++] = umountprog; - umountargs[i++] = xstrdup(node); - if (nomtab) diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-uclibc.patch b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-uclibc.patch deleted file mode 100644 index 237e126..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/files/util-linux-2.13-uclibc.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- login-utils/agetty.c -+++ login-utils/agetty.c -@@ -884,7 +884,7 @@ - - case 'o': - { -- char domainname[HOST_NAME_MAX+1]; -+ char domainname[HOSTNAME_LENGTH+1]; - #ifdef HAVE_GETDOMAINNAME - if (getdomainname(domainname, sizeof(domainname))) - #endif -@@ -897,7 +897,7 @@ - case 'O': - { - char *dom = "unknown_domain"; -- char host[HOST_NAME_MAX + 1]; -+ char host[HOSTNAME_LENGTH + 1]; - struct addrinfo hints, *info = NULL; - - memset(&hints, 0, sizeof(hints)); -@@ -992,7 +992,7 @@ - } - #endif - { -- char hn[HOST_NAME_MAX+1]; -+ char hn[HOSTNAME_LENGTH+1]; - if (gethostname(hn, sizeof(hn)) == 0) - write(1, hn, strlen(hn)); - } ---- configure -+++ configure -@@ -7663,7 +7663,10 @@ - main () - { - --int test = SYS_sched_getaffinity; -+#if defined(__UCLIBC__) && __UCLIBC_SUBLEVEL__ <= 28 -+#error taskset unusable -+#endif -+int test = SYS_sched_getaffinity; - - ; - return 0; ---- sys-utils/setarch.c -+++ sys-utils/setarch.c -@@ -39,6 +39,10 @@ - #include <sys/utsname.h> - #include "nls.h" - -+#if defined(__UCLIBC__) && __UCLIBC_SUBLEVEL__ <= 28 -+static const char *program_invocation_short_name; -+#endif -+ - #define set_pers(pers) ((long)syscall(SYS_personality, pers)) - - struct { -@@ -184,6 +188,14 @@ - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - -+#if defined(__UCLIBC__) && __UCLIBC_SUBLEVEL__ <= 28 -+ program_invocation_short_name = strrchr(argv[0],'/'); -+ if (program_invocation_short_name) -+ program_invocation_short_name++; -+ else -+ program_invocation_short_name = argv[0]; -+#endif -+ - if (argc < 1) - show_usage(_("Not enough arguments")); - diff --git a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/util-linux-2.13-r2.ebuild b/catalyst/portage_overlay/uclibc/sys-apps/util-linux/util-linux-2.13-r2.ebuild deleted file mode 100644 index 0f2981a..0000000 --- a/catalyst/portage_overlay/uclibc/sys-apps/util-linux/util-linux-2.13-r2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13-r2.ebuild,v 1.10 2008/01/12 10:50:31 vapier Exp $ - -EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" -inherit eutils -[[ ${PV} == "9999" ]] && inherit git - -MY_PV=${PV/_/-} -MY_P=${PN}-ng-${MY_PV} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/" -if [[ ${PV} == "9999" ]] ; then - SRC_URI="" -else - SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2 - crypt? ( http://loop-aes.sourceforge.net/updates/${MY_P}-1.diff.bz2 )" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="crypt nls old-linux selinux" - -RDEPEND="!sys-process/schedutils - !sys-apps/setarch - >=sys-libs/ncurses-5.2-r2 - >=sys-fs/e2fsprogs-1.34 - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/os-headers" - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git_src_unpack - cd "${S}" - ./autogen.sh || die - else - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-uclibc.patch #203711 - epatch "${FILESDIR}"/${P}-locale.patch #191111 - epatch "${FILESDIR}"/${P}-ioprio-syscalls.patch #190613 - epatch "${FILESDIR}"/${P}-setuid-checks.patch - epatch "${FILESDIR}"/${P}-script-SIGWINCH.patch #191452 - use crypt && epatch "${WORKDIR}"/${MY_P}-1.diff - sed -i '/#include <asm\/page.h>/d' mount/swapon.c || die - fi -} - -src_compile() { - export localedir="/usr/share/locale" #190895 - econf \ - --with-fsprobe=blkid \ - $(use_enable nls) \ - --enable-agetty \ - --enable-cramfs \ - $(use_enable old-linux elvtune) \ - --disable-init \ - --disable-kill \ - --disable-last \ - --disable-mesg \ - --enable-partx \ - --enable-raw \ - --enable-rdev \ - --enable-rename \ - --disable-reset \ - --disable-login-utils \ - --enable-schedutils \ - --disable-wall \ - --enable-write \ - --without-pam \ - $(use_with selinux) \ - || die "configure failed" - emake || die "emake failed" -} - -src_install() { - emake install DESTDIR="${D}" || die "install failed" - dodoc AUTHORS NEWS README* TODO docs/* - - if use crypt ; then - newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die - newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die - fi -} diff --git a/catalyst/portage_overlay/uclibc/sys-libs/uclibc/Manifest b/catalyst/portage_overlay/uclibc/sys-libs/uclibc/Manifest deleted file mode 100644 index 45aefa0..0000000 --- a/catalyst/portage_overlay/uclibc/sys-libs/uclibc/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -DIST uClibc-0.9.28.3-patches-1.2.tar.bz2 17096 RMD160 f7ab3b4ff648c6c39edd53145bd95678b1d38093 SHA1 be59a9ebb2f14a1e26c9241282b0e1f0d095e6d6 SHA256 cbcf7d5e2923335d4123bc713357a236329c1bb58bb3acb0d11e63c517c6d0d7 -DIST uClibc-0.9.28.3.tar.bz2 1795383 RMD160 61591281f4193d4dcd0fa3252fb3286028d4cb63 SHA1 77c5220697a1772d0d9da4bda0d866e4f4b68540 SHA256 1d86d5dad6060e7057cfe023ffc7b7661bdc7fe95112b37447851c0a75b547a1 -DIST uClibc-locale-030818.tgz 236073 RMD160 8e3f4b20b94e07e535cbbbe81287186014c5f151 SHA1 78f901e6ed228ed84106bd034c1b97eee1eecb50 SHA256 c4362be318a38f18d98dccf462d22d95bab92f05548bb93f65298fe9afaebd57 -EBUILD uclibc-0.9.28.3-r2.ebuild 14471 RMD160 c5f99d3a19b9df8bdf835031aa4cf823a00033a5 SHA1 a1cb9ed59823141dd6c414583af435d4d9ff60a1 SHA256 b5f932940edaeb545d3ba00e3b496da216ffb92a7f0e2d1ae84b959a0722d999 -MD5 0e966b201e2e578aee8d963c44a3e026 uclibc-0.9.28.3-r2.ebuild 14471 -RMD160 c5f99d3a19b9df8bdf835031aa4cf823a00033a5 uclibc-0.9.28.3-r2.ebuild 14471 -SHA256 b5f932940edaeb545d3ba00e3b496da216ffb92a7f0e2d1ae84b959a0722d999 uclibc-0.9.28.3-r2.ebuild 14471 -MD5 8c6979345d70c3acc8b7ccb3388a2ddc files/digest-uclibc-0.9.28.3-r2 720 -RMD160 481c12e16c24708de9b29598c3c4b9a5b9c59cae files/digest-uclibc-0.9.28.3-r2 720 -SHA256 0889bcd1b069110bd6008df309bd4139a9dde5ff4b185d5155792d66c334eda5 files/digest-uclibc-0.9.28.3-r2 720 diff --git a/catalyst/portage_overlay/uclibc/sys-libs/uclibc/files/digest-uclibc-0.9.28.3-r2 b/catalyst/portage_overlay/uclibc/sys-libs/uclibc/files/digest-uclibc-0.9.28.3-r2 deleted file mode 100644 index 2b7a1e8..0000000 --- a/catalyst/portage_overlay/uclibc/sys-libs/uclibc/files/digest-uclibc-0.9.28.3-r2 +++ /dev/null @@ -1,8 +0,0 @@ -MD5 08d3756a07c00298b6a639c3b0f1ce0c uClibc-0.9.28.3-patches-1.2.tar.bz2 17096 -RMD160 f7ab3b4ff648c6c39edd53145bd95678b1d38093 uClibc-0.9.28.3-patches-1.2.tar.bz2 17096 -SHA256 cbcf7d5e2923335d4123bc713357a236329c1bb58bb3acb0d11e63c517c6d0d7 uClibc-0.9.28.3-patches-1.2.tar.bz2 17096 -MD5 428405a36b4662980d9343b32089b5a6 uClibc-0.9.28.3.tar.bz2 1795383 -RMD160 61591281f4193d4dcd0fa3252fb3286028d4cb63 uClibc-0.9.28.3.tar.bz2 1795383 -SHA256 1d86d5dad6060e7057cfe023ffc7b7661bdc7fe95112b37447851c0a75b547a1 uClibc-0.9.28.3.tar.bz2 1795383 -RMD160 8e3f4b20b94e07e535cbbbe81287186014c5f151 uClibc-locale-030818.tgz 236073 -SHA256 c4362be318a38f18d98dccf462d22d95bab92f05548bb93f65298fe9afaebd57 uClibc-locale-030818.tgz 236073 diff --git a/catalyst/portage_overlay/uclibc/sys-libs/uclibc/uclibc-0.9.28.3-r2.ebuild b/catalyst/portage_overlay/uclibc/sys-libs/uclibc/uclibc-0.9.28.3-r2.ebuild deleted file mode 100644 index 6938160..0000000 --- a/catalyst/portage_overlay/uclibc/sys-libs/uclibc/uclibc-0.9.28.3-r2.ebuild +++ /dev/null @@ -1,459 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r2.ebuild,v 1.1 2008/01/01 23:28:54 solar Exp $ - -#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" -#inherit subversion -inherit eutils flag-o-matic toolchain-funcs - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -# Handle the case where we want uclibc on glibc ... -if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc ]] ; then - export UCLIBC_AND_GLIBC="sitting in a tree" - export CTARGET=${CHOST%%-*}-pc-linux-uclibc -fi - -MY_P=uClibc-${PV} -SVN_VER="" -PATCH_VER="1.2" -DESCRIPTION="C library for developing embedded Linux systems" -HOMEPAGE="http://www.uclibc.org/" -SRC_URI="mirror://kernel/linux/libs/uclibc/${MY_P}.tar.bz2 - http://uclibc.org/downloads/${MY_P}.tar.bz2 - nls? ( !userlocales? ( pregen? ( - x86? ( http://www.uclibc.org/downloads/uClibc-locale-030818.tgz ) - ) ) )" -[[ -z ${SVN_VER} ]] || \ - SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-svn-update-${SVN_VER}.patch.bz2" -[[ -z ${PATCH_VER} ]] || \ - SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2" - -LICENSE="LGPL-2" -[[ ${CTARGET} != ${CHOST} ]] \ - && SLOT="${CTARGET}" \ - || SLOT="0" -KEYWORDS="-* ~arm ~m68k -mips ~ppc ~sh ~sparc ~x86" -IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen savedconfig userlocales wordexp" -RESTRICT="strip" - -RDEPEND="" -if [[ ${CTARGET} == ${CHOST} ]] ; then - DEPEND="virtual/os-headers app-misc/pax-utils" - PROVIDE="virtual/libc" -else - DEPEND="" -fi - -S=${WORKDIR}/${MY_P} - -alt_build_kprefix() { - if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \ - || [[ -n ${UCLIBC_AND_GLIBC} ]] - then - echo /usr - else - echo /usr/${CTARGET}/usr - fi -} -just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] -} - -uclibc_endian() { - # XXX: this wont work for a toolchain which is bi-endian, but we - # dont have any such thing at the moment, so not a big deal - touch "${T}"/endian.s - $(tc-getAS) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "big";; - *" LSB "*) echo "little";; - *) echo "NFC";; - esac - rm -f "${T}"/endian.{s,o} -} - -pkg_setup() { - just_headers && return 0 - has_version ${CATEGORY}/uclibc || return 0 - [[ -n ${UCLIBC_AND_GLIBC} ]] && return 0 - [[ ${ROOT} != "/" ]] && return 0 - [[ ${CATEGORY} == cross-* ]] && return 0 - - if ! built_with_use --missing false ${CATEGORY}/uclibc nls && use nls && ! use pregen ; then - eerror "You previously built uclibc with USE=-nls." - eerror "You cannot generate locale data with this" - eerror "system. Please rerun emerge with USE=pregen." - die "host cannot support locales" - elif built_with_use --missing false ${CATEGORY}/uclibc nls && ! use nls ; then - eerror "You previously built uclibc with USE=nls." - eerror "Rebuilding uClibc with USE=-nls will prob" - eerror "destroy your system." - die "switching from nls is baaaad" - fi -} - -PIE_STABLE="arm mips ppc x86" - -CPU_ALPHA="" -CPU_AMD64="" -CPU_ARM="GENERIC_ARM ARM{610,710,720T,920T,922T,926T,_{SA110,SA1100,XSCALE}}" -CPU_IA64="" -CPU_M68K="" -CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32,64}}" -CPU_PPC="" -CPU_SH="SH{2,3,4,5}" -CPU_SPARC="" -CPU_X86="GENERIC_386 {3,4,5,6}86 586MMX PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH" -IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPARC} ${CPU_X86}" - -check_cpu_opts() { - local cpu_var="CPU_$(echo $(tc-arch) | tr [a-z] [A-Z])" - [[ -z ${!cpu_var} ]] && return 0 - - if [[ -z ${UCLIBC_CPU} ]] ; then - ewarn "You really should consider setting UCLIBC_CPU" - ewarn "Otherwise, the build will be generic (read: slow)." - ewarn "Available CPU options:" - UCLIBC_CPU=$(eval echo ${!cpu_var}) - echo ${UCLIBC_CPU} - case ${CTARGET} in - mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";; - sh[2345]*) export UCLIBC_CPU="SH${CTARGET:2:1}";; - i[456]86*) export UCLIBC_CPU="${CTARGET:1:1}86";; - *) export UCLIBC_CPU=${UCLIBC_CPU%% *};; - esac - else - local cpu found=0 - for cpu in $(eval echo ${!cpu_var}) ; do - [[ ${UCLIBC_CPU} == "${cpu}" ]] && found=1 && break - done - if [[ ${found} -eq 0 ]] ; then - ewarn "UCLIBC_CPU choice '${UCLIBC_CPU}' not supported" - ewarn "Valid choices:" - eval echo ${!cpu_var} - die "pick a supported cpu type" - fi - fi -} - -src_unpack() { - [[ -n ${ESVN_REPO_URI} ]] \ - && subversion_src_unpack \ - || unpack ${A} - cd "${S}" - - check_cpu_opts - - echo - einfo "Runtime Prefix: /" - einfo "Devel Prefix: /usr" - einfo "Kernel Prefix: $(alt_build_kprefix)" - einfo "CBUILD: ${CBUILD}" - einfo "CHOST: ${CHOST}" - einfo "CTARGET: ${CTARGET}" - einfo "CPU: ${UCLIBC_CPU:-default}" - einfo "ENDIAN: $(uclibc_endian)" - echo - - ########## PATCHES ########## - - [[ -n ${SVN_VER} ]] && \ - epatch "${WORKDIR}"/${MY_P}-cvs-update-${SVN_VER}.patch - - if [[ -n ${PATCH_VER} ]] ; then - unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2 - EPATCH_SUFFIX="patch" - epatch "${WORKDIR}"/patch - # math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f) - cp "${WORKDIR}"/patch/math/libm/* "${S}"/libm/ || die - epatch "${WORKDIR}"/patch/math - fi - - ########## CPU SELECTION ########## - - local target config_target - case $(tc-arch) in - alpha) target="alpha"; config_target="no cpu-specific options";; - amd64) target="x86_64"; config_target="no cpu-specific options";; - arm) target="arm"; config_target="GENERIC_ARM";; - ia64) target="ia64"; config_target="no cpu-specific options";; - m68k) target="m68k"; config_target="no cpu-specific options";; - mips) target="mips"; config_target="MIPS_ISA_1";; - ppc) target="powerpc"; config_target="no cpu-specific options";; - sh) target="sh"; config_target="SH4";; - sparc) target="sparc"; config_target="no cpu-specific options";; - x86) target="i386"; config_target="GENERIC_386";; - *) die "$(tc-arch) lists no defaults :/";; - esac - sed -i -e "s:default TARGET_i386:default TARGET_${target}:" \ - extra/Configs/Config.in - sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \ - extra/Configs/Config.${target} - - ########## CONFIG SETUP ########## - - make defconfig >/dev/null || die "could not config" - - for def in DO{DEBUG{,_PT},ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} ; do - sed -i -e "s:${def}=y:# ${def} is not set:" .config - done - if use debug ; then - #echo "SUPPORT_LD_DEBUG_EARLY=y" >> .config - echo "SUPPORT_LD_DEBUG=y" >> .config - echo "DODEBUG=y" >> .config - #echo "DODEBUG_PT=y" >> .config - fi - - sed -i -e '/ARCH_.*_ENDIAN/d' .config - echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config - - if [[ $(tc-is-softfloat) != "no" ]] ; then - sed -i -e '/^HAS_FPU=y$/d' .config - echo 'HAS_FPU=n' >> .config - fi - - local moredefs="DL_FINI_CRT_COMPAT" - # We need todo this for a few months. .28 is a major upgrade. - # Don't do it from cross-compiling case though - if ! use uclibc-compat ; then - if [[ -z ${UCLIBC_AND_GLIBC} ]] && [[ -z ${UCLIBC_SCANNED_COMPAT} ]] && \ - ! just_headers && [[ ${CHOST} == ${CTARGET} ]] ; then - local fnames="" - einfo "Doing a scanelf in paths for bins containing the __uClibc_start_main symbol" - fnames=$(scanelf -pyqs__uClibc_start_main -F%F#s) - if [[ -z ${fnames} ]] ; then - einfo "This system is clean." - einfo "To prevent the scanning of files again in the future you can export UCLIBC_SCANNED_COMPAT=1" - moredefs="" - else - ewarn "You need to remerge the packages that contain the following files before you can remerge ${P} without USE=uclibc-compat enabled." - ewarn "qfile ${fnames}" - echo - ewarn "Leaving on ${moredefs}" - fi - else - moredefs="" - fi - fi - for def in ${moredefs} MALLOC_GLIBC_COMPAT DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do - sed -i -e "s:# ${def} is not set:${def}=y:" .config - done - echo "UCLIBC_HAS_FULL_RPC=y" >> .config - echo "PTHREADS_DEBUG_SUPPORT=y" >> .config - echo "UCLIBC_HAS_TZ_FILE_READ_MANY=n" >> .config - - if use iconv ; then - sed -i -e "s:# UCLIBC_HAS_LOCALE is not set:UCLIBC_HAS_LOCALE=y:" .config - echo "UCLIBC_HAS_XLOCALE=n" >> .config - echo "UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y" >> .config - echo "UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y" >> .config - - if use nls ; then - echo "UCLIBC_HAS_GETTEXT_AWARENESS=y" >> .config - else - echo "UCLIBC_HAS_GETTEXT_AWARENESS=n" >> .config - fi - - if use pregen ; then - echo "UCLIBC_PREGENERATED_LOCALE_DATA=y" >> .config - echo "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y" >> .config - if use userlocales ; then - cp "${DISTDIR}"/${MY_P}-user-locale.tar.gz \ - extra/locale/uClibc-locale-030818.tgz \ - || die "could not copy ${MY_P}-user-locale.tar.gz" - else - cp "${DISTDIR}"/${MY_P}-$(tc-arch)-full-locale.tar.gz \ - extra/locale/uClibc-locale-030818.tgz \ - || die "could not copy locale" - fi - else - echo "UCLIBC_PREGENERATED_LOCALE_DATA=n" >> .config - fi - else - echo "UCLIBC_HAS_LOCALE=n" >> .config - fi - - use ipv6 && sed -i -e "s:# UCLIBC_HAS_IPV6 is not set:UCLIBC_HAS_IPV6=y:" .config - - # uncomment if you miss wordexp (alsa-lib) - use wordexp && sed -i -e "s:# UCLIBC_HAS_WORDEXP is not set:UCLIBC_HAS_WORDEXP=y:" .config - - # we need to do it independently of hardened to get ssp.c built into libc - sed -i -e "s:# UCLIBC_SECURITY.*:UCLIBC_SECURITY=y:" .config - echo "UCLIBC_HAS_SSP=y" >> .config - echo "SSP_USE_ERANDOM=n" >> .config - echo "PROPOLICE_BLOCK_ABRT=n" >> .config - if use debug ; then - echo "PROPOLICE_BLOCK_SEGV=y" >> .config - echo "PROPOLICE_BLOCK_KILL=n" >> .config - else - echo "PROPOLICE_BLOCK_SEGV=n" >> .config - echo "PROPOLICE_BLOCK_KILL=y" >> .config - fi - - # arm/mips do not emit PT_GNU_STACK, but if we enable this here - # it will be emitted as RWE, ppc has to be checked, x86 needs it - # this option should be used independently of hardened - # relro could be also moved out of hardened - if has $(tc-arch) x86 ; then - echo "UCLIBC_BUILD_NOEXECSTACK=y" >> .config - else - echo "UCLIBC_BUILD_NOEXECSTACK=n" >> .config - fi - echo "UCLIBC_BUILD_RELRO=y" >> .config - if use hardened ; then - if has $(tc-arch) ${PIE_STABLE} ; then - echo "UCLIBC_BUILD_PIE=y" >> .config - else - echo "UCLIBC_BUILD_PIE=n" >> .config - fi - echo "SSP_QUICK_CANARY=n" >> .config - echo "UCLIBC_BUILD_SSP=y" >> .config - echo "UCLIBC_BUILD_NOW=y" >> .config - else - echo "UCLIBC_BUILD_PIE=n" >> .config - echo "SSP_QUICK_CANARY=y" >> .config - echo "UCLIBC_BUILD_SSP=n" >> .config - echo "UCLIBC_BUILD_NOW=n" >> .config - fi - - # Allow users some custom control over the config - if use savedconfig ; then - for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do - configfile=${ROOT}/etc/${PN}/${CTARGET}/${conf}.config - einfo "Checking existence of ${configfile} ..." - [[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config - if [[ -r ${configfile} ]] ; then - cp "${configfile}" "${S}"/.config - einfo "Found your ${configfile} and using it." - einfo "Note that this feature is *totally unsupported*." - break - fi - done - fi - - # setup build and run paths - local cross=${CTARGET}- - type -p ${cross}ar > /dev/null || cross="" - sed -i \ - -e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${cross}\":" \ - -e "/^KERNEL_SOURCE/s:=.*:=\"$(alt_build_kprefix)\":" \ - -e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \ - -e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \ - -e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \ - .config || die - - yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig" - - cp .config myconfig - - emake -s clean > /dev/null || die "could not clean" -} - -setup_locales() { - cd "${S}"/extra/locale - if use userlocales && [[ -f ${ROOT}/etc/locales.build ]] ; then - :; - elif use minimal ; then - find ./charmaps -name ASCII.pairs > codesets.txt - find ./charmaps -name ISO-8859-1.pairs >> codesets.txt - cat <<-EOF > locales.txt - @euro e - UTF-8 yes - 8-bit yes - en_US ISO-8859-1 - en_US.UTF-8 UTF-8 - EOF - else - find ./charmaps -name '*.pairs' > codesets.txt - cp LOCALES locales.txt - fi - cd - -} - -src_compile() { - cp myconfig .config - - emake headers || die "make headers failed" - just_headers && return 0 - - if use iconv && ! use pregen ; then - cd extra/locale - make clean || die "make locale clean failed" - setup_locales - emake || die "make locales failed" - cd ../.. - fi - - emake || die "make failed" - if [[ ${CTARGET} != ${CHOST} ]] ; then - emake -C utils hostutils || die "make hostutils failed" - elif [[ ${CHOST} == *-uclibc ]] ; then - emake utils || die "make utils failed" - fi -} - -src_test() { - [[ ${CHOST} != ${CTARGET} ]] && return 0 - [[ ${CBUILD} != ${CHOST} ]] && return 0 - - # assert test fails on pax/grsec enabled kernels - normal - # vfork test fails in sandbox (both glibc/uclibc) - make UCLIBC_ONLY=1 check || die "test failed" -} - -src_install() { - local sysroot=${D} - [[ ${CHOST} != ${CTARGET} ]] && sysroot="${sysroot}/usr/${CTARGET}" - - local target="install" - just_headers && target="install_dev" - emake DESTDIR="${sysroot}" ${target} || die "install failed" - - # remove files coming from kernel-headers - rm -rf "${sysroot}"/usr/include/{linux,asm*} - - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if [[ ${CTARGET} != ${CHOST} ]] ; then - dosym usr/include /usr/${CTARGET}/sys-include - newbin utils/ldconfig.host ${CTARGET}-ldconfig || die - newbin utils/ldd.host ${CTARGET}-ldd || die - return 0 - fi - - if [[ ${CHOST} == *-uclibc ]] ; then - make DESTDIR="${D}" install_utils || die "install-utils failed" - dobin extra/scripts/getent - fi - - if ! use build ; then - dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 - doman docs/man/*.[1-9] - fi -} - -pkg_postinst() { - [[ ${CTARGET} != ${CHOST} ]] && return 0 - [[ ${CHOST} != *-uclibc ]] && return 0 - - if [[ ! -e ${ROOT}/etc/TZ ]] ; then - ewarn "Please remember to set your timezone in /etc/TZ" - [[ ! -d ${ROOT}/etc ]] && mkdir -p "${ROOT}"/etc - echo "UTC" > "${ROOT}"/etc/TZ - fi - - if [[ ${ROOT} == "/" ]] ; then - # update cache before reloading init - /sbin/ldconfig - # reload init ... - [[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null - fi -} diff --git a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage1.spec b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage1.spec index ff2c2cb..b23e477 100644 --- a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage1.spec +++ b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage1.spec @@ -1,9 +1,9 @@ subarch: amd64 target: stage1 -version_stamp: hardened+nomultilib-20080110 +version_stamp: hardened+nomultilib-20080120 rel_type: default profile: hardened/amd64 -snapshot: 20080110 -source_subpath: stage3-amd64-hardened+nomultilib-20080105 +snapshot: 20080120 +source_subpath: stage3-amd64-hardened+nomultilib-20080110 cflags: -O2 -pipe -fforce-addr cxxflags: -O2 -pipe -fforce-addr diff --git a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage2.spec b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage2.spec index 0b1dec4..e4260f6 100644 --- a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage2.spec +++ b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage2.spec @@ -1,9 +1,9 @@ subarch: amd64 target: stage2 -version_stamp: hardened+nomultilib-20080110 +version_stamp: hardened+nomultilib-20080120 rel_type: default profile: hardened/amd64 -snapshot: 20080110 -source_subpath: default/stage1-amd64-hardened+nomultilib-20080110 +snapshot: 20080120 +source_subpath: default/stage1-amd64-hardened+nomultilib-20080120 cflags: -O2 -pipe -fforce-addr cxxflags: -O2 -pipe -fforce-addr diff --git a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage3.spec b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage3.spec index feff005..b960e12 100644 --- a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage3.spec +++ b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage3.spec @@ -1,9 +1,9 @@ subarch: amd64 target: stage3 -version_stamp: hardened+nomultilib-20080110 +version_stamp: hardened+nomultilib-20080120 rel_type: default profile: hardened/amd64 -snapshot: 20080110 -source_subpath: default/stage2-amd64-hardened+nomultilib-20080110 +snapshot: 20080120 +source_subpath: default/stage2-amd64-hardened+nomultilib-20080120 cflags: -O2 -pipe -fforce-addr cxxflags: -O2 -pipe -fforce-addr diff --git a/catalyst/specs/glibc/amd64/hardened/stage1.spec b/catalyst/specs/glibc/amd64/hardened/stage1.spec index 0fc3507..75009e6 100644 --- a/catalyst/specs/glibc/amd64/hardened/stage1.spec +++ b/catalyst/specs/glibc/amd64/hardened/stage1.spec @@ -1,9 +1,9 @@ subarch: amd64 target: stage1 -version_stamp: hardened-20080110 +version_stamp: hardened-20080120 rel_type: default profile: hardened/amd64/multilib -snapshot: 20080110 -source_subpath: stage3-amd64-hardened-20080105 +snapshot: 20080120 +source_subpath: stage3-amd64-hardened-20080110 cflags: -O2 -pipe -fforce-addr cxxflags: -O2 -pipe -fforce-addr diff --git a/catalyst/specs/glibc/amd64/hardened/stage2.spec b/catalyst/specs/glibc/amd64/hardened/stage2.spec index 3d14438..355b685 100644 --- a/catalyst/specs/glibc/amd64/hardened/stage2.spec +++ b/catalyst/specs/glibc/amd64/hardened/stage2.spec @@ -1,9 +1,9 @@ subarch: amd64 target: stage2 -version_stamp: hardened-20080110 +version_stamp: hardened-20080120 rel_type: default profile: hardened/amd64/multilib -snapshot: 20080110 -source_subpath: default/stage1-amd64-hardened-20080110 +snapshot: 20080120 +source_subpath: default/stage1-amd64-hardened-20080120 cflags: -O2 -pipe -fforce-addr cxxflags: -O2 -pipe -fforce-addr diff --git a/catalyst/specs/glibc/amd64/hardened/stage3.spec b/catalyst/specs/glibc/amd64/hardened/stage3.spec index 06b0c90..0b70f75 100644 --- a/catalyst/specs/glibc/amd64/hardened/stage3.spec +++ b/catalyst/specs/glibc/amd64/hardened/stage3.spec @@ -1,9 +1,9 @@ subarch: amd64 target: stage3 -version_stamp: hardened-20080110 +version_stamp: hardened-20080120 rel_type: default profile: hardened/amd64/multilib -snapshot: 20080110 -source_subpath: default/stage2-amd64-hardened-20080110 +snapshot: 20080120 +source_subpath: default/stage2-amd64-hardened-20080120 cflags: -O2 -pipe -fforce-addr cxxflags: -O2 -pipe -fforce-addr diff --git a/catalyst/specs/glibc/x86/hardened/stage1.spec b/catalyst/specs/glibc/x86/hardened/stage1.spec index 2abeeb6..575f9d9 100644 --- a/catalyst/specs/glibc/x86/hardened/stage1.spec +++ b/catalyst/specs/glibc/x86/hardened/stage1.spec @@ -1,10 +1,10 @@ subarch: x86 target: stage1 -version_stamp: hardened-20080110 +version_stamp: hardened-20080120 rel_type: default profile: hardened/x86/2.6 -snapshot: 20080110 -source_subpath: stage3-x86-hardened-20080105 +snapshot: 20080120 +source_subpath: stage3-x86-hardened-20080110 chost: i486-pc-linux-gnu cflags: -mtune=i486 -O2 -pipe -fforce-addr cxxflags: -mtune=i486 -O2 -pipe -fforce-addr diff --git a/catalyst/specs/glibc/x86/hardened/stage2.spec b/catalyst/specs/glibc/x86/hardened/stage2.spec index 20b95ab..cf9f553 100644 --- a/catalyst/specs/glibc/x86/hardened/stage2.spec +++ b/catalyst/specs/glibc/x86/hardened/stage2.spec @@ -1,10 +1,10 @@ subarch: x86 target: stage2 -version_stamp: hardened-20080110 +version_stamp: hardened-20080120 rel_type: default profile: hardened/x86/2.6 -snapshot: 20080110 -source_subpath: default/stage1-x86-hardened-20080110 +snapshot: 20080120 +source_subpath: default/stage1-x86-hardened-20080120 chost: i486-pc-linux-gnu cflags: -mtune=i486 -O2 -pipe -fforce-addr cxxflags: -mtune=i486 -O2 -pipe -fforce-addr diff --git a/catalyst/specs/glibc/x86/hardened/stage3.spec b/catalyst/specs/glibc/x86/hardened/stage3.spec index 90e6b6d..4e90d3c 100644 --- a/catalyst/specs/glibc/x86/hardened/stage3.spec +++ b/catalyst/specs/glibc/x86/hardened/stage3.spec @@ -1,9 +1,9 @@ subarch: x86 target: stage3 -version_stamp: hardened-20080110 +version_stamp: hardened-20080120 rel_type: default profile: hardened/x86/2.6 -snapshot: 20080110 -source_subpath: default/stage2-x86-hardened-20080110 +snapshot: 20080120 +source_subpath: default/stage2-x86-hardened-20080120 cflags: -mtune=i486 -O2 -pipe -fforce-addr cxxflags: -mtune=i486 -O2 -pipe -fforce-addr diff --git a/catalyst/specs/glibc/x86/i686/hardened/stage2.spec b/catalyst/specs/glibc/x86/i686/hardened/stage2.spec index ea8e219..e76f5ac 100644 --- a/catalyst/specs/glibc/x86/i686/hardened/stage2.spec +++ b/catalyst/specs/glibc/x86/i686/hardened/stage2.spec @@ -1,10 +1,10 @@ subarch: i686 target: stage2 -version_stamp: hardened-20080110 +version_stamp: hardened-20080120 rel_type: default profile: hardened/x86/2.6 -snapshot: 20080110 -source_subpath: default/stage1-x86-hardened-20080110 +snapshot: 20080120 +source_subpath: default/stage1-x86-hardened-20080120 chost: i686-pc-linux-gnu cflags: -mtune=i686 -O2 -pipe -fforce-addr cxxflags: -mtune=i686 -O2 -pipe -fforce-addr diff --git a/catalyst/specs/glibc/x86/i686/hardened/stage3.spec b/catalyst/specs/glibc/x86/i686/hardened/stage3.spec index 3678617..a52e76b 100644 --- a/catalyst/specs/glibc/x86/i686/hardened/stage3.spec +++ b/catalyst/specs/glibc/x86/i686/hardened/stage3.spec @@ -1,9 +1,9 @@ subarch: i686 target: stage3 -version_stamp: hardened-20080110 +version_stamp: hardened-20080120 rel_type: default profile: hardened/x86/2.6 -snapshot: 20080110 -source_subpath: default/stage2-i686-hardened-20080110 +snapshot: 20080120 +source_subpath: default/stage2-i686-hardened-20080120 cflags: -mtune=i686 -O2 -pipe -fforce-addr cxxflags: -mtune=i686 -O2 -pipe -fforce-addr diff --git a/catalyst/specs/uclibc/ppc/float/stage1.spec b/catalyst/specs/uclibc/ppc/float/stage1.spec index 526b63f..3575411 100644 --- a/catalyst/specs/uclibc/ppc/float/stage1.spec +++ b/catalyst/specs/uclibc/ppc/float/stage1.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage1 -version_stamp: uclibc-softfloat-20080110 +version_stamp: uclibc-softfloat-20080120 rel_type: default profile: uclibc/ppc -snapshot: 20080110 -source_subpath: stage3-ppc-uclibc-softfloat-20080105 +snapshot: 20080120 +source_subpath: stage3-ppc-uclibc-softfloat-20080110 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/ppc/float/stage2.spec b/catalyst/specs/uclibc/ppc/float/stage2.spec index 728e151..51b368a 100644 --- a/catalyst/specs/uclibc/ppc/float/stage2.spec +++ b/catalyst/specs/uclibc/ppc/float/stage2.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage2 -version_stamp: uclibc-softfloat-20080110 +version_stamp: uclibc-softfloat-20080120 rel_type: default profile: uclibc/ppc -snapshot: 20080110 -source_subpath: default/stage1-ppc-uclibc-softfloat-20080110 +snapshot: 20080120 +source_subpath: default/stage1-ppc-uclibc-softfloat-20080120 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/ppc/float/stage3.spec b/catalyst/specs/uclibc/ppc/float/stage3.spec index a16e2e1..4a10d71 100644 --- a/catalyst/specs/uclibc/ppc/float/stage3.spec +++ b/catalyst/specs/uclibc/ppc/float/stage3.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage3 -version_stamp: uclibc-softfloat-20080110 +version_stamp: uclibc-softfloat-20080120 rel_type: default profile: uclibc/ppc -snapshot: 20080110 -source_subpath: default/stage2-ppc-uclibc-softfloat-20080110 +snapshot: 20080120 +source_subpath: default/stage2-ppc-uclibc-softfloat-20080120 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/ppc/hardened/stage1.spec b/catalyst/specs/uclibc/ppc/hardened/stage1.spec index 6478a55..31ba450 100644 --- a/catalyst/specs/uclibc/ppc/hardened/stage1.spec +++ b/catalyst/specs/uclibc/ppc/hardened/stage1.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage1 -version_stamp: uclibc-hardened-20080110 +version_stamp: uclibc-hardened-20080120 rel_type: default profile: uclibc/ppc/hardened/ -snapshot: 20080110 -source_subpath: stage3-ppc-uclibc-hardened-20080105 +snapshot: 20080120 +source_subpath: stage3-ppc-uclibc-hardened-20080110 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/ppc/hardened/stage2.spec b/catalyst/specs/uclibc/ppc/hardened/stage2.spec index 4e66034..b8ae801 100644 --- a/catalyst/specs/uclibc/ppc/hardened/stage2.spec +++ b/catalyst/specs/uclibc/ppc/hardened/stage2.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage2 -version_stamp: uclibc-hardened-20080110 +version_stamp: uclibc-hardened-20080120 rel_type: default profile: uclibc/ppc/hardened -snapshot: 20080110 -source_subpath: default/stage1-ppc-uclibc-hardened-20080110 +snapshot: 20080120 +source_subpath: default/stage1-ppc-uclibc-hardened-20080120 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/ppc/hardened/stage3.spec b/catalyst/specs/uclibc/ppc/hardened/stage3.spec index 36eedf0..4ea4890 100644 --- a/catalyst/specs/uclibc/ppc/hardened/stage3.spec +++ b/catalyst/specs/uclibc/ppc/hardened/stage3.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage3 -version_stamp: uclibc-hardened-20080110 +version_stamp: uclibc-hardened-20080120 rel_type: default profile: uclibc/ppc/hardened -snapshot: 20080110 -source_subpath: default/stage2-ppc-uclibc-hardened-20080110 +snapshot: 20080120 +source_subpath: default/stage2-ppc-uclibc-hardened-20080120 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/ppc/stage1.spec b/catalyst/specs/uclibc/ppc/stage1.spec index e40d55c..0edfe65 100644 --- a/catalyst/specs/uclibc/ppc/stage1.spec +++ b/catalyst/specs/uclibc/ppc/stage1.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage1 -version_stamp: uclibc-20080110 +version_stamp: uclibc-20080120 rel_type: default profile: uclibc/ppc -snapshot: 20080110 -source_subpath: stage3-ppc-uclibc-20080105 +snapshot: 20080120 +source_subpath: stage3-ppc-uclibc-20080110 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/ppc/stage2.spec b/catalyst/specs/uclibc/ppc/stage2.spec index be7986a..83301c6 100644 --- a/catalyst/specs/uclibc/ppc/stage2.spec +++ b/catalyst/specs/uclibc/ppc/stage2.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage2 -version_stamp: uclibc-20080110 +version_stamp: uclibc-20080120 rel_type: default profile: uclibc/ppc -snapshot: 20080110 -source_subpath: default/stage1-ppc-uclibc-20080110 +snapshot: 20080120 +source_subpath: default/stage1-ppc-uclibc-20080120 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/ppc/stage3.spec b/catalyst/specs/uclibc/ppc/stage3.spec index 90c6ce2..05c9c6c 100644 --- a/catalyst/specs/uclibc/ppc/stage3.spec +++ b/catalyst/specs/uclibc/ppc/stage3.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage3 -version_stamp: uclibc-20080110 +version_stamp: uclibc-20080120 rel_type: default profile: uclibc/ppc -snapshot: 20080110 -source_subpath: default/stage2-ppc-uclibc-20080110 +snapshot: 20080120 +source_subpath: default/stage2-ppc-uclibc-20080120 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/x86/hardened/stage1.spec b/catalyst/specs/uclibc/x86/hardened/stage1.spec index 274ed2e..960ac99 100644 --- a/catalyst/specs/uclibc/x86/hardened/stage1.spec +++ b/catalyst/specs/uclibc/x86/hardened/stage1.spec @@ -1,10 +1,10 @@ subarch: x86 target: stage1 -version_stamp: uclibc-hardened-20080110 +version_stamp: uclibc-hardened-20080120 rel_type: default profile: uclibc/x86/hardened -snapshot: 20080110 -source_subpath: stage3-x86-uclibc-hardened-20080105 +snapshot: 20080120 +source_subpath: stage3-x86-uclibc-hardened-20080110 cflags: -Os -mtune=i386 -pipe cxxflags: -Os -mtune=i386 -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/x86/hardened/stage2.spec b/catalyst/specs/uclibc/x86/hardened/stage2.spec index f2ead1f..7aaa36b 100644 --- a/catalyst/specs/uclibc/x86/hardened/stage2.spec +++ b/catalyst/specs/uclibc/x86/hardened/stage2.spec @@ -1,10 +1,10 @@ subarch: x86 target: stage2 -version_stamp: uclibc-hardened-20080110 +version_stamp: uclibc-hardened-20080120 rel_type: default profile: uclibc/x86/hardened -snapshot: 20080110 -source_subpath: default/stage1-x86-uclibc-hardened-20080110 +snapshot: 20080120 +source_subpath: default/stage1-x86-uclibc-hardened-20080120 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/x86/hardened/stage3.spec b/catalyst/specs/uclibc/x86/hardened/stage3.spec index 2354c75..5d9e8de 100644 --- a/catalyst/specs/uclibc/x86/hardened/stage3.spec +++ b/catalyst/specs/uclibc/x86/hardened/stage3.spec @@ -1,10 +1,10 @@ subarch: x86 target: stage3 -version_stamp: uclibc-hardened-20080110 +version_stamp: uclibc-hardened-20080120 rel_type: default profile: uclibc/x86/hardened -snapshot: 20080110 -source_subpath: default/stage2-x86-uclibc-hardened-20080110 +snapshot: 20080120 +source_subpath: default/stage2-x86-uclibc-hardened-20080120 cflags: -Os -pipe cxxflags: -Os -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/x86/stage1.spec b/catalyst/specs/uclibc/x86/stage1.spec index c853d6d..2afe1b4 100644 --- a/catalyst/specs/uclibc/x86/stage1.spec +++ b/catalyst/specs/uclibc/x86/stage1.spec @@ -1,10 +1,10 @@ subarch: x86 target: stage1 -version_stamp: uclibc-20080110 +version_stamp: uclibc-20080120 rel_type: default profile: uclibc/x86 -snapshot: 20080110 -source_subpath: stage3-x86-uclibc-20080105 +snapshot: 20080120 +source_subpath: stage3-x86-uclibc-20080110 cflags: -Os -mtune=i386 -pipe cxxflags: -Os -mtune=i386 -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/x86/stage2.spec b/catalyst/specs/uclibc/x86/stage2.spec index 235128c..219d1bc 100644 --- a/catalyst/specs/uclibc/x86/stage2.spec +++ b/catalyst/specs/uclibc/x86/stage2.spec @@ -1,10 +1,10 @@ subarch: x86 target: stage2 -version_stamp: uclibc-20080110 +version_stamp: uclibc-20080120 rel_type: default profile: uclibc/x86 -snapshot: 20080110 -source_subpath: default/stage1-x86-uclibc-20080110 +snapshot: 20080120 +source_subpath: default/stage1-x86-uclibc-20080120 cflags: -Os -mtune=i386 -pipe cxxflags: -Os -mtune=i386 -pipe ldflags: -Wl,-O1 diff --git a/catalyst/specs/uclibc/x86/stage3.spec b/catalyst/specs/uclibc/x86/stage3.spec index b8c17af..bc9a805 100644 --- a/catalyst/specs/uclibc/x86/stage3.spec +++ b/catalyst/specs/uclibc/x86/stage3.spec @@ -1,10 +1,10 @@ subarch: x86 target: stage3 -version_stamp: uclibc-20080110 +version_stamp: uclibc-20080120 rel_type: default profile: uclibc/x86 -snapshot: 20080110 -source_subpath: default/stage2-x86-uclibc-20080110 +snapshot: 20080120 +source_subpath: default/stage2-x86-uclibc-20080120 cflags: -Os -mtune=i386 cxxflags: -Os -mtune=i386 ldflags: -Wl,-O1 |