Commit abf219e7 authored by Michal Čihař's avatar Michal Čihař

New upstream version 4.14.1+dfsg1

parent 51436541
RPM and it's source code are covered under two separate licenses.
RPM is covered under two separate licenses.
The entire code base may be distributed under the terms of the GNU General
Public License (GPL), which appears immediately below. Alternatively,
......@@ -8,7 +8,7 @@ distributed under the GNU Library General Public License (LGPL), at the
choice of the distributor. The complete text of the LGPL appears
at the bottom of this file.
This alternatively is allowed to enable applications to be linked against
This alternative is provided to enable applications to be linked against
the RPM library (commonly called librpm) without forcing such applications
to be distributed under the GPL.
......
......@@ -25,6 +25,7 @@ have been contributed by:
Archie Cobbs
Ralf Corsépius
Kit Cosper
Rafal Cygnarowski
Jean Delvare
Kristof Depraetere
Alex deVries
......@@ -34,6 +35,7 @@ have been contributed by:
Boris Egorov
Karl Eichwalder
Peter Eisentraut
W. L. Estes
Giulio Eulisse
Christophe Fergeau
Florian Festi
......@@ -43,6 +45,7 @@ have been contributed by:
Nikola Forró
Gleb Fotengauer-Malinovskiy
David Fox
Artur Frysiak
Stephen Gallagher
Rafael Garcia-Suarez
Alexey Gladkov
......@@ -73,6 +76,7 @@ have been contributed by:
Jiri Kastner
Peter Kjellerstedt
Phil Knirsch
Michal Kochanowicz
Ales Kozumplik
Jan Kratochvil
Toshio Kuratomi
......@@ -95,6 +99,7 @@ have been contributed by:
Kyle McMartin
Joshua Megerman
Nigel Metheringham
Arkadiusz Miśkiewicz
Tomas Mlcoch
Horacio Rodriguez Montero
Tim Mooney
......
This diff is collapsed.
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -635,7 +635,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
rpm_version_info = 8:0:0
rpm_version_info = 8:1:0
AM_CFLAGS = @RPMCFLAGS@
CLEANFILES = rpmrc.tmp rpmrc macros platform.tmp platform rpm.pc.tmp \
rpm.pc rpmpopt-@VERSION@.tmp rpmpopt-@VERSION@ \
......
# generated automatically by aclocal 1.15 -*- Autoconf -*-
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -364,7 +364,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
])dnl PKG_HAVE_DEFINE_WITH_MODULES
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -379,7 +379,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.15], [],
m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -395,14 +395,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.15])dnl
[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -454,7 +454,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -485,7 +485,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -676,7 +676,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -752,7 +752,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -949,7 +949,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -970,7 +970,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -991,7 +991,7 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1041,7 +1041,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1078,7 +1078,7 @@ else
fi
])
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1112,7 +1112,7 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1141,7 +1141,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1188,7 +1188,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1221,8 +1221,9 @@ AC_DEFUN([AM_PATH_PYTHON],
[
dnl Find a Python interpreter. Python versions prior to 2.0 are not
dnl supported. (2.0 was released on October 16, 2000).
dnl FIXME: Remove the need to hard-code Python versions here.
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
AC_ARG_VAR([PYTHON], [the Python interpreter])
......@@ -1423,7 +1424,7 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
sys.exit(sys.hexversion < minverhex)"
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1442,7 +1443,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1523,7 +1524,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1583,7 +1584,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1611,7 +1612,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1630,7 +1631,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -480,7 +480,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
rpm_version_info = 8:0:0
rpm_version_info = 8:1:0
AM_CFLAGS = @RPMCFLAGS@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
-I$(top_builddir)/include/ @WITH_BEECRYPT_INCLUDE@ \
......
......@@ -857,6 +857,7 @@ static VFA_t const virtualAttrs[] = {
{ "%license", RPMFILE_LICENSE },
{ "%pubkey", RPMFILE_PUBKEY },
{ "%missingok", RPMFILE_MISSINGOK },
{ "%artifact", RPMFILE_ARTIFACT },
{ NULL, 0 }
};
......@@ -1628,13 +1629,18 @@ exit:
return rc;
}
/* add a directory to the file list */
static void argvAddDir(ARGV_t *filesp, const char *dir)
/* add a file with possible virtual attributes to the file list */
static void argvAddAttr(ARGV_t *filesp, rpmfileAttrs attrs, const char *path)
{
char *line = NULL;
rasprintf(&line, "%%dir %s", dir);
for (VFA_t *vfa = virtualAttrs; vfa->attribute != NULL; vfa++) {
if (vfa->flag & attrs)
line = rstrscat(&line, vfa->attribute, " ", NULL);
}
line = rstrscat(&line, path, NULL);
argvAdd(filesp, line);
_free(line);
free(line);
}
#if HAVE_LIBDW
......@@ -1693,7 +1699,7 @@ static int addNewIDSymlink(ARGV_t *files,
rpmlog(RPMLOG_ERR, "%s: %s -> %s: %m\n",
linkerr, linkpath, targetpath);
} else {
rc = argvAdd(files, linkpath);
argvAddAttr(files, RPMFILE_ARTIFACT, linkpath);
}
if (nr > 0) {
......@@ -1894,7 +1900,7 @@ static int generateBuildIDs(FileList fl, ARGV_t *files)
if ((rc = rpmioMkpath(mainiddir, 0755, -1, -1)) != 0) {
rpmlog(RPMLOG_ERR, "%s %s: %m\n", errdir, mainiddir);
} else {
argvAddDir(files, mainiddir);
argvAddAttr(files, RPMFILE_DIR|RPMFILE_ARTIFACT, mainiddir);
}
}
......@@ -1902,7 +1908,7 @@ static int generateBuildIDs(FileList fl, ARGV_t *files)
if ((rc = rpmioMkpath(debugiddir, 0755, -1, -1)) != 0) {
rpmlog(RPMLOG_ERR, "%s %s: %m\n", errdir, debugiddir);
} else {
argvAddDir(files, debugiddir);
argvAddAttr(files, RPMFILE_DIR|RPMFILE_ARTIFACT, debugiddir);
}
}
}
......@@ -1942,7 +1948,7 @@ static int generateBuildIDs(FileList fl, ARGV_t *files)
rpmlog(RPMLOG_ERR, "%s %s: %m\n", errdir, buildidsubdir);
} else {
if (addsubdir)
argvAddDir (files, buildidsubdir);
argvAddAttr(files, RPMFILE_DIR|RPMFILE_ARTIFACT, buildidsubdir);
if (rc == 0) {
char *linkpattern, *targetpattern;
char *linkpath, *targetpath;
......@@ -2859,7 +2865,7 @@ static void filterDebuginfoPackage(rpmSpec spec, Package pkg,
if (!files) {
char *attr = mkattr();
argvAdd(&files, attr);
argvAddDir(&files, DEBUG_LIB_DIR);
argvAddAttr(&files, RPMFILE_DIR, DEBUG_LIB_DIR);
free(attr);
}
......@@ -2904,7 +2910,7 @@ static void filterDebuginfoPackage(rpmSpec spec, Package pkg,
argvSort(dirs, NULL);
for (i = 0; dirs[i]; i++) {
if (!i || strcmp(dirs[i], dirs[i - 1]) != 0)
argvAddDir(&files, dirs[i]);
argvAddAttr(&files, RPMFILE_DIR, dirs[i]);
}
dirs = argvFree(dirs);
}
......@@ -2938,10 +2944,10 @@ static int addDebugDwz(Package pkg, char *buildroot)
if (!pkg->fileList) {
char *attr = mkattr();
argvAdd(&pkg->fileList, attr);
argvAddDir(&pkg->fileList, DEBUG_LIB_DIR);
argvAddAttr(&pkg->fileList, RPMFILE_DIR|RPMFILE_ARTIFACT, DEBUG_LIB_DIR);
free(attr);
}
argvAdd(&pkg->fileList, DEBUG_DWZ_DIR);
argvAddAttr(&pkg->fileList, RPMFILE_ARTIFACT, DEBUG_DWZ_DIR);
ret = 1;
}
path = _free(path);
......
......@@ -428,6 +428,12 @@ int rpmfcExec(ARGV_const_t av, StringBuf sb_stdin, StringBuf * sb_stdoutp,
buf_stdin_len = strlen(buf_stdin);
}
if (_rpmfc_debug) {
char *cmd = argvJoin(xav, " ");
rpmlog(RPMLOG_DEBUG, "Executing %s on %s\n", cmd, buf_stdin);
free(cmd);
}
/* Read output from exec'd helper. */
sb = getOutputFrom(xav, buf_stdin, buf_stdin_len, failnonzero, buildRoot);
......@@ -691,7 +697,6 @@ static rpm_color_t rpmfcColor(const char * fmstr)
void rpmfcPrint(const char * msg, rpmfc fc, FILE * fp)
{
rpm_color_t fcolor;
int ndx;
int dx;
int fx;
......@@ -703,21 +708,23 @@ void rpmfcPrint(const char * msg, rpmfc fc, FILE * fp)
if (fc)
for (fx = 0; fx < fc->nfiles; fx++) {
rpmsid cx = fc->fcdictx[fx] + 1; /* id's are one off */
fcolor = fc->fcolor[fx];
ARGV_t fattrs = fc->fattrs[fx];
fprintf(fp, "%3d %s", fx, fc->fn[fx]);
if (fcolor != RPMFC_BLACK)
if (_rpmfc_debug) {
rpmsid cx = fc->fcdictx[fx] + 1; /* id's are one off */
rpm_color_t fcolor = fc->fcolor[fx];
ARGV_t fattrs = fc->fattrs[fx];
if (fcolor != RPMFC_BLACK)
fprintf(fp, "\t0x%x", fc->fcolor[fx]);
else
else
fprintf(fp, "\t%s", rpmstrPoolStr(fc->cdict, cx));
if (fattrs) {
char *attrs = argvJoin(fattrs, ",");
fprintf(fp, " [%s]", attrs);
free(attrs);
} else {
fprintf(fp, " [none]");
if (fattrs) {
char *attrs = argvJoin(fattrs, ",");
fprintf(fp, " [%s]", attrs);
free(attrs);
} else {
fprintf(fp, " [none]");
}
}
fprintf(fp, "\n");
......
......@@ -45,7 +45,6 @@ typedef const struct rpmfcTokens_s * rpmfcToken;
/** \ingroup rpmfc
* Print results of file classification.
* @todo Remove debugging routine.
* @param msg message prefix (NULL for none)
* @param fc file classifier
* @param fp output file handle (NULL for stderr)
......
......@@ -96,6 +96,9 @@
/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
/* Define to 1 if you have the `getline' function. */
#undef HAVE_GETLINE
/* Define to 1 if you have the <getopt.h> header file. */
#undef HAVE_GETOPT_H
......@@ -114,9 +117,6 @@
/* Define to 1 if you have the `lchown' function. */
#undef HAVE_LCHOWN
/* Define to 1 if you have the `crypt' library (-lcrypt). */
#undef HAVE_LIBCRYPT
/* Define to 1 if you have the `crypto' library (-lcrypto). */
#undef HAVE_LIBCRYPTO
......@@ -141,6 +141,9 @@
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define to 1 if you have the `lsetxattr' function. */
#undef HAVE_LSETXATTR
/* Define to 1 if you have the `lutimes' function. */
#undef HAVE_LUTIMES
......@@ -159,6 +162,9 @@
/* Define to 1 if you have the `mkstemp' function. */
#undef HAVE_MKSTEMP
/* Define to 1 if you have the `mremap' function. */
#undef HAVE_MREMAP
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
#undef HAVE_NDIR_H
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for rpm 4.14.0.
# Generated by GNU Autoconf 2.69 for rpm 4.14.1.
#
# Report bugs to <rpm-maint@lists.rpm.org>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='rpm'
PACKAGE_TARNAME='rpm'
PACKAGE_VERSION='4.14.0'
PACKAGE_STRING='rpm 4.14.0'
PACKAGE_VERSION='4.14.1'
PACKAGE_STRING='rpm 4.14.1'
PACKAGE_BUGREPORT='rpm-maint@lists.rpm.org'
PACKAGE_URL=''
......@@ -651,6 +651,8 @@ RUNDIR
RPMCANONGNU
RPMCANONOS
RPMCANONVENDOR
IMA_FALSE
IMA_TRUE
DBUS_FALSE
DBUS_TRUE
DBUS_LIBS
......@@ -1546,7 +1548,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures rpm 4.14.0 to adapt to many kinds of systems.
\`configure' configures rpm 4.14.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1616,7 +1618,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of rpm 4.14.0:";;
short | recursive ) echo "Configuration of rpm 4.14.1:";;
esac
cat <<\_ACEOF
......@@ -1788,7 +1790,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
rpm configure 4.14.0
rpm configure 4.14.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2435,7 +2437,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by rpm $as_me 4.14.0, which was
It was created by rpm $as_me 4.14.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -3305,7 +3307,7 @@ fi
# Define the identity of the package.
PACKAGE='rpm'
VERSION='4.14.0'
VERSION='4.14.1'
cat >>confdefs.h <<_ACEOF
......@@ -21038,13 +21040,13 @@ $as_echo "#define HAVE_EVP_MD_CTX_NEW 1" >>confdefs.h
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_MD_CTX_create in -lcrypt" >&5
$as_echo_n "checking for EVP_MD_CTX_create in -lcrypt... " >&6; }
if ${ac_cv_lib_crypt_EVP_MD_CTX_create+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_MD_CTX_create in -lcrypto" >&5
$as_echo_n "checking for EVP_MD_CTX_create in -lcrypto... " >&6; }
if ${ac_cv_lib_crypto_EVP_MD_CTX_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypt $LIBS"
LIBS="-lcrypto $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
......@@ -21064,22 +21066,22 @@ return EVP_MD_CTX_create ();
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_crypt_EVP_MD_CTX_create=yes
ac_cv_lib_crypto_EVP_MD_CTX_create=yes
else
ac_cv_lib_crypt_EVP_MD_CTX_create=no
ac_cv_lib_crypto_EVP_MD_CTX_create=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_EVP_MD_CTX_create" >&5
$as_echo "$ac_cv_lib_crypt_EVP_MD_CTX_create" >&6; }
if test "x$ac_cv_lib_crypt_EVP_MD_CTX_create" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_MD_CTX_create" >&5
$as_echo "$ac_cv_lib_crypto_EVP_MD_CTX_create" >&6; }
if test "x$ac_cv_lib_crypto_EVP_MD_CTX_create" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
#define HAVE_LIBCRYPTO 1
_ACEOF
LIBS="-lcrypt $LIBS"
LIBS="-lcrypto $LIBS"
else
......@@ -22088,9 +22090,21 @@ fi
if test "$enable_ndb" = yes; then :
for ac_func in mremap
do :
ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap"
if test "x$ac_cv_func_mremap" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MREMAP 1
_ACEOF
$as_echo "#define ENABLE_NDB 1" >>confdefs.h
else
as_fn_error $? "mremap function required by ndb" "$LINENO" 5
fi
done
fi
if test "$enable_ndb" = yes; then
......@@ -24930,7 +24944,8 @@ fi
done
for ac_func in mkstemp getcwd basename dirname realpath setenv unsetenv regcomp lchown utimes
for ac_func in mkstemp getcwd basename dirname realpath setenv unsetenv regcomp lchown \
utimes getline
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
......@@ -25008,7 +25023,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
......@@ -26320,6 +26335,30 @@ else
fi
if test "$enable_plugins" != no; then :
for ac_func in lsetxattr
do :
ac_fn_c_check_func "$LINENO" "lsetxattr" "ac_cv_func_lsetxattr"
if test "x$ac_cv_func_lsetxattr" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LSETXATTR 1
_ACEOF
fi
done
fi
if test "x$ac_cv_func_lsetxattr" = xyes; then
IMA_TRUE=
IMA_FALSE='#'
else
IMA_TRUE='#'
IMA_FALSE=
fi
with_dmalloc=no
# Check whether --with-dmalloc was given.
......@@ -26334,8 +26373,8 @@ $as_echo "#define DMALLOC 1" >>confdefs.h
LIBS="$LIBS -ldmalloc"
fi
user_with_uid0=$(awk -F: '$3==0 {print $1}' /etc/passwd)
group_with_gid0=$(awk -F: '$3==0 {print $1}' /etc/group)
user_with_uid0=$(awk -F: '$3==0 {print $1;exit}' /etc/passwd)
group_with_gid0=$(awk -F: '$3==0 {print $1;exit}' /etc/group)
cat >>confdefs.h <<_ACEOF
#define UID_0_USER "$user_with_uid0"
......@@ -26712,6 +26751,10 @@ if test -z "${DBUS_TRUE}" && test -z "${DBUS_FALSE}"; then
as_fn_error $? "conditional \"DBUS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${IMA_TRUE}" && test -z "${IMA_FALSE}"; then
as_fn_error $? "conditional \"IMA\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${WITH_INTERNAL_DB_TRUE}" && test -z "${WITH_INTERNAL_DB_FALSE}"; then
as_fn_error $? "conditional \"WITH_INTERNAL_DB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
......@@ -27121,7 +27164,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by rpm $as_me 4.14.0, which was
This file was extended by rpm $as_me 4.14.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -27187,7 +27230,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
rpm config.status 4.14.0
rpm config.status 4.14.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
AC_PREREQ(2.61)
AC_INIT(rpm, 4.14.0, rpm-maint@lists.rpm.org)
AC_INIT(rpm, 4.14.1, rpm-maint@lists.rpm.org)