rpms/ElectricFence/FC-6 ElectricFence-2.2.2-banner.patch, NONE, 1.1 ElectricFence-mmap-size.patch, NONE, 1.1 ElectricFence.spec, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: pmachata

Update of /cvs/dist/rpms/ElectricFence/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7918

Modified Files:
	ElectricFence.spec 
Added Files:
	ElectricFence-2.2.2-banner.patch ElectricFence-mmap-size.patch 
Log Message:
- Detect for EF_DISABLE_BANNER env. var before printing out the
  banner.  (Patch adapted from Debian repositories.)
- Remove bad cast in ElectricFence mmap (George Beshers)
- Use dist tag.


ElectricFence-2.2.2-banner.patch:
 efence.c |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE ElectricFence-2.2.2-banner.patch ---
diff -urp ElectricFence-2.2.2/efence.c ElectricFence-2.2.2-pm/efence.c
--- ElectricFence-2.2.2/efence.c	2007-03-28 20:16:43.000000000 +0200
+++ ElectricFence-2.2.2-pm/efence.c	2007-03-28 20:16:01.000000000 +0200
@@ -47,7 +47,7 @@
 #undef	calloc
 #endif
 
-static const char	version[] = "\n  Electric Fence 2.2.0"
+static const char	version[] = "\n  Electric Fence 2.2.2"
  " Copyright (C) 1987-1999 Bruce Perens <bruce at perens.com>\n";
 
 /*
@@ -82,6 +82,13 @@ struct _Slot {
 };
 typedef struct _Slot	Slot;
 
+ /*
+ * EF_DISABLE_BANNER is a global variable used to control whether
+ * Electric Fence prints its usual startup message.  If the value is
+ * -1, it will be set from the environment default to 0 at run time.
+ */
+int		EF_DISABLE_BANNER = -1;
+
 /*
  * EF_ALIGNMENT is a global variable used to control the default alignment
  * of buffers returned by malloc(), calloc(), and realloc(). It is all-caps
@@ -280,7 +287,15 @@ initialize(void)
 	char *	string;
 	Slot *	slot;
 
-	EF_Print(version);
+	if ( EF_DISABLE_BANNER == -1 ) {
+		if ( (string = getenv("EF_DISABLE_BANNER")) != 0 )
+			EF_DISABLE_BANNER = atoi(string);
+		else
+			EF_DISABLE_BANNER = 0;
+	}
+
+	if ( EF_DISABLE_BANNER == 0 )
+		EF_Print(version);
 
 #ifdef USE_SEMAPHORE
 	if (sem_init != NULL && !pthread_initialization && sem_init(&EF_sem, 0, 1) >= 0) {

ElectricFence-mmap-size.patch:
 page.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ElectricFence-mmap-size.patch ---
Size is, correctly, size_t and mmap, correctly, takes
size_t as the size argument; the cast to int flunks
64bit thinking.


diff -Naur ElectricFence-2.2.2/page.c ElectricFence-2.2.3/page.c
--- ElectricFence-2.2.2/page.c	2007-03-16 13:20:44.000000000 -0400
+++ ElectricFence-2.2.3/page.c	2007-03-16 13:23:28.000000000 -0400
@@ -70,7 +70,7 @@
 	 */
 	allocation = (caddr_t) mmap(
 	 startAddr
-	,(int)size
+	,size
 	,PROT_READ|PROT_WRITE
 	,MAP_PRIVATE|MAP_ANONYMOUS
 	,-1
@@ -122,7 +122,7 @@
 	 */
 	allocation = (caddr_t) mmap(
 	 startAddr
-	,(int)size
+	,size
 	,PROT_READ|PROT_WRITE
 	,MAP_PRIVATE
 	,devZeroFd


Index: ElectricFence.spec
===================================================================
RCS file: /cvs/dist/rpms/ElectricFence/FC-6/ElectricFence.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ElectricFence.spec	12 Jul 2006 05:43:56 -0000	1.16
+++ ElectricFence.spec	28 Mar 2007 18:30:35 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A debugger which detects memory allocation violations.
 Name: ElectricFence
 Version: 2.2.2
-Release: 20.2.2
+Release: 21%{?dist}
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.perens.com/pub/ElectricFence/beta/%{name}-%{version}.tar.gz
@@ -9,6 +9,8 @@
 Patch2: ElectricFence-2.1-vaarg.patch
 Patch3: ElectricFence-2.2.2-pthread.patch
 Patch4: ElectricFence-2.2.2-madvise.patch
+Patch5: ElectricFence-mmap-size.patch
+Patch6: ElectricFence-2.2.2-banner.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: /sbin/ldconfig
 
@@ -63,6 +65,12 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Mar 28 2007 Petr Machata <pmachata at redhat.com> - 2.2.2-21
+- Detect for EF_DISABLE_BANNER env. var before printing out the
+  banner.  (Patch adapted from Debian repositories.)
+- Remove bad cast in ElectricFence mmap (George Beshers)
+- Use dist tag.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.2-20.2.2
 - rebuild