From 8b80e4e83e8c39021fec0985850bb3486c7faa75 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 23 Jun 2009 02:28:51 +0000 Subject: [PATCH 01/22] Initialize branch F-11 for 389-admin --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From abf6aec2ecda2720c505bcad4b664e43268f63f5 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 23 Jun 2009 02:39:41 +0000 Subject: [PATCH 02/22] initial commit on all branches --- .cvsignore | 1 + 389-admin-git.sh | 22 ++++ 389-admin.spec | 298 +++++++++++++++++++++++++++++++++++++++++++++++ f11-httpd.patch | 15 +++ sources | 1 + 5 files changed, 337 insertions(+) create mode 100755 389-admin-git.sh create mode 100644 389-admin.spec create mode 100644 f11-httpd.patch diff --git a/.cvsignore b/.cvsignore index e69de29..b8f0cd0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +389-admin-1.1.8.tar.bz2 diff --git a/389-admin-git.sh b/389-admin-git.sh new file mode 100755 index 0000000..d827a65 --- /dev/null +++ b/389-admin-git.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +DATE=`date +%Y%m%d` +TAG=HEAD +VERSION=1.1.7 +PKGNAME=389-admin +export URL=git://git.fedorahosted.org/git/389/admin.git +#SRCNAME=$PKGNAME-$VERSION-$DATE +SRCNAME=$PKGNAME-$VERSION + +git clone $URL +cd admin.git +git archive --prefix=$SRCNAME/ $TAG | bzip2 > $SRCNAME.tar.bz2 +#cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME adminserver +#cd $SRCNAME +#cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd +#cd .. + +#tar -cjf $SRCNAME.tar.bz2 $SRCNAME + +cd .. +rm -rf admin.git diff --git a/389-admin.spec b/389-admin.spec new file mode 100644 index 0000000..bb77295 --- /dev/null +++ b/389-admin.spec @@ -0,0 +1,298 @@ +%define pkgname dirsrv + +Summary: 389 Administration Server (admin) +Name: 389-admin +Version: 1.1.8 +Release: 1%{?dist} +License: GPLv2 and ASL 2.0 +URL: http://port389.org/ +Group: System Environment/Daemons +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Provides: fedora-ds-admin = %{version}-%{release} +Obsoletes: fedora-ds-admin < 1.1.8-1 + +BuildRequires: nspr-devel +BuildRequires: nss-devel +BuildRequires: svrcore-devel +BuildRequires: mozldap-devel +BuildRequires: cyrus-sasl-devel +BuildRequires: icu +BuildRequires: libicu-devel +BuildRequires: httpd-devel +BuildRequires: apr-devel +BuildRequires: mod_nss +BuildRequires: adminutil-devel + +Requires: 389-ds-base +Requires: mod_nss +# the following are needed for some of our scripts +Requires: perl-Mozilla-LDAP +Requires: nss-tools + +# for the init script +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service + +Source0: http://port389.org/sources/%{name}-%{version}.tar.bz2 +# 389-admin-git.sh should be used to generate the source tarball from git +Source1: %{name}-git.sh +Patch1: f11-httpd.patch + +%description +389 Administration Server is an HTTP agent that provides management features +for 389 Directory Server. It provides some management web apps that can +be used through a web browser. It provides the authentication, access control, +and CGI utilities used by the console. + +%prep +%setup -q -n %{name}-%{version} +%patch1 + +%build +%configure --disable-rpath + +# Generate symbolic info for debuggers +export XCFLAGS=$RPM_OPT_FLAGS + +%ifarch x86_64 ppc64 ia64 s390x sparc64 +export USE_64=1 +%endif + +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT + +make DESTDIR="$RPM_BUILD_ROOT" install + +# make console jars directory +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java + +#remove libtool and static libs +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/*.so +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +# save permission info in temp file +# if upgrading +if [ "$1" -gt 1 ] ; then + set -x + mydt=`date +%Y%m%d` + mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID + perm1=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null` + if [ -z "$perm1" ] ; then + perm1=0 + fi + own1=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null` + if [ -z "$own1" ] ; then + own1=0 + fi + perm2=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null` + if [ -z "$perm2" ] ; then + perm2=0 + fi + own2=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null` + if [ -z "$own2" ] ; then + own2=0 + fi + echo $perm1 $own1 $perm2 $own2 > $mytmpfile +fi + +%post +/sbin/chkconfig --add %{pkgname}-admin +/sbin/ldconfig +# if installing for the first time, make sure the config +# directory and file have the correct permissions +# the setup script is used to "fix" these +if [ "$1" -gt 1 ]; then + set -x + mydt=`date +%Y%m%d` + mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID + if [ ! -f $mytmpfile ] ; then + echo Error: upgrade temp file $mytmpfile not found + exit 1 + fi + cat $mytmpfile | while read perm1 own1 perm2 own2 ; do + chmod $perm1 %{_sysconfdir}/%{pkgname}/admin-serv + chown $own1 %{_sysconfdir}/%{pkgname}/admin-serv + chmod $perm2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf + chown $own2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf + done + rm -f $mytmpfile +fi + +%preun +if [ $1 = 0 ]; then + /sbin/service %{pkgname}-admin stop >/dev/null 2>&1 || : + /sbin/chkconfig --del %{pkgname}-admin +fi + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc LICENSE +%dir %{_sysconfdir}/%{pkgname}/admin-serv +%config(noreplace)%{_sysconfdir}/%{pkgname}/admin-serv/*.conf +%{_datadir}/%{pkgname} +%{_sysconfdir}/rc.d/init.d/%{pkgname}-admin +%config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}-admin +%{_sbindir}/* +%{_libdir}/*.so.* +%{_libdir}/%{pkgname} +%{_mandir}/man8/* + +%changelog +* Thu Jun 18 2009 Rich Megginson - 1.1.8-1 +- bump version to 1.1.8 +- change license to GPLv2 + ASL 2.0 +- changed files that were incorrectly licensed as GPLv2+ to plain GPLv2 + +* Wed May 13 2009 Rich Megginson - 1.1.7-5 +- rename to 389 + +* Thu Apr 9 2009 Rich Megginson - 1.1.7-4 +- Resolves: bug 493424 +- Description: dirsrv-admin initscript looks for nonexistent library +- Added patch to remove those modules from the httpd.conf + +* Wed Apr 8 2009 Rich Megginson - 1.1.7-3 +- Resolves: bug 494980 +- Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress +- CVS tag FedoraDirSrvAdmin_1_1_7_RC3 FedoraDirSrvAdmin_1_1_7_RC3_20090408 + +* Fri Apr 3 2009 Rich Megginson - 1.1.7-2 +- Resolves: bug 493989 +- Description: Admin Server: valgrind invalid read in security.c when installing CRL + +* Tue Mar 31 2009 Rich Megginson - 1.1.7-1 +- this is the 1.1.7 release +- added man pages for setup, migration, remove commands +- better error handling for command line utilities +- fixed remove from console +- added remove-ds-admin.pl +- added pre and post sections in order to preserve the permissions and ownerships +- CVS tag FedoraDirSrvAdmin_1_1_7_RC1 FedoraDirSrvAdmin_1_1_7_RC1_20090331 + +* Tue Feb 24 2009 Fedora Release Engineering - 1.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Sep 15 2008 Rich Megginson - 1.1.6-2 +- patch for bug 451702 not required anymore - in upstream now + +* Wed Jul 2 2008 Rich Megginson - 1.1.6-1 +- add patch for bug 451702 +- The 1.1.6 release + +* Fri Jun 6 2008 Rich Megginson - 1.1.5-1 +- Resolves: Bug 448366 +- genrb no longer supports -p option + +* Tue Apr 15 2008 Rich Megginson - 1.1.4-1 +- Resolves: Bug 437301 +- Directory Server: shell command injection in CGI replication monitor +- Fix: rewrite the perl script to ignore all input parameters - replmon.conf +- file will have to be hard coded to be in the admin-serv directory +- Resolves: Bug 437320 +- Directory Server: unrestricted access to CGI scripts +- Fix: remove script alias for /bin/admin/admin/bin/ + +* Wed Jan 9 2008 Rich Megginson - 1.1.2-1 +- Fix issues associated with Fedora pkg review bug 249548 + +* Tue Dec 11 2007 Rich Megginson - 1.1.1-1 +- this is the final GA candidate + +* Tue Nov 6 2007 Rich Megginson - 1.1.0-1.16 +- fix several beta blocker issues + +* Mon Oct 15 2007 Rich Megginson - 1.1.0-1.15 +- fix bogus dist macro +- change mozldap6 to mozldap + +* Thu Oct 11 2007 Rich Megginson - 1.1.0-1.14 +- make admin server work with SELinux enabled +- fix wording errors in setup + +* Mon Oct 8 2007 Rich Megginson - 1.1.0-1.13 +- added /etc/sysconfig/dirsrv-admin the file that allows you to set +- the environment used to start up the admin server (e.g. keytab, ulimit, etc.) +- the initscript and admin start script use this file now +- This version also has a fix to print the correct error message if the admin +- server cannot be contacted during setup or migration. + +* Thu Sep 27 2007 Rich Megginson - 1.1.0-1.12 +- fix a couple of migration issues, including the rpath $libdir problem +- allow ds_remove from console to remove instances + +* Wed Sep 19 2007 Rich Megginson - 1.1.0-1.11 +- one line fix to fix of 295001 - console.conf clobbered + +* Tue Sep 18 2007 Rich Megginson - 1.1.0-1.10 +- fixed migration issue bugzilla 295001 - console.conf clobbered + +* Fri Sep 14 2007 Rich Megginson - 1.1.0-1.9 +- fix several more migration problems + +* Fri Sep 14 2007 Rich Megginson - 1.1.0-1.8 +- fix migration - servers are started as they are migrated now + +* Tue Aug 21 2007 Rich Megginson - 1.1.0-1.7 +- Fix the with-fhs-opt configure flag + +* Fri Aug 17 2007 Rich Megginson - 1.1.0-1.6 +- remove curses +- make mod_admserv link against sasl +- add the usual .m4 files to mod_admserv instead of having all of +- the component logic in configure.in + +* Thu Aug 16 2007 Rich Megginson - 1.1.0-1.5 +- incorporate Noriko's migration fix + +* Wed Aug 15 2007 Rich Megginson - 1.1.0-1.4 +- address several migration issues + +* Mon Aug 13 2007 Rich Megginson - 1.1.0-1.3 +- there is no devel package, so remove unused .so files + +* Mon Aug 13 2007 Rich Megginson - 1.1.0-1.2 +- forgot to tag the modules + +* Fri Aug 10 2007 Rich Megginson - 1.1.0-1.1 +- get rid of cvsdate +- use pkgname of dirsrv for filesystem path naming +- get rid of devel package +- simplify files section + +* Fri Aug 10 2007 Noriko Hosoi - 1.1.0-0.3.20070810 +- updated to latest sources +- upgraded the mozldap6 version to 6.0.4 + +* Wed Aug 8 2007 Noriko Hosoi - 1.1.0-0.2.20070808 +- updated to latest sources -- bug fixes in the setup scripts + +* Mon Aug 6 2007 Rich Megginson - 1.1.0-0.1.20070806 +- updated to latest sources + +* Thu Aug 2 2007 Rich Megginson - 1.1.0-0.4.20070802 +- There are no files in bindir anymore + +* Thu Aug 2 2007 Rich Megginson - 1.1.0-0.3.20070802 +- forgot to prepend build root to java dir creation + +* Thu Aug 2 2007 Rich Megginson - 1.1.0-0.2.20070802 +- forgot to add mod_admserv and mod_restartd to source + +* Thu Aug 2 2007 Rich Megginson - 1.1.0-0.1.20070802 +- updated to latest sources - fix build breakage +- add console jars dir under html + +* Mon Jul 23 2007 Rich Megginson - 1.1.0-0.1.20070725 +- Initial version based on fedora-ds-base.spec diff --git a/f11-httpd.patch b/f11-httpd.patch new file mode 100644 index 0000000..630ecb8 --- /dev/null +++ b/f11-httpd.patch @@ -0,0 +1,15 @@ +--- admserv/cfgstuff/httpd-2.2.conf.in 1 Aug 2007 18:14:53 -0000 1.6 ++++ admserv/cfgstuff/httpd-2.2.conf.in 9 Apr 2009 16:07:53 -0000 +@@ -137,12 +137,10 @@ + LoadModule actions_module @moddir@/mod_actions.so + LoadModule alias_module @moddir@/mod_alias.so + LoadModule rewrite_module @moddir@/mod_rewrite.so + LoadModule cache_module @moddir@/mod_cache.so + LoadModule disk_cache_module @moddir@/mod_disk_cache.so +-LoadModule file_cache_module @moddir@/mod_file_cache.so +-LoadModule mem_cache_module @moddir@/mod_mem_cache.so + LoadModule cgi_module @moddir@/mod_cgi.so + LoadModule restartd_module @admmoddir@/mod_restartd.so + LoadModule nss_module @nssmoddir@/libmodnss.so + LoadModule admserv_module @admmoddir@/mod_admserv.so + diff --git a/sources b/sources index e69de29..dab224c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +6d9ba5141022e10696dc92f296ae5ed3 389-admin-1.1.8.tar.bz2 From b1c421365e5ae96948010ac49dcdc0610316e3f4 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 21 Jul 2009 12:56:12 +0000 Subject: [PATCH 03/22] use 389-adminutil instead of adminutil --- 389-admin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index bb77295..06d2eda 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -3,7 +3,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -21,7 +21,7 @@ BuildRequires: libicu-devel BuildRequires: httpd-devel BuildRequires: apr-devel BuildRequires: mod_nss -BuildRequires: adminutil-devel +BuildRequires: 389-adminutil-devel Requires: 389-ds-base Requires: mod_nss @@ -150,6 +150,9 @@ fi %{_mandir}/man8/* %changelog +* Tue Jul 21 Rich Megginson - 1.1.8-2 +- change adminutil to 389-adminutil + * Thu Jun 18 2009 Rich Megginson - 1.1.8-1 - bump version to 1.1.8 - change license to GPLv2 + ASL 2.0 From 19faebef567b9d5340ac82c1ad2b7363c247ba2c Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 21 Jul 2009 12:59:11 +0000 Subject: [PATCH 04/22] fix bad date --- 389-admin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/389-admin.spec b/389-admin.spec index 06d2eda..e9888a1 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -150,7 +150,7 @@ fi %{_mandir}/man8/* %changelog -* Tue Jul 21 Rich Megginson - 1.1.8-2 +* Tue Jul 21 2009 Rich Megginson - 1.1.8-2 - change adminutil to 389-adminutil * Thu Jun 18 2009 Rich Megginson - 1.1.8-1 From 80b02d6c3e36458792b3300895665e45435ad6dd Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 21 Jul 2009 15:38:09 +0000 Subject: [PATCH 05/22] final release of 1.1.8 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index dab224c..34ce3e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d9ba5141022e10696dc92f296ae5ed3 389-admin-1.1.8.tar.bz2 +44fa5cfbb7570ebb2cd775ac8379b5de 389-admin-1.1.8.tar.bz2 From 453defedc5344b8eb889a7b562b2e706f7b18d61 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 12 Aug 2009 20:00:08 +0000 Subject: [PATCH 06/22] final 1.1.8 release --- 389-admin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index e9888a1..97c3754 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -3,7 +3,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -150,6 +150,9 @@ fi %{_mandir}/man8/* %changelog +* Wed Aug 12 2009 Rich Megginson - 1.1.8-3 +- final rebuild for 1.1.8 release + * Tue Jul 21 2009 Rich Megginson - 1.1.8-2 - change adminutil to 389-adminutil diff --git a/sources b/sources index 34ce3e1..e994c5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -44fa5cfbb7570ebb2cd775ac8379b5de 389-admin-1.1.8.tar.bz2 +62d9c76e138e1421db7ca515e445f022 389-admin-1.1.8.tar.bz2 From e89a822f7a50ba38fa4bd91306fa748da9097a8a Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 25 Aug 2009 20:05:59 +0000 Subject: [PATCH 07/22] Resolves 518418 - Package rename shuts down server, results in unconfigured package rewrite perm/owner preservation code to use lua VS: ---------------------------------------------------------------------- --- 389-admin.spec | 104 ++++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 48 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index 97c3754..c9ae200 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -3,7 +3,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -79,54 +79,44 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la %clean rm -rf $RPM_BUILD_ROOT -%pre -# save permission info in temp file -# if upgrading -if [ "$1" -gt 1 ] ; then - set -x - mydt=`date +%Y%m%d` - mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID - perm1=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null` - if [ -z "$perm1" ] ; then - perm1=0 - fi - own1=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null` - if [ -z "$own1" ] ; then - own1=0 - fi - perm2=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null` - if [ -z "$perm2" ] ; then - perm2=0 - fi - own2=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null` - if [ -z "$own2" ] ; then - own2=0 - fi - echo $perm1 $own1 $perm2 $own2 > $mytmpfile -fi +%pre -p +-- save ownership/permissions on the dirs/files that rpm changes +-- if these don't exist, the vars will be nil +%{pkgname}admin_adminserv = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv') +%{pkgname}admin_consoleconf = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf') +-- save the run level configuration, if any +rc = os.execute('rpm --quiet -q fedora-ds-admin') +if rc == 0 then + %{pkgname}admin_exists = true + %{pkgname}admin_savelinks = {} + for dir in posix.files("%{_sysconfdir}/rc.d") do + if string.find(dir, "rc%d.d") then +-- print("looking in %{_sysconfdir}/rc.d/"..dir) + for link in posix.files("%{_sysconfdir}/rc.d/"..dir) do + if string.find(link, "[SK]%d%d%{pkgname}-admin") then + fullname = "%{_sysconfdir}/rc.d/"..dir.."/"..link + linked = posix.readlink(fullname) +-- print(fullname.." is linked to "..linked) + %{pkgname}_savelinks[fullname] = linked + end + end + end + end +end -%post -/sbin/chkconfig --add %{pkgname}-admin -/sbin/ldconfig -# if installing for the first time, make sure the config -# directory and file have the correct permissions -# the setup script is used to "fix" these -if [ "$1" -gt 1 ]; then - set -x - mydt=`date +%Y%m%d` - mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID - if [ ! -f $mytmpfile ] ; then - echo Error: upgrade temp file $mytmpfile not found - exit 1 - fi - cat $mytmpfile | while read perm1 own1 perm2 own2 ; do - chmod $perm1 %{_sysconfdir}/%{pkgname}/admin-serv - chown $own1 %{_sysconfdir}/%{pkgname}/admin-serv - chmod $perm2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf - chown $own2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf - done - rm -f $mytmpfile -fi +%post -p +-- do the usual daemon post setup stuff +os.execute('/sbin/chkconfig --add %{pkgname}-admin') +os.execute('/sbin/ldconfig') +-- restore permissions if upgrading +if %{pkgname}admin_adminserv then + posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv', %{pkgname}admin_adminserv.mode) + posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv', %{pkgname}admin_adminserv.uid, %{pkgname}admin_adminserv.gid) +end +if %{pkgname}admin_consoleconf then + posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.mode) + posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.uid, %{pkgname}admin_consoleconf.gid) +end %preun if [ $1 = 0 ]; then @@ -136,6 +126,19 @@ fi %postun -p /sbin/ldconfig +%posttrans -p +-- if we saved the run level configuration in %pre, restore it now +-- we can get rid of this code once Fedora 11 becomes obsolete +if %{pkgname}admin_savelinks then + for fullpath,link in pairs(%{pkgname}admin_savelinks) do + posix.symlink(link,fullpath) +-- print("posttrans - restored run level "..fullpath.." to "..link) + end +end +if %{pkgname}admin_exists then + os.execute('/sbin/service %{pkgname}-admin start >/dev/null 2>&1') +end + %files %defattr(-,root,root,-) %doc LICENSE @@ -150,6 +153,11 @@ fi %{_mandir}/man8/* %changelog +* Tue Aug 25 2009 Rich Megginson - 1.1.8-4 +- resolves 518418 - Package rename shuts down server, results in unconfigured package +- rewrite perm/owner preservation code to use lua +- add lua code to save run level configuration + * Wed Aug 12 2009 Rich Megginson - 1.1.8-3 - final rebuild for 1.1.8 release From 18e9a9a1fecfe1255a9918da48e64570e1221868 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 7 Oct 2009 15:50:27 +0000 Subject: [PATCH 08/22] This is the 1.1.9 release Added 389-admin-git-local.sh to construct a source tarball from a local git repo and a tag - also grabs the correct versions of mod_admserv and mod_restartd from CVS --- .cvsignore | 2 +- 389-admin-git-local.sh | 18 ++++++++++++++++++ 389-admin.spec | 7 +++++-- sources | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100755 389-admin-git-local.sh diff --git a/.cvsignore b/.cvsignore index b8f0cd0..072960f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.8.tar.bz2 +389-admin-1.1.9.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh new file mode 100755 index 0000000..2916ee8 --- /dev/null +++ b/389-admin-git-local.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +DATE=`date +%Y%m%d` +TAG=389-admin-1.1.9 +CVSTAG=three89Admin_1_1_9 +VERSION=1.1.9 +PKGNAME=389-admin +SRCNAME=${PKGNAME}-${VERSION} +CVSROOT=:pserver:anonymous@cvs.fedoraproject.org:/cvs/dirsec +echo you must be in the admin server git repo to use this +git status > /dev/null || echo bye +if [ -z "$1" ] ; then + dir=. +else + dir="$1" +fi +git archive --format=tar --prefix=$SRCNAME/ $TAG | ( cd $dir ; tar xf - ; cd $SRCNAME ; cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd ; cd .. ; tar cfj $dir/$SRCNAME.tar.bz2 $SRCNAME ) +rm -rf $dir/$SRCNAME diff --git a/389-admin.spec b/389-admin.spec index c9ae200..64d45cc 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -2,8 +2,8 @@ Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.8 -Release: 4%{?dist} +Version: 1.1.9 +Release: 1%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -153,6 +153,9 @@ end %{_mandir}/man8/* %changelog +* Mon Sep 14 2009 Rich Megginson - 1.1.9-1 +- the 1.1.9 release + * Tue Aug 25 2009 Rich Megginson - 1.1.8-4 - resolves 518418 - Package rename shuts down server, results in unconfigured package - rewrite perm/owner preservation code to use lua diff --git a/sources b/sources index e994c5d..63cc2ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62d9c76e138e1421db7ca515e445f022 389-admin-1.1.8.tar.bz2 +1f84413babbcd29035b8707f2ee9cea1 389-admin-1.1.9.tar.bz2 From 0fca043a625c428058368556614391b158bad47c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:49:51 +0000 Subject: [PATCH 09/22] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1ae5393..e5424cf 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := 389-admin 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 5462cd5fd05746bdc54e3e600528db1c13419a46 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Fri, 18 Dec 2009 16:24:24 +0000 Subject: [PATCH 10/22] this is the 1.1.10.a1 release --- .cvsignore | 2 +- 389-admin-git-local.sh | 11 ++++------- 389-admin-git.sh | 20 +++++++------------- 389-admin.spec | 17 ++++++++++++----- sources | 2 +- 5 files changed, 25 insertions(+), 27 deletions(-) diff --git a/.cvsignore b/.cvsignore index 072960f..5e3c25e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.9.tar.bz2 +389-admin-1.1.10.a1.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 2916ee8..14a3cfa 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,18 +1,15 @@ #!/bin/bash DATE=`date +%Y%m%d` -TAG=389-admin-1.1.9 -CVSTAG=three89Admin_1_1_9 -VERSION=1.1.9 +VERSION=1.1.10.a1 PKGNAME=389-admin +TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} -CVSROOT=:pserver:anonymous@cvs.fedoraproject.org:/cvs/dirsec echo you must be in the admin server git repo to use this -git status > /dev/null || echo bye +test -d .git || {echo bye ; exit 1 } if [ -z "$1" ] ; then dir=. else dir="$1" fi -git archive --format=tar --prefix=$SRCNAME/ $TAG | ( cd $dir ; tar xf - ; cd $SRCNAME ; cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd ; cd .. ; tar cfj $dir/$SRCNAME.tar.bz2 $SRCNAME ) -rm -rf $dir/$SRCNAME +git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2 diff --git a/389-admin-git.sh b/389-admin-git.sh index d827a65..d954158 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,22 +1,16 @@ #!/bin/bash DATE=`date +%Y%m%d` -TAG=HEAD -VERSION=1.1.7 +VERSION=1.1.10.a1 PKGNAME=389-admin -export URL=git://git.fedorahosted.org/git/389/admin.git #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION +TAG=${PKGNAME}-${VERSION} +URL="http://git.fedorahosted.org/git/?p=389/admin.git;a=snapshot;h=$TAG;sf=tgz" -git clone $URL -cd admin.git -git archive --prefix=$SRCNAME/ $TAG | bzip2 > $SRCNAME.tar.bz2 -#cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME adminserver -#cd $SRCNAME -#cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd -#cd .. +wget -O $SRCNAME.tar.gz "$URL" -#tar -cjf $SRCNAME.tar.bz2 $SRCNAME +echo convert tgz format to tar.bz2 format -cd .. -rm -rf admin.git +gunzip $PKGNAME-$VERSION.tar.gz +bzip2 $PKGNAME-$VERSION.tar diff --git a/389-admin.spec b/389-admin.spec index 64d45cc..13ae1d4 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,9 +1,13 @@ -%define pkgname dirsrv +%global pkgname dirsrv +# for a pre-release, define the prerel field - comment out for official release +%global prerel .a1 +# also need the relprefix field for a pre-release - also comment out for official release +%global relprefix 0. Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.9 -Release: 1%{?dist} +Version: 1.1.10 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -34,7 +38,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -Source0: http://port389.org/sources/%{name}-%{version}.tar.bz2 +Source0: http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2 # 389-admin-git.sh should be used to generate the source tarball from git Source1: %{name}-git.sh Patch1: f11-httpd.patch @@ -46,7 +50,7 @@ be used through a web browser. It provides the authentication, access control, and CGI utilities used by the console. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}%{?prerel} %patch1 %build @@ -153,6 +157,9 @@ end %{_mandir}/man8/* %changelog +* Thu Oct 8 2009 Rich Megginson - 1.1.10.a1-1 +- the 1.1.10.a1 release + * Mon Sep 14 2009 Rich Megginson - 1.1.9-1 - the 1.1.9 release diff --git a/sources b/sources index 63cc2ec..d48c81b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f84413babbcd29035b8707f2ee9cea1 389-admin-1.1.9.tar.bz2 +b0fb7b83b06513cbe9b31c6195ea5202 389-admin-1.1.10.a1.tar.bz2 From def76e0ffecbe4eedd5da6973cc87f4c98b083b2 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Fri, 18 Dec 2009 17:52:09 +0000 Subject: [PATCH 11/22] bump version to 1.1.10.a2 - fix genrb path problem --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 8 ++++++-- sources | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5e3c25e..345ada8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.10.a1.tar.bz2 +389-admin-1.1.10.a2.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 14a3cfa..ca2be77 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.10.a1 +VERSION=1.1.10.a2 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index d954158..2c95e9d 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.10.a1 +VERSION=1.1.10.a2 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 13ae1d4..88ef5fd 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,13 +1,13 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a1 +%global prerel .a2 # also need the relprefix field for a pre-release - also comment out for official release %global relprefix 0. Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.10 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -157,6 +157,10 @@ end %{_mandir}/man8/* %changelog +* Fri Dec 18 2009 Rich Megginson - 1.1.10.a2-0.2 +- the 1.1.10.a2 release +- fix problem with genrb path on F-12 and later + * Thu Oct 8 2009 Rich Megginson - 1.1.10.a1-1 - the 1.1.10.a1 release diff --git a/sources b/sources index d48c81b..1d0b680 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0fb7b83b06513cbe9b31c6195ea5202 389-admin-1.1.10.a1.tar.bz2 +092b48ed6503f37d58b19acda13c5cb9 389-admin-1.1.10.a2.tar.bz2 From db21b436d8012afaf52c910bf2568bc5a6e78fbd Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 14 Jan 2010 22:39:04 +0000 Subject: [PATCH 12/22] this is the 1.1.10.a3 release - address some ICU genrb related build issues on rawhide and other platforms --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 8 ++++++-- sources | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 345ada8..813d9fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.10.a2.tar.bz2 +389-admin-1.1.10.a3.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index ca2be77..1bfac57 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.10.a2 +VERSION=1.1.10.a3 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 2c95e9d..a40a437 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.10.a2 +VERSION=1.1.10.a3 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 88ef5fd..1629d04 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,13 +1,13 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a2 +%global prerel .a3 # also need the relprefix field for a pre-release - also comment out for official release %global relprefix 0. Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.10 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}3%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -157,6 +157,10 @@ end %{_mandir}/man8/* %changelog +* Thu Jan 14 2010 Rich Megginson - 1.1.10.a3-0.3 +- the 1.1.10.a3 release +- make sure we can find ICU genrb on all platforms + * Fri Dec 18 2009 Rich Megginson - 1.1.10.a2-0.2 - the 1.1.10.a2 release - fix problem with genrb path on F-12 and later diff --git a/sources b/sources index 1d0b680..1eae96b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -092b48ed6503f37d58b19acda13c5cb9 389-admin-1.1.10.a2.tar.bz2 +9379a20ef8ea32d779eb9b034048036a 389-admin-1.1.10.a3.tar.bz2 From 54cf04a0fa4ccae73ae4c29888b436fb1d47dcf5 Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Tue, 19 Jan 2010 19:39:44 +0000 Subject: [PATCH 13/22] Added SELinux subpackage --- 389-admin.spec | 82 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 3 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index 1629d04..81d77ab 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,13 +1,15 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a3 +%global prerel .a4 # also need the relprefix field for a pre-release - also comment out for official release %global relprefix 0. +%global selinux_variants mls targeted + Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.10 -Release: %{?relprefix}3%{?prerel}%{?dist} +Release: %{?relprefix}4%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -27,6 +29,12 @@ BuildRequires: apr-devel BuildRequires: mod_nss BuildRequires: 389-adminutil-devel +# The following are needed to build the SELinux policy +BuildRequires: checkpolicy +BuildRequires: selinux-policy-devel +BuildRequires: /usr/share/selinux/devel/Makefile +BuildRequires: 389-ds-base-selinux-devel + Requires: 389-ds-base Requires: mod_nss # the following are needed for some of our scripts @@ -49,12 +57,22 @@ for 389 Directory Server. It provides some management web apps that can be used through a web browser. It provides the authentication, access control, and CGI utilities used by the console. +%package selinux +Summary: SELinux policy for 389 Administration Server +Group: System Environment/Daemons +Requires: selinux-policy +Requires: %{name} = %{version}-%{release} +Requires: 389-ds-base-selinux + +%description selinux +SELinux policy for the 389 Adminstration Server package. + %prep %setup -q -n %{name}-%{version}%{?prerel} %patch1 %build -%configure --disable-rpath +%configure --disable-rpath --with-selinux # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -65,6 +83,18 @@ export USE_64=1 make %{?_smp_mflags} +# Build the SELinux policy module for each variant +cd selinux-built +cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.if . +cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.te . +for selinuxvariant in %{selinux_variants} +do + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + mv %{pkgname}-admin.pp %{pkgname}-admin.pp.${selinuxvariant} + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean +done +cd - + %install rm -rf $RPM_BUILD_ROOT @@ -80,6 +110,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la +# Install the SELinux policy +cd selinux-built +for selinuxvariant in %{selinux_variants} +do + install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + install -p -m 644 %{pkgname}-admin.pp.${selinuxvariant} \ + %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp +done +cd - + %clean rm -rf $RPM_BUILD_ROOT @@ -143,6 +183,34 @@ if %{pkgname}admin_exists then os.execute('/sbin/service %{pkgname}-admin 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}-admin.pp 2>/dev/null || : +done +fixfiles -R %{name} restore || : +/sbin/service %{pkgname}-admin 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}-admin 2>/dev/null || : +done +fixfiles -R %{name} restore || : +/sbin/service %{pkgname}-admin 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}-admin.pp 2>/dev/null || : +done +fi + %files %defattr(-,root,root,-) %doc LICENSE @@ -156,7 +224,15 @@ end %{_libdir}/%{pkgname} %{_mandir}/man8/* +%files selinux +%defattr(-,root,root,-) +%{_datadir}/selinux/*/%{pkgname}-admin.pp + %changelog +* Mon Jan 18 2010 Nathan Kinder - 1.1.10.a4-0.4 +- the 1.1.10.a4 release +- added SELinux subpackage + * Thu Jan 14 2010 Rich Megginson - 1.1.10.a3-0.3 - the 1.1.10.a3 release - make sure we can find ICU genrb on all platforms From 3eb9c395312401f32667ad04b0888e7466e16ac9 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 21 Jan 2010 00:04:27 +0000 Subject: [PATCH 14/22] this is the 1.1.10 release --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 86 ++++-------------------------------------- sources | 2 +- 5 files changed, 11 insertions(+), 83 deletions(-) diff --git a/.cvsignore b/.cvsignore index 813d9fb..8f9b5c4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.10.a3.tar.bz2 +389-admin-1.1.10.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 1bfac57..fc60ec7 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.10.a3 +VERSION=1.1.10 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index a40a437..1786739 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.10.a3 +VERSION=1.1.10 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 81d77ab..dfa0401 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,15 +1,13 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a4 +###%global prerel # also need the relprefix field for a pre-release - also comment out for official release -%global relprefix 0. - -%global selinux_variants mls targeted +###%global relprefix Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.10 -Release: %{?relprefix}4%{?prerel}%{?dist} +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -29,12 +27,6 @@ BuildRequires: apr-devel BuildRequires: mod_nss BuildRequires: 389-adminutil-devel -# The following are needed to build the SELinux policy -BuildRequires: checkpolicy -BuildRequires: selinux-policy-devel -BuildRequires: /usr/share/selinux/devel/Makefile -BuildRequires: 389-ds-base-selinux-devel - Requires: 389-ds-base Requires: mod_nss # the following are needed for some of our scripts @@ -57,22 +49,12 @@ for 389 Directory Server. It provides some management web apps that can be used through a web browser. It provides the authentication, access control, and CGI utilities used by the console. -%package selinux -Summary: SELinux policy for 389 Administration Server -Group: System Environment/Daemons -Requires: selinux-policy -Requires: %{name} = %{version}-%{release} -Requires: 389-ds-base-selinux - -%description selinux -SELinux policy for the 389 Adminstration Server package. - %prep %setup -q -n %{name}-%{version}%{?prerel} %patch1 %build -%configure --disable-rpath --with-selinux +%configure --disable-rpath # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -83,18 +65,6 @@ export USE_64=1 make %{?_smp_mflags} -# Build the SELinux policy module for each variant -cd selinux-built -cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.if . -cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.te . -for selinuxvariant in %{selinux_variants} -do - make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile - mv %{pkgname}-admin.pp %{pkgname}-admin.pp.${selinuxvariant} - make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean -done -cd - - %install rm -rf $RPM_BUILD_ROOT @@ -110,16 +80,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la -# Install the SELinux policy -cd selinux-built -for selinuxvariant in %{selinux_variants} -do - install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 %{pkgname}-admin.pp.${selinuxvariant} \ - %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp -done -cd - - %clean rm -rf $RPM_BUILD_ROOT @@ -183,34 +143,6 @@ if %{pkgname}admin_exists then os.execute('/sbin/service %{pkgname}-admin 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}-admin.pp 2>/dev/null || : -done -fixfiles -R %{name} restore || : -/sbin/service %{pkgname}-admin 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}-admin 2>/dev/null || : -done -fixfiles -R %{name} restore || : -/sbin/service %{pkgname}-admin 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}-admin.pp 2>/dev/null || : -done -fi - %files %defattr(-,root,root,-) %doc LICENSE @@ -224,14 +156,10 @@ fi %{_libdir}/%{pkgname} %{_mandir}/man8/* -%files selinux -%defattr(-,root,root,-) -%{_datadir}/selinux/*/%{pkgname}-admin.pp - %changelog -* Mon Jan 18 2010 Nathan Kinder - 1.1.10.a4-0.4 -- the 1.1.10.a4 release -- added SELinux subpackage +* Wed Jan 20 2010 Rich Megginson - 1.1.10-1 +- the 1.1.10 release +- allow server to run unconfined if not built with selinux support * Thu Jan 14 2010 Rich Megginson - 1.1.10.a3-0.3 - the 1.1.10.a3 release diff --git a/sources b/sources index 1eae96b..3bff33f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9379a20ef8ea32d779eb9b034048036a 389-admin-1.1.10.a3.tar.bz2 +55f4b856e31916a7fa05afe5b15be9c4 389-admin-1.1.10.tar.bz2 From 31c893f6f3fac30115c3cd7679218dba818a532a Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 26 Jan 2010 02:19:01 +0000 Subject: [PATCH 15/22] this is the 1.1.11.a1 release - this is the first release that supports SELinux enforcement --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 86 +++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 5 files changed, 85 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8f9b5c4..bf52f93 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.10.tar.bz2 +389-admin-1.1.11.a1.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index fc60ec7..a96a3e6 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.10 +VERSION=1.1.11.a1 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 1786739..cd4c85f 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.10 +VERSION=1.1.11.a1 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index dfa0401..0656a19 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,12 +1,14 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -###%global prerel -# also need the relprefix field for a pre-release - also comment out for official release -###%global relprefix +%global prerel .a1 +# also need the relprefix 0. field for a pre-release - also comment out for official release +%global relprefix 0. + +%global selinux_variants mls targeted Summary: 389 Administration Server (admin) Name: 389-admin -Version: 1.1.10 +Version: 1.1.11 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -27,6 +29,12 @@ BuildRequires: apr-devel BuildRequires: mod_nss BuildRequires: 389-adminutil-devel +# The following are needed to build the SELinux policy +BuildRequires: checkpolicy +BuildRequires: selinux-policy-devel +BuildRequires: /usr/share/selinux/devel/Makefile +BuildRequires: 389-ds-base-selinux-devel + Requires: 389-ds-base Requires: mod_nss # the following are needed for some of our scripts @@ -49,12 +57,22 @@ for 389 Directory Server. It provides some management web apps that can be used through a web browser. It provides the authentication, access control, and CGI utilities used by the console. +%package selinux +Summary: SELinux policy for 389 Administration Server +Group: System Environment/Daemons +Requires: selinux-policy +Requires: %{name} = %{version}-%{release} +Requires: 389-ds-base-selinux + +%description selinux +SELinux policy for the 389 Adminstration Server package. + %prep %setup -q -n %{name}-%{version}%{?prerel} %patch1 %build -%configure --disable-rpath +%configure --disable-rpath --with-selinux # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -65,6 +83,18 @@ export USE_64=1 make %{?_smp_mflags} +# Build the SELinux policy module for each variant +cd selinux-built +cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.if . +cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.te . +for selinuxvariant in %{selinux_variants} +do + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + mv %{pkgname}-admin.pp %{pkgname}-admin.pp.${selinuxvariant} + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean +done +cd - + %install rm -rf $RPM_BUILD_ROOT @@ -80,6 +110,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la +# Install the SELinux policy +cd selinux-built +for selinuxvariant in %{selinux_variants} +do + install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + install -p -m 644 %{pkgname}-admin.pp.${selinuxvariant} \ + %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp +done +cd - + %clean rm -rf $RPM_BUILD_ROOT @@ -143,6 +183,34 @@ if %{pkgname}admin_exists then os.execute('/sbin/service %{pkgname}-admin 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}-admin.pp 2>/dev/null || : +done +fixfiles -R %{name} restore || : +/sbin/service %{pkgname}-admin 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}-admin 2>/dev/null || : +done +fixfiles -R %{name} restore || : +/sbin/service %{pkgname}-admin 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}-admin.pp 2>/dev/null || : +done +fi + %files %defattr(-,root,root,-) %doc LICENSE @@ -156,7 +224,15 @@ end %{_libdir}/%{pkgname} %{_mandir}/man8/* +%files selinux +%defattr(-,root,root,-) +%{_datadir}/selinux/*/%{pkgname}-admin.pp + %changelog +* Thu Jan 21 2010 Nathan Kinder - 1.1.11.a1-0.1 +- the 1.1.11.a1 release +- added SELinux subpackage + * Wed Jan 20 2010 Rich Megginson - 1.1.10-1 - the 1.1.10 release - allow server to run unconfined if not built with selinux support diff --git a/sources b/sources index 3bff33f..7dfa470 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55f4b856e31916a7fa05afe5b15be9c4 389-admin-1.1.10.tar.bz2 +2d5c5e2058429086bbced744590aba7f 389-admin-1.1.11.a1.tar.bz2 From 8194cf1e66bb7eba963e8cbb5ab1c6600c89ff53 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Sat, 27 Feb 2010 02:08:55 +0000 Subject: [PATCH 16/22] the 1.1.11.a2 release Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location Bug 460209 - Correct configure help message Bug 560827 - Admin Server: DistinguishName validation fails Make check for threaded httpd work with Apache 2.0 --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 11 +++++++++-- sources | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index bf52f93..23e0e29 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.11.a1.tar.bz2 +389-admin-1.1.11.a2.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index a96a3e6..92663c5 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11.a1 +VERSION=1.1.11.a2 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index cd4c85f..d247d5f 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11.a1 +VERSION=1.1.11.a2 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 0656a19..f2d9312 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,6 +1,6 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a1 +%global prerel .a2 # also need the relprefix 0. field for a pre-release - also comment out for official release %global relprefix 0. @@ -9,7 +9,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.11 -Release: %{?relprefix}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -229,6 +229,13 @@ fi %{_datadir}/selinux/*/%{pkgname}-admin.pp %changelog +* Fri Feb 26 2010 Rich Megginson - 1.1.11.a2-0.2 +- the 1.1.11.a2 release +- Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location +- Bug 460209 - Correct configure help message +- Bug 560827 - Admin Server: DistinguishName validation fails +- Make check for threaded httpd work with Apache 2.0 + * Thu Jan 21 2010 Nathan Kinder - 1.1.11.a1-0.1 - the 1.1.11.a1 release - added SELinux subpackage diff --git a/sources b/sources index 7dfa470..ad5c992 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d5c5e2058429086bbced744590aba7f 389-admin-1.1.11.a1.tar.bz2 +0148b864e82a79d4cc9e5340befce8b9 389-admin-1.1.11.a2.tar.bz2 From 3ca1810a36a7a572326edea85533d45997ed727e Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Tue, 6 Apr 2010 19:12:46 +0000 Subject: [PATCH 17/22] Updated spec files for 1.1.11.a3 release. --- 389-admin.spec | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index f2d9312..721bf8c 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,6 +1,6 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a2 +%global prerel .a3 # also need the relprefix 0. field for a pre-release - also comment out for official release %global relprefix 0. @@ -9,7 +9,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.11 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}3%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -37,6 +37,13 @@ BuildRequires: 389-ds-base-selinux-devel Requires: 389-ds-base Requires: mod_nss + +# 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: perl-Mozilla-LDAP Requires: nss-tools @@ -61,9 +68,15 @@ and CGI utilities used by the console. Summary: SELinux policy for 389 Administration Server Group: System Environment/Daemons Requires: selinux-policy -Requires: %{name} = %{version}-%{release} Requires: 389-ds-base-selinux +# 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 Adminstration Server package. @@ -229,6 +242,12 @@ fi %{_datadir}/selinux/*/%{pkgname}-admin.pp %changelog +* Tue Apr 6 2010 Nathan Kinder - 1.1.11-0.3.a3 +- 1.1.11.a3 release +- Bug 570912 - dirsrv-admin SELinux module fails to install +- Change parsing of start-slapd for instance name +- Bug 574233 - Updated requirements for selinux subpackage + * Fri Feb 26 2010 Rich Megginson - 1.1.11.a2-0.2 - the 1.1.11.a2 release - Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location From 63e602777816a71785695063730a1e7abb05c686 Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Wed, 7 Apr 2010 22:44:39 +0000 Subject: [PATCH 18/22] Moved selinux subpackage into base package. --- 389-admin.spec | 82 ++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 53 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index 721bf8c..2bf38a2 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -16,6 +16,7 @@ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: fedora-ds-admin = %{version}-%{release} Obsoletes: fedora-ds-admin < 1.1.8-1 +Obsoletes: %{name}-selinux BuildRequires: nspr-devel BuildRequires: nss-devel @@ -38,12 +39,14 @@ BuildRequires: 389-ds-base-selinux-devel Requires: 389-ds-base Requires: mod_nss -# require our selinux subpackage -Requires: %{name}-selinux = %{version}-%{release} - # this is needed for using semanage from our setup scripts Requires: policycoreutils-python +# this is needed to load and unload the policy module +Requires(post): policycoreutils +Requires(preun): policycoreutils +Requires(postun): policycoreutils + # the following are needed for some of our scripts Requires: perl-Mozilla-LDAP Requires: nss-tools @@ -64,22 +67,6 @@ for 389 Directory Server. It provides some management web apps that can be used through a web browser. It provides the authentication, access control, and CGI utilities used by the console. -%package selinux -Summary: SELinux policy for 389 Administration Server -Group: System Environment/Daemons -Requires: selinux-policy -Requires: 389-ds-base-selinux - -# 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 Adminstration Server package. - %prep %setup -q -n %{name}-%{version}%{?prerel} %patch1 @@ -174,14 +161,32 @@ if %{pkgname}admin_consoleconf then posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.mode) posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.uid, %{pkgname}admin_consoleconf.gid) 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}-admin.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 /sbin/service %{pkgname}-admin stop >/dev/null 2>&1 || : /sbin/chkconfig --del %{pkgname}-admin + for selinuxvariant in %{selinux_variants} + do + semodule -s ${selinuxvariant} -r %{pkgname}-admin 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}-admin.pp 2>/dev/null || : +done +fi %posttrans -p -- if we saved the run level configuration in %pre, restore it now @@ -196,33 +201,6 @@ if %{pkgname}admin_exists then os.execute('/sbin/service %{pkgname}-admin 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}-admin.pp 2>/dev/null || : -done -fixfiles -R %{name} restore || : -/sbin/service %{pkgname}-admin 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}-admin 2>/dev/null || : -done -fixfiles -R %{name} restore || : -/sbin/service %{pkgname}-admin 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}-admin.pp 2>/dev/null || : -done -fi %files %defattr(-,root,root,-) @@ -230,6 +208,7 @@ fi %dir %{_sysconfdir}/%{pkgname}/admin-serv %config(noreplace)%{_sysconfdir}/%{pkgname}/admin-serv/*.conf %{_datadir}/%{pkgname} +%{_datadir}/selinux/*/%{pkgname}-admin.pp %{_sysconfdir}/rc.d/init.d/%{pkgname}-admin %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}-admin %{_sbindir}/* @@ -237,16 +216,13 @@ fi %{_libdir}/%{pkgname} %{_mandir}/man8/* -%files selinux -%defattr(-,root,root,-) -%{_datadir}/selinux/*/%{pkgname}-admin.pp - %changelog -* Tue Apr 6 2010 Nathan Kinder - 1.1.11-0.3.a3 +* Tue Apr 7 2010 Nathan Kinder - 1.1.11-0.3.a3 - 1.1.11.a3 release - Bug 570912 - dirsrv-admin SELinux module fails to install - Change parsing of start-slapd for instance name -- Bug 574233 - Updated requirements for selinux subpackage +- Bug 574233 - Updated requirements for selinux policy +- Moved selinux subpackage into base package * Fri Feb 26 2010 Rich Megginson - 1.1.11.a2-0.2 - the 1.1.11.a2 release From 39844f49009f6d2d505ed5c5c73d8d2ce7d0c4f8 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 15 Apr 2010 18:15:17 +0000 Subject: [PATCH 19/22] sources for the 1.1.11.a3 release --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 23e0e29..4d9fb8f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.11.a2.tar.bz2 +389-admin-1.1.11.a3.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 92663c5..4e29007 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11.a2 +VERSION=1.1.11.a3 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index d247d5f..c2e7c20 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11.a2 +VERSION=1.1.11.a3 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/sources b/sources index ad5c992..06f3f2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0148b864e82a79d4cc9e5340befce8b9 389-admin-1.1.11.a2.tar.bz2 +24ccd2beb11d7e120b24af38149e4b70 389-admin-1.1.11.a3.tar.bz2 From 13ae0df0e69149665a3e753d0ba9990c7c773495 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 26 May 2010 21:48:14 +0000 Subject: [PATCH 20/22] this is the 1.1.11.a4 release --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 7 +++++-- sources | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4d9fb8f..f68ed43 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.11.a3.tar.bz2 +389-admin-1.1.11.a4.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 4e29007..e39a982 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11.a3 +VERSION=1.1.11.a4 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index c2e7c20..005adc3 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11.a3 +VERSION=1.1.11.a4 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index 2bf38a2..fe81d10 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,6 +1,6 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a3 +%global prerel .a4 # also need the relprefix 0. field for a pre-release - also comment out for official release %global relprefix 0. @@ -9,7 +9,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.11 -Release: %{?relprefix}3%{?prerel}%{?dist} +Release: %{?relprefix}4%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -217,6 +217,9 @@ end %{_mandir}/man8/* %changelog +* Wed May 26 2010 Rich Megginson - 1.1.11-0.4.a4 +- 1.1.11.a4 release + * Tue Apr 7 2010 Nathan Kinder - 1.1.11-0.3.a3 - 1.1.11.a3 release - Bug 570912 - dirsrv-admin SELinux module fails to install diff --git a/sources b/sources index 06f3f2c..4f3877c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24ccd2beb11d7e120b24af38149e4b70 389-admin-1.1.11.a3.tar.bz2 +e7404ffd7245d7a88e09ca5f627ec339 389-admin-1.1.11.a4.tar.bz2 From 4f2637ae3e33cbcb96da0fc36ea8f725386a710e Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 9 Jun 2010 15:03:24 +0000 Subject: [PATCH 21/22] this is the 1.1.11.rc1 release --- .cvsignore | 2 +- 389-admin-git-local.sh | 2 +- 389-admin-git.sh | 2 +- 389-admin.spec | 7 +++++-- sources | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index f68ed43..bc5278c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-1.1.11.a4.tar.bz2 +389-admin-1.1.11.rc1.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index e39a982..0e3bcb5 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11.a4 +VERSION=1.1.11.rc1 PKGNAME=389-admin TAG=${TAG:-$PKGNAME-$VERSION} SRCNAME=${PKGNAME}-${VERSION} diff --git a/389-admin-git.sh b/389-admin-git.sh index 005adc3..e06144b 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11.a4 +VERSION=1.1.11.rc1 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index fe81d10..a464b4d 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,6 +1,6 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -%global prerel .a4 +%global prerel .rc1 # also need the relprefix 0. field for a pre-release - also comment out for official release %global relprefix 0. @@ -9,7 +9,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.11 -Release: %{?relprefix}4%{?prerel}%{?dist} +Release: %{?relprefix}5%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://port389.org/ Group: System Environment/Daemons @@ -217,6 +217,9 @@ end %{_mandir}/man8/* %changelog +* Wed Jun 9 2010 Rich Megginson - 1.1.11-0.5.rc1 +- 1.1.11.rc1 release + * Wed May 26 2010 Rich Megginson - 1.1.11-0.4.a4 - 1.1.11.a4 release diff --git a/sources b/sources index 4f3877c..dbbfb93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7404ffd7245d7a88e09ca5f627ec339 389-admin-1.1.11.a4.tar.bz2 +fc80b47ce1e5bd39d8e5632dd359d1df 389-admin-1.1.11.rc1.tar.bz2 From 19edf2543deb2757230282039cbed321239816e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:43:40 +0000 Subject: [PATCH 22/22] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 e5424cf..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 389-admin -# $Id$ -NAME := 389-admin -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11