.dockerignore

+.git
+.gitignore
+./src/cockpit/389-console/node_modules

.gitignore

@@ -25,6 +25,7 @@ libtool
 stamp-h1
 *~
 *.patch
+.DS_Store
 .autotools
 .cproject
 .project
@@ -224,3 +225,8 @@ html/
 src/lib389/dist/
 src/lib389/man/
 src/libsds/target/
+dist
+venv
+.idea
+src/cockpit/389-console/cockpit_dist/
+src/cockpit/389-console/node_modules/

389-doap.rdf

-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl"?>
-<rdf:RDF xml:lang="en"
-         xmlns="http://usefulinc.com/ns/doap#" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:foaf="http://xmlns.com/foaf/0.1/">
-  <Project rdf:about="http://port389.org">
-    <created>2005-06-01</created>
-    <name>389 Project</name>
-    <shortname>389</shortname>
-    <homepage rdf:resource="http://port389.org" />
-    <shortdesc>Directory Server, Admin Server, Graphical Management Console, web based tools</shortdesc>
-    <description>The 389 Project provides an LDAPv3 compliant directory server, HTTP based administration server, graphical management console, and web based tools.</description>
-    <implements>LDAPv3 - IETF RFC 4511-4518</implements>
-    <bug-database rdf:resource="https://fedorahosted.org/389/report" />
-    <mailing-list rdf:resource="http://port389.org/wiki/Mailing_Lists" />
-    <mailing-list>389-devel@lists.fedoraproject.org</mailing-list>
-    <mailing-list>389-users@lists.fedoraproject.org</mailing-list>
-    <mailing-list>389-announce@lists.fedoraproject.org</mailing-list>
-    <mailing-list>389-commits@lists.fedoraproject.org</mailing-list>
-    <license rdf:resource="http://port389.org/wiki/Licensing" />
-    <download-page rdf:resource="http://port389.org/wiki/Download" />
-    <programming-language>C</programming-language>
-    <programming-language>Perl</programming-language>
-    <programming-language>Java</programming-language>
-    <release>
-      <Version>
-        <name>stable</name>
-	<branch>389-ds-base-1.2.11</branch>
-        <created>2012-10-09</created>
-        <revision>1.2.11.16</revision>
-      </Version>
-    </release>
-    <repository>
-      <GitRepository>
-        <location rdf:resource="git://git.fedorahosted.org/389/ds.git"/>
-        <browse rdf:resource="http://git.fedorahosted.org/cgit/389/ds.git/"/>
-      </GitRepository>
-    </repository>
-    <maintainer>
-      <foaf:Person>
-        <foaf:name>Rich Megginson</foaf:name>
-          <foaf:mbox rdf:resource="mailto:rmeggins@redhat.com"/>
-      </foaf:Person>
-    </maintainer>
-  </Project>
-</rdf:RDF>

Makefile.am

@@ -26,13 +26,10 @@ UBSAN_CFLAGS = @ubsan_cflags@
 
 SYSTEMD_DEFINES = @systemd_defs@
 
-CMOCKA_INCLUDES = @cmocka_inc@
+CMOCKA_INCLUDES = $(CMOCKA_CFLAGS)
 
 PROFILING_DEFINES = @profiling_defs@
-NSPR_INCLUDES = @nspr_inc@
-
-SASL_INCLUDES = @sasl_inc@
-EVENT_INCLUDES = @event_inc@
+NSPR_INCLUDES = $(NSPR_CFLAGS)
 
 # Rust inclusions.
 if RUST_ENABLE
@@ -140,44 +137,35 @@ AM_CFLAGS = $(DEBUG_CFLAGS) $(GCCSEC_CFLAGS) $(ASAN_CFLAGS) $(MSAN_CFLAGS) $(TSA
 AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(GCCSEC_CFLAGS) $(ASAN_CFLAGS) $(MSAN_CFLAGS) $(TSAN_CFLAGS) $(UBSAN_CFLAGS)
 # Flags for Directory Server
 # WARNING: This needs a clean up, because slap.h is a horrible mess and is publically exposed!
-DSPLUGIN_CPPFLAGS = $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES) $(SYSTEMD_DEFINES) $(NUNCSTANS_INCLUDES) @openldap_inc@ @ldapsdk_inc@ @nss_inc@ $(NSPR_INCLUDES) @systemd_inc@
+DSPLUGIN_CPPFLAGS = $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES) $(SYSTEMD_DEFINES) $(NUNCSTANS_INCLUDES) @openldap_inc@ $(NSS_CFLAGS) $(NSPR_INCLUDES) $(SYSTEMD_CFLAGS)
 # This should give access to internal headers only for tests!!!
 DSINTERNAL_CPPFLAGS = -I$(srcdir)/include/ldaputil
 # Flags for Datastructure Library
 SDS_CPPFLAGS = $(SDS_INCLUDES) $(NSPR_INCLUDES)
 # Flags for nunc-stans
-NUNCSTANS_CPPFLAGS = $(NSPR_INCLUDES) $(NUNCSTANS_INCLUDES) $(SDS_INCLUDES) $(EVENT_INCLUDES)
+NUNCSTANS_CPPFLAGS = $(NSPR_INCLUDES) $(NUNCSTANS_INCLUDES) $(SDS_INCLUDES) $(EVENT_CFLAGS)
 
 #------------------------
 # Linker Flags
 #------------------------
-SYSTEMD_LINK = @systemd_lib@
-CMOCKA_LINKS = @cmocka_lib@
+CMOCKA_LINKS = $(CMOCKA_LIBS)
 PROFILING_LINKS = @profiling_links@
 
-NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
-NSS_LINK = @nss_lib@ -lssl3 -lnss3
+NSPR_LINK = $(NSPR_LIBS)
+NSS_LINK = $(NSS_LIBS)
 
