rebuild with openssl-1.0.0c

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

k/krb5/krb5-vl.spec

@@ -19,7 +19,7 @@ Summary: The Kerberos network authentication system.
 Summary(ja): Kerberos ネットワーク認証システム
 Name: krb5
 Version: 1.6.3
-Release: 7%{?_dist_release}
+Release: 8%{?_dist_release}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -112,14 +112,17 @@ Patch85: krb5-1.6_CVE-2009-4212.patch
 Patch86: krb5-CVE-2010-0629.patch
 Patch87: http://web.mit.edu/kerberos/advisories/2010-005-patch_r16.txt
 
+# patch for Vine Linux
+Patch500: krb5-1.6.3-openssl-1.0.0-vine.patch
+
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Prereq: grep, info, sh-utils, /sbin/install-info
-BuildPrereq: autoconf, bison, e2fsprogs-devel >= 1.35, flex, gawk
-BuildPrereq: gzip, ncurses-devel, rsh, texinfo, tar
-BuildRequires: tetex-latex
+Requires(pre): grep, info, sh-utils, /sbin/install-info
+BuildRequires: autoconf, bison, e2fsprogs-devel >= 1.35, flex, gawk
+BuildRequires: gzip, ncurses-devel, rsh, texinfo, tar
+BuildRequires: texlive
 BuildRequires: keyutils-libs-devel
 BuildRequires: pam-devel
 %if %{WITH_SELINUX}
@@ -162,7 +165,8 @@ to install this package.
 Summary: The shared libraries used by Kerberos 5.
 Summary(ja): Kerberos 5 の共有ライブラリ
 Group: System Environment/Libraries
-Prereq: grep, /sbin/ldconfig, sh-utils
+Requires(pre): grep, sh-utils
+Requires(pre): /sbin/ldconfig
 Obsoletes: krb5-configs
 
 %description libs
@@ -175,7 +179,8 @@ Group: System Environment/Daemons
 Summary: The KDC and related programs for Kerberos 5.
 Summary(ja): Kerberos 5 KDC および関連プログラム
 Requires: %{name}-libs = %{version}-%{release}
-Prereq: grep, /sbin/install-info, /bin/sh, sh-utils, /sbin/chkconfig
+Requires(pre): grep, sh-utils
+Requires(pre): /sbin/install-info, /bin/sh, /sbin/chkconfig
 
 %description server
 Kerberos is a network authentication system. The krb5-server package
@@ -202,7 +207,8 @@ Summary: Kerberos 5 programs for use on workstations.
 Summary(ja): ワークステーションで使用する Kerberos 5 プログラム
 Group: System Environment/Base
 Requires: %{name}-libs = %{version}-%{release}
-Prereq: grep, /sbin/install-info, /bin/sh, sh-utils
+Requires(pre): grep, sh-utils
+Requires(pre): /sbin/install-info, /bin/sh
 # mktemp is used by krb5-send-pr
 Requires: mktemp
 
@@ -218,7 +224,8 @@ Summary: Kerberos 5 clients for use on workstations.
 Summary(ja): ワークステーションで使用する Kerberos 5 クライアント
 Group: System Environment/Base
 Requires: %{name}-workstation = %{version}-%{release}
-Prereq: grep, /sbin/install-info, /bin/sh, sh-utils
+Requires(pre): grep, sh-utils
+Requires(pre): /sbin/install-info, /bin/sh
 # mktemp is used by krb5-send-pr
 Requires: mktemp
 
@@ -234,7 +241,8 @@ Summary: Kerberos 5 servers for use on workstations.
 Summary(ja): ワークステーションで使用する Kerberos 5 サーバ
 Group: System Environment/Base
 Requires: %{name}-workstation = %{version}-%{release}
-Prereq: grep, /sbin/install-info, /bin/sh, sh-utils
+Requires(pre): grep, sh-utils
+Requires(pre): /sbin/install-info, /bin/sh
 # mktemp is used by krb5-send-pr
 Requires: mktemp, xinetd, /etc/pam.d/%{login_pam_service}
 
@@ -276,7 +284,7 @@ to install this package.
 Summary: The shared libraries used by Kerberos 5.
 Summary(ja): Kerberos 5 の共有ライブラリ
 Group: System Environment/Libraries
-Prereq: /sbin/ldconfig
+Requires(pre): /sbin/ldconfig
 Requires: %{name}-libs = %{version}-%{release}
 
 %description -n compat32-%{name}-libs
@@ -365,6 +373,7 @@ popd
 %patch85 -p0 -b .CVE-2009-4212
 %patch86 -p0 -b .CVE-2010-0629
 %patch87 -p1 -b .CVE-2010-1321
+%patch500 -p1 -b .vine
 
 cp src/krb524/README README.krb524
 gzip doc/*.ps
@@ -985,6 +994,11 @@ exit 0
 %endif
 
 %changelog
+* Mon Jan 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.3-8
+- rebuild with openssl-1.0.0c
+- add Patch500 (krb5-1.6.3-openssl-1.0.0-vine.patch)
+- change BuildRequires: texlive instead of tetex-latex
+
 * Fri May 21 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.6.3-7
 - add patch87 for fix CVE-2010-1321 (GSS API Null pointer def)
 

n/net-snmp/net-snmp-vl.spec

@@ -31,7 +31,7 @@ Patch9: net-snmp-5.6.1-config_libdir.patch
 # Patch10: net-snmp-5.4.1-ethtool-config.patch
 Patch11: net-snmp-5.6.1-strange_libpath.patch
 # Patch12: net-snmp-5.4.1-hostname.patch
-Patch13: net-snmp-5.6.1-shared-ip.patch
+Patch13: net-snmp-5.4.3-shared-ip.patch
 # Patch14: net-snmp-5.4-exec-crash.patch
 Patch15: net-snmp-5.1.2-snmpconf-selinux.patch
 Patch16: net-snmp-5.4.1-sensors3.patch
@@ -158,7 +158,7 @@ perl から mib2c や SNMP を使用したいならば, net-snmp-perl パッケ
 # %patch10 -p1 -b .ethtool
 %patch11 -p1 -b .libpath
 # %patch12 -p1 -b .hostname
-%patch13 -p1 -b .shared-ip
+# %patch13 -p1 -b .shared-ip
 # %patch14 -p1 -b .exec
 %patch15 -p1 -b .selinux
 # %patch16 -p0 -b .sensors
@@ -358,8 +358,8 @@ rm -rf ${RPM_BUILD_ROOT}
 * Mon Jan 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.6.1-1
 - new upstream release
 - add configure option: --with-mnttab="/etc/mnttab"
-- update Patch1,4,9,11,13 for net-snmp-5.6.1
-- drop Patch6,8,16,17
+- update Patch1,4,9,11 for net-snmp-5.6.1
+- drop Patch6,8,13,16,17
 - fix %%files
 
 * Sun Aug 01 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.4.3-1