Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #643 from mstorchak/misc-fixes

Browse source 
Update some packages, mostly license info
This commit is contained in:
Steven Barth 2014-12-14 13:24:11 +01:00
commit bbb7eb2b0c
12 changed files with 69 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lang/luaposix/Makefile
View file

@ -8,17 +8,18 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luaposix PKG_NAME:=luaposix
PKG_VERSION:=v32 PKG_VERSION:=v33.0.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=release-$(PKG_VERSION).tar.gz PKG_SOURCE:=release-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/luaposix/luaposix/archive/ 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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)
PKG_REMOVE_FILES:=aclocal.m4 PKG_REMOVE_FILES:=aclocal.m4
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com> PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -48,7 +49,7 @@ endif
define Package/luaposix/install define Package/luaposix/install
$(INSTALL_DIR) $(1)/usr/lib/lua $(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 $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/posix.lua $(1)/usr/lib/lua
endef endef

39
lang/luaposix/patches/100-eglibc-compat.patch
View file

@ -1,28 +1,29 @@
--- a/ext/posix/posix.c diff -Naur luaposix-release-v33.0.0.orig/ext/posix/unistd.c luaposix-release-v33.0.0/ext/posix/unistd.c
+++ b/ext/posix/posix.c --- luaposix-release-v33.0.0.orig/ext/posix/unistd.c 2014-11-04 17:49:35.000000000 +0200
@@ -1970,6 +1970,7 @@ static int Pctermid(lua_State *L) +++ luaposix-release-v33.0.0/ext/posix/unistd.c 2014-12-14 00:59:14.878622722 +0200
return 1; @@ -526,6 +526,7 @@
} #endif
+#ifndef NO_GETLOGIN +#ifndef NO_GETLOGIN
/*** /***
Current logged-in user. Current logged-in user.
@see getlogin(3) @treturn[1] string username, if successful
@@ -1980,6 +1981,7 @@ static int Pgetlogin(lua_State *L) @@ -538,6 +539,7 @@
lua_pushstring(L, getlogin()); checknargs(L, 0);
return 1; return pushstringresult(getlogin());
} }
+#endif +#endif
static void Fgetpasswd(lua_State *L, int i, const void *data)
{ /***
@@ -3786,7 +3788,9 @@ static const luaL_Reg R[] = @@ -1037,7 +1039,9 @@
#if _POSIX_VERSION >= 200112L LPOSIX_FUNC( Pgetegid ),
MENTRY( Pgetgroups ), LPOSIX_FUNC( Pgeteuid ),
#endif LPOSIX_FUNC( Pgetgid ),
+#ifndef NO_GETLOGIN +#ifndef NO_GETLOGIN
MENTRY( Pgetlogin ), LPOSIX_FUNC( Pgetlogin ),
+#endif +#endif
MENTRY( Pgetopt ), LPOSIX_FUNC( Pgetpgrp ),
MENTRY( Pgetpasswd ), LPOSIX_FUNC( Pgetpid ),
MENTRY( Pgetpid ), LPOSIX_FUNC( Pgetppid ),

30
lang/luaposix/patches/101-disable-curses.patch Normal file
View file

@ -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

3
net/rsync/Makefile
View file

@ -14,10 +14,9 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
PKG_MD5SUM:=43bd6676f0b404326eee2d63be3cdcfe PKG_MD5SUM:=43bd6676f0b404326eee2d63be3cdcfe
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com> PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1

4
net/tgt/Makefile
View file

@ -7,8 +7,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=tgt PKG_NAME:=tgt
PKG_VERSION:=1.0.48 PKG_VERSION:=1.0.53
PKG_REV:=22d9567f39e5eb8a794ce2cb5a2190abdbecaa1f PKG_REV:=9764e0afd9a7115e356fc85569a780f9003c4eac
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0

1
net/wget/Makefile
View file

@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_MD5SUM:=78942cc0cce0a23e18114d982789e360 PKG_MD5SUM:=78942cc0cce0a23e18114d982789e360
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com> PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-3.0+ PKG_LICENSE:=GPL-3.0+
PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

5
utils/acl/Makefile
View file

@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=acl PKG_NAME:=acl
PKG_REV:=f2a5f57a20ffa007abc1fa24df1f76e18b74a425 PKG_REV:=62ce6354ef5a8eb5644908748f79c8cd18474d4c
PKG_VERSION:=20140610 PKG_VERSION:=20140812
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 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_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_LICENSE:=LGPL-2.1 GPL-2.0 PKG_LICENSE:=LGPL-2.1 GPL-2.0
PKG_LICENSE_FILES:=doc/COPYING doc/COPYING.LGPL
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

5
utils/attr/Makefile
View file

@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=attr PKG_NAME:=attr
PKG_REV:=50fc862d69984089ce09138b3350ee7762290403 PKG_REV:=c4a7fdbcc109d6e8b465a427c714926fcb85c750
PKG_VERSION:=20140610 PKG_VERSION:=20141020
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 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_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_LICENSE:=LGPL-2.1 GPL-2.0 PKG_LICENSE:=LGPL-2.1 GPL-2.0
PKG_LICENSE_FILES:=doc/COPYING doc/COPYING.LGPL
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

1
utils/haserl/Makefile
View file

@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/haserl
PKG_MD5SUM:=a9decddb508944d56f71dd2f821e2ec5 PKG_MD5SUM:=a9decddb508944d56f71dd2f821e2ec5
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com> PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_HASERL_with_lua \ CONFIG_HASERL_with_lua \

2
utils/lsof/Makefile
View file

@ -17,6 +17,8 @@ PKG_SOURCE_URL:=http://ftp2.de.debian.org/debian/pool/main/l/lsof
PKG_MD5SUM:=23420509564a897b76055f9d84d19068 PKG_MD5SUM:=23420509564a897b76055f9d84d19068
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)+dfsg.orig PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)+dfsg.orig
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com> PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=Unique
PKG_LICENSE_FILES:=00README
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

1
utils/smartmontools/Makefile
View file

@ -17,6 +17,7 @@ PKG_SOURCE_URL:=@SF/smartmontools
PKG_MD5SUM:=2ea0c62206e110192a97b59291b17f54 PKG_MD5SUM:=2ea0c62206e110192a97b59291b17f54
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com> PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+
PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

1
utils/tmux/Makefile
View file

@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/tmux
PKG_MD5SUM:=b07601711f96f1d260b390513b509a2d PKG_MD5SUM:=b07601711f96f1d260b390513b509a2d
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com> PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=ISC PKG_LICENSE:=ISC
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1 PKG_INSTALL:=1