Menu
▾
▴
astlinux-commits — Commits to the AstLinux SVN repository
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
(14) |
Aug
(156) |
Sep
(35) |
Oct
(48) |
Nov
(55) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(24) |
Feb
(154) |
Mar
(139) |
Apr
(175) |
May
(87) |
Jun
(34) |
Jul
(42) |
Aug
(68) |
Sep
(41) |
Oct
(76) |
Nov
(77) |
Dec
(50) |
| 2008 |
Jan
(98) |
Feb
(43) |
Mar
(102) |
Apr
(27) |
May
(55) |
Jun
(13) |
Jul
(58) |
Aug
(62) |
Sep
(61) |
Oct
(43) |
Nov
(87) |
Dec
(134) |
| 2009 |
Jan
(175) |
Feb
(106) |
Mar
(58) |
Apr
(41) |
May
(74) |
Jun
(123) |
Jul
(252) |
Aug
(192) |
Sep
(69) |
Oct
(38) |
Nov
(117) |
Dec
(95) |
| 2010 |
Jan
(146) |
Feb
(76) |
Mar
(90) |
Apr
(60) |
May
(23) |
Jun
(19) |
Jul
(208) |
Aug
(140) |
Sep
(103) |
Oct
(114) |
Nov
(50) |
Dec
(47) |
| 2011 |
Jan
(59) |
Feb
(47) |
Mar
(61) |
Apr
(58) |
May
(41) |
Jun
(11) |
Jul
(17) |
Aug
(49) |
Sep
(34) |
Oct
(166) |
Nov
(38) |
Dec
(70) |
| 2012 |
Jan
(87) |
Feb
(37) |
Mar
(28) |
Apr
(25) |
May
(29) |
Jun
(30) |
Jul
(43) |
Aug
(27) |
Sep
(46) |
Oct
(27) |
Nov
(51) |
Dec
(70) |
| 2013 |
Jan
(92) |
Feb
(34) |
Mar
(58) |
Apr
(37) |
May
(46) |
Jun
(9) |
Jul
(38) |
Aug
(22) |
Sep
(28) |
Oct
(42) |
Nov
(44) |
Dec
(34) |
| 2014 |
Jan
(63) |
Feb
(39) |
Mar
(48) |
Apr
(31) |
May
(21) |
Jun
(43) |
Jul
(36) |
Aug
(69) |
Sep
(53) |
Oct
(56) |
Nov
(46) |
Dec
(49) |
| 2015 |
Jan
(63) |
Feb
(35) |
Mar
(30) |
Apr
(38) |
May
(27) |
Jun
(42) |
Jul
(42) |
Aug
(63) |
Sep
(18) |
Oct
(45) |
Nov
(65) |
Dec
(71) |
| 2016 |
Jan
(54) |
Feb
(79) |
Mar
(59) |
Apr
(38) |
May
(32) |
Jun
(46) |
Jul
(42) |
Aug
(30) |
Sep
(58) |
Oct
(33) |
Nov
(98) |
Dec
(59) |
| 2017 |
Jan
(79) |
Feb
(12) |
Mar
(43) |
Apr
(32) |
May
(76) |
Jun
(59) |
Jul
(44) |
Aug
(14) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <abe...@us...> - 2015-03-07 20:49:14
|
Revision: 6996
http://sourceforge.net/p/astlinux/code/6996
Author: abelbeck
Date: 2015-03-07 20:49:06 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
libcurl, version bump to 7.41.0
Modified Paths:
--------------
branches/1.0/package/libcurl/libcurl.mk
Modified: branches/1.0/package/libcurl/libcurl.mk
===================================================================
--- branches/1.0/package/libcurl/libcurl.mk 2015-03-07 20:40:38 UTC (rev 6995)
+++ branches/1.0/package/libcurl/libcurl.mk 2015-03-07 20:49:06 UTC (rev 6996)
@@ -3,7 +3,7 @@
# libcurl
#
#############################################################
-LIBCURL_VERSION = 7.40.0
+LIBCURL_VERSION = 7.41.0
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.gz
LIBCURL_SITE = http://curl.haxx.se/download
LIBCURL_INSTALL_STAGING = YES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-03-07 20:40:46
|
Revision: 6995
http://sourceforge.net/p/astlinux/code/6995
Author: abelbeck
Date: 2015-03-07 20:40:38 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
perl, version bump to 5.20.2 using perl-cross 0.9.5
Modified Paths:
--------------
branches/1.0/package/perl/perl-fix-Module-Build.patch
branches/1.0/package/perl/perl-ifprefixed.patch
branches/1.0/package/perl/perl.mk
Modified: branches/1.0/package/perl/perl-fix-Module-Build.patch
===================================================================
--- branches/1.0/package/perl/perl-fix-Module-Build.patch 2015-03-02 23:30:51 UTC (rev 6994)
+++ branches/1.0/package/perl/perl-fix-Module-Build.patch 2015-03-07 20:40:38 UTC (rev 6995)
@@ -5,7 +5,7 @@
===================================================================
--- a/cpan/Module-Build/lib/Module/Build/Base.pm
+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
-@@ -456,7 +456,7 @@
+@@ -459,7 +459,7 @@
my $proto = shift;
my $c = ref($proto) ? $proto->{config} : 'Module::Build::Config';
Modified: branches/1.0/package/perl/perl-ifprefixed.patch
===================================================================
--- branches/1.0/package/perl/perl-ifprefixed.patch 2015-03-02 23:30:51 UTC (rev 6994)
+++ branches/1.0/package/perl/perl-ifprefixed.patch 2015-03-07 20:40:38 UTC (rev 6995)
@@ -1,6 +1,6 @@
--- perl-5.16.2/Makefile.config.SH.orig 2012-12-21 23:52:27.000000000 -0600
+++ perl-5.16.2/Makefile.config.SH 2012-12-21 23:53:11.000000000 -0600
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
fi
function ifprefixed() {
Modified: branches/1.0/package/perl/perl.mk
===================================================================
--- branches/1.0/package/perl/perl.mk 2015-03-02 23:30:51 UTC (rev 6994)
+++ branches/1.0/package/perl/perl.mk 2015-03-07 20:40:38 UTC (rev 6995)
@@ -4,7 +4,7 @@
#
#############################################################
-PERL_VERSION_MAJOR = 18
+PERL_VERSION_MAJOR = 20
PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2
PERL_SITE = http://www.cpan.org/src/5.0
PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
@@ -12,13 +12,14 @@
# Depend on linux to define LINUX_VERSION_PROBED
PERL_DEPENDENCIES = linux
-PERL_MODULES = constant Carp Errno Fcntl Cwd POSIX Digest Socket IO XSLoader
-PERL_MODULES += Digest/MD5 Digest/SHA Getopt/Std Getopt/Long Time/Local File/Glob Sys/Hostname
+PERL_MODULES = constant version Carp Errno Fcntl PathTools POSIX Digest Socket IO XSLoader Exporter File-Find
+PERL_MODULES += Digest/MD5 Digest/SHA Getopt/Long Time/Local File/Glob Sys/Hostname
-PERL_CROSS_VERSION = 0.8.5
+PERL_CROSS_VERSION = 0.9.5
PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).2
-PERL_CROSS_SITE = https://raw.github.com/arsv/perl-cross/releases
-PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
+#PERL_CROSS_SITE = http://raw.github.com/arsv/perl-cross/releases
+PERL_CROSS_SITE = http://files.astlinux.org
+PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
# We use the perlcross hack to cross-compile perl. It should
# be extracted over the perl sources, so we don't define that
@@ -37,7 +38,7 @@
PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT
ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
- PERL_DEPENDENCIES += berkeleydb
+PERL_DEPENDENCIES += berkeleydb
endif
# We have to override LD, because an external multilib toolchain ld is not
@@ -60,11 +61,11 @@
-Dperladmin=root
ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
- PERL_CONF_OPT += -Dusedevel
+PERL_CONF_OPT += -Dusedevel
endif
ifneq ($(BR2_LARGEFILE),y)
- PERL_CONF_OPT += -Uuselargefiles
+PERL_CONF_OPT += -Uuselargefiles
endif
ifneq ($(PERL_MODULES),)
@@ -74,6 +75,7 @@
define PERL_CONFIGURE_CMDS
(cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_CONF_OPT))
$(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
+ touch $(@D)/x2p/a2p.c # prevents regen by yacc
endef
define PERL_BUILD_CMDS
@@ -84,20 +86,16 @@
$(MAKE1) -C $(@D) DESTDIR="$(STAGING_DIR)" install.perl
endef
-PERL_INSTALL_TARGET_GOALS = install.perl
-ifeq ($(BR2_HAVE_DOCUMENTATION),y)
-PERL_INSTALL_TARGET_GOALS += install.man
-endif
-
-
define PERL_INSTALL_TARGET_CMDS
- $(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" $(PERL_INSTALL_TARGET_GOALS)
+ $(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" install.perl
# Remove all .pod files
- find $(TARGET_DIR)/usr/lib/perl5/ -name "*.pod" -print0 | xargs -0 rm -f
+ find $(TARGET_DIR)/usr/lib/perl5/ -name '*.pod' -print0 | xargs -0 rm -f
# Remove many unicore files
rm -rf $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/unicore/lib/
rm -rf $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/unicore/To/
rm -f $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/unicore/Name.pl
+ # Remove misc files
+ find $(TARGET_DIR)/usr/lib/perl5/ -name '.packlist' -print0 | xargs -0 rm -f
#
ln -sf perl$(PERL_VERSION) $(TARGET_DIR)/usr/bin/perl
endef
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-03-02 23:30:54
|
Revision: 6994
http://sourceforge.net/p/astlinux/code/6994
Author: abelbeck
Date: 2015-03-02 23:30:51 +0000 (Mon, 02 Mar 2015)
Log Message:
-----------
pjsip, enable ssl support to define tls symbols such as 'pjsip_tls_transport_start2', Thanks Ian
Modified Paths:
--------------
branches/1.0/package/pjsip/pjsip.mk
Modified: branches/1.0/package/pjsip/pjsip.mk
===================================================================
--- branches/1.0/package/pjsip/pjsip.mk 2015-02-28 16:46:12 UTC (rev 6993)
+++ branches/1.0/package/pjsip/pjsip.mk 2015-03-02 23:30:51 UTC (rev 6994)
@@ -23,4 +23,11 @@
--disable-video \
--disable-opencore-amr
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+PJSIP_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr
+PJSIP_DEPENDENCIES += openssl
+else
+PJSIP_CONF_OPT += --disable-ssl
+endif
+
$(eval $(call AUTOTARGETS,package,pjsip))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-28 16:46:15
|
Revision: 6993
http://sourceforge.net/p/astlinux/code/6993
Author: abelbeck
Date: 2015-02-28 16:46:12 +0000 (Sat, 28 Feb 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-02-28 16:19:59 UTC (rev 6992)
+++ branches/1.0/docs/ChangeLog.txt 2015-02-28 16:46:12 UTC (rev 6993)
@@ -32,6 +32,8 @@
-- netsnmp, version bump to 5.7.3, security fix: CVE-2014-2285
+-- miniupnpd, version bump to 1.9.20141209, adds 'Port Control Protocol' NAT-PMP/PCP support.
+
-- (Custom Build Only) kamailio, version bump to 4.1.8
** Asterisk
@@ -44,7 +46,9 @@
-- Prefs and System tab, set default "Repository URL" to use Asterisk 13 if installed.
+-- Status and Network tab, change NAT-PMP to NAT-PMP/PCP labels adding 'Port Control Protocol' support.
+
Additions for AstLinux 1.2.2:
=============================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-28 16:20:06
|
Revision: 6992
http://sourceforge.net/p/astlinux/code/6992
Author: abelbeck
Date: 2015-02-28 16:19:59 +0000 (Sat, 28 Feb 2015)
Log Message:
-----------
web interface, Status and Network tab, change NAT-PMP to NAT-PMP/PCP labels for latest MiniUPnP
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/network.php
branches/1.0/package/webinterface/altweb/common/status.inc
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2015-02-28 14:20:12 UTC (rev 6991)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2015-02-28 16:19:59 UTC (rev 6992)
@@ -114,9 +114,9 @@
$select_upnp = array (
'disabled' => 'no:no',
- 'NAT-PMP only' => 'yes:no',
+ 'NAT-PMP/PCP only' => 'yes:no',
'UPnP only' => 'no:yes',
- 'NAT-PMP & UPnP' => 'yes:yes'
+ 'NAT-PMP/PCP & UPnP' => 'yes:yes'
);
// Function: checkNETWORKsettings
@@ -441,7 +441,7 @@
$x_value = $_POST['upnp'];
$tokens = explode(':', $x_value);
$value = 'UPNP_ENABLE_NATPMP="'.$tokens[0].'"';
- fwrite($fp, "### UPnP NAT-PMP\n".$value."\n");
+ fwrite($fp, "### UPnP NAT-PMP/PCP\n".$value."\n");
$value = 'UPNP_ENABLE_UPNP="'.$tokens[1].'"';
fwrite($fp, "### UPnP Enable\n".$value."\n");
@@ -1148,9 +1148,9 @@
case 1:
case 2:
case 3:
- alert('WARNING: Enabling either NAT-PMP or UPnP has security implications!\
+ alert('WARNING: Enabling either NAT-PMP/PCP or UPnP has security implications!\
\n\nNAT EXT->LAN rules can be created automatically.\
-\n\nIf you must, try NAT-PMP only.');
+\n\nIf you must, try NAT-PMP/PCP only.');
break;
}
}
Modified: branches/1.0/package/webinterface/altweb/common/status.inc
===================================================================
--- branches/1.0/package/webinterface/altweb/common/status.inc 2015-02-28 14:20:12 UTC (rev 6991)
+++ branches/1.0/package/webinterface/altweb/common/status.inc 2015-02-28 16:19:59 UTC (rev 6992)
@@ -723,11 +723,11 @@
if ($daemon['miniupnpd'] > 0) {
if (getPREFdef($global_prefs, 'status_show_miniupnpd_leases') !== 'no') { // currently not set in the Prefs tab
- putHtml("<h2>Universal Plug'n'Play (NAT-PMP and UPnP) Leases:</h2>");
+ putHtml("<h2>Universal Plug'n'Play (NAT-PMP/PCP and UPnP) Leases:</h2>");
if (is_null($upnp = parseMINIUPNPDleases($MINIUPNPDLEASES))) {
putHtml("<pre>");
- putText('No Active NAT-PMP or UPnP Leases');
+ putText('No Active NAT-PMP/PCP or UPnP Leases');
putHtml("</pre>");
} else {
putHtml('<pre><table class="statusdatatable">');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-28 14:20:20
|
Revision: 6991
http://sourceforge.net/p/astlinux/code/6991
Author: abelbeck
Date: 2015-02-28 14:20:12 +0000 (Sat, 28 Feb 2015)
Log Message:
-----------
miniupnpd, use the more descriptive 'http_port' instead of 'port', and re-enable 'friendly_name' along with some other strings
Modified Paths:
--------------
branches/1.0/package/miniupnpd/miniupnpd.init
branches/1.0/package/miniupnpd/miniupnpd.mk
Modified: branches/1.0/package/miniupnpd/miniupnpd.init
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.init 2015-02-27 17:48:43 UTC (rev 6990)
+++ branches/1.0/package/miniupnpd/miniupnpd.init 2015-02-28 14:20:12 UTC (rev 6991)
@@ -158,7 +158,9 @@
return
fi
- echo "port=5000
+ astlinux_release="$(cat /etc/astlinux-release)"
+
+ echo "http_port=5000
enable_natpmp=$UPNP_ENABLE_NATPMP
enable_upnp=$UPNP_ENABLE_UPNP
lease_file=$MINIUPNPD_LEASEFILE
@@ -170,7 +172,10 @@
clean_ruleset_interval=600
uuid=$UUID
serial=000001
-model_number=$(cat /etc/astlinux-release)" >> $MINIUPNPD_CONF
+friendly_name=AstLinux Router
+model_name=AstLinux Router
+model_description=$astlinux_release
+model_number=$astlinux_release" >> $MINIUPNPD_CONF
if [ -n "$UPNP_ALLOW" ]; then
upnp_allow >> $MINIUPNPD_CONF
else
Modified: branches/1.0/package/miniupnpd/miniupnpd.mk
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.mk 2015-02-27 17:48:43 UTC (rev 6990)
+++ branches/1.0/package/miniupnpd/miniupnpd.mk 2015-02-28 14:20:12 UTC (rev 6991)
@@ -22,7 +22,7 @@
define MINIUPNPD_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) \
- CONFIG_OPTIONS="--leasefile --portinuse" \
+ CONFIG_OPTIONS="--leasefile --portinuse --vendorcfg" \
$(MAKE) -f Makefile.linux -C $(@D) miniupnpd
endef
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-27 17:48:52
|
Revision: 6990
http://sourceforge.net/p/astlinux/code/6990
Author: abelbeck
Date: 2015-02-27 17:48:43 +0000 (Fri, 27 Feb 2015)
Log Message:
-----------
miniupnpd, version bump to 1.9.20141209
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/miniupnpd/Config.in
branches/1.0/package/miniupnpd/miniupnpd.init
branches/1.0/package/miniupnpd/miniupnpd.mk
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/libnfnetlink/
branches/1.0/package/libnfnetlink/Config.in
branches/1.0/package/libnfnetlink/libnfnetlink.mk
Removed Paths:
-------------
branches/1.0/package/miniupnpd/miniupnpd-config.patch
branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/astlinux-ast11.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6965-dirty Configuration
-# Sat Feb 7 17:51:44 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:10 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -604,6 +604,7 @@
BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
+BR2_PACKAGE_LIBNFNETLINK=y
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
# BR2_PACKAGE_PJSIP is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/astlinux-ast13.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6965-dirty Configuration
-# Sat Feb 7 17:52:06 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:11 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -604,6 +604,7 @@
BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
+BR2_PACKAGE_LIBNFNETLINK=y
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
BR2_PACKAGE_PJSIP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/astlinux18.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6965-dirty Configuration
-# Sat Feb 7 17:51:39 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:10 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -604,6 +604,7 @@
BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
+BR2_PACKAGE_LIBNFNETLINK=y
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
# BR2_PACKAGE_PJSIP is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/initrd.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan 3 11:05:55 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:56 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -489,6 +489,7 @@
# BR2_PACKAGE_NEON is not set
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBPCAP is not set
# BR2_PACKAGE_PJSIP is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/Config.in 2015-02-27 17:48:43 UTC (rev 6990)
@@ -370,6 +370,7 @@
source "package/neon/Config.in"
source "package/libmnl/Config.in"
source "package/libnet/Config.in"
+source "package/libnfnetlink/Config.in"
source "package/libnl/Config.in"
source "package/libpcap/Config.in"
source "package/pjsip/Config.in"
Added: branches/1.0/package/libnfnetlink/Config.in
===================================================================
--- branches/1.0/package/libnfnetlink/Config.in (rev 0)
+++ branches/1.0/package/libnfnetlink/Config.in 2015-02-27 17:48:43 UTC (rev 6990)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBNFNETLINK
+ bool "libnfnetlink"
+ help
+ libnfnetlink is the low-level library for netfilter related
+ kernel/userspace communication.
+ It provides a generic messaging infrastructure for in-kernel
+ netfilter subsystems (such as nfnetlink_log, nfnetlink_queue,
+ nfnetlink_conntrack) and their respective users
+ and/or management tools in userspace.
+
+ http://www.netfilter.org/projects/libnfnetlink/
+
Added: branches/1.0/package/libnfnetlink/libnfnetlink.mk
===================================================================
--- branches/1.0/package/libnfnetlink/libnfnetlink.mk (rev 0)
+++ branches/1.0/package/libnfnetlink/libnfnetlink.mk 2015-02-27 17:48:43 UTC (rev 6990)
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libnfnetlink
+#
+################################################################################
+
+LIBNFNETLINK_VERSION = 1.0.1
+LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
+LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
+LIBNFNETLINK_AUTORECONF = YES
+LIBNFNETLINK_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,libnfnetlink))
Modified: branches/1.0/package/miniupnpd/Config.in
===================================================================
--- branches/1.0/package/miniupnpd/Config.in 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/Config.in 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,8 +1,9 @@
config BR2_PACKAGE_MINIUPNPD
bool "miniupnpd"
depends on BR2_LINUX_KERNEL
- depends on BR2_PACKAGE_IPTABLES
+ select BR2_PACKAGE_IPTABLES
+ select BR2_PACKAGE_LIBNFNETLINK
help
- Implements UPnP and NAT-PMP protocols.
+ Implements UPnP and NAT-PMP/PCP protocols.
http://miniupnp.free.fr/
Deleted: branches/1.0/package/miniupnpd/miniupnpd-config.patch
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd-config.patch 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd-config.patch 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,27 +0,0 @@
---- miniupnpd-1.6.20120509-orig/genconfig.sh 2012-05-09 06:40:34.000000000 -0400
-+++ miniupnpd-1.6.20120509/genconfig.sh 2012-05-24 21:13:04.412605721 -0400
-@@ -56,6 +56,12 @@
- OS_VERSION=$(cat ./os.openwrt)
- fi
-
-+# AstLinux special case
-+if [ -f ./os.astlinux ]; then
-+ OS_NAME=AstLinux
-+ OS_VERSION=$(cat ./os.astlinux)
-+fi
-+
- # Tomato USB special case
- if [ -f ../shared/tomato_version ]; then
- OS_NAME=Tomato
-@@ -223,6 +229,11 @@
- echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
- FW=netfilter
- ;;
-+ AstLinux)
-+ OS_URL=http://www.astlinux.org/
-+ echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
-+ FW=netfilter
-+ ;;
- Tomato)
- OS_NAME=UPnP
- OS_URL=http://tomatousb.org/
Deleted: branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,268 +0,0 @@
-diff -rupN miniupnpd-1.7-orig/Makefile.linux miniupnpd-1.7/Makefile.linux
---- miniupnpd-1.7-orig/Makefile.linux 2012-05-23 04:46:14.000000000 -0400
-+++ miniupnpd-1.7/Makefile.linux 2012-07-06 15:42:39.000000000 -0400
-@@ -41,7 +41,7 @@ SBININSTALLDIR = $(INSTALLPREFIX)/sbin
- ETCINSTALLDIR = $(PREFIX)/etc/miniupnpd
-
- BASEOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
-- upnpreplyparse.o minixml.o \
-+ upnpreplyparse.o minixml.o portinuse.o \
- upnpredirect.o getifaddr.o daemonize.o upnpglobalvars.o \
- options.o upnppermissions.o minissdp.o natpmp.o \
- upnpevents.o upnputils.o getconnstatus.o \
-@@ -191,7 +191,7 @@ upnpreplyparse.o: upnpreplyparse.h minix
- minixml.o: minixml.h
- upnpredirect.o: macros.h config.h upnpredirect.h upnpglobalvars.h
- upnpredirect.o: upnppermissions.h miniupnpdtypes.h upnpevents.h
--upnpredirect.o: netfilter/iptcrdr.h commonrdr.h
-+upnpredirect.o: netfilter/iptcrdr.h commonrdr.h portinuse.h
- getifaddr.o: config.h getifaddr.h
- daemonize.o: daemonize.h config.h
- upnpglobalvars.o: config.h upnpglobalvars.h upnppermissions.h
-@@ -203,7 +203,7 @@ minissdp.o: config.h upnpdescstrings.h m
- minissdp.o: upnpglobalvars.h upnppermissions.h miniupnpdtypes.h minissdp.h
- minissdp.o: upnputils.h codelength.h
- natpmp.o: macros.h config.h natpmp.h upnpglobalvars.h upnppermissions.h
--natpmp.o: miniupnpdtypes.h getifaddr.h upnpredirect.h commonrdr.h
-+natpmp.o: miniupnpdtypes.h getifaddr.h upnpredirect.h commonrdr.h portinuse.h
- upnpevents.o: config.h upnpevents.h miniupnpdpath.h upnpglobalvars.h
- upnpevents.o: upnppermissions.h miniupnpdtypes.h upnpdescgen.h upnputils.h
- upnputils.o: config.h upnputils.h
-diff -rupN miniupnpd-1.7-orig/natpmp.c miniupnpd-1.7/natpmp.c
---- miniupnpd-1.7-orig/natpmp.c 2012-05-27 19:12:51.000000000 -0400
-+++ miniupnpd-1.7/natpmp.c 2012-07-07 08:32:14.087915642 -0400
-@@ -23,9 +23,11 @@
- #include "upnpredirect.h"
- #include "commonrdr.h"
- #include "upnputils.h"
-+#include "portinuse.h"
-
- #ifdef ENABLE_NATPMP
-
-+
- int OpenAndConfNATPMPSocket(in_addr_t addr)
- {
- int snatpmp;
-@@ -267,6 +269,12 @@ void ProcessIncomingNATPMPPacket(int s)
- continue;
- }
- }
-+ if (port_in_use(ext_if_name, eport, proto, senderaddrstr, iport)) {
-+ syslog(LOG_INFO, "port %hu protocol %s already in use", eport, (proto==IPPROTO_TCP)?"tcp":"udp");
-+ eport++;
-+ r = 0;
-+ continue;
-+ }
- { /* do the redirection */
- char desc[64];
- #if 0
-diff -rupN miniupnpd-1.7-orig/netfilter/iptcrdr.c miniupnpd-1.7/netfilter/iptcrdr.c
---- miniupnpd-1.7-orig/netfilter/iptcrdr.c 2012-05-01 05:11:16.000000000 -0400
-+++ miniupnpd-1.7/netfilter/iptcrdr.c 2012-07-06 22:07:34.537558699 -0400
-@@ -238,6 +238,18 @@ get_redirect_rule(const char * ifname, u
- unsigned int * timestamp,
- u_int64_t * packets, u_int64_t * bytes)
- {
-+ return get_nat_redirect_rule(miniupnpd_nat_chain, ifname, eport, proto, iaddr, iaddrlen, iport,
-+ desc, desclen, rhost, rhostlen,timestamp, packets, bytes);
-+}
-+
-+int
-+get_nat_redirect_rule(const char * nat_chain_name, const char * ifname, unsigned short eport, int proto,
-+ char * iaddr, int iaddrlen, unsigned short * iport,
-+ char * desc, int desclen,
-+ char * rhost, int rhostlen,
-+ unsigned int * timestamp,
-+ u_int64_t * packets, u_int64_t * bytes)
-+{
- int r = -1;
- IPTC_HANDLE h;
- const struct ipt_entry * e;
-@@ -254,18 +266,18 @@ get_redirect_rule(const char * ifname, u
- iptc_strerror(errno));
- return -1;
- }
-- if(!iptc_is_chain(miniupnpd_nat_chain, h))
-+ if(!iptc_is_chain(nat_chain_name, h))
- {
-- syslog(LOG_ERR, "chain %s not found", miniupnpd_nat_chain);
-+ syslog(LOG_ERR, "chain %s not found", nat_chain_name);
- }
- else
- {
- #ifdef IPTABLES_143
-- for(e = iptc_first_rule(miniupnpd_nat_chain, h);
-+ for(e = iptc_first_rule(nat_chain_name, h);
- e;
- e = iptc_next_rule(e, h))
- #else
-- for(e = iptc_first_rule(miniupnpd_nat_chain, &h);
-+ for(e = iptc_first_rule(nat_chain_name, &h);
- e;
- e = iptc_next_rule(e, &h))
- #endif
-diff -rupN miniupnpd-1.7-orig/netfilter/iptcrdr.h miniupnpd-1.7/netfilter/iptcrdr.h
---- miniupnpd-1.7-orig/netfilter/iptcrdr.h 2012-03-05 15:37:14.000000000 -0500
-+++ miniupnpd-1.7/netfilter/iptcrdr.h 2012-07-06 22:03:25.000000000 -0400
-@@ -25,6 +25,14 @@ add_filter_rule2(const char * ifname,
- int
- delete_redirect_and_filter_rules(unsigned short eport, int proto);
-
-+int
-+get_nat_redirect_rule(const char * nat_chain_name, const char * ifname, unsigned short eport, int proto,
-+ char * iaddr, int iaddrlen, unsigned short * iport,
-+ char * desc, int desclen,
-+ char * rhost, int rhostlen,
-+ unsigned int * timestamp,
-+ u_int64_t * packets, u_int64_t * bytes);
-+
- /* for debug */
- int
- list_redirect_rule(const char * ifname);
-diff -rupN miniupnpd-1.7-orig/portinuse.c miniupnpd-1.7/portinuse.c
---- miniupnpd-1.7-orig/portinuse.c 1969-12-31 19:00:00.000000000 -0500
-+++ miniupnpd-1.7/portinuse.c 2012-07-07 08:46:20.000000000 -0400
-@@ -0,0 +1,95 @@
-+/* */
-+/* MiniUPnP project
-+ * (c) 2007-2012 Thomas Bernard
-+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
-+ * This software is subject to the conditions detailed
-+ * in the LICENCE file provided within the distribution */
-+#include <stdio.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <syslog.h>
-+#include <errno.h>
-+#include <time.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+
-+#include "macros.h"
-+#include "config.h"
-+#include "upnpglobalvars.h"
-+#include "getifaddr.h"
-+#include "portinuse.h"
-+
-+/* Hardcoded for now. Ideally would come from .conf file */
-+char *chains_to_check[] = { "PREROUTING" , 0 };
-+
-+int port_in_use(const char *if_name, unsigned eport, int proto, const char *iaddr, unsigned iport)
-+{
-+ char line[256];
-+ FILE *f;
-+ int found = 0;
-+ char ip_addr_str[INET_ADDRSTRLEN];
-+ struct in_addr ip_addr = { .s_addr = 0 };
-+ const char tcpfile[] = "/proc/net/tcp";
-+ const char udpfile[] = "/proc/net/udp";
-+
-+ f = fopen((proto==IPPROTO_TCP)?tcpfile:udpfile, "r");
-+ if (!f) return 0;
-+
-+ if(getifaddr(if_name, ip_addr_str, INET_ADDRSTRLEN) == 0)
-+ ip_addr.s_addr = inet_addr(ip_addr_str);
-+
-+ syslog(LOG_DEBUG, "Check protocol %s for port %d on ext_if %s %s, %8X",
-+ (proto==IPPROTO_TCP)?"tcp":"udp", eport, if_name, ip_addr_str, (unsigned)ip_addr.s_addr);
-+
-+ while (fgets(line, 255, f)) {
-+ char eaddr[68];
-+ unsigned tmp_port;
-+ if (sscanf(line, "%*d: %64[0-9A-Fa-f]:%x %*x:%*x %*x %*x:%*x "
-+ "%*x:%*x %*x %*d %*d %*llu",
-+ eaddr, &tmp_port) == 2
-+ ) {
-+ /* TODO add IPV6 support if enabled
-+ * Presently assumes IPV4 */
-+ // syslog(LOG_DEBUG, "port_in_use check port %d and address %s", tmp_port, eaddr);
-+ if (tmp_port == eport) {
-+ char tmp_addr[4];
-+ struct in_addr *tmp_ip_addr = (struct in_addr *)tmp_addr;
-+ if (sscanf(eaddr,"%2hhx%2hhx%2hhx%2hhx",
-+ &tmp_addr[3],&tmp_addr[2],&tmp_addr[1],&tmp_addr[0]) == 4)
-+ {
-+ if (tmp_ip_addr->s_addr == 0 || tmp_ip_addr->s_addr == ip_addr.s_addr)
-+ {
-+ found++;
-+ break; /* don't care how many, just that we found at least one */
-+ }
-+ }
-+ }
-+ }
-+ }
-+ fclose(f);
-+
-+ if (!found) {
-+ char iaddr_old[16];
-+ unsigned short iport_old;
-+ int i = 0;
-+ while (chains_to_check[i]) {
-+ if (get_nat_redirect_rule(chains_to_check[i], if_name, eport, proto,
-+ iaddr_old, sizeof(iaddr_old),&iport_old,
-+ 0, 0, 0, 0, 0, 0, 0) == 0)
-+ {
-+ syslog(LOG_DEBUG, "port_in_use check port %d on nat chain %s redirected to %s port %d", eport,
-+ chains_to_check[i], iaddr_old, iport_old);
-+ if (!(strcmp(iaddr, iaddr_old)==0 && iport==iport_old)) {
-+ /* only "in use" if redirected to somewhere else */
-+ found++;
-+ break; /* don't care how many, just that we found at least one */
-+ }
-+ }
-+ i++;
-+ }
-+ }
-+ return found;
-+}
-+
-diff -rupN miniupnpd-1.7-orig/portinuse.h miniupnpd-1.7/portinuse.h
---- miniupnpd-1.7-orig/portinuse.h 1969-12-31 19:00:00.000000000 -0500
-+++ miniupnpd-1.7/portinuse.h 2012-07-07 08:31:27.479918032 -0400
-@@ -0,0 +1,19 @@
-+/* */
-+/* MiniUPnP project
-+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
-+ * (c) 2006-2011 Thomas Bernard
-+ * This software is subject to the conditions detailed
-+ * in the LICENCE file provided within the distribution */
-+
-+#ifndef __PORTINUSE_H__
-+#define __PORTINUSE_H__
-+
-+/* portinuse()
-+ * determine wither a port is already in use
-+ * on a given interface.
-+ * returns: 0 not in use, 1 in use */
-+int
-+port_in_use(const char *if_name, unsigned port, int proto, const char *iaddr, unsigned iport);
-+
-+#endif
-+
-diff -rupN miniupnpd-1.7-orig/upnpredirect.c miniupnpd-1.7/upnpredirect.c
---- miniupnpd-1.7-orig/upnpredirect.c 2012-05-01 16:11:50.000000000 -0400
-+++ miniupnpd-1.7/upnpredirect.c 2012-07-07 08:47:44.000000000 -0400
-@@ -23,6 +23,7 @@
- #include "upnpredirect.h"
- #include "upnpglobalvars.h"
- #include "upnpevents.h"
-+#include "portinuse.h"
- #if defined(USE_NETFILTER)
- #include "netfilter/iptcrdr.h"
- #endif
-@@ -294,7 +295,12 @@ upnp_redirect(const char * rhost, unsign
- eport, protocol, iaddr_old, iport_old);
- return -2;
- }
-- } else {
-+ }
-+ else if (port_in_use(ext_if_name, eport, proto, iaddr, iport)) {
-+ syslog(LOG_INFO, "port %hu protocol %s already in use", eport, protocol);
-+ return -2;
-+ }
-+ else {
- timestamp = (leaseduration > 0) ? time(NULL) + leaseduration : 0;
- syslog(LOG_INFO, "redirecting port %hu to %s:%hu protocol %s for: %s",
- eport, iaddr, iport, protocol, desc);
Modified: branches/1.0/package/miniupnpd/miniupnpd.init
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.init 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd.init 2015-02-27 17:48:43 UTC (rev 6990)
@@ -169,7 +169,6 @@
notify_interval=60
clean_ruleset_interval=600
uuid=$UUID
-friendly_name=AstLinux Router
serial=000001
model_number=$(cat /etc/astlinux-release)" >> $MINIUPNPD_CONF
if [ -n "$UPNP_ALLOW" ]; then
Modified: branches/1.0/package/miniupnpd/miniupnpd.mk
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.mk 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd.mk 2015-02-27 17:48:43 UTC (rev 6990)
@@ -4,10 +4,10 @@
#
#############################################################
-MINIUPNPD_VERSION = 1.7
+MINIUPNPD_VERSION = 1.9.20141209
MINIUPNPD_SOURCE = miniupnpd-$(MINIUPNPD_VERSION).tar.gz
MINIUPNPD_SITE = http://miniupnp.free.fr/files
-MINIUPNPD_DEPENDENCIES = linux iptables
+MINIUPNPD_DEPENDENCIES = host-pkg-config linux iptables libnfnetlink
define MINIUPNPD_IPTABLES_PATH_FIX
$(SED) 's:/sbin/iptables:/usr/sbin/iptables:g' \
@@ -17,18 +17,13 @@
MINIUPNPD_POST_PATCH_HOOKS += MINIUPNPD_IPTABLES_PATH_FIX
define MINIUPNPD_CONFIGURE_CMDS
-# add this to make for IPv6... CONFIG_OPTIONS="--ipv6"
echo "$(LINUX_VERSION_PROBED)" >$(@D)/os.astlinux
- CONFIG_OPTIONS="--leasefile" \
- $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" CFLAGS="$(TARGET_CFLAGS)" \
- -f Makefile.linux -C $(@D) config.h
endef
define MINIUPNPD_BUILD_CMDS
- $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \
- CFLAGS="$(TARGET_CFLAGS) -I$(BUILD_DIR)/iptables-$(IPTABLES_VERSION)/include/ -DIPTABLES_143" \
- LIBS="$(STAGING_DIR)/usr/lib/libiptc.so $(STAGING_DIR)/usr/lib/libip4tc.so $(STAGING_DIR)/usr/lib/libip6tc.so" \
- -f Makefile.linux -C $(@D) miniupnpd
+ $(TARGET_CONFIGURE_OPTS) \
+ CONFIG_OPTIONS="--leasefile --portinuse" \
+ $(MAKE) -f Makefile.linux -C $(@D) miniupnpd
endef
define MINIUPNPD_INSTALL_TARGET_CMDS
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/runnix-uclibc.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6943-dirty Configuration
-# Sun Jan 25 21:06:44 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:53 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -724,6 +724,7 @@
# libmnl requires a toolchain with LARGEFILE support
#
# BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBPCAP is not set
# BR2_PACKAGE_PJSIP is not set
@@ -889,6 +890,7 @@
# BR2_PACKAGE_LRZSZ is not set
# BR2_PACKAGE_MDNSRESPONDER is not set
# BR2_PACKAGE_MII_DIAG is not set
+# BR2_PACKAGE_MINIUPNPD is not set
# BR2_PACKAGE_MROUTED is not set
# BR2_PACKAGE_MSMTP is not set
# BR2_PACKAGE_MTR is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/runnix.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan 3 11:05:47 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:49 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -515,6 +515,7 @@
# BR2_PACKAGE_NEON is not set
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBPCAP is not set
# BR2_PACKAGE_PJSIP is not set
@@ -625,6 +626,7 @@
# BR2_PACKAGE_LRZSZ is not set
# BR2_PACKAGE_MDNSRESPONDER is not set
# BR2_PACKAGE_MII_DIAG is not set
+# BR2_PACKAGE_MINIUPNPD is not set
# BR2_PACKAGE_MROUTED is not set
# BR2_PACKAGE_MSMTP is not set
# BR2_PACKAGE_MTR is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-27 14:21:14
|
Revision: 6989
http://sourceforge.net/p/astlinux/code/6989
Author: abelbeck
Date: 2015-02-27 14:21:12 +0000 (Fri, 27 Feb 2015)
Log Message:
-----------
monit, pre-5.13 upstream fixes
Added Paths:
-----------
branches/1.0/package/monit/monit-9000-pre-5.13.patch
Added: branches/1.0/package/monit/monit-9000-pre-5.13.patch
===================================================================
--- branches/1.0/package/monit/monit-9000-pre-5.13.patch (rev 0)
+++ branches/1.0/package/monit/monit-9000-pre-5.13.patch 2015-02-27 14:21:12 UTC (rev 6989)
@@ -0,0 +1,217 @@
+From 64fdf3195f3e5be7377a66318a54eb878c74fdc6 Mon Sep 17 00:00:00 2001
+From: tildeslash <in...@ti...>
+Date: Fri, 27 Feb 2015 07:51:39 +0100
+Subject: [PATCH] fix Issue #155 : Monit may crash if the system hostname
+ resolving failed.
+
+---
+ CHANGES | 2 ++
+ src/http/engine.c | 42 +++++++++++++++++++++---------------------
+ src/net.c | 5 ++---
+ src/util.c | 11 +++++------
+ 4 files changed, 30 insertions(+), 30 deletions(-)
+
+diff --git a/src/http/engine.c b/src/http/engine.c
+index 0a5025a..3fd4eb6 100644
+--- a/src/http/engine.c
++++ b/src/http/engine.c
+@@ -365,32 +365,32 @@ boolean_t Engine_addHostAllow(char *pattern) {
+ struct addrinfo *res, hints = {
+ .ai_family = AF_INET /* we support just IPv4 currently */
+ };
+- if (getaddrinfo(pattern, NULL, &hints, &res) != 0)
+- return false;
+ int added = 0;
+- for (struct addrinfo *_res = res; _res; _res = _res->ai_next) {
+- if (_res->ai_family == AF_INET) {
+- struct sockaddr_in *sin = (struct sockaddr_in *)_res->ai_addr;
+- HostsAllow_T h;
+- NEW(h);
+- memcpy(&h->network, &sin->sin_addr, 4);
+- h->mask = 0xffffffff;
+- LOCK(mutex)
+- {
+- if (_hasHostAllow(h)) {
+- DEBUG("Skipping redundant host '%s'\n", pattern);
+- FREE(h);
+- } else {
+- DEBUG("Adding host allow '%s'\n", pattern);
+- h->next = hostlist;
+- hostlist = h;
+- added++;
++ if (! getaddrinfo(pattern, NULL, &hints, &res)) {
++ for (struct addrinfo *_res = res; _res; _res = _res->ai_next) {
++ if (_res->ai_family == AF_INET) {
++ struct sockaddr_in *sin = (struct sockaddr_in *)_res->ai_addr;
++ HostsAllow_T h;
++ NEW(h);
++ memcpy(&h->network, &sin->sin_addr, 4);
++ h->mask = 0xffffffff;
++ LOCK(mutex)
++ {
++ if (_hasHostAllow(h)) {
++ DEBUG("Skipping redundant host '%s'\n", pattern);
++ FREE(h);
++ } else {
++ DEBUG("Adding host allow '%s'\n", pattern);
++ h->next = hostlist;
++ hostlist = h;
++ added++;
++ }
+ }
++ END_LOCK;
+ }
+- END_LOCK;
+ }
++ freeaddrinfo(res);
+ }
+- freeaddrinfo(res);
+ return added ? true : false;
+ }
+
+diff --git a/src/net.c b/src/net.c
+index 3426de3..55405a5 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -256,9 +256,8 @@ boolean_t check_host(const char *hostname) {
+ #endif
+ };
+ struct addrinfo *res;
+- if (getaddrinfo(hostname, NULL, &hints, &res) != 0)
+- return false;
+- freeaddrinfo(res);
++ if (! getaddrinfo(hostname, NULL, &hints, &res))
++ freeaddrinfo(res);
+ return true;
+ }
+
+diff --git a/src/util.c b/src/util.c
+index b1a0bcd..cca27b2 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -1922,23 +1922,22 @@ int Util_getfqdnhostname(char *buf, unsigned len) {
+ snprintf(buf, len, "%s", hostname);
+
+ // Try to look for FQDN hostname
+- struct addrinfo *result, hints = {
++ struct addrinfo *result = NULL, hints = {
+ .ai_family = AF_UNSPEC,
+ .ai_flags = AI_CANONNAME,
+ .ai_socktype = SOCK_STREAM
+ };
+- if ((status = getaddrinfo(hostname, NULL, &hints, &result))) {
+- LogError("Cannot translate '%s' to FQDN name -- %s\n", hostname, status == EAI_SYSTEM ? STRERROR : gai_strerror(status));
+- } else {
++ if (! (status = getaddrinfo(hostname, NULL, &hints, &result))) {
+ for (struct addrinfo *r = result; r; r = r->ai_next) {
+ if (Str_startsWith(r->ai_canonname, hostname)) {
+ snprintf(buf, len, "%s", r->ai_canonname);
+ break;
+ }
+ }
+- }
+- if (result)
+ freeaddrinfo(result);
++ } else {
++ LogError("Cannot translate '%s' to FQDN name -- %s\n", hostname, status == EAI_SYSTEM ? STRERROR : gai_strerror(status));
++ }
+ return 0;
+ }
+
+--
+2.1.1
+From 23fc19a034d39196fa462d599037ae52f3e51ba7 Mon Sep 17 00:00:00 2001
+From: tildeslash <in...@ti...>
+Date: Fri, 27 Feb 2015 08:52:47 +0100
+Subject: [PATCH] Fixed: Monit skipped the connection tests if no start program
+ was defined.
+
+---
+ CHANGES | 2 ++
+ libmonit | 2 +-
+ src/validate.c | 8 ++++----
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/validate.c b/src/validate.c
+index f506e9a..9432289 100644
+--- a/src/validate.c
++++ b/src/validate.c
+@@ -1027,14 +1027,14 @@ boolean_t check_process(Service_T s) {
+ }
+ }
+ if (s->portlist) {
+- /* pause port tests int the start timeout timeframe while the process is starting (it may take some time to the process before it starts accepting connections) */
+- if (s->start && s->inf->priv.process.uptime > s->start->timeout)
++ /* pause port tests in the start timeout timeframe while the process is starting (it may take some time to the process before it starts accepting connections) */
++ if (! s->start || s->inf->priv.process.uptime > s->start->timeout)
+ for (Port_T pp = s->portlist; pp; pp = pp->next)
+ check_connection(s, pp);
+ }
+ if (s->socketlist) {
+- /* pause socket tests int the start timeout timeframe while the process is starting (it may take some time to the process before it starts accepting connections) */
+- if (s->start && s->inf->priv.process.uptime > s->start->timeout)
++ /* pause socket tests in the start timeout timeframe while the process is starting (it may take some time to the process before it starts accepting connections) */
++ if (! s->start || s->inf->priv.process.uptime > s->start->timeout)
+ for (Port_T pp = s->socketlist; pp; pp = pp->next)
+ check_connection(s, pp);
+ }
+--
+2.1.1
+From 803d731da2232ab15b8aca18bb8d974567f0922e Mon Sep 17 00:00:00 2001
+From: tildeslash <in...@ti...>
+Date: Fri, 27 Feb 2015 12:17:37 +0100
+Subject: [PATCH] fix
+
+---
+ libmonit | 2 +-
+ src/net.c | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/net.c b/src/net.c
+index 55405a5..ac1fd58 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -256,8 +256,10 @@ boolean_t check_host(const char *hostname) {
+ #endif
+ };
+ struct addrinfo *res;
+- if (! getaddrinfo(hostname, NULL, &hints, &res))
++ if (! getaddrinfo(hostname, NULL, &hints, &res)) {
+ freeaddrinfo(res);
++ return false;
++ }
+ return true;
+ }
+
+--
+2.1.1
+From 1d27f53fcb3534e286b58cd54d2d2e5a0bf75762 Mon Sep 17 00:00:00 2001
+From: tildeslash <in...@ti...>
+Date: Fri, 27 Feb 2015 12:22:13 +0100
+Subject: [PATCH] fix
+
+---
+ src/net.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/net.c b/src/net.c
+index ac1fd58..823c744 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -256,11 +256,11 @@ boolean_t check_host(const char *hostname) {
+ #endif
+ };
+ struct addrinfo *res;
+- if (! getaddrinfo(hostname, NULL, &hints, &res)) {
++ if (getaddrinfo(hostname, NULL, &hints, &res) == 0) {
+ freeaddrinfo(res);
+- return false;
++ return true;
+ }
+- return true;
++ return false;
+ }
+
+
+--
+2.1.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-25 16:17:27
|
Revision: 6988
http://sourceforge.net/p/astlinux/code/6988
Author: abelbeck
Date: 2015-02-25 16:17:20 +0000 (Wed, 25 Feb 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-02-25 16:15:05 UTC (rev 6987)
+++ branches/1.0/docs/ChangeLog.txt 2015-02-25 16:17:20 UTC (rev 6988)
@@ -18,6 +18,8 @@
-- e2fsprogs, security fix: CVE-2015-1572
+-- Monit, version bump to 5.12, added IPv6 support
+
-- logrotate, version bump to 3.8.7
-- Kernel runtime parameters, add support for /etc/sysctl.conf via either /mnt/kd/sysctl.conf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-25 16:15:08
|
Revision: 6987
http://sourceforge.net/p/astlinux/code/6987
Author: abelbeck
Date: 2015-02-25 16:15:05 +0000 (Wed, 25 Feb 2015)
Log Message:
-----------
monit, version bump to 5.12, now with IPv6 support
Modified Paths:
--------------
branches/1.0/package/monit/monit-0001-no-force-static.patch
branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
branches/1.0/package/monit/monit-0110-http-base-url.patch
branches/1.0/package/monit/monit-0120-style-sheet.patch
branches/1.0/package/monit/monit.mk
Removed Paths:
-------------
branches/1.0/package/monit/monit-0200-linux-net-stats.patch
Modified: branches/1.0/package/monit/monit-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2015-02-25 16:15:05 UTC (rev 6987)
@@ -10,7 +10,7 @@
--- monit-5.7.orig/Makefile.am 2014-02-20 09:00:42.000000000 +0100
+++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200
@@ -89,7 +89,7 @@
- src/process/sysdep_@ARCH@.c
+ src/ssl/Ssl.c
monit_LDADD = libmonit/libmonit.la
-monit_LDFLAGS = -static $(EXTLDFLAGS)
Modified: branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
===================================================================
--- branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit-0100-localhost-sendmail.patch 2015-02-25 16:15:05 UTC (rev 6987)
@@ -28,7 +28,7 @@
+ const char *mailcmd = "/usr/sbin/sendmail -t";
+ char *tmpname = CALLOC(sizeof(char), strlen(template) + 1);
+ char *system_cmd = CALLOC(sizeof(char), STRLEN);
-+ int failed = FALSE;
++ int failed = false;
+
+ for (m = mail; m; m = m->next) {
+ strcpy(tmpname, template);
@@ -44,7 +44,7 @@
+ snprintf(system_cmd, STRLEN, "( %s < %s ; rm -f %s ) &", mailcmd, tmpname, tmpname);
+ spawn_system_cmd(system_cmd);
+ } else {
-+ failed = TRUE;
++ failed = true;
+ LogError("Sendmail: Unable to launch '%s' (can't create temporary file)\n", mailcmd);
+ }
+ }
@@ -57,7 +57,7 @@
/* ------------------------------------------------------------------ Public */
-@@ -199,6 +249,10 @@
+@@ -198,6 +248,10 @@
ASSERT(mail);
@@ -92,16 +92,16 @@
+ pthread_sigmask(SIG_BLOCK, &mask, &save);
+
+ pid = fork();
-+ if(pid < 0) {
++ if (pid < 0) {
+ LogError("Cannot fork a new process -- %s\n", STRERROR);
+ exit(1);
+ }
+
-+ if(pid == 0) {
++ if (pid == 0) {
+
-+ if(! Run.isdaemon) {
-+ for(int i = 0; i < 3; i++)
-+ if(close(i) == -1 || open("/dev/null", O_RDWR) != i)
++ if (! Run.isdaemon) {
++ for (int i = 0; i < 3; i++)
++ if (close(i) == -1 || open("/dev/null", O_RDWR) != i)
+ stat_loc |= redirect_ERROR;
+ }
+
@@ -110,12 +110,12 @@
+ setsid();
+
+ pid = fork();
-+ if(pid < 0) {
++ if (pid < 0) {
+ stat_loc |= fork_ERROR;
+ _exit(stat_loc);
+ }
+
-+ if(pid == 0) {
++ if (pid == 0) {
+ /*
+ * Reset all signals, so the spawned process is *not* created
+ * with any inherited SIG_BLOCKs
@@ -137,7 +137,7 @@
+ }
+
+ /* Wait for first child - aka second parent, to exit */
-+ if(waitpid(pid, &stat_loc, 0) != pid) {
++ if (waitpid(pid, &stat_loc, 0) != pid) {
+ LogError("Waitpid error\n");
+ }
+
Modified: branches/1.0/package/monit/monit-0110-http-base-url.patch
===================================================================
--- branches/1.0/package/monit/monit-0110-http-base-url.patch 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit-0110-http-base-url.patch 2015-02-25 16:15:05 UTC (rev 6987)
@@ -9,15 +9,15 @@
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
-@@ -504,6 +506,11 @@
- internal_error(S, SC_BAD_REQUEST, "[error] URL too long");
- return NULL;
- }
+@@ -506,6 +508,11 @@
+ internal_error(S, SC_BAD_REQUEST, "[error] URL too long");
+ return NULL;
+ }
+#ifdef HTTP_BASE_URL
-+ if(Str_startsWith(url, HTTP_BASE_URL)) {
-+ Str_copy(url, url + strlen(HTTP_BASE_URL), strlen(url) - strlen(HTTP_BASE_URL));
-+ }
++ if (Str_startsWith(url, HTTP_BASE_URL)) {
++ Str_copy(url, url + strlen(HTTP_BASE_URL), strlen(url) - strlen(HTTP_BASE_URL));
++ }
+#endif
- NEW(req);
- req->S = S;
- Util_urlDecode(url);
+ NEW(req);
+ req->S = S;
+ Util_urlDecode(url);
Modified: branches/1.0/package/monit/monit-0120-style-sheet.patch
===================================================================
--- branches/1.0/package/monit/monit-0120-style-sheet.patch 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit-0120-style-sheet.patch 2015-02-25 16:15:05 UTC (rev 6987)
@@ -1,37 +1,37 @@
--- monit-5.10/src/http/cervlet.c.orig 2014-12-18 15:56:05.000000000 -0600
+++ monit-5.10/src/http/cervlet.c 2014-12-18 15:57:08.000000000 -0600
-@@ -329,10 +329,10 @@
- " a:hover {text-decoration: none;} "\
- " a {text-decoration: underline;color:#222} "\
- " table {border-collapse:collapse; border:0;} "\
-- " .stripe {background:#EDF5FF} "\
-- " .rule {background:#ddd} "\
-- " .red-text {color:#ff0000;} "\
-- " .green-text {color:#00ff00;} "\
-+ " .stripe {background:#EFEFE7} "\
-+ " .rule {background:#E7E5E2} "\
-+ " .red-text {color:#dd0000;} "\
-+ " .green-text {color:#008000;} "\
- " .gray-text {color:#999999;} "\
- " .blue-text {color:#0000ff;} "\
- " .orange-text {color:#ff8800;} "\
-@@ -342,16 +342,16 @@
- " /*Opera Fix*/body:before {content:\"\";height:100%%;float:left;width:0;margin-top:-32767px;/} "\
- " #footer {position: relative;margin-top: -50px; height: 50px; clear:both; font-size:11px;color:#777;text-align:center;} "\
- " #footer a {color:#333;} #footer a:hover {text-decoration: none;} "\
-- " #nav {background:#ddd;font:normal normal normal 14px/0px 'HelveticaNeue', Helvetica;} "\
-+ " #nav {background:#E7E5E2;font:normal normal normal 14px/0px 'HelveticaNeue', Helvetica;} "\
- " #nav td {padding:5px 10px;} "\
-- " #header {margin-bottom:30px;background:#EFF7FF} "\
-+ " #header {margin-bottom:30px;background:#EFEFE7} "\
- " #nav, #header {border-bottom:1px solid #ccc;} "\
- " #header-row {width:95%%;} "\
- " #header-row th {padding:30px 10px 10px 10px;font-size:120%%;} "\
- " #header-row td {padding:3px 10px;} "\
- " #header-row .first {min-width:200px;width:200px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} "\
- " #status-table {width:95%%;} "\
-- " #status-table th {text-align:left;background:#edf5ff;font-weight:normal;} "\
-+ " #status-table th {text-align:left;background:#EFEFE7;font-weight:normal;} "\
- " #status-table th, #status-table td, #status-table tr {border:1px solid #ccc;padding:5px;} "\
- " #buttons {font-size:20px; margin:40px 0 20px 0;} "\
- " #buttons td {padding-right:50px;} "\
+@@ -319,10 +319,10 @@
+ " a:hover {text-decoration: none;} "\
+ " a {text-decoration: underline;color:#222} "\
+ " table {border-collapse:collapse; border:0;} "\
+- " .stripe {background:#EDF5FF} "\
+- " .rule {background:#ddd} "\
+- " .red-text {color:#ff0000;} "\
+- " .green-text {color:#00ff00;} "\
++ " .stripe {background:#EFEFE7} "\
++ " .rule {background:#E7E5E2} "\
++ " .red-text {color:#dd0000;} "\
++ " .green-text {color:#008000;} "\
+ " .gray-text {color:#999999;} "\
+ " .blue-text {color:#0000ff;} "\
+ " .orange-text {color:#ff8800;} "\
+@@ -332,16 +332,16 @@
+ " /*Opera Fix*/body:before {content:\"\";height:100%%;float:left;width:0;margin-top:-32767px;/} "\
+ " #footer {position: relative;margin-top: -50px; height: 50px; clear:both; font-size:11px;color:#777;text-align:center;} "\
+ " #footer a {color:#333;} #footer a:hover {text-decoration: none;} "\
+- " #nav {background:#ddd;font:normal normal normal 14px/0px 'HelveticaNeue', Helvetica;} "\
++ " #nav {background:#E7E5E2;font:normal normal normal 14px/0px 'HelveticaNeue', Helvetica;} "\
+ " #nav td {padding:5px 10px;} "\
+- " #header {margin-bottom:30px;background:#EFF7FF} "\
++ " #header {margin-bottom:30px;background:#EFEFE7} "\
+ " #nav, #header {border-bottom:1px solid #ccc;} "\
+ " #header-row {width:95%%;} "\
+ " #header-row th {padding:30px 10px 10px 10px;font-size:120%%;} "\
+ " #header-row td {padding:3px 10px;} "\
+ " #header-row .first {min-width:200px;width:200px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} "\
+ " #status-table {width:95%%;} "\
+- " #status-table th {text-align:left;background:#edf5ff;font-weight:normal;} "\
++ " #status-table th {text-align:left;background:#EFEFE7;font-weight:normal;} "\
+ " #status-table th, #status-table td, #status-table tr {border:1px solid #ccc;padding:5px;} "\
+ " #buttons {font-size:20px; margin:40px 0 20px 0;} "\
+ " #buttons td {padding-right:50px;} "\
Deleted: branches/1.0/package/monit/monit-0200-linux-net-stats.patch
===================================================================
--- branches/1.0/package/monit/monit-0200-linux-net-stats.patch 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit-0200-linux-net-stats.patch 2015-02-25 16:15:05 UTC (rev 6987)
@@ -1,88 +0,0 @@
---- monit-5.11/libmonit/src/system/NetStatistics.c.orig 2014-12-24 13:59:56.000000000 -0600
-+++ monit-5.11/libmonit/src/system/NetStatistics.c 2014-12-24 14:39:16.000000000 -0600
-@@ -71,6 +71,8 @@
-
- #define T NetStatistics_T
-
-+#define DO_FIX_32BIT 1
-+#define NO_FIX_32BIT 0
-
- static struct {
- struct ifaddrs *addrs;
-@@ -81,6 +83,7 @@
- typedef struct NetStatisticsData_T {
- long long last;
- long long now;
-+ long long raw;
- long long minute[60];
- long long hour[24];
- } NetStatisticsData_T;
-@@ -122,6 +125,22 @@
- /* --------------------------------------------------------------- Private */
-
-
-+static void _updateRawStats(NetStatisticsData_T *data, long long value, int fix32bit) {
-+ long long raw = value;
-+
-+ if (fix32bit == DO_FIX_32BIT) {
-+ if (raw < data->raw) {
-+ raw += 4294967296LL;
-+ }
-+ }
-+ data->last = data->now;
-+ if (raw > data->raw) {
-+ data->now += raw - data->raw;
-+ }
-+ data->raw = value;
-+}
-+
-+
- #if defined DARWIN
- #include "os/macosx/NetStatistics.c"
- #elif defined FREEBSD
-@@ -153,6 +172,18 @@
- S->state = -1;
- S->duplex = -1;
- S->speed = 0LL;
-+ S->ibytes.now = 0LL;
-+ S->ipackets.now = 0LL;
-+ S->ierrors.now = 0LL;
-+ S->obytes.now = 0LL;
-+ S->opackets.now = 0LL;
-+ S->oerrors.now = 0LL;
-+ S->ibytes.raw = 0LL;
-+ S->ipackets.raw = 0LL;
-+ S->ierrors.raw = 0LL;
-+ S->obytes.raw = 0LL;
-+ S->opackets.raw = 0LL;
-+ S->oerrors.raw = 0LL;
- _resetData(&(S->ibytes), -1LL);
- _resetData(&(S->ipackets), -1LL);
- _resetData(&(S->ierrors), -1LL);
---- monit-5.11/libmonit/src/system/os/linux/NetStatistics.c.orig 2014-12-24 14:00:18.000000000 -0600
-+++ monit-5.11/libmonit/src/system/os/linux/NetStatistics.c 2014-12-24 14:55:04.000000000 -0600
-@@ -90,18 +90,12 @@
- if (sscanf(buf, "%256[^:]: %lld %lld %lld %*s %*s %*s %*s %*s %lld %lld %lld %*s %*s %*s %*s %*s", iface, &ibytes, &ipackets, &ierrors, &obytes, &opackets, &oerrors) == 7 && Str_isEqual(Str_trim(iface), interface)) {
- S->timestamp.last = S->timestamp.now;
- S->timestamp.now = Time_milli();
-- S->ipackets.last = S->ipackets.now;
-- S->ipackets.now = ipackets;
-- S->ibytes.last = S->ibytes.now;
-- S->ibytes.now = ibytes;
-- S->ierrors.last = S->ierrors.now;
-- S->ierrors.now = ierrors;
-- S->opackets.last = S->opackets.now;
-- S->opackets.now = opackets;
-- S->obytes.last = S->obytes.now;
-- S->obytes.now = obytes;
-- S->oerrors.last = S->oerrors.now;
-- S->oerrors.now = oerrors;
-+ _updateRawStats(&(S->ibytes), ibytes, DO_FIX_32BIT);
-+ _updateRawStats(&(S->ipackets), ipackets, DO_FIX_32BIT);
-+ _updateRawStats(&(S->ierrors), ierrors, DO_FIX_32BIT);
-+ _updateRawStats(&(S->obytes), obytes, DO_FIX_32BIT);
-+ _updateRawStats(&(S->opackets), opackets, DO_FIX_32BIT);
-+ _updateRawStats(&(S->oerrors), oerrors, DO_FIX_32BIT);
- fclose(f);
- return true;
- }
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2015-02-23 21:42:12 UTC (rev 6986)
+++ branches/1.0/package/monit/monit.mk 2015-02-25 16:15:05 UTC (rev 6987)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.11
+MONIT_VERSION = 5.12
MONIT_SITE = http://mmonit.com/monit/dist
MONIT_DEPENDENCIES = host-bison host-flex
#
@@ -12,6 +12,7 @@
MONIT_AUTORECONF = YES
MONIT_CONF_ENV = \
+ ac_cv_ipv6=yes \
libmonit_cv_setjmp_available=yes \
libmonit_cv_vsnprintf_c99_conformant=yes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-23 21:42:24
|
Revision: 6986
http://sourceforge.net/p/astlinux/code/6986
Author: abelbeck
Date: 2015-02-23 21:42:12 +0000 (Mon, 23 Feb 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-02-23 21:40:25 UTC (rev 6985)
+++ branches/1.0/docs/ChangeLog.txt 2015-02-23 21:42:12 UTC (rev 6986)
@@ -16,6 +16,8 @@
-- sudo, version bump to 1.8.12, security fix: CVE-2014-9680
+-- e2fsprogs, security fix: CVE-2015-1572
+
-- logrotate, version bump to 3.8.7
-- Kernel runtime parameters, add support for /etc/sysctl.conf via either /mnt/kd/sysctl.conf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-23 21:40:38
|
Revision: 6985
http://sourceforge.net/p/astlinux/code/6985
Author: abelbeck
Date: 2015-02-23 21:40:25 +0000 (Mon, 23 Feb 2015)
Log Message:
-----------
e2fsprogs, security fix: CVE-2015-1572, fix potential buffer overflow in closefs()
Added Paths:
-----------
branches/1.0/package/e2fsprogs/e2fsprogs-CVE-2015-1572.patch
Added: branches/1.0/package/e2fsprogs/e2fsprogs-CVE-2015-1572.patch
===================================================================
--- branches/1.0/package/e2fsprogs/e2fsprogs-CVE-2015-1572.patch (rev 0)
+++ branches/1.0/package/e2fsprogs/e2fsprogs-CVE-2015-1572.patch 2015-02-23 21:40:25 UTC (rev 6985)
@@ -0,0 +1,58 @@
+From 49d0fe2a14f2a23da2fe299643379b8c1d37df73 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <ty...@mi...>
+Date: Fri, 6 Feb 2015 12:46:39 -0500
+Subject: [PATCH] libext2fs: fix potential buffer overflow in closefs()
+
+Upstream commit 49d0fe2a14f2.
+
+The bug fix in f66e6ce4446: "libext2fs: avoid buffer overflow if
+s_first_meta_bg is too big" had a typo in the fix for
+ext2fs_closefs(). In practice most of the security exposure was from
+the openfs path, since this meant if there was a carefully crafted
+file system, buffer overrun would be triggered when the file system was
+opened.
+
+However, if corrupted file system didn't trip over some corruption
+check, and then the file system was modified via tune2fs or debugfs,
+such that the superblock was marked dirty and then written out via the
+closefs() path, it's possible that the buffer overrun could be
+triggered when the file system is closed.
+
+Also clear up a signed vs unsigned warning while we're at it.
+
+Thanks to Nick Kralevich <nn...@go...> for asking me to look at
+compiler warning in the code in question, which led me to notice the
+bug in f66e6ce4446.
+
+Addresses: CVE-2015-1572
+
+Signed-off-by: Theodore Ts'o <ty...@mi...>
+Signed-off-by: Baruch Siach <ba...@tk...>
+---
+ lib/ext2fs/closefs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c
+index 1f9911311a1a..ab5b2fb2365e 100644
+--- a/lib/ext2fs/closefs.c
++++ b/lib/ext2fs/closefs.c
+@@ -287,7 +287,7 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags)
+ dgrp_t j;
+ #endif
+ char *group_ptr;
+- int old_desc_blocks;
++ blk64_t old_desc_blocks;
+ struct ext2fs_numeric_progress_struct progress;
+
+ EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
+@@ -346,7 +346,7 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags)
+ group_ptr = (char *) group_shadow;
+ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) {
+ old_desc_blocks = fs->super->s_first_meta_bg;
+- if (old_desc_blocks > fs->super->s_first_meta_bg)
++ if (old_desc_blocks > fs->desc_blocks)
+ old_desc_blocks = fs->desc_blocks;
+ } else
+ old_desc_blocks = fs->desc_blocks;
+--
+2.1.4
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-21 17:18:03
|
Revision: 6984
http://sourceforge.net/p/astlinux/code/6984
Author: abelbeck
Date: 2015-02-21 17:18:01 +0000 (Sat, 21 Feb 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-02-21 17:16:16 UTC (rev 6983)
+++ branches/1.0/docs/ChangeLog.txt 2015-02-21 17:18:01 UTC (rev 6984)
@@ -38,7 +38,7 @@
** Web Interface
--- no change
+-- Prefs and System tab, set default "Repository URL" to use Asterisk 13 if installed.
Additions for AstLinux 1.2.2:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-21 17:16:24
|
Revision: 6983
http://sourceforge.net/p/astlinux/code/6983
Author: abelbeck
Date: 2015-02-21 17:16:16 +0000 (Sat, 21 Feb 2015)
Log Message:
-----------
web interface, Prefs and System tab, set default 'Repository URL' to use Asterisk 13 if installed
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/common/functions.php
branches/1.0/package/webinterface/altweb/common/version.php
Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php 2015-02-20 18:37:26 UTC (rev 6982)
+++ branches/1.0/package/webinterface/altweb/common/functions.php 2015-02-21 17:16:16 UTC (rev 6983)
@@ -616,8 +616,10 @@
$str .= 'firmware-1.x';
} elseif ($ver3 === '1.8') {
$str .= 'ast18-firmware-1.x';
+ } elseif ($ver3 === '11.') {
+ $str .= 'ast11-firmware-1.x';
} else {
- $str .= 'ast11-firmware-1.x';
+ $str .= 'ast13-firmware-1.x';
}
return($str);
}
Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php 2015-02-20 18:37:26 UTC (rev 6982)
+++ branches/1.0/package/webinterface/altweb/common/version.php 2015-02-21 17:16:16 UTC (rev 6983)
@@ -1,6 +1,6 @@
<?php
// version.php for AstLinux Alternate Web Interface
-$GUI_VERSION = '1.8.32';
+$GUI_VERSION = '1.8.33';
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-20 18:37:30
|
Revision: 6982
http://sourceforge.net/p/astlinux/code/6982
Author: abelbeck
Date: 2015-02-20 18:37:26 +0000 (Fri, 20 Feb 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-02-20 18:32:02 UTC (rev 6981)
+++ branches/1.0/docs/ChangeLog.txt 2015-02-20 18:37:26 UTC (rev 6982)
@@ -12,8 +12,10 @@
** System
--- php, version bump to 5.5.21, major version change, bug and security fixes
+-- php, version bump to 5.5.22, major version change, bug and security fixes
+-- sudo, version bump to 1.8.12, security fix: CVE-2014-9680
+
-- logrotate, version bump to 3.8.7
-- Kernel runtime parameters, add support for /etc/sysctl.conf via either /mnt/kd/sysctl.conf
@@ -24,6 +26,8 @@
-- ntpd/sntp, version bump to 4.2.8p1, security fixes: CVE-2014-9297 and CVE-2014-9298
+-- netsnmp, version bump to 5.7.3, security fix: CVE-2014-2285
+
-- (Custom Build Only) kamailio, version bump to 4.1.8
** Asterisk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-20 18:32:09
|
Revision: 6981
http://sourceforge.net/p/astlinux/code/6981
Author: abelbeck
Date: 2015-02-20 18:32:02 +0000 (Fri, 20 Feb 2015)
Log Message:
-----------
sudo, version bump to 1.8.12, security fix: CVE-2014-9680
Modified Paths:
--------------
branches/1.0/package/sudo/sudo.mk
Modified: branches/1.0/package/sudo/sudo.mk
===================================================================
--- branches/1.0/package/sudo/sudo.mk 2015-02-20 17:51:46 UTC (rev 6980)
+++ branches/1.0/package/sudo/sudo.mk 2015-02-20 18:32:02 UTC (rev 6981)
@@ -4,22 +4,26 @@
#
#############################################################
-SUDO_VERSION = 1.8.6p7
-SUDO_SITE = http://www.sudo.ws/sudo/dist
+SUDO_VERSION = 1.8.12
+SUDO_SITE = http://www.sudo.ws/sudo/dist
+# This is to avoid sudo's make install from chown()ing files which fails
+SUDO_INSTALL_TARGET_OPT = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install
+
SUDO_CONF_OPT = \
- --without-lecture \
- --without-sendmail \
- --without-umask \
- --with-logging=syslog \
- --without-interfaces \
- --without-pam
+ --without-lecture \
+ --without-sendmail \
+ --without-umask \
+ --with-logging=syslog \
+ --without-interfaces \
+ --without-pam \
+ --with-env-editor
# mksigname/mksiglist needs to run on build host to generate source files
define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST
$(MAKE) $(HOST_CONFIGURE_OPTS) \
- CPPFLAGS="$(HOST_CPPFLAGS) -I../include -I.." \
- -C $(@D)/compat mksigname mksiglist
+ CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \
+ -C $(@D)/lib/util mksigname mksiglist
endef
SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-20 17:51:54
|
Revision: 6980
http://sourceforge.net/p/astlinux/code/6980
Author: abelbeck
Date: 2015-02-20 17:51:46 +0000 (Fri, 20 Feb 2015)
Log Message:
-----------
php, version bump to 5.5.22
Modified Paths:
--------------
branches/1.0/package/php/php.mk
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2015-02-20 17:35:32 UTC (rev 6979)
+++ branches/1.0/package/php/php.mk 2015-02-20 17:51:46 UTC (rev 6980)
@@ -4,7 +4,7 @@
#
#############################################################
-PHP_VERSION = 5.5.21
+PHP_VERSION = 5.5.22
PHP_SITE = http://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-20 17:35:35
|
Revision: 6979
http://sourceforge.net/p/astlinux/code/6979
Author: abelbeck
Date: 2015-02-20 17:35:32 +0000 (Fri, 20 Feb 2015)
Log Message:
-----------
netsnmp, version bump to 5.7.3, security fix CVE-2014-2285 though perl related
Modified Paths:
--------------
branches/1.0/package/netsnmp/netsnmp.mk
Modified: branches/1.0/package/netsnmp/netsnmp.mk
===================================================================
--- branches/1.0/package/netsnmp/netsnmp.mk 2015-02-20 16:37:52 UTC (rev 6978)
+++ branches/1.0/package/netsnmp/netsnmp.mk 2015-02-20 17:35:32 UTC (rev 6979)
@@ -4,22 +4,33 @@
#
#############################################################
-NETSNMP_VERSION = 5.7.2.1
+NETSNMP_VERSION = 5.7.3
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
NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=no
-NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \
- --with-defaults --enable-mini-agent --without-rpm \
- --with-logfile=none --without-kmem-usage \
- --enable-as-needed --disable-debugging --without-perl-modules \
- --disable-embedded-perl --disable-perl-cc-checks \
- --disable-scripts --with-default-snmp-version="1" \
- --enable-silent-libtool --enable-mfd-rewrites \
- --with-sys-contact="root@localhost" \
- --with-sys-location="Unknown" \
- --with-mib-modules="host ucd-snmp/dlmod agentx" \
- --with-out-mib-modules="disman/event disman/schedule utilities"
+NETSNMP_CONF_OPT = \
+ --with-persistent-directory=/var/lib/snmp \
+ --disable-static \
+ --with-defaults \
+ --enable-mini-agent \
+ --without-rpm \
+ --with-logfile=none \
+ --without-kmem-usage \
+ --enable-as-needed \
+ --disable-debugging \
+ --without-perl-modules \
+ --disable-embedded-perl \
+ --disable-perl-cc-checks \
+ --disable-scripts \
+ --with-default-snmp-version="1" \
+ --enable-silent-libtool \
+ --enable-mfd-rewrites \
+ --with-sys-contact="root@localhost" \
+ --with-sys-location="Unknown" \
+ --with-mib-modules="host ucd-snmp/dlmod agentx" \
+ --with-out-mib-modules="disman/event disman/schedule utilities" \
+ --disable-manuals
NETSNMP_MAKE = $(MAKE1)
NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX
@@ -38,11 +49,6 @@
NETSNMP_CONF_OPT += --without-openssl
endif
-# Docs
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
- NETSNMP_CONF_OPT += --disable-manuals
-endif
-
# Remove IPv6 MIBs if there's no IPv6
ifneq ($(BR2_INET_IPV6),y)
define NETSNMP_REMOVE_MIBS_IPV6
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-20 16:37:54
|
Revision: 6978
http://sourceforge.net/p/astlinux/code/6978
Author: abelbeck
Date: 2015-02-20 16:37:52 +0000 (Fri, 20 Feb 2015)
Log Message:
-----------
netsnmp, build system, set ac_cv_NETSNMP_CAN_USE_SYSCTL=no as per upstream
Ref: http://git.buildroot.net/buildroot/commit/package?id=e6b614c9c6e3e1cf9d8a2ee04c471aff9fb7b2ef
Modified Paths:
--------------
branches/1.0/package/netsnmp/netsnmp.mk
Modified: branches/1.0/package/netsnmp/netsnmp.mk
===================================================================
--- branches/1.0/package/netsnmp/netsnmp.mk 2015-02-19 15:44:25 UTC (rev 6977)
+++ branches/1.0/package/netsnmp/netsnmp.mk 2015-02-20 16:37:52 UTC (rev 6978)
@@ -8,7 +8,7 @@
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
-NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes
+NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=no
NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \
--with-defaults --enable-mini-agent --without-rpm \
--with-logfile=none --without-kmem-usage \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-19 15:44:33
|
Revision: 6977
http://sourceforge.net/p/astlinux/code/6977
Author: abelbeck
Date: 2015-02-19 15:44:25 +0000 (Thu, 19 Feb 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-02-19 15:34:29 UTC (rev 6976)
+++ branches/1.0/docs/ChangeLog.txt 2015-02-19 15:44:25 UTC (rev 6977)
@@ -16,6 +16,10 @@
-- logrotate, version bump to 3.8.7
+-- Kernel runtime parameters, add support for /etc/sysctl.conf via either /mnt/kd/sysctl.conf
+ or the rc.conf variable KERNEL_SYSCTL, disabled by default.
+ Example: KERNEL_SYSCTL="kernel.panic=3 vm.min_free_kbytes=8192"
+
** Networking
-- ntpd/sntp, version bump to 4.2.8p1, security fixes: CVE-2014-9297 and CVE-2014-9298
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-19 15:34:31
|
Revision: 6976
http://sourceforge.net/p/astlinux/code/6976
Author: abelbeck
Date: 2015-02-19 15:34:29 +0000 (Thu, 19 Feb 2015)
Log Message:
-----------
kernel runtime params, add support for /etc/sysctl.conf via either /mnt/kd/sysctl.conf or the rc.conf variable KERNEL_SYSCTL, disabled by default
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/sysctl
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S97sysctl
branches/1.0/project/astlinux/target_skeleton/etc/sysctl.conf
Added: branches/1.0/project/astlinux/target_skeleton/etc/init.d/sysctl
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/sysctl (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/sysctl 2015-02-19 15:34:29 UTC (rev 6976)
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+gen_sysctl_conf()
+{
+ local i param value IFS
+
+ unset IFS
+ for i in $KERNEL_SYSCTL; do
+ param="$(echo "$i" | cut -s -d'=' -f1)"
+ value="$(echo "$i" | cut -s -d'=' -f2)"
+ if [ -n "$param" -a -n "$value" ]; then
+ echo "$param = $value"
+ fi
+ done
+}
+
+init () {
+
+ if [ -f /mnt/kd/sysctl.conf ]; then
+ echo "# Autogenerated. Edit /mnt/kd/sysctl.conf file.
+" > /tmp/etc/sysctl.conf
+ cat /mnt/kd/sysctl.conf >>/tmp/etc/sysctl.conf
+ elif [ -n "$KERNEL_SYSCTL" ]; then
+ echo "# Autogenerated. Do not edit.
+# A manually generated sysctl config will use /mnt/kd/sysctl.conf if it exists.
+" > /tmp/etc/sysctl.conf
+ gen_sysctl_conf >>/tmp/etc/sysctl.conf
+ elif [ -f /etc/sysctl.conf ]; then
+ rm -f /tmp/etc/sysctl.conf
+ fi
+}
+
+start () {
+
+ if [ -f /etc/sysctl.conf ]; then
+ echo "Setting kernel runtime parameters..."
+ sysctl -p /etc/sysctl.conf >/dev/null
+ fi
+}
+
+stop () {
+ :
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
+
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/init.d/sysctl
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S97sysctl
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S97sysctl (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S97sysctl 2015-02-19 15:34:29 UTC (rev 6976)
@@ -0,0 +1 @@
+link ../../init.d/sysctl
\ No newline at end of file
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S97sysctl
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/project/astlinux/target_skeleton/etc/sysctl.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/sysctl.conf (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/sysctl.conf 2015-02-19 15:34:29 UTC (rev 6976)
@@ -0,0 +1 @@
+link /tmp/etc/sysctl.conf
\ No newline at end of file
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/sysctl.conf
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-02-12 18:06:38 UTC (rev 6975)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-02-19 15:34:29 UTC (rev 6976)
@@ -802,6 +802,11 @@
## Module options
## Edit /etc/modprobe.d/options.conf if you need to pass any options.
+## Kernel runtime parameters
+## List of kernel sysctl 'param=value' entries, space or newline separated.
+## Note: If /mnt/kd/sysctl.conf exists, it will be used instead.
+#KERNEL_SYSCTL="kernel.panic=3 vm.min_free_kbytes=8192"
+
## LMSensors Modules
## List your hardware modules, seperated by spaces
## You will also need to create a sensors.conf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-12 18:06:45
|
Revision: 6975
http://sourceforge.net/p/astlinux/code/6975
Author: abelbeck
Date: 2015-02-12 18:06:38 +0000 (Thu, 12 Feb 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-02-11 17:42:56 UTC (rev 6974)
+++ branches/1.0/docs/ChangeLog.txt 2015-02-12 18:06:38 UTC (rev 6975)
@@ -18,6 +18,8 @@
** Networking
+-- ntpd/sntp, version bump to 4.2.8p1, security fixes: CVE-2014-9297 and CVE-2014-9298
+
-- (Custom Build Only) kamailio, version bump to 4.1.8
** Asterisk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-11 17:42:59
|
Revision: 6974
http://sourceforge.net/p/astlinux/code/6974
Author: abelbeck
Date: 2015-02-11 17:42:56 +0000 (Wed, 11 Feb 2015)
Log Message:
-----------
build system, fix patching libtool with a verson with a single 'dot' and eliminate errors like:
/bin/sh: line 0: test: 2.4: integer expression expected
Modified Paths:
--------------
branches/1.0/package/Makefile.autotools.in
Modified: branches/1.0/package/Makefile.autotools.in
===================================================================
--- branches/1.0/package/Makefile.autotools.in 2015-02-11 16:39:52 UTC (rev 6973)
+++ branches/1.0/package/Makefile.autotools.in 2015-02-11 17:42:56 UTC (rev 6974)
@@ -150,10 +150,10 @@
-a "$$($$(PKG)_AUTORECONF)" != "YES"; then \
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 \
+ sed -e 's/\([0-9][.][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]*[.]*\)\([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; \
@@ -182,9 +182,9 @@
$(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 -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/\"//'`; \
+ sed -e 's/\([0-9][.][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]*[.]*\)\([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\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-11 16:39:55
|
Revision: 6973
http://sourceforge.net/p/astlinux/code/6973
Author: abelbeck
Date: 2015-02-11 16:39:52 +0000 (Wed, 11 Feb 2015)
Log Message:
-----------
ntp, version bump to 4.2.8p1, security fixes: CVE-2014-9297 and CVE-2014-9298
Modified Paths:
--------------
branches/1.0/package/ntp/ntp.mk
Modified: branches/1.0/package/ntp/ntp.mk
===================================================================
--- branches/1.0/package/ntp/ntp.mk 2015-02-11 01:27:24 UTC (rev 6972)
+++ branches/1.0/package/ntp/ntp.mk 2015-02-11 16:39:52 UTC (rev 6973)
@@ -3,7 +3,7 @@
# ntp
#
#############################################################
-NTP_VERSION = 4.2.8
+NTP_VERSION = 4.2.8p1
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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-11 01:27:26
|
Revision: 6972
http://sourceforge.net/p/astlinux/code/6972
Author: abelbeck
Date: 2015-02-11 01:27:24 +0000 (Wed, 11 Feb 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-02-11 01:24:30 UTC (rev 6971)
+++ branches/1.0/docs/ChangeLog.txt 2015-02-11 01:27:24 UTC (rev 6972)
@@ -22,7 +22,7 @@
** Asterisk
--- Asterisk 1.8.32.2 (no change), 11.15.1 (no change) and 13.1.1 (no change)
+-- Asterisk 1.8.32.2 (no change), 11.16.0 (version bump) and 13.2.0 (version bump)
-- DAHDI, dahdi-linux 2.8.0.1 (no change) and dahdi-tools 2.8.0 (no change)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
