diff --git a/archiver/bize/bize.desc b/archiver/bize/bize.desc index 7afbaf947..95db45b5c 100644 --- a/archiver/bize/bize.desc +++ b/archiver/bize/bize.desc @@ -28,5 +28,5 @@ [L] GPL [S] Stable [V] 0.7 -[P] X -1---5---9 114.400 +[P] X -?---5---9 114.400 diff --git a/archiver/cpio/cpio.desc b/archiver/cpio/cpio.desc index 5603971bc..102f6179f 100644 --- a/archiver/cpio/cpio.desc +++ b/archiver/cpio/cpio.desc @@ -35,7 +35,7 @@ [L] GPL [S] Stable [V] 2.8 -[P] X 0----5---9 102.050 +[P] X ?----5---9 102.050 [D] 2894495944 cpio-2.8.tar.gz ftp://ftp.gnu.org/pub/gnu/cpio/ diff --git a/archiver/zlib/zlib.desc b/archiver/zlib/zlib.desc index 9f97d3735..5e9da8733 100644 --- a/archiver/zlib/zlib.desc +++ b/archiver/zlib/zlib.desc @@ -38,7 +38,7 @@ [L] OpenSource [S] Stable [V] 1.2.3 -[P] X -1-3-----9 105.900 +[P] X -?-3-----9 105.900 [D] 623948124 zlib-1.2.3.tar.bz2 http://www.zlib.net/ diff --git a/attic/linux24/linux24.desc b/attic/linux24/linux24.desc index 440d80b87..0ad0d7564 100644 --- a/attic/linux24/linux24.desc +++ b/attic/linux24/linux24.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable [V] 2.4.33.3 -[P] O -1---5---9 102.061 +[P] O -?---5---9 102.061 [D] 1886799399 linux-2.4.33.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ [D] 3557076765 patch-2.4.33.3.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ diff --git a/base/busybox/busybox.conf b/base/busybox/busybox.conf index 8d6a19a12..8aa480fdf 100644 --- a/base/busybox/busybox.conf +++ b/base/busybox/busybox.conf @@ -14,7 +14,6 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- - for x in $( match_source_file -p patch ); do var_append patchfiles ' ' $x done diff --git a/base/busybox/busybox.desc b/base/busybox/busybox.desc index 6ef5eff1a..9ecf6cf5a 100644 --- a/base/busybox/busybox.desc +++ b/base/busybox/busybox.desc @@ -30,7 +30,9 @@ [L] GPL [S] Stable -[V] 1.5.1 -[P] X -1---5---9 102.000 +[V] 1.6.1 +[P] X -?---5---9 102.001 -[D] 3077479039 busybox-1.5.1.tar.bz2 http://busybox.net/downloads/ +[D] 3511620770 busybox-1.6.1.tar.bz2 http://busybox.net/downloads/ +[D] 3883757934 busybox-1.6.1-adduser.patch http://busybox.net/downloads/fixes-1.6.1/ +[D] 3494677559 busybox-1.6.1-init.patch http://busybox.net/downloads/fixes-1.6.1/ diff --git a/base/busybox/dietlibc.patch b/base/busybox/dietlibc.patch new file mode 100644 index 000000000..841e96041 --- /dev/null +++ b/base/busybox/dietlibc.patch @@ -0,0 +1,39 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../busybox/dietlibc.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./shell/ash.c.orig 2007-07-17 11:01:59.000000000 -0400 ++++ ./shell/ash.c 2007-07-17 11:02:57.000000000 -0400 +@@ -66,6 +66,9 @@ + #error "Do not even bother, ash will not run on uClinux" + #endif + ++#ifdef __dietlibc__ ++#define dprintf fdprintf ++#endif + + /* ============ Misc helpers */ + +--- ./libbb/pw_encrypt.c.orig 2007-07-21 19:35:23.000000000 -0400 ++++ ./libbb/pw_encrypt.c 2007-07-21 19:35:36.000000000 -0400 +@@ -8,7 +8,7 @@ + */ + + #include "libbb.h" +-#include ++#include + + char *pw_encrypt(const char *clear, const char *salt) + { diff --git a/base/busybox/linuxrc-location.patch b/base/busybox/linuxrc-location.patch index ece887b49..6ec6bc0ea 100644 --- a/base/busybox/linuxrc-location.patch +++ b/base/busybox/linuxrc-location.patch @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../busybox/linuxrc-location.patch +# Filename: package/.../busybox/linuxrc-location.patch +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,16 +13,16 @@ # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- ---- ./include/applets.h.orig 2006-06-30 22:42:10.000000000 +0000 -+++ ./include/applets.h 2006-07-02 20:32:32.000000000 +0000 -@@ -164,7 +164,7 @@ +--- ./include/applets.h.orig 2007-06-01 07:48:39.000000000 -0400 ++++ ./include/applets.h 2007-06-09 18:40:38.000000000 -0400 +@@ -202,7 +202,7 @@ USE_LESS(APPLET(less, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_SETARCH(APPLET_NOUSAGE(linux32, setarch, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_SETARCH(APPLET_NOUSAGE(linux64, setarch, _BB_DIR_BIN, _BB_SUID_NEVER)) -USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_NEVER)) +USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init, _BB_DIR_SBIN, _BB_SUID_NEVER)) - USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER)) + USE_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, _BB_SUID_NEVER, ln)) + USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER)) diff --git a/base/dd_rescue/dd_rescue.cache b/base/dd_rescue/dd_rescue.cache new file mode 100644 index 000000000..e2ea20457 --- /dev/null +++ b/base/dd_rescue/dd_rescue.cache @@ -0,0 +1,21 @@ + +[TIMESTAMP] 1187216752 Wed Aug 15 18:25:52 2007 +[BUILDTIME] 100 (9) +[SIZE] 0.04 MB, 7 files + +[DEP] 00-dirtree +[DEP] bash +[DEP] binutils +[DEP] bzip2 +[DEP] coreutils +[DEP] diffutils +[DEP] findutils +[DEP] gawk +[DEP] gcc +[DEP] glibc +[DEP] grep +[DEP] linux-header +[DEP] make +[DEP] sed +[DEP] sysfiles +[DEP] tar diff --git a/base/dd_rescue/dd_rescue.desc b/base/dd_rescue/dd_rescue.desc new file mode 100644 index 000000000..530f37304 --- /dev/null +++ b/base/dd_rescue/dd_rescue.desc @@ -0,0 +1,35 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../ddrescue/ddrescue.desc +[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] +[COPY] More information can be found in the files COPYING and README. +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-COPYRIGHT-NOTE-END --- + +[I] A block copier, which ignores errors + +[T] Dd_rescue copies data from one file or block device to another. It is +[T] intended for error recovery, so, by default, it doesn't abort on errors, +[T] and doesn't truncate the output file. It uses large block sizes to +[T] quicken the copying, but falls back to small blocks upon encountering +[T] errors. It produces reports that allow you to keep track of bad blocks. + +[U] http://www.garloff.de/kurt/linux/ddrescue/ + +[A] Kurt Garloff +[M] Alejandro Mery + +[C] extra/tool + +[L] GPL +[S] Stable +[V] 1.13 +[P] X -----5---9 800.000 + +[D] 1485625184 dd_rescue-1.13.tar.gz http://www.garloff.de/kurt/linux/ddrescue/ diff --git a/base/dd_rhelp/dd_rhelp.cache b/base/dd_rhelp/dd_rhelp.cache new file mode 100644 index 000000000..0afd47717 --- /dev/null +++ b/base/dd_rhelp/dd_rhelp.cache @@ -0,0 +1,18 @@ + +[TIMESTAMP] 1187218415 Wed Aug 15 18:53:35 2007 +[BUILDTIME] 100 (9) +[SIZE] 0.05 MB, 8 files + +[DEP] 00-dirtree +[DEP] bash +[DEP] bzip2 +[DEP] coreutils +[DEP] diffutils +[DEP] findutils +[DEP] gawk +[DEP] gcc +[DEP] glibc +[DEP] grep +[DEP] sed +[DEP] sysfiles +[DEP] tar diff --git a/base/dd_rhelp/dd_rhelp.conf b/base/dd_rhelp/dd_rhelp.conf new file mode 100644 index 000000000..91affef21 --- /dev/null +++ b/base/dd_rhelp/dd_rhelp.conf @@ -0,0 +1,18 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../dd_rhelp/dd_rhelp.conf +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +makeopt= +makeinstopt= + +hook_add postmake 5 'cp -vf dd_rhelp $root$bindir/' diff --git a/base/dd_rhelp/dd_rhelp.desc b/base/dd_rhelp/dd_rhelp.desc new file mode 100644 index 000000000..615c3d20b --- /dev/null +++ b/base/dd_rhelp/dd_rhelp.desc @@ -0,0 +1,38 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../dd_rhelp/dd_rhelp.desc +[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] +[COPY] More information can be found in the files COPYING and README. +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-COPYRIGHT-NOTE-END --- + +[I] A quick and easy data recovery manager + +[T] Dd_rhelp allows users to retrieve, quickly and easily, recoverable data +[T] from any device with bad sectors. It will copy it using dd_rescue in +[T] all the appropriate ways (reverse copy, setting start and stop offset +[T] accordingly to previously rescued data) to recover the maximum data +[T] possible before spending time on bad sectors. It is straightforward +[T] to use, supports ctrl-c at anytime, can resume a job (or standalone +[T] dd_rescue job) by parsing the dd_rescue logs, and displays a nice ASCII +[T] bar showing rescue progress. + +[U] http://www.kalysto.org/utilities/dd_rhelp/ + +[A] LAB Valentin +[M] Alejandro Mery + +[C] extra/tool + +[L] GPL +[S] Stable +[V] 0.1.1 +[P] X -----5---9 800.000 + +[D] 2730682768 dd_rhelp-0.1.1.tar.gz http://www.kalysto.org/pkg/ diff --git a/base/ddrescue/ddrescue.cache b/base/ddrescue/ddrescue.cache new file mode 100644 index 000000000..576a5a8e1 --- /dev/null +++ b/base/ddrescue/ddrescue.cache @@ -0,0 +1,22 @@ + +[TIMESTAMP] 1187219923 Wed Aug 15 19:18:43 2007 +[BUILDTIME] 100 (9) +[SIZE] 0.08 MB, 9 files + +[DEP] 00-dirtree +[DEP] bash +[DEP] binutils +[DEP] bzip2 +[DEP] coreutils +[DEP] diffutils +[DEP] findutils +[DEP] gawk +[DEP] gcc +[DEP] glibc +[DEP] grep +[DEP] linux-header +[DEP] make +[DEP] sed +[DEP] sysfiles +[DEP] tar +[DEP] texinfo diff --git a/base/ddrescue/ddrescue.conf b/base/ddrescue/ddrescue.conf new file mode 100644 index 000000000..02f89326f --- /dev/null +++ b/base/ddrescue/ddrescue.conf @@ -0,0 +1,15 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../ddrescue/ddrescue.conf +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +var_remove confopt ' ' '--disable-debug' diff --git a/base/ddrescue/ddrescue.desc b/base/ddrescue/ddrescue.desc new file mode 100644 index 000000000..b3126557b --- /dev/null +++ b/base/ddrescue/ddrescue.desc @@ -0,0 +1,40 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../ddrescue/ddrescue.desc +[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] +[COPY] More information can be found in the files COPYING and README. +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-COPYRIGHT-NOTE-END --- + +[I] A data recovery tool + +[T] GNU ddrescue is a data recovery tool. It copies data from one file or +[T] block device (hard disc, cdrom, etc) to another, trying hard to rescue +[T] data in case of read errors. GNU ddrescue does not truncate the output +[T] file if not asked to. So, every time you run it on the same output file, +[T] it tries to fill in the gaps. The basic operation of GNU ddrescue is +[T] fully automatic. That is, you don't have to wait for an error, stop +[T] the program, read the log, run it in reverse mode, etc. If you use the +[T] logfile feature of GNU ddrescue, the data is rescued very efficiently +[T] (only the needed blocks are read). Also you can interrupt the rescue at +[T] any time and resume it later at the same point. + +[U] http://www.gnu.org/software/ddrescue/ddrescue.html + +[A] Antonio Diaz Diaz +[M] Alejandro Mery + +[C] extra/tool + +[L] GPL +[S] Stable +[V] 1.5 +[P] X -----5---9 800.000 + +[D] 2141959318 ddrescue-1.5.tar.bz2 http://ftp.gnu.org/gnu/ddrescue/ diff --git a/base/device-mapper/device-mapper.conf b/base/device-mapper/device-mapper.conf index f30697049..8ff47c3c2 100644 --- a/base/device-mapper/device-mapper.conf +++ b/base/device-mapper/device-mapper.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../device-mapper/device-mapper.conf +# Filename: package/.../device-mapper/device-mapper.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,18 +11,18 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- -prefix='' +# --- SDE-COPYRIGHT-NOTE-END --- + +prefix= set_confopt if [ "$SDECFG_STATIC" == 1 ]; then var_append patchfiles ' ' "$confdir/no_dynamic.diff" var_append confopt ' ' '--enable-static_link=yes' + libdir="/usr/lib" fi -if ! atstage native; then - autogen=1 -fi +atstage native || autogen=1 # STRIP is used on the Makefile as the -s argument for `install` -var_remove_regex makeinstopt ' ' 'STRIP=.*' +export STRIP= diff --git a/base/device-mapper/device-mapper.desc b/base/device-mapper/device-mapper.desc index cf58cc3ff..0c3872003 100644 --- a/base/device-mapper/device-mapper.desc +++ b/base/device-mapper/device-mapper.desc @@ -15,7 +15,7 @@ [COPY] GNU General Public License can be found in the file COPYING. [COPY] --- SDE-COPYRIGHT-NOTE-END --- -[I] Device-Mapper +[I] Logical volume management for the Linux kernel [T] The Device-mapper is a new component of the linux kernel [T] that supports logical volume management. It is required by @@ -24,15 +24,15 @@ [U] http://sources.redhat.com/dm/ -[A] dm-devel@redhat.com +[A] Red Hat, Inc [M] Alejandro Mery [C] extra/filesystem [L] GPL [S] Stable -[V] 1.02.15 -[P] X ---3-----9 183.800 +[V] 1.02.20 +[P] X -?-3-----9 183.800 -[D] 2385732643 device-mapper.1.02.15.tgz ftp://sources.redhat.com/pub/dm/ +[D] 607338793 device-mapper.1.02.20.tgz ftp://sources.redhat.com/pub/dm/ diff --git a/base/device-mapper/dietlibc.patch b/base/device-mapper/dietlibc.patch new file mode 100644 index 000000000..c077d97d0 --- /dev/null +++ b/base/device-mapper/dietlibc.patch @@ -0,0 +1,26 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../device-mapper/dietlibc.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./dmsetup/dmsetup.c.orig 2007-08-15 16:01:23.000000000 -0400 ++++ ./dmsetup/dmsetup.c 2007-08-15 16:01:45.000000000 -0400 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/base/device-mapper/no_dynamic.diff b/base/device-mapper/no_dynamic.diff index 5d09345c6..7ca2b33d8 100644 --- a/base/device-mapper/no_dynamic.diff +++ b/base/device-mapper/no_dynamic.diff @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../device-mapper/no_dynamic.diff +# Filename: package/.../device-mapper/no_dynamic.diff +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,7 +13,7 @@ # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- --- ./lib/Makefile.in.orig 2006-06-21 17:07:03.000000000 +0200 +++ ./lib/Makefile.in 2006-06-21 17:09:15.000000000 +0200 @@ -49,3 +50,10 @@ ifeq ("@STATIC_LINK@", "yes") TARGETS += dmsetup.static +@@ -45,5 +45,5 @@ + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$< + + install_static: dmsetup.static +- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$< ++ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/dmsetup + diff --git a/base/dietlibc/dietlibc.conf b/base/dietlibc/dietlibc.conf index b343bc7fe..2c643ae7b 100644 --- a/base/dietlibc/dietlibc.conf +++ b/base/dietlibc/dietlibc.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../dietlibc/dietlibc.conf +# Filename: package/.../dietlibc/dietlibc.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf # @@ -11,9 +12,23 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- + +# Apply debian patches (debian/diff/*.diff) +hook_add prepatch 3 'dietlibc_debian_patches' +dietlibc_debian_patches() { + local x= + for x in $( match_source_file -p diff ); do + case "$x" in + *.bz2) bzcat "$x" | patch ${patchopt} ;; + *) patch ${patchopt} < "$x" ;; + esac -var_insert patchfiles ' ' "$confdir/libm.patch.bz2" + done + for x in debian/diff/*.diff; do + patch ${patchopt} < $x + done +} dietlibc_initial_fixup() { sed -i /WANT_SYSENTER/d dietfeatures.h @@ -32,6 +47,13 @@ dietlibc_initial_fixup() { fi } +dietlibc_install_headers() { + find include/* -name '*.orig' -exec rm -v '{}' \; + + mkdir -p $base/build/${SDECFG_ID}${includedir}/ + cp -rv include/* $base/build/${SDECFG_ID}${includedir}/ +} + dietlibc_make_wrappers() { rm -rf $toolsbin; mkdir -p $toolsbin for x in gcc as ld ar ranlib nm ; do # wrapper @@ -114,10 +136,10 @@ var_append GCC_WRAPPER_APPEND ' ' "$dietfeatures" if atstage toolchain; then makeopt= makeinstopt= - hook_add postmake 4 'mkdir -p $base/build/${SDECFG_ID}${includedir}/' - hook_add postmake 5 'cp -rv include/* $base/build/${SDECFG_ID}${includedir}/' + hook_add postmake 5 'dietlibc_install_headers' else hook_add postpatch 5 'dietlibc_initial_fixup' + [ $toolsdir != tools.cross ] || hook_add premake 5 'dietlibc_make_wrappers' diff --git a/base/dietlibc/dietlibc.desc b/base/dietlibc/dietlibc.desc index 23c0df5d2..0a2d65f51 100644 --- a/base/dietlibc/dietlibc.desc +++ b/base/dietlibc/dietlibc.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../dietlibc/dietlibc.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] @@ -24,7 +24,7 @@ [U] http://www.fefe.de/dietlibc/ [A] Felix von Leitner -[M] The OpenSDE Community +[M] Alejandro Mery [C] base/library [E] group libc @@ -35,8 +35,8 @@ [L] GPL [S] Stable -[V] 0.30 +[V] 0.30-7 [P] X 01-3-----9 102.000 [D] 2285014446 dietlibc-0.30.tar.bz2 http://www.kernel.org/pub/linux/libs/dietlibc/ -#[D] X dietlibc-0.29-2004-12-18.tar.bz2 cvs://:pserver:cvs@cvs.fefe.de:/cvs dietlibc -D 2004-12-18 +[D] 1241677160 dietlibc_0.30-7.diff.gz http://ftp.debian.org/debian/pool/main/d/dietlibc/ diff --git a/base/dietlibc/libm-i386.patch b/base/dietlibc/libm-i386.patch deleted file mode 100644 index 9f90012da..000000000 --- a/base/dietlibc/libm-i386.patch +++ /dev/null @@ -1,531 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/libm-i386.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -diff -ur dietlibc-0.30/libm/fpmacros.c dietlibc-0.30-libm-i386/libm/fpmacros.c ---- dietlibc-0.30/libm/fpmacros.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/fpmacros.c 2006-06-28 19:51:31.000000000 +0200 -@@ -20,6 +20,8 @@ - ** - ***********************************************************************/ - -+#if ! defined (__i386__) && ! defined (__x86_64__) -+ - #include - #define _GNU_SOURCE - #include -@@ -289,3 +291,4 @@ - weak_alias (__isnanl, isnanl); - #endif - -+#endif -diff -ur dietlibc-0.30/libm/s_asinh.c dietlibc-0.30-libm-i386/libm/s_asinh.c ---- dietlibc-0.30/libm/s_asinh.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_asinh.c 2006-06-28 20:03:38.000000000 +0200 -@@ -38,9 +38,9 @@ - huge= 1.00000000000000000000e+300; - - #ifdef __STDC__ -- double asinh(double x) -+ double __asinh(double x) - #else -- double asinh(x) -+ double __asinh(x) - double x; - #endif - { -@@ -63,3 +63,4 @@ - } - if(hx>0) return w; else return -w; - } -+weak_alias (__asinh, asinh) -diff -ur dietlibc-0.30/libm/s_atan.c dietlibc-0.30-libm-i386/libm/s_atan.c ---- dietlibc-0.30/libm/s_atan.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_atan.c 2006-06-28 20:10:26.000000000 +0200 -@@ -86,9 +86,9 @@ - huge = 1.0e300; - - #ifdef __STDC__ -- double atan(double x) -+ double __atan(double x) - #else -- double atan(x) -+ double __atan(x) - double x; - #endif - { -@@ -137,3 +137,4 @@ - return (hx<0)? -z:z; - } - } -+weak_alias (__atan, atan) -diff -ur dietlibc-0.30/libm/s_cbrt.c dietlibc-0.30-libm-i386/libm/s_cbrt.c ---- dietlibc-0.30/libm/s_cbrt.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_cbrt.c 2006-06-28 20:05:18.000000000 +0200 -@@ -40,9 +40,9 @@ - G = 3.57142857142857150787e-01; /* 5/14 = 0x3FD6DB6D, 0xB6DB6DB7 */ - - #ifdef __STDC__ -- double cbrt(double x) -+ double __cbrt(double x) - #else -- double cbrt(x) -+ double __cbrt(x) - double x; - #endif - { -@@ -91,3 +91,4 @@ - SET_HIGH_WORD(t,high|sign); - return(t); - } -+weak_alias (__cbrt, cbrt) -diff -ur dietlibc-0.30/libm/s_copysign.c dietlibc-0.30-libm-i386/libm/s_copysign.c ---- dietlibc-0.30/libm/s_copysign.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_copysign.c 2006-06-28 20:01:55.000000000 +0200 -@@ -24,9 +24,9 @@ - #include "math_private.h" - - #ifdef __STDC__ -- double copysign(double x, double y) -+ double __copysign(double x, double y) - #else -- double copysign(x,y) -+ double __copysign(x,y) - double x,y; - #endif - { -@@ -36,4 +36,4 @@ - SET_HIGH_WORD(x,(hx&0x7fffffff)|(hy&0x80000000)); - return x; - } -- -+weak_alias(__copysign, copysign) -diff -ur dietlibc-0.30/libm/s_cos.c dietlibc-0.30-libm-i386/libm/s_cos.c ---- dietlibc-0.30/libm/s_cos.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_cos.c 2006-06-28 20:10:03.000000000 +0200 -@@ -49,9 +49,9 @@ - #include "math_private.h" - - #ifdef __STDC__ -- double cos(double x) -+ double __cos(double x) - #else -- double cos(x) -+ double __cos(x) - double x; - #endif - { -@@ -80,3 +80,4 @@ - } - } - } -+weak_alias (__cos, cos) -diff -ur dietlibc-0.30/libm/s_expm1.c dietlibc-0.30-libm-i386/libm/s_expm1.c ---- dietlibc-0.30/libm/s_expm1.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_expm1.c 2006-06-28 20:04:13.000000000 +0200 -@@ -132,9 +132,9 @@ - Q5 = -2.01099218183624371326e-07; /* BE8AFDB7 6E09C32D */ - - #ifdef __STDC__ -- double expm1(double x) -+ double __expm1(double x) - #else -- double expm1(x) -+ double __expm1(x) - double x; - #endif - { -@@ -227,3 +227,4 @@ - } - return y; - } -+weak_alias (__expm1, expm1) -diff -ur dietlibc-0.30/libm/s_fabs.c dietlibc-0.30-libm-i386/libm/s_fabs.c ---- dietlibc-0.30/libm/s_fabs.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_fabs.c 2006-06-28 20:09:37.000000000 +0200 -@@ -22,9 +22,9 @@ - #include "math_private.h" - - #ifdef __STDC__ -- double fabs(double x) -+ double __fabs(double x) - #else -- double fabs(x) -+ double __fabs(x) - double x; - #endif - { -@@ -33,3 +33,4 @@ - SET_HIGH_WORD(x,high&0x7fffffff); - return x; - } -+weak_alias (__fabs, fabs) -diff -ur dietlibc-0.30/libm/s_floor.c dietlibc-0.30-libm-i386/libm/s_floor.c ---- dietlibc-0.30/libm/s_floor.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_floor.c 2006-06-28 20:09:19.000000000 +0200 -@@ -33,9 +33,9 @@ - #endif - - #ifdef __STDC__ -- double floor(double x) -+ double __floor(double x) - #else -- double floor(x) -+ double __floor(x) - double x; - #endif - { -@@ -79,3 +79,4 @@ - INSERT_WORDS(x,i0,i1); - return x; - } -+weak_alias (__floor, floor) -diff -ur dietlibc-0.30/libm/s_ilogb.c dietlibc-0.30-libm-i386/libm/s_ilogb.c ---- dietlibc-0.30/libm/s_ilogb.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_ilogb.c 2006-06-28 19:58:36.000000000 +0200 -@@ -24,9 +24,9 @@ - #include "math_private.h" - - #ifdef __STDC__ -- int ilogb(double x) -+ int __ilogb(double x) - #else -- int ilogb(x) -+ int __ilogb(x) - double x; - #endif - { -@@ -49,3 +49,4 @@ - else if (hx<0x7ff00000) return (hx>>20)-1023; - else return 0x7fffffff; - } -+weak_alias (__ilogb, ilogb) -diff -ur dietlibc-0.30/libm/s_ldexp.c dietlibc-0.30-libm-i386/libm/s_ldexp.c ---- dietlibc-0.30/libm/s_ldexp.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_ldexp.c 2006-06-28 20:06:45.000000000 +0200 -@@ -19,9 +19,9 @@ - #include - - #ifdef __STDC__ -- double ldexp(double value, int exp) -+ double __ldexp(double value, int exp) - #else -- double ldexp(value, exp) -+ double __ldexp(value, exp) - double value; int exp; - #endif - { -@@ -30,3 +30,4 @@ - if(!finite(value)||value==0.0) errno = ERANGE; - return value; - } -+weak_alias (__ldexp, ldexp) -diff -ur dietlibc-0.30/libm/s_log1p.c dietlibc-0.30-libm-i386/libm/s_log1p.c ---- dietlibc-0.30/libm/s_log1p.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_log1p.c 2006-06-28 20:06:16.000000000 +0200 -@@ -105,9 +105,9 @@ - #endif - - #ifdef __STDC__ -- double log1p(double x) -+ double __log1p(double x) - #else -- double log1p(x) -+ double __log1p(x) - double x; - #endif - { -@@ -172,3 +172,4 @@ - if(k==0) return f-(hfsq-s*(hfsq+R)); else - return k*ln2_hi-((hfsq-(s*(hfsq+R)+(k*ln2_lo+c)))-f); - } -+weak_alias (__log1p, log1p) -diff -ur dietlibc-0.30/libm/s_logb.c dietlibc-0.30-libm-i386/libm/s_logb.c ---- dietlibc-0.30/libm/s_logb.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_logb.c 2006-06-28 19:59:16.000000000 +0200 -@@ -24,9 +24,9 @@ - #include "math_private.h" - - #ifdef __STDC__ -- double logb(double x) -+ double __logb(double x) - #else -- double logb(x) -+ double __logb(x) - double x; - #endif - { -@@ -40,3 +40,4 @@ - else - return (double) (ix-1023); - } -+weak_alias (__logb, logb) -diff -ur dietlibc-0.30/libm/s_sin.c dietlibc-0.30-libm-i386/libm/s_sin.c ---- dietlibc-0.30/libm/s_sin.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_sin.c 2006-06-28 20:07:36.000000000 +0200 -@@ -49,9 +49,9 @@ - #include "math_private.h" - - #ifdef __STDC__ -- double sin(double x) -+ double __sin(double x) - #else -- double sin(x) -+ double __sin(x) - double x; - #endif - { -@@ -80,3 +80,4 @@ - } - } - } -+weak_alias (__sin, sin) -diff -ur dietlibc-0.30/libm/s_tan.c dietlibc-0.30-libm-i386/libm/s_tan.c ---- dietlibc-0.30/libm/s_tan.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/s_tan.c 2006-06-28 19:57:55.000000000 +0200 -@@ -48,9 +48,9 @@ - #include "math_private.h" - - #ifdef __STDC__ -- double tan(double x) -+ double __tan(double x) - #else -- double tan(x) -+ double __tan(x) - double x; - #endif - { -@@ -74,3 +74,4 @@ - -1 -- n odd */ - } - } -+weak_alias (__tan, tan) -diff -ur dietlibc-0.30/libm/w_acos.c dietlibc-0.30-libm-i386/libm/w_acos.c ---- dietlibc-0.30/libm/w_acos.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_acos.c 2006-06-28 20:10:58.000000000 +0200 -@@ -23,9 +23,9 @@ - - - #ifdef __STDC__ -- double acos(double x) /* wrapper acos */ -+ double __acos(double x) /* wrapper acos */ - #else -- double acos(x) /* wrapper acos */ -+ double __acos(x) /* wrapper acos */ - double x; - #endif - { -@@ -41,3 +41,4 @@ - return z; - #endif - } -+weak_alias (__acos, acos) -diff -ur dietlibc-0.30/libm/w_acosh.c dietlibc-0.30-libm-i386/libm/w_acosh.c ---- dietlibc-0.30/libm/w_acosh.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_acosh.c 2006-06-28 20:02:44.000000000 +0200 -@@ -22,9 +22,9 @@ - #include "math_private.h" - - #ifdef __STDC__ -- double acosh(double x) /* wrapper acosh */ -+ double __acosh(double x) /* wrapper acosh */ - #else -- double acosh(x) /* wrapper acosh */ -+ double __acosh(x) /* wrapper acosh */ - double x; - #endif - { -@@ -40,3 +40,4 @@ - return z; - #endif - } -+weak_alias (__acosh, acosh) -diff -ur dietlibc-0.30/libm/w_asin.c dietlibc-0.30-libm-i386/libm/w_asin.c ---- dietlibc-0.30/libm/w_asin.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_asin.c 2006-06-28 20:03:08.000000000 +0200 -@@ -24,9 +24,9 @@ - - - #ifdef __STDC__ -- double asin(double x) /* wrapper asin */ -+ double __asin(double x) /* wrapper asin */ - #else -- double asin(x) /* wrapper asin */ -+ double __asin(x) /* wrapper asin */ - double x; - #endif - { -@@ -42,3 +42,4 @@ - return z; - #endif - } -+weak_alias (__asin, asin) -diff -ur dietlibc-0.30/libm/w_atan2.c dietlibc-0.30-libm-i386/libm/w_atan2.c ---- dietlibc-0.30/libm/w_atan2.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_atan2.c 2006-06-28 19:57:11.000000000 +0200 -@@ -22,9 +22,9 @@ - - - #ifdef __STDC__ -- double atan2(double y, double x) /* wrapper atan2 */ -+ double __atan2(double y, double x) /* wrapper atan2 */ - #else -- double atan2(y,x) /* wrapper atan2 */ -+ double __atan2(y,x) /* wrapper atan2 */ - double y,x; - #endif - { -@@ -40,3 +40,4 @@ - return z; - #endif - } -+weak_alias (__atan2, atan2) -diff -ur dietlibc-0.30/libm/w_atanh.c dietlibc-0.30-libm-i386/libm/w_atanh.c ---- dietlibc-0.30/libm/w_atanh.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_atanh.c 2006-06-28 20:02:23.000000000 +0200 -@@ -23,9 +23,9 @@ - - - #ifdef __STDC__ -- double atanh(double x) /* wrapper atanh */ -+ double __atanh(double x) /* wrapper atanh */ - #else -- double atanh(x) /* wrapper atanh */ -+ double __atanh(x) /* wrapper atanh */ - double x; - #endif - { -@@ -45,3 +45,4 @@ - return z; - #endif - } -+weak_alias (__atanh, atanh) -diff -ur dietlibc-0.30/libm/w_drem.c dietlibc-0.30-libm-i386/libm/w_drem.c ---- dietlibc-0.30/libm/w_drem.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_drem.c 2006-06-28 20:01:26.000000000 +0200 -@@ -6,10 +6,10 @@ - */ - - #include -+#include "math_private.h" - --double --drem(x, y) -- double x, y; -+double __drem(double x, double y) - { - return remainder(x, y); - } -+weak_alias (__drem, drem) -diff -ur dietlibc-0.30/libm/w_fmod.c dietlibc-0.30-libm-i386/libm/w_fmod.c ---- dietlibc-0.30/libm/w_fmod.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_fmod.c 2006-06-28 20:05:43.000000000 +0200 -@@ -23,9 +23,9 @@ - - - #ifdef __STDC__ -- double fmod(double x, double y) /* wrapper fmod */ -+ double __fmod(double x, double y) /* wrapper fmod */ - #else -- double fmod(x,y) /* wrapper fmod */ -+ double __fmod(x,y) /* wrapper fmod */ - double x,y; - #endif - { -@@ -41,3 +41,4 @@ - return z; - #endif - } -+weak_alias (__fmod, fmod) -diff -ur dietlibc-0.30/libm/w_hypot.c dietlibc-0.30-libm-i386/libm/w_hypot.c ---- dietlibc-0.30/libm/w_hypot.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_hypot.c 2006-06-28 20:08:54.000000000 +0200 -@@ -23,9 +23,9 @@ - - - #ifdef __STDC__ -- double hypot(double x, double y)/* wrapper hypot */ -+ double __hypot(double x, double y)/* wrapper hypot */ - #else -- double hypot(x,y) /* wrapper hypot */ -+ double __hypot(x,y) /* wrapper hypot */ - double x,y; - #endif - { -@@ -41,3 +41,4 @@ - return z; - #endif - } -+weak_alias (__hypot, hypot) -diff -ur dietlibc-0.30/libm/w_log.c dietlibc-0.30-libm-i386/libm/w_log.c ---- dietlibc-0.30/libm/w_log.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_log.c 2006-06-28 20:08:32.000000000 +0200 -@@ -23,9 +23,9 @@ - - - #ifdef __STDC__ -- double log(double x) /* wrapper log */ -+ double __log(double x) /* wrapper log */ - #else -- double log(x) /* wrapper log */ -+ double __log(x) /* wrapper log */ - double x; - #endif - { -@@ -41,3 +41,4 @@ - return __kernel_standard(x,x,17); /* log(x<0) */ - #endif - } -+weak_alias (__log, log) -diff -ur dietlibc-0.30/libm/w_log10.c dietlibc-0.30-libm-i386/libm/w_log10.c ---- dietlibc-0.30/libm/w_log10.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_log10.c 2006-06-28 20:08:11.000000000 +0200 -@@ -23,9 +23,9 @@ - - - #ifdef __STDC__ -- double log10(double x) /* wrapper log10 */ -+ double __log10(double x) /* wrapper log10 */ - #else -- double log10(x) /* wrapper log10 */ -+ double __log10(x) /* wrapper log10 */ - double x; - #endif - { -@@ -44,3 +44,4 @@ - return z; - #endif - } -+weak_alias (__log10, log10) -diff -ur dietlibc-0.30/libm/w_sqrt.c dietlibc-0.30-libm-i386/libm/w_sqrt.c ---- dietlibc-0.30/libm/w_sqrt.c 2006-06-28 20:15:02.000000000 +0200 -+++ dietlibc-0.30-libm-i386/libm/w_sqrt.c 2006-06-28 20:07:09.000000000 +0200 -@@ -22,9 +22,9 @@ - #include "math_private.h" - - #ifdef __STDC__ -- double sqrt(double x) /* wrapper sqrt */ -+ double __sqrt(double x) /* wrapper sqrt */ - #else -- double sqrt(x) /* wrapper sqrt */ -+ double __sqrt(x) /* wrapper sqrt */ - double x; - #endif - { -@@ -40,3 +40,4 @@ - return z; - #endif - } -+weak_alias (__sqrt, sqrt) diff --git a/base/dietlibc/no-spp.patch b/base/dietlibc/no-spp.patch deleted file mode 100644 index f7e08e685..000000000 --- a/base/dietlibc/no-spp.patch +++ /dev/null @@ -1,33 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/no-spp.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -The dynamic flavour does not built for us due undefined __guard, but since -we do not care for the size optimized binaries we do just do not enable it -automatically for now. - - - Rene Rebe - ---- dietlibc-0.30/dietfeatures.h 2006-04-04 07:35:14.000000000 +0200 -+++ dietlibc-0.30-fixed/dietfeatures.h 2006-06-30 15:38:05.000000000 +0200 -@@ -108,7 +107,7 @@ - * WANT_SSP_URANDOM and then not using -fstack-protector enlarges a - * binary by 152 bytes. */ - #if (__GNUC__>4) || ((__GNUC__==4) && (__GNUC_MINOR__>=1)) --#define WANT_SSP -+//#define WANT_SSP - #endif - /* Choose which canary seeder you want you can choose - * both but it will check urandom first and use xor as diff --git a/base/dietlibc/parse-config-9 b/base/dietlibc/parse-config-9 index 82d863e86..400ba0609 100644 --- a/base/dietlibc/parse-config-9 +++ b/base/dietlibc/parse-config-9 @@ -119,7 +119,7 @@ if [ "$pkg_dietlibc_useit" = 1 ]; then set_wrapper_and_misc ;; - coreutils|findutils|curl|procps|radiusclient-ng|libpcap|binutils|udhcp|file|libxml|lvm2|iputils) + coreutils|findutils|curl|procps|radiusclient-ng|libpcap|binutils|udhcp|file|libxml|lvm2|iputils|hotplug2) echo_status "Enabling non-portable BSD features." var_append CC_WRAPPER_INSERT " " "-D_BSD_SOURCE" set_wrapper_and_misc @@ -159,7 +159,7 @@ if [ "$pkg_dietlibc_useit" = 1 ]; then esac case "$pkg" in - sed|lilo|findutils|net-tools|dropbear|udev|rng-tools|udhcp|psmisc) + sed|lilo|findutils|net-tools|dropbear|udev|rng-tools|udhcp|psmisc|busybox|e2fsprogs) add_lib "-lcompat" ;; coreutils) diff --git a/base/dietlibc/patches/pkg_e2fsprogs.patch b/base/dietlibc/patches/pkg_e2fsprogs.patch deleted file mode 100644 index 88863ea33..000000000 --- a/base/dietlibc/patches/pkg_e2fsprogs.patch +++ /dev/null @@ -1,86 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/patches/pkg_e2fsprogs.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - ---- ./lib/ss/pager.c.orig 2006-06-21 15:44:59.000000000 +0200 -+++ ./lib/ss/pager.c 2006-06-21 15:45:54.000000000 +0200 -@@ -36,6 +36,9 @@ - #if (!defined(HAVE_PRCTL) && defined(linux)) - #include - #endif -+#ifndef PR_GET_DUMPABLE -+#define PR_GET_DUMPABLE 3 -+#endif - - static char MORE[] = "more"; - extern char *_ss_pager_name; ---- ./lib/ext2fs/test_io.c.orig 2006-06-21 15:51:20.000000000 +0200 -+++ ./lib/ext2fs/test_io.c 2006-06-21 15:51:47.000000000 +0200 -@@ -34,6 +34,10 @@ - #include "ext2_fs.h" - #include "ext2fs.h" - -+#ifndef PR_GET_DUMPABLE -+#define PR_GET_DUMPABLE 3 -+#endif -+ - /* - * For checking structure magic numbers... - */ ---- ./lib/blkid/cache.c.orig 2006-06-21 15:57:47.000000000 +0200 -+++ ./lib/blkid/cache.c 2006-06-21 15:58:16.000000000 +0200 -@@ -28,6 +28,10 @@ - #endif - #include "blkidP.h" - -+#ifndef PR_GET_DUMPABLE -+#define PR_GET_DUMPABLE 3 -+#endif -+ - int blkid_debug_mask = 0; - - ---- ./lib/ext2fs/ext2_types.h.in.orig 2006-07-08 00:36:04.000000000 +0000 -+++ ./lib/ext2fs/ext2_types.h.in 2006-07-08 00:37:06.000000000 +0000 -@@ -3,6 +3,8 @@ - * everything we need. (cross fingers) Other header files may have - * also defined the types that we need. - */ -+#include -+ - #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && !defined(_PPC64_TYPES_H) && \ - !defined(_EXT2_TYPES_H)) - #define _EXT2_TYPES_H ---- ./lib/blkid/blkid.h.orig 2006-07-08 00:41:20.000000000 +0000 -+++ ./lib/blkid/blkid.h 2006-07-08 00:41:38.000000000 +0000 -@@ -14,6 +14,7 @@ - #define _BLKID_BLKID_H - - #include -+#include - #include - - #ifdef __cplusplus ---- ./misc/util.c.orig 2006-07-08 00:58:39.000000000 +0000 -+++ ./misc/util.c 2006-07-08 00:59:42.000000000 +0000 -@@ -79,7 +79,7 @@ - void check_plausibility(const char *device) - { - int val; --#ifdef HAVE_OPEN64 -+#ifndef __NO_STAT64 - struct stat64 s; - - val = stat64(device, &s); diff --git a/base/dietlibc/patches/pkg_lvm2.patch b/base/dietlibc/patches/pkg_lvm2.patch deleted file mode 100644 index 89ddb57e4..000000000 --- a/base/dietlibc/patches/pkg_lvm2.patch +++ /dev/null @@ -1,37 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/patches/pkg_lvm2.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - ---- ./lib/metadata/metadata.c.orig 2006-06-21 18:03:02.000000000 +0200 -+++ ./lib/metadata/metadata.c 2006-06-21 18:10:12.000000000 +0200 -@@ -24,6 +24,9 @@ - #include "pv_alloc.h" - #include "activate.h" - -+#include -+#define UINT32_MAX (4294967295U) -+ - static int _add_pv_to_vg(struct format_instance *fid, struct volume_group *vg, - const char *pv_name) - { ---- ./lib/misc/lib.h.orig 2006-07-07 20:17:21.000000000 +0000 -+++ ./lib/misc/lib.h 2006-07-07 20:17:48.000000000 +0000 -@@ -28,5 +28,6 @@ - #include "lvm-types.h" - - #include -+#include - - #endif diff --git a/base/dietlibc/patches/pkg_util-linux.patch b/base/dietlibc/patches/pkg_util-linux.patch deleted file mode 100644 index ba8c4b8a7..000000000 --- a/base/dietlibc/patches/pkg_util-linux.patch +++ /dev/null @@ -1,75 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/patches/pkg_util-linux.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -Some hackery, mostly even semi-valid fixes. - - - Rene Rebe - ---- util-linux-2.12q/mount/mount_by_label.c.vanilla 2005-06-16 01:20:52.000000000 +0200 -+++ util-linux-2.12q/mount/mount_by_label.c 2005-06-16 01:21:59.000000000 +0200 -@@ -189,7 +189,7 @@ - if (!procpt) { - static int warn = 0; - if (!warn++) -- error (_("%s: could not open %s, so UUID and LABEL " -+ fprintf (stderr, _("%s: could not open %s, so UUID and LABEL " - "conversion cannot be done.\n"), - progname, PROC_PARTITIONS); - return; ---- util-linux-2.12q/mount/fstab.c.vanilla 2005-06-16 01:19:50.000000000 +0200 -+++ util-linux-2.12q/mount/fstab.c 2005-06-16 01:20:00.000000000 +0200 -@@ -400,7 +400,7 @@ - static int signals_have_been_setup = 0; - - /* Ensure that the lock is released if we are interrupted. */ --extern char *strsignal(int sig); /* not always in */ -+//extern char *strsignal(int sig); /* not always in */ - - static void - handler (int sig) { ---- util-linux-2.12q/text-utils/column.c.vanilla 2005-06-16 01:23:44.000000000 +0200 -+++ util-linux-2.12q/text-utils/column.c 2005-06-16 01:24:00.000000000 +0200 -@@ -41,6 +41,8 @@ - #include - #include - -+#include -+ - #include - #include - #include ---- util-linux-2.12q/partx/solaris.c.vanilla 2005-06-16 01:34:09.000000000 +0200 -+++ util-linux-2.12q/partx/solaris.c 2005-06-16 01:34:15.000000000 +0200 -@@ -5,8 +5,6 @@ - #define SOLARIS_X86_NUMSLICE 8 - #define SOLARIS_X86_VTOC_SANE (0x600DDEEEUL) - --typedef int daddr_t; /* or long - check */ -- - struct solaris_x86_slice { - unsigned short s_tag; /* ID tag of partition */ - unsigned short s_flag; /* permision flags */ ---- util-linux-2.12q/text-utils/pg.c.vanilla 2006-01-01 10:40:13.000000000 +0000 -+++ util-linux-2.12q/text-utils/pg.c 2006-01-01 10:40:20.000000000 +0000 -@@ -46,7 +46,7 @@ - #ifndef TIOCGWINSZ - #include - #endif --#include -+#include - #include - #include - #include diff --git a/base/dietlibc/ppc-select.patch b/base/dietlibc/ppc-select.patch deleted file mode 100644 index 9cf7e8309..000000000 --- a/base/dietlibc/ppc-select.patch +++ /dev/null @@ -1,33 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/ppc-select.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - - -We must not use the old select syscall ... - - - Rene Rebe - ---- /dev/null 2006-01-03 10:10:10.127999000 +0100 -+++ dietlibc-0.29/ppc/select.S 2006-01-03 11:20:43.000000000 +0100 -@@ -0,0 +1,3 @@ -+#include "syscalls.h" -+ -+syscall(_newselect,select) ---- /dev/null 2006-01-03 10:10:10.127999000 +0100 -+++ dietlibc-0.29/ppc64/select.S 2006-01-03 11:16:50.000000000 +0100 -@@ -0,0 +1,3 @@ -+#include "syscalls.h" -+ -+syscall(_newselect,select) diff --git a/base/dietlibc/sane-defaults.patch b/base/dietlibc/sane-defaults.patch deleted file mode 100644 index 855dc01a7..000000000 --- a/base/dietlibc/sane-defaults.patch +++ /dev/null @@ -1,90 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/sane-defaults.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -For certain architectures we need to mangle the opts to get working binaries. -This is for example the case on mips, where we need -mnoabi-calls if we -do not want get segfaults ... Alternatively instead of injecting the generic --Os battery of options we could define fine-grained injections in our build -system but I find working with up-stream people and those defaults might be -the better choice. - - - Rene Rebe - ---- dietlibc-0.29/diet.c 2005-05-18 14:38:55.000000000 +0000 -+++ dietlibc-0.29-improved/diet.c 2005-11-27 15:11:24.000000000 +0000 -@@ -33,8 +33,8 @@ - "sparc64","-Os","-m64","-mhard-quad-float",0, - "alpha","-Os","-fomit-frame-pointer",0, - "arm","-Os","-fomit-frame-pointer",0, -- "mips","-Os","-fomit-frame-pointer","-mno-abicalls","-fno-pic","-G","0",0, -- "mipsel","-Os","-fomit-frame-pointer","-mno-abicalls","-fno-pic","-G","0",0, -+ "mips","-Os","-fomit-frame-pointer","-G","0",0, -+ "mipsel","-Os","-fomit-frame-pointer","-G","0",0, - "ppc","-Os","-fomit-frame-pointer","-mpowerpc-gpopt","-mpowerpc-gfxopt",0, - "ppc64","-Os","-fomit-frame-pointer","-mpowerpc-gpopt","-mpowerpc-gfxopt",0, - "s390","-Os","-fomit-frame-pointer",0, -@@ -44,6 +44,13 @@ - "x86_64","-Os","-fstrict-aliasing","-momit-leaf-frame-pointer","-mfancy-math-387",0, - 0}; - -+static const char* Opts[] = { -+ "mips", "-mno-abicalls","-fno-pic",0, -+ "mipsel", "-mno-abicalls","-fno-pic",0, -+ "sparc64", "-m64","-mhard-quad-float",0, -+ 0 -+}; -+ - static void usage(void) { - __write2( - #ifdef __DYN_LIB -@@ -77,6 +83,7 @@ - #endif - const char *nostdlib="-nostdlib"; - const char *libgcc="-lgcc"; -+ const char **o; - char dashL[1000]; - char dashstatic[]="-static"; - int i; -@@ -333,8 +340,21 @@ - } - #endif - *dest++="-D__dietlibc__"; -+ /* strictly needed opts */ -+ for (o=Opts;*o;++o) { -+ if (!strcmp(*o,shortplatform)) { -+ ++o; -+ while (*o) { -+ *dest++=(char*)*o; -+ ++o; -+ } -+ break; -+ } else -+ while (*o) ++o; -+ } -+ - if (mangleopts) { -- const char **o=Os; -+ o=Os; - - { - int fd; ---- dietlibc-0.30/sparc64/Makefile.add 2004-03-25 21:11:00.000000000 +0000 -+++ dietlibc-0.30-patch/sparc64/Makefile.add 2006-07-31 10:12:05.000000000 +0000 -@@ -1,3 +1,3 @@ --CFLAGS+=-m64 -Os -+CFLAGS+=-m64 -Os -mhard-quad-float - VPATH:=sparc64:syscalls.s:$(VPATH) - LIBOBJ+=$(patsubst %,$(OBJDIR)/%,__time.o) diff --git a/base/dietlibc/sparc64-longjmp.patch b/base/dietlibc/sparc64-longjmp.patch deleted file mode 100644 index fbec479d3..000000000 --- a/base/dietlibc/sparc64-longjmp.patch +++ /dev/null @@ -1,34 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/sparc64-longjmp.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -This fixes the sparc64 longjmp to inject the return value at the correct -memory location (and not SIGBUS). MC_G1 is just the index in the register -array, and before that array there are 4 more words placed, thus the offset -4 and multiple with the word-size ... - - - Rene Rebe - ---- dietlibc-0.29/sparc64/longjmp.S 2002-09-16 11:17:02.000000000 +0000 -+++ dietlibc-0.29-fixed/sparc64/longjmp.S 2006-06-21 15:00:15.000000000 +0000 -@@ -11,7 +11,7 @@ - .type __libc_longjmp,function - __libc_longjmp: - movrz %o1, 1, %o1 /* never return 0 in setjmp */ -- stx %o1, [ %o0+MC_G1 ] /* save return value in context */ -+ stx %o1, [%o0 + (4+MC_G1) * 8] /* save return value in context */ - ld [ %o0+FLAG_SAVEMASK ], %o1 /* has setjmp saved the signalmask ? */ - ta 0x6f /* setcontext / restore context */ - .size __libc_longjmp,.-__libc_longjmp diff --git a/base/dietlibc/stdint.patch b/base/dietlibc/stdint.patch new file mode 100644 index 000000000..f50b4a107 --- /dev/null +++ b/base/dietlibc/stdint.patch @@ -0,0 +1,89 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../dietlibc/stdint.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./include/stdint.h.orig 2007-07-18 19:35:47.000000000 -0400 ++++ ./include/stdint.h 2007-07-18 19:51:06.000000000 -0400 +@@ -26,28 +26,6 @@ + typedef uint64_t uint_fast64_t; + + +- +-/* The ISO C99 standard specifies that in C++ implementations these +- should only be defined if explicitly requested. */ +-#if !defined __cplusplus || defined __STDC_LIMIT_MACROS +- +-/* FIXME: missing are +- INTx_MIN, INTx_MAX, UINTx_MAX +- INT_LEASTx_MIN, INT_LEASTx_MAX, UINT_LEASTx_MAX +- INT_FASTx_MIN, INT_FASTx_MAX, UINT_FASTx_MAX +- INTMAX_MIN, INTMAX_MAX, UINTMAX_MAX +- INTPTR_MIN, INTPTR_MAX, UINTPTR_MAX +- PTRDIFF_MIN, PTRDIFF_MAX +- SIG_ATOMIC_MIN, SIG_ATOMIC_MAX +- SIZE_MAX +- WCHAR_MIN, WCHAR_MAX +- WINT_MIN, WINT_MAX +-*/ +- +-#endif /* C++ && limit macros */ +- +- +- + /* The ISO C99 standard specifies that in C++ implementations these + should only be defined if explicitly requested. */ + #if !defined __cplusplus || defined __STDC_CONSTANT_MACROS +@@ -83,6 +61,41 @@ + + #endif /* C++ && constant macros */ + ++/* The ISO C99 standard specifies that in C++ implementations these ++ should only be defined if explicitly requested. */ ++#if !defined __cplusplus || defined __STDC_LIMIT_MACROS ++ ++/* Minimum of signed integral types. */ ++# define INT8_MIN (-128) ++# define INT16_MIN (-32767-1) ++# define INT32_MIN (-2147483647-1) ++# define INT64_MIN (-INT64_C(9223372036854775807)-1) ++/* Maximum of signed integral types. */ ++# define INT8_MAX (127) ++# define INT16_MAX (32767) ++# define INT32_MAX (2147483647) ++# define INT64_MAX (INT64_C(9223372036854775807)) ++ ++/* Maximum of unsigned integral types. */ ++# define UINT8_MAX (255) ++# define UINT16_MAX (65535) ++# define UINT32_MAX (4294967295U) ++# define UINT64_MAX (UINT64_C(18446744073709551615)) ++ ++/* FIXME: missing are ++ INT_LEASTx_MIN, INT_LEASTx_MAX, UINT_LEASTx_MAX ++ INT_FASTx_MIN, INT_FASTx_MAX, UINT_FASTx_MAX ++ INTMAX_MIN, INTMAX_MAX, UINTMAX_MAX ++ INTPTR_MIN, INTPTR_MAX, UINTPTR_MAX ++ PTRDIFF_MIN, PTRDIFF_MAX ++ SIG_ATOMIC_MIN, SIG_ATOMIC_MAX ++ SIZE_MAX ++ WCHAR_MIN, WCHAR_MAX ++ WINT_MIN, WINT_MAX ++*/ ++ ++#endif /* C++ && limit macros */ ++ + __END_DECLS + + #endif diff --git a/base/dietlibc/x86_64-stat-fix.patch b/base/dietlibc/x86_64-stat-fix.patch deleted file mode 100644 index f9d10ef11..000000000 --- a/base/dietlibc/x86_64-stat-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/x86_64-stat-fix.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- -diff -Naur dietlibc_cvs-orig/include/sys/stat.h dietlibc_cvs/include/sys/stat.h ---- dietlibc_cvs-orig/include/sys/stat.h 2005-03-15 10:51:22.000000000 +0200 -+++ dietlibc_cvs/include/sys/stat.h 2005-04-30 18:50:40.000000000 +0300 -@@ -520,11 +520,11 @@ - unsigned long st_size; - unsigned long st_blksize; - unsigned long st_blocks; -- unsigned long st_atime; -+ signed long st_atime; - unsigned long __reserved0; -- unsigned long st_mtime; -+ signed long st_mtime; - unsigned long __reserved1; -- unsigned long st_ctime; -+ signed long st_ctime; - unsigned long __reserved2; - long __unused[3]; - }; diff --git a/base/dmraid/destdir.patch b/base/dmraid/destdir.patch new file mode 100644 index 000000000..9fe877dcf --- /dev/null +++ b/base/dmraid/destdir.patch @@ -0,0 +1,35 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../dmraid/destdir.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./make.tmpl.in.orig 2007-06-12 20:01:27.000000000 -0400 ++++ ./make.tmpl.in 2007-06-12 20:02:03.000000000 -0400 +@@ -25,11 +25,11 @@ + exec_prefix = $(DESTDIR)@exec_prefix@ + bindir = @bindir@ + ifeq ("@KLIBC@", "no") +- libdir = @libdir@ +- sbindir = @sbindir@ +- includedir = @includedir@ +- infodir = @infodir@ +- mandir = @mandir@ ++ libdir = $(DESTDIR)@libdir@ ++ sbindir = $(DESTDIR)@sbindir@ ++ includedir = $(DESTDIR)@includedir@ ++ infodir = $(DESTDIR)@infodir@ ++ mandir = $(DESTDIR)@mandir@ + else + libdir = $(DESTDIR)@KLIBC_LIB_DIR@ + sbindir = $(DESTDIR)@KLIBC_SBIN_DIR@ diff --git a/base/dmraid/dmraid.conf b/base/dmraid/dmraid.conf index 0c05a8e2d..c1833ca5f 100644 --- a/base/dmraid/dmraid.conf +++ b/base/dmraid/dmraid.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../dmraid/dmraid.conf +# Filename: package/.../dmraid/dmraid.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,6 +11,8 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- -srcdir=dmraid/* +srcdir="dmraid/$ver" + +unset STRIP diff --git a/base/embutils/embutils.desc b/base/embutils/embutils.desc index 0b1eba174..4d97bda9e 100644 --- a/base/embutils/embutils.desc +++ b/base/embutils/embutils.desc @@ -29,7 +29,7 @@ [L] GPL [S] Beta [V] 0.18 -[P] X -1---5---9 102.040 +[P] X -?---5---9 102.040 [D] 835572 embutils-0.18.tar.bz2 http://dl.fefe.de/ diff --git a/base/gcc/no-libstdc++.patch.cross0 b/base/gcc/no-libstdc++.patch.toolchain similarity index 86% rename from base/gcc/no-libstdc++.patch.cross0 rename to base/gcc/no-libstdc++.patch.toolchain index 8cb62d089..f58bcccd5 100644 --- a/base/gcc/no-libstdc++.patch.cross0 +++ b/base/gcc/no-libstdc++.patch.toolchain @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../gcc/no-libstdc++.patch.cross0 +# Filename: package/.../gcc/no-libstdc++.patch.toolchain +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,7 +13,7 @@ # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- We first only build the c++ compiler for the toolchain cross-compiler. Later, in the next stage, when we have cross built the C library, we also build the diff --git a/base/glark/glark.desc b/base/glark/glark.desc index 211eaaaee..5f0513684 100644 --- a/base/glark/glark.desc +++ b/base/glark/glark.desc @@ -12,7 +12,6 @@ [COPY] GNU General Public License can be found in the file COPYING. [COPY] --- SDE-COPYRIGHT-NOTE-END --- - [I] A replacement for (or supplement to) the grep family [T] Glark offers: Perl compatible regular expressions, @@ -29,7 +28,7 @@ [L] LGPL [S] Stable [V] 1.8.0 -[P] X -1---5---9 107.900 +[P] X -?---5---9 107.900 [D] 51522196 glark-1.8.0.tar.gz http://www.incava.org/pub/glark/ diff --git a/base/glib/glib.conf b/base/glib/glib.conf index 33eb6b511..751ece1ba 100644 --- a/base/glib/glib.conf +++ b/base/glib/glib.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../glib/glib.conf -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -15,14 +15,8 @@ if ! atstage native; then # help configure - glib_config_cache() { - cat <<-EOT >> config.cache - glib_cv_stack_grows=yes - glib_cv_uscore=no - ac_cv_func_posix_getpwuid_r=yes - EOT - } - - hook_add preconf 5 "glib_config_cache" + var_append configcache ' ' 'glib_cv_stack_grows=yes' + var_append configcache ' ' 'glib_cv_uscore=no' + var_append configcache ' ' 'ac_cv_func_posix_getpwuid_r=yes' fi diff --git a/base/hotplug++/hotplug++.desc b/base/hotplug++/hotplug++.desc index d38983fa3..b2ac2bb89 100644 --- a/base/hotplug++/hotplug++.desc +++ b/base/hotplug++/hotplug++.desc @@ -23,7 +23,6 @@ [A] Juergen "George" Sawinski [A] Rene Rebe [M] Juergen "George" Sawinski -[M] The OpenSDE Community [C] base/system [F] DIETLIBC @@ -31,7 +30,7 @@ [L] GPL [S] Beta [V] 0.1.1 -[P] X -1---5---9 102.045 +[P] X -?---5---9 102.045 [D] 2091707560 hotplug++-0.1.1.tar.bz2 http://dl.exactcode.de/oss/hotplug++/ diff --git a/base/hotplug2/destdir.patch b/base/hotplug2/destdir.patch new file mode 100644 index 000000000..26e8e4ef8 --- /dev/null +++ b/base/hotplug2/destdir.patch @@ -0,0 +1,95 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../hotplug2/destdir.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./docs/Makefile.orig 2007-06-10 12:42:15.000000000 -0400 ++++ ./docs/Makefile 2007-06-10 12:43:57.000000000 -0400 +@@ -2,12 +2,13 @@ + + BINS= + SUBDIRS= +- ++DESTDIR= ++MANDIR=/usr/share/man + + all: + + install: +- $(INSTALL) $(wildcard *.8) /usr/share/man/man8/ ++ $(INSTALL) $(wildcard *.8) $(DESTDIR)$(MANDIR)/man8/ + + + include ../common.mak +--- ./Makefile.orig 2007-06-10 12:41:27.000000000 -0400 ++++ ./Makefile 2007-06-10 12:41:57.000000000 -0400 +@@ -2,12 +2,13 @@ + + BINS=hotplug2 hotplug2-dnode + SUBDIRS=linux24_compat docs examples ++DESTDIR= + + + all: $(BINS) + + install: +- $(INSTALL_BIN) $(BINS) /sbin/ ++ $(INSTALL_BIN) $(BINS) $(DESTDIR)/sbin/ + + + hotplug2: hotplug2.o childlist.o mem_utils.o rules.o +--- ./linux24_compat/Makefile.orig 2007-06-10 12:45:14.000000000 -0400 ++++ ./linux24_compat/Makefile 2007-06-10 12:45:38.000000000 -0400 +@@ -2,13 +2,14 @@ + + BINS=generate_alias hotplug2-coldplug-2.4 hotplug2-modwrap + SUBDIRS= ++DESTDIR= + + + all: $(BINS) + + install: +- $(INSTALL_BIN) hotplug2-coldplug-2.4 hotplug2-modwrap /sbin/ +- $(INSTALL_BIN) generate_alias /usr/sbin/ ++ $(INSTALL_BIN) hotplug2-coldplug-2.4 hotplug2-modwrap $(DESTDIR)/sbin/ ++ $(INSTALL_BIN) generate_alias $(DESTDIR)/usr/sbin/ + + + hotplug2-coldplug-2.4: hotplug2-coldplug-2.4.o ../parser_utils.o ../filemap_utils.o ../mem_utils.o +--- ./examples/Makefile.orig 2007-06-10 12:44:09.000000000 -0400 ++++ ./examples/Makefile 2007-06-10 12:47:48.000000000 -0400 +@@ -2,17 +2,19 @@ + + BINS= + SUBDIRS= ++DESTDIR= ++KERNELVER=`uname -r` + + + all: + + install: +- case "`uname -r`" in \ ++ case "$(KERNELVER)" in \ + 2.6.*) \ +- $(INSTALL) hotplug2.rules-2.6kernel /etc/hotplug2.rules \ ++ $(INSTALL) hotplug2.rules-2.6kernel $(DESTDIR)/etc/hotplug2.rules \ + ;; \ + *) \ +- $(INSTALL) hotplug2.rules-2.4kernel /etc/hotplug2.rules \ ++ $(INSTALL) hotplug2.rules-2.4kernel $(DESTDIR)/etc/hotplug2.rules \ + ;; \ + esac + diff --git a/base/hotplug2/dietlibc.patch b/base/hotplug2/dietlibc.patch new file mode 100644 index 000000000..a85bb57f8 --- /dev/null +++ b/base/hotplug2/dietlibc.patch @@ -0,0 +1,20 @@ +--- ./hotplug2.c.orig 2007-08-15 16:36:03.000000000 -0400 ++++ ./hotplug2.c 2007-08-15 16:39:05.000000000 -0400 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -27,6 +28,9 @@ + #include "rules.h" + #include "childlist.h" + ++#ifndef WAIT_ANY ++#define WAIT_ANY (pid_t)-1 ++#endif + #define TERMCONDITION (persistent == 0 && \ + coldplug_p == FORK_FINISHED && \ + child == NULL && \ diff --git a/base/hotplug2/hotplug2.conf b/base/hotplug2/hotplug2.conf new file mode 100644 index 000000000..4dbba95c8 --- /dev/null +++ b/base/hotplug2/hotplug2.conf @@ -0,0 +1,17 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../hotplug2/hotplug2.conf +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +pkgprefix -t linux-header + +var_append makeinstopt ' ' "KERNELVER=$( pkgprefix ver linux-header )" diff --git a/base/hotplug2/hotplug2.desc b/base/hotplug2/hotplug2.desc new file mode 100644 index 000000000..e08b200a7 --- /dev/null +++ b/base/hotplug2/hotplug2.desc @@ -0,0 +1,35 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../hotplug2/hotplug2.desc +[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] +[COPY] More information can be found in the files COPYING and README. +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-COPYRIGHT-NOTE-END --- + +[I] A tiny udev/hotplug replacement for early userspace and weak boxes + +[T] Hotplug2 is aimed at early Linux user space, i. E. Initramfs or initrd, +[T] and possibly also at embedded devices (such as WRT-like routers) or +[T] very weak machines, such as 386/486. It connects to the uevent netlink +[T] socket and reads events. The application generally operates in two modes: +[T] dumb and smart. + +[U] http://isteve.bofh.cz/~isteve/hotplug2/ + +[A] iSteve +[M] Alejandro Mery + +[C] extra/tool + +[L] GPL +[S] Beta +[V] 0.9 +[P] X -?---5---9 800.000 + +[D] 2614571654 hotplug2-0.9.tar.gz http://isteve.bofh.cz/~isteve/hotplug2/ diff --git a/base/hotplug2/modwrap-fallback.patch b/base/hotplug2/modwrap-fallback.patch new file mode 100644 index 000000000..d08be4a17 --- /dev/null +++ b/base/hotplug2/modwrap-fallback.patch @@ -0,0 +1,31 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../hotplug2/modwrap-fallback.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./linux24_compat/hotplug2-modwrap.c (revision 100) ++++ ./linux24_compat/hotplug2-modwrap.c (working copy) +@@ -122,6 +122,12 @@ + free(module); + free(line); + } ++ ++ if (strcmp(argv[argc - 1], match_alias) == 0) { ++ if (execute(argv)) { ++ ERROR("execute", "Unable to execute: `%s'.", argv[0]); ++ } ++ } + + free(filename); + free(match_alias); diff --git a/base/less/less.desc b/base/less/less.desc index 1cb3d0875..7917bc07e 100644 --- a/base/less/less.desc +++ b/base/less/less.desc @@ -31,7 +31,7 @@ [L] GPL [S] Stable [V] 394 -[P] X -1---5---9 108.800 +[P] X -?---5---9 108.800 [D] 3454954325 less-394.tar.gz http://www.greenwoodsoftware.com/less/ [D] 190724856 less-394-signal_fix-1.patch http://www.linuxfromscratch.org/patches/downloads/less/ diff --git a/base/libpcap/libpcap.conf b/base/libpcap/libpcap.conf index 6b9de95ed..dbfa24fb0 100644 --- a/base/libpcap/libpcap.conf +++ b/base/libpcap/libpcap.conf @@ -28,7 +28,8 @@ hook_add postmake 5 "cp -fv pcap-int.h $root/$prefix/include/" # we need to perform some config hacking for cross compilation ... :-( if ! atstage native; then - var_append confopt " " "--with-pcap=linux --cache=./config.cache" - hook_add preconf 5 "echo 'ac_cv_linux_vers=2' >> ./config.cache" + var_append configcache ' ' 'ac_cv_linux_vers=2' + + var_append confopt " " "--with-pcap=linux" fi diff --git a/base/linux26/linux26.desc b/base/linux26/linux26.desc index 1739c1afd..502195c5d 100644 --- a/base/linux26/linux26.desc +++ b/base/linux26/linux26.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable [V] 2.6.21.6 -[P] X -1---5---9 102.060 +[P] X -?---5---9 102.060 [D] 28349517 linux-2.6.21.tar.bz2 http://ftp.kernel.org/pub/linux/kernel/v2.6/ [D] 1416663892 patch-2.6.21.6.bz2 http://kernel.org/pub/linux/kernel/v2.6/ diff --git a/base/linux26mm/linux26mm.desc b/base/linux26mm/linux26mm.desc index e64555c4e..b03300cfb 100644 --- a/base/linux26mm/linux26mm.desc +++ b/base/linux26mm/linux26mm.desc @@ -33,7 +33,7 @@ [L] GPL [S] Stable [V] 2.6.18-mm3 -[P] X -1---5---9 102.060 +[P] X -?---5---9 102.060 [D] 1833570624 linux-2.6.18.tar.bz2 http://ftp.kernel.org/pub/linux/kernel/v2.6/ [D] 264215164 patch-2.6.18-mm3.bz2 !http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18/2.6.18-mm3/2.6.18-mm3.bz2 diff --git a/base/lvm2/dietlibc.patch b/base/lvm2/dietlibc.patch new file mode 100644 index 000000000..568868414 --- /dev/null +++ b/base/lvm2/dietlibc.patch @@ -0,0 +1,25 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../lvm2/dietlibc.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./lib/misc/lib.h.orig 2007-07-18 21:00:06.000000000 -0400 ++++ ./lib/misc/lib.h 2007-07-18 21:00:36.000000000 -0400 +@@ -31,5 +31,6 @@ + #include "lvm-wrappers.h" + + #include ++#include + + #endif diff --git a/base/lvm2/lvm2.conf b/base/lvm2/lvm2.conf index 884139372..dd0e25e74 100644 --- a/base/lvm2/lvm2.conf +++ b/base/lvm2/lvm2.conf @@ -1,8 +1,8 @@ -#!/bin/sh -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../lvm2/lvm2.conf +# Filename: package/.../lvm2/lvm2.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -11,29 +11,32 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- -prefix='' +# --- SDE-COPYRIGHT-NOTE-END --- + +prefix= set_confopt if [ "$SDECFG_STATIC" == 1 ]; then var_append patchfiles ' ' "$confdir/no_dynamic.diff" var_append confopt ' ' '--enable-static_link=yes' - - # let it read lvm1 format metadata (via device-mapper) - var_append extraconfopt ' ' '--with-lvm1=internal' -else - var_append extraconfopt ' ' '--with-lvm1=shared' fi # if there is no device-mapper, lvm2 tools fallback to $0.lvm1 if pkginstalled linux24; then var_append extraconfopt ' ' '--enable-lvm1_fallback' -fi -if ! atstage native; then - autogen=1 + if [ "$SDECFG_STATIC" == 1 ]; then + # let it read lvm1 format metadata (via device-mapper) + var_append extraconfopt ' ' '--with-lvm1=internal' + else + var_append extraconfopt ' ' '--with-lvm1=shared' + fi +else + var_append extraconfopt ' ' '--with-lvm1=none' fi +atstage native || autogen=1 + # our STRIP definition makes conflict with this package which defined STRIP # as an argument for `install` -var_remove_regex makeinstopt ' ' 'STRIP=.*' +export STRIP= diff --git a/base/lvm2/lvm2.desc b/base/lvm2/lvm2.desc index dd66573d3..84351fd18 100644 --- a/base/lvm2/lvm2.desc +++ b/base/lvm2/lvm2.desc @@ -27,15 +27,15 @@ [U] http://sources.redhat.com/lvm2/ -[A] linux-lvm@redhat.com +[A] Red Hat, Inc. [M] Alejandro Mery [C] extra/filesystem [L] GPL [S] Stable -[V] 2.02.19 -[P] X ---3-----9 184.000 +[V] 2.02.25 +[P] X -?-3-----9 184.000 -[D] 2094513046 LVM2.2.02.19.tgz ftp://sources.redhat.com/pub/lvm2/ +[D] 2611074846 LVM2.2.02.25.tgz ftp://sources.redhat.com/pub/lvm2/ diff --git a/base/lvm2/no_dynamic.diff b/base/lvm2/no_dynamic.diff index 075cff154..5bb4cbc9f 100644 --- a/base/lvm2/no_dynamic.diff +++ b/base/lvm2/no_dynamic.diff @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../lvm2/no_dynamic.diff +# Filename: package/.../lvm2/no_dynamic.diff +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,7 +13,7 @@ # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- --- ./make.tmpl.in.orig 2006-07-07 19:57:41.000000000 +0000 +++ ./make.tmpl.in 2006-07-07 19:58:24.000000000 +0000 @@ -25,9 +26,9 @@ all: $(SUBDIRS) $(TARGETS) ---- ./tools/Makefile.in.orig 2006-04-19 15:33:06.000000000 +0000 -+++ ./tools/Makefile.in 2006-07-07 21:25:45.000000000 +0000 -@@ -66,11 +66,10 @@ +--- ./tools/Makefile.in.orig 2007-03-30 17:00:26.000000000 -0400 ++++ ./tools/Makefile.in 2007-05-17 19:56:45.000000000 -0400 +@@ -67,11 +67,10 @@ vgsplit.c TARGETS =\ @@ -42,8 +43,8 @@ ifeq ("@STATIC_LINK@", "yes") TARGETS += lvm.static -@@ -83,7 +82,7 @@ - CLEAN_TARGETS = liblvm2cmd.so liblvm2cmd.a lvm lvm.static lvm.cflow lvm.xref lvm.tree lvm.rxref lvm.rtree +@@ -87,7 +86,7 @@ + lvmcmdlib.o lvm-static.o ifeq ("@CMDLIB@", "yes") - TARGETS += liblvm2cmd.so @@ -51,21 +52,34 @@ INSTALL_TARGETS += $(INSTALL_CMDLIB_TARGETS) endif -@@ -144,7 +143,7 @@ - $(includedir)/lvm2cmd.h +--- ./tools/Makefile.in.orig 2007-07-18 20:11:11.000000000 -0400 ++++ ./tools/Makefile.in 2007-07-18 20:12:41.000000000 -0400 +@@ -105,7 +105,7 @@ - install_cmdlib_static: liblvm2cmd.a -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.a \ -+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 liblvm2cmd.a \ - $(libdir)/liblvm2cmd.a.$(LIB_VERSION) - $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ -@@ -162,7 +161,7 @@ - ) + lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a + $(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \ +- $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic ++ $(LDFLAGS) $(LVMLIBS) $(LIBS) - install_tools_static: lvm.static -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \ -+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 lvm.static \ - $(staticdir)/lvm.static - - install: $(INSTALL_TARGETS) + liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o + cat $(top_srcdir)/lib/liblvm.a > $@ +--- ./configure.orig 2007-07-18 20:19:25.000000000 -0400 ++++ ./configure 2007-07-18 20:19:44.000000000 -0400 +@@ -1948,7 +1948,6 @@ + CLDWHOLEARCHIVE="-Wl,-whole-archive" + CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive" + LDDEPS="$LDDEPS .export.sym" +- LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + LIB_SUFFIX="so" + DEVMAPPER=yes + ODIRECT=yes +--- ./configure.in.orig 2007-07-18 20:22:31.000000000 -0400 ++++ ./configure.in 2007-07-18 20:22:42.000000000 -0400 +@@ -37,7 +37,6 @@ + CLDWHOLEARCHIVE="-Wl,-whole-archive" + CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive" + LDDEPS="$LDDEPS .export.sym" +- LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + LIB_SUFFIX="so" + DEVMAPPER=yes + ODIRECT=yes diff --git a/base/man/man.desc b/base/man/man.desc index a4a182ed1..b02df9e60 100644 --- a/base/man/man.desc +++ b/base/man/man.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable [V] 1.6e -[P] X -1---5---9 109.000 +[P] X -?---5---9 109.000 [D] 2611541767 man-1.6e.tar.gz http://primates.ximian.com/~flucifredi/man/ diff --git a/base/mdadm/dietlibc.patch b/base/mdadm/dietlibc.patch new file mode 100644 index 000000000..44a22b1b6 --- /dev/null +++ b/base/mdadm/dietlibc.patch @@ -0,0 +1,37 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../mdadm/dietlibc.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./config.c.orig 2007-07-18 21:10:32.000000000 -0400 ++++ ./config.c 2007-07-18 21:10:45.000000000 -0400 +@@ -29,7 +29,7 @@ + + #include "mdadm.h" + #include "dlink.h" +-#include ++#include + #include + #include + #include +--- ./Monitor.c.orig 2007-07-18 21:17:39.000000000 -0400 ++++ ./Monitor.c 2007-07-18 21:17:57.000000000 -0400 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mailfrom, + char *cmd, int dosyslog); diff --git a/base/mdadm/gcc-4.1.patch b/base/mdadm/gcc-4.1.patch new file mode 100644 index 000000000..12f2daad2 --- /dev/null +++ b/base/mdadm/gcc-4.1.patch @@ -0,0 +1,27 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../mdadm/gcc-4.1.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./Detail.c.orig 2007-06-14 15:12:07.000000000 -0400 ++++ ./Detail.c 2007-06-14 15:12:19.000000000 -0400 +@@ -59,7 +59,7 @@ + void *super = NULL; + int rv = test ? 4 : 1; + int avail_disks = 0; +- char *avail; ++ char *avail = NULL; + + if (fd < 0) { + fprintf(stderr, Name ": cannot open %s: %s\n", diff --git a/base/mdadm/mdadm.desc b/base/mdadm/mdadm.desc index 553f44425..aa30489f1 100644 --- a/base/mdadm/mdadm.desc +++ b/base/mdadm/mdadm.desc @@ -29,7 +29,7 @@ [L] GPL [S] Stable [V] 2.6.2 -[P] X -----5---9 194.000 +[P] X -?---5---9 194.000 [D] 2363148714 mdadm-2.6.2.tar.bz2 http://www.kernel.org/pub/linux/utils/raid/mdadm/ diff --git a/base/minised/minised.desc b/base/minised/minised.desc index 0b816ffb2..265b511da 100644 --- a/base/minised/minised.desc +++ b/base/minised/minised.desc @@ -33,7 +33,7 @@ [L] GPL [S] Stable [V] 1.12 -[P] X -1---5---9 102.041 +[P] X -?---5---9 102.041 [D] 358312932 minised-1.12.tar.gz http://dl.exactcode.de/oss/minised/ diff --git a/base/mkpkg/mkpkg.desc b/base/mkpkg/mkpkg.desc index 4ac51b335..8452fdf06 100644 --- a/base/mkpkg/mkpkg.desc +++ b/base/mkpkg/mkpkg.desc @@ -27,4 +27,4 @@ [L] GPL [S] Stable [V] 2003-09-09 -[P] X -1-------9 210.000 +[P] X -?---5---9 210.000 diff --git a/base/module-init-tools/module-init-tools.desc b/base/module-init-tools/module-init-tools.desc index 2414e29e2..c09c81961 100644 --- a/base/module-init-tools/module-init-tools.desc +++ b/base/module-init-tools/module-init-tools.desc @@ -33,7 +33,7 @@ [L] GPL [S] Stable [V] 3.2.2 -[P] X -1-3-----9 102.050 +[P] X -?-3-----9 102.050 [D] 3974788475 module-init-tools-3.2.2.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/ diff --git a/base/multitail/multitail.desc b/base/multitail/multitail.desc index 9e710e6bc..06601c9bd 100644 --- a/base/multitail/multitail.desc +++ b/base/multitail/multitail.desc @@ -29,7 +29,7 @@ [L] GPL [S] Stable [V] 5.0.5 -[P] X -1---5---9 107.900 +[P] X -?---5---9 107.900 [D] 3113199394 multitail-5.0.5.tgz http://www.vanheusden.com/multitail/ diff --git a/base/pam/pam.conf b/base/pam/pam.conf index c98b13d32..58407bb13 100644 --- a/base/pam/pam.conf +++ b/base/pam/pam.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../pam/pam.conf -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -22,11 +22,8 @@ includedir="$includedir/security" # checking for prelude support # pam is able to act as prelude sensor since version 0.79 -if [ $stagelevel -ge 5 ]; then - if pkginstalled libprelude; then - pkgprefix -t libprelude - var_append extraconfopt " " "--with-libprelude-prefix=$root/$( pkgprefix libprelude )" - fi +if pkginstalled -f libprelude; then + var_append extraconfopt " " "--with-libprelude-prefix=$root/$( pkgprefix libprelude )" else var_append extraconfopt " " "--disable-prelude" fi diff --git a/base/popt/popt.desc b/base/popt/popt.desc index 103c79404..02f1ae6b9 100644 --- a/base/popt/popt.desc +++ b/base/popt/popt.desc @@ -38,7 +38,7 @@ [L] OpenSource [S] Stable [V] 1.7 -[P] X -1---5---9 117.300 +[P] X -?---5---9 117.300 [D] 418381445 popt-1.7.tar.gz ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ diff --git a/base/procps/procps.desc b/base/procps/procps.desc index 6259620a2..4c92a5053 100644 --- a/base/procps/procps.desc +++ b/base/procps/procps.desc @@ -47,7 +47,7 @@ [L] GPL [S] Stable [V] 3.2.7 -[P] X -1-3-----9 185.600 +[P] X -?-3-----9 185.600 [D] 4263266377 procps-3.2.7.tar.gz http://procps.sourceforge.net/ diff --git a/base/sed/sed.conf b/base/sed/sed.conf index 15e71affe..0b5e4f0ac 100644 --- a/base/sed/sed.conf +++ b/base/sed/sed.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../sed/sed.conf +# Filename: package/.../sed/sed.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -11,9 +12,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- # workaround for sed configure getline disabling in stage 1 -hook_add preconf 5 "echo am_cv_func_working_getline=yes >> config.cache" +if ! atstage native; then + var_append configcache ' ' 'am_cv_func_working_getline=yes' +fi + hook_add postmake 5 "mv -v $root/usr/bin/sed $root/bin/sed" diff --git a/base/strace/strace.desc b/base/strace/strace.desc index ff91964e8..fe904f1c5 100644 --- a/base/strace/strace.desc +++ b/base/strace/strace.desc @@ -34,7 +34,7 @@ [L] OpenSource [S] Stable [V] 4.5.15 -[P] X -1---5---9 104.200 +[P] X -?---5---9 104.200 [D] 3459310751 strace-4.5.15.tar.bz2 http://dl.sourceforge.net/sourceforge/strace/ diff --git a/base/uclibc/parse-config-9 b/base/uclibc/parse-config-9 index 8a468f913..2466c1db4 100644 --- a/base/uclibc/parse-config-9 +++ b/base/uclibc/parse-config-9 @@ -76,7 +76,7 @@ if [ "$SDECFG_LIBC" == "uclibc" ]; then gcc) hook_add postpatch 6 'uclibc_fix_configsub libjava/libltdl/config.sub' ;; - apache|minicom|nmap|expat|libiconv) + apache|minicom|nmap|expat|libiconv|dmraid) hook_add postpatch 6 'uclibc_findall_fix_configsub' ;; ntp) diff --git a/base/ugrep/ugrep.desc b/base/ugrep/ugrep.desc index 7997f7347..582efa008 100644 --- a/base/ugrep/ugrep.desc +++ b/base/ugrep/ugrep.desc @@ -27,7 +27,7 @@ [L] GPL [S] Stable [V] 1.7 -[P] O -1---5---9 108.000 +[P] O -?---5---9 108.000 [D] 2002293650 ugrep-1.7.tar.bz2 !http://robur.slu.se/jensl/ugrep/ugrep.tar.bz2 diff --git a/base/util-linux/dietlibc.patch b/base/util-linux/dietlibc.patch new file mode 100644 index 000000000..37287be57 --- /dev/null +++ b/base/util-linux/dietlibc.patch @@ -0,0 +1,89 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../util-linux/dietlibc.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./login-utils/vipw.c.orig 2007-07-17 13:07:32.000000000 -0400 ++++ ./login-utils/vipw.c 2007-07-17 13:08:35.000000000 -0400 +@@ -73,6 +73,10 @@ + + #define FILENAMELEN 67 + ++#ifndef _PATH_VI ++#define _PATH_VI "/usr/bin/vi" ++#endif ++ + char *progname; + enum { VIPW, VIGR }; + int program; +--- ./login-utils/login.c.orig 2007-07-17 12:53:12.000000000 -0400 ++++ ./login-utils/login.c 2007-07-17 12:53:35.000000000 -0400 +@@ -152,7 +152,7 @@ + #ifndef __linux__ + # include + #endif +-#include ++#include + + #define SLEEP_EXIT_TIMEOUT 5 + +--- ./mount/fstab.c.orig 2007-07-17 13:17:38.000000000 -0400 ++++ ./mount/fstab.c 2007-07-17 13:17:59.000000000 -0400 +@@ -399,9 +399,6 @@ + /* Flag to indicate that signals have been set up. */ + static int signals_have_been_setup = 0; + +-/* Ensure that the lock is released if we are interrupted. */ +-extern char *strsignal(int sig); /* not always in */ +- + static void + handler (int sig) { + die(EX_USER, "%s", strsignal(sig)); +--- ./sys-utils/dmesg.c.orig 2007-07-18 16:09:10.000000000 -0400 ++++ ./sys-utils/dmesg.c 2007-07-18 16:10:01.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + #include "nls.h" + +-#if __GNU_LIBRARY__ < 5 ++#if (__GNU_LIBRARY__ < 5) && (! defined(__dietlibc__)) + + #ifndef __alpha__ + # define __NR_klogctl __NR_syslog +--- ./text-utils/column.c.orig 2007-07-18 16:24:58.000000000 -0400 ++++ ./text-utils/column.c 2007-07-18 16:25:19.000000000 -0400 +@@ -50,6 +50,7 @@ + #include "errs.h" + #include "nls.h" + ++#include + #include "widechar.h" + + #ifdef ENABLE_WIDECHAR +--- ./partx/solaris.c.orig 2007-07-18 16:31:07.000000000 -0400 ++++ ./partx/solaris.c 2007-07-18 16:31:37.000000000 -0400 +@@ -1,12 +1,11 @@ + #include + #include /* time_t */ ++#include /* daddr_t */ + #include "partx.h" + + #define SOLARIS_X86_NUMSLICE 8 + #define SOLARIS_X86_VTOC_SANE (0x600DDEEEUL) + +-typedef int daddr_t; /* or long - check */ +- + struct solaris_x86_slice { + unsigned short s_tag; /* ID tag of partition */ + unsigned short s_flag; /* permision flags */ diff --git a/develop/duma/duma.desc b/develop/duma/duma.desc index 4b1c6b1bc..5ca885d5c 100644 --- a/develop/duma/duma.desc +++ b/develop/duma/duma.desc @@ -34,7 +34,7 @@ [L] GPL [S] Stable -[V] 2.5.3 +[V] 2.5.6 [P] X -----5---9 105.000 -[D] 2417243524 duma_2_5_3.tar.gz http://dl.sourceforge.net/sourceforge/duma/ +[D] 2526498392 duma_2_5_6.tar.gz http://dl.sourceforge.net/sourceforge/duma/ diff --git a/develop/duma/no_test.patch b/develop/duma/no_test.patch index 7524e2e2a..e973c06c1 100644 --- a/develop/duma/no_test.patch +++ b/develop/duma/no_test.patch @@ -14,25 +14,25 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./Makefile.orig 2007-07-15 07:15:44.000000000 -0400 -+++ ./Makefile 2007-07-15 12:52:28.000000000 -0400 -@@ -170,19 +170,6 @@ +--- ./Makefile.orig 2007-08-14 16:53:17.000000000 -0400 ++++ ./Makefile 2007-08-15 18:04:32.000000000 -0400 +@@ -215,19 +215,6 @@ SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o - all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS) -- @ echo -- @ echo "Testing DUMA (static library):" + all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS) +- @ $(ECHOLF) +- @ $(ECHO) "Testing DUMA (static library):" - $(CURPATH)dumatest$(EXEPOSTFIX) - $(CURPATH)tstheap$(EXEPOSTFIX) 3072 - $(CURPATH)testoperators$(EXEPOSTFIX) -- @ echo -- @ echo "DUMA static confidence test PASSED." -- @ echo -- @ echo "Testing DUMA (dynamic library)." -- (export LD_PRELOAD=./$(DUMASO); exec $(CURPATH)tstheap_so 3072) -- @ echo -- @ echo "DUMA dynamic confidence test PASSED." -- @ echo +- @ $(ECHOLF) +- @ $(ECHO) "DUMA static confidence test PASSED." +- @ $(ECHOLF) +- @ $(ECHO) "Testing DUMA (dynamic library)." +- (export LD_PRELOAD=./$(DUMASO); export DYLD_INSERT_LIBRARIES=./$(DUMASO); export DYLD_FORCE_FLAT_NAMESPACE=1; exec $(CURPATH)tstheap_so 3072) +- @ $(ECHOLF) +- @ $(ECHO) "DUMA dynamic confidence test PASSED." +- @ $(ECHOLF) install: libduma.a duma.3 $(DUMASO) $(INSTALL) -m 755 duma.sh $(BIN_INSTALL_DIR)/duma diff --git a/develop/git/git.conf b/develop/git/git.conf index 1cb0ed223..ec2fd5b16 100644 --- a/develop/git/git.conf +++ b/develop/git/git.conf @@ -16,3 +16,18 @@ if pkginstalled asciidoc; then var_append makeopt ' ' 'doc' var_append makeinstopt ' ' 'install-doc' fi + +gitweb_install() { + local dir="$root$docdir/gitweb" + + mkdir -p "$dir" + + cp -vf gitweb/*.{cgi,png,css} "$dir/" + cp -vf gitweb/README "$dir/" +} +hook_add postmake 5 'gitweb_install' + +git_contrib_install() { + tar -cf - contrib | tar -C "$root$docdir" -xvf - +} +hook_add postmake 5 'git_contrib_install' diff --git a/editors/ne/ne.desc b/editors/ne/ne.desc index f638454a4..8b44eaa0f 100644 --- a/editors/ne/ne.desc +++ b/editors/ne/ne.desc @@ -31,7 +31,7 @@ [L] GPL [S] Stable [V] 1.42 -[P] X -1---5---9 172.800 +[P] X -?---5---9 172.800 [D] 3783810168 ne-1.42.tar.gz http://ne.dsi.unimi.it/ diff --git a/editors/nvi/nvi.desc b/editors/nvi/nvi.desc index 8ea79221d..5dd136778 100644 --- a/editors/nvi/nvi.desc +++ b/editors/nvi/nvi.desc @@ -39,7 +39,7 @@ [L] BSD [S] Stable [V] 1.79 -[P] X -1-3-----9 109.200 +[P] X -?-3-----9 109.200 [D] 2728660379 nvi-1.79.tar.gz ftp://ftp.sleepycat.com/pub/ diff --git a/editors/zile/zile.desc b/editors/zile/zile.desc index a9fac464f..75e52abfd 100644 --- a/editors/zile/zile.desc +++ b/editors/zile/zile.desc @@ -34,6 +34,6 @@ [L] GPL [S] Stable [V] 2.2.26 -[P] X -1---5---9 126.100 +[P] X -?---5---9 126.100 [D] 1811942882 zile-2.2.26.tar.gz http://dl.sourceforge.net/sourceforge/zile/ diff --git a/filesystem/disktype/disktype.desc b/filesystem/disktype/disktype.desc index 3bb7964c0..32f2c637f 100644 --- a/filesystem/disktype/disktype.desc +++ b/filesystem/disktype/disktype.desc @@ -32,7 +32,7 @@ [L] OpenSource [S] Stable [V] 9 -[P] X -1---5---9 102.020 +[P] X -?---5---9 102.020 [D] 1182283551 disktype-9.tar.gz http://dl.sourceforge.net/sourceforge/disktype/ diff --git a/filesystem/dosfstools/dosfstools.desc b/filesystem/dosfstools/dosfstools.desc index 47fa414c9..16050d94b 100644 --- a/filesystem/dosfstools/dosfstools.desc +++ b/filesystem/dosfstools/dosfstools.desc @@ -29,7 +29,7 @@ [L] GPL [S] Stable [V] 2.11 -[P] X -1---5---9 180.300 +[P] X -?---5---9 180.300 [D] 3041766312 dosfstools-2.11.src.tar.gz ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/ diff --git a/filesystem/dvhtool/dvhtool.desc b/filesystem/dvhtool/dvhtool.desc index cd54f94ef..44690184c 100644 --- a/filesystem/dvhtool/dvhtool.desc +++ b/filesystem/dvhtool/dvhtool.desc @@ -31,7 +31,7 @@ [L] GPL [S] Stable [V] 1.0.1 -[P] X -1---5---9 165.000 +[P] X -?---5---9 165.000 [D] 1257912659 dvhtool_1.0.1.orig.tar.gz http://ftp.debian.org/debian/pool/main/d/dvhtool/ diff --git a/filesystem/e2fsprogs/e2fsprogs.desc b/filesystem/e2fsprogs/e2fsprogs.desc index 31f22c2d1..df18f66a2 100644 --- a/filesystem/e2fsprogs/e2fsprogs.desc +++ b/filesystem/e2fsprogs/e2fsprogs.desc @@ -31,7 +31,7 @@ [L] GPL LGPL [S] Stable [V] 1.40 -[P] X -1-3-----9 179.199 +[P] X -?-3-----9 179.199 [D] 1332911320 e2fsprogs-1.40.tar.gz http://dl.sourceforge.net/sourceforge/e2fsprogs/ diff --git a/filesystem/reiserfsprogs/reiserfsprogs.desc b/filesystem/reiserfsprogs/reiserfsprogs.desc index c2898fd0e..7dcdeedb4 100644 --- a/filesystem/reiserfsprogs/reiserfsprogs.desc +++ b/filesystem/reiserfsprogs/reiserfsprogs.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../reiserfsprogs/reiserfsprogs.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] @@ -34,7 +34,7 @@ [L] GPL [S] Stable [V] 3.6.19 -[P] X -----5---9 183.500 +[P] X -?---5---9 183.500 [D] 3598117138 reiserfsprogs-3.6.19.tar.gz ftp://ftp.namesys.com/pub/reiserfsprogs/ diff --git a/filesystem/udev/udev.desc b/filesystem/udev/udev.desc index f9f834579..97ac238ad 100644 --- a/filesystem/udev/udev.desc +++ b/filesystem/udev/udev.desc @@ -32,7 +32,7 @@ [L] GPL [S] Beta [V] 105 -[P] X -1---5---9 102.030 +[P] X -?---5---9 102.030 [D] 1793761676 udev-105.tar.gz http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ diff --git a/filesystem/unionfs/unionfs.desc b/filesystem/unionfs/unionfs.desc index e644bad29..2b8d1d87b 100644 --- a/filesystem/unionfs/unionfs.desc +++ b/filesystem/unionfs/unionfs.desc @@ -35,7 +35,7 @@ [L] GPL [S] Stable [V] 20060916-2203 -[P] X -1---5---9 200.000 +[P] X -?---5---9 200.000 #[D] 1782949345 unionfs-1.3.tar.gz ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/ [D] 962551256 unionfs-20060916-2203.tar.gz ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/snapshots/ diff --git a/gnome2/gmime/gmime.conf b/gnome2/gmime/gmime.conf index add45cf70..c495ba6f4 100644 --- a/gnome2/gmime/gmime.conf +++ b/gnome2/gmime/gmime.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../gmime/gmime.conf +# Filename: package/.../gmime/gmime.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf # @@ -11,9 +12,8 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- - -if [ $stagelevel -lt 7 ] || ! pkginstalled mono || ! pkginstalled gtk-sharp; then +if ! pkginstalled -f gtk-sharp; then var_append extraconfopt ' ' '--enable-mono=no' fi diff --git a/mail/nail/nail.conf b/mail/nail/nail.conf index 3948a632a..992e01c4d 100644 --- a/mail/nail/nail.conf +++ b/mail/nail/nail.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../nail/nail.conf -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -23,7 +23,5 @@ var_append makeinstopt ' ' DESTDIR=$root hook_add premake 5 'sh ./makeconfig' -if ! pkginstalled mailx; then - # create compatibility symlink to `mail` - hook_add postmake 5 'ln -svf nail $root$bindir/mail' -fi +# create compatibility symlink to `mail` +hook_add postmake 5 'ln -svf mailx $root$bindir/mail' diff --git a/mail/nail/nail.desc b/mail/nail/nail.desc index e7073462a..7649b325d 100644 --- a/mail/nail/nail.desc +++ b/mail/nail/nail.desc @@ -35,6 +35,6 @@ [L] BSD [S] Stable [V] 12.3 -[P] X -----5---9 800.000 +[P] O -----5---9 800.000 [D] 2981876385 mailx-12.3.tar.bz2 http://dl.sourceforge.net/sourceforge/heirloom/ diff --git a/network/curl/curl.conf b/network/curl/curl.conf index 921c52f3c..38e641147 100644 --- a/network/curl/curl.conf +++ b/network/curl/curl.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../curl/curl.conf +# Filename: package/.../curl/curl.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -11,13 +12,13 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- if ! atstage native; then # work arround configure mess confopt="$confopt --without-ssl" - hook_add preconf 5 "$preconf echo ac_cv_path_PKGCONFIG=/tmp/nothing >> \ - config.cache" + + var_append configcache ' ' 'ac_cv_path_PKGCONFIG=/tmp/nothing' fi if [ "$SDECFG_STATIC" = "1" ] ; then diff --git a/network/curl/curl.desc b/network/curl/curl.desc index 4bdce7e8f..654667a68 100644 --- a/network/curl/curl.desc +++ b/network/curl/curl.desc @@ -34,7 +34,7 @@ [L] MIT [S] Stable [V] 7.15.5 -[P] X -1---5-7-9 112.300 +[P] X -?---5-7-9 112.300 [D] 195080737 curl-7.15.5.tar.bz2 http://curl.haxx.se/download/ diff --git a/network/ethtool/ethtool.desc b/network/ethtool/ethtool.desc index 7f9f00347..33b7db99b 100644 --- a/network/ethtool/ethtool.desc +++ b/network/ethtool/ethtool.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable [V] 6 -[P] X -1---5---9 184.400 +[P] X -?---5---9 184.400 [D] 1866114428 ethtool-6.tar.gz http://dl.sourceforge.net/sourceforge/gkernel/ diff --git a/network/fget/fget.desc b/network/fget/fget.desc index 911713521..5fa1fcb84 100644 --- a/network/fget/fget.desc +++ b/network/fget/fget.desc @@ -27,7 +27,7 @@ [L] GPL [S] Beta [V] 0.4.1 -[P] X -1---5---9 112.400 +[P] X -?---5---9 112.400 [D] 838917931 fget-0.4.1.tar.bz2 http://www.fefe.de/fget/ diff --git a/network/iproute2/iproute2.desc b/network/iproute2/iproute2.desc index b9bbe46d8..8e4036131 100644 --- a/network/iproute2/iproute2.desc +++ b/network/iproute2/iproute2.desc @@ -38,7 +38,7 @@ [L] GPL [S] Stable [V] 2.6.19-061214 -[P] X -1---5---9 190.000 +[P] X -?---5---9 190.000 [D] 2776769982 iproute2-2.6.19-061214.tar.gz http://developer.osdl.org/dev/iproute2/download/ diff --git a/network/madwifi/pkg_linux24_post.conf b/network/madwifi/pkg_linux24_post.conf index ca645aabc..7936021a2 100644 --- a/network/madwifi/pkg_linux24_post.conf +++ b/network/madwifi/pkg_linux24_post.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../madwifi/pkg_linux24_post.conf +# Filename: package/.../madwifi/pkg_linux24_post.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,7 +11,9 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- -[ $stagelevel -ge 5 ] && var_append lx_3rd_party_modules " " "madwifi" +if atstage native; then + var_append lx_3rd_party_modules " " "madwifi" +fi diff --git a/network/madwifi/pkg_linux26_post.conf b/network/madwifi/pkg_linux26_post.conf index 83c1228db..3c3d171a1 100644 --- a/network/madwifi/pkg_linux26_post.conf +++ b/network/madwifi/pkg_linux26_post.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../madwifi/pkg_linux26_post.conf +# Filename: package/.../madwifi/pkg_linux26_post.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,6 +11,8 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- -[ $stagelevel -ge 5 ] && var_append lx_3rd_party_modules " " "madwifi" +if atstage native; then + var_append lx_3rd_party_modules " " "madwifi" +fi diff --git a/network/madwifi/pkg_linux26mm_post.conf b/network/madwifi/pkg_linux26mm_post.conf index 78d08fea9..7b10e01b9 100644 --- a/network/madwifi/pkg_linux26mm_post.conf +++ b/network/madwifi/pkg_linux26mm_post.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../madwifi/pkg_linux26mm_post.conf +# Filename: package/.../madwifi/pkg_linux26mm_post.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,6 +11,8 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- -[ $stagelevel -ge 5 ] && var_append lx_3rd_party_modules " " "madwifi" +if atstage native; then + var_append lx_3rd_party_modules " " "madwifi" +fi diff --git a/network/net-tools/net-tools.desc b/network/net-tools/net-tools.desc index 5a658ee10..206c12f27 100644 --- a/network/net-tools/net-tools.desc +++ b/network/net-tools/net-tools.desc @@ -46,7 +46,7 @@ [L] GPL [S] Stable [V] 1.60 -[P] X -1---5---9 184.500 +[P] X -?---5---9 184.500 [D] 1395528642 net-tools-1.60.tar.bz2 http://www.tazenda.demon.co.uk/phil/net-tools/ [D] 3869631410 net-tools-1.60-ether-wake-1.patch http://linuxfromscratch.mirror.ac.uk/sites/www.linuxfromscratch.org/patches/downloads/net-tools/ diff --git a/network/netdiscover/netdiscover.cache b/network/netdiscover/netdiscover.cache new file mode 100644 index 000000000..cbe9173f7 --- /dev/null +++ b/network/netdiscover/netdiscover.cache @@ -0,0 +1,25 @@ + +[TIMESTAMP] 1187021451 Mon Aug 13 18:10:51 2007 +[BUILDTIME] 100 (9) +[SIZE] 0.37 MB, 16 files + +[DEP] 00-dirtree +[DEP] bash +[DEP] binutils +[DEP] bzip2 +[DEP] coreutils +[DEP] diffutils +[DEP] findutils +[DEP] gawk +[DEP] gcc +[DEP] glibc +[DEP] grep +[DEP] libnet +[DEP] libpcap +[DEP] linux-header +[DEP] make +[DEP] mktemp +[DEP] sed +[DEP] sysfiles +[DEP] tar +[DEP] util-linux diff --git a/network/netdiscover/netdiscover.desc b/network/netdiscover/netdiscover.desc new file mode 100644 index 000000000..2f8a85758 --- /dev/null +++ b/network/netdiscover/netdiscover.desc @@ -0,0 +1,34 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../netdiscover/netdiscover.desc +[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] +[COPY] More information can be found in the files COPYING and README. +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-COPYRIGHT-NOTE-END --- + +[I] An ARP network scanner + +[T] Netdiscover is a network address discovering tool that was developed +[T] mainly for those wireless networks without DHCP servers, though it also +[T] works on wired networks. It sends ARP requests and sniffs for replies. + +[U] http://sourceforge.net/projects/netdiscover/ +[U] http://nixgeneration.com/~jaime/netdiscover/ + +[A] Jamie Penalba +[M] Christian Wiese + +[C] extra/network + +[L] GPL +[S] Beta +[V] 0.3-beta6 +[P] X -----5---9 800.000 + +[D] 3351960646 netdiscover-0.3-beta6.tar.gz http://dl.sourceforge.net/sourceforge/netdiscover/ diff --git a/network/rsync/rsync.desc b/network/rsync/rsync.desc index ffbed650e..8ea9cdc45 100644 --- a/network/rsync/rsync.desc +++ b/network/rsync/rsync.desc @@ -38,7 +38,7 @@ [L] GPL [S] Stable [V] 2.6.9 -[P] X -1---5---9 118.200 +[P] X -?---5---9 118.200 [D] 2975072070 rsync-2.6.9.tar.gz http://rsync.samba.org/ftp/rsync/ diff --git a/network/wget/wget.desc b/network/wget/wget.desc index ea77c9d16..63c95e28b 100644 --- a/network/wget/wget.desc +++ b/network/wget/wget.desc @@ -36,7 +36,7 @@ [L] GPL [S] Stable [V] 1.10.2 -[P] X -1---5---9 112.400 +[P] X -?---5---9 112.400 [D] 2752054755 wget-1.10.2.tar.gz ftp://ftp.gnu.org/pub/gnu/wget/ diff --git a/network/wireless-tools/wireless-tools.desc b/network/wireless-tools/wireless-tools.desc index 83b810dde..5911a3615 100644 --- a/network/wireless-tools/wireless-tools.desc +++ b/network/wireless-tools/wireless-tools.desc @@ -30,7 +30,7 @@ [L] GPL [S] Stable [V] 28 -[P] X -1---5---9 184.600 +[P] X -?---5---9 184.600 [D] 2720196791 wireless_tools.28.tar.gz http://pcmcia-cs.sourceforge.net/ftp/contrib/ diff --git a/office/libwpd/libwpd.desc b/office/libwpd/libwpd.desc index 53536f8b5..ba1c323ce 100644 --- a/office/libwpd/libwpd.desc +++ b/office/libwpd/libwpd.desc @@ -25,14 +25,14 @@ [A] William Lachance [A] Marc Maurer [A] Fridrich Strba -[M] The OpenSDE Community +[M] Alejandro Mery [C] base/library [L] LGPL [S] Beta -[V] 0.8.7 +[V] 0.8.10 [P] X -----5---9 157.800 -[D] 138913971 libwpd-0.8.7.tar.gz http://dl.sourceforge.net/sourceforge/libwpd/ +[D] 2816196457 libwpd-0.8.10.tar.gz http://dl.sourceforge.net/sourceforge/libwpd/ diff --git a/office/libwpg/libwpg.cache b/office/libwpg/libwpg.cache new file mode 100644 index 000000000..0374771f4 --- /dev/null +++ b/office/libwpg/libwpg.cache @@ -0,0 +1,26 @@ + +[TIMESTAMP] 1186866777 Sat Aug 11 17:12:57 2007 +[BUILDTIME] 20 (5) +[SIZE] 0.28 MB, 35 files + +[DEP] 00-dirtree +[DEP] bash +[DEP] binutils +[DEP] bzip2 +[DEP] coreutils +[DEP] curl +[DEP] diffutils +[DEP] findutils +[DEP] gawk +[DEP] gcc +[DEP] glibc +[DEP] grep +[DEP] libwpd +[DEP] linux-header +[DEP] make +[DEP] mktemp +[DEP] pkgconfig +[DEP] sed +[DEP] sysfiles +[DEP] tar +[DEP] util-linux diff --git a/office/libwpg/libwpg.desc b/office/libwpg/libwpg.desc new file mode 100644 index 000000000..3573254bb --- /dev/null +++ b/office/libwpg/libwpg.desc @@ -0,0 +1,34 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../libwpg/libwpg.desc +[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] +[COPY] More information can be found in the files COPYING and README. +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-COPYRIGHT-NOTE-END --- + +[I] Library for importing and converting Corel WordPerfect(tm) Graphics images + +[T] Libwpg project is a collection of library and tools to work with graphics +[T] in WPG (WordPerfect Graphics) format. WPG is the format used among others +[T] in Corel sofware, such as WordPerfect(tm) and Presentations(tm). + +[U] http://libwpg.sourceforge.net/libwpg.htm + +[A] Fridrich Strba +[M] Alejandro Mery + +[C] base/library + +[L] LGPL +[S] Alpha +[V] 0.1.0 +[P] X -----5---9 157.900 + +[D] 2890963190 libwpg-0.1.0.tar.gz http://dl.sourceforge.net/sourceforge/libwpg/ + diff --git a/office/libwps/libwps.cache b/office/libwps/libwps.cache new file mode 100644 index 000000000..7c0fe1d08 --- /dev/null +++ b/office/libwps/libwps.cache @@ -0,0 +1,26 @@ + +[TIMESTAMP] 1186865394 Sat Aug 11 16:49:54 2007 +[BUILDTIME] 20 (5) +[SIZE] 0.21 MB, 25 files + +[DEP] 00-dirtree +[DEP] bash +[DEP] binutils +[DEP] bzip2 +[DEP] coreutils +[DEP] curl +[DEP] diffutils +[DEP] findutils +[DEP] gawk +[DEP] gcc +[DEP] glibc +[DEP] grep +[DEP] libwpd +[DEP] linux-header +[DEP] make +[DEP] mktemp +[DEP] pkgconfig +[DEP] sed +[DEP] sysfiles +[DEP] tar +[DEP] util-linux diff --git a/office/libwps/libwps.desc b/office/libwps/libwps.desc new file mode 100644 index 000000000..9e7bcc9f4 --- /dev/null +++ b/office/libwps/libwps.desc @@ -0,0 +1,37 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../libwps/libwps.desc +[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] +[COPY] More information can be found in the files COPYING and README. +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-COPYRIGHT-NOTE-END --- + +[I] A Microsoft Works file word processor format import filter library + +[T] libwps is a library (for use by word procesors, for example) for importing +[T] the Microsoft Works word processor file format. As of December 2006, the +[T] project is new, but it imports Works format versions 2, 3, 4, 5 (aka 2000), +[T] and 8 with some formatting. The scope of this project is just a Works word +[T] processor import filter, so there are no plans for supporting an export +[T] filter, spreadsheets, or databases. + +[U] http://libwps.sourceforge.net/ + +[A] Andrew Ziem +[M] Alejandro Mery + +[C] base/library + +[L] LGPL +[S] Alpha +[V] 0.1.0 +[P] X -----5---9 157.900 + +[D] 2177443760 libwps-0.1.0.tar.bz2 http://dl.sourceforge.net/sourceforge/libwps/ + diff --git a/security/brouette/brouette.desc b/security/brouette/brouette.desc index 80fac628f..be1a7f793 100644 --- a/security/brouette/brouette.desc +++ b/security/brouette/brouette.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../brouette/brouette.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -26,7 +26,7 @@ [L] OpenSource [S] Alpha -[V] r8474 +[V] r9113 [P] X -----5---9 800.000 -[D] X brouette-r8474.tar.bz2 svn+http://svn.prelude-ids.org/trunk/brouette -r8474 +[D] X brouette-r9113.tar.bz2 svn+http://svn.prelude-ids.org/brouette/trunk -r9113 diff --git a/security/heimdal/heimdal.conf b/security/heimdal/heimdal.conf index 40655f169..6f2822997 100644 --- a/security/heimdal/heimdal.conf +++ b/security/heimdal/heimdal.conf @@ -1,8 +1,9 @@ #!/bin/sh -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../heimdal/heimdal.conf +# Filename: package/.../heimdal/heimdal.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -11,7 +12,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- if [ $prefix_auto=1 ]; then prefix=opt/heimdal @@ -21,7 +22,7 @@ localstatedir=/var/heimdal var_insert CC_WRAPPER_INSERT " " "-D_REENTRANT" -if [ $stagelevel -ge 5 ]; then +if atstage native; then if pkginstalled openssl; then pkgprefix -t openssl var_append extraconfopt ' ' "--with-openssl=$( pkgprefix sysconfdir openssl )" diff --git a/security/prelude-correlator/install_sysconfdir.patch b/security/prelude-correlator/install_sysconfdir.patch new file mode 100644 index 000000000..c3c830511 --- /dev/null +++ b/security/prelude-correlator/install_sysconfdir.patch @@ -0,0 +1,37 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../prelude-correlator/install_sysconfdir.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./Makefile.am.orig 2007-08-12 01:24:54.000000000 +0200 ++++ ./Makefile.am 2007-08-12 01:25:22.000000000 +0200 +@@ -4,7 +4,8 @@ + + + install-data-local: +- $(INSTALL) -m 700 -d $(prelude_correlator_context_dir) ++ $(INSTALL) -m 700 -d $(DESTDIR)$(configdir); ++ $(INSTALL) -m 700 -d $(prelude_correlator_context_dir); + @if test -f $(DESTDIR)$(configdir)/prelude-correlator.conf; then \ + echo "********************************************************************************"; \ + echo; \ +--- ./plugins/pcre/ruleset/Makefile.am.orig 2000-01-01 00:00:00.000000000 +0100 ++++ ./plugins/pcre/ruleset/Makefile.am 2007-08-12 01:39:09.000000000 +0200 +@@ -4,5 +4,5 @@ + pcre.rules \ + scan.rules \ + worm.rules +-rulesetdir = $(PRELUDE_CORRELATOR_CONFIG_PREFIX)/ruleset ++rulesetdir = $(DESTDIR)$(configdir)/ruleset + EXTRA_DIST = $(ruleset_DATA) diff --git a/security/prelude-correlator/prelude-correlator.cache b/security/prelude-correlator/prelude-correlator.cache new file mode 100644 index 000000000..6be173bfe --- /dev/null +++ b/security/prelude-correlator/prelude-correlator.cache @@ -0,0 +1,37 @@ + +[TIMESTAMP] 1186875774 Sun Aug 12 01:42:54 2007 +[BUILDTIME] 25 (5) +[SIZE] 0.11 MB, 22 files + +[DEP] 00-dirtree +[DEP] autoconf +[DEP] automake +[DEP] bash +[DEP] binutils +[DEP] bzip2 +[DEP] coreutils +[DEP] diffutils +[DEP] findutils +[DEP] gawk +[DEP] gcc +[DEP] glibc +[DEP] gnutls +[DEP] grep +[DEP] libgcrypt +[DEP] libgpg-error +[DEP] libprelude +[DEP] libtasn1 +[DEP] libtool +[DEP] linux-header +[DEP] m4 +[DEP] make +[DEP] mktemp +[DEP] patch +[DEP] pcre +[DEP] perl +[DEP] prelude-lml +[DEP] sed +[DEP] sysfiles +[DEP] tar +[DEP] util-linux +[DEP] zlib diff --git a/security/prelude-correlator/prelude-correlator.conf b/security/prelude-correlator/prelude-correlator.conf new file mode 100644 index 000000000..8ef0c6d42 --- /dev/null +++ b/security/prelude-correlator/prelude-correlator.conf @@ -0,0 +1,22 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../prelude-correlator/prelude-correlator.conf +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +if [ $prefix_auto = 1 ] ; then + if [ "$SDECFG_PKG_PRELUDE_PREFIX" ] ; then + prefix="$SDECFG_PKG_PRELUDE_PREFIX" + else + prefix="opt/prelude" + fi + set_confopt +fi diff --git a/security/prelude-correlator/prelude-correlator.desc b/security/prelude-correlator/prelude-correlator.desc new file mode 100644 index 000000000..2065538e8 --- /dev/null +++ b/security/prelude-correlator/prelude-correlator.desc @@ -0,0 +1,29 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../prelude-correlator/prelude-correlator.desc +[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] +[COPY] More information can be found in the files COPYING and README. +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-COPYRIGHT-NOTE-END --- + +[I] Prelude-IDS Correlation Engine + +[T] Prelude-IDS Correlation Engine + +[A] Yoann Vandoorselaere +[M] Christian Wiese + +[C] extra/tool + +[L] OpenSource +[S] Alpha +[V] r9712 +[P] X -----5---9 800.000 + +[D] X prelude-correlator-r9712.tar.bz2 svn+http://svn.prelude-ids.org/prelude-correlator/trunk -r9712 diff --git a/shells/ash/ash.desc b/shells/ash/ash.desc index ce2d363a5..4bc514d94 100644 --- a/shells/ash/ash.desc +++ b/shells/ash/ash.desc @@ -34,7 +34,7 @@ [L] GPL [S] Stable [V] 0.2 -[P] X -1---5---9 106.400 +[P] X -?---5---9 106.400 [D] 3239031740 ash-linux-0.2.tar.gz ftp://metalab.unc.edu/pub/Linux/system/shells/ diff --git a/shells/kiss/kiss.desc b/shells/kiss/kiss.desc index 9d979df9d..dd2dc3bff 100644 --- a/shells/kiss/kiss.desc +++ b/shells/kiss/kiss.desc @@ -39,7 +39,7 @@ [L] GPL [S] Stable [V] 0.21 -[P] X -1---5---9 106.200 +[P] X -?---5---9 106.200 [D] 222355141 kiss-0.21.tar.gz.gz !ftp://metalab.unc.edu/pub/Linux/system/shells/kiss-0.21.tar.gz diff --git a/shells/pdksh/pdksh.desc b/shells/pdksh/pdksh.desc index ee635966c..7dbd9d843 100644 --- a/shells/pdksh/pdksh.desc +++ b/shells/pdksh/pdksh.desc @@ -32,7 +32,7 @@ [L] OpenSource [S] Stable [V] 5.2.14 -[P] X -1---5---9 102.050 +[P] X -?---5---9 102.050 [D] 3325611823 pdksh-5.2.14.tar.gz ftp://ftp.cs.mun.ca/pub/pdksh/ diff --git a/x11/xterm/xterm.desc b/x11/xterm/xterm.desc index e7393a28f..bb2949763 100644 --- a/x11/xterm/xterm.desc +++ b/x11/xterm/xterm.desc @@ -28,10 +28,10 @@ [L] MIT [S] Stable -[V] 227 +[V] 229 [P] X -----5---9 134.200 [O] . package/*/*/modular-x-conf.in -[D] 1912161100 xterm-227.tgz ftp://invisible-island.net/xterm/ +[D] 985039650 xterm-229.tgz ftp://invisible-island.net/xterm/