X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from correo.mendoza-conicet.gob.ar (mx1.mendoza-conicet.gob.ar [168.96.255.91]) by mail.alpinelinux.org (Postfix) with ESMTP id DAB74DC016F for ; Wed, 12 Dec 2012 17:08:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by correo.mendoza-conicet.gob.ar (Postfix) with ESMTP id 80C1BAC14088 for ; Wed, 12 Dec 2012 13:59:53 -0300 (ART) X-Virus-Scanned: amavisd-new at mendoza-conicet.gob.ar Received: from correo.mendoza-conicet.gob.ar ([127.0.0.1]) by localhost (correo.mendoza-conicet.gob.ar [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZXLjwcTPW1JY; Wed, 12 Dec 2012 13:59:50 -0300 (ART) Received: from pcastorino-cct.admin.cricyt.edu.ar (unknown [172.16.18.34]) by correo.mendoza-conicet.gob.ar (Postfix) with ESMTPA id B5DD5AC14083; Wed, 12 Dec 2012 13:59:50 -0300 (ART) From: Pablo Castorino To: alpine-devel@lists.alpinelinux.org Cc: Pablo Castorino Subject: [alpine-devel] [PATCH] testing/csync2: upgrade to 2.0_rc1_git20121210 Date: Wed, 12 Dec 2012 14:08:29 -0300 Message-Id: <1355332109-22329-1-git-send-email-pcastorino@mendoza-conicet.gob.ar> X-Mailer: git-send-email 1.7.10 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/csync2/03-strlcpy_disable.patch | 21 +++++++++++++++++ testing/csync2/APKBUILD | 39 ++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 testing/csync2/03-strlcpy_disable.patch diff --git a/testing/csync2/03-strlcpy_disable.patch b/testing/csync2/03-strlcpy_disable.patch new file mode 100644 index 0000000..f0e9d45 --- /dev/null +++ b/testing/csync2/03-strlcpy_disable.patch @@ -0,0 +1,21 @@ +--- old/rsync.c ++++ new/rsync.c +@@ -49,6 +49,9 @@ + * + * @return index of the terminating byte. + **/ ++ ++/* disabled ** ++ + static size_t strlcpy(char *d, const char *s, size_t bufsize) + { + size_t len = strlen(s); +@@ -61,7 +64,7 @@ + } + return ret; + } +- ++*/ + + /* This has been taken from rsync sources: receiver.c */ + diff --git a/testing/csync2/APKBUILD b/testing/csync2/APKBUILD index 425d15c..6b2ff91 100644 --- a/testing/csync2/APKBUILD +++ b/testing/csync2/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa pkgname=csync2 -pkgver=1.34 +pkgver=2.0_rc1_git20121210 pkgrel=0 -pkgdesc="a cluster synchronization tool" +pkgdesc="Cluster synchronization tool" url="http://oss.linbit.com/csync2/" arch="all" license="GPL-2+" @@ -10,12 +10,34 @@ depends= makedepends="librsync-dev gnutls-dev sqlite-dev autoconf automake bison flex" install= subpackages="$pkgname-doc" -source="http://oss.linbit.com/csync2/csync2-$pkgver.tar.gz - 01-csync2-sqlite3.patch - 02-csync2-1.34-gnutls_pkgconfig.patch - " +source="$pkgname-$pkgver.tar.gz + 03-strlcpy_disable.patch" +# 01-csync2-sqlite3.patch +# 02-csync2-1.34-gnutls_pkgconfig.patch _builddir="$srcdir"/$pkgname-$pkgver +_giturl="http://git.linbit.com/csync2.git" + + +snapshot() { + local _pkg=$pkgname-$pkgver.tar.gz + mkdir -p "$srcdir" + cd "$srcdir" + msg "Creating snapshot: $_pkg" + rm -rf ${_giturl##*/} + git clone --bare $_giturl || return 1 + git --git-dir ${_giturl##*/} archive -o $_pkg \ + --prefix=$pkgname-$pkgver/ HEAD \ + || return 1 + + msg "New snapshot: $_pkg" + if [ -n "$_upload" ]; then + msg "Uploading to $_upload" + scp $_pkg $_upload || return 1 + abump $pkgname-$_tag + fi + #abuild checksum +} prepare() { cd "$_builddir" @@ -40,6 +62,5 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="efc8a3548996b79cef2ad76af5e93cd8 csync2-1.34.tar.gz -35ba1bb1aafd87741c7ef55bdfb2e212 01-csync2-sqlite3.patch -31b2ed6a7bb424ccdbf1486223eca323 02-csync2-1.34-gnutls_pkgconfig.patch" +md5sums="9c835a405db0ab3496239ef185bc43f2 csync2-2.0_rc1_git20121210.tar.gz +e6d8aaff70cf847b11873cd1cfaaa8f6 03-strlcpy_disable.patch" -- 1.7.10 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---