From 808c8648422c62908101663a8edad90f55137ae8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:45:31 +0000 Subject: [PATCH 01/15] Initialize branch F-13 for 389-ds-base --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 49deb3b63ac1e5b424d3b894409cedd1475d2fb6 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 2 Mar 2010 20:17:48 +0000 Subject: [PATCH 02/15] this is the 1.2.6.a2 release - add support for matching rules - many bug fixes --- .cvsignore | 2 +- 389-ds-base-git-local.sh | 2 +- 389-ds-base-git.sh | 2 +- 389-ds-base.spec | 9 +++++++-- sources | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index d13a7c1..7dc15c3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-ds-base-1.2.6.a1.tar.bz2 +389-ds-base-1.2.6.a2.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index 32e8acc..49eb7e9 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.a1 +VERSION=1.2.6.a2 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index 9426795..df2aa99 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.a1 +VERSION=1.2.6.a2 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" diff --git a/389-ds-base.spec b/389-ds-base.spec index fb313dd..349ce75 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,7 +1,7 @@ %global pkgname dirsrv # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release -%global prerel .a1 +%global prerel .a2 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release %global relprefix 0. @@ -10,7 +10,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.6 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -356,6 +356,11 @@ fi %{_datadir}/%{pkgname}-selinux %changelog +* Mon Mar 2 2010 Rich Megginson - 1.2.6-0.2.a2 +- 1.2.6.a2 release +- add support for matching rules +- many bug fixes + * Thu Jan 14 2010 Nathan Kinder - 1.2.6-0.1.a1 - 1.2.6.a1 release - Added SELinux policy and subpackages diff --git a/sources b/sources index 8dbd3db..a2f01c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa9299aa66b09f89ed80dd0cfeebde55 389-ds-base-1.2.6.a1.tar.bz2 +b1941ba0e102e9935b4c84edcad225bf 389-ds-base-1.2.6.a2.tar.bz2 From 748afdef07e45a69d7ce894b5f172eb4b39eb67c Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Tue, 6 Apr 2010 18:45:59 +0000 Subject: [PATCH 03/15] Updated spec files for 1.2.6.a3 release. --- 389-ds-base.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/389-ds-base.spec b/389-ds-base.spec index 349ce75..2902897 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,7 +1,7 @@ %global pkgname dirsrv # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release -%global prerel .a2 +%global prerel .a3 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release %global relprefix 0. @@ -10,7 +10,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.6 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}3%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -43,6 +43,12 @@ BuildRequires: /usr/share/selinux/devel/Makefile # the following is for the pam passthru auth plug-in BuildRequires: pam-devel +# require our selinux subpackage +Requires: %{name}-selinux = %{version}-%{release} + +# this is needed for using semanage from our setup scripts +Requires: policycoreutils-python + # the following are needed for some of our scripts Requires: mozldap-tools Requires: perl-Mozilla-LDAP @@ -94,7 +100,13 @@ Development Libraries and headers for the 389 Directory Server base package. Summary: SELinux policy for 389 Directory Server Group: System Environment/Daemons Requires: selinux-policy -Requires: %{name} = %{version}-%{release} + +# this is needed to load and unload the policy module +Requires(post): policycoreutils +Requires(post): /sbin/service +Requires(preun): policycoreutils +Requires(preun): /sbin/service +Requires(postun): policycoreutils %description selinux SELinux policy for the 389 Directory Server base package. @@ -356,6 +368,11 @@ fi %{_datadir}/%{pkgname}-selinux %changelog +* Tue Apr 6 2010 Nathan Kinder - 1.2.6-0.3.a3 +- 1.2.6.a3 release +- add managed entries plug-in +- many bug fixes + * Mon Mar 2 2010 Rich Megginson - 1.2.6-0.2.a2 - 1.2.6.a2 release - add support for matching rules From 75dd970820b0f189781cee89807ca7861acec5aa Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Wed, 7 Apr 2010 22:34:08 +0000 Subject: [PATCH 04/15] Moved selinux subpackage into base package. --- 389-ds-base.spec | 87 ++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 55 deletions(-) diff --git a/389-ds-base.spec b/389-ds-base.spec index 2902897..9a56883 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -17,6 +17,7 @@ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: fedora-ds-base = %{version}-%{release} Obsoletes: fedora-ds-base < 1.2.1-1 +Obsoletes: %{name}-selinux BuildRequires: nspr-devel BuildRequires: nss-devel @@ -43,12 +44,15 @@ BuildRequires: /usr/share/selinux/devel/Makefile # the following is for the pam passthru auth plug-in BuildRequires: pam-devel -# require our selinux subpackage -Requires: %{name}-selinux = %{version}-%{release} - # this is needed for using semanage from our setup scripts Requires: policycoreutils-python +# these are needed for selinux +Requires: selinux-policy +Requires(post): policycoreutils +Requires(preun): policycoreutils +Requires(postun): policycoreutils + # the following are needed for some of our scripts Requires: mozldap-tools Requires: perl-Mozilla-LDAP @@ -96,21 +100,6 @@ Obsoletes: fedora-ds-base-devel < 1.2.1-1 %description devel Development Libraries and headers for the 389 Directory Server base package. -%package selinux -Summary: SELinux policy for 389 Directory Server -Group: System Environment/Daemons -Requires: selinux-policy - -# this is needed to load and unload the policy module -Requires(post): policycoreutils -Requires(post): /sbin/service -Requires(preun): policycoreutils -Requires(preun): /sbin/service -Requires(postun): policycoreutils - -%description selinux -SELinux policy for the 389 Directory Server base package. - %package selinux-devel Summary: Development interface for 389 Directory Server base SELinux policy Group: Development/Libraries @@ -234,17 +223,35 @@ else -- print("in %{pkgname} post - installing") %{pkgname}_upgrading = false end +-- load the selinux policy module +variants = "%{selinux_variants}" +for selinuxvariant in string.gfind(variants, "%a+") do + os.execute('semodule -s '..selinuxvariant..' -i %{_datadir}/selinux/'..selinuxvariant..'/%{pkgname}.pp > /dev/null 2>&1') +end +-- label the files installed by this package +os.execute('fixfiles -R %{name} restore > /dev/null 2>&1') %preun -if [ $1 = 0 ]; then +if [ $1 = 0 ]; then # Final removal /sbin/service %{pkgname} stop >/dev/null 2>&1 || : /sbin/chkconfig --del %{pkgname} /sbin/service %{pkgname}-snmp stop >/dev/null 2>&1 || : /sbin/chkconfig --del %{pkgname}-snmp + for selinuxvariant in %{selinux_variants} + do + semodule -s ${selinuxvariant} -r %{pkgname} 2>/dev/null || : + done fi -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +if [ "$1" -ge "1" ]; then # Upgrade +for selinuxvariant in %{selinux_variants} +do + semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{pkgname}.pp 2>/dev/null || : +done +fi %posttrans -p -- if we saved the run level configuration in %pre, restore it now @@ -286,6 +293,8 @@ if %{pkgname}_upgrading then -- print("restarting instance "..inst) os.execute('/sbin/service %{pkgname} start '..inst..' >/dev/null 2>&1') end +-- restart the snmp subagent if needed + os.execute('/sbin/service %{pkgname}-snmp condrestart > /dev/null 2>&1') end -- if we upgraded from fedora to 389, the upgrade will shutdown -- all old running instances, so we have to start them here @@ -294,36 +303,6 @@ if %{pkgname}_exists then os.execute('/sbin/service %{pkgname} start >/dev/null 2>&1') end -%post selinux -if [ "$1" -le "1" ] ; then # First install -for selinuxvariant in %{selinux_variants} -do - semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{pkgname}.pp 2>/dev/null || : -done -fixfiles -R %{name} restore || : -/sbin/service %{pkgname} condrestart > /dev/null 2>&1 || : -/sbin/service %{pkgname}-snmp condrestart > /dev/null 2>&1 || : -fi - -%preun selinux -if [ "$1" -lt "1" ]; then # Final removal -for selinuxvariant in %{selinux_variants} -do - semodule -s ${selinuxvariant} -r %{pkgname} 2>/dev/null || : -done -fixfiles -R %{name} restore || : -/sbin/service %{pkgname} condrestart > /dev/null 2>&1 || : -/sbin/service %{pkgname}-snmp condrestart > /dev/null 2>&1 || : -fi - -%postun selinux -if [ "$1" -ge "1" ]; then # Upgrade -for selinuxvariant in %{selinux_variants} -do - semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{pkgname}.pp 2>/dev/null || : -done -fi - %files %defattr(-,root,root,-) @@ -338,6 +317,7 @@ fi %config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname} %{_datadir}/%{pkgname} +%{_datadir}/selinux/*/%{pkgname}.pp %{_sysconfdir}/rc.d/init.d/%{pkgname} %{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp %{_bindir}/* @@ -359,19 +339,16 @@ fi %{_includedir}/%{pkgname} %{_libdir}/%{pkgname}/*.so -%files selinux -%defattr(-,root,root,-) -%{_datadir}/selinux/*/%{pkgname}.pp - %files selinux-devel %defattr(-,root,root,-) %{_datadir}/%{pkgname}-selinux %changelog -* Tue Apr 6 2010 Nathan Kinder - 1.2.6-0.3.a3 +* Tue Apr 7 2010 Nathan Kinder - 1.2.6-0.3.a3 - 1.2.6.a3 release - add managed entries plug-in - many bug fixes +- moved selinux subpackage into base package * Mon Mar 2 2010 Rich Megginson - 1.2.6-0.2.a2 - 1.2.6.a2 release From 668219846c93b1fa7032b6b6a66c9f62d9be61ed Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Sat, 10 Apr 2010 02:00:57 +0000 Subject: [PATCH 05/15] update git source scripts --- 389-ds-base-git-local.sh | 2 +- 389-ds-base-git.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index 49eb7e9..250ed11 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.a2 +VERSION=1.2.6.a3 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index df2aa99..caecec9 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.a2 +VERSION=1.2.6.a3 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" From 1a6f57e716467bfdcd6f2890d6bc1be653c4a2d8 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 15 Apr 2010 18:09:58 +0000 Subject: [PATCH 06/15] sources for 1.2.6.a3 release --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7dc15c3..74b680f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-ds-base-1.2.6.a2.tar.bz2 +389-ds-base-1.2.6.a3.tar.bz2 diff --git a/sources b/sources index a2f01c2..f578c7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1941ba0e102e9935b4c84edcad225bf 389-ds-base-1.2.6.a2.tar.bz2 +8ebd9659167fbfbc514e5abf552901c0 389-ds-base-1.2.6.a3.tar.bz2 From 08352a405e24a5f87d55ea7f3094281d199b46ca Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 26 May 2010 21:39:37 +0000 Subject: [PATCH 07/15] this is the 1.2.6.a4 release --- .cvsignore | 2 +- 389-ds-base-git-local.sh | 2 +- 389-ds-base-git.sh | 2 +- 389-ds-base.spec | 7 +++++-- sources | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 74b680f..0c3276f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-ds-base-1.2.6.a3.tar.bz2 +389-ds-base-1.2.6.a4.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index 250ed11..2b9f29a 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.a3 +VERSION=1.2.6.a4 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index caecec9..8c52537 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.a3 +VERSION=1.2.6.a4 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" diff --git a/389-ds-base.spec b/389-ds-base.spec index 9a56883..48b2ef8 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,7 +1,7 @@ %global pkgname dirsrv # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release -%global prerel .a3 +%global prerel .a4 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release %global relprefix 0. @@ -10,7 +10,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.6 -Release: %{?relprefix}3%{?prerel}%{?dist} +Release: %{?relprefix}4%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -344,6 +344,9 @@ end %{_datadir}/%{pkgname}-selinux %changelog +* Wed May 26 2010 Rich Megginson - 1.2.6-0.4.a4 +- 1.2.6.a4 release + * Tue Apr 7 2010 Nathan Kinder - 1.2.6-0.3.a3 - 1.2.6.a3 release - add managed entries plug-in diff --git a/sources b/sources index f578c7b..da7280d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ebd9659167fbfbc514e5abf552901c0 389-ds-base-1.2.6.a3.tar.bz2 +bc996a7ec8e7fff2266172c9ecb1883a 389-ds-base-1.2.6.a4.tar.bz2 From 1d41b3f7d25a78c033d00c3d0e2576ef019cdc33 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 9 Jun 2010 14:23:23 +0000 Subject: [PATCH 08/15] this is 1.2.6 RC1 --- .cvsignore | 2 +- 389-ds-base-git-local.sh | 2 +- 389-ds-base-git.sh | 2 +- 389-ds-base.spec | 7 +++++-- sources | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0c3276f..fca041e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-ds-base-1.2.6.a4.tar.bz2 +389-ds-base-1.2.6.rc1.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index 2b9f29a..b922da6 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.a4 +VERSION=1.2.6.rc1 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index 8c52537..1ab80c9 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.a4 +VERSION=1.2.6.rc1 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" diff --git a/389-ds-base.spec b/389-ds-base.spec index 48b2ef8..0afe16b 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,7 +1,7 @@ %global pkgname dirsrv # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release -%global prerel .a4 +%global prerel .rc1 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release %global relprefix 0. @@ -10,7 +10,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.6 -Release: %{?relprefix}4%{?prerel}%{?dist} +Release: %{?relprefix}5%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -344,6 +344,9 @@ end %{_datadir}/%{pkgname}-selinux %changelog +* Wed June 9 2010 Rich Megginson - 1.2.6-0.5.rc1 +- 1.2.6 release candidate 1 + * Wed May 26 2010 Rich Megginson - 1.2.6-0.4.a4 - 1.2.6.a4 release diff --git a/sources b/sources index da7280d..75159b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc996a7ec8e7fff2266172c9ecb1883a 389-ds-base-1.2.6.a4.tar.bz2 +a2d3631c3d57b9a0d00f28b49ee00456 389-ds-base-1.2.6.rc1.tar.bz2 From d321a9b70b4577aa91124b076e261b78d7cd634d Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 9 Jun 2010 14:29:23 +0000 Subject: [PATCH 09/15] fix typo in spec changelog --- 389-ds-base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/389-ds-base.spec b/389-ds-base.spec index 0afe16b..7af656a 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -344,7 +344,7 @@ end %{_datadir}/%{pkgname}-selinux %changelog -* Wed June 9 2010 Rich Megginson - 1.2.6-0.5.rc1 +* Wed Jun 9 2010 Rich Megginson - 1.2.6-0.5.rc1 - 1.2.6 release candidate 1 * Wed May 26 2010 Rich Megginson - 1.2.6-0.4.a4 From fba8bc41eca7ba7ad4735eeb0da8f1975d82e541 Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Tue, 15 Jun 2010 23:20:24 +0000 Subject: [PATCH 10/15] Added replication session header to devel subpackage. --- 389-ds-base.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/389-ds-base.spec b/389-ds-base.spec index 7af656a..5e82ba6 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -10,7 +10,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.6 -Release: %{?relprefix}5%{?prerel}%{?dist} +Release: %{?relprefix}6%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -151,6 +151,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/ install -p -m 644 ldap/servers/plugins/replication/winsync-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/ +install -p -m 644 ldap/servers/plugins/replication/repl-session-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/ # make sure perl scripts have a proper shebang sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl @@ -344,6 +345,9 @@ end %{_datadir}/%{pkgname}-selinux %changelog +* Mon Jun 14 2010 Nathan Kinder - 1.2.6-0.6.rc1 +- install replication session plugin header with devel package + * Wed Jun 9 2010 Rich Megginson - 1.2.6-0.5.rc1 - 1.2.6 release candidate 1 From 7a6015420c5ee2e84018ecf9a90ff71e30448e86 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 16 Jun 2010 16:31:33 +0000 Subject: [PATCH 11/15] 1.2.6.rc2 --- .cvsignore | 2 +- 389-ds-base-git-local.sh | 2 +- 389-ds-base-git.sh | 2 +- 389-ds-base.spec | 7 +++++-- sources | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index fca041e..1e5ee01 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-ds-base-1.2.6.rc1.tar.bz2 +389-ds-base-1.2.6.rc2.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index b922da6..2930297 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.rc1 +VERSION=1.2.6.rc2 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index 1ab80c9..9856881 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.rc1 +VERSION=1.2.6.rc2 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" diff --git a/389-ds-base.spec b/389-ds-base.spec index 5e82ba6..0b54440 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,7 +1,7 @@ %global pkgname dirsrv # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release -%global prerel .rc1 +%global prerel .rc2 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release %global relprefix 0. @@ -10,7 +10,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.6 -Release: %{?relprefix}6%{?prerel}%{?dist} +Release: %{?relprefix}7%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -345,6 +345,9 @@ end %{_datadir}/%{pkgname}-selinux %changelog +* Wed Jun 16 2010 Rich Megginson - 1.2.6-0.7.rc2 +- 1.2.6 release candidate 2 + * Mon Jun 14 2010 Nathan Kinder - 1.2.6-0.6.rc1 - install replication session plugin header with devel package diff --git a/sources b/sources index 75159b8..b839a6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2d3631c3d57b9a0d00f28b49ee00456 389-ds-base-1.2.6.rc1.tar.bz2 +5f27dda7ef5c0453f5db35135faf6dbf 389-ds-base-1.2.6.rc2.tar.bz2 From b698a7d992df41b1294d6de43bd8dde4f25c57a9 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 1 Jul 2010 21:09:40 +0000 Subject: [PATCH 12/15] 1.2.6 release candidate 3 git tag 389-ds-base-1.2.6.rc3 Bug 603942 - null deref in _ger_parse_control() for subjectdn 609256 - Selinux: pwdhash fails if called via Admin Server CGI 578296 - Attribute type entrydn needs to be added when subtree rename switch is on 605827 - In-place upgrade: upgrade dn format should not run in setup-ds-admin.pl Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll 606920 - anonymous resource limit - nstimelimit - also applied to "cn=directory manager" --- .cvsignore | 2 +- 389-ds-base-git-local.sh | 2 +- 389-ds-base-git.sh | 2 +- 389-ds-base.spec | 15 +++++++++++++-- sources | 2 +- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1e5ee01..30216f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-ds-base-1.2.6.rc2.tar.bz2 +389-ds-base-1.2.6.rc3.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index 2930297..999539c 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.rc2 +VERSION=1.2.6.rc3 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index 9856881..4514966 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.rc2 +VERSION=1.2.6.rc3 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" diff --git a/389-ds-base.spec b/389-ds-base.spec index 0b54440..4d5b2e6 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,7 +1,7 @@ %global pkgname dirsrv # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release -%global prerel .rc2 +%global prerel .rc3 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release %global relprefix 0. @@ -10,7 +10,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.6 -Release: %{?relprefix}7%{?prerel}%{?dist} +Release: %{?relprefix}8%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -345,6 +345,17 @@ end %{_datadir}/%{pkgname}-selinux %changelog +* Thu Jul 1 2010 Rich Megginson - 1.2.6-0.8.rc3 +- 1.2.6 release candidate 3 +- git tag 389-ds-base-1.2.6.rc3 +- Bug 603942 - null deref in _ger_parse_control() for subjectdn +- 609256 - Selinux: pwdhash fails if called via Admin Server CGI +- 578296 - Attribute type entrydn needs to be added when subtree rename switch is on +- 605827 - In-place upgrade: upgrade dn format should not run in setup-ds-admin.pl +- Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll +- Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll +- 606920 - anonymous resource limit - nstimelimit - also applied to "cn=directory manager" + * Wed Jun 16 2010 Rich Megginson - 1.2.6-0.7.rc2 - 1.2.6 release candidate 2 diff --git a/sources b/sources index b839a6e..ae9ee47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5f27dda7ef5c0453f5db35135faf6dbf 389-ds-base-1.2.6.rc2.tar.bz2 +18511d2ec2b2b7704ae12e552077d1f6 389-ds-base-1.2.6.rc3.tar.bz2 From 41826b89e0c0f62bec635e745e62e8c5604ff08b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:44:17 +0000 Subject: [PATCH 13/15] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0d40fde..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 389-ds-base -# $Id: Makefile,v 1.1 2009/05/26 22:39:38 tibbs Exp $ -NAME := 389-ds-base -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index b370be0..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -89-ds-base-1_2_1-1:HEAD:389-ds-base-1.2.1-1.src.rpm:1243378349 From 541ff8759740a524f82de820807a1e76fc016a45 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 4 Aug 2010 08:41:44 -0600 Subject: [PATCH 14/15] 1.2.6 release candidate 6 git tag 389-ds-base-1.2.6.rc6 Bug 617013 - repl-monitor.pl use cpu upto 90% Bug 616618 - 389 v1.2.5 accepts 2 identical entries with different DN formats Bug 547503 - replication broken again, with 389 MMR replication and TCP error Bug 613833 - Allow dirsrv_t to bind to rpc ports Bug 612242 - membership change on DS does not show on AD Bug 617629 - Missing aliases in new schema files Bug 619595 - Upgrading sub suffix under non-normalized suffix disappears Bug 616608 - SIGBUS in RDN index reads on platforms with strict alignments Bug 617862 - Replication: Unable to delete tombstone errors Bug 594745 - Get rid of dirsrv_lib_t label --- .gitignore | 2 ++ 389-ds-base-git-local.sh | 2 +- 389-ds-base-git.sh | 2 +- 389-ds-base.spec | 18 ++++++++++++++++-- sources | 2 +- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 30216f5..edba661 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ 389-ds-base-1.2.6.rc3.tar.bz2 +*~ +389-ds-base-1.2.6.rc6.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index 999539c..39562f4 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.rc3 +VERSION=1.2.6.rc6 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index 4514966..2825260 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.rc3 +VERSION=1.2.6.rc6 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" diff --git a/389-ds-base.spec b/389-ds-base.spec index 4d5b2e6..16ca8dc 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,7 +1,7 @@ %global pkgname dirsrv # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release -%global prerel .rc3 +%global prerel .rc6 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release %global relprefix 0. @@ -10,7 +10,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.6 -Release: %{?relprefix}8%{?prerel}%{?dist} +Release: %{?relprefix}9%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -345,6 +345,20 @@ end %{_datadir}/%{pkgname}-selinux %changelog +* Mon Aug 2 2010 Rich Megginson - 1.2.6-0.9.rc6 +- 1.2.6 release candidate 6 +- git tag 389-ds-base-1.2.6.rc6 +- Bug 617013 - repl-monitor.pl use cpu upto 90% +- Bug 616618 - 389 v1.2.5 accepts 2 identical entries with different DN formats +- Bug 547503 - replication broken again, with 389 MMR replication and TCP errors +- Bug 613833 - Allow dirsrv_t to bind to rpc ports +- Bug 612242 - membership change on DS does not show on AD +- Bug 617629 - Missing aliases in new schema files +- Bug 619595 - Upgrading sub suffix under non-normalized suffix disappears +- Bug 616608 - SIGBUS in RDN index reads on platforms with strict alignments +- Bug 617862 - Replication: Unable to delete tombstone errors +- Bug 594745 - Get rid of dirsrv_lib_t label + * Thu Jul 1 2010 Rich Megginson - 1.2.6-0.8.rc3 - 1.2.6 release candidate 3 - git tag 389-ds-base-1.2.6.rc3 diff --git a/sources b/sources index ae9ee47..011cf7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18511d2ec2b2b7704ae12e552077d1f6 389-ds-base-1.2.6.rc3.tar.bz2 +143c4653cf8f3fd3e4cf12617deb8a0f 389-ds-base-1.2.6.rc6.tar.bz2 From 6fa7afc2019ab74864ab429f37d0be716c736bdc Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 10 Aug 2010 08:24:03 -0600 Subject: [PATCH 15/15] 389-ds-base 1.2.6 release candidate 7 * Tue Aug 10 2010 Rich Megginson - 1.2.6-0.11.rc7 - 1.2.6 release candidate 7 - git tag 389-ds-base-1.2.6.rc7 - Bug 621928 - Unable to enable replica (rdn problem?) on 1.2.6 rc6 --- .gitignore | 2 +- 389-ds-base-git-local.sh | 2 +- 389-ds-base-git.sh | 2 +- 389-ds-base.spec | 9 +++++++-- sources | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5d85e94..d894c58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -389-ds-base-1.2.6.rc6.tar.bz2 *~ +389-ds-base-1.2.6.rc7.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index 39562f4..a54c749 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.rc6 +VERSION=1.2.6.rc7 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index 2825260..ee57fdd 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.rc6 +VERSION=1.2.6.rc7 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" diff --git a/389-ds-base.spec b/389-ds-base.spec index a9972cb..40b6265 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,7 +1,7 @@ %global pkgname dirsrv # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release -%global prerel .rc6 +%global prerel .rc7 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release %global relprefix 0. @@ -10,7 +10,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.6 -Release: %{?relprefix}10%{?prerel}%{?dist} +Release: %{?relprefix}11%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -346,6 +346,11 @@ end %{_datadir}/%{pkgname}-selinux %changelog +* Tue Aug 10 2010 Rich Megginson - 1.2.6-0.11.rc7 +- 1.2.6 release candidate 7 +- git tag 389-ds-base-1.2.6.rc7 +- Bug 621928 - Unable to enable replica (rdn problem?) on 1.2.6 rc6 + * Mon Aug 2 2010 Rich Megginson - 1.2.6-0.10.rc6 - 1.2.6 release candidate 6 - git tag 389-ds-base-1.2.6.rc6 diff --git a/sources b/sources index 011cf7c..50ef2ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -143c4653cf8f3fd3e4cf12617deb8a0f 389-ds-base-1.2.6.rc6.tar.bz2 +63598946045858e41d688b132dd279d5 389-ds-base-1.2.6.rc7.tar.bz2