haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

librsync: Update version

Browse Source 
Also addresses Adrien's request of using the full Git commit hash, which
unfortunately is still needed although in the Git history it seems the
version has already been released.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
This commit is contained in:
Timothy Gu
2014-12-23 05:55:24 +00:00
parent 7d11e013cd
commit 031a13aefb
2 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
net-libs/librsync/librsync-1.0.0pre.recipe → net-libs/librsync/librsync-1.0.0.recipe
View File

@@ -7,10 +7,20 @@ design similar to that of zlib with the aim of allowing it to be embedded \
into many different applications."
HOMEPAGE="http://librsync.sourcefrog.net"
GIT_HASH='ad8d065bfd'
SRC_URI="git://github.com/librsync/librsync.git#$GIT_HASH"
#CHECKSUM_SHA256=""
# Unfortunately the maintainer of librsync did not publish a tag or released
# tarball for the 1.0.0 release (yet?). Use a static tarball with Git hash
# for now (which comparing to directly cloning allows for double-checking
# correctness of the source).
GIT_HASH='02f1cc19182845d37cfb6a893f54af220a294ce7'
# Attach the $GIT_HASH to the file name just in case upstream publishes an
# official release tarball.
SRC_FILENAME="librsync-${portVersion}-${GIT_HASH}.tar.gz"
SRC_URI="https://github.com/librsync/librsync/archive/${GIT_HASH}.tar.gz"
CHECKSUM_SHA256='25d046a8cbc6e075cc68925b5070c1f0e731e3a018446f6bda20ec9723a5631a'
REVISION="1"
SOURCE_DIR="librsync-${GIT_HASH}"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
LICENSE="GNU LGPL v2.1"
@@ -53,17 +63,11 @@ BUILD_PREREQUIRES="
PROVIDES="
$portName = $portVersion
cmd:rdiff$secondaryArchSuffix = $portVersion
lib:librsync$secondaryArchSuffix = 1.0.2 compat >= 1
lib:librsync$secondaryArchSuffix = 2.0.0 compat >= 2
"
PATCH()
{
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
}
BUILD()
{
mkdir -p m4
autoreconf -fi
runConfigure ./configure \
--enable-shared
@@ -84,9 +88,11 @@ TEST()
make check
}
# Although the librsync soname is bumped to 2.0.0, it is purely an ABI change,
# so the compat level for the devel package remains at 1.
PROVIDES_devel="
${portName}_devel = $portVersion
devel:librsync$secondaryArchSuffix = 1.0.2 compat >= 1
${portName}_devel = $portVersion compat >= 1
devel:librsync$secondaryArchSuffix = 2.0.0 compat >= 1
"
REQUIRES_devel="
librsync$secondaryArchSuffix == $portVersion base

28
net-libs/librsync/patches/librsync-1.0.0.patchset Normal file
View File

@@ -0,0 +1,28 @@
From 6fdcdff86e215e06817462c0fe4d63a0ca64cf21 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 23 Dec 2014 06:15:47 +0000
Subject: blake2b: Separate declaration and code
Fixes old compilers like gcc 2.95.3.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/blake2b-ref.c b/blake2b-ref.c
index bcf81da..43cf4c1 100644
--- a/blake2b-ref.c
+++ b/blake2b-ref.c
@@ -149,10 +149,10 @@ static inline int blake2b_init0( blake2b_state *S )
/* init xors IV with input parameter block */
int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
{
- blake2b_init0( S );
uint8_t *p = ( uint8_t * )( P );
size_t i;
+ blake2b_init0( S );
/* IV XOR ParamBlock */
for( i = 0; i < 8; ++i )
S->h[i] ^= load64( p + sizeof( S->h[i] ) * i );
--
1.8.3.4