astlinux-commits Mailing List for AstLinux (Page 17)

Brought to you by: dhartman, krisk84

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

Flat | Threaded

<< < 1 .. 15 16 17 18 19 .. 329 > >> (Page 17 of 329)

[Astlinux-commits] SF.net SVN: astlinux:[8020] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2016-12-06 13:45:51

Revision: 8020
          http://sourceforge.net/p/astlinux/code/8020
Author:   abelbeck
Date:     2016-12-06 13:45:48 +0000 (Tue, 06 Dec 2016)
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	2016-12-05 22:24:33 UTC (rev 8019)
+++ branches/1.0/docs/ChangeLog.txt	2016-12-06 13:45:48 UTC (rev 8020)
@@ -38,8 +38,6 @@
 
 -- tiff, version bump to 4.0.7, security fixes: 11 CVE's
 
--- readline, version bump to 7.0
-
 -- nano, version bump to 2.7.1
 
 -- reload-blocklist-netset (optional CRON script), add 'firehol_webclient' blocklist support.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8019] branches/1.0/package/prosody/prosody.init

From: <abe...@us...> - 2016-12-05 22:24:36

Revision: 8019
          http://sourceforge.net/p/astlinux/code/8019
Author:   abelbeck
Date:     2016-12-05 22:24:33 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
prosody, init.d script, use 'start-stop-daemon' for start and stop

Modified Paths:
--------------
    branches/1.0/package/prosody/prosody.init

Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init	2016-12-05 18:54:36 UTC (rev 8018)
+++ branches/1.0/package/prosody/prosody.init	2016-12-05 22:24:33 UTC (rev 8019)
@@ -2,6 +2,8 @@
 
 . /etc/rc.conf
 
+PIDFILE="/var/run/prosody/prosody.pid"
+
 DEFAULT_MODULES="roster saslauth tls disco \
 private vcard \
 legacyauth version uptime time ping pep register adhoc \
@@ -109,7 +111,7 @@
   fi
 
   echo "
-pidfile = \"/var/run/prosody/prosody.pid\"
+pidfile = \"${PIDFILE}\"
 
 prosody_user = \"prosody\"
 prosody_group = \"prosody\"
@@ -245,24 +247,24 @@
   if [ -f /etc/prosody/prosody.cfg.lua ] && grep -q '^[^-]*"posix"' /etc/prosody/prosody.cfg.lua; then
     echo "Starting XMPP Server..."
 
-    su -p -s /bin/ash -c /usr/bin/prosody prosody
+    start-stop-daemon -S -x /usr/bin/prosody -n lua -p $PIDFILE -u prosody --chuid prosody:prosody
   fi
 }
 
 stop () {
 
-  if [ -f /var/run/prosody/prosody.pid ]; then
+  if [ -f $PIDFILE ]; then
     echo "Stopping XMPP Server..."
 
-    kill $(cat /var/run/prosody/prosody.pid) >/dev/null 2>&1
+    start-stop-daemon -K -q -n lua -p $PIDFILE -u prosody -s TERM
 
     # Wait for prosody to stop
     cnt=5
-    while [ $cnt -gt 0 ] && [ -f /var/run/prosody/prosody.pid ]; do
+    while [ $cnt -gt 0 ] && [ -f $PIDFILE ]; do
       cnt=$((cnt - 1))
       sleep 1
     done
-    rm -f /var/run/prosody/prosody.pid
+    rm -f $PIDFILE
   fi
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8018] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2016-12-05 18:54:38

Revision: 8018
          http://sourceforge.net/p/astlinux/code/8018
Author:   abelbeck
Date:     2016-12-05 18:54:36 +0000 (Mon, 05 Dec 2016)
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	2016-12-05 18:35:36 UTC (rev 8017)
+++ branches/1.0/docs/ChangeLog.txt	2016-12-05 18:54:36 UTC (rev 8018)
@@ -33,6 +33,9 @@
 
 -- libcap, version 2.25, new package, user-space library for POSIX 1003.1e capabilities available in Linux kernels.
 
+-- libedit, version 20160903-3.1, new package, commonly used instead of the somewhat bloated readline (no longer enabled).
+   Utilized by commands: asterisk -r, sqlite3, chronyc, sftp, bc
+
 -- tiff, version bump to 4.0.7, security fixes: 11 CVE's
 
 -- readline, version bump to 7.0
@@ -89,7 +92,7 @@
 
 ** Asterisk
 
--- Asterisk 11.25.0 (version bump) and 13.13.0 (version bump)
+-- Asterisk 11.25.0 (version bump) and 13.12.2 (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.

[Astlinux-commits] SF.net SVN: astlinux:[8017] branches/1.0/package/asterisk

From: <abe...@us...> - 2016-12-05 18:35:38

Revision: 8017
          http://sourceforge.net/p/astlinux/code/8017
Author:   abelbeck
Date:     2016-12-05 18:35:36 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
asterisk, backport 13.13.0 patch to allow the newer utf-8 enabled libedit to work in the CLI.  This allows asterisk to share the newer version of libedit and makes the asterisk binary 100 KB smaller

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-11-cli-libedit-utf8.patch
    branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch

Added: branches/1.0/package/asterisk/asterisk-11-cli-libedit-utf8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-cli-libedit-utf8.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-cli-libedit-utf8.patch	2016-12-05 18:35:36 UTC (rev 8017)
@@ -0,0 +1,63 @@
+X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=main%2Fasterisk.c;h=fa919936b4767580ff852f2ba1fcbe7781949968;hp=1c7a0e1885501e5e2446c72266e492ffd40a08ef;hb=5e0c22404316ecdf8e1510553474274eddf55e20;hpb=ec17e96784b8a75f74d84621165c73d986d56f95
+
+diff --git a/main/asterisk.c b/main/asterisk.c
+index 1c7a0e1..fa91993 100644
+--- a/main/asterisk.c
++++ b/main/asterisk.c
+@@ -2568,7 +2568,13 @@ static void send_rasterisk_connect_commands(void)
+ 	}
+ }
+ 
++#define HAVE_LIBEDIT_IS_UNICODE 1
++
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++static int ast_el_read_char(EditLine *editline, wchar_t *cp)
++#else
+ static int ast_el_read_char(EditLine *editline, char *cp)
++#endif
+ {
+ 	int num_read = 0;
+ 	int lastpos = 0;
+@@ -2598,10 +2604,16 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ 		}
+ 
+ 		if (!ast_opt_exec && fds[1].revents) {
+-			num_read = read(STDIN_FILENO, cp, 1);
++			char c = '\0';
++			num_read = read(STDIN_FILENO, &c, 1);
+ 			if (num_read < 1) {
+ 				break;
+ 			} else {
++#ifdef 	HAVE_LIBEDIT_IS_UNICODE
++				*cp = btowc(c);
++#else
++				*cp = c;
++#endif
+ 				return (num_read);
+ 			}
+ 		}
+@@ -2645,7 +2657,11 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ 			console_print(buf, 0);
+ 
+ 			if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (res >= 2 && buf[res-2] == '\n'))) {
++#ifdef 	HAVE_LIBEDIT_IS_UNICODE
++				*cp = btowc(CC_REFRESH);
++#else
+ 				*cp = CC_REFRESH;
++#endif
+ 				return(1);
+ 			} else {
+ 				lastpos = 1;
+@@ -2653,7 +2669,12 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ 		}
+ 	}
+ 
++#ifdef 	HAVE_LIBEDIT_IS_UNICODE
++	*cp = btowc('\0');
++#else
+ 	*cp = '\0';
++#endif
++
+ 	return (0);
+ }
+ 

Added: branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch	2016-12-05 18:35:36 UTC (rev 8017)
@@ -0,0 +1,63 @@
+X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=main%2Fasterisk.c;h=fa919936b4767580ff852f2ba1fcbe7781949968;hp=1c7a0e1885501e5e2446c72266e492ffd40a08ef;hb=5e0c22404316ecdf8e1510553474274eddf55e20;hpb=ec17e96784b8a75f74d84621165c73d986d56f95
+
+diff --git a/main/asterisk.c b/main/asterisk.c
+index 1c7a0e1..fa91993 100644
+--- a/main/asterisk.c
++++ b/main/asterisk.c
+@@ -2818,7 +2818,13 @@ static void send_rasterisk_connect_commands(void)
+ 	}
+ }
+ 
++#define HAVE_LIBEDIT_IS_UNICODE 1
++
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++static int ast_el_read_char(EditLine *editline, wchar_t *cp)
++#else
+ static int ast_el_read_char(EditLine *editline, char *cp)
++#endif
+ {
+ 	int num_read = 0;
+ 	int lastpos = 0;
+@@ -2848,10 +2854,16 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ 		}
+ 
+ 		if (!ast_opt_exec && fds[1].revents) {
+-			num_read = read(STDIN_FILENO, cp, 1);
++			char c = '\0';
++			num_read = read(STDIN_FILENO, &c, 1);
+ 			if (num_read < 1) {
+ 				break;
+ 			} else {
++#ifdef 	HAVE_LIBEDIT_IS_UNICODE
++				*cp = btowc(c);
++#else
++				*cp = c;
++#endif
+ 				return (num_read);
+ 			}
+ 		}
+@@ -2895,7 +2907,11 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ 			console_print(buf, 0);
+ 
+ 			if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (res >= 2 && buf[res-2] == '\n'))) {
++#ifdef 	HAVE_LIBEDIT_IS_UNICODE
++				*cp = btowc(CC_REFRESH);
++#else
+ 				*cp = CC_REFRESH;
++#endif
+ 				return(1);
+ 			} else {
+ 				lastpos = 1;
+@@ -2903,7 +2919,12 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ 		}
+ 	}
+ 
++#ifdef 	HAVE_LIBEDIT_IS_UNICODE
++	*cp = btowc('\0');
++#else
+ 	*cp = '\0';
++#endif
++
+ 	return (0);
+ }
+ 

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2016-12-05 16:10:15 UTC (rev 8016)
+++ branches/1.0/package/asterisk/asterisk.mk	2016-12-05 18:35:36 UTC (rev 8017)
@@ -52,9 +52,14 @@
 ASTERISK_CONFIGURE_ARGS+= \
 			--without-cap
 
