commit bbb7eb2b0c9a9d1c159b9500fc5665a902283130
parent 1fe4160fc29ed7d4a95fcd47452ee1c2223d5f1b
Author: Steven Barth <steven@midlink.org>
Date: Sun, 14 Dec 2014 13:24:11 +0100
Merge pull request #643 from mstorchak/misc-fixes
Update some packages, mostly license info
Diffstat:
12 files changed, 69 insertions(+), 30 deletions(-)
diff --git a/lang/luaposix/Makefile b/lang/luaposix/Makefile
@@ -8,17 +8,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luaposix
-PKG_VERSION:=v32
+PKG_VERSION:=v33.0.0
PKG_RELEASE:=1
PKG_SOURCE:=release-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/luaposix/luaposix/archive/
-PKG_MD5SUM:=2bfede7b7cee96c5d0f6c0354e17498c
+PKG_MD5SUM:=3241c33566542b7563ae001112646af6
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)
PKG_REMOVE_FILES:=aclocal.m4
PKG_FIXUP:=autoreconf
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk
@@ -48,7 +49,7 @@ endif
define Package/luaposix/install
$(INSTALL_DIR) $(1)/usr/lib/lua
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/ext/posix/.libs/posix_c.so $(1)/usr/lib/lua
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ext/posix/.libs/posix.so $(1)/usr/lib/lua
$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/posix.lua $(1)/usr/lib/lua
endef
diff --git a/lang/luaposix/patches/100-eglibc-compat.patch b/lang/luaposix/patches/100-eglibc-compat.patch
@@ -1,28 +1,29 @@
---- a/ext/posix/posix.c
-+++ b/ext/posix/posix.c
-@@ -1970,6 +1970,7 @@ static int Pctermid(lua_State *L)
- return 1;
- }
+diff -Naur luaposix-release-v33.0.0.orig/ext/posix/unistd.c luaposix-release-v33.0.0/ext/posix/unistd.c
+--- luaposix-release-v33.0.0.orig/ext/posix/unistd.c 2014-11-04 17:49:35.000000000 +0200
++++ luaposix-release-v33.0.0/ext/posix/unistd.c 2014-12-14 00:59:14.878622722 +0200
+@@ -526,6 +526,7 @@
+ #endif
+
+#ifndef NO_GETLOGIN
/***
Current logged-in user.
- @see getlogin(3)
-@@ -1980,6 +1981,7 @@ static int Pgetlogin(lua_State *L)
- lua_pushstring(L, getlogin());
- return 1;
+ @treturn[1] string username, if successful
+@@ -538,6 +539,7 @@
+ checknargs(L, 0);
+ return pushstringresult(getlogin());
}
+#endif
- static void Fgetpasswd(lua_State *L, int i, const void *data)
- {
-@@ -3786,7 +3788,9 @@ static const luaL_Reg R[] =
- #if _POSIX_VERSION >= 200112L
- MENTRY( Pgetgroups ),
- #endif
+
+ /***
+@@ -1037,7 +1039,9 @@
+ LPOSIX_FUNC( Pgetegid ),
+ LPOSIX_FUNC( Pgeteuid ),
+ LPOSIX_FUNC( Pgetgid ),
+#ifndef NO_GETLOGIN
- MENTRY( Pgetlogin ),
+ LPOSIX_FUNC( Pgetlogin ),
+#endif
- MENTRY( Pgetopt ),
- MENTRY( Pgetpasswd ),
- MENTRY( Pgetpid ),
+ LPOSIX_FUNC( Pgetpgrp ),
+ LPOSIX_FUNC( Pgetpid ),
+ LPOSIX_FUNC( Pgetppid ),
diff --git a/lang/luaposix/patches/101-disable-curses.patch b/lang/luaposix/patches/101-disable-curses.patch
@@ -0,0 +1,30 @@
+diff -Naur luaposix-release-v33.0.0.orig/ext/posix/posix.c luaposix-release-v33.0.0/ext/posix/posix.c
+--- luaposix-release-v33.0.0.orig/ext/posix/posix.c 2014-11-04 17:49:35.000000000 +0200
++++ luaposix-release-v33.0.0/ext/posix/posix.c 2014-12-14 01:49:44.486562194 +0200
+@@ -11,7 +11,6 @@
+ */
+
+ #include "ctype.c"
+-#include "curses.c"
+ #include "dirent.c"
+ #include "errno.c"
+ #include "fcntl.c"
+diff -Naur luaposix-release-v33.0.0.orig/configure.ac luaposix-release-v33.0.0/configure.ac
+--- luaposix-release-v33.0.0.orig/configure.ac 2014-11-04 17:49:35.000000000 +0200
++++ luaposix-release-v33.0.0/configure.ac 2014-12-14 01:58:08.214554482 +0200
+@@ -109,15 +109,6 @@
+ AC_SUBST([LIBRT], [-lrt])
+ fi
+
+-dnl Curses
+-AX_WITH_CURSES
+-AC_ARG_VAR(CURSES_LIB, [linker flags for curses library])
+-
+-save_LIBS=$LIBS
+-LIBS="$CURSES_LIB $LIBS"
+-AC_CHECK_FUNCS([resizeterm])
+-LIBS=$save_LIBS
+-
+ dnl Lua 5.1 or 5.2
+ AX_PROG_LUA(5.1, 5.3)
+ AX_LUA_HEADERS
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
@@ -14,10 +14,9 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
PKG_MD5SUM:=43bd6676f0b404326eee2d63be3cdcfe
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
diff --git a/net/tgt/Makefile b/net/tgt/Makefile
@@ -7,8 +7,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tgt
-PKG_VERSION:=1.0.48
-PKG_REV:=22d9567f39e5eb8a794ce2cb5a2190abdbecaa1f
+PKG_VERSION:=1.0.53
+PKG_REV:=9764e0afd9a7115e356fc85569a780f9003c4eac
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
diff --git a/net/wget/Makefile b/net/wget/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_MD5SUM:=78942cc0cce0a23e18114d982789e360
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/utils/acl/Makefile b/utils/acl/Makefile
@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=acl
-PKG_REV:=f2a5f57a20ffa007abc1fa24df1f76e18b74a425
-PKG_VERSION:=20140610
+PKG_REV:=62ce6354ef5a8eb5644908748f79c8cd18474d4c
+PKG_VERSION:=20140812
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -21,6 +21,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_INSTALL:=1
PKG_LICENSE:=LGPL-2.1 GPL-2.0
+PKG_LICENSE_FILES:=doc/COPYING doc/COPYING.LGPL
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/attr/Makefile b/utils/attr/Makefile
@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=attr
-PKG_REV:=50fc862d69984089ce09138b3350ee7762290403
-PKG_VERSION:=20140610
+PKG_REV:=c4a7fdbcc109d6e8b465a427c714926fcb85c750
+PKG_VERSION:=20141020
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -21,6 +21,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_INSTALL:=1
PKG_LICENSE:=LGPL-2.1 GPL-2.0
+PKG_LICENSE_FILES:=doc/COPYING doc/COPYING.LGPL
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/haserl/Makefile b/utils/haserl/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/haserl
PKG_MD5SUM:=a9decddb508944d56f71dd2f821e2ec5
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
PKG_CONFIG_DEPENDS:= \
CONFIG_HASERL_with_lua \
diff --git a/utils/lsof/Makefile b/utils/lsof/Makefile
@@ -17,6 +17,8 @@ PKG_SOURCE_URL:=http://ftp2.de.debian.org/debian/pool/main/l/lsof
PKG_MD5SUM:=23420509564a897b76055f9d84d19068
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)+dfsg.orig
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
+PKG_LICENSE:=Unique
+PKG_LICENSE_FILES:=00README
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile
@@ -17,6 +17,7 @@ PKG_SOURCE_URL:=@SF/smartmontools
PKG_MD5SUM:=2ea0c62206e110192a97b59291b17f54
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/tmux/Makefile b/utils/tmux/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/tmux
PKG_MD5SUM:=b07601711f96f1d260b390513b509a2d
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=ISC
+PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
