Revision: 24890
http://sourceforge.net/p/gar/code/24890
Author: cgrzemba
Date: 2015-04-23 07:24:16 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
389-admin/trunk: update version 1.1.38
Modified Paths:
--------------
csw/mgar/pkg/389-admin/trunk/Makefile
csw/mgar/pkg/389-admin/trunk/checksums
csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch
Added Paths:
-----------
csw/mgar/pkg/389-admin/trunk/files/0005-ctime_r-params-viewdata.c.patch
Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile 2015-04-22 21:28:02 UTC (rev
24889)
+++ csw/mgar/pkg/389-admin/trunk/Makefile 2015-04-23 07:24:16 UTC (rev
24890)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = 389-admin
-VERSION = 1.1.31
+VERSION = 1.1.38
GARTYPE = v2
DESCRIPTION = The 389 LDAP server Admin Tools
@@ -12,36 +12,40 @@
BUNDLE = 389-ds
-MASTER_SITES = http://port389.org/sources/
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
+MASTER_SITES = https://git.fedorahosted.org/cgit/389/admin.git/snapshot/
+DISTNAME = admin-$(NAME)-$(VERSION)
+DISTFILES = $(DISTNAME).tar.gz
DISTFILES += CSW389-admin.preremove
-# BUILD64 = 1
+BUILD64 = 1
PACKAGING_PLATFORMS += solaris10-sparc
PACKAGING_PLATFORMS += solaris10-i386
-GARCOMPILER = SOS12U3
+GARCOMPILER = SOS12U4
LICENSE = LICENSE
# GARFLAVOR=DBG
+# LDAP_API=mozldap
+LDAP_API=openldap
PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch
PATCHFILES += 0004-change-include-preferences-in-Makefile.am.patch
+PATCHFILES += 0005-ctime_r-params-viewdata.c.patch
BUILD_DEP_PKGS += CSWnspr-dev
BUILD_DEP_PKGS += CSWlibnss-dev
BUILD_DEP_PKGS += CSW389-adminutil-dev
-BUILD_DEP_PKGS += CSWapache2-dev CSWapache2
+BUILD_DEP_PKGS += CSWapache24-dev
BUILD_DEP_PKGS += CSWap2modnss
BUILD_DEP_PKGS += CSWlibiconv-dev
BUILD_DEP_PKGS += CSWlibicu-dev
BUILD_DEP_PKGS += CSWsasl-dev
-BUILD_DEP_PKGS += CSWopenldap-dev
+BUILD_DEP_PKGS_openldap += CSWopenldap-dev
BUILD_DEP_PKGS += CSWlibtool CSWautoconf CSWautomake
+BULID_DEP_PKGS += $(BUILD_DEP_PKGS_&(LDAP_API))
-
PACKAGES += CSWlibds-admin-serv0
CATALOGNAME_CSWlibds-admin-serv0 = libds_admin_serv0
PKGFILES_CSWlibds-admin-serv0 += $(call
baseisadirs,$(libdir),libds-admin-serv\.so\.0(\.\d+)*)
@@ -100,10 +104,11 @@
CPPFLAGS =
EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
+EXTRA_CONFIGURE_ENV=PATH=/opt/csw/gnu:$(PATH)
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-openldap-inc=$(includedir)
-CONFIGURE_ARGS += --with-openldap=$(prefix)
+CONFIGURE_ARGS_openldap += --with-openldap-inc=$(includedir)
+CONFIGURE_ARGS_openldap += --with-openldap=$(prefix)
CONFIGURE_ARGS += --with-icu-inc=$(includedir)
CONFIGURE_ARGS += --with-icu-lib=$(libdir)
CONFIGURE_ARGS += --with-icu-bin=$(bindir)
@@ -113,11 +118,12 @@
CONFIGURE_ARGS += --with-nspr-inc=$(includedir)/nspr
CONFIGURE_ARGS += --with-nss-lib=$(libdir)
CONFIGURE_ARGS += --with-nss-inc=$(includedir)/nss
-CONFIGURE_ARGS += --with-apxs=/opt/csw/apache2/sbin/apxs
-CONFIGURE_ARGS += --with-httpd=/opt/csw/apache2/sbin/httpd
-CONFIGURE_ARGS += --with-modnss-lib=/opt/csw/apache2/libexec
-CONFIGURE_ARGS += --with-modnss-bin=/opt/csw/apache2/sbin
+CONFIGURE_ARGS += --with-apxs=/opt/csw/bin/apxs
+CONFIGURE_ARGS += --with-httpd=/opt/csw/sbin/httpd
+CONFIGURE_ARGS += --with-modnss-lib=/opt/csw/lib//apache2/modules
+CONFIGURE_ARGS += --with-modnss-bin=/opt/csw/sbin
# CONFIGURE_ARGS += --with-adminutil=/opt/csw
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(LDAP_API))
include gar/category.mk
Modified: csw/mgar/pkg/389-admin/trunk/checksums
===================================================================
--- csw/mgar/pkg/389-admin/trunk/checksums 2015-04-22 21:28:02 UTC (rev
24889)
+++ csw/mgar/pkg/389-admin/trunk/checksums 2015-04-23 07:24:16 UTC (rev
24890)
@@ -1 +1 @@
-3abcdb7d588f6a22b613602c21d1d973 389-admin-1.1.31.tar.bz2
+e38bc1cd71c05e65391221d64e804f35 admin-389-admin-1.1.38.tar.gz
Modified:
csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
===================================================================
---
csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
2015-04-22 21:28:02 UTC (rev 24889)
+++
csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
2015-04-23 07:24:16 UTC (rev 24890)
@@ -1,47 +1,33 @@
-From 285470791f9eb6dbb196075e0f1945a09c4ad9ea Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrze...@opencsw.org>
-Date: Mon, 23 Jan 2012 15:51:51 +0100
-Subject: [PATCH] correct initscript and http.conf.in
-
----
- admserv/cfgstuff/httpd-2.2.conf.in | 10 +++++-----
- wrappers/initscript.in | 6 ++++--
- 2 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/wrappers/initscript.in b/wrappers/initscript.in
-index 82dd20e..8fd03da 100644
--- a/wrappers/initscript.in
+++ b/wrappers/initscript.in
-@@ -7,6 +7,8 @@
+@@ -7,6 +7,9 @@
# processname: @sbindir@/httpd
# piddir: @localstatedir@/run/@PACKAGE_BASE_NAME@
#
+#AUTOENABLE no # no SMF enable at install!
+#
++
# Source function library.
if [ -f /etc/rc.d/init.d/functions ] ; then
-@@ -94,7 +96,8 @@ prog="@package_name@"
+@@ -94,7 +97,9 @@ prog="@package_name@"
piddir="@localstatedir@/run/@PACKAGE_BASE_NAME@"
# PID file
pidfile=$piddir/admin-serv.pid
-lockfile=/var/lock/subsys/@package_name@
+lockfile=@localstatedir@/lock/subsys/@package_name@
+lockdir=`dirname $lockfile`
++
[ -f $exec ] || exit 0
-@@ -163,7 +166,8 @@ start() {
+@@ -163,7 +168,8 @@ start() {
RETVAL=1
fi
fi
- [ $RETVAL -eq 0 -a -d /var/lock/subsys ] && touch $lockfile
+ [ ! -d $lockdir ] && mkdir -p $lockdir
+ [ $RETVAL -eq 0 -a -d $lockdir ] && touch $lockfile
- }
-
- stop() {
-
---
-1.7.8.3
-
+ if [ -f $lockfile ]; then
+ restorecon $lockfile
+ fi
Modified:
csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch
===================================================================
---
csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch
2015-04-22 21:28:02 UTC (rev 24889)
+++
csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch
2015-04-23 07:24:16 UTC (rev 24890)
@@ -1,35 +1,24 @@
-From 75a3e53349b14539b1d3325af7df7e35b4d5e6d5 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrze...@opencsw.org>
-Date: Thu, 26 Jan 2012 16:12:09 +0100
-Subject: [PATCH] change include preferences in Makefile.am
-
----
- Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 25ae853..51327db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,7 +104,7 @@ libadmin_a_SOURCES = lib/libadmin/cluster.c \
lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c
lib/libadmin/install.c \
lib/libadmin/referer.c lib/libadmin/template.c lib/libadmin/util.c
-
+
-AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES)
@adminutil_inc@ @icu_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-DUSE_ADMSERV=1 \
-+AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES)
@adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @icu_inc@ -DUSE_ADMSERV=1 \
++AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES)
@adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @icu_inc@ @openldap_inc@
-DUSE_ADMSERV=1 \
-I$(srcdir)/include -I$(srcdir)/include/base
if WINNT
AM_CPPFLAGS += -DXP_WINNT
@@ -294,7 +294,7 @@ libdsa_a_SOURCES = lib/libdsa/dsalib_conf.c \
lib/libdsa/dsalib_db.c \
lib/libdsa/dsalib_util.c
-
+
-libdsa_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include/libdsa @openldap_inc@
@ldapsdk_inc@ @nss_inc@ @nspr_inc@
+libdsa_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include/libdsa @ldapsdk_inc@
@nss_inc@ @nspr_inc@ @openldap_inc@
-
+
# source files for our CGI programs
download_SOURCES = admserv/cgi-src40/download.c
-@@ -371,7 +371,7 @@ ds_snmpctrl_LINK = $(MYLINK)
+@@ -380,7 +380,7 @@ ds_snmpctrl_LINK = $(MYLINK)
############## mod_admserv ################
mod_admserv_la_SOURCES = mod_admserv/mod_admserv.c
@@ -38,6 +27,3 @@
mod_admserv_la_LDFLAGS = -module -avoid-version
mod_admserv_la_LIBADD = $(DEFAULT_LIBS)
mod_admserv_la_LINK = $(MYLINK) $(mod_admserv_la_LDFLAGS)
---
-1.7.8.3
-
Added: csw/mgar/pkg/389-admin/trunk/files/0005-ctime_r-params-viewdata.c.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0005-ctime_r-params-viewdata.c.patch
(rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/0005-ctime_r-params-viewdata.c.patch
2015-04-23 07:24:16 UTC (rev 24890)
@@ -0,0 +1,11 @@
+--- a/admserv/cgi-src40/viewdata.c
++++ b/admserv/cgi-src40/viewdata.c
+@@ -398,7 +398,7 @@ output_data(LDAP *server, char *sie)
+ char *inst_time;
+
+ if( (parsed_time = parse_genTime (vals[0])) &&
+- (inst_time = ctime_r(&parsed_time, buf)) )
++ (inst_time = ctime_r(&parsed_time, buf, BIG_LINE)) )
+ {
+ PR_snprintf(buf, sizeof(buf), "%s %s", inst_time, daylight ? tzname[1]
: tzname[0]);
+ } else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
