haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged in TimothyGu/haikuports/rsync (pull request #387)

Browse Source 
Fix librsync
This commit is contained in:
Jerome Duval
2014-12-23 11:26:09 +01:00
parent abab702011 58775420ac
commit ab4897f578
2 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
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"
@@ -23,16 +33,12 @@ COPYRIGHT="1995 Patrick Powell <papowell@astart.com>
REQUIRES="
haiku$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libpopt$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix
devel:libpopt$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
@@ -53,17 +59,13 @@ 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
}
PATCHES="librsync-${portVersion}.patchset"
BUILD()
{
mkdir -p m4
autoreconf -fi
runConfigure ./configure \
--enable-shared
@@ -84,9 +86,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