Update version to new fork

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5DE03AE

diff --git a/dev-lua/lualdap/ChangeLog b/dev-lua/lualdap/ChangeLog
index 951ad9e5123df79603598471a0989745e676615f..c7a13651cc040f449f39cc1a399475814516be95 100644 (file)
--- a/dev-lua/lualdap/ChangeLog
+++ b/dev-lua/lualdap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lua/lualdap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/lualdap/ChangeLog,v 1.1 2015/02/24 10:05:41 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lualdap/ChangeLog,v 1.2 2015/03/10 11:31:17 zx2c4 Exp $
+
+*lualdap-1.2.0 (10 Mar 2015)
+
+  10 Mar 2015; Jason A. Donenfeld <zx2c4@gentoo.org> +lualdap-1.2.0.ebuild,
+  -files/lualdap-1.1.0-destdir.patch, -files/lualdap-1.1.0-lua-5.1.patch,
+  -files/lualdap-1.1.0-openldap-2.3.patch, -lualdap-1.1.0.ebuild, metadata.xml:
+  Update version to new fork
 
 *lualdap-1.1.0 (24 Feb 2015)
 
@@ -9,4 +16,3 @@
   +files/lualdap-1.1.0-openldap-2.3.patch, +metadata.xml:
   Initial commit. Ebuild and all patches by Dennis "devurandom" Schridde in bug
   #418311.
-

diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest
index 7c9ddeee8fb1df2666bba082da111ea2298f7912..ac22677f079fd824a46db2a387ac9b53685aed77 100644 (file)
--- a/dev-lua/lualdap/Manifest
+++ b/dev-lua/lualdap/Manifest
@@ -1,17 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX lualdap-1.1.0-destdir.patch 511 SHA256 026ffca1410496dd63a3c4135944375765e7311886ec7dfce115f3e6a49ca7b8 SHA512 988c06bde30e8f404fb4667e6687fcb37fd1b999dfa787bc20e9ad79c61449350ffaa4e731d5139b935deedc1df481d81f9282d3a863ec0df9c47da8582cc7c9 WHIRLPOOL a6581f3aa4f4a4ba673dc6956b6580dab8fb051295850daacb4c37b5a46ceb4114ef7d455e0a19ea93d2d386944a0a0b0b718d98eca7ab7ea30bf35198386bc2
-AUX lualdap-1.1.0-lua-5.1.patch 604 SHA256 75909f89cc3a8ab8d455f5f06b47e7cf2a994e2a22ffc6e977694419cbcce5f8 SHA512 45a15ea6f5e00ef2e7aca675082c7e4103f67a7649578b34e12160378c898ea1516442b50c1fc56cdce56520102eb45ca0b73f505d9ba78393f44defeaa75726 WHIRLPOOL a23f96e70559904830047b4432c4f986108a83ce13334ee0767bd7b9ff224266a3dfd9ff90aea2eb5483dafdd11371077a0a0eade3e546d307690659594f8258
-AUX lualdap-1.1.0-openldap-2.3.patch 2109 SHA256 c3b56ca22f5c248dd3d8e7542805e44a332327de6b699b2ea2ac0c1a1f4bf3f7 SHA512 cf469a757cdd8506e8f438c1a51c0049e080d673d63d31126356d9a184781bd4e946f3bcc4fe51911832df3906187e0e84a9f2233cc7dfebf35fbc512778c1ed WHIRLPOOL 7124a38714a9269496e6438add354957a41dd80a7b2bd0a3c2ea8457be9c3b9e68897c84c7e71eb6070ae179288052b7b424a9db2cd76b7f9a46b77914480332
-DIST lualdap-1.1.0.tar.gz 30087 SHA256 c2875704b8cdc6398c2f1cf25199a16d217ded2c696d134ae591935ab3c98d33 SHA512 48217d0428cdc45a3d310458a59ba507b334ed75fe8c24f5a963e3c8e891b063f60f89ce5475fe83e3f32e4971e16ce9c7b1daffd78200db8372440a01155d4b WHIRLPOOL 4dc84de52c46e86fe5e0cca2dd668c25480ceeec7efafff3d48b54248ffe4a1b601703bbc60ce28750bc5b11ffa1571d00b2a2b728aee082faed66beb2fe8671
-EBUILD lualdap-1.1.0.ebuild 1182 SHA256 a9b46bc1ea74ad7df51ba2c31ee4d18bb903434a1ea63722628244017f02abfa SHA512 b56de262545b0c850851305396979541751fd9523f15ece293d5e81dc68292fbf7dfe4d169d40b0c9e8c6b12d70c3fdab309124e2eabb7cab98832cb47bfe18d WHIRLPOOL a1f3d57903cf09a63e5aeb671cbe417b66ed81b0433d4a77d33799d814aa6c336d8bf4a81922f612cb2646ffdf66e08d94c8b7cc44801b71f42c637c5bba0df4
-MISC ChangeLog 530 SHA256 1cd799209d2512d31a88851cddfa86cc7a041931d587c4c599dd9d37b59a0674 SHA512 d5b5515dd855c4f4f2d08a2fa56a2e28604a29ee9c979877beea917fcff11e58566a3380aa39ddb9b475000b832ce8f4face459218672d58b2edbde8b016c501 WHIRLPOOL 79a757fbf5a5730bc28913221ab767cd1ae0a22641b59d54fd8a6a60ea250fcf4f85d04560866915a9a5f527737329b2fcdd329090dffc85db9bcf0ff1401da4
-MISC metadata.xml 235 SHA256 d86650a6b5b8085efecfd93c89ce79334d080b266f0566d4cc8e8688f1414d1f SHA512 bf8b56a69c45698e2e272d4597edf42db2cbe6b4756cc234b0f867c802043354a7a28aeb0f191cf4cd8024abf2a8526f87a574f6d10ee56bda54071f6c3c1d91 WHIRLPOOL 10bed663f90f516aaa92b9ca735074b73efbf0556c9f280252824f2bffa812cd2f3bb5a8cbb7ab42af169ff46bd7f29d1579f7c57444720aa97bd5e6ff98e0b7
+DIST lualdap-1.2.0.tar.gz 13565 SHA256 da8febe2ebcd1e5eb7ee16acec6e9dc72104d7f1d17be3f9a24b5644497f19fd SHA512 ad66a68174524abd75859480fff3cb93dda8168b99668c44b7b6f1fed0f7e6313661b083080c2269e5e586769f5d8467536beaf4ff1285ed0f7d4830b7f4ae83 WHIRLPOOL 93870e809fd35a8206a72e97fb3f7d3459a52aa381a20ab70b70d1e31afe3c2e70507a0561dd9727da1202f62287897235c3212ebb6dc3e7dc9f05681bf918cc
+EBUILD lualdap-1.2.0.ebuild 571 SHA256 8f6dfc30e5eea29eb2e9d21ddb5ea7096ebbdd8943cebb69dc593e89aa80b744 SHA512 3d8d7db983c149f7adf229b11d6b20d460226133841a3cc141fbed3c2b2f7259ced2b349c00b5e7c325245fd91f3b6117394c5263d81876ceef7ff6a85e9fa7a WHIRLPOOL d550ddacdb4e9d613599341c62b5003c0d874941b6551d166f8b78e73b840b8d2186786c54815ea2f11539b5aaf40fb869d1de1c90cc9e48c67be6e4f0ac373f
+MISC ChangeLog 816 SHA256 86ef5555a0d9be4bdf8f4007e26768fdff075514d6128a76d7d4714744d301b5 SHA512 de6e34ed59712b7ce8a566e019b6110d8a70317af789a31fa4c912d37c2744693219ff663f14af8660687cfa390079ce236fe8033dc9933470267a42f02449ae WHIRLPOOL 67090ff761507d4f334dd4343d6f70496b9647d3e585249fcc54251a0edeeaf8a4becc929a28c8fa7efe674e29cd7f4b92da6d6fbe88262a53af5577078d4469
+MISC metadata.xml 338 SHA256 443f6bff2482eb939a5a92ee9c8279cc5b80403050b99e2da2de8f4cf0202da0 SHA512 a5e16d43ac51585db2392e2dc3bdbc56d5017eaea4170b60aff344205db23e7eaa9136690222e939510677104ca9fa1a232c44f9032ef5b1b64f6266842b9caf WHIRLPOOL 1c995472f81c65ca872013e70db8a6804426e0a7c8d6916f577ff46637a38f3afeba636ab1e35c5a126cab1958733e2b303cea0399e4f8fab7ca896522d924a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTsTPEACgkQp5vW4rUFj5oCgQCgt/tpibyyv3BE8GJFTlpFW9YK
-ANQAmgI7BJoGrdwAFAIA7xNpWqMBhXDl
-=nR62
+iQIcBAEBCAAGBQJU/tYhAAoJEEn8cBKl3gOuQScP+gNi12+p8ug0v9t2AsoSr1e9
+5Saw2JTZCSnc5cS71+sMkQ2jQdAk8O/cgbTbBPUct4VC2aO3cYoDS1KjVrAlrUeb
+kZ7JsPnelAbL8WXGhG9K6GMhSNtDr+inWvN8Wdln5kjznF2YzAXzIKLPkebA1lgG
++qOC1j8oVKkLNbufrGuPdtCdY/H01OCw0QuK8GyOz6hXvZ7KShNALlH9FZCDTh9t
+tK1UHgGrB4Fb9JuE3A6+mFwahCih6kL09tOvA4XdOkZGUXLWuAml3GVSDc+wYJl9
+XLkZbvFb4rlXNJcJrtSAezBhHGImr6YzfUwGoAFFIfsMjbitZ1bsaUAuNEwx6Xg0
+BPw0HLjV1g+INPTH5SHUXe+/MILltF0eENlFaSqB+x9d8e8yuUeIUNAiHv+2QTlA
++NoQ2joJMs/49mTIctkVqQRxOdIw6yKdH3+XhcvHJXojzTlyH3jLJvBTrVzTrzZy
+4QEhFZvV+6fhDPJsNZ9yJsPqjiFXgoXjx0zQfeahACR04jyZP6JjUlek38kdHvgK
+TSFGEe3PU+USsVmzOZHPLRdap28emeASZoA++AiI4Hd5nGzMEwr3+RhT1KqNiIo9
+MqZXhGfrId8I2u4y8zYKdSiZai6qDSfl0zQIg4QEK1OgWxu/N+LAC2sxSO43VGDO
+piAtJmLETZkHMaXypeaf
+=ILqa
 -----END PGP SIGNATURE-----

