rpms/dhcdbd/devel .cvsignore, 1.16, 1.17 dhcdbd.spec, 1.27, 1.28 sources, 1.26, 1.27

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21330

Modified Files:
	.cvsignore dhcdbd.spec sources 
Log Message:
v1.14: fix bug 189529


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	17 Jan 2006 21:40:34 -0000	1.16
+++ .cvsignore	20 Apr 2006 19:54:41 -0000	1.17
@@ -13,3 +13,4 @@
 dhcdbd-1.10.tar.gz
 dhcdbd-1.11.tar.gz
 dhcdbd-1.12.tar.gz
+dhcdbd-1.14.tar.gz


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dhcdbd.spec	11 Feb 2006 02:25:24 -0000	1.27
+++ dhcdbd.spec	20 Apr 2006 19:54:41 -0000	1.28
@@ -1,6 +1,7 @@
 #  DHCP D-BUS Daemon 
 #
 %{?!DHCDBD_SETUID:%define DHCDBD_SETUID	0}
+%{?!NODEBUGINFO:%define   NODEBUGINFO   0}
 #
 #  If dhcdbd is to be run by the dbus-daemon's service activation service,
 #  then currently it MUST be installed setuid; else, it must have an 
@@ -8,8 +9,8 @@
 #
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
 Name: 	   dhcdbd
-Version:   1.12
-Release:   1.FC5.2
+Version:   1.14
+Release:   1.FC6
 License:   GPL
 Group:     System Environment/Daemons
 URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
@@ -33,13 +34,21 @@
   cp -fp %{_builddir}/%{name}.spec RedHat/;
 fi;
 
+%if %{NODEBUGINFO}
+%define debug_package %{nil}
+%endif
+
 %build
 %ifarch s390x x86_64 ppc64
 # every 64-bit arch EXCEPT ia64 has dbus arch. dep. includes in 
 # /usr/lib64/dbus-1.0/include
 export LIBDIR=lib64
 %endif
-CFLAGS="-Wall $RPM_OPT_FLAGS" CC='gcc' make
+%if %{NODEBUGINFO}
+CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/'`' -Wall' CC='gcc' make
+%else
+CFLAGS="$RPM_OPT_FLAGS -Wall" CC='gcc' make
+%endif
 
 %install
 DESTDIR=$RPM_BUILD_ROOT make install
@@ -47,6 +56,10 @@
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -c -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcdbd
 %endif
+%if %{NODEBUGINFO}
+/usr/lib/rpm/brp-compress
+exit 0
+%endif
 
 %post
 if [ $1 -eq 1 ]; then
@@ -79,6 +92,11 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Thu Apr 20 2006 Jason Vas Dias <jvdias at redhat.com> - 1.14-1.FC5
+- fix bug 189529: prevent potential memory corruption on hex string
+  options with single-byte non-ascii values
+- modify dhcp option types to be in line with latest ISC dhcp
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.12-1.FC5.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	17 Jan 2006 21:40:34 -0000	1.26
+++ sources	20 Apr 2006 19:54:41 -0000	1.27
@@ -1 +1 @@
-f84f00d10643193fb5e6ee08ccfc0b09  dhcdbd-1.12.tar.gz
+1180dee7a51a4384d55768650634cf93  dhcdbd-1.14.tar.gz