-if OPENLDAP
 # with recent versions of openldap - if you link with both ldap_r and ldap, the
 # shared lib _fini for one will stomp on the other, and the program will crash
 LDAPSDK_LINK_NOTHR = @openldap_lib@ -lldap@ol_libver@ @ldap_lib_ldif@ -llber@ol_libver@
 LDAPSDK_LINK = @openldap_lib@ -lldap_r@ol_libver@ @ldap_lib_ldif@ -llber@ol_libver@
-else
-LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60
-LDAPSDK_LINK_NOTHR = $(LDAPSDK_LINK)
-endif
 ldaplib = @ldaplib@
 ldaplib_defs = @ldaplib_defs@
 
 DB_LINK = @db_lib@ -ldb-@db_libver@
-SASL_LINK = @sasl_lib@ -lsasl2
-ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
-PCRE_LINK = @pcre_lib@ -lpcre
+SASL_LINK = $(SASL_LIBS)
 NETSNMP_LINK = @netsnmp_lib@ @netsnmp_link@
 PAM_LINK = -lpam
-KERBEROS_LINK = $(kerberos_lib)
-EVENT_LINK = @event_lib@
+EVENT_LINK = $(EVENT_LIBS)
 PW_CRACK_LINK = -lcrack
 
 LIBSOCKET=@LIBSOCKET@
@@ -312,6 +300,7 @@ serverdir = $(libdir)/@serverdir@
 serverplugindir = $(libdir)@serverplugindir@
 taskdir = $(datadir)@scripttemplatedir@
 systemdsystemunitdir = @with_systemdsystemunitdir@
+systemdsystemunitdropindir = @with_systemdsystemunitdir@/$(PACKAGE_NAME)@.service.d
 systemdsystemconfdir = @with_systemdsystemconfdir@
 systemdgroupname = @with_systemdgroupname@
 initdir = @initdir@
@@ -526,7 +515,6 @@ dist_noinst_HEADERS = \
 	ldap/servers/slapd/http.h \
 	ldap/servers/slapd/intrinsics.h \
 	ldap/servers/slapd/log.h \
-	ldap/servers/slapd/mozldap.h \
 	ldap/servers/slapd/openldapber.h \
 	ldap/servers/slapd/pblock_v3.h \
 	ldap/servers/slapd/poll_using_select.h \
@@ -614,7 +602,7 @@ dist_noinst_HEADERS += \
 	src/libsds/external/liblfds711/src/lfds711_queue_unbounded_manyproducer_manyconsumer/lfds711_queue_unbounded_manyproducer_manyconsumer_internal.h
 endif
 
-if WITH_CMOCKA
+if ENABLE_CMOCKA
 dist_noinst_HEADERS += \
 	test/test_slapd.h \
 	src/libsds/test/test_sds.h \
