Commit 4781106d authored by Enrico Tassi's avatar Enrico Tassi

New upstream release

parent ac7a583f
lua-posix (31-1) unstable; urgency=medium
* New upstream release
* Fix compilation with lua-doc >= 1.4 (Closes: #742869), thanks Colin Watson
* Use autoreconf (Closes: #742870), thanks Colin Watson
* Drop patch 0002-Fix-compilation-on-kfreebsd.patch (sort of applied
upstream)
-- Enrico Tassi <gareuselesinge@debian.org> Mon, 07 Apr 2014 09:45:48 +0200
lua-posix (29-7) unstable; urgency=medium
* Build-depend on lua-discount (Closes: #735976)
......
......@@ -2,7 +2,7 @@ Source: lua-posix
Section: interpreters
Priority: optional
Maintainer: Enrico Tassi <gareuselesinge@debian.org>
Build-Depends: debhelper (>= 8.1.3), dh-lua (>= 8), libncursesw5-dev, lua-bitop, lua-ldoc, lua-discount
Build-Depends: debhelper (>= 8.1.3), dh-autoreconf, dh-lua (>= 8), libncursesw5-dev, lua-bitop, lua-ldoc, lua-discount
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-lua/lua-posix.git
Vcs-Browser: http://git.debian.org/?p=pkg-lua/lua-posix.git
......
......@@ -2,14 +2,15 @@
PKG_NAME=curses
### things relative to the C library part
CLIB_CFLAGS= -I. -DHAVE_CONFIG_H $(shell pkg-config ncursesw --cflags) -I /usr/include/ncursesw/
CLIB_CFLAGS= -I. -DHAVE_CONFIG_H $(shell pkg-config ncursesw --cflags) -I /usr/include/ncursesw/ -I ext/include/
CLIB_LDFLAGS=$(shell pkg-config ncursesw --libs)
CLIB_OBJS= lcurses.lo
CLIB_OBJS= ext/curses/curses.lo
VERSION_INFO=0:0:0
### things relative to the lua library part
LUA_HEADER=
LUA_SOURCES=curses.lua
LUA_SOURCES=lib/curses.lua
LUA_SOURCES_MANGLER=sed -e 's?^lib/??'
LUA_MODNAME=curses
LUA_MODNAME_CPART=curses_c
......
......@@ -2,14 +2,15 @@
PKG_NAME=posix
### things relative to the C library part
CLIB_CFLAGS=-D_XOPEN_SOURCE=700 -I. -DHAVE_CONFIG_H
CLIB_CFLAGS=-D_XOPEN_SOURCE=700 -I. -DHAVE_CONFIG_H -I ext/include/
CLIB_LDFLAGS=-lcrypt -lrt
CLIB_OBJS= lposix.lo
CLIB_OBJS= ext/posix/posix.lo
VERSION_INFO=1:0:0
### things relative to the lua library part
LUA_HEADER=
LUA_SOURCES=posix.lua
LUA_SOURCES=lib/posix.lua
LUA_SOURCES_MANGLER=sed -e 's?^lib/??'
LUA_MODNAME=posix
LUA_MODNAME_CPART=posix_c
......
......@@ -4,13 +4,13 @@ Subject: Fix build on hurd-i386
See http://www.debian.org/ports/hurd/
---
lposix.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
ext/posix/posix.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/lposix.c b/lposix.c
index 5f3de33..fa4c0b9 100644
--- a/lposix.c
+++ b/lposix.c
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index d07648c..a4b1268 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -11,6 +11,9 @@
* With contributions by Roberto Ierusalimschy.
* With documentation from Steve Donovan 2012
......@@ -21,51 +21,12 @@ index 5f3de33..fa4c0b9 100644
#include <config.h>
@@ -673,7 +676,19 @@ Current working directory for this process.
*/
static int Pgetcwd(lua_State *L)
{
+#ifdef __GNU__
+ char *b = get_current_dir_name();
+ if (b != NULL) {
+ lua_pushstring(L, b);
+ return 1;
+ } else {
+ // we return the same error as below
+ return pusherror(L, ".");
+ }
+#else
@@ -692,6 +695,8 @@ static int Pgetcwd(lua_State *L)
}
#else
long size = pathconf(".", _PC_PATH_MAX);
+ if (size == -1)
+ return pusherror(L, "pathconf");
void *ud;
lua_Alloc lalloc = lua_getallocf(L, &ud);
char *b, *ret;
@@ -686,6 +701,7 @@ static int Pgetcwd(lua_State *L)
lua_pushstring(L, b);
lalloc(ud, b, (size_t)size + 1, 0);
return (ret == NULL) ? pusherror(L, ".") : 1;
+#endif
}
/***
@@ -3991,7 +4007,9 @@ LUALIB_API int luaopen_posix_c (lua_State *L)
#define MENTRY(_e) set_integer_const(LPOSIX_STR_1(LPOSIX_SPLICE(_SA, _e)), LPOSIX_SPLICE(SA, _e))
MENTRY( _NOCLDSTOP );
#if _POSIX_VERSION >= 20112L
+#ifndef __GNU__
MENTRY( _NOCLDWAIT );
+#endif
MENTRY( _RESETHAND );
MENTRY( _NODEFER );
#endif
@@ -4133,7 +4151,9 @@ LUALIB_API int luaopen_posix_c (lua_State *L)
MENTRY( OCRNL );
MENTRY( ONLRET );
MENTRY( OFILL );
+#ifndef __GNU__
MENTRY( OFDEL );
+#endif
MENTRY( NLDLY );
MENTRY( NL0 );
MENTRY( NL1 );
From: Enrico Tassi <gareuselesinge@debian.org>
Date: Sun, 30 Jun 2013 11:59:27 +0200
Subject: Fix compilation on kfreebsd
Freebsd kernel on GNU userland:
http://www.debian.org/ports/kfreebsd-gnu/
---
lposix.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/lposix.c b/lposix.c
index fa4c0b9..083db4e 100644
--- a/lposix.c
+++ b/lposix.c
@@ -4150,6 +4150,7 @@ LUALIB_API int luaopen_posix_c (lua_State *L)
MENTRY( ONLCR );
MENTRY( OCRNL );
MENTRY( ONLRET );
+#ifndef __FreeBSD_kernel__
MENTRY( OFILL );
#ifndef __GNU__
MENTRY( OFDEL );
@@ -4162,11 +4163,15 @@ LUALIB_API int luaopen_posix_c (lua_State *L)
MENTRY( CR1 );
MENTRY( CR2 );
MENTRY( CR3 );
+#endif
MENTRY( TABDLY );
MENTRY( TAB0 );
+#ifndef __FreeBSD_kernel__
MENTRY( TAB1 );
MENTRY( TAB2 );
+#endif
MENTRY( TAB3 );
+#ifndef __FreeBSD_kernel__
MENTRY( BSDLY );
MENTRY( BS0 );
MENTRY( BS1 );
@@ -4176,6 +4181,7 @@ LUALIB_API int luaopen_posix_c (lua_State *L)
MENTRY( FFDLY );
MENTRY( FF0 );
MENTRY( FF1 );
+#endif
/* cc */
MENTRY( VINTR );
From: "Gary V. Vaughan" <gary@gnu.org>
Date: Thu, 12 Dec 2013 09:15:12 +1300
Subject: doc: fix LDoc manual page custom_see_handler pattern.
* ext/posix/config.ld (custom_see_handler): Add a missing closing
`%)`.
(upat): Pull the format string up per LDoc documentation.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---
ext/posix/config.ld | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ext/posix/config.ld b/ext/posix/config.ld
index c8994ac..2ca615f 100644
--- a/ext/posix/config.ld
+++ b/ext/posix/config.ld
@@ -7,9 +7,10 @@ tparam_alias 'string'
tparam_alias 'int'
tparam_alias 'bool'
-custom_see_handler('^([%w_]+)%((%d)$',function(name,section)
- local url = ("http://www.kernel.org/doc/man-pages/online/pages/man%s/%s.%s.html"):format(section,name,section)
- local name = name .. '(' ..section..')'
+local upat = "http://www.kernel.org/doc/man-pages/online/pages/man%s/%s.%s.html"
+custom_see_handler('^([%w_]+)%((%d)%)$',function(name,section)
+ local url = upat:format(section,name,section)
+ local name = name .. '(' .. section .. ')'
return name, url
end)
From: Enrico Tassi <gareuselesinge@debian.org>
Date: Mon, 7 Apr 2014 10:09:07 +0200
Subject: doc: add missing LDoc function tag.
---
ext/posix/posix.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index a4b1268..0be5385 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -2954,6 +2954,7 @@ static int Pstrftime(lua_State *L)
/***
Parse a date string.
+@function strptime
@see strptime(3)
@string s
@string format same as for `strftime`
0001-Fix-build-on-hurd-i386.patch
0002-Fix-compilation-on-kfreebsd.patch
0002-doc-fix-LDoc-manual-page-custom_see_handler-pattern.patch
0003-doc-add-missing-LDoc-function-tag.patch
#!/usr/bin/make -f
%:
dh $@ --buildsystem=lua --with lua
dh $@ --buildsystem=lua --with autoreconf,lua
override_dh_auto_configure:
./configure --prefix=/usr/ \
......@@ -11,12 +11,15 @@ override_dh_auto_configure:
override_dh_auto_build:
dh_auto_build
ldoc .
ldoc ext/posix/
perl build-aux/make_lcurses_doc.pl
mv doc/curses_c.html .
mv doc/curses.html .
override_dh_auto_test:
touch dummy.la
dh_auto_test
override_dh_auto_clean:
rm -f dummy.la
rm -f dummy.la curses.html curses_c.html
dh_auto_clean
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment