Accepting request 147491 from devel:Factory:ARM
- Update to 4.10.2 - Update to 4.10.2 - update to 4.10.2 (bnc#796375): * Fix missing error code on unparseable signature in packages, regression introduced in rpm 4.10.0. This could result in packages with malformed signature falling through signature checking. * Fix missing error code on --import on bogus key file (RhBug:869667) * Fix installation of packages containing skipped hardlinks (RhBug:864622) * Fix --setperms regression introduced in rpm 4.10.0 (RhBug:881835) * Fix locale dependent behavior in rpm2cpio.sh (RhBug:878363) * Add --undefine cli switch for undefining macros (related to RhBug:876308) * Fix warnings when building with gcc >= 4.7 * Permit key imports on transactions where signature checking is disabled, regression of sorts introduced in 4.10.0 (RhBug:856225) * Fix RPMPROB_FILTER_FORCERELOCATE aka --badreloc, regression introduced in 4.9.0 (RhBug:828784) * Verify files from non-installed packages again, regression introduced in 4.9.0 (RhBug:826589) * Fix large (> 4GB) package support, regression introduced in 4.9.0 (RhBug:844936) * Only create the first instance of a file shared between multiple packages on install (speedup + improved verification timestamp behavior) * Report config and missinok flags too in deptype format extension * Fix relative path handling in --whatprovides query * Add --noclean and --nocheck options to rpmbuild (RhBug:756531) * Permit non-existent %ghost directories to be packaged (RhBug:839656) * Dont silence patch by default (RhBug:678000, RhBug:773503) * Accept "owner" as an alias to "user" %verify attribute (RhBug:838657) OBS-URL: https://build.opensuse.org/request/show/147491 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=245
This commit is contained in:
Git OBS Bridge
@@ -1,5 +1,5 @@
|
||||
--- ./config.h.in.orig 2012-05-22 10:55:46.000000000 +0000
|
||||
+++ ./config.h.in 2012-05-31 16:41:07.000000000 +0000
|
||||
--- config.h.in
|
||||
+++ config.h.in
|
||||
@@ -13,6 +13,9 @@
|
||||
/* Define to 1 if you have the `basename' function. */
|
||||
#undef HAVE_BASENAME
|
||||
@@ -10,7 +10,7 @@
|
||||
/* Define to 1 if you have the <bzlib.h> header file. */
|
||||
#undef HAVE_BZLIB_H
|
||||
|
||||
@@ -206,6 +209,10 @@
|
||||
@@ -203,6 +206,10 @@
|
||||
*/
|
||||
#undef LT_OBJDIR
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
|
||||
*/
|
||||
#undef MAJOR_IN_MKDEV
|
||||
@@ -290,6 +297,9 @@
|
||||
@@ -287,6 +294,9 @@
|
||||
/* Build with acl support? */
|
||||
#undef WITH_ACL
|
||||
|
||||
@@ -31,9 +31,9 @@
|
||||
/* Build with capability support? */
|
||||
#undef WITH_CAP
|
||||
|
||||
--- ./configure.ac.orig 2012-05-22 10:55:31.000000000 +0000
|
||||
+++ ./configure.ac 2012-05-31 16:37:32.000000000 +0000
|
||||
@@ -239,12 +239,43 @@ AC_CHECK_HEADERS([dwarf.h], [
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -239,12 +239,43 @@
|
||||
AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes])
|
||||
|
||||
#=================
|
||||
@@ -77,7 +77,7 @@
|
||||
AC_CHECK_HEADERS([nspr.h nss.h sechash.h], [], [
|
||||
AC_MSG_ERROR([missing required NSPR / NSS header])
|
||||
])
|
||||
@@ -253,6 +284,7 @@ AC_CHECK_LIB(nss3, NSS_NoDB_Init, [
|
||||
@@ -257,6 +288,7 @@
|
||||
], [
|
||||
AC_MSG_ERROR([missing required NSS library 'nss3'])
|
||||
])
|
||||
@@ -85,53 +85,8 @@
|
||||
AC_SUBST(WITH_NSS_INCLUDE)
|
||||
AC_SUBST(WITH_NSS_LIB)
|
||||
|
||||
--- ./rpmio/Makefile.am.orig 2012-03-20 08:07:25.000000000 +0000
|
||||
+++ ./rpmio/Makefile.am 2012-05-31 16:39:58.000000000 +0000
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
|
||||
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
|
||||
+AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@
|
||||
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/misc
|
||||
AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
|
||||
@@ -17,12 +18,18 @@ librpmio_la_SOURCES = \
|
||||
rpmstring.c rpmfileutil.c \
|
||||
rpmkeyring.c
|
||||
|
||||
+if WITH_BEECRYPT
|
||||
+librpmio_la_SOURCES += digest_beecrypt.c
|
||||
+else
|
||||
librpmio_la_SOURCES += digest_nss.c
|
||||
+endif
|
||||
+
|
||||
|
||||
librpmio_la_LDFLAGS = -version-info 3:0:0
|
||||
librpmio_la_LIBADD = \
|
||||
../misc/libmisc.la \
|
||||
@WITH_NSS_LIB@ \
|
||||
+ @WITH_BEECRYPT_LIB@ \
|
||||
@WITH_BZ2_LIB@ \
|
||||
@WITH_ZLIB_LIB@ \
|
||||
@WITH_LIBELF_LIB@ \
|
||||
@@ -30,6 +37,15 @@ librpmio_la_LIBADD = \
|
||||
@WITH_LZMA_LIB@ \
|
||||
-lpthread
|
||||
|
||||
+if WITH_INTERNAL_BEECRYPT
|
||||
+librpmio_la_LIBADD += $(libbeecrypt_la)
|
||||
+
|
||||
+libbeecrypt_la = $(top_builddir)/beecrypt/libbeecrypt_nolibdir.la
|
||||
+
|
||||
+$(top_builddir)/beecrypt/libbeecrypt_nolibdir.la: $(top_builddir)/beecrypt/libbeecrypt.la
|
||||
+ sed -e 's/libdir=.*/libdir=/' < $(top_builddir)/beecrypt/libbeecrypt.la > $(top_builddir)/beecrypt/libbeecrypt_nolibdir.la
|
||||
+endif
|
||||
+
|
||||
if WITH_LUA
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/luaext/
|
||||
AM_CPPFLAGS += @LUA_CFLAGS@
|
||||
--- ./rpmio/digest_beecrypt.c.orig 2012-05-31 16:42:01.000000000 +0000
|
||||
+++ ./rpmio/digest_beecrypt.c 2012-05-31 17:33:28.000000000 +0000
|
||||
--- rpmio/digest_beecrypt.c
|
||||
+++ rpmio/digest_beecrypt.c
|
||||
@@ -0,0 +1,526 @@
|
||||
+#include "system.h"
|
||||
+
|
||||
@@ -659,3 +614,47 @@
|
||||
+ }
|
||||
+ return sa;
|
||||
+}
|
||||
--- rpmio/Makefile.am
|
||||
+++ rpmio/Makefile.am
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
|
||||
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
|
||||
+AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@
|
||||
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/misc
|
||||
AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
|
||||
@@ -17,12 +18,17 @@
|
||||
rpmstring.c rpmfileutil.c \
|
||||
rpmkeyring.c
|
||||
|
||||
+if WITH_BEECRYPT
|
||||
+librpmio_la_SOURCES += digest_beecrypt.c
|
||||
+else
|
||||
librpmio_la_SOURCES += digest_nss.c
|
||||
+endif
|
||||
|
||||
librpmio_la_LDFLAGS = -version-info 3:2:0
|
||||
librpmio_la_LIBADD = \
|
||||
../misc/libmisc.la \
|
||||
@WITH_NSS_LIB@ \
|
||||
+ @WITH_BEECRYPT_LIB@ \
|
||||
@WITH_BZ2_LIB@ \
|
||||
@WITH_ZLIB_LIB@ \
|
||||
@WITH_LIBELF_LIB@ \
|
||||
@@ -30,6 +36,15 @@
|
||||
@WITH_LZMA_LIB@ \
|
||||
-lpthread
|
||||
|
||||
+if WITH_INTERNAL_BEECRYPT
|
||||
+librpmio_la_LIBADD += $(libbeecrypt_la)
|
||||
+
|
||||
+libbeecrypt_la = $(top_builddir)/beecrypt/libbeecrypt_nolibdir.la
|
||||
+
|
||||
+$(top_builddir)/beecrypt/libbeecrypt_nolibdir.la: $(top_builddir)/beecrypt/libbeecrypt.la
|
||||
+ sed -e 's/libdir=.*/libdir=/' < $(top_builddir)/beecrypt/libbeecrypt.la > $(top_builddir)/beecrypt/libbeecrypt_nolibdir.la
|
||||
+endif
|
||||
+
|
||||
if WITH_LUA
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/luaext/
|
||||
AM_CPPFLAGS += @LUA_CFLAGS@
|
||||
|
||||
Reference in New Issue
Block a user