Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2014-01-18 13:50:36
|
Revision: 6366
http://sourceforge.net/p/astlinux/code/6366
Author: abelbeck
Date: 2014-01-18 13:50:32 +0000 (Sat, 18 Jan 2014)
Log Message:
-----------
Remove a couple stray target package-config scripts
Modified Paths:
--------------
branches/1.0/package/libpcap/libpcap.mk
branches/1.0/package/netsnmp/netsnmp.mk
Modified: branches/1.0/package/libpcap/libpcap.mk
===================================================================
--- branches/1.0/package/libpcap/libpcap.mk 2014-01-18 13:24:18 UTC (rev 6365)
+++ branches/1.0/package/libpcap/libpcap.mk 2014-01-18 13:50:32 UTC (rev 6366)
@@ -37,4 +37,9 @@
endef
LIBPCAP_POST_INSTALL_STAGING_HOOKS += LIBPCAP_STAGING_FIXUP_PCAP_CONFIG
+define LIBPCAP_TARGET_REMOVE_PCAP_CONFIG
+ rm -f $(TARGET_DIR)/usr/bin/pcap-config
+endef
+LIBPCAP_POST_INSTALL_TARGET_HOOKS += LIBPCAP_TARGET_REMOVE_PCAP_CONFIG
+
$(eval $(call AUTOTARGETS,package,libpcap))
Modified: branches/1.0/package/netsnmp/netsnmp.mk
===================================================================
--- branches/1.0/package/netsnmp/netsnmp.mk 2014-01-18 13:24:18 UTC (rev 6365)
+++ branches/1.0/package/netsnmp/netsnmp.mk 2014-01-18 13:50:32 UTC (rev 6366)
@@ -78,7 +78,11 @@
-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
$(STAGING_DIR)/usr/bin/net-snmp-config
endef
-
NETSNMP_POST_INSTALL_STAGING_HOOKS += NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
+define NETSNMP_TARGET_REMOVE_NETSNMP_CONFIG
+ rm -f $(TARGET_DIR)/usr/bin/net-snmp-config
+endef
+NETSNMP_POST_INSTALL_TARGET_HOOKS += NETSNMP_TARGET_REMOVE_NETSNMP_CONFIG
+
$(eval $(call AUTOTARGETS,package,netsnmp))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-01-19 19:52:08
|
Revision: 6370
http://sourceforge.net/p/astlinux/code/6370
Author: abelbeck
Date: 2014-01-19 19:52:05 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
DAHDI, version bump to 2.8.0.1 / 2.8.0 for all
Modified Paths:
--------------
branches/1.0/package/dahdi-linux/dahdi-linux.mk
branches/1.0/package/dahdi-tools/dahdi-tools.mk
Modified: branches/1.0/package/dahdi-linux/dahdi-linux.mk
===================================================================
--- branches/1.0/package/dahdi-linux/dahdi-linux.mk 2014-01-19 19:44:27 UTC (rev 6369)
+++ branches/1.0/package/dahdi-linux/dahdi-linux.mk 2014-01-19 19:52:05 UTC (rev 6370)
@@ -4,10 +4,10 @@
#
##############################################################
ifeq ($(BR2_PACKAGE_RHINO),y)
-DAHDI_LINUX_VERSION := 2.6.2
+DAHDI_LINUX_VERSION := 2.8.0.1
else
ifeq ($(BR2_PACKAGE_WANPIPE),y)
-DAHDI_LINUX_VERSION := 2.6.2
+DAHDI_LINUX_VERSION := 2.8.0.1
else
DAHDI_LINUX_VERSION := 2.8.0.1
endif
Modified: branches/1.0/package/dahdi-tools/dahdi-tools.mk
===================================================================
--- branches/1.0/package/dahdi-tools/dahdi-tools.mk 2014-01-19 19:44:27 UTC (rev 6369)
+++ branches/1.0/package/dahdi-tools/dahdi-tools.mk 2014-01-19 19:52:05 UTC (rev 6370)
@@ -4,10 +4,10 @@
#
##############################################################
ifeq ($(BR2_PACKAGE_RHINO),y)
-DAHDI_TOOLS_VERSION := 2.6.2
+DAHDI_TOOLS_VERSION := 2.8.0
else
ifeq ($(BR2_PACKAGE_WANPIPE),y)
-DAHDI_TOOLS_VERSION := 2.6.2
+DAHDI_TOOLS_VERSION := 2.8.0
else
DAHDI_TOOLS_VERSION := 2.8.0
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-01-30 20:10:47
|
Revision: 6387
http://sourceforge.net/p/astlinux/code/6387
Author: abelbeck
Date: 2014-01-30 20:10:44 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
libusb and libusb-compat version bumps, 1.0.18 and 0.1.5
Modified Paths:
--------------
branches/1.0/package/libusb/Config.in
branches/1.0/package/libusb/libusb.mk
branches/1.0/package/libusb-compat/Config.in
branches/1.0/package/libusb-compat/libusb-compat.mk
Removed Paths:
-------------
branches/1.0/package/libusb-compat/libusb-compat-0.1.3-pkgconfig.patch
Modified: branches/1.0/package/libusb/Config.in
===================================================================
--- branches/1.0/package/libusb/Config.in 2014-01-30 19:49:08 UTC (rev 6386)
+++ branches/1.0/package/libusb/Config.in 2014-01-30 20:10:44 UTC (rev 6387)
@@ -3,4 +3,4 @@
help
Userspace library for accessing USB devices
- http://libusb.sourceforge.net/
+ http://libusb.info/
Modified: branches/1.0/package/libusb/libusb.mk
===================================================================
--- branches/1.0/package/libusb/libusb.mk 2014-01-30 19:49:08 UTC (rev 6386)
+++ branches/1.0/package/libusb/libusb.mk 2014-01-30 20:10:44 UTC (rev 6387)
@@ -3,11 +3,16 @@
# libusb
#
#############################################################
-LIBUSB_VERSION = 1.0.9
+LIBUSB_VERSION = 1.0.18
LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
-LIBUSB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
+LIBUSB_SITE = http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
LIBUSB_DEPENDENCIES = host-pkg-config
LIBUSB_INSTALL_STAGING = YES
-LIBUSB_INSTALL_TARGET = YES
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y)
+LIBUSB_DEPENDENCIES += udev
+else
+LIBUSB_CONF_OPT += --disable-udev
+endif
+
$(eval $(call AUTOTARGETS,package,libusb))
Modified: branches/1.0/package/libusb-compat/Config.in
===================================================================
--- branches/1.0/package/libusb-compat/Config.in 2014-01-30 19:49:08 UTC (rev 6386)
+++ branches/1.0/package/libusb-compat/Config.in 2014-01-30 20:10:44 UTC (rev 6387)
@@ -4,4 +4,4 @@
help
libusb-0.1 compatibility layer for libusb-1.0.
- http://libusb.sourceforge.net/
+ http://libusb.info/
Deleted: branches/1.0/package/libusb-compat/libusb-compat-0.1.3-pkgconfig.patch
===================================================================
--- branches/1.0/package/libusb-compat/libusb-compat-0.1.3-pkgconfig.patch 2014-01-30 19:49:08 UTC (rev 6386)
+++ branches/1.0/package/libusb-compat/libusb-compat-0.1.3-pkgconfig.patch 2014-01-30 20:10:44 UTC (rev 6387)
@@ -1,10 +0,0 @@
---- libusb-compat-0.1.3.orig/libusb.pc.in 2008-06-18 00:13:02.000000000 +0100
-+++ libusb-compat-0.1.3/libusb.pc.in 2009-09-16 12:06:50.000000000 +0100
-@@ -9,6 +9,7 @@ emulated_by=libusb-1.0
- Name: libusb
- Description: USB access library (libusb-1.0 compat wrapper)
- Version: @LIBUSB01_VERSION@
-+Requires: libusb-1.0
- Libs: -L${libdir} -lusb
- Cflags: -I${includedir}
-
Modified: branches/1.0/package/libusb-compat/libusb-compat.mk
===================================================================
--- branches/1.0/package/libusb-compat/libusb-compat.mk 2014-01-30 19:49:08 UTC (rev 6386)
+++ branches/1.0/package/libusb-compat/libusb-compat.mk 2014-01-30 20:10:44 UTC (rev 6387)
@@ -3,7 +3,7 @@
# libusb-compat
#
#############################################################
-LIBUSB_COMPAT_VERSION = 0.1.4
+LIBUSB_COMPAT_VERSION = 0.1.5
LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config libusb
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-03-13 17:27:03
|
Revision: 6461
http://sourceforge.net/p/astlinux/code/6461
Author: abelbeck
Date: 2014-03-13 17:27:00 +0000 (Thu, 13 Mar 2014)
Log Message:
-----------
package updates:
lighttpd: security bump to version 1.4.35 - CVE-2014-2323, CVE-2014-2324
radvd: bump to version 1.9.9
msmtp: bump to version 1.4.32
ipsec-tools: bump to version 0.8.2
fping: bump to version 3.9
netsnmp: security bump to version 5.7.2.1 - CVE-2014-2284
Modified Paths:
--------------
branches/1.0/package/fping/fping.mk
branches/1.0/package/ipsec-tools/Config.in
branches/1.0/package/ipsec-tools/ipsec-tools-susv3-legacy.patch
branches/1.0/package/ipsec-tools/ipsec-tools-xauth-request.patch
branches/1.0/package/ipsec-tools/ipsec-tools-xauth-user-pass.patch
branches/1.0/package/ipsec-tools/ipsec-tools.mk
branches/1.0/package/lighttpd/lighttpd-hostname-underscore.patch
branches/1.0/package/lighttpd/lighttpd.mk
branches/1.0/package/msmtp/msmtp.mk
branches/1.0/package/netsnmp/netsnmp.mk
branches/1.0/package/radvd/radvd.mk
Modified: branches/1.0/package/fping/fping.mk
===================================================================
--- branches/1.0/package/fping/fping.mk 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/fping/fping.mk 2014-03-13 17:27:00 UTC (rev 6461)
@@ -3,7 +3,7 @@
# fping
#
#############################################################
-FPING_VERSION = 3.8
+FPING_VERSION = 3.9
FPING_SITE = http://fping.org/dist
FPING_SOURCE = fping-$(FPING_VERSION).tar.gz
Modified: branches/1.0/package/ipsec-tools/Config.in
===================================================================
--- branches/1.0/package/ipsec-tools/Config.in 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/ipsec-tools/Config.in 2014-03-13 17:27:00 UTC (rev 6461)
@@ -5,6 +5,8 @@
select BR2_PACKAGE_FLEX_LIBFL
help
This package is required to support IPSec for Linux 2.6+
+
+ http://ipsec-tools.sourceforge.net/
if BR2_PACKAGE_IPSEC_TOOLS
Modified: branches/1.0/package/ipsec-tools/ipsec-tools-susv3-legacy.patch
===================================================================
--- branches/1.0/package/ipsec-tools/ipsec-tools-susv3-legacy.patch 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/ipsec-tools/ipsec-tools-susv3-legacy.patch 2014-03-13 17:27:00 UTC (rev 6461)
@@ -1,11 +1,11 @@
Replaces sysv3 legacy functions with modern equivalents.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: ipsec-tools-0.7.3/src/racoon/pfkey.c
+Index: ipsec-tools-0.8.2/src/racoon/pfkey.c
===================================================================
---- ipsec-tools-0.7.3.orig/src/racoon/pfkey.c 2010-07-12 14:46:52.000000000 +0200
-+++ ipsec-tools-0.7.3/src/racoon/pfkey.c 2010-07-12 15:01:39.000000000 +0200
-@@ -3008,12 +3008,12 @@
+--- ipsec-tools-0.8.2.orig/src/racoon/pfkey.c 2010-07-12 14:46:52.000000000 +0200
++++ ipsec-tools-0.8.2/src/racoon/pfkey.c 2010-07-12 15:01:39.000000000 +0200
+@@ -3855,12 +3855,12 @@
struct sockaddr *paddr;
paddr = (struct sockaddr *)(xisr + 1);
@@ -20,11 +20,11 @@
sysdep_sa_len(paddr));
}
-Index: ipsec-tools-0.7.3/src/racoon/racoonctl.c
+Index: ipsec-tools-0.8.2/src/racoon/racoonctl.c
===================================================================
---- ipsec-tools-0.7.3.orig/src/racoon/racoonctl.c 2010-07-12 14:49:51.000000000 +0200
-+++ ipsec-tools-0.7.3/src/racoon/racoonctl.c 2010-07-12 15:00:52.000000000 +0200
-@@ -785,7 +785,7 @@
+--- ipsec-tools-0.8.2.orig/src/racoon/racoonctl.c 2010-07-12 14:49:51.000000000 +0200
++++ ipsec-tools-0.8.2/src/racoon/racoonctl.c 2010-07-12 15:00:52.000000000 +0200
+@@ -693,7 +693,7 @@
errx(1, "cannot read source address");
/* We get "ip[port]" strip the port */
Modified: branches/1.0/package/ipsec-tools/ipsec-tools-xauth-request.patch
===================================================================
--- branches/1.0/package/ipsec-tools/ipsec-tools-xauth-request.patch 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/ipsec-tools/ipsec-tools-xauth-request.patch 2014-03-13 17:27:00 UTC (rev 6461)
@@ -1,6 +1,6 @@
---- ipsec-tools-0.7.3/src/racoon/isakmp_xauth.c.orig 2009-04-20 10:35:36.000000000 -0300
-+++ ipsec-tools-0.7.3/src/racoon/isakmp_xauth.c 2009-09-05 17:23:16.000000000 -0300
-@@ -172,6 +172,11 @@ xauth_sendreq(iph1)
+--- ipsec-tools-0.8.2/src/racoon/isakmp_xauth.c.orig 2009-04-20 10:35:36.000000000 -0300
++++ ipsec-tools-0.8.2/src/racoon/isakmp_xauth.c 2009-09-05 17:23:16.000000000 -0300
+@@ -173,6 +173,11 @@ xauth_sendreq(iph1)
pwdattr->type = htons(XAUTH_USER_PASSWORD | ISAKMP_GEN_TLV);
pwdattr->lorv = htons(0);
Modified: branches/1.0/package/ipsec-tools/ipsec-tools-xauth-user-pass.patch
===================================================================
--- branches/1.0/package/ipsec-tools/ipsec-tools-xauth-user-pass.patch 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/ipsec-tools/ipsec-tools-xauth-user-pass.patch 2014-03-13 17:27:00 UTC (rev 6461)
@@ -1,6 +1,6 @@
---- ipsec-tools-0.8.0/src/racoon/isakmp_xauth.c.orig 2011-03-14 16:50:36.000000000 +0100
-+++ ipsec-tools-0.8.0/src/racoon/isakmp_xauth.c 2011-10-27 09:45:08.000000000 +0200
-@@ -1261,6 +1261,39 @@
+--- ipsec-tools-0.8.2/src/racoon/isakmp_xauth.c.orig 2011-03-14 16:50:36.000000000 +0100
++++ ipsec-tools-0.8.2/src/racoon/isakmp_xauth.c 2011-10-27 09:45:08.000000000 +0200
+@@ -1270,6 +1270,39 @@
char *usr;
char *pwd;
{
Modified: branches/1.0/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- branches/1.0/package/ipsec-tools/ipsec-tools.mk 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/ipsec-tools/ipsec-tools.mk 2014-03-13 17:27:00 UTC (rev 6461)
@@ -4,7 +4,7 @@
#
#############################################################
-IPSEC_TOOLS_VERSION = 0.8.0
+IPSEC_TOOLS_VERSION = 0.8.2
IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.8/
IPSEC_TOOLS_INSTALL_STAGING = YES
Modified: branches/1.0/package/lighttpd/lighttpd-hostname-underscore.patch
===================================================================
--- branches/1.0/package/lighttpd/lighttpd-hostname-underscore.patch 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/lighttpd/lighttpd-hostname-underscore.patch 2014-03-13 17:27:00 UTC (rev 6461)
@@ -1,6 +1,6 @@
---- lighttpd-1.4.28.orig/src/request.c 2010-08-17 05:04:38.000000000 -0400
-+++ lighttpd-1.4.28/src/request.c 2011-02-24 13:11:20.000000000 -0500
-@@ -176,12 +176,12 @@
+--- lighttpd-1.4.35.orig/src/request.c 2010-08-17 05:04:38.000000000 -0400
++++ lighttpd-1.4.35/src/request.c 2011-02-24 13:11:20.000000000 -0500
+@@ -180,12 +180,12 @@
label_len = 0;
level++;
} else if (i == 0) {
Modified: branches/1.0/package/lighttpd/lighttpd.mk
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.mk 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/lighttpd/lighttpd.mk 2014-03-13 17:27:00 UTC (rev 6461)
@@ -4,7 +4,7 @@
#
#############################################################
-LIGHTTPD_VERSION = 1.4.34
+LIGHTTPD_VERSION = 1.4.35
LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
LIGHTTPD_DEPENDENCIES = host-pkg-config
LIGHTTPD_CONF_OPT = \
Modified: branches/1.0/package/msmtp/msmtp.mk
===================================================================
--- branches/1.0/package/msmtp/msmtp.mk 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/msmtp/msmtp.mk 2014-03-13 17:27:00 UTC (rev 6461)
@@ -4,7 +4,7 @@
#
#############################################################
-MSMTP_VERSION = 1.4.31
+MSMTP_VERSION = 1.4.32
MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.bz2
MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION)
MSMTP_DEPENDENCIES = openssl
Modified: branches/1.0/package/netsnmp/netsnmp.mk
===================================================================
--- branches/1.0/package/netsnmp/netsnmp.mk 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/netsnmp/netsnmp.mk 2014-03-13 17:27:00 UTC (rev 6461)
@@ -4,7 +4,7 @@
#
#############################################################
-NETSNMP_VERSION = 5.7.2
+NETSNMP_VERSION = 5.7.2.1
NETSNMP_SITE = http://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION)
NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
NETSNMP_INSTALL_STAGING = YES
Modified: branches/1.0/package/radvd/radvd.mk
===================================================================
--- branches/1.0/package/radvd/radvd.mk 2014-03-13 13:12:04 UTC (rev 6460)
+++ branches/1.0/package/radvd/radvd.mk 2014-03-13 17:27:00 UTC (rev 6461)
@@ -3,7 +3,7 @@
# radvd
#
#############################################################
-RADVD_VERSION = 1.9.8
+RADVD_VERSION = 1.9.9
RADVD_SOURCE = radvd-$(RADVD_VERSION).tar.gz
RADVD_SITE = http://www.litech.org/radvd/dist/
RADVD_DEPENDENCIES:=flex libdaemon host-flex host-pkg-config
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-04-08 18:01:42
|
Revision: 6494
http://sourceforge.net/p/astlinux/code/6494
Author: abelbeck
Date: 2014-04-08 18:01:39 +0000 (Tue, 08 Apr 2014)
Log Message:
-----------
prosody version bump to 0.9.4, luaexpat version bump to 1.3.0
Modified Paths:
--------------
branches/1.0/package/luaexpat/luaexpat.mk
branches/1.0/package/prosody/prosody.mk
Modified: branches/1.0/package/luaexpat/luaexpat.mk
===================================================================
--- branches/1.0/package/luaexpat/luaexpat.mk 2014-04-07 23:13:15 UTC (rev 6493)
+++ branches/1.0/package/luaexpat/luaexpat.mk 2014-04-08 18:01:39 UTC (rev 6494)
@@ -4,16 +4,15 @@
#
#############################################################
-LUAEXPAT_VERSION = 1.2.0
+LUAEXPAT_VERSION = 1.3.0
LUAEXPAT_SITE = http://matthewwild.co.uk/projects/luaexpat
LUAEXPAT_DEPENDENCIES = lua expat
-LUAEXPAT_MFLAGS += LUA_VERSION_NUM=501
-LUAEXPAT_MFLAGS += LUA_INC=$(STAGING_DIR)/usr/include/lua
-LUAEXPAT_MFLAGS += EXPAT_INC=$(STAGING_DIR)/usr/include
-LUAEXPAT_MFLAGS += LIBNAME=lxp.so
-LUAEXPAT_MFLAGS += LIB_OPTION="-shared -fPIC $(TARGET_CFLAGS)"
+LUAEXPAT_MFLAGS += LUA_LDIR=$(TARGET_DIR)/usr/share/lua
+LUAEXPAT_MFLAGS += LUA_CDIR=$(TARGET_DIR)/usr/lib/lua
+LUAEXPAT_MFLAGS += LUA_INC=-I$(STAGING_DIR)/usr/include
+LUAEXPAT_MFLAGS += EXPAT_INC=-I$(STAGING_DIR)/usr/include
LUAEXPAT_MFLAGS += CC="$(TARGET_CC) -fPIC $(TARGET_CFLAGS)"
Modified: branches/1.0/package/prosody/prosody.mk
===================================================================
--- branches/1.0/package/prosody/prosody.mk 2014-04-07 23:13:15 UTC (rev 6493)
+++ branches/1.0/package/prosody/prosody.mk 2014-04-08 18:01:39 UTC (rev 6494)
@@ -4,7 +4,7 @@
#
#############################################################
-PROSODY_VERSION = 0.9.3
+PROSODY_VERSION = 0.9.4
PROSODY_SOURCE = prosody-$(PROSODY_VERSION).tar.gz
PROSODY_SITE = http://prosody.im/downloads/source
PROSODY_DEPENDENCIES = lua libidn openssl luafilesystem luaexpat luasocket luasec
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-06-09 17:31:26
|
Revision: 6545
http://sourceforge.net/p/astlinux/code/6545
Author: abelbeck
Date: 2014-06-09 17:31:22 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
sqlite, version bump to 3.8.4.2 and sqliteodbc version bump to 0.997
Modified Paths:
--------------
branches/1.0/package/sqlite/sqlite.mk
branches/1.0/package/sqliteodbc/sqliteodbc.mk
Modified: branches/1.0/package/sqlite/sqlite.mk
===================================================================
--- branches/1.0/package/sqlite/sqlite.mk 2014-06-09 17:05:41 UTC (rev 6544)
+++ branches/1.0/package/sqlite/sqlite.mk 2014-06-09 17:31:22 UTC (rev 6545)
@@ -4,9 +4,9 @@
#
#############################################################
-SQLITE_VERSION = 3080002
+SQLITE_VERSION = 3080402
SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
-SQLITE_SITE = http://www.sqlite.org/2013
+SQLITE_SITE = http://www.sqlite.org/2014
SQLITE_INSTALL_STAGING = YES
ifneq ($(BR2_LARGEFILE),y)
Modified: branches/1.0/package/sqliteodbc/sqliteodbc.mk
===================================================================
--- branches/1.0/package/sqliteodbc/sqliteodbc.mk 2014-06-09 17:05:41 UTC (rev 6544)
+++ branches/1.0/package/sqliteodbc/sqliteodbc.mk 2014-06-09 17:31:22 UTC (rev 6545)
@@ -3,7 +3,7 @@
# sqliteodbc
#
#############################################################
-SQLITEODBC_VERSION = 0.995
+SQLITEODBC_VERSION = 0.997
SQLITEODBC_SOURCE = sqliteodbc-$(SQLITEODBC_VERSION).tar.gz
SQLITEODBC_SITE = http://www.ch-werner.de/sqliteodbc
SQLITEODBC_SUBDIR = sqliteodbc-$(SQLITEODBC_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-06-27 18:14:36
|
Revision: 6569
http://sourceforge.net/p/astlinux/code/6569
Author: abelbeck
Date: 2014-06-27 18:14:33 +0000 (Fri, 27 Jun 2014)
Log Message:
-----------
lzo, version bump to 2.07, integer overflow security fix: CVE-2014-4608
Modified Paths:
--------------
branches/1.0/package/lzo/lzo.mk
Added Paths:
-----------
branches/1.0/package/buildroot-libtool-v2.4.2.patch
branches/1.0/package/lzo/lzo-configure-conformance-test.patch
Added: branches/1.0/package/buildroot-libtool-v2.4.2.patch
===================================================================
--- branches/1.0/package/buildroot-libtool-v2.4.2.patch (rev 0)
+++ branches/1.0/package/buildroot-libtool-v2.4.2.patch 2014-06-27 18:14:33 UTC (rev 6569)
@@ -0,0 +1,47 @@
+--- a/autoconf/ltmain.sh.orig 2014-06-27 12:04:53.000000000 -0500
++++ b/autoconf/ltmain.sh 2014-06-27 12:14:41.000000000 -0500
+@@ -2583,8 +2583,8 @@
+ # was found and let the user know that the "--tag" command
+ # line option must be used.
+ if test -z "$tagname"; then
+- func_echo "unable to infer tagged configuration"
+- func_fatal_error "specify a tag with '--tag'"
++ func_echo "defaulting to 'CC'"
++ func_echo "if this is not correct, specify a tag with '--tag'"
+ # else
+ # func_verbose "using $tagname tagged configuration"
+ fi
+@@ -4172,8 +4172,11 @@
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+- test "$inst_prefix_dir" = "$destdir" && \
+- func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
++ #
++ # This breaks install into our staging area. -PB
++ #
++ # test "$inst_prefix_dir" = "$destdir" && \
++ # func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+@@ -7964,7 +7967,7 @@
+ *)
+ if test no = "$installed"; then
+ func_append notinst_deplibs " $lib"
+- need_relink=yes
++ need_relink=no
+ fi
+ ;;
+ esac
+@@ -10554,6 +10557,10 @@
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
++ # Replacing uninstalled with installed can easily break crosscompilation,
++ # since the installed path is generally the wrong architecture. -CL
++ newdependency_libs="$newdependency_libs $deplib"
++ continue
+ case $deplib in
+ *.la)
+ func_basename "$deplib"
Added: branches/1.0/package/lzo/lzo-configure-conformance-test.patch
===================================================================
--- branches/1.0/package/lzo/lzo-configure-conformance-test.patch (rev 0)
+++ branches/1.0/package/lzo/lzo-configure-conformance-test.patch 2014-06-27 18:14:33 UTC (rev 6569)
@@ -0,0 +1,89 @@
+--- lzo-2.07/configure.orig 2014-06-27 11:52:43.000000000 -0500
++++ lzo-2.07/configure 2014-06-27 11:54:36.000000000 -0500
+@@ -13942,86 +13942,6 @@
+ # ************************************************************************/
+
+
+-mfx_tmp="-I$srcdir"
+-mfx_save_CPPFLAGS=$CPPFLAGS
+-test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your compiler passes the LZO conformance test" >&5
+-$as_echo_n "checking whether your compiler passes the LZO conformance test... " >&6; }
+-
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#define LZO_CFG_NO_CONFIG_HEADER 1
+-#define LZO_WANT_ACC_INCD_H 1
+-#include "include/lzo/lzodefs.h"
+-#include "src/lzo_supp.h"
+-
+-#undef LZOCHK_ASSERT
+-#define LZOCHK_ASSERT(expr) LZO_COMPILE_TIME_ASSERT_HEADER(expr)
+-#define LZO_WANT_ACC_CHK_CH 1
+-#include "src/lzo_supp.h"
+-
+-#undef LZOCHK_ASSERT
+-#define LZOCHK_ASSERT(expr) LZO_COMPILE_TIME_ASSERT(expr)
+-static void test_lzo_compile_time_assert(void) {
+-#define LZO_WANT_ACC_CHK_CH 1
+-#include "src/lzo_supp.h"
+-}
+-
+-#undef NDEBUG
+-#include <assert.h>
+-#undef LZOCHK_ASSERT
+-#define LZOCHK_ASSERT(expr) assert(expr);
+-static int test_lzo_run_time_assert(int r) {
+-#define LZO_WANT_ACC_CHK_CH 1
+-#include "src/lzo_supp.h"
+-return r;
+-}
+-
+-int
+-main ()
+-{
+-
+-test_lzo_compile_time_assert();
+-if (test_lzo_run_time_assert(1) != 1) return 1;
+-
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-
+-mfx_tmp=FAILED
+-if ac_fn_c_try_compile "$LINENO"; then :
+- mfx_tmp=yes
+-fi
+-rm -f core conftest.err conftest.$ac_objext
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-
+-CPPFLAGS=$mfx_save_CPPFLAGS
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mfx_tmp" >&5
+-$as_echo "$mfx_tmp" >&6; }
+-case x$mfx_tmp in
+- xpassed | xyes) ;;
+- *)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+-$as_echo "$as_me: " >&6;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: Your compiler failed the LZO conformance test - for details see " >&5
+-$as_echo "$as_me: Your compiler failed the LZO conformance test - for details see " >&6;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: \`config.log'. Please check that log file and consider sending" >&5
+-$as_echo "$as_me: \`config.log'. Please check that log file and consider sending" >&6;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: a patch or bug-report to <${PACKAGE_BUGREPORT}>." >&5
+-$as_echo "$as_me: a patch or bug-report to <${PACKAGE_BUGREPORT}>." >&6;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: Thanks for your support." >&5
+-$as_echo "$as_me: Thanks for your support." >&6;}
+- { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+-$as_echo "$as_me: " >&6;}
+- as_fn_error $? "LZO conformance test failed. Stop." "$LINENO" 5
+- ;;
+-esac
+-
+-
+ if test -r .Conf.settings2; then
+ . ./.Conf.settings2
+ fi
Modified: branches/1.0/package/lzo/lzo.mk
===================================================================
--- branches/1.0/package/lzo/lzo.mk 2014-06-26 17:57:36 UTC (rev 6568)
+++ branches/1.0/package/lzo/lzo.mk 2014-06-27 18:14:33 UTC (rev 6569)
@@ -3,9 +3,17 @@
# lzo
#
#############################################################
-LZO_VERSION = 2.05
+LZO_VERSION = 2.07
LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
LZO_INSTALL_STAGING = YES
+# Manually patch libtool
+LZO_LIBTOOL_PATCH = NO
+define LZO_LIBTOOL_PATCH_2.4.2
+ @echo "Patching libtool 2.4.2"
+ toolchain/patch-kernel.sh $(@D) package buildroot-libtool-v2.4.2.patch
+endef
+LZO_POST_PATCH_HOOKS += LZO_LIBTOOL_PATCH_2.4.2
+
$(eval $(call AUTOTARGETS,package,lzo))
$(eval $(call AUTOTARGETS,package,lzo,host))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-07-28 17:50:24
|
Revision: 6603
http://sourceforge.net/p/astlinux/code/6603
Author: abelbeck
Date: 2014-07-28 17:50:15 +0000 (Mon, 28 Jul 2014)
Log Message:
-----------
sqlite, version bump to 3.8.5 / sqliteodbc, version bump to 0.998
Modified Paths:
--------------
branches/1.0/package/sqlite/sqlite.mk
branches/1.0/package/sqliteodbc/sqliteodbc.mk
Modified: branches/1.0/package/sqlite/sqlite.mk
===================================================================
--- branches/1.0/package/sqlite/sqlite.mk 2014-07-28 17:22:33 UTC (rev 6602)
+++ branches/1.0/package/sqlite/sqlite.mk 2014-07-28 17:50:15 UTC (rev 6603)
@@ -4,7 +4,7 @@
#
#############################################################
-SQLITE_VERSION = 3080402
+SQLITE_VERSION = 3080500
SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
SQLITE_SITE = http://www.sqlite.org/2014
SQLITE_INSTALL_STAGING = YES
Modified: branches/1.0/package/sqliteodbc/sqliteodbc.mk
===================================================================
--- branches/1.0/package/sqliteodbc/sqliteodbc.mk 2014-07-28 17:22:33 UTC (rev 6602)
+++ branches/1.0/package/sqliteodbc/sqliteodbc.mk 2014-07-28 17:50:15 UTC (rev 6603)
@@ -3,7 +3,7 @@
# sqliteodbc
#
#############################################################
-SQLITEODBC_VERSION = 0.997
+SQLITEODBC_VERSION = 0.998
SQLITEODBC_SOURCE = sqliteodbc-$(SQLITEODBC_VERSION).tar.gz
SQLITEODBC_SITE = http://www.ch-werner.de/sqliteodbc
SQLITEODBC_SUBDIR = sqliteodbc-$(SQLITEODBC_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-08-24 00:16:15
|
Revision: 6653
http://sourceforge.net/p/astlinux/code/6653
Author: abelbeck
Date: 2014-08-24 00:16:10 +0000 (Sun, 24 Aug 2014)
Log Message:
-----------
opensips, remove db_unixodbc module as it does not appear to work, as in seg-fault
Modified Paths:
--------------
branches/1.0/package/opensips/opensips.mk
branches/1.0/package/unixodbc/unixodbc.init
Modified: branches/1.0/package/opensips/opensips.mk
===================================================================
--- branches/1.0/package/opensips/opensips.mk 2014-08-22 23:35:34 UTC (rev 6652)
+++ branches/1.0/package/opensips/opensips.mk 2014-08-24 00:16:10 UTC (rev 6653)
@@ -11,11 +11,6 @@
OPENSIPS_INCLUDE_MODULES =
-ifeq ($(strip $(BR2_PACKAGE_UNIXODBC)),y)
-OPENSIPS_DEPENDENCIES += unixodbc
-OPENSIPS_INCLUDE_MODULES += db_unixodbc
-endif
-
OPENSIPS_EXCLUDE_MODULES = siptrace sipcapture cachedb_couchbase cachedb_memcached cachedb_cassandra cachedb_redis \
cachedb_mongodb db_berkeley db_oracle db_perlvdb db_unixodbc event_rabbitmq identity jabber json ldap lua mi_xmlrpc osp \
perl perlvdb python h350 snmpstats sngtc aaa_radius carrierroute db_http db_mysql db_postgres mmgeoip httpd \
@@ -43,23 +38,23 @@
endef
define OPENSIPS_INSTALL_TARGET_CMDS
- $(INSTALL) -s -D -m 0755 $(@D)/opensips $(TARGET_DIR)/usr/sbin/opensips
+ $(INSTALL) -D -m 0755 $(@D)/opensips $(TARGET_DIR)/usr/sbin/opensips
# Install modules
(for i in `find $(@D)/modules -name \*.so`; \
- do $(INSTALL) -s -D -m 0755 "$$i" $(TARGET_DIR)/usr/lib/opensips/modules/`basename "$$i"`; done)
+ do $(INSTALL) -D -m 0755 "$$i" $(TARGET_DIR)/usr/lib/opensips/modules/`basename "$$i"`; done)
# Install opensipsctl
- $(INSTALL) -D -m 0640 $(@D)/scripts/opensipsctl.base $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.base
+ $(INSTALL) -D -m 0644 $(@D)/scripts/opensipsctl.base $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.base
+ $(INSTALL) -D -m 0644 $(@D)/scripts/opensipsctl.ctlbase $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.ctlbase
+ $(INSTALL) -D -m 0644 $(@D)/scripts/opensipsctl.fifo $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.fifo
$(SED) 's:/usr/local/etc/opensips:/etc/opensips:g' \
- $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.base
- $(INSTALL) -D -m 0640 $(@D)/scripts/opensipsctl.ctlbase $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.ctlbase
- $(INSTALL) -D -m 0640 $(@D)/scripts/opensipsctl.fifo $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.fifo
+ $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.*
$(INSTALL) -D -m 0755 $(@D)/scripts/opensipsctl $(TARGET_DIR)/usr/sbin/opensipsctl
$(SED) 's:/bin/sh:/bin/bash:' \
-e 's:/usr/local/etc/opensips:/etc/opensips:g' \
-e 's:/usr/local/lib/opensips:/usr/lib/opensips:g' \
$(TARGET_DIR)/usr/sbin/opensipsctl
- $(INSTALL) -D -m 0640 $(@D)/scripts/opensipsctlrc $(TARGET_DIR)/stat/etc/opensips/opensipsctlrc
- $(INSTALL) -D -m 0640 package/opensips/opensips.cfg $(TARGET_DIR)/stat/etc/opensips/opensips.cfg
+ $(INSTALL) -D -m 0644 $(@D)/scripts/opensipsctlrc $(TARGET_DIR)/stat/etc/opensips/opensipsctlrc
+ $(INSTALL) -D -m 0644 package/opensips/opensips.cfg $(TARGET_DIR)/stat/etc/opensips/opensips.cfg
$(INSTALL) -D -m 0755 package/opensips/opensips.init $(TARGET_DIR)/etc/init.d/opensips
ln -snf /tmp/etc/opensips $(TARGET_DIR)/etc/opensips
ln -sf ../../init.d/opensips $(TARGET_DIR)/etc/runlevels/default/S58opensips
@@ -69,7 +64,6 @@
define OPENSIPS_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/usr/sbin/opensips
rm -rf $(TARGET_DIR)/usr/lib/opensips
- rm -f $(TARGET_DIR)/usr/sbin/opensipsctl.base
rm -f $(TARGET_DIR)/usr/sbin/opensipsctl
rm -rf $(TARGET_DIR)/stat/etc/opensips
rm -f $(TARGET_DIR)/etc/init.d/opensips
Modified: branches/1.0/package/unixodbc/unixodbc.init
===================================================================
--- branches/1.0/package/unixodbc/unixodbc.init 2014-08-22 23:35:34 UTC (rev 6652)
+++ branches/1.0/package/unixodbc/unixodbc.init 2014-08-24 00:16:10 UTC (rev 6653)
@@ -102,16 +102,6 @@
Timeout=2000
"
install_odbc_dsn "asterisk-cdr" "$DATA"
-
- if [ -x /usr/sbin/opensips ]; then
- DATA="
-Description=OpenSIPS database
-Driver=SQLite3
-Database=/mnt/kd/opensips-odbc.sqlite3
-Timeout=2000
-"
- install_odbc_dsn "opensips" "$DATA"
- fi
}
stop () {
@@ -122,9 +112,6 @@
# Remove DSN's
remove_odbc_dsn "asterisk"
remove_odbc_dsn "asterisk-cdr"
- if [ -x /usr/sbin/opensips ]; then
- remove_odbc_dsn "opensips"
- fi
}
case $1 in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-09-08 14:15:09
|
Revision: 6699
http://sourceforge.net/p/astlinux/code/6699
Author: abelbeck
Date: 2014-09-08 14:15:01 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
ngrep and sipgrep require --with-pcap-includes fully defined to find bpf.h
Modified Paths:
--------------
branches/1.0/package/ngrep/ngrep.mk
branches/1.0/package/sipgrep/sipgrep.mk
Modified: branches/1.0/package/ngrep/ngrep.mk
===================================================================
--- branches/1.0/package/ngrep/ngrep.mk 2014-09-05 17:43:26 UTC (rev 6698)
+++ branches/1.0/package/ngrep/ngrep.mk 2014-09-08 14:15:01 UTC (rev 6699)
@@ -12,7 +12,7 @@
NGREP_UNINSTALL_STAGING_OPT = --version
NGREP_CONF_OPT += \
- --with-pcap-includes=$(STAGING_DIR)/usr/include \
+ --with-pcap-includes=$(STAGING_DIR)/usr/include/pcap \
--with-pcre=$(STAGING_DIR)/usr \
--enable-pcre \
--enable-ipv6
Modified: branches/1.0/package/sipgrep/sipgrep.mk
===================================================================
--- branches/1.0/package/sipgrep/sipgrep.mk 2014-09-05 17:43:26 UTC (rev 6698)
+++ branches/1.0/package/sipgrep/sipgrep.mk 2014-09-08 14:15:01 UTC (rev 6699)
@@ -13,7 +13,7 @@
SIPGREP_UNINSTALL_STAGING_OPT = --version
SIPGREP_CONF_OPT += \
- --with-pcap-includes=$(STAGING_DIR)/usr/include \
+ --with-pcap-includes=$(STAGING_DIR)/usr/include/pcap \
--enable-ipv6
define SIPGREP_INSTALL_TARGET_CMDS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-09-08 15:08:55
|
Revision: 6700
http://sourceforge.net/p/astlinux/code/6700
Author: abelbeck
Date: 2014-09-08 15:08:46 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
libpcap / tcpdump version bumps to 1.6.2 / 4.6.2
Modified Paths:
--------------
branches/1.0/package/libpcap/libpcap.mk
branches/1.0/package/tcpdump/tcpdump.mk
Modified: branches/1.0/package/libpcap/libpcap.mk
===================================================================
--- branches/1.0/package/libpcap/libpcap.mk 2014-09-08 14:15:01 UTC (rev 6699)
+++ branches/1.0/package/libpcap/libpcap.mk 2014-09-08 15:08:46 UTC (rev 6700)
@@ -4,7 +4,7 @@
#
#############################################################
-LIBPCAP_VERSION = 1.4.0
+LIBPCAP_VERSION = 1.6.2
LIBPCAP_SITE = http://www.tcpdump.org/release
LIBPCAP_SOURCE = libpcap-$(LIBPCAP_VERSION).tar.gz
LIBPCAP_INSTALL_STAGING = YES
@@ -18,6 +18,20 @@
LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
+# On purpose, not compatible with bluez5
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+LIBPCAP_DEPENDENCIES += bluez_utils
+else
+LIBPCAP_CONF_OPT += --disable-bluetooth
+endif
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+LIBPCAP_CONF_OPT += --enable-dbus
+LIBPCAP_DEPENDENCIES += dbus
+else
+LIBPCAP_CONF_OPT += --disable-dbus
+endif
+
ifeq ($(BR2_PACKAGE_LIBUSB),y)
LIBPCAP_CONF_OPT += --enable-canusb
LIBPCAP_DEPENDENCIES += libusb
Modified: branches/1.0/package/tcpdump/tcpdump.mk
===================================================================
--- branches/1.0/package/tcpdump/tcpdump.mk 2014-09-08 14:15:01 UTC (rev 6699)
+++ branches/1.0/package/tcpdump/tcpdump.mk 2014-09-08 15:08:46 UTC (rev 6700)
@@ -6,7 +6,7 @@
# Copyright (C) 2001-2003 by Erik Andersen <and...@co...>
# Copyright (C) 2002 by Tim Riker <Ti...@Ri...>
-TCPDUMP_VERSION = 4.4.0
+TCPDUMP_VERSION = 4.6.2
TCPDUMP_SITE = http://www.tcpdump.org/release
TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-09-21 14:13:57
|
Revision: 6717
http://sourceforge.net/p/astlinux/code/6717
Author: abelbeck
Date: 2014-09-21 14:13:48 +0000 (Sun, 21 Sep 2014)
Log Message:
-----------
sqlite / sqliteodbc, version bumps to 3.8.6 / 0.999
Modified Paths:
--------------
branches/1.0/package/sqlite/sqlite.mk
branches/1.0/package/sqliteodbc/sqliteodbc.mk
Modified: branches/1.0/package/sqlite/sqlite.mk
===================================================================
--- branches/1.0/package/sqlite/sqlite.mk 2014-09-21 13:46:50 UTC (rev 6716)
+++ branches/1.0/package/sqlite/sqlite.mk 2014-09-21 14:13:48 UTC (rev 6717)
@@ -4,7 +4,7 @@
#
#############################################################
-SQLITE_VERSION = 3080500
+SQLITE_VERSION = 3080600
SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
SQLITE_SITE = http://www.sqlite.org/2014
SQLITE_INSTALL_STAGING = YES
Modified: branches/1.0/package/sqliteodbc/sqliteodbc.mk
===================================================================
--- branches/1.0/package/sqliteodbc/sqliteodbc.mk 2014-09-21 13:46:50 UTC (rev 6716)
+++ branches/1.0/package/sqliteodbc/sqliteodbc.mk 2014-09-21 14:13:48 UTC (rev 6717)
@@ -3,7 +3,7 @@
# sqliteodbc
#
#############################################################
-SQLITEODBC_VERSION = 0.998
+SQLITEODBC_VERSION = 0.999
SQLITEODBC_SOURCE = sqliteodbc-$(SQLITEODBC_VERSION).tar.gz
SQLITEODBC_SITE = http://www.ch-werner.de/sqliteodbc
SQLITEODBC_SUBDIR = sqliteodbc-$(SQLITEODBC_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-10-14 14:43:01
|
Revision: 6759
http://sourceforge.net/p/astlinux/code/6759
Author: abelbeck
Date: 2014-10-14 14:42:53 +0000 (Tue, 14 Oct 2014)
Log Message:
-----------
libsrtp, version bump to 1.5.0, using the Cisco repo and OpenSSL support
Modified Paths:
--------------
branches/1.0/package/libsrtp/Config.in
branches/1.0/package/libsrtp/libsrtp.mk
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch
branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch
Removed Paths:
-------------
branches/1.0/package/libsrtp/libsrtp-1.4.4-fix_crash_on_rtcp_decode.patch
branches/1.0/package/libsrtp/libsrtp-1.4.4-shared.patch
Added: branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch 2014-10-14 14:42:53 UTC (rev 6759)
@@ -0,0 +1,9 @@
+--- asterisk-1.8.31.0/res/res_srtp.c.orig 2014-10-13 22:34:16.000000000 -0500
++++ asterisk-1.8.31.0/res/res_srtp.c 2014-10-13 22:37:49.000000000 -0500
+@@ -41,5 +41,6 @@
+
+ #include <srtp/srtp.h>
++#include <srtp/crypto_kernel.h>
+
+ #include "asterisk/lock.h"
+ #include "asterisk/sched.h"
Added: branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch 2014-10-14 14:42:53 UTC (rev 6759)
@@ -0,0 +1,9 @@
+--- asterisk-11.13.0/res/res_srtp.c.orig 2014-10-13 22:34:16.000000000 -0500
++++ asterisk-11.13.0/res/res_srtp.c 2014-10-13 22:37:49.000000000 -0500
+@@ -41,5 +41,6 @@
+
+ #include <srtp/srtp.h>
++#include <srtp/crypto_kernel.h>
+
+ #include "asterisk/lock.h"
+ #include "asterisk/sched.h"
Modified: branches/1.0/package/libsrtp/Config.in
===================================================================
--- branches/1.0/package/libsrtp/Config.in 2014-10-13 16:55:24 UTC (rev 6758)
+++ branches/1.0/package/libsrtp/Config.in 2014-10-14 14:42:53 UTC (rev 6759)
@@ -1,9 +1,10 @@
config BR2_PACKAGE_LIBSRTP
bool "libsrtp"
default n
+ select BR2_PACKAGE_OPENSSL
help
The libSRTP library is an open-source implementation of the
Secure Real-time Transport Protocol (SRTP) originally authored
by Cisco Systems, Inc. It is available under a BSD-style license.
- http://srtp.sourceforge.net/
+ https://github.com/cisco/libsrtp
Deleted: branches/1.0/package/libsrtp/libsrtp-1.4.4-fix_crash_on_rtcp_decode.patch
===================================================================
--- branches/1.0/package/libsrtp/libsrtp-1.4.4-fix_crash_on_rtcp_decode.patch 2014-10-13 16:55:24 UTC (rev 6758)
+++ branches/1.0/package/libsrtp/libsrtp-1.4.4-fix_crash_on_rtcp_decode.patch 2014-10-14 14:42:53 UTC (rev 6759)
@@ -1,11 +0,0 @@
---- srtp/crypto/replay/rdb.c.orig 2008-01-23 21:17:42.000000000 +0100
-+++ srtp/crypto/replay/rdb.c 2012-04-02 13:03:54.000000000 +0200
-@@ -115,7 +115,7 @@
-
- /* shift the window forward by delta bits*/
- v128_left_shift(&rdb->bitmask, delta);
-- v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-delta);
-+ v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-1);
- rdb->window_start += delta;
-
- }
Deleted: branches/1.0/package/libsrtp/libsrtp-1.4.4-shared.patch
===================================================================
--- branches/1.0/package/libsrtp/libsrtp-1.4.4-shared.patch 2014-10-13 16:55:24 UTC (rev 6758)
+++ branches/1.0/package/libsrtp/libsrtp-1.4.4-shared.patch 2014-10-14 14:42:53 UTC (rev 6759)
@@ -1,44 +0,0 @@
---- srtp.orig/Makefile.in 2009-04-15 01:46:57.000000000 +0200
-+++ srtp/Makefile.in 2009-04-15 02:07:43.000000000 +0200
-@@ -65,11 +65,11 @@
-
-
- # implicit rules for object files and test apps
-
- %.o: %.c
-- $(COMPILE) -c $< -o $@
-+ $(COMPILE) -fPIC -c $< -o $@
-
- %$(EXE): %.c
- $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
-
-
-@@ -103,10 +103,13 @@
-
- libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
- ar cr libsrtp.a $^
- $(RANLIB) libsrtp.a
-
-+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
-+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.1 -o libsrtp.so.1.0 $^
-+
- # libcryptomath.a contains general-purpose routines that are used to
- # generate tables and verify cryptoalgorithm implementations - this
- # library is not meant to be included in production code
-
- cryptomath = crypto/math/math.o crypto/math/gf2_8.o
-@@ -195,10 +198,15 @@
- $(INSTALL) -d $(DESTDIR)$(includedir)/srtp
- $(INSTALL) -d $(DESTDIR)$(libdir)
- cp include/*.h $(DESTDIR)$(includedir)/srtp
- cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp
- if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
-+ if [ -f libsrtp.so.1.0 ]; then \
-+ cp libsrtp.so.1.0 $(DESTDIR)$(libdir)/; \
-+ ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so.1; \
-+ ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so; \
-+ fi
-
- uninstall:
- rm -rf $(DESTDIR)$(includedir)/srtp
- rm -rf $(DESTDIR)$(libdir)/libsrtp.a
Modified: branches/1.0/package/libsrtp/libsrtp.mk
===================================================================
--- branches/1.0/package/libsrtp/libsrtp.mk 2014-10-13 16:55:24 UTC (rev 6758)
+++ branches/1.0/package/libsrtp/libsrtp.mk 2014-10-14 14:42:53 UTC (rev 6759)
@@ -3,16 +3,25 @@
# libsrtp
#
#############################################################
-LIBSRTP_VERSION:=1.4.4
-LIBSRTP_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/srtp
-LIBSRTP_SOURCE:=srtp-$(LIBSRTP_VERSION).tgz
+LIBSRTP_VERSION = 1.5.0
+LIBSRTP_SITE = http://files.astlinux.org
+#LIBSRTP_SITE = https://github.com/cisco/libsrtp/releases
+LIBSRTP_SOURCE = libsrtp-$(LIBSRTP_VERSION).tar.gz
LIBSRTP_INSTALL_STAGING = YES
-LIBSRTP_INSTALL_TARGET = YES
+LIBSRTP_DEPENDENCIES = openssl
+
LIBSRTP_CONF_OPT = \
--prefix=/usr \
+ --enable-openssl \
+ --enable-syslog \
+ --disable-stdout \
--disable-debug
-LIBSRTP_MAKE_OPT = CC='$(TARGET_CC)' LD='$(TARGET_LD)' -C $(@D) libsrtp.so
+LIBSRTP_MAKE_OPT = \
+ CC='$(TARGET_CC)' \
+ LD='$(TARGET_LD)' \
+ CFLAGS='$(TARGET_CFLAGS) -fPIC' \
+ -C $(@D) libsrtp.so
define LIBSRTP_INSTALL_TARGET_CMDS
cp -a $(STAGING_DIR)/usr/lib/libsrtp.so* $(TARGET_DIR)/usr/lib/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-10-20 18:55:46
|
Revision: 6773
http://sourceforge.net/p/astlinux/code/6773
Author: abelbeck
Date: 2014-10-20 18:55:36 +0000 (Mon, 20 Oct 2014)
Log Message:
-----------
asterisk, version bump to 1.8.31.1 and 11.13.1, security fix - Credits the AstLinux Team for this fix related to the POODLE vulnerability
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/prosody/prosody.init
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-1.8-jabber-tls.patch
branches/1.0/package/asterisk/asterisk-11-jabber-xmpp-tls.patch
Deleted: branches/1.0/package/asterisk/asterisk-1.8-jabber-tls.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-jabber-tls.patch 2014-10-19 15:07:21 UTC (rev 6772)
+++ branches/1.0/package/asterisk/asterisk-1.8-jabber-tls.patch 2014-10-20 18:55:36 UTC (rev 6773)
@@ -1,21 +0,0 @@
---- asterisk-1.8.31.0/res/res_jabber.c.orig 2014-10-16 08:45:07.000000000 -0500
-+++ asterisk-1.8.31.0/res/res_jabber.c 2014-10-16 08:51:36.000000000 -0500
-@@ -1240,14 +1240,17 @@
- {
- int ret;
- int sock;
-+ long ssl_opts;
-
- ast_debug(1, "Starting TLS handshake\n");
-
- /* Choose an SSL/TLS protocol version, create SSL_CTX */
-- client->ssl_method = SSLv3_method();
-+ client->ssl_method = SSLv23_method();
- if (!(client->ssl_context = SSL_CTX_new((SSL_METHOD *) client->ssl_method))) {
- return IKS_NET_TLSFAIL;
- }
-+ ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-+ SSL_CTX_set_options(client->ssl_context, ssl_opts);
-
- /* Create new SSL session */
- if (!(client->ssl_session = SSL_new(client->ssl_context))) {
Deleted: branches/1.0/package/asterisk/asterisk-11-jabber-xmpp-tls.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-jabber-xmpp-tls.patch 2014-10-19 15:07:21 UTC (rev 6772)
+++ branches/1.0/package/asterisk/asterisk-11-jabber-xmpp-tls.patch 2014-10-20 18:55:36 UTC (rev 6773)
@@ -1,45 +0,0 @@
---- asterisk-11.13.0/res/res_jabber.c.orig 2014-10-16 10:05:57.000000000 -0500
-+++ asterisk-11.13.0/res/res_jabber.c 2014-10-16 10:04:51.000000000 -0500
-@@ -1282,14 +1282,17 @@
- static int aji_tls_handshake(struct aji_client *client)
- {
- int sock;
-+ long ssl_opts;
-
- ast_debug(1, "Starting TLS handshake\n");
-
- /* Choose an SSL/TLS protocol version, create SSL_CTX */
-- client->ssl_method = SSLv3_method();
-+ client->ssl_method = SSLv23_method();
- if (!(client->ssl_context = SSL_CTX_new((SSL_METHOD *) client->ssl_method))) {
- return IKS_NET_TLSFAIL;
- }
-+ ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-+ SSL_CTX_set_options(client->ssl_context, ssl_opts);
-
- /* Create new SSL session */
- if (!(client->ssl_session = SSL_new(client->ssl_context))) {
---- asterisk-11.13.0/res/res_xmpp.c.orig 2014-10-16 10:13:57.000000000 -0500
-+++ asterisk-11.13.0/res/res_xmpp.c 2014-10-16 10:16:49.000000000 -0500
-@@ -2501,6 +2501,7 @@
- {
- #ifdef HAVE_OPENSSL
- int sock;
-+ long ssl_opts;
- #endif
-
- if (!strcmp(iks_name(node), "success")) {
-@@ -2519,10 +2520,12 @@
- ast_log(LOG_ERROR, "Somehow we managed to try to start TLS negotiation on client '%s' without OpenSSL support, disconnecting\n", client->name);
- return -1;
- #else
-- client->ssl_method = SSLv3_method();
-+ client->ssl_method = SSLv23_method();
- if (!(client->ssl_context = SSL_CTX_new((SSL_METHOD *) client->ssl_method))) {
- goto failure;
- }
-+ ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-+ SSL_CTX_set_options(client->ssl_context, ssl_opts);
-
- if (!(client->ssl_session = SSL_new(client->ssl_context))) {
- goto failure;
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2014-10-19 15:07:21 UTC (rev 6772)
+++ branches/1.0/package/asterisk/asterisk.mk 2014-10-20 18:55:36 UTC (rev 6773)
@@ -4,9 +4,9 @@
#
##############################################################
ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.31.0
+ASTERISK_VERSION := 1.8.31.1
else
-ASTERISK_VERSION := 11.13.0
+ASTERISK_VERSION := 11.13.1
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
ASTERISK_SITE := http://downloads.asterisk.org/pub/telephony/asterisk/releases
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2014-10-19 15:07:21 UTC (rev 6772)
+++ branches/1.0/package/prosody/prosody.init 2014-10-20 18:55:36 UTC (rev 6773)
@@ -136,7 +136,7 @@
${ERROR_LOG} error = \"/var/log/prosody/prosody.err\";
}
--- Don't include ssl option \"no_sslv3\" since Asterisk 1.8 and 11 use SSLv3
+-- Don't include ssl option \"no_sslv3\" since pre-Asterisk 1.8.31.1 and 11.13.1 used SSLv3
ssl = {
options = { \"no_sslv2\", \"no_ticket\", \"no_compression\", \"cipher_server_preference\", \"single_dh_use\", \"single_ecdh_use\" };
certificate = \"$cert\";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-12-30 15:02:28
|
Revision: 6887
http://sourceforge.net/p/astlinux/code/6887
Author: abelbeck
Date: 2014-12-30 15:02:26 +0000 (Tue, 30 Dec 2014)
Log Message:
-----------
sqlite / sqliteodbc, version bumps to 3.8.7.4 / 0.9991
Modified Paths:
--------------
branches/1.0/package/sqlite/sqlite.mk
branches/1.0/package/sqliteodbc/sqliteodbc.mk
Modified: branches/1.0/package/sqlite/sqlite.mk
===================================================================
--- branches/1.0/package/sqlite/sqlite.mk 2014-12-30 14:42:58 UTC (rev 6886)
+++ branches/1.0/package/sqlite/sqlite.mk 2014-12-30 15:02:26 UTC (rev 6887)
@@ -4,7 +4,7 @@
#
#############################################################
-SQLITE_VERSION = 3080600
+SQLITE_VERSION = 3080704
SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
SQLITE_SITE = http://www.sqlite.org/2014
SQLITE_INSTALL_STAGING = YES
Modified: branches/1.0/package/sqliteodbc/sqliteodbc.mk
===================================================================
--- branches/1.0/package/sqliteodbc/sqliteodbc.mk 2014-12-30 14:42:58 UTC (rev 6886)
+++ branches/1.0/package/sqliteodbc/sqliteodbc.mk 2014-12-30 15:02:26 UTC (rev 6887)
@@ -3,7 +3,7 @@
# sqliteodbc
#
#############################################################
-SQLITEODBC_VERSION = 0.999
+SQLITEODBC_VERSION = 0.9991
SQLITEODBC_SOURCE = sqliteodbc-$(SQLITEODBC_VERSION).tar.gz
SQLITEODBC_SITE = http://www.ch-werner.de/sqliteodbc
SQLITEODBC_SUBDIR = sqliteodbc-$(SQLITEODBC_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-09 03:29:15
|
Revision: 6912
http://sourceforge.net/p/astlinux/code/6912
Author: abelbeck
Date: 2015-01-09 03:29:05 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------
Update build system tools...
autoconf, version bump to 2.69
automake, version bump to 1.15
libtool, version bump to 2.4.4
Modified Paths:
--------------
branches/1.0/package/Makefile.autotools.in
branches/1.0/package/autoconf/Config.in
branches/1.0/package/autoconf/autoconf.mk
branches/1.0/package/automake/Config.in
branches/1.0/package/automake/automake.mk
branches/1.0/package/automake/gtk-doc.m4
branches/1.0/package/buildroot-libtool-v2.4.patch
branches/1.0/package/libtool/libtool.mk
branches/1.0/package/libxml2/libxml2.mk
branches/1.0/package/lzo/lzo.mk
Added Paths:
-----------
branches/1.0/package/autoconf/autoconf-dont-add-dirty-to-version.patch
branches/1.0/package/automake/automake-0001-noman.patch
branches/1.0/package/buildroot-libtool-v2.4.4.patch
branches/1.0/package/libxml2/libxml2-config.cmake.in-update-include-directories.patch
Removed Paths:
-------------
branches/1.0/package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch
branches/1.0/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
branches/1.0/package/buildroot-libtool-v2.4.2.patch
Modified: branches/1.0/package/Makefile.autotools.in
===================================================================
--- branches/1.0/package/Makefile.autotools.in 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/Makefile.autotools.in 2015-01-09 03:29:05 UTC (rev 6912)
@@ -151,12 +151,18 @@
for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
+ ltmain_patchlevel=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
+ sed -e 's/\([0-9].[0-9].\)\([0-9]*\).*/\2/' -e 's/\"//'`; \
if test $$$${ltmain_version} = '1.5'; then \
toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
elif test $$$${ltmain_version} = "2.2"; then\
toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
elif test $$$${ltmain_version} = "2.4"; then\
- toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
+ if test $$$${ltmain_patchlevel} -gt 2; then \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.4.patch; \
+ else \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
+ fi \
fi \
done \
fi
@@ -175,13 +181,20 @@
$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
- ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \
+ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
+ sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
+ ltmain_patchlevel=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
+ sed -e 's/\([0-9].[0-9].\)\([0-9]*\).*/\2/' -e 's/\"//'`; \
if test $$$${ltmain_version} = "1.5"; then \
toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
elif test $$$${ltmain_version} = "2.2"; then\
toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
elif test $$$${ltmain_version} = "2.4"; then\
- toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
+ if test $$$${ltmain_patchlevel} -gt 2; then \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.4.patch; \
+ else \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
+ fi \
fi \
done \
fi
Modified: branches/1.0/package/autoconf/Config.in
===================================================================
--- branches/1.0/package/autoconf/Config.in 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/autoconf/Config.in 2015-01-09 03:29:05 UTC (rev 6912)
@@ -1,8 +1,9 @@
config BR2_PACKAGE_AUTOCONF
bool "autoconf"
- select BR2_PACKAGE_PERL
help
Extensible program for developing configure scripts. These
scripts handle all the mundane system/feature detection.
http://www.gnu.org/software/autoconf/
+
+ **HOST Only**
Deleted: branches/1.0/package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch
===================================================================
--- branches/1.0/package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch 2015-01-09 03:29:05 UTC (rev 6912)
@@ -1,30 +0,0 @@
-autoconf: don't append -dirty to version
-
-Don't append -dirty to autoconf version number if the buildroot git tree
-has uncommited changes.
-
-This script is meant for the autoconf developers, but it also activates
-if you build autoconf in a subdirectory of a git tree (E.G. like how it's
-commonly done in buildroot).
-
-The affect is that autoconf gets built as being version 2.65-dirty, which
-breaks programs (like Python) which explicitly checks for autoconf-2.65.
-
-Signed-off-by: Peter Korsgaard <ja...@su...>
----
- build-aux/git-version-gen | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: autoconf-2.65/build-aux/git-version-gen
-===================================================================
---- autoconf-2.65.orig/build-aux/git-version-gen
-+++ autoconf-2.65/build-aux/git-version-gen
-@@ -135,7 +135,7 @@ case "$dirty" in
- *) # Append the suffix only if there isn't one already.
- case $v in
- *-dirty) ;;
-- *) v="$v-dirty" ;;
-+ #*) v="$v-dirty" ;;
- esac ;;
- esac
-
Deleted: branches/1.0/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
===================================================================
--- branches/1.0/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch 2015-01-09 03:29:05 UTC (rev 6912)
@@ -1,36 +0,0 @@
-Patch taken upstream at
-http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=7f75858f577f11a844781764f30cd42cfe8a5669,
-with the following modifications:
-
- * Changes to NEWS file removed to avoid conflicts
-
- * Changes also made manually to the generated configure
- script. Otherwise, host-autoconf is needed to compile
- host-autoconf !
-
-Index: autoconf-2.65.old/configure
-===================================================================
---- autoconf-2.65.old.orig/configure 2009-12-15 16:11:05.175566911 +0100
-+++ autoconf-2.65.old/configure 2009-12-15 16:11:37.739562146 +0100
-@@ -2380,7 +2380,7 @@
- ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
- ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
- test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
-- && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-+ && test -z "`$as_echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
- && test -f conftest.m4f \
- && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
- rm -f conftest.m4f
-Index: autoconf-2.65.old/m4/m4.m4
-===================================================================
---- autoconf-2.65.old.orig/m4/m4.m4 2009-12-15 16:11:05.207566124 +0100
-+++ autoconf-2.65.old/m4/m4.m4 2009-12-15 16:11:18.595562030 +0100
-@@ -29,7 +29,7 @@
- ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
- ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
- test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
-- && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-+ && test -z "`AS_ECHO([$ac_snippet]) | $ac_path_M4 --trace=mac 2>&1`" \
- && test -f conftest.m4f \
- && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
- rm -f conftest.m4f],
Added: branches/1.0/package/autoconf/autoconf-dont-add-dirty-to-version.patch
===================================================================
--- branches/1.0/package/autoconf/autoconf-dont-add-dirty-to-version.patch (rev 0)
+++ branches/1.0/package/autoconf/autoconf-dont-add-dirty-to-version.patch 2015-01-09 03:29:05 UTC (rev 6912)
@@ -0,0 +1,28 @@
+autoconf: don't append -dirty to version
+
+Don't append -dirty to autoconf version number if the buildroot git tree
+has uncommited changes.
+
+This script is meant for the autoconf developers, but it also activates
+if you build autoconf in a subdirectory of a git tree (E.G. like how it's
+commonly done in buildroot).
+
+The affect is that autoconf gets built as being version 2.65-dirty, which
+breaks programs (like Python) which explicitly checks for autoconf-2.65.
+
+[Gustavo: update for autoconf 2.69]
+Signed-off-by: Peter Korsgaard <ja...@su...>
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura autoconf-2.69.orig/build-aux/git-version-gen autoconf-2.69/build-aux/git-version-gen
+--- autoconf-2.69.orig/build-aux/git-version-gen 2013-06-27 11:31:02.340200154 -0300
++++ autoconf-2.69/build-aux/git-version-gen 2013-06-27 11:31:13.734577033 -0300
+@@ -203,7 +203,7 @@
+ *) # Append the suffix only if there isn't one already.
+ case $v in
+ *-dirty) ;;
+- *) v="$v-dirty" ;;
++ #*) v="$v-dirty" ;;
+ esac ;;
+ esac
+ fi
Modified: branches/1.0/package/autoconf/autoconf.mk
===================================================================
--- branches/1.0/package/autoconf/autoconf.mk 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/autoconf/autoconf.mk 2015-01-09 03:29:05 UTC (rev 6912)
@@ -3,21 +3,17 @@
# autoconf
#
#############################################################
-AUTOCONF_VERSION = 2.65
-AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.bz2
+AUTOCONF_VERSION = 2.69
+AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.xz
AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
-AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
- ac_cv_prog_gnu_m4_gnu=no
+HOST_AUTOCONF_CONF_ENV = \
+ EMACS="no" \
+ ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
+ ac_cv_prog_gnu_m4_gnu=no
-AUTOCONF_DEPENDENCIES = perl host-m4
-
-HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
- ac_cv_prog_gnu_m4_gnu=no
-
HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
-$(eval $(call AUTOTARGETS,package,autoconf))
$(eval $(call AUTOTARGETS,package,autoconf,host))
# variables used by other packages
Modified: branches/1.0/package/automake/Config.in
===================================================================
--- branches/1.0/package/automake/Config.in 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/automake/Config.in 2015-01-09 03:29:05 UTC (rev 6912)
@@ -1,9 +1,9 @@
config BR2_PACKAGE_AUTOMAKE
bool "automake"
- select BR2_PACKAGE_AUTOCONF
- select BR2_PACKAGE_PERL
help
Tool for automatically generating Makefile's for input to
configure scripts (made by autoconf).
http://www.gnu.org/software/automake/
+
+ **HOST Only**
Added: branches/1.0/package/automake/automake-0001-noman.patch
===================================================================
--- branches/1.0/package/automake/automake-0001-noman.patch (rev 0)
+++ branches/1.0/package/automake/automake-0001-noman.patch 2015-01-09 03:29:05 UTC (rev 6912)
@@ -0,0 +1,28 @@
+Disable manpages build and installation, seems the bundled version of
+help2man is somewhat old and breaks on modern distributions such as
+Fedora 20, as reported by Kanibal on IRC.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura automake-1.14.1.orig/Makefile.in automake-1.14.1/Makefile.in
+--- automake-1.14.1.orig/Makefile.in 2014-09-10 18:40:57.554164448 -0300
++++ automake-1.14.1/Makefile.in 2014-09-10 18:42:01.050348068 -0300
+@@ -3387,7 +3387,7 @@
+ check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
+ check: check-am
+-all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(MANS) $(DATA)
++all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(amdir)" "$(DESTDIR)$(automake_acdir)" "$(DESTDIR)$(automake_internal_acdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(pkgvdatadir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(system_acdir)" "$(DESTDIR)$(perllibdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+@@ -3454,7 +3454,7 @@
+ install-dist_automake_internal_acDATA install-dist_docDATA \
+ install-dist_perllibDATA install-dist_pkgvdataDATA \
+ install-dist_scriptDATA install-dist_system_acDATA \
+- install-info-am install-man install-nodist_perllibDATA
++ install-info-am install-nodist_perllibDATA
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-am
+
Modified: branches/1.0/package/automake/automake.mk
===================================================================
--- branches/1.0/package/automake/automake.mk 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/automake/automake.mk 2015-01-09 03:29:05 UTC (rev 6912)
@@ -3,16 +3,14 @@
# automake
#
#############################################################
-AUTOMAKE_VERSION = 1.11.1
-AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
+AUTOMAKE_VERSION = 1.15
+AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz
AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
-AUTOMAKE_DEPENDENCIES = host-autoconf autoconf perl
-
HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
define GTK_DOC_M4_INSTALL
- $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
+ $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
endef
# ensure staging aclocal dir exists
@@ -23,7 +21,6 @@
HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL
HOST_AUTOMAKE_POST_INSTALL_HOOKS += HOST_AUTOMAKE_MAKE_ACLOCAL
-$(eval $(call AUTOTARGETS,package,automake))
$(eval $(call AUTOTARGETS,package,automake,host))
# variables used by other packages
Modified: branches/1.0/package/automake/gtk-doc.m4
===================================================================
--- branches/1.0/package/automake/gtk-doc.m4 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/automake/gtk-doc.m4 2015-01-09 03:29:05 UTC (rev 6912)
@@ -1,16 +1,33 @@
dnl -*- mode: autoconf -*-
-# serial 1
+# serial 2
dnl Usage:
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
AC_DEFUN([GTK_DOC_CHECK],
[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
+ AC_MSG_CHECKING([for gtk-doc])
+ PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
+ AC_MSG_RESULT($have_gtk_doc)
+
+ if test "$have_gtk_doc" = "no"; then
+ AC_MSG_WARN([
+ You will not be able to create source packages with 'make dist'
+ because $gtk_doc_requires is not found.])
+ fi
+
dnl check for tools we added during development
- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+ dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
+ dnl may not be writable by the user. Currently, automake requires that the
+ dnl test name must end in '.test'.
+ dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
+ AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
+ AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
@@ -27,17 +44,22 @@
[use gtk-doc to build documentation [[default=no]]]),,
[enable_gtk_doc=no])
- if test x$enable_gtk_doc = xyes; then
- ifelse([$1],[],
- [PKG_CHECK_EXISTS([gtk-doc],,
- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
- fi
-
AC_MSG_CHECKING([whether to build gtk-doc documentation])
AC_MSG_RESULT($enable_gtk_doc)
+ if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+ AC_MSG_ERROR([
+ You must have $gtk_doc_requires installed to build documentation for
+ $PACKAGE_NAME. Please install gtk-doc or disable building the
+ documentation by adding '--disable-gtk-doc' to '[$]0'.])
+ fi
+
+ dnl don't check for glib if we build glib
+ if test "x$PACKAGE_NAME" != "xglib"; then
+ dnl don't fail if someone does not have glib
+ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:])
+ fi
+
dnl enable/disable output formats
AC_ARG_ENABLE([gtk-doc-html],
AS_HELP_STRING([--enable-gtk-doc-html],
@@ -52,7 +74,12 @@
enable_gtk_doc_pdf=no
fi
+ if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+ fi
+ AC_SUBST([AM_DEFAULT_VERBOSITY])
+ AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
Deleted: branches/1.0/package/buildroot-libtool-v2.4.2.patch
===================================================================
--- branches/1.0/package/buildroot-libtool-v2.4.2.patch 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/buildroot-libtool-v2.4.2.patch 2015-01-09 03:29:05 UTC (rev 6912)
@@ -1,47 +0,0 @@
---- a/autoconf/ltmain.sh.orig 2014-06-27 12:04:53.000000000 -0500
-+++ b/autoconf/ltmain.sh 2014-06-27 12:14:41.000000000 -0500
-@@ -2583,8 +2583,8 @@
- # was found and let the user know that the "--tag" command
- # line option must be used.
- if test -z "$tagname"; then
-- func_echo "unable to infer tagged configuration"
-- func_fatal_error "specify a tag with '--tag'"
-+ func_echo "defaulting to 'CC'"
-+ func_echo "if this is not correct, specify a tag with '--tag'"
- # else
- # func_verbose "using $tagname tagged configuration"
- fi
-@@ -4172,8 +4172,11 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- test "$inst_prefix_dir" = "$destdir" && \
-- func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # test "$inst_prefix_dir" = "$destdir" && \
-+ # func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
-@@ -7964,7 +7967,7 @@
- *)
- if test no = "$installed"; then
- func_append notinst_deplibs " $lib"
-- need_relink=yes
-+ need_relink=no
- fi
- ;;
- esac
-@@ -10554,6 +10557,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- func_basename "$deplib"
Added: branches/1.0/package/buildroot-libtool-v2.4.4.patch
===================================================================
--- branches/1.0/package/buildroot-libtool-v2.4.4.patch (rev 0)
+++ branches/1.0/package/buildroot-libtool-v2.4.4.patch 2015-01-09 03:29:05 UTC (rev 6912)
@@ -0,0 +1,96 @@
+Libtool fixes for cross-compilation, many past contributors/authors.
+Update based on libtool-2.4.4, useful for 2.4.3 as well but not 2.4.2.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+--- a/ltmain.sh 2014-12-16 09:51:23.068441045 -0300
++++ b/ltmain.sh 2014-12-16 09:57:10.509430339 -0300
+@@ -2687,8 +2687,8 @@
+ # was found and let the user know that the "--tag" command
+ # line option must be used.
+ if test -z "$tagname"; then
+- func_echo "unable to infer tagged configuration"
+- func_fatal_error "specify a tag with '--tag'"
++ func_echo "defaulting to \`CC'"
++ func_echo "if this is not correct, specify a tag with \`--tag'"
+ # else
+ # func_verbose "using $tagname tagged configuration"
+ fi
+@@ -4277,8 +4277,12 @@
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+- test "$inst_prefix_dir" = "$destdir" && \
+- func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
++
++ #
++ # This breaks install into our staging area. -PB
++ #
++ #test "$inst_prefix_dir" = "$destdir" && \
++ # func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+@@ -6550,7 +6554,8 @@
+ ;;
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+- -all-static)
++ # Make -static behave like -all-static -GZ
++ -all-static | -static)
+ if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
+ func_warning "complete static linking is impossible in this configuration"
+ fi
+@@ -6559,12 +6564,6 @@
+ fi
+ prefer_static_libs=yes
+ ;;
+- -static)
+- if test -z "$pic_flag" && test -n "$link_static_flag"; then
+- dlopen_self=$dlopen_self_static
+- fi
+- prefer_static_libs=built
+- ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+@@ -6858,7 +6857,8 @@
+ prevarg=$arg
+
+ case $arg in
+- -all-static)
++ # Make -static behave like -all-static -GZ
++ -all-static | -static)
+ if test -n "$link_static_flag"; then
+ # See comment for -static flag below, for more details.
+ func_append compile_command " $link_static_flag"
+@@ -7149,7 +7149,7 @@
+ continue
+ ;;
+
+- -static | -static-libtool-libs)
++ -static-libtool-libs)
+ # The effects of -static are defined in a previous loop.
+ # We used to do the same as -all-static on platforms that
+ # didn't have a PIC flag, but the assumption that the effects
+@@ -8112,7 +8112,7 @@
+ *)
+ if test no = "$installed"; then
+ func_append notinst_deplibs " $lib"
+- need_relink=yes
++ need_relink=no
+ fi
+ ;;
+ esac
+@@ -10710,6 +10710,10 @@
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
++ # Replacing uninstalled with installed can easily break crosscompilation,
++ # since the installed path is generally the wrong architecture. -CL
++ newdependency_libs="$newdependency_libs $deplib"
++ continue
+ case $deplib in
+ *.la)
+ func_basename "$deplib"
+
Modified: branches/1.0/package/buildroot-libtool-v2.4.patch
===================================================================
--- branches/1.0/package/buildroot-libtool-v2.4.patch 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/buildroot-libtool-v2.4.patch 2015-01-09 03:29:05 UTC (rev 6912)
@@ -1,6 +1,6 @@
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -1416,8 +1416,8 @@
+--- a/ltmain.sh 2014-07-30 22:21:24.664684143 +0200
++++ b/ltmain.sh 2014-07-30 22:23:02.440687625 +0200
+@@ -1417,8 +1417,8 @@
# was found and let the user know that the "--tag" command
# line option must be used.
if test -z "$tagname"; then
@@ -11,7 +11,7 @@
# else
# func_verbose "using $tagname tagged configuration"
fi
-@@ -2962,8 +2962,11 @@
+@@ -2963,8 +2963,11 @@
# At present, this check doesn't affect windows .dll's that
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
@@ -25,7 +25,49 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
-@@ -6683,7 +6686,7 @@
+@@ -5176,7 +5179,8 @@
+ ;;
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+- -all-static)
++ # Make -static behave like -all-static
++ -all-static | -static)
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ func_warning "complete static linking is impossible in this configuration"
+ fi
+@@ -5185,12 +5189,6 @@
+ fi
+ prefer_static_libs=yes
+ ;;
+- -static)
+- if test -z "$pic_flag" && test -n "$link_static_flag"; then
+- dlopen_self=$dlopen_self_static
+- fi
+- prefer_static_libs=built
+- ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+@@ -5473,7 +5471,8 @@
+ prevarg="$arg"
+
+ case $arg in
+- -all-static)
++ # Make -static behave like -all-static
++ -all-static | -static)
+ if test -n "$link_static_flag"; then
+ # See comment for -static flag below, for more details.
+ func_append compile_command " $link_static_flag"
+@@ -5754,7 +5753,7 @@
+ continue
+ ;;
+
+- -static | -static-libtool-libs)
++ -static-libtool-libs)
+ # The effects of -static are defined in a previous loop.
+ # We used to do the same as -all-static on platforms that
+ # didn't have a PIC flag, but the assumption that the effects
+@@ -6697,7 +6696,7 @@
*)
if test "$installed" = no; then
func_append notinst_deplibs " $lib"
@@ -34,7 +76,7 @@
fi
;;
esac
-@@ -9257,6 +9260,10 @@
+@@ -9275,6 +9274,10 @@
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
@@ -45,3 +87,4 @@
case $deplib in
*.la)
func_basename "$deplib"
+
Modified: branches/1.0/package/libtool/libtool.mk
===================================================================
--- branches/1.0/package/libtool/libtool.mk 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/libtool/libtool.mk 2015-01-09 03:29:05 UTC (rev 6912)
@@ -3,13 +3,35 @@
# libtool
#
#############################################################
-LIBTOOL_VERSION = 2.2.10
-LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
+LIBTOOL_VERSION = 2.4.4
+LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.xz
LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
LIBTOOL_INSTALL_STAGING = YES
+LIBTOOL_CONF_ENV = HELP2MAN=true
+LIBTOOL_DEPENDENCIES = host-m4
HOST_LIBTOOL_LIBTOOL_PATCH = NO
+# We have a patch that affects libtool.m4, which triggers an autoreconf
+# in the build step. Normally we would set AUTORECONF = YES, but this
+# doesn't work for host-libtool because that creates a circular
+# dependency. Instead, touch the generated files so autoreconf is not
+# triggered in the build step. Note that aclocal.m4 has to be touched
+# first since the rest depends on it. Note that we don't need the changes
+# in libtool.m4 in our configure script, because we're not actually
+# running it on the target.
+# For the target, we would normally be able to use AUTORECONF, but it
+# fails on libltdl/Makefile.inc. Rather than trying to fix that failure,
+# just use the same hack as on the host.
+define LIBTOOL_AVOID_AUTORECONF_HOOK
+ find $(@D) -name aclocal.m4 -exec touch '{}' \;
+ find $(@D) -name config-h.in -exec touch '{}' \;
+ find $(@D) -name configure -exec touch '{}' \;
+ find $(@D) -name Makefile.in -exec touch '{}' \;
+endef
+LIBTOOL_PRE_CONFIGURE_HOOKS += LIBTOOL_AVOID_AUTORECONF_HOOK
+HOST_LIBTOOL_PRE_CONFIGURE_HOOKS += LIBTOOL_AVOID_AUTORECONF_HOOK
+
define LIBTOOL_INSTALL_TARGET_CMDS
cp -a $(STAGING_DIR)/usr/lib/libltdl.*so* $(TARGET_DIR)/usr/lib/
endef
Added: branches/1.0/package/libxml2/libxml2-config.cmake.in-update-include-directories.patch
===================================================================
--- branches/1.0/package/libxml2/libxml2-config.cmake.in-update-include-directories.patch (rev 0)
+++ branches/1.0/package/libxml2/libxml2-config.cmake.in-update-include-directories.patch 2015-01-09 03:29:05 UTC (rev 6912)
@@ -0,0 +1,28 @@
+From dd6125f4b58fe7bc270e51bc3fcf41cd228d22fc Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.m...@gm...>
+Date: Mon, 29 Dec 2014 20:40:18 +0100
+Subject: [PATCH] libxml2-config.cmake.in: update include directories
+
+Align the include directories on those from the pkg-config module.
+
+Signed-off-by: Samuel Martin <s.m...@gm...>
+---
+ libxml2-config.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in
+index ac29329..6b16fc2 100644
+--- a/libxml2-config.cmake.in
++++ b/libxml2-config.cmake.in
+@@ -21,7 +21,7 @@ set(LIBXML2_VERSION_MINOR @LIBXML_MINOR_VERSION@)
+ set(LIBXML2_VERSION_MICRO @LIBXML_MICRO_VERSION@)
+ set(LIBXML2_VERSION_STRING "@VERSION@")
+ set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir})
+-set(LIBXML2_INCLUDE_DIRS ${_libxml2_rootdir}/include)
++set(LIBXML2_INCLUDE_DIRS ${_libxml2_rootdir}/include ${_libxml2_rootdir}/include/libxml2)
+ set(LIBXML2_LIBRARY_DIR ${_libxml2_rootdir}/lib)
+ set(LIBXML2_LIBRARIES -L${LIBXML2_LIBRARY_DIR} -lxml2)
+
+--
+2.2.1
+
Modified: branches/1.0/package/libxml2/libxml2.mk
===================================================================
--- branches/1.0/package/libxml2/libxml2.mk 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/libxml2/libxml2.mk 2015-01-09 03:29:05 UTC (rev 6912)
@@ -12,19 +12,18 @@
LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
endif
-LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug
+LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug --without-lzma
define LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
- ln -snf $(STAGING_DIR)/usr/include/libxml2/libxml $(STAGING_DIR)/usr/include/libxml
endef
LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
HOST_LIBXML2_DEPENDENCIES = host-pkg-config
LIBXML2_DEPENDENCIES = host-pkg-config
-HOST_LIBXML2_CONF_OPT = --without-debug --without-python
+HOST_LIBXML2_CONF_OPT = --without-zlib --without-lzma --without-debug --without-python
ifneq ($(BR2_HAVE_DEVFILES),y)
define LIBXML2_REMOVE_CONFIG_SCRIPTS
Modified: branches/1.0/package/lzo/lzo.mk
===================================================================
--- branches/1.0/package/lzo/lzo.mk 2015-01-06 16:49:55 UTC (rev 6911)
+++ branches/1.0/package/lzo/lzo.mk 2015-01-09 03:29:05 UTC (rev 6912)
@@ -7,13 +7,10 @@
LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
LZO_INSTALL_STAGING = YES
-# Manually patch libtool
-LZO_LIBTOOL_PATCH = NO
-define LZO_LIBTOOL_PATCH_2.4.2
- @echo "Patching libtool 2.4.2"
- toolchain/patch-kernel.sh $(@D) package buildroot-libtool-v2.4.2.patch
-endef
-LZO_POST_PATCH_HOOKS += LZO_LIBTOOL_PATCH_2.4.2
+# Ships a beta libtool version hence our patch doesn't apply.
+# Run autoreconf to regenerate ltmain.sh.
+LZO_AUTORECONF = YES
+HOST_LZO_AUTORECONF = YES
$(eval $(call AUTOTARGETS,package,lzo))
$(eval $(call AUTOTARGETS,package,lzo,host))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-24 01:21:54
|
Revision: 6937
http://sourceforge.net/p/astlinux/code/6937
Author: abelbeck
Date: 2015-01-24 01:21:51 +0000 (Sat, 24 Jan 2015)
Log Message:
-----------
build system, use host-bison instead of the native bison
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/at/at.mk
branches/1.0/package/bash/bash.mk
branches/1.0/package/bc/bc.mk
branches/1.0/package/e2fsprogs/e2fsprogs.mk
branches/1.0/package/fbset/fbset.mk
branches/1.0/package/gob2/gob2.mk
branches/1.0/package/iproute2/iproute2.mk
branches/1.0/package/ipsec-tools/ipsec-tools.mk
branches/1.0/package/libical/libical.mk
branches/1.0/package/libpcap/libpcap.mk
branches/1.0/package/linux-atm/linux-atm.mk
branches/1.0/package/lm-sensors/lm-sensors.mk
branches/1.0/package/monit/monit.mk
branches/1.0/package/mrouted/mrouted.mk
branches/1.0/package/multimedia/gstreamer/gstreamer.mk
branches/1.0/package/ntp/ntp.mk
branches/1.0/package/olsr/olsr.mk
branches/1.0/package/radvd/radvd.mk
branches/1.0/package/unixodbc/unixodbc.mk
branches/1.0/package/vtun/vtun.mk
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -217,8 +217,8 @@
touch $@
-$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | host-pkg-config host-ncurses host-flex libelf ncurses zlib \
- openssl libtool util-linux $(ASTERISK_EXTRAS)
+$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | host-pkg-config host-ncurses host-bison host-flex \
+ libelf ncurses zlib openssl libtool util-linux $(ASTERISK_EXTRAS)
(cd $(ASTERISK_DIR); rm -rf config.cache configure; \
./bootstrap.sh; \
$(TARGET_CONFIGURE_OPTS) \
Modified: branches/1.0/package/at/at.mk
===================================================================
--- branches/1.0/package/at/at.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/at/at.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -12,7 +12,7 @@
AT_INSTALL_STAGING = NO
AT_INSTALL_TARGET = YES
-AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex)
+AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex
AT_CONF_OPT = \
--with-jobdir=/var/spool/cron/atjobs \
Modified: branches/1.0/package/bash/bash.mk
===================================================================
--- branches/1.0/package/bash/bash.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/bash/bash.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -6,7 +6,7 @@
BASH_VERSION = 4.1
BASH_SITE = $(BR2_GNU_MIRROR)/bash
-BASH_DEPENDENCIES = ncurses
+BASH_DEPENDENCIES = ncurses host-bison
BASH_CONF_ENV += \
bash_cv_job_control_missing=present \
bash_cv_sys_named_pipes=present \
Modified: branches/1.0/package/bc/bc.mk
===================================================================
--- branches/1.0/package/bc/bc.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/bc/bc.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -7,7 +7,7 @@
BC_VERSION = 1.06
BC_SOURCE:=bc-$(BC_VERSION).tar.gz
BC_SITE = http://ftp.gnu.org/gnu/bc
-BC_DEPENDENCIES = host-flex
+BC_DEPENDENCIES = host-bison host-flex
define BC_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/bc/bc $(TARGET_DIR)/usr/bin/bc
Modified: branches/1.0/package/e2fsprogs/e2fsprogs.mk
===================================================================
--- branches/1.0/package/e2fsprogs/e2fsprogs.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/e2fsprogs/e2fsprogs.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -23,14 +23,16 @@
--disable-testio-debug \
--disable-rpath
-E2FSPROGS_DEPENDENCIES = host-pkg-config util-linux
+E2FSPROGS_DEPENDENCIES = host-bison host-pkg-config util-linux
E2FSPROGS_MAKE_OPT = \
LDCONFIG=true
define HOST_E2FSPROGS_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
endef
+# we don't have a host-util-linux
+HOST_E2FSPROGS_DEPENDENCIES = host-bison host-pkg-config
# binaries to keep or remove
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks
Modified: branches/1.0/package/fbset/fbset.mk
===================================================================
--- branches/1.0/package/fbset/fbset.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/fbset/fbset.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -7,6 +7,7 @@
FBSET_VERSION = 2.1
FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz
FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
+FBSET_DEPENDENCIES = host-bison host-flex
# Make sure full fbset wins over busybox fbset
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
Modified: branches/1.0/package/gob2/gob2.mk
===================================================================
--- branches/1.0/package/gob2/gob2.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/gob2/gob2.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -10,7 +10,7 @@
GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex
-HOST_GOB2_DEPENDENCIES = host-libglib2
+HOST_GOB2_DEPENDENCIES = host-bison host-flex host-libglib2
$(eval $(call AUTOTARGETS,package,gob2))
$(eval $(call AUTOTARGETS,package,gob2,host))
Modified: branches/1.0/package/iproute2/iproute2.mk
===================================================================
--- branches/1.0/package/iproute2/iproute2.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/iproute2/iproute2.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -9,6 +9,8 @@
IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
+IPROUTE2_DEPENDENCIES += host-bison
+
# If both iproute2 and busybox are selected, make certain we win
# the fight over who gets to have their utils actually installed.
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
@@ -37,11 +39,12 @@
define IPROUTE2_BUILD_CMDS
$(SED) 's/$$(CCOPTS)//' $(@D)/netem/Makefile
- $(MAKE) CC="$(TARGET_CC)" CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D)
+ $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D)
endef
define IPROUTE2_INSTALL_TARGET_CMDS
- $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" SBINDIR=/sbin \
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" \
+ SBINDIR=/sbin \
DOCDIR=/usr/share/doc/iproute2-$(IPROUTE2_VERSION) \
MANDIR=/usr/share/man install
# Wants bash
Modified: branches/1.0/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- branches/1.0/package/ipsec-tools/ipsec-tools.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/ipsec-tools/ipsec-tools.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -9,7 +9,7 @@
IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.8/
IPSEC_TOOLS_INSTALL_STAGING = YES
IPSEC_TOOLS_MAKE = $(MAKE1)
-IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
+IPSEC_TOOLS_DEPENDENCIES = openssl host-bison flex host-flex
# configure hardcodes -Werror, so override CFLAGS on make invocation
IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)'
Modified: branches/1.0/package/libical/libical.mk
===================================================================
--- branches/1.0/package/libical/libical.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/libical/libical.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -8,6 +8,7 @@
#LIBICAL_SITE = http://downloads.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION)
LIBICAL_VERSION = r1139
LIBICAL_SITE = http://files.astlinux.org
+LIBICAL_DEPENDENCIES = host-bison host-flex
LIBICAL_INSTALL_STAGING = YES
LIBICAL_AUTORECONF = YES
Modified: branches/1.0/package/libpcap/libpcap.mk
===================================================================
--- branches/1.0/package/libpcap/libpcap.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/libpcap/libpcap.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -8,7 +8,7 @@
LIBPCAP_SITE = http://www.tcpdump.org/release
LIBPCAP_SOURCE = libpcap-$(LIBPCAP_VERSION).tar.gz
LIBPCAP_INSTALL_STAGING = YES
-LIBPCAP_DEPENDENCIES = zlib
+LIBPCAP_DEPENDENCIES = zlib host-flex host-bison
# We're patching configure.in
LIBPCAP_AUTORECONF = YES
Modified: branches/1.0/package/linux-atm/linux-atm.mk
===================================================================
--- branches/1.0/package/linux-atm/linux-atm.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/linux-atm/linux-atm.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -6,8 +6,8 @@
LINUX_ATM_VERSION = 2.5.2
LINUX_ATM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/linux-atm/linux-atm/$(LINUX_ATM_VERSION)
LINUX_ATM_SOURCE = linux-atm-$(LINUX_ATM_VERSION).tar.gz
+LINUX_ATM_DEPENDENCIES = host-bison host-flex
LINUX_ATM_INSTALL_STAGING = YES
-LINUX_ATM_INSTALL_TARGET = YES
LINUX_ATM_CONF_OPT = \
--program-transform-name=''
Modified: branches/1.0/package/lm-sensors/lm-sensors.mk
===================================================================
--- branches/1.0/package/lm-sensors/lm-sensors.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/lm-sensors/lm-sensors.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -7,6 +7,7 @@
LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
LM_SENSORS_INSTALL_STAGING = YES
+LM_SENSORS_DEPENDENCIES = host-bison host-flex
LM_SENSORS_BINS_ = bin/sensors-conf-convert
LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS) += bin/sensors
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/monit/monit.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -6,6 +6,7 @@
MONIT_VERSION = 5.11
MONIT_SITE = http://mmonit.com/monit/dist
+MONIT_DEPENDENCIES = host-bison host-flex
#
# Touching Makefile.am:
MONIT_AUTORECONF = YES
Modified: branches/1.0/package/mrouted/mrouted.mk
===================================================================
--- branches/1.0/package/mrouted/mrouted.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/mrouted/mrouted.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -7,6 +7,7 @@
MROUTED_VERSION = 3.9.4
MROUTED_SOURCE = mrouted-$(MROUTED_VERSION).tar.bz2
MROUTED_SITE = http://ftp.vmlinux.org/pub/People/jocke/mrouted
+MROUTED_DEPENDENCIES = host-bison
define MROUTED_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
Modified: branches/1.0/package/multimedia/gstreamer/gstreamer.mk
===================================================================
--- branches/1.0/package/multimedia/gstreamer/gstreamer.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/multimedia/gstreamer/gstreamer.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -21,6 +21,6 @@
--disable-failing-tests \
--disable-loadsave
-GSTREAMER_DEPENDENCIES = libglib2 host-pkg-config
+GSTREAMER_DEPENDENCIES = libglib2 host-pkg-config host-bison host-flex
$(eval $(call AUTOTARGETS,package/multimedia,gstreamer))
Modified: branches/1.0/package/ntp/ntp.mk
===================================================================
--- branches/1.0/package/ntp/ntp.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/ntp/ntp.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -6,6 +6,7 @@
NTP_VERSION = 4.2.8
NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
+NTP_DEPENDENCIES = host-bison host-flex host-pkg-config
NTP_CONF_OPT = --with-shared \
--program-transform-name=s,,, \
Modified: branches/1.0/package/olsr/olsr.mk
===================================================================
--- branches/1.0/package/olsr/olsr.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/olsr/olsr.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -14,6 +14,7 @@
#OLSR_PLUGINS=httpinfo tas dot_draw nameservice dyn_gw dyn_gw_plain pgraph bmf quagga secure
OLSR_PLUGINS=dot_draw dyn_gw secure
OLSR_TARGET_PLUGIN=usr/lib/
+OLSR_DEPENDENCIES = host-flex host-bison
define OLSR_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd $(OLSR_PLUGINS)
Modified: branches/1.0/package/radvd/radvd.mk
===================================================================
--- branches/1.0/package/radvd/radvd.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/radvd/radvd.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -6,7 +6,7 @@
RADVD_VERSION = 2.8
RADVD_SOURCE = radvd-$(RADVD_VERSION).tar.gz
RADVD_SITE = http://www.litech.org/radvd/dist/
-RADVD_DEPENDENCIES:=flex host-flex host-pkg-config
+RADVD_DEPENDENCIES = host-bison flex host-flex host-pkg-config
# For radvd-drop-check.patch
RADVD_AUTORECONF = YES
Modified: branches/1.0/package/unixodbc/unixodbc.mk
===================================================================
--- branches/1.0/package/unixodbc/unixodbc.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/unixodbc/unixodbc.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -6,7 +6,7 @@
UNIXODBC_VERSION = 2.3.2
UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz
UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC
-UNIXODBC_DEPENDENCIES = libtool
+UNIXODBC_DEPENDENCIES = host-bison host-flex libtool
UNIXODBC_INSTALL_STAGING = YES
Modified: branches/1.0/package/vtun/vtun.mk
===================================================================
--- branches/1.0/package/vtun/vtun.mk 2015-01-23 22:25:06 UTC (rev 6936)
+++ branches/1.0/package/vtun/vtun.mk 2015-01-24 01:21:51 UTC (rev 6937)
@@ -9,7 +9,7 @@
VTUN_VERSION:=3.0.2
VTUN_SOURCE:=vtun-$(VTUN_VERSION).tar.gz
VTUN_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/vtun/
-VTUN_DEPENDENCIES = zlib lzo openssl
+VTUN_DEPENDENCIES = host-bison host-flex zlib lzo openssl
VTUN_CONF_OPT = \
--with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-25 20:21:30
|
Revision: 6939
http://sourceforge.net/p/astlinux/code/6939
Author: abelbeck
Date: 2015-01-25 20:21:20 +0000 (Sun, 25 Jan 2015)
Log Message:
-----------
libsodium, version bump to 1.0.2, and related increase the dnscrypt-proxy 'max-active-requests' to 520
Modified Paths:
--------------
branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
branches/1.0/package/libsodium/libsodium.mk
Modified: branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
===================================================================
--- branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init 2015-01-24 01:23:23 UTC (rev 6938)
+++ branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init 2015-01-25 20:21:20 UTC (rev 6939)
@@ -18,7 +18,7 @@
name="${DNSCRYPT_PROVIDER_NAME:-2.dnscrypt-cert.opendns.com}"
key="${DNSCRYPT_PROVIDER_KEY:-B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79}"
- dnscrypt-proxy -d --local-address 127.0.0.1:2053 -n 128 -m ${DNSCRYPT_VERBOSITY:-5} -p $PIDFILE \
+ dnscrypt-proxy -d --local-address 127.0.0.1:2053 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PIDFILE \
--resolver-address "$address" --provider-name "$name" --provider-key "$key"
fi
}
Modified: branches/1.0/package/libsodium/libsodium.mk
===================================================================
--- branches/1.0/package/libsodium/libsodium.mk 2015-01-24 01:23:23 UTC (rev 6938)
+++ branches/1.0/package/libsodium/libsodium.mk 2015-01-25 20:21:20 UTC (rev 6939)
@@ -3,7 +3,7 @@
# libsodium
#
#############################################################
-LIBSODIUM_VERSION = 1.0.1
+LIBSODIUM_VERSION = 1.0.2
LIBSODIUM_SOURCE = libsodium-$(LIBSODIUM_VERSION).tar.gz
LIBSODIUM_SITE = http://download.dnscrypt.org/libsodium/releases
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-03-15 15:30:22
|
Revision: 7007
http://sourceforge.net/p/astlinux/code/7007
Author: abelbeck
Date: 2015-03-15 15:30:20 +0000 (Sun, 15 Mar 2015)
Log Message:
-----------
libpcap / tcpdump version bumps to 1.7.2 / 4.7.3
Modified Paths:
--------------
branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch
branches/1.0/package/libpcap/libpcap.mk
branches/1.0/package/tcpdump/tcpdump.mk
Modified: branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch
===================================================================
--- branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch 2015-03-15 14:19:23 UTC (rev 7006)
+++ branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch 2015-03-15 15:30:20 UTC (rev 7007)
@@ -1,16 +1,25 @@
Remove hardcoded path to libnl3 include directory
Signed-off-by: Thomas Petazzoni <tho...@fr...>
+[Gustavo: update for 1.7.2]
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -445,7 +445,6 @@
+diff -Nura libpcap-1.7.2.orig/configure.in libpcap-1.7.2/configure.in
+--- libpcap-1.7.2.orig/configure.in 2015-03-14 08:02:05.538706347 -0300
++++ libpcap-1.7.2/configure.in 2015-03-14 08:17:22.637519050 -0300
+@@ -461,14 +461,13 @@
+ #
+ # Yes, we have libnl 3.x.
+ #
+- LIBS="${libnldir} -lnl-genl-3 -lnl-3 $LIBS"
++ LIBS="-lnl-genl-3 -lnl-3 $LIBS"
+ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
-- V_INCLS="$V_INCLS -I/usr/include/libnl3"
+- V_INCLS="$V_INCLS ${incdir}"
have_any_nl="yes"
- ])
+- ],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
++ ],[], -lnl-genl-3 -lnl-3 )
+ if test x$have_any_nl = xno ; then
+ #
Modified: branches/1.0/package/libpcap/libpcap.mk
===================================================================
--- branches/1.0/package/libpcap/libpcap.mk 2015-03-15 14:19:23 UTC (rev 7006)
+++ branches/1.0/package/libpcap/libpcap.mk 2015-03-15 15:30:20 UTC (rev 7007)
@@ -4,7 +4,7 @@
#
#############################################################
-LIBPCAP_VERSION = 1.6.2
+LIBPCAP_VERSION = 1.7.2
LIBPCAP_SITE = http://www.tcpdump.org/release
LIBPCAP_SOURCE = libpcap-$(LIBPCAP_VERSION).tar.gz
LIBPCAP_INSTALL_STAGING = YES
@@ -12,12 +12,19 @@
# We're patching configure.in
LIBPCAP_AUTORECONF = YES
-LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
- ac_cv_header_linux_wireless_h=yes \
- CFLAGS="$(LIBPCAP_CFLAGS)"
+LIBPCAP_CONF_ENV = \
+ ac_cv_linux_vers=2 \
+ ac_cv_header_linux_wireless_h=yes \
+ CFLAGS="$(LIBPCAP_CFLAGS)"
LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
+# Omit -rpath from pcap-config output
+define LIBPCAP_CONFIG_REMOVE_RPATH
+ $(SED) 's/^V_RPATH_OPT=.*/V_RPATH_OPT=""/g' $(@D)/pcap-config
+endef
+LIBPCAP_POST_BUILD_HOOKS = LIBPCAP_CONFIG_REMOVE_RPATH
+
# On purpose, not compatible with bluez5
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
LIBPCAP_DEPENDENCIES += bluez_utils
Modified: branches/1.0/package/tcpdump/tcpdump.mk
===================================================================
--- branches/1.0/package/tcpdump/tcpdump.mk 2015-03-15 14:19:23 UTC (rev 7006)
+++ branches/1.0/package/tcpdump/tcpdump.mk 2015-03-15 15:30:20 UTC (rev 7007)
@@ -3,16 +3,19 @@
# tcpdump
#
#############################################################
-# Copyright (C) 2001-2003 by Erik Andersen <and...@co...>
-# Copyright (C) 2002 by Tim Riker <Ti...@Ri...>
-TCPDUMP_VERSION = 4.6.2
+TCPDUMP_VERSION = 4.7.3
TCPDUMP_SITE = http://www.tcpdump.org/release
TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
-TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no
-TCPDUMP_CONF_OPT = --without-crypto \
- $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
+TCPDUMP_CONF_ENV = \
+ ac_cv_linux_vers=2 \
+ td_cv_buggygetaddrinfo=no \
+ PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
+TCPDUMP_CONF_OPT = \
+ --without-crypto \
+ --with-system-libpcap \
+ $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
TCPDUMP_DEPENDENCIES = zlib libpcap
# make install installs an unneeded extra copy of the tcpdump binary
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-04-15 20:36:05
|
Revision: 7037
http://sourceforge.net/p/astlinux/code/7037
Author: abelbeck
Date: 2015-04-15 20:36:03 +0000 (Wed, 15 Apr 2015)
Log Message:
-----------
sqlite / sqliteodbc, version bumps to 3.8.9 / 0.9992
Modified Paths:
--------------
branches/1.0/package/sqlite/sqlite.mk
branches/1.0/package/sqliteodbc/sqliteodbc.mk
Removed Paths:
-------------
branches/1.0/package/sqliteodbc/sqliteodbc-upstream-xml2-config.patch
Modified: branches/1.0/package/sqlite/sqlite.mk
===================================================================
--- branches/1.0/package/sqlite/sqlite.mk 2015-04-10 15:11:00 UTC (rev 7036)
+++ branches/1.0/package/sqlite/sqlite.mk 2015-04-15 20:36:03 UTC (rev 7037)
@@ -4,18 +4,15 @@
#
#############################################################
-SQLITE_VERSION = 3080704
+SQLITE_VERSION = 3080900
SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
-SQLITE_SITE = http://www.sqlite.org/2014
+SQLITE_SITE = http://www.sqlite.org/2015
SQLITE_INSTALL_STAGING = YES
-ifneq ($(BR2_LARGEFILE),y)
-# the sqlite configure script fails to define SQLITE_DISABLE_LFS when
-# --disable-largefile is passed, breaking the build. Work around it by
-# simply adding it to CFLAGS for configure instead
-SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DSQLITE_DISABLE_LFS"
-endif
+SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA
+SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
+
SQLITE_CONF_OPT = \
--enable-threadsafe \
--localstatedir=/var
Deleted: branches/1.0/package/sqliteodbc/sqliteodbc-upstream-xml2-config.patch
===================================================================
--- branches/1.0/package/sqliteodbc/sqliteodbc-upstream-xml2-config.patch 2015-04-10 15:11:00 UTC (rev 7036)
+++ branches/1.0/package/sqliteodbc/sqliteodbc-upstream-xml2-config.patch 2015-04-15 20:36:03 UTC (rev 7037)
@@ -1,220 +0,0 @@
---- sqliteodbc-0.9991/sqliteodbc-0.9991/configure.orig 2014-07-21 01:27:18.000000000 -0500
-+++ sqliteodbc-0.9991/sqliteodbc-0.9991/configure 2015-01-12 10:12:43.000000000 -0600
-@@ -921,6 +921,7 @@
- with_sqlite
- with_sqlite3
- with_sqlite4
-+with_libxml2
- with_odbc
- enable_winterface
- with_dls
-@@ -1573,6 +1574,7 @@
- --with-sqlite=DIR use SQLite header/lib from DIR
- --with-sqlite3=DIR use SQLite3 hdr/lib from DIR
- --with-sqlite4=DIR use SQLite4 hdr/src from DIR
-+ --with-libxml2=SCR use xml2-config script SCR
- --with-odbc=DIR use ODBC header/libs from DIR
- --with-dls dlopen SQLite3/SQLite4 lib
-
-@@ -3691,13 +3693,13 @@
- else
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:3694: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:3696: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:3697: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:3699: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:3700: output\"" >&5)
-+ (eval echo "\"\$as_me:3702: output\"" >&5)
- cat conftest.out >&5
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
-@@ -4903,7 +4905,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 4906 "configure"' > conftest.$ac_ext
-+ echo '#line 4908 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -6760,11 +6762,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:6763: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:6765: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:6767: \$? = $ac_status" >&5
-+ echo "$as_me:6769: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -7099,11 +7101,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7102: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7104: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7106: \$? = $ac_status" >&5
-+ echo "$as_me:7108: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -7204,11 +7206,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7207: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7209: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:7211: \$? = $ac_status" >&5
-+ echo "$as_me:7213: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -7259,11 +7261,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7262: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7264: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:7266: \$? = $ac_status" >&5
-+ echo "$as_me:7268: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -10062,7 +10064,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 10065 "configure"
-+#line 10067 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10158,7 +10160,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 10161 "configure"
-+#line 10163 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -12306,23 +12308,43 @@
-
- #########
- # libxml2 support for XPath virtual table module
-+
-+# Check whether --with-libxml2 was given.
-+if test "${with_libxml2+set}" = set; then
-+ withval=$with_libxml2; XML2_CONFIG=$withval
-+fi
-+
- XML2_FLAGS=""
- XML2_LIBS=""
- EXT_XPATH=""
- if test "$SQLITE3_LOADEXTENSION" = "1" ; then
-- { $as_echo "$as_me:$LINENO: checking for libxml2 header and library" >&5
-+ if test "$with_libxml2" = "no" ; then
-+ XML2_CONFIG=""
-+ else
-+ { $as_echo "$as_me:$LINENO: checking for libxml2 header and library" >&5
- $as_echo_n "checking for libxml2 header and library... " >&6; }
-- XML2_CONFIG="`which xml2-config 2>/dev/null`"
-- if test -n "$XML2_CONFIG" ; then
-- XML2_FLAGS="`xml2-config --cflags`"
-- XML2_LIBS="`xml2-config --libs`"
-- EXT_XPATH=libsqlite3_mod_xpath.la
-- LIB_TARGETS="$LIB_TARGETS $EXT_XPATH"
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ if test "$with_libxml2" != "no" ; then
-+ if test -z "$XML2_CONFIG" ; then
-+ XML2_CONFIG=`which xml2-config 2>/dev/null`
-+ fi
-+ fi
-+ xml2_err1=1
-+ xml2_err2=1
-+ if test -n "$XML2_CONFIG" ; then
-+ XML2_FLAGS="`$XML2_CONFIG --cflags 2>/dev/null`"
-+ xml2_err1=$?
-+ XML2_LIBS="`$XML2_CONFIG --libs 2>/dev/null`"
-+ xml2_err2=$?
-+ fi
-+ if test $xml2_err1 -eq 0 -a $xml2_err2 -eq 0 ; then
-+ EXT_XPATH=libsqlite3_mod_xpath.la
-+ LIB_TARGETS="$LIB_TARGETS $EXT_XPATH"
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
-+ fi
- fi
- fi
-
---- sqliteodbc-0.9991/sqliteodbc-0.9991/configure.in.orig 2014-07-21 01:23:45.000000000 -0500
-+++ sqliteodbc-0.9991/sqliteodbc-0.9991/configure.in 2015-01-12 10:12:43.000000000 -0600
-@@ -336,20 +336,36 @@
-
- #########
- # libxml2 support for XPath virtual table module
-+AC_ARG_WITH(libxml2, [ --with-libxml2=SCR use xml2-config script SCR],
-+ XML2_CONFIG=$withval)
- XML2_FLAGS=""
- XML2_LIBS=""
- EXT_XPATH=""
- if test "$SQLITE3_LOADEXTENSION" = "1" ; then
-- AC_MSG_CHECKING([for libxml2 header and library])
-- XML2_CONFIG="`which xml2-config 2>/dev/null`"
-- if test -n "$XML2_CONFIG" ; then
-- XML2_FLAGS="`xml2-config --cflags`"
-- XML2_LIBS="`xml2-config --libs`"
-- EXT_XPATH=libsqlite3_mod_xpath.la
-- LIB_TARGETS="$LIB_TARGETS $EXT_XPATH"
-- AC_MSG_RESULT(yes)
-+ if test "$with_libxml2" = "no" ; then
-+ XML2_CONFIG=""
- else
-- AC_MSG_RESULT(no)
-+ AC_MSG_CHECKING([for libxml2 header and library])
-+ if test "$with_libxml2" != "no" ; then
-+ if test -z "$XML2_CONFIG" ; then
-+ XML2_CONFIG=`which xml2-config 2>/dev/null`
-+ fi
-+ fi
-+ xml2_err1=1
-+ xml2_err2=1
-+ if test -n "$XML2_CONFIG" ; then
-+ XML2_FLAGS="`$XML2_CONFIG --cflags 2>/dev/null`"
-+ xml2_err1=$?
-+ XML2_LIBS="`$XML2_CONFIG --libs 2>/dev/null`"
-+ xml2_err2=$?
-+ fi
-+ if test $xml2_err1 -eq 0 -a $xml2_err2 -eq 0 ; then
-+ EXT_XPATH=libsqlite3_mod_xpath.la
-+ LIB_TARGETS="$LIB_TARGETS $EXT_XPATH"
-+ AC_MSG_RESULT(yes)
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
- fi
- fi
- AC_SUBST(XML2_FLAGS)
Modified: branches/1.0/package/sqliteodbc/sqliteodbc.mk
===================================================================
--- branches/1.0/package/sqliteodbc/sqliteodbc.mk 2015-04-10 15:11:00 UTC (rev 7036)
+++ branches/1.0/package/sqliteodbc/sqliteodbc.mk 2015-04-15 20:36:03 UTC (rev 7037)
@@ -3,7 +3,7 @@
# sqliteodbc
#
#############################################################
-SQLITEODBC_VERSION = 0.9991
+SQLITEODBC_VERSION = 0.9992
SQLITEODBC_SOURCE = sqliteodbc-$(SQLITEODBC_VERSION).tar.gz
SQLITEODBC_SITE = http://www.ch-werner.de/sqliteodbc
SQLITEODBC_SUBDIR = sqliteodbc-$(SQLITEODBC_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-05-25 22:38:53
|
Revision: 7078
http://sourceforge.net/p/astlinux/code/7078
Author: abelbeck
Date: 2015-05-25 22:38:50 +0000 (Mon, 25 May 2015)
Log Message:
-----------
libpcap / tcpdump version bumps to 1.7.3 / 4.7.4
Modified Paths:
--------------
branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch
branches/1.0/package/libpcap/libpcap.mk
branches/1.0/package/tcpdump/tcpdump.mk
Modified: branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch
===================================================================
--- branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch 2015-05-25 22:14:08 UTC (rev 7077)
+++ branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch 2015-05-25 22:38:50 UTC (rev 7078)
@@ -6,7 +6,7 @@
diff -Nura libpcap-1.7.2.orig/configure.in libpcap-1.7.2/configure.in
--- libpcap-1.7.2.orig/configure.in 2015-03-14 08:02:05.538706347 -0300
+++ libpcap-1.7.2/configure.in 2015-03-14 08:17:22.637519050 -0300
-@@ -461,14 +461,13 @@
+@@ -471,14 +471,13 @@
#
# Yes, we have libnl 3.x.
#
Modified: branches/1.0/package/libpcap/libpcap.mk
===================================================================
--- branches/1.0/package/libpcap/libpcap.mk 2015-05-25 22:14:08 UTC (rev 7077)
+++ branches/1.0/package/libpcap/libpcap.mk 2015-05-25 22:38:50 UTC (rev 7078)
@@ -4,7 +4,7 @@
#
#############################################################
-LIBPCAP_VERSION = 1.7.2
+LIBPCAP_VERSION = 1.7.3
LIBPCAP_SITE = http://www.tcpdump.org/release
LIBPCAP_SOURCE = libpcap-$(LIBPCAP_VERSION).tar.gz
LIBPCAP_INSTALL_STAGING = YES
Modified: branches/1.0/package/tcpdump/tcpdump.mk
===================================================================
--- branches/1.0/package/tcpdump/tcpdump.mk 2015-05-25 22:14:08 UTC (rev 7077)
+++ branches/1.0/package/tcpdump/tcpdump.mk 2015-05-25 22:38:50 UTC (rev 7078)
@@ -4,7 +4,7 @@
#
#############################################################
-TCPDUMP_VERSION = 4.7.3
+TCPDUMP_VERSION = 4.7.4
TCPDUMP_SITE = http://www.tcpdump.org/release
TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-06-15 16:21:47
|
Revision: 7117
http://sourceforge.net/p/astlinux/code/7117
Author: abelbeck
Date: 2015-06-15 16:21:45 +0000 (Mon, 15 Jun 2015)
Log Message:
-----------
zoneinfo, version bump to 2015e, php timezonedb 2015.5
Modified Paths:
--------------
branches/1.0/package/php/php.mk
branches/1.0/package/zoneinfo/zoneinfo.mk
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2015-06-13 01:35:51 UTC (rev 7116)
+++ branches/1.0/package/php/php.mk 2015-06-15 16:21:45 UTC (rev 7117)
@@ -13,7 +13,7 @@
PHP_DEPENDENCIES = host-pkg-config
ifeq ($(BR2_PACKAGE_PHP_EXT_TIMEZONEDB),y)
-PHP_TIMEZONEDB_VERSION = 2015.4
+PHP_TIMEZONEDB_VERSION = 2015.5
PHP_TIMEZONEDB_SITE = http://files.astlinux.org
PHP_TIMEZONEDB_SOURCE = timezonedb-$(PHP_TIMEZONEDB_VERSION).tar.gz
Modified: branches/1.0/package/zoneinfo/zoneinfo.mk
===================================================================
--- branches/1.0/package/zoneinfo/zoneinfo.mk 2015-06-13 01:35:51 UTC (rev 7116)
+++ branches/1.0/package/zoneinfo/zoneinfo.mk 2015-06-15 16:21:45 UTC (rev 7117)
@@ -3,7 +3,7 @@
# zoneinfo
#
##############################################################
-ZONEINFO_VERSION := 2015d
+ZONEINFO_VERSION := 2015e
ZONEINFO_DATA := tzdata$(ZONEINFO_VERSION).tar.gz
ZONEINFO_SOURCE := tzcode$(ZONEINFO_VERSION).tar.gz
ZONEINFO_SITE := ftp://ftp.iana.org/tz/releases
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-08-13 23:18:15
|
Revision: 7191
http://sourceforge.net/p/astlinux/code/7191
Author: abelbeck
Date: 2015-08-13 23:18:13 +0000 (Thu, 13 Aug 2015)
Log Message:
-----------
zoneinfo, version bump to 2015f and PHP_TIMEZONEDB 2015.6
Modified Paths:
--------------
branches/1.0/package/php/php.mk
branches/1.0/package/zoneinfo/zoneinfo.mk
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2015-08-13 22:43:35 UTC (rev 7190)
+++ branches/1.0/package/php/php.mk 2015-08-13 23:18:13 UTC (rev 7191)
@@ -13,7 +13,7 @@
PHP_DEPENDENCIES = host-pkg-config
ifeq ($(BR2_PACKAGE_PHP_EXT_TIMEZONEDB),y)
-PHP_TIMEZONEDB_VERSION = 2015.5
+PHP_TIMEZONEDB_VERSION = 2015.6
PHP_TIMEZONEDB_SITE = http://files.astlinux.org
PHP_TIMEZONEDB_SOURCE = timezonedb-$(PHP_TIMEZONEDB_VERSION).tar.gz
Modified: branches/1.0/package/zoneinfo/zoneinfo.mk
===================================================================
--- branches/1.0/package/zoneinfo/zoneinfo.mk 2015-08-13 22:43:35 UTC (rev 7190)
+++ branches/1.0/package/zoneinfo/zoneinfo.mk 2015-08-13 23:18:13 UTC (rev 7191)
@@ -3,7 +3,7 @@
# zoneinfo
#
##############################################################
-ZONEINFO_VERSION := 2015e
+ZONEINFO_VERSION := 2015f
ZONEINFO_DATA := tzdata$(ZONEINFO_VERSION).tar.gz
ZONEINFO_SOURCE := tzcode$(ZONEINFO_VERSION).tar.gz
ZONEINFO_SITE := ftp://ftp.iana.org/tz/releases
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-10-05 16:58:29
|
Revision: 7258
http://sourceforge.net/p/astlinux/code/7258
Author: abelbeck
Date: 2015-10-05 16:58:27 +0000 (Mon, 05 Oct 2015)
Log Message:
-----------
zoneinfo, version bump to 2015g and PHP_TIMEZONEDB 2015.7
Modified Paths:
--------------
branches/1.0/package/php/php.mk
branches/1.0/package/zoneinfo/zoneinfo.mk
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2015-10-05 16:50:03 UTC (rev 7257)
+++ branches/1.0/package/php/php.mk 2015-10-05 16:58:27 UTC (rev 7258)
@@ -13,7 +13,7 @@
PHP_DEPENDENCIES = host-pkg-config
ifeq ($(BR2_PACKAGE_PHP_EXT_TIMEZONEDB),y)
-PHP_TIMEZONEDB_VERSION = 2015.6
+PHP_TIMEZONEDB_VERSION = 2015.7
PHP_TIMEZONEDB_SITE = http://files.astlinux.org
PHP_TIMEZONEDB_SOURCE = timezonedb-$(PHP_TIMEZONEDB_VERSION).tar.gz
Modified: branches/1.0/package/zoneinfo/zoneinfo.mk
===================================================================
--- branches/1.0/package/zoneinfo/zoneinfo.mk 2015-10-05 16:50:03 UTC (rev 7257)
+++ branches/1.0/package/zoneinfo/zoneinfo.mk 2015-10-05 16:58:27 UTC (rev 7258)
@@ -3,7 +3,7 @@
# zoneinfo
#
##############################################################
-ZONEINFO_VERSION := 2015f
+ZONEINFO_VERSION := 2015g
ZONEINFO_DATA := tzdata$(ZONEINFO_VERSION).tar.gz
ZONEINFO_SOURCE := tzcode$(ZONEINFO_VERSION).tar.gz
ZONEINFO_SITE := ftp://ftp.iana.org/tz/releases
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-15 16:12:48
|
Revision: 7327
http://sourceforge.net/p/astlinux/code/7327
Author: abelbeck
Date: 2015-11-15 16:12:46 +0000 (Sun, 15 Nov 2015)
Log Message:
-----------
shellinabox, version bump to 2.18, new supported repo
Modified Paths:
--------------
branches/1.0/package/shellinabox/Config.in
branches/1.0/package/shellinabox/shellinabox.mk
branches/1.0/package/webinterface/altweb/admin/cli.php
Added Paths:
-----------
branches/1.0/package/shellinabox/shellinabox-0000-fixed-reverse-video-rendering.patch
branches/1.0/package/shellinabox/shellinabox-0010-shared-shellinaboxd.patch
branches/1.0/package/shellinabox/shellinabox-0011-ios-vt100.patch
Removed Paths:
-------------
branches/1.0/package/shellinabox/shellinabox-FF15-vt100.patch
branches/1.0/package/shellinabox/shellinabox-ios-vt100.patch
Modified: branches/1.0/package/shellinabox/Config.in
===================================================================
--- branches/1.0/package/shellinabox/Config.in 2015-11-13 18:52:50 UTC (rev 7326)
+++ branches/1.0/package/shellinabox/Config.in 2015-11-15 16:12:46 UTC (rev 7327)
@@ -8,5 +8,8 @@
emulator is accessible to any JavaScript and CSS enabled web
browser and does not require any additional browser plugins.
+ https://github.com/shellinabox/shellinabox
+
+ Original:
http://code.google.com/p/shellinabox/
Added: branches/1.0/package/shellinabox/shellinabox-0000-fixed-reverse-video-rendering.patch
===================================================================
--- branches/1.0/package/shellinabox/shellinabox-0000-fixed-reverse-video-rendering.patch (rev 0)
+++ branches/1.0/package/shellinabox/shellinabox-0000-fixed-reverse-video-rendering.patch 2015-11-15 16:12:46 UTC (rev 7327)
@@ -0,0 +1,208 @@
+From cde2e923786486d30c41246f7adc554855fb7e62 Mon Sep 17 00:00:00 2001
+From: KLuka <luk...@gm...>
+Date: Thu, 3 Sep 2015 19:01:17 +0200
+Subject: [PATCH] Issue #341: Fixed reverse video rendering
+
+* Added new CSS class for handling reverse video with default terminal
+ colors. For colors given with value 0-255 background and foreground
+ values are just switched.
+* New CSS classes were also added to Black On White and White On Black
+ color themes.
+---
+ shellinabox/black-on-white.css | 16 +++++++++++
+ shellinabox/color.css | 2 ++
+ shellinabox/styles.css | 7 +++++
+ shellinabox/vt100.jspp | 62 +++++++++++++++++++++++-------------------
+ shellinabox/white-on-black.css | 16 +++++++++++
+ 5 files changed, 75 insertions(+), 28 deletions(-)
+
+diff --git a/shellinabox/black-on-white.css b/shellinabox/black-on-white.css
+index e69de29..8f08acf 100644
+--- a/shellinabox/black-on-white.css
++++ b/shellinabox/black-on-white.css
+@@ -0,0 +1,16 @@
++#vt100 .ansiDefR {
++ color: #ffffff;
++}
++
++#vt100 .bgAnsiDefR {
++ background-color: #000000;
++}
++
++#vt100 #scrollable.inverted .ansiDefR {
++ color: #000000;
++}
++
++#vt100 #scrollable.inverted .bgAnsiDefR {
++ background-color: #ffffff;
++}
++
+diff --git a/shellinabox/color.css b/shellinabox/color.css
+index 06e565b..3c042ee 100644
+--- a/shellinabox/color.css
++++ b/shellinabox/color.css
+@@ -2,6 +2,7 @@
+
+ /* SYSTEM colors */
+ #vt100 .ansiDef { }
++#vt100 .ansiDefR { }
+
+ #vt100 .ansi0 { color: #000000; }
+ #vt100 .ansi1 { color: #cd0000; }
+@@ -264,6 +265,7 @@
+
+ /* SYSTEM colors */
+ #vt100 .bgAnsiDef { }
++#vt100 .bgAnsiDefR { }
+
+ #vt100 .bgAnsi0 { background-color: #000000; }
+ #vt100 .bgAnsi1 { background-color: #cd0000; }
+diff --git a/shellinabox/styles.css b/shellinabox/styles.css
+index d025c94..8978eaa 100755
+--- a/shellinabox/styles.css
++++ b/shellinabox/styles.css
+@@ -243,9 +243,12 @@
+ [else DEFINES_COLORS]
+ /* SYSTEM colors */
+ #vt100 .ansiDef { color: #000000; }
++#vt100 .ansiDefR { color: #ffffff; }
+
+ #vt100 #scrollable.inverted .ansiDef
+ { color: #ffffff; }
++#vt100 #scrollable.inverted .ansiDefR
++ { color: #000000; }
+
+ #vt100 .ansi0 { color: #000000; }
+ #vt100 .ansi1 { color: #cd0000; }
+@@ -508,9 +511,13 @@
+
+ /* SYSTEM colors */
+ #vt100 .bgAnsiDef { background-color: #ffffff; }
++#vt100 .bgAnsiDefR
++ { background-color: #000000; }
+
+ #vt100 #scrollable.inverted .bgAnsiDef
+ { background-color: #000000; }
++#vt100 #scrollable.inverted .bgAnsiDefR
++ { background-color: #ffffff; }
+
+ #vt100 .bgAnsi0 { background-color: #000000; }
+ #vt100 .bgAnsi1 { background-color: #cd0000; }
+diff --git a/shellinabox/vt100.jspp b/shellinabox/vt100.jspp
+index e06efca..d44c631 100755
+--- a/shellinabox/vt100.jspp
++++ b/shellinabox/vt100.jspp
+@@ -3351,44 +3351,50 @@ VT100.prototype.respondSecondaryDA = function() {
+
+
+ VT100.prototype.updateStyle = function() {
+- this.style = '';
++ var fg = '';
++ var bg = '';
++ this.style = '';
++
+ if (this.attr & ATTR_UNDERLINE) {
+- this.style = 'text-decoration: underline;';
+- }
+- var bg = (this.attr >> 4) & 0xF;
+- var fg = this.attr & 0xF;
+- if (this.attr & ATTR_REVERSE) {
+- var tmp = bg;
+- bg = fg;
+- fg = tmp;
+- }
+- if ((this.attr & (ATTR_REVERSE | ATTR_DIM)) == ATTR_DIM) {
+- fg = 8; // Dark grey
+- } else if (this.attr & ATTR_BRIGHT) {
+- fg |= 8;
+- this.style = 'font-weight: bold;';
++ this.style += 'text-decoration: underline;';
+ }
+ if (this.attr & ATTR_BLINK) {
+- this.style = 'text-decoration: blink;';
+- }
+-
+- // Default colors
+- if (this.attr & ATTR_DEF_FG) {
+- fg = 'Def';
+- }
+- if (this.attr & ATTR_DEF_BG) {
+- bg = 'Def';
++ this.style += 'text-decoration: blink;';
+ }
+
+- // Extended color mode support (256 colors).
++ // Forground color
+ if (this.attrFg) {
+- fg = this.attrFg;
++ // 256 color mode
++ fg = this.attrFg
++ } else if (this.attr & ATTR_DEF_FG) {
++ fg = 'Def';
++ } else {
++ fg = this.attr & 0xF;
++ if (this.attr & ATTR_BRIGHT) {
++ fg |= 8;
++ this.style += 'font-weight: bold;';
++ }
+ }
++
++ // Background color
+ if (this.attrBg) {
+- bg = this.attrBg;
++ // 256 color mode
++ bg = this.attrBg
++ } else if (this.attr & ATTR_DEF_BG) {
++ bg = 'Def';
++ } else {
++ bg = (this.attr >> 4) & 0xF;
++ }
++
++ // Reverse colors
++ if (this.attr & ATTR_REVERSE) {
++ var tmpFg = fg;
++ var tmpBg = bg;
++ fg = (tmpBg == 'Def') ? 'DefR' : tmpBg;
++ bg = (tmpFg == 'Def') ? 'DefR' : tmpFg;
+ }
+
+- this.color = 'ansi' + fg + ' bgAnsi' + bg;
++ this.color = 'ansi' + fg + ' bgAnsi' + bg;
+ };
+
+ VT100.prototype.setAttrColors = function(attr) {
+diff --git a/shellinabox/white-on-black.css b/shellinabox/white-on-black.css
+index 2482f1d..92cdef8 100755
+--- a/shellinabox/white-on-black.css
++++ b/shellinabox/white-on-black.css
+@@ -24,14 +24,30 @@
+ color: #ffffff;
+ }
+
++#vt100 .ansiDefR {
++ color: #000000;
++}
++
+ #vt100 .bgAnsiDef {
+ background-color: #000000;
+ }
+
++#vt100 .bgAnsiDefR {
++ background-color: #ffffff;
++}
++
+ #vt100 #scrollable.inverted .ansiDef {
+ color: #000000;
+ }
+
++#vt100 #scrollable.inverted .ansiDefR {
++ color: #ffffff;
++}
++
+ #vt100 #scrollable.inverted .bgAnsiDef {
+ background-color: #ffffff;
+ }
++
++#vt100 #scrollable.inverted .bgAnsiDefR {
++ background-color: #000000;
++}
Added: branches/1.0/package/shellinabox/shellinabox-0010-shared-shellinaboxd.patch
===================================================================
--- branches/1.0/package/shellinabox/shellinabox-0010-shared-shellinaboxd.patch (rev 0)
+++ branches/1.0/package/shellinabox/shellinabox-0010-shared-shellinaboxd.patch 2015-11-15 16:12:46 UTC (rev 7327)
@@ -0,0 +1,11 @@
+--- shellinabox-2.18/Makefile.am.orig 2015-11-14 17:21:13.000000000 -0600
++++ shellinabox-2.18/Makefile.am 2015-11-14 17:21:45.000000000 -0600
+@@ -126,7 +126,7 @@
+
+ shellinaboxd_LDADD = liblogging.la \
+ libhttp.la
+-shellinaboxd_LDFLAGS = -static
++shellinaboxd_LDFLAGS = -shared
+ ## Added this for compatibility with older versions of autoconf/automake
+ docdir = ${datadir}/doc/${PACKAGE}
+
Copied: branches/1.0/package/shellinabox/shellinabox-0011-ios-vt100.patch (from rev 7326, branches/1.0/package/shellinabox/shellinabox-ios-vt100.patch)
===================================================================
--- branches/1.0/package/shellinabox/shellinabox-0011-ios-vt100.patch (rev 0)
+++ branches/1.0/package/shellinabox/shellinabox-0011-ios-vt100.patch 2015-11-15 16:12:46 UTC (rev 7327)
@@ -0,0 +1,21 @@
+--- shellinabox-2.18/shellinabox/vt100.jspp.orig 2015-11-14 19:14:16.000000000 -0600
++++ shellinabox-2.18/shellinabox/vt100.jspp 2015-11-14 19:20:34.000000000 -0600
+@@ -301,6 +301,9 @@
+ this.signature = Math.floor(16807*this.signature + 1) %
+ ((1 << 31) - 1);
+ }
++ if (navigator.userAgent.match(/iPad|iPhone|iPod/i) != null) {
++ this.softKeyboard = true;
++ }
+ if (typeof userCSSList != 'undefined') {
+ for (var i = 0; i < userCSSList.length; ++i) {
+ var label = userCSSList[i][0];
+@@ -1199,7 +1199,7 @@
+ document.body.clientHeight))-1;
+
+ // Prevent ever growing consoles on iPad.
+- if (navigator.userAgent.match(/iPad/i) != null) {
++ if (navigator.userAgent.match(/iPad|iPhone|iPod/i) != null) {
+ height -= 1;
+ }
+
Deleted: branches/1.0/package/shellinabox/shellinabox-FF15-vt100.patch
===================================================================
--- branches/1.0/package/shellinabox/shellinabox-FF15-vt100.patch 2015-11-13 18:52:50 UTC (rev 7326)
+++ branches/1.0/package/shellinabox/shellinabox-FF15-vt100.patch 2015-11-15 16:12:46 UTC (rev 7327)
@@ -1,18 +0,0 @@
---- shellinabox-239/shellinabox/vt100.js.orig 2013-01-05 10:42:23.000000000 -0600
-+++ shellinabox-239/shellinabox/vt100.js 2013-01-05 10:45:41.000000000 -0600
-@@ -2742,6 +2742,7 @@
- case 187: /* = */ ch = this.applyModifiers(61, event); break;
- case 188: /* , */ ch = this.applyModifiers(44, event); break;
- case 189: /* - */ ch = this.applyModifiers(45, event); break;
-+ case 173: /* - */ ch = this.applyModifiers(45, event); break; // FF15 Patch
- case 190: /* . */ ch = this.applyModifiers(46, event); break;
- case 191: /* / */ ch = this.applyModifiers(47, event); break;
- // Conflicts with dead key " on Swiss keyboards
-@@ -2886,6 +2887,7 @@
- case 187: /* = -> + */ u = 61; s = 43; break;
- case 188: /* , -> < */ u = 44; s = 60; break;
- case 189: /* - -> _ */ u = 45; s = 95; break;
-+ case 173: /* - -> _ */ u = 45; s = 95; break; // FF15 Patch
- case 190: /* . -> > */ u = 46; s = 62; break;
- case 191: /* / -> ? */ u = 47; s = 63; break;
- case 192: /* ` -> ~ */ u = 96; s = 126; break;
Deleted: branches/1.0/package/shellinabox/shellinabox-ios-vt100.patch
===================================================================
--- branches/1.0/package/shellinabox/shellinabox-ios-vt100.patch 2015-11-13 18:52:50 UTC (rev 7326)
+++ branches/1.0/package/shellinabox/shellinabox-ios-vt100.patch 2015-11-15 16:12:46 UTC (rev 7327)
@@ -1,24 +0,0 @@
---- shellinabox-239/shellinabox/vt100.js.orig 2011-11-30 22:55:50.000000000 -0600
-+++ shellinabox-239/shellinabox/vt100.js 2011-11-30 22:59:20.000000000 -0600
-@@ -289,6 +289,10 @@
- this.signature = Math.floor(16807*this.signature + 1) %
- ((1 << 31) - 1);
- }
-+ var isMobile = navigator.userAgent.match(/iPad|iPhone|iPod/i) != null;
-+ if (isMobile) {
-+ this.softKeyboard = true;
-+ }
- if (typeof userCSSList != 'undefined') {
- for (var i = 0; i < userCSSList.length; ++i) {
- var label = userCSSList[i][0];
-@@ -971,6 +971,10 @@
- document.documentElement.clientWidth ||
- document.body.clientWidth) -
- marginRight != x + this.container.offsetWidth;
-+ var isMobile = navigator.userAgent.match(/iPad|iPhone|iPod/i) != null;
-+ if (isMobile) {
-+ this.isEmbedded = false;
-+ }
- if (!this.isEmbedded) {
- // Some browsers generate resize events when the terminal is first
- // shown. Disable showing the size indicator until a little bit after
Modified: branches/1.0/package/shellinabox/shellinabox.mk
===================================================================
--- branches/1.0/package/shellinabox/shellinabox.mk 2015-11-13 18:52:50 UTC (rev 7326)
+++ branches/1.0/package/shellinabox/shellinabox.mk 2015-11-15 16:12:46 UTC (rev 7327)
@@ -3,11 +3,19 @@
# shellinabox
#
#############################################################
-SHELLINABOX_VERSION = 2.14
+SHELLINABOX_VERSION = 2.18
SHELLINABOX_SOURCE = shellinabox-$(SHELLINABOX_VERSION).tar.gz
-SHELLINABOX_SITE = http://shellinabox.googlecode.com/files
+#SHELLINABOX_SITE = https://github.com/shellinabox/shellinabox
+SHELLINABOX_SITE = http://files.astlinux.org
SHELLINABOX_DEPENDENCIES = openssl
+SHELLINABOX_AUTORECONF = YES
+
+SHELLINABOX_CONF_OPT = \
+ --enable-ssl \
+ --disable-pam \
+ --disable-runtime-loading
+
define SHELLINABOX_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/shellinaboxd $(TARGET_DIR)/usr/bin/shellinaboxd
$(INSTALL) -D -m 0755 package/shellinabox/shellinaboxd.init $(TARGET_DIR)/etc/init.d/shellinaboxd
Modified: branches/1.0/package/webinterface/altweb/admin/cli.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/cli.php 2015-11-13 18:52:50 UTC (rev 7326)
+++ branches/1.0/package/webinterface/altweb/admin/cli.php 2015-11-15 16:12:46 UTC (rev 7327)
@@ -56,15 +56,11 @@
</script>
<center>
<table class="layoutNOpad" width="100%"><tr><td><center>
- <table class="stdtable">
- <tr><td style="text-align: center;" colspan="3">
- <h2>Command Line Interface:</h2>
- </td></tr></table>
<?php
putHtml('<table class="stdtable" width="100%"><tr><td style="text-align: center;">');
if (is_file('/var/run/shellinaboxd.pid')) {
- echo '<iframe id="cli" src="/admin/cli/" frameborder="1" width="100%" onload="setCLIheight();">';
+ echo '<iframe id="cli" src="/admin/cli/" frameborder="1" width="100%" style="background-color: #ffffff;" onload="setCLIheight();">';
putHtml('</iframe>');
} else {
putHtml('<p style="color: red;">The CLI Proxy Server is not running, enable via the Network Tab.</p>');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X