Mon May 12 14:43:41 UTC 2008

Author: sdake

Update of /cvs/pkgs/rpms/openais/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3905/devel

Modified Files:
	.cvsignore openais.spec sources 
Added Files:
	openais-defaultconfig.patch 
Removed Files:
	openais-0.76-defaultconfig.patch 
	openais-0.80.1-gnusource.patch openais-0.80.1-open-fix.patch 
	revision-1223.patch revision-1230.patch revision-1245.patch 
	revision-1246.patch revision-1248.patch revision-1252.patch 
	revision-1256.patch revision-1257.patch revision-1258.patch 
	revision-1260.patch revision-1261.patch revision-1262.patch 
	revision-1263.patch revision-1264.patch revision-1265.patch 
Log Message:
Update to latest community version 0.83 for rawhide.


openais-defaultconfig.patch:

--- NEW FILE openais-defaultconfig.patch ---
Index: conf/openais.conf
===================================================================
--- conf/openais.conf	(revision 1528)
+++ conf/openais.conf	(working copy)
@@ -14,9 +14,6 @@
 
 logging {
 	fileline: off
-	to_stderr: yes
-	to_file: yes
-	logfile: /tmp/openais.log
 	debug: off
 	timestamp: on
 	logger_subsys {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Aug 2006 04:45:44 -0000	1.7
+++ .cvsignore	12 May 2008 14:42:59 -0000	1.8
@@ -1 +1 @@
-openais-0.80.1.tar.gz
+openais-0.83.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- openais.spec	29 Feb 2008 19:50:42 -0000	1.22
+++ openais.spec	12 May 2008 14:42:59 -0000	1.23
@@ -1,35 +1,20 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.80.1
-Release: 9
+Version: 0.83
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
-Patch0: openais-0.76-defaultconfig.patch
-Patch1: revision-1223.patch
-Patch2: revision-1230.patch
-Patch3: revision-1245.patch
-Patch4: revision-1246.patch
-Patch5: revision-1248.patch
-Patch6: revision-1252.patch
-Patch7: revision-1256.patch
-Patch8: revision-1257.patch
-Patch9: revision-1258.patch
-Patch10: revision-1260.patch
-Patch11: revision-1261.patch
-Patch12: revision-1262.patch
-Patch13: revision-1263.patch
-Patch14: revision-1264.patch
-Patch15: revision-1265.patch
-Patch16: openais-0.80.1-open-fix.patch
-Patch17: openais-0.80.1-gnusource.patch
+Patch0: openais-defaultconfig.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x alpha
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 
-%define ais_user_uid	39
+%define ais_user_uid 39
 
 %description 
 This package contains the openais executive, openais service handlers,
@@ -46,26 +31,9 @@
 
 %prep
 %setup -q -n openais-%{version}
-%patch0
-%patch1
-%patch2 
-%patch3
-%patch4
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9
-%patch10
-%patch11
-%patch12
-%patch13
-%patch14
-%patch15
-%patch16 -p1
-%patch17 -p1
-
+%patch0 -p0
 %build
+
 # -O3 required for performance reasons
 # So we get proper debug output, for now we don't compile with O3
 #CFLAGS="$(echo '%{optflags}' | sed -e 's/-O[0-9]*//') -O3"
@@ -77,10 +45,12 @@
 make install DESTDIR=$RPM_BUILD_ROOT STATICLIBS=NO
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -m 644 CHANGELOG LICENSE SECURITY README.devmap README.amf \
-	$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+install -m 644 LICENSE SECURITY README.devmap README.amf \
+ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 install -m 755 init/redhat $RPM_BUILD_ROOT%{_initrddir}/openais
 install -m 755 test/openais-cfgtool $RPM_BUILD_ROOT%{_sbindir}
+# fix install permissions and make rpmlint happy
+chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/ais-keygen
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,7 +58,7 @@
 %pre
 # Add the "ais" user
 /usr/sbin/useradd -c 'openais Standards Based Cluster Framework' \
-	-u %{ais_user_uid} -s /sbin/nologin -r -d '/' ais 2> /dev/null || :
+ -u %{ais_user_uid} -s /sbin/nologin -r -d '/' ais 2> /dev/null || :
 
 %post
 /sbin/chkconfig --add openais || :
@@ -96,8 +66,8 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-    %{_initrddir}/openais stop &>/dev/null || :
-    /sbin/chkconfig --del openais || :
+	%{_initrddir}/openais stop &>/dev/null || :
+	/sbin/chkconfig --del openais || :
 fi
 
 %postun
@@ -106,6 +76,7 @@
 
 %files 
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/LICENSE
 %doc %{_docdir}/%{name}-%{version}/SECURITY
 %doc %{_docdir}/%{name}-%{version}/README.amf
@@ -115,7 +86,7 @@
 %dir /etc/ais
 %config(noreplace) /etc/ais/openais.conf
 %config(noreplace) /etc/ais/amf.conf
-%config /etc/ld.so.conf.d/openais-*.conf
+%config(noreplace) /etc/ld.so.conf.d/openais-*.conf
 %{_initrddir}/openais
 %dir %{_libexecdir}/lcrso
 %{_libexecdir}/lcrso/aisparser.lcrso
@@ -129,6 +100,7 @@
 %{_libexecdir}/lcrso/service_evt.lcrso
 %{_libexecdir}/lcrso/service_lck.lcrso
 %{_libexecdir}/lcrso/service_msg.lcrso
+%{_libexecdir}/lcrso/service_confdb.lcrso
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
 %dir %{_libdir}/openais
 %{_libdir}/openais/libais.so*
@@ -142,17 +114,27 @@
 %{_libdir}/openais/libSaLck.so*
 %{_libdir}/openais/libSaMsg.so*
 %{_libdir}/openais/libtotem_pg.so*
+%{_libdir}/openais/liblogsys.so*
+%{_libdir}/openais/libconfdb.so*
+%{_libdir}/openais/libaisutil.so*
 %{_mandir}/man8/openais_overview.8*
 %{_mandir}/man8/cpg_overview.8*
 %{_mandir}/man8/evs_overview.8*
+%{_mandir}/man8/confdb_overview.8*
+%{_mandir}/man8/logsys_overview.8*
 %{_mandir}/man5/openais.conf.5*
+%{_mandir}/man5/amf.conf.5*
 
 %files devel
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/CHANGELOG
 %doc %{_docdir}/%{name}-%{version}/README.devmap
 %dir %{_includedir}/openais/
+%{_includedir}/openais/ais_util.h
+%{_includedir}/openais/confdb.h
+%{_includedir}/openais/ipc_gen.h
+%{_includedir}/openais/mar_gen.h
+%{_includedir}/openais/swab.h
 %{_includedir}/openais/cpg.h
 %{_includedir}/openais/cfg.h
 %{_includedir}/openais/evs.h
@@ -173,39 +155,233 @@
 %{_includedir}/openais/lcr/lcr_comp.h
 %{_includedir}/openais/lcr/lcr_ifact.h
 %dir %{_includedir}/openais/service
+%{_includedir}/openais/service/flow.h
+%{_includedir}/openais/service/ipc.h
+%{_includedir}/openais/service/timer.h
 %{_includedir}/openais/service/config.h
 %{_includedir}/openais/service/objdb.h
-%{_includedir}/openais/service/print.h
+%{_includedir}/openais/service/logsys.h
 %{_includedir}/openais/service/swab.h
 %{_includedir}/openais/service/service.h
-%{_mandir}/man3/cpg_dispatch.3*
-%{_mandir}/man3/cpg_fd_get.3*
-%{_mandir}/man3/cpg_finalize.3*
-%{_mandir}/man3/cpg_initialize.3*
-%{_mandir}/man3/cpg_join.3*
-%{_mandir}/man3/cpg_leave.3*
-%{_mandir}/man3/cpg_mcast_joined.3*
-%{_mandir}/man3/cpg_membership_get.3*
-%{_mandir}/man3/evs_dispatch.3*
-%{_mandir}/man3/evs_fd_get.3*
-%{_mandir}/man3/evs_finalize.3*
-%{_mandir}/man3/evs_initialize.3*
-%{_mandir}/man3/evs_join.3*
-%{_mandir}/man3/evs_leave.3*
-%{_mandir}/man3/evs_mcast_groups.3*
-%{_mandir}/man3/evs_mcast_joined.3*
-%{_mandir}/man3/evs_membership_get.3*
+%{_mandir}/man3/cpg_*3*
+%{_mandir}/man3/evs_*3*
+%{_mandir}/man3/confdb_*3*
 
 %changelog
-* Fri Feb 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80.1-9
-- fix issue where struct ucred wasn't getting defined anymore
+* Mon May 12 2008 Steven Dake <sdake at redhat.com> - 0.83-1
+- Release 0.83.
 
-* Fri Feb 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80.1-8
-- Drop list of ExclusiveArch, if something is broken, ExcludeArch it.
-- fix open glibc issue
+Tue Apr 29 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.82-1.svn1528
+- Update to latest svn trunk in preparation for 0.83.
+- Fix a bunch of rpmlint warnings/errors.
+- Merge bits from the fedora package.
+- Remove all unrequired patches.
+- Update default config patch.
+
+* Tue Apr 1 2008 Steven Dake <sdake at redhat.com> - 0.80.3-15
+- Resolves: rhbz#432531
+- Add upstream revision 1514 - Remove extra log_printf.
+- Add upstream revision 1513 - Remove comparison with zero and replace with comparison with NULL in handle database code.
+- Add upstream revision 1512 - Remove early commit of synchronization data when a synchronization in progress is followed by a node leaving or joining the cluster.
+- Add upstream revision 1511 - Remove double pthread_mutex_destroy from evt service.
+- Add upstream revision 1510 - Remove double pthread_mutex_destroy from evs service.
+- Add upstream revision 1509 - Remove double pthread_mutex_destroy from cpg service.
+- Add upstream revision 1508 - Remove double pthread_mutex_destroy from clm service.
+- Add upstream revision 1507 - Remove double pthread_mutex_destroy from checkpoint service.
+* Sat Mar 15 2008 Steven Dake <sdake at redhat.com> - 0.80.3-14
+- Resolves: rhbz#432531
+- Add upstream revision 1506 - Resolves incomplete checkpoing synchronization when totem queue is full.
+
+* Thu Mar 6 2008 Steven Dake <sdake at redhat.com> - 0.80.3-13
+- Resolves: rhbz#432531
+- Add upstream revision 1504 - Fixes checkpoint synchronization issue when a new node is started.
+- Add upstream revision 1503 - backport -f foreground option.
+- Add upstream revision 1502 - Revert revision 1477 which exhibits problems with cman.
+- Add revision 1477 - This was reverted in a previous version but cherrypicked.  Now the patch has been applied and reverted in the rpm build process to match upstream.
+
+
+* Tue Feb 26 2008 Steven Dake <sdake at redhat.com> - 0.80.3-12
+- Resolves: rhbz#433839
+- Fix problem with cvs not allowing new checkin requires new revision.
+
+* Fri Feb 22 2008 Steven Dake <sdake at redhat.com> - 0.80.3-11
+- Resolves: rhbz#429920
+- Add upstream revision 1500 - IPC locks up if a POLLERR is returned in certain circumstances.
+- Resolves: rhbz#433839
+- Add upstream revision 1501 - A mcast is delivered before a join in some circumstances.
+* Fri Jan 18 2008 Steven Dake <sdake at redhat.com> - 0.80.3-10
+- Resolves: rhbz#249287
+- Remove upstream revision 1477 - Exhibits problem with revolver tester
+
+* Tue Jan 15 2008 Steven Dake <sdake at redhat.com> - 0.80.3-9
+- Resolves: rhbz#249287
+- Add upstream revision 1499 - ipc changes merged into tree
+
+* Tue Jan 15 2008 Steven Dake <sdake at redhat.com> - 0.80.3-8
+- Resolves: rhbz#249287
+- Add non-merged IPC changes for fixing operation with cluster mirror
+- Resolves: rhbz#403901
+- Add upstream revision 1498 - enhance openais_exit_error to report string instead of error code
+- Resolves: rhbz#309621
+- Add upstream revision 1497 - Follow LSB guidelines for initscript
+- Add upstream revision 1496 - Revert patch 1480 since it causes problems with cman
+- Add upstream revision 1493 - Backport of patch 1379 to remove this_ip and replace with accessor functoins for use by ipc system
+- Add upstream revision 1486 - Unlock mutex on error condition of no memory when creating handle
+- Add upstream revision 1480 - Endian fixes for the totempg code
+- Add upstream revision 1479 - Remove & when regular reference works properly.
+- Add upstream revision 1478 - Patch to set system_from properly in retransmitted messages
+- Add upstream revision 1473 - Fix pthread_equal for timer_delete operation
+- Add upstream revision 1471 - Endian convert cpg downlist messages properly
+- Add upstream revision 1469 - change initialDataSize paramter from saUint32gt to SaSizeT to match specifications
+
+* Tue Oct 2 2007 Steven Dake <sdake at redhat.com> - 0.80.3-7
+- Resolves: rhbz#216954
+- Add upstream revision 1465 - remove fsync call that blocks protocol
+
+* Mon Sep 24 2007 Steven Dake <sdake at redhat.com> - 0.80.3-5
+- Resolves: rhbz#302341
+- Add upstream revision 1455 - Fix loss of node joins in commit state resulting in looping of membership protocol.
+- Add upstream revision 1453 - Fix assertion if component registration occurs during certain phases of instantation.
+- Add upstream revision 1450 - Fix reference counting in lcr code so that lcr_ifact_release works properly.
+- Add upstream revision 1449 - Allow missing services in synchronization to not cause a segfault.k
+- Add upstream revision 1446 - Remove inadvertant commit of changes to totemsrp which happened when security changes were patched in revision 1426.
+- Add upstream revision 1426 - Patch to log security warnings when invalid identifier is used in message header for a totem header.
+
+* Tue Aug 28 2007 Steven Dake <sdake at redhat.com> - 0.80.3-4
+- Resolves: rhbz#251082
+- Add upstream revision 1423 - Fix synchronization defect resulting in segfault.
+- This is the fc6 build.
+ 
+* Tue Aug 1 2007 Steven Dake <sdake at redhat.com> - 0.80.3-3
+- Resolves: rhbz#209862
+- Resolves: rhbz#249506
+- Resolves: rhbz#249509
+- Resolves: rhbz#247733
+
+* Tue Aug 1 2007 Steven Dake <sdake at redhat.com> - 0.80.3-2
+- Resolves: rhbz#209862
+- Add upstream revision 1406 - Filter commit token when it is retransmitted.
+- Resolves: rhbz#249506
+- Add upstream revision 1407 - Reset consensus array on entering operational mode.
+- Resolves: rhbz#249509
+- Add upstream revision 1408 - Store the ring id information properly when it changes.
+- Resolves: rhbz#247733
+- Add upstream revision 1409 - Add subtractor to availability of message entries for the totem message queue
+- This is the rhel5 version of 0.80.3-0 with some upstream patches.
+
+* Tue Jun 26 2007 Steven Dake <sdake at redhat.com> - 0.80.3-1
+- Resolves: rhbz#243119
+- Resolves: rhbz#221190
+- Resolves: rhbz#224190
+- Resolves: rhbz#233892
+- Resolves: rhbz#236549
+- New upstream version including all previous revisions.
+- This is the fc6 version of 0.80.3-1.
+
+* Tue Jun 26 2007 Steven Dake <sdake at redhat.com> - 0.80.3-0
+- Resolves: rhbz#243119
+- Resolves: rhbz#221190
+- Resolves: rhbz#224190
+- Resolves: rhbz#233892
+- Resolves: rhbz#236549
+- New upstream version including all previous revisions.
+- This is the rhel5 version of 0.80.3-0.
+
+* Mon Dec 18 2006 Steven Dake <sdake at redhat.com> - 0.80.2-1
+- Resolves: rhbz#211357
+- This is the rhel5 version of 0.80.2-0.
+
+* Mon Dec 18 2006 Steven Dake <sdake at redhat.com> - 0.80.2-0
+- Resolves: rhbz#211357
+- New upstream version including all prevision revisions.
+- Fixes cpg ordering problem.
+- Fixes ia64 unaligned problem.
+- This is the fc6 version.
+
+* Tue Dec 5 2006 Steven Dake <sdake at redhat.com> - 0.80.1-22
+- Resolves: rhbz#216492
+- This is the rhel5 version of 0.80.1-21.
+
+* Tue Dec 5 2006 Steven Dake <sdake at redhat.com> - 0.80.1-21
+- Resolves: rhbz#216492
+- Add upstream revision 1319 - Increase outbound buffer size to 5000 messages.
+- Add upstream revision 1316 - Improvements on segfault logging.
+- This is the fc6 version.
+
+* Wed Nov 29 2006 Steven Dake <sdake at redhat.com> - 0.80.1-20
+- Resolves: rhbz#216492
+- Need new res line to commit.  This is the same as 0.80.1-18.
+
+* Wed Nov 29 2006 Steven Dake <sdake at redhat.com> - 0.80.1-19
+- This is the rhel5 version of 0.80.1-18.
+
+* Wed Nov 29 2006 Steven Dake <sdake at redhat.com> - 0.80.1-18
+- Add upstream revision 1315 - Fix compile error in libcpg.
+- Add upstream revision 1314 - Change rundir to /var/openais.
+- Add upstream revision 1313 - Flow control fixes for the CPG service.
+- Add upstream revision 1312 - Correct usage of ERR_LIBRARY to SA_AIS_ERR_LIBRARY.
+- Add upstream revision 1311 - handle case where POLLHUP and POLLERR are not uspported by OS.
+- Add upstream revision 1309 - set default downcheck value to 1000ms.
+- Add upstream revision 1308 - Remove invalid code and warnings detected by Intel compiler.
+- This is the fc6 version.
+
+* Tue Nov 14 2006 Steven Dake <sdake at redhat.com> - 0.80.1-17
+- This is the rhel5 version of 0.80.1-16.
+
+* Tue Nov 14 2006 Steven Dake <sdake at redhat.com> - 0.80.1-16
+- Add upstream revision 1307 - Remove flow control compile warning.
+- Add upstream revision 1306 - Make clean now really makes clean.
+- Add upstream revision 1305 - Set scheduler SCHED_RR to max priority available
+  in system.
+- Add upstream revision 1300 - Improve behavior of flow control of CPG service
+  during configuration changes.
+- This is the fc6 version.
+
+* Thu Nov 9 2006 Steven Dake <sdake at redhat.com> - 0.80.1-15
+- This is the rhel5 version of 0.80.1-14
+
+* Thu Nov 9 2006 Steven Dake <sdake at redhat.com> - 0.80.1-14
+- Add upstream revision 1296 - Remove compile warnings.
+- Add upstream revision 1295 - The totem membership protocol was changed to
+- Add upstream revision 1294 - modify location of ringid file to
+- Add upstream revision 1293 - flush output of debug messages on exit or segv.
+  /var/run/openais and chdir here so cores are saved there.
+  match specifications.
+- This is the fc6 version.
+
+* Fri Nov 3 2006 Steven Dake <sdake at redhat.com> - 0.80.1-13
+- Add upstream revision 1286 - Fix checkpoint unlink operation under certain
+  conditions.  This is the rhel5 version.
+
+* Fri Nov 3 2006 Steven Dake <sdake at redhat.com> - 0.80.1-12
+- Add upstream revision 1286 - Fix checkpoint unlink operation under certain
+  conditions.  This is the fc6 version.
+
+* Tue Oct 24 2006 Steven Dake <sdake at redhat.com> - 0.80.1-11
+- Add upstream revision 1284 - Initialize variables for checkpoint sync.
+
+* Tue Oct 24 2006 Steven Dake <sdake at redhat.com> - 0.80.1-10
+- Add %{?dist} to release field.
+
+* Tue Oct 24 2006 Steven Dake <sdake at redhat.com> - 0.80.1-9
+- Add upstream revision 1270 - Resolve IPC segfault.
+- Add upstream revision 1271 - Fix errors in ia64 alignment.
+- Add upstream revision 1275 - pthread_mutex_destroy cleanup patch.
+- Add upstream revision 1276 - Remove debug from makefile committed in revision 1275.
+- Add upstream revision 1277 - Formatting changes.
+- Add upstream revision 1278 - Patch testckpt to use proper seciton id size.
+- Add upstream revision 1279 - Call abort in sync service when processing is interrupted.
+- Add upstream revision 1282 - New generation checkpoint state machine.
+- Add upstream revision 1283 - Fix memory leaks.
+
+* Wed Oct 18 2006 Steven Dake <sdake at redhat.com> - 0.80.1-8
+- Add upstream revision 1268 - Align data in totem delivery on 4 byte
+  boundaries for ia64.
+- Add upstream revision 1269 - Increase default stack size for IPC connections
+  on ia64.
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.80.1-7
-- Autorebuild for GCC 4.3
+* Mon Oct 16 2006 Steven Dake <sdake at redhat.com> - 0.80.1-7
+- Add upstream revision 1267 - rework of checkpoint synchronization.
 
 * Thu Oct 12 2006 Steven Dake <sdake at redhat.com> - 0.80.1-6
 - Add upstream revision 1260 - Allocate the retransmission token in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Aug 2006 04:45:44 -0000	1.7
+++ sources	12 May 2008 14:42:59 -0000	1.8
@@ -1 +1 @@
-7414d683d51cb00c46456125c7e1b2b0  openais-0.80.1.tar.gz
+a733c68de1e16bd185cad84827f3896d  openais-0.83.tar.gz


--- openais-0.76-defaultconfig.patch DELETED ---


--- openais-0.80.1-gnusource.patch DELETED ---


--- openais-0.80.1-open-fix.patch DELETED ---


--- revision-1223.patch DELETED ---


--- revision-1230.patch DELETED ---


--- revision-1245.patch DELETED ---


--- revision-1246.patch DELETED ---


--- revision-1248.patch DELETED ---


--- revision-1252.patch DELETED ---


--- revision-1256.patch DELETED ---


--- revision-1257.patch DELETED ---


--- revision-1258.patch DELETED ---


--- revision-1260.patch DELETED ---


--- revision-1261.patch DELETED ---


--- revision-1262.patch DELETED ---


--- revision-1263.patch DELETED ---


--- revision-1264.patch DELETED ---


--- revision-1265.patch DELETED ---


