jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lua: fix build and update to lua5.3 

Fixes #8360
cute-signatures
Timo Teräs 2019-12-30 16:15:44 +02:00
parent 90fc52e2b8
commit 0b82bcc53e
4 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -6,7 +6,7 @@ test:alpine:
stage: test stage: test
script: script:
- apk update - apk update
- apk add make gcc git musl-dev openssl-dev linux-headers zlib-dev lua5.2-dev - apk add make gcc git musl-dev openssl-dev linux-headers zlib-dev lua5.3-dev
- make -j$(nproc) check - make -j$(nproc) check
tags: tags:
- docker-alpine - docker-alpine
@ -16,7 +16,7 @@ test:debian:
stage: test stage: test
script: script:
- apt-get update - apt-get update
- apt-get install -y make gcc git libssl-dev zlib1g-dev lua5.2-dev sudo - apt-get install -y make gcc git libssl-dev zlib1g-dev lua5.3-dev sudo
- unlink /bin/sh - unlink /bin/sh
- ln -s /bin/bash /bin/sh - ln -s /bin/bash /bin/sh
- make -j$(nproc) check - make -j$(nproc) check

2
.travis.yml
View File

@ -15,7 +15,7 @@ before_install:
- alpine() { /alpine/enter-chroot -u "$USER" "$@"; } - alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
install: install:
- sudo sh alpine-chroot-install -a "$ARCH" -b v3.10 - sudo sh alpine-chroot-install -a "$ARCH" -b v3.10
-p 'build-base alpine-sdk linux-headers lua5.2-dev openssl openssl-dev zlib-dev' -p 'build-base alpine-sdk linux-headers lua5.3-dev openssl openssl-dev zlib-dev'
before_script: before_script:
- /alpine/enter-chroot sh -c "addgroup $USER wheel && addgroup $USER abuild" - /alpine/enter-chroot sh -c "addgroup $USER wheel && addgroup $USER abuild"
- alpine abuild-keygen -ain - alpine abuild-keygen -ain

2
src/Makefile
View File

@ -9,7 +9,7 @@ ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
# lua module # lua module
ifneq ($(LUAAPK),) ifneq ($(LUAAPK),)
LUA_VERSION ?= 5.2 LUA_VERSION ?= 5.3
LUA_PC ?= lua$(LUA_VERSION) LUA_PC ?= lua$(LUA_VERSION)
LUA_LIBDIR ?= /usr/lib/lua/$(LUA_VERSION) LUA_LIBDIR ?= /usr/lib/lua/$(LUA_VERSION)
LIBAPK := YesPlease LIBAPK := YesPlease

35
src/lua-apk.c
View File

@ -17,24 +17,24 @@
#endif #endif
struct flagmap { struct flagmap {
const char *name; const char *name;
int flag; int flag;
}; };
struct flagmap opendb_flagmap[] = { struct flagmap opendb_flagmap[] = {
{"read", APK_OPENF_READ}, {"read", APK_OPENF_READ},
{"write", APK_OPENF_WRITE}, {"write", APK_OPENF_WRITE},
{"create", APK_OPENF_CREATE}, {"create", APK_OPENF_CREATE},
{"no_installed", APK_OPENF_NO_INSTALLED}, {"no_installed", APK_OPENF_NO_INSTALLED},
{"no_scripts", APK_OPENF_NO_SCRIPTS}, {"no_scripts", APK_OPENF_NO_SCRIPTS},
{"no_world", APK_OPENF_NO_WORLD}, {"no_world", APK_OPENF_NO_WORLD},
{"no_sys_repos", APK_OPENF_NO_SYS_REPOS}, {"no_sys_repos", APK_OPENF_NO_SYS_REPOS},
{"no_installed_repo", APK_OPENF_NO_INSTALLED_REPO}, {"no_installed_repo", APK_OPENF_NO_INSTALLED_REPO},
{"no_repos", APK_OPENF_NO_REPOS}, {"no_repos", APK_OPENF_NO_REPOS},
{"no_state", APK_OPENF_NO_STATE}, {"no_state", APK_OPENF_NO_STATE},
{"no_scripts", APK_OPENF_NO_SCRIPTS}, {"no_scripts", APK_OPENF_NO_SCRIPTS},
{"no_world", APK_OPENF_NO_WORLD}, {"no_world", APK_OPENF_NO_WORLD},
{NULL, 0} {NULL, 0}
}; };
/* implemented as luaL_typerror until lua 5.1, dropped in 5.2 /* implemented as luaL_typerror until lua 5.1, dropped in 5.2
@ -46,6 +46,11 @@ static int typerror (lua_State *L, int narg, const char *tname) {
return luaL_argerror(L, narg, msg); return luaL_argerror(L, narg, msg);
} }
time_t apk_time(void)
{
return time(NULL);
}
static apk_blob_t check_blob(lua_State *L, int index) static apk_blob_t check_blob(lua_State *L, int index)
{ {
apk_blob_t blob; apk_blob_t blob;