diff --git a/dev-lua/lualdap/files/lualdap-1.1.0-destdir.patch b/dev-lua/lualdap/files/lualdap-1.1.0-destdir.patch
deleted file mode 100644 (file)
index 4f0afdc..0000000
--- a/dev-lua/lualdap/files/lualdap-1.1.0-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- lualdap-1.1.0/Makefile.orig        2012-05-31 01:14:53.773987493 +0200
-+++ lualdap-1.1.0/Makefile     2012-05-31 01:15:46.539987507 +0200
-@@ -20,9 +20,9 @@
-       $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
- 
- install: src/$(LIBNAME)
--      mkdir -p $(LUA_LIBDIR)
--      cp src/$(LIBNAME) $(LUA_LIBDIR)
--      cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
-+      mkdir -p $(DESTDIR)$(LUA_LIBDIR)
-+      cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR)
-+      cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
- 
- clean:
-       rm -f $(OBJS) src/$(LIBNAME)

diff --git a/dev-lua/lualdap/files/lualdap-1.1.0-lua-5.1.patch b/dev-lua/lualdap/files/lualdap-1.1.0-lua-5.1.patch
deleted file mode 100644 (file)
index 6b61056..0000000
--- a/dev-lua/lualdap/files/lualdap-1.1.0-lua-5.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- lualdap-1.1.0/src/lualdap.c.orig   2012-05-31 02:16:27.677987500 +0200
-+++ lualdap-1.1.0/src/lualdap.c        2012-05-31 02:19:57.963987490 +0200
-@@ -887,7 +887,11 @@
-               return 0;
- 
-       /* define methods */
-+#if LUA_VERSION_NUM >= 501
-+      luaL_register (L, NULL, methods);
-+#else
-       luaL_openlib (L, NULL, methods, 0);
-+#endif
- 
-       /* define metamethods */
-       lua_pushliteral (L, "__gc");
-@@ -993,7 +997,11 @@
-       };
- 
-       lualdap_createmeta (L);
-+#if LUA_VERSION_NUM >= 501
-+      luaL_register (L, LUALDAP_TABLENAME, lualdap);
-+#else
-       luaL_openlib (L, LUALDAP_TABLENAME, lualdap, 0);
-+#endif
-       set_info (L);
- 
-       return 1;

