rpms/partimage/devel partimage-0.6.8-gcc44.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.4, 1.5 partimage.spec, 1.6, 1.7 sources, 1.3, 1.4

[Paulo Roma Cavalcanti]

Author: roma

Update of /cvs/pkgs/rpms/partimage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25730/devel

Modified Files:
	.cvsignore import.log partimage.spec sources 
Added Files:
	partimage-0.6.8-gcc44.patch 
Log Message:
version 0.6.8 - ssl enabled

partimage-0.6.8-gcc44.patch:
 client/netclient.h |    2 +-
 server/netserver.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE partimage-0.6.8-gcc44.patch ---
diff -Naur partimage-0.6.8/src/client/netclient.h partimage-0.6.8-new/src/client/netclient.h
--- partimage-0.6.8/src/client/netclient.h	2009-09-24 16:21:42.000000000 -0300
+++ partimage-0.6.8-new/src/client/netclient.h	2009-11-26 09:23:07.000000000 -0200
@@ -35,7 +35,7 @@
 #ifdef HAVE_SSL
   SSL_CTX * ctx;
   X509 * server_cert;
-  SSL_METHOD * meth;
+  const SSL_METHOD * meth;
 #endif
   bool m_bUseSSL;
   bool m_bMustLogin;
diff -Naur partimage-0.6.8/src/server/netserver.h partimage-0.6.8-new/src/server/netserver.h
--- partimage-0.6.8/src/server/netserver.h	2009-09-12 05:06:22.000000000 -0300
+++ partimage-0.6.8-new/src/server/netserver.h	2009-11-26 09:32:02.000000000 -0200
@@ -41,7 +41,7 @@
 #ifdef HAVE_SSL
   SSL_CTX * ctx;
   X509 * client_cert;
-  SSL_METHOD * meth; 
+  const SSL_METHOD * meth; 
   int err;
 #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/partimage/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Nov 2009 11:08:23 -0000	1.3
+++ .cvsignore	26 Nov 2009 14:18:00 -0000	1.4
@@ -1,3 +1,3 @@
+partimage-0.6.8.tar.bz2
 partimage-man.tar.gz
 partimage-scripts.tar.gz
-partimage-0.6.8.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/partimage/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	26 Nov 2009 11:08:23 -0000	1.4
+++ import.log	26 Nov 2009 14:18:00 -0000	1.5
@@ -2,3 +2,4 @@ partimage-0_6_7-5_fc8:HEAD:partimage-0.6
 partimage-0_6_7-6_fc11:HEAD:partimage-0.6.7-6.fc11.src.rpm:1235666598
 partimage-0_6_7-7_fc10:HEAD:partimage-0.6.7-7.fc10.src.rpm:1235667632
 partimage-0_6_8-1_fc10:HEAD:partimage-0.6.8-1.fc10.src.rpm:1259233680
+partimage-0_6_8-2_fc12:HEAD:partimage-0.6.8-2.fc12.src.rpm:1259245052


Index: partimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/partimage/devel/partimage.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- partimage.spec	26 Nov 2009 11:08:23 -0000	1.6
+++ partimage.spec	26 Nov 2009 14:18:00 -0000	1.7
@@ -13,7 +13,7 @@
 Summary: Partition imaging utility, much like Ghost
 Name:    partimage
 Version: 0.6.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/System
 URL:     http://www.partimage.org/
@@ -21,6 +21,7 @@ Source0: http://downloads.sourceforge.ne
 Source1: %{name}-man.tar.gz
 Source2: %{name}-scripts.tar.gz
 Source3: README.partimage.html
+Patch0:  partimage-0.6.8-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext
 BuildRequires: autoconf 
@@ -65,6 +66,7 @@ This package contains the server daemon 
 
 %prep
 %setup -q -a1 -a2
+%patch0 -p1 -b .gcc44
 for i in ./TODO ./README ./ChangeLog ./THANKS ./README.partimaged; do
         iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
         mv "${i}_" "$i"
@@ -218,6 +220,9 @@ fi
 %dir %{image_place}
 
 %changelog
+* Thu Nov 26 2009 Paulo Roma <roma at lcg.ufrj.br> - 0.6.8-2
+- Patched for gcc44 (Fedora 12).
+
 * Mon Nov 23 2009 Paulo Roma <roma at lcg.ufrj.br> - 0.6.8-1
 - Updated 0.6.8
 - Removed all patches.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/partimage/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Nov 2009 11:08:23 -0000	1.3
+++ sources	26 Nov 2009 14:18:00 -0000	1.4
@@ -1,3 +1,3 @@
+c13c8ede8cdf7745b97ec5827920ece7  partimage-0.6.8.tar.bz2
 2ca176278ca1dbe52d74f70812a693ab  partimage-man.tar.gz
 77e47a3cdd7d804ab7efae19143b23ec  partimage-scripts.tar.gz
-c13c8ede8cdf7745b97ec5827920ece7  partimage-0.6.8.tar.bz2