diff --git a/fdopen_strncat.diff b/fdopen_strncat.diff new file mode 100644 index 0000000..c0fbe40 --- /dev/null +++ b/fdopen_strncat.diff @@ -0,0 +1,22 @@ +--- ./rpmio/rpmio.c.orig 2012-08-30 16:47:57.000000000 +0000 ++++ ./rpmio/rpmio.c 2012-08-30 16:54:01.000000000 +0000 +@@ -1370,7 +1370,7 @@ static void cvtfmode (const char *m, + + FD_t Fdopen(FD_t ofd, const char *fmode) + { +- char stdio[20], other[20], zstdio[20]; ++ char stdio[20], other[20], zstdio[40]; + const char *end = NULL; + FDIO_t iof = NULL; + FD_t fd = ofd; +@@ -1385,8 +1385,8 @@ fprintf(stderr, "*** Fdopen(%p,%s) %s\n" + if (stdio[0] == '\0') + return NULL; + zstdio[0] = '\0'; +- strncat(zstdio, stdio, sizeof(zstdio) - strlen(zstdio)); +- strncat(zstdio, other, sizeof(zstdio) - strlen(zstdio)); ++ strncat(zstdio, stdio, sizeof(zstdio) - strlen(zstdio) - 1); ++ strncat(zstdio, other, sizeof(zstdio) - strlen(zstdio) - 1); + + if (end == NULL && other[0] == '\0') + return fd; diff --git a/python3-rpm.spec b/python3-rpm.spec index 25367fd..5b826aa 100644 --- a/python3-rpm.spec +++ b/python3-rpm.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python3-rpm Version: 4.9.1.2 Release: 0 diff --git a/rpm-python.spec b/rpm-python.spec index b1125b1..c53c2eb 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rpm-python Version: 4.10.0 Release: 0 diff --git a/rpm.spec b/rpm.spec index f80f1f9..0cc29eb 100644 --- a/rpm.spec +++ b/rpm.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rpm BuildRequires: binutils BuildRequires: bzip2 @@ -132,6 +133,7 @@ Patch77: langnoc.diff Patch78: headerchk2.diff Patch79: helperenv.diff Patch80: obsoletesdeptag.diff +Patch81: fdopen_strncat.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -204,7 +206,7 @@ rm -f rpmdb/db.h %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %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 +%patch -P 80 -P 81 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov