rebuild vine6 package

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

d/dhcp/dhcp-vl.spec

@@ -1,8 +1,8 @@
 # vendor string (e.g., Fedora, EL)
 %define vvendor Vine
 
-%define pversion 4.1.ESV.R2
-%define sversion 4.1-ESV-R2
+%define pversion 4.1.ESV.R4
+%define sversion 4.1-ESV-R4
 
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Summary(ja): DHCP (動的ホスト設定プロトコル) サーバおよびリレーエージェント
@@ -33,16 +33,16 @@ Source9: dhcp.schema
 Source10: get-ldap-patch.sh
 
 Patch0:   %{name}-4.1.0-errwarn-message.patch
-Patch1:   %{name}-4.1.0-ldap-configuration.patch
-Patch3:   %{name}-4.1-ESV-R2-options.patch
+Patch1:   %{name}-4.1-ESV-R3-ldap-configuration.patch
+Patch3:   %{name}-4.1-ESV-R3-options.patch
 Patch4:   %{name}-4.1.0-release-by-ifup.patch
 Patch5:   %{name}-4.1.0-dhclient-decline-backoff.patch
 Patch6:   %{name}-4.1.0-unicast-bootp.patch
 Patch7:   %{name}-4.1.0-failover-ports.patch
-Patch8:   %{name}-4.1.0-dhclient-usage.patch
+Patch8:   %{name}-4.1-ESV-R3-dhclient-usage.patch
 Patch9:   %{name}-4.1.0-default-requested-options.patch
-Patch10:  %{name}-4.1.0-xen-checksum.patch
-Patch11:  %{name}-4.1-ESV-R2-dhclient-anycast.patch
+Patch10:  %{name}-4.1-ESV-R3-xen-checksum.patch
+Patch11:  %{name}-4.1-ESV-R3-dhclient-anycast.patch
 Patch12:  %{name}-4.1.0-manpages.patch
 Patch13:  %{name}-4.1.0-paths.patch
 Patch15:  %{name}-4.1.0-inherit-leases.patch
@@ -216,6 +216,8 @@ for page in server/dhcpd.conf.5 server/dhcpd.leases.5 server/dhcpd.8 ; do
                 -e 's|ETCDIR|%{_sysconfdir}/dhcp|g' $page
 done
 
+%{__sed} -i -e 's|-lldap|-lldap -lcrypto|' server/Makefile.am
+
 aclocal
 libtoolize --copy --force
 autoconf
@@ -391,6 +393,15 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Dec  8 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp>
+- 13:4.1.ESV.R4-1
+- update to Extended Support Version with security gix (CVE-2011-4539)
+
+* Fri Aug 12 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp>
+- 13:4.1.ESV.R3-1
+- update to Extended Support Version with security gix (CVE-2011-2748,2749)
+- update patch1,3,8,10,11 to fit ESV.R3.......
+
 * Wed Apr 13 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 13:4.1.ESV.R2-1
 - update to Extended Support Version
 - increment Epoch

s/sudo/sudo-vl.spec

@@ -2,7 +2,7 @@ Summary: Allows command execution as root for specified users
 Summary(ja): スーパーユーザ権限でのコマンドの実行
 Name: sudo
 Version: 1.7.2p7
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 License: ISC-style
 Group: Applications/System
 URL: http://www.sudo.ws/
@@ -21,6 +21,7 @@ Patch6: sudo-1.7.4p4-sudoi.patch
 Patch100: sudo-1.7.2p7_CVE-2010-2956.patch
 Patch110: sudo-1.7.2p7_CVE-2011-0010.patch
 Patch111: sudo-1.7.2p7_user_in_group.patch
+Patch120: sudo-1.7.2p7_CVE-2012-2337.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pam-devel
@@ -55,6 +56,7 @@ sudo は、特定のユーザや特定のグループに所属するユーザが
 %patch100 -p1 -b .CVE-2010-2956
 %patch110 -p1 -b .CVE-2011-0010
 %patch111 -p1 -b .user_in_group
+%patch120 -p1 -b .CVE-2012-2337
 
 libtoolize --force && rm acsite.m4 && mv aclocal.m4 acinclude.m4 && autoreconf
 
@@ -131,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Sat May 19 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.7.2p7-5
+- add patch120 for fix CVE-2012-2337 (netmask match)
+
 * Fri Jun 03 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.2p7-4
 - update sudoers
   - enable "%wheel ALL=(ALL) ALL" by default.