Browse Source

lualdap: Updated (1.0.1 -> 1.1.0)

user/karasz/firmware
Christian Wiese 13 years ago committed by Christian Wiese
parent
commit
455455f76f
  1. 32
      lua/lualdap/config-no-compat-5.1.patch
  2. 39
      lua/lualdap/lualdap-5.1-compat.patch
  3. 83
      lua/lualdap/lualdap-5.1.1-compat.patch
  4. 4
      lua/lualdap/lualdap.conf
  5. 6
      lua/lualdap/lualdap.desc

32
lua/lualdap/config-no-compat-5.1.patch

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lualdap/config-no-compat-5.1.patch
# Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2006 - 2012 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -14,27 +14,8 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.orig 2006-10-09 14:22:17.000000000 +0200
+++ ./Makefile 2006-10-09 14:22:40.000000000 +0200
@@ -6,15 +6,12 @@
include $(CONFIG)
-OBJS= src/lualdap.o $(COMPAT_DIR)/compat-5.1.o
+OBJS= src/lualdap.o
src/$(LIBNAME): $(OBJS)
export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) $(OPENLDAP_LIB)
-$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
-
install: src/$(LIBNAME)
mkdir -p $(LUA_LIBDIR)
cp src/$(LIBNAME) $(LUA_LIBDIR)
--- ./config.orig 2006-10-09 14:29:38.000000000 +0200
+++ ./config 2006-10-09 14:29:06.000000000 +0200
--- ./config.orig 2007-12-14 18:06:58.000000000 +0100
+++ ./config 2012-05-24 10:31:06.564841080 +0200
@@ -1,8 +1,8 @@
# Installation directories
# System's libraries directory (where binary libraries are installed)
@ -42,13 +23,16 @@
+LUA_LIBDIR= $(shell pkg-config --variable INSTALL_CMOD lua)
# Lua includes directory
-LUA_INC= /usr/local/include
+LUA_INC= $(shell pkg-config --variable INSTALL_LMOD lua)
+LUA_INC= $(shell pkg-config --variable includedir lua)
# OpenLDAP includes directory
OPENLDAP_INC= /usr/local/include
# OpenLDAP library (an optional directory can be specified with -L<dir>)
@@ -13,11 +13,10 @@
@@ -13,13 +13,12 @@
#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
# Lua version number (first and second digits of target version)
-LUA_VERSION_NUM= 500
+LUA_VERSION_NUM= $(shell pkg-config --variable=V lua | tr '.' '0')
LIBNAME= $T.so.$V
-COMPAT_DIR= ../compat/src

39
lua/lualdap/lualdap-5.1-compat.patch

@ -1,39 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lualdap/lualdap-5.1-compat.patch
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- lualdap/src/lualdap.c 2006/04/04 20:11:51 1.44
+++ lualdap/src/lualdap.c 2006/07/24 01:36:51 1.45
@@ -1,7 +1,7 @@
/*
** LuaLDAP
** See Copyright Notice in license.html
-** $Id: lualdap.c,v 1.44 2006/04/04 20:11:51 carregal Exp $
+** $Id: lualdap.c,v 1.45 2006/07/24 01:36:51 tomas Exp $
*/
#include <stdlib.h>
@@ -16,8 +16,9 @@
#include "lua.h"
#include "lauxlib.h"
+#if ! defined (LUA_VERSION_NUM) || LUA_VERSION_NUM < 501
#include "compat-5.1.h"
-
+#endif
#define LUALDAP_PREFIX "LuaLDAP: "
#define LUALDAP_TABLENAME "lualdap"

83
lua/lualdap/lualdap-5.1.1-compat.patch