-# Asterisk does not work using system libedit with wide-char/UTF-8 support
+ifeq ($(strip $(BR2_PACKAGE_LIBEDIT)),y)
+ASTERISK_EXTRAS+=libedit
 ASTERISK_CONFIGURE_ARGS+= \
+			--with-libedit="$(STAGING_DIR)/usr" 
+else
+ASTERISK_CONFIGURE_ARGS+= \
 			--without-libedit
+endif
 
 ifeq ($(strip $(BR2_PACKAGE_LIBXML2)),y)
 ASTERISK_EXTRAS+=libxml2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8016] branches/1.0/package/bc/bc.mk

From: <abe...@us...> - 2016-12-05 16:10:18

Revision: 8016
          http://sourceforge.net/p/astlinux/code/8016
Author:   abelbeck
Date:     2016-12-05 16:10:15 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
bc, enable libedit support

Modified Paths:
--------------
    branches/1.0/package/bc/bc.mk

Modified: branches/1.0/package/bc/bc.mk
===================================================================
--- branches/1.0/package/bc/bc.mk	2016-12-05 14:32:31 UTC (rev 8015)
+++ branches/1.0/package/bc/bc.mk	2016-12-05 16:10:15 UTC (rev 8016)
@@ -9,6 +9,11 @@
 BC_SITE = http://alpha.gnu.org/gnu/bc
 BC_DEPENDENCIES = host-bison host-flex
 
+ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+BC_DEPENDENCIES += libedit
+BC_CONF_OPT += --with-libedit
+endif
+
 define BC_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/bc/bc $(TARGET_DIR)/usr/bin/bc
 endef

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8015] branches/1.0/package/asterisk/asterisk.mk

From: <abe...@us...> - 2016-12-05 14:32:34

Revision: 8015
          http://sourceforge.net/p/astlinux/code/8015
Author:   abelbeck
Date:     2016-12-05 14:32:31 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
asterisk, revert back to 13.12.2 because of 13.13.0 issues

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2016-12-05 14:16:36 UTC (rev 8014)
+++ branches/1.0/package/asterisk/asterisk.mk	2016-12-05 14:32:31 UTC (rev 8015)
@@ -7,7 +7,7 @@
 ASTERISK_VERSION := 11.25.0
 else
  ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
-ASTERISK_VERSION := 13.13.0
+ASTERISK_VERSION := 13.12.2
  else
 ASTERISK_VERSION := 15.0.0
  endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8014] branches/1.0/package/openssh/openssh.mk

From: <abe...@us...> - 2016-12-05 14:16:38

Revision: 8014
          http://sourceforge.net/p/astlinux/code/8014
Author:   abelbeck
Date:     2016-12-05 14:16:36 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
openssh, enable libedit support which sftp uses for command history and tab completion

Modified Paths:
--------------
    branches/1.0/package/openssh/openssh.mk

Modified: branches/1.0/package/openssh/openssh.mk
===================================================================
--- branches/1.0/package/openssh/openssh.mk	2016-12-05 04:26:18 UTC (rev 8013)
+++ branches/1.0/package/openssh/openssh.mk	2016-12-05 14:16:36 UTC (rev 8014)
@@ -7,12 +7,24 @@
 OPENSSH_VERSION = 6.6p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
-OPENSSH_CONF_OPT = --libexecdir=/usr/libexec --disable-lastlog --disable-utmp \
-		--disable-utmpx --disable-wtmp --disable-wtmpx --disable-strip \
-		--sysconfdir=/etc/ssh
 
 OPENSSH_DEPENDENCIES = zlib openssl
 
+OPENSSH_CONF_OPT = \
+	--libexecdir=/usr/libexec \
+	--disable-lastlog \
+	--disable-utmp \
+	--disable-utmpx \
+	--disable-wtmp \
+	--disable-wtmpx \
+	--disable-strip \
+	--sysconfdir=/etc/ssh
+
+ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+OPENSSH_DEPENDENCIES += libedit
+OPENSSH_CONF_OPT += --with-libedit="$(STAGING_DIR)/usr"
+endif
+
 OPENSSH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) -C $(@D) install-nosysconf
 
 define OPENSSH_INSTALL_INITSCRIPT

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8013] branches/1.0

From: <abe...@us...> - 2016-12-05 04:26:21

Revision: 8013
          http://sourceforge.net/p/astlinux/code/8013
Author:   abelbeck
Date:     2016-12-05 04:26:18 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
libedit, new package replacing the somewhat bloated readline, only used by sqlite CLI tool and chronyc, could be used by Asterisk but does not work with the latest UTF-8 enabled libedit.  BR2_PACKAGE_READLINE no longer needs to be enabled with BR2_PACKAGE_LIBEDIT=y

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/initrd.config
    branches/1.0/package/Config.in
    branches/1.0/package/asterisk/asterisk.mk
    branches/1.0/package/chrony/chrony.mk
    branches/1.0/package/sqlite/Config.in
    branches/1.0/package/sqlite/sqlite.mk
    branches/1.0/runnix-iso.config
    branches/1.0/runnix.config
    branches/1.0/x86_64-configs/astlinux-ast11.config
    branches/1.0/x86_64-configs/astlinux-ast13.config
    branches/1.0/x86_64-configs/initrd.config

Added Paths:
-----------
    branches/1.0/package/libedit/
    branches/1.0/package/libedit/Config.in
    branches/1.0/package/libedit/libedit.mk

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/astlinux-ast11.config	2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec  1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec  4 22:03:56 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -536,7 +536,6 @@
 # BR2_PACKAGE_BERKELEYDB is not set
 # BR2_PACKAGE_MYSQL_CLIENT is not set
 BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
 BR2_PACKAGE_SQLITEODBC=y
 BR2_PACKAGE_UNIXODBC=y
 
@@ -639,6 +638,7 @@
 #
 # BR2_PACKAGE_ENCHANT is not set
 # BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
 BR2_PACKAGE_NCURSES=y
 # BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
 # BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -646,7 +646,7 @@
 BR2_PACKAGE_NEWT=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
 BR2_PACKAGE_SLANG=y
 
 #

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/astlinux-ast13.config	2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec  1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec  4 22:03:56 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -536,7 +536,6 @@
 # BR2_PACKAGE_BERKELEYDB is not set
 # BR2_PACKAGE_MYSQL_CLIENT is not set
 BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
 BR2_PACKAGE_SQLITEODBC=y
 BR2_PACKAGE_UNIXODBC=y
 
@@ -639,6 +638,7 @@
 #
 # BR2_PACKAGE_ENCHANT is not set
 # BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
 BR2_PACKAGE_NCURSES=y
 # BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
 # BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -646,7 +646,7 @@
 BR2_PACKAGE_NEWT=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
 BR2_PACKAGE_SLANG=y
 
 #

Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/initrd.config	2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec  1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec  4 22:03:56 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -524,6 +524,7 @@
 #
 # BR2_PACKAGE_ENCHANT is not set
 # BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
 # BR2_PACKAGE_NCURSES is not set
 # BR2_PACKAGE_NEWT is not set
 # BR2_PACKAGE_PCRE is not set

Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/Config.in	2016-12-05 04:26:18 UTC (rev 8013)
@@ -405,6 +405,7 @@
 menu "Text and terminal handling"
 source "package/enchant/Config.in"
 source "package/icu/Config.in"
+source "package/libedit/Config.in"
 source "package/libiconv/Config.in"
 source "package/ncurses/Config.in"
 source "package/newt/Config.in"

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/asterisk/asterisk.mk	2016-12-05 04:26:18 UTC (rev 8013)
@@ -52,6 +52,10 @@
 ASTERISK_CONFIGURE_ARGS+= \
 			--without-cap
 
+# Asterisk does not work using system libedit with wide-char/UTF-8 support
+ASTERISK_CONFIGURE_ARGS+= \
+			--without-libedit
+
 ifeq ($(strip $(BR2_PACKAGE_LIBXML2)),y)
 ASTERISK_EXTRAS+=libxml2
 ASTERISK_CONFIGURE_ARGS+= \

Modified: branches/1.0/package/chrony/chrony.mk
===================================================================
--- branches/1.0/package/chrony/chrony.mk	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/chrony/chrony.mk	2016-12-05 04:26:18 UTC (rev 8013)
@@ -28,8 +28,12 @@
 
 ifeq ($(BR2_PACKAGE_READLINE),y)
 CHRONY_DEPENDENCIES += readline
+CHRONY_CONF_OPT += --without-editline
+else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+CHRONY_DEPENDENCIES += libedit
+CHRONY_CONF_OPT += --without-readline
 else
-CHRONY_CONF_OPT += --disable-readline
+CHRONY_CONF_OPT += --without-editline --without-readline
 endif
 
 # If pps-tools is available, build it before so the package can use it

Added: branches/1.0/package/libedit/Config.in
===================================================================
--- branches/1.0/package/libedit/Config.in	                        (rev 0)
+++ branches/1.0/package/libedit/Config.in	2016-12-05 04:26:18 UTC (rev 8013)
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBEDIT
+	bool "libedit"
+	select BR2_PACKAGE_NCURSES
+	help
+	  The editline library (from BSD) provides generic line editing
+	  and history functions. It slightly resembles GNU readline.
+
+	  Jess Thrysoee maintains an autotoolified package, which we use
+	  in Buildroot as it makes it much simpler than using the upstream
+	  sources which require pmake.
+
+	  http://www.thrysoee.dk/editline
+

