diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpmatch.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpmatch.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpmatch.patch b/meta/recipes-devtools/rpm/rpm/rpmatch.patch index 8ea349003a..20d13aa08c 100644 --- a/meta/recipes-devtools/rpm/rpm/rpmatch.patch +++ b/meta/recipes-devtools/rpm/rpm/rpmatch.patch | |||
| @@ -8,26 +8,26 @@ Upstream-Status: Pending | |||
| 8 | 8 | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | 10 | ||
| 11 | Index: rpm-5.4.0/configure.ac | 11 | Index: rpm-5.4.14/configure.ac |
| 12 | =================================================================== | 12 | =================================================================== |
| 13 | --- rpm-5.4.0.orig/configure.ac 2012-05-31 15:40:05.985990822 -0700 | 13 | --- rpm-5.4.14.orig/configure.ac |
| 14 | +++ rpm-5.4.0/configure.ac 2012-05-31 15:41:15.601995311 -0700 | 14 | +++ rpm-5.4.14/configure.ac |
| 15 | @@ -800,7 +800,7 @@ | 15 | @@ -943,7 +943,7 @@ AC_CHECK_FUNCS([dnl |
| 16 | ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo dnl | 16 | ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo dnl |
| 17 | getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl | 17 | getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl |
| 18 | lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl | 18 | lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl |
| 19 | - posix_fadvise posix_fallocate putenv realpath regcomp __secure_getenv dnl | 19 | - posix_fadvise posix_fallocate putenv realpath regcomp secure_getenv __secure_getenv dnl |
| 20 | + posix_fadvise posix_fallocate putenv realpath regcomp rpmatch __secure_getenv dnl | 20 | + posix_fadvise posix_fallocate putenv realpath regcomp rpmatch secure_getenv __secure_getenv dnl |
| 21 | setattrlist setenv setlocale setmode setxattr dnl | 21 | setattrlist setenv setlocale setmode setxattr dnl |
| 22 | sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl | 22 | sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl |
| 23 | sigprocmask sigsuspend sigaction dnl | 23 | sigprocmask sigsuspend sigaction dnl |
| 24 | Index: rpm-5.4.0/system.h | 24 | Index: rpm-5.4.14/system.h |
| 25 | =================================================================== | 25 | =================================================================== |
| 26 | --- rpm-5.4.0.orig/system.h 2012-05-31 15:40:05.997991504 -0700 | 26 | --- rpm-5.4.14.orig/system.h |
| 27 | +++ rpm-5.4.0/system.h 2012-05-31 15:42:04.941997731 -0700 | 27 | +++ rpm-5.4.14/system.h |
| 28 | @@ -410,6 +410,14 @@ | 28 | @@ -353,6 +353,14 @@ extern int _tolower(int) __THROW /*@*/; |
| 29 | #endif /* defined(__GNUC__) */ | 29 | #include <libgen.h> |
| 30 | #endif /* HAVE_MCHECK_H */ | 30 | #endif |
| 31 | 31 | ||
| 32 | +#ifndef HAVE_RPMATCH | 32 | +#ifndef HAVE_RPMATCH |
| 33 | +#define rpmatch(line) \ | 33 | +#define rpmatch(line) \ |
| @@ -37,6 +37,6 @@ Index: rpm-5.4.0/system.h | |||
| 37 | + -1 ) | 37 | + -1 ) |
| 38 | +#endif | 38 | +#endif |
| 39 | + | 39 | + |
| 40 | /* Retrofit glibc __progname */ | 40 | /* -- Retrofit glibc __progname */ |
| 41 | #if defined __GLIBC__ && __GLIBC__ >= 2 | 41 | #if defined __GLIBC__ && __GLIBC__ >= 2 |
| 42 | #if __GLIBC_MINOR__ >= 1 | 42 | #if __GLIBC_MINOR__ >= 1 |