Attachment 291184 Details for Bug 249548 – the real patch

[patch] the real patch

cvsdiffs (text/plain), 7.23 KB, created by Rich Megginson on 2008-01-09 18:51:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2008-01-09 18:51:45 UTC

Size: 7.23 KB

patch

obsolete

>Index: adminserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.38
>diff -u -8 -r1.38 Makefile.am
>--- adminserver/Makefile.am	17 Dec 2007 20:10:04 -0000	1.38
>+++ adminserver/Makefile.am	9 Jan 2008 18:32:23 -0000
>@@ -142,17 +142,17 @@
> if CXXLINK_REQUIRED
> MYLINK = $(CXXLINK)
> else
> MYLINK = $(LINK)
> endif
> 
> init_SCRIPTS = wrappers/$(PACKAGE_NAME)
> 
>-initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME)
>+initconfig_DATA = admserv/cfgstuff/$(PACKAGE_NAME)
> 
> ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
> 	admserv/schema/ldif/01nsroot.ldif.tmpl \
> 	admserv/schema/ldif/02globalpreferences.ldif.tmpl \
> 	admserv/schema/ldif/10dsdata.ldif.tmpl \
> 	admserv/schema/ldif/10rm_dsdata.ldif.tmpl \
> 	admserv/schema/ldif/11dstasks.ldif.tmpl \
> 	admserv/schema/ldif/12dsconfig.mod.tmpl \
>@@ -193,17 +193,17 @@
> 	admserv/cfgstuff/restart-ds-admin \
> 	admserv/cfgstuff/ds_removal \
> 	admserv/cfgstuff/ds_unregister
> 
> cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
> 	admserv/newinst/src/migrate-ds-admin.pl \
> 	admserv/newinst/src/register-ds-admin.pl
> 
>-perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \
>+perl_DATA = admserv/newinst/src/ASDialogs.pm \
> 	admserv/newinst/src/AdminUtil.pm \
> 	admserv/newinst/src/AdminServer.pm \
> 	admserv/newinst/src/ConfigDSDialogs.pm \
> 	admserv/newinst/src/AdminMigration.pm \
> 	admserv/newinst/src/RegDSDialogs.pm
> 
> libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
> libds_admin_serv_la_LINK = $(MYLINK)
>Index: adminserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminserver/configure.ac,v
>retrieving revision 1.24
>diff -u -8 -r1.24 configure.ac
>--- adminserver/configure.ac	18 Dec 2007 19:55:22 -0000	1.24
>+++ adminserver/configure.ac	9 Jan 2008 18:32:23 -0000
>@@ -1,13 +1,13 @@
> #                                               -*- Autoconf -*-
> # Process this file with autoconf to produce a configure script.
> 
> AC_PREREQ(2.59)
>-AC_INIT([dirsrv-admin], [1.1.1], [http://bugzilla.redhat.com/])
>+AC_INIT([dirsrv-admin], [1.1.2], [http://bugzilla.redhat.com/])
> AC_CONFIG_SRCDIR([admserv/cgi-src40/viewlog.c])
> AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
> AM_MAINTAINER_MODE
> AC_CANONICAL_HOST
> 
> AC_CONFIG_HEADER([config.h])
> 
> # Checks for programs.
>Index: adminserver/pkg/fedora-ds-admin.spec
>===================================================================
>RCS file: /cvs/dirsec/adminserver/pkg/fedora-ds-admin.spec,v
>retrieving revision 1.2
>diff -u -8 -r1.2 fedora-ds-admin.spec
>--- adminserver/pkg/fedora-ds-admin.spec	12 Dec 2007 01:26:27 -0000	1.2
>+++ adminserver/pkg/fedora-ds-admin.spec	9 Jan 2008 18:32:23 -0000
>@@ -1,14 +1,14 @@
> %define shortname fedora-ds
> %define pkgname   dirsrv
> 
> Summary:          Fedora Administration Server (admin)
> Name:             fedora-ds-admin
>-Version:          1.1.1
>+Version:          1.1.2
> Release:          1%{?dist}
> License:          GPLv2
> URL:              http://directory.fedoraproject.org/
> Group:            System Environment/Daemons
> BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:    nspr-devel >= 4.6.4
> BuildRequires:    nss-devel >= 3.11.4
>@@ -91,22 +91,25 @@
> 
> %files
> %defattr(-,root,root,-)
> %doc LICENSE
> %dir %{_sysconfdir}/%{pkgname}/admin-serv
> %config(noreplace)%{_sysconfdir}/%{pkgname}/admin-serv/*.conf
> %{_datadir}/%{pkgname}
> %{_initrddir}/%{pkgname}-admin
>-%{_sysconfdir}/sysconfig/%{pkgname}-admin
>+%config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}-admin
> %{_sbindir}/*
> %{_libdir}/*.so.*
> %{_libdir}/%{pkgname}
> 
> %changelog
>+* Wed Jan  9 2008 Rich Megginson <rmeggins@redhat.com> - 1.1.2-1
>+- Fix issues associated with Fedora pkg review bug 249548
>+
> * Tue Dec 11 2007 Rich Megginson <rmeggins@redhat.com> - 1.1.1-1
> - this is the final GA candidate
> 
> * Tue Nov  6 2007 Rich Megginson <rmeggins@redhat.com> - 1.1.0-1.16
> - fix several beta blocker issues
> 
> * Mon Oct 15 2007 Rich Megginson <rmeggins@redhat.com> - 1.1.0-1.15
> - fix bogus dist macro
>Index: adminserver/wrappers/initscript.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/wrappers/initscript.in,v
>retrieving revision 1.4
>diff -u -8 -r1.4 initscript.in
>--- adminserver/wrappers/initscript.in	8 Dec 2007 17:42:49 -0000	1.4
>+++ adminserver/wrappers/initscript.in	9 Jan 2008 18:32:23 -0000
>@@ -89,21 +89,24 @@
> restart_script=@sbindir@/restart-ds-admin
> stop_script=@sbindir@/stop-ds-admin
> exec=`grep "^HTTPD=" $start_script | awk -F= '{print $2}'`
> prog="@package_name@"
> # PID directory
> piddir="@localstatedir@/run/@PACKAGE_BASE_NAME@"
> # PID file
> pidfile=$piddir/admin-serv.pid
>+lockfile=/var/lock/subsys/@package_name@
> 
> [ -f $exec ] || exit 0
> 
> umask 077
> 
>+RETVAL=0
>+
> # since we use the start script to start admin, we source the
> # init config file there, not here
> # if we ever get rid of the start script, we'll have to uncomment
> # the following line
> #[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
> 
> start() {
>     if [ ! -f $start_script ]; then
>@@ -131,16 +134,17 @@
>     if [ $server_running -eq 0 ] ; then
>         rm -f $pidfile
>         fix_pid_dir_ownership 
>         $start_script
>         if [ $? -eq 0 ]; then
>             server_started=1 # well, perhaps not running, but started ok
>         else
>             failure; echo
>+            RETVAL=1
>         fi
>     fi
>     if [ $server_started -eq 1 ] ; then
>         loop_counter=1
> 		# wait for 10 minutes (600 times 1 seconds)
>         max_count=600
>         while test $loop_counter -le $max_count ; do
>             loop_counter=`expr $loop_counter + 1`
>@@ -151,18 +155,20 @@
>                 break
>             fi
>         done
>         if kill -0 $pid > /dev/null 2>&1 && test -f $pidfile ; then
>             success; echo
>         else
>             echo_n "*** Error: $prog failed to start"
>             failure; echo
>+            RETVAL=1
>         fi
>     fi
>+    [ $RETVAL -eq 0 -a -d /var/lock/subsys ] && touch $lockfile
> }
> 
> stop() {
>     if [ ! -f $stop_script ]; then
>        echo_n "$stop_script does not exist"
>        failure; echo
>        exit 1
>     fi
>@@ -171,16 +177,17 @@
>         pid=`cat $pidfile`
>         server_stopped=0
>         if kill -0 $pid > /dev/null 2>&1 ; then
>             kill $pid
>             if [ $? -eq 0 ]; then
>                 server_stopped=1
>             else
>                 failure; echo
>+                RETVAL=1
>             fi
>         fi
>         if [ $server_stopped -eq 1 ] ; then
>             loop_counter=1
> 			# wait for 10 minutes (600 times 1 second)
>             max_count=600
>             while test $loop_counter -le $max_count; do
>                 loop_counter=`expr $loop_counter + 1`
>@@ -191,22 +198,24 @@
>                         rm -f $pidfile
>                     fi
>                     break
>                 fi
>             done
>             if test -f $pidfile ; then
>                 echo_n "*** Error: $prog failed to stop"
>                 failure; echo
>+                RETVAL=1
>             else
>                 success; echo
>                 rm -f $pidfile
>             fi
>         fi
>     fi
>+    [ $RETVAL -eq 0 ] && rm -f $lockfile
> }
> 
> restart() {
>     stop
>     start
> }
> 
>

Actions: View | Diff

Attachments on bug 249548: 159929 | 159930 | 291181 | 291184 | 291308