rpms/libosip2/FC-4 libosip2-2.2.2-x64.patch, NONE, 1.1 libosip2.spec, 1.6, 1.7

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/rpms/libosip2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7195

Modified Files:
	libosip2.spec 
Added Files:
	libosip2-2.2.2-x64.patch 
Log Message:
Fix for AMD64

libosip2-2.2.2-x64.patch:

--- NEW FILE libosip2-2.2.2-x64.patch ---
--- libosip2-2.2.2/src/osipparser2/osip_parser_cfg.c.x64	2006-02-23 13:29:36.000000000 -0500
+++ libosip2-2.2.2/src/osipparser2/osip_parser_cfg.c	2006-02-23 13:31:48.000000000 -0500
@@ -32,8 +32,15 @@
  * Anyway, this mechanism improves the search time (from binary seach (log(n)) to 1).
  */
 
-#define HASH_TABLE_SIZE 150     /* set this to the hash table size, 150 is the first size
-                                   where no conflicts occur                               */
+#ifndef HASH_TABLE_SIZE
+#ifdef __amd64__
+#define HASH_TABLE_SIZE 450
+#else
+#define HASH_TABLE_SIZE 150     /* set this to the hash table size, 150 is the
+				   first size where no conflicts occur */
+#endif
+#endif
+
 static int hdr_ref_table[HASH_TABLE_SIZE];      /* the hashtable contains indices to the pconfig table    */
 
 /*
@@ -146,6 +153,10 @@
       } else
         {
           /* oops, conflict!-> change the hash table or use another hash function size */
+	  
+	  OSIP_TRACE (osip_trace
+		(__FILE__, __LINE__, OSIP_ERROR, NULL,
+		"conflict with current hashtable size\n"));
           return -1;
         }
     }


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-4/libosip2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libosip2.spec	22 Dec 2005 23:59:40 -0000	1.6
+++ libosip2.spec	23 Feb 2006 21:37:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libosip2
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -8,6 +8,7 @@
 License:        LGPL
 URL:            http://www.gnu.org/software/osip/
 Source0:        http://ftp.gnu.org/gnu/osip/%{name}-%{version}.tar.gz
+Patch:          libosip2-2.2.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .x64
 
 %build
 %configure --disable-static
@@ -72,6 +74,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Feb 23 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-2
+- Fix for AMD64
+
 * Thu Dec 22 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-1
 - Upstream update