Commit 2b271a53 authored by Michal Čihař's avatar Michal Čihař

New upstream version 4.12.0.2+dfsg1

parent b98e6bfd
Work on RPM was done primarily by:
Initial work on RPM was done primarily by:
Erik Troan
Marc Ewing
Erik Troan
Significant code, ideas, or porting help have been contributed by:
Over the years, code, documentation, ideas, porting help, tests etc
have been contributed by:
Tero Aho
Stuart Anderson
Ed Bailey
Donnie Barnes
Stefan Berger
Eric W. Biederman
Anders F Bjorklund
Frederic Bonnard
Nikita Borisov
Pádraig Brady
Tony Breeds
Till Bubeck
Héctor Daniel Cabrera
Yuri Chornoivan
Michal Čihař
Archie Cobbs
Ralf Corsépius
Kit Cosper
Jean Delvare
Kristof Depraetere
Alex deVries
Johannes Dewender
Michal Domonkos
Piotr Drąg
Boris Egorov
Karl Eichwalder
Peter Eisentraut
Giulio Eulisse
Christophe Fergeau
Florian Festi
Jakub Filak
Brian Elliott Finley
Fred Fish
Nikola Forró
Gleb Fotengauer-Malinovskiy
David Fox
Joseph L. Hartmann, Jr
Rafael Garcia-Suarez
Alexey Gladkov
Igor Gnatenko
Neal Gompa
Guido Grazioli
David Greaves
Aron Griffis
Fionnuala Gunter
Anssi Hannula
Richard Hughes
Tom Hughes
Thomas Jarosch
Zbigniew Jędrzejewski-Szmek
Jakub Jelinek
Jeff Johnson
Michael K. Johnson
Tadashi Jokagi
Peter Jones
Richard W.M. Jones
Guillem Jover
Joseph L. Hartmann, Jr
Juha Kallioinen
Alexandr D. Kanevskiy
Eugene Kanter
Lubos Kardos
Per Øyvind Karlsen
Jiri Kastner
Phil Knirsch
Ales Kozumplik
Jan Kratochvil
Toshio Kuratomi
Tim Landscheidt
Hermann Lauer
Steve Lawrence
Alec Leamas
Dimitri John Ledkov
Elliot Lee
Dominique Leuenberger
Benedict Lofstedt
Till Maas
David Malcolm
Michal Marek
Panu Matilainen
Jared Mauch
Roland McGrath
Kyle McMartin
Joshua Megerman
Nigel Metheringham
Tomas Mlcoch
Horacio Rodriguez Montero
Tim Mooney
David Martínez Moreno
Eric Mumpower
Paul Nasrat
Gustavo Niemeyer
Jindrich Novy
Michael Nyquisk
Stanislav Ochotnicky
Denis Ollier
Vít Ondruch
Rakesh Pandit
Thomas Petazzoni
Trần Ngọc Quân
Jerome Quelin
Pavel Raiskup
Elena Reshetova
Lubomir Rintel
Pavol Rusnak
Kamil Rytarowski
Mark Salter
Steve Sanbeg
Tyson Sawyer
Andreas Scherer
Michal Schmidt
Michael Schroeder
Andreas Schwab
Christopher Seawood
Misha Shnurapet
Kirill A. Shutemov
Jan Silhan
Taylon Silmer
Mukund Sivaraman
Ville Skyttä
Jeff Smith
Johnie Stafford
Gary Thomas
Hajime Taira
Bob Tanner
Pascal Terjan
Gary Thomas
Jeff Tickle
Michal Toman
Alexey Tourbin
Tom Tromey
Chip Turner
Vincent Untz
Pavlina Varekova
Nicolas Vigier
Thierry Vignaud
Jonathan Wakely
Colin Walters
Florian Weimer
Karsten Weiss
Mark Wielaard
Mimi Zohar
commit 6cd6032599f79a39bb67f5f5e5689ec9e455b2c0
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Wed Nov 2 10:42:35 2016 +0200
Preparing for rpm 4.12.0.2
commit a0a24884d9c8c54ae37b8912067179b7e04b4bbf
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Wed Oct 19 17:15:42 2016 +0300
Avoid going past header data area when validating SHA1 header digest
A malformed header with no zeros in it could've easily walked off the
edge of the world here. That it happens while trying to validate the
tag data content is the height of embarrasment of sorts.
(cherry picked from commit d8bfe732572e8295015a372348dd13bdecb40f8c)
commit 489769fea8ddbe187be92bc5b247c211a3bb065d
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Wed Oct 19 14:48:08 2016 +0300
Verify data is within range and does not overlap in headerVerifyInfo()
Checking whether data start offset is within header data area is of no use
whatsoever if the entire chunk doesn't fit. Validate the entire data
fits within range and that it does not overlap, however with string
types we can only check the array size is sane but we cant check the
actual content.
Adjust the upper limit for region trailer in headerVerifyRegion() so
it fits the new rules, but in reality calling headerVerifyInfo() for
the region tags is rather pointless since they're so different.
Partial fix for RhBug:1373107.
(cherry picked from commit 89dce2b91d7d73a1e225461a7392c3d6d7a30a95)
commit 648d717f231cccb1ce976d5fa038c9255e7bf6b9
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Tue Oct 18 14:50:20 2016 +0300
Bring CREDITS to this millenium
Merge pre-existing contributions with names from git shortlog (now that
we have a reasonable mapping), all names in alphabetical order.
(cherry picked from commit ef656ca6a6edb75dd9e9ee5801c7ac3357de9f4d)
(cherry picked from commit 49f06a1d96200f17f09e22e62b3c71221272b3fe)
commit 493c9372b6a00c06014c2d935a3839329cd9c72d
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Tue Oct 11 09:43:54 2016 +0300
Revised fix for CVE-2013-6435
In case of hardlinked files, we first create a zero-length file
to which all the links are created, the content comes in the last
link. When the links have been created with no permissions at all
(as per commit 7e26e2bd726f48836be289400c7d82cb8b067dc1), reopening
the final file for writing the actual content fails for non-root users.
Which breaks installation of hardlinked files for regular users,
including our testsuite.
Creating the files with write-only permissions solves the issue - we
*are* writing to these files afterall so it only makes sense.
This doesn't stop root from reading the file but neither does zero
permissions so no change there. But if somebody reads a file with
write-only permissions and gets garbage, at least we get to tell
them "told you so".
(cherry picked from commit 6e7c6d1a18aa14fc7a980c43d980a26d82f785c4)
commit eec854932d50010e4b3c6fb237f37d8f0a93bd23
Author: Florian Festi <ffesti@redhat.com>
Date: Thu Jul 23 11:56:13 2015 +0200
Create files with with 000 permissions to avoid leaking yet unchecked data
As we are calculating the check sum while writing we only know the file
content is correct after it being written comletely. CVE-2013-6435
(cherry picked from commit 7e26e2bd726f48836be289400c7d82cb8b067dc1)
commit b1cb0cb18fc9b98b44f5f7381a2ab4558ae7c0cb
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon Sep 5 10:12:29 2016 +0200
Fix overflow in cpio filename by limiting the allowed length to 4kB
This could lead to a stack-based overflow, while parsing a crafted CPIO header in the payload section of an RPM file.
Fixes: rhbz#1168715, CVE-2014-8118
(cherry picked from commit f255c6bdb27ad1512c043a64195410d46996395a)
commit 8a755e2b2c3220c2da108ecb67b7a43c8d313855
Author: Florian Festi <ffesti@redhat.com>
Date: Fri Apr 22 07:58:46 2016 +0200
Make sure getNEVRA always sets td.data
Fixes segfault when reading tampered package without any of the NEVRA tags.
(cherry picked from commit b4f0e7ef184f2cdfcee5289108763e46be9438db)
commit 81a1656b38a837fa0bf78c7669a6133b04658293
Author: Lubos Kardos <lkardos@redhat.com>
Date: Mon Apr 25 14:38:47 2016 +0200
Fix sigsegv in stringFormat() (rhbz:1316903)
Just skip duping of NULL and return it. Returned NULL is handled in
upper layer.
(cherry picked from commit cddf43a56f19711866371f02f378dc4095b0fadd)
commit 3cffded66206cad881348c98b16f86e22e6e00da
Author: Lubos Kardos <lkardos@redhat.com>
Date: Mon Apr 25 13:31:08 2016 +0200
Fix reading rpmtd behind its size in formatValue() (rhbz:1316896)
When it is read from index higher than size of rpmtd, return "(none)".
(cherry picked from commit b722cf86200505b3e3fcbb2095c4ff61f1f5a2ab)
commit 1234747a82b7b479bc60b57fd2525c3ce088be7e
Author: Boris Egorov <egorov@linux.com>
Date: Sun Mar 27 23:55:08 2016 +0600
Misleading indentation fixes (GCC6)
package.c:
This one is definitely an error (See commit 57000e976b1e5ed2c3c1e78567cd
stating "No functional changes").
rpminstall.c:
Judging by the code above, we should set eiu->fnp to NULL only on error,
but it happens every time we reach function end.
Signed-off-by: Boris Egorov <egorov@linux.com>
(cherry picked from commit dddc6e7be597e787917009c3d892ebe29c99eff8)
commit 05c41d2c84f85967921e2d5cdd51f5732da7d6a2
Author: Lubos Kardos <lkardos@redhat.com>
Date: Fri Nov 6 14:49:59 2015 +0100
Fix crash when parsing corrupted RPM file (rhbz:1273360)
(cherry picked from commit 9c36ca411332d2718eca339e867561c39abc256b)
commit 9b2942bef39af2a013aa457c019f38b6b747361e
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Tue Oct 28 10:06:17 2014 +0200
Handle %ghost file in payload (RhBug:1156497)
- Older rpm (< 4.11) sometimes packaged %ghost files into payload,
at least in case of a hardlinked file marked as %ghost. Just skip
them if encountered in payload, whereas older rpm thought of these
as actual hardlinks (including 'rpm -qlv' output) but handled
(whether accidentally or otherwise) somewhere in the fsm. Thanks
to Florian for pointing out this correct fix instead of reverting
back to former behavior.
- Depends on commit d85dc92e8d7fb50d16f49faa1e88c85fdc526199.
(cherry picked from commit bcb5fb50ddccdbccf6f096d0c574184c7b82c4b8)
commit 973bdd9e709727c4cb56c4811250f9a23e0a13b6
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Tue Oct 28 10:01:53 2014 +0200
Generic support for skipping items inside file info iterator
(cherry picked from commit 051ca9ec7f3c386877f9c0faa77d577f891d3a59)
commit 767140049c1eac57c105fdfc874c2628a9089145
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Tue Oct 7 15:37:21 2014 +0300
Unbreak size and archive size generation on big-endian systems
- Fix regression from commit 68bddc353a7ea87ea00ad957858cd509e845e84c,
accessing a 64bit int as if it were a 32bit one doesn't make it one.
(cherry picked from commit 104856ea17161eb3a508913c2b7ed701f2e4f6aa)
commit 6d125a2694ba8a2e4d97f0d1f6ef6f8f3af68723
Author: Florian Festi <ffesti@redhat.com>
Date: Mon Aug 29 18:08:29 2016 +0200
tests: Do not pass real pathnames to fakechroot commands
for the remaining tests.
Also add a Provides: /bin/sh to one of the specs as the test does no longer
works without for some unknown reason.
(backported from commit 394cbfb668655f7aa10ff6b178ec92b44a117ea6)
commit 5a5510848a2ddc28164e9882a42a96a29706e878
Author: Michal Marek <mmarek@suse.com>
Date: Fri Aug 12 21:47:16 2016 +0200
tests: Do not pass real pathnames to fakechroot commands
Fakechroot returns -ENOENT for such paths:
$ FAKECHROOT_BASE=$PWD/tests/testing fakechroot ls /not_an.rpm
/not_an.rpm
$ FAKECHROOT_BASE=$PWD/tests/testing fakechroot ls $PWD/not_an.rpm
ls: cannot access /home/mmarek/GIT/rpm/not_an.rpm: No such file or directory
Signed-off-by: Michal Marek <mmarek@suse.com>
(backported from commit 3a392532b0074bb7744c4d682f52834e942f50a2)
commit 01769c0d88bbb9f2e8d20b2beae5489587496eda
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Thu Sep 18 14:07:24 2014 +0300
# Makefile.in generated by automake 1.13.4 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -21,7 +21,17 @@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -84,13 +94,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(top_srcdir)/rpm.am $(top_srcdir)/preinstall.am \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in mkinstalldirs $(dist_bin_SCRIPTS) \
depcomp $(pkginclude_HEADERS) ABOUT-NLS COPYING ChangeLog \
INSTALL README config.guess config.rpath config.sub install-sh \
missing ltmain.sh
@WITH_INTERNAL_DB_TRUE@am__append_1 = db3
@WITH_LUA_TRUE@am__append_2 = luaext
@ENABLE_PYTHON_TRUE@am__append_3 = python
......@@ -119,6 +122,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(dist_bin_SCRIPTS) \
$(pkginclude_HEADERS) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
......@@ -307,6 +313,11 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/preinstall.am $(top_srcdir)/rpm.am ABOUT-NLS \
COPYING ChangeLog INSTALL README compile config.guess \
config.rpath config.sub depcomp install-sh ltmain.sh missing \
mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -408,6 +419,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LUA_CFLAGS = @LUA_CFLAGS@
LUA_LIBS = @LUA_LIBS@
MAKEINFO = @MAKEINFO@
......@@ -739,7 +751,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/rpm.am $(top_srcdir)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -749,7 +760,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
$(top_srcdir)/rpm.am $(top_srcdir)/preinstall.am:
$(top_srcdir)/rpm.am $(top_srcdir)/preinstall.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
......@@ -761,8 +772,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
@if test ! -f $@; then rm -f stamp-h1; else :; fi
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
@test -f $@ || rm -f stamp-h1
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
......@@ -1507,10 +1518,16 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
......@@ -1545,16 +1562,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......@@ -1774,6 +1792,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
uninstall-rpmconfigSCRIPTS uninstall-rpmlibexecPROGRAMS \
uninstall-rpmvarDATA
.PRECIOUS: Makefile
rpmrc: $(top_srcdir)/rpmrc.in
@$(SED) \
-e "s,[@]SYSCONFIGDIR[@],$(sysconfdir)/rpm,g" \
......
This diff is collapsed.
# Makefile.in generated by automake 1.13.4 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -17,7 +17,17 @@
# Makefile for rpmbuild library.
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -80,9 +90,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(top_srcdir)/rpm.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs \
$(top_srcdir)/depcomp
subdir = build
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
......@@ -95,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
......@@ -205,6 +213,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
$(top_srcdir)/mkinstalldirs $(top_srcdir)/rpm.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
......@@ -265,6 +275,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LUA_CFLAGS = @LUA_CFLAGS@
LUA_LIBS = @LUA_LIBS@
MAKEINFO = @MAKEINFO@
......@@ -484,7 +495,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/rpm.am $(am__configu
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign build/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -493,7 +503,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
$(top_srcdir)/rpm.am:
$(top_srcdir)/rpm.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
......@@ -805,6 +815,8 @@ uninstall-am: uninstall-usrlibLTLIBRARIES
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-usrlibLTLIBRARIES
.PRECIOUS: Makefile
# 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.
......
......@@ -284,9 +284,6 @@ static rpmRC generateSignature(char *SHA1, uint8_t *MD5, rpm_loff_t size,
{
Header sig = NULL;
struct rpmtd_s td;
rpmTagVal sizetag;
rpmTagVal payloadtag;
rpm_tagtype_t typetag;
rpmRC rc = RPMRC_OK;
char *reservedSpace;
int spaceSize = 0;
......@@ -308,29 +305,33 @@ static rpmRC generateSignature(char *SHA1, uint8_t *MD5, rpm_loff_t size,
td.data = MD5;
headerPut(sig, &td, HEADERPUT_DEFAULT);
rpmtdReset(&td);
td.count = 1;
if (payloadSize < UINT32_MAX) {
sizetag = RPMSIGTAG_SIZE;
payloadtag = RPMSIGTAG_PAYLOADSIZE;
typetag = RPM_INT32_TYPE;
rpm_off_t p = payloadSize;
rpm_off_t s = size;
td.type = RPM_INT32_TYPE;
td.tag = RPMSIGTAG_PAYLOADSIZE;
td.data = &p;
headerPut(sig, &td, HEADERPUT_DEFAULT);
td.tag = RPMSIGTAG_SIZE;
td.data = &s;
headerPut(sig, &td, HEADERPUT_DEFAULT);
} else {
sizetag = RPMSIGTAG_LONGSIZE;
payloadtag = RPMSIGTAG_LONGARCHIVESIZE;
typetag = RPM_INT64_TYPE;
}
rpm_loff_t p = payloadSize;
rpm_loff_t s = size;
td.type = RPM_INT64_TYPE;
rpmtdReset(&td);
td.tag = payloadtag;
td.count = 1;
td.type = typetag;
td.data = &payloadSize;
headerPut(sig, &td, HEADERPUT_DEFAULT);
td.tag = RPMSIGTAG_LONGARCHIVESIZE;
td.data = &p;
headerPut(sig, &td, HEADERPUT_DEFAULT);
rpmtdReset(&td);
td.tag = sizetag;
td.count = 1;
td.type = typetag;
td.data = &size;
headerPut(sig, &td, HEADERPUT_DEFAULT);
td.tag = RPMSIGTAG_LONGSIZE;
td.data = &s;
headerPut(sig, &td, HEADERPUT_DEFAULT);
}
spaceSize = rpmExpandNumeric("%{__gpg_reserved_space}");
if(spaceSize > 0) {
......
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
# We need space, tab and new line, in precisely that order. Quoting is
# there to prevent tools from complaining about whitespace usage.
IFS=" "" $nl"
file_conv=
# func_file_conv build_file lazy
# Convert a $build file to $host form and store it in $file
# Currently only supports Windows hosts. If the determined conversion
# type is listed in (the comma separated) LAZY, no conversion will
# take place.
func_file_conv ()
{
file=$1
case $file in
/ | /[!/]*) # absolute file, and not a UNC file
if test -z "$file_conv"; then
# lazily determine how to convert abs files
case `uname -s` in
MINGW*)
file_conv=mingw
;;
CYGWIN*)
file_conv=cygwin
;;
*)
file_conv=wine
;;
esac
fi
case $file_conv/,$2, in
*,$file_conv,*)
;;
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)