Added: branches/1.0/package/libedit/libedit.mk
===================================================================
--- branches/1.0/package/libedit/libedit.mk	                        (rev 0)
+++ branches/1.0/package/libedit/libedit.mk	2016-12-05 04:26:18 UTC (rev 8013)
@@ -0,0 +1,21 @@
+################################################################################
+#
+# libedit
+#
+################################################################################
+
+LIBEDIT_VERSION = 20160903-3.1
+LIBEDIT_SITE = http://thrysoee.dk/editline
+LIBEDIT_INSTALL_STAGING = YES
+
+LIBEDIT_DEPENDENCIES = ncurses
+
+define LIBEDIT_INSTALL_TARGET_CMDS
+	cp -a $(STAGING_DIR)/usr/lib/libedit.so* $(TARGET_DIR)/usr/lib/
+endef
+
+define LIBEDIT_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/lib/libedit.so*
+endef
+
+$(eval $(call AUTOTARGETS,package,libedit))

Modified: branches/1.0/package/sqlite/Config.in
===================================================================
--- branches/1.0/package/sqlite/Config.in	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/sqlite/Config.in	2016-12-05 04:26:18 UTC (rev 8013)
@@ -6,11 +6,3 @@
 
 	  http://www.sqlite.org/
 
-config BR2_PACKAGE_SQLITE_READLINE
-	bool "Command-line editing"
-	depends on BR2_PACKAGE_SQLITE
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_READLINE
-	help
-	  Enable command-line editing. This requires ncurses and readline.
-

Modified: branches/1.0/package/sqlite/sqlite.mk
===================================================================
--- branches/1.0/package/sqlite/sqlite.mk	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/sqlite/sqlite.mk	2016-12-05 04:26:18 UTC (rev 8013)
@@ -18,11 +18,14 @@
 	--enable-threadsafe \
 	--localstatedir=/var
 
-ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
-SQLITE_DEPENDENCIES += ncurses readline
-SQLITE_CONF_OPT += --enable-readline
+ifeq ($(BR2_PACKAGE_READLINE),y)
+SQLITE_DEPENDENCIES += readline
+SQLITE_CONF_OPT += --disable-editline --enable-readline
+else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+SQLITE_DEPENDENCIES += libedit
+SQLITE_CONF_OPT += --enable-editline --disable-readline
 else
-SQLITE_CONF_OPT += --disable-readline
+SQLITE_CONF_OPT += --disable-editline --disable-readline
 endif
 
 define SQLITE_UNINSTALL_TARGET_CMDS

Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/runnix-iso.config	2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec  1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec  4 22:03:57 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -549,6 +549,7 @@
 #
 # BR2_PACKAGE_ENCHANT is not set
 # BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
 BR2_PACKAGE_NCURSES=y
 # BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
 # BR2_PACKAGE_NCURSES_TARGET_FORM is not set

Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/runnix.config	2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec  1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec  4 22:03:56 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -550,6 +550,7 @@
 #
 # BR2_PACKAGE_ENCHANT is not set
 # BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
 BR2_PACKAGE_NCURSES=y
 # BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
 # BR2_PACKAGE_NCURSES_TARGET_FORM is not set

Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config	2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec  1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec  4 22:03:57 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_ARCH_IS_64=y
@@ -517,7 +517,6 @@
 # BR2_PACKAGE_BERKELEYDB is not set
 # BR2_PACKAGE_MYSQL_CLIENT is not set
 BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
 BR2_PACKAGE_SQLITEODBC=y
 BR2_PACKAGE_UNIXODBC=y
 
@@ -620,6 +619,7 @@
 #
 # BR2_PACKAGE_ENCHANT is not set
 # BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
 BR2_PACKAGE_NCURSES=y
 # BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
 # BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -627,7 +627,7 @@
 BR2_PACKAGE_NEWT=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
 BR2_PACKAGE_SLANG=y
 
 #

Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config	2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec  1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec  4 22:03:57 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_ARCH_IS_64=y
@@ -517,7 +517,6 @@
 # BR2_PACKAGE_BERKELEYDB is not set
 # BR2_PACKAGE_MYSQL_CLIENT is not set
 BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
 BR2_PACKAGE_SQLITEODBC=y
 BR2_PACKAGE_UNIXODBC=y
 
@@ -620,6 +619,7 @@
 #
 # BR2_PACKAGE_ENCHANT is not set
 # BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
 BR2_PACKAGE_NCURSES=y
 # BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
 # BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -627,7 +627,7 @@
 BR2_PACKAGE_NEWT=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
 BR2_PACKAGE_SLANG=y
 
 #

Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config	2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/x86_64-configs/initrd.config	2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec  1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec  4 22:03:57 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_ARCH_IS_64=y
@@ -505,6 +505,7 @@
 #
 # BR2_PACKAGE_ENCHANT is not set
 # BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
 # BR2_PACKAGE_NCURSES is not set
 # BR2_PACKAGE_NEWT is not set
 # BR2_PACKAGE_PCRE is not set

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8012] branches/1.0/package/lighttpd/ lighttpd-ssl_shutdown-only-if-handshake-finished.patch

From: <abe...@us...> - 2016-12-04 16:09:20

Revision: 8012
          http://sourceforge.net/p/astlinux/code/8012
Author:   abelbeck
Date:     2016-12-04 16:09:19 +0000 (Sun, 04 Dec 2016)
Log Message:
-----------
lighttpd, add patch upstream from 1.4.41, [TLS] SSL_shutdown() only if handshake finished
Ref: https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/156bea38597ced5de7521ada2e85fb67aead21db/diff

Added Paths:
-----------
    branches/1.0/package/lighttpd/lighttpd-ssl_shutdown-only-if-handshake-finished.patch

Added: branches/1.0/package/lighttpd/lighttpd-ssl_shutdown-only-if-handshake-finished.patch
===================================================================
--- branches/1.0/package/lighttpd/lighttpd-ssl_shutdown-only-if-handshake-finished.patch	                        (rev 0)
+++ branches/1.0/package/lighttpd/lighttpd-ssl_shutdown-only-if-handshake-finished.patch	2016-12-04 16:09:19 UTC (rev 8012)
@@ -0,0 +1,22 @@
+commit 156bea38597ced5de7521ada2e85fb67aead21db
+Author: Glenn Strauss <gst...@gl...>
+Date:   Tue Aug 2 22:32:28 2016 -0400
+
+    [TLS] SSL_shutdown() only if handshake finished
+    
+    avoid noise in logs due to calling SSL_shutdown() on a connection
+    that has not yet completed TLS handshake
+
+diff --git a/src/connections.c b/src/connections.c
+index ccdf360..4cd2139 100644
+--- a/src/connections.c
++++ b/src/connections.c
+@@ -183,7 +183,7 @@ static void connection_handle_shutdown(server *srv, connection *con) {
+ 
+ #ifdef USE_OPENSSL
+ 	server_socket *srv_sock = con->srv_socket;
+-	if (srv_sock->is_ssl) {
++	if (srv_sock->is_ssl && SSL_is_init_finished(con->ssl)) {
+ 		int ret, ssl_r;
+ 		unsigned long err;
+ 		ERR_clear_error();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8011] branches/1.0/package/chrony/ntpd.init

From: <abe...@us...> - 2016-12-03 15:59:20

Revision: 8011
          http://sourceforge.net/p/astlinux/code/8011
Author:   abelbeck
Date:     2016-12-03 15:59:17 +0000 (Sat, 03 Dec 2016)
Log Message:
-----------
chrony, ntpd init.d script, log syslog error if initial time step fails

Modified Paths:
--------------
    branches/1.0/package/chrony/ntpd.init

Modified: branches/1.0/package/chrony/ntpd.init
===================================================================
--- branches/1.0/package/chrony/ntpd.init	2016-12-03 14:15:06 UTC (rev 8010)
+++ branches/1.0/package/chrony/ntpd.init	2016-12-03 15:59:17 UTC (rev 8011)
@@ -78,6 +78,8 @@
         if [ -r /dev/rtc ]; then
           hwclock -wu --noadjfile 2>/dev/null
         fi
+      else
+        logger -s -t chronyd -p kern.info "Failed to set time using NTP server '$first', continuing in the background."
       fi
       rm -f $PIDFILE
       sleep 1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8010] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2016-12-03 14:15:09

Revision: 8010
          http://sourceforge.net/p/astlinux/code/8010
Author:   abelbeck
Date:     2016-12-03 14:15:06 +0000 (Sat, 03 Dec 2016)
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	2016-12-03 13:46:03 UTC (rev 8009)
+++ branches/1.0/docs/ChangeLog.txt	2016-12-03 14:15:06 UTC (rev 8010)
@@ -35,6 +35,8 @@
 
 -- tiff, version bump to 4.0.7, security fixes: 11 CVE's
 
+-- readline, version bump to 7.0
+
 -- nano, version bump to 2.7.1
 
 -- reload-blocklist-netset (optional CRON script), add 'firehol_webclient' blocklist support.
@@ -54,6 +56,11 @@
    New rc.conf variables are: IPSEC_ALLOWED_ENDPOINTS and IPSEC_ALLOWED_VPN_NETS
    More info: http://doc.astlinux.org/userdoc:tt_ipsec_vpn_strongswan
 
+-- chrony, version 2.4.1, new package to replace 'ntpd' as the NTP daemon, NTPv4 client and server.
+   Note: No configuration change for most users, though if you had a custom /mnt/kd/ntpd.conf file
+         you will have to generate a new /mnt/kd/chrony.conf file with similar but different syntax.
+   More info: http://doc.astlinux.org/userdoc:tt_ntp_client_server
+
 -- OpenVPN, version bump to 2.3.13
 
 -- prosody, version bump to 0.9.11
@@ -68,8 +75,6 @@
 
 -- shellinabox, version bump to 2.20
 
--- ntpd/sntp, version bump to 4.2.8p9, security fixes: 2 medium-, 2 medium-/low-, and 5 low-severity
-
 -- avahi, now runs with 'avahi' user/group permissions using the new libcap support, for added security.
 
 -- msmtp, version bump to 1.6.6
@@ -104,7 +109,9 @@
 
 -- Status tab, display "ipsec status" output in IPsec Associations (strongSwan).
 
+-- Status, Network, Edit, Prefs, System tabs, add support for 'chrony' instead of 'ntp' for network time.
 
+
 Additions for AstLinux 1.2.8:
 =============================
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8009] branches/1.0/package/webinterface/altweb/common /license-packages.txt

