From 982594b3eb80f7a701ea75076845c8fa31570000 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 23 Jun 2009 02:28:52 +0000 Subject: [PATCH 01/10] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 06511bfffc393ef361a0152423253116b14f6100 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 23 Jun 2009 02:39:41 +0000 Subject: [PATCH 02/10] initial commit on all branches --- .cvsignore | 1 + 389-admin-git.sh | 22 ++++ 389-admin.spec | 296 +++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 320 insertions(+) create mode 100755 389-admin-git.sh create mode 100644 389-admin.spec 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..cbe86ed --- /dev/null +++ b/389-admin.spec @@ -0,0 +1,296 @@ +%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 + +%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} + +%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/sources b/sources index e69de29..dab224c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +6d9ba5141022e10696dc92f296ae5ed3 389-admin-1.1.8.tar.bz2 From f15d69e552b88b4009e53d055de307466db23a07 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 21 Jul 2009 12:56:12 +0000 Subject: [PATCH 03/10] 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 cbe86ed..21a649b 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 @@ -148,6 +148,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 e6aa104099510df72c61c5ae955ed6ffbf9d1dcc Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 21 Jul 2009 12:59:11 +0000 Subject: [PATCH 04/10] 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 21a649b..a379925 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -148,7 +148,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 eb45faa95281edcc1f837843de9ed807be664aa0 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 21 Jul 2009 15:38:08 +0000 Subject: [PATCH 05/10] 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 894666ce6cf11c538a3af014303050dbb236193c Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 12 Aug 2009 20:00:08 +0000 Subject: [PATCH 06/10] 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 a379925..b9434df 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 @@ -148,6 +148,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 ea32edc378c7321b479b218e047bf4b92332a901 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 25 Aug 2009 20:05:58 +0000 Subject: [PATCH 07/10] Resolves 518418 - Package rename shuts down server, results in unconfigured package rewrite perm/owner preservation code to use lua VS: ---------------------------------------------------------------------- --- 389-admin.spec | 106 +++++++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 48 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index b9434df..1b8fa94 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 @@ -77,54 +77,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 @@ -134,6 +124,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 @@ -148,6 +151,13 @@ 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 + +- 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 c8b03e80f4438e319bfa8f591d08f60991f3a765 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 7 Oct 2009 15:50:26 +0000 Subject: [PATCH 08/10] 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 1b8fa94..0612900 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 @@ -151,6 +151,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 b6b5087a39bac58b8e7003065234e1913b25faf0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:49:50 +0000 Subject: [PATCH 09/10] 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 159a39eb166faa3941eb36437d75516fea17870b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:43:35 +0000 Subject: [PATCH 10/10] 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10