diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-01-08 14:53:19 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-01-08 14:54:28 +0200 |
| commit | 23214819586a6d738df262b503a96625effdc61a (patch) | |
| tree | a0a742b34a1556218ebad5057ad1618e4058e3aa /main/fakeroot | |
| parent | f8ae4e7b0a1d9561f12be77def0337b975a52d5f (diff) | |
| download | aports-23214819586a6d738df262b503a96625effdc61a.tar.bz2 aports-23214819586a6d738df262b503a96625effdc61a.tar.xz | |
main/fakeroot: use patch instead of sed
The sed replacement is more vulnerable to breaking if something
changes in upstream source tarball. Apply the change as a patch
instead. fixes #4701
Diffstat (limited to 'main/fakeroot')
| -rw-r--r-- | main/fakeroot/APKBUILD | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD index 2e17c9189e..a0906ac88a 100644 --- a/main/fakeroot/APKBUILD +++ b/main/fakeroot/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fakeroot pkgver=1.20.2 -pkgrel=2 +pkgrel=3 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch="all" license='GPL' @@ -15,6 +15,7 @@ source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.o fakeroot-hide-dlsym-errors.patch fakeroot-no64.patch fakeroot-stdint.patch + xstatjunk.patch " prepare() { @@ -24,12 +25,6 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - - if [ "$CLIBC" = "musl" ]; then - # overrides wrong symbol for musl, so hack the config script - sed -e 's/for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do/for WRAPPED in ${PRE}${FUNC}; do/' \ - -i configure - fi } build() { @@ -60,14 +55,17 @@ md5sums="a4b4564a75024aa96c86e4d1017ac786 fakeroot_1.20.2.orig.tar.bz2 7ca69287e73bdd65947e70e439b5bb64 busybox-getopt.patch 624cd86a66d020d01bde4ba60efc4d40 fakeroot-hide-dlsym-errors.patch 3fc66a8ffb365fcf2acd652d33f101a2 fakeroot-no64.patch -50a899380cfd5eae8ce3aaf878fb17b2 fakeroot-stdint.patch" +50a899380cfd5eae8ce3aaf878fb17b2 fakeroot-stdint.patch +ff42badefea59d969f2df3994110d747 xstatjunk.patch" sha256sums="7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2 6b881eaecacacba100cbaa96d552c51a622639a40f3d7701b6756b4cde0e5d95 busybox-getopt.patch 915313c164b2968bc785621d14e652aae0bb74cec01510457d1fa601f23e0ca2 fakeroot-hide-dlsym-errors.patch 3420da0789caef582fcfc890c657da4136b3b06d1205443f4409cdf85ab02a46 fakeroot-no64.patch -8739c0b79c3f2b0e46cd0dffa8b73d946efbe994f61f69f7d1115c2dcec22df1 fakeroot-stdint.patch" +8739c0b79c3f2b0e46cd0dffa8b73d946efbe994f61f69f7d1115c2dcec22df1 fakeroot-stdint.patch +78f2fcc1ffcacdfbfa8c74bdb2a528c9226921fde949d451a0269d8c35d6a027 xstatjunk.patch" sha512sums="1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231 fakeroot_1.20.2.orig.tar.bz2 9024263f4452bcb46c9670f8b8106e67c2d9b4cf45215def7ff4e78d2c908e4f98d494dd6f514fb3325165b0f61571fa031632b4642163cf9b1b3386d0867c5f busybox-getopt.patch 666f41d6adc5e65eba419e08d5bbc4f561e40b0fc7bfa82090eb87962a7f3193bf319754e04aca289e865c66df2ecced1dbb45c9aa9f093657f22193dda25354 fakeroot-hide-dlsym-errors.patch 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch -ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch" +ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch +27bac2aaea72547efc7c48313f8c2eee3b60d778e7bf4ebb49a37a750b7477a5080cfa7fbc2c135527ade7e9fb826ccaaba06b85d2713cad21891608e9c1ad4d xstatjunk.patch" |