[389-admin/f13] 389-admin-1.1.17
Richard Allen Megginson
rmeggins at fedoraproject.org
Thu Jun 2 16:11:26 UTC 2011
commit 69d6812fbbec61bfcfb6264ccb906eca3b2eb021
Author: Rich Megginson <rmeggins at redhat.com>
Date: Tue May 31 17:00:25 2011 -0600
389-admin-1.1.17
389-admin-1.1.17
support "in-place" upgrade and rebranding from Red Hat to 389
many fixes for coverity issues
.gitignore | 1 +
389-admin-git-local.sh | 2 +-
389-admin-git.sh | 2 +-
389-admin.spec | 44 ++++++--------------------------------------
sources | 2 +-
5 files changed, 10 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d022d6f..d474e3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/389-admin-1.1.14.tar.bz2
/389-admin-1.1.15.tar.bz2
/389-admin-1.1.16.tar.bz2
+/389-admin-1.1.17.tar.bz2
diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh
index 571011c..06317f9 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.16
+VERSION=1.1.17
PKGNAME=389-admin
TAG=${TAG:-$PKGNAME-$VERSION}
SRCNAME=${PKGNAME}-${VERSION}
diff --git a/389-admin-git.sh b/389-admin-git.sh
index dd71536..31f2541 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.15
+VERSION=1.1.17
PKGNAME=389-admin
#SRCNAME=$PKGNAME-$VERSION-$DATE
SRCNAME=$PKGNAME-$VERSION
diff --git a/389-admin.spec b/389-admin.spec
index fd77738..ea16c7e 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -6,16 +6,12 @@
Summary: 389 Administration Server (admin)
Name: 389-admin
-Version: 1.1.16
+Version: 1.1.17
Release: %{?relprefix}1%{?prerel}%{?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
-Obsoletes: %{name}-selinux
-Conflicts: selinux-policy-base < 3.7.19-72
BuildRequires: nspr-devel
BuildRequires: nss-devel
@@ -99,25 +95,6 @@ rm -rf $RPM_BUILD_ROOT
-- 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 -p <lua>
-- do the usual daemon post setup stuff
@@ -142,20 +119,6 @@ fi
%postun
/sbin/ldconfig
-%posttrans -p <lua>
--- 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
@@ -170,6 +133,11 @@ end
%{_mandir}/man8/*
%changelog
+* Fri May 13 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.17-1
+- 1.1.17
+- support "in-place" upgrade and rebranding from Red Hat to 389
+- many fixes for coverity issues
+
* Tue Mar 29 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.16-1
- 389-admin-1.1.16
- Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user
diff --git a/sources b/sources
index 4c9fd67..921ca09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6122af6b9d21829ab939ab286676aedf 389-admin-1.1.16.tar.bz2
+f4d8db9be619f4dbfcaafe46fe6e10fb 389-admin-1.1.17.tar.bz2
More information about the scm-commits
mailing list