Browse code
update nettle,newt,nfs-utils,nspr,nss-altfiles,openldap,openvswitch,paramiko
Change-Id: Icc3d4f57556dce64e8302cfbc5f56cbb3af9be32
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2448
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Priyesh Padmavilasom authored on 2017/04/16 07:32:13Showing 13 changed files
- SPECS/nettle/nettle.spec
- SPECS/newt/newt.spec
- SPECS/nfs-utils/nfs-utils.spec
- SPECS/nspr/nspr.spec
- SPECS/nss-altfiles/nss-altfiles.spec
- SPECS/nss/nss-3.25-standalone-1.patch
- SPECS/nss/nss-3.30.1-standalone-1.patch
- SPECS/nss/nss.spec
- SPECS/openldap/openldap-2.4.43-consolidated-1.patch
- SPECS/openldap/openldap-2.4.44-consolidated-2.patch
- SPECS/openldap/openldap.spec
- SPECS/ovs/openvswitch.spec
- SPECS/paramiko/paramiko.spec
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
Summary: Low level cryptographic libraries |
| 2 | 2 |
Name: nettle |
| 3 |
-Version: 3.2 |
|
| 4 |
-Release: 3%{?dist}
|
|
| 3 |
+Version: 3.3 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: LGPLv3+ or GPLv2+ |
| 6 | 6 |
URL: http://www.lysator.liu.se/~nisse/nettle/ |
| 7 | 7 |
Source0: https://ftp.gnu.org/gnu/nettle/%{name}-%{version}.tar.gz
|
| 8 |
-%define sha1 nettle=b2eb5b36e65a8d3ed60ff81ec897044dead6dae0 |
|
| 8 |
+%define sha1 nettle=bf2b4d3a41192ff6177936d7bc3bee4cebeb86c4 |
|
| 9 | 9 |
Group: Development/Libraries |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| ... | ... |
@@ -36,7 +36,9 @@ developing applications that use nettle. |
| 36 | 36 |
%build |
| 37 | 37 |
./configure \ |
| 38 | 38 |
--prefix=%{_prefix} \
|
| 39 |
- --enable-shared |
|
| 39 |
+ --enable-shared \ |
|
| 40 |
+ --disable-static |
|
| 41 |
+ |
|
| 40 | 42 |
make %{?_smp_mflags}
|
| 41 | 43 |
%install |
| 42 | 44 |
make DESTDIR=%{buildroot} install
|
| ... | ... |
@@ -46,18 +48,23 @@ rm %{buildroot}%{_infodir}/*
|
| 46 | 46 |
make %{?_smp_mflags} check
|
| 47 | 47 |
|
| 48 | 48 |
%post -p /sbin/ldconfig |
| 49 |
+ |
|
| 49 | 50 |
%postun -p /sbin/ldconfig |
| 51 |
+ |
|
| 50 | 52 |
%files |
| 51 | 53 |
%defattr(-,root,root) |
| 52 | 54 |
%{_libdir}/*.so.*
|
| 53 | 55 |
%{_bindir}/*
|
| 56 |
+ |
|
| 54 | 57 |
%files devel |
| 55 | 58 |
%defattr(-,root,root) |
| 56 | 59 |
%{_includedir}/nettle/*.h
|
| 57 | 60 |
%{_libdir}/*.so
|
| 58 | 61 |
%{_libdir}/pkgconfig/*.pc
|
| 59 |
-%{_libdir}/*.a
|
|
| 62 |
+ |
|
| 60 | 63 |
%changelog |
| 64 |
+* Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3-1 |
|
| 65 |
+- Update to 3.3 |
|
| 61 | 66 |
* Mon Oct 04 2016 ChangLee <changLee@vmware.com> 3.2-3 |
| 62 | 67 |
- Modified %check |
| 63 | 68 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.2-2 |
| ... | ... |
@@ -1,17 +1,18 @@ |
| 1 | 1 |
Summary: A library for text mode user interfaces |
| 2 | 2 |
Name: newt |
| 3 |
-Version: 0.52.18 |
|
| 4 |
-Release: 3%{?dist}
|
|
| 3 |
+Version: 0.52.20 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: GNU Library General Public License |
| 6 | 6 |
URL: https://admin.fedoraproject.org/pkgdb/package/newt/ |
| 7 | 7 |
Group: Development/Languages |
| 8 | 8 |
Source0: https://fedorahosted.org/releases/n/e/newt/%{name}-%{version}.tar.gz
|
| 9 |
-%define sha1 newt=2992c926bd3699ff0d6fd7549d4a8a018e3ac8fd |
|
| 9 |
+%define sha1 newt=aec1a633abe595eadb55e568b759e7188d2a6766 |
|
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
Requires: slang |
| 13 | 13 |
BuildRequires: slang-devel |
| 14 | 14 |
BuildRequires: popt-devel |
| 15 |
+ |
|
| 15 | 16 |
%description |
| 16 | 17 |
|
| 17 | 18 |
Newt is a programming library for color text mode, widget based user |
| ... | ... |
@@ -23,7 +24,7 @@ shared library needed by programs built with newt, as well as a |
| 23 | 23 |
slang library. |
| 24 | 24 |
|
| 25 | 25 |
%package devel |
| 26 |
-Summary: Header and development files for ncurses |
|
| 26 |
+Summary: Header and development files for newt |
|
| 27 | 27 |
Requires: %{name} = %{version}
|
| 28 | 28 |
|
| 29 | 29 |
%description devel |
| ... | ... |
@@ -31,11 +32,18 @@ It contains the libraries and header files to create applications |
| 31 | 31 |
|
| 32 | 32 |
%prep |
| 33 | 33 |
%setup -q -n %{name}-%{version}
|
| 34 |
+ |
|
| 34 | 35 |
%build |
| 35 |
-./configure --prefix=/usr --with-gpm-support --without-python |
|
| 36 |
+./configure --prefix=/usr \ |
|
| 37 |
+ --with-gpm-support \ |
|
| 38 |
+ --without-python \ |
|
| 39 |
+ --disable-static |
|
| 40 |
+ |
|
| 36 | 41 |
make |
| 37 | 42 |
%install |
| 38 | 43 |
make DESTDIR=%{buildroot} install
|
| 44 |
+find %{buildroot} -name '*.la' -delete
|
|
| 45 |
+find %{buildroot} -name '*.a' -delete
|
|
| 39 | 46 |
|
| 40 | 47 |
%check |
| 41 | 48 |
make %{?_smp_mflags} test
|
| ... | ... |
@@ -49,11 +57,12 @@ make %{?_smp_mflags} test
|
| 49 | 49 |
|
| 50 | 50 |
%files devel |
| 51 | 51 |
%{_includedir}/*
|
| 52 |
-%{_libdir}/*.a
|
|
| 53 | 52 |
%{_libdir}/libnewt.so
|
| 54 | 53 |
%{_libdir}/pkgconfig/*.pc
|
| 55 | 54 |
|
| 56 | 55 |
%changelog |
| 56 |
+* Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.52.20-1 |
|
| 57 |
+- Update to 0.52.20 |
|
| 57 | 58 |
* Mon Oct 04 2016 ChangLee <changLee@vmware.com> 0.52.18-3 |
| 58 | 59 |
- Modified %check |
| 59 | 60 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.52.18-2 |
| ... | ... |
@@ -1,12 +1,12 @@ |
| 1 | 1 |
Summary: NFS client utils |
| 2 | 2 |
Name: nfs-utils |
| 3 |
-Version: 1.3.3 |
|
| 4 |
-Release: 6%{?dist}
|
|
| 3 |
+Version: 2.1.1 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: GPLv2+ |
| 6 | 6 |
URL: http://sourceforge.net/projects/nfs |
| 7 | 7 |
Group: Applications/Nfs-utils-client |
| 8 | 8 |
Source0: http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2
|
| 9 |
-%define sha1 nfs-utils=7c561e6a22a626aed93766bdb0c34e9a4e77b9e7 |
|
| 9 |
+%define sha1 nfs-utils=8f86ffef3bfc954f3ef9aee805b35cdca3802b14 |
|
| 10 | 10 |
Source1: nfs-client.service |
| 11 | 11 |
Source2: nfs-client.target |
| 12 | 12 |
Source3: rpc-statd.service |
| ... | ... |
@@ -28,13 +28,16 @@ The nfs-utils package contains simple nfs client service |
| 28 | 28 |
%setup -q -n %{name}-%{version}
|
| 29 | 29 |
#not prevent statd to start |
| 30 | 30 |
sed -i "/daemon_init/s:\!::" utils/statd/statd.c |
| 31 |
+ |
|
| 31 | 32 |
%build |
| 32 | 33 |
./configure --prefix=%{_prefix} \
|
| 33 | 34 |
--sysconfdir=%{_sysconfdir} \
|
| 34 | 35 |
--enable-libmount-mount \ |
| 35 | 36 |
--without-tcp-wrappers \ |
| 36 | 37 |
--disable-nfsv4 \ |
| 37 |
- --disable-gss |
|
| 38 |
+ --disable-gss \ |
|
| 39 |
+ --disable-static |
|
| 40 |
+ |
|
| 38 | 41 |
make |
| 39 | 42 |
%install |
| 40 | 43 |
make DESTDIR=%{buildroot} install
|
| ... | ... |
@@ -66,6 +69,8 @@ install -m644 systemd/nfs-mountd.service %{buildroot}/lib/systemd/system/
|
| 66 | 66 |
/lib/systemd/system/* |
| 67 | 67 |
|
| 68 | 68 |
%changelog |
| 69 |
+* Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.1-1 |
|
| 70 |
+- Update to 2.1.1 |
|
| 69 | 71 |
* Fri Dec 16 2016 Nick Shi <nshi@vmware.com> 1.3.3-6 |
| 70 | 72 |
- Requires rpcbind.socket upon starting rpc-statd service (bug 1668405) |
| 71 | 73 |
* Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.3.3-5 |
| ... | ... |
@@ -1,22 +1,25 @@ |
| 1 | 1 |
Summary: Platform-neutral API |
| 2 | 2 |
Name: nspr |
| 3 |
-Version: 4.12 |
|
| 4 |
-Release: 2%{?dist}
|
|
| 3 |
+Version: 4.14 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: MPLv2.0 |
| 6 | 6 |
URL: http://ftp.mozilla.org/pub/mozilla.org |
| 7 | 7 |
Group: Applications/System |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 |
-Source0: http://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/v%{version}/src/%{name}-%{version}.tar.gz
|
|
| 11 |
-%define sha1 nspr=14fb67a0e686a5c662f92e7f59dfd10053f327dd |
|
| 10 |
+Source0: http://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/v%{version}/src/%{name}-%{version}.tar.gz
|
|
| 11 |
+%define sha1 nspr=4c9ffda940882229104090f8fc8539f6412e1ff7 |
|
| 12 |
+ |
|
| 12 | 13 |
%description |
| 13 | 14 |
Netscape Portable Runtime (NSPR) provides a platform-neutral API |
| 14 | 15 |
for system level and libc like functions. |
| 16 |
+ |
|
| 15 | 17 |
%prep |
| 16 | 18 |
%setup -q |
| 17 | 19 |
cd nspr |
| 18 | 20 |
sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in |
| 19 | 21 |
sed -i 's#$(LIBRARY) ##' config/rules.mk |
| 22 |
+ |
|
| 20 | 23 |
%build |
| 21 | 24 |
cd nspr |
| 22 | 25 |
./configure \ |
| ... | ... |
@@ -26,12 +29,17 @@ cd nspr |
| 26 | 26 |
--with-pthreads \ |
| 27 | 27 |
$([ $(uname -m) = x86_64 ] && echo --enable-64bit) \ |
| 28 | 28 |
--disable-silent-rules |
| 29 |
+ |
|
| 29 | 30 |
make %{?_smp_mflags}
|
| 31 |
+ |
|
| 30 | 32 |
%install |
| 31 | 33 |
cd nspr |
| 32 | 34 |
make DESTDIR=%{buildroot} install
|
| 35 |
+ |
|
| 33 | 36 |
%post -p /sbin/ldconfig |
| 37 |
+ |
|
| 34 | 38 |
%postun -p /sbin/ldconfig |
| 39 |
+ |
|
| 35 | 40 |
%files |
| 36 | 41 |
%defattr(-,root,root) |
| 37 | 42 |
%{_bindir}/*
|
| ... | ... |
@@ -39,7 +47,10 @@ make DESTDIR=%{buildroot} install
|
| 39 | 39 |
%{_libdir}/*.so
|
| 40 | 40 |
%{_libdir}/pkgconfig/*.pc
|
| 41 | 41 |
%{_datarootdir}/aclocal/*
|
| 42 |
+ |
|
| 42 | 43 |
%changelog |
| 44 |
+* Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.14-1 |
|
| 45 |
+- Update to 4.14 |
|
| 43 | 46 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.12-2 |
| 44 | 47 |
- GA - Bump release of all rpms |
| 45 | 48 |
* Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 4.12-1 |
| ... | ... |
@@ -1,14 +1,14 @@ |
| 1 | 1 |
Summary: NSS module to read passwd/group files from alternate locations |
| 2 | 2 |
Name: nss-altfiles |
| 3 |
-Version: 2.19.1 |
|
| 4 |
-Release: 2%{?dist}
|
|
| 3 |
+Version: 2.23.0 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: LGPL 2.1 |
| 6 | 6 |
URL: https://github.com/aperezdc/nss-altfiles |
| 7 | 7 |
Group: Applications/System |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: https://github.com/aperezdc/nss-altfiles/archive/%{name}-%{version}.tar.gz
|
| 11 |
-%define sha1 nss-altfiles=1dbe12033c0d166a509c267a21995c9d29b919f8 |
|
| 11 |
+%define sha1 nss-altfiles=dec35095f974b6dbe460c770443c0e70cbeb1b56 |
|
| 12 | 12 |
BuildRequires: glibc-devel |
| 13 | 13 |
|
| 14 | 14 |
%description |
| ... | ... |
@@ -16,8 +16,10 @@ NSS module to read passwd/group files from alternate locations. |
| 16 | 16 |
|
| 17 | 17 |
%prep |
| 18 | 18 |
%setup -q |
| 19 |
+ |
|
| 19 | 20 |
%build |
| 20 |
-env CFLAGS=%{_optflags} ./configure --prefix=%{_prefix} --libdir=%{_libdir}
|
|
| 21 |
+env CFLAGS='%{optflags}' ./configure --prefix=%{_prefix} --libdir=%{_libdir}
|
|
| 22 |
+ |
|
| 21 | 23 |
make %{?_smp_mflags}
|
| 22 | 24 |
|
| 23 | 25 |
%install |
| ... | ... |
@@ -34,6 +36,8 @@ rm -rf %{buildroot}%{_infodir}
|
| 34 | 34 |
%{_libdir}/*.so.*
|
| 35 | 35 |
|
| 36 | 36 |
%changelog |
| 37 |
+* Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.23.0-1 |
|
| 38 |
+- Update to 2.23.0 |
|
| 37 | 39 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.19.1-2 |
| 38 | 40 |
- GA - Bump release of all rpms |
| 39 | 41 |
* Sat Jul 11 2015 Touseef Liaqat <tliaqat@vmware.com> 2.19.1-2 |
| 40 | 42 |
deleted file mode 100644 |
| ... | ... |
@@ -1,248 +0,0 @@ |
| 1 |
-Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br> |
|
| 2 |
-Date: 2015-11-10 |
|
| 3 |
-Initial Package Version: 3.21 |
|
| 4 |
-Upstream Status: Not applicable |
|
| 5 |
-Origin: Based on dj's original patch, rediffed and |
|
| 6 |
- modified for 3.15 by Armin K. |
|
| 7 |
- <krejzi at email dot com> |
|
| 8 |
-Description: Adds auto-generated nss.pc and nss-config script, and |
|
| 9 |
- allows building without nspr in the source tree. |
|
| 10 |
- |
|
| 11 |
-diff -Naur nss-3.21.orig/nss/config/Makefile nss-3.21/nss/config/Makefile |
|
| 12 |
-+++ nss-3.21/nss/config/Makefile 2015-11-10 12:54:49.358835857 -0300 |
|
| 13 |
-@@ -0,0 +1,40 @@ |
|
| 14 |
-+CORE_DEPTH = .. |
|
| 15 |
-+DEPTH = .. |
|
| 16 |
-+ |
|
| 17 |
-+include $(CORE_DEPTH)/coreconf/config.mk |
|
| 18 |
-+ |
|
| 19 |
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
|
|
| 20 |
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
|
|
| 21 |
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
|
|
| 22 |
-+PREFIX = /usr |
|
| 23 |
-+ |
|
| 24 |
-+all: export libs |
|
| 25 |
-+ |
|
| 26 |
-+export: |
|
| 27 |
-+ # Create the nss.pc file |
|
| 28 |
-+ mkdir -p $(DIST)/lib/pkgconfig |
|
| 29 |
-+ sed -e "s,@prefix@,$(PREFIX)," \ |
|
| 30 |
-+ -e "s,@exec_prefix@,\$${prefix}," \
|
|
| 31 |
-+ -e "s,@libdir@,\$${prefix}/lib," \
|
|
| 32 |
-+ -e "s,@includedir@,\$${prefix}/include/nss," \
|
|
| 33 |
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ |
|
| 34 |
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ |
|
| 35 |
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ |
|
| 36 |
-+ nss.pc.in > nss.pc |
|
| 37 |
-+ chmod 0644 nss.pc |
|
| 38 |
-+ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig |
|
| 39 |
-+ |
|
| 40 |
-+ # Create the nss-config script |
|
| 41 |
-+ mkdir -p $(DIST)/bin |
|
| 42 |
-+ sed -e "s,@prefix@,$(PREFIX)," \ |
|
| 43 |
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ |
|
| 44 |
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ |
|
| 45 |
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ |
|
| 46 |
-+ nss-config.in > nss-config |
|
| 47 |
-+ chmod 0755 nss-config |
|
| 48 |
-+ ln -sf ../../../nss/config/nss-config $(DIST)/bin |
|
| 49 |
-+ |
|
| 50 |
-+libs: |
|
| 51 |
-+ |
|
| 52 |
-+dummy: all export libs |
|
| 53 |
-+ |
|
| 54 |
-diff -Naur nss-3.21.orig/nss/config/nss-config.in nss-3.21/nss/config/nss-config.in |
|
| 55 |
-+++ nss-3.21/nss/config/nss-config.in 2015-11-10 12:54:49.359835835 -0300 |
|
| 56 |
-@@ -0,0 +1,153 @@ |
|
| 57 |
-+#!/bin/sh |
|
| 58 |
-+ |
|
| 59 |
-+prefix=@prefix@ |
|
| 60 |
-+ |
|
| 61 |
-+major_version=@NSS_MAJOR_VERSION@ |
|
| 62 |
-+minor_version=@NSS_MINOR_VERSION@ |
|
| 63 |
-+patch_version=@NSS_PATCH_VERSION@ |
|
| 64 |
-+ |
|
| 65 |
-+usage() |
|
| 66 |
-+{
|
|
| 67 |
-+ cat <<EOF |
|
| 68 |
-+Usage: nss-config [OPTIONS] [LIBRARIES] |
|
| 69 |
-+Options: |
|
| 70 |
-+ [--prefix[=DIR]] |
|
| 71 |
-+ [--exec-prefix[=DIR]] |
|
| 72 |
-+ [--includedir[=DIR]] |
|
| 73 |
-+ [--libdir[=DIR]] |
|
| 74 |
-+ [--version] |
|
| 75 |
-+ [--libs] |
|
| 76 |
-+ [--cflags] |
|
| 77 |
-+Dynamic Libraries: |
|
| 78 |
-+ nss |
|
| 79 |
-+ nssutil |
|
| 80 |
-+ smime |
|
| 81 |
-+ ssl |
|
| 82 |
-+ softokn |
|
| 83 |
-+EOF |
|
| 84 |
-+ exit $1 |
|
| 85 |
-+} |
|
| 86 |
-+ |
|
| 87 |
-+if test $# -eq 0; then |
|
| 88 |
-+ usage 1 1>&2 |
|
| 89 |
-+fi |
|
| 90 |
-+ |
|
| 91 |
-+lib_nss=yes |
|
| 92 |
-+lib_nssutil=yes |
|
| 93 |
-+lib_smime=yes |
|
| 94 |
-+lib_ssl=yes |
|
| 95 |
-+lib_softokn=yes |
|
| 96 |
-+ |
|
| 97 |
-+while test $# -gt 0; do |
|
| 98 |
-+ case "$1" in |
|
| 99 |
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; |
|
| 100 |
-+ *) optarg= ;; |
|
| 101 |
-+ esac |
|
| 102 |
-+ |
|
| 103 |
-+ case $1 in |
|
| 104 |
-+ --prefix=*) |
|
| 105 |
-+ prefix=$optarg |
|
| 106 |
-+ ;; |
|
| 107 |
-+ --prefix) |
|
| 108 |
-+ echo_prefix=yes |
|
| 109 |
-+ ;; |
|
| 110 |
-+ --exec-prefix=*) |
|
| 111 |
-+ exec_prefix=$optarg |
|
| 112 |
-+ ;; |
|
| 113 |
-+ --exec-prefix) |
|
| 114 |
-+ echo_exec_prefix=yes |
|
| 115 |
-+ ;; |
|
| 116 |
-+ --includedir=*) |
|
| 117 |
-+ includedir=$optarg |
|
| 118 |
-+ ;; |
|
| 119 |
-+ --includedir) |
|
| 120 |
-+ echo_includedir=yes |
|
| 121 |
-+ ;; |
|
| 122 |
-+ --libdir=*) |
|
| 123 |
-+ libdir=$optarg |
|
| 124 |
-+ ;; |
|
| 125 |
-+ --libdir) |
|
| 126 |
-+ echo_libdir=yes |
|
| 127 |
-+ ;; |
|
| 128 |
-+ --version) |
|
| 129 |
-+ echo ${major_version}.${minor_version}.${patch_version}
|
|
| 130 |
-+ ;; |
|
| 131 |
-+ --cflags) |
|
| 132 |
-+ echo_cflags=yes |
|
| 133 |
-+ ;; |
|
| 134 |
-+ --libs) |
|
| 135 |
-+ echo_libs=yes |
|
| 136 |
-+ ;; |
|
| 137 |
-+ nss) |
|
| 138 |
-+ lib_nss=yes |
|
| 139 |
-+ ;; |
|
| 140 |
-+ nssutil) |
|
| 141 |
-+ lib_nssutil=yes |
|
| 142 |
-+ ;; |
|
| 143 |
-+ smime) |
|
| 144 |
-+ lib_smime=yes |
|
| 145 |
-+ ;; |
|
| 146 |
-+ ssl) |
|
| 147 |
-+ lib_ssl=yes |
|
| 148 |
-+ ;; |
|
| 149 |
-+ softokn) |
|
| 150 |
-+ lib_softokn=yes |
|
| 151 |
-+ ;; |
|
| 152 |
-+ *) |
|
| 153 |
-+ usage 1 1>&2 |
|
| 154 |
-+ ;; |
|
| 155 |
-+ esac |
|
| 156 |
-+ shift |
|
| 157 |
-+done |
|
| 158 |
-+ |
|
| 159 |
-+# Set variables that may be dependent upon other variables |
|
| 160 |
-+if test -z "$exec_prefix"; then |
|
| 161 |
-+ exec_prefix=`pkg-config --variable=exec_prefix nss` |
|
| 162 |
-+fi |
|
| 163 |
-+if test -z "$includedir"; then |
|
| 164 |
-+ includedir=`pkg-config --variable=includedir nss` |
|
| 165 |
-+fi |
|
| 166 |
-+if test -z "$libdir"; then |
|
| 167 |
-+ libdir=`pkg-config --variable=libdir nss` |
|
| 168 |
-+fi |
|
| 169 |
-+ |
|
| 170 |
-+if test "$echo_prefix" = "yes"; then |
|
| 171 |
-+ echo $prefix |
|
| 172 |
-+fi |
|
| 173 |
-+ |
|
| 174 |
-+if test "$echo_exec_prefix" = "yes"; then |
|
| 175 |
-+ echo $exec_prefix |
|
| 176 |
-+fi |
|
| 177 |
-+ |
|
| 178 |
-+if test "$echo_includedir" = "yes"; then |
|
| 179 |
-+ echo $includedir |
|
| 180 |
-+fi |
|
| 181 |
-+ |
|
| 182 |
-+if test "$echo_libdir" = "yes"; then |
|
| 183 |
-+ echo $libdir |
|
| 184 |
-+fi |
|
| 185 |
-+ |
|
| 186 |
-+if test "$echo_cflags" = "yes"; then |
|
| 187 |
-+ echo -I$includedir |
|
| 188 |
-+fi |
|
| 189 |
-+ |
|
| 190 |
-+if test "$echo_libs" = "yes"; then |
|
| 191 |
-+ libdirs="-L$libdir" |
|
| 192 |
-+ if test -n "$lib_nss"; then |
|
| 193 |
-+ libdirs="$libdirs -lnss${major_version}"
|
|
| 194 |
-+ fi |
|
| 195 |
-+ if test -n "$lib_nssutil"; then |
|
| 196 |
-+ libdirs="$libdirs -lnssutil${major_version}"
|
|
| 197 |
-+ fi |
|
| 198 |
-+ if test -n "$lib_smime"; then |
|
| 199 |
-+ libdirs="$libdirs -lsmime${major_version}"
|
|
| 200 |
-+ fi |
|
| 201 |
-+ if test -n "$lib_ssl"; then |
|
| 202 |
-+ libdirs="$libdirs -lssl${major_version}"
|
|
| 203 |
-+ fi |
|
| 204 |
-+ if test -n "$lib_softokn"; then |
|
| 205 |
-+ libdirs="$libdirs -lsoftokn${major_version}"
|
|
| 206 |
-+ fi |
|
| 207 |
-+ echo $libdirs |
|
| 208 |
-+fi |
|
| 209 |
-+ |
|
| 210 |
-diff -Naur nss-3.21.orig/nss/config/nss.pc.in nss-3.21/nss/config/nss.pc.in |
|
| 211 |
-+++ nss-3.21/nss/config/nss.pc.in 2015-11-10 12:54:49.359835835 -0300 |
|
| 212 |
-@@ -0,0 +1,12 @@ |
|
| 213 |
-+prefix=@prefix@ |
|
| 214 |
-+exec_prefix=@exec_prefix@ |
|
| 215 |
-+libdir=@libdir@ |
|
| 216 |
-+includedir=@includedir@ |
|
| 217 |
-+ |
|
| 218 |
-+Name: NSS |
|
| 219 |
-+Description: Network Security Services |
|
| 220 |
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ |
|
| 221 |
-+Requires: nspr >= 4.8 |
|
| 222 |
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ |
|
| 223 |
-+Cflags: -I${includedir}
|
|
| 224 |
-+ |
|
| 225 |
-diff -Naur nss-3.21.orig/nss/Makefile nss-3.21/nss/Makefile |
|
| 226 |
-+++ nss-3.21/nss/Makefile 2015-11-10 12:54:49.359835835 -0300 |
|
| 227 |
-@@ -46,7 +46,7 @@ |
|
| 228 |
- # (7) Execute "local" rules. (OPTIONAL). # |
|
| 229 |
- ####################################################################### |
|
| 230 |
- |
|
| 231 |
--nss_build_all: build_nspr all |
|
| 232 |
-+nss_build_all: all |
|
| 233 |
- |
|
| 234 |
- nss_clean_all: clobber_nspr clobber |
|
| 235 |
- |
|
| 236 |
-diff -Naur nss-3.21.orig/nss/manifest.mn nss-3.21/nss/manifest.mn |
|
| 237 |
-+++ nss-3.21/nss/manifest.mn 2015-11-10 12:59:22.439784449 -0300 |
|
| 238 |
-@@ -10,4 +10,4 @@ |
|
| 239 |
- |
|
| 240 |
- RELEASE = nss |
|
| 241 |
- |
|
| 242 |
--DIRS = coreconf lib cmd external_tests |
|
| 243 |
-+DIRS = coreconf lib cmd external_tests config |
| 244 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,246 @@ |
| 0 |
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> |
|
| 1 |
+Date: 2016-12-27 |
|
| 2 |
+Initial Package Version: 3.12.4 |
|
| 3 |
+Upstream Status: Not applicable |
|
| 4 |
+Origin: Self, rediffed for nss-3.28. |
|
| 5 |
+Description: Adds auto-generated nss.pc and nss-config script, and |
|
| 6 |
+ allows building without nspr in the source tree. |
|
| 7 |
+ |
|
| 8 |
+diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile |
|
| 9 |
+--- nss-3.28-orig/nss/Makefile 2016-12-21 05:56:27.000000000 -0600 |
|
| 10 |
+@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk |
|
| 11 |
+ # (7) Execute "local" rules. (OPTIONAL). # |
|
| 12 |
+ ####################################################################### |
|
| 13 |
+ |
|
| 14 |
+-nss_build_all: build_nspr all latest |
|
| 15 |
++nss_build_all: all latest |
|
| 16 |
+ |
|
| 17 |
+ nss_clean_all: clobber_nspr clobber |
|
| 18 |
+ |
|
| 19 |
+diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile |
|
| 20 |
+--- nss-3.28-orig/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 |
|
| 21 |
+@@ -0,0 +1,40 @@ |
|
| 22 |
++CORE_DEPTH = .. |
|
| 23 |
++DEPTH = .. |
|
| 24 |
++ |
|
| 25 |
++include $(CORE_DEPTH)/coreconf/config.mk |
|
| 26 |
++ |
|
| 27 |
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
|
|
| 28 |
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
|
|
| 29 |
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
|
|
| 30 |
++PREFIX = /usr |
|
| 31 |
++ |
|
| 32 |
++all: export libs |
|
| 33 |
++ |
|
| 34 |
++export: |
|
| 35 |
++ # Create the nss.pc file |
|
| 36 |
++ mkdir -p $(DIST)/lib/pkgconfig |
|
| 37 |
++ sed -e "s,@prefix@,$(PREFIX)," \ |
|
| 38 |
++ -e "s,@exec_prefix@,\$${prefix}," \
|
|
| 39 |
++ -e "s,@libdir@,\$${prefix}/lib," \
|
|
| 40 |
++ -e "s,@includedir@,\$${prefix}/include/nss," \
|
|
| 41 |
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ |
|
| 42 |
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ |
|
| 43 |
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ |
|
| 44 |
++ nss.pc.in > nss.pc |
|
| 45 |
++ chmod 0644 nss.pc |
|
| 46 |
++ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig |
|
| 47 |
++ |
|
| 48 |
++ # Create the nss-config script |
|
| 49 |
++ mkdir -p $(DIST)/bin |
|
| 50 |
++ sed -e "s,@prefix@,$(PREFIX)," \ |
|
| 51 |
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ |
|
| 52 |
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ |
|
| 53 |
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ |
|
| 54 |
++ nss-config.in > nss-config |
|
| 55 |
++ chmod 0755 nss-config |
|
| 56 |
++ ln -sf ../../../nss/config/nss-config $(DIST)/bin |
|
| 57 |
++ |
|
| 58 |
++libs: |
|
| 59 |
++ |
|
| 60 |
++dummy: all export libs |
|
| 61 |
++ |
|
| 62 |
+diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-config.in |
|
| 63 |
+--- nss-3.28-orig/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 |
|
| 64 |
+@@ -0,0 +1,153 @@ |
|
| 65 |
++#!/bin/sh |
|
| 66 |
++ |
|
| 67 |
++prefix=@prefix@ |
|
| 68 |
++ |
|
| 69 |
++major_version=@NSS_MAJOR_VERSION@ |
|
| 70 |
++minor_version=@NSS_MINOR_VERSION@ |
|
| 71 |
++patch_version=@NSS_PATCH_VERSION@ |
|
| 72 |
++ |
|
| 73 |
++usage() |
|
| 74 |
++{
|
|
| 75 |
++ cat <<EOF |
|
| 76 |
++Usage: nss-config [OPTIONS] [LIBRARIES] |
|
| 77 |
++Options: |
|
| 78 |
++ [--prefix[=DIR]] |
|
| 79 |
++ [--exec-prefix[=DIR]] |
|
| 80 |
++ [--includedir[=DIR]] |
|
| 81 |
++ [--libdir[=DIR]] |
|
| 82 |
++ [--version] |
|
| 83 |
++ [--libs] |
|
| 84 |
++ [--cflags] |
|
| 85 |
++Dynamic Libraries: |
|
| 86 |
++ nss |
|
| 87 |
++ nssutil |
|
| 88 |
++ smime |
|
| 89 |
++ ssl |
|
| 90 |
++ softokn |
|
| 91 |
++EOF |
|
| 92 |
++ exit $1 |
|
| 93 |
++} |
|
| 94 |
++ |
|
| 95 |
++if test $# -eq 0; then |
|
| 96 |
++ usage 1 1>&2 |
|
| 97 |
++fi |
|
| 98 |
++ |
|
| 99 |
++lib_nss=yes |
|
| 100 |
++lib_nssutil=yes |
|
| 101 |
++lib_smime=yes |
|
| 102 |
++lib_ssl=yes |
|
| 103 |
++lib_softokn=yes |
|
| 104 |
++ |
|
| 105 |
++while test $# -gt 0; do |
|
| 106 |
++ case "$1" in |
|
| 107 |
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; |
|
| 108 |
++ *) optarg= ;; |
|
| 109 |
++ esac |
|
| 110 |
++ |
|
| 111 |
++ case $1 in |
|
| 112 |
++ --prefix=*) |
|
| 113 |
++ prefix=$optarg |
|
| 114 |
++ ;; |
|
| 115 |
++ --prefix) |
|
| 116 |
++ echo_prefix=yes |
|
| 117 |
++ ;; |
|
| 118 |
++ --exec-prefix=*) |
|
| 119 |
++ exec_prefix=$optarg |
|
| 120 |
++ ;; |
|
| 121 |
++ --exec-prefix) |
|
| 122 |
++ echo_exec_prefix=yes |
|
| 123 |
++ ;; |
|
| 124 |
++ --includedir=*) |
|
| 125 |
++ includedir=$optarg |
|
| 126 |
++ ;; |
|
| 127 |
++ --includedir) |
|
| 128 |
++ echo_includedir=yes |
|
| 129 |
++ ;; |
|
| 130 |
++ --libdir=*) |
|
| 131 |
++ libdir=$optarg |
|
| 132 |
++ ;; |
|
| 133 |
++ --libdir) |
|
| 134 |
++ echo_libdir=yes |
|
| 135 |
++ ;; |
|
| 136 |
++ --version) |
|
| 137 |
++ echo ${major_version}.${minor_version}.${patch_version}
|
|
| 138 |
++ ;; |
|
| 139 |
++ --cflags) |
|
| 140 |
++ echo_cflags=yes |
|
| 141 |
++ ;; |
|
| 142 |
++ --libs) |
|
| 143 |
++ echo_libs=yes |
|
| 144 |
++ ;; |
|
| 145 |
++ nss) |
|
| 146 |
++ lib_nss=yes |
|
| 147 |
++ ;; |
|
| 148 |
++ nssutil) |
|
| 149 |
++ lib_nssutil=yes |
|
| 150 |
++ ;; |
|
| 151 |
++ smime) |
|
| 152 |
++ lib_smime=yes |
|
| 153 |
++ ;; |
|
| 154 |
++ ssl) |
|
| 155 |
++ lib_ssl=yes |
|
| 156 |
++ ;; |
|
| 157 |
++ softokn) |
|
| 158 |
++ lib_softokn=yes |
|
| 159 |
++ ;; |
|
| 160 |
++ *) |
|
| 161 |
++ usage 1 1>&2 |
|
| 162 |
++ ;; |
|
| 163 |
++ esac |
|
| 164 |
++ shift |
|
| 165 |
++done |
|
| 166 |
++ |
|
| 167 |
++# Set variables that may be dependent upon other variables |
|
| 168 |
++if test -z "$exec_prefix"; then |
|
| 169 |
++ exec_prefix=`pkg-config --variable=exec_prefix nss` |
|
| 170 |
++fi |
|
| 171 |
++if test -z "$includedir"; then |
|
| 172 |
++ includedir=`pkg-config --variable=includedir nss` |
|
| 173 |
++fi |
|
| 174 |
++if test -z "$libdir"; then |
|
| 175 |
++ libdir=`pkg-config --variable=libdir nss` |
|
| 176 |
++fi |
|
| 177 |
++ |
|
| 178 |
++if test "$echo_prefix" = "yes"; then |
|
| 179 |
++ echo $prefix |
|
| 180 |
++fi |
|
| 181 |
++ |
|
| 182 |
++if test "$echo_exec_prefix" = "yes"; then |
|
| 183 |
++ echo $exec_prefix |
|
| 184 |
++fi |
|
| 185 |
++ |
|
| 186 |
++if test "$echo_includedir" = "yes"; then |
|
| 187 |
++ echo $includedir |
|
| 188 |
++fi |
|
| 189 |
++ |
|
| 190 |
++if test "$echo_libdir" = "yes"; then |
|
| 191 |
++ echo $libdir |
|
| 192 |
++fi |
|
| 193 |
++ |
|
| 194 |
++if test "$echo_cflags" = "yes"; then |
|
| 195 |
++ echo -I$includedir |
|
| 196 |
++fi |
|
| 197 |
++ |
|
| 198 |
++if test "$echo_libs" = "yes"; then |
|
| 199 |
++ libdirs="-L$libdir" |
|
| 200 |
++ if test -n "$lib_nss"; then |
|
| 201 |
++ libdirs="$libdirs -lnss${major_version}"
|
|
| 202 |
++ fi |
|
| 203 |
++ if test -n "$lib_nssutil"; then |
|
| 204 |
++ libdirs="$libdirs -lnssutil${major_version}"
|
|
| 205 |
++ fi |
|
| 206 |
++ if test -n "$lib_smime"; then |
|
| 207 |
++ libdirs="$libdirs -lsmime${major_version}"
|
|
| 208 |
++ fi |
|
| 209 |
++ if test -n "$lib_ssl"; then |
|
| 210 |
++ libdirs="$libdirs -lssl${major_version}"
|
|
| 211 |
++ fi |
|
| 212 |
++ if test -n "$lib_softokn"; then |
|
| 213 |
++ libdirs="$libdirs -lsoftokn${major_version}"
|
|
| 214 |
++ fi |
|
| 215 |
++ echo $libdirs |
|
| 216 |
++fi |
|
| 217 |
++ |
|
| 218 |
+diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in |
|
| 219 |
+--- nss-3.28-orig/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 |
|
| 220 |
+@@ -0,0 +1,12 @@ |
|
| 221 |
++prefix=@prefix@ |
|
| 222 |
++exec_prefix=@exec_prefix@ |
|
| 223 |
++libdir=@libdir@ |
|
| 224 |
++includedir=@includedir@ |
|
| 225 |
++ |
|
| 226 |
++Name: NSS |
|
| 227 |
++Description: Network Security Services |
|
| 228 |
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ |
|
| 229 |
++Requires: nspr >= 4.10 |
|
| 230 |
++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ |
|
| 231 |
++Cflags: -I${includedir}
|
|
| 232 |
++ |
|
| 233 |
+diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn |
|
| 234 |
+--- nss-3.28-orig/nss/manifest.mn 2016-12-21 05:56:27.000000000 -0600 |
|
| 235 |
+@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \ |
|
| 236 |
+ |
|
| 237 |
+ RELEASE = nss |
|
| 238 |
+ |
|
| 239 |
+-DIRS = coreconf lib cmd gtests |
|
| 240 |
++DIRS = coreconf lib cmd gtests config |
| ... | ... |
@@ -1,15 +1,15 @@ |
| 1 | 1 |
Summary: Security client |
| 2 | 2 |
Name: nss |
| 3 |
-Version: 3.25 |
|
| 4 |
-Release: 3%{?dist}
|
|
| 3 |
+Version: 3.30.1 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: MPLv2.0 |
| 6 |
-URL: http://ftp.mozilla.org/pub/mozilla.org/security/nss |
|
| 6 |
+URL: https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_30_1_RTM/src/%{name}-%{version}.tar.gz
|
|
| 7 | 7 |
Group: Applications/System |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: %{name}-%{version}.tar.gz
|
| 11 |
-%define sha1 nss=ffa55041a7904bb43afbc6821f479819d9802abf |
|
| 12 |
-Patch: nss-3.25-standalone-1.patch |
|
| 11 |
+%define sha1 nss=3e1207b1293605435106148aa8e7205b37aeae74 |
|
| 12 |
+Patch: nss-3.30.1-standalone-1.patch |
|
| 13 | 13 |
Requires: nspr |
| 14 | 14 |
BuildRequires: nspr |
| 15 | 15 |
BuildRequires: sqlite-devel |
| ... | ... |
@@ -77,6 +77,8 @@ HOST=localhost DOMSUF=localdomain |
| 77 | 77 |
|
| 78 | 78 |
|
| 79 | 79 |
%changelog |
| 80 |
+* Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.30.1-1 |
|
| 81 |
+- Update to 3.30.1 |
|
| 80 | 82 |
* Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 3.25-3 |
| 81 | 83 |
- Use sqlite-libs as runtime dependency |
| 82 | 84 |
* Mon Oct 04 2016 ChangLee <changLee@vmware.com> 3.25-2 |
| 83 | 85 |
deleted file mode 100644 |
| ... | ... |
@@ -1,399 +0,0 @@ |
| 1 |
-Submitted by: Bruce Dubbs <bdubbs at linuxfromscratch.org> |
|
| 2 |
-Date: 2012-03-26 |
|
| 3 |
-Initial Package Version: 2.4.40 |
|
| 4 |
-Upstream Status: BLFS Specific |
|
| 5 |
-Origin: Armin K. <krejzi at email dot com> and Debian |
|
| 6 |
-Description: Consolidate earlier patches to: |
|
| 7 |
- 1. Update various installation options, such as ldap database path, |
|
| 8 |
- configuration file options, slapd install location, etc. |
|
| 9 |
- 2. Remove reference to bdb module |
|
| 10 |
- 3. Enables symbol versioning in ldap libraries. Without these changes |
|
| 11 |
- some applications might generate a warning about missing symbol versions. |
|
| 12 |
- |
|
| 13 |
-diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap.m4 |
|
| 14 |
-+++ openldap-2.4.40/build/openldap.m4 2015-03-26 15:37:39.801077750 -0500 |
|
| 15 |
-@@ -1142,3 +1142,54 @@ |
|
| 16 |
- #endif |
|
| 17 |
- ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) |
|
| 18 |
- ]) |
|
| 19 |
-+ |
|
| 20 |
-+dnl ==================================================================== |
|
| 21 |
-+dnl check for symbol versioning support |
|
| 22 |
-+AC_DEFUN([OL_SYMBOL_VERSIONING], |
|
| 23 |
-+[AC_CACHE_CHECK([for .symver assembler directive], |
|
| 24 |
-+ [ol_cv_asm_symver_directive],[ |
|
| 25 |
-+cat > conftest.s <<EOF |
|
| 26 |
-+${libc_cv_dot_text}
|
|
| 27 |
-+_sym: |
|
| 28 |
-+.symver _sym,sym@VERS |
|
| 29 |
-+EOF |
|
| 30 |
-+if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
|
|
| 31 |
-+ ol_cv_asm_symver_directive=yes |
|
| 32 |
-+else |
|
| 33 |
-+ ol_cv_asm_symver_directive=no |
|
| 34 |
-+fi |
|
| 35 |
-+rm -f conftest*]) |
|
| 36 |
-+AC_CACHE_CHECK([for ld --version-script], |
|
| 37 |
-+ [ol_cv_ld_version_script_option],[ |
|
| 38 |
-+if test $ol_cv_asm_symver_directive = yes; then |
|
| 39 |
-+ cat > conftest.s <<EOF |
|
| 40 |
-+${libc_cv_dot_text}
|
|
| 41 |
-+_sym: |
|
| 42 |
-+.symver _sym,sym@VERS |
|
| 43 |
-+EOF |
|
| 44 |
-+ cat > conftest.map <<EOF |
|
| 45 |
-+VERS_1 {
|
|
| 46 |
-+ global: sym; |
|
| 47 |
-+}; |
|
| 48 |
-+ |
|
| 49 |
-+VERS_2 {
|
|
| 50 |
-+ global: sym; |
|
| 51 |
-+} VERS_1; |
|
| 52 |
-+EOF |
|
| 53 |
-+ if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
|
|
| 54 |
-+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared
|
|
| 55 |
-+ -o conftest.so conftest.o |
|
| 56 |
-+ -Wl,--version-script,conftest.map |
|
| 57 |
-+ 1>&AS_MESSAGE_LOG_FD]); |
|
| 58 |
-+ then |
|
| 59 |
-+ ol_cv_ld_version_script_option=yes |
|
| 60 |
-+ else |
|
| 61 |
-+ ol_cv_ld_version_script_option=no |
|
| 62 |
-+ fi |
|
| 63 |
-+ else |
|
| 64 |
-+ ol_cv_ld_version_script_option=no |
|
| 65 |
-+ fi |
|
| 66 |
-+else |
|
| 67 |
-+ ol_cv_ld_version_script_option=no |
|
| 68 |
-+fi |
|
| 69 |
-+rm -f conftest*])]) |
|
| 70 |
-diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk |
|
| 71 |
-+++ openldap-2.4.40/build/top.mk 2015-03-26 15:37:39.801077750 -0500 |
|
| 72 |
-@@ -104,6 +104,9 @@ |
|
| 73 |
- # LINK_LIBS referenced in library and module link commands. |
|
| 74 |
- LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS) |
|
| 75 |
- |
|
| 76 |
-+# option to pass to $(CC) to support library symbol versioning, if any |
|
| 77 |
-+VERSION_OPTION = @VERSION_OPTION@ |
|
| 78 |
-+ |
|
| 79 |
- LTSTATIC = @LTSTATIC@ |
|
| 80 |
- |
|
| 81 |
- LTLINK = $(LIBTOOL) --mode=link \ |
|
| 82 |
-@@ -113,7 +116,7 @@ |
|
| 83 |
- $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c |
|
| 84 |
- |
|
| 85 |
- LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \ |
|
| 86 |
-- $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) |
|
| 87 |
-+ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS) |
|
| 88 |
- |
|
| 89 |
- LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \ |
|
| 90 |
- $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c |
|
| 91 |
-diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in |
|
| 92 |
-+++ openldap-2.4.40/configure.in 2015-03-26 15:37:39.801077750 -0500 |
|
| 93 |
-@@ -1916,6 +1916,13 @@ |
|
| 94 |
- fi |
|
| 95 |
- AC_SUBST(LTSTATIC)dnl |
|
| 96 |
- |
|
| 97 |
-+VERSION_OPTION="" |
|
| 98 |
-+OL_SYMBOL_VERSIONING |
|
| 99 |
-+if test $ol_cv_ld_version_script_option = yes ; then |
|
| 100 |
-+ VERSION_OPTION="-Wl,--version-script=" |
|
| 101 |
-+fi |
|
| 102 |
-+AC_SUBST(VERSION_OPTION) |
|
| 103 |
-+ |
|
| 104 |
- dnl ---------------------------------------------------------------- |
|
| 105 |
- if test $ol_enable_wrappers != no ; then |
|
| 106 |
- AC_CHECK_HEADERS(tcpd.h,[ |
|
| 107 |
-diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man/man5/slapd-bdb.5 |
|
| 108 |
-+++ openldap-2.4.40/doc/man/man5/slapd-bdb.5 2015-03-26 15:36:59.637464038 -0500 |
|
| 109 |
-@@ -135,7 +135,7 @@ |
|
| 110 |
- associated indexes live. |
|
| 111 |
- A separate directory must be specified for each database. |
|
| 112 |
- The default is |
|
| 113 |
--.BR LOCALSTATEDIR/openldap\-data . |
|
| 114 |
-+.BR LOCALSTATEDIR/lib/openldap . |
|
| 115 |
- .TP |
|
| 116 |
- .B dirtyread |
|
| 117 |
- Allow reads of modified but not yet committed data. |
|
| 118 |
-diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-config.5 openldap-2.4.40/doc/man/man5/slapd-config.5 |
|
| 119 |
-+++ openldap-2.4.40/doc/man/man5/slapd-config.5 2015-03-26 15:36:59.638464004 -0500 |
|
| 120 |
-@@ -2051,7 +2051,7 @@ |
|
| 121 |
- # The database directory MUST exist prior to |
|
| 122 |
- # running slapd AND should only be accessible |
|
| 123 |
- # by the slapd/tools. Mode 0700 recommended. |
|
| 124 |
--olcDbDirectory: LOCALSTATEDIR/openldap\-data |
|
| 125 |
-+olcDbDirectory: LOCALSTATEDIR/lib/openldap |
|
| 126 |
- # Indices to maintain |
|
| 127 |
- olcDbIndex: objectClass eq |
|
| 128 |
- olcDbIndex: cn,sn,mail pres,eq,approx,sub |
|
| 129 |
-diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/man/man5/slapd.conf.5 |
|
| 130 |
-+++ openldap-2.4.40/doc/man/man5/slapd.conf.5 2015-03-26 15:36:59.638464004 -0500 |
|
| 131 |
-@@ -2021,7 +2021,7 @@ |
|
| 132 |
- # The database directory MUST exist prior to |
|
| 133 |
- # running slapd AND should only be accessible |
|
| 134 |
- # by the slapd/tools. Mode 0700 recommended. |
|
| 135 |
--directory LOCALSTATEDIR/openldap\-data |
|
| 136 |
-+directory LOCALSTATEDIR/lib/openldap |
|
| 137 |
- # Indices to maintain |
|
| 138 |
- index objectClass eq |
|
| 139 |
- index cn,sn,mail pres,eq,approx,sub |
|
| 140 |
-diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/ldap_defaults.h |
|
| 141 |
-+++ openldap-2.4.40/include/ldap_defaults.h 2015-03-26 15:36:59.638464004 -0500 |
|
| 142 |
-@@ -39,7 +39,7 @@ |
|
| 143 |
- #define LDAP_ENV_PREFIX "LDAP" |
|
| 144 |
- |
|
| 145 |
- /* default ldapi:// socket */ |
|
| 146 |
--#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi" |
|
| 147 |
-+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi" |
|
| 148 |
- |
|
| 149 |
- /* |
|
| 150 |
- * SLAPD DEFINITIONS |
|
| 151 |
-@@ -47,7 +47,7 @@ |
|
| 152 |
- /* location of the default slapd config file */ |
|
| 153 |
- #define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf" |
|
| 154 |
- #define SLAPD_DEFAULT_CONFIGDIR LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d" |
|
| 155 |
--#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-data" |
|
| 156 |
-+#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap" |
|
| 157 |
- #define SLAPD_DEFAULT_DB_MODE 0600 |
|
| 158 |
- #define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata" |
|
| 159 |
- /* default max deref depth for aliases */ |
|
| 160 |
-diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/libraries/liblber/Makefile.in |
|
| 161 |
-+++ openldap-2.4.40/libraries/liblber/Makefile.in 2015-03-26 15:37:39.801077750 -0500 |
|
| 162 |
-@@ -38,6 +38,9 @@ |
|
| 163 |
- XXLIBS = |
|
| 164 |
- NT_LINK_LIBS = $(AC_LIBS) |
|
| 165 |
- UNIX_LINK_LIBS = $(AC_LIBS) |
|
| 166 |
-+ifneq (,$(VERSION_OPTION)) |
|
| 167 |
-+ VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map" |
|
| 168 |
-+endif |
|
| 169 |
- |
|
| 170 |
- dtest: $(XLIBS) dtest.o |
|
| 171 |
- $(LTLINK) -o $@ dtest.o $(LIBS) |
|
| 172 |
-@@ -48,6 +51,6 @@ |
|
| 173 |
- |
|
| 174 |
- install-local: FORCE |
|
| 175 |
- -$(MKDIR) $(DESTDIR)$(libdir) |
|
| 176 |
-- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 177 |
-+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 178 |
- $(LTFINISH) $(DESTDIR)$(libdir) |
|
| 179 |
- |
|
| 180 |
-diff -Naur openldap-2.4.40.orig/libraries/liblber/liblber.map openldap-2.4.40/libraries/liblber/liblber.map |
|
| 181 |
-+++ openldap-2.4.40/libraries/liblber/liblber.map 2015-03-26 15:37:39.801077750 -0500 |
|
| 182 |
-@@ -0,0 +1,8 @@ |
|
| 183 |
-+OPENLDAP_2.4_2 {
|
|
| 184 |
-+ global: |
|
| 185 |
-+ ber_*; |
|
| 186 |
-+ der_alloc; |
|
| 187 |
-+ lutil_*; |
|
| 188 |
-+ local: |
|
| 189 |
-+ *; |
|
| 190 |
-+}; |
|
| 191 |
-diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/libraries/libldap/Makefile.in |
|
| 192 |
-+++ openldap-2.4.40/libraries/libldap/Makefile.in 2015-03-26 15:37:39.802077716 -0500 |
|
| 193 |
-@@ -52,6 +52,9 @@ |
|
| 194 |
- XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) |
|
| 195 |
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) |
|
| 196 |
- UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) |
|
| 197 |
-+ifneq (,$(VERSION_OPTION)) |
|
| 198 |
-+ VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map |
|
| 199 |
-+endif |
|
| 200 |
- |
|
| 201 |
- apitest: $(XLIBS) apitest.o |
|
| 202 |
- $(LTLINK) -o $@ apitest.o $(LIBS) |
|
| 203 |
-@@ -68,7 +71,7 @@ |
|
| 204 |
- |
|
| 205 |
- install-local: $(CFFILES) FORCE |
|
| 206 |
- -$(MKDIR) $(DESTDIR)$(libdir) |
|
| 207 |
-- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 208 |
-+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 209 |
- $(LTFINISH) $(DESTDIR)$(libdir) |
|
| 210 |
- -$(MKDIR) $(DESTDIR)$(sysconfdir) |
|
| 211 |
- @for i in $(CFFILES); do \ |
|
| 212 |
-diff -Naur openldap-2.4.40.orig/libraries/libldap/libldap.map openldap-2.4.40/libraries/libldap/libldap.map |
|
| 213 |
-+++ openldap-2.4.40/libraries/libldap/libldap.map 2015-03-26 15:37:39.802077716 -0500 |
|
| 214 |
-@@ -0,0 +1,7 @@ |
|
| 215 |
-+OPENLDAP_2.4_2 {
|
|
| 216 |
-+ global: |
|
| 217 |
-+ ldap_*; |
|
| 218 |
-+ ldif_*; |
|
| 219 |
-+ local: |
|
| 220 |
-+ *; |
|
| 221 |
-+}; |
|
| 222 |
-diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/libraries/libldap_r/Makefile.in |
|
| 223 |
-+++ openldap-2.4.40/libraries/libldap_r/Makefile.in 2015-03-26 15:37:39.802077716 -0500 |
|
| 224 |
-@@ -61,6 +61,9 @@ |
|
| 225 |
- XXXLIBS = $(LTHREAD_LIBS) |
|
| 226 |
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) |
|
| 227 |
- UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) |
|
| 228 |
-+ifneq (,$(VERSION_OPTION)) |
|
| 229 |
-+ VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map" |
|
| 230 |
-+endif |
|
| 231 |
- |
|
| 232 |
- .links : Makefile |
|
| 233 |
- @for i in $(XXSRCS); do \ |
|
| 234 |
-@@ -83,6 +86,6 @@ |
|
| 235 |
- |
|
| 236 |
- install-local: $(CFFILES) FORCE |
|
| 237 |
- -$(MKDIR) $(DESTDIR)$(libdir) |
|
| 238 |
-- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 239 |
-+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 240 |
- $(LTFINISH) $(DESTDIR)$(libdir) |
|
| 241 |
- |
|
| 242 |
-diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/servers/slapd/Makefile.in |
|
| 243 |
-+++ openldap-2.4.40/servers/slapd/Makefile.in 2015-03-26 15:36:59.639463969 -0500 |
|
| 244 |
-@@ -376,10 +376,10 @@ |
|
| 245 |
- install-conf install-dbc-maybe install-schema install-tools |
|
| 246 |
- |
|
| 247 |
- install-slapd: FORCE |
|
| 248 |
-- -$(MKDIR) $(DESTDIR)$(libexecdir) |
|
| 249 |
-+ -$(MKDIR) $(DESTDIR)$(sbindir) |
|
| 250 |
- -$(MKDIR) $(DESTDIR)$(localstatedir)/run |
|
| 251 |
- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ |
|
| 252 |
-- slapd$(EXEEXT) $(DESTDIR)$(libexecdir) |
|
| 253 |
-+ slapd$(EXEEXT) $(DESTDIR)$(sbindir) |
|
| 254 |
- @for i in $(SUBDIRS); do \ |
|
| 255 |
- if test -d $$i && test -f $$i/Makefile ; then \ |
|
| 256 |
- echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ |
|
| 257 |
-@@ -445,9 +445,9 @@ |
|
| 258 |
- |
|
| 259 |
- install-db-config: FORCE |
|
| 260 |
- @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) |
|
| 261 |
-- @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data |
|
| 262 |
-+ @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap |
|
| 263 |
- $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ |
|
| 264 |
-- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example |
|
| 265 |
-+ $(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example |
|
| 266 |
- $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ |
|
| 267 |
- $(DESTDIR)$(sysconfdir)/DB_CONFIG.example |
|
| 268 |
- |
|
| 269 |
-@@ -455,6 +455,6 @@ |
|
| 270 |
- -$(MKDIR) $(DESTDIR)$(sbindir) |
|
| 271 |
- for i in $(SLAPTOOLS); do \ |
|
| 272 |
- $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ |
|
| 273 |
-- $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ |
|
| 274 |
-+ $(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ |
|
| 275 |
- done |
|
| 276 |
- |
|
| 277 |
-diff -Naur openldap-2.4.40.orig/servers/slapd/slapd.conf openldap-2.4.40/servers/slapd/slapd.conf |
|
| 278 |
-+++ openldap-2.4.40/servers/slapd/slapd.conf 2015-03-26 16:12:59.380911754 -0500 |
|
| 279 |
-@@ -2,43 +2,41 @@ |
|
| 280 |
- # See slapd.conf(5) for details on configuration options. |
|
| 281 |
- # This file should NOT be world readable. |
|
| 282 |
- # |
|
| 283 |
--include %SYSCONFDIR%/schema/core.schema |
|
| 284 |
-+include %SYSCONFDIR%/schema/core.schema |
|
| 285 |
- |
|
| 286 |
- # Define global ACLs to disable default read access. |
|
| 287 |
- |
|
| 288 |
- # Do not enable referrals until AFTER you have a working directory |
|
| 289 |
- # service AND an understanding of referrals. |
|
| 290 |
--#referral ldap://root.openldap.org |
|
| 291 |
-+#referral ldap://root.openldap.org |
|
| 292 |
- |
|
| 293 |
--pidfile %LOCALSTATEDIR%/run/slapd.pid |
|
| 294 |
--argsfile %LOCALSTATEDIR%/run/slapd.args |
|
| 295 |
-+pidfile %LOCALSTATEDIR%/run/openldap/slapd.pid |
|
| 296 |
-+argsfile %LOCALSTATEDIR%/run/openldap/slapd.args |
|
| 297 |
- |
|
| 298 |
- # Load dynamic backend modules: |
|
| 299 |
--# modulepath %MODULEDIR% |
|
| 300 |
--# moduleload back_bdb.la |
|
| 301 |
--# moduleload back_hdb.la |
|
| 302 |
--# moduleload back_ldap.la |
|
| 303 |
-+modulepath %MODULEDIR% |
|
| 304 |
-+#moduleload back_bdb |
|
| 305 |
- |
|
| 306 |
- # Sample security restrictions |
|
| 307 |
--# Require integrity protection (prevent hijacking) |
|
| 308 |
--# Require 112-bit (3DES or better) encryption for updates |
|
| 309 |
--# Require 63-bit encryption for simple bind |
|
| 310 |
-+# Require integrity protection (prevent hijacking) |
|
| 311 |
-+# Require 112-bit (3DES or better) encryption for updates |
|
| 312 |
-+# Require 63-bit encryption for simple bind |
|
| 313 |
- # security ssf=1 update_ssf=112 simple_bind=64 |
|
| 314 |
- |
|
| 315 |
- # Sample access control policy: |
|
| 316 |
--# Root DSE: allow anyone to read it |
|
| 317 |
--# Subschema (sub)entry DSE: allow anyone to read it |
|
| 318 |
--# Other DSEs: |
|
| 319 |
--# Allow self write access |
|
| 320 |
--# Allow authenticated users read access |
|
| 321 |
--# Allow anonymous users to authenticate |
|
| 322 |
--# Directives needed to implement policy: |
|
| 323 |
-+# Root DSE: allow anyone to read it |
|
| 324 |
-+# Subschema (sub)entry DSE: allow anyone to read it |
|
| 325 |
-+# Other DSEs: |
|
| 326 |
-+# Allow self write access |
|
| 327 |
-+# Allow authenticated users read access |
|
| 328 |
-+# Allow anonymous users to authenticate |
|
| 329 |
-+# Directives needed to implement policy: |
|
| 330 |
- # access to dn.base="" by * read |
|
| 331 |
- # access to dn.base="cn=Subschema" by * read |
|
| 332 |
- # access to * |
|
| 333 |
--# by self write |
|
| 334 |
--# by users read |
|
| 335 |
--# by anonymous auth |
|
| 336 |
-+# by self write |
|
| 337 |
-+# by users read |
|
| 338 |
-+# by anonymous auth |
|
| 339 |
- # |
|
| 340 |
- # if no access controls are present, the default policy |
|
| 341 |
- # allows anyone and everyone to read anything but restricts |
|
| 342 |
-@@ -46,20 +44,26 @@ |
|
| 343 |
- # |
|
| 344 |
- # rootdn can always read and write EVERYTHING! |
|
| 345 |
- |
|
| 346 |
-+# Specific Backend Directives for mdb: |
|
| 347 |
-+backend mdb |
|
| 348 |
-+ |
|
| 349 |
- ####################################################################### |
|
| 350 |
- # BDB database definitions |
|
| 351 |
- ####################################################################### |
|
| 352 |
- |
|
| 353 |
--database bdb |
|
| 354 |
--suffix "dc=my-domain,dc=com" |
|
| 355 |
--rootdn "cn=Manager,dc=my-domain,dc=com" |
|
| 356 |
-+database mdb |
|
| 357 |
-+suffix "dc=my-domain,dc=com" |
|
| 358 |
-+#rootdn "cn=Manager,dc=my-domain,dc=com" |
|
| 359 |
-+ |
|
| 360 |
- # Cleartext passwords, especially for the rootdn, should |
|
| 361 |
- # be avoid. See slappasswd(8) and slapd.conf(5) for details. |
|
| 362 |
- # Use of strong authentication encouraged. |
|
| 363 |
--rootpw secret |
|
| 364 |
-+#rootpw secret |
|
| 365 |
-+ |
|
| 366 |
- # The database directory MUST exist prior to running slapd AND |
|
| 367 |
- # should only be accessible by the slapd and slap tools. |
|
| 368 |
- # Mode 700 recommended. |
|
| 369 |
--directory %LOCALSTATEDIR%/openldap-data |
|
| 370 |
-+directory %LOCALSTATEDIR%/lib/openldap |
|
| 371 |
-+ |
|
| 372 |
- # Indices to maintain |
|
| 373 |
--index objectClass eq |
|
| 374 |
-+index objectClass eq |
|
| 375 |
-diff -Naur openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in openldap-2.4.40/servers/slapd/slapi/Makefile.in |
|
| 376 |
-+++ openldap-2.4.40/servers/slapd/slapi/Makefile.in 2015-03-26 15:36:59.639463969 -0500 |
|
| 377 |
-@@ -46,6 +46,6 @@ |
|
| 378 |
- install-local: FORCE |
|
| 379 |
- if test "$(BUILD_MOD)" = "yes"; then \ |
|
| 380 |
- $(MKDIR) $(DESTDIR)$(libdir); \ |
|
| 381 |
-- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \ |
|
| 382 |
-+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \ |
|
| 383 |
- fi |
|
| 384 |
- |
| 385 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,371 @@ |
| 0 |
+Submitted by: Bruce Dubbs <bdubbs at linuxfromscratch.org> |
|
| 1 |
+Date: 2012-03-26 |
|
| 2 |
+Initial Package Version: 2.4.40 |
|
| 3 |
+Upstream Status: BLFS Specific |
|
| 4 |
+Origin: Armin K. <krejzi at email dot com> and Debian |
|
| 5 |
+Comment: Rediffed by Fernando de Oliveira <famobr at yahoo dot |
|
| 6 |
+ com dot br> for version 2.4.44 - 2016.02.06 |
|
| 7 |
+ Rediffed by Pierre Labastie <pierre dot labastie at |
|
| 8 |
+ neuf dot fr> to add mdb backend and slapd.ldif. See |
|
| 9 |
+ ticket #7394 - 2016.02.24 |
|
| 10 |
+Description: Consolidate earlier patches to: |
|
| 11 |
+ 1. Update various installation options, such as ldap database path, |
|
| 12 |
+ configuration file options, slapd install location, etc. |
|
| 13 |
+ 2. Remove reference to bdb module |
|
| 14 |
+ 3. Enables symbol versioning in ldap libraries. Without these changes |
|
| 15 |
+ some applications might generate a warning about missing symbol versions. |
|
| 16 |
+ |
|
| 17 |
+diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap.m4 |
|
| 18 |
+--- openldap-2.4.40.orig/build/openldap.m4 2014-09-18 20:48:49.000000000 -0500 |
|
| 19 |
+@@ -1142,3 +1142,54 @@ |
|
| 20 |
+ #endif |
|
| 21 |
+ ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) |
|
| 22 |
+ ]) |
|
| 23 |
++ |
|
| 24 |
++dnl ==================================================================== |
|
| 25 |
++dnl check for symbol versioning support |
|
| 26 |
++AC_DEFUN([OL_SYMBOL_VERSIONING], |
|
| 27 |
++[AC_CACHE_CHECK([for .symver assembler directive], |
|
| 28 |
++ [ol_cv_asm_symver_directive],[ |
|
| 29 |
++cat > conftest.s <<EOF |
|
| 30 |
++${libc_cv_dot_text}
|
|
| 31 |
++_sym: |
|
| 32 |
++.symver _sym,sym@VERS |
|
| 33 |
++EOF |
|
| 34 |
++if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
|
|
| 35 |
++ ol_cv_asm_symver_directive=yes |
|
| 36 |
++else |
|
| 37 |
++ ol_cv_asm_symver_directive=no |
|
| 38 |
++fi |
|
| 39 |
++rm -f conftest*]) |
|
| 40 |
++AC_CACHE_CHECK([for ld --version-script], |
|
| 41 |
++ [ol_cv_ld_version_script_option],[ |
|
| 42 |
++if test $ol_cv_asm_symver_directive = yes; then |
|
| 43 |
++ cat > conftest.s <<EOF |
|
| 44 |
++${libc_cv_dot_text}
|
|
| 45 |
++_sym: |
|
| 46 |
++.symver _sym,sym@VERS |
|
| 47 |
++EOF |
|
| 48 |
++ cat > conftest.map <<EOF |
|
| 49 |
++VERS_1 {
|
|
| 50 |
++ global: sym; |
|
| 51 |
++}; |
|
| 52 |
++ |
|
| 53 |
++VERS_2 {
|
|
| 54 |
++ global: sym; |
|
| 55 |
++} VERS_1; |
|
| 56 |
++EOF |
|
| 57 |
++ if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
|
|
| 58 |
++ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared
|
|
| 59 |
++ -o conftest.so conftest.o |
|
| 60 |
++ -Wl,--version-script,conftest.map |
|
| 61 |
++ 1>&AS_MESSAGE_LOG_FD]); |
|
| 62 |
++ then |
|
| 63 |
++ ol_cv_ld_version_script_option=yes |
|
| 64 |
++ else |
|
| 65 |
++ ol_cv_ld_version_script_option=no |
|
| 66 |
++ fi |
|
| 67 |
++ else |
|
| 68 |
++ ol_cv_ld_version_script_option=no |
|
| 69 |
++ fi |
|
| 70 |
++else |
|
| 71 |
++ ol_cv_ld_version_script_option=no |
|
| 72 |
++fi |
|
| 73 |
++rm -f conftest*])]) |
|
| 74 |
+diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk |
|
| 75 |
+--- openldap-2.4.40.orig/build/top.mk 2014-09-18 20:48:49.000000000 -0500 |
|
| 76 |
+@@ -104,6 +104,9 @@ |
|
| 77 |
+ # LINK_LIBS referenced in library and module link commands. |
|
| 78 |
+ LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS) |
|
| 79 |
+ |
|
| 80 |
++# option to pass to $(CC) to support library symbol versioning, if any |
|
| 81 |
++VERSION_OPTION = @VERSION_OPTION@ |
|
| 82 |
++ |
|
| 83 |
+ LTSTATIC = @LTSTATIC@ |
|
| 84 |
+ |
|
| 85 |
+ LTLINK = $(LIBTOOL) --mode=link \ |
|
| 86 |
+@@ -113,7 +116,7 @@ |
|
| 87 |
+ $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c |
|
| 88 |
+ |
|
| 89 |
+ LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \ |
|
| 90 |
+- $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) |
|
| 91 |
++ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS) |
|
| 92 |
+ |
|
| 93 |
+ LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \ |
|
| 94 |
+ $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c |
|
| 95 |
+diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in |
|
| 96 |
+--- openldap-2.4.40.orig/configure.in 2014-09-18 20:48:49.000000000 -0500 |
|
| 97 |
+@@ -1916,6 +1916,13 @@ |
|
| 98 |
+ fi |
|
| 99 |
+ AC_SUBST(LTSTATIC)dnl |
|
| 100 |
+ |
|
| 101 |
++VERSION_OPTION="" |
|
| 102 |
++OL_SYMBOL_VERSIONING |
|
| 103 |
++if test $ol_cv_ld_version_script_option = yes ; then |
|
| 104 |
++ VERSION_OPTION="-Wl,--version-script=" |
|
| 105 |
++fi |
|
| 106 |
++AC_SUBST(VERSION_OPTION) |
|
| 107 |
++ |
|
| 108 |
+ dnl ---------------------------------------------------------------- |
|
| 109 |
+ if test $ol_enable_wrappers != no ; then |
|
| 110 |
+ AC_CHECK_HEADERS(tcpd.h,[ |
|
| 111 |
+diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man/man5/slapd-bdb.5 |
|
| 112 |
+--- openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 2014-09-18 20:48:49.000000000 -0500 |
|
| 113 |
+@@ -135,7 +135,7 @@ |
|
| 114 |
+ associated indexes live. |
|
| 115 |
+ A separate directory must be specified for each database. |
|
| 116 |
+ The default is |
|
| 117 |
+-.BR LOCALSTATEDIR/openldap\-data . |
|
| 118 |
++.BR LOCALSTATEDIR/lib/openldap . |
|
| 119 |
+ .TP |
|
| 120 |
+ .B dirtyread |
|
| 121 |
+ Allow reads of modified but not yet committed data. |
|
| 122 |
+diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-config.5 openldap-2.4.40/doc/man/man5/slapd-config.5 |
|
| 123 |
+--- openldap-2.4.40.orig/doc/man/man5/slapd-config.5 2014-09-18 20:48:49.000000000 -0500 |
|
| 124 |
+@@ -2051,7 +2051,7 @@ |
|
| 125 |
+ # The database directory MUST exist prior to |
|
| 126 |
+ # running slapd AND should only be accessible |
|
| 127 |
+ # by the slapd/tools. Mode 0700 recommended. |
|
| 128 |
+-olcDbDirectory: LOCALSTATEDIR/openldap\-data |
|
| 129 |
++olcDbDirectory: LOCALSTATEDIR/lib/openldap |
|
| 130 |
+ # Indices to maintain |
|
| 131 |
+ olcDbIndex: objectClass eq |
|
| 132 |
+ olcDbIndex: cn,sn,mail pres,eq,approx,sub |
|
| 133 |
+diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/man/man5/slapd.conf.5 |
|
| 134 |
+--- openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 2014-09-18 20:48:49.000000000 -0500 |
|
| 135 |
+@@ -2021,7 +2021,7 @@ |
|
| 136 |
+ # The database directory MUST exist prior to |
|
| 137 |
+ # running slapd AND should only be accessible |
|
| 138 |
+ # by the slapd/tools. Mode 0700 recommended. |
|
| 139 |
+-directory LOCALSTATEDIR/openldap\-data |
|
| 140 |
++directory LOCALSTATEDIR/lib/openldap |
|
| 141 |
+ # Indices to maintain |
|
| 142 |
+ index objectClass eq |
|
| 143 |
+ index cn,sn,mail pres,eq,approx,sub |
|
| 144 |
+diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/ldap_defaults.h |
|
| 145 |
+--- openldap-2.4.40.orig/include/ldap_defaults.h 2014-09-18 20:48:49.000000000 -0500 |
|
| 146 |
+@@ -39,7 +39,7 @@ |
|
| 147 |
+ #define LDAP_ENV_PREFIX "LDAP" |
|
| 148 |
+ |
|
| 149 |
+ /* default ldapi:// socket */ |
|
| 150 |
+-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi" |
|
| 151 |
++#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi" |
|
| 152 |
+ |
|
| 153 |
+ /* |
|
| 154 |
+ * SLAPD DEFINITIONS |
|
| 155 |
+@@ -47,7 +47,7 @@ |
|
| 156 |
+ /* location of the default slapd config file */ |
|
| 157 |
+ #define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf" |
|
| 158 |
+ #define SLAPD_DEFAULT_CONFIGDIR LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d" |
|
| 159 |
+-#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-data" |
|
| 160 |
++#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap" |
|
| 161 |
+ #define SLAPD_DEFAULT_DB_MODE 0600 |
|
| 162 |
+ #define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata" |
|
| 163 |
+ /* default max deref depth for aliases */ |
|
| 164 |
+diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/libraries/liblber/Makefile.in |
|
| 165 |
+--- openldap-2.4.40.orig/libraries/liblber/Makefile.in 2014-09-18 20:48:49.000000000 -0500 |
|
| 166 |
+@@ -38,6 +38,9 @@ |
|
| 167 |
+ XXLIBS = |
|
| 168 |
+ NT_LINK_LIBS = $(AC_LIBS) |
|
| 169 |
+ UNIX_LINK_LIBS = $(AC_LIBS) |
|
| 170 |
++ifneq (,$(VERSION_OPTION)) |
|
| 171 |
++ VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map" |
|
| 172 |
++endif |
|
| 173 |
+ |
|
| 174 |
+ dtest: $(XLIBS) dtest.o |
|
| 175 |
+ $(LTLINK) -o $@ dtest.o $(LIBS) |
|
| 176 |
+@@ -48,6 +51,6 @@ |
|
| 177 |
+ |
|
| 178 |
+ install-local: FORCE |
|
| 179 |
+ -$(MKDIR) $(DESTDIR)$(libdir) |
|
| 180 |
+- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 181 |
++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 182 |
+ $(LTFINISH) $(DESTDIR)$(libdir) |
|
| 183 |
+ |
|
| 184 |
+diff -Naur openldap-2.4.40.orig/libraries/liblber/liblber.map openldap-2.4.40/libraries/liblber/liblber.map |
|
| 185 |
+--- openldap-2.4.40.orig/libraries/liblber/liblber.map 1969-12-31 18:00:00.000000000 -0600 |
|
| 186 |
+@@ -0,0 +1,8 @@ |
|
| 187 |
++OPENLDAP_2.4_2 {
|
|
| 188 |
++ global: |
|
| 189 |
++ ber_*; |
|
| 190 |
++ der_alloc; |
|
| 191 |
++ lutil_*; |
|
| 192 |
++ local: |
|
| 193 |
++ *; |
|
| 194 |
++}; |
|
| 195 |
+diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/libraries/libldap/Makefile.in |
|
| 196 |
+--- openldap-2.4.40.orig/libraries/libldap/Makefile.in 2014-09-18 20:48:49.000000000 -0500 |
|
| 197 |
+@@ -52,6 +52,9 @@ |
|
| 198 |
+ XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) |
|
| 199 |
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) |
|
| 200 |
+ UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) |
|
| 201 |
++ifneq (,$(VERSION_OPTION)) |
|
| 202 |
++ VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map |
|
| 203 |
++endif |
|
| 204 |
+ |
|
| 205 |
+ apitest: $(XLIBS) apitest.o |
|
| 206 |
+ $(LTLINK) -o $@ apitest.o $(LIBS) |
|
| 207 |
+@@ -68,7 +71,7 @@ |
|
| 208 |
+ |
|
| 209 |
+ install-local: $(CFFILES) FORCE |
|
| 210 |
+ -$(MKDIR) $(DESTDIR)$(libdir) |
|
| 211 |
+- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 212 |
++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 213 |
+ $(LTFINISH) $(DESTDIR)$(libdir) |
|
| 214 |
+ -$(MKDIR) $(DESTDIR)$(sysconfdir) |
|
| 215 |
+ @for i in $(CFFILES); do \ |
|
| 216 |
+diff -Naur openldap-2.4.40.orig/libraries/libldap/libldap.map openldap-2.4.40/libraries/libldap/libldap.map |
|
| 217 |
+--- openldap-2.4.40.orig/libraries/libldap/libldap.map 1969-12-31 18:00:00.000000000 -0600 |
|
| 218 |
+@@ -0,0 +1,7 @@ |
|
| 219 |
++OPENLDAP_2.4_2 {
|
|
| 220 |
++ global: |
|
| 221 |
++ ldap_*; |
|
| 222 |
++ ldif_*; |
|
| 223 |
++ local: |
|
| 224 |
++ *; |
|
| 225 |
++}; |
|
| 226 |
+diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/libraries/libldap_r/Makefile.in |
|
| 227 |
+--- openldap-2.4.40.orig/libraries/libldap_r/Makefile.in 2014-09-18 20:48:49.000000000 -0500 |
|
| 228 |
+@@ -61,6 +61,9 @@ |
|
| 229 |
+ XXXLIBS = $(LTHREAD_LIBS) |
|
| 230 |
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) |
|
| 231 |
+ UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) |
|
| 232 |
++ifneq (,$(VERSION_OPTION)) |
|
| 233 |
++ VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map" |
|
| 234 |
++endif |
|
| 235 |
+ |
|
| 236 |
+ .links : Makefile |
|
| 237 |
+ @for i in $(XXSRCS); do \ |
|
| 238 |
+@@ -83,6 +86,6 @@ |
|
| 239 |
+ |
|
| 240 |
+ install-local: $(CFFILES) FORCE |
|
| 241 |
+ -$(MKDIR) $(DESTDIR)$(libdir) |
|
| 242 |
+- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 243 |
++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) |
|
| 244 |
+ $(LTFINISH) $(DESTDIR)$(libdir) |
|
| 245 |
+ |
|
| 246 |
+diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/servers/slapd/Makefile.in |
|
| 247 |
+--- openldap-2.4.40.orig/servers/slapd/Makefile.in 2014-09-18 20:48:49.000000000 -0500 |
|
| 248 |
+@@ -376,10 +376,10 @@ |
|
| 249 |
+ install-conf install-dbc-maybe install-schema install-tools |
|
| 250 |
+ |
|
| 251 |
+ install-slapd: FORCE |
|
| 252 |
+- -$(MKDIR) $(DESTDIR)$(libexecdir) |
|
| 253 |
++ -$(MKDIR) $(DESTDIR)$(sbindir) |
|
| 254 |
+ -$(MKDIR) $(DESTDIR)$(localstatedir)/run |
|
| 255 |
+ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ |
|
| 256 |
+- slapd$(EXEEXT) $(DESTDIR)$(libexecdir) |
|
| 257 |
++ slapd$(EXEEXT) $(DESTDIR)$(sbindir) |
|
| 258 |
+ @for i in $(SUBDIRS); do \ |
|
| 259 |
+ if test -d $$i && test -f $$i/Makefile ; then \ |
|
| 260 |
+ echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ |
|
| 261 |
+@@ -445,9 +445,9 @@ |
|
| 262 |
+ |
|
| 263 |
+ install-db-config: FORCE |
|
| 264 |
+ @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) |
|
| 265 |
+- @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data |
|
| 266 |
++ @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap |
|
| 267 |
+ $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ |
|
| 268 |
+- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example |
|
| 269 |
++ $(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example |
|
| 270 |
+ $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ |
|
| 271 |
+ $(DESTDIR)$(sysconfdir)/DB_CONFIG.example |
|
| 272 |
+ |
|
| 273 |
+@@ -455,6 +455,6 @@ |
|
| 274 |
+ -$(MKDIR) $(DESTDIR)$(sbindir) |
|
| 275 |
+ for i in $(SLAPTOOLS); do \ |
|
| 276 |
+ $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ |
|
| 277 |
+- $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ |
|
| 278 |
++ $(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ |
|
| 279 |
+ done |
|
| 280 |
+ |
|
| 281 |
+diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.conf openldap-2.4.44/servers/slapd/slapd.conf |
|
| 282 |
+--- openldap-2.4.44.orig/servers/slapd/slapd.conf 2016-02-06 00:57:45.000000000 +0100 |
|
| 283 |
+@@ -10,12 +10,12 @@ |
|
| 284 |
+ # service AND an understanding of referrals. |
|
| 285 |
+ #referral ldap://root.openldap.org |
|
| 286 |
+ |
|
| 287 |
+-pidfile %LOCALSTATEDIR%/run/slapd.pid |
|
| 288 |
+-argsfile %LOCALSTATEDIR%/run/slapd.args |
|
| 289 |
++pidfile %LOCALSTATEDIR%/run/openldap/slapd.pid |
|
| 290 |
++argsfile %LOCALSTATEDIR%/run/openldap/slapd.args |
|
| 291 |
+ |
|
| 292 |
+ # Load dynamic backend modules: |
|
| 293 |
+-# modulepath %MODULEDIR% |
|
| 294 |
+-# moduleload back_mdb.la |
|
| 295 |
++modulepath %MODULEDIR% |
|
| 296 |
++moduleload back_mdb.la |
|
| 297 |
+ # moduleload back_ldap.la |
|
| 298 |
+ |
|
| 299 |
+ # Sample security restrictions |
|
| 300 |
+@@ -60,6 +60,6 @@ |
|
| 301 |
+ # The database directory MUST exist prior to running slapd AND |
|
| 302 |
+ # should only be accessible by the slapd and slap tools. |
|
| 303 |
+ # Mode 700 recommended. |
|
| 304 |
+-directory %LOCALSTATEDIR%/openldap-data |
|
| 305 |
++directory %LOCALSTATEDIR%/lib/openldap |
|
| 306 |
+ # Indices to maintain |
|
| 307 |
+ index objectClass eq |
|
| 308 |
+diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.ldif openldap-2.4.44/servers/slapd/slapd.ldif |
|
| 309 |
+--- openldap-2.4.44.orig/servers/slapd/slapd.ldif 2016-02-06 00:57:45.000000000 +0100 |
|
| 310 |
+@@ -9,8 +9,8 @@ |
|
| 311 |
+ # |
|
| 312 |
+ # Define global ACLs to disable default read access. |
|
| 313 |
+ # |
|
| 314 |
+-olcArgsFile: %LOCALSTATEDIR%/run/slapd.args |
|
| 315 |
+-olcPidFile: %LOCALSTATEDIR%/run/slapd.pid |
|
| 316 |
++olcArgsFile: %LOCALSTATEDIR%/run/openldap/slapd.args |
|
| 317 |
++olcPidFile: %LOCALSTATEDIR%/run/openldap/slapd.pid |
|
| 318 |
+ # |
|
| 319 |
+ # Do not enable referrals until AFTER you have a working directory |
|
| 320 |
+ # service AND an understanding of referrals. |
|
| 321 |
+@@ -26,10 +26,11 @@ |
|
| 322 |
+ # |
|
| 323 |
+ # Load dynamic backend modules: |
|
| 324 |
+ # |
|
| 325 |
+-#dn: cn=module,cn=config |
|
| 326 |
+-#objectClass: olcModuleList |
|
| 327 |
+-#cn: module |
|
| 328 |
+-#olcModulepath: %MODULEDIR% |
|
| 329 |
++dn: cn=module,cn=config |
|
| 330 |
++objectClass: olcModuleList |
|
| 331 |
++cn: module |
|
| 332 |
++olcModulepath: %MODULEDIR% |
|
| 333 |
++olcModuleload: back_mdb.la |
|
| 334 |
+ #olcModuleload: back_bdb.la |
|
| 335 |
+ #olcModuleload: back_hdb.la |
|
| 336 |
+ #olcModuleload: back_ldap.la |
|
| 337 |
+@@ -90,6 +91,6 @@ |
|
| 338 |
+ # The database directory MUST exist prior to running slapd AND |
|
| 339 |
+ # should only be accessible by the slapd and slap tools. |
|
| 340 |
+ # Mode 700 recommended. |
|
| 341 |
+-olcDbDirectory: %LOCALSTATEDIR%/openldap-data |
|
| 342 |
++olcDbDirectory: %LOCALSTATEDIR%/lib/openldap |
|
| 343 |
+ # Indices to maintain |
|
| 344 |
+ olcDbIndex: objectClass eq |
|
| 345 |
+diff -Naur openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in openldap-2.4.40/servers/slapd/slapi/Makefile.in |
|
| 346 |
+--- openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in 2014-09-18 20:48:49.000000000 -0500 |
|
| 347 |
+@@ -46,6 +46,6 @@ |
|
| 348 |
+ install-local: FORCE |
|
| 349 |
+ if test "$(BUILD_MOD)" = "yes"; then \ |
|
| 350 |
+ $(MKDIR) $(DESTDIR)$(libdir); \ |
|
| 351 |
+- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \ |
|
| 352 |
++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \ |
|
| 353 |
+ fi |
|
| 354 |
+ |
| ... | ... |
@@ -1,22 +1,23 @@ |
| 1 | 1 |
%global _default_patch_fuzz 2 |
| 2 | 2 |
Summary: OpenLdap-2.4.43 |
| 3 | 3 |
Name: openldap |
| 4 |
-Version: 2.4.43 |
|
| 5 |
-Release: 3%{?dist}
|
|
| 4 |
+Version: 2.4.44 |
|
| 5 |
+Release: 1%{?dist}
|
|
| 6 | 6 |
License: OpenLDAP |
| 7 | 7 |
URL: http://cyrusimap.web.cmu.edu/ |
| 8 | 8 |
Group: System Environment/Security |
| 9 | 9 |
Vendor: VMware, Inc. |
| 10 | 10 |
Distribution: Photon |
| 11 | 11 |
Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
|
| 12 |
-%define sha1 openldap=3b52924df2f45e81f25ecbe37551bc837d090cfa |
|
| 13 |
-Patch0: openldap-2.4.43-consolidated-1.patch |
|
| 12 |
+%define sha1 openldap=016a738d050a68d388602a74b5e991035cdba149 |
|
| 13 |
+Patch0: openldap-2.4.44-consolidated-2.patch |
|
| 14 | 14 |
Patch2: openldap-2.4.40-gssapi-1.patch |
| 15 | 15 |
Requires: openssl >= 1.0.1, cyrus-sasl >= 2.1 |
| 16 | 16 |
BuildRequires: cyrus-sasl >= 2.1 |
| 17 | 17 |
BuildRequires: openssl-devel >= 1.0.1 |
| 18 | 18 |
BuildRequires: groff |
| 19 | 19 |
BuildRequires: e2fsprogs-devel |
| 20 |
+ |
|
| 20 | 21 |
%description |
| 21 | 22 |
OpenLDAP is an open source suite of LDAP (Lightweight Directory Access |
| 22 | 23 |
Protocol) applications and development tools. LDAP is a set of |
| ... | ... |
@@ -25,6 +26,7 @@ information, but other information is possible) over the Internet, |
| 25 | 25 |
similar to the way DNS (Domain Name System) information is propagated |
| 26 | 26 |
over the Internet. The openldap package contains configuration files, |
| 27 | 27 |
libraries, and documentation for OpenLDAP. |
| 28 |
+ |
|
| 28 | 29 |
%prep |
| 29 | 30 |
%setup -q |
| 30 | 31 |
%patch2 -p1 |
| ... | ... |
@@ -58,9 +60,12 @@ find %{buildroot}/%{_libdir} -name '*.la' -delete
|
| 58 | 58 |
make %{?_smp_mflags} test
|
| 59 | 59 |
|
| 60 | 60 |
%post -p /sbin/ldconfig |
| 61 |
+ |
|
| 61 | 62 |
%postun -p /sbin/ldconfig |
| 63 |
+ |
|
| 62 | 64 |
%clean |
| 63 | 65 |
rm -rf %{buildroot}/*
|
| 66 |
+ |
|
| 64 | 67 |
%files |
| 65 | 68 |
%defattr(-,root,root) |
| 66 | 69 |
%{_bindir}/*
|
| ... | ... |
@@ -73,6 +78,8 @@ rm -rf %{buildroot}/*
|
| 73 | 73 |
/etc/openldap/* |
| 74 | 74 |
|
| 75 | 75 |
%changelog |
| 76 |
+* Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.44-1 |
|
| 77 |
+- Update to 2.4.44 |
|
| 76 | 78 |
* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 2.4.43-3 |
| 77 | 79 |
- Modified %check |
| 78 | 80 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.43-2 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Open vSwitch daemon/database/utilities |
| 2 | 2 |
Name: openvswitch |
| 3 |
-Version: 2.6.1 |
|
| 4 |
-Release: 2%{?dist}
|
|
| 3 |
+Version: 2.7.0 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: ASL 2.0 and LGPLv2+ |
| 6 | 6 |
URL: http://www.openvswitch.org/ |
| 7 | 7 |
Group: System Environment/Daemons |
| ... | ... |
@@ -9,7 +9,7 @@ Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
|
| 11 | 11 |
Source0: http://openvswitch.org/releases/%{name}-%{version}.tar.gz
|
| 12 |
-%define sha1 openvswitch=2865fe03b3906b5aea984102c4b65772b5dd7450 |
|
| 12 |
+%define sha1 openvswitch=0f324ccfe52ae84a2b102a7f2db1411f4debacf6 |
|
| 13 | 13 |
|
| 14 | 14 |
BuildRequires: gcc >= 4.0.0 |
| 15 | 15 |
BuildRequires: libcap-ng |
| ... | ... |
@@ -66,7 +66,8 @@ It contains the documentation and manpages for openvswitch. |
| 66 | 66 |
--sysconfdir=/etc \ |
| 67 | 67 |
--localstatedir=/var \ |
| 68 | 68 |
--enable-ssl \ |
| 69 |
- --enable-shared |
|
| 69 |
+ --enable-shared \ |
|
| 70 |
+ --disable-static |
|
| 70 | 71 |
|
| 71 | 72 |
make %{_smp_mflags}
|
| 72 | 73 |
|
| ... | ... |
@@ -112,32 +113,35 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 112 | 112 |
%{_sbindir}/ovsdb-server
|
| 113 | 113 |
%{_libdir}/systemd/system/openvswitch.service
|
| 114 | 114 |
%{_libdir}/lib*
|
| 115 |
-/etc/bash_completion.d/ovs-*-bashcomp.bash |
|
| 116 |
-/usr/share/openvswitch/*.ovsschema |
|
| 117 |
-/usr/share/openvswitch/bugtool-plugins/* |
|
| 118 |
-/usr/share/openvswitch/python/* |
|
| 119 |
-/usr/share/openvswitch/scripts/ovs-* |
|
| 120 |
-/usr/share/openvswitch/scripts/ovn-* |
|
| 115 |
+%{_sysconfdir}/bash_completion.d/ovs-*-bashcomp.bash
|
|
| 116 |
+%{_datadir}/openvswitch/*.ovsschema
|
|
| 117 |
+%{_datadir}/openvswitch/bugtool-plugins/*
|
|
| 118 |
+%{_datadir}/openvswitch/python/*
|
|
| 119 |
+%{_datadir}/openvswitch/scripts/ovs-*
|
|
| 120 |
+%{_datadir}/openvswitch/scripts/ovn-*
|
|
| 121 |
+%{_datadir}/openvswitch/scripts/ovndb-servers.ocf
|
|
| 121 | 122 |
|
| 122 | 123 |
%files devel |
| 123 | 124 |
%{_includedir}/ovn/*.h
|
| 124 | 125 |
%{_includedir}/openflow/*.h
|
| 125 | 126 |
%{_includedir}/openvswitch/*.h
|
| 126 |
-%{_libdir}/*.a
|
|
| 127 | 127 |
%{_libdir}/pkgconfig/*.pc
|
| 128 | 128 |
|
| 129 | 129 |
%files doc |
| 130 |
-/usr/share/man/man1/ovs-*.1.gz |
|
| 131 |
-/usr/share/man/man1/ovsdb-*.1.gz |
|
| 132 |
-/usr/share/man/man5/ovs-vswitchd.conf.db.5.gz |
|
| 133 |
-/usr/share/man/man5/ovn-*.5.gz |
|
| 134 |
-/usr/share/man/man5/vtep.5.gz |
|
| 135 |
-/usr/share/man/man7/ovn-architecture.7.gz |
|
| 136 |
-/usr/share/man/man8/ovs-*.8.gz |
|
| 137 |
-/usr/share/man/man8/ovn-*.8.gz |
|
| 138 |
-/usr/share/man/man8/vtep-ctl.8.gz |
|
| 130 |
+%{_mandir}/man1/ovs-*.1.gz
|
|
| 131 |
+%{_mandir}/man1/ovsdb-*.1.gz
|
|
| 132 |
+%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
|
|
| 133 |
+%{_mandir}/man5/ovn-*.5.gz
|
|
| 134 |
+%{_mandir}/man5/vtep.5.gz
|
|
| 135 |
+%{_mandir}/man7/ovn-architecture.7.gz
|
|
| 136 |
+%{_mandir}/man7/ovs-fields.7.gz
|
|
| 137 |
+%{_mandir}/man8/ovs-*.8.gz
|
|
| 138 |
+%{_mandir}/man8/ovn-*.8.gz
|
|
| 139 |
+%{_mandir}/man8/vtep-ctl.8.gz
|
|
| 139 | 140 |
|
| 140 | 141 |
%changelog |
| 142 |
+* Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.0-1 |
|
| 143 |
+- Update to 2.7.0 |
|
| 141 | 144 |
* Fri Feb 10 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-2 |
| 142 | 145 |
- Build ovs shared library |
| 143 | 146 |
* Wed Nov 16 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-1 |
| ... | ... |
@@ -2,15 +2,15 @@ |
| 2 | 2 |
%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
| 3 | 3 |
Summary: Python SSH module |
| 4 | 4 |
Name: paramiko |
| 5 |
-Version: 1.16.0 |
|
| 6 |
-Release: 4%{?dist}
|
|
| 5 |
+Version: 2.1.2 |
|
| 6 |
+Release: 1%{?dist}
|
|
| 7 | 7 |
License: LGPL |
| 8 | 8 |
Group: System Environment/Security |
| 9 | 9 |
Vendor: VMware, Inc. |
| 10 | 10 |
Distribution: Photon |
| 11 | 11 |
URL: http://www.paramiko.org/ |
| 12 | 12 |
Source0: https://github.com/paramiko/paramiko/archive/paramiko-%{version}.tar.gz
|
| 13 |
-%define sha1 paramiko=adf3afcc9e5a3f299a20639771f587a803924443 |
|
| 13 |
+%define sha1 paramiko=8802efc2f4b23f83c677885d9210e359fc20133c |
|
| 14 | 14 |
|
| 15 | 15 |
BuildArch: noarch |
| 16 | 16 |
|
| ... | ... |
@@ -75,6 +75,8 @@ python3 test.py |
| 75 | 75 |
%{python3_sitelib}/*
|
| 76 | 76 |
|
| 77 | 77 |
%changelog |
| 78 |
+* Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.2-1 |
|
| 79 |
+- Update to 2.1.2 |
|
| 78 | 80 |
* Mon Feb 27 2017 Xiaolin Li <xiaolinl@vmware.com> 1.16.0-4 |
| 79 | 81 |
- Added python3 site-packages. |
| 80 | 82 |
* Fri Oct 07 2016 ChangLee <changlee@vmware.com> 1.16.0-3 |