diff --git a/net-libs/liboauth/liboauth-1.0.3.recipe b/net-libs/liboauth/liboauth-1.0.3~git.recipe similarity index 76% rename from net-libs/liboauth/liboauth-1.0.3.recipe rename to net-libs/liboauth/liboauth-1.0.3~git.recipe index 70f5fed6b..6782a7be6 100644 --- a/net-libs/liboauth/liboauth-1.0.3.recipe +++ b/net-libs/liboauth/liboauth-1.0.3~git.recipe @@ -4,13 +4,16 @@ liboauth provides functions to escape and encode stings according to \ OAuth specifications and offers high-level functionality built on top to sign \ requests or verify signatures using either NSS or OpenSSL for calculating \ the hash/signatures." -HOMEPAGE="http://liboauth.sourceforge.net" +HOMEPAGE="http://liboauth.sourceforge.net/ + https://github.com/x42/liboauth/" COPYRIGHT="2007-2014 Robin Gareus" LICENSE="GNU GPL v2 MIT" -REVISION="4" -SOURCE_URI="http://downloads.sourceforge.net/project/liboauth/liboauth-$portVersion.tar.gz" -CHECKSUM_SHA256="0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f" +REVISION="1" +srcGitRev="186fb14843c1bc98b70ece02c74b5696b3de9ce7" +SOURCE_URI="https://github.com/x42/liboauth/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="34bc990211c379712bf19952df8f800c4a6d411527c274e18f8c12f6fe4fe6a0" +SOURCE_DIR="liboauth-$srcGitRev" PATCHES="liboauth-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -34,6 +37,7 @@ PROVIDES_devel=" " REQUIRES_devel=" liboauth$secondaryArchSuffix == $portVersion base + devel:libssl$secondaryArchSuffix " BUILD_REQUIRES=" @@ -49,14 +53,14 @@ BUILD_PREREQUIRES=" cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:libtoolize + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix " BUILD() { - autoreconf -fi + autoreconf -vfi runConfigure ./configure make $jobArgs } @@ -67,7 +71,7 @@ INSTALL() rm $libDir/liboauth.la - prepareInstalledDevelLibs liboauth + prepareInstalledDevelLib liboauth fixPkgconfig # devel package @@ -75,3 +79,8 @@ INSTALL() $manDir/man3 \ $developDir } + +TEST() +{ + make check +} diff --git a/net-libs/liboauth/patches/liboauth-1.0.3.patchset b/net-libs/liboauth/patches/liboauth-1.0.3.patchset deleted file mode 100644 index b2a0adea2..000000000 --- a/net-libs/liboauth/patches/liboauth-1.0.3.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 0a1842365f336e558983b45986379029b10d5748 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sun, 24 May 2015 20:19:50 +0000 -Subject: Haiku patch - - -diff --git a/configure.ac b/configure.ac -index 828f730..0dbdd7f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,7 +25,7 @@ AC_CANONICAL_TARGET([]) - AC_COPYRIGHT([Copyright (C) Robin Gareus 2007-2012]) - AM_INIT_AUTOMAKE(liboauth,$VERSION) - --AM_CONFIG_HEADER(src/config.h) -+AC_CONFIG_HEADERS(src/config.h) - - AC_SUBST(VERSION) - AC_SUBST(VERSION_INFO) --- -1.8.3.4 - diff --git a/net-libs/liboauth/patches/liboauth-1.0.3~git.patchset b/net-libs/liboauth/patches/liboauth-1.0.3~git.patchset new file mode 100644 index 000000000..e9bdf121b --- /dev/null +++ b/net-libs/liboauth/patches/liboauth-1.0.3~git.patchset @@ -0,0 +1,50 @@ +From e023fe37df06948f70257c0312f938ffc3d289da Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 24 May 2015 20:19:50 +0000 +Subject: Haiku patch + + +diff --git a/configure.ac b/configure.ac +index 683c378..70f4009 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,7 +25,7 @@ AC_CANONICAL_TARGET([]) + AC_COPYRIGHT([Copyright (C) Robin Gareus 2007-2012]) + AM_INIT_AUTOMAKE + +-AM_CONFIG_HEADER(src/config.h) ++AC_CONFIG_HEADER(src/config.h) + + AC_SUBST(VERSION) + AC_SUBST(VERSION_INFO) +-- +2.28.0 + + +From 6329e7cc1fed3c30dad050ec2c8e3b03907d4aa6 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 1 Nov 2020 19:27:01 +0000 +Subject: Fix build for gcc2 + + +diff --git a/tests/selftest_other.c b/tests/selftest_other.c +index 5879d72..ed293d7 100644 +--- a/tests/selftest_other.c ++++ b/tests/selftest_other.c +@@ -62,6 +62,7 @@ int main (int argc, char **argv) { + + if (loglevel) printf("\n *** Testing body hash calculation.\n"); + ++ { + char *bh; + const char *teststring="Hello World!"; + bh=oauth_body_hash_data(strlen(teststring), teststring); +@@ -91,4 +92,5 @@ int main (int argc, char **argv) { + } + + return (fail?1:0); ++ } + } +-- +2.28.0 +