diff --git a/dev-lua/lualdap/files/lualdap-1.1.0-openldap-2.3.patch b/dev-lua/lualdap/files/lualdap-1.1.0-openldap-2.3.patch
deleted file mode 100644 (file)
index 4742fa8..0000000
--- a/dev-lua/lualdap/files/lualdap-1.1.0-openldap-2.3.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- lualdap-1.1.0/src/lualdap.c.orig   2012-05-31 03:32:44.337987490 +0200
-+++ lualdap-1.1.0/src/lualdap.c        2012-05-31 03:33:35.515987505 +0200
-@@ -461,7 +461,11 @@
-       luaL_argcheck(L, conn!=NULL, 1, LUALDAP_PREFIX"LDAP connection expected");
-       if (conn->ld == NULL) /* already closed */
-               return 0;
-+#if defined(LDAP_API_FEATURE_X_OPENLDAP) && LDAP_API_FEATURE_X_OPENLDAP >= 20300
-+      ldap_unbind_ext (conn->ld, NULL, NULL);
-+#else
-       ldap_unbind (conn->ld);
-+#endif
-       conn->ld = NULL;
-       lua_pushnumber (L, 1);
-       return 1;
-@@ -939,13 +947,27 @@
-       const char *password = luaL_optstring (L, 3, NULL);
-       int use_tls = lua_toboolean (L, 4);
-       conn_data *conn = (conn_data *)lua_newuserdata (L, sizeof(conn_data));
-+#if defined(LDAP_API_FEATURE_X_OPENLDAP) && LDAP_API_FEATURE_X_OPENLDAP >= 20300
-+      struct berval cred = { 0, NULL };
-+      char *host_with_schema = NULL;
-+#endif
-       int err;
- 
-       /* Initialize */
-       lualdap_setmeta (L, LUALDAP_CONNECTION_METATABLE);
-       conn->version = 0;
-+#if defined(LDAP_API_FEATURE_X_OPENLDAP) && LDAP_API_FEATURE_X_OPENLDAP >= 20300
-+      host_with_schema = malloc(strlen(host) + 8);
-+      strcpy(host_with_schema, "ldap://");
-+      strcat(host_with_schema, host);
-+      err = ldap_initialize(&conn->ld, host_with_schema);
-+      free(host_with_schema);
-+      host_with_schema = NULL;
-+      if (err != LDAP_SUCCESS)
-+#else
-       conn->ld = ldap_init (host, LDAP_PORT);
-       if (conn->ld == NULL)
-+#endif
-               return faildirect(L,LUALDAP_PREFIX"Error connecting to server");
-       /* Set protocol version */
-       conn->version = LDAP_VERSION3;
-@@ -959,7 +981,17 @@
-                       return faildirect (L, ldap_err2string (rc));
-       }
-       /* Bind to a server */
-+#if defined(LDAP_API_FEATURE_X_OPENLDAP) && LDAP_API_FEATURE_X_OPENLDAP >= 20300
-+      cred.bv_len = strlen(password);
-+      cred.bv_val = malloc(cred.bv_len+1);
-+      strcpy(cred.bv_val, password);
-+      err = ldap_sasl_bind_s (conn->ld, who, LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL);
-+      free(cred.bv_val);
-+      cred.bv_len = 0;
-+      cred.bv_val = NULL;
-+#else
-       err = ldap_bind_s (conn->ld, who, password, LDAP_AUTH_SIMPLE);
-+#endif
-       if (err != LDAP_SUCCESS)
-               return faildirect (L, ldap_err2string (err));
- 

