Daniel Sabogal: 2 main/e2fsprogs: upgrade to 1.43.2 main/mercurial: upgrade to 3.9.1 2 files changed, 20 insertions(+), 30 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/1898/mbox | git am -3Learn more about email & git
--- main/e2fsprogs/APKBUILD | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD index 18515e5..a41cdd9 100644 --- a/main/e2fsprogs/APKBUILD +++ b/main/e2fsprogs/APKBUILD @@ -1,35 +1,25 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=e2fsprogs -pkgver=1.43.1 +pkgver=1.43.2 pkgrel=0 pkgdesc="Standard Ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" arch="all" license="GPL LGPL MIT" -depends= -install= +depends="" depends_dev="util-linux-dev" makedepends="$depends_dev linux-headers" subpackages="$pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra" +# https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$pkgname-$pkgver.tar.gz source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz mke2fs-uninit_bg.patch " -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} +builddir="$srcdir/$pkgname-$pkgver" build () { - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -48,7 +38,7 @@ build () { } package() { - cd "$_builddir" + cd "$builddir" make -j1 LDCONFIG=: DESTDIR="$pkgdir" install install-libs || return 1 mv "$pkgdir"/sbin/* "$pkgdir"/usr/sbin/ for i in e2fsck mke2fs mkfs.* fsck.*; do @@ -80,9 +70,9 @@ extra() { mv "$pkgdir"/usr "$subpkgdir"/ } -md5sums="1775f3f0eed9dee1c5f39e08d1964a97 e2fsprogs-1.43.1.tar.gz +md5sums="8ba7612e82d0858266461407f6fb9bdd e2fsprogs-1.43.2.tar.gz aec2304bbeb1d589e802cec78360db95 mke2fs-uninit_bg.patch" -sha256sums="83dba1d96dfdba06f1ca0da6a77d539c22391b99fbd9bd733699689ca25dbebc e2fsprogs-1.43.1.tar.gz +sha256sums="20085fd43d52b8f81bda259a7df5c2b1a7a745b6fd3d082a2915965dd77f5365 e2fsprogs-1.43.2.tar.gz 38e62b1604601861cb4088030ae0569b325fab4a09c600bd14f17174a6a36e18 mke2fs-uninit_bg.patch" -sha512sums="979f6b83f0c0650fd27e0a63dfe0cfb7690de71977f374a43ccdb0b77f49c40531d6b9a6a16c4a3b31a16cc4f4906846862a489c6d4b8bf036530ce72ffd36bb e2fsprogs-1.43.1.tar.gz +sha512sums="4a008f2200024685df37d5fb5c01097ca005d335c7bb2b0c6b2f13db71d9046da7dbbd367ef25800e0e16312bbfdbab603d78ac675581bb39610234002756be4 e2fsprogs-1.43.2.tar.gz d27034edaa776879bbd218fefedc22e6e3af507d363877da99ecbda8c688f75017fde3e2a934c92ce16b6accedec7404da4a209f7f4e1e856b57983f99f1f964 mke2fs-uninit_bg.patch" -- 2.9.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
--- main/mercurial/APKBUILD | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD index 31c2cea..7686757 100644 --- a/main/mercurial/APKBUILD +++ b/main/mercurial/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mercurial -pkgver=3.9 -pkgrel=1 +pkgver=3.9.1 +pkgrel=0 pkgdesc="A scalable distributed SCM tool" url="https://www.mercurial-scm.org/" arch="all" @@ -16,14 +16,14 @@ subpackages=" $pkgname-bash-completion:bashcomp" source="https://www.mercurial-scm.org/release/$pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$_builddir" + cd "$builddir" python setup.py build || return 1 } package() { - cd "$_builddir" + cd "$builddir" python setup.py install --root="$pkgdir" || return 1 install -m755 contrib/hgk hgeditor "$pkgdir"/usr/bin || return 1 @@ -39,7 +39,7 @@ vim() { install_if="vim $pkgname=$pkgver-r$pkgrel" arch="noarch" - cd "$_builddir"/contrib/vim/ + cd "$builddir"/contrib/vim/ mkdir -p "$subpkgdir"/usr/share/vim/vimfiles/syntax/ install -Dm644 HGAnnotate.vim hgtest.vim \ "$subpkgdir"/usr/share/vim/vimfiles/syntax/ || return 1 @@ -51,7 +51,7 @@ zshcomp() { install_if="$pkgname=$pkgver-r$pkgrel zsh" arch="noarch" - install -Dm644 "$_builddir"/contrib/zsh_completion \ + install -Dm644 "$builddir"/contrib/zsh_completion \ "$subpkgdir"/usr/share/zsh/site-functions/_${pkgname} || return 1 } @@ -61,10 +61,10 @@ bashcomp() { install_if="$pkgname=$pkgver-r$pkgrel bash-completion" arch="noarch" - install -Dm644 "$_builddir"/contrib/bash_completion \ + install -Dm644 "$builddir"/contrib/bash_completion \ "$subpkgdir"/usr/share/bash-completion/completions/${pkgname} || return 1 } -md5sums="e2b355da744e94747daae3a5339d28a0 mercurial-3.9.tar.gz" -sha256sums="834f25dcff44994198fb8a7ba161a6e24204dbd63c8e6270577e06e6cedbdabc mercurial-3.9.tar.gz" -sha512sums="148d5f4c1c8c78b654b03d898f8e9624697caf3f75ff8d56496f8ba5b0e28c487f6800ea2e7e26bf2ac5f01e9bdf92e7d3b4941c88521372af090a3587a0227b mercurial-3.9.tar.gz" +md5sums="3759dd10edb8c1a6dfb8ff0ce82658ce mercurial-3.9.1.tar.gz" +sha256sums="625e4fc7e85ec2278c2828bdc547fce74091b3bbe4d9eeeba2d61af51195df74 mercurial-3.9.1.tar.gz" +sha512sums="d96e45cafd36be692d6ce5259e18140641c24f73d4731ff767df0f39af425b0630c687436fc0f53d5882495ceacacaadd5e19f8f7c701b4b94c48631123b4666 mercurial-3.9.1.tar.gz" -- 2.9.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---