[pkgsrc/pkgsrc-2004Q3]: pkgsrc Security Pullup - requested by Grant Beattie

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2004Q3]: pkgsrc Security Pullup - requested by Grant Beattie
From: agc <agc%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:34:50 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/600ef1af0cb6
branches:  pkgsrc-2004Q3
changeset: 480725:600ef1af0cb6
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Oct 26 11:09:16 2004 +0000

description:
Security Pullup - requested by Grant Beattie
security fix for firefox

Includes the following modifications:

        Module Name:    pkgsrc
        Committed By:   grant
        Date:           Mon Oct  4 09:11:30 UTC 2004

        Modified Files:
                pkgsrc/www/firefox: Makefile-firefox.common distinfo

        Log Message:
        update to Firefox 0.10.1, bugfix for a security issue:

                http://www.mozilla.org/press/mozilla-2004-10-01-02.html


        To generate a diff of this commit:
        cvs rdiff -r1.3 -r1.4 pkgsrc/www/firefox/Makefile-firefox.common
        cvs rdiff -r1.16 -r1.17 pkgsrc/www/firefox/distinfo
---
        Module Name:    pkgsrc
        Committed By:   grant
        Date:           Mon Oct  4 09:15:29 UTC 2004

        Modified Files:
                pkgsrc/www/firefox: distinfo
                pkgsrc/www/firefox/patches: patch-br

        Log Message:
        commit a patch for using thread-safe resolver library functions on
        NetBSD >=2.0F - I've been running with it for months on -current
        without any problems.


        To generate a diff of this commit:
        cvs rdiff -r1.17 -r1.18 pkgsrc/www/firefox/distinfo
        cvs rdiff -r1.2 -r1.3 pkgsrc/www/firefox/patches/patch-br
---
        Module Name:    pkgsrc
        Committed By:   reed
        Date:           Sat Oct 16 20:08:48 UTC 2004

        Modified Files:
                pkgsrc/www/firefox: Makefile-firefox.common

        Log Message:
        Use cp(1)'s -RL instead of -r, because coreutils's
        cp -r copies symlinks as symlinks (which caused
        files to be missing in install).

        Hopefully, this is portable. I tested under NetBSD and with coreutils.
        And I brought this up on tech-pkg in July.


        To generate a diff of this commit:
        cvs rdiff -r1.4 -r1.5 pkgsrc/www/firefox/Makefile-firefox.common

---
        Module Name:    pkgsrc
        Committed By:   reed
        Date:           Tue Oct 19 21:01:47 UTC 2004

        Modified Files:
                pkgsrc/www/firefox: Makefile-firefox.common

        Log Message:
        Instead of non-portable cp -RL, use pax with -Lrw
        to copy the extensions files.

        On Solaris, cp doesn't know -L. (Reported by R. Quinn.)
        Using pax was suggested by grant@.


        To generate a diff of this commit:
        cvs rdiff -r1.5 -r1.6 pkgsrc/www/firefox/Makefile-firefox.common
---
        Module Name:    pkgsrc
        Committed By:   xtraeme
        Date:           Thu Oct 21 00:55:36 UTC 2004

        Modified Files:
                pkgsrc/www/firefox: distinfo
        Added Files:
                pkgsrc/www/firefox/patches: patch-cd

        Log Message:
        Only include <stdbool.h> if !defined(_cplusplus) in nptypes.h.

        Fixes build on NetBSD/macppc and maybe others, tested by Peter Bex
        on 2-0/macppc and i386/-current/2-0 by me, closes PR pkg/27033.


        To generate a diff of this commit:
        cvs rdiff -r1.18 -r1.19 pkgsrc/www/firefox/distinfo
        cvs rdiff -r0 -r1.1 pkgsrc/www/firefox/patches/patch-cd
---
        Module Name:    pkgsrc
        Committed By:   grant
        Date:           Sun Oct 24 05:41:25 UTC 2004

        Modified Files:
                pkgsrc/www/firefox: distinfo
        Added Files:
                pkgsrc/www/firefox/patches: patch-ce patch-cf

        Log Message:
        apply patch from mozilla CVS to fix bug id #260337 (installer missing
        libnsl on Solaris), as well as another sh(1) portability fix.

                https://bugzilla.mozilla.org/show_bug.cgi?id=260337

        no PKGREVISION bump because this didn't build on Solaris without
        libnsl.


        To generate a diff of this commit:
        cvs rdiff -r1.19 -r1.20 pkgsrc/www/firefox/distinfo
        cvs rdiff -r0 -r1.1 pkgsrc/www/firefox/patches/patch-ce \
            pkgsrc/www/firefox/patches/patch-cf

diffstat:

 doc/CHANGES-pkgsrc-2004Q3           |   4 +++-
 www/firefox/Makefile-firefox.common |   9 +++++----
 www/firefox/distinfo                |  11 +++++++----
 www/firefox/patches/patch-br        |  16 ++++++++++------
 www/firefox/patches/patch-cd        |  29 +++++++++++++++++++++++++++++
 www/firefox/patches/patch-ce        |  15 +++++++++++++++
 www/firefox/patches/patch-cf        |  14 ++++++++++++++
 7 files changed, 83 insertions(+), 15 deletions(-)

diffs (174 lines):

diff -r 9fa9072ed25c -r 600ef1af0cb6 doc/CHANGES-pkgsrc-2004Q3
--- a/doc/CHANGES-pkgsrc-2004Q3 Mon Oct 25 21:28:01 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q3 Tue Oct 26 11:09:16 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q3,v 1.1.2.11 2004/10/25 21:25:25 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q3,v 1.1.2.12 2004/10/26 11:09:16 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q3 branch:
@@ -25,3 +25,5 @@
 security fix for ap-ssl
 Security Pullup - requested by Mark Davies
 security fix for kpdf, part of kdegraphics3
+Security Pullup - requested by Grant Beattie
+security fix for firefox
diff -r 9fa9072ed25c -r 600ef1af0cb6 www/firefox/Makefile-firefox.common
--- a/www/firefox/Makefile-firefox.common       Mon Oct 25 21:28:01 2004 +0000
+++ b/www/firefox/Makefile-firefox.common       Tue Oct 26 11:09:16 2004 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile-firefox.common,v 1.3 2004/09/20 08:03:42 taya Exp $
+# $NetBSD: Makefile-firefox.common,v 1.3.2.1 2004/10/26 11:09:16 agc Exp $
 
 MOZILLA_BIN=   firefox-bin
-MOZ_VER=       0.10
+MOZ_VER=       0.10.1
 EXTRACT_SUFX=  .tar.bz2
 
 DISTNAME=      firefox-1.0PR-source
+DIST_SUBDIR=   firefox-${MOZ_VER}
 
 MASTER_SITES=  http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
                ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
@@ -29,8 +30,8 @@
 MESSAGE=               ${.CURDIR}/../../www/firefox/MESSAGE
 
 pre-install:
-       ${CP} -r ${WRKSRC}/dist/bin/defaults/profile/extensions \
-                                                       ${WRKSRC}/dist/bin
+       cd ${WRKSRC}/dist/bin/defaults/profile/ && \
+               ${PAX} -Lrw extensions ${WRKSRC}/dist/bin
        ${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \
                ${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt
 
diff -r 9fa9072ed25c -r 600ef1af0cb6 www/firefox/distinfo
--- a/www/firefox/distinfo      Mon Oct 25 21:28:01 2004 +0000
+++ b/www/firefox/distinfo      Tue Oct 26 11:09:16 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2004/09/20 08:03:42 taya Exp $
+$NetBSD: distinfo,v 1.16.2.1 2004/10/26 11:09:16 agc Exp $
 
-SHA1 (firefox-1.0PR-source.tar.bz2) = bd88b755e879b71d13fa479f5d89cf2df3c5f6e0
-Size (firefox-1.0PR-source.tar.bz2) = 32396291 bytes
+SHA1 (firefox-0.10.1/firefox-1.0PR-source.tar.bz2) = e12f861c8e55fe591053f30e9c9259fa8e662c41
+Size (firefox-0.10.1/firefox-1.0PR-source.tar.bz2) = 32380173 bytes
 SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
 SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369
 SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642
@@ -23,7 +23,7 @@
 SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991
 SHA1 (patch-bo) = 357c4cacdc179191d6fe263b4eb62cc56b7ec25f
 SHA1 (patch-bq) = 3b8a951828b0e6906e4352027b4d36c9b1f8aaae
-SHA1 (patch-br) = aa48e974306fdbfc1e71b5fd9c1f5d18771143f5
+SHA1 (patch-br) = 6311da23ec126fe0959cb19502a22c106f8f975c
 SHA1 (patch-bs) = 81065130c96bf966b22e6abb767a5b674dcb52cb
 SHA1 (patch-bt) = 8ee09dd2acbbc0c002283b15eafbafb4f324948a
 SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
@@ -35,3 +35,6 @@
 SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b
 SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908
 SHA1 (patch-cc) = cb08d4b7330c9e471d172c11772c840e613ceb76
+SHA1 (patch-cd) = bbe839bce72a1d6816fa0c091172a818fb469981
+SHA1 (patch-ce) = f7db7a46d40b80287774f93d55b05a5ad0c79214
+SHA1 (patch-cf) = 337bc106afe7ce3fa6678fca4c0317714393a977
diff -r 9fa9072ed25c -r 600ef1af0cb6 www/firefox/patches/patch-br
--- a/www/firefox/patches/patch-br      Mon Oct 25 21:28:01 2004 +0000
+++ b/www/firefox/patches/patch-br      Tue Oct 26 11:09:16 2004 +0000
@@ -1,17 +1,21 @@
-$NetBSD: patch-br,v 1.2 2004/06/23 16:47:12 taya Exp $
+$NetBSD: patch-br,v 1.2.2.1 2004/10/26 11:09:16 agc Exp $
 
-diff -ru ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c
---- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c      2004-01-23 07:22:37.000000000 +0900
-+++ ./nsprpub/pr/src/misc/prnetdb.c    2004-06-15 23:56:46.000000000 +0900
-@@ -2094,7 +2094,12 @@
+--- nsprpub/pr/src/misc/prnetdb.c.orig 2004-01-23 09:22:37.000000000 +1100
++++ nsprpub/pr/src/misc/prnetdb.c
+@@ -2094,7 +2094,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
  
-+        LOCK_DNS();
++/* NetBSD >=2.0F has a thread-safe resolver */
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000
++      LOCK_DNS();
++#endif
 +
          rv = GETADDRINFO(hostname, NULL, &hints, &res);
 +
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000
 +        UNLOCK_DNS();
++#endif
 +
          if (rv == 0)
              return (PRAddrInfo *) res;
diff -r 9fa9072ed25c -r 600ef1af0cb6 www/firefox/patches/patch-cd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-cd      Tue Oct 26 11:09:16 2004 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-cd,v 1.1.2.2 2004/10/26 11:09:16 agc Exp $
+
+--- modules/plugin/base/public/nptypes.h.orig  2004-10-21 01:07:27.000000000 +0200
++++ modules/plugin/base/public/nptypes.h       2004-10-21 01:09:38.000000000 +0200
+@@ -78,8 +78,10 @@
+     typedef int bool;
+   #endif
+   #else /* OPENBSD is defined, so use its bool */
++  #if !defined(__cplusplus)
+     #include <stdbool.h>
+   #endif
++  #endif
+   #else
+   /*
+    * FreeBSD defines uint32_t and bool.
+@@ -97,6 +99,7 @@
+    */
+   #include <stdint.h>
+ 
++  #if !defined(__cplusplus)
+   #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
+     #include <stdbool.h>
+   #else
+@@ -106,4 +109,5 @@
+      */
+     #define bool int
+   #endif
++  #endif
+ #endif
diff -r 9fa9072ed25c -r 600ef1af0cb6 www/firefox/patches/patch-ce
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-ce      Tue Oct 26 11:09:16 2004 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ce,v 1.1.2.2 2004/10/26 11:09:16 agc Exp $
+
+--- toolkit/mozapps/installer/unix/wizard/Makefile.in.orig     2004-08-27 05:57:00.000000000 +1000
++++ toolkit/mozapps/installer/unix/wizard/Makefile.in
+@@ -60,6 +60,10 @@ LIBS        = \
+         -lpthread \
+         $(NULL)
+ 
++ifeq ($(OS_ARCH),SunOS)
++LIBS    += -lnsl
++endif
++
+ EXTRA_DEPS = \
+       $(DIST)/lib/$(LIB_PREFIX)jar50_s.$(LIB_SUFFIX) \
+       $(DIST)/lib/$(LIB_PREFIX)xpnet_s.$(LIB_SUFFIX) \
diff -r 9fa9072ed25c -r 600ef1af0cb6 www/firefox/patches/patch-cf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-cf      Tue Oct 26 11:09:16 2004 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-cf,v 1.1.2.2 2004/10/26 11:09:16 agc Exp $
+
+--- browser/config/mozconfig.orig      2004-07-07 18:31:10.000000000 +1000
++++ browser/config/mozconfig
+@@ -3,7 +3,8 @@
+ #  . $topsrcdir/browser/config/mozconfig
+ # to the top of your mozconfig file.
+ 
+-export MOZ_PHOENIX=1
++MOZ_PHOENIX=1
++export MOZ_PHOENIX
+ mk_add_options MOZ_PHOENIX=1
+ 
+ ac_add_options --disable-ldap
Prev by Date: [pkgsrc/pkgsrc-2004Q3]: pkgsrc Security Pullup - requested by Mark Davies
Next by Date: [pkgsrc/pkgsrc-2004Q3]: pkgsrc Security Pullup - requested by Adrian Portelli
Previous by Thread: [pkgsrc/pkgsrc-2004Q3]: pkgsrc Security Pullup - requested by Mark Davies
Next by Thread: [pkgsrc/pkgsrc-2004Q3]: pkgsrc Security Pullup - requested by Adrian Portelli
Indexes:
Home | Main Index | Thread Index | Old Index