rpms/partimage/F-12 partimage-0.6.8-gcc44.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 README.partimage.html, 1.1, 1.2 import.log, 1.3, 1.4 partimage.spec, 1.5, 1.6 sources, 1.2, 1.3 partimage-0.6.7-gcc43.patch, 1.1, NONE partimage-0.6.7-gcc44.patch, 1.1, NONE

Thu Nov 26 11:42:18 UTC 2009

Author: roma

Update of /cvs/pkgs/rpms/partimage/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29504/F-12

Modified Files:
	.cvsignore README.partimage.html import.log partimage.spec 
	sources 
Added Files:
	partimage-0.6.8-gcc44.patch 
Removed Files:
	partimage-0.6.7-gcc43.patch partimage-0.6.7-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/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Dec 2008 01:19:12 -0000	1.2
+++ .cvsignore	26 Nov 2009 11:42:17 -0000	1.3
@@ -1,3 +1,3 @@
-partimage-0.6.7.tar.bz2
 partimage-man.tar.gz
 partimage-scripts.tar.gz
+partimage-0.6.8.tar.bz2


Index: README.partimage.html
===================================================================
RCS file: /cvs/pkgs/rpms/partimage/F-12/README.partimage.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README.partimage.html	4 Dec 2008 01:19:12 -0000	1.1
+++ README.partimage.html	26 Nov 2009 11:42:17 -0000	1.2
@@ -40,7 +40,7 @@ and optionally another machine on the ne
 to receive the image. In the server, the file <b>/etc/sysconfig/partimaged</b>
 should contain options like this:
 </p><p>
-OPTIONS="--port=4025 --nologin --dest /your_image_dir/images"
+OPTIONS="--port=4025 --dest /your_image_dir/images"
 </p><p>
 The client must always be run as <b>root</b>, and it can optionally use a password
 for accessing the server. 
@@ -61,11 +61,11 @@ For using the ssl capability, the certif
 <b>/usr/share/partimaged/create_certificates.sh</b>. The file 
 <b>/etc/partimaged/partimage-certs.cnf</b> can be customized, in order to change
 information, such as, Country, State and Location.
-The client supplied with SystemRescueCd is not compiled with ssl or login 
-enabled. However, for security reasons, the partimage package was created 
-with pam and login enabled.
-Please, note that, for disabling login in the server, it is enough to add 
-the option <b>--nologin</b> to its configuration file, and <u>restart</u> the server.
+Clients supplied with SystemRescueCd, version 1.3.1 or greater, ARE compiled with 
+ssl and login enabled. Therefore, the partimage package was created with the same 
+options also enabled.
+Please, note that, for disabling ssl in the server, it is enough to add 
+the option <b>--nossl</b> to its configuration file, and <u>restart</u> the server.
 To check which compilation options have been chosen, just type <b>partimaged -i</b>.
 
 </p><p>


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/partimage/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	26 Feb 2009 17:01:22 -0000	1.3
+++ import.log	26 Nov 2009 11:42:17 -0000	1.4
@@ -1,3 +1,4 @@
 partimage-0_6_7-5_fc8:HEAD:partimage-0.6.7-5.fc8.src.rpm:1228353414
 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-2_fc10:F-12:partimage-0.6.8-2.fc10.src.rpm:1259235714


Index: partimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/partimage/F-12/partimage.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- partimage.spec	25 Jul 2009 23:16:47 -0000	1.5
+++ partimage.spec	26 Nov 2009 11:42:18 -0000	1.6
@@ -1,6 +1,6 @@
 %bcond_without login
 %bcond_without pam
-%bcond_with ssl
+%bcond_without ssl
 
 %define image_place  %{_localstatedir}/partimaged
 
@@ -12,8 +12,8 @@
 
 Summary: Partition imaging utility, much like Ghost
 Name:    partimage
-Version: 0.6.7
-Release: 8%{?dist}
+Version: 0.6.8
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/System
 URL:     http://www.partimage.org/
@@ -21,9 +21,7 @@ Source0: http://downloads.sourceforge.ne
 Source1: %{name}-man.tar.gz
 Source2: %{name}-scripts.tar.gz
 Source3: README.partimage.html
-# Changes include <iostream.h> for include <iostream> (gcc-c++ 4.3)
-Patch0:  partimage-0.6.7-gcc43.patch
-Patch1:  partimage-0.6.7-gcc44.patch
+Patch0:  partimage-0.6.8-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext
 BuildRequires: autoconf 
@@ -68,8 +66,7 @@ This package contains the server daemon 
 
 %prep
 %setup -q -a1 -a2
-%patch0 -p1 -b .gcc43
-%patch1 -p1 -b .gcc44
+%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"
@@ -87,12 +84,12 @@ done
 # NOTE: The client has always to be run as root.
 # For the server being able to authenticate, the client has to be compiled 
 # with login enabled. Otherwise, a "version mismatch" error occurs.
-# Use --nologin, and restart partimaged, to disable login.
+# Use --nossl, and restart partimaged, to disable ssl encription.
 #
-%if %{with login}
+%if %{with ssl}
 OPTIONS="--port=4025 --dest %{image_place}"
 %else
-OPTIONS="--port=4025 --nologin --dest %{image_place}"
+OPTIONS="--port=4025 --nossl --dest %{image_place}"
 %endif
 EOF
 
@@ -223,8 +220,13 @@ fi
 %dir %{image_place}
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.7-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* 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.
+- Enabled ssl to match SystemRescueCD's client.
 
 * Thu Feb 26 2009 Paulo Roma <roma at lcg.ufrj.br> - 0.6.7-7
 - Patched for gcc-4.4.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/partimage/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Dec 2008 01:19:12 -0000	1.2
+++ sources	26 Nov 2009 11:42:18 -0000	1.3
@@ -1,3 +1,3 @@
-1c13530b43ea5c368c1c2fd0ab36bddb  partimage-0.6.7.tar.bz2
 2ca176278ca1dbe52d74f70812a693ab  partimage-man.tar.gz
 77e47a3cdd7d804ab7efae19143b23ec  partimage-scripts.tar.gz
+c13c8ede8cdf7745b97ec5827920ece7  partimage-0.6.8.tar.bz2


--- partimage-0.6.7-gcc43.patch DELETED ---


--- partimage-0.6.7-gcc44.patch DELETED ---


