diff options
Diffstat (limited to 'taler-exchange')
-rw-r--r-- | taler-exchange/patch/1-remove-header.patch | 45 | ||||
-rw-r--r-- | taler-exchange/patch/2-remove-double-constant.patch | 42 | ||||
-rw-r--r-- | taler-exchange/taler-exchange.SlackBuild | 25 | ||||
-rw-r--r-- | taler-exchange/taler-exchange.info | 6 |
4 files changed, 105 insertions, 13 deletions
diff --git a/taler-exchange/patch/1-remove-header.patch b/taler-exchange/patch/1-remove-header.patch new file mode 100644 index 0000000..20e8f30 --- /dev/null +++ b/taler-exchange/patch/1-remove-header.patch @@ -0,0 +1,45 @@ +Only in b/src/exchange: sedjui6lB +diff -ru a/src/exchange/taler-exchange-httpd_kyc-wallet.c b/src/exchange/taler-exchange-httpd_kyc-wallet.c +--- a/src/exchange/taler-exchange-httpd_kyc-wallet.c 2024-08-19 03:08:33.447317541 -0500 ++++ b/src/exchange/taler-exchange-httpd_kyc-wallet.c 2024-10-01 14:36:38.206822705 -0500 +@@ -30,7 +30,6 @@ + #include "taler-exchange-httpd_common_kyc.h" + #include "taler-exchange-httpd_kyc-wallet.h" + #include "taler-exchange-httpd_responses.h" +-#include "taler-exchange-httpd_withdraw.h" + + + /** +diff -ru a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c +--- a/src/exchange/taler-exchange-httpd_purses_merge.c 2024-08-19 03:08:33.447317541 -0500 ++++ b/src/exchange/taler-exchange-httpd_purses_merge.c 2024-10-01 14:36:38.213822705 -0500 +@@ -33,7 +33,6 @@ + #include "taler-exchange-httpd_common_kyc.h" + #include "taler-exchange-httpd_purses_merge.h" + #include "taler-exchange-httpd_responses.h" +-#include "taler-exchange-httpd_withdraw.h" + #include "taler_exchangedb_lib.h" + #include "taler-exchange-httpd_keys.h" + +diff -ru a/src/exchange/taler-exchange-httpd_reserves_close.c b/src/exchange/taler-exchange-httpd_reserves_close.c +--- a/src/exchange/taler-exchange-httpd_reserves_close.c 2024-08-19 03:08:33.448317541 -0500 ++++ b/src/exchange/taler-exchange-httpd_reserves_close.c 2024-10-01 14:36:38.215822705 -0500 +@@ -30,7 +30,6 @@ + #include "taler-exchange-httpd_common_kyc.h" + #include "taler-exchange-httpd_keys.h" + #include "taler-exchange-httpd_reserves_close.h" +-#include "taler-exchange-httpd_withdraw.h" + #include "taler-exchange-httpd_responses.h" + + +diff -ru a/src/exchange/taler-exchange-httpd_reserves_purse.c b/src/exchange/taler-exchange-httpd_reserves_purse.c +--- a/src/exchange/taler-exchange-httpd_reserves_purse.c 2024-08-26 12:13:30.709771927 -0500 ++++ b/src/exchange/taler-exchange-httpd_reserves_purse.c 2024-10-01 14:36:38.217822705 -0500 +@@ -32,7 +32,6 @@ + #include "taler-exchange-httpd_common_kyc.h" + #include "taler-exchange-httpd_reserves_purse.h" + #include "taler-exchange-httpd_responses.h" +-#include "taler-exchange-httpd_withdraw.h" + #include "taler_exchangedb_lib.h" + #include "taler-exchange-httpd_keys.h" + diff --git a/taler-exchange/patch/2-remove-double-constant.patch b/taler-exchange/patch/2-remove-double-constant.patch new file mode 100644 index 0000000..2ed21fd --- /dev/null +++ b/taler-exchange/patch/2-remove-double-constant.patch @@ -0,0 +1,42 @@ +diff -ru a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c +--- a/src/benchmark/taler-exchange-benchmark.c 2024-10-01 14:48:00.588810485 -0500 ++++ b/src/benchmark/taler-exchange-benchmark.c 2024-10-01 14:49:16.372809128 -0500 +@@ -296,7 +296,7 @@ + GNUNET_TIME_UNIT_ZERO, + amount_1, + MHD_HTTP_OK)); +- if (eval_probability (refresh_rate / 100.0d)) ++ if (eval_probability (refresh_rate / 100.0)) + { + char *melt_label; + char *reveal_label; +@@ -630,7 +630,7 @@ + " * Reserve=%u * Parallel=%u, operations in %s\n", + howmany_coins, + howmany_coins, +- howmany_coins * (refresh_rate / 100.0d), ++ howmany_coins * (refresh_rate / 100.0), + howmany_reserves, + howmany_clients, + GNUNET_STRINGS_relative_time_to_string ( +diff -ru a/src/lib/exchange_api_stefan.c b/src/lib/exchange_api_stefan.c +--- a/src/lib/exchange_api_stefan.c 2024-10-01 14:48:00.564810485 -0500 ++++ b/src/lib/exchange_api_stefan.c 2024-10-01 14:49:16.396809127 -0500 +@@ -125,7 +125,7 @@ + min = get_unit (keys); + if (NULL == min) + return GNUNET_SYSERR; +- if (1.0d <= keys->stefan_lin) ++ if (1.0 <= keys->stefan_lin) + { + /* This cannot work, linear STEFAN fee estimate always + exceed any gross amount. */ +@@ -273,7 +273,7 @@ + min = get_unit (keys); + if (NULL == min) + return GNUNET_SYSERR; +- if (1.0d <= keys->stefan_lin) ++ if (1.0 <= keys->stefan_lin) + { + /* This cannot work, linear STEFAN fee estimate always + exceed any gross amount. */ diff --git a/taler-exchange/taler-exchange.SlackBuild b/taler-exchange/taler-exchange.SlackBuild index 2c262a2..ac8b215 100644 --- a/taler-exchange/taler-exchange.SlackBuild +++ b/taler-exchange/taler-exchange.SlackBuild @@ -3,7 +3,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=taler-exchange -VERSION=${VERSION:-0.11.2} +VERSION=${VERSION:-0.13.0} BUILD=${BUILD:-1} TAG=${TAG:-_slackcoder} PKGTYPE=${PKGTYPE:-txz} @@ -44,9 +44,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-0.11.2 -tar xvf $CWD/$PRGNAM-0.11.2.tar.gz -cd $PRGNAM-0.11.2 +rm -rf $PRGNAM-0.13.0 +tar xvf $CWD/$PRGNAM-0.13.0.tar.gz +cd $PRGNAM-0.13.0 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -54,13 +54,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +for p in $CWD/patch/*.patch; do + echo "applying patch $p" + patch -p1 <"$p" +done + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-0.11.2 \ + --docdir=/usr/doc/$PRGNAM-0.13.0 \ --disable-static \ --build=$ARCH-slackware-linux make @@ -69,9 +74,9 @@ make DESTDIR="$PKG" install find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-0.11.2 -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-0.11.2/$PRGNAM.SlackBuild -cat $CWD/README > $PKG/usr/doc/$PRGNAM-0.11.2/README_slackware.txt +mkdir -p $PKG/usr/doc/$PRGNAM-0.13.0 +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-0.13.0/$PRGNAM.SlackBuild +cat $CWD/README > $PKG/usr/doc/$PRGNAM-0.13.0/README_slackware.txt cp -a \ AUTHORS \ COPYING \ @@ -80,7 +85,7 @@ cp -a \ NEWS \ README \ README.1st \ - $PKG/usr/doc/$PRGNAM-0.11.2 + $PKG/usr/doc/$PRGNAM-0.13.0 mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc @@ -98,4 +103,4 @@ chmod g+w $PKG/var/log/taler chmod -R u=rwX,g=rX,o= $PKG/etc/taler/secrets/* cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-0.11.2-$ARCH-$BUILD$TAG.$PKGTYPE +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-0.13.0-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/taler-exchange/taler-exchange.info b/taler-exchange/taler-exchange.info index 16d1a82..2602dee 100644 --- a/taler-exchange/taler-exchange.info +++ b/taler-exchange/taler-exchange.info @@ -1,8 +1,8 @@ PRGNAM="taler-exchange" -VERSION="0.11.2" +VERSION="0.13.0" HOMEPAGE="https://taler.net" -DOWNLOAD="https://ftpmirror.gnu.org/gnu/taler/taler-exchange-0.11.2.tar.gz" -MD5SUM="d163c6f07ee23d8ae974262ebadf802e" +DOWNLOAD="https://ftpmirror.gnu.org/gnu/taler/taler-exchange-0.13.0.tar.gz" +MD5SUM="67889315a20300af3f9220d69e16106a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gnunet jq postgresql" |