diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 18bb66d..921417f 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -13,12 +13,12 @@ case $NSS_BRANCH in
PATCHLEVEL=1
;;
3.12)
- VERSION=3.12.10
+ VERSION=3.12.11
SECURITY_PATCH=1
# FFVERSION=3.6.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:ce6fe98e18ca3a2401e9a56b878a6b65439a113a9bd3222a3f144e6d795907b1974d4ac7e4ffdc8d437a931acba056bc26c2ceebf3bff468b47b180635d107c6
+
SOURCE_HASH=sha512:3ed1134c972cee9ac23a77adc4c38eeb0597d0734b13b561ec74480560eb77b259ebc9708e4ecd8cc1565bfb6ae9e471c7131dd26ca48e6b427284c3c005ec6a
# SOURCE=firefox-$FFVERSION.source.tar.bz2
# SOURCE2=$SOURCE.asc
# SOURCE2_IGNORE=signature
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index e7af691..45e031e 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 3.12.11
+
2011-05-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.12.10
diff --git a/editors/jedit/DETAILS b/editors/jedit/DETAILS
index 9b7a01c..d0c2d34 100755
--- a/editors/jedit/DETAILS
+++ b/editors/jedit/DETAILS
@@ -1,11 +1,11 @@
SPELL=jedit
- VERSION=4.3.2
+ VERSION=4.4.1
SOURCE=jedit${VERSION}source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/jEdit
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
WEB_SITE=http://www.jedit.org
ENTERED=20040608
-
SOURCE_HASH=sha512:471fa64ec0e60a39b3e63af8d790e088960d4b81d5eb07cb7f0bbf7a2db31c3d4956024d1f7491eafcc08215e04a13fb92c20b13f5ee9025e7acc2301fabf192
+
SOURCE_HASH=sha512:7d1587c6868b9c584f58a2a61f496f7aa260e727e8a65dc3522749011336de11e87bdc35e7c2b9ad25023d570a2e272ea97615126b7aa3bde3ba531f9deaf70c
LICENSE[0]=GPL
KEYWORDS="editors"
SHORT="jEdit is a mature and well-designed programmer's text
editor that has been in development for over 5 years."
diff --git a/editors/jedit/HISTORY b/editors/jedit/HISTORY
index 6e5bfae..5a5be26 100644
--- a/editors/jedit/HISTORY
+++ b/editors/jedit/HISTORY
@@ -1,3 +1,8 @@
+2011-08-10 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 4.4.1
+ * build.properties_4.3.2.patch: removed
+ * build.properties_4.4.1.patch: added from former .patch
+
2010-12-08 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 4.3.2, updated SOURCE_URL
* build.properties_4.3.patch: removed
diff --git a/editors/jedit/build.properties_4.3.2.patch
b/editors/jedit/build.properties_4.3.2.patch
deleted file mode 100644
index d92dfd9..0000000
--- a/editors/jedit/build.properties_4.3.2.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -urNp jEdit.orig/build.properties jEdit/build.properties
---- jEdit.orig/build.properties 1970-01-01 01:00:00.000000000 +0100
-+++ jEdit/build.properties 2006-08-08 21:07:34.000000000 +0200
-@@ -0,0 +1,4 @@
-+xsltproc.executable=xsltproc
-+docbook.xsl=/usr/share/xml/docbook/xsl-stylesheets-1.76
-+docbook.catalog=/usr/share/xml/docbook/xml-dtd-4.5/catalog.xml
-+fop.dir=/usr/share/fop-0.20.5
diff --git a/editors/jedit/build.properties_4.4.1.patch
b/editors/jedit/build.properties_4.4.1.patch
new file mode 100644
index 0000000..d92dfd9
--- /dev/null
+++ b/editors/jedit/build.properties_4.4.1.patch
@@ -0,0 +1,8 @@
+diff -urNp jEdit.orig/build.properties jEdit/build.properties
+--- jEdit.orig/build.properties 1970-01-01 01:00:00.000000000 +0100
++++ jEdit/build.properties 2006-08-08 21:07:34.000000000 +0200
+@@ -0,0 +1,4 @@
++xsltproc.executable=xsltproc
++docbook.xsl=/usr/share/xml/docbook/xsl-stylesheets-1.76
++docbook.catalog=/usr/share/xml/docbook/xml-dtd-4.5/catalog.xml
++fop.dir=/usr/share/fop-0.20.5
diff --git a/ftp/wget/DETAILS b/ftp/wget/DETAILS
index c075962..81d1ea6 100755
--- a/ftp/wget/DETAILS
+++ b/ftp/wget/DETAILS
@@ -1,5 +1,5 @@
SPELL=wget
- VERSION=1.12
+ VERSION=1.13
SECURITY_PATCH=1
PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index 9f4fa46..a91d79e 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,8 @@
+2011-08-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.13
+ * wget.gpg: added key C03363F4
+ * PRE_BUILD, wget-1.12-CVE-2010-2252.patch: removed
+
2011-04-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added libidn optional dependency
diff --git a/ftp/wget/PRE_BUILD b/ftp/wget/PRE_BUILD
deleted file mode 100755
index b337b86..0000000
--- a/ftp/wget/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/wget-1.12-CVE-2010-2252.patch
diff --git a/ftp/wget/wget-1.12-CVE-2010-2252.patch
b/ftp/wget/wget-1.12-CVE-2010-2252.patch
deleted file mode 100644
index d1d797a..0000000
--- a/ftp/wget/wget-1.12-CVE-2010-2252.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/doc/wget.texi wget/doc/wget.texi
---- wget~/doc/wget.texi 2010-09-05 15:32:44.000000000 +0200
-+++ wget/doc/wget.texi 2010-09-05 15:32:44.000000000 +0200
-@@ -1487,6 +1487,13 @@
- @code{Content-Disposition} headers to describe what the name of a
- downloaded file should be.
-
-+@cindex Trust server names
-+@item --trust-server-names
-+
-+If this is set to on, on a redirect the last component of the
-+redirection URL will be used as the local file name. By default it is
-+used the last component in the original URL.
-+
- @cindex authentication
- @item --auth-no-challenge
-
-@@ -2797,6 +2804,10 @@
- Turn on recognition of the (non-standard) @samp{Content-Disposition}
- HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}.
-
-+@item trust_server_names = on/off
-+If set to on, use the last component of a redirection URL for the local
-+file name.
-+
- @item continue = on/off
- If set to on, force continuation of preexistent partially retrieved
- files. See @samp{-c} before setting it.
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/http.c wget/src/http.c
---- wget~/src/http.c 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/http.c 2010-09-05 15:32:44.000000000 +0200
-@@ -2410,8 +2410,9 @@
- /* The genuine HTTP loop! This is the part where the retrieval is
- retried, and retried, and retried, and... */
- uerr_t
--http_loop (struct url *u, char **newloc, char **local_file, const char
*referer,
-- int *dt, struct url *proxy, struct iri *iri)
-+http_loop (struct url *u, struct url *original_url, char **newloc,
-+ char **local_file, const char *referer, int *dt, struct url
*proxy,
-+ struct iri *iri)
- {
- int count;
- bool got_head = false; /* used for time-stamping and filename
detection */
-@@ -2457,7 +2458,8 @@
- }
- else if (!opt.content_disposition)
- {
-- hstat.local_file = url_file_name (u);
-+ hstat.local_file =
-+ url_file_name (opt.trustservernames ? u : original_url);
- got_name = true;
- }
-
-@@ -2497,7 +2499,7 @@
-
- /* Send preliminary HEAD request if -N is given and we have an existing
- * destination file. */
-- file_name = url_file_name (u);
-+ file_name = url_file_name (opt.trustservernames ? u : original_url);
- if (opt.timestamping
- && !opt.content_disposition
- && file_exists_p (file_name))
-@@ -2852,9 +2854,9 @@
-
- /* Remember that we downloaded the file for later ".orig" code. */
- if (*dt & ADDED_HTML_EXTENSION)
-- downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
hstat.local_file);
-+ downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
hstat.local_file);
- else
-- downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file);
-+ downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file);
-
- ret = RETROK;
- goto exit;
-@@ -2885,9 +2887,9 @@
-
- /* Remember that we downloaded the file for later ".orig"
code. */
- if (*dt & ADDED_HTML_EXTENSION)
-- downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
hstat.local_file);
-+ downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
hstat.local_file);
- else
-- downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file);
-+ downloaded_file (FILE_DOWNLOADED_NORMALLY,
hstat.local_file);
-
- ret = RETROK;
- goto exit;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/http.h wget/src/http.h
---- wget~/src/http.h 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/http.h 2010-09-05 15:32:44.000000000 +0200
-@@ -33,8 +33,8 @@
-
- struct url;
-
--uerr_t http_loop (struct url *, char **, char **, const char *, int *,
-- struct url *, struct iri *);
-+uerr_t http_loop (struct url *, struct url *, char **, char **, const char
*,
-+ int *, struct url *, struct iri *);
- void save_cookies (void);
- void http_cleanup (void);
- time_t http_atotm (const char *);
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/init.c wget/src/init.c
---- wget~/src/init.c 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/init.c 2010-09-05 15:32:44.000000000 +0200
-@@ -243,6 +243,7 @@
- { "timeout", NULL, cmd_spec_timeout },
- { "timestamping", &opt.timestamping, cmd_boolean },
- { "tries", &opt.ntry, cmd_number_inf },
-+ { "trustservernames", &opt.trustservernames, cmd_boolean },
- { "useproxy", &opt.use_proxy, cmd_boolean },
- { "user", &opt.user, cmd_string },
- { "useragent", NULL, cmd_spec_useragent },
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/main.c wget/src/main.c
---- wget~/src/main.c 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/main.c 2010-09-05 15:32:44.000000000 +0200
-@@ -266,6 +266,7 @@
- { "timeout", 'T', OPT_VALUE, "timeout", -1 },
- { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 },
- { "tries", 't', OPT_VALUE, "tries", -1 },
-+ { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 },
- { "user", 0, OPT_VALUE, "user", -1 },
- { "user-agent", 'U', OPT_VALUE, "useragent", -1 },
- { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 },
-@@ -675,6 +676,8 @@
- N_("\
- -I, --include-directories=LIST list of allowed directories.\n"),
- N_("\
-+ --trust-server-names use the name specified by the redirection url last
component.\n"),
-+ N_("\
- -X, --exclude-directories=LIST list of excluded directories.\n"),
- N_("\
- -np, --no-parent don't ascend to the parent
directory.\n"),
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/options.h wget/src/options.h
---- wget~/src/options.h 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/options.h 2010-09-05 15:32:44.000000000 +0200
-@@ -242,6 +242,7 @@
- char *encoding_remote;
- char *locale;
-
-+ bool trustservernames;
- #ifdef __VMS
- int ftp_stmlf; /* Force Stream_LF format for binary FTP. */
- #endif /* def __VMS */
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
wget~/src/retr.c wget/src/retr.c
---- wget~/src/retr.c 2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/retr.c 2010-09-05 15:32:44.000000000 +0200
-@@ -689,7 +689,8 @@
- #endif
- || (proxy_url && proxy_url->scheme == SCHEME_HTTP))
- {
-- result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url,
iri);
-+ result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl,
dt,
-+ proxy_url, iri);
- }
- else if (u->scheme == SCHEME_FTP)
- {
diff --git a/ftp/wget/wget.gpg b/ftp/wget/wget.gpg
index bbc8b99..9aad033 100644
Binary files a/ftp/wget/wget.gpg and b/ftp/wget/wget.gpg differ
diff --git a/http/apache22/DEPENDS b/http/apache22/DEPENDS
index af158fc..46d5d82 100755
--- a/http/apache22/DEPENDS
+++ b/http/apache22/DEPENDS
@@ -1,8 +1,10 @@
-#depends apr "--with-apr=${INSTALL_ROOT}/usr" &&
-#depends apr-util "--with-apr-util=${INSTALL_ROOT}/usr" &&
depends apr &&
depends apr-util &&
+if list_find "$OPTS" "ldap"; then
+ depends -sub LDAP apr-util
+fi &&
+
optional_depends openssl \
'--enable-ssl' \
'--disable-ssl' \
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 22a3116..09d50bb 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: force LDAP version of apr-util if any ldap module is
selected
+
2011-05-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.19; SECURITY_PATCH++ (CVE-2011-1928)
swapped source urls; modified short desc
diff --git a/libs/apr-util/HISTORY b/libs/apr-util/HISTORY
index 1c0f808..150cd32 100644
--- a/libs/apr-util/HISTORY
+++ b/libs/apr-util/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * {{REPAIR^all^,}PRE_,}SUB_DEPENDS: added LDAP subdependency
+
2011-07-25 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: fixed dependency flags
diff --git a/libs/apr-util/PRE_SUB_DEPENDS b/libs/apr-util/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..63b6487
--- /dev/null
+++ b/libs/apr-util/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) is_depends_enabled $SPELL openldap;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
b/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..63b6487
--- /dev/null
+++ b/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) is_depends_enabled $SPELL openldap;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/apr-util/SUB_DEPENDS b/libs/apr-util/SUB_DEPENDS
new file mode 100755
index 0000000..a7d6161
--- /dev/null
+++ b/libs/apr-util/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) message "apr-util with OpenLDAP support requested, forcing openldap
dependency" &&
+ depends openldap "--with-ldap";;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 847589f..cf387bd 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -29,10 +29,10 @@ config_query_option PHP5_OPTS "Enable pcntl support (Only
affects CLI/CGI)" n \
message "${MESSAGE_COLOR}Apache-based and *CGI SAPIs are mutually exclusive
(though both FastCGI and CGI can be enabled at the same
time)${DEFAULT_COLOR}" &&
config_query_list PHP5_SAPI "What SAPI do you want to use?" \
- apache cgi &&
+ apache cgi none &&
if [[ $PHP5_SAPI == cgi ]]; then
- PHP5_OPTS="${PHP5_OPTS} --enable-cgi" &&
+ PHP5_OPTS="--enable-cgi --without-apxs --without-apxs2 ${PHP5_OPTS}" &&
if [[ $PHP5_BRANCH == legacy ]]; then
config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
@@ -40,9 +40,9 @@ if [[ $PHP5_SAPI == cgi ]]; then
else
message "${MESSAGE_COLOR}The FastCGI SAPI is now always enabled since
PHP 5.3.0${DEFAULT_COLOR}"
fi
-else
+elif [[ $PHP5_SAPI == apache ]]; then
config_query_list PHP5_APACHE "Which Apache module to build?" \
- none handler filter
+ handler filter
fi &&
if [[ "${PHP5_PEAR}" == "y" ]] || list_find "$PHP5_OPTS" "--enable-cgi" ||
list_find "$PHP5_OPTS" "--enable-fastcgi" ; then
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 96fdf3a..60c9928 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -51,8 +51,14 @@ optional_depends pth \
if [[ $PHP5_SAPI == apache ]]; then
case "${PHP5_APACHE}" in
handler) depends APACHE;;
- filter) depends APACHE2;;
- esac
+ filter) depends APACHE2 '--with-apxs2 --without-apxs';;
+ esac &&
+
+ if [[ "$(get_spell_provider $SPELL APACHE)" == 'apache1' ]]; then
+ PHP5_OPTS="--with-apxs --without-apxs2 $PHP5_OPTS"
+ else
+ PHP5_OPTS="--with-apxs2 --without-apxs $PHP5_OPTS"
+ fi
fi &&
if [[ "$PHP5_PCRE" == "none" ]]; then
@@ -220,6 +226,10 @@ if [[ "${PHP5_GD}" != "none" ]]; then
"--without-xpm" \
"for XPM image support" &&
+ if [[ "${PHP5_GD}" == "internal" ]]; then
+ depends JPEG "--with-jpeg-dir=${INSTALL_ROOT}/usr" &&
+ depends libpng "--with-png-dir=${INSTALL_ROOT}/usr"
+ else
optional_depends JPEG \
"--with-jpeg-dir=${INSTALL_ROOT}/usr" \
"--without-jpeg-dir" \
@@ -228,7 +238,8 @@ if [[ "${PHP5_GD}" != "none" ]]; then
optional_depends libpng \
"--with-png-dir=${INSTALL_ROOT}/usr" \
"--without-png-dir" \
- "for PNG support (for GD)" &&
+ "for PNG support (for GD)"
+ fi &&
optional_depends t1lib \
"--with-t1lib=${INSTALL_ROOT}/usr" \
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index fd5f13f..0201766 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, CONFIGURE: corrected apache flags; moved 'none' SAPI
selector
+ to a proper place; fixed dependencies for internal gd
+
2011-03-18 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to version 5.3.6
diff --git a/smgl/basesystem/DEPENDS b/smgl/basesystem/DEPENDS
index e25b694..2ca6756 100755
--- a/smgl/basesystem/DEPENDS
+++ b/smgl/basesystem/DEPENDS
@@ -21,7 +21,7 @@ depends locale &&
depends make &&
. $GRIMOIRE/FUNCTIONS &&
local KVER=$(get_kernel_version) &&
-if (( ${KVER:2:1} < 6 )); then
+if [[ ${KVER:0:3} < 2.6 ]]; then
depends modutils
else
depends module-init-tools
diff --git a/smgl/basesystem/HISTORY b/smgl/basesystem/HISTORY
index 5cacca8..f2e0438 100644
--- a/smgl/basesystem/HISTORY
+++ b/smgl/basesystem/HISTORY
@@ -1,3 +1,6 @@
+2011-08-10 Julien"_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: fixed kernel version test, which chooses dependency on
modutils for kernel < 2.6 and module-init-tools otherwise, for the new 3.x
scheme
+
2011-04-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: removed unzip as a required dependency
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index dd22723..0962926 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -1,39 +1,4 @@
-message "Target list: $QEMU_ARCHS" &&
-
-if [[ $QEMU_VER == "0.10" ]] || [[ $QEMU_VER == "0.11" ]]; then
- if [[ ! $OPTS =~ "--disable-kqemu" ]]; then
- #
- # Disable PIC if building soft MMU targets
- # Pentium3/4 or athlon(-xp) breaks on building soft MMU
- # generally shrinking march down to pentium-mmx
- #
- if grep -q softmmu <<< "$QEMU_ARCHS"; then
- # we need to check does 0.10 act the same way
- message "${MESSAGE_COLOR}QEMU $QEMU_VER has a build problem with
advanced CFLAGS.${DEFAULT_COLOR}" &&
- message "${MESSAGE_COLOR}Trying to make it work, starting with removal
of any sse flags.${DEFAULT_COLOR}" &&
- # sse seems to be bad; -march=pentium -m3dnow worked, though
- list_remove CFLAGS -msse -msse2 -msse3 -mfpmath=sse &&
- if [[ "$CFLAGS" =~ -march=pentium[^[:space:]]+ ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=pentium-mmx"
- fi &&
-
- # -march=prescott was added after
- if [[ "$CFLAGS" =~ -march=prescott ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=pentium-mmx"
- fi &&
- if [[ "$CFLAGS" =~ -march=athlon[^[:space:]]* ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
k6-3.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=k6-3"
- fi &&
- disable_pic
- fi
- fi
-fi &&
+message "${MESSAGE_COLOR}Target list: $QEMU_ARCHS${DEFAULT_COLOR}" &&