fix for nm-0.8.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2423 ec354946-7b23-47d6-9f5a-488ba84defc7

d/dhcp/dhcp-vl.spec

@@ -5,7 +5,7 @@ Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Summary(ja): DHCP (動的ホスト設定プロトコル) サーバおよびリレーエージェント
 Name:     dhcp
 Version:  4.1.0p1
-Release:  1%{?_dist_release}
+Release:  3%{?_dist_release}
 
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
@@ -44,6 +44,12 @@ Patch15:  %{name}-4.1.0-inherit-leases.patch
 Patch16:  %{name}-4.1.0-garbage-chars.patch
 Patch17:  %{name}-4.1.0-port-validation.patch
 Patch18:  %{name}-4.1.0-invalid-dhclient-conf.patch
+Patch19:  %{name}-4.1.0-dhclient-option.patch
+
+# security
+Patch100: dhcp-4.1.0-CVE-2009-1892.diff
+Patch110: dhcp-4.1.0-CVE-2010-2156.diff
+Patch120: dhcp-4.1.0p1-CVE-2010-3611.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -51,12 +57,17 @@ BuildRequires: automake
 BuildRequires: groff
 BuildRequires: libtool
 BuildRequires: openldap-devel
+BuildRequires: openssl-devel
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
 
+Packager: daisuke, iwamoto
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
 individual devices on an IP network to get their own network
@@ -171,6 +182,13 @@ libdhcpctl and libomapi static libraries are also included in this package.
 # The sample dhclient.conf should say 'supersede domain-search' (#467955)
 %patch18 -p1
 
+%patch19 -p1
+
+# security fixes
+%patch100 -p0 -b .CVE-2009-1892
+%patch110 -p0 -b .CVE-2010-2156
+%patch120 -p0 -b .CVE-2010-3611
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0644 %{SOURCE5} .
 %{__install} -p -m 0644 %{SOURCE6} doc/
@@ -290,6 +308,9 @@ EOF
 # Install empty directory for dhclient.d scripts
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp/dhclient.d
 
+# remove perl module (depend perl(Win32API::Registry))
+%{__rm} -rf __fedora_contrib/ms2isc
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -387,6 +408,16 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Sat Jan 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 12:4.1.0p1-3
+- add patch19 (dhcp-4.1.0-dhclient-option.patch)
+
+* Sat Nov 20 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 12:4.1.0p1-2
+- add patch100 for fix CVE-2009-1892 
+- add patch110 for fix CVE-2010-2156
+- add patch120 for fix CVE-2010-3611
+- patch100, 110 are from mkd, Thanks.
+- add BR: openssl-devel, vendor/dist tags
+
 * Wed Jul 15 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 12:4.1.0p1-1
 - new upstream release with security fix (CVE-2009-0692)