diff --git a/dev-lua/lualdap/lualdap-1.1.0.ebuild b/dev-lua/lualdap/lualdap-1.1.0.ebuild
deleted file mode 100644 (file)
index 547397e..0000000
--- a/dev-lua/lualdap/lualdap-1.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/lualdap/lualdap-1.1.0.ebuild,v 1.1 2015/02/24 10:05:41 chainsaw Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_PN="LuaLDAP"
-
-DESCRIPTION="Simple interface from Lua to an LDAP client"
-HOMEPAGE="http://www.keplerproject.org/lualdap"
-SRC_URI="http://files.luaforge.net/releases/${PN}/${PN}/${MY_PN}${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="dev-lang/lua:*"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig"
-
-src_prepare() {
-       epatch "${FILESDIR}/${P}-destdir.patch"
-       epatch "${FILESDIR}/${P}-lua-5.1.patch"
-       epatch "${FILESDIR}/${P}-openldap-2.3.patch"
-}
-
-src_configure() {
-       sed -i config \
-               -e "s:LUA_VERSION_NUM=.*:LUA_VERSION_NUM=501:" \
-               -e "s:LUA_LIBDIR=.*:LUA_LIBDIR=$(pkg-config --variable=INSTALL_CMOD lua):" \
-               -e "s:LUA_INC=.*:LUA_INC=$(pkg-config --variable=INSTALL_INC lua):" \
-               -e "s:OPENLDAP_INC=.*:OPENLDAP_INC=/usr/include:" \
-               -e "s:CFLAGS=.*:CFLAGS=${CFLAGS} ${LDFLAGS} -fPIC -Wall -ansi \$(INCS):" \
-               -e "s:CC=.*:CC=$(tc-getCC):" \
-               || die "Failed to customise configure script"
-}

diff --git a/dev-lua/lualdap/lualdap-1.2.0.ebuild b/dev-lua/lualdap/lualdap-1.2.0.ebuild
new file mode 100644 (file)
index 0000000..7493d2a
--- /dev/null
+++ b/dev-lua/lualdap/lualdap-1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lualdap/lualdap-1.2.0.ebuild,v 1.1 2015/03/10 11:31:17 zx2c4 Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MY_PN="LuaLDAP"
+
+DESCRIPTION="Simple interface from Lua to OpenLDAP"
+HOMEPAGE="http://git.zx2c4.com/lualdap/about/"
+SRC_URI="http://git.zx2c4.com/${PN}/snapshot/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="dev-lang/lua:*"
+DEPEND="${RDEPEND}
+       net-nds/openldap
+       virtual/pkgconfig"

diff --git a/dev-lua/lualdap/metadata.xml b/dev-lua/lualdap/metadata.xml
index 483ef2f1539985b0545f4bf385a58ce96a5a5737..55afbdcdf8de3c4de6bf52a32cbf4b5740f88d22 100644 (file)
--- a/dev-lua/lualdap/metadata.xml
+++ b/dev-lua/lualdap/metadata.xml
@@ -5,4 +5,8 @@
                <email>chainsaw@gentoo.org</email>
                <name>Tony Vroon</name>
        </maintainer>
+       <maintainer>
+           <email>zx2c4@gentoo.org</email>
+               <name>Jason A. Donenfeld</name>
+    </maintainer>
 </pkgmetadata>