Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (7c94368e0507ed8183131b6d320eed70d4ecc846)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (7c94368e0507ed8183131b6d320eed70d4ecc846)
  • Date: Sun, 21 Oct 2007 03:24:47 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

http/firefox/DETAILS | 4 ++--
http/firefox/HISTORY | 5 -----
http/firefox/firefox-config.patch | 10 +++++-----
3 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit 7c94368e0507ed8183131b6d320eed70d4ecc846
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "firefox 2.0.0.8, SECURITY_PATCH=12"

This reverts commit fbcbee4e4600baa98cbcd2b141202818f6090592.

Reverting until we can get this working

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 953096d..d767530 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -5,7 +5,7 @@ if [ "$FIREFOX_CVS" == "y" ]; then

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
SOURCE_IGNORE=volatile
else
- VERSION=2.0.0.8
+ VERSION=2.0.0.7
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
@@ -15,7 +15,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=12
+ SECURITY_PATCH=11
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 7245c4d..6c07798 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,8 +1,3 @@
-2007-10-19 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.0.0.8, SECURITY_PATCH=12
-
http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.8
- * firefox-config.patch: updated to 2.0.0.8
-
2007-09-24 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to used UPSTREAM_KEY again
* firefox.gpg: Added new upstream key
diff --git a/http/firefox/firefox-config.patch
b/http/firefox/firefox-config.patch
index 4e7b316..6a3f0dd 100644
--- a/http/firefox/firefox-config.patch
+++ b/http/firefox/firefox-config.patch
@@ -14,8 +14,8 @@
exit 0
;;
--cflags)
-- if test "/usr/local/include/firefox-2.0.0.8" != /usr/include ; then
-- includes="-I/usr/local/include/firefox-2.0.0.8"
+- if test "/usr/local/include/firefox-2.0.0.7" != /usr/include ; then
+- includes="-I/usr/local/include/firefox-2.0.0.7"
+ if test "/usr/include/firefox" != /usr/include ; then
+ includes="-I/usr/include/firefox"
fi
@@ -25,14 +25,14 @@
if test "$echo_cflags" = "yes"; then
nspr_cflags="-I/usr/include/nspr"
for n in $echo_components; do
-- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.8/$n"
+- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.7/$n"
+ component_includes="$component_includes -I/usr/include/firefox/$n"
done
echo $component_includes $includes $nspr_cflags
fi

if test "$echo_idlflags" = "yes"; then
-- echo "-I/usr/local/share/idl/firefox-2.0.0.8"
+- echo "-I/usr/local/share/idl/firefox-2.0.0.7"
+ echo "-I/usr/share/idl/firefox"
fi

@@ -41,6 +41,6 @@
;;
esac
done
-- echo -L/usr/local/lib/firefox-2.0.0.8 $libs
+- echo -L/usr/local/lib/firefox-2.0.0.7 $libs
+ echo -L/usr/lib $libs
fi



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (7c94368e0507ed8183131b6d320eed70d4ecc846), Eric Sandall, 10/21/2007

Archive powered by MHonArc 2.6.24.

Top of Page