From: <abe...@us...> - 2016-12-03 13:46:06

Revision: 8009
          http://sourceforge.net/p/astlinux/code/8009
Author:   abelbeck
Date:     2016-12-03 13:46:03 +0000 (Sat, 03 Dec 2016)
Log Message:
-----------
web interface, Show Licenses, add Richard P. Curnow to chrony

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/common/license-packages.txt

Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt
===================================================================
--- branches/1.0/package/webinterface/altweb/common/license-packages.txt	2016-12-02 19:09:43 UTC (rev 8008)
+++ branches/1.0/package/webinterface/altweb/common/license-packages.txt	2016-12-03 13:46:03 UTC (rev 8009)
@@ -63,4 +63,4 @@
 Linux Kernel~Copyright (c) 1997-2016 The Linux Kernel Organization, Inc.; Linux is a Registered Trademark of Linus Torvalds.
 whois~Copyright (c) 1999-2016 Marco d'Itri.
 strongSwan~Copyright (c) 2006-2016 Andreas Steffen, Tobias Brunner, et al.
-chrony~Copyright (c) 2009-2016 Miroslav Lichvar.
+chrony~Copyright (c) 1997-2016 Richard P. Curnow, Miroslav Lichvar.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8008] branches/1.0/package/readline

From: <abe...@us...> - 2016-12-02 19:09:45

Revision: 8008
          http://sourceforge.net/p/astlinux/code/8008
Author:   abelbeck
Date:     2016-12-02 19:09:43 +0000 (Fri, 02 Dec 2016)
Log Message:
-----------
readline, version bump to 7.0

Modified Paths:
--------------
    branches/1.0/package/readline/Config.in
    branches/1.0/package/readline/readline.mk

Added Paths:
-----------
    branches/1.0/package/readline/readline-0000-curses-link.patch

Removed Paths:
-------------
    branches/1.0/package/readline/readline-6.2-curses-link.patch
    branches/1.0/package/readline/readline-6.2-pl1.patch

Modified: branches/1.0/package/readline/Config.in
===================================================================
--- branches/1.0/package/readline/Config.in	2016-12-02 16:09:27 UTC (rev 8007)
+++ branches/1.0/package/readline/Config.in	2016-12-02 19:09:43 UTC (rev 8008)
@@ -2,4 +2,9 @@
 	bool "readline"
 	select BR2_PACKAGE_NCURSES
 	help
-	    Enable GNU readline support?
+	  The GNU Readline library provides a set of functions for use
+	  by applications that allow users to edit command lines
+	  as they are typed in.
+
+	  https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+

Added: branches/1.0/package/readline/readline-0000-curses-link.patch
===================================================================
--- branches/1.0/package/readline/readline-0000-curses-link.patch	                        (rev 0)
+++ branches/1.0/package/readline/readline-0000-curses-link.patch	2016-12-02 19:09:43 UTC (rev 8008)
@@ -0,0 +1,16 @@
+link readline directly to ncurses since it needs symbols from it
+
+upstream readline does this on purpose (no direct linking), but
+it doesn't make much sense in a Linux world
+
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -42,7 +42,7 @@
+ SHOBJ_LIBS=
+ 
+ SHLIB_XLDFLAGS=
+-SHLIB_LIBS=
++SHLIB_LIBS=-lncurses
+ 
+ SHLIB_DOT='.'
+ SHLIB_LIBPREF='lib'

Deleted: branches/1.0/package/readline/readline-6.2-curses-link.patch
===================================================================
--- branches/1.0/package/readline/readline-6.2-curses-link.patch	2016-12-02 16:09:27 UTC (rev 8007)
+++ branches/1.0/package/readline/readline-6.2-curses-link.patch	2016-12-02 19:09:43 UTC (rev 8008)
@@ -1,16 +0,0 @@
-link readline directly to ncurses since it needs symbols from it
-
-upstream readline does this on purpose (no direct linking), but
-it doesn't make much sense in a Linux world
-
---- a/support/shobj-conf
-+++ b/support/shobj-conf
-@@ -42,7 +42,7 @@
- SHOBJ_LIBS=
- 
- SHLIB_XLDFLAGS=
--SHLIB_LIBS=
-+SHLIB_LIBS=-lncurses
- 
- SHLIB_DOT='.'
- SHLIB_LIBPREF='lib'

Deleted: branches/1.0/package/readline/readline-6.2-pl1.patch
===================================================================
--- branches/1.0/package/readline/readline-6.2-pl1.patch	2016-12-02 16:09:27 UTC (rev 8007)
+++ branches/1.0/package/readline/readline-6.2-pl1.patch	2016-12-02 19:09:43 UTC (rev 8008)
@@ -1,29 +0,0 @@
-Bug-Reported-by:	Clark J. Wang <dea...@gm...>
-Bug-Reference-ID:	<AAN...@ma...>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
-
-diff -Nura readline-6.2/callback.c readline-6.2-pl1/callback.c
---- readline-6.2/callback.c	2010-06-06 13:18:58.000000000 -0300
-+++ readline-6.2-pl1/callback.c	2011-04-19 14:20:00.269829168 -0300
-@@ -148,6 +148,9 @@
- 	  eof = _rl_vi_domove_callback (_rl_vimvcxt);
- 	  /* Should handle everything, including cleanup, numeric arguments,
- 	     and turning off RL_STATE_VIMOTION */
-+	  if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
-+	   _rl_internal_char_cleanup ();
-+
- 	  return;
- 	}
- #endif
-diff -Nura readline-6.2/vi_mode.c readline-6.2-pl1/vi_mode.c
---- readline-6.2/vi_mode.c	2010-11-20 21:51:39.000000000 -0300
-+++ readline-6.2-pl1/vi_mode.c	2011-04-19 14:19:24.510586785 -0300
-@@ -1114,7 +1114,7 @@
-       rl_beg_of_line (1, c);
-       _rl_vi_last_motion = c;
-       RL_UNSETSTATE (RL_STATE_VIMOTION);
--      return (0);
-+      return (vidomove_dispatch (m));
-     }
- #if defined (READLINE_CALLBACKS)
-   /* XXX - these need to handle rl_universal_argument bindings */

Modified: branches/1.0/package/readline/readline.mk
===================================================================
--- branches/1.0/package/readline/readline.mk	2016-12-02 16:09:27 UTC (rev 8007)
+++ branches/1.0/package/readline/readline.mk	2016-12-02 19:09:43 UTC (rev 8008)
@@ -4,24 +4,26 @@
 #
 #############################################################
 
-READLINE_VERSION = 6.2
+READLINE_VERSION = 7.0
 READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
 READLINE_SITE = $(BR2_GNU_MIRROR)/readline
 READLINE_INSTALL_STAGING = YES
-READLINE_INSTALL_TARGET = YES
 
 READLINE_DEPENDENCIES = ncurses
 
-READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes
+READLINE_CONF_ENV = \
+	bash_cv_func_sigsetjmp=yes \
+	bash_cv_wcwidth_broken=no
 
 define READLINE_INSTALL_TARGET_CMDS
-	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
-	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) install-shared uninstall-doc
-	chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) \
-		$(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) \
-		$(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) \
-		$(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
+	cp -a $(STAGING_DIR)/usr/lib/libhistory.so* $(TARGET_DIR)/usr/lib/
+	cp -a $(STAGING_DIR)/usr/lib/libreadline.so* $(TARGET_DIR)/usr/lib/
+	chmod +w $(addprefix $(TARGET_DIR)/usr/lib/,libhistory.so.* libreadline.so.*)
 endef
 
+define READLINE_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/lib/libhistory.so*
+	rm -f $(TARGET_DIR)/usr/lib/libreadline.so*
+endef
+
 $(eval $(call AUTOTARGETS,package,readline))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8007] branches/1.0/package/chrony

From: <abe...@us...> - 2016-12-02 16:09:29

Revision: 8007
          http://sourceforge.net/p/astlinux/code/8007
Author:   abelbeck
Date:     2016-12-02 16:09:27 +0000 (Fri, 02 Dec 2016)
Log Message:
-----------
chrony, add upstream patch to add -t option to chronyd
Ref: https://git.tuxfamily.org/chrony/chrony.git/commit/?id=35134848524fe06e3c87cf685eb1a4cb886625a8

Modified Paths:
--------------
    branches/1.0/package/chrony/ntpd.init

Added Paths:
-----------
    branches/1.0/package/chrony/chrony-0001-add-timeout-option.patch

