Browse Source

openldap-2.4.40-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9396 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 9 years ago
parent
commit
cec1813be5
1 changed files with 11 additions and 25 deletions
  1. 11 25
      o/openldap/openldap-vl.spec

+ 11 - 25
o/openldap/openldap-vl.spec

@@ -7,7 +7,7 @@
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
 %define __perl_requires %{SOURCE11}
 
-%define stable 1
+%define stable 0
 %if %{stable}
 %define date 20100719
 %endif
@@ -15,8 +15,8 @@
 Summary: The configuration files, libraries and documentation for OpenLDAP.
 Summary(ja): OpenLDAP の設定ファイル,ライブラリ,ドキュメント.
 Name: openldap
-Version: 2.4.23
-Release: 6%{?_dist_release}
+Version: 2.4.40
+Release: 1%{?_dist_release}
 License: OpenLDAP
 Group: System Environment/Libraries
 URL: http://www.openldap.org/
@@ -61,18 +61,9 @@ Patch304: MigrationTools-46-schema.patch
 Patch305: MigrationTools-45-noaliases.patch
 
 # Vine Patches
-Patch700: openldap-2.4.23-libdb.patch
 
 # security fixes
-## from CentOS 6.3; openldap 2.4.23-26.el6_3.2
-Patch1112: openldap-cve-ppolicy-forward-updates.patch
-Patch1113: openldap-cve-ndb-bind-rootdn.patch
-Patch1141: openldap-cve-relay-rwm-translucent.patch
-Patch1144: openldap-cve-nss-cipher-suite-ignored.patch
-## based CentOS 6.3; openldap 2.4.23-26.el6_3.2
-Patch1145: openldap-VineLinux-cve-nss-default-cipher-suite-always-selected.patch
-# CVE-2013-4449
-Patch1146: openldap-rwm-reference-counting.patch
+
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, automake, libtool >= 2.2.6a
@@ -235,16 +226,8 @@ pushd openldap-%{version}
 %patch9 -p1 -b .smbk5pwd
 %patch10 -p1 -b .multilib
 
-%patch700 -p1 -b .libdb
-
 # security
-%patch1112 -p1 -b .cve-ppolicy-forward-updates
-%patch1113 -p1 -b .cve-ndb-bind-rootdn
-%patch1141 -p1 -b .cve-relay-rwm-translucent
-%patch1144 -p1 -b .cve-nss-cipher-suite-ignored
-%patch1145 -p2 -b .cve-VineLinux-nss-default-cipher-suite-always-selected
-# CVE-2013-4449
-%patch1146 -p1 -b .rwm-reference-counting
+# no patch.
 
 libtoolize --force --copy
 popd
@@ -711,6 +694,9 @@ fi
 
 
 %changelog
+* Sat Feb 28 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.40-1
+- new upstream release.
+
 * Fri Feb 27 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.4.23-6
 - add patch1146 for fix CVE-2013-4449
 
@@ -824,7 +810,7 @@ fi
 - removed internal bdb
 - removed autoconf-2.13.1 and automake-1.4a
 
-* Wed Jul 11 2006 NAKAMURA Kenta <kenta@vinelinux.org> 2.3.24-0vl2
+* Tue Jul 11 2006 NAKAMURA Kenta <kenta@vinelinux.org> 2.3.24-0vl2
 - removed compat-openldap subpackage
 
 * Sun Jul 02 2006 Satoshi MACHINO <machino@vinelinux.org> 2.3.24-0vl1
@@ -888,7 +874,7 @@ fi
 - for VinePlus
 - new upstream version (openldap-2.1.22)
 
-* Fri May 29 2003 Satoshi MACHINO <machino@vinelinux.org> 2.1.21-0vl1
+* Thu May 29 2003 Satoshi MACHINO <machino@vinelinux.org> 2.1.21-0vl1
 - new upstream version (openldap-2.1.21)
 
 * Tue May 20 2003 Satoshi MACHINO <machino@vinelinux.org> 2.1.20-0vl1
@@ -937,7 +923,7 @@ fi
 * Wed Feb 06 2002 Satoshi MACHINO <machino@vinelinux.org> 2.0.22-0vl1
 - updated openldap-2.0.22
 
-* Tue Jan 21 2002 Satoshi MACHINO <machino@vinelinux.org> 2.0.21-0vl1
+* Mon Jan 21 2002 Satoshi MACHINO <machino@vinelinux.org> 2.0.21-0vl1
 - updated openldap-2.0.21
 
 * Wed Nov 07 2001 Satoshi MACHINO <machino@vinelinux.org> 2.0.18-0vl1