Attachment 152861 Details for Bug 236612 – Revised Diffs

[patch] Revised Diffs

diffs.txt (text/plain), 10.18 KB, created by Nathan Kinder on 2007-04-17 22:52:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-04-17 22:52:49 UTC

Size: 10.18 KB

patch

obsolete

>Index: m4/fhs.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/fhs.m4,v
>retrieving revision 1.1
>diff -u -5 -t -r1.1 fhs.m4
>--- m4/fhs.m4	10 Nov 2006 23:59:16 -0000	1.1
>+++ m4/fhs.m4	17 Apr 2007 22:47:04 -0000
>@@ -23,12 +23,25 @@
> # check for --with-fhs
> AC_MSG_CHECKING(for --with-fhs)
> AC_ARG_WITH(fhs, [  --with-fhs   Use FHS layout],
> [
>   with_fhs=yes
>+  AC_MSG_RESULT(yes)
> ],
> AC_MSG_RESULT(no))
> 
> if test "$with_fhs" = "yes"; then
>   AC_DEFINE([IS_FHS], [1], [Use FHS layout])
> fi
> 
>+# check for --with-fhs-opt
>+AC_MSG_CHECKING(for --with-fhs-opt)
>+AC_ARG_WITH(fhs-opt, [  --with-fhs-opt   Use FHS optional layout],
>+[
>+  with_fhs_opt=yes
>+  AC_MSG_RESULT(yes)
>+],
>+AC_MSG_RESULT(no))
>+
>+if test "$with_fhs" = "yes" -a "$with_fhs_opt" = "yes"; then
>+  AC_MSG_ERROR([Can't set both --with-fhs and --with-fhs-opt.  Please only use one of these options.])
>+fi
>Index: configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.25
>diff -u -5 -t -r1.25 configure.ac
>--- configure.ac	20 Mar 2007 18:46:45 -0000	1.25
>+++ configure.ac	17 Apr 2007 22:47:19 -0000
>@@ -124,37 +124,56 @@
> # the default prefix - override with --prefix or --with-fhs
> AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
> 
> m4_include(m4/fhs.m4)
> 
>-# installation paths - by default, configure will just
>-# use /usr as the prefix for everything, which means
>-# /usr/etc and /usr/var.  FHS sez to use /etc and /var.
>+# installation paths - by default, we store everything
>+# under the prefix.  The with-fhs option will use /usr,
>+# /etc, and /var.  The with-fhs-opt option will use the
>+# prefix, but it's sysconfdir and localstatedir will be
>+# /etc/opt, and /var/opt.
> if test "$with_fhs" = "yes"; then
>   ac_default_prefix=/usr
>   prefix=$ac_default_prefix
>   exec_prefix=$prefix
> dnl as opposed to the default /usr/etc
>   sysconfdir='/etc'
> dnl as opposed to the default /usr/var
>   localstatedir='/var'
>+  # relative to datadir
>+  sampledatadir=/$PACKAGE_NAME/data
>+  # relative to datadir
>+  scripttemplatedir=/$PACKAGE_NAME/script-templates
>+  # relative to libdir
>+  serverdir=/$PACKAGE_NAME
>+  # relative to libdir
>+  serverplugindir=/$PACKAGE_NAME/plugins
>+else
>+  if test "$with_fhs_opt" = "yes"; then
>+    # Override sysconfdir and localstatedir if FHS optional
>+    # package was requested.
>+    sysconfdir='/etc/opt'
>+    localstatedir='/var/opt'
>+  fi
>+  # Paths for default layout
>+  # relative to datadir
>+  sampledatadir=/data
>+  # relative to datadir
>+  scripttemplatedir=/script-templates
>+  # relative to libdir
>+  serverdir=
>+  # relative to libdir
>+  serverplugindir=/plugins
> fi
> 
>+# Shared paths for both FHS and default layouts
> # relative to sysconfdir
> configdir=/$PACKAGE_NAME/config
>-# relative to datadir
>-sampledatadir=/$PACKAGE_NAME/data
> # relative to sysconfdir
> propertydir=/$PACKAGE_NAME/property
> # relative to sysconfdir
> schemadir=/$PACKAGE_NAME/schema
>-# relative to libdir
>-serverdir=/$PACKAGE_NAME
>-# relative to libdir
>-serverplugindir=/$PACKAGE_NAME/plugins
>-# relative to datadir
>-scripttemplatedir=/$PACKAGE_NAME/script-templates
> 
> AC_SUBST(configdir)
> AC_SUBST(sampledatadir)
> AC_SUBST(propertydir)
> AC_SUBST(schemadir)
>Index: ldap/admin/src/create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.53
>diff -u -5 -t -r1.53 create_instance.c
>--- ldap/admin/src/create_instance.c	3 Apr 2007 23:07:43 -0000	1.53
>+++ ldap/admin/src/create_instance.c	17 Apr 2007 22:48:08 -0000
>@@ -707,13 +707,18 @@
>     if (PR_FAILURE == PR_Access(cs_path, PR_ACCESS_EXISTS)) {
>         printf("Notice: %s does not exist, skipping %s . . .\n", cs_path, name);
>         return NULL;
>     }
> 
>+#if defined (IS_FHS)
>     PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s",
>             cf->datadir, FILE_PATHSEP, cf->package_name,
>             FILE_PATHSEP, FILE_PATHSEP, name);
>+#else
>+    PR_snprintf(ofn, sizeof(ofn), "%s%cscript-templates%ctemplate-%s",
>+            cf->datadir, FILE_PATHSEP, FILE_PATHSEP, name);
>+#endif
>     PR_snprintf(fn, sizeof(fn), "%s%c%s", cs_path, FILE_PATHSEP, name);
>     create_instance_mkdir(cs_path, NEWDIR_MODE);
> #ifdef USE_NSPERL
>     PR_snprintf(myperl, sizeof(myperl), "!%s%cbin%cslapd%cadmin%cbin%cperl",
>             cf->prefix, FILE_PATHSEP, FILE_PATHSEP,
>@@ -4364,12 +4369,17 @@
>         cf->prefix = PL_strdup(prefix); /* value of NETSITE_ROOT */
>     } else {
>         prefix = cf->prefix = PL_strdup("/");
>     }
> 
>+#if defined (IS_FHS)
>     cf->sroot = PR_smprintf("%s%s%c%s",
>                 prefix, LIBDIR, FILE_PATHSEP, cf->package_name);
>+#else
>+    cf->sroot = PR_smprintf("%sopt%c%s", prefix, FILE_PATHSEP, cf->package_name);
>+#endif
>+
>     temp = ds_a_get_cgi_var("sasl_path", NULL, NULL);
>     if (NULL != temp) {
>         /* if sasl_path is given, we set it in the conf file regardless of
>          * the platform. */
>         cf->sasl_path = PL_strdup(temp);
>@@ -4380,11 +4390,16 @@
>     else
>     {
>         cf->sasl_path = PR_smprintf("%s%s%csasl2", prefix, LIBDIR, FILE_PATHSEP);
>     }
> #endif
>+
>+#if defined (IS_FHS)
>     cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP);
>+#else
>+    cf->plugin_dir = PR_smprintf("%s%cplugins", LIBDIR, FILE_PATHSEP);
>+#endif
> 
>     if (!(cf->servname = ds_a_get_cgi_var("servname", "Server Name",
>                                           "Please give a hostname for your server.")))
>     {
>         return 1;
>@@ -4593,75 +4608,122 @@
>         cf->schema_dir = PL_strdup(temp);
>     }
> 
>     temp = ds_a_get_cgi_var("lock_dir", NULL, NULL);
>     if (NULL == temp) {
>+#if defined (IS_FHS)
>         cf->lock_dir = PR_smprintf("%s%clock%c%s%c%s-%s",
>                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
>                             cf->package_name, FILE_PATHSEP,
>                             PRODUCT_NAME, cf->servid);
>+#else
>+        cf->lock_dir = PR_smprintf("%s%c%s%c%s-%s%clock",
>+                            cf->localstatedir, FILE_PATHSEP,
>+                            cf->package_name, FILE_PATHSEP,
>+                            PRODUCT_NAME, cf->servid, FILE_PATHSEP);
>+#endif
>     } else {
>         cf->lock_dir = PL_strdup(temp);
>     }
> 
>     temp = ds_a_get_cgi_var("log_dir", NULL, NULL);
>     if (NULL == temp) {
>+#if defined (IS_FHS)
>         cf->log_dir = PR_smprintf("%s%clog%c%s%c%s-%s",
>                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
>                             cf->package_name, FILE_PATHSEP,
>                             PRODUCT_NAME, cf->servid);
>+#else
>+        cf->log_dir = PR_smprintf("%s%c%s%c%s-%s%clog",
>+                            cf->localstatedir, FILE_PATHSEP,
>+                            cf->package_name, FILE_PATHSEP,
>+                            PRODUCT_NAME, cf->servid, FILE_PATHSEP);
>+#endif
>     } else {
>         cf->log_dir = PL_strdup(temp);
>     }
> 
>     temp = ds_a_get_cgi_var("run_dir", NULL, NULL);
>     if (NULL == temp) {
>+#if defined (IS_FHS)
>         cf->run_dir = PR_smprintf("%s%crun%c%s",
>                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
>                             cf->package_name);
>+#else
>+        cf->run_dir = PR_smprintf("%s%c%s%c%s-%s%crun",
>+                            cf->localstatedir, FILE_PATHSEP,
>+                            cf->package_name, FILE_PATHSEP,
>+                            PRODUCT_NAME, cf->servid, FILE_PATHSEP);
>+#endif
>     } else {
>         cf->run_dir = PL_strdup(temp);
>     }
>     /* set run dir to the environment variable DS_RUN_DIR */
>     ds_set_run_dir(cf->run_dir);
> 
>     temp = ds_a_get_cgi_var("db_dir", NULL, NULL);
>     if (NULL == temp) {
>+#if defined (IS_FHS)
>         cf->db_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cdb",
>                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
>                             cf->package_name, FILE_PATHSEP,
>                             PRODUCT_NAME, cf->servid, FILE_PATHSEP);
>+#else
>+        cf->db_dir = PR_smprintf("%s%c%s%c%s-%s%cdb",
>+                            cf->localstatedir, FILE_PATHSEP,
>+                            cf->package_name, FILE_PATHSEP,
>+                            PRODUCT_NAME, cf->servid, FILE_PATHSEP);
>+#endif
>     } else {
>         cf->db_dir = PL_strdup(temp);
>     }
> 
>     temp = ds_a_get_cgi_var("bak_dir", NULL, NULL);
>     if (NULL == temp) {
>+#if defined (IS_FHS)
>         cf->bak_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cbak",
>                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
>                             cf->package_name, FILE_PATHSEP,
>                             PRODUCT_NAME, cf->servid, FILE_PATHSEP);
>+#else
>+        cf->bak_dir = PR_smprintf("%s%c%s%c%s-%s%cbak",
>+                            cf->localstatedir, FILE_PATHSEP,
>+                            cf->package_name, FILE_PATHSEP,
>+                            PRODUCT_NAME, cf->servid, FILE_PATHSEP);
>+#endif
>     } else {
>         cf->bak_dir = PL_strdup(temp);
>     }
>     /* set bak dir to the environment variable DS_BAK_DIR */
>     ds_set_bak_dir(cf->bak_dir);
> 
>     temp = ds_a_get_cgi_var("ldif_dir", NULL, NULL);
>     if (NULL == temp) {
>+#if defined (IS_FHS)
>         cf->ldif_dir = PR_smprintf("%s%c%s%cldif",
>                             cf->datadir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
>+#else
>+        cf->ldif_dir = PR_smprintf("%s%cldif",
>+                            cf->datadir, FILE_PATHSEP);
>+#endif
>     } else {
>         cf->ldif_dir = PL_strdup(temp);
>     }
> 
>     temp = ds_a_get_cgi_var("tmp_dir", NULL, NULL);
>     if (NULL == temp) {
>+#if defined (IS_FHS)
>         cf->tmp_dir = PR_smprintf("%s%ctmp%c%s%c%s-%s",
>                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
>                             cf->package_name, FILE_PATHSEP,
>                             PRODUCT_NAME, cf->servid);
>+#else
>+        cf->tmp_dir = PR_smprintf("%s%c%s%c%s-%s%ctmp",
>+                            cf->localstatedir, FILE_PATHSEP,
>+                            cf->package_name, FILE_PATHSEP,
>+                            PRODUCT_NAME, cf->servid, FILE_PATHSEP);
>+#endif
>     } else {
>         cf->tmp_dir = PL_strdup(temp);
>     }
>     /* set tmp dir to the environment variable DS_TMP_DIR */
>     ds_set_tmp_dir(cf->tmp_dir);

Actions: View | Diff

Attachments on bug 236612: 152711 | 152861 | 153468