Added: branches/1.0/package/chrony/chrony-0001-add-timeout-option.patch
===================================================================
--- branches/1.0/package/chrony/chrony-0001-add-timeout-option.patch	                        (rev 0)
+++ branches/1.0/package/chrony/chrony-0001-add-timeout-option.patch	2016-12-02 16:09:27 UTC (rev 8007)
@@ -0,0 +1,69 @@
+From 35134848524fe06e3c87cf685eb1a4cb886625a8 Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar <mli...@re...>
+Date: Thu, 1 Dec 2016 15:57:39 +0100
+Subject: main: add -t option to chronyd
+
+This option sets a timeout (in seconds) after which chronyd will exit.
+If the clock is not synchronised, it will exit with a non-zero status.
+This is useful with the -q or -Q option to shorten the maximum time
+waiting for measurements, or with the -r option to limit the time when
+chronyd is running, but still allow it to adjust the frequency of the
+system clock.
+---
+ main.c           | 19 ++++++++++++++++++-
+ 2 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/main.c b/main.c
+index 71916fa..63d9cdc 100644
+--- a/main.c
++++ b/main.c
+@@ -144,6 +144,16 @@ signal_cleanup(int x)
+ /* ================================================== */
+ 
+ static void
++quit_timeout(void *arg)
++{
++  /* Return with non-zero status if the clock is not synchronised */
++  exit_status = REF_GetOurStratum() >= NTP_MAX_STRATUM;
++  SCH_QuitProgram();
++}
++
++/* ================================================== */
++
++static void
+ ntp_source_resolving_end(void)
+ {
+   NSR_SetSourceResolvingEndHandler(NULL);
+@@ -359,7 +369,7 @@ int main
+   char *user = NULL;
+   struct passwd *pw;
+   int debug = 0, nofork = 0, address_family = IPADDR_UNSPEC;
+-  int do_init_rtc = 0, restarted = 0;
++  int do_init_rtc = 0, restarted = 0, timeout = 0;
+   int other_pid;
+   int scfilter_level = 0, lock_memory = 0, sched_priority = 0;
+   int system_log = 1;
+@@ -417,6 +427,10 @@ int main
+       ref_mode = REF_ModePrintOnce;
+       nofork = 1;
+       system_log = 0;
++    } else if (!strcmp("-t", *argv)) {
++      ++argv, --argc;
++      if (argc == 0 || sscanf(*argv, "%d", &timeout) != 1 || timeout <= 0)
++        LOG_FATAL(LOGF_Main, "Bad timeout");
+     } else if (!strcmp("-4", *argv)) {
+       address_family = IPADDR_INET4;
+     } else if (!strcmp("-6", *argv)) {
+@@ -545,6 +559,9 @@ int main
+   REF_SetModeEndHandler(reference_mode_end);
+   REF_SetMode(ref_mode);
+ 
++  if (timeout)
++    SCH_AddTimeoutByDelay(timeout, quit_timeout, NULL);
++
+   if (do_init_rtc) {
+     RTC_TimeInit(post_init_rtc_hook, NULL);
+   } else {
+-- 
+cgit v0.12
+

Modified: branches/1.0/package/chrony/ntpd.init
===================================================================
--- branches/1.0/package/chrony/ntpd.init	2016-12-01 21:55:41 UTC (rev 8006)
+++ branches/1.0/package/chrony/ntpd.init	2016-12-02 16:09:27 UTC (rev 8007)
@@ -74,7 +74,7 @@
     fi
     if [ -n "$first" ]; then
       echo "Setting local system time using '$first'..."
-      if chronyd -q "server $first iburst"; then
+      if chronyd -q -t 8 "server $first iburst"; then
         if [ -r /dev/rtc ]; then
           hwclock -wu --noadjfile 2>/dev/null
         fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8006] branches/1.0/package/webinterface/altweb/common /functions.php

From: <abe...@us...> - 2016-12-01 21:55:43

Revision: 8006
          http://sourceforge.net/p/astlinux/code/8006
Author:   abelbeck
Date:     2016-12-01 21:55:41 +0000 (Thu, 01 Dec 2016)
Log Message:
-----------
web interface, add another 5 seconds to the default reboot time

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/common/functions.php

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2016-12-01 21:30:56 UTC (rev 8005)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2016-12-01 21:55:41 UTC (rev 8006)
@@ -187,7 +187,7 @@
 function systemREBOOT($myself, $result, $setup = FALSE) {
   global $global_prefs;
   
-  $count_down_secs = 125;                                     
+  $count_down_secs = 130;                                     
   
   if (($adjust = getPREFdef($global_prefs, 'system_reboot_timer_adjust')) !== '') {
     $count_down_secs += (int)$adjust;                                     

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8005] branches/1.0/package/chrony/ntpd.init

From: <abe...@us...> - 2016-12-01 21:30:59

Revision: 8005
          http://sourceforge.net/p/astlinux/code/8005
Author:   abelbeck
Date:     2016-12-01 21:30:56 +0000 (Thu, 01 Dec 2016)
Log Message:
-----------
chrony, only use the first 'server' or 'pool' entry to first set the time

Modified Paths:
--------------
    branches/1.0/package/chrony/ntpd.init

Modified: branches/1.0/package/chrony/ntpd.init
===================================================================
--- branches/1.0/package/chrony/ntpd.init	2016-12-01 18:19:01 UTC (rev 8004)
+++ branches/1.0/package/chrony/ntpd.init	2016-12-01 21:30:56 UTC (rev 8005)
@@ -63,18 +63,25 @@
 }
 
 start () {
+  local first
 
   if [ -f /etc/chrony.conf ]; then
 
     # Set the clock (large change)
-    echo "Setting local time/date..."
-    if chronyd -q; then
-      if [ -r /dev/rtc ]; then
-        hwclock -wu --noadjfile 2>/dev/null
+    first="$(awk '/^server / { print $2; nextfile; }' /etc/chrony.conf)"
+    if [ -z "$first" ]; then
+      first="$(awk '/^pool / { print $2; nextfile; }' /etc/chrony.conf)"
+    fi
+    if [ -n "$first" ]; then
+      echo "Setting local system time using '$first'..."
+      if chronyd -q "server $first iburst"; then
+        if [ -r /dev/rtc ]; then
+          hwclock -wu --noadjfile 2>/dev/null
+        fi
       fi
+      rm -f $PIDFILE
+      sleep 1
     fi
-    rm -f $PIDFILE
-    sleep 1
 
     # Maintain the clock (small changes)
     echo "Starting NTP Daemon (chronyd)..."

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8004] branches/1.0/package/webinterface/altweb

From: <abe...@us...> - 2016-12-01 18:19:03

Revision: 8004
          http://sourceforge.net/p/astlinux/code/8004
Author:   abelbeck
Date:     2016-12-01 18:19:01 +0000 (Thu, 01 Dec 2016)
Log Message:
-----------
web interface, Status, Network, Edit, Prefs, System tabs, add support for 'chrony' instead of 'ntp' for network time

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/edit.php
    branches/1.0/package/webinterface/altweb/admin/network.php
    branches/1.0/package/webinterface/altweb/admin/prefs.php
    branches/1.0/package/webinterface/altweb/admin/system.php
    branches/1.0/package/webinterface/altweb/admin/view.php
    branches/1.0/package/webinterface/altweb/common/functions.php
    branches/1.0/package/webinterface/altweb/common/license-packages.txt
    branches/1.0/package/webinterface/altweb/common/status.inc

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php	2016-12-01 16:09:41 UTC (rev 8003)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2016-12-01 18:19:01 UTC (rev 8004)
@@ -61,7 +61,7 @@
   'dnsmasq.conf' => 'DNSmasq Configuration',
   'misdn-init.conf' => 'mISDN Configuration',
   'msmtp-aliases.conf' => 'SMTP Local Aliases',
-  'ntpd.conf' => 'NTP Time Client/Server',
+  'chrony.conf' => 'NTP Time Client/Server',
   'sshd.conf' => 'SSH Server sshd_config',
   'ldap.conf' => 'LDAP Client System Defaults',
   'slapd.conf' => 'LDAP Server Configuration',

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2016-12-01 16:09:41 UTC (rev 8003)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2016-12-01 18:19:01 UTC (rev 8004)
@@ -927,7 +927,7 @@
     }
   } elseif (isset($_POST['submit_edit_ntp'])) {
     $result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
-    if (is_writable($file = '/mnt/kd/ntpd.conf')) {
+    if (is_writable($file = '/mnt/kd/chrony.conf')) {
       header('Location: /admin/edit.php?file='.$file);
       exit;
     }
@@ -1698,7 +1698,7 @@
   putHtml('</td></tr>');
   putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
   putHtml('NTP Server:');
-  if (! is_file('/mnt/kd/ntpd.conf')) {
+  if (! is_file('/mnt/kd/chrony.conf')) {
     if (($t_value = getVARdef($db, 'NTPSERVS', $cur_db)) === '') {
       $t_value = getVARdef($db, 'NTPSERV', $cur_db);
     }

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2016-12-01 16:09:41 UTC (rev 8003)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2016-12-01 18:19:01 UTC (rev 8004)
@@ -588,7 +588,7 @@
 
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'status_ntp_sessions') !== 'no') ? ' checked="checked"' : '';
-  putHtml('<input type="checkbox" value="ntp_sessions" name="ntp_sessions"'.$sel.' /></td><td colspan="5">Show NTP Peer States</td></tr>');
+  putHtml('<input type="checkbox" value="ntp_sessions" name="ntp_sessions"'.$sel.' /></td><td colspan="5">Show NTP Time Sources</td></tr>');
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'status_show_dhcp_leases') !== 'no') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="dhcp_leases" name="dhcp_leases"'.$sel.' /></td><td colspan="5">Show DHCP Leases</td></tr>');

Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php	2016-12-01 16:09:41 UTC (rev 8003)
+++ branches/1.0/package/webinterface/altweb/admin/system.php	2016-12-01 18:19:01 UTC (rev 8004)
@@ -632,10 +632,8 @@
   if (is_file($file = '/mnt/kd/crontabs/root')) {
     putHtml('<option value="'.$file.'">Cron Jobs for root</option>');
   }