@@ -648,7 +636,6 @@ dist_noinst_DATA = \
 	$(srcdir)/LICENSE.* \
 	$(srcdir)/VERSION.sh \
 	$(srcdir)/wrappers/*.in \
-	$(srcdir)/wrappers/systemd.template.sysconfig \
 	$(srcdir)/dirsrvtests \
 	$(srcdir)/src/lib389/setup.py \
 	$(srcdir)/src/lib389
@@ -761,7 +748,7 @@ install-data-hook:
 	mkdir -p $(DESTDIR)$(cockpitdir)
 	rsync -rupE src/cockpit/389-console/cockpit_dist/ $(DESTDIR)$(cockpitdir)
 	mkdir -p $(DESTDIR)$(metainfodir)
-	rsync -up src/cockpit/389-console/org.cockpit-project.389-console.metainfo.xml $(DESTDIR)$(metainfodir)/org.cockpit-project.389-console.metainfo.xml
+	rsync -up src/cockpit/389-console/org.port389.cockpit_console.metainfo.xml $(DESTDIR)$(metainfodir)/org.port389.cockpit_console.metainfo.xml
 
 if ENABLE_PERL
 sbin_SCRIPTS = ldap/admin/src/scripts/setup-ds.pl \
@@ -894,6 +881,11 @@ if SYSTEMD
 systemdsystemunit_DATA = wrappers/$(PACKAGE_NAME)@.service \
 	wrappers/$(systemdgroupname) \
 	wrappers/$(PACKAGE_NAME)-snmp.service
+
+systemdsystemunitdropin_DATA = wrappers/$(PACKAGE_NAME)@.service.d/custom.conf
+if with_sanitizer
+systemdsystemunitdropin_DATA += wrappers/$(PACKAGE_NAME)@.service.d/xsan.conf
+endif
 else
 if INITDDIR
 init_SCRIPTS = wrappers/$(PACKAGE_NAME) \
@@ -901,14 +893,9 @@ init_SCRIPTS = wrappers/$(PACKAGE_NAME) \
 endif
 endif
 
-if SYSTEMD
-initconfig_DATA = ldap/admin/src/$(PACKAGE_NAME) \
-	wrappers/$(PACKAGE_NAME).systemd
-else 
 if INITDDIR
 initconfig_DATA = ldap/admin/src/$(PACKAGE_NAME)
 endif
-endif
 
 inf_DATA = ldap/admin/src/slapd.inf \
 	ldap/admin/src/scripts/dscreate.map \
@@ -1273,12 +1260,10 @@ libns_dshttpd_la_SOURCES = lib/libaccess/access_plhash.cpp \
 	lib/libadmin/template.c \
 	lib/libadmin/util.c \
 	lib/base/crit.cpp \
-	lib/base/dns.cpp \
 	lib/base/dnsdmain.cpp \
 	lib/base/ereport.cpp \
 	lib/base/file.cpp \
 	lib/base/fsmutex.cpp \
-	lib/base/net.cpp \
 	lib/base/nscperror.c \
 	lib/base/plist.cpp \
 	lib/base/pool.cpp \
@@ -1314,6 +1299,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
 	ldap/servers/slapd/ch_malloc.c \
 	ldap/servers/slapd/computed.c \
 	ldap/servers/slapd/control.c \
+	ldap/servers/slapd/configdse.c \
 	ldap/servers/slapd/counters.c \
 	ldap/servers/slapd/csn.c \
 	ldap/servers/slapd/csngen.c \
@@ -1395,8 +1381,8 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
 	ldap/servers/slapd/slapi_pal.c \
 	$(libavl_a_SOURCES)
 
-libslapd_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(SASL_INCLUDES) @db_inc@ @kerberos_inc@ @pcre_inc@ $(SDS_CPPFLAGS) $(SVRCORE_INCLUDES)
-libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(KERBEROS_LINK) $(PCRE_LINK) $(THREADLIB) $(SYSTEMD_LINK) libsds.la libsvrcore.la
+libslapd_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(SASL_CFLAGS) @db_inc@ $(KERBEROS_CFLAGS) $(PCRE_CFLAGS) $(SDS_CPPFLAGS) $(SVRCORE_INCLUDES)
+libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(KERBEROS_LIBS) $(PCRE_LIBS) $(THREADLIB) $(SYSTEMD_LIBS) libsds.la libsvrcore.la
 libslapd_la_LDFLAGS = $(AM_LDFLAGS) $(SLAPD_LDFLAGS)
 
 
@@ -1614,8 +1600,8 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \
         ldap/servers/plugins/collation/config.c \
         ldap/servers/plugins/collation/orfilter.c
 
-libcollation_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) @icu_inc@
-libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
+libcollation_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(ICU_CFLAGS)
+libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LIBS) $(LIBCSTD) $(LIBCRUN)
 libcollation_plugin_la_DEPENDENCIES = libslapd.la
 libcollation_plugin_la_LDFLAGS = -avoid-version
 # libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
@@ -1857,8 +1843,8 @@ libreplication_plugin_la_SOURCES = ldap/servers/plugins/replication/cl5_api.c \
 	ldap/servers/plugins/replication/windows_protocol_util.c \
 	ldap/servers/plugins/replication/windows_tot_protocol.c
 
-libreplication_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) @icu_inc@ @db_inc@
-libreplication_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(ICU_LINK) $(DB_LINK)
+libreplication_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(ICU_CFLAGS) @db_inc@
+libreplication_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(ICU_LIBS) $(DB_LINK)
 libreplication_plugin_la_DEPENDENCIES = libslapd.la
 libreplication_plugin_la_LDFLAGS = -avoid-version
 
@@ -1981,7 +1967,7 @@ libwhoami_plugin_la_LDFLAGS = -avoid-version
 #------------------------
 dbscan_SOURCES = ldap/servers/slapd/tools/dbscan.c
 
-dbscan_CPPFLAGS = @db_inc@ @nspr_inc@ $(AM_CPPFLAGS)
+dbscan_CPPFLAGS = @db_inc@ $(NSPR_INCLUDES) $(AM_CPPFLAGS)
 dbscan_LDADD = $(NSPR_LINK) $(DB_LINK)
 
 #------------------------
@@ -2021,7 +2007,7 @@ ldclt_SOURCES = ldap/servers/slapd/tools/ldaptool-sasl.c \
 	ldap/servers/slapd/tools/ldclt/version.c \
 	ldap/servers/slapd/tools/ldclt/workarounds.c
 
-ldclt_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/servers/slapd/tools $(DSPLUGIN_CPPFLAGS) $(SASL_INCLUDES)
+ldclt_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/servers/slapd/tools $(DSPLUGIN_CPPFLAGS) $(SASL_CFLAGS)
 ldclt_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(LIBDL) $(THREADLIB)
 
 #------------------------
@@ -2069,7 +2055,6 @@ ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \
 	ldap/servers/slapd/bind.c  \
 	ldap/servers/slapd/compare.c \
 	ldap/servers/slapd/config.c \
-	ldap/servers/slapd/configdse.c \
 	ldap/servers/slapd/connection.c \
 	ldap/servers/slapd/conntable.c \
 	ldap/servers/slapd/daemon.c \
@@ -2098,9 +2083,9 @@ ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \
 	ldap/servers/slapd/unbind.c \
 	$(GETSOCKETPEER)
 
-ns_slapd_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(SASL_INCLUDES) $(SVRCORE_INCLUDES)
+ns_slapd_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(SASL_CFLAGS) $(SVRCORE_INCLUDES)
 ns_slapd_LDADD = libnunc-stans.la libslapd.la libldaputil.la libsvrcore.la $(LDAPSDK_LINK) $(NSS_LINK) $(LIBADD_DL) \
-	$(NSPR_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(THREADLIB) $(SYSTEMD_LINK) $(EVENT_LINK)
+	$(NSPR_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(THREADLIB) $(SYSTEMD_LIBS) $(EVENT_LINK)
 ns_slapd_DEPENDENCIES = libslapd.la libnunc-stans.la libldaputil.la
 # We need to link ns-slapd with the C++ compiler on HP-UX since we load
 # some C++ shared libraries (such as icu).
@@ -2133,7 +2118,7 @@ rsearch_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKE
 #-------------------------
 # CMOCKA TEST PROGRAMS
 #-------------------------
-if WITH_CMOCKA
+if ENABLE_CMOCKA
 
 check_PROGRAMS = test_slapd \
 	test_libsds \
@@ -2229,17 +2214,12 @@ fixupcmd = sed \
 	-e 's,@sbindir\@,$(sbindir),g' \
 	-e 's,@libdir\@,$(libdir),g' \
 	-e 's,@libexecdir\@,$(libexecdir),g' \
-	-e 's,@nspr_libdir\@,$(nspr_libdir),g' \
 	-e 's,@nss_libdir\@,$(nss_libdir),g' \
-	-e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
-	-e 's,@ldapsdk_bindir\@,$(ldapsdk_bindir),g' \
 	-e 's,@ldaptool_bindir\@,$(ldaptool_bindir),g' \
 	-e 's,@ldaptool_opts\@,$(ldaptool_opts),g' \
 	-e 's,@plainldif_opts\@,$(plainldif_opts),g' \
 	-e 's,@db_libdir\@,$(db_libdir),g' \
 	-e 's,@db_bindir\@,$(db_bindir),g' \
-	-e 's,@sasl_libdir\@,$(sasl_libdir),g' \
-	-e 's,@sasl_path\@,@sasl_path@,g' \
 	-e 's,@netsnmp_libdir\@,$(netsnmp_libdir),g' \
 	-e 's,@pcre_libdir\@,$(pcre_libdir),g' \
 	-e 's,@propertydir\@,$(propertydir),g' \
@@ -2336,17 +2316,18 @@ endif
 # yes, that is an @ in the filename . . .
 %/$(PACKAGE_NAME)@.service: %/systemd.template.service.in
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
-	if [ ! -z ${SANITIZER} ] ; then \
-		service_template=$(shell echo $^ | sed 's/template/template.xsan/g'); \
-		else \
-		service_template=$^; \
-	fi; \
-	$(fixupcmd) $$service_template > $@
-
-%/$(PACKAGE_NAME).systemd: %/systemd.template.sysconfig
+	$(fixupcmd) $^ > $@
+
+%/$(PACKAGE_NAME)@.service.d/custom.conf: %/systemd.template.service.custom.conf.in
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
 	$(fixupcmd) $^ > $@
 
+if with_sanitizer
+%/$(PACKAGE_NAME)@.service.d/xsan.conf: %/systemd.template.service.xsan.conf.in
+	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+	$(fixupcmd) $^ > $@
+endif
+
 %/$(systemdgroupname): %/systemd.group.in
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
 	$(fixupcmd) $^ > $@

VERSION.sh

@@ -10,7 +10,7 @@ vendor="389 Project"
 # PACKAGE_VERSION is constructed from these
 VERSION_MAJOR=1
 VERSION_MINOR=4
-VERSION_MAINT=0.22
+VERSION_MAINT=1.4
 # NOTE: VERSION_PREREL is automatically set for builds made out of a git tree
 VERSION_PREREL=
 VERSION_DATE=$(date -u +%Y%m%d)

autogen.sh

@@ -35,12 +35,16 @@ checkvers() {
     vers="$1"; shift
     needmaj="$1"; shift
     needmin="$1"; shift
-    needrev="$1"; shift
+    if [ "$#" != "0" ]; then
+        needrev="$1"; shift
+    fi
     verslist=`echo $vers | tr '.' ' '`
     set $verslist
     maj=$1; shift
     min=$1; shift
-    rev=$1; shift
+    if [ "$#" != "0" ]; then
+        rev=$1; shift
+    fi
     if [ "$maj" -gt "$needmaj" ] ; then return 0; fi
     if [ "$maj" -lt "$needmaj" ] ; then return 1; fi
     # if we got here, maj == needmaj

configure.ac

@@ -34,6 +34,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AM_PROG_AS
 AC_PROG_CC_STDC
+PKG_PROG_PKG_CONFIG
 
 # disable static libs by default - we only use a couple
 AC_DISABLE_STATIC
@@ -75,7 +76,7 @@ AC_FUNC_STAT
 AC_FUNC_STRERROR_R
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([endpwent ftruncate getcwd gethostbyname inet_ntoa localtime_r memmove memset mkdir munmap putenv rmdir setrlimit socket strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strstr strtol tzset])
+AC_CHECK_FUNCS([endpwent ftruncate getcwd getaddrinfo inet_pton inet_ntop localtime_r memmove memset mkdir munmap putenv rmdir setrlimit socket strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strstr strtol tzset])
 
 # These functions are *required* without option.
 AC_CHECK_FUNCS([clock_gettime], [], AC_MSG_ERROR([unable to locate required symbol clock_gettime]))
@@ -195,6 +196,8 @@ AC_SUBST([ubsan_cflags])
 AC_SUBST([ubsan_rust_defs])
 AM_CONDITIONAL(enable_ubsan,test "$enable_ubsan" = "yes")
 
+AM_CONDITIONAL(with_sanitizer,test "$enable_asan" = "yes" -o "$enable_msan" = "yes" -o "$enable_tsan" = "yes" -o "$enable_ubsan" = "yes")
+
 # Enable CLANG
 AC_MSG_CHECKING(for --enable-clang)
 AC_ARG_ENABLE(clang, AS_HELP_STRING([--enable-clang], [Enable clang (default: no)]),
@@ -208,10 +211,10 @@ AM_CONDITIONAL(CLANG_ENABLE,test "$enable_clang" = "yes")
 
 # Enable Perl
 if test -z "$enable_perl" ; then
-   enable_perl=yes
+   enable_perl=no
 fi
 AC_MSG_CHECKING(for --enable-perl)
-AC_ARG_ENABLE(perl, AS_HELP_STRING([--enable-perl], [Enable perl and shell script wrappers (default: yes)])
+AC_ARG_ENABLE(perl, AS_HELP_STRING([--enable-perl], [Enable deprecated legacy perl and shell scripts (default: no)]),
 [
     AC_MSG_RESULT(yes)
 ],
@@ -504,7 +507,7 @@ defaultgroup=dirsrv
 AC_MSG_CHECKING(for --with-perldir)
 AC_ARG_WITH([perldir],
    AS_HELP_STRING([--with-perldir=PATH],
-                  [Directory for perl)])
+                  [Directory for perl])
 )
 if test -n "$with_perldir"; then
   if test  "$with_perldir" = yes ; then
@@ -521,7 +524,7 @@ fi
 AC_MSG_CHECKING(for --with-pythonexec)
 AC_ARG_WITH([pythonexec],
    AS_HELP_STRING([--with-pythonexec=PATH],
-                  [Path to executable for python)])
+                  [Path to executable for python])
 )
 if test -n "$with_pythonexec"; then
   if test  "$with_pythonexec" = yes ; then
@@ -815,51 +818,80 @@ AM_CONDITIONAL([FREEBSD],[test "$platform" = "freebsd"])
 AM_CONDITIONAL([SPARC],[test "x$TARGET" = xSPARC])
 
 # Check for library dependencies
-m4_include(m4/event.m4)
-m4_include(m4/nspr.m4)
-m4_include(m4/nss.m4)
+PKG_CHECK_MODULES([EVENT], [libevent])
+
+if $PKG_CONFIG --exists nspr; then
+    PKG_CHECK_MODULES([NSPR], [nspr])
+else
+    PKG_CHECK_MODULES([NSPR], [dirsec-nspr])
+fi
+
+if $PKG_CONFIG --exists nss; then
+    PKG_CHECK_MODULES([NSS], [nss])
+    nss_libdir=`$PKG_CONFIG --libs-only-L nss | sed -e s/-L// | sed -e s/\ .*$//`
+else
+    PKG_CHECK_MODULES([NSS], [dirsec-nss])
+    nss_libdir=`$PKG_CONFIG --libs-only-L dirsec-nss | sed -e s/-L// | sed -e s/\ .*$//`
+fi
+AC_SUBST(nss_libdir)
+
 m4_include(m4/openldap.m4)
-m4_include(m4/mozldap.m4)
 m4_include(m4/db.m4)
-m4_include(m4/sasl.m4)
-m4_include(m4/icu.m4)
+
+PKG_CHECK_MODULES([SASL], [libsasl2])
+
+PKG_CHECK_MODULES([ICU], [icu-i18n >= 60.2])
+
 m4_include(m4/netsnmp.m4)
-m4_include(m4/kerberos.m4)
-m4_include(m4/pcre.m4)
+
+PKG_CHECK_MODULES([KERBEROS], [krb5])
+krb5_vendor=`$PKG_CONFIG --variable=vendor krb5`
+if test "$krb5_vendor" = "MIT"; then
+    AC_DEFINE(HAVE_KRB5, 1, [Define if you have Kerberos V])
+    save_LIBS="$LIBS"
+    LIBS="$KERBEROS_LIBS"
+    AC_CHECK_FUNCS([krb5_cc_new_unique])
+    LIBS="$save_LIBS"
+elif test "$krb5_vendor" = "Heimdal"; then
+    AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1, [Define if you have Heimdal Kerberos])
+fi
+
+if $PKG_CONFIG --exists pcre; then
+    PKG_CHECK_MODULES([PCRE], [pcre])
+    pcre_libdir=`$PKG_CONFIG --libs-only-L pcre | sed -e s/-L// | sed -e s/\ .*$//`
+else
+    PKG_CHECK_MODULES([PCRE], [libpcre])
+    pcre_libdir=`$PKG_CONFIG --libs-only-L libpcre | sed -e s/-L// | sed -e s/\ .*$//`
+fi
+AC_SUBST(pcre_libdir)
+
 m4_include(m4/selinux.m4)
 m4_include(m4/systemd.m4)
-m4_include(m4/cmocka.m4)
+
+AC_MSG_CHECKING(whether to enable cmocka unit tests)
+AC_ARG_ENABLE(cmocka, AS_HELP_STRING([--enable-cmocka], [Enable cmocka unit tests (default: no)]))
+if test "x$enable_cmocka" = "xyes"; then
+    AC_MSG_RESULT(yes)
+    PKG_CHECK_MODULES([CMOCKA], [cmocka])
+    AC_DEFINE([ENABLE_CMOCKA], [1], [Enable cmocka unit tests])
+else
+    AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL([ENABLE_CMOCKA], [test "x$enable_cmocka" = "xyes"])
+
 m4_include(m4/doxygen.m4)
 
 PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'`
 AC_SUBST(PACKAGE_BASE_VERSION)
 
-# set sasl_path for wrapper scripts
-if test -z "$sasl_libdir" ; then
-  sasl_path="$libdir/sasl2"
-else
-  sasl_path="$sasl_libdir/sasl2"
-fi
-
 AM_CONDITIONAL(OPENLDAP,test "$with_openldap" = "yes")
 
 # write out paths for binary components
-AC_SUBST(ldapsdk_inc)
-AC_SUBST(ldapsdk_lib)
-AC_SUBST(ldapsdk_libdir)
-AC_SUBST(ldapsdk_bindir)
 AC_SUBST(ldaplib)
 AC_SUBST(ldaplib_defs)
 AC_SUBST(ldaptool_bindir)
 AC_SUBST(ldaptool_opts)
 AC_SUBST(plainldif_opts)
-AC_SUBST(sasl_inc)
-AC_SUBST(sasl_lib)
-AC_SUBST(sasl_libdir)
-AC_SUBST(sasl_path)
-AC_SUBST(pcre_inc)
-AC_SUBST(pcre_lib)
-AC_SUBST(pcre_libdir)
 AC_SUBST(nunc_stans_inc)
 AC_SUBST(nunc_stans_lib)
 AC_SUBST(nunc_stans_libdir)

debian/389-ds-base.install

-etc/default/dirsrv
-etc/default/dirsrv.systemd
 etc/dirsrv/config/
 etc/dirsrv/schema/*.ldif
 etc/systemd/
 lib/systemd/system/dirsrv-snmp.service
 lib/systemd/system/dirsrv.target
 lib/systemd/system/dirsrv@.service
+lib/systemd/system/dirsrv@.service.d/custom.conf
 usr/bin/dbscan
 usr/bin/ds-logpipe
 usr/bin/ds-replcheck
@@ -15,11 +14,12 @@ usr/bin/pwdhash
 usr/bin/readnsstate
 usr/lib/*/dirsrv/plugins/*.so
 usr/lib/*/dirsrv/python/
-usr/lib/*/ds_selinux_enabled
-usr/lib/*/ds_selinux_port_query
-usr/lib/*/ds_systemd_ask_password_acl
+usr/libexec/ds_selinux_enabled
+usr/libexec/ds_selinux_port_query
+usr/libexec/ds_systemd_ask_password_acl
 usr/lib/sysctl.d/70-dirsrv.conf
 usr/sbin/dbverify
+usr/sbin/dscontainer
 usr/sbin/ldap-agent
 usr/sbin/ldif2ldap
 usr/sbin/ns-slapd

debian/changelog

+389-ds-base (1.4.1.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * watch: Use https.
+  * control: Bump policy to 4.4.0.
+  * Bump debhelper to 12.
+  * patches: fix-dsctl-remove.diff, fix-nss-path.diff, icu_pkg-config.patch removed,
+    upstream. Others refreshed.
+  * rules: Pass --enable-perl, we still need the perl tools.
+  * *.install: Updated.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 08 Jul 2019 11:46:19 +0300
+
 389-ds-base (1.4.0.22-1) unstable; urgency=medium
 
   * New upstream bugfix release.

debian/cockpit-389-ds.install

 usr/share/cockpit/389-console/
-usr/share/metainfo/389-console/org.cockpit-project.389-console.metainfo.xml
+usr/share/metainfo/389-console/org.port389.cockpit_console.metainfo.xml

debian/compat

-11
+12

debian/control

@@ -6,7 +6,7 @@ Uploaders:
  Timo Aaltonen <tjaalton@debian.org>,
 Build-Depends:
  libcmocka-dev,
- debhelper (>= 11),
+ debhelper (>= 12),
  dh-python,
  doxygen,
  libbz2-dev,
@@ -38,7 +38,7 @@ Build-Depends:
  python3-six,
  rsync,
  zlib1g-dev,
-Standards-Version: 4.1.0
+Standards-Version: 4.4.0
 Vcs-Git: https://salsa.debian.org/freeipa-team/389-ds-base.git
 Vcs-Browser: https://salsa.debian.org/freeipa-team/389-ds-base.git
 Homepage: http://directory.fedoraproject.org

debian/patches/CVE-2017-15135.patch

@@ -119,7 +119,7 @@ Review by: ???
      }
 --- a/ldap/servers/plugins/pwdstorage/crypt_pwd.c
 +++ b/ldap/servers/plugins/pwdstorage/crypt_pwd.c
-@@ -36,7 +36,7 @@ static unsigned char itoa64[] = /* 0 ...
+@@ -42,7 +42,7 @@ static unsigned char itoa64[] = /* 0 ...
  int
  crypt_pw_cmp(const char *userpwd, const char *dbpwd)
  {
@@ -128,7 +128,7 @@ Review by: ???
      char *cp;
      struct crypt_data data;
      data.initialized = 0;
-@@ -44,7 +44,7 @@ crypt_pw_cmp(const char *userpwd, const
+@@ -50,7 +50,7 @@ crypt_pw_cmp(const char *userpwd, const
      /* we use salt (first 2 chars) of encoded password in call to crypt_r() */
      cp = crypt_r(userpwd, dbpwd, &data);
      if (cp) {
@@ -184,7 +184,7 @@ Review by: ???
      if (dbhash && dbhash != quick_dbhash)
 --- a/ldap/servers/slapd/ch_malloc.c
 +++ b/ldap/servers/slapd/ch_malloc.c
-@@ -336,8 +336,8 @@ slapi_ch_smprintf(const char *fmt, ...)
+@@ -331,8 +331,8 @@ slapi_ch_smprintf(const char *fmt, ...)
  
  /* Constant time memcmp. Does not shortcircuit on failure! */
  /* This relies on p1 and p2 both being size at least n! */
@@ -195,7 +195,7 @@ Review by: ???
  {
      int result = 0;
      const unsigned char *_p1 = (const unsigned char *)p1;
-@@ -347,9 +347,35 @@ slapi_ct_memcmp(const void *p1, const vo
+@@ -342,9 +342,35 @@ slapi_ct_memcmp(const void *p1, const vo
          return 2;
      }
  
@@ -236,7 +236,7 @@ Review by: ???
      return result;
 --- a/ldap/servers/slapd/slapi-plugin.h
 +++ b/ldap/servers/slapd/slapi-plugin.h
-@@ -5864,7 +5864,7 @@ char *slapi_ch_smprintf(const char *fmt,
+@@ -5781,7 +5781,7 @@ char *slapi_ch_smprintf(const char *fmt,
   * \param n length in bytes of the content of p1 AND p2.
   * \return 0 on match. 1 on non-match. 2 on presence of NULL pointer in p1 or p2.
   */

debian/patches/fix-dsctl-remove.diff

-https://pagure.io/lib389/issue/107
-
---- a/src/lib389/lib389/instance/remove.py
-+++ b/src/lib389/lib389/instance/remove.py
-@@ -39,7 +39,7 @@ def remove_ds_instance(dirsrv, force=Fal
-     remove_paths['tmpfiles_d'] = dirsrv.ds_paths.tmpfiles_d + "/dirsrv-" + dirsrv.serverid + ".conf"
-     remove_paths['inst_dir'] = dirsrv.ds_paths.inst_dir
- 
--    marker_path = "%s/sysconfig/dirsrv-%s" % (dirsrv.ds_paths.sysconf_dir, dirsrv.serverid)
-+    marker_path = "%s/dirsrv-%s" % (dirsrv.ds_paths.initconfig_dir, dirsrv.serverid)
-     etc_dirsrv_path = os.path.join(dirsrv.ds_paths.sysconf_dir, 'dirsrv/')
-     ssca_path = os.path.join(etc_dirsrv_path, 'ssca/')
- 

debian/patches/fix-nss-path.diff

---- a/include/ldaputil/certmap.h
-+++ b/include/ldaputil/certmap.h
-@@ -16,7 +16,7 @@
- /* What was extcmap.h begins ... */
- 
- #include <ldap.h>
--#include <nss3/cert.h>
-+#include <nss/cert.h>
- 
- #ifndef NSAPI_PUBLIC
- #define NSAPI_PUBLIC
---- a/lib/ldaputil/examples/init.c
-+++ b/lib/ldaputil/examples/init.c
-@@ -15,7 +15,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <nss3/cert.h>
-+#include <nss/cert.h>
- #include "certmap.h" /* Public Certmap API */
- #include "plugin.h"  /* must define extern "C" functions */
- 

debian/patches/fix-saslpath.diff

 --- a/ldap/servers/slapd/ldaputil.c
 +++ b/ldap/servers/slapd/ldaputil.c
-@@ -962,10 +962,14 @@ ldaputil_get_saslpath()
+@@ -827,10 +827,14 @@ ldaputil_get_saslpath()
          if (PR_SUCCESS != PR_Access(saslpath, PR_ACCESS_EXISTS)) {
  #ifdef CPU_arm
              /* the 64-bit ARMv8 architecture. */
@@ -17,7 +17,7 @@
  #endif
          }
  #else
-@@ -973,14 +977,14 @@ ldaputil_get_saslpath()
+@@ -838,14 +842,14 @@ ldaputil_get_saslpath()
          if (PR_SUCCESS != PR_Access(saslpath, PR_ACCESS_EXISTS)) {
  #ifdef CPU_arm
              /* the latest 32 bit ARM architecture using the hard-float version of EABI. */
@@ -37,7 +37,7 @@
  #endif
 --- a/configure.ac
 +++ b/configure.ac
-@@ -563,7 +563,8 @@ case $host in
+@@ -655,7 +655,8 @@ case $host in
        arm-*-linux*)
          AC_DEFINE([CPU_arm], [], [cpu type arm])
          ;;
@@ -47,7 +47,7 @@
          ;;
        ppc64-*-linux*)
          ;;
-@@ -572,6 +573,7 @@ case $host in
+@@ -664,6 +665,7 @@ case $host in
        s390-*-linux*)
          ;;
        s390x-*-linux*)

debian/patches/fix-systemctl-path.diff

@@ -3,18 +3,18 @@ Author: Timo Aaltonen <tjaalton@debian.org>
 
 --- a/ldap/admin/src/scripts/start-dirsrv.in
 +++ b/ldap/admin/src/scripts/start-dirsrv.in
-@@ -55,7 +55,7 @@ start_instance() {
+@@ -36,7 +36,7 @@ start_instance() {
      # otherwise start the instance the old way.
      #
      if [ -d "@systemdsystemunitdir@" ] && [ $(id -u) -eq 0 ];then
--        @bindir@/systemctl start @package_name@@$SERV_ID.service
-+        /bin/systemctl start @package_name@@$SERV_ID.service
+-        @bindir@/systemctl start @package_name@@$SERV_ID.service -l
++        /bin/systemctl start @package_name@@$SERV_ID.service -l
          if [ $? -ne 0 ]; then
              return 1
          fi
 --- a/ldap/admin/src/scripts/stop-dirsrv.in
 +++ b/ldap/admin/src/scripts/stop-dirsrv.in
-@@ -43,12 +43,12 @@ stop_instance() {
+@@ -27,12 +27,12 @@ stop_instance() {
          # 
          # Now, check if systemctl is aware of this running instance
          #
@@ -24,8 +24,28 @@ Author: Timo Aaltonen <tjaalton@debian.org>
              # 
              # systemctl sees the running process, so stop it correctly
              #
--            @bindir@/systemctl stop @package_name@@$SERV_ID.service
-+            /bin/systemctl stop @package_name@@$SERV_ID.service
+-            @bindir@/systemctl stop @package_name@@$SERV_ID.service -l
++            /bin/systemctl stop @package_name@@$SERV_ID.service -l
          else
              # 
              # Have to kill it since systemctl doesn't think it's running
+--- a/ldap/admin/src/scripts/status-dirsrv.in
++++ b/ldap/admin/src/scripts/status-dirsrv.in
+@@ -27,7 +27,7 @@ status_instance() {
+     # Use systemctl if available.
+     #
+     if [ -d "@systemdsystemunitdir@" ] && [ $(id -u) -eq 0 ];then
+-        @bindir@/systemctl status @package_name@@$SERV_ID.service -l --no-pager
++        /bin/systemctl status @package_name@@$SERV_ID.service -l --no-pager
+         rv=$?
+         if [ $rv -ne 0 ]; then
+             return 1
+@@ -69,7 +69,7 @@ if [ $# -eq 0 ]; then
+     # Use systemctl if available and running as root,
+     #
+     if [ -d "@systemdsystemunitdir@" ] && [ $(id -u) -eq 0 ];then
+-        @bindir@/systemctl status @package_name@@*.service -l --no-pager
++        /bin/systemctl status @package_name@@*.service -l --no-pager
+         ret=$?
+         if [ $? -ne 0 ]; then
+             return 1

debian/patches/icu_pkg-config.patch

-Description: Use pkg-config to detect icu, since icu-config is deprecated 
- and will be removed from Debian
-Bug: https://pagure.io/389-ds-base/issue/50067
-Bug-Debian: https://bugs.debian.org/916115
-Forwarded: https://pagure.io/389-ds-base/pull-request/50111
-Author: Hugh McMaster <hugh.mcmaster@outlook.com>
-Last-Update: 2018-12-28
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -172,7 +172,6 @@
- 
- DB_LINK = @db_lib@ -ldb-@db_libver@
- SASL_LINK = @sasl_lib@ -lsasl2
--ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
- PCRE_LINK = @pcre_lib@ -lpcre
- NETSNMP_LINK = @netsnmp_lib@ @netsnmp_link@
- PAM_LINK = -lpam
-@@ -1616,8 +1615,8 @@
-         ldap/servers/plugins/collation/config.c \
-         ldap/servers/plugins/collation/orfilter.c
- 
--libcollation_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) @icu_inc@
--libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
-+libcollation_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(ICU_CFLAGS)
-+libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LIBS) $(LIBCSTD) $(LIBCRUN)
- libcollation_plugin_la_DEPENDENCIES = libslapd.la
- libcollation_plugin_la_LDFLAGS = -avoid-version
- # libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
-@@ -1859,8 +1858,8 @@
- 	ldap/servers/plugins/replication/windows_protocol_util.c \
- 	ldap/servers/plugins/replication/windows_tot_protocol.c
- 
--libreplication_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) @icu_inc@ @db_inc@
--libreplication_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(ICU_LINK) $(DB_LINK)
-+libreplication_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(ICU_CFLAGS) @db_inc@
-+libreplication_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(ICU_LIBS) $(DB_LINK)
- libreplication_plugin_la_DEPENDENCIES = libslapd.la
- libreplication_plugin_la_LDFLAGS = -avoid-version
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,6 +34,7 @@
- AM_PROG_CC_C_O
- AM_PROG_AS
- AC_PROG_CC_STDC
-+PKG_PROG_PKG_CONFIG
- 
- # disable static libs by default - we only use a couple
- AC_DISABLE_STATIC
---- a/m4/icu.m4
-+++ b/m4/icu.m4
-@@ -6,95 +6,22 @@
- # See LICENSE for details. 
- # END COPYRIGHT BLOCK
- 
--AC_CHECKING(for LIBICU)
--
--# check for --with-icu
--AC_MSG_CHECKING(for --with-icu)
--AC_ARG_WITH(icu, AS_HELP_STRING([--with-icu@<:@=PATH@:>@],[ICU directory]),
--[
--  if test "$withval" = "yes"
--  then
--    AC_MSG_RESULT(yes)
--  elif test "$withval" = "no"
--  then
--    AC_MSG_RESULT(no)
--    AC_MSG_ERROR([ICU is required.])
--  elif test -d "$withval"/lib
--  then
--    AC_MSG_RESULT([using $withval])
--    ICUDIR=$withval
--    icu_lib="-L$ICUDIR/lib"
--    icu_inc="-I$withval/include"
--    icu_bin="$withval/bin"
--  else
--    echo
--    AC_MSG_ERROR([$withval not found])
--  fi
--],
--AC_MSG_RESULT(yes))
--
--# check for --with-icu-inc
--AC_MSG_CHECKING(for --with-icu-inc)
--AC_ARG_WITH(icu-inc, AS_HELP_STRING([--with-icu-inc=PATH],[ICU include directory]),
-+# check for --enable-icu
-+AC_MSG_CHECKING([whether to enable internationalization support])
-+AC_ARG_ENABLE(icu, AS_HELP_STRING([--enable-icu], [Enable internationalization support]),
- [
--  if test -d "$withval"
--  then
--    AC_MSG_RESULT([using $withval])
--    icu_inc="-I$withval"
--  else
--    echo
--    AC_MSG_ERROR([$withval not found])
--  fi
--],
--AC_MSG_RESULT(no))
--
--# check for --with-icu-lib
--AC_MSG_CHECKING(for --with-icu-lib)
--AC_ARG_WITH(icu-lib, AS_HELP_STRING([--with-icu-lib=PATH],[ICU library directory]),
--[
--  if test -d "$withval"
--  then
--    AC_MSG_RESULT([using $withval])
--    icu_lib="-L$withval"
--  else
--    echo
--    AC_MSG_ERROR([$withval not found])
--  fi
--],
--AC_MSG_RESULT(no))
--
--# check for --with-icu-bin
--AC_MSG_CHECKING(for --with-icu-bin)
--AC_ARG_WITH(icu-bin, AS_HELP_STRING([--with-icu-bin=PATH],[ICU binary directory]),
--[
--  if test -d "$withval"
--  then
--    AC_MSG_RESULT([using $withval])
--    icu_bin="$withval"
--  else
--    echo
--    AC_MSG_ERROR([$withval not found])
--  fi
--],
--AC_MSG_RESULT(no))
--# if ICU is not found yet, try pkg-config
--
--# last resort
--if test -z "$icu_lib"; then
--  AC_PATH_PROG(ICU_CONFIG, icu-config)
--  AC_MSG_CHECKING(for icu with icu-config)
--  if test -n "$ICU_CONFIG"; then
--    icu_lib=`$ICU_CONFIG --ldflags-searchpath`
--    icu_inc=`$ICU_CONFIG --cppflags-searchpath`
--    icu_bin=`$ICU_CONFIG --bindir`
--    AC_MSG_RESULT([using system ICU])
--  else
--    AC_MSG_ERROR([ICU not found, specify with --with-icu.])
--  fi
-+  case "${enableval}" in
-+    yes) enable_icu=true ;;
-+    no)  enable_icu=false ;;
-+    *)   AC_MSG_ERROR([unknown option '${enableval}' for --enable-icu]) ;;
-+  esac
-+], [
-+  enable_icu=false
-+])
-+
-+if test "$enable_icu" = true; then
-+  AC_MSG_RESULT([yes])
-+  PKG_CHECK_MODULES([ICU], [icu-i18n])
-+else
-+  AC_MSG_RESULT([no])
- fi
--
--
--AC_SUBST(icu_lib)
--AC_SUBST(icu_inc)
--AC_SUBST(icu_bin)
--

debian/patches/series

@@ -5,6 +5,3 @@ fix-saslpath.diff
 fix-systemctl-path.diff
 CVE-2017-15135.patch
 perl-use-move-instead-of-rename.diff
-icu_pkg-config.patch
-fix-nss-path.diff
-fix-dsctl-remove.diff

debian/rules

@@ -83,7 +83,8 @@ override_dh_auto_configure:
 		--with-tmpfiles-d=/etc/tmpfiles.d \
 		--enable-autobind \
 		--enable-cmocka \
-		--enable-icu
+		--enable-icu \
+		--enable-perl
 
 override_dh_auto_build:
 	(cd src/lib389 && python3 setup.py build)