Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (c12597397072b334cb932fe197439f6d3aca7f33)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Martin Spitzbarth <m.spitzbarth AT gmx.de>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (c12597397072b334cb932fe197439f6d3aca7f33)
  • Date: Sat, 19 Apr 2008 11:01:00 +0200

On Sat, 19 Apr 2008 02:08:06 -0500 Eric Sandall <scm AT sourcemage.org>
wrote:

> GIT changes to master grimoire by Eric Sandall
> <sandalle AT sourcemage.org>:
>
> http/firefox/DETAILS | 2 +-
> http/firefox/INSTALL | 4 ++++
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> New commits:
> commit c12597397072b334cb932fe197439f6d3aca7f33
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: Eric Sandall <sandalle AT sourcemage.org>
>
> firefox: Updated to 2.0.0.14. SECURITY_PATCH++
>
> commit 3ed90172623188093f8b7a88aca4b3a8dc833763
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: Eric Sandall <sandalle AT sourcemage.org>
>
> Revert "firefox: Updated to 2.0.0.14. SECURITY_PATCH++"
>
> This reverts commit f0f175388784d348708cd2037abcf16af3bd1ae6.
>
> Forgot SECURITY_PATCH++
>
> diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
> index 2a12041..8387874 100755
> --- a/http/firefox/DETAILS
> +++ b/http/firefox/DETAILS
> @@ -16,7 +16,7 @@ else
>
> SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
> SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
> SOURCE2_URL[0]=$SOURCE_URL.asc
> - SECURITY_PATCH=16
> + SECURITY_PATCH=17
> fi
> SOURCE2_IGNORE=signature
> SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
> diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
> index 7116f8f..464c83e 100755
> --- a/http/firefox/INSTALL
> +++ b/http/firefox/INSTALL
> @@ -5,6 +5,10 @@ FIREFOX_HOME=$INSTALL_ROOT/usr/lib/firefox &&
> if spell_ok Firebird; then
> dispel Firebird
> fi &&
> +#fix firefox-config file to match installed configuration
> +if [ "$FIREFOX_CVS" == "n" ]; then
> + patch -p0 < $SCRIPT_DIRECTORY/firefox-config.patch
> +fi &&

Something went b0rked here. The firefox-config.patch file has been
removed in this commit (c1259...), but
the "revert" in commit (3ed90...) has re-added the call to patch in
INSTALL (along with the note in HISTORY).

Martin

Attachment: signature.asc
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page