Browse Source

xap/cardpeek: Upgraded to cardpeek-0.8.4.

slackware-14.2
Damien Goutte-Gattat 5 years ago
parent
commit
1a3b1ca843
  1. 1
      xap/cardpeek/cardpeek-0.8.2.tar.gz.sha1
  2. 99
      xap/cardpeek/cardpeek-0.8.4-lua-checkinteger.patch
  3. 1
      xap/cardpeek/cardpeek-0.8.4.tar.gz.sha1
  4. 18
      xap/cardpeek/cardpeek.SlackBuild

1
xap/cardpeek/cardpeek-0.8.2.tar.gz.sha1

@ -1 +0,0 @@
7bd532684891b525ae7b98d2ca91d2bb26cd03bf cardpeek-0.8.2.tar.gz

99
xap/cardpeek/cardpeek-0.8.4-lua-checkinteger.patch

@ -0,0 +1,99 @@
diff -Naur cardpeek-0.8.4.orig/lua_bytes.c cardpeek-0.8.4/lua_bytes.c
--- cardpeek-0.8.4.orig/lua_bytes.c 2015-03-08 22:33:10.000000000 +0100
+++ cardpeek-0.8.4/lua_bytes.c 2016-07-26 14:56:47.221522330 +0200
@@ -116,7 +116,7 @@
static int subr_bytes_new(lua_State *L)
{
- int width = luaL_checkint(L, 1);
+ int width = luaL_checkinteger(L, 1);
int n = lua_gettop(L);
bytestring_t *bs;
@@ -259,7 +259,7 @@
b_index = 0;
else
{
- b_index=luaL_checkint(L,2);
+ b_index=luaL_checkinteger(L,2);
if (b_index<0) b_index = 0;
}
@@ -267,7 +267,7 @@
e_index = b_index;
else
{
- e_index=luaL_checkint(L,2);
+ e_index=luaL_checkinteger(L,2);
if (e_index>=(int)bytestring_get_size(bs)) e_index = bytestring_get_size(bs)-1;
}
@@ -293,13 +293,13 @@
unsigned i;
unsigned char c;
- b_index=(unsigned)luaL_checkint(L,2);
+ b_index=(unsigned)luaL_checkinteger(L,2);
e_index = b_index + lua_gettop(L)-3;
for (i=b_index;i<=e_index;i++)
{
- c = (unsigned char)luaL_checkint(L,i-b_index+3);
+ c = (unsigned char)luaL_checkinteger(L,i-b_index+3);
if (i<bytestring_get_size(bs))
{
bytestring_set_element(bs,i,c);
@@ -324,8 +324,8 @@
static int subr_bytes_pad_left(lua_State *L)
{
bytestring_t *bs = bytestring_duplicate(luaL_check_bytestring(L, 1));
- unsigned pad_length = luaL_checkint(L,2);
- unsigned pad_value = luaL_checkint(L,3);
+ unsigned pad_length = luaL_checkinteger(L,2);
+ unsigned pad_value = luaL_checkinteger(L,3);
if (bytestring_pad_left(bs,pad_length,pad_value)!=BYTESTRING_OK)
{
bytestring_free(bs);
@@ -340,8 +340,8 @@
static int subr_bytes_pad_right(lua_State *L)
{
bytestring_t *bs = bytestring_duplicate(luaL_check_bytestring(L, 1));
- unsigned pad_length = luaL_checkint(L,2);
- unsigned pad_value = luaL_checkint(L,3);
+ unsigned pad_length = luaL_checkinteger(L,2);
+ unsigned pad_value = luaL_checkinteger(L,3);
if (bytestring_pad_right(bs,pad_length,pad_value)!=BYTESTRING_OK)
{
bytestring_free(bs);
@@ -376,12 +376,12 @@
static int subr_bytes_sub(lua_State *L)
{
bytestring_t *bs = luaL_check_bytestring(L, 1);
- int start=luaL_checkint(L,2);
+ int start=luaL_checkinteger(L,2);
int end=-1;
bytestring_t *ret;
if (lua_gettop(L)>2)
- end=luaL_checkint(L,3);
+ end=luaL_checkinteger(L,3);
if (start<0)
start=bytestring_get_size(bs)+start;
if (end<0)
@@ -431,13 +431,13 @@
"\tchange bytes.convert(A,B) to bytes.convert(B,A)\n"
"\tThis warning will only appear once.");
}
- width=luaL_checkint(L,1);
+ width=luaL_checkinteger(L,1);
bs = luaL_check_bytestring(L, 2);
}
else
{
bs = luaL_check_bytestring(L, 1);
- width=luaL_checkint(L,2);
+ width=luaL_checkinteger(L,2);
}
if (width!=8 && width!=4 && width!=1)

1
xap/cardpeek/cardpeek-0.8.4.tar.gz.sha1

@ -0,0 +1 @@
b5616185c3675072486b00dbbf345c9a7818eb14 cardpeek-0.8.4.tar.gz

18
xap/cardpeek/cardpeek.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2013,2014 Damien Goutte-Gattat
# Copyright (C) 2013,2014,2016 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -23,15 +23,15 @@
# Contact: Damien Goutte-Gattat <dgouttegattat@incenp.org>
#
# Latest cardpeek sourcecode is available at:
# <http://pannetrat.com/Cardpeek/>.
# <https://github.com/L1L1/cardpeek>.
#
# Depends: d/lua, l/pcsc-lite
# Source package infos
NAMESRC=${NAMESRC:-cardpeek}
VERSION=${VERSION:-0.8.2}
VERSION=${VERSION:-0.8.4}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
WGET=${WGET:-http://downloads.pannetrat.com/install/$ARCHIVE}
WGET=${WGET:-https://github.com/L1L1/cardpeek/archive/$ARCHIVE}
# Build infos
NAMEPKG=${NAMEPKG:-cardpeek}
@ -86,13 +86,16 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# Patch for Lua-5.3
patch -p 1 < $CWD/cardpeek-0.8.4-lua-checkinteger.patch
autoreconf -i
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
LDFLAGS="-L/lib$LIBDIRSUFFIX -ldl" \
./configure \
--prefix=/usr \
--mandir=/usr/man \
--docdir=/usr/doc/$NAME
sed -i "s,^LDFLAGS = ,LDFLAGS = -L/lib$LIBDIRSUFFIX -ldl," Makefile
--docdir=/usr/doc/$NAMEPKG-$VERSION
make -j $JOBS
make install-strip DESTDIR=$PKG
@ -100,8 +103,7 @@ make install-strip DESTDIR=$PKG
find $PKG/usr/man -type f -exec gzip -9 {} \;
# Install the documentation
mkdir -p $PKG/usr/doc/$NAME
install -m 644 AUTHORS COPYING ChangeLog README $PKG/usr/doc/$NAME
install -m 644 AUTHORS COPYING ChangeLog README $PKG/usr/doc/$NAMEPKG-$VERSION
# Copy slack-desc and doinst.sh files
install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc

Loading…
Cancel
Save