diff --git a/brp.diff b/brp.diff index bc3aab2..3a9c517 100644 --- a/brp.diff +++ b/brp.diff @@ -1,15 +1,15 @@ ---- ./scripts/Makefile.am.orig 2012-03-20 08:07:25.000000000 +0000 -+++ ./scripts/Makefile.am 2012-06-01 11:39:13.000000000 +0000 -@@ -25,6 +25,7 @@ EXTRA_DIST = \ - rpmconfig_SCRIPTS = \ +--- ./scripts/Makefile.am.orig 2014-09-05 11:48:54.000000000 +0000 ++++ ./scripts/Makefile.am 2014-09-08 16:42:03.387071432 +0000 +@@ -26,6 +26,7 @@ rpmconfig_SCRIPTS = \ + appdata.prov \ brp-compress brp-python-bytecompile brp-java-gcjcompile \ brp-strip brp-strip-comment-note brp-python-hardlink \ + brp-suse \ brp-strip-shared brp-strip-static-archive \ check-files check-prereqs \ check-buildroot check-rpaths check-rpaths-worker \ ---- ./scripts/brp-strip-comment-note.orig 2012-03-20 08:07:25.000000000 +0000 -+++ ./scripts/brp-strip-comment-note 2012-06-01 11:39:13.000000000 +0000 +--- ./scripts/brp-strip-comment-note.orig 2012-11-07 12:55:24.000000000 +0000 ++++ ./scripts/brp-strip-comment-note 2014-09-08 16:42:03.387071432 +0000 @@ -16,6 +16,8 @@ esac # for already stripped elf files in the build root for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ @@ -19,8 +19,8 @@ sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do note="-R .note" if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \ ---- ./scripts/brp-strip.orig 2012-03-20 08:07:25.000000000 +0000 -+++ ./scripts/brp-strip 2012-06-01 11:39:13.000000000 +0000 +--- ./scripts/brp-strip.orig 2012-11-07 12:55:24.000000000 +0000 ++++ ./scripts/brp-strip 2014-09-08 16:42:03.388071423 +0000 @@ -15,6 +15,7 @@ esac for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ @@ -29,8 +29,8 @@ sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do $STRIP -g "$f" || : done ---- ./scripts/brp-suse.orig 2012-06-01 11:39:13.000000000 +0000 -+++ ./scripts/brp-suse 2012-06-01 11:39:13.000000000 +0000 +--- ./scripts/brp-suse.orig 2014-09-08 16:42:03.388071423 +0000 ++++ ./scripts/brp-suse 2014-09-08 16:42:03.388071423 +0000 @@ -0,0 +1,13 @@ +#! /bin/sh + diff --git a/debugedit-m68k.patch b/debugedit-m68k.patch deleted file mode 100644 index 89bc25f..0000000 --- a/debugedit-m68k.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: tools/debugedit.c -=================================================================== ---- tools/debugedit.c.orig -+++ tools/debugedit.c -@@ -1235,6 +1235,10 @@ edit_dwarf2 (DSO *dso) - goto fail; - break; - #endif -+ case EM_68K: -+ if (rtype != R_68K_32) -+ goto fail; -+ break; - default: - fail: - error (1, 0, "%s: Unhandled relocation %d in .debug_info section", diff --git a/debugsubpkg.diff b/debugsubpkg.diff index 468cc03..fb2c76f 100644 --- a/debugsubpkg.diff +++ b/debugsubpkg.diff @@ -1,7 +1,7 @@ Create a debuginfo package for each subpackage. ---- ./build/files.c.orig 2014-08-18 12:59:00.491259331 +0000 -+++ ./build/files.c 2014-08-18 13:02:12.918275693 +0000 +--- ./build/files.c.orig 2014-08-18 12:37:19.151934240 +0000 ++++ ./build/files.c 2014-08-18 12:48:48.106395561 +0000 @@ -21,6 +21,10 @@ #include #include @@ -270,8 +270,8 @@ Create a debuginfo package for each subpackage. goto exit; a = headerGetString(pkg->header, RPMTAG_ARCH); ---- ./build/parseSpec.c.orig 2014-08-18 13:00:49.767700174 +0000 -+++ ./build/parseSpec.c 2014-08-18 13:00:59.917648619 +0000 +--- ./build/parseSpec.c.orig 2014-08-18 12:44:49.564619395 +0000 ++++ ./build/parseSpec.c 2014-08-18 12:44:59.187569649 +0000 @@ -503,7 +503,7 @@ static void initSourceHeader(rpmSpec spe } @@ -281,14 +281,14 @@ Create a debuginfo package for each subpackage. { const char *arch, *name; char *evr, *isaprov; ---- ./build/rpmbuild_internal.h.orig 2014-08-18 13:00:42.455737908 +0000 -+++ ./build/rpmbuild_internal.h 2014-08-18 13:01:40.838439511 +0000 +--- ./build/rpmbuild_internal.h.orig 2014-08-18 12:43:17.461092324 +0000 ++++ ./build/rpmbuild_internal.h 2014-08-18 12:44:25.578739914 +0000 @@ -425,6 +425,13 @@ int addReqProv(Package pkg, rpmTagVal ta uint32_t index); /** \ingroup rpmbuild + * Add self-provides to package. -+ * @param pkg package ++ * @param pkg package + */ +RPM_GNUC_INTERNAL +void addPackageProvides(Package pkg); @@ -297,8 +297,8 @@ Create a debuginfo package for each subpackage. * Add rpmlib feature dependency. * @param pkg package * @param feature rpm feature name (i.e. "rpmlib(Foo)" for feature Foo) ---- ./macros.in.orig 2014-08-18 12:59:00.558258988 +0000 -+++ ./macros.in 2014-08-18 12:59:21.194153431 +0000 +--- ./macros.in.orig 2014-08-18 12:37:19.206933957 +0000 ++++ ./macros.in 2014-08-18 12:37:30.648875217 +0000 @@ -186,24 +186,10 @@ # Template for debug information sub-package. %debug_package \ @@ -324,8 +324,8 @@ Create a debuginfo package for each subpackage. %description debugsource\ This package provides debug sources for package %{name}.\ Debug sources are useful when developing applications that use this\ ---- ./scripts/find-debuginfo.sh.orig 2014-08-18 12:59:00.552259019 +0000 -+++ ./scripts/find-debuginfo.sh 2014-08-18 12:59:21.195153440 +0000 +--- ./scripts/find-debuginfo.sh.orig 2014-08-18 12:37:19.201933983 +0000 ++++ ./scripts/find-debuginfo.sh 2014-08-18 12:37:30.648875217 +0000 @@ -149,6 +149,11 @@ debug_link() # Provide .2, .3, ... symlinks to all filename instances of this build-id. make_id_dup_link() diff --git a/gentlyadjustmacros.diff b/gentlyadjustmacros.diff deleted file mode 100644 index b85c9e8..0000000 --- a/gentlyadjustmacros.diff +++ /dev/null @@ -1,25 +0,0 @@ -commit 46993cd3846a8c8935c980e30bbc3718338e2378 -Author: Panu Matilainen -Date: Fri May 9 10:56:46 2014 +0300 - - Sometimes a smaller hammer is better (but only sometimes) - - - The sed-munger added in commit ccd6281e699781e0b00edb16b6e9f4dec6878c15 - causes bigger breakage than it fixes, perhaps because the hammer - applied was disproportionally large. The only thing needing adjustment - is ${prefix} in case when localstatedir is not explicitly set, so - we fixup just that instead of "everything". - - Discovered via RhBug:921973 testing - -diff --git a/installplatform b/installplatform -index ffaef48..98b87f3 100755 ---- installplatform.orig -+++ installplatform -@@ -154,5 +154,5 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do - - done - --# gently adjust autoconf variables to rpm macros... --cat $MACROS | sed -e '/\${\w*:-/!s,\${,%{_,' > ${DESTDIR}/${pkglibdir}/macros -+# gently adjust undefined autoconf variables to rpm macros... -+cat $MACROS | sed -e 's,${prefix},%{_prefix},g' > ${DESTDIR}/${pkglibdir}/macros diff --git a/m68k.patch b/m68k.patch deleted file mode 100644 index 2f09a73..0000000 --- a/m68k.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: installplatform -=================================================================== ---- installplatform.orig -+++ installplatform -@@ -108,6 +108,12 @@ for ARCH in noarch `grep ^arch_canon $RP - CANONARCH=aarch64 - CANONCOLOR=3 - ;; -+ m68k) -+ ISANAME=m68k -+ ISABITS=32 -+ CANONARCH=m68k -+ CANONCOLOR=0 -+ ;; - noarch) - CANONARCH=noarch - CANONCOLOR=0 -Index: rpmrc.in -=================================================================== ---- rpmrc.in.orig -+++ rpmrc.in -@@ -109,6 +109,8 @@ archcolor: armv5tejl 1 - archcolor: armv6l 1 - archcolor: armv7l 1 - -+archcolor: m68k 1 -+ - archcolor: m68kmint 1 - - archcolor: s390 1 -@@ -299,6 +301,8 @@ buildarchtranslate: armv6hl: armv6hl - buildarchtranslate: armv7l: armv7l - buildarchtranslate: armv7hl: armv7hl - -+buildarchtranslate: m68k: m68k -+ - buildarchtranslate: atarist: m68kmint - buildarchtranslate: atariste: m68kmint - buildarchtranslate: ataritt: m68kmint -@@ -405,6 +409,8 @@ arch_compat: armv4tl: armv4l - arch_compat: armv4l: armv3l - arch_compat: armv3l: noarch - -+arch_compat: m68k: noarch -+ - arch_compat: atarist: m68kmint noarch - arch_compat: atariste: m68kmint noarch - arch_compat: ataritt: m68kmint noarch diff --git a/newweakdeps.diff b/newweakdeps.diff index cdaf6a4..86016d3 100644 --- a/newweakdeps.diff +++ b/newweakdeps.diff @@ -307,137 +307,6 @@ { RPMTAG_PROVIDENEVRS, providenevrsTag }, { RPMTAG_OBSOLETENEVRS, obsoletenevrsTag }, { RPMTAG_CONFLICTNEVRS, conflictnevrsTag }, ---- ./python/Makefile.am.orig 2014-02-05 13:04:02.000000000 +0000 -+++ ./python/Makefile.am 2014-02-20 14:47:48.110802710 +0000 -@@ -6,16 +6,16 @@ AM_CPPFLAGS = -I$(top_builddir)/include/ - AM_CPPFLAGS += -I$(top_srcdir)/python - AM_CPPFLAGS += -I@WITH_PYTHON_INCLUDE@ - --pkgpyexec_LTLIBRARIES = _rpmmodule.la _rpmbmodule.la _rpmsmodule.la -+pkgpyexec_LTLIBRARIES = _rpm.la _rpmb.la _rpms.la - pkgpyexec_DATA = rpm/__init__.py rpm/transaction.py - --_rpmmodule_la_LDFLAGS = -module -avoid-version -shared --_rpmmodule_la_LIBADD = \ -+_rpm_la_LDFLAGS = -module -avoid-version -shared -+_rpm_la_LIBADD = \ - $(top_builddir)/lib/librpm.la \ - $(top_builddir)/rpmio/librpmio.la \ - @WITH_PYTHON_LIB@ - --_rpmmodule_la_SOURCES = rpmmodule.c rpmsystem-py.h \ -+_rpm_la_SOURCES = rpmmodule.c rpmsystem-py.h \ - header-py.c header-py.h \ - rpmds-py.c rpmds-py.h \ - rpmfd-py.c rpmfd-py.h \ -@@ -30,22 +30,22 @@ _rpmmodule_la_SOURCES = rpmmodule.c rpms - rpmte-py.c rpmte-py.h \ - rpmts-py.c rpmts-py.h - --_rpmbmodule_la_LDFLAGS = -module -avoid-version -shared --_rpmbmodule_la_LIBADD = \ -+_rpmb_la_LDFLAGS = -module -avoid-version -shared -+_rpmb_la_LIBADD = \ - $(top_builddir)/build/librpmbuild.la \ - $(top_builddir)/lib/librpm.la \ - $(top_builddir)/rpmio/librpmio.la \ - @WITH_PYTHON_LIB@ - --_rpmbmodule_la_SOURCES = rpmbmodule.c rpmsystem-py.h \ -+_rpmb_la_SOURCES = rpmbmodule.c rpmsystem-py.h \ - spec-py.c spec-py.h - --_rpmsmodule_la_LDFLAGS = -module -avoid-version -shared --_rpmsmodule_la_LIBADD = \ -+_rpms_la_LDFLAGS = -module -avoid-version -shared -+_rpms_la_LIBADD = \ - $(top_builddir)/sign/librpmsign.la \ - $(top_builddir)/lib/librpm.la \ - $(top_builddir)/rpmio/librpmio.la \ - @WITH_PYTHON_LIB@ - --_rpmsmodule_la_SOURCES = rpmsmodule.c rpmsystem-py.h -+_rpms_la_SOURCES = rpmsmodule.c rpmsystem-py.h - ---- ./python/rpmbmodule.c.orig 2012-11-07 12:55:24.000000000 +0000 -+++ ./python/rpmbmodule.c 2014-02-20 14:47:48.110802710 +0000 -@@ -66,8 +66,8 @@ static struct PyModuleDef moduledef = { - NULL /* m_free */ - }; - --PyObject * PyInit__rpm(void); /* XXX eliminate gcc warning */ --PyObject * PyInit__rpm(void) -+PyObject * PyInit__rpmb(void); /* XXX eliminate gcc warning */ -+PyObject * PyInit__rpmb(void) - { - PyObject *m; - ---- ./python/rpmii-py.c.orig 2012-11-07 12:55:24.000000000 +0000 -+++ ./python/rpmii-py.c 2014-02-20 14:47:48.110802710 +0000 -@@ -88,7 +88,9 @@ static PyNumberMethods rpmii_as_number = - 0, /* nb_add */ - 0, /* nb_subtract */ - 0, /* nb_multiply */ -+#if PY_MAJOR_VERSION < 3 - 0, /* nb_divide */ -+#endif - 0, /* nb_remainder */ - 0, /* nb_divmod */ - 0, /* nb_power */ ---- ./python/rpmmi-py.c.orig 2012-11-07 12:55:24.000000000 +0000 -+++ ./python/rpmmi-py.c 2014-02-20 14:47:48.110802710 +0000 -@@ -149,7 +149,9 @@ static PyNumberMethods rpmmi_as_number = - 0, /* nb_add */ - 0, /* nb_subtract */ - 0, /* nb_multiply */ -+#if PY_MAJOR_VERSION < 3 - 0, /* nb_divide */ -+#endif - 0, /* nb_remainder */ - 0, /* nb_divmod */ - 0, /* nb_power */ ---- ./python/rpmsmodule.c.orig 2012-11-07 12:55:24.000000000 +0000 -+++ ./python/rpmsmodule.c 2014-02-20 14:47:48.110802710 +0000 -@@ -59,15 +59,15 @@ static struct PyModuleDef moduledef = { - "_rpms", /* m_name */ - rpms__doc__, /* m_doc */ - 0, /* m_size */ -- NULL, /* m_methods */ -+ modMethods, /* m_methods */ - NULL, /* m_reload */ - NULL, /* m_traverse */ - NULL, /* m_clear */ - NULL /* m_free */ - }; - --PyObject * PyInit__rpm(void); /* XXX eliminate gcc warning */ --PyObject * PyInit__rpm(void) -+PyObject * PyInit__rpms(void); /* XXX eliminate gcc warning */ -+PyObject * PyInit__rpms(void) - { - PyObject *m; - ---- ./python/rpmsystem-py.h.orig 2012-11-07 12:55:24.000000000 +0000 -+++ ./python/rpmsystem-py.h 2014-02-20 14:47:48.110802710 +0000 -@@ -48,6 +48,7 @@ typedef Py_ssize_t (*lenfunc)(PyObject * - #define PyInt_FromLong PyLong_FromLong - #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask - #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask -+#define PyInt_AsSsize_t PyLong_AsSsize_t - #endif - - #endif /* H_SYSTEM_PYTHON */ ---- ./rpmio/digest.c.orig 2012-11-07 12:55:24.000000000 +0000 -+++ ./rpmio/digest.c 2014-02-20 14:47:48.110802710 +0000 -@@ -8,7 +8,7 @@ - - #include "debug.h" - --#define DIGESTS_MAX 11 -+#define DIGESTS_MAX 12 - struct rpmDigestBundle_s { - int index_min; /*!< Smallest index of active digest */ - int index_max; /*!< Largest index of active digest */ --- ./rpmpopt.in.orig 2014-02-05 13:04:02.000000000 +0000 +++ ./rpmpopt.in 2014-02-20 14:47:48.110802710 +0000 @@ -67,6 +67,19 @@ rpm alias --requires --qf \ diff --git a/platformin.diff b/platformin.diff index 4de1e10..870ee9f 100644 --- a/platformin.diff +++ b/platformin.diff @@ -1,7 +1,7 @@ SUSE specific platform changes. ---- ./platform.in.orig 2012-03-20 08:07:25.000000000 +0000 -+++ ./platform.in 2012-06-01 12:42:30.000000000 +0000 +--- ./platform.in.orig 2014-09-05 11:49:01.000000000 +0000 ++++ ./platform.in 2014-09-08 16:43:35.250660580 +0000 @@ -29,7 +29,7 @@ %_exec_prefix @exec_prefix@ %_bindir @bindir@ @@ -19,8 +19,8 @@ SUSE specific platform changes. +%_initddir %{_sysconfdir}/init.d # Deprecated misspelling, present for backwards compatibility. %_initrddir %{_initddir} - -@@ -78,3 +78,21 @@ + %_rundir @RUNDIR@ +@@ -79,3 +79,21 @@ @apple@# @apple@%_use_internal_dependency_generator 0 @apple@%__so dylib diff --git a/python3-rpm.spec b/python3-rpm.spec index 9523d63..4d65c0d 100644 --- a/python3-rpm.spec +++ b/python3-rpm.spec @@ -17,7 +17,7 @@ Name: python3-rpm -Version: 4.11.2 +Version: 4.11.3 Release: 0 Summary: Python Bindings for Manipulating RPM Packages License: GPL-2.0+ diff --git a/rpm-4.11.2.tar.bz2 b/rpm-4.11.2.tar.bz2 deleted file mode 100644 index d209b23..0000000 --- a/rpm-4.11.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:403f8de632b33846ce5746f429c21a60f40dff9dcb56f1b4118f37a0652a48d4 -size 3988837 diff --git a/rpm-4.11.3.tar.bz2 b/rpm-4.11.3.tar.bz2 new file mode 100644 index 0000000..e8ec99f --- /dev/null +++ b/rpm-4.11.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7da2771a7312f149d326badce97d61ff7ecb0940692acbac29675357ae0e0b03 +size 3907544 diff --git a/rpm-python.spec b/rpm-python.spec index 9b93c6e..ab2080d 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -17,7 +17,7 @@ Name: rpm-python -Version: 4.11.2 +Version: 4.11.3 Release: 0 #!BuildIgnore: rpmlint-Factory Summary: Python Bindings for Manipulating RPM Packages diff --git a/rpm.changes b/rpm.changes index 9ecb798..96d747f 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Sep 8 18:51:28 CEST 2014 - mls@suse.de + +- update to rpm-4.11.3 + * consists of cherry picked bug fixes + * fix double-free on malformed signature header (RhBug:1133885) + * fix curl globbing being enabled on remote retrieval (RhBug:1076277) + * fix verification of SHA224 signatures (RhBug:1066494) + * fix buffer overflows on malformed macro define/undefine (RhBug:1087000) + * fix buffer overflow on unterminated macro options + * fix file actions sometimes carrying state across multiple + rpmtsRun() calls (RhBug:1076552, RhBug:1128359) + * fix %autopatch options getting expanded twice + * add support for %autosetup -S git_am (RhBug:1082038) +- dropped patches: gentlyadjustmacros.diff, rundir.diff, + m68k.patch, debugedit-m68k.patch + ------------------------------------------------------------------- Mon Aug 18 14:50:33 CEST 2014 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index ec23e09..0e76df2 100644 --- a/rpm.spec +++ b/rpm.spec @@ -47,7 +47,7 @@ PreReq: %fillup_prereq Summary: The RPM Package Manager License: GPL-2.0+ Group: System/Packages -Version: 4.11.2 +Version: 4.11.3 Release: 0 Source: http://rpm.org/releases/rpm-4.11.x/rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 @@ -137,11 +137,7 @@ Patch92: find-lang-python.patch Patch93: weakdepscompat.diff Patch94: checksepwarn.diff Patch95: exportoldtags.diff -Patch96: rundir.diff -Patch97: gentlyadjustmacros.diff Patch6464: auto-config-update-aarch64-ppc64le.diff -Patch68000: m68k.patch -Patch68001: debugedit-m68k.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -228,13 +224,11 @@ rm -f rpmdb/db.h %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 80 -P 82 -P 85 -%patch -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 +%patch -P 92 -P 93 -P 94 -P 95 %ifarch aarch64 ppc64le %patch6464 %endif -%patch68000 -%patch68001 cp config.guess config.sub db/dist/ cp config.guess config.sub beecrypt/ @@ -333,7 +327,6 @@ install -m 755 %{SOURCE6} %{buildroot}/usr/lib/rpm install -m 755 scripts/find-supplements{,.ksyms} %{buildroot}/usr/lib/rpm install -m 755 scripts/firmware.prov %{buildroot}/usr/lib/rpm install -m 755 scripts/debuginfo.prov %{buildroot}/usr/lib/rpm -install -m 755 scripts/appdata.prov %{buildroot}/usr/lib/rpm rm -f %{buildroot}/usr/lib/locale %{buildroot}/usr/lib/rpmrc mkdir -p %{buildroot}/etc/rpm chmod 755 %{buildroot}/etc/rpm diff --git a/rpmrc.diff b/rpmrc.diff index d590527..0ddae67 100644 --- a/rpmrc.diff +++ b/rpmrc.diff @@ -1,5 +1,5 @@ ---- ./rpmrc.in.orig 2014-02-05 13:04:02.000000000 +0000 -+++ ./rpmrc.in 2014-02-20 12:48:24.342815390 +0000 +--- ./rpmrc.in.orig 2014-09-05 11:47:15.000000000 +0000 ++++ ./rpmrc.in 2014-09-08 16:44:47.547337670 +0000 @@ -12,16 +12,16 @@ # "fat" binary with both archs, for Darwin optflags: fat -O2 -g -arch i386 -arch ppc @@ -62,9 +62,9 @@ optflags: armv7l -O2 -g -march=armv7 +optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mthumb -mabi=aapcs-linux - optflags: atarist -O2 -g -fomit-frame-pointer - optflags: atariste -O2 -g -fomit-frame-pointer -@@ -77,8 +80,8 @@ optflags: atariclone -O2 -g -fomit-frame + optflags: m68k -O2 -g -fomit-frame-pointer + +@@ -79,8 +82,8 @@ optflags: atariclone -O2 -g -fomit-frame optflags: milan -O2 -g -fomit-frame-pointer optflags: hades -O2 -g -fomit-frame-pointer @@ -75,7 +75,7 @@ optflags: sh3 -O2 -g optflags: sh4 -O2 -g -mieee -@@ -180,7 +183,9 @@ arch_canon: armv4l: armv4l 12 +@@ -184,7 +187,9 @@ arch_canon: armv4l: armv4l 12 arch_canon: armv5tel: armv5tel 12 arch_canon: armv5tejl: armv5tejl 12 arch_canon: armv6l: armv6l 12 @@ -85,7 +85,7 @@ arch_canon: m68kmint: m68kmint 13 arch_canon: atarist: m68kmint 13 -@@ -244,17 +249,17 @@ os_canon: MacOSX: macosx 21 +@@ -248,17 +253,17 @@ os_canon: MacOSX: macosx 21 ############################################################# # For a given uname().machine, the default build arch @@ -111,7 +111,7 @@ buildarchtranslate: i486: i386 buildarchtranslate: i386: i386 -@@ -293,7 +298,9 @@ buildarchtranslate: armv4tl: armv4tl +@@ -297,7 +302,9 @@ buildarchtranslate: armv4tl: armv4tl buildarchtranslate: armv5tel: armv5tel buildarchtranslate: armv5tejl: armv5tejl buildarchtranslate: armv6l: armv6l @@ -119,9 +119,9 @@ buildarchtranslate: armv7l: armv7l +buildarchtranslate: armv7hl: armv7hl - buildarchtranslate: atarist: m68kmint - buildarchtranslate: atariste: m68kmint -@@ -318,6 +325,15 @@ buildarchtranslate: sh4a: sh4 + buildarchtranslate: m68k: m68k + +@@ -324,6 +331,15 @@ buildarchtranslate: sh4a: sh4 buildarchtranslate: aarch64: aarch64 @@ -137,7 +137,7 @@ ############################################################# # Architecture compatibility -@@ -375,14 +391,20 @@ arch_compat: mipsel: noarch +@@ -381,14 +397,20 @@ arch_compat: mipsel: noarch arch_compat: hppa2.0: hppa1.2 arch_compat: hppa1.2: hppa1.1 arch_compat: hppa1.1: hppa1.0 @@ -160,7 +160,7 @@ arch_compat: armv4tl: armv4l arch_compat: armv4l: armv3l arch_compat: armv3l: noarch -@@ -399,7 +421,7 @@ arch_compat: i370: noarch +@@ -407,7 +429,7 @@ arch_compat: i370: noarch arch_compat: s390: noarch arch_compat: s390x: s390 noarch @@ -169,7 +169,7 @@ arch_compat: x86_64: amd64 em64t athlon noarch arch_compat: amd64: x86_64 em64t athlon noarch -@@ -484,12 +506,15 @@ buildarch_compat: ppc64le: noarch fat +@@ -492,12 +514,15 @@ buildarch_compat: ppc64le: noarch fat buildarch_compat: ppc64pseries: ppc64 buildarch_compat: ppc64iseries: ppc64 buildarch_compat: ppc64p7: ppc64 @@ -185,7 +185,7 @@ buildarch_compat: armv6l: armv5tejl buildarch_compat: armv5tejl: armv5tel buildarch_compat: armv5tel: armv4tl -@@ -500,7 +525,8 @@ buildarch_compat: armv3l: noarch +@@ -508,7 +533,8 @@ buildarch_compat: armv3l: noarch buildarch_compat: hppa2.0: hppa1.2 buildarch_compat: hppa1.2: hppa1.1 buildarch_compat: hppa1.1: hppa1.0 diff --git a/rundir.diff b/rundir.diff deleted file mode 100644 index fe7739b..0000000 --- a/rundir.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.ac.orig 2014-04-25 13:40:13.808532251 +0000 -+++ configure.ac 2014-04-25 13:40:13.822532172 +0000 -@@ -814,6 +814,13 @@ AC_SUBST(RPMCANONVENDOR) - AC_SUBST(RPMCANONOS) - AC_SUBST(RPMCANONGNU) - -+RUNDIR="/run" -+AC_ARG_WITH([rundir], -+ AS_HELP_STRING([--with-rundir=RUNDIR], [specify run-time variable directory]), -+ [RUNDIR=$withval]) -+AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory]) -+AC_SUBST(RUNDIR) -+ - if test X"$prefix" = XNONE ; then - usrprefix="$ac_default_prefix" - else ---- platform.in.orig 2014-04-25 13:40:13.823532166 +0000 -+++ platform.in 2014-04-25 13:41:13.034198906 +0000 -@@ -44,6 +44,7 @@ - %_initddir %{_sysconfdir}/init.d - # Deprecated misspelling, present for backwards compatibility. - %_initrddir %{_initddir} -+%_rundir @RUNDIR@ - - %_defaultdocdir %{_datadir}/doc -