.gitignore | 167 +++++++++++++++++++++++++++++
Makefile.am | 254 ++++++++++++++++++++++++++++++++++++++++++++
Makefile.in | 276 ++++++++++++++++++++++++++++++++++++++++++++++--
VERSION.sh | 26 +---
aclocal.m4 | 17 ++
configure | 181 ++++++++++++++++++-------------
configure.ac | 6 -
rpm/389-ds-base.spec.in | 6 -
8 files changed, 826 insertions(+), 107 deletions(-)
New commits:
commit c7fe975c9c90ff57bd28fe983c8be8b1a5cf3c42
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Sep 16 11:51:13 2015 -0700
Ticket #48277 - Assorted build fixes and make rpms target
Description: Per team disuccsion, keep autogenerated files in the git repository.
https://fedorahosted.org/389/ticket/48277
diff --git a/Makefile.in b/Makefile.in
index a29509d..af69b68 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,9 +95,10 @@ noinst_PROGRAMS = makstrdb$(EXEEXT)
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in depcomp $(dist_man_MANS) \
- $(serverinc_HEADERS) README compile config.guess config.sub \
- install-sh missing ltmain.sh
+ $(srcdir)/config.h.in $(top_srcdir)/rpm/389-ds-base.spec.in \
+ depcomp $(dist_man_MANS) $(dist_noinst_DATA) \
+ $(dist_noinst_HEADERS) $(serverinc_HEADERS) README compile \
+ config.guess config.sub install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -116,7 +117,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = rpm/389-ds-base.spec
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
@@ -1224,11 +1225,12 @@ man1dir = $(mandir)/man1
man8dir = $(mandir)/man8
NROFF = nroff
MANS = $(dist_man_MANS)
-DATA = $(config_DATA) $(inf_DATA) $(initconfig_DATA) $(mib_DATA) \
- $(nodist_property_DATA) $(perl_DATA) $(pkgconfig_DATA) \
- $(property_DATA) $(python_DATA) $(sampledata_DATA) \
- $(schema_DATA) $(systemdsystemunit_DATA) $(update_DATA)
-HEADERS = $(serverinc_HEADERS)
+DATA = $(config_DATA) $(dist_noinst_DATA) $(inf_DATA) \
+ $(initconfig_DATA) $(mib_DATA) $(nodist_property_DATA) \
+ $(perl_DATA) $(pkgconfig_DATA) $(property_DATA) $(python_DATA) \
+ $(sampledata_DATA) $(schema_DATA) $(systemdsystemunit_DATA) \
+ $(update_DATA)
+HEADERS = $(dist_noinst_HEADERS) $(serverinc_HEADERS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
@@ -1347,6 +1349,8 @@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
+RPM_RELEASE = @RPM_RELEASE@
+RPM_VERSION = @RPM_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1508,6 +1512,8 @@ DS_DEFINES = -DBUILD_NUM=$(BUILDNUM)
-DVENDOR="\"$(vendor)\"" -DBRAND="\"$(brand
@enable_nunc_stans_TRUE@NUNC_STANS_INCLUDES = $(nunc_stans_inc)
@enable_nunc_stans_TRUE@NUNC_STANS_LINK = $(nunc_stans_lib) -lnunc-stans
+@enable_nunc_stans_FALSE@NUNC_STANS_ON = 0
+@enable_nunc_stans_TRUE@NUNC_STANS_ON = 1
DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include
-I. $(NUNC_STANS_INCLUDES)
# these paths are dependent on the settings of prefix and exec_prefix which may be
specified
@@ -1654,6 +1660,230 @@ serverplugin_LTLIBRARIES = libacl-plugin.la
libattr-unique-plugin.la \
nodist_property_DATA = ns-slapd.properties
noinst_LIBRARIES = libavl.a libldaputil.a
+dist_noinst_HEADERS = \
+ include/i18n.h \
+ include/netsite.h \
+ include/base/crit.h \
+ include/base/dbtbase.h \
+ include/base/ereport.h \
+ include/base/file.h \
+ include/base/fsmutex.h \
+ include/base/plist.h \
+ include/base/pool.h \
+ include/base/shexp.h \
+ include/base/systems.h \
+ include/base/systhr.h \
+ include/base/util.h \
+ include/ldaputil/cert.h \
+ include/ldaputil/certmap.h \
+ include/ldaputil/dbconf.h \
+ include/ldaputil/encode.h \
+ include/ldaputil/errors.h \
+ include/ldaputil/extcmap.h \
+ include/ldaputil/init.h \
+ include/ldaputil/ldapauth.h \
+ include/ldaputil/ldaputil.h \
+ include/libaccess/aclerror.h \
+ include/libaccess/acleval.h \
+ include/libaccess/aclglobal.h \
+ include/libaccess/acl.h \
+ include/libaccess/aclproto.h \
+ include/libaccess/aclstruct.h \
+ include/libaccess/attrec.h \
+ include/libaccess/authdb.h \
+ include/libaccess/dbtlibaccess.h \
+ include/libaccess/dnfstruct.h \
+ include/libaccess/ipfstruct.h \
+ include/libaccess/las.h \
+ include/libaccess/nsautherr.h \
+ include/libaccess/nsauth.h \
+ include/libaccess/nserror.h \
+ include/libaccess/symbols.h \
+ include/libaccess/userauth.h \
+ include/libaccess/usi.h \
+ include/libaccess/usrcache.h \
+ include/libadmin/dbtlibadmin.h \
+ include/libadmin/libadmin.h \
+ include/public/netsite.h \
+ include/public/nsapi.h \
+ include/public/base/systems.h \
+ include/public/nsacl/aclapi.h \
+ include/public/nsacl/acldef.h \
+ include/public/nsacl/nserrdef.h \
+ include/public/nsacl/plistdef.h \
+ ldap/include/avl.h \
+ ldap/include/dblayer.h \
+ ldap/include/disptmpl.h \
+ ldap/include/ldaplog.h \
+ ldap/include/ldaprot.h \
+ ldap/include/ldbm.h \
+ ldap/include/portable.h \
+ ldap/include/regex.h \
+ ldap/include/srchpref.h \
+ ldap/include/sysexits-compat.h \
+ ldap/servers/plugins/collation/config.h \
+ ldap/servers/plugins/collation/collate.h \
+ ldap/servers/plugins/collation/orfilter.h \
+ ldap/servers/plugins/chainingdb/cb.h \
+ ldap/servers/plugins/deref/deref.h \
+ ldap/servers/plugins/acctpolicy/acctpolicy.h \
+ ldap/servers/plugins/posix-winsync/posix-wsp-ident.h \
+ ldap/servers/plugins/posix-winsync/posix-group-func.h \
+ ldap/servers/plugins/roles/roles_cache.h \
+ ldap/servers/plugins/usn/usn.h \
+ ldap/servers/plugins/pwdstorage/pwdstorage.h \
+ ldap/servers/plugins/pwdstorage/md5.h \
+ ldap/servers/plugins/acl/acl.h \
+ ldap/servers/plugins/linkedattrs/linked_attrs.h \
+ ldap/servers/plugins/rootdn_access/rootdn_access.h \
+ ldap/servers/plugins/acct_usability/acct_usability.h \
+ ldap/servers/plugins/retrocl/retrocl.h \
+ ldap/servers/plugins/uiduniq/plugin-utils.h \
+ ldap/servers/plugins/memberof/memberof.h \
+ ldap/servers/plugins/replication/cl5_api.h \
+ ldap/servers/plugins/replication/cl4_api.h \
+ ldap/servers/plugins/replication/llist.h \
+ ldap/servers/plugins/replication/repl_shared.h \
+ ldap/servers/plugins/replication/csnpl.h \
+ ldap/servers/plugins/replication/cl5.h \
+ ldap/servers/plugins/replication/repl-session-plugin.h \
+ ldap/servers/plugins/replication/repl.h \
+ ldap/servers/plugins/replication/windows_prot_private.h \
+ ldap/servers/plugins/replication/repl_helper.h \
+ ldap/servers/plugins/replication/repl_objset.h \
+ ldap/servers/plugins/replication/repl5.h \
+ ldap/servers/plugins/replication/cl5_test.h \
+ ldap/servers/plugins/replication/repl5_ruv.h \
+ ldap/servers/plugins/replication/cl5_clcache.h \
+ ldap/servers/plugins/replication/cl4.h \
+ ldap/servers/plugins/replication/cl_crypt.h \
+ ldap/servers/plugins/replication/urp.h \
+ ldap/servers/plugins/replication/winsync-plugin.h \
+ ldap/servers/plugins/replication/windowsrepl.h \
+ ldap/servers/plugins/replication/repl5_prot_private.h \
+ ldap/servers/plugins/pam_passthru/pam_passthru.h \
+ ldap/servers/plugins/syntaxes/syntax.h \
+ ldap/servers/plugins/cos/cos_cache.h \
+ ldap/servers/plugins/sync/sync.h \
+ ldap/servers/plugins/passthru/passthru.h \
+ ldap/servers/plugins/rever/rever.h \
+ ldap/servers/plugins/http/http_client.h \
+ ldap/servers/plugins/http/http_impl.h \
+ ldap/servers/plugins/automember/automember.h \
+ ldap/servers/plugins/mep/mep.h \
+ ldap/servers/slapd/agtmmap.h \
+ ldap/servers/slapd/auth.h \
+ ldap/servers/slapd/csngen.h \
+ ldap/servers/slapd/disconnect_errors.h \
+ ldap/servers/slapd/disconnect_error_strings.h \
+ ldap/servers/slapd/fe.h \
+ ldap/servers/slapd/filter.h \
+ ldap/servers/slapd/getopt_ext.h \
+ ldap/servers/slapd/getsocketpeer.h \
+ ldap/servers/slapd/http.h \
+ ldap/servers/slapd/index_subsys.h \
+ ldap/servers/slapd/intrinsics.h \
+ ldap/servers/slapd/log.h \
+ ldap/servers/slapd/mozldap.h \
+ ldap/servers/slapd/openldapber.h \
+ ldap/servers/slapd/poll_using_select.h \
+ ldap/servers/slapd/prerrstrs.h \
+ ldap/servers/slapd/protect_db.h \
+ ldap/servers/slapd/proto-slap.h \
+ ldap/servers/slapd/pw.h \
+ ldap/servers/slapd/secerrstrs.h \
+ ldap/servers/slapd/slap.h \
+ ldap/servers/slapd/slapi-plugin-compat4.h \
+ ldap/servers/slapd/slapi-plugin.h \
+ ldap/servers/slapd/slapi-private.h \
+ ldap/servers/slapd/snmp_collator.h \
+ ldap/servers/slapd/sslerrstrs.h \
+ ldap/servers/slapd/statechange.h \
+ ldap/servers/slapd/uuid.h \
+ ldap/servers/slapd/vattr_spi.h \
+ ldap/servers/slapd/views.h \
+ ldap/servers/slapd/back-ldbm/attrcrypt.h \
+ ldap/servers/slapd/back-ldbm/back-ldbm.h \
+ ldap/servers/slapd/back-ldbm/dblayer.h \
+ ldap/servers/slapd/back-ldbm/idlapi.h \
+ ldap/servers/slapd/back-ldbm/import.h \
+ ldap/servers/slapd/back-ldbm/ldbm_config.h \
+ ldap/servers/slapd/back-ldbm/perfctrs.h \
+ ldap/servers/slapd/back-ldbm/proto-back-ldbm.h \
+ ldap/servers/slapd/back-ldbm/vlv_key.h \
+ ldap/servers/slapd/back-ldbm/vlv_srch.h \
+ ldap/servers/slapd/tools/ldaptool.h \
+ ldap/servers/slapd/tools/ldaptool-sasl.h \
+ ldap/servers/slapd/tools/ldclt/ldap-private.h \
+ ldap/servers/slapd/tools/ldclt/ldclt.h \
+ ldap/servers/slapd/tools/ldclt/port.h \
+ ldap/servers/slapd/tools/ldclt/remote.h \
+ ldap/servers/slapd/tools/ldclt/scalab01.h \
+ ldap/servers/slapd/tools/ldclt/utils.h \
+ ldap/servers/slapd/tools/rsearch/addthread.h \
+ ldap/servers/slapd/tools/rsearch/infadd.h \
+ ldap/servers/slapd/tools/rsearch/nametable.h \
+ ldap/servers/slapd/tools/rsearch/rsearch.h \
+ ldap/servers/slapd/tools/rsearch/sdattable.h \
+ ldap/servers/slapd/tools/rsearch/searchthread.h \
+ ldap/servers/snmp/ldap-agent.h \
+ ldap/systools/pio.h \
+ lib/base/lexer_pvt.h \
+ lib/base/plist_pvt.h \
+ lib/ldaputil/ldaputili.h \
+ lib/libaccess/access_plhash.h \
+ lib/libaccess/aclcache.h \
+ lib/libaccess/aclpriv.h \
+ lib/libaccess/aclscan.h \
+ lib/libaccess/acl.tab.h \
+ lib/libaccess/aclutil.h \
+ lib/libaccess/lasdns.h \
+ lib/libaccess/las.h \
+ lib/libaccess/lasip.h \
+ lib/libaccess/ldapauth.h \
+ lib/libaccess/oneeval.h \
+ lib/libaccess/parse.h \
+ lib/libaccess/permhash.h \
+ lib/libsi18n/getstrmem.h \
+ lib/libsi18n/gsslapd.h \
+ lib/libsi18n/reshash.h \
+ lib/libsi18n/txtfile.h \
+ $(NULL)
+
+dist_noinst_DATA = \
+ buildnum.pl \
+ dirsrv.pc.in \
+ ldap/admin/src/*.pl \
+ ldap/admin/src/*.in \
+ ldap/admin/src/scripts/*.in \
+ ldap/admin/src/scripts/*.ldif \
+ ldap/admin/src/scripts/*.pl \
+ ldap/admin/src/scripts/*.pm \
+ ldap/admin/src/scripts/*.py \
+ ldap/admin/src/scripts/*.sh \
+ ldap/admin/src/scripts/migrate-ds.res \
+ ldap/ldif/*.in \
+ ldap/ldif/*.ldif \
+ ldap/schema/*ldif \
+ ldap/schema/slapd-collations.conf \
+ ldap/servers/slapd/mkDBErrStrs.pl \
+ ldap/servers/slapd/tools/rsearch/scripts/dbgen* \
+ ldap/servers/snmp/ldap-agent.conf \
+ ldap/servers/snmp/redhat-directory.mib \
+ lib/ldaputil/certmap.conf \
+ m4 \
+ rpm/389-ds-base.spec.in \
+ rpm/389-ds-base-devel.README \
+ rpm/389-ds-base-git.sh \
+ selinux \
+ README \
+ LICENSE \
+ LICENSE.* \
+ VERSION.sh \
+ wrappers/*.in \
+ wrappers/systemd.template.sysconfig \
+ $(NULL)
+
#------------------------
# Installed Files
@@ -3022,6 +3252,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
+rpm/389-ds-base.spec: $(top_builddir)/config.status
$(top_srcdir)/rpm/389-ds-base.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -10549,6 +10781,32 @@ git-archive:
fi ; \
git archive --prefix=$(distdir)/ $$gittag | bzip2 > $$srcdistdir/$(distdir).tar.bz2
+# RPM-related tasks
+
+RPMBUILD ?= $(PWD)/rpmbuild
+
+rpmroot:
+ $(MKDIR_P) $(RPMBUILD)/BUILD
+ $(MKDIR_P) $(RPMBUILD)/RPMS
+ $(MKDIR_P) $(RPMBUILD)/SOURCES
+ $(MKDIR_P) $(RPMBUILD)/SPECS
+ $(MKDIR_P) $(RPMBUILD)/SRPMS
+
+rpmbrprep: dist-bzip2 rpmroot
+ cp $(distdir).tar.bz2 $(RPMBUILD)/SOURCES
+ cp $(builddir)/rpm/389-ds-base-git.sh $(RPMBUILD)/SOURCES
+ cp $(builddir)/rpm/389-ds-base-devel.README $(RPMBUILD)/SOURCES
+ sed -e "s/__VERSION__/$(RPM_VERSION)/" -e
"s/__RELEASE__/$(RPM_RELEASE)/" -e
"s/__NUNC_STANS_ON__/$(NUNC_STANS_ON)/" < $(builddir)/rpm/389-ds-base.spec
> $(RPMBUILD)/SPECS/389-ds-base.spec
+
+rpms: rpmbrprep
+ cd $(RPMBUILD); \
+ rpmbuild --define "_topdir $(RPMBUILD)" -ba SPECS/389-ds-base.spec
+
+srpm: rpmbrprep
+ cd $(RPMBUILD); \
+ rpmbuild --define "_topdir $(RPMBUILD)" \
+ -bs SPECS/389-ds-base.spec
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
index 7afd01a..6681aa3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1019,6 +1019,23 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }])
+
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
diff --git a/configure b/configure
index 2ce6f47..0274c94 100755
--- a/configure
+++ b/configure
@@ -828,6 +828,8 @@ MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
CONSOLE_VERSION
+RPM_RELEASE
+RPM_VERSION
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -3339,7 +3341,92 @@ AMTAR='$${TAR-tar}'
# We'll loop over all known methods to create a tar archive until one works.
_am_tools='gnutar pax cpio none'
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf
-'
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar
archive" >&5
+$as_echo_n "checking how to create a pax tar archive... " >&6; }
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_pax-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ { echo "$as_me:$LINENO: $_am_tar --version" >&5
+ ($_am_tar --version) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && break
+ done
+ am__tar="$_am_tar --format=posix -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=posix -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x pax -w "$$tardir"'
+ am__tar_='pax -L -x pax -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H pax -L'
+ am__tar_='find "$tardir" -print | cpio -o -H pax -L'
+ am__untar='cpio -i -H pax -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_pax}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_
>conftest.tar" >&5
+ (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5
2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+ ($am__untar <conftest.tar) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+ (cat conftest.dir/file) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
+ rm -rf conftest.dir
+
+ if ${am_cv_prog_tar_pax+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ am_cv_prog_tar_pax=$_am_tool
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax"
>&5
+$as_echo "$am_cv_prog_tar_pax" >&6; }
@@ -3361,6 +3448,8 @@ _ACEOF
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable
maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles...
" >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -17935,14 +18024,10 @@ fi
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
-# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FHS..." >&5
@@ -18745,15 +18830,11 @@ fi
# Check for library dependencies
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSPR..." >&5
@@ -18907,15 +18988,11 @@ $as_echo "using system dirsec NSPR" >&6; }
fi
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS..." >&5
@@ -19069,15 +19146,11 @@ $as_echo "using system dirsec NSS" >&6; }
fi
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
-# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenLDAP..." >&5
@@ -19468,15 +19541,11 @@ $as_echo "#define USE_OPENLDAP 1" >>confdefs.h
fi
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla LDAPSDK..."
>&5
@@ -19721,15 +19790,11 @@ $as_echo "#define HAVE_LDAP_URL_PARSE_NO_DEFAULTS 1"
>>confdefs.h
fi
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db..." >&5
@@ -19917,15 +19982,11 @@ else
fi
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
# -*- tab-width: 4; -*-
# Configure paths for SASL
@@ -20036,15 +20097,11 @@ $as_echo "no" >&6; }
fi
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
#
# Configure paths for SVRCORE
@@ -20255,14 +20312,10 @@ fi
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
-# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBICU..." >&5
@@ -20430,14 +20483,10 @@ fi
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
-# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Net-SNMP..." >&5
@@ -20595,15 +20644,11 @@ else
fi
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
-# Copyright (C) 2007 Red Hat, Inc.
# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
# -*- tab-width: 4; -*-
# Configure paths for Kerberos
@@ -20993,15 +21038,11 @@ fi
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE..." >&5
@@ -21131,15 +21172,11 @@ $as_echo "no" >&6; }
fi
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
-# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
# All rights reserved.
#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SELinux..." >&5
@@ -21169,15 +21206,8 @@ fi
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
-# Copyright (C) 2007 Red Hat, Inc.
-# Copyright (C) 2008 Red Hat, Inc.
-# Copyright (C) 2009 Red Hat, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
-# All rights reserved.
-#
# License: GPL (version 3 or any later version).
-# See LICENSE for details.
+# See LICENSE for details.
# END COPYRIGHT BLOCK
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nunc-stans..."
>&5
@@ -21388,7 +21418,7 @@ $as_echo "$as_me: Not using gcc - fixing libtool to remove
gcc-isms . . ." >&6;}
rm -f libtool.tmp
fi
-ac_config_files="$ac_config_files Makefile"
+ac_config_files="$ac_config_files Makefile rpm/389-ds-base.spec"
cat >confcache <<\_ACEOF
@@ -22583,6 +22613,7 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "rpm/389-ds-base.spec") CONFIG_FILES="$CONFIG_FILES
rpm/389-ds-base.spec" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'"
"$LINENO" 5;;
esac
commit f2f6532e77fb4fc5272663eabdbf051e236b5aba
Author: Simo Sorce <simo(a)redhat.com>
Date: Tue Sep 15 17:57:34 2015 -0400
Updating .gitignore
Signed-off-by: Simo Sorce <simo(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index c85d24b..07e31d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,16 @@ autom4te.cache
.deps
rpmbuild
rpm/389-ds-base.spec
+Makefile.in
+aclocal.m4
+compile
+config.guess
+config.h.in
+config.sub
+configure
+depcomp
+install-sh
+missing
Makefile
config.h
config.log
commit 1da84373eceb7da8225700e70edc3a7b54d209e2
Author: Simo Sorce <simo(a)redhat.com>
Date: Tue Sep 15 17:55:21 2015 -0400
Ignore build artifacts
This allows people to actually use git status and have a meaningful output
Signed-off-by: Simo Sorce <simo(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 7c276f9..c85d24b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,160 @@ autom4te.cache
.cproject
.project
.settings
+*.a
+*.dirstamp
+*.la
+*.lo
+*.o
+.libs
.deps
rpmbuild
rpm/389-ds-base.spec
+Makefile
+config.h
+config.log
+config.status
+dberrstrs.h
+dbscan-bin
+dirsrv.pc
+dsktune-bin
+infadd-bin
+ldap-agent-bin
+ldclt-bin
+ldif-bin
+libtool
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+makstrdb
+migratecred-bin
+mmldif-bin
+ns-slapd
+ns-slapd.properties
+pwdhash-bin
+rsearch-bin
+stamp-h1
+ldap/admin/src/dirsrv
+ldap/admin/src/scripts/80upgradednformat.pl
+ldap/admin/src/scripts/DSCreate.pm
+ldap/admin/src/scripts/DSMigration.pm
+ldap/admin/src/scripts/DSSharedLib
+ldap/admin/src/scripts/DSUpdate.pm
+ldap/admin/src/scripts/DSUtil.pm
+ldap/admin/src/scripts/DialogManager.pm
+ldap/admin/src/scripts/Migration.pm
+ldap/admin/src/scripts/Setup.pm
+ldap/admin/src/scripts/SetupDialogs.pm
+ldap/admin/src/scripts/bak2db
+ldap/admin/src/scripts/bak2db.pl
+ldap/admin/src/scripts/cleanallruv.pl
+ldap/admin/src/scripts/db2bak
+ldap/admin/src/scripts/db2bak.pl
+ldap/admin/src/scripts/db2index
+ldap/admin/src/scripts/db2index.pl
+ldap/admin/src/scripts/db2ldif
+ldap/admin/src/scripts/db2ldif.pl
+ldap/admin/src/scripts/dbverify
+ldap/admin/src/scripts/dn2rdn
+ldap/admin/src/scripts/dscreate.map
+ldap/admin/src/scripts/dsorgentries.map
+ldap/admin/src/scripts/dsupdate.map
+ldap/admin/src/scripts/fixup-linkedattrs.pl
+ldap/admin/src/scripts/fixup-memberof.pl
+ldap/admin/src/scripts/ldif2db
+ldap/admin/src/scripts/ldif2db.pl
+ldap/admin/src/scripts/ldif2ldap
+ldap/admin/src/scripts/migrate-ds.pl
+ldap/admin/src/scripts/monitor
+ldap/admin/src/scripts/ns-accountstatus.pl
+ldap/admin/src/scripts/ns-activate.pl
+ldap/admin/src/scripts/ns-inactivate.pl
+ldap/admin/src/scripts/ns-newpwpolicy.pl
+ldap/admin/src/scripts/remove-ds.pl
+ldap/admin/src/scripts/repl-monitor.pl
+ldap/admin/src/scripts/restart-dirsrv
+ldap/admin/src/scripts/restoreconfig
+ldap/admin/src/scripts/saveconfig
+ldap/admin/src/scripts/schema-reload.pl
+ldap/admin/src/scripts/setup-ds.pl
+ldap/admin/src/scripts/setup-ds.res
+ldap/admin/src/scripts/start-dirsrv
+ldap/admin/src/scripts/stop-dirsrv
+ldap/admin/src/scripts/suffix2instance
+ldap/admin/src/scripts/syntax-validate.pl
+ldap/admin/src/scripts/template-bak2db
+ldap/admin/src/scripts/template-bak2db.pl
+ldap/admin/src/scripts/template-cleanallruv.pl
+ldap/admin/src/scripts/template-db2bak
+ldap/admin/src/scripts/template-db2bak.pl
+ldap/admin/src/scripts/template-db2index
+ldap/admin/src/scripts/template-db2index.pl
+ldap/admin/src/scripts/template-db2ldif
+ldap/admin/src/scripts/template-db2ldif.pl
+ldap/admin/src/scripts/template-dbverify
+ldap/admin/src/scripts/template-dn2rdn
+ldap/admin/src/scripts/template-fixup-linkedattrs.pl
+ldap/admin/src/scripts/template-fixup-memberof.pl
+ldap/admin/src/scripts/template-fixup-memberuid.pl
+ldap/admin/src/scripts/template-ldif2db
+ldap/admin/src/scripts/template-ldif2db.pl
+ldap/admin/src/scripts/template-ldif2ldap
+ldap/admin/src/scripts/template-monitor
+ldap/admin/src/scripts/template-ns-accountstatus.pl
+ldap/admin/src/scripts/template-ns-activate.pl
+ldap/admin/src/scripts/template-ns-inactivate.pl
+ldap/admin/src/scripts/template-ns-newpwpolicy.pl
+ldap/admin/src/scripts/template-restart-slapd
+ldap/admin/src/scripts/template-restoreconfig
+ldap/admin/src/scripts/template-saveconfig
+ldap/admin/src/scripts/template-schema-reload.pl
+ldap/admin/src/scripts/template-start-slapd
+ldap/admin/src/scripts/template-stop-slapd
+ldap/admin/src/scripts/template-suffix2instance
+ldap/admin/src/scripts/template-syntax-validate.pl
+ldap/admin/src/scripts/template-upgradednformat
+ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl
+ldap/admin/src/scripts/template-verify-db.pl
+ldap/admin/src/scripts/template-vlvindex
+ldap/admin/src/scripts/upgradedb
+ldap/admin/src/scripts/upgradednformat
+ldap/admin/src/scripts/usn-tombstone-cleanup.pl
+ldap/admin/src/scripts/verify-db.pl
+ldap/admin/src/scripts/vlvindex
+ldap/admin/src/slapd.inf
+ldap/admin/src/template-initconfig
+ldap/ldif/template-baseacis.ldif
+ldap/ldif/template-bitwise.ldif
+ldap/ldif/template-country.ldif
+ldap/ldif/template-dnaplugin.ldif
+ldap/ldif/template-domain.ldif
+ldap/ldif/template-dse.ldif
+ldap/ldif/template-ldapi-autobind.ldif
+ldap/ldif/template-ldapi-default.ldif
+ldap/ldif/template-ldapi.ldif
+ldap/ldif/template-locality.ldif
+ldap/ldif/template-org.ldif
+ldap/ldif/template-orgunit.ldif
+ldap/ldif/template-pampta.ldif
+ldap/ldif/template-sasl.ldif
+ldap/ldif/template-state.ldif
+ldap/ldif/template-suffix-db.ldif
+ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl
+ldap/servers/snmp/ldap-agent.conf
+wrappers/cl-dump
+wrappers/dbscan
+wrappers/dirsrv
+wrappers/dirsrv-snmp
+wrappers/dsktune
+wrappers/infadd
+wrappers/ldap-agent
+wrappers/ldclt
+wrappers/ldif
+wrappers/migratecred
+wrappers/mmldif
+wrappers/pwdhash
+wrappers/repl-monitor
+wrappers/rsearch
+
commit 44cc536083277510230053275f966d283e2c7eae
Author: Simo Sorce <simo(a)redhat.com>
Date: Tue Sep 15 17:29:23 2015 -0400
Add make rpms target
This allows rpms to be built straight from the development tree.
Signed-off-by: Simo Sorce <simo(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index ea1af3e..7c276f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@ autom4te.cache
.cproject
.project
.settings
+.deps
+rpmbuild
+rpm/389-ds-base.spec
diff --git a/Makefile.am b/Makefile.am
index a9a2d61..755e215 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,9 @@ DS_DEFINES = -DBUILD_NUM=$(BUILDNUM)
-DVENDOR="\"$(vendor)\"" -DBRAND="\"$(brand
if enable_nunc_stans
NUNC_STANS_INCLUDES = $(nunc_stans_inc)
NUNC_STANS_LINK = $(nunc_stans_lib) -lnunc-stans
+NUNC_STANS_ON = 1
+else
+NUNC_STANS_ON = 0
endif
DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include
-I. $(NUNC_STANS_INCLUDES)
@@ -1940,3 +1943,30 @@ git-archive:
fi ; \
git archive --prefix=$(distdir)/ $$gittag | bzip2 > $$srcdistdir/$(distdir).tar.bz2
+
+# RPM-related tasks
+
+RPMBUILD ?= $(PWD)/rpmbuild
+
+rpmroot:
+ $(MKDIR_P) $(RPMBUILD)/BUILD
+ $(MKDIR_P) $(RPMBUILD)/RPMS
+ $(MKDIR_P) $(RPMBUILD)/SOURCES
+ $(MKDIR_P) $(RPMBUILD)/SPECS
+ $(MKDIR_P) $(RPMBUILD)/SRPMS
+
+rpmbrprep: dist-bzip2 rpmroot
+ cp $(distdir).tar.bz2 $(RPMBUILD)/SOURCES
+ cp $(builddir)/rpm/389-ds-base-git.sh $(RPMBUILD)/SOURCES
+ cp $(builddir)/rpm/389-ds-base-devel.README $(RPMBUILD)/SOURCES
+ sed -e "s/__VERSION__/$(RPM_VERSION)/" -e
"s/__RELEASE__/$(RPM_RELEASE)/" -e
"s/__NUNC_STANS_ON__/$(NUNC_STANS_ON)/" < $(builddir)/rpm/389-ds-base.spec
> $(RPMBUILD)/SPECS/389-ds-base.spec
+
+
+rpms: rpmbrprep
+ cd $(RPMBUILD); \
+ rpmbuild --define "_topdir $(RPMBUILD)" -ba SPECS/389-ds-base.spec
+
+srpm: rpmbrprep
+ cd $(RPMBUILD); \
+ rpmbuild --define "_topdir $(RPMBUILD)" \
+ -bs SPECS/389-ds-base.spec
diff --git a/configure.ac b/configure.ac
index b65b217..c6471a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,12 +11,14 @@ AC_DEFINE_UNQUOTED([DS_PACKAGE_VERSION], "$PACKAGE_VERSION",
[package version])
AC_DEFINE_UNQUOTED([DS_PACKAGE_TARNAME], "$PACKAGE_TARNAME", [package tarball
name])
AC_DEFINE_UNQUOTED([DS_PACKAGE_BUGREPORT], "$PACKAGE_BUGREPORT", [package bug
report url])
AC_DEFINE_UNQUOTED([DS_PACKAGE_STRING], "$PACKAGE_STRING", [package string])
-AM_INIT_AUTOMAKE([1.9 foreign subdir-objects dist-bzip2 no-dist-gzip no-define])
+AM_INIT_AUTOMAKE([1.9 foreign subdir-objects dist-bzip2 no-dist-gzip no-define tar-pax])
# define these for automake distdir
VERSION=$PACKAGE_VERSION
PACKAGE=$PACKAGE_TARNAME
AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [package version])
AC_DEFINE_UNQUOTED([PACKAGE], "$PACKAGE", [package tar name])
+AC_SUBST([RPM_VERSION])
+AC_SUBST([RPM_RELEASE])
AC_SUBST([CONSOLE_VERSION])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
@@ -778,6 +780,6 @@ if test "$GCC" != yes ; then
rm -f libtool.tmp
fi
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile rpm/389-ds-base.spec])
AC_OUTPUT
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index ecdecb5..b589b93 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -12,12 +12,8 @@
# If perl-Socket-2.000 or newer is available, set 0 to use_Socket6.
%global use_Socket6 0
# nunc-stans only builds on x86_64 for now
-%ifarch x86_64
# To build without nunc-stans, set 0 to use_nunc_stans.
-%global use_nunc_stans 1
-%else
-%global use_nunc_stans 0
-%endif
+%global use_nunc_stans __NUNC_STANS_ON__
%if %{use_nunc_stans}
%global nunc_stans_ver 0.1.5
commit 24db783ee2ba02ebdba6a4db34d3e7fb207846e2
Author: Simo Sorce <simo(a)redhat.com>
Date: Tue Sep 15 17:25:44 2015 -0400
Change prereleases to use date+git commit format
Signed-off-by: Simo Sorce <simo(a)redhat.com>
diff --git a/VERSION.sh b/VERSION.sh
index 46bd1b3..94de01e 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -11,25 +11,19 @@ vendor="389 Project"
VERSION_MAJOR=1
VERSION_MINOR=3
VERSION_MAINT=5
-# if this is a PRERELEASE, set VERSION_PREREL
-# otherwise, comment it out
-# be sure to include the dot prefix in the prerel
-VERSION_PREREL=.a1
-# NOTES on VERSION_PREREL
-# use aN for an alpha release e.g. a1, a2, etc.
-# use rcN for a release candidate e.g. rc1, rc2, etc.
-# for extra clarification, the date can be appended to the prerel e.g.
-# RC1.`date +%Y%m%d`
-# a git commit may also be used
+# NOTE: VERSION_PREREL is automatically set for builds made out of a git tree
+VERSION_PREREL=
+VERSION_DATE=`date -u +%Y%m%d%H%M%S`
+GIT_CHECKOUT=`git log -1 >/dev/null 2>&1`
# Set the version and release numbers for local developer RPM builds. We
# set these here because we do not want the git commit hash in the RPM
# version since it can make RPM upgrades difficult. If we have a git
# commit hash, we add it into the release number below.
-RPM_RELEASE=`date -u +%Y%m%d%H%M%S`
-RPM_VERSION=$VERSION_MAJOR.$VERSION_MINOR.${VERSION_MAINT}$VERSION_PREREL
+RPM_RELEASE=${VERSION_DATE}
+RPM_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MAINT}
-if test -n "$VERSION_PREREL"; then
+if test -n "$GIT_CHECKOUT"; then
# if the source is from a git repo, put the last commit
# in the version
# if this is not a git repo, git log will say
@@ -38,8 +32,8 @@ if test -n "$VERSION_PREREL"; then
# this tells git to print the short commit hash from the last commit
COMMIT=`cd $srcdir ; git log -1 --pretty=format:%h 2> /dev/null`
if test -n "$COMMIT" ; then
- VERSION_PREREL=$VERSION_PREREL.git$COMMIT
- RPM_RELEASE=$RPM_RELEASE.git$COMMIT
+ VERSION_PREREL=.${VERSION_DATE}-git$COMMIT
+ RPM_RELEASE=$RPM_RELEASE-git$COMMIT
fi
fi
@@ -50,7 +44,7 @@ fi
# DS_PACKAGE_VERSION DS_PACKAGE_TARNAME DS_PACKAGE_BUGREPORT
# for use in C code - other code (perl scripts, shell scripts, Makefiles)
# can use PACKAGE_VERSION et. al.
-PACKAGE_VERSION=$VERSION_MAJOR.$VERSION_MINOR.${VERSION_MAINT}$VERSION_PREREL
+PACKAGE_VERSION=$VERSION_MAJOR.$VERSION_MINOR.${VERSION_MAINT}${VERSION_PREREL}
# the name of the source tarball - see make dist
PACKAGE_TARNAME=${brand}-ds-base
# url for bug reports
commit 5d98edd35881888a15feefc2b9ba7bbb9230f653
Author: Simo Sorce <simo(a)redhat.com>
Date: Tue Sep 15 17:16:05 2015 -0400
Fix Makefile so that make dist works
Signed-off-by: Simo Sorce <simo(a)redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 8dcdb36..a9a2d61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,6 +246,230 @@ noinst_PROGRAMS = makstrdb
noinst_LIBRARIES = libavl.a libldaputil.a
+dist_noinst_HEADERS = \
+ include/i18n.h \
+ include/netsite.h \
+ include/base/crit.h \
+ include/base/dbtbase.h \
+ include/base/ereport.h \
+ include/base/file.h \
+ include/base/fsmutex.h \
+ include/base/plist.h \
+ include/base/pool.h \
+ include/base/shexp.h \
+ include/base/systems.h \
+ include/base/systhr.h \
+ include/base/util.h \
+ include/ldaputil/cert.h \
+ include/ldaputil/certmap.h \
+ include/ldaputil/dbconf.h \
+ include/ldaputil/encode.h \
+ include/ldaputil/errors.h \
+ include/ldaputil/extcmap.h \
+ include/ldaputil/init.h \
+ include/ldaputil/ldapauth.h \
+ include/ldaputil/ldaputil.h \
+ include/libaccess/aclerror.h \
+ include/libaccess/acleval.h \
+ include/libaccess/aclglobal.h \
+ include/libaccess/acl.h \
+ include/libaccess/aclproto.h \
+ include/libaccess/aclstruct.h \
+ include/libaccess/attrec.h \
+ include/libaccess/authdb.h \
+ include/libaccess/dbtlibaccess.h \
+ include/libaccess/dnfstruct.h \
+ include/libaccess/ipfstruct.h \
+ include/libaccess/las.h \
+ include/libaccess/nsautherr.h \
+ include/libaccess/nsauth.h \
+ include/libaccess/nserror.h \
+ include/libaccess/symbols.h \
+ include/libaccess/userauth.h \
+ include/libaccess/usi.h \
+ include/libaccess/usrcache.h \
+ include/libadmin/dbtlibadmin.h \
+ include/libadmin/libadmin.h \
+ include/public/netsite.h \
+ include/public/nsapi.h \
+ include/public/base/systems.h \
+ include/public/nsacl/aclapi.h \
+ include/public/nsacl/acldef.h \
+ include/public/nsacl/nserrdef.h \
+ include/public/nsacl/plistdef.h \
+ ldap/include/avl.h \
+ ldap/include/dblayer.h \
+ ldap/include/disptmpl.h \
+ ldap/include/ldaplog.h \
+ ldap/include/ldaprot.h \
+ ldap/include/ldbm.h \
+ ldap/include/portable.h \
+ ldap/include/regex.h \
+ ldap/include/srchpref.h \
+ ldap/include/sysexits-compat.h \
+ ldap/servers/plugins/collation/config.h \
+ ldap/servers/plugins/collation/collate.h \
+ ldap/servers/plugins/collation/orfilter.h \
+ ldap/servers/plugins/chainingdb/cb.h \
+ ldap/servers/plugins/deref/deref.h \
+ ldap/servers/plugins/acctpolicy/acctpolicy.h \
+ ldap/servers/plugins/posix-winsync/posix-wsp-ident.h \
+ ldap/servers/plugins/posix-winsync/posix-group-func.h \
+ ldap/servers/plugins/roles/roles_cache.h \
+ ldap/servers/plugins/usn/usn.h \
+ ldap/servers/plugins/pwdstorage/pwdstorage.h \
+ ldap/servers/plugins/pwdstorage/md5.h \
+ ldap/servers/plugins/acl/acl.h \
+ ldap/servers/plugins/linkedattrs/linked_attrs.h \
+ ldap/servers/plugins/rootdn_access/rootdn_access.h \
+ ldap/servers/plugins/acct_usability/acct_usability.h \
+ ldap/servers/plugins/retrocl/retrocl.h \
+ ldap/servers/plugins/uiduniq/plugin-utils.h \
+ ldap/servers/plugins/memberof/memberof.h \
+ ldap/servers/plugins/replication/cl5_api.h \
+ ldap/servers/plugins/replication/cl4_api.h \
+ ldap/servers/plugins/replication/llist.h \
+ ldap/servers/plugins/replication/repl_shared.h \
+ ldap/servers/plugins/replication/csnpl.h \
+ ldap/servers/plugins/replication/cl5.h \
+ ldap/servers/plugins/replication/repl-session-plugin.h \
+ ldap/servers/plugins/replication/repl.h \
+ ldap/servers/plugins/replication/windows_prot_private.h \
+ ldap/servers/plugins/replication/repl_helper.h \
+ ldap/servers/plugins/replication/repl_objset.h \
+ ldap/servers/plugins/replication/repl5.h \
+ ldap/servers/plugins/replication/cl5_test.h \
+ ldap/servers/plugins/replication/repl5_ruv.h \
+ ldap/servers/plugins/replication/cl5_clcache.h \
+ ldap/servers/plugins/replication/cl4.h \
+ ldap/servers/plugins/replication/cl_crypt.h \
+ ldap/servers/plugins/replication/urp.h \
+ ldap/servers/plugins/replication/winsync-plugin.h \
+ ldap/servers/plugins/replication/windowsrepl.h \
+ ldap/servers/plugins/replication/repl5_prot_private.h \
+ ldap/servers/plugins/pam_passthru/pam_passthru.h \
+ ldap/servers/plugins/syntaxes/syntax.h \
+ ldap/servers/plugins/cos/cos_cache.h \
+ ldap/servers/plugins/sync/sync.h \
+ ldap/servers/plugins/passthru/passthru.h \
+ ldap/servers/plugins/rever/rever.h \
+ ldap/servers/plugins/http/http_client.h \
+ ldap/servers/plugins/http/http_impl.h \
+ ldap/servers/plugins/automember/automember.h \
+ ldap/servers/plugins/mep/mep.h \
+ ldap/servers/slapd/agtmmap.h \
+ ldap/servers/slapd/auth.h \
+ ldap/servers/slapd/csngen.h \
+ ldap/servers/slapd/disconnect_errors.h \
+ ldap/servers/slapd/disconnect_error_strings.h \
+ ldap/servers/slapd/fe.h \
+ ldap/servers/slapd/filter.h \
+ ldap/servers/slapd/getopt_ext.h \
+ ldap/servers/slapd/getsocketpeer.h \
+ ldap/servers/slapd/http.h \
+ ldap/servers/slapd/index_subsys.h \
+ ldap/servers/slapd/intrinsics.h \
+ ldap/servers/slapd/log.h \
+ ldap/servers/slapd/mozldap.h \
+ ldap/servers/slapd/openldapber.h \
+ ldap/servers/slapd/poll_using_select.h \
+ ldap/servers/slapd/prerrstrs.h \
+ ldap/servers/slapd/protect_db.h \
+ ldap/servers/slapd/proto-slap.h \
+ ldap/servers/slapd/pw.h \
+ ldap/servers/slapd/secerrstrs.h \
+ ldap/servers/slapd/slap.h \
+ ldap/servers/slapd/slapi-plugin-compat4.h \
+ ldap/servers/slapd/slapi-plugin.h \
+ ldap/servers/slapd/slapi-private.h \
+ ldap/servers/slapd/snmp_collator.h \
+ ldap/servers/slapd/sslerrstrs.h \
+ ldap/servers/slapd/statechange.h \
+ ldap/servers/slapd/uuid.h \
+ ldap/servers/slapd/vattr_spi.h \
+ ldap/servers/slapd/views.h \
+ ldap/servers/slapd/back-ldbm/attrcrypt.h \
+ ldap/servers/slapd/back-ldbm/back-ldbm.h \
+ ldap/servers/slapd/back-ldbm/dblayer.h \
+ ldap/servers/slapd/back-ldbm/idlapi.h \
+ ldap/servers/slapd/back-ldbm/import.h \
+ ldap/servers/slapd/back-ldbm/ldbm_config.h \
+ ldap/servers/slapd/back-ldbm/perfctrs.h \
+ ldap/servers/slapd/back-ldbm/proto-back-ldbm.h \
+ ldap/servers/slapd/back-ldbm/vlv_key.h \
+ ldap/servers/slapd/back-ldbm/vlv_srch.h \
+ ldap/servers/slapd/tools/ldaptool.h \
+ ldap/servers/slapd/tools/ldaptool-sasl.h \
+ ldap/servers/slapd/tools/ldclt/ldap-private.h \
+ ldap/servers/slapd/tools/ldclt/ldclt.h \
+ ldap/servers/slapd/tools/ldclt/port.h \
+ ldap/servers/slapd/tools/ldclt/remote.h \
+ ldap/servers/slapd/tools/ldclt/scalab01.h \
+ ldap/servers/slapd/tools/ldclt/utils.h \
+ ldap/servers/slapd/tools/rsearch/addthread.h \
+ ldap/servers/slapd/tools/rsearch/infadd.h \
+ ldap/servers/slapd/tools/rsearch/nametable.h \
+ ldap/servers/slapd/tools/rsearch/rsearch.h \
+ ldap/servers/slapd/tools/rsearch/sdattable.h \
+ ldap/servers/slapd/tools/rsearch/searchthread.h \
+ ldap/servers/snmp/ldap-agent.h \
+ ldap/systools/pio.h \
+ lib/base/lexer_pvt.h \
+ lib/base/plist_pvt.h \
+ lib/ldaputil/ldaputili.h \
+ lib/libaccess/access_plhash.h \
+ lib/libaccess/aclcache.h \
+ lib/libaccess/aclpriv.h \
+ lib/libaccess/aclscan.h \
+ lib/libaccess/acl.tab.h \
+ lib/libaccess/aclutil.h \
+ lib/libaccess/lasdns.h \
+ lib/libaccess/las.h \
+ lib/libaccess/lasip.h \
+ lib/libaccess/ldapauth.h \
+ lib/libaccess/oneeval.h \
+ lib/libaccess/parse.h \
+ lib/libaccess/permhash.h \
+ lib/libsi18n/getstrmem.h \
+ lib/libsi18n/gsslapd.h \
+ lib/libsi18n/reshash.h \
+ lib/libsi18n/txtfile.h \
+ $(NULL)
+
+dist_noinst_DATA = \
+ buildnum.pl \
+ dirsrv.pc.in \
+ ldap/admin/src/*.pl \
+ ldap/admin/src/*.in \
+ ldap/admin/src/scripts/*.in \
+ ldap/admin/src/scripts/*.ldif \
+ ldap/admin/src/scripts/*.pl \
+ ldap/admin/src/scripts/*.pm \
+ ldap/admin/src/scripts/*.py \
+ ldap/admin/src/scripts/*.sh \
+ ldap/admin/src/scripts/migrate-ds.res \
+ ldap/ldif/*.in \
+ ldap/ldif/*.ldif \
+ ldap/schema/*ldif \
+ ldap/schema/slapd-collations.conf \
+ ldap/servers/slapd/mkDBErrStrs.pl \
+ ldap/servers/slapd/tools/rsearch/scripts/dbgen* \
+ ldap/servers/snmp/ldap-agent.conf \
+ ldap/servers/snmp/redhat-directory.mib \
+ lib/ldaputil/certmap.conf \
+ m4 \
+ rpm/389-ds-base.spec.in \
+ rpm/389-ds-base-devel.README \
+ rpm/389-ds-base-git.sh \
+ selinux \
+ README \
+ LICENSE \
+ LICENSE.* \
+ VERSION.sh \
+ wrappers/*.in \
+ wrappers/systemd.template.sysconfig \
+ $(NULL)
+
#------------------------
# Installed Files
#------------------------
--
389 commits mailing list
389-commits@%(host_name)s
http://lists.fedoraproject.org/postorius/389-commits@lists.fedoraproject.org