@ -1,83 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lualdap/lualdap-5.1.1-compat.patch
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Description: Updating to run also on Lua 5.1.1
Origin: see upstream cvs (Revision 1.46)
--- lualdap/src/lualdap.c 2006/07/24 01:36:51 1.45
+++ lualdap/src/lualdap.c 2007/02/07 15:05:48 1.46
@@ -463,7 +463,7 @@ static int lualdap_close (lua_State *L)
*/
static int lualdap_add (lua_State *L) {
conn_data *conn = getconnection (L);
- const char *dn = luaL_check_string (L, 2);
+ const char *dn = luaL_checkstring (L, 2);
attrs_data attrs;
int rc, msgid;
A_init (&attrs);
@@ -485,11 +485,11 @@ static int lualdap_add (lua_State *L) {
*/
static int lualdap_compare (lua_State *L) {
conn_data *conn = getconnection (L);
- const char *dn = luaL_check_string (L, 2);
- const char *attr = luaL_check_string (L, 3);
+ const char *dn = luaL_checkstring (L, 2);
+ const char *attr = luaL_checkstring (L, 3);
BerValue bvalue;
int rc, msgid;
- bvalue.bv_val = (char *)luaL_check_string (L, 4);
+ bvalue.bv_val = (char *)luaL_checkstring (L, 4);
bvalue.bv_len = lua_strlen (L, 4);
rc = ldap_compare_ext (conn->ld, dn, attr, &bvalue, NULL, NULL, &msgid);
return create_future (L, rc, 1, msgid, LDAP_RES_COMPARE);
@@ -504,7 +504,7 @@ static int lualdap_compare (lua_State *L
*/
static int lualdap_delete (lua_State *L) {
conn_data *conn = getconnection (L);
- const char *dn = luaL_check_string (L, 2);
+ const char *dn = luaL_checkstring (L, 2);
int rc, msgid;
rc = ldap_delete_ext (conn->ld, dn, NULL, NULL, &msgid);
return create_future (L, rc, 1, msgid, LDAP_RES_DELETE);
@@ -539,7 +539,7 @@ static int op2code (const char *s) {
*/
static int lualdap_modify (lua_State *L) {
conn_data *conn = getconnection (L);
- const char *dn = luaL_check_string (L, 2);
+ const char *dn = luaL_checkstring (L, 2);
attrs_data attrs;
int rc, msgid, param = 3;
A_init (&attrs);
@@ -565,8 +565,8 @@ static int lualdap_modify (lua_State *L)
*/
static int lualdap_rename (lua_State *L) {
conn_data *conn = getconnection (L);
- const char *dn = luaL_check_string (L, 2);
- const char *rdn = luaL_check_string (L, 3);
+ const char *dn = luaL_checkstring (L, 2);
+ const char *rdn = luaL_checkstring (L, 3);
const char *par = luaL_optlstring (L, 4, NULL, NULL);
const int del = luaL_optnumber (L, 5, 0);
int msgid;
@@ -915,7 +915,7 @@ static int lualdap_createmeta (lua_State
** @return #1 Userdata with connection structure.
*/
static int lualdap_open_simple (lua_State *L) {
- const char *host = luaL_check_string (L, 1);
+ const char *host = luaL_checkstring (L, 1);
const char *who = luaL_optstring (L, 2, NULL);
const char *password = luaL_optstring (L, 3, NULL);
int use_tls = lua_toboolean (L, 4);

4
lua/lualdap/lualdap.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lualdap/lualdap.conf
# Copyright (C) 2008 - 2009 The OpenSDE Project
# Copyright (C) 2008 - 2012 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -13,6 +13,8 @@
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
hook_add prepatch 1 'cd lualdap'
pkgprefix -t openldap
OPENLDAP_INC=$( pkgprefix includedir openldap )

6
lua/lualdap/lualdap.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../lualdap/lualdap.desc
[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project
[COPY] Copyright (C) 2006 The T2 SDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
@ -35,7 +35,7 @@
[L] OpenSource
[S] Stable
[V] 1.0.1
[V] 1.1.0
[P] X -----5---9 200.400
[D] 2837666563 lualdap-1.0.1.tar.gz http://luaforge.net/frs/download.php/1571/
[D] 2142640591 lualdap-1.1.0.tar.gz !https://github.com/luaforge/lualdap/tarball/v1_1_0

Loading…
Cancel
Save