12:17 p.m.
Makefile.am | 2 +-
Makefile.in | 2 +-
configure | 20 ++++++++++----------
configure.ac | 2 +-
setup-ds-dsgw.in | 7 +++++++
5 files changed, 20 insertions(+), 13 deletions(-)
New commits:
commit 742013f578d3cee7ad5f35712432d234eb43fd7f
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed Dec 14 19:17:23 2011 -0700
dsgw does not need libldap_r
diff --git a/Makefile.am b/Makefile.am
index 212e6c3..a710cdf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,7 @@ AM_CPPFLAGS +=-DPROPERTYDIR=\"$(propertydir)\" \
-DCGIURIBASE=\"$(cgiuri)\" -DMANUALSUBDIR=\"$(manualsubdir)\"
if OPENLDAP
-LDAPSDK_LINK = @openldap_lib@ -lldap_r@ol_libver@ -lldap@ol_libver@ @ldap_lib_ldif@
-llber@ol_libver@
+LDAPSDK_LINK = @openldap_lib@ -lldap@ol_libver@ @ldap_lib_ldif@ -llber@ol_libver@
else
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60
endif
diff --git a/Makefile.in b/Makefile.in
index 08cd8cb..0d8f0a3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -486,7 +486,7 @@ AM_CPPFLAGS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\"
$(DEBUG_DEFINES) \
-DMANUALDIR=\"$(manualdir)\" -DCGIURIBASE=\"$(cgiuri)\" \
-DMANUALSUBDIR=\"$(manualsubdir)\"
@OPENLDAP_FALSE@LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60
-@OPENLDAP_TRUE@LDAPSDK_LINK = @openldap_lib@ -lldap_r@ol_libver@ -lldap@ol_libver@
@ldap_lib_ldif@ -llber@ol_libver@
+@OPENLDAP_TRUE@LDAPSDK_LINK = @openldap_lib@ -lldap@ol_libver@ @ldap_lib_ldif@
-llber@ol_libver@
DSGW_LIBS = @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ \
@icu_lib@ -licui18n -licuuc -licudata \
$(LDAPSDK_LINK) \
commit 5c425cf879effbe637cfeb97c0570954e7f81131
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed Dec 14 14:59:28 2011 -0700
bump version to 1.1.8
diff --git a/configure b/configure
index 595f594..04f1906 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for dirsrv-gw 1.1.7.
+# Generated by GNU Autoconf 2.63 for dirsrv-gw 1.1.8.
#
# Report bugs to <http://bugzilla.redhat.com/>;.
#
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='dirsrv-gw'
PACKAGE_TARNAME='dirsrv-gw'
-PACKAGE_VERSION='1.1.7'
-PACKAGE_STRING='dirsrv-gw 1.1.7'
+PACKAGE_VERSION='1.1.8'
+PACKAGE_STRING='dirsrv-gw 1.1.8'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
ac_unique_file="dsgwutil.c"
@@ -1579,7 +1579,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dirsrv-gw 1.1.7 to adapt to many kinds of systems.
+\`configure' configures dirsrv-gw 1.1.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1649,7 +1649,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dirsrv-gw 1.1.7:";;
+ short | recursive ) echo "Configuration of dirsrv-gw 1.1.8:";;
esac
cat <<\_ACEOF
@@ -1788,7 +1788,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dirsrv-gw configure 1.1.7
+dirsrv-gw configure 1.1.8
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1802,7 +1802,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dirsrv-gw $as_me 1.1.7, which was
+It was created by dirsrv-gw $as_me 1.1.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2652,7 +2652,7 @@ fi
# Define the identity of the package.
PACKAGE='dirsrv-gw'
- VERSION='1.1.7'
+ VERSION='1.1.8'
cat >>confdefs.h <<_ACEOF
@@ -20796,7 +20796,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dirsrv-gw $as_me 1.1.7, which was
+This file was extended by dirsrv-gw $as_me 1.1.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20859,7 +20859,7 @@ Report bugs to <bug-autoconf(a)gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-dirsrv-gw config.status 1.1.7
+dirsrv-gw config.status 1.1.8
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 7a727b6..940c222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dirsrv-gw], [1.1.7], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv-gw], [1.1.8], [http://bugzilla.redhat.com/])
AC_CONFIG_SRCDIR([dsgwutil.c])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
commit 7aefc4420bba4b36562a2d883efbd5ba81dd946e
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed Dec 14 14:58:18 2011 -0700
add tmpfiles.d support for the cookiedir
diff --git a/setup-ds-dsgw.in b/setup-ds-dsgw.in
index 4e2d6ad..ba1a484 100644
--- a/setup-ds-dsgw.in
+++ b/setup-ds-dsgw.in
@@ -251,6 +251,13 @@ fi
chown $dsgwuser:$dsgwgroup "$cookiedir"
chmod 0700 "$cookiedir"
+if [ -d /etc/tmpfiles.d -a ! -f /etc/tmpfiles.d/dirsrv-dsgw.conf ] ; then
+ echo Updating information in /etc/tmpfiles.d/dirsrv-dsgw.conf
+ parentdir=`dirname $cookiedir`
+ echo "d $parentdir 0700 $dsgwuser $dsgwgroup" >
/etc/tmpfiles.d/dirsrv-dsgw.conf || { echo Error: could not update
/etc/tmpfiles.d/dirsrv-dsgw.conf ; echo skipping tmpfiles.d configuration; }
+ echo "d $cookiedir 0700 $dsgwuser $dsgwgroup" >>
/etc/tmpfiles.d/dirsrv-dsgw.conf || { echo Error: could not update
/etc/tmpfiles.d/dirsrv-dsgw.conf ; echo skipping tmpfiles.d configuration; }
+fi
+
# tell Apache about the dsgw - must restart Apache
echo Adding configuration to httpd config file $httpdconf . . .
grep dsgw-httpd.conf "$httpdconf" > /dev/null 2>&1 || (echo
"" ; echo "# DSGW configuration" ; echo "Include
$dsgwconfigdir/dsgw-httpd.conf") >> $httpdconf