rpms/nspr/devel nspr-thread-cleanup.patch, NONE, 1.1 nspr-ipv6-numerichost.patch, 1.1, 1.2 nspr.spec, 1.19, 1.20 nspr-4.6.1-disable-gcc-ansi.patch, 1.1, NONE nspr-4.6.1-gcc-visibility.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Feb 24 08:29:25 UTC 2007 

Author: kengert

Update of /cvs/dist/rpms/nspr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30320

Modified Files:
	nspr-ipv6-numerichost.patch nspr.spec 
Added Files:
	nspr-thread-cleanup.patch 
Removed Files:
	nspr-4.6.1-disable-gcc-ansi.patch 
	nspr-4.6.1-gcc-visibility.patch 
Log Message:
* Sat Feb 24 2007 Kai Engert <kengert at redhat.com> - 4.6.5-2
- Update to latest ipv6 upstream patch
- Add upstream patch to fix a thread cleanup issue
- Now requires pkgconfig


nspr-thread-cleanup.patch:
 ptthread.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+)

--- NEW FILE nspr-thread-cleanup.patch ---
Index: mozilla/nsprpub/pr/src/pthreads/ptthread.c
===================================================================
RCS file: /cvsroot/mozilla/nsprpub/pr/src/pthreads/ptthread.c,v
retrieving revision 3.66
diff -p -U8 -r3.66 ptthread.c
--- mozilla/nsprpub/pr/src/pthreads/ptthread.c	1 Jul 2005 22:26:37 -0000	3.66
+++ mozilla/nsprpub/pr/src/pthreads/ptthread.c	4 Dec 2006 22:50:55 -0000
@@ -919,16 +919,42 @@ void _PR_InitThreads(
      */
     rv = _PT_PTHREAD_KEY_CREATE(&pt_book.key, _pt_thread_death);
     PR_ASSERT(0 == rv);
     rv = pthread_setspecific(pt_book.key, thred);
     PR_ASSERT(0 == rv);    
     PR_SetThreadPriority(thred, priority);
 }  /* _PR_InitThreads */
 
+#ifdef __GNUC__
+/*
+ * GCC supports the constructor and destructor attributes as of
+ * version 2.5.
+ */
+static void _PR_Fini(void) __attribute__ ((destructor));
+
+static void _PR_Fini(void)
+{
+    void *thred;
+    int rv;
+
+    if (!_pr_initialized) return;
+
+    _PT_PTHREAD_GETSPECIFIC(pt_book.key, thred);
+    if (NULL != thred)
+    {
+        _pt_thread_death(thred);
+        rv = pthread_setspecific(pt_book.key, NULL);
+        PR_ASSERT(0 == rv);
+    }
+    /* TODO: free other resources used by NSPR */
+    /* _pr_initialized = PR_FALSE; */
+}  /* _PR_Fini */
+#endif
+
 PR_IMPLEMENT(PRStatus) PR_Cleanup(void)
 {
     PRThread *me = PR_CurrentThread();
     int rv;
     PR_LOG(_pr_thread_lm, PR_LOG_MIN, ("PR_Cleanup: shutting down NSPR"));
     PR_ASSERT(me->state & PT_THREAD_PRIMORD);
     if (me->state & PT_THREAD_PRIMORD)
     {

nspr-ipv6-numerichost.patch:
 include/md/_win95.h |    2 
 include/md/_winnt.h |    2 
 src/misc/prnetdb.c  |  168 ++++++++++++++++++++++++++++++++++++++++------------
 3 files changed, 135 insertions(+), 37 deletions(-)

Index: nspr-ipv6-numerichost.patch
===================================================================
RCS file: /cvs/dist/rpms/nspr/devel/nspr-ipv6-numerichost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspr-ipv6-numerichost.patch	16 Jan 2007 18:44:35 -0000	1.1
+++ nspr-ipv6-numerichost.patch	24 Feb 2007 08:29:22 -0000	1.2
@@ -1,5 +1,43 @@
---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2007-01-15 13:44:34.365432000 -0800
-+++ mozilla/nsprpub/pr/src/misc/prnetdb.c	2007-01-15 13:45:24.298333000 -0800
+? mozilla/nsprpub/pr/tests/detach.c
+Index: mozilla/nsprpub/pr/include/md/_win95.h
+===================================================================
+RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_win95.h,v
+retrieving revision 3.30.2.1
+diff -u -r3.30.2.1 _win95.h
+--- mozilla/nsprpub/pr/include/md/_win95.h	5 Apr 2006 21:51:23 -0000	3.30.2.1
++++ mozilla/nsprpub/pr/include/md/_win95.h	20 Feb 2007 20:51:07 -0000
+@@ -61,6 +61,8 @@
+ /* newer ws2tcpip.h provides these */
+ #ifndef AI_CANONNAME
+ #define AI_CANONNAME 0x2
++#define AI_NUMERICHOST 0x4
++#define NI_NUMERICHOST 0x02
+ struct addrinfo {
+     int ai_flags;
+     int ai_family;
+Index: mozilla/nsprpub/pr/include/md/_winnt.h
+===================================================================
+RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_winnt.h,v
+retrieving revision 3.30
+diff -u -r3.30 _winnt.h
+--- mozilla/nsprpub/pr/include/md/_winnt.h	20 Jun 2005 22:05:20 -0000	3.30
++++ mozilla/nsprpub/pr/include/md/_winnt.h	20 Feb 2007 20:51:07 -0000
+@@ -76,6 +76,8 @@
+ /* newer ws2tcpip.h provides these */
+ #ifndef AI_CANONNAME
+ #define AI_CANONNAME 0x2
++#define AI_NUMERICHOST 0x4
++#define NI_NUMERICHOST 0x02
+ struct addrinfo {
+     int ai_flags;
+     int ai_family;
+Index: mozilla/nsprpub/pr/src/misc/prnetdb.c
+===================================================================
+RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/prnetdb.c,v
+retrieving revision 3.47.2.1
+diff -u -r3.47.2.1 prnetdb.c
+--- mozilla/nsprpub/pr/src/misc/prnetdb.c	14 Nov 2006 17:41:59 -0000	3.47.2.1
++++ mozilla/nsprpub/pr/src/misc/prnetdb.c	20 Feb 2007 20:51:08 -0000
 @@ -39,6 +39,8 @@
  
  #include <string.h>
@@ -170,19 +208,20 @@
          _pr_freeaddrinfo = (FN_FREEADDRINFO)
              PR_FindFunctionSymbol(lib, FREEADDRINFO_SYMBOL);
          PR_ASSERT(_pr_freeaddrinfo);
-@@ -2020,6 +2043,11 @@
+@@ -2020,6 +2043,12 @@
      if (!_pr_getaddrinfo) {
          return PR_FAILURE;
      }
 +    _pr_getnameinfo = (FN_GETNAMEINFO)
-+        PR_FindFunctionSymbolAndLibrary(GETNAMEINFO_SYMBOL, &lib);
++        PR_FindFunctionSymbol(lib, GETNAMEINFO_SYMBOL);
 +    if (!_pr_getnameinfo) {
++        PR_UnloadLibrary(lib);
 +        return PR_FAILURE;
 +    }
      _pr_freeaddrinfo = (FN_FREEADDRINFO)
          PR_FindFunctionSymbol(lib, FREEADDRINFO_SYMBOL);
      PR_UnloadLibrary(lib);
-@@ -2032,6 +2060,7 @@
+@@ -2032,6 +2061,7 @@
  
  #define GETADDRINFO (*_pr_getaddrinfo)
  #define FREEADDRINFO (*_pr_freeaddrinfo)
@@ -190,7 +229,7 @@
  
  #endif /* _PR_INET6 */
  
-@@ -2048,6 +2077,46 @@
+@@ -2048,6 +2078,46 @@
      PRBool    has_cname;
  } PRAddrInfoFB;
  
@@ -237,7 +276,7 @@
  static PRAddrInfo *
  pr_GetAddrInfoByNameFB(const char  *hostname,
                         PRUint16     af,
-@@ -2055,6 +2124,13 @@
+@@ -2055,6 +2125,13 @@
  {
      PRStatus rv;
      PRAddrInfoFB *ai;
@@ -251,7 +290,7 @@
      /* fallback on PR_GetHostByName */
      ai = PR_NEW(PRAddrInfoFB);
      if (!ai) {
-@@ -2077,7 +2153,7 @@
+@@ -2077,7 +2154,7 @@
  {
      /* restrict input to supported values */
      if ((af != PR_AF_INET && af != PR_AF_UNSPEC) ||
@@ -260,7 +299,7 @@
          PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
          return NULL;
      }
-@@ -2104,6 +2180,7 @@
+@@ -2104,6 +2181,7 @@
  
          memset(&hints, 0, sizeof(hints));
          hints.ai_flags = (flags & PR_AI_NOCANONNAME) ? 0: AI_CANONNAME;
@@ -268,7 +307,7 @@
          hints.ai_family = (af == PR_AF_INET) ? AF_INET : AF_UNSPEC;
  
          /*
-@@ -2139,6 +2216,22 @@
+@@ -2139,6 +2217,22 @@
  #endif
  }
  
@@ -291,25 +330,3 @@
  PR_IMPLEMENT(void *) PR_EnumerateAddrInfo(void             *iterPtr,
                                            const PRAddrInfo *base,
                                            PRUint16          port,
---- mozilla/nsprpub/pr/include/md/_winnt.h.orig	2007-01-15 13:44:17.299466000 -0800
-+++ mozilla/nsprpub/pr/include/md/_winnt.h	2007-01-15 13:45:24.286333000 -0800
-@@ -76,6 +76,8 @@
- /* newer ws2tcpip.h provides these */
- #ifndef AI_CANONNAME
- #define AI_CANONNAME 0x2
-+#define AI_NUMERICHOST 0x4
-+#define NI_NUMERICHOST 0x02
- struct addrinfo {
-     int ai_flags;
-     int ai_family;
---- mozilla/nsprpub/pr/include/md/_win95.h.orig	2007-01-15 13:44:25.152451000 -0800
-+++ mozilla/nsprpub/pr/include/md/_win95.h	2007-01-15 13:45:24.280332000 -0800
-@@ -61,6 +61,8 @@
- /* newer ws2tcpip.h provides these */
- #ifndef AI_CANONNAME
- #define AI_CANONNAME 0x2
-+#define AI_NUMERICHOST 0x4
-+#define NI_NUMERICHOST 0x02
- struct addrinfo {
-     int ai_flags;
-     int ai_family;


Index: nspr.spec
===================================================================
RCS file: /cvs/dist/rpms/nspr/devel/nspr.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nspr.spec	23 Jan 2007 01:49:28 -0000	1.19
+++ nspr.spec	24 Feb 2007 08:29:22 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	Netscape Portable Runtime
 Name:		nspr
 Version:	4.6.5
-Release:	1
+Release:	2
 License:	MPL/GPL/LGPL
 URL:		http://www.mozilla.org/projects/nspr/
 Group:		System Environment/Libraries
@@ -12,6 +12,7 @@
 
 Patch1:         nspr-config-pc.patch
 Patch2:         nspr-ipv6-numerichost.patch
+Patch3:         nspr-thread-cleanup.patch
 
 Provides:	mozilla-nspr
 Obsoletes:	mozilla-nspr
@@ -26,6 +27,7 @@
 Summary:	Development libraries for the Netscape Portable Runtime
 Group:		Development/Libraries
 Requires:	nspr = %{version}-%{release}
+Requires:       pkgconfig
 Provides:	mozilla-nspr-devel
 Obsoletes:	mozilla-nspr-devel
 
@@ -46,6 +48,7 @@
 cp ./mozilla/nsprpub/config/nspr-config.in ./mozilla/nsprpub/config/nspr-config-pc.in
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 
 cp %{SOURCE2} ./mozilla/nsprpub/config/
 
@@ -122,6 +125,11 @@
 %{_bindir}/nspr-config
 
 %changelog
+* Sat Feb 24 2007 Kai Engert <kengert at redhat.com> - 4.6.5-2
+- Update to latest ipv6 upstream patch
+- Add upstream patch to fix a thread cleanup issue
+- Now requires pkgconfig
+
 * Mon Jan 22 2007 Wan-Teh Chang <wtchang at redhat.com> - 4.6.5-1
 - Update to 4.6.5
 


--- nspr-4.6.1-disable-gcc-ansi.patch DELETED ---


--- nspr-4.6.1-gcc-visibility.patch DELETED ---

More information about the fedora-cvs-commits mailing list