diff options
| -rw-r--r-- | community/rpm/APKBUILD | 14 | ||||
| -rw-r--r-- | community/rpm/rpm-uclibc.patch | 45 |
2 files changed, 5 insertions, 54 deletions
diff --git a/community/rpm/APKBUILD b/community/rpm/APKBUILD index f72c48e931..9109464c37 100644 --- a/community/rpm/APKBUILD +++ b/community/rpm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=rpm -pkgver=4.12.0.1 +pkgver=4.13.0 pkgrel=0 pkgdesc="The RPM package manager" url="http://www.rpm.org/" @@ -14,8 +14,7 @@ depends_dev="nspr-dev nss-dev db-dev lua-dev zlib-dev bzip2-dev xz-dev makedepends="$depends_dev graphviz gettext-dev python2-dev" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py-rpm:py_rpm" -source="http://rpm.org/releases/rpm-4.12.x/$pkgname-$pkgver.tar.bz2 - rpm-uclibc.patch" +source="http://ftp.rpm.org/releases/rpm-4.13.x/$pkgname-$pkgver.tar.bz2" builddir="$srcdir"/rpm-$pkgver @@ -46,9 +45,6 @@ py_rpm() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib || return 1 } -md5sums="c06a691765252d2b381a7942a9669856 rpm-4.12.0.1.tar.bz2 -528cdfc96ebfe8db3e389abdcf024d94 rpm-uclibc.patch" -sha256sums="77ddd228fc332193c874aa0b424f41db1ff8b7edbb6a338703ef747851f50229 rpm-4.12.0.1.tar.bz2 -e963102ba11f83b691ad27ca7df9283524710a8fbd458e85e6ac84f3413778e9 rpm-uclibc.patch" -sha512sums="ae751b04cec2463f1f259aec4b4750fca1e4cef6144b7e612d0c94f7b6a2864ed119547568f6acebb7fefddb7b040b6021c1f32cf465963db0b627f524c5760f rpm-4.12.0.1.tar.bz2 -7a5796716b0f53e0c7fde5d7f42bd767eb2dd03fda03179779b7085e7f0dfc72a1c246621458d3bbe6227a5d59074b3f29147eea34d889a700b3ff47b799c2ce rpm-uclibc.patch" +md5sums="f64e70c7548911da51a11651a789e30e rpm-4.13.0.tar.bz2" +sha256sums="221166b61584721a8ca979d7d8576078a5dadaf09a44208f69cc1b353240ba1b rpm-4.13.0.tar.bz2" +sha512sums="d13d9170d5aba93698acfaa88a8ef4cddc9dc9d57aff88fa6947b23efcb11b51d4953f8ed2804b2b052fc6c7d9a95d2f5da599b9c17490c643bf8eff7b68f6e9 rpm-4.13.0.tar.bz2" diff --git a/community/rpm/rpm-uclibc.patch b/community/rpm/rpm-uclibc.patch deleted file mode 100644 index 12636f0fc9..0000000000 --- a/community/rpm/rpm-uclibc.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -rupN a/misc/fts.c b/misc/fts.c ---- a/misc/fts.c 2012-11-07 13:55:24.000000000 +0100 -+++ b/misc/fts.c 2014-03-06 08:15:37.983514119 +0100 -@@ -42,6 +42,11 @@ static char sccsid[] = "@(#)fts.c 8.6 (B - #include <string.h> - #include <unistd.h> - #else -+#include "system.h" -+#include <stdlib.h> -+#include <string.h> -+#include <errno.h> -+#include "misc/fts.h" - #if defined(hpux) - # define _INCLUDE_POSIX_SOURCE - # define __errno_location() (&errno) -@@ -61,11 +66,10 @@ static char sccsid[] = "@(#)fts.c 8.6 (B - # define _STAT_VER 0 - # define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp)) - #endif --#include "system.h" --#include <stdlib.h> --#include <string.h> --#include <errno.h> --#include "misc/fts.h" -+#if !defined(__GLIBC__) || defined(__UCLIBC__) -+# define _STAT_VER 0 -+# define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp)) -+#endif - # define __set_errno(val) (*__errno_location ()) = (val) - # define __open open - # define __close close -diff -rupN a/misc/fts.h b/misc/fts.h ---- a/misc/fts.h 2012-11-07 13:55:24.000000000 +0100 -+++ b/misc/fts.h 2014-03-06 08:17:10.426850180 +0100 -@@ -61,6 +61,10 @@ - # define _D_EXACT_NAMLEN(d) (strlen((d)->d_name)) - #endif - -+#if !defined(_D_EXACT_NAMLEN) -+# define _D_EXACT_NAMLEN(d) (strlen((d)->d_name)) -+#endif -+ - #endif - - #include <sys/types.h> |