-  if (is_file($file = '/mnt/kd/ntpd.drift')) {
+  if (is_file($file = '/var/lib/ntp/chrony.drift')) {
     putHtml('<option value="'.$file.'">NTP drift file</option>');
-  } elseif (is_file($file = '/var/db/ntpd.drift')) {
-    putHtml('<option value="'.$file.'">NTP drift file</option>');
   }
   if (is_file($file = '/etc/udev/rules.d/70-persistent-net.rules')) {
     putHtml('<option value="'.$file.'">Net Interface Rules</option>');

Modified: branches/1.0/package/webinterface/altweb/admin/view.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/view.php	2016-12-01 16:09:41 UTC (rev 8003)
+++ branches/1.0/package/webinterface/altweb/admin/view.php	2016-12-01 18:19:01 UTC (rev 8004)
@@ -50,7 +50,7 @@
         $dir === '/etc/dahdi' ||
         $file === '/etc/ssh/sshd_config' ||
         $file === '/stat/etc/rc.conf' ||
-        $file === '/var/db/ntpd.drift' ||
+        $file === '/var/lib/ntp/chrony.drift' ||
         $file === '/etc/udev/rules.d/70-persistent-net.rules' ||
         ($dir === '/etc' && (substr($file, -5) === '.conf'))) {
       if (is_file($file)) {

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2016-12-01 16:09:41 UTC (rev 8003)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2016-12-01 18:19:01 UTC (rev 8004)
@@ -123,6 +123,12 @@
     } else {
       $str = $stopped;
     }
+  } elseif ($process === 'ntpd') {
+    if (is_file($path.'chronyd.pid')) {
+      $str = $running;
+    } else {
+      $str = $stopped;
+    }
   } elseif ($process === 'ipsec') {
     if (is_file($path.'charon.pid')) {
       $str = $running;
@@ -181,7 +187,7 @@
 function systemREBOOT($myself, $result, $setup = FALSE) {
   global $global_prefs;
   
-  $count_down_secs = 120;                                     
+  $count_down_secs = 125;                                     
   
   if (($adjust = getPREFdef($global_prefs, 'system_reboot_timer_adjust')) !== '') {
     $count_down_secs += (int)$adjust;                                     
@@ -552,8 +558,8 @@
           $value = trim($value, ' ');
         }
         if ($var === 'NTPSERV' || $var === 'NTPSERVS') {
-          if (is_file('/mnt/kd/ntpd.conf')) {
-            $value = '#NTP server is specified in /mnt/kd/ntpd.conf';
+          if (is_file('/mnt/kd/chrony.conf')) {
+            $value = '#NTP server is specified in /mnt/kd/chrony.conf';
           }
         }
         if ($var === 'UPS_DRIVER' || $var === 'UPS_DRIVER_PORT') {

Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt
===================================================================
--- branches/1.0/package/webinterface/altweb/common/license-packages.txt	2016-12-01 16:09:41 UTC (rev 8003)
+++ branches/1.0/package/webinterface/altweb/common/license-packages.txt	2016-12-01 18:19:01 UTC (rev 8004)
@@ -20,7 +20,6 @@
 OpenSSH~Copyright (c) 1995-2015 Tatu Ylonen, Espoo, Finland. All rights reserved.
 OpenVPN~Copyright (c) 2002-2016 OpenVPN Technologies, Inc.
 PHP~Copyright (c) 1999-2016 The PHP Group. All rights reserved.
-ntpd~Copyright (c) 1992-2016 David L. Mills.
 vsftpd~Copyright (c) 2001-2015 Daniel Jacobowitz.
 lighttpd~Copyright (c) 2004-2016 Jan Kneschke.
 msmtp~Copyright (c) 2000-2016 Martin Lambers.
@@ -64,3 +63,4 @@
 Linux Kernel~Copyright (c) 1997-2016 The Linux Kernel Organization, Inc.; Linux is a Registered Trademark of Linus Torvalds.
 whois~Copyright (c) 1999-2016 Marco d'Itri.
 strongSwan~Copyright (c) 2006-2016 Andreas Steffen, Tobias Brunner, et al.
+chrony~Copyright (c) 2009-2016 Miroslav Lichvar.

Modified: branches/1.0/package/webinterface/altweb/common/status.inc
===================================================================
--- branches/1.0/package/webinterface/altweb/common/status.inc	2016-12-01 16:09:41 UTC (rev 8003)
+++ branches/1.0/package/webinterface/altweb/common/status.inc	2016-12-01 18:19:01 UTC (rev 8004)
@@ -36,6 +36,7 @@
 // 10-28-2014, Added S.M.A.R.T Monitoring Status
 // 11-06-2014, Added Failover Status
 // 10-14-2016, Added Check for default admin password
+// 12-01-2016, Added chronyc to replace ntpq
 //
 // System location of OpenVPN Client logfile
 $OVPNCLOGFILE = '/var/log/openvpnclient-status.log';
@@ -73,7 +74,7 @@
 function getDaemons() {
 
   $status['asterisk'] = 0;
-  $status['ntpd'] = 0;
+  $status['chronyd'] = 0;
   $status['miniupnpd'] = 0;
   $status['dnsmasq'] = 0;
   $status['openvpn'] = 0;
@@ -705,24 +706,20 @@
   }
 }
 
-if ($daemon['ntpd'] > 0) {
+if ($daemon['chronyd'] > 0) {
   if (getPREFdef($global_prefs, 'status_ntp_sessions') !== 'no') {
-    putHtml("<h2>NTP Peer States:</h2>");
+    putHtml("<h2>NTP Time Sources:</h2>");
     putHtml("<pre>");
-    $tmpfile = tempnam("/tmp", "PHP_");
-    shell('ntpq -pn 127.0.0.1 >'.$tmpfile, $status);
-    if ($status == 0) {
-      $ph = @fopen($tmpfile, "r");
-      while (! feof($ph)) {
-        if (($line = rtrim(fgets($ph, 1024))) !== '') {
-          putText($line);
-        }
-      }
-      fclose($ph);
-    } else {
-      putText('No NTP peers found');
+
+    $output = array();
+    @exec('/usr/bin/chronyc sources', $output);
+    if (strncmp(current($output), '210', 3) == 0) {
+      array_shift($output); // Skip first '210' line
     }
-    @unlink($tmpfile);
+    foreach ($output as $line) {
+      putText(rtrim($line));
+    }
+    unset($output);
     putHtml("</pre>");
   }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8003] branches/1.0

From: <abe...@us...> - 2016-12-01 16:09:43

Revision: 8003
          http://sourceforge.net/p/astlinux/code/8003
Author:   abelbeck
Date:     2016-12-01 16:09:41 +0000 (Thu, 01 Dec 2016)
Log Message:
-----------
chrony, new package, replaces 'ntp' as the 'ntpd' service using the chronyd daemon.  Web interface tweaks to follow

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/initrd.config
    branches/1.0/package/Config.in
    branches/1.0/package/ntp/Config.in
    branches/1.0/package/openntpd/Config.in
    branches/1.0/runnix-iso.config
    branches/1.0/runnix.config
    branches/1.0/x86_64-configs/astlinux-ast11.config
    branches/1.0/x86_64-configs/astlinux-ast13.config
    branches/1.0/x86_64-configs/initrd.config

Added Paths:
-----------
    branches/1.0/package/chrony/
    branches/1.0/package/chrony/Config.in
    branches/1.0/package/chrony/chrony.mk
    branches/1.0/package/chrony/ntpd.init

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/astlinux-ast11.config	2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:27 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec  1 09:44:30 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -691,6 +691,7 @@
 BR2_PACKAGE_BRIDGE=y
 # BR2_PACKAGE_BWM_NG is not set
 # BR2_PACKAGE_CAN_UTILS is not set
+BR2_PACKAGE_CHRONY=y
 # BR2_PACKAGE_CTORRENT is not set
 # BR2_PACKAGE_CUPS is not set
 BR2_PACKAGE_DARKSTAT=y
@@ -749,23 +750,12 @@
 # BR2_PACKAGE_NGIRCD is not set
 BR2_PACKAGE_NGREP=y
 # BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
 BR2_PACKAGE_NUT=y
 # BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
 # BR2_PACKAGE_NUTTCP is not set
 # BR2_PACKAGE_OLSR is not set
 BR2_PACKAGE_OPENLDAP=y
 BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_OPENVPN=y
 BR2_PACKAGE_OPENVPN_LZO=y

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/astlinux-ast13.config	2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:28 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec  1 09:44:30 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -691,6 +691,7 @@
 BR2_PACKAGE_BRIDGE=y
 # BR2_PACKAGE_BWM_NG is not set
 # BR2_PACKAGE_CAN_UTILS is not set
+BR2_PACKAGE_CHRONY=y
 # BR2_PACKAGE_CTORRENT is not set
 # BR2_PACKAGE_CUPS is not set
 BR2_PACKAGE_DARKSTAT=y
@@ -749,23 +750,12 @@
 # BR2_PACKAGE_NGIRCD is not set
 BR2_PACKAGE_NGREP=y
 # BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
 BR2_PACKAGE_NUT=y
 # BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
 # BR2_PACKAGE_NUTTCP is not set
 # BR2_PACKAGE_OLSR is not set
 BR2_PACKAGE_OPENLDAP=y
 BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_OPENVPN=y
 BR2_PACKAGE_OPENVPN_LZO=y

Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/initrd.config	2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:29 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec  1 09:44:30 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -569,6 +569,7 @@
 # BR2_PACKAGE_BRIDGE is not set
 # BR2_PACKAGE_BWM_NG is not set
 # BR2_PACKAGE_CAN_UTILS is not set
+# BR2_PACKAGE_CHRONY is not set
 # BR2_PACKAGE_CTORRENT is not set
 # BR2_PACKAGE_CUPS is not set
 # BR2_PACKAGE_DARKSTAT is not set

Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/package/Config.in	2016-12-01 16:09:41 UTC (rev 8003)
@@ -455,6 +455,7 @@
 source "package/bridge-utils/Config.in"
 source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
+source "package/chrony/Config.in"
 source "package/ctorrent/Config.in"
 source "package/cups/Config.in"
 source "package/darkstat/Config.in"

Added: branches/1.0/package/chrony/Config.in
===================================================================
--- branches/1.0/package/chrony/Config.in	                        (rev 0)
+++ branches/1.0/package/chrony/Config.in	2016-12-01 16:09:41 UTC (rev 8003)
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_CHRONY
+	bool "chrony"
+	select BR2_PACKAGE_LIBCAP
+	help
+	  An NTP client and server designed to perform well in a wide range
+	  of conditions. It can synchronize the system clock with NTP servers,
+	  reference clocks, and manual input using wristwatch and keyboard.
+
+	  http://chrony.tuxfamily.org/
+

Added: branches/1.0/package/chrony/chrony.mk
===================================================================
--- branches/1.0/package/chrony/chrony.mk	                        (rev 0)
+++ branches/1.0/package/chrony/chrony.mk	2016-12-01 16:09:41 UTC (rev 8003)
@@ -0,0 +1,64 @@
+################################################################################
+#
+# chrony
+#
+################################################################################
+
+CHRONY_VERSION = 2.4.1
+CHRONY_SITE = http://download.tuxfamily.org/chrony
+CHRONY_DEPENDENCIES = libcap
+
+CHRONY_CONF_OPT = \
+	--host-system=Linux \
+	--host-release="" \
+	--host-machine=$(BR2_ARCH) \
+	--prefix=/usr \
+	--with-sendmail=/usr/sbin/sendmail \
+	--with-user=ntp \
+	--disable-ipv6 \
+	--disable-phc \
+	--without-seccomp \
+	--without-tomcrypt
+
+ifeq ($(BR2_PACKAGE_LIBNSS),y)
+CHRONY_DEPENDENCIES += host-pkgconf libnss
+else
+CHRONY_CONF_OPT += --without-nss
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+CHRONY_DEPENDENCIES += readline
+else
+CHRONY_CONF_OPT += --disable-readline
+endif
+
+# If pps-tools is available, build it before so the package can use it
+# (HAVE_SYS_TIMEPPS_H).
+ifeq ($(BR2_PACKAGE_PPS_TOOLS),y)
+CHRONY_DEPENDENCIES += pps-tools
+else
+CHRONY_CONF_OPT += --disable-pps
+endif
+
+define CHRONY_CONFIGURE_CMDS
+	cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPT)
+endef
+
+define CHRONY_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define CHRONY_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
+	$(INSTALL) -D -m 755 package/chrony/ntpd.init $(TARGET_DIR)/etc/init.d/ntpd
+	ln -sf /tmp/etc/chrony.conf $(TARGET_DIR)/etc/chrony.conf
+endef
+
+define CHRONY_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/chronyd
+	rm -f $(TARGET_DIR)/usr/bin/chronyc
+	rm -f $(TARGET_DIR)/etc/init.d/ntpd
+	rm -f $(TARGET_DIR)/etc/chrony.conf
+endef
+
+$(eval $(call GENTARGETS,package,chrony))

Added: branches/1.0/package/chrony/ntpd.init
===================================================================
--- branches/1.0/package/chrony/ntpd.init	                        (rev 0)
+++ branches/1.0/package/chrony/ntpd.init	2016-12-01 16:09:41 UTC (rev 8003)
@@ -0,0 +1,121 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+PIDFILE="/var/run/chronyd.pid"
+
+DATA_DIR="/var/lib/ntp"
+
+gen_chrony_config()
+{
+  local x IFS
+
+  echo "# Autogenerated.  Do not edit.
+
+driftfile $DATA_DIR/chrony.drift
+
+allow
+makestep 1.0 3
+cmdport 0
+rtconutc
+rtcsync"
+
+  if [ -n "$NTPSERVS" ]; then
+    echo "
+# NTP Servers/Pools"
+    unset IFS
+    for x in $NTPSERVS; do
+      if echo "$x" | grep -q '^[a-zA-Z].*\.pool\.'; then
+        echo "pool $x iburst"
+      else
+        echo "server $x iburst"
+      fi
+    done
+  fi
+
+  if [ "$NTPBROADCAST" = "yes" ]; then
+    echo "
+# Broadcast using IPv4 Multicast address
+broadcast 50 224.0.1.1"
+  fi
+
+  echo "
+# Undisciplined Local Clock
+# When no outside source of synchronized time is available
+local stratum 5"
+}
+
+init () {
+
+  if [ ! -d $DATA_DIR ]; then
+    mkdir -m 0700 -p $DATA_DIR
+    chown ntp:ntp $DATA_DIR
+  fi
+
+  if [ -f /mnt/kd/chrony.conf ]; then
+    ln -sf /mnt/kd/chrony.conf /tmp/etc/chrony.conf
+  else
+    if [ -L /tmp/etc/chrony.conf ]; then
+      rm -f /tmp/etc/chrony.conf
+    fi
+    gen_chrony_config > /tmp/etc/chrony.conf
+  fi
+}
+
+start () {
+
+  if [ -f /etc/chrony.conf ]; then
+
+    # Set the clock (large change)
+    echo "Setting local time/date..."
+    if chronyd -q; then
+      if [ -r /dev/rtc ]; then
+        hwclock -wu --noadjfile 2>/dev/null
+      fi
+    fi
+    rm -f $PIDFILE
+    sleep 1
+
+    # Maintain the clock (small changes)
+    echo "Starting NTP Daemon (chronyd)..."
+    chronyd
+  fi
+}
+
+stop () {
+
+  if [ -f $PIDFILE ]; then
+
+    echo "Stopping NTP Daemon (chronyd)..."
+    kill $(cat $PIDFILE) >/dev/null 2>&1
+    rm -f $PIDFILE
+  fi
+}
+
+case $1 in
+
+start)
+  start
+  ;;
+
+stop)
+  stop
+  ;;
+
+init)
+  init
+  start
+  ;;
+
+restart)
+  stop
+  sleep 2
+  start
+  ;;
+
+*)
+  echo "Usage: start|stop|restart"
+  ;;
+
+esac
+

Modified: branches/1.0/package/ntp/Config.in
===================================================================
--- branches/1.0/package/ntp/Config.in	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/package/ntp/Config.in	2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NTP
 	bool "ntp"
+	depends on !BR2_PACKAGE_CHRONY
 	select BR2_PACKAGE_LIBCAP
 	help
 	  Network Time Protocol suite/programs.

Modified: branches/1.0/package/openntpd/Config.in
===================================================================
--- branches/1.0/package/openntpd/Config.in	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/package/openntpd/Config.in	2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OPENNTPD
 	bool "OpenNTPD"
+	depends on !BR2_PACKAGE_CHRONY
 	help
 	     OpenNTPD is an easy to use implementation of the Network Time
 	     Protocol. It provides the ability to sync the local clock

Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/runnix-iso.config	2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:32 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec  1 09:44:31 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -598,6 +598,7 @@
 # BR2_PACKAGE_BRIDGE is not set
 # BR2_PACKAGE_BWM_NG is not set
 # BR2_PACKAGE_CAN_UTILS is not set
+# BR2_PACKAGE_CHRONY is not set
 # BR2_PACKAGE_CTORRENT is not set
 # BR2_PACKAGE_CUPS is not set
 # BR2_PACKAGE_DARKSTAT is not set

Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/runnix.config	2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:31 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec  1 09:44:30 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -599,6 +599,7 @@
 # BR2_PACKAGE_BRIDGE is not set
 # BR2_PACKAGE_BWM_NG is not set
 # BR2_PACKAGE_CAN_UTILS is not set
+# BR2_PACKAGE_CHRONY is not set
 # BR2_PACKAGE_CTORRENT is not set
 # BR2_PACKAGE_CUPS is not set
 # BR2_PACKAGE_DARKSTAT is not set

Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config	2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:33 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec  1 09:44:31 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_ARCH_IS_64=y
@@ -672,6 +672,7 @@
 BR2_PACKAGE_BRIDGE=y
 # BR2_PACKAGE_BWM_NG is not set
 # BR2_PACKAGE_CAN_UTILS is not set
+BR2_PACKAGE_CHRONY=y
 # BR2_PACKAGE_CTORRENT is not set
 # BR2_PACKAGE_CUPS is not set
 BR2_PACKAGE_DARKSTAT=y
@@ -730,23 +731,12 @@
 # BR2_PACKAGE_NGIRCD is not set
 BR2_PACKAGE_NGREP=y
 # BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
 BR2_PACKAGE_NUT=y
 # BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
 # BR2_PACKAGE_NUTTCP is not set
 # BR2_PACKAGE_OLSR is not set
 BR2_PACKAGE_OPENLDAP=y
 BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_OPENVPN=y
 BR2_PACKAGE_OPENVPN_LZO=y

Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config	2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:35 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec  1 09:44:31 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_ARCH_IS_64=y
@@ -672,6 +672,7 @@
 BR2_PACKAGE_BRIDGE=y
 # BR2_PACKAGE_BWM_NG is not set
 # BR2_PACKAGE_CAN_UTILS is not set
+BR2_PACKAGE_CHRONY=y
 # BR2_PACKAGE_CTORRENT is not set
 # BR2_PACKAGE_CUPS is not set
 BR2_PACKAGE_DARKSTAT=y
@@ -730,23 +731,12 @@
 # BR2_PACKAGE_NGIRCD is not set
 BR2_PACKAGE_NGREP=y
 # BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
 BR2_PACKAGE_NUT=y
 # BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
 # BR2_PACKAGE_NUTTCP is not set
 # BR2_PACKAGE_OLSR is not set
 BR2_PACKAGE_OPENLDAP=y
 BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_OPENVPN=y
 BR2_PACKAGE_OPENVPN_LZO=y

Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config	2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/x86_64-configs/initrd.config	2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:36 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec  1 09:44:31 2016
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_ARCH_IS_64=y
@@ -550,6 +550,7 @@
 # BR2_PACKAGE_BRIDGE is not set
 # BR2_PACKAGE_BWM_NG is not set
 # BR2_PACKAGE_CAN_UTILS is not set
+# BR2_PACKAGE_CHRONY is not set
 # BR2_PACKAGE_CTORRENT is not set
 # BR2_PACKAGE_CUPS is not set
 # BR2_PACKAGE_DARKSTAT is not set

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8002] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2016-11-29 23:41:59

Revision: 8002
          http://sourceforge.net/p/astlinux/code/8002
Author:   abelbeck
Date:     2016-11-29 23:41:57 +0000 (Tue, 29 Nov 2016)
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	2016-11-29 17:41:57 UTC (rev 8001)
+++ branches/1.0/docs/ChangeLog.txt	2016-11-29 23:41:57 UTC (rev 8002)
@@ -70,13 +70,6 @@
 
 -- ntpd/sntp, version bump to 4.2.8p9, security fixes: 2 medium-, 2 medium-/low-, and 5 low-severity
 
--- ntpd, now runs with 'ntp' user/group permissions using the new libcap support, for added security.
-   Note: If you use a custom /mnt/kd/ntpd.conf and a persistent driftfile, you must create a directory with ntp:ntp permissions.
-         The new default, non-persistent driftfile location is: /var/lib/ntp/ntpd.drift
-   Example: "driftfile /mnt/kd/ntp/ntpd.drift" is defined in /mnt/kd/ntpd.conf
-            # mkdir /mnt/kd/ntp
-            # chown ntp:ntp /mnt/kd/ntp
-
 -- avahi, now runs with 'avahi' user/group permissions using the new libcap support, for added security.
 
 -- msmtp, version bump to 1.6.6

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8001] branches/1.0/package/ntp/ntpd.init

From: <abe...@us...> - 2016-11-29 17:42:00

Revision: 8001
          http://sourceforge.net/p/astlinux/code/8001
Author:   abelbeck
Date:     2016-11-29 17:41:57 +0000 (Tue, 29 Nov 2016)
Log Message:
-----------
ntp, ntpd: workaround restart lockup, can't start ntpd with 'ntp' privileges

Modified Paths:
--------------
    branches/1.0/package/ntp/ntpd.init

Modified: branches/1.0/package/ntp/ntpd.init
===================================================================
--- branches/1.0/package/ntp/ntpd.init	2016-11-29 15:31:12 UTC (rev 8000)
+++ branches/1.0/package/ntp/ntpd.init	2016-11-29 17:41:57 UTC (rev 8001)
@@ -6,8 +6,6 @@
 
 DATA_DIR="/var/lib/ntp"
 
-NTPD_STARTED="$DATA_DIR/ntpd_started"
-
 init () {
 
   # So sntp doesn't complain
@@ -60,7 +58,7 @@
 }
 
 start () {
-  local NTPAF="" UG first driftfile
+  local NTPAF="" UG="" first
 
   if [ -f /etc/ntpd.conf ]; then
 
@@ -79,20 +77,10 @@
         fi
         sleep 1
 
-        # workaround restart lockup, start ntpd with 'ntp' privileges at boot, then restart as 'root'
-        if [ -f $NTPD_STARTED ]; then
-          UG=""
-        else
-          UG="ntp:ntp"
-          driftfile="$(awk '/^driftfile / { print $2; nextfile; }' /etc/ntpd.conf)"
-          if [ -n "$driftfile" ] && [ -f "$driftfile" ]; then
-            chown $UG "$driftfile"
-          fi
-        fi
+        ## workaround restart lockup, can't start ntpd with 'ntp' privileges
+        ## UG="ntp:ntp"
         # Maintain the clock (small changes)
         ntpd $NTPAF -p $PIDFILE${UG:+ -u $UG} -g -c /etc/ntpd.conf
-
-        touch $NTPD_STARTED
       elif ( set -o noclobber; echo "$$" > /var/lock/ntpd-delayed.lock ) 2>/dev/null; then
         echo "ntpd: server unreachable, will automatically retry in 2 minutes"
         (

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[8000] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2016-11-29 15:31:14

Revision: 8000
          http://sourceforge.net/p/astlinux/code/8000
Author:   abelbeck
Date:     2016-11-29 15:31:12 +0000 (Tue, 29 Nov 2016)
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	2016-11-29 15:30:29 UTC (rev 7999)
+++ branches/1.0/docs/ChangeLog.txt	2016-11-29 15:31:12 UTC (rev 8000)
@@ -23,7 +23,7 @@
 
 -- php, version bump to 5.6.28
 
--- sqlite, version bump to 3.15.1
+-- sqlite, version bump to 3.15.2
 
 -- Monit, version bump to 5.20.0
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7999] branches/1.0/package/sqlite/sqlite.mk

From: <abe...@us...> - 2016-11-29 15:30:32

Revision: 7999
          http://sourceforge.net/p/astlinux/code/7999
Author:   abelbeck
Date:     2016-11-29 15:30:29 +0000 (Tue, 29 Nov 2016)
Log Message:
-----------
sqlite, version bump to 3.15.2

Modified Paths:
--------------
    branches/1.0/package/sqlite/sqlite.mk

Modified: branches/1.0/package/sqlite/sqlite.mk
===================================================================
--- branches/1.0/package/sqlite/sqlite.mk	2016-11-29 14:58:02 UTC (rev 7998)
+++ branches/1.0/package/sqlite/sqlite.mk	2016-11-29 15:30:29 UTC (rev 7999)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3150100
+SQLITE_VERSION = 3150200
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org/2016
 SQLITE_INSTALL_STAGING = YES

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7998] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2016-11-29 14:58:04

Revision: 7998
          http://sourceforge.net/p/astlinux/code/7998
Author:   abelbeck
Date:     2016-11-29 14:58:02 +0000 (Tue, 29 Nov 2016)
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	2016-11-29 14:54:44 UTC (rev 7997)
+++ branches/1.0/docs/ChangeLog.txt	2016-11-29 14:58:02 UTC (rev 7998)
@@ -64,7 +64,7 @@
 
 -- tcpdump, version bump to 4.8.1
 
--- stunnel, version bump to 5.37
+-- stunnel, version bump to 5.38
 
 -- shellinabox, version bump to 2.20
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7997] branches/1.0/package/ntp/ntpd.init

From: <abe...@us...> - 2016-11-29 14:54:46

Revision: 7997
          http://sourceforge.net/p/astlinux/code/7997
Author:   abelbeck
Date:     2016-11-29 14:54:44 +0000 (Tue, 29 Nov 2016)
Log Message:
-----------
ntp, ntpd: workaround restart lockup, start ntpd with 'ntp' privileges at boot, then restart as 'root'

Modified Paths:
--------------
    branches/1.0/package/ntp/ntpd.init

Modified: branches/1.0/package/ntp/ntpd.init
===================================================================
--- branches/1.0/package/ntp/ntpd.init	2016-11-28 22:35:55 UTC (rev 7996)
+++ branches/1.0/package/ntp/ntpd.init	2016-11-29 14:54:44 UTC (rev 7997)
@@ -4,14 +4,18 @@
 
 PIDFILE="/var/run/ntpd.pid"
 
+DATA_DIR="/var/lib/ntp"
+
+NTPD_STARTED="$DATA_DIR/ntpd_started"
+
 init () {
 
   # So sntp doesn't complain
   touch /var/db/ntp-kod
 
-  if [ ! -d /var/lib/ntp ]; then
-    mkdir -m 0700 -p /var/lib/ntp
-    chown ntp:ntp /var/lib/ntp
+  if [ ! -d $DATA_DIR ]; then
+    mkdir -m 0700 -p $DATA_DIR
+    chown ntp:ntp $DATA_DIR
   fi
 
   if [ -f /mnt/kd/ntpd.conf ]; then
@@ -22,7 +26,7 @@
     fi
     echo "# Autogenerated.  Do not edit.
 
-driftfile /var/lib/ntp/ntpd.drift
+driftfile $DATA_DIR/ntpd.drift
 
 restrict default noquery nopeer notrap nomodify
 restrict 127.0.0.1" > /tmp/etc/ntpd.conf
@@ -56,7 +60,7 @@
 }
 
 start () {
-  local NTPAF="" first
+  local NTPAF="" UG first driftfile
 
   if [ -f /etc/ntpd.conf ]; then
 
@@ -74,8 +78,21 @@
           hwclock -wu --noadjfile 2>/dev/null
         fi
         sleep 1
+
+        # workaround restart lockup, start ntpd with 'ntp' privileges at boot, then restart as 'root'
+        if [ -f $NTPD_STARTED ]; then
+          UG=""
+        else
+          UG="ntp:ntp"
+          driftfile="$(awk '/^driftfile / { print $2; nextfile; }' /etc/ntpd.conf)"
+          if [ -n "$driftfile" ] && [ -f "$driftfile" ]; then
+            chown $UG "$driftfile"
+          fi
+        fi
         # Maintain the clock (small changes)
-        ntpd $NTPAF -p $PIDFILE -u ntp:ntp -g -c /etc/ntpd.conf
+        ntpd $NTPAF -p $PIDFILE${UG:+ -u $UG} -g -c /etc/ntpd.conf
+
+        touch $NTPD_STARTED
       elif ( set -o noclobber; echo "$$" > /var/lock/ntpd-delayed.lock ) 2>/dev/null; then
         echo "ntpd: server unreachable, will automatically retry in 2 minutes"
         (

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7996] branches/1.0/package/stunnel/stunnel.mk

From: <abe...@us...> - 2016-11-28 22:35:57

Revision: 7996
          http://sourceforge.net/p/astlinux/code/7996
Author:   abelbeck
Date:     2016-11-28 22:35:55 +0000 (Mon, 28 Nov 2016)
Log Message:
-----------
stunnel, version bump to 5.38

Modified Paths:
--------------
    branches/1.0/package/stunnel/stunnel.mk

Modified: branches/1.0/package/stunnel/stunnel.mk
===================================================================
--- branches/1.0/package/stunnel/stunnel.mk	2016-11-28 15:04:18 UTC (rev 7995)
+++ branches/1.0/package/stunnel/stunnel.mk	2016-11-28 22:35:55 UTC (rev 7996)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-STUNNEL_VERSION = 5.37
+STUNNEL_VERSION = 5.38
 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/5.x
 STUNNEL_DEPENDENCIES = openssl
 

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.

Flat | Threaded

<< < 1 .. 15 16 17 18 19 .. 329 > >> (Page 17 of 329)