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

New upstream version 4.14.0+dfsg1

parent 7fc06fa7
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -19,6 +19,7 @@ have been contributed by:
Tony Breeds
Till Bubeck
Héctor Daniel Cabrera
Davide Cavalca
Yuri Chornoivan
Michal Čihař
Archie Cobbs
......@@ -42,6 +43,7 @@ have been contributed by:
Nikola Forró
Gleb Fotengauer-Malinovskiy
David Fox
Stephen Gallagher
Rafael Garcia-Suarez
Alexey Gladkov
Igor Gnatenko
......@@ -69,6 +71,7 @@ have been contributed by:
Lubos Kardos
Per Øyvind Karlsen
Jiri Kastner
Peter Kjellerstedt
Phil Knirsch
Ales Kozumplik
Jan Kratochvil
......@@ -79,6 +82,8 @@ have been contributed by:
Alec Leamas
Dimitri John Ledkov
Elliot Lee
Robin Lee
Simon Lees
Dominique Leuenberger
Benedict Lofstedt
Till Maas
......@@ -102,12 +107,15 @@ have been contributed by:
Stanislav Ochotnicky
Denis Ollier
Vít Ondruch
Tomas Orsava
Rakesh Pandit
Thomas Petazzoni
Jan Pokorný
Trần Ngọc Quân
Jerome Quelin
Pavel Raiskup
Elena Reshetova
Sebastian Riedel
Lubomir Rintel
Pavol Rusnak
Kamil Rytarowski
......@@ -144,5 +152,6 @@ have been contributed by:
Colin Walters
Florian Weimer
Karsten Weiss
Bernhard M. Wiedemann
Mark Wielaard
Mimi Zohar
This diff is collapsed.
Amusements/Games
Amusements/Graphics
Applications/Archiving
Applications/Communications
Applications/Databases
Applications/Editors
Applications/Emulators
Applications/Engineering
Applications/File
Applications/Internet
Applications/Multimedia
Applications/Productivity
Applications/Publishing
Applications/System
Applications/Text
Development/Debuggers
Development/Languages
Development/Libraries
Development/System
Development/Tools
Documentation
System Environment/Base
System Environment/Daemons
System Environment/Kernel
System Environment/Libraries
System Environment/Shells
User Interface/Desktops
User Interface/X
User Interface/X Hardware Support
......@@ -9,17 +9,34 @@ The libmagic (aka file) library for file type detection (used by rpmbuild).
The source for the file utility + library is available from
ftp://ftp.astron.com/pub/file/
The NSS >= 3.12 library for encryption, and NSPR library which NSS uses.
Both NSPR and NSS libraries and headers need to be installed during RPM
compilation. As NSPR and NSS typically install their headers outside
the regular include search path, you need to tell configure about this,
eg something like:
You will need a cryptographic library to support digests and signatures.
This library may be Mozilla NSS, OpenSSL or beecrypt. Which library to use
must be specified with the --with-crypto=[beecrypt|nss|openssl] argument
to configure.
If using the Mozilla NSS library for encyption (and NSPR library which
NSS uses) it must be version 3.12 or later. Both NSPR and NSS libraries and
headers need to be installed during RPM compilation. As NSPR and NSS
typically install their headers outside the regular include search path,
you need to tell configure about this, eg something like:
./configure <......> CPPFLAGS="-I/usr/include/nspr -I/usr/include/nss"
The NSPR and NSS libraries are available from
http://www.mozilla.org/projects/security/pki/nss/
http://www.mozilla.org/projects/nspr/
If using the OpenSSL library for encryption, it must be version 1.0.2 or
later. Note: when compiling against OpenSSL, there is a possible license
incompatibility. For more details on this, see
https://people.gnome.org/~markmc/openssl-and-the-gpl.html
Some Linux distributions have different legal interpretations of this
possible incompatibility. It is recommended to consult with a lawyer before
building RPM against OpenSSL.
Fedora: https://fedoraproject.org/wiki/Licensing:FAQ#What.27s_the_deal_with_the_OpenSSL_license.3F
Debian: https://lists.debian.org/debian-legal/2002/10/msg00113.html
The OpenSSL crypto library is available from https://www.openssl.org/
The Berkeley DB >= 4.3.x (4.5.x or newer recommended) is required for the
default database backend. BDB can be downloaded from
http://www.oracle.com/technology/software/products/berkeley-db/index.html
......@@ -162,7 +179,7 @@ and then install with:
make install
Rpm comes with an automated self-test suite. The test-suite relies heavily
on fakechroot (https://github.com/fakechroot/) and cannot be executed
on fakechroot (https://github.com/dex4er/fakechroot/) and cannot be executed
without it. Provided that fakechroot was found during configure,
it can be executed after a successful build with:
......
......@@ -2,12 +2,13 @@
ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --with-external-db
DISTCHECK_CONFIGURE_FLAGS = --with-external-db --enable-python
include $(top_srcdir)/rpm.am
AM_CFLAGS = @RPMCFLAGS@
CLEANFILES =
EXTRA_DIST = CHANGES ChangeLog CREDITS GROUPS INSTALL \
EXTRA_DIST = ChangeLog CREDITS INSTALL \
autogen.sh db3/configure installplatform platform.in
BUILT_SOURCES =
......@@ -40,7 +41,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
AM_CPPFLAGS += -I$(top_srcdir)/build
AM_CPPFLAGS += -I$(top_srcdir)/lib
AM_CPPFLAGS += -I$(top_srcdir)/rpmio
AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
AM_CPPFLAGS += @WITH_OPENSSL_INCLUDE@
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
AM_CPPFLAGS += -I$(top_srcdir)/misc
AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
......@@ -72,7 +75,6 @@ pkginclude_HEADERS += lib/rpmlib.h
pkginclude_HEADERS += lib/rpmds.h
pkginclude_HEADERS += lib/rpmfi.h
pkginclude_HEADERS += lib/rpmfiles.h
pkginclude_HEADERS += lib/rpmlegacy.h
pkginclude_HEADERS += lib/rpmpol.h
pkginclude_HEADERS += lib/rpmps.h
pkginclude_HEADERS += lib/rpmprob.h
......@@ -91,10 +93,7 @@ pkginclude_HEADERS += build/rpmfc.h
pkginclude_HEADERS += build/rpmspec.h
rpmbindir = `echo $(bindir) | $(SED) -e s,usr/bin,bin,`
rpmbin_PROGRAMS = rpm
bin_PROGRAMS = rpm2cpio rpmbuild rpmdb rpmkeys rpmsign rpmspec
bin_PROGRAMS = rpm rpm2cpio rpmbuild rpmdb rpmkeys rpmsign rpmspec
if WITH_ARCHIVE
bin_PROGRAMS += rpm2archive
endif
......@@ -113,56 +112,63 @@ rpm_SOURCES = rpmqv.c debug.h system.h
rpm_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMEIU -DIAM_RPMQ -DIAM_RPMV
rpm_LDADD = libcliutils.la
rpm_LDADD += lib/librpm.la rpmio/librpmio.la
rpm_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpm_LDADD += @WITH_POPT_LIB@
rpmdb_SOURCES = rpmdb.c debug.h system.h
rpmdb_CPPFLAGS = $(AM_CPPFLAGS)
rpmdb_LDADD = libcliutils.la
rpmdb_LDADD += lib/librpm.la rpmio/librpmio.la
rpmdb_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmdb_LDADD += @WITH_POPT_LIB@
rpmkeys_SOURCES = rpmkeys.c debug.h system.h
rpmkeys_CPPFLAGS = $(AM_CPPFLAGS)
rpmkeys_LDADD = libcliutils.la
rpmkeys_LDADD += lib/librpm.la rpmio/librpmio.la
rpmkeys_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmkeys_LDADD += @WITH_POPT_LIB@
rpmsign_SOURCES = rpmsign.c debug.h system.h
rpmsign_CPPFLAGS = $(AM_CPPFLAGS)
rpmsign_LDADD = libcliutils.la
rpmsign_LDADD += sign/librpmsign.la lib/librpm.la rpmio/librpmio.la
rpmsign_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmsign_LDADD += @WITH_POPT_LIB@
rpmbuild_SOURCES = rpmbuild.c debug.h system.h
rpmbuild_CPPFLAGS = $(AM_CPPFLAGS)
rpmbuild_LDADD = libcliutils.la
rpmbuild_LDADD += build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
rpmbuild_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmbuild_LDADD += @WITH_POPT_LIB@
rpmspec_SOURCES = rpmspec.c debug.h system.h
rpmspec_CPPFLAGS = $(AM_CPPFLAGS)
rpmspec_LDADD = libcliutils.la
rpmspec_LDADD += build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
rpmspec_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmspec_LDADD += @WITH_POPT_LIB@
rpm2cpio_SOURCES = rpm2cpio.c debug.h system.h
rpm2cpio_LDADD = lib/librpm.la rpmio/librpmio.la
rpm2cpio_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpm2cpio_LDADD += @WITH_POPT_LIB@
rpm2archive_SOURCES = rpm2archive.c debug.h system.h
rpm2archive_LDADD = lib/librpm.la rpmio/librpmio.la
rpm2archive_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ @WITH_ARCHIVE_LIB@
rpm2archive_LDADD += @WITH_POPT_LIB@ @WITH_ARCHIVE_LIB@
if LIBELF
if LIBDWARF
if LIBDW
rpmconfig_SCRIPTS += scripts/find-debuginfo.sh
rpmlibexec_PROGRAMS += debugedit
debugedit_SOURCES = tools/debugedit.c tools/hashtab.c tools/hashtab.h
debugedit_LDADD = rpmio/librpmio.la
debugedit_LDADD += @WITH_LIBELF_LIB@ @WITH_POPT_LIB@
if HAVE_LIBDW_STRTAB
debugedit_LDADD += @WITH_LIBDW_LIB@
else
debugedit_LDADD += @WITH_LIBDW_LIB@ -lebl
endif # HAVE_LIBDW_STRTAB
endif # LIBDW
endif # LIBDWARF
rpmlibexec_PROGRAMS += elfdeps
elfdeps_SOURCES = tools/elfdeps.c
elfdeps_LDADD = rpmio/librpmio.la
......@@ -171,8 +177,7 @@ elfdeps_LDADD += @WITH_LIBELF_LIB@ @WITH_POPT_LIB@
rpmlibexec_PROGRAMS += sepdebugcrcfix
sepdebugcrcfix_SOURCES = tools/sepdebugcrcfix.c
sepdebugcrcfix_LDADD = @WITH_LIBELF_LIB@
endif
endif
endif #LIBELF
rpmlibexec_PROGRAMS += rpmdeps
rpmdeps_SOURCES = tools/rpmdeps.c
......@@ -237,9 +242,9 @@ rpmvar_DATA =
install-exec-hook:
@rm -f $(DESTDIR)$(bindir)/rpmquery
@LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmquery
@LN_S@ $(rpm_symlink_prefix)rpm $(DESTDIR)$(bindir)/rpmquery
@rm -f $(DESTDIR)$(bindir)/rpmverify
@LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmverify
@LN_S@ $(rpm_symlink_prefix)rpm $(DESTDIR)$(bindir)/rpmverify
install-data-local:
DESTDIR="$(DESTDIR)" pkglibdir="$(rpmconfigdir)" \
......@@ -247,6 +252,7 @@ install-data-local:
rpmrc platform macros \
$(RPMCANONVENDOR) $(RPMCANONOS) $(RPMCANONGNU)
@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp
@$(MKDIR_P) $(DESTDIR)$(rpmconfigdir)/macros.d
# XXX to appease distcheck we need to remove "stuff" here...
uninstall-local:
......@@ -254,6 +260,7 @@ uninstall-local:
@rm -f $(DESTDIR)$(bindir)/rpmverify
@rm -rf $(DESTDIR)$(rpmconfigdir)/platform/
@rm -f $(DESTDIR)$(rpmconfigdir)/macros
@rm -rf $(DESTDIR)$(rpmconfigdir)/macros.d
MAINTAINERCLEANFILES = ChangeLog
......@@ -300,17 +307,21 @@ BUILT_SOURCES += db.h
endif
DISTCLEANFILES = db.h
ChangeLog:
touch ChangeLog
dist-hook:
if [ -d .git ] && [ -x $(command -v git) ]; then git log --no-merges > $(distdir)/ChangeLog; fi
clean-local:
rm -rf doc/hacking/html
rm -rf include
distclean-local:
rm -rf doc/librpm.doxy doc/librpm/html
rm -rf Doxytags
rm -f stamp-h.in db3/*.orig db3/db3lobjs
maintainer-clean-local:
rm -rf doc/librpm/html
$(top_srcdir)/preinstall.am: Makefile.am
rm -f $(top_srcdir)/preinstall.am
@for f in $(HEADERS); do \
......
This diff is collapsed.
......@@ -7,7 +7,7 @@ The latest releases are always available at:
Additional RPM documentation (papers, slides, HOWTOs) can also be
found at the same site: http://rpm.org.
http://rpm.org/wiki/Communicate lists all rpm releated mailing lists.
http://rpm.org/community all rpm releated mailing lists.
RPM was originally written by:
......
......@@ -20,9 +20,9 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
dnl serial 11 (pkg-config-0.29.1)
dnl
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 11 (pkg-config-0.29.1)
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
dnl
......@@ -296,6 +296,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
dnl [DESCRIPTION], [DEFAULT])
dnl ------------------------------------------
dnl
dnl Prepare a "--with-" configure option using the lowercase
dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
dnl PKG_CHECK_MODULES in a single macro.
AC_DEFUN([PKG_WITH_MODULES],
[
m4_pushdef([with_arg], m4_tolower([$1]))
m4_pushdef([description],
[m4_default([$5], [build with ]with_arg[ support])])
m4_pushdef([def_arg], [m4_default([$6], [auto])])
m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
m4_case(def_arg,
[yes],[m4_pushdef([with_without], [--without-]with_arg)],
[m4_pushdef([with_without],[--with-]with_arg)])
AC_ARG_WITH(with_arg,
AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
[AS_TR_SH([with_]with_arg)=def_arg])
AS_CASE([$AS_TR_SH([with_]with_arg)],
[yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
[auto],[PKG_CHECK_MODULES([$1],[$2],
[m4_n([def_action_if_found]) $3],
[m4_n([def_action_if_not_found]) $4])])
m4_popdef([with_arg])
m4_popdef([description])
m4_popdef([def_arg])
])dnl PKG_WITH_MODULES
dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [DESCRIPTION], [DEFAULT])
dnl -----------------------------------------------
dnl
dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
dnl check._[VARIABLE-PREFIX] is exported as make variable.
AC_DEFUN([PKG_HAVE_WITH_MODULES],
[
PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
AM_CONDITIONAL([HAVE_][$1],
[test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
])dnl PKG_HAVE_WITH_MODULES
dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [DESCRIPTION], [DEFAULT])
dnl ------------------------------------------------------
dnl
dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
dnl and preprocessor variable.
AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
[
PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
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.
#
# This file is free software; the Free Software Foundation
......
# Makefile for rpmbuild library.
include $(top_srcdir)/rpm.am
AM_CFLAGS = @RPMCFLAGS@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
AM_CPPFLAGS += @WITH_MAGIC_INCLUDE@
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
......@@ -26,3 +28,7 @@ librpmbuild_la_LIBADD = \
@LTLIBICONV@ \
@WITH_POPT_LIB@ \
@WITH_MAGIC_LIB@
if LIBDW
librpmbuild_la_LIBADD += @WITH_LIBELF_LIB@ @WITH_LIBDW_LIB@
endif
......@@ -90,6 +90,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@LIBDW_TRUE@am__append_1 = @WITH_LIBELF_LIB@ @WITH_LIBDW_LIB@
subdir = build
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
......@@ -136,9 +137,10 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(usrlibdir)"
LTLIBRARIES = $(usrlib_LTLIBRARIES)
am__DEPENDENCIES_1 =
librpmbuild_la_DEPENDENCIES = $(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmio/librpmio.la \
$(top_builddir)/misc/libmisc.la
$(top_builddir)/misc/libmisc.la $(am__DEPENDENCIES_1)
am_librpmbuild_la_OBJECTS = build.lo expression.lo files.lo misc.lo \
pack.lo parseBuildInstallClean.lo parseChangelog.lo \
parseDescription.lo parseFiles.lo parsePreamble.lo \
......@@ -254,8 +256,14 @@ FIXPERMS = @FIXPERMS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
HAVE_BN2BINPAD = @HAVE_BN2BINPAD@
HAVE_DOT = @HAVE_DOT@
HAVE_DSA_SET0_KEY = @HAVE_DSA_SET0_KEY@
HAVE_DSA_SET0_PQG = @HAVE_DSA_SET0_PQG@
HAVE_DSA_SIG_SET0 = @HAVE_DSA_SIG_SET0@
HAVE_EVP_MD_CTX_NEW = @HAVE_EVP_MD_CTX_NEW@
HAVE_NSS_INITCONTEXT = @HAVE_NSS_INITCONTEXT@
HAVE_RSA_SET0_KEY = @HAVE_RSA_SET0_KEY@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
......@@ -271,6 +279,9 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LMDB_CFLAGS = @LMDB_CFLAGS@
LMDB_LIBS = @LMDB_LIBS@
LMDB_REQUIRES = @LMDB_REQUIRES@
LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
......@@ -298,12 +309,16 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKGCONFIG = @PKGCONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
PYTHON = @PYTHON@
PYTHON_CFLAGS = @PYTHON_CFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_LIB = @PYTHON_LIB@
PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
......@@ -311,6 +326,7 @@ RANLIB = @RANLIB@
RPMCANONGNU = @RPMCANONGNU@
RPMCANONOS = @RPMCANONOS@
RPMCANONVENDOR = @RPMCANONVENDOR@
RPMCFLAGS = @RPMCFLAGS@
RPMCONFIGDIR = @RPMCONFIGDIR@
RUNDIR = @RUNDIR@
SED = @SED@
......@@ -327,16 +343,18 @@ WITH_BEECRYPT_LIB = @WITH_BEECRYPT_LIB@
WITH_BZ2_LIB = @WITH_BZ2_LIB@
WITH_CAP_LIB = @WITH_CAP_LIB@
WITH_DB_LIB = @WITH_DB_LIB@
WITH_IMAEVM_LIB = @WITH_IMAEVM_LIB@
WITH_LIBDW_LIB = @WITH_LIBDW_LIB@
WITH_LIBELF_LIB = @WITH_LIBELF_LIB@
WITH_LZMA_LIB = @WITH_LZMA_LIB@
WITH_MAGIC_INCLUDE = @WITH_MAGIC_INCLUDE@
WITH_MAGIC_LIB = @WITH_MAGIC_LIB@
WITH_NSS_INCLUDE = @WITH_NSS_INCLUDE@
WITH_NSS_LIB = @WITH_NSS_LIB@
WITH_OPENSSL_INCLUDE = @WITH_OPENSSL_INCLUDE@
WITH_OPENSSL_LIB = @WITH_OPENSSL_LIB@
WITH_POPT_INCLUDE = @WITH_POPT_INCLUDE@
WITH_POPT_LIB = @WITH_POPT_LIB@
WITH_PYTHON_INCLUDE = @WITH_PYTHON_INCLUDE@
WITH_PYTHON_LIB = @WITH_PYTHON_LIB@
WITH_SELINUX_LIB = @WITH_SELINUX_LIB@
WITH_SEMANAGE_LIB = @WITH_SEMANAGE_LIB@
WITH_ZLIB_INCLUDE = @WITH_ZLIB_INCLUDE@
......@@ -345,6 +363,9 @@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZSTD_CFLAGS = @ZSTD_CFLAGS@
ZSTD_LIBS = @ZSTD_LIBS@
ZSTD_REQUIRES = @ZSTD_REQUIRES@
__7ZIP = @__7ZIP@
__BZIP2 = @__BZIP2@
__BZR = @__BZR@
......@@ -358,6 +379,7 @@ __CPIO = @__CPIO@
__CURL = @__CURL@
__FAKECHROOT = @__FAKECHROOT@
__FILE = @__FILE@
__GEM = @__GEM@
__GIT = @__GIT@
__GPG = @__GPG@
__GREP = @__GREP@
......@@ -390,6 +412,7 @@ __STRIP = @__STRIP@
__TAR = @__TAR@
__UNZIP = @__UNZIP@
__XZ = @__XZ@
__ZSTD = @__ZSTD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......@@ -457,10 +480,12 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
rpm_version_info = 7:1:0
rpm_version_info = 8:0:0
AM_CFLAGS = @RPMCFLAGS@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
-I$(top_builddir)/include/ @WITH_NSS_INCLUDE@ \
@WITH_MAGIC_INCLUDE@ @WITH_POPT_INCLUDE@ -I$(top_srcdir)/misc
-I$(top_builddir)/include/ @WITH_BEECRYPT_INCLUDE@ \
@WITH_NSS_INCLUDE@ @WITH_MAGIC_INCLUDE@ @WITH_POPT_INCLUDE@ \
-I$(top_srcdir)/misc
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmbuild.la
librpmbuild_la_SOURCES = \
......@@ -472,14 +497,10 @@ librpmbuild_la_SOURCES = \
rpmbuild_internal.h rpmbuild_misc.h
librpmbuild_la_LDFLAGS = -version-info $(rpm_version_info)
librpmbuild_la_LIBADD = \
$(top_builddir)/lib/librpm.la \
librpmbuild_la_LIBADD = $(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmio/librpmio.la \
$(top_builddir)/misc/libmisc.la \
@LTLIBICONV@ \
@WITH_POPT_LIB@ \
@WITH_MAGIC_LIB@
$(top_builddir)/misc/libmisc.la @LTLIBICONV@ @WITH_POPT_LIB@ \
@WITH_MAGIC_LIB@ $(am__append_1)
all: all-am
.SUFFIXES:
......
......@@ -69,7 +69,7 @@ rpmRC doScript(rpmSpec spec, rpmBuildFlags what, const char *name,
pid_t pid;
pid_t child;
int status;
rpmRC rc;
rpmRC rc = RPMRC_FAIL; /* assume failure */
switch (what) {
case RPMBUILD_PREP:
......@@ -118,13 +118,11 @@ rpmRC doScript(rpmSpec spec, rpmBuildFlags what, const char *name,
fd = rpmMkTempFile(spec->rootDir, &scriptName);
if (Ferror(fd)) {
rpmlog(RPMLOG_ERR, _("Unable to open temp file: %s\n"), Fstrerror(fd));
rc = RPMRC_FAIL;
goto exit;
}
if ((fp = fdopen(Fileno(fd), "w")) == NULL) {
rpmlog(RPMLOG_ERR, _("Unable to open stream: %s\n"), strerror(errno));
rc = RPMRC_FAIL;
goto exit;
}
......@@ -151,7 +149,6 @@ rpmRC doScript(rpmSpec spec, rpmBuildFlags what, const char *name,
}
if (buildDir && buildDir[0] != '/') {
rc = RPMRC_FAIL;
goto exit;
}
......@@ -160,8 +157,6 @@ rpmRC doScript(rpmSpec spec, rpmBuildFlags what, const char *name,
rpmlog(RPMLOG_NOTICE, _("Executing(%s): %s\n"), name, buildCmd);
if (!(child = fork())) {
/* NSPR messes with SIGPIPE, reset to default for the kids */
signal(SIGPIPE, SIG_DFL);
errno = 0;
(void) execvp(argv[0], (char *const *)argv);
......@@ -176,21 +171,19 @@ rpmRC doScript(rpmSpec spec, rpmBuildFlags what, const char *name,
if (pid == -1) {
rpmlog(RPMLOG_ERR, _("Error executing scriptlet %s (%s)\n"),
scriptName, name);
rc = RPMRC_FAIL;
goto exit;
}
if (!WIFEXITED(status) || WEXITSTATUS(status)) {
rpmlog(RPMLOG_ERR, _("Bad exit status from %s (%s)\n"),