Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 78183 by Arwed von Merkatz for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "Benoit Papillault" <benoit.papillault AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 78183 by Arwed von Merkatz for review
  • Date: Sat, 22 Apr 2006 10:15:01 +0100 (BST)

Change 78183 by arwed_von_merkatz@arwed-Otherland on 2006/04/22 10:10:55

mozilla 1.7.13 security update

Affected files ...

... //sgl/grimoires/stable-rc/0.4/ChangeLog#5 integrate
... //sgl/grimoires/stable-rc/0.4/http/mozilla/DETAILS#2 integrate
... //sgl/grimoires/stable-rc/0.4/http/mozilla/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/http/mozilla/PRE_BUILD#2 integrate
... //sgl/grimoires/stable-rc/0.4/http/mozilla/gcc4.patch#2 integrate
... //sgl/grimoires/stable-rc/0.4/mozilla.gpg#2 integrate
... //sgl/grimoires/stable/0.3/ChangeLog#5 integrate
... //sgl/grimoires/stable/0.3/http/mozilla/DETAILS#2 integrate
... //sgl/grimoires/stable/0.3/http/mozilla/HISTORY#2 integrate
... //sgl/grimoires/stable/0.3/http/mozilla/PRE_BUILD#2 integrate
... //sgl/grimoires/stable/0.3/http/mozilla/gcc4.patch#2 integrate
... //sgl/grimoires/stable/0.3/mozilla.gpg#2 integrate

Differences ...

==== //sgl/grimoires/stable-rc/0.4/ChangeLog#5 (text) ====

@@ -1,3 +1,6 @@
+2006-04-22 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * mozilla.gpg: added the current mozilla signing key (1AF32821)
+
2006-04-18 Pieter Lenaerts <e-type AT sourcemage.org>
* editors/pico to z-rejected/z-editors


==== //sgl/grimoires/stable-rc/0.4/http/mozilla/DETAILS#2 (xtext) ====

@@ -1,7 +1,8 @@
SPELL=mozilla
- VERSION=1.7.12
+ VERSION=1.7.13
ENIGMAIL_VERSION=0.92.1
IPC_VERSION=1.1.3
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz

==== //sgl/grimoires/stable-rc/0.4/http/mozilla/HISTORY#2 (text) ====

@@ -1,3 +1,8 @@
+2006-04-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.7.13, SECURITY_PATCH=1
+ * PRE_BUILD: small build fix for extensions/p3p broken Makefile.in
+ * gcc4.patch: removed a part that wasn't necessary anymore
+
2006-01-31 Eric Sandall <eric AT sandall.us>
* DETAILS: Added UPSTREAM_KEY to SOURCE_GPG


==== //sgl/grimoires/stable-rc/0.4/http/mozilla/PRE_BUILD#2 (xtext) ====

@@ -7,10 +7,14 @@

patch -p1 < $SCRIPT_DIRECTORY/freetype.patch &&

+
if use_gcc ^4; then
patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch
fi &&

+# fixes a broken upstream Makefile.in
+sedit 's/\\$/ \\/' extensions/p3p/Makefile.in &&
+
#
# Enigmail extensions
#

==== //sgl/grimoires/stable-rc/0.4/http/mozilla/gcc4.patch#2 (text) ====

@@ -22,18 +22,6 @@

switch (name) {
case MAX_CONNECTIONS:
---- security/nss/lib/pki1/oiddata.h 4 Jan 2002 05:22:07 -0000 1.1
-+++ mozilla/security/nss/lib/pki1/oiddata.h 4 Mar 2005 19:59:58 -0000
-@@ -43,9 +43,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
-
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
- /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
- /*extern const PRUint32 nss_attribute_type_alias_count;*/
-
--- security/nss/lib/pki1/pki1.h 19 Jul 2001 20:40:42 -0000 1.2
+++ mozilla/security/nss/lib/pki1/pki1.h 4 Mar 2005 19:59:59 -0000
@@ -58,6 +58,8 @@

==== //sgl/grimoires/stable-rc/0.4/mozilla.gpg#2 (binary) ====


==== //sgl/grimoires/stable/0.3/ChangeLog#5 (text) ====

@@ -1,3 +1,6 @@
+2006-04-22 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * mozilla.gpg: added the current mozilla signing key (1AF32821)
+
2006-04-18 Pieter Lenaerts <e-type AT sourcemage.org>
* editors/pico to z-rejected/z-editors


==== //sgl/grimoires/stable/0.3/http/mozilla/DETAILS#2 (xtext) ====

@@ -1,7 +1,8 @@
SPELL=mozilla
- VERSION=1.7.12
+ VERSION=1.7.13
ENIGMAIL_VERSION=0.92.1
IPC_VERSION=1.1.3
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz

==== //sgl/grimoires/stable/0.3/http/mozilla/HISTORY#2 (text) ====

@@ -1,3 +1,8 @@
+2006-04-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.7.13, SECURITY_PATCH=1
+ * PRE_BUILD: small build fix for extensions/p3p broken Makefile.in
+ * gcc4.patch: removed a part that wasn't necessary anymore
+
2005-09-23 Thomas Houssin <Thomas.Houssin AT sourcemage.org>
* DETAILS: Updated to 1.7.12


==== //sgl/grimoires/stable/0.3/http/mozilla/PRE_BUILD#2 (xtext) ====

@@ -7,10 +7,14 @@

patch -p1 < $SCRIPT_DIRECTORY/freetype.patch &&

+
if use_gcc ^4; then
patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch
fi &&

+# fixes a broken upstream Makefile.in
+sedit 's/\\$/ \\/' extensions/p3p/Makefile.in &&
+
#
# Enigmail extensions
#

==== //sgl/grimoires/stable/0.3/http/mozilla/gcc4.patch#2 (text) ====

@@ -22,18 +22,6 @@

switch (name) {
case MAX_CONNECTIONS:
---- security/nss/lib/pki1/oiddata.h 4 Jan 2002 05:22:07 -0000 1.1
-+++ mozilla/security/nss/lib/pki1/oiddata.h 4 Mar 2005 19:59:58 -0000
-@@ -43,9 +43,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
-
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
- /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
- /*extern const PRUint32 nss_attribute_type_alias_count;*/
-
--- security/nss/lib/pki1/pki1.h 19 Jul 2001 20:40:42 -0000 1.2
+++ mozilla/security/nss/lib/pki1/pki1.h 4 Mar 2005 19:59:59 -0000
@@ -58,6 +58,8 @@

==== //sgl/grimoires/stable/0.3/mozilla.gpg#2 (binary) ====




  • [SM-Commit] PERFORCE change 78183 by Arwed von Merkatz for review, Perforce Review Daemon, 04/22/2006

Archive powered by MHonArc 2.6.24.

Top of Page