diff options
-rw-r--r-- | main/cvs/APKBUILD | 23 | ||||
-rw-r--r-- | main/cvs/cvs-musl.patch | 27 |
2 files changed, 44 insertions, 6 deletions
diff --git a/main/cvs/APKBUILD b/main/cvs/APKBUILD index 98e41fb44a..fff46a0fee 100644 --- a/main/cvs/APKBUILD +++ b/main/cvs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cvs -pkgver=1.12.13 -pkgrel=3 +pkgver=1.11.23 +pkgrel=0 pkgdesc="Concurrent Versions System" url="http://www.nongnu.org/cvs/" arch="all" @@ -11,12 +11,20 @@ depends="" makedepends="zlib-dev" install= subpackages="$pkgname-doc" -source="http://ftp.gnu.org/non-gnu/cvs/source/feature/$pkgver/$pkgname-$pkgver.tar.gz" +source="http://ftp.gnu.org/non-gnu/cvs/source/stable/$pkgver/$pkgname-$pkgver.tar.gz + cvs-musl.patch + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { + local i cd "$_builddir" update_config_sub || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { @@ -39,6 +47,9 @@ package() { make -j1 DESTDIR="$pkgdir" install } -md5sums="7a71a2e7a64973ecf255965956a1d338 cvs-1.12.13.tar.gz" -sha256sums="4734971a59471744e4ad8665c1dca54cb3ebf9fc66ce9c2dff3d04670d3f7312 cvs-1.12.13.tar.gz" -sha512sums="acd658b7ffa29a67e33f294073a0f80a27aa4e19dc2185cfa43f862d34e511bcf9802012b8e6957f82c7532fdabbb058b33686e0e6046cdd1f1aa9af619e92e9 cvs-1.12.13.tar.gz" +md5sums="bf185eb51b5918330a04671c3f3cccde cvs-1.11.23.tar.gz +3b51f4b2b94b83666f9e105038222cd8 cvs-musl.patch" +sha256sums="0ad692e3c22e4b33274a53ad22a194deb3024ec833b9e87ad7968d9b0b58cdcf cvs-1.11.23.tar.gz +b5b687e9c5349fbb15e82ca1f99d9227432f6be29a55b7ca22bd9b1c8b6f08d5 cvs-musl.patch" +sha512sums="e486df1d2aaf13605b9abc8ea5e8e2261dd015483cef82a9489919646f0d5d52a7bf4385f4fdb5f845a9c2287184153a0d456510089f1e2609957ba48ad9f96a cvs-1.11.23.tar.gz +7de04d5ec797430f8405b00e271d9edb5dffa3be855fc1e1dc35b134d981418c969486da668a78e1da88a4dba57952bfa14ffafbe3ff3ffc081de9cc908cf245 cvs-musl.patch" diff --git a/main/cvs/cvs-musl.patch b/main/cvs/cvs-musl.patch new file mode 100644 index 0000000000..313377dbdd --- /dev/null +++ b/main/cvs/cvs-musl.patch @@ -0,0 +1,27 @@ +--- cvs-1.11.23.org/lib/getline.h 2013-09-16 18:28:13.026099577 +0000 ++++ cvs-1.11.23/lib/getline.h 2013-09-16 18:44:33.356064387 +0000 +@@ -12,8 +12,6 @@ + #define GETLINE_NO_LIMIT -1 + + int +- getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); +-int + getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, + int limit)); + int +--- cvs-1.11.23.org/lib/getline.c 2013-09-16 18:28:13.021099577 +0000 ++++ cvs-1.11.23/lib/getline.c 2013-09-16 18:45:14.463062911 +0000 +@@ -154,12 +154,7 @@ + return ret; + } + +-int +-getline (lineptr, n, stream) +- char **lineptr; +- size_t *n; +- FILE *stream; +-{ ++ssize_t getline(char ** lineptr, size_t * n, FILE *stream) { + return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT); + } + |