diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-06 11:05:14 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-06 11:05:14 +0000 |
| commit | 26dbf8bdcbc6ef342e84728f113b063c604a4893 (patch) | |
| tree | 61a304d815275eb3c8733455d111b1c981f89202 /main/fakeroot | |
| parent | 1c2725684d584bd52eb45dd66421b1a339cfeb3a (diff) | |
| download | aports-26dbf8bdcbc6ef342e84728f113b063c604a4893.tar.bz2 aports-26dbf8bdcbc6ef342e84728f113b063c604a4893.tar.xz | |
main/fakeroot: fix getopt to handle args with spaces
ref #3500
Diffstat (limited to 'main/fakeroot')
| -rw-r--r-- | main/fakeroot/APKBUILD | 19 | ||||
| -rw-r--r-- | main/fakeroot/busybox-getopt.patch | 15 |
2 files changed, 16 insertions, 18 deletions
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD index aab1443e34..1a50c114cc 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=1 +pkgrel=2 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch="all" license='GPL' @@ -15,7 +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 - fakeroot-uclibc.patch" + " prepare() { cd $startdir/src/$pkgname-$pkgver @@ -58,20 +58,17 @@ package() { } md5sums="a4b4564a75024aa96c86e4d1017ac786 fakeroot_1.20.2.orig.tar.bz2 -bdbf1db14f2cfdff0f5b4c35da78b9fe busybox-getopt.patch +7ca69287e73bdd65947e70e439b5bb64 busybox-getopt.patch 624cd86a66d020d01bde4ba60efc4d40 fakeroot-hide-dlsym-errors.patch 3fc66a8ffb365fcf2acd652d33f101a2 fakeroot-no64.patch -50a899380cfd5eae8ce3aaf878fb17b2 fakeroot-stdint.patch -7a54ab51fdb90bc44e366e0a66811bfe fakeroot-uclibc.patch" +50a899380cfd5eae8ce3aaf878fb17b2 fakeroot-stdint.patch" sha256sums="7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2 -e915ce6cf414da590d39c735e1e522725717f43bfe6da77bd62cd1be365a06ec busybox-getopt.patch +6b881eaecacacba100cbaa96d552c51a622639a40f3d7701b6756b4cde0e5d95 busybox-getopt.patch 915313c164b2968bc785621d14e652aae0bb74cec01510457d1fa601f23e0ca2 fakeroot-hide-dlsym-errors.patch 3420da0789caef582fcfc890c657da4136b3b06d1205443f4409cdf85ab02a46 fakeroot-no64.patch -8739c0b79c3f2b0e46cd0dffa8b73d946efbe994f61f69f7d1115c2dcec22df1 fakeroot-stdint.patch -e325ad9aad310caa71002adea220795f706c621c5794093f16c0f319b3d58977 fakeroot-uclibc.patch" +8739c0b79c3f2b0e46cd0dffa8b73d946efbe994f61f69f7d1115c2dcec22df1 fakeroot-stdint.patch" sha512sums="1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231 fakeroot_1.20.2.orig.tar.bz2 -3a3cfcddbfe6685111d2a9dd93ebe5816bacab664aa19004cc39e18c00b5ef8045cb153755f66cabb204f17e2495ce38e2fb37fdc8da01cc69ec62e4694e3001 busybox-getopt.patch +9024263f4452bcb46c9670f8b8106e67c2d9b4cf45215def7ff4e78d2c908e4f98d494dd6f514fb3325165b0f61571fa031632b4642163cf9b1b3386d0867c5f busybox-getopt.patch 666f41d6adc5e65eba419e08d5bbc4f561e40b0fc7bfa82090eb87962a7f3193bf319754e04aca289e865c66df2ecced1dbb45c9aa9f093657f22193dda25354 fakeroot-hide-dlsym-errors.patch 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch -ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch -783ceaf00c6c1c190327dbc3f67761488aaeb23e40b3a249bcaf301f99334721a864f8a730abfb0e17467bad24f5db9127d83379dea3ef24b6f708ff7dfb3f98 fakeroot-uclibc.patch" +ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch" diff --git a/main/fakeroot/busybox-getopt.patch b/main/fakeroot/busybox-getopt.patch index 94029bf248..e8172e8f10 100644 --- a/main/fakeroot/busybox-getopt.patch +++ b/main/fakeroot/busybox-getopt.patch @@ -1,13 +1,14 @@ -diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in -index 324a9dc..8d4235d 100755 ---- a/scripts/fakeroot.in -+++ b/scripts/fakeroot.in -@@ -43,7 +43,7 @@ export FAKED_MODE +--- ./scripts/fakeroot.in.orig ++++ ./scripts/fakeroot.in +@@ -43,9 +43,9 @@ libfound=no -GETOPTEST=`getopt --version` -+GETOPTEST=`getopt --version 2>/dev/null` ++GETOPTEST=`getopt --version 2>&1 | head -n2` case $GETOPTEST in - getopt*) # GNU getopt +-getopt*) # GNU getopt ++getopt*|*BusyBox*) # GNU getopt FAKE_TEMP=`getopt -l lib: -l faked: -l unknown-is-real -l fd-base: -l version -l help -- +l:f:i:s:ub:vh "$@"` + ;; + *) # POSIX getopt ? |