rpms/conexus/devel conexus.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 conexus.spec, 1.11, 1.12 sources, 1.8, 1.9

Rick L. Vinyard, Jr. (rvinyard) fedora-extras-commits at redhat.com
Tue Mar 4 04:52:38 UTC 2008


Author: rvinyard

Update of /cvs/extras/rpms/conexus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9280

Modified Files:
	.cvsignore conexus.spec sources 
Added Files:
	conexus.patch 
Log Message:


conexus.patch:

--- NEW FILE conexus.patch ---
diff -r -U 5 conexus-0.5.3.orig/conexus/data.cpp conexus-0.5.3/conexus/data.cpp
--- conexus-0.5.3.orig/conexus/data.cpp	2007-03-13 19:31:19.000000000 -0600
+++ conexus-0.5.3/conexus/data.cpp	2008-03-03 21:40:26.000000000 -0700
@@ -15,10 +15,11 @@
  *   License along with this library; if not, write to the                 *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA              *
  ***************************************************************************/
 #include "data.h"
+#include <cstring>
 
 namespace Conexus
 {
 
   Data::Data( const void* d, size_t s, unsigned priority, DataMode mode ) throw ( std::bad_alloc )
diff -r -U 5 conexus-0.5.3.orig/conexus/except.h conexus-0.5.3/conexus/except.h
--- conexus-0.5.3.orig/conexus/except.h	2007-03-10 14:29:34.000000000 -0700
+++ conexus-0.5.3/conexus/except.h	2008-03-03 21:31:31.000000000 -0700
@@ -24,10 +24,11 @@
  */
 
 #include <stdexcept>
 #include <errno.h>
 #include <sstream>
+#include <cstring>
 
 namespace Conexus
   {
 
   /**
diff -r -U 5 conexus-0.5.3.orig/conexus/except_socket.h conexus-0.5.3/conexus/except_socket.h
--- conexus-0.5.3.orig/conexus/except_socket.h	2007-03-10 14:29:33.000000000 -0700
+++ conexus-0.5.3/conexus/except_socket.h	2008-03-03 20:08:36.000000000 -0700
@@ -18,10 +18,11 @@
  ***************************************************************************/
 #ifndef CONEXUSEXCEPT_SOCKET_H
 #define CONEXUSEXCEPT_SOCKET_H
 
 #include <conexus/except.h>
+#include <cstring>
 
 namespace Conexus
   {
 
     /**
diff -r -U 5 conexus-0.5.3.orig/conexus/ipv4_address.cpp conexus-0.5.3/conexus/ipv4_address.cpp
--- conexus-0.5.3.orig/conexus/ipv4_address.cpp	2007-02-06 10:16:38.000000000 -0700
+++ conexus-0.5.3/conexus/ipv4_address.cpp	2008-03-03 21:39:30.000000000 -0700
@@ -23,10 +23,11 @@
 
 #include <sstream>
 #include <cstdlib>
 #include <netdb.h>
 #include <boost/regex.hpp>
+#include <cstring>
 
 namespace Conexus
 {
 
   namespace IPv4
@@ -87,11 +88,11 @@
         m_port( 0 ),
         m_prefix_length( 32 )
     {
       uint32_t ipv4addr;
       if ( ipv6addr.is_ipv4_compatible() ) {
-        ipv4addr = ipv6addr.address().in6_u.u6_addr32[ 3 ];
+        ipv4addr = ipv6addr.address().__in6_u.__u6_addr32[ 3 ];
         this->set_address( ipv4addr );
         m_sockaddr.ipv4.sin_port = htons( ipv6addr.port() );
       } else
         throw( exception::address::ipv6_not_ipv4_compatible() );
     }
diff -r -U 5 conexus-0.5.3.orig/conexus/ll_address.cpp conexus-0.5.3/conexus/ll_address.cpp
--- conexus-0.5.3.orig/conexus/ll_address.cpp	2007-01-31 14:03:09.000000000 -0700
+++ conexus-0.5.3/conexus/ll_address.cpp	2008-03-03 21:32:07.000000000 -0700
@@ -19,10 +19,11 @@
 #include "ll_address.h"
 
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
+#include <cstring>
 
 namespace Conexus
 {
   namespace LL
   {
diff -r -U 5 conexus-0.5.3.orig/conexus/ll_packet.cpp conexus-0.5.3/conexus/ll_packet.cpp
--- conexus-0.5.3.orig/conexus/ll_packet.cpp	2007-03-08 14:10:31.000000000 -0700
+++ conexus-0.5.3/conexus/ll_packet.cpp	2008-03-03 20:09:06.000000000 -0700
@@ -19,10 +19,11 @@
 #include "ll_packet.h"
 
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
+#include <cstring>
 
 namespace Conexus
 {
   namespace LL
   {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/conexus/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Mar 2007 02:14:30 -0000	1.8
+++ .cvsignore	4 Mar 2008 04:52:00 -0000	1.9
@@ -1 +1,2 @@
 conexus-0.5.3.tar.bz2
+conexus.patch


Index: conexus.spec
===================================================================
RCS file: /cvs/extras/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- conexus.spec	19 Feb 2008 22:51:08 -0000	1.11
+++ conexus.spec	4 Mar 2008 04:52:00 -0000	1.12
@@ -1,13 +1,14 @@
 Summary:          C++ network and serial communication library
 Name:             conexus
 Version:          0.5.3
-Release:          3%{?dist}
-License:          LGPL
+Release:          4%{?dist}
+License:          LGPLv2
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
 Source:           http://download.sourceforge.net/conexus/conexus-0.5.3.tar.bz2
+Patch0:           conexus.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    glibmm24-devel >= 2.6.0 boost-devel >= 1.32.0 cppunit-devel >= 1.11 pkgconfig m4
+BuildRequires:    glibmm24-devel >= 2.6.0 boost-devel >= 1.32.0 cppunit-devel >= 1.11 popt-devel pkgconfig m4
 
 %description
 Conexus is a generalized C++ I/O library that includes support for BSD
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure --enable-static=no
@@ -59,6 +61,10 @@
 
 
 %changelog
+* Mon Mar 03 2008 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.3-4
+- Added cstring patch
+- Added popt-devel requires
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.3-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/conexus/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Mar 2007 02:14:30 -0000	1.8
+++ sources	4 Mar 2008 04:52:00 -0000	1.9
@@ -1 +1,2 @@
 bde0c8fe11be8079407098137f346f0c  conexus-0.5.3.tar.bz2
+0184eaf7e5decd0d4eaba34803cdedde  conexus.patch




More information about the fedora-extras-commits mailing list