diff --git a/l/scute/scute-1.4.0-no-readcert.diff b/l/scute/scute-1.4.0-no-readcert.diff deleted file mode 100644 index 6757209d..00000000 --- a/l/scute/scute-1.4.0-no-readcert.diff +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur scute-38bdba0.orig/src/gpgsm.c scute-38bdba0/src/gpgsm.c ---- scute-38bdba0.orig/src/gpgsm.c 2010-04-21 04:57:53.000000000 +0200 -+++ scute-38bdba0/src/gpgsm.c 2014-08-22 22:31:17.197783508 +0200 -@@ -122,30 +122,6 @@ - search.hook = hook; - search.with_chain = false; - -- /* If the key is from the card, we might get the certificate from -- the card as well. */ -- if (no >= 0) -- { -- struct cert cert; -- -- memset (&cert, '\0', sizeof (cert)); -- err = scute_agent_get_cert (no, &cert); -- if (! err) -- { --#if 0 -- /* For now, we don't need no stinking chain. */ -- -- /* As we only have the DER certificate from the card, we need to -- parse that and fill out the missing info and try to get the -- certificate chain from gpgsm. */ -- err = scute_cert_from_der (&cert); --#endif -- if (! err) -- err = search_cb (&search, &cert); -- return err; -- } -- } -- - search.with_chain = true; - err = scute_gpgsm_search_certs_by_grip (grip, search_cb, &search); - return err; diff --git a/l/scute/scute.SlackBuild b/l/scute/scute.SlackBuild index 61184cad..a184934f 100755 --- a/l/scute/scute.SlackBuild +++ b/l/scute/scute.SlackBuild @@ -33,7 +33,7 @@ WGET=${WGET:-http://git.gnupg.org/cgi-bin/gitweb.cgi?p=scute.git;a=snapshot;h=$C # Build infos NAMEPKG=${NAMEPKG:-scute} -BUILD=${BUILD:-2GGD} +BUILD=${BUILD:-1GGD} ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')} JOBS=${JOBS:-1} EXT=${EXT:-txz} @@ -84,7 +84,6 @@ cd $TMP echo "Building $ARCHIVE..." tar xf $CWD/$ARCHIVE cd $NAME -patch -p 1 < $CWD/scute-1.4.0-no-readcert.diff ./autogen.sh CFLAGS=$CPUOPT \ CXXFLAGS